diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/arm_proxy.c | 2 | ||||
| -rw-r--r-- | src/fileScreen.c | 2 | ||||
| -rw-r--r-- | src/intro.c | 2 | ||||
| -rw-r--r-- | src/main.c | 4 | ||||
| -rw-r--r-- | src/screenDebug.c | 4 | ||||
| -rw-r--r-- | src/textbox.c | 8 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/arm_proxy.c b/src/arm_proxy.c index aebfa3f2..858cf985 100644 --- a/src/arm_proxy.c +++ b/src/arm_proxy.c @@ -249,7 +249,7 @@ void sub_080171F0(void) { gPlayerEntity.bitfield &= ~0x80; if (gPlayerEntity.action != 0x14) - gPlayerState.flags.all = (gPlayerState.flags.all & ~0x10000) | (0x8000 * (gPlayerState.flags.all & 2)); + gPlayerState.flags.all = (gPlayerState.flags.all & ~0x10000) | (0x10000 * (gPlayerState.flags.all & 2) / 2); gPlayerState.flags.all &= ~2; sub_080028E0(&gPlayerEntity); diff --git a/src/fileScreen.c b/src/fileScreen.c index 23384734..4c542b32 100644 --- a/src/fileScreen.c +++ b/src/fileScreen.c @@ -185,7 +185,7 @@ static void HandleFileScreenEnter(void) { sub_0801DA90(1); sub_080A3210(); _DmaZero((void*)VRAM, 0x80); // clear palettes - sub_08056418(); + MessageInitialize(); EraseAllEntities(); sub_08080668(); sub_080ADD30(); diff --git a/src/intro.c b/src/intro.c index b0e75a85..7515818e 100644 --- a/src/intro.c +++ b/src/intro.c @@ -63,7 +63,7 @@ void HandleIntroScreen(void) { FlushSprites(); switch (gUnk_03001000.funcIndex) { case 0: - sub_08056418(); + MessageInitialize(); _DmaZero(&gUnk_02032EC0, sizeof(gUnk_02032EC0)); AdvanceIntroSequence(0); break; @@ -33,7 +33,7 @@ void MainLoop(void) { sub_0804FFE4(); DmaCopy32(3, BG_PLTT, gPaletteBuffer, BG_PLTT_SIZE); sub_0804FF84(1); - sub_08056418(); + MessageInitialize(); sub_080ADD30(); gRand = 0x1234567; _DmaZero(&gUnk_03001000, sizeof(gUnk_03001000)); @@ -66,7 +66,7 @@ void MainLoop(void) { gUnk_03001000.ticks++; sScreenHandlers[gUnk_03001000.screen](); - sub_08056458(); + MessageUpdate(); sub_08050154(); sub_080A3480(); break; diff --git a/src/screenDebug.c b/src/screenDebug.c index a370e373..f121d78c 100644 --- a/src/screenDebug.c +++ b/src/screenDebug.c @@ -32,7 +32,7 @@ void sub_0805FA04(void) { gScreen.affine.bg3yOffset = 0; gScreen.affine.bg3Control = 0x1e0f; gScreen.affine.unk4 = 1; - sub_08056418(); + MessageInitialize(); _DmaZero((void*)&gUnk_02032EC0, sizeof(UI)); _DmaZero((void*)&gMenu, sizeof(Menu)); gMenu.unk16 = gUnk_02000000->gameLanguage; @@ -68,7 +68,7 @@ void sub_0805FA98(void) { TextboxNoOverlapFollow(gMenu.unk14 * 0x100 + gMenu.unk15); break; case 0x2: - sub_08056418(); + MessageInitialize(); break; default: switch (gInput.unk4) { diff --git a/src/textbox.c b/src/textbox.c index a4f921ee..b44454d4 100644 --- a/src/textbox.c +++ b/src/textbox.c @@ -93,7 +93,7 @@ void ShowTextbox(u32 index) { gTextBox.doTextBox = 1; } -void sub_08056418(void) { +void MessageInitialize(void) { _DmaZero(&gTextBox, 32); _DmaZero(&gUnk_02022780, 168); _DmaZero(&gUnk_02036A40, 8); @@ -101,7 +101,7 @@ void sub_08056418(void) { _DmaZero(&gUnk_02000040, 4); } -void sub_08056458(void) { +void MessageUpdate(void) { int iVar1; if (gTextBox.doTextBox == 1) { @@ -120,8 +120,8 @@ void sub_08056458(void) { gUnk_02022780._9d = 0; sub_08056F70(); } - sub_08056C68(); - sub_08056D70(); + DeleteWindow(); + CreateWindow(); } void sub_080564C8(u32 a1) { |
