diff options
| -rw-r--r-- | arm9/asm/scrcmd.s | 67 | ||||
| -rw-r--r-- | arm9/asm/scrcmd_6.s | 10 | ||||
| -rw-r--r-- | arm9/asm/scrcmd_7.s | 4 | ||||
| -rw-r--r-- | arm9/asm/unk_020051F4.s | 4 | ||||
| -rw-r--r-- | arm9/asm/unk_02038C78.s | 48 | ||||
| -rw-r--r-- | arm9/asm/unk_02046294.s | 4 | ||||
| -rw-r--r-- | arm9/asm/unk_02048904.s | 2 | ||||
| -rw-r--r-- | arm9/asm/unk_0205C598.s | 2 | ||||
| -rw-r--r-- | arm9/asm/unk_0205F314.s | 4 | ||||
| -rw-r--r-- | arm9/asm/unk_0206C700.s | 4 | ||||
| -rw-r--r-- | arm9/asm/unk_02072548.s | 2 | ||||
| -rw-r--r-- | arm9/asm/unk_02086FA8.s | 4 | ||||
| -rw-r--r-- | arm9/global.inc | 42 | ||||
| -rw-r--r-- | arm9/modules/05/asm/mod05_021E1374.s | 4 | ||||
| -rw-r--r-- | arm9/modules/05/asm/module_05.s | 4 | ||||
| -rw-r--r-- | arm9/modules/06/asm/module_06.s | 2 | ||||
| -rw-r--r-- | arm9/modules/11/asm/module_11_thumb2.s | 4 | ||||
| -rw-r--r-- | arm9/modules/76/asm/module_76.s | 2 | ||||
| -rw-r--r-- | arm9/modules/81/asm/module_81.s | 2 | ||||
| -rw-r--r-- | include/save_block_2.h | 2 | ||||
| -rw-r--r-- | include/script.h | 3 |
21 files changed, 111 insertions, 109 deletions
diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s index 28154fc5..751c0e4d 100644 --- a/arm9/asm/scrcmd.s +++ b/arm9/asm/scrcmd.s @@ -50,17 +50,17 @@ ScrCmd_delay: ; 0x020399B4 add r1, r4, #0x0 bl GetVarPointer strh r7, [r0, #0x0] - ldr r1, _020399E4 ; =FUN_020399E8 + ldr r1, _020399E4 ; =RunPauseTimer add r0, r5, #0x0 str r4, [r5, #0x64] bl SetupNativeScript mov r0, #0x1 pop {r3-r7, pc} .balign 4 -_020399E4: .word FUN_020399E8 +_020399E4: .word RunPauseTimer - thumb_func_start FUN_020399E8 -FUN_020399E8: ; 0x020399E8 + thumb_func_start RunPauseTimer +RunPauseTimer: ; 0x020399E8 push {r3, lr} add r1, r0, #0x0 ldr r1, [r1, #0x64] @@ -95,8 +95,8 @@ FUN_02039A10: ; 0x02039A10 pop {r4, pc} .balign 4 - thumb_func_start FUN_02039A28 -FUN_02039A28: ; 0x02039A28 + thumb_func_start ScrCmd_loadbyte +ScrCmd_loadbyte: ; 0x02039A28 ldr r1, [r0, #0x8] add r2, r1, #0x1 str r2, [r0, #0x8] @@ -110,8 +110,8 @@ FUN_02039A28: ; 0x02039A28 mov r0, #0x0 bx lr - thumb_func_start FUN_02039A40 -FUN_02039A40: ; 0x02039A40 + thumb_func_start ScrCmd_loadword +ScrCmd_loadword: ; 0x02039A40 push {r3-r5, lr} add r4, r0, #0x0 ldr r2, [r4, #0x8] @@ -126,8 +126,8 @@ FUN_02039A40: ; 0x02039A40 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02039A5C -FUN_02039A5C: ; 0x02039A5C + thumb_func_start ScrCmd_loadbytefromaddr +ScrCmd_loadbytefromaddr: ; 0x02039A5C push {r3-r5, lr} add r5, r0, #0x0 ldr r2, [r5, #0x8] @@ -142,8 +142,8 @@ FUN_02039A5C: ; 0x02039A5C mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_02039A78 -FUN_02039A78: ; 0x02039A78 + thumb_func_start ScrCmd_writebytetoaddr +ScrCmd_writebytetoaddr: ; 0x02039A78 push {r4, lr} add r4, r0, #0x0 bl ScriptReadWord @@ -156,8 +156,8 @@ FUN_02039A78: ; 0x02039A78 pop {r4, pc} .balign 4 - thumb_func_start FUN_02039A90 -FUN_02039A90: ; 0x02039A90 + thumb_func_start ScrCmd_setptrbyte +ScrCmd_setptrbyte: ; 0x02039A90 push {r4, lr} add r4, r0, #0x0 bl ScriptReadWord @@ -172,8 +172,8 @@ FUN_02039A90: ; 0x02039A90 mov r0, #0x0 pop {r4, pc} - thumb_func_start FUN_02039AAC -FUN_02039AAC: ; 0x02039AAC + thumb_func_start ScrCmd_copylocal +ScrCmd_copylocal: ; 0x02039AAC ldr r1, [r0, #0x8] add r2, r1, #0x1 str r2, [r0, #0x8] @@ -191,8 +191,8 @@ FUN_02039AAC: ; 0x02039AAC bx lr .balign 4 - thumb_func_start FUN_02039ACC -FUN_02039ACC: ; 0x02039ACC + thumb_func_start ScrCmd_copybyte +ScrCmd_copybyte: ; 0x02039ACC push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadWord @@ -740,8 +740,8 @@ FUN_02039EC0: ; 0x02039EC0 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02039EE8 -FUN_02039EE8: ; 0x02039EE8 + thumb_func_start ScrCmd_settrainerflag +ScrCmd_settrainerflag: ; 0x02039EE8 push {r3-r5, lr} add r4, r0, #0x0 add r1, r4, #0x0 @@ -754,12 +754,12 @@ FUN_02039EE8: ; 0x02039EE8 bl VarGet add r1, r0, #0x0 add r0, r5, #0x0 - bl FUN_0203965C + bl TrainerFlagSet mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_02039F0C -FUN_02039F0C: ; 0x02039F0C + thumb_func_start ScrCmd_cleartrainerflag +ScrCmd_cleartrainerflag: ; 0x02039F0C push {r3-r5, lr} add r4, r0, #0x0 add r1, r4, #0x0 @@ -772,12 +772,12 @@ FUN_02039F0C: ; 0x02039F0C bl VarGet add r1, r0, #0x0 add r0, r5, #0x0 - bl FUN_02039678 + bl TrainerFlagClear mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_02039F30 -FUN_02039F30: ; 0x02039F30 + thumb_func_start ScrCmd_checktrainerflag +ScrCmd_checktrainerflag: ; 0x02039F30 push {r3-r5, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -791,7 +791,7 @@ FUN_02039F30: ; 0x02039F30 bl VarGet add r1, r0, #0x0 add r0, r4, #0x0 - bl FUN_02039640 + bl TrainerFlagCheck strb r0, [r5, #0x2] mov r0, #0x0 pop {r3-r5, pc} @@ -904,20 +904,21 @@ ScrCmd_setorcopyvar: ; 0x0203A00C mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203A038 -FUN_0203A038: ; 0x0203A038 + thumb_func_start ScrCmd_message +ScrCmd_message: ; 0x0203A038 push {r3, lr} ldr r2, [r0, #0x8] add r1, r2, #0x1 str r1, [r0, #0x8] ldrb r2, [r2, #0x0] ldr r1, [r0, #0x78] - bl MOD05_021E2C24 + bl MOD05_ShowMessageInField mov r0, #0x0 pop {r3, pc} - thumb_func_start FUN_0203A04C -FUN_0203A04C: ; 0x0203A04C + thumb_func_start ScrCmd_message_from +ScrCmd_message_from: ; 0x0203A04C + ; message_from bank, id push {r4-r6, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -944,7 +945,7 @@ FUN_0203A04C: ; 0x0203A04C add r0, r4, #0x0 add r1, r5, #0x0 add r2, r6, #0x0 - bl MOD05_021E2C24 + bl MOD05_ShowMessageInField add r0, r5, #0x0 bl DestroyMsgData mov r0, #0x0 diff --git a/arm9/asm/scrcmd_6.s b/arm9/asm/scrcmd_6.s index 71037451..10b41ff7 100644 --- a/arm9/asm/scrcmd_6.s +++ b/arm9/asm/scrcmd_6.s @@ -239,8 +239,8 @@ FUN_02041558: ; 0x02041558 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_02041588 -FUN_02041588: ; 0x02041588 + thumb_func_start ScrCmd_waitcry +ScrCmd_waitcry: ; 0x02041588 push {r3, lr} ldr r1, _02041594 ; =FUN_02041598 bl SetupNativeScript @@ -262,11 +262,11 @@ _020415A6: pop {r3, pc} .balign 4 - thumb_func_start FUN_020415AC -FUN_020415AC: ; 0x020415AC + thumb_func_start ScrCmd_playbgm +ScrCmd_playbgm: ; 0x020415AC push {r3, lr} bl ScriptReadHalfword - bl FUN_02005C28 + bl PlayBGM mov r0, #0x0 pop {r3, pc} .balign 4 diff --git a/arm9/asm/scrcmd_7.s b/arm9/asm/scrcmd_7.s index a49b7e4f..217985cb 100644 --- a/arm9/asm/scrcmd_7.s +++ b/arm9/asm/scrcmd_7.s @@ -635,7 +635,7 @@ FUN_02041BC4: ; 0x02041BC4 lsl r1, r1, #0x10 add r0, r4, #0x0 lsr r1, r1, #0x10 - bl FUN_0203965C + bl TrainerFlagSet mov r0, #0x0 pop {r3-r5, pc} @@ -660,7 +660,7 @@ FUN_02041BF0: ; 0x02041BF0 lsl r1, r1, #0x10 add r0, r7, #0x0 lsr r1, r1, #0x10 - bl FUN_02039640 + bl TrainerFlagCheck cmp r0, #0x1 bne _02041C34 ldr r1, [r6, #0x8] diff --git a/arm9/asm/unk_020051F4.s b/arm9/asm/unk_020051F4.s index 0e71ba6f..ccb8d272 100644 --- a/arm9/asm/unk_020051F4.s +++ b/arm9/asm/unk_020051F4.s @@ -1216,8 +1216,8 @@ FUN_02005BF8: ; 0x02005BF8 pop {r3-r6, pc} .balign 4 - thumb_func_start FUN_02005C28 -FUN_02005C28: ; 0x02005C28 + thumb_func_start PlayBGM +PlayBGM: ; 0x02005C28 push {r3-r5, lr} add r5, r0, #0x0 bl FUN_020048F4 diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index 4a5d0abb..8eb56920 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -153,13 +153,13 @@ gScriptCmdTable: ; 0x020F355C .word ScrCmd_nop2 .word ScrCmd_end .word ScrCmd_delay - .word FUN_02039A28 - .word FUN_02039A40 - .word FUN_02039A5C - .word FUN_02039A78 - .word FUN_02039A90 - .word FUN_02039AAC - .word FUN_02039ACC + .word ScrCmd_loadbyte + .word ScrCmd_loadword + .word ScrCmd_loadbytefromaddr + .word ScrCmd_writebytetoaddr + .word ScrCmd_setptrbyte + .word ScrCmd_copylocal + .word ScrCmd_copybyte .word ScrCmd_compare_local_to_local .word ScrCmd_compare_local_to_value .word ScrCmd_compare_local_to_addr @@ -184,15 +184,15 @@ gScriptCmdTable: ; 0x020F355C .word ScrCmd_checkflag .word FUN_02039E84 .word FUN_02039EC0 - .word FUN_02039EE8 - .word FUN_02039F0C - .word FUN_02039F30 + .word ScrCmd_settrainerflag + .word ScrCmd_cleartrainerflag + .word ScrCmd_checktrainerflag .word ScrCmd_addvar .word ScrCmd_subvar .word ScrCmd_setvar .word ScrCmd_copyvar .word ScrCmd_setorcopyvar - .word FUN_0203A038 + .word ScrCmd_message .word FUN_0203A2C4 .word FUN_0203A304 .word FUN_0203A388 @@ -226,8 +226,8 @@ gScriptCmdTable: ; 0x020F355C .word FUN_020414FC .word FUN_02041518 .word FUN_02041558 - .word FUN_02041588 - .word FUN_020415AC + .word ScrCmd_waitcry + .word ScrCmd_playbgm .word FUN_020415BC .word FUN_020413E8 .word FUN_020413F8 @@ -655,7 +655,7 @@ gScriptCmdTable: ; 0x020F355C .word FUN_02044658 .word FUN_0203BC2C .word FUN_02039A10 - .word FUN_0203A04C + .word ScrCmd_message_from .word FUN_0203A098 .word FUN_0203A0FC .word FUN_0203A13C @@ -1958,7 +1958,7 @@ _020394D0: cmp r4, r1 bhs _020394DE add r1, r4, #0x0 - bl FUN_02046380 + bl GetVarAddr pop {r3-r5, pc} _020394DE: ldr r1, _020394EC ; =0x00007FD7 @@ -2034,8 +2034,8 @@ FlagClear: ; 0x02039550 pop {r4, pc} .balign 4 - thumb_func_start FUN_02039564 -FUN_02039564: ; 0x02039564 + thumb_func_start ResetTempFlagsAndVars +ResetTempFlagsAndVars: ; 0x02039564 push {r4, lr} ldr r0, [r0, #0xc] bl SavArray_Flags_get @@ -2054,7 +2054,7 @@ FUN_02039564: ; 0x02039564 mov r1, #0x1 add r0, r4, #0x0 lsl r1, r1, #0xe - bl FUN_02046380 + bl GetVarAddr mov r1, #0x0 mov r2, #0x40 bl memset @@ -2152,8 +2152,8 @@ _0203963C: mov r0, #0x0 pop {r3, pc} - thumb_func_start FUN_02039640 -FUN_02039640: ; 0x02039640 + thumb_func_start TrainerFlagCheck +TrainerFlagCheck: ; 0x02039640 push {r4, lr} ldr r0, [r0, #0xc] add r4, r1, #0x0 @@ -2167,8 +2167,8 @@ FUN_02039640: ; 0x02039640 pop {r4, pc} .balign 4 - thumb_func_start FUN_0203965C -FUN_0203965C: ; 0x0203965C + thumb_func_start TrainerFlagSet +TrainerFlagSet: ; 0x0203965C push {r4, lr} ldr r0, [r0, #0xc] add r4, r1, #0x0 @@ -2182,8 +2182,8 @@ FUN_0203965C: ; 0x0203965C pop {r4, pc} .balign 4 - thumb_func_start FUN_02039678 -FUN_02039678: ; 0x02039678 + thumb_func_start TrainerFlagClear +TrainerFlagClear: ; 0x02039678 push {r4, lr} ldr r0, [r0, #0xc] add r4, r1, #0x0 diff --git a/arm9/asm/unk_02046294.s b/arm9/asm/unk_02046294.s index ca4a05c3..32424277 100644 --- a/arm9/asm/unk_02046294.s +++ b/arm9/asm/unk_02046294.s @@ -149,8 +149,8 @@ _02046376: .balign 4 _0204637C: .word UNK_021C5A14 - thumb_func_start FUN_02046380 -FUN_02046380: ; 0x02046380 + thumb_func_start GetVarAddr +GetVarAddr: ; 0x02046380 push {r3-r5, lr} add r5, r0, #0x0 mov r0, #0x1 diff --git a/arm9/asm/unk_02048904.s b/arm9/asm/unk_02048904.s index 0d97ea59..4555e234 100644 --- a/arm9/asm/unk_02048904.s +++ b/arm9/asm/unk_02048904.s @@ -166,7 +166,7 @@ FUN_020489FC: ; 0x020489FC add r0, r5, #0x0 bl FUN_0204AB44 add r0, r5, #0x0 - bl FUN_02039564 + bl ResetTempFlagsAndVars cmp r4, #0x0 bne _02048A28 add r0, r5, #0x0 diff --git a/arm9/asm/unk_0205C598.s b/arm9/asm/unk_0205C598.s index 51030e32..8429979f 100644 --- a/arm9/asm/unk_0205C598.s +++ b/arm9/asm/unk_0205C598.s @@ -200,7 +200,7 @@ _0205C6E8: lsl r1, r1, #0x10 add r0, r6, #0x0 lsr r1, r1, #0x10 - bl FUN_02039640 + bl TrainerFlagCheck cmp r0, #0x0 bne _0205C724 ldr r0, [sp, #0x28] diff --git a/arm9/asm/unk_0205F314.s b/arm9/asm/unk_0205F314.s index 40cdba15..d6c97ced 100644 --- a/arm9/asm/unk_0205F314.s +++ b/arm9/asm/unk_0205F314.s @@ -18,7 +18,7 @@ FUN_0205F314: ; 0x0205F314 push {r3-r5, lr} add r5, r1, #0x0 add r4, r2, #0x0 - bl FUN_02046380 + bl GetVarAddr mov r1, #0x1 lsl r1, r1, #0xe cmp r5, r1 @@ -44,7 +44,7 @@ _0205F33C: thumb_func_start FUN_0205F344 FUN_0205F344: ; 0x0205F344 push {r3, lr} - bl FUN_02046380 + bl GetVarAddr cmp r0, #0x0 bne _0205F352 mov r0, #0x0 diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index b27d0c31..2c651288 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -2719,7 +2719,7 @@ _0206DDDC: b _0206DDFA _0206DDE4: ldr r0, _0206DE00 ; =0x00000484 - bl FUN_02005C28 + bl PlayBGM b _0206DDFA _0206DDEC: ldr r0, _0206DE04 ; =0x000005E6 @@ -2727,7 +2727,7 @@ _0206DDEC: b _0206DDFA _0206DDF4: ldr r0, _0206DE08 ; =0x00000483 - bl FUN_02005C28 + bl PlayBGM _0206DDFA: add r0, r4, #0x0 pop {r4, pc} diff --git a/arm9/asm/unk_02072548.s b/arm9/asm/unk_02072548.s index 16c4a95b..3479c659 100644 --- a/arm9/asm/unk_02072548.s +++ b/arm9/asm/unk_02072548.s @@ -1717,7 +1717,7 @@ _020732A6: b _020732BE _020732AE: ldr r0, _020732C8 ; =0x00000483 - bl FUN_02005C28 + bl PlayBGM b _020732BE _020732B6: ldr r0, _020732C4 ; =0x000005E6 diff --git a/arm9/asm/unk_02086FA8.s b/arm9/asm/unk_02086FA8.s index e728ee4a..8cc246e9 100644 --- a/arm9/asm/unk_02086FA8.s +++ b/arm9/asm/unk_02086FA8.s @@ -185,7 +185,7 @@ _0208710E: cmp r0, #0x0 bne _0208712A ldr r0, _02087244 ; =0x00000484 - bl FUN_02005C28 + bl PlayBGM ldr r0, [r4, #0x5c] add r0, r0, #0x1 str r0, [r4, #0x5c] @@ -470,7 +470,7 @@ _02087362: cmp r0, #0x0 bne _0208737E ldr r0, _02087498 ; =0x00000484 - bl FUN_02005C28 + bl PlayBGM ldr r0, [r4, #0x5c] add r0, r0, #0x1 str r0, [r4, #0x5c] diff --git a/arm9/global.inc b/arm9/global.inc index dfec2af6..966a1683 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -360,7 +360,7 @@ .extern FUN_02005614 .extern FUN_02005670 .extern FUN_020056AC -.extern FUN_02005C28 +.extern PlayBGM .extern FUN_02005CBC .extern FUN_02005CFC .extern FUN_02005D20 @@ -2686,15 +2686,15 @@ .extern FlagCheck .extern FlagSet .extern FlagClear -.extern FUN_02039564 +.extern ResetTempFlagsAndVars .extern FUN_0203959C .extern FUN_020395BC .extern FUN_020395F4 .extern FUN_02039618 .extern FUN_0203962C -.extern FUN_02039640 -.extern FUN_0203965C -.extern FUN_02039678 +.extern TrainerFlagCheck +.extern TrainerFlagSet +.extern TrainerFlagClear .extern FUN_02039694 .extern FUN_02039754 .extern FUN_02039874 @@ -2704,13 +2704,13 @@ .extern ScrCmd_end .extern ScrCmd_delay .extern FUN_02039A10 -.extern FUN_02039A28 -.extern FUN_02039A40 -.extern FUN_02039A5C -.extern FUN_02039A78 -.extern FUN_02039A90 -.extern FUN_02039AAC -.extern FUN_02039ACC +.extern ScrCmd_loadbyte +.extern ScrCmd_loadword +.extern ScrCmd_loadbytefromaddr +.extern ScrCmd_writebytetoaddr +.extern ScrCmd_setptrbyte +.extern ScrCmd_copylocal +.extern ScrCmd_copybyte .extern ScrCmd_compare_local_to_local .extern ScrCmd_compare_local_to_value .extern ScrCmd_compare_local_to_addr @@ -2735,16 +2735,16 @@ .extern ScrCmd_checkflag .extern FUN_02039E84 .extern FUN_02039EC0 -.extern FUN_02039EE8 -.extern FUN_02039F0C -.extern FUN_02039F30 +.extern ScrCmd_settrainerflag +.extern ScrCmd_cleartrainerflag +.extern ScrCmd_checktrainerflag .extern ScrCmd_addvar .extern ScrCmd_subvar .extern ScrCmd_setvar .extern ScrCmd_copyvar .extern ScrCmd_setorcopyvar -.extern FUN_0203A038 -.extern FUN_0203A04C +.extern ScrCmd_message +.extern ScrCmd_message_from .extern FUN_0203A098 .extern FUN_0203A0FC .extern FUN_0203A13C @@ -3215,8 +3215,8 @@ .extern FUN_020414FC .extern FUN_02041518 .extern FUN_02041558 -.extern FUN_02041588 -.extern FUN_020415AC +.extern ScrCmd_waitcry +.extern ScrCmd_playbgm .extern FUN_020415BC .extern FUN_020415E0 .extern FUN_02041618 @@ -3429,7 +3429,7 @@ .extern SetFlagInArray .extern ClearFlagInArray .extern GetFlagAddr -.extern FUN_02046380 +.extern GetVarAddr .extern FUN_020463CC .extern FUN_020463EC .extern FUN_0204640C @@ -6382,7 +6382,7 @@ .extern MOD05_021E2B9C .extern MOD05_021E2BB8 .extern MOD05_021E2BD0 -.extern MOD05_021E2C24 +.extern MOD05_ShowMessageInField .extern MOD05_021E2C58 .extern MOD05_021E2CBC .extern MOD05_021E320C diff --git a/arm9/modules/05/asm/mod05_021E1374.s b/arm9/modules/05/asm/mod05_021E1374.s index fe98e120..018f4d8c 100644 --- a/arm9/modules/05/asm/mod05_021E1374.s +++ b/arm9/modules/05/asm/mod05_021E1374.s @@ -568,7 +568,7 @@ _021E17BE: bl MOD05_021E1848 add r1, r0, #0 ldr r0, [r5, #4] - bl FUN_02039640 + bl TrainerFlagCheck cmp r0, #0 bne _021E17DE ldr r1, [r4, #0x10] @@ -712,7 +712,7 @@ _021E18DC: cmp r1, r7 beq _021E18F0 add r0, r6, #0 - bl FUN_02039640 + bl TrainerFlagCheck cmp r0, #0 bne _021E18F0 lsl r0, r4, #0x10 diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 36dd0461..1172f733 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -93,8 +93,8 @@ _021E2C16: add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} - thumb_func_start MOD05_021E2C24 -MOD05_021E2C24: ; 0x021E2C24 + thumb_func_start MOD05_ShowMessageInField +MOD05_ShowMessageInField: ; 0x021E2C24 push {r4, r5, r6, lr} sub sp, #0x18 add r5, r0, #0 diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index cdc23ba3..561761c1 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -38773,7 +38773,7 @@ _0224C476: mov r2, #0 bl MOD05_021DA4EC ldr r0, _0224C51C ; =0x0000048E - bl FUN_02005C28 + bl PlayBGM ldrb r0, [r4, #0xf] add r0, r0, #1 strb r0, [r4, #0xf] diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index b22fc761..92756469 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -6258,7 +6258,7 @@ _02232234: b _02232252 _0223223C: ldr r0, _02232258 ; =0x00000484 - bl FUN_02005C28 + bl PlayBGM b _02232252 _02232244: ldr r0, _0223225C ; =0x000005E6 @@ -6266,7 +6266,7 @@ _02232244: b _02232252 _0223224C: ldr r0, _02232260 ; =0x00000483 - bl FUN_02005C28 + bl PlayBGM _02232252: add r0, r4, #0 pop {r4, pc} diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index da9aff3b..3a079284 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -2105,7 +2105,7 @@ _021D85BE: b _021D85D6 _021D85C6: ldr r0, _021D85E0 ; =0x00000483 - bl FUN_02005C28 + bl PlayBGM b _021D85D6 _021D85CE: ldr r0, _021D85DC ; =0x000005E6 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 8ebe39e5..6b04578f 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -9611,7 +9611,7 @@ _0223C982: add r0, #0x48 bl FUN_020191D0 ldr r0, _0223CA90 ; =0x00000484 - bl FUN_02005C28 + bl PlayBGM mov r0, #0 str r0, [r4, #8] mov r0, #1 diff --git a/include/save_block_2.h b/include/save_block_2.h index 38e11de4..ac5a2044 100644 --- a/include/save_block_2.h +++ b/include/save_block_2.h @@ -8,7 +8,7 @@ struct SaveBlock2 u8 filler_14[4]; u8 gender; u8 padding[3]; - // TODO: finish this struct + // TODO: finish this st ruct }; struct String * FUN_020239A0(struct SaveBlock2 *, u32 heap_id); diff --git a/include/script.h b/include/script.h index 494a9d9f..7c4dae6d 100644 --- a/include/script.h +++ b/include/script.h @@ -3,6 +3,7 @@ #include "global.h"
#include "msgdata.h"
+#include "save_block_2.h"
struct ScriptContext;
@@ -23,7 +24,7 @@ struct ScriptContext u32 unk74;
struct MsgData * unk78;
u8 *unk7C;
- void * unk80;
+ struct SaveBlock2 * unk80;
};
#define ScriptReadByte(ctx) (*(ctx->scriptPtr++))
|