This commit is contained in:
theo3
2021-02-19 15:01:30 -08:00
parent ab3e488126
commit 112e97abc8
16 changed files with 52 additions and 52 deletions
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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
+14 -14
View File
@@ -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
+5 -5
View File
@@ -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
+2 -2
View File
@@ -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]
+1 -1
View File
@@ -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
+9 -9
View File
@@ -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