pret/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-10-07 17:30:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #378 from PikalaxALT/pikalax_work

Browse Source 
list_menu; Try matching FUN_0202EFE4
This commit is contained in:
Akira Akashi
2021-05-22 17:05:58 +01:00
committed by GitHub
parent 98f1148980 de6f8fc978
commit 1e7dcfbf61
140 changed files with 2921 additions and 3740 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arm9/arm9.lsf
+1 -1
View File
@@ -6,7 +6,7 @@ Static arm9
{
Address 0x02000000
Object main.o
Object unk_020010A8.o
Object list_menu.o
Object unk_02001B80.o
Object string_util.o
Object unk_020023C0.o
arm9/asm/scrcmd_asm.s
+1 -1
View File
@@ -3490,7 +3490,7 @@ FUN_0203CBE8: ; 0x0203CBE8
mov r1, #0x1
bl FUN_02039438
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0x0
mov r1, #0x1
bl FUN_02039438
arm9/asm/unk_020010A8.s
-1514
View File
File diff suppressed because it is too large Load Diff
arm9/asm/unk_02001B80.s
+20 -28
View File
@@ -12,14 +12,6 @@ UNK_020ECAC8: ; 0x020ECAC8
.text
thumb_func_start FUN_02001B80
FUN_02001B80: ; 0x02001B80
ldr r3, _02001B88 ; =CopyWindowToVram
ldr r0, [r0, #0xc]
bx r3
nop
_02001B88: .word CopyWindowToVram
thumb_func_start FUN_02001B8C
FUN_02001B8C: ; 0x02001B8C
push {r3-r7, lr}
@@ -41,7 +33,7 @@ FUN_02001B8C: ; 0x02001B8C
ldr r0, [r3, #0x0]
str r0, [r2, #0x0]
ldr r0, [sp, #0x4]
bl FUN_02013690
bl ListMenuCursorNew
str r0, [r4, #0xc]
ldr r0, [sp, #0x24]
str r0, [r4, #0x10]
@@ -57,20 +49,20 @@ FUN_02001B8C: ; 0x02001B8C
strb r6, [r4, #0x17]
strb r7, [r4, #0x18]
ldrb r0, [r5, #0x8]
bl FUN_02002E4C
bl GetFontAttribute
add r6, r0, #0x0
ldrb r0, [r5, #0x8]
mov r1, #0x2
bl FUN_02002E4C
bl GetFontAttribute
add r0, r6, r0
strb r0, [r4, #0x19]
ldrb r0, [r5, #0x8]
mov r1, #0x1
bl FUN_02002E4C
bl GetFontAttribute
add r6, r0, #0x0
ldrb r0, [r5, #0x8]
mov r1, #0x3
bl FUN_02002E4C
bl GetFontAttribute
add r0, r6, r0
strb r0, [r4, #0x1a]
add r0, r4, #0x0
@@ -108,7 +100,7 @@ FUN_02001C34: ; 0x02001C34
add r6, r1, #0x0
add r4, r2, #0x0
mov r1, #0x0
bl FUN_02002E4C
bl GetFontAttribute
add r1, r0, #0x0
str r4, [sp, #0x0]
mov r0, #0x2
@@ -130,10 +122,10 @@ FUN_02001C5C: ; 0x02001C5C
strb r0, [r1, #0x0]
_02001C68:
ldr r0, [r4, #0xc]
bl FUN_020136C0
bl DestroyListMenuCursorObj
ldrb r0, [r4, #0x1c]
add r1, r4, #0x0
bl FUN_02016A8C
bl FreeToHeapExplicit
pop {r4, pc}
thumb_func_start FUN_02001C78
@@ -420,7 +412,7 @@ FUN_02001E64: ; 0x02001E64
_02001E7C:
ldrb r0, [r5, #0x8]
mov r1, #0x6
bl FUN_02002E4C
bl GetFontAttribute
add r1, sp, #0x8
add r7, r0, #0x0
add r0, r5, #0x0
@@ -437,7 +429,7 @@ _02001E7C:
ldrb r2, [r3, #0x1]
ldrb r3, [r3, #0x0]
ldr r0, [r5, #0x4]
bl FUN_020196F4
bl FillWindowPixelRect
add r0, r5, #0x0
bl FUN_02002080
add r0, r6, #0x0
@@ -631,10 +623,10 @@ FUN_02001FF4: ; 0x02001FF4
add r5, r0, #0x0
ldrb r0, [r5, #0x8]
mov r1, #0x6
bl FUN_02002E4C
bl GetFontAttribute
add r1, r0, #0x0
ldr r0, [r5, #0x4]
bl FUN_02019620
bl FillWindowPixelBuffer
ldrb r0, [r5, #0x19]
ldrb r1, [r5, #0x16]
ldrb r7, [r5, #0x17]
@@ -718,7 +710,7 @@ FUN_02002080: ; 0x02002080
ldrb r3, [r3, #0x0]
ldr r0, [r4, #0xc]
ldr r1, [r4, #0x4]
bl FUN_020136F8
bl ListMenuUpdateCursorObj
_020020AA:
add sp, #0x4
pop {r3-r4, pc}
@@ -772,24 +764,24 @@ CreateYesNoMenu: ; 0x020020EC
add r4, r0, #0x0
mov r0, #0x2
add r1, r5, #0x0
bl ListMenu_ctor
bl ListMenuItems_ctor
add r1, r4, #0x0
mov r2, #0x29
mov r3, #0x0
add r6, r0, #0x0
bl ListMenu_ItemFromMsgData ; YES
bl ListMenuItems_AppendFromMsgData ; YES
mov r3, #0x2a
add r2, r3, #0x0
add r0, r6, #0x0
add r1, r4, #0x0
sub r3, #0x2c
bl ListMenu_ItemFromMsgData ; NO
bl ListMenuItems_AppendFromMsgData ; NO
add r0, r4, #0x0
bl DestroyMsgData
add r0, r5, #0x0
mov r1, #0x1
str r6, [sp, #0x14]
bl FUN_02018FF4
bl AllocWindows
add r1, r0, #0x0
str r1, [sp, #0x18]
mov r0, #0x0
@@ -894,9 +886,9 @@ FUN_020021EC: ; 0x020021EC
bl FUN_02019178
ldr r1, [r5, #0x4]
add r0, r4, #0x0
bl FUN_02016A8C
bl FreeToHeapExplicit
ldr r0, [r5, #0x0]
bl ListMenu_dtor
bl ListMenuItems_dtor
add r0, r5, #0x0
mov r1, #0x0
bl FUN_02001C5C
@@ -921,7 +913,7 @@ FUN_02002218: ; 0x02002218
mov r2, #0x0
str r3, [sp, #0x14]
add r3, r2, #0x0
bl FUN_02019658
bl BlitBitmapRectToWindow
add sp, #0x18
pop {r4, pc}
nop
arm9/asm/unk_020023C0.s
+7 -7
View File
@@ -193,7 +193,7 @@ _020024F2:
mov r1, #0x1
strb r0, [r4, #0xc]
ldrb r0, [r4, #0x9]
bl FUN_02002E4C
bl GetFontAttribute
ldrb r1, [r4, #0xf]
ldrb r2, [r4, #0xd]
add sp, #0xc
@@ -500,7 +500,7 @@ _0200275C:
bl FUN_02002A00
ldrb r1, [r4, #0x12]
ldr r0, [r4, #0x4]
bl FUN_02019620
bl FillWindowPixelBuffer
ldrb r0, [r4, #0xa]
strb r0, [r4, #0xc]
ldrb r0, [r4, #0xb]
@@ -520,7 +520,7 @@ _02002786:
bl FUN_02002A00
ldrb r0, [r4, #0x9]
mov r1, #0x1
bl FUN_02002E4C
bl GetFontAttribute
ldrb r1, [r4, #0xf]
add r1, r1, r0
add r0, r4, #0x0
@@ -549,7 +549,7 @@ _020027B6:
ldr r0, [r4, #0x4]
mov r1, #0x0
lsr r3, r3, #0x18
bl FUN_0201A8C8
bl ScrollWindow
mov r1, #0x0
b _020027F2
_020027D8:
@@ -560,7 +560,7 @@ _020027D8:
mov r1, #0x0
mov r2, #0x4
lsr r3, r3, #0x18
bl FUN_0201A8C8
bl ScrollWindow
add r0, r4, #0x0
add r0, #0x27
ldrb r0, [r0, #0x0]
@@ -686,7 +686,7 @@ _020028AC:
bl FUN_0201AB18
str r0, [sp, #0x28]
ldr r0, [r5, #0x4]
bl FUN_0201AB0C
bl GetWindowWidth
ldr r1, _020029F8 ; =gTextFlags
ldrh r6, [r1, #0x2]
ldr r1, [sp, #0x28]
@@ -853,7 +853,7 @@ FUN_02002A00: ; 0x02002A00
bl FUN_0201AB18
add r6, r0, #0x0
ldr r0, [r5, #0x4]
bl FUN_0201AB0C
bl GetWindowWidth
ldr r1, _02002A90 ; =gTextFlags
add r7, r6, #0x2
ldrh r4, [r1, #0x2]
arm9/asm/unk_02002C14.s
+2 -2
View File
@@ -327,8 +327,8 @@ _02002E2E:
.balign 4
_02002E48: .word UNK_02106FC8
thumb_func_start FUN_02002E4C
FUN_02002E4C: ; 0x02002E4C
thumb_func_start GetFontAttribute
GetFontAttribute: ; 0x02002E4C
mov r2, #0x0
cmp r1, #0x7
bhi _02002EAC
arm9/asm/unk_02006864.s
+1 -1
View File
@@ -567,7 +567,7 @@ FUN_02006C88: ; 0x02006C88
thumb_func_start UncompressFromNarc
UncompressFromNarc: ; 0x02006C98
; BOOL UncompressFromNarc(NarcId narcId, s32 memberNo, BOOL a2, u32 heap_id, BOOL a4)
; void * UncompressFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd)
push {r3-r7, lr}
add r5, r2, #0x0
add r7, r0, #0x0
arm9/asm/unk_0200CABC.s
+19 -19
View File
@@ -291,10 +291,10 @@ FUN_0200CCA4: ; 0x0200CCA4
bl FUN_0201AB18
str r0, [sp, #0x18]
add r0, r5, #0x0
bl FUN_0201AB0C
bl GetWindowWidth
str r0, [sp, #0x1c]
add r0, r5, #0x0
bl FUN_0201AB10
bl GetWindowHeight
ldr r1, [sp, #0x1c]
ldr r2, [sp, #0x14]
str r1, [sp, #0x0]
@@ -328,10 +328,10 @@ FUN_0200CCF8: ; 0x0200CCF8
bl FUN_0201AB18
add r7, r0, #0x0
add r0, r5, #0x0
bl FUN_0201AB0C
bl GetWindowWidth
str r0, [sp, #0x14]
add r0, r5, #0x0
bl FUN_0201AB10
bl GetWindowHeight
sub r1, r7, #0x1
lsl r1, r1, #0x18
lsr r1, r1, #0x18
@@ -758,10 +758,10 @@ FUN_0200D06C: ; 0x0200D06C
bl FUN_0201AB18
str r0, [sp, #0x18]
add r0, r5, #0x0
bl FUN_0201AB0C
bl GetWindowWidth
add r7, r0, #0x0
add r0, r5, #0x0
bl FUN_0201AB10
bl GetWindowHeight
str r7, [sp, #0x0]
str r0, [sp, #0x4]
lsl r0, r6, #0x18
@@ -813,10 +813,10 @@ FUN_0200D0E0: ; 0x0200D0E0
bl FUN_0201AB18
add r7, r0, #0x0
add r0, r5, #0x0
bl FUN_0201AB0C
bl GetWindowWidth
str r0, [sp, #0x14]
add r0, r5, #0x0
bl FUN_0201AB10
bl GetWindowHeight
sub r1, r7, #0x1
lsl r1, r1, #0x18
lsr r1, r1, #0x18
@@ -879,7 +879,7 @@ FUN_0200D148: ; 0x0200D148
mov r0, #0x0
str r0, [sp, #0x10]
add r0, sp, #0x1c
bl FUN_02018A60
bl BlitBitmapRect4Bit
add sp, #0x24
pop {r4-r5, pc}
@@ -1098,7 +1098,7 @@ FUN_0200D300: ; 0x0200D300
bl FUN_02017FB4
ldr r1, [sp, #0x14]
add r0, r4, #0x0
bl FUN_02016A8C
bl FreeToHeapExplicit
add r0, sp, #0x20
ldrb r3, [r0, #0x10]
cmp r3, #0x1
@@ -1575,10 +1575,10 @@ FUN_0200D6F8: ; 0x0200D6F8
bl FUN_0201AB18
str r0, [sp, #0x1c]
add r0, r5, #0x0
bl FUN_0201AB0C
bl GetWindowWidth
add r7, r0, #0x0
add r0, r5, #0x0
bl FUN_0201AB10
bl GetWindowHeight
str r7, [sp, #0x0]
str r0, [sp, #0x4]
str r6, [sp, #0x8]
@@ -1604,10 +1604,10 @@ _0200D756:
bl FUN_0201AB18
str r0, [sp, #0x24]
add r0, r5, #0x0
bl FUN_0201AB0C
bl GetWindowWidth
add r7, r0, #0x0
add r0, r5, #0x0
bl FUN_0201AB10
bl GetWindowHeight
str r7, [sp, #0x0]
str r0, [sp, #0x4]
str r6, [sp, #0x8]
@@ -1648,10 +1648,10 @@ FUN_0200D7A0: ; 0x0200D7A0
bl FUN_0201AB18
add r7, r0, #0x0
add r0, r5, #0x0
bl FUN_0201AB0C
bl GetWindowWidth
add r6, r0, #0x0
add r0, r5, #0x0
bl FUN_0201AB10
bl GetWindowHeight
sub r1, r7, #0x1
lsl r1, r1, #0x18
lsr r1, r1, #0x18
@@ -1681,10 +1681,10 @@ _0200D7FE:
bl FUN_0201AB18
add r6, r0, #0x0
add r0, r5, #0x0
bl FUN_0201AB0C
bl GetWindowWidth
add r7, r0, #0x0
add r0, r5, #0x0
bl FUN_0201AB10
bl GetWindowHeight
sub r1, r6, #0x1
lsl r1, r1, #0x18
lsr r1, r1, #0x18
@@ -1863,7 +1863,7 @@ FUN_0200D980: ; 0x0200D980
bl FUN_0201AB18
str r0, [sp, #0x1c]
ldr r0, [r5, #0x0]
bl FUN_0201AB0C
bl GetWindowWidth
str r0, [sp, #0x20]
cmp r6, #0x2
bne _0200DA8A
arm9/asm/unk_02011744.s
+18 -18
View File
@@ -2407,8 +2407,8 @@ _0201282C: .word sMaxDate
_02012830: .word sMaxTime
_02012834: .word 0xBC19137F
thumb_func_start ListMenu_ctor
ListMenu_ctor: ; 0x02012838
thumb_func_start ListMenuItems_ctor
ListMenuItems_ctor: ; 0x02012838
push {r3-r5, lr}
add r5, r0, #0x0
add r4, r1, #0x0
@@ -2440,23 +2440,23 @@ _02012862:
_0201286E:
pop {r3-r5, pc}
thumb_func_start ListMenu_dtor
ListMenu_dtor: ; 0x02012870
thumb_func_start ListMenuItems_dtor
ListMenuItems_dtor: ; 0x02012870
push {r4, lr}
add r4, r0, #0x0
bl ListMenu_DestroyMenuStrings
bl ListMenuItems_DestroyMenuStrings
add r0, r4, #0x0
bl FreeToHeap
pop {r4, pc}
thumb_func_start ListMenu_ItemFromMsgData
ListMenu_ItemFromMsgData: ; 0x02012880
thumb_func_start ListMenuItems_AppendFromMsgData
ListMenuItems_AppendFromMsgData: ; 0x02012880
push {r3-r7, lr}
add r6, r1, #0x0
add r1, sp, #0x0
add r7, r2, #0x0
add r5, r3, #0x0
bl ListMenu_NewItem
bl ListMenuItems_NewItem
add r4, r0, #0x0
beq _0201289E
add r0, r6, #0x0
@@ -2467,14 +2467,14 @@ ListMenu_ItemFromMsgData: ; 0x02012880
_0201289E:
pop {r3-r7, pc}
thumb_func_start ListMenu_AddItem
ListMenu_AddItem: ; 0x020128A0
thumb_func_start ListMenuItems_AddItem
ListMenuItems_AddItem: ; 0x020128A0
push {r3-r6, lr}
sub sp, #0x4
add r6, r1, #0x0
add r1, sp, #0x0
add r5, r2, #0x0
bl ListMenu_NewItem
bl ListMenuItems_NewItem
add r4, r0, #0x0
beq _020128BE
ldr r1, [sp, #0x0]
@@ -2487,13 +2487,13 @@ _020128BE:
pop {r3-r6, pc}
.balign 4
thumb_func_start ListMenu_CopyItem
ListMenu_CopyItem: ; 0x020128C4
thumb_func_start ListMenuItems_CopyItem
ListMenuItems_CopyItem: ; 0x020128C4
push {r3-r4, lr}
sub sp, #0x4
add r4, r1, #0x0
add r1, sp, #0x0
bl ListMenu_NewItem
bl ListMenuItems_NewItem
cmp r0, #0x0
beq _020128DC
ldr r1, [r4, #0x0]
@@ -2504,8 +2504,8 @@ _020128DC:
add sp, #0x4
pop {r3-r4, pc}
thumb_func_start ListMenu_NewItem
ListMenu_NewItem: ; 0x020128E0
thumb_func_start ListMenuItems_NewItem
ListMenuItems_NewItem: ; 0x020128E0
push {r4, lr}
ldr r3, [r0, #0x0]
cmp r3, #0x0
@@ -2541,8 +2541,8 @@ _02012912:
pop {r4, pc}
.balign 4
thumb_func_start ListMenu_DestroyMenuStrings
ListMenu_DestroyMenuStrings: ; 0x0201291C
thumb_func_start ListMenuItems_DestroyMenuStrings
ListMenuItems_DestroyMenuStrings: ; 0x0201291C
push {r4-r6, lr}
add r5, r0, #0x0
mov r0, #0x0
arm9/asm/unk_02012CC8.s
+8 -8
View File
@@ -1488,8 +1488,8 @@ _02013688:
strh r0, [r4, #0x0]
pop {r4, pc}
thumb_func_start FUN_02013690
FUN_02013690: ; 0x02013690
thumb_func_start ListMenuCursorNew
ListMenuCursorNew: ; 0x02013690
push {r3-r5, lr}
mov r1, #0x8
add r5, r0, #0x0
@@ -1511,8 +1511,8 @@ _020136B2:
_020136B8: .word 0x0001020F
_020136BC: .word UNK_020ED548
thumb_func_start FUN_020136C0
FUN_020136C0: ; 0x020136C0
thumb_func_start DestroyListMenuCursorObj
DestroyListMenuCursorObj: ; 0x020136C0
push {r4, lr}
add r4, r0, #0x0
bne _020136CA
@@ -1530,8 +1530,8 @@ _020136D8:
_020136DE:
pop {r4, pc}
thumb_func_start FUN_020136E0
FUN_020136E0: ; 0x020136E0
thumb_func_start ListMenuCursorSetColor
ListMenuCursorSetColor: ; 0x020136E0
push {r3-r5, lr}
add r5, r0, #0x0
add r4, r1, #0x0
@@ -1546,8 +1546,8 @@ _020136F4:
pop {r3-r5, pc}
.balign 4
thumb_func_start FUN_020136F8
FUN_020136F8: ; 0x020136F8
thumb_func_start ListMenuUpdateCursorObj
ListMenuUpdateCursorObj: ; 0x020136F8
push {r4-r6, lr}
sub sp, #0x10
add r6, r0, #0x0
arm9/asm/unk_02016B94.s
+27 -27
View File
@@ -2716,7 +2716,7 @@ FUN_02017F18: ; 0x02017F18
bl FUN_02017E84
ldr r0, [sp, #0x0]
add r1, r4, #0x0
bl FUN_02016A8C
bl FreeToHeapExplicit
pop {r3-r7, pc}
thumb_func_start FUN_02017F48
@@ -4256,8 +4256,8 @@ _02018A54: .word 0x0400100A
_02018A58: .word 0x0400100C
_02018A5C: .word 0x0400100E
thumb_func_start FUN_02018A60
FUN_02018A60: ; 0x02018A60
thumb_func_start BlitBitmapRect4Bit
BlitBitmapRect4Bit: ; 0x02018A60
push {r3-r7, lr}
sub sp, #0x68
str r2, [sp, #0x8]
@@ -4560,8 +4560,8 @@ _02018C92:
_02018C98: .word 0x0000FFFF
_02018C9C: .word 0x00003FE0
thumb_func_start FUN_02018CA0
FUN_02018CA0: ; 0x02018CA0
thumb_func_start BlitBitmapRect8Bit
BlitBitmapRect8Bit: ; 0x02018CA0
push {r3-r7, lr}
sub sp, #0x50
str r2, [sp, #0x8]
@@ -5022,8 +5022,8 @@ _02018FEA:
nop
_02018FF0: .word 0x00007FC0
thumb_func_start FUN_02018FF4
FUN_02018FF4: ; 0x02018FF4
thumb_func_start AllocWindows
AllocWindows: ; 0x02018FF4
push {r4-r6, lr}
add r5, r1, #0x0
lsl r1, r5, #0x4
@@ -5035,7 +5035,7 @@ FUN_02018FF4: ; 0x02018FF4
_02019006:
lsl r0, r4, #0x4
add r0, r6, r0
bl FUN_0201901C
bl InitWindow
add r0, r4, #0x1
lsl r0, r0, #0x10
lsr r4, r0, #0x10
@@ -5045,8 +5045,8 @@ _02019018:
add r0, r6, #0x0
pop {r4-r6, pc}
thumb_func_start FUN_0201901C
FUN_0201901C: ; 0x0201901C
thumb_func_start InitWindow
InitWindow: ; 0x0201901C
mov r3, #0x0
str r3, [r0, #0x0]
mov r1, #0xff
@@ -5886,8 +5886,8 @@ FUN_0201960C: ; 0x0201960C
pop {r4, pc}
.balign 4
thumb_func_start FUN_02019620
FUN_02019620: ; 0x02019620
thumb_func_start FillWindowPixelBuffer
FillWindowPixelBuffer: ; 0x02019620
push {r3-r5, lr}
add r4, r0, #0x0
ldrb r2, [r4, #0x4]
@@ -5917,8 +5917,8 @@ _0201963C:
bl MIi_CpuClearFast
pop {r3-r5, pc}
thumb_func_start FUN_02019658
FUN_02019658: ; 0x02019658
thumb_func_start BlitBitmapRectToWindow
BlitBitmapRectToWindow: ; 0x02019658
push {r4-r5, lr}
sub sp, #0x1c
add r4, sp, #0x18
@@ -5936,13 +5936,13 @@ FUN_02019658: ; 0x02019658
str r4, [sp, #0x14]
mov r4, #0x0
str r4, [sp, #0x18]
bl FUN_02019684
bl BlitBitmapRect
add sp, #0x1c
pop {r4-r5, pc}
.balign 4
thumb_func_start FUN_02019684
FUN_02019684: ; 0x02019684
thumb_func_start BlitBitmapRect
BlitBitmapRect: ; 0x02019684
push {r4-r5, lr}
sub sp, #0x24
str r1, [sp, #0x1c]
@@ -5980,7 +5980,7 @@ FUN_02019684: ; 0x02019684
ldrh r0, [r4, #0x28]
str r0, [sp, #0x10]
add r0, sp, #0x1c
bl FUN_02018A60
bl BlitBitmapRect4Bit
add sp, #0x24
pop {r4-r5, pc}
_020196D6:
@@ -5994,13 +5994,13 @@ _020196D6:
ldrh r0, [r4, #0x28]
str r0, [sp, #0x10]
add r0, sp, #0x1c
bl FUN_02018CA0
bl BlitBitmapRect8Bit
add sp, #0x24
pop {r4-r5, pc}
.balign 4
thumb_func_start FUN_020196F4
FUN_020196F4: ; 0x020196F4
thumb_func_start FillWindowPixelRect
FillWindowPixelRect: ; 0x020196F4
push {r3-r5, lr}
sub sp, #0x10
add r5, r1, #0x0
@@ -8422,8 +8422,8 @@ FUN_0201A8BC: ; 0x0201A8BC
nop
_0201A8C4: .word 0x00007FC0
thumb_func_start FUN_0201A8C8
FUN_0201A8C8: ; 0x0201A8C8
thumb_func_start ScrollWindow
ScrollWindow: ; 0x0201A8C8
push {r4-r6, lr}
ldrb r6, [r0, #0x4]
mov r5, #0x2c
@@ -8752,13 +8752,13 @@ FUN_0201AB08: ; 0x0201AB08
ldrb r0, [r0, #0x4]
bx lr
thumb_func_start FUN_0201AB0C
FUN_0201AB0C: ; 0x0201AB0C
thumb_func_start GetWindowWidth
GetWindowWidth: ; 0x0201AB0C
ldrb r0, [r0, #0x7]
bx lr
thumb_func_start FUN_0201AB10
FUN_0201AB10: ; 0x0201AB10
thumb_func_start GetWindowHeight
GetWindowHeight: ; 0x0201AB10
ldrb r0, [r0, #0x8]
bx lr
arm9/asm/unk_02033F50.s
+1 -1
View File
@@ -198,7 +198,7 @@ _02033FA4:
add r0, sp, #0x18
mov r1, #0xf
add r3, r2, #0x0
bl FUN_020196F4
bl FillWindowPixelRect
ldr r2, _0203417C ; =0x000001F7
add r0, sp, #0x18
mov r1, #0x0
arm9/asm/unk_02034188.s
+1 -1
View File
@@ -138,7 +138,7 @@ FUN_02034188: ; 0x02034188
add r0, sp, #0x14
mov r1, #0xf
add r3, r2, #0x0
bl FUN_020196F4
bl FillWindowPixelRect
ldr r2, _0203438C ; =0x000001F7
add r0, sp, #0x14
mov r1, #0x0
arm9/asm/unk_02035068.s
+11 -11
View File
@@ -639,7 +639,7 @@ FUN_0203549C: ; 0x0203549C
str r0, [sp, #0x18]
ldr r0, [sp, #0x14]
mov r1, #0xb
bl ListMenu_ctor
bl ListMenuItems_ctor
str r0, [r4, #0x24]
mov r5, #0x0
ldr r0, [sp, #0x14]
@@ -684,7 +684,7 @@ _02035526:
ldrb r2, [r2, #0x0]
ldr r0, [r4, #0x24]
add r1, r7, #0x0
bl ListMenu_AddItem
bl ListMenuItems_AddItem
ldr r0, [sp, #0x20]
bl String_dtor
add r0, r7, #0x0
@@ -698,7 +698,7 @@ _02035594:
ldr r0, [r4, #0x24]
ldr r1, [sp, #0x18]
ldr r2, [r2, r6]
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
_020355A2:
ldr r0, [sp, #0x1c]
add r0, #0x8c
@@ -902,7 +902,7 @@ FUN_02035718: ; 0x02035718
mov r1, #0x0
bl FUN_02001C5C
ldr r0, [r4, #0x24]
bl ListMenu_dtor
bl ListMenuItems_dtor
mov r0, #0x0
str r0, [r4, #0x20]
pop {r4, pc}
@@ -966,7 +966,7 @@ _0203576C:
add r0, r5, #0x0
add r0, #0x10
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r2, _0203589C ; =0x00000143
mov r0, #0x0
mov r1, #0x1a
@@ -1731,7 +1731,7 @@ FUN_02035DC8: ; 0x02035DC8
cmp r1, #0x0
beq _02035DF0
mov r0, #0xb
bl FUN_02016A8C
bl FreeToHeapExplicit
_02035DF0:
mov r0, #0xc
strh r0, [r4, #0x2a]
@@ -3193,7 +3193,7 @@ FUN_02036A14: ; 0x02036A14
lsl r1, r1, #0x2
ldr r1, [r4, r1]
mov r0, #0xb
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r1, #0x73
lsl r1, r1, #0x2
add r0, r5, #0x0
@@ -3223,7 +3223,7 @@ FUN_02036A78: ; 0x02036A78
lsl r1, r1, #0x2
ldr r1, [r4, r1]
mov r0, #0xb
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r1, #0x73
lsl r1, r1, #0x2
add r0, r5, #0x0
@@ -3255,7 +3255,7 @@ FUN_02036AB8: ; 0x02036AB8
ldr r1, [r4, r0]
mov r0, #0xb
ldr r7, [r1, #0x0]
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r0, #0x7e
lsl r0, r0, #0x2
ldr r5, [r4, r0]
@@ -3264,7 +3264,7 @@ FUN_02036AB8: ; 0x02036AB8
bne _02036B0E
mov r0, #0xb
add r1, r5, #0x0
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r1, #0x7a
lsl r1, r1, #0x2
lsl r2, r7, #0x18
@@ -3320,7 +3320,7 @@ _02036B0E:
lsl r1, r1, #0x2
ldr r1, [r4, r1]
mov r0, #0xb
bl FUN_02016A8C
bl FreeToHeapExplicit
add r0, r6, #0x0
bl FUN_0204649C
mov r0, #0x72
arm9/asm/unk_02048120.s
+2 -2
View File
@@ -209,7 +209,7 @@ _02048298:
add r0, r4, #0x0
add r0, #0xc
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@@ -263,7 +263,7 @@ FUN_020482F4: ; 0x020482F4
add r0, r5, #0x0
add r0, #0xc
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r5, #0x1c]
ldr r1, [sp, #0x10]
add r2, r6, #0x0
arm9/asm/unk_020484A8.s
+1 -1
View File
@@ -343,7 +343,7 @@ FUN_02048764: ; 0x02048764
str r0, [r1, #0x30]
add r1, #0x1c
add r0, r1, #0x0
bl FUN_0201901C
bl InitWindow
ldr r0, _020487D4 ; =UNK_020F46B0
bl GX_SetBanks
ldr r2, _020487D8 ; =0x04000304
arm9/asm/unk_02050E48.s
+16 -16
View File
@@ -1255,7 +1255,7 @@ _02051836:
bl FUN_02019178
add r0, r5, #0x0
add r0, #0x14
bl FUN_0201901C
bl InitWindow
_02051846:
add r0, r5, #0x0
add r0, #0x54
@@ -1267,7 +1267,7 @@ _02051846:
bl FUN_02019178
add r0, r5, #0x0
add r0, #0x54
bl FUN_0201901C
bl InitWindow
_02051862:
add r0, r5, #0x0
add r0, #0x64
@@ -1279,7 +1279,7 @@ _02051862:
bl FUN_02019178
add r5, #0x64
add r0, r5, #0x0
bl FUN_0201901C
bl InitWindow
_0205187E:
pop {r3-r5, pc}
@@ -1325,15 +1325,15 @@ _0205188E:
str r0, [r4, #0x10]
add r0, r4, #0x0
add r0, #0x14
bl FUN_0201901C
bl InitWindow
add r0, r4, #0x0
add r0, #0x54
bl FUN_0201901C
bl InitWindow
add r0, r4, #0x0
add r0, #0x64
bl FUN_0201901C
bl InitWindow
mov r0, #0xb
bl FUN_02013690
bl ListMenuCursorNew
str r0, [r4, #0x78]
bl FUN_02033534
add r1, r4, #0x0
@@ -1442,7 +1442,7 @@ _020519BA:
ldr r0, [r4, #0x10]
bl String_dtor
ldr r0, [r4, #0x78]
bl FUN_020136C0
bl DestroyListMenuCursorObj
add r0, r4, #0x0
mov r1, #0x1
bl FUN_02051810
@@ -1711,7 +1711,7 @@ FUN_02051B68: ; 0x02051B68
bl FUN_0200CB00
ldr r0, [sp, #0x20]
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r7, #0x0
add r6, r7, #0x0
add r4, r7, #0x0
@@ -1769,14 +1769,14 @@ _02051C34:
lsr r0, r0, #0x10
str r0, [sp, #0x4]
ldr r0, [sp, #0x20]
bl FUN_020196F4
bl FillWindowPixelRect
ldr r3, [sp, #0x14]
add r1, r5, #0x0
ldr r0, [r5, #0x78]
add r1, #0x54
mov r2, #0x0
lsl r3, r3, #0x4
bl FUN_020136F8
bl ListMenuUpdateCursorObj
add r0, r5, #0x0
add r0, #0x54
mov r1, #0x0
@@ -1837,7 +1837,7 @@ FUN_02051C88: ; 0x02051C88
bl FUN_0200CB00
add r0, r7, #0x0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r6, #0x0
add r4, r6, #0x0
_02051CE0:
@@ -1880,13 +1880,13 @@ _02051D0A:
str r0, [sp, #0x4]
add r0, r7, #0x0
add r3, r2, #0x0
bl FUN_020196F4
bl FillWindowPixelRect
ldr r3, [sp, #0x14]
ldr r0, [r5, #0x78]
ldr r1, [r5, #0x7c]
mov r2, #0x0
lsl r3, r3, #0x4
bl FUN_020136F8
bl ListMenuUpdateCursorObj
ldr r0, [r5, #0x7c]
mov r1, #0x0
mov r2, #0x1
@@ -1987,14 +1987,14 @@ _02051DE0:
lsr r1, r1, #0x10
str r1, [sp, #0x4]
mov r1, #0xf
bl FUN_020196F4
bl FillWindowPixelRect
mov r3, #0x81
ldrsb r3, [r4, r3]
ldr r0, [r4, #0x78]
ldr r1, [r4, #0x7c]
mov r2, #0x0
lsl r3, r3, #0x4
bl FUN_020136F8
bl ListMenuUpdateCursorObj
ldr r0, [r4, #0x7c]
bl FUN_02019548
mov r0, #0x0
arm9/asm/unk_02053750.s
+6 -6
View File
@@ -1291,7 +1291,7 @@ FUN_020540C8: ; 0x020540C8
bl FUN_0201FFC8
ldr r1, [r4, #0x0]
mov r0, #0x4
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r0, #0x0
str r0, [r4, #0x0]
_020540E4:
@@ -1408,7 +1408,7 @@ FUN_020541A4: ; 0x020541A4
bl FUN_0201FFC8
ldr r1, [r4, #0x0]
mov r0, #0x4
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r0, #0x0
str r0, [r4, #0x0]
_020541C0:
@@ -1481,7 +1481,7 @@ FUN_02054228: ; 0x02054228
bl FUN_0201FFC8
ldr r1, [r4, #0x0]
mov r0, #0x4
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r0, #0x0
str r0, [r4, #0x0]
_02054244:
@@ -1581,7 +1581,7 @@ FUN_020542E8: ; 0x020542E8
bl FUN_0201FFC8
ldr r1, [r4, #0x0]
mov r0, #0x4
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r0, #0x0
str r0, [r4, #0x0]
_02054304:
@@ -1749,7 +1749,7 @@ FUN_0205442C: ; 0x0205442C
bl FUN_0201FFC8
ldr r1, [r4, #0x0]
mov r0, #0x4
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r0, #0x0
str r0, [r4, #0x0]
_02054448:
@@ -1900,7 +1900,7 @@ FUN_0205454C: ; 0x0205454C
bl FUN_0201FFC8
ldr r1, [r4, #0x0]
mov r0, #0x4
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r0, #0x0
str r0, [r4, #0x0]
_02054568:
arm9/asm/unk_02057380.s
+4 -4
View File
@@ -33,10 +33,10 @@ FUN_020573AC: ; 0x020573AC
bl FUN_020583CC
add r1, r0, #0x0
mov r0, #0xb
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r0, #0xb
add r1, r4, #0x0
bl FUN_02016A8C
bl FreeToHeapExplicit
pop {r4, pc}
.balign 4
@@ -1035,10 +1035,10 @@ _02057C42:
blt _02057C1A
ldr r1, [r5, #0x10]
mov r0, #0xb
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r0, #0xb
add r1, r5, #0x0
bl FUN_02016A8C
bl FreeToHeapExplicit
pop {r3-r7, pc}
thumb_func_start FUN_02057C64
arm9/asm/unk_0205AD98.s
+1 -1
View File
@@ -212,7 +212,7 @@ _0205AF14:
bl FUN_0205AE50
mov r0, #0x4
add r1, r4, #0x0
bl FUN_02016A8C
bl FreeToHeapExplicit
add r0, r5, #0x0
bl FUN_0200CAB4
pop {r3-r5, pc}
arm9/asm/unk_0205C598.s
+1 -1
View File
@@ -723,7 +723,7 @@ FUN_0205CAE0: ; 0x0205CAE0
bl FUN_0201B6C8
add r1, r0, #0x0
mov r0, #0x4
bl FUN_02016A8C
bl FreeToHeapExplicit
add r0, r4, #0x0
bl FUN_0200CAB4
pop {r4, pc}
arm9/asm/unk_020625EC.s
+19 -19
View File
@@ -246,7 +246,7 @@ FUN_02062770: ; 0x02062770
add r4, r0, #0x0
add r0, #0xc0
ldr r0, [r0, #0x0]
bl FUN_02001204
bl ListMenu_ProcessInput
ldr r1, _020627C8 ; =gMain
ldr r3, [r1, #0x48]
mov r1, #0x2
@@ -467,7 +467,7 @@ _0206290C:
_02062912:
add r0, #0xe4
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
mov r3, #0x0
str r3, [sp, #0x0]
ldrh r0, [r4, #0x1a]
@@ -578,7 +578,7 @@ FUN_020629D8: ; 0x020629D8
_020629EE:
add r0, #0xe4
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
mov r3, #0x0
str r3, [sp, #0x0]
ldrh r0, [r4, #0x1a]
@@ -1173,7 +1173,7 @@ FUN_02062DB0: ; 0x02062DB0
add r4, #0xe4
add r0, r4, #0x0
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
add sp, #0x14
pop {r3-r4, pc}
.balign 4
@@ -1361,7 +1361,7 @@ FUN_02063028: ; 0x02063028
ldr r1, [r5, #0x0]
add r7, r0, #0x1
add r0, r7, #0x0
bl ListMenu_ctor
bl ListMenuItems_ctor
add r1, r5, #0x0
add r1, #0xc4
str r0, [r1, #0x0]
@@ -1385,7 +1385,7 @@ FUN_02063028: ; 0x02063028
add r0, r5, #0x0
add r0, #0xd4
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
ldrb r0, [r5, #0x18]
mov r6, #0x0
cmp r0, #0x0
@@ -1397,7 +1397,7 @@ _0206307C:
ldr r0, [r0, #0x0]
ldr r1, [r4, #0x64]
add r2, r6, #0x0
bl ListMenu_AddItem
bl ListMenuItems_AddItem
ldrb r0, [r5, #0x18]
add r6, r6, #0x1
add r4, r4, #0x4
@@ -1409,7 +1409,7 @@ _02063094:
ldr r0, [r0, #0x0]
ldr r1, [r5, #0x38]
ldr r2, _02063160 ; =0x0000FFFF
bl ListMenu_AddItem
bl ListMenuItems_AddItem
add r1, r5, #0x0
ldr r0, _02063164 ; =UNK_020F7C2C
add r1, #0xa0
@@ -1455,7 +1455,7 @@ _02063094:
ldr r2, [sp, #0x18]
add r0, #0xa0
lsr r3, r3, #0x18
bl FUN_020010A8
bl ListMenuInit
add r1, r5, #0x0
add r1, #0xc0
str r0, [r1, #0x0]
@@ -1474,7 +1474,7 @@ _02063094:
add r0, r5, #0x0
add r0, #0xe4
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
mov r3, #0x0
str r3, [sp, #0x0]
ldr r0, _02063174 ; =0x0001020F
@@ -1515,11 +1515,11 @@ FUN_02063178: ; 0x02063178
ldr r0, [r0, #0x0]
add r1, #0x22
add r2, #0x24
bl FUN_02001300
bl DestroyListMenu
add r0, r4, #0x0
add r0, #0xc4
ldr r0, [r0, #0x0]
bl ListMenu_dtor
bl ListMenuItems_dtor
add r0, r4, #0x0
add r0, #0xd4
bl FUN_02019570
@@ -1546,16 +1546,16 @@ FUN_020631C8: ; 0x020631C8
push {r3-r5, lr}
mov r1, #0x13
add r5, r0, #0x0
bl FUN_02001470
bl ListMenuGetTemplateField
add r1, sp, #0x0
add r4, r0, #0x0
add r0, r5, #0x0
add r1, #0x2
add r2, sp, #0x0
bl FUN_02001448
bl ListMenuGetScrollAndRow
add r0, r5, #0x0
mov r1, #0x2
bl FUN_02001470
bl ListMenuGetTemplateField
add r2, sp, #0x0
ldrh r3, [r2, #0x0]
ldrh r2, [r2, #0x2]
@@ -1579,7 +1579,7 @@ FUN_02063208: ; 0x02063208
add r4, r0, #0x0
add r0, #0xe4
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
mov r3, #0x0
str r3, [sp, #0x0]
ldr r0, _02063234 ; =0x0001020F
@@ -1626,7 +1626,7 @@ FUN_02063264: ; 0x02063264
add r4, r0, #0x0
add r0, #0xe4
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
mov r3, #0x0
str r3, [sp, #0x0]
ldr r0, _020632A0 ; =0x0001020F
@@ -1675,7 +1675,7 @@ FUN_020632A4: ; 0x020632A4
add r0, r4, #0x0
add r0, #0xd4
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x1
str r0, [sp, #0x1c]
mov r0, #0x0
@@ -1901,7 +1901,7 @@ FUN_02063430: ; 0x02063430
add r0, r4, #0x0
add r0, #0xf4
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0x0
str r1, [sp, #0x0]
ldr r0, _020634D8 ; =0x00010200
arm9/asm/unk_020643C0.s
+4 -4
View File
@@ -292,12 +292,12 @@ _020645F2:
thumb_func_start FUN_02064600
FUN_02064600: ; 0x02064600
ldr r3, _02064608 ; =FUN_02016A8C
ldr r3, _02064608 ; =FreeToHeapExplicit
add r1, r0, #0x0
ldr r0, [r1, #0x8]
bx r3
.balign 4
_02064608: .word FUN_02016A8C
_02064608: .word FreeToHeapExplicit
thumb_func_start FUN_0206460C
FUN_0206460C: ; 0x0206460C
@@ -320,13 +320,13 @@ _02064622:
thumb_func_start FUN_02064630
FUN_02064630: ; 0x02064630
ldr r3, _0206463C ; =FUN_02016A8C
ldr r3, _0206463C ; =FreeToHeapExplicit
add r1, r0, #0x0
ldr r0, [r1, #0x8]
ldr r1, [r1, #0xc]
bx r3
nop
_0206463C: .word FUN_02016A8C
_0206463C: .word FreeToHeapExplicit
thumb_func_start FUN_02064640
FUN_02064640: ; 0x02064640
arm9/asm/unk_020653EC.s
+25 -25
View File
@@ -146,7 +146,7 @@ FUN_020654D0: ; 0x020654D0
add r5, r1, #0x0
lsl r0, r0, #0x4
ldr r0, [r5, r0]
bl FUN_02001204
bl ListMenu_ProcessInput
add r4, r0, #0x0
mov r0, #0x69
lsl r0, r0, #0x2
@@ -256,7 +256,7 @@ FUN_020655B0: ; 0x020655B0
add r4, r1, #0x0
lsl r0, r0, #0x4
ldr r0, [r4, r0]
bl FUN_02001204
bl ListMenu_ProcessInput
add r5, r0, #0x0
ldr r0, _02065638 ; =gMain
mov r1, #0x2
@@ -967,16 +967,16 @@ FUN_02065AF4: ; 0x02065AF4
lsl r0, r0, #0x2
add r0, r5, r0
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x65
lsl r0, r0, #0x2
add r0, r5, r0
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
ldrb r0, [r5, #0x1b]
ldr r1, [r5, #0x0]
add r0, r0, #0x1
bl ListMenu_ctor
bl ListMenuItems_ctor
mov r1, #0x59
lsl r1, r1, #0x2
add r7, r5, #0x0
@@ -995,7 +995,7 @@ _02065B7E:
ldr r1, [r2, #0x8]
ldrb r2, [r2, #0x0]
ldr r0, [r5, r0]
bl ListMenu_AddItem
bl ListMenuItems_AddItem
add r0, r6, #0x1
lsl r0, r0, #0x18
lsr r6, r0, #0x18
@@ -1011,7 +1011,7 @@ _02065B9E:
sub r1, #0x4c
ldr r1, [r5, r1]
ldr r2, _02065CE0 ; =0x0000FFFF
bl ListMenu_AddItem
bl ListMenuItems_AddItem
add r0, r6, #0x1
lsl r0, r0, #0x18
mov r1, #0x5
@@ -1110,7 +1110,7 @@ _02065C64:
lsl r3, r3, #0x18
ldrh r2, [r5, r2]
lsr r3, r3, #0x18
bl FUN_020010A8
bl ListMenuInit
mov r1, #0x16
lsl r1, r1, #0x4
str r0, [r5, r1]
@@ -1169,7 +1169,7 @@ FUN_02065CFC: ; 0x02065CFC
add r4, r1, #0x0
mov r1, #0x13
add r5, r0, #0x0
bl FUN_02001470
bl ListMenuGetTemplateField
ldr r1, _02065D48 ; =0x0000FFFF
cmp r4, r1
bne _02065D1C
@@ -1177,7 +1177,7 @@ FUN_02065CFC: ; 0x02065CFC
mov r1, #0x1
mov r2, #0xf
mov r3, #0x2
bl FUN_020013E8
bl ListMenuOverrideSetColors
pop {r3-r5, pc}
_02065D1C:
mov r1, #0xc
@@ -1191,14 +1191,14 @@ _02065D1C:
mov r1, #0x3
mov r2, #0xf
mov r3, #0x4
bl FUN_020013E8
bl ListMenuOverrideSetColors
pop {r3-r5, pc}
_02065D38:
add r0, r5, #0x0
mov r1, #0x7
mov r2, #0xf
mov r3, #0x8
bl FUN_020013E8
bl ListMenuOverrideSetColors
pop {r3-r5, pc}
nop
_02065D48: .word 0x0000FFFF
@@ -1210,16 +1210,16 @@ FUN_02065D4C: ; 0x02065D4C
mov r1, #0x13
add r4, r0, #0x0
add r6, r2, #0x0
bl FUN_02001470
bl ListMenuGetTemplateField
add r1, sp, #0x0
add r5, r0, #0x0
add r0, r4, #0x0
add r1, #0x2
add r2, sp, #0x0
bl FUN_02001448
bl ListMenuGetScrollAndRow
add r0, r4, #0x0
mov r1, #0x2
bl FUN_02001470
bl ListMenuGetTemplateField
lsl r0, r0, #0x10
lsr r4, r0, #0x10
cmp r6, #0x0
@@ -1280,7 +1280,7 @@ FUN_02065DD8: ; 0x02065DD8
str r2, [sp, #0x4]
ldr r1, [r5, #0x0]
mov r0, #0x4
bl ListMenu_ctor
bl ListMenuItems_ctor
mov r1, #0x59
lsl r1, r1, #0x2
str r0, [r5, r1]
@@ -1295,7 +1295,7 @@ FUN_02065DD8: ; 0x02065DD8
lsl r0, r0, #0x2
add r0, r5, r0
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
mov r7, #0x43
ldr r6, _02065ECC ; =UNK_020F7EAC
mov r4, #0x0
@@ -1309,7 +1309,7 @@ _02065E14:
ldr r1, [r5, r7]
ldr r2, [r6, r2]
ldr r3, [r3, #0x4]
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
add r0, r4, #0x1
lsl r0, r0, #0x18
lsr r4, r0, #0x18
@@ -1362,7 +1362,7 @@ _02065E14:
ldr r2, [sp, #0x4]
add r0, r5, r0
lsr r3, r3, #0x18
bl FUN_020010A8
bl ListMenuInit
mov r1, #0x16
lsl r1, r1, #0x4
str r0, [r5, r1]
@@ -1418,11 +1418,11 @@ FUN_02065EF8: ; 0x02065EF8
ldr r0, [r4, r0]
add r1, #0x2
add r2, sp, #0x0
bl FUN_02001300
bl DestroyListMenu
mov r0, #0x59
lsl r0, r0, #0x2
ldr r0, [r4, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
mov r0, #0x65
lsl r0, r0, #0x2
add r0, r4, r0
@@ -1495,11 +1495,11 @@ FUN_02065F8C: ; 0x02065F8C
ldr r0, [r4, r0]
add r1, #0x2
add r2, sp, #0x0
bl FUN_02001300
bl DestroyListMenu
mov r0, #0x59
lsl r0, r0, #0x2
ldr r0, [r4, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
mov r0, #0x5d
lsl r0, r0, #0x2
add r0, r4, r0
@@ -2006,7 +2006,7 @@ FUN_02066334: ; 0x02066334
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
add sp, #0x14
pop {r3-r4, pc}
.balign 4
@@ -2066,7 +2066,7 @@ _02066426:
add r0, r5, r1
mov r1, #0xff
add r3, r2, #0x0
bl FUN_020196F4
bl FillWindowPixelRect
mov r0, #0x1
bl FUN_02002B60
mov r0, #0x0
arm9/asm/unk_0206C700.s
+3 -3
View File
@@ -117,7 +117,7 @@ FUN_0206C700: ; 0x0206C700
str r0, [r4, #0x0]
add r0, r5, #0x0
mov r1, #0x1
bl FUN_02018FF4
bl AllocWindows
str r0, [r4, #0x4]
ldr r0, [sp, #0x18]
str r0, [r4, #0x2c]
@@ -147,7 +147,7 @@ FUN_0206C700: ; 0x0206C700
bl FUN_02019064
ldr r0, [r4, #0x4]
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #0x4]
mov r1, #0x0
mov r2, #0x1
@@ -2673,7 +2673,7 @@ FUN_0206DD6C: ; 0x0206DD6C
bl FreeToHeap
ldr r0, [r4, #0x4]
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #0x2c]
bl Options_GetTextFrameDelay
mov r3, #0x0
arm9/asm/unk_0206F3FC.s
+8 -8
View File
@@ -781,7 +781,7 @@ _0206F914:
bl FUN_02001C5C
ldr r0, _0206F978 ; =0x000006F8
ldr r0, [r4, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
add r0, r4, #0x0
mov r1, #0x1d
mov r2, #0x1
@@ -1237,7 +1237,7 @@ FUN_0206FCD4: ; 0x0206FCD4
bl FUN_020178A0
mov r0, #0xc
add r1, r4, #0x0
bl FUN_02016A8C
bl FreeToHeapExplicit
pop {r4, pc}
.balign 4
@@ -1293,7 +1293,7 @@ FUN_0206FD24: ; 0x0206FD24
bl memcpy
mov r0, #0xc
add r1, r4, #0x0
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r1, #0x1a
mov r0, #0x0
lsl r1, r1, #0x4
@@ -3729,7 +3729,7 @@ _02071146:
bl FUN_02072844
mov r0, #0xc
add r1, r4, #0x0
bl FUN_02016A8C
bl FreeToHeapExplicit
add r0, r5, #0x0
bl FUN_0207295C
mov r1, #0x0
@@ -5223,7 +5223,7 @@ FUN_02071CB4: ; 0x02071CB4
lsl r1, r1, #0x4
add r0, r0, r1
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0x0
add r1, r6, #0x0
bl FUN_02072B7C
@@ -5645,7 +5645,7 @@ _02072054:
bl FUN_0200D0BC
add r0, r5, r7
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0x0
bl FUN_0207322C
add r0, r4, #0x0
@@ -5902,7 +5902,7 @@ _02072282:
lsl r0, r0, #0x2
add r0, r5, r0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0x0
bl FUN_0207322C
mov r0, #0xb
@@ -6066,7 +6066,7 @@ _020723D6:
lsl r0, r0, #0x2
add r0, r5, r0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0x0
bl FUN_0207322C
ldr r0, _02072410 ; =0x000005A4
arm9/asm/unk_02072548.s
+29 -29
View File
@@ -453,7 +453,7 @@ FUN_02072844: ; 0x02072844
bl FUN_02019064
ldr r0, [sp, #0x14]
mov r1, #0xc
bl ListMenu_ctor
bl ListMenuItems_ctor
ldr r1, _0207294C ; =0x000006F8
mov r6, #0x0
str r0, [r5, r1]
@@ -473,7 +473,7 @@ _02072890:
ldr r1, _02072950 ; =0x000006E8
ldr r0, [r5, r0]
ldr r1, [r3, r1]
bl ListMenu_AddItem
bl ListMenuItems_AddItem
add r0, r6, #0x1
lsl r0, r0, #0x10
lsr r6, r0, #0x10
@@ -488,7 +488,7 @@ _020728B4:
ldr r1, _02072954 ; =0x000006AC
ldr r0, [r5, r0]
ldr r1, [r3, r1]
bl ListMenu_AddItem
bl ListMenuItems_AddItem
_020728CC:
add r0, r4, #0x1
lsl r0, r0, #0x10
@@ -870,7 +870,7 @@ FUN_02072BBC: ; 0x02072BBC
add r0, r5, r4
mov r2, #0x4
add r3, r1, #0x0
bl FUN_020196F4
bl FillWindowPixelRect
add r0, r5, r4
bl FUN_02019220
add sp, #0x8
@@ -1000,7 +1000,7 @@ _02072CBE:
mov r1, #0xa
mov r2, #0x0
mov r3, #0x2
bl FUN_020196F4
bl FillWindowPixelRect
str r5, [sp, #0x0]
mov r0, #0x2
str r0, [sp, #0x4]
@@ -1008,7 +1008,7 @@ _02072CBE:
mov r1, #0x9
mov r2, #0x0
mov r3, #0x3
bl FUN_020196F4
bl FillWindowPixelRect
str r5, [sp, #0x0]
mov r0, #0x1
str r0, [sp, #0x4]
@@ -1016,7 +1016,7 @@ _02072CBE:
mov r1, #0xa
mov r2, #0x0
mov r3, #0x5
bl FUN_020196F4
bl FillWindowPixelRect
add r0, r4, #0x0
bl FUN_02019220
add sp, #0xc
@@ -1042,14 +1042,14 @@ FUN_02072D1C: ; 0x02072D1C
str r0, [sp, #0x4]
add r0, r1, r0
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0x1
lsl r0, r0, #0x4
add r7, r5, #0x4
str r0, [sp, #0x8]
add r0, r7, r0
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r7, #0x0
str r0, [sp, #0xc]
add r0, r4, #0x2
@@ -1058,7 +1058,7 @@ FUN_02072D1C: ; 0x02072D1C
str r0, [sp, #0x10]
add r0, r1, r0
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r7, #0x0
str r0, [sp, #0x14]
add r0, r4, #0x3
@@ -1066,7 +1066,7 @@ FUN_02072D1C: ; 0x02072D1C
ldr r0, [sp, #0x14]
mov r1, #0x0
add r0, r0, r4
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0x0
add r1, r6, #0x0
bl FUN_02072A54
@@ -1179,13 +1179,13 @@ FUN_02072E4C: ; 0x02072E4C
lsl r0, r6, #0x4
add r0, r1, r0
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r6, #0x1
add r1, r5, #0x4
lsl r0, r0, #0x4
add r0, r1, r0
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0x0
add r1, r4, #0x0
bl FUN_02072A54
@@ -1249,13 +1249,13 @@ FUN_02072EE4: ; 0x02072EE4
lsl r0, r6, #0x4
add r0, r1, r0
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r6, #0x1
add r1, r5, #0x4
lsl r0, r0, #0x4
add r0, r1, r0
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0x0
add r1, r4, #0x0
bl FUN_02072A54
@@ -1319,13 +1319,13 @@ FUN_02072F78: ; 0x02072F78
lsl r0, r6, #0x4
add r0, r1, r0
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r6, #0x1
add r1, r5, #0x4
lsl r0, r0, #0x4
add r0, r1, r0
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0x0
add r1, r4, #0x0
bl FUN_02072A54
@@ -1367,13 +1367,13 @@ FUN_02072FDC: ; 0x02072FDC
lsl r0, r6, #0x4
add r0, r1, r0
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r6, #0x1
add r1, r5, #0x4
lsl r0, r0, #0x4
add r0, r1, r0
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0x0
add r1, r4, #0x0
bl FUN_02072A54
@@ -1463,12 +1463,12 @@ FUN_02073094: ; 0x02073094
add r4, r1, #0x0
add r0, r5, r0
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x7d
lsl r0, r0, #0x2
add r0, r5, r0
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x1
tst r0, r4
beq _020730FE
@@ -1563,7 +1563,7 @@ FUN_02073160: ; 0x02073160
_0207317A:
add r0, r4, #0x0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x0
mvn r0, r0
cmp r6, r0
@@ -1634,7 +1634,7 @@ FUN_020731E8: ; 0x020731E8
_02073202:
add r0, r5, r6
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x0
mvn r0, r0
cmp r4, r0
@@ -1763,7 +1763,7 @@ FUN_020732F4: ; 0x020732F4
add r0, r4, r6
mov r1, #0x0
add r7, r2, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
cmp r7, #0x0
beq _02073318
cmp r7, #0x1
@@ -1817,7 +1817,7 @@ FUN_02073364: ; 0x02073364
add r0, r4, r7
mov r1, #0x0
add r6, r2, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
cmp r6, #0x0
beq _0207338C
cmp r6, #0x1
@@ -1880,7 +1880,7 @@ FUN_020733E4: ; 0x020733E4
add r0, r4, r6
mov r1, #0x0
add r7, r2, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
cmp r7, #0x0
ldr r0, _02073440 ; =0x0000069C
bne _0207340E
@@ -1928,7 +1928,7 @@ FUN_02073448: ; 0x02073448
add r0, r4, r7
mov r1, #0x0
add r6, r2, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
cmp r6, #0x6
ldr r0, _020734B8 ; =0x0000069C
bhs _02073476
@@ -2046,7 +2046,7 @@ FUN_020734C0: ; 0x020734C0
lsl r0, r0, #0x2
add r0, r5, r0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r4, #0x0
str r4, [sp, #0x14]
add r7, r5, #0x0
@@ -2158,7 +2158,7 @@ FUN_0207363C: ; 0x0207363C
mov r1, #0xf
mov r2, #0x50
mov r3, #0x0
bl FUN_020196F4
bl FillWindowPixelRect
ldr r0, _020736E8 ; =0x0000069C
mov r1, #0xc0
ldr r0, [r5, r0]
arm9/asm/unk_02073DA8.s
+19 -19
View File
@@ -46,7 +46,7 @@ FUN_02073DB4: ; 0x02073DB4
bl FUN_02001C5C
ldr r0, _02073DF0 ; =0x000006F8
ldr r0, [r4, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
mov r0, #0x95
lsl r0, r0, #0x2
add r0, r4, r0
@@ -69,7 +69,7 @@ FUN_02073DF4: ; 0x02073DF4
bl FUN_020731D4
mov r0, #0x3
mov r1, #0xc
bl ListMenu_ctor
bl ListMenuItems_ctor
ldr r1, _02073EB0 ; =0x000006F8
str r0, [r5, r1]
mov r0, #0x3
@@ -79,7 +79,7 @@ FUN_02073DF4: ; 0x02073DF4
ldr r0, [r5, r1]
sub r1, #0x40
ldr r1, [r5, r1]
bl ListMenu_AddItem
bl ListMenuItems_AddItem
mov r0, #0x4
bl FUN_02073DA8
ldr r1, _02073EB0 ; =0x000006F8
@@ -87,7 +87,7 @@ FUN_02073DF4: ; 0x02073DF4
ldr r0, [r5, r1]
sub r1, #0x3c
ldr r1, [r5, r1]
bl ListMenu_AddItem
bl ListMenuItems_AddItem
mov r0, #0x9
bl FUN_02073DA8
ldr r1, _02073EB0 ; =0x000006F8
@@ -95,7 +95,7 @@ FUN_02073DF4: ; 0x02073DF4
ldr r0, [r5, r1]
sub r1, #0x28
ldr r1, [r5, r1]
bl ListMenu_AddItem
bl ListMenuItems_AddItem
ldr r0, _02073EB0 ; =0x000006F8
mov r1, #0x0
ldr r0, [r5, r0]
@@ -155,7 +155,7 @@ FUN_02073EB8: ; 0x02073EB8
bl FUN_02001C5C
ldr r0, _02073EE4 ; =0x000006F8
ldr r0, [r5, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
ldr r0, _02073EE8 ; =0x000005A4
mov r1, #0x3
ldr r0, [r5, r0]
@@ -186,7 +186,7 @@ FUN_02073EEC: ; 0x02073EEC
bl FUN_02001C5C
ldr r0, _02074048 ; =0x000006F8
ldr r0, [r5, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
ldr r0, _0207404C ; =0x00000B25
ldrb r1, [r5, r0]
mov r0, #0x2c
@@ -316,7 +316,7 @@ _02074018:
lsl r0, r0, #0x2
add r0, r5, r0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0x0
bl FUN_0207322C
mov r0, #0xf
@@ -381,7 +381,7 @@ FUN_020740AC: ; 0x020740AC
bl FUN_020731D4
mov r0, #0x3
mov r1, #0xc
bl ListMenu_ctor
bl ListMenuItems_ctor
ldr r1, _02074168 ; =0x000006F8
str r0, [r5, r1]
mov r0, #0x6
@@ -391,7 +391,7 @@ FUN_020740AC: ; 0x020740AC
ldr r0, [r5, r1]
sub r1, #0x34
ldr r1, [r5, r1]
bl ListMenu_AddItem
bl ListMenuItems_AddItem
mov r0, #0x7
bl FUN_02073DA8
ldr r1, _02074168 ; =0x000006F8
@@ -399,7 +399,7 @@ FUN_020740AC: ; 0x020740AC
ldr r0, [r5, r1]
sub r1, #0x30
ldr r1, [r5, r1]
bl ListMenu_AddItem
bl ListMenuItems_AddItem
mov r0, #0x9
bl FUN_02073DA8
ldr r1, _02074168 ; =0x000006F8
@@ -407,7 +407,7 @@ FUN_020740AC: ; 0x020740AC
ldr r0, [r5, r1]
sub r1, #0x28
ldr r1, [r5, r1]
bl ListMenu_AddItem
bl ListMenuItems_AddItem
ldr r0, _02074168 ; =0x000006F8
mov r1, #0x0
ldr r0, [r5, r0]
@@ -467,7 +467,7 @@ FUN_02074170: ; 0x02074170
bl FUN_02001C5C
ldr r0, _0207419C ; =0x000006F8
ldr r0, [r5, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
ldr r0, _020741A0 ; =0x000005A4
mov r1, #0x7
ldr r0, [r5, r0]
@@ -497,7 +497,7 @@ FUN_020741A4: ; 0x020741A4
bl FUN_02001C5C
ldr r0, _020741F0 ; =0x000006F8
ldr r0, [r5, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
add r0, r5, #0x0
mov r1, #0x2b
mov r2, #0x1
@@ -744,7 +744,7 @@ FUN_020743AC: ; 0x020743AC
bl FUN_02001C5C
ldr r0, _02074414 ; =0x000006F8
ldr r0, [r5, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
ldr r0, _02074418 ; =0x000005A4
mov r1, #0x0
ldr r0, [r5, r0]
@@ -1672,7 +1672,7 @@ _02074B6A:
add r1, r7, #0x0
str r0, [r3, #0x0]
mov r0, #0xc
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r1, #0x3
lsl r1, r1, #0x8
ldrb r3, [r4, r1]
@@ -2324,7 +2324,7 @@ FUN_02075090: ; 0x02075090
bl FUN_02001C5C
ldr r0, _020750C0 ; =0x000006F8
ldr r0, [r5, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
mov r0, #0x1b
str r0, [r4, #0x0]
pop {r3-r5, pc}
@@ -2349,7 +2349,7 @@ FUN_020750C4: ; 0x020750C4
bl FUN_02001C5C
ldr r0, _020750F4 ; =0x000006F8
ldr r0, [r5, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
mov r0, #0x1b
str r0, [r4, #0x0]
pop {r3-r5, pc}
@@ -2482,7 +2482,7 @@ _020751E4:
bl FUN_02001C5C
ldr r0, _0207523C ; =0x000006F8
ldr r0, [r4, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
mov r0, #0x1b
str r0, [r6, #0x0]
pop {r4-r6, pc}
arm9/asm/unk_0207550C.s
+7 -7
View File
@@ -1403,7 +1403,7 @@ _020760D4:
lsl r1, r1, #0x4
add r0, r0, r1
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r1, _02076134 ; =0x00000B25
add r0, r5, #0x0
ldrb r1, [r5, r1]
@@ -1672,7 +1672,7 @@ _020762DC:
lsl r1, r1, #0x4
add r0, r0, r1
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r1, _020763E0 ; =0x00000B25
add r0, r4, #0x0
ldrb r1, [r4, r1]
@@ -3174,7 +3174,7 @@ FUN_02076FB0: ; 0x02076FB0
mov r2, #0x2
ldr r1, [r5, r1]
mvn r2, r2
bl ListMenu_AddItem
bl ListMenuItems_AddItem
mov r0, #0x0
pop {r3-r7, pc}
_0207701C:
@@ -3182,7 +3182,7 @@ _0207701C:
sub r1, #0x50
ldr r1, [r5, r1]
add r2, r6, #0x0
bl ListMenu_AddItem
bl ListMenuItems_AddItem
mov r0, #0x1
pop {r3-r7, pc}
.balign 4
@@ -3209,7 +3209,7 @@ _02077050:
_02077058:
mov r0, #0x4
mov r1, #0xc
bl ListMenu_ctor
bl ListMenuItems_ctor
ldr r1, _02077108 ; =0x000006F8
str r0, [r4, r1]
add r0, r4, #0x0
@@ -3328,7 +3328,7 @@ _02077130:
bl FUN_02001C5C
ldr r0, _02077230 ; =0x000006F8
ldr r0, [r5, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
add r0, r5, #0x0
mov r1, #0x20
mov r2, #0x1
@@ -3353,7 +3353,7 @@ _0207716A:
bl FUN_02001C5C
ldr r0, _02077230 ; =0x000006F8
ldr r0, [r5, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
ldr r0, _02077234 ; =0x000005A4
ldr r6, [r5, r0]
add r0, r5, #0x0
arm9/asm/unk_020772F0.s
+25 -25
View File
@@ -1013,7 +1013,7 @@ _02077594:
ldr r0, _020776B0 ; =0x00000448
mov r1, #0xf
add r0, r4, r0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _020776B0 ; =0x00000448
mov r2, #0x1
add r0, r4, r0
@@ -1509,18 +1509,18 @@ _02077982:
ldr r1, _02077A70 ; =0x000004AC
mov r0, #0x12
ldr r1, [r4, r1]
bl FUN_02016A8C
bl FreeToHeapExplicit
ldr r0, [r4, #0x0]
cmp r0, #0x1
bne _020779C2
ldr r1, _02077A74 ; =0x000004B4
mov r0, #0x12
ldr r1, [r4, r1]
bl FUN_02016A8C
bl FreeToHeapExplicit
ldr r1, _02077A78 ; =0x000004BC
mov r0, #0x12
ldr r1, [r4, r1]
bl FUN_02016A8C
bl FreeToHeapExplicit
_020779C2:
mov r0, #0x16
lsl r0, r0, #0x4
@@ -2250,7 +2250,7 @@ _02077FB0:
bl FUN_020178A0
mov r0, #0x12
add r1, r6, #0x0
bl FUN_02016A8C
bl FreeToHeapExplicit
pop {r4-r6, pc}
thumb_func_start FUN_02077FE8
@@ -3359,7 +3359,7 @@ FUN_020788C4: ; 0x020788C4
_020788DE:
add r0, r5, #0x0
mov r1, #0x1
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0x0
str r1, [sp, #0x0]
ldr r0, _02078908 ; =0x000E0F01
@@ -3524,7 +3524,7 @@ _020789D8:
lsl r0, r0, #0x2
add r0, r5, r0
mov r1, #0x1
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x3
str r0, [sp, #0x0]
mov r0, #0x7
@@ -3548,7 +3548,7 @@ _020789D8:
ldr r0, _02078B74 ; =0x00000438
mov r1, #0x1
add r0, r5, r0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r1, [r5, #0x0]
cmp r1, #0x5
bne _02078A90
@@ -3581,7 +3581,7 @@ _02078A90:
ldr r0, _02078B78 ; =0x00000448
mov r1, #0xf
add r0, r5, r0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r2, #0x5e
ldr r0, _02078B78 ; =0x00000448
lsl r2, r2, #0x2
@@ -3640,7 +3640,7 @@ _02078B0E:
bl FUN_02019064
add r0, r7, r6
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
add r4, r4, #0x1
cmp r4, #0x3
blt _02078B0E
@@ -3661,7 +3661,7 @@ _02078B0E:
ldr r0, _02078B84 ; =0x00000428
mov r1, #0x0
add r0, r5, r0
bl FUN_02019620
bl FillWindowPixelBuffer
add sp, #0x14
pop {r4-r7, pc}
.balign 4
@@ -4119,7 +4119,7 @@ _02078EB4:
mov r2, #0x0
ldr r0, [sp, #0x18]
add r3, r2, #0x0
bl FUN_02019658
bl BlitBitmapRectToWindow
b _02078F56
_02078F00:
ldr r0, _02078F78 ; =0x0000D004
@@ -4212,7 +4212,7 @@ FUN_02078FA0: ; 0x02078FA0
mov r1, #0x0
add r5, r2, #0x0
add r4, r3, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r6, #0x0
ldr r3, _0207906C ; =0x000D0E0F
add r0, #0x30
@@ -4266,7 +4266,7 @@ _02079012:
strh r1, [r0, #0x2]
add r0, r6, r7
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0x0
add r1, sp, #0xc
bl CopyU16ArrayToString
@@ -4563,7 +4563,7 @@ _0207924A:
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x1
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0xc
str r0, [sp, #0x0]
mov r2, #0x0
@@ -4599,7 +4599,7 @@ _0207927C:
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x1
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0xc
str r0, [sp, #0x0]
mov r2, #0x0
@@ -4632,7 +4632,7 @@ _020792CA:
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x1
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0xc
str r0, [sp, #0x0]
mov r2, #0x0
@@ -4708,7 +4708,7 @@ _0207936A:
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x1
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x56
lsl r0, r0, #0x2
ldrh r0, [r4, r0]
@@ -4835,7 +4835,7 @@ _02079470:
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x1
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0xc
str r0, [sp, #0x0]
mov r2, #0x0
@@ -5203,7 +5203,7 @@ FUN_0207974C: ; 0x0207974C
add r5, r0, #0x0
str r3, [sp, #0x14]
str r2, [sp, #0x30]
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r1, _0207982C ; =UNK_020F9D30
ldr r0, [sp, #0x10]
mov r7, #0x0
@@ -5219,7 +5219,7 @@ _0207976C:
add r1, r4, #0x0
lsr r2, r2, #0x10
mov r3, #0x0
bl FUN_020196F4
bl FillWindowPixelRect
mov r0, #0x10
str r0, [sp, #0x0]
mov r0, #0x13
@@ -5229,7 +5229,7 @@ _0207976C:
add r1, r4, #0x0
lsr r2, r2, #0x10
mov r3, #0x26
bl FUN_020196F4
bl FillWindowPixelRect
mov r0, #0x10
str r0, [sp, #0x0]
mov r0, #0x13
@@ -5239,7 +5239,7 @@ _0207976C:
add r1, r4, #0x0
lsr r2, r2, #0x10
mov r3, #0x4c
bl FUN_020196F4
bl FillWindowPixelRect
add r7, r7, #0x1
add r6, #0x20
cmp r7, #0x6
@@ -5256,7 +5256,7 @@ _020797BA:
add r1, r4, #0x0
lsr r2, r2, #0x10
mov r3, #0x13
bl FUN_020196F4
bl FillWindowPixelRect
mov r0, #0x10
str r0, [sp, #0x0]
mov r0, #0x13
@@ -5266,7 +5266,7 @@ _020797BA:
add r1, r4, #0x0
lsr r2, r2, #0x10
mov r3, #0x39
bl FUN_020196F4
bl FillWindowPixelRect
add r7, r7, #0x1
add r6, #0x20
cmp r7, #0x7
arm9/asm/unk_02079C70.s
+1 -1
View File
@@ -533,7 +533,7 @@ FUN_0207A08C: ; 0x0207A08C
bl FUN_020178A0
mov r0, #0x13
add r1, r4, #0x0
bl FUN_02016A8C
bl FreeToHeapExplicit
pop {r4, pc}
.balign 4
arm9/asm/unk_0207D5BC.s
+48 -48
View File
@@ -82,7 +82,7 @@ _0207D5C4:
bl FUN_02019150
add r0, r4, r6
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0x1
lsl r0, r0, #0x10
lsr r5, r0, #0x10
@@ -190,7 +190,7 @@ _0207D692:
mov r0, #0x13
lsl r1, r1, #0x18
lsr r1, r1, #0x18
bl FUN_02018FF4
bl AllocWindows
mov r1, #0x91
lsl r1, r1, #0x2
str r0, [r4, r1]
@@ -300,7 +300,7 @@ FUN_0207D768: ; 0x0207D768
lsl r4, r4, #0x2
add r0, r5, r4
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0x0
add r2, r4, #0x0
str r1, [sp, #0x0]
@@ -371,7 +371,7 @@ FUN_0207D800: ; 0x0207D800
lsl r6, r6, #0x2
add r0, r5, r6
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r6, #0x0
add r0, #0x8c
ldr r0, [r5, r0]
@@ -444,7 +444,7 @@ FUN_0207D8A0: ; 0x0207D8A0
lsl r0, r0, #0x2
add r0, r5, r0
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _0207D918 ; =0x0000025E
ldrh r2, [r5, r0]
cmp r2, #0x0
@@ -504,7 +504,7 @@ FUN_0207D924: ; 0x0207D924
add r4, r1, #0x0
add r0, r5, r0
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x0
str r0, [sp, #0x0]
ldr r3, _0207D954 ; =0x000F0E00
@@ -581,7 +581,7 @@ _0207D9B4:
lsl r0, r0, #0x18
lsr r5, r0, #0x18
add r0, r6, #0x0
bl FUN_0201AB0C
bl GetWindowWidth
lsl r0, r0, #0x1b
lsr r0, r0, #0x18
sub r0, r0, r5
@@ -598,7 +598,7 @@ _0207D9D8:
lsl r0, r0, #0x18
lsr r5, r0, #0x18
add r0, r6, #0x0
bl FUN_0201AB0C
bl GetWindowWidth
lsl r0, r0, #0x1b
lsr r0, r0, #0x18
sub r1, r0, r5
@@ -1151,37 +1151,37 @@ FUN_0207DE3C: ; 0x0207DE3C
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x10
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x20
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x30
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x40
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x50
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0x93
lsl r1, r1, #0x2
ldr r0, [r4, r1]
@@ -1522,7 +1522,7 @@ FUN_0207E190: ; 0x0207E190
lsl r0, r0, #0x2
ldr r0, [r5, r0]
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0x0
bl FUN_0207B628
add r6, r0, #0x0
@@ -1601,53 +1601,53 @@ FUN_0207E200: ; 0x0207E200
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x10
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x20
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x30
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x40
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x50
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x60
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x70
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r4, r0]
bl FUN_0201AB0C
bl GetWindowWidth
mov r1, #0x76
str r1, [sp, #0x0]
mov r1, #0x9d
@@ -1875,7 +1875,7 @@ _0207E4C6:
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x10
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r2, _0207E584 ; =0x00000674
mov r1, #0xa5
ldr r0, [r4, r2]
@@ -1929,7 +1929,7 @@ _0207E4C6:
sub r0, #0x8
ldr r0, [r4, r0]
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r2, _0207E584 ; =0x00000674
mov r1, #0xa3
ldr r0, [r4, r2]
@@ -1991,25 +1991,25 @@ _0207E5BC:
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x10
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x20
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x30
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0x0
mov r1, #0x0
bl FUN_0207EA44
@@ -2074,25 +2074,25 @@ _0207E678:
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x10
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x20
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x30
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0x0
mov r1, #0x0
bl FUN_0207EA44
@@ -2144,7 +2144,7 @@ FUN_0207E70C: ; 0x0207E70C
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x0
str r0, [sp, #0x0]
ldr r2, _0207E780 ; =0x00000699
@@ -2214,7 +2214,7 @@ _0207E7BC:
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x10
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r2, _0207E830 ; =0x00000674
mov r1, #0xa5
ldr r0, [r4, r2]
@@ -2278,7 +2278,7 @@ FUN_0207E840: ; 0x0207E840
ldr r0, [r5, r0]
mov r1, #0x0
add r0, #0x10
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _0207E994 ; =0x00000674
mov r1, #0xba
ldr r0, [r5, r0]
@@ -2436,13 +2436,13 @@ FUN_0207E9A0: ; 0x0207E9A0
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x20
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x30
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _0207EA34 ; =0x0000069A
mov r1, #0x3
ldrb r0, [r4, r0]
@@ -2659,19 +2659,19 @@ FUN_0207EB64: ; 0x0207EB64
ldr r0, [r5, r0]
mov r1, #0x0
add r0, #0x50
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r5, r0]
mov r1, #0x0
add r0, #0x60
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r0, [r5, r0]
mov r1, #0x0
add r0, #0x70
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0x0
mov r1, #0x2
bl GetWazaAttr
@@ -2819,7 +2819,7 @@ FUN_0207ECDC: ; 0x0207ECDC
ldr r0, [r4, r0]
mov r1, #0x0
add r0, #0x40
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0x0
mov r1, #0x4
bl FUN_0207EA44
@@ -2862,7 +2862,7 @@ FUN_0207ED30: ; 0x0207ED30
lsl r0, r0, #0x4
add r0, r1, r0
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x91
lsl r0, r0, #0x2
ldr r1, [r4, r0]
@@ -2873,7 +2873,7 @@ FUN_0207ED30: ; 0x0207ED30
lsl r0, r0, #0x4
add r0, r1, r0
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r1, _0207EDB0 ; =0x0000068D
add r0, r4, #0x0
ldrb r1, [r4, r1]
@@ -2946,7 +2946,7 @@ _0207EDEE:
_0207EDF6:
add r0, r4, #0x0
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r2, _0207EE24 ; =0x00000674
mov r1, #0x9c
ldr r0, [r5, r2]
@@ -2977,7 +2977,7 @@ FUN_0207EE2C: ; 0x0207EE2C
add r4, r1, #0x0
add r0, #0x50
mov r1, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0x0
mov r1, #0xa
bl GetWazaAttr
@@ -3098,7 +3098,7 @@ _0207EF10:
bl FUN_0200D0BC
add r0, r6, #0x0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r2, _0207EF64 ; =0x00000674
add r1, r5, #0x0
ldr r0, [r4, r2]
arm9/asm/unk_02086414.s
+7 -7
View File
@@ -517,7 +517,7 @@ FUN_02086784: ; 0x02086784
add r0, r5, #0x0
add r4, r2, #0x0
add r6, r3, #0x0
bl FUN_0201901C
bl InitWindow
ldr r0, [sp, #0x28]
lsl r2, r4, #0x18
lsl r0, r0, #0x18
@@ -552,7 +552,7 @@ FUN_02086784: ; 0x02086784
bl FUN_0200D0BC
add r0, r5, #0x0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0x0
bl CopyWindowToVram
add sp, #0x14
@@ -567,7 +567,7 @@ FUN_020867EC: ; 0x020867EC
str r0, [sp, #0xc]
str r2, [sp, #0x10]
add r6, r3, #0x0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r2, _02086874 ; =0x0000013F
mov r0, #0x0
mov r1, #0x1a
@@ -627,7 +627,7 @@ FUN_02086878: ; 0x02086878
add r6, r1, #0x0
str r2, [sp, #0x14]
add r4, r3, #0x0
bl FUN_0201901C
bl InitWindow
ldr r0, [sp, #0x3c]
ldr r3, [sp, #0x38]
lsl r0, r0, #0x18
@@ -658,7 +658,7 @@ FUN_02086878: ; 0x02086878
bl FUN_02019064
mov r0, #0x2
mov r1, #0x47
bl ListMenu_ctor
bl ListMenuItems_ctor
str r0, [r5, #0x44]
ldr r2, _0208695C ; =0x0000013F
mov r0, #0x0
@@ -675,7 +675,7 @@ _020868DE:
ldr r0, [r5, #0x44]
add r1, r6, #0x0
add r2, r4, #0x0
bl ListMenu_AddItem
bl ListMenuItems_AddItem
add r0, r6, #0x0
bl String_dtor
add r4, r4, #0x1
@@ -744,7 +744,7 @@ FUN_02086960: ; 0x02086960
mov r1, #0x0
bl FUN_02001C5C
ldr r0, [r4, #0x44]
bl ListMenu_dtor
bl ListMenuItems_dtor
pop {r4, pc}
thumb_func_start FUN_0208698C
arm9/asm/unk_02089498.s
+2 -2
View File
@@ -360,7 +360,7 @@ FUN_02089734: ; 0x02089734
add r0, r4, #0x0
mov r1, #0xf
add r3, r2, #0x0
bl FUN_020196F4
bl FillWindowPixelRect
add sp, #0x8
pop {r4, pc}
nop
@@ -539,7 +539,7 @@ _020898B8:
mov r1, #0xf
add r2, r6, #0x0
add r3, r6, #0x0
bl FUN_020196F4
bl FillWindowPixelRect
add r0, r5, #0x0
ldr r2, _02089958 ; =0x000001E2
add r0, #0x1c
arm9/asm/unk_02089960.s
+2 -2
View File
@@ -299,7 +299,7 @@ FUN_02089B80: ; 0x02089B80
add r0, r4, #0x0
mov r1, #0xf
add r3, r2, #0x0
bl FUN_020196F4
bl FillWindowPixelRect
add sp, #0x8
pop {r4, pc}
nop
@@ -466,7 +466,7 @@ _02089CE8:
mov r1, #0xf
add r2, r6, #0x0
add r3, r6, #0x0
bl FUN_020196F4
bl FillWindowPixelRect
add r0, r5, #0x0
ldr r2, _02089D88 ; =0x000001E2
add r0, #0x20
arm9/asm/unk_02089D90.s
+1 -1
View File
@@ -137,7 +137,7 @@ FUN_02089D90: ; 0x02089D90
add r0, sp, #0xc
mov r1, #0xf
add r3, r2, #0x0
bl FUN_020196F4
bl FillWindowPixelRect
ldr r2, _02089F18 ; =0x000001F7
add r0, sp, #0xc
mov r1, #0x0
arm9/asm/unk_02089F24.s
+2 -2
View File
@@ -141,7 +141,7 @@ FUN_02089F24: ; 0x02089F24
add r0, sp, #0xc
mov r1, #0xf
add r3, r2, #0x0
bl FUN_020196F4
bl FillWindowPixelRect
ldr r2, _0208A0AC ; =0x000001F7
add r0, sp, #0xc
mov r1, #0x0
@@ -310,7 +310,7 @@ _0208A0C8:
add r0, sp, #0xc
mov r1, #0xf
add r3, r2, #0x0
bl FUN_020196F4
bl FillWindowPixelRect
ldr r2, _0208A24C ; =0x000001F7
add r0, sp, #0xc
mov r1, #0x0
arm9/asm/unk_0208A338.s
+14 -14
View File
@@ -36,7 +36,7 @@ FUN_0208A338: ; 0x0208A338
bl NewMsgDataFromNarc
str r0, [r4, #0x10]
mov r0, #0x20
bl FUN_02013690
bl ListMenuCursorNew
str r0, [r4, #0x14]
ldr r2, [r4, #0x0]
mov r0, #0x2
@@ -48,13 +48,13 @@ FUN_0208A338: ; 0x0208A338
bl FUN_020853DC
add r0, r4, #0x0
add r0, #0x18
bl FUN_0201901C
bl InitWindow
add r0, r4, #0x0
add r0, #0x28
bl FUN_0201901C
bl InitWindow
add r0, r4, #0x0
add r0, #0x38
bl FUN_0201901C
bl InitWindow
mov r0, #0x0
str r0, [r4, #0x54]
ldr r1, _0208A3C4 ; =FUN_0208A458
@@ -73,7 +73,7 @@ FUN_0208A3C8: ; 0x0208A3C8
ldr r0, [r4, #0x50]
bl FUN_020853A8
ldr r0, [r4, #0x14]
bl FUN_020136C0
bl DestroyListMenuCursorObj
ldr r0, [r4, #0x4]
bl String_dtor
ldr r0, [r4, #0x8]
@@ -102,7 +102,7 @@ FUN_0208A400: ; 0x0208A400
bl FUN_02019178
add r0, r4, #0x0
add r0, #0x18
bl FUN_0201901C
bl InitWindow
_0208A41E:
add r0, r4, #0x0
add r0, #0x28
@@ -114,7 +114,7 @@ _0208A41E:
bl FUN_02019178
add r0, r4, #0x0
add r0, #0x28
bl FUN_0201901C
bl InitWindow
_0208A43A:
add r0, r4, #0x0
add r0, #0x38
@@ -126,7 +126,7 @@ _0208A43A:
bl FUN_02019178
add r4, #0x38
add r0, r4, #0x0
bl FUN_0201901C
bl InitWindow
_0208A456:
pop {r4, pc}
@@ -556,7 +556,7 @@ FUN_0208A77C: ; 0x0208A77C
bl FUN_02019064
add r0, r7, #0x0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r6, #0x0
add r4, r6, #0x0
_0208A7D2:
@@ -583,7 +583,7 @@ _0208A7D2:
ldr r0, [r5, #0x14]
add r1, r7, #0x0
add r3, r2, #0x0
bl FUN_020136F8
bl ListMenuUpdateCursorObj
_0208A808:
str r7, [r5, #0x68]
mov r1, #0x0
@@ -644,7 +644,7 @@ FUN_0208A82C: ; 0x0208A82C
bl FUN_02019064
add r0, r7, #0x0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r6, #0x0
add r4, r6, #0x0
_0208A882:
@@ -671,7 +671,7 @@ _0208A882:
ldr r0, [r5, #0x14]
add r1, r7, #0x0
add r3, r2, #0x0
bl FUN_020136F8
bl ListMenuUpdateCursorObj
_0208A8B8:
str r7, [r5, #0x68]
mov r1, #0x0
@@ -771,13 +771,13 @@ _0208A954:
lsr r1, r1, #0x10
str r1, [sp, #0x4]
mov r1, #0xf
bl FUN_020196F4
bl FillWindowPixelRect
ldr r3, [r4, #0x5c]
ldr r0, [r4, #0x14]
ldr r1, [r4, #0x68]
mov r2, #0x0
lsl r3, r3, #0x4
bl FUN_020136F8
bl ListMenuUpdateCursorObj
ldr r0, [r4, #0x68]
bl FUN_02019548
ldr r0, _0208A994 ; =0x000005DC
arm9/global.inc
+38 -37
View File
@@ -188,21 +188,21 @@
.extern FUN_02000EE8
.extern FUN_02000F18
.extern HandleDSLidAction
.extern FUN_020010A8
.extern FUN_02001204
.extern FUN_02001300
.extern FUN_02001328
.extern FUN_02001354
.extern FUN_020013C8
.extern FUN_020013E8
.extern FUN_0200143C
.extern FUN_02001448
.extern FUN_0200145C
.extern FUN_02001464
.extern FUN_02001470
.extern FUN_02001538
.extern FUN_02001658
.extern FUN_02001B80
.extern ListMenuInit
.extern ListMenu_ProcessInput
.extern DestroyListMenu
.extern RedrawListMenu
.extern ListMenuTestInputInternal
.extern ListMenuTestInput
.extern ListMenuOverrideSetColors
.extern ListMenuGetCurrentItemArrayId
.extern ListMenuGetScrollAndRow
.extern ListMenuGetUnk33
.extern ListMenuGetValueByArrayId
.extern ListMenuGetTemplateField
.extern ListMenuSetTemplateField
.extern ListMenuGetItemStr
.extern ListMenuCopyToVram
.extern FUN_02001B8C
.extern FUN_02001C14
.extern FUN_02001C34
@@ -236,7 +236,7 @@
.extern FontFunc
.extern FUN_02002DE0
.extern FUN_02002E14
.extern FUN_02002E4C
.extern GetFontAttribute
.extern FUN_02002ED0
.extern FUN_02002EEC
.extern FUN_02002F08
@@ -810,12 +810,12 @@
.extern GF_RTC_GetTimeOfDay
.extern GF_RTC_GetTimeOfDayByHour
.extern FUN_020127C0
.extern ListMenu_ctor
.extern ListMenu_dtor
.extern ListMenu_ItemFromMsgData
.extern ListMenu_AddItem
.extern ListMenu_CopyItem
.extern ListMenu_DestroyMenuStrings
.extern ListMenuItems_ctor
.extern ListMenuItems_dtor
.extern ListMenuItems_AppendFromMsgData
.extern ListMenuItems_AddItem
.extern ListMenuItems_CopyItem
.extern ListMenuItems_DestroyMenuStrings
.extern FUN_02012944
.extern FUN_02012974
.extern FUN_02012988
@@ -882,10 +882,10 @@
.extern FUN_02013628
.extern FUN_0201365C
.extern FUN_02013674
.extern FUN_02013690
.extern FUN_020136C0
.extern FUN_020136E0
.extern FUN_020136F8
.extern ListMenuCursorNew
.extern DestroyListMenuCursorObj
.extern ListMenuCursorSetColor
.extern ListMenuUpdateCursorObj
.extern MailMsg_init
.extern MailMsg_init_withBank
.extern MailMsg_init_default
@@ -1029,7 +1029,7 @@
.extern AllocFromHeap
.extern AllocFromHeapAtEnd
.extern FreeToHeap
.extern FUN_02016A8C
.extern FreeToHeapExplicit
.extern FUN_02016AF8
.extern FUN_02016B20
.extern FUN_02016B44
@@ -1068,10 +1068,10 @@
.extern FUN_0201886C
.extern FUN_02018878
.extern FUN_02018884
.extern FUN_02018A60
.extern BlitBitmapRect4Bit
.extern FUN_02018F4C
.extern FUN_02018FF4
.extern FUN_0201901C
.extern AllocWindows
.extern InitWindow
.extern FUN_02019048
.extern FUN_02019064
.extern FUN_020190EC
@@ -1098,15 +1098,15 @@
.extern FUN_020195D0
.extern FUN_020195E4
.extern FUN_0201960C
.extern FUN_02019620
.extern FUN_02019658
.extern FUN_02019684
.extern FUN_020196F4
.extern FillWindowPixelBuffer
.extern BlitBitmapRectToWindow
.extern BlitBitmapRect
.extern FillWindowPixelRect
.extern FUN_0201974C
.extern FUN_0201A8C8
.extern ScrollWindow
.extern FUN_0201AB08
.extern FUN_0201AB0C
.extern FUN_0201AB10
.extern GetWindowWidth
.extern GetWindowHeight
.extern FUN_0201AB14
.extern FUN_0201AB18
.extern FUN_0201AB1C
@@ -7708,6 +7708,7 @@
.extern MTX_TransApply44
.extern NitroMain
.extern gBacklightTop
.extern UNK_02016FA4
.extern OS_AllocFromArenaHi
.extern OS_AllocFromArenaLo
.extern OS_AllocFromHeap
arm9/modules/04/asm/thumb_04.s
+3 -3
View File
@@ -202,13 +202,13 @@ MOD04_021D7660: ; 0x021D7660
ldr r0, [r2, r1]
sub r1, #0x50
ldr r1, [r2, r1]
bl FUN_02016A8C
bl FreeToHeapExplicit
ldr r1, _021D76A0 ; =UNK04_0220FBC0
ldr r0, _021D76A8 ; =0x00001F54
ldr r2, [r1]
ldr r1, [r1, #4]
ldr r0, [r2, r0]
bl FUN_02016A8C
bl FreeToHeapExplicit
ldr r0, _021D76A0 ; =UNK04_0220FBC0
mov r1, #0
str r1, [r0, #4]
@@ -3065,7 +3065,7 @@ MOD04_021D8C6C: ; 0x021D8C6C
lsl r0, r0, #8
ldr r0, [r2, r0]
ldr r1, [r1]
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r1, #0
ldr r0, _021D8CBC ; =UNK04_0220FBC8
cmp r4, #0
arm9/modules/05/asm/mod05_021DB44C.s
+3 -3
View File
@@ -67,7 +67,7 @@ _021DB4BA:
bl MOD05_021DB7A0
ldr r1, [r4]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r0, #0
str r0, [r4]
pop {r4, pc}
@@ -419,7 +419,7 @@ _021DB73E:
_021DB78A:
ldr r1, [sp, #0x14]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
ldr r0, [sp, #8]
add sp, #0x1fc
add sp, #0x20
@@ -433,7 +433,7 @@ MOD05_021DB7A0: ; 0x021DB7A0
add r4, r0, #0
ldr r1, [r4]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r0, #0
str r0, [r4]
pop {r4, pc}
arm9/modules/05/asm/mod05_021DBA00.s
+1 -1
View File
@@ -24,7 +24,7 @@ MOD05_021DBA1C: ; 0x021DBA1C
add r4, r0, #0
ldr r1, [r4]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r0, #0
str r0, [r4]
pop {r4, pc}
arm9/modules/05/asm/mod05_021DBABC.s
+1 -1
View File
@@ -24,7 +24,7 @@ MOD05_021DBAD8: ; 0x021DBAD8
add r4, r0, #0
ldr r1, [r4]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r0, #0
str r0, [r4]
pop {r4, pc}
arm9/modules/05/asm/mod05_021DC0B8.s
+4 -4
View File
@@ -692,7 +692,7 @@ _021DC5A2:
bl NARC_dtor
ldr r1, [r4]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r0, #0
str r0, [r4]
_021DC5FE:
@@ -1362,7 +1362,7 @@ _021DCAD2:
bl MOD05_021DC880
ldr r1, [r4, #0x10]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r0, #0
str r0, [r4, #0x10]
ldr r0, [r4, #0x1c]
@@ -1390,7 +1390,7 @@ _021DCB14:
cmp r1, #0
beq _021DCB2C
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
ldr r1, [r4, #0xc]
ldr r0, _021DCB64 ; =0x00000F58
mov r2, #0
@@ -1414,7 +1414,7 @@ _021DCB3E:
_021DCB4C:
ldr r1, [r4, #0xc]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r0, #0
str r0, [r4, #0xc]
_021DCB58:
arm9/modules/05/asm/mod05_021E1374.s
+1 -1
View File
@@ -533,7 +533,7 @@ _021E1770:
bl FUN_0200CAB4
mov r0, #4
add r1, r4, #0
bl FUN_02016A8C
bl FreeToHeapExplicit
_021E178E:
pop {r4, pc}
.balign 4, 0
arm9/modules/05/asm/mod05_021E1AD8.s
+17 -17
View File
@@ -738,7 +738,7 @@ _021E2032:
add r0, r4, r0
mov r1, #0
mov r3, #4
bl FUN_020010A8
bl ListMenuInit
mov r1, #0x6d
lsl r1, r1, #2
str r0, [r4, r1]
@@ -1012,13 +1012,13 @@ MOD05_021E2278: ; 0x021E2278
mov r1, #3
mov r2, #0xf
mov r3, #4
bl FUN_020013E8
bl ListMenuOverrideSetColors
pop {r3, pc}
_021E228E:
mov r1, #1
mov r2, #0xf
mov r3, #2
bl FUN_020013E8
bl ListMenuOverrideSetColors
pop {r3, pc}
.balign 4, 0
@@ -1045,7 +1045,7 @@ _021E22B8:
mov r0, #0x6d
lsl r0, r0, #2
ldr r0, [r5, r0]
bl FUN_02001204
bl ListMenu_ProcessInput
add r4, r0, #0
mov r0, #0x6d
mov r1, #0xb5
@@ -1054,7 +1054,7 @@ _021E22B8:
ldrh r6, [r5, r1]
ldr r0, [r5, r0]
add r1, r5, r1
bl FUN_0200143C
bl ListMenuGetCurrentItemArrayId
mov r0, #0xb5
lsl r0, r0, #2
ldrh r0, [r5, r0]
@@ -1134,7 +1134,7 @@ MOD05_021E2368: ; 0x021E2368
mov r1, #0
ldr r0, [r6, r0]
add r2, r1, #0
bl FUN_02001300
bl DestroyListMenu
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r6, r0]
@@ -1189,7 +1189,7 @@ MOD05_021E23D0: ; 0x021E23D0
add r6, r0, #0
ldr r0, [r5, #0x18]
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
add r0, #0x8c
ldr r0, [r0]
@@ -1226,7 +1226,7 @@ MOD05_021E2434: ; 0x021E2434
ldr r0, [r4, r1]
add r1, r1, #6
add r1, r4, r1
bl FUN_0200143C
bl ListMenuGetCurrentItemArrayId
ldr r0, _021E2460 ; =0x000001BA
ldrh r1, [r4, r0]
add r0, #0xe2
@@ -1259,7 +1259,7 @@ MOD05_021E2464: ; 0x021E2464
add r5, r0, #0
add r0, r4, #0
add r1, r0, #0
bl FUN_02002E4C
bl GetFontAttribute
lsl r1, r0, #3
mov r0, #7
tst r0, r1
@@ -1318,7 +1318,7 @@ _021E2496:
add r0, #8
mov r1, #0xf
add r3, r2, #0
bl FUN_020196F4
bl FillWindowPixelRect
mov r2, #0
add r0, r5, #0
mov r1, #0xf
@@ -1718,7 +1718,7 @@ MOD05_021E27E8: ; 0x021E27E8
add r6, r2, #0
mov r0, #4
mov r1, #1
bl FUN_02018FF4
bl AllocWindows
add r4, r0, #0
str r6, [sp]
mov r0, #0xa
@@ -1750,7 +1750,7 @@ MOD05_021E27E8: ; 0x021E27E8
bl FUN_0200CCA4
add r0, r4, #0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r2, #0x7a
mov r0, #0
mov r1, #0x1a
@@ -1807,7 +1807,7 @@ MOD05_021E28A0: ; 0x021E28A0
mov r1, #0xf
mov r2, #0
str r3, [sp, #4]
bl FUN_020196F4
bl FillWindowPixelRect
mov r2, #0x7a
mov r0, #0
mov r1, #0x1a
@@ -1878,7 +1878,7 @@ MOD05_021E2950: ; 0x021E2950
add r6, r2, #0
mov r0, #4
mov r1, #1
bl FUN_02018FF4
bl AllocWindows
add r4, r0, #0
str r6, [sp]
mov r0, #0xa
@@ -1936,7 +1936,7 @@ MOD05_021E29C8: ; 0x021E29C8
str r1, [sp, #0xc]
add r0, r1, #0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r2, _021E2A6C ; =0x00000141
mov r0, #0
mov r1, #0x1a
@@ -2007,7 +2007,7 @@ MOD05_021E2A70: ; 0x021E2A70
add r6, r2, #0
mov r0, #4
mov r1, #1
bl FUN_02018FF4
bl AllocWindows
add r4, r0, #0
str r6, [sp]
mov r0, #0xa
@@ -2054,7 +2054,7 @@ MOD05_021E2AD4: ; 0x021E2AD4
str r1, [sp, #0xc]
add r0, r1, #0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r2, _021E2B7C ; =0x00000141
mov r0, #0
mov r1, #0x1a
arm9/modules/05/asm/mod05_021E2B80.s
+1 -1
View File
@@ -296,7 +296,7 @@ MOD05_CreateMessageBox: ; 0x021E2D9C
_021E2DC8:
ldr r0, [r4, #0xc]
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
pop {r3, r4, r5, pc}
.balign 4, 0
arm9/modules/05/asm/mod05_021E2E88.s
+10 -10
View File
@@ -146,7 +146,7 @@ _021E2F92:
add r0, r5, #0
add r0, #0x20
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r2, #8
str r2, [sp]
add r0, r5, #0
@@ -159,7 +159,7 @@ _021E2F92:
ldr r1, [r5, #0x34]
add r0, #0x20
ldr r1, [r1, #0x14]
bl FUN_02019658
bl BlitBitmapRectToWindow
ldr r0, [sp, #0x18]
mov r1, #8
add r0, r0, #1
@@ -178,7 +178,7 @@ _021E2F92:
ldr r1, [r1, #0x14]
add r0, #0x20
mov r2, #0x18
bl FUN_02019658
bl BlitBitmapRectToWindow
mov r0, #8
str r0, [sp]
str r0, [sp, #4]
@@ -192,7 +192,7 @@ _021E2F92:
ldr r1, [r1, #0x14]
add r0, #0x20
mov r2, #0x38
bl FUN_02019658
bl BlitBitmapRectToWindow
mov r1, #8
str r1, [sp]
lsl r0, r4, #0x10
@@ -208,7 +208,7 @@ _021E2F92:
add r0, #0x20
mov r2, #0x40
mov r3, #0
bl FUN_02019658
bl BlitBitmapRectToWindow
mov r1, #8
str r1, [sp]
str r1, [sp, #4]
@@ -223,7 +223,7 @@ _021E2F92:
ldr r1, [r1, #0x14]
add r0, #0x20
mov r2, #0x20
bl FUN_02019658
bl BlitBitmapRectToWindow
mov r1, #8
str r1, [sp]
lsl r0, r4, #0x10
@@ -240,7 +240,7 @@ _021E2F92:
add r0, #0x20
mov r2, #0x30
mov r3, #0
bl FUN_02019658
bl BlitBitmapRectToWindow
ldr r0, [sp, #0x18]
mov r7, #0
cmp r0, #0
@@ -266,7 +266,7 @@ _021E3078:
ldr r1, [r1, #0x14]
mov r2, #0x10
mov r3, #0
bl FUN_02019658
bl BlitBitmapRectToWindow
mov r0, #8
str r0, [sp]
str r0, [sp, #4]
@@ -282,7 +282,7 @@ _021E3078:
ldr r1, [r1, #0x14]
mov r2, #0x48
mov r3, #0
bl FUN_02019658
bl BlitBitmapRectToWindow
mov r0, #8
str r0, [sp]
str r0, [sp, #4]
@@ -299,7 +299,7 @@ _021E3078:
ldr r1, [r1, #0x14]
mov r2, #0x28
mov r3, #0
bl FUN_02019658
bl BlitBitmapRectToWindow
add r0, r7, #1
lsl r0, r0, #0x18
lsr r7, r0, #0x18
arm9/modules/05/asm/mod05_021E3444.s
+1 -1
View File
@@ -1989,7 +1989,7 @@ _021E4370:
ldrb r1, [r1, #0x14]
lsr r2, r2, #0x10
lsr r3, r3, #0x10
bl FUN_020196F4
bl FillWindowPixelRect
_021E4390:
add sp, #8
pop {r3, r4, r5, pc}
arm9/modules/05/asm/mod05_021E5FD8.s
+2 -2
View File
@@ -2409,12 +2409,12 @@ _021E72CC:
thumb_func_start MOD05_021E72DC
MOD05_021E72DC: ; 0x021E72DC
ldr r3, _021E72E4 ; =FUN_02016A8C
ldr r3, _021E72E4 ; =FreeToHeapExplicit
add r1, r0, #0
mov r0, #4
bx r3
.balign 4, 0
_021E72E4: .word FUN_02016A8C
_021E72E4: .word FreeToHeapExplicit
thumb_func_start MOD05_021E72E8
MOD05_021E72E8: ; 0x021E72E8
arm9/modules/05/asm/mod05_021E8310.s
+5 -5
View File
@@ -139,11 +139,11 @@ MOD05_021E8410: ; 0x021E8410
add r5, r0, #0
mov r0, #0
mov r1, #1
bl FUN_02002E4C
bl GetFontAttribute
add r4, r0, #0
mov r0, #0
mov r1, #3
bl FUN_02002E4C
bl GetFontAttribute
add r0, r4, r0
str r0, [sp, #0x14]
mov r4, #0
@@ -204,7 +204,7 @@ _021E846E:
add r6, r0, #0
mov r0, #0
mov r1, #2
bl FUN_02002E4C
bl GetFontAttribute
add r2, r0, #0
mov r0, #0
add r1, r6, #0
@@ -276,10 +276,10 @@ MOD05_021E84F4: ; 0x021E84F4
bl FUN_0200CB00
mov r0, #0
mov r1, #6
bl FUN_02002E4C
bl GetFontAttribute
add r1, r0, #0
ldr r0, [r4, #0x10]
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
bl MOD05_021E8410
ldr r0, [r4, #0x10]
arm9/modules/05/asm/module_05.s
+39 -39
View File
@@ -339,7 +339,7 @@ MOD05_021E88C0: ; 0x021E88C0
bl GX_EngineAToggleLayers
ldr r1, [r4]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
pop {r4, pc}
thumb_func_start MOD05_021E88E8
@@ -513,7 +513,7 @@ _021E8A42:
bl MOD05_021E37A4
ldr r1, [r4, #0xc]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
add r0, r6, #0
bl FUN_0200621C
_021E8A56:
@@ -695,7 +695,7 @@ _021E8BC2:
bl MOD05_021E37A4
ldr r1, [r4, #0xc]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
add r0, r6, #0
bl FUN_0200621C
_021E8BD6:
@@ -851,7 +851,7 @@ _021E8CE6:
_021E8D00:
ldr r1, [r4, #0xc]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
add r0, r6, #0
bl FUN_0200621C
mov r0, #1
@@ -1008,7 +1008,7 @@ _021E8E1C:
_021E8E36:
ldr r1, [r4, #0xc]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
add r0, r6, #0
bl FUN_0200621C
mov r0, #1
@@ -1256,7 +1256,7 @@ _021E8FFC:
_021E9010:
ldr r1, [r4, #0xc]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
add r0, r6, #0
bl FUN_0200621C
mov r0, #1
@@ -1391,7 +1391,7 @@ _021E910C:
_021E9120:
ldr r1, [r4, #0xc]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
add r0, r6, #0
bl FUN_0200621C
mov r0, #1
@@ -1794,7 +1794,7 @@ _021E944E:
bl MOD05_021E37A4
ldr r1, [r7, #0xc]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
ldr r0, [sp, #0x10]
bl FUN_0200621C
_021E948A:
@@ -2151,7 +2151,7 @@ _021E974A:
bl MOD05_021E3A48
ldr r1, [r6, #0xc]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
ldr r0, [sp, #0x10]
bl FUN_0200621C
_021E9786:
@@ -2594,7 +2594,7 @@ _021E9AF0:
bl MOD05_021E3E44
ldr r1, [r7, #0xc]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
ldr r0, [sp, #0x14]
bl FUN_0200621C
add sp, #0x58
@@ -2737,7 +2737,7 @@ _021E9C02:
bl GX_EngineAToggleLayers
mov r0, #4
mov r1, #1
bl FUN_02018FF4
bl AllocWindows
mov r1, #0x83
lsl r1, r1, #2
str r0, [r4, r1]
@@ -2766,7 +2766,7 @@ _021E9C02:
lsl r0, r0, #2
ldr r0, [r4, r0]
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x83
lsl r0, r0, #2
ldr r0, [r4, r0]
@@ -3183,7 +3183,7 @@ _021E9FA4:
ldr r1, [sp, #0x1c]
mov r0, #4
ldr r1, [r1, #0xc]
bl FUN_02016A8C
bl FreeToHeapExplicit
ldr r0, [sp, #0x18]
bl FUN_0200621C
add sp, #0x44
@@ -3594,7 +3594,7 @@ _021EA354:
bl MOD05_021E3E44
ldr r1, [r5, #0xc]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
add r0, r6, #0
bl FUN_0200621C
_021EA382:
@@ -3709,7 +3709,7 @@ _021EA430:
bl GX_EngineAToggleLayers
mov r0, #4
mov r1, #1
bl FUN_02018FF4
bl AllocWindows
mov r1, #2
lsl r1, r1, #8
str r0, [r4, r1]
@@ -3738,7 +3738,7 @@ _021EA430:
lsl r0, r0, #8
ldr r0, [r4, r0]
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #2
lsl r0, r0, #8
ldr r0, [r4, r0]
@@ -4116,7 +4116,7 @@ _021EA76C:
ldr r1, [sp, #0x18]
mov r0, #4
ldr r1, [r1, #0xc]
bl FUN_02016A8C
bl FreeToHeapExplicit
ldr r0, [sp, #0x14]
bl FUN_0200621C
_021EA7DE:
@@ -4472,7 +4472,7 @@ _021EAA98:
bl MOD05_021E3E44
ldr r1, [r4, #0xc]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
add r0, r6, #0
bl FUN_0200621C
_021EAAC6:
@@ -4781,7 +4781,7 @@ _021EAD1A:
bl MOD05_021E3E44
ldr r1, [r6, #0xc]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
ldr r0, [sp, #0x10]
bl FUN_0200621C
_021EAD4C:
@@ -5156,7 +5156,7 @@ _021EB01A:
ldr r1, [sp, #0x14]
mov r0, #4
ldr r1, [r1, #0xc]
bl FUN_02016A8C
bl FreeToHeapExplicit
ldr r0, [sp, #0x10]
bl FUN_0200621C
_021EB04A:
@@ -5380,7 +5380,7 @@ _021EB18E:
str r0, [r4, #4]
mov r0, #4
mov r1, #1
bl FUN_02018FF4
bl AllocWindows
str r0, [r4]
mov r3, #0
str r3, [sp]
@@ -5404,7 +5404,7 @@ _021EB18E:
bl FUN_02017FB4
ldr r0, [r4]
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4]
bl FUN_02019220
ldr r0, [r5]
@@ -5586,7 +5586,7 @@ _021EB394:
strb r1, [r0]
ldr r1, [r5, #0xc]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
add r0, r6, #0
bl FUN_0200621C
_021EB3F2:
@@ -5797,7 +5797,7 @@ _021EB56C:
_021EB58A:
ldr r1, [r4, #0xc]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
add r0, r6, #0
bl FUN_0200621C
mov r0, #1
@@ -6008,7 +6008,7 @@ _021EB720:
_021EB73E:
ldr r1, [r4, #0xc]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
add r0, r6, #0
bl FUN_0200621C
mov r0, #1
@@ -6506,7 +6506,7 @@ _021EBB60:
str r0, [r2]
ldr r1, [r5, #0xc]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
add sp, #0x30
mov r0, #1
pop {r3, r4, r5, r6, r7, pc}
@@ -7514,7 +7514,7 @@ _021EC37A:
bl MOD05_021E3E44
ldr r1, [r5, #0xc]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
add sp, #0x4c
mov r0, #1
pop {r4, r5, r6, r7, pc}
@@ -15197,7 +15197,7 @@ MOD05_021EFEDC: ; 0x021EFEDC
add r7, r0, #0
add r0, r7, #1
mov r1, #4
bl ListMenu_ctor
bl ListMenuItems_ctor
str r0, [r5]
mov r0, #1
str r0, [sp]
@@ -15238,7 +15238,7 @@ _021EFF2E:
ldr r0, [r5]
ldr r1, [r5, #8]
add r2, r4, #0
bl ListMenu_AddItem
bl ListMenuItems_AddItem
_021EFF54:
add r4, r4, #1
cmp r4, #0x20
@@ -15248,7 +15248,7 @@ _021EFF54:
ldr r0, [r5]
ldr r1, [r5, #0x3c]
sub r3, #0xd
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
ldr r4, _021EFFC0 ; =UNK05_021F8B4C
add r3, sp, #0x14
add r2, r3, #0
@@ -15277,7 +15277,7 @@ _021EFF54:
add r0, r2, #0
add r2, r1, #0
mov r3, #4
bl FUN_020010A8
bl ListMenuInit
str r0, [r5, #4]
add r0, r5, #0
add r0, #0x20
@@ -15298,7 +15298,7 @@ MOD05_021EFFC8: ; 0x021EFFC8
push {r3, r4, r5, r6, r7, lr}
add r5, r0, #0
ldr r0, [r5, #4]
bl FUN_02001204
bl ListMenu_ProcessInput
add r4, r0, #0
mov r0, #1
mvn r0, r0
@@ -15366,9 +15366,9 @@ _021F0056:
mov r1, #0
ldr r0, [r5, #4]
add r2, r1, #0
bl FUN_02001300
bl DestroyListMenu
ldr r0, [r5]
bl ListMenu_dtor
bl ListMenuItems_dtor
mov r0, #0
pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0
@@ -19600,11 +19600,11 @@ MOD05_021F21AC: ; 0x021F21AC
add r1, #0xe4
ldr r1, [r1]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
add r4, #0xf4
ldr r1, [r4]
mov r0, #4
bl FUN_02016A8C
bl FreeToHeapExplicit
pop {r4, pc}
thumb_func_start MOD05_021F21CC
@@ -22552,12 +22552,12 @@ _021F37C2:
thumb_func_start MOD05_021F37D0
MOD05_021F37D0: ; 0x021F37D0
ldr r3, _021F37D8 ; =FUN_02016A8C
ldr r3, _021F37D8 ; =FreeToHeapExplicit
add r1, r0, #0
ldr r0, [r1]
bx r3
.balign 4, 0
_021F37D8: .word FUN_02016A8C
_021F37D8: .word FreeToHeapExplicit
thumb_func_start MOD05_021F37DC
MOD05_021F37DC: ; 0x021F37DC
@@ -22588,7 +22588,7 @@ _021F37FC:
bne _021F37F0
ldr r0, [r5]
ldr r1, [r5, #0xc]
bl FUN_02016A8C
bl FreeToHeapExplicit
_021F380E:
pop {r3, r4, r5, pc}
arm9/modules/05/src/mod05_021E72FC.c
+1 -1
View File
@@ -156,5 +156,5 @@ THUMB_FUNC UnkStruct021E7358 *MOD05_021E74D4(u32 param0)
THUMB_FUNC void MOD05_021E74F8(UnkStruct021E7358 *param0)
{
FUN_02016A8C(4, param0);
FreeToHeapExplicit(4, param0);
}
arm9/modules/06/asm/module_06.s
+104 -104
View File
@@ -8427,7 +8427,7 @@ MOD06_0223D63C: ; 0x0223D63C
mov r4, #3
add r0, r4, #0
mov r1, #0xb
bl ListMenu_ctor
bl ListMenuItems_ctor
add r1, r5, #0
add r1, #0x84
str r0, [r1]
@@ -8439,7 +8439,7 @@ MOD06_0223D63C: ; 0x0223D63C
ldr r1, [r1]
mov r2, #0xf
mov r3, #2
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
add r0, r5, #0
add r1, r5, #0
add r0, #0x84
@@ -8448,7 +8448,7 @@ MOD06_0223D63C: ; 0x0223D63C
ldr r1, [r1]
mov r2, #0x10
mov r3, #0xe
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
add r0, r5, #0
add r1, r5, #0
add r0, #0x84
@@ -8458,7 +8458,7 @@ MOD06_0223D63C: ; 0x0223D63C
ldr r0, [r0]
ldr r1, [r1]
sub r3, #0x13
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
mov r3, #1
str r3, [sp]
mov r1, #0xd
@@ -8478,7 +8478,7 @@ _0223D6B8:
mov r4, #2
add r0, r4, #0
mov r1, #0xb
bl ListMenu_ctor
bl ListMenuItems_ctor
add r1, r5, #0
add r1, #0x84
str r0, [r1]
@@ -8490,7 +8490,7 @@ _0223D6B8:
ldr r1, [r1]
mov r2, #0xf
add r3, r4, #0
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
add r0, r5, #0
add r1, r5, #0
add r0, #0x84
@@ -8500,7 +8500,7 @@ _0223D6B8:
ldr r0, [r0]
ldr r1, [r1]
sub r3, #0x13
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
mov r3, #1
str r3, [sp]
mov r1, #0xd
@@ -8618,7 +8618,7 @@ MOD06_0223D7B8: ; 0x0223D7B8
add r0, r4, #0
add r0, #0x84
ldr r0, [r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
add r4, #8
add r0, r4, #0
bl FUN_02019178
@@ -9146,7 +9146,7 @@ _0223DC34:
ldrb r0, [r5, r0]
mov r1, #0xb
add r0, r0, #1
bl ListMenu_ctor
bl ListMenuItems_ctor
str r0, [r5, #0x7c]
mov r0, #0x8b
lsl r0, r0, #2
@@ -9172,7 +9172,7 @@ _0223DC52:
ldr r0, [r5, #0x7c]
ldrh r2, [r2, r4]
add r1, r7, #0
bl ListMenu_AddItem
bl ListMenuItems_AddItem
add r0, r7, #0
bl String_dtor
mov r0, #0x8b
@@ -9190,7 +9190,7 @@ _0223DC8E:
ldr r0, [r5, #0x7c]
ldr r1, [r1]
sub r3, #0xa
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
ldr r0, [sp]
bl DestroyMsgData
ldr r4, _0223DCEC ; =0x0224F38C
@@ -9220,7 +9220,7 @@ _0223DC8E:
add r0, r2, #0
add r2, r1, #0
str r5, [sp, #0x20]
bl FUN_020010A8
bl ListMenuInit
str r0, [r5, #0x78]
add sp, #0x24
pop {r4, r5, r6, r7, pc}
@@ -9236,7 +9236,7 @@ MOD06_0223DCF0: ; 0x0223DCF0
mov r1, #0x13
str r0, [sp, #0x10]
add r6, r2, #0
bl FUN_02001470
bl ListMenuGetTemplateField
add r4, r0, #0
cmp r6, #1
beq _0223DD0C
@@ -9246,7 +9246,7 @@ _0223DD0C:
add r0, r4, #0
add r0, #0x18
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #1
mvn r1, r1
cmp r5, r1
@@ -9328,7 +9328,7 @@ _0223DDBA:
ldr r0, [sp, #0x10]
add r1, #2
add r2, sp, #0x14
bl FUN_02001448
bl ListMenuGetScrollAndRow
add r0, sp, #0x14
ldrh r0, [r0, #2]
cmp r0, #0
@@ -9348,7 +9348,7 @@ _0223DDE4:
_0223DDF0:
ldr r0, [sp, #0x10]
mov r1, #2
bl FUN_02001470
bl ListMenuGetTemplateField
cmp r0, #7
bls _0223DE16
add r1, sp, #0x14
@@ -9383,7 +9383,7 @@ MOD06_0223DE34: ; 0x0223DE34
add r4, r1, #0
mov r1, #0x13
add r7, r2, #0
bl FUN_02001470
bl ListMenuGetTemplateField
mov r1, #1
mvn r1, r1
add r5, r0, #0
@@ -9456,7 +9456,7 @@ MOD06_0223DED0: ; 0x0223DED0
bne _0223DF1C
add r0, #0x28
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
add r0, #0x28
mov r1, #1
@@ -9491,7 +9491,7 @@ _0223DF1C:
mov r1, #0xf
mov r2, #0
str r3, [sp, #4]
bl FUN_020196F4
bl FillWindowPixelRect
_0223DF30:
mov r0, #0x10
mov r1, #0xb
@@ -9558,14 +9558,14 @@ MOD06_0223DFB4: ; 0x0223DFB4
ldr r0, [r5, #0x78]
mov r1, #0
add r2, #2
bl FUN_02001448
bl ListMenuGetScrollAndRow
ldr r0, [r5, #0x78]
bl FUN_02001204
bl ListMenu_ProcessInput
add r4, r0, #0
ldr r0, [r5, #0x78]
mov r1, #0
add r2, sp, #0
bl FUN_02001448
bl ListMenuGetScrollAndRow
add r0, sp, #0
ldrh r2, [r0]
ldrh r0, [r0, #2]
@@ -9595,9 +9595,9 @@ _0223E006:
mov r1, #0
ldr r0, [r5, #0x78]
add r2, r1, #0
bl FUN_02001300
bl DestroyListMenu
ldr r0, [r5, #0x7c]
bl ListMenu_dtor
bl ListMenuItems_dtor
add r0, r5, #0
bl MOD06_0223D9C0
add r0, r5, #0
@@ -9637,7 +9637,7 @@ _0223E034:
add r0, r5, #0
add r0, #0x58
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
add r0, #0x18
bl FUN_02019570
@@ -9832,7 +9832,7 @@ _0223E214:
add r0, r5, #0
add r0, #0x48
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
add r0, #0x48
mov r1, #1
@@ -9934,7 +9934,7 @@ _0223E2C4:
add r0, r4, #0
add r0, #0x58
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _0223E380 ; =0x000005DC
bl FUN_020054C8
add r0, r4, #0
@@ -10167,7 +10167,7 @@ MOD06_0223E4E8: ; 0x0223E4E8
add r4, r1, #0
add r0, #0x38
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
cmp r4, #0
bne _0223E50A
add r0, r5, #0
@@ -10429,7 +10429,7 @@ _0223E704:
add r0, r5, #0
add r0, #0x58
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r2, #0x23
lsl r2, r2, #4
ldr r1, [r5, r2]
@@ -10644,7 +10644,7 @@ _0223E88A:
add r0, r5, #0
add r0, #0x58
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r2, #0x23
lsl r2, r2, #4
ldr r1, [r5, r2]
@@ -11388,7 +11388,7 @@ _0223EEB8:
mov r1, #0
add r0, r2, #0
add r2, r1, #0
bl FUN_020010A8
bl ListMenuInit
ldr r1, _0223EF10 ; =0x02252420
ldr r2, [r1]
str r0, [r2, #0x5c]
@@ -11454,15 +11454,15 @@ _0223EF28:
str r0, [r2, #0x7c]
ldr r0, [r1]
add r0, #0x20
bl FUN_0201901C
bl InitWindow
ldr r0, _0223EFF4 ; =0x02252420
ldr r0, [r0]
add r0, #0x30
bl FUN_0201901C
bl InitWindow
ldr r0, _0223EFF4 ; =0x02252420
ldr r0, [r0]
add r0, #0x40
bl FUN_0201901C
bl InitWindow
mov r0, #4
bl ScrStrBufs_new
ldr r1, _0223EFF4 ; =0x02252420
@@ -11619,7 +11619,7 @@ MOD06_0223F0C8: ; 0x0223F0C8
mov r1, #3
add r5, r0, #0
mov r4, #0
bl FUN_02001470
bl ListMenuGetTemplateField
cmp r0, #0
bls _0223F0F6
add r6, r4, #0
@@ -11633,7 +11633,7 @@ _0223F0DC:
add r0, r5, #0
add r1, r7, #0
add r4, r4, #1
bl FUN_02001470
bl ListMenuGetTemplateField
cmp r4, r0
blo _0223F0DC
_0223F0F6:
@@ -11655,7 +11655,7 @@ MOD06_0223F0F8: ; 0x0223F0F8
cmp r0, #0
beq _0223F11A
add r1, sp, #0xc
bl FUN_02001448
bl ListMenuGetScrollAndRow
_0223F11A:
add r0, sp, #0xc
ldrh r1, [r0]
@@ -11665,7 +11665,7 @@ _0223F11A:
lsl r5, r5, #4
ldr r0, [r0]
add r0, #0x20
bl FUN_0201AB0C
bl GetWindowWidth
lsl r0, r0, #3
sub r0, #8
lsl r0, r0, #0x10
@@ -11680,7 +11680,7 @@ _0223F11A:
add r0, #0x20
mov r2, #8
lsr r3, r3, #0x10
bl FUN_020196F4
bl FillWindowPixelRect
add r0, sp, #0xc
ldrh r2, [r0]
cmp r2, r4
@@ -11853,7 +11853,7 @@ _0223F2AA:
mov r1, #0xf
ldr r0, [r0]
add r0, #0x30
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _0223F330 ; =0x02252420
ldr r0, [r0]
add r0, #0x30
@@ -11977,7 +11977,7 @@ MOD06_0223F3B8: ; 0x0223F3B8
beq _0223F450
mov r0, #0x10
mov r1, #4
bl ListMenu_ctor
bl ListMenuItems_ctor
ldr r4, _0223F454 ; =0x02252420
mov r5, #0
ldr r1, [r4]
@@ -12006,7 +12006,7 @@ _0223F3E0:
mov r2, #0
ldr r0, [r1, #0x64]
ldr r1, [r1]
bl ListMenu_AddItem
bl ListMenuItems_AddItem
add r5, r5, #1
cmp r5, #0x10
blt _0223F3E0
@@ -12074,7 +12074,7 @@ _0223F49A:
ldr r0, _0223F518 ; =0x02252420
ldr r0, [r0]
ldr r0, [r0, #0x5c]
bl FUN_02001204
bl ListMenu_ProcessInput
_0223F4A4:
mov r1, #1
mvn r1, r1
@@ -12105,7 +12105,7 @@ _0223F4D8:
add r1, r4, #0
ldr r0, [r4, #0x5c]
add r1, #0x8e
bl FUN_0200143C
bl ListMenuGetCurrentItemArrayId
add r0, r4, #0
add r0, #0x8e
ldrh r5, [r0]
@@ -12160,7 +12160,7 @@ _0223F53C:
mov r2, #8
add r0, #0x20
mov r3, #0
bl FUN_020196F4
bl FillWindowPixelRect
ldr r0, _0223F580 ; =0x02252420
mov r1, #0
ldr r0, [r0]
@@ -12451,7 +12451,7 @@ MOD06_0223F7C4: ; 0x0223F7C4
cmp r0, #0
beq _0223F7E0
add r1, sp, #0xc
bl FUN_02001448
bl ListMenuGetScrollAndRow
_0223F7E0:
add r0, sp, #0xc
ldrh r1, [r0]
@@ -12611,7 +12611,7 @@ _0223F910:
mov r1, #0xf
ldr r0, [r0]
add r0, #0x30
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _0223F950 ; =0x02252420
ldr r0, [r0]
add r0, #0x30
@@ -12727,7 +12727,7 @@ _0223FA02:
mov r1, #0xf
ldr r0, [r0]
add r0, #0x30
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _0223FA5C ; =0x02252420
add r1, r4, #0
ldr r2, [r0]
@@ -12821,7 +12821,7 @@ MOD06_0223FAB8: ; 0x0223FAB8
beq _0223FB4C
mov r0, #5
mov r1, #4
bl ListMenu_ctor
bl ListMenuItems_ctor
ldr r4, _0223FB50 ; =0x02252420
mov r5, #0
ldr r1, [r4]
@@ -12834,7 +12834,7 @@ _0223FAE6:
ldr r0, [r1, #0x64]
ldr r1, [r1, #0x74]
add r3, r7, #0
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
add r5, r5, #1
cmp r5, #5
blt _0223FAE6
@@ -12966,13 +12966,13 @@ _0223FBDA:
strb r0, [r2]
ldr r0, [r1]
ldr r0, [r0, #0x5c]
bl FUN_02001328
bl RedrawListMenu
ldr r0, _0223FCF0 ; =0x02252420
mov r1, #3
ldr r0, [r0]
mov r5, #0
ldr r0, [r0, #0x5c]
bl FUN_02001470
bl ListMenuGetTemplateField
cmp r0, #0
bls _0223FC32
ldr r4, _0223FCF0 ; =0x02252420
@@ -12989,13 +12989,13 @@ _0223FC14:
add r1, r7, #0
ldr r0, [r0, #0x5c]
add r5, r5, #1
bl FUN_02001470
bl ListMenuGetTemplateField
cmp r5, r0
blo _0223FC14
_0223FC32:
ldr r0, [sp, #4]
ldr r0, [r0, #0x5c]
bl FUN_02001204
bl ListMenu_ProcessInput
add r4, r0, #0
bl FUN_0202DF08
cmp r0, #0xff
@@ -13094,7 +13094,7 @@ MOD06_0223FD08: ; 0x0223FD08
add r0, r4, #0
bl MOD06_0223F9D8
ldr r0, [r4, #0x5c]
bl FUN_02001204
bl ListMenu_ProcessInput
ldr r0, [r4, #0x60]
mov r1, #4
bl FUN_020021AC
@@ -13421,7 +13421,7 @@ MOD06_0223FFD4: ; 0x0223FFD4
mov r0, #0
bl FUN_02031A24
ldr r0, [r4, #0x5c]
bl FUN_02001204
bl ListMenu_ProcessInput
ldr r0, _02240020 ; =0x02252420
ldr r0, [r0]
add r0, #0x94
@@ -13459,7 +13459,7 @@ MOD06_02240030: ; 0x02240030
add r0, r5, #0
bl MOD06_0223F9D8
ldr r0, [r5, #0x5c]
bl FUN_02001204
bl ListMenu_ProcessInput
ldr r0, [r5, #0x60]
mov r1, #4
bl FUN_020021AC
@@ -13681,7 +13681,7 @@ MOD06_02240204: ; 0x02240204
add r0, r4, #0
bl MOD06_0223F9D8
ldr r0, [r4, #0x5c]
bl FUN_02001204
bl ListMenu_ProcessInput
ldr r0, _02240248 ; =0x02252420
ldr r0, [r0]
add r0, #0x94
@@ -13719,7 +13719,7 @@ MOD06_02240258: ; 0x02240258
add r0, r5, #0
bl MOD06_0223F9D8
ldr r0, [r5, #0x5c]
bl FUN_02001204
bl ListMenu_ProcessInput
ldr r0, [r5, #0x60]
mov r1, #4
bl FUN_020021AC
@@ -13778,7 +13778,7 @@ _022402DC:
add r0, r4, #0
bl MOD06_0223F9D8
ldr r0, [r4, #0x5c]
bl FUN_02001204
bl ListMenu_ProcessInput
mov r0, #0xa
bl FUN_020315D8
cmp r0, #0
@@ -13804,7 +13804,7 @@ MOD06_02240310: ; 0x02240310
add r0, r4, #0
bl MOD06_0223F9D8
ldr r0, [r4, #0x5c]
bl FUN_02001204
bl ListMenu_ProcessInput
ldr r0, _02240354 ; =0x02252420
ldr r0, [r0]
add r0, #0x94
@@ -13843,17 +13843,17 @@ MOD06_02240364: ; 0x02240364
ldr r0, [r0]
mov r1, #0xf
add r0, #0x40
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
add r0, #0x20
mov r1, #0
bl FUN_0200CCF8
ldr r0, [r4, #0x64]
bl ListMenu_dtor
bl ListMenuItems_dtor
mov r1, #0
ldr r0, [r4, #0x5c]
add r2, r1, #0
bl FUN_02001300
bl DestroyListMenu
add r0, r4, #0
add r0, #0x20
bl FUN_02019570
@@ -14473,7 +14473,7 @@ MOD06_02240864: ; 0x02240864
bne _0224089E
add r0, r5, #0
add r0, #0x54
bl FUN_0201901C
bl InitWindow
ldr r0, [r5, #0x10]
add r1, r5, #0
ldr r0, [r0, #8]
@@ -14577,7 +14577,7 @@ _02240940:
bne _022409D2
add r0, r6, #2
mov r1, #4
bl ListMenu_ctor
bl ListMenuItems_ctor
str r0, [r5, #8]
mov r3, #1
str r3, [sp]
@@ -14605,7 +14605,7 @@ _02240940:
ldr r1, [r5, #0x68]
mov r2, #0x7b
mov r3, #0xc
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
mov r4, #0
cmp r6, #0
ble _022409C4
@@ -14625,7 +14625,7 @@ _02240998:
ldr r0, [r5, #8]
ldr r1, [r5, #0x20]
add r2, r4, #0
bl ListMenu_AddItem
bl ListMenuItems_AddItem
add r4, r4, #1
cmp r4, r6
blt _02240998
@@ -14635,7 +14635,7 @@ _022409C4:
ldr r0, [r5, #8]
ldr r1, [r5, #0x68]
sub r3, #0x74
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
_022409D2:
ldr r4, _02240A24 ; =0x0224F704
add r3, sp, #0x14
@@ -14666,7 +14666,7 @@ _022409D2:
add r2, #0x78
ldrh r2, [r2]
mov r3, #4
bl FUN_020010A8
bl ListMenuInit
str r0, [r5]
add r5, #0x34
add r0, r5, #0
@@ -14686,7 +14686,7 @@ MOD06_02240A28: ; 0x02240A28
beq _02240A62
mov r1, #0
add r2, r1, #0
bl FUN_02001300
bl DestroyListMenu
add r0, r4, #0
add r0, #0x34
mov r1, #1
@@ -14700,7 +14700,7 @@ MOD06_02240A28: ; 0x02240A28
add r0, #0x34
bl FUN_02019178
ldr r0, [r4, #8]
bl ListMenu_dtor
bl ListMenuItems_dtor
mov r0, #0
str r0, [r4]
_02240A62:
@@ -14711,20 +14711,20 @@ MOD06_02240A64: ; 0x02240A64
push {r4, r5, r6, lr}
add r5, r0, #0
ldr r0, [r5]
bl FUN_02001204
bl ListMenu_ProcessInput
add r4, r0, #0
add r2, r5, #0
ldr r0, [r5]
mov r1, #0
add r2, #0x78
bl FUN_02001448
bl ListMenuGetScrollAndRow
add r0, r5, #0
add r0, #0x80
ldrh r6, [r0]
add r1, r5, #0
ldr r0, [r5]
add r1, #0x80
bl FUN_0200143C
bl ListMenuGetCurrentItemArrayId
add r0, r5, #0
add r0, #0x80
ldrh r0, [r0]
@@ -14792,7 +14792,7 @@ MOD06_02240B04: ; 0x02240B04
mov r0, #3
mov r1, #4
ldr r4, _02240BA8 ; =MOD6_022522E4
bl ListMenu_ctor
bl ListMenuItems_ctor
str r0, [r5, #0xc]
mov r0, #0xa
str r0, [sp]
@@ -14823,7 +14823,7 @@ _02240B4A:
ldr r1, [r5, #0x68]
ldr r2, [r4]
ldr r3, [r4, #4]
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
add r6, r6, #1
add r4, #8
cmp r6, #3
@@ -14855,7 +14855,7 @@ _02240B4A:
add r2, #0x7a
ldrh r2, [r2]
mov r3, #4
bl FUN_020010A8
bl ListMenuInit
str r0, [r5, #4]
add r5, #0x44
add r0, r5, #0
@@ -14873,20 +14873,20 @@ MOD06_02240BB8: ; 0x02240BB8
push {r4, r5, r6, lr}
add r5, r0, #0
ldr r0, [r5, #4]
bl FUN_02001204
bl ListMenu_ProcessInput
add r4, r0, #0
add r2, r5, #0
ldr r0, [r5, #4]
mov r1, #0
add r2, #0x7a
bl FUN_02001448
bl ListMenuGetScrollAndRow
add r0, r5, #0
add r0, #0x82
ldrh r6, [r0]
add r1, r5, #0
ldr r0, [r5, #4]
add r1, #0x82
bl FUN_0200143C
bl ListMenuGetCurrentItemArrayId
add r0, r5, #0
add r0, #0x82
ldrh r0, [r0]
@@ -14921,7 +14921,7 @@ _02240C1A:
beq _02240C50
mov r1, #0
add r2, r1, #0
bl FUN_02001300
bl DestroyListMenu
add r0, r5, #0
add r0, #0x44
mov r1, #1
@@ -14935,7 +14935,7 @@ _02240C1A:
add r0, #0x44
bl FUN_02019178
ldr r0, [r5, #0xc]
bl ListMenu_dtor
bl ListMenuItems_dtor
mov r0, #0
str r0, [r5, #4]
_02240C50:
@@ -14992,7 +14992,7 @@ MOD06_02240C58: ; 0x02240C58
bl FUN_0200CCA4
ldr r0, [sp, #0x24]
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [sp, #0x14]
add r1, r0, #0
add r1, #0x78
@@ -19028,7 +19028,7 @@ MOD06_02242CDC: ; 0x02242CDC
mov r1, #0
add r2, r5, #0
mov r3, #4
bl FUN_020010A8
bl ListMenuInit
add r4, #0x88
str r0, [r4]
add sp, #0x14
@@ -19219,13 +19219,13 @@ MOD06_02242E9C: ; 0x02242E9C
mov r1, #3
mov r2, #0xf
mov r3, #4
bl FUN_020013E8
bl ListMenuOverrideSetColors
pop {r3, pc}
_02242EB2:
mov r1, #1
mov r2, #0xf
mov r3, #2
bl FUN_020013E8
bl ListMenuOverrideSetColors
pop {r3, pc}
.align 2, 0
@@ -19287,7 +19287,7 @@ MOD06_02242F1C: ; 0x02242F1C
add r4, r0, #0
add r0, #0x88
ldr r0, [r0]
bl FUN_02001204
bl ListMenu_ProcessInput
mov r1, #1
mvn r1, r1
cmp r0, r1
@@ -19331,7 +19331,7 @@ _02242F6E:
add r0, r4, #0
add r0, #0x88
ldr r0, [r0]
bl FUN_02001204
bl ListMenu_ProcessInput
mov r1, #1
mvn r1, r1
cmp r0, r1
@@ -19439,7 +19439,7 @@ MOD06_02243024: ; 0x02243024
mov r1, #0
ldr r0, [r0]
add r2, r1, #0
bl FUN_02001300
bl DestroyListMenu
ldr r0, [r6, #0x74]
mov r1, #0
bl FUN_0200CCF8
@@ -19480,7 +19480,7 @@ MOD06_02243080: ; 0x02243080
add r0, r5, #0
add r0, #0x14
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r5, #0x54]
ldr r1, [sp, #0xc]
add r2, r4, #0
@@ -40892,7 +40892,7 @@ MOD06_0224D46C: ; 0x0224D46C
bl FUN_0200CCA4
add r0, r4, #0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x64
mov r1, #0xb
bl String_ctor
@@ -41794,7 +41794,7 @@ MOD06_0224DC5C: ; 0x0224DC5C
str r3, [r5, #8]
add r0, r2, #0
mov r1, #1
bl FUN_02018FF4
bl AllocWindows
str r0, [r5, #4]
mov r0, #0x13
str r0, [sp]
@@ -41813,7 +41813,7 @@ MOD06_0224DC5C: ; 0x0224DC5C
bl FUN_02019064
ldr r0, [r5, #4]
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r5, #4]
mov r1, #0
mov r2, #1
@@ -41859,7 +41859,7 @@ MOD06_0224DCD8: ; 0x0224DCD8
_0224DCEC:
ldr r0, [r5, #4]
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
add r1, r6, #0
bl StringDup
@@ -42039,7 +42039,7 @@ MOD06_0224DE60: ; 0x0224DE60
beq _0224DED2
add r0, r3, #0
mov r1, #1
bl FUN_02018FF4
bl AllocWindows
str r0, [r6, #4]
mov r0, #0xb
str r0, [sp]
@@ -42077,7 +42077,7 @@ _0224DEA8:
str r0, [r6, #0xc]
ldr r0, [r6, #4]
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #1
str r0, [r6]
_0224DED2:
@@ -42148,7 +42148,7 @@ MOD06_0224DF1C: ; 0x0224DF1C
bl BufferIntegerAsString
ldr r0, [r5, #4]
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r7, #0
add r6, r5, #0
add r4, r7, #0
@@ -42214,7 +42214,7 @@ _0224DFC0:
add r2, #0x14
str r0, [r5, r2]
ldr r0, [sp, #0x14]
bl FUN_02018FF4
bl AllocWindows
str r0, [r5, #4]
mov r0, #1
str r0, [sp]
@@ -42332,7 +42332,7 @@ _0224E084:
mov r1, #0
ldr r0, _0224E16C ; =MOD6_022523A0
add r2, r1, #0
bl FUN_020010A8
bl ListMenuInit
str r0, [r5, #8]
ldr r0, [r5, #4]
mov r1, #0
@@ -42445,7 +42445,7 @@ _0224E1C0:
mov r1, #0
ldr r0, [r6, #8]
add r2, r1, #0
bl FUN_02001300
bl DestroyListMenu
ldr r0, [r6, #4]
bl FUN_02019570
ldr r0, [r6, #4]
@@ -42463,7 +42463,7 @@ MOD06_0224E1E4: ; 0x0224E1E4
push {r3, r4, r5, lr}
add r5, r0, #0
ldr r0, [r5, #8]
bl FUN_02001204
bl ListMenu_ProcessInput
mov r1, #0
add r4, r0, #0
mvn r1, r1
@@ -42471,7 +42471,7 @@ MOD06_0224E1E4: ; 0x0224E1E4
bne _0224E22A
ldr r0, [r5, #8]
add r1, sp, #0
bl FUN_0200143C
bl ListMenuGetCurrentItemArrayId
mov r2, #0x4b
add r0, sp, #0
lsl r2, r2, #2
@@ -42685,7 +42685,7 @@ MOD06_0224E39C: ; 0x0224E39C
ldr r0, [r4, #8]
add r1, sp, #0
mov r2, #0
bl FUN_02001448
bl ListMenuGetScrollAndRow
add r0, sp, #0
ldrh r0, [r0]
cmp r0, #0
arm9/modules/07/asm/module_07.s
+7 -7
View File
@@ -4858,7 +4858,7 @@ _0221459E:
mov r1, #0xa
mov r2, #0
mov r3, #2
bl FUN_020196F4
bl FillWindowPixelRect
lsl r0, r5, #0x10
lsr r0, r0, #0x10
str r0, [sp]
@@ -4868,7 +4868,7 @@ _0221459E:
mov r1, #9
mov r2, #0
mov r3, #3
bl FUN_020196F4
bl FillWindowPixelRect
lsl r0, r5, #0x10
lsr r0, r0, #0x10
str r0, [sp]
@@ -4878,7 +4878,7 @@ _0221459E:
mov r1, #0xa
mov r2, #0
mov r3, #5
bl FUN_020196F4
bl FillWindowPixelRect
add sp, #0xc
pop {r4, r5, r6, r7, pc}
nop
@@ -4900,19 +4900,19 @@ MOD07_02214600: ; 0x02214600
mov r1, #0
str r2, [sp, #0xc]
str r3, [sp, #0x10]
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, r4
add r0, #0x10
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, r4
add r0, #0x20
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, r4
add r0, #0x30
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [sp, #0x28]
ldr r1, [sp, #8]
str r0, [sp]
arm9/modules/09/asm/module_09.s
+117 -117
View File
@@ -3922,7 +3922,7 @@ _02213D74:
ldr r0, [r4]
ldrb r1, [r4, r1]
ldr r0, [r0, #0xc]
bl FUN_02018FF4
bl AllocWindows
ldr r1, _02213DDC ; =0x00002070
mov r5, #0
str r0, [r4, r1]
@@ -4150,7 +4150,7 @@ _02213F22:
bl NewString_ReadMsgData
add r6, r0, #0
add r0, r5, r4
bl FUN_0201AB0C
bl GetWindowWidth
str r0, [sp, #0x28]
mov r0, #0
add r1, r6, #0
@@ -4196,7 +4196,7 @@ _02213FA6:
bl NewString_ReadMsgData
add r6, r0, #0
add r0, r5, r4
bl FUN_0201AB0C
bl GetWindowWidth
str r0, [sp, #0x2c]
mov r0, #0
add r1, r6, #0
@@ -4419,7 +4419,7 @@ _0221415E:
add r0, r0, r5
lsr r1, r1, #0x18
lsr r3, r3, #0x10
bl FUN_020196F4
bl FillWindowPixelRect
ldr r0, [sp, #0x14]
add r3, r6, #2
str r0, [sp]
@@ -4432,7 +4432,7 @@ _0221415E:
add r0, r0, r5
add r1, r7, #0
lsr r3, r3, #0x10
bl FUN_020196F4
bl FillWindowPixelRect
ldr r0, [sp, #0x14]
ldr r1, [sp, #0x10]
str r0, [sp]
@@ -4447,7 +4447,7 @@ _0221415E:
add r0, r0, r5
lsr r1, r1, #0x18
lsr r3, r3, #0x10
bl FUN_020196F4
bl FillWindowPixelRect
ldr r0, _022141D4 ; =0x00002070
ldr r0, [r4, r0]
add r0, r0, r5
@@ -4623,7 +4623,7 @@ MOD09_022142FC: ; 0x022142FC
cmp r0, #2
bne _02214360
add r0, r4, r6
bl FUN_0201AB0C
bl GetWindowWidth
add r5, r0, #0
add r0, sp, #0x20
ldrh r0, [r0, #0x10]
@@ -4718,7 +4718,7 @@ MOD09_022143F8: ; 0x022143F8
ldr r0, _02214450 ; =0x00002050
mov r1, #0xf
add r0, r4, r0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02214454 ; =0x00001FA8
add r1, r5, #0
ldr r0, [r4, r0]
@@ -4766,7 +4766,7 @@ MOD09_0221445C: ; 0x0221445C
bl FUN_02002E14
add r6, r0, #0
add r0, r5, r4
bl FUN_0201AB0C
bl GetWindowWidth
add r3, r0, #0
mov r0, #6
str r0, [sp]
@@ -4944,7 +4944,7 @@ _022145F4:
ldr r0, [r5, r0]
lsl r4, r6, #4
add r0, r0, r4
bl FUN_0201AB0C
bl GetWindowWidth
add r6, r0, #0
mov r0, #0
ldr r1, [sp, #0x10]
@@ -5070,7 +5070,7 @@ MOD09_02214694: ; 0x02214694
ldr r0, _02214780 ; =0x00002070
ldr r0, [r5, r0]
add r0, r0, r4
bl FUN_0201AB0C
bl GetWindowWidth
lsl r0, r0, #3
sub r0, r0, r7
lsl r0, r0, #0x18
@@ -5179,7 +5179,7 @@ MOD09_02214790: ; 0x02214790
ldr r0, _0221487C ; =0x00002070
ldr r0, [r5, r0]
add r0, r0, r4
bl FUN_0201AB0C
bl GetWindowWidth
lsl r0, r0, #3
sub r0, r0, r7
lsl r0, r0, #0x18
@@ -5289,7 +5289,7 @@ MOD09_0221488C: ; 0x0221488C
ldr r0, _0221497C ; =0x00002070
ldr r0, [r5, r0]
add r0, r0, r4
bl FUN_0201AB0C
bl GetWindowWidth
lsl r0, r0, #3
sub r0, r0, r7
lsl r0, r0, #0x18
@@ -5401,7 +5401,7 @@ MOD09_0221498C: ; 0x0221498C
ldr r0, [r4, r0]
lsl r5, r5, #4
add r0, r0, r5
bl FUN_0201AB0C
bl GetWindowWidth
lsl r0, r0, #3
sub r0, r0, r7
lsl r0, r0, #0x18
@@ -5513,7 +5513,7 @@ MOD09_02214A8C: ; 0x02214A8C
ldr r0, [r4, r0]
lsl r5, r5, #4
add r0, r0, r5
bl FUN_0201AB0C
bl GetWindowWidth
lsl r0, r0, #3
sub r0, r0, r7
lsl r0, r0, #0x18
@@ -5602,7 +5602,7 @@ MOD09_02214B8C: ; 0x02214B8C
ldr r0, _02214D14 ; =0x00002070
ldr r0, [r5, r0]
add r0, #0x40
bl FUN_0201AB0C
bl GetWindowWidth
lsl r1, r0, #3
ldr r0, [sp, #0x14]
ldr r2, [sp, #0x10]
@@ -5843,7 +5843,7 @@ MOD09_02214DE8: ; 0x02214DE8
lsl r0, r0, #0x10
lsr r5, r0, #0x10
add r0, r4, r6
bl FUN_0201AB0C
bl GetWindowWidth
lsl r0, r0, #3
sub r0, r0, r5
lsl r0, r0, #0x10
@@ -5893,7 +5893,7 @@ _02214E42:
lsl r0, r0, #0x10
lsr r5, r0, #0x10
add r0, r4, r6
bl FUN_0201AB0C
bl GetWindowWidth
lsl r0, r0, #3
sub r0, r0, r5
lsl r0, r0, #0x10
@@ -5979,7 +5979,7 @@ MOD09_02214F18: ; 0x02214F18
lsl r0, r0, #0x10
lsr r5, r0, #0x10
add r0, r4, r6
bl FUN_0201AB0C
bl GetWindowWidth
lsl r0, r0, #3
sub r0, r0, r5
lsl r0, r0, #0x10
@@ -6029,7 +6029,7 @@ _02214F72:
lsl r0, r0, #0x10
lsr r5, r0, #0x10
add r0, r4, r6
bl FUN_0201AB0C
bl GetWindowWidth
lsl r0, r0, #3
sub r0, r0, r5
lsl r0, r0, #0x10
@@ -6166,7 +6166,7 @@ MOD09_022150C8: ; 0x022150C8
lsl r0, r0, #0x10
lsr r6, r0, #0x10
add r0, r5, r4
bl FUN_0201AB0C
bl GetWindowWidth
lsl r0, r0, #3
sub r1, r0, r6
lsr r0, r1, #0x1f
@@ -6275,7 +6275,7 @@ MOD09_022151A8: ; 0x022151A8
bl FUN_02002E14
str r0, [sp, #0x1c]
add r0, r4, r6
bl FUN_0201AB0C
bl GetWindowWidth
lsl r1, r0, #3
ldr r0, [sp, #0x1c]
ldr r2, [sp, #0x18]
@@ -6461,7 +6461,7 @@ _02215362:
_02215368:
add r0, r5, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _022153A8 ; =0x00001FA8
mov r1, #0x3c
ldr r0, [r4, r0]
@@ -6673,7 +6673,7 @@ MOD09_022154FC: ; 0x022154FC
mov r1, #0
lsr r2, r2, #0x10
mov r3, #0x18
bl FUN_020196F4
bl FillWindowPixelRect
ldr r0, _022155C4 ; =0x00001FA8
mov r1, #0x2c
ldr r0, [r5, r0]
@@ -6748,7 +6748,7 @@ _022155EE:
ldr r0, [sp, #8]
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldrh r0, [r6, #8]
cmp r0, #0
beq _0221563E
@@ -6828,7 +6828,7 @@ MOD09_0221567C: ; 0x0221567C
add r0, r0, r4
mov r2, #0x38
mov r3, #0x20
bl FUN_020196F4
bl FillWindowPixelRect
mov r2, #0x40
str r2, [sp]
mov r0, #8
@@ -6838,7 +6838,7 @@ MOD09_0221567C: ; 0x0221567C
ldr r0, [r5, r0]
mov r3, #0x18
add r0, r0, r4
bl FUN_020196F4
bl FillWindowPixelRect
mov r0, #0x20
str r0, [sp]
add r0, r5, #0
@@ -6884,22 +6884,22 @@ MOD09_022156FC: ; 0x022156FC
ldr r0, _02215780 ; =0x00002070
mov r1, #0
ldr r0, [r4, r0]
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215780 ; =0x00002070
mov r1, #0
ldr r0, [r4, r0]
add r0, #0x10
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215780 ; =0x00002070
mov r1, #0
ldr r0, [r4, r0]
add r0, #0x20
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215780 ; =0x00002070
mov r1, #0
ldr r0, [r4, r0]
add r0, #0x30
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r1, [r4]
add r0, r4, #0
ldrb r1, [r1, #0x11]
@@ -7030,7 +7030,7 @@ _02215830:
mov r4, #8
_02215840:
ldr r0, [sp, #0x18]
bl FUN_0201AB0C
bl GetWindowWidth
lsl r0, r0, #3
sub r0, r0, r6
sub r0, r0, r7
@@ -7122,7 +7122,7 @@ MOD09_022158EC: ; 0x022158EC
lsl r0, r6, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r6, #1
lsl r0, r0, #4
str r0, [sp, #0x18]
@@ -7131,7 +7131,7 @@ MOD09_022158EC: ; 0x022158EC
ldr r0, [sp, #0x18]
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r6, #2
lsl r0, r0, #4
str r0, [sp, #0x14]
@@ -7140,7 +7140,7 @@ MOD09_022158EC: ; 0x022158EC
ldr r0, [sp, #0x14]
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r6, #3
lsl r0, r0, #4
str r0, [sp, #0x10]
@@ -7149,7 +7149,7 @@ MOD09_022158EC: ; 0x022158EC
ldr r0, [sp, #0x10]
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r6, #4
lsl r0, r0, #4
str r0, [sp, #0xc]
@@ -7158,12 +7158,12 @@ MOD09_022158EC: ; 0x022158EC
ldr r0, [sp, #0xc]
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215A20 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x50
bl FUN_02019620
bl FillWindowPixelBuffer
mov r2, #0
str r2, [sp]
str r2, [sp, #4]
@@ -7269,63 +7269,63 @@ MOD09_02215A2C: ; 0x02215A2C
lsl r0, r0, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215C40 ; =0x00002070
ldr r1, [r5, r0]
mov r0, #5
lsl r0, r0, #6
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215C40 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0xe0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215C40 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0xf0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215C40 ; =0x00002070
ldr r1, [r5, r0]
mov r0, #1
lsl r0, r0, #8
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215C40 ; =0x00002070
ldr r1, [r5, r0]
mov r0, #0x11
lsl r0, r0, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215C40 ; =0x00002070
ldr r1, [r5, r0]
mov r0, #0x12
lsl r0, r0, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215C40 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0xd0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215C40 ; =0x00002070
ldr r1, [r5, r0]
mov r0, #0x15
lsl r0, r0, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215C40 ; =0x00002070
ldr r1, [r5, r0]
lsl r0, r4, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215C40 ; =0x00002070
ldr r1, [r5, r0]
add r0, r4, #0
@@ -7333,7 +7333,7 @@ MOD09_02215A2C: ; 0x02215A2C
lsl r0, r0, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215C40 ; =0x00002070
ldr r1, [r5, r0]
add r0, r4, #0
@@ -7341,7 +7341,7 @@ MOD09_02215A2C: ; 0x02215A2C
lsl r0, r0, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215C40 ; =0x00002070
ldr r1, [r5, r0]
add r0, r4, #0
@@ -7349,28 +7349,28 @@ MOD09_02215A2C: ; 0x02215A2C
lsl r0, r0, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215C40 ; =0x00002070
ldr r1, [r5, r0]
add r0, r4, #5
lsl r0, r0, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215C40 ; =0x00002070
ldr r1, [r5, r0]
add r0, r4, #6
lsl r0, r0, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215C40 ; =0x00002070
ldr r1, [r5, r0]
add r0, r4, #7
lsl r0, r0, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215C40 ; =0x00002070
ldr r1, [r5, r0]
add r0, r4, #0
@@ -7378,7 +7378,7 @@ MOD09_02215A2C: ; 0x02215A2C
lsl r0, r0, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215C40 ; =0x00002070
ldr r1, [r5, r0]
add r0, r4, #0
@@ -7386,35 +7386,35 @@ MOD09_02215A2C: ; 0x02215A2C
lsl r0, r0, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215C40 ; =0x00002070
ldr r1, [r5, r0]
add r0, r4, #4
lsl r0, r0, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215C40 ; =0x00002070
ldr r1, [r5, r0]
add r0, r4, #1
lsl r0, r0, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215C40 ; =0x00002070
ldr r1, [r5, r0]
add r0, r4, #2
lsl r0, r0, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215C40 ; =0x00002070
ldr r1, [r5, r0]
add r0, r4, #3
lsl r0, r0, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r2, #0
str r2, [sp]
str r2, [sp, #4]
@@ -7502,68 +7502,68 @@ MOD09_02215C44: ; 0x02215C44
mul r4, r1
add r0, #0x60
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215D9C ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x70
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215D9C ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x80
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215D9C ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x90
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215D9C ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0xa0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215D9C ; =0x00002070
ldr r1, [r5, r0]
add r0, r4, #1
lsl r0, r0, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215D9C ; =0x00002070
ldr r1, [r5, r0]
lsl r0, r4, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215D9C ; =0x00002070
ldr r1, [r5, r0]
add r0, r4, #2
lsl r0, r0, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215D9C ; =0x00002070
ldr r1, [r5, r0]
add r0, r4, #3
lsl r0, r0, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215D9C ; =0x00002070
ldr r1, [r5, r0]
add r0, r4, #5
lsl r0, r0, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215D9C ; =0x00002070
ldr r1, [r5, r0]
add r0, r4, #4
lsl r0, r0, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r5]
add r2, r5, #0
ldrb r3, [r0, #0x11]
@@ -7652,32 +7652,32 @@ MOD09_02215DA8: ; 0x02215DA8
ldr r0, _02215EC4 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215EC4 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x10
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215EC4 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x20
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215EC4 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x30
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215EC4 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x40
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02215EC4 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x50
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0
str r1, [sp]
str r1, [sp, #4]
@@ -7785,62 +7785,62 @@ MOD09_02215ED0: ; 0x02215ED0
ldr r0, _02216090 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02216090 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x20
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02216090 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x30
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02216090 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x10
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02216090 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x40
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02216090 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x60
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02216090 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x50
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02216090 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x70
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02216090 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x90
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02216090 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0xa0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02216090 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x80
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02216090 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0xb0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0
str r1, [sp]
str r1, [sp, #4]
@@ -7983,27 +7983,27 @@ MOD09_0221609C: ; 0x0221609C
ldr r0, _02216184 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02216184 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x10
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02216184 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x20
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02216184 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x30
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02216184 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x40
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0
str r1, [sp]
str r1, [sp, #4]
@@ -8112,37 +8112,37 @@ MOD09_022161B0: ; 0x022161B0
ldr r0, _02216304 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02216304 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x20
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02216304 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x30
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02216304 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x10
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02216304 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x40
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02216304 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x50
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02216304 ; =0x00002070
mov r1, #0
ldr r0, [r5, r0]
add r0, #0x60
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0
str r1, [sp]
str r1, [sp, #4]
@@ -8275,7 +8275,7 @@ MOD09_02216314: ; 0x02216314
ldr r0, _02216338 ; =0x00002060
mov r1, #0xf
add r0, r4, r0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
bl MOD09_0221633C
pop {r4, pc}
@@ -11816,7 +11816,7 @@ _0221803C:
lsl r1, r1, #4
add r0, r0, r1
add r1, r7, #0
bl FUN_0201A8C8
bl ScrollWindow
ldr r1, _022180B0 ; =0x00002070
ldr r0, [r5, r1]
add r1, r1, #5
@@ -11839,7 +11839,7 @@ _02218072:
add r0, r1, r0
ldr r2, [sp]
add r1, r7, #0
bl FUN_0201A8C8
bl ScrollWindow
ldr r0, _022180B0 ; =0x00002070
ldr r1, [r5, r0]
ldrb r0, [r6, r4]
@@ -14355,7 +14355,7 @@ _022194C6:
add r1, #0x30
ldrb r1, [r1]
ldr r0, [r0, #0xc]
bl FUN_02018FF4
bl AllocWindows
str r0, [r5, #0x2c]
add r0, r5, #0
add r0, #0x30
@@ -14450,7 +14450,7 @@ MOD09_02219560: ; 0x02219560
bl FUN_02002E14
add r7, r0, #0
add r0, r5, r4
bl FUN_0201AB0C
bl GetWindowWidth
lsl r0, r0, #3
sub r0, r0, r7
lsr r3, r0, #1
@@ -14486,7 +14486,7 @@ _022195C4:
ldr r0, [r5, #0x2c]
add r1, r7, #0
add r0, r0, r4
bl FUN_02019620
bl FillWindowPixelBuffer
add r6, r6, #1
add r4, #0x10
cmp r6, #5
@@ -14588,7 +14588,7 @@ MOD09_02219694: ; 0x02219694
add r0, r4, r6
mov r1, #0
str r2, [sp, #0x10]
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02219730 ; =0x0000114D
lsl r7, r7, #2
ldrb r1, [r5, r0]
@@ -14626,7 +14626,7 @@ MOD09_02219694: ; 0x02219694
bl FUN_02002E14
add r7, r0, #0
add r0, r4, r6
bl FUN_0201AB0C
bl GetWindowWidth
lsl r0, r0, #3
sub r0, r0, r7
lsr r3, r0, #1
@@ -14664,7 +14664,7 @@ MOD09_02219738: ; 0x02219738
add r0, r4, r7
mov r1, #0
str r2, [sp, #0x10]
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _022197C4 ; =0x0000114D
lsl r6, r6, #2
ldrb r1, [r5, r0]
@@ -14827,7 +14827,7 @@ MOD09_02219884: ; 0x02219884
lsl r0, r0, #4
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r5, #0x10]
mov r1, #0x1c
ldr r4, [r5, #0x2c]
@@ -14841,7 +14841,7 @@ MOD09_02219884: ; 0x02219884
mov r0, #0x19
lsl r0, r0, #4
add r0, r4, r0
bl FUN_0201AB0C
bl GetWindowWidth
lsl r0, r0, #3
sub r0, r0, r7
lsr r6, r0, #1
@@ -14962,7 +14962,7 @@ MOD09_022199B4: ; 0x022199B4
lsl r0, r0, #6
add r0, r1, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _02219A6C ; =0x0000114D
ldrb r0, [r4, r0]
cmp r0, #3
@@ -15089,7 +15089,7 @@ MOD09_02219A8C: ; 0x02219A8C
bl StringExpandPlaceholders
add r0, r4, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0
str r1, [sp]
mov r0, #0xff
@@ -15170,7 +15170,7 @@ _02219B6C:
ldr r0, [r5, #0x2c]
add r1, r7, #0
add r0, r0, r4
bl FUN_02019620
bl FillWindowPixelBuffer
add r6, r6, #1
add r4, #0x10
cmp r6, #4
@@ -15230,7 +15230,7 @@ MOD09_02219BE0: ; 0x02219BE0
add r0, r4, #0
add r0, #0x1c
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
bl MOD09_02219C08
pop {r4, pc}
@@ -16913,7 +16913,7 @@ _0221A93C:
ldr r1, [sp]
add r2, r7, #0
mov r3, #0
bl FUN_0201A8C8
bl ScrollWindow
ldrb r0, [r4, r5]
ldr r1, [r6, #0x2c]
lsl r0, r0, #4
arm9/modules/11/asm/module_11_thumb1.s
+3 -3
View File
@@ -633,7 +633,7 @@ _0222D99A:
bl FUN_02019064
ldr r0, [r5, #8]
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r5, #8]
mov r1, #0
mov r2, #1
@@ -746,7 +746,7 @@ MOD11_0222DB50: ; 0x0222DB50
str r0, [r4, #4]
mov r0, #5
mov r1, #3
bl FUN_02018FF4
bl AllocWindows
mov r7, #0x73
str r0, [r4, #8]
mov r6, #0
@@ -795,7 +795,7 @@ _0222DC42:
bl FUN_02019064
ldr r0, [r4, #8]
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #8]
mov r1, #0
mov r2, #1
arm9/modules/11/asm/module_11_thumb2.s
+14 -14
View File
@@ -45,7 +45,7 @@ MOD11_0222F29C: ; 0x0222F29C
str r0, [r5, #4]
mov r0, #5
mov r1, #1
bl FUN_02018FF4
bl AllocWindows
str r0, [r5, #8]
add r0, r5, #0
bl FUN_0206BFF0
@@ -186,7 +186,7 @@ _0222F30E:
bl FUN_02019064
ldr r0, [r5, #8]
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r5, #8]
mov r1, #0
mov r2, #1
@@ -4854,7 +4854,7 @@ _022316CC:
add r4, r0, #0
add r0, r6, #0
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
mov r3, #0
ldr r0, [sp, #0x28]
str r3, [sp]
@@ -4892,7 +4892,7 @@ _02231708:
add r4, r0, #0
add r0, r6, #0
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
mov r3, #0
ldr r0, [sp, #0x28]
str r3, [sp]
@@ -4917,7 +4917,7 @@ _0223174C:
bl GetTrainerMessageByIdPair
add r0, r6, #0
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
mov r3, #0
ldr r0, [sp, #0x28]
str r3, [sp]
@@ -4962,7 +4962,7 @@ MOD11_0223178C: ; 0x0223178C
bl MOD11_022321EC
add r0, r7, #0
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
mov r3, #0
str r3, [sp]
ldr r0, _022317DC ; =MOD11_0223220C
@@ -5000,7 +5000,7 @@ MOD11_022317E0: ; 0x022317E0
beq _02231814
add r0, r4, #0
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
_02231814:
ldr r1, [sp, #0x28]
mov r0, #2
@@ -23862,7 +23862,7 @@ _0223AC50:
bl FUN_02019064
add r0, r5, #0
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
mov r1, #0
mov r2, #1
@@ -23987,7 +23987,7 @@ _0223ADBA:
mov r2, #0x50
mov r3, #0
add r7, r0, #0
bl FUN_020196F4
bl FillWindowPixelRect
mov r1, #0
str r1, [sp, #0x4c]
add r5, sp, #0xb0
@@ -28099,7 +28099,7 @@ _0223CF5C:
add r0, r6, #0
bl String_dtor
add r0, sp, #0x68
bl FUN_0201901C
bl InitWindow
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -62294,7 +62294,7 @@ MOD11_0224D518: ; 0x0224D518
bl MOD11_0222FF6C
add r6, r0, #0
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r6, #0
bl FUN_02019548
mov r1, #0x65
@@ -71657,7 +71657,7 @@ _022520D2:
bl MOD11_0222FF6C
add r6, r0, #0
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r6, #0
bl FUN_02019548
ldr r0, [r4]
@@ -88280,7 +88280,7 @@ _0225A49C:
cmp r4, #0
bne _0225A4DA
add r0, sp, #0x3c
bl FUN_0201901C
bl InitWindow
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -88914,7 +88914,7 @@ MOD11_0225A968: ; 0x0225A968
bl FUN_02019178
_0225A994:
add r0, r4, #0
bl FUN_0201901C
bl InitWindow
ldr r0, [r5]
bl MOD11_0222FF68
mov r1, #0
arm9/modules/12/asm/module_12.s
+13 -13
View File
@@ -7568,7 +7568,7 @@ MOD12_02231380: ; 0x02231380
add r6, r6, #1
_022313B0:
add r0, sp, #0x34
bl FUN_0201901C
bl InitWindow
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -9540,7 +9540,7 @@ _022322FE:
cmp r4, #0
bne _0223233C
add r0, sp, #0x3c
bl FUN_0201901C
bl InitWindow
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -10928,7 +10928,7 @@ MOD12_02232D7C: ; 0x02232D7C
bl FUN_02019178
_02232DA8:
add r0, r4, #0
bl FUN_0201901C
bl InitWindow
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -15225,7 +15225,7 @@ MOD12_02234EFC: ; 0x02234EFC
add r4, r0, #0
add r0, #0x34
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
add r4, #0x34
add r0, r4, #0
bl CopyWindowToVram
@@ -15275,7 +15275,7 @@ _02234F42:
add r0, r5, #0
add r0, #0x34
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
mov r3, #0
str r3, [sp]
str r4, [sp, #4]
@@ -25518,7 +25518,7 @@ _02239AF4:
add r0, r5, #0
add r0, #0x34
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
mov r3, #0
str r3, [sp]
str r4, [sp, #4]
@@ -29905,7 +29905,7 @@ _0223BCF0:
add r6, r6, #1
_0223BD1C:
add r0, sp, #0x38
bl FUN_0201901C
bl InitWindow
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -34767,7 +34767,7 @@ _0223E210:
add r0, r5, #0
add r0, #0x78
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
mov r3, #0
str r3, [sp]
str r4, [sp, #4]
@@ -35104,7 +35104,7 @@ _0223E49A:
add r0, r5, #0
add r0, #0x88
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
mov r3, #0
str r3, [sp]
str r3, [sp, #4]
@@ -43554,7 +43554,7 @@ _02242618:
add r0, r5, #0
add r0, #0x34
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
mov r3, #0
str r3, [sp]
str r4, [sp, #4]
@@ -43894,13 +43894,13 @@ _022428E6:
str r0, [sp, #0x14]
add r0, r4, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #5
lsl r0, r0, #4
str r0, [sp, #0x18]
add r0, r4, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #3
str r0, [sp]
mov r0, #0
@@ -47014,7 +47014,7 @@ _022440EE:
ldr r0, [r4]
mov r1, #0xff
add r0, #0x34
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4]
add r0, #0x34
bl CopyWindowToVram
arm9/modules/14/asm/module_14.s
+39 -39
View File
@@ -13820,7 +13820,7 @@ MOD14_021DE1D0: ; 0x021DE1D0
beq _021DE262
mov r0, #0xa
mov r1, #1
bl FUN_02018FF4
bl AllocWindows
add r4, r0, #0
beq _021DE250
ldr r0, _021DE270 ; =0x00005984
@@ -19634,7 +19634,7 @@ MOD14_021E0F40: ; 0x021E0F40
beq _021E0FA0
mov r0, #0xa
mov r1, #4
bl FUN_02018FF4
bl AllocWindows
str r0, [r5, #4]
cmp r0, #0
beq _021E0F94
@@ -19965,7 +19965,7 @@ _021E11CE:
add r0, #0x30
mov r2, #4
add r3, r1, #0
bl FUN_0201A8C8
bl ScrollWindow
ldr r0, [r5, #4]
add r0, #0x30
bl FUN_02019548
@@ -20058,7 +20058,7 @@ MOD14_021E1284: ; 0x021E1284
ldr r4, [r0, #4]
add r4, #0x30
add r0, r4, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldrh r2, [r5, #2]
ldr r1, [r5, #8]
add r0, r4, #0
@@ -20233,19 +20233,19 @@ MOD14_021E13F0: ; 0x021E13F0
beq _021E144E
ldr r0, [r4, #4]
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #4]
mov r1, #0xf
add r0, #0x10
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #4]
mov r1, #0xf
add r0, #0x20
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #4]
mov r1, #0
add r0, #0x30
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #0x10]
bl MOD14_021DC408
cmp r0, #0
@@ -20276,19 +20276,19 @@ MOD14_021E1450: ; 0x021E1450
beq _021E14CC
ldr r0, [r4, #4]
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #4]
mov r1, #0xf
add r0, #0x10
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #4]
mov r1, #0xf
add r0, #0x20
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #4]
mov r1, #0
add r0, #0x30
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #0x24]
cmp r0, #0
beq _021E148E
@@ -20334,19 +20334,19 @@ MOD14_021E14D0: ; 0x021E14D0
beq _021E153A
ldr r0, [r4, #4]
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #4]
mov r1, #0xf
add r0, #0x10
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #4]
mov r1, #0xf
add r0, #0x20
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #4]
mov r1, #0
add r0, #0x30
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #0x24]
cmp r0, #0
beq _021E150E
@@ -20615,7 +20615,7 @@ MOD14_021E1704: ; 0x021E1704
ldr r0, [r5, #4]
mov r1, #0
add r0, #0x30
bl FUN_02019620
bl FillWindowPixelBuffer
ldrb r0, [r4, #0xf]
cmp r0, #0
bne _021E1742
@@ -20751,7 +20751,7 @@ MOD14_021E1818: ; 0x021E1818
add r6, r0, #0
mov r0, #0xa
mov r1, #2
bl FUN_02018FF4
bl AllocWindows
str r0, [r6, #0x18]
cmp r0, #0
beq _021E1848
@@ -20828,7 +20828,7 @@ MOD14_021E189C: ; 0x021E189C
bl MOD14_021E1908
ldr r0, [r5, #0x18]
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r5, #0x10]
ldr r2, [r5, #0x30]
add r1, r4, #0
@@ -20976,7 +20976,7 @@ _021E19E8:
str r0, [sp, #0x14]
add r0, #0x10
str r0, [sp, #0x14]
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [sp, #0x10]
mov r6, #0
add r0, #0x21
@@ -21087,7 +21087,7 @@ _021E1AA0:
ldr r1, [r1, #0x14]
lsr r2, r2, #0x10
lsr r3, r3, #0x10
bl FUN_02019684
bl BlitBitmapRect
add sp, #0x1c
pop {r4, r5, pc}
.align 2, 0
@@ -21221,7 +21221,7 @@ MOD14_021E1B9C: ; 0x021E1B9C
mov r1, #0xf
mov r2, #0
lsr r3, r3, #0x10
bl FUN_020196F4
bl FillWindowPixelRect
add r6, #0x20
ldrb r2, [r6]
add r0, r4, #0
@@ -21631,7 +21631,7 @@ MOD14_021E1EEC: ; 0x021E1EEC
add r7, r0, #0
mov r0, #0xa
mov r1, #3
bl FUN_02018FF4
bl AllocWindows
str r0, [r7, #0x10]
cmp r0, #0
beq _021E1F1A
@@ -22259,7 +22259,7 @@ MOD14_021E2394: ; 0x021E2394
add r6, r0, #0
add r0, r4, #0
mov r1, #7
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0
str r1, [sp]
mov r0, #0xff
@@ -22288,7 +22288,7 @@ MOD14_021E23F8: ; 0x021E23F8
ldr r4, [r0, #0x10]
mov r1, #7
add r0, r4, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
bl FUN_02019548
pop {r4, pc}
@@ -22303,7 +22303,7 @@ MOD14_021E240C: ; 0x021E240C
str r0, [sp, #0xc]
add r0, #0x10
str r0, [sp, #0xc]
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r7, #0
bl MOD14_021E2188
mov r6, #0
@@ -22345,7 +22345,7 @@ MOD14_021E2464: ; 0x021E2464
mov r1, #4
add r4, #0x10
add r0, r4, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
bl FUN_02019548
pop {r4, pc}
@@ -22698,7 +22698,7 @@ MOD14_021E26E4: ; 0x021E26E4
ldr r0, [r5, #0x10]
mov r1, #4
add r0, #0x20
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r2, _021E279C ; =0x00004BF8
add r1, r6, #0
ldr r0, [r5, r2]
@@ -24684,7 +24684,7 @@ MOD14_021E355C: ; 0x021E355C
add r0, r4, #0
add r0, #0x88
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
add r0, #0x88
bl CopyWindowToVram
@@ -27058,7 +27058,7 @@ _021E47AE:
ldrh r3, [r5, #2]
add r0, r7, #0
mov r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
mov r0, #2
ldrsh r0, [r5, r0]
mov r1, #0
@@ -28653,11 +28653,11 @@ _021E541E:
add r0, r7, #0
add r0, #0x78
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r7, #0
add r0, #0x88
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r4, r7, #0
mov r5, #0
add r4, #0x78
@@ -28797,7 +28797,7 @@ _021E554C:
bl FUN_02019270
add r0, r5, r4
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r6, r6, #1
add r7, #8
cmp r6, #2
@@ -28983,7 +28983,7 @@ _021E56B4:
bl FUN_02019270
add r0, r5, r4
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r6, r6, #1
add r7, #8
cmp r6, #2
@@ -29032,7 +29032,7 @@ MOD14_021E5718: ; 0x021E5718
add r7, #0x98
add r0, r7, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r5, #8]
bl MOD14_021DC560
cmp r0, #0
@@ -29116,7 +29116,7 @@ MOD14_021E57CC: ; 0x021E57CC
add r4, #0x98
add r0, r4, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
bl FUN_02019548
pop {r4, pc}
@@ -29156,7 +29156,7 @@ _021E581A:
str r0, [sp, #0x14]
add r0, r4, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [sp, #0x18]
cmp r0, #1
bne _021E5836
@@ -29299,7 +29299,7 @@ _021E593E:
str r0, [sp, #0x18]
add r0, r4, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [sp, #0x1c]
cmp r0, #1
bne _021E595A
@@ -29753,7 +29753,7 @@ MOD14_021E5CFC: ; 0x021E5CFC
add r4, r1, r0
add r0, r4, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r5, #8]
bl MOD14_021DC3F0
cmp r0, #0
arm9/modules/15/asm/module_15.s
+22 -22
View File
@@ -4345,7 +4345,7 @@ MOD15_021D95E8: ; 0x021D95E8
bl NewMsgDataFromNarc
str r0, [r4, #0x48]
mov r0, #0x23
bl FUN_02013690
bl ListMenuCursorNew
str r0, [r4, #0x50]
add r0, r4, #0
pop {r3, r4, r5, r6, r7, pc}
@@ -4359,7 +4359,7 @@ MOD15_021D9634: ; 0x021D9634
ldr r0, [r4, #0x50]
cmp r0, #0
beq _021D9642
bl FUN_020136C0
bl DestroyListMenuCursorObj
_021D9642:
ldr r0, [r4, #0x3c]
cmp r0, #0
@@ -4749,7 +4749,7 @@ MOD15_021D9964: ; 0x021D9964
add r0, r4, #0
add r0, #0xc
mov r1, #0xd
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #4]
bl MOD15_021D86E4
cmp r0, #0
@@ -5135,7 +5135,7 @@ MOD15_021D9C30: ; 0x021D9C30
ldrh r3, [r3, #2]
add r0, r4, #0
mov r1, #0xe
bl FUN_020196F4
bl FillWindowPixelRect
add sp, #0xc
pop {r3, r4, pc}
@@ -5194,7 +5194,7 @@ MOD15_021D9CB4: ; 0x021D9CB4
add r5, r1, #0
add r0, #0x1c
mov r1, #9
bl FUN_02019620
bl FillWindowPixelBuffer
cmp r5, #3
bhi _021D9DB0
add r0, r5, r5
@@ -5462,7 +5462,7 @@ MOD15_021D9ECC: ; 0x021D9ECC
add r4, r1, #0
add r0, #0x2c
mov r1, #9
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r5, #0x48]
ldr r2, [r5, #0x4c]
mov r1, #9
@@ -5509,7 +5509,7 @@ MOD15_021D9ECC: ; 0x021D9ECC
add r1, #0x2c
mov r2, #0
lsl r3, r4, #4
bl FUN_020136F8
bl ListMenuUpdateCursorObj
add r5, #0x2c
add r0, r5, #0
bl CopyWindowToVram
@@ -5533,13 +5533,13 @@ MOD15_021D9F58: ; 0x021D9F58
add r0, #0x2c
mov r1, #9
add r3, r2, #0
bl FUN_020196F4
bl FillWindowPixelRect
ldr r0, [r5, #0x50]
add r5, #0x2c
add r1, r5, #0
mov r2, #0
lsl r3, r4, #4
bl FUN_020136F8
bl ListMenuUpdateCursorObj
add sp, #8
pop {r3, r4, r5, pc}
@@ -5650,7 +5650,7 @@ MOD15_021DA044: ; 0x021DA044
bl FUN_02019270
add r0, sp, #0x10
mov r1, #0xe
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r1, _021DA0B0 ; =0x00000183
mov r0, #0x1a
add r2, r4, #0
@@ -6021,7 +6021,7 @@ _021DA31A:
bl FUN_02019064
add r0, sp, #0x28
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0
add r1, r5, #0
add r2, r0, #0
@@ -6102,7 +6102,7 @@ _021DA3CC:
add r4, r0, #0
add r0, sp, #0x20
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
bl MOD15_021DB770
add r7, r0, #0
ldr r5, _021DA474 ; =0x00000000
@@ -6215,7 +6215,7 @@ _021DA4C2:
bl FUN_02019064
add r0, r6, #0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0
str r0, [sp]
mov r0, #0xff
@@ -6769,7 +6769,7 @@ MOD15_021DA8E8: ; 0x021DA8E8
add r0, r5, #0
add r0, #0x10
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
add r0, #0x10
bl FUN_02019270
@@ -6853,7 +6853,7 @@ MOD15_021DA9D4: ; 0x021DA9D4
add r6, r0, #0
add r0, #0x10
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r6, #0
bl MOD15_021DAD78
ldr r0, [r6, #4]
@@ -7291,7 +7291,7 @@ _021DAD1A:
add r0, r5, #0
add r2, r1, #0
lsr r3, r3, #0x10
bl FUN_020196F4
bl FillWindowPixelRect
add sp, #8
pop {r3, r4, r5, pc}
_021DAD3E:
@@ -7308,7 +7308,7 @@ _021DAD3E:
add r0, #0x10
add r2, r1, #0
lsr r3, r3, #0x10
bl FUN_020196F4
bl FillWindowPixelRect
mov r1, #0
mov r0, #0xd0
str r0, [sp]
@@ -7319,7 +7319,7 @@ _021DAD3E:
add r0, r5, #0
add r2, r1, #0
add r3, r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
add sp, #8
pop {r3, r4, r5, pc}
@@ -7378,7 +7378,7 @@ _021DADD4:
add r0, r5, #0
add r0, #0x20
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0
str r1, [sp]
mov r0, #0xff
@@ -7416,7 +7416,7 @@ _021DADD4:
ldr r1, [r5, #0x2c]
add r0, #0x10
add r3, r2, #0
bl FUN_02019658
bl BlitBitmapRectToWindow
mov r1, #0x60
lsl r2, r7, #0x10
lsl r3, r6, #0x10
@@ -7436,7 +7436,7 @@ _021DADD4:
ldr r1, [r5, #0x2c]
add r0, #0x10
lsr r3, r3, #0x10
bl FUN_02019658
bl BlitBitmapRectToWindow
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -7680,7 +7680,7 @@ MOD15_021DAFF8: ; 0x021DAFF8
cmp r0, #0
beq _021DB0D4
add r0, sp, #0x10
bl FUN_0201901C
bl InitWindow
ldr r0, [r5, #0xc]
add r1, sp, #0xc
str r0, [sp, #0x10]
arm9/modules/16/asm/module_16.s
+29 -29
View File
@@ -3518,7 +3518,7 @@ MOD16_021D8F60: ; 0x021D8F60
bl FUN_02019064
add r0, r4, #4
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #4
bl CopyWindowToVram
add sp, #0x14
@@ -8433,9 +8433,9 @@ MOD16_021DB388: ; 0x021DB388
add r4, r1, #0
mov r1, #1
add r6, r2, #0
bl FUN_02018FF4
bl AllocWindows
add r7, r0, #0
bl FUN_0201901C
bl InitWindow
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -9139,7 +9139,7 @@ MOD16_021DB7F4: ; 0x021DB7F4
str r0, [sp, #0x10]
str r0, [sp, #0x14]
ldr r0, [sp, #0x18]
bl FUN_02019658
bl BlitBitmapRectToWindow
_021DB848:
add sp, #0x20
pop {r3, r4, r5, r6, r7, pc}
@@ -13350,7 +13350,7 @@ _021DD77E:
ldr r0, [r5]
mov r1, #0
add r0, r0, #4
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r5]
mov r1, #1
ldr r0, [r0]
@@ -13505,7 +13505,7 @@ _021DD8A8:
ldr r0, [r5]
mov r1, #0
add r0, r0, #4
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r5]
mov r1, #1
ldr r0, [r0]
@@ -16653,7 +16653,7 @@ MOD16_021DEFF8: ; 0x021DEFF8
ldr r0, [r5]
mov r1, #0
add r0, r0, #4
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r5]
mov r1, #7
add r0, r0, #4
@@ -16737,7 +16737,7 @@ MOD16_021DF0BC: ; 0x021DF0BC
ldr r0, [r4]
mov r1, #0
add r0, r0, #4
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4]
mov r1, #0
add r0, r0, #4
@@ -17058,7 +17058,7 @@ MOD16_021DF350: ; 0x021DF350
mov r1, #0
mov r2, #0x18
mov r3, #8
bl FUN_020196F4
bl FillWindowPixelRect
cmp r6, #3
bhi _021DF394
add r0, r6, r6
@@ -17135,7 +17135,7 @@ MOD16_021DF3E4: ; 0x021DF3E4
mov r1, #0
mov r2, #0x18
mov r3, #8
bl FUN_020196F4
bl FillWindowPixelRect
mov r0, #0x5d
add r1, r5, #0
bl MOD16_021D8270
@@ -17387,7 +17387,7 @@ MOD16_021DF5D0: ; 0x021DF5D0
mov r1, #0
mov r2, #0x58
mov r3, #0x34
bl FUN_020196F4
bl FillWindowPixelRect
add r5, #0x51
add r0, r5, #0
add r1, r6, #0
@@ -17433,7 +17433,7 @@ MOD16_021DF630: ; 0x021DF630
mov r1, #0
mov r2, #0x58
mov r3, #0x4d
bl FUN_020196F4
bl FillWindowPixelRect
cmp r6, #9
bhi _021DF698
add r0, r6, r6
@@ -17529,7 +17529,7 @@ MOD16_021DF6D8: ; 0x021DF6D8
mov r1, #0
mov r2, #0x58
lsr r3, r3, #0x10
bl FUN_020196F4
bl FillWindowPixelRect
cmp r6, #0x11
bhi _021DF774
add r0, r6, r6
@@ -17852,7 +17852,7 @@ _021DF92E:
ldr r0, [r4]
mov r1, #0
add r0, r0, #4
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4]
add r0, r0, #4
bl FUN_02019220
@@ -17883,7 +17883,7 @@ MOD16_021DF970: ; 0x021DF970
add r4, r1, #0
add r0, r5, #4
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x5e
add r1, r4, #0
bl MOD16_021D8270
@@ -17928,7 +17928,7 @@ MOD16_021DF9C0: ; 0x021DF9C0
ldr r0, [r5]
mov r1, #0
add r0, r0, #4
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r1, [r4]
add r0, r5, #0
add r2, r6, #0
@@ -26946,7 +26946,7 @@ MOD16_021E3B70: ; 0x021E3B70
add r6, r2, #0
add r0, r0, #4
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
str r6, [sp]
ldr r3, _021E3BBC ; =0x000007F8
ldr r0, [r4]
@@ -26985,7 +26985,7 @@ MOD16_021E3BC8: ; 0x021E3BC8
ldr r0, [r4]
mov r1, #0
add r0, r0, #4
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4]
mov r1, #1
ldr r0, [r0]
@@ -27335,7 +27335,7 @@ MOD16_021E3E6C: ; 0x021E3E6C
ldr r0, [r4]
mov r1, #0
add r0, r0, #4
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #2
lsl r0, r0, #0xa
ldr r3, [r5, r0]
@@ -29593,7 +29593,7 @@ MOD16_021E4EE4: ; 0x021E4EE4
ldr r0, [r4]
mov r1, #0
add r0, r0, #4
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
add r1, r4, #0
bl MOD16_021E5224
@@ -34307,7 +34307,7 @@ MOD16_021E71A8: ; 0x021E71A8
ldr r0, [r4]
mov r1, #0
add r0, r0, #4
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
add r1, r4, #0
bl MOD16_021E753C
@@ -41593,7 +41593,7 @@ MOD16_021EA858: ; 0x021EA858
add r2, r1, #0
add r0, r0, #4
add r3, r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
ldr r0, [r4]
mov r1, #1
ldr r0, [r0]
@@ -41901,7 +41901,7 @@ MOD16_021EAAA4: ; 0x021EAAA4
mov r1, #0
lsr r2, r2, #0x10
lsr r3, r3, #0x10
bl FUN_020196F4
bl FillWindowPixelRect
ldr r1, [sp, #0x38]
ldr r0, [sp, #0xc]
mov r6, #0
@@ -42016,7 +42016,7 @@ _021EABA2:
mov r1, #6
lsr r2, r2, #0x10
lsr r3, r3, #0x10
bl FUN_020196F4
bl FillWindowPixelRect
str r5, [r4]
add sp, #0xc
pop {r4, r5, r6, r7, pc}
@@ -42049,7 +42049,7 @@ MOD16_021EABC4: ; 0x021EABC4
mov r1, #0
lsr r2, r2, #0x10
lsr r3, r3, #0x10
bl FUN_020196F4
bl FillWindowPixelRect
cmp r5, r6
bge _021EAC18
_021EABFE:
@@ -45513,7 +45513,7 @@ MOD16_021EC574: ; 0x021EC574
ldr r0, [r4]
mov r1, #0
add r0, r0, #4
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4]
mov r1, #1
ldr r0, [r0]
@@ -48265,7 +48265,7 @@ MOD16_021EDA3C: ; 0x021EDA3C
ldr r0, [r4]
mov r1, #0
add r0, r0, #4
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4]
mov r1, #1
ldr r0, [r0]
@@ -51457,7 +51457,7 @@ MOD16_021EF318: ; 0x021EF318
add r5, r0, #0
add r0, r1, #0
mov r1, #1
bl FUN_02018FF4
bl AllocWindows
add r4, r0, #0
mov r3, #0
str r3, [sp]
@@ -51473,7 +51473,7 @@ MOD16_021EF318: ; 0x021EF318
bl FUN_02019064
add r0, r4, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
bl CopyWindowToVram
add r0, r4, #0
arm9/modules/17/asm/module_17.s
+16 -16
View File
@@ -2123,7 +2123,7 @@ MOD17_021D83E4: ; 0x021D83E4
str r0, [r5, r1]
mov r0, #0xd
mov r1, #1
bl FUN_02018FF4
bl AllocWindows
ldr r2, _021D84EC ; =0x000006A8
mov r1, #0
str r0, [r5, r2]
@@ -2663,7 +2663,7 @@ _021D88F8:
str r0, [r4, r1]
mov r0, #0xd
mov r1, #1
bl FUN_02018FF4
bl AllocWindows
ldr r1, _021D8994 ; =0x000006A8
mov r2, #0
str r0, [r4, r1]
@@ -4691,7 +4691,7 @@ MOD17_021D9918: ; 0x021D9918
ldr r0, _021D99D4 ; =0x000006A8
mov r1, #0xf
ldr r0, [r5, r0]
bl FUN_02019620
bl FillWindowPixelBuffer
lsl r0, r6, #0x18
lsr r0, r0, #0x18
str r0, [sp]
@@ -4753,7 +4753,7 @@ MOD17_021D99E0: ; 0x021D99E0
add r4, r1, #0
ldr r0, [r5, r0]
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r2, _021D9A5C ; =0x00000151
mov r0, #0
mov r1, #0x1a
@@ -4818,7 +4818,7 @@ _021D9A7E:
ldr r0, _021D9B08 ; =0x000006A8
mov r1, #0xf
ldr r0, [r5, r0]
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r2, _021D9B0C ; =0x00000151
mov r0, #0
mov r1, #0x1a
@@ -11265,9 +11265,9 @@ _021DC898:
add r7, r0, #0
mov r0, #0xe
mov r1, #1
bl FUN_02018FF4
bl AllocWindows
add r4, r0, #0
bl FUN_0201901C
bl InitWindow
mov r0, #0
ldr r2, [sp, #0x28]
ldr r3, [sp, #0x2c]
@@ -11436,7 +11436,7 @@ _021DC9CC:
lsl r0, r0, #2
ldr r0, [r5, r0]
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -11789,9 +11789,9 @@ MOD17_021DCC68: ; 0x021DCC68
mov r0, #0xe
mov r1, #1
add r4, r2, #0
bl FUN_02018FF4
bl AllocWindows
str r0, [r5]
bl FUN_0201901C
bl InitWindow
lsl r0, r6, #0x18
lsr r0, r0, #0x18
str r0, [sp]
@@ -11817,7 +11817,7 @@ MOD17_021DCC68: ; 0x021DCC68
bl FUN_02019064
ldr r0, [r5]
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [sp, #0x34]
cmp r0, #0
beq _021DCCCC
@@ -11860,7 +11860,7 @@ MOD17_021DCCEC: ; 0x021DCCEC
add r5, r0, #0
add r6, r2, #0
add r7, r3, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [sp, #0x28]
add r1, r4, #0
str r0, [sp]
@@ -11896,7 +11896,7 @@ MOD17_021DCD34: ; 0x021DCD34
add r5, r0, #0
add r6, r2, #0
add r7, r3, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [sp, #0x28]
add r1, r4, #0
str r0, [sp]
@@ -12396,7 +12396,7 @@ _021DD0D0:
bl MOD17_021DCC68
ldr r0, [r7, #0x18]
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0
str r0, [sp]
mov r3, #4
@@ -14242,7 +14242,7 @@ MOD17_021DDF1C: ; 0x021DDF1C
add r4, r0, #0
mov r0, #0xe
mov r1, #1
bl FUN_02018FF4
bl AllocWindows
mov r1, #0x19
lsl r1, r1, #4
str r0, [r4, r1]
@@ -14313,7 +14313,7 @@ MOD17_021DDFAC: ; 0x021DDFAC
lsl r0, r0, #4
ldr r0, [r4, r0]
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #0xc]
cmp r0, #0
bne _021DDFCA
arm9/modules/18/asm/module_18.s
+169 -169
View File
File diff suppressed because it is too large Load Diff
arm9/modules/20/asm/module_20.s
+9 -9
View File
@@ -3279,23 +3279,23 @@ _02253C0E:
cmp r1, #0
beq _02253C22
add r0, r5, #0
bl FUN_02016A8C
bl FreeToHeapExplicit
_02253C22:
ldr r1, [r4, #0xc]
cmp r1, #0
beq _02253C2E
add r0, r5, #0
bl FUN_02016A8C
bl FreeToHeapExplicit
_02253C2E:
ldr r1, [r4, #4]
cmp r1, #0
beq _02253C3A
add r0, r5, #0
bl FUN_02016A8C
bl FreeToHeapExplicit
_02253C3A:
add r0, r5, #0
add r1, r4, #0
bl FUN_02016A8C
bl FreeToHeapExplicit
_02253C42:
mov r0, #0
pop {r3, r4, r5, r6, r7, pc}
@@ -3848,7 +3848,7 @@ MOD20_02254014: ; 0x02254014
cmp r1, #0
beq _02254028
ldr r0, [r4, #0x10]
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r0, #0
str r0, [r4]
_02254028:
@@ -3856,7 +3856,7 @@ _02254028:
cmp r1, #0
beq _02254038
ldr r0, [r4, #0x10]
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r0, #0
str r0, [r4, #4]
_02254038:
@@ -4072,7 +4072,7 @@ _02254176:
_02254188:
add r0, r5, #0
add r1, r4, #0
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r4, #0
_02254192:
add r0, r4, #0
@@ -4089,10 +4089,10 @@ MOD20_02254198: ; 0x02254198
_022541A2:
ldr r0, [r4, #8]
ldr r1, [r4, #0x14]
bl FUN_02016A8C
bl FreeToHeapExplicit
ldr r0, [r4, #8]
add r1, r4, #0
bl FUN_02016A8C
bl FreeToHeapExplicit
pop {r4, pc}
thumb_func_end MOD20_02254198
arm9/modules/21/src/mod21_02254854.c
+1 -1
View File
@@ -29,7 +29,7 @@ THUMB_FUNC BOOL MOD21_02254854(UnkStruct02254854 **param0, u32 param1, u32 param
UnkStruct02254854 *alloced = (UnkStruct02254854 *)AllocFromHeap(8, sizeof(UnkStruct02254854));
if (alloced != NULL)
{
if (MOD21_0225489C(alloced, param1, param2, param3) && FUN_0200CA44((void (*)(u32, void *))MOD21_02254930, alloced, (void *)1))
if (MOD21_0225489C(alloced, param1, param2, param3) && FUN_0200CA44((void (*)(u32, struct TextPrinter *))MOD21_02254930, (struct TextPrinter *)alloced, 1))
{
*param0 = alloced;
return TRUE;
arm9/modules/24/asm/module_24.s
+4 -4
View File
@@ -662,7 +662,7 @@ MOD24_02254D00: ; 0x02254D00
add r4, r0, #0
mov r0, #8
mov r1, #1
bl FUN_02018FF4
bl AllocWindows
str r0, [r4, #0x70]
add r1, r0, #0
beq _02254D3C
@@ -681,7 +681,7 @@ MOD24_02254D00: ; 0x02254D00
bne _02254D38
ldr r0, [r4, #0x70]
mov r1, #4
bl FUN_02019620
bl FillWindowPixelBuffer
_02254D38:
mov r0, #1
pop {r4, pc}
@@ -987,7 +987,7 @@ _02254F80:
mov r1, #4
lsr r2, r2, #0x10
lsr r3, r3, #0x10
bl FUN_020196F4
bl FillWindowPixelRect
asr r1, r5, #3
mov r2, #0x14
asr r0, r6, #3
@@ -1048,7 +1048,7 @@ _02254FF2:
mov r1, #1
lsr r2, r2, #0x10
lsr r3, r3, #0x10
bl FUN_020196F4
bl FillWindowPixelRect
ldr r0, [r7, #0x70]
mov r2, #0x20
ldr r1, [r0, #0xc]
arm9/modules/27/asm/module_27.s
+4 -4
View File
@@ -389,7 +389,7 @@ MOD27_02254AF0: ; 0x02254AF0
add r7, r6, #0
_02254B36:
add r0, r4, #0
bl FUN_0201901C
bl InitWindow
add r0, r5, #0
add r0, #0x9c
str r7, [r0]
@@ -608,7 +608,7 @@ MOD27_02254CC8: ; 0x02254CC8
add r4, #0x3c
_02254CE8:
add r0, r4, #0
bl FUN_0201901C
bl InitWindow
ldrh r0, [r5, #2]
add r1, r4, #0
mov r2, #6
@@ -834,7 +834,7 @@ MOD27_02254EAC: ; 0x02254EAC
mov r1, #4
add r3, r2, #0
add r5, r0, #0
bl FUN_020196F4
bl FillWindowPixelRect
cmp r4, #0
beq _02254EE0
lsl r0, r4, #0x10
@@ -846,7 +846,7 @@ MOD27_02254EAC: ; 0x02254EAC
add r0, r5, #0
mov r1, #0xf
add r3, r2, #0
bl FUN_020196F4
bl FillWindowPixelRect
_02254EE0:
add r0, r5, #0
bl FUN_02019548
arm9/modules/36/asm/module_36.s
+3 -3
View File
@@ -1108,7 +1108,7 @@ MOD36_0225503C: ; 0x0225503C
add r0, r4, #0
add r0, #0x48
mov r1, #4
bl FUN_02019620
bl FillWindowPixelBuffer
_02255082:
add r0, r4, #0
add r0, #0x48
@@ -1205,7 +1205,7 @@ MOD36_0225510C: ; 0x0225510C
mov r1, #1
lsr r2, r2, #0x10
lsr r3, r3, #0x10
bl FUN_020196F4
bl FillWindowPixelRect
ldr r1, [r4, #0x54]
lsl r0, r5, #5
add r0, r1, r0
@@ -1298,7 +1298,7 @@ MOD36_022551E0: ; 0x022551E0
add r0, r4, #0
add r0, #0x48
mov r1, #4
bl FUN_02019620
bl FillWindowPixelBuffer
add r4, #0x48
add r0, r4, #0
bl FUN_02019548
arm9/modules/38/asm/module_38.s
+2 -2
View File
@@ -1046,7 +1046,7 @@ MOD38_0225500C: ; 0x0225500C
add r0, r4, #0
mov r1, #4
add r6, r2, #0
bl FUN_02019620
bl FillWindowPixelBuffer
cmp r6, #0x12
bne _02255036
add r0, r5, #0
@@ -1106,7 +1106,7 @@ MOD38_02255084: ; 0x02255084
add r0, r4, #0
mov r1, #4
add r6, r2, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
add r2, r5, #0
add r0, #0xb8
arm9/modules/43/asm/module_43.s
+1 -1
View File
@@ -654,7 +654,7 @@ MOD43_02254CD0: ; 0x02254CD0
bl FUN_02019064
add r0, sp, #0x14
mov r1, #4
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0
str r1, [sp]
mov r0, #0xff
arm9/modules/47/asm/module_47.s
+5 -5
View File
@@ -1162,7 +1162,7 @@ MOD47_022550FC: ; 0x022550FC
add r4, r0, #0
add r0, #0x20
mov r1, #4
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #0x58]
ldr r2, [r4, #0x5c]
mov r1, #0
@@ -1225,7 +1225,7 @@ MOD47_02255184: ; 0x02255184
add r4, r0, #0
add r0, #0x20
mov r1, #4
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #0x58]
ldr r2, [r4, #0x5c]
mov r1, #1
@@ -1265,7 +1265,7 @@ MOD47_022551D8: ; 0x022551D8
add r4, r0, #0
add r0, #0x20
mov r1, #4
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #0x58]
ldr r2, [r4, #0x5c]
mov r1, #2
@@ -1322,7 +1322,7 @@ MOD47_02255250: ; 0x02255250
add r4, r0, #0
add r0, #0x20
mov r1, #4
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #0x58]
ldr r2, [r4, #0x5c]
mov r1, #2
@@ -1386,7 +1386,7 @@ MOD47_022552D8: ; 0x022552D8
add r7, r1, #0
add r0, #0x20
mov r1, #4
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r5, #0x58]
ldr r2, [r5, #0x5c]
mov r1, #5
arm9/modules/49/asm/module_49.s
+1 -1
View File
@@ -421,7 +421,7 @@ MOD49_02254AD4: ; 0x02254AD4
bl FUN_02019064
add r0, sp, #0x1c
mov r1, #4
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, sp, #0x1c
bl FUN_02019270
ldr r1, _02254BD4 ; =0x00000197
arm9/modules/51/asm/module_51.s
+6 -6
View File
@@ -165,7 +165,7 @@ _02254960:
bl FUN_02019064
add r0, r5, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
bl CopyWindowToVram
ldr r0, [sp, #0x18]
@@ -193,7 +193,7 @@ _02254960:
add r0, r5, #0
add r0, #0x10
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
add r0, #0x10
bl CopyWindowToVram
@@ -221,7 +221,7 @@ _02254960:
add r0, r5, #0
add r0, #0x20
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
add r0, #0x20
bl CopyWindowToVram
@@ -792,20 +792,20 @@ MOD51_02254E48: ; 0x02254E48
add r7, r5, r0
add r0, r7, r4
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x76
lsl r0, r0, #2
add r0, r5, r0
str r0, [sp, #0x1c]
add r0, r0, r4
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x7a
lsl r0, r0, #2
add r5, r5, r0
add r0, r5, r4
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #2
str r0, [sp]
mov r0, #0xff
arm9/modules/52/include/module_52.h
+12 -12
View File
@@ -17,20 +17,20 @@ extern const struct Unk21DBE18 MOD52_021D76E8;
extern const struct Unk21DBE18 MOD52_021D76D8;
extern const struct Unk21DBE18 MOD52_021D76C8;
THUMB_FUNC BOOL MOD52_021D74E0(struct UnkStruct_02006234 *arg1, u32 *arg2);
THUMB_FUNC BOOL MOD52_021D74F8(struct UnkStruct_02006234 *param0, u32 *unused);
THUMB_FUNC BOOL MOD52_021D750C(struct UnkStruct_02006234 *arg1, u32 *arg2);
BOOL MOD52_021D74E0(struct UnkStruct_02006234 *arg1, u32 *arg2);
BOOL MOD52_021D74F8(struct UnkStruct_02006234 *param0, u32 *unused);
BOOL MOD52_021D750C(struct UnkStruct_02006234 *arg1, u32 *arg2);
THUMB_FUNC BOOL MOD52_021D7528(struct UnkStruct_02006234 *arg1, u32 *arg2);
THUMB_FUNC BOOL MOD52_021D7540(struct UnkStruct_02006234 *param0, u32 *unused);
THUMB_FUNC BOOL MOD52_021D7560(struct UnkStruct_02006234 *arg1, u32 *arg2);
BOOL MOD52_021D7528(struct UnkStruct_02006234 *arg1, u32 *arg2);
BOOL MOD52_021D7540(struct UnkStruct_02006234 *param0, u32 *unused);
BOOL MOD52_021D7560(struct UnkStruct_02006234 *arg1, u32 *arg2);
THUMB_FUNC BOOL MOD52_021D757C(struct UnkStruct_02006234 *arg1, u32 *arg2);
THUMB_FUNC BOOL MOD52_021D7594(struct UnkStruct_02006234 *param0, u32 *unused);
THUMB_FUNC BOOL MOD52_021D75E8(struct UnkStruct_02006234 *arg1, u32 *arg2);
BOOL MOD52_021D757C(struct UnkStruct_02006234 *arg1, u32 *arg2);
BOOL MOD52_021D7594(struct UnkStruct_02006234 *param0, u32 *unused);
BOOL MOD52_021D75E8(struct UnkStruct_02006234 *arg1, u32 *arg2);
THUMB_FUNC void MOD52_021D7604(u32 heap_id, struct SaveBlock2 *sav2, BOOL set_trainerid);
THUMB_FUNC void MOD52_021D7688(u32 param0, struct SaveBlock2 *sav2);
THUMB_FUNC void MOD52_021D769C(u32 param0, struct SaveBlock2 *sav2);
void MOD52_021D7604(u32 heap_id, struct SaveBlock2 *sav2, BOOL set_trainerid);
void MOD52_021D7688(u32 param0, struct SaveBlock2 *sav2);
void MOD52_021D769C(u32 param0, struct SaveBlock2 *sav2);
#endif // POKEDIAMOND_MODULE_52_H
arm9/modules/53/asm/module_53.s
+7 -7
View File
@@ -1325,7 +1325,7 @@ MOD53_021D7FDC: ; 0x021D7FDC
lsl r0, r0, #2
add r0, r7, r0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #2
str r0, [sp]
mov r0, #0x1e
@@ -1346,7 +1346,7 @@ MOD53_021D7FDC: ; 0x021D7FDC
lsl r0, r0, #2
add r0, r7, r0
mov r1, #2
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x15
str r0, [sp]
mov r0, #6
@@ -1368,7 +1368,7 @@ MOD53_021D7FDC: ; 0x021D7FDC
lsl r0, r0, #2
add r0, r7, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r1, [r7, #0x28]
mov r0, #1
mov r2, #0
@@ -1415,7 +1415,7 @@ _021D80A8:
bl FUN_02019064
add r0, r5, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [sp, #0x14]
add r6, #0x14
add r0, r0, #1
@@ -2915,7 +2915,7 @@ _021D8C9C:
mov r1, ip
lsr r2, r2, #0x10
lsr r3, r3, #0x10
bl FUN_02019658
bl BlitBitmapRectToWindow
add sp, #0x1c
pop {r4, r5, r6, r7, pc}
thumb_func_end MOD53_021D8C58
@@ -3429,7 +3429,7 @@ _021D906C:
add r0, r4, #0
add r2, r1, #0
add r3, r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
add r6, r6, #1
add r4, #0x10
cmp r6, #5
@@ -3633,7 +3633,7 @@ MOD53_021D91C8: ; 0x021D91C8
lsl r0, r0, #2
add r0, r5, r0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0xb6
lsl r0, r0, #2
add r0, r5, r0
arm9/modules/54/asm/module_54.s
+6 -6
View File
@@ -1081,7 +1081,7 @@ MOD54_021D7DB4: ; 0x021D7DB4
lsl r0, r0, #2
add r0, r4, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x13
str r0, [sp]
mov r0, #0x1b
@@ -1103,7 +1103,7 @@ MOD54_021D7DB4: ; 0x021D7DB4
lsl r0, r0, #2
add r0, r4, r0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #1
str r0, [sp]
mov r0, #0x1a
@@ -1148,7 +1148,7 @@ MOD54_021D7DB4: ; 0x021D7DB4
lsl r0, r0, #2
add r0, r4, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0xa6
lsl r0, r0, #2
ldr r2, _021D7E94 ; =0x00010300
@@ -1176,7 +1176,7 @@ MOD54_021D7E98: ; 0x021D7E98
add r6, r0, #0
add r0, r5, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #1
str r1, [sp]
mov r0, #0x41
@@ -2787,7 +2787,7 @@ MOD54_021D8AF8: ; 0x021D8AF8
_021D8B18:
add r0, r6, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r7, [sp, #0x14]
mov r0, #0
str r0, [sp, #0x20]
@@ -3013,7 +3013,7 @@ MOD54_021D8C90: ; 0x021D8C90
lsl r0, r0, #2
add r0, r5, r0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0xba
lsl r0, r0, #2
add r0, r5, r0
arm9/modules/55/asm/module_55.s
+23 -23
View File
@@ -1238,7 +1238,7 @@ _021D7F02:
lsl r0, r0, #2
add r0, r5, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r2, r5, #0
add r2, #0xc0
ldr r0, [r5, #0x10]
@@ -1305,7 +1305,7 @@ _021D7F86:
bl FUN_02019064
add r0, r4, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
cmp r6, #2
bne _021D7FF4
ldr r0, [r5, #8]
@@ -2618,7 +2618,7 @@ _021D89AE:
add r7, r0, #0
add r0, r5, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #1
str r0, [sp]
mov r0, #0xff
@@ -2775,7 +2775,7 @@ _021D8AEE:
lsl r0, r0, #2
add r0, r5, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r2, r5, #0
add r2, #0xc0
ldr r0, [r5, #0x10]
@@ -2834,7 +2834,7 @@ _021D8B6C:
lsl r0, r0, #2
add r0, r5, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r2, r5, #0
add r2, #0xd0
ldr r0, [r5, #0x10]
@@ -2917,7 +2917,7 @@ _021D8C02:
bl FUN_02019064
add r0, r4, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
bl FUN_02019220
add r6, r6, #1
@@ -3213,7 +3213,7 @@ MOD55_021D8E6C: ; 0x021D8E6C
stmia r2!, {r0, r1}
add r0, r7, #0
mov r1, #0x34
bl ListMenu_ctor
bl ListMenuItems_ctor
ldr r4, _021D8FD0 ; =0x021DA3D8
str r0, [r5, #0x14]
mov r6, #0
@@ -3222,7 +3222,7 @@ _021D8EB6:
ldr r1, [r5, #0x10]
ldr r2, [r4]
ldr r3, [r4, #4]
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
add r6, r6, #1
add r4, #8
cmp r6, #4
@@ -3241,7 +3241,7 @@ _021D8ECC:
stmia r2!, {r0, r1}
add r0, r7, #0
mov r1, #0x34
bl ListMenu_ctor
bl ListMenuItems_ctor
ldr r4, _021D8FD8 ; =0x021DA438
str r0, [r5, #0x14]
mov r6, #0
@@ -3250,7 +3250,7 @@ _021D8EEE:
ldr r1, [r5, #0x10]
ldr r2, [r4]
ldr r3, [r4, #4]
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
add r6, r6, #1
add r4, #8
cmp r6, #4
@@ -3306,7 +3306,7 @@ _021D8F1A:
add r0, sp, #0x1c
add r2, r1, #0
mov r3, #0x34
bl FUN_020010A8
bl ListMenuInit
mov r1, #0xea
lsl r1, r1, #2
str r0, [r5, r1]
@@ -3374,7 +3374,7 @@ _021D9002:
mov r0, #0xea
lsl r0, r0, #2
ldr r0, [r5, r0]
bl FUN_02001204
bl ListMenu_ProcessInput
ldr r1, _021D90D0 ; =0x00000418
add r4, r0, #0
add r0, r1, #0
@@ -3382,7 +3382,7 @@ _021D9002:
ldrh r7, [r5, r1]
ldr r0, [r5, r0]
add r1, r5, r1
bl FUN_0200143C
bl ListMenuGetCurrentItemArrayId
ldr r0, _021D90D0 ; =0x00000418
ldrh r0, [r5, r0]
cmp r7, r0
@@ -3458,9 +3458,9 @@ _021D9098:
mov r1, #0
ldr r0, [r5, r0]
add r2, r1, #0
bl FUN_02001300
bl DestroyListMenu
ldr r0, [r5, #0x14]
bl ListMenu_dtor
bl ListMenuItems_dtor
add r0, r6, #0
add sp, #0xc
pop {r4, r5, r6, r7, pc}
@@ -3605,7 +3605,7 @@ _021D91D6:
lsl r0, r0, #2
add r0, r5, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r5, #8]
bl Sav2_PlayerData_GetProfileAddr
add r2, r0, #0
@@ -3677,7 +3677,7 @@ _021D9278:
lsl r0, r0, #2
add r0, r5, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0
mov r0, #0
eor r1, r4
@@ -3781,7 +3781,7 @@ _021D9338:
lsl r0, r0, #2
add r0, r5, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r1, r5, #0
add r1, #0xbc
mov r0, #0
@@ -4164,7 +4164,7 @@ _021D969A:
lsl r0, r0, #2
add r0, r4, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x34
bl PlayerProfile_new
str r0, [sp, #0x20]
@@ -4243,7 +4243,7 @@ _021D974E:
lsl r0, r0, #2
add r0, r4, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #0xc]
ldr r2, [sp, #0x20]
mov r1, #0
@@ -4382,7 +4382,7 @@ _021D987C:
lsl r0, r0, #2
add r0, r4, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r2, r4, #0
add r2, #0xc4
ldr r0, [r4, #0x10]
@@ -5397,7 +5397,7 @@ _021DA0D0:
lsl r0, r0, #2
add r0, r5, r0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0xce
lsl r0, r0, #2
ldr r2, _021DA158 ; =0x000001E2
@@ -5478,7 +5478,7 @@ _021DA17C:
lsl r0, r0, #2
add r0, r5, r0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0xce
lsl r0, r0, #2
ldr r2, _021DA210 ; =0x000001E2
arm9/modules/56/asm/module_56.s
+57 -57
View File
@@ -1342,7 +1342,7 @@ _022128CE:
lsl r0, r0, #2
add r0, r4, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
mov r2, #0x16
add r0, #0xcc
@@ -1450,14 +1450,14 @@ _022129D8:
beq _022129EA
mov r1, #0
add r2, r1, #0
bl FUN_02001300
bl DestroyListMenu
_022129EA:
add r0, r4, #0
add r0, #0xb0
ldr r0, [r0]
cmp r0, #0
beq _02212A00
bl ListMenu_dtor
bl ListMenuItems_dtor
add r0, r4, #0
mov r1, #0
add r0, #0xb0
@@ -2479,7 +2479,7 @@ MOD56_02213194: ; 0x02213194
mov r1, #0
ldr r0, [r0]
add r2, r1, #0
bl FUN_02001300
bl DestroyListMenu
add r0, r6, #0
mov r1, #0
add r0, #0xb4
@@ -2487,7 +2487,7 @@ MOD56_02213194: ; 0x02213194
add r0, r6, #0
add r0, #0xb0
ldr r0, [r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
add r0, r6, #0
mov r1, #0
add r0, #0xb0
@@ -2786,7 +2786,7 @@ _0221344C:
lsl r0, r0, #2
add r0, r4, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0
str r1, [sp]
mov r0, #0xff
@@ -3021,7 +3021,7 @@ MOD56_02213624: ; 0x02213624
add r5, r1, #0
mov r1, #0x13
add r7, r2, #0
bl FUN_02001470
bl ListMenuGetTemplateField
add r4, r0, #0
ldr r6, _02213750 ; =0x00010200
cmp r5, #0x20
@@ -3462,7 +3462,7 @@ _02213944:
ldr r0, [r0]
ldr r1, [r5, r7]
sub r2, r2, #1
bl ListMenu_AddItem
bl ListMenuItems_AddItem
add r6, r6, #1
_0221395C:
add r4, r4, #1
@@ -3476,7 +3476,7 @@ _0221395C:
ldr r1, [r1]
mov r2, #0x1b
mov r3, #0x20
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
add r0, r5, #0
add r0, #0xb0
add r5, #0xcc
@@ -3485,7 +3485,7 @@ _0221395C:
ldr r0, [r0]
ldr r1, [r5]
sub r3, #0x30
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
add r0, r6, #0
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -3498,7 +3498,7 @@ MOD56_02213990: ; 0x02213990
add r5, r0, #0
mov r0, #0x22
mov r1, #0x36
bl ListMenu_ctor
bl ListMenuItems_ctor
add r1, r5, #0
add r1, #0xb0
str r0, [r1]
@@ -3567,7 +3567,7 @@ _022139D0:
add r2, r1, #0
mov r3, #0x36
str r5, [sp, #0x30]
bl FUN_020010A8
bl ListMenuInit
add r5, #0xb4
str r0, [r5]
add sp, #0x34
@@ -3675,7 +3675,7 @@ _02213AF0:
mov r1, #0
ldr r0, [r0]
add r2, r1, #0
bl FUN_02001300
bl DestroyListMenu
add r0, r5, #0
mov r1, #0
add r0, #0xb4
@@ -3683,7 +3683,7 @@ _02213AF0:
add r0, r5, #0
add r0, #0xb0
ldr r0, [r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
add r0, r5, #0
mov r1, #0
add r0, #0xb0
@@ -3712,7 +3712,7 @@ _02213B2C:
lsl r0, r0, #2
add r0, r5, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
mov r2, #0x16
add r0, #0xcc
@@ -3808,13 +3808,13 @@ _02213C24:
add r0, r5, #0
add r0, #0xb0
ldr r0, [r0]
bl ListMenu_DestroyMenuStrings
bl ListMenuItems_DestroyMenuStrings
add r0, r5, #0
add r0, #0xb4
ldr r0, [r0]
mov r1, #2
add r2, r4, #2
bl FUN_02001538
bl ListMenuSetTemplateField
cmp r4, #3
ble _02213C50
add r0, r5, #0
@@ -3822,7 +3822,7 @@ _02213C24:
ldr r0, [r0]
mov r1, #3
mov r2, #5
bl FUN_02001538
bl ListMenuSetTemplateField
b _02213C5E
_02213C50:
add r0, r5, #0
@@ -3830,7 +3830,7 @@ _02213C50:
ldr r0, [r0]
mov r1, #3
add r2, r4, #2
bl FUN_02001538
bl ListMenuSetTemplateField
_02213C5E:
add r0, r5, #0
bl MOD56_02213938
@@ -3840,7 +3840,7 @@ _02213C5E:
ldr r0, [r0]
add r1, #2
add r2, sp, #0xc
bl FUN_02001448
bl ListMenuGetScrollAndRow
cmp r4, #3
blt _02213C84
add r0, sp, #0xc
@@ -3860,11 +3860,11 @@ _02213C84:
ldrh r2, [r3, #2]
ldrh r3, [r3]
ldr r0, [r0]
bl FUN_020013C8
bl ListMenuTestInput
add r0, r5, #0
add r0, #0xb4
ldr r0, [r0]
bl FUN_02001328
bl RedrawListMenu
str r4, [r5, #8]
_02213CA8:
add r0, r5, #0
@@ -3873,7 +3873,7 @@ _02213CA8:
ldr r0, [r0]
add r1, #2
add r2, sp, #0xc
bl FUN_02001448
bl ListMenuGetScrollAndRow
add r0, sp, #0xc
ldr r1, [r5, #8]
ldrh r3, [r0]
@@ -3913,11 +3913,11 @@ _02213CF0:
str r1, [sp, #8]
add r0, #0xb4
ldr r0, [r0]
bl FUN_020013C8
bl ListMenuTestInput
add r0, r5, #0
add r0, #0xb4
ldr r0, [r0]
bl FUN_02001328
bl RedrawListMenu
_02213D0C:
add r1, sp, #0xc
ldrh r1, [r1, #2]
@@ -4099,7 +4099,7 @@ _02213E5C:
mov r1, #0
ldr r0, [r0]
add r2, r1, #0
bl FUN_02001300
bl DestroyListMenu
add r0, r5, #0
mov r1, #0
add r0, #0xb4
@@ -4107,7 +4107,7 @@ _02213E5C:
add r0, r5, #0
add r0, #0xb0
ldr r0, [r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
add r0, r5, #0
mov r1, #0
add r0, #0xb0
@@ -4139,7 +4139,7 @@ _02213ECE:
add r0, r5, #0
add r0, #0xb4
ldr r0, [r0]
bl FUN_02001204
bl ListMenu_ProcessInput
add r6, r0, #0
_02213EE8:
mov r0, #1
@@ -5059,7 +5059,7 @@ MOD56_022145D4: ; 0x022145D4
stmia r2!, {r0, r1}
mov r0, #4
mov r1, #0x36
bl ListMenu_ctor
bl ListMenuItems_ctor
add r1, r5, #0
add r1, #0xb8
ldr r4, _022146C4 ; =0x02216480
@@ -5074,7 +5074,7 @@ _02214602:
ldr r1, [r1]
ldr r2, [r4]
ldr r3, [r4, #4]
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
add r6, r6, #1
add r4, #8
cmp r6, #4
@@ -5134,7 +5134,7 @@ _02214642:
add r0, sp, #0x14
mov r1, #0
mov r3, #0x36
bl FUN_020010A8
bl ListMenuInit
add r1, r5, #0
add r1, #0xbc
str r0, [r1]
@@ -5180,7 +5180,7 @@ _022146EE:
add r0, r5, #0
add r0, #0xbc
ldr r0, [r0]
bl FUN_02001204
bl ListMenu_ProcessInput
add r4, r0, #0
add r0, r5, #0
bl MOD56_02213BF4
@@ -5257,11 +5257,11 @@ _0221476E:
ldr r0, [r0]
mov r1, #0
add r2, r5, r2
bl FUN_02001300
bl DestroyListMenu
add r0, r5, #0
add r0, #0xb8
ldr r0, [r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
add r0, r5, #0
add r1, r4, #0
bl MOD56_02214808
@@ -5298,10 +5298,10 @@ _022147CE:
ldr r0, [r0]
mov r1, #0
add r2, r5, r2
bl FUN_02001300
bl DestroyListMenu
add r5, #0xb8
ldr r0, [r5]
bl ListMenu_dtor
bl ListMenuItems_dtor
add r0, r6, #0
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -5338,7 +5338,7 @@ _02214820:
stmia r2!, {r0, r1}
add r0, r7, #0
mov r1, #0x36
bl ListMenu_ctor
bl ListMenuItems_ctor
add r1, r5, #0
add r1, #0xb8
mov r6, #0
@@ -5354,7 +5354,7 @@ _0221484C:
ldr r1, [r1]
ldr r2, [r4]
ldr r3, [r4, #4]
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
add r6, r6, #1
add r4, #8
cmp r6, r7
@@ -5425,7 +5425,7 @@ _0221488C:
ldrh r2, [r2, r3]
mov r1, #0
mov r3, #0x36
bl FUN_020010A8
bl ListMenuInit
add r1, r5, #0
add r1, #0xbc
str r0, [r1]
@@ -5463,7 +5463,7 @@ _0221493C:
add r0, r5, #0
add r0, #0xbc
ldr r0, [r0]
bl FUN_02001204
bl ListMenu_ProcessInput
add r4, r0, #0
add r0, r5, #0
bl MOD56_02213BF4
@@ -5521,10 +5521,10 @@ _02214994:
lsl r3, r3, #1
mov r1, #0
add r2, r2, r3
bl FUN_02001300
bl DestroyListMenu
add r5, #0xb8
ldr r0, [r5]
bl ListMenu_dtor
bl ListMenuItems_dtor
add r0, r6, #0
pop {r4, r5, r6, pc}
nop
@@ -5554,7 +5554,7 @@ MOD56_022149D8: ; 0x022149D8
add r0, #0xb4
ldr r0, [r0]
add r1, sp, #0x28
bl FUN_0200143C
bl ListMenuGetCurrentItemArrayId
add r0, sp, #0x28
ldrh r0, [r0]
add r0, r5, r0
@@ -5585,7 +5585,7 @@ MOD56_022149D8: ; 0x022149D8
lsr r0, r0, #0x10
str r0, [sp, #0x1c]
mov r0, #3
bl ListMenu_ctor
bl ListMenuItems_ctor
add r1, r5, #0
add r1, #0xb8
str r0, [r1]
@@ -5630,7 +5630,7 @@ _02214A7E:
ldr r1, [r1]
ldr r3, [r4, #4]
mov r2, #0x1a
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
b _02214ADC
_02214A9E:
ldrh r0, [r7, #0x16]
@@ -5652,7 +5652,7 @@ _02214AB2:
ldr r1, [r1]
ldr r2, [r4]
ldr r3, [r4, #4]
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
b _02214ADC
_02214AC8:
add r0, r5, #0
@@ -5663,7 +5663,7 @@ _02214AC8:
ldr r1, [r1]
ldr r2, [r4]
ldr r3, [r4, #4]
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
_02214ADC:
ldr r0, [sp, #0x24]
add r4, #8
@@ -5717,7 +5717,7 @@ _02214ADC:
add r0, sp, #0x2c
add r2, r1, #0
mov r3, #0x36
bl FUN_020010A8
bl ListMenuInit
add r1, r5, #0
add r1, #0xbc
str r0, [r1]
@@ -5837,7 +5837,7 @@ _02214C1E:
add r0, r4, #0
add r0, #0xbc
ldr r0, [r0]
bl FUN_02001204
bl ListMenu_ProcessInput
add r5, r0, #0
add r0, r4, #0
bl MOD56_02213BF4
@@ -5878,7 +5878,7 @@ _02214C66:
add r0, #0xb4
ldr r0, [r0]
add r1, sp, #0xc
bl FUN_0200143C
bl ListMenuGetCurrentItemArrayId
add r0, sp, #0xc
ldrh r0, [r0]
add r0, r4, r0
@@ -6074,10 +6074,10 @@ _02214DEC:
mov r1, #0
ldr r0, [r0]
add r2, r1, #0
bl FUN_02001300
bl DestroyListMenu
add r4, #0xb8
ldr r0, [r4]
bl ListMenu_dtor
bl ListMenuItems_dtor
ldr r0, [sp]
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
@@ -7019,12 +7019,12 @@ _02215532:
lsl r0, r0, #2
add r0, r5, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
add r0, #0xb4
ldr r0, [r0]
add r1, sp, #0x14
bl FUN_0200143C
bl ListMenuGetCurrentItemArrayId
add r0, sp, #0x14
ldrh r0, [r0]
add r0, r5, r0
@@ -7569,7 +7569,7 @@ MOD56_022159B0: ; 0x022159B0
lsl r0, r0, #2
add r0, r5, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
mov r2, #0x16
add r0, #0xcc
@@ -8272,7 +8272,7 @@ _02215F82:
lsl r0, r0, #2
add r0, r5, r0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0xcf
lsl r0, r0, #2
ldr r2, _02215FF0 ; =0x000001E2
@@ -8388,7 +8388,7 @@ _02216048:
lsl r0, r0, #2
add r0, r5, r0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0xdb
lsl r0, r0, #2
ldr r2, _022160E0 ; =0x000001D9
arm9/modules/57/asm/module_57.s
+13 -13
View File
@@ -2689,7 +2689,7 @@ MOD57_021D89F0: ; 0x021D89F0
add r2, r1, #0
add r3, r1, #0
add r7, r0, #0
bl FUN_020196F4
bl FillWindowPixelRect
mov r1, #0
mov r0, #0x88
str r0, [sp]
@@ -2699,7 +2699,7 @@ MOD57_021D89F0: ; 0x021D89F0
add r0, #0x10
add r2, r1, #0
add r3, r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
mov r1, #0
mov r0, #0x88
str r0, [sp]
@@ -2709,7 +2709,7 @@ MOD57_021D89F0: ; 0x021D89F0
add r0, #0x20
add r2, r1, #0
add r3, r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
mov r1, #0
mov r0, #0x88
str r0, [sp]
@@ -2719,7 +2719,7 @@ MOD57_021D89F0: ; 0x021D89F0
add r0, #0x30
add r2, r1, #0
add r3, r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
mov r1, #0
mov r0, #0x88
str r0, [sp]
@@ -2729,7 +2729,7 @@ MOD57_021D89F0: ; 0x021D89F0
add r0, #0x40
add r2, r1, #0
add r3, r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
mov r1, #0
mov r0, #0xe0
str r0, [sp]
@@ -2739,7 +2739,7 @@ MOD57_021D89F0: ; 0x021D89F0
add r0, #0x50
add r2, r1, #0
add r3, r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
mov r1, #0
mov r0, #0xe0
str r0, [sp]
@@ -2749,7 +2749,7 @@ MOD57_021D89F0: ; 0x021D89F0
add r0, #0x60
add r2, r1, #0
add r3, r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
ldr r2, _021D8CEC ; =0x0000022D
mov r0, #0
mov r1, #0x1a
@@ -3042,7 +3042,7 @@ MOD57_021D8CF8: ; 0x021D8CF8
add r0, #0x70
add r2, r1, #0
add r3, r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
mov r1, #0
mov r0, #0xe0
str r0, [sp]
@@ -3052,7 +3052,7 @@ MOD57_021D8CF8: ; 0x021D8CF8
add r0, #0x80
add r2, r1, #0
add r3, r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
mov r1, #0
mov r0, #0xe0
str r0, [sp]
@@ -3062,7 +3062,7 @@ MOD57_021D8CF8: ; 0x021D8CF8
add r0, #0x90
add r2, r1, #0
add r3, r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
mov r1, #0
mov r0, #0xe0
str r0, [sp]
@@ -3072,7 +3072,7 @@ MOD57_021D8CF8: ; 0x021D8CF8
add r0, #0xa0
add r2, r1, #0
add r3, r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
ldr r2, _021D8FAC ; =0x0000022D
mov r0, #0
mov r1, #0x1a
@@ -3455,7 +3455,7 @@ _021D906E:
add r0, #0x50
mov r2, #0xb8
add r3, r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
ldr r2, _021D913C ; =0x0000022D
mov r0, #0
mov r1, #0x1a
@@ -3558,7 +3558,7 @@ _021D9164:
mov r1, #0
mov r2, #0xcd
add r3, r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
add r0, r4, #0
bl CopyWindowToVram
add sp, #0x10
arm9/modules/58/asm/module_58.s
+8 -8
View File
@@ -1077,7 +1077,7 @@ MOD58_021DA30C: ; 0x021DA30C
lsl r0, r0, #2
add r0, r5, r0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #9
str r0, [sp]
mov r0, #0x18
@@ -1097,7 +1097,7 @@ MOD58_021DA30C: ; 0x021DA30C
lsl r0, r0, #2
add r0, r5, r0
mov r1, #2
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x15
str r0, [sp]
mov r0, #8
@@ -1118,7 +1118,7 @@ MOD58_021DA30C: ; 0x021DA30C
lsl r0, r0, #2
add r0, r5, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _021DA4BC ; =0x000E0702
mov r2, #1
str r0, [sp]
@@ -1189,7 +1189,7 @@ _021DA3C2:
lsl r0, r0, #2
add r0, r5, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0
str r1, [sp]
mov r3, #0xe0
@@ -1234,7 +1234,7 @@ _021DA46A:
bl FUN_02019064
add r0, r4, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [sp, #0x14]
add r7, #0x14
add r0, r0, #1
@@ -1646,7 +1646,7 @@ _021DA7A4:
lsl r0, r0, #2
add r0, r5, r0
mov r1, #2
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0xb1
lsl r0, r0, #2
add r0, r5, r0
@@ -1780,7 +1780,7 @@ _021DA888:
mov r1, ip
lsr r2, r2, #0x10
lsr r3, r3, #0x10
bl FUN_02019658
bl BlitBitmapRectToWindow
add sp, #0x1c
pop {r4, r5, r6, r7, pc}
thumb_func_end MOD58_021DA844
@@ -2217,7 +2217,7 @@ MOD58_021DAB94: ; 0x021DAB94
lsl r0, r0, #2
add r0, r5, r0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0xb5
lsl r0, r0, #2
add r0, r5, r0
arm9/modules/59/asm/mod59_021D74E0_asm.s
+9 -9
View File
@@ -883,7 +883,7 @@ _021D7C5E:
add r0, #0x1c
mov r1, #0xf
add r3, r2, #0
bl FUN_020196F4
bl FillWindowPixelRect
add r0, r5, #0
ldr r2, _021D7D60 ; =0x000003E2
add r0, #0x1c
@@ -1051,7 +1051,7 @@ _021D7DC4:
bl FUN_02019150
ldr r1, [r5]
add r0, r6, #0
bl ListMenu_ctor
bl ListMenuItems_ctor
mov r7, #0
str r0, [r5, #0x44]
cmp r6, #0
@@ -1061,7 +1061,7 @@ _021D7DDE:
ldr r1, [r5, #0x4c]
ldr r2, [r4]
ldr r3, [r4, #4]
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
add r7, r7, #1
add r4, #8
cmp r7, r6
@@ -1096,7 +1096,7 @@ _021D7DF2:
lsl r3, r3, #0x18
add r2, r1, #0
lsr r3, r3, #0x18
bl FUN_020010A8
bl ListMenuInit
str r0, [r5, #0x40]
ldr r0, [sp, #0x10]
ldr r2, _021D7EC4 ; =0x000003D9
@@ -1111,7 +1111,7 @@ _021D7DF2:
b _021D7E96
_021D7E4C:
ldr r0, [r5, #0x40]
bl FUN_02001204
bl ListMenu_ProcessInput
mov r1, #0
mvn r1, r1
str r0, [r5, #0x48]
@@ -1133,9 +1133,9 @@ _021D7E66:
mov r1, #0
ldr r0, [r5, #0x40]
add r2, r1, #0
bl FUN_02001300
bl DestroyListMenu
ldr r0, [r5, #0x44]
bl ListMenu_dtor
bl ListMenuItems_dtor
ldr r0, _021D7EC8 ; =0x000005DC
bl FUN_020054C8
mov r0, #0
@@ -1234,7 +1234,7 @@ _021D7EFA:
add r0, #0x1c
add r2, r1, #0
add r3, r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
add r1, r5, #0
str r1, [sp]
ldr r0, _021D8048 ; =0x00010200
@@ -1273,7 +1273,7 @@ _021D7F7C:
add r0, #0x1c
add r2, r1, #0
add r3, r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
add r1, r5, #0
str r1, [sp]
ldr r0, _021D804C ; =0x000F0200
arm9/modules/59/asm/mod59_021D9868.s
+1 -1
View File
@@ -536,7 +536,7 @@ _021D9C9A:
add r0, #0x10
add r2, r1, #0
add r3, r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
add r0, r5, #0
add r1, r6, #0
add r2, r0, #0
arm9/modules/60/asm/module_60.s
+5 -5
View File
@@ -922,15 +922,15 @@ MOD60_021D7BA4: ; 0x021D7BA4
add r0, r4, #0
add r0, #0x2c
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
add r0, #0x3c
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
add r0, #0x4c
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
add r0, #0x4c
bl FUN_020192B8
@@ -980,7 +980,7 @@ _021D7CF0:
bl FUN_02019570
add r0, r5, r4
add r1, r7, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, r4
bl FUN_020192B8
add r0, r5, r4
@@ -1209,7 +1209,7 @@ MOD60_021D7EA4: ; 0x021D7EA4
mov r1, #0xff
lsr r2, r2, #0x10
lsr r3, r3, #0x10
bl FUN_020196F4
bl FillWindowPixelRect
ldr r0, [sp, #0x14]
cmp r0, #5
bne _021D7F26
arm9/modules/61/asm/module_61.s
+3 -3
View File
@@ -305,7 +305,7 @@ _021D7702:
add r0, r5, #0
add r0, #0x94
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r1, [r5]
mov r0, #0x4c
bl String_ctor
@@ -432,7 +432,7 @@ _021D77F2:
add r0, r5, #0
add r0, #0x94
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r1, [r5]
mov r0, #0x4c
bl String_ctor
@@ -1484,7 +1484,7 @@ MOD61_021D7FF4: ; 0x021D7FF4
_021D80BE:
add r0, r5, #0
add r1, r6, #0
bl FUN_02019620
bl FillWindowPixelBuffer
cmp r4, #5
bge _021D80D0
add r0, r5, #0
arm9/modules/62/asm/module_62.s
+17 -17
View File
@@ -1152,7 +1152,7 @@ MOD62_0222DE00: ; 0x0222DE00
bl NewString_ReadMsgData
str r0, [sp, #0x18]
add r0, sp, #0x1c
bl FUN_0201901C
bl InitWindow
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -1936,7 +1936,7 @@ _0222E442:
add r0, r4, r0
asr r7, r0, #1
ldr r0, [sp, #0x18]
bl FUN_0201901C
bl InitWindow
lsl r0, r5, #0x18
lsr r0, r0, #0x18
str r0, [sp]
@@ -1957,7 +1957,7 @@ _0222E442:
bl FUN_02019064
add r0, r7, #0
mov r1, #0x35
bl ListMenu_ctor
bl ListMenuItems_ctor
mov r2, #0x67
ldr r1, [sp, #0x1c]
lsl r2, r2, #2
@@ -1990,7 +1990,7 @@ _0222E49A:
ldr r0, [r1, r0]
ldr r2, [r2, #4]
add r1, r4, #0
bl ListMenu_AddItem
bl ListMenuItems_AddItem
add r0, r4, #0
bl String_dtor
add r6, r6, #1
@@ -3251,7 +3251,7 @@ MOD62_0222EE78: ; 0x0222EE78
cmp r5, r1
bne _0222EE96
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
bl CopyWindowToVram
add sp, #0xc
@@ -3268,7 +3268,7 @@ _0222EE96:
add r5, r0, #0
add r0, r4, #0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0
str r1, [sp]
str r1, [sp, #4]
@@ -3298,7 +3298,7 @@ MOD62_0222EEE0: ; 0x0222EEE0
add r0, r5, #0
add r4, r2, #0
add r6, r3, #0
bl FUN_0201901C
bl InitWindow
ldr r0, [sp, #0x28]
lsl r2, r4, #0x18
lsl r0, r0, #0x18
@@ -3331,7 +3331,7 @@ MOD62_0222EEE0: ; 0x0222EEE0
bl FUN_0200D0BC
add r0, r5, #0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
bl CopyWindowToVram
add sp, #0x14
@@ -3347,7 +3347,7 @@ MOD62_0222EF44: ; 0x0222EF44
add r0, r5, #0
add r4, r2, #0
add r6, r3, #0
bl FUN_0201901C
bl InitWindow
ldr r0, [sp, #0x28]
lsl r2, r4, #0x18
lsl r0, r0, #0x18
@@ -3377,7 +3377,7 @@ MOD62_0222EF44: ; 0x0222EF44
bl FUN_02019064
add r0, r5, #0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
bl CopyWindowToVram
add sp, #0x14
@@ -3552,14 +3552,14 @@ _0222F0E2:
bne _0222F0FE
add r0, r5, #0
mov r1, #0xee
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
bl CopyWindowToVram
b _0222F152
_0222F0FE:
add r0, r5, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x64
mov r1, #0x35
bl String_ctor
@@ -3621,7 +3621,7 @@ MOD62_0222F168: ; 0x0222F168
bne _0222F194
add r0, r5, r4
mov r1, #0xee
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, r4
bl CopyWindowToVram
add sp, #0x14
@@ -3629,7 +3629,7 @@ MOD62_0222F168: ; 0x0222F168
_0222F194:
add r0, r5, r4
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x64
mov r1, #0x35
bl String_ctor
@@ -3693,7 +3693,7 @@ MOD62_0222F208: ; 0x0222F208
cmp r5, r1
bne _0222F226
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
bl CopyWindowToVram
add sp, #0xc
@@ -3710,7 +3710,7 @@ _0222F226:
add r5, r0, #0
add r0, r4, #0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0
str r1, [sp]
str r1, [sp, #4]
@@ -4612,7 +4612,7 @@ MOD62_0222F904: ; 0x0222F904
mov r0, #0x67
lsl r0, r0, #2
ldr r0, [r4, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
add r4, #0xfc
add r0, r4, #0
bl FUN_02019178
arm9/modules/63/asm/mod63_021D74E0.s
+1 -1
View File
@@ -2064,7 +2064,7 @@ _021D844C:
add r0, #0xac
add r2, r1, #0
add r3, r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
add r0, r7, #0
mov r1, #0
add r2, r4, #0
arm9/modules/64/asm/module_64.s
+8 -8
View File
@@ -653,14 +653,14 @@ MOD64_021D7A54: ; 0x021D7A54
add r5, r0, #0
add r0, r4, #0
mov r1, #1
bl FUN_02018FF4
bl AllocWindows
add r1, r5, #0
add r1, #0x98
str r0, [r1]
add r0, r5, #0
add r0, #0x98
ldr r0, [r0]
bl FUN_0201901C
bl InitWindow
mov r0, #0x13
str r0, [sp]
mov r0, #0x17
@@ -683,7 +683,7 @@ MOD64_021D7A54: ; 0x021D7A54
add r0, #0x98
ldr r0, [r0]
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _021D7AE8 ; =0x000006A8
mov r1, #1
ldr r0, [r5, r0]
@@ -2318,7 +2318,7 @@ _021D86F8:
add r6, r0, #0
add r0, r5, #0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r3, #0
ldr r0, [sp, #0x2c]
str r3, [sp]
@@ -2375,7 +2375,7 @@ _021D8770:
str r0, [r4]
add r0, r5, #0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r3, #0
ldr r0, [sp, #0x2c]
str r3, [sp]
@@ -3393,14 +3393,14 @@ MOD64_021D8EF4: ; 0x021D8EF4
_021D8F16:
ldr r0, [sp, #0x18]
mov r1, #1
bl FUN_02018FF4
bl AllocWindows
add r1, r5, #0
add r1, #0x9c
str r0, [r1]
add r0, r5, #0
add r0, #0x9c
ldr r0, [r0]
bl FUN_0201901C
bl InitWindow
cmp r4, #0
beq _021D8F3C
cmp r4, #1
@@ -3511,7 +3511,7 @@ _021D8FEC:
lsl r1, r1, #0x18
add r0, r5, #0
lsr r1, r1, #0x18
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0
str r1, [sp]
mov r0, #0xff
arm9/modules/65/asm/module_65.s
+29 -29
View File
@@ -335,7 +335,7 @@ _021D7762:
add r0, r5, #0
add r0, #0xc4
ldr r0, [r0]
bl FUN_02001204
bl ListMenu_ProcessInput
add r4, r0, #0
b _021D7796
_021D7784:
@@ -425,7 +425,7 @@ MOD65_021D7818: ; 0x021D7818
add r5, r0, #0
add r0, #0xc8
ldr r0, [r0]
bl FUN_02001204
bl ListMenu_ProcessInput
add r4, r0, #0
ldr r0, _021D78A4 ; =gMain
ldr r1, [r0, #0x48]
@@ -998,7 +998,7 @@ _021D7C68:
bl FUN_02019064
add r0, r5, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r7, r7, #1
add r4, #8
add r5, #0x10
@@ -1404,7 +1404,7 @@ _021D7FCA:
add r0, r5, r0
mov r1, #0xff
add r3, r2, #0
bl FUN_020196F4
bl FillWindowPixelRect
mov r0, #1
bl FUN_02002B60
mov r0, #0
@@ -1542,7 +1542,7 @@ MOD65_021D80C8: ; 0x021D80C8
strb r0, [r5, #0x1c]
ldrb r0, [r5, #0x1c]
ldr r1, [r5]
bl ListMenu_ctor
bl ListMenuItems_ctor
add r1, r5, #0
add r1, #0xcc
str r0, [r1]
@@ -1585,7 +1585,7 @@ _021D80EE:
ldrb r2, [r6, #5]
ldr r0, [r0]
ldr r1, [r5, #0x34]
bl ListMenu_AddItem
bl ListMenuItems_AddItem
cmp r4, #0xff
bne _021D80EE
_021D8142:
@@ -1594,7 +1594,7 @@ _021D8142:
ldr r0, [r0]
ldr r1, [r5, #0x38]
mov r2, #0xff
bl ListMenu_AddItem
bl ListMenuItems_AddItem
add r1, r5, #0
ldr r0, _021D8210 ; =0x021DA2E0
add r1, #0x84
@@ -1684,7 +1684,7 @@ _021D81C0:
ldrh r2, [r2]
add r0, #0x84
lsr r3, r3, #0x18
bl FUN_020010A8
bl ListMenuInit
add r1, r5, #0
add r1, #0xc4
str r0, [r1]
@@ -1711,7 +1711,7 @@ MOD65_021D8214: ; 0x021D8214
add r0, #0xe8
add r2, r1, #0
add r3, r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
cmp r4, #0
beq _021D823E
add r0, r5, #0
@@ -1725,11 +1725,11 @@ _021D823E:
ldr r0, [r0]
add r1, #0x80
add r2, #0x82
bl FUN_02001300
bl DestroyListMenu
add r0, r5, #0
add r0, #0xcc
ldr r0, [r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
add r0, r5, #0
add r0, #0x80
ldrh r1, [r0]
@@ -1792,7 +1792,7 @@ _021D82A2:
mov r1, #1
mov r2, #2
mov r3, #0
bl FUN_0201A8C8
bl ScrollWindow
b _021D8392
_021D82D2:
mov r0, #0x1e
@@ -1812,7 +1812,7 @@ _021D82D2:
mov r1, #0
mov r2, #4
add r3, r1, #0
bl FUN_0201A8C8
bl ScrollWindow
mov r0, #1
strh r0, [r4, #0x14]
b _021D8392
@@ -1834,7 +1834,7 @@ _021D8302:
mov r1, #1
mov r2, #2
mov r3, #0
bl FUN_0201A8C8
bl ScrollWindow
mov r0, #0
strh r0, [r4, #0x14]
b _021D8392
@@ -1856,7 +1856,7 @@ _021D8330:
mov r1, #0
mov r2, #2
add r3, r1, #0
bl FUN_0201A8C8
bl ScrollWindow
mov r0, #1
strh r0, [r4, #0x14]
b _021D8392
@@ -1881,7 +1881,7 @@ _021D835E:
mov r1, #0
mov r2, #2
add r3, r1, #0
bl FUN_0201A8C8
bl ScrollWindow
mov r0, #0
strh r0, [r4, #0x14]
_021D8392:
@@ -1953,7 +1953,7 @@ _021D83D2:
mov r1, #0
add r2, r1, #0
add r3, r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
ldrb r1, [r4, #0x1b]
cmp r1, #5
bne _021D8434
@@ -2057,11 +2057,11 @@ _021D84E0: .word 0x00000001
thumb_func_start MOD65_021D84E4
MOD65_021D84E4: ; 0x021D84E4
ldr r3, _021D84EC ; =FUN_02001470
ldr r3, _021D84EC ; =ListMenuGetTemplateField
mov r1, #0x13
bx r3
nop
_021D84EC: .word FUN_02001470
_021D84EC: .word ListMenuGetTemplateField
thumb_func_end MOD65_021D84E4
thumb_func_start MOD65_021D84F0
@@ -2072,7 +2072,7 @@ MOD65_021D84F0: ; 0x021D84F0
mov r1, #0x13
add r7, r0, #0
add r6, r2, #0
bl FUN_02001470
bl ListMenuGetTemplateField
add r4, r0, #0
cmp r6, #0
bne _021D850C
@@ -2083,7 +2083,7 @@ _021D850C:
add r0, r7, #0
add r1, #2
add r2, sp, #0x10
bl FUN_02001448
bl ListMenuGetScrollAndRow
add r2, sp, #0x10
ldrh r2, [r2]
mov r0, #7
@@ -2140,7 +2140,7 @@ _021D8578:
add r0, #0xf8
add r2, r1, #0
add r3, r1, #0
bl FUN_020196F4
bl FillWindowPixelRect
cmp r5, #0xff
bne _021D85B4
add r0, r4, #0
@@ -2223,7 +2223,7 @@ MOD65_021D8634: ; 0x021D8634
add r5, r0, #0
ldr r1, [r5]
mov r0, #3
bl ListMenu_ctor
bl ListMenuItems_ctor
add r1, r5, #0
add r1, #0xd0
str r0, [r1]
@@ -2235,7 +2235,7 @@ _021D8648:
ldr r1, [r5, #0x2c]
add r2, r4, #1
add r3, r4, #0
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
add r0, r4, #1
lsl r0, r0, #0x18
lsr r4, r0, #0x18
@@ -2276,7 +2276,7 @@ _021D8648:
add r0, #0xa4
add r2, r1, #0
lsr r3, r3, #0x18
bl FUN_020010A8
bl ListMenuInit
add r5, #0xc8
str r0, [r5]
pop {r3, r4, r5, pc}
@@ -2304,11 +2304,11 @@ MOD65_021D86BC: ; 0x021D86BC
ldr r0, [r0]
add r1, sp, #0
add r2, #2
bl FUN_02001300
bl DestroyListMenu
add r0, r4, #0
add r0, #0xd0
ldr r0, [r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
add r0, r4, #0
mov r1, #0
add r0, #0xc8
@@ -3269,7 +3269,7 @@ MOD65_021D8E68: ; 0x021D8E68
add r0, r4, #0
add r0, #0x6c
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #0x10]
mov r1, #1
ldrb r0, [r0, #0xb]
@@ -3842,7 +3842,7 @@ MOD65_021D92C4: ; 0x021D92C4
add r0, r4, #0
add r0, #0x6c
mov r1, #0xff
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #0x20]
bl StringSetEmpty
mov r0, #1
arm9/modules/66/asm/module_66.s
+11 -11
View File
@@ -1350,7 +1350,7 @@ _021D7F44:
bl FUN_0200D6F8
add r0, r7, #0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r3, #0
str r3, [sp]
mov r0, #0xff
@@ -1720,7 +1720,7 @@ MOD66_021D820C: ; 0x021D820C
bl StringSetEmpty
add r0, r4, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r6, #0xa0
ldr r0, [r6]
cmp r0, #0
@@ -1801,7 +1801,7 @@ MOD66_021D82B8: ; 0x021D82B8
bne _021D82DC
add r0, r6, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r6, #0
bl CopyWindowToVram
add r0, r6, #0
@@ -1811,7 +1811,7 @@ MOD66_021D82B8: ; 0x021D82B8
_021D82DC:
add r0, r6, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldrh r1, [r4, #8]
ldr r0, _021D8378 ; =0x0000FFFF
cmp r1, r0
@@ -2044,7 +2044,7 @@ MOD66_021D8494: ; 0x021D8494
cmp r5, #0
beq _021D84C6
add r0, r5, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
bl FUN_02019570
ldrb r1, [r4, #0x15]
@@ -2104,7 +2104,7 @@ MOD66_021D84C8: ; 0x021D84C8
sub r4, r1, r0
add r0, r5, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0
str r1, [sp]
mov r0, #0xff
@@ -2212,23 +2212,23 @@ MOD66_021D8554: ; 0x021D8554
add r0, r4, #0
add r0, #0x28
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
add r0, #0x38
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
add r0, #0x48
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
add r0, #0x58
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
add r0, #0x68
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
add r0, #0x28
bl CopyWindowToVram
arm9/modules/67/asm/module_67.s
+3 -3
View File
@@ -327,7 +327,7 @@ MOD67_021D777C: ; 0x021D777C
bl FUN_020178A0
mov r0, #0x2a
add r1, r4, #0
bl FUN_02016A8C
bl FreeToHeapExplicit
pop {r4, pc}
.align 2, 0
thumb_func_end MOD67_021D777C
@@ -1122,10 +1122,10 @@ _021D7DAC:
_021D7DB4:
add r0, r6, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
add r1, r6, #0
add r2, r4, #0
arm9/modules/68/asm/module_68.s
+14 -14
View File
@@ -320,7 +320,7 @@ MOD68_021D7774: ; 0x021D7774
bl FUN_020178A0
mov r0, #0x24
add r1, r4, #0
bl FUN_02016A8C
bl FreeToHeapExplicit
pop {r4, pc}
.align 2, 0
thumb_func_end MOD68_021D7774
@@ -527,7 +527,7 @@ MOD68_021D7904: ; 0x021D7904
bl FUN_02002E14
add r7, r0, #0
add r0, r5, r4
bl FUN_0201AB0C
bl GetWindowWidth
add r3, r0, #0
mov r1, #0
lsl r3, r3, #3
@@ -555,7 +555,7 @@ MOD68_021D7958: ; 0x021D7958
add r4, r0, #0
add r0, r4, #4
mov r1, #4
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0
ldr r3, _021D7974 ; =0x00010204
add r0, r4, #0
@@ -572,7 +572,7 @@ MOD68_021D7978: ; 0x021D7978
add r4, r0, #0
add r0, #0x24
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r3, _021D7994 ; =0x000F0200
add r0, r4, #0
mov r1, #2
@@ -589,7 +589,7 @@ MOD68_021D7998: ; 0x021D7998
add r4, r0, #0
add r0, #0x34
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r3, _021D79B4 ; =0x000F0200
add r0, r4, #0
mov r1, #3
@@ -606,7 +606,7 @@ MOD68_021D79B8: ; 0x021D79B8
add r4, r0, #0
add r0, #0x44
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r3, _021D79D4 ; =0x000F0200
add r0, r4, #0
mov r1, #4
@@ -623,7 +623,7 @@ MOD68_021D79D8: ; 0x021D79D8
add r4, r0, #0
add r0, #0x54
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r3, _021D79F4 ; =0x000F0200
add r0, r4, #0
mov r1, #5
@@ -640,7 +640,7 @@ MOD68_021D79F8: ; 0x021D79F8
add r4, r0, #0
add r0, #0x64
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r3, _021D7A14 ; =0x000F0200
add r0, r4, #0
mov r1, #6
@@ -660,7 +660,7 @@ MOD68_021D7A18: ; 0x021D7A18
add r4, #0x14
add r0, r4, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #5
str r0, [sp]
add r0, r5, #0
@@ -752,7 +752,7 @@ MOD68_021D7AE4: ; 0x021D7AE4
add r5, #0xb4
add r0, r5, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x7e
lsl r0, r0, #2
ldr r0, [r4, r0]
@@ -790,7 +790,7 @@ MOD68_021D7B34: ; 0x021D7B34
add r5, #0x94
add r0, r5, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r4, #0xc4
ldr r0, [r4]
mov r1, #0xa
@@ -826,7 +826,7 @@ MOD68_021D7B80: ; 0x021D7B80
add r5, #0xa4
add r0, r5, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x7f
lsl r0, r0, #2
ldr r0, [r4, r0]
@@ -871,7 +871,7 @@ MOD68_021D7BDC: ; 0x021D7BDC
add r5, #0x74
add r0, r5, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r4, #0xc4
ldr r0, [r4]
mov r1, #8
@@ -907,7 +907,7 @@ MOD68_021D7C28: ; 0x021D7C28
add r6, #0x84
add r0, r6, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x7f
lsl r0, r0, #2
ldr r0, [r5, r0]
arm9/modules/69/asm/module_69.s
+2 -2
View File
@@ -793,7 +793,7 @@ MOD69_0222DBAC: ; 0x0222DBAC
add r0, r4, #0
add r0, #0x14
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
add r0, #0x14
bl FUN_02019548
@@ -2608,7 +2608,7 @@ _0222EAEA:
_0222EB16:
ldr r0, [r4, #0x10]
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #0x10]
bl FUN_02019548
ldr r0, [r4, #0x28]
arm9/modules/70/asm/module_70.s
+4 -4
View File
@@ -1022,11 +1022,11 @@ MOD70_021D7CC0: ; 0x021D7CC0
add r4, r0, #0
add r0, #0x14
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
add r0, #0x24
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
add r0, #0x14
bl FUN_02019548
@@ -1102,7 +1102,7 @@ MOD70_021D7CE8: ; 0x021D7CE8
bl StringExpandPlaceholders
add r0, r6, #0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0
str r1, [sp]
mov r2, #0xff
@@ -1136,7 +1136,7 @@ MOD70_021D7D98: ; 0x021D7D98
add r0, #0x24
mov r1, #0xf
str r0, [sp, #0xc]
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r4, #0x1c]
cmp r0, #0
beq _021D7DC8
arm9/modules/71/asm/module_71.s
+34 -34
View File
@@ -1750,7 +1750,7 @@ MOD71_0222E438: ; 0x0222E438
lsl r1, r1, #2
ldr r1, [r4, r1]
mov r0, #0x1a
bl FUN_02016A8C
bl FreeToHeapExplicit
mov r0, #0x61
lsl r0, r0, #2
ldr r0, [r4, r0]
@@ -2700,7 +2700,7 @@ MOD71_0222EC5C: ; 0x0222EC5C
bl GetMonData
add r0, r5, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [sp, #0x20]
ldr r2, [sp, #8]
str r0, [sp]
@@ -2910,7 +2910,7 @@ _0222EE14:
str r0, [sp, #0x30]
add r0, r6, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x61
lsl r0, r0, #2
ldr r0, [r4, r0]
@@ -2985,7 +2985,7 @@ _0222EEA6:
lsr r7, r0, #0x10
add r0, r6, r4
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x14
mov r1, #0x1a
bl String_ctor
@@ -4313,7 +4313,7 @@ MOD71_0222F954: ; 0x0222F954
mov r0, #0xda
lsl r0, r0, #6
ldr r0, [r5, r0]
bl FUN_02001204
bl ListMenu_ProcessInput
add r4, r0, #0
mov r0, #1
mvn r0, r0
@@ -4383,10 +4383,10 @@ _0222F9E4:
mov r1, #0
ldr r0, [r5, r0]
add r2, r1, #0
bl FUN_02001300
bl DestroyListMenu
ldr r0, _0222FA34 ; =0x0000367C
ldr r0, [r5, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
mov r0, #0
pop {r4, r5, r6, pc}
.align 2, 0
@@ -4412,7 +4412,7 @@ MOD71_0222FA38: ; 0x0222FA38
str r0, [sp]
add r0, r0, #1
mov r1, #0x1a
bl ListMenu_ctor
bl ListMenuItems_ctor
ldr r1, _0222FAD0 ; =0x0000367C
str r0, [r5, r1]
mov r0, #0x64
@@ -4438,7 +4438,7 @@ _0222FA60:
add r1, r6, #0
ldr r0, [r5, r0]
add r2, r4, #0
bl ListMenu_AddItem
bl ListMenuItems_AddItem
_0222FA8A:
add r4, r4, #1
cmp r4, #0x20
@@ -4450,7 +4450,7 @@ _0222FA8A:
add r3, r2, #0
ldr r1, [r5, r1]
sub r3, #0xd
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
add r0, r6, #0
bl String_dtor
ldr r2, _0222FAD0 ; =0x0000367C
@@ -4909,7 +4909,7 @@ MOD71_0222FDD8: ; 0x0222FDD8
bl MOD71_02230F40
mov r0, #3
mov r1, #0x1a
bl ListMenu_ctor
bl ListMenuItems_ctor
ldr r1, _0222FED8 ; =0x0000065C
mov r2, #0x11
str r0, [r4, r1]
@@ -4918,7 +4918,7 @@ MOD71_0222FDD8: ; 0x0222FDD8
lsl r1, r1, #2
ldr r1, [r4, r1]
mov r3, #0
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
ldr r0, _0222FED8 ; =0x0000065C
mov r1, #0x61
lsl r1, r1, #2
@@ -4926,7 +4926,7 @@ MOD71_0222FDD8: ; 0x0222FDD8
ldr r1, [r4, r1]
mov r2, #0x12
mov r3, #1
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
ldr r0, _0222FED8 ; =0x0000065C
mov r1, #0x61
lsl r1, r1, #2
@@ -4934,7 +4934,7 @@ MOD71_0222FDD8: ; 0x0222FDD8
ldr r1, [r4, r1]
mov r2, #0x13
mov r3, #2
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
ldr r0, _0222FED8 ; =0x0000065C
ldr r1, [r4, r0]
str r1, [sp, #0x10]
@@ -5024,7 +5024,7 @@ _0222FF10:
bl FUN_02001C5C
ldr r0, _0223000C ; =0x0000065C
ldr r0, [r4, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
ldr r1, _02230010 ; =MOD71_0222F538
ldr r0, _02230014 ; =0x00002214
add sp, #0x10
@@ -5063,7 +5063,7 @@ _0222FF64:
bl FUN_02001C5C
ldr r0, _0223000C ; =0x0000065C
ldr r0, [r4, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
ldr r1, _0223001C ; =MOD71_02230020
ldr r0, _02230014 ; =0x00002214
str r1, [r4, r0]
@@ -5100,7 +5100,7 @@ _0222FFB4:
bl FUN_02001C5C
ldr r0, _0223000C ; =0x0000065C
ldr r0, [r4, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
ldr r1, _02230010 ; =MOD71_0222F538
ldr r0, _02230014 ; =0x00002214
str r1, [r4, r0]
@@ -6155,7 +6155,7 @@ MOD71_02230810: ; 0x02230810
bl MOD71_02230F40
mov r0, #2
mov r1, #0x1a
bl ListMenu_ctor
bl ListMenuItems_ctor
ldr r1, _02230900 ; =0x0000065C
mov r2, #0x11
str r0, [r4, r1]
@@ -6164,7 +6164,7 @@ MOD71_02230810: ; 0x02230810
lsl r1, r1, #2
ldr r1, [r4, r1]
mov r3, #0
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
ldr r0, _02230900 ; =0x0000065C
mov r1, #0x61
lsl r1, r1, #2
@@ -6172,7 +6172,7 @@ MOD71_02230810: ; 0x02230810
ldr r1, [r4, r1]
mov r2, #0x13
mov r3, #1
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
ldr r0, _02230900 ; =0x0000065C
ldr r1, [r4, r0]
sub r0, #0x94
@@ -6259,7 +6259,7 @@ _0223092E:
bl FUN_02001C5C
ldr r0, _022309E4 ; =0x0000065C
ldr r0, [r4, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
add sp, #0x10
mov r0, #3
pop {r4, pc}
@@ -6295,7 +6295,7 @@ _02230982:
bl FUN_02001C5C
ldr r0, _022309E4 ; =0x0000065C
ldr r0, [r4, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
ldr r1, _022309DC ; =MOD71_0222F538
ldr r0, _022309E0 ; =0x00002214
str r1, [r4, r0]
@@ -6627,7 +6627,7 @@ MOD71_02230C48: ; 0x02230C48
bl FUN_02019064
add r0, r5, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r2, #1
add r1, r5, #0
str r2, [sp]
@@ -6646,7 +6646,7 @@ MOD71_02230C48: ; 0x02230C48
add r0, r5, #0
add r0, #0x10
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x15
str r0, [sp]
mov r0, #5
@@ -6666,7 +6666,7 @@ MOD71_02230C48: ; 0x02230C48
add r0, r5, #0
add r0, #0x60
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
bl Options_GetFrame
lsl r0, r0, #0x18
@@ -6706,7 +6706,7 @@ MOD71_02230C48: ; 0x02230C48
lsl r0, r0, #4
add r0, r5, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x13
str r0, [sp]
mov r0, #0xe
@@ -6728,7 +6728,7 @@ MOD71_02230C48: ; 0x02230C48
lsl r0, r0, #4
add r0, r5, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x13
str r0, [sp]
mov r0, #0x1b
@@ -6750,7 +6750,7 @@ MOD71_02230C48: ; 0x02230C48
lsl r0, r0, #4
add r0, r5, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x11
str r0, [sp]
mov r0, #0xb
@@ -6771,7 +6771,7 @@ MOD71_02230C48: ; 0x02230C48
lsl r0, r0, #6
add r0, r5, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x13
str r0, [sp]
mov r0, #0xb
@@ -6792,7 +6792,7 @@ MOD71_02230C48: ; 0x02230C48
lsl r0, r0, #4
add r0, r5, r0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r4, _02230E80 ; =0x022313F4
mov r7, #0
mov r6, #0x33
@@ -6824,7 +6824,7 @@ _02230DE2:
ldr r0, [sp, #0x18]
mov r1, #0
add r0, r5, r0
bl FUN_02019620
bl FillWindowPixelBuffer
add r7, r7, #1
add r6, #0x10
add r4, r4, #4
@@ -6861,7 +6861,7 @@ _02230E2C:
bl FUN_02019064
add r0, r5, r7
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r6, r6, #1
add r4, #0xa
cmp r6, #8
@@ -6995,7 +6995,7 @@ _02230F6A:
_02230F76:
add r0, r5, #0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r3, #0
str r3, [sp]
ldr r0, _02230FAC ; =0x0001020F
@@ -7127,7 +7127,7 @@ MOD71_02231018: ; 0x02231018
mov r3, #0x1a
str r5, [sp, #0x14]
str r4, [sp, #0x20]
bl FUN_020010A8
bl ListMenuInit
add sp, #0x34
pop {r4, r5, r6, r7, pc}
nop
arm9/modules/73/asm/module_73.s
+11 -11
View File
@@ -4805,7 +4805,7 @@ MOD73_021D9AC8: ; 0x021D9AC8
add r4, r0, #0
ldr r0, [r4, #8]
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r1, [r4, #0x18]
mov r2, #0
ldr r0, [r4, #8]
@@ -4947,11 +4947,11 @@ MOD73_021D9BE0: ; 0x021D9BE0
add r5, r0, #0
add r0, r4, #0
mov r1, #1
bl FUN_02018FF4
bl AllocWindows
str r0, [r5, #8]
add r0, r4, #0
mov r1, #1
bl FUN_02018FF4
bl AllocWindows
str r0, [r5, #0xc]
mov r0, #0x13
str r0, [sp]
@@ -4984,10 +4984,10 @@ MOD73_021D9BE0: ; 0x021D9BE0
bl FUN_02019064
ldr r0, [r5, #8]
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r5, #0xc]
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, [r5, #0x10]
mov r1, #4
lsl r0, r0, #0x18
@@ -5924,7 +5924,7 @@ MOD73_021DA2AC: ; 0x021DA2AC
_021DA2FA:
ldr r0, [sp, #0x14]
mov r1, #1
bl FUN_02018FF4
bl AllocWindows
str r0, [r4, #8]
ldrh r0, [r5, #2]
mov r2, #2
@@ -5953,7 +5953,7 @@ _021DA2FA:
bl FUN_02019064
ldr r0, [r4, #8]
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r6, r6, #1
add r4, r4, #4
add r5, #0xc
@@ -6099,7 +6099,7 @@ _021DA446:
mov r1, #0
str r1, [r5, #0x30]
ldr r0, [r5, #8]
bl FUN_02019620
bl FillWindowPixelBuffer
mov r3, #0
str r3, [sp]
ldr r0, _021DA498 ; =0x0001020F
@@ -6173,7 +6173,7 @@ MOD73_021DA4D4: ; 0x021DA4D4
bl FUN_02018744
ldr r0, [r4, #0xc]
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0
str r1, [sp]
ldr r0, _021DA54C ; =0x0001020F
@@ -6192,7 +6192,7 @@ MOD73_021DA4D4: ; 0x021DA4D4
bl FUN_0200CCA4
ldr r0, [r4, #0x10]
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #0
str r1, [sp]
ldr r0, _021DA54C ; =0x0001020F
@@ -6494,7 +6494,7 @@ MOD73_021DA770: ; 0x021DA770
ldr r0, [r4, #0x14]
add r6, r1, #0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
cmp r6, #6
bhi _021DA7EC
add r0, r6, r6
arm9/modules/74/asm/module_74.s
+5 -5
View File
@@ -771,7 +771,7 @@ _021D7A9A:
bl FUN_02019150
add r0, r5, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r7, r7, #1
add r4, #8
add r5, #0x10
@@ -790,7 +790,7 @@ _021D7AC0:
bl FUN_02019150
add r0, r5, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r7, r7, #1
add r4, #8
add r5, #0x10
@@ -1343,7 +1343,7 @@ MOD74_021D7F44: ; 0x021D7F44
mov r1, #0
add r5, r2, #0
add r4, r3, #0
bl FUN_02019620
bl FillWindowPixelBuffer
cmp r4, #8
blo _021D7F8C
mov r0, #2
@@ -1637,7 +1637,7 @@ MOD74_021D818C: ; 0x021D818C
add r0, r4, #0
add r0, #0x8c
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #4
str r0, [sp]
mov r1, #0
@@ -1664,7 +1664,7 @@ MOD74_021D81E0: ; 0x021D81E0
add r4, r0, #0
add r0, #0x8c
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
add r0, #0x8c
bl FUN_02019570
arm9/modules/75/asm/module_75.s
+81 -81
View File
@@ -759,7 +759,7 @@ MOD75_021E71BC: ; 0x021E71BC
bl FUN_020178A0
mov r0, #6
add r1, r4, #0
bl FUN_02016A8C
bl FreeToHeapExplicit
pop {r4, pc}
.align 2, 0
thumb_func_end MOD75_021E71BC
@@ -1233,7 +1233,7 @@ MOD75_021E7580: ; 0x021E7580
ldrb r0, [r0, r1]
mov r1, #6
add r0, r0, #3
bl ListMenu_ctor
bl ListMenuItems_ctor
mov r1, #0x16
lsl r1, r1, #4
str r0, [r5, r1]
@@ -1243,7 +1243,7 @@ MOD75_021E7580: ; 0x021E7580
add r3, r2, #0
ldr r1, [r5, r1]
sub r3, #0x23
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
ldrb r3, [r4, #8]
cmp r3, #3
bne _021E764A
@@ -1280,7 +1280,7 @@ _021E75CE:
ldr r0, [r5, r0]
ldr r1, [r7, r1]
add r2, r6, #0
bl ListMenu_AddItem
bl ListMenuItems_AddItem
ldr r0, [sp]
ldrb r1, [r4, #8]
add r0, r0, #4
@@ -1300,7 +1300,7 @@ _021E761A:
add r3, r2, #0
ldr r1, [r5, r1]
sub r3, #0x22
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
mov r1, #0x16
lsl r1, r1, #4
ldr r0, [r5, r1]
@@ -1309,7 +1309,7 @@ _021E761A:
add r3, r2, #0
ldr r1, [r5, r1]
sub r3, #0x23
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
add r0, r6, #3
add sp, #8
strb r0, [r4, #9]
@@ -1348,7 +1348,7 @@ _021E7658:
ldr r0, [r5, r0]
ldr r1, [r7, r1]
add r2, r6, #0
bl ListMenu_AddItem
bl ListMenuItems_AddItem
ldr r0, [sp, #4]
ldrb r3, [r4, #8]
add r0, r0, #4
@@ -1377,7 +1377,7 @@ _021E76A4:
add r3, r2, #0
ldr r1, [r5, r1]
sub r3, #0x22
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
b _021E76E0
_021E76CC:
mov r1, #0x16
@@ -1388,7 +1388,7 @@ _021E76CC:
add r3, r2, #0
ldr r1, [r5, r1]
sub r3, #0x2b
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
_021E76E0:
mov r1, #0x16
lsl r1, r1, #4
@@ -1398,7 +1398,7 @@ _021E76E0:
add r3, r2, #0
ldr r1, [r5, r1]
sub r3, #0x23
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
add r0, r6, #3
add sp, #8
strb r0, [r4, #9]
@@ -1412,7 +1412,7 @@ _021E76FC:
add r3, r2, #0
ldr r1, [r5, r1]
sub r3, #0x23
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
add r0, r6, #2
strb r0, [r4, #9]
add sp, #8
@@ -1606,7 +1606,7 @@ _021E784E:
add r1, r3, #0
add r0, sp, #0
mov r3, #6
bl FUN_020010A8
bl ListMenuInit
mov r1, #0x57
lsl r1, r1, #2
str r0, [r4, r1]
@@ -1624,7 +1624,7 @@ MOD75_021E7870: ; 0x021E7870
add r7, r1, #0
mov r1, #0x13
add r4, r2, #0
bl FUN_02001470
bl ListMenuGetTemplateField
add r5, r0, #0
cmp r4, #1
beq _021E78F8
@@ -1693,7 +1693,7 @@ _021E78F8:
add r0, r5, #0
add r0, #0x14
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #1
mvn r1, r1
cmp r7, r1
@@ -1751,7 +1751,7 @@ MOD75_021E797C: ; 0x021E797C
mov r1, #0x13
str r0, [sp]
add r7, r2, #0
bl FUN_02001470
bl ListMenuGetTemplateField
add r4, r0, #0
add r0, #0xc4
ldr r0, [r0]
@@ -1773,14 +1773,14 @@ MOD75_021E797C: ; 0x021E797C
mov r1, #8
mov r2, #0
mov r3, #9
bl FUN_020013E8
bl ListMenuOverrideSetColors
b _021E79C6
_021E79BA:
ldr r0, [sp]
mov r1, #1
mov r2, #0
mov r3, #2
bl FUN_020013E8
bl ListMenuOverrideSetColors
_021E79C6:
ldrb r0, [r6, #8]
cmp r0, #7
@@ -1911,11 +1911,11 @@ MOD75_021E7AA4: ; 0x021E7AA4
add r3, #8
add r1, r1, r2
add r2, r3, r2
bl FUN_02001300
bl DestroyListMenu
mov r0, #0x16
lsl r0, r0, #4
ldr r0, [r4, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
mov r0, #0x57
mov r1, #0
lsl r0, r0, #2
@@ -1959,7 +1959,7 @@ _021E7B12:
add r0, r4, #0
add r0, #0x14
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
add r0, #0x14
bl FUN_02019570
@@ -2019,7 +2019,7 @@ MOD75_021E7B7C: ; 0x021E7B7C
ldr r0, [r5, r0]
add r1, r4, #6
add r2, r4, #4
bl FUN_02001448
bl ListMenuGetScrollAndRow
ldr r0, _021E7CD8 ; =gMain
ldr r1, [r0, #0x48]
mov r0, #4
@@ -2038,7 +2038,7 @@ _021E7BC0:
mov r0, #0x57
lsl r0, r0, #2
ldr r0, [r5, r0]
bl FUN_02001204
bl ListMenu_ProcessInput
add r6, r0, #0
mov r0, #0x57
lsl r0, r0, #2
@@ -2046,7 +2046,7 @@ _021E7BC0:
ldr r0, [r5, r0]
add r1, #2
add r2, sp, #0
bl FUN_02001448
bl ListMenuGetScrollAndRow
add r0, sp, #0
ldrh r2, [r0]
ldrh r0, [r4, #4]
@@ -2085,7 +2085,7 @@ _021E7BFC:
lsl r1, r1, #0x10
ldr r0, [r5, r0]
lsr r1, r1, #0x10
bl FUN_02001464
bl ListMenuGetValueByArrayId
add r6, r0, #0
mov r0, #0x49
mov r1, #1
@@ -2102,7 +2102,7 @@ _021E7C38:
mov r0, #0x57
lsl r0, r0, #2
ldr r0, [r5, r0]
bl FUN_0200145C
bl ListMenuGetUnk33
cmp r0, #1
bne _021E7C5E
add r0, r5, #0
@@ -2396,11 +2396,11 @@ MOD75_021E7E60: ; 0x021E7E60
bl MOD75_021E7AA4
add r0, r4, #4
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
add r0, #0x14
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #4
bl FUN_02019220
add r0, r4, #0
@@ -2830,11 +2830,11 @@ _021E81D2:
add r3, #8
add r1, r1, r2
add r2, r3, r2
bl FUN_02001300
bl DestroyListMenu
mov r0, #0x16
lsl r0, r0, #4
ldr r0, [r5, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
_021E8206:
add r0, r5, #0
add r0, #0xc4
@@ -3643,7 +3643,7 @@ MOD75_021E8808: ; 0x021E8808
add r1, r2, r1
lsl r1, r1, #0x10
lsr r1, r1, #0x10
bl FUN_02001464
bl ListMenuGetValueByArrayId
mov r1, #1
mvn r1, r1
cmp r0, r1
@@ -3701,7 +3701,7 @@ MOD75_021E8864: ; 0x021E8864
lsl r0, r0, #2
ldrb r1, [r4, r1]
ldr r0, [r4, r0]
bl FUN_02001464
bl ListMenuGetValueByArrayId
ldr r1, _021E88B8 ; =0x0000047C
str r0, [r4, r1]
add r0, r4, #0
@@ -3709,7 +3709,7 @@ MOD75_021E8864: ; 0x021E8864
mov r0, #0x57
lsl r0, r0, #2
ldr r0, [r4, r0]
bl FUN_02001328
bl RedrawListMenu
add r0, r4, #0
bl MOD75_021E8AAC
pop {r4, pc}
@@ -3744,7 +3744,7 @@ _021E88D0:
ldr r0, [r5, r0]
add r1, r4, #6
add r2, r4, #4
bl FUN_02001448
bl ListMenuGetScrollAndRow
add r0, r5, #0
bl MOD75_021E87B8
cmp r0, #1
@@ -3776,7 +3776,7 @@ _021E892E:
mov r0, #0x57
lsl r0, r0, #2
ldr r0, [r5, r0]
bl FUN_02001204
bl ListMenu_ProcessInput
add r6, r0, #0
mov r0, #0x57
lsl r0, r0, #2
@@ -3784,7 +3784,7 @@ _021E892E:
ldr r0, [r5, r0]
add r1, #2
add r2, sp, #0
bl FUN_02001448
bl ListMenuGetScrollAndRow
add r0, sp, #0
ldrh r2, [r0]
ldrh r0, [r4, #4]
@@ -3816,7 +3816,7 @@ _021E896A:
mov r0, #0x57
lsl r0, r0, #2
ldr r0, [r5, r0]
bl FUN_0200145C
bl ListMenuGetUnk33
cmp r0, #1
bne _021E899A
add r0, r5, #0
@@ -3900,7 +3900,7 @@ MOD75_021E89F0: ; 0x021E89F0
mov r0, #0x16
lsl r0, r0, #4
ldr r0, [r4, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
add r0, r4, #0
bl MOD75_021E7580
_021E8A3C:
@@ -3928,7 +3928,7 @@ MOD75_021E8A48: ; 0x021E8A48
ldr r0, [r5, r0]
add r1, r4, #6
add r2, r4, #4
bl FUN_02001300
bl DestroyListMenu
mov r0, #0x57
mov r1, #0
lsl r0, r0, #2
@@ -4455,7 +4455,7 @@ MOD75_021E8E1C: ; 0x021E8E1C
add r0, r4, #0
add r0, #0x64
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
ldr r2, _021E8EA8 ; =0x000003D9
add r0, #0x64
@@ -4567,7 +4567,7 @@ _021E8F3A:
add r0, r4, #0
add r0, #0x64
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
ldr r2, _021E8FB8 ; =0x000003D9
add r0, #0x64
@@ -4686,7 +4686,7 @@ _021E9046:
add r0, r4, #0
add r0, #0x64
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
ldr r2, _021E91A8 ; =0x000003D9
add r0, #0x64
@@ -4726,7 +4726,7 @@ _021E908E:
add r0, r4, #0
add r0, #0x64
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x46
mov r1, #0xfe
lsl r0, r0, #2
@@ -5022,11 +5022,11 @@ MOD75_021E92BC: ; 0x021E92BC
add r3, #8
add r1, r1, r2
add r2, r3, r2
bl FUN_02001300
bl DestroyListMenu
mov r0, #0x16
lsl r0, r0, #4
ldr r0, [r4, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
add r0, r4, #0
bl MOD75_021E7580
add r0, r4, #0
@@ -5102,7 +5102,7 @@ MOD75_021E9394: ; 0x021E9394
_021E93AA:
add r0, #0x64
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
ldr r2, _021E942C ; =0x000003D9
add r0, #0x64
@@ -5473,7 +5473,7 @@ _021E967A:
add r0, r5, #0
add r0, #0x64
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
bl MOD75_021EB660
ldr r1, _021E9718 ; =0x00000426
@@ -5608,7 +5608,7 @@ MOD75_021E97A8: ; 0x021E97A8
mov r0, #0x57
lsl r0, r0, #2
ldr r0, [r4, r0]
bl FUN_02001328
bl RedrawListMenu
add r0, r4, #0
bl MOD75_021EB344
add r0, r4, #0
@@ -5633,7 +5633,7 @@ MOD75_021E97E4: ; 0x021E97E4
mov r0, #0x57
lsl r0, r0, #2
ldr r0, [r4, r0]
bl FUN_02001328
bl RedrawListMenu
add r0, r4, #0
bl MOD75_021EB344
add r0, r4, #0
@@ -5711,7 +5711,7 @@ _021E9872:
add r0, r5, #0
add r0, #0x64
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
ldr r2, _021E9928 ; =0x000003D9
add r0, #0x64
@@ -5864,7 +5864,7 @@ _021E99C6:
add r0, r5, #0
add r0, #0x64
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
ldr r2, _021E9B3C ; =0x000003D9
add r0, #0x64
@@ -6100,7 +6100,7 @@ _021E9BAC:
add r0, r4, #0
add r0, #0x64
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x45
lsl r0, r0, #2
ldr r0, [r4, r0]
@@ -6195,7 +6195,7 @@ _021E9C80:
add r0, r4, #0
add r0, #0x64
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x45
lsl r0, r0, #2
ldr r0, [r4, r0]
@@ -6405,7 +6405,7 @@ _021E9E2A:
add r0, r5, #0
add r0, #0x64
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
bl MOD75_021EB660
ldr r1, _021E9EDC ; =0x00000426
@@ -6654,7 +6654,7 @@ _021EA016:
add r0, r4, #0
add r0, #0x64
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
ldr r2, _021EA0C4 ; =0x000003D9
add r0, #0x64
@@ -7055,7 +7055,7 @@ MOD75_021EA328: ; 0x021EA328
ldrh r3, [r3]
ldr r0, [r4, r0]
mov r1, #0
bl FUN_02001354
bl ListMenuTestInputInternal
add r0, r4, #0
add r0, #0xc4
ldr r0, [r0]
@@ -7207,7 +7207,7 @@ MOD75_021EA444: ; 0x021EA444
ldrh r3, [r3]
ldr r0, [r4, r0]
mov r1, #0
bl FUN_02001354
bl ListMenuTestInputInternal
add r0, r4, #0
add r0, #0xc4
ldr r0, [r0]
@@ -7755,7 +7755,7 @@ MOD75_021EA8BC: ; 0x021EA8BC
add r4, r0, #0
add r0, #0x24
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r2, r4, #0
add r2, #0xc4
ldr r6, [r2]
@@ -7898,13 +7898,13 @@ _021EA9A8:
ldr r1, [r1, #0x14]
add r0, #0x54
mov r3, #0
bl FUN_02019658
bl BlitBitmapRectToWindow
add r5, #0x54
add r0, r5, #0
bl FUN_02019220
mov r0, #6
add r1, r7, #0
bl FUN_02016A8C
bl FreeToHeapExplicit
add sp, #0x1c
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -7922,7 +7922,7 @@ MOD75_021EA9F8: ; 0x021EA9F8
add r0, r5, #0
add r0, #0x54
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r0, _021EAAA0 ; =0x00000424
mov r4, #0
ldrb r0, [r5, r0]
@@ -7979,7 +7979,7 @@ _021EAA4C:
add r0, r6, #0
ldr r1, [r1, #0x14]
mov r3, #0
bl FUN_02019658
bl BlitBitmapRectToWindow
add r0, r4, #1
lsl r0, r0, #0x18
lsr r4, r0, #0x18
@@ -7993,7 +7993,7 @@ _021EAA8C:
bl FUN_02019220
ldr r1, [sp, #0x18]
mov r0, #6
bl FUN_02016A8C
bl FreeToHeapExplicit
add sp, #0x20
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -8617,10 +8617,10 @@ MOD75_021EAF70: ; 0x021EAF70
add r0, r5, #4
ldr r1, [r1, #0x14]
mov r2, #0x28
bl FUN_02019658
bl BlitBitmapRectToWindow
mov r0, #6
add r1, r6, #0
bl FUN_02016A8C
bl FreeToHeapExplicit
add sp, #0x1c
pop {r3, r4, r5, r6, pc}
thumb_func_end MOD75_021EAF70
@@ -8646,7 +8646,7 @@ MOD75_021EAFB0: ; 0x021EAFB0
add r0, r5, #4
add r2, r1, #0
lsr r3, r3, #0x10
bl FUN_020196F4
bl FillWindowPixelRect
mov r1, #0
str r4, [sp]
mov r0, #0xff
@@ -8692,10 +8692,10 @@ MOD75_021EB004: ; 0x021EB004
add r0, r5, #4
ldr r1, [r1, #0x14]
add r3, r2, #0
bl FUN_02019658
bl BlitBitmapRectToWindow
mov r0, #6
add r1, r6, #0
bl FUN_02016A8C
bl FreeToHeapExplicit
add sp, #0x1c
pop {r3, r4, r5, r6, pc}
.align 2, 0
@@ -8881,7 +8881,7 @@ _021EB180:
_021EB1B0:
add r0, r7, #0
mov r1, #6
bl ListMenu_ctor
bl ListMenuItems_ctor
mov r1, #0x55
lsl r1, r1, #2
mov r4, #0
@@ -8901,7 +8901,7 @@ _021EB1C4:
lsl r1, r1, #2
ldr r0, [r5, r0]
ldr r1, [r3, r1]
bl ListMenu_AddItem
bl ListMenuItems_AddItem
add r0, r4, #1
lsl r0, r0, #0x10
lsr r4, r0, #0x10
@@ -8971,7 +8971,7 @@ _021EB22E:
add r0, r5, #0
add r0, #0x14
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r1, r5, #0
add r1, #0xc4
ldr r1, [r1]
@@ -9001,7 +9001,7 @@ _021EB298:
bl FUN_0200D0BC
add r0, r4, r6
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x45
lsl r0, r0, #2
ldr r0, [r5, r0]
@@ -9112,14 +9112,14 @@ _021EB37A:
mov r0, #0x55
lsl r0, r0, #2
ldr r0, [r5, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
add r0, r5, #0
add r0, #0xb4
bl FUN_02019178
add r0, r5, #0
add r0, #0x14
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r1, r5, #0
add r1, #0xc4
ldr r1, [r1]
@@ -9144,7 +9144,7 @@ MOD75_021EB3D8: ; 0x021EB3D8
add r5, r0, #0
add r0, #0x14
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x45
lsl r0, r0, #2
ldr r0, [r5, r0]
@@ -9214,7 +9214,7 @@ MOD75_021EB454: ; 0x021EB454
add r0, r5, #0
add r0, #0x34
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x45
lsl r0, r0, #2
ldr r0, [r5, r0]
@@ -9280,7 +9280,7 @@ MOD75_021EB504: ; 0x021EB504
add r4, #0x94
add r0, r4, #0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x45
lsl r0, r0, #2
ldr r0, [r5, r0]
@@ -9365,7 +9365,7 @@ MOD75_021EB5B0: ; 0x021EB5B0
add r0, r5, #0
add r0, #0x64
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x45
lsl r0, r0, #2
ldr r0, [r5, r0]
@@ -9543,7 +9543,7 @@ MOD75_021EB708: ; 0x021EB708
_021EB722:
add r0, r4, #0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x45
lsl r0, r0, #2
ldr r0, [r5, r0]
@@ -9654,7 +9654,7 @@ MOD75_021EB808: ; 0x021EB808
bne _021EB854
add r0, r4, #0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r2, _021EB8E4 ; =0x000003F7
add r0, r4, #0
mov r1, #1
@@ -9686,7 +9686,7 @@ _021EB854:
mov r1, #0xf
mov r2, #0
str r3, [sp, #4]
bl FUN_020196F4
bl FillWindowPixelRect
_021EB866:
mov r0, #0x45
lsl r0, r0, #2
@@ -9755,7 +9755,7 @@ MOD75_021EB8E8: ; 0x021EB8E8
add r4, #0xa4
add r0, r4, #0
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
ldr r2, _021EB9B0 ; =0x000003F7
add r0, r4, #0
mov r1, #1
arm9/modules/76/asm/module_76.s
+23 -23
View File
@@ -382,7 +382,7 @@ MOD76_021D77E4: ; 0x021D77E4
bl FUN_020178A0
mov r0, #0x43
add r1, r4, #0
bl FUN_02016A8C
bl FreeToHeapExplicit
pop {r4, pc}
.align 2, 0
thumb_func_end MOD76_021D77E4
@@ -467,7 +467,7 @@ _021D78A8:
bl FUN_02019150
add r0, r5, #0
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r6, r6, #1
add r4, #8
add r5, #0x10
@@ -478,7 +478,7 @@ _021D78A8:
add r0, r7, #0
add r0, #0xc8
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r7, #0xc8
add r0, r7, #0
mov r1, #0
@@ -596,11 +596,11 @@ _021D799C:
ldr r0, [r5, r0]
add r1, #2
add r2, sp, #0
bl FUN_02001448
bl ListMenuGetScrollAndRow
mov r0, #0x41
lsl r0, r0, #2
ldr r0, [r5, r0]
bl FUN_02001204
bl ListMenu_ProcessInput
add r4, r0, #0
ldr r2, [r5]
mov r0, #0x41
@@ -609,7 +609,7 @@ _021D799C:
ldr r0, [r5, r0]
add r1, #0x12
add r2, #0x10
bl FUN_02001448
bl ListMenuGetScrollAndRow
ldr r2, [r5]
add r1, sp, #0
ldrh r1, [r1, #2]
@@ -1021,7 +1021,7 @@ _021D7CE8:
add r1, #8
lsl r0, r4, #4
add r0, r1, r0
bl FUN_0201AB0C
bl GetWindowWidth
lsl r0, r0, #0x1b
lsr r0, r0, #0x18
sub r0, r0, r6
@@ -1041,7 +1041,7 @@ _021D7D12:
add r1, #8
lsl r0, r4, #4
add r0, r1, r0
bl FUN_0201AB0C
bl GetWindowWidth
lsl r0, r0, #0x1b
lsr r0, r0, #0x18
sub r1, r0, r6
@@ -1257,7 +1257,7 @@ MOD76_021D7ECC: ; 0x021D7ECC
strb r1, [r5, r0]
ldrb r0, [r5, r0]
mov r1, #0x43
bl ListMenu_ctor
bl ListMenuItems_ctor
mov r1, #0x42
lsl r1, r1, #2
str r0, [r5, r1]
@@ -1287,7 +1287,7 @@ _021D7F0E:
ldr r0, [r5, r0]
add r1, r7, #0
add r3, r2, #0
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
b _021D7F42
_021D7F2A:
mov r0, #0x42
@@ -1299,7 +1299,7 @@ _021D7F2A:
ldr r0, [r5, r0]
ldr r1, [r1]
sub r3, #0x22
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
b _021D7F50
_021D7F42:
mov r0, #0x61
@@ -1340,7 +1340,7 @@ _021D7F50:
ldrh r1, [r3, #0x12]
ldrh r2, [r3, #0x10]
mov r3, #0x43
bl FUN_020010A8
bl ListMenuInit
mov r1, #0x41
lsl r1, r1, #2
str r0, [r5, r1]
@@ -1365,11 +1365,11 @@ MOD76_021D7FAC: ; 0x021D7FAC
ldr r0, [r4, r0]
add r1, #0x12
add r2, #0x10
bl FUN_02001300
bl DestroyListMenu
mov r0, #0x42
lsl r0, r0, #2
ldr r0, [r4, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
pop {r4, pc}
.align 2, 0
thumb_func_end MOD76_021D7FAC
@@ -1380,7 +1380,7 @@ MOD76_021D7FD0: ; 0x021D7FD0
add r5, r1, #0
mov r1, #0x13
add r6, r2, #0
bl FUN_02001470
bl ListMenuGetTemplateField
add r4, r0, #0
cmp r6, #1
beq _021D7FE8
@@ -1418,19 +1418,19 @@ MOD76_021D800C: ; 0x021D800C
add r4, r1, #0
add r0, #0xa8
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
add r0, #0x78
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
add r0, #0x88
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r5, #0
add r0, #0x98
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r0, #0x4b
lsl r0, r0, #2
ldr r0, [r5, r0]
@@ -1601,7 +1601,7 @@ MOD76_021D81AC: ; 0x021D81AC
add r4, r1, #0
add r0, #0xb8
mov r1, #0
bl FUN_02019620
bl FillWindowPixelBuffer
mov r1, #1
mvn r1, r1
cmp r4, r1
@@ -2043,7 +2043,7 @@ MOD76_021D853C: ; 0x021D853C
add r5, r1, #0
add r0, #0xc8
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
add r1, r5, #0
bl MOD76_021D8354
@@ -2169,7 +2169,7 @@ MOD76_021D862C: ; 0x021D862C
add r4, r0, #0
add r0, #0xc8
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
mov r1, #0
bl MOD76_021D8354
@@ -2217,7 +2217,7 @@ MOD76_021D8688: ; 0x021D8688
add r4, r0, #0
add r0, #0xc8
mov r1, #0xf
bl FUN_02019620
bl FillWindowPixelBuffer
add r0, r4, #0
mov r1, #0
bl MOD76_021D8354
arm9/modules/77/asm/module_77.s
+20 -20
View File
@@ -242,7 +242,7 @@ _021D76D6:
_021D76FA:
ldr r0, _021D7988 ; =0x0000C054
ldr r0, [r4, r0]
bl FUN_02001204
bl ListMenu_ProcessInput
add r6, r0, #0
sub r0, r7, #1
cmp r6, r0
@@ -358,7 +358,7 @@ _021D77A2:
_021D77DE:
ldr r0, _021D7988 ; =0x0000C054
ldr r0, [r4, r0]
bl FUN_02001204
bl ListMenu_ProcessInput
add r6, r0, #0
sub r0, r7, #1
cmp r6, r0
@@ -438,7 +438,7 @@ _021D7838:
_021D7886:
ldr r0, _021D7988 ; =0x0000C054
ldr r0, [r4, r0]
bl FUN_02001204
bl ListMenu_ProcessInput
add r6, r0, #0
sub r0, r7, #1
cmp r6, r0
@@ -601,7 +601,7 @@ _021D79D0:
add r0, r4, r0
mov r1, #0xf
add r3, r2, #0
bl FUN_020196F4
bl FillWindowPixelRect
ldr r0, _021D7B7C ; =0x0000C034
ldr r2, _021D7B80 ; =0x000001D9
add r0, r4, r0
@@ -656,7 +656,7 @@ _021D7A4E:
add r0, r4, r0
mov r1, #0xf
add r3, r2, #0
bl FUN_020196F4
bl FillWindowPixelRect
ldr r0, _021D7B84 ; =0x0000C314
ldr r1, [r4, r0]
cmp r1, #0
@@ -1432,7 +1432,7 @@ MOD77_021D7FAC: ; 0x021D7FAC
add r0, r5, r0
mov r1, #0xf
add r3, r2, #0
bl FUN_020196F4
bl FillWindowPixelRect
ldr r0, _021D8224 ; =0x0000C014
ldr r2, _021D8214 ; =0x000001E2
add r0, r5, r0
@@ -1565,7 +1565,7 @@ MOD77_021D7FAC: ; 0x021D7FAC
add r0, r5, r0
mov r1, #0xf
add r3, r2, #0
bl FUN_020196F4
bl FillWindowPixelRect
ldr r0, _021D8244 ; =0x0000C060
mov r1, #0xc
ldr r0, [r5, r0]
@@ -1671,7 +1671,7 @@ _021D82B0:
mov r1, #0xf
add r2, r4, #0
add r3, r4, #0
bl FUN_020196F4
bl FillWindowPixelRect
mov r0, #1
ldr r1, [r5]
lsl r0, r0, #0xa
@@ -1767,7 +1767,7 @@ MOD77_021D8370: ; 0x021D8370
bl FUN_02019150
ldrh r0, [r6, #0x10]
ldr r1, [r5]
bl ListMenu_ctor
bl ListMenuItems_ctor
ldr r1, _021D8404 ; =0x0000C058
mov r7, #0
str r0, [r5, r1]
@@ -1782,7 +1782,7 @@ _021D8398:
ldr r1, [r5, r1]
ldr r2, [r4]
ldr r3, [r4, #4]
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
ldrh r0, [r6, #0x10]
add r7, r7, #1
add r4, #8
@@ -1812,7 +1812,7 @@ _021D83B2:
lsl r3, r3, #0x18
add r2, r1, #0
lsr r3, r3, #0x18
bl FUN_020010A8
bl ListMenuInit
ldr r1, _021D8410 ; =0x0000C054
ldr r2, _021D8414 ; =0x000001D9
str r0, [r5, r1]
@@ -1853,7 +1853,7 @@ MOD77_021D8418: ; 0x021D8418
str r0, [sp, #8]
ldr r1, [r5]
add r0, r6, #0
bl ListMenu_ctor
bl ListMenuItems_ctor
ldr r1, _021D84C8 ; =0x0000C058
mov r4, #0
str r0, [r5, r1]
@@ -1865,7 +1865,7 @@ _021D844E:
ldr r0, [r5, r0]
ldr r1, [sp, #8]
add r3, r4, #0
bl ListMenu_ItemFromMsgData
bl ListMenuItems_AppendFromMsgData
add r4, r4, #1
cmp r4, r6
blo _021D844E
@@ -1902,7 +1902,7 @@ _021D8462:
lsl r3, r3, #0x18
add r2, r1, #0
lsr r3, r3, #0x18
bl FUN_020010A8
bl ListMenuInit
ldr r1, _021D84D0 ; =0x0000C054
ldr r2, _021D84D4 ; =0x000001D9
str r0, [r5, r1]
@@ -1937,10 +1937,10 @@ MOD77_021D84D8: ; 0x021D84D8
mov r1, #0
ldr r0, [r4, r0]
add r2, r1, #0
bl FUN_02001300
bl DestroyListMenu
ldr r0, _021D850C ; =0x0000C058
ldr r0, [r4, r0]
bl ListMenu_dtor
bl ListMenuItems_dtor
pop {r4, pc}
.align 2, 0
_021D8504: .word 0x0000C024
@@ -1978,7 +1978,7 @@ MOD77_021D8510: ; 0x021D8510
add r0, r5, r0
mov r1, #0xf
add r3, r2, #0
bl FUN_020196F4
bl FillWindowPixelRect
ldr r0, _021D85CC ; =0x0000C044
ldr r2, _021D85D0 ; =0x000001D9
add r0, r5, r0
@@ -2067,7 +2067,7 @@ MOD77_021D85E0: ; 0x021D85E0
add r0, r5, r0
mov r1, #0xf
add r3, r2, #0
bl FUN_020196F4
bl FillWindowPixelRect
ldr r0, _021D8690 ; =0x0000C044
ldr r2, _021D8694 ; =0x000001D9
add r0, r5, r0
@@ -2159,7 +2159,7 @@ MOD77_021D86B4: ; 0x021D86B4
add r0, r5, r0
mov r1, #0xf
add r3, r2, #0
bl FUN_020196F4
bl FillWindowPixelRect
ldr r0, _021D8810 ; =0x0000C060
mov r1, #0xe
ldr r0, [r5, r0]
@@ -2245,7 +2245,7 @@ _021D8748:
add r0, r5, r0
mov r1, #0xf
add r3, r2, #0
bl FUN_020196F4
bl FillWindowPixelRect
ldr r0, [r5]
add r2, r7, #0
str r0, [sp]

Some files were not shown because too many files have changed in this diff Show More