diff options
569 files changed, 9191 insertions, 1358 deletions
diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf index 6b739cbf..8d496a27 100644 --- a/arm9/arm9.lsf +++ b/arm9/arm9.lsf @@ -183,7 +183,7 @@ Static arm9 Object unk_02048120.o Object unk_020484A8.o Object unk_02048904.o - Object unk_0204A01C.o + Object script_pokemon_util.o Object unk_0204A368.o Object unk_0204A498.o Object unk_0204AB0C.o @@ -246,7 +246,7 @@ Static arm9 Object pokemon.o Object waza.o Object unk_0206ABC4.o - Object unk_0206B16C.o + Object pokemon_storage_system.o Object unk_0206B688.o Object party.o Object unk_0206BB28.o 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 diff --git a/arm9/global.inc b/arm9/global.inc index 18ecce82..19ea45d3 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -184,7 +184,7 @@ .extern FSi_TranslateCommand .extern FUNRTC_Init .extern FUN_02000DF4 -.extern FUN_02000E7C +.extern RegisterMainOverlay .extern FUN_02000EE8 .extern FUN_02000F18 .extern HandleDSLidAction @@ -375,13 +375,13 @@ .extern FUN_02005F14 .extern FUN_020061E8 .extern FUN_0200621C -.extern FUN_02006234 -.extern FUN_02006260 -.extern FUN_02006268 -.extern FUN_02006278 -.extern FUN_0200627C -.extern FUN_0200628C -.extern FUN_02006290 +.extern OverlayManager_new +.extern OverlayManager_delete +.extern OverlayManager_CreateAndGetData +.extern OverlayManager_GetData +.extern OverlayManager_FreeData +.extern OverlayManager_GetField18 +.extern OverlayManager_Run .extern AllocAtEndAndReadWholeNarcMemberByIdPair .extern ReadFromNarcMemberByIdPair .extern AllocAndReadFromNarcMemberByIdPair @@ -408,7 +408,7 @@ .extern FUN_02006C30 .extern FUN_02006C5C .extern FUN_02006C88 -.extern FUN_02006C98 +.extern UncompressFromNarc .extern FUN_02006D18 .extern FUN_02006D98 .extern FUN_02006ED4 @@ -551,7 +551,7 @@ .extern FUN_0200AD18 .extern FUN_0200AD38 .extern FUN_0200AD5C -.extern FUN_0200AD94 +.extern GetRibbonNameOrDesc .extern FUN_0200ADCC .extern FUN_0200AE04 .extern FUN_0200AE38 @@ -1446,8 +1446,8 @@ .extern FUN_02022800 .extern FUN_02022804 .extern FUN_0202280C -.extern FUN_0202282C -.extern FUN_02022830 +.extern SaveGetDirtyBit +.extern SaveSetDirtyBit .extern FUN_02022840 .extern FUN_02022854 .extern FUN_0202287C @@ -4832,7 +4832,7 @@ .extern FUN_0206A9AC .extern FUN_0206AA30 .extern FUN_0206AA84 -.extern FUN_0206AAB4 +.extern RestoreBoxMonPP .extern LoadAllWazaTbl .extern GetWazaAttr .extern WazaGetMaxPp @@ -4844,28 +4844,28 @@ .extern FUN_0206ADE0 .extern FUN_0206ADF0 .extern FUN_0206AE00 -.extern FUN_0206B16C -.extern FUN_0206B178 -.extern FUN_0206B20C -.extern FUN_0206B244 -.extern FUN_0206B2B0 -.extern FUN_0206B2FC -.extern FUN_0206B330 -.extern FUN_0206B334 -.extern FUN_0206B384 -.extern FUN_0206B3E4 -.extern FUN_0206B428 -.extern FUN_0206B43C -.extern FUN_0206B458 -.extern FUN_0206B484 -.extern FUN_0206B4B4 -.extern FUN_0206B4E4 -.extern FUN_0206B57C -.extern FUN_0206B598 -.extern FUN_0206B5E4 -.extern FUN_0206B620 -.extern FUN_0206B644 -.extern FUN_0206B668 +.extern PCStorage_init +.extern PCStorage_sizeof +.extern PCStorage_PlaceMonInFirstEmptySlotInAnyBox +.extern PCStorage_PlaceMonInBoxFirstEmptySlot +.extern PCStorage_PlaceMonInBoxByIndexPair +.extern PCStorage_DeleteBoxMonByIndexPair +.extern PCStorage_GetActiveBox +.extern PCStorage_FindFirstBoxWithEmptySlot +.extern PCStorage_FindFirstEmptySlot +.extern PCStorage_CountMonsAndEggsInAllBoxes +.extern PCStorage_SetActiveBox +.extern PCStorage_GetBoxWallpaper +.extern PCStorage_SetBoxWallpaper +.extern PCStorage_GetBoxName +.extern PCStorage_SetBoxName +.extern PCStorage_CountMonsAndEggsInBox +.extern PCStorage_CountMonsInAllBoxes +.extern PCStorage_SetBoxMonDataByIndexPair +.extern PCStorage_GetMonByIndexPair +.extern PCStorage_UnlockBonusWallpaper +.extern PCStorage_IsBonusWallpaperUnlocked +.extern PCStorage_CountUnlockedBonusWallpapers .extern FUN_0206B688 .extern FUN_0206B6C8 .extern FUN_0206B6D4 diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s index 047e643f..ad9d0939 100644 --- a/arm9/modules/05/asm/mod05_021D74E0.s +++ b/arm9/modules/05/asm/mod05_021D74E0.s @@ -23,7 +23,7 @@ MOD05_021D7504: ; 0x021D7504 push {r4, r5, r6, lr} add r5, r1, #0 mov r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r1, [r5] add r4, r0, #0 cmp r1, #3 @@ -179,7 +179,7 @@ _021D7678: .word SDK_OVERLAY_MODULE_06_ID thumb_func_start MOD05_021D767C MOD05_021D767C: ; 0x021D767C push {r4, lr} - bl FUN_0200628C + bl OverlayManager_GetField18 add r4, r0, #0 bl MOD05_021D7864 cmp r0, #0 @@ -212,7 +212,7 @@ _021D76BA: MOD05_021D76C0: ; 0x021D76C0 push {r3, r4, r5, lr} add r5, r1, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r4, r0, #0 ldr r1, [r4, #0x24] bl MOD05_021EE52C diff --git a/arm9/modules/05/asm/mod05_021DC0B8.s b/arm9/modules/05/asm/mod05_021DC0B8.s index d660a9a4..5e07b24d 100644 --- a/arm9/modules/05/asm/mod05_021DC0B8.s +++ b/arm9/modules/05/asm/mod05_021DC0B8.s @@ -520,7 +520,7 @@ MOD05_021DC480: ; 0x021DC480 add r1, r5, #0 mov r2, #0 mov r3, #4 - bl FUN_02006C98 + bl UncompressFromNarc add r5, r0, #0 add r1, r4, #0 mov r2, #4 diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 734dca2b..7f97e561 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -32820,7 +32820,7 @@ MOD05_021F5268: ; 0x021F5268 add r1, r2, #0 str r5, [sp] add r2, r5, #0 - bl FUN_02006C98 + bl UncompressFromNarc str r0, [r4] bl FUN_020BC13C str r0, [r4, #4] @@ -32913,7 +32913,7 @@ MOD05_021F531C: ; 0x021F531C ldr r3, [sp, #0x18] add r2, r6, #0 str r6, [sp] - bl FUN_02006C98 + bl UncompressFromNarc add r2, r0, #0 ldr r3, [sp, #0x1c] add r0, r5, #0 diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index e2f76b59..ee5fe56a 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -30992,7 +30992,7 @@ _0224886C: mov r0, #0x73 add r1, r6, #0 add r3, r5, #0 - bl FUN_02006C98 + bl UncompressFromNarc str r0, [r4] str r5, [r4, #0x10] str r6, [r4, #0xc] @@ -31005,7 +31005,7 @@ _0224886C: bl PlayerProfile_Clear add r0, r5, #0 add r1, r6, #4 - bl MOD06_022489AC + bl GetInGameTradeMonOrPartnerName add r5, r0, #0 add r1, sp, #4 mov r2, #0x80 @@ -31093,7 +31093,7 @@ MOD06_0224891C: ; 0x0224891C ldr r0, [r5, #4] ldr r1, [r5] ldr r3, [r5, #0xc] - bl MOD06_022489D4 + bl CreateInGameTradeMon ldr r1, [sp, #0x20] add r0, r7, #0 bl FUN_02069B88 @@ -31135,8 +31135,8 @@ _022489A2: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 - thumb_func_start MOD06_022489AC -MOD06_022489AC: ; 0x022489AC + thumb_func_start GetInGameTradeMonOrPartnerName +GetInGameTradeMonOrPartnerName: ; 0x022489AC push {r3, r4, r5, lr} ldr r2, _022489D0 ; =0x00000146 add r3, r0, #0 @@ -31155,8 +31155,9 @@ MOD06_022489AC: ; 0x022489AC .align 2, 0 _022489D0: .word 0x00000146 - thumb_func_start MOD06_022489D4 -MOD06_022489D4: ; 0x022489D4 + thumb_func_start CreateInGameTradeMon +CreateInGameTradeMon: ; 0x022489D4 + ; void CreateInGameTradeMon(struct Pokemon * mon, struct InGameTrade * trade, u32 level, u32 name_idx, u32 heap_id) push {r4, r5, r6, r7, lr} sub sp, #0x14 add r6, r3, #0 @@ -31174,7 +31175,7 @@ MOD06_022489D4: ; 0x022489D4 bl CreateMon ldr r0, [sp, #0x28] add r1, r6, #0 - bl MOD06_022489AC + bl GetInGameTradeMonOrPartnerName add r7, r0, #0 add r0, r5, #0 mov r1, #0x76 @@ -31250,7 +31251,7 @@ MOD06_022489D4: ; 0x022489D4 bl SetMonData ldr r0, [sp, #0x28] add r1, r6, #4 - bl MOD06_022489AC + bl GetInGameTradeMonOrPartnerName add r6, r0, #0 add r0, r5, #0 mov r1, #0x90 @@ -44315,7 +44316,7 @@ _0224EFCC: add r1, r4, #4 mov r2, #0 mov r3, #4 - bl FUN_02006C98 + bl UncompressFromNarc str r0, [r6, r7] add r4, r4, #1 add r6, r6, #4 diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index 571d34b6..4ff7de8f 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -13510,7 +13510,7 @@ _02218DF2: cmp r0, #6 bne _02218E32 add r0, r4, #0 - bl FUN_0206B334 + bl PCStorage_FindFirstBoxWithEmptySlot cmp r0, #0x12 bne _02218E32 ldr r0, [r5, #0x10] diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s index a5298ae9..c24d5e86 100644 --- a/arm9/modules/11/asm/module_11_thumb1.s +++ b/arm9/modules/11/asm/module_11_thumb1.s @@ -9,7 +9,7 @@ MOD11_0222D5C0: ; 0x0222D5C0 sub sp, #0x28 add r4, r1, #0 add r6, r0, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r1, [r4] add r5, r0, #0 cmp r1, #0xf @@ -655,7 +655,7 @@ _0222DB4C: .word MOD11_0222F01C MOD11_0222DB50: ; 0x0222DB50 push {r3, r4, r5, r6, r7, lr} sub sp, #0x30 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl FUN_020222F0 add r5, r0, #0 @@ -1076,7 +1076,7 @@ _0222DF48: .word 0x00002434 thumb_func_start MOD11_0222DF4C MOD11_0222DF4C: ; 0x0222DF4C push {r4, r5, r6, lr} - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, _0222DF9C ; =0x000023F8 add r4, r0, #0 ldrb r1, [r4, r1] @@ -1122,10 +1122,10 @@ _0222DFA0: .word 0x000023FA MOD11_0222DFA4: ; 0x0222DFA4 push {r3, r4, r5, r6, r7, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r7, r0, #0 mov r0, #0 add r1, r0, #0 diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index ab70294a..a87f7d23 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -10,7 +10,7 @@ MOD11_0222F29C: ; 0x0222F29C add r4, r1, #0 ldr r1, _0222F4C0 ; =0x00001028 mov r2, #5 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r5, r0, #0 ldr r0, _0222F4C4 ; =0x00001020 str r4, [r5] @@ -255,7 +255,7 @@ _0222F4E0: .word 0x00001024 MOD11_0222F4E4: ; 0x0222F4E4 push {r4, r5, r6, r7, lr} sub sp, #0xc - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r1, [r4, #4] mov r0, #5 @@ -795,7 +795,7 @@ _0222F938: .word 0x00001024 thumb_func_start MOD11_0222F93C MOD11_0222F93C: ; 0x0222F93C push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 mov r0, #0 add r1, r0, #0 @@ -829,10 +829,10 @@ MOD11_0222F988: ; 0x0222F988 ldr r1, _0222FAB4 ; =0x00002444 add r5, r0, #0 mov r2, #5 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r4, r0, #0 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r6, r0, #0 bl FUN_02031190 lsl r0, r0, #0x18 @@ -979,7 +979,7 @@ _0222FAB8: .word SDK_OVERLAY_MODULE_07_ID thumb_func_start MOD11_0222FABC MOD11_0222FABC: ; 0x0222FABC push {r3, r4, r5, r6, r7, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0 mov r0, #7 lsl r0, r0, #6 @@ -1019,10 +1019,10 @@ _0222FAFE: MOD11_0222FB04: ; 0x0222FB04 push {r3, r4, r5, r6, r7, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 bl FUN_02031190 lsl r0, r0, #0x18 lsr r7, r0, #0x18 @@ -1165,7 +1165,7 @@ _0222FC2A: thumb_func_start MOD11_0222FC38 MOD11_0222FC38: ; 0x0222FC38 push {r3, r4, r5, r6, r7, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0 mov r0, #7 lsl r0, r0, #6 @@ -1205,7 +1205,7 @@ _0222FC7A: MOD11_0222FC80: ; 0x0222FC80 push {r3, r4, r5, r6, r7, lr} sub sp, #0x10 - bl FUN_0200628C + bl OverlayManager_GetField18 add r7, r0, #0 bl FUN_02031190 lsl r0, r0, #0x18 @@ -1434,7 +1434,7 @@ _0222FE54: .word SDK_OVERLAY_MODULE_07_ID thumb_func_start MOD11_0222FE58 MOD11_0222FE58: ; 0x0222FE58 push {r4, r5, r6, lr} - bl FUN_0200628C + bl OverlayManager_GetField18 mov r1, #0x66 lsl r1, r1, #2 ldr r6, [r0, r1] @@ -22671,7 +22671,7 @@ MOD11_0223A3B4: ; 0x0223A3B4 cmp r0, #6 bne _0223A3E0 ldr r0, [r5, #0x64] - bl FUN_0206B334 + bl PCStorage_FindFirstBoxWithEmptySlot cmp r0, #0x12 beq _0223A3F0 _0223A3E0: @@ -25682,7 +25682,7 @@ _0223BBEE: ldr r0, _0223BF18 ; =UNK_020FA5FC add r1, r5, #0 mov r2, #5 - bl FUN_02006234 + bl OverlayManager_new str r0, [r4, #0x50] mov r0, #0x15 str r0, [r4, #0x28] @@ -25697,7 +25697,7 @@ _0223BBEE: pop {r3, r4, r5, r6, r7, pc} _0223BC38: ldr r0, [r4, #0x50] - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0 beq _0223BC88 ldr r2, [r4, #4] @@ -25718,7 +25718,7 @@ _0223BC62: add r0, r5, #0 bl FUN_02077AC4 ldr r0, [r4, #0x50] - bl FUN_02006260 + bl OverlayManager_delete ldr r0, [r4] mov r1, #2 bl MOD11_02231338 @@ -25801,14 +25801,14 @@ _0223BD1E: ldr r0, [r4] bl MOD11_02230290 str r0, [sp, #0x1c] - bl FUN_0206B330 + bl PCStorage_GetActiveBox str r0, [sp, #0x18] ldr r0, [sp, #0x1c] - bl FUN_0206B334 + bl PCStorage_FindFirstBoxWithEmptySlot str r0, [sp, #0x14] ldr r0, [sp, #0x1c] ldr r1, [sp, #0x14] - bl FUN_0206B428 + bl PCStorage_SetActiveBox mov r5, #0 _0223BD3E: add r1, r5, #0 @@ -25830,7 +25830,7 @@ _0223BD3E: add r2, r0, #0 ldr r0, [sp, #0x1c] ldr r1, [sp, #0x14] - bl FUN_0206B244 + bl PCStorage_PlaceMonInBoxFirstEmptySlot ldr r0, [r4, #0x28] cmp r0, #0x16 bne _0223BDD0 diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index 122cd442..5d8f7ae6 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -44,7 +44,7 @@ MOD12_0222D5C0: ; 0x0222D5C0 ldr r1, _0222D868 ; =0x00001658 add r0, r5, #0 mov r2, #0x15 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _0222D868 ; =0x00001658 mov r1, #0 add r4, r0, #0 @@ -53,7 +53,7 @@ MOD12_0222D5C0: ; 0x0222D5C0 bl MOD12_022312D8 str r0, [r4, #8] add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r1, #0x5b str r0, [r4] lsl r1, r1, #2 @@ -299,7 +299,7 @@ MOD12_0222D89C: ; 0x0222D89C push {r4, r5, lr} sub sp, #0xc add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4] bl FUN_02082878 @@ -430,7 +430,7 @@ _0222D9AC: .word 0x00001650 MOD12_0222D9B0: ; 0x0222D9B0 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl FUN_02012EAC ldr r0, [r4, #0x2c] @@ -515,7 +515,7 @@ MOD12_0222D9B0: ; 0x0222D9B0 bl MOD12_02231378 bl FUN_0201CD04 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl FUN_02015F10 @@ -3179,7 +3179,7 @@ MOD12_0222EF04: ; 0x0222EF04 ldr r1, _0222F168 ; =0x00000F68 add r0, r4, #0 mov r2, #0x16 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _0222F168 ; =0x00000F68 mov r1, #0 add r5, r0, #0 @@ -3188,7 +3188,7 @@ MOD12_0222EF04: ; 0x0222EF04 bl MOD12_022312D8 str r0, [r5, #8] add r0, r4, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r1, #0x5b str r0, [r5] lsl r1, r1, #2 @@ -3405,7 +3405,7 @@ MOD12_0222F19C: ; 0x0222F19C push {r4, r5, lr} sub sp, #0xc add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4] bl FUN_02082878 @@ -3588,7 +3588,7 @@ _0222F320: .word 0x00000F1C MOD12_0222F324: ; 0x0222F324 push {r3, r4, r5, r6, r7, lr} str r0, [sp] - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl FUN_02012EAC add r0, r4, #0 @@ -3680,7 +3680,7 @@ _0222F3AE: bl MOD12_02231378 bl FUN_0201CD04 ldr r0, [sp] - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl FUN_02015F10 @@ -5019,7 +5019,7 @@ MOD12_0222FE4C: ; 0x0222FE4C ldr r1, _022300EC ; =0x00001BF4 add r0, r4, #0 mov r2, #0x17 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _022300EC ; =0x00001BF4 mov r1, #0 add r5, r0, #0 @@ -5028,7 +5028,7 @@ MOD12_0222FE4C: ; 0x0222FE4C bl MOD12_022312D8 str r0, [r5, #0x10] add r0, r4, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r1, #0x5b str r0, [r5] lsl r1, r1, #2 @@ -5272,7 +5272,7 @@ MOD12_02230128: ; 0x02230128 push {r4, r5, lr} sub sp, #0xc add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4] bl FUN_02082878 @@ -5402,7 +5402,7 @@ _02230238: .word 0x00001BF0 MOD12_0223023C: ; 0x0223023C push {r3, r4, r5, r6, r7, lr} add r7, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #0xc] bl FUN_020133C8 @@ -5524,7 +5524,7 @@ _02230296: bl MOD12_02231378 bl FUN_0201CD04 add r0, r7, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl FUN_02015F10 @@ -41107,7 +41107,7 @@ MOD12_02241210: ; 0x02241210 add r0, r4, #0 lsl r1, r1, #6 mov r2, #0x18 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0x4a mov r1, #0 lsl r2, r2, #6 @@ -41117,7 +41117,7 @@ MOD12_02241210: ; 0x02241210 bl MOD12_022312D8 str r0, [r5, #0xc] add r0, r4, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r1, #0x5b str r0, [r5] lsl r1, r1, #2 @@ -41326,7 +41326,7 @@ MOD12_02241490: ; 0x02241490 push {r3, r4, r5, lr} sub sp, #8 add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4] bl FUN_02082878 @@ -41456,7 +41456,7 @@ _022415A4: .word 0x0000127C MOD12_022415A8: ; 0x022415A8 push {r3, r4, r5, r6, r7, lr} add r7, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl FUN_02012EAC add r0, r4, #0 @@ -41561,7 +41561,7 @@ _022415D4: bl MOD12_02231378 bl FUN_0201CD04 add r0, r7, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r2, #1 lsl r2, r2, #0x1a ldr r1, [r2] @@ -47817,7 +47817,7 @@ MOD12_0224473C: ; 0x0224473C mov r0, #0x5a add r1, r1, #3 str r2, [sp] - bl FUN_02006C98 + bl UncompressFromNarc pop {r3, pc} .align 2, 0 diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index e1232e0b..21e68458 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -21,11 +21,11 @@ MOD14_021D74E0: ; 0x021D74E0 add r0, r5, #0 lsl r1, r1, #2 mov r2, #9 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r4, r0, #0 beq _021D7544 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r1, r0, #0 add r0, r4, #0 bl MOD14_021DB220 @@ -56,7 +56,7 @@ _021D7548: .word MOD14_021D7680 thumb_func_start MOD14_021D754C MOD14_021D754C: ; 0x021D754C push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData mov r1, #0x6b add r4, r0, #0 lsl r1, r1, #2 @@ -110,7 +110,7 @@ _021D75B4: .word gMain thumb_func_start MOD14_021D75B8 MOD14_021D75B8: ; 0x021D75B8 push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData mov r1, #0x49 add r4, r0, #0 lsl r1, r1, #2 @@ -1865,13 +1865,13 @@ _021D8428: mov r0, #0x12 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_0206B330 + bl PCStorage_GetActiveBox add r1, r0, #0 mov r0, #0x12 lsl r0, r0, #4 ldr r0, [r4, r0] mov r2, #0 - bl FUN_0206B5E4 + bl PCStorage_GetMonByIndexPair mov r1, #0x4b lsl r1, r1, #2 str r0, [r4, r1] @@ -3187,7 +3187,7 @@ _021D8F12: ldr r0, [r5, r1] add r1, #0xa1 ldrsb r1, [r5, r1] - bl FUN_0206B428 + bl PCStorage_SetActiveBox mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -3403,7 +3403,7 @@ _021D90B0: mov r1, #0 mvn r1, r1 sub r2, #0xa - bl FUN_0206B458 + bl PCStorage_SetBoxWallpaper mov r1, #0x12 lsl r1, r1, #4 ldr r1, [r4, r1] @@ -3756,7 +3756,7 @@ _021D9396: mov r0, #0x12 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_0206B428 + bl PCStorage_SetActiveBox mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -3772,7 +3772,7 @@ _021D93BC: mov r0, #0x12 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_0206B428 + bl PCStorage_SetActiveBox mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -3865,7 +3865,7 @@ _021D9488: ldr r0, [r0] mvn r1, r1 add r2, r7, r2 - bl FUN_0206B5E4 + bl PCStorage_GetMonByIndexPair mov r1, #0xab mov r2, #0 bl GetBoxMonData @@ -5297,7 +5297,7 @@ _021DA042: ldrb r1, [r1, #2] ldr r0, [r0, #0x14] ldr r2, [sp, #0xc] - bl FUN_0206B5E4 + bl PCStorage_GetMonByIndexPair mov r1, #0xab mov r2, #0 add r7, r0, #0 @@ -5550,7 +5550,7 @@ _021DA1FE: mov r0, #0x12 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_0206B330 + bl PCStorage_GetActiveBox mov r2, #0x12 lsl r2, r2, #4 add r1, r0, #0 @@ -5558,13 +5558,13 @@ _021DA1FE: add r2, #8 ldr r2, [r4, r2] ldr r2, [r2, #0x18] - bl FUN_0206B484 + bl PCStorage_GetBoxName mov r1, #0x4a lsl r1, r1, #2 ldr r0, _021DA2C0 ; =MOD14_020FA5FC ldr r1, [r4, r1] mov r2, #9 - bl FUN_02006234 + bl OverlayManager_new mov r1, #0x21 lsl r1, r1, #4 str r0, [r4, r1] @@ -5576,18 +5576,18 @@ _021DA256: mov r0, #0x21 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0 beq _021DA2BC mov r0, #0x12 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_0206B330 + bl PCStorage_GetActiveBox add r5, r0, #0 mov r0, #0x21 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02006260 + bl OverlayManager_delete mov r2, #0xf mov r0, #3 mov r1, #0xa @@ -5600,7 +5600,7 @@ _021DA256: ldr r2, [r4, r2] add r1, r5, #0 ldr r2, [r2, #0x18] - bl FUN_0206B4B4 + bl PCStorage_SetBoxName mov r0, #0x12 lsl r0, r0, #4 add r1, r4, #0 @@ -5666,7 +5666,7 @@ _021DA2F2: ldr r0, _021DA394 ; =UNK_020FA6E8 add r1, r5, r1 mov r2, #9 - bl FUN_02006234 + bl OverlayManager_new mov r1, #0x21 lsl r1, r1, #4 str r0, [r5, r1] @@ -5678,17 +5678,17 @@ _021DA334: mov r0, #0x21 lsl r0, r0, #4 ldr r0, [r5, r0] - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0 beq _021DA390 mov r0, #0x12 lsl r0, r0, #4 ldr r0, [r5, r0] - bl FUN_0206B330 + bl PCStorage_GetActiveBox mov r0, #0x21 lsl r0, r0, #4 ldr r0, [r5, r0] - bl FUN_02006260 + bl OverlayManager_delete mov r2, #0xf mov r0, #3 mov r1, #0xa @@ -5828,7 +5828,7 @@ _021DA41E: ldr r0, _021DA5E0 ; =MOD75_021EC68C ldr r1, [r4, r1] mov r2, #9 - bl FUN_02006234 + bl OverlayManager_new mov r1, #0x21 lsl r1, r1, #4 str r0, [r4, r1] @@ -5840,7 +5840,7 @@ _021DA488: mov r0, #0x21 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0 bne _021DA498 _021DA496: @@ -5855,7 +5855,7 @@ _021DA498: mov r0, #0x21 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02006260 + bl OverlayManager_delete mov r0, #0x85 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -6765,7 +6765,7 @@ _021DABFE: mov r0, #0x12 lsl r0, r0, #4 ldr r0, [r5, r0] - bl FUN_0206B428 + bl PCStorage_SetActiveBox add r0, r5, #0 bl MOD14_021DB934 mov r0, #0x45 @@ -6958,7 +6958,7 @@ _021DAD6C: lsl r0, r0, #4 ldr r0, [r4, r0] add r1, r6, #0 - bl FUN_0206B428 + bl PCStorage_SetActiveBox add r0, r4, #0 bl MOD14_021DB934 add r0, r4, #0 @@ -7816,7 +7816,7 @@ MOD14_021DB49C: ; 0x021DB49C push {r3, r4, r5, lr} add r4, r1, #0 add r5, r0, #0 - bl FUN_0206B330 + bl PCStorage_GetActiveBox strb r0, [r4] mov r0, #0x14 mov r1, #9 @@ -7936,12 +7936,12 @@ MOD14_021DB580: ; 0x021DB580 add r4, r1, #0 ldrb r1, [r4] add r5, r0, #0 - bl FUN_0206B43C + bl PCStorage_GetBoxWallpaper strb r0, [r4, #1] ldrb r1, [r4] ldr r2, [r4, #4] add r0, r5, #0 - bl FUN_0206B484 + bl PCStorage_GetBoxName pop {r3, r4, r5, pc} .align 2, 0 @@ -7954,7 +7954,7 @@ MOD14_021DB59C: ; 0x021DB59C add r0, r1, #0 ldrb r1, [r2] add r4, #0x40 - bl FUN_0206B43C + bl PCStorage_GetBoxWallpaper strb r0, [r4, #1] pop {r4, pc} .align 2, 0 @@ -8486,7 +8486,7 @@ _021DB95C: ldrsb r2, [r4, r2] ldr r0, [r5] sub r1, r1, #1 - bl FUN_0206B5E4 + bl PCStorage_GetMonByIndexPair str r0, [r4] b _021DB998 _021DB96C: @@ -8647,7 +8647,7 @@ MOD14_021DBA5C: ; 0x021DBA5C ldrsb r2, [r5, r2] ldr r0, [r7, r0] mvn r1, r1 - bl FUN_0206B2FC + bl PCStorage_DeleteBoxMonByIndexPair mov r0, #0 b _021DBAB6 _021DBA98: @@ -8735,7 +8735,7 @@ _021DBB36: ldr r0, [r7, r0] mvn r1, r1 add r2, r4, #0 - bl FUN_0206B5E4 + bl PCStorage_GetMonByIndexPair mov r1, #0xab mov r2, #0 str r0, [sp, #0x20] @@ -8752,7 +8752,7 @@ _021DBB36: ldr r0, [r7, r0] mvn r1, r1 add r2, r4, #0 - bl FUN_0206B2FC + bl PCStorage_DeleteBoxMonByIndexPair ldr r0, [sp, #0x10] add r5, r5, r0 ldr r0, [sp, #0xc] @@ -8859,7 +8859,7 @@ MOD14_021DBC00: ; 0x021DBC00 ldr r0, [r5, r0] ldr r3, [r4] mvn r1, r1 - bl FUN_0206B2B0 + bl PCStorage_PlaceMonInBoxByIndexPair mov r0, #0x12 mov r2, #7 lsl r0, r0, #4 @@ -8867,7 +8867,7 @@ MOD14_021DBC00: ; 0x021DBC00 ldrsb r2, [r6, r2] ldr r0, [r5, r0] mvn r1, r1 - bl FUN_0206B5E4 + bl PCStorage_GetMonByIndexPair add r1, r0, #0 b _021DBC8A _021DBC42: @@ -8950,7 +8950,7 @@ _021DBCCA: ldr r0, [r7, r0] mvn r1, r1 add r3, r4, #0 - bl FUN_0206B2B0 + bl PCStorage_PlaceMonInBoxByIndexPair ldr r0, [sp, #4] add r5, r5, #1 add r4, r4, r0 @@ -8966,7 +8966,7 @@ _021DBCF4: mov r1, #0 ldr r0, [r7, r0] mvn r1, r1 - bl FUN_0206B5E4 + bl PCStorage_GetMonByIndexPair add r1, r0, #0 ldr r0, [sp] bl MOD14_021DC1A8 @@ -9026,7 +9026,7 @@ MOD14_021DBD34: ; 0x021DBD34 ldr r0, [r5, r0] mvn r1, r1 add r3, r7, r6 - bl FUN_0206B2B0 + bl PCStorage_PlaceMonInBoxByIndexPair mov r0, #0 strb r0, [r4, #0xb] b _021DBDC8 @@ -9076,7 +9076,7 @@ MOD14_021DBDD8: ; 0x021DBDD8 lsl r0, r0, #4 ldr r0, [r4, r0] ldr r2, [r4, #0x14] - bl FUN_0206B244 + bl PCStorage_PlaceMonInBoxFirstEmptySlot cmp r0, #0 beq _021DBDFA mov r0, #1 @@ -9100,7 +9100,7 @@ MOD14_021DBE00: ; 0x021DBE00 ldr r0, [r5, r0] ldr r2, [r5, #8] add r4, #8 - bl FUN_0206B244 + bl PCStorage_PlaceMonInBoxFirstEmptySlot cmp r0, #0 beq _021DBE30 mov r0, #0x49 @@ -9146,7 +9146,7 @@ MOD14_021DBE4C: ; 0x021DBE4C ldrsb r2, [r4, r2] ldr r0, [r5, r0] mvn r1, r1 - bl FUN_0206B2FC + bl PCStorage_DeleteBoxMonByIndexPair b _021DBE7E _021DBE70: mov r0, #0x49 @@ -9566,7 +9566,7 @@ MOD14_021DC1AC: ; 0x021DC1AC bl MOD14_021DC3F4 cmp r0, #1 bne _021DC1E2 - bl FUN_02022830 + bl SaveSetDirtyBit _021DC1E2: add sp, #4 pop {r3, r4, pc} @@ -9617,7 +9617,7 @@ _021DC218: ldr r0, [r6, r0] mvn r1, r1 mov r3, #6 - bl FUN_0206B598 + bl PCStorage_SetBoxMonDataByIndexPair b _021DC254 _021DC24A: ldr r0, [r4] @@ -13810,7 +13810,7 @@ MOD14_021DE1D0: ; 0x021DE1D0 ldr r1, _021DE26C ; =MOD14_021E65AD ldrb r1, [r1, r3] mov r3, #0xa - bl FUN_02006C98 + bl UncompressFromNarc str r0, [sp, #0x10] cmp r0, #0 beq _021DE268 @@ -13890,7 +13890,7 @@ MOD14_021DE278: ; 0x021DE278 ldr r1, _021DE2E0 ; =MOD14_021E65AC ldrb r1, [r1, r3] mov r3, #0xa - bl FUN_02006C98 + bl UncompressFromNarc str r0, [sp, #4] cmp r0, #0 beq _021DE2DC @@ -14329,7 +14329,7 @@ _021DE5FE: ldr r0, [sp, #0x30] ldr r1, [r1, #0x30] add r2, r4, #0 - bl FUN_0206B5E4 + bl PCStorage_GetMonByIndexPair mov r1, #0xab mov r2, #0 str r0, [sp, #0x34] @@ -14430,7 +14430,7 @@ _021DE6D0: ldr r0, [sp, #8] ldr r1, [sp, #4] add r2, r6, #0 - bl FUN_0206B5E4 + bl PCStorage_GetMonByIndexPair mov r1, #5 mov r2, #0 add r7, r0, #0 @@ -14889,7 +14889,7 @@ MOD14_021DEA50: ; 0x021DEA50 ldr r0, _021DEB14 ; =0x00005988 ldr r0, [r5, r0] ldr r0, [r0] - bl FUN_0206B330 + bl PCStorage_GetActiveBox mov r4, #0 str r0, [sp, #0x1c] add r0, r5, #0 @@ -14904,7 +14904,7 @@ _021DEA70: ldr r0, [r5, r0] add r2, r4, #0 ldr r0, [r0] - bl FUN_0206B5E4 + bl PCStorage_GetMonByIndexPair mov r1, #0xab mov r2, #0 str r0, [sp, #0x20] @@ -15021,7 +15021,7 @@ _021DEB5C: ldr r0, [r0, #0x40] add r2, r4, #0 ldr r0, [r0] - bl FUN_0206B5E4 + bl PCStorage_GetMonByIndexPair mov r1, #5 mov r2, #0 str r0, [sp, #0x2c] @@ -21783,7 +21783,7 @@ MOD14_021E1FF8: ; 0x021E1FF8 bl MOD14_021DC44C ldr r1, [sp, #0xc] str r0, [sp, #0x28] - bl FUN_0206B43C + bl PCStorage_GetBoxWallpaper add r0, #0xd0 lsl r0, r0, #0x18 lsr r1, r0, #0x18 @@ -21816,7 +21816,7 @@ _021E204A: ldr r0, [sp, #0x28] ldr r1, [sp, #0xc] add r2, r4, #0 - bl FUN_0206B5E4 + bl PCStorage_GetMonByIndexPair add r4, r4, #1 add r5, r0, #0 bl AcquireBoxMonLock @@ -22178,7 +22178,7 @@ _021E2322: ldr r0, [r6, #0xc] bl MOD14_021DC44C add r1, r4, #0 - bl FUN_0206B4E4 + bl PCStorage_CountMonsAndEggsInBox add r1, r5, #0 add r1, #0x94 add r4, r4, #1 @@ -22250,7 +22250,7 @@ MOD14_021E2394: ; 0x021E2394 ldr r1, [r1] ldr r2, [r5, r2] ldr r4, [r5, #0x10] - bl FUN_0206B484 + bl PCStorage_GetBoxName ldr r1, _021E23F0 ; =0x00004BFC mov r0, #0 ldr r1, [r5, r1] @@ -27049,7 +27049,7 @@ _021E47AE: ldr r0, [r0] ldr r2, [r2] add r1, r4, #0 - bl FUN_0206B484 + bl PCStorage_GetBoxName mov r0, #0x68 str r0, [sp] mov r0, #0x10 @@ -30100,7 +30100,7 @@ MOD14_021E5FC8: ; 0x021E5FC8 mov r1, #7 bl MOD14_021E613C add r0, r6, #0 - bl FUN_0206B668 + bl PCStorage_CountUnlockedBonusWallpapers add r6, r0, #0 beq _021E600E add r0, r4, #0 @@ -30168,7 +30168,7 @@ _021E607A: _021E607C: ldr r0, [sp] add r1, r5, #0 - bl FUN_0206B644 + bl PCStorage_IsBonusWallpaperUnlocked cmp r0, #0 beq _021E60A0 cmp r4, #0 diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index ea50637f..bd0ca04e 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -39,7 +39,7 @@ _021D74F2: str r0, [r4] b _021D7552 _021D752A: - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #0x14] bl MOD15_021D8958 @@ -66,7 +66,7 @@ _021D7552: thumb_func_start MOD15_021D7558 MOD15_021D7558: ; 0x021D7558 push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, _021D7594 ; =gMain ldr r1, [r0, #0x48] @@ -166,7 +166,7 @@ _021D7604: MOD15_021D7608: ; 0x021D7608 push {r4, lr} add r4, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r1, r4, #0 bl MOD15_021D7774 mov r0, #0x22 @@ -183,10 +183,10 @@ MOD15_021D7628: ; 0x021D7628 add r5, r0, #0 mov r1, #0x68 mov r2, #0x22 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r4, r0, #0 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4] bl FUN_0208540C str r0, [r4, #4] @@ -352,7 +352,7 @@ MOD15_021D7774: ; 0x021D7774 ldr r0, [r5, #0x18] bl FUN_02088F4C add r0, r4, #0 - bl FUN_0200627C + bl OverlayManager_FreeData pop {r3, r4, r5, pc} thumb_func_start MOD15_021D7794 diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 386eea1e..515f1d08 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -20,7 +20,7 @@ MOD16_021D74E0: ; 0x021D74E0 add r0, r5, #0 mov r1, #4 mov r2, #0x25 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r4, r0, #0 bne _021D750E bl ErrorHandling @@ -34,7 +34,7 @@ _021D750E: mov r1, #0x25 bl FUN_0201C24C add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r5, r0, #0 ldr r0, _021D7584 ; =MOD16_021D7650 add r1, r4, #0 @@ -83,7 +83,7 @@ _021D7584: .word MOD16_021D7650 MOD16_021D7588: ; 0x021D7588 push {r3, r4, r5, lr} add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r4] add r5, r0, #0 cmp r1, #3 @@ -154,7 +154,7 @@ _021D7610: .word 0x04001050 MOD16_021D7614: ; 0x021D7614 push {r4, lr} add r4, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData mov r0, #0 add r1, r0, #0 bl FUN_02015F10 @@ -166,7 +166,7 @@ _021D7630: bl MOD16_021D7A10 bl FUN_0201C29C add r0, r4, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x25 bl FUN_020168D0 mov r0, #1 diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index e258bcc9..5c020257 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -1752,7 +1752,7 @@ _021D81AC: add r1, r4, #1 mov r2, #0 mov r3, #0xe - bl FUN_02006C98 + bl UncompressFromNarc str r0, [sp, #4] cmp r0, #0 bne _021D81C6 @@ -1778,7 +1778,7 @@ _021D81C6: mov r0, #0x19 add r2, r1, #0 mov r3, #0xe - bl FUN_02006C98 + bl UncompressFromNarc add r4, r0, #0 ldr r0, [r6, #0x14] add r1, r4, #0 @@ -1816,7 +1816,7 @@ _021D822A: add r1, #0xce mov r2, #0 mov r3, #0xe - bl FUN_02006C98 + bl UncompressFromNarc add r2, r4, #0 add r1, r0, #0 add r2, #0x64 @@ -1837,7 +1837,7 @@ _021D822A: str r0, [sp] ldr r1, [sp, #8] mov r0, #0x19 - bl FUN_02006C98 + bl UncompressFromNarc str r0, [sp, #0xc] ldr r0, [r5, #0x14] ldr r1, [sp, #0xc] @@ -1887,7 +1887,7 @@ MOD17_021D82B8: ; 0x021D82B8 mov r0, #0x19 mov r1, #0xeb str r2, [sp] - bl FUN_02006C98 + bl UncompressFromNarc str r0, [r4, #0x28] add sp, #4 pop {r3, r4, pc} @@ -2051,7 +2051,7 @@ MOD17_021D83E4: ; 0x021D83E4 ldr r1, _021D84D8 ; =0x000006D8 add r0, r4, #0 mov r2, #0xd - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021D84D8 ; =0x000006D8 mov r1, #0 add r5, r0, #0 @@ -2061,7 +2061,7 @@ MOD17_021D83E4: ; 0x021D83E4 bl FUN_02015F10 bl FUN_02015F1C add r0, r4, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r4, r0, #0 ldr r1, [r4, #0xc] ldr r0, _021D84E0 ; =0x000006C8 @@ -2150,11 +2150,11 @@ MOD17_021D84F0: ; 0x021D84F0 sub sp, #0xc add r7, r0, #0 add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, r7, #0 mov r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r1, [r5] cmp r1, #0xc bhi _021D85BA @@ -2433,10 +2433,10 @@ _021D8734: .word 0x0000048C MOD17_021D8738: ; 0x021D8738 push {r4, r5, r6, lr} add r6, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r5, r0, #0 ldr r0, _021D8808 ; =0x000006AC ldr r0, [r4, r0] @@ -2509,7 +2509,7 @@ _021D8780: bl ErrorHandling _021D87F0: add r0, r6, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0xd bl FUN_020168D0 mov r0, #0xe @@ -2541,7 +2541,7 @@ MOD17_021D8818: ; 0x021D8818 ldr r1, _021D897C ; =0x000006D8 add r0, r5, #0 mov r2, #0xd - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021D897C ; =0x000006D8 mov r1, #0 add r4, r0, #0 @@ -2551,7 +2551,7 @@ MOD17_021D8818: ; 0x021D8818 bl FUN_02015F10 bl FUN_02015F1C add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r5, r0, #0 ldr r0, [r5, #0xc] ldr r1, _021D8984 ; =0x000006B4 @@ -2692,7 +2692,7 @@ MOD17_021D8998: ; 0x021D8998 push {r3, r4, r5, r6, lr} sub sp, #0xc add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r4] add r5, r0, #0 mov r6, #0 @@ -3061,10 +3061,10 @@ _021D8C98: .word 0xFFFF1FFF MOD17_021D8C9C: ; 0x021D8C9C push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r2, _021D8D50 ; =0x000006B4 add r3, r0, #0 mov r1, #0xfa @@ -3117,7 +3117,7 @@ MOD17_021D8C9C: ; 0x021D8C9C bl ErrorHandling _021D8D30: add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0xd bl FUN_020168D0 mov r0, #0xe @@ -8834,7 +8834,7 @@ MOD17_021DB6D8: ; 0x021DB6D8 ldrh r0, [r1] ldrh r1, [r1, #2] mov r3, #0xe - bl FUN_02006C98 + bl UncompressFromNarc add r1, r0, #0 add r0, r4, #0 mov r2, #0x76 @@ -8913,7 +8913,7 @@ MOD17_021DB700: ; 0x021DB700 ldrh r0, [r6] ldrh r1, [r6, #2] ldr r3, [sp, #0x30] - bl FUN_02006C98 + bl UncompressFromNarc add r1, sp, #0x10 add r6, r0, #0 bl FUN_020B0088 @@ -13716,7 +13716,7 @@ _021DDAC6: mov r0, #0x19 add r1, r5, #1 mov r2, #0 - bl FUN_02006C98 + bl UncompressFromNarc add r7, r0, #0 ldr r0, [r4, #0x10] add r1, r7, #0 @@ -13749,7 +13749,7 @@ _021DDB1E: ldr r3, [sp, #0xc] mov r0, #0x19 add r2, r1, #0 - bl FUN_02006C98 + bl UncompressFromNarc add r5, r0, #0 ldr r0, [r4, #0x14] add r1, r5, #0 @@ -13790,7 +13790,7 @@ MOD17_021DDB58: ; 0x021DDB58 add r0, r5, #0 lsl r1, r1, #2 mov r2, #0xd - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0x65 mov r1, #0 lsl r2, r2, #2 @@ -13801,7 +13801,7 @@ MOD17_021DDB58: ; 0x021DDB58 bl FUN_02015F10 bl FUN_02015F1C add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r5, r0, #0 ldr r0, [r5, #8] cmp r0, #0 @@ -13872,7 +13872,7 @@ MOD17_021DDC30: ; 0x021DDC30 push {r4, r5, lr} sub sp, #0xc add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r5, r0, #0 bl FUN_020222AC bl FUN_020B02C8 @@ -13971,7 +13971,7 @@ _021DDCF0: .word gMain MOD17_021DDCF4: ; 0x021DDCF4 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #0x10] bl MOD17_021DD540 @@ -13988,7 +13988,7 @@ MOD17_021DDCF4: ; 0x021DDCF4 bl FUN_02015F10 bl FUN_02015F1C add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0xd bl FUN_020168D0 mov r0, #0xe diff --git a/arm9/modules/52/asm/module_52.s b/arm9/modules/52/asm/module_52.s index 6858197f..55bb6ed3 100644 --- a/arm9/modules/52/asm/module_52.s +++ b/arm9/modules/52/asm/module_52.s @@ -20,7 +20,7 @@ MOD52_021D74E0: ; 0x021D74E0 thumb_func_start MOD52_021D74F8 MOD52_021D74F8: ; 0x021D74F8 push {r3, lr} - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r1, [r0, #8] mov r0, #0x4d bl MOD52_021D769C @@ -37,7 +37,7 @@ MOD52_021D750C: ; 0x021D750C mov r0, #0 ldr r1, _021D7524 ; =UNK_020FD144 mvn r0, r0 - bl FUN_02000E7C + bl RegisterMainOverlay mov r0, #1 pop {r3, pc} nop @@ -61,7 +61,7 @@ MOD52_021D7528: ; 0x021D7528 thumb_func_start MOD52_021D7540 MOD52_021D7540: ; 0x021D7540 push {r4, lr} - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r4, [r0, #8] mov r0, #0x4d add r1, r4, #0 @@ -82,7 +82,7 @@ MOD52_021D7560: ; 0x021D7560 mov r0, #0 ldr r1, _021D7578 ; =UNK_020F2B7C mvn r0, r0 - bl FUN_02000E7C + bl RegisterMainOverlay mov r0, #1 pop {r3, pc} nop @@ -106,7 +106,7 @@ MOD52_021D757C: ; 0x021D757C thumb_func_start MOD52_021D7594 MOD52_021D7594: ; 0x021D7594 push {r3, r4, r5, lr} - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r4, [r0, #8] add r0, r4, #0 bl FUN_02023788 @@ -148,7 +148,7 @@ MOD52_021D75E8: ; 0x021D75E8 mov r0, #0 ldr r1, _021D7600 ; =UNK_020F2B8C mvn r0, r0 - bl FUN_02000E7C + bl RegisterMainOverlay mov r0, #1 pop {r3, pc} nop diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index 23ad97c5..5b38d781 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -41,7 +41,7 @@ _021D74F6: ldr r1, _021D7640 ; =0x0000940C add r0, r6, #0 mov r2, #0x27 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021D7640 ; =0x0000940C mov r1, #0 add r4, r0, #0 @@ -82,7 +82,7 @@ _021D74F6: add r3, r0, #0 bl FUN_0200E1D0 add r0, r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4, #8] add r0, r4, #0 bl MOD53_021D7B60 @@ -136,7 +136,7 @@ _021D761A: str r0, [r5] b _021D7630 _021D7622: - bl FUN_02006278 + bl OverlayManager_GetData mov r0, #0 str r0, [r5] add sp, #0xc @@ -160,7 +160,7 @@ _021D7650: .word 0xFFFF7FFF MOD53_021D7654: ; 0x021D7654 push {r3, r4, r5, lr} add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl FUN_02031190 cmp r0, #0 @@ -292,10 +292,10 @@ MOD53_021D7764: ; 0x021D7764 push {r3, r4, r5, r6, r7, lr} add r5, r0, #0 add r7, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r4, r0, #0 ldr r0, [r7] cmp r0, #3 @@ -412,7 +412,7 @@ _021D786E: ldr r0, [r6, #8] bl FreeToHeap add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl FUN_02015F10 diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index cc365fa2..5dd265c7 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -42,7 +42,7 @@ _021D74F6: ldr r1, _021D7638 ; =0x00004A60 add r0, r6, #0 mov r2, #0x33 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021D7638 ; =0x00004A60 mov r1, #0 add r4, r0, #0 @@ -51,7 +51,7 @@ _021D74F6: bl FUN_02016B94 str r0, [r4] add r0, r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4, #8] ldr r1, [r0] ldr r0, _021D763C ; =0x00004A38 @@ -133,7 +133,7 @@ _021D75F4: str r0, [r5] b _021D7628 _021D761A: - bl FUN_02006278 + bl OverlayManager_GetData mov r0, #0 str r0, [r5] add sp, #0xc @@ -157,7 +157,7 @@ _021D7648: .word MOD54_021D77E8 MOD54_021D764C: ; 0x021D764C push {r3, r4, r5, lr} add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl FUN_02031190 cmp r0, #0 @@ -276,7 +276,7 @@ _021D773C: .word 0x00010300 MOD54_021D7740: ; 0x021D7740 push {r3, r4, r5, r6, r7, lr} str r0, [sp] - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0 ldr r0, [r6, #0x20] bl FUN_0200CAB4 @@ -321,7 +321,7 @@ _021D776C: add r0, r6, #0 bl MOD54_021D7A34 ldr r0, [sp] - bl FUN_0200627C + bl OverlayManager_FreeData ldr r2, _021D77E4 ; =0x04000304 ldrh r1, [r2] lsr r0, r2, #0xb diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index e0ada2b4..d6b9b522 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -93,13 +93,13 @@ _021D7580: ldr r1, _021D7610 ; =0x0000041C add r0, r6, #0 mov r2, #0x34 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021D7610 ; =0x0000041C mov r1, #0 add r4, r0, #0 bl MI_CpuFill8 add r0, r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4, #8] add r0, r4, #0 bl MOD55_021D7994 @@ -127,7 +127,7 @@ _021D7580: str r0, [r5] b _021D760A _021D75FC: - bl FUN_02006278 + bl OverlayManager_GetData mov r0, #0 str r0, [r5] add sp, #0xc @@ -168,13 +168,13 @@ _021D7628: ldr r1, _021D76B8 ; =0x0000041C add r0, r6, #0 mov r2, #0x34 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021D76B8 ; =0x0000041C mov r1, #0 add r4, r0, #0 bl MI_CpuFill8 add r0, r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4, #8] add r0, r4, #0 bl MOD55_021D7994 @@ -204,7 +204,7 @@ _021D7628: str r0, [r5] b _021D76B2 _021D76A4: - bl FUN_02006278 + bl OverlayManager_GetData mov r0, #0 str r0, [r5] add sp, #0xc @@ -222,7 +222,7 @@ _021D76B8: .word 0x0000041C MOD55_021D76BC: ; 0x021D76BC push {r3, r4, r5, lr} add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 cmp r1, #0 @@ -341,13 +341,13 @@ MOD55_021D778C: ; 0x021D778C MOD55_021D77AC: ; 0x021D77AC push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl MOD55_021D778C add r0, r4, #0 bl MOD55_021D7A38 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x34 bl FUN_020168D0 mov r0, #1 @@ -1780,7 +1780,7 @@ MOD55_021D8320: ; 0x021D8320 ldr r0, _021D836C ; =UNK_020FA5FC ldr r1, [r5] mov r2, #0x34 - bl FUN_02006234 + bl OverlayManager_new mov r1, #0x3d lsl r1, r1, #4 str r0, [r5, r1] @@ -1803,13 +1803,13 @@ MOD55_021D8370: ; 0x021D8370 lsl r0, r0, #4 ldr r0, [r5, r0] add r4, r1, #0 - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0 beq _021D83FC mov r0, #0x3d lsl r0, r0, #4 ldr r0, [r5, r0] - bl FUN_02006260 + bl OverlayManager_delete ldr r1, [r5] ldr r0, [r1, #0x14] cmp r0, #0 @@ -1880,7 +1880,7 @@ MOD55_021D8404: ; 0x021D8404 ldr r0, _021D843C ; =UNK_020FA5FC ldr r1, [r5] mov r2, #0x34 - bl FUN_02006234 + bl OverlayManager_new mov r1, #0x3d lsl r1, r1, #4 str r0, [r5, r1] @@ -1902,13 +1902,13 @@ MOD55_021D8440: ; 0x021D8440 lsl r0, r0, #4 ldr r0, [r5, r0] add r4, r1, #0 - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0 beq _021D84C2 mov r0, #0x3d lsl r0, r0, #4 ldr r0, [r5, r0] - bl FUN_02006260 + bl OverlayManager_delete add r0, r5, #0 ldr r1, [r5] add r0, #0xd8 @@ -5068,7 +5068,7 @@ MOD55_021D9E40: ; 0x021D9E40 ldr r0, _021D9EC4 ; =UNK_020FA5FC ldr r1, [r4] mov r2, #0x34 - bl FUN_02006234 + bl OverlayManager_new mov r1, #0x3d lsl r1, r1, #4 str r0, [r4, r1] @@ -5112,13 +5112,13 @@ MOD55_021D9EC8: ; 0x021D9EC8 lsl r0, r0, #4 ldr r0, [r5, r0] add r4, r1, #0 - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0 beq _021D9F68 mov r0, #0x3d lsl r0, r0, #4 ldr r0, [r5, r0] - bl FUN_02006260 + bl OverlayManager_delete ldr r1, [r5] ldr r0, [r1, #0x14] cmp r0, #0 diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index 197bf84c..5bf21ef0 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -331,7 +331,7 @@ MOD56_02212084: ; 0x02212084 beq _0221214E b _0221215C _02212098: - bl FUN_0200628C + bl OverlayManager_GetField18 add r6, r0, #0 ldr r0, [r6, #4] cmp r0, #1 @@ -353,7 +353,7 @@ _022120BE: add r0, r4, #0 lsl r1, r1, #4 mov r2, #0x36 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0x3f mov r1, #0 lsl r2, r2, #4 @@ -413,7 +413,7 @@ _02212146: str r0, [r5] b _0221215C _0221214E: - bl FUN_02006278 + bl OverlayManager_GetData mov r0, #0 str r0, [r5] add sp, #0xc @@ -430,7 +430,7 @@ _0221215C: MOD56_02212164: ; 0x02212164 push {r3, r4, r5, lr} add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 cmp r1, #0 @@ -537,11 +537,11 @@ _022121EC: MOD56_02212240: ; 0x02212240 push {r4, r5, r6, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl MOD56_022121C4 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r6, r0, #0 mov r0, #0xed lsl r0, r0, #2 @@ -562,7 +562,7 @@ _02212274: add r0, r4, #0 bl MOD56_022124E4 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x36 bl FUN_020168D0 mov r0, #1 diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index f317d49f..9bf62714 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -37,13 +37,13 @@ MOD57_021D74E0: ; 0x021D74E0 ldr r1, _021D76F0 ; =0x00003320 add r0, r5, #0 mov r2, #0x19 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021D76F0 ; =0x00003320 mov r1, #0 add r4, r0, #0 bl memset add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r1, r4, #0 add r1, #0xb4 str r0, [r1] @@ -259,7 +259,7 @@ MOD57_021D7714: ; 0x021D7714 push {r3, r4, r5, r6, lr} sub sp, #0xc add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 cmp r1, #4 @@ -536,7 +536,7 @@ _021D7940: .word 0x000030E4 MOD57_021D7944: ; 0x021D7944 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl MOD57_021D8588 add r0, r4, #0 @@ -556,7 +556,7 @@ MOD57_021D7944: ; 0x021D7944 bl MOD57_021D7EDC bl FUN_0201CD04 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl FUN_02015F10 @@ -1010,7 +1010,7 @@ MOD57_021D7CA4: ; 0x021D7CA4 mov r1, #0x1b mov r3, #0x19 str r2, [sp] - bl FUN_02006C98 + bl UncompressFromNarc ldr r1, _021D7ECC ; =0x000030B8 str r0, [r4, r1] ldr r0, [r4, r1] @@ -1064,7 +1064,7 @@ _021D7D9C: mov r0, #0x33 mov r3, #0x19 str r2, [sp] - bl FUN_02006C98 + bl UncompressFromNarc ldr r1, _021D7ECC ; =0x000030B8 str r0, [r4, r1] ldr r0, [r4, r1] diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index 625039e7..5f477c7b 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -47,7 +47,7 @@ _021D9A36: ldr r1, _021D9B74 ; =0x00005CB0 add r0, r6, #0 mov r2, #0x27 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021D9B74 ; =0x00005CB0 mov r1, #0 add r4, r0, #0 @@ -81,17 +81,17 @@ _021D9A36: add r3, r0, #0 bl FUN_0200E1D0 add r0, r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 bl FUN_02029ABC bl FUN_02029AC8 ldr r1, _021D9B7C ; =0x00005B98 str r0, [r4, r1] add r0, r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 bl FUN_02029FC8 str r0, [r4, #8] add r0, r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0xc] add r0, r4, #0 @@ -129,7 +129,7 @@ _021D9A36: str r0, [r5] b _021D9B64 _021D9B56: - bl FUN_02006278 + bl OverlayManager_GetData mov r0, #0 str r0, [r5] add sp, #0xc @@ -154,7 +154,7 @@ _021D9B88: .word 0xFFFF7FFF MOD58_021D9B8C: ; 0x021D9B8C push {r3, r4, r5, lr} add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 cmp r1, #0 @@ -207,7 +207,7 @@ _021D9BEC: .word 0x00004318 MOD58_021D9BF0: ; 0x021D9BF0 push {r3, r4, r5, r6, r7, lr} str r0, [sp] - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0 ldr r0, _021D9CAC ; =0x00005B98 mov r1, #0x2d @@ -264,7 +264,7 @@ _021D9C40: add r0, r6, #0 bl MOD58_021D9EA0 ldr r0, [sp] - bl FUN_0200627C + bl OverlayManager_FreeData ldr r2, _021D9CB0 ; =0x04000304 ldrh r1, [r2] lsr r0, r2, #0xb diff --git a/arm9/modules/59/asm/module_59.s b/arm9/modules/59/asm/module_59.s index a06b384c..8e652086 100644 --- a/arm9/modules/59/asm/module_59.s +++ b/arm9/modules/59/asm/module_59.s @@ -15,7 +15,7 @@ MOD59_021D74E0: ; 0x021D74E0 add r0, r5, #0 mov r1, #0xb4 mov r2, #0x52 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0 mov r2, #0xb4 add r4, r0, #0 @@ -23,7 +23,7 @@ MOD59_021D74E0: ; 0x021D74E0 mov r0, #0x52 str r0, [r4] add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r0, #8] str r0, [r4, #4] bl Sav2_PlayerData_GetOptionsAddr @@ -71,7 +71,7 @@ MOD59_021D7564: ; 0x021D7564 push {r3, r4, r5, r6, lr} sub sp, #0xc add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 mov r6, #0 @@ -201,11 +201,11 @@ _021D7668: b _021D76AC _021D7690: ldr r0, [r4, #0x14] - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #1 bne _021D76AC ldr r0, [r4, #0x14] - bl FUN_02006260 + bl OverlayManager_delete add r0, r6, #0 str r0, [r4, #0x14] mov r0, #5 @@ -227,7 +227,7 @@ _021D76BC: .word MOD59_021D7724 MOD59_021D76C0: ; 0x021D76C0 push {r4, r5, r6, lr} add r6, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #4] ldr r5, [r4] @@ -250,12 +250,12 @@ MOD59_021D76C0: ; 0x021D76C0 ldr r0, [r4, #0x74] bl FUN_02077AC4 add r0, r6, #0 - bl FUN_0200627C + bl OverlayManager_FreeData add r0, r5, #0 bl FUN_020168D0 ldr r0, _021D771C ; =SDK_OVERLAY_MODULE_52_ID ldr r1, _021D7720 ; =MOD52_021D76D8 - bl FUN_02000E7C + bl RegisterMainOverlay mov r0, #1 pop {r4, r5, r6, pc} nop @@ -3903,7 +3903,7 @@ _021D945C: ldr r0, _021D9778 ; =UNK_020FA5FC ldr r1, [r4, #0x70] ldr r2, [r4] - bl FUN_02006234 + bl OverlayManager_new str r0, [r4, #0x14] mov r0, #0x4d str r0, [r4, #0xc] @@ -4179,7 +4179,7 @@ _021D9684: ldr r0, _021D9778 ; =UNK_020FA5FC ldr r1, [r4, #0x74] ldr r2, [r4] - bl FUN_02006234 + bl OverlayManager_new str r0, [r4, #0x14] mov r0, #0x5d str r0, [r4, #0xc] @@ -4396,7 +4396,7 @@ _021D9848: ldr r0, _021D9864 ; =0x021D9DDC ldr r2, [r4] add r1, r5, #0 - bl FUN_02006234 + bl OverlayManager_new str r0, [r4, #0x14] mov r0, #0x6d str r0, [r4, #0xc] @@ -4423,7 +4423,7 @@ MOD59_021D9868: ; 0x021D9868 add r0, r4, #0 mov r1, #0x28 mov r2, #0x53 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0 mov r2, #0x28 add r4, r0, #0 @@ -4441,7 +4441,7 @@ MOD59_021D9898: ; 0x021D9898 push {r3, r4, r5, r6, lr} sub sp, #0xc add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 mov r6, #0 @@ -4603,10 +4603,10 @@ _021D99F4: .word 0x00000406 MOD59_021D99F8: ; 0x021D99F8 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r4, [r0] add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData add r0, r4, #0 bl FUN_020168D0 mov r0, #1 diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index 58961d48..6c2094b1 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -7,7 +7,7 @@ MOD60_021D74E0: ; 0x021D74E0 push {r3, r4, r5, lr} add r4, r0, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r2, #1 add r5, r0, #0 mov r0, #3 @@ -18,7 +18,7 @@ MOD60_021D74E0: ; 0x021D74E0 add r0, r4, #0 lsl r1, r1, #2 mov r2, #0x26 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0xad mov r1, #0 lsl r2, r2, #2 @@ -104,7 +104,7 @@ _021D75AC: .word 0xFFFF83FF MOD60_021D75B0: ; 0x021D75B0 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #0x10] lsl r0, r0, #0x1e @@ -213,7 +213,7 @@ _021D7680: bl FUN_02024F9C _021D769A: add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData ldr r0, [r4] bl FUN_020168D0 mov r0, #1 @@ -228,7 +228,7 @@ _021D76B4: .word 0xFFFF83FF MOD60_021D76B8: ; 0x021D76B8 push {r3, r4, lr} sub sp, #0xc - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r1, [r4, #4] cmp r1, #4 diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index ec5a0d99..ac07287d 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -7,7 +7,7 @@ MOD61_021D74E0: ; 0x021D74E0 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData mov r2, #2 mov r0, #3 mov r1, #0x29 @@ -16,7 +16,7 @@ MOD61_021D74E0: ; 0x021D74E0 add r0, r5, #0 mov r1, #0xbc mov r2, #0x29 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0 mov r2, #0xbc add r4, r0, #0 @@ -24,7 +24,7 @@ MOD61_021D74E0: ; 0x021D74E0 mov r0, #0x29 str r0, [r4] add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4, #0x1c] ldrh r0, [r0] ldr r1, _021D754C ; =0x0000FFFF @@ -59,7 +59,7 @@ _021D754C: .word 0x0000FFFF thumb_func_start MOD61_021D7550 MOD61_021D7550: ; 0x021D7550 push {r3, lr} - bl FUN_02006278 + bl OverlayManager_GetData bl MOD61_021D78D4 cmp r0, #0 beq _021D7562 @@ -75,10 +75,10 @@ _021D7562: MOD61_021D7568: ; 0x021D7568 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r4, [r0] add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData add r0, r4, #0 bl FUN_020168D0 mov r0, #1 diff --git a/arm9/modules/63/asm/mod63_021D74E0.s b/arm9/modules/63/asm/mod63_021D74E0.s index 8d172847..09884c1e 100644 --- a/arm9/modules/63/asm/mod63_021D74E0.s +++ b/arm9/modules/63/asm/mod63_021D74E0.s @@ -47,7 +47,7 @@ MOD63_021D74E0: ; 0x021D74E0 add r0, r4, #0 lsl r1, r1, #2 mov r2, #0x1e - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0x79 mov r1, #0 lsl r2, r2, #2 @@ -86,7 +86,7 @@ MOD63_021D759C: ; 0x021D759C push {r3, r4, r5, r6, lr} sub sp, #0xc add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r5] cmp r0, #6 @@ -347,7 +347,7 @@ _021D77B0: .word 0x00007FFF MOD63_021D77B4: ; 0x021D77B4 push {r3, r4, r5, r6, r7, lr} add r7, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0 mov r0, #0x1d lsl r0, r0, #4 @@ -361,7 +361,7 @@ MOD63_021D77B4: ; 0x021D77B4 add r0, r6, #0 bl MOD63_021D7B9C add r0, r7, #0 - bl FUN_0200627C + bl OverlayManager_FreeData add r0, r4, #0 bl FUN_020168D0 cmp r5, #1 @@ -374,20 +374,20 @@ _021D77F2: mov r0, #0 ldr r1, _021D781C ; =UNK_020FF3D4 mvn r0, r0 - bl FUN_02000E7C + bl RegisterMainOverlay b _021D7818 _021D77FE: mov r0, #0 ldr r1, _021D7820 ; =UNK_020FF368 mvn r0, r0 - bl FUN_02000E7C + bl RegisterMainOverlay b _021D7818 _021D780A: mov r0, #0 bl FUN_0200415C ldr r0, _021D7824 ; =SDK_OVERLAY_MODULE_63_ID ldr r1, _021D7828 ; =MOD63_021DBE18 - bl FUN_02000E7C + bl RegisterMainOverlay _021D7818: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} diff --git a/arm9/modules/63/asm/mod63_021D8890.s b/arm9/modules/63/asm/mod63_021D8890.s index c6b8180b..7940564f 100644 --- a/arm9/modules/63/asm/mod63_021D8890.s +++ b/arm9/modules/63/asm/mod63_021D8890.s @@ -591,7 +591,7 @@ MOD63_021D8D10: ; 0x021D8D10 add r0, r4, #0 lsl r1, r1, #2 mov r2, #0x4c - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0xab mov r1, #0 lsl r2, r2, #2 @@ -622,7 +622,7 @@ _021D8D94: .word gUnk021C4918 MOD63_021D8D98: ; 0x021D8D98 push {r3, r4, r5, lr} add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r5, r0, #0 mov r0, #0xaa lsl r0, r0, #2 @@ -731,18 +731,18 @@ _021D8E64: .word 0x00000A8C MOD63_021D8E68: ; 0x021D8E68 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl FUN_0200E31C ldr r0, [r4, #0x14] bl SetLCRNGSeed add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x4c bl FUN_020168D0 ldr r0, _021D8E94 ; =SDK_OVERLAY_MODULE_63_ID ldr r1, _021D8E98 ; =MOD63_021DBAB8 - bl FUN_02000E7C + bl RegisterMainOverlay mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index 3f68cd7c..e979f20e 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -16,7 +16,7 @@ MOD64_021D74E0: ; 0x021D74E0 ldr r1, _021D7630 ; =0x000006B4 add r0, r4, #0 mov r2, #0x2f - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r5, r0, #0 bne _021D7504 bl ErrorHandling @@ -32,7 +32,7 @@ _021D7504: mov r2, #0x20 bl FUN_02016B20 add r0, r4, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r4, r0, #0 ldr r0, [r4, #4] bl FUN_02025084 @@ -152,7 +152,7 @@ MOD64_021D7640: ; 0x021D7640 push {r3, r4, r5, r6, lr} sub sp, #4 add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r2, _021D76F0 ; =0x000008C3 add r1, sp, #0 strh r2, [r1] @@ -238,10 +238,10 @@ _021D76F0: .word 0x000008C3 MOD64_021D76F4: ; 0x021D76F4 push {r4, r5, r6, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r6, r0, #0 mov r0, #0 add r1, r0, #0 @@ -297,7 +297,7 @@ _021D7726: bl MOD64_021D7828 bl FUN_0201C29C add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x2f bl FUN_020168D0 mov r0, #1 @@ -1057,7 +1057,7 @@ MOD64_021D7D7C: ; 0x021D7D7C add r4, r0, #0 str r2, [sp] mov r0, #0x52 - bl FUN_02006C98 + bl UncompressFromNarc str r0, [r4, #0x54] bl FUN_020BC13C str r0, [r4, #0x58] @@ -1091,7 +1091,7 @@ MOD64_021D7DC0: ; 0x021D7DC0 str r2, [sp] mov r0, #0x52 add r3, r6, #0 - bl FUN_02006C98 + bl UncompressFromNarc str r0, [r4, #0x64] mov r1, #0 bl FUN_020BC4C8 diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index 748c1b41..d6b9d89f 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -7,7 +7,7 @@ MOD65_021D74E0: ; 0x021D74E0 push {r3, r4, r5, lr} add r4, r0, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r2, #2 add r5, r0, #0 mov r0, #3 @@ -18,7 +18,7 @@ MOD65_021D74E0: ; 0x021D74E0 add r0, r4, #0 lsl r1, r1, #8 mov r2, #0x2d - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #2 mov r1, #0 lsl r2, r2, #8 @@ -40,7 +40,7 @@ _021D7520: .word 0x0000FFFF thumb_func_start MOD65_021D7524 MOD65_021D7524: ; 0x021D7524 push {r3, lr} - bl FUN_02006278 + bl OverlayManager_GetData bl MOD65_021D757C cmp r0, #0 beq _021D7536 @@ -56,7 +56,7 @@ _021D7536: MOD65_021D753C: ; 0x021D753C push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldrb r1, [r4, #0x1a] ldr r0, [r4, #0x20] @@ -78,7 +78,7 @@ MOD65_021D753C: ; 0x021D753C ldr r0, [r4, #0x20] strh r1, [r0, #6] add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData ldr r0, [r4] bl FUN_020168D0 mov r0, #1 @@ -2704,7 +2704,7 @@ MOD65_021D89C4: ; 0x021D89C4 MOD65_021D8A08: ; 0x021D8A08 push {r3, r4, r5, lr} add r4, r0, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r2, #1 add r5, r0, #0 mov r0, #3 @@ -2715,7 +2715,7 @@ MOD65_021D8A08: ; 0x021D8A08 add r0, r4, #0 lsl r1, r1, #2 mov r2, #0x2e - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0x6f mov r1, #0 lsl r2, r2, #2 @@ -2733,7 +2733,7 @@ MOD65_021D8A40: ; 0x021D8A40 push {r4, r5, lr} sub sp, #0xc add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r5] cmp r0, #2 @@ -2916,10 +2916,10 @@ _021D8BB8: .word MOD65_021D8C88 MOD65_021D8BBC: ; 0x021D8BBC push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData ldr r0, [r4] bl FUN_020168D0 mov r0, #1 diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index 50786029..2967b0c9 100644 --- a/arm9/modules/66/asm/module_66.s +++ b/arm9/modules/66/asm/module_66.s @@ -7,7 +7,7 @@ MOD66_021D74E0: ; 0x021D74E0 push {r3, r4, r5, lr} add r4, r0, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r2, #2 add r5, r0, #0 mov r0, #3 @@ -17,7 +17,7 @@ MOD66_021D74E0: ; 0x021D74E0 add r0, r4, #0 mov r1, #0xe4 mov r2, #0x11 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0 mov r2, #0xe4 add r4, r0, #0 @@ -51,7 +51,7 @@ _021D7534: .word 0x00000139 thumb_func_start MOD66_021D7538 MOD66_021D7538: ; 0x021D7538 push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r1, [r4, #8] cmp r1, #8 @@ -115,9 +115,9 @@ _021D75AA: MOD66_021D75B0: ; 0x021D75B0 push {r4, lr} add r4, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r0, r4, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x11 bl FUN_020168D0 mov r0, #1 diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index e00635fe..4c85f4ff 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -37,12 +37,12 @@ MOD67_021D74E0: ; 0x021D74E0 lsl r2, r2, #0x10 bl FUN_0201681C add r0, r4, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r5, r0, #0 ldr r1, _021D75C8 ; =0x00001068 add r0, r4, #0 mov r2, #0x2a - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021D75C8 ; =0x00001068 mov r1, #0 add r4, r0, #0 @@ -102,7 +102,7 @@ _021D75CC: .word MOD67_021D7660 MOD67_021D75D0: ; 0x021D75D0 push {r4, lr} add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r4] cmp r1, #4 bhi _021D7620 @@ -149,7 +149,7 @@ _021D7620: MOD67_021D7624: ; 0x021D7624 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 mov r0, #0 add r1, r0, #0 @@ -163,7 +163,7 @@ MOD67_021D7624: ; 0x021D7624 mov r0, #0 bl FUN_02002CC0 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x2a bl FUN_020168D0 mov r0, #1 diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s index 953d3b63..ff21b695 100644 --- a/arm9/modules/68/asm/module_68.s +++ b/arm9/modules/68/asm/module_68.s @@ -37,14 +37,14 @@ MOD68_021D74E0: ; 0x021D74E0 add r0, r4, #0 lsl r1, r1, #2 mov r2, #0x24 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0x81 mov r1, #0 lsl r2, r2, #2 add r5, r0, #0 bl memset add r0, r4, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r1, #0x7e lsl r1, r1, #2 str r0, [r5, r1] @@ -106,7 +106,7 @@ _021D75D4: .word MOD68_021D7680 MOD68_021D75D8: ; 0x021D75D8 push {r3, r4, r5, lr} add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r4] add r5, r0, #0 cmp r1, #3 @@ -152,7 +152,7 @@ _021D7620: MOD68_021D762C: ; 0x021D762C push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, r4, #4 bl MOD68_021D78EC @@ -168,7 +168,7 @@ MOD68_021D762C: ; 0x021D762C ldr r0, [r4, r0] bl FreeToHeap add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl FUN_02015F10 diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index e9c2015c..74cfe028 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -17,10 +17,10 @@ HOF_OverlayInit: ; 0x0222D5C0 ldr r1, _0222D70C ; =0x00001B60 add r0, r5, #0 mov r2, #0x3f - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r4, r0, #0 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r2, #0x4e str r0, [r4, #0xc] mov r0, #0 @@ -181,7 +181,7 @@ HOF_OverlayTeardown: ; 0x0222D750 beq _0222D7C6 b _0222D7D2 _0222D762: - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, _0222D7D8 ; =0x00001B34 ldr r0, [r4, r0] @@ -211,7 +211,7 @@ _0222D762: ldr r0, [r4, r0] bl DestroyMsgData add r0, r6, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x3f bl FUN_020168D0 ldr r0, [r5] @@ -240,7 +240,7 @@ _0222D7F0: .word 0x00001B5C HOF_OverlayRun: ; 0x0222D7F4 push {r3, r4, r5, lr} add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 cmp r1, #5 diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index e2e99a1f..f18bda67 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -20,11 +20,11 @@ MOD70_021D74E0: ; 0x021D74E0 add r0, r5, #0 mov r1, #0xdc mov r2, #0x3c - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r4, r0, #0 beq _021D7558 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r1, r4, #0 add r1, #0xcc str r0, [r1] @@ -66,7 +66,7 @@ _021D7558: MOD70_021D755C: ; 0x021D755C push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, #0xc8 ldr r0, [r0] @@ -74,7 +74,7 @@ MOD70_021D755C: ; 0x021D755C add r0, r4, #0 bl MOD70_021D7760 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x3d bl FUN_020168D0 mov r0, #0x3c @@ -88,7 +88,7 @@ MOD70_021D755C: ; 0x021D755C MOD70_021D758C: ; 0x021D758C push {r3, r4, r5, lr} add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, #0xd8 ldr r0, [r0] diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index c5d9cbbc..6337fcb9 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -31,7 +31,7 @@ MOD71_0222D5C0: ; 0x0222D5C0 ldr r1, _0222D738 ; =0x000036B4 add r0, r5, #0 mov r2, #0x1a - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r4, r0, #0 ldr r2, _0222D738 ; =0x000036B4 mov r0, #0 @@ -444,7 +444,7 @@ MOD71_0222D9C8: ; 0x0222D9C8 push {r3, r4, r5, r6, lr} sub sp, #0xc add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 mov r6, #0 @@ -555,11 +555,11 @@ _0222DA72: b _0222DB32 _0222DAAE: ldr r0, [r4, #0x40] - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0 beq _0222DB32 ldr r0, [r4, #0x40] - bl FUN_02006260 + bl OverlayManager_delete add r0, r4, #0 bl MOD71_0222D820 add r0, r6, #0 @@ -1722,10 +1722,10 @@ _0222E434: .word 0x000007A8 MOD71_0222E438: ; 0x0222E438 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r1, [r4, #0x5c] str r1, [r0, #0x28] add r0, r4, #0 @@ -1772,7 +1772,7 @@ MOD71_0222E438: ; 0x0222E438 ldr r0, [r4, r0] bl String_dtor add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl FUN_02015F10 @@ -2088,7 +2088,7 @@ MOD71_0222E76C: ; 0x0222E76C push {r4, r5, r6, lr} add r5, r0, #0 add r0, r1, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r4, r0, #0 mov r2, #6 ldr r0, _0222E830 ; =0x00000668 @@ -2220,7 +2220,7 @@ MOD71_0222E884: ; 0x0222E884 str r2, [sp] ldr r2, [sp, #0x20] ldr r3, [sp, #0x24] - bl FUN_02006C98 + bl UncompressFromNarc add r6, r0, #0 beq _0222E8D6 add r1, sp, #4 @@ -3937,7 +3937,7 @@ _0222F606: ldr r0, _0222F670 ; =UNK_020FA6E8 add r1, #0xc mov r2, #0x1a - bl FUN_02006234 + bl OverlayManager_new str r0, [r5, #0x40] str r4, [r5, #0x3c] pop {r3, r4, r5, pc} diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index 4a1e86bf..d46ff721 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -17,7 +17,7 @@ MOD73_021D74E0: ; 0x021D74E0 MOD73_021D74F0: ; 0x021D74F0 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r2, #2 add r4, r0, #0 mov r0, #3 @@ -27,7 +27,7 @@ MOD73_021D74F0: ; 0x021D74F0 ldr r1, _021D757C ; =0x000015E8 add r0, r5, #0 mov r2, #0x38 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021D757C ; =0x000015E8 add r5, r0, #0 mov r1, #0 @@ -87,10 +87,10 @@ MOD73_021D758C: ; 0x021D758C push {r3, r4, r5, r6, r7, lr} add r4, r0, #0 add r5, r1, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r7, r0, #0 add r0, r4, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #0xc] ldr r1, _021D763C ; =0x021DBC9C @@ -180,10 +180,10 @@ _021D763C: .word MOD73_021DBC9C MOD73_021D7640: ; 0x021D7640 push {r3, r4, r5, r6, r7, lr} add r5, r0, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r6, r0, #0 add r0, r5, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r7, r0, #0 ldr r4, [r7] bl MOD73_021D8E90 @@ -197,7 +197,7 @@ MOD73_021D7640: ; 0x021D7640 mov r1, #0 bl MI_CpuFill8 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0 str r0, [r6, #0x18] add r0, r4, #0 diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index e843de0d..1aca7c52 100644 --- a/arm9/modules/74/asm/module_74.s +++ b/arm9/modules/74/asm/module_74.s @@ -7,7 +7,7 @@ MOD74_021D74E0: ; 0x021D74E0 push {r3, r4, r5, lr} add r4, r0, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r2, #1 add r5, r0, #0 mov r0, #3 @@ -18,7 +18,7 @@ MOD74_021D74E0: ; 0x021D74E0 add r0, r4, #0 lsl r1, r1, #2 mov r2, #0x4a - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0xad mov r1, #0 lsl r2, r2, #2 @@ -51,10 +51,10 @@ MOD74_021D74E0: ; 0x021D74E0 MOD74_021D7540: ; 0x021D7540 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData ldr r0, [r4] bl FUN_020168D0 mov r0, #1 @@ -67,7 +67,7 @@ MOD74_021D755C: ; 0x021D755C push {r4, r5, lr} sub sp, #0xc add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r4] add r5, r0, #0 cmp r1, #4 diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index ec4049ab..f2852678 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -36,13 +36,13 @@ MOD75_021E6BA0: ; 0x021E6BA0 ldr r1, _021E6D60 ; =0x000004A4 add r0, r5, #0 mov r2, #6 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021E6D60 ; =0x000004A4 mov r1, #0 add r4, r0, #0 bl memset add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r1, r4, #0 add r1, #0xc4 str r0, [r1] @@ -196,7 +196,7 @@ _021E6D68: .word MOD75_021E700C MOD75_021E6D6C: ; 0x021E6D6C push {r3, r4, r5, lr} add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r4] add r5, r0, #0 cmp r1, #0x18 @@ -406,7 +406,7 @@ _021E6EE0: MOD75_021E6F00: ; 0x021E6F00 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl MOD75_021EBFE4 add r0, r4, #0 @@ -455,7 +455,7 @@ MOD75_021E6F00: ; 0x021E6F00 ldr r0, [r4] bl NARC_dtor add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl FUN_02015F10 diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index 028319f9..c062f14a 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -16,14 +16,14 @@ MOD76_021D74E0: ; 0x021D74E0 add r0, r5, #0 lsl r1, r1, #2 mov r2, #0x43 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0x62 mov r1, #0 lsl r2, r2, #2 add r4, r0, #0 bl memset add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4] add r0, r4, #0 bl MOD76_021D7638 @@ -67,7 +67,7 @@ _021D7564: .word MOD76_021D76E8 MOD76_021D7568: ; 0x021D7568 push {r3, r4, r5, lr} add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r4] add r5, r0, #0 cmp r1, #0xc @@ -161,10 +161,10 @@ _021D7606: MOD76_021D761C: ; 0x021D761C push {r4, lr} add r4, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData bl MOD76_021D76B8 add r0, r4, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x43 bl FUN_020168D0 mov r0, #1 @@ -3165,7 +3165,7 @@ MOD76_021D8D5C: ; 0x021D8D5C ldr r0, _021D8DE8 ; =UNK_020FA6E8 add r1, r4, r1 mov r2, #0x43 - bl FUN_02006234 + bl OverlayManager_new mov r1, #0x5f lsl r1, r1, #2 str r0, [r4, r1] @@ -3184,13 +3184,13 @@ MOD76_021D8DEC: ; 0x021D8DEC mov r0, #0x5f lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0 beq _021D8E3E mov r0, #0x5f lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02006260 + bl OverlayManager_delete add r0, r4, #0 bl MOD76_021D7638 ldr r1, [r4] diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 3d646524..7219a909 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -32,7 +32,7 @@ MOD77_021D74E0: ; 0x021D74E0 ldr r1, _021D75DC ; =0x0000C32C add r0, r4, #0 mov r2, #0x32 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021D75DC ; =0x0000C32C mov r1, #0 add r5, r0, #0 @@ -51,7 +51,7 @@ _021D7540: ldr r0, _021D75E4 ; =0x0000C2F0 str r1, [r5, r0] add r0, r4, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r4, r0, #0 bl FUN_02029AFC str r0, [r5, #4] @@ -125,7 +125,7 @@ MOD77_021D7604: ; 0x021D7604 push {r4, r5, r6, r7, lr} sub sp, #0x14 add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 mov r7, #0 @@ -800,7 +800,7 @@ _021D7BA8: .word 0x0000C060 MOD77_021D7BAC: ; 0x021D7BAC push {r4, r5, r6, lr} add r6, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 mov r0, #4 mov r1, #0 @@ -829,7 +829,7 @@ MOD77_021D7BAC: ; 0x021D7BAC add r1, r0, #0 bl FUN_02015F10 add r0, r6, #0 - bl FUN_0200627C + bl OverlayManager_FreeData add r0, r5, #0 bl FUN_020168D0 ldr r0, _021D7C20 ; =gUnk021C4918 diff --git a/arm9/modules/78/asm/module_78.s b/arm9/modules/78/asm/module_78.s index 1e9df5e9..60412019 100644 --- a/arm9/modules/78/asm/module_78.s +++ b/arm9/modules/78/asm/module_78.s @@ -16,13 +16,13 @@ MOD78_021D74E0: ; 0x021D74E0 add r0, r5, #0 mov r1, #0xa0 mov r2, #0x48 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0 mov r2, #0xa0 add r4, r0, #0 bl memset add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r5, r0, #0 add r0, r4, #0 ldrb r1, [r5] @@ -138,7 +138,7 @@ _021D75DE: str r0, [r1, #4] str r0, [r1, #8] add r0, r2, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r5] cmp r0, #0 @@ -231,7 +231,7 @@ _021D76B4: .word 0x000006DC MOD78_021D76B8: ; 0x021D76B8 push {r3, r4, r5, r6, r7, lr} str r0, [sp] - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0 add r7, r6, #0 mov r4, #0 @@ -256,7 +256,7 @@ _021D76C8: ldr r0, [r6] bl FUN_0201EB70 ldr r0, [sp] - bl FUN_0200627C + bl OverlayManager_FreeData bl FUN_0201B398 mov r0, #0x48 bl FUN_020168D0 diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 6f1d2bbe..d8d72189 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -1395,7 +1395,7 @@ _0222DFE4: ldr r1, _0222E108 ; =0x00001044 add r0, r6, #0 mov r2, #0x3e - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _0222E108 ; =0x00001044 mov r1, #0 add r4, r0, #0 @@ -1511,7 +1511,7 @@ _0222E130: .word 0x00020020 MOD80_0222E134: ; 0x0222E134 push {r4, r5, r6, lr} add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl MOD04_021DD984 bl MOD80_0222D5DC @@ -1651,7 +1651,7 @@ _0222E258: .word 0x00000B84 MOD80_0222E25C: ; 0x0222E25C push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #0x48] bl FreeToHeap @@ -1684,7 +1684,7 @@ MOD80_0222E25C: ; 0x0222E25C ldr r0, [r4] bl FreeToHeap add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl FUN_02015F10 @@ -1751,7 +1751,7 @@ MOD80_0222E338: ; 0x0222E338 push {r4, lr} add r4, r0, #0 add r0, r1, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r1, #0 str r0, [r4] add r0, r4, #0 @@ -2434,7 +2434,7 @@ MOD80_0222E87C: ; 0x0222E87C ldr r0, [r4] sub r1, r1, #1 ldr r0, [r0, #0xc] - bl FUN_0206B4E4 + bl PCStorage_CountMonsAndEggsInBox ldr r1, _0222E8B8 ; =0x00001008 ldrh r2, [r4, r1] add r0, r2, r0 @@ -10966,7 +10966,7 @@ _02232DB0: ldr r0, [sp, #0x20] ldr r1, [sp, #0x10] add r2, r4, #0 - bl FUN_0206B5E4 + bl PCStorage_GetMonByIndexPair ldr r2, [r5, r6] lsl r1, r4, #2 add r1, r2, r1 @@ -10987,7 +10987,7 @@ _02232DD0: ldr r1, [sp, #0x10] add r2, r4, #0 add r7, r5, r6 - bl FUN_0206B5E4 + bl PCStorage_GetMonByIndexPair ldr r1, [sp, #0x1c] str r4, [sp] str r1, [sp, #4] @@ -11026,7 +11026,7 @@ _02232E22: ldr r0, [sp, #0x20] ldr r1, [sp, #0x10] ldr r2, [r5, r2] - bl FUN_0206B484 + bl PCStorage_GetBoxName b _02232F22 _02232E3A: ldr r0, [r5] @@ -11237,7 +11237,7 @@ _02232FEA: add r0, r7, #0 add r1, r6, #0 add r2, r4, #0 - bl FUN_0206B5E4 + bl PCStorage_GetMonByIndexPair pop {r3, r4, r5, r6, r7, pc} .align 2, 0 thumb_func_end MOD80_02232FB8 @@ -15852,7 +15852,7 @@ MOD80_02235398: ; 0x02235398 MOD80_022353B4: ; 0x022353B4 push {r3, r4, r5, lr} add r4, r0, #0 - bl FUN_02022830 + bl SaveSetDirtyBit ldr r0, [r4] mov r1, #2 ldr r0, [r0, #0x20] @@ -15940,7 +15940,7 @@ _02235450: .word 0x00000FE6 MOD80_02235454: ; 0x02235454 push {r4, lr} add r4, r0, #0 - bl FUN_02022830 + bl SaveSetDirtyBit ldr r0, [r4] mov r1, #2 ldr r0, [r0, #0x20] @@ -16074,7 +16074,7 @@ MOD80_02235534: ; 0x02235534 ldrh r1, [r1] ldrh r2, [r2] ldr r0, [r0, #0xc] - bl FUN_0206B5E4 + bl PCStorage_GetMonByIndexPair add r1, r4, #0 bl FUN_02069A64 add r2, r5, #0 @@ -16092,7 +16092,7 @@ MOD80_02235534: ; 0x02235534 ldrh r1, [r1] ldrh r2, [r2] ldr r0, [r0, #0xc] - bl FUN_0206B2FC + bl PCStorage_DeleteBoxMonByIndexPair add r0, r4, #0 bl FreeToHeap b _022355DC @@ -16203,14 +16203,14 @@ _02235664: add r1, sp, #0x20 ldr r0, [r0, #0xc] add r2, sp, #4 - bl FUN_0206B384 + bl PCStorage_FindFirstEmptySlot add r0, r4, #0 bl FUN_020690E4 add r2, r0, #0 ldr r0, [r5] ldr r1, [sp, #0x20] ldr r0, [r0, #0xc] - bl FUN_0206B244 + bl PCStorage_PlaceMonInBoxFirstEmptySlot add r0, r5, #0 ldr r1, [sp, #0x20] add r0, #0xcc @@ -16282,14 +16282,14 @@ _02235706: add r1, sp, #0x20 ldr r0, [r0, #0xc] add r2, sp, #4 - bl FUN_0206B384 + bl PCStorage_FindFirstEmptySlot add r0, r4, #0 bl FUN_020690E4 add r2, r0, #0 ldr r0, [r5] ldr r1, [sp, #0x20] ldr r0, [r0, #0xc] - bl FUN_0206B244 + bl PCStorage_PlaceMonInBoxFirstEmptySlot add r0, r5, #0 ldr r1, [sp, #0x20] add r0, #0xcc @@ -17146,7 +17146,7 @@ MOD80_02235D34: ; 0x02235D34 ldr r0, _02235DD0 ; =UNK_020FA6E8 add r1, #0x60 mov r2, #0x3e - bl FUN_02006234 + bl OverlayManager_new str r0, [r4, #0x5c] mov r0, #1 add r4, #0xac @@ -17164,11 +17164,11 @@ MOD80_02235DD4: ; 0x02235DD4 add r5, r0, #0 ldr r0, [r5, #0x5c] mov r4, #3 - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0 beq _02235DF6 ldr r0, [r5, #0x5c] - bl FUN_02006260 + bl OverlayManager_delete ldr r2, [r5, #0x24] add r0, r5, #0 mov r1, #5 @@ -17392,7 +17392,7 @@ _02235F94: add r1, r4, #0 ldr r0, _02235FB8 ; =0x022375F0 add r1, #0x90 - bl FUN_02006234 + bl OverlayManager_new str r0, [r4, #0x5c] mov r0, #1 add r4, #0xac @@ -17419,13 +17419,13 @@ _02235FD0: b _0223617E _02235FD2: ldr r0, [r4, #0x5c] - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0 bne _02235FDE b _0223617E _02235FDE: ldr r0, [r4, #0x5c] - bl FUN_02006260 + bl OverlayManager_delete ldr r1, [r4, #0x24] cmp r1, #9 bne _02236060 @@ -17735,19 +17735,19 @@ _02236248: ldr r0, [r0, #0xc] ldr r1, [r1] ldr r2, [r2] - bl FUN_0206B2FC + bl PCStorage_DeleteBoxMonByIndexPair ldr r0, [r5] add r1, sp, #4 ldr r0, [r0, #0xc] add r2, sp, #0 - bl FUN_0206B384 + bl PCStorage_FindFirstEmptySlot add r0, r4, #0 bl FUN_020690E4 add r2, r0, #0 ldr r0, [r5] ldr r1, [sp, #4] ldr r0, [r0, #0xc] - bl FUN_0206B244 + bl PCStorage_PlaceMonInBoxFirstEmptySlot add sp, #8 pop {r3, r4, r5, pc} thumb_func_end MOD80_02236218 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 6b04578f..d21611f4 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -30,13 +30,13 @@ _02237E50: add r0, r5, #0 lsl r1, r1, #2 mov r2, #0x39 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r4, r0, #0 bne _02237E84 b _02237FC2 _02237E84: add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4] mov r0, #0 str r0, [r4, #4] @@ -216,7 +216,7 @@ MOD81_02238004: ; 0x02238004 bl OS_DisableInterrupts add r6, r0, #0 add r0, r5, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 mov r0, #0x51 lsl r0, r0, #2 @@ -235,7 +235,7 @@ MOD81_02238004: ; 0x02238004 bl FUN_0201FD58 bl FUN_02009FA0 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x39 bl FUN_020168D0 mov r0, #0x3a @@ -251,7 +251,7 @@ MOD81_02238004: ; 0x02238004 MOD81_02238064: ; 0x02238064 push {r4, r5, r6, lr} add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r3, [r4, #4] cmp r3, #7 @@ -1657,7 +1657,7 @@ MOD81_02238A84: ; 0x02238A84 mov r2, #0 mov r3, #0x3a add r5, r4, r6 - bl FUN_02006C98 + bl UncompressFromNarc str r0, [r4, r6] ldr r1, [sp, #4] add r0, r7, #0 diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index 1427108d..cc15c1dc 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -645,7 +645,7 @@ _0222DA48: ldr r1, _0222DB58 ; =0x00000EC8 add r0, r6, #0 mov r2, #0x44 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _0222DB58 ; =0x00000EC8 mov r1, #0 add r4, r0, #0 @@ -751,7 +751,7 @@ _0222DB78: .word 0x00020020 MOD82_0222DB7C: ; 0x0222DB7C push {r4, r5, r6, lr} add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r5, r0, #0 bl MOD04_021DD984 bl MOD82_0222D5DC @@ -855,7 +855,7 @@ _0222DC4C: .word MOD82_0222FA14 MOD82_0222DC50: ; 0x0222DC50 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #0x24] bl FreeToHeap @@ -882,7 +882,7 @@ MOD82_0222DC50: ; 0x0222DC50 ldr r0, [r4, #4] bl FreeToHeap add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl FUN_02015F10 @@ -938,7 +938,7 @@ MOD82_0222DD04: ; 0x0222DD04 push {r4, lr} add r4, r0, #0 add r0, r1, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r1, #0 str r0, [r4] add r0, r4, #0 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 4e81fd4b..bb52eeb3 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -1805,7 +1805,7 @@ _0222E38E: thumb_func_start MOD83_0222E3B8 MOD83_0222E3B8: ; 0x0222E3B8 push {r3, r4, r5, r6, r7, lr} - bl FUN_02006278 + bl OverlayManager_GetData mov r1, #0x15 add r7, r0, #0 lsl r1, r1, #4 @@ -1921,7 +1921,7 @@ MOD83_0222E48C: ; 0x0222E48C add r0, r5, #0 lsl r1, r1, #2 mov r2, #0x51 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0x57 mov r1, #0 lsl r2, r2, #2 @@ -1937,7 +1937,7 @@ MOD83_0222E48C: ; 0x0222E48C mov r1, #0 bl FUN_0200E3A0 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r0, #8] str r0, [r4, #4] bl FUN_0202251C @@ -1991,7 +1991,7 @@ MOD83_0222E540: ; 0x0222E540 push {r4, r5, r6, lr} add r6, r0, #0 add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #0x18] add r0, r0, #1 @@ -2310,27 +2310,27 @@ _0222E7C0: ; jump table _0222E7D0: ldr r0, _0222E824 ; =SDK_OVERLAY_MODULE_52_ID ldr r1, _0222E828 ; =MOD52_021D76C8 - bl FUN_02000E7C + bl RegisterMainOverlay pop {r3, pc} _0222E7DA: ldr r0, _0222E824 ; =SDK_OVERLAY_MODULE_52_ID ldr r1, _0222E82C ; =MOD52_021D76E8 - bl FUN_02000E7C + bl RegisterMainOverlay pop {r3, pc} _0222E7E4: ldr r0, _0222E830 ; =SDK_OVERLAY_MODULE_83_ID ldr r1, _0222E834 ; =MOD83_0223A434 - bl FUN_02000E7C + bl RegisterMainOverlay pop {r3, pc} _0222E7EE: ldr r0, _0222E830 ; =SDK_OVERLAY_MODULE_83_ID ldr r1, _0222E838 ; =MOD83_0223A4FC - bl FUN_02000E7C + bl RegisterMainOverlay pop {r3, pc} _0222E7F8: ldr r0, _0222E830 ; =SDK_OVERLAY_MODULE_83_ID ldr r1, _0222E83C ; =MOD83_0223A3A8 - bl FUN_02000E7C + bl RegisterMainOverlay pop {r3, pc} _0222E802: ldr r0, _0222E840 ; =MOD83_0223A8C4 @@ -2341,12 +2341,12 @@ _0222E80A: mov r0, #0 ldr r1, _0222E844 ; =UNK_020FD6D4 mvn r0, r0 - bl FUN_02000E7C + bl RegisterMainOverlay pop {r3, pc} _0222E81A: ldr r0, _0222E848 ; =SDK_OVERLAY_MODULE_63_ID ldr r1, _0222E84C ; =MOD63_021DBAB8 - bl FUN_02000E7C + bl RegisterMainOverlay _0222E822: pop {r3, pc} .align 2, 0 @@ -2367,10 +2367,10 @@ _0222E84C: .word MOD63_021DBAB8 MOD83_0222E850: ; 0x0222E850 push {r4, lr} add r4, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData bl MOD83_0222E7AC add r0, r4, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x51 bl FUN_020168D0 mov r0, #0 @@ -2989,7 +2989,7 @@ _0222ED84: .word 0x00000172 thumb_func_start MOD83_0222ED88 MOD83_0222ED88: ; 0x0222ED88 push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl MOD83_02238E48 add r0, r4, #0 @@ -3048,7 +3048,7 @@ MOD83_0222EDF8: ; 0x0222EDF8 bl FUN_02016B94 str r0, [r4, #4] add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r0, #8] str r0, [r4, #8] bl Sav2_PlayerData_GetProfileAddr @@ -3104,7 +3104,7 @@ MOD83_0222EE8C: ; 0x0222EE8C sub sp, #4 add r5, r1, #0 add r6, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 cmp r1, #0xd @@ -3315,9 +3315,9 @@ MOD83_0222F048: ; 0x0222F048 bl FUN_020168D0 ldr r0, _0222F06C ; =SDK_OVERLAY_MODULE_63_ID ldr r1, _0222F070 ; =MOD63_021DBAB8 - bl FUN_02000E7C + bl RegisterMainOverlay add r0, r4, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x55 bl FUN_020168D0 mov r0, #1 @@ -4408,7 +4408,7 @@ MOD83_0222F900: ; 0x0222F900 cmp r0, #0 bne _0222F92C bl MOD83_02231364 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r0, #8] add r1, r4, #0 bl FUN_02031CA8 @@ -4603,7 +4603,7 @@ _0222FA48: .word MOD83_0222FA0C thumb_func_start MOD83_0222FA4C MOD83_0222FA4C: ; 0x0222FA4C push {r3, r4, r5, r6, r7, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r7, r0, #0 bl MOD83_02238E48 ldr r0, [r7, #0x7c] @@ -4740,7 +4740,7 @@ _0222FB5A: MOD83_0222FB5C: ; 0x0222FB5C push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, _0222FBB0 ; =0x000015D4 ldr r0, [r4, r0] @@ -4785,7 +4785,7 @@ _0222FBB8: .word 0x00000434 MOD83_0222FBBC: ; 0x0222FBBC push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, #0x80 ldr r1, [r0] @@ -4852,7 +4852,7 @@ _0222FC3C: .word 0x00000438 thumb_func_start MOD83_0222FC40 MOD83_0222FC40: ; 0x0222FC40 push {r3, r4, r5, r6, r7, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, _0222FCA4 ; =0x000015D4 add r5, r4, #0 @@ -4936,14 +4936,14 @@ MOD83_0222FCE4: ; 0x0222FCE4 push {r3, r4, r5, r6, r7, lr} sub sp, #0x18 add r7, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0 add r4, r6, #0 add r5, r6, #0 add r0, r7, #0 add r4, #0x8c add r5, #0xdc - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r0, #8] str r0, [sp] add r0, r4, #0 @@ -5016,7 +5016,7 @@ MOD83_0222FD84: ; 0x0222FD84 sub sp, #0x14 add r6, r0, #0 add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData cmp r4, #0 bne _0222FD98 mov r5, #4 @@ -5067,7 +5067,7 @@ _0222FDE4: .word MOD83_0223ADD8 MOD83_0222FDE8: ; 0x0222FDE8 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, #0x48 mov r1, #0 @@ -5097,7 +5097,7 @@ MOD83_0222FE24: ; 0x0222FE24 push {r3, r4, r5, r6, lr} sub sp, #0x14 add r6, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r5, r0, #0 bl MOD83_02238700 cmp r0, #0 @@ -5158,7 +5158,7 @@ MOD83_0222FEA0: ; 0x0222FEA0 push {r3, r4, r5, r6, lr} sub sp, #0x14 add r6, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, _0222FF08 ; =0x000015D4 mov r1, #4 @@ -5213,7 +5213,7 @@ MOD83_0222FF10: ; 0x0222FF10 push {r3, r4, r5, r6, lr} sub sp, #0x14 add r6, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, _0222FF78 ; =0x000015D4 mov r1, #3 @@ -5268,7 +5268,7 @@ MOD83_0222FF80: ; 0x0222FF80 push {r4, r5, lr} sub sp, #0x14 add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r1, [r0, #0x48] add r4, #0x48 @@ -5312,7 +5312,7 @@ _0222FFD4: .word MOD83_0223ADB8 MOD83_0222FFD8: ; 0x0222FFD8 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, #0x48 mov r1, #0 @@ -5339,7 +5339,7 @@ _0223000C: .word 0x000015D4 MOD83_02230010: ; 0x02230010 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r1, r4, #0 add r0, r5, #0 @@ -5366,7 +5366,7 @@ _02230044: .word MOD83_0223B888 MOD83_02230048: ; 0x02230048 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, #0x80 ldr r0, [r0] @@ -5422,7 +5422,7 @@ _022300A8: .word MOD83_0223B888 MOD83_022300AC: ; 0x022300AC push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r1, r4, #0 add r0, r5, #0 @@ -5457,7 +5457,7 @@ _022300F4: .word 0x00002620 MOD83_022300F8: ; 0x022300F8 push {r4, lr} add r4, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r0, #0x38 mov r1, #0 bl MOD83_0222FB44 @@ -5475,7 +5475,7 @@ MOD83_02230118: ; 0x02230118 push {r3, r4, r5, r6, lr} sub sp, #0x14 add r6, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r5, r0, #0 ldr r0, [r5, #4] bl FUN_0202251C @@ -5537,7 +5537,7 @@ _02230198: .word MOD83_0223AE20 thumb_func_start MOD83_0223019C MOD83_0223019C: ; 0x0223019C push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, _022301CC ; =0x000005C8 add r4, r0, #0 ldr r2, [r4, r1] @@ -5565,7 +5565,7 @@ _022301D0: .word 0x000015D8 thumb_func_start MOD83_022301D4 MOD83_022301D4: ; 0x022301D4 push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, _02230204 ; =0x000005C8 ldr r1, [r4, r0] @@ -5807,7 +5807,7 @@ MOD83_022303B0: ; 0x022303B0 add r5, r1, #0 add r7, r2, #0 str r3, [sp, #4] - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #0x7c] cmp r0, #0 @@ -5895,7 +5895,7 @@ MOD83_02230464: ; 0x02230464 str r0, [sp, #0x14] str r1, [sp, #0x1c] str r2, [sp, #0x18] - bl FUN_02006278 + bl OverlayManager_GetData add r7, r0, #0 ldr r0, [r7, #4] mov r5, #0 @@ -5977,7 +5977,7 @@ MOD83_0223050C: ; 0x0223050C sub sp, #0x10 add r5, r1, #0 add r7, r2, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r2, _0223059C ; =0x00000172 mov r0, #1 @@ -6046,7 +6046,7 @@ MOD83_022305A4: ; 0x022305A4 sub sp, #0x10 add r5, r1, #0 add r6, r2, #0 - bl FUN_02006278 + bl OverlayManager_GetData mov r0, #0x25 mov r1, #0x56 bl String_ctor @@ -6090,7 +6090,7 @@ MOD83_02230604: ; 0x02230604 add r7, r0, #0 add r5, r1, #0 add r6, r2, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r0, [r0, #0x78] bl FUN_02001204 add r4, r0, #0 @@ -6220,7 +6220,7 @@ MOD83_02230714: ; 0x02230714 push {r4, r5, r6, lr} add r6, r0, #0 add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r1, _022307A4 ; =0x000015DC add r0, r6, #0 @@ -6363,7 +6363,7 @@ _02230848: .word 0x00000265 MOD83_0223084C: ; 0x0223084C push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r1, r0, #0 add r0, #0x80 ldr r0, [r0] @@ -6413,7 +6413,7 @@ MOD83_0223089C: ; 0x0223089C add r6, r1, #0 add r5, r2, #0 str r3, [sp, #4] - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 cmp r6, #0 beq _022308F8 @@ -6509,7 +6509,7 @@ MOD83_02230954: ; 0x02230954 ldr r1, _022309FC ; =0x00002998 add r0, r5, #0 mov r2, #0x56 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _022309FC ; =0x00002998 mov r1, #0 add r4, r0, #0 @@ -6550,7 +6550,7 @@ _022309D0: mov r1, #0x1d str r1, [r4, r0] add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r0, #8] str r0, [r4, #4] bl Sav2_PlayerData_GetOptionsAddr @@ -6578,7 +6578,7 @@ MOD83_02230A10: ; 0x02230A10 sub sp, #0x14 add r6, r0, #0 add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl CTRDG_IsExisting ldr r0, _02230D5C ; =0x000005C8 @@ -7676,7 +7676,7 @@ _02231378: .word MOD83_0223B888 MOD83_0223137C: ; 0x0223137C push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 mov r0, #0x11 lsl r0, r0, #6 @@ -7685,19 +7685,19 @@ MOD83_0223137C: ; 0x0223137C bne _0223139A ldr r0, _022313D0 ; =SDK_OVERLAY_MODULE_63_ID ldr r1, _022313D4 ; =MOD63_021DBAB8 - bl FUN_02000E7C + bl RegisterMainOverlay b _022313A6 _0223139A: cmp r0, #1 bne _022313A6 ldr r0, _022313D8 ; =SDK_OVERLAY_MODULE_83_ID ldr r1, _022313DC ; =MOD83_0223A444 - bl FUN_02000E7C + bl RegisterMainOverlay _022313A6: mov r0, #0x5b bl FUN_020168D0 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x56 bl FUN_020168D0 ldr r0, _022313E0 ; =0x000015D4 @@ -8344,7 +8344,7 @@ MOD83_02231820: ; 0x02231820 thumb_func_start MOD83_022318B0 MOD83_022318B0: ; 0x022318B0 push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl MOD83_02231A00 ldr r0, _022318DC ; =0x00002B70 @@ -8368,7 +8368,7 @@ _022318DC: .word 0x00002B70 thumb_func_start MOD83_022318E0 MOD83_022318E0: ; 0x022318E0 push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl MOD83_02231A00 mov r1, #0xad @@ -8407,7 +8407,7 @@ _0223192C: .word 0x00002B70 thumb_func_start MOD83_02231930 MOD83_02231930: ; 0x02231930 push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl MOD83_02231A00 ldr r0, _022319C0 ; =0x00002B70 @@ -8476,7 +8476,7 @@ _022319CC: .word 0x00002B60 thumb_func_start MOD83_022319D0 MOD83_022319D0: ; 0x022319D0 push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl MOD83_02231A00 ldr r0, _022319FC ; =0x00002B70 @@ -9382,7 +9382,7 @@ MOD83_022320D8: ; 0x022320D8 add r6, r3, #0 ldr r3, [r5] mov r0, #0x74 - bl FUN_02006C98 + bl UncompressFromNarc add r1, sp, #4 add r7, r0, #0 bl FUN_020B0180 @@ -9526,7 +9526,7 @@ MOD83_02232208: ; 0x02232208 add r7, r0, #0 add r5, r1, #0 add r6, r2, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, _02232270 ; =0x00002B68 ldr r0, [r0, r1] bl FUN_02001204 @@ -9730,7 +9730,7 @@ MOD83_022323A8: ; 0x022323A8 ldr r1, _0223240C ; =0x00003CF4 add r0, r4, #0 mov r2, #0x57 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _0223240C ; =0x00003CF4 mov r1, #0 add r4, r0, #0 @@ -10226,7 +10226,7 @@ MOD83_02232788: ; 0x02232788 sub sp, #8 add r5, r1, #0 add r6, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 cmp r1, #0x1d @@ -10272,7 +10272,7 @@ _022327AA: ; jump table .short _02232CF4 - _022327AA - 2 ; case 29 _022327E6: add r0, r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r1, [r0, #8] ldr r0, _02232B54 ; =0x00002B44 str r1, [r4, r0] @@ -11300,7 +11300,7 @@ _022330A0: .word 0x00002BE0 MOD83_022330A4: ; 0x022330A4 push {r3, r4, r5, r6, r7, lr} str r0, [sp] - bl FUN_02006278 + bl OverlayManager_GetData add r7, r0, #0 ldr r0, _02233154 ; =0x000029A8 mov r6, #0 @@ -11364,11 +11364,11 @@ _02233104: bl FreeToHeap ldr r0, _02233160 ; =SDK_OVERLAY_MODULE_83_ID ldr r1, _02233164 ; =MOD83_0223A434 - bl FUN_02000E7C + bl RegisterMainOverlay mov r0, #0x5b bl FUN_020168D0 ldr r0, [sp] - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x57 bl FUN_020168D0 mov r0, #1 @@ -18513,7 +18513,7 @@ MOD83_02236764: ; 0x02236764 ldr r1, _022367F0 ; =0x00012608 add r0, r5, #0 mov r2, #0x4e - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _022367F0 ; =0x00012608 mov r1, #0 add r4, r0, #0 @@ -18532,7 +18532,7 @@ MOD83_02236764: ; 0x02236764 mov r1, #0 bl FUN_0200E3A0 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r0, #8] str r0, [r4, #0x10] bl Sav2_PlayerData_GetProfileAddr @@ -18570,7 +18570,7 @@ _02236800: .word MOD83_0223BB14 MOD83_02236804: ; 0x02236804 push {r4, r5, r6, lr} add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl CTRDG_IsExisting bl CTRDG_IsPulledOut @@ -19278,14 +19278,14 @@ _02236DCC: .word gMain MOD83_02236DD0: ; 0x02236DD0 push {r4, lr} add r4, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r0, [r0, #0x20] bl FreeToHeap ldr r0, _02236DFC ; =SDK_OVERLAY_MODULE_63_ID ldr r1, _02236E00 ; =MOD63_021DBAB8 - bl FUN_02000E7C + bl RegisterMainOverlay add r0, r4, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x4e bl FUN_020168D0 mov r0, #0 @@ -22831,7 +22831,7 @@ MOD83_022387A0: ; 0x022387A0 add r0, r5, #0 add r1, r4, #0 add r2, r6, #0 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0 add r2, r4, #0 add r5, r0, #0 @@ -24220,7 +24220,7 @@ MOD83_022391EC: ; 0x022391EC ldr r3, [r3, #4] mov r0, #0x74 mov r1, #0x1f - bl FUN_02006C98 + bl UncompressFromNarc add r1, sp, #0x14 str r0, [sp, #0x10] bl FUN_020B0180 @@ -25955,7 +25955,7 @@ _02239F30: .word MOD83_0223CADC MOD83_02239F34: ; 0x02239F34 push {r3, r4, r5, lr} add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, _0223A24C ; =0x0000260C add r4, r0, #0 ldr r1, [r4, r1] diff --git a/arm9/modules/84/asm/module_84_thumb1.s b/arm9/modules/84/asm/module_84_thumb1.s index a00ea88f..0a2c3e1b 100644 --- a/arm9/modules/84/asm/module_84_thumb1.s +++ b/arm9/modules/84/asm/module_84_thumb1.s @@ -29,7 +29,7 @@ _021D74FC: ldr r1, _021D7670 ; =0x00001244 add r0, r6, #0 mov r2, #0x4b - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r4, r0, #0 bne _021D7516 b _021D7618 @@ -51,7 +51,7 @@ _021D7516: and r0, r1 str r0, [r2] add r0, r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4, #0x18] mov r0, #0 str r0, [r4, #0x1c] @@ -149,7 +149,7 @@ _021D7618: str r0, [r5] b _021D7668 _021D7620: - bl FUN_02006278 + bl OverlayManager_GetData ldr r2, _021D7684 ; =0x021DA6C8 ldr r1, _021D768C ; =0x0000122C add r4, r0, #0 @@ -208,7 +208,7 @@ MOD84_021D76A4: ; 0x021D76A4 push {r4, r5, r6, lr} add r4, r1, #0 add r6, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r5, r0, #0 ldr r0, [r4] cmp r0, #3 @@ -267,7 +267,7 @@ _021D771A: b _021D773E _021D772E: add r0, r6, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x4b bl FUN_020168D0 mov r0, #1 @@ -284,7 +284,7 @@ MOD84_021D7748: ; 0x021D7748 push {r4, r5, lr} sub sp, #0xc add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #8] mov r1, #1 diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s index c40d4f3b..e7e4e431 100644 --- a/arm9/modules/85/asm/module_85.s +++ b/arm9/modules/85/asm/module_85.s @@ -22,7 +22,7 @@ MOD85_021D74E0: ; 0x021D74E0 add r0, r5, #0 mov r1, #8 mov r2, #0x4f - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r4, r0, #0 mov r0, #0 strb r0, [r4] @@ -34,7 +34,7 @@ MOD85_021D74E0: ; 0x021D74E0 strb r0, [r4, #6] strb r0, [r4, #7] add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4] bl MOD85_021D76CC add r5, r0, #0 @@ -86,7 +86,7 @@ MOD85_021D75A0: ; 0x021D75A0 push {r4, r5, lr} sub sp, #0xc add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r5, [r0, #4] ldr r0, [r4] cmp r0, #3 @@ -167,7 +167,7 @@ _021D7640: .word 0x0000044C MOD85_021D7644: ; 0x021D7644 push {r4, r5, r6, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0 mov r0, #0 ldr r4, [r6, #4] @@ -191,7 +191,7 @@ MOD85_021D7644: ; 0x021D7644 add r0, r4, #0 bl MOD85_021D76F4 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x4f bl FUN_020168D0 mov r0, #1 diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s index 37b0b5f6..28089fba 100644 --- a/arm9/modules/86/asm/module_86.s +++ b/arm9/modules/86/asm/module_86.s @@ -15,7 +15,7 @@ MOD86_021D74E0: ; 0x021D74E0 add r0, r5, #0 mov r1, #0x44 mov r2, #0x54 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0 mov r2, #0x44 add r4, r0, #0 @@ -23,7 +23,7 @@ MOD86_021D74E0: ; 0x021D74E0 mov r0, #0x54 str r0, [r4] add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r1, [r0] str r1, [r4, #8] ldr r0, [r0, #4] @@ -79,7 +79,7 @@ MOD86_021D758C: ; 0x021D758C push {r3, r4, r5, r6, lr} sub sp, #0xc add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 mov r6, #0 @@ -221,7 +221,7 @@ _021D76AC: .word UNK_021C48F8 MOD86_021D76B0: ; 0x021D76B0 push {r4, r5, r6, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0 ldr r4, [r6] bl MOD86_021D7964 @@ -231,7 +231,7 @@ MOD86_021D76B0: ; 0x021D76B0 add r1, r0, #0 bl FUN_02015F10 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData add r0, r4, #0 bl FUN_020168D0 mov r0, #1 diff --git a/arm9/src/main.c b/arm9/src/main.c index a81db33d..3f967380 100644 --- a/arm9/src/main.c +++ b/arm9/src/main.c @@ -6,7 +6,7 @@ #include "PAD_pad.h" #include "main.h" #include "poke_overlay.h" -#include "save_block_2.h" +#include "player_data.h" #include "sound.h" FS_EXTERN_OVERLAY(MODULE_52); @@ -16,9 +16,9 @@ FS_EXTERN_OVERLAY(MODULE_63); struct Unk2106FA0 gBacklightTop; -extern BOOL FUN_02006234(struct Unk21DBE18 *, s32 *, int); -extern BOOL FUN_02006290(int); -extern void FUN_02006260(int); +extern BOOL OverlayManager_new(struct Unk21DBE18 *, s32 *, int); +extern BOOL OverlayManager_Run(int); +extern void OverlayManager_delete(int); extern BOOL FUN_02033678(void); extern u32 FUN_020335B8(void); extern BOOL FUN_0202FB80(void); @@ -89,12 +89,12 @@ THUMB_FUNC void NitroMain(void) case 0: // Title Demo gBacklightTop.unk1C = 0; - FUN_02000E7C(FS_OVERLAY_ID(MODULE_63), &MOD63_021DBE18); + RegisterMainOverlay(FS_OVERLAY_ID(MODULE_63), &MOD63_021DBE18); break; case 1: // Reset transition? gBacklightTop.unk1C = 1; - FUN_02000E7C(FS_OVERLAY_ID(MODULE_52), &MOD52_021D76C8); + RegisterMainOverlay(FS_OVERLAY_ID(MODULE_52), &MOD52_021D76C8); break; default: GF_ASSERT(0); @@ -118,7 +118,7 @@ THUMB_FUNC void NitroMain(void) } if (FUN_0202FB80()) { - FUN_02000E0C(); + Main_RunOverlayManager(); FUN_0201B5CC(gMain.unk18); FUN_0201B5CC(gMain.unk24); if (!gMain.unk30) @@ -151,7 +151,7 @@ THUMB_FUNC void FUN_02000DF4(void) gBacklightTop.unk14 = NULL; } -THUMB_FUNC void FUN_02000E0C(void) +THUMB_FUNC void Main_RunOverlayManager(void) { if (!gBacklightTop.unkC) { @@ -160,20 +160,20 @@ THUMB_FUNC void FUN_02000E0C(void) if (gBacklightTop.unk10 != SDK_OVERLAY_INVALID_ID) HandleLoadOverlay(gBacklightTop.unk10, 0); gBacklightTop.unk8 = gBacklightTop.unk10; - gBacklightTop.unkC = FUN_02006234(gBacklightTop.unk14, &gBacklightTop.unk18, 0); + gBacklightTop.unkC = OverlayManager_new(gBacklightTop.unk14, &gBacklightTop.unk18, 0); gBacklightTop.unk10 = SDK_OVERLAY_INVALID_ID; gBacklightTop.unk14 = NULL; } - if (FUN_02006290(gBacklightTop.unkC)) + if (OverlayManager_Run(gBacklightTop.unkC)) { - FUN_02006260(gBacklightTop.unkC); + OverlayManager_delete(gBacklightTop.unkC); gBacklightTop.unkC = 0; if (gBacklightTop.unk8 != SDK_OVERLAY_INVALID_ID) UnloadOverlayByID(gBacklightTop.unk8); } } -THUMB_FUNC void FUN_02000E7C(FSOverlayID id, struct Unk21DBE18 * arg1) +THUMB_FUNC void RegisterMainOverlay(FSOverlayID id, struct Unk21DBE18 * arg1) { if (gBacklightTop.unk14 != NULL) ErrorHandling(); diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c index dbf86d8a..3db6796a 100644 --- a/arm9/src/pokemon.c +++ b/arm9/src/pokemon.c @@ -701,33 +701,33 @@ u32 GetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * dest) ret = blockA->sheen; break; case MON_DATA_SINNOH_CHAMP_RIBBON: - case MON_DATA_SINNOH_RIBBON_26: - case MON_DATA_SINNOH_RIBBON_27: - case MON_DATA_SINNOH_RIBBON_28: - case MON_DATA_SINNOH_RIBBON_29: - case MON_DATA_SINNOH_RIBBON_30: - case MON_DATA_SINNOH_RIBBON_31: - case MON_DATA_SINNOH_RIBBON_32: - case MON_DATA_SINNOH_RIBBON_33: - case MON_DATA_SINNOH_RIBBON_34: - case MON_DATA_SINNOH_RIBBON_35: - case MON_DATA_SINNOH_RIBBON_36: - case MON_DATA_SINNOH_RIBBON_37: - case MON_DATA_SINNOH_RIBBON_38: - case MON_DATA_SINNOH_RIBBON_39: - case MON_DATA_SINNOH_RIBBON_40: - case MON_DATA_SINNOH_RIBBON_41: - case MON_DATA_SINNOH_RIBBON_42: - case MON_DATA_SINNOH_RIBBON_43: - case MON_DATA_SINNOH_RIBBON_44: - case MON_DATA_SINNOH_RIBBON_45: - case MON_DATA_SINNOH_RIBBON_46: - case MON_DATA_SINNOH_RIBBON_47: - case MON_DATA_SINNOH_RIBBON_48: - case MON_DATA_SINNOH_RIBBON_49: - case MON_DATA_SINNOH_RIBBON_50: - case MON_DATA_SINNOH_RIBBON_51: - case MON_DATA_SINNOH_RIBBON_52: + case MON_DATA_ABILITY_RIBBON: + case MON_DATA_GREAT_ABILITY_RIBBON: + case MON_DATA_DOUBLE_ABILITY_RIBBON: + case MON_DATA_MULTI_ABILITY_RIBBON: + case MON_DATA_PAIR_ABILITY_RIBBON: + case MON_DATA_WORLD_ABILITY_RIBBON: + case MON_DATA_ALERT_RIBBON: + case MON_DATA_SHOCK_RIBBON: + case MON_DATA_DOWNCAST_RIBBON: + case MON_DATA_CARELESS_RIBBON: + case MON_DATA_RELAX_RIBBON: + case MON_DATA_SNOOZE_RIBBON: + case MON_DATA_SMILE_RIBBON: + case MON_DATA_GORGEOUS_RIBBON: + case MON_DATA_ROYAL_RIBBON: + case MON_DATA_GORGEOUS_ROYAL_RIBBON: + case MON_DATA_FOOTPRINT_RIBBON: + case MON_DATA_RECORD_RIBBON: + case MON_DATA_HISTORY_RIBBON: + case MON_DATA_LEGEND_RIBBON: + case MON_DATA_RED_RIBBON: + case MON_DATA_GREEN_RIBBON: + case MON_DATA_BLUE_RIBBON: + case MON_DATA_FESTIVAL_RIBBON: + case MON_DATA_CARNIVAL_RIBBON: + case MON_DATA_CLASSIC_RIBBON: + case MON_DATA_PREMIER_RIBBON: case MON_DATA_SINNOH_RIBBON_53: { if (blockA->sinnohRibbons & (1ll << (attr - MON_DATA_SINNOH_CHAMP_RIBBON))) @@ -790,39 +790,39 @@ u32 GetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * dest) case MON_DATA_HAS_NICKNAME: ret = blockB->isNicknamed; break; - case MON_DATA_COOL_RIBBON: - case MON_DATA_HOENN_RIBBON_79: - case MON_DATA_HOENN_RIBBON_80: - case MON_DATA_HOENN_RIBBON_81: - case MON_DATA_HOENN_RIBBON_82: - case MON_DATA_HOENN_RIBBON_83: - case MON_DATA_HOENN_RIBBON_84: - case MON_DATA_HOENN_RIBBON_85: - case MON_DATA_HOENN_RIBBON_86: - case MON_DATA_HOENN_RIBBON_87: - case MON_DATA_HOENN_RIBBON_88: - case MON_DATA_HOENN_RIBBON_89: - case MON_DATA_HOENN_RIBBON_90: - case MON_DATA_HOENN_RIBBON_91: - case MON_DATA_HOENN_RIBBON_92: - case MON_DATA_HOENN_RIBBON_93: - case MON_DATA_HOENN_RIBBON_94: - case MON_DATA_HOENN_RIBBON_95: - case MON_DATA_HOENN_RIBBON_96: - case MON_DATA_HOENN_RIBBON_97: - case MON_DATA_HOENN_RIBBON_98: - case MON_DATA_HOENN_RIBBON_99: - case MON_DATA_HOENN_RIBBON_100: - case MON_DATA_HOENN_RIBBON_101: - case MON_DATA_HOENN_RIBBON_102: - case MON_DATA_HOENN_RIBBON_103: - case MON_DATA_HOENN_RIBBON_104: - case MON_DATA_HOENN_RIBBON_105: - case MON_DATA_HOENN_RIBBON_106: - case MON_DATA_HOENN_RIBBON_107: - case MON_DATA_HOENN_RIBBON_108: - case MON_DATA_HOENN_RIBBON_109: - if (blockB->ribbonFlags & (1ll << (attr - MON_DATA_COOL_RIBBON))) + case MON_DATA_HOENN_COOL_RIBBON: + case MON_DATA_HOENN_COOL_RIBBON_SUPER: + case MON_DATA_HOENN_COOL_RIBBON_HYPER: + case MON_DATA_HOENN_COOL_RIBBON_MASTER: + case MON_DATA_HOENN_BEAUTY_RIBBON: + case MON_DATA_HOENN_BEAUTY_RIBBON_SUPER: + case MON_DATA_HOENN_BEAUTY_RIBBON_HYPER: + case MON_DATA_HOENN_BEAUTY_RIBBON_MASTER: + case MON_DATA_HOENN_CUTE_RIBBON: + case MON_DATA_HOENN_CUTE_RIBBON_SUPER: + case MON_DATA_HOENN_CUTE_RIBBON_HYPER: + case MON_DATA_HOENN_CUTE_RIBBON_MASTER: + case MON_DATA_HOENN_SMART_RIBBON: + case MON_DATA_HOENN_SMART_RIBBON_SUPER: + case MON_DATA_HOENN_SMART_RIBBON_HYPER: + case MON_DATA_HOENN_SMART_RIBBON_MASTER: + case MON_DATA_HOENN_TOUGH_RIBBON: + case MON_DATA_HOENN_TOUGH_RIBBON_SUPER: + case MON_DATA_HOENN_TOUGH_RIBBON_HYPER: + case MON_DATA_HOENN_TOUGH_RIBBON_MASTER: + case MON_DATA_HOENN_CHAMPION_RIBBON: + case MON_DATA_HOENN_WINNING_RIBBON: + case MON_DATA_HOENN_VICTORY_RIBBON: + case MON_DATA_HOENN_ARTIST_RIBBON: + case MON_DATA_HOENN_EFFORT_RIBBON: + case MON_DATA_HOENN_MARINE_RIBBON: + case MON_DATA_HOENN_LAND_RIBBON: + case MON_DATA_HOENN_SKY_RIBBON: + case MON_DATA_HOENN_COUNTRY_RIBBON: + case MON_DATA_HOENN_NATIONAL_RIBBON: + case MON_DATA_HOENN_EARTH_RIBBON: + case MON_DATA_HOENN_WORLD_RIBBON: + if (blockB->ribbonFlags & (1ll << (attr - MON_DATA_HOENN_COOL_RIBBON))) ret = TRUE; else ret = FALSE; @@ -876,28 +876,28 @@ u32 GetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * dest) case MON_DATA_GAME_VERSION: ret = blockC->originGame; break; - case MON_DATA_SINNOH_RIBBON_122: - case MON_DATA_SINNOH_RIBBON_123: - case MON_DATA_SINNOH_RIBBON_124: - case MON_DATA_SINNOH_RIBBON_125: - case MON_DATA_SINNOH_RIBBON_126: - case MON_DATA_SINNOH_RIBBON_127: - case MON_DATA_SINNOH_RIBBON_128: - case MON_DATA_SINNOH_RIBBON_129: - case MON_DATA_SINNOH_RIBBON_130: - case MON_DATA_SINNOH_RIBBON_131: - case MON_DATA_SINNOH_RIBBON_132: - case MON_DATA_SINNOH_RIBBON_133: - case MON_DATA_SINNOH_RIBBON_134: - case MON_DATA_SINNOH_RIBBON_135: - case MON_DATA_SINNOH_RIBBON_136: - case MON_DATA_SINNOH_RIBBON_137: - case MON_DATA_SINNOH_RIBBON_138: - case MON_DATA_SINNOH_RIBBON_139: - case MON_DATA_SINNOH_RIBBON_140: - case MON_DATA_SINNOH_RIBBON_141: + case MON_DATA_COOL_RIBBON: + case MON_DATA_COOL_RIBBON_GREAT: + case MON_DATA_COOL_RIBBON_ULTRA: + case MON_DATA_COOL_RIBBON_MASTER: + case MON_DATA_BEAUTY_RIBBON: + case MON_DATA_BEAUTY_RIBBON_GREAT: + case MON_DATA_BEAUTY_RIBBON_ULTRA: + case MON_DATA_BEAUTY_RIBBON_MASTER: + case MON_DATA_CUTE_RIBBON: + case MON_DATA_CUTE_RIBBON_GREAT: + case MON_DATA_CUTE_RIBBON_ULTRA: + case MON_DATA_CUTE_RIBBON_MASTER: + case MON_DATA_SMART_RIBBON: + case MON_DATA_SMART_RIBBON_GREAT: + case MON_DATA_SMART_RIBBON_ULTRA: + case MON_DATA_SMART_RIBBON_MASTER: + case MON_DATA_TOUGH_RIBBON: + case MON_DATA_TOUGH_RIBBON_GREAT: + case MON_DATA_TOUGH_RIBBON_ULTRA: + case MON_DATA_TOUGH_RIBBON_MASTER: case MON_DATA_SINNOH_RIBBON_142: - if (blockC->sinnohRibbons2 & (1ll << (attr - MON_DATA_SINNOH_RIBBON_122))) + if (blockC->sinnohRibbons2 & (1ll << (attr - MON_DATA_COOL_RIBBON))) ret = TRUE; else ret = FALSE; @@ -1178,33 +1178,33 @@ void SetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * value) blockA->sheen = VALUE(u8); break; case MON_DATA_SINNOH_CHAMP_RIBBON: - case MON_DATA_SINNOH_RIBBON_26: - case MON_DATA_SINNOH_RIBBON_27: - case MON_DATA_SINNOH_RIBBON_28: - case MON_DATA_SINNOH_RIBBON_29: - case MON_DATA_SINNOH_RIBBON_30: - case MON_DATA_SINNOH_RIBBON_31: - case MON_DATA_SINNOH_RIBBON_32: - case MON_DATA_SINNOH_RIBBON_33: - case MON_DATA_SINNOH_RIBBON_34: - case MON_DATA_SINNOH_RIBBON_35: - case MON_DATA_SINNOH_RIBBON_36: - case MON_DATA_SINNOH_RIBBON_37: - case MON_DATA_SINNOH_RIBBON_38: - case MON_DATA_SINNOH_RIBBON_39: - case MON_DATA_SINNOH_RIBBON_40: - case MON_DATA_SINNOH_RIBBON_41: - case MON_DATA_SINNOH_RIBBON_42: - case MON_DATA_SINNOH_RIBBON_43: - case MON_DATA_SINNOH_RIBBON_44: - case MON_DATA_SINNOH_RIBBON_45: - case MON_DATA_SINNOH_RIBBON_46: - case MON_DATA_SINNOH_RIBBON_47: - case MON_DATA_SINNOH_RIBBON_48: - case MON_DATA_SINNOH_RIBBON_49: - case MON_DATA_SINNOH_RIBBON_50: - case MON_DATA_SINNOH_RIBBON_51: - case MON_DATA_SINNOH_RIBBON_52: + case MON_DATA_ABILITY_RIBBON: + case MON_DATA_GREAT_ABILITY_RIBBON: + case MON_DATA_DOUBLE_ABILITY_RIBBON: + case MON_DATA_MULTI_ABILITY_RIBBON: + case MON_DATA_PAIR_ABILITY_RIBBON: + case MON_DATA_WORLD_ABILITY_RIBBON: + case MON_DATA_ALERT_RIBBON: + case MON_DATA_SHOCK_RIBBON: + case MON_DATA_DOWNCAST_RIBBON: + case MON_DATA_CARELESS_RIBBON: + case MON_DATA_RELAX_RIBBON: + case MON_DATA_SNOOZE_RIBBON: + case MON_DATA_SMILE_RIBBON: + case MON_DATA_GORGEOUS_RIBBON: + case MON_DATA_ROYAL_RIBBON: + case MON_DATA_GORGEOUS_ROYAL_RIBBON: + case MON_DATA_FOOTPRINT_RIBBON: + case MON_DATA_RECORD_RIBBON: + case MON_DATA_HISTORY_RIBBON: + case MON_DATA_LEGEND_RIBBON: + case MON_DATA_RED_RIBBON: + case MON_DATA_GREEN_RIBBON: + case MON_DATA_BLUE_RIBBON: + case MON_DATA_FESTIVAL_RIBBON: + case MON_DATA_CARNIVAL_RIBBON: + case MON_DATA_CLASSIC_RIBBON: + case MON_DATA_PREMIER_RIBBON: case MON_DATA_SINNOH_RIBBON_53: flag = VALUE(u8); mask = (u64)flag << (attr - MON_DATA_SINNOH_CHAMP_RIBBON); @@ -1255,40 +1255,40 @@ void SetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * value) case MON_DATA_HAS_NICKNAME: blockB->isNicknamed = VALUE(u8); break; - case MON_DATA_COOL_RIBBON: - case MON_DATA_HOENN_RIBBON_79: - case MON_DATA_HOENN_RIBBON_80: - case MON_DATA_HOENN_RIBBON_81: - case MON_DATA_HOENN_RIBBON_82: - case MON_DATA_HOENN_RIBBON_83: - case MON_DATA_HOENN_RIBBON_84: - case MON_DATA_HOENN_RIBBON_85: - case MON_DATA_HOENN_RIBBON_86: - case MON_DATA_HOENN_RIBBON_87: - case MON_DATA_HOENN_RIBBON_88: - case MON_DATA_HOENN_RIBBON_89: - case MON_DATA_HOENN_RIBBON_90: - case MON_DATA_HOENN_RIBBON_91: - case MON_DATA_HOENN_RIBBON_92: - case MON_DATA_HOENN_RIBBON_93: - case MON_DATA_HOENN_RIBBON_94: - case MON_DATA_HOENN_RIBBON_95: - case MON_DATA_HOENN_RIBBON_96: - case MON_DATA_HOENN_RIBBON_97: - case MON_DATA_HOENN_RIBBON_98: - case MON_DATA_HOENN_RIBBON_99: - case MON_DATA_HOENN_RIBBON_100: - case MON_DATA_HOENN_RIBBON_101: - case MON_DATA_HOENN_RIBBON_102: - case MON_DATA_HOENN_RIBBON_103: - case MON_DATA_HOENN_RIBBON_104: - case MON_DATA_HOENN_RIBBON_105: - case MON_DATA_HOENN_RIBBON_106: - case MON_DATA_HOENN_RIBBON_107: - case MON_DATA_HOENN_RIBBON_108: - case MON_DATA_HOENN_RIBBON_109: + case MON_DATA_HOENN_COOL_RIBBON: + case MON_DATA_HOENN_COOL_RIBBON_SUPER: + case MON_DATA_HOENN_COOL_RIBBON_HYPER: + case MON_DATA_HOENN_COOL_RIBBON_MASTER: + case MON_DATA_HOENN_BEAUTY_RIBBON: + case MON_DATA_HOENN_BEAUTY_RIBBON_SUPER: + case MON_DATA_HOENN_BEAUTY_RIBBON_HYPER: + case MON_DATA_HOENN_BEAUTY_RIBBON_MASTER: + case MON_DATA_HOENN_CUTE_RIBBON: + case MON_DATA_HOENN_CUTE_RIBBON_SUPER: + case MON_DATA_HOENN_CUTE_RIBBON_HYPER: + case MON_DATA_HOENN_CUTE_RIBBON_MASTER: + case MON_DATA_HOENN_SMART_RIBBON: + case MON_DATA_HOENN_SMART_RIBBON_SUPER: + case MON_DATA_HOENN_SMART_RIBBON_HYPER: + case MON_DATA_HOENN_SMART_RIBBON_MASTER: + case MON_DATA_HOENN_TOUGH_RIBBON: + case MON_DATA_HOENN_TOUGH_RIBBON_SUPER: + case MON_DATA_HOENN_TOUGH_RIBBON_HYPER: + case MON_DATA_HOENN_TOUGH_RIBBON_MASTER: + case MON_DATA_HOENN_CHAMPION_RIBBON: + case MON_DATA_HOENN_WINNING_RIBBON: + case MON_DATA_HOENN_VICTORY_RIBBON: + case MON_DATA_HOENN_ARTIST_RIBBON: + case MON_DATA_HOENN_EFFORT_RIBBON: + case MON_DATA_HOENN_MARINE_RIBBON: + case MON_DATA_HOENN_LAND_RIBBON: + case MON_DATA_HOENN_SKY_RIBBON: + case MON_DATA_HOENN_COUNTRY_RIBBON: + case MON_DATA_HOENN_NATIONAL_RIBBON: + case MON_DATA_HOENN_EARTH_RIBBON: + case MON_DATA_HOENN_WORLD_RIBBON: flag = VALUE(u8); - mask = (u64)flag << (attr - MON_DATA_COOL_RIBBON); + mask = (u64)flag << (attr - MON_DATA_HOENN_COOL_RIBBON); if (flag) blockB->ribbonFlags |= mask; else @@ -1333,29 +1333,29 @@ void SetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * value) case MON_DATA_GAME_VERSION: blockC->originGame = VALUE(u8); break; - case MON_DATA_SINNOH_RIBBON_122: - case MON_DATA_SINNOH_RIBBON_123: - case MON_DATA_SINNOH_RIBBON_124: - case MON_DATA_SINNOH_RIBBON_125: - case MON_DATA_SINNOH_RIBBON_126: - case MON_DATA_SINNOH_RIBBON_127: - case MON_DATA_SINNOH_RIBBON_128: - case MON_DATA_SINNOH_RIBBON_129: - case MON_DATA_SINNOH_RIBBON_130: - case MON_DATA_SINNOH_RIBBON_131: - case MON_DATA_SINNOH_RIBBON_132: - case MON_DATA_SINNOH_RIBBON_133: - case MON_DATA_SINNOH_RIBBON_134: - case MON_DATA_SINNOH_RIBBON_135: - case MON_DATA_SINNOH_RIBBON_136: - case MON_DATA_SINNOH_RIBBON_137: - case MON_DATA_SINNOH_RIBBON_138: - case MON_DATA_SINNOH_RIBBON_139: - case MON_DATA_SINNOH_RIBBON_140: - case MON_DATA_SINNOH_RIBBON_141: + case MON_DATA_COOL_RIBBON: + case MON_DATA_COOL_RIBBON_GREAT: + case MON_DATA_COOL_RIBBON_ULTRA: + case MON_DATA_COOL_RIBBON_MASTER: + case MON_DATA_BEAUTY_RIBBON: + case MON_DATA_BEAUTY_RIBBON_GREAT: + case MON_DATA_BEAUTY_RIBBON_ULTRA: + case MON_DATA_BEAUTY_RIBBON_MASTER: + case MON_DATA_CUTE_RIBBON: + case MON_DATA_CUTE_RIBBON_GREAT: + case MON_DATA_CUTE_RIBBON_ULTRA: + case MON_DATA_CUTE_RIBBON_MASTER: + case MON_DATA_SMART_RIBBON: + case MON_DATA_SMART_RIBBON_GREAT: + case MON_DATA_SMART_RIBBON_ULTRA: + case MON_DATA_SMART_RIBBON_MASTER: + case MON_DATA_TOUGH_RIBBON: + case MON_DATA_TOUGH_RIBBON_GREAT: + case MON_DATA_TOUGH_RIBBON_ULTRA: + case MON_DATA_TOUGH_RIBBON_MASTER: case MON_DATA_SINNOH_RIBBON_142: flag = VALUE(u8); - mask = (u64)flag << (attr - MON_DATA_SINNOH_RIBBON_122); + mask = (u64)flag << (attr - MON_DATA_COOL_RIBBON); if (flag) blockC->sinnohRibbons2 |= mask; else @@ -1630,33 +1630,33 @@ void AddBoxMonData(struct BoxPokemon * boxmon, int attr, int value) case MON_DATA_MARKINGS: case MON_DATA_GAME_LANGUAGE: case MON_DATA_SINNOH_CHAMP_RIBBON: - case MON_DATA_SINNOH_RIBBON_26: - case MON_DATA_SINNOH_RIBBON_27: - case MON_DATA_SINNOH_RIBBON_28: - case MON_DATA_SINNOH_RIBBON_29: - case MON_DATA_SINNOH_RIBBON_30: - case MON_DATA_SINNOH_RIBBON_31: - case MON_DATA_SINNOH_RIBBON_32: - case MON_DATA_SINNOH_RIBBON_33: - case MON_DATA_SINNOH_RIBBON_34: - case MON_DATA_SINNOH_RIBBON_35: - case MON_DATA_SINNOH_RIBBON_36: - case MON_DATA_SINNOH_RIBBON_37: - case MON_DATA_SINNOH_RIBBON_38: - case MON_DATA_SINNOH_RIBBON_39: - case MON_DATA_SINNOH_RIBBON_40: - case MON_DATA_SINNOH_RIBBON_41: - case MON_DATA_SINNOH_RIBBON_42: - case MON_DATA_SINNOH_RIBBON_43: - case MON_DATA_SINNOH_RIBBON_44: - case MON_DATA_SINNOH_RIBBON_45: - case MON_DATA_SINNOH_RIBBON_46: - case MON_DATA_SINNOH_RIBBON_47: - case MON_DATA_SINNOH_RIBBON_48: - case MON_DATA_SINNOH_RIBBON_49: - case MON_DATA_SINNOH_RIBBON_50: - case MON_DATA_SINNOH_RIBBON_51: - case MON_DATA_SINNOH_RIBBON_52: + case MON_DATA_ABILITY_RIBBON: + case MON_DATA_GREAT_ABILITY_RIBBON: + case MON_DATA_DOUBLE_ABILITY_RIBBON: + case MON_DATA_MULTI_ABILITY_RIBBON: + case MON_DATA_PAIR_ABILITY_RIBBON: + case MON_DATA_WORLD_ABILITY_RIBBON: + case MON_DATA_ALERT_RIBBON: + case MON_DATA_SHOCK_RIBBON: + case MON_DATA_DOWNCAST_RIBBON: + case MON_DATA_CARELESS_RIBBON: + case MON_DATA_RELAX_RIBBON: + case MON_DATA_SNOOZE_RIBBON: + case MON_DATA_SMILE_RIBBON: + case MON_DATA_GORGEOUS_RIBBON: + case MON_DATA_ROYAL_RIBBON: + case MON_DATA_GORGEOUS_ROYAL_RIBBON: + case MON_DATA_FOOTPRINT_RIBBON: + case MON_DATA_RECORD_RIBBON: + case MON_DATA_HISTORY_RIBBON: + case MON_DATA_LEGEND_RIBBON: + case MON_DATA_RED_RIBBON: + case MON_DATA_GREEN_RIBBON: + case MON_DATA_BLUE_RIBBON: + case MON_DATA_FESTIVAL_RIBBON: + case MON_DATA_CARNIVAL_RIBBON: + case MON_DATA_CLASSIC_RIBBON: + case MON_DATA_PREMIER_RIBBON: case MON_DATA_SINNOH_RIBBON_53: case MON_DATA_MOVE1: case MON_DATA_MOVE2: @@ -1664,38 +1664,38 @@ void AddBoxMonData(struct BoxPokemon * boxmon, int attr, int value) case MON_DATA_MOVE4: case MON_DATA_IS_EGG: case MON_DATA_HAS_NICKNAME: - case MON_DATA_COOL_RIBBON: - case MON_DATA_HOENN_RIBBON_79: - case MON_DATA_HOENN_RIBBON_80: - case MON_DATA_HOENN_RIBBON_81: - case MON_DATA_HOENN_RIBBON_82: - case MON_DATA_HOENN_RIBBON_83: - case MON_DATA_HOENN_RIBBON_84: - case MON_DATA_HOENN_RIBBON_85: - case MON_DATA_HOENN_RIBBON_86: - case MON_DATA_HOENN_RIBBON_87: - case MON_DATA_HOENN_RIBBON_88: - case MON_DATA_HOENN_RIBBON_89: - case MON_DATA_HOENN_RIBBON_90: - case MON_DATA_HOENN_RIBBON_91: - case MON_DATA_HOENN_RIBBON_92: - case MON_DATA_HOENN_RIBBON_93: - case MON_DATA_HOENN_RIBBON_94: - case MON_DATA_HOENN_RIBBON_95: - case MON_DATA_HOENN_RIBBON_96: - case MON_DATA_HOENN_RIBBON_97: - case MON_DATA_HOENN_RIBBON_98: - case MON_DATA_HOENN_RIBBON_99: - case MON_DATA_HOENN_RIBBON_100: - case MON_DATA_HOENN_RIBBON_101: - case MON_DATA_HOENN_RIBBON_102: - case MON_DATA_HOENN_RIBBON_103: - case MON_DATA_HOENN_RIBBON_104: - case MON_DATA_HOENN_RIBBON_105: - case MON_DATA_HOENN_RIBBON_106: - case MON_DATA_HOENN_RIBBON_107: - case MON_DATA_HOENN_RIBBON_108: - case MON_DATA_HOENN_RIBBON_109: + case MON_DATA_HOENN_COOL_RIBBON: + case MON_DATA_HOENN_COOL_RIBBON_SUPER: + case MON_DATA_HOENN_COOL_RIBBON_HYPER: + case MON_DATA_HOENN_COOL_RIBBON_MASTER: + case MON_DATA_HOENN_BEAUTY_RIBBON: + case MON_DATA_HOENN_BEAUTY_RIBBON_SUPER: + case MON_DATA_HOENN_BEAUTY_RIBBON_HYPER: + case MON_DATA_HOENN_BEAUTY_RIBBON_MASTER: + case MON_DATA_HOENN_CUTE_RIBBON: + case MON_DATA_HOENN_CUTE_RIBBON_SUPER: + case MON_DATA_HOENN_CUTE_RIBBON_HYPER: + case MON_DATA_HOENN_CUTE_RIBBON_MASTER: + case MON_DATA_HOENN_SMART_RIBBON: + case MON_DATA_HOENN_SMART_RIBBON_SUPER: + case MON_DATA_HOENN_SMART_RIBBON_HYPER: + case MON_DATA_HOENN_SMART_RIBBON_MASTER: + case MON_DATA_HOENN_TOUGH_RIBBON: + case MON_DATA_HOENN_TOUGH_RIBBON_SUPER: + case MON_DATA_HOENN_TOUGH_RIBBON_HYPER: + case MON_DATA_HOENN_TOUGH_RIBBON_MASTER: + case MON_DATA_HOENN_CHAMPION_RIBBON: + case MON_DATA_HOENN_WINNING_RIBBON: + case MON_DATA_HOENN_VICTORY_RIBBON: + case MON_DATA_HOENN_ARTIST_RIBBON: + case MON_DATA_HOENN_EFFORT_RIBBON: + case MON_DATA_HOENN_MARINE_RIBBON: + case MON_DATA_HOENN_LAND_RIBBON: + case MON_DATA_HOENN_SKY_RIBBON: + case MON_DATA_HOENN_COUNTRY_RIBBON: + case MON_DATA_HOENN_NATIONAL_RIBBON: + case MON_DATA_HOENN_EARTH_RIBBON: + case MON_DATA_HOENN_WORLD_RIBBON: case MON_DATA_FATEFUL_ENCOUNTER: case MON_DATA_GENDER: case MON_DATA_FORME: @@ -1708,26 +1708,26 @@ void AddBoxMonData(struct BoxPokemon * boxmon, int attr, int value) case MON_DATA_NICKNAME_4: case MON_DATA_UNK_120: case MON_DATA_GAME_VERSION: - case MON_DATA_SINNOH_RIBBON_122: - case MON_DATA_SINNOH_RIBBON_123: - case MON_DATA_SINNOH_RIBBON_124: - case MON_DATA_SINNOH_RIBBON_125: - case MON_DATA_SINNOH_RIBBON_126: - case MON_DATA_SINNOH_RIBBON_127: - case MON_DATA_SINNOH_RIBBON_128: - case MON_DATA_SINNOH_RIBBON_129: - case MON_DATA_SINNOH_RIBBON_130: - case MON_DATA_SINNOH_RIBBON_131: - case MON_DATA_SINNOH_RIBBON_132: - case MON_DATA_SINNOH_RIBBON_133: - case MON_DATA_SINNOH_RIBBON_134: - case MON_DATA_SINNOH_RIBBON_135: - case MON_DATA_SINNOH_RIBBON_136: - case MON_DATA_SINNOH_RIBBON_137: - case MON_DATA_SINNOH_RIBBON_138: - case MON_DATA_SINNOH_RIBBON_139: - case MON_DATA_SINNOH_RIBBON_140: - case MON_DATA_SINNOH_RIBBON_141: + case MON_DATA_COOL_RIBBON: + case MON_DATA_COOL_RIBBON_GREAT: + case MON_DATA_COOL_RIBBON_ULTRA: + case MON_DATA_COOL_RIBBON_MASTER: + case MON_DATA_BEAUTY_RIBBON: + case MON_DATA_BEAUTY_RIBBON_GREAT: + case MON_DATA_BEAUTY_RIBBON_ULTRA: + case MON_DATA_BEAUTY_RIBBON_MASTER: + case MON_DATA_CUTE_RIBBON: + case MON_DATA_CUTE_RIBBON_GREAT: + case MON_DATA_CUTE_RIBBON_ULTRA: + case MON_DATA_CUTE_RIBBON_MASTER: + case MON_DATA_SMART_RIBBON: + case MON_DATA_SMART_RIBBON_GREAT: + case MON_DATA_SMART_RIBBON_ULTRA: + case MON_DATA_SMART_RIBBON_MASTER: + case MON_DATA_TOUGH_RIBBON: + case MON_DATA_TOUGH_RIBBON_GREAT: + case MON_DATA_TOUGH_RIBBON_ULTRA: + case MON_DATA_TOUGH_RIBBON_MASTER: case MON_DATA_SINNOH_RIBBON_142: case MON_DATA_OT_NAME: case MON_DATA_OT_NAME_2: @@ -3725,7 +3725,7 @@ void FUN_0206AA84(struct Pokemon * pokemon) SetMonData(pokemon, MON_DATA_SEAL_COORDS, sp1); } -void FUN_0206AAB4(struct BoxPokemon * boxmon) +void RestoreBoxMonPP(struct BoxPokemon * boxmon) { int i; u8 pp; diff --git a/arm9/src/unk_02006234.c b/arm9/src/unk_02006234.c index af93ed3e..a493311d 100644 --- a/arm9/src/unk_02006234.c +++ b/arm9/src/unk_02006234.c @@ -3,15 +3,15 @@ #include "poke_overlay.h" #include "heap.h" -struct UnkStruct_02006234 * FUN_02006234(struct Unk21DBE18 * ovly_mgr, int * a1, u32 heap_id); //todo header? -void FUN_02006260(struct UnkStruct_02006234 * a0); -void * FUN_02006268(struct UnkStruct_02006234 * a0, u32 size, u32 heap_id); -void * FUN_02006278(struct UnkStruct_02006234 * a0); -void FUN_0200627C(struct UnkStruct_02006234 * a0); -int * FUN_0200628C(struct UnkStruct_02006234 * a0); -BOOL FUN_02006290(struct UnkStruct_02006234 * a0); +struct UnkStruct_02006234 * OverlayManager_new(struct Unk21DBE18 * ovly_mgr, int * a1, u32 heap_id); //todo header? +void OverlayManager_delete(struct UnkStruct_02006234 * a0); +void * OverlayManager_CreateAndGetData(struct UnkStruct_02006234 * a0, u32 size, u32 heap_id); +void * OverlayManager_GetData(struct UnkStruct_02006234 * a0); +void OverlayManager_FreeData(struct UnkStruct_02006234 * a0); +int * OverlayManager_GetField18(struct UnkStruct_02006234 * a0); +BOOL OverlayManager_Run(struct UnkStruct_02006234 * a0); -THUMB_FUNC struct UnkStruct_02006234 * FUN_02006234(struct Unk21DBE18 * ovly_mgr, int * a1, u32 heap_id) +THUMB_FUNC struct UnkStruct_02006234 * OverlayManager_new(struct Unk21DBE18 * ovly_mgr, int * a1, u32 heap_id) { struct UnkStruct_02006234 * ret = (struct UnkStruct_02006234 *)AllocFromHeap(heap_id, sizeof(struct UnkStruct_02006234)); ret->ovly_mgr = *ovly_mgr; @@ -24,33 +24,33 @@ THUMB_FUNC struct UnkStruct_02006234 * FUN_02006234(struct Unk21DBE18 * ovly_mgr return ret; } -THUMB_FUNC void FUN_02006260(struct UnkStruct_02006234 * a0) +THUMB_FUNC void OverlayManager_delete(struct UnkStruct_02006234 * a0) { FreeToHeap(a0); } -THUMB_FUNC void * FUN_02006268(struct UnkStruct_02006234 * a0, u32 size, u32 heap_id) +THUMB_FUNC void * OverlayManager_CreateAndGetData(struct UnkStruct_02006234 * a0, u32 size, u32 heap_id) { return a0->unk1C = AllocFromHeap(heap_id, size); } -THUMB_FUNC void * FUN_02006278(struct UnkStruct_02006234 * a0) +THUMB_FUNC void * OverlayManager_GetData(struct UnkStruct_02006234 * a0) { return a0->unk1C; } -THUMB_FUNC void FUN_0200627C(struct UnkStruct_02006234 * a0) +THUMB_FUNC void OverlayManager_FreeData(struct UnkStruct_02006234 * a0) { FreeToHeap(a0->unk1C); a0->unk1C = NULL; } -THUMB_FUNC int * FUN_0200628C(struct UnkStruct_02006234 * a0) +THUMB_FUNC int * OverlayManager_GetField18(struct UnkStruct_02006234 * a0) { return a0->unk18; } -THUMB_FUNC BOOL FUN_02006290(struct UnkStruct_02006234 * a0) +THUMB_FUNC BOOL OverlayManager_Run(struct UnkStruct_02006234 * a0) { switch (a0->unk10) { diff --git a/arm9/src/unk_0207FC5C.c b/arm9/src/unk_0207FC5C.c new file mode 100644 index 00000000..1f001de1 --- /dev/null +++ b/arm9/src/unk_0207FC5C.c @@ -0,0 +1,533 @@ +#include "global.h" +#include "unk_0207FC5C.h" +#include "constants/pokemon.h" + +#pragma thumb on + +struct UnkStruct_020FB788 +{ + u32 monDataId; + u16 gfxId; + u16 palId; + u16 nameIdx; + u16 descIdx; +}; + +const struct UnkStruct_020FB788 UNK_020FB788[] = { + { + MON_DATA_HOENN_CHAMPION_RIBBON, + 72, + 0, + RIBBON_HOENN_CHAMPION, + 80 + }, { + MON_DATA_HOENN_COOL_RIBBON, + 73, + 0, + RIBBON_HOENN_COOL, + 81 + }, { + MON_DATA_HOENN_COOL_RIBBON_SUPER, + 74, + 0, + RIBBON_HOENN_COOL_SUPER, + 82 + }, { + MON_DATA_HOENN_COOL_RIBBON_HYPER, + 75, + 0, + RIBBON_HOENN_COOL_HYPER, + 83 + }, { + MON_DATA_HOENN_COOL_RIBBON_MASTER, + 76, + 0, + RIBBON_HOENN_COOL_MASTER, + 84 + }, { + MON_DATA_HOENN_BEAUTY_RIBBON, + 73, + 1, + RIBBON_HOENN_BEAUTY, + 85 + }, { + MON_DATA_HOENN_BEAUTY_RIBBON_SUPER, + 74, + 1, + RIBBON_HOENN_BEAUTY_SUPER, + 86 + }, { + MON_DATA_HOENN_BEAUTY_RIBBON_HYPER, + 75, + 1, + RIBBON_HOENN_BEAUTY_HYPER, + 87 + }, { + MON_DATA_HOENN_BEAUTY_RIBBON_MASTER, + 76, + 1, + RIBBON_HOENN_BEAUTY_MASTER, + 88 + }, { + MON_DATA_HOENN_CUTE_RIBBON, + 73, + 2, + RIBBON_HOENN_CUTE, + 89 + }, { + MON_DATA_HOENN_CUTE_RIBBON_SUPER, + 74, + 2, + RIBBON_HOENN_CUTE_SUPER, + 90 + }, { + MON_DATA_HOENN_CUTE_RIBBON_HYPER, + 75, + 2, + RIBBON_HOENN_CUTE_HYPER, + 91 + }, { + MON_DATA_HOENN_CUTE_RIBBON_MASTER, + 76, + 2, + RIBBON_HOENN_CUTE_MASTER, + 92 + }, { + MON_DATA_HOENN_SMART_RIBBON, + 73, + 3, + RIBBON_HOENN_SMART, + 93 + }, { + MON_DATA_HOENN_SMART_RIBBON_SUPER, + 74, + 3, + RIBBON_HOENN_SMART_SUPER, + 94 + }, { + MON_DATA_HOENN_SMART_RIBBON_HYPER, + 75, + 3, + RIBBON_HOENN_SMART_HYPER, + 95 + }, { + MON_DATA_HOENN_SMART_RIBBON_MASTER, + 76, + 3, + RIBBON_HOENN_SMART_MASTER, + 96 + }, { + MON_DATA_HOENN_TOUGH_RIBBON, + 73, + 4, + RIBBON_HOENN_TOUGH, + 97 + }, { + MON_DATA_HOENN_TOUGH_RIBBON_SUPER, + 74, + 4, + RIBBON_HOENN_TOUGH_SUPER, + 98 + }, { + MON_DATA_HOENN_TOUGH_RIBBON_HYPER, + 75, + 4, + RIBBON_HOENN_TOUGH_HYPER, + 99 + }, { + MON_DATA_HOENN_TOUGH_RIBBON_MASTER, + 76, + 4, + RIBBON_HOENN_TOUGH_MASTER, + 100 + }, { + MON_DATA_HOENN_WINNING_RIBBON, + 78, + 0, + RIBBON_HOENN_WINNING, + 101 + }, { + MON_DATA_HOENN_VICTORY_RIBBON, + 77, + 0, + RIBBON_HOENN_VICTORY, + 102 + }, { + MON_DATA_HOENN_ARTIST_RIBBON, + 79, + 1, + RIBBON_HOENN_ARTIST, + 103 + }, { + MON_DATA_HOENN_EFFORT_RIBBON, + 80, + 2, + RIBBON_HOENN_EFFORT, + 104 + }, { + MON_DATA_HOENN_MARINE_RIBBON, + 81, + 1, + RIBBON_HOENN_MARINE, + 0 | 0x8000 + }, { + MON_DATA_HOENN_LAND_RIBBON, + 81, + 3, + RIBBON_HOENN_LAND, + 1 | 0x8000 + }, { + MON_DATA_HOENN_SKY_RIBBON, + 81, + 4, + RIBBON_HOENN_SKY, + 2 | 0x8000 + }, { + MON_DATA_HOENN_COUNTRY_RIBBON, + 82, + 3, + RIBBON_HOENN_COUNTRY, + 178 + }, { + MON_DATA_HOENN_NATIONAL_RIBBON, + 82, + 4, + RIBBON_HOENN_NATIONAL, + 190 + }, { + MON_DATA_HOENN_EARTH_RIBBON, + 83, + 0, + RIBBON_HOENN_EARTH, + 191 + }, { + MON_DATA_HOENN_WORLD_RIBBON, + 83, + 1, + RIBBON_HOENN_WORLD, + 178 + }, { + MON_DATA_SINNOH_CHAMP_RIBBON, + 88, + 0, + RIBBON_SINNOH_CHAMP, + 105 + }, { + MON_DATA_COOL_RIBBON, + 89, + 0, + RIBBON_COOL, + 106 + }, { + MON_DATA_COOL_RIBBON_GREAT, + 90, + 0, + RIBBON_COOL_GREAT, + 107 + }, { + MON_DATA_COOL_RIBBON_ULTRA, + 91, + 0, + RIBBON_COOL_ULTRA, + 108 + }, { + MON_DATA_COOL_RIBBON_MASTER, + 92, + 0, + RIBBON_COOL_MASTER, + 109 + }, { + MON_DATA_BEAUTY_RIBBON, + 89, + 1, + RIBBON_BEAUTY, + 110 + }, { + MON_DATA_BEAUTY_RIBBON_GREAT, + 90, + 1, + RIBBON_BEAUTY_GREAT, + 111 + }, { + MON_DATA_BEAUTY_RIBBON_ULTRA, + 91, + 1, + RIBBON_BEAUTY_ULTRA, + 112 + }, { + MON_DATA_BEAUTY_RIBBON_MASTER, + 92, + 1, + RIBBON_BEAUTY_MASTER, + 113 + }, { + MON_DATA_CUTE_RIBBON, + 89, + 2, + RIBBON_CUTE, + 114 + }, { + MON_DATA_CUTE_RIBBON_GREAT, + 90, + 2, + RIBBON_CUTE_GREAT, + 115 + }, { + MON_DATA_CUTE_RIBBON_ULTRA, + 91, + 2, + RIBBON_CUTE_ULTRA, + 116 + }, { + MON_DATA_CUTE_RIBBON_MASTER, + 92, + 2, + RIBBON_CUTE_MASTER, + 117 + }, { + MON_DATA_SMART_RIBBON, + 89, + 3, + RIBBON_SMART, + 118 + }, { + MON_DATA_SMART_RIBBON_GREAT, + 90, + 3, + RIBBON_SMART_GREAT, + 119 + }, { + MON_DATA_SMART_RIBBON_ULTRA, + 91, + 3, + RIBBON_SMART_ULTRA, + 120 + }, { + MON_DATA_SMART_RIBBON_MASTER, + 92, + 3, + RIBBON_SMART_MASTER, + 121 + }, { + MON_DATA_TOUGH_RIBBON, + 89, + 4, + RIBBON_TOUGH, + 122 + }, { + MON_DATA_TOUGH_RIBBON_GREAT, + 90, + 4, + RIBBON_TOUGH_GREAT, + 123 + }, { + MON_DATA_TOUGH_RIBBON_ULTRA, + 91, + 4, + RIBBON_TOUGH_ULTRA, + 124 + }, { + MON_DATA_TOUGH_RIBBON_MASTER, + 92, + 4, + RIBBON_TOUGH_MASTER, + 125 + }, { + MON_DATA_ABILITY_RIBBON, + 93, + 0, + RIBBON_ABILITY, + 126 + }, { + MON_DATA_GREAT_ABILITY_RIBBON, + 94, + 0, + RIBBON_GREAT_ABILITY, + 127 + }, { + MON_DATA_DOUBLE_ABILITY_RIBBON, + 95, + 0, + RIBBON_DOUBLE_ABILITY, + 128 + }, { + MON_DATA_MULTI_ABILITY_RIBBON, + 96, + 0, + RIBBON_MULTI_ABILITY, + 129 + }, { + MON_DATA_PAIR_ABILITY_RIBBON, + 97, + 0, + RIBBON_PAIR_ABILITY, + 130 + }, { + MON_DATA_WORLD_ABILITY_RIBBON, + 98, + 0, + RIBBON_WORLD_ABILITY, + 131 + }, { + MON_DATA_ALERT_RIBBON, + 99, + 2, + RIBBON_ALERT, + 132 + }, { + MON_DATA_SHOCK_RIBBON, + 100, + 0, + RIBBON_SHOCK, + 133 + }, { + MON_DATA_DOWNCAST_RIBBON, + 101, + 1, + RIBBON_DOWNCAST, + 134 + }, { + MON_DATA_CARELESS_RIBBON, + 102, + 2, + RIBBON_CARELESS, + 135 + }, { + MON_DATA_RELAX_RIBBON, + 103, + 3, + RIBBON_RELAX, + 136 + }, { + MON_DATA_SNOOZE_RIBBON, + 104, + 0, + RIBBON_SNOOZE, + 137 + }, { + MON_DATA_SMILE_RIBBON, + 105, + 2, + RIBBON_SMILE, + 138 + }, { + MON_DATA_GORGEOUS_RIBBON, + 106, + 1, + RIBBON_GORGEOUS, + 139 + }, { + MON_DATA_ROYAL_RIBBON, + 107, + 3, + RIBBON_ROYAL, + 140 + }, { + MON_DATA_GORGEOUS_ROYAL_RIBBON, + 108, + 0, + RIBBON_GORGEOUS_ROYAL, + 141 + }, { + MON_DATA_FOOTPRINT_RIBBON, + 109, + 0, + RIBBON_FOOTPRINT, + 142 + }, { + MON_DATA_RECORD_RIBBON, + 110, + 1, + RIBBON_RECORD, + 143 + }, { + MON_DATA_HISTORY_RIBBON, + 111, + 3, + RIBBON_HISTORY, + 144 + }, { + MON_DATA_LEGEND_RIBBON, + 112, + 0, + RIBBON_LEGEND, + 145 + }, { + MON_DATA_RED_RIBBON, + 113, + 0, + RIBBON_RED, + 7 | 0x8000 + }, { + MON_DATA_GREEN_RIBBON, + 114, + 3, + RIBBON_GREEN, + 8 | 0x8000 + }, { + MON_DATA_BLUE_RIBBON, + 115, + 1, + RIBBON_BLUE, + 9 | 0x8000 + }, { + MON_DATA_FESTIVAL_RIBBON, + 116, + 1, + RIBBON_FESTIVAL, + 10 | 0x8000 + }, { + MON_DATA_CARNIVAL_RIBBON, + 117, + 0, + RIBBON_CARNIVAL, + 11 | 0x8000 + }, { + MON_DATA_CLASSIC_RIBBON, + 118, + 1, + RIBBON_CLASSIC, + 12 | 0x8000 + }, { + MON_DATA_PREMIER_RIBBON, + 119, + 0, + RIBBON_PREMIER, + 13 | 0x8000 + } +}; + +u32 FUN_0207FC5C(u8 a0, u32 a1) +{ + switch (a1) + { + case 0: + return UNK_020FB788[a0].monDataId; + case 1: + return UNK_020FB788[a0].gfxId; + case 2: + return UNK_020FB788[a0].palId; + case 3: + return UNK_020FB788[a0].nameIdx; + case 4: + return UNK_020FB788[a0].descIdx; + default: + return 0; + } +} + +int FUN_0207FCC0(u8 * a0, u32 a1) +{ + int ret = (int)UNK_020FB788[a1].descIdx; + if (ret & 0x8000) + ret = a0[(u8)ret] + 0x92; + return ret; +} + +u8 FUN_0207FCE0(u32 a0) +{ + int ret = (int)UNK_020FB788[a0].descIdx; + if (ret & 0x8000) + return (u8)ret; + return 0xFF; +} diff --git a/arm9/src/waza.c b/arm9/src/waza.c index f394fedd..5d676afa 100644 --- a/arm9/src/waza.c +++ b/arm9/src/waza.c @@ -37,8 +37,8 @@ u32 GetAttrFromWazaTbl(struct WazaTbl * wazaTbl, MoveAttr attr) { case MOVEATTR_EFFECT: return wazaTbl->effect; - case MOVEATTR_UNK1: - return wazaTbl->unk2; + case MOVEATTR_CLASS: + return wazaTbl->class; case MOVEATTR_POWER: return wazaTbl->power; case MOVEATTR_TYPE: diff --git a/files/poketool/waza/waza_tbl.json b/files/poketool/waza/waza_tbl.json new file mode 100644 index 00000000..98f3000b --- /dev/null +++ b/files/poketool/waza/waza_tbl.json @@ -0,0 +1,7069 @@ +{ + "waza_tbl": [ + { + "name": "MOVE_NONE", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 0, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 0, + "unkC": 0, + "contestType": "COOL" + }, + { + "name": "MOVE_POUND", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 40, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 35, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 5, + "contestType": "TOUGH" + }, + { + "name": "MOVE_KARATE_CHOP", + "effect": "MOVE_EFFECT_HIGH_CRIT", + "class": "CLASS_PHYSICAL", + "power": 50, + "type": "TYPE_FIGHTING", + "accuracy": 100, + "pp": 25, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 5, + "contestType": "TOUGH" + }, + { + "name": "MOVE_DOUBLE_SLAP", + "effect": "MOVE_EFFECT_MULTIHIT_2_5", + "class": "CLASS_PHYSICAL", + "power": 15, + "type": "TYPE_NORMAL", + "accuracy": 85, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 7, + "contestType": "TOUGH" + }, + { + "name": "MOVE_COMET_PUNCH", + "effect": "MOVE_EFFECT_MULTIHIT_2_5", + "class": "CLASS_PHYSICAL", + "power": 18, + "type": "TYPE_NORMAL", + "accuracy": 85, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 7, + "contestType": "TOUGH" + }, + { + "name": "MOVE_MEGA_PUNCH", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 80, + "type": "TYPE_NORMAL", + "accuracy": 85, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 18, + "contestType": "TOUGH" + }, + { + "name": "MOVE_PAY_DAY", + "effect": "MOVE_EFFECT_PAYDAY", + "class": "CLASS_PHYSICAL", + "power": 40, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 23, + "contestType": "SMART" + }, + { + "name": "MOVE_FIRE_PUNCH", + "effect": "MOVE_EFFECT_BURN_HIT", + "class": "CLASS_PHYSICAL", + "power": 75, + "type": "TYPE_FIRE", + "accuracy": 100, + "pp": 15, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 17, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_ICE_PUNCH", + "effect": "MOVE_EFFECT_FREEZE_HIT", + "class": "CLASS_PHYSICAL", + "power": 75, + "type": "TYPE_ICE", + "accuracy": 100, + "pp": 15, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 17, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_THUNDER_PUNCH", + "effect": "MOVE_EFFECT_PARALYZE_HIT", + "class": "CLASS_PHYSICAL", + "power": 75, + "type": "TYPE_ELECTRIC", + "accuracy": 100, + "pp": 15, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 17, + "contestType": "COOL" + }, + { + "name": "MOVE_SCRATCH", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 40, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 35, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 5, + "contestType": "TOUGH" + }, + { + "name": "MOVE_VISE_GRIP", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 55, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 30, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 5, + "contestType": "TOUGH" + }, + { + "name": "MOVE_GUILLOTINE", + "effect": "MOVE_EFFECT_OHKO", + "class": "CLASS_PHYSICAL", + "power": 1, + "type": "TYPE_NORMAL", + "accuracy": 30, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 9, + "contestType": "COOL" + }, + { + "name": "MOVE_RAZOR_WIND", + "effect": "MOVE_EFFECT_RAZOR_WIND", + "class": "CLASS_SPECIAL", + "power": 80, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 4, + "priority": 0, + "unkB": 50, + "unkC": 6, + "contestType": "COOL" + }, + { + "name": "MOVE_SWORDS_DANCE", + "effect": "MOVE_EFFECT_ATTACK_2UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 30, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 11, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_CUT", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 50, + "type": "TYPE_NORMAL", + "accuracy": 95, + "pp": 30, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_GUST", + "effect": "MOVE_EFFECT_GUST", + "class": "CLASS_SPECIAL", + "power": 40, + "type": "TYPE_FLYING", + "accuracy": 100, + "pp": 35, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 5, + "contestType": "SMART" + }, + { + "name": "MOVE_WING_ATTACK", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 60, + "type": "TYPE_FLYING", + "accuracy": 100, + "pp": 35, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_WHIRLWIND", + "effect": "MOVE_EFFECT_SWITCH_FOE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": -6, + "unkB": 82, + "unkC": 9, + "contestType": "SMART" + }, + { + "name": "MOVE_FLY", + "effect": "MOVE_EFFECT_FLY", + "class": "CLASS_PHYSICAL", + "power": 90, + "type": "TYPE_FLYING", + "accuracy": 95, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 179, + "unkC": 6, + "contestType": "SMART" + }, + { + "name": "MOVE_BIND", + "effect": "MOVE_EFFECT_TRAP_HIT", + "class": "CLASS_PHYSICAL", + "power": 15, + "type": "TYPE_NORMAL", + "accuracy": 75, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 21, + "contestType": "TOUGH" + }, + { + "name": "MOVE_SLAM", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 80, + "type": "TYPE_NORMAL", + "accuracy": 75, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 5, + "contestType": "TOUGH" + }, + { + "name": "MOVE_VINE_WHIP", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 35, + "type": "TYPE_GRASS", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_STOMP", + "effect": "MOVE_EFFECT_STOMP", + "class": "CLASS_PHYSICAL", + "power": 65, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 20, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 83, + "unkC": 5, + "contestType": "TOUGH" + }, + { + "name": "MOVE_DOUBLE_KICK", + "effect": "MOVE_EFFECT_DOUBLE_HIT", + "class": "CLASS_PHYSICAL", + "power": 30, + "type": "TYPE_FIGHTING", + "accuracy": 100, + "pp": 30, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 7, + "contestType": "COOL" + }, + { + "name": "MOVE_MEGA_KICK", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 120, + "type": "TYPE_NORMAL", + "accuracy": 75, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 179, + "unkC": 18, + "contestType": "COOL" + }, + { + "name": "MOVE_JUMP_KICK", + "effect": "MOVE_EFFECT_JUMP_KICK", + "class": "CLASS_PHYSICAL", + "power": 85, + "type": "TYPE_FIGHTING", + "accuracy": 95, + "pp": 25, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_ROLLING_KICK", + "effect": "MOVE_EFFECT_FLINCH_HIT", + "class": "CLASS_PHYSICAL", + "power": 60, + "type": "TYPE_FIGHTING", + "accuracy": 85, + "pp": 15, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_SAND_ATTACK", + "effect": "MOVE_EFFECT_ACCURACY_DOWN", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_GROUND", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 19, + "contestType": "CUTE" + }, + { + "name": "MOVE_HEADBUTT", + "effect": "MOVE_EFFECT_FLINCH_HIT", + "class": "CLASS_PHYSICAL", + "power": 70, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 15, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 83, + "unkC": 5, + "contestType": "TOUGH" + }, + { + "name": "MOVE_HORN_ATTACK", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 65, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 25, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_FURY_ATTACK", + "effect": "MOVE_EFFECT_MULTIHIT_2_5", + "class": "CLASS_PHYSICAL", + "power": 15, + "type": "TYPE_NORMAL", + "accuracy": 85, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 7, + "contestType": "COOL" + }, + { + "name": "MOVE_HORN_DRILL", + "effect": "MOVE_EFFECT_OHKO", + "class": "CLASS_PHYSICAL", + "power": 1, + "type": "TYPE_NORMAL", + "accuracy": 30, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 9, + "contestType": "COOL" + }, + { + "name": "MOVE_TACKLE", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 35, + "type": "TYPE_NORMAL", + "accuracy": 95, + "pp": 35, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 5, + "contestType": "TOUGH" + }, + { + "name": "MOVE_BODY_SLAM", + "effect": "MOVE_EFFECT_PARALYZE_HIT", + "class": "CLASS_PHYSICAL", + "power": 85, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 15, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 83, + "unkC": 5, + "contestType": "TOUGH" + }, + { + "name": "MOVE_WRAP", + "effect": "MOVE_EFFECT_TRAP_HIT", + "class": "CLASS_PHYSICAL", + "power": 15, + "type": "TYPE_NORMAL", + "accuracy": 85, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 21, + "contestType": "TOUGH" + }, + { + "name": "MOVE_TAKE_DOWN", + "effect": "MOVE_EFFECT_RECOIL_HIT", + "class": "CLASS_PHYSICAL", + "power": 90, + "type": "TYPE_NORMAL", + "accuracy": 85, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 5, + "contestType": "TOUGH" + }, + { + "name": "MOVE_THRASH", + "effect": "MOVE_EFFECT_RAMPAGE", + "class": "CLASS_PHYSICAL", + "power": 90, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 2, + "priority": 0, + "unkB": 51, + "unkC": 7, + "contestType": "TOUGH" + }, + { + "name": "MOVE_DOUBLE_EDGE", + "effect": "MOVE_EFFECT_RECOIL_HIT_HARD", + "class": "CLASS_PHYSICAL", + "power": 120, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 179, + "unkC": 9, + "contestType": "TOUGH" + }, + { + "name": "MOVE_TAIL_WHIP", + "effect": "MOVE_EFFECT_DEFENSE_DOWN", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 30, + "effectChance": 0, + "unk8": 4, + "priority": 0, + "unkB": 86, + "unkC": 19, + "contestType": "CUTE" + }, + { + "name": "MOVE_POISON_STING", + "effect": "MOVE_EFFECT_POISON_HIT", + "class": "CLASS_PHYSICAL", + "power": 15, + "type": "TYPE_POISON", + "accuracy": 100, + "pp": 35, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 19, + "contestType": "SMART" + }, + { + "name": "MOVE_TWINEEDLE", + "effect": "MOVE_EFFECT_POISON_DOUBLE_HIT", + "class": "CLASS_PHYSICAL", + "power": 25, + "type": "TYPE_BUG", + "accuracy": 100, + "pp": 20, + "effectChance": 20, + "unk8": 0, + "priority": 0, + "unkB": 82, + "unkC": 7, + "contestType": "COOL" + }, + { + "name": "MOVE_PIN_MISSILE", + "effect": "MOVE_EFFECT_MULTIHIT_2_5", + "class": "CLASS_PHYSICAL", + "power": 14, + "type": "TYPE_BUG", + "accuracy": 85, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 114, + "unkC": 7, + "contestType": "COOL" + }, + { + "name": "MOVE_LEER", + "effect": "MOVE_EFFECT_DEFENSE_DOWN", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 30, + "effectChance": 0, + "unk8": 4, + "priority": 0, + "unkB": 22, + "unkC": 19, + "contestType": "COOL" + }, + { + "name": "MOVE_BITE", + "effect": "MOVE_EFFECT_FLINCH_HIT", + "class": "CLASS_PHYSICAL", + "power": 60, + "type": "TYPE_DARK", + "accuracy": 100, + "pp": 25, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 5, + "contestType": "TOUGH" + }, + { + "name": "MOVE_GROWL", + "effect": "MOVE_EFFECT_ATTACK_DOWN", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 40, + "effectChance": 0, + "unk8": 4, + "priority": 0, + "unkB": 86, + "unkC": 19, + "contestType": "CUTE" + }, + { + "name": "MOVE_ROAR", + "effect": "MOVE_EFFECT_SWITCH_FOE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": -6, + "unkB": 82, + "unkC": 19, + "contestType": "COOL" + }, + { + "name": "MOVE_SING", + "effect": "MOVE_EFFECT_SLEEP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 55, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 19, + "contestType": "CUTE" + }, + { + "name": "MOVE_SUPERSONIC", + "effect": "MOVE_EFFECT_CONFUSE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 55, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 19, + "contestType": "SMART" + }, + { + "name": "MOVE_SONIC_BOOM", + "effect": "MOVE_EFFECT_FIXED_20", + "class": "CLASS_SPECIAL", + "power": 1, + "type": "TYPE_NORMAL", + "accuracy": 90, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 114, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_DISABLE", + "effect": "MOVE_EFFECT_DISABLE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 80, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 19, + "contestType": "SMART" + }, + { + "name": "MOVE_ACID", + "effect": "MOVE_EFFECT_SPDEF_DOWN_HIT", + "class": "CLASS_SPECIAL", + "power": 40, + "type": "TYPE_POISON", + "accuracy": 100, + "pp": 30, + "effectChance": 10, + "unk8": 4, + "priority": 0, + "unkB": 18, + "unkC": 5, + "contestType": "SMART" + }, + { + "name": "MOVE_EMBER", + "effect": "MOVE_EFFECT_BURN_HIT", + "class": "CLASS_SPECIAL", + "power": 40, + "type": "TYPE_FIRE", + "accuracy": 100, + "pp": 25, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 82, + "unkC": 5, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_FLAMETHROWER", + "effect": "MOVE_EFFECT_BURN_HIT", + "class": "CLASS_SPECIAL", + "power": 95, + "type": "TYPE_FIRE", + "accuracy": 100, + "pp": 15, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 17, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_MIST", + "effect": "MOVE_EFFECT_MIST", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_ICE", + "accuracy": 0, + "pp": 30, + "effectChance": 0, + "unk8": 32, + "priority": 0, + "unkB": 8, + "unkC": 13, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_WATER_GUN", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_SPECIAL", + "power": 40, + "type": "TYPE_WATER", + "accuracy": 100, + "pp": 25, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 5, + "contestType": "CUTE" + }, + { + "name": "MOVE_HYDRO_PUMP", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_SPECIAL", + "power": 120, + "type": "TYPE_WATER", + "accuracy": 80, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 178, + "unkC": 17, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_SURF", + "effect": "MOVE_EFFECT_SURF", + "class": "CLASS_SPECIAL", + "power": 95, + "type": "TYPE_WATER", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 8, + "priority": 0, + "unkB": 50, + "unkC": 17, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_ICE_BEAM", + "effect": "MOVE_EFFECT_FREEZE_HIT", + "class": "CLASS_SPECIAL", + "power": 95, + "type": "TYPE_ICE", + "accuracy": 100, + "pp": 10, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 17, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_BLIZZARD", + "effect": "MOVE_EFFECT_BLIZZARD", + "class": "CLASS_SPECIAL", + "power": 120, + "type": "TYPE_ICE", + "accuracy": 70, + "pp": 5, + "effectChance": 10, + "unk8": 4, + "priority": 0, + "unkB": 146, + "unkC": 17, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_PSYBEAM", + "effect": "MOVE_EFFECT_CONFUSE_HIT", + "class": "CLASS_SPECIAL", + "power": 65, + "type": "TYPE_PSYCHIC", + "accuracy": 100, + "pp": 20, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 17, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_BUBBLE_BEAM", + "effect": "MOVE_EFFECT_SPEED_DOWN_HIT", + "class": "CLASS_SPECIAL", + "power": 65, + "type": "TYPE_WATER", + "accuracy": 100, + "pp": 20, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 2, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_AURORA_BEAM", + "effect": "MOVE_EFFECT_ATTACK_DOWN_HIT", + "class": "CLASS_SPECIAL", + "power": 65, + "type": "TYPE_ICE", + "accuracy": 100, + "pp": 20, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 17, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_HYPER_BEAM", + "effect": "MOVE_EFFECT_HIT_RECHARGE", + "class": "CLASS_SPECIAL", + "power": 150, + "type": "TYPE_NORMAL", + "accuracy": 90, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 178, + "unkC": 22, + "contestType": "COOL" + }, + { + "name": "MOVE_PECK", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 35, + "type": "TYPE_FLYING", + "accuracy": 100, + "pp": 35, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_DRILL_PECK", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 80, + "type": "TYPE_FLYING", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_SUBMISSION", + "effect": "MOVE_EFFECT_RECOIL_HIT", + "class": "CLASS_PHYSICAL", + "power": 80, + "type": "TYPE_FIGHTING", + "accuracy": 80, + "pp": 25, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_LOW_KICK", + "effect": "MOVE_EFFECT_STRONGER_HEAVIER", + "class": "CLASS_PHYSICAL", + "power": 1, + "type": "TYPE_FIGHTING", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 5, + "contestType": "TOUGH" + }, + { + "name": "MOVE_COUNTER", + "effect": "MOVE_EFFECT_COUNTER", + "class": "CLASS_PHYSICAL", + "power": 1, + "type": "TYPE_FIGHTING", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 1, + "priority": -5, + "unkB": 1, + "unkC": 15, + "contestType": "TOUGH" + }, + { + "name": "MOVE_SEISMIC_TOSS", + "effect": "MOVE_EFFECT_LEVEL_DAMAGE", + "class": "CLASS_PHYSICAL", + "power": 1, + "type": "TYPE_FIGHTING", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 179, + "unkC": 5, + "contestType": "TOUGH" + }, + { + "name": "MOVE_STRENGTH", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 80, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 5, + "contestType": "TOUGH" + }, + { + "name": "MOVE_ABSORB", + "effect": "MOVE_EFFECT_DRAIN_HP", + "class": "CLASS_SPECIAL", + "power": 20, + "type": "TYPE_GRASS", + "accuracy": 100, + "pp": 25, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 20, + "contestType": "SMART" + }, + { + "name": "MOVE_MEGA_DRAIN", + "effect": "MOVE_EFFECT_DRAIN_HP", + "class": "CLASS_SPECIAL", + "power": 40, + "type": "TYPE_GRASS", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 20, + "contestType": "SMART" + }, + { + "name": "MOVE_LEECH_SEED", + "effect": "MOVE_EFFECT_LEECH_SEED", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_GRASS", + "accuracy": 90, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 21, + "contestType": "SMART" + }, + { + "name": "MOVE_GROWTH", + "effect": "MOVE_EFFECT_SPATK_UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 40, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 11, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_RAZOR_LEAF", + "effect": "MOVE_EFFECT_HIGH_CRIT", + "class": "CLASS_PHYSICAL", + "power": 55, + "type": "TYPE_GRASS", + "accuracy": 95, + "pp": 25, + "effectChance": 0, + "unk8": 4, + "priority": 0, + "unkB": 50, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_SOLAR_BEAM", + "effect": "MOVE_EFFECT_SOLAR_BEAM", + "class": "CLASS_SPECIAL", + "power": 120, + "type": "TYPE_GRASS", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 6, + "contestType": "COOL" + }, + { + "name": "MOVE_POISON_POWDER", + "effect": "MOVE_EFFECT_POISON", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_POISON", + "accuracy": 75, + "pp": 35, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 86, + "unkC": 19, + "contestType": "SMART" + }, + { + "name": "MOVE_STUN_SPORE", + "effect": "MOVE_EFFECT_PARALYZE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_GRASS", + "accuracy": 75, + "pp": 30, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 86, + "unkC": 19, + "contestType": "SMART" + }, + { + "name": "MOVE_SLEEP_POWDER", + "effect": "MOVE_EFFECT_SLEEP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_GRASS", + "accuracy": 75, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 86, + "unkC": 19, + "contestType": "SMART" + }, + { + "name": "MOVE_PETAL_DANCE", + "effect": "MOVE_EFFECT_RAMPAGE", + "class": "CLASS_SPECIAL", + "power": 90, + "type": "TYPE_GRASS", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 2, + "priority": 0, + "unkB": 51, + "unkC": 21, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_STRING_SHOT", + "effect": "MOVE_EFFECT_SPEED_DOWN", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_BUG", + "accuracy": 95, + "pp": 40, + "effectChance": 0, + "unk8": 4, + "priority": 0, + "unkB": 22, + "unkC": 19, + "contestType": "SMART" + }, + { + "name": "MOVE_DRAGON_RAGE", + "effect": "MOVE_EFFECT_FIXED_40", + "class": "CLASS_SPECIAL", + "power": 1, + "type": "TYPE_DRAGON", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_FIRE_SPIN", + "effect": "MOVE_EFFECT_TRAP_HIT", + "class": "CLASS_SPECIAL", + "power": 15, + "type": "TYPE_FIRE", + "accuracy": 70, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 21, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_THUNDER_SHOCK", + "effect": "MOVE_EFFECT_PARALYZE_HIT", + "class": "CLASS_SPECIAL", + "power": 40, + "type": "TYPE_ELECTRIC", + "accuracy": 100, + "pp": 30, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_THUNDERBOLT", + "effect": "MOVE_EFFECT_PARALYZE_HIT", + "class": "CLASS_SPECIAL", + "power": 95, + "type": "TYPE_ELECTRIC", + "accuracy": 100, + "pp": 15, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 17, + "contestType": "COOL" + }, + { + "name": "MOVE_THUNDER_WAVE", + "effect": "MOVE_EFFECT_PARALYZE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_ELECTRIC", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 19, + "contestType": "COOL" + }, + { + "name": "MOVE_THUNDER", + "effect": "MOVE_EFFECT_THUNDER", + "class": "CLASS_SPECIAL", + "power": 120, + "type": "TYPE_ELECTRIC", + "accuracy": 70, + "pp": 10, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 146, + "unkC": 17, + "contestType": "COOL" + }, + { + "name": "MOVE_ROCK_THROW", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 50, + "type": "TYPE_ROCK", + "accuracy": 90, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 5, + "contestType": "TOUGH" + }, + { + "name": "MOVE_EARTHQUAKE", + "effect": "MOVE_EFFECT_EARTHQUAKE", + "class": "CLASS_PHYSICAL", + "power": 100, + "type": "TYPE_GROUND", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 8, + "priority": 0, + "unkB": 50, + "unkC": 18, + "contestType": "TOUGH" + }, + { + "name": "MOVE_FISSURE", + "effect": "MOVE_EFFECT_OHKO", + "class": "CLASS_PHYSICAL", + "power": 1, + "type": "TYPE_GROUND", + "accuracy": 30, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 146, + "unkC": 9, + "contestType": "TOUGH" + }, + { + "name": "MOVE_DIG", + "effect": "MOVE_EFFECT_DIG", + "class": "CLASS_PHYSICAL", + "power": 80, + "type": "TYPE_GROUND", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 6, + "contestType": "SMART" + }, + { + "name": "MOVE_TOXIC", + "effect": "MOVE_EFFECT_TOXIC", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_POISON", + "accuracy": 85, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 19, + "contestType": "SMART" + }, + { + "name": "MOVE_CONFUSION", + "effect": "MOVE_EFFECT_CONFUSE_HIT", + "class": "CLASS_SPECIAL", + "power": 50, + "type": "TYPE_PSYCHIC", + "accuracy": 100, + "pp": 25, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 5, + "contestType": "SMART" + }, + { + "name": "MOVE_PSYCHIC", + "effect": "MOVE_EFFECT_SPDEF_DOWN_HIT", + "class": "CLASS_SPECIAL", + "power": 90, + "type": "TYPE_PSYCHIC", + "accuracy": 100, + "pp": 10, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 17, + "contestType": "SMART" + }, + { + "name": "MOVE_HYPNOSIS", + "effect": "MOVE_EFFECT_SLEEP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 70, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 19, + "contestType": "SMART" + }, + { + "name": "MOVE_MEDITATE", + "effect": "MOVE_EFFECT_ATTACK_UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 40, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 8, + "unkC": 11, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_AGILITY", + "effect": "MOVE_EFFECT_SPEED_2UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 30, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 136, + "unkC": 1, + "contestType": "COOL" + }, + { + "name": "MOVE_QUICK_ATTACK", + "effect": "MOVE_EFFECT_PRIORITY_HIT", + "class": "CLASS_PHYSICAL", + "power": 40, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 30, + "effectChance": 0, + "unk8": 0, + "priority": 1, + "unkB": 115, + "unkC": 1, + "contestType": "COOL" + }, + { + "name": "MOVE_RAGE", + "effect": "MOVE_EFFECT_RAGE", + "class": "CLASS_PHYSICAL", + "power": 20, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 11, + "contestType": "COOL" + }, + { + "name": "MOVE_TELEPORT", + "effect": "MOVE_EFFECT_TELEPORT", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 0, + "unkC": 1, + "contestType": "COOL" + }, + { + "name": "MOVE_NIGHT_SHADE", + "effect": "MOVE_EFFECT_LEVEL_DAMAGE", + "class": "CLASS_SPECIAL", + "power": 1, + "type": "TYPE_GHOST", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 5, + "contestType": "SMART" + }, + { + "name": "MOVE_MIMIC", + "effect": "MOVE_EFFECT_MIMIC", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 2, + "unkC": 12, + "contestType": "CUTE" + }, + { + "name": "MOVE_SCREECH", + "effect": "MOVE_EFFECT_DEFENSE_2DOWN", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 85, + "pp": 40, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 86, + "unkC": 10, + "contestType": "SMART" + }, + { + "name": "MOVE_DOUBLE_TEAM", + "effect": "MOVE_EFFECT_EVASION_UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 15, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 1, + "contestType": "COOL" + }, + { + "name": "MOVE_RECOVER", + "effect": "MOVE_EFFECT_RESTORE_HP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 8, + "contestType": "SMART" + }, + { + "name": "MOVE_HARDEN", + "effect": "MOVE_EFFECT_DEFENSE_UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 30, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 13, + "contestType": "TOUGH" + }, + { + "name": "MOVE_MINIMIZE", + "effect": "MOVE_EFFECT_MINIMIZE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 8, + "unkC": 13, + "contestType": "CUTE" + }, + { + "name": "MOVE_SMOKESCREEN", + "effect": "MOVE_EFFECT_ACCURACY_DOWN", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 10, + "contestType": "SMART" + }, + { + "name": "MOVE_CONFUSE_RAY", + "effect": "MOVE_EFFECT_CONFUSE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_GHOST", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 10, + "contestType": "SMART" + }, + { + "name": "MOVE_WITHDRAW", + "effect": "MOVE_EFFECT_DEFENSE_UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_WATER", + "accuracy": 0, + "pp": 40, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 13, + "contestType": "CUTE" + }, + { + "name": "MOVE_DEFENSE_CURL", + "effect": "MOVE_EFFECT_DEFENSE_CURL", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 40, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 13, + "contestType": "CUTE" + }, + { + "name": "MOVE_BARRIER", + "effect": "MOVE_EFFECT_DEFENSE_2UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 30, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 13, + "contestType": "COOL" + }, + { + "name": "MOVE_LIGHT_SCREEN", + "effect": "MOVE_EFFECT_LIGHT_SCREEN", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 30, + "effectChance": 0, + "unk8": 32, + "priority": 0, + "unkB": 72, + "unkC": 13, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_HAZE", + "effect": "MOVE_EFFECT_STATS_RESET", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_ICE", + "accuracy": 0, + "pp": 30, + "effectChance": 0, + "unk8": 64, + "priority": 0, + "unkB": 0, + "unkC": 13, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_REFLECT", + "effect": "MOVE_EFFECT_REFLECT", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 32, + "priority": 0, + "unkB": 72, + "unkC": 13, + "contestType": "SMART" + }, + { + "name": "MOVE_FOCUS_ENERGY", + "effect": "MOVE_EFFECT_CRIT_CHANCE_UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 30, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 11, + "contestType": "COOL" + }, + { + "name": "MOVE_BIDE", + "effect": "MOVE_EFFECT_BIDE", + "class": "CLASS_PHYSICAL", + "power": 1, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 16, + "priority": 1, + "unkB": 99, + "unkC": 15, + "contestType": "TOUGH" + }, + { + "name": "MOVE_METRONOME", + "effect": "MOVE_EFFECT_METRONOME", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 1, + "priority": 0, + "unkB": 64, + "unkC": 14, + "contestType": "CUTE" + }, + { + "name": "MOVE_MIRROR_MOVE", + "effect": "MOVE_EFFECT_MIRROR_MOVE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_FLYING", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 1, + "priority": 0, + "unkB": 0, + "unkC": 15, + "contestType": "SMART" + }, + { + "name": "MOVE_SELF_DESTRUCT", + "effect": "MOVE_EFFECT_EXPLOSION", + "class": "CLASS_PHYSICAL", + "power": 200, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 5, + "effectChance": 0, + "unk8": 8, + "priority": 0, + "unkB": 50, + "unkC": 9, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_EGG_BOMB", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 100, + "type": "TYPE_NORMAL", + "accuracy": 75, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 5, + "contestType": "TOUGH" + }, + { + "name": "MOVE_LICK", + "effect": "MOVE_EFFECT_PARALYZE_HIT", + "class": "CLASS_PHYSICAL", + "power": 20, + "type": "TYPE_GHOST", + "accuracy": 100, + "pp": 30, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 83, + "unkC": 16, + "contestType": "TOUGH" + }, + { + "name": "MOVE_SMOG", + "effect": "MOVE_EFFECT_POISON_HIT", + "class": "CLASS_SPECIAL", + "power": 20, + "type": "TYPE_POISON", + "accuracy": 70, + "pp": 20, + "effectChance": 40, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 5, + "contestType": "TOUGH" + }, + { + "name": "MOVE_SLUDGE", + "effect": "MOVE_EFFECT_POISON_HIT", + "class": "CLASS_SPECIAL", + "power": 65, + "type": "TYPE_POISON", + "accuracy": 100, + "pp": 20, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 18, + "contestType": "TOUGH" + }, + { + "name": "MOVE_BONE_CLUB", + "effect": "MOVE_EFFECT_FLINCH_HIT", + "class": "CLASS_PHYSICAL", + "power": 65, + "type": "TYPE_GROUND", + "accuracy": 85, + "pp": 20, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 82, + "unkC": 5, + "contestType": "TOUGH" + }, + { + "name": "MOVE_FIRE_BLAST", + "effect": "MOVE_EFFECT_BURN_HIT", + "class": "CLASS_SPECIAL", + "power": 120, + "type": "TYPE_FIRE", + "accuracy": 85, + "pp": 5, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 146, + "unkC": 17, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_WATERFALL", + "effect": "MOVE_EFFECT_FLINCH_HIT", + "class": "CLASS_PHYSICAL", + "power": 80, + "type": "TYPE_WATER", + "accuracy": 100, + "pp": 15, + "effectChance": 20, + "unk8": 0, + "priority": 0, + "unkB": 179, + "unkC": 5, + "contestType": "TOUGH" + }, + { + "name": "MOVE_CLAMP", + "effect": "MOVE_EFFECT_TRAP_HIT", + "class": "CLASS_PHYSICAL", + "power": 35, + "type": "TYPE_WATER", + "accuracy": 75, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 5, + "contestType": "TOUGH" + }, + { + "name": "MOVE_SWIFT", + "effect": "MOVE_EFFECT_ALWAYS_HIT", + "class": "CLASS_SPECIAL", + "power": 60, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 4, + "priority": 0, + "unkB": 50, + "unkC": 17, + "contestType": "COOL" + }, + { + "name": "MOVE_SKULL_BASH", + "effect": "MOVE_EFFECT_SKULL_BASH", + "class": "CLASS_PHYSICAL", + "power": 100, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 15, + "effectChance": 100, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 6, + "contestType": "TOUGH" + }, + { + "name": "MOVE_SPIKE_CANNON", + "effect": "MOVE_EFFECT_MULTIHIT_2_5", + "class": "CLASS_PHYSICAL", + "power": 20, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 7, + "contestType": "COOL" + }, + { + "name": "MOVE_CONSTRICT", + "effect": "MOVE_EFFECT_SPEED_DOWN_HIT", + "class": "CLASS_PHYSICAL", + "power": 10, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 35, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 21, + "contestType": "TOUGH" + }, + { + "name": "MOVE_AMNESIA", + "effect": "MOVE_EFFECT_SPDEF_2UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 8, + "unkC": 11, + "contestType": "CUTE" + }, + { + "name": "MOVE_KINESIS", + "effect": "MOVE_EFFECT_ACCURACY_DOWN", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 80, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 86, + "unkC": 11, + "contestType": "SMART" + }, + { + "name": "MOVE_SOFT_BOILED", + "effect": "MOVE_EFFECT_RESTORE_HP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 8, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_HIGH_JUMP_KICK", + "effect": "MOVE_EFFECT_JUMP_KICK", + "class": "CLASS_PHYSICAL", + "power": 100, + "type": "TYPE_FIGHTING", + "accuracy": 90, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_GLARE", + "effect": "MOVE_EFFECT_PARALYZE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 75, + "pp": 30, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 19, + "contestType": "TOUGH" + }, + { + "name": "MOVE_DREAM_EATER", + "effect": "MOVE_EFFECT_DREAM_EATER", + "class": "CLASS_SPECIAL", + "power": 100, + "type": "TYPE_PSYCHIC", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 20, + "contestType": "SMART" + }, + { + "name": "MOVE_POISON_GAS", + "effect": "MOVE_EFFECT_POISON", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_POISON", + "accuracy": 55, + "pp": 40, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 5, + "contestType": "SMART" + }, + { + "name": "MOVE_BARRAGE", + "effect": "MOVE_EFFECT_MULTIHIT_2_5", + "class": "CLASS_PHYSICAL", + "power": 15, + "type": "TYPE_NORMAL", + "accuracy": 85, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 114, + "unkC": 7, + "contestType": "TOUGH" + }, + { + "name": "MOVE_LEECH_LIFE", + "effect": "MOVE_EFFECT_DRAIN_HP", + "class": "CLASS_PHYSICAL", + "power": 20, + "type": "TYPE_BUG", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 20, + "contestType": "SMART" + }, + { + "name": "MOVE_LOVELY_KISS", + "effect": "MOVE_EFFECT_SLEEP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 75, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 19, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_SKY_ATTACK", + "effect": "MOVE_EFFECT_SKY_ATTACK", + "class": "CLASS_PHYSICAL", + "power": 140, + "type": "TYPE_FLYING", + "accuracy": 90, + "pp": 5, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 6, + "contestType": "COOL" + }, + { + "name": "MOVE_TRANSFORM", + "effect": "MOVE_EFFECT_TRANSFORM", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 64, + "unkC": 23, + "contestType": "SMART" + }, + { + "name": "MOVE_BUBBLE", + "effect": "MOVE_EFFECT_SPEED_DOWN_HIT", + "class": "CLASS_SPECIAL", + "power": 20, + "type": "TYPE_WATER", + "accuracy": 100, + "pp": 30, + "effectChance": 10, + "unk8": 4, + "priority": 0, + "unkB": 18, + "unkC": 2, + "contestType": "CUTE" + }, + { + "name": "MOVE_DIZZY_PUNCH", + "effect": "MOVE_EFFECT_CONFUSE_HIT", + "class": "CLASS_PHYSICAL", + "power": 70, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 10, + "effectChance": 20, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 16, + "contestType": "COOL" + }, + { + "name": "MOVE_SPORE", + "effect": "MOVE_EFFECT_SLEEP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_GRASS", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 10, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_FLASH", + "effect": "MOVE_EFFECT_ACCURACY_DOWN", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 150, + "unkC": 10, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_PSYWAVE", + "effect": "MOVE_EFFECT_RANDOM_DAMAGE", + "class": "CLASS_SPECIAL", + "power": 1, + "type": "TYPE_PSYCHIC", + "accuracy": 80, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 5, + "contestType": "SMART" + }, + { + "name": "MOVE_SPLASH", + "effect": "MOVE_EFFECT_NONE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 40, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 64, + "unkC": 16, + "contestType": "CUTE" + }, + { + "name": "MOVE_ACID_ARMOR", + "effect": "MOVE_EFFECT_DEFENSE_2UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_POISON", + "accuracy": 0, + "pp": 40, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 11, + "contestType": "TOUGH" + }, + { + "name": "MOVE_CRABHAMMER", + "effect": "MOVE_EFFECT_HIGH_CRIT", + "class": "CLASS_PHYSICAL", + "power": 90, + "type": "TYPE_WATER", + "accuracy": 85, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 18, + "contestType": "TOUGH" + }, + { + "name": "MOVE_EXPLOSION", + "effect": "MOVE_EFFECT_EXPLOSION", + "class": "CLASS_PHYSICAL", + "power": 250, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 5, + "effectChance": 0, + "unk8": 8, + "priority": 0, + "unkB": 50, + "unkC": 9, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_FURY_SWIPES", + "effect": "MOVE_EFFECT_MULTIHIT_2_5", + "class": "CLASS_PHYSICAL", + "power": 18, + "type": "TYPE_NORMAL", + "accuracy": 80, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 7, + "contestType": "TOUGH" + }, + { + "name": "MOVE_BONEMERANG", + "effect": "MOVE_EFFECT_DOUBLE_HIT", + "class": "CLASS_PHYSICAL", + "power": 50, + "type": "TYPE_GROUND", + "accuracy": 90, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 114, + "unkC": 7, + "contestType": "TOUGH" + }, + { + "name": "MOVE_REST", + "effect": "MOVE_EFFECT_SLEEP_USER", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 8, + "contestType": "CUTE" + }, + { + "name": "MOVE_ROCK_SLIDE", + "effect": "MOVE_EFFECT_FLINCH_HIT", + "class": "CLASS_PHYSICAL", + "power": 75, + "type": "TYPE_ROCK", + "accuracy": 90, + "pp": 10, + "effectChance": 30, + "unk8": 4, + "priority": 0, + "unkB": 18, + "unkC": 5, + "contestType": "TOUGH" + }, + { + "name": "MOVE_HYPER_FANG", + "effect": "MOVE_EFFECT_FLINCH_HIT", + "class": "CLASS_PHYSICAL", + "power": 80, + "type": "TYPE_NORMAL", + "accuracy": 90, + "pp": 15, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 18, + "contestType": "COOL" + }, + { + "name": "MOVE_SHARPEN", + "effect": "MOVE_EFFECT_ATTACK_UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 30, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 11, + "contestType": "CUTE" + }, + { + "name": "MOVE_CONVERSION", + "effect": "MOVE_EFFECT_CONVERSION", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 30, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 64, + "unkC": 23, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_TRI_ATTACK", + "effect": "MOVE_EFFECT_TRI_ATTACK", + "class": "CLASS_SPECIAL", + "power": 80, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 10, + "effectChance": 20, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 5, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_SUPER_FANG", + "effect": "MOVE_EFFECT_SUPER_FANG", + "class": "CLASS_PHYSICAL", + "power": 1, + "type": "TYPE_NORMAL", + "accuracy": 90, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 83, + "unkC": 5, + "contestType": "TOUGH" + }, + { + "name": "MOVE_SLASH", + "effect": "MOVE_EFFECT_HIGH_CRIT", + "class": "CLASS_PHYSICAL", + "power": 70, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_SUBSTITUTE", + "effect": "MOVE_EFFECT_SUBSTITUTE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 23, + "contestType": "SMART" + }, + { + "name": "MOVE_STRUGGLE", + "effect": "MOVE_EFFECT_STRUGGLE", + "class": "CLASS_PHYSICAL", + "power": 50, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 1, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 99, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_SKETCH", + "effect": "MOVE_EFFECT_SKETCH", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 1, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 0, + "unkC": 23, + "contestType": "SMART" + }, + { + "name": "MOVE_TRIPLE_KICK", + "effect": "MOVE_EFFECT_TRIPLE_KICK", + "class": "CLASS_PHYSICAL", + "power": 10, + "type": "TYPE_FIGHTING", + "accuracy": 90, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 7, + "contestType": "COOL" + }, + { + "name": "MOVE_THIEF", + "effect": "MOVE_EFFECT_STEAL_ITEM", + "class": "CLASS_PHYSICAL", + "power": 40, + "type": "TYPE_DARK", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 83, + "unkC": 12, + "contestType": "TOUGH" + }, + { + "name": "MOVE_SPIDER_WEB", + "effect": "MOVE_EFFECT_PREVENT_ESCAPE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_BUG", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 13, + "contestType": "SMART" + }, + { + "name": "MOVE_MIND_READER", + "effect": "MOVE_EFFECT_ENSURE_NEXT_HIT", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 20, + "contestType": "SMART" + }, + { + "name": "MOVE_NIGHTMARE", + "effect": "MOVE_EFFECT_NIGHTMARE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_GHOST", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 19, + "contestType": "SMART" + }, + { + "name": "MOVE_FLAME_WHEEL", + "effect": "MOVE_EFFECT_BURN_HIT_THAW", + "class": "CLASS_PHYSICAL", + "power": 60, + "type": "TYPE_FIRE", + "accuracy": 100, + "pp": 25, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 7, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_SNORE", + "effect": "MOVE_EFFECT_SNORE", + "class": "CLASS_SPECIAL", + "power": 40, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 15, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 5, + "contestType": "CUTE" + }, + { + "name": "MOVE_CURSE", + "effect": "MOVE_EFFECT_CURSE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_MYSTERY", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 64, + "unkC": 21, + "contestType": "TOUGH" + }, + { + "name": "MOVE_FLAIL", + "effect": "MOVE_EFFECT_STRONGER_LOW_HP", + "class": "CLASS_PHYSICAL", + "power": 1, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 15, + "contestType": "CUTE" + }, + { + "name": "MOVE_CONVERSION_2", + "effect": "MOVE_EFFECT_CONVERSION_2", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 30, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 0, + "unkC": 23, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_AEROBLAST", + "effect": "MOVE_EFFECT_HIGH_CRIT", + "class": "CLASS_SPECIAL", + "power": 100, + "type": "TYPE_FLYING", + "accuracy": 95, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 178, + "unkC": 22, + "contestType": "COOL" + }, + { + "name": "MOVE_COTTON_SPORE", + "effect": "MOVE_EFFECT_SPEED_2DOWN", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_GRASS", + "accuracy": 85, + "pp": 40, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 86, + "unkC": 1, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_REVERSAL", + "effect": "MOVE_EFFECT_STRONGER_LOW_HP", + "class": "CLASS_PHYSICAL", + "power": 1, + "type": "TYPE_FIGHTING", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 15, + "contestType": "COOL" + }, + { + "name": "MOVE_SPITE", + "effect": "MOVE_EFFECT_SPITE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_GHOST", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 19, + "contestType": "TOUGH" + }, + { + "name": "MOVE_POWDER_SNOW", + "effect": "MOVE_EFFECT_FREEZE_HIT", + "class": "CLASS_SPECIAL", + "power": 40, + "type": "TYPE_ICE", + "accuracy": 100, + "pp": 25, + "effectChance": 10, + "unk8": 4, + "priority": 0, + "unkB": 18, + "unkC": 5, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_PROTECT", + "effect": "MOVE_EFFECT_PROTECT", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 16, + "priority": 3, + "unkB": 0, + "unkC": 16, + "contestType": "CUTE" + }, + { + "name": "MOVE_MACH_PUNCH", + "effect": "MOVE_EFFECT_PRIORITY_HIT", + "class": "CLASS_PHYSICAL", + "power": 40, + "type": "TYPE_FIGHTING", + "accuracy": 100, + "pp": 30, + "effectChance": 0, + "unk8": 0, + "priority": 1, + "unkB": 115, + "unkC": 1, + "contestType": "COOL" + }, + { + "name": "MOVE_SCARY_FACE", + "effect": "MOVE_EFFECT_SPEED_2DOWN", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 90, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 2, + "contestType": "TOUGH" + }, + { + "name": "MOVE_FEINT_ATTACK", + "effect": "MOVE_EFFECT_ALWAYS_HIT", + "class": "CLASS_PHYSICAL", + "power": 60, + "type": "TYPE_DARK", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 18, + "contestType": "SMART" + }, + { + "name": "MOVE_SWEET_KISS", + "effect": "MOVE_EFFECT_CONFUSE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 75, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 19, + "contestType": "CUTE" + }, + { + "name": "MOVE_BELLY_DRUM", + "effect": "MOVE_EFFECT_BELLY_DRUM", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 11, + "contestType": "CUTE" + }, + { + "name": "MOVE_SLUDGE_BOMB", + "effect": "MOVE_EFFECT_POISON_HIT", + "class": "CLASS_SPECIAL", + "power": 90, + "type": "TYPE_POISON", + "accuracy": 100, + "pp": 10, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 18, + "contestType": "TOUGH" + }, + { + "name": "MOVE_MUD_SLAP", + "effect": "MOVE_EFFECT_ACCURACY_DOWN_HIT", + "class": "CLASS_SPECIAL", + "power": 20, + "type": "TYPE_GROUND", + "accuracy": 100, + "pp": 10, + "effectChance": 100, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 5, + "contestType": "CUTE" + }, + { + "name": "MOVE_OCTAZOOKA", + "effect": "MOVE_EFFECT_ACCURACY_DOWN_HIT", + "class": "CLASS_SPECIAL", + "power": 65, + "type": "TYPE_WATER", + "accuracy": 85, + "pp": 10, + "effectChance": 50, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 4, + "contestType": "TOUGH" + }, + { + "name": "MOVE_SPIKES", + "effect": "MOVE_EFFECT_SPIKES", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_GROUND", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 128, + "priority": 0, + "unkB": 0, + "unkC": 13, + "contestType": "SMART" + }, + { + "name": "MOVE_ZAP_CANNON", + "effect": "MOVE_EFFECT_PARALYZE_HIT", + "class": "CLASS_SPECIAL", + "power": 120, + "type": "TYPE_ELECTRIC", + "accuracy": 50, + "pp": 5, + "effectChance": 100, + "unk8": 0, + "priority": 0, + "unkB": 146, + "unkC": 4, + "contestType": "COOL" + }, + { + "name": "MOVE_FORESIGHT", + "effect": "MOVE_EFFECT_IDENTIFY", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 40, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 82, + "unkC": 20, + "contestType": "SMART" + }, + { + "name": "MOVE_DESTINY_BOND", + "effect": "MOVE_EFFECT_DESTINY_BOND", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_GHOST", + "accuracy": 0, + "pp": 5, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 0, + "unkC": 9, + "contestType": "SMART" + }, + { + "name": "MOVE_PERISH_SONG", + "effect": "MOVE_EFFECT_PERISH_SONG", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 5, + "effectChance": 0, + "unk8": 64, + "priority": 0, + "unkB": 128, + "unkC": 10, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_ICY_WIND", + "effect": "MOVE_EFFECT_SPEED_DOWN_HIT", + "class": "CLASS_SPECIAL", + "power": 55, + "type": "TYPE_ICE", + "accuracy": 95, + "pp": 15, + "effectChance": 100, + "unk8": 4, + "priority": 0, + "unkB": 18, + "unkC": 2, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_DETECT", + "effect": "MOVE_EFFECT_PROTECT", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_FIGHTING", + "accuracy": 0, + "pp": 5, + "effectChance": 0, + "unk8": 16, + "priority": 3, + "unkB": 0, + "unkC": 16, + "contestType": "COOL" + }, + { + "name": "MOVE_BONE_RUSH", + "effect": "MOVE_EFFECT_MULTIHIT_2_5", + "class": "CLASS_PHYSICAL", + "power": 25, + "type": "TYPE_GROUND", + "accuracy": 80, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 114, + "unkC": 7, + "contestType": "TOUGH" + }, + { + "name": "MOVE_LOCK_ON", + "effect": "MOVE_EFFECT_ENSURE_NEXT_HIT", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 20, + "contestType": "SMART" + }, + { + "name": "MOVE_OUTRAGE", + "effect": "MOVE_EFFECT_RAMPAGE", + "class": "CLASS_PHYSICAL", + "power": 120, + "type": "TYPE_DRAGON", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 2, + "priority": 0, + "unkB": 179, + "unkC": 7, + "contestType": "COOL" + }, + { + "name": "MOVE_SANDSTORM", + "effect": "MOVE_EFFECT_SANDSTORM", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_ROCK", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 64, + "priority": 0, + "unkB": 0, + "unkC": 13, + "contestType": "TOUGH" + }, + { + "name": "MOVE_GIGA_DRAIN", + "effect": "MOVE_EFFECT_DRAIN_HP", + "class": "CLASS_SPECIAL", + "power": 60, + "type": "TYPE_GRASS", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 20, + "contestType": "SMART" + }, + { + "name": "MOVE_ENDURE", + "effect": "MOVE_EFFECT_ENDURE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 16, + "priority": 3, + "unkB": 64, + "unkC": 13, + "contestType": "TOUGH" + }, + { + "name": "MOVE_CHARM", + "effect": "MOVE_EFFECT_ATTACK_2DOWN", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 86, + "unkC": 19, + "contestType": "CUTE" + }, + { + "name": "MOVE_ROLLOUT", + "effect": "MOVE_EFFECT_INCREASING_HIT", + "class": "CLASS_PHYSICAL", + "power": 30, + "type": "TYPE_ROCK", + "accuracy": 90, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 7, + "contestType": "TOUGH" + }, + { + "name": "MOVE_FALSE_SWIPE", + "effect": "MOVE_EFFECT_FALSE_SWIPE", + "class": "CLASS_PHYSICAL", + "power": 40, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 40, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 16, + "contestType": "COOL" + }, + { + "name": "MOVE_SWAGGER", + "effect": "MOVE_EFFECT_SWAGGER", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 90, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 86, + "unkC": 19, + "contestType": "CUTE" + }, + { + "name": "MOVE_MILK_DRINK", + "effect": "MOVE_EFFECT_RESTORE_HP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 8, + "unkC": 8, + "contestType": "CUTE" + }, + { + "name": "MOVE_SPARK", + "effect": "MOVE_EFFECT_PARALYZE_HIT", + "class": "CLASS_PHYSICAL", + "power": 65, + "type": "TYPE_ELECTRIC", + "accuracy": 100, + "pp": 20, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_FURY_CUTTER", + "effect": "MOVE_EFFECT_FURY_CUTTER", + "class": "CLASS_PHYSICAL", + "power": 10, + "type": "TYPE_BUG", + "accuracy": 95, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 7, + "contestType": "COOL" + }, + { + "name": "MOVE_STEEL_WING", + "effect": "MOVE_EFFECT_DEFENSE_UP_HIT", + "class": "CLASS_PHYSICAL", + "power": 70, + "type": "TYPE_STEEL", + "accuracy": 90, + "pp": 25, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_MEAN_LOOK", + "effect": "MOVE_EFFECT_PREVENT_ESCAPE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 10, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_ATTRACT", + "effect": "MOVE_EFFECT_ATTRACT", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 19, + "contestType": "CUTE" + }, + { + "name": "MOVE_SLEEP_TALK", + "effect": "MOVE_EFFECT_SLEEP_TALK", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 1, + "priority": 0, + "unkB": 0, + "unkC": 5, + "contestType": "CUTE" + }, + { + "name": "MOVE_HEAL_BELL", + "effect": "MOVE_EFFECT_HEAL_ALL_STATUS", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 5, + "effectChance": 0, + "unk8": 32, + "priority": 0, + "unkB": 72, + "unkC": 8, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_RETURN", + "effect": "MOVE_EFFECT_RETURN", + "class": "CLASS_PHYSICAL", + "power": 1, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 17, + "contestType": "CUTE" + }, + { + "name": "MOVE_PRESENT", + "effect": "MOVE_EFFECT_PRESENT", + "class": "CLASS_PHYSICAL", + "power": 1, + "type": "TYPE_NORMAL", + "accuracy": 90, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 16, + "contestType": "CUTE" + }, + { + "name": "MOVE_FRUSTRATION", + "effect": "MOVE_EFFECT_FRUSTRATION", + "class": "CLASS_PHYSICAL", + "power": 1, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 18, + "contestType": "CUTE" + }, + { + "name": "MOVE_SAFEGUARD", + "effect": "MOVE_EFFECT_SAFEGUARD", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 25, + "effectChance": 0, + "unk8": 32, + "priority": 0, + "unkB": 72, + "unkC": 13, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_PAIN_SPLIT", + "effect": "MOVE_EFFECT_PAIN_SPLIT", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 10, + "contestType": "SMART" + }, + { + "name": "MOVE_SACRED_FIRE", + "effect": "MOVE_EFFECT_BURN_HIT_THAW", + "class": "CLASS_PHYSICAL", + "power": 100, + "type": "TYPE_FIRE", + "accuracy": 95, + "pp": 5, + "effectChance": 50, + "unk8": 0, + "priority": 0, + "unkB": 146, + "unkC": 22, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_MAGNITUDE", + "effect": "MOVE_EFFECT_MAGNITUDE", + "class": "CLASS_PHYSICAL", + "power": 1, + "type": "TYPE_GROUND", + "accuracy": 100, + "pp": 30, + "effectChance": 0, + "unk8": 8, + "priority": 0, + "unkB": 50, + "unkC": 18, + "contestType": "TOUGH" + }, + { + "name": "MOVE_DYNAMIC_PUNCH", + "effect": "MOVE_EFFECT_CONFUSE_HIT", + "class": "CLASS_PHYSICAL", + "power": 100, + "type": "TYPE_FIGHTING", + "accuracy": 50, + "pp": 5, + "effectChance": 100, + "unk8": 0, + "priority": 0, + "unkB": 147, + "unkC": 18, + "contestType": "COOL" + }, + { + "name": "MOVE_MEGAHORN", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 120, + "type": "TYPE_BUG", + "accuracy": 85, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 179, + "unkC": 18, + "contestType": "COOL" + }, + { + "name": "MOVE_DRAGON_BREATH", + "effect": "MOVE_EFFECT_PARALYZE_HIT", + "class": "CLASS_SPECIAL", + "power": 60, + "type": "TYPE_DRAGON", + "accuracy": 100, + "pp": 20, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 17, + "contestType": "COOL" + }, + { + "name": "MOVE_BATON_PASS", + "effect": "MOVE_EFFECT_BATON_PASS", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 40, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 0, + "unkC": 16, + "contestType": "CUTE" + }, + { + "name": "MOVE_ENCORE", + "effect": "MOVE_EFFECT_ENCORE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 20, + "contestType": "CUTE" + }, + { + "name": "MOVE_PURSUIT", + "effect": "MOVE_EFFECT_PURSUIT", + "class": "CLASS_PHYSICAL", + "power": 40, + "type": "TYPE_DARK", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 147, + "unkC": 20, + "contestType": "SMART" + }, + { + "name": "MOVE_RAPID_SPIN", + "effect": "MOVE_EFFECT_RAPID_SPIN", + "class": "CLASS_PHYSICAL", + "power": 20, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 40, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 17, + "contestType": "COOL" + }, + { + "name": "MOVE_SWEET_SCENT", + "effect": "MOVE_EFFECT_EVASION_DOWN", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 4, + "priority": 0, + "unkB": 22, + "unkC": 19, + "contestType": "CUTE" + }, + { + "name": "MOVE_IRON_TAIL", + "effect": "MOVE_EFFECT_DEFENSE_DOWN_HIT", + "class": "CLASS_PHYSICAL", + "power": 100, + "type": "TYPE_STEEL", + "accuracy": 75, + "pp": 15, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 18, + "contestType": "COOL" + }, + { + "name": "MOVE_METAL_CLAW", + "effect": "MOVE_EFFECT_ATTACK_UP_HIT", + "class": "CLASS_PHYSICAL", + "power": 50, + "type": "TYPE_STEEL", + "accuracy": 95, + "pp": 35, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 18, + "contestType": "COOL" + }, + { + "name": "MOVE_VITAL_THROW", + "effect": "MOVE_EFFECT_VITAL_THROW", + "class": "CLASS_PHYSICAL", + "power": 70, + "type": "TYPE_FIGHTING", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": -1, + "unkB": 51, + "unkC": 2, + "contestType": "COOL" + }, + { + "name": "MOVE_MORNING_SUN", + "effect": "MOVE_EFFECT_RESTORE_HP_DAYTIME", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 5, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 8, + "unkC": 8, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_SYNTHESIS", + "effect": "MOVE_EFFECT_RESTORE_HP_DAYTIME", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_GRASS", + "accuracy": 0, + "pp": 5, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 8, + "contestType": "SMART" + }, + { + "name": "MOVE_MOONLIGHT", + "effect": "MOVE_EFFECT_RESTORE_HP_DAYTIME", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 5, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 136, + "unkC": 8, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_HIDDEN_POWER", + "effect": "MOVE_EFFECT_HIDDEN_POWER", + "class": "CLASS_SPECIAL", + "power": 1, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 23, + "contestType": "SMART" + }, + { + "name": "MOVE_CROSS_CHOP", + "effect": "MOVE_EFFECT_HIGH_CRIT", + "class": "CLASS_PHYSICAL", + "power": 100, + "type": "TYPE_FIGHTING", + "accuracy": 80, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 18, + "contestType": "COOL" + }, + { + "name": "MOVE_TWISTER", + "effect": "MOVE_EFFECT_TWISTER", + "class": "CLASS_SPECIAL", + "power": 40, + "type": "TYPE_DRAGON", + "accuracy": 100, + "pp": 20, + "effectChance": 20, + "unk8": 4, + "priority": 0, + "unkB": 50, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_RAIN_DANCE", + "effect": "MOVE_EFFECT_RAIN", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_WATER", + "accuracy": 0, + "pp": 5, + "effectChance": 0, + "unk8": 64, + "priority": 0, + "unkB": 0, + "unkC": 13, + "contestType": "TOUGH" + }, + { + "name": "MOVE_SUNNY_DAY", + "effect": "MOVE_EFFECT_SUNNY", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_FIRE", + "accuracy": 0, + "pp": 5, + "effectChance": 0, + "unk8": 64, + "priority": 0, + "unkB": 0, + "unkC": 13, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_CRUNCH", + "effect": "MOVE_EFFECT_DEFENSE_DOWN_HIT", + "class": "CLASS_PHYSICAL", + "power": 80, + "type": "TYPE_DARK", + "accuracy": 100, + "pp": 15, + "effectChance": 20, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 18, + "contestType": "TOUGH" + }, + { + "name": "MOVE_MIRROR_COAT", + "effect": "MOVE_EFFECT_MIRROR_COAT", + "class": "CLASS_SPECIAL", + "power": 1, + "type": "TYPE_PSYCHIC", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 1, + "priority": -5, + "unkB": 0, + "unkC": 15, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_PSYCH_UP", + "effect": "MOVE_EFFECT_PSYCH_UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 72, + "unkC": 11, + "contestType": "SMART" + }, + { + "name": "MOVE_EXTREME_SPEED", + "effect": "MOVE_EFFECT_PRIORITY_HIT", + "class": "CLASS_PHYSICAL", + "power": 80, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 1, + "unkB": 179, + "unkC": 1, + "contestType": "COOL" + }, + { + "name": "MOVE_ANCIENT_POWER", + "effect": "MOVE_EFFECT_STATS_UP_HIT", + "class": "CLASS_SPECIAL", + "power": 60, + "type": "TYPE_ROCK", + "accuracy": 100, + "pp": 5, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 18, + "contestType": "TOUGH" + }, + { + "name": "MOVE_SHADOW_BALL", + "effect": "MOVE_EFFECT_SPDEF_DOWN_HIT", + "class": "CLASS_SPECIAL", + "power": 80, + "type": "TYPE_GHOST", + "accuracy": 100, + "pp": 15, + "effectChance": 20, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 17, + "contestType": "SMART" + }, + { + "name": "MOVE_FUTURE_SIGHT", + "effect": "MOVE_EFFECT_HIT_LATER", + "class": "CLASS_SPECIAL", + "power": 80, + "type": "TYPE_PSYCHIC", + "accuracy": 90, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 0, + "unkC": 17, + "contestType": "SMART" + }, + { + "name": "MOVE_ROCK_SMASH", + "effect": "MOVE_EFFECT_DEFENSE_DOWN_HIT", + "class": "CLASS_PHYSICAL", + "power": 40, + "type": "TYPE_FIGHTING", + "accuracy": 100, + "pp": 15, + "effectChance": 50, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 18, + "contestType": "TOUGH" + }, + { + "name": "MOVE_WHIRLPOOL", + "effect": "MOVE_EFFECT_WHIRLPOOL", + "class": "CLASS_SPECIAL", + "power": 15, + "type": "TYPE_WATER", + "accuracy": 70, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 178, + "unkC": 21, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_BEAT_UP", + "effect": "MOVE_EFFECT_BEAT_UP", + "class": "CLASS_PHYSICAL", + "power": 10, + "type": "TYPE_DARK", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 114, + "unkC": 7, + "contestType": "SMART" + }, + { + "name": "MOVE_FAKE_OUT", + "effect": "MOVE_EFFECT_FAKE_OUT", + "class": "CLASS_PHYSICAL", + "power": 40, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 10, + "effectChance": 100, + "unk8": 0, + "priority": 1, + "unkB": 19, + "unkC": 17, + "contestType": "CUTE" + }, + { + "name": "MOVE_UPROAR", + "effect": "MOVE_EFFECT_UPROAR", + "class": "CLASS_SPECIAL", + "power": 50, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 2, + "priority": 0, + "unkB": 50, + "unkC": 10, + "contestType": "CUTE" + }, + { + "name": "MOVE_STOCKPILE", + "effect": "MOVE_EFFECT_STOCKPILE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 11, + "contestType": "TOUGH" + }, + { + "name": "MOVE_SPIT_UP", + "effect": "MOVE_EFFECT_SPIT_UP", + "class": "CLASS_SPECIAL", + "power": 1, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 34, + "unkC": 18, + "contestType": "TOUGH" + }, + { + "name": "MOVE_SWALLOW", + "effect": "MOVE_EFFECT_SWALLOW", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 8, + "contestType": "TOUGH" + }, + { + "name": "MOVE_HEAT_WAVE", + "effect": "MOVE_EFFECT_BURN_HIT", + "class": "CLASS_SPECIAL", + "power": 100, + "type": "TYPE_FIRE", + "accuracy": 90, + "pp": 10, + "effectChance": 10, + "unk8": 4, + "priority": 0, + "unkB": 18, + "unkC": 17, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_HAIL", + "effect": "MOVE_EFFECT_HAIL", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_ICE", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 64, + "priority": 0, + "unkB": 2, + "unkC": 13, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_TORMENT", + "effect": "MOVE_EFFECT_TORMENT", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_DARK", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 82, + "unkC": 16, + "contestType": "TOUGH" + }, + { + "name": "MOVE_FLATTER", + "effect": "MOVE_EFFECT_FLATTER", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_DARK", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 19, + "contestType": "SMART" + }, + { + "name": "MOVE_WILL_O_WISP", + "effect": "MOVE_EFFECT_BURN", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_FIRE", + "accuracy": 75, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 17, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_MEMENTO", + "effect": "MOVE_EFFECT_MEMENTO", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_DARK", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 9, + "contestType": "TOUGH" + }, + { + "name": "MOVE_FACADE", + "effect": "MOVE_EFFECT_FACADE", + "class": "CLASS_PHYSICAL", + "power": 70, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 83, + "unkC": 15, + "contestType": "CUTE" + }, + { + "name": "MOVE_FOCUS_PUNCH", + "effect": "MOVE_EFFECT_FOCUS_PUNCH", + "class": "CLASS_PHYSICAL", + "power": 150, + "type": "TYPE_FIGHTING", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": -3, + "unkB": 131, + "unkC": 6, + "contestType": "TOUGH" + }, + { + "name": "MOVE_SMELLING_SALTS", + "effect": "MOVE_EFFECT_SMELLING_SALTS", + "class": "CLASS_PHYSICAL", + "power": 60, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 16, + "contestType": "SMART" + }, + { + "name": "MOVE_FOLLOW_ME", + "effect": "MOVE_EFFECT_FOLLOW_ME", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 16, + "priority": 3, + "unkB": 0, + "unkC": 14, + "contestType": "CUTE" + }, + { + "name": "MOVE_NATURE_POWER", + "effect": "MOVE_EFFECT_NATURE_POWER", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 1, + "priority": 0, + "unkB": 64, + "unkC": 14, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_CHARGE", + "effect": "MOVE_EFFECT_CHARGE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_ELECTRIC", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 8, + "unkC": 11, + "contestType": "SMART" + }, + { + "name": "MOVE_TAUNT", + "effect": "MOVE_EFFECT_TAUNT", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_DARK", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 82, + "unkC": 16, + "contestType": "SMART" + }, + { + "name": "MOVE_HELPING_HAND", + "effect": "MOVE_EFFECT_HELPING_HAND", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 256, + "priority": 5, + "unkB": 0, + "unkC": 20, + "contestType": "SMART" + }, + { + "name": "MOVE_TRICK", + "effect": "MOVE_EFFECT_SWAP_ITEMS", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 12, + "contestType": "SMART" + }, + { + "name": "MOVE_ROLE_PLAY", + "effect": "MOVE_EFFECT_ROLE_PLAY", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 0, + "unkC": 23, + "contestType": "CUTE" + }, + { + "name": "MOVE_WISH", + "effect": "MOVE_EFFECT_WISH", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 128, + "unkC": 8, + "contestType": "CUTE" + }, + { + "name": "MOVE_ASSIST", + "effect": "MOVE_EFFECT_ASSIST", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 1, + "priority": 0, + "unkB": 0, + "unkC": 14, + "contestType": "CUTE" + }, + { + "name": "MOVE_INGRAIN", + "effect": "MOVE_EFFECT_INGRAIN", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_GRASS", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 21, + "contestType": "SMART" + }, + { + "name": "MOVE_SUPERPOWER", + "effect": "MOVE_EFFECT_SUPERPOWER", + "class": "CLASS_PHYSICAL", + "power": 120, + "type": "TYPE_FIGHTING", + "accuracy": 100, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 147, + "unkC": 18, + "contestType": "TOUGH" + }, + { + "name": "MOVE_MAGIC_COAT", + "effect": "MOVE_EFFECT_MAGIC_COAT", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 15, + "effectChance": 0, + "unk8": 1, + "priority": 4, + "unkB": 0, + "unkC": 15, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_RECYCLE", + "effect": "MOVE_EFFECT_RECYCLE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 64, + "unkC": 12, + "contestType": "SMART" + }, + { + "name": "MOVE_REVENGE", + "effect": "MOVE_EFFECT_REVENGE", + "class": "CLASS_PHYSICAL", + "power": 60, + "type": "TYPE_FIGHTING", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": -4, + "unkB": 51, + "unkC": 15, + "contestType": "TOUGH" + }, + { + "name": "MOVE_BRICK_BREAK", + "effect": "MOVE_EFFECT_BRICK_BREAK", + "class": "CLASS_PHYSICAL", + "power": 75, + "type": "TYPE_FIGHTING", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_YAWN", + "effect": "MOVE_EFFECT_YAWN", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 19, + "contestType": "CUTE" + }, + { + "name": "MOVE_KNOCK_OFF", + "effect": "MOVE_EFFECT_KNOCK_OFF", + "class": "CLASS_PHYSICAL", + "power": 20, + "type": "TYPE_DARK", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 5, + "contestType": "SMART" + }, + { + "name": "MOVE_ENDEAVOR", + "effect": "MOVE_EFFECT_ENDEAVOR", + "class": "CLASS_PHYSICAL", + "power": 1, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 15, + "contestType": "TOUGH" + }, + { + "name": "MOVE_ERUPTION", + "effect": "MOVE_EFFECT_STRONGER_HIGH_HP", + "class": "CLASS_SPECIAL", + "power": 150, + "type": "TYPE_FIRE", + "accuracy": 100, + "pp": 5, + "effectChance": 0, + "unk8": 4, + "priority": 0, + "unkB": 50, + "unkC": 18, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_SKILL_SWAP", + "effect": "MOVE_EFFECT_SKILL_SWAP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 12, + "contestType": "SMART" + }, + { + "name": "MOVE_IMPRISON", + "effect": "MOVE_EFFECT_IMPRISON", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 0, + "unkC": 20, + "contestType": "SMART" + }, + { + "name": "MOVE_REFRESH", + "effect": "MOVE_EFFECT_REFRESH", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 8, + "unkC": 8, + "contestType": "CUTE" + }, + { + "name": "MOVE_GRUDGE", + "effect": "MOVE_EFFECT_GRUDGE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_GHOST", + "accuracy": 0, + "pp": 5, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 0, + "unkC": 10, + "contestType": "TOUGH" + }, + { + "name": "MOVE_SNATCH", + "effect": "MOVE_EFFECT_SNATCH", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_DARK", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 1, + "priority": 4, + "unkB": 0, + "unkC": 12, + "contestType": "SMART" + }, + { + "name": "MOVE_SECRET_POWER", + "effect": "MOVE_EFFECT_SECRET_POWER", + "class": "CLASS_PHYSICAL", + "power": 70, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 20, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 14, + "contestType": "SMART" + }, + { + "name": "MOVE_DIVE", + "effect": "MOVE_EFFECT_DIVE", + "class": "CLASS_PHYSICAL", + "power": 80, + "type": "TYPE_WATER", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 6, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_ARM_THRUST", + "effect": "MOVE_EFFECT_MULTIHIT_2_5", + "class": "CLASS_PHYSICAL", + "power": 15, + "type": "TYPE_FIGHTING", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 7, + "contestType": "TOUGH" + }, + { + "name": "MOVE_CAMOUFLAGE", + "effect": "MOVE_EFFECT_CAMOUFLAGE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 13, + "contestType": "SMART" + }, + { + "name": "MOVE_TAIL_GLOW", + "effect": "MOVE_EFFECT_SPATK_2UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_BUG", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 8, + "unkC": 11, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_LUSTER_PURGE", + "effect": "MOVE_EFFECT_SPDEF_DOWN_HIT", + "class": "CLASS_SPECIAL", + "power": 70, + "type": "TYPE_PSYCHIC", + "accuracy": 100, + "pp": 5, + "effectChance": 50, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 22, + "contestType": "SMART" + }, + { + "name": "MOVE_MIST_BALL", + "effect": "MOVE_EFFECT_SPATK_DOWN_HIT", + "class": "CLASS_SPECIAL", + "power": 70, + "type": "TYPE_PSYCHIC", + "accuracy": 100, + "pp": 5, + "effectChance": 50, + "unk8": 0, + "priority": 0, + "unkB": 146, + "unkC": 22, + "contestType": "SMART" + }, + { + "name": "MOVE_FEATHER_DANCE", + "effect": "MOVE_EFFECT_ATTACK_2DOWN", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_FLYING", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 19, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_TEETER_DANCE", + "effect": "MOVE_EFFECT_CONFUSE_ALL", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 8, + "priority": 0, + "unkB": 18, + "unkC": 14, + "contestType": "CUTE" + }, + { + "name": "MOVE_BLAZE_KICK", + "effect": "MOVE_EFFECT_BURN_HIT_HIGH_CRIT", + "class": "CLASS_PHYSICAL", + "power": 85, + "type": "TYPE_FIRE", + "accuracy": 90, + "pp": 10, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 17, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_MUD_SPORT", + "effect": "MOVE_EFFECT_MUD_SPORT", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_GROUND", + "accuracy": 0, + "pp": 15, + "effectChance": 0, + "unk8": 64, + "priority": 0, + "unkB": 0, + "unkC": 13, + "contestType": "CUTE" + }, + { + "name": "MOVE_ICE_BALL", + "effect": "MOVE_EFFECT_INCREASING_HIT", + "class": "CLASS_PHYSICAL", + "power": 30, + "type": "TYPE_ICE", + "accuracy": 90, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 7, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_NEEDLE_ARM", + "effect": "MOVE_EFFECT_FLINCH_HIT", + "class": "CLASS_PHYSICAL", + "power": 60, + "type": "TYPE_GRASS", + "accuracy": 100, + "pp": 15, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 5, + "contestType": "SMART" + }, + { + "name": "MOVE_SLACK_OFF", + "effect": "MOVE_EFFECT_RESTORE_HP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 8, + "contestType": "CUTE" + }, + { + "name": "MOVE_HYPER_VOICE", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_SPECIAL", + "power": 90, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 4, + "priority": 0, + "unkB": 18, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_POISON_FANG", + "effect": "MOVE_EFFECT_TOXIC_HIT", + "class": "CLASS_PHYSICAL", + "power": 50, + "type": "TYPE_POISON", + "accuracy": 100, + "pp": 15, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 4, + "contestType": "SMART" + }, + { + "name": "MOVE_CRUSH_CLAW", + "effect": "MOVE_EFFECT_DEFENSE_DOWN_HIT", + "class": "CLASS_PHYSICAL", + "power": 75, + "type": "TYPE_NORMAL", + "accuracy": 95, + "pp": 10, + "effectChance": 50, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_BLAST_BURN", + "effect": "MOVE_EFFECT_HIT_RECHARGE", + "class": "CLASS_SPECIAL", + "power": 150, + "type": "TYPE_FIRE", + "accuracy": 90, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 22, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_HYDRO_CANNON", + "effect": "MOVE_EFFECT_HIT_RECHARGE", + "class": "CLASS_SPECIAL", + "power": 150, + "type": "TYPE_WATER", + "accuracy": 90, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 178, + "unkC": 22, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_METEOR_MASH", + "effect": "MOVE_EFFECT_ATTACK_UP_HIT", + "class": "CLASS_PHYSICAL", + "power": 100, + "type": "TYPE_STEEL", + "accuracy": 85, + "pp": 10, + "effectChance": 20, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 18, + "contestType": "COOL" + }, + { + "name": "MOVE_ASTONISH", + "effect": "MOVE_EFFECT_FLINCH_HIT", + "class": "CLASS_PHYSICAL", + "power": 30, + "type": "TYPE_GHOST", + "accuracy": 100, + "pp": 15, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 83, + "unkC": 5, + "contestType": "SMART" + }, + { + "name": "MOVE_WEATHER_BALL", + "effect": "MOVE_EFFECT_WEATHER_BALL", + "class": "CLASS_SPECIAL", + "power": 50, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 4, + "contestType": "SMART" + }, + { + "name": "MOVE_AROMATHERAPY", + "effect": "MOVE_EFFECT_HEAL_ALL_STATUS", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_GRASS", + "accuracy": 0, + "pp": 5, + "effectChance": 0, + "unk8": 32, + "priority": 0, + "unkB": 8, + "unkC": 8, + "contestType": "SMART" + }, + { + "name": "MOVE_FAKE_TEARS", + "effect": "MOVE_EFFECT_SPDEF_2DOWN", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_DARK", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 86, + "unkC": 19, + "contestType": "SMART" + }, + { + "name": "MOVE_AIR_CUTTER", + "effect": "MOVE_EFFECT_HIGH_CRIT", + "class": "CLASS_SPECIAL", + "power": 55, + "type": "TYPE_FLYING", + "accuracy": 95, + "pp": 25, + "effectChance": 0, + "unk8": 4, + "priority": 0, + "unkB": 50, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_OVERHEAT", + "effect": "MOVE_EFFECT_HIT_USER_SPATK_2_DOWN", + "class": "CLASS_SPECIAL", + "power": 140, + "type": "TYPE_FIRE", + "accuracy": 90, + "pp": 5, + "effectChance": 100, + "unk8": 0, + "priority": 0, + "unkB": 178, + "unkC": 22, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_ODOR_SLEUTH", + "effect": "MOVE_EFFECT_IDENTIFY", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 40, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 82, + "unkC": 20, + "contestType": "SMART" + }, + { + "name": "MOVE_ROCK_TOMB", + "effect": "MOVE_EFFECT_SPEED_DOWN_HIT", + "class": "CLASS_PHYSICAL", + "power": 50, + "type": "TYPE_ROCK", + "accuracy": 80, + "pp": 10, + "effectChance": 100, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 2, + "contestType": "SMART" + }, + { + "name": "MOVE_SILVER_WIND", + "effect": "MOVE_EFFECT_STATS_UP_HIT", + "class": "CLASS_SPECIAL", + "power": 60, + "type": "TYPE_BUG", + "accuracy": 100, + "pp": 5, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 4, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_METAL_SOUND", + "effect": "MOVE_EFFECT_SPDEF_2DOWN", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_STEEL", + "accuracy": 85, + "pp": 40, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 10, + "contestType": "SMART" + }, + { + "name": "MOVE_GRASS_WHISTLE", + "effect": "MOVE_EFFECT_SLEEP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_GRASS", + "accuracy": 55, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 19, + "contestType": "SMART" + }, + { + "name": "MOVE_TICKLE", + "effect": "MOVE_EFFECT_ATTACK_DEFENSE_DOWN", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 86, + "unkC": 19, + "contestType": "CUTE" + }, + { + "name": "MOVE_COSMIC_POWER", + "effect": "MOVE_EFFECT_DEFENSE_SPDEF_UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 136, + "unkC": 11, + "contestType": "COOL" + }, + { + "name": "MOVE_WATER_SPOUT", + "effect": "MOVE_EFFECT_STRONGER_HIGH_HP", + "class": "CLASS_SPECIAL", + "power": 150, + "type": "TYPE_WATER", + "accuracy": 100, + "pp": 5, + "effectChance": 0, + "unk8": 4, + "priority": 0, + "unkB": 18, + "unkC": 22, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_SIGNAL_BEAM", + "effect": "MOVE_EFFECT_CONFUSE_HIT", + "class": "CLASS_SPECIAL", + "power": 75, + "type": "TYPE_BUG", + "accuracy": 100, + "pp": 15, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 4, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_SHADOW_PUNCH", + "effect": "MOVE_EFFECT_ALWAYS_HIT", + "class": "CLASS_PHYSICAL", + "power": 60, + "type": "TYPE_GHOST", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 17, + "contestType": "SMART" + }, + { + "name": "MOVE_EXTRASENSORY", + "effect": "MOVE_EFFECT_FLINCH_HIT", + "class": "CLASS_SPECIAL", + "power": 80, + "type": "TYPE_PSYCHIC", + "accuracy": 100, + "pp": 30, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 17, + "contestType": "COOL" + }, + { + "name": "MOVE_SKY_UPPERCUT", + "effect": "MOVE_EFFECT_SKY_UPPERCUT", + "class": "CLASS_PHYSICAL", + "power": 85, + "type": "TYPE_FIGHTING", + "accuracy": 90, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 179, + "unkC": 17, + "contestType": "COOL" + }, + { + "name": "MOVE_SAND_TOMB", + "effect": "MOVE_EFFECT_TRAP_HIT", + "class": "CLASS_PHYSICAL", + "power": 15, + "type": "TYPE_GROUND", + "accuracy": 70, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 21, + "contestType": "SMART" + }, + { + "name": "MOVE_SHEER_COLD", + "effect": "MOVE_EFFECT_OHKO", + "class": "CLASS_SPECIAL", + "power": 1, + "type": "TYPE_ICE", + "accuracy": 30, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 9, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_MUDDY_WATER", + "effect": "MOVE_EFFECT_ACCURACY_DOWN_HIT", + "class": "CLASS_SPECIAL", + "power": 95, + "type": "TYPE_WATER", + "accuracy": 85, + "pp": 10, + "effectChance": 30, + "unk8": 4, + "priority": 0, + "unkB": 50, + "unkC": 18, + "contestType": "TOUGH" + }, + { + "name": "MOVE_BULLET_SEED", + "effect": "MOVE_EFFECT_MULTIHIT_2_5", + "class": "CLASS_PHYSICAL", + "power": 10, + "type": "TYPE_GRASS", + "accuracy": 100, + "pp": 30, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 114, + "unkC": 7, + "contestType": "COOL" + }, + { + "name": "MOVE_AERIAL_ACE", + "effect": "MOVE_EFFECT_ALWAYS_HIT", + "class": "CLASS_PHYSICAL", + "power": 60, + "type": "TYPE_FLYING", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 17, + "contestType": "COOL" + }, + { + "name": "MOVE_ICICLE_SPEAR", + "effect": "MOVE_EFFECT_MULTIHIT_2_5", + "class": "CLASS_PHYSICAL", + "power": 10, + "type": "TYPE_ICE", + "accuracy": 100, + "pp": 30, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 114, + "unkC": 7, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_IRON_DEFENSE", + "effect": "MOVE_EFFECT_DEFENSE_2UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_STEEL", + "accuracy": 0, + "pp": 15, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 13, + "contestType": "TOUGH" + }, + { + "name": "MOVE_BLOCK", + "effect": "MOVE_EFFECT_PREVENT_ESCAPE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 13, + "contestType": "CUTE" + }, + { + "name": "MOVE_HOWL", + "effect": "MOVE_EFFECT_ATTACK_UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 40, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 8, + "unkC": 11, + "contestType": "COOL" + }, + { + "name": "MOVE_DRAGON_CLAW", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 80, + "type": "TYPE_DRAGON", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 17, + "contestType": "COOL" + }, + { + "name": "MOVE_FRENZY_PLANT", + "effect": "MOVE_EFFECT_HIT_RECHARGE", + "class": "CLASS_SPECIAL", + "power": 150, + "type": "TYPE_GRASS", + "accuracy": 90, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 178, + "unkC": 22, + "contestType": "COOL" + }, + { + "name": "MOVE_BULK_UP", + "effect": "MOVE_EFFECT_ATTACK_DEFENSE_UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_FIGHTING", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 11, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_BOUNCE", + "effect": "MOVE_EFFECT_BOUNCE", + "class": "CLASS_PHYSICAL", + "power": 85, + "type": "TYPE_FLYING", + "accuracy": 85, + "pp": 5, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 6, + "contestType": "CUTE" + }, + { + "name": "MOVE_MUD_SHOT", + "effect": "MOVE_EFFECT_SPEED_DOWN_HIT", + "class": "CLASS_SPECIAL", + "power": 55, + "type": "TYPE_GROUND", + "accuracy": 95, + "pp": 15, + "effectChance": 100, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 2, + "contestType": "TOUGH" + }, + { + "name": "MOVE_POISON_TAIL", + "effect": "MOVE_EFFECT_POISON_HIT_HIGH_CRIT", + "class": "CLASS_PHYSICAL", + "power": 50, + "type": "TYPE_POISON", + "accuracy": 100, + "pp": 25, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 4, + "contestType": "SMART" + }, + { + "name": "MOVE_COVET", + "effect": "MOVE_EFFECT_STEAL_ITEM", + "class": "CLASS_PHYSICAL", + "power": 40, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 40, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 19, + "unkC": 12, + "contestType": "CUTE" + }, + { + "name": "MOVE_VOLT_TACKLE", + "effect": "MOVE_EFFECT_VOLT_TACKLE", + "class": "CLASS_PHYSICAL", + "power": 120, + "type": "TYPE_ELECTRIC", + "accuracy": 100, + "pp": 15, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 179, + "unkC": 22, + "contestType": "COOL" + }, + { + "name": "MOVE_MAGICAL_LEAF", + "effect": "MOVE_EFFECT_ALWAYS_HIT", + "class": "CLASS_SPECIAL", + "power": 60, + "type": "TYPE_GRASS", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 17, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_WATER_SPORT", + "effect": "MOVE_EFFECT_WATER_SPORT", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_WATER", + "accuracy": 0, + "pp": 15, + "effectChance": 0, + "unk8": 64, + "priority": 0, + "unkB": 0, + "unkC": 13, + "contestType": "CUTE" + }, + { + "name": "MOVE_CALM_MIND", + "effect": "MOVE_EFFECT_SPATK_SPDEF_UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 8, + "unkC": 11, + "contestType": "SMART" + }, + { + "name": "MOVE_LEAF_BLADE", + "effect": "MOVE_EFFECT_HIGH_CRIT", + "class": "CLASS_PHYSICAL", + "power": 90, + "type": "TYPE_GRASS", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 17, + "contestType": "COOL" + }, + { + "name": "MOVE_DRAGON_DANCE", + "effect": "MOVE_EFFECT_ATTACK_SPEED_UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_DRAGON", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 8, + "unkC": 11, + "contestType": "COOL" + }, + { + "name": "MOVE_ROCK_BLAST", + "effect": "MOVE_EFFECT_MULTIHIT_2_5", + "class": "CLASS_PHYSICAL", + "power": 25, + "type": "TYPE_ROCK", + "accuracy": 80, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 7, + "contestType": "TOUGH" + }, + { + "name": "MOVE_SHOCK_WAVE", + "effect": "MOVE_EFFECT_ALWAYS_HIT", + "class": "CLASS_SPECIAL", + "power": 60, + "type": "TYPE_ELECTRIC", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 17, + "contestType": "COOL" + }, + { + "name": "MOVE_WATER_PULSE", + "effect": "MOVE_EFFECT_CONFUSE_HIT", + "class": "CLASS_SPECIAL", + "power": 60, + "type": "TYPE_WATER", + "accuracy": 100, + "pp": 20, + "effectChance": 20, + "unk8": 0, + "priority": 0, + "unkB": 178, + "unkC": 17, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_DOOM_DESIRE", + "effect": "MOVE_EFFECT_HIT_LATER", + "class": "CLASS_SPECIAL", + "power": 120, + "type": "TYPE_STEEL", + "accuracy": 85, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 128, + "unkC": 17, + "contestType": "COOL" + }, + { + "name": "MOVE_PSYCHO_BOOST", + "effect": "MOVE_EFFECT_HIT_USER_SPATK_2_DOWN", + "class": "CLASS_SPECIAL", + "power": 140, + "type": "TYPE_PSYCHIC", + "accuracy": 90, + "pp": 5, + "effectChance": 100, + "unk8": 0, + "priority": 0, + "unkB": 178, + "unkC": 22, + "contestType": "SMART" + }, + { + "name": "MOVE_ROOST", + "effect": "MOVE_EFFECT_ROOST", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_FLYING", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 8, + "contestType": "COOL" + }, + { + "name": "MOVE_GRAVITY", + "effect": "MOVE_EFFECT_GRAVITY", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 5, + "effectChance": 0, + "unk8": 64, + "priority": 0, + "unkB": 0, + "unkC": 13, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_MIRACLE_EYE", + "effect": "MOVE_EFFECT_MIRACLE_EYE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 40, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 20, + "contestType": "CUTE" + }, + { + "name": "MOVE_WAKE_UP_SLAP", + "effect": "MOVE_EFFECT_WAKE_UP_SLAP", + "class": "CLASS_PHYSICAL", + "power": 60, + "type": "TYPE_FIGHTING", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 16, + "contestType": "SMART" + }, + { + "name": "MOVE_HAMMER_ARM", + "effect": "MOVE_EFFECT_HAMMER_ARM", + "class": "CLASS_PHYSICAL", + "power": 100, + "type": "TYPE_FIGHTING", + "accuracy": 90, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 2, + "contestType": "COOL" + }, + { + "name": "MOVE_GYRO_BALL", + "effect": "MOVE_EFFECT_GYRO_BALL", + "class": "CLASS_PHYSICAL", + "power": 1, + "type": "TYPE_STEEL", + "accuracy": 100, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 15, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_HEALING_WISH", + "effect": "MOVE_EFFECT_HEALING_WISH", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 0, + "unkC": 8, + "contestType": "CUTE" + }, + { + "name": "MOVE_BRINE", + "effect": "MOVE_EFFECT_BRINE", + "class": "CLASS_SPECIAL", + "power": 65, + "type": "TYPE_WATER", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 4, + "contestType": "SMART" + }, + { + "name": "MOVE_NATURAL_GIFT", + "effect": "MOVE_EFFECT_NATURAL_GIFT", + "class": "CLASS_PHYSICAL", + "power": 1, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 82, + "unkC": 18, + "contestType": "COOL" + }, + { + "name": "MOVE_FEINT", + "effect": "MOVE_EFFECT_FEINT", + "class": "CLASS_PHYSICAL", + "power": 50, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 2, + "unkB": 0, + "unkC": 16, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_PLUCK", + "effect": "MOVE_EFFECT_BUG_BITE", + "class": "CLASS_PHYSICAL", + "power": 60, + "type": "TYPE_FLYING", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 12, + "contestType": "CUTE" + }, + { + "name": "MOVE_TAILWIND", + "effect": "MOVE_EFFECT_TAILWIND", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_FLYING", + "accuracy": 0, + "pp": 30, + "effectChance": 0, + "unk8": 32, + "priority": 0, + "unkB": 8, + "unkC": 1, + "contestType": "SMART" + }, + { + "name": "MOVE_ACUPRESSURE", + "effect": "MOVE_EFFECT_ACUPRESSURE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 30, + "effectChance": 0, + "unk8": 512, + "priority": 0, + "unkB": 72, + "unkC": 11, + "contestType": "COOL" + }, + { + "name": "MOVE_METAL_BURST", + "effect": "MOVE_EFFECT_METAL_BURST", + "class": "CLASS_PHYSICAL", + "power": 1, + "type": "TYPE_STEEL", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 1, + "priority": 0, + "unkB": 16, + "unkC": 15, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_U_TURN", + "effect": "MOVE_EFFECT_U_TURN", + "class": "CLASS_PHYSICAL", + "power": 70, + "type": "TYPE_BUG", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 16, + "contestType": "CUTE" + }, + { + "name": "MOVE_CLOSE_COMBAT", + "effect": "MOVE_EFFECT_CLOSE_COMBAT", + "class": "CLASS_PHYSICAL", + "power": 120, + "type": "TYPE_FIGHTING", + "accuracy": 100, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 179, + "unkC": 22, + "contestType": "SMART" + }, + { + "name": "MOVE_PAYBACK", + "effect": "MOVE_EFFECT_PAYBACK", + "class": "CLASS_PHYSICAL", + "power": 50, + "type": "TYPE_DARK", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 6, + "contestType": "COOL" + }, + { + "name": "MOVE_ASSURANCE", + "effect": "MOVE_EFFECT_ASSURANCE", + "class": "CLASS_PHYSICAL", + "power": 50, + "type": "TYPE_DARK", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 15, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_EMBARGO", + "effect": "MOVE_EFFECT_EMBARGO", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_DARK", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 13, + "contestType": "CUTE" + }, + { + "name": "MOVE_FLING", + "effect": "MOVE_EFFECT_FLING", + "class": "CLASS_PHYSICAL", + "power": 1, + "type": "TYPE_DARK", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 23, + "contestType": "TOUGH" + }, + { + "name": "MOVE_PSYCHO_SHIFT", + "effect": "MOVE_EFFECT_PSYCHO_SHIFT", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 90, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 16, + "contestType": "COOL" + }, + { + "name": "MOVE_TRUMP_CARD", + "effect": "MOVE_EFFECT_TRUMP_CARD", + "class": "CLASS_SPECIAL", + "power": 1, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 21, + "contestType": "COOL" + }, + { + "name": "MOVE_HEAL_BLOCK", + "effect": "MOVE_EFFECT_HEAL_BLOCK", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 4, + "priority": 0, + "unkB": 18, + "unkC": 13, + "contestType": "CUTE" + }, + { + "name": "MOVE_WRING_OUT", + "effect": "MOVE_EFFECT_CRUSH_GRIP", + "class": "CLASS_SPECIAL", + "power": 1, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 22, + "contestType": "SMART" + }, + { + "name": "MOVE_POWER_TRICK", + "effect": "MOVE_EFFECT_POWER_TRICK", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 64, + "unkC": 16, + "contestType": "COOL" + }, + { + "name": "MOVE_GASTRO_ACID", + "effect": "MOVE_EFFECT_GASTRO_ACID", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_POISON", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 13, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_LUCKY_CHANT", + "effect": "MOVE_EFFECT_LUCKY_CHANT", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 30, + "effectChance": 0, + "unk8": 32, + "priority": 0, + "unkB": 64, + "unkC": 13, + "contestType": "CUTE" + }, + { + "name": "MOVE_ME_FIRST", + "effect": "MOVE_EFFECT_ME_FIRST", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 1024, + "priority": 0, + "unkB": 2, + "unkC": 1, + "contestType": "CUTE" + }, + { + "name": "MOVE_COPYCAT", + "effect": "MOVE_EFFECT_COPYCAT", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 1, + "priority": 0, + "unkB": 0, + "unkC": 12, + "contestType": "COOL" + }, + { + "name": "MOVE_POWER_SWAP", + "effect": "MOVE_EFFECT_POWER_SWAP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 16, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_GUARD_SWAP", + "effect": "MOVE_EFFECT_GUARD_SWAP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 16, + "contestType": "CUTE" + }, + { + "name": "MOVE_PUNISHMENT", + "effect": "MOVE_EFFECT_PUNISHMENT", + "class": "CLASS_PHYSICAL", + "power": 1, + "type": "TYPE_DARK", + "accuracy": 100, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 23, + "contestType": "SMART" + }, + { + "name": "MOVE_LAST_RESORT", + "effect": "MOVE_EFFECT_LAST_RESORT", + "class": "CLASS_PHYSICAL", + "power": 130, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 21, + "contestType": "CUTE" + }, + { + "name": "MOVE_WORRY_SEED", + "effect": "MOVE_EFFECT_WORRY_SEED", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_GRASS", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 22, + "unkC": 19, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_SUCKER_PUNCH", + "effect": "MOVE_EFFECT_SUCKER_PUNCH", + "class": "CLASS_PHYSICAL", + "power": 80, + "type": "TYPE_DARK", + "accuracy": 100, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 1, + "unkB": 115, + "unkC": 1, + "contestType": "SMART" + }, + { + "name": "MOVE_TOXIC_SPIKES", + "effect": "MOVE_EFFECT_TOXIC_SPIKES", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_POISON", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 128, + "priority": 0, + "unkB": 64, + "unkC": 13, + "contestType": "SMART" + }, + { + "name": "MOVE_HEART_SWAP", + "effect": "MOVE_EFFECT_HEART_SWAP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 16, + "contestType": "COOL" + }, + { + "name": "MOVE_AQUA_RING", + "effect": "MOVE_EFFECT_AQUA_RING", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_WATER", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 0, + "unkC": 8, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_MAGNET_RISE", + "effect": "MOVE_EFFECT_MAGNET_RISE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_ELECTRIC", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 0, + "unkC": 13, + "contestType": "CUTE" + }, + { + "name": "MOVE_FLARE_BLITZ", + "effect": "MOVE_EFFECT_FLARE_BLITZ", + "class": "CLASS_PHYSICAL", + "power": 120, + "type": "TYPE_FIRE", + "accuracy": 100, + "pp": 15, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 147, + "unkC": 22, + "contestType": "SMART" + }, + { + "name": "MOVE_FORCE_PALM", + "effect": "MOVE_EFFECT_PARALYZE_HIT", + "class": "CLASS_PHYSICAL", + "power": 60, + "type": "TYPE_FIGHTING", + "accuracy": 100, + "pp": 10, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 18, + "contestType": "COOL" + }, + { + "name": "MOVE_AURA_SPHERE", + "effect": "MOVE_EFFECT_ALWAYS_HIT", + "class": "CLASS_SPECIAL", + "power": 90, + "type": "TYPE_FIGHTING", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 178, + "unkC": 17, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_ROCK_POLISH", + "effect": "MOVE_EFFECT_SPEED_2UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_ROCK", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 8, + "unkC": 1, + "contestType": "TOUGH" + }, + { + "name": "MOVE_POISON_JAB", + "effect": "MOVE_EFFECT_POISON_HIT", + "class": "CLASS_PHYSICAL", + "power": 80, + "type": "TYPE_POISON", + "accuracy": 100, + "pp": 20, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 4, + "contestType": "SMART" + }, + { + "name": "MOVE_DARK_PULSE", + "effect": "MOVE_EFFECT_FLINCH_HIT", + "class": "CLASS_SPECIAL", + "power": 80, + "type": "TYPE_DARK", + "accuracy": 100, + "pp": 15, + "effectChance": 20, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 17, + "contestType": "COOL" + }, + { + "name": "MOVE_NIGHT_SLASH", + "effect": "MOVE_EFFECT_HIGH_CRIT", + "class": "CLASS_PHYSICAL", + "power": 70, + "type": "TYPE_DARK", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 5, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_AQUA_TAIL", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 90, + "type": "TYPE_WATER", + "accuracy": 90, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 5, + "contestType": "CUTE" + }, + { + "name": "MOVE_SEED_BOMB", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 80, + "type": "TYPE_GRASS", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 5, + "contestType": "SMART" + }, + { + "name": "MOVE_AIR_SLASH", + "effect": "MOVE_EFFECT_FLINCH_HIT", + "class": "CLASS_SPECIAL", + "power": 75, + "type": "TYPE_FLYING", + "accuracy": 95, + "pp": 20, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 17, + "contestType": "COOL" + }, + { + "name": "MOVE_X_SCISSOR", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 80, + "type": "TYPE_BUG", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 17, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_BUG_BUZZ", + "effect": "MOVE_EFFECT_SPDEF_DOWN_HIT", + "class": "CLASS_SPECIAL", + "power": 90, + "type": "TYPE_BUG", + "accuracy": 100, + "pp": 10, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 4, + "contestType": "CUTE" + }, + { + "name": "MOVE_DRAGON_PULSE", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_SPECIAL", + "power": 90, + "type": "TYPE_DRAGON", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 4, + "contestType": "SMART" + }, + { + "name": "MOVE_DRAGON_RUSH", + "effect": "MOVE_EFFECT_FLINCH_HIT", + "class": "CLASS_PHYSICAL", + "power": 100, + "type": "TYPE_DRAGON", + "accuracy": 75, + "pp": 10, + "effectChance": 20, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 18, + "contestType": "COOL" + }, + { + "name": "MOVE_POWER_GEM", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_SPECIAL", + "power": 70, + "type": "TYPE_ROCK", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 5, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_DRAIN_PUNCH", + "effect": "MOVE_EFFECT_DRAIN_HP", + "class": "CLASS_PHYSICAL", + "power": 60, + "type": "TYPE_FIGHTING", + "accuracy": 100, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 20, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_VACUUM_WAVE", + "effect": "MOVE_EFFECT_PRIORITY_HIT", + "class": "CLASS_SPECIAL", + "power": 40, + "type": "TYPE_FIGHTING", + "accuracy": 100, + "pp": 30, + "effectChance": 0, + "unk8": 0, + "priority": 1, + "unkB": 50, + "unkC": 1, + "contestType": "SMART" + }, + { + "name": "MOVE_FOCUS_BLAST", + "effect": "MOVE_EFFECT_SPDEF_DOWN_HIT", + "class": "CLASS_SPECIAL", + "power": 120, + "type": "TYPE_FIGHTING", + "accuracy": 70, + "pp": 5, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 146, + "unkC": 17, + "contestType": "COOL" + }, + { + "name": "MOVE_ENERGY_BALL", + "effect": "MOVE_EFFECT_SPDEF_DOWN_HIT", + "class": "CLASS_SPECIAL", + "power": 80, + "type": "TYPE_GRASS", + "accuracy": 100, + "pp": 10, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 17, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_BRAVE_BIRD", + "effect": "MOVE_EFFECT_RECOIL_HIT_HARD", + "class": "CLASS_PHYSICAL", + "power": 120, + "type": "TYPE_FLYING", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 179, + "unkC": 18, + "contestType": "CUTE" + }, + { + "name": "MOVE_EARTH_POWER", + "effect": "MOVE_EFFECT_SPDEF_DOWN_HIT", + "class": "CLASS_SPECIAL", + "power": 90, + "type": "TYPE_GROUND", + "accuracy": 100, + "pp": 10, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 18, + "contestType": "SMART" + }, + { + "name": "MOVE_SWITCHEROO", + "effect": "MOVE_EFFECT_SWAP_ITEMS", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_DARK", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 12, + "contestType": "COOL" + }, + { + "name": "MOVE_GIGA_IMPACT", + "effect": "MOVE_EFFECT_HIT_RECHARGE", + "class": "CLASS_PHYSICAL", + "power": 150, + "type": "TYPE_NORMAL", + "accuracy": 90, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 179, + "unkC": 22, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_NASTY_PLOT", + "effect": "MOVE_EFFECT_SPATK_2UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_DARK", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 72, + "unkC": 11, + "contestType": "CUTE" + }, + { + "name": "MOVE_BULLET_PUNCH", + "effect": "MOVE_EFFECT_PRIORITY_HIT", + "class": "CLASS_PHYSICAL", + "power": 40, + "type": "TYPE_STEEL", + "accuracy": 100, + "pp": 30, + "effectChance": 0, + "unk8": 0, + "priority": 1, + "unkB": 115, + "unkC": 1, + "contestType": "SMART" + }, + { + "name": "MOVE_AVALANCHE", + "effect": "MOVE_EFFECT_REVENGE", + "class": "CLASS_PHYSICAL", + "power": 60, + "type": "TYPE_ICE", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": -4, + "unkB": 51, + "unkC": 15, + "contestType": "COOL" + }, + { + "name": "MOVE_ICE_SHARD", + "effect": "MOVE_EFFECT_PRIORITY_HIT", + "class": "CLASS_PHYSICAL", + "power": 40, + "type": "TYPE_ICE", + "accuracy": 100, + "pp": 30, + "effectChance": 0, + "unk8": 0, + "priority": 1, + "unkB": 50, + "unkC": 1, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_SHADOW_CLAW", + "effect": "MOVE_EFFECT_HIGH_CRIT", + "class": "CLASS_PHYSICAL", + "power": 70, + "type": "TYPE_GHOST", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 17, + "contestType": "CUTE" + }, + { + "name": "MOVE_THUNDER_FANG", + "effect": "MOVE_EFFECT_THUNDER_FANG", + "class": "CLASS_PHYSICAL", + "power": 65, + "type": "TYPE_ELECTRIC", + "accuracy": 95, + "pp": 15, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 5, + "contestType": "SMART" + }, + { + "name": "MOVE_ICE_FANG", + "effect": "MOVE_EFFECT_ICE_FANG", + "class": "CLASS_PHYSICAL", + "power": 65, + "type": "TYPE_ICE", + "accuracy": 95, + "pp": 15, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_FIRE_FANG", + "effect": "MOVE_EFFECT_FIRE_FANG", + "class": "CLASS_PHYSICAL", + "power": 65, + "type": "TYPE_FIRE", + "accuracy": 95, + "pp": 15, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 5, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_SHADOW_SNEAK", + "effect": "MOVE_EFFECT_PRIORITY_HIT", + "class": "CLASS_PHYSICAL", + "power": 40, + "type": "TYPE_GHOST", + "accuracy": 100, + "pp": 30, + "effectChance": 0, + "unk8": 0, + "priority": 1, + "unkB": 51, + "unkC": 1, + "contestType": "SMART" + }, + { + "name": "MOVE_MUD_BOMB", + "effect": "MOVE_EFFECT_ACCURACY_DOWN_HIT", + "class": "CLASS_SPECIAL", + "power": 65, + "type": "TYPE_GROUND", + "accuracy": 85, + "pp": 10, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 18, + "contestType": "SMART" + }, + { + "name": "MOVE_PSYCHO_CUT", + "effect": "MOVE_EFFECT_HIGH_CRIT", + "class": "CLASS_PHYSICAL", + "power": 70, + "type": "TYPE_PSYCHIC", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 17, + "contestType": "COOL" + }, + { + "name": "MOVE_ZEN_HEADBUTT", + "effect": "MOVE_EFFECT_FLINCH_HIT", + "class": "CLASS_PHYSICAL", + "power": 80, + "type": "TYPE_PSYCHIC", + "accuracy": 90, + "pp": 15, + "effectChance": 20, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 18, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_MIRROR_SHOT", + "effect": "MOVE_EFFECT_ACCURACY_DOWN_HIT", + "class": "CLASS_SPECIAL", + "power": 65, + "type": "TYPE_STEEL", + "accuracy": 85, + "pp": 10, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 17, + "contestType": "CUTE" + }, + { + "name": "MOVE_FLASH_CANNON", + "effect": "MOVE_EFFECT_SPDEF_DOWN_HIT", + "class": "CLASS_SPECIAL", + "power": 80, + "type": "TYPE_STEEL", + "accuracy": 100, + "pp": 10, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 17, + "contestType": "SMART" + }, + { + "name": "MOVE_ROCK_CLIMB", + "effect": "MOVE_EFFECT_CONFUSE_HIT", + "class": "CLASS_PHYSICAL", + "power": 90, + "type": "TYPE_NORMAL", + "accuracy": 85, + "pp": 20, + "effectChance": 20, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 18, + "contestType": "COOL" + }, + { + "name": "MOVE_DEFOG", + "effect": "MOVE_EFFECT_DEFOG", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_FLYING", + "accuracy": 0, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 18, + "unkC": 13, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_TRICK_ROOM", + "effect": "MOVE_EFFECT_TRICK_ROOM", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 5, + "effectChance": 0, + "unk8": 64, + "priority": -7, + "unkB": 16, + "unkC": 14, + "contestType": "CUTE" + }, + { + "name": "MOVE_DRACO_METEOR", + "effect": "MOVE_EFFECT_HIT_USER_SPATK_2_DOWN", + "class": "CLASS_SPECIAL", + "power": 140, + "type": "TYPE_DRAGON", + "accuracy": 90, + "pp": 5, + "effectChance": 100, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 22, + "contestType": "SMART" + }, + { + "name": "MOVE_DISCHARGE", + "effect": "MOVE_EFFECT_PARALYZE_HIT", + "class": "CLASS_SPECIAL", + "power": 80, + "type": "TYPE_ELECTRIC", + "accuracy": 100, + "pp": 15, + "effectChance": 30, + "unk8": 8, + "priority": 0, + "unkB": 50, + "unkC": 17, + "contestType": "COOL" + }, + { + "name": "MOVE_LAVA_PLUME", + "effect": "MOVE_EFFECT_BURN_HIT", + "class": "CLASS_SPECIAL", + "power": 80, + "type": "TYPE_FIRE", + "accuracy": 100, + "pp": 15, + "effectChance": 30, + "unk8": 8, + "priority": 0, + "unkB": 50, + "unkC": 17, + "contestType": "TOUGH" + }, + { + "name": "MOVE_LEAF_STORM", + "effect": "MOVE_EFFECT_HIT_USER_SPATK_2_DOWN", + "class": "CLASS_SPECIAL", + "power": 140, + "type": "TYPE_GRASS", + "accuracy": 90, + "pp": 5, + "effectChance": 100, + "unk8": 0, + "priority": 0, + "unkB": 178, + "unkC": 22, + "contestType": "CUTE" + }, + { + "name": "MOVE_POWER_WHIP", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_PHYSICAL", + "power": 120, + "type": "TYPE_GRASS", + "accuracy": 85, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 179, + "unkC": 5, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_ROCK_WRECKER", + "effect": "MOVE_EFFECT_HIT_RECHARGE", + "class": "CLASS_PHYSICAL", + "power": 150, + "type": "TYPE_ROCK", + "accuracy": 90, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 178, + "unkC": 22, + "contestType": "TOUGH" + }, + { + "name": "MOVE_CROSS_POISON", + "effect": "MOVE_EFFECT_POISON_HIT_HIGH_CRIT", + "class": "CLASS_PHYSICAL", + "power": 70, + "type": "TYPE_POISON", + "accuracy": 100, + "pp": 20, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_GUNK_SHOT", + "effect": "MOVE_EFFECT_POISON_HIT", + "class": "CLASS_PHYSICAL", + "power": 120, + "type": "TYPE_POISON", + "accuracy": 70, + "pp": 5, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 178, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_IRON_HEAD", + "effect": "MOVE_EFFECT_FLINCH_HIT", + "class": "CLASS_PHYSICAL", + "power": 80, + "type": "TYPE_STEEL", + "accuracy": 100, + "pp": 15, + "effectChance": 30, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 18, + "contestType": "TOUGH" + }, + { + "name": "MOVE_MAGNET_BOMB", + "effect": "MOVE_EFFECT_ALWAYS_HIT", + "class": "CLASS_PHYSICAL", + "power": 60, + "type": "TYPE_STEEL", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 5, + "contestType": "COOL" + }, + { + "name": "MOVE_STONE_EDGE", + "effect": "MOVE_EFFECT_HIGH_CRIT", + "class": "CLASS_PHYSICAL", + "power": 100, + "type": "TYPE_ROCK", + "accuracy": 80, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 4, + "contestType": "TOUGH" + }, + { + "name": "MOVE_CAPTIVATE", + "effect": "MOVE_EFFECT_CAPTIVATE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 4, + "priority": 0, + "unkB": 86, + "unkC": 19, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_STEALTH_ROCK", + "effect": "MOVE_EFFECT_STEALTH_ROCK", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_ROCK", + "accuracy": 0, + "pp": 20, + "effectChance": 0, + "unk8": 128, + "priority": 0, + "unkB": 0, + "unkC": 13, + "contestType": "COOL" + }, + { + "name": "MOVE_GRASS_KNOT", + "effect": "MOVE_EFFECT_STRONGER_HEAVIER", + "class": "CLASS_SPECIAL", + "power": 1, + "type": "TYPE_GRASS", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 4, + "contestType": "SMART" + }, + { + "name": "MOVE_CHATTER", + "effect": "MOVE_EFFECT_CHATTER", + "class": "CLASS_SPECIAL", + "power": 60, + "type": "TYPE_FLYING", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 66, + "unkC": 23, + "contestType": "SMART" + }, + { + "name": "MOVE_JUDGMENT", + "effect": "MOVE_EFFECT_JUDGMENT", + "class": "CLASS_SPECIAL", + "power": 100, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 14, + "contestType": "SMART" + }, + { + "name": "MOVE_BUG_BITE", + "effect": "MOVE_EFFECT_BUG_BITE", + "class": "CLASS_PHYSICAL", + "power": 60, + "type": "TYPE_BUG", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 115, + "unkC": 12, + "contestType": "TOUGH" + }, + { + "name": "MOVE_CHARGE_BEAM", + "effect": "MOVE_EFFECT_CHARGE_BEAM", + "class": "CLASS_SPECIAL", + "power": 50, + "type": "TYPE_ELECTRIC", + "accuracy": 90, + "pp": 10, + "effectChance": 70, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 17, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_WOOD_HAMMER", + "effect": "MOVE_EFFECT_RECOIL_HIT_HARD", + "class": "CLASS_PHYSICAL", + "power": 120, + "type": "TYPE_GRASS", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 18, + "contestType": "TOUGH" + }, + { + "name": "MOVE_AQUA_JET", + "effect": "MOVE_EFFECT_PRIORITY_HIT", + "class": "CLASS_PHYSICAL", + "power": 40, + "type": "TYPE_WATER", + "accuracy": 100, + "pp": 20, + "effectChance": 0, + "unk8": 0, + "priority": 1, + "unkB": 51, + "unkC": 1, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_ATTACK_ORDER", + "effect": "MOVE_EFFECT_HIGH_CRIT", + "class": "CLASS_PHYSICAL", + "power": 90, + "type": "TYPE_BUG", + "accuracy": 100, + "pp": 15, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 4, + "contestType": "SMART" + }, + { + "name": "MOVE_DEFEND_ORDER", + "effect": "MOVE_EFFECT_DEFENSE_SPDEF_UP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_BUG", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 8, + "unkC": 11, + "contestType": "SMART" + }, + { + "name": "MOVE_HEAL_ORDER", + "effect": "MOVE_EFFECT_RESTORE_HP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_BUG", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 8, + "unkC": 8, + "contestType": "SMART" + }, + { + "name": "MOVE_HEAD_SMASH", + "effect": "MOVE_EFFECT_HEAD_SMASH", + "class": "CLASS_PHYSICAL", + "power": 150, + "type": "TYPE_ROCK", + "accuracy": 80, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 179, + "unkC": 22, + "contestType": "TOUGH" + }, + { + "name": "MOVE_DOUBLE_HIT", + "effect": "MOVE_EFFECT_DOUBLE_HIT", + "class": "CLASS_PHYSICAL", + "power": 35, + "type": "TYPE_NORMAL", + "accuracy": 90, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 7, + "contestType": "SMART" + }, + { + "name": "MOVE_ROAR_OF_TIME", + "effect": "MOVE_EFFECT_HIT_RECHARGE", + "class": "CLASS_SPECIAL", + "power": 150, + "type": "TYPE_DRAGON", + "accuracy": 90, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 22, + "contestType": "COOL" + }, + { + "name": "MOVE_SPACIAL_REND", + "effect": "MOVE_EFFECT_HIGH_CRIT", + "class": "CLASS_SPECIAL", + "power": 100, + "type": "TYPE_DRAGON", + "accuracy": 95, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 178, + "unkC": 4, + "contestType": "TOUGH" + }, + { + "name": "MOVE_LUNAR_DANCE", + "effect": "MOVE_EFFECT_LUNAR_DANCE", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_PSYCHIC", + "accuracy": 0, + "pp": 10, + "effectChance": 0, + "unk8": 16, + "priority": 0, + "unkB": 128, + "unkC": 8, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_CRUSH_GRIP", + "effect": "MOVE_EFFECT_CRUSH_GRIP", + "class": "CLASS_PHYSICAL", + "power": 1, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 51, + "unkC": 15, + "contestType": "TOUGH" + }, + { + "name": "MOVE_MAGMA_STORM", + "effect": "MOVE_EFFECT_TRAP_HIT", + "class": "CLASS_SPECIAL", + "power": 120, + "type": "TYPE_FIRE", + "accuracy": 70, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 178, + "unkC": 7, + "contestType": "TOUGH" + }, + { + "name": "MOVE_DARK_VOID", + "effect": "MOVE_EFFECT_SLEEP", + "class": "CLASS_STATUS", + "power": 0, + "type": "TYPE_DARK", + "accuracy": 80, + "pp": 10, + "effectChance": 0, + "unk8": 4, + "priority": 0, + "unkB": 150, + "unkC": 19, + "contestType": "SMART" + }, + { + "name": "MOVE_SEED_FLARE", + "effect": "MOVE_EFFECT_SEED_FLARE", + "class": "CLASS_SPECIAL", + "power": 120, + "type": "TYPE_GRASS", + "accuracy": 85, + "pp": 5, + "effectChance": 40, + "unk8": 0, + "priority": 0, + "unkB": 178, + "unkC": 22, + "contestType": "COOL" + }, + { + "name": "MOVE_OMINOUS_WIND", + "effect": "MOVE_EFFECT_STATS_UP_HIT", + "class": "CLASS_SPECIAL", + "power": 60, + "type": "TYPE_GHOST", + "accuracy": 100, + "pp": 5, + "effectChance": 10, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 11, + "contestType": "SMART" + }, + { + "name": "MOVE_SHADOW_FORCE", + "effect": "MOVE_EFFECT_SHADOW_FORCE", + "class": "CLASS_PHYSICAL", + "power": 120, + "type": "TYPE_GHOST", + "accuracy": 100, + "pp": 5, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 49, + "unkC": 22, + "contestType": "SMART" + }, + { + "name": "MOVE_468", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_SPECIAL", + "power": 100, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 16, + "contestType": "BEAUTY" + }, + { + "name": "MOVE_469", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_SPECIAL", + "power": 100, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 17, + "contestType": "CUTE" + }, + { + "name": "MOVE_470", + "effect": "MOVE_EFFECT_NORMAL_HIT", + "class": "CLASS_SPECIAL", + "power": 100, + "type": "TYPE_NORMAL", + "accuracy": 100, + "pp": 10, + "effectChance": 0, + "unk8": 0, + "priority": 0, + "unkB": 50, + "unkC": 18, + "contestType": "SMART" + } + ] +} diff --git a/files/poketool/waza/waza_tbl.json.txt b/files/poketool/waza/waza_tbl.json.txt new file mode 100644 index 00000000..f0d4cbab --- /dev/null +++ b/files/poketool/waza/waza_tbl.json.txt @@ -0,0 +1,29 @@ +{{ doNotModifyHeader }} + +#include "global.h" +#include "constants/moves.h" +#include "constants/battle.h" +#include "constants/pokemon.h" +#include "move_data.h" + +u32 __size = sizeof(struct WazaTbl); + +const struct WazaTbl __data[] = { +## for move in waza_tbl + // {{ move.name }} + { + {{ move.effect }}, + {{ move.class }}, + {{ move.power }}, + {{ move.type }}, + {{ move.accuracy }}, + {{ move.pp }}, + {{ move.effectChance }}, + {{ move.unk8 }}, + {{ move.priority }}, + {{ move.unkB }}, + {{ move.unkC }}, + {{ move.contestType }} + }, +## endfor +}; diff --git a/files/poketool/waza/waza_tbl/.knarcignore b/files/poketool/waza/waza_tbl/.knarcignore deleted file mode 100644 index 2856080a..00000000 --- a/files/poketool/waza/waza_tbl/.knarcignore +++ /dev/null @@ -1,2 +0,0 @@ -*.png -*.pal diff --git a/files/poketool/waza/waza_tbl/narc_0000.bin b/files/poketool/waza/waza_tbl/narc_0000.bin Binary files differdeleted file mode 100644 index 01d633b2..00000000 --- a/files/poketool/waza/waza_tbl/narc_0000.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0001.bin b/files/poketool/waza/waza_tbl/narc_0001.bin Binary files differdeleted file mode 100644 index 00f7c5a4..00000000 --- a/files/poketool/waza/waza_tbl/narc_0001.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0002.bin b/files/poketool/waza/waza_tbl/narc_0002.bin Binary files differdeleted file mode 100644 index 9571fba6..00000000 --- a/files/poketool/waza/waza_tbl/narc_0002.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0003.bin b/files/poketool/waza/waza_tbl/narc_0003.bin Binary files differdeleted file mode 100644 index 7cd7c8cd..00000000 --- a/files/poketool/waza/waza_tbl/narc_0003.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0004.bin b/files/poketool/waza/waza_tbl/narc_0004.bin Binary files differdeleted file mode 100644 index d69d603c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0004.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0005.bin b/files/poketool/waza/waza_tbl/narc_0005.bin Binary files differdeleted file mode 100644 index 3380b26e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0005.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0006.bin b/files/poketool/waza/waza_tbl/narc_0006.bin Binary files differdeleted file mode 100644 index 4d229b82..00000000 --- a/files/poketool/waza/waza_tbl/narc_0006.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0007.bin b/files/poketool/waza/waza_tbl/narc_0007.bin Binary files differdeleted file mode 100644 index fb96fac6..00000000 --- a/files/poketool/waza/waza_tbl/narc_0007.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0008.bin b/files/poketool/waza/waza_tbl/narc_0008.bin Binary files differdeleted file mode 100644 index 785f3d79..00000000 --- a/files/poketool/waza/waza_tbl/narc_0008.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0009.bin b/files/poketool/waza/waza_tbl/narc_0009.bin Binary files differdeleted file mode 100644 index c7f88c16..00000000 --- a/files/poketool/waza/waza_tbl/narc_0009.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0010.bin b/files/poketool/waza/waza_tbl/narc_0010.bin Binary files differdeleted file mode 100644 index 00f7c5a4..00000000 --- a/files/poketool/waza/waza_tbl/narc_0010.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0011.bin b/files/poketool/waza/waza_tbl/narc_0011.bin Binary files differdeleted file mode 100644 index effe0ed3..00000000 --- a/files/poketool/waza/waza_tbl/narc_0011.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0012.bin b/files/poketool/waza/waza_tbl/narc_0012.bin Binary files differdeleted file mode 100644 index 7f5b9118..00000000 --- a/files/poketool/waza/waza_tbl/narc_0012.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0013.bin b/files/poketool/waza/waza_tbl/narc_0013.bin Binary files differdeleted file mode 100644 index 07e7bc39..00000000 --- a/files/poketool/waza/waza_tbl/narc_0013.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0014.bin b/files/poketool/waza/waza_tbl/narc_0014.bin Binary files differdeleted file mode 100644 index abf50359..00000000 --- a/files/poketool/waza/waza_tbl/narc_0014.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0015.bin b/files/poketool/waza/waza_tbl/narc_0015.bin Binary files differdeleted file mode 100644 index 6d3ffc41..00000000 --- a/files/poketool/waza/waza_tbl/narc_0015.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0016.bin b/files/poketool/waza/waza_tbl/narc_0016.bin Binary files differdeleted file mode 100644 index ec56197e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0016.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0017.bin b/files/poketool/waza/waza_tbl/narc_0017.bin Binary files differdeleted file mode 100644 index 4c68d4af..00000000 --- a/files/poketool/waza/waza_tbl/narc_0017.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0018.bin b/files/poketool/waza/waza_tbl/narc_0018.bin Binary files differdeleted file mode 100644 index cd3909d4..00000000 --- a/files/poketool/waza/waza_tbl/narc_0018.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0019.bin b/files/poketool/waza/waza_tbl/narc_0019.bin Binary files differdeleted file mode 100644 index 09447d86..00000000 --- a/files/poketool/waza/waza_tbl/narc_0019.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0020.bin b/files/poketool/waza/waza_tbl/narc_0020.bin Binary files differdeleted file mode 100644 index 2bf065df..00000000 --- a/files/poketool/waza/waza_tbl/narc_0020.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0021.bin b/files/poketool/waza/waza_tbl/narc_0021.bin Binary files differdeleted file mode 100644 index a0fbfe83..00000000 --- a/files/poketool/waza/waza_tbl/narc_0021.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0022.bin b/files/poketool/waza/waza_tbl/narc_0022.bin Binary files differdeleted file mode 100644 index 98394356..00000000 --- a/files/poketool/waza/waza_tbl/narc_0022.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0023.bin b/files/poketool/waza/waza_tbl/narc_0023.bin Binary files differdeleted file mode 100644 index 48c2c01d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0023.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0024.bin b/files/poketool/waza/waza_tbl/narc_0024.bin Binary files differdeleted file mode 100644 index 38c369ef..00000000 --- a/files/poketool/waza/waza_tbl/narc_0024.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0025.bin b/files/poketool/waza/waza_tbl/narc_0025.bin Binary files differdeleted file mode 100644 index 46a02a5d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0025.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0026.bin b/files/poketool/waza/waza_tbl/narc_0026.bin Binary files differdeleted file mode 100644 index c5cfd07c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0026.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0027.bin b/files/poketool/waza/waza_tbl/narc_0027.bin Binary files differdeleted file mode 100644 index ad8b53b7..00000000 --- a/files/poketool/waza/waza_tbl/narc_0027.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0028.bin b/files/poketool/waza/waza_tbl/narc_0028.bin Binary files differdeleted file mode 100644 index d448cc7c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0028.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0029.bin b/files/poketool/waza/waza_tbl/narc_0029.bin Binary files differdeleted file mode 100644 index b9415a2e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0029.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0030.bin b/files/poketool/waza/waza_tbl/narc_0030.bin Binary files differdeleted file mode 100644 index e4d6e535..00000000 --- a/files/poketool/waza/waza_tbl/narc_0030.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0031.bin b/files/poketool/waza/waza_tbl/narc_0031.bin Binary files differdeleted file mode 100644 index 8fdc7da9..00000000 --- a/files/poketool/waza/waza_tbl/narc_0031.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0032.bin b/files/poketool/waza/waza_tbl/narc_0032.bin Binary files differdeleted file mode 100644 index 7f5b9118..00000000 --- a/files/poketool/waza/waza_tbl/narc_0032.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0033.bin b/files/poketool/waza/waza_tbl/narc_0033.bin Binary files differdeleted file mode 100644 index 2d4c7c98..00000000 --- a/files/poketool/waza/waza_tbl/narc_0033.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0034.bin b/files/poketool/waza/waza_tbl/narc_0034.bin Binary files differdeleted file mode 100644 index ac75f579..00000000 --- a/files/poketool/waza/waza_tbl/narc_0034.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0035.bin b/files/poketool/waza/waza_tbl/narc_0035.bin Binary files differdeleted file mode 100644 index 0253c08d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0035.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0036.bin b/files/poketool/waza/waza_tbl/narc_0036.bin Binary files differdeleted file mode 100644 index 356d690c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0036.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0037.bin b/files/poketool/waza/waza_tbl/narc_0037.bin Binary files differdeleted file mode 100644 index 6df530d7..00000000 --- a/files/poketool/waza/waza_tbl/narc_0037.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0038.bin b/files/poketool/waza/waza_tbl/narc_0038.bin Binary files differdeleted file mode 100644 index c95b6b14..00000000 --- a/files/poketool/waza/waza_tbl/narc_0038.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0039.bin b/files/poketool/waza/waza_tbl/narc_0039.bin Binary files differdeleted file mode 100644 index 8f9df603..00000000 --- a/files/poketool/waza/waza_tbl/narc_0039.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0040.bin b/files/poketool/waza/waza_tbl/narc_0040.bin Binary files differdeleted file mode 100644 index 4110bdcb..00000000 --- a/files/poketool/waza/waza_tbl/narc_0040.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0041.bin b/files/poketool/waza/waza_tbl/narc_0041.bin Binary files differdeleted file mode 100644 index ace0b7f0..00000000 --- a/files/poketool/waza/waza_tbl/narc_0041.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0042.bin b/files/poketool/waza/waza_tbl/narc_0042.bin Binary files differdeleted file mode 100644 index f7004da9..00000000 --- a/files/poketool/waza/waza_tbl/narc_0042.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0043.bin b/files/poketool/waza/waza_tbl/narc_0043.bin Binary files differdeleted file mode 100644 index 5be0a1c1..00000000 --- a/files/poketool/waza/waza_tbl/narc_0043.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0044.bin b/files/poketool/waza/waza_tbl/narc_0044.bin Binary files differdeleted file mode 100644 index 1099129b..00000000 --- a/files/poketool/waza/waza_tbl/narc_0044.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0045.bin b/files/poketool/waza/waza_tbl/narc_0045.bin Binary files differdeleted file mode 100644 index 5a8deb28..00000000 --- a/files/poketool/waza/waza_tbl/narc_0045.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0046.bin b/files/poketool/waza/waza_tbl/narc_0046.bin Binary files differdeleted file mode 100644 index bb3b0057..00000000 --- a/files/poketool/waza/waza_tbl/narc_0046.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0047.bin b/files/poketool/waza/waza_tbl/narc_0047.bin Binary files differdeleted file mode 100644 index c1038f3c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0047.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0048.bin b/files/poketool/waza/waza_tbl/narc_0048.bin Binary files differdeleted file mode 100644 index a5b94925..00000000 --- a/files/poketool/waza/waza_tbl/narc_0048.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0049.bin b/files/poketool/waza/waza_tbl/narc_0049.bin Binary files differdeleted file mode 100644 index 7dc17118..00000000 --- a/files/poketool/waza/waza_tbl/narc_0049.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0050.bin b/files/poketool/waza/waza_tbl/narc_0050.bin Binary files differdeleted file mode 100644 index 21e57788..00000000 --- a/files/poketool/waza/waza_tbl/narc_0050.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0051.bin b/files/poketool/waza/waza_tbl/narc_0051.bin Binary files differdeleted file mode 100644 index 4bddd62c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0051.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0052.bin b/files/poketool/waza/waza_tbl/narc_0052.bin Binary files differdeleted file mode 100644 index 9061f188..00000000 --- a/files/poketool/waza/waza_tbl/narc_0052.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0053.bin b/files/poketool/waza/waza_tbl/narc_0053.bin Binary files differdeleted file mode 100644 index ea396f6d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0053.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0054.bin b/files/poketool/waza/waza_tbl/narc_0054.bin Binary files differdeleted file mode 100644 index 33bd4744..00000000 --- a/files/poketool/waza/waza_tbl/narc_0054.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0055.bin b/files/poketool/waza/waza_tbl/narc_0055.bin Binary files differdeleted file mode 100644 index e8db89f1..00000000 --- a/files/poketool/waza/waza_tbl/narc_0055.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0056.bin b/files/poketool/waza/waza_tbl/narc_0056.bin Binary files differdeleted file mode 100644 index ab7e9f8e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0056.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0057.bin b/files/poketool/waza/waza_tbl/narc_0057.bin Binary files differdeleted file mode 100644 index 7c7c4779..00000000 --- a/files/poketool/waza/waza_tbl/narc_0057.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0058.bin b/files/poketool/waza/waza_tbl/narc_0058.bin Binary files differdeleted file mode 100644 index dc6a335d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0058.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0059.bin b/files/poketool/waza/waza_tbl/narc_0059.bin Binary files differdeleted file mode 100644 index d998e084..00000000 --- a/files/poketool/waza/waza_tbl/narc_0059.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0060.bin b/files/poketool/waza/waza_tbl/narc_0060.bin Binary files differdeleted file mode 100644 index 94e34152..00000000 --- a/files/poketool/waza/waza_tbl/narc_0060.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0061.bin b/files/poketool/waza/waza_tbl/narc_0061.bin Binary files differdeleted file mode 100644 index a41578ad..00000000 --- a/files/poketool/waza/waza_tbl/narc_0061.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0062.bin b/files/poketool/waza/waza_tbl/narc_0062.bin Binary files differdeleted file mode 100644 index afb41b97..00000000 --- a/files/poketool/waza/waza_tbl/narc_0062.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0063.bin b/files/poketool/waza/waza_tbl/narc_0063.bin Binary files differdeleted file mode 100644 index c174035b..00000000 --- a/files/poketool/waza/waza_tbl/narc_0063.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0064.bin b/files/poketool/waza/waza_tbl/narc_0064.bin Binary files differdeleted file mode 100644 index 40288f47..00000000 --- a/files/poketool/waza/waza_tbl/narc_0064.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0065.bin b/files/poketool/waza/waza_tbl/narc_0065.bin Binary files differdeleted file mode 100644 index 813d3908..00000000 --- a/files/poketool/waza/waza_tbl/narc_0065.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0066.bin b/files/poketool/waza/waza_tbl/narc_0066.bin Binary files differdeleted file mode 100644 index 476fc540..00000000 --- a/files/poketool/waza/waza_tbl/narc_0066.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0067.bin b/files/poketool/waza/waza_tbl/narc_0067.bin Binary files differdeleted file mode 100644 index cd34aabf..00000000 --- a/files/poketool/waza/waza_tbl/narc_0067.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0068.bin b/files/poketool/waza/waza_tbl/narc_0068.bin Binary files differdeleted file mode 100644 index e09e934a..00000000 --- a/files/poketool/waza/waza_tbl/narc_0068.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0069.bin b/files/poketool/waza/waza_tbl/narc_0069.bin Binary files differdeleted file mode 100644 index 792e7c61..00000000 --- a/files/poketool/waza/waza_tbl/narc_0069.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0070.bin b/files/poketool/waza/waza_tbl/narc_0070.bin Binary files differdeleted file mode 100644 index 87ab1d07..00000000 --- a/files/poketool/waza/waza_tbl/narc_0070.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0071.bin b/files/poketool/waza/waza_tbl/narc_0071.bin Binary files differdeleted file mode 100644 index 17d753b8..00000000 --- a/files/poketool/waza/waza_tbl/narc_0071.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0072.bin b/files/poketool/waza/waza_tbl/narc_0072.bin Binary files differdeleted file mode 100644 index 9461f86e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0072.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0073.bin b/files/poketool/waza/waza_tbl/narc_0073.bin Binary files differdeleted file mode 100644 index 8ae31226..00000000 --- a/files/poketool/waza/waza_tbl/narc_0073.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0074.bin b/files/poketool/waza/waza_tbl/narc_0074.bin Binary files differdeleted file mode 100644 index d331d2af..00000000 --- a/files/poketool/waza/waza_tbl/narc_0074.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0075.bin b/files/poketool/waza/waza_tbl/narc_0075.bin Binary files differdeleted file mode 100644 index 3333636e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0075.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0076.bin b/files/poketool/waza/waza_tbl/narc_0076.bin Binary files differdeleted file mode 100644 index 54917cd2..00000000 --- a/files/poketool/waza/waza_tbl/narc_0076.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0077.bin b/files/poketool/waza/waza_tbl/narc_0077.bin Binary files differdeleted file mode 100644 index a022fd6e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0077.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0078.bin b/files/poketool/waza/waza_tbl/narc_0078.bin Binary files differdeleted file mode 100644 index 598c5d2c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0078.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0079.bin b/files/poketool/waza/waza_tbl/narc_0079.bin Binary files differdeleted file mode 100644 index 79b0d81e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0079.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0080.bin b/files/poketool/waza/waza_tbl/narc_0080.bin Binary files differdeleted file mode 100644 index 5fda4147..00000000 --- a/files/poketool/waza/waza_tbl/narc_0080.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0081.bin b/files/poketool/waza/waza_tbl/narc_0081.bin Binary files differdeleted file mode 100644 index 55dd4e64..00000000 --- a/files/poketool/waza/waza_tbl/narc_0081.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0082.bin b/files/poketool/waza/waza_tbl/narc_0082.bin Binary files differdeleted file mode 100644 index 1cc13208..00000000 --- a/files/poketool/waza/waza_tbl/narc_0082.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0083.bin b/files/poketool/waza/waza_tbl/narc_0083.bin Binary files differdeleted file mode 100644 index 57f648c8..00000000 --- a/files/poketool/waza/waza_tbl/narc_0083.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0084.bin b/files/poketool/waza/waza_tbl/narc_0084.bin Binary files differdeleted file mode 100644 index 6e2b71fc..00000000 --- a/files/poketool/waza/waza_tbl/narc_0084.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0085.bin b/files/poketool/waza/waza_tbl/narc_0085.bin Binary files differdeleted file mode 100644 index e582ccaf..00000000 --- a/files/poketool/waza/waza_tbl/narc_0085.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0086.bin b/files/poketool/waza/waza_tbl/narc_0086.bin Binary files differdeleted file mode 100644 index 5cd472e9..00000000 --- a/files/poketool/waza/waza_tbl/narc_0086.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0087.bin b/files/poketool/waza/waza_tbl/narc_0087.bin Binary files differdeleted file mode 100644 index 1a2af732..00000000 --- a/files/poketool/waza/waza_tbl/narc_0087.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0088.bin b/files/poketool/waza/waza_tbl/narc_0088.bin Binary files differdeleted file mode 100644 index 7dbf04c0..00000000 --- a/files/poketool/waza/waza_tbl/narc_0088.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0089.bin b/files/poketool/waza/waza_tbl/narc_0089.bin Binary files differdeleted file mode 100644 index f53c1c87..00000000 --- a/files/poketool/waza/waza_tbl/narc_0089.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0090.bin b/files/poketool/waza/waza_tbl/narc_0090.bin Binary files differdeleted file mode 100644 index 7dd4f347..00000000 --- a/files/poketool/waza/waza_tbl/narc_0090.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0091.bin b/files/poketool/waza/waza_tbl/narc_0091.bin Binary files differdeleted file mode 100644 index d7c60b83..00000000 --- a/files/poketool/waza/waza_tbl/narc_0091.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0092.bin b/files/poketool/waza/waza_tbl/narc_0092.bin Binary files differdeleted file mode 100644 index 17035b71..00000000 --- a/files/poketool/waza/waza_tbl/narc_0092.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0093.bin b/files/poketool/waza/waza_tbl/narc_0093.bin Binary files differdeleted file mode 100644 index 513ca736..00000000 --- a/files/poketool/waza/waza_tbl/narc_0093.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0094.bin b/files/poketool/waza/waza_tbl/narc_0094.bin Binary files differdeleted file mode 100644 index 8f25fa0c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0094.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0095.bin b/files/poketool/waza/waza_tbl/narc_0095.bin Binary files differdeleted file mode 100644 index 6b1c909f..00000000 --- a/files/poketool/waza/waza_tbl/narc_0095.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0096.bin b/files/poketool/waza/waza_tbl/narc_0096.bin Binary files differdeleted file mode 100644 index 78015e8a..00000000 --- a/files/poketool/waza/waza_tbl/narc_0096.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0097.bin b/files/poketool/waza/waza_tbl/narc_0097.bin Binary files differdeleted file mode 100644 index d6f9cef6..00000000 --- a/files/poketool/waza/waza_tbl/narc_0097.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0098.bin b/files/poketool/waza/waza_tbl/narc_0098.bin Binary files differdeleted file mode 100644 index 6ce2a437..00000000 --- a/files/poketool/waza/waza_tbl/narc_0098.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0099.bin b/files/poketool/waza/waza_tbl/narc_0099.bin Binary files differdeleted file mode 100644 index 50201a7d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0099.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0100.bin b/files/poketool/waza/waza_tbl/narc_0100.bin Binary files differdeleted file mode 100644 index 9cee8303..00000000 --- a/files/poketool/waza/waza_tbl/narc_0100.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0101.bin b/files/poketool/waza/waza_tbl/narc_0101.bin Binary files differdeleted file mode 100644 index dcfe666d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0101.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0102.bin b/files/poketool/waza/waza_tbl/narc_0102.bin Binary files differdeleted file mode 100644 index 6d3bcfcc..00000000 --- a/files/poketool/waza/waza_tbl/narc_0102.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0103.bin b/files/poketool/waza/waza_tbl/narc_0103.bin Binary files differdeleted file mode 100644 index 0224632e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0103.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0104.bin b/files/poketool/waza/waza_tbl/narc_0104.bin Binary files differdeleted file mode 100644 index 75184389..00000000 --- a/files/poketool/waza/waza_tbl/narc_0104.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0105.bin b/files/poketool/waza/waza_tbl/narc_0105.bin Binary files differdeleted file mode 100644 index 7ff727c8..00000000 --- a/files/poketool/waza/waza_tbl/narc_0105.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0106.bin b/files/poketool/waza/waza_tbl/narc_0106.bin Binary files differdeleted file mode 100644 index 85737625..00000000 --- a/files/poketool/waza/waza_tbl/narc_0106.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0107.bin b/files/poketool/waza/waza_tbl/narc_0107.bin Binary files differdeleted file mode 100644 index 8ae84ec0..00000000 --- a/files/poketool/waza/waza_tbl/narc_0107.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0108.bin b/files/poketool/waza/waza_tbl/narc_0108.bin Binary files differdeleted file mode 100644 index 97a4dada..00000000 --- a/files/poketool/waza/waza_tbl/narc_0108.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0109.bin b/files/poketool/waza/waza_tbl/narc_0109.bin Binary files differdeleted file mode 100644 index 5b5d8488..00000000 --- a/files/poketool/waza/waza_tbl/narc_0109.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0110.bin b/files/poketool/waza/waza_tbl/narc_0110.bin Binary files differdeleted file mode 100644 index edf1b8ed..00000000 --- a/files/poketool/waza/waza_tbl/narc_0110.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0111.bin b/files/poketool/waza/waza_tbl/narc_0111.bin Binary files differdeleted file mode 100644 index 96b94ae5..00000000 --- a/files/poketool/waza/waza_tbl/narc_0111.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0112.bin b/files/poketool/waza/waza_tbl/narc_0112.bin Binary files differdeleted file mode 100644 index c8e34e31..00000000 --- a/files/poketool/waza/waza_tbl/narc_0112.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0113.bin b/files/poketool/waza/waza_tbl/narc_0113.bin Binary files differdeleted file mode 100644 index 1f7aa012..00000000 --- a/files/poketool/waza/waza_tbl/narc_0113.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0114.bin b/files/poketool/waza/waza_tbl/narc_0114.bin Binary files differdeleted file mode 100644 index b8f3c27c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0114.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0115.bin b/files/poketool/waza/waza_tbl/narc_0115.bin Binary files differdeleted file mode 100644 index a881d883..00000000 --- a/files/poketool/waza/waza_tbl/narc_0115.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0116.bin b/files/poketool/waza/waza_tbl/narc_0116.bin Binary files differdeleted file mode 100644 index 2b2c17dd..00000000 --- a/files/poketool/waza/waza_tbl/narc_0116.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0117.bin b/files/poketool/waza/waza_tbl/narc_0117.bin Binary files differdeleted file mode 100644 index d83f7815..00000000 --- a/files/poketool/waza/waza_tbl/narc_0117.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0118.bin b/files/poketool/waza/waza_tbl/narc_0118.bin Binary files differdeleted file mode 100644 index b81cece8..00000000 --- a/files/poketool/waza/waza_tbl/narc_0118.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0119.bin b/files/poketool/waza/waza_tbl/narc_0119.bin Binary files differdeleted file mode 100644 index be75f205..00000000 --- a/files/poketool/waza/waza_tbl/narc_0119.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0120.bin b/files/poketool/waza/waza_tbl/narc_0120.bin Binary files differdeleted file mode 100644 index 2a614da0..00000000 --- a/files/poketool/waza/waza_tbl/narc_0120.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0121.bin b/files/poketool/waza/waza_tbl/narc_0121.bin Binary files differdeleted file mode 100644 index 0c268e6b..00000000 --- a/files/poketool/waza/waza_tbl/narc_0121.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0122.bin b/files/poketool/waza/waza_tbl/narc_0122.bin Binary files differdeleted file mode 100644 index 074976a6..00000000 --- a/files/poketool/waza/waza_tbl/narc_0122.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0123.bin b/files/poketool/waza/waza_tbl/narc_0123.bin Binary files differdeleted file mode 100644 index b4cfc123..00000000 --- a/files/poketool/waza/waza_tbl/narc_0123.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0124.bin b/files/poketool/waza/waza_tbl/narc_0124.bin Binary files differdeleted file mode 100644 index 3312f22b..00000000 --- a/files/poketool/waza/waza_tbl/narc_0124.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0125.bin b/files/poketool/waza/waza_tbl/narc_0125.bin Binary files differdeleted file mode 100644 index 88bbbbb1..00000000 --- a/files/poketool/waza/waza_tbl/narc_0125.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0126.bin b/files/poketool/waza/waza_tbl/narc_0126.bin Binary files differdeleted file mode 100644 index c581afd8..00000000 --- a/files/poketool/waza/waza_tbl/narc_0126.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0127.bin b/files/poketool/waza/waza_tbl/narc_0127.bin Binary files differdeleted file mode 100644 index 11aab21d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0127.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0128.bin b/files/poketool/waza/waza_tbl/narc_0128.bin Binary files differdeleted file mode 100644 index 55e273b3..00000000 --- a/files/poketool/waza/waza_tbl/narc_0128.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0129.bin b/files/poketool/waza/waza_tbl/narc_0129.bin Binary files differdeleted file mode 100644 index 51b7af5f..00000000 --- a/files/poketool/waza/waza_tbl/narc_0129.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0130.bin b/files/poketool/waza/waza_tbl/narc_0130.bin Binary files differdeleted file mode 100644 index e9da1a66..00000000 --- a/files/poketool/waza/waza_tbl/narc_0130.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0131.bin b/files/poketool/waza/waza_tbl/narc_0131.bin Binary files differdeleted file mode 100644 index e2678050..00000000 --- a/files/poketool/waza/waza_tbl/narc_0131.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0132.bin b/files/poketool/waza/waza_tbl/narc_0132.bin Binary files differdeleted file mode 100644 index d7a69fe6..00000000 --- a/files/poketool/waza/waza_tbl/narc_0132.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0133.bin b/files/poketool/waza/waza_tbl/narc_0133.bin Binary files differdeleted file mode 100644 index d4b51afe..00000000 --- a/files/poketool/waza/waza_tbl/narc_0133.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0134.bin b/files/poketool/waza/waza_tbl/narc_0134.bin Binary files differdeleted file mode 100644 index 5bffef12..00000000 --- a/files/poketool/waza/waza_tbl/narc_0134.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0135.bin b/files/poketool/waza/waza_tbl/narc_0135.bin Binary files differdeleted file mode 100644 index fe89e6b8..00000000 --- a/files/poketool/waza/waza_tbl/narc_0135.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0136.bin b/files/poketool/waza/waza_tbl/narc_0136.bin Binary files differdeleted file mode 100644 index 041d93cf..00000000 --- a/files/poketool/waza/waza_tbl/narc_0136.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0137.bin b/files/poketool/waza/waza_tbl/narc_0137.bin Binary files differdeleted file mode 100644 index e1df1ab4..00000000 --- a/files/poketool/waza/waza_tbl/narc_0137.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0138.bin b/files/poketool/waza/waza_tbl/narc_0138.bin Binary files differdeleted file mode 100644 index d3c3d94d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0138.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0139.bin b/files/poketool/waza/waza_tbl/narc_0139.bin Binary files differdeleted file mode 100644 index 0b3e203a..00000000 --- a/files/poketool/waza/waza_tbl/narc_0139.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0140.bin b/files/poketool/waza/waza_tbl/narc_0140.bin Binary files differdeleted file mode 100644 index 58aaaadc..00000000 --- a/files/poketool/waza/waza_tbl/narc_0140.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0141.bin b/files/poketool/waza/waza_tbl/narc_0141.bin Binary files differdeleted file mode 100644 index 200f38bb..00000000 --- a/files/poketool/waza/waza_tbl/narc_0141.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0142.bin b/files/poketool/waza/waza_tbl/narc_0142.bin Binary files differdeleted file mode 100644 index 7b3e08b6..00000000 --- a/files/poketool/waza/waza_tbl/narc_0142.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0143.bin b/files/poketool/waza/waza_tbl/narc_0143.bin Binary files differdeleted file mode 100644 index 4ddfedf6..00000000 --- a/files/poketool/waza/waza_tbl/narc_0143.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0144.bin b/files/poketool/waza/waza_tbl/narc_0144.bin Binary files differdeleted file mode 100644 index 5404cee2..00000000 --- a/files/poketool/waza/waza_tbl/narc_0144.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0145.bin b/files/poketool/waza/waza_tbl/narc_0145.bin Binary files differdeleted file mode 100644 index 091e6603..00000000 --- a/files/poketool/waza/waza_tbl/narc_0145.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0146.bin b/files/poketool/waza/waza_tbl/narc_0146.bin Binary files differdeleted file mode 100644 index 43ca9218..00000000 --- a/files/poketool/waza/waza_tbl/narc_0146.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0147.bin b/files/poketool/waza/waza_tbl/narc_0147.bin Binary files differdeleted file mode 100644 index 7c3d7ff3..00000000 --- a/files/poketool/waza/waza_tbl/narc_0147.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0148.bin b/files/poketool/waza/waza_tbl/narc_0148.bin Binary files differdeleted file mode 100644 index 93dd39b9..00000000 --- a/files/poketool/waza/waza_tbl/narc_0148.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0149.bin b/files/poketool/waza/waza_tbl/narc_0149.bin Binary files differdeleted file mode 100644 index 739cc857..00000000 --- a/files/poketool/waza/waza_tbl/narc_0149.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0150.bin b/files/poketool/waza/waza_tbl/narc_0150.bin Binary files differdeleted file mode 100644 index 17dc40a1..00000000 --- a/files/poketool/waza/waza_tbl/narc_0150.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0151.bin b/files/poketool/waza/waza_tbl/narc_0151.bin Binary files differdeleted file mode 100644 index 876c572a..00000000 --- a/files/poketool/waza/waza_tbl/narc_0151.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0152.bin b/files/poketool/waza/waza_tbl/narc_0152.bin Binary files differdeleted file mode 100644 index 08552573..00000000 --- a/files/poketool/waza/waza_tbl/narc_0152.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0153.bin b/files/poketool/waza/waza_tbl/narc_0153.bin Binary files differdeleted file mode 100644 index 9d5d67ee..00000000 --- a/files/poketool/waza/waza_tbl/narc_0153.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0154.bin b/files/poketool/waza/waza_tbl/narc_0154.bin Binary files differdeleted file mode 100644 index 500c3bce..00000000 --- a/files/poketool/waza/waza_tbl/narc_0154.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0155.bin b/files/poketool/waza/waza_tbl/narc_0155.bin Binary files differdeleted file mode 100644 index c7453df3..00000000 --- a/files/poketool/waza/waza_tbl/narc_0155.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0156.bin b/files/poketool/waza/waza_tbl/narc_0156.bin Binary files differdeleted file mode 100644 index f4bf0c4f..00000000 --- a/files/poketool/waza/waza_tbl/narc_0156.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0157.bin b/files/poketool/waza/waza_tbl/narc_0157.bin Binary files differdeleted file mode 100644 index 426b2db5..00000000 --- a/files/poketool/waza/waza_tbl/narc_0157.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0158.bin b/files/poketool/waza/waza_tbl/narc_0158.bin Binary files differdeleted file mode 100644 index c604e257..00000000 --- a/files/poketool/waza/waza_tbl/narc_0158.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0159.bin b/files/poketool/waza/waza_tbl/narc_0159.bin Binary files differdeleted file mode 100644 index 46b6a388..00000000 --- a/files/poketool/waza/waza_tbl/narc_0159.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0160.bin b/files/poketool/waza/waza_tbl/narc_0160.bin Binary files differdeleted file mode 100644 index 654db938..00000000 --- a/files/poketool/waza/waza_tbl/narc_0160.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0161.bin b/files/poketool/waza/waza_tbl/narc_0161.bin Binary files differdeleted file mode 100644 index 94d3ea9d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0161.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0162.bin b/files/poketool/waza/waza_tbl/narc_0162.bin Binary files differdeleted file mode 100644 index 020918f1..00000000 --- a/files/poketool/waza/waza_tbl/narc_0162.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0163.bin b/files/poketool/waza/waza_tbl/narc_0163.bin Binary files differdeleted file mode 100644 index aa0d30c4..00000000 --- a/files/poketool/waza/waza_tbl/narc_0163.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0164.bin b/files/poketool/waza/waza_tbl/narc_0164.bin Binary files differdeleted file mode 100644 index e3420145..00000000 --- a/files/poketool/waza/waza_tbl/narc_0164.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0165.bin b/files/poketool/waza/waza_tbl/narc_0165.bin Binary files differdeleted file mode 100644 index c78d1dfc..00000000 --- a/files/poketool/waza/waza_tbl/narc_0165.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0166.bin b/files/poketool/waza/waza_tbl/narc_0166.bin Binary files differdeleted file mode 100644 index 7391aad3..00000000 --- a/files/poketool/waza/waza_tbl/narc_0166.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0167.bin b/files/poketool/waza/waza_tbl/narc_0167.bin Binary files differdeleted file mode 100644 index a69b184c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0167.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0168.bin b/files/poketool/waza/waza_tbl/narc_0168.bin Binary files differdeleted file mode 100644 index 1646f0c5..00000000 --- a/files/poketool/waza/waza_tbl/narc_0168.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0169.bin b/files/poketool/waza/waza_tbl/narc_0169.bin Binary files differdeleted file mode 100644 index 204a1edf..00000000 --- a/files/poketool/waza/waza_tbl/narc_0169.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0170.bin b/files/poketool/waza/waza_tbl/narc_0170.bin Binary files differdeleted file mode 100644 index 18b4a6e7..00000000 --- a/files/poketool/waza/waza_tbl/narc_0170.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0171.bin b/files/poketool/waza/waza_tbl/narc_0171.bin Binary files differdeleted file mode 100644 index 0c86eb38..00000000 --- a/files/poketool/waza/waza_tbl/narc_0171.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0172.bin b/files/poketool/waza/waza_tbl/narc_0172.bin Binary files differdeleted file mode 100644 index 7882fb54..00000000 --- a/files/poketool/waza/waza_tbl/narc_0172.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0173.bin b/files/poketool/waza/waza_tbl/narc_0173.bin Binary files differdeleted file mode 100644 index be61504e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0173.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0174.bin b/files/poketool/waza/waza_tbl/narc_0174.bin Binary files differdeleted file mode 100644 index 9653f8fe..00000000 --- a/files/poketool/waza/waza_tbl/narc_0174.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0175.bin b/files/poketool/waza/waza_tbl/narc_0175.bin Binary files differdeleted file mode 100644 index 28a0171b..00000000 --- a/files/poketool/waza/waza_tbl/narc_0175.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0176.bin b/files/poketool/waza/waza_tbl/narc_0176.bin Binary files differdeleted file mode 100644 index c4f208db..00000000 --- a/files/poketool/waza/waza_tbl/narc_0176.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0177.bin b/files/poketool/waza/waza_tbl/narc_0177.bin Binary files differdeleted file mode 100644 index 0a608d1f..00000000 --- a/files/poketool/waza/waza_tbl/narc_0177.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0178.bin b/files/poketool/waza/waza_tbl/narc_0178.bin Binary files differdeleted file mode 100644 index ae7a82c8..00000000 --- a/files/poketool/waza/waza_tbl/narc_0178.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0179.bin b/files/poketool/waza/waza_tbl/narc_0179.bin Binary files differdeleted file mode 100644 index dae70497..00000000 --- a/files/poketool/waza/waza_tbl/narc_0179.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0180.bin b/files/poketool/waza/waza_tbl/narc_0180.bin Binary files differdeleted file mode 100644 index 92a64473..00000000 --- a/files/poketool/waza/waza_tbl/narc_0180.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0181.bin b/files/poketool/waza/waza_tbl/narc_0181.bin Binary files differdeleted file mode 100644 index 9bab3c5f..00000000 --- a/files/poketool/waza/waza_tbl/narc_0181.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0182.bin b/files/poketool/waza/waza_tbl/narc_0182.bin Binary files differdeleted file mode 100644 index 2f0ee2f7..00000000 --- a/files/poketool/waza/waza_tbl/narc_0182.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0183.bin b/files/poketool/waza/waza_tbl/narc_0183.bin Binary files differdeleted file mode 100644 index 67c21ce1..00000000 --- a/files/poketool/waza/waza_tbl/narc_0183.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0184.bin b/files/poketool/waza/waza_tbl/narc_0184.bin Binary files differdeleted file mode 100644 index d442a8ce..00000000 --- a/files/poketool/waza/waza_tbl/narc_0184.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0185.bin b/files/poketool/waza/waza_tbl/narc_0185.bin Binary files differdeleted file mode 100644 index 4b0fa1cd..00000000 --- a/files/poketool/waza/waza_tbl/narc_0185.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0186.bin b/files/poketool/waza/waza_tbl/narc_0186.bin Binary files differdeleted file mode 100644 index 1dbc2233..00000000 --- a/files/poketool/waza/waza_tbl/narc_0186.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0187.bin b/files/poketool/waza/waza_tbl/narc_0187.bin Binary files differdeleted file mode 100644 index 91b590e5..00000000 --- a/files/poketool/waza/waza_tbl/narc_0187.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0188.bin b/files/poketool/waza/waza_tbl/narc_0188.bin Binary files differdeleted file mode 100644 index f4f38801..00000000 --- a/files/poketool/waza/waza_tbl/narc_0188.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0189.bin b/files/poketool/waza/waza_tbl/narc_0189.bin Binary files differdeleted file mode 100644 index 7025a79a..00000000 --- a/files/poketool/waza/waza_tbl/narc_0189.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0190.bin b/files/poketool/waza/waza_tbl/narc_0190.bin Binary files differdeleted file mode 100644 index 5e0791e5..00000000 --- a/files/poketool/waza/waza_tbl/narc_0190.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0191.bin b/files/poketool/waza/waza_tbl/narc_0191.bin Binary files differdeleted file mode 100644 index d560cbd3..00000000 --- a/files/poketool/waza/waza_tbl/narc_0191.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0192.bin b/files/poketool/waza/waza_tbl/narc_0192.bin Binary files differdeleted file mode 100644 index bc716d3e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0192.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0193.bin b/files/poketool/waza/waza_tbl/narc_0193.bin Binary files differdeleted file mode 100644 index 9ec893dd..00000000 --- a/files/poketool/waza/waza_tbl/narc_0193.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0194.bin b/files/poketool/waza/waza_tbl/narc_0194.bin Binary files differdeleted file mode 100644 index 0d0e9d71..00000000 --- a/files/poketool/waza/waza_tbl/narc_0194.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0195.bin b/files/poketool/waza/waza_tbl/narc_0195.bin Binary files differdeleted file mode 100644 index c52e99b4..00000000 --- a/files/poketool/waza/waza_tbl/narc_0195.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0196.bin b/files/poketool/waza/waza_tbl/narc_0196.bin Binary files differdeleted file mode 100644 index cdbc9ff8..00000000 --- a/files/poketool/waza/waza_tbl/narc_0196.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0197.bin b/files/poketool/waza/waza_tbl/narc_0197.bin Binary files differdeleted file mode 100644 index 0140302f..00000000 --- a/files/poketool/waza/waza_tbl/narc_0197.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0198.bin b/files/poketool/waza/waza_tbl/narc_0198.bin Binary files differdeleted file mode 100644 index 31143e1d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0198.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0199.bin b/files/poketool/waza/waza_tbl/narc_0199.bin Binary files differdeleted file mode 100644 index 18b4a6e7..00000000 --- a/files/poketool/waza/waza_tbl/narc_0199.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0200.bin b/files/poketool/waza/waza_tbl/narc_0200.bin Binary files differdeleted file mode 100644 index 7a10be4a..00000000 --- a/files/poketool/waza/waza_tbl/narc_0200.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0201.bin b/files/poketool/waza/waza_tbl/narc_0201.bin Binary files differdeleted file mode 100644 index 25a096ff..00000000 --- a/files/poketool/waza/waza_tbl/narc_0201.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0202.bin b/files/poketool/waza/waza_tbl/narc_0202.bin Binary files differdeleted file mode 100644 index db4067d4..00000000 --- a/files/poketool/waza/waza_tbl/narc_0202.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0203.bin b/files/poketool/waza/waza_tbl/narc_0203.bin Binary files differdeleted file mode 100644 index af4df578..00000000 --- a/files/poketool/waza/waza_tbl/narc_0203.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0204.bin b/files/poketool/waza/waza_tbl/narc_0204.bin Binary files differdeleted file mode 100644 index d22a318f..00000000 --- a/files/poketool/waza/waza_tbl/narc_0204.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0205.bin b/files/poketool/waza/waza_tbl/narc_0205.bin Binary files differdeleted file mode 100644 index 1cc592a9..00000000 --- a/files/poketool/waza/waza_tbl/narc_0205.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0206.bin b/files/poketool/waza/waza_tbl/narc_0206.bin Binary files differdeleted file mode 100644 index eab5c365..00000000 --- a/files/poketool/waza/waza_tbl/narc_0206.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0207.bin b/files/poketool/waza/waza_tbl/narc_0207.bin Binary files differdeleted file mode 100644 index f0f7d345..00000000 --- a/files/poketool/waza/waza_tbl/narc_0207.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0208.bin b/files/poketool/waza/waza_tbl/narc_0208.bin Binary files differdeleted file mode 100644 index 21423b10..00000000 --- a/files/poketool/waza/waza_tbl/narc_0208.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0209.bin b/files/poketool/waza/waza_tbl/narc_0209.bin Binary files differdeleted file mode 100644 index d13cbe52..00000000 --- a/files/poketool/waza/waza_tbl/narc_0209.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0210.bin b/files/poketool/waza/waza_tbl/narc_0210.bin Binary files differdeleted file mode 100644 index 9988d352..00000000 --- a/files/poketool/waza/waza_tbl/narc_0210.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0211.bin b/files/poketool/waza/waza_tbl/narc_0211.bin Binary files differdeleted file mode 100644 index 0fb0b401..00000000 --- a/files/poketool/waza/waza_tbl/narc_0211.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0212.bin b/files/poketool/waza/waza_tbl/narc_0212.bin Binary files differdeleted file mode 100644 index 895bc1b7..00000000 --- a/files/poketool/waza/waza_tbl/narc_0212.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0213.bin b/files/poketool/waza/waza_tbl/narc_0213.bin Binary files differdeleted file mode 100644 index 78b27aaa..00000000 --- a/files/poketool/waza/waza_tbl/narc_0213.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0214.bin b/files/poketool/waza/waza_tbl/narc_0214.bin Binary files differdeleted file mode 100644 index 83148e45..00000000 --- a/files/poketool/waza/waza_tbl/narc_0214.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0215.bin b/files/poketool/waza/waza_tbl/narc_0215.bin Binary files differdeleted file mode 100644 index 8dca3c2a..00000000 --- a/files/poketool/waza/waza_tbl/narc_0215.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0216.bin b/files/poketool/waza/waza_tbl/narc_0216.bin Binary files differdeleted file mode 100644 index 686b84aa..00000000 --- a/files/poketool/waza/waza_tbl/narc_0216.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0217.bin b/files/poketool/waza/waza_tbl/narc_0217.bin Binary files differdeleted file mode 100644 index eb842629..00000000 --- a/files/poketool/waza/waza_tbl/narc_0217.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0218.bin b/files/poketool/waza/waza_tbl/narc_0218.bin Binary files differdeleted file mode 100644 index 19672597..00000000 --- a/files/poketool/waza/waza_tbl/narc_0218.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0219.bin b/files/poketool/waza/waza_tbl/narc_0219.bin Binary files differdeleted file mode 100644 index 99e6e6e3..00000000 --- a/files/poketool/waza/waza_tbl/narc_0219.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0220.bin b/files/poketool/waza/waza_tbl/narc_0220.bin Binary files differdeleted file mode 100644 index 242d819f..00000000 --- a/files/poketool/waza/waza_tbl/narc_0220.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0221.bin b/files/poketool/waza/waza_tbl/narc_0221.bin Binary files differdeleted file mode 100644 index 945edcce..00000000 --- a/files/poketool/waza/waza_tbl/narc_0221.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0222.bin b/files/poketool/waza/waza_tbl/narc_0222.bin Binary files differdeleted file mode 100644 index 50134c8b..00000000 --- a/files/poketool/waza/waza_tbl/narc_0222.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0223.bin b/files/poketool/waza/waza_tbl/narc_0223.bin Binary files differdeleted file mode 100644 index c30aebe1..00000000 --- a/files/poketool/waza/waza_tbl/narc_0223.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0224.bin b/files/poketool/waza/waza_tbl/narc_0224.bin Binary files differdeleted file mode 100644 index 24a54ce9..00000000 --- a/files/poketool/waza/waza_tbl/narc_0224.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0225.bin b/files/poketool/waza/waza_tbl/narc_0225.bin Binary files differdeleted file mode 100644 index d6fe6e05..00000000 --- a/files/poketool/waza/waza_tbl/narc_0225.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0226.bin b/files/poketool/waza/waza_tbl/narc_0226.bin Binary files differdeleted file mode 100644 index 18e3e716..00000000 --- a/files/poketool/waza/waza_tbl/narc_0226.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0227.bin b/files/poketool/waza/waza_tbl/narc_0227.bin Binary files differdeleted file mode 100644 index 22560d0f..00000000 --- a/files/poketool/waza/waza_tbl/narc_0227.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0228.bin b/files/poketool/waza/waza_tbl/narc_0228.bin Binary files differdeleted file mode 100644 index d11e8322..00000000 --- a/files/poketool/waza/waza_tbl/narc_0228.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0229.bin b/files/poketool/waza/waza_tbl/narc_0229.bin Binary files differdeleted file mode 100644 index 7722ce42..00000000 --- a/files/poketool/waza/waza_tbl/narc_0229.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0230.bin b/files/poketool/waza/waza_tbl/narc_0230.bin Binary files differdeleted file mode 100644 index be79924b..00000000 --- a/files/poketool/waza/waza_tbl/narc_0230.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0231.bin b/files/poketool/waza/waza_tbl/narc_0231.bin Binary files differdeleted file mode 100644 index 4fc5fc0e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0231.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0232.bin b/files/poketool/waza/waza_tbl/narc_0232.bin Binary files differdeleted file mode 100644 index 8eb61264..00000000 --- a/files/poketool/waza/waza_tbl/narc_0232.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0233.bin b/files/poketool/waza/waza_tbl/narc_0233.bin Binary files differdeleted file mode 100644 index 4d9d142a..00000000 --- a/files/poketool/waza/waza_tbl/narc_0233.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0234.bin b/files/poketool/waza/waza_tbl/narc_0234.bin Binary files differdeleted file mode 100644 index e237e0ad..00000000 --- a/files/poketool/waza/waza_tbl/narc_0234.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0235.bin b/files/poketool/waza/waza_tbl/narc_0235.bin Binary files differdeleted file mode 100644 index bc91ebe6..00000000 --- a/files/poketool/waza/waza_tbl/narc_0235.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0236.bin b/files/poketool/waza/waza_tbl/narc_0236.bin Binary files differdeleted file mode 100644 index 3dd70f44..00000000 --- a/files/poketool/waza/waza_tbl/narc_0236.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0237.bin b/files/poketool/waza/waza_tbl/narc_0237.bin Binary files differdeleted file mode 100644 index 157e5174..00000000 --- a/files/poketool/waza/waza_tbl/narc_0237.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0238.bin b/files/poketool/waza/waza_tbl/narc_0238.bin Binary files differdeleted file mode 100644 index fdcddd88..00000000 --- a/files/poketool/waza/waza_tbl/narc_0238.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0239.bin b/files/poketool/waza/waza_tbl/narc_0239.bin Binary files differdeleted file mode 100644 index 7d46d35b..00000000 --- a/files/poketool/waza/waza_tbl/narc_0239.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0240.bin b/files/poketool/waza/waza_tbl/narc_0240.bin Binary files differdeleted file mode 100644 index 3fac43e0..00000000 --- a/files/poketool/waza/waza_tbl/narc_0240.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0241.bin b/files/poketool/waza/waza_tbl/narc_0241.bin Binary files differdeleted file mode 100644 index ff7e3949..00000000 --- a/files/poketool/waza/waza_tbl/narc_0241.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0242.bin b/files/poketool/waza/waza_tbl/narc_0242.bin Binary files differdeleted file mode 100644 index 057c3dd7..00000000 --- a/files/poketool/waza/waza_tbl/narc_0242.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0243.bin b/files/poketool/waza/waza_tbl/narc_0243.bin Binary files differdeleted file mode 100644 index b11d4e4f..00000000 --- a/files/poketool/waza/waza_tbl/narc_0243.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0244.bin b/files/poketool/waza/waza_tbl/narc_0244.bin Binary files differdeleted file mode 100644 index 44388747..00000000 --- a/files/poketool/waza/waza_tbl/narc_0244.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0245.bin b/files/poketool/waza/waza_tbl/narc_0245.bin Binary files differdeleted file mode 100644 index e4fc768d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0245.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0246.bin b/files/poketool/waza/waza_tbl/narc_0246.bin Binary files differdeleted file mode 100644 index 30be4aca..00000000 --- a/files/poketool/waza/waza_tbl/narc_0246.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0247.bin b/files/poketool/waza/waza_tbl/narc_0247.bin Binary files differdeleted file mode 100644 index dff1feeb..00000000 --- a/files/poketool/waza/waza_tbl/narc_0247.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0248.bin b/files/poketool/waza/waza_tbl/narc_0248.bin Binary files differdeleted file mode 100644 index a851a2bb..00000000 --- a/files/poketool/waza/waza_tbl/narc_0248.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0249.bin b/files/poketool/waza/waza_tbl/narc_0249.bin Binary files differdeleted file mode 100644 index c37ccf3d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0249.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0250.bin b/files/poketool/waza/waza_tbl/narc_0250.bin Binary files differdeleted file mode 100644 index 11d9a3cc..00000000 --- a/files/poketool/waza/waza_tbl/narc_0250.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0251.bin b/files/poketool/waza/waza_tbl/narc_0251.bin Binary files differdeleted file mode 100644 index f8f7c459..00000000 --- a/files/poketool/waza/waza_tbl/narc_0251.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0252.bin b/files/poketool/waza/waza_tbl/narc_0252.bin Binary files differdeleted file mode 100644 index bd025bf9..00000000 --- a/files/poketool/waza/waza_tbl/narc_0252.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0253.bin b/files/poketool/waza/waza_tbl/narc_0253.bin Binary files differdeleted file mode 100644 index 846a0f4c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0253.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0254.bin b/files/poketool/waza/waza_tbl/narc_0254.bin Binary files differdeleted file mode 100644 index 043c06d9..00000000 --- a/files/poketool/waza/waza_tbl/narc_0254.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0255.bin b/files/poketool/waza/waza_tbl/narc_0255.bin Binary files differdeleted file mode 100644 index ed14a01e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0255.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0256.bin b/files/poketool/waza/waza_tbl/narc_0256.bin Binary files differdeleted file mode 100644 index e7ebd641..00000000 --- a/files/poketool/waza/waza_tbl/narc_0256.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0257.bin b/files/poketool/waza/waza_tbl/narc_0257.bin Binary files differdeleted file mode 100644 index 63f7d5d5..00000000 --- a/files/poketool/waza/waza_tbl/narc_0257.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0258.bin b/files/poketool/waza/waza_tbl/narc_0258.bin Binary files differdeleted file mode 100644 index b6851518..00000000 --- a/files/poketool/waza/waza_tbl/narc_0258.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0259.bin b/files/poketool/waza/waza_tbl/narc_0259.bin Binary files differdeleted file mode 100644 index 64e5936e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0259.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0260.bin b/files/poketool/waza/waza_tbl/narc_0260.bin Binary files differdeleted file mode 100644 index e2530d47..00000000 --- a/files/poketool/waza/waza_tbl/narc_0260.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0261.bin b/files/poketool/waza/waza_tbl/narc_0261.bin Binary files differdeleted file mode 100644 index 34a1e456..00000000 --- a/files/poketool/waza/waza_tbl/narc_0261.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0262.bin b/files/poketool/waza/waza_tbl/narc_0262.bin Binary files differdeleted file mode 100644 index 820de7e4..00000000 --- a/files/poketool/waza/waza_tbl/narc_0262.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0263.bin b/files/poketool/waza/waza_tbl/narc_0263.bin Binary files differdeleted file mode 100644 index b7ab0a79..00000000 --- a/files/poketool/waza/waza_tbl/narc_0263.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0264.bin b/files/poketool/waza/waza_tbl/narc_0264.bin Binary files differdeleted file mode 100644 index 6914f8b4..00000000 --- a/files/poketool/waza/waza_tbl/narc_0264.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0265.bin b/files/poketool/waza/waza_tbl/narc_0265.bin Binary files differdeleted file mode 100644 index c1093070..00000000 --- a/files/poketool/waza/waza_tbl/narc_0265.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0266.bin b/files/poketool/waza/waza_tbl/narc_0266.bin Binary files differdeleted file mode 100644 index fc2dcb42..00000000 --- a/files/poketool/waza/waza_tbl/narc_0266.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0267.bin b/files/poketool/waza/waza_tbl/narc_0267.bin Binary files differdeleted file mode 100644 index 4f00b7e1..00000000 --- a/files/poketool/waza/waza_tbl/narc_0267.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0268.bin b/files/poketool/waza/waza_tbl/narc_0268.bin Binary files differdeleted file mode 100644 index 102f975b..00000000 --- a/files/poketool/waza/waza_tbl/narc_0268.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0269.bin b/files/poketool/waza/waza_tbl/narc_0269.bin Binary files differdeleted file mode 100644 index ef16b8b9..00000000 --- a/files/poketool/waza/waza_tbl/narc_0269.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0270.bin b/files/poketool/waza/waza_tbl/narc_0270.bin Binary files differdeleted file mode 100644 index 8264cd1e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0270.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0271.bin b/files/poketool/waza/waza_tbl/narc_0271.bin Binary files differdeleted file mode 100644 index fb7d1c1a..00000000 --- a/files/poketool/waza/waza_tbl/narc_0271.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0272.bin b/files/poketool/waza/waza_tbl/narc_0272.bin Binary files differdeleted file mode 100644 index a2162e5c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0272.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0273.bin b/files/poketool/waza/waza_tbl/narc_0273.bin Binary files differdeleted file mode 100644 index c59eed50..00000000 --- a/files/poketool/waza/waza_tbl/narc_0273.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0274.bin b/files/poketool/waza/waza_tbl/narc_0274.bin Binary files differdeleted file mode 100644 index f84e2a0b..00000000 --- a/files/poketool/waza/waza_tbl/narc_0274.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0275.bin b/files/poketool/waza/waza_tbl/narc_0275.bin Binary files differdeleted file mode 100644 index 1f53391d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0275.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0276.bin b/files/poketool/waza/waza_tbl/narc_0276.bin Binary files differdeleted file mode 100644 index e90a491e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0276.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0277.bin b/files/poketool/waza/waza_tbl/narc_0277.bin Binary files differdeleted file mode 100644 index e05fafa4..00000000 --- a/files/poketool/waza/waza_tbl/narc_0277.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0278.bin b/files/poketool/waza/waza_tbl/narc_0278.bin Binary files differdeleted file mode 100644 index 0dd84a9a..00000000 --- a/files/poketool/waza/waza_tbl/narc_0278.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0279.bin b/files/poketool/waza/waza_tbl/narc_0279.bin Binary files differdeleted file mode 100644 index 01382f23..00000000 --- a/files/poketool/waza/waza_tbl/narc_0279.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0280.bin b/files/poketool/waza/waza_tbl/narc_0280.bin Binary files differdeleted file mode 100644 index 76ea8a80..00000000 --- a/files/poketool/waza/waza_tbl/narc_0280.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0281.bin b/files/poketool/waza/waza_tbl/narc_0281.bin Binary files differdeleted file mode 100644 index 7cf79fbb..00000000 --- a/files/poketool/waza/waza_tbl/narc_0281.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0282.bin b/files/poketool/waza/waza_tbl/narc_0282.bin Binary files differdeleted file mode 100644 index 4bc6c785..00000000 --- a/files/poketool/waza/waza_tbl/narc_0282.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0283.bin b/files/poketool/waza/waza_tbl/narc_0283.bin Binary files differdeleted file mode 100644 index a3d0f6e6..00000000 --- a/files/poketool/waza/waza_tbl/narc_0283.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0284.bin b/files/poketool/waza/waza_tbl/narc_0284.bin Binary files differdeleted file mode 100644 index 42138b55..00000000 --- a/files/poketool/waza/waza_tbl/narc_0284.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0285.bin b/files/poketool/waza/waza_tbl/narc_0285.bin Binary files differdeleted file mode 100644 index 06324efd..00000000 --- a/files/poketool/waza/waza_tbl/narc_0285.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0286.bin b/files/poketool/waza/waza_tbl/narc_0286.bin Binary files differdeleted file mode 100644 index 167beadd..00000000 --- a/files/poketool/waza/waza_tbl/narc_0286.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0287.bin b/files/poketool/waza/waza_tbl/narc_0287.bin Binary files differdeleted file mode 100644 index 13517218..00000000 --- a/files/poketool/waza/waza_tbl/narc_0287.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0288.bin b/files/poketool/waza/waza_tbl/narc_0288.bin Binary files differdeleted file mode 100644 index 263e453c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0288.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0289.bin b/files/poketool/waza/waza_tbl/narc_0289.bin Binary files differdeleted file mode 100644 index a2462b35..00000000 --- a/files/poketool/waza/waza_tbl/narc_0289.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0290.bin b/files/poketool/waza/waza_tbl/narc_0290.bin Binary files differdeleted file mode 100644 index 7d88bbbc..00000000 --- a/files/poketool/waza/waza_tbl/narc_0290.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0291.bin b/files/poketool/waza/waza_tbl/narc_0291.bin Binary files differdeleted file mode 100644 index 4dcdf892..00000000 --- a/files/poketool/waza/waza_tbl/narc_0291.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0292.bin b/files/poketool/waza/waza_tbl/narc_0292.bin Binary files differdeleted file mode 100644 index 9a1cdaf3..00000000 --- a/files/poketool/waza/waza_tbl/narc_0292.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0293.bin b/files/poketool/waza/waza_tbl/narc_0293.bin Binary files differdeleted file mode 100644 index 6c5b2daf..00000000 --- a/files/poketool/waza/waza_tbl/narc_0293.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0294.bin b/files/poketool/waza/waza_tbl/narc_0294.bin Binary files differdeleted file mode 100644 index 411331fc..00000000 --- a/files/poketool/waza/waza_tbl/narc_0294.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0295.bin b/files/poketool/waza/waza_tbl/narc_0295.bin Binary files differdeleted file mode 100644 index 925c895f..00000000 --- a/files/poketool/waza/waza_tbl/narc_0295.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0296.bin b/files/poketool/waza/waza_tbl/narc_0296.bin Binary files differdeleted file mode 100644 index 99468d07..00000000 --- a/files/poketool/waza/waza_tbl/narc_0296.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0297.bin b/files/poketool/waza/waza_tbl/narc_0297.bin Binary files differdeleted file mode 100644 index a02d39d4..00000000 --- a/files/poketool/waza/waza_tbl/narc_0297.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0298.bin b/files/poketool/waza/waza_tbl/narc_0298.bin Binary files differdeleted file mode 100644 index 49e78c1e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0298.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0299.bin b/files/poketool/waza/waza_tbl/narc_0299.bin Binary files differdeleted file mode 100644 index 954baeb1..00000000 --- a/files/poketool/waza/waza_tbl/narc_0299.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0300.bin b/files/poketool/waza/waza_tbl/narc_0300.bin Binary files differdeleted file mode 100644 index ce3c1995..00000000 --- a/files/poketool/waza/waza_tbl/narc_0300.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0301.bin b/files/poketool/waza/waza_tbl/narc_0301.bin Binary files differdeleted file mode 100644 index ed5fed85..00000000 --- a/files/poketool/waza/waza_tbl/narc_0301.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0302.bin b/files/poketool/waza/waza_tbl/narc_0302.bin Binary files differdeleted file mode 100644 index db05ea7c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0302.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0303.bin b/files/poketool/waza/waza_tbl/narc_0303.bin Binary files differdeleted file mode 100644 index 0ff7d9b1..00000000 --- a/files/poketool/waza/waza_tbl/narc_0303.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0304.bin b/files/poketool/waza/waza_tbl/narc_0304.bin Binary files differdeleted file mode 100644 index 4c9d5ade..00000000 --- a/files/poketool/waza/waza_tbl/narc_0304.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0305.bin b/files/poketool/waza/waza_tbl/narc_0305.bin Binary files differdeleted file mode 100644 index a96c8c65..00000000 --- a/files/poketool/waza/waza_tbl/narc_0305.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0306.bin b/files/poketool/waza/waza_tbl/narc_0306.bin Binary files differdeleted file mode 100644 index 873a4564..00000000 --- a/files/poketool/waza/waza_tbl/narc_0306.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0307.bin b/files/poketool/waza/waza_tbl/narc_0307.bin Binary files differdeleted file mode 100644 index 1f9f5165..00000000 --- a/files/poketool/waza/waza_tbl/narc_0307.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0308.bin b/files/poketool/waza/waza_tbl/narc_0308.bin Binary files differdeleted file mode 100644 index 819010c6..00000000 --- a/files/poketool/waza/waza_tbl/narc_0308.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0309.bin b/files/poketool/waza/waza_tbl/narc_0309.bin Binary files differdeleted file mode 100644 index 45740a8a..00000000 --- a/files/poketool/waza/waza_tbl/narc_0309.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0310.bin b/files/poketool/waza/waza_tbl/narc_0310.bin Binary files differdeleted file mode 100644 index 186a0ce0..00000000 --- a/files/poketool/waza/waza_tbl/narc_0310.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0311.bin b/files/poketool/waza/waza_tbl/narc_0311.bin Binary files differdeleted file mode 100644 index d7f9b35f..00000000 --- a/files/poketool/waza/waza_tbl/narc_0311.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0312.bin b/files/poketool/waza/waza_tbl/narc_0312.bin Binary files differdeleted file mode 100644 index 2aa44769..00000000 --- a/files/poketool/waza/waza_tbl/narc_0312.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0313.bin b/files/poketool/waza/waza_tbl/narc_0313.bin Binary files differdeleted file mode 100644 index 374ed5f0..00000000 --- a/files/poketool/waza/waza_tbl/narc_0313.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0314.bin b/files/poketool/waza/waza_tbl/narc_0314.bin Binary files differdeleted file mode 100644 index a934630b..00000000 --- a/files/poketool/waza/waza_tbl/narc_0314.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0315.bin b/files/poketool/waza/waza_tbl/narc_0315.bin Binary files differdeleted file mode 100644 index ff007f24..00000000 --- a/files/poketool/waza/waza_tbl/narc_0315.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0316.bin b/files/poketool/waza/waza_tbl/narc_0316.bin Binary files differdeleted file mode 100644 index 9ec893dd..00000000 --- a/files/poketool/waza/waza_tbl/narc_0316.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0317.bin b/files/poketool/waza/waza_tbl/narc_0317.bin Binary files differdeleted file mode 100644 index 9c29a118..00000000 --- a/files/poketool/waza/waza_tbl/narc_0317.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0318.bin b/files/poketool/waza/waza_tbl/narc_0318.bin Binary files differdeleted file mode 100644 index 481d9b72..00000000 --- a/files/poketool/waza/waza_tbl/narc_0318.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0319.bin b/files/poketool/waza/waza_tbl/narc_0319.bin Binary files differdeleted file mode 100644 index 22b9bcf4..00000000 --- a/files/poketool/waza/waza_tbl/narc_0319.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0320.bin b/files/poketool/waza/waza_tbl/narc_0320.bin Binary files differdeleted file mode 100644 index 8c1d30cc..00000000 --- a/files/poketool/waza/waza_tbl/narc_0320.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0321.bin b/files/poketool/waza/waza_tbl/narc_0321.bin Binary files differdeleted file mode 100644 index bf579eb5..00000000 --- a/files/poketool/waza/waza_tbl/narc_0321.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0322.bin b/files/poketool/waza/waza_tbl/narc_0322.bin Binary files differdeleted file mode 100644 index 2734a69e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0322.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0323.bin b/files/poketool/waza/waza_tbl/narc_0323.bin Binary files differdeleted file mode 100644 index 96e30f0c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0323.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0324.bin b/files/poketool/waza/waza_tbl/narc_0324.bin Binary files differdeleted file mode 100644 index 097dcbfb..00000000 --- a/files/poketool/waza/waza_tbl/narc_0324.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0325.bin b/files/poketool/waza/waza_tbl/narc_0325.bin Binary files differdeleted file mode 100644 index cd2f9d68..00000000 --- a/files/poketool/waza/waza_tbl/narc_0325.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0326.bin b/files/poketool/waza/waza_tbl/narc_0326.bin Binary files differdeleted file mode 100644 index 2b8e7f6c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0326.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0327.bin b/files/poketool/waza/waza_tbl/narc_0327.bin Binary files differdeleted file mode 100644 index ab4eda03..00000000 --- a/files/poketool/waza/waza_tbl/narc_0327.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0328.bin b/files/poketool/waza/waza_tbl/narc_0328.bin Binary files differdeleted file mode 100644 index 44863764..00000000 --- a/files/poketool/waza/waza_tbl/narc_0328.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0329.bin b/files/poketool/waza/waza_tbl/narc_0329.bin Binary files differdeleted file mode 100644 index 3996af94..00000000 --- a/files/poketool/waza/waza_tbl/narc_0329.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0330.bin b/files/poketool/waza/waza_tbl/narc_0330.bin Binary files differdeleted file mode 100644 index 14f5d625..00000000 --- a/files/poketool/waza/waza_tbl/narc_0330.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0331.bin b/files/poketool/waza/waza_tbl/narc_0331.bin Binary files differdeleted file mode 100644 index d87a878f..00000000 --- a/files/poketool/waza/waza_tbl/narc_0331.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0332.bin b/files/poketool/waza/waza_tbl/narc_0332.bin Binary files differdeleted file mode 100644 index ac50d359..00000000 --- a/files/poketool/waza/waza_tbl/narc_0332.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0333.bin b/files/poketool/waza/waza_tbl/narc_0333.bin Binary files differdeleted file mode 100644 index 9e7f76b8..00000000 --- a/files/poketool/waza/waza_tbl/narc_0333.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0334.bin b/files/poketool/waza/waza_tbl/narc_0334.bin Binary files differdeleted file mode 100644 index 07c7705d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0334.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0335.bin b/files/poketool/waza/waza_tbl/narc_0335.bin Binary files differdeleted file mode 100644 index 717c986d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0335.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0336.bin b/files/poketool/waza/waza_tbl/narc_0336.bin Binary files differdeleted file mode 100644 index 6869c085..00000000 --- a/files/poketool/waza/waza_tbl/narc_0336.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0337.bin b/files/poketool/waza/waza_tbl/narc_0337.bin Binary files differdeleted file mode 100644 index 36f9e0c7..00000000 --- a/files/poketool/waza/waza_tbl/narc_0337.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0338.bin b/files/poketool/waza/waza_tbl/narc_0338.bin Binary files differdeleted file mode 100644 index fc449af1..00000000 --- a/files/poketool/waza/waza_tbl/narc_0338.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0339.bin b/files/poketool/waza/waza_tbl/narc_0339.bin Binary files differdeleted file mode 100644 index c51b3615..00000000 --- a/files/poketool/waza/waza_tbl/narc_0339.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0340.bin b/files/poketool/waza/waza_tbl/narc_0340.bin Binary files differdeleted file mode 100644 index 5d9c8c44..00000000 --- a/files/poketool/waza/waza_tbl/narc_0340.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0341.bin b/files/poketool/waza/waza_tbl/narc_0341.bin Binary files differdeleted file mode 100644 index ab10e4a1..00000000 --- a/files/poketool/waza/waza_tbl/narc_0341.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0342.bin b/files/poketool/waza/waza_tbl/narc_0342.bin Binary files differdeleted file mode 100644 index fd4884be..00000000 --- a/files/poketool/waza/waza_tbl/narc_0342.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0343.bin b/files/poketool/waza/waza_tbl/narc_0343.bin Binary files differdeleted file mode 100644 index f082308e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0343.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0344.bin b/files/poketool/waza/waza_tbl/narc_0344.bin Binary files differdeleted file mode 100644 index 6eed3c6a..00000000 --- a/files/poketool/waza/waza_tbl/narc_0344.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0345.bin b/files/poketool/waza/waza_tbl/narc_0345.bin Binary files differdeleted file mode 100644 index 418bb452..00000000 --- a/files/poketool/waza/waza_tbl/narc_0345.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0346.bin b/files/poketool/waza/waza_tbl/narc_0346.bin Binary files differdeleted file mode 100644 index 9170928b..00000000 --- a/files/poketool/waza/waza_tbl/narc_0346.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0347.bin b/files/poketool/waza/waza_tbl/narc_0347.bin Binary files differdeleted file mode 100644 index eb3cbc1b..00000000 --- a/files/poketool/waza/waza_tbl/narc_0347.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0348.bin b/files/poketool/waza/waza_tbl/narc_0348.bin Binary files differdeleted file mode 100644 index 09eef99f..00000000 --- a/files/poketool/waza/waza_tbl/narc_0348.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0349.bin b/files/poketool/waza/waza_tbl/narc_0349.bin Binary files differdeleted file mode 100644 index 0362e8c0..00000000 --- a/files/poketool/waza/waza_tbl/narc_0349.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0350.bin b/files/poketool/waza/waza_tbl/narc_0350.bin Binary files differdeleted file mode 100644 index 335f437e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0350.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0351.bin b/files/poketool/waza/waza_tbl/narc_0351.bin Binary files differdeleted file mode 100644 index 1006ca23..00000000 --- a/files/poketool/waza/waza_tbl/narc_0351.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0352.bin b/files/poketool/waza/waza_tbl/narc_0352.bin Binary files differdeleted file mode 100644 index abd0b002..00000000 --- a/files/poketool/waza/waza_tbl/narc_0352.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0353.bin b/files/poketool/waza/waza_tbl/narc_0353.bin Binary files differdeleted file mode 100644 index 4269160f..00000000 --- a/files/poketool/waza/waza_tbl/narc_0353.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0354.bin b/files/poketool/waza/waza_tbl/narc_0354.bin Binary files differdeleted file mode 100644 index c1373cf7..00000000 --- a/files/poketool/waza/waza_tbl/narc_0354.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0355.bin b/files/poketool/waza/waza_tbl/narc_0355.bin Binary files differdeleted file mode 100644 index 8947ca70..00000000 --- a/files/poketool/waza/waza_tbl/narc_0355.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0356.bin b/files/poketool/waza/waza_tbl/narc_0356.bin Binary files differdeleted file mode 100644 index 975e4fbd..00000000 --- a/files/poketool/waza/waza_tbl/narc_0356.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0357.bin b/files/poketool/waza/waza_tbl/narc_0357.bin Binary files differdeleted file mode 100644 index 74655db9..00000000 --- a/files/poketool/waza/waza_tbl/narc_0357.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0358.bin b/files/poketool/waza/waza_tbl/narc_0358.bin Binary files differdeleted file mode 100644 index d6573f4e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0358.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0359.bin b/files/poketool/waza/waza_tbl/narc_0359.bin Binary files differdeleted file mode 100644 index 620df349..00000000 --- a/files/poketool/waza/waza_tbl/narc_0359.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0360.bin b/files/poketool/waza/waza_tbl/narc_0360.bin Binary files differdeleted file mode 100644 index 54aa0064..00000000 --- a/files/poketool/waza/waza_tbl/narc_0360.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0361.bin b/files/poketool/waza/waza_tbl/narc_0361.bin Binary files differdeleted file mode 100644 index 10f5bc98..00000000 --- a/files/poketool/waza/waza_tbl/narc_0361.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0362.bin b/files/poketool/waza/waza_tbl/narc_0362.bin Binary files differdeleted file mode 100644 index 8b0d5669..00000000 --- a/files/poketool/waza/waza_tbl/narc_0362.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0363.bin b/files/poketool/waza/waza_tbl/narc_0363.bin Binary files differdeleted file mode 100644 index d5aaad74..00000000 --- a/files/poketool/waza/waza_tbl/narc_0363.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0364.bin b/files/poketool/waza/waza_tbl/narc_0364.bin Binary files differdeleted file mode 100644 index 1bda0491..00000000 --- a/files/poketool/waza/waza_tbl/narc_0364.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0365.bin b/files/poketool/waza/waza_tbl/narc_0365.bin Binary files differdeleted file mode 100644 index 21a8a8f4..00000000 --- a/files/poketool/waza/waza_tbl/narc_0365.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0366.bin b/files/poketool/waza/waza_tbl/narc_0366.bin Binary files differdeleted file mode 100644 index d90ddb1c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0366.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0367.bin b/files/poketool/waza/waza_tbl/narc_0367.bin Binary files differdeleted file mode 100644 index 82d6c1d7..00000000 --- a/files/poketool/waza/waza_tbl/narc_0367.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0368.bin b/files/poketool/waza/waza_tbl/narc_0368.bin Binary files differdeleted file mode 100644 index 308aaaa1..00000000 --- a/files/poketool/waza/waza_tbl/narc_0368.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0369.bin b/files/poketool/waza/waza_tbl/narc_0369.bin Binary files differdeleted file mode 100644 index 6689062c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0369.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0370.bin b/files/poketool/waza/waza_tbl/narc_0370.bin Binary files differdeleted file mode 100644 index 5c5df5ea..00000000 --- a/files/poketool/waza/waza_tbl/narc_0370.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0371.bin b/files/poketool/waza/waza_tbl/narc_0371.bin Binary files differdeleted file mode 100644 index 673c42d5..00000000 --- a/files/poketool/waza/waza_tbl/narc_0371.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0372.bin b/files/poketool/waza/waza_tbl/narc_0372.bin Binary files differdeleted file mode 100644 index 814e477e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0372.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0373.bin b/files/poketool/waza/waza_tbl/narc_0373.bin Binary files differdeleted file mode 100644 index 79ba5d50..00000000 --- a/files/poketool/waza/waza_tbl/narc_0373.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0374.bin b/files/poketool/waza/waza_tbl/narc_0374.bin Binary files differdeleted file mode 100644 index 973c5699..00000000 --- a/files/poketool/waza/waza_tbl/narc_0374.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0375.bin b/files/poketool/waza/waza_tbl/narc_0375.bin Binary files differdeleted file mode 100644 index 373a8871..00000000 --- a/files/poketool/waza/waza_tbl/narc_0375.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0376.bin b/files/poketool/waza/waza_tbl/narc_0376.bin Binary files differdeleted file mode 100644 index 6ec33738..00000000 --- a/files/poketool/waza/waza_tbl/narc_0376.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0377.bin b/files/poketool/waza/waza_tbl/narc_0377.bin Binary files differdeleted file mode 100644 index 9ddfe62b..00000000 --- a/files/poketool/waza/waza_tbl/narc_0377.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0378.bin b/files/poketool/waza/waza_tbl/narc_0378.bin Binary files differdeleted file mode 100644 index d0c160fb..00000000 --- a/files/poketool/waza/waza_tbl/narc_0378.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0379.bin b/files/poketool/waza/waza_tbl/narc_0379.bin Binary files differdeleted file mode 100644 index 3ec1a012..00000000 --- a/files/poketool/waza/waza_tbl/narc_0379.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0380.bin b/files/poketool/waza/waza_tbl/narc_0380.bin Binary files differdeleted file mode 100644 index d6156065..00000000 --- a/files/poketool/waza/waza_tbl/narc_0380.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0381.bin b/files/poketool/waza/waza_tbl/narc_0381.bin Binary files differdeleted file mode 100644 index b4b4eb39..00000000 --- a/files/poketool/waza/waza_tbl/narc_0381.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0382.bin b/files/poketool/waza/waza_tbl/narc_0382.bin Binary files differdeleted file mode 100644 index c72f6578..00000000 --- a/files/poketool/waza/waza_tbl/narc_0382.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0383.bin b/files/poketool/waza/waza_tbl/narc_0383.bin Binary files differdeleted file mode 100644 index 3fe0645b..00000000 --- a/files/poketool/waza/waza_tbl/narc_0383.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0384.bin b/files/poketool/waza/waza_tbl/narc_0384.bin Binary files differdeleted file mode 100644 index e447eaf4..00000000 --- a/files/poketool/waza/waza_tbl/narc_0384.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0385.bin b/files/poketool/waza/waza_tbl/narc_0385.bin Binary files differdeleted file mode 100644 index ceccddc7..00000000 --- a/files/poketool/waza/waza_tbl/narc_0385.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0386.bin b/files/poketool/waza/waza_tbl/narc_0386.bin Binary files differdeleted file mode 100644 index 1e9a9009..00000000 --- a/files/poketool/waza/waza_tbl/narc_0386.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0387.bin b/files/poketool/waza/waza_tbl/narc_0387.bin Binary files differdeleted file mode 100644 index e2c36487..00000000 --- a/files/poketool/waza/waza_tbl/narc_0387.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0388.bin b/files/poketool/waza/waza_tbl/narc_0388.bin Binary files differdeleted file mode 100644 index ffd95cb8..00000000 --- a/files/poketool/waza/waza_tbl/narc_0388.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0389.bin b/files/poketool/waza/waza_tbl/narc_0389.bin Binary files differdeleted file mode 100644 index 19de3d72..00000000 --- a/files/poketool/waza/waza_tbl/narc_0389.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0390.bin b/files/poketool/waza/waza_tbl/narc_0390.bin Binary files differdeleted file mode 100644 index 77f6930b..00000000 --- a/files/poketool/waza/waza_tbl/narc_0390.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0391.bin b/files/poketool/waza/waza_tbl/narc_0391.bin Binary files differdeleted file mode 100644 index 115537bf..00000000 --- a/files/poketool/waza/waza_tbl/narc_0391.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0392.bin b/files/poketool/waza/waza_tbl/narc_0392.bin Binary files differdeleted file mode 100644 index b3a4d48f..00000000 --- a/files/poketool/waza/waza_tbl/narc_0392.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0393.bin b/files/poketool/waza/waza_tbl/narc_0393.bin Binary files differdeleted file mode 100644 index 8cffc721..00000000 --- a/files/poketool/waza/waza_tbl/narc_0393.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0394.bin b/files/poketool/waza/waza_tbl/narc_0394.bin Binary files differdeleted file mode 100644 index 969c3b88..00000000 --- a/files/poketool/waza/waza_tbl/narc_0394.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0395.bin b/files/poketool/waza/waza_tbl/narc_0395.bin Binary files differdeleted file mode 100644 index b2b9c3e4..00000000 --- a/files/poketool/waza/waza_tbl/narc_0395.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0396.bin b/files/poketool/waza/waza_tbl/narc_0396.bin Binary files differdeleted file mode 100644 index db10e01b..00000000 --- a/files/poketool/waza/waza_tbl/narc_0396.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0397.bin b/files/poketool/waza/waza_tbl/narc_0397.bin Binary files differdeleted file mode 100644 index 4ec07c0d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0397.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0398.bin b/files/poketool/waza/waza_tbl/narc_0398.bin Binary files differdeleted file mode 100644 index d36adf84..00000000 --- a/files/poketool/waza/waza_tbl/narc_0398.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0399.bin b/files/poketool/waza/waza_tbl/narc_0399.bin Binary files differdeleted file mode 100644 index be990b22..00000000 --- a/files/poketool/waza/waza_tbl/narc_0399.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0400.bin b/files/poketool/waza/waza_tbl/narc_0400.bin Binary files differdeleted file mode 100644 index f6138c42..00000000 --- a/files/poketool/waza/waza_tbl/narc_0400.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0401.bin b/files/poketool/waza/waza_tbl/narc_0401.bin Binary files differdeleted file mode 100644 index 05b3d69c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0401.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0402.bin b/files/poketool/waza/waza_tbl/narc_0402.bin Binary files differdeleted file mode 100644 index e5b03e19..00000000 --- a/files/poketool/waza/waza_tbl/narc_0402.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0403.bin b/files/poketool/waza/waza_tbl/narc_0403.bin Binary files differdeleted file mode 100644 index ca2361be..00000000 --- a/files/poketool/waza/waza_tbl/narc_0403.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0404.bin b/files/poketool/waza/waza_tbl/narc_0404.bin Binary files differdeleted file mode 100644 index 76353921..00000000 --- a/files/poketool/waza/waza_tbl/narc_0404.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0405.bin b/files/poketool/waza/waza_tbl/narc_0405.bin Binary files differdeleted file mode 100644 index 45c2ddae..00000000 --- a/files/poketool/waza/waza_tbl/narc_0405.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0406.bin b/files/poketool/waza/waza_tbl/narc_0406.bin Binary files differdeleted file mode 100644 index 1e751b0b..00000000 --- a/files/poketool/waza/waza_tbl/narc_0406.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0407.bin b/files/poketool/waza/waza_tbl/narc_0407.bin Binary files differdeleted file mode 100644 index 3e85da2d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0407.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0408.bin b/files/poketool/waza/waza_tbl/narc_0408.bin Binary files differdeleted file mode 100644 index ad5d6461..00000000 --- a/files/poketool/waza/waza_tbl/narc_0408.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0409.bin b/files/poketool/waza/waza_tbl/narc_0409.bin Binary files differdeleted file mode 100644 index 8c262e9f..00000000 --- a/files/poketool/waza/waza_tbl/narc_0409.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0410.bin b/files/poketool/waza/waza_tbl/narc_0410.bin Binary files differdeleted file mode 100644 index adfb200d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0410.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0411.bin b/files/poketool/waza/waza_tbl/narc_0411.bin Binary files differdeleted file mode 100644 index f2f685f0..00000000 --- a/files/poketool/waza/waza_tbl/narc_0411.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0412.bin b/files/poketool/waza/waza_tbl/narc_0412.bin Binary files differdeleted file mode 100644 index e53c8e27..00000000 --- a/files/poketool/waza/waza_tbl/narc_0412.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0413.bin b/files/poketool/waza/waza_tbl/narc_0413.bin Binary files differdeleted file mode 100644 index 11b60fae..00000000 --- a/files/poketool/waza/waza_tbl/narc_0413.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0414.bin b/files/poketool/waza/waza_tbl/narc_0414.bin Binary files differdeleted file mode 100644 index 5147d12c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0414.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0415.bin b/files/poketool/waza/waza_tbl/narc_0415.bin Binary files differdeleted file mode 100644 index ac8a280c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0415.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0416.bin b/files/poketool/waza/waza_tbl/narc_0416.bin Binary files differdeleted file mode 100644 index aa8c327d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0416.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0417.bin b/files/poketool/waza/waza_tbl/narc_0417.bin Binary files differdeleted file mode 100644 index 8d2ed13d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0417.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0418.bin b/files/poketool/waza/waza_tbl/narc_0418.bin Binary files differdeleted file mode 100644 index 1ca57bd7..00000000 --- a/files/poketool/waza/waza_tbl/narc_0418.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0419.bin b/files/poketool/waza/waza_tbl/narc_0419.bin Binary files differdeleted file mode 100644 index 107e29c2..00000000 --- a/files/poketool/waza/waza_tbl/narc_0419.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0420.bin b/files/poketool/waza/waza_tbl/narc_0420.bin Binary files differdeleted file mode 100644 index c0ad13a9..00000000 --- a/files/poketool/waza/waza_tbl/narc_0420.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0421.bin b/files/poketool/waza/waza_tbl/narc_0421.bin Binary files differdeleted file mode 100644 index 9bfc9612..00000000 --- a/files/poketool/waza/waza_tbl/narc_0421.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0422.bin b/files/poketool/waza/waza_tbl/narc_0422.bin Binary files differdeleted file mode 100644 index eba3ffe6..00000000 --- a/files/poketool/waza/waza_tbl/narc_0422.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0423.bin b/files/poketool/waza/waza_tbl/narc_0423.bin Binary files differdeleted file mode 100644 index a216bd04..00000000 --- a/files/poketool/waza/waza_tbl/narc_0423.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0424.bin b/files/poketool/waza/waza_tbl/narc_0424.bin Binary files differdeleted file mode 100644 index 56c63ff8..00000000 --- a/files/poketool/waza/waza_tbl/narc_0424.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0425.bin b/files/poketool/waza/waza_tbl/narc_0425.bin Binary files differdeleted file mode 100644 index f63e5e6a..00000000 --- a/files/poketool/waza/waza_tbl/narc_0425.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0426.bin b/files/poketool/waza/waza_tbl/narc_0426.bin Binary files differdeleted file mode 100644 index da34521e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0426.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0427.bin b/files/poketool/waza/waza_tbl/narc_0427.bin Binary files differdeleted file mode 100644 index 07b156e7..00000000 --- a/files/poketool/waza/waza_tbl/narc_0427.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0428.bin b/files/poketool/waza/waza_tbl/narc_0428.bin Binary files differdeleted file mode 100644 index 5cb6db7b..00000000 --- a/files/poketool/waza/waza_tbl/narc_0428.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0429.bin b/files/poketool/waza/waza_tbl/narc_0429.bin Binary files differdeleted file mode 100644 index 1611df24..00000000 --- a/files/poketool/waza/waza_tbl/narc_0429.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0430.bin b/files/poketool/waza/waza_tbl/narc_0430.bin Binary files differdeleted file mode 100644 index e49a8500..00000000 --- a/files/poketool/waza/waza_tbl/narc_0430.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0431.bin b/files/poketool/waza/waza_tbl/narc_0431.bin Binary files differdeleted file mode 100644 index 498073b1..00000000 --- a/files/poketool/waza/waza_tbl/narc_0431.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0432.bin b/files/poketool/waza/waza_tbl/narc_0432.bin Binary files differdeleted file mode 100644 index 4aba4cd9..00000000 --- a/files/poketool/waza/waza_tbl/narc_0432.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0433.bin b/files/poketool/waza/waza_tbl/narc_0433.bin Binary files differdeleted file mode 100644 index 7b089dca..00000000 --- a/files/poketool/waza/waza_tbl/narc_0433.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0434.bin b/files/poketool/waza/waza_tbl/narc_0434.bin Binary files differdeleted file mode 100644 index c98f570d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0434.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0435.bin b/files/poketool/waza/waza_tbl/narc_0435.bin Binary files differdeleted file mode 100644 index 7fc5aa3d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0435.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0436.bin b/files/poketool/waza/waza_tbl/narc_0436.bin Binary files differdeleted file mode 100644 index c3bc1da8..00000000 --- a/files/poketool/waza/waza_tbl/narc_0436.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0437.bin b/files/poketool/waza/waza_tbl/narc_0437.bin Binary files differdeleted file mode 100644 index 01e8b723..00000000 --- a/files/poketool/waza/waza_tbl/narc_0437.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0438.bin b/files/poketool/waza/waza_tbl/narc_0438.bin Binary files differdeleted file mode 100644 index d0027d02..00000000 --- a/files/poketool/waza/waza_tbl/narc_0438.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0439.bin b/files/poketool/waza/waza_tbl/narc_0439.bin Binary files differdeleted file mode 100644 index e2a7350f..00000000 --- a/files/poketool/waza/waza_tbl/narc_0439.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0440.bin b/files/poketool/waza/waza_tbl/narc_0440.bin Binary files differdeleted file mode 100644 index cbea19cb..00000000 --- a/files/poketool/waza/waza_tbl/narc_0440.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0441.bin b/files/poketool/waza/waza_tbl/narc_0441.bin Binary files differdeleted file mode 100644 index 2f5a62e4..00000000 --- a/files/poketool/waza/waza_tbl/narc_0441.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0442.bin b/files/poketool/waza/waza_tbl/narc_0442.bin Binary files differdeleted file mode 100644 index 35a0b0c7..00000000 --- a/files/poketool/waza/waza_tbl/narc_0442.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0443.bin b/files/poketool/waza/waza_tbl/narc_0443.bin Binary files differdeleted file mode 100644 index 621fb43a..00000000 --- a/files/poketool/waza/waza_tbl/narc_0443.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0444.bin b/files/poketool/waza/waza_tbl/narc_0444.bin Binary files differdeleted file mode 100644 index d3648aad..00000000 --- a/files/poketool/waza/waza_tbl/narc_0444.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0445.bin b/files/poketool/waza/waza_tbl/narc_0445.bin Binary files differdeleted file mode 100644 index e53be86e..00000000 --- a/files/poketool/waza/waza_tbl/narc_0445.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0446.bin b/files/poketool/waza/waza_tbl/narc_0446.bin Binary files differdeleted file mode 100644 index da6d6e06..00000000 --- a/files/poketool/waza/waza_tbl/narc_0446.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0447.bin b/files/poketool/waza/waza_tbl/narc_0447.bin Binary files differdeleted file mode 100644 index 71fb5980..00000000 --- a/files/poketool/waza/waza_tbl/narc_0447.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0448.bin b/files/poketool/waza/waza_tbl/narc_0448.bin Binary files differdeleted file mode 100644 index 48a8102c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0448.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0449.bin b/files/poketool/waza/waza_tbl/narc_0449.bin Binary files differdeleted file mode 100644 index d5911be7..00000000 --- a/files/poketool/waza/waza_tbl/narc_0449.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0450.bin b/files/poketool/waza/waza_tbl/narc_0450.bin Binary files differdeleted file mode 100644 index 44a213fb..00000000 --- a/files/poketool/waza/waza_tbl/narc_0450.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0451.bin b/files/poketool/waza/waza_tbl/narc_0451.bin Binary files differdeleted file mode 100644 index 4a78c3e2..00000000 --- a/files/poketool/waza/waza_tbl/narc_0451.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0452.bin b/files/poketool/waza/waza_tbl/narc_0452.bin Binary files differdeleted file mode 100644 index 8858efbd..00000000 --- a/files/poketool/waza/waza_tbl/narc_0452.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0453.bin b/files/poketool/waza/waza_tbl/narc_0453.bin Binary files differdeleted file mode 100644 index 908bcb69..00000000 --- a/files/poketool/waza/waza_tbl/narc_0453.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0454.bin b/files/poketool/waza/waza_tbl/narc_0454.bin Binary files differdeleted file mode 100644 index 69d6f9d7..00000000 --- a/files/poketool/waza/waza_tbl/narc_0454.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0455.bin b/files/poketool/waza/waza_tbl/narc_0455.bin Binary files differdeleted file mode 100644 index ed5b5e21..00000000 --- a/files/poketool/waza/waza_tbl/narc_0455.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0456.bin b/files/poketool/waza/waza_tbl/narc_0456.bin Binary files differdeleted file mode 100644 index 5429d2f8..00000000 --- a/files/poketool/waza/waza_tbl/narc_0456.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0457.bin b/files/poketool/waza/waza_tbl/narc_0457.bin Binary files differdeleted file mode 100644 index 05f3c483..00000000 --- a/files/poketool/waza/waza_tbl/narc_0457.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0458.bin b/files/poketool/waza/waza_tbl/narc_0458.bin Binary files differdeleted file mode 100644 index ac2f8a0c..00000000 --- a/files/poketool/waza/waza_tbl/narc_0458.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0459.bin b/files/poketool/waza/waza_tbl/narc_0459.bin Binary files differdeleted file mode 100644 index b5cd223a..00000000 --- a/files/poketool/waza/waza_tbl/narc_0459.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0460.bin b/files/poketool/waza/waza_tbl/narc_0460.bin Binary files differdeleted file mode 100644 index 93d7a3b8..00000000 --- a/files/poketool/waza/waza_tbl/narc_0460.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0461.bin b/files/poketool/waza/waza_tbl/narc_0461.bin Binary files differdeleted file mode 100644 index 08b387b0..00000000 --- a/files/poketool/waza/waza_tbl/narc_0461.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0462.bin b/files/poketool/waza/waza_tbl/narc_0462.bin Binary files differdeleted file mode 100644 index 848f30c3..00000000 --- a/files/poketool/waza/waza_tbl/narc_0462.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0463.bin b/files/poketool/waza/waza_tbl/narc_0463.bin Binary files differdeleted file mode 100644 index 729d887f..00000000 --- a/files/poketool/waza/waza_tbl/narc_0463.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0464.bin b/files/poketool/waza/waza_tbl/narc_0464.bin Binary files differdeleted file mode 100644 index 67739957..00000000 --- a/files/poketool/waza/waza_tbl/narc_0464.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0465.bin b/files/poketool/waza/waza_tbl/narc_0465.bin Binary files differdeleted file mode 100644 index 2a7dd4e0..00000000 --- a/files/poketool/waza/waza_tbl/narc_0465.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0466.bin b/files/poketool/waza/waza_tbl/narc_0466.bin Binary files differdeleted file mode 100644 index 036840ec..00000000 --- a/files/poketool/waza/waza_tbl/narc_0466.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0467.bin b/files/poketool/waza/waza_tbl/narc_0467.bin Binary files differdeleted file mode 100644 index cb42580d..00000000 --- a/files/poketool/waza/waza_tbl/narc_0467.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0468.bin b/files/poketool/waza/waza_tbl/narc_0468.bin Binary files differdeleted file mode 100644 index a71eb40b..00000000 --- a/files/poketool/waza/waza_tbl/narc_0468.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0469.bin b/files/poketool/waza/waza_tbl/narc_0469.bin Binary files differdeleted file mode 100644 index 91d9fedc..00000000 --- a/files/poketool/waza/waza_tbl/narc_0469.bin +++ /dev/null diff --git a/files/poketool/waza/waza_tbl/narc_0470.bin b/files/poketool/waza/waza_tbl/narc_0470.bin Binary files differdeleted file mode 100644 index 3239ccb9..00000000 --- a/files/poketool/waza/waza_tbl/narc_0470.bin +++ /dev/null diff --git a/filesystem.mk b/filesystem.mk index 1ee8dde7..b1f9d4a7 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -287,6 +287,7 @@ O2NARC_TARGETS := \ files/poketool/personal/evo.narc \ files/poketool/personal/growtbl.narc \ files/poketool/personal/pms.narc \ + files/poketool/waza/waza_tbl.narc \ files/poketool/personal/pms.narc: O2NARCFLAGS = -f diff --git a/include/constants/battle.h b/include/constants/battle.h new file mode 100644 index 00000000..21a5f080 --- /dev/null +++ b/include/constants/battle.h @@ -0,0 +1,283 @@ +#ifndef POKEDIAMOND_BATTLE_H +#define POKEDIAMOND_BATTLE_H + +#define MOVE_EFFECT_NORMAL_HIT 0 +#define MOVE_EFFECT_SLEEP 1 +#define MOVE_EFFECT_POISON_HIT 2 +#define MOVE_EFFECT_DRAIN_HP 3 +#define MOVE_EFFECT_BURN_HIT 4 +#define MOVE_EFFECT_FREEZE_HIT 5 +#define MOVE_EFFECT_PARALYZE_HIT 6 +#define MOVE_EFFECT_EXPLOSION 7 +#define MOVE_EFFECT_DREAM_EATER 8 +#define MOVE_EFFECT_MIRROR_MOVE 9 +#define MOVE_EFFECT_ATTACK_UP 10 +#define MOVE_EFFECT_DEFENSE_UP 11 +#define MOVE_EFFECT_SPEED_UP 12 // unused +#define MOVE_EFFECT_SPATK_UP 13 +#define MOVE_EFFECT_SPDEF_UP 14 // unused +#define MOVE_EFFECT_ACCURACY_UP 15 // unused +#define MOVE_EFFECT_EVASION_UP 16 +#define MOVE_EFFECT_ALWAYS_HIT 17 +#define MOVE_EFFECT_ATTACK_DOWN 18 +#define MOVE_EFFECT_DEFENSE_DOWN 19 +#define MOVE_EFFECT_SPEED_DOWN 20 +#define MOVE_EFFECT_SPATK_DOWN 21 // unused +#define MOVE_EFFECT_SPDEF_DOWN 22 // unused +#define MOVE_EFFECT_ACCURACY_DOWN 23 +#define MOVE_EFFECT_EVASION_DOWN 24 +#define MOVE_EFFECT_STATS_RESET 25 +#define MOVE_EFFECT_BIDE 26 +#define MOVE_EFFECT_RAMPAGE 27 +#define MOVE_EFFECT_SWITCH_FOE 28 +#define MOVE_EFFECT_MULTIHIT_2_5 29 +#define MOVE_EFFECT_CONVERSION 30 +#define MOVE_EFFECT_FLINCH_HIT 31 +#define MOVE_EFFECT_RESTORE_HP 32 +#define MOVE_EFFECT_TOXIC 33 +#define MOVE_EFFECT_PAYDAY 34 +#define MOVE_EFFECT_LIGHT_SCREEN 35 +#define MOVE_EFFECT_TRI_ATTACK 36 +#define MOVE_EFFECT_SLEEP_USER 37 +#define MOVE_EFFECT_OHKO 38 +#define MOVE_EFFECT_RAZOR_WIND 39 +#define MOVE_EFFECT_SUPER_FANG 40 +#define MOVE_EFFECT_FIXED_40 41 +#define MOVE_EFFECT_TRAP_HIT 42 +#define MOVE_EFFECT_HIGH_CRIT 43 +#define MOVE_EFFECT_DOUBLE_HIT 44 +#define MOVE_EFFECT_JUMP_KICK 45 +#define MOVE_EFFECT_MIST 46 +#define MOVE_EFFECT_CRIT_CHANCE_UP 47 +#define MOVE_EFFECT_RECOIL_HIT 48 +#define MOVE_EFFECT_CONFUSE 49 +#define MOVE_EFFECT_ATTACK_2UP 50 +#define MOVE_EFFECT_DEFENSE_2UP 51 +#define MOVE_EFFECT_SPEED_2UP 52 +#define MOVE_EFFECT_SPATK_2UP 53 +#define MOVE_EFFECT_SPDEF_2UP 54 +#define MOVE_EFFECT_ACCURACY_2UP 55 // unused +#define MOVE_EFFECT_EVASION_2UP 56 // unused +#define MOVE_EFFECT_TRANSFORM 57 +#define MOVE_EFFECT_ATTACK_2DOWN 58 +#define MOVE_EFFECT_DEFENSE_2DOWN 59 +#define MOVE_EFFECT_SPEED_2DOWN 60 +#define MOVE_EFFECT_SPATK_2DOWN 61 // unused +#define MOVE_EFFECT_SPDEF_2DOWN 62 +#define MOVE_EFFECT_ACCURACY_2DOWN 63 // unused +#define MOVE_EFFECT_EVASION_2DOWN 64 // unused +#define MOVE_EFFECT_REFLECT 65 +#define MOVE_EFFECT_POISON 66 +#define MOVE_EFFECT_PARALYZE 67 +#define MOVE_EFFECT_ATTACK_DOWN_HIT 68 +#define MOVE_EFFECT_DEFENSE_DOWN_HIT 69 +#define MOVE_EFFECT_SPEED_DOWN_HIT 70 +#define MOVE_EFFECT_SPATK_DOWN_HIT 71 +#define MOVE_EFFECT_SPDEF_DOWN_HIT 72 +#define MOVE_EFFECT_ACCURACY_DOWN_HIT 73 +#define MOVE_EFFECT_EVASION_DOWN_HIT 74 // unused +#define MOVE_EFFECT_SKY_ATTACK 75 +#define MOVE_EFFECT_CONFUSE_HIT 76 +#define MOVE_EFFECT_POISON_DOUBLE_HIT 77 +#define MOVE_EFFECT_VITAL_THROW 78 +#define MOVE_EFFECT_SUBSTITUTE 79 +#define MOVE_EFFECT_HIT_RECHARGE 80 +#define MOVE_EFFECT_RAGE 81 +#define MOVE_EFFECT_MIMIC 82 +#define MOVE_EFFECT_METRONOME 83 +#define MOVE_EFFECT_LEECH_SEED 84 +#define MOVE_EFFECT_NONE 85 +#define MOVE_EFFECT_DISABLE 86 +#define MOVE_EFFECT_LEVEL_DAMAGE 87 +#define MOVE_EFFECT_RANDOM_DAMAGE 88 +#define MOVE_EFFECT_COUNTER 89 +#define MOVE_EFFECT_ENCORE 90 +#define MOVE_EFFECT_PAIN_SPLIT 91 +#define MOVE_EFFECT_SNORE 92 +#define MOVE_EFFECT_CONVERSION_2 93 +#define MOVE_EFFECT_ENSURE_NEXT_HIT 94 +#define MOVE_EFFECT_SKETCH 95 +#define MOVE_EFFECT_UNK096 96 // unused +#define MOVE_EFFECT_SLEEP_TALK 97 +#define MOVE_EFFECT_DESTINY_BOND 98 +#define MOVE_EFFECT_STRONGER_LOW_HP 99 +#define MOVE_EFFECT_SPITE 100 +#define MOVE_EFFECT_FALSE_SWIPE 101 +#define MOVE_EFFECT_HEAL_ALL_STATUS 102 +#define MOVE_EFFECT_PRIORITY_HIT 103 +#define MOVE_EFFECT_TRIPLE_KICK 104 +#define MOVE_EFFECT_STEAL_ITEM 105 +#define MOVE_EFFECT_PREVENT_ESCAPE 106 +#define MOVE_EFFECT_NIGHTMARE 107 +#define MOVE_EFFECT_MINIMIZE 108 +#define MOVE_EFFECT_CURSE 109 +#define MOVE_EFFECT_UNK110 110 // unused +#define MOVE_EFFECT_PROTECT 111 +#define MOVE_EFFECT_SPIKES 112 +#define MOVE_EFFECT_IDENTIFY 113 +#define MOVE_EFFECT_PERISH_SONG 114 +#define MOVE_EFFECT_SANDSTORM 115 +#define MOVE_EFFECT_ENDURE 116 +#define MOVE_EFFECT_INCREASING_HIT 117 +#define MOVE_EFFECT_SWAGGER 118 +#define MOVE_EFFECT_FURY_CUTTER 119 +#define MOVE_EFFECT_ATTRACT 120 +#define MOVE_EFFECT_RETURN 121 +#define MOVE_EFFECT_PRESENT 122 +#define MOVE_EFFECT_FRUSTRATION 123 +#define MOVE_EFFECT_SAFEGUARD 124 +#define MOVE_EFFECT_BURN_HIT_THAW 125 +#define MOVE_EFFECT_MAGNITUDE 126 +#define MOVE_EFFECT_BATON_PASS 127 +#define MOVE_EFFECT_PURSUIT 128 +#define MOVE_EFFECT_RAPID_SPIN 129 +#define MOVE_EFFECT_FIXED_20 130 +#define MOVE_EFFECT_UNK131 131 // unused +#define MOVE_EFFECT_RESTORE_HP_DAYTIME 132 +#define MOVE_EFFECT_UNK133 133 // unused +#define MOVE_EFFECT_UNK134 134 // unused +#define MOVE_EFFECT_HIDDEN_POWER 135 // unused +#define MOVE_EFFECT_RAIN 136 +#define MOVE_EFFECT_SUNNY 137 +#define MOVE_EFFECT_DEFENSE_UP_HIT 138 +#define MOVE_EFFECT_ATTACK_UP_HIT 139 +#define MOVE_EFFECT_STATS_UP_HIT 140 +#define MOVE_EFFECT_UNK141 141 // unused +#define MOVE_EFFECT_BELLY_DRUM 142 +#define MOVE_EFFECT_PSYCH_UP 143 +#define MOVE_EFFECT_MIRROR_COAT 144 +#define MOVE_EFFECT_SKULL_BASH 145 +#define MOVE_EFFECT_TWISTER 146 +#define MOVE_EFFECT_EARTHQUAKE 147 +#define MOVE_EFFECT_HIT_LATER 148 +#define MOVE_EFFECT_GUST 149 +#define MOVE_EFFECT_STOMP 150 +#define MOVE_EFFECT_SOLAR_BEAM 151 +#define MOVE_EFFECT_THUNDER 152 +#define MOVE_EFFECT_TELEPORT 153 +#define MOVE_EFFECT_BEAT_UP 154 +#define MOVE_EFFECT_FLY 155 +#define MOVE_EFFECT_DEFENSE_CURL 156 +#define MOVE_EFFECT_UNK157 157 // unused +#define MOVE_EFFECT_FAKE_OUT 158 +#define MOVE_EFFECT_UPROAR 159 +#define MOVE_EFFECT_STOCKPILE 160 +#define MOVE_EFFECT_SPIT_UP 161 +#define MOVE_EFFECT_SWALLOW 162 +#define MOVE_EFFECT_UNK163 163 // unused +#define MOVE_EFFECT_HAIL 164 +#define MOVE_EFFECT_TORMENT 165 +#define MOVE_EFFECT_FLATTER 166 +#define MOVE_EFFECT_BURN 167 +#define MOVE_EFFECT_MEMENTO 168 +#define MOVE_EFFECT_FACADE 169 +#define MOVE_EFFECT_FOCUS_PUNCH 170 +#define MOVE_EFFECT_SMELLING_SALTS 171 +#define MOVE_EFFECT_FOLLOW_ME 172 +#define MOVE_EFFECT_NATURE_POWER 173 +#define MOVE_EFFECT_CHARGE 174 +#define MOVE_EFFECT_TAUNT 175 +#define MOVE_EFFECT_HELPING_HAND 176 +#define MOVE_EFFECT_SWAP_ITEMS 177 +#define MOVE_EFFECT_ROLE_PLAY 178 +#define MOVE_EFFECT_WISH 179 +#define MOVE_EFFECT_ASSIST 180 +#define MOVE_EFFECT_INGRAIN 181 +#define MOVE_EFFECT_SUPERPOWER 182 +#define MOVE_EFFECT_MAGIC_COAT 183 +#define MOVE_EFFECT_RECYCLE 184 +#define MOVE_EFFECT_REVENGE 185 +#define MOVE_EFFECT_BRICK_BREAK 186 +#define MOVE_EFFECT_YAWN 187 +#define MOVE_EFFECT_KNOCK_OFF 188 +#define MOVE_EFFECT_ENDEAVOR 189 +#define MOVE_EFFECT_STRONGER_HIGH_HP 190 +#define MOVE_EFFECT_SKILL_SWAP 191 +#define MOVE_EFFECT_IMPRISON 192 +#define MOVE_EFFECT_REFRESH 193 +#define MOVE_EFFECT_GRUDGE 194 +#define MOVE_EFFECT_SNATCH 195 +#define MOVE_EFFECT_STRONGER_HEAVIER 196 +#define MOVE_EFFECT_SECRET_POWER 197 +#define MOVE_EFFECT_RECOIL_HIT_HARD 198 +#define MOVE_EFFECT_CONFUSE_ALL 199 +#define MOVE_EFFECT_BURN_HIT_HIGH_CRIT 200 +#define MOVE_EFFECT_MUD_SPORT 201 +#define MOVE_EFFECT_TOXIC_HIT 202 +#define MOVE_EFFECT_WEATHER_BALL 203 +#define MOVE_EFFECT_HIT_USER_SPATK_2_DOWN 204 +#define MOVE_EFFECT_ATTACK_DEFENSE_DOWN 205 +#define MOVE_EFFECT_DEFENSE_SPDEF_UP 206 +#define MOVE_EFFECT_SKY_UPPERCUT 207 +#define MOVE_EFFECT_ATTACK_DEFENSE_UP 208 +#define MOVE_EFFECT_POISON_HIT_HIGH_CRIT 209 +#define MOVE_EFFECT_WATER_SPORT 210 +#define MOVE_EFFECT_SPATK_SPDEF_UP 211 +#define MOVE_EFFECT_ATTACK_SPEED_UP 212 +#define MOVE_EFFECT_CAMOUFLAGE 213 +#define MOVE_EFFECT_ROOST 214 +#define MOVE_EFFECT_GRAVITY 215 +#define MOVE_EFFECT_MIRACLE_EYE 216 +#define MOVE_EFFECT_WAKE_UP_SLAP 217 +#define MOVE_EFFECT_HAMMER_ARM 218 +#define MOVE_EFFECT_GYRO_BALL 219 +#define MOVE_EFFECT_HEALING_WISH 220 +#define MOVE_EFFECT_BRINE 221 +#define MOVE_EFFECT_NATURAL_GIFT 222 +#define MOVE_EFFECT_FEINT 223 +#define MOVE_EFFECT_BUG_BITE 224 +#define MOVE_EFFECT_TAILWIND 225 +#define MOVE_EFFECT_ACUPRESSURE 226 +#define MOVE_EFFECT_METAL_BURST 227 +#define MOVE_EFFECT_U_TURN 228 +#define MOVE_EFFECT_CLOSE_COMBAT 229 +#define MOVE_EFFECT_PAYBACK 230 +#define MOVE_EFFECT_ASSURANCE 231 +#define MOVE_EFFECT_EMBARGO 232 +#define MOVE_EFFECT_FLING 233 +#define MOVE_EFFECT_PSYCHO_SHIFT 234 +#define MOVE_EFFECT_TRUMP_CARD 235 +#define MOVE_EFFECT_HEAL_BLOCK 236 +#define MOVE_EFFECT_CRUSH_GRIP 237 +#define MOVE_EFFECT_POWER_TRICK 238 +#define MOVE_EFFECT_GASTRO_ACID 239 +#define MOVE_EFFECT_LUCKY_CHANT 240 +#define MOVE_EFFECT_ME_FIRST 241 +#define MOVE_EFFECT_COPYCAT 242 +#define MOVE_EFFECT_POWER_SWAP 243 +#define MOVE_EFFECT_GUARD_SWAP 244 +#define MOVE_EFFECT_PUNISHMENT 245 +#define MOVE_EFFECT_LAST_RESORT 246 +#define MOVE_EFFECT_WORRY_SEED 247 +#define MOVE_EFFECT_SUCKER_PUNCH 248 +#define MOVE_EFFECT_TOXIC_SPIKES 249 +#define MOVE_EFFECT_HEART_SWAP 250 +#define MOVE_EFFECT_AQUA_RING 251 +#define MOVE_EFFECT_MAGNET_RISE 252 +#define MOVE_EFFECT_FLARE_BLITZ 253 +#define MOVE_EFFECT_STRUGGLE 254 +#define MOVE_EFFECT_DIVE 255 +#define MOVE_EFFECT_DIG 256 +#define MOVE_EFFECT_SURF 257 +#define MOVE_EFFECT_DEFOG 258 +#define MOVE_EFFECT_TRICK_ROOM 259 +#define MOVE_EFFECT_BLIZZARD 260 +#define MOVE_EFFECT_WHIRLPOOL 261 +#define MOVE_EFFECT_VOLT_TACKLE 262 +#define MOVE_EFFECT_BOUNCE 263 +#define MOVE_EFFECT_UNK264 264 // unused +#define MOVE_EFFECT_CAPTIVATE 265 +#define MOVE_EFFECT_STEALTH_ROCK 266 +#define MOVE_EFFECT_CHATTER 267 +#define MOVE_EFFECT_JUDGMENT 268 +#define MOVE_EFFECT_HEAD_SMASH 269 +#define MOVE_EFFECT_LUNAR_DANCE 270 +#define MOVE_EFFECT_SEED_FLARE 271 +#define MOVE_EFFECT_SHADOW_FORCE 272 +#define MOVE_EFFECT_FIRE_FANG 273 +#define MOVE_EFFECT_ICE_FANG 274 +#define MOVE_EFFECT_THUNDER_FANG 275 +#define MOVE_EFFECT_CHARGE_BEAM 276 + + +#endif //POKEDIAMOND_BATTLE_H diff --git a/include/constants/moves.h b/include/constants/moves.h index bd658c17..b25e5f91 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -470,6 +470,10 @@ #define MOVE_OMINOUS_WIND 466 #define MOVE_SHADOW_FORCE 467 +#define CLASS_PHYSICAL 0 +#define CLASS_SPECIAL 1 +#define CLASS_STATUS 2 + #define NUM_MOVES MOVE_SHADOW_FORCE #endif //POKEDIAMOND_CONSTANTS_MOVES_H diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index c83847c6..06a105b6 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -24,6 +24,13 @@ #define TYPE_DARK 17 #define NUMBER_OF_MON_TYPES 18 +// Contest types +#define COOL 0 +#define BEAUTY 1 +#define CUTE 2 +#define SMART 3 +#define TOUGH 4 + // Pokemon egg groups #define EGG_GROUP_NONE 0 #define EGG_GROUP_MONSTER 1 @@ -88,185 +95,185 @@ #define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536 -#define MON_DATA_PERSONALITY 0 -#define MON_DATA_PARTY_LOCK 1 -#define MON_DATA_BOX_LOCK 2 -#define MON_DATA_CHECKSUM_FAILED 3 -#define MON_DATA_CHECKSUM 4 -#define MON_DATA_SPECIES 5 -#define MON_DATA_HELD_ITEM 6 -#define MON_DATA_OTID 7 -#define MON_DATA_EXPERIENCE 8 -#define MON_DATA_FRIENDSHIP 9 -#define MON_DATA_ABILITY 10 -#define MON_DATA_MARKINGS 11 -#define MON_DATA_GAME_LANGUAGE 12 -#define MON_DATA_HP_EV 13 -#define MON_DATA_ATK_EV 14 -#define MON_DATA_DEF_EV 15 -#define MON_DATA_SPEED_EV 16 -#define MON_DATA_SPATK_EV 17 -#define MON_DATA_SPDEF_EV 18 -#define MON_DATA_COOL 19 -#define MON_DATA_BEAUTY 20 -#define MON_DATA_CUTE 21 -#define MON_DATA_SMART 22 -#define MON_DATA_TOUGH 23 -#define MON_DATA_SHEEN 24 -#define MON_DATA_SINNOH_CHAMP_RIBBON 25 -#define MON_DATA_SINNOH_RIBBON_26 26 -#define MON_DATA_SINNOH_RIBBON_27 27 -#define MON_DATA_SINNOH_RIBBON_28 28 -#define MON_DATA_SINNOH_RIBBON_29 29 -#define MON_DATA_SINNOH_RIBBON_30 30 -#define MON_DATA_SINNOH_RIBBON_31 31 -#define MON_DATA_SINNOH_RIBBON_32 32 -#define MON_DATA_SINNOH_RIBBON_33 33 -#define MON_DATA_SINNOH_RIBBON_34 34 -#define MON_DATA_SINNOH_RIBBON_35 35 -#define MON_DATA_SINNOH_RIBBON_36 36 -#define MON_DATA_SINNOH_RIBBON_37 37 -#define MON_DATA_SINNOH_RIBBON_38 38 -#define MON_DATA_SINNOH_RIBBON_39 39 -#define MON_DATA_SINNOH_RIBBON_40 40 -#define MON_DATA_SINNOH_RIBBON_41 41 -#define MON_DATA_SINNOH_RIBBON_42 42 -#define MON_DATA_SINNOH_RIBBON_43 43 -#define MON_DATA_SINNOH_RIBBON_44 44 -#define MON_DATA_SINNOH_RIBBON_45 45 -#define MON_DATA_SINNOH_RIBBON_46 46 -#define MON_DATA_SINNOH_RIBBON_47 47 -#define MON_DATA_SINNOH_RIBBON_48 48 -#define MON_DATA_SINNOH_RIBBON_49 49 -#define MON_DATA_SINNOH_RIBBON_50 50 -#define MON_DATA_SINNOH_RIBBON_51 51 -#define MON_DATA_SINNOH_RIBBON_52 52 -#define MON_DATA_SINNOH_RIBBON_53 53 -#define MON_DATA_MOVE1 54 -#define MON_DATA_MOVE2 55 -#define MON_DATA_MOVE3 56 -#define MON_DATA_MOVE4 57 -#define MON_DATA_MOVE1PP 58 -#define MON_DATA_MOVE2PP 59 -#define MON_DATA_MOVE3PP 60 -#define MON_DATA_MOVE4PP 61 -#define MON_DATA_MOVE1PPUP 62 -#define MON_DATA_MOVE2PPUP 63 -#define MON_DATA_MOVE3PPUP 64 -#define MON_DATA_MOVE4PPUP 65 -#define MON_DATA_MOVE1MAXPP 66 -#define MON_DATA_MOVE2MAXPP 67 -#define MON_DATA_MOVE3MAXPP 68 -#define MON_DATA_MOVE4MAXPP 69 -#define MON_DATA_HP_IV 70 -#define MON_DATA_ATK_IV 71 -#define MON_DATA_DEF_IV 72 -#define MON_DATA_SPEED_IV 73 -#define MON_DATA_SPATK_IV 74 -#define MON_DATA_SPDEF_IV 75 -#define MON_DATA_IS_EGG 76 -#define MON_DATA_HAS_NICKNAME 77 -#define MON_DATA_COOL_RIBBON 78 -#define MON_DATA_HOENN_RIBBON_79 79 -#define MON_DATA_HOENN_RIBBON_80 80 -#define MON_DATA_HOENN_RIBBON_81 81 -#define MON_DATA_HOENN_RIBBON_82 82 -#define MON_DATA_HOENN_RIBBON_83 83 -#define MON_DATA_HOENN_RIBBON_84 84 -#define MON_DATA_HOENN_RIBBON_85 85 -#define MON_DATA_HOENN_RIBBON_86 86 -#define MON_DATA_HOENN_RIBBON_87 87 -#define MON_DATA_HOENN_RIBBON_88 88 -#define MON_DATA_HOENN_RIBBON_89 89 -#define MON_DATA_HOENN_RIBBON_90 90 -#define MON_DATA_HOENN_RIBBON_91 91 -#define MON_DATA_HOENN_RIBBON_92 92 -#define MON_DATA_HOENN_RIBBON_93 93 -#define MON_DATA_HOENN_RIBBON_94 94 -#define MON_DATA_HOENN_RIBBON_95 95 -#define MON_DATA_HOENN_RIBBON_96 96 -#define MON_DATA_HOENN_RIBBON_97 97 -#define MON_DATA_HOENN_RIBBON_98 98 -#define MON_DATA_HOENN_RIBBON_99 99 -#define MON_DATA_HOENN_RIBBON_100 100 -#define MON_DATA_HOENN_RIBBON_101 101 -#define MON_DATA_HOENN_RIBBON_102 102 -#define MON_DATA_HOENN_RIBBON_103 103 -#define MON_DATA_HOENN_RIBBON_104 104 -#define MON_DATA_HOENN_RIBBON_105 105 -#define MON_DATA_HOENN_RIBBON_106 106 -#define MON_DATA_HOENN_RIBBON_107 107 -#define MON_DATA_HOENN_RIBBON_108 108 -#define MON_DATA_HOENN_RIBBON_109 109 -#define MON_DATA_FATEFUL_ENCOUNTER 110 -#define MON_DATA_GENDER 111 -#define MON_DATA_FORME 112 -#define MON_DATA_RESERVED_113 113 // HGSS -#define MON_DATA_RESERVED_114 114 // Plat -#define MON_DATA_UNUSED_115 115 -#define MON_DATA_NICKNAME 116 -#define MON_DATA_NICKNAME_2 117 -#define MON_DATA_NICKNAME_3 118 // ??? -#define MON_DATA_NICKNAME_4 119 // ??? -#define MON_DATA_UNK_120 120 -#define MON_DATA_GAME_VERSION 121 -#define MON_DATA_SINNOH_RIBBON_122 122 -#define MON_DATA_SINNOH_RIBBON_123 123 -#define MON_DATA_SINNOH_RIBBON_124 124 -#define MON_DATA_SINNOH_RIBBON_125 125 -#define MON_DATA_SINNOH_RIBBON_126 126 -#define MON_DATA_SINNOH_RIBBON_127 127 -#define MON_DATA_SINNOH_RIBBON_128 128 -#define MON_DATA_SINNOH_RIBBON_129 129 -#define MON_DATA_SINNOH_RIBBON_130 130 -#define MON_DATA_SINNOH_RIBBON_131 131 -#define MON_DATA_SINNOH_RIBBON_132 132 -#define MON_DATA_SINNOH_RIBBON_133 133 -#define MON_DATA_SINNOH_RIBBON_134 134 -#define MON_DATA_SINNOH_RIBBON_135 135 -#define MON_DATA_SINNOH_RIBBON_136 136 -#define MON_DATA_SINNOH_RIBBON_137 137 -#define MON_DATA_SINNOH_RIBBON_138 138 -#define MON_DATA_SINNOH_RIBBON_139 139 -#define MON_DATA_SINNOH_RIBBON_140 140 -#define MON_DATA_SINNOH_RIBBON_141 141 -#define MON_DATA_SINNOH_RIBBON_142 142 -#define MON_DATA_OT_NAME 143 -#define MON_DATA_OT_NAME_2 144 // ??? -#define MON_DATA_EGG_MET_YEAR 145 -#define MON_DATA_EGG_MET_MONTH 146 -#define MON_DATA_EGG_MET_DAY 147 -#define MON_DATA_MET_YEAR 148 -#define MON_DATA_MET_MONTH 149 -#define MON_DATA_MET_DAY 150 -#define MON_DATA_EGG_MET_LOCATION 151 -#define MON_DATA_MET_LOCATION 152 -#define MON_DATA_POKERUS 153 -#define MON_DATA_POKEBALL 154 -#define MON_DATA_MET_LEVEL 155 -#define MON_DATA_MET_GENDER 156 -#define MON_DATA_ENCOUNTER_TYPE 157 -#define MON_DATA_RESERVED_158 158 // HGSS -#define MON_DATA_STATUS 159 -#define MON_DATA_LEVEL 160 -#define MON_DATA_CAPSULE 161 -#define MON_DATA_HP 162 -#define MON_DATA_MAXHP 163 -#define MON_DATA_ATK 164 -#define MON_DATA_DEF 165 -#define MON_DATA_SPEED 166 -#define MON_DATA_SPATK 167 -#define MON_DATA_SPDEF 168 -#define MON_DATA_SEAL_STRUCT 169 -#define MON_DATA_SEAL_COORDS 170 -#define MON_DATA_SPECIES_EXISTS 171 -#define MON_DATA_SANITY_IS_EGG 172 -#define MON_DATA_SPECIES2 173 -#define MON_DATA_IVS_WORD 174 -#define MON_DATA_UNK_175 175 -#define MON_DATA_TYPE_1 176 -#define MON_DATA_TYPE_2 177 -#define MON_DATA_SPECIES_NAME 178 +#define MON_DATA_PERSONALITY 0 +#define MON_DATA_PARTY_LOCK 1 +#define MON_DATA_BOX_LOCK 2 +#define MON_DATA_CHECKSUM_FAILED 3 +#define MON_DATA_CHECKSUM 4 +#define MON_DATA_SPECIES 5 +#define MON_DATA_HELD_ITEM 6 +#define MON_DATA_OTID 7 +#define MON_DATA_EXPERIENCE 8 +#define MON_DATA_FRIENDSHIP 9 +#define MON_DATA_ABILITY 10 +#define MON_DATA_MARKINGS 11 +#define MON_DATA_GAME_LANGUAGE 12 +#define MON_DATA_HP_EV 13 +#define MON_DATA_ATK_EV 14 +#define MON_DATA_DEF_EV 15 +#define MON_DATA_SPEED_EV 16 +#define MON_DATA_SPATK_EV 17 +#define MON_DATA_SPDEF_EV 18 +#define MON_DATA_COOL 19 +#define MON_DATA_BEAUTY 20 +#define MON_DATA_CUTE 21 +#define MON_DATA_SMART 22 +#define MON_DATA_TOUGH 23 +#define MON_DATA_SHEEN 24 +#define MON_DATA_SINNOH_CHAMP_RIBBON 25 +#define MON_DATA_ABILITY_RIBBON 26 +#define MON_DATA_GREAT_ABILITY_RIBBON 27 +#define MON_DATA_DOUBLE_ABILITY_RIBBON 28 +#define MON_DATA_MULTI_ABILITY_RIBBON 29 +#define MON_DATA_PAIR_ABILITY_RIBBON 30 +#define MON_DATA_WORLD_ABILITY_RIBBON 31 +#define MON_DATA_ALERT_RIBBON 32 +#define MON_DATA_SHOCK_RIBBON 33 +#define MON_DATA_DOWNCAST_RIBBON 34 +#define MON_DATA_CARELESS_RIBBON 35 +#define MON_DATA_RELAX_RIBBON 36 +#define MON_DATA_SNOOZE_RIBBON 37 +#define MON_DATA_SMILE_RIBBON 38 +#define MON_DATA_GORGEOUS_RIBBON 39 +#define MON_DATA_ROYAL_RIBBON 40 +#define MON_DATA_GORGEOUS_ROYAL_RIBBON 41 +#define MON_DATA_FOOTPRINT_RIBBON 42 +#define MON_DATA_RECORD_RIBBON 43 +#define MON_DATA_HISTORY_RIBBON 44 +#define MON_DATA_LEGEND_RIBBON 45 +#define MON_DATA_RED_RIBBON 46 +#define MON_DATA_GREEN_RIBBON 47 +#define MON_DATA_BLUE_RIBBON 48 +#define MON_DATA_FESTIVAL_RIBBON 49 +#define MON_DATA_CARNIVAL_RIBBON 50 +#define MON_DATA_CLASSIC_RIBBON 51 +#define MON_DATA_PREMIER_RIBBON 52 +#define MON_DATA_SINNOH_RIBBON_53 53 +#define MON_DATA_MOVE1 54 +#define MON_DATA_MOVE2 55 +#define MON_DATA_MOVE3 56 +#define MON_DATA_MOVE4 57 +#define MON_DATA_MOVE1PP 58 +#define MON_DATA_MOVE2PP 59 +#define MON_DATA_MOVE3PP 60 +#define MON_DATA_MOVE4PP 61 +#define MON_DATA_MOVE1PPUP 62 +#define MON_DATA_MOVE2PPUP 63 +#define MON_DATA_MOVE3PPUP 64 +#define MON_DATA_MOVE4PPUP 65 +#define MON_DATA_MOVE1MAXPP 66 +#define MON_DATA_MOVE2MAXPP 67 +#define MON_DATA_MOVE3MAXPP 68 +#define MON_DATA_MOVE4MAXPP 69 +#define MON_DATA_HP_IV 70 +#define MON_DATA_ATK_IV 71 +#define MON_DATA_DEF_IV 72 +#define MON_DATA_SPEED_IV 73 +#define MON_DATA_SPATK_IV 74 +#define MON_DATA_SPDEF_IV 75 +#define MON_DATA_IS_EGG 76 +#define MON_DATA_HAS_NICKNAME 77 +#define MON_DATA_HOENN_COOL_RIBBON 78 +#define MON_DATA_HOENN_COOL_RIBBON_SUPER 79 +#define MON_DATA_HOENN_COOL_RIBBON_HYPER 80 +#define MON_DATA_HOENN_COOL_RIBBON_MASTER 81 +#define MON_DATA_HOENN_BEAUTY_RIBBON 82 +#define MON_DATA_HOENN_BEAUTY_RIBBON_SUPER 83 +#define MON_DATA_HOENN_BEAUTY_RIBBON_HYPER 84 +#define MON_DATA_HOENN_BEAUTY_RIBBON_MASTER 85 +#define MON_DATA_HOENN_CUTE_RIBBON 86 +#define MON_DATA_HOENN_CUTE_RIBBON_SUPER 87 +#define MON_DATA_HOENN_CUTE_RIBBON_HYPER 88 +#define MON_DATA_HOENN_CUTE_RIBBON_MASTER 89 +#define MON_DATA_HOENN_SMART_RIBBON 90 +#define MON_DATA_HOENN_SMART_RIBBON_SUPER 91 +#define MON_DATA_HOENN_SMART_RIBBON_HYPER 92 +#define MON_DATA_HOENN_SMART_RIBBON_MASTER 93 +#define MON_DATA_HOENN_TOUGH_RIBBON 94 +#define MON_DATA_HOENN_TOUGH_RIBBON_SUPER 95 +#define MON_DATA_HOENN_TOUGH_RIBBON_HYPER 96 +#define MON_DATA_HOENN_TOUGH_RIBBON_MASTER 97 +#define MON_DATA_HOENN_CHAMPION_RIBBON 98 +#define MON_DATA_HOENN_WINNING_RIBBON 99 +#define MON_DATA_HOENN_VICTORY_RIBBON 100 +#define MON_DATA_HOENN_ARTIST_RIBBON 101 +#define MON_DATA_HOENN_EFFORT_RIBBON 102 +#define MON_DATA_HOENN_MARINE_RIBBON 103 +#define MON_DATA_HOENN_LAND_RIBBON 104 +#define MON_DATA_HOENN_SKY_RIBBON 105 +#define MON_DATA_HOENN_COUNTRY_RIBBON 106 +#define MON_DATA_HOENN_NATIONAL_RIBBON 107 +#define MON_DATA_HOENN_EARTH_RIBBON 108 +#define MON_DATA_HOENN_WORLD_RIBBON 109 +#define MON_DATA_FATEFUL_ENCOUNTER 110 +#define MON_DATA_GENDER 111 +#define MON_DATA_FORME 112 +#define MON_DATA_RESERVED_113 113 // HGSS +#define MON_DATA_RESERVED_114 114 // Plat +#define MON_DATA_UNUSED_115 115 +#define MON_DATA_NICKNAME 116 +#define MON_DATA_NICKNAME_2 117 +#define MON_DATA_NICKNAME_3 118 // ??? +#define MON_DATA_NICKNAME_4 119 // ??? +#define MON_DATA_UNK_120 120 +#define MON_DATA_GAME_VERSION 121 +#define MON_DATA_COOL_RIBBON 122 +#define MON_DATA_COOL_RIBBON_GREAT 123 +#define MON_DATA_COOL_RIBBON_ULTRA 124 +#define MON_DATA_COOL_RIBBON_MASTER 125 +#define MON_DATA_BEAUTY_RIBBON 126 +#define MON_DATA_BEAUTY_RIBBON_GREAT 127 +#define MON_DATA_BEAUTY_RIBBON_ULTRA 128 +#define MON_DATA_BEAUTY_RIBBON_MASTER 129 +#define MON_DATA_CUTE_RIBBON 130 +#define MON_DATA_CUTE_RIBBON_GREAT 131 +#define MON_DATA_CUTE_RIBBON_ULTRA 132 +#define MON_DATA_CUTE_RIBBON_MASTER 133 +#define MON_DATA_SMART_RIBBON 134 +#define MON_DATA_SMART_RIBBON_GREAT 135 +#define MON_DATA_SMART_RIBBON_ULTRA 136 +#define MON_DATA_SMART_RIBBON_MASTER 137 +#define MON_DATA_TOUGH_RIBBON 138 +#define MON_DATA_TOUGH_RIBBON_GREAT 139 +#define MON_DATA_TOUGH_RIBBON_ULTRA 140 +#define MON_DATA_TOUGH_RIBBON_MASTER 141 +#define MON_DATA_SINNOH_RIBBON_142 142 +#define MON_DATA_OT_NAME 143 +#define MON_DATA_OT_NAME_2 144 // ??? +#define MON_DATA_EGG_MET_YEAR 145 +#define MON_DATA_EGG_MET_MONTH 146 +#define MON_DATA_EGG_MET_DAY 147 +#define MON_DATA_MET_YEAR 148 +#define MON_DATA_MET_MONTH 149 +#define MON_DATA_MET_DAY 150 +#define MON_DATA_EGG_MET_LOCATION 151 +#define MON_DATA_MET_LOCATION 152 +#define MON_DATA_POKERUS 153 +#define MON_DATA_POKEBALL 154 +#define MON_DATA_MET_LEVEL 155 +#define MON_DATA_MET_GENDER 156 +#define MON_DATA_ENCOUNTER_TYPE 157 +#define MON_DATA_RESERVED_158 158 // HGSS +#define MON_DATA_STATUS 159 +#define MON_DATA_LEVEL 160 +#define MON_DATA_CAPSULE 161 +#define MON_DATA_HP 162 +#define MON_DATA_MAXHP 163 +#define MON_DATA_ATK 164 +#define MON_DATA_DEF 165 +#define MON_DATA_SPEED 166 +#define MON_DATA_SPATK 167 +#define MON_DATA_SPDEF 168 +#define MON_DATA_SEAL_STRUCT 169 +#define MON_DATA_SEAL_COORDS 170 +#define MON_DATA_SPECIES_EXISTS 171 +#define MON_DATA_SANITY_IS_EGG 172 +#define MON_DATA_SPECIES2 173 +#define MON_DATA_IVS_WORD 174 +#define MON_DATA_UNK_175 175 +#define MON_DATA_TYPE_1 176 +#define MON_DATA_TYPE_2 177 +#define MON_DATA_SPECIES_NAME 178 #define MON_RATIO_MALE 0 #define MON_RATIO_EIGHTH 31 diff --git a/include/main.h b/include/main.h index a01f06ce..fa31953c 100644 --- a/include/main.h +++ b/include/main.h @@ -97,8 +97,8 @@ void NitroMain(void); extern struct Unk21C48B8 gMain; void FUN_02000DF4(void); -void FUN_02000E0C(void); -void FUN_02000E7C(FSOverlayID id, struct Unk21DBE18 * arg1); +void Main_RunOverlayManager(void); +void RegisterMainOverlay(FSOverlayID id, struct Unk21DBE18 * arg1); void FUN_02000E9C(void); void FUN_02000EC8(u32 parameter); void FUN_02000EE8(void); diff --git a/include/move_data.h b/include/move_data.h index a970e1bf..9f8656d7 100644 --- a/include/move_data.h +++ b/include/move_data.h @@ -4,7 +4,7 @@ struct WazaTbl { u16 effect; - u8 unk2; + u8 class; u8 power; u8 type; u8 accuracy; @@ -20,7 +20,7 @@ struct WazaTbl typedef enum MoveAttr { MOVEATTR_EFFECT = 0, - MOVEATTR_UNK1, + MOVEATTR_CLASS, MOVEATTR_POWER, MOVEATTR_TYPE, MOVEATTR_ACCURACY, diff --git a/include/player_data.h b/include/player_data.h index 28133f43..bd9cd3b9 100644 --- a/include/player_data.h +++ b/include/player_data.h @@ -12,7 +12,7 @@ struct PlayerData /* 0x10 */ u32 playerId; /* 0x14 */ u32 money; /* 0x18 */ u8 gender; - /* 0x19 */ u8 language; + /* 0x19 */ u8 country; /* 0x1A */ u8 badges; /* 0x1B */ u8 avatar; /* 0x1C */ u8 field_1C; diff --git a/include/pokemon.h b/include/pokemon.h index d3be0c34..ed62c18e 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -9,7 +9,7 @@ #include "seals.h" #include "constants/pokemon.h" #include "string16.h" -#include "save_block_2.h" +#include "player_data.h" struct BaseStats { /* 0x00 */ u8 hp; @@ -305,6 +305,6 @@ u16 GetLegendaryMon(u32 idx); BOOL FUN_0206A998(struct Pokemon * pokemon); BOOL FUN_0206A9AC(struct BoxPokemon * boxmon, struct PlayerData * sb2, u32 heap_id); void FUN_0206AA84(struct Pokemon * pokemon); -void FUN_0206AAB4(struct BoxPokemon * boxmon); +void RestoreBoxMonPP(struct BoxPokemon * boxmon); #endif //POKEDIAMOND_POKEMON_H diff --git a/include/save_block_2.h b/include/save_block_2.h index 5257b11d..304469c7 100644 --- a/include/save_block_2.h +++ b/include/save_block_2.h @@ -2,7 +2,6 @@ #define POKEDIAMOND_SAVE_BLOCK_2_H #include "MATH_crc.h" -#include "player_data.h" struct SavArrayHeader { diff --git a/include/script.h b/include/script.h index 7c4dae6d..8fd7696f 100644 --- a/include/script.h +++ b/include/script.h @@ -24,7 +24,7 @@ struct ScriptContext u32 unk74;
struct MsgData * unk78;
u8 *unk7C;
- struct SaveBlock2 * unk80;
+ struct UnkStruct_0204639C * unk80;
};
#define ScriptReadByte(ctx) (*(ctx->scriptPtr++))
diff --git a/include/sound.h b/include/sound.h index 9cec824d..9b50542f 100644 --- a/include/sound.h +++ b/include/sound.h @@ -3,7 +3,7 @@ #include "FS_file.h" #include "sdat.h" -#include "save_block_2.h" +#include "player_data.h" struct SoundData { diff --git a/include/unk_0207FC5C.h b/include/unk_0207FC5C.h new file mode 100644 index 00000000..0e26f38e --- /dev/null +++ b/include/unk_0207FC5C.h @@ -0,0 +1,89 @@ +#ifndef POKEDIAMOND_UNK_0207FC5C_H +#define POKEDIAMOND_UNK_0207FC5C_H + +#define RIBBON_HOENN_CHAMPION 0 +#define RIBBON_HOENN_COOL 1 +#define RIBBON_HOENN_COOL_SUPER 2 +#define RIBBON_HOENN_COOL_HYPER 3 +#define RIBBON_HOENN_COOL_MASTER 4 +#define RIBBON_HOENN_BEAUTY 5 +#define RIBBON_HOENN_BEAUTY_SUPER 6 +#define RIBBON_HOENN_BEAUTY_HYPER 7 +#define RIBBON_HOENN_BEAUTY_MASTER 8 +#define RIBBON_HOENN_CUTE 9 +#define RIBBON_HOENN_CUTE_SUPER 10 +#define RIBBON_HOENN_CUTE_HYPER 11 +#define RIBBON_HOENN_CUTE_MASTER 12 +#define RIBBON_HOENN_SMART 13 +#define RIBBON_HOENN_SMART_SUPER 14 +#define RIBBON_HOENN_SMART_HYPER 15 +#define RIBBON_HOENN_SMART_MASTER 16 +#define RIBBON_HOENN_TOUGH 17 +#define RIBBON_HOENN_TOUGH_SUPER 18 +#define RIBBON_HOENN_TOUGH_HYPER 19 +#define RIBBON_HOENN_TOUGH_MASTER 20 +#define RIBBON_HOENN_WINNING 21 +#define RIBBON_HOENN_VICTORY 22 +#define RIBBON_HOENN_ARTIST 23 +#define RIBBON_HOENN_EFFORT 24 +#define RIBBON_HOENN_MARINE 25 +#define RIBBON_HOENN_LAND 26 +#define RIBBON_HOENN_SKY 27 +#define RIBBON_HOENN_COUNTRY 28 +#define RIBBON_HOENN_NATIONAL 29 +#define RIBBON_HOENN_EARTH 30 +#define RIBBON_HOENN_WORLD 31 +#define RIBBON_SINNOH_CHAMP 32 +#define RIBBON_COOL 33 +#define RIBBON_COOL_GREAT 34 +#define RIBBON_COOL_ULTRA 35 +#define RIBBON_COOL_MASTER 36 +#define RIBBON_BEAUTY 37 +#define RIBBON_BEAUTY_GREAT 38 +#define RIBBON_BEAUTY_ULTRA 39 +#define RIBBON_BEAUTY_MASTER 40 +#define RIBBON_CUTE 41 +#define RIBBON_CUTE_GREAT 42 +#define RIBBON_CUTE_ULTRA 43 +#define RIBBON_CUTE_MASTER 44 +#define RIBBON_SMART 45 +#define RIBBON_SMART_GREAT 46 +#define RIBBON_SMART_ULTRA 47 +#define RIBBON_SMART_MASTER 48 +#define RIBBON_TOUGH 49 +#define RIBBON_TOUGH_GREAT 50 +#define RIBBON_TOUGH_ULTRA 51 +#define RIBBON_TOUGH_MASTER 52 +#define RIBBON_ABILITY 53 +#define RIBBON_GREAT_ABILITY 54 +#define RIBBON_DOUBLE_ABILITY 55 +#define RIBBON_MULTI_ABILITY 56 +#define RIBBON_PAIR_ABILITY 57 +#define RIBBON_WORLD_ABILITY 58 +#define RIBBON_ALERT 59 +#define RIBBON_SHOCK 60 +#define RIBBON_DOWNCAST 61 +#define RIBBON_CARELESS 62 +#define RIBBON_RELAX 63 +#define RIBBON_SNOOZE 64 +#define RIBBON_SMILE 65 +#define RIBBON_GORGEOUS 66 +#define RIBBON_ROYAL 67 +#define RIBBON_GORGEOUS_ROYAL 68 +#define RIBBON_FOOTPRINT 69 +#define RIBBON_RECORD 70 +#define RIBBON_HISTORY 71 +#define RIBBON_LEGEND 72 +#define RIBBON_RED 73 +#define RIBBON_GREEN 74 +#define RIBBON_BLUE 75 +#define RIBBON_FESTIVAL 76 +#define RIBBON_CARNIVAL 77 +#define RIBBON_CLASSIC 78 +#define RIBBON_PREMIER 79 + +u32 FUN_0207FC5C(u8 a0, u32 a1); +int FUN_0207FCC0(u8 * a0, u32 a1); +u8 FUN_0207FCE0(u32 a0); + +#endif //POKEDIAMOND_UNK_0207FC5C_H |