github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-20 13:23:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix greg hint (and an RSK parsing issue) (#2547)

Browse source 
* fix RSK parsing error introduced by  #2541

* add logic to not give greg hint when we shouldn't

---------

Co-authored-by: briaguya <briaguya@alice>
This commit is contained in:
briaguya 2023-02-27 21:03:00 -05:00 • committed by GitHub
commit 061e232685
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

9
soh/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c
View file

@ -104,7 +104,14 @@ void func_80B1778C(EnTakaraMan* this, PlayState* play) {
if (!this->unk_21A && this->unk_214) {
if (Flags_GetSwitch(play, 0x32)) {
this->actor.textId = 0x84; //Thanks a lot! (Lost)
// text id 0x84 is used in places other than the treasure chest game.
// in order to provide a unique text id that can be replaced for the custom
// greg hint, we set it to 0x6E instead
if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_GREG_HINT)) {
this->actor.textId = 0x6E;
} else {
this->actor.textId = 0x84; //Thanks a lot! (Lost)
}
this->dialogState = TEXT_STATE_EVENT;
} else {
this->actor.textId = 0x704C; //Proceed