diff --git a/Source/UI/Buttons/UIBmpTextButton.cpp b/Source/UI/Buttons/UIBmpTextButton.cpp index 54571744a..82330815e 100644 --- a/Source/UI/Buttons/UIBmpTextButton.cpp +++ b/Source/UI/Buttons/UIBmpTextButton.cpp @@ -13,13 +13,6 @@ UIBmpTextButton::UIBmpTextButton() : UIBitmapButton() { UIBmpTextButton::~UIBmpTextButton() = default; -// OFFSET: 0x007C2340 -// FUNCTION: fn_09323 -void UIBmpTextButton::SetText(std::string value) { - this->text = value; - this->Invalidate(); -} - // OFFSET: 0x0085BDE0 // FUNCTION: fn_10799 void UIBmpTextButton::Paint() { diff --git a/Source/UI/Party/UIAdvenPartyBoardWnd.cpp b/Source/UI/Party/UIAdvenPartyBoardWnd.cpp index 245136f4e..0dc8d8127 100644 --- a/Source/UI/Party/UIAdvenPartyBoardWnd.cpp +++ b/Source/UI/Party/UIAdvenPartyBoardWnd.cpp @@ -260,6 +260,25 @@ void UIAdvenPartyBoardWnd::LoadPage(int pageValue) { } } +// OFFSET: 0x007C1C50 +// FUNCTION: fn_09318 +void UIJobSlotButton::SetSelected(bool value) { + this->selected = value; + this->SetState(0); + + if (value == 1) { + this->SetBitmap(this->selectedImage.c_str(), 0, 0); + this->SetBitmap(this->selectedImage.c_str(), 1, 0); + this->SetBitmap(this->unselectedImage.c_str(), 2, 0); + } else { + this->SetBitmap(this->unselectedImage.c_str(), 0, 0); + this->SetBitmap(this->unselectedImage.c_str(), 1, 0); + this->SetBitmap(this->selectedImage.c_str(), 2, 0); + } + + this->Invalidate(); +} + // OFFSET: 0x007C2120 // FUNCTION: fn_09322 void UIAdvenPartyBoardWnd::Registration(bool value) { @@ -294,6 +313,13 @@ void UIAdvenPartyBoardWnd::Registration(bool value) { this->InvalidateChildren(); } +// OFFSET: 0x007C2340 +// FUNCTION: fn_09323 +void UIBmpTextButton::SetText(std::string value) { + this->text = value; + this->Invalidate(); +} + // OFFSET: 0x007C1BC0 // FUNCTION: fn_09317 void UIAdvenPartyBoardWnd::SetOwnParty(CAdvenPartyInfo value) { diff --git a/Source/UI/Party/UIJobSlotButton.cpp b/Source/UI/Party/UIJobSlotButton.cpp index f74b4071b..9ce3fbce8 100644 --- a/Source/UI/Party/UIJobSlotButton.cpp +++ b/Source/UI/Party/UIJobSlotButton.cpp @@ -13,22 +13,3 @@ void UIJobSlotButton::OnLBtnUp(int x, int y) { this->UIButton::OnLBtnUp(x, y); this->SetSelected(this->selected == 0); } - -// OFFSET: 0x007C1C50 -// FUNCTION: fn_09318 -void UIJobSlotButton::SetSelected(bool value) { - this->selected = value; - this->SetState(0); - - if (value == 1) { - this->SetBitmap(this->selectedImage.c_str(), 0, 0); - this->SetBitmap(this->selectedImage.c_str(), 1, 0); - this->SetBitmap(this->unselectedImage.c_str(), 2, 0); - } else { - this->SetBitmap(this->unselectedImage.c_str(), 0, 0); - this->SetBitmap(this->unselectedImage.c_str(), 1, 0); - this->SetBitmap(this->selectedImage.c_str(), 2, 0); - } - - this->Invalidate(); -} diff --git a/Source/UI/Party/UIJobSlotButton.h b/Source/UI/Party/UIJobSlotButton.h index 23ec2ef22..a072f24a7 100644 --- a/Source/UI/Party/UIJobSlotButton.h +++ b/Source/UI/Party/UIJobSlotButton.h @@ -8,7 +8,7 @@ public: UIJobSlotButton(); ~UIJobSlotButton() override; void OnLBtnUp(int x, int y) override; - __declspec(noinline) void SetSelected(bool value); + void SetSelected(bool value); /* 0120 */ std::string selectedImage; /* 0138 */ std::string unselectedImage;