summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/code_08019444.s4
-rw-r--r--asm/code_080526F8.s2
-rw-r--r--asm/code_0805436C.s6
-rw-r--r--asm/code_08056418.s28
-rw-r--r--asm/code_0805EC04.s10
-rw-r--r--asm/code_0807F0D8.s4
-rw-r--r--asm/code_080A5574.s2
-rwxr-xr-xasm/fileScreen.s18
-rw-r--r--include/functions.h4
-rw-r--r--include/main.h4
-rw-r--r--src/arm_proxy.c2
-rw-r--r--src/fileScreen.c2
-rw-r--r--src/intro.c2
-rw-r--r--src/main.c4
-rw-r--r--src/screenDebug.c4
-rw-r--r--src/textbox.c8
16 files changed, 52 insertions, 52 deletions
diff --git a/asm/code_08019444.s b/asm/code_08019444.s
index d528d5b9..c140c657 100644
--- a/asm/code_08019444.s
+++ b/asm/code_08019444.s
@@ -3708,8 +3708,8 @@ _0801B054:
pop {r4, r5, r6, r7, pc}
.align 2, 0
- thumb_func_start sub_0801B060
-sub_0801B060: @ 0x0801B060
+ thumb_func_start UpdateBgAnim
+UpdateBgAnim: @ 0x0801B060
push {r4, r5, lr}
movs r3, #0
ldr r4, _0801B0B0 @ =gUnk_02000CC0
diff --git a/asm/code_080526F8.s b/asm/code_080526F8.s
index 92ac7b50..a85d6639 100644
--- a/asm/code_080526F8.s
+++ b/asm/code_080526F8.s
@@ -1964,7 +1964,7 @@ sub_08053634: @ 0x08053634
ldr r1, _08053644 @ =gUnk_02032EC0
movs r0, #3
strb r0, [r1]
- bl sub_08056418
+ bl MessageInitialize
pop {pc}
.align 2, 0
_08053644: .4byte gUnk_02032EC0
diff --git a/asm/code_0805436C.s b/asm/code_0805436C.s
index 3e74e142..d49996a2 100644
--- a/asm/code_0805436C.s
+++ b/asm/code_0805436C.s
@@ -61,8 +61,8 @@ sub_080548E8: @ 0x080548E8
bl sub_0805E5C0
bl sub_080AD9B0
bl sub_080AD918
- bl sub_0807FC40
- bl sub_0801B060
+ bl UpdateScroll
+ bl UpdateBgAnim
bl sub_08000108
pop {pc}
.align 2, 0
@@ -72,7 +72,7 @@ _0805491C: .4byte gMenu
thumb_func_start sub_08054920
sub_08054920: @ 0x08054920
push {lr}
- bl sub_08056418
+ bl MessageInitialize
bl sub_0806F38C
ldr r1, _08054948 @ =gUnk_080C9CBC
ldr r0, _0805494C @ =gUnk_02022740
diff --git a/asm/code_08056418.s b/asm/code_08056418.s
index bb12835c..ee3abc80 100644
--- a/asm/code_08056418.s
+++ b/asm/code_08056418.s
@@ -179,7 +179,7 @@ _0805680A:
_08056812:
adds r0, r4, #0
movs r1, #0
- bl sub_0805F324
+ bl sub_GetFontStrWidth
adds r3, r0, #0
adds r4, r5, #0
adds r4, #0x56
@@ -752,8 +752,8 @@ sub_08056C54: @ 0x08056C54
_08056C60: .4byte gTextBox
_08056C64: .4byte gUnk_02022780
- thumb_func_start sub_08056C68
-sub_08056C68: @ 0x08056C68
+ thumb_func_start DeleteWindow
+DeleteWindow: @ 0x08056C68
push {r4, r5, r6, lr}
ldr r5, _08056CB8 @ =gUnk_02036A38
ldrb r0, [r5, #1]
@@ -894,8 +894,8 @@ _08056D66:
pop {r4, r5, r6, r7, pc}
.align 2, 0
- thumb_func_start sub_08056D70
-sub_08056D70: @ 0x08056D70
+ thumb_func_start CreateWindow
+CreateWindow: @ 0x08056D70
push {r4, lr}
ldr r0, _08056DB4 @ =gUnk_02022780
adds r0, #0x9b
@@ -915,9 +915,9 @@ sub_08056D70: @ 0x08056D70
ldr r3, _08056DC0 @ =0x0000F07B
ldrb r1, [r4, #6]
ldrb r2, [r4, #7]
- bl sub_08056DC8
- bl sub_08056EC0
- bl sub_08056F1C
+ bl DispMessageFrame
+ bl DispString
+ bl DispCursor
ldr r2, _08056DC4 @ =gUnk_02036A38
ldr r0, [r4]
ldr r1, [r4, #4]
@@ -933,8 +933,8 @@ _08056DBC: .4byte gBG0Buffer
_08056DC0: .4byte 0x0000F07B
_08056DC4: .4byte gUnk_02036A38
- thumb_func_start sub_08056DC8
-sub_08056DC8: @ 0x08056DC8
+ thumb_func_start DispMessageFrame
+DispMessageFrame: @ 0x08056DC8
push {r4, r5, r6, r7, lr}
mov r7, sb
mov r6, r8
@@ -1066,8 +1066,8 @@ _08056EB6:
pop {r4, r5, r6, r7, pc}
.align 2, 0
- thumb_func_start sub_08056EC0
-sub_08056EC0: @ 0x08056EC0
+ thumb_func_start DispString
+DispString: @ 0x08056EC0
push {r4, r5, r6, r7, lr}
ldr r6, _08056F10 @ =gUnk_02036A40
ldrb r0, [r6, #6]
@@ -1116,8 +1116,8 @@ _08056F10: .4byte gUnk_02036A40
_08056F14: .4byte gUnk_02034CB2
_08056F18: .4byte gUnk_0202281E
- thumb_func_start sub_08056F1C
-sub_08056F1C: @ 0x08056F1C
+ thumb_func_start DispCursor
+DispCursor: @ 0x08056F1C
push {lr}
ldr r0, _08056F58 @ =gUnk_02022780
adds r0, #0x98
diff --git a/asm/code_0805EC04.s b/asm/code_0805EC04.s
index 329b46b0..761f4567 100644
--- a/asm/code_0805EC04.s
+++ b/asm/code_0805EC04.s
@@ -794,8 +794,8 @@ _0805F320:
pop {pc}
.align 2, 0
- thumb_func_start sub_0805F324
-sub_0805F324: @ 0x0805F324
+ thumb_func_start sub_GetFontStrWidth
+sub_GetFontStrWidth: @ 0xGetFontStrWidth
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
@@ -1028,7 +1028,7 @@ _0805F486:
str r0, [r4, #4]
mov r0, sp
movs r1, #1
- bl sub_0805F324
+ bl sub_GetFontStrWidth
lsrs r2, r0, #0x18
ldrb r1, [r4, #0x16]
muls r2, r1, r2
@@ -1087,7 +1087,7 @@ _0805F554:
adds r1, r4, #0
adds r2, r7, #0
adds r3, r6, #0
- bl sub_08056DC8
+ bl DispMessageFrame
adds r5, #2
mov r1, sb
ldrh r0, [r1, #0x10]
@@ -1161,7 +1161,7 @@ sub_0805F5CC: @ 0x0805F5CC
bl _DmaFill32
adds r0, r6, #0
movs r1, #0
- bl sub_0805F324
+ bl sub_GetFontStrWidth
adds r2, r0, #0
ldrb r1, [r4, #0x13]
movs r0, #1
diff --git a/asm/code_0807F0D8.s b/asm/code_0807F0D8.s
index 51137693..8bacaa15 100644
--- a/asm/code_0807F0D8.s
+++ b/asm/code_0807F0D8.s
@@ -1598,8 +1598,8 @@ _0807FC32:
.align 2, 0
_0807FC3C: .4byte gRoomControls
- thumb_func_start sub_0807FC40
-sub_0807FC40: @ 0x0807FC40
+ thumb_func_start UpdateScroll
+UpdateScroll: @ 0xUpdateScroll
push {lr}
ldr r0, _0807FC5C @ =gRoomControls
ldrb r2, [r0, #0xf]
diff --git a/asm/code_080A5574.s b/asm/code_080A5574.s
index 8ad62f9b..c2dbdf9d 100644
--- a/asm/code_080A5574.s
+++ b/asm/code_080A5574.s
@@ -3783,7 +3783,7 @@ sub_080A7328: @ 0x080A7328
strb r0, [r4, #8]
movs r0, #1
bl sub_0801DA90
- bl sub_08056418
+ bl MessageInitialize
bl sub_080ADD30
movs r0, #0
bl sub_0801CFA8
diff --git a/asm/fileScreen.s b/asm/fileScreen.s
index 534bdbd8..4e2629a4 100755
--- a/asm/fileScreen.s
+++ b/asm/fileScreen.s
@@ -143,7 +143,7 @@ InitializeNewRoom: @ 0x08051AAC
strb r2, [r0, #8]
strb r2, [r0, #4]
strb r2, [r0, #5]
- bl sub_08056418
+ bl MessageInitialize
bl sub_08052CFC
movs r0, #0
bl sub_0801C370
@@ -162,9 +162,9 @@ sub_08051AF0: @ 0x08051AF0
bl sub_0805BBBC
cmp r0, #0
bne _08051B02
- bl sub_0807FC40
+ bl UpdateScroll
_08051B02:
- bl sub_0801B060
+ bl UpdateBgAnim
bl sub_08000108
bl sub_0801C344
bl sub_0805E5F8
@@ -273,8 +273,8 @@ _08051C06:
bl sub_0805E5C0
bl sub_08080A40
bl sub_080175F4
- bl sub_0807FC40
- bl sub_0801B060
+ bl UpdateScroll
+ bl UpdateBgAnim
bl sub_08000108
bl sub_08052C3C
bl sub_0801C344
@@ -607,8 +607,8 @@ sub_08051F04: @ 0x08051F04
bl sub_0805E5C0
bl sub_080AD9B0
bl sub_080AD918
- bl sub_0807FC40
- bl sub_0801B060
+ bl UpdateScroll
+ bl UpdateBgAnim
bl sub_0805E5F8
bl sub_08000108
pop {pc}
@@ -641,7 +641,7 @@ _08051F68:
strb r0, [r2]
movs r0, #0x10
bl sub_080500F4
- bl sub_08056418
+ bl MessageInitialize
_08051F76:
pop {pc}
@@ -727,7 +727,7 @@ _0805200C: .4byte gMenu
sub_08052010: @ 0x08052010
push {r4, lr}
bl sub_080A3210
- bl sub_08056418
+ bl MessageInitialize
movs r0, #1
bl sub_0801DA90
ldr r0, _0805207C @ =gBG1Buffer
diff --git a/include/functions.h b/include/functions.h
index f3213239..f9702c2a 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -312,8 +312,8 @@ extern u32 sub_08056134(void);
extern void sub_08004484(Entity*, Entity*);
extern void sub_080564C8(u32);
extern void sub_08056F70(void);
-extern void sub_08056C68(void);
-extern void sub_08056D70(void);
+extern void DeleteWindow(void);
+extern void CreateWindow(void);
extern void sub_0805EEB4(u8*, u32, u32);
extern void sub_08056FBC(void*);
extern void sub_08056C54(u32);
diff --git a/include/main.h b/include/main.h
index 55e7b341..693430b5 100644
--- a/include/main.h
+++ b/include/main.h
@@ -84,7 +84,7 @@ extern void sub_0807CE90(void);
extern void sub_080560B8(void);
extern void sub_08056208(void);
extern void sub_0804FFE4(void);
-extern void sub_08056418(void);
+extern void MessageInitialize(void);
extern void sub_080ADD30(void);
extern void InitScreen(u32);
@@ -93,7 +93,7 @@ extern void ReadKeyInput(void);
extern void DoSoftReset(void);
extern void sub_08056260(void);
extern void VBlankIntrWait();
-extern void sub_08056458(void);
+extern void MessageUpdate(void);
extern void sub_08050154(void);
extern void sub_080A3480(void);
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;
diff --git a/src/main.c b/src/main.c
index 3d8b1f96..c65428e7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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) {
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 07:57:01 +0000