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

Merge pull request #313 from red031000/master

Browse Source 
properly split data for cartridge flash files
This commit is contained in:
red031000
2021-01-14 20:00:50 +00:00
committed by GitHub
parent 3289261e5a 935da757da
commit 588288d30b
37 changed files with 304 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arm9/arm9.lsf
+1
View File
@@ -457,6 +457,7 @@ Static arm9
Object CTRDG_backup.o
Object CTRDG_flash_common.o
Object CTRDG_flash_AT29LV512.o
Object CTRDG_flash_LE26FV10N1TS-10.o
Object CTRDG_flash_LE39FW512.o
Object CTRDG_flash_MX29L010.o
Object CTRDG_flash_MX29L512.o
arm9/asm/CTRDG_backup.s
+14 -131
View File
@@ -1,6 +1,7 @@
.include "asm/macros.inc"
.include "global.inc"
.extern AT29LV512_lib
.extern CTRDGi_EraseFlash4KBAT
.extern CTRDGi_EraseFlash4KBAsyncAT
.extern CTRDGi_EraseFlashChipAT
@@ -26,6 +27,12 @@
.extern CTRDGi_WriteFlashSectorMX
.extern CTRDGi_WriteFlashSectorAsyncMX5
.extern CTRDGi_WriteFlashSectorMX5
.extern defaultFlash1M
.extern defaultFlash512
.extern LE26FV10N1TS_10
.extern LE39FW512
.extern MN63F805MNP
.extern MX29L010
.extern UNK_021D6B14
.extern UNK_021D6B30
.extern UNK_021D6B28
@@ -46,140 +53,16 @@ UNK_02103FE4: ; 0x02103FE4
.global UNK_02103FE8
UNK_02103FE8: ; 0x02103FE8
.word UNK_02104150
.word UNK_0210408C
.word UNK_0210418C
.word MX29L010
.word LE26FV10N1TS_10
.word defaultFlash1M
.global UNK_02103FF4
UNK_02103FF4: ; 0x02103FF4
.word UNK_0210410C
.word UNK_0210400C
.word UNK_021041D0
.word UNK_021040D0
.global UNK_02104004
UNK_02104004: ; 0x02104004
.byte 0x0A, 0x00, 0x28, 0x00, 0x00, 0x00, 0x28, 0x00
.global UNK_0210400C
UNK_0210400C: ; 0x0210400C
.word CTRDGi_WriteFlash4KBAT
.word CTRDGi_EraseFlashChipAT
.word CTRDGi_EraseFlash4KBAT
.word CTRDGi_WriteFlash4KBAsyncAT
.word CTRDGi_EraseFlashChipAsyncAT
.word CTRDGi_EraseFlash4KBAsyncAT
.word CTRDGi_PollingSR512kCOMMON
.word UNK_02104004
.byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x0C, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x3D, 0x00
.global UNK_02104048
UNK_02104048: ; 0x02104048
.word CTRDGi_WriteFlashSectorAT
.word CTRDGi_EraseFlashChipAT
.word CTRDGi_EraseFlashSectorAT
.word CTRDGi_WriteFlashSectorAsyncAT
.word CTRDGi_EraseFlashChipAsyncAT
.word CTRDGi_EraseFlashSectorAsyncAT
.word CTRDGi_PollingSR512kCOMMON
.word UNK_02104004
.byte 0x00, 0x00, 0x01, 0x00, 0x80, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x3D, 0x00
.global UNK_02104084
UNK_02104084: ; 0x02104084
.byte 0x0A, 0x00, 0x0A, 0x00, 0xD0, 0x07, 0x88, 0x13
.global UNK_0210408C
UNK_0210408C: ; 0x0210408C
.word CTRDGi_WriteFlashSectorMX
.word CTRDGi_EraseFlashChipMX
.word CTRDGi_EraseFlashSectorMX
.word CTRDGi_WriteFlashSectorAsyncMX
.word CTRDGi_EraseFlashChipAsyncMX
.word CTRDGi_EraseFlashSectorAsyncMX
.word CTRDGi_PollingSR1MCOMMON
.word UNK_02104084
.byte 0x00, 0x00, 0x02, 0x00, 0x00, 0x10, 0x00, 0x00, 0x0C, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x62, 0x00, 0x13, 0x00
.global UNK_021040C8
UNK_021040C8: ; 0x021040C8
.byte 0x0A, 0x00, 0x0A, 0x00, 0x28, 0x00, 0xC8, 0x00
.global UNK_021040D0
UNK_021040D0: ; 0x021040D0
.word CTRDGi_WriteFlashSectorLE
.word CTRDGi_EraseFlashChipLE
.word CTRDGi_EraseFlashSectorLE
.word CTRDGi_WriteFlashSectorAsyncLE
.word CTRDGi_EraseFlashChipAsyncLE
.word CTRDGi_EraseFlashSectorAsyncLE
.word CTRDGi_PollingSR512kCOMMON
.word UNK_021040C8
.byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x0C, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global UNK_0210410C
UNK_0210410C: ; 0x0210410C
.word CTRDGi_WriteFlashSectorLE
.word CTRDGi_EraseFlashChipLE
.word CTRDGi_EraseFlashSectorLE
.word CTRDGi_WriteFlashSectorAsyncLE
.word CTRDGi_EraseFlashChipAsyncLE
.word CTRDGi_EraseFlashSectorAsyncLE
.word CTRDGi_PollingSR512kCOMMON
.word UNK_021040C8
.byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x0C, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xBF, 0x00, 0xD4, 0x00
.global UNK_02104148
UNK_02104148: ; 0x02104148
.byte 0x0A, 0x00, 0x0A, 0x00, 0xD0, 0x07, 0xD0, 0x07
.global UNK_02104150
UNK_02104150: ; 0x02104150
.word CTRDGi_WriteFlashSectorMX
.word CTRDGi_EraseFlashChipMX
.word CTRDGi_EraseFlashSectorMX
.word CTRDGi_WriteFlashSectorAsyncMX
.word CTRDGi_EraseFlashChipAsyncMX
.word CTRDGi_EraseFlashSectorAsyncMX
.word CTRDGi_PollingSR1MCOMMON
.word UNK_02104148
.byte 0x00, 0x00, 0x02, 0x00, 0x00, 0x10, 0x00, 0x00, 0x0C, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xC2, 0x00, 0x09, 0x00
.global UNK_0210418C
UNK_0210418C: ; 0x0210418C
.word CTRDGi_WriteFlashSectorMX
.word CTRDGi_EraseFlashChipMX
.word CTRDGi_EraseFlashSectorMX
.word CTRDGi_WriteFlashSectorAsyncMX
.word CTRDGi_EraseFlashChipAsyncMX
.word CTRDGi_EraseFlashSectorAsyncMX
.word CTRDGi_PollingSR1MCOMMON
.word UNK_02104148
.byte 0x00, 0x00, 0x02, 0x00, 0x00, 0x10, 0x00, 0x00, 0x0C, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global UNK_021041C8
UNK_021041C8: ; 0x021041C8
.byte 0x0A, 0x00, 0x0A, 0x00, 0xF4, 0x01, 0xF4, 0x01
.global UNK_021041D0
UNK_021041D0: ; 0x021041D0
.word CTRDGi_WriteFlashSectorMX5
.word CTRDGi_EraseFlashChipLE
.word CTRDGi_EraseFlashSectorLE
.word CTRDGi_WriteFlashSectorAsyncMX5
.word CTRDGi_EraseFlashChipAsyncLE
.word CTRDGi_EraseFlashSectorAsyncLE
.word CTRDGi_PollingSR512kCOMMON
.word UNK_021041C8
.byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x0C, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x32, 0x00, 0x1B, 0x00
.word LE39FW512
.word AT29LV512_lib
.word MN63F805MNP
.word defaultFlash512
.section .bss
arm9/asm/CTRDG_flash_AT29LV512.s
+42 -11
View File
@@ -1,14 +1,45 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_0210400C
.extern CTRDGi_PollingSR512kCOMMON
.extern UNK_021D6B20
.extern UNK_021D6B24
.extern UNK_021D6B0C
.extern UNK_021D6B38
.extern UNK_02104048
.extern UNK_021D6B08
.section .rodata
.global atMaxTime
atMaxTime: ; 0x02104004
.short 10, 40, 0, 40
.global AT29LV512_lib
AT29LV512_lib: ; 0x0210400C
.word CTRDGi_WriteFlash4KBAT
.word CTRDGi_EraseFlashChipAT
.word CTRDGi_EraseFlash4KBAT
.word CTRDGi_WriteFlash4KBAsyncAT
.word CTRDGi_EraseFlashChipAsyncAT
.word CTRDGi_EraseFlash4KBAsyncAT
.word CTRDGi_PollingSR512kCOMMON
.word atMaxTime
.byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x0C, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x3D, 0x00
.global AT29LV512_org
AT29LV512_org: ; 0x02104048
.word CTRDGi_WriteFlashSectorAT
.word CTRDGi_EraseFlashChipAT
.word CTRDGi_EraseFlashSectorAT
.word CTRDGi_WriteFlashSectorAsyncAT
.word CTRDGi_EraseFlashChipAsyncAT
.word CTRDGi_EraseFlashSectorAsyncAT
.word CTRDGi_PollingSR512kCOMMON
.word atMaxTime
.byte 0x00, 0x00, 0x01, 0x00, 0x80, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x3D, 0x00
.text
arm_func_start CTRDGi_WriteFlashSectorAsyncAT
@@ -170,7 +201,7 @@ CTRDGi_WriteFlash4KBCoreAT: ; 0x020DC780
ldrhs r0, _020DC85C ; =0x000080FF
ldmcsia sp!, {r4-r9,lr}
bxcs lr
ldr r1, _020DC860 ; =UNK_0210400C
ldr r1, _020DC860 ; =AT29LV512_lib
mov r0, r0, lsl #0x15
ldr r1, [r1, #0x24]
ldr r4, _020DC864 ; =UNK_021D6B08
@@ -179,7 +210,7 @@ CTRDGi_WriteFlash4KBCoreAT: ; 0x020DC780
ldrh r0, [r4, #0x0]
cmp r0, #0x0
beq _020DC84C
ldr r0, _020DC868 ; =UNK_02104048
ldr r0, _020DC868 ; =AT29LV512_org
ldr r6, [r0, #0x24]
mov r5, #0x2
_020DC7F4:
@@ -214,9 +245,9 @@ _020DC84C:
bx lr
.balign 4
_020DC85C: .word 0x000080FF
_020DC860: .word UNK_0210400C
_020DC860: .word AT29LV512_lib
_020DC864: .word UNK_021D6B08
_020DC868: .word UNK_02104048
_020DC868: .word AT29LV512_org
arm_func_start CTRDGi_WriteFlashSectorCoreAT
CTRDGi_WriteFlashSectorCoreAT: ; 0x020DC86C
@@ -240,7 +271,7 @@ CTRDGi_WriteFlashSectorCoreAT: ; 0x020DC86C
ldr r1, [r1, #0x0]
ldrh r2, [r5, #0x0]
ldr r3, [r1, #0x10]
ldr r1, _020DC990 ; =UNK_02104048
ldr r1, _020DC990 ; =AT29LV512_org
bic r2, r2, #0x3
orr r2, r2, r3
strh r2, [r5, #0x0]
@@ -296,7 +327,7 @@ _020DC92C:
_020DC984: .word UNK_021D6B0C
_020DC988: .word 0x04000204
_020DC98C: .word UNK_021D6B20
_020DC990: .word UNK_02104048
_020DC990: .word AT29LV512_org
_020DC994: .word 0x04000208
_020DC998: .word 0x0A005555
_020DC99C: .word 0x0A002AAA
@@ -366,7 +397,7 @@ CTRDGi_EraseFlashSectorCoreAT: ; 0x020DCA58
ldmia r5!, {r0-r3}
stmia r4!, {r0-r3}
ldr r0, [r5, #0x0]
ldr r1, _020DCB80 ; =UNK_02104048
ldr r1, _020DCB80 ; =AT29LV512_org
str r0, [r4, #0x0]
ldr r0, _020DCB84 ; =UNK_021D6B0C
ldrh r2, [sp, #0x20]
@@ -396,7 +427,7 @@ CTRDGi_EraseFlashSectorCoreAT: ; 0x020DCA58
strb r3, [r1, #0x0]
mov r3, #0xa0
strb r3, [r4, #0x0]
ldr r1, _020DCB80 ; =UNK_02104048
ldr r1, _020DCB80 ; =AT29LV512_org
and r4, r0, #0x3
ldr r1, [r1, #0x24]
cmp r1, #0x0
@@ -434,7 +465,7 @@ _020DCB18:
ldmia sp!, {r4-r5,lr}
bx lr
.balign 4
_020DCB80: .word UNK_02104048
_020DCB80: .word AT29LV512_org
_020DCB84: .word UNK_021D6B0C
_020DCB88: .word 0x04000204
_020DCB8C: .word UNK_021D6B20
arm9/asm/CTRDG_flash_LE26FV10N1TS-10.s
+29
View File
@@ -0,0 +1,29 @@
.include "asm/macros.inc"
.include "global.inc"
.extern CTRDGi_EraseFlashChipAsyncMX
.extern CTRDGi_EraseFlashChipMX
.extern CTRDGi_EraseFlashSectorAsyncMX
.extern CTRDGi_EraseFlashSectorMX
.extern CTRDGi_PollingSR1MCOMMON
.extern CTRDGi_WriteFlashSectorAsyncMX
.extern CTRDGi_WriteFlashSectorMX
.section .rodata
.global LeMaxTime
LeMaxTime: ; 0x02104084
.short 10, 10, 2000, 5000
.global LE26FV10N1TS_10
LE26FV10N1TS_10: ; 0x0210408C
.word CTRDGi_WriteFlashSectorMX
.word CTRDGi_EraseFlashChipMX
.word CTRDGi_EraseFlashSectorMX
.word CTRDGi_WriteFlashSectorAsyncMX
.word CTRDGi_EraseFlashChipAsyncMX
.word CTRDGi_EraseFlashSectorAsyncMX
.word CTRDGi_PollingSR1MCOMMON
.word LeMaxTime
.byte 0x00, 0x00, 0x02, 0x00, 0x00, 0x10, 0x00, 0x00, 0x0C, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x62, 0x00, 0x13, 0x00
arm9/asm/CTRDG_flash_LE39FW512.s
+33
View File
@@ -1,12 +1,45 @@
.include "asm/macros.inc"
.include "global.inc"
.extern CTRDGi_PollingSR512kCOMMON
.extern UNK_021D6B20
.extern UNK_021D6B24
.extern UNK_021D6B0C
.extern UNK_021D6B38
.extern UNK_021D6B08
.section .rodata
.global leMaxTime
leMaxTime: ; 0x021040C8
.byte 0x0A, 0x00, 0x0A, 0x00, 0x28, 0x00, 0xC8, 0x00
.global defaultFlash512
defaultFlash512: ; 0x021040D0
.word CTRDGi_WriteFlashSectorLE
.word CTRDGi_EraseFlashChipLE
.word CTRDGi_EraseFlashSectorLE
.word CTRDGi_WriteFlashSectorAsyncLE
.word CTRDGi_EraseFlashChipAsyncLE
.word CTRDGi_EraseFlashSectorAsyncLE
.word CTRDGi_PollingSR512kCOMMON
.word leMaxTime
.byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x0C, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global LE39FW512
LE39FW512: ; 0x0210410C
.word CTRDGi_WriteFlashSectorLE
.word CTRDGi_EraseFlashChipLE
.word CTRDGi_EraseFlashSectorLE
.word CTRDGi_WriteFlashSectorAsyncLE
.word CTRDGi_EraseFlashChipAsyncLE
.word CTRDGi_EraseFlashSectorAsyncLE
.word CTRDGi_PollingSR512kCOMMON
.word leMaxTime
.byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x0C, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xBF, 0x00, 0xD4, 0x00
.text
arm_func_start CTRDGi_WriteFlashSectorAsyncLE
arm9/asm/CTRDG_flash_MX29L010.s
+33
View File
@@ -1,12 +1,45 @@
.include "asm/macros.inc"
.include "global.inc"
.extern CTRDGi_PollingSR1MCOMMON
.extern UNK_021D6B20
.extern UNK_021D6B24
.extern UNK_021D6B0C
.extern UNK_021D6B38
.extern UNK_021D6B08
.section .rodata
.global MxMaxTime
MxMaxTime: ; 0x02104148
.short 10, 10, 2000, 2000
.global MX29L010
MX29L010: ; 0x02104150
.word CTRDGi_WriteFlashSectorMX
.word CTRDGi_EraseFlashChipMX
.word CTRDGi_EraseFlashSectorMX
.word CTRDGi_WriteFlashSectorAsyncMX
.word CTRDGi_EraseFlashChipAsyncMX
.word CTRDGi_EraseFlashSectorAsyncMX
.word CTRDGi_PollingSR1MCOMMON
.word MxMaxTime
.byte 0x00, 0x00, 0x02, 0x00, 0x00, 0x10, 0x00, 0x00, 0x0C, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xC2, 0x00, 0x09, 0x00
.global defaultFlash1M
defaultFlash1M: ; 0x0210418C
.word CTRDGi_WriteFlashSectorMX
.word CTRDGi_EraseFlashChipMX
.word CTRDGi_EraseFlashSectorMX
.word CTRDGi_WriteFlashSectorAsyncMX
.word CTRDGi_EraseFlashChipAsyncMX
.word CTRDGi_EraseFlashSectorAsyncMX
.word CTRDGi_PollingSR1MCOMMON
.word MxMaxTime
.byte 0x00, 0x00, 0x02, 0x00, 0x00, 0x10, 0x00, 0x00, 0x0C, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.text
arm_func_start CTRDGi_WriteFlashSectorAsyncMX
arm9/asm/CTRDG_flash_MX29L512.s
+23
View File
@@ -1,10 +1,33 @@
.include "asm/macros.inc"
.include "global.inc"
.extern CTRDGi_EraseFlashChipAsyncLE
.extern CTRDGi_EraseFlashChipLE
.extern CTRDGi_EraseFlashSectorAsyncLE
.extern CTRDGi_PollingSR512kCOMMON
.extern UNK_021D6B08
.extern UNK_021D6B20
.extern UNK_021D6B0C
.section .rodata
.global PaMaxTime
PaMaxTime: ; 0x021041C8
.byte 0x0A, 0x00, 0x0A, 0x00, 0xF4, 0x01, 0xF4, 0x01
.global MN63F805MNP
MN63F805MNP: ; 0x021041D0
.word CTRDGi_WriteFlashSectorMX5
.word CTRDGi_EraseFlashChipLE
.word CTRDGi_EraseFlashSectorLE
.word CTRDGi_WriteFlashSectorAsyncMX5
.word CTRDGi_EraseFlashChipAsyncLE
.word CTRDGi_EraseFlashSectorAsyncLE
.word CTRDGi_PollingSR512kCOMMON
.word PaMaxTime
.byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x0C, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x32, 0x00, 0x1B, 0x00
.text
arm_func_start CTRDGi_WriteFlashSectorAsyncMX5
arm9/asm/scrcmd.s
+1 -1
View File
@@ -2248,7 +2248,7 @@ FUN_0203AAA0: ; 0x0203AAA0
ldr r1, _0203AAF8 ; =UNK_020F34E0
ldr r2, _0203AAF4 ; =0x000003D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r6, #0x0]
ldr r1, _0203AAFC ; =FUN_0203AB00
add r0, r5, #0x0
arm9/asm/scrcmd_7.s
+3 -3
View File
@@ -366,7 +366,7 @@ FUN_02041970: ; 0x02041970
add r5, r0, #0x0
ldrh r0, [r4, #0x0]
bl FUN_020395F4
bl FUN_0203962C
bl Field_TrainerIsDoubleBattle
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bne _020419D2
@@ -430,7 +430,7 @@ FUN_020419F8: ; 0x020419F8
add r5, r0, #0x0
ldrh r0, [r4, #0x0]
bl FUN_020395F4
bl FUN_0203962C
bl Field_TrainerIsDoubleBattle
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bne _02041A5A
@@ -478,7 +478,7 @@ FUN_02041A80: ; 0x02041A80
add r5, r0, #0x0
ldrh r0, [r4, #0x0]
bl FUN_020395F4
bl FUN_0203962C
bl Field_TrainerIsDoubleBattle
strh r0, [r5, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
arm9/asm/unk_02001B80.s
+7 -7
View File
@@ -755,8 +755,8 @@ FUN_020020B0: ; 0x020020B0
pop {r3-r7, pc}
.balign 4
thumb_func_start FUN_020020EC
FUN_020020EC: ; 0x020020EC
thumb_func_start CreateYesNoMenu
CreateYesNoMenu: ; 0x020020EC
push {r3-r7, lr}
sub sp, #0x20
ldr r5, [sp, #0x3c]
@@ -777,13 +777,13 @@ FUN_020020EC: ; 0x020020EC
mov r2, #0x29
mov r3, #0x0
add r6, r0, #0x0
bl ListMenu_ItemFromMsgData
bl ListMenu_ItemFromMsgData ; YES
mov r3, #0x2a
add r2, r3, #0x0
add r0, r6, #0x0
add r1, r4, #0x0
sub r3, #0x2c
bl ListMenu_ItemFromMsgData
bl ListMenu_ItemFromMsgData ; NO
add r0, r4, #0x0
bl DestroyMsgData
add r0, r5, #0x0
@@ -834,15 +834,15 @@ FUN_020020EC: ; 0x020020EC
nop
_02002194: .word 0x00000141
thumb_func_start FUN_02002198
FUN_02002198: ; 0x02002198
thumb_func_start Std_CreateYesNoMenu
Std_CreateYesNoMenu: ; 0x02002198
push {r4, lr}
sub sp, #0x8
mov r4, #0x0
str r4, [sp, #0x0]
ldr r4, [sp, #0x10]
str r4, [sp, #0x4]
bl FUN_020020EC
bl CreateYesNoMenu
add sp, #0x8
pop {r4, pc}
arm9/asm/unk_02038C78.s
+18 -18
View File
@@ -879,7 +879,7 @@ FUN_02038C78: ; 0x02038C78
add r5, r0, #0x0
add r6, r1, #0x0
add r7, r2, #0x0
bl FUN_02038E20
bl CreateFieldContext
add r4, r0, #0x0
mov r0, #0x0
str r0, [sp, #0x0]
@@ -932,7 +932,7 @@ FUN_02038CD8: ; 0x02038CD8
add r5, r3, #0x0
bl FUN_02046528
str r0, [sp, #0x8]
bl FUN_02038E20
bl CreateFieldContext
add r4, r0, #0x0
ldr r0, [sp, #0x8]
ldr r3, [sp, #0x4]
@@ -958,7 +958,7 @@ FUN_02038D10: ; 0x02038D10
add r7, r2, #0x0
bl FUN_02046528
str r0, [sp, #0x4]
bl FUN_02038E20
bl CreateFieldContext
add r4, r0, #0x0
mov r0, #0x0
str r0, [sp, #0x0]
@@ -1031,7 +1031,7 @@ _02038DA8:
cmp r0, #0x0
bne _02038DD2
add r0, r6, #0x0
bl FUN_02038E48
bl DeleteScriptContext
ldrb r0, [r4, #0x9]
cmp r0, #0x0
bne _02038DC8
@@ -1081,8 +1081,8 @@ _02038E1A:
add sp, #0x8
pop {r3-r7, pc}
thumb_func_start FUN_02038E20
FUN_02038E20: ; 0x02038E20
thumb_func_start CreateFieldContext
CreateFieldContext: ; 0x02038E20
push {r4, lr}
mov r0, #0xb
mov r1, #0xdc
@@ -1102,8 +1102,8 @@ _02038E32:
.balign 4
_02038E44: .word 0x0003643F
thumb_func_start FUN_02038E48
FUN_02038E48: ; 0x02038E48
thumb_func_start DeleteScriptContext
DeleteScriptContext: ; 0x02038E48
push {r4, lr}
add r4, r0, #0x0
ldr r0, [r4, #0x78]
@@ -2139,8 +2139,8 @@ _02039622:
nop
_02039628: .word 0x00001388
thumb_func_start FUN_0203962C
FUN_0203962C: ; 0x0203962C
thumb_func_start Field_TrainerIsDoubleBattle
Field_TrainerIsDoubleBattle: ; 0x0203962C
push {r3, lr}
mov r1, #0x9
bl TrainerData_GetAttr
@@ -2443,17 +2443,17 @@ _02039856:
nop
_02039870: .word 0x0000FFFF
thumb_func_start FUN_02039874
FUN_02039874: ; 0x02039874
ldr r3, _0203987C ; =FUN_02039880
thumb_func_start RunPokemonCenterScriptsInNewContext
RunPokemonCenterScriptsInNewContext: ; 0x02039874
ldr r3, _0203987C ; =RunScriptInNewContext
mov r1, #0x96
lsl r1, r1, #0x6
bx r3
.balign 4
_0203987C: .word FUN_02039880
_0203987C: .word RunScriptInNewContext
thumb_func_start FUN_02039880
FUN_02039880: ; 0x02039880
thumb_func_start RunScriptInNewContext
RunScriptInNewContext: ; 0x02039880
push {r4, lr}
bl CreateScriptContext
add r4, r0, #0x0
@@ -2463,7 +2463,7 @@ _02039888:
cmp r0, #0x1
beq _02039888
add r0, r4, #0x0
bl FUN_02038E48
bl DeleteScriptContext
pop {r4, pc}
.balign 4
@@ -2503,7 +2503,7 @@ _020398CE:
b _020398E2
_020398DC:
add r0, r5, #0x0
bl FUN_02039880
bl RunScriptInNewContext
_020398E2:
mov r0, #0x1
pop {r3-r5, pc}
arm9/asm/unk_02048904.s
+2 -2
View File
@@ -599,7 +599,7 @@ FUN_02048D90: ; 0x02048D90
add r4, r0, #0x0
mov r1, #0x0
str r1, [r4, #0x6c]
bl FUN_02039874
bl RunPokemonCenterScriptsInNewContext
ldr r1, _02048DA8 ; =FUN_02048D34
add r0, r4, #0x0
mov r2, #0x0
@@ -2040,7 +2040,7 @@ _020498DC:
ldr r0, [r5, #0x8]
ldr r1, _02049ABC ; =UNK_020F46D8
ldr r2, _02049AB8 ; =0x000003D9
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #0x3c]
mov r0, #0x2
str r0, [r4, #0x0]
arm9/asm/unk_02054590.s
+2 -2
View File
@@ -131,8 +131,8 @@ FUN_02054658: ; 0x02054658
add sp, #0xc
pop {r3-r6, pc}
thumb_func_start FUN_02054690
FUN_02054690: ; 0x02054690
thumb_func_start DrawFieldMessage
DrawFieldMessage: ; 0x02054690
push {r4-r7, lr}
sub sp, #0xc
add r5, r0, #0x0
arm9/asm/unk_0205C598.s
+1 -1
View File
@@ -241,7 +241,7 @@ FUN_0205C73C: ; 0x0205C73C
str r0, [r5, #0xc]
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bl FUN_0203962C
bl Field_TrainerIsDoubleBattle
str r0, [r5, #0x10]
str r4, [r5, #0x14]
pop {r3-r5, pc}
arm9/asm/unk_020625EC.s
+1 -1
View File
@@ -430,7 +430,7 @@ FUN_020628BC: ; 0x020628BC
ldr r0, [r0, #0x0]
ldr r2, _020628E4 ; =0x000003D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
add r4, #0xc8
str r0, [r4, #0x0]
add sp, #0x4
arm9/asm/unk_020653EC.s
+1 -1
View File
@@ -2192,7 +2192,7 @@ FUN_02066520: ; 0x02066520
ldr r0, [r4, r0]
ldr r2, _02066548 ; =0x000003D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
mov r1, #0x5a
lsl r1, r1, #0x2
str r0, [r4, r1]
arm9/asm/unk_0206C700.s
+2 -2
View File
@@ -1314,7 +1314,7 @@ _0206D1F0:
ldr r0, [r4, #0x0]
mov r2, #0x1
mov r3, #0x8
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #0x40]
add r0, r4, #0x0
add r0, #0x64
@@ -1537,7 +1537,7 @@ _0206D3CC:
ldr r0, [r4, #0x0]
mov r2, #0x1
mov r3, #0x8
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #0x40]
add r0, r4, #0x0
add r0, #0x64
arm9/asm/unk_02072548.s
+1 -1
View File
@@ -1741,7 +1741,7 @@ FUN_020732CC: ; 0x020732CC
ldr r1, _020732EC ; =UNK_020F96EC
mov r2, #0x1
mov r3, #0xe
bl FUN_02002198
bl Std_CreateYesNoMenu
ldr r1, _020732F0 ; =0x000006FC
str r0, [r4, r1]
add sp, #0x4
arm9/asm/unk_02089498.s
+2 -2
View File
@@ -415,7 +415,7 @@ _020897B8:
ldr r0, [r4, #0x14]
ldr r2, _02089894 ; =0x000001D9
mov r3, #0x3
bl FUN_020020EC
bl CreateYesNoMenu
str r0, [r4, #0x2c]
mov r0, #0x1
str r0, [r4, #0x4]
@@ -453,7 +453,7 @@ _02089802:
ldr r0, [r4, #0x14]
ldr r2, _02089894 ; =0x000001D9
mov r3, #0x3
bl FUN_020020EC
bl CreateYesNoMenu
str r0, [r4, #0x2c]
mov r0, #0x3
str r0, [r4, #0x4]
arm9/global.inc
+5 -5
View File
@@ -212,8 +212,8 @@
.extern FUN_02001DDC
.extern FUN_02001E5C
.extern FUN_02001E60
.extern FUN_020020EC
.extern FUN_02002198
.extern CreateYesNoMenu
.extern Std_CreateYesNoMenu
.extern FUN_020021AC
.extern FUN_020021CC
.extern FUN_020021EC
@@ -2691,13 +2691,13 @@
.extern FUN_020395BC
.extern FUN_020395F4
.extern FUN_02039618
.extern FUN_0203962C
.extern Field_TrainerIsDoubleBattle
.extern TrainerFlagCheck
.extern TrainerFlagSet
.extern TrainerFlagClear
.extern FUN_02039694
.extern FUN_02039754
.extern FUN_02039874
.extern RunPokemonCenterScriptsInNewContext
.extern FUN_0203989C
.extern ScrCmd_nop
.extern ScrCmd_nop2
@@ -3804,7 +3804,7 @@
.extern FUN_02054608
.extern FUN_0205464C
.extern FUN_02054658
.extern FUN_02054690
.extern DrawFieldMessage
.extern FUN_020546C8
.extern FUN_020546E0
.extern FUN_02054744
arm9/modules/05/asm/mod05_021E1374.s
+1 -1
View File
@@ -915,7 +915,7 @@ MOD05_021E1A30: ; 0x021E1A30
str r0, [sp, #0xc]
bl FUN_020395F4
str r0, [sp, #8]
bl FUN_0203962C
bl Field_TrainerIsDoubleBattle
cmp r0, #0
bne _021E1A60
add sp, #0x10
arm9/modules/05/asm/mod05_021E2B80.s
+30 -30
View File
@@ -42,7 +42,7 @@ MOD05_021E2BB8: ; 0x021E2BB8
push {r4, lr}
add r4, r0, #0
add r0, r1, #0
bl MOD05_021E2D00
bl MOD05_ScriptContext_GetTextFrameDelay
strb r0, [r4]
mov r0, #0
strb r0, [r4, #1]
@@ -68,15 +68,15 @@ MOD05_021E2BD0: ; 0x021E2BD0
add r0, #0x80
ldr r0, [r0]
add r1, sp, #8
bl MOD05_021E2D9C
bl MOD05_CreateMessageBox
add r0, sp, #8
add r1, r6, #0
add r2, r7, #0
bl MOD05_021E2DD4
bl MOD05_ReadAndExpandMsgDataViaBuffer
cmp r4, #0
bne _021E2C10
add r0, r5, #0
bl MOD05_021E2D00
bl MOD05_ScriptContext_GetTextFrameDelay
add r2, r0, #0
mov r0, #0
mov r1, #1
@@ -89,7 +89,7 @@ _021E2C16:
str r0, [sp]
ldr r3, [sp, #4]
add r0, sp, #8
bl MOD05_021E2E40
bl MOD05_DrawFieldMessage
add sp, #0x20
pop {r3, r4, r5, r6, r7, pc}
@@ -107,14 +107,14 @@ MOD05_ShowMessageInField: ; 0x021E2C24
add r5, #0x80
ldr r0, [r5]
add r1, sp, #0
bl MOD05_021E2D9C
bl MOD05_CreateMessageBox
add r0, sp, #0
add r1, r4, #0
add r2, r6, #0
bl MOD05_021E2DD4
bl MOD05_ReadAndExpandMsgDataViaBuffer
add r0, sp, #0
mov r1, #1
bl MOD05_021E2E68
bl MOD05_AddTextPrinterParameterized
add sp, #0x18
pop {r4, r5, r6, pc}
@@ -134,7 +134,7 @@ MOD05_021E2C58: ; 0x021E2C58
add r0, #0x80
ldr r0, [r0]
add r1, sp, #4
bl MOD05_021E2D9C
bl MOD05_CreateMessageBox
add r0, sp, #0x20
ldrh r0, [r0, #0x10]
add r1, r4, #0
@@ -142,13 +142,13 @@ MOD05_021E2C58: ; 0x021E2C58
str r0, [sp]
add r0, sp, #4
add r3, r7, #0
bl MOD05_021E2DF0
bl MOD05_ExpandEasyChatMessage
add r0, sp, #0x20
ldrb r0, [r0, #0x14]
cmp r0, #0xff
beq _021E2CB0
add r0, r5, #0
bl MOD05_021E2D00
bl MOD05_ScriptContext_GetTextFrameDelay
add r2, r0, #0
mov r0, #0
str r0, [sp]
@@ -156,13 +156,13 @@ MOD05_021E2C58: ; 0x021E2C58
ldrb r3, [r3, #0x14]
add r0, sp, #4
mov r1, #1
bl MOD05_021E2E40
bl MOD05_DrawFieldMessage
add sp, #0x1c
pop {r4, r5, r6, r7, pc}
_021E2CB0:
add r0, sp, #4
mov r1, #1
bl MOD05_021E2E68
bl MOD05_AddTextPrinterParameterized
add sp, #0x1c
pop {r4, r5, r6, r7, pc}
@@ -181,25 +181,25 @@ MOD05_021E2CBC: ; 0x021E2CBC
add r0, #0x80
ldr r0, [r0]
add r1, sp, #4
bl MOD05_021E2D9C
bl MOD05_CreateMessageBox
ldr r1, [r5, #0x78]
add r0, sp, #4
add r2, r4, #0
bl MOD05_021E2DD4
bl MOD05_ReadAndExpandMsgDataViaBuffer
add r0, r5, #0
bl MOD05_021E2D00
bl MOD05_ScriptContext_GetTextFrameDelay
add r2, r0, #0
mov r0, #0
str r0, [sp]
add r0, sp, #4
mov r1, #1
add r3, r6, #0
bl MOD05_021E2E40
bl MOD05_DrawFieldMessage
add sp, #0x1c
pop {r3, r4, r5, r6, pc}
thumb_func_start MOD05_021E2D00
MOD05_021E2D00: ; 0x021E2D00
thumb_func_start MOD05_ScriptContext_GetTextFrameDelay
MOD05_ScriptContext_GetTextFrameDelay: ; 0x021E2D00
push {r3, lr}
add r0, #0x80
ldr r0, [r0]
@@ -272,8 +272,8 @@ MOD05_021E2D5C: ; 0x021E2D5C
str r0, [r4, #0x14]
pop {r4, r5, r6, pc}
thumb_func_start MOD05_021E2D9C
MOD05_021E2D9C: ; 0x021E2D9C
thumb_func_start MOD05_CreateMessageBox
MOD05_CreateMessageBox: ; 0x021E2D9C
push {r3, r4, r5, lr}
add r4, r1, #0
add r5, r0, #0
@@ -300,8 +300,8 @@ _021E2DC8:
pop {r3, r4, r5, pc}
.balign 4, 0
thumb_func_start MOD05_021E2DD4
MOD05_021E2DD4: ; 0x021E2DD4
thumb_func_start MOD05_ReadAndExpandMsgDataViaBuffer
MOD05_ReadAndExpandMsgDataViaBuffer: ; 0x021E2DD4
push {r4, lr}
add r4, r0, #0
add r0, r1, #0
@@ -315,8 +315,8 @@ MOD05_021E2DD4: ; 0x021E2DD4
pop {r4, pc}
.balign 4, 0
thumb_func_start MOD05_021E2DF0
MOD05_021E2DF0: ; 0x021E2DF0
thumb_func_start MOD05_ExpandEasyChatMessage
MOD05_ExpandEasyChatMessage: ; 0x021E2DF0
push {r3, r4, r5, r6, r7, lr}
sub sp, #8
add r5, r0, #0
@@ -351,8 +351,8 @@ MOD05_021E2DF0: ; 0x021E2DF0
pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0
thumb_func_start MOD05_021E2E40
MOD05_021E2E40: ; 0x021E2E40
thumb_func_start MOD05_DrawFieldMessage
MOD05_DrawFieldMessage: ; 0x021E2E40
push {r4, r5, r6, lr}
sub sp, #8
add r4, r0, #0
@@ -367,14 +367,14 @@ MOD05_021E2E40: ; 0x021E2E40
ldr r1, [r4]
add r2, r6, #0
add r3, r5, #0
bl FUN_02054690
bl DrawFieldMessage
ldr r1, [r4, #0x14]
strb r0, [r1]
add sp, #8
pop {r4, r5, r6, pc}
thumb_func_start MOD05_021E2E68
MOD05_021E2E68: ; 0x021E2E68
thumb_func_start MOD05_AddTextPrinterParameterized
MOD05_AddTextPrinterParameterized: ; 0x021E2E68
push {r3, r4, lr}
sub sp, #0xc
mov r3, #0
arm9/modules/05/asm/module_05.s
+4 -4
View File
@@ -14988,7 +14988,7 @@ MOD05_021EFD40: ; 0x021EFD40
ldr r0, [r0, #8]
ldr r2, _021EFD78 ; =0x000003D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #0x44]
mov r0, #3
str r0, [r4, #0x48]
@@ -15079,7 +15079,7 @@ MOD05_021EFDF0: ; 0x021EFDF0
ldr r0, [r0, #8]
ldr r2, _021EFE28 ; =0x000003D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #0x44]
mov r0, #5
str r0, [r4, #0x48]
@@ -15145,7 +15145,7 @@ MOD05_021EFE70: ; 0x021EFE70
ldr r0, [r0, #8]
ldr r2, _021EFEA8 ; =0x000003D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #0x44]
mov r0, #7
str r0, [r4, #0x48]
@@ -15392,7 +15392,7 @@ MOD05_021F0080: ; 0x021F0080
ldr r0, [r0, #8]
ldr r2, _021F00B8 ; =0x000003D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #0x44]
mov r0, #0xb
str r0, [r4, #0x48]
arm9/modules/06/asm/module_06.s
+7 -7
View File
@@ -10293,7 +10293,7 @@ _0223E5FE:
ldr r0, [r4]
ldr r1, _0223E618 ; =0x0224F348
mov r2, #0x1f
bl FUN_02002198
bl Std_CreateYesNoMenu
add r4, #0x80
str r0, [r4]
mov r0, #8
@@ -12384,7 +12384,7 @@ MOD06_0223F720: ; 0x0223F720
ldr r0, [r0, #0x68]
mov r3, #0xb
ldr r0, [r0, #8]
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #0x60]
ldr r0, _0223F76C ; =MOD06_0223F770
bl MOD06_0223F8BC
@@ -13438,7 +13438,7 @@ MOD06_0223FFD4: ; 0x0223FFD4
ldr r0, [r0, #0x68]
mov r3, #0xb
ldr r0, [r0, #8]
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #0x60]
ldr r0, _0224002C ; =MOD06_02240030
bl MOD06_0223F8BC
@@ -13698,7 +13698,7 @@ MOD06_02240204: ; 0x02240204
ldr r0, [r0, #0x68]
mov r3, #0xb
ldr r0, [r0, #8]
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #0x60]
ldr r0, _02240254 ; =MOD06_02240258
bl MOD06_0223F8BC
@@ -13821,7 +13821,7 @@ MOD06_02240310: ; 0x02240310
ldr r0, [r0, #0x68]
mov r3, #0xb
ldr r0, [r0, #8]
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #0x60]
ldr r0, _02240360 ; =MOD06_0223FD08
bl MOD06_0223F8BC
@@ -19372,7 +19372,7 @@ _02242FA6:
ldr r0, [r0, #8]
ldr r2, _02242FE8 ; =0x000003D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #0x64]
add r0, r4, #0
mov r1, #0x24
@@ -42800,7 +42800,7 @@ MOD06_0224E470: ; 0x0224E470
mov r2, #0x1f
mov r3, #0xb
str r4, [sp]
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r5, #4]
str r4, [r5, #8]
mov r0, #1
arm9/modules/18/asm/module_18.s
+14 -14
View File
@@ -1223,7 +1223,7 @@ MOD18_02239F98: ; 0x02239F98
ldr r0, [r0]
mov r3, #0xb
ldr r0, [r0, #8]
bl FUN_02002198
bl Std_CreateYesNoMenu
ldr r2, _0223A044 ; =0x02251380
ldr r1, _0223A050 ; =0x000007E4
ldr r3, [r2]
@@ -25227,7 +25227,7 @@ _02245898:
ldr r1, _022459E0 ; =0x022504F8
ldr r2, _022459E4 ; =0x000003D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #4]
mov r0, #2
str r0, [r4, #0xc]
@@ -25262,7 +25262,7 @@ _022458D4:
ldr r1, _022459E0 ; =0x022504F8
ldr r2, _022459E4 ; =0x000003D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #4]
mov r0, #4
str r0, [r4, #0xc]
@@ -25302,7 +25302,7 @@ _0224592A:
ldr r1, _022459E0 ; =0x022504F8
ldr r2, _022459E4 ; =0x000003D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #4]
mov r0, #6
str r0, [r4, #0xc]
@@ -25669,7 +25669,7 @@ _02245C14:
ldr r1, _02245E08 ; =0x022504F8
ldr r2, _02245E0C ; =0x000003D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #4]
mov r0, #2
str r0, [r4, #0xc]
@@ -25715,7 +25715,7 @@ _02245C7C:
ldr r1, _02245E08 ; =0x022504F8
ldr r2, _02245E0C ; =0x000003D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #4]
mov r0, #5
str r0, [r4, #0xc]
@@ -27379,7 +27379,7 @@ _022469E0:
ldr r1, _02246AD8 ; =0x022504F8
ldr r2, _02246ADC ; =0x000003D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #8]
mov r0, #6
str r0, [r4, #0xc]
@@ -30583,7 +30583,7 @@ _0224830C:
ldr r0, [r0, #8]
ldr r2, _022484D4 ; =0x000003D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #0x24]
add r0, r4, #0
mov r1, #0x14
@@ -31535,7 +31535,7 @@ _02248AAE:
ldr r0, [r0, #8]
ldr r2, _02248D94 ; =0x000003D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #0x20]
b _02248DB6
_02248AD8:
@@ -31664,7 +31664,7 @@ _02248BC2:
ldr r0, [r0, #8]
ldr r2, _02248D94 ; =0x000003D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #0x20]
b _02248DB6
_02248BEC:
@@ -35073,7 +35073,7 @@ MOD18_0224A710: ; 0x0224A710
ldr r0, [r0, #8]
ldr r2, _0224A744 ; =0x000003D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #0x5c]
ldr r0, _0224A748 ; =0x00000246
mov r1, #0xc
@@ -35224,7 +35224,7 @@ MOD18_0224A844: ; 0x0224A844
ldr r0, [r0, #8]
ldr r2, _0224A878 ; =0x000003D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #0x5c]
ldr r0, _0224A87C ; =0x00000246
mov r1, #1
@@ -37895,7 +37895,7 @@ _0224BE0A:
ldr r0, [r0, #8]
ldr r2, _0224BE80 ; =0x000003D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #8]
mov r0, #1
str r0, [r4]
@@ -40208,7 +40208,7 @@ _0224D0DA:
ldr r0, [r0, #8]
ldr r2, _0224D1EC ; =0x000003D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r4, #0x5c]
ldr r0, _0224D1D8 ; =0x00000246
mov r1, #0xe
arm9/modules/54/asm/module_54.s
+3 -3
View File
@@ -1502,7 +1502,7 @@ MOD54_021D8120: ; 0x021D8120
ldr r1, _021D814C ; =0x021D9678
mov r2, #0x1f
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
mov r1, #0x32
lsl r1, r1, #4
str r0, [r5, r1]
@@ -1767,7 +1767,7 @@ MOD54_021D8340: ; 0x021D8340
ldr r1, _021D836C ; =0x021D9678
mov r2, #0x1f
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
mov r1, #0x32
lsl r1, r1, #4
str r0, [r5, r1]
@@ -2128,7 +2128,7 @@ MOD54_021D8600: ; 0x021D8600
ldr r1, _021D862C ; =0x021D9678
mov r2, #0x1f
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
mov r1, #0x32
lsl r1, r1, #4
str r0, [r5, r1]
arm9/modules/55/asm/module_55.s
+2 -2
View File
@@ -2031,7 +2031,7 @@ MOD55_021D8544: ; 0x021D8544
ldr r1, _021D857C ; =0x021DA2AC
ldr r2, _021D8580 ; =0x000001D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
add r1, r5, #0
add r1, #0xe8
str r0, [r1]
@@ -5253,7 +5253,7 @@ MOD55_021D9FDC: ; 0x021D9FDC
ldr r1, _021DA014 ; =0x021DA2AC
ldr r2, _021DA018 ; =0x000001D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
add r1, r5, #0
add r1, #0xe8
str r0, [r1]
arm9/modules/56/asm/module_56.s
+12 -12
View File
@@ -1565,7 +1565,7 @@ _02212A9A:
ldr r1, _02212B34 ; =0x02216310
ldr r2, _02212B38 ; =0x000001D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
mov r1, #0x5f
lsl r1, r1, #2
str r0, [r5, r1]
@@ -1627,7 +1627,7 @@ MOD56_02212B3C: ; 0x02212B3C
ldr r1, _02212B7C ; =0x022162F8
ldr r2, _02212B80 ; =0x000001D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
mov r1, #0x5f
lsl r1, r1, #2
str r0, [r5, r1]
@@ -1727,7 +1727,7 @@ MOD56_02212BE8: ; 0x02212BE8
ldr r1, _02212C48 ; =0x02216310
ldr r2, _02212C4C ; =0x000001D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
mov r1, #0x5f
lsl r1, r1, #2
str r0, [r5, r1]
@@ -1786,7 +1786,7 @@ _02212C74:
ldr r1, _02212CC4 ; =0x02216310
ldr r2, _02212CC8 ; =0x000001D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
mov r1, #0x5f
lsl r1, r1, #2
str r0, [r5, r1]
@@ -2378,7 +2378,7 @@ MOD56_022130F4: ; 0x022130F4
ldr r1, _02213134 ; =0x02216308
ldr r2, _02213138 ; =0x000001D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
mov r1, #0x5f
lsl r1, r1, #2
str r0, [r5, r1]
@@ -4575,7 +4575,7 @@ MOD56_02214238: ; 0x02214238
ldr r1, _02214284 ; =0x02216308
ldr r2, _02214288 ; =0x000001D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
mov r1, #0x5f
lsl r1, r1, #2
str r0, [r5, r1]
@@ -4968,7 +4968,7 @@ MOD56_02214520: ; 0x02214520
ldr r1, _02214560 ; =0x02216308
ldr r2, _02214564 ; =0x000001D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
mov r1, #0x5f
lsl r1, r1, #2
str r0, [r5, r1]
@@ -6212,7 +6212,7 @@ MOD56_02214F0C: ; 0x02214F0C
ldr r1, _02214F4C ; =0x02216308
ldr r2, _02214F50 ; =0x000001D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
mov r1, #0x5f
lsl r1, r1, #2
str r0, [r5, r1]
@@ -6317,7 +6317,7 @@ MOD56_02214FD8: ; 0x02214FD8
ldr r1, _02215018 ; =0x02216308
ldr r2, _0221501C ; =0x000001D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
mov r1, #0x5f
lsl r1, r1, #2
str r0, [r5, r1]
@@ -7646,7 +7646,7 @@ MOD56_02215A8C: ; 0x02215A8C
ldr r1, _02215ACC ; =0x02216308
ldr r2, _02215AD0 ; =0x000001D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
mov r1, #0x5f
lsl r1, r1, #2
str r0, [r5, r1]
@@ -7831,7 +7831,7 @@ _02215BF0:
ldr r1, _02215C28 ; =0x02216308
ldr r2, _02215C2C ; =0x000001D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
mov r1, #0x5f
lsl r1, r1, #2
str r0, [r5, r1]
@@ -7985,7 +7985,7 @@ MOD56_02215D20: ; 0x02215D20
ldr r1, _02215D60 ; =0x02216308
ldr r2, _02215D64 ; =0x000001D9
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
mov r1, #0x5f
lsl r1, r1, #2
str r0, [r5, r1]
arm9/modules/61/asm/module_61.s
+1 -1
View File
@@ -374,7 +374,7 @@ MOD61_021D7790: ; 0x021D7790
ldr r0, [r4, #0x18]
mov r2, #1
mov r3, #5
bl FUN_02002198
bl Std_CreateYesNoMenu
add r4, #0xa4
str r0, [r4]
add sp, #4
arm9/modules/64/asm/module_64.s
+1 -1
View File
@@ -2212,7 +2212,7 @@ _021D8604:
ldr r2, _021D86D8 ; =0x0000029E
add r1, #0xb0
mov r3, #1
bl FUN_02002198
bl Std_CreateYesNoMenu
add r1, r4, #0
add r1, #0xb8
str r0, [r1]
arm9/modules/65/asm/module_65.s
+1 -1
View File
@@ -2418,7 +2418,7 @@ MOD65_021D87B0: ; 0x021D87B0
ldr r0, [r4, #0x24]
mov r2, #0x1f
mov r3, #0xf
bl FUN_02002198
bl Std_CreateYesNoMenu
add r4, #0xd4
str r0, [r4]
add sp, #4
arm9/modules/71/asm/module_71.s
+1 -1
View File
@@ -7038,7 +7038,7 @@ _02230FC8:
ldr r1, _02230FFC ; =0x022313CC
ldr r2, _02231000 ; =0x000001F7
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
str r0, [r5]
ldr r0, [r4]
add r0, r0, #1
arm9/modules/75/asm/module_75.s
+1 -1
View File
@@ -9515,7 +9515,7 @@ MOD75_021EB6E0: ; 0x021EB6E0
ldr r1, _021EB700 ; =0x021EC6AC
ldr r2, _021EB704 ; =0x000003F7
mov r3, #0xe
bl FUN_02002198
bl Std_CreateYesNoMenu
mov r1, #0x56
lsl r1, r1, #2
str r0, [r4, r1]
arm9/modules/76/asm/module_76.s
+1 -1
View File
@@ -735,7 +735,7 @@ MOD76_021D7AB4: ; 0x021D7AB4
ldr r1, _021D7AD8 ; =0x021D9034
mov r2, #1
mov r3, #0xc
bl FUN_02002198
bl Std_CreateYesNoMenu
mov r1, #0x43
lsl r1, r1, #2
str r0, [r4, r1]
arm9/modules/77/asm/module_77.s
+2 -2
View File
@@ -291,7 +291,7 @@ _021D7744:
ldr r2, _021D7998 ; =0x000001D9
ldr r0, [r4, r0]
mov r3, #7
bl FUN_02002198
bl Std_CreateYesNoMenu
ldr r1, _021D799C ; =0x0000C05C
str r0, [r4, r1]
mov r0, #6
@@ -499,7 +499,7 @@ _021D78EE:
ldr r2, _021D7998 ; =0x000001D9
ldr r0, [r4, r0]
mov r3, #7
bl FUN_02002198
bl Std_CreateYesNoMenu
ldr r1, _021D799C ; =0x0000C05C
str r0, [r4, r1]
mov r0, #0xd
arm9/modules/80/asm/module_80.s
+1 -1
View File
@@ -2192,7 +2192,7 @@ MOD80_0222E6A8: ; 0x0222E6A8
add r1, r3, #0
mov r2, #0x1f
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
add sp, #0xc
pop {r3, r4, r5, r6, pc}
.align 2, 0
arm9/modules/82/asm/module_82.s
+1 -1
View File
@@ -1230,7 +1230,7 @@ MOD82_0222DF38: ; 0x0222DF38
add r1, r3, #0
mov r2, #0x1f
mov r3, #0xb
bl FUN_02002198
bl Std_CreateYesNoMenu
add sp, #0xc
pop {r3, r4, r5, r6, pc}
.align 2, 0