diff options
Diffstat (limited to 'arm9/asm')
31 files changed, 206 insertions, 386 deletions
diff --git a/arm9/asm/unk_0206B16C.s b/arm9/asm/pokemon_storage_system.s index 1e7eb1f4..472e04b3 100644 --- a/arm9/asm/unk_0206B16C.s +++ b/arm9/asm/pokemon_storage_system.s @@ -3,22 +3,22 @@ .text - thumb_func_start FUN_0206B16C -FUN_0206B16C: ; 0x0206B16C + thumb_func_start PCStorage_init +PCStorage_init: ; 0x0206B16C push {r3, lr} - bl FUN_0206B180 - bl FUN_02022830 + bl PCStorage_InitializeBoxes + bl SaveSetDirtyBit pop {r3, pc} - thumb_func_start FUN_0206B178 -FUN_0206B178: ; 0x0206B178 + thumb_func_start PCStorage_sizeof +PCStorage_sizeof: ; 0x0206B178 ldr r0, _0206B17C ; =0x000121C8 bx lr .balign 4 _0206B17C: .word 0x000121C8 - thumb_func_start FUN_0206B180 -FUN_0206B180: ; 0x0206B180 + thumb_func_start PCStorage_InitializeBoxes +PCStorage_InitializeBoxes: ; 0x0206B180 push {r3-r7, lr} str r0, [sp, #0x0] mov r7, #0x0 @@ -90,8 +90,8 @@ _0206B200: .word 0x000121B4 _0206B204: .word 0x000121C6 _0206B208: .word 0x00011EE4 - thumb_func_start FUN_0206B20C -FUN_0206B20C: ; 0x0206B20C + thumb_func_start PCStorage_PlaceMonInFirstEmptySlotInAnyBox +PCStorage_PlaceMonInFirstEmptySlotInAnyBox: ; 0x0206B20C push {r3-r7, lr} add r5, r0, #0x0 ldr r4, [r5, #0x0] @@ -99,14 +99,14 @@ FUN_0206B20C: ; 0x0206B20C mov r7, #0x0 _0206B216: add r0, r6, #0x0 - bl FUN_0206AAB4 + bl RestoreBoxMonPP add r0, r5, #0x0 add r1, r4, #0x0 add r2, r6, #0x0 - bl FUN_0206B244 + bl PCStorage_PlaceMonInBoxFirstEmptySlot cmp r0, #0x0 beq _0206B232 - bl FUN_02022830 + bl SaveSetDirtyBit mov r0, #0x1 pop {r3-r7, pc} _0206B232: @@ -121,15 +121,15 @@ _0206B23A: mov r0, #0x0 pop {r3-r7, pc} - thumb_func_start FUN_0206B244 -FUN_0206B244: ; 0x0206B244 + thumb_func_start PCStorage_PlaceMonInBoxFirstEmptySlot +PCStorage_PlaceMonInBoxFirstEmptySlot: ; 0x0206B244 push {r3-r7, lr} sub sp, #0x8 add r6, r0, #0x0 add r0, r2, #0x0 add r5, r1, #0x0 str r2, [sp, #0x0] - bl FUN_0206AAB4 + bl RestoreBoxMonPP mov r0, #0x0 mvn r0, r0 cmp r5, r0 @@ -165,7 +165,7 @@ _0206B28A: str r2, [sp, #0x0] stmia r4!, {r0-r1} bne _0206B28A - bl FUN_02022830 + bl SaveSetDirtyBit add sp, #0x8 mov r0, #0x1 pop {r3-r7, pc} @@ -179,15 +179,15 @@ _0206B2A0: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0206B2B0 -FUN_0206B2B0: ; 0x0206B2B0 + thumb_func_start PCStorage_PlaceMonInBoxByIndexPair +PCStorage_PlaceMonInBoxByIndexPair: ; 0x0206B2B0 push {r3-r7, lr} add r7, r3, #0x0 add r5, r0, #0x0 add r0, r7, #0x0 add r4, r1, #0x0 add r6, r2, #0x0 - bl FUN_0206AAB4 + bl RestoreBoxMonPP mov r0, #0x0 mvn r0, r0 cmp r4, r0 @@ -212,7 +212,7 @@ _0206B2E4: stmia r3!, {r0-r1} sub r2, r2, #0x1 bne _0206B2E4 - bl FUN_02022830 + bl SaveSetDirtyBit mov r0, #0x1 pop {r3-r7, pc} _0206B2F4: @@ -220,8 +220,8 @@ _0206B2F4: mov r0, #0x0 pop {r3-r7, pc} - thumb_func_start FUN_0206B2FC -FUN_0206B2FC: ; 0x0206B2FC + thumb_func_start PCStorage_DeleteBoxMonByIndexPair +PCStorage_DeleteBoxMonByIndexPair: ; 0x0206B2FC push {r3, lr} mov r3, #0x0 mvn r3, r3 @@ -242,19 +242,19 @@ _0206B308: mul r0, r2 add r0, r1, r0 bl ZeroBoxMonData - bl FUN_02022830 + bl SaveSetDirtyBit pop {r3, pc} _0206B32A: bl ErrorHandling pop {r3, pc} - thumb_func_start FUN_0206B330 -FUN_0206B330: ; 0x0206B330 + thumb_func_start PCStorage_GetActiveBox +PCStorage_GetActiveBox: ; 0x0206B330 ldr r0, [r0, #0x0] bx lr - thumb_func_start FUN_0206B334 -FUN_0206B334: ; 0x0206B334 + thumb_func_start PCStorage_FindFirstBoxWithEmptySlot +PCStorage_FindFirstBoxWithEmptySlot: ; 0x0206B334 push {r3-r7, lr} sub sp, #0x8 str r0, [sp, #0x0] @@ -299,8 +299,8 @@ _0206B374: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0206B384 -FUN_0206B384: ; 0x0206B384 + thumb_func_start PCStorage_FindFirstEmptySlot +PCStorage_FindFirstEmptySlot: ; 0x0206B384 push {r3-r7, lr} add r6, r1, #0x0 str r2, [sp, #0x0] @@ -355,8 +355,8 @@ _0206B3DE: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0206B3E4 -FUN_0206B3E4: ; 0x0206B3E4 + thumb_func_start PCStorage_CountMonsAndEggsInAllBoxes +PCStorage_CountMonsAndEggsInAllBoxes: ; 0x0206B3E4 push {r3-r7, lr} sub sp, #0x8 mov r6, #0x0 @@ -394,20 +394,20 @@ _0206B406: add sp, #0x8 pop {r3-r7, pc} - thumb_func_start FUN_0206B428 -FUN_0206B428: ; 0x0206B428 + thumb_func_start PCStorage_SetActiveBox +PCStorage_SetActiveBox: ; 0x0206B428 push {r3, lr} cmp r1, #0x12 bhs _0206B436 str r1, [r0, #0x0] - bl FUN_02022830 + bl SaveSetDirtyBit pop {r3, pc} _0206B436: bl ErrorHandling pop {r3, pc} - thumb_func_start FUN_0206B43C -FUN_0206B43C: ; 0x0206B43C + thumb_func_start PCStorage_GetBoxWallpaper +PCStorage_GetBoxWallpaper: ; 0x0206B43C push {r3, lr} cmp r1, #0x12 bhs _0206B44A @@ -422,8 +422,8 @@ _0206B44A: nop _0206B454: .word 0x000121B4 - thumb_func_start FUN_0206B458 -FUN_0206B458: ; 0x0206B458 + thumb_func_start PCStorage_SetBoxWallpaper +PCStorage_SetBoxWallpaper: ; 0x0206B458 push {r3, lr} mov r3, #0x0 mvn r3, r3 @@ -438,7 +438,7 @@ _0206B464: add r1, r0, r1 ldr r0, _0206B480 ; =0x000121B4 strb r2, [r1, r0] - bl FUN_02022830 + bl SaveSetDirtyBit pop {r3, pc} _0206B478: bl ErrorHandling @@ -446,8 +446,8 @@ _0206B478: nop _0206B480: .word 0x000121B4 - thumb_func_start FUN_0206B484 -FUN_0206B484: ; 0x0206B484 + thumb_func_start PCStorage_GetBoxName +PCStorage_GetBoxName: ; 0x0206B484 push {r3, lr} add r3, r0, #0x0 mov r0, #0x0 @@ -472,8 +472,8 @@ _0206B4A8: nop _0206B4B0: .word 0x00011EE4 - thumb_func_start FUN_0206B4B4 -FUN_0206B4B4: ; 0x0206B4B4 + thumb_func_start PCStorage_SetBoxName +PCStorage_SetBoxName: ; 0x0206B4B4 push {r3, lr} add r3, r0, #0x0 mov r0, #0x0 @@ -492,14 +492,14 @@ _0206B4C2: add r1, r3, r2 mov r2, #0x14 bl CopyStringToU16Array - bl FUN_02022830 + bl SaveSetDirtyBit _0206B4DC: pop {r3, pc} nop _0206B4E0: .word 0x00011EE4 - thumb_func_start FUN_0206B4E4 -FUN_0206B4E4: ; 0x0206B4E4 + thumb_func_start PCStorage_CountMonsAndEggsInBox +PCStorage_CountMonsAndEggsInBox: ; 0x0206B4E4 push {r3-r7, lr} mov r2, #0x0 mvn r2, r2 @@ -537,8 +537,8 @@ _0206B520: mov r0, #0x0 pop {r3-r7, pc} - thumb_func_start FUN_0206B528 -FUN_0206B528: ; 0x0206B528 + thumb_func_start PCStorage_CountMonsInBox +PCStorage_CountMonsInBox: ; 0x0206B528 push {r3-r7, lr} mov r2, #0x0 mvn r2, r2 @@ -583,8 +583,8 @@ _0206B572: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0206B57C -FUN_0206B57C: ; 0x0206B57C + thumb_func_start PCStorage_CountMonsInAllBoxes +PCStorage_CountMonsInAllBoxes: ; 0x0206B57C push {r4-r6, lr} mov r5, #0x0 add r6, r0, #0x0 @@ -592,7 +592,7 @@ FUN_0206B57C: ; 0x0206B57C _0206B584: add r0, r6, #0x0 add r1, r5, #0x0 - bl FUN_0206B528 + bl PCStorage_CountMonsInBox add r5, r5, #0x1 add r4, r4, r0 cmp r5, #0x12 @@ -600,8 +600,8 @@ _0206B584: add r0, r4, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_0206B598 -FUN_0206B598: ; 0x0206B598 + thumb_func_start PCStorage_SetBoxMonDataByIndexPair +PCStorage_SetBoxMonDataByIndexPair: ; 0x0206B598 push {r3-r7, lr} add r4, r1, #0x0 add r5, r0, #0x0 @@ -636,12 +636,12 @@ _0206B5C4: ldr r2, [sp, #0x18] add r1, r7, #0x0 bl SetBoxMonData - bl FUN_02022830 + bl SaveSetDirtyBit pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0206B5E4 -FUN_0206B5E4: ; 0x0206B5E4 + thumb_func_start PCStorage_GetMonByIndexPair +PCStorage_GetMonByIndexPair: ; 0x0206B5E4 push {r4-r6, lr} add r4, r1, #0x0 add r5, r0, #0x0 @@ -674,8 +674,8 @@ _0206B60E: add r0, r1, r0 pop {r4-r6, pc} - thumb_func_start FUN_0206B620 -FUN_0206B620: ; 0x0206B620 + thumb_func_start PCStorage_UnlockBonusWallpaper +PCStorage_UnlockBonusWallpaper: ; 0x0206B620 push {r3-r5, lr} add r4, r1, #0x0 add r5, r0, #0x0 @@ -689,13 +689,13 @@ _0206B62E: lsl r1, r4 orr r1, r2 strb r1, [r5, r0] - bl FUN_02022830 + bl SaveSetDirtyBit pop {r3-r5, pc} .balign 4 _0206B640: .word 0x000121C6 - thumb_func_start FUN_0206B644 -FUN_0206B644: ; 0x0206B644 + thumb_func_start PCStorage_IsBonusWallpaperUnlocked +PCStorage_IsBonusWallpaperUnlocked: ; 0x0206B644 push {r3-r5, lr} add r4, r1, #0x0 add r5, r0, #0x0 @@ -716,8 +716,8 @@ _0206B662: .balign 4 _0206B664: .word 0x000121C6 - thumb_func_start FUN_0206B668 -FUN_0206B668: ; 0x0206B668 + thumb_func_start PCStorage_CountUnlockedBonusWallpapers +PCStorage_CountUnlockedBonusWallpapers: ; 0x0206B668 push {r4-r6, lr} mov r4, #0x0 add r6, r0, #0x0 @@ -725,7 +725,7 @@ FUN_0206B668: ; 0x0206B668 _0206B670: add r0, r6, #0x0 add r1, r4, #0x0 - bl FUN_0206B644 + bl PCStorage_IsBonusWallpaperUnlocked cmp r0, #0x0 beq _0206B67E add r5, r5, #0x1 diff --git a/arm9/asm/save.s b/arm9/asm/save.s index b825978e..a29733dc 100644 --- a/arm9/asm/save.s +++ b/arm9/asm/save.s @@ -53,7 +53,7 @@ UNK_020EE700: ; 0x020EE700 .word 0x20, 0x00, FUN_0202BE98, FUN_0202BEA0 .word 0x21, 0x00, FUN_0202C0E0, FUN_0202C0E4 .word 0x22, 0x00, FUN_02013B28, FUN_02013B2C - .word 0x23, 0x01, FUN_0206B178, FUN_0206B16C + .word 0x23, 0x01, PCStorage_sizeof, PCStorage_init .section .bss @@ -450,13 +450,13 @@ _02022826: pop {r4, pc} .balign 4 - thumb_func_start FUN_0202282C -FUN_0202282C: ; 0x0202282C + thumb_func_start SaveGetDirtyBit +SaveGetDirtyBit: ; 0x0202282C ldr r0, [r0, #0xc] bx lr - thumb_func_start FUN_02022830 -FUN_02022830: ; 0x02022830 + thumb_func_start SaveSetDirtyBit +SaveSetDirtyBit: ; 0x02022830 ldr r0, _0202283C ; =UNK_021C59C8 mov r1, #0x1 ldr r0, [r0, #0x0] diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s index 4fa6f75b..6c2d8674 100644 --- a/arm9/asm/scrcmd.s +++ b/arm9/asm/scrcmd.s @@ -7082,7 +7082,7 @@ _0203D1EC: b _0203D210 _0203D1FC: add r0, r5, #0x0 - bl FUN_0202282C + bl SaveGetDirtyBit cmp r0, #0x0 beq _0203D20C mov r0, #0x2 @@ -10381,7 +10381,7 @@ _0203EC7E: _0203EC88: add r0, r6, #0x0 add r1, r5, #0x0 - bl FUN_0206B644 + bl PCStorage_IsBonusWallpaperUnlocked cmp r0, #0x0 beq _0203EC98 mov r0, #0x0 @@ -10389,7 +10389,7 @@ _0203EC88: _0203EC98: add r0, r6, #0x0 add r1, r5, #0x0 - bl FUN_0206B620 + bl PCStorage_UnlockBonusWallpaper add r0, r5, #0x1 _0203ECA2: strh r0, [r4, #0x0] @@ -10513,7 +10513,7 @@ FUN_0203ED70: ; 0x0203ED70 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] bl FUN_02022510 - bl FUN_0206B3E4 + bl PCStorage_CountMonsAndEggsInAllBoxes lsl r0, r0, #0x10 lsr r1, r0, #0x10 mov r0, #0x87 diff --git a/arm9/asm/scrcmd_13.s b/arm9/asm/scrcmd_13.s index c9a5bc2d..57061f8b 100644 --- a/arm9/asm/scrcmd_13.s +++ b/arm9/asm/scrcmd_13.s @@ -125,7 +125,7 @@ _0204395C: bl FUN_020690E4 add r1, r0, #0x0 ldr r0, [sp, #0x8] - bl FUN_0206B20C + bl PCStorage_PlaceMonInFirstEmptySlotInAnyBox cmp r0, #0x0 bne _0204398C bl ErrorHandling diff --git a/arm9/asm/scrcmd_18.s b/arm9/asm/scrcmd_18.s index c5765553..f37a8c62 100644 --- a/arm9/asm/scrcmd_18.s +++ b/arm9/asm/scrcmd_18.s @@ -1148,7 +1148,7 @@ _02044C6E: blt _02044C44 _02044C76: ldr r0, [sp, #0x4] - bl FUN_0206B57C + bl PCStorage_CountMonsInAllBoxes add r1, r4, r0 ldr r0, [sp, #0x0] strh r1, [r0, #0x0] diff --git a/arm9/asm/scrcmd_4.s b/arm9/asm/scrcmd_4.s index d7e850ab..e5e930b2 100644 --- a/arm9/asm/scrcmd_4.s +++ b/arm9/asm/scrcmd_4.s @@ -357,7 +357,7 @@ FUN_02040964: ; 0x02040964 add r2, r1, #0x0 ldr r0, [sp, #0x0] add r1, r7, #0x0 - bl FUN_0206B5E4 + bl PCStorage_GetMonByIndexPair add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 @@ -984,7 +984,7 @@ FUN_02040EB4: ; 0x02040EB4 lsr r2, r0, #0x10 ldr r0, [r6, #0x0] add r1, r4, #0x0 - bl FUN_0200AD94 + bl GetRibbonNameOrDesc mov r0, #0x0 pop {r4-r6, pc} .balign 4 diff --git a/arm9/asm/scrcmd_5.s b/arm9/asm/scrcmd_5.s index e69b3a3e..d001fb33 100644 --- a/arm9/asm/scrcmd_5.s +++ b/arm9/asm/scrcmd_5.s @@ -128,7 +128,7 @@ _02041290: ldr r0, [sp, #0x20] ldr r1, [sp, #0x10] add r2, r5, #0x0 - bl FUN_0206B5E4 + bl PCStorage_GetMonByIndexPair mov r1, #0x5 mov r2, #0x0 add r4, r0, #0x0 diff --git a/arm9/asm/unk_0204A01C.s b/arm9/asm/script_pokemon_util.s index 49ac1fa6..49ac1fa6 100644 --- a/arm9/asm/unk_0204A01C.s +++ b/arm9/asm/script_pokemon_util.s diff --git a/arm9/asm/unk_02006864.s b/arm9/asm/unk_02006864.s index 8bd21720..cffea043 100644 --- a/arm9/asm/unk_02006864.s +++ b/arm9/asm/unk_02006864.s @@ -34,7 +34,7 @@ FUN_0200687C: ; 0x0200687C ldr r2, [sp, #0x28] ldr r3, [sp, #0x2c] ldr r4, [sp, #0x24] - bl FUN_02006C98 + bl UncompressFromNarc add r7, r0, #0x0 beq _020068C2 add r1, sp, #0x4 @@ -74,7 +74,7 @@ FUN_020068C8: ; 0x020068C8 ldr r2, [sp, #0x28] ldr r3, [sp, #0x2c] ldr r4, [sp, #0x24] - bl FUN_02006C98 + bl UncompressFromNarc add r7, r0, #0x0 beq _0200692C add r1, sp, #0x4 @@ -142,7 +142,7 @@ FUN_02006948: ; 0x02006948 mov r2, #0x0 ldr r6, [sp, #0x20] ldr r5, [sp, #0x24] - bl FUN_02006C98 + bl UncompressFromNarc str r0, [sp, #0x4] cmp r0, #0x0 beq _02006A2A @@ -258,7 +258,7 @@ FUN_02006A34: ; 0x02006A34 ldr r2, [sp, #0x24] ldr r3, [sp, #0x28] ldr r4, [sp, #0x20] - bl FUN_02006C98 + bl UncompressFromNarc add r7, r0, #0x0 beq _02006A80 add r1, sp, #0x4 @@ -302,7 +302,7 @@ FUN_02006A8C: ; 0x02006A8C str r2, [sp, #0x0] ldr r3, [sp, #0x20] mov r2, #0x0 - bl FUN_02006C98 + bl UncompressFromNarc add r6, r0, #0x0 beq _02006AE0 add r1, sp, #0x4 @@ -344,7 +344,7 @@ FUN_02006AE4: ; 0x02006AE4 mov r3, #0x1 str r3, [sp, #0x0] ldr r3, [sp, #0x24] - bl FUN_02006C98 + bl UncompressFromNarc add r6, r0, #0x0 ldr r4, _02006B30 ; =0x00000000 beq _02006B28 @@ -387,7 +387,7 @@ FUN_02006B38: ; 0x02006B38 mov r3, #0x1 str r3, [sp, #0x0] ldr r3, [sp, #0x24] - bl FUN_02006C98 + bl UncompressFromNarc add r4, r0, #0x0 beq _02006B9E add r1, sp, #0x4 @@ -449,7 +449,7 @@ FUN_02006BB0: ; 0x02006BB0 mov r3, #0x0 str r3, [sp, #0x0] ldr r3, [sp, #0x10] - bl FUN_02006C98 + bl UncompressFromNarc add r5, r0, #0x0 beq _02006BD6 add r1, r4, #0x0 @@ -472,7 +472,7 @@ FUN_02006BDC: ; 0x02006BDC mov r3, #0x0 str r3, [sp, #0x0] ldr r3, [sp, #0x10] - bl FUN_02006C98 + bl UncompressFromNarc add r5, r0, #0x0 beq _02006C02 add r1, r4, #0x0 @@ -494,7 +494,7 @@ FUN_02006C08: ; 0x02006C08 add r5, r2, #0x0 mov r2, #0x0 str r2, [sp, #0x0] - bl FUN_02006C98 + bl UncompressFromNarc add r4, r0, #0x0 beq _02006C2C add r1, r5, #0x0 @@ -516,7 +516,7 @@ FUN_02006C30: ; 0x02006C30 mov r3, #0x0 str r3, [sp, #0x0] ldr r3, [sp, #0x10] - bl FUN_02006C98 + bl UncompressFromNarc add r5, r0, #0x0 beq _02006C56 add r1, r4, #0x0 @@ -539,7 +539,7 @@ FUN_02006C5C: ; 0x02006C5C mov r3, #0x0 str r3, [sp, #0x0] ldr r3, [sp, #0x10] - bl FUN_02006C98 + bl UncompressFromNarc add r5, r0, #0x0 beq _02006C82 add r1, r4, #0x0 @@ -562,11 +562,11 @@ FUN_02006C88: ; 0x02006C88 mov r2, #0x0 str r2, [sp, #0x0] mov r2, #0x1 - bl FUN_02006C98 + bl UncompressFromNarc pop {r3, pc} - thumb_func_start FUN_02006C98 -FUN_02006C98: ; 0x02006C98 + thumb_func_start UncompressFromNarc +UncompressFromNarc: ; 0x02006C98 push {r3-r7, lr} add r5, r2, #0x0 add r7, r0, #0x0 diff --git a/arm9/asm/unk_02008DEC.s b/arm9/asm/unk_02008DEC.s index 50b83f92..1b0161ae 100644 --- a/arm9/asm/unk_02008DEC.s +++ b/arm9/asm/unk_02008DEC.s @@ -1604,7 +1604,7 @@ FUN_02009978: ; 0x02009978 add r1, r3, #0x0 ldr r2, [sp, #0x10] ldr r3, [sp, #0x24] - bl FUN_02006C98 + bl UncompressFromNarc add r1, r0, #0x0 ldr r0, [r5, #0x0] ldr r2, [sp, #0x14] diff --git a/arm9/asm/unk_0200AA80.s b/arm9/asm/unk_0200AA80.s index c5065adc..aa06782f 100644 --- a/arm9/asm/unk_0200AA80.s +++ b/arm9/asm/unk_0200AA80.s @@ -427,8 +427,8 @@ _0200AD90: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0200AD94 -FUN_0200AD94: ; 0x0200AD94 + thumb_func_start GetRibbonNameOrDesc +GetRibbonNameOrDesc: ; 0x0200AD94 push {r3-r7, lr} add r5, r0, #0x0 add r6, r2, #0x0 @@ -1266,7 +1266,7 @@ FUN_0200B410: ; 0x0200B410 add r4, r1, #0x0 ldr r2, [r5, #0xc] add r1, r3, #0x0 - bl FUN_0206B484 + bl PCStorage_GetBoxName ldr r2, [r5, #0xc] add r0, r5, #0x0 add r1, r4, #0x0 diff --git a/arm9/asm/unk_020372D4.s b/arm9/asm/unk_020372D4.s index abbd1d7e..cb831ada 100644 --- a/arm9/asm/unk_020372D4.s +++ b/arm9/asm/unk_020372D4.s @@ -15,7 +15,7 @@ UNK_021C5A08: ; 0x021C5A08 FUN_020372D4: ; 0x020372D4 push {r3-r5, lr} add r5, r0, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_02037400 @@ -51,7 +51,7 @@ _02037318: .word UNK_021C5A08 thumb_func_start FUN_0203731C FUN_0203731C: ; 0x0203731C push {r3, lr} - bl FUN_02006278 + bl OverlayManager_GetData bl FUN_02037524 cmp r0, #0x0 beq _0203732E @@ -68,7 +68,7 @@ FUN_02037334: ; 0x02037334 bl FUN_020374B0 ldr r0, _02037348 ; =SDK_OVERLAY_MODULE_63_ID ldr r1, _0203734C ; =MOD63_021DBAB8 - bl FUN_02000E7C + bl RegisterMainOverlay mov r0, #0x1 pop {r3, pc} nop @@ -101,7 +101,7 @@ _0203736C: str r1, [r0, #0x8] ldr r0, _02037390 ; =UNK05_021F64C8 add r1, r4, #0x0 - bl FUN_02006234 + bl OverlayManager_new ldr r1, [r4, #0x0] str r0, [r1, #0x0] pop {r4, pc} @@ -173,7 +173,7 @@ _020373E8: add r0, r4, #0x0 add r1, r6, #0x0 mov r2, #0xb - bl FUN_02006234 + bl OverlayManager_new ldr r1, [r5, #0x0] str r0, [r1, #0x4] pop {r4-r6, pc} @@ -200,7 +200,7 @@ FUN_02037400: ; 0x02037400 add r0, r5, #0x0 mov r1, #0xb8 mov r2, #0xb - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0x0 mov r2, #0xb8 add r4, r0, #0x0 @@ -218,7 +218,7 @@ FUN_02037400: ; 0x02037400 ldr r0, [r4, #0x0] str r1, [r0, #0xc] add r0, r5, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r0, #0x8] str r0, [r4, #0xc] mov r0, #0x0 @@ -259,7 +259,7 @@ FUN_02037400: ; 0x02037400 FUN_020374B0: ; 0x020374B0 push {r3-r5, lr} add r5, r0, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0x0 ldr r0, [r4, #0x28] bl FUN_020344D0 @@ -280,7 +280,7 @@ FUN_020374B0: ; 0x020374B0 ldr r0, [r4, #0x0] bl FreeToHeap add r0, r5, #0x0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x5b bl FUN_020168D0 mov r0, #0xb @@ -296,11 +296,11 @@ FUN_02037504: ; 0x02037504 ldr r0, [r4, #0x0] cmp r0, #0x0 beq _02037520 - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0x0 beq _02037520 ldr r0, [r4, #0x0] - bl FUN_02006260 + bl OverlayManager_delete mov r0, #0x0 str r0, [r4, #0x0] _02037520: diff --git a/arm9/asm/unk_0204653C.s b/arm9/asm/unk_0204653C.s index 33ce011d..eaeb9036 100644 --- a/arm9/asm/unk_0204653C.s +++ b/arm9/asm/unk_0204653C.s @@ -1021,7 +1021,7 @@ _02046D5C: bl SavArray_PlayerParty_get add r5, r0, #0x0 ldr r0, [sp, #0x8] - bl FUN_0206B334 + bl PCStorage_FindFirstBoxWithEmptySlot cmp r0, #0x12 bne _02046D8C add r0, r5, #0x0 diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s index 1d7ad0d5..48f457be 100644 --- a/arm9/asm/unk_020484A8.s +++ b/arm9/asm/unk_020484A8.s @@ -160,7 +160,7 @@ _020485C0: ldr r0, [r6, #0xc] bl SavArray_PlayerParty_get bl FUN_02085140 - bl FUN_02022830 + bl SaveSetDirtyBit ldr r0, [r6, #0xc] bl FUN_02022720 add r7, r0, #0x0 diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index 7387f701..a11f74e3 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -1425,14 +1425,14 @@ _0206D260: pop {r3-r4, pc} _0206D2E2: ldr r0, [r4, #0x38] - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0x0 bne _0206D2EE _0206D2EC: b _0206D806 _0206D2EE: ldr r0, [r4, #0x38] - bl FUN_02006260 + bl OverlayManager_delete ldr r1, [r4, #0x0] add r0, r4, #0x0 bl FUN_0206D9B4 @@ -2743,7 +2743,7 @@ FUN_0206DE0C: ; 0x0206DE0C ldr r0, _0206DE20 ; =UNK_020FA6E8 ldr r1, [r4, #0x3c] ldr r2, [r4, #0x5c] - bl FUN_02006234 + bl OverlayManager_new str r0, [r4, #0x38] pop {r4, pc} nop diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index 5c8bbf31..7a1729d2 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -307,7 +307,7 @@ _0206F5A8: .word FUN_0206FB58 FUN_0206F5AC: ; 0x0206F5AC push {r3-r5, lr} add r4, r1, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r4, #0x0] add r5, r0, #0x0 cmp r1, #0x1c @@ -960,7 +960,7 @@ _0206FAA0: .word 0x000006A4 FUN_0206FAA4: ; 0x0206FAA4 push {r3-r7, lr} str r0, [sp, #0x0] - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0x0 mov r0, #0x0 add r1, r0, #0x0 @@ -1017,7 +1017,7 @@ _0206FAFC: bl FUN_0206BB74 _0206FB30: ldr r0, [sp, #0x0] - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0xc bl FUN_020168D0 mov r0, #0x1 @@ -1395,13 +1395,13 @@ FUN_0206FE74: ; 0x0206FE74 ldr r1, _0206FF50 ; =0x00000B38 mov r2, #0xc add r4, r0, #0x0 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _0206FF50 ; =0x00000B38 mov r1, #0x0 add r6, r0, #0x0 bl memset add r0, r4, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r1, _0206FF54 ; =0x000005A4 str r0, [r6, r1] mov r0, #0xc diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index 5c572392..863b9270 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -410,7 +410,7 @@ _020772FE: add r0, r6, #0x0 lsl r1, r1, #0x4 mov r2, #0x12 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0x5d mov r1, #0x0 lsl r2, r2, #0x4 @@ -459,7 +459,7 @@ _020772FE: ldr r0, [r4, r0] bl FUN_02077B44 add r0, r6, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_02077B08 @@ -527,7 +527,7 @@ _020772FE: str r0, [r5, #0x0] b _02077490 _02077456: - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0x0 ldr r0, [r4, #0x0] cmp r0, #0x1 @@ -599,7 +599,7 @@ FUN_020774EC: ; 0x020774EC sub sp, #0x10 add r5, r1, #0x0 add r6, r0, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5, #0x0] add r4, r0, #0x0 cmp r1, #0x3 @@ -1065,10 +1065,10 @@ FUN_02077894: ; 0x02077894 push {r4-r7, lr} sub sp, #0x14 str r0, [sp, #0x10] - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0x0 ldr r0, [sp, #0x10] - bl FUN_0200628C + bl OverlayManager_GetField18 add r5, r0, #0x0 mov r0, #0x56 lsl r0, r0, #0x2 @@ -1253,7 +1253,7 @@ _02077A0C: ldr r0, [r4, r0] bl FUN_0200AB18 ldr r0, [sp, #0x10] - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x0 add r1, r0, #0x0 bl FUN_02015F10 @@ -1564,7 +1564,7 @@ FUN_02077CD4: ; 0x02077CD4 sub sp, #0x10 add r4, r0, #0x0 add r0, r1, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r7, r0, #0x0 ldr r0, _02077E7C ; =0x0000045C mov r1, #0x4 @@ -1772,7 +1772,7 @@ FUN_02077E90: ; 0x02077E90 sub sp, #0x14 add r5, r0, #0x0 add r0, r1, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r4, r0, #0x0 ldr r0, [r4, #0x44] cmp r0, #0x0 @@ -1786,10 +1786,10 @@ FUN_02077E90: ; 0x02077E90 lsl r0, r0, #0x6 str r1, [r5, r0] ldr r0, [r4, #0x48] - bl FUN_0206B330 + bl PCStorage_GetActiveBox add r6, r0, #0x0 ldr r0, [r4, #0x48] - bl FUN_0206B334 + bl PCStorage_FindFirstBoxWithEmptySlot str r0, [sp, #0x10] mov r0, #0x5a lsl r0, r0, #0x2 @@ -3265,7 +3265,7 @@ _02078A90: add r0, r5, r0 bl FUN_02078894 add r0, r6, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r1, #0x46 lsl r1, r1, #0x2 ldrh r2, [r5, r1] diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 5dd4a4a5..c49c2d67 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -96,13 +96,13 @@ FUN_02079C7C: ; 0x02079C7C ldr r1, _02079DAC ; =0x0000069C add r0, r4, #0x0 mov r2, #0x13 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _02079DAC ; =0x0000069C mov r1, #0x0 add r5, r0, #0x0 bl memset add r0, r4, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r1, #0x93 lsl r1, r1, #0x2 str r0, [r5, r1] @@ -176,7 +176,7 @@ _02079DB0: .word FUN_02079F24 FUN_02079DB4: ; 0x02079DB4 push {r3-r5, lr} add r4, r1, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r4, #0x0] add r5, r0, #0x0 cmp r1, #0x13 @@ -314,7 +314,7 @@ _02079EC8: .word 0x00000404 FUN_02079ECC: ; 0x02079ECC push {r3-r5, lr} add r4, r0, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData add r5, r0, #0x0 mov r0, #0x0 add r1, r0, #0x0 @@ -337,7 +337,7 @@ FUN_02079ECC: ; 0x02079ECC mov r1, #0x0 strh r1, [r0, #0x0] add r0, r4, #0x0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x13 bl FUN_020168D0 mov r0, #0x1 diff --git a/arm9/asm/unk_0207FC5C.s b/arm9/asm/unk_0207FC5C.s deleted file mode 100644 index b06b72e9..00000000 --- a/arm9/asm/unk_0207FC5C.s +++ /dev/null @@ -1,180 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .section .rodata - - .global UNK_020FB788 -UNK_020FB788: ; 0x020FB788 - .byte 0x62, 0x00, 0x00, 0x00 - - .global UNK_020FB78C -UNK_020FB78C: ; 0x020FB78C - .byte 0x48, 0x00 - - .global UNK_020FB78E -UNK_020FB78E: ; 0x020FB78E - .byte 0x00, 0x00 - - .global UNK_020FB790 -UNK_020FB790: ; 0x020FB790 - .byte 0x00, 0x00 - - .global UNK_020FB792 -UNK_020FB792: ; 0x020FB792 - .byte 0x50, 0x00, 0x4E, 0x00, 0x00, 0x00, 0x49, 0x00, 0x00, 0x00, 0x01, 0x00, 0x51, 0x00, 0x4F, 0x00 - .byte 0x00, 0x00, 0x4A, 0x00, 0x00, 0x00, 0x02, 0x00, 0x52, 0x00, 0x50, 0x00, 0x00, 0x00, 0x4B, 0x00 - .byte 0x00, 0x00, 0x03, 0x00, 0x53, 0x00, 0x51, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00, 0x04, 0x00 - .byte 0x54, 0x00, 0x52, 0x00, 0x00, 0x00, 0x49, 0x00, 0x01, 0x00, 0x05, 0x00, 0x55, 0x00, 0x53, 0x00 - .byte 0x00, 0x00, 0x4A, 0x00, 0x01, 0x00, 0x06, 0x00, 0x56, 0x00, 0x54, 0x00, 0x00, 0x00, 0x4B, 0x00 - .byte 0x01, 0x00, 0x07, 0x00, 0x57, 0x00, 0x55, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x01, 0x00, 0x08, 0x00 - .byte 0x58, 0x00, 0x56, 0x00, 0x00, 0x00, 0x49, 0x00, 0x02, 0x00, 0x09, 0x00, 0x59, 0x00, 0x57, 0x00 - .byte 0x00, 0x00, 0x4A, 0x00, 0x02, 0x00, 0x0A, 0x00, 0x5A, 0x00, 0x58, 0x00, 0x00, 0x00, 0x4B, 0x00 - .byte 0x02, 0x00, 0x0B, 0x00, 0x5B, 0x00, 0x59, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x02, 0x00, 0x0C, 0x00 - .byte 0x5C, 0x00, 0x5A, 0x00, 0x00, 0x00, 0x49, 0x00, 0x03, 0x00, 0x0D, 0x00, 0x5D, 0x00, 0x5B, 0x00 - .byte 0x00, 0x00, 0x4A, 0x00, 0x03, 0x00, 0x0E, 0x00, 0x5E, 0x00, 0x5C, 0x00, 0x00, 0x00, 0x4B, 0x00 - .byte 0x03, 0x00, 0x0F, 0x00, 0x5F, 0x00, 0x5D, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x03, 0x00, 0x10, 0x00 - .byte 0x60, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x49, 0x00, 0x04, 0x00, 0x11, 0x00, 0x61, 0x00, 0x5F, 0x00 - .byte 0x00, 0x00, 0x4A, 0x00, 0x04, 0x00, 0x12, 0x00, 0x62, 0x00, 0x60, 0x00, 0x00, 0x00, 0x4B, 0x00 - .byte 0x04, 0x00, 0x13, 0x00, 0x63, 0x00, 0x61, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x04, 0x00, 0x14, 0x00 - .byte 0x64, 0x00, 0x63, 0x00, 0x00, 0x00, 0x4E, 0x00, 0x00, 0x00, 0x15, 0x00, 0x65, 0x00, 0x64, 0x00 - .byte 0x00, 0x00, 0x4D, 0x00, 0x00, 0x00, 0x16, 0x00, 0x66, 0x00, 0x65, 0x00, 0x00, 0x00, 0x4F, 0x00 - .byte 0x01, 0x00, 0x17, 0x00, 0x67, 0x00, 0x66, 0x00, 0x00, 0x00, 0x50, 0x00, 0x02, 0x00, 0x18, 0x00 - .byte 0x68, 0x00, 0x67, 0x00, 0x00, 0x00, 0x51, 0x00, 0x01, 0x00, 0x19, 0x00, 0x00, 0x80, 0x68, 0x00 - .byte 0x00, 0x00, 0x51, 0x00, 0x03, 0x00, 0x1A, 0x00, 0x01, 0x80, 0x69, 0x00, 0x00, 0x00, 0x51, 0x00 - .byte 0x04, 0x00, 0x1B, 0x00, 0x02, 0x80, 0x6A, 0x00, 0x00, 0x00, 0x52, 0x00, 0x03, 0x00, 0x1C, 0x00 - .byte 0xB2, 0x00, 0x6B, 0x00, 0x00, 0x00, 0x52, 0x00, 0x04, 0x00, 0x1D, 0x00, 0xBE, 0x00, 0x6C, 0x00 - .byte 0x00, 0x00, 0x53, 0x00, 0x00, 0x00, 0x1E, 0x00, 0xBF, 0x00, 0x6D, 0x00, 0x00, 0x00, 0x53, 0x00 - .byte 0x01, 0x00, 0x1F, 0x00, 0xB2, 0x00, 0x19, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x20, 0x00 - .byte 0x69, 0x00, 0x7A, 0x00, 0x00, 0x00, 0x59, 0x00, 0x00, 0x00, 0x21, 0x00, 0x6A, 0x00, 0x7B, 0x00 - .byte 0x00, 0x00, 0x5A, 0x00, 0x00, 0x00, 0x22, 0x00, 0x6B, 0x00, 0x7C, 0x00, 0x00, 0x00, 0x5B, 0x00 - .byte 0x00, 0x00, 0x23, 0x00, 0x6C, 0x00, 0x7D, 0x00, 0x00, 0x00, 0x5C, 0x00, 0x00, 0x00, 0x24, 0x00 - .byte 0x6D, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x59, 0x00, 0x01, 0x00, 0x25, 0x00, 0x6E, 0x00, 0x7F, 0x00 - .byte 0x00, 0x00, 0x5A, 0x00, 0x01, 0x00, 0x26, 0x00, 0x6F, 0x00, 0x80, 0x00, 0x00, 0x00, 0x5B, 0x00 - .byte 0x01, 0x00, 0x27, 0x00, 0x70, 0x00, 0x81, 0x00, 0x00, 0x00, 0x5C, 0x00, 0x01, 0x00, 0x28, 0x00 - .byte 0x71, 0x00, 0x82, 0x00, 0x00, 0x00, 0x59, 0x00, 0x02, 0x00, 0x29, 0x00, 0x72, 0x00, 0x83, 0x00 - .byte 0x00, 0x00, 0x5A, 0x00, 0x02, 0x00, 0x2A, 0x00, 0x73, 0x00, 0x84, 0x00, 0x00, 0x00, 0x5B, 0x00 - .byte 0x02, 0x00, 0x2B, 0x00, 0x74, 0x00, 0x85, 0x00, 0x00, 0x00, 0x5C, 0x00, 0x02, 0x00, 0x2C, 0x00 - .byte 0x75, 0x00, 0x86, 0x00, 0x00, 0x00, 0x59, 0x00, 0x03, 0x00, 0x2D, 0x00, 0x76, 0x00, 0x87, 0x00 - .byte 0x00, 0x00, 0x5A, 0x00, 0x03, 0x00, 0x2E, 0x00, 0x77, 0x00, 0x88, 0x00, 0x00, 0x00, 0x5B, 0x00 - .byte 0x03, 0x00, 0x2F, 0x00, 0x78, 0x00, 0x89, 0x00, 0x00, 0x00, 0x5C, 0x00, 0x03, 0x00, 0x30, 0x00 - .byte 0x79, 0x00, 0x8A, 0x00, 0x00, 0x00, 0x59, 0x00, 0x04, 0x00, 0x31, 0x00, 0x7A, 0x00, 0x8B, 0x00 - .byte 0x00, 0x00, 0x5A, 0x00, 0x04, 0x00, 0x32, 0x00, 0x7B, 0x00, 0x8C, 0x00, 0x00, 0x00, 0x5B, 0x00 - .byte 0x04, 0x00, 0x33, 0x00, 0x7C, 0x00, 0x8D, 0x00, 0x00, 0x00, 0x5C, 0x00, 0x04, 0x00, 0x34, 0x00 - .byte 0x7D, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x5D, 0x00, 0x00, 0x00, 0x35, 0x00, 0x7E, 0x00, 0x1B, 0x00 - .byte 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x36, 0x00, 0x7F, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x5F, 0x00 - .byte 0x00, 0x00, 0x37, 0x00, 0x80, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x38, 0x00 - .byte 0x81, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x00, 0x39, 0x00, 0x82, 0x00, 0x1F, 0x00 - .byte 0x00, 0x00, 0x62, 0x00, 0x00, 0x00, 0x3A, 0x00, 0x83, 0x00, 0x20, 0x00, 0x00, 0x00, 0x63, 0x00 - .byte 0x02, 0x00, 0x3B, 0x00, 0x84, 0x00, 0x21, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x3C, 0x00 - .byte 0x85, 0x00, 0x22, 0x00, 0x00, 0x00, 0x65, 0x00, 0x01, 0x00, 0x3D, 0x00, 0x86, 0x00, 0x23, 0x00 - .byte 0x00, 0x00, 0x66, 0x00, 0x02, 0x00, 0x3E, 0x00, 0x87, 0x00, 0x24, 0x00, 0x00, 0x00, 0x67, 0x00 - .byte 0x03, 0x00, 0x3F, 0x00, 0x88, 0x00, 0x25, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0x40, 0x00 - .byte 0x89, 0x00, 0x26, 0x00, 0x00, 0x00, 0x69, 0x00, 0x02, 0x00, 0x41, 0x00, 0x8A, 0x00, 0x27, 0x00 - .byte 0x00, 0x00, 0x6A, 0x00, 0x01, 0x00, 0x42, 0x00, 0x8B, 0x00, 0x28, 0x00, 0x00, 0x00, 0x6B, 0x00 - .byte 0x03, 0x00, 0x43, 0x00, 0x8C, 0x00, 0x29, 0x00, 0x00, 0x00, 0x6C, 0x00, 0x00, 0x00, 0x44, 0x00 - .byte 0x8D, 0x00, 0x2A, 0x00, 0x00, 0x00, 0x6D, 0x00, 0x00, 0x00, 0x45, 0x00, 0x8E, 0x00, 0x2B, 0x00 - .byte 0x00, 0x00, 0x6E, 0x00, 0x01, 0x00, 0x46, 0x00, 0x8F, 0x00, 0x2C, 0x00, 0x00, 0x00, 0x6F, 0x00 - .byte 0x03, 0x00, 0x47, 0x00, 0x90, 0x00, 0x2D, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x48, 0x00 - .byte 0x91, 0x00, 0x2E, 0x00, 0x00, 0x00, 0x71, 0x00, 0x00, 0x00, 0x49, 0x00, 0x07, 0x80, 0x2F, 0x00 - .byte 0x00, 0x00, 0x72, 0x00, 0x03, 0x00, 0x4A, 0x00, 0x08, 0x80, 0x30, 0x00, 0x00, 0x00, 0x73, 0x00 - .byte 0x01, 0x00, 0x4B, 0x00, 0x09, 0x80, 0x31, 0x00, 0x00, 0x00, 0x74, 0x00, 0x01, 0x00, 0x4C, 0x00 - .byte 0x0A, 0x80, 0x32, 0x00, 0x00, 0x00, 0x75, 0x00, 0x00, 0x00, 0x4D, 0x00, 0x0B, 0x80, 0x33, 0x00 - .byte 0x00, 0x00, 0x76, 0x00, 0x01, 0x00, 0x4E, 0x00, 0x0C, 0x80, 0x34, 0x00, 0x00, 0x00, 0x77, 0x00 - .byte 0x00, 0x00, 0x4F, 0x00, 0x0D, 0x80 - - .text - - thumb_func_start FUN_0207FC5C -FUN_0207FC5C: ; 0x0207FC5C - cmp r1, #0x4 - bhi _0207FCA8 - add r1, r1, r1 - add r1, pc - ldrh r1, [r1, #0x6] - lsl r1, r1, #0x10 - asr r1, r1, #0x10 - add pc, r1 -_0207FC6C: ; jump table (using 16-bit offset) - .short _0207FC76 - _0207FC6C - 2; case 0 - .short _0207FC80 - _0207FC6C - 2; case 1 - .short _0207FC8A - _0207FC6C - 2; case 2 - .short _0207FC94 - _0207FC6C - 2; case 3 - .short _0207FC9E - _0207FC6C - 2; case 4 -_0207FC76: - mov r1, #0xc - mul r1, r0 - ldr r0, _0207FCAC ; =UNK_020FB788 - ldr r0, [r0, r1] - bx lr -_0207FC80: - mov r1, #0xc - mul r1, r0 - ldr r0, _0207FCB0 ; =UNK_020FB78C - ldrh r0, [r0, r1] - bx lr -_0207FC8A: - mov r1, #0xc - mul r1, r0 - ldr r0, _0207FCB4 ; =UNK_020FB78E - ldrh r0, [r0, r1] - bx lr -_0207FC94: - mov r1, #0xc - mul r1, r0 - ldr r0, _0207FCB8 ; =UNK_020FB790 - ldrh r0, [r0, r1] - bx lr -_0207FC9E: - mov r1, #0xc - mul r1, r0 - ldr r0, _0207FCBC ; =UNK_020FB792 - ldrh r0, [r0, r1] - bx lr -_0207FCA8: - mov r0, #0x0 - bx lr - .balign 4 -_0207FCAC: .word UNK_020FB788 -_0207FCB0: .word UNK_020FB78C -_0207FCB4: .word UNK_020FB78E -_0207FCB8: .word UNK_020FB790 -_0207FCBC: .word UNK_020FB792 - - thumb_func_start FUN_0207FCC0 -FUN_0207FCC0: ; 0x0207FCC0 - mov r2, #0xc - mul r2, r1 - ldr r1, _0207FCDC ; =UNK_020FB792 - ldrh r2, [r1, r2] - mov r1, #0x2 - lsl r1, r1, #0xe - tst r1, r2 - beq _0207FCD8 - lsl r1, r2, #0x18 - lsr r1, r1, #0x18 - ldrb r2, [r0, r1] - add r2, #0x92 -_0207FCD8: - add r0, r2, #0x0 - bx lr - .balign 4 -_0207FCDC: .word UNK_020FB792 - - thumb_func_start FUN_0207FCE0 -FUN_0207FCE0: ; 0x0207FCE0 - mov r1, #0xc - mul r1, r0 - ldr r0, _0207FCFC ; =UNK_020FB792 - ldrh r1, [r0, r1] - mov r0, #0x2 - lsl r0, r0, #0xe - tst r0, r1 - beq _0207FCF6 - lsl r0, r1, #0x18 - lsr r0, r0, #0x18 - bx lr -_0207FCF6: - mov r0, #0xff - bx lr - nop -_0207FCFC: .word UNK_020FB792 diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s index 55901920..8eb1213d 100644 --- a/arm9/asm/unk_02080C38.s +++ b/arm9/asm/unk_02080C38.s @@ -3041,7 +3041,7 @@ _020822D6: add r2, r0, #0x0 add r0, r4, #0x0 add r1, r5, #0x0 - bl FUN_0200AD94 + bl GetRibbonNameOrDesc pop {r3-r5, pc} .balign 4 _020822EC: .word 0x0000011F diff --git a/arm9/asm/unk_020828BC.s b/arm9/asm/unk_020828BC.s index 3c10063d..f63a493e 100644 --- a/arm9/asm/unk_020828BC.s +++ b/arm9/asm/unk_020828BC.s @@ -177,7 +177,7 @@ _0208292A: mov r0, #0x5a add r2, r1, #0x0 add r3, r5, #0x0 - bl FUN_02006C98 + bl UncompressFromNarc str r0, [sp, #0x14] mov r0, #0x5a mov r1, #0x0 @@ -513,7 +513,7 @@ FUN_02082B90: ; 0x02082B90 mov r0, #0x5a mov r1, #0x2 mov r2, #0x0 - bl FUN_02006C98 + bl UncompressFromNarc str r0, [sp, #0x14] ldr r1, _02082D10 ; =0x00000121 ldr r0, [sp, #0x8] @@ -938,7 +938,7 @@ FUN_02082ED0: ; 0x02082ED0 add r2, r5, #0x0 add r4, r5, #0x0 str r1, [sp, #0x0] - bl FUN_02006C98 + bl UncompressFromNarc str r0, [sp, #0x14] mov r0, #0x5a mov r1, #0x1 diff --git a/arm9/asm/unk_020854E0.s b/arm9/asm/unk_020854E0.s index b783b730..86ea2fee 100644 --- a/arm9/asm/unk_020854E0.s +++ b/arm9/asm/unk_020854E0.s @@ -395,11 +395,11 @@ FUN_020857D4: ; 0x020857D4 ldr r0, [r4, #0x0] cmp r0, #0x0 beq _020857F4 - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0x0 beq _020857F4 ldr r0, [r4, #0x0] - bl FUN_02006260 + bl OverlayManager_delete mov r0, #0x0 str r0, [r4, #0x0] mov r0, #0x1 @@ -412,7 +412,7 @@ _020857F4: FUN_020857F8: ; 0x020857F8 push {r3-r5, lr} add r4, r0, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r2, #0x1 add r5, r0, #0x0 mov r0, #0x3 @@ -422,7 +422,7 @@ FUN_020857F8: ; 0x020857F8 add r0, r4, #0x0 mov r1, #0x1c mov r2, #0x28 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0x0 mov r2, #0x1c add r4, r0, #0x0 @@ -462,10 +462,10 @@ FUN_0208585C: ; 0x0208585C push {r4-r6, lr} add r6, r0, #0x0 add r5, r1, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0x0 add r0, r6, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r6, r0, #0x0 ldr r0, [r5, #0x0] cmp r0, #0x4 @@ -491,7 +491,7 @@ _0208588E: ldr r0, _02085994 ; =UNK_020FCAA8 ldr r1, [r4, #0x10] ldr r2, [r4, #0x0] - bl FUN_02006234 + bl OverlayManager_new str r0, [r4, #0xc] mov r0, #0x1 str r0, [r5, #0x0] @@ -582,7 +582,7 @@ _02085942: ldr r0, _0208599C ; =UNK_020FCAB8 ldr r1, [r4, #0x8] ldr r2, [r4, #0x0] - bl FUN_02006234 + bl OverlayManager_new str r0, [r4, #0xc] mov r0, #0x4 str r0, [r5, #0x0] @@ -622,12 +622,12 @@ _0208599C: .word UNK_020FCAB8 FUN_020859A0: ; 0x020859A0 push {r3-r5, lr} add r5, r0, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0x0 ldr r0, [r4, #0x10] bl FUN_0208578C add r0, r5, #0x0 - bl FUN_0200627C + bl OverlayManager_FreeData ldr r0, [r4, #0x0] bl FUN_020168D0 mov r0, #0x1 diff --git a/arm9/asm/unk_020859C0.s b/arm9/asm/unk_020859C0.s index 8f1aa043..efd11044 100644 --- a/arm9/asm/unk_020859C0.s +++ b/arm9/asm/unk_020859C0.s @@ -100,7 +100,7 @@ FUN_020859C0: ; 0x020859C0 ldr r1, _02085BA0 ; =0x0000042C add r0, r5, #0x0 mov r2, #0x35 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _02085BA0 ; =0x0000042C mov r1, #0x0 add r4, r0, #0x0 @@ -110,7 +110,7 @@ FUN_020859C0: ; 0x020859C0 lsl r1, r1, #0x4 str r0, [r4, r1] add r0, r5, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4, #0x0] mov r0, #0x35 bl AllocMonZeroed @@ -304,7 +304,7 @@ _02085BAC: .word MOD62_022310CC FUN_02085BB0: ; 0x02085BB0 push {r3-r5, lr} add r5, r1, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5, #0x0] add r4, r0, #0x0 cmp r1, #0x0 @@ -350,7 +350,7 @@ _02085C02: FUN_02085C08: ; 0x02085C08 push {r3-r5, lr} add r5, r0, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0x0 mov r0, #0x1 mov r1, #0x0 @@ -476,7 +476,7 @@ FUN_02085C08: ; 0x02085C08 mov r0, #0x35 bl MOD62_02230F70 add r0, r5, #0x0 - bl FUN_0200627C + bl OverlayManager_FreeData bl FUN_0201CD04 mov r0, #0x35 bl FUN_020168D0 diff --git a/arm9/asm/unk_02086084.s b/arm9/asm/unk_02086084.s index 4945183c..c83c9aff 100644 --- a/arm9/asm/unk_02086084.s +++ b/arm9/asm/unk_02086084.s @@ -27,13 +27,13 @@ FUN_02086084: ; 0x02086084 add r0, r5, #0x0 mov r1, #0x80 mov r2, #0x47 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0x0 mov r2, #0x80 add r4, r0, #0x0 bl memset add r0, r5, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4, #0x0] ldr r0, [r0, #0x10] bl FUN_02024FF4 @@ -105,7 +105,7 @@ _02086164: .word FUN_02086664 FUN_02086168: ; 0x02086168 push {r3-r5, lr} add r5, r1, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5, #0x0] add r4, r0, #0x0 cmp r1, #0x0 @@ -165,7 +165,7 @@ _020861D8: .word 0x000001EA FUN_020861DC: ; 0x020861DC push {r3-r5, lr} add r5, r0, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0x0 ldr r0, [r4, #0x38] bl FUN_020223BC @@ -217,7 +217,7 @@ FUN_020861DC: ; 0x020861DC add r0, r4, #0x4 bl FUN_02086ED4 add r0, r5, #0x0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x47 bl FUN_020168D0 mov r0, #0x1 diff --git a/arm9/asm/unk_02087A6C.s b/arm9/asm/unk_02087A6C.s index c91f5a47..d51eab43 100644 --- a/arm9/asm/unk_02087A6C.s +++ b/arm9/asm/unk_02087A6C.s @@ -249,7 +249,7 @@ FUN_02087C18: ; 0x02087C18 mov r0, #0x4b add r2, r1, #0x0 str r1, [sp, #0x0] - bl FUN_02006C98 + bl UncompressFromNarc pop {r3, pc} .balign 4 @@ -261,7 +261,7 @@ FUN_02087C2C: ; 0x02087C2C mov r0, #0x4b mov r1, #0x1 str r2, [sp, #0x0] - bl FUN_02006C98 + bl UncompressFromNarc pop {r3, pc} .balign 4 @@ -277,14 +277,14 @@ FUN_02087C40: ; 0x02087C40 mov r0, #0x4b mov r1, #0x9 add r3, r6, #0x0 - bl FUN_02006C98 + bl UncompressFromNarc str r0, [r5, #0x0] mov r2, #0x0 mov r0, #0x4b mov r1, #0xa add r3, r6, #0x0 str r2, [sp, #0x0] - bl FUN_02006C98 + bl UncompressFromNarc str r0, [r4, #0x0] add sp, #0x4 pop {r3-r6, pc} @@ -302,14 +302,14 @@ FUN_02087C70: ; 0x02087C70 mov r0, #0x4b mov r1, #0x7 add r3, r6, #0x0 - bl FUN_02006C98 + bl UncompressFromNarc str r0, [r5, #0x0] mov r2, #0x0 mov r0, #0x4b mov r1, #0x8 add r3, r6, #0x0 str r2, [sp, #0x0] - bl FUN_02006C98 + bl UncompressFromNarc str r0, [r4, #0x0] add sp, #0x4 pop {r3-r6, pc} @@ -327,14 +327,14 @@ FUN_02087CA0: ; 0x02087CA0 mov r0, #0x4b mov r1, #0x5 add r3, r6, #0x0 - bl FUN_02006C98 + bl UncompressFromNarc str r0, [r5, #0x0] mov r2, #0x0 mov r0, #0x4b mov r1, #0x6 add r3, r6, #0x0 str r2, [sp, #0x0] - bl FUN_02006C98 + bl UncompressFromNarc str r0, [r4, #0x0] add sp, #0x4 pop {r3-r6, pc} @@ -352,14 +352,14 @@ FUN_02087CD0: ; 0x02087CD0 mov r0, #0x4b mov r1, #0x3 add r3, r6, #0x0 - bl FUN_02006C98 + bl UncompressFromNarc str r0, [r5, #0x0] mov r2, #0x0 mov r0, #0x4b mov r1, #0x4 add r3, r6, #0x0 str r2, [sp, #0x0] - bl FUN_02006C98 + bl UncompressFromNarc str r0, [r4, #0x0] add sp, #0x4 pop {r3-r6, pc} diff --git a/arm9/asm/unk_02087D00.s b/arm9/asm/unk_02087D00.s index 5676baf3..bf502fa3 100644 --- a/arm9/asm/unk_02087D00.s +++ b/arm9/asm/unk_02087D00.s @@ -183,11 +183,11 @@ FUN_02087E1C: ; 0x02087E1C ldr r0, [r4, #0x0] cmp r0, #0x0 beq _02087E3C - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0x0 beq _02087E3C ldr r0, [r4, #0x0] - bl FUN_02006260 + bl OverlayManager_delete mov r0, #0x0 str r0, [r4, #0x0] mov r0, #0x1 @@ -200,7 +200,7 @@ _02087E3C: FUN_02087E40: ; 0x02087E40 push {r3-r5, lr} add r4, r0, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r2, #0x1 add r5, r0, #0x0 mov r0, #0x3 @@ -210,7 +210,7 @@ FUN_02087E40: ; 0x02087E40 add r0, r4, #0x0 mov r1, #0x18 mov r2, #0x2c - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0x0 mov r2, #0x18 add r4, r0, #0x0 @@ -225,7 +225,7 @@ FUN_02087E40: ; 0x02087E40 FUN_02087E74: ; 0x02087E74 push {r4, lr} add r4, r1, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r4, #0x0] cmp r1, #0x8 bhi _02087EE4 @@ -288,11 +288,11 @@ _02087EE4: FUN_02087EE8: ; 0x02087EE8 push {r3-r5, lr} add r5, r0, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0x0 bl FUN_02087F08 add r0, r5, #0x0 - bl FUN_0200627C + bl OverlayManager_FreeData ldr r0, [r4, #0x0] bl FUN_020168D0 mov r0, #0x1 @@ -347,7 +347,7 @@ FUN_02087F50: ; 0x02087F50 ldr r0, _02087F64 ; =UNK_020FD15C ldr r1, [r4, #0xc] ldr r2, [r4, #0x0] - bl FUN_02006234 + bl OverlayManager_new str r0, [r4, #0x14] mov r0, #0x1 pop {r4, pc} @@ -401,7 +401,7 @@ _02087F86: str r0, [r4, #0xc] ldr r0, _02087FD0 ; =UNK_020F96DC ldr r2, [r5, #0x0] - bl FUN_02006234 + bl OverlayManager_new str r0, [r5, #0x14] str r4, [r5, #0x10] mov r0, #0x2 @@ -465,7 +465,7 @@ _02087FFE: ldr r0, _02088058 ; =UNK_020FA6E8 ldr r2, [r5, #0x0] add r1, r7, #0x0 - bl FUN_02006234 + bl OverlayManager_new str r0, [r5, #0x14] str r4, [r5, #0x10] mov r0, #0x3 @@ -553,7 +553,7 @@ FUN_020880A0: ; 0x020880A0 ldr r0, _02088108 ; =UNK_020FD16C ldr r2, [r5, #0x0] add r1, r4, #0x0 - bl FUN_02006234 + bl OverlayManager_new str r0, [r5, #0x14] str r4, [r5, #0x10] mov r0, #0x5 @@ -628,7 +628,7 @@ FUN_02088130: ; 0x02088130 ldr r0, _020881A8 ; =UNK_020FA6E8 ldr r2, [r5, #0x0] add r1, r4, #0x0 - bl FUN_02006234 + bl OverlayManager_new str r0, [r5, #0x14] str r4, [r5, #0x10] mov r0, #0x7 diff --git a/arm9/asm/unk_02088858.s b/arm9/asm/unk_02088858.s index dfc20769..5f71517a 100644 --- a/arm9/asm/unk_02088858.s +++ b/arm9/asm/unk_02088858.s @@ -91,7 +91,7 @@ FUN_020888DC: ; 0x020888DC lsl r2, r2, #0xc bl FUN_0201681C add r0, r4, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r0, #0x8] mov r1, #0x31 bl FUN_02088898 diff --git a/arm9/asm/unk_0208898C.s b/arm9/asm/unk_0208898C.s index e2243e5e..6fef7584 100644 --- a/arm9/asm/unk_0208898C.s +++ b/arm9/asm/unk_0208898C.s @@ -10,11 +10,11 @@ FUN_0208898C: ; 0x0208898C ldr r0, [r4, #0x0] cmp r0, #0x0 beq _020889AC - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0x0 beq _020889AC ldr r0, [r4, #0x0] - bl FUN_02006260 + bl OverlayManager_delete mov r0, #0x0 str r0, [r4, #0x0] mov r0, #0x1 @@ -27,7 +27,7 @@ _020889AC: FUN_020889B0: ; 0x020889B0 push {r3-r5, lr} add r4, r0, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r2, #0x1 add r5, r0, #0x0 mov r0, #0x3 @@ -37,7 +37,7 @@ FUN_020889B0: ; 0x020889B0 add r0, r4, #0x0 mov r1, #0x24 mov r2, #0x37 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0x0 mov r2, #0x24 add r4, r0, #0x0 @@ -67,10 +67,10 @@ FUN_02088A00: ; 0x02088A00 push {r4-r6, lr} add r5, r0, #0x0 add r4, r1, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0x0 add r0, r5, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r5, [r4, #0x0] cmp r5, #0x4 bhi _02088A6A @@ -131,10 +131,10 @@ _02088A74: FUN_02088A78: ; 0x02088A78 push {r4-r6, lr} add r5, r0, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r4, #0xc] ldr r6, [r4, #0x0] bl FreeToHeap @@ -143,7 +143,7 @@ FUN_02088A78: ; 0x02088A78 mov r2, #0x24 bl MI_CpuFill8 add r0, r5, #0x0 - bl FUN_0200627C + bl OverlayManager_FreeData add r0, r6, #0x0 bl FUN_020168D0 mov r0, #0x1 diff --git a/arm9/asm/unk_02088AAC.s b/arm9/asm/unk_02088AAC.s index 30ea796e..65ce7a60 100644 --- a/arm9/asm/unk_02088AAC.s +++ b/arm9/asm/unk_02088AAC.s @@ -83,7 +83,7 @@ FUN_02088AFC: ; 0x02088AFC add r0, r2, #0x0 ldr r2, [r4, #0x0] add r1, r4, #0x0 - bl FUN_02006234 + bl OverlayManager_new str r0, [r4, #0x1c] mov r0, #0x2 add sp, #0x10 @@ -153,7 +153,7 @@ _02088B7C: ldr r2, [r5, #0x0] add r0, sp, #0x0 add r1, r4, #0x0 - bl FUN_02006234 + bl OverlayManager_new str r0, [r5, #0x1c] str r4, [r5, #0x18] mov r0, #0x1 @@ -304,7 +304,7 @@ _02088C9A: ldr r1, [r5, #0x18] ldr r2, [r5, #0x0] add r0, sp, #0x8 - bl FUN_02006234 + bl OverlayManager_new str r0, [r5, #0x1c] mov r0, #0x3 add sp, #0x18 diff --git a/arm9/asm/unk_02089498.s b/arm9/asm/unk_02089498.s index 20b958ad..3962942c 100644 --- a/arm9/asm/unk_02089498.s +++ b/arm9/asm/unk_02089498.s @@ -46,7 +46,7 @@ FUN_02089498: ; 0x02089498 add r0, r5, #0x0 mov r1, #0x38 mov r2, #0x58 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0x0 mov r2, #0x38 add r4, r0, #0x0 @@ -56,7 +56,7 @@ FUN_02089498: ; 0x02089498 mov r0, #0x0 str r0, [r4, #0x4] add r0, r5, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r0, #0x8] str r0, [r4, #0x30] mov r0, #0x1 @@ -68,7 +68,7 @@ FUN_020894D4: ; 0x020894D4 push {r3-r6, lr} sub sp, #0xc add r5, r1, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5, #0x0] add r4, r0, #0x0 mov r6, #0x0 @@ -192,10 +192,10 @@ _020895EC: .word FUN_02089610 FUN_020895F0: ; 0x020895F0 push {r3-r5, lr} add r5, r0, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r4, [r0, #0x0] add r0, r5, #0x0 - bl FUN_0200627C + bl OverlayManager_FreeData add r0, r4, #0x0 bl FUN_020168D0 mov r0, #0x0 diff --git a/arm9/asm/unk_02089960.s b/arm9/asm/unk_02089960.s index d7d6fc47..2154cdf9 100644 --- a/arm9/asm/unk_02089960.s +++ b/arm9/asm/unk_02089960.s @@ -42,7 +42,7 @@ FUN_02089960: ; 0x02089960 add r0, r5, #0x0 mov r1, #0x3c mov r2, #0x58 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0x0 mov r2, #0x3c add r4, r0, #0x0 @@ -52,7 +52,7 @@ FUN_02089960: ; 0x02089960 mov r0, #0x0 str r0, [r4, #0x4] add r0, r5, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r0, #0x8] str r0, [r4, #0x34] mov r0, #0x1 @@ -63,7 +63,7 @@ FUN_02089960: ; 0x02089960 FUN_0208999C: ; 0x0208999C push {r4-r6, lr} add r5, r1, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5, #0x0] add r6, r0, #0x0 mov r4, #0x0 @@ -136,15 +136,15 @@ _02089A3C: .word 0x04001000 FUN_02089A40: ; 0x02089A40 push {r3-r5, lr} add r5, r0, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r4, [r0, #0x0] add r0, r5, #0x0 - bl FUN_0200627C + bl OverlayManager_FreeData add r0, r4, #0x0 bl FUN_020168D0 ldr r0, _02089A64 ; =SDK_OVERLAY_MODULE_83_ID ldr r1, _02089A68 ; =MOD83_0223A360 - bl FUN_02000E7C + bl RegisterMainOverlay mov r0, #0x1 pop {r3-r5, pc} nop |