diff options
Diffstat (limited to 'arm9/asm')
53 files changed, 421 insertions, 3959 deletions
diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s index 876bd329..62f32eeb 100644 --- a/arm9/asm/scrcmd.s +++ b/arm9/asm/scrcmd.s @@ -6,7 +6,6 @@ .extern UNK_020F34FC .extern UNK_020F3538 .extern gMain - .extern gUnk021C4918 .section .bss @@ -1170,7 +1169,7 @@ FUN_0203A210: ; 0x0203A210 mov r3, #0x1 bl MOD05_021E2CBC add r0, r6, #0x0 - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r1, _0203A284 ; =FUN_0203A2F0 add r0, r5, #0x0 bl SetupNativeScript @@ -5171,8 +5170,8 @@ FUN_0203C200: ; 0x0203C200 .balign 4 _0203C274: .word FUN_0203BB90 - thumb_func_start FUN_0203C278 -FUN_0203C278: ; 0x0203C278 + thumb_func_start ScrCmd_monstoragepc +ScrCmd_monstoragepc: ; 0x0203C278 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -5198,7 +5197,7 @@ FUN_0203C278: ; 0x0203C278 add r0, #0x80 ldr r0, [r0, #0x0] ldr r1, [r4, #0x0] - bl FUN_02037D60 + bl LaunchStoragePCInterface ldr r1, _0203C2C0 ; =FUN_0203BBBC add r0, r5, #0x0 bl SetupNativeScript @@ -11112,13 +11111,13 @@ FUN_0203F234: ; 0x0203F234 add r1, r0, #0x0 ldr r0, [r4, #0x0] bl GetVarPointer - ldr r1, _0203F250 ; =gUnk021C4918 + ldr r1, _0203F250 ; =gMain + 0x60 ldrb r1, [r1, #0x6] strh r1, [r0, #0x0] mov r0, #0x1 pop {r4, pc} .balign 4 -_0203F250: .word gUnk021C4918 +_0203F250: .word gMain + 0x60 thumb_func_start FUN_0203F254 FUN_0203F254: ; 0x0203F254 @@ -11187,7 +11186,7 @@ FUN_0203F2AC: ; 0x0203F2AC add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl FUN_0200B6D0 + bl BufferContestBackgroundName mov r0, #0x1 pop {r4-r6, pc} .balign 4 @@ -12175,7 +12174,7 @@ FUN_0203FA58: ; 0x0203FA58 bl VarGet add r7, r0, #0x0 mov r0, #0x20 - bl FUN_0200AA80 + bl ScrStrBufs_new add r4, r0, #0x0 ldr r2, _0203FB48 ; =0x00000147 mov r0, #0x0 @@ -12227,7 +12226,7 @@ _0203FB26: add r0, r5, #0x0 bl DestroyMsgData add r0, r4, #0x0 - bl FUN_0200AB18 + bl ScrStrBufs_delete mov r0, #0x0 add sp, #0x10 pop {r3-r7, pc} diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s index 059262cf..524c0006 100644 --- a/arm9/asm/scrcmd_12.s +++ b/arm9/asm/scrcmd_12.s @@ -326,7 +326,7 @@ FUN_02042F48: ; 0x02042F48 add r2, r0, #0x0 ldr r0, [r4, #0x4] mov r1, #0x0 - bl FUN_0200ABC0 + bl BufferPlayersName pop {r4, pc} .balign 4 @@ -694,13 +694,13 @@ FUN_02043274: ; 0x02043274 add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r7, #0x4 bl FUN_020690E4 add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x1 - bl FUN_0200ACA4 + bl BufferBoxMonSpeciesNameWithArticle pop {r3-r7, pc} .balign 4 @@ -740,13 +740,13 @@ FUN_020432C8: ; 0x020432C8 add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r7, #0x4 bl FUN_020690E4 add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x1 - bl FUN_0200AC60 + bl BufferBoxMonSpeciesName pop {r3-r7, pc} .balign 4 @@ -812,11 +812,11 @@ FUN_02043358: ; 0x02043358 add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 - bl FUN_0200ABC0 + bl BufferPlayersName ldr r0, [r5, #0x4] mov r1, #0x1 add r2, r7, #0x0 - bl FUN_0200AE38 + bl BufferItemName pop {r3-r7, pc} thumb_func_start FUN_02043394 @@ -840,7 +840,7 @@ FUN_02043394: ; 0x02043394 mov r0, #0x5 strh r0, [r6, #0x0] ldr r0, [r5, #0x4] - bl FUN_0200AE38 + bl BufferItemName pop {r4-r6, pc} thumb_func_start FUN_020433C4 @@ -880,7 +880,7 @@ FUN_020433DC: ; 0x020433DC add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r7, #0x0 mov r1, #0x20 bl FUN_02023AF4 @@ -892,7 +892,7 @@ FUN_020433DC: ; 0x020433DC ldr r0, [r5, #0x4] add r2, r4, #0x0 mov r3, #0x0 - bl FUN_0200ABB4 + bl BufferString add r0, r4, #0x0 bl String_dtor add sp, #0x8 @@ -953,11 +953,11 @@ FUN_0204346C: ; 0x0204346C add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 - bl FUN_0200ABC0 + bl BufferPlayersName ldr r0, [r5, #0x4] mov r1, #0x1 add r2, r7, #0x0 - bl FUN_0200B350 + bl BufferDecorationName pop {r3-r7, pc} thumb_func_start FUN_020434A4 @@ -1058,17 +1058,17 @@ FUN_02043538: ; 0x02043538 _02043558: ldr r0, [r5, #0x4] mov r1, #0x1 - bl FUN_0200B534 + bl BufferSealName b _02043574 _02043562: ldr r0, [r5, #0x4] mov r1, #0x1 - bl FUN_0200B660 + bl BufferFashionName b _02043574 _0204356C: ldr r0, [r5, #0x4] mov r1, #0x1 - bl FUN_0200B6D0 + bl BufferContestBackgroundName _02043574: mov r0, #0x53 lsl r0, r0, #0x2 @@ -1081,7 +1081,7 @@ _02043574: add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 - bl FUN_0200ABC0 + bl BufferPlayersName pop {r4-r6, pc} .balign 4 @@ -1155,11 +1155,11 @@ FUN_020435F8: ; 0x020435F8 add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 - bl FUN_0200ABC0 + bl BufferPlayersName ldr r0, [r5, #0x4] ldr r2, _02043630 ; =0x000001C6 mov r1, #0x1 - bl FUN_0200AE38 + bl BufferItemName pop {r4-r6, pc} nop _02043630: .word 0x000001C6 @@ -1183,7 +1183,7 @@ FUN_02043634: ; 0x02043634 ldr r0, [r5, #0x4] mov r1, #0x0 add r2, #0x7a - bl FUN_0200AE38 + bl BufferItemName pop {r4-r6, pc} thumb_func_start FUN_02043660 @@ -1247,12 +1247,12 @@ FUN_020436B8: ; 0x020436B8 add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 - bl FUN_0200ABC0 + bl BufferPlayersName mov r2, #0x71 ldr r0, [r5, #0x4] mov r1, #0x1 lsl r2, r2, #0x2 - bl FUN_0200AE38 + bl BufferItemName pop {r4-r6, pc} thumb_func_start FUN_020436F0 @@ -1274,7 +1274,7 @@ FUN_020436F0: ; 0x020436F0 ldr r0, [r5, #0x4] mov r1, #0x0 add r2, #0x78 - bl FUN_0200AE38 + bl BufferItemName pop {r4-r6, pc} thumb_func_start FUN_0204371C @@ -1338,11 +1338,11 @@ FUN_02043774: ; 0x02043774 add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 - bl FUN_0200ABC0 + bl BufferPlayersName ldr r0, [r5, #0x4] ldr r2, _020437AC ; =0x000001C7 mov r1, #0x1 - bl FUN_0200AE38 + bl BufferItemName pop {r4-r6, pc} nop _020437AC: .word 0x000001C7 @@ -1366,7 +1366,7 @@ FUN_020437B0: ; 0x020437B0 ldr r0, [r5, #0x4] mov r1, #0x0 add r2, #0x7b - bl FUN_0200AE38 + bl BufferItemName pop {r4-r6, pc} thumb_func_start FUN_020437DC @@ -1419,11 +1419,11 @@ FUN_02043818: ; 0x02043818 add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 - bl FUN_0200ABC0 + bl BufferPlayersName ldr r0, [r5, #0x4] ldr r2, [r7, #0x0] mov r1, #0x1 - bl FUN_0200B02C + bl BufferPoketchAppName pop {r3-r7, pc} thumb_func_start FUN_02043850 @@ -1445,5 +1445,5 @@ FUN_02043850: ; 0x02043850 add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 - bl FUN_0200ABC0 + bl BufferPlayersName pop {r4-r6, pc} diff --git a/arm9/asm/scrcmd_3.s b/arm9/asm/scrcmd_3.s index 475edde8..3de355ea 100644 --- a/arm9/asm/scrcmd_3.s +++ b/arm9/asm/scrcmd_3.s @@ -370,7 +370,7 @@ FUN_02040170: ; 0x02040170 str r3, [sp, #0x4] ldr r0, [r4, #0x0] add r2, r6, #0x0 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x0 add sp, #0x8 pop {r4-r6, pc} diff --git a/arm9/asm/scrcmd_4.s b/arm9/asm/scrcmd_4.s index aede6782..b3af2c5c 100644 --- a/arm9/asm/scrcmd_4.s +++ b/arm9/asm/scrcmd_4.s @@ -25,7 +25,7 @@ FUN_020406CC: ; 0x020406CC add r2, r0, #0x0 ldr r0, [r4, #0x0] add r1, r5, #0x0 - bl FUN_0200ABC0 + bl BufferPlayersName mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -45,7 +45,7 @@ FUN_02040700: ; 0x02040700 ldrb r1, [r2, #0x0] ldr r0, [r0, #0x0] ldr r2, [r4, #0xc] - bl FUN_0200ABE4 + bl BufferRivalsName mov r0, #0x0 pop {r3-r5, pc} @@ -64,7 +64,7 @@ FUN_02040724: ; 0x02040724 ldrb r1, [r2, #0x0] ldr r0, [r0, #0x0] ldr r2, [r4, #0xc] - bl FUN_0200AC0C + bl BufferFriendsName mov r0, #0x0 pop {r3-r5, pc} @@ -96,7 +96,7 @@ FUN_02040748: ; 0x02040748 add r2, r0, #0x0 ldr r0, [r7, #0x0] add r1, r4, #0x0 - bl FUN_0200AC60 + bl BufferBoxMonSpeciesName mov r0, #0x0 pop {r3-r7, pc} .balign 4 @@ -123,7 +123,7 @@ FUN_02040790: ; 0x02040790 add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl FUN_0200AE38 + bl BufferItemName mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -150,7 +150,7 @@ FUN_020407C8: ; 0x020407C8 add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl FUN_0200AEE0 + bl BufferPocketName mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -178,7 +178,7 @@ FUN_02040800: ; 0x02040800 add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl FUN_0200AD5C + bl BufferMoveName mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -205,7 +205,7 @@ FUN_0204083C: ; 0x0204083C add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl FUN_0200AD5C + bl BufferMoveName mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -239,7 +239,7 @@ FUN_02040874: ; 0x02040874 ldr r0, [r6, #0x0] add r1, r4, #0x0 add r2, r5, #0x0 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x0 add sp, #0x8 pop {r4-r6, pc} @@ -285,7 +285,7 @@ _02040904: ldr r0, [r7, #0x0] ldr r2, [sp, #0x8] add r1, r6, #0x0 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x0 add sp, #0xc pop {r4-r7, pc} @@ -319,7 +319,7 @@ FUN_0204091C: ; 0x0204091C add r2, r0, #0x0 ldr r0, [r7, #0x0] add r1, r4, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r0, #0x0 pop {r3-r7, pc} .balign 4 @@ -361,7 +361,7 @@ FUN_02040964: ; 0x02040964 add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r0, #0x0 pop {r3-r7, pc} @@ -387,7 +387,7 @@ FUN_020409C0: ; 0x020409C0 add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl FUN_0200B02C + bl BufferPoketchAppName mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -414,7 +414,7 @@ FUN_020409F8: ; 0x020409F8 add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl FUN_0200B064 + bl BufferTrainerClassName mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -449,7 +449,7 @@ FUN_02040A30: ; 0x02040A30 add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r5, #0x0 - bl FUN_0200B09C + bl BufferTrainerClassNameWithArticle mov r0, #0x0 pop {r3-r7, pc} @@ -493,7 +493,7 @@ FUN_02040A7C: ; 0x02040A7C ldr r3, [sp, #0x8] add r1, r4, #0x0 add r2, r6, #0x0 - bl FUN_0200ABB4 + bl BufferString add r0, r6, #0x0 bl String_dtor mov r0, #0x0 @@ -551,7 +551,7 @@ FUN_02040B0C: ; 0x02040B0C add r1, r5, #0x0 add r2, r4, #0x0 mov r3, #0x0 - bl FUN_0200ABB4 + bl BufferString add r0, r4, #0x0 bl String_dtor mov r0, #0x0 @@ -588,7 +588,7 @@ FUN_02040B5C: ; 0x02040B5C add r1, r5, #0x0 add r2, r4, #0x0 mov r3, #0x0 - bl FUN_0200ABB4 + bl BufferString add r0, r4, #0x0 bl String_dtor mov r0, #0x0 @@ -625,7 +625,7 @@ FUN_02040BAC: ; 0x02040BAC add r1, r5, #0x0 add r2, r4, #0x0 mov r3, #0x0 - bl FUN_0200ABB4 + bl BufferString add r0, r4, #0x0 bl String_dtor mov r0, #0x0 @@ -654,7 +654,7 @@ FUN_02040BFC: ; 0x02040BFC add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl FUN_0200B350 + bl BufferDecorationName mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -681,7 +681,7 @@ FUN_02040C34: ; 0x02040C34 add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl FUN_0200B1D4 + bl BufferUndergroundTrapName mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -708,7 +708,7 @@ FUN_02040C6C: ; 0x02040C6C add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl FUN_0200B164 + bl BufferUndergroundItemName mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -749,7 +749,7 @@ FUN_02040CA4: ; 0x02040CA4 add r1, r6, #0x0 add r2, r4, #0x0 mov r3, #0x0 - bl FUN_0200ABB4 + bl BufferString add r0, r4, #0x0 bl String_dtor mov r0, #0x0 @@ -806,7 +806,7 @@ _02040D5C: add r1, r6, #0x0 add r2, r5, #0x0 mov r3, #0x0 - bl FUN_0200ABB4 + bl BufferString add r0, r5, #0x0 bl String_dtor mov r0, #0x0 @@ -836,7 +836,7 @@ FUN_02040D7C: ; 0x02040D7C add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl FUN_0200AE04 + bl BufferNatureName mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -863,7 +863,7 @@ FUN_02040DB4: ; 0x02040DB4 add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl FUN_0200B660 + bl BufferFashionName mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -902,7 +902,7 @@ FUN_02040DEC: ; 0x02040DEC str r0, [sp, #0x4] ldr r0, [r7, #0x0] add r2, r4, #0x0 - bl FUN_0200ABB4 + bl BufferString add r0, r4, #0x0 bl String_dtor mov r0, #0x0 @@ -952,7 +952,7 @@ FUN_02040E4C: ; 0x02040E4C lsr r2, r0, #0x10 ldr r0, [r7, #0x0] add r1, r5, #0x0 - bl FUN_0200AD5C + bl BufferMoveName mov r0, #0x0 pop {r3-r7, pc} .balign 4 @@ -984,7 +984,7 @@ FUN_02040EB4: ; 0x02040EB4 lsr r2, r0, #0x10 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl GetRibbonNameOrDesc + bl BufferRibbonNameOrDesc mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -1014,7 +1014,7 @@ FUN_02040EF8: ; 0x02040EF8 ldr r0, [r6, #0x0] add r1, r4, #0x0 lsr r2, r2, #0x10 - bl FUN_0200B534 + bl BufferSealName mov r0, #0x0 pop {r4-r6, pc} @@ -1040,7 +1040,7 @@ FUN_02040F34: ; 0x02040F34 add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl FUN_0200AE70 + bl BufferItemNameWithIndefArticle mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -1067,7 +1067,7 @@ FUN_02040F6C: ; 0x02040F6C add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl FUN_0200AEA8 + bl BufferItemNamePlural mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -1094,7 +1094,7 @@ FUN_02040FA4: ; 0x02040FA4 add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl FUN_0200B388 + bl BufferDecorationNameWithArticle mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -1121,7 +1121,7 @@ FUN_02040FDC: ; 0x02040FDC add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl FUN_0200B20C + bl BufferUndergroundTrapNameWithArticle mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -1148,7 +1148,7 @@ FUN_02041014: ; 0x02041014 add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl FUN_0200B19C + bl BufferUndergroundItemNameWithArticle mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -1182,7 +1182,7 @@ FUN_0204104C: ; 0x0204104C str r0, [r5, #0x8] ldr r0, [r6, #0x0] add r2, r7, #0x0 - bl FUN_0200ACC0 + bl BufferSpeciesNameWithArticle mov r0, #0x0 pop {r3-r7, pc} .balign 4 @@ -1208,7 +1208,7 @@ FUN_02041094: ; 0x02041094 add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl FUN_0200ACC0 + bl BufferSpeciesNameWithArticle mov r0, #0x0 pop {r4-r6, pc} @@ -1234,7 +1234,7 @@ FUN_020410C8: ; 0x020410C8 add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl FUN_0200B698 + bl BufferFashionNameWithArticle mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -1261,7 +1261,7 @@ FUN_02041100: ; 0x02041100 add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl FUN_0200B09C + bl BufferTrainerClassNameWithArticle mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -1291,7 +1291,7 @@ FUN_02041138: ; 0x02041138 ldr r0, [r6, #0x0] add r1, r4, #0x0 lsr r2, r2, #0x10 - bl FUN_0200B568 + bl BufferSealNamePlural mov r0, #0x0 pop {r4-r6, pc} diff --git a/arm9/asm/scrcmd_9.s b/arm9/asm/scrcmd_9.s index 5c723f9a..1741c29b 100644 --- a/arm9/asm/scrcmd_9.s +++ b/arm9/asm/scrcmd_9.s @@ -536,7 +536,7 @@ FUN_0204224C: ; 0x0204224C str r0, [sp, #0x4] add r0, r5, #0x0 add r2, r4, #0x0 - bl FUN_0200ABB4 + bl BufferString add r0, r4, #0x0 bl String_dtor add sp, #0xc @@ -554,7 +554,7 @@ FUN_02042288: ; 0x02042288 add r2, r0, #0x0 add r0, r4, #0x0 mov r1, #0x0 - bl FUN_0200AC60 + bl BufferBoxMonSpeciesName pop {r4, pc} .balign 4 @@ -568,7 +568,7 @@ FUN_020422A8: ; 0x020422A8 add r2, r0, #0x0 add r0, r4, #0x0 mov r1, #0x0 - bl FUN_0200B02C + bl BufferPoketchAppName pop {r4, pc} thumb_func_start FUN_020422C0 diff --git a/arm9/asm/unk_020023C0.s b/arm9/asm/unk_020023C0.s index 110db7ea..a84fda87 100644 --- a/arm9/asm/unk_020023C0.s +++ b/arm9/asm/unk_020023C0.s @@ -3,7 +3,7 @@ .section .bss - .extern UNK_021C48F8 + .extern gMain .extern gMain .global gTextFlags @@ -57,7 +57,7 @@ _020023F0: lsr r0, r0, #0x1f bne _02002414 _02002402: - ldr r0, _0200265C ; =UNK_021C48F8 + ldr r0, _0200265C ; =gMain + 0x40 ldrh r0, [r0, #0x22] cmp r0, #0x0 beq _02002432 @@ -111,7 +111,7 @@ _02002432: mov r1, #0x3 tst r1, r2 bne _02002478 - ldr r1, _0200265C ; =UNK_021C48F8 + ldr r1, _0200265C ; =gMain + 0x40 ldrh r1, [r1, #0x20] cmp r1, #0x0 beq _02002486 @@ -375,7 +375,7 @@ _0200264E: b _020026CA .balign 4 _02002658: .word gMain -_0200265C: .word UNK_021C48F8 +_0200265C: .word gMain + 0x40 _02002660: .word gTextFlags _02002664: .word 0x0000F0FD _02002668: .word 0x000025BD @@ -915,7 +915,7 @@ FUN_02002A94: ; 0x02002A94 mov r0, #0x3 tst r0, r1 bne _02002AB2 - ldr r0, _02002AD0 ; =UNK_021C48F8 + ldr r0, _02002AD0 ; =gMain + 0x40 ldrh r0, [r0, #0x20] cmp r0, #0x0 beq _02002AC6 @@ -939,7 +939,7 @@ _02002AC6: pop {r3, pc} nop _02002ACC: .word gMain -_02002AD0: .word UNK_021C48F8 +_02002AD0: .word gMain + 0x40 _02002AD4: .word gTextFlags _02002AD8: .word 0x000005DC diff --git a/arm9/asm/unk_02006864.s b/arm9/asm/unk_02006864.s index cffea043..5528150d 100644 --- a/arm9/asm/unk_02006864.s +++ b/arm9/asm/unk_02006864.s @@ -567,6 +567,7 @@ FUN_02006C88: ; 0x02006C88 thumb_func_start UncompressFromNarc UncompressFromNarc: ; 0x02006C98 + ; BOOL UncompressFromNarc(NarcId narcId, s32 memberNo, BOOL a2, u32 heap_id, BOOL a4) push {r3-r7, lr} add r5, r2, #0x0 add r7, r0, #0x0 diff --git a/arm9/asm/unk_0200AA80.s b/arm9/asm/unk_0200AA80.s deleted file mode 100644 index aa06782f..00000000 --- a/arm9/asm/unk_0200AA80.s +++ /dev/null @@ -1,2098 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .section .rodata - - .global UNK_020ECE64 -UNK_020ECE64: ; 0x020ECE64 - .short 0x017E ; Locations - .short 0x0180 ; Gifts/trades - .short 0x017F ; Events - - .balign 4 - .global UNK_020ECE6C -UNK_020ECE6C: ; 0x020ECE6C - .short 0x0140, 0x0008 - .short 0x0160, 0x0010 - .short 0x01A0, 0x0010 - .short 0x01E0, 0x0010 - .short 0x0220, 0x0010 - .short 0x0260, 0x0010 - .short 0x02A0, 0x0010 - - .text - - thumb_func_start FUN_0200AA80 -FUN_0200AA80: ; 0x0200AA80 - ldr r3, _0200AA8C ; =FUN_0200AA90 - add r2, r0, #0x0 - mov r0, #0x8 - mov r1, #0x20 - bx r3 - nop -_0200AA8C: .word FUN_0200AA90 - - thumb_func_start FUN_0200AA90 -FUN_0200AA90: ; 0x0200AA90 - push {r3-r7, lr} - sub sp, #0x8 - add r7, r0, #0x0 - str r1, [sp, #0x0] - str r2, [sp, #0x4] - bne _0200AAA0 - bl ErrorHandling -_0200AAA0: - ldr r0, [sp, #0x0] - cmp r0, #0x0 - bne _0200AAAA - bl ErrorHandling -_0200AAAA: - ldr r0, [sp, #0x4] - mov r1, #0x10 - bl AllocFromHeapAtEnd - add r4, r0, #0x0 - beq _0200AB10 - ldr r0, [sp, #0x4] - str r7, [r4, #0x0] - str r0, [r4, #0x4] - ldr r0, [sp, #0x0] - ldr r1, [sp, #0x4] - bl String_ctor - str r0, [r4, #0xc] - cmp r0, #0x0 - beq _0200AB10 - ldr r0, [sp, #0x4] - lsl r1, r7, #0x3 - bl AllocFromHeapAtEnd - str r0, [r4, #0x8] - cmp r0, #0x0 - beq _0200AB10 - mov r6, #0x0 - cmp r7, #0x0 - bls _0200AB06 - add r5, r6, #0x0 -_0200AAE0: - add r0, r0, r5 - bl FUN_0200AB6C - ldr r0, [sp, #0x0] - ldr r1, [sp, #0x4] - bl String_ctor - ldr r1, [r4, #0x8] - add r1, r1, r5 - str r0, [r1, #0x4] - ldr r0, [r4, #0x8] - add r1, r0, r5 - ldr r1, [r1, #0x4] - cmp r1, #0x0 - beq _0200AB06 - add r6, r6, #0x1 - add r5, #0x8 - cmp r6, r7 - blo _0200AAE0 -_0200AB06: - cmp r6, r7 - bne _0200AB10 - add sp, #0x8 - add r0, r4, #0x0 - pop {r3-r7, pc} -_0200AB10: - mov r0, #0x0 - add sp, #0x8 - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200AB18 -FUN_0200AB18: ; 0x0200AB18 - push {r4-r6, lr} - add r5, r0, #0x0 - ldr r0, [r5, #0x0] - cmp r0, #0x0 - bne _0200AB26 - bl ErrorHandling -_0200AB26: - ldr r0, [r5, #0x8] - cmp r0, #0x0 - beq _0200AB54 - ldr r0, [r5, #0x0] - mov r6, #0x0 - cmp r0, #0x0 - bls _0200AB4E - add r4, r6, #0x0 -_0200AB36: - ldr r0, [r5, #0x8] - add r0, r0, r4 - ldr r0, [r0, #0x4] - cmp r0, #0x0 - beq _0200AB4E - bl String_dtor - ldr r0, [r5, #0x0] - add r6, r6, #0x1 - add r4, #0x8 - cmp r6, r0 - blo _0200AB36 -_0200AB4E: - ldr r0, [r5, #0x8] - bl FreeToHeap -_0200AB54: - ldr r0, [r5, #0xc] - cmp r0, #0x0 - beq _0200AB5E - bl String_dtor -_0200AB5E: - mov r0, #0x0 - str r0, [r5, #0x0] - add r0, r5, #0x0 - bl FreeToHeap - pop {r4-r6, pc} - .balign 4 - - thumb_func_start FUN_0200AB6C -FUN_0200AB6C: ; 0x0200AB6C - bx lr - .balign 4 - - thumb_func_start FUN_0200AB70 -FUN_0200AB70: ; 0x0200AB70 - push {r3-r7, lr} - add r5, r0, #0x0 - ldr r0, [r5, #0x0] - add r6, r1, #0x0 - add r7, r2, #0x0 - add r4, r3, #0x0 - cmp r6, r0 - blo _0200AB84 - bl ErrorHandling -_0200AB84: - ldr r0, [r5, #0x0] - cmp r6, r0 - bhs _0200ABB2 - cmp r4, #0x0 - beq _0200ABA4 - ldrb r0, [r4, #0x0] - ldr r3, [r5, #0x8] - lsl r2, r6, #0x3 - strb r0, [r3, r2] - ldrb r0, [r4, #0x1] - add r1, r3, r2 - strb r0, [r1, #0x1] - ldrb r0, [r4, #0x2] - strb r0, [r1, #0x2] - ldrb r0, [r4, #0x3] - strb r0, [r1, #0x3] -_0200ABA4: - ldr r1, [r5, #0x8] - lsl r0, r6, #0x3 - add r0, r1, r0 - ldr r0, [r0, #0x4] - add r1, r7, #0x0 - bl StringCopy -_0200ABB2: - pop {r3-r7, pc} - - thumb_func_start FUN_0200ABB4 -FUN_0200ABB4: ; 0x0200ABB4 - push {r3, lr} - mov r3, #0x0 - bl FUN_0200AB70 - pop {r3, pc} - .balign 4 - - thumb_func_start FUN_0200ABC0 -FUN_0200ABC0: ; 0x0200ABC0 - push {r3-r5, lr} - add r5, r0, #0x0 - add r0, r2, #0x0 - add r4, r1, #0x0 - bl PlayerProfile_GetNamePtr - add r1, r0, #0x0 - ldr r0, [r5, #0xc] - bl CopyU16ArrayToString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - pop {r3-r5, pc} - .balign 4 - - thumb_func_start FUN_0200ABE4 -FUN_0200ABE4: ; 0x0200ABE4 - push {r3-r5, lr} - add r5, r0, #0x0 - add r0, r2, #0x0 - add r4, r1, #0x0 - bl FUN_02024EC0 - bl FUN_02024EE8 - add r1, r0, #0x0 - ldr r0, [r5, #0xc] - bl CopyU16ArrayToString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - pop {r3-r5, pc} - .balign 4 - - thumb_func_start FUN_0200AC0C -FUN_0200AC0C: ; 0x0200AC0C - push {r3-r7, lr} - add r5, r0, #0x0 - add r0, r2, #0x0 - add r6, r1, #0x0 - bl Sav2_PlayerData_GetProfileAddr - add r7, r0, #0x0 - ldr r2, _0200AC5C ; =0x000001F1 - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r4, r0, #0x0 - add r0, r7, #0x0 - bl PlayerProfile_GetTrainerGender - cmp r0, #0x0 - bne _0200AC3E - ldr r2, [r5, #0xc] - add r0, r4, #0x0 - mov r1, #0x1 - bl ReadMsgDataIntoString - b _0200AC48 -_0200AC3E: - ldr r2, [r5, #0xc] - add r0, r4, #0x0 - mov r1, #0x0 - bl ReadMsgDataIntoString -_0200AC48: - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r6, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r4, #0x0 - bl DestroyMsgData - pop {r3-r7, pc} - .balign 4 -_0200AC5C: .word 0x000001F1 - - thumb_func_start FUN_0200AC60 -FUN_0200AC60: ; 0x0200AC60 - push {r3-r7, lr} - add r5, r0, #0x0 - add r7, r2, #0x0 - add r6, r1, #0x0 - ldr r2, _0200ACA0 ; =0x0000016A - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r4, r0, #0x0 - add r0, r7, #0x0 - mov r1, #0x5 - mov r2, #0x0 - bl GetBoxMonData - add r1, r0, #0x0 - ldr r2, [r5, #0xc] - add r0, r4, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r6, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r4, #0x0 - bl DestroyMsgData - pop {r3-r7, pc} - nop -_0200ACA0: .word 0x0000016A - - thumb_func_start FUN_0200ACA4 -FUN_0200ACA4: ; 0x0200ACA4 - push {r3-r5, lr} - add r5, r0, #0x0 - add r4, r1, #0x0 - add r0, r2, #0x0 - mov r1, #0x5 - mov r2, #0x0 - bl GetBoxMonData - add r2, r0, #0x0 - add r0, r5, #0x0 - add r1, r4, #0x0 - bl FUN_0200ACC0 - pop {r3-r5, pc} - - thumb_func_start FUN_0200ACC0 -FUN_0200ACC0: ; 0x0200ACC0 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - add r4, r1, #0x0 - ldr r2, _0200ACF4 ; =0x0000016B - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - add r7, r0, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData - pop {r3-r7, pc} - nop -_0200ACF4: .word 0x0000016B - - thumb_func_start FUN_0200ACF8 -FUN_0200ACF8: ; 0x0200ACF8 - push {r3-r5, lr} - add r5, r0, #0x0 - add r0, r2, #0x0 - add r4, r1, #0x0 - ldr r2, [r5, #0xc] - mov r1, #0x76 - bl GetBoxMonData - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - pop {r3-r5, pc} - .balign 4 - - thumb_func_start FUN_0200AD18 -FUN_0200AD18: ; 0x0200AD18 - push {r3-r5, lr} - add r5, r0, #0x0 - add r0, r2, #0x0 - add r4, r1, #0x0 - ldr r2, [r5, #0xc] - mov r1, #0x90 - bl GetBoxMonData - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - pop {r3-r5, pc} - .balign 4 - - thumb_func_start FUN_0200AD38 -FUN_0200AD38: ; 0x0200AD38 - push {r3-r5, lr} - add r5, r0, #0x0 - ldr r0, [sp, #0x14] - add r4, r1, #0x0 - str r0, [sp, #0x0] - add r1, r2, #0x0 - add r2, r3, #0x0 - ldr r0, [r5, #0xc] - ldr r3, [sp, #0x10] - bl String16_FormatInteger - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - pop {r3-r5, pc} - - thumb_func_start FUN_0200AD5C -FUN_0200AD5C: ; 0x0200AD5C - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - mov r2, #0x93 - add r4, r1, #0x0 - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - lsl r2, r2, #0x2 - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200AD90 - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200AD90: - pop {r3-r7, pc} - .balign 4 - - thumb_func_start GetRibbonNameOrDesc -GetRibbonNameOrDesc: ; 0x0200AD94 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - mov r2, #0x79 - add r4, r1, #0x0 - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - lsl r2, r2, #0x2 - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200ADC8 - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200ADC8: - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200ADCC -FUN_0200ADCC: ; 0x0200ADCC - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - mov r2, #0x8a - add r4, r1, #0x0 - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - lsl r2, r2, #0x2 - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200AE00 - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200AE00: - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200AE04 -FUN_0200AE04: ; 0x0200AE04 - push {r3-r7, lr} - add r5, r0, #0x0 - ldr r3, [r5, #0x4] - add r4, r1, #0x0 - add r6, r2, #0x0 - mov r0, #0x1 - mov r1, #0x1a - mov r2, #0xbe - bl NewMsgDataFromNarc - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - add r7, r0, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200AE38 -FUN_0200AE38: ; 0x0200AE38 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - mov r2, #0x56 - add r4, r1, #0x0 - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - lsl r2, r2, #0x2 - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200AE6C - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200AE6C: - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200AE70 -FUN_0200AE70: ; 0x0200AE70 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - add r4, r1, #0x0 - ldr r2, _0200AEA4 ; =0x0000015A - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200AEA2 - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200AEA2: - pop {r3-r7, pc} - .balign 4 -_0200AEA4: .word 0x0000015A - - thumb_func_start FUN_0200AEA8 -FUN_0200AEA8: ; 0x0200AEA8 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - add r4, r1, #0x0 - ldr r2, _0200AEDC ; =0x0000015B - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200AEDA - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200AEDA: - pop {r3-r7, pc} - .balign 4 -_0200AEDC: .word 0x0000015B - - thumb_func_start FUN_0200AEE0 -FUN_0200AEE0: ; 0x0200AEE0 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - add r4, r1, #0x0 - ldr r2, _0200AF14 ; =0x0000015D - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200AF12 - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200AF12: - pop {r3-r7, pc} - .balign 4 -_0200AF14: .word 0x0000015D - - thumb_func_start FUN_0200AF18 -FUN_0200AF18: ; 0x0200AF18 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - add r4, r1, #0x0 - ldr r2, _0200AF4C ; =0x00000235 - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200AF4A - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200AF4A: - pop {r3-r7, pc} - .balign 4 -_0200AF4C: .word 0x00000235 - - thumb_func_start FUN_0200AF50 -FUN_0200AF50: ; 0x0200AF50 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - add r4, r1, #0x0 - ldr r2, _0200AF84 ; =0x000001EF - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200AF82 - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200AF82: - pop {r3-r7, pc} - .balign 4 -_0200AF84: .word 0x000001EF - - thumb_func_start FUN_0200AF88 -FUN_0200AF88: ; 0x0200AF88 - push {r3-r7, lr} - add r5, r0, #0x0 - ldr r3, [r5, #0x4] - add r4, r1, #0x0 - add r6, r2, #0x0 - mov r0, #0x1 - mov r1, #0x1a - mov r2, #0xcd - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200AFBA - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200AFBA: - pop {r3-r7, pc} - - thumb_func_start FUN_0200AFBC -FUN_0200AFBC: ; 0x0200AFBC - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - mov r2, #0x89 - add r4, r1, #0x0 - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - lsl r2, r2, #0x2 - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200AFF0 - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200AFF0: - pop {r3-r7, pc} - .balign 4 - - thumb_func_start GetLandmarkName -GetLandmarkName: ; 0x0200AFF4 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - add r4, r1, #0x0 - ldr r2, _0200B028 ; =0x0000017E - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B026 - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B026: - pop {r3-r7, pc} - .balign 4 -_0200B028: .word 0x0000017E - - thumb_func_start FUN_0200B02C -FUN_0200B02C: ; 0x0200B02C - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - add r4, r1, #0x0 - ldr r2, _0200B060 ; =0x00000196 - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B05E - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B05E: - pop {r3-r7, pc} - .balign 4 -_0200B060: .word 0x00000196 - - thumb_func_start FUN_0200B064 -FUN_0200B064: ; 0x0200B064 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - mov r2, #0x23 - add r4, r1, #0x0 - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - lsl r2, r2, #0x4 - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B098 - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B098: - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200B09C -FUN_0200B09C: ; 0x0200B09C - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - add r4, r1, #0x0 - ldr r2, _0200B0D0 ; =0x00000231 - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B0CE - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B0CE: - pop {r3-r7, pc} - .balign 4 -_0200B0D0: .word 0x00000231 - - thumb_func_start FUN_0200B0D4 -FUN_0200B0D4: ; 0x0200B0D4 - push {r3-r7, lr} - add r5, r0, #0x0 - add r4, r2, #0x0 - mov r2, #0x23 - add r6, r1, #0x0 - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - lsl r2, r2, #0x4 - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B108 - ldrb r1, [r4, #0x1] - ldr r2, [r5, #0xc] - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r6, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B108: - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200B10C -FUN_0200B10C: ; 0x0200B10C - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - add r4, r1, #0x0 - ldr r2, _0200B140 ; =0x0000022F - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B13E - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B13E: - pop {r3-r7, pc} - .balign 4 -_0200B140: .word 0x0000022F - - thumb_func_start FUN_0200B144 -FUN_0200B144: ; 0x0200B144 - push {r3-r5, lr} - add r5, r0, #0x0 - ldr r0, [r5, #0xc] - add r2, #0x14 - add r4, r1, #0x0 - add r1, r2, #0x0 - bl CopyU16ArrayToString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - pop {r3-r5, pc} - .balign 4 - - thumb_func_start FUN_0200B164 -FUN_0200B164: ; 0x0200B164 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - add r4, r1, #0x0 - ldr r2, _0200B198 ; =0x00000239 - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B196 - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B196: - pop {r3-r7, pc} - .balign 4 -_0200B198: .word 0x00000239 - - thumb_func_start FUN_0200B19C -FUN_0200B19C: ; 0x0200B19C - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - add r4, r1, #0x0 - ldr r2, _0200B1D0 ; =0x0000023A - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B1CE - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B1CE: - pop {r3-r7, pc} - .balign 4 -_0200B1D0: .word 0x0000023A - - thumb_func_start FUN_0200B1D4 -FUN_0200B1D4: ; 0x0200B1D4 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - add r4, r1, #0x0 - ldr r2, _0200B208 ; =0x0000023B - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B206 - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B206: - pop {r3-r7, pc} - .balign 4 -_0200B208: .word 0x0000023B - - thumb_func_start FUN_0200B20C -FUN_0200B20C: ; 0x0200B20C - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - mov r2, #0x8f - add r4, r1, #0x0 - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - lsl r2, r2, #0x2 - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B240 - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B240: - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200B244 -FUN_0200B244: ; 0x0200B244 - push {r3-r7, lr} - add r5, r0, #0x0 - ldr r3, [r5, #0x4] - add r4, r1, #0x0 - add r6, r2, #0x0 - mov r0, #0x1 - mov r1, #0x1a - mov r2, #0xc2 - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B276 - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B276: - pop {r3-r7, pc} - - thumb_func_start FUN_0200B278 -FUN_0200B278: ; 0x0200B278 - push {r3-r7, lr} - add r5, r0, #0x0 - ldr r3, [r5, #0x4] - add r4, r1, #0x0 - add r6, r2, #0x0 - mov r0, #0x1 - mov r1, #0x1a - mov r2, #0xbf - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B2AA - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B2AA: - pop {r3-r7, pc} - - thumb_func_start FUN_0200B2AC -FUN_0200B2AC: ; 0x0200B2AC - push {r3-r7, lr} - add r5, r0, #0x0 - ldr r3, [r5, #0x4] - add r4, r1, #0x0 - add r6, r2, #0x0 - mov r0, #0x1 - mov r1, #0x1a - mov r2, #0xbf - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B2DE - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B2DE: - pop {r3-r7, pc} - - thumb_func_start FUN_0200B2E0 -FUN_0200B2E0: ; 0x0200B2E0 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - add r4, r1, #0x0 - ldr r2, _0200B314 ; =0x0000023E - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B312 - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B312: - pop {r3-r7, pc} - .balign 4 -_0200B314: .word 0x0000023E - - thumb_func_start FUN_0200B318 -FUN_0200B318: ; 0x0200B318 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - add r4, r1, #0x0 - ldr r2, _0200B34C ; =0x0000023D - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B34A - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B34A: - pop {r3-r7, pc} - .balign 4 -_0200B34C: .word 0x0000023D - - thumb_func_start FUN_0200B350 -FUN_0200B350: ; 0x0200B350 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - add r4, r1, #0x0 - ldr r2, _0200B384 ; =0x00000237 - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B382 - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B382: - pop {r3-r7, pc} - .balign 4 -_0200B384: .word 0x00000237 - - thumb_func_start FUN_0200B388 -FUN_0200B388: ; 0x0200B388 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - mov r2, #0x8e - add r4, r1, #0x0 - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - lsl r2, r2, #0x2 - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B3BC - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B3BC: - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200B3C0 -FUN_0200B3C0: ; 0x0200B3C0 - push {r3-r7, lr} - add r5, r0, #0x0 - ldr r3, [r5, #0x4] - add r6, r1, #0x0 - add r4, r2, #0x0 - mov r0, #0x1 - mov r1, #0x1a - mov r2, #0xc7 - bl NewMsgDataFromNarc - add r7, r0, #0x0 - cmp r4, #0x0 - beq _0200B3E0 - cmp r4, #0x1 - beq _0200B3EA - b _0200B3F4 -_0200B3E0: - ldr r2, [r5, #0xc] - mov r1, #0x44 - bl ReadMsgDataIntoString - b _0200B3FA -_0200B3EA: - ldr r2, [r5, #0xc] - mov r1, #0x45 - bl ReadMsgDataIntoString - b _0200B3FA -_0200B3F4: - ldr r0, [r5, #0xc] - bl StringSetEmpty -_0200B3FA: - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r6, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200B410 -FUN_0200B410: ; 0x0200B410 - push {r3-r5, lr} - add r5, r0, #0x0 - add r0, r2, #0x0 - add r4, r1, #0x0 - ldr r2, [r5, #0xc] - add r1, r3, #0x0 - bl PCStorage_GetBoxName - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - pop {r3-r5, pc} - .balign 4 - - thumb_func_start FUN_0200B430 -FUN_0200B430: ; 0x0200B430 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - add r4, r1, #0x0 - ldr r2, _0200B464 ; =0x0000014B - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B462 - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B462: - pop {r3-r7, pc} - .balign 4 -_0200B464: .word 0x0000014B - - thumb_func_start FUN_0200B468 -FUN_0200B468: ; 0x0200B468 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - add r4, r1, #0x0 - ldr r2, _0200B49C ; =0x00000226 - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B49A - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B49A: - pop {r3-r7, pc} - .balign 4 -_0200B49C: .word 0x00000226 - - thumb_func_start FUN_0200B4A0 -FUN_0200B4A0: ; 0x0200B4A0 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - mov r2, #0x99 - add r4, r1, #0x0 - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - lsl r2, r2, #0x2 - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B4D4 - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B4D4: - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200B4D8 -FUN_0200B4D8: ; 0x0200B4D8 - push {r3-r7, lr} - add r5, r0, #0x0 - add r0, r2, #0x0 - add r6, r1, #0x0 - add r4, r3, #0x0 - bl FUN_02088D40 - add r2, r0, #0x0 - beq _0200B516 - cmp r4, #0x0 - beq _0200B516 - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B516 - ldr r2, [r5, #0xc] - add r1, r4, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r6, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B516: - pop {r3-r7, pc} - - thumb_func_start FUN_0200B518 -FUN_0200B518: ; 0x0200B518 - push {r3-r5, lr} - add r5, r0, #0x0 - add r4, r1, #0x0 - ldr r1, [r5, #0xc] - add r0, r2, #0x0 - bl FUN_02013A58 - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - pop {r3-r5, pc} - - thumb_func_start FUN_0200B534 -FUN_0200B534: ; 0x0200B534 - push {r3-r7, lr} - add r5, r0, #0x0 - ldr r3, [r5, #0x4] - add r4, r1, #0x0 - add r6, r2, #0x0 - mov r0, #0x1 - mov r1, #0x1a - mov r2, #0xa - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B566 - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B566: - pop {r3-r7, pc} - - thumb_func_start FUN_0200B568 -FUN_0200B568: ; 0x0200B568 - push {r3-r7, lr} - add r5, r0, #0x0 - ldr r3, [r5, #0x4] - add r4, r1, #0x0 - add r6, r2, #0x0 - mov r0, #0x1 - mov r1, #0x1a - mov r2, #0xb - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B59A - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B59A: - pop {r3-r7, pc} - - thumb_func_start FUN_0200B59C -FUN_0200B59C: ; 0x0200B59C - push {r3-r7, lr} - add r4, r2, #0x0 - add r5, r0, #0x0 - add r0, r4, #0x0 - add r7, r1, #0x0 - bl FUN_02015CC0 - add r6, r0, #0x0 - add r0, r4, #0x0 - bl FUN_02015CE0 - add r4, r0, #0x0 - ldr r2, _0200B620 ; =UNK_020ECE64 - lsl r3, r6, #0x1 - ldrh r2, [r2, r3] - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r6, r0, #0x0 - beq _0200B61E - bl MsgDataGetCount - cmp r4, r0 - bhs _0200B5EE - ldr r2, [r5, #0xc] - add r0, r6, #0x0 - add r1, r4, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r7, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r6, #0x0 - bl DestroyMsgData - pop {r3-r7, pc} -_0200B5EE: - add r0, r6, #0x0 - bl DestroyMsgData - ldr r2, _0200B624 ; =0x0000017E - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r4, r0, #0x0 - beq _0200B61E - ldr r2, [r5, #0xc] - mov r1, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r7, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r4, #0x0 - bl DestroyMsgData -_0200B61E: - pop {r3-r7, pc} - .balign 4 -_0200B620: .word UNK_020ECE64 -_0200B624: .word 0x0000017E - - thumb_func_start FUN_0200B628 -FUN_0200B628: ; 0x0200B628 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - add r4, r1, #0x0 - ldr r2, _0200B65C ; =0x0000019E - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B65A - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B65A: - pop {r3-r7, pc} - .balign 4 -_0200B65C: .word 0x0000019E - - thumb_func_start FUN_0200B660 -FUN_0200B660: ; 0x0200B660 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - add r4, r1, #0x0 - ldr r2, _0200B694 ; =0x00000152 - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B692 - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B692: - pop {r3-r7, pc} - .balign 4 -_0200B694: .word 0x00000152 - - thumb_func_start FUN_0200B698 -FUN_0200B698: ; 0x0200B698 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - add r4, r1, #0x0 - ldr r2, _0200B6CC ; =0x00000153 - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B6CA - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B6CA: - pop {r3-r7, pc} - .balign 4 -_0200B6CC: .word 0x00000153 - - thumb_func_start FUN_0200B6D0 -FUN_0200B6D0: ; 0x0200B6D0 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r2, #0x0 - mov r2, #0x55 - add r4, r1, #0x0 - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - lsl r2, r2, #0x2 - bl NewMsgDataFromNarc - add r7, r0, #0x0 - beq _0200B704 - ldr r2, [r5, #0xc] - add r1, r6, #0x0 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r7, #0x0 - bl DestroyMsgData -_0200B704: - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200B708 -FUN_0200B708: ; 0x0200B708 - push {r4-r7, lr} - sub sp, #0x14 - str r0, [sp, #0x8] - add r5, r2, #0x0 - add r0, r1, #0x0 - str r3, [sp, #0xc] - bl FUN_0202881C - add r6, r0, #0x0 - add r1, r5, #0x0 - bl FUN_020287F8 - str r0, [sp, #0x10] - add r0, r6, #0x0 - add r1, r5, #0x0 - bl FUN_02028804 - add r7, r0, #0x0 - mov r0, #0x40 - mov r1, #0x4 - bl String_ctor - add r4, r0, #0x0 - ldr r2, [sp, #0x28] - add r0, r6, #0x0 - add r1, r5, #0x0 - bl FUN_020287A8 - add r1, r0, #0x0 - add r0, r4, #0x0 - bl CopyU16ArrayToString - mov r0, #0x1 - str r0, [sp, #0x0] - ldr r0, [sp, #0x8] - ldr r1, [sp, #0xc] - ldr r3, [sp, #0x10] - add r2, r4, #0x0 - str r7, [sp, #0x4] - bl FUN_0200ABB4 - add r0, r4, #0x0 - bl String_dtor - add sp, #0x14 - pop {r4-r7, pc} - - thumb_func_start FUN_0200B764 -FUN_0200B764: ; 0x0200B764 - push {r3-r7, lr} - add r5, r0, #0x0 - add r4, r2, #0x0 - mov r2, #0x5b - add r7, r1, #0x0 - ldr r3, [r5, #0x4] - mov r0, #0x1 - mov r1, #0x1a - lsl r2, r2, #0x2 - bl NewMsgDataFromNarc - add r6, r0, #0x0 - beq _0200B7A4 - cmp r4, #0x1 - blo _0200B786 - cmp r4, #0xc - bls _0200B788 -_0200B786: - mov r4, #0x1 -_0200B788: - ldr r2, [r5, #0xc] - add r0, r6, #0x0 - sub r1, r4, #0x1 - bl ReadMsgDataIntoString - ldr r2, [r5, #0xc] - add r0, r5, #0x0 - add r1, r7, #0x0 - mov r3, #0x0 - bl FUN_0200AB70 - add r0, r6, #0x0 - bl DestroyMsgData -_0200B7A4: - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200B7A8 -FUN_0200B7A8: ; 0x0200B7A8 - ldr r2, [r0, #0x8] - lsl r0, r1, #0x3 - add r0, r2, r0 - ldr r3, _0200B7B4 ; =StrUpperFirstChar - ldr r0, [r0, #0x4] - bx r3 - .balign 4 -_0200B7B4: .word StrUpperFirstChar - - thumb_func_start StringExpandPlaceholders -StringExpandPlaceholders: ; 0x0200B7B8 - push {r3-r7, lr} - add r7, r0, #0x0 - add r6, r1, #0x0 - add r0, r2, #0x0 - bl String_c_str - add r5, r0, #0x0 - add r0, r6, #0x0 - bl StringSetEmpty - ldrh r1, [r5, #0x0] - ldr r0, _0200B844 ; =0x0000FFFF - cmp r1, r0 - beq _0200B840 -_0200B7D4: - ldr r0, _0200B848 ; =0x0000FFFE - cmp r1, r0 - bne _0200B82E - add r0, r5, #0x0 - bl MsgArray_ControlCodeIsStrVar - cmp r0, #0x0 - beq _0200B810 - add r0, r5, #0x0 - mov r1, #0x0 - bl MsgArray_ControlCodeGetField - add r4, r0, #0x0 - ldr r0, [r7, #0x0] - cmp r4, r0 - blo _0200B7F8 - bl ErrorHandling -_0200B7F8: - ldr r2, [r7, #0x8] - lsl r1, r4, #0x3 - add r1, r2, r1 - ldr r1, [r1, #0x4] - add r0, r6, #0x0 - bl FUN_02022048 - add r0, r5, #0x0 - bl MsgArray_SkipControlCode - add r5, r0, #0x0 - b _0200B838 -_0200B810: - add r0, r5, #0x0 - add r4, r5, #0x0 - bl MsgArray_SkipControlCode - add r5, r0, #0x0 - cmp r4, r5 - bhs _0200B838 -_0200B81E: - ldrh r1, [r4, #0x0] - add r0, r6, #0x0 - add r4, r4, #0x2 - bl StrAddChar - cmp r4, r5 - blo _0200B81E - b _0200B838 -_0200B82E: - ldrh r1, [r5, #0x0] - add r0, r6, #0x0 - add r5, r5, #0x2 - bl StrAddChar -_0200B838: - ldrh r1, [r5, #0x0] - ldr r0, _0200B844 ; =0x0000FFFF - cmp r1, r0 - bne _0200B7D4 -_0200B840: - pop {r3-r7, pc} - nop -_0200B844: .word 0x0000FFFF -_0200B848: .word 0x0000FFFE - - thumb_func_start FUN_0200B84C -FUN_0200B84C: ; 0x0200B84C - push {r4-r6, lr} - add r5, r0, #0x0 - ldr r0, [r5, #0x0] - mov r6, #0x0 - cmp r0, #0x0 - bls _0200B86E - add r4, r6, #0x0 -_0200B85A: - ldr r0, [r5, #0x8] - add r0, r0, r4 - ldr r0, [r0, #0x4] - bl StringSetEmpty - ldr r0, [r5, #0x0] - add r6, r6, #0x1 - add r4, #0x8 - cmp r6, r0 - blo _0200B85A -_0200B86E: - pop {r4-r6, pc} - - thumb_func_start FUN_0200B870 -FUN_0200B870: ; 0x0200B870 - push {r4-r7, lr} - sub sp, #0x2c - add r4, r3, #0x0 - add r5, r0, #0x0 - add r6, r1, #0x0 - add r0, r4, #0x0 - mov r1, #0x2c - str r2, [sp, #0x4] - bl AllocFromHeap - str r0, [sp, #0x8] - cmp r0, #0x0 - beq _0200B98A - ldr r3, [sp, #0x8] - mov r0, #0xe - mov r1, #0x4 - mov r2, #0x1 - add r3, r3, #0x4 - str r4, [sp, #0x0] - bl FUN_02006BB0 - ldr r1, [sp, #0x8] - mov r3, #0x0 - str r0, [r1, #0x0] - add r0, r1, #0x0 - ldr r0, [r0, #0x4] - ldr r4, [r0, #0x14] - ldr r0, [r0, #0x10] - cmp r0, #0x0 - bls _0200B984 - ldr r0, [sp, #0x4] - ldr r1, [sp, #0x4] - lsl r0, r0, #0x4 - orr r1, r0 - str r1, [sp, #0xc] - add r1, r0, #0x0 - orr r1, r5 - str r1, [sp, #0x10] - orr r0, r6 - str r0, [sp, #0x14] - ldr r1, [sp, #0x4] - lsl r0, r5, #0x4 - orr r1, r0 - str r1, [sp, #0x18] - add r1, r5, #0x0 - orr r1, r0 - str r1, [sp, #0x1c] - orr r0, r6 - lsl r2, r6, #0x4 - lsl r0, r0, #0x18 - lsr r0, r0, #0x18 - str r0, [sp, #0x20] - ldr r0, [sp, #0x1c] - ldr r1, [sp, #0x4] - add r7, r2, #0x0 - orr r7, r1 - add r1, r2, #0x0 - orr r1, r5 - lsl r1, r1, #0x18 - lsr r1, r1, #0x18 - orr r2, r6 - str r1, [sp, #0x28] - lsl r1, r7, #0x18 - lsl r0, r0, #0x18 - lsr r7, r0, #0x18 - ldr r0, [sp, #0x18] - lsl r2, r2, #0x18 - lsr r2, r2, #0x18 - lsr r1, r1, #0x18 - lsl r0, r0, #0x18 - mov r12, r2 - str r1, [sp, #0x24] - lsr r6, r0, #0x18 - ldr r0, [sp, #0x14] - ldr r1, [sp, #0x10] - ldr r2, [sp, #0xc] - lsl r0, r0, #0x18 - lsl r1, r1, #0x18 - lsl r2, r2, #0x18 - lsr r0, r0, #0x18 - lsr r1, r1, #0x18 - lsr r2, r2, #0x18 -_0200B914: - ldrb r5, [r4, r3] - cmp r5, #0x12 - bgt _0200B93C - bge _0200B962 - cmp r5, #0x10 - bgt _0200B936 - bge _0200B95A - cmp r5, #0x2 - bgt _0200B978 - cmp r5, #0x0 - blt _0200B978 - beq _0200B94E - cmp r5, #0x1 - beq _0200B952 - cmp r5, #0x2 - beq _0200B956 - b _0200B978 -_0200B936: - cmp r5, #0x11 - beq _0200B95E - b _0200B978 -_0200B93C: - cmp r5, #0x21 - bgt _0200B948 - bge _0200B96E - cmp r5, #0x20 - beq _0200B968 - b _0200B978 -_0200B948: - cmp r5, #0x22 - beq _0200B974 - b _0200B978 -_0200B94E: - strb r2, [r4, r3] - b _0200B978 -_0200B952: - strb r1, [r4, r3] - b _0200B978 -_0200B956: - strb r0, [r4, r3] - b _0200B978 -_0200B95A: - strb r6, [r4, r3] - b _0200B978 -_0200B95E: - strb r7, [r4, r3] - b _0200B978 -_0200B962: - ldr r5, [sp, #0x20] - strb r5, [r4, r3] - b _0200B978 -_0200B968: - ldr r5, [sp, #0x24] - strb r5, [r4, r3] - b _0200B978 -_0200B96E: - ldr r5, [sp, #0x28] - strb r5, [r4, r3] - b _0200B978 -_0200B974: - mov r5, r12 - strb r5, [r4, r3] -_0200B978: - ldr r5, [sp, #0x8] - add r3, r3, #0x1 - ldr r5, [r5, #0x4] - ldr r5, [r5, #0x10] - cmp r3, r5 - blo _0200B914 -_0200B984: - ldr r1, [sp, #0x4] - ldr r0, [sp, #0x8] - str r1, [r0, #0x28] -_0200B98A: - ldr r0, [sp, #0x8] - add sp, #0x2c - pop {r4-r7, pc} - - thumb_func_start FUN_0200B990 -FUN_0200B990: ; 0x0200B990 - push {r4, lr} - add r4, r0, #0x0 - beq _0200B9A6 - ldr r0, [r4, #0x0] - cmp r0, #0x0 - beq _0200B9A0 - bl FreeToHeap -_0200B9A0: - add r0, r4, #0x0 - bl FreeToHeap -_0200B9A6: - pop {r4, pc} - - thumb_func_start FUN_0200B9A8 -FUN_0200B9A8: ; 0x0200B9A8 - push {r3-r5, lr} - sub sp, #0x18 - add r4, r0, #0x0 - ldr r0, _0200B9E4 ; =UNK_020ECE6C + 2 - lsl r5, r1, #0x2 - ldrh r1, [r0, r5] - lsl r3, r3, #0x10 - mov r0, #0x8 - str r1, [sp, #0x0] - str r0, [sp, #0x4] - lsr r3, r3, #0x10 - str r3, [sp, #0x8] - ldr r3, [sp, #0x28] - lsl r3, r3, #0x10 - lsr r3, r3, #0x10 - str r3, [sp, #0xc] - str r1, [sp, #0x10] - str r0, [sp, #0x14] - ldr r1, [r4, #0x4] - add r0, r2, #0x0 - ldr r2, [r1, #0x14] - ldr r1, _0200B9E8 ; =UNK_020ECE6C - ldrh r1, [r1, r5] - add r1, r2, r1 - mov r2, #0x0 - add r3, r2, #0x0 - bl FUN_02019658 - add sp, #0x18 - pop {r3-r5, pc} - .balign 4 -_0200B9E4: .word UNK_020ECE6C + 2 -_0200B9E8: .word UNK_020ECE6C - - thumb_func_start FUN_0200B9EC -FUN_0200B9EC: ; 0x0200B9EC - push {r3-r7, lr} - sub sp, #0x18 - add r6, r0, #0x0 - ldr r0, [sp, #0x30] - add r4, r2, #0x0 - str r0, [sp, #0x30] - add r0, r6, #0x0 - add r2, r3, #0x0 - add r0, #0x8 - add r3, r4, #0x0 - ldr r5, [sp, #0x34] - ldr r7, [sp, #0x38] - bl ConvertUIntToDecimalString - ldrh r1, [r6, #0x8] - ldr r0, _0200BA74 ; =0x0000FFFF - cmp r1, r0 - beq _0200BA6E - lsl r0, r7, #0x10 - add r4, r6, #0x0 - lsr r7, r0, #0x10 -_0200BA16: - ldrh r2, [r4, #0x8] - cmp r2, #0xa2 - blo _0200BA4A - cmp r2, #0xab - bhi _0200BA4A - mov r0, #0x8 - str r0, [sp, #0x0] - str r0, [sp, #0x4] - lsl r0, r5, #0x10 - lsr r0, r0, #0x10 - str r0, [sp, #0x8] - str r7, [sp, #0xc] - mov r0, #0x8 - str r0, [sp, #0x10] - str r0, [sp, #0x14] - ldr r1, [r6, #0x4] - sub r2, #0xa2 - ldr r1, [r1, #0x14] - lsl r2, r2, #0x5 - add r1, r1, r2 - mov r2, #0x0 - ldr r0, [sp, #0x30] - add r3, r2, #0x0 - bl FUN_02019658 - b _0200BA62 -_0200BA4A: - mov r0, #0x8 - str r0, [sp, #0x0] - str r0, [sp, #0x4] - ldr r1, [r6, #0x28] - lsl r2, r5, #0x10 - lsl r1, r1, #0x18 - ldr r0, [sp, #0x30] - lsr r1, r1, #0x18 - lsr r2, r2, #0x10 - add r3, r7, #0x0 - bl FUN_020196F4 -_0200BA62: - add r4, r4, #0x2 - ldrh r1, [r4, #0x8] - ldr r0, _0200BA74 ; =0x0000FFFF - add r5, #0x8 - cmp r1, r0 - bne _0200BA16 -_0200BA6E: - add sp, #0x18 - pop {r3-r7, pc} - nop -_0200BA74: .word 0x0000FFFF diff --git a/arm9/asm/unk_02013724.s b/arm9/asm/unk_02013724.s index 1cbd1070..b36fa660 100644 --- a/arm9/asm/unk_02013724.s +++ b/arm9/asm/unk_02013724.s @@ -135,7 +135,7 @@ FUN_020137D4: ; 0x020137D4 str r0, [sp, #0x0] add r0, r1, #0x0 str r1, [sp, #0x4] - bl FUN_0200AA80 + bl ScrStrBufs_new ldr r5, [sp, #0x0] ldr r7, _02013838 ; =0x0000FFFF add r6, r0, #0x0 @@ -172,7 +172,7 @@ _02013800: add r0, r5, #0x0 bl DestroyMsgData add r0, r6, #0x0 - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r4, #0x0 add sp, #0x8 pop {r3-r7, pc} diff --git a/arm9/asm/unk_020139D8.s b/arm9/asm/unk_020139D8.s index 45d3119d..afc8a077 100644 --- a/arm9/asm/unk_020139D8.s +++ b/arm9/asm/unk_020139D8.s @@ -66,8 +66,8 @@ UNK_020ED5C0: ; 0x020ED5C0 .global UNK_020ED5D6 UNK_020ED5D6: ; 0x020ED5D6 - .byte 0xF0, 0x01, 0xD4, 0x01, 0x12, 0x00, 0x7C, 0x00, 0x26, 0x00, 0x26, 0x00, 0x6B, 0x00, 0x68, 0x00 - .byte 0x2F, 0x00, 0x20, 0x00, 0x17, 0x00 + .short 0x01F0, 0x01D4, 0x0012, 0x007C, 0x0026, 0x0026, 0x006B, 0x0068 + .short 0x002F, 0x0020, 0x0017 .global UNK_020ED5EC UNK_020ED5EC: ; 0x020ED5EC diff --git a/arm9/asm/unk_02015EA0.s b/arm9/asm/unk_02015EA0.s deleted file mode 100644 index 047d2a6b..00000000 --- a/arm9/asm/unk_02015EA0.s +++ /dev/null @@ -1,1099 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .section .rodata - - .global UNK_020EDB10 -UNK_020EDB10: ; 0x020EDB10 - .byte 0x00, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00 - - .section .bss - - .global gMain -gMain: ; 0x021C48B8 - .space 0x40 - - .global UNK_021C48F8 -UNK_021C48F8: ; 0x021C48F8 - .space 0x20 - - .global gUnk021C4918 -gUnk021C4918: ; 0x021C4918 - .space 0x10 - - .global UNK_021C4928 -UNK_021C4928: ; 0x021C4928 - .space 0x4 - - .global UNK_021C492C -UNK_021C492C: ; 0x021C492C - .space 0x3f4 - - .global UNK_021C4D20 -UNK_021C4D20: ; 0x021C4D20 - .space 0x8 - - .text - - thumb_func_start FUN_02015EA0 -FUN_02015EA0: ; 0x02015EA0 - push {r3, lr} - ldr r3, _02015EC8 ; =0x027E0000 - ldr r1, _02015ECC ; =0x00003FF8 - mov r0, #0x1 - ldr r2, [r3, r1] - orr r0, r2 - str r0, [r3, r1] - mov r0, #0x3 - bl MI_WaitDma - ldr r0, _02015ED0 ; =gMain - ldr r0, [r0, #0x1c] - bl FUN_0201B5CC - ldr r0, _02015ED0 ; =gMain - ldr r1, [r0, #0x30] - add r1, r1, #0x1 - str r1, [r0, #0x30] - pop {r3, pc} - nop -_02015EC8: .word 0x027E0000 -_02015ECC: .word 0x00003FF8 -_02015ED0: .word gMain - - thumb_func_start FUN_02015ED4 -FUN_02015ED4: ; 0x02015ED4 - ldr r3, _02015EE8 ; =0x027E0000 - ldr r1, _02015EEC ; =0x00003FF8 - mov r0, #0x1 - ldr r2, [r3, r1] - orr r0, r2 - str r0, [r3, r1] - ldr r3, _02015EF0 ; =MI_WaitDma - mov r0, #0x3 - bx r3 - nop -_02015EE8: .word 0x027E0000 -_02015EEC: .word 0x00003FF8 -_02015EF0: .word MI_WaitDma - - thumb_func_start FUN_02015EF4 -FUN_02015EF4: ; 0x02015EF4 - push {r3, lr} - mov r0, #0x1 - bl OS_DisableIrqMask - ldr r1, _02015F0C ; =FUN_02015ED4 - mov r0, #0x1 - bl OS_SetIrqFunction - mov r0, #0x1 - bl OS_EnableIrqMask - pop {r3, pc} - .balign 4 -_02015F0C: .word FUN_02015ED4 - - thumb_func_start FUN_02015F10 -FUN_02015F10: ; 0x02015F10 - ldr r2, _02015F18 ; =gMain - str r0, [r2, #0x0] - str r1, [r2, #0x4] - bx lr - .balign 4 -_02015F18: .word gMain - - thumb_func_start FUN_02015F1C -FUN_02015F1C: ; 0x02015F1C - push {r3, lr} - mov r0, #0x0 - bl FUN_02015F80 - ldr r0, _02015F30 ; =gMain - mov r1, #0x0 - str r1, [r0, #0x8] - str r1, [r0, #0xc] - pop {r3, pc} - nop -_02015F30: .word gMain - - thumb_func_start FUN_02015F34 -FUN_02015F34: ; 0x02015F34 - push {r3, lr} - cmp r0, #0x0 - bne _02015F4C - mov r0, #0x0 - bl FUN_02015F80 - ldr r0, _02015F68 ; =gMain - mov r1, #0x0 - str r1, [r0, #0x8] - str r1, [r0, #0xc] - mov r0, #0x1 - pop {r3, pc} -_02015F4C: - ldr r2, _02015F68 ; =gMain - ldr r3, [r2, #0x8] - cmp r3, #0x0 - bne _02015F62 - str r1, [r2, #0xc] - str r0, [r2, #0x8] - mov r0, #0x1 - bl FUN_02015F80 - mov r0, #0x1 - pop {r3, pc} -_02015F62: - mov r0, #0x0 - pop {r3, pc} - nop -_02015F68: .word gMain - - thumb_func_start FUN_02015F6C -FUN_02015F6C: ; 0x02015F6C - push {r3, lr} - ldr r0, _02015F7C ; =gMain - ldr r1, [r0, #0x8] - cmp r1, #0x0 - beq _02015F7A - ldr r0, [r0, #0xc] - blx r1 -_02015F7A: - pop {r3, pc} - .balign 4 -_02015F7C: .word gMain - - thumb_func_start FUN_02015F80 -FUN_02015F80: ; 0x02015F80 - push {r3, lr} - ldr r2, _02015FC0 ; =0x04000208 - ldrh r1, [r2, #0x0] - mov r1, #0x0 - strh r1, [r2, #0x0] - cmp r0, #0x0 - bne _02015F9E - ldr r0, [r2, #0x8] - mov r0, #0x2 - bl OS_DisableIrqMask - mov r0, #0x0 - bl GX_HBlankIntr - b _02015FB4 -_02015F9E: - ldr r0, [r2, #0x8] - ldr r1, _02015FC4 ; =FUN_02015F6C - mov r0, #0x2 - bl OS_SetIrqFunction - mov r0, #0x2 - bl OS_EnableIrqMask - mov r0, #0x1 - bl GX_HBlankIntr -_02015FB4: - ldr r1, _02015FC0 ; =0x04000208 - ldrh r0, [r1, #0x0] - mov r0, #0x1 - strh r0, [r1, #0x0] - pop {r3, pc} - nop -_02015FC0: .word 0x04000208 -_02015FC4: .word FUN_02015F6C - - thumb_func_start FUN_02015FC8 -FUN_02015FC8: ; 0x02015FC8 - push {r3, lr} - sub sp, #0x30 - add r0, sp, #0x10 - bl OS_GetLowEntropyData - add r0, sp, #0x0 - add r1, sp, #0x10 - mov r2, #0x20 - bl MATH_CalcMD5 - mov r3, #0x0 - add r1, r3, #0x0 - add r2, sp, #0x0 -_02015FE2: - ldrb r0, [r2, #0x0] - add r1, r1, #0x1 - add r2, r2, #0x1 - add r3, r3, r0 - cmp r1, #0x10 - blo _02015FE2 - lsl r0, r3, #0x18 - lsr r3, r0, #0x18 - mov r0, #0x3 - tst r0, r3 - beq _02016002 - mov r0, #0x3 -_02015FFA: - add r3, r3, #0x1 - add r1, r3, #0x0 - tst r1, r0 - bne _02015FFA -_02016002: - ldr r0, _02016010 ; =UNK_020EDB10 - mov r1, #0x4 - mov r2, #0x5c - bl FUN_020166C8 - add sp, #0x30 - pop {r3, pc} - .balign 4 -_02016010: .word UNK_020EDB10 - - thumb_func_start InitSystemForTheGame -InitSystemForTheGame: ; 0x02016014 - push {r3-r5, lr} - bl OS_Init - bl FX_Init - ldr r2, _02016124 ; =0x04000304 - ldr r0, _02016128 ; =0xFFFFFDF1 - ldrh r1, [r2, #0x0] - and r1, r0 - ldr r0, _0201612C ; =0x0000020E - orr r0, r1 - strh r0, [r2, #0x0] - bl GX_Init - bl OS_InitTick - bl FUN_02015FC8 - mov r0, #0xa0 - bl FUN_0201B578 - add r1, r0, #0x0 - mov r0, #0x0 - mov r2, #0x4 - bl OS_AllocFromArenaLo - add r1, r0, #0x0 - mov r0, #0xa0 - bl FUN_0201B580 - ldr r1, _02016130 ; =gMain - str r0, [r1, #0x18] - mov r0, #0x10 - bl FUN_0201B578 - add r1, r0, #0x0 - mov r0, #0x0 - mov r2, #0x4 - bl OS_AllocFromArenaLo - add r1, r0, #0x0 - mov r0, #0x10 - bl FUN_0201B580 - ldr r1, _02016130 ; =gMain - str r0, [r1, #0x1c] - mov r0, #0x20 - bl FUN_0201B578 - add r1, r0, #0x0 - mov r0, #0x0 - mov r2, #0x4 - bl OS_AllocFromArenaLo - add r1, r0, #0x0 - mov r0, #0x20 - bl FUN_0201B580 - ldr r1, _02016130 ; =gMain - str r0, [r1, #0x20] - mov r0, #0x4 - bl FUN_0201B578 - add r1, r0, #0x0 - mov r0, #0x0 - mov r2, #0x4 - bl OS_AllocFromArenaLo - add r1, r0, #0x0 - mov r0, #0x4 - bl FUN_0201B580 - ldr r1, _02016130 ; =gMain - str r0, [r1, #0x24] - bl GX_DispOff - ldr r2, _02016134 ; =0x04001000 - ldr r0, _02016138 ; =0xFFFEFFFF - ldr r1, [r2, #0x0] - and r0, r1 - str r0, [r2, #0x0] - ldr r2, _02016124 ; =0x04000304 - ldrh r1, [r2, #0x0] - lsr r0, r2, #0xb - orr r0, r1 - strh r0, [r2, #0x0] - ldr r1, _0201613C ; =FUN_02015EA0 - mov r0, #0x1 - bl OS_SetIrqFunction - mov r0, #0x1 - bl OS_EnableIrqMask - mov r0, #0x1 - lsl r0, r0, #0x12 - bl OS_EnableIrqMask - ldr r1, _02016140 ; =0x04000208 - ldrh r0, [r1, #0x0] - mov r0, #0x1 - strh r0, [r1, #0x0] - bl GX_VBlankIntr - mov r0, #0x1 - bl FS_Init - bl FUN_02022450 - mov r0, #0x0 - add r1, r0, #0x0 - bl FS_TryLoadTable - add r4, r0, #0x0 - mov r0, #0x0 - add r1, r4, #0x0 - mov r2, #0x4 - bl OS_AllocFromArenaLo - add r5, r0, #0x0 - bne _02016108 - bl ErrorHandling -_02016108: - add r0, r5, #0x0 - add r1, r4, #0x0 - bl FS_TryLoadTable - ldr r0, _02016130 ; =gMain - mov r1, #0x0 - str r1, [r0, #0x0] - str r1, [r0, #0x8] - str r1, [r0, #0x10] - str r1, [r0, #0x14] - str r1, [r0, #0x2c] - ldr r0, _02016144 ; =gUnk021C4918 - strb r1, [r0, #0x5] - pop {r3-r5, pc} - .balign 4 -_02016124: .word 0x04000304 -_02016128: .word 0xFFFFFDF1 -_0201612C: .word 0x0000020E -_02016130: .word gMain -_02016134: .word 0x04001000 -_02016138: .word 0xFFFEFFFF -_0201613C: .word FUN_02015EA0 -_02016140: .word 0x04000208 -_02016144: .word gUnk021C4918 - - thumb_func_start InitGraphicMemory -InitGraphicMemory: ; 0x02016148 - push {r3, lr} - ldr r0, _02016198 ; =0x000001FF - bl GX_SetBankForLCDC - mov r1, #0x1a - mov r2, #0x29 - mov r0, #0x0 - lsl r1, r1, #0x16 - lsl r2, r2, #0xe - bl MIi_CpuClearFast - bl GX_DisableBankForLCDC - mov r1, #0x7 - mov r2, #0x1 - mov r0, #0xc0 - lsl r1, r1, #0x18 - lsl r2, r2, #0xa - bl MIi_CpuClearFast - mov r2, #0x1 - ldr r1, _0201619C ; =0x07000400 - mov r0, #0xc0 - lsl r2, r2, #0xa - bl MIi_CpuClearFast - mov r1, #0x5 - mov r2, #0x1 - mov r0, #0x0 - lsl r1, r1, #0x18 - lsl r2, r2, #0xa - bl MIi_CpuClearFast - mov r2, #0x1 - ldr r1, _020161A0 ; =0x05000400 - mov r0, #0x0 - lsl r2, r2, #0xa - bl MIi_CpuClearFast - pop {r3, pc} - .balign 4 -_02016198: .word 0x000001FF -_0201619C: .word 0x07000400 -_020161A0: .word 0x05000400 - - thumb_func_start FUN_020161A4 -FUN_020161A4: ; 0x020161A4 - push {r4-r6, lr} - sub sp, #0x48 - add r6, r0, #0x0 - add r4, r1, #0x0 - add r0, sp, #0x0 - bl FS_InitFile - add r0, sp, #0x0 - add r1, r4, #0x0 - bl FS_OpenFile - cmp r0, #0x0 - beq _020161F0 - ldr r1, [sp, #0x28] - ldr r0, [sp, #0x24] - sub r5, r1, r0 - add r0, r6, #0x0 - add r1, r5, #0x0 - bl AllocFromHeap - add r4, r0, #0x0 - beq _020161E8 - add r0, sp, #0x0 - add r1, r4, #0x0 - add r2, r5, #0x0 - bl FS_ReadFile - cmp r5, r0 - beq _020161E8 - add r0, r6, #0x0 - add r1, r4, #0x0 - bl FUN_02016A8C - mov r4, #0x0 -_020161E8: - add r0, sp, #0x0 - bl FS_CloseFile - b _020161F2 -_020161F0: - mov r4, #0x0 -_020161F2: - add r0, r4, #0x0 - add sp, #0x48 - pop {r4-r6, pc} - - thumb_func_start FUN_020161F8 -FUN_020161F8: ; 0x020161F8 - push {r3-r5, lr} - sub sp, #0x48 - add r5, r0, #0x0 - add r0, sp, #0x0 - add r4, r1, #0x0 - bl FS_InitFile - add r0, sp, #0x0 - add r1, r5, #0x0 - bl FS_OpenFile - cmp r0, #0x0 - beq _0201622A - ldr r1, [sp, #0x28] - ldr r0, [sp, #0x24] - sub r2, r1, r0 - ldr r1, [r4, #0x0] - cmp r1, #0x0 - beq _02016224 - add r0, sp, #0x0 - bl FS_ReadFile -_02016224: - add r0, sp, #0x0 - bl FS_CloseFile -_0201622A: - add sp, #0x48 - pop {r3-r5, pc} - .balign 4 - - thumb_func_start FUN_02016230 -FUN_02016230: ; 0x02016230 - push {r3-r7, lr} - sub sp, #0x8 - str r0, [sp, #0x0] - bl strlen - lsl r0, r0, #0x10 - lsr r3, r0, #0x10 - lsr r2, r3, #0x1f - lsl r1, r3, #0x1e - sub r1, r1, r2 - mov r0, #0x1e - ror r1, r0 - add r0, r2, r1 - beq _02016258 - lsr r0, r3, #0x2 - add r0, r0, #0x1 - lsl r0, r0, #0x10 - lsr r0, r0, #0x10 - str r0, [sp, #0x4] - b _0201625E -_02016258: - lsl r0, r3, #0xe - lsr r0, r0, #0x10 - str r0, [sp, #0x4] -_0201625E: - ldr r0, [sp, #0x4] - mov r7, #0x0 - mov r12, r7 - cmp r0, #0x0 - ble _0201629A - add r6, r7, #0x0 - add r4, r7, #0x0 -_0201626C: - ldr r2, [sp, #0x0] - mov r1, #0x0 - add r0, r1, #0x0 - add r2, r2, r6 - add r3, r1, #0x0 -_02016276: - ldrsb r5, [r2, r4] - cmp r5, #0x0 - beq _0201628A - lsl r5, r3 - add r0, r0, #0x1 - orr r1, r5 - add r2, r2, #0x1 - add r3, #0x8 - cmp r0, #0x4 - blt _02016276 -_0201628A: - mov r0, r12 - eor r7, r1 - add r1, r0, #0x1 - ldr r0, [sp, #0x4] - add r6, r6, #0x4 - mov r12, r1 - cmp r1, r0 - blt _0201626C -_0201629A: - add r0, r7, #0x0 - add sp, #0x8 - pop {r3-r7, pc} - - thumb_func_start FUN_020162A0 -FUN_020162A0: ; 0x020162A0 - ldr r3, _020162C4 ; =UNK_021C4928 - mov r2, #0x0 -_020162A4: - ldr r1, [r3, #0x4] - cmp r0, r1 - bne _020162B4 - ldr r1, [r3, #0x0] - cmp r1, #0x0 - beq _020162B4 - add r0, r2, #0x0 - bx lr -_020162B4: - add r2, r2, #0x1 - add r3, #0x8 - cmp r2, #0x80 - blt _020162A4 - mov r0, #0x0 - mvn r0, r0 - bx lr - nop -_020162C4: .word UNK_021C4928 - - thumb_func_start FUN_020162C8 -FUN_020162C8: ; 0x020162C8 - push {r3-r4} - ldr r3, _020162F4 ; =UNK_021C4928 - mov r4, #0x0 -_020162CE: - ldr r2, [r3, #0x0] - cmp r2, #0x0 - bne _020162E4 - ldr r2, _020162F4 ; =UNK_021C4928 - lsl r3, r4, #0x3 - str r0, [r2, r3] - ldr r0, _020162F8 ; =UNK_021C492C - str r1, [r0, r3] - add r0, r4, #0x0 - pop {r3-r4} - bx lr -_020162E4: - add r4, r4, #0x1 - add r3, #0x8 - cmp r4, #0x80 - blt _020162CE - mov r0, #0x0 - mvn r0, r0 - pop {r3-r4} - bx lr - .balign 4 -_020162F4: .word UNK_021C4928 -_020162F8: .word UNK_021C492C - - thumb_func_start FUN_020162FC -FUN_020162FC: ; 0x020162FC - push {r3-r7, lr} - mov r6, #0x0 - ldr r5, _02016320 ; =UNK_021C4D20 - mov r4, #0x7f - sub r7, r6, #0x1 -_02016306: - ldr r0, [r5, #0x0] - cmp r0, #0x0 - beq _02016314 - bl FreeToHeap - str r6, [r5, #0x0] - str r6, [r5, #0x4] -_02016314: - sub r4, r4, #0x1 - sub r5, #0x8 - cmp r4, r7 - bgt _02016306 - pop {r3-r7, pc} - nop -_02016320: .word UNK_021C4D20 - - thumb_func_start FUN_02016324 -FUN_02016324: ; 0x02016324 - push {r3-r7, lr} - sub sp, #0x68 - add r2, r0, #0x0 - mov r5, #0x0 - ldrsb r0, [r2, r5] - add r4, r1, #0x0 - cmp r0, #0x21 - add r0, sp, #0x0 - bne _02016340 - add r1, r2, #0x1 - bl strcpy - mov r5, #0x1 - b _02016346 -_02016340: - add r1, r2, #0x0 - bl strcpy -_02016346: - add r0, sp, #0x0 - bl FUN_02016230 - add r7, r0, #0x0 - bl FUN_020162A0 - cmp r0, #0x0 - blt _02016362 - cmp r5, #0x0 - bne _02016362 - lsl r1, r0, #0x3 - ldr r0, _020163B8 ; =UNK_021C4928 - ldr r4, [r0, r1] - b _020163B2 -_02016362: - add r0, sp, #0x20 - bl FS_InitFile - add r0, sp, #0x20 - add r1, sp, #0x0 - bl FS_OpenFile - cmp r0, #0x0 - beq _020163B0 - ldr r1, [sp, #0x48] - ldr r0, [sp, #0x44] - sub r6, r1, r0 - add r0, r4, #0x0 - add r1, r6, #0x0 - bl AllocFromHeap - add r4, r0, #0x0 - beq _0201639C - add r0, sp, #0x20 - add r1, r4, #0x0 - add r2, r6, #0x0 - bl FS_ReadFile - cmp r6, r0 - beq _0201639C - add r0, r4, #0x0 - bl FreeToHeap - mov r4, #0x0 -_0201639C: - add r0, sp, #0x20 - bl FS_CloseFile - cmp r5, #0x0 - bne _020163B2 - add r0, r4, #0x0 - add r1, r7, #0x0 - bl FUN_020162C8 - b _020163B2 -_020163B0: - mov r4, #0x0 -_020163B2: - add r0, r4, #0x0 - add sp, #0x68 - pop {r3-r7, pc} - .balign 4 -_020163B8: .word UNK_021C4928 - - thumb_func_start FUN_020163BC -FUN_020163BC: ; 0x020163BC - push {r3, lr} - sub sp, #0x8 - ldr r0, _0201641C ; =gMain - mov r2, #0x0 - str r2, [r0, #0x34] - str r2, [r0, #0x38] - str r2, [r0, #0x3c] - str r2, [r0, #0x40] - str r2, [r0, #0x44] - str r2, [r0, #0x48] - str r2, [r0, #0x4c] - str r2, [r0, #0x50] - mov r1, #0x8 - str r1, [r0, #0x54] - mov r1, #0xf - str r1, [r0, #0x58] - ldr r0, _02016420 ; =UNK_021C48F8 - strh r2, [r0, #0x1c] - strh r2, [r0, #0x1e] - strh r2, [r0, #0x20] - strh r2, [r0, #0x22] - ldr r0, _02016424 ; =gUnk021C4918 - strb r2, [r0, #0x4] - bl TP_Init - add r0, sp, #0x0 - bl TP_GetUserInfo - cmp r0, #0x1 - add r0, sp, #0x0 - bne _02016402 - bl TP_SetCalibrateParam - add sp, #0x8 - pop {r3, pc} -_02016402: - ldr r1, _02016428 ; =0x000002AE - strh r1, [r0, #0x0] - ldr r1, _0201642C ; =0x0000058C - strh r1, [r0, #0x2] - ldr r1, _02016430 ; =0x00000E25 - strh r1, [r0, #0x4] - ldr r1, _02016434 ; =0x00001208 - strh r1, [r0, #0x6] - add r0, sp, #0x0 - bl TP_SetCalibrateParam - add sp, #0x8 - pop {r3, pc} - .balign 4 -_0201641C: .word gMain -_02016420: .word UNK_021C48F8 -_02016424: .word gUnk021C4918 -_02016428: .word 0x000002AE -_0201642C: .word 0x0000058C -_02016430: .word 0x00000E25 -_02016434: .word 0x00001208 - - thumb_func_start FUN_02016438 -FUN_02016438: ; 0x02016438 - ldr r1, _02016440 ; =gUnk021C4918 - strb r0, [r1, #0x6] - bx lr - nop -_02016440: .word gUnk021C4918 - - thumb_func_start FUN_02016444 -FUN_02016444: ; 0x02016444 - ldr r1, _02016450 ; =gUnk021C4918 - ldrb r2, [r1, #0x7] - orr r0, r2 - strb r0, [r1, #0x7] - bx lr - nop -_02016450: .word gUnk021C4918 - - thumb_func_start FUN_02016454 -FUN_02016454: ; 0x02016454 - ldr r1, _02016460 ; =gUnk021C4918 - mvn r0, r0 - ldrb r2, [r1, #0x7] - and r0, r2 - strb r0, [r1, #0x7] - bx lr - .balign 4 -_02016460: .word gUnk021C4918 - - thumb_func_start FUN_02016464 -FUN_02016464: ; 0x02016464 - push {r4, lr} - sub sp, #0x10 - ldr r2, _02016550 ; =0x027FFFA8 - mov r0, #0x2 - ldrh r1, [r2, #0x0] - lsl r0, r0, #0xe - and r0, r1 - asr r0, r0, #0xf - beq _0201648A - ldr r0, _02016554 ; =gMain - mov r1, #0x0 - str r1, [r0, #0x48] - str r1, [r0, #0x44] - str r1, [r0, #0x4c] - ldr r0, _02016558 ; =UNK_021C48F8 - add sp, #0x10 - strh r1, [r0, #0x20] - strh r1, [r0, #0x22] - pop {r4, pc} -_0201648A: - ldr r0, _0201655C ; =0x04000130 - ldrh r1, [r0, #0x0] - ldrh r0, [r2, #0x0] - orr r1, r0 - ldr r0, _02016560 ; =0x00002FFF - eor r1, r0 - and r0, r1 - ldr r1, _02016554 ; =gMain - lsl r0, r0, #0x10 - lsr r0, r0, #0x10 - ldr r2, [r1, #0x38] - add r3, r0, #0x0 - eor r3, r2 - and r3, r0 - str r3, [r1, #0x3c] - str r3, [r1, #0x40] - cmp r0, #0x0 - beq _020164C2 - cmp r2, r0 - bne _020164C2 - ldr r2, [r1, #0x50] - sub r2, r2, #0x1 - str r2, [r1, #0x50] - bne _020164C8 - str r0, [r1, #0x40] - ldr r2, [r1, #0x54] - str r2, [r1, #0x50] - b _020164C8 -_020164C2: - ldr r1, _02016554 ; =gMain - ldr r2, [r1, #0x58] - str r2, [r1, #0x50] -_020164C8: - ldr r1, _02016554 ; =gMain - str r0, [r1, #0x38] - ldr r2, [r1, #0x3c] - str r2, [r1, #0x48] - str r0, [r1, #0x44] - ldr r0, [r1, #0x40] - str r0, [r1, #0x4c] - bl FUN_02016568 - ldr r0, _02016564 ; =gUnk021C4918 - ldrb r0, [r0, #0x4] - cmp r0, #0x0 - bne _020164F4 - add r4, sp, #0x8 -_020164E4: - bl TP_RequestSamplingAsync - add r0, r4, #0x0 - bl TP_WaitRawResult - cmp r0, #0x0 - bne _020164E4 - b _020164FA -_020164F4: - add r0, sp, #0x8 - bl TP_GetLatestRawPointInAuto -_020164FA: - add r0, sp, #0x0 - add r1, sp, #0x8 - bl TP_GetCalibratedPoint - add r1, sp, #0x0 - ldrh r3, [r1, #0x6] - cmp r3, #0x0 - bne _02016516 - ldrh r2, [r1, #0x0] - ldr r0, _02016558 ; =UNK_021C48F8 - strh r2, [r0, #0x1c] - ldrh r1, [r1, #0x2] - strh r1, [r0, #0x1e] - b _0201653A -_02016516: - ldr r0, _02016558 ; =UNK_021C48F8 - ldrh r2, [r0, #0x22] - cmp r2, #0x0 - beq _02016536 - cmp r3, #0x1 - beq _0201652A - cmp r3, #0x2 - beq _02016530 - cmp r3, #0x3 - b _0201653A -_0201652A: - ldrh r1, [r1, #0x2] - strh r1, [r0, #0x1e] - b _0201653A -_02016530: - ldrh r1, [r1, #0x0] - strh r1, [r0, #0x1c] - b _0201653A -_02016536: - mov r0, #0x0 - strh r0, [r1, #0x4] -_0201653A: - add r0, sp, #0x0 - ldrh r2, [r0, #0x4] - ldr r0, _02016558 ; =UNK_021C48F8 - ldrh r1, [r0, #0x22] - eor r1, r2 - and r1, r2 - strh r1, [r0, #0x20] - strh r2, [r0, #0x22] - add sp, #0x10 - pop {r4, pc} - nop -_02016550: .word 0x027FFFA8 -_02016554: .word gMain -_02016558: .word UNK_021C48F8 -_0201655C: .word 0x04000130 -_02016560: .word 0x00002FFF -_02016564: .word gUnk021C4918 - - thumb_func_start FUN_02016568 -FUN_02016568: ; 0x02016568 - ldr r0, _02016690 ; =gMain - ldr r1, [r0, #0x34] - cmp r1, #0x3 - bls _02016572 - b _0201668C -_02016572: - add r1, r1, r1 - add r1, pc - ldrh r1, [r1, #0x6] - lsl r1, r1, #0x10 - asr r1, r1, #0x10 - add pc, r1 -_0201657E: ; jump table (using 16-bit offset) - .short _0201668C - _0201657E - 2; case 0 - .short _02016586 - _0201657E - 2; case 1 - .short _020165BC - _0201657E - 2; case 2 - .short _02016642 - _0201657E - 2; case 3 -_02016586: - ldr r2, [r0, #0x48] - mov r1, #0x8 - add r3, r2, #0x0 - tst r3, r1 - beq _02016596 - lsl r1, r1, #0x7 - orr r1, r2 - str r1, [r0, #0x48] -_02016596: - ldr r1, _02016690 ; =gMain - mov r0, #0x8 - ldr r2, [r1, #0x44] - add r3, r2, #0x0 - tst r3, r0 - beq _020165A8 - lsl r0, r0, #0x7 - orr r0, r2 - str r0, [r1, #0x44] -_020165A8: - ldr r1, _02016690 ; =gMain - mov r0, #0x8 - ldr r2, [r1, #0x4c] - add r3, r2, #0x0 - tst r3, r0 - beq _0201668C - lsl r0, r0, #0x7 - orr r0, r2 - str r0, [r1, #0x4c] - bx lr -_020165BC: - ldr r3, [r0, #0x48] - mov r0, #0x1 - lsl r0, r0, #0xa - add r2, r3, #0x0 - mov r1, #0x0 - tst r2, r0 - beq _020165CE - lsl r0, r0, #0x1 - orr r1, r0 -_020165CE: - mov r0, #0x2 - lsl r0, r0, #0xa - add r2, r3, #0x0 - tst r2, r0 - beq _020165DC - lsr r0, r0, #0x1 - orr r1, r0 -_020165DC: - ldr r2, _02016690 ; =gMain - ldr r0, _02016694 ; =0x0000F3FF - ldr r3, [r2, #0x48] - and r0, r3 - orr r0, r1 - str r0, [r2, #0x48] - ldr r3, [r2, #0x44] - mov r1, #0x1 - lsl r1, r1, #0xa - add r2, r3, #0x0 - mov r0, #0x0 - tst r2, r1 - beq _020165FA - lsl r1, r1, #0x1 - orr r0, r1 -_020165FA: - mov r1, #0x2 - lsl r1, r1, #0xa - add r2, r3, #0x0 - tst r2, r1 - beq _02016608 - lsr r1, r1, #0x1 - orr r0, r1 -_02016608: - ldr r2, _02016690 ; =gMain - ldr r1, _02016694 ; =0x0000F3FF - ldr r3, [r2, #0x44] - and r1, r3 - orr r0, r1 - str r0, [r2, #0x44] - ldr r3, [r2, #0x4c] - mov r1, #0x1 - lsl r1, r1, #0xa - add r2, r3, #0x0 - mov r0, #0x0 - tst r2, r1 - beq _02016626 - lsl r1, r1, #0x1 - orr r0, r1 -_02016626: - mov r1, #0x2 - lsl r1, r1, #0xa - add r2, r3, #0x0 - tst r2, r1 - beq _02016634 - lsr r1, r1, #0x1 - orr r0, r1 -_02016634: - ldr r2, _02016690 ; =gMain - ldr r1, _02016694 ; =0x0000F3FF - ldr r3, [r2, #0x4c] - and r1, r3 - orr r0, r1 - str r0, [r2, #0x4c] - bx lr -_02016642: - mov r1, #0x2 - ldr r2, [r0, #0x48] - lsl r1, r1, #0x8 - tst r1, r2 - beq _02016652 - mov r1, #0x1 - orr r1, r2 - str r1, [r0, #0x48] -_02016652: - ldr r1, _02016690 ; =gMain - mov r0, #0x2 - ldr r2, [r1, #0x44] - lsl r0, r0, #0x8 - tst r0, r2 - beq _02016664 - mov r0, #0x1 - orr r0, r2 - str r0, [r1, #0x44] -_02016664: - ldr r1, _02016690 ; =gMain - mov r0, #0x2 - ldr r2, [r1, #0x4c] - lsl r0, r0, #0x8 - tst r0, r2 - beq _02016676 - mov r0, #0x1 - orr r0, r2 - str r0, [r1, #0x4c] -_02016676: - ldr r1, _02016690 ; =gMain - ldr r0, _02016698 ; =0x0000FCFF - ldr r2, [r1, #0x48] - and r2, r0 - str r2, [r1, #0x48] - ldr r2, [r1, #0x44] - and r2, r0 - str r2, [r1, #0x44] - ldr r2, [r1, #0x4c] - and r0, r2 - str r0, [r1, #0x4c] -_0201668C: - bx lr - nop -_02016690: .word gMain -_02016694: .word 0x0000F3FF -_02016698: .word 0x0000FCFF - - thumb_func_start FUN_0201669C -FUN_0201669C: ; 0x0201669C - ldr r2, _020166A4 ; =gMain - str r0, [r2, #0x54] - str r1, [r2, #0x58] - bx lr - .balign 4 -_020166A4: .word gMain - - thumb_func_start FUN_020166A8 -FUN_020166A8: ; 0x020166A8 - ldr r1, _020166B4 ; =gUnk021C4918 - ldrb r2, [r1, #0x8] - orr r0, r2 - strb r0, [r1, #0x8] - bx lr - nop -_020166B4: .word gUnk021C4918 - - thumb_func_start FUN_020166B8 -FUN_020166B8: ; 0x020166B8 - ldr r1, _020166C4 ; =gUnk021C4918 - mvn r0, r0 - ldrb r2, [r1, #0x8] - and r0, r2 - strb r0, [r1, #0x8] - bx lr - .balign 4 -_020166C4: .word gUnk021C4918 diff --git a/arm9/asm/unk_0201CC08.s b/arm9/asm/unk_0201CC08.s index 4c198931..c35c4b23 100644 --- a/arm9/asm/unk_0201CC08.s +++ b/arm9/asm/unk_0201CC08.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnk021C4918 + .extern gMain .section .bss @@ -88,7 +88,7 @@ FUN_0201CC78: ; 0x0201CC78 push {r4, lr} ldr r4, _0201CC9C ; =UNK_021C5978 strh r0, [r4, #0x18] - ldr r0, _0201CCA0 ; =gUnk021C4918 + ldr r0, _0201CCA0 ; =gMain + 0x60 strb r1, [r0, #0x4] ldr r0, _0201CCA4 ; =UNK_021C5938 ldr r1, [sp, #0xc] @@ -103,7 +103,7 @@ FUN_0201CC78: ; 0x0201CC78 pop {r4, pc} nop _0201CC9C: .word UNK_021C5978 -_0201CCA0: .word gUnk021C4918 +_0201CCA0: .word gMain + 0x60 _0201CCA4: .word UNK_021C5938 _0201CCA8: .word UNK_021C5944 diff --git a/arm9/asm/unk_0201E66C.s b/arm9/asm/unk_0201E66C.s index 84e97898..5f5dcb68 100644 --- a/arm9/asm/unk_0201E66C.s +++ b/arm9/asm/unk_0201E66C.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnk021C4918 + .extern gMain .section .bss @@ -167,7 +167,7 @@ _0201E79C: .word 0x04001000 thumb_func_start FUN_0201E7A0 FUN_0201E7A0: ; 0x0201E7A0 - ldr r0, _0201E7C0 ; =gUnk021C4918 + ldr r0, _0201E7C0 ; =gMain + 0x60 ldr r2, _0201E7C4 ; =0x04000304 ldrb r0, [r0, #0x5] cmp r0, #0x0 @@ -184,7 +184,7 @@ _0201E7B4: strh r0, [r2, #0x0] bx lr nop -_0201E7C0: .word gUnk021C4918 +_0201E7C0: .word gMain + 0x60 _0201E7C4: .word 0x04000304 _0201E7C8: .word 0xFFFF7FFF diff --git a/arm9/asm/unk_020208B8.s b/arm9/asm/unk_020208B8.s index ce42a526..11027cff 100644 --- a/arm9/asm/unk_020208B8.s +++ b/arm9/asm/unk_020208B8.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern UNK_021C48F8 + .extern gMain .text @@ -118,7 +118,7 @@ _02020960: thumb_func_start FUN_02020968 FUN_02020968: ; 0x02020968 push {r3, lr} - ldr r2, _02020984 ; =UNK_021C48F8 + ldr r2, _02020984 ; =gMain + 0x40 ldrh r1, [r2, #0x22] cmp r1, #0x0 beq _0202097C @@ -131,12 +131,12 @@ _0202097C: mvn r0, r0 pop {r3, pc} nop -_02020984: .word UNK_021C48F8 +_02020984: .word gMain + 0x40 thumb_func_start FUN_02020988 FUN_02020988: ; 0x02020988 push {r3, lr} - ldr r2, _020209A4 ; =UNK_021C48F8 + ldr r2, _020209A4 ; =gMain + 0x40 ldrh r1, [r2, #0x20] cmp r1, #0x0 beq _0202099C @@ -149,12 +149,12 @@ _0202099C: mvn r0, r0 pop {r3, pc} nop -_020209A4: .word UNK_021C48F8 +_020209A4: .word gMain + 0x40 thumb_func_start FUN_020209A8 FUN_020209A8: ; 0x020209A8 push {r3-r7, lr} - ldr r7, _020209F0 ; =UNK_021C48F8 + ldr r7, _020209F0 ; =gMain + 0x40 add r5, r0, #0x0 ldrh r0, [r7, #0x22] cmp r0, #0x0 @@ -192,12 +192,12 @@ _020209EA: mvn r0, r0 pop {r3-r7, pc} .balign 4 -_020209F0: .word UNK_021C48F8 +_020209F0: .word gMain + 0x40 thumb_func_start FUN_020209F4 FUN_020209F4: ; 0x020209F4 push {r3-r7, lr} - ldr r7, _02020A3C ; =UNK_021C48F8 + ldr r7, _02020A3C ; =gMain + 0x40 add r5, r0, #0x0 ldrh r0, [r7, #0x20] cmp r0, #0x0 @@ -235,12 +235,12 @@ _02020A36: mvn r0, r0 pop {r3-r7, pc} .balign 4 -_02020A3C: .word UNK_021C48F8 +_02020A3C: .word gMain + 0x40 thumb_func_start FUN_02020A40 FUN_02020A40: ; 0x02020A40 push {r3, lr} - ldr r2, _02020A68 ; =UNK_021C48F8 + ldr r2, _02020A68 ; =gMain + 0x40 ldrh r1, [r2, #0x22] cmp r1, #0x0 beq _02020A62 @@ -259,12 +259,12 @@ _02020A62: mov r0, #0x0 pop {r3, pc} nop -_02020A68: .word UNK_021C48F8 +_02020A68: .word gMain + 0x40 thumb_func_start FUN_02020A6C FUN_02020A6C: ; 0x02020A6C push {r3, lr} - ldr r2, _02020A94 ; =UNK_021C48F8 + ldr r2, _02020A94 ; =gMain + 0x40 ldrh r1, [r2, #0x20] cmp r1, #0x0 beq _02020A8E @@ -283,27 +283,27 @@ _02020A8E: mov r0, #0x0 pop {r3, pc} nop -_02020A94: .word UNK_021C48F8 +_02020A94: .word gMain + 0x40 thumb_func_start FUN_02020A98 FUN_02020A98: ; 0x02020A98 - ldr r0, _02020AA0 ; =UNK_021C48F8 + ldr r0, _02020AA0 ; =gMain + 0x40 ldrh r0, [r0, #0x22] bx lr nop -_02020AA0: .word UNK_021C48F8 +_02020AA0: .word gMain + 0x40 thumb_func_start FUN_02020AA4 FUN_02020AA4: ; 0x02020AA4 - ldr r0, _02020AAC ; =UNK_021C48F8 + ldr r0, _02020AAC ; =gMain + 0x40 ldrh r0, [r0, #0x20] bx lr nop -_02020AAC: .word UNK_021C48F8 +_02020AAC: .word gMain + 0x40 thumb_func_start FUN_02020AB0 FUN_02020AB0: ; 0x02020AB0 - ldr r2, _02020AC8 ; =UNK_021C48F8 + ldr r2, _02020AC8 ; =gMain + 0x40 ldrh r3, [r2, #0x22] cmp r3, #0x0 beq _02020AC4 @@ -317,11 +317,11 @@ _02020AC4: mov r0, #0x0 bx lr .balign 4 -_02020AC8: .word UNK_021C48F8 +_02020AC8: .word gMain + 0x40 thumb_func_start FUN_02020ACC FUN_02020ACC: ; 0x02020ACC - ldr r2, _02020AE4 ; =UNK_021C48F8 + ldr r2, _02020AE4 ; =gMain + 0x40 ldrh r3, [r2, #0x20] cmp r3, #0x0 beq _02020AE0 @@ -335,7 +335,7 @@ _02020AE0: mov r0, #0x0 bx lr .balign 4 -_02020AE4: .word UNK_021C48F8 +_02020AE4: .word gMain + 0x40 thumb_func_start FUN_02020AE8 FUN_02020AE8: ; 0x02020AE8 diff --git a/arm9/asm/unk_020286F8.s b/arm9/asm/unk_020286F8.s deleted file mode 100644 index 2d75f824..00000000 --- a/arm9/asm/unk_020286F8.s +++ /dev/null @@ -1,340 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .section .bss - - .global UNK_021C59D0 -UNK_021C59D0: ; 0x021C59D0 - .space 0x4 - - .text - - thumb_func_start FUN_020286F8 -FUN_020286F8: ; 0x020286F8 - mov r0, #0x42 - lsl r0, r0, #0x2 - bx lr - .balign 4 - - thumb_func_start FUN_02028700 -FUN_02028700: ; 0x02028700 - push {r4-r5} - add r5, r2, #0x0 - mov r3, #0x2c - add r2, r1, #0x0 - mul r2, r3 - mul r5, r3 - add r4, r0, r2 - add r3, r0, r5 - mov r2, #0x5 -_02028712: - ldmia r4!, {r0-r1} - stmia r3!, {r0-r1} - sub r2, r2, #0x1 - bne _02028712 - ldr r0, [r4, #0x0] - str r0, [r3, #0x0] - pop {r4-r5} - bx lr - .balign 4 - - thumb_func_start FUN_02028724 -FUN_02028724: ; 0x02028724 - push {r4, lr} - add r4, r0, #0x0 - mov r2, #0x42 - mov r0, #0x0 - add r1, r4, #0x0 - lsl r2, r2, #0x2 - bl MIi_CpuClearFast - ldr r0, _0202874C ; =0x0000FFFF - mov r1, #0x0 - add r2, r4, #0x0 -_0202873A: - strh r0, [r2, #0x0] - strh r0, [r2, #0x10] - add r1, r1, #0x1 - add r2, #0x2c - cmp r1, #0x6 - blt _0202873A - ldr r0, _02028750 ; =UNK_021C59D0 - str r4, [r0, #0x0] - pop {r4, pc} - .balign 4 -_0202874C: .word 0x0000FFFF -_02028750: .word UNK_021C59D0 - - thumb_func_start FUN_02028754 -FUN_02028754: ; 0x02028754 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r1, #0x0 - mov r7, #0x0 -_0202875C: - mov r4, #0x0 - cmp r6, #0x0 - bls _02028770 -_02028762: - ldr r0, [r5, #0x28] - bl PRandom - add r4, r4, #0x1 - str r0, [r5, #0x28] - cmp r4, r6 - blo _02028762 -_02028770: - add r7, r7, #0x1 - add r5, #0x2c - cmp r7, #0x6 - blo _0202875C - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0202877C -FUN_0202877C: ; 0x0202877C - mov r2, #0x2c - mul r2, r1 - add r0, r0, r2 - ldr r0, [r0, #0x24] - bx lr - .balign 4 - - thumb_func_start FUN_02028788 -FUN_02028788: ; 0x02028788 - push {r3-r5, lr} - add r5, r0, #0x0 - mov r0, #0x2c - add r4, r1, #0x0 - mul r4, r0 - add r0, r5, r4 - str r2, [r0, #0x24] - add r0, r2, #0x0 - bl PRandom - add r1, r5, r4 - str r0, [r1, #0x28] - pop {r3-r5, pc} - .balign 4 - - thumb_func_start FUN_020287A4 -FUN_020287A4: ; 0x020287A4 - ldr r0, [r0, #0x54] - bx lr - - thumb_func_start FUN_020287A8 -FUN_020287A8: ; 0x020287A8 - cmp r2, #0x0 - bne _020287B4 - mov r2, #0x2c - mul r2, r1 - add r0, r0, r2 - bx lr -_020287B4: - mov r2, #0x2c - mul r2, r1 - add r0, r0, r2 - add r0, #0x10 - bx lr - .balign 4 - - thumb_func_start FUN_020287C0 -FUN_020287C0: ; 0x020287C0 - push {r4, lr} - add r4, r0, #0x0 - cmp r2, #0x0 - bne _020287D8 - mov r2, #0x2c - mul r2, r1 - add r1, r4, r2 - add r0, r3, #0x0 - mov r2, #0x8 - bl CopyStringToU16Array - pop {r4, pc} -_020287D8: - mov r2, #0x2c - mul r2, r1 - add r1, r4, r2 - add r0, r3, #0x0 - add r1, #0x10 - mov r2, #0x8 - bl CopyStringToU16Array - pop {r4, pc} - .balign 4 - - thumb_func_start FUN_020287EC -FUN_020287EC: ; 0x020287EC - mov r3, #0x2c - mul r3, r1 - add r0, r0, r3 - add r0, #0x20 - strb r2, [r0, #0x0] - bx lr - - thumb_func_start FUN_020287F8 -FUN_020287F8: ; 0x020287F8 - mov r2, #0x2c - mul r2, r1 - add r0, r0, r2 - add r0, #0x20 - ldrb r0, [r0, #0x0] - bx lr - - thumb_func_start FUN_02028804 -FUN_02028804: ; 0x02028804 - mov r2, #0x2c - mul r2, r1 - add r0, r0, r2 - add r0, #0x21 - ldrb r0, [r0, #0x0] - bx lr - - thumb_func_start FUN_02028810 -FUN_02028810: ; 0x02028810 - mov r3, #0x2c - mul r3, r1 - add r0, r0, r3 - add r0, #0x21 - strb r2, [r0, #0x0] - bx lr - - thumb_func_start FUN_0202881C -FUN_0202881C: ; 0x0202881C - ldr r3, _02028824 ; =SavArray_get - mov r1, #0x11 - bx r3 - nop -_02028824: .word SavArray_get - - thumb_func_start FUN_02028828 -FUN_02028828: ; 0x02028828 - push {r3, lr} - mov r2, #0x2c - mul r2, r1 - add r0, r0, r2 - bl FUN_0202888C - cmp r0, #0x0 - bne _0202883C - mov r0, #0x1 - pop {r3, pc} -_0202883C: - mov r0, #0x0 - pop {r3, pc} - - thumb_func_start FUN_02028840 -FUN_02028840: ; 0x02028840 - mov r2, #0x2c - add r3, r0, #0x0 - mul r2, r1 - add r1, r3, r2 - ldr r3, _02028850 ; =FUN_020288AC - add r0, #0x2c - bx r3 - nop -_02028850: .word FUN_020288AC - - thumb_func_start FUN_02028854 -FUN_02028854: ; 0x02028854 - push {r3-r7, lr} - add r6, r1, #0x0 - ldrh r1, [r6, #0x0] - add r5, r0, #0x0 - ldr r0, _02028888 ; =0x0000FFFF - cmp r1, r0 - bne _02028866 - mov r0, #0x0 - pop {r3-r7, pc} -_02028866: - mov r4, #0x0 - mov r7, #0x8 -_0202886A: - add r0, r6, #0x0 - add r1, r5, #0x0 - add r2, r7, #0x0 - bl StringNotEqualN - cmp r0, #0x0 - bne _0202887C - mov r0, #0x1 - pop {r3-r7, pc} -_0202887C: - add r4, r4, #0x1 - add r5, #0x2c - cmp r4, #0x6 - blt _0202886A - mov r0, #0x0 - pop {r3-r7, pc} - .balign 4 -_02028888: .word 0x0000FFFF - - thumb_func_start FUN_0202888C -FUN_0202888C: ; 0x0202888C - ldrh r2, [r0, #0x0] - ldr r1, _020288A8 ; =0x0000FFFF - cmp r2, r1 - bne _02028898 - mov r0, #0x1 - bx lr -_02028898: - ldrh r0, [r0, #0x10] - cmp r0, r1 - bne _020288A2 - mov r0, #0x1 - bx lr -_020288A2: - mov r0, #0x0 - bx lr - nop -_020288A8: .word 0x0000FFFF - - thumb_func_start FUN_020288AC -FUN_020288AC: ; 0x020288AC - push {r3-r5, lr} - add r5, r0, #0x0 - add r4, r1, #0x0 - add r0, #0x10 - add r1, #0x10 - mov r2, #0x8 - bl StringNotEqualN - cmp r0, #0x0 - beq _020288C4 - mov r0, #0x0 - pop {r3-r5, pc} -_020288C4: - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r2, #0x8 - bl StringNotEqualN - cmp r0, #0x0 - beq _020288D6 - mov r0, #0x0 - pop {r3-r5, pc} -_020288D6: - add r0, r5, #0x0 - add r0, #0x20 - ldrb r1, [r0, #0x0] - add r0, r4, #0x0 - add r0, #0x20 - ldrb r0, [r0, #0x0] - cmp r1, r0 - beq _020288EA - mov r0, #0x0 - pop {r3-r5, pc} -_020288EA: - add r0, r5, #0x0 - add r0, #0x21 - ldrb r1, [r0, #0x0] - add r0, r4, #0x0 - add r0, #0x21 - ldrb r0, [r0, #0x0] - cmp r1, r0 - beq _020288FE - mov r0, #0x0 - pop {r3-r5, pc} -_020288FE: - ldr r1, [r5, #0x24] - ldr r0, [r4, #0x24] - cmp r1, r0 - bne _0202890A - mov r0, #0x1 - pop {r3-r5, pc} -_0202890A: - mov r0, #0x0 - pop {r3-r5, pc} - .balign 4 diff --git a/arm9/asm/unk_02031734.s b/arm9/asm/unk_02031734.s index e28c8c38..5a054d51 100644 --- a/arm9/asm/unk_02031734.s +++ b/arm9/asm/unk_02031734.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnk021C4918 + .extern gMain .section .rodata .global UNK_020EEC48 UNK_020EEC48: ; 0x020EEC48 @@ -4062,7 +4062,7 @@ _02033622: ldr r0, [r0, #0x0] ldr r0, [r0, #0x28] bl FUN_0202287C - ldr r1, _02033674 ; =gUnk021C4918 + ldr r1, _02033674 ; =gMain + 0x60 mov r0, #0x1 strb r0, [r1, #0x4] ldr r1, _02033670 ; =UNK_021C5A00 @@ -4092,7 +4092,7 @@ _0203366C: pop {r3, pc} nop _02033670: .word UNK_021C5A00 -_02033674: .word gUnk021C4918 +_02033674: .word gMain + 0x60 thumb_func_start FUN_02033678 FUN_02033678: ; 0x02033678 diff --git a/arm9/asm/unk_02033F50.s b/arm9/asm/unk_02033F50.s index d514a9d6..cf84285f 100644 --- a/arm9/asm/unk_02033F50.s +++ b/arm9/asm/unk_02033F50.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnk021C4918 + .extern gMain .section .rodata @@ -92,7 +92,7 @@ _02033FA4: bl OS_EnableIrqMask mov r0, #0x0 add r1, r0, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB mov r0, #0x0 add r1, r0, #0x0 bl FUN_02015F34 @@ -111,7 +111,7 @@ _02033FA4: mov r0, #0x4 mov r1, #0x8 bl FUN_0201669C - ldr r0, _02034160 ; =gUnk021C4918 + ldr r0, _02034160 ; =gMain + 0x60 mov r1, #0x0 strb r1, [r0, #0x5] bl FUN_0201E7A0 @@ -184,7 +184,7 @@ _02033FA4: str r0, [sp, #0x14] bl FUN_0201BD5C add r0, r4, #0x0 - bl FUN_0200AA80 + bl ScrStrBufs_new add r4, r0, #0x0 ldr r2, _02034184 ; =UNK_020EEC9C add r0, r6, #0x0 @@ -212,7 +212,7 @@ _02033FA4: add r0, r4, #0x0 mov r1, #0x0 mov r3, #0x5 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [sp, #0x10] ldr r2, [sp, #0x14] add r1, r5, #0x0 @@ -245,7 +245,7 @@ _02033FA4: ldr r0, [sp, #0x10] bl DestroyMsgData add r0, r4, #0x0 - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r6, #0x0 bl FreeToHeap add sp, #0x28 @@ -254,7 +254,7 @@ _02033FA4: _02034154: .word FUN_02033F50 _02034158: .word 0xFFFFE0FF _0203415C: .word 0x04001000 -_02034160: .word gUnk021C4918 +_02034160: .word gMain + 0x60 _02034164: .word 0x04000050 _02034168: .word 0x04001050 _0203416C: .word 0xFFFF1FFF diff --git a/arm9/asm/unk_02034188.s b/arm9/asm/unk_02034188.s index f84f094a..d8b35c57 100644 --- a/arm9/asm/unk_02034188.s +++ b/arm9/asm/unk_02034188.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnk021C4918 + .extern gMain .section .rodata @@ -40,7 +40,7 @@ FUN_02034188: ; 0x02034188 bl FUN_02015EF4 mov r0, #0x0 add r1, r0, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB mov r0, #0x0 add r1, r0, #0x0 bl FUN_02015F34 @@ -59,7 +59,7 @@ FUN_02034188: ; 0x02034188 mov r0, #0x4 mov r1, #0x8 bl FUN_0201669C - ldr r0, _02034370 ; =gUnk021C4918 + ldr r0, _02034370 ; =gMain + 0x60 mov r1, #0x0 strb r1, [r0, #0x5] bl FUN_0201E7A0 @@ -226,7 +226,7 @@ _02034308: nop _02034368: .word 0xFFFFE0FF _0203436C: .word 0x04001000 -_02034370: .word gUnk021C4918 +_02034370: .word gMain + 0x60 _02034374: .word 0x04000050 _02034378: .word 0x04001050 _0203437C: .word 0xFFFF1FFF diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index 3b3dccfc..da71c049 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -653,7 +653,7 @@ _02035526: cmp r3, #0x3 bne _02035594 mov r0, #0xb - bl FUN_0200AA80 + bl ScrStrBufs_new add r6, r0, #0x0 mov r0, #0x8 mov r1, #0xb @@ -674,7 +674,7 @@ _02035526: add r2, r0, #0x0 add r0, r6, #0x0 mov r1, #0x0 - bl FUN_0200ABC0 + bl BufferPlayersName ldr r2, [sp, #0x20] add r0, r6, #0x0 add r1, r7, #0x0 @@ -690,7 +690,7 @@ _02035526: add r0, r7, #0x0 bl String_dtor add r0, r6, #0x0 - bl FUN_0200AB18 + bl ScrStrBufs_delete b _020355A2 _02035594: ldr r2, _02035664 ; =UNK_020F2ACC @@ -996,7 +996,7 @@ _020357D6: add r0, r7, #0x0 bl String_dtor mov r0, #0xb - bl FUN_0200AA80 + bl ScrStrBufs_new add r7, r0, #0x0 mov r0, #0x20 mov r1, #0xb @@ -1019,7 +1019,7 @@ _020357D6: ldrh r2, [r2, #0x0] add r0, r7, #0x0 mov r3, #0x2 - bl FUN_0200AD38 + bl BufferIntegerAsString b _0203584C _02035834: add r0, r4, #0x0 @@ -1031,7 +1031,7 @@ _02035834: str r0, [sp, #0x4] add r0, r7, #0x0 mov r3, #0x2 - bl FUN_0200AD38 + bl BufferIntegerAsString _0203584C: ldr r1, [sp, #0x18] ldr r2, [sp, #0x14] @@ -1053,7 +1053,7 @@ _0203584C: ldr r0, [sp, #0x14] bl String_dtor add r0, r7, #0x0 - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [sp, #0x1c] bl DestroyMsgData add r5, #0x10 diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s index ca4520b6..26f6442d 100644 --- a/arm9/asm/unk_020377F0.s +++ b/arm9/asm/unk_020377F0.s @@ -123,7 +123,7 @@ UNK_020F2CE4: ; 0x020F2CE4 .balign 4 .global UNK_020F2CF4 UNK_020F2CF4: ; 0x020F2CF4 - .word MOD14_021D74E0, MOD14_021D754C, MOD14_021D75B8, SDK_OVERLAY_MODULE_14_ID + .word StoragePC_Overlay_Init, StoragePC_Overlay_Run, StoragePC_Overlay_Teardown, SDK_OVERLAY_MODULE_14_ID .balign 4 .global UNK_020F2D04 @@ -900,8 +900,8 @@ FUN_02037D5C: ; 0x02037D5C ldrb r0, [r0, #0x16] bx lr - thumb_func_start FUN_02037D60 -FUN_02037D60: ; 0x02037D60 + thumb_func_start LaunchStoragePCInterface +LaunchStoragePCInterface: ; 0x02037D60 ldr r3, _02037D68 ; =FUN_020373D4 add r2, r1, #0x0 ldr r1, _02037D6C ; =UNK_020F2CF4 diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index acb9fd0b..667b0c58 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -320,7 +320,7 @@ gScriptCmdTable: ; 0x020F355C .word FUN_0203BFEC .word FUN_0203C118 .word FUN_0203C12C - .word FUN_0203C278 + .word ScrCmd_monstoragepc .word FUN_0203C2C4 .word FUN_0203C2E0 .word FUN_0203C2F0 @@ -1001,7 +1001,7 @@ _02038D68: mov r0, #0x8 mov r1, #0x40 mov r2, #0xb - bl FUN_0200AA90 + bl ScrStrBufs_new_custom str r0, [r4, #0x40] mov r0, #0x1 lsl r0, r0, #0xa @@ -1056,7 +1056,7 @@ _02038DD2: add r0, #0xa4 ldr r5, [r0, #0x0] ldr r0, [r4, #0x40] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r4, #0x44] bl String_dtor ldr r0, [r4, #0x48] diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s index d94329c4..f28f76eb 100644 --- a/arm9/asm/unk_02048120.s +++ b/arm9/asm/unk_02048120.s @@ -88,7 +88,7 @@ _0204817A: bl NewMsgDataFromNarc str r0, [r4, #0x1c] mov r0, #0xb - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r4, #0x20] add r1, r4, #0x0 ldr r0, [r4, #0x8] @@ -101,7 +101,7 @@ _0204817A: add r2, r0, #0x0 ldr r0, [r4, #0x20] mov r1, #0x0 - bl FUN_0200ABC0 + bl BufferPlayersName ldr r0, [r5, #0x1c] ldr r1, [r0, #0x0] ldr r0, _0204820C ; =0x0000019E @@ -223,7 +223,7 @@ _020482B2: add r0, #0xc bl FUN_02019178 ldr r0, [r4, #0x20] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r4, #0x1c] bl DestroyMsgData ldr r0, [r4, #0x8] diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s index 48f457be..db9ea9af 100644 --- a/arm9/asm/unk_020484A8.s +++ b/arm9/asm/unk_020484A8.s @@ -466,14 +466,14 @@ FUN_02048864: ; 0x02048864 cmp r6, #0x2 bne _020488AC mov r0, #0x4 - bl FUN_0200AA80 + bl ScrStrBufs_new add r6, r0, #0x0 ldr r0, [r5, #0xc] bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 add r0, r6, #0x0 mov r1, #0x0 - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r6, #0x0 add r1, r7, #0x0 mov r2, #0x10 @@ -481,7 +481,7 @@ FUN_02048864: ; 0x02048864 bl ReadMsgData_ExpandPlaceholders str r0, [r4, #0x2c] add r0, r6, #0x0 - bl FUN_0200AB18 + bl ScrStrBufs_delete b _020488B4 _020488AC: mov r1, #0x12 diff --git a/arm9/asm/unk_02048904.s b/arm9/asm/unk_02048904.s index 4f852dbe..4ca21350 100644 --- a/arm9/asm/unk_02048904.s +++ b/arm9/asm/unk_02048904.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnk021C4918 + .extern gMain .section .rodata @@ -146,11 +146,11 @@ _020489EA: ldr r0, [r0, #0x0] lsl r0, r0, #0x10 lsr r1, r0, #0x1c - ldr r0, _020489F8 ; =gUnk021C4918 + ldr r0, _020489F8 ; =gMain + 0x60 strb r1, [r0, #0x5] pop {r4, pc} .balign 4 -_020489F8: .word gUnk021C4918 +_020489F8: .word gMain + 0x60 thumb_func_start FUN_020489FC FUN_020489FC: ; 0x020489FC diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s index 51c42247..5746b23f 100644 --- a/arm9/asm/unk_02050E48.s +++ b/arm9/asm/unk_02050E48.s @@ -783,7 +783,7 @@ _0205142C: ldr r0, [r4, #0x28] ldr r2, [r4, #0x74] mov r1, #0x0 - bl FUN_0200ABC0 + bl BufferPlayersName ldr r0, [r4, #0x2c] ldr r2, [r4, #0xc] mov r1, #0xe @@ -962,7 +962,7 @@ _020515BA: add r2, r0, #0x0 ldr r0, [r4, #0x28] mov r1, #0x1 - bl FUN_0200AC60 + bl BufferBoxMonSpeciesName ldr r0, [r4, #0x2c] ldr r2, [r4, #0xc] mov r1, #0x12 @@ -1307,7 +1307,7 @@ _0205188E: str r5, [r4, #0x24] str r6, [r4, #0x8] mov r0, #0xb - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r4, #0x28] mov r0, #0x0 mov r1, #0x1a @@ -1436,7 +1436,7 @@ _020519BA: ldr r0, [r4, #0x2c] bl DestroyMsgData ldr r0, [r4, #0x28] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r4, #0xc] bl String_dtor ldr r0, [r4, #0x10] @@ -2124,7 +2124,7 @@ _02051EE2: ; jump table (using 16-bit offset) .short _02052028 - _02051EE2 - 2; case 7 _02051EF2: mov r0, #0x4 - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r4, #0x18] mov r0, #0x0 mov r1, #0x1a @@ -2150,7 +2150,7 @@ _02051EF2: add r2, r0, #0x0 ldr r0, [r4, #0x18] mov r1, #0x0 - bl FUN_0200ABC0 + bl BufferPlayersName ldr r0, [r4, #0x18] ldr r1, [r4, #0x4] ldr r2, [r4, #0x0] @@ -2194,7 +2194,7 @@ _02051F7C: ldr r0, [r4, #0x1c] bl DestroyMsgData ldr r0, [r4, #0x18] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r4, #0x0] bl String_dtor ldr r0, [r4, #0x4] diff --git a/arm9/asm/unk_020520AC.s b/arm9/asm/unk_020520AC.s index 4ae557da..48a4f8ec 100644 --- a/arm9/asm/unk_020520AC.s +++ b/arm9/asm/unk_020520AC.s @@ -1336,14 +1336,14 @@ _020529B0: ldr r0, [sp, #0x0] mov r1, #0x3 add r2, r4, #0x0 - bl FUN_0200B4A0 + bl BufferCountryName cmp r5, #0x0 beq _020529CC ldr r0, [sp, #0x0] mov r1, #0x4 add r2, r4, #0x0 add r3, r5, #0x0 - bl FUN_0200B4D8 + bl BufferCityName _020529CC: cmp r7, r4 beq _020529E4 @@ -1698,7 +1698,7 @@ _02052C46: add r2, r0, #0x0 add r0, r6, #0x0 mov r1, #0x0 - bl FUN_0200B064 + bl BufferTrainerClassName mov r0, #0xa6 pop {r4-r6, pc} _02052C78: @@ -1814,11 +1814,11 @@ _02052D3C: add r0, r5, #0x0 mov r1, #0x0 add r2, r4, #0x0 - bl FUN_0200ABC0 + bl BufferPlayersName ldr r2, [sp, #0x8] add r0, r5, #0x0 mov r1, #0x1 - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r4, #0x0 bl FUN_02023A70 add r4, r0, #0x0 @@ -1887,7 +1887,7 @@ _02052DBA: add r2, r6, #0x0 mov r3, #0x0 str r4, [sp, #0x4] - bl FUN_0200ABB4 + bl BufferString add r0, r6, #0x0 bl FreeToHeap add r0, r7, #0x0 diff --git a/arm9/asm/unk_0205363C.s b/arm9/asm/unk_0205363C.s index 5dc182e1..3b13ed24 100644 --- a/arm9/asm/unk_0205363C.s +++ b/arm9/asm/unk_0205363C.s @@ -61,7 +61,7 @@ _02053654: ldr r2, [r2, #0x4] add r0, r7, #0x0 add r1, r4, #0x0 - bl FUN_0200B064 + bl BufferTrainerClassName add r4, r4, #0x1 add r5, r5, #0x4 cmp r4, #0x4 diff --git a/arm9/asm/unk_02060CCC.s b/arm9/asm/unk_02060CCC.s index eaf86357..0f319d3c 100644 --- a/arm9/asm/unk_02060CCC.s +++ b/arm9/asm/unk_02060CCC.s @@ -276,7 +276,7 @@ FUN_02060D90: ; 0x02060D90 str r0, [sp, #0x4] add r0, r5, #0x0 add r2, r4, #0x0 - bl FUN_0200ABB4 + bl BufferString add r0, r4, #0x0 bl String_dtor add sp, #0xc @@ -736,7 +736,7 @@ FUN_020610F8: ; 0x020610F8 ldrh r2, [r4, #0x22] add r0, r5, #0x0 mov r1, #0x2 - bl FUN_0200AE38 + bl BufferItemName mov r0, #0x0 str r0, [sp, #0x0] mov r0, #0x1 @@ -745,7 +745,7 @@ FUN_020610F8: ; 0x020610F8 ldrh r2, [r4, #0x4] add r0, r5, #0x0 add r3, r1, #0x0 - bl FUN_0200AD38 + bl BufferIntegerAsString ldrb r0, [r4, #0x9] add r2, r4, #0x0 mov r1, #0x4 @@ -776,7 +776,7 @@ _02061166: ldrh r2, [r4, #0x22] add r0, r5, #0x0 mov r1, #0x2 - bl FUN_0200AE38 + bl BufferItemName mov r0, #0x0 str r0, [sp, #0x0] mov r0, #0x1 @@ -785,7 +785,7 @@ _02061166: ldrh r2, [r4, #0x4] add r0, r5, #0x0 add r3, r1, #0x0 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x1 add sp, #0x8 pop {r4-r6, pc} @@ -810,7 +810,7 @@ FUN_020611A8: ; 0x020611A8 ldrh r2, [r4, #0x4] add r0, r5, #0x0 mov r3, #0x3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r4, #0x0] cmp r0, #0x1 bne _020611E0 @@ -886,7 +886,7 @@ FUN_0206123C: ; 0x0206123C ldrh r2, [r4, #0x6] add r0, r5, #0x0 mov r1, #0x1 - bl FUN_0200AE38 + bl BufferItemName ldrb r0, [r4, #0x3] mov r1, #0x2 str r0, [sp, #0x0] @@ -1056,7 +1056,7 @@ FUN_0206139C: ; 0x0206139C ldrh r2, [r4, #0x2] add r0, r5, #0x0 mov r1, #0x0 - bl GetLandmarkName + bl BufferLandmarkName add r0, r5, #0x0 mov r1, #0x1 add r2, r6, #0x0 @@ -1064,7 +1064,7 @@ FUN_0206139C: ; 0x0206139C ldrh r2, [r4, #0x0] add r0, r5, #0x0 mov r1, #0x2 - bl FUN_0200AE38 + bl BufferItemName mov r0, #0xa pop {r4-r6, pc} @@ -1108,7 +1108,7 @@ FUN_02061404: ; 0x02061404 ldrh r2, [r4, #0x6] add r0, r5, #0x0 mov r1, #0x1 - bl GetLandmarkName + bl BufferLandmarkName add r0, r5, #0x0 mov r1, #0x0 add r2, r6, #0x0 @@ -1262,7 +1262,7 @@ FUN_02061534: ; 0x02061534 ldrh r2, [r4, #0x0] add r0, r5, #0x0 mov r1, #0x1 - bl FUN_0200B164 + bl BufferUndergroundItemName mov r0, #0x0 str r0, [sp, #0x0] mov r0, #0x1 @@ -1271,7 +1271,7 @@ FUN_02061534: ; 0x02061534 add r0, r5, #0x0 mov r1, #0x2 mov r3, #0x3 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x18 add sp, #0x8 pop {r4-r6, pc} @@ -1338,7 +1338,7 @@ FUN_020615B0: ; 0x020615B0 ldrb r2, [r4, #0x5] add r0, r5, #0x0 add r3, r1, #0x0 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x1a add sp, #0x8 pop {r4-r6, pc} @@ -1409,7 +1409,7 @@ FUN_02061648: ; 0x02061648 ldrh r2, [r4, #0x6] add r0, r5, #0x0 mov r1, #0x2 - bl FUN_0200AE38 + bl BufferItemName mov r0, #0x1d add sp, #0x8 pop {r4-r6, pc} @@ -1482,7 +1482,7 @@ FUN_020616E8: ; 0x020616E8 ldrh r2, [r4, #0x0] add r0, r5, #0x0 mov r1, #0x1 - bl FUN_0200AE38 + bl BufferItemName mov r0, #0x0 str r0, [sp, #0x0] mov r0, #0x1 @@ -1491,7 +1491,7 @@ FUN_020616E8: ; 0x020616E8 ldrh r2, [r4, #0x4] add r0, r5, #0x0 add r3, r1, #0x0 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x1e add sp, #0x8 pop {r4-r6, pc} @@ -1512,7 +1512,7 @@ FUN_02061728: ; 0x02061728 ldrh r2, [r4, #0x0] add r0, r5, #0x0 mov r1, #0x1 - bl FUN_0200AE38 + bl BufferItemName mov r0, #0x1f pop {r4-r6, pc} .balign 4 @@ -1544,7 +1544,7 @@ FUN_02061750: ; 0x02061750 add r0, r5, #0x0 add r2, r4, #0x0 mov r3, #0x0 - bl FUN_0200ABB4 + bl BufferString add r0, r4, #0x0 bl String_dtor mov r0, #0x5 @@ -1598,7 +1598,7 @@ FUN_020617D8: ; 0x020617D8 ldrb r2, [r4, #0x6] add r0, r5, #0x0 mov r1, #0x1 - bl FUN_0200B534 + bl BufferSealName ldrb r0, [r4, #0x3] mov r1, #0x2 str r0, [sp, #0x0] @@ -1672,7 +1672,7 @@ _02061884: add r0, r5, #0x0 mov r1, #0x1 add r2, r4, #0x4 - bl FUN_0200ABC0 + bl BufferPlayersName pop {r4-r6, pc} .balign 4 @@ -1794,7 +1794,7 @@ FUN_0206193C: ; 0x0206193C add r0, r5, #0x0 mov r1, #0x2 mov r3, #0x4 - bl FUN_0200AD38 + bl BufferIntegerAsString ldrb r0, [r4, #0x7] cmp r0, #0x0 bne _0206198A @@ -1896,7 +1896,7 @@ FUN_020619F0: ; 0x020619F0 add r0, r5, #0x0 mov r1, #0x2 mov r3, #0x3 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r4, #0x0 mov r1, #0xa bl _u32_div_f @@ -1907,7 +1907,7 @@ FUN_020619F0: ; 0x020619F0 add r0, r5, #0x0 mov r1, #0x3 str r3, [sp, #0x4] - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x2 add sp, #0x8 pop {r4-r6, pc} @@ -1967,7 +1967,7 @@ FUN_02061AB0: ; 0x02061AB0 ldr r2, [r4, #0x8] add r0, r5, #0x0 mov r3, #0xa - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x0 str r0, [sp, #0x0] mov r0, #0x1 @@ -1976,7 +1976,7 @@ FUN_02061AB0: ; 0x02061AB0 add r0, r5, #0x0 mov r1, #0x2 mov r3, #0x6 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x0 str r0, [sp, #0x0] mov r0, #0x1 @@ -1985,7 +1985,7 @@ FUN_02061AB0: ; 0x02061AB0 add r0, r5, #0x0 mov r1, #0x3 mov r3, #0x6 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x3 add sp, #0x8 pop {r4-r6, pc} @@ -2021,7 +2021,7 @@ FUN_02061B24: ; 0x02061B24 ldrh r2, [r4, #0x0] add r0, r5, #0x0 mov r1, #0x1 - bl FUN_0200B1D4 + bl BufferUndergroundTrapName mov r0, #0x0 str r0, [sp, #0x0] mov r0, #0x1 @@ -2030,7 +2030,7 @@ FUN_02061B24: ; 0x02061B24 add r0, r5, #0x0 mov r1, #0x2 mov r3, #0x3 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x7 add sp, #0x8 pop {r4-r6, pc} @@ -2073,7 +2073,7 @@ FUN_02061B80: ; 0x02061B80 ldrh r2, [r4, #0x0] add r0, r5, #0x0 mov r3, #0x3 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x8 add sp, #0x8 pop {r4-r6, pc} @@ -2134,7 +2134,7 @@ FUN_02061C00: ; 0x02061C00 ldrh r2, [r4, #0x2] add r0, r5, #0x0 mov r3, #0x4 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r5, #0x0 mov r1, #0x1 add r2, r6, #0x0 @@ -2315,7 +2315,7 @@ FUN_02061D74: ; 0x02061D74 ldr r2, [r4, #0x0] add r0, r5, #0x0 mov r1, #0x1 - bl FUN_0200B02C + bl BufferPoketchAppName ldrh r2, [r4, #0x4] add r0, r5, #0x0 mov r1, #0x2 @@ -2378,13 +2378,13 @@ FUN_02061DE4: ; 0x02061DE4 add r2, r0, #0x0 add r0, r5, #0x0 mov r1, #0x1 - bl FUN_0200B2AC + bl BufferContestMessage2 ldrb r0, [r4, #0x7] bl FUN_02083268 add r2, r0, #0x0 add r0, r5, #0x0 mov r1, #0x2 - bl FUN_0200B278 + bl BufferContestMessage mov r0, #0x0 str r0, [sp, #0x0] mov r3, #0x1 @@ -2392,7 +2392,7 @@ FUN_02061DE4: ; 0x02061DE4 ldrb r2, [r4, #0x9] add r0, r5, #0x0 mov r1, #0x3 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r5, #0x0 mov r1, #0x4 add r2, r6, #0x0 @@ -2557,7 +2557,7 @@ FUN_02061F60: ; 0x02061F60 add r0, r5, #0x0 mov r1, #0x1 add r2, r4, #0x0 - bl FUN_0200B628 + bl BufferPoffinName ldrh r2, [r6, #0x2] add r0, r5, #0x0 mov r1, #0x2 @@ -2648,7 +2648,7 @@ FUN_02061FF8: ; 0x02061FF8 ldrb r2, [r4, #0x1e] add r0, r5, #0x0 mov r1, #0x2 - bl FUN_0200AE04 + bl BufferNatureName ldrh r2, [r4, #0x24] add r0, r5, #0x0 mov r1, #0x5 @@ -2670,7 +2670,7 @@ _02062050: ldrb r2, [r4, #0x0] add r0, r5, #0x0 mov r1, #0x3 - bl FUN_0200B660 + bl BufferFashionName add sp, #0x8 mov r0, #0x2c pop {r4-r6, pc} @@ -2678,7 +2678,7 @@ _02062062: ldrh r2, [r4, #0x22] add r0, r5, #0x0 mov r1, #0x3 - bl FUN_0200AE38 + bl BufferItemName add sp, #0x8 mov r0, #0x2e pop {r4-r6, pc} @@ -2795,7 +2795,7 @@ _0206211E: ldr r0, [sp, #0x8] mov r1, #0x2 add r2, r4, #0x0 - bl FUN_0200AF18 + bl BufferTypeName mov r0, #0x0 add sp, #0x10 pop {r3-r7, pc} @@ -2842,7 +2842,7 @@ _0206218C: add r2, r0, #0x0 add r0, r7, #0x0 mov r1, #0x0 - bl GetLandmarkName + bl BufferLandmarkName cmp r4, #0xb bhi _0206222C add r0, r4, r4 @@ -2953,7 +2953,7 @@ FUN_02062240: ; 0x02062240 add r2, r0, #0x0 add r0, r4, #0x0 mov r1, #0x0 - bl GetLandmarkName + bl BufferLandmarkName add r2, sp, #0x0 ldrh r2, [r2, #0x0] add r0, r4, #0x0 @@ -3037,11 +3037,11 @@ _02062304: add r0, r6, #0x0 mov r1, #0x0 add r2, r5, #0x0 - bl FUN_0200AF18 + bl BufferTypeName add r0, r6, #0x0 mov r1, #0x1 add r2, r4, #0x0 - bl FUN_0200AF18 + bl BufferTypeName add r0, r5, #0x0 add r1, r4, #0x0 bl FUN_02062290 @@ -3180,7 +3180,7 @@ FUN_020623F4: ; 0x020623F4 add r2, r0, #0x0 add r0, r5, #0x0 mov r1, #0x0 - bl GetLandmarkName + bl BufferLandmarkName add r0, r6, #0x0 add r1, r4, #0x0 bl FUN_02025238 @@ -3291,7 +3291,7 @@ _020624C6: ldrh r2, [r2, #0x0] add r0, r6, #0x0 mov r1, #0x1 - bl FUN_0200AE38 + bl BufferItemName mov r0, #0x2a add sp, #0xc pop {r3-r6, pc} @@ -3388,7 +3388,7 @@ _0206257A: mov r1, #0x0 add r2, r4, #0x0 add r3, r6, #0x0 - bl FUN_0200ABB4 + bl BufferString add r0, r4, #0x0 bl String_dtor add r0, r5, #0x0 diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s index 92829a69..9809241c 100644 --- a/arm9/asm/unk_020625EC.s +++ b/arm9/asm/unk_020625EC.s @@ -926,7 +926,7 @@ FUN_02062C80: ; 0x02062C80 ldr r2, [r5, #0x0] mov r0, #0x2 mov r1, #0x4c - bl FUN_0200AA90 + bl ScrStrBufs_new_custom str r0, [r5, #0x30] ldr r1, [r5, #0x0] mov r0, #0x4c @@ -1052,7 +1052,7 @@ _02062D84: ldr r0, [r6, #0x34] bl String_dtor ldr r0, [r6, #0x30] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r6, #0x2c] bl DestroyMsgData pop {r4-r6, pc} @@ -1720,7 +1720,7 @@ _02063318: ldr r2, [sp, #0x1c] mov r1, #0x0 mov r3, #0x1 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x1 str r0, [sp, #0x0] mov r0, #0x2 @@ -1730,7 +1730,7 @@ _02063318: ldr r2, [r2, #0x8] mov r1, #0x1 mov r3, #0x2 - bl FUN_0200ABB4 + bl BufferString ldr r0, [r4, #0x30] ldr r1, [r4, #0x34] ldr r2, [r4, #0x44] @@ -1756,7 +1756,7 @@ _02063318: ldrh r3, [r3, #0x4] mov r1, #0x0 add r2, r5, #0x0 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r2, [sp, #0x14] ldr r0, [r4, #0x30] ldrh r2, [r2, #0x6] diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index 22b20ee4..dd82a0eb 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -1862,7 +1862,7 @@ FUN_02066270: ; 0x02066270 ldr r2, [r6, #0x0] mov r0, #0x1 mov r1, #0x80 - bl FUN_0200AA90 + bl ScrStrBufs_new_custom mov r1, #0x11 lsl r1, r1, #0x4 str r0, [r6, r1] @@ -1932,7 +1932,7 @@ _020662F0: mov r0, #0x11 lsl r0, r0, #0x4 ldr r0, [r6, r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete mov r0, #0x43 lsl r0, r0, #0x2 ldr r0, [r6, r0] @@ -2091,7 +2091,7 @@ _02066426: ldr r2, [r2, #0x24] mov r1, #0x0 mov r3, #0x2 - bl FUN_0200ABB4 + bl BufferString mov r2, #0x11 lsl r2, r2, #0x4 lsl r3, r4, #0x2 diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index a11f74e3..956f6263 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -177,7 +177,7 @@ FUN_0206C700: ; 0x0206C700 bl NewMsgDataFromNarc str r0, [r4, #0x8] add r0, r5, #0x0 - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r4, #0xc] mov r0, #0x5 lsl r0, r0, #0x6 @@ -294,7 +294,7 @@ FUN_0206C92C: ; 0x0206C92C bl FUN_0200E3A0 mov r0, #0x0 add r1, r0, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB ldr r0, [r4, #0x4] mov r1, #0x1 bl FUN_020191A4 @@ -323,7 +323,7 @@ FUN_0206C92C: ; 0x0206C92C ldr r0, [r4, #0x8] bl DestroyMsgData ldr r0, [r4, #0xc] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r4, #0x10] bl FreeToHeap ldr r0, [r4, #0x3c] @@ -643,7 +643,7 @@ _0206CBE4: add r2, r0, #0x0 ldr r0, [r4, #0xc] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r1, [r4, #0x7c] mov r0, #0x2 tst r0, r1 @@ -1050,13 +1050,13 @@ _0206CF7E: add r2, r0, #0x0 ldr r0, [r4, #0xc] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r0, [r4, #0x28] bl FUN_020690E4 add r2, r0, #0x0 ldr r0, [r4, #0xc] mov r1, #0x1 - bl FUN_0200AC60 + bl BufferBoxMonSpeciesName ldr r1, _0206D1D8 ; =0x00000396 add r0, r4, #0x0 bl FUN_0206DD6C @@ -1168,12 +1168,12 @@ _0206D0AC: add r2, r0, #0x0 ldr r0, [r4, #0xc] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add r2, sp, #0xc ldrh r2, [r2, #0x0] ldr r0, [r4, #0xc] mov r1, #0x1 - bl FUN_0200AD5C + bl BufferMoveName add r0, r4, #0x0 mov r1, #0x4 bl FUN_0206DD6C @@ -1195,13 +1195,13 @@ _0206D0E8: add r2, r0, #0x0 ldr r0, [r4, #0xc] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add r2, r4, #0x0 add r2, #0x6c ldrh r2, [r2, #0x0] ldr r0, [r4, #0xc] mov r1, #0x1 - bl FUN_0200AD5C + bl BufferMoveName ldr r1, _0206D1E0 ; =0x000004A9 add r0, r4, #0x0 bl FUN_0206DD6C @@ -1226,7 +1226,7 @@ _0206D12C: add r2, r0, #0x0 ldr r0, [r4, #0xc] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r1, _0206D1E4 ; =0x000004AA add r0, r4, #0x0 bl FUN_0206DD6C @@ -1511,7 +1511,7 @@ _0206D398: ldrh r2, [r2, #0x0] ldr r0, [r4, #0xc] mov r1, #0x0 - bl FUN_0200AD5C + bl BufferMoveName ldr r1, _0206D548 ; =0x000004AD add r0, r4, #0x0 bl FUN_0206DD6C @@ -1565,13 +1565,13 @@ _0206D406: add r2, r0, #0x0 ldr r0, [r4, #0xc] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add r2, r4, #0x0 add r2, #0x6c ldrh r2, [r2, #0x0] ldr r0, [r4, #0xc] mov r1, #0x1 - bl FUN_0200AD5C + bl BufferMoveName ldr r1, _0206D550 ; =0x000004AE add r0, r4, #0x0 bl FUN_0206DD6C @@ -1645,7 +1645,7 @@ _0206D4A6: add r2, r0, #0x0 ldr r0, [r4, #0xc] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add r1, r4, #0x0 add r1, #0x6e ldrb r1, [r1, #0x0] @@ -1656,7 +1656,7 @@ _0206D4A6: add r2, r0, #0x0 ldr r0, [r4, #0xc] mov r1, #0x1 - bl FUN_0200AD5C + bl BufferMoveName mov r1, #0x4b add r0, r4, #0x0 lsl r1, r1, #0x4 @@ -1701,13 +1701,13 @@ _0206D51E: add r2, r0, #0x0 ldr r0, [r4, #0xc] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add r2, r4, #0x0 add r2, #0x6c ldrh r2, [r2, #0x0] ldr r0, [r4, #0xc] mov r1, #0x1 - bl FUN_0200AD5C + bl BufferMoveName ldr r1, _0206D55C ; =0x000004B2 b _0206D560 .balign 4 @@ -1966,7 +1966,7 @@ _0206D748: add r2, r0, #0x0 ldr r0, [r4, #0xc] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r1, _0206D81C ; =0x00000397 add r0, r4, #0x0 bl FUN_0206DD6C @@ -2513,7 +2513,7 @@ _0206DA26: bl FUN_0201E6E4 ldr r0, _0206DC44 ; =FUN_0206DD08 add r1, r5, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB add sp, #0xb8 pop {r4-r6, pc} .balign 4 diff --git a/arm9/asm/unk_0206E2F0.s b/arm9/asm/unk_0206E2F0.s index 8694a11b..6741fd51 100644 --- a/arm9/asm/unk_0206E2F0.s +++ b/arm9/asm/unk_0206E2F0.s @@ -188,7 +188,7 @@ FUN_0206E3F8: ; 0x0206E3F8 bl NewMsgDataFromNarc add r6, r0, #0x0 add r0, r4, #0x0 - bl FUN_0200AA80 + bl ScrStrBufs_new add r4, r0, #0x0 cmp r5, #0x0 bne _0206E428 @@ -215,7 +215,7 @@ _0206E428: str r0, [sp, #0x4] add r0, r4, #0x0 mov r3, #0x4 - bl FUN_0200AD38 + bl BufferIntegerAsString b _0206E4FA _0206E454: add r2, r1, #0x2 ; ITEM_SEAL_CASE @@ -234,7 +234,7 @@ _0206E454: str r0, [sp, #0x4] add r0, r4, #0x0 mov r3, #0x4 - bl FUN_0200AD38 + bl BufferIntegerAsString b _0206E4FA _0206E47E: add r2, r1, #0x3 ; ITEM_FASHION_CASE @@ -253,7 +253,7 @@ _0206E47E: str r0, [sp, #0x4] add r0, r4, #0x0 mov r3, #0x3 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r7, #0x0 bl FUN_0206E3D8 add r2, r0, #0x0 @@ -263,7 +263,7 @@ _0206E47E: add r0, r4, #0x0 mov r3, #0x2 str r1, [sp, #0x4] - bl FUN_0200AD38 + bl BufferIntegerAsString b _0206E4FA _0206E4C0: add r1, #0xc ; ITEM_COIN_CASE @@ -282,10 +282,10 @@ _0206E4C0: str r0, [sp, #0x4] add r0, r4, #0x0 mov r3, #0x5 - bl FUN_0200AD38 + bl BufferIntegerAsString b _0206E4FA _0206E4EA: - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r6, #0x0 bl DestroyMsgData add sp, #0xc @@ -299,7 +299,7 @@ _0206E4FA: add r0, r5, #0x0 bl String_dtor add r0, r4, #0x0 - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r6, #0x0 bl DestroyMsgData mov r0, #0x1 @@ -351,7 +351,7 @@ _0206E56A: bl NewMsgDataFromNarc add r7, r0, #0x0 add r0, r4, #0x0 - bl FUN_0200AA80 + bl ScrStrBufs_new add r4, r0, #0x0 add r0, r7, #0x0 mov r1, #0x24 @@ -360,7 +360,7 @@ _0206E56A: ldr r2, [sp, #0x0] add r0, r4, #0x0 mov r1, #0x0 - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r4, #0x0 add r1, r5, #0x0 add r2, r6, #0x0 @@ -368,7 +368,7 @@ _0206E56A: add r0, r6, #0x0 bl String_dtor add r0, r4, #0x0 - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r7, #0x0 bl DestroyMsgData pop {r3-r7, pc} diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index 7a1729d2..3e7aed0c 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern UNK_021C48F8 + .extern gMain .extern gMain .section .rodata @@ -119,7 +119,7 @@ FUN_0206F3FC: ; 0x0206F3FC add r4, r0, #0x0 mov r0, #0x0 add r1, r0, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB bl FUN_02015F1C bl FUN_0201E6D8 bl FUN_0201E740 @@ -290,7 +290,7 @@ _0206F564: _0206F582: ldr r0, _0206F5A8 ; =FUN_0206FB58 add r1, r4, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB bl FUN_02033F20 mov r0, #0x1 add sp, #0xc @@ -964,7 +964,7 @@ FUN_0206FAA4: ; 0x0206FAA4 add r6, r0, #0x0 mov r0, #0x0 add r1, r0, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB add r0, r6, #0x0 bl FUN_02073A2C add r0, r6, #0x0 @@ -1009,7 +1009,7 @@ _0206FAFC: mov r0, #0x6a lsl r0, r0, #0x4 ldr r0, [r6, r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, _0206FB54 ; =0x00000B34 ldr r0, [r6, r0] cmp r0, #0x0 @@ -1442,7 +1442,7 @@ _0206FEC2: ldr r1, _0206FF64 ; =0x00000698 str r0, [r6, r1] mov r0, #0xc - bl FUN_0200AA80 + bl ScrStrBufs_new mov r1, #0x6a lsl r1, r1, #0x4 add r7, r1, #0x0 @@ -4397,7 +4397,7 @@ _02071630: lsl r0, r0, #0x4 ldr r0, [r4, r0] mov r3, #0x3 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r1, #0x6a lsl r1, r1, #0x4 ldr r0, [r4, r1] @@ -4688,7 +4688,7 @@ _02071886: strh r1, [r0, #0x0] add r0, sp, #0x4 str r0, [sp, #0x0] - ldr r3, _020718C8 ; =UNK_021C48F8 + ldr r3, _020718C8 ; =gMain + 0x40 ldr r0, [r5, #0x0] ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] @@ -4707,7 +4707,7 @@ _020718BA: .balign 4 _020718C0: .word UNK_020F94B8 _020718C4: .word 0x0000FFFE -_020718C8: .word UNK_021C48F8 +_020718C8: .word gMain + 0x40 thumb_func_start FUN_020718CC FUN_020718CC: ; 0x020718CC @@ -5047,7 +5047,7 @@ _02071B34: lsl r0, r0, #0x4 ldr r0, [r4, r0] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r0, #0x0 str r0, [sp, #0x0] mov r1, #0x1 @@ -5058,7 +5058,7 @@ _02071B34: ldrh r2, [r4, r2] ldr r0, [r4, r0] mov r3, #0x3 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r1, #0x6a lsl r1, r1, #0x4 ldr r0, [r4, r1] @@ -5570,7 +5570,7 @@ _02071FA0: lsl r0, r0, #0x4 ldr r0, [r5, r0] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r2, #0x6a lsl r2, r2, #0x4 ldr r0, [r5, r2] @@ -5578,7 +5578,7 @@ _02071FA0: ldr r2, [r5, r2] mov r1, #0x1 ldrh r2, [r2, #0x24] - bl FUN_0200AE38 + bl BufferItemName mov r2, #0x6a lsl r2, r2, #0x4 add r1, r2, #0x4 @@ -5603,7 +5603,7 @@ _02071FF2: lsl r0, r0, #0x4 ldr r0, [r5, r0] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r2, _02072078 ; =0x00000B25 mov r3, #0x6a ldrb r4, [r5, r2] @@ -5615,7 +5615,7 @@ _02071FF2: add r3, #0x6c ldrh r2, [r2, r3] mov r1, #0x1 - bl FUN_0200AE70 + bl BufferItemNameWithIndefArticle mov r2, #0x6a lsl r2, r2, #0x4 add r1, r2, #0x4 @@ -5879,13 +5879,13 @@ _02072246: ldr r0, [r5, r0] mov r1, #0x1 add r2, r4, #0x0 - bl FUN_0200AE38 + bl BufferItemName mov r0, #0x6a lsl r0, r0, #0x4 ldr r0, [r5, r0] mov r1, #0x2 add r2, r6, #0x0 - bl FUN_0200AE38 + bl BufferItemName mov r2, #0x6a lsl r2, r2, #0x4 add r1, r2, #0x4 @@ -5998,7 +5998,7 @@ FUN_0207230C: ; 0x0207230C lsl r0, r0, #0x4 ldr r0, [r5, r0] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r2, #0x6a lsl r2, r2, #0x4 ldr r0, [r5, r2] @@ -6006,7 +6006,7 @@ FUN_0207230C: ; 0x0207230C ldr r2, [r5, r2] mov r1, #0x1 ldrh r2, [r2, #0x24] - bl FUN_0200AE38 + bl BufferItemName mov r2, #0x6a lsl r2, r2, #0x4 add r1, r2, #0x4 @@ -6036,13 +6036,13 @@ _02072388: ldr r0, [r5, r0] mov r1, #0x1 add r2, r4, #0x0 - bl FUN_0200AE38 + bl BufferItemName mov r0, #0x6a lsl r0, r0, #0x4 ldr r0, [r5, r0] mov r1, #0x2 add r2, r6, #0x0 - bl FUN_0200AE38 + bl BufferItemName mov r2, #0x6a lsl r2, r2, #0x4 add r1, r2, #0x4 diff --git a/arm9/asm/unk_02072548.s b/arm9/asm/unk_02072548.s index 99ab8a55..f6f09ad1 100644 --- a/arm9/asm/unk_02072548.s +++ b/arm9/asm/unk_02072548.s @@ -406,7 +406,7 @@ FUN_020727FC: ; 0x020727FC ldr r0, [r5, r0] mov r1, #0x0 add r2, r7, #0x0 - bl FUN_0200AD5C + bl BufferMoveName mov r1, #0x6a add r4, #0xf lsl r1, r1, #0x4 @@ -596,7 +596,7 @@ _0207297E: lsl r0, r0, #0x4 ldr r0, [r5, r0] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r1, #0x6a lsl r1, r1, #0x4 ldr r0, [r5, r1] @@ -657,7 +657,7 @@ FUN_02072A00: ; 0x02072A00 lsl r0, r0, #0x4 ldr r0, [r5, r0] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r2, #0x6a mov r1, #0x2c lsl r2, r2, #0x4 @@ -2090,7 +2090,7 @@ _0207356C: mov r1, #0x0 sub r2, r3, r2 mov r3, #0x2 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x6a ldr r1, _02073638 ; =0x000006A4 lsl r0, r0, #0x4 @@ -2180,7 +2180,7 @@ _0207366E: ldr r0, [r5, r0] mov r1, #0x0 mov r3, #0x3 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x6a ldr r1, _020736F0 ; =0x000006A4 lsl r0, r0, #0x4 diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s index 8eed46de..8b8442a3 100644 --- a/arm9/asm/unk_02073DA8.s +++ b/arm9/asm/unk_02073DA8.s @@ -214,7 +214,7 @@ FUN_02073EEC: ; 0x02073EEC lsl r0, r0, #0x4 ldr r0, [r5, r0] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r2, #0x6a lsl r2, r2, #0x4 add r1, r2, #0x4 @@ -260,7 +260,7 @@ _02073F66: lsl r0, r0, #0x4 ldr r0, [r5, r0] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r2, _0207404C ; =0x00000B25 mov r3, #0x6a ldrb r6, [r5, r2] @@ -272,7 +272,7 @@ _02073F66: add r3, #0x6c ldrh r2, [r2, r3] mov r1, #0x1 - bl FUN_0200AE38 + bl BufferItemName mov r2, #0x6a lsl r2, r2, #0x4 add r1, r2, #0x4 diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s index 4750d078..9b71148c 100644 --- a/arm9/asm/unk_0207550C.s +++ b/arm9/asm/unk_0207550C.s @@ -372,7 +372,7 @@ FUN_020757F4: ; 0x020757F4 lsl r0, r0, #0x4 ldr r0, [r4, r0] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add r0, r6, #0x0 bl FUN_0207550C cmp r0, #0x1b @@ -553,7 +553,7 @@ _0207598C: ldr r0, [r4, r0] mov r1, #0x1 mov r2, #0x0 - bl FUN_0200AF50 + bl BufferStatName mov r1, #0x6a lsl r1, r1, #0x4 ldr r0, [r4, r1] @@ -575,7 +575,7 @@ _020759BE: mov r1, #0x1 ldr r0, [r4, r0] add r2, r1, #0x0 - bl FUN_0200AF50 + bl BufferStatName mov r1, #0x6a lsl r1, r1, #0x4 ldr r0, [r4, r1] @@ -597,7 +597,7 @@ _020759F0: ldr r0, [r4, r0] mov r1, #0x1 mov r2, #0x2 - bl FUN_0200AF50 + bl BufferStatName mov r1, #0x6a lsl r1, r1, #0x4 ldr r0, [r4, r1] @@ -619,7 +619,7 @@ _02075A22: ldr r0, [r4, r0] mov r1, #0x1 mov r2, #0x3 - bl FUN_0200AF50 + bl BufferStatName mov r1, #0x6a lsl r1, r1, #0x4 ldr r0, [r4, r1] @@ -641,7 +641,7 @@ _02075A54: ldr r0, [r4, r0] mov r1, #0x1 mov r2, #0x4 - bl FUN_0200AF50 + bl BufferStatName mov r1, #0x6a lsl r1, r1, #0x4 ldr r0, [r4, r1] @@ -663,7 +663,7 @@ _02075A86: ldr r0, [r4, r0] mov r1, #0x1 mov r2, #0x5 - bl FUN_0200AF50 + bl BufferStatName mov r1, #0x6a lsl r1, r1, #0x4 ldr r0, [r4, r1] @@ -686,7 +686,7 @@ _02075AB8: ldr r0, [r4, r0] mov r1, #0x1 mov r2, #0x0 - bl FUN_0200AF50 + bl BufferStatName mov r1, #0x6a lsl r1, r1, #0x4 ldr r0, [r4, r1] @@ -709,7 +709,7 @@ _02075AEC: mov r1, #0x1 ldr r0, [r4, r0] add r2, r1, #0x0 - bl FUN_0200AF50 + bl BufferStatName mov r1, #0x6a lsl r1, r1, #0x4 ldr r0, [r4, r1] @@ -732,7 +732,7 @@ _02075B20: ldr r0, [r4, r0] mov r1, #0x1 mov r2, #0x2 - bl FUN_0200AF50 + bl BufferStatName mov r1, #0x6a lsl r1, r1, #0x4 ldr r0, [r4, r1] @@ -755,7 +755,7 @@ _02075B54: ldr r0, [r4, r0] mov r1, #0x1 mov r2, #0x3 - bl FUN_0200AF50 + bl BufferStatName mov r1, #0x6a lsl r1, r1, #0x4 ldr r0, [r4, r1] @@ -784,7 +784,7 @@ _02075B98: ldr r0, [r4, r0] mov r1, #0x1 mov r2, #0x4 - bl FUN_0200AF50 + bl BufferStatName mov r1, #0x6a lsl r1, r1, #0x4 ldr r0, [r4, r1] @@ -807,7 +807,7 @@ _02075BCA: ldr r0, [r4, r0] mov r1, #0x1 mov r2, #0x5 - bl FUN_0200AF50 + bl BufferStatName mov r1, #0x6a lsl r1, r1, #0x4 ldr r0, [r4, r1] @@ -829,7 +829,7 @@ _02075BFE: ldr r0, [r4, r0] mov r1, #0x0 add r2, r5, #0x0 - bl FUN_0200AD5C + bl BufferMoveName mov r1, #0x6a lsl r1, r1, #0x4 ldr r0, [r4, r1] @@ -1287,7 +1287,7 @@ _02075FDA: lsl r0, r0, #0x4 ldr r0, [r5, r0] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r0, #0x0 mov r3, #0x6a str r0, [sp, #0x0] @@ -1304,7 +1304,7 @@ _02075FDA: ldrh r2, [r2, r3] mov r3, #0x3 sub r2, r4, r2 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r1, #0x6a lsl r1, r1, #0x4 ldr r0, [r5, r1] @@ -1587,7 +1587,7 @@ _02076212: lsl r0, r0, #0x4 ldr r0, [r4, r0] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r1, #0x6a lsl r1, r1, #0x4 ldr r0, [r4, r1] @@ -1878,7 +1878,7 @@ FUN_0207640C: ; 0x0207640C lsl r0, r0, #0x4 ldr r0, [r5, r0] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r0, #0x0 mov r3, #0x6a str r0, [sp, #0x0] @@ -1894,7 +1894,7 @@ FUN_0207640C: ; 0x0207640C add r3, #0x6a ldrh r2, [r2, r3] mov r3, #0x3 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r1, #0x6a lsl r1, r1, #0x4 ldr r0, [r5, r1] @@ -2089,7 +2089,7 @@ _020766BA: lsl r0, r0, #0x4 ldr r0, [r4, r0] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r2, #0x6a lsl r2, r2, #0x4 ldr r0, [r4, r2] @@ -2097,7 +2097,7 @@ _020766BA: ldr r2, [r4, r2] mov r1, #0x1 ldrh r2, [r2, #0x26] - bl FUN_0200AD5C + bl BufferMoveName ldr r0, _02076880 ; =0x0000069C mov r1, #0x34 ldr r0, [r4, r0] @@ -2136,7 +2136,7 @@ _02076724: lsl r0, r0, #0x4 ldr r0, [r4, r0] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r2, #0x6a lsl r2, r2, #0x4 ldr r0, [r4, r2] @@ -2144,7 +2144,7 @@ _02076724: ldr r2, [r4, r2] mov r1, #0x1 ldrh r2, [r2, #0x26] - bl FUN_0200AD5C + bl BufferMoveName ldr r0, _02076880 ; =0x0000069C mov r1, #0xc2 ldr r0, [r4, r0] @@ -2216,7 +2216,7 @@ _020767A4: ldr r2, [r4, r2] mov r1, #0x1 ldrh r2, [r2, #0x26] - bl FUN_0200AD5C + bl BufferMoveName mov r1, #0x6a lsl r1, r1, #0x4 ldr r0, [r4, r1] @@ -2315,7 +2315,7 @@ FUN_02076890: ; 0x02076890 lsl r0, r0, #0x4 ldr r0, [r4, r0] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r0, _02076944 ; =0x000005A4 ldr r2, [r4, r0] add r1, r2, #0x0 @@ -2327,7 +2327,7 @@ FUN_02076890: ; 0x02076890 ldrh r2, [r2, #0x26] ldr r0, [r4, r0] mov r1, #0x1 - bl FUN_0200AD5C + bl BufferMoveName add r0, r4, #0x0 bl FUN_020769A4 pop {r3-r5, pc} @@ -2341,7 +2341,7 @@ _020768E6: lsl r0, r0, #0x4 ldr r0, [r4, r0] mov r1, #0x1 - bl FUN_0200AD5C + bl BufferMoveName ldr r0, _02076948 ; =0x0000069C mov r1, #0x3c ldr r0, [r4, r0] @@ -2599,7 +2599,7 @@ FUN_02076AF8: ; 0x02076AF8 lsl r0, r0, #0x4 ldr r0, [r4, r0] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r2, #0x6a lsl r2, r2, #0x4 ldr r0, [r4, r2] @@ -2607,7 +2607,7 @@ FUN_02076AF8: ; 0x02076AF8 ldr r2, [r4, r2] mov r1, #0x1 ldrh r2, [r2, #0x26] - bl FUN_0200AD5C + bl BufferMoveName cmp r5, #0xfd bhi _02076B5A bhs _02076BB2 @@ -2783,7 +2783,7 @@ FUN_02076C94: ; 0x02076C94 lsl r0, r0, #0x4 ldr r0, [r4, r0] mov r1, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r0, _02076D2C ; =0x000005A4 ldr r2, [r4, r0] add r1, r2, #0x0 @@ -2795,7 +2795,7 @@ FUN_02076C94: ; 0x02076C94 ldrh r2, [r2, #0x26] ldr r0, [r4, r0] mov r1, #0x1 - bl FUN_0200AD5C + bl BufferMoveName add r0, r4, #0x0 bl FUN_02076E28 pop {r3-r5, pc} @@ -2809,7 +2809,7 @@ _02076CDC: lsl r0, r0, #0x4 ldr r0, [r4, r0] mov r1, #0x1 - bl FUN_0200AD5C + bl BufferMoveName ldr r0, _02076D34 ; =0x0000069C mov r1, #0x3c ldr r0, [r4, r0] @@ -2874,7 +2874,7 @@ FUN_02076D3C: ; 0x02076D3C ldr r2, [r5, r2] mov r1, #0x1 ldrh r2, [r2, #0x26] - bl FUN_0200AD5C + bl BufferMoveName mov r1, #0x6a lsl r1, r1, #0x4 ldr r0, [r5, r1] @@ -3156,7 +3156,7 @@ FUN_02076FB0: ; 0x02076FB0 ldr r0, [r5, r0] mov r1, #0x0 add r2, r4, #0x0 - bl FUN_0200AD5C + bl BufferMoveName mov r1, #0x6a lsl r1, r1, #0x4 ldr r0, [r5, r1] diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index 863b9270..7ada0ae4 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -1,8 +1,8 @@ .include "asm/macros.inc" .include "global.inc" - .extern UNK_021C48F8 - .extern gUnk021C4918 + .extern gMain + .extern gMain .extern gMain .section .rodata @@ -387,7 +387,7 @@ _020772FC: _020772FE: mov r0, #0x0 add r1, r0, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB bl FUN_02015F1C bl FUN_0201E6D8 bl FUN_0201E740 @@ -422,7 +422,7 @@ _020772FE: lsl r1, r1, #0x4 str r0, [r4, r1] mov r0, #0x12 - bl FUN_0200AA80 + bl ScrStrBufs_new mov r2, #0x5a lsl r2, r2, #0x2 str r0, [r4, r2] @@ -470,7 +470,7 @@ _020772FE: bl FUN_02002C50 ldr r0, _020774A0 ; =FUN_02077AE8 mov r1, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB add r0, r4, #0x0 add r1, r6, #0x0 bl FUN_02077CD4 @@ -518,7 +518,7 @@ _020772FE: bl FUN_0200E1D0 mov r0, #0x1 bl FUN_02077C84 - ldr r0, _020774A8 ; =gUnk021C4918 + ldr r0, _020774A8 ; =gMain + 0x60 mov r1, #0x1 strb r1, [r0, #0x5] bl FUN_0201E7A0 @@ -563,7 +563,7 @@ _02077498: .word 0xFFFFE0FF _0207749C: .word 0x04001000 _020774A0: .word FUN_02077AE8 _020774A4: .word 0x000004C4 -_020774A8: .word gUnk021C4918 +_020774A8: .word gMain + 0x60 _020774AC: .word 0x000004B8 _020774B0: .word UNK_021C5C54 _020774B4: .word 0x000005C4 @@ -1251,15 +1251,15 @@ _02077A0C: mov r0, #0x5a lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [sp, #0x10] bl OverlayManager_FreeData mov r0, #0x0 add r1, r0, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB mov r0, #0x12 bl FUN_020168D0 - ldr r0, _02077A80 ; =gUnk021C4918 + ldr r0, _02077A80 ; =gMain + 0x60 mov r1, #0x0 strb r1, [r0, #0x5] bl FUN_0201E7A0 @@ -1272,7 +1272,7 @@ _02077A70: .word 0x000004AC _02077A74: .word 0x000004B4 _02077A78: .word 0x000004BC _02077A7C: .word 0xFFFF1FFF -_02077A80: .word gUnk021C4918 +_02077A80: .word gMain + 0x60 thumb_func_start FUN_02077A84 FUN_02077A84: ; 0x02077A84 @@ -1670,7 +1670,7 @@ _02077D88: lsl r0, r0, #0x2 ldr r0, [r4, r0] mov r1, #0x0 - bl FUN_0200AC60 + bl BufferBoxMonSpeciesName add r0, r5, #0x0 bl FreeToHeap _02077DCE: @@ -1797,7 +1797,7 @@ FUN_02077E90: ; 0x02077E90 ldr r2, [r4, #0x48] mov r1, #0x1 add r3, r6, #0x0 - bl FUN_0200B410 + bl BufferBoxName ldr r0, [sp, #0x10] cmp r6, r0 beq _02077EF4 @@ -1807,7 +1807,7 @@ FUN_02077E90: ; 0x02077E90 ldr r2, [r4, #0x48] ldr r3, [sp, #0x10] mov r1, #0x2 - bl FUN_0200B410 + bl BufferBoxName ldr r0, [r4, #0x44] add r0, r0, #0x2 str r0, [r4, #0x44] @@ -1819,7 +1819,7 @@ _02077EF4: ldr r2, [r4, #0x48] mov r1, #0x2 add r3, r6, #0x0 - bl FUN_0200B410 + bl BufferBoxName _02077F04: mov r0, #0x56 lsl r0, r0, #0x2 @@ -1850,7 +1850,7 @@ _02077F1A: lsl r0, r0, #0x2 ldr r0, [r5, r0] mov r1, #0x0 - bl FUN_0200AC60 + bl BufferBoxMonSpeciesName add r0, r6, #0x0 bl FreeToHeap b _02077F7E @@ -1875,7 +1875,7 @@ _02077F50: ldr r0, [r5, r0] add r2, r7, #0x0 add r3, r1, #0x0 - bl FUN_0200ABB4 + bl BufferString _02077F7E: mov r1, #0x5a lsl r1, r1, #0x2 @@ -5126,7 +5126,7 @@ FUN_02079930: ; 0x02079930 mov r0, #0x4 mov r12, r0 _02079944: - ldr r2, _020799E0 ; =UNK_021C48F8 + ldr r2, _020799E0 ; =gMain + 0x40 ldrh r0, [r2, #0x20] cmp r0, #0x0 beq _020799DA @@ -5211,5 +5211,5 @@ _020799DA: mov r0, #0x0 pop {r3-r7, pc} nop -_020799E0: .word UNK_021C48F8 +_020799E0: .word gMain + 0x40 _020799E4: .word UNK_020FA264 diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index c49c2d67..c701f1a8 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -59,7 +59,7 @@ FUN_02079C7C: ; 0x02079C7C add r4, r0, #0x0 mov r0, #0x0 add r1, r0, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB bl FUN_02015F1C bl FUN_0201E6D8 bl FUN_0201E740 @@ -156,7 +156,7 @@ FUN_02079C7C: ; 0x02079C7C bl FUN_0207F098 ldr r0, _02079DB0 ; =FUN_02079F24 add r1, r5, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB bl FUN_0201E788 mov r1, #0x0 mov r0, #0x3d @@ -318,7 +318,7 @@ FUN_02079ECC: ; 0x02079ECC add r5, r0, #0x0 mov r0, #0x0 add r1, r0, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB add r0, r5, #0x0 bl FUN_0207F068 add r0, r5, #0x0 @@ -669,7 +669,7 @@ FUN_0207A1A0: ; 0x0207A1A0 lsl r1, r1, #0x4 str r0, [r4, r1] mov r0, #0x13 - bl FUN_0200AA80 + bl ScrStrBufs_new ldr r1, _0207A258 ; =0x0000067C str r0, [r4, r1] mov r0, #0xc @@ -745,7 +745,7 @@ FUN_0207A264: ; 0x0207A264 bl FUN_0200B990 ldr r0, _0207A2D0 ; =0x0000067C ldr r0, [r4, r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete mov r0, #0x25 lsl r0, r0, #0x4 ldr r0, [r4, r0] @@ -1863,7 +1863,7 @@ FUN_0207AB0C: ; 0x0207AB0C mov r1, #0x0 ldr r0, [r7, r0] add r2, r4, #0x0 - bl FUN_0200AC60 + bl BufferBoxMonSpeciesName ldr r2, _0207AEB0 ; =0x0000067C mov r1, #0x25 ldr r0, [r7, r2] @@ -1882,7 +1882,7 @@ FUN_0207AB0C: ; 0x0207AB0C mov r1, #0x0 ldr r0, [r7, r0] add r2, r4, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r2, _0207AEB0 ; =0x0000067C mov r1, #0x95 ldr r0, [r7, r2] @@ -1901,7 +1901,7 @@ FUN_0207AB0C: ; 0x0207AB0C mov r1, #0x0 ldr r0, [r7, r0] add r2, r4, #0x0 - bl FUN_0200AD18 + bl BufferBoxMonOTName ldr r2, _0207AEB0 ; =0x0000067C mov r1, #0x96 ldr r0, [r7, r2] diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s index 3163b4c6..ca5fef37 100644 --- a/arm9/asm/unk_0207D5BC.s +++ b/arm9/asm/unk_0207D5BC.s @@ -404,7 +404,7 @@ FUN_0207D800: ; 0x0207D800 lsl r2, r2, #0x19 ldr r0, [r5, r0] lsr r2, r2, #0x19 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r1, _0207D898 ; =0x0000067C add r2, r4, #0x0 ldr r0, [r5, r1] @@ -452,7 +452,7 @@ FUN_0207D8A0: ; 0x0207D8A0 ldr r0, _0207D91C ; =0x0000067C mov r1, #0x0 ldr r0, [r5, r0] - bl FUN_0200AE38 + bl BufferItemName ldr r0, _0207D920 ; =0x00000674 mov r1, #0x5 ldr r0, [r5, r0] @@ -666,7 +666,7 @@ FUN_0207DA48: ; 0x0207DA48 ldr r0, _0207DA90 ; =0x0000067C add r3, r7, #0x0 ldr r0, [r5, r0] - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r1, _0207DA90 ; =0x0000067C add r2, r4, #0x0 ldr r0, [r5, r1] @@ -1756,7 +1756,7 @@ FUN_0207E200: ; 0x0207E200 ldrb r2, [r4, r2] ldr r0, [r4, r0] mov r1, #0x0 - bl FUN_0200ADCC + bl BufferAbilityName ldr r0, _0207E498 ; =0x00000674 mov r1, #0x7d ldr r0, [r4, r0] @@ -2293,7 +2293,7 @@ FUN_0207E840: ; 0x0207E840 add r2, #0x1d ldrb r2, [r5, r2] mov r3, #0x3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r1, _0207E998 ; =0x0000067C add r2, r4, #0x0 ldr r0, [r5, r1] @@ -2380,7 +2380,7 @@ FUN_0207E840: ; 0x0207E840 add r2, r3, r2 add r2, r2, #0x1 mov r3, #0x3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r1, _0207E998 ; =0x0000067C add r2, r6, #0x0 ldr r0, [r5, r1] diff --git a/arm9/asm/unk_0207F95C.s b/arm9/asm/unk_0207F95C.s index d53dcbdf..cface8d1 100644 --- a/arm9/asm/unk_0207F95C.s +++ b/arm9/asm/unk_0207F95C.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern UNK_021C48F8 + .extern gMain .section .rodata .global UNK_020FB6F8 @@ -274,7 +274,7 @@ _0207FADA: strh r1, [r0, #0x0] add r0, sp, #0x4 str r0, [sp, #0x0] - ldr r3, _0207FB24 ; =UNK_021C48F8 + ldr r3, _0207FB24 ; =gMain + 0x40 ldr r0, [r5, #0x0] ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] @@ -294,7 +294,7 @@ _0207FB12: _0207FB18: .word 0x0000068F _0207FB1C: .word UNK_0210613C _0207FB20: .word 0x0000FFFE -_0207FB24: .word UNK_021C48F8 +_0207FB24: .word gMain + 0x40 thumb_func_start FUN_0207FB28 FUN_0207FB28: ; 0x0207FB28 diff --git a/arm9/asm/unk_0207FD00.s b/arm9/asm/unk_0207FD00.s index 496486d7..38a42358 100644 --- a/arm9/asm/unk_0207FD00.s +++ b/arm9/asm/unk_0207FD00.s @@ -37,7 +37,7 @@ FUN_0207FD00: ; 0x0207FD00 ldr r2, [r4, #0x0] mov r0, #0x9 mov r1, #0x20 - bl FUN_0200AA90 + bl ScrStrBufs_new_custom str r0, [r4, #0x8] str r5, [r4, #0xc] str r6, [r4, #0x10] @@ -459,7 +459,7 @@ _020800C0: bl FreeToHeap _020800CA: ldr r0, [r4, #0x8] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r4, #0x4] bl DestroyMsgData add r0, r4, #0x0 @@ -519,7 +519,7 @@ FUN_02080108: ; 0x02080108 str r0, [sp, #0x4] ldr r0, [r5, #0x8] mov r1, #0x0 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r5, #0xc] mov r1, #0x95 mov r2, #0x0 @@ -527,7 +527,7 @@ FUN_02080108: ; 0x02080108 add r2, r0, #0x0 ldr r0, [r5, #0x8] mov r1, #0x1 - bl FUN_0200B764 + bl BufferMonthNameAbbr ldr r0, [r5, #0xc] mov r1, #0x96 mov r2, #0x0 @@ -540,7 +540,7 @@ FUN_02080108: ; 0x02080108 mov r1, #0x2 ldr r0, [r5, #0x8] add r3, r1, #0x0 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r5, #0xc] mov r1, #0x9b mov r2, #0x0 @@ -553,7 +553,7 @@ FUN_02080108: ; 0x02080108 mov r1, #0x3 ldr r0, [r5, #0x8] add r3, r1, #0x0 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r5, #0xc] mov r1, #0x98 mov r2, #0x0 @@ -561,7 +561,7 @@ FUN_02080108: ; 0x02080108 add r2, r0, #0x0 ldr r0, [r5, #0x8] mov r1, #0x4 - bl FUN_0200B59C + bl BufferLocationName ldr r0, [r5, #0xc] mov r1, #0x91 mov r2, #0x0 @@ -573,7 +573,7 @@ FUN_02080108: ; 0x02080108 str r0, [sp, #0x4] ldr r0, [r5, #0x8] mov r1, #0x5 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r5, #0xc] mov r1, #0x92 mov r2, #0x0 @@ -581,7 +581,7 @@ FUN_02080108: ; 0x02080108 add r2, r0, #0x0 ldr r0, [r5, #0x8] mov r1, #0x6 - bl FUN_0200B764 + bl BufferMonthNameAbbr ldr r0, [r5, #0xc] mov r1, #0x93 mov r2, #0x0 @@ -594,7 +594,7 @@ FUN_02080108: ; 0x02080108 ldr r0, [r5, #0x8] mov r1, #0x7 mov r3, #0x2 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r5, #0xc] mov r1, #0x97 mov r2, #0x0 @@ -602,7 +602,7 @@ FUN_02080108: ; 0x02080108 add r2, r0, #0x0 ldr r0, [r5, #0x8] mov r1, #0x8 - bl FUN_0200B59C + bl BufferLocationName ldr r0, [r5, #0x8] ldr r1, [r5, #0x20] add r2, r4, #0x0 @@ -643,7 +643,7 @@ FUN_02080228: ; 0x02080228 str r0, [sp, #0x4] ldr r0, [r4, #0x8] mov r1, #0x0 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r4, #0xc] mov r1, #0x95 mov r2, #0x0 @@ -651,7 +651,7 @@ FUN_02080228: ; 0x02080228 add r2, r0, #0x0 ldr r0, [r4, #0x8] mov r1, #0x1 - bl FUN_0200B764 + bl BufferMonthNameAbbr ldr r0, [r4, #0xc] mov r1, #0x96 mov r2, #0x0 @@ -664,7 +664,7 @@ FUN_02080228: ; 0x02080228 mov r1, #0x2 ldr r0, [r4, #0x8] add r3, r1, #0x0 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r4, #0xc] mov r1, #0x9b mov r2, #0x0 @@ -677,7 +677,7 @@ FUN_02080228: ; 0x02080228 mov r1, #0x3 ldr r0, [r4, #0x8] add r3, r1, #0x0 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r4, #0xc] mov r1, #0x79 mov r2, #0x0 @@ -714,7 +714,7 @@ _020802F8: add r2, r0, #0x0 ldr r0, [r4, #0x8] mov r1, #0x4 - bl FUN_0200B59C + bl BufferLocationName b _0208036E _0208030C: mov r0, #0x1 @@ -723,7 +723,7 @@ _0208030C: add r2, r0, #0x0 ldr r0, [r4, #0x8] mov r1, #0x4 - bl FUN_0200B59C + bl BufferLocationName b _0208036E _02080320: mov r0, #0x1 @@ -732,7 +732,7 @@ _02080320: add r2, r0, #0x0 ldr r0, [r4, #0x8] mov r1, #0x4 - bl FUN_0200B59C + bl BufferLocationName b _0208036E _02080334: mov r0, #0x1 @@ -741,7 +741,7 @@ _02080334: add r2, r0, #0x0 ldr r0, [r4, #0x8] mov r1, #0x4 - bl FUN_0200B59C + bl BufferLocationName b _0208036E _02080348: mov r0, #0x1 @@ -750,7 +750,7 @@ _02080348: add r2, r0, #0x0 ldr r0, [r4, #0x8] mov r1, #0x4 - bl FUN_0200B59C + bl BufferLocationName b _0208036E _0208035C: mov r0, #0x1 @@ -759,7 +759,7 @@ _0208035C: add r2, r0, #0x0 ldr r0, [r4, #0x8] mov r1, #0x4 - bl FUN_0200B59C + bl BufferLocationName _0208036E: ldr r0, [r4, #0x8] ldr r1, [r4, #0x20] @@ -805,7 +805,7 @@ FUN_02080384: ; 0x02080384 str r0, [sp, #0x4] ldr r0, [r5, #0x8] mov r1, #0x5 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r5, #0xc] mov r1, #0x92 mov r2, #0x0 @@ -813,7 +813,7 @@ FUN_02080384: ; 0x02080384 add r2, r0, #0x0 ldr r0, [r5, #0x8] mov r1, #0x6 - bl FUN_0200B764 + bl BufferMonthNameAbbr ldr r0, [r5, #0xc] mov r1, #0x93 mov r2, #0x0 @@ -826,7 +826,7 @@ FUN_02080384: ; 0x02080384 ldr r0, [r5, #0x8] mov r1, #0x7 mov r3, #0x2 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r5, #0xc] mov r1, #0x97 mov r2, #0x0 @@ -834,7 +834,7 @@ FUN_02080384: ; 0x02080384 add r2, r0, #0x0 ldr r0, [r5, #0x8] mov r1, #0x8 - bl FUN_0200B59C + bl BufferLocationName b _02080478 _02080418: mov r1, #0x94 @@ -847,7 +847,7 @@ _02080418: str r0, [sp, #0x4] ldr r0, [r5, #0x8] mov r1, #0x5 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r5, #0xc] mov r1, #0x95 mov r2, #0x0 @@ -855,7 +855,7 @@ _02080418: add r2, r0, #0x0 ldr r0, [r5, #0x8] mov r1, #0x6 - bl FUN_0200B764 + bl BufferMonthNameAbbr ldr r0, [r5, #0xc] mov r1, #0x96 mov r2, #0x0 @@ -868,7 +868,7 @@ _02080418: ldr r0, [r5, #0x8] mov r1, #0x7 mov r3, #0x2 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r5, #0xc] mov r1, #0x98 mov r2, #0x0 @@ -876,7 +876,7 @@ _02080418: add r2, r0, #0x0 ldr r0, [r5, #0x8] mov r1, #0x8 - bl FUN_0200B59C + bl BufferLocationName _02080478: ldr r0, [r5, #0x8] ldr r1, [r5, #0x20] diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s index 51dec0d5..b41f5319 100644 --- a/arm9/asm/unk_02080C38.s +++ b/arm9/asm/unk_02080C38.s @@ -2643,7 +2643,7 @@ FUN_0208201C: ; 0x0208201C add r2, #0xd0 ldrh r2, [r2, #0x0] add r1, r3, #0x0 - bl FUN_0200B244 + bl BufferContestJudgeName pop {r3-r5, pc} thumb_func_start FUN_02082034 @@ -2670,7 +2670,7 @@ FUN_02082034: ; 0x02082034 ldrb r3, [r4, r3] ldr r2, [r2, #0x0] add r1, r6, #0x0 - bl FUN_0200ABB4 + bl BufferString add sp, #0x8 pop {r4-r6, pc} .balign 4 @@ -2689,7 +2689,7 @@ FUN_0208206C: ; 0x0208206C add r2, r0, #0x0 add r0, r4, #0x0 add r1, r6, #0x0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname pop {r4-r6, pc} .balign 4 @@ -2710,7 +2710,7 @@ FUN_02082090: ; 0x02082090 add r2, r0, #0x0 add r0, r5, #0x0 add r1, r4, #0x0 - bl FUN_0200B278 + bl BufferContestMessage pop {r3-r5, pc} .balign 4 @@ -2728,7 +2728,7 @@ FUN_020820B8: ; 0x020820B8 add r2, r0, #0x0 add r0, r5, #0x0 add r1, r4, #0x0 - bl FUN_0200B2AC + bl BufferContestMessage2 pop {r3-r5, pc} .balign 4 _020820D8: .word 0x0000011F @@ -3041,7 +3041,7 @@ _020822D6: add r2, r0, #0x0 add r0, r4, #0x0 add r1, r5, #0x0 - bl GetRibbonNameOrDesc + bl BufferRibbonNameOrDesc pop {r3-r5, pc} .balign 4 _020822EC: .word 0x0000011F diff --git a/arm9/asm/unk_020859C0.s b/arm9/asm/unk_020859C0.s index efd11044..1a38e392 100644 --- a/arm9/asm/unk_020859C0.s +++ b/arm9/asm/unk_020859C0.s @@ -285,7 +285,7 @@ _02085A9A: bl MOD62_022300E4 ldr r0, _02085BAC ; =MOD62_022310CC add r1, r4, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB add r0, r4, #0x0 bl MOD62_0222DD1C mov r1, #0x0 diff --git a/arm9/asm/unk_02086084.s b/arm9/asm/unk_02086084.s index 9e58b5cc..6ef3d150 100644 --- a/arm9/asm/unk_02086084.s +++ b/arm9/asm/unk_02086084.s @@ -17,7 +17,7 @@ FUN_02086084: ; 0x02086084 add r5, r0, #0x0 mov r0, #0x0 add r1, r0, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB bl FUN_02015F1C mov r2, #0x1 mov r0, #0x3 @@ -95,7 +95,7 @@ FUN_02086084: ; 0x02086084 bl FUN_0200541C ldr r0, _02086164 ; =FUN_02086664 add r1, r4, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB mov r0, #0x1 pop {r3-r5, pc} nop diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index 05e25ce3..09d66fb6 100644 --- a/arm9/asm/unk_02086414.s +++ b/arm9/asm/unk_02086414.s @@ -575,7 +575,7 @@ FUN_020867EC: ; 0x020867EC bl NewMsgDataFromNarc add r7, r0, #0x0 mov r0, #0x47 - bl FUN_0200AA80 + bl ScrStrBufs_new add r5, r0, #0x0 add r0, r7, #0x0 add r1, r4, #0x0 @@ -590,7 +590,7 @@ FUN_020867EC: ; 0x020867EC add r2, r0, #0x0 add r0, r5, #0x0 mov r1, #0x0 - bl FUN_0200AC60 + bl BufferBoxMonSpeciesName ldr r2, [sp, #0x14] add r0, r5, #0x0 add r1, r4, #0x0 @@ -611,7 +611,7 @@ FUN_020867EC: ; 0x020867EC ldr r0, [sp, #0x14] bl String_dtor add r0, r5, #0x0 - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r6, #0x0 add sp, #0x18 pop {r3-r7, pc} diff --git a/arm9/asm/unk_02087D00.s b/arm9/asm/unk_02087D00.s index bf502fa3..49d4676c 100644 --- a/arm9/asm/unk_02087D00.s +++ b/arm9/asm/unk_02087D00.s @@ -77,7 +77,7 @@ FUN_02087D00: ; 0x02087D00 mov r0, #0x1 mov r1, #0x20 add r2, r5, #0x0 - bl FUN_0200AA90 + bl ScrStrBufs_new_custom str r0, [sp, #0x4] mov r6, #0x0 _02087D60: @@ -157,7 +157,7 @@ _02087DEE: cmp r6, #0x64 blo _02087D60 ldr r0, [sp, #0x4] - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r4, #0x0 bl FreeToHeap ldr r0, [sp, #0x0] diff --git a/arm9/asm/unk_02088D1C.s b/arm9/asm/unk_02088D1C.s index 87b75f0d..a7a41701 100644 --- a/arm9/asm/unk_02088D1C.s +++ b/arm9/asm/unk_02088D1C.s @@ -95,8 +95,7 @@ UNK_020FD894: ; 0x020FD894 UNK_020FD8C8: ; 0x020FD8C8 .byte 0x00, 0x12 .short 0x0264 - .word UNK_020FD9AC - .word 0x00000082 + .word UNK_020FD9AC, 0x00000082 .byte 0x09, 0x00 .short 0x0252 .word UNK_020FD7D0, 0x00000018 @@ -197,8 +196,8 @@ _02088D2E: nop _02088D3C: .word UNK_020FD8C8 - thumb_func_start FUN_02088D40 -FUN_02088D40: ; 0x02088D40 + thumb_func_start GetCityNamesMsgdataIdByCountry +GetCityNamesMsgdataIdByCountry: ; 0x02088D40 push {r3, lr} bl FUN_02088D20 bl FUN_02088D4C diff --git a/arm9/asm/unk_02089498.s b/arm9/asm/unk_02089498.s index 3962942c..82d06472 100644 --- a/arm9/asm/unk_02089498.s +++ b/arm9/asm/unk_02089498.s @@ -101,7 +101,7 @@ _020894FC: bl FUN_0200E3A0 add r0, r6, #0x0 add r1, r0, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB add r0, r6, #0x0 add r1, r0, #0x0 bl FUN_02015F34 @@ -126,7 +126,7 @@ _020894FC: bl FUN_02089734 ldr r0, _020895EC ; =FUN_02089610 add r1, r4, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB bl FUN_0201E788 mov r0, #0x6 mov r1, #0x1 @@ -176,7 +176,7 @@ _020895BC: bl FUN_020896E0 add r0, r6, #0x0 add r1, r0, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB mov r6, #0x1 _020895DA: add r0, r6, #0x0 diff --git a/arm9/asm/unk_02089960.s b/arm9/asm/unk_02089960.s index 2154cdf9..575eade7 100644 --- a/arm9/asm/unk_02089960.s +++ b/arm9/asm/unk_02089960.s @@ -83,7 +83,7 @@ _020899B8: bl FUN_0200E3A0 add r0, r4, #0x0 add r1, r0, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB add r0, r4, #0x0 add r1, r0, #0x0 bl FUN_02015F34 @@ -123,7 +123,7 @@ _02089A20: bl FUN_02089B2C add r0, r4, #0x0 add r1, r0, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB mov r4, #0x1 _02089A34: add r0, r4, #0x0 diff --git a/arm9/asm/unk_02089D90.s b/arm9/asm/unk_02089D90.s index b4a6a662..b8c341df 100644 --- a/arm9/asm/unk_02089D90.s +++ b/arm9/asm/unk_02089D90.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnk021C4918 + .extern gMain .section .rodata @@ -39,7 +39,7 @@ FUN_02089D90: ; 0x02089D90 bl FUN_0200E3A0 mov r0, #0x0 add r1, r0, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB mov r0, #0x0 add r1, r0, #0x0 bl FUN_02015F34 @@ -58,7 +58,7 @@ FUN_02089D90: ; 0x02089D90 mov r0, #0x4 mov r1, #0x8 bl FUN_0201669C - ldr r0, _02089EFC ; =gUnk021C4918 + ldr r0, _02089EFC ; =gMain + 0x60 mov r1, #0x0 strb r1, [r0, #0x5] bl FUN_0201E7A0 @@ -176,7 +176,7 @@ _02089EE4: nop _02089EF4: .word 0xFFFFE0FF _02089EF8: .word 0x04001000 -_02089EFC: .word gUnk021C4918 +_02089EFC: .word gMain + 0x60 _02089F00: .word 0x04000050 _02089F04: .word 0x04001050 _02089F08: .word 0xFFFF1FFF diff --git a/arm9/asm/unk_02089F24.s b/arm9/asm/unk_02089F24.s index 8dfe9755..5c84eabc 100644 --- a/arm9/asm/unk_02089F24.s +++ b/arm9/asm/unk_02089F24.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnk021C4918 + .extern gMain .extern UNK_020FF3E4 .extern UNK_020FF3EC .extern UNK_020FF3FC @@ -43,7 +43,7 @@ FUN_02089F24: ; 0x02089F24 bl FUN_0200E3A0 mov r0, #0x0 add r1, r0, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB mov r0, #0x0 add r1, r0, #0x0 bl FUN_02015F34 @@ -62,7 +62,7 @@ FUN_02089F24: ; 0x02089F24 mov r0, #0x4 mov r1, #0x8 bl FUN_0201669C - ldr r0, _0208A090 ; =gUnk021C4918 + ldr r0, _0208A090 ; =gMain + 0x60 mov r1, #0x0 strb r1, [r0, #0x5] bl FUN_0201E7A0 @@ -180,7 +180,7 @@ _0208A078: nop _0208A088: .word 0xFFFFE0FF _0208A08C: .word 0x04001000 -_0208A090: .word gUnk021C4918 +_0208A090: .word gMain + 0x60 _0208A094: .word 0x04000050 _0208A098: .word 0x04001050 _0208A09C: .word 0xFFFF1FFF @@ -212,7 +212,7 @@ _0208A0C8: bl FUN_02015EF4 mov r0, #0x0 add r1, r0, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB mov r0, #0x0 add r1, r0, #0x0 bl FUN_02015F34 @@ -231,7 +231,7 @@ _0208A0C8: mov r0, #0x4 mov r1, #0x8 bl FUN_0201669C - ldr r0, _0208A230 ; =gUnk021C4918 + ldr r0, _0208A230 ; =gMain + 0x60 mov r1, #0x0 strb r1, [r0, #0x5] bl FUN_0201E7A0 @@ -350,7 +350,7 @@ _0208A21A: .balign 4 _0208A228: .word 0xFFFFE0FF _0208A22C: .word 0x04001000 -_0208A230: .word gUnk021C4918 +_0208A230: .word gMain + 0x60 _0208A234: .word 0x04000050 _0208A238: .word 0x04001050 _0208A23C: .word 0xFFFF1FFF diff --git a/arm9/asm/unk_0208A338.s b/arm9/asm/unk_0208A338.s index d55eaa28..9764dd11 100644 --- a/arm9/asm/unk_0208A338.s +++ b/arm9/asm/unk_0208A338.s @@ -27,7 +27,7 @@ FUN_0208A338: ; 0x0208A338 bl String_ctor str r0, [r4, #0x8] mov r0, #0x20 - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r4, #0xc] ldr r2, _0208A3C0 ; =0x00000171 mov r0, #0x1 @@ -79,7 +79,7 @@ FUN_0208A3C8: ; 0x0208A3C8 ldr r0, [r4, #0x8] bl String_dtor ldr r0, [r4, #0xc] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r4, #0x10] bl DestroyMsgData add r0, r4, #0x0 diff --git a/arm9/asm/unk_0208A998.s b/arm9/asm/unk_0208A998.s index 4b3a5510..14a02753 100644 --- a/arm9/asm/unk_0208A998.s +++ b/arm9/asm/unk_0208A998.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnk021C4918 + .extern gMain .section .rodata @@ -94,7 +94,7 @@ _0208A9C6: bl OS_EnableIrqMask mov r0, #0x0 add r1, r0, #0x0 - bl FUN_02015F10 + bl Main_SetVBlankIntrCB mov r0, #0x0 add r1, r0, #0x0 bl FUN_02015F34 @@ -113,7 +113,7 @@ _0208A9C6: mov r0, #0x4 mov r1, #0x8 bl FUN_0201669C - ldr r0, _0208ABDC ; =gUnk021C4918 + ldr r0, _0208ABDC ; =gMain + 0x60 mov r1, #0x0 strb r1, [r0, #0x5] bl FUN_0201E7A0 @@ -278,7 +278,7 @@ _0208ABCC: .word UNK_020FF4A4 _0208ABD0: .word FUN_0208A998 _0208ABD4: .word 0xFFFFE0FF _0208ABD8: .word 0x04001000 -_0208ABDC: .word gUnk021C4918 +_0208ABDC: .word gMain + 0x60 _0208ABE0: .word 0x04000050 _0208ABE4: .word 0x04001050 _0208ABE8: .word 0xFFFF1FFF |