diff options
| author | Garrett Cox <garrettjcox@gmail.com> | 2024-10-06 00:38:46 -0500 |
|---|---|---|
| committer | Garrett Cox <garrettjcox@gmail.com> | 2024-10-06 00:38:46 -0500 |
| commit | 60fc8caa50af30ceba9a6572bfa6267fc89ffc4a (patch) | |
| tree | ad0e722df51eae060392481293def43175a6e695 /mm/src/code | |
| parent | ab30ca1617c12cf2e192d339af1269332976278c (diff) | |
| parent | 41d77dd9b4095e87fce1f3ffa2ab2e1b1b04b258 (diff) | |
Merge branch 'event-queue' of garrettjoecox.github.com:garrettjoecox/2ship2harkinian into develop-rando
Diffstat (limited to 'mm/src/code')
| -rw-r--r-- | mm/src/code/z_draw.c | 4 | ||||
| -rw-r--r-- | mm/src/code/z_en_item00.c | 2 | ||||
| -rw-r--r-- | mm/src/code/z_message.c | 8 | ||||
| -rw-r--r-- | mm/src/code/z_msgevent.c | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/mm/src/code/z_draw.c b/mm/src/code/z_draw.c index bc5da705d..1d5b967d7 100644 --- a/mm/src/code/z_draw.c +++ b/mm/src/code/z_draw.c @@ -90,8 +90,6 @@ #include "assets/objects/object_bsmask/object_bsmask.h" #include "assets/objects/object_st/object_st.h" -#include "2s2h/Enhancements/GameInteractor/GameInteractor.h" - void GetItem_DrawBombchu(PlayState* play, s16 drawId); void GetItem_DrawPoes(PlayState* play, s16 drawId); void GetItem_DrawFairyBottle(PlayState* play, s16 drawId); @@ -373,8 +371,6 @@ static DrawItemTableEntry sDrawItemTable[] = { { GetItem_DrawOpa0Xlu1, { gGiPictoBoxFrameDL, gGiPictoBoxBodyAndLensDL } }, // GID_MASK_FIERCE_DEITY, OBJECT_GI_MASK03 { GetItem_DrawOpa01, { gGiFierceDeityMaskFaceDL, gGiFierceDeityMaskHairAndHatDL } }, - // GID_SHIP - { GameInteractor_GetItemDraw, {} }, }; /** diff --git a/mm/src/code/z_en_item00.c b/mm/src/code/z_en_item00.c index 31439df89..92dc54a9b 100644 --- a/mm/src/code/z_en_item00.c +++ b/mm/src/code/z_en_item00.c @@ -4,7 +4,7 @@ #include "objects/object_gi_hearts/object_gi_hearts.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" #include "overlays/actors/ovl_En_Elforg/z_en_elforg.h" -#include "2s2h/Enhancements/GameInteractor/GameInteractor.h" +#include "2s2h/GameInteractor/GameInteractor.h" #define FLAGS 0x00000000 diff --git a/mm/src/code/z_message.c b/mm/src/code/z_message.c index 8865806ff..9e0f4798d 100644 --- a/mm/src/code/z_message.c +++ b/mm/src/code/z_message.c @@ -3281,7 +3281,8 @@ void Message_OpenText(PlayState* play, u16 textId) { Player* player = GET_PLAYER(play); f32 var_fv0; - GameInteractor_ExecuteOnOpenText(&textId); + bool loadFromMessageTable = true; + GameInteractor_ExecuteOnOpenText(&textId, &loadFromMessageTable); // BENTODO do this somewhere else gSaveContext.options.language = LANGUAGE_ENG; @@ -3358,8 +3359,9 @@ void Message_OpenText(PlayState* play, u16 textId) { sCharTexSize = msgCtx->textCharScale * 16.0f; sCharTexScale = 1024.0f / msgCtx->textCharScale; D_801F6B08 = 1024.0f / var_fv0; - if (textId == CUSTOM_MESSAGE_ID) { - CustomMessage_HandleCustomMessage(); + // BENTODO all of these + if (!loadFromMessageTable) { + // no-op } else if (msgCtx->textIsCredits) { Message_FindCreditsMessage(play, textId); MessageTableEntry* msgEntry = (MessageTableEntry*)font->messageStart; diff --git a/mm/src/code/z_msgevent.c b/mm/src/code/z_msgevent.c index c943a9d65..cf732f660 100644 --- a/mm/src/code/z_msgevent.c +++ b/mm/src/code/z_msgevent.c @@ -1,5 +1,5 @@ #include "global.h" -#include "2s2h/Enhancements/GameInteractor/GameInteractor.h" +#include "2s2h/GameInteractor/GameInteractor.h" #include "2s2h/GameInteractor/GameInteractor.h" |