diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-03 16:45:53 -0700 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-03 16:45:53 -0700 |
| commit | 4df728666e55b47480467fbea86f48dadcb81c97 (patch) | |
| tree | 6a8413c90ec9d68c54389e1a54f6de9f12bb686c | |
| parent | 9b2ebe671fe77298d0b1adcb5d87cbb2bd01cd3e (diff) | |
| parent | 397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff) | |
Merge branch 'master' into slot_machine
285 files changed, 8596 insertions, 8563 deletions
@@ -13,18 +13,22 @@ To set up the repository, see [INSTALL.md](INSTALL.md). * Disassembly of [**Pokémon Red/Blue**][pokered] * Disassembly of [**Pokémon Yellow**][pokeyellow] +* Disassembly of [**Pokémon Gold**][pokegold] * Disassembly of [**Pokémon Crystal**][pokecrystal] * Disassembly of [**Pokémon Pinball**][pokepinball] * Disassembly of [**Pokémon TCG**][poketcg] +* Disassembly of [**Pokémon Fire Red**][pokefirered] * Disassembly of [**Pokémon Emerald**][pokeemerald] * Discord: [**pret**][Discord] * irc: **irc.freenode.net** [**#pret**][irc] [pokered]: https://github.com/pret/pokered [pokeyellow]: https://github.com/pret/pokeyellow +[pokegold]: https://github.com/pret/pokegold [pokecrystal]: https://github.com/pret/pokecrystal [pokepinball]: https://github.com/pret/pokepinball [poketcg]: https://github.com/pret/poketcg +[pokefirered]: https://github.com/pret/pokefirered [pokeemerald]: https://github.com/pret/pokeemerald [Discord]: https://discord.gg/cJxDDVP [irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret diff --git a/asm-de/contest_link_80C2020.s b/asm-de/contest_link_80C2020.s index 209a1bb24..0213fe90c 100644 --- a/asm-de/contest_link_80C2020.s +++ b/asm-de/contest_link_80C2020.s @@ -86,25 +86,25 @@ sub_80C2020: @ 80C2020 strh r2, [r0] ldr r0, _080C2118 @ =gUnknown_030042A0 strh r2, [r0] - ldr r0, _080C211C @ =gUnknown_030042C0 + ldr r0, _080C211C @ =gBattle_BG1_X strh r2, [r0] - ldr r0, _080C2120 @ =gUnknown_030041B4 + ldr r0, _080C2120 @ =gBattle_BG1_Y strh r2, [r0] - ldr r0, _080C2124 @ =gUnknown_03004288 + ldr r0, _080C2124 @ =gBattle_BG2_X strh r2, [r0] - ldr r0, _080C2128 @ =gUnknown_03004280 + ldr r0, _080C2128 @ =gBattle_BG2_Y strh r2, [r0] ldr r0, _080C212C @ =gUnknown_030041B0 strh r2, [r0] ldr r0, _080C2130 @ =gUnknown_030041B8 strh r2, [r0] - ldr r0, _080C2134 @ =gUnknown_030042C4 + ldr r0, _080C2134 @ =gBattle_WIN0H strh r2, [r0] - ldr r0, _080C2138 @ =gUnknown_03004240 + ldr r0, _080C2138 @ =gBattle_WIN0V strh r2, [r0] - ldr r0, _080C213C @ =gUnknown_03004200 + ldr r0, _080C213C @ =gBattle_WIN1H strh r2, [r0] - ldr r0, _080C2140 @ =gUnknown_03004244 + ldr r0, _080C2140 @ =gBattle_WIN1V strh r2, [r0] pop {r4,r5} pop {r0} @@ -121,16 +121,16 @@ _080C210C: .4byte 0x00003f3f _080C2110: .4byte REG_WIN0H _080C2114: .4byte gUnknown_030042A4 _080C2118: .4byte gUnknown_030042A0 -_080C211C: .4byte gUnknown_030042C0 -_080C2120: .4byte gUnknown_030041B4 -_080C2124: .4byte gUnknown_03004288 -_080C2128: .4byte gUnknown_03004280 +_080C211C: .4byte gBattle_BG1_X +_080C2120: .4byte gBattle_BG1_Y +_080C2124: .4byte gBattle_BG2_X +_080C2128: .4byte gBattle_BG2_Y _080C212C: .4byte gUnknown_030041B0 _080C2130: .4byte gUnknown_030041B8 -_080C2134: .4byte gUnknown_030042C4 -_080C2138: .4byte gUnknown_03004240 -_080C213C: .4byte gUnknown_03004200 -_080C2140: .4byte gUnknown_03004244 +_080C2134: .4byte gBattle_WIN0H +_080C2138: .4byte gBattle_WIN0V +_080C213C: .4byte gBattle_WIN1H +_080C2140: .4byte gBattle_WIN1V thumb_func_end sub_80C2020 thumb_func_start sub_80C2144 @@ -435,10 +435,10 @@ sub_80C2358: @ 80C2358 strb r0, [r4, 0x2] ldr r0, _080C2418 @ =sub_80C2430 bl SetMainCallback2 - ldr r1, _080C241C @ =gUnknown_03004200 + ldr r1, _080C241C @ =gBattle_WIN1H movs r0, 0xF0 strh r0, [r1] - ldr r1, _080C2420 @ =gUnknown_03004244 + ldr r1, _080C2420 @ =gBattle_WIN1V ldr r2, _080C2424 @ =0x000080a0 adds r0, r2, 0 strh r0, [r1] @@ -460,8 +460,8 @@ _080C240C: .4byte gPaletteFade _080C2410: .4byte gSharedMem + 0x18000 _080C2414: .4byte sub_80C24F4 _080C2418: .4byte sub_80C2430 -_080C241C: .4byte gUnknown_03004200 -_080C2420: .4byte gUnknown_03004244 +_080C241C: .4byte gBattle_WIN1H +_080C2420: .4byte gBattle_WIN1V _080C2424: .4byte 0x000080a0 _080C2428: .4byte sub_80C2F28 _080C242C: .4byte sub_80C2448 @@ -490,19 +490,19 @@ sub_80C2448: @ 80C2448 ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 - ldr r0, _080C24CC @ =gUnknown_030042C0 + ldr r0, _080C24CC @ =gBattle_BG1_X ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 - ldr r0, _080C24D0 @ =gUnknown_030041B4 + ldr r0, _080C24D0 @ =gBattle_BG1_Y ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 - ldr r0, _080C24D4 @ =gUnknown_03004288 + ldr r0, _080C24D4 @ =gBattle_BG2_X ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 - ldr r0, _080C24D8 @ =gUnknown_03004280 + ldr r0, _080C24D8 @ =gBattle_BG2_Y ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 @@ -514,19 +514,19 @@ sub_80C2448: @ 80C2448 ldrh r0, [r0] strh r0, [r1] adds r1, 0x22 - ldr r0, _080C24E4 @ =gUnknown_030042C4 + ldr r0, _080C24E4 @ =gBattle_WIN0H ldrh r0, [r0] strh r0, [r1] adds r1, 0x4 - ldr r0, _080C24E8 @ =gUnknown_03004240 + ldr r0, _080C24E8 @ =gBattle_WIN0V ldrh r0, [r0] strh r0, [r1] subs r1, 0x2 - ldr r0, _080C24EC @ =gUnknown_03004200 + ldr r0, _080C24EC @ =gBattle_WIN1H ldrh r0, [r0] strh r0, [r1] adds r1, 0x4 - ldr r0, _080C24F0 @ =gUnknown_03004244 + ldr r0, _080C24F0 @ =gBattle_WIN1V ldrh r0, [r0] strh r0, [r1] bl LoadOam @@ -539,16 +539,16 @@ sub_80C2448: @ 80C2448 _080C24C0: .4byte REG_BG0HOFS _080C24C4: .4byte gUnknown_030042A4 _080C24C8: .4byte gUnknown_030042A0 -_080C24CC: .4byte gUnknown_030042C0 -_080C24D0: .4byte gUnknown_030041B4 -_080C24D4: .4byte gUnknown_03004288 -_080C24D8: .4byte gUnknown_03004280 +_080C24CC: .4byte gBattle_BG1_X +_080C24D0: .4byte gBattle_BG1_Y +_080C24D4: .4byte gBattle_BG2_X +_080C24D8: .4byte gBattle_BG2_Y _080C24DC: .4byte gUnknown_030041B0 _080C24E0: .4byte gUnknown_030041B8 -_080C24E4: .4byte gUnknown_030042C4 -_080C24E8: .4byte gUnknown_03004240 -_080C24EC: .4byte gUnknown_03004200 -_080C24F0: .4byte gUnknown_03004244 +_080C24E4: .4byte gBattle_WIN0H +_080C24E8: .4byte gBattle_WIN0V +_080C24EC: .4byte gBattle_WIN1H +_080C24F0: .4byte gBattle_WIN1V thumb_func_end sub_80C2448 thumb_func_start sub_80C24F4 @@ -1302,10 +1302,10 @@ _080C2AC4: .4byte _080C2CA8 .4byte _080C2CE8 _080C2ADC: - ldr r1, _080C2BC4 @ =gUnknown_030042C4 + ldr r1, _080C2BC4 @ =gBattle_WIN0H movs r0, 0xF0 strh r0, [r1] - ldr r1, _080C2BC8 @ =gUnknown_03004240 + ldr r1, _080C2BC8 @ =gBattle_WIN0V ldr r3, _080C2BCC @ =0x00005050 adds r0, r3, 0 strh r0, [r1] @@ -1413,8 +1413,8 @@ _080C2B14: strh r0, [r1, 0x8] b _080C2D04 .align 2, 0 -_080C2BC4: .4byte gUnknown_030042C4 -_080C2BC8: .4byte gUnknown_03004240 +_080C2BC4: .4byte gBattle_WIN0H +_080C2BC8: .4byte gBattle_WIN0V _080C2BCC: .4byte 0x00005050 _080C2BD0: .4byte gContestFinalStandings _080C2BD4: .4byte gContestMons @@ -1454,7 +1454,7 @@ _080C2C04: strh r0, [r4, 0xC] _080C2C30: ldrb r2, [r4, 0xC] - ldr r3, _080C2C50 @ =gUnknown_03004240 + ldr r3, _080C2C50 @ =gBattle_WIN0V movs r0, 0x50 subs r0, r2 lsls r0, 8 @@ -1469,7 +1469,7 @@ _080C2C30: strh r0, [r4, 0x8] b _080C2D04 .align 2, 0 -_080C2C50: .4byte gUnknown_03004240 +_080C2C50: .4byte gBattle_WIN0V _080C2C54: ldr r0, _080C2C60 @ =gSharedMem + 0x18000 ldrb r0, [r0, 0x6] @@ -1515,7 +1515,7 @@ _080C2CA8: ldrb r0, [r0, 0x6] cmp r0, 0x2 bne _080C2D04 - ldr r3, _080C2CE4 @ =gUnknown_03004240 + ldr r3, _080C2CE4 @ =gBattle_WIN0V ldrh r0, [r3] lsrs r2, r0, 8 adds r0, r2, 0x2 @@ -1543,7 +1543,7 @@ _080C2CD0: b _080C2D04 .align 2, 0 _080C2CE0: .4byte gSharedMem + 0x18000 -_080C2CE4: .4byte gUnknown_03004240 +_080C2CE4: .4byte gBattle_WIN0V _080C2CE8: ldr r2, _080C2D14 @ =gSharedMem + 0x18000 ldrb r0, [r2, 0x6] @@ -2857,10 +2857,10 @@ _080C36DA: adds r5, 0x1 cmp r5, 0x2 ble _080C36DA - ldr r1, _080C3754 @ =gUnknown_030042C4 + ldr r1, _080C3754 @ =gBattle_WIN0H movs r0, 0xF0 strh r0, [r1] - ldr r2, _080C3758 @ =gUnknown_03004240 + ldr r2, _080C3758 @ =gBattle_WIN0V ldrh r1, [r4, 0x22] adds r0, r1, 0 subs r0, 0x10 @@ -2878,8 +2878,8 @@ _080C36DA: .align 2, 0 _080C374C: .4byte gSharedMem + 0x18000 _080C3750: .4byte gSprites -_080C3754: .4byte gUnknown_030042C4 -_080C3758: .4byte gUnknown_03004240 +_080C3754: .4byte gBattle_WIN0H +_080C3758: .4byte gBattle_WIN0V _080C375C: .4byte REG_WININ _080C3760: .4byte 0x00003f3e thumb_func_end sub_80C3698 @@ -2902,8 +2902,8 @@ sub_80C3764: @ 80C3764 orrs r0, r1 mov r1, r12 strb r0, [r1] - ldr r7, _080C37D0 @ =gUnknown_030042C4 - ldr r6, _080C37D4 @ =gUnknown_03004240 + ldr r7, _080C37D0 @ =gBattle_WIN0H + ldr r6, _080C37D4 @ =gBattle_WIN0V adds r5, r3, 0 movs r4, 0x4 adds r2, 0x2E @@ -2940,8 +2940,8 @@ _080C3790: .align 2, 0 _080C37C8: .4byte gSharedMem + 0x18000 _080C37CC: .4byte gSprites -_080C37D0: .4byte gUnknown_030042C4 -_080C37D4: .4byte gUnknown_03004240 +_080C37D0: .4byte gBattle_WIN0H +_080C37D4: .4byte gBattle_WIN0V _080C37D8: .4byte REG_WIN0H _080C37DC: .4byte REG_WININ _080C37E0: .4byte 0x00003f3f diff --git a/asm/battle_1.s b/asm/battle_1.s index c37418e5c..f0a883ec4 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -490,8 +490,8 @@ _0800D7B0: .4byte 0x0000675a _0800D7B4: .4byte gPlttBufferFaded + 0xB8 thumb_func_end sub_800D74C - thumb_func_start sub_800D7B8 -sub_800D7B8: @ 800D7B8 + thumb_func_start DrawMainBattleBackground +DrawMainBattleBackground: @ 800D7B8 push {r4,r5,lr} ldr r0, _0800D7DC @ =gBattleTypeFlags ldrh r1, [r0] @@ -792,7 +792,7 @@ _0800DAA8: .4byte 0x06008000 _0800DAAC: .4byte gBattleTerrainTilemap_Building _0800DAB0: .4byte 0x0600d000 _0800DAB4: .4byte gBattleTerrainPalette_BattleTower - thumb_func_end sub_800D7B8 + thumb_func_end DrawMainBattleBackground thumb_func_start sub_800DAB8 sub_800DAB8: @ 800DAB8 @@ -811,7 +811,7 @@ sub_800DAB8: @ 800DAB8 movs r2, 0x40 bl LoadCompressedPalette bl sub_800D74C - bl sub_800D7B8 + bl DrawMainBattleBackground pop {r0} bx r0 .align 2, 0 @@ -1231,7 +1231,7 @@ _0800E03C: ldrsh r0, [r6, r1] cmp r0, 0 beq _0800E0A4 - ldr r4, _0800E090 @ =gUnknown_030042C0 + ldr r4, _0800E090 @ =gBattle_BG1_X ldrh r0, [r6, 0xA] bl Sin2 lsls r0, 16 @@ -1246,7 +1246,7 @@ _0800E056: adds r0, r2, 0 subs r0, r1 strh r0, [r4] - ldr r4, _0800E094 @ =gUnknown_03004288 + ldr r4, _0800E094 @ =gBattle_BG2_X ldrh r0, [r6, 0xC] bl Sin2 lsls r0, 16 @@ -1261,21 +1261,21 @@ _0800E074: adds r0, r5, 0 subs r0, r1 strh r0, [r4] - ldr r0, _0800E098 @ =gUnknown_030041B4 + ldr r0, _0800E098 @ =gBattle_BG1_Y ldr r2, _0800E09C @ =0x0000ffdc adds r1, r2, 0 strh r1, [r0] - ldr r0, _0800E0A0 @ =gUnknown_03004280 + ldr r0, _0800E0A0 @ =gBattle_BG2_Y strh r1, [r0] b _0800E110 .align 2, 0 -_0800E090: .4byte gUnknown_030042C0 -_0800E094: .4byte gUnknown_03004288 -_0800E098: .4byte gUnknown_030041B4 +_0800E090: .4byte gBattle_BG1_X +_0800E094: .4byte gBattle_BG2_X +_0800E098: .4byte gBattle_BG1_Y _0800E09C: .4byte 0x0000ffdc -_0800E0A0: .4byte gUnknown_03004280 +_0800E0A0: .4byte gBattle_BG2_Y _0800E0A4: - ldr r4, _0800E134 @ =gUnknown_030042C0 + ldr r4, _0800E134 @ =gBattle_BG1_X ldrh r0, [r6, 0xA] bl Sin2 lsls r0, 16 @@ -1290,7 +1290,7 @@ _0800E0B6: adds r0, r5, 0 subs r0, r1 strh r0, [r4] - ldr r4, _0800E138 @ =gUnknown_030041B4 + ldr r4, _0800E138 @ =gBattle_BG1_Y ldrh r0, [r6, 0xA] bl Cos2 lsls r0, 16 @@ -1302,7 +1302,7 @@ _0800E0D4: asrs r0, 5 subs r0, 0xA4 strh r0, [r4] - ldr r4, _0800E13C @ =gUnknown_03004288 + ldr r4, _0800E13C @ =gBattle_BG2_X ldrh r0, [r6, 0xC] bl Sin2 lsls r0, 16 @@ -1317,7 +1317,7 @@ _0800E0EC: adds r0, r2, 0 subs r0, r1 strh r0, [r4] - ldr r4, _0800E140 @ =gUnknown_03004280 + ldr r4, _0800E140 @ =gBattle_BG2_Y ldrh r0, [r6, 0xC] bl Cos2 lsls r0, 16 @@ -1348,10 +1348,10 @@ _0800E110: strh r0, [r1, 0xA] b _0800E212 .align 2, 0 -_0800E134: .4byte gUnknown_030042C0 -_0800E138: .4byte gUnknown_030041B4 -_0800E13C: .4byte gUnknown_03004288 -_0800E140: .4byte gUnknown_03004280 +_0800E134: .4byte gBattle_BG1_X +_0800E138: .4byte gBattle_BG1_Y +_0800E13C: .4byte gBattle_BG2_X +_0800E140: .4byte gBattle_BG2_Y _0800E144: .4byte gTasks _0800E148: movs r5, 0x12 @@ -1506,11 +1506,11 @@ sub_800E23C: @ 800E23C strh r1, [r0] adds r0, 0x2 strh r1, [r0] - ldr r0, _0800E2CC @ =gUnknown_030041B4 + ldr r0, _0800E2CC @ =gBattle_BG1_Y ldr r2, _0800E2D0 @ =0x0000ff5c adds r1, r2, 0 strh r1, [r0] - ldr r0, _0800E2D4 @ =gUnknown_03004280 + ldr r0, _0800E2D4 @ =gBattle_BG2_Y strh r1, [r0] ldr r0, _0800E2D8 @ =gUnknown_081F95A4 bl LoadCompressedObjectPic @@ -1528,9 +1528,9 @@ _0800E2BC: .4byte gVersusFramePal _0800E2C0: .4byte REG_BG1CNT _0800E2C4: .4byte 0x00005c04 _0800E2C8: .4byte REG_WININ -_0800E2CC: .4byte gUnknown_030041B4 +_0800E2CC: .4byte gBattle_BG1_Y _0800E2D0: .4byte 0x0000ff5c -_0800E2D4: .4byte gUnknown_03004280 +_0800E2D4: .4byte gBattle_BG2_Y _0800E2D8: .4byte gUnknown_081F95A4 _0800E2DC: ldr r0, _0800E2F0 @ =0x00000902 diff --git a/asm/battle_2.s b/asm/battle_2.s index dd720ec79..5a751ba55 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -426,13 +426,13 @@ _080126C2: ldrb r0, [r3] lsls r0, 2 adds r0, r1 - ldr r1, _080126DC @ =gUnknown_081D9B29 + ldr r1, _080126DC @ =BattleScript_ActionSelectionItemsCantBeUsed b _080129CC .align 2, 0 _080126D0: .4byte gBattleTypeFlags _080126D4: .4byte 0x00000902 _080126D8: .4byte gUnknown_02024C1C -_080126DC: .4byte gUnknown_081D9B29 +_080126DC: .4byte BattleScript_ActionSelectionItemsCantBeUsed _080126E0: ldr r3, _08012738 @ =gSharedMem ldr r5, _0801273C @ =gActiveBank @@ -661,7 +661,7 @@ _080128B0: ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, _080128F4 @ =gUnknown_081D8E4A + ldr r1, _080128F4 @ =BattleScript_PrintFullBox str r1, [r0] ldr r0, _080128F8 @ =gBattleCommunication ldrb r1, [r2] @@ -684,7 +684,7 @@ _080128B0: .align 2, 0 _080128EC: .4byte gUnknown_02024C1C _080128F0: .4byte gActiveBank -_080128F4: .4byte gUnknown_081D8E4A +_080128F4: .4byte BattleScript_PrintFullBox _080128F8: .4byte gBattleCommunication _080128FC: .4byte gSharedMem _08012900: .4byte 0x00016060 @@ -747,7 +747,7 @@ _08012968: ldrb r0, [r1] cmp r0, 0x3 bne _080129A8 - ldr r0, _080129A0 @ =gUnknown_081D8E37 + ldr r0, _080129A0 @ =BattleScript_PrintCantRunFromTrainer bl b_call_bc_move_exec ldr r1, _080129A4 @ =gBattleCommunication ldrb r0, [r4] @@ -757,7 +757,7 @@ _08012968: _08012994: .4byte gBattleTypeFlags _08012998: .4byte gBattleBufferB _0801299C: .4byte gActiveBank -_080129A0: .4byte gUnknown_081D8E37 +_080129A0: .4byte BattleScript_PrintCantRunFromTrainer _080129A4: .4byte gBattleCommunication _080129A8: bl CanRunFromBattle @@ -776,7 +776,7 @@ _080129A8: ldr r1, _080129FC @ =gUnknown_02024C1C lsls r0, r2, 2 adds r0, r1 - ldr r1, _08012A00 @ =gUnknown_081D8E44 + ldr r1, _08012A00 @ =BattleScript_PrintCantEscapeFromBattle _080129CC: str r1, [r0] ldr r0, _08012A04 @ =gBattleCommunication @@ -801,7 +801,7 @@ _080129CC: _080129F4: .4byte gBattleBufferB _080129F8: .4byte gActiveBank _080129FC: .4byte gUnknown_02024C1C -_08012A00: .4byte gUnknown_081D8E44 +_08012A00: .4byte BattleScript_PrintCantEscapeFromBattle _08012A04: .4byte gBattleCommunication _08012A08: .4byte gSharedMem _08012A0C: .4byte 0x00016060 @@ -2790,7 +2790,7 @@ _08013A04: _08013A0E: bl BattleMusicStop ldr r1, _08013A3C @ =gBattlescriptCurrInstr - ldr r0, _08013A40 @ =gUnknown_081D8DBE + ldr r0, _08013A40 @ =BattleScript_LocalTrainerBattleWon str r0, [r1] ldr r2, _08013A44 @ =gTrainers ldr r0, _08013A48 @ =gTrainerBattleOpponent @@ -2812,7 +2812,7 @@ _08013A30: mov pc, r0 .align 2, 0 _08013A3C: .4byte gBattlescriptCurrInstr -_08013A40: .4byte gUnknown_081D8DBE +_08013A40: .4byte BattleScript_LocalTrainerBattleWon _08013A44: .4byte gTrainers _08013A48: .4byte gTrainerBattleOpponent _08013A4C: .4byte _08013A50 @@ -2891,7 +2891,7 @@ _08013B38: b _08013B48 _08013B42: ldr r1, _08013B54 @ =gBattlescriptCurrInstr - ldr r0, _08013B58 @ =gUnknown_081D8DCE + ldr r0, _08013B58 @ =BattleScript_PayDayMoneyAndPickUpItems _08013B46: str r0, [r1] _08013B48: @@ -2903,7 +2903,7 @@ _08013B48: bx r0 .align 2, 0 _08013B54: .4byte gBattlescriptCurrInstr -_08013B58: .4byte gUnknown_081D8DCE +_08013B58: .4byte BattleScript_PayDayMoneyAndPickUpItems _08013B5C: .4byte gBattleMainFunc _08013B60: .4byte sub_8013C9C thumb_func_end sub_8013998 @@ -2946,7 +2946,7 @@ _08013BB0: .4byte gBattlescriptCurrInstr _08013BB4: .4byte gUnknown_081D8E02 _08013BB8: ldr r1, _08013BCC @ =gBattlescriptCurrInstr - ldr r0, _08013BD0 @ =gUnknown_081D8DD1 + ldr r0, _08013BD0 @ =BattleScript_LocalBattleLost str r0, [r1] _08013BBE: ldr r1, _08013BD4 @ =gBattleMainFunc @@ -2957,7 +2957,7 @@ _08013BBE: bx r0 .align 2, 0 _08013BCC: .4byte gBattlescriptCurrInstr -_08013BD0: .4byte gUnknown_081D8DD1 +_08013BD0: .4byte BattleScript_LocalBattleLost _08013BD4: .4byte gBattleMainFunc _08013BD8: .4byte sub_8013C9C thumb_func_end sub_8013B64 @@ -2981,24 +2981,24 @@ sub_8013BDC: @ 8013BDC cmp r0, 0x2 beq _08013C28 ldr r1, _08013C10 @ =gBattlescriptCurrInstr - ldr r0, _08013C14 @ =gUnknown_081D8E29 + ldr r0, _08013C14 @ =BattleScript_GotAwaySafely b _08013C2C .align 2, 0 _08013C04: .4byte gFightStateTracker _08013C08: .4byte gProtectStructs _08013C0C: .4byte gBankAttacker _08013C10: .4byte gBattlescriptCurrInstr -_08013C14: .4byte gUnknown_081D8E29 +_08013C14: .4byte BattleScript_GotAwaySafely _08013C18: ldr r1, _08013C20 @ =gBattlescriptCurrInstr - ldr r0, _08013C24 @ =gUnknown_081D8E14 + ldr r0, _08013C24 @ =BattleScript_SmokeBallEscape b _08013C2C .align 2, 0 _08013C20: .4byte gBattlescriptCurrInstr -_08013C24: .4byte gUnknown_081D8E14 +_08013C24: .4byte BattleScript_SmokeBallEscape _08013C28: ldr r1, _08013C38 @ =gBattlescriptCurrInstr - ldr r0, _08013C3C @ =gUnknown_081D8E22 + ldr r0, _08013C3C @ =BattleScript_RanAwayUsingMonAbility _08013C2C: str r0, [r1] ldr r1, _08013C40 @ =gBattleMainFunc @@ -3008,7 +3008,7 @@ _08013C2C: bx r0 .align 2, 0 _08013C38: .4byte gBattlescriptCurrInstr -_08013C3C: .4byte gUnknown_081D8E22 +_08013C3C: .4byte BattleScript_RanAwayUsingMonAbility _08013C40: .4byte gBattleMainFunc _08013C44: .4byte sub_8013C9C thumb_func_end sub_8013BDC @@ -3035,7 +3035,7 @@ sub_8013C48: @ 8013C48 movs r0, 0xFF strb r0, [r1, 0x4] ldr r1, _08013C8C @ =gBattlescriptCurrInstr - ldr r0, _08013C90 @ =gUnknown_081D8E30 + ldr r0, _08013C90 @ =BattleScript_WildMonFled str r0, [r1] ldr r1, _08013C94 @ =gBattleMainFunc ldr r0, _08013C98 @ =sub_8013C9C @@ -3047,7 +3047,7 @@ _08013C80: .4byte gBattleTextBuff1 _08013C84: .4byte gBankAttacker _08013C88: .4byte gBattlePartyID _08013C8C: .4byte gBattlescriptCurrInstr -_08013C90: .4byte gUnknown_081D8E30 +_08013C90: .4byte BattleScript_WildMonFled _08013C94: .4byte gBattleMainFunc _08013C98: .4byte sub_8013C9C thumb_func_end sub_8013C48 @@ -3545,7 +3545,7 @@ _08014044: ands r0, r1 strb r0, [r5] ldr r2, _080140E0 @ =gCurrentMove - ldr r1, _080140E4 @ =gUnknown_02024BE8 + ldr r1, _080140E4 @ =gChosenMove movs r0, 0xA5 strh r0, [r1] strh r0, [r2] @@ -3574,7 +3574,7 @@ _080140D4: .4byte 0x0001608c _080140D8: .4byte gUnknown_02024BE5 _080140DC: .4byte gProtectStructs _080140E0: .4byte gCurrentMove -_080140E4: .4byte gUnknown_02024BE8 +_080140E4: .4byte gChosenMove _080140E8: .4byte gHitMarker _080140EC: .4byte 0x00016010 _080140F0: @@ -3598,7 +3598,7 @@ _080140F0: beq _08014138 _08014114: ldr r3, _0801412C @ =gCurrentMove - ldr r2, _08014130 @ =gUnknown_02024BE8 + ldr r2, _08014130 @ =gChosenMove ldr r1, _08014134 @ =gLockedMove lsls r0, r4, 1 adds r0, r1 @@ -3609,7 +3609,7 @@ _08014114: .align 2, 0 _08014128: .4byte gBattleMons _0801412C: .4byte gCurrentMove -_08014130: .4byte gUnknown_02024BE8 +_08014130: .4byte gChosenMove _08014134: .4byte gLockedMove _08014138: ldr r3, _08014188 @ =gDisableStructs @@ -3635,7 +3635,7 @@ _08014138: cmp r1, r0 bne _080141A0 ldr r1, _08014190 @ =gCurrentMove - ldr r0, _08014194 @ =gUnknown_02024BE8 + ldr r0, _08014194 @ =gChosenMove strh r4, [r0] strh r4, [r1] ldrb r0, [r2, 0xC] @@ -3654,7 +3654,7 @@ _08014138: _08014188: .4byte gDisableStructs _0801418C: .4byte gBattleMons _08014190: .4byte gCurrentMove -_08014194: .4byte gUnknown_02024BE8 +_08014194: .4byte gChosenMove _08014198: .4byte gUnknown_02024BE5 _0801419C: .4byte 0x00016010 _080141A0: @@ -3667,7 +3667,7 @@ _080141A0: mov r1, r8 strb r3, [r1] ldr r3, _0801420C @ =gCurrentMove - ldr r1, _08014210 @ =gUnknown_02024BE8 + ldr r1, _08014210 @ =gChosenMove mov r2, r8 ldrb r0, [r2] lsls r0, 1 @@ -3712,7 +3712,7 @@ _08014200: .align 2, 0 _08014208: .4byte gUnknown_02024BE5 _0801420C: .4byte gCurrentMove -_08014210: .4byte gUnknown_02024BE8 +_08014210: .4byte gChosenMove _08014214: .4byte 0x00016010 _08014218: mov r4, r8 @@ -3734,7 +3734,7 @@ _08014218: cmp r3, r2 beq _08014278 ldr r1, _08014268 @ =gCurrentMove - ldr r0, _0801426C @ =gUnknown_02024BE8 + ldr r0, _0801426C @ =gChosenMove strh r3, [r0] strh r3, [r1] ldrh r0, [r1] @@ -3752,12 +3752,12 @@ _0801425C: .4byte gBankAttacker _08014260: .4byte gBattleMons _08014264: .4byte gChosenMovesByBanks _08014268: .4byte gCurrentMove -_0801426C: .4byte gUnknown_02024BE8 +_0801426C: .4byte gChosenMove _08014270: .4byte gSharedMem _08014274: .4byte 0x00016010 _08014278: ldr r1, _08014298 @ =gCurrentMove - ldr r0, _0801429C @ =gUnknown_02024BE8 + ldr r0, _0801429C @ =gChosenMove strh r3, [r0] strh r3, [r1] _08014280: @@ -3774,7 +3774,7 @@ _08014280: b _080142B0 .align 2, 0 _08014298: .4byte gCurrentMove -_0801429C: .4byte gUnknown_02024BE8 +_0801429C: .4byte gChosenMove _080142A0: .4byte gBankAttacker _080142A4: .4byte gBattleResults _080142A8: @@ -3963,7 +3963,7 @@ _08014416: b _08014522 _0801441E: ldr r2, _08014460 @ =gBattleMoves - ldr r0, _0801447C @ =gUnknown_02024BE8 + ldr r0, _0801447C @ =gChosenMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -3998,7 +3998,7 @@ _0801446C: .4byte gSharedMem _08014470: .4byte 0x00016010 _08014474: .4byte gActiveBank _08014478: .4byte gNoOfAllBanks -_0801447C: .4byte gUnknown_02024BE8 +_0801447C: .4byte gChosenMove _08014480: movs r0, 0x3 b _08014496 @@ -4121,7 +4121,7 @@ _08014570: cmp r0, 0 beq _0801461C ldr r2, _080145B4 @ =gBattleMoves - ldr r0, _080145B8 @ =gUnknown_02024BE8 + ldr r0, _080145B8 @ =gChosenMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -4146,7 +4146,7 @@ _08014570: b _080145D2 .align 2, 0 _080145B4: .4byte gBattleMoves -_080145B8: .4byte gUnknown_02024BE8 +_080145B8: .4byte gChosenMove _080145BC: movs r0, 0x3 b _080145D2 @@ -4260,7 +4260,7 @@ _0801469A: strb r0, [r5] _080146AC: ldr r4, _080146E0 @ =gBattlescriptCurrInstr - ldr r3, _080146E4 @ =gBattleScriptsEffectsTable + ldr r3, _080146E4 @ =gBattleScriptsForMoveEffects ldr r2, _080146E8 @ =gBattleMoves ldr r0, _080146EC @ =gCurrentMove ldrh r1, [r0] @@ -4287,7 +4287,7 @@ _080146CC: bx r0 .align 2, 0 _080146E0: .4byte gBattlescriptCurrInstr -_080146E4: .4byte gBattleScriptsEffectsTable +_080146E4: .4byte gBattleScriptsForMoveEffects _080146E8: .4byte gBattleMoves _080146EC: .4byte gCurrentMove _080146F0: .4byte gFightStateTracker @@ -4336,7 +4336,7 @@ sub_80146F4: @ 80146F4 adds r1, r0 strb r4, [r1] ldr r1, _08014790 @ =gBattlescriptCurrInstr - ldr r0, _08014794 @ =gUnknown_081D8E4E + ldr r0, _08014794 @ =BattleScript_ActionSwitch str r0, [r1] ldr r1, _08014798 @ =gFightStateTracker movs r0, 0xA @@ -4364,7 +4364,7 @@ _08014784: .4byte gSharedMem _08014788: .4byte 0x00016064 _0801478C: .4byte 0x00016003 _08014790: .4byte gBattlescriptCurrInstr -_08014794: .4byte gUnknown_081D8E4E +_08014794: .4byte BattleScript_ActionSwitch _08014798: .4byte gFightStateTracker _0801479C: .4byte gBattleResults thumb_func_end sub_80146F4 @@ -4452,14 +4452,14 @@ _0801484C: cmp r0, 0 bne _0801486C ldr r0, _08014864 @ =gBattlescriptCurrInstr - ldr r1, _08014868 @ =gUnknown_081D9E7C + ldr r1, _08014868 @ =gBattlescriptsForUsingItem _0801485C: ldr r1, [r1] str r1, [r0] b _08014A8C .align 2, 0 _08014864: .4byte gBattlescriptCurrInstr -_08014868: .4byte gUnknown_081D9E7C +_08014868: .4byte gBattlescriptsForUsingItem _0801486C: ldr r2, _080148A0 @ =gSharedMem ldrb r0, [r4] @@ -4476,7 +4476,7 @@ _0801486C: mov r8, r4 ldr r3, _080148AC @ =gBattlescriptCurrInstr mov r9, r3 - ldr r1, _080148B0 @ =gUnknown_081D9E7C + ldr r1, _080148B0 @ =gBattlescriptsForUsingItem mov r10, r1 adds r7, r2, 0 cmp r0, 0x4 @@ -4493,7 +4493,7 @@ _080148A0: .4byte gSharedMem _080148A4: .4byte 0x00016003 _080148A8: .4byte 0x000160d8 _080148AC: .4byte gBattlescriptCurrInstr -_080148B0: .4byte gUnknown_081D9E7C +_080148B0: .4byte gBattlescriptsForUsingItem _080148B4: .4byte _080148B8 .align 2, 0 _080148B8: @@ -4522,7 +4522,7 @@ _080148CC: ands r0, r3 ldr r3, _08014910 @ =gBattlescriptCurrInstr mov r9, r3 - ldr r1, _08014914 @ =gUnknown_081D9E7C + ldr r1, _08014914 @ =gBattlescriptsForUsingItem mov r10, r1 cmp r0, 0 bne _080148FC @@ -4536,11 +4536,11 @@ _08014904: .4byte gBattleCommunication _08014908: .4byte gBankAttacker _0801490C: .4byte 0x000160da _08014910: .4byte gBattlescriptCurrInstr -_08014914: .4byte gUnknown_081D9E7C +_08014914: .4byte gBattlescriptsForUsingItem _08014918: ldr r3, _08014950 @ =gBattlescriptCurrInstr mov r9, r3 - ldr r0, _08014954 @ =gUnknown_081D9E7C + ldr r0, _08014954 @ =gBattlescriptsForUsingItem mov r10, r0 adds r5, r7, 0 mov r4, r8 @@ -4568,7 +4568,7 @@ _08014926: b _08014A74 .align 2, 0 _08014950: .4byte gBattlescriptCurrInstr -_08014954: .4byte gUnknown_081D9E7C +_08014954: .4byte gBattlescriptsForUsingItem _08014958: ldr r3, _0801498C @ =gBattleCommunication movs r0, 0x4 @@ -4592,7 +4592,7 @@ _08014958: strb r0, [r3, 0x5] ldr r2, _08014998 @ =gBattlescriptCurrInstr mov r9, r2 - ldr r3, _0801499C @ =gUnknown_081D9E7C + ldr r3, _0801499C @ =gBattlescriptsForUsingItem mov r10, r3 b _08014A74 .align 2, 0 @@ -4600,7 +4600,7 @@ _0801498C: .4byte gBattleCommunication _08014990: .4byte gBankAttacker _08014994: .4byte 0x000160da _08014998: .4byte gBattlescriptCurrInstr -_0801499C: .4byte gUnknown_081D9E7C +_0801499C: .4byte gBattlescriptsForUsingItem _080149A0: ldr r3, _08014A18 @ =gBattleTextBuff1 movs r4, 0xFD @@ -4623,7 +4623,7 @@ _080149A0: ands r2, r0 ldr r0, _08014A20 @ =gBattlescriptCurrInstr mov r9, r0 - ldr r1, _08014A24 @ =gUnknown_081D9E7C + ldr r1, _08014A24 @ =gBattlescriptsForUsingItem mov r10, r1 adds r6, r3, 0 cmp r2, 0 @@ -4667,7 +4667,7 @@ _08014A02: _08014A18: .4byte gBattleTextBuff1 _08014A1C: .4byte gBattleTextBuff2 _08014A20: .4byte gBattlescriptCurrInstr -_08014A24: .4byte gUnknown_081D9E7C +_08014A24: .4byte gBattlescriptsForUsingItem _08014A28: .4byte 0x000160a4 _08014A2C: .4byte 0x000160a5 _08014A30: @@ -4684,7 +4684,7 @@ _08014A30: mov r8, r0 ldr r1, _08014A5C @ =gBattlescriptCurrInstr mov r9, r1 - ldr r2, _08014A60 @ =gUnknown_081D9E7C + ldr r2, _08014A60 @ =gBattlescriptsForUsingItem mov r10, r2 b _08014A74 .align 2, 0 @@ -4692,7 +4692,7 @@ _08014A50: .4byte gBattleTypeFlags _08014A54: .4byte gBattleCommunication _08014A58: .4byte gBankAttacker _08014A5C: .4byte gBattlescriptCurrInstr -_08014A60: .4byte gUnknown_081D9E7C +_08014A60: .4byte gBattlescriptsForUsingItem _08014A64: ldr r0, _08014AA0 @ =gBattleCommunication strb r1, [r0, 0x5] @@ -4700,7 +4700,7 @@ _08014A64: mov r8, r3 ldr r0, _08014AA8 @ =gBattlescriptCurrInstr mov r9, r0 - ldr r1, _08014AAC @ =gUnknown_081D9E7C + ldr r1, _08014AAC @ =gBattlescriptsForUsingItem mov r10, r1 _08014A74: mov r2, r8 @@ -4730,7 +4730,7 @@ _08014A8C: _08014AA0: .4byte gBattleCommunication _08014AA4: .4byte gBankAttacker _08014AA8: .4byte gBattlescriptCurrInstr -_08014AAC: .4byte gUnknown_081D9E7C +_08014AAC: .4byte gBattlescriptsForUsingItem _08014AB0: .4byte 0x000160d8 _08014AB4: .4byte gFightStateTracker thumb_func_end sub_80147A0 @@ -4998,7 +4998,7 @@ _08014C9C: movs r0, 0x3 strb r0, [r1, 0x5] ldr r1, _08014CE8 @ =gBattlescriptCurrInstr - ldr r0, _08014CEC @ =gUnknown_081D8E3B + ldr r0, _08014CEC @ =BattleScript_PrintFailedToRunString str r0, [r1] ldr r1, _08014CF0 @ =gFightStateTracker movs r0, 0xA @@ -5008,7 +5008,7 @@ _08014CDC: .4byte gBattleMons _08014CE0: .4byte 0xfdffffff _08014CE4: .4byte gBattleCommunication _08014CE8: .4byte gBattlescriptCurrInstr -_08014CEC: .4byte gUnknown_081D8E3B +_08014CEC: .4byte BattleScript_PrintFailedToRunString _08014CF0: .4byte gFightStateTracker _08014CF4: ldr r1, _08014D1C @ =gBattleMons @@ -5026,7 +5026,7 @@ _08014CF4: movs r0, 0x4 strb r0, [r1, 0x5] ldr r1, _08014D28 @ =gBattlescriptCurrInstr - ldr r0, _08014D2C @ =gUnknown_081D8E3B + ldr r0, _08014D2C @ =BattleScript_PrintFailedToRunString str r0, [r1] ldr r1, _08014D30 @ =gFightStateTracker movs r0, 0xA @@ -5036,7 +5036,7 @@ _08014D1C: .4byte gBattleMons _08014D20: .4byte 0x0400e000 _08014D24: .4byte gBattleCommunication _08014D28: .4byte gBattlescriptCurrInstr -_08014D2C: .4byte gUnknown_081D8E3B +_08014D2C: .4byte BattleScript_PrintFailedToRunString _08014D30: .4byte gFightStateTracker _08014D34: ldr r0, _08014D48 @ =gNoOfAllBanks diff --git a/asm/battle_anim_81258BC.s b/asm/battle_anim_81258BC.s index 6705c0fd7..2c19ad731 100644 --- a/asm/battle_anim_81258BC.s +++ b/asm/battle_anim_81258BC.s @@ -77,12 +77,12 @@ sub_812AF30: @ 812AF30 strh r0, [r6, 0xA] movs r0, 0x40 negs r0, r0 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 movs r0, 0x3F - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r5, r0, 0 lsls r4, 24 asrs r4, 24 @@ -91,7 +91,7 @@ sub_812AF30: @ 812AF30 adds r0, r4, 0 adds r1, r5, 0 movs r2, 0x2 - bl sub_807712C + bl CalculatePanIncrement strh r4, [r6, 0xC] strh r5, [r6, 0xE] lsls r0, 24 @@ -188,7 +188,7 @@ sub_812B004: @ 812B004 movs r0, 0 strh r0, [r4, 0x1C] movs r0, 0x3F - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 ldrh r0, [r4, 0xA] lsls r1, 24 @@ -236,14 +236,14 @@ sub_812B058: @ 812B058 ldrb r0, [r0, 0x2] lsls r0, 24 asrs r0, 24 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 lsls r5, 24 asrs r5, 24 adds r0, r5, 0 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r5, r0, 0 lsls r4, 24 asrs r4, 24 @@ -254,7 +254,7 @@ sub_812B058: @ 812B058 adds r0, r4, 0 adds r1, r5, 0 adds r2, r6, 0 - bl sub_807712C + bl CalculatePanIncrement ldr r2, _0812B100 @ =gTasks mov r3, r8 lsls r1, r3, 2 @@ -373,10 +373,10 @@ sub_812B18C: @ 812B18C movs r4, 0 movs r0, 0x40 negs r0, r0 - bl sub_8076F98 + bl BattleAnimAdjustPanning lsls r0, 24 lsrs r6, r0, 24 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _0812B1CC @@ -402,29 +402,29 @@ _0812B1CC: adds r2, r0, 0 cmp r1, 0 bne _0812B1E8 - ldr r0, _0812B1E4 @ =gBattleAnimBankAttacker + ldr r0, _0812B1E4 @ =gAnimBankAttacker ldrb r4, [r0] b _0812B20E .align 2, 0 _0812B1E0: .4byte gBattleAnimArgs -_0812B1E4: .4byte gBattleAnimBankAttacker +_0812B1E4: .4byte gAnimBankAttacker _0812B1E8: cmp r1, 0x1 bne _0812B1F8 - ldr r0, _0812B1F4 @ =gBattleAnimBankTarget + ldr r0, _0812B1F4 @ =gAnimBankTarget ldrb r4, [r0] b _0812B20E .align 2, 0 -_0812B1F4: .4byte gBattleAnimBankTarget +_0812B1F4: .4byte gAnimBankTarget _0812B1F8: cmp r1, 0x2 bne _0812B204 - ldr r0, _0812B200 @ =gBattleAnimBankAttacker + ldr r0, _0812B200 @ =gAnimBankAttacker b _0812B206 .align 2, 0 -_0812B200: .4byte gBattleAnimBankAttacker +_0812B200: .4byte gAnimBankAttacker _0812B204: - ldr r0, _0812B230 @ =gBattleAnimBankTarget + ldr r0, _0812B230 @ =gAnimBankTarget _0812B206: ldrb r1, [r0] movs r0, 0x2 @@ -447,7 +447,7 @@ _0812B21A: bl DestroyAnimVisualTask b _0812B2B0 .align 2, 0 -_0812B230: .4byte gBattleAnimBankTarget +_0812B230: .4byte gAnimBankTarget _0812B234: adds r0, r4, 0 bl GetBankSide @@ -520,10 +520,10 @@ sub_812B2B8: @ 812B2B8 lsrs r5, r0, 24 movs r0, 0x40 negs r0, r0 - bl sub_8076F98 + bl BattleAnimAdjustPanning lsls r0, 24 lsrs r4, r0, 24 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _0812B2DC @@ -532,8 +532,8 @@ sub_812B2B8: @ 812B2B8 .align 2, 0 _0812B2D8: .4byte gSharedMem + 0x19348 _0812B2DC: - ldr r1, _0812B304 @ =gUnknown_0202F7CA - ldr r0, _0812B308 @ =gBattleAnimBankAttacker + ldr r1, _0812B304 @ =gAnimSpeciesByBanks + ldr r0, _0812B308 @ =gAnimBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -552,8 +552,8 @@ _0812B2F6: pop {r0} bx r0 .align 2, 0 -_0812B304: .4byte gUnknown_0202F7CA -_0812B308: .4byte gBattleAnimBankAttacker +_0812B304: .4byte gAnimSpeciesByBanks +_0812B308: .4byte gAnimBankAttacker thumb_func_end sub_812B2B8 thumb_func_start sub_812B30C @@ -567,7 +567,7 @@ sub_812B30C: @ 812B30C ldrb r0, [r0, 0x2] lsls r0, 24 asrs r0, 24 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -593,7 +593,7 @@ sub_812B340: @ 812B340 ldrb r0, [r0, 0x2] lsls r0, 24 asrs r0, 24 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -626,14 +626,14 @@ sub_812B374: @ 812B374 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 lsls r5, 24 asrs r5, 24 adds r0, r5, 0 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r5, r0, 0 lsls r4, 24 asrs r4, 24 @@ -644,7 +644,7 @@ sub_812B374: @ 812B374 adds r0, r4, 0 adds r1, r5, 0 adds r2, r6, 0 - bl sub_807712C + bl CalculatePanIncrement ldr r2, _0812B3FC @ =gTasks mov r3, r8 lsls r1, r3, 2 diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s index 91033c777..02eec98ec 100644 --- a/asm/battle_anim_812C144.s +++ b/asm/battle_anim_812C144.s @@ -77,7 +77,7 @@ sub_812C184: @ 812C184 b _0812C1CA _0812C1C4: adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812C1CA: pop {r0} bx r0 @@ -89,10 +89,10 @@ sub_812C1D0: @ 812C1D0 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r6, _0812C21C @ =gBattleAnimBankTarget + ldr r6, _0812C21C @ =gAnimBankTarget ldrb r0, [r6] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 lsls r4, 24 lsrs r4, 8 @@ -102,7 +102,7 @@ sub_812C1D0: @ 812C1D0 asrs r4, 16 ldrb r0, [r6] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition adds r1, r0, 0 lsls r1, 24 lsrs r1, 8 @@ -119,7 +119,7 @@ sub_812C1D0: @ 812C1D0 pop {r0} bx r0 .align 2, 0 -_0812C21C: .4byte gBattleAnimBankTarget +_0812C21C: .4byte gAnimBankTarget thumb_func_end sub_812C1D0 thumb_func_start sub_812C220 @@ -198,7 +198,7 @@ sub_812C2A4: @ 812C2A4 strh r2, [r1] adds r1, 0x2 strh r2, [r1] - bl move_anim_8072740 + bl DestroyAnimSprite pop {r0} bx r0 .align 2, 0 @@ -210,16 +210,16 @@ sub_812C2BC: @ 812C2BC push {r4-r7,lr} sub sp, 0x4 adds r5, r0, 0 - ldr r4, _0812C348 @ =gBattleAnimBankTarget + ldr r4, _0812C348 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r7, r0, 0 ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r6, r0, 0 @@ -240,7 +240,7 @@ sub_812C2BC: @ 812C2BC lsls r1, 23 adds r0, r1 lsrs r4, r0, 16 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _0812C31A @@ -264,7 +264,7 @@ _0812C31A: strh r6, [r5, 0x36] ldr r0, _0812C350 @ =sub_8078B34 str r0, [r5, 0x1C] - ldr r1, _0812C354 @ =move_anim_8072740 + ldr r1, _0812C354 @ =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData add sp, 0x4 @@ -272,10 +272,10 @@ _0812C31A: pop {r0} bx r0 .align 2, 0 -_0812C348: .4byte gBattleAnimBankTarget +_0812C348: .4byte gAnimBankTarget _0812C34C: .4byte gBattleAnimArgs _0812C350: .4byte sub_8078B34 -_0812C354: .4byte move_anim_8072740 +_0812C354: .4byte DestroyAnimSprite thumb_func_end sub_812C2BC thumb_func_start sub_812C358 @@ -547,7 +547,7 @@ _0812C53A: strh r0, [r1] strh r0, [r4] adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812C550: pop {r4} pop {r0} @@ -796,7 +796,7 @@ sub_812C720: @ 812C720 adds r4, r0, 0 movs r1, 0x1 bl sub_80787B0 - ldr r0, _0812C784 @ =gBattleAnimBankTarget + ldr r0, _0812C784 @ =gAnimBankTarget ldrb r0, [r0] mov r5, sp adds r5, 0x2 @@ -804,7 +804,7 @@ sub_812C720: @ 812C720 mov r2, sp adds r3, r5, 0 bl sub_807A3FC - ldr r0, _0812C788 @ =gBattleAnimBankAttacker + ldr r0, _0812C788 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -838,8 +838,8 @@ _0812C754: pop {r0} bx r0 .align 2, 0 -_0812C784: .4byte gBattleAnimBankTarget -_0812C788: .4byte gBattleAnimBankAttacker +_0812C784: .4byte gAnimBankTarget +_0812C788: .4byte gAnimBankAttacker _0812C78C: .4byte gBattleAnimArgs _0812C790: .4byte 0x0000ffce _0812C794: .4byte sub_812C798 @@ -904,7 +904,7 @@ _0812C7F4: cmp r0, 0x10 bne _0812C808 adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812C808: pop {r0} bx r0 @@ -926,7 +926,7 @@ sub_812C80C: @ 812C80C strh r0, [r4, 0x22] ldr r0, _0812C840 @ =sub_8078600 str r0, [r4, 0x1C] - ldr r1, _0812C844 @ =move_anim_8072740 + ldr r1, _0812C844 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData pop {r4,r5} @@ -935,7 +935,7 @@ sub_812C80C: @ 812C80C .align 2, 0 _0812C83C: .4byte gBattleAnimArgs _0812C840: .4byte sub_8078600 -_0812C844: .4byte move_anim_8072740 +_0812C844: .4byte DestroyAnimSprite thumb_func_end sub_812C80C thumb_func_start sub_812C848 @@ -953,11 +953,11 @@ sub_812C848: @ 812C848 ldrsh r1, [r5, r2] adds r0, r4, 0 bl sub_807867C - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _0812C89C - ldr r0, _0812C888 @ =gBattleAnimBankAttacker + ldr r0, _0812C888 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -967,7 +967,7 @@ sub_812C848: @ 812C848 b _0812C8A2 .align 2, 0 _0812C884: .4byte gBattleAnimArgs -_0812C888: .4byte gBattleAnimBankAttacker +_0812C888: .4byte gAnimBankAttacker _0812C88C: movs r1, 0x4 ldrsh r0, [r5, r1] @@ -1028,7 +1028,7 @@ _0812C8A8: cmp r0, 0xF0 bls _0812C900 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812C900: pop {r4,r5} pop {r0} @@ -1046,7 +1046,7 @@ sub_812C908: @ 812C908 cmp r0, 0 beq _0812C91E adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812C91E: pop {r0} bx r0 @@ -1057,7 +1057,7 @@ sub_812C924: @ 812C924 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0812C940 @ =gBattleAnimBankTarget + ldr r0, _0812C940 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -1068,7 +1068,7 @@ sub_812C924: @ 812C924 movs r0, 0 b _0812C94C .align 2, 0 -_0812C940: .4byte gBattleAnimBankTarget +_0812C940: .4byte gAnimBankTarget _0812C944: .4byte gBattleAnimArgs _0812C948: ldr r1, _0812C95C @ =gBattleAnimArgs @@ -1089,7 +1089,7 @@ sub_812C960: @ 812C960 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0812C974 @ =gMoveDmgMoveAnim + ldr r0, _0812C974 @ =gAnimMoveDmg ldr r0, [r0] cmp r0, 0 ble _0812C97C @@ -1097,7 +1097,7 @@ sub_812C960: @ 812C960 movs r0, 0 b _0812C980 .align 2, 0 -_0812C974: .4byte gMoveDmgMoveAnim +_0812C974: .4byte gAnimMoveDmg _0812C978: .4byte gBattleAnimArgs _0812C97C: ldr r1, _0812C98C @ =gBattleAnimArgs @@ -1128,10 +1128,10 @@ sub_812C990: @ 812C990 adds r1, r3, 0 orrs r0, r1 strh r0, [r2] - ldr r0, _0812C9F4 @ =gUnknown_030042C4 + ldr r0, _0812C9F4 @ =gBattle_WIN0H movs r1, 0 strh r1, [r0] - ldr r0, _0812C9F8 @ =gUnknown_03004240 + ldr r0, _0812C9F8 @ =gBattle_WIN0V strh r1, [r0] ldr r0, _0812C9FC @ =REG_WIN0H strh r1, [r0] @@ -1161,8 +1161,8 @@ sub_812C990: @ 812C990 .align 2, 0 _0812C9EC: .4byte REG_WINOUT _0812C9F0: .4byte 0x00001f3f -_0812C9F4: .4byte gUnknown_030042C4 -_0812C9F8: .4byte gUnknown_03004240 +_0812C9F4: .4byte gBattle_WIN0H +_0812C9F8: .4byte gBattle_WIN0V _0812C9FC: .4byte REG_WIN0H _0812CA00: .4byte sub_812CA04 thumb_func_end sub_812C990 @@ -1288,7 +1288,7 @@ sub_812CAD0: @ 812CAD0 adds r2, r4, 0 eors r1, r2 strh r1, [r3] - bl move_anim_8072740 + bl DestroyAnimSprite pop {r4} pop {r0} bx r0 @@ -1306,16 +1306,16 @@ sub_812CAFC: @ 812CAFC ldrsh r0, [r6, r1] cmp r0, 0 bne _0812CB28 - ldr r4, _0812CB74 @ =gBattleAnimBankAttacker + ldr r4, _0812CB74 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -1357,7 +1357,7 @@ _0812CB28: b _0812CB8A .align 2, 0 _0812CB70: .4byte gBattleAnimArgs -_0812CB74: .4byte gBattleAnimBankAttacker +_0812CB74: .4byte gAnimBankAttacker _0812CB78: .4byte 0x000003ff _0812CB7C: .4byte 0xfffffc00 _0812CB80: .4byte 0x0000fff4 @@ -1412,7 +1412,7 @@ sub_812CBB4: @ 812CBB4 bne _0812CC12 movs r0, 0x40 negs r0, r0 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -1443,7 +1443,7 @@ _0812CC12: cmp r0, 0 bne _0812CC20 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812CC20: pop {r4} pop {r0} @@ -1472,7 +1472,7 @@ sub_812CC44: @ 812CC44 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _0812CC7A @@ -1480,19 +1480,19 @@ sub_812CC44: @ 812CC44 ldr r2, _0812CC8C @ =0x00001f3f adds r0, r2, 0 strh r0, [r1] - ldr r1, _0812CC90 @ =gUnknown_03004200 + ldr r1, _0812CC90 @ =gBattle_WIN1H ldr r2, _0812CC94 @ =0x000098f0 adds r0, r2, 0 strh r0, [r1] - ldr r1, _0812CC98 @ =gUnknown_03004244 + ldr r1, _0812CC98 @ =gBattle_WIN1V movs r0, 0xA0 strh r0, [r1] ldr r1, _0812CC9C @ =REG_WIN1H - ldr r0, _0812CCA0 @ =gUnknown_030042C4 + ldr r0, _0812CCA0 @ =gBattle_WIN0H ldrh r0, [r0] strh r0, [r1] adds r1, 0x4 - ldr r0, _0812CCA4 @ =gUnknown_03004240 + ldr r0, _0812CCA4 @ =gBattle_WIN0V ldrh r0, [r0] strh r0, [r1] _0812CC7A: @@ -1504,12 +1504,12 @@ _0812CC7A: .align 2, 0 _0812CC88: .4byte REG_WININ _0812CC8C: .4byte 0x00001f3f -_0812CC90: .4byte gUnknown_03004200 +_0812CC90: .4byte gBattle_WIN1H _0812CC94: .4byte 0x000098f0 -_0812CC98: .4byte gUnknown_03004244 +_0812CC98: .4byte gBattle_WIN1V _0812CC9C: .4byte REG_WIN1H -_0812CCA0: .4byte gUnknown_030042C4 -_0812CCA4: .4byte gUnknown_03004240 +_0812CCA0: .4byte gBattle_WIN0H +_0812CCA4: .4byte gBattle_WIN0V thumb_func_end sub_812CC44 thumb_func_start sub_812CCA8 @@ -1517,7 +1517,7 @@ sub_812CCA8: @ 812CCA8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _0812CCCA @@ -1525,10 +1525,10 @@ sub_812CCA8: @ 812CCA8 ldr r2, _0812CCDC @ =0x00003f3f adds r0, r2, 0 strh r0, [r1] - ldr r0, _0812CCE0 @ =gUnknown_03004200 + ldr r0, _0812CCE0 @ =gBattle_WIN1H movs r1, 0 strh r1, [r0] - ldr r0, _0812CCE4 @ =gUnknown_03004244 + ldr r0, _0812CCE4 @ =gBattle_WIN1V strh r1, [r0] _0812CCCA: adds r0, r4, 0 @@ -1539,8 +1539,8 @@ _0812CCCA: .align 2, 0 _0812CCD8: .4byte REG_WININ _0812CCDC: .4byte 0x00003f3f -_0812CCE0: .4byte gUnknown_03004200 -_0812CCE4: .4byte gUnknown_03004244 +_0812CCE0: .4byte gBattle_WIN1H +_0812CCE4: .4byte gBattle_WIN1V thumb_func_end sub_812CCA8 thumb_func_start sub_812CCE8 @@ -1552,17 +1552,17 @@ sub_812CCE8: @ 812CCE8 ldrsh r0, [r6, r1] cmp r0, 0 bne _0812CD04 - ldr r4, _0812CD00 @ =gBattleAnimBankAttacker + ldr r4, _0812CD00 @ =gAnimBankAttacker b _0812CD06 .align 2, 0 _0812CCFC: .4byte gBattleAnimArgs -_0812CD00: .4byte gBattleAnimBankAttacker +_0812CD00: .4byte gAnimBankAttacker _0812CD04: - ldr r4, _0812CD58 @ =gBattleAnimBankTarget + ldr r4, _0812CD58 @ =gAnimBankTarget _0812CD06: ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r6, [r6, 0x2] @@ -1570,7 +1570,7 @@ _0812CD06: strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -1601,7 +1601,7 @@ _0812CD3E: pop {r0} bx r0 .align 2, 0 -_0812CD58: .4byte gBattleAnimBankTarget +_0812CD58: .4byte gAnimBankTarget _0812CD5C: .4byte gBattleAnimArgs _0812CD60: .4byte sub_812CD64 thumb_func_end sub_812CCE8 @@ -1640,7 +1640,7 @@ sub_812CD64: @ 812CD64 cmp r0, r1 bge _0812CDC2 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _0812CDC2 .align 2, 0 _0812CDAC: .4byte gSineTable @@ -1652,7 +1652,7 @@ _0812CDB0: cmp r0, r1 ble _0812CDC2 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812CDC2: pop {r0} bx r0 @@ -1674,14 +1674,14 @@ sub_812CDC8: @ 812CDC8 ldrsh r0, [r0, r1] cmp r0, 0 bne _0812CDF4 - ldr r4, _0812CDF0 @ =gBattleAnimBankAttacker + ldr r4, _0812CDF0 @ =gAnimBankAttacker b _0812CDF6 .align 2, 0 _0812CDE8: .4byte gTasks _0812CDEC: .4byte gBattleAnimArgs -_0812CDF0: .4byte gBattleAnimBankAttacker +_0812CDF0: .4byte gAnimBankAttacker _0812CDF4: - ldr r4, _0812CE3C @ =gBattleAnimBankTarget + ldr r4, _0812CE3C @ =gAnimBankTarget _0812CDF6: ldrb r0, [r4] bl sub_8077FC0 @@ -1714,14 +1714,14 @@ _0812CE20: strh r2, [r5, 0x16] cmp r7, 0x1 bne _0812CE48 - ldr r0, _0812CE44 @ =gUnknown_030042C0 + ldr r0, _0812CE44 @ =gBattle_BG1_X b _0812CE4A .align 2, 0 -_0812CE3C: .4byte gBattleAnimBankTarget +_0812CE3C: .4byte gAnimBankTarget _0812CE40: .4byte gBattleAnimArgs -_0812CE44: .4byte gUnknown_030042C0 +_0812CE44: .4byte gBattle_BG1_X _0812CE48: - ldr r0, _0812CE68 @ =gUnknown_03004288 + ldr r0, _0812CE68 @ =gBattle_BG2_X _0812CE4A: ldrh r2, [r0] strh r2, [r5, 0x18] @@ -1738,7 +1738,7 @@ _0812CE4A: ldrh r3, [r5, 0x18] b _0812CE70 .align 2, 0 -_0812CE68: .4byte gUnknown_03004288 +_0812CE68: .4byte gBattle_BG2_X _0812CE6C: strh r2, [r5, 0x1E] ldrh r3, [r5, 0x1A] @@ -1974,16 +1974,16 @@ sub_812D008: @ 812D008 movs r5, 0 strh r5, [r4, 0x8] strh r5, [r4, 0xA] - ldr r6, _0812D060 @ =gBattleAnimBankAttacker + ldr r6, _0812D060 @ =gAnimBankAttacker ldrb r0, [r6] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0xC] ldrb r0, [r6] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0xE] @@ -2004,7 +2004,7 @@ sub_812D008: @ 812D008 bx r0 .align 2, 0 _0812D05C: .4byte gTasks -_0812D060: .4byte gBattleAnimBankAttacker +_0812D060: .4byte gAnimBankAttacker _0812D064: .4byte 0x0000ffec _0812D068: .4byte sub_812D06C thumb_func_end sub_812D008 @@ -2081,7 +2081,7 @@ _0812D0D4: lsrs r4, r0, 24 movs r0, 0x40 negs r0, r0 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -2347,7 +2347,7 @@ _0812D2F0: ldrsh r0, [r5, r1] cmp r0, 0x3D bne _0812D33C - ldr r1, _0812D344 @ =move_anim_8072740 + ldr r1, _0812D344 @ =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData ldrh r0, [r5, 0x24] @@ -2363,16 +2363,16 @@ _0812D2F0: strh r1, [r5, 0x26] movs r0, 0x14 strh r0, [r5, 0x2E] - ldr r4, _0812D348 @ =gBattleAnimBankTarget + ldr r4, _0812D348 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] @@ -2383,8 +2383,8 @@ _0812D33C: pop {r0} bx r0 .align 2, 0 -_0812D344: .4byte move_anim_8072740 -_0812D348: .4byte gBattleAnimBankTarget +_0812D344: .4byte DestroyAnimSprite +_0812D348: .4byte gAnimBankTarget _0812D34C: .4byte sub_8078B34 thumb_func_end sub_812D294 @@ -2460,16 +2460,16 @@ _0812D3CC: beq _0812D490 b _0812D4AE _0812D3D6: - ldr r4, _0812D408 @ =gBattleAnimBankAttacker + ldr r4, _0812D408 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -2482,7 +2482,7 @@ _0812D3D6: strh r0, [r5, 0x32] b _0812D484 .align 2, 0 -_0812D408: .4byte gBattleAnimBankAttacker +_0812D408: .4byte gAnimBankAttacker _0812D40C: ldrh r0, [r5, 0x30] adds r0, 0x60 @@ -2563,7 +2563,7 @@ _0812D490: cmp r0, r1 bge _0812D4AE adds r0, r5, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812D4AE: pop {r4-r6} pop {r0} @@ -2574,7 +2574,7 @@ _0812D4AE: sub_812D4B4: @ 812D4B4 push {r4,lr} adds r4, r0, 0 - ldr r0, _0812D4CC @ =gBattleAnimBankAttacker + ldr r0, _0812D4CC @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -2583,7 +2583,7 @@ sub_812D4B4: @ 812D4B4 ldr r0, _0812D4D0 @ =0x0000fff0 b _0812D4D8 .align 2, 0 -_0812D4CC: .4byte gBattleAnimBankAttacker +_0812D4CC: .4byte gAnimBankAttacker _0812D4D0: .4byte 0x0000fff0 _0812D4D4: movs r0, 0x80 @@ -2608,7 +2608,7 @@ sub_812D4EC: @ 812D4EC ldrh r0, [r4, 0x2E] adds r0, 0x48 strh r0, [r4, 0x2E] - ldr r0, _0812D50C @ =gBattleAnimBankAttacker + ldr r0, _0812D50C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -2619,7 +2619,7 @@ sub_812D4EC: @ 812D4EC asrs r0, 20 b _0812D518 .align 2, 0 -_0812D50C: .4byte gBattleAnimBankAttacker +_0812D50C: .4byte gAnimBankAttacker _0812D510: ldrh r0, [r4, 0x2E] lsls r0, 16 @@ -2674,7 +2674,7 @@ _0812D564: cmp r0, r1 bls _0812D57E adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812D57E: pop {r4,r5} pop {r0} @@ -2919,10 +2919,10 @@ _0812D736: movs r0, 0x90 lsls r0, 4 strh r0, [r4, 0x30] - ldr r0, _0812D75C @ =gBattleAnimBankAttacker + ldr r0, _0812D75C @ =gAnimBankAttacker ldrb r0, [r0] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] @@ -2931,7 +2931,7 @@ _0812D736: strh r0, [r4, 0x2E] b _0812D788 .align 2, 0 -_0812D75C: .4byte gBattleAnimBankAttacker +_0812D75C: .4byte gAnimBankAttacker _0812D760: ldrh r2, [r4, 0x30] lsls r1, r2, 16 @@ -2951,7 +2951,7 @@ _0812D760: cmp r0, r1 ble _0812D788 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812D788: pop {r4} pop {r0} @@ -3043,7 +3043,7 @@ _0812D834: ldr r1, _0812D850 @ =REG_MOSAIC movs r0, 0 strh r0, [r1] - ldr r0, _0812D854 @ =gBattleAnimBankAttacker + ldr r0, _0812D854 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -3054,7 +3054,7 @@ _0812D834: b _0812D85E .align 2, 0 _0812D850: .4byte REG_MOSAIC -_0812D854: .4byte gBattleAnimBankAttacker +_0812D854: .4byte gAnimBankAttacker _0812D858: .4byte REG_BG1CNT _0812D85C: ldr r0, _0812D87C @ =REG_BG2CNT @@ -3110,9 +3110,9 @@ _0812D8BC: .align 2, 0 _0812D8C0: .4byte REG_MOSAIC _0812D8C4: - ldr r5, _0812D8F4 @ =gBattleAnimBankAttacker + ldr r5, _0812D8F4 @ =gAnimBankAttacker ldrb r0, [r5] - ldr r1, _0812D8F8 @ =gBattleAnimBankTarget + ldr r1, _0812D8F8 @ =gAnimBankTarget ldrb r1, [r1] mov r2, r8 lsls r4, r2, 2 @@ -3124,7 +3124,7 @@ _0812D8C4: ldrb r1, [r5] mov r0, sp bl sub_8078954 - bl NotInBattle + bl IsContest lsls r0, 24 mov r9, r4 cmp r0, 0 @@ -3132,8 +3132,8 @@ _0812D8C4: movs r1, 0 b _0812D906 .align 2, 0 -_0812D8F4: .4byte gBattleAnimBankAttacker -_0812D8F8: .4byte gBattleAnimBankTarget +_0812D8F4: .4byte gAnimBankAttacker +_0812D8F8: .4byte gAnimBankTarget _0812D8FC: ldrb r0, [r5] bl GetBankIdentity @@ -3144,7 +3144,7 @@ _0812D906: lsls r1, 2 adds r1, r0 ldr r2, _0812D9D0 @ =gBattleMonForms - ldr r0, _0812D9D4 @ =gBattleAnimBankAttacker + ldr r0, _0812D9D4 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r2 ldrb r0, [r0] @@ -3158,16 +3158,16 @@ _0812D906: ldr r1, _0812D9DC @ =0x84000200 str r1, [r0, 0x8] ldr r0, [r0, 0x8] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _0812DA20 ldr r5, _0812D9E0 @ =gSharedMem + 0x19348 ldrh r0, [r5] - bl sub_80AEB1C + bl IsSpeciesNotUnown adds r4, r0, 0 ldrh r0, [r5, 0x2] - bl sub_80AEB1C + bl IsSpeciesNotUnown lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -3222,13 +3222,13 @@ _0812D98E: _0812D9A2: ldr r0, _0812D9E0 @ =gSharedMem + 0x19348 ldrh r0, [r0, 0x2] - bl sub_80AEB1C + bl IsSpeciesNotUnown lsls r0, 24 cmp r0, 0 beq _0812D9F0 ldr r3, _0812D9E4 @ =gSprites ldr r4, _0812D9E8 @ =gObjectBankIDs - ldr r2, _0812D9D4 @ =gBattleAnimBankAttacker + ldr r2, _0812D9D4 @ =gAnimBankAttacker ldrb r0, [r2] adds r0, r4 ldrb r1, [r0] @@ -3243,7 +3243,7 @@ _0812D9A2: .align 2, 0 _0812D9CC: .4byte gUnknown_081FAF4C _0812D9D0: .4byte gBattleMonForms -_0812D9D4: .4byte gBattleAnimBankAttacker +_0812D9D4: .4byte gAnimBankAttacker _0812D9D8: .4byte 0x040000d4 _0812D9DC: .4byte 0x84000200 _0812D9E0: .4byte gSharedMem + 0x19348 @@ -3253,7 +3253,7 @@ _0812D9EC: .4byte gSpriteAffineAnimTable_81E7C18 _0812D9F0: ldr r3, _0812DA34 @ =gSprites ldr r4, _0812DA38 @ =gObjectBankIDs - ldr r2, _0812DA3C @ =gBattleAnimBankAttacker + ldr r2, _0812DA3C @ =gAnimBankAttacker ldrb r0, [r2] adds r0, r4 ldrb r1, [r0] @@ -3289,7 +3289,7 @@ _0812DA2A: .align 2, 0 _0812DA34: .4byte gSprites _0812DA38: .4byte gObjectBankIDs -_0812DA3C: .4byte gBattleAnimBankAttacker +_0812DA3C: .4byte gAnimBankAttacker _0812DA40: .4byte gSpriteAffineAnimTable_81E7BEC _0812DA44: .4byte gTasks _0812DA48: @@ -3328,7 +3328,7 @@ _0812DA84: ldr r1, _0812DAA0 @ =REG_MOSAIC movs r0, 0 strh r0, [r1] - ldr r0, _0812DAA4 @ =gBattleAnimBankAttacker + ldr r0, _0812DAA4 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -3339,7 +3339,7 @@ _0812DA84: b _0812DAAE .align 2, 0 _0812DAA0: .4byte REG_MOSAIC -_0812DAA4: .4byte gBattleAnimBankAttacker +_0812DAA4: .4byte gAnimBankAttacker _0812DAA8: .4byte REG_BG1CNT _0812DAAC: ldr r2, _0812DB08 @ =REG_BG2CNT @@ -3349,11 +3349,11 @@ _0812DAAE: negs r0, r0 ands r0, r1 strb r0, [r2] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _0812DAF4 - ldr r4, _0812DB0C @ =gBattleAnimBankAttacker + ldr r4, _0812DB0C @ =gAnimBankAttacker ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -3389,7 +3389,7 @@ _0812DAFA: bx r0 .align 2, 0 _0812DB08: .4byte REG_BG2CNT -_0812DB0C: .4byte gBattleAnimBankAttacker +_0812DB0C: .4byte gAnimBankAttacker _0812DB10: .4byte gTasks _0812DB14: .4byte gSharedMem + 0x17800 thumb_func_end sub_812D7E8 @@ -3402,7 +3402,7 @@ c3_80DFBE4: @ 812DB18 ldr r4, _0812DB48 @ =gBattleAnimArgs ldr r3, _0812DB4C @ =gSprites ldr r2, _0812DB50 @ =gObjectBankIDs - ldr r1, _0812DB54 @ =gBattleAnimBankAttacker + ldr r1, _0812DB54 @ =gAnimBankAttacker ldrb r1, [r1] adds r1, r2 ldrb r2, [r1] @@ -3423,7 +3423,7 @@ c3_80DFBE4: @ 812DB18 _0812DB48: .4byte gBattleAnimArgs _0812DB4C: .4byte gSprites _0812DB50: .4byte gObjectBankIDs -_0812DB54: .4byte gBattleAnimBankAttacker +_0812DB54: .4byte gAnimBankAttacker thumb_func_end c3_80DFBE4 thumb_func_start sub_812DB58 @@ -3432,9 +3432,9 @@ sub_812DB58: @ 812DB58 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _0812DB7C @ =gBattleAnimBankAttacker + ldr r0, _0812DB7C @ =gAnimBankAttacker ldrb r0, [r0] - ldr r1, _0812DB80 @ =gBattleAnimBankTarget + ldr r1, _0812DB80 @ =gAnimBankTarget ldrb r1, [r1] movs r2, 0x1 bl sub_8031FC4 @@ -3444,8 +3444,8 @@ sub_812DB58: @ 812DB58 pop {r0} bx r0 .align 2, 0 -_0812DB7C: .4byte gBattleAnimBankAttacker -_0812DB80: .4byte gBattleAnimBankTarget +_0812DB7C: .4byte gAnimBankAttacker +_0812DB80: .4byte gAnimBankTarget thumb_func_end sub_812DB58 thumb_func_start sub_812DB84 @@ -3506,7 +3506,7 @@ _0812DBD0: movs r1, 0x1 orrs r0, r1 strb r0, [r4] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _0812DC12 @@ -3541,7 +3541,7 @@ _0812DC12: lsls r1, 4 movs r2, 0x20 bl LoadCompressedPalette - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _0812DC9C @@ -3551,11 +3551,11 @@ _0812DC12: movs r2, 0 movs r3, 0 bl sub_80763FC - ldr r1, _0812DC90 @ =gUnknown_030042C0 + ldr r1, _0812DC90 @ =gBattle_BG1_X ldr r2, _0812DC94 @ =0x0000ffc8 adds r0, r2, 0 strh r0, [r1] - ldr r0, _0812DC98 @ =gUnknown_030041B4 + ldr r0, _0812DC98 @ =gBattle_BG1_Y strh r4, [r0] b _0812DCCE .align 2, 0 @@ -3567,31 +3567,31 @@ _0812DC80: .4byte 0x85000400 _0812DC84: .4byte gUnknown_08D2AA98 _0812DC88: .4byte gUnknown_08D2A9E0 _0812DC8C: .4byte gUnknown_08D2AA80 -_0812DC90: .4byte gUnknown_030042C0 +_0812DC90: .4byte gBattle_BG1_X _0812DC94: .4byte 0x0000ffc8 -_0812DC98: .4byte gUnknown_030041B4 +_0812DC98: .4byte gBattle_BG1_Y _0812DC9C: - ldr r0, _0812DCB4 @ =gBattleAnimBankAttacker + ldr r0, _0812DCB4 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0812DCC0 - ldr r1, _0812DCB8 @ =gUnknown_030042C0 + ldr r1, _0812DCB8 @ =gBattle_BG1_X ldr r4, _0812DCBC @ =0x0000ff79 adds r0, r4, 0 b _0812DCC6 .align 2, 0 -_0812DCB4: .4byte gBattleAnimBankAttacker -_0812DCB8: .4byte gUnknown_030042C0 +_0812DCB4: .4byte gAnimBankAttacker +_0812DCB8: .4byte gBattle_BG1_X _0812DCBC: .4byte 0x0000ff79 _0812DCC0: - ldr r1, _0812DCEC @ =gUnknown_030042C0 + ldr r1, _0812DCEC @ =gBattle_BG1_X ldr r2, _0812DCF0 @ =0x0000fff6 adds r0, r2, 0 _0812DCC6: strh r0, [r1] - ldr r1, _0812DCF4 @ =gUnknown_030041B4 + ldr r1, _0812DCF4 @ =gBattle_BG1_Y movs r0, 0 strh r0, [r1] _0812DCCE: @@ -3600,19 +3600,19 @@ _0812DCCE: adds r1, r7 lsls r1, 3 adds r1, r0 - ldr r0, _0812DCEC @ =gUnknown_030042C0 + ldr r0, _0812DCEC @ =gBattle_BG1_X ldrh r0, [r0] strh r0, [r1, 0x1C] - ldr r0, _0812DCF4 @ =gUnknown_030041B4 + ldr r0, _0812DCF4 @ =gBattle_BG1_Y ldrh r0, [r0] strh r0, [r1, 0x1E] ldrh r0, [r1, 0x8] adds r0, 0x1 b _0812DDD2 .align 2, 0 -_0812DCEC: .4byte gUnknown_030042C0 +_0812DCEC: .4byte gBattle_BG1_X _0812DCF0: .4byte 0x0000fff6 -_0812DCF4: .4byte gUnknown_030041B4 +_0812DCF4: .4byte gBattle_BG1_Y _0812DCF8: .4byte gTasks _0812DCFC: lsls r0, r7, 2 @@ -3685,7 +3685,7 @@ _0812DD64: beq _0812DD7C b _0812DE80 _0812DD7C: - ldr r2, _0812DDA8 @ =gUnknown_030042C0 + ldr r2, _0812DDA8 @ =gBattle_BG1_X ldr r1, _0812DDAC @ =gUnknown_084025C0 movs r4, 0xC ldrsh r0, [r3, r4] @@ -3707,7 +3707,7 @@ _0812DD7C: b _0812DE80 .align 2, 0 _0812DDA4: .4byte REG_BLDALPHA -_0812DDA8: .4byte gUnknown_030042C0 +_0812DDA8: .4byte gBattle_BG1_X _0812DDAC: .4byte gUnknown_084025C0 _0812DDB0: movs r0, 0x3 @@ -3732,7 +3732,7 @@ _0812DDD2: strh r0, [r1, 0x8] movs r0, 0x40 negs r0, r0 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -3785,7 +3785,7 @@ _0812DE0C: ldr r1, _0812DE98 @ =0x85000200 str r1, [r0, 0x8] ldr r0, [r0, 0x8] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _0812DE5A @@ -3804,9 +3804,9 @@ _0812DE5A: movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r0, _0812DEA0 @ =gUnknown_030042C0 + ldr r0, _0812DEA0 @ =gBattle_BG1_X strh r4, [r0] - ldr r0, _0812DEA4 @ =gUnknown_030041B4 + ldr r0, _0812DEA4 @ =gBattle_BG1_Y strh r4, [r0] ldr r0, _0812DEA8 @ =REG_BLDCNT strh r4, [r0] @@ -3827,8 +3827,8 @@ _0812DE90: .4byte 0x040000d4 _0812DE94: .4byte 0x85000400 _0812DE98: .4byte 0x85000200 _0812DE9C: .4byte REG_BG1CNT -_0812DEA0: .4byte gUnknown_030042C0 -_0812DEA4: .4byte gUnknown_030041B4 +_0812DEA0: .4byte gBattle_BG1_X +_0812DEA4: .4byte gBattle_BG1_Y _0812DEA8: .4byte REG_BLDCNT thumb_func_end sub_812DB84 @@ -3855,17 +3855,17 @@ sub_812DEAC: @ 812DEAC lsls r0, 16 lsrs r5, r0, 16 _0812DED6: - ldr r4, _0812DFD0 @ =gBattleAnimBankAttacker + ldr r4, _0812DFD0 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, r5 strh r0, [r7, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, 0x20 @@ -3974,7 +3974,7 @@ _0812DED6: pop {r0} bx r0 .align 2, 0 -_0812DFD0: .4byte gBattleAnimBankAttacker +_0812DFD0: .4byte gAnimBankAttacker _0812DFD4: .4byte gBattleAnimArgs _0812DFD8: .4byte gBattleAnimSpriteTemplate_84025EC _0812DFDC: .4byte gSprites @@ -4113,7 +4113,7 @@ sub_812E09C: @ 812E09C adds r0, r5 bl DestroySprite adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812E0E8: pop {r4-r6} pop {r0} @@ -4225,7 +4225,7 @@ _0812E194: movs r1, 0x1 orrs r0, r1 strb r0, [r4] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _0812E1D4 @@ -4260,7 +4260,7 @@ _0812E1D4: lsls r1, 4 movs r2, 0x20 bl LoadCompressedPalette - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _0812E260 @@ -4270,11 +4270,11 @@ _0812E1D4: movs r2, 0 movs r3, 0 bl sub_80763FC - ldr r1, _0812E254 @ =gUnknown_030042C0 + ldr r1, _0812E254 @ =gBattle_BG1_X ldr r3, _0812E258 @ =0x0000ffc8 adds r0, r3, 0 strh r0, [r1] - ldr r0, _0812E25C @ =gUnknown_030041B4 + ldr r0, _0812E25C @ =gBattle_BG1_Y strh r4, [r0] b _0812E2D2 .align 2, 0 @@ -4287,11 +4287,11 @@ _0812E244: .4byte 0x85000400 _0812E248: .4byte gUnknown_08D2AA98 _0812E24C: .4byte gUnknown_08D2A9E0 _0812E250: .4byte gUnknown_08D2AA80 -_0812E254: .4byte gUnknown_030042C0 +_0812E254: .4byte gBattle_BG1_X _0812E258: .4byte 0x0000ffc8 -_0812E25C: .4byte gUnknown_030041B4 +_0812E25C: .4byte gBattle_BG1_Y _0812E260: - ldr r0, _0812E2A0 @ =gBattleAnimBankTarget + ldr r0, _0812E2A0 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankIdentity lsls r0, 24 @@ -4301,7 +4301,7 @@ _0812E260: lsrs r0, 24 cmp r0, 0x1 bne _0812E2B4 - ldr r1, _0812E2A4 @ =gUnknown_030042C0 + ldr r1, _0812E2A4 @ =gBattle_BG1_X cmp r4, 0x1 bne _0812E284 ldr r2, _0812E2A8 @ =0x0000ff65 @@ -4321,32 +4321,32 @@ _0812E28E: _0812E296: cmp r4, 0x2 bne _0812E2CC - ldr r1, _0812E2A4 @ =gUnknown_030042C0 + ldr r1, _0812E2A4 @ =gBattle_BG1_X ldr r2, _0812E2B0 @ =0x0000ffec b _0812E2C8 .align 2, 0 -_0812E2A0: .4byte gBattleAnimBankTarget -_0812E2A4: .4byte gUnknown_030042C0 +_0812E2A0: .4byte gAnimBankTarget +_0812E2A4: .4byte gBattle_BG1_X _0812E2A8: .4byte 0x0000ff65 _0812E2AC: .4byte 0x0000ff8d _0812E2B0: .4byte 0x0000ffec _0812E2B4: cmp r4, 0x1 bne _0812E2C0 - ldr r1, _0812E2EC @ =gUnknown_030042C0 + ldr r1, _0812E2EC @ =gBattle_BG1_X ldr r3, _0812E2F0 @ =0x0000ff79 adds r0, r3, 0 strh r0, [r1] _0812E2C0: cmp r4, 0 bne _0812E2CC - ldr r1, _0812E2EC @ =gUnknown_030042C0 + ldr r1, _0812E2EC @ =gBattle_BG1_X ldr r2, _0812E2F4 @ =0x0000fff6 _0812E2C8: adds r0, r2, 0 strh r0, [r1] _0812E2CC: - ldr r1, _0812E2F8 @ =gUnknown_030041B4 + ldr r1, _0812E2F8 @ =gBattle_BG1_Y movs r0, 0 strh r0, [r1] _0812E2D2: @@ -4355,18 +4355,18 @@ _0812E2D2: adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _0812E2EC @ =gUnknown_030042C0 + ldr r0, _0812E2EC @ =gBattle_BG1_X ldrh r0, [r0] strh r0, [r1, 0x1C] - ldr r0, _0812E2F8 @ =gUnknown_030041B4 + ldr r0, _0812E2F8 @ =gBattle_BG1_Y ldrh r0, [r0] strh r0, [r1, 0x1E] b _0812E380 .align 2, 0 -_0812E2EC: .4byte gUnknown_030042C0 +_0812E2EC: .4byte gBattle_BG1_X _0812E2F0: .4byte 0x0000ff79 _0812E2F4: .4byte 0x0000fff6 -_0812E2F8: .4byte gUnknown_030041B4 +_0812E2F8: .4byte gBattle_BG1_Y _0812E2FC: .4byte gTasks _0812E300: ldr r1, _0812E334 @ =gTasks @@ -4376,14 +4376,14 @@ _0812E300: adds r5, r0, r1 movs r0, 0 strh r0, [r5, 0xE] - ldr r0, _0812E338 @ =gBattleAnimBankTarget + ldr r0, _0812E338 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _0812E344 - ldr r2, _0812E33C @ =gUnknown_030042C0 + ldr r2, _0812E33C @ =gBattle_BG1_X ldr r1, _0812E340 @ =gUnknown_08402604 movs r3, 0xC ldrsh r0, [r5, r3] @@ -4396,11 +4396,11 @@ _0812E300: b _0812E356 .align 2, 0 _0812E334: .4byte gTasks -_0812E338: .4byte gBattleAnimBankTarget -_0812E33C: .4byte gUnknown_030042C0 +_0812E338: .4byte gAnimBankTarget +_0812E33C: .4byte gBattle_BG1_X _0812E340: .4byte gUnknown_08402604 _0812E344: - ldr r2, _0812E374 @ =gUnknown_030042C0 + ldr r2, _0812E374 @ =gBattle_BG1_X ldr r1, _0812E378 @ =gUnknown_08402604 movs r3, 0xC ldrsh r0, [r5, r3] @@ -4425,7 +4425,7 @@ _0812E356: strh r0, [r1, 0x8] b _0812E476 .align 2, 0 -_0812E374: .4byte gUnknown_030042C0 +_0812E374: .4byte gBattle_BG1_X _0812E378: .4byte gUnknown_08402604 _0812E37C: .4byte gTasks _0812E380: @@ -4528,7 +4528,7 @@ _0812E420: ldr r0, _0812E484 @ =0x85000200 str r0, [r1, 0x8] ldr r0, [r1, 0x8] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _0812E450 @@ -4547,9 +4547,9 @@ _0812E450: movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r0, _0812E48C @ =gUnknown_030042C0 + ldr r0, _0812E48C @ =gBattle_BG1_X strh r4, [r0] - ldr r0, _0812E490 @ =gUnknown_030041B4 + ldr r0, _0812E490 @ =gBattle_BG1_Y strh r4, [r0] ldr r0, _0812E494 @ =REG_BLDCNT strh r4, [r0] @@ -4566,8 +4566,8 @@ _0812E476: _0812E480: .4byte 0x040000d4 _0812E484: .4byte 0x85000200 _0812E488: .4byte REG_BG1CNT -_0812E48C: .4byte gUnknown_030042C0 -_0812E490: .4byte gUnknown_030041B4 +_0812E48C: .4byte gBattle_BG1_X +_0812E490: .4byte gBattle_BG1_Y _0812E494: .4byte REG_BLDCNT thumb_func_end sub_812E14C @@ -4642,7 +4642,7 @@ _0812E50E: ldrh r0, [r4, 0x32] adds r0, 0x80 strh r0, [r4, 0x32] - ldr r0, _0812E53C @ =gBattleAnimBankAttacker + ldr r0, _0812E53C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -4654,7 +4654,7 @@ _0812E50E: negs r0, r0 b _0812E546 .align 2, 0 -_0812E53C: .4byte gBattleAnimBankAttacker +_0812E53C: .4byte gAnimBankAttacker _0812E540: ldrh r0, [r4, 0x30] lsls r0, 16 @@ -4672,7 +4672,7 @@ _0812E546: cmp r0, 0x40 ble _0812E562 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812E562: pop {r4} pop {r0} @@ -4747,12 +4747,12 @@ _0812E5AC: ldrsh r0, [r5, r1] cmp r0, 0 bne _0812E5F8 - ldr r0, _0812E5F4 @ =gBattleAnimBankAttacker + ldr r0, _0812E5F4 @ =gAnimBankAttacker b _0812E5FA .align 2, 0 -_0812E5F4: .4byte gBattleAnimBankAttacker +_0812E5F4: .4byte gAnimBankAttacker _0812E5F8: - ldr r0, _0812E630 @ =gBattleAnimBankTarget + ldr r0, _0812E630 @ =gAnimBankTarget _0812E5FA: ldrb r0, [r0] bl GetBankSide @@ -4781,7 +4781,7 @@ _0812E628: pop {r0} bx r0 .align 2, 0 -_0812E630: .4byte gBattleAnimBankTarget +_0812E630: .4byte gAnimBankTarget _0812E634: .4byte sub_812E638 thumb_func_end sub_812E568 @@ -4970,7 +4970,7 @@ _0812E798: sub_812E7A0: @ 812E7A0 push {r4,lr} adds r4, r0, 0 - ldr r0, _0812E7BC @ =gBattleAnimBankAttacker + ldr r0, _0812E7BC @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -4982,7 +4982,7 @@ sub_812E7A0: @ 812E7A0 ldrh r0, [r1] b _0812E7CE .align 2, 0 -_0812E7BC: .4byte gBattleAnimBankAttacker +_0812E7BC: .4byte gAnimBankAttacker _0812E7C0: .4byte gBattleAnimArgs _0812E7C4: movs r0, 0xF0 @@ -5014,7 +5014,7 @@ sub_812E7F0: @ 812E7F0 ldrh r0, [r4, 0x2E] adds r0, 0x3 strh r0, [r4, 0x2E] - ldr r0, _0812E830 @ =gBattleAnimBankAttacker + ldr r0, _0812E830 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -5031,7 +5031,7 @@ sub_812E7F0: @ 812E7F0 cmp r1, 0xF0 ble _0812E822 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812E822: ldrh r1, [r4, 0x2E] movs r0, 0xFF @@ -5040,7 +5040,7 @@ _0812E822: bl Sin b _0812E858 .align 2, 0 -_0812E830: .4byte gBattleAnimBankAttacker +_0812E830: .4byte gAnimBankAttacker _0812E834: ldrh r1, [r4, 0x20] subs r1, 0x5 @@ -5052,7 +5052,7 @@ _0812E834: cmp r1, 0 bge _0812E84C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812E84C: ldrh r1, [r4, 0x2E] movs r0, 0xFF @@ -5329,16 +5329,16 @@ sub_812EA4C: @ 812EA4C ldrsh r0, [r6, r2] cmp r0, 0 bne _0812EA80 - ldr r4, _0812EAA8 @ =gBattleAnimBankAttacker + ldr r4, _0812EAA8 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -5363,7 +5363,7 @@ _0812EA80: b _0812EB0A .align 2, 0 _0812EAA4: .4byte gBattleAnimArgs -_0812EAA8: .4byte gBattleAnimBankAttacker +_0812EAA8: .4byte gAnimBankAttacker _0812EAAC: ldrh r1, [r5, 0x30] lsls r0, r1, 16 @@ -5410,7 +5410,7 @@ _0812EAEA: cmp r0, 0 beq _0812EB0A adds r0, r5, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812EB0A: pop {r4-r6} pop {r0} @@ -5440,14 +5440,14 @@ sub_812EB10: @ 812EB10 mov r8, r0 cmp r1, 0 bne _0812EB4C - ldr r0, _0812EB48 @ =gBattleAnimBankAttacker + ldr r0, _0812EB48 @ =gAnimBankAttacker b _0812EB4E .align 2, 0 _0812EB40: .4byte gTasks _0812EB44: .4byte gBattleAnimArgs -_0812EB48: .4byte gBattleAnimBankAttacker +_0812EB48: .4byte gAnimBankAttacker _0812EB4C: - ldr r0, _0812EB88 @ =gBattleAnimBankTarget + ldr r0, _0812EB88 @ =gAnimBankTarget _0812EB4E: ldrb r0, [r0] strh r0, [r2, 0x1E] @@ -5477,7 +5477,7 @@ _0812EB4E: lsls r2, r5, 4 b _0812EBF8 .align 2, 0 -_0812EB88: .4byte gBattleAnimBankTarget +_0812EB88: .4byte gAnimBankTarget _0812EB8C: .4byte gTasks _0812EB90: cmp r0, 0x2 @@ -5512,7 +5512,7 @@ _0812EBC2: bl obj_id_set_rotscale adds r0, r5, 0 bl sub_8079A64 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _0812EBE8 @@ -5733,7 +5733,7 @@ _0812ED6A: cmp r0, 0x1F bne _0812ED7E adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812ED7E: pop {r4} pop {r0} @@ -5756,10 +5756,10 @@ sub_812ED84: @ 812ED84 adds r1, r3, 0 orrs r0, r1 strh r0, [r2] - ldr r0, _0812EDEC @ =gUnknown_030042C4 + ldr r0, _0812EDEC @ =gBattle_WIN0H movs r1, 0 strh r1, [r0] - ldr r0, _0812EDF0 @ =gUnknown_03004240 + ldr r0, _0812EDF0 @ =gBattle_WIN0V strh r1, [r0] ldr r0, _0812EDF4 @ =REG_WIN0H strh r1, [r0] @@ -5792,8 +5792,8 @@ sub_812ED84: @ 812ED84 .align 2, 0 _0812EDE4: .4byte REG_WINOUT _0812EDE8: .4byte 0x00001f3f -_0812EDEC: .4byte gUnknown_030042C4 -_0812EDF0: .4byte gUnknown_03004240 +_0812EDEC: .4byte gBattle_WIN0H +_0812EDF0: .4byte gBattle_WIN0V _0812EDF4: .4byte REG_WIN0H _0812EDF8: .4byte gBattleAnimArgs _0812EDFC: .4byte sub_812EE00 @@ -5878,7 +5878,7 @@ _0812EE76: eors r0, r1 strh r0, [r2] adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812EE94: pop {r4} pop {r0} @@ -5892,16 +5892,16 @@ _0812EEA0: .4byte 0x00003f3f sub_812EEA4: @ 812EEA4 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _0812EEE0 @ =gBattleAnimBankAttacker + ldr r5, _0812EEE0 @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x20] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] @@ -5918,7 +5918,7 @@ sub_812EEA4: @ 812EEA4 pop {r0} bx r0 .align 2, 0 -_0812EEE0: .4byte gBattleAnimBankAttacker +_0812EEE0: .4byte gAnimBankAttacker _0812EEE4: .4byte gBattleAnimArgs _0812EEE8: .4byte sub_812EEEC thumb_func_end sub_812EEA4 @@ -5953,15 +5953,15 @@ sub_812EEEC: @ 812EEEC cmp r0, 0xC3 ble _0812EF38 _0812EF26: - ldr r0, _0812EF34 @ =gBattleAnimBankAttacker + ldr r0, _0812EF34 @ =gAnimBankAttacker ldrb r0, [r0] bl sub_8079E90 subs r0, 0x1 b _0812EF42 .align 2, 0 -_0812EF34: .4byte gBattleAnimBankAttacker +_0812EF34: .4byte gAnimBankAttacker _0812EF38: - ldr r0, _0812EF84 @ =gBattleAnimBankAttacker + ldr r0, _0812EF84 @ =gAnimBankAttacker ldrb r0, [r0] bl sub_8079E90 adds r0, 0x1 @@ -5999,7 +5999,7 @@ _0812EF42: strh r0, [r4, 0x38] b _0812EFB8 .align 2, 0 -_0812EF84: .4byte gBattleAnimBankAttacker +_0812EF84: .4byte gAnimBankAttacker _0812EF88: cmp r2, 0x1 bne _0812EFB8 @@ -6023,7 +6023,7 @@ _0812EF88: cmp r0, r1 bne _0812EFB8 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812EFB8: pop {r4} pop {r0} @@ -6046,7 +6046,7 @@ sub_812EFC8: @ 812EFC8 str r0, [sp, 0x10] movs r0, 0 bl GetAnimBankSpriteId - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _0812F004 @@ -6063,7 +6063,7 @@ sub_812EFC8: @ 812EFC8 .align 2, 0 _0812F000: .4byte gSharedMem + 0x19348 _0812F004: - ldr r0, _0812F070 @ =gBattleAnimBankAttacker + ldr r0, _0812F070 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -6072,7 +6072,7 @@ _0812F004: movs r0, 0 str r0, [sp, 0x14] ldr r6, _0812F074 @ =gBattlePartyID - ldr r4, _0812F078 @ =gBattleAnimBankTarget + ldr r4, _0812F078 @ =gAnimBankTarget ldrb r0, [r4] lsls r0, 1 adds r0, r6 @@ -6113,9 +6113,9 @@ _0812F004: adds r0, r7 b _0812F092 .align 2, 0 -_0812F070: .4byte gBattleAnimBankAttacker +_0812F070: .4byte gAnimBankAttacker _0812F074: .4byte gBattlePartyID -_0812F078: .4byte gBattleAnimBankTarget +_0812F078: .4byte gAnimBankTarget _0812F07C: .4byte gPlayerParty _0812F080: .4byte gSharedMem + 0x17800 _0812F084: @@ -6144,7 +6144,7 @@ _0812F0AC: movs r2, 0x1 str r2, [sp, 0x14] ldr r6, _0812F10C @ =gBattlePartyID - ldr r4, _0812F110 @ =gBattleAnimBankTarget + ldr r4, _0812F110 @ =gAnimBankTarget ldrb r0, [r4] lsls r0, 1 adds r0, r6 @@ -6187,7 +6187,7 @@ _0812F0AC: b _0812F12C .align 2, 0 _0812F10C: .4byte gBattlePartyID -_0812F110: .4byte gBattleAnimBankTarget +_0812F110: .4byte gAnimBankTarget _0812F114: .4byte gEnemyParty _0812F118: .4byte gSharedMem + 0x17800 _0812F11C: .4byte gPlayerParty @@ -6211,21 +6211,21 @@ _0812F13A: _0812F13C: mov r10, r3 _0812F13E: - ldr r0, _0812F21C @ =gBattleAnimBankAttacker + ldr r0, _0812F21C @ =gAnimBankAttacker ldrb r0, [r0] bl sub_8079ED4 lsls r0, 24 lsrs r7, r0, 24 - ldr r5, _0812F21C @ =gBattleAnimBankAttacker + ldr r5, _0812F21C @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 ldrb r0, [r5] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 mov r2, r10 lsls r1, r2, 16 @@ -6317,7 +6317,7 @@ _0812F13E: bx r0 .align 2, 0 _0812F218: .4byte 0x0000ffec -_0812F21C: .4byte gBattleAnimBankAttacker +_0812F21C: .4byte gAnimBankAttacker _0812F220: .4byte gSprites _0812F224: .4byte 0x00007fff _0812F228: .4byte REG_BLDCNT @@ -6454,14 +6454,14 @@ sub_812F314: @ 812F314 ldrsh r0, [r0, r1] cmp r0, 0 bne _0812F340 - ldr r0, _0812F33C @ =gBattleAnimBankAttacker + ldr r0, _0812F33C @ =gAnimBankAttacker b _0812F342 .align 2, 0 _0812F334: .4byte gTasks _0812F338: .4byte gBattleAnimArgs -_0812F33C: .4byte gBattleAnimBankAttacker +_0812F33C: .4byte gAnimBankAttacker _0812F340: - ldr r0, _0812F3C0 @ =gBattleAnimBankTarget + ldr r0, _0812F3C0 @ =gAnimBankTarget _0812F342: ldrb r5, [r0] movs r6, 0 @@ -6519,18 +6519,18 @@ _0812F388: ldr r2, _0812F3D0 @ =0x00003f42 adds r0, r2, 0 strh r0, [r1] - ldr r0, _0812F3D4 @ =gUnknown_030042C0 + ldr r0, _0812F3D4 @ =gBattle_BG1_X ldrh r5, [r0] - ldr r0, _0812F3D8 @ =gUnknown_030041B4 + ldr r0, _0812F3D8 @ =gBattle_BG1_Y b _0812F3EE .align 2, 0 -_0812F3C0: .4byte gBattleAnimBankTarget +_0812F3C0: .4byte gAnimBankTarget _0812F3C4: .4byte gBattleAnimArgs _0812F3C8: .4byte REG_BG1HOFS _0812F3CC: .4byte REG_BLDCNT _0812F3D0: .4byte 0x00003f42 -_0812F3D4: .4byte gUnknown_030042C0 -_0812F3D8: .4byte gUnknown_030041B4 +_0812F3D4: .4byte gBattle_BG1_X +_0812F3D8: .4byte gBattle_BG1_Y _0812F3DC: ldr r0, _0812F454 @ =REG_BG2HOFS str r0, [sp] @@ -6538,9 +6538,9 @@ _0812F3DC: ldr r2, _0812F45C @ =0x00003f44 adds r0, r2, 0 strh r0, [r1] - ldr r0, _0812F460 @ =gUnknown_03004288 + ldr r0, _0812F460 @ =gBattle_BG2_X ldrh r5, [r0] - ldr r0, _0812F464 @ =gUnknown_03004280 + ldr r0, _0812F464 @ =gBattle_BG2_Y _0812F3EE: ldrh r3, [r0] movs r7, 0 @@ -6597,8 +6597,8 @@ _0812F3FE: _0812F454: .4byte REG_BG2HOFS _0812F458: .4byte REG_BLDCNT _0812F45C: .4byte 0x00003f44 -_0812F460: .4byte gUnknown_03004288 -_0812F464: .4byte gUnknown_03004280 +_0812F460: .4byte gBattle_BG2_X +_0812F464: .4byte gBattle_BG2_Y _0812F468: .4byte gUnknown_03004DE0 _0812F46C: .4byte 0xa6600001 _0812F470: .4byte sub_812F474 @@ -6625,20 +6625,20 @@ sub_812F474: @ 812F474 lsrs r0, 24 cmp r0, 0x1 bne _0812F4B4 - ldr r0, _0812F4AC @ =gUnknown_030042C0 + ldr r0, _0812F4AC @ =gBattle_BG1_X ldrh r0, [r0] str r0, [sp, 0x4] - ldr r0, _0812F4B0 @ =gUnknown_030041B4 + ldr r0, _0812F4B0 @ =gBattle_BG1_Y b _0812F4BC .align 2, 0 _0812F4A8: .4byte gTasks -_0812F4AC: .4byte gUnknown_030042C0 -_0812F4B0: .4byte gUnknown_030041B4 +_0812F4AC: .4byte gBattle_BG1_X +_0812F4B0: .4byte gBattle_BG1_Y _0812F4B4: - ldr r0, _0812F4D4 @ =gUnknown_03004288 + ldr r0, _0812F4D4 @ =gBattle_BG2_X ldrh r0, [r0] str r0, [sp, 0x4] - ldr r0, _0812F4D8 @ =gUnknown_03004280 + ldr r0, _0812F4D8 @ =gBattle_BG2_Y _0812F4BC: ldrh r0, [r0] str r0, [sp, 0x8] @@ -6654,8 +6654,8 @@ _0812F4CA: beq _0812F4EA b _0812F712 .align 2, 0 -_0812F4D4: .4byte gUnknown_03004288 -_0812F4D8: .4byte gUnknown_03004280 +_0812F4D4: .4byte gBattle_BG2_X +_0812F4D8: .4byte gBattle_BG2_Y _0812F4DC: cmp r0, 0x2 bne _0812F4E2 @@ -7249,7 +7249,7 @@ sub_812F948: @ 812F948 ldrb r1, [r6] adds r0, r5, 0 bl StartSpriteAffineAnim - ldr r0, _0812F9A4 @ =gBattleAnimBankTarget + ldr r0, _0812F9A4 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -7259,10 +7259,10 @@ sub_812F948: @ 812F948 negs r0, r0 strh r0, [r6, 0x2] _0812F96E: - ldr r4, _0812F9A8 @ =gBattleAnimBankAttacker + ldr r4, _0812F9A8 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r6, 0x2] @@ -7270,7 +7270,7 @@ _0812F96E: strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r6, [r6, 0x4] @@ -7283,8 +7283,8 @@ _0812F96E: bx r0 .align 2, 0 _0812F9A0: .4byte gBattleAnimArgs -_0812F9A4: .4byte gBattleAnimBankTarget -_0812F9A8: .4byte gBattleAnimBankAttacker +_0812F9A4: .4byte gAnimBankTarget +_0812F9A8: .4byte gAnimBankAttacker _0812F9AC: .4byte sub_80DA48C thumb_func_end sub_812F948 @@ -7673,7 +7673,7 @@ sub_812FC68: @ 812FC68 mov r1, r8 adds r4, r0, r1 ldr r1, _0812FCCC @ =gObjectBankIDs - ldr r2, _0812FCD0 @ =gBattleAnimBankAttacker + ldr r2, _0812FCD0 @ =gAnimBankAttacker ldrb r0, [r2] adds r0, r1 ldrb r0, [r0] @@ -7710,7 +7710,7 @@ _0812FCAC: .align 2, 0 _0812FCC8: .4byte gTasks _0812FCCC: .4byte gObjectBankIDs -_0812FCD0: .4byte gBattleAnimBankAttacker +_0812FCD0: .4byte gAnimBankAttacker _0812FCD4: .4byte gBattleAnimArgs _0812FCD8: .4byte 0xffff8000 _0812FCDC: @@ -7821,25 +7821,25 @@ _0812FD9C: ldrsh r0, [r4, r1] cmp r0, 0 bne _0812FDC0 - ldr r0, _0812FDBC @ =gBattleAnimBankAttacker + ldr r0, _0812FDBC @ =gAnimBankAttacker b _0812FDC2 .align 2, 0 _0812FDB4: .4byte gTasks _0812FDB8: .4byte gBattleAnimArgs -_0812FDBC: .4byte gBattleAnimBankAttacker +_0812FDBC: .4byte gAnimBankAttacker _0812FDC0: - ldr r0, _0812FE10 @ =gBattleAnimBankTarget + ldr r0, _0812FE10 @ =gAnimBankTarget _0812FDC2: ldrb r4, [r0] adds r0, r4, 0 movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x10] adds r0, r4, 0 movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x12] @@ -7864,7 +7864,7 @@ _0812FDC2: pop {r0} bx r0 .align 2, 0 -_0812FE10: .4byte gBattleAnimBankTarget +_0812FE10: .4byte gAnimBankTarget _0812FE14: .4byte gBattleAnimArgs _0812FE18: .4byte gUnknown_084028AC _0812FE1C: .4byte sub_812FE20 @@ -8214,7 +8214,7 @@ sub_81300A4: @ 81300A4 lsrs r0, 24 movs r2, 0xD0 lsls r2, 1 - ldr r1, _081300E0 @ =gBattleAnimBankAttacker + ldr r1, _081300E0 @ =gAnimBankAttacker ldrb r3, [r1] ldr r1, _081300E4 @ =gBattleAnimArgs ldrb r1, [r1] @@ -8237,7 +8237,7 @@ sub_81300A4: @ 81300A4 pop {r0} bx r0 .align 2, 0 -_081300E0: .4byte gBattleAnimBankAttacker +_081300E0: .4byte gAnimBankAttacker _081300E4: .4byte gBattleAnimArgs _081300E8: .4byte gUnknown_08D2E014 _081300EC: .4byte gUnknown_08D2E170 @@ -8248,7 +8248,7 @@ _081300F0: .4byte gUnknown_08D2E150 sub_81300F4: @ 81300F4 push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _0813014C @ =gBattleAnimBankAttacker + ldr r6, _0813014C @ =gAnimBankAttacker ldrb r0, [r6] bl GetBankSide lsls r0, 24 @@ -8262,7 +8262,7 @@ sub_81300F4: @ 81300F4 _08130110: ldrb r0, [r6] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 ldr r4, _08130150 @ =gBattleAnimArgs lsrs r0, 24 @@ -8271,7 +8271,7 @@ _08130110: strh r0, [r5, 0x20] ldrb r0, [r6] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x2] @@ -8288,7 +8288,7 @@ _08130110: strh r0, [r5, 0x30] b _08130180 .align 2, 0 -_0813014C: .4byte gBattleAnimBankAttacker +_0813014C: .4byte gAnimBankAttacker _08130150: .4byte gBattleAnimArgs _08130154: .4byte 0x0000fd80 _08130158: @@ -8313,7 +8313,7 @@ _08130172: lsls r0, 2 strh r0, [r5, 0x2E] _08130180: - ldr r0, _081301AC @ =gBattleAnimBankAttacker + ldr r0, _081301AC @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -8335,7 +8335,7 @@ _081301A0: pop {r0} bx r0 .align 2, 0 -_081301AC: .4byte gBattleAnimBankAttacker +_081301AC: .4byte gAnimBankAttacker _081301B0: .4byte sub_81301B4 thumb_func_end sub_81300F4 @@ -8365,7 +8365,7 @@ sub_81301B4: @ 81301B4 cmp r0, 0xE bne _081301E8 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081301E8: pop {r0} bx r0 @@ -8381,7 +8381,7 @@ sub_81301EC: @ 81301EC lsls r1, 3 ldr r0, _08130218 @ =gTasks adds r6, r1, r0 - bl NotInBattle + bl IsContest lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 @@ -8402,7 +8402,7 @@ _0813021C: strh r0, [r6, 0x14] strh r1, [r6, 0x16] _08130226: - ldr r5, _0813025C @ =gBattleAnimBankAttacker + ldr r5, _0813025C @ =gAnimBankAttacker ldrb r0, [r5] bl GetBankSide lsls r0, 24 @@ -8410,7 +8410,7 @@ _08130226: bne _08130260 ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 ldrb r0, [r5] movs r1, 0 @@ -8427,11 +8427,11 @@ _08130254: adds r0, r4, r0 b _08130284 .align 2, 0 -_0813025C: .4byte gBattleAnimBankAttacker +_0813025C: .4byte gAnimBankAttacker _08130260: ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 ldrb r0, [r5] movs r1, 0 @@ -8448,10 +8448,10 @@ _08130280: subs r0, r4, r0 _08130284: strh r0, [r6, 0x1E] - ldr r5, _081302D8 @ =gBattleAnimBankAttacker + ldr r5, _081302D8 @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 ldrb r0, [r5] movs r1, 0 @@ -8467,16 +8467,16 @@ _081302A8: asrs r0, 2 subs r0, r4, r0 strh r0, [r6, 0x20] - ldr r4, _081302DC @ =gBattleAnimBankTarget + ldr r4, _081302DC @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x22] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x24] @@ -8486,8 +8486,8 @@ _081302A8: pop {r0} bx r0 .align 2, 0 -_081302D8: .4byte gBattleAnimBankAttacker -_081302DC: .4byte gBattleAnimBankTarget +_081302D8: .4byte gAnimBankAttacker +_081302DC: .4byte gAnimBankTarget _081302E0: .4byte sub_81302E4 thumb_func_end sub_81301EC @@ -8807,7 +8807,7 @@ sub_813051C: @ 813051C strh r0, [r4, 0x36] ldrh r0, [r1, 0x8] strh r0, [r4, 0x2E] - ldr r1, _0813054C @ =move_anim_8072740 + ldr r1, _0813054C @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData ldr r0, _08130550 @ =sub_8078CC0 @@ -8817,7 +8817,7 @@ sub_813051C: @ 813051C bx r0 .align 2, 0 _08130548: .4byte gBattleAnimArgs -_0813054C: .4byte move_anim_8072740 +_0813054C: .4byte DestroyAnimSprite _08130550: .4byte sub_8078CC0 thumb_func_end sub_813051C @@ -8836,33 +8836,33 @@ sub_8130554: @ 8130554 lsls r0, 3 ldr r1, _08130674 @ =gTasks adds r7, r0, r1 - ldr r0, _08130678 @ =gBattleAnimBankAttacker + ldr r0, _08130678 @ =gAnimBankAttacker mov r10, r0 ldrb r0, [r0] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r7, 0x1E] mov r1, r10 ldrb r0, [r1] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r7, 0x20] - ldr r0, _0813067C @ =gBattleAnimBankTarget + ldr r0, _0813067C @ =gAnimBankTarget mov r8, r0 ldrb r0, [r0] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r7, 0x22] mov r1, r8 ldrb r0, [r1] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 mov r1, r8 ldrb r0, [r1] @@ -8961,8 +8961,8 @@ _0813066E: b _08130696 .align 2, 0 _08130674: .4byte gTasks -_08130678: .4byte gBattleAnimBankAttacker -_0813067C: .4byte gBattleAnimBankTarget +_08130678: .4byte gAnimBankAttacker +_0813067C: .4byte gAnimBankTarget _08130680: .4byte gSpriteTemplate_84029AC _08130684: .4byte gSprites _08130688: .4byte 0x0000ffe0 @@ -9128,13 +9128,13 @@ sub_81307B0: @ 81307B0 adds r6, r0, 0 cmp r1, 0 bne _081307CC - ldr r0, _081307C8 @ =gBattleAnimBankAttacker + ldr r0, _081307C8 @ =gAnimBankAttacker b _081307CE .align 2, 0 _081307C4: .4byte gBattleAnimArgs -_081307C8: .4byte gBattleAnimBankAttacker +_081307C8: .4byte gAnimBankAttacker _081307CC: - ldr r0, _08130834 @ =gBattleAnimBankTarget + ldr r0, _08130834 @ =gAnimBankTarget _081307CE: ldrb r5, [r0] ldrh r2, [r4, 0x4] @@ -9163,7 +9163,7 @@ _081307FC: strh r1, [r4, 0x3C] adds r0, r5, 0 movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] @@ -9187,7 +9187,7 @@ _081307FC: subs r0, 0x8 b _0813084A .align 2, 0 -_08130834: .4byte gBattleAnimBankTarget +_08130834: .4byte gAnimBankTarget _08130838: .4byte 0x000003ff _0813083C: .4byte 0xfffffc00 _08130840: @@ -9306,7 +9306,7 @@ _081308DA: b _08130914 _0813090E: adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08130914: pop {r0} bx r0 @@ -9460,17 +9460,17 @@ sub_8130A2C: @ 8130A2C ldrsh r0, [r0, r1] cmp r0, 0 bne _08130A48 - ldr r4, _08130A44 @ =gBattleAnimBankAttacker + ldr r4, _08130A44 @ =gAnimBankAttacker b _08130A4A .align 2, 0 _08130A40: .4byte gBattleAnimArgs -_08130A44: .4byte gBattleAnimBankAttacker +_08130A44: .4byte gAnimBankAttacker _08130A48: - ldr r4, _08130A88 @ =gBattleAnimBankTarget + ldr r4, _08130A88 @ =gAnimBankTarget _08130A4A: ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] @@ -9499,7 +9499,7 @@ _08130A6E: pop {r0} bx r0 .align 2, 0 -_08130A88: .4byte gBattleAnimBankTarget +_08130A88: .4byte gAnimBankTarget _08130A8C: .4byte gBattleAnimArgs _08130A90: .4byte sub_8130A94 thumb_func_end sub_8130A2C @@ -9546,7 +9546,7 @@ sub_8130A94: @ 8130A94 cmp r0, 0 bne _08130AE8 adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08130AE8: pop {r0} bx r0 @@ -9840,7 +9840,7 @@ _08130CF6: cmp r0, 0x5 bne _08130D18 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08130D18: pop {r4} pop {r0} @@ -9862,7 +9862,7 @@ sub_8130D20: @ 8130D20 lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x26] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _08130DA8 @@ -9871,10 +9871,10 @@ sub_8130D20: @ 8130D20 lsrs r7, r0, 24 cmp r7, 0x1 bne _08130D8C - ldr r5, _08130D80 @ =gBattleAnimBankAttacker + ldr r5, _08130D80 @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -9882,7 +9882,7 @@ sub_8130D20: @ 8130D20 movs r0, 0x2 eors r0, r1 movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -9891,14 +9891,14 @@ sub_8130D20: @ 8130D20 b _08130DAC .align 2, 0 _08130D7C: .4byte gTasks -_08130D80: .4byte gBattleAnimBankAttacker +_08130D80: .4byte gAnimBankAttacker _08130D84: ldr r0, _08130D88 @ =0x0000ffff b _08130DAA .align 2, 0 _08130D88: .4byte 0x0000ffff _08130D8C: - ldr r0, _08130DA0 @ =gBattleAnimBankAttacker + ldr r0, _08130DA0 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -9907,7 +9907,7 @@ _08130D8C: ldr r0, _08130DA4 @ =0x0000ffff b _08130DAA .align 2, 0 -_08130DA0: .4byte gBattleAnimBankAttacker +_08130DA0: .4byte gAnimBankAttacker _08130DA4: .4byte 0x0000ffff _08130DA8: movs r0, 0x1 @@ -10152,13 +10152,13 @@ sub_8130F5C: @ 8130F5C adds r0, r4, 0 movs r1, 0x1 bl sub_80787B0 - ldr r0, _08130F7C @ =gBattleAnimBankAttacker + ldr r0, _08130F7C @ =gAnimBankAttacker b _08130F82 .align 2, 0 _08130F78: .4byte gBattleAnimArgs -_08130F7C: .4byte gBattleAnimBankAttacker +_08130F7C: .4byte gAnimBankAttacker _08130F80: - ldr r0, _08130FD8 @ =gBattleAnimBankTarget + ldr r0, _08130FD8 @ =gAnimBankTarget _08130F82: ldrb r0, [r0] strh r0, [r4, 0x3C] @@ -10203,7 +10203,7 @@ _08130FA6: pop {r0} bx r0 .align 2, 0 -_08130FD8: .4byte gBattleAnimBankTarget +_08130FD8: .4byte gAnimBankTarget _08130FDC: .4byte sub_8130FE0 thumb_func_end sub_8130F5C @@ -10323,14 +10323,14 @@ _081310C4: lsls r0, 24 lsrs r0, 24 movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r5, r0, 24 ldrh r0, [r4, 0x3C] lsls r0, 24 lsrs r0, 24 movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r1, r0, 24 _081310E4: @@ -10467,7 +10467,7 @@ _081311CA: _081311D4: .4byte REG_BLDALPHA _081311D8: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081311DE: pop {r4,r5} pop {r0} @@ -10528,7 +10528,7 @@ _08131242: cmp r1, r0 bne _08131254 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08131254: ldrh r0, [r4, 0x38] adds r0, 0x1 @@ -10544,19 +10544,19 @@ _08131260: .4byte gSpriteTemplate_8402500 sub_8131264: @ 8131264 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _081312A0 @ =gBattleAnimBankTarget + ldr r4, _081312A0 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition ldrb r0, [r4] bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08131290 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _081312A8 @@ -10570,7 +10570,7 @@ _08131290: subs r1, r0 b _081312B6 .align 2, 0 -_081312A0: .4byte gBattleAnimBankTarget +_081312A0: .4byte gAnimBankTarget _081312A4: .4byte gBattleAnimArgs _081312A8: ldr r2, _081312DC @ =gBattleAnimArgs @@ -10685,11 +10685,11 @@ _08131378: .align 2, 0 _08131380: .4byte gSprites _08131384: - ldr r4, _081313F4 @ =gBattleAnimBankAttacker + ldr r4, _081313F4 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 bl refresh_graphics_maybe - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _081313C6 @@ -10742,7 +10742,7 @@ _081313E8: pop {r0} bx r0 .align 2, 0 -_081313F4: .4byte gBattleAnimBankAttacker +_081313F4: .4byte gAnimBankAttacker _081313F8: .4byte gSprites _081313FC: .4byte gObjectBankIDs _08131400: .4byte gSpriteAffineAnimTable_81E7C18 @@ -10838,7 +10838,7 @@ _081314A6: bne _0813155A movs r0, 0x40 negs r0, r0 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -10911,7 +10911,7 @@ _08131538: bne _0813155A movs r0, 0x40 negs r0, r0 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -10931,7 +10931,7 @@ _08131560: .4byte gSprites sub_8131564: @ 8131564 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _08131588 @ =gBattleAnimBankTarget + ldr r4, _08131588 @ =gAnimBankTarget ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -10946,7 +10946,7 @@ sub_8131564: @ 8131564 ldr r4, _0813158C @ =0x0000ff70 b _081315A0 .align 2, 0 -_08131588: .4byte gBattleAnimBankTarget +_08131588: .4byte gAnimBankTarget _0813158C: .4byte 0x0000ff70 _08131590: ldrb r0, [r4] @@ -10957,10 +10957,10 @@ _08131590: strb r0, [r1] ldr r4, _081315BC @ =0x0000ffa0 _081315A0: - ldr r0, _081315C0 @ =gBattleAnimBankTarget + ldr r0, _081315C0 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -10972,7 +10972,7 @@ _081315A0: bx r0 .align 2, 0 _081315BC: .4byte 0x0000ffa0 -_081315C0: .4byte gBattleAnimBankTarget +_081315C0: .4byte gAnimBankTarget _081315C4: .4byte sub_81315C8 thumb_func_end sub_8131564 @@ -11008,7 +11008,7 @@ _081315F8: cmp r0, 0 blt _081316F2 movs r0, 0x3F - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -11037,7 +11037,7 @@ _0813161C: cmp r1, 0x7F ble _081316F2 movs r0, 0x3F - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -11081,7 +11081,7 @@ _0813168C: cmp r0, 0x8 ble _081316F2 movs r0, 0x3F - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -11122,7 +11122,7 @@ _081316B8: cmp r0, 0x7 bne _081316F2 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081316F2: pop {r4,r5} pop {r0} @@ -11139,7 +11139,7 @@ sub_81316F8: @ 81316F8 lsls r0, 24 lsrs r4, r0, 24 mov r10, r4 - bl NotInBattle + bl IsContest lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 @@ -11395,7 +11395,7 @@ sub_81318F0: @ 81318F0 ldr r3, _0813193C @ =gBattleAnimArgs movs r2, 0 strh r2, [r3, 0xE] - ldr r1, _08131940 @ =gHappinessMoveAnim + ldr r1, _08131940 @ =gAnimFriendship ldrb r0, [r1] ldrb r1, [r1] adds r0, r1, 0 @@ -11431,7 +11431,7 @@ _08131930: bx r0 .align 2, 0 _0813193C: .4byte gBattleAnimArgs -_08131940: .4byte gHappinessMoveAnim +_08131940: .4byte gAnimFriendship thumb_func_end sub_81318F0 thumb_func_start sub_8131944 @@ -11488,7 +11488,7 @@ _08131990: ldrh r1, [r6, 0xA] adds r0, r1 strh r0, [r6, 0xA] - ldr r0, _081319E0 @ =gBattleAnimBankAttacker + ldr r0, _081319E0 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -11509,7 +11509,7 @@ _08131990: b _08131A02 .align 2, 0 _081319DC: .4byte gTasks -_081319E0: .4byte gBattleAnimBankAttacker +_081319E0: .4byte gAnimBankAttacker _081319E4: .4byte gSprites _081319E8: ldr r3, _08131A3C @ =gSprites @@ -11559,7 +11559,7 @@ _08131A2E: _08131A3C: .4byte gSprites _08131A40: .4byte gTasks _08131A44: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _08131A74 @@ -11569,7 +11569,7 @@ _08131A44: ldr r3, [r0, 0xC] mov r9, r3 ldrh r5, [r0] - ldr r0, _08131A70 @ =gBattleAnimBankAttacker + ldr r0, _08131A70 @ =gAnimBankAttacker ldrb r0, [r0] bl sub_8079E90 lsls r0, 24 @@ -11578,9 +11578,9 @@ _08131A44: b _08131B92 .align 2, 0 _08131A6C: .4byte gSharedMem + 0x19348 -_08131A70: .4byte gBattleAnimBankAttacker +_08131A70: .4byte gAnimBankAttacker _08131A74: - ldr r4, _08131AD4 @ =gBattleAnimBankAttacker + ldr r4, _08131AD4 @ =gAnimBankAttacker ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -11625,7 +11625,7 @@ _08131A74: lsrs r5, r0, 16 b _08131AE6 .align 2, 0 -_08131AD4: .4byte gBattleAnimBankAttacker +_08131AD4: .4byte gAnimBankAttacker _08131AD8: .4byte gBattlePartyID _08131ADC: .4byte gPlayerParty _08131AE0: .4byte gSharedMem + 0x17800 @@ -11716,10 +11716,10 @@ _08131B72: _08131B92: ldr r6, _08131C08 @ =0x0000ffe0 _08131B94: - ldr r0, _08131C0C @ =gBattleAnimBankTarget + ldr r0, _08131C0C @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 lsls r3, r6, 16 @@ -11736,7 +11736,7 @@ _08131B94: bl sub_8079F44 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _08131C10 @ =gBattleAnimBankAttacker + ldr r0, _08131C10 @ =gAnimBankAttacker ldrb r0, [r0] lsls r0, 2 ldr r1, _08131C14 @ =gSharedMem + 0x17800 @@ -11772,8 +11772,8 @@ _08131BF2: .align 2, 0 _08131C04: .4byte gSprites _08131C08: .4byte 0x0000ffe0 -_08131C0C: .4byte gBattleAnimBankTarget -_08131C10: .4byte gBattleAnimBankAttacker +_08131C0C: .4byte gAnimBankTarget +_08131C10: .4byte gAnimBankAttacker _08131C14: .4byte gSharedMem + 0x17800 _08131C18: .4byte 0x00007fff _08131C1C: .4byte gTasks @@ -11793,7 +11793,7 @@ _08131C20: ldrh r2, [r6, 0xA] adds r0, r2 strh r0, [r6, 0xA] - ldr r0, _08131C70 @ =gBattleAnimBankAttacker + ldr r0, _08131C70 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -11816,7 +11816,7 @@ _08131C20: b _08131C8E .align 2, 0 _08131C6C: .4byte gTasks -_08131C70: .4byte gBattleAnimBankAttacker +_08131C70: .4byte gAnimBankAttacker _08131C74: .4byte gSprites _08131C78: ldr r2, _08131CDC @ =gSprites @@ -11850,7 +11850,7 @@ _08131C8E: ldrsh r0, [r6, r1] cmp r0, 0 bne _08131D0E - ldr r0, _08131CE4 @ =gBattleAnimBankAttacker + ldr r0, _08131CE4 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -11858,10 +11858,10 @@ _08131C8E: bne _08131CEC lsls r4, r5, 16 asrs r4, 16 - ldr r0, _08131CE8 @ =gBattleAnimBankTarget + ldr r0, _08131CE8 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -11870,15 +11870,15 @@ _08131C8E: .align 2, 0 _08131CDC: .4byte gSprites _08131CE0: .4byte gTasks -_08131CE4: .4byte gBattleAnimBankAttacker -_08131CE8: .4byte gBattleAnimBankTarget +_08131CE4: .4byte gAnimBankAttacker +_08131CE8: .4byte gAnimBankTarget _08131CEC: lsls r4, r5, 16 asrs r4, 16 - ldr r0, _08131D30 @ =gBattleAnimBankTarget + ldr r0, _08131D30 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -11910,7 +11910,7 @@ _08131D20: strh r0, [r1, 0xA] b _08131DB6 .align 2, 0 -_08131D30: .4byte gBattleAnimBankTarget +_08131D30: .4byte gAnimBankTarget _08131D34: .4byte gBattleAnimArgs _08131D38: .4byte 0x0000ffff _08131D3C: .4byte gTasks @@ -11934,7 +11934,7 @@ _08131D40: ldr r5, _08131D90 @ =gSprites adds r0, r5 bl sub_807A0F4 - ldr r0, _08131D94 @ =gBattleAnimBankAttacker + ldr r0, _08131D94 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -11953,7 +11953,7 @@ _08131D40: .align 2, 0 _08131D8C: .4byte gTasks _08131D90: .4byte gSprites -_08131D94: .4byte gBattleAnimBankAttacker +_08131D94: .4byte gAnimBankAttacker _08131D98: lsls r0, r7, 4 adds r0, r7 @@ -11995,7 +11995,7 @@ _08131DC4: ldrh r3, [r2, 0xA] adds r0, r3 strh r0, [r2, 0xA] - ldr r0, _08131E3C @ =gBattleAnimBankAttacker + ldr r0, _08131E3C @ =gAnimBankAttacker mov r10, r0 ldrb r0, [r0] str r2, [sp, 0x10] @@ -12024,7 +12024,7 @@ _08131DC4: mov r1, r10 ldrb r0, [r1] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r3, r5, 0 @@ -12035,7 +12035,7 @@ _08131DC4: b _08131E7C .align 2, 0 _08131E38: .4byte gTasks -_08131E3C: .4byte gBattleAnimBankAttacker +_08131E3C: .4byte gAnimBankAttacker _08131E40: .4byte gSprites _08131E44: ldr r1, _08131EB0 @ =gSprites @@ -12057,7 +12057,7 @@ _08131E44: mov r2, r10 ldrb r0, [r2] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r3, r5, 0 @@ -12117,16 +12117,16 @@ _08131ECA: cmp r1, r0 bne _08131F64 movs r0, 0x3F - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 movs r0, 0x7A bl PlaySE12WithPanning - ldr r0, _08131F54 @ =gBattleAnimBankTarget + ldr r0, _08131F54 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, 0x10 @@ -12143,14 +12143,14 @@ _08131ECA: negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r0, _08131F5C @ =gBattleAnimBankAttacker + ldr r0, _08131F5C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _08131FF4 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _08131FF4 @@ -12172,9 +12172,9 @@ _08131ECA: b _08131FF4 .align 2, 0 _08131F50: .4byte gBattleAnimArgs -_08131F54: .4byte gBattleAnimBankTarget +_08131F54: .4byte gAnimBankTarget _08131F58: .4byte 0x0000ffe0 -_08131F5C: .4byte gBattleAnimBankAttacker +_08131F5C: .4byte gAnimBankAttacker _08131F60: .4byte gSprites _08131F64: adds r0, r4, 0 @@ -12217,7 +12217,7 @@ _08131FA6: ldrh r1, [r4, 0x32] adds r0, r1 strh r0, [r4, 0x32] - ldr r0, _08131FD0 @ =gBattleAnimBankAttacker + ldr r0, _08131FD0 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -12232,7 +12232,7 @@ _08131FA6: adds r1, r2, 0 b _08131FE0 .align 2, 0 -_08131FD0: .4byte gBattleAnimBankAttacker +_08131FD0: .4byte gAnimBankAttacker _08131FD4: ldrh r1, [r4, 0x32] lsls r0, r1, 16 @@ -12249,7 +12249,7 @@ _08131FE0: cmp r0, 0x2 bne _08131FF4 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08131FF4: pop {r4} pop {r0} @@ -12289,17 +12289,17 @@ _0813202C: .4byte _08132104 .4byte _0813216A _08132040: - ldr r0, _08132084 @ =gBattleAnimBankAttacker + ldr r0, _08132084 @ =gAnimBankAttacker ldrb r0, [r0] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r0, _08132088 @ =gBattleAnimBankTarget + ldr r0, _08132088 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r2, r0, 0 @@ -12322,12 +12322,12 @@ _08132076: strh r0, [r1, 0x26] b _08132188 .align 2, 0 -_08132084: .4byte gBattleAnimBankAttacker -_08132088: .4byte gBattleAnimBankTarget +_08132084: .4byte gAnimBankAttacker +_08132088: .4byte gAnimBankTarget _0813208C: .4byte gTasks _08132090: ldr r1, _081320CC @ =gObjectBankIDs - ldr r0, _081320D0 @ =gBattleAnimBankAttacker + ldr r0, _081320D0 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] @@ -12358,7 +12358,7 @@ _08132090: b _0813215E .align 2, 0 _081320CC: .4byte gObjectBankIDs -_081320D0: .4byte gBattleAnimBankAttacker +_081320D0: .4byte gAnimBankAttacker _081320D4: .4byte gSprites _081320D8: movs r3, 0x20 @@ -12386,7 +12386,7 @@ _081320EC: b _08132188 _08132104: ldr r1, _08132144 @ =gObjectBankIDs - ldr r0, _08132148 @ =gBattleAnimBankAttacker + ldr r0, _08132148 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] @@ -12419,7 +12419,7 @@ _08132104: b _08132162 .align 2, 0 _08132144: .4byte gObjectBankIDs -_08132148: .4byte gBattleAnimBankAttacker +_08132148: .4byte gAnimBankAttacker _0813214C: .4byte gSprites _08132150: movs r3, 0x20 @@ -12439,7 +12439,7 @@ _08132162: b _08132188 _0813216A: ldr r1, _08132190 @ =gObjectBankIDs - ldr r0, _08132194 @ =gBattleAnimBankAttacker + ldr r0, _08132194 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] @@ -12458,7 +12458,7 @@ _08132188: bx r0 .align 2, 0 _08132190: .4byte gObjectBankIDs -_08132194: .4byte gBattleAnimBankAttacker +_08132194: .4byte gAnimBankAttacker _08132198: .4byte gSprites thumb_func_end sub_8131FFC @@ -12478,7 +12478,7 @@ sub_813219C: @ 813219C lsrs r0, 24 movs r5, 0 strh r0, [r4, 0xE] - ldr r0, _08132208 @ =gBattleAnimBankAttacker + ldr r0, _08132208 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -12517,7 +12517,7 @@ _081321D0: bx r0 .align 2, 0 _08132204: .4byte gTasks -_08132208: .4byte gBattleAnimBankAttacker +_08132208: .4byte gAnimBankAttacker _0813220C: .4byte gSprites _08132210: .4byte sub_8132214 thumb_func_end sub_813219C @@ -12661,7 +12661,7 @@ _08132312: sub_8132318: @ 8132318 push {r4,lr} adds r4, r0, 0 - ldr r0, _0813236C @ =gBattleAnimBankTarget + ldr r0, _0813236C @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -12689,7 +12689,7 @@ sub_8132318: @ 8132318 cmp r0, 0 beq _0813235E adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0813235E: ldrh r0, [r4, 0x32] adds r0, 0x1 @@ -12698,14 +12698,14 @@ _0813235E: pop {r0} bx r0 .align 2, 0 -_0813236C: .4byte gBattleAnimBankTarget +_0813236C: .4byte gAnimBankTarget thumb_func_end sub_8132318 thumb_func_start sub_8132370 sub_8132370: @ 8132370 push {r4,lr} adds r4, r0, 0 - ldr r0, _081323A8 @ =gBattleAnimBankTarget + ldr r0, _081323A8 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -12729,7 +12729,7 @@ sub_8132370: @ 8132370 bl StartSpriteAffineAnim b _081323CE .align 2, 0 -_081323A8: .4byte gBattleAnimBankTarget +_081323A8: .4byte gAnimBankTarget _081323AC: .4byte gBattleAnimArgs _081323B0: .4byte 0x0000fff5 _081323B4: @@ -12761,10 +12761,10 @@ _081323DC: .4byte sub_8132318 sub_81323E0: @ 81323E0 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _08132424 @ =gBattleAnimBankAttacker + ldr r4, _08132424 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] @@ -12792,7 +12792,7 @@ _0813240A: pop {r0} bx r0 .align 2, 0 -_08132424: .4byte gBattleAnimBankAttacker +_08132424: .4byte gAnimBankAttacker _08132428: .4byte sub_8132430 _0813242C: .4byte REG_BLDALPHA thumb_func_end sub_81323E0 diff --git a/asm/battle_anim_813F0F4.s b/asm/battle_anim_813F0F4.s index f09d42062..73f399caa 100644 --- a/asm/battle_anim_813F0F4.s +++ b/asm/battle_anim_813F0F4.s @@ -16,12 +16,12 @@ unref_sub_813F0F4: @ 813F0F4 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x10] - ldr r0, _0813F2AC @ =gBattleAnimBankAttacker + ldr r0, _0813F2AC @ =gAnimBankAttacker ldrb r3, [r0] - ldr r0, _0813F2B0 @ =gUnknown_030042C4 + ldr r0, _0813F2B0 @ =gBattle_WIN0H movs r1, 0 strh r1, [r0] - ldr r0, _0813F2B4 @ =gUnknown_03004240 + ldr r0, _0813F2B4 @ =gBattle_WIN0V strh r1, [r0] ldr r1, _0813F2B8 @ =REG_WININ ldr r2, _0813F2BC @ =0x00003f3f @@ -183,12 +183,12 @@ unref_sub_813F0F4: @ 813F0F4 lsls r1, 4 movs r2, 0x20 bl LoadCompressedPalette - ldr r1, _0813F2F0 @ =gUnknown_030042C0 + ldr r1, _0813F2F0 @ =gBattle_BG1_X ldrh r0, [r7, 0x20] negs r0, r0 adds r0, 0x20 strh r0, [r1] - ldr r1, _0813F2F4 @ =gUnknown_030041B4 + ldr r1, _0813F2F4 @ =gBattle_BG1_Y ldrh r0, [r7, 0x22] negs r0, r0 subs r0, 0x20 @@ -219,9 +219,9 @@ unref_sub_813F0F4: @ 813F0F4 pop {r0} bx r0 .align 2, 0 -_0813F2AC: .4byte gBattleAnimBankAttacker -_0813F2B0: .4byte gUnknown_030042C4 -_0813F2B4: .4byte gUnknown_03004240 +_0813F2AC: .4byte gAnimBankAttacker +_0813F2B0: .4byte gBattle_WIN0H +_0813F2B4: .4byte gBattle_WIN0V _0813F2B8: .4byte REG_WININ _0813F2BC: .4byte 0x00003f3f _0813F2C0: .4byte 0x00003f3d @@ -236,8 +236,8 @@ _0813F2E0: .4byte 0x85000400 _0813F2E4: .4byte gUnknown_08D2EE48 _0813F2E8: .4byte gUnknown_08D2EDFC _0813F2EC: .4byte gUnknown_08D2E150 -_0813F2F0: .4byte gUnknown_030042C0 -_0813F2F4: .4byte gUnknown_030041B4 +_0813F2F0: .4byte gBattle_BG1_X +_0813F2F4: .4byte gBattle_BG1_Y _0813F2F8: .4byte gTasks _0813F2FC: .4byte sub_813F300 thumb_func_end unref_sub_813F0F4 @@ -251,7 +251,7 @@ sub_813F300: @ 813F300 sub sp, 0x10 lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _0813F34C @ =gBattleAnimBankAttacker + ldr r0, _0813F34C @ =gAnimBankAttacker ldrb r0, [r0] mov r9, r0 ldr r1, _0813F350 @ =gTasks @@ -264,7 +264,7 @@ sub_813F300: @ 813F300 adds r1, r0 movs r3, 0 strh r1, [r4, 0x22] - ldr r2, _0813F354 @ =gUnknown_030041B4 + ldr r2, _0813F354 @ =gBattle_BG1_Y lsls r0, r1, 16 lsrs r0, 24 ldrh r5, [r2] @@ -283,9 +283,9 @@ sub_813F300: @ 813F300 beq _0813F35E b _0813F4B2 .align 2, 0 -_0813F34C: .4byte gBattleAnimBankAttacker +_0813F34C: .4byte gAnimBankAttacker _0813F350: .4byte gTasks -_0813F354: .4byte gUnknown_030041B4 +_0813F354: .4byte gBattle_BG1_Y _0813F358: cmp r0, 0x2 beq _0813F3AC @@ -357,9 +357,9 @@ _0813F3AC: bne _0813F4B2 movs r0, 0 bl sub_8076464 - ldr r0, _0813F4C4 @ =gUnknown_030042C4 + ldr r0, _0813F4C4 @ =gBattle_WIN0H strh r5, [r0] - ldr r0, _0813F4C8 @ =gUnknown_03004240 + ldr r0, _0813F4C8 @ =gBattle_WIN0V strh r5, [r0] ldr r0, _0813F4CC @ =REG_WININ ldr r2, _0813F4D0 @ =0x00003f3f @@ -367,7 +367,7 @@ _0813F3AC: strh r1, [r0] adds r0, 0x2 strh r1, [r0] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _0813F406 @@ -470,8 +470,8 @@ _0813F4B2: bx r0 .align 2, 0 _0813F4C0: .4byte REG_BLDALPHA -_0813F4C4: .4byte gUnknown_030042C4 -_0813F4C8: .4byte gUnknown_03004240 +_0813F4C4: .4byte gBattle_WIN0H +_0813F4C8: .4byte gBattle_WIN0V _0813F4CC: .4byte REG_WININ _0813F4D0: .4byte 0x00003f3f _0813F4D4: .4byte REG_BG1CNT @@ -494,7 +494,7 @@ sub_813F4EC: @ 813F4EC lsrs r0, 24 str r0, [sp] ldr r1, _0813F5D0 @ =gHealthboxIDs - ldr r0, _0813F5D4 @ =gBattleAnimBankAttacker + ldr r0, _0813F5D4 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -594,7 +594,7 @@ sub_813F4EC: @ 813F4EC bx r0 .align 2, 0 _0813F5D0: .4byte gHealthboxIDs -_0813F5D4: .4byte gBattleAnimBankAttacker +_0813F5D4: .4byte gAnimBankAttacker _0813F5D8: .4byte gSprites _0813F5DC: .4byte 0x0000d709 _0813F5E0: .4byte 0x0000d70a @@ -613,7 +613,7 @@ sub_813F5E8: @ 813F5E8 lsrs r0, 24 mov r8, r0 ldr r1, _0813F684 @ =gHealthboxIDs - ldr r0, _0813F688 @ =gBattleAnimBankAttacker + ldr r0, _0813F688 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -677,7 +677,7 @@ sub_813F5E8: @ 813F5E8 bx r0 .align 2, 0 _0813F684: .4byte gHealthboxIDs -_0813F688: .4byte gBattleAnimBankAttacker +_0813F688: .4byte gAnimBankAttacker _0813F68C: .4byte gSprites _0813F690: .4byte 0x0000d709 _0813F694: .4byte 0x0000d70a @@ -819,7 +819,7 @@ sub_813F798: @ 813F798 lsls r0, 24 lsrs r6, r0, 24 ldr r1, _0813F7C4 @ =gObjectBankIDs - ldr r0, _0813F7C8 @ =gBattleAnimBankAttacker + ldr r0, _0813F7C8 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r5, [r0] @@ -839,7 +839,7 @@ sub_813F798: @ 813F798 b _0813F838 .align 2, 0 _0813F7C4: .4byte gObjectBankIDs -_0813F7C8: .4byte gBattleAnimBankAttacker +_0813F7C8: .4byte gAnimBankAttacker _0813F7CC: .4byte gTasks _0813F7D0: cmp r0, 0x2 @@ -910,7 +910,7 @@ sub_813F844: @ 813F844 lsls r0, 24 lsrs r5, r0, 24 ldr r1, _0813F87C @ =gObjectBankIDs - ldr r4, _0813F880 @ =gBattleAnimBankAttacker + ldr r4, _0813F880 @ =gAnimBankAttacker ldrb r0, [r4] adds r1, r0, r1 ldrb r1, [r1] @@ -930,7 +930,7 @@ sub_813F844: @ 813F844 b _0813F89C .align 2, 0 _0813F87C: .4byte gObjectBankIDs -_0813F880: .4byte gBattleAnimBankAttacker +_0813F880: .4byte gAnimBankAttacker _0813F884: .4byte gBattlePartyID _0813F888: .4byte gPlayerParty _0813F88C: @@ -969,16 +969,16 @@ _0813F8CC: .4byte gBattlePartyID _0813F8D0: .4byte gEnemyParty _0813F8D4: .4byte gTasks _0813F8D8: - ldr r5, _0813F950 @ =gBattleAnimBankAttacker + ldr r5, _0813F950 @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 ldrb r0, [r5] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition adds r1, r0, 0 lsls r1, 24 ldr r2, _0813F954 @ =gSprites @@ -1024,7 +1024,7 @@ _0813F8D8: strh r0, [r6, 0x8] b _0813F982 .align 2, 0 -_0813F950: .4byte gBattleAnimBankAttacker +_0813F950: .4byte gAnimBankAttacker _0813F954: .4byte gSprites _0813F958: movs r1, 0x1C @@ -1234,18 +1234,18 @@ sub_813FA94: @ 813FA94 adds r6, r4, r1 movs r0, 0x22 strh r0, [r6, 0x2E] - ldr r2, _0813FB64 @ =gBattleAnimBankTarget + ldr r2, _0813FB64 @ =gAnimBankTarget mov r8, r2 ldrb r0, [r2] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x30] mov r1, r8 ldrb r0, [r1] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 subs r0, 0x10 @@ -1296,7 +1296,7 @@ sub_813FA94: @ 813FA94 _0813FB58: .4byte gLastUsedItem _0813FB5C: .4byte gBallSpriteTemplates _0813FB60: .4byte gSprites -_0813FB64: .4byte gBattleAnimBankTarget +_0813FB64: .4byte gAnimBankTarget _0813FB68: .4byte sub_813FD90 _0813FB6C: .4byte gSharedMem + 0x17840 _0813FB70: .4byte gObjectBankIDs @@ -1396,18 +1396,18 @@ _0813FBE0: adds r6, r4, r0 movs r0, 0x22 strh r0, [r6, 0x2E] - ldr r1, _0813FCA8 @ =gBattleAnimBankTarget + ldr r1, _0813FCA8 @ =gAnimBankTarget mov r8, r1 ldrb r0, [r1] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x30] mov r1, r8 ldrb r0, [r1] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 subs r0, 0x10 @@ -1448,7 +1448,7 @@ _0813FBE0: _0813FC9C: .4byte gLastUsedItem _0813FCA0: .4byte gBallSpriteTemplates _0813FCA4: .4byte gSprites -_0813FCA8: .4byte gBattleAnimBankTarget +_0813FCA8: .4byte gAnimBankTarget _0813FCAC: .4byte SpriteCallbackDummy _0813FCB0: .4byte gObjectBankIDs _0813FCB4: .4byte gTasks @@ -1651,7 +1651,7 @@ _0813FE10: movs r2, 0x1 movs r3, 0x1C bl sub_814086C - ldr r0, _0813FE6C @ =gBattleAnimBankTarget + ldr r0, _0813FE6C @ =gAnimBankTarget ldrb r1, [r0] movs r0, 0 movs r2, 0xE @@ -1665,7 +1665,7 @@ _0813FE5A: .align 2, 0 _0813FE64: .4byte sub_813FE70 _0813FE68: .4byte gLastUsedItem -_0813FE6C: .4byte gBattleAnimBankTarget +_0813FE6C: .4byte gAnimBankTarget thumb_func_end sub_813FDC0 thumb_func_start sub_813FE70 @@ -1689,7 +1689,7 @@ sub_813FE70: @ 813FE70 str r0, [r4, 0x1C] ldr r2, _0813FEBC @ =gSprites ldr r1, _0813FEC0 @ =gObjectBankIDs - ldr r0, _0813FEC4 @ =gBattleAnimBankTarget + ldr r0, _0813FEC4 @ =gAnimBankTarget ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -1708,7 +1708,7 @@ _0813FEB4: .4byte TaskDummy _0813FEB8: .4byte sub_813FEC8 _0813FEBC: .4byte gSprites _0813FEC0: .4byte gObjectBankIDs -_0813FEC4: .4byte gBattleAnimBankTarget +_0813FEC4: .4byte gAnimBankTarget thumb_func_end sub_813FE70 thumb_func_start sub_813FEC8 @@ -1716,7 +1716,7 @@ sub_813FEC8: @ 813FEC8 push {r4-r7,lr} adds r7, r0, 0 ldr r1, _0813FF0C @ =gObjectBankIDs - ldr r0, _0813FF10 @ =gBattleAnimBankTarget + ldr r0, _0813FF10 @ =gAnimBankTarget ldrb r0, [r0] adds r0, r1 ldrb r4, [r0] @@ -1749,7 +1749,7 @@ _0813FEFA: b _0813FFDC .align 2, 0 _0813FF0C: .4byte gObjectBankIDs -_0813FF10: .4byte gBattleAnimBankTarget +_0813FF10: .4byte gAnimBankTarget _0813FF14: .4byte gTasks _0813FF18: cmp r0, 0x2 @@ -2450,7 +2450,7 @@ _08140450: .4byte sub_8140454 sub_8140454: @ 8140454 push {r4-r7,lr} adds r6, r0, 0 - ldr r7, _08140484 @ =gBattleAnimBankTarget + ldr r7, _08140484 @ =gAnimBankTarget ldrh r0, [r6, 0x36] adds r0, 0x1 strh r0, [r6, 0x36] @@ -2464,13 +2464,13 @@ sub_8140454: @ 8140454 movs r1, 0 strb r1, [r0] movs r0, 0x1 - bl sub_8043EB4 + bl UpdateOamPriorityInAllHealthboxes bl m4aMPlayAllStop ldr r0, _0814048C @ =0x00000173 bl PlaySE b _081404CC .align 2, 0 -_08140484: .4byte gBattleAnimBankTarget +_08140484: .4byte gAnimBankTarget _08140488: .4byte gDoingBattleAnim _0814048C: .4byte 0x00000173 _08140490: @@ -2689,7 +2689,7 @@ sub_81405F4: @ 81405F4 movs r2, 0x1 movs r3, 0x1C bl sub_814086C - ldr r0, _081406B0 @ =gBattleAnimBankTarget + ldr r0, _081406B0 @ =gAnimBankTarget ldrb r1, [r0] movs r0, 0x1 movs r2, 0xE @@ -2698,7 +2698,7 @@ sub_81405F4: @ 81405F4 _08140646: ldr r6, _081406B4 @ =gSprites ldr r5, _081406B8 @ =gObjectBankIDs - ldr r4, _081406B0 @ =gBattleAnimBankTarget + ldr r4, _081406B0 @ =gAnimBankTarget ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -2746,7 +2746,7 @@ _08140646: .align 2, 0 _081406A8: .4byte sub_81406BC _081406AC: .4byte gLastUsedItem -_081406B0: .4byte gBattleAnimBankTarget +_081406B0: .4byte gAnimBankTarget _081406B4: .4byte gSprites _081406B8: .4byte gObjectBankIDs thumb_func_end sub_81405F4 @@ -2771,7 +2771,7 @@ sub_81406BC: @ 81406BC _081406DA: ldr r4, _08140708 @ =gSprites ldr r3, _0814070C @ =gObjectBankIDs - ldr r2, _08140710 @ =gBattleAnimBankTarget + ldr r2, _08140710 @ =gAnimBankTarget ldrb r0, [r2] adds r0, r3 ldrb r1, [r0] @@ -2793,7 +2793,7 @@ _081406DA: .align 2, 0 _08140708: .4byte gSprites _0814070C: .4byte gObjectBankIDs -_08140710: .4byte gBattleAnimBankTarget +_08140710: .4byte gAnimBankTarget _08140714: ldr r6, _0814079C @ =0xfffffee0 adds r0, r6, 0 @@ -2823,7 +2823,7 @@ _08140734: beq _08140796 ldr r4, _081407A0 @ =gSprites ldr r3, _081407A4 @ =gObjectBankIDs - ldr r2, _081407A8 @ =gBattleAnimBankTarget + ldr r2, _081407A8 @ =gAnimBankTarget ldrb r0, [r2] adds r0, r3 ldrb r1, [r0] @@ -2859,7 +2859,7 @@ _08140734: ldr r0, _081407B4 @ =gDoingBattleAnim strb r6, [r0] movs r0, 0x1 - bl sub_8043EB4 + bl UpdateOamPriorityInAllHealthboxes _08140796: pop {r4-r7} pop {r0} @@ -2868,7 +2868,7 @@ _08140796: _0814079C: .4byte 0xfffffee0 _081407A0: .4byte gSprites _081407A4: .4byte gObjectBankIDs -_081407A8: .4byte gBattleAnimBankTarget +_081407A8: .4byte gAnimBankTarget _081407AC: .4byte gSharedMem + 0x17840 _081407B0: .4byte sub_81405C8 _081407B4: .4byte gDoingBattleAnim @@ -2962,7 +2962,7 @@ _0814084A: movs r0, 0 strb r0, [r1] movs r0, 0x1 - bl sub_8043EB4 + bl UpdateOamPriorityInAllHealthboxes _0814085E: pop {r4} pop {r0} @@ -4582,7 +4582,7 @@ sub_814151C: @ 814151C movs r0, 0 mov r8, r0 ldr r0, _08141550 @ =gObjectBankIDs - ldr r3, _08141554 @ =gBattleAnimBankAttacker + ldr r3, _08141554 @ =gAnimBankAttacker ldrb r2, [r3] adds r0, r2, r0 ldrb r6, [r0] @@ -4602,7 +4602,7 @@ sub_814151C: @ 814151C b _081416B6 .align 2, 0 _08141550: .4byte gObjectBankIDs -_08141554: .4byte gBattleAnimBankAttacker +_08141554: .4byte gAnimBankAttacker _08141558: .4byte gTasks _0814155C: cmp r0, 0x2 @@ -4737,7 +4737,7 @@ _08141654: adds r0, r1 ldrb r1, [r0, 0x8] strh r1, [r0, 0x8] - ldr r0, _08141690 @ =gBattleAnimBankAttacker + ldr r0, _08141690 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -4758,7 +4758,7 @@ _08141654: .align 2, 0 _08141688: .4byte gSprites _0814168C: .4byte gTasks -_08141690: .4byte gBattleAnimBankAttacker +_08141690: .4byte gAnimBankAttacker _08141694: ldr r0, _081416C0 @ =gSprites adds r1, r4, r6 @@ -4815,7 +4815,7 @@ _081416EC: beq _0814177C b _081417B8 _081416F2: - ldr r0, _08141708 @ =gBattleAnimBankAttacker + ldr r0, _08141708 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -4826,7 +4826,7 @@ _081416F2: ldr r2, _08141710 @ =0x00003f42 b _08141718 .align 2, 0 -_08141708: .4byte gBattleAnimBankAttacker +_08141708: .4byte gAnimBankAttacker _0814170C: .4byte REG_BLDCNT _08141710: .4byte 0x00003f42 _08141714: @@ -4883,7 +4883,7 @@ _08141744: _08141778: .4byte REG_BLDALPHA _0814177C: ldr r1, _081417C0 @ =gObjectBankIDs - ldr r3, _081417C4 @ =gBattleAnimBankAttacker + ldr r3, _081417C4 @ =gAnimBankAttacker ldrb r0, [r3] adds r0, r1 ldrb r1, [r0] @@ -4917,7 +4917,7 @@ _081417B8: bx r0 .align 2, 0 _081417C0: .4byte gObjectBankIDs -_081417C4: .4byte gBattleAnimBankAttacker +_081417C4: .4byte gAnimBankAttacker _081417C8: .4byte gSprites _081417CC: .4byte 0x06010000 _081417D0: .4byte 0x040000d4 @@ -4930,7 +4930,7 @@ sub_81417D8: @ 81417D8 lsls r0, 24 lsrs r0, 24 ldr r3, _081417FC @ =gBattleAnimArgs - ldr r1, _08141800 @ =gBattleAnimBankAttacker + ldr r1, _08141800 @ =gAnimBankAttacker ldrb r1, [r1] lsls r1, 2 ldr r2, _08141804 @ =gSharedMem + 0x17800 @@ -4944,7 +4944,7 @@ sub_81417D8: @ 81417D8 bx r0 .align 2, 0 _081417FC: .4byte gBattleAnimArgs -_08141800: .4byte gBattleAnimBankAttacker +_08141800: .4byte gAnimBankAttacker _08141804: .4byte gSharedMem + 0x17800 thumb_func_end sub_81417D8 @@ -4953,7 +4953,7 @@ sub_8141808: @ 8141808 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08141820 @ =gBattleAnimBankTarget + ldr r2, _08141820 @ =gAnimBankTarget ldr r1, _08141824 @ =gEffectBank ldrb r1, [r1] strb r1, [r2] @@ -4961,7 +4961,7 @@ sub_8141808: @ 8141808 pop {r0} bx r0 .align 2, 0 -_08141820: .4byte gBattleAnimBankTarget +_08141820: .4byte gAnimBankTarget _08141824: .4byte gEffectBank thumb_func_end sub_8141808 @@ -5124,12 +5124,12 @@ _08141966: ldrb r0, [r4, 0x8] mov r8, r0 movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r5, r0, 24 mov r0, r8 movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r2, r0, 24 movs r1, 0x1E @@ -5487,7 +5487,7 @@ sub_8141C30: @ 8141C30 lsls r0, 24 lsrs r0, 24 movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 ldr r5, _08141CA4 @ =gBattleAnimArgs lsrs r0, 24 @@ -5499,7 +5499,7 @@ sub_8141C30: @ 8141C30 lsls r0, 24 lsrs r0, 24 movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r5, [r5, 0x6] @@ -5510,7 +5510,7 @@ sub_8141C30: @ 8141C30 adds r0, r4, 0 bl sub_80786EC ldr r1, _08141CAC @ =gObjectBankIDs - ldr r0, _08141CB0 @ =gBattleAnimBankAttacker + ldr r0, _08141CB0 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -5530,7 +5530,7 @@ sub_8141C30: @ 8141C30 _08141CA4: .4byte gBattleAnimArgs _08141CA8: .4byte 0x0000ffe0 _08141CAC: .4byte gObjectBankIDs -_08141CB0: .4byte gBattleAnimBankAttacker +_08141CB0: .4byte gAnimBankAttacker _08141CB4: .4byte gSprites _08141CB8: .4byte sub_8141CBC thumb_func_end sub_8141C30 @@ -5541,7 +5541,7 @@ sub_8141CBC: @ 8141CBC adds r3, r0, 0 ldr r2, _08141CE4 @ =gSprites ldr r1, _08141CE8 @ =gObjectBankIDs - ldr r0, _08141CEC @ =gBattleAnimBankAttacker + ldr r0, _08141CEC @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -5561,7 +5561,7 @@ _08141CE0: .align 2, 0 _08141CE4: .4byte gSprites _08141CE8: .4byte gObjectBankIDs -_08141CEC: .4byte gBattleAnimBankAttacker +_08141CEC: .4byte gAnimBankAttacker _08141CF0: .4byte sub_8141CF4 thumb_func_end sub_8141CBC @@ -5597,7 +5597,7 @@ sub_8141D20: @ 8141D20 adds r4, r0, 0 ldr r5, _08141D70 @ =gSprites ldr r3, _08141D74 @ =gObjectBankIDs - ldr r2, _08141D78 @ =gBattleAnimBankAttacker + ldr r2, _08141D78 @ =gAnimBankAttacker ldrb r0, [r2] adds r0, r3 ldrb r1, [r0] @@ -5626,7 +5626,7 @@ sub_8141D20: @ 8141D20 movs r1, 0 bl StartSpriteAnim adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08141D68: pop {r4,r5} pop {r0} @@ -5634,7 +5634,7 @@ _08141D68: .align 2, 0 _08141D70: .4byte gSprites _08141D74: .4byte gObjectBankIDs -_08141D78: .4byte gBattleAnimBankAttacker +_08141D78: .4byte gAnimBankAttacker thumb_func_end sub_8141D20 thumb_func_start sub_8141D7C @@ -5645,11 +5645,11 @@ sub_8141D7C: @ 8141D7C lsrs r4, 24 movs r0, 0 bl GetBankByPlayerAI - ldr r1, _08141DA4 @ =gBattleAnimBankAttacker + ldr r1, _08141DA4 @ =gAnimBankAttacker strb r0, [r1] movs r0, 0x1 bl GetBankByPlayerAI - ldr r1, _08141DA8 @ =gBattleAnimBankTarget + ldr r1, _08141DA8 @ =gAnimBankTarget strb r0, [r1] adds r0, r4, 0 bl DestroyAnimVisualTask @@ -5657,8 +5657,8 @@ sub_8141D7C: @ 8141D7C pop {r0} bx r0 .align 2, 0 -_08141DA4: .4byte gBattleAnimBankAttacker -_08141DA8: .4byte gBattleAnimBankTarget +_08141DA4: .4byte gAnimBankAttacker +_08141DA8: .4byte gAnimBankTarget thumb_func_end sub_8141D7C thumb_func_start sub_8141DAC @@ -5720,20 +5720,20 @@ sub_8141E10: @ 8141E10 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08141E2C @ =gBattleAnimBankAttacker + ldr r2, _08141E2C @ =gAnimBankAttacker ldr r1, _08141E30 @ =gSharedMem + 0x17840 ldrh r1, [r1] strb r1, [r2] - ldr r2, _08141E34 @ =gBattleAnimBankTarget + ldr r2, _08141E34 @ =gAnimBankTarget lsrs r1, 8 strb r1, [r2] bl DestroyAnimVisualTask pop {r0} bx r0 .align 2, 0 -_08141E2C: .4byte gBattleAnimBankAttacker +_08141E2C: .4byte gAnimBankAttacker _08141E30: .4byte gSharedMem + 0x17840 -_08141E34: .4byte gBattleAnimBankTarget +_08141E34: .4byte gAnimBankTarget thumb_func_end sub_8141E10 .align 2, 0 @ Don't pad with nop. diff --git a/asm/battle_intro.s b/asm/battle_intro.s index 721583c30..10b504a79 100755 --- a/asm/battle_intro.s +++ b/asm/battle_intro.s @@ -76,14 +76,14 @@ sub_80E443C: @ 80E443C lsls r0, 24 lsrs r0, 24 bl DestroyTask - ldr r0, _080E4474 @ =gUnknown_030042C0 + ldr r0, _080E4474 @ =gBattle_BG1_X movs r1, 0 strh r1, [r0] - ldr r0, _080E4478 @ =gUnknown_030041B4 + ldr r0, _080E4478 @ =gBattle_BG1_Y strh r1, [r0] - ldr r0, _080E447C @ =gUnknown_03004288 + ldr r0, _080E447C @ =gBattle_BG2_X strh r1, [r0] - ldr r0, _080E4480 @ =gUnknown_03004280 + ldr r0, _080E4480 @ =gBattle_BG2_Y strh r1, [r0] ldr r0, _080E4484 @ =REG_BLDCNT strh r1, [r0] @@ -100,10 +100,10 @@ sub_80E443C: @ 80E443C pop {r0} bx r0 .align 2, 0 -_080E4474: .4byte gUnknown_030042C0 -_080E4478: .4byte gUnknown_030041B4 -_080E447C: .4byte gUnknown_03004288 -_080E4480: .4byte gUnknown_03004280 +_080E4474: .4byte gBattle_BG1_X +_080E4478: .4byte gBattle_BG1_Y +_080E447C: .4byte gBattle_BG2_X +_080E4480: .4byte gBattle_BG2_Y _080E4484: .4byte REG_BLDCNT _080E4488: .4byte 0x00003f3f thumb_func_end sub_80E443C @@ -117,7 +117,7 @@ task_battle_intro_80BC47C: @ 80E448C sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080E44C4 @ =gUnknown_030042C0 + ldr r1, _080E44C4 @ =gBattle_BG1_X ldrh r0, [r1] adds r0, 0x6 strh r0, [r1] @@ -139,7 +139,7 @@ _080E44B8: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E44C4: .4byte gUnknown_030042C0 +_080E44C4: .4byte gBattle_BG1_X _080E44C8: .4byte gTasks _080E44CC: .4byte _080E44D0 .align 2, 0 @@ -200,7 +200,7 @@ _080E452C: .align 2, 0 _080E453C: .4byte REG_WININ _080E4540: - ldr r1, _080E457C @ =gUnknown_03004240 + ldr r1, _080E457C @ =gBattle_WIN0V ldrh r0, [r1] subs r0, 0xFF strh r0, [r1] @@ -231,7 +231,7 @@ _080E4558: strh r0, [r2] b _080E46BE .align 2, 0 -_080E457C: .4byte gUnknown_03004240 +_080E457C: .4byte gBattle_WIN0V _080E4580: .4byte gUnknown_02024DE8 _080E4584: .4byte 0x0000fffe _080E4588: @@ -254,7 +254,7 @@ _080E45A4: ldrsh r0, [r2, r1] cmp r0, 0x1 bne _080E45C4 - ldr r2, _080E45BC @ =gUnknown_030041B4 + ldr r2, _080E45BC @ =gBattle_BG1_Y ldrh r1, [r2] ldr r0, _080E45C0 @ =0x0000ffb0 cmp r1, r0 @@ -262,10 +262,10 @@ _080E45A4: subs r0, r1, 0x2 b _080E45D0 .align 2, 0 -_080E45BC: .4byte gUnknown_030041B4 +_080E45BC: .4byte gBattle_BG1_Y _080E45C0: .4byte 0x0000ffb0 _080E45C4: - ldr r2, _080E4690 @ =gUnknown_030041B4 + ldr r2, _080E4690 @ =gBattle_BG1_Y ldrh r1, [r2] ldr r0, _080E4694 @ =0x0000ffc8 cmp r1, r0 @@ -274,7 +274,7 @@ _080E45C4: _080E45D0: strh r0, [r2] _080E45D2: - ldr r2, _080E4698 @ =gUnknown_03004240 + ldr r2, _080E4698 @ =gBattle_WIN0V ldrh r1, [r2] movs r0, 0xFF lsls r0, 8 @@ -373,9 +373,9 @@ _080E464E: strh r0, [r1] b _080E46BE .align 2, 0 -_080E4690: .4byte gUnknown_030041B4 +_080E4690: .4byte gBattle_BG1_Y _080E4694: .4byte 0x0000ffc8 -_080E4698: .4byte gUnknown_03004240 +_080E4698: .4byte gBattle_WIN0V _080E469C: .4byte 0xfffffc04 _080E46A0: .4byte gUnknown_03004DC0 _080E46A4: .4byte gUnknown_03004DE0 @@ -425,14 +425,14 @@ _080E46FC: cmp r0, 0x4 bne _080E4714 _080E4700: - ldr r1, _080E4708 @ =gUnknown_030042C0 + ldr r1, _080E4708 @ =gBattle_BG1_X ldrh r0, [r1] adds r0, 0x8 b _080E4712 .align 2, 0 -_080E4708: .4byte gUnknown_030042C0 +_080E4708: .4byte gBattle_BG1_X _080E470C: - ldr r1, _080E4750 @ =gUnknown_030042C0 + ldr r1, _080E4750 @ =gBattle_BG1_X ldrh r0, [r1] adds r0, 0x6 _080E4712: @@ -447,7 +447,7 @@ _080E4714: adds r6, r0, 0 cmp r1, 0x4 bne _080E4778 - ldr r7, _080E4754 @ =gUnknown_030041B4 + ldr r7, _080E4754 @ =gBattle_BG1_Y ldrh r0, [r4, 0x14] bl Cos2 lsls r0, 16 @@ -468,8 +468,8 @@ _080E473A: adds r0, r1, 0x4 b _080E475E .align 2, 0 -_080E4750: .4byte gUnknown_030042C0 -_080E4754: .4byte gUnknown_030041B4 +_080E4750: .4byte gBattle_BG1_X +_080E4754: .4byte gBattle_BG1_Y _080E4758: .4byte 0x000001ff _080E475C: adds r0, r1, 0x6 @@ -562,7 +562,7 @@ _080E47F6: _080E4804: .4byte gTasks _080E4808: .4byte REG_WININ _080E480C: - ldr r1, _080E484C @ =gUnknown_03004240 + ldr r1, _080E484C @ =gBattle_WIN0V ldrh r0, [r1] subs r0, 0xFF strh r0, [r1] @@ -595,7 +595,7 @@ _080E4824: strh r0, [r2] b _080E4996 .align 2, 0 -_080E484C: .4byte gUnknown_03004240 +_080E484C: .4byte gBattle_WIN0V _080E4850: .4byte gTasks _080E4854: .4byte gUnknown_02024DE8 _080E4858: .4byte 0x0000fffe @@ -646,7 +646,7 @@ _080E4898: movs r0, 0x4 strh r0, [r1, 0x12] _080E48B8: - ldr r3, _080E4970 @ =gUnknown_03004240 + ldr r3, _080E4970 @ =gBattle_WIN0V ldrh r1, [r3] movs r0, 0xFF lsls r0, 8 @@ -743,7 +743,7 @@ _080E4932: strh r0, [r1] b _080E4996 .align 2, 0 -_080E4970: .4byte gUnknown_03004240 +_080E4970: .4byte gBattle_WIN0V _080E4974: .4byte 0xfffffc04 _080E4978: .4byte gUnknown_03004DC0 _080E497C: .4byte gUnknown_03004DE0 @@ -786,7 +786,7 @@ task_battle_intro_anim: @ 80E49C0 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080E49F4 @ =gUnknown_030042C0 + ldr r1, _080E49F4 @ =gBattle_BG1_X ldrh r0, [r1] adds r0, 0x8 strh r0, [r1] @@ -808,7 +808,7 @@ _080E49EA: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E49F4: .4byte gUnknown_030042C0 +_080E49F4: .4byte gBattle_BG1_X _080E49F8: .4byte gTasks _080E49FC: .4byte _080E4A00 .align 2, 0 @@ -884,7 +884,7 @@ _080E4A84: _080E4A94: .4byte gTasks _080E4A98: .4byte REG_WININ _080E4A9C: - ldr r1, _080E4ADC @ =gUnknown_03004240 + ldr r1, _080E4ADC @ =gBattle_WIN0V ldrh r0, [r1] subs r0, 0xFF strh r0, [r1] @@ -918,7 +918,7 @@ _080E4AB4: strh r0, [r2] b _080E4C06 .align 2, 0 -_080E4ADC: .4byte gUnknown_03004240 +_080E4ADC: .4byte gBattle_WIN0V _080E4AE0: .4byte gTasks _080E4AE4: .4byte gUnknown_02024DE8 _080E4AE8: .4byte 0x0000fffe @@ -954,7 +954,7 @@ _080E4B06: movs r0, 0x6 strh r0, [r2, 0x12] _080E4B26: - ldr r2, _080E4BE0 @ =gUnknown_03004240 + ldr r2, _080E4BE0 @ =gBattle_WIN0V ldrh r1, [r2] movs r0, 0xFF lsls r0, 8 @@ -1051,7 +1051,7 @@ _080E4B9E: strh r0, [r1] b _080E4C06 .align 2, 0 -_080E4BE0: .4byte gUnknown_03004240 +_080E4BE0: .4byte gBattle_WIN0V _080E4BE4: .4byte 0xfffffc04 _080E4BE8: .4byte gUnknown_03004DC0 _080E4BEC: .4byte gUnknown_03004DE0 @@ -1109,7 +1109,7 @@ sub_80E4C34: @ 80E4C34 ldrsh r0, [r7, r2] cmp r0, 0 bne _080E4CAA - ldr r2, _080E4C84 @ =gUnknown_030042C0 + ldr r2, _080E4C84 @ =gBattle_BG1_X ldrh r1, [r2] movs r0, 0x80 lsls r0, 8 @@ -1123,15 +1123,15 @@ sub_80E4C34: @ 80E4C34 _080E4C72: adds r0, r1, 0x3 strh r0, [r2] - ldr r1, _080E4C88 @ =gUnknown_03004288 + ldr r1, _080E4C88 @ =gBattle_BG2_X ldrh r0, [r1] subs r0, 0x3 strh r0, [r1] b _080E4CAA .align 2, 0 _080E4C80: .4byte gTasks -_080E4C84: .4byte gUnknown_030042C0 -_080E4C88: .4byte gUnknown_03004288 +_080E4C84: .4byte gBattle_BG1_X +_080E4C88: .4byte gBattle_BG2_X _080E4C8C: str r5, [sp] ldr r1, _080E4CCC @ =0x0600e000 @@ -1265,7 +1265,7 @@ _080E4D9C: .4byte 0x0001608b _080E4DA0: .4byte REG_WININ _080E4DA4: .4byte 0x00003f06 _080E4DA8: - ldr r1, _080E4DE0 @ =gUnknown_03004240 + ldr r1, _080E4DE0 @ =gBattle_WIN0V ldrh r0, [r1] subs r0, 0xFF strh r0, [r1] @@ -1295,11 +1295,11 @@ _080E4DC0: strh r0, [r2] b _080E4EBA .align 2, 0 -_080E4DE0: .4byte gUnknown_03004240 +_080E4DE0: .4byte gBattle_WIN0V _080E4DE4: .4byte gUnknown_02024DE8 _080E4DE8: .4byte 0x0000fffe _080E4DEC: - ldr r2, _080E4E9C @ =gUnknown_03004240 + ldr r2, _080E4E9C @ =gBattle_WIN0V ldrh r1, [r2] movs r0, 0xFF lsls r0, 8 @@ -1393,7 +1393,7 @@ _080E4E94: strh r0, [r1] b _080E4EBA .align 2, 0 -_080E4E9C: .4byte gUnknown_03004240 +_080E4E9C: .4byte gBattle_WIN0V _080E4EA0: .4byte 0xfffffc04 _080E4EA4: .4byte gUnknown_03004DC0 _080E4EA8: .4byte gUnknown_03004DE0 @@ -11,7 +11,7 @@ sub_80DC824: @ 80DC824 push {r4-r6,lr} adds r6, r0, 0 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DC850 @@ -29,7 +29,7 @@ sub_80DC824: @ 80DC824 .align 2, 0 _080DC84C: .4byte gBattleAnimArgs _080DC850: - ldr r0, _080DC8E4 @ =gBattleAnimBankTarget + ldr r0, _080DC8E4 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -52,7 +52,7 @@ _080DC850: negs r0, r0 strh r0, [r1] _080DC880: - ldr r5, _080DC8E4 @ =gBattleAnimBankTarget + ldr r5, _080DC8E4 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_8077EE4 @@ -74,7 +74,7 @@ _080DC880: strh r0, [r6, 0x2E] ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x4] @@ -82,7 +82,7 @@ _080DC880: strh r0, [r6, 0x32] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r4, [r4, 0x6] @@ -90,24 +90,24 @@ _080DC880: strh r0, [r6, 0x36] ldr r0, _080DC8EC @ =sub_8078B34 str r0, [r6, 0x1C] - ldr r1, _080DC8F0 @ =move_anim_8072740 + ldr r1, _080DC8F0 @ =DestroyAnimSprite adds r0, r6, 0 bl StoreSpriteCallbackInData pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080DC8E4: .4byte gBattleAnimBankTarget +_080DC8E4: .4byte gAnimBankTarget _080DC8E8: .4byte gBattleAnimArgs _080DC8EC: .4byte sub_8078B34 -_080DC8F0: .4byte move_anim_8072740 +_080DC8F0: .4byte DestroyAnimSprite thumb_func_end sub_80DC824 thumb_func_start sub_80DC8F4 sub_80DC8F4: @ 80DC8F4 push {r4-r6,lr} adds r6, r0, 0 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DC918 @@ -122,7 +122,7 @@ sub_80DC8F4: @ 80DC8F4 .align 2, 0 _080DC914: .4byte gBattleAnimArgs _080DC918: - ldr r0, _080DC990 @ =gBattleAnimBankTarget + ldr r0, _080DC990 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -136,7 +136,7 @@ _080DC918: negs r1, r1 strh r1, [r0] _080DC934: - ldr r5, _080DC990 @ =gBattleAnimBankTarget + ldr r5, _080DC990 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_8077EE4 @@ -158,36 +158,36 @@ _080DC934: strh r0, [r6, 0x2E] ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x32] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x36] ldr r0, _080DC998 @ =sub_8078B34 str r0, [r6, 0x1C] - ldr r1, _080DC99C @ =move_anim_8072740 + ldr r1, _080DC99C @ =DestroyAnimSprite adds r0, r6, 0 bl StoreSpriteCallbackInData pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080DC990: .4byte gBattleAnimBankTarget +_080DC990: .4byte gAnimBankTarget _080DC994: .4byte gBattleAnimArgs _080DC998: .4byte sub_8078B34 -_080DC99C: .4byte move_anim_8072740 +_080DC99C: .4byte DestroyAnimSprite thumb_func_end sub_80DC8F4 thumb_func_start sub_80DC9A0 sub_80DC9A0: @ 80DC9A0 push {r4,r5,lr} adds r5, r0, 0 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DC9BC @@ -213,25 +213,25 @@ _080DC9BC: ldrsh r0, [r1, r2] cmp r0, 0 bne _080DCA04 - ldr r4, _080DCA00 @ =gBattleAnimBankTarget + ldr r4, _080DCA00 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] b _080DCA16 .align 2, 0 _080DC9FC: .4byte gBattleAnimArgs -_080DCA00: .4byte gBattleAnimBankTarget +_080DCA00: .4byte gAnimBankTarget _080DCA04: - ldr r0, _080DCA2C @ =gBattleAnimBankTarget + ldr r0, _080DCA2C @ =gAnimBankTarget ldrb r0, [r0] adds r2, r5, 0 adds r2, 0x32 @@ -251,7 +251,7 @@ _080DCA16: pop {r0} bx r0 .align 2, 0 -_080DCA2C: .4byte gBattleAnimBankTarget +_080DCA2C: .4byte gAnimBankTarget _080DCA30: .4byte gBattleAnimArgs _080DCA34: .4byte sub_80DCA38 thumb_func_end sub_80DC9A0 @@ -265,7 +265,7 @@ sub_80DCA38: @ 80DCA38 cmp r0, 0 beq _080DCA4E adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _080DCA6A _080DCA4E: movs r1, 0x3A @@ -291,7 +291,7 @@ _080DCA6A: sub_80DCA70: @ 80DCA70 push {r4,lr} adds r4, r0, 0 - ldr r0, _080DCAA0 @ =gBattleAnimBankTarget + ldr r0, _080DCAA0 @ =gAnimBankTarget ldrb r0, [r0] adds r2, r4, 0 adds r2, 0x20 @@ -299,7 +299,7 @@ sub_80DCA70: @ 80DCA70 adds r3, 0x22 movs r1, 0 bl sub_807A3FC - ldr r0, _080DCAA4 @ =gBattleAnimBankAttacker + ldr r0, _080DCAA4 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -312,8 +312,8 @@ sub_80DCA70: @ 80DCA70 strh r1, [r4, 0x20] b _080DCAB8 .align 2, 0 -_080DCAA0: .4byte gBattleAnimBankTarget -_080DCAA4: .4byte gBattleAnimBankAttacker +_080DCAA0: .4byte gAnimBankTarget +_080DCAA4: .4byte gAnimBankAttacker _080DCAA8: .4byte gBattleAnimArgs _080DCAAC: ldr r1, _080DCAE0 @ =gBattleAnimArgs @@ -327,7 +327,7 @@ _080DCAB8: ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - ldr r0, _080DCAE4 @ =gBattleAnimBankTarget + ldr r0, _080DCAE4 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -344,7 +344,7 @@ _080DCAD4: bx r0 .align 2, 0 _080DCAE0: .4byte gBattleAnimArgs -_080DCAE4: .4byte gBattleAnimBankTarget +_080DCAE4: .4byte gAnimBankTarget _080DCAE8: .4byte sub_80DCAEC thumb_func_end sub_80DCA70 @@ -385,7 +385,7 @@ _080DCB20: cmp r0, 0x33 bne _080DCB34 adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DCB34: pop {r0} bx r0 @@ -468,7 +468,7 @@ sub_80DCBB4: @ 80DCBB4 strh r2, [r1] adds r1, 0x2 strh r2, [r1] - bl move_anim_8072740 + bl DestroyAnimSprite pop {r0} bx r0 .align 2, 0 @@ -480,7 +480,7 @@ sub_80DCBCC: @ 80DCBCC push {r4-r7,lr} sub sp, 0x4 adds r7, r0, 0 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DCBEC @@ -492,7 +492,7 @@ sub_80DCBCC: @ 80DCBCC .align 2, 0 _080DCBE8: .4byte gBattleAnimArgs _080DCBEC: - ldr r0, _080DCCE8 @ =gBattleAnimBankAttacker + ldr r0, _080DCCE8 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -509,15 +509,15 @@ _080DCBEC: negs r0, r0 strh r0, [r1, 0x6] _080DCC0E: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080DCC5E - ldr r0, _080DCCE8 @ =gBattleAnimBankAttacker + ldr r0, _080DCCE8 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide adds r4, r0, 0 - ldr r5, _080DCCF0 @ =gBattleAnimBankTarget + ldr r5, _080DCCF0 @ =gAnimBankTarget ldrb r0, [r5] bl GetBankSide lsls r4, 24 @@ -549,10 +549,10 @@ _080DCC5E: adds r0, r7, 0 movs r1, 0x1 bl sub_80787B0 - ldr r5, _080DCCF0 @ =gBattleAnimBankTarget + ldr r5, _080DCCF0 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 lsls r4, 24 ldr r6, _080DCCEC @ =gBattleAnimArgs @@ -563,7 +563,7 @@ _080DCC5E: lsrs r4, 16 ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -601,7 +601,7 @@ _080DCC5E: strh r5, [r7, 0x36] ldr r0, _080DCCF4 @ =sub_8078B34 str r0, [r7, 0x1C] - ldr r1, _080DCCF8 @ =move_anim_8072740 + ldr r1, _080DCCF8 @ =DestroyAnimSprite adds r0, r7, 0 bl StoreSpriteCallbackInData add sp, 0x4 @@ -609,11 +609,11 @@ _080DCC5E: pop {r0} bx r0 .align 2, 0 -_080DCCE8: .4byte gBattleAnimBankAttacker +_080DCCE8: .4byte gAnimBankAttacker _080DCCEC: .4byte gBattleAnimArgs -_080DCCF0: .4byte gBattleAnimBankTarget +_080DCCF0: .4byte gAnimBankTarget _080DCCF4: .4byte sub_8078B34 -_080DCCF8: .4byte move_anim_8072740 +_080DCCF8: .4byte DestroyAnimSprite thumb_func_end sub_80DCBCC thumb_func_start sub_80DCCFC @@ -622,7 +622,7 @@ sub_80DCCFC: @ 80DCCFC adds r6, r0, 0 movs r1, 0x1 bl sub_80787B0 - ldr r0, _080DCD68 @ =gBattleAnimBankAttacker + ldr r0, _080DCD68 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -636,10 +636,10 @@ _080DCD1C: ldr r4, _080DCD6C @ =gBattleAnimArgs ldrh r0, [r4, 0x8] strh r0, [r6, 0x2E] - ldr r5, _080DCD70 @ =gBattleAnimBankTarget + ldr r5, _080DCD70 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x4] @@ -647,7 +647,7 @@ _080DCD1C: strh r0, [r6, 0x32] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x6] @@ -669,9 +669,9 @@ _080DCD1C: pop {r0} bx r0 .align 2, 0 -_080DCD68: .4byte gBattleAnimBankAttacker +_080DCD68: .4byte gAnimBankAttacker _080DCD6C: .4byte gBattleAnimArgs -_080DCD70: .4byte gBattleAnimBankTarget +_080DCD70: .4byte gAnimBankTarget _080DCD74: .4byte sub_80DCD78 thumb_func_end sub_80DCCFC @@ -695,7 +695,7 @@ sub_80DCD78: @ 80DCD78 cmp r0, 0 beq _080DCDA4 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _080DCE34 _080DCDA4: movs r0, 0x2E @@ -787,23 +787,23 @@ sub_80DCE40: @ 80DCE40 ldrsh r0, [r0, r1] cmp r0, 0 bne _080DCE5C - ldr r4, _080DCE58 @ =gBattleAnimBankAttacker + ldr r4, _080DCE58 @ =gAnimBankAttacker b _080DCE5E .align 2, 0 _080DCE54: .4byte gBattleAnimArgs -_080DCE58: .4byte gBattleAnimBankAttacker +_080DCE58: .4byte gAnimBankAttacker _080DCE5C: - ldr r4, _080DCE90 @ =gBattleAnimBankTarget + ldr r4, _080DCE90 @ =gAnimBankTarget _080DCE5E: ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, 0x12 @@ -817,7 +817,7 @@ _080DCE5E: pop {r0} bx r0 .align 2, 0 -_080DCE90: .4byte gBattleAnimBankTarget +_080DCE90: .4byte gAnimBankTarget _080DCE94: .4byte move_anim_8074EE0 _080DCE98: .4byte sub_80785E4 thumb_func_end sub_80DCE40 diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index 594d569ad..26ed8e3fe 100644 --- a/asm/contest_link_80C2020.s +++ b/asm/contest_link_80C2020.s @@ -86,25 +86,25 @@ sub_80C2020: @ 80C2020 strh r2, [r0] ldr r0, _080C2118 @ =gUnknown_030042A0 strh r2, [r0] - ldr r0, _080C211C @ =gUnknown_030042C0 + ldr r0, _080C211C @ =gBattle_BG1_X strh r2, [r0] - ldr r0, _080C2120 @ =gUnknown_030041B4 + ldr r0, _080C2120 @ =gBattle_BG1_Y strh r2, [r0] - ldr r0, _080C2124 @ =gUnknown_03004288 + ldr r0, _080C2124 @ =gBattle_BG2_X strh r2, [r0] - ldr r0, _080C2128 @ =gUnknown_03004280 + ldr r0, _080C2128 @ =gBattle_BG2_Y strh r2, [r0] ldr r0, _080C212C @ =gUnknown_030041B0 strh r2, [r0] ldr r0, _080C2130 @ =gUnknown_030041B8 strh r2, [r0] - ldr r0, _080C2134 @ =gUnknown_030042C4 + ldr r0, _080C2134 @ =gBattle_WIN0H strh r2, [r0] - ldr r0, _080C2138 @ =gUnknown_03004240 + ldr r0, _080C2138 @ =gBattle_WIN0V strh r2, [r0] - ldr r0, _080C213C @ =gUnknown_03004200 + ldr r0, _080C213C @ =gBattle_WIN1H strh r2, [r0] - ldr r0, _080C2140 @ =gUnknown_03004244 + ldr r0, _080C2140 @ =gBattle_WIN1V strh r2, [r0] pop {r4,r5} pop {r0} @@ -121,16 +121,16 @@ _080C210C: .4byte 0x00003f3f _080C2110: .4byte REG_WIN0H _080C2114: .4byte gUnknown_030042A4 _080C2118: .4byte gUnknown_030042A0 -_080C211C: .4byte gUnknown_030042C0 -_080C2120: .4byte gUnknown_030041B4 -_080C2124: .4byte gUnknown_03004288 -_080C2128: .4byte gUnknown_03004280 +_080C211C: .4byte gBattle_BG1_X +_080C2120: .4byte gBattle_BG1_Y +_080C2124: .4byte gBattle_BG2_X +_080C2128: .4byte gBattle_BG2_Y _080C212C: .4byte gUnknown_030041B0 _080C2130: .4byte gUnknown_030041B8 -_080C2134: .4byte gUnknown_030042C4 -_080C2138: .4byte gUnknown_03004240 -_080C213C: .4byte gUnknown_03004200 -_080C2140: .4byte gUnknown_03004244 +_080C2134: .4byte gBattle_WIN0H +_080C2138: .4byte gBattle_WIN0V +_080C213C: .4byte gBattle_WIN1H +_080C2140: .4byte gBattle_WIN1V thumb_func_end sub_80C2020 thumb_func_start sub_80C2144 @@ -435,10 +435,10 @@ sub_80C2358: @ 80C2358 strb r0, [r4, 0x2] ldr r0, _080C2418 @ =sub_80C2430 bl SetMainCallback2 - ldr r1, _080C241C @ =gUnknown_03004200 + ldr r1, _080C241C @ =gBattle_WIN1H movs r0, 0xF0 strh r0, [r1] - ldr r1, _080C2420 @ =gUnknown_03004244 + ldr r1, _080C2420 @ =gBattle_WIN1V ldr r2, _080C2424 @ =0x000080a0 adds r0, r2, 0 strh r0, [r1] @@ -460,8 +460,8 @@ _080C240C: .4byte gPaletteFade _080C2410: .4byte gSharedMem + 0x18000 _080C2414: .4byte sub_80C24F4 _080C2418: .4byte sub_80C2430 -_080C241C: .4byte gUnknown_03004200 -_080C2420: .4byte gUnknown_03004244 +_080C241C: .4byte gBattle_WIN1H +_080C2420: .4byte gBattle_WIN1V _080C2424: .4byte 0x000080a0 _080C2428: .4byte sub_80C2F28 _080C242C: .4byte sub_80C2448 @@ -490,19 +490,19 @@ sub_80C2448: @ 80C2448 ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 - ldr r0, _080C24CC @ =gUnknown_030042C0 + ldr r0, _080C24CC @ =gBattle_BG1_X ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 - ldr r0, _080C24D0 @ =gUnknown_030041B4 + ldr r0, _080C24D0 @ =gBattle_BG1_Y ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 - ldr r0, _080C24D4 @ =gUnknown_03004288 + ldr r0, _080C24D4 @ =gBattle_BG2_X ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 - ldr r0, _080C24D8 @ =gUnknown_03004280 + ldr r0, _080C24D8 @ =gBattle_BG2_Y ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 @@ -514,19 +514,19 @@ sub_80C2448: @ 80C2448 ldrh r0, [r0] strh r0, [r1] adds r1, 0x22 - ldr r0, _080C24E4 @ =gUnknown_030042C4 + ldr r0, _080C24E4 @ =gBattle_WIN0H ldrh r0, [r0] strh r0, [r1] adds r1, 0x4 - ldr r0, _080C24E8 @ =gUnknown_03004240 + ldr r0, _080C24E8 @ =gBattle_WIN0V ldrh r0, [r0] strh r0, [r1] subs r1, 0x2 - ldr r0, _080C24EC @ =gUnknown_03004200 + ldr r0, _080C24EC @ =gBattle_WIN1H ldrh r0, [r0] strh r0, [r1] adds r1, 0x4 - ldr r0, _080C24F0 @ =gUnknown_03004244 + ldr r0, _080C24F0 @ =gBattle_WIN1V ldrh r0, [r0] strh r0, [r1] bl LoadOam @@ -539,16 +539,16 @@ sub_80C2448: @ 80C2448 _080C24C0: .4byte REG_BG0HOFS _080C24C4: .4byte gUnknown_030042A4 _080C24C8: .4byte gUnknown_030042A0 -_080C24CC: .4byte gUnknown_030042C0 -_080C24D0: .4byte gUnknown_030041B4 -_080C24D4: .4byte gUnknown_03004288 -_080C24D8: .4byte gUnknown_03004280 +_080C24CC: .4byte gBattle_BG1_X +_080C24D0: .4byte gBattle_BG1_Y +_080C24D4: .4byte gBattle_BG2_X +_080C24D8: .4byte gBattle_BG2_Y _080C24DC: .4byte gUnknown_030041B0 _080C24E0: .4byte gUnknown_030041B8 -_080C24E4: .4byte gUnknown_030042C4 -_080C24E8: .4byte gUnknown_03004240 -_080C24EC: .4byte gUnknown_03004200 -_080C24F0: .4byte gUnknown_03004244 +_080C24E4: .4byte gBattle_WIN0H +_080C24E8: .4byte gBattle_WIN0V +_080C24EC: .4byte gBattle_WIN1H +_080C24F0: .4byte gBattle_WIN1V thumb_func_end sub_80C2448 thumb_func_start sub_80C24F4 @@ -1302,10 +1302,10 @@ _080C2AC4: .4byte _080C2CA8 .4byte _080C2CE8 _080C2ADC: - ldr r1, _080C2BC4 @ =gUnknown_030042C4 + ldr r1, _080C2BC4 @ =gBattle_WIN0H movs r0, 0xF0 strh r0, [r1] - ldr r1, _080C2BC8 @ =gUnknown_03004240 + ldr r1, _080C2BC8 @ =gBattle_WIN0V ldr r3, _080C2BCC @ =0x00005050 adds r0, r3, 0 strh r0, [r1] @@ -1413,8 +1413,8 @@ _080C2B14: strh r0, [r1, 0x8] b _080C2D04 .align 2, 0 -_080C2BC4: .4byte gUnknown_030042C4 -_080C2BC8: .4byte gUnknown_03004240 +_080C2BC4: .4byte gBattle_WIN0H +_080C2BC8: .4byte gBattle_WIN0V _080C2BCC: .4byte 0x00005050 _080C2BD0: .4byte gContestFinalStandings _080C2BD4: .4byte gContestMons @@ -1454,7 +1454,7 @@ _080C2C04: strh r0, [r4, 0xC] _080C2C30: ldrb r2, [r4, 0xC] - ldr r3, _080C2C50 @ =gUnknown_03004240 + ldr r3, _080C2C50 @ =gBattle_WIN0V movs r0, 0x50 subs r0, r2 lsls r0, 8 @@ -1469,7 +1469,7 @@ _080C2C30: strh r0, [r4, 0x8] b _080C2D04 .align 2, 0 -_080C2C50: .4byte gUnknown_03004240 +_080C2C50: .4byte gBattle_WIN0V _080C2C54: ldr r0, _080C2C60 @ =gSharedMem + 0x18000 ldrb r0, [r0, 0x6] @@ -1515,7 +1515,7 @@ _080C2CA8: ldrb r0, [r0, 0x6] cmp r0, 0x2 bne _080C2D04 - ldr r3, _080C2CE4 @ =gUnknown_03004240 + ldr r3, _080C2CE4 @ =gBattle_WIN0V ldrh r0, [r3] lsrs r2, r0, 8 adds r0, r2, 0x2 @@ -1543,7 +1543,7 @@ _080C2CD0: b _080C2D04 .align 2, 0 _080C2CE0: .4byte gSharedMem + 0x18000 -_080C2CE4: .4byte gUnknown_03004240 +_080C2CE4: .4byte gBattle_WIN0V _080C2CE8: ldr r2, _080C2D14 @ =gSharedMem + 0x18000 ldrb r0, [r2, 0x6] @@ -2857,10 +2857,10 @@ _080C36DA: adds r5, 0x1 cmp r5, 0x2 ble _080C36DA - ldr r1, _080C3754 @ =gUnknown_030042C4 + ldr r1, _080C3754 @ =gBattle_WIN0H movs r0, 0xF0 strh r0, [r1] - ldr r2, _080C3758 @ =gUnknown_03004240 + ldr r2, _080C3758 @ =gBattle_WIN0V ldrh r1, [r4, 0x22] adds r0, r1, 0 subs r0, 0x10 @@ -2878,8 +2878,8 @@ _080C36DA: .align 2, 0 _080C374C: .4byte gSharedMem + 0x18000 _080C3750: .4byte gSprites -_080C3754: .4byte gUnknown_030042C4 -_080C3758: .4byte gUnknown_03004240 +_080C3754: .4byte gBattle_WIN0H +_080C3758: .4byte gBattle_WIN0V _080C375C: .4byte REG_WININ _080C3760: .4byte 0x00003f3e thumb_func_end sub_80C3698 @@ -2902,8 +2902,8 @@ sub_80C3764: @ 80C3764 orrs r0, r1 mov r1, r12 strb r0, [r1] - ldr r7, _080C37D0 @ =gUnknown_030042C4 - ldr r6, _080C37D4 @ =gUnknown_03004240 + ldr r7, _080C37D0 @ =gBattle_WIN0H + ldr r6, _080C37D4 @ =gBattle_WIN0V adds r5, r3, 0 movs r4, 0x4 adds r2, 0x2E @@ -2940,8 +2940,8 @@ _080C3790: .align 2, 0 _080C37C8: .4byte gSharedMem + 0x18000 _080C37CC: .4byte gSprites -_080C37D0: .4byte gUnknown_030042C4 -_080C37D4: .4byte gUnknown_03004240 +_080C37D0: .4byte gBattle_WIN0H +_080C37D4: .4byte gBattle_WIN0V _080C37D8: .4byte REG_WIN0H _080C37DC: .4byte REG_WININ _080C37E0: .4byte 0x00003f3f diff --git a/asm/current.s b/asm/current.s index df72b56af..e77218cc9 100755 --- a/asm/current.s +++ b/asm/current.s @@ -18,10 +18,10 @@ sub_80D648C: @ 80D648C strh r0, [r4, 0x2E] ldrh r0, [r4, 0x20] strh r0, [r4, 0x30] - ldr r6, _080D6504 @ =gBattleAnimBankTarget + ldr r6, _080D6504 @ =gAnimBankTarget ldrb r0, [r6] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] @@ -29,7 +29,7 @@ sub_80D648C: @ 80D648C strh r0, [r4, 0x34] ldrb r0, [r6] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] @@ -64,7 +64,7 @@ sub_80D648C: @ 80D648C bx r0 .align 2, 0 _080D6500: .4byte gBattleAnimArgs -_080D6504: .4byte gBattleAnimBankTarget +_080D6504: .4byte gAnimBankTarget _080D6508: .4byte 0x000003ff _080D650C: .4byte 0xfffffc00 _080D6510: .4byte sub_80D6514 @@ -123,7 +123,7 @@ sub_80D6514: @ 80D6514 b _080D6584 _080D657E: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D6584: pop {r4} pop {r0} @@ -168,7 +168,7 @@ _080D65C4: cmp r0, 0 bgt _080D65D6 adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D65D6: pop {r0} bx r0 @@ -186,7 +186,7 @@ sub_80D65DC: @ 80D65DC ands r0, r1 cmp r0, 0 beq _080D65FE - ldr r0, _080D664C @ =gBattleAnimBankTarget + ldr r0, _080D664C @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -198,10 +198,10 @@ _080D65FE: negs r0, r0 strh r0, [r1, 0x2] _080D6606: - ldr r5, _080D664C @ =gBattleAnimBankTarget + ldr r5, _080D664C @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 ldr r4, _080D6650 @ =gBattleAnimArgs lsrs r0, 24 @@ -210,7 +210,7 @@ _080D6606: strh r0, [r6, 0x20] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x4] @@ -229,7 +229,7 @@ _080D6606: .align 2, 0 _080D6644: .4byte gMain _080D6648: .4byte 0x0000043d -_080D664C: .4byte gBattleAnimBankTarget +_080D664C: .4byte gAnimBankTarget _080D6650: .4byte gBattleAnimArgs _080D6654: .4byte sub_80D658C thumb_func_end sub_80D65DC @@ -248,13 +248,13 @@ sub_80D6658: @ 80D6658 ands r0, r1 cmp r0, 0 beq _080D667C - ldr r0, _080D6678 @ =gBattleAnimBankTarget + ldr r0, _080D6678 @ =gAnimBankTarget b _080D667E .align 2, 0 _080D6674: .4byte gBattleAnimArgs -_080D6678: .4byte gBattleAnimBankTarget +_080D6678: .4byte gAnimBankTarget _080D667C: - ldr r0, _080D670C @ =gBattleAnimBankAttacker + ldr r0, _080D670C @ =gAnimBankAttacker _080D667E: ldrb r6, [r0] ldr r0, _080D6710 @ =gMain @@ -278,7 +278,7 @@ _080D669C: _080D66A4: adds r0, r6, 0 movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 ldr r4, _080D6718 @ =gBattleAnimArgs lsrs r0, 24 @@ -287,7 +287,7 @@ _080D66A4: strh r0, [r5, 0x20] adds r0, r6, 0 movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r2, [r4, 0x2] @@ -325,7 +325,7 @@ _080D66A4: pop {r0} bx r0 .align 2, 0 -_080D670C: .4byte gBattleAnimBankAttacker +_080D670C: .4byte gAnimBankAttacker _080D6710: .4byte gMain _080D6714: .4byte 0x0000043d _080D6718: .4byte gBattleAnimArgs @@ -385,7 +385,7 @@ _080D6782: cmp r0, 0 bgt _080D6794 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D6794: pop {r4} pop {r0} @@ -444,7 +444,7 @@ _080D67F6: strh r0, [r4, 0x2E] ldr r0, _080D6814 @ =sub_80782D8 str r0, [r4, 0x1C] - ldr r1, _080D6818 @ =move_anim_8072740 + ldr r1, _080D6818 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData pop {r4,r5} @@ -453,7 +453,7 @@ _080D67F6: .align 2, 0 _080D6810: .4byte gBattleAnimArgs _080D6814: .4byte sub_80782D8 -_080D6818: .4byte move_anim_8072740 +_080D6818: .4byte DestroyAnimSprite thumb_func_end sub_80D679C thumb_func_start sub_80D681C @@ -462,10 +462,10 @@ sub_80D681C: @ 80D681C adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r6, _080D6864 @ =gBattleAnimBankTarget + ldr r6, _080D6864 @ =gAnimBankTarget ldrb r0, [r6] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition ldr r1, _080D6868 @ =gTasks lsls r4, r5, 2 adds r4, r5 @@ -479,7 +479,7 @@ sub_80D681C: @ 80D681C strh r0, [r4, 0x8] ldrb r0, [r6] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r5, 0x2] @@ -493,7 +493,7 @@ sub_80D681C: @ 80D681C pop {r0} bx r0 .align 2, 0 -_080D6864: .4byte gBattleAnimBankTarget +_080D6864: .4byte gAnimBankTarget _080D6868: .4byte gTasks _080D686C: .4byte gBattleAnimArgs _080D6870: .4byte sub_80D6874 @@ -855,7 +855,7 @@ _080D6B24: cmp r0, 0x33 bne _080D6B38 adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D6B38: pop {r0} bx r0 @@ -876,24 +876,24 @@ sub_80D6B3C: @ 80D6B3C ldrsh r0, [r0, r1] cmp r0, 0 bne _080D6B68 - ldr r4, _080D6B64 @ =gBattleAnimBankAttacker + ldr r4, _080D6B64 @ =gAnimBankAttacker b _080D6B6A .align 2, 0 _080D6B5C: .4byte gTasks _080D6B60: .4byte gBattleAnimArgs -_080D6B64: .4byte gBattleAnimBankAttacker +_080D6B64: .4byte gAnimBankAttacker _080D6B68: - ldr r4, _080D6BAC @ =gBattleAnimBankTarget + ldr r4, _080D6BAC @ =gAnimBankTarget _080D6B6A: ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x24] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x26] @@ -916,7 +916,7 @@ _080D6B6A: pop {r0} bx r0 .align 2, 0 -_080D6BAC: .4byte gBattleAnimBankTarget +_080D6BAC: .4byte gAnimBankTarget _080D6BB0: .4byte gBattleAnimArgs _080D6BB4: .4byte sub_80D6BB8 thumb_func_end sub_80D6B3C @@ -1110,23 +1110,23 @@ sub_80D6D18: @ 80D6D18 ldrsh r0, [r0, r1] cmp r0, 0 bne _080D6D34 - ldr r4, _080D6D30 @ =gBattleAnimBankAttacker + ldr r4, _080D6D30 @ =gAnimBankAttacker b _080D6D36 .align 2, 0 _080D6D2C: .4byte gBattleAnimArgs -_080D6D30: .4byte gBattleAnimBankAttacker +_080D6D30: .4byte gAnimBankAttacker _080D6D34: - ldr r4, _080D6D64 @ =gBattleAnimBankTarget + ldr r4, _080D6D64 @ =gAnimBankTarget _080D6D36: ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -1139,7 +1139,7 @@ _080D6D36: pop {r0} bx r0 .align 2, 0 -_080D6D64: .4byte gBattleAnimBankTarget +_080D6D64: .4byte gAnimBankTarget _080D6D68: .4byte move_anim_8074EE0 _080D6D6C: .4byte sub_80785E4 thumb_func_end sub_80D6D18 @@ -1153,23 +1153,23 @@ sub_80D6D70: @ 80D6D70 ldrsh r0, [r0, r1] cmp r0, 0 bne _080D6D8C - ldr r4, _080D6D88 @ =gBattleAnimBankAttacker + ldr r4, _080D6D88 @ =gAnimBankAttacker b _080D6D8E .align 2, 0 _080D6D84: .4byte gBattleAnimArgs -_080D6D88: .4byte gBattleAnimBankAttacker +_080D6D88: .4byte gAnimBankAttacker _080D6D8C: - ldr r4, _080D6DC8 @ =gBattleAnimBankTarget + ldr r4, _080D6DC8 @ =gAnimBankTarget _080D6D8E: ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -1178,7 +1178,7 @@ _080D6D8E: strh r0, [r5, 0x24] ldrh r0, [r1, 0x4] strh r0, [r5, 0x26] - ldr r1, _080D6DD0 @ =move_anim_8072740 + ldr r1, _080D6DD0 @ =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData ldr r0, _080D6DD4 @ =sub_8078600 @@ -1187,9 +1187,9 @@ _080D6D8E: pop {r0} bx r0 .align 2, 0 -_080D6DC8: .4byte gBattleAnimBankTarget +_080D6DC8: .4byte gAnimBankTarget _080D6DCC: .4byte gBattleAnimArgs -_080D6DD0: .4byte move_anim_8072740 +_080D6DD0: .4byte DestroyAnimSprite _080D6DD4: .4byte sub_8078600 thumb_func_end sub_80D6D70 @@ -1199,16 +1199,16 @@ sub_80D6DD8: @ 80D6DD8 adds r5, r0, 0 movs r1, 0x1 bl StartSpriteAffineAnim - ldr r4, _080D6E30 @ =gBattleAnimBankAttacker + ldr r4, _080D6E30 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -1236,7 +1236,7 @@ _080D6E26: pop {r0} bx r0 .align 2, 0 -_080D6E30: .4byte gBattleAnimBankAttacker +_080D6E30: .4byte gAnimBankAttacker _080D6E34: .4byte sub_80D6E38 thumb_func_end sub_80D6DD8 @@ -1331,10 +1331,10 @@ _080D6ED0: lsrs r0, 24 movs r6, 0 strh r0, [r5, 0x26] - ldr r4, _080D6F04 @ =gBattleAnimBankAttacker + ldr r4, _080D6F04 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x24] @@ -1348,7 +1348,7 @@ _080D6ED0: movs r0, 0x2 b _080D6F12 .align 2, 0 -_080D6F04: .4byte gBattleAnimBankAttacker +_080D6F04: .4byte gAnimBankAttacker _080D6F08: .4byte 0x0000ffe0 _080D6F0C: movs r0, 0x20 @@ -1513,7 +1513,7 @@ _080D7034: _080D703A: b _080D718E _080D703C: - ldr r4, _080D707C @ =gBattleAnimBankAttacker + ldr r4, _080D707C @ =gAnimBankAttacker ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -1545,19 +1545,19 @@ _080D7052: ldr r0, _080D7084 @ =0x0000fff0 b _080D70F0 .align 2, 0 -_080D707C: .4byte gBattleAnimBankAttacker +_080D707C: .4byte gAnimBankAttacker _080D7080: .4byte gBattleAnimArgs _080D7084: .4byte 0x0000fff0 _080D7088: ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0xE] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x12] @@ -1574,16 +1574,16 @@ _080D70B0: movs r0, 0x78 subs r0, r1 strh r0, [r5, 0xE] - ldr r4, _080D70E4 @ =gBattleAnimBankTarget + ldr r4, _080D70E4 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x12] ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 movs r2, 0xA @@ -1593,7 +1593,7 @@ _080D70B0: strh r0, [r5, 0x10] b _080D7126 .align 2, 0 -_080D70E4: .4byte gBattleAnimBankTarget +_080D70E4: .4byte gAnimBankTarget _080D70E8: ldr r0, _080D710C @ =0x0000fff0 strh r0, [r5, 0xE] @@ -1826,16 +1826,16 @@ sub_80D727C: @ 80D727C beq _080D72C0 b _080D72D4 _080D728E: - ldr r4, _080D72BC @ =gBattleAnimBankAttacker + ldr r4, _080D72BC @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -1847,7 +1847,7 @@ _080D728E: strh r0, [r5, 0x2E] b _080D72D4 .align 2, 0 -_080D72BC: .4byte gBattleAnimBankAttacker +_080D72BC: .4byte gAnimBankAttacker _080D72C0: adds r0, r5, 0 adds r0, 0x3F @@ -1896,25 +1896,25 @@ _080D7308: .4byte _080D7444 .4byte _080D7454 _080D731C: - ldr r4, _080D73A0 @ =gBattleAnimBankAttacker + ldr r4, _080D73A0 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x14] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x16] movs r0, 0x4 strh r0, [r5, 0x18] - ldr r0, _080D73A4 @ =gBattleAnimBankTarget + ldr r0, _080D73A4 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x1C] @@ -1933,12 +1933,12 @@ _080D731C: movs r0, 0xC strh r0, [r5, 0x1E] subs r0, 0x4C - bl sub_8076F98 + bl BattleAnimAdjustPanning lsls r0, 24 asrs r0, 24 strh r0, [r5, 0x20] movs r0, 0x3F - bl sub_8076F98 + bl BattleAnimAdjustPanning lsls r0, 24 asrs r0, 24 strh r0, [r5, 0x22] @@ -1956,8 +1956,8 @@ _080D731C: adds r0, 0x1 b _080D7466 .align 2, 0 -_080D73A0: .4byte gBattleAnimBankAttacker -_080D73A4: .4byte gBattleAnimBankTarget +_080D73A0: .4byte gAnimBankAttacker +_080D73A4: .4byte gAnimBankTarget _080D73A8: .4byte 0x0000ffff _080D73AC: ldrh r0, [r5, 0xA] @@ -2254,10 +2254,10 @@ _080D75C4: beq _080D7640 b _080D764E _080D75CA: - ldr r0, _080D7614 @ =gBattleAnimBankTarget + ldr r0, _080D7614 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, 0x20 @@ -2276,10 +2276,10 @@ _080D75E4: bgt _080D75E4 strh r1, [r5, 0x24] _080D75F4: - ldr r4, _080D7614 @ =gBattleAnimBankTarget + ldr r4, _080D7614 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -2291,7 +2291,7 @@ _080D75F4: strh r0, [r5, 0x20] b _080D7638 .align 2, 0 -_080D7614: .4byte gBattleAnimBankTarget +_080D7614: .4byte gAnimBankTarget _080D7618: ldrh r0, [r5, 0xA] adds r0, 0x1 diff --git a/asm/dark.s b/asm/dark.s index 5175d84f0..3fcc3f56c 100755 --- a/asm/dark.s +++ b/asm/dark.s @@ -116,13 +116,13 @@ sub_80DFFD0: @ 80DFFD0 adds r3, r0, 0 cmp r1, 0 bne _080DFFEC - ldr r0, _080DFFE8 @ =gBattleAnimBankAttacker + ldr r0, _080DFFE8 @ =gAnimBankAttacker b _080DFFEE .align 2, 0 _080DFFE4: .4byte gBattleAnimArgs -_080DFFE8: .4byte gBattleAnimBankAttacker +_080DFFE8: .4byte gAnimBankAttacker _080DFFEC: - ldr r0, _080E001C @ =gBattleAnimBankTarget + ldr r0, _080E001C @ =gAnimBankTarget _080DFFEE: ldrb r5, [r0] movs r6, 0x14 @@ -147,7 +147,7 @@ _080DFFEE: beq _080E0032 b _080E00A0 .align 2, 0 -_080E001C: .4byte gBattleAnimBankTarget +_080E001C: .4byte gAnimBankTarget _080E0020: .4byte 0x000003ff _080E0024: .4byte 0xfffffc00 _080E0028: @@ -259,10 +259,10 @@ sub_80E00EC: @ 80E00EC lsls r1, 3 ldr r0, _080E0150 @ =gTasks adds r5, r1, r0 - ldr r4, _080E0154 @ =gBattleAnimBankAttacker + ldr r4, _080E0154 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, 0x1F @@ -281,7 +281,7 @@ sub_80E00EC: @ 80E00EC strh r1, [r5, 0x22] ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r1, r0, 0 @@ -298,13 +298,13 @@ sub_80E00EC: @ 80E00EC b _080E015E .align 2, 0 _080E0150: .4byte gTasks -_080E0154: .4byte gBattleAnimBankAttacker +_080E0154: .4byte gAnimBankAttacker _080E0158: .4byte 0x0000fff4 _080E015C: ldr r0, _080E01A8 @ =0x0000ffc0 _080E015E: strh r0, [r5, 0x18] - ldr r0, _080E01AC @ =gBattleAnimBankAttacker + ldr r0, _080E01AC @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -315,7 +315,7 @@ _080E015E: add r4, sp, 0xC adds r0, r4, 0 bl sub_8078914 - ldr r0, _080E01B0 @ =gUnknown_030041B4 + ldr r0, _080E01B0 @ =gBattle_BG1_Y ldrh r0, [r0] strh r0, [r5, 0x1C] ldr r1, _080E01B4 @ =REG_BLDCNT @@ -330,22 +330,22 @@ _080E015E: ldr r0, _080E01BC @ =REG_BG1VOFS str r0, [sp] movs r7, 0x2 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E01F4 - ldr r1, _080E01C0 @ =gUnknown_03004288 + ldr r1, _080E01C0 @ =gBattle_BG2_X b _080E01EE .align 2, 0 _080E01A8: .4byte 0x0000ffc0 -_080E01AC: .4byte gBattleAnimBankAttacker -_080E01B0: .4byte gUnknown_030041B4 +_080E01AC: .4byte gAnimBankAttacker +_080E01B0: .4byte gBattle_BG1_Y _080E01B4: .4byte REG_BLDCNT _080E01B8: .4byte 0x00003f42 _080E01BC: .4byte REG_BG1VOFS -_080E01C0: .4byte gUnknown_03004288 +_080E01C0: .4byte gBattle_BG2_X _080E01C4: - ldr r0, _080E0278 @ =gUnknown_03004280 + ldr r0, _080E0278 @ =gBattle_BG2_Y ldrh r0, [r0] strh r0, [r5, 0x1C] ldr r1, _080E027C @ =REG_BLDCNT @@ -359,11 +359,11 @@ _080E01C4: ldr r0, _080E0284 @ =REG_BG2VOFS str r0, [sp] movs r7, 0x4 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E01F4 - ldr r1, _080E0288 @ =gUnknown_030042C0 + ldr r1, _080E0288 @ =gBattle_BG1_X _080E01EE: ldrh r0, [r1] adds r0, 0xF0 @@ -419,13 +419,13 @@ _080E0220: adds r2, 0x3F adds r0, r2, 0 strh r0, [r1] - ldr r2, _080E0298 @ =gUnknown_030042C4 + ldr r2, _080E0298 @ =gBattle_WIN0H ldrh r0, [r5, 0x24] lsls r0, 8 ldrh r1, [r5, 0x26] orrs r0, r1 strh r0, [r2] - ldr r1, _080E029C @ =gUnknown_03004240 + ldr r1, _080E029C @ =gBattle_WIN0V movs r0, 0xA0 strh r0, [r1] ldr r0, _080E02A0 @ =sub_80E02A4 @@ -435,16 +435,16 @@ _080E0220: pop {r0} bx r0 .align 2, 0 -_080E0278: .4byte gUnknown_03004280 +_080E0278: .4byte gBattle_BG2_Y _080E027C: .4byte REG_BLDCNT _080E0280: .4byte 0x00003f44 _080E0284: .4byte REG_BG2VOFS -_080E0288: .4byte gUnknown_030042C0 +_080E0288: .4byte gBattle_BG1_X _080E028C: .4byte 0xa2600001 _080E0290: .4byte gUnknown_03004DE0 _080E0294: .4byte REG_WINOUT -_080E0298: .4byte gUnknown_030042C4 -_080E029C: .4byte gUnknown_03004240 +_080E0298: .4byte gBattle_WIN0H +_080E029C: .4byte gBattle_WIN0V _080E02A0: .4byte sub_80E02A4 thumb_func_end sub_80E00EC @@ -561,7 +561,7 @@ _080E035E: blt _080E0380 strh r2, [r4, 0x24] _080E0380: - ldr r3, _080E0398 @ =gUnknown_030042C4 + ldr r3, _080E0398 @ =gBattle_WIN0H ldrh r2, [r4, 0x24] lsls r0, r2, 8 ldrh r1, [r4, 0x26] @@ -573,7 +573,7 @@ _080E0380: bne _080E03B6 b _080E03A2 .align 2, 0 -_080E0398: .4byte gUnknown_030042C4 +_080E0398: .4byte gBattle_WIN0H _080E039C: ldr r1, _080E03AC @ =gUnknown_03004DC0 movs r0, 0x3 @@ -627,15 +627,15 @@ _080E03EC: .4byte _080E053C .4byte _080E05A4 _080E0400: - bl NotInBattle + bl IsContest lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _080E043C - ldr r0, _080E042C @ =gUnknown_030042C4 + ldr r0, _080E042C @ =gBattle_WIN0H movs r1, 0 strh r1, [r0] - ldr r0, _080E0430 @ =gUnknown_03004240 + ldr r0, _080E0430 @ =gBattle_WIN0V strh r1, [r0] ldr r0, _080E0434 @ =REG_WININ ldr r2, _080E0438 @ =0x00003f3f @@ -647,12 +647,12 @@ _080E0400: bl DestroyAnimVisualTask b _080E05F2 .align 2, 0 -_080E042C: .4byte gUnknown_030042C4 -_080E0430: .4byte gUnknown_03004240 +_080E042C: .4byte gBattle_WIN0H +_080E0430: .4byte gBattle_WIN0V _080E0434: .4byte REG_WININ _080E0438: .4byte 0x00003f3f _080E043C: - ldr r0, _080E045C @ =gBattleAnimBankTarget + ldr r0, _080E045C @ =gAnimBankTarget ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -664,19 +664,19 @@ _080E043C: ldr r2, _080E0464 @ =0x00003f42 adds r0, r2, 0 strh r0, [r1] - ldr r1, _080E0468 @ =gUnknown_03004288 + ldr r1, _080E0468 @ =gBattle_BG2_X b _080E0476 .align 2, 0 -_080E045C: .4byte gBattleAnimBankTarget +_080E045C: .4byte gAnimBankTarget _080E0460: .4byte REG_BLDCNT _080E0464: .4byte 0x00003f42 -_080E0468: .4byte gUnknown_03004288 +_080E0468: .4byte gBattle_BG2_X _080E046C: ldr r1, _080E0480 @ =REG_BLDCNT ldr r2, _080E0484 @ =0x00003f44 adds r0, r2, 0 strh r0, [r1] - ldr r1, _080E0488 @ =gUnknown_030042C0 + ldr r1, _080E0488 @ =gBattle_BG1_X _080E0476: ldrh r0, [r1] adds r0, 0xF0 @@ -685,7 +685,7 @@ _080E0476: .align 2, 0 _080E0480: .4byte REG_BLDCNT _080E0484: .4byte 0x00003f44 -_080E0488: .4byte gUnknown_030042C0 +_080E0488: .4byte gBattle_BG1_X _080E048C: movs r1, 0xE ldrsh r0, [r5, r1] @@ -693,7 +693,7 @@ _080E048C: bne _080E04B4 mov r0, sp bl sub_8078914 - ldr r0, _080E04B0 @ =gUnknown_030041B4 + ldr r0, _080E04B0 @ =gBattle_BG1_Y ldrh r0, [r0] strh r0, [r5, 0x1C] mov r0, sp @@ -704,9 +704,9 @@ _080E048C: bl FillPalette b _080E04C4 .align 2, 0 -_080E04B0: .4byte gUnknown_030041B4 +_080E04B0: .4byte gBattle_BG1_Y _080E04B4: - ldr r0, _080E04CC @ =gUnknown_03004280 + ldr r0, _080E04CC @ =gBattle_BG2_Y ldrh r0, [r0] strh r0, [r5, 0x1C] movs r0, 0 @@ -718,12 +718,12 @@ _080E04C4: bl sub_80E08CC b _080E0590 .align 2, 0 -_080E04CC: .4byte gUnknown_03004280 +_080E04CC: .4byte gBattle_BG2_Y _080E04D0: - ldr r4, _080E051C @ =gBattleAnimBankTarget + ldr r4, _080E051C @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, 0x1F @@ -740,7 +740,7 @@ _080E04D0: strh r1, [r5, 0x22] ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 subs r1, r0, 0x4 @@ -755,7 +755,7 @@ _080E04D0: ldr r0, _080E0520 @ =0x0000fff4 b _080E0526 .align 2, 0 -_080E051C: .4byte gBattleAnimBankTarget +_080E051C: .4byte gAnimBankTarget _080E0520: .4byte 0x0000fff4 _080E0524: ldr r0, _080E0538 @ =0x0000ffc0 @@ -846,13 +846,13 @@ _080E05C0: ldr r2, _080E0608 @ =0x00003f3f adds r0, r2, 0 strh r0, [r1] - ldr r2, _080E060C @ =gUnknown_030042C4 + ldr r2, _080E060C @ =gBattle_WIN0H ldrh r0, [r5, 0x24] lsls r0, 8 ldrh r1, [r5, 0x26] orrs r0, r1 strh r0, [r2] - ldr r1, _080E0610 @ =gUnknown_03004240 + ldr r1, _080E0610 @ =gBattle_WIN0V movs r0, 0xA0 strh r0, [r1] movs r0, 0 @@ -875,8 +875,8 @@ _080E05FC: .4byte REG_WINOUT _080E0600: .4byte 0x00003f3b _080E0604: .4byte REG_WININ _080E0608: .4byte 0x00003f3f -_080E060C: .4byte gUnknown_030042C4 -_080E0610: .4byte gUnknown_03004240 +_080E060C: .4byte gBattle_WIN0H +_080E0610: .4byte gBattle_WIN0V _080E0614: .4byte REG_BLDALPHA _080E0618: .4byte 0x0000080c _080E061C: .4byte sub_80E0620 @@ -956,7 +956,7 @@ _080E06A8: movs r0, 0x1 strh r0, [r4, 0xA] _080E06AC: - ldr r2, _080E06F0 @ =gUnknown_030042C4 + ldr r2, _080E06F0 @ =gBattle_WIN0H ldrh r0, [r4, 0x24] lsls r0, 8 ldrh r1, [r4, 0x26] @@ -990,7 +990,7 @@ _080E06CE: strh r0, [r4, 0xA] b _080E075A .align 2, 0 -_080E06F0: .4byte gUnknown_030042C4 +_080E06F0: .4byte gBattle_WIN0H _080E06F4: ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -1054,10 +1054,10 @@ _080E075A: .align 2, 0 _080E0764: .4byte gUnknown_03004DC0 _080E0768: - ldr r0, _080E078C @ =gUnknown_030042C4 + ldr r0, _080E078C @ =gBattle_WIN0H movs r1, 0 strh r1, [r0] - ldr r0, _080E0790 @ =gUnknown_03004240 + ldr r0, _080E0790 @ =gBattle_WIN0V strh r1, [r0] ldr r0, _080E0794 @ =REG_WININ ldr r3, _080E0798 @ =0x00003f3f @@ -1072,8 +1072,8 @@ _080E0784: pop {r0} bx r0 .align 2, 0 -_080E078C: .4byte gUnknown_030042C4 -_080E0790: .4byte gUnknown_03004240 +_080E078C: .4byte gBattle_WIN0H +_080E0790: .4byte gBattle_WIN0V _080E0794: .4byte REG_WININ _080E0798: .4byte 0x00003f3f thumb_func_end sub_80E0620 @@ -1293,7 +1293,7 @@ sub_80E0918: @ 80E0918 lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r6, _080E09B8 @ =gBattleAnimBankAttacker + ldr r6, _080E09B8 @ =gAnimBankAttacker ldrb r0, [r6] bl GetBankIdentity_permutated lsls r0, 24 @@ -1361,7 +1361,7 @@ _080E09A2: pop {r0} bx r0 .align 2, 0 -_080E09B8: .4byte gBattleAnimBankAttacker +_080E09B8: .4byte gAnimBankAttacker _080E09BC: .4byte gSprites _080E09C0: .4byte gObjectBankIDs thumb_func_end sub_80E0918 @@ -1371,7 +1371,7 @@ sub_80E09C4: @ 80E09C4 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r4, _080E0A0C @ =gBattleAnimBankAttacker + ldr r4, _080E0A0C @ =gAnimBankAttacker ldrb r0, [r4] bl GetBankIdentity_permutated lsls r0, 24 @@ -1401,7 +1401,7 @@ _080E0A00: pop {r0} bx r0 .align 2, 0 -_080E0A0C: .4byte gBattleAnimBankAttacker +_080E0A0C: .4byte gAnimBankAttacker thumb_func_end sub_80E09C4 thumb_func_start sub_80E0A10 @@ -1422,7 +1422,7 @@ sub_80E0A10: @ 80E0A10 bl StartSpriteAnim ldr r0, _080E0A44 @ =sub_8078600 str r0, [r4, 0x1C] - ldr r1, _080E0A48 @ =move_anim_8072740 + ldr r1, _080E0A48 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData pop {r4} @@ -1431,7 +1431,7 @@ sub_80E0A10: @ 80E0A10 .align 2, 0 _080E0A40: .4byte gBattleAnimArgs _080E0A44: .4byte sub_8078600 -_080E0A48: .4byte move_anim_8072740 +_080E0A48: .4byte DestroyAnimSprite thumb_func_end sub_80E0A10 thumb_func_start sub_80E0A4C @@ -1445,9 +1445,9 @@ sub_80E0A4C: @ 80E0A4C lsrs r0, 24 mov r9, r0 movs r7, 0 - ldr r0, _080E0B50 @ =gUnknown_030042C4 + ldr r0, _080E0B50 @ =gBattle_WIN0H strh r7, [r0] - ldr r0, _080E0B54 @ =gUnknown_03004240 + ldr r0, _080E0B54 @ =gBattle_WIN0V strh r7, [r0] ldr r1, _080E0B58 @ =REG_WININ ldr r2, _080E0B5C @ =0x00003f3f @@ -1484,7 +1484,7 @@ sub_80E0A4C: @ 80E0A4C movs r0, 0x3F ands r0, r1 strb r0, [r5, 0x1] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E0AC4 @@ -1500,11 +1500,11 @@ _080E0AC4: lsls r0, 24 cmp r0, 0 beq _080E0B40 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E0B40 - ldr r4, _080E0B74 @ =gBattleAnimBankAttacker + ldr r4, _080E0B74 @ =gAnimBankAttacker ldrb r0, [r4] bl GetBankIdentity lsls r0, 24 @@ -1555,7 +1555,7 @@ _080E0AF4: strb r0, [r5] movs r7, 0x1 _080E0B40: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080E0B84 @@ -1563,8 +1563,8 @@ _080E0B40: ldrh r5, [r0] b _080E0BCC .align 2, 0 -_080E0B50: .4byte gUnknown_030042C4 -_080E0B54: .4byte gUnknown_03004240 +_080E0B50: .4byte gBattle_WIN0H +_080E0B54: .4byte gBattle_WIN0V _080E0B58: .4byte REG_WININ _080E0B5C: .4byte 0x00003f3f _080E0B60: .4byte 0x00003f3d @@ -1572,12 +1572,12 @@ _080E0B64: .4byte REG_BLDCNT _080E0B68: .4byte 0x00003f42 _080E0B6C: .4byte 0x00000c08 _080E0B70: .4byte REG_BG1CNT -_080E0B74: .4byte gBattleAnimBankAttacker +_080E0B74: .4byte gAnimBankAttacker _080E0B78: .4byte gSprites _080E0B7C: .4byte gObjectBankIDs _080E0B80: .4byte gSharedMem + 0x19348 _080E0B84: - ldr r4, _080E0BA4 @ =gBattleAnimBankAttacker + ldr r4, _080E0BA4 @ =gAnimBankAttacker ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -1593,7 +1593,7 @@ _080E0B84: ldr r1, _080E0BAC @ =gEnemyParty b _080E0BC0 .align 2, 0 -_080E0BA4: .4byte gBattleAnimBankAttacker +_080E0BA4: .4byte gAnimBankAttacker _080E0BA8: .4byte gBattlePartyID _080E0BAC: .4byte gEnemyParty _080E0BB0: @@ -1617,7 +1617,7 @@ _080E0BCC: adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080E0C60 @ =gBattleAnimBankAttacker + ldr r0, _080E0C60 @ =gAnimBankAttacker ldrb r0, [r0] adds r1, r4, 0 adds r2, r5, 0 @@ -1647,7 +1647,7 @@ _080E0BCC: lsls r1, 4 movs r2, 0x20 bl LoadCompressedPalette - ldr r2, _080E0C78 @ =gUnknown_030042C0 + ldr r2, _080E0C78 @ =gBattle_BG1_X ldr r0, _080E0C7C @ =gSprites lsls r1, r4, 4 adds r1, r4 @@ -1657,7 +1657,7 @@ _080E0BCC: negs r0, r0 adds r0, 0x60 strh r0, [r2] - ldr r2, _080E0C80 @ =gUnknown_030041B4 + ldr r2, _080E0C80 @ =gBattle_BG1_Y ldrh r0, [r1, 0x22] negs r0, r0 adds r0, 0x20 @@ -1678,15 +1678,15 @@ _080E0BCC: .align 2, 0 _080E0C58: .4byte gBattlePartyID _080E0C5C: .4byte gPlayerParty -_080E0C60: .4byte gBattleAnimBankAttacker +_080E0C60: .4byte gAnimBankAttacker _080E0C64: .4byte 0x040000d4 _080E0C68: .4byte 0x85000400 _080E0C6C: .4byte gUnknown_08D1D574 _080E0C70: .4byte gUnknown_08D1D410 _080E0C74: .4byte gUnknown_08D1D54C -_080E0C78: .4byte gUnknown_030042C0 +_080E0C78: .4byte gBattle_BG1_X _080E0C7C: .4byte gSprites -_080E0C80: .4byte gUnknown_030041B4 +_080E0C80: .4byte gBattle_BG1_Y _080E0C84: .4byte gBattleAnimArgs _080E0C88: lsls r0, r1, 4 @@ -1740,7 +1740,7 @@ sub_80E0CD0: @ 80E0CD0 adds r0, 0x4 movs r5, 0 strh r0, [r4, 0x1C] - ldr r2, _080E0DF4 @ =gUnknown_030042C0 + ldr r2, _080E0DF4 @ =gBattle_BG1_X ldrh r3, [r2] subs r1, r3, 0x4 strh r1, [r2] @@ -1761,9 +1761,9 @@ sub_80E0CD0: @ 80E0CD0 bne _080E0DE8 movs r0, 0 bl sub_8076464 - ldr r0, _080E0DF8 @ =gUnknown_030042C4 + ldr r0, _080E0DF8 @ =gBattle_WIN0H strh r5, [r0] - ldr r0, _080E0DFC @ =gUnknown_03004240 + ldr r0, _080E0DFC @ =gBattle_WIN0V strh r5, [r0] ldr r0, _080E0E00 @ =REG_WININ ldr r2, _080E0E04 @ =0x00003f3f @@ -1771,7 +1771,7 @@ sub_80E0CD0: @ 80E0CD0 strh r1, [r0] adds r0, 0x2 strh r1, [r0] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E0D40 @@ -1838,7 +1838,7 @@ _080E0D84: cmp r0, 0x1 bne _080E0DE2 ldr r2, _080E0E1C @ =gObjectBankIDs - ldr r0, _080E0E20 @ =gBattleAnimBankAttacker + ldr r0, _080E0E20 @ =gAnimBankAttacker ldrb r1, [r0] movs r0, 0x2 eors r0, r1 @@ -1870,9 +1870,9 @@ _080E0DE8: bx r0 .align 2, 0 _080E0DF0: .4byte gTasks -_080E0DF4: .4byte gUnknown_030042C0 -_080E0DF8: .4byte gUnknown_030042C4 -_080E0DFC: .4byte gUnknown_03004240 +_080E0DF4: .4byte gBattle_BG1_X +_080E0DF8: .4byte gBattle_WIN0H +_080E0DFC: .4byte gBattle_WIN0V _080E0E00: .4byte REG_WININ _080E0E04: .4byte 0x00003f3f _080E0E08: .4byte REG_BG1CNT @@ -1881,7 +1881,7 @@ _080E0E10: .4byte gSprites _080E0E14: .4byte 0x040000d4 _080E0E18: .4byte 0x85000200 _080E0E1C: .4byte gObjectBankIDs -_080E0E20: .4byte gBattleAnimBankAttacker +_080E0E20: .4byte gAnimBankAttacker thumb_func_end sub_80E0CD0 thumb_func_start sub_80E0E24 @@ -1986,7 +1986,7 @@ sub_80E0EE8: @ 80E0EE8 push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _080E0F14 @ =gUnknown_0202F7C4 + ldr r2, _080E0F14 @ =gAnimMoveTurn ldrb r0, [r2] cmp r0, 0x1 bhi _080E0EFC @@ -2006,7 +2006,7 @@ _080E0F08: pop {r0} bx r0 .align 2, 0 -_080E0F14: .4byte gUnknown_0202F7C4 +_080E0F14: .4byte gAnimMoveTurn _080E0F18: .4byte gBattleAnimArgs thumb_func_end sub_80E0EE8 diff --git a/asm/dragon.s b/asm/dragon.s index c384e3b6c..7c4ea0547 100755 --- a/asm/dragon.s +++ b/asm/dragon.s @@ -11,16 +11,16 @@ sub_80DF5A0: @ 80DF5A0 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _080DF5E8 @ =gBattleAnimBankAttacker + ldr r4, _080DF5E8 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -43,7 +43,7 @@ sub_80DF5A0: @ 80DF5A0 adds r1, r2, 0 b _080DF5FA .align 2, 0 -_080DF5E8: .4byte gBattleAnimBankAttacker +_080DF5E8: .4byte gAnimBankAttacker _080DF5EC: .4byte gBattleAnimArgs _080DF5F0: ldr r1, _080DF630 @ =gBattleAnimArgs @@ -89,20 +89,20 @@ sub_80DF63C: @ 80DF63C push {r4,r5,lr} adds r5, r0, 0 bl sub_8078650 - ldr r4, _080DF694 @ =gBattleAnimBankTarget + ldr r4, _080DF694 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] - ldr r0, _080DF698 @ =gBattleAnimBankAttacker + ldr r0, _080DF698 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -126,8 +126,8 @@ sub_80DF63C: @ 80DF63C strh r0, [r5, 0x36] b _080DF6CA .align 2, 0 -_080DF694: .4byte gBattleAnimBankTarget -_080DF698: .4byte gBattleAnimBankAttacker +_080DF694: .4byte gAnimBankTarget +_080DF698: .4byte gAnimBankAttacker _080DF69C: .4byte gBattleAnimArgs _080DF6A0: ldr r1, _080DF6E4 @ =gBattleAnimArgs @@ -177,23 +177,23 @@ sub_80DF6F0: @ 80DF6F0 ldrsh r0, [r0, r1] cmp r0, 0 bne _080DF70C - ldr r4, _080DF708 @ =gBattleAnimBankAttacker + ldr r4, _080DF708 @ =gAnimBankAttacker b _080DF70E .align 2, 0 _080DF704: .4byte gBattleAnimArgs -_080DF708: .4byte gBattleAnimBankAttacker +_080DF708: .4byte gAnimBankAttacker _080DF70C: - ldr r4, _080DF750 @ =gBattleAnimBankTarget + ldr r4, _080DF750 @ =gAnimBankTarget _080DF70E: ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -215,7 +215,7 @@ _080DF70E: pop {r0} bx r0 .align 2, 0 -_080DF750: .4byte gBattleAnimBankTarget +_080DF750: .4byte gAnimBankTarget _080DF754: .4byte gBattleAnimArgs _080DF758: .4byte sub_8078600 _080DF75C: .4byte move_anim_8074EE0 @@ -225,7 +225,7 @@ _080DF75C: .4byte move_anim_8074EE0 sub_80DF760: @ 80DF760 push {r4,lr} adds r4, r0, 0 - ldr r0, _080DF788 @ =gBattleAnimBankAttacker + ldr r0, _080DF788 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -241,24 +241,24 @@ _080DF77A: pop {r0} bx r0 .align 2, 0 -_080DF788: .4byte gBattleAnimBankAttacker +_080DF788: .4byte gAnimBankAttacker thumb_func_end sub_80DF760 thumb_func_start sub_80DF78C sub_80DF78C: @ 80DF78C push {r4-r7,lr} adds r6, r0, 0 - ldr r4, _080DF7E0 @ =gBattleAnimBankAttacker + ldr r4, _080DF7E0 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 movs r5, 0 strh r0, [r6, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x22] @@ -284,7 +284,7 @@ sub_80DF78C: @ 80DF78C lsrs r0, r7, 17 b _080DF7EE .align 2, 0 -_080DF7E0: .4byte gBattleAnimBankAttacker +_080DF7E0: .4byte gAnimBankAttacker _080DF7E4: .4byte gBattleAnimArgs _080DF7E8: .4byte gBankAttacker _080DF7EC: @@ -442,7 +442,7 @@ _080DF90A: cmp r0, 0x14 ble _080DF91E adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DF91E: pop {r4,r5} pop {r0} @@ -460,7 +460,7 @@ sub_80DF924: @ 80DF924 lsls r1, 3 ldr r0, _080DF950 @ =gTasks adds r4, r1, r0 - ldr r0, _080DF954 @ =gBattleAnimBankAttacker + ldr r0, _080DF954 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -469,17 +469,17 @@ sub_80DF924: @ 80DF924 bne _080DF960 ldr r0, _080DF958 @ =REG_BG1HOFS str r0, [sp] - ldr r0, _080DF95C @ =gUnknown_030042C0 + ldr r0, _080DF95C @ =gBattle_BG1_X b _080DF966 .align 2, 0 _080DF950: .4byte gTasks -_080DF954: .4byte gBattleAnimBankAttacker +_080DF954: .4byte gAnimBankAttacker _080DF958: .4byte REG_BG1HOFS -_080DF95C: .4byte gUnknown_030042C0 +_080DF95C: .4byte gBattle_BG1_X _080DF960: ldr r0, _080DF9DC @ =REG_BG2HOFS str r0, [sp] - ldr r0, _080DF9E0 @ =gUnknown_03004288 + ldr r0, _080DF9E0 @ =gBattle_BG2_X _080DF966: ldrh r0, [r0] strh r0, [r4, 0xC] @@ -491,7 +491,7 @@ _080DF966: strb r0, [r1, 0x8] mov r0, sp strb r5, [r0, 0x9] - ldr r0, _080DF9E8 @ =gBattleAnimBankAttacker + ldr r0, _080DF9E8 @ =gAnimBankAttacker ldrb r0, [r0] bl sub_8077FC0 lsls r0, 24 @@ -542,9 +542,9 @@ _080DF9C4: bx r0 .align 2, 0 _080DF9DC: .4byte REG_BG2HOFS -_080DF9E0: .4byte gUnknown_03004288 +_080DF9E0: .4byte gBattle_BG2_X _080DF9E4: .4byte 0xa2600001 -_080DF9E8: .4byte gBattleAnimBankAttacker +_080DF9E8: .4byte gAnimBankAttacker _080DF9EC: .4byte gUnknown_03004DE0 _080DF9F0: .4byte sub_80DF9F4 thumb_func_end sub_80DF924 @@ -724,18 +724,18 @@ sub_80DFB28: @ 80DFB28 movs r1, 0x5 bl __divsi3 adds r6, r0, 0 - ldr r1, _080DFBCC @ =gBattleAnimBankAttacker + ldr r1, _080DFBCC @ =gAnimBankAttacker mov r8, r1 ldrb r0, [r1] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x20] mov r2, r8 ldrb r0, [r2] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r3, [r5, 0x8] @@ -790,7 +790,7 @@ _080DFBB0: bx r0 .align 2, 0 _080DFBC8: .4byte gBattleAnimArgs -_080DFBCC: .4byte gBattleAnimBankAttacker +_080DFBCC: .4byte gAnimBankAttacker _080DFBD0: .4byte sub_80DFBD8 _080DFBD4: .4byte gUnknown_03000730 thumb_func_end sub_80DFB28 @@ -827,7 +827,7 @@ sub_80DFBD8: @ 80DFBD8 cmp r0, r1 ble _080DFC1C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DFC1C: pop {r4} pop {r0} @@ -847,7 +847,7 @@ sub_80DFC24: @ 80DFC24 ldr r0, _080DFC5C @ =gBattleAnimArgs ldrh r0, [r0] strh r0, [r1, 0x8] - ldr r0, _080DFC60 @ =gBattleAnimBankAttacker + ldr r0, _080DFC60 @ =gAnimBankAttacker ldrb r0, [r0] movs r2, 0x10 strh r2, [r1, 0xA] @@ -864,7 +864,7 @@ sub_80DFC24: @ 80DFC24 .align 2, 0 _080DFC58: .4byte gTasks _080DFC5C: .4byte gBattleAnimArgs -_080DFC60: .4byte gBattleAnimBankAttacker +_080DFC60: .4byte gAnimBankAttacker _080DFC64: .4byte REG_BLDALPHA _080DFC68: .4byte REG_BLDCNT _080DFC6C: .4byte 0x00003f42 @@ -927,7 +927,7 @@ sub_80DFC9C: @ 80DFC9C bne _080DFD1E ldr r2, _080DFD0C @ =gSprites ldr r1, _080DFD10 @ =gObjectBankIDs - ldr r0, _080DFD14 @ =gBattleAnimBankAttacker + ldr r0, _080DFD14 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -948,7 +948,7 @@ _080DFD04: .4byte gTasks _080DFD08: .4byte REG_BLDALPHA _080DFD0C: .4byte gSprites _080DFD10: .4byte gObjectBankIDs -_080DFD14: .4byte gBattleAnimBankAttacker +_080DFD14: .4byte gAnimBankAttacker _080DFD18: ldrh r0, [r4, 0xC] adds r0, 0x1 @@ -1050,7 +1050,7 @@ sub_80DFDC0: @ 80DFDC0 lsls r2, 5 adds r0, r2, 0 strh r0, [r1] - ldr r0, _080DFDEC @ =gBattleAnimBankAttacker + ldr r0, _080DFDEC @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -1062,7 +1062,7 @@ sub_80DFDC0: @ 80DFDC0 b _080DFDFC .align 2, 0 _080DFDE8: .4byte REG_BLDALPHA -_080DFDEC: .4byte gBattleAnimBankAttacker +_080DFDEC: .4byte gAnimBankAttacker _080DFDF0: .4byte REG_BLDCNT _080DFDF4: .4byte 0x00003f42 _080DFDF8: @@ -1085,29 +1085,29 @@ _080DFE10: .4byte 0x00003f44 sub_80DFE14: @ 80DFE14 push {r4-r6,lr} adds r4, r0, 0 - ldr r6, _080DFE80 @ =gBattleAnimBankTarget + ldr r6, _080DFE80 @ =gAnimBankTarget ldrb r0, [r6] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x30] - ldr r5, _080DFE84 @ =gBattleAnimBankAttacker + ldr r5, _080DFE84 @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] ldrb r0, [r6] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x34] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] @@ -1131,8 +1131,8 @@ sub_80DFE14: @ 80DFE14 pop {r0} bx r0 .align 2, 0 -_080DFE80: .4byte gBattleAnimBankTarget -_080DFE84: .4byte gBattleAnimBankAttacker +_080DFE80: .4byte gAnimBankTarget +_080DFE84: .4byte gAnimBankAttacker _080DFE88: .4byte 0x0000ffd8 _080DFE8C: .4byte sub_80DFE90 thumb_func_end sub_80DFE14 @@ -1204,7 +1204,7 @@ _080DFF02: cmp r0, 0 bne _080DFF14 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DFF14: pop {r4-r6} pop {r0} diff --git a/asm/fight.s b/asm/fight.s index c6ef33840..d0d042113 100755 --- a/asm/fight.s +++ b/asm/fight.s @@ -24,7 +24,7 @@ unc_080B08A0: @ 80D8FF0 strh r0, [r4, 0x2E] ldr r0, _080D9024 @ =sub_80782D8 str r0, [r4, 0x1C] - ldr r1, _080D9028 @ =move_anim_8072740 + ldr r1, _080D9028 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData pop {r4,r5} @@ -33,7 +33,7 @@ unc_080B08A0: @ 80D8FF0 .align 2, 0 _080D9020: .4byte gBattleAnimArgs _080D9024: .4byte sub_80782D8 -_080D9028: .4byte move_anim_8072740 +_080D9028: .4byte DestroyAnimSprite thumb_func_end unc_080B08A0 thumb_func_start sub_80D902C @@ -45,7 +45,7 @@ sub_80D902C: @ 80D902C ldrsh r0, [r4, r1] cmp r0, 0x1 bne _080D9054 - ldr r0, _080D9074 @ =gBattleAnimBankAttacker + ldr r0, _080D9074 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -71,14 +71,14 @@ _080D9054: bx r0 .align 2, 0 _080D9070: .4byte gBattleAnimArgs -_080D9074: .4byte gBattleAnimBankAttacker +_080D9074: .4byte gAnimBankAttacker thumb_func_end sub_80D902C thumb_func_start sub_80D9078 sub_80D9078: @ 80D9078 push {r4,lr} adds r4, r0, 0 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080D9094 @@ -126,7 +126,7 @@ _080D90D0: strh r0, [r5, 0x2E] ldr r0, _080D90EC @ =sub_80782D8 str r0, [r5, 0x1C] - ldr r1, _080D90F0 @ =move_anim_8072740 + ldr r1, _080D90F0 @ =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData pop {r4,r5} @@ -135,7 +135,7 @@ _080D90D0: .align 2, 0 _080D90E8: .4byte gBattleAnimArgs _080D90EC: .4byte sub_80782D8 -_080D90F0: .4byte move_anim_8072740 +_080D90F0: .4byte DestroyAnimSprite thumb_func_end sub_80D90A4 thumb_func_start sub_80D90F4 @@ -151,13 +151,13 @@ sub_80D90F4: @ 80D90F4 mov r9, r0 cmp r1, 0 bne _080D9118 - ldr r0, _080D9114 @ =gBattleAnimBankAttacker + ldr r0, _080D9114 @ =gAnimBankAttacker b _080D911A .align 2, 0 _080D9110: .4byte gBattleAnimArgs -_080D9114: .4byte gBattleAnimBankAttacker +_080D9114: .4byte gAnimBankAttacker _080D9118: - ldr r0, _080D9260 @ =gBattleAnimBankTarget + ldr r0, _080D9260 @ =gAnimBankTarget _080D911A: ldrb r0, [r0] mov r8, r0 @@ -178,13 +178,13 @@ _080D9138: bl StartSpriteAnim mov r0, r8 movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] mov r0, r8 movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -314,7 +314,7 @@ _080D9250: pop {r0} bx r0 .align 2, 0 -_080D9260: .4byte gBattleAnimBankTarget +_080D9260: .4byte gAnimBankTarget _080D9264: .4byte gBanksBySide _080D9268: .4byte 0xfff00000 _080D926C: .4byte gBattleAnimSpriteTemplate_83DB4A8 @@ -355,7 +355,7 @@ sub_80D927C: @ 80D927C bl DestroySprite _080D92B8: adds r0, r5, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _080D92C8 .align 2, 0 _080D92C0: .4byte gSprites @@ -444,7 +444,7 @@ sub_80D9328: @ 80D9328 strh r6, [r5, 0x24] ldr r0, _080D9370 @ =sub_8078B34 str r0, [r5, 0x1C] - ldr r1, _080D9374 @ =move_anim_8072740 + ldr r1, _080D9374 @ =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData _080D9368: @@ -453,17 +453,17 @@ _080D9368: bx r0 .align 2, 0 _080D9370: .4byte sub_8078B34 -_080D9374: .4byte move_anim_8072740 +_080D9374: .4byte DestroyAnimSprite thumb_func_end sub_80D9328 thumb_func_start sub_80D9378 sub_80D9378: @ 80D9378 push {r4-r6,lr} adds r6, r0, 0 - ldr r0, _080D93F4 @ =gBattleAnimBankAttacker + ldr r0, _080D93F4 @ =gAnimBankAttacker ldrb r1, [r0] movs r0, 0x2 - ldr r2, _080D93F8 @ =gBattleAnimBankTarget + ldr r2, _080D93F8 @ =gAnimBankTarget eors r0, r1 ldrb r1, [r2] cmp r0, r1 @@ -483,7 +483,7 @@ _080D93A4: adds r0, r6, 0 movs r1, 0x1 bl sub_8078764 - ldr r0, _080D93F4 @ =gBattleAnimBankAttacker + ldr r0, _080D93F4 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -519,8 +519,8 @@ _080D93C2: pop {r0} bx r0 .align 2, 0 -_080D93F4: .4byte gBattleAnimBankAttacker -_080D93F8: .4byte gBattleAnimBankTarget +_080D93F4: .4byte gAnimBankAttacker +_080D93F8: .4byte gAnimBankTarget _080D93FC: .4byte gBattleAnimArgs _080D9400: .4byte sub_80D9404 thumb_func_end sub_80D9378 @@ -549,7 +549,7 @@ sub_80D9404: @ 80D9404 b _080D9436 _080D9430: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D9436: pop {r4} pop {r0} @@ -598,7 +598,7 @@ sub_80D9474: @ 80D9474 strh r0, [r4, 0x2E] ldr r0, _080D94A0 @ =sub_80782D8 str r0, [r4, 0x1C] - ldr r1, _080D94A4 @ =move_anim_8072740 + ldr r1, _080D94A4 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData pop {r4} @@ -606,7 +606,7 @@ sub_80D9474: @ 80D9474 bx r0 .align 2, 0 _080D94A0: .4byte sub_80782D8 -_080D94A4: .4byte move_anim_8072740 +_080D94A4: .4byte DestroyAnimSprite thumb_func_end sub_80D9474 thumb_func_start sub_80D94A8 @@ -643,16 +643,16 @@ sub_80D94CC: @ 80D94CC bne _080D9510 movs r0, 0x6 strh r0, [r5, 0x2E] - ldr r4, _080D9518 @ =gBattleAnimBankTarget + ldr r4, _080D9518 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] @@ -666,7 +666,7 @@ _080D9510: pop {r0} bx r0 .align 2, 0 -_080D9518: .4byte gBattleAnimBankTarget +_080D9518: .4byte gAnimBankTarget _080D951C: .4byte sub_8078B34 _080D9520: .4byte sub_80D9524 thumb_func_end sub_80D94CC @@ -678,13 +678,13 @@ sub_80D9524: @ 80D9524 strh r1, [r0, 0x2E] ldr r1, _080D9538 @ =sub_80782D8 str r1, [r0, 0x1C] - ldr r1, _080D953C @ =move_anim_8072740 + ldr r1, _080D953C @ =DestroyAnimSprite bl StoreSpriteCallbackInData pop {r0} bx r0 .align 2, 0 _080D9538: .4byte sub_80782D8 -_080D953C: .4byte move_anim_8072740 +_080D953C: .4byte DestroyAnimSprite thumb_func_end sub_80D9524 thumb_func_start sub_80D9540 @@ -754,7 +754,7 @@ _080D95BA: cmp r0, 0x78 ble _080D95C8 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D95C8: pop {r4} pop {r0} @@ -770,23 +770,23 @@ sub_80D95D0: @ 80D95D0 ldrsh r0, [r0, r1] cmp r0, 0 bne _080D95EC - ldr r4, _080D95E8 @ =gBattleAnimBankAttacker + ldr r4, _080D95E8 @ =gAnimBankAttacker b _080D95EE .align 2, 0 _080D95E4: .4byte gBattleAnimArgs -_080D95E8: .4byte gBattleAnimBankAttacker +_080D95E8: .4byte gAnimBankAttacker _080D95EC: - ldr r4, _080D9634 @ =gBattleAnimBankTarget + ldr r4, _080D9634 @ =gAnimBankTarget _080D95EE: ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -812,7 +812,7 @@ _080D95EE: pop {r0} bx r0 .align 2, 0 -_080D9634: .4byte gBattleAnimBankTarget +_080D9634: .4byte gAnimBankTarget _080D9638: .4byte gBattleAnimArgs _080D963C: .4byte sub_80D9640 thumb_func_end sub_80D95D0 @@ -840,7 +840,7 @@ _080D9652: cmp r0, 0 bne _080D966E adds r0, r1, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _080D96B0 _080D966E: ldrh r0, [r1, 0x2E] @@ -878,7 +878,7 @@ _080D969E: cmp r0, 0 bne _080D96B0 adds r0, r1, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D96B0: pop {r0} bx r0 @@ -895,10 +895,10 @@ sub_80D96B8: @ 80D96B8 ldrsh r0, [r6, r1] cmp r0, 0 bne _080D96E4 - ldr r4, _080D96E0 @ =gBattleAnimBankAttacker + ldr r4, _080D96E0 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r2, [r6, 0x4] @@ -906,12 +906,12 @@ sub_80D96B8: @ 80D96B8 b _080D96F6 .align 2, 0 _080D96DC: .4byte gBattleAnimArgs -_080D96E0: .4byte gBattleAnimBankAttacker +_080D96E0: .4byte gAnimBankAttacker _080D96E4: - ldr r4, _080D9740 @ =gBattleAnimBankTarget + ldr r4, _080D9740 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r6, 0x4] @@ -920,7 +920,7 @@ _080D96F6: strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r6, [r6, 0x6] @@ -954,7 +954,7 @@ _080D96F6: beq _080D975A b _080D978A .align 2, 0 -_080D9740: .4byte gBattleAnimBankTarget +_080D9740: .4byte gAnimBankTarget _080D9744: .4byte gBattleAnimArgs _080D9748: .4byte 0x000003ff _080D974C: .4byte 0xfffffc00 @@ -991,7 +991,7 @@ _080D9784: b _080D9792 _080D978A: adds r0, r5, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _080D9796 _080D9792: ldr r0, _080D979C @ =sub_80D97A0 @@ -1024,7 +1024,7 @@ sub_80D97A0: @ 80D97A0 cmp r0, 0x28 ble _080D97C8 adds r0, r1, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D97C8: pop {r0} bx r0 @@ -1042,17 +1042,17 @@ sub_80D97CC: @ 80D97CC ldr r4, _080D981C @ =gBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r0, _080D9820 @ =gBattleAnimBankAttacker + ldr r0, _080D9820 @ =gAnimBankAttacker ldrb r0, [r0] bl sub_8079ED4 movs r1, 0x3 @@ -1064,15 +1064,15 @@ sub_80D97CC: @ 80D97CC ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] - ldr r0, _080D9824 @ =gBattleAnimBankTarget + ldr r0, _080D9824 @ =gAnimBankTarget b _080D9844 .align 2, 0 _080D9818: .4byte gBattleAnimArgs _080D981C: .4byte gBankAttacker -_080D9820: .4byte gBattleAnimBankAttacker -_080D9824: .4byte gBattleAnimBankTarget +_080D9820: .4byte gAnimBankAttacker +_080D9824: .4byte gAnimBankTarget _080D9828: - ldr r0, _080D9860 @ =gBattleAnimBankTarget + ldr r0, _080D9860 @ =gAnimBankTarget ldrb r0, [r0] bl sub_8079ED4 movs r1, 0x3 @@ -1084,7 +1084,7 @@ _080D9828: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] - ldr r0, _080D9864 @ =gBattleAnimBankAttacker + ldr r0, _080D9864 @ =gAnimBankAttacker _080D9844: ldrb r0, [r0] strh r0, [r5, 0x3C] @@ -1100,8 +1100,8 @@ _080D9844: pop {r0} bx r0 .align 2, 0 -_080D9860: .4byte gBattleAnimBankTarget -_080D9864: .4byte gBattleAnimBankAttacker +_080D9860: .4byte gAnimBankTarget +_080D9864: .4byte gAnimBankAttacker _080D9868: .4byte sub_80D986C thumb_func_end sub_80D97CC @@ -1127,7 +1127,7 @@ sub_80D986C: @ 80D986C lsls r0, 24 lsrs r0, 24 movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] @@ -1137,7 +1137,7 @@ sub_80D986C: @ 80D986C lsls r0, 24 lsrs r0, 24 movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] @@ -1237,7 +1237,7 @@ sub_80D9934: @ 80D9934 cmp r4, r0 bge _080D997E adds r0, r7, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _080D99DC _080D997E: ldrh r0, [r7, 0x2E] @@ -1245,31 +1245,31 @@ _080D997E: strh r0, [r7, 0x2E] b _080D99DC _080D9986: - ldr r4, _080D99E8 @ =gBattleAnimBankAttacker + ldr r4, _080D99E8 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r2, _080D99EC @ =gBattleAnimBankTarget + ldr r2, _080D99EC @ =gAnimBankTarget mov r8, r2 ldrb r0, [r2] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 mov r1, r8 ldrb r0, [r1] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 subs r4, r6 strh r4, [r7, 0x2E] @@ -1291,8 +1291,8 @@ _080D99DC: pop {r0} bx r0 .align 2, 0 -_080D99E8: .4byte gBattleAnimBankAttacker -_080D99EC: .4byte gBattleAnimBankTarget +_080D99E8: .4byte gAnimBankAttacker +_080D99EC: .4byte gAnimBankTarget _080D99F0: .4byte sub_80D99F4 thumb_func_end sub_80D9934 @@ -1329,7 +1329,7 @@ sub_80D99F4: @ 80D99F4 ble _080D9A34 _080D9A2E: adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D9A34: pop {r0} bx r0 @@ -1347,29 +1347,29 @@ sub_80D9A38: @ 80D9A38 ldr r4, _080D9A70 @ =gBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r0, _080D9A74 @ =gBattleAnimBankTarget + ldr r0, _080D9A74 @ =gAnimBankTarget ldrb r4, [r0] - ldr r0, _080D9A78 @ =gBattleAnimBankAttacker + ldr r0, _080D9A78 @ =gAnimBankAttacker b _080D9A82 .align 2, 0 _080D9A6C: .4byte gBattleAnimArgs _080D9A70: .4byte gBankAttacker -_080D9A74: .4byte gBattleAnimBankTarget -_080D9A78: .4byte gBattleAnimBankAttacker +_080D9A74: .4byte gAnimBankTarget +_080D9A78: .4byte gAnimBankAttacker _080D9A7C: - ldr r0, _080D9AB4 @ =gBattleAnimBankAttacker + ldr r0, _080D9AB4 @ =gAnimBankAttacker ldrb r4, [r0] - ldr r0, _080D9AB8 @ =gBattleAnimBankTarget + ldr r0, _080D9AB8 @ =gAnimBankTarget _080D9A82: ldrb r0, [r0] bl sub_8079ED4 @@ -1382,7 +1382,7 @@ _080D9A82: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080D9ABC @@ -1395,8 +1395,8 @@ _080D9A82: subs r0, 0x47 b _080D9AD6 .align 2, 0 -_080D9AB4: .4byte gBattleAnimBankAttacker -_080D9AB8: .4byte gBattleAnimBankTarget +_080D9AB4: .4byte gAnimBankAttacker +_080D9AB8: .4byte gAnimBankTarget _080D9ABC: adds r0, r4, 0 bl GetBankSide @@ -1421,7 +1421,7 @@ _080D9ADC: strh r0, [r5, 0x30] adds r0, r4, 0 movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] @@ -1429,13 +1429,13 @@ _080D9ADC: strh r0, [r5, 0x34] adds r0, r4, 0 movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] adds r0, r5, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r1, _080D9B1C @ =move_anim_8072740 + ldr r1, _080D9B1C @ =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData ldr r0, _080D9B20 @ =sub_8078BB8 @@ -1444,7 +1444,7 @@ _080D9ADC: pop {r0} bx r0 .align 2, 0 -_080D9B1C: .4byte move_anim_8072740 +_080D9B1C: .4byte DestroyAnimSprite _080D9B20: .4byte sub_8078BB8 thumb_func_end sub_80D9A38 @@ -1459,7 +1459,7 @@ sub_80D9B24: @ 80D9B24 cmp r1, r0 bne _080D9B3A adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D9B3A: ldrh r0, [r4, 0x2E] adds r0, 0x1 @@ -1473,16 +1473,16 @@ _080D9B3A: sub_80D9B48: @ 80D9B48 push {r4-r6,lr} adds r5, r0, 0 - ldr r4, _080D9BC4 @ =gBattleAnimBankTarget + ldr r4, _080D9BC4 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -1495,7 +1495,7 @@ sub_80D9B48: @ 80D9B48 strh r0, [r5, 0x34] ldrh r0, [r1, 0x4] strh r0, [r5, 0x36] - ldr r0, _080D9BCC @ =gUnknown_0202F7C4 + ldr r0, _080D9BCC @ =gAnimMoveTurn ldrb r6, [r0] ldrb r0, [r4] bl GetBankSide @@ -1532,9 +1532,9 @@ _080D9BA6: pop {r0} bx r0 .align 2, 0 -_080D9BC4: .4byte gBattleAnimBankTarget +_080D9BC4: .4byte gAnimBankTarget _080D9BC8: .4byte gBattleAnimArgs -_080D9BCC: .4byte gUnknown_0202F7C4 +_080D9BCC: .4byte gAnimMoveTurn _080D9BD0: .4byte sub_80D9B24 thumb_func_end sub_80D9B48 @@ -1558,7 +1558,7 @@ _080D9BF0: movs r1, 0 bl sub_8078764 _080D9BF8: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080D9C0C @@ -1567,7 +1567,7 @@ _080D9BF8: bl StartSpriteAnim b _080D9C22 _080D9C0C: - ldr r0, _080D9C34 @ =gBattleAnimBankAttacker + ldr r0, _080D9C34 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -1579,16 +1579,16 @@ _080D9C0C: _080D9C22: ldr r0, _080D9C38 @ =sub_8078600 str r0, [r4, 0x1C] - ldr r1, _080D9C3C @ =move_anim_8072740 + ldr r1, _080D9C3C @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData pop {r4} pop {r0} bx r0 .align 2, 0 -_080D9C34: .4byte gBattleAnimBankAttacker +_080D9C34: .4byte gAnimBankAttacker _080D9C38: .4byte sub_8078600 -_080D9C3C: .4byte move_anim_8072740 +_080D9C3C: .4byte DestroyAnimSprite thumb_func_end sub_80D9BD4 thumb_func_start sub_80D9C40 @@ -1619,7 +1619,7 @@ sub_80D9C40: @ 80D9C40 cmp r0, 0x28 ble _080D9C7A adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D9C7A: pop {r4} pop {r0} @@ -1682,7 +1682,7 @@ _080D9CDE: ldrh r1, [r4, 0x1C] adds r0, r1 strh r0, [r4, 0x1C] - ldr r0, _080D9D0C @ =gBattleAnimBankTarget + ldr r0, _080D9D0C @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -1698,7 +1698,7 @@ _080D9CDE: adds r7, r1, 0 b _080D9D24 .align 2, 0 -_080D9D0C: .4byte gBattleAnimBankTarget +_080D9D0C: .4byte gAnimBankTarget _080D9D10: .4byte gUnknown_030041B0 _080D9D14: ldr r2, _080D9D64 @ =gUnknown_030041B0 diff --git a/asm/fire.s b/asm/fire.s index bafe1d7e1..dcf793e39 100755 --- a/asm/fire.s +++ b/asm/fire.s @@ -23,7 +23,7 @@ sub_80D4ED8: @ 80D4ED8 movs r0, 0xFE lsls r0, 8 strh r0, [r4, 0x36] - ldr r1, _080D4F10 @ =move_anim_8072740 + ldr r1, _080D4F10 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData ldr r1, _080D4F14 @ =sub_8078174 @@ -35,7 +35,7 @@ sub_80D4ED8: @ 80D4ED8 bx r0 .align 2, 0 _080D4F0C: .4byte gBattleAnimArgs -_080D4F10: .4byte move_anim_8072740 +_080D4F10: .4byte DestroyAnimSprite _080D4F14: .4byte sub_8078174 thumb_func_end sub_80D4ED8 @@ -60,7 +60,7 @@ sub_80D4F18: @ 80D4F18 strh r0, [r4, 0x32] ldr r0, _080D4F54 @ =sub_8078394 str r0, [r4, 0x1C] - ldr r1, _080D4F58 @ =move_anim_8072740 + ldr r1, _080D4F58 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData pop {r4,r5} @@ -69,7 +69,7 @@ sub_80D4F18: @ 80D4F18 .align 2, 0 _080D4F50: .4byte gBattleAnimArgs _080D4F54: .4byte sub_8078394 -_080D4F58: .4byte move_anim_8072740 +_080D4F58: .4byte DestroyAnimSprite thumb_func_end sub_80D4F18 thumb_func_start sub_80D4F5C @@ -77,7 +77,7 @@ sub_80D4F5C: @ 80D4F5C push {r4,lr} adds r4, r0, 0 bl sub_8078650 - ldr r0, _080D4F90 @ =gBattleAnimBankAttacker + ldr r0, _080D4F90 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -98,7 +98,7 @@ sub_80D4F5C: @ 80D4F5C adds r1, r2, 0 b _080D4FAE .align 2, 0 -_080D4F90: .4byte gBattleAnimBankAttacker +_080D4F90: .4byte gAnimBankAttacker _080D4F94: .4byte gBattleAnimArgs _080D4F98: ldr r1, _080D4FC4 @ =gBattleAnimArgs @@ -133,7 +133,7 @@ _080D4FC8: .4byte sub_80D5038 sub_80D4FCC: @ 80D4FCC push {r4,lr} adds r4, r0, 0 - ldr r0, _080D4FF8 @ =gBattleAnimBankAttacker + ldr r0, _080D4FF8 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -153,7 +153,7 @@ sub_80D4FCC: @ 80D4FCC adds r1, r2, 0 b _080D5018 .align 2, 0 -_080D4FF8: .4byte gBattleAnimBankAttacker +_080D4FF8: .4byte gAnimBankAttacker _080D4FFC: .4byte gBattleAnimArgs _080D5000: ldr r1, _080D5030 @ =gBattleAnimArgs @@ -225,7 +225,7 @@ sub_80D5074: @ 80D5074 push {r4,lr} adds r4, r0, 0 bl sub_8078650 - ldr r0, _080D5098 @ =gBattleAnimBankAttacker + ldr r0, _080D5098 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -238,7 +238,7 @@ sub_80D5074: @ 80D5074 strh r1, [r4, 0x20] b _080D50B2 .align 2, 0 -_080D5098: .4byte gBattleAnimBankAttacker +_080D5098: .4byte gAnimBankAttacker _080D509C: .4byte gBattleAnimArgs _080D50A0: ldr r0, _080D50E0 @ =gBattleAnimArgs diff --git a/asm/fire_2.s b/asm/fire_2.s index b96962bdf..6e8ea7ce4 100755 --- a/asm/fire_2.s +++ b/asm/fire_2.s @@ -11,11 +11,11 @@ sub_80D51A8: @ 80D51A8 push {r4-r6,lr} adds r6, r0, 0 - ldr r5, _080D5200 @ =gBattleAnimBankAttacker + ldr r5, _080D5200 @ =gAnimBankAttacker ldrb r0, [r5] bl GetBankSide adds r4, r0, 0 - ldr r0, _080D5204 @ =gBattleAnimBankTarget + ldr r0, _080D5204 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r4, 24 @@ -50,8 +50,8 @@ _080D51EE: pop {r0} bx r0 .align 2, 0 -_080D5200: .4byte gBattleAnimBankAttacker -_080D5204: .4byte gBattleAnimBankTarget +_080D5200: .4byte gAnimBankAttacker +_080D5204: .4byte gAnimBankTarget _080D5208: .4byte gBattleAnimArgs _080D520C: .4byte sub_8079534 thumb_func_end sub_80D51A8 @@ -110,10 +110,10 @@ sub_80D5254: @ 80D5254 strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] strh r0, [r5, 0x30] - ldr r4, _080D52A4 @ =gBattleAnimBankTarget + ldr r4, _080D52A4 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] @@ -121,7 +121,7 @@ sub_80D5254: @ 80D5254 strh r0, [r5, 0x34] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] @@ -134,7 +134,7 @@ _080D529E: pop {r0} bx r0 .align 2, 0 -_080D52A4: .4byte gBattleAnimBankTarget +_080D52A4: .4byte gAnimBankTarget _080D52A8: .4byte sub_80D52AC thumb_func_end sub_80D5254 @@ -148,16 +148,16 @@ sub_80D52AC: @ 80D52AC beq _080D52F4 movs r4, 0 strh r4, [r6, 0x2E] - ldr r5, _080D52EC @ =gBattleAnimBankTarget + ldr r5, _080D52EC @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x20] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x22] @@ -169,7 +169,7 @@ sub_80D52AC: @ 80D52AC bl _call_via_r1 b _080D531E .align 2, 0 -_080D52EC: .4byte gBattleAnimBankTarget +_080D52EC: .4byte gAnimBankTarget _080D52F0: .4byte sub_80D5324 _080D52F4: movs r1, 0x3C @@ -210,7 +210,7 @@ sub_80D5324: @ 80D5324 cmp r0, 0x1F bne _080D5340 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D5340: pop {r4} pop {r0} @@ -260,7 +260,7 @@ sub_80D5374: @ 80D5374 strh r0, [r4, 0x30] ldrh r0, [r1, 0x8] strh r0, [r4, 0x32] - ldr r1, _080D53AC @ =move_anim_8072740 + ldr r1, _080D53AC @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData ldr r0, _080D53B0 @ =sub_8078364 @@ -270,7 +270,7 @@ sub_80D5374: @ 80D5374 bx r0 .align 2, 0 _080D53A8: .4byte gBattleAnimArgs -_080D53AC: .4byte move_anim_8072740 +_080D53AC: .4byte DestroyAnimSprite _080D53B0: .4byte sub_8078364 thumb_func_end sub_80D5374 @@ -364,7 +364,7 @@ sub_80D541C: @ 80D541C cmp r0, r1 bne _080D5468 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D5468: pop {r4} pop {r0} @@ -400,7 +400,7 @@ sub_80D5470: @ 80D5470 adds r0, r2 ldrh r0, [r0, 0x22] strh r0, [r4, 0x10] - ldr r0, _080D54D8 @ =gBattleAnimBankAttacker + ldr r0, _080D54D8 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -420,7 +420,7 @@ sub_80D5470: @ 80D5470 .align 2, 0 _080D54D0: .4byte gTasks _080D54D4: .4byte gSprites -_080D54D8: .4byte gBattleAnimBankAttacker +_080D54D8: .4byte gAnimBankAttacker _080D54DC: .4byte sub_80D54E0 thumb_func_end sub_80D5470 @@ -826,7 +826,7 @@ sub_80D57C4: @ 80D57C4 lsls r0, 2 adds r0, r1 ldrh r4, [r0, 0x20] - ldr r0, _080D5818 @ =gBattleAnimBankAttacker + ldr r0, _080D5818 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -840,7 +840,7 @@ sub_80D57C4: @ 80D57C4 b _080D5826 .align 2, 0 _080D5814: .4byte gSprites -_080D5818: .4byte gBattleAnimBankAttacker +_080D5818: .4byte gAnimBankAttacker _080D581C: adds r0, r4, 0 adds r0, 0x10 diff --git a/asm/flying.s b/asm/flying.s index cf0b1053c..99cb11913 100755 --- a/asm/flying.s +++ b/asm/flying.s @@ -56,7 +56,7 @@ sub_80DA05C: @ 80DA05C cmp r0, 0x47 bne _080DA096 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DA096: pop {r4} pop {r0} @@ -175,7 +175,7 @@ sub_80DA16C: @ 80DA16C adds r6, r0, 0 movs r1, 0x1 bl sub_80787B0 - ldr r0, _080DA1D8 @ =gBattleAnimBankAttacker + ldr r0, _080DA1D8 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -191,10 +191,10 @@ _080DA18C: strh r0, [r6, 0x2E] ldrh r0, [r6, 0x20] strh r0, [r6, 0x30] - ldr r5, _080DA1E0 @ =gBattleAnimBankTarget + ldr r5, _080DA1E0 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x4] @@ -204,7 +204,7 @@ _080DA18C: strh r0, [r6, 0x34] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r4, [r4, 0x6] @@ -221,9 +221,9 @@ _080DA18C: pop {r0} bx r0 .align 2, 0 -_080DA1D8: .4byte gBattleAnimBankAttacker +_080DA1D8: .4byte gAnimBankAttacker _080DA1DC: .4byte gBattleAnimArgs -_080DA1E0: .4byte gBattleAnimBankTarget +_080DA1E0: .4byte gAnimBankTarget _080DA1E4: .4byte sub_80785E4 _080DA1E8: .4byte sub_80DA1EC thumb_func_end sub_80DA16C @@ -237,7 +237,7 @@ sub_80DA1EC: @ 80DA1EC cmp r0, 0 beq _080DA200 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DA200: pop {r4} pop {r0} @@ -248,7 +248,7 @@ _080DA200: sub_80DA208: @ 80DA208 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _080DA2A4 @ =gBattleAnimBankAttacker + ldr r4, _080DA2A4 @ =gAnimBankAttacker ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -268,7 +268,7 @@ sub_80DA208: @ 80DA208 negs r0, r0 strh r0, [r1, 0x6] _080DA234: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DA24C @@ -282,13 +282,13 @@ _080DA234: _080DA24C: ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 ldr r2, _080DA2A8 @ =gBattleAnimArgs ldrh r1, [r2] @@ -305,26 +305,26 @@ _080DA24C: ldrsh r0, [r2, r3] cmp r0, 0 bne _080DA2B0 - ldr r4, _080DA2AC @ =gBattleAnimBankTarget + ldr r4, _080DA2AC @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] b _080DA2C2 .align 2, 0 -_080DA2A4: .4byte gBattleAnimBankAttacker +_080DA2A4: .4byte gAnimBankAttacker _080DA2A8: .4byte gBattleAnimArgs -_080DA2AC: .4byte gBattleAnimBankTarget +_080DA2AC: .4byte gAnimBankTarget _080DA2B0: - ldr r0, _080DA2F0 @ =gBattleAnimBankTarget + ldr r0, _080DA2F0 @ =gAnimBankTarget ldrb r0, [r0] adds r2, r5, 0 adds r2, 0x32 @@ -344,7 +344,7 @@ _080DA2C2: strh r0, [r5, 0x36] ldr r0, _080DA2F8 @ =sub_8078B34 str r0, [r5, 0x1C] - ldr r1, _080DA2FC @ =move_anim_8072740 + ldr r1, _080DA2FC @ =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData ldrb r1, [r4, 0xA] @@ -354,10 +354,10 @@ _080DA2C2: pop {r0} bx r0 .align 2, 0 -_080DA2F0: .4byte gBattleAnimBankTarget +_080DA2F0: .4byte gAnimBankTarget _080DA2F4: .4byte gBattleAnimArgs _080DA2F8: .4byte sub_8078B34 -_080DA2FC: .4byte move_anim_8072740 +_080DA2FC: .4byte DestroyAnimSprite thumb_func_end sub_80DA208 thumb_func_start sub_80DA300 @@ -429,7 +429,7 @@ _080DA36E: cmp r0, r1 bge _080DA386 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DA386: pop {r0} bx r0 @@ -439,7 +439,7 @@ _080DA386: sub_80DA38C: @ 80DA38C push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _080DA3B4 @ =gBattleAnimBankAttacker + ldr r0, _080DA3B4 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -455,7 +455,7 @@ sub_80DA38C: @ 80DA38C bl StartSpriteAffineAnim b _080DA3C2 .align 2, 0 -_080DA3B4: .4byte gBattleAnimBankAttacker +_080DA3B4: .4byte gAnimBankAttacker _080DA3B8: .4byte 0x0000ffe0 _080DA3BC: ldr r0, _080DA400 @ =0x0000ffe0 @@ -467,10 +467,10 @@ _080DA3C2: strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] strh r0, [r5, 0x30] - ldr r4, _080DA408 @ =gBattleAnimBankTarget + ldr r4, _080DA408 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] @@ -478,7 +478,7 @@ _080DA3C2: strh r0, [r5, 0x34] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] @@ -492,7 +492,7 @@ _080DA3C2: .align 2, 0 _080DA400: .4byte 0x0000ffe0 _080DA404: .4byte gBattleAnimArgs -_080DA408: .4byte gBattleAnimBankTarget +_080DA408: .4byte gAnimBankTarget _080DA40C: .4byte sub_80DA410 thumb_func_end sub_80DA38C @@ -552,7 +552,7 @@ _080DA45A: ands r0, r2 strb r0, [r1] adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DA480: pop {r4} pop {r0} @@ -617,13 +617,13 @@ sub_80DA4D8: @ 80DA4D8 ands r0, r1 cmp r0, 0 beq _080DA500 - ldr r0, _080DA4FC @ =gBattleAnimBankAttacker + ldr r0, _080DA4FC @ =gAnimBankAttacker b _080DA502 .align 2, 0 _080DA4F8: .4byte gBattleAnimArgs -_080DA4FC: .4byte gBattleAnimBankAttacker +_080DA4FC: .4byte gAnimBankAttacker _080DA500: - ldr r0, _080DA5B0 @ =gBattleAnimBankTarget + ldr r0, _080DA5B0 @ =gAnimBankTarget _080DA502: ldrb r6, [r0] adds r0, r6, 0 @@ -638,7 +638,7 @@ _080DA502: _080DA518: adds r0, r6, 0 movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 ldr r4, _080DA5B4 @ =gBattleAnimArgs lsrs r0, 24 @@ -647,7 +647,7 @@ _080DA518: strh r0, [r7, 0x20] adds r0, r6, 0 movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 ldrh r1, [r4, 0x2] lsrs r0, 24 @@ -710,7 +710,7 @@ _080DA518: strb r1, [r7, 0x5] b _080DA5D8 .align 2, 0 -_080DA5B0: .4byte gBattleAnimBankTarget +_080DA5B0: .4byte gAnimBankTarget _080DA5B4: .4byte gBattleAnimArgs _080DA5B8: .4byte gMain _080DA5BC: .4byte 0x0000043d @@ -1718,7 +1718,7 @@ _080DAD2C: .4byte sub_80DA48C sub_80DAD30: @ 80DAD30 push {r4,r5,lr} adds r4, r0, 0 - ldr r0, _080DAD78 @ =gBattleAnimBankTarget + ldr r0, _080DAD78 @ =gAnimBankTarget ldrb r0, [r0] bl sub_8079ED4 movs r1, 0x3 @@ -1730,16 +1730,16 @@ sub_80DAD30: @ 80DAD30 ands r0, r2 orrs r0, r1 strb r0, [r4, 0x5] - ldr r5, _080DAD7C @ =gBattleAnimBankAttacker + ldr r5, _080DAD7C @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x20] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] @@ -1749,8 +1749,8 @@ sub_80DAD30: @ 80DAD30 pop {r0} bx r0 .align 2, 0 -_080DAD78: .4byte gBattleAnimBankTarget -_080DAD7C: .4byte gBattleAnimBankAttacker +_080DAD78: .4byte gAnimBankTarget +_080DAD7C: .4byte gAnimBankAttacker _080DAD80: .4byte sub_807941C thumb_func_end sub_80DAD30 @@ -1774,7 +1774,7 @@ sub_80DAD84: @ 80DAD84 cmp r0, 0 beq _080DAE44 ldr r0, _080DADD8 @ =gBanksBySide - ldr r1, _080DADDC @ =gBattleAnimBankTarget + ldr r1, _080DADDC @ =gAnimBankTarget ldrb r2, [r1] adds r0, r2, r0 ldrb r1, [r0] @@ -1784,7 +1784,7 @@ sub_80DAD84: @ 80DAD84 beq _080DADE0 adds r0, r2, 0 movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r5, [r5, 0x6] @@ -1795,11 +1795,11 @@ _080DADCC: .4byte gBattleAnimArgs _080DADD0: .4byte gMain _080DADD4: .4byte 0x0000043d _080DADD8: .4byte gBanksBySide -_080DADDC: .4byte gBattleAnimBankTarget +_080DADDC: .4byte gAnimBankTarget _080DADE0: adds r0, r2, 0 movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, 0x28 @@ -1810,7 +1810,7 @@ _080DADEE: ldrsh r0, [r0, r1] cmp r0, 0 beq _080DAE24 - ldr r0, _080DAE20 @ =gBattleAnimBankTarget + ldr r0, _080DAE20 @ =gAnimBankTarget ldrb r0, [r0] bl sub_8079ED4 lsls r0, 24 @@ -1828,9 +1828,9 @@ _080DADEE: b _080DAE58 .align 2, 0 _080DAE1C: .4byte gBattleAnimArgs -_080DAE20: .4byte gBattleAnimBankTarget +_080DAE20: .4byte gAnimBankTarget _080DAE24: - ldr r0, _080DAE40 @ =gBattleAnimBankTarget + ldr r0, _080DAE40 @ =gAnimBankTarget ldrb r0, [r0] bl sub_8079ED4 movs r1, 0x3 @@ -1844,12 +1844,12 @@ _080DAE24: strb r0, [r4, 0x5] b _080DAE58 .align 2, 0 -_080DAE40: .4byte gBattleAnimBankTarget +_080DAE40: .4byte gAnimBankTarget _080DAE44: - ldr r0, _080DAEFC @ =gBattleAnimBankTarget + ldr r0, _080DAEFC @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r5, [r5, 0x6] @@ -1940,7 +1940,7 @@ _080DAEF2: pop {r0} bx r0 .align 2, 0 -_080DAEFC: .4byte gBattleAnimBankTarget +_080DAEFC: .4byte gAnimBankTarget _080DAF00: .4byte gSineTable _080DAF04: .4byte gOamMatrices _080DAF08: .4byte sub_80DAF0C @@ -2100,7 +2100,7 @@ _080DB024: ldrsh r0, [r4, r2] cmp r0, 0 bne _080DB03C - ldr r0, _080DB090 @ =gBattleAnimBankAttacker + ldr r0, _080DB090 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -2111,7 +2111,7 @@ _080DB03C: ldrsh r0, [r4, r1] cmp r0, 0x1 bne _080DB058 - ldr r0, _080DB094 @ =gBattleAnimBankTarget + ldr r0, _080DB094 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -2149,8 +2149,8 @@ _080DB058: bx r0 .align 2, 0 _080DB08C: .4byte gBattleAnimArgs -_080DB090: .4byte gBattleAnimBankAttacker -_080DB094: .4byte gBattleAnimBankTarget +_080DB090: .4byte gAnimBankAttacker +_080DB094: .4byte gAnimBankTarget _080DB098: .4byte 0x00000ccc _080DB09C: .4byte sub_80DB0A0 thumb_func_end sub_80DB000 @@ -2188,7 +2188,7 @@ _080DB0CA: cmp r0, r1 bne _080DB0E2 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DB0E2: pop {r4} pop {r0} @@ -2236,16 +2236,16 @@ sub_80DB0E8: @ 80DB0E8 strh r0, [r4, 0x6] ldr r0, _080DB18C @ =gBattleAnimSpriteTemplate_83DB538 mov r8, r0 - ldr r5, _080DB190 @ =gBattleAnimBankTarget + ldr r5, _080DB190 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 @@ -2274,7 +2274,7 @@ _080DB180: .4byte gTasks _080DB184: .4byte gAnimVisualTaskCount _080DB188: .4byte gBattleAnimArgs _080DB18C: .4byte gBattleAnimSpriteTemplate_83DB538 -_080DB190: .4byte gBattleAnimBankTarget +_080DB190: .4byte gAnimBankTarget thumb_func_end sub_80DB0E8 thumb_func_start sub_80DB194 @@ -2321,7 +2321,7 @@ _080DB1D8: cmp r0, 0 beq _080DB1EC adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DB1EC: pop {r4} pop {r0} @@ -2346,10 +2346,10 @@ _080DB20A: beq _080DB240 b _080DB27E _080DB210: - ldr r0, _080DB228 @ =gBattleAnimBankTarget + ldr r0, _080DB228 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] @@ -2358,7 +2358,7 @@ _080DB210: strh r0, [r4, 0x26] b _080DB238 .align 2, 0 -_080DB228: .4byte gBattleAnimBankTarget +_080DB228: .4byte gAnimBankTarget _080DB22C: ldrh r0, [r4, 0x26] adds r0, 0xA @@ -2400,7 +2400,7 @@ _080DB240: ands r0, r2 strb r0, [r1] adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DB27E: pop {r4} pop {r0} @@ -2532,7 +2532,7 @@ _080DB360: cmp r0, 0 ble _080DB36E adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DB36E: pop {r0} bx r0 @@ -2556,23 +2556,23 @@ _080DB388: ldrsh r0, [r0, r2] cmp r0, 0 bne _080DB3A0 - ldr r4, _080DB39C @ =gBattleAnimBankAttacker + ldr r4, _080DB39C @ =gAnimBankAttacker b _080DB3A2 .align 2, 0 _080DB398: .4byte gBattleAnimArgs -_080DB39C: .4byte gBattleAnimBankAttacker +_080DB39C: .4byte gAnimBankAttacker _080DB3A0: - ldr r4, _080DB3DC @ =gBattleAnimBankTarget + ldr r4, _080DB3DC @ =gAnimBankTarget _080DB3A2: ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -2591,7 +2591,7 @@ _080DB3A2: strh r0, [r5, 0x2E] b _080DB44C .align 2, 0 -_080DB3DC: .4byte gBattleAnimBankTarget +_080DB3DC: .4byte gAnimBankTarget _080DB3E0: movs r1, 0x32 ldrsh r0, [r5, r1] @@ -2645,7 +2645,7 @@ _080DB42C: adds r0, r5, 0 bl sub_8079098 adds r0, r5, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DB44C: add sp, 0x4 pop {r4,r5} @@ -2716,23 +2716,23 @@ _080DB4C0: ldrsh r0, [r2, r1] cmp r0, 0 bne _080DB4D4 - ldr r4, _080DB4D0 @ =gBattleAnimBankAttacker + ldr r4, _080DB4D0 @ =gAnimBankAttacker b _080DB4D6 .align 2, 0 _080DB4CC: .4byte gBattleAnimArgs -_080DB4D0: .4byte gBattleAnimBankAttacker +_080DB4D0: .4byte gAnimBankAttacker _080DB4D4: - ldr r4, _080DB500 @ =gBattleAnimBankTarget + ldr r4, _080DB500 @ =gAnimBankTarget _080DB4D6: ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, 0x20 @@ -2743,7 +2743,7 @@ _080DB4D6: pop {r0} bx r0 .align 2, 0 -_080DB500: .4byte gBattleAnimBankTarget +_080DB500: .4byte gAnimBankTarget _080DB504: .4byte sub_80DB508 thumb_func_end sub_80DB458 @@ -2793,7 +2793,7 @@ _080DB54A: cmp r0, 0x1F bne _080DB55E adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DB55E: pop {r4} pop {r0} @@ -2866,7 +2866,7 @@ _080DB58A: b _080DB5DE _080DB5D8: adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DB5DE: pop {r0} bx r0 @@ -2882,17 +2882,17 @@ sub_80DB5E4: @ 80DB5E4 mov r8, r0 ldrh r4, [r0, 0x20] ldrh r5, [r0, 0x22] - ldr r6, _080DB698 @ =gBattleAnimBankAttacker + ldr r6, _080DB698 @ =gAnimBankAttacker ldrb r0, [r6] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 mov r1, r8 strh r0, [r1, 0x20] ldrb r0, [r6] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 @@ -2958,7 +2958,7 @@ sub_80DB5E4: @ 80DB5E4 pop {r0} bx r0 .align 2, 0 -_080DB698: .4byte gBattleAnimBankAttacker +_080DB698: .4byte gAnimBankAttacker _080DB69C: .4byte sub_80DB6A0 thumb_func_end sub_80DB5E4 diff --git a/asm/ghost.s b/asm/ghost.s index 09458dec1..0db176d08 100755 --- a/asm/ghost.s +++ b/asm/ghost.s @@ -18,10 +18,10 @@ sub_80DDB6C: @ 80DDB6C strh r0, [r4, 0x2E] ldrh r0, [r4, 0x20] strh r0, [r4, 0x30] - ldr r5, _080DDBCC @ =gBattleAnimBankTarget + ldr r5, _080DDBCC @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] @@ -29,7 +29,7 @@ sub_80DDB6C: @ 80DDB6C strh r0, [r4, 0x34] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] @@ -52,7 +52,7 @@ sub_80DDB6C: @ 80DDB6C bx r0 .align 2, 0 _080DDBC8: .4byte gBattleAnimArgs -_080DDBCC: .4byte gBattleAnimBankTarget +_080DDBCC: .4byte gAnimBankTarget _080DDBD0: .4byte sub_80DDBD8 _080DDBD4: .4byte REG_BLDCNT thumb_func_end sub_80DDB6C @@ -334,7 +334,7 @@ _080DDDB6: cmp r0, 0x3D bne _080DDDE8 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DDDE8: pop {r4} pop {r0} @@ -520,11 +520,11 @@ sub_80DDF40: @ 80DDF40 adds r4, r0, 0 ldrh r5, [r4, 0x20] ldrh r6, [r4, 0x22] - ldr r0, _080DDFDC @ =gBattleAnimBankAttacker + ldr r0, _080DDFDC @ =gAnimBankAttacker mov r8, r0 ldrb r0, [r0] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 movs r1, 0 @@ -533,7 +533,7 @@ sub_80DDF40: @ 80DDF40 mov r1, r8 ldrb r0, [r1] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] @@ -587,7 +587,7 @@ sub_80DDF40: @ 80DDF40 pop {r0} bx r0 .align 2, 0 -_080DDFDC: .4byte gBattleAnimBankAttacker +_080DDFDC: .4byte gAnimBankAttacker _080DDFE0: .4byte gBattleAnimArgs _080DDFE4: .4byte sub_80DDFE8 thumb_func_end sub_80DDF40 @@ -640,16 +640,16 @@ _080DE032: lsls r0, 16 cmp r0, 0 bgt _080DE0F6 - ldr r4, _080DE098 @ =gBattleAnimBankTarget + ldr r4, _080DE098 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x30] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] @@ -681,7 +681,7 @@ _080DE032: strh r0, [r5, 0x3C] b _080DE0E2 .align 2, 0 -_080DE098: .4byte gBattleAnimBankTarget +_080DE098: .4byte gAnimBankTarget _080DE09C: ldrh r0, [r5, 0x3A] ldrh r1, [r5, 0x36] @@ -703,16 +703,16 @@ _080DE09C: lsls r0, 16 cmp r0, 0 bgt _080DE0F6 - ldr r4, _080DE0EC @ =gBattleAnimBankTarget + ldr r4, _080DE0EC @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -722,7 +722,7 @@ _080DE0E2: strh r0, [r5, 0x2E] b _080DE0F6 .align 2, 0 -_080DE0EC: .4byte gBattleAnimBankTarget +_080DE0EC: .4byte gAnimBankTarget _080DE0F0: adds r0, r5, 0 bl move_anim_8074EE0 @@ -824,7 +824,7 @@ _080DE198: cmp r6, 0 beq _080DE1A4 adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _080DE1AA _080DE1A4: ldrh r0, [r3, 0x30] @@ -886,7 +886,7 @@ _080DE1E0: adds r0, r4 movs r1, 0x50 strh r1, [r0, 0x2E] - ldr r0, _080DE250 @ =gBattleAnimBankTarget + ldr r0, _080DE250 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -912,7 +912,7 @@ _080DE1E0: _080DE244: .4byte REG_BLDCNT _080DE248: .4byte REG_BLDALPHA _080DE24C: .4byte gSprites -_080DE250: .4byte gBattleAnimBankTarget +_080DE250: .4byte gAnimBankTarget _080DE254: .4byte 0x0000ff70 _080DE258: movs r2, 0x8 @@ -1125,7 +1125,7 @@ sub_80DE3D4: @ 80DE3D4 lsls r0, 3 ldr r1, _080DE40C @ =gTasks adds r5, r0, r1 - ldr r0, _080DE410 @ =gBattleAnimBankTarget + ldr r0, _080DE410 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -1143,7 +1143,7 @@ _080DE400: mov pc, r0 .align 2, 0 _080DE40C: .4byte gTasks -_080DE410: .4byte gBattleAnimBankTarget +_080DE410: .4byte gAnimBankTarget _080DE414: .4byte _080DE418 .align 2, 0 _080DE418: @@ -1485,7 +1485,7 @@ sub_80DE6B0: @ 80DE6B0 lsls r0, 3 ldr r1, _080DE6E0 @ =gTasks adds r4, r0, r1 - ldr r0, _080DE6E4 @ =gBattleAnimBankTarget + ldr r0, _080DE6E4 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -1501,7 +1501,7 @@ sub_80DE6B0: @ 80DE6B0 b _080DE7AA .align 2, 0 _080DE6E0: .4byte gTasks -_080DE6E4: .4byte gBattleAnimBankTarget +_080DE6E4: .4byte gAnimBankTarget _080DE6E8: cmp r0, 0x2 beq _080DE740 @@ -1617,54 +1617,54 @@ sub_80DE7B8: @ 80DE7B8 ldrsh r0, [r0, r1] cmp r0, 0 bne _080DE800 - ldr r4, _080DE7F8 @ =gBattleAnimBankAttacker + ldr r4, _080DE7F8 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r6, r0, 24 ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 8 movs r2, 0xE0 lsls r2, 13 adds r0, r2 lsrs r5, r0, 16 - ldr r4, _080DE7FC @ =gBattleAnimBankTarget + ldr r4, _080DE7FC @ =gAnimBankTarget b _080DE824 .align 2, 0 _080DE7F4: .4byte gBattleAnimArgs -_080DE7F8: .4byte gBattleAnimBankAttacker -_080DE7FC: .4byte gBattleAnimBankTarget +_080DE7F8: .4byte gAnimBankAttacker +_080DE7FC: .4byte gAnimBankTarget _080DE800: - ldr r4, _080DE8C8 @ =gBattleAnimBankTarget + ldr r4, _080DE8C8 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r6, r0, 24 ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 8 movs r2, 0xE0 lsls r2, 13 adds r0, r2 lsrs r5, r0, 16 - ldr r4, _080DE8CC @ =gBattleAnimBankAttacker + ldr r4, _080DE8CC @ =gAnimBankAttacker _080DE824: ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 mov r10, r0 ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 8 movs r1, 0xE0 @@ -1734,8 +1734,8 @@ _080DE824: pop {r0} bx r0 .align 2, 0 -_080DE8C8: .4byte gBattleAnimBankTarget -_080DE8CC: .4byte gBattleAnimBankAttacker +_080DE8C8: .4byte gAnimBankTarget +_080DE8CC: .4byte gAnimBankAttacker _080DE8D0: .4byte gBattleAnimArgs _080DE8D4: .4byte sub_80DE8D8 thumb_func_end sub_80DE7B8 @@ -1813,10 +1813,10 @@ sub_80DE918: @ 80DE918 ldr r2, _080DEA70 @ =gBattleAnimArgs ldrh r0, [r2] strh r0, [r1, 0x1C] - ldr r4, _080DEA74 @ =gBattleAnimBankAttacker + ldr r4, _080DEA74 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x4] @@ -1826,7 +1826,7 @@ sub_80DE918: @ 80DE918 lsls r0, 16 lsrs r0, 16 str r0, [sp, 0x8] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DE988 @@ -1836,7 +1836,7 @@ _080DE988: _080DE98A: lsls r1, r4, 16 asrs r3, r1, 16 - ldr r0, _080DEA74 @ =gBattleAnimBankAttacker + ldr r0, _080DEA74 @ =gAnimBankAttacker ldrb r2, [r0] str r1, [sp, 0x10] cmp r3, r2 @@ -1868,7 +1868,7 @@ _080DE98A: beq _080DEA56 adds r0, r4, 0 movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 mov r10, r0 @@ -1944,7 +1944,7 @@ _080DEA56: _080DEA68: .4byte gTasks _080DEA6C: .4byte REG_BLDCNT _080DEA70: .4byte gBattleAnimArgs -_080DEA74: .4byte gBattleAnimBankAttacker +_080DEA74: .4byte gAnimBankAttacker _080DEA78: .4byte gSpriteTemplate_83DAF08 _080DEA7C: .4byte gSprites _080DEA80: .4byte gSprites + 0x1C @@ -2240,10 +2240,10 @@ sub_80DECB0: @ 80DECB0 push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080DECF8 @ =gUnknown_030042C4 + ldr r0, _080DECF8 @ =gBattle_WIN0H movs r1, 0 strh r1, [r0] - ldr r0, _080DECFC @ =gUnknown_03004240 + ldr r0, _080DECFC @ =gBattle_WIN0V strh r1, [r0] ldr r1, _080DED00 @ =REG_WININ ldr r2, _080DED04 @ =0x00003f3f @@ -2259,13 +2259,13 @@ sub_80DECB0: @ 80DECB0 adds r1, 0x4 movs r0, 0x10 strh r0, [r1] - ldr r0, _080DED08 @ =gBattleAnimBankAttacker + ldr r0, _080DED08 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080DECF4 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DED0C @@ -2273,21 +2273,21 @@ _080DECF4: movs r6, 0x28 b _080DED0E .align 2, 0 -_080DECF8: .4byte gUnknown_030042C4 -_080DECFC: .4byte gUnknown_03004240 +_080DECF8: .4byte gBattle_WIN0H +_080DECFC: .4byte gBattle_WIN0V _080DED00: .4byte REG_WININ _080DED04: .4byte 0x00003f3f -_080DED08: .4byte gBattleAnimBankAttacker +_080DED08: .4byte gAnimBankAttacker _080DED0C: movs r6, 0xC8 _080DED0E: - ldr r1, _080DED4C @ =gUnknown_030042C4 + ldr r1, _080DED4C @ =gBattle_WIN0H lsls r3, r6, 16 asrs r2, r3, 16 lsls r0, r2, 8 orrs r0, r2 strh r0, [r1] - ldr r1, _080DED50 @ =gUnknown_03004240 + ldr r1, _080DED50 @ =gBattle_WIN0V movs r5, 0x28 ldr r0, _080DED54 @ =0x00002828 strh r0, [r1] @@ -2312,8 +2312,8 @@ _080DED0E: pop {r0} bx r0 .align 2, 0 -_080DED4C: .4byte gUnknown_030042C4 -_080DED50: .4byte gUnknown_03004240 +_080DED4C: .4byte gBattle_WIN0H +_080DED50: .4byte gBattle_WIN0V _080DED54: .4byte 0x00002828 _080DED58: .4byte gTasks _080DED5C: .4byte sub_80DED60 @@ -2470,12 +2470,12 @@ _080DEE8C: ldr r0, _080DEEDC @ =sub_80DEEE8 str r0, [r4] _080DEEBA: - ldr r1, _080DEEE0 @ =gUnknown_030042C4 + ldr r1, _080DEEE0 @ =gBattle_WIN0H mov r2, r9 lsls r0, r2, 8 orrs r7, r0 strh r7, [r1] - ldr r1, _080DEEE4 @ =gUnknown_03004240 + ldr r1, _080DEEE4 @ =gBattle_WIN0V lsls r0, r6, 8 orrs r5, r0 strh r5, [r1] @@ -2489,8 +2489,8 @@ _080DEEBA: bx r0 .align 2, 0 _080DEEDC: .4byte sub_80DEEE8 -_080DEEE0: .4byte gUnknown_030042C4 -_080DEEE4: .4byte gUnknown_03004240 +_080DEEE0: .4byte gBattle_WIN0H +_080DEEE4: .4byte gBattle_WIN0V thumb_func_end sub_80DED60 thumb_func_start sub_80DEEE8 @@ -2506,9 +2506,9 @@ sub_80DEEE8: @ 80DEEE8 lsrs r2, r0, 24 cmp r2, 0 bne _080DEF20 - ldr r0, _080DEF2C @ =gUnknown_030042C4 + ldr r0, _080DEF2C @ =gBattle_WIN0H strh r2, [r0] - ldr r0, _080DEF30 @ =gUnknown_03004240 + ldr r0, _080DEF30 @ =gBattle_WIN0V strh r2, [r0] ldr r0, _080DEF34 @ =REG_WININ ldr r4, _080DEF38 @ =0x00003f3f @@ -2528,8 +2528,8 @@ _080DEF20: bx r0 .align 2, 0 _080DEF28: .4byte gPaletteFade -_080DEF2C: .4byte gUnknown_030042C4 -_080DEF30: .4byte gUnknown_03004240 +_080DEF2C: .4byte gBattle_WIN0H +_080DEF30: .4byte gBattle_WIN0V _080DEF34: .4byte REG_WININ _080DEF38: .4byte 0x00003f3f thumb_func_end sub_80DEEE8 @@ -2540,7 +2540,7 @@ sub_80DEF3C: @ 80DEF3C adds r4, r0, 0 movs r1, 0x1 bl sub_80787B0 - ldr r0, _080DEF68 @ =gBattleAnimBankAttacker + ldr r0, _080DEF68 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -2557,7 +2557,7 @@ sub_80DEF3C: @ 80DEF3C strb r1, [r4, 0x3] b _080DEF74 .align 2, 0 -_080DEF68: .4byte gBattleAnimBankAttacker +_080DEF68: .4byte gAnimBankAttacker _080DEF6C: .4byte 0x0000fffe _080DEF70: ldr r2, _080DEF90 @ =0x0000ffe8 @@ -2722,17 +2722,17 @@ sub_80DF090: @ 80DF090 strh r2, [r1] adds r1, 0x2 strh r2, [r1] - ldr r1, _080DF0B0 @ =gUnknown_030042C4 + ldr r1, _080DF0B0 @ =gBattle_WIN0H strh r2, [r1] - ldr r1, _080DF0B4 @ =gUnknown_03004240 + ldr r1, _080DF0B4 @ =gBattle_WIN0V strh r2, [r1] - bl move_anim_8072740 + bl DestroyAnimSprite pop {r0} bx r0 .align 2, 0 _080DF0AC: .4byte REG_BLDCNT -_080DF0B0: .4byte gUnknown_030042C4 -_080DF0B4: .4byte gUnknown_03004240 +_080DF0B0: .4byte gBattle_WIN0H +_080DF0B4: .4byte gBattle_WIN0V thumb_func_end sub_80DF090 thumb_func_start sub_80DF0B8 @@ -2744,7 +2744,7 @@ sub_80DF0B8: @ 80DF0B8 movs r1, 0xC bl Sin strh r0, [r4, 0x24] - ldr r0, _080DF120 @ =gBattleAnimBankAttacker + ldr r0, _080DF120 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -2788,7 +2788,7 @@ _080DF0DC: strh r0, [r1] b _080DF17E .align 2, 0 -_080DF120: .4byte gBattleAnimBankAttacker +_080DF120: .4byte gAnimBankAttacker _080DF124: .4byte 0x0000050b _080DF128: .4byte REG_BLDCNT _080DF12C: @@ -2852,7 +2852,7 @@ sub_80DF18C: @ 80DF18C strh r2, [r1] adds r1, 0x2 strh r2, [r1] - bl move_anim_8072740 + bl DestroyAnimSprite pop {r0} bx r0 .align 2, 0 @@ -2877,10 +2877,10 @@ sub_80DF1A4: @ 80DF1A4 mov r8, r0 mov r2, r8 strh r2, [r4, 0xA] - ldr r5, _080DF240 @ =gBattleAnimBankAttacker + ldr r5, _080DF240 @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1A] @@ -2934,7 +2934,7 @@ sub_80DF1A4: @ 80DF1A4 bx r0 .align 2, 0 _080DF23C: .4byte gTasks -_080DF240: .4byte gBattleAnimBankAttacker +_080DF240: .4byte gAnimBankAttacker _080DF244: .4byte REG_BLDCNT _080DF248: .4byte sub_80DF24C thumb_func_end sub_80DF1A4 @@ -2991,7 +2991,7 @@ _080DF292: lsls r0, 2 adds r5, r0, r1 strh r7, [r5, 0x2E] - ldr r0, _080DF2FC @ =gBattleAnimBankAttacker + ldr r0, _080DF2FC @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide movs r1, 0 @@ -3025,7 +3025,7 @@ _080DF2E6: .align 2, 0 _080DF2F4: .4byte gSpriteTemplate_83DAF80 _080DF2F8: .4byte gSprites -_080DF2FC: .4byte gBattleAnimBankAttacker +_080DF2FC: .4byte gAnimBankAttacker _080DF300: ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -3258,7 +3258,7 @@ sub_80DF49C: @ 80DF49C orrs r1, r2 strb r1, [r3] ldr r2, _080DF4E0 @ =gObjectBankIDs - ldr r1, _080DF4E4 @ =gBattleAnimBankAttacker + ldr r1, _080DF4E4 @ =gAnimBankAttacker ldrb r1, [r1] adds r1, r2 ldrb r1, [r1] @@ -3287,7 +3287,7 @@ sub_80DF49C: @ 80DF49C bx lr .align 2, 0 _080DF4E0: .4byte gObjectBankIDs -_080DF4E4: .4byte gBattleAnimBankAttacker +_080DF4E4: .4byte gAnimBankAttacker _080DF4E8: .4byte gBattleAnimArgs _080DF4EC: .4byte sub_80DF4F4 _080DF4F0: .4byte gSprites diff --git a/asm/ground.s b/asm/ground.s index 7a401e9e8..fd4cecbfd 100755 --- a/asm/ground.s +++ b/asm/ground.s @@ -11,31 +11,31 @@ sub_80E0F1C: @ 80E0F1C push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _080E0F74 @ =gBattleAnimBankAttacker + ldr r5, _080E0F74 @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x20] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] movs r0, 0x14 strh r0, [r4, 0x2E] - ldr r5, _080E0F78 @ =gBattleAnimBankTarget + ldr r5, _080E0F78 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] @@ -49,8 +49,8 @@ sub_80E0F1C: @ 80E0F1C pop {r0} bx r0 .align 2, 0 -_080E0F74: .4byte gBattleAnimBankAttacker -_080E0F78: .4byte gBattleAnimBankTarget +_080E0F74: .4byte gAnimBankAttacker +_080E0F78: .4byte gAnimBankTarget _080E0F7C: .4byte 0x0000ffd8 _080E0F80: .4byte sub_80E0F84 thumb_func_end sub_80E0F1C @@ -76,16 +76,16 @@ sub_80E0F84: @ 80E0F84 strh r1, [r5, 0x24] movs r0, 0x14 strh r0, [r5, 0x2E] - ldr r4, _080E0FE0 @ =gBattleAnimBankAttacker + ldr r4, _080E0FE0 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] @@ -100,7 +100,7 @@ _080E0FD8: pop {r0} bx r0 .align 2, 0 -_080E0FE0: .4byte gBattleAnimBankAttacker +_080E0FE0: .4byte gAnimBankAttacker _080E0FE4: .4byte sub_80E0FE8 thumb_func_end sub_80E0F84 @@ -113,7 +113,7 @@ sub_80E0FE8: @ 80E0FE8 cmp r0, 0 beq _080E0FFC adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080E0FFC: pop {r4} pop {r0} @@ -126,7 +126,7 @@ sub_80E1004: @ 80E1004 adds r6, r0, 0 movs r1, 0x1 bl sub_8078764 - ldr r0, _080E1064 @ =gBattleAnimBankAttacker + ldr r0, _080E1064 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -140,10 +140,10 @@ _080E1024: ldr r4, _080E1068 @ =gBattleAnimArgs ldrh r0, [r4, 0x8] strh r0, [r6, 0x2E] - ldr r5, _080E106C @ =gBattleAnimBankTarget + ldr r5, _080E106C @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x4] @@ -151,7 +151,7 @@ _080E1024: strh r0, [r6, 0x32] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r4, [r4, 0x6] @@ -159,18 +159,18 @@ _080E1024: strh r0, [r6, 0x36] ldr r0, _080E1070 @ =sub_8078B34 str r0, [r6, 0x1C] - ldr r1, _080E1074 @ =move_anim_8072740 + ldr r1, _080E1074 @ =DestroyAnimSprite adds r0, r6, 0 bl StoreSpriteCallbackInData pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080E1064: .4byte gBattleAnimBankAttacker +_080E1064: .4byte gAnimBankAttacker _080E1068: .4byte gBattleAnimArgs -_080E106C: .4byte gBattleAnimBankTarget +_080E106C: .4byte gAnimBankTarget _080E1070: .4byte sub_8078B34 -_080E1074: .4byte move_anim_8072740 +_080E1074: .4byte DestroyAnimSprite thumb_func_end sub_80E1004 thumb_func_start sub_80E1078 @@ -181,7 +181,7 @@ sub_80E1078: @ 80E1078 adds r6, r0, 0 movs r1, 0x1 bl sub_80787B0 - ldr r4, _080E10F8 @ =gBattleAnimBankTarget + ldr r4, _080E10F8 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_8077EE4 @@ -235,7 +235,7 @@ _080E10D0: pop {r0} bx r0 .align 2, 0 -_080E10F8: .4byte gBattleAnimBankTarget +_080E10F8: .4byte gAnimBankTarget _080E10FC: .4byte gBattleAnimArgs _080E1100: .4byte sub_8078B34 _080E1104: .4byte move_anim_8074EE0 @@ -261,10 +261,10 @@ sub_80E1108: @ 80E1108 ldrsh r0, [r6, r1] cmp r0, 0 bne _080E117C - ldr r4, _080E1174 @ =gBattleAnimBankAttacker + ldr r4, _080E1174 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r2, [r6, 0x2] @@ -272,7 +272,7 @@ sub_80E1108: @ 80E1108 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r3, [r6, 0x4] @@ -294,7 +294,7 @@ _080E1162: _080E1168: .4byte 0x000003ff _080E116C: .4byte 0xfffffc00 _080E1170: .4byte gBattleAnimArgs -_080E1174: .4byte gBattleAnimBankAttacker +_080E1174: .4byte gAnimBankAttacker _080E1178: .4byte sub_80E1198 _080E117C: ldrh r0, [r6, 0x2] @@ -341,7 +341,7 @@ _080E11B6: cmp r0, r1 bge _080E11CE adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080E11CE: pop {r0} bx r0 @@ -402,7 +402,7 @@ _080E11FC: cmp r0, 0xA bne _080E123E adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080E123E: pop {r0} bx r0 @@ -479,7 +479,7 @@ _080E12C4: lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1C] - ldr r0, _080E12EC @ =gBattleAnimBankAttacker + ldr r0, _080E12EC @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -487,24 +487,24 @@ _080E12C4: strh r0, [r4, 0x1E] cmp r0, 0x1 bne _080E12F8 - ldr r0, _080E12F0 @ =gUnknown_030042C0 + ldr r0, _080E12F0 @ =gBattle_BG1_X ldrh r0, [r0] strh r0, [r4, 0x20] - ldr r0, _080E12F4 @ =gUnknown_030041B4 + ldr r0, _080E12F4 @ =gBattle_BG1_Y b _080E1300 .align 2, 0 -_080E12EC: .4byte gBattleAnimBankAttacker -_080E12F0: .4byte gUnknown_030042C0 -_080E12F4: .4byte gUnknown_030041B4 +_080E12EC: .4byte gAnimBankAttacker +_080E12F0: .4byte gBattle_BG1_X +_080E12F4: .4byte gBattle_BG1_Y _080E12F8: - ldr r0, _080E133C @ =gUnknown_03004288 + ldr r0, _080E133C @ =gBattle_BG2_X ldrh r0, [r0] strh r0, [r4, 0x20] - ldr r0, _080E1340 @ =gUnknown_03004280 + ldr r0, _080E1340 @ =gBattle_BG2_Y _080E1300: ldrh r0, [r0] strh r0, [r4, 0x22] - ldr r0, _080E1344 @ =gBattleAnimBankAttacker + ldr r0, _080E1344 @ =gAnimBankAttacker ldrb r0, [r0] bl sub_8077FC0 lsls r0, 24 @@ -533,9 +533,9 @@ _080E1322: strb r1, [r0] b _080E1406 .align 2, 0 -_080E133C: .4byte gUnknown_03004288 -_080E1340: .4byte gUnknown_03004280 -_080E1344: .4byte gBattleAnimBankAttacker +_080E133C: .4byte gBattle_BG2_X +_080E1340: .4byte gBattle_BG2_Y +_080E1344: .4byte gAnimBankAttacker _080E1348: .4byte gSprites _080E134C: ldrb r0, [r4, 0x1E] @@ -579,13 +579,13 @@ _080E137E: ldrsh r0, [r4, r1] cmp r0, 0x1 bne _080E13A8 - ldr r1, _080E13A4 @ =gUnknown_030041B4 + ldr r1, _080E13A4 @ =gBattle_BG1_Y b _080E13AA .align 2, 0 _080E13A0: .4byte gSineTable -_080E13A4: .4byte gUnknown_030041B4 +_080E13A4: .4byte gBattle_BG1_Y _080E13A8: - ldr r1, _080E13CC @ =gUnknown_03004280 + ldr r1, _080E13CC @ =gBattle_BG2_Y _080E13AA: ldrh r0, [r4, 0x22] subs r0, r2 @@ -602,13 +602,13 @@ _080E13AA: ldrsh r0, [r4, r3] cmp r0, 0x1 bne _080E13D4 - ldr r1, _080E13D0 @ =gUnknown_030041B4 + ldr r1, _080E13D0 @ =gBattle_BG1_Y b _080E13D6 .align 2, 0 -_080E13CC: .4byte gUnknown_03004280 -_080E13D0: .4byte gUnknown_030041B4 +_080E13CC: .4byte gBattle_BG2_Y +_080E13D0: .4byte gBattle_BG1_Y _080E13D4: - ldr r1, _080E13F8 @ =gUnknown_03004280 + ldr r1, _080E13F8 @ =gBattle_BG2_Y _080E13D6: ldrh r0, [r4, 0x22] subs r0, r2 @@ -628,7 +628,7 @@ _080E13D6: strh r0, [r1, 0x24] b _080E1406 .align 2, 0 -_080E13F8: .4byte gUnknown_03004280 +_080E13F8: .4byte gBattle_BG2_Y _080E13FC: .4byte gSprites _080E1400: ldr r1, _080E1410 @ =gUnknown_03004DC0 @@ -687,21 +687,21 @@ sub_80E143C: @ 80E143C movs r4, 0 strh r4, [r1, 0x24] strh r4, [r1, 0x26] - ldr r0, _080E1480 @ =gBattleAnimBankAttacker + ldr r0, _080E1480 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _080E1488 - ldr r0, _080E1484 @ =gUnknown_030041B4 + ldr r0, _080E1484 @ =gBattle_BG1_Y b _080E148A .align 2, 0 _080E147C: .4byte gSprites -_080E1480: .4byte gBattleAnimBankAttacker -_080E1484: .4byte gUnknown_030041B4 +_080E1480: .4byte gAnimBankAttacker +_080E1484: .4byte gBattle_BG1_Y _080E1488: - ldr r0, _080E1498 @ =gUnknown_03004280 + ldr r0, _080E1498 @ =gBattle_BG2_Y _080E148A: strh r4, [r0] adds r0, r5, 0 @@ -710,7 +710,7 @@ _080E148A: pop {r0} bx r0 .align 2, 0 -_080E1498: .4byte gUnknown_03004280 +_080E1498: .4byte gBattle_BG2_Y thumb_func_end sub_80E143C thumb_func_start sub_80E149C @@ -852,7 +852,7 @@ _080E15A0: lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1C] - ldr r0, _080E15C4 @ =gBattleAnimBankAttacker + ldr r0, _080E15C4 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -860,17 +860,17 @@ _080E15A0: strh r0, [r4, 0x1E] cmp r0, 0x1 bne _080E15CC - ldr r0, _080E15C8 @ =gUnknown_030042C0 + ldr r0, _080E15C8 @ =gBattle_BG1_X b _080E15CE .align 2, 0 -_080E15C4: .4byte gBattleAnimBankAttacker -_080E15C8: .4byte gUnknown_030042C0 +_080E15C4: .4byte gAnimBankAttacker +_080E15C8: .4byte gBattle_BG1_X _080E15CC: - ldr r0, _080E15EC @ =gUnknown_03004288 + ldr r0, _080E15EC @ =gBattle_BG2_X _080E15CE: ldrh r0, [r0] strh r0, [r4, 0x20] - ldr r0, _080E15F0 @ =gBattleAnimBankAttacker + ldr r0, _080E15F0 @ =gAnimBankAttacker ldrb r0, [r0] bl sub_8077FC0 lsls r0, 24 @@ -882,8 +882,8 @@ _080E15CE: strh r0, [r4, 0x26] b _080E164A .align 2, 0 -_080E15EC: .4byte gUnknown_03004288 -_080E15F0: .4byte gBattleAnimBankAttacker +_080E15EC: .4byte gBattle_BG2_X +_080E15F0: .4byte gAnimBankAttacker _080E15F4: ldrb r0, [r4, 0x1E] movs r1, 0x26 @@ -957,15 +957,15 @@ sub_80E1668: @ 80E1668 lsrs r4, r2, 16 cmp r0, 0x1 bne _080E168C - ldr r0, _080E1684 @ =gUnknown_030042C0 + ldr r0, _080E1684 @ =gBattle_BG1_X ldrh r3, [r0] ldr r0, _080E1688 @ =REG_BG1HOFS b _080E1692 .align 2, 0 -_080E1684: .4byte gUnknown_030042C0 +_080E1684: .4byte gBattle_BG1_X _080E1688: .4byte REG_BG1HOFS _080E168C: - ldr r0, _080E1718 @ =gUnknown_03004288 + ldr r0, _080E1718 @ =gBattle_BG2_X ldrh r3, [r0] ldr r0, _080E171C @ =REG_BG2HOFS _080E1692: @@ -1041,7 +1041,7 @@ _080E16F6: pop {r0} bx r0 .align 2, 0 -_080E1718: .4byte gUnknown_03004288 +_080E1718: .4byte gBattle_BG2_X _080E171C: .4byte REG_BG2HOFS _080E1720: .4byte gUnknown_03004DE0 _080E1724: .4byte 0xa2600001 @@ -1057,13 +1057,13 @@ sub_80E1728: @ 80E1728 adds r7, r0, 0 cmp r1, 0 bne _080E1744 - ldr r0, _080E1740 @ =gBattleAnimBankAttacker + ldr r0, _080E1740 @ =gAnimBankAttacker b _080E1746 .align 2, 0 _080E173C: .4byte gBattleAnimArgs -_080E1740: .4byte gBattleAnimBankAttacker +_080E1740: .4byte gAnimBankAttacker _080E1744: - ldr r0, _080E17A8 @ =gBattleAnimBankTarget + ldr r0, _080E17A8 @ =gAnimBankTarget _080E1746: ldrb r4, [r0] movs r6, 0x18 @@ -1082,7 +1082,7 @@ _080E1746: _080E1762: adds r0, r4, 0 movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, r6 @@ -1112,7 +1112,7 @@ _080E1762: pop {r0} bx r0 .align 2, 0 -_080E17A8: .4byte gBattleAnimBankTarget +_080E17A8: .4byte gAnimBankTarget _080E17AC: .4byte sub_80E17B0 thumb_func_end sub_80E1728 @@ -1125,7 +1125,7 @@ sub_80E17B0: @ 80E17B0 cmp r0, 0 beq _080E17C4 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080E17C4: pop {r4} pop {r0} @@ -1141,18 +1141,18 @@ sub_80E17CC: @ 80E17CC ldrsh r0, [r0, r1] cmp r0, 0 bne _080E17E8 - ldr r0, _080E17E4 @ =gBattleAnimBankAttacker + ldr r0, _080E17E4 @ =gAnimBankAttacker b _080E17EA .align 2, 0 _080E17E0: .4byte gBattleAnimArgs -_080E17E4: .4byte gBattleAnimBankAttacker +_080E17E4: .4byte gAnimBankAttacker _080E17E8: - ldr r0, _080E1848 @ =gBattleAnimBankTarget + ldr r0, _080E1848 @ =gAnimBankTarget _080E17EA: ldrb r5, [r0] adds r0, r5, 0 movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldr r2, _080E184C @ =0x0000fff0 @@ -1183,7 +1183,7 @@ _080E17EA: ands r0, r2 orrs r0, r1 strh r0, [r6, 0x4] - ldr r1, _080E185C @ =move_anim_8072740 + ldr r1, _080E185C @ =DestroyAnimSprite adds r0, r6, 0 bl StoreSpriteCallbackInData ldrh r0, [r4, 0x4] @@ -1194,12 +1194,12 @@ _080E17EA: pop {r0} bx r0 .align 2, 0 -_080E1848: .4byte gBattleAnimBankTarget +_080E1848: .4byte gAnimBankTarget _080E184C: .4byte 0x0000fff0 _080E1850: .4byte gBattleAnimArgs _080E1854: .4byte 0x000003ff _080E1858: .4byte 0xfffffc00 -_080E185C: .4byte move_anim_8072740 +_080E185C: .4byte DestroyAnimSprite _080E1860: .4byte sub_80782D8 thumb_func_end sub_80E17CC @@ -1226,7 +1226,7 @@ sub_80E1864: @ 80E1864 _080E1888: .4byte gTasks _080E188C: .4byte gBattleAnimArgs _080E1890: - ldr r0, _080E18BC @ =gMovePowerMoveAnim + ldr r0, _080E18BC @ =gAnimMovePower ldrh r0, [r0] movs r1, 0xA bl __udivsi3 @@ -1249,7 +1249,7 @@ _080E189C: ldr r0, _080E18C4 @ =sub_80E1934 b _080E1926 .align 2, 0 -_080E18BC: .4byte gMovePowerMoveAnim +_080E18BC: .4byte gAnimMovePower _080E18C0: .4byte gUnknown_030041B0 _080E18C4: .4byte sub_80E1934 _080E18C8: @@ -1643,7 +1643,7 @@ sub_80E1B88: @ 80E1B88 lsrs r1, r0, 24 ldr r3, _080E1BA8 @ =gBattleAnimArgs movs r2, 0 - ldr r0, _080E1BAC @ =gMovePowerMoveAnim + ldr r0, _080E1BAC @ =gAnimMovePower ldrh r0, [r0] cmp r0, 0x63 bls _080E1B9C @@ -1656,7 +1656,7 @@ _080E1B9C: bx r0 .align 2, 0 _080E1BA8: .4byte gBattleAnimArgs -_080E1BAC: .4byte gMovePowerMoveAnim +_080E1BAC: .4byte gAnimMovePower thumb_func_end sub_80E1B88 thumb_func_start sub_80E1BB0 @@ -1671,13 +1671,13 @@ sub_80E1BB0: @ 80E1BB0 adds r6, r2, 0 cmp r0, 0 beq _080E1BD0 - ldr r0, _080E1BCC @ =gBattleAnimBankTarget + ldr r0, _080E1BCC @ =gAnimBankTarget b _080E1BD2 .align 2, 0 _080E1BC8: .4byte gBattleAnimArgs -_080E1BCC: .4byte gBattleAnimBankTarget +_080E1BCC: .4byte gAnimBankTarget _080E1BD0: - ldr r0, _080E1C40 @ =gBattleAnimBankAttacker + ldr r0, _080E1C40 @ =gAnimBankAttacker _080E1BD2: ldrb r0, [r0] adds r5, r0, 0 @@ -1700,7 +1700,7 @@ _080E1BE2: adds r4, r0 adds r0, r5, 0 movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 movs r1, 0x20 @@ -1711,7 +1711,7 @@ _080E1BE2: strh r1, [r4, 0xA] adds r0, r5, 0 movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 movs r1, 0x40 @@ -1732,7 +1732,7 @@ _080E1BE2: pop {r0} bx r0 .align 2, 0 -_080E1C40: .4byte gBattleAnimBankAttacker +_080E1C40: .4byte gAnimBankAttacker _080E1C44: .4byte sub_80E1C58 _080E1C48: .4byte gTasks _080E1C4C: .4byte 0x000001ff @@ -62,29 +62,29 @@ sub_80D7704: @ 80D7704 ands r0, r2 orrs r0, r1 strh r0, [r5, 0x4] - ldr r4, _080D7814 @ =gBattleAnimBankTarget + ldr r4, _080D7814 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 mov r9, r0 ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r4, _080D7818 @ =gBattleAnimBankAttacker + ldr r4, _080D7818 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r3, r0, 24 ldrb r0, [r4] movs r1, 0x3 str r3, [sp] - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r6, r0, 24 ldr r1, _080D781C @ =gBattleAnimArgs @@ -176,8 +176,8 @@ _080D77DE: .align 2, 0 _080D780C: .4byte 0x000003ff _080D7810: .4byte 0xfffffc00 -_080D7814: .4byte gBattleAnimBankTarget -_080D7818: .4byte gBattleAnimBankAttacker +_080D7814: .4byte gAnimBankTarget +_080D7818: .4byte gAnimBankAttacker _080D781C: .4byte gBattleAnimArgs _080D7820: lsls r1, r3, 16 @@ -281,7 +281,7 @@ sub_80D7888: @ 80D7888 b _080D78E6 _080D78E0: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D78E6: pop {r4} pop {r0} @@ -304,7 +304,7 @@ sub_80D78EC: @ 80D78EC movs r0, 0xFE lsls r0, 8 strh r0, [r4, 0x36] - ldr r1, _080D7924 @ =move_anim_8072740 + ldr r1, _080D7924 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData ldr r1, _080D7928 @ =sub_8078174 @@ -316,7 +316,7 @@ sub_80D78EC: @ 80D78EC bx r0 .align 2, 0 _080D7920: .4byte gBattleAnimArgs -_080D7924: .4byte move_anim_8072740 +_080D7924: .4byte DestroyAnimSprite _080D7928: .4byte sub_8078174 thumb_func_end sub_80D78EC @@ -326,14 +326,14 @@ sub_80D792C: @ 80D792C adds r4, r0, 0 movs r1, 0x1 bl sub_80787B0 - ldr r0, _080D7960 @ =gBattleAnimBankTarget + ldr r0, _080D7960 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] - ldr r0, _080D7964 @ =gBattleAnimBankAttacker + ldr r0, _080D7964 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -346,8 +346,8 @@ sub_80D792C: @ 80D792C strh r1, [r4, 0x32] b _080D7976 .align 2, 0 -_080D7960: .4byte gBattleAnimBankTarget -_080D7964: .4byte gBattleAnimBankAttacker +_080D7960: .4byte gAnimBankTarget +_080D7964: .4byte gAnimBankAttacker _080D7968: .4byte gBattleAnimArgs _080D796C: ldr r0, _080D79A4 @ =gBattleAnimArgs @@ -356,10 +356,10 @@ _080D796C: adds r0, r1 strh r0, [r4, 0x32] _080D7976: - ldr r0, _080D79A8 @ =gBattleAnimBankTarget + ldr r0, _080D79A8 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 ldr r1, _080D79A4 @ =gBattleAnimArgs lsrs r0, 24 @@ -368,7 +368,7 @@ _080D7976: strh r0, [r4, 0x36] ldrh r0, [r1, 0x8] strh r0, [r4, 0x2E] - ldr r1, _080D79AC @ =move_anim_8072740 + ldr r1, _080D79AC @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData ldr r0, _080D79B0 @ =sub_8078B34 @@ -378,8 +378,8 @@ _080D7976: bx r0 .align 2, 0 _080D79A4: .4byte gBattleAnimArgs -_080D79A8: .4byte gBattleAnimBankTarget -_080D79AC: .4byte move_anim_8072740 +_080D79A8: .4byte gAnimBankTarget +_080D79AC: .4byte DestroyAnimSprite _080D79B0: .4byte sub_8078B34 thumb_func_end sub_80D792C @@ -399,7 +399,7 @@ sub_80D79B4: @ 80D79B4 .align 2, 0 _080D79CC: .4byte gBattleAnimArgs _080D79D0: - ldr r0, _080D7A18 @ =gBattleAnimBankTarget + ldr r0, _080D7A18 @ =gAnimBankTarget ldrb r0, [r0] adds r2, r4, 0 adds r2, 0x20 @@ -407,7 +407,7 @@ _080D79D0: adds r3, 0x22 movs r1, 0x1 bl sub_807A3FC - ldr r0, _080D7A1C @ =gBattleAnimBankAttacker + ldr r0, _080D7A1C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -435,8 +435,8 @@ _080D7A06: pop {r0} bx r0 .align 2, 0 -_080D7A18: .4byte gBattleAnimBankTarget -_080D7A1C: .4byte gBattleAnimBankAttacker +_080D7A18: .4byte gAnimBankTarget +_080D7A1C: .4byte gAnimBankAttacker _080D7A20: .4byte sub_80D7A28 _080D7A24: .4byte sub_80785E4 thumb_func_end sub_80D79B4 @@ -492,16 +492,16 @@ sub_80D7A64: @ 80D7A64 ldrsh r0, [r6, r1] cmp r0, 0 bne _080D7AB4 - ldr r4, _080D7AB0 @ =gBattleAnimBankTarget + ldr r4, _080D7AB0 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r6, [r6, 0x6] @@ -510,9 +510,9 @@ sub_80D7A64: @ 80D7A64 b _080D7AC6 .align 2, 0 _080D7AAC: .4byte gBattleAnimArgs -_080D7AB0: .4byte gBattleAnimBankTarget +_080D7AB0: .4byte gAnimBankTarget _080D7AB4: - ldr r0, _080D7AE0 @ =gBattleAnimBankTarget + ldr r0, _080D7AE0 @ =gAnimBankTarget ldrb r0, [r0] adds r2, r5, 0 adds r2, 0x32 @@ -521,7 +521,7 @@ _080D7AB4: movs r1, 0x1 bl sub_807A3FC _080D7AC6: - ldr r0, _080D7AE4 @ =gBattleAnimBankAttacker + ldr r0, _080D7AE4 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -534,8 +534,8 @@ _080D7AC6: strh r1, [r5, 0x32] b _080D7AF6 .align 2, 0 -_080D7AE0: .4byte gBattleAnimBankTarget -_080D7AE4: .4byte gBattleAnimBankAttacker +_080D7AE0: .4byte gAnimBankTarget +_080D7AE4: .4byte gAnimBankAttacker _080D7AE8: .4byte gBattleAnimArgs _080D7AEC: ldr r0, _080D7B94 @ =gBattleAnimArgs @@ -647,7 +647,7 @@ sub_80D7BA0: @ 80D7BA0 strh r5, [r4, 0x24] movs r0, 0x80 strh r0, [r4, 0x2E] - ldr r0, _080D7BFC @ =gBattleAnimBankAttacker + ldr r0, _080D7BFC @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -676,7 +676,7 @@ _080D7BD0: pop {r0} bx r0 .align 2, 0 -_080D7BFC: .4byte gBattleAnimBankAttacker +_080D7BFC: .4byte gAnimBankAttacker _080D7C00: .4byte 0x0000ffec _080D7C04: .4byte sub_80D7C08 thumb_func_end sub_80D7BA0 @@ -685,7 +685,7 @@ _080D7C04: .4byte sub_80D7C08 sub_80D7C08: @ 80D7C08 push {r4,lr} adds r4, r0, 0 - ldr r0, _080D7C5C @ =gBattleAnimBankAttacker + ldr r0, _080D7C5C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -723,7 +723,7 @@ _080D7C1E: strh r0, [r4, 0x38] b _080D7C82 .align 2, 0 -_080D7C5C: .4byte gBattleAnimBankAttacker +_080D7C5C: .4byte gAnimBankAttacker _080D7C60: .4byte 0x0000ffec _080D7C64: ldrh r0, [r4, 0x24] @@ -782,7 +782,7 @@ sub_80D7C8C: @ 80D7C8C bge _080D7CCE _080D7CC8: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D7CCE: pop {r4} pop {r0} @@ -807,25 +807,25 @@ sub_80D7CD4: @ 80D7CD4 ldrsh r0, [r1, r2] cmp r0, 0 bne _080D7D20 - ldr r4, _080D7D1C @ =gBattleAnimBankTarget + ldr r4, _080D7D1C @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] b _080D7D32 .align 2, 0 _080D7D18: .4byte gBattleAnimArgs -_080D7D1C: .4byte gBattleAnimBankTarget +_080D7D1C: .4byte gAnimBankTarget _080D7D20: - ldr r0, _080D7D50 @ =gBattleAnimBankTarget + ldr r0, _080D7D50 @ =gAnimBankTarget ldrb r0, [r0] adds r2, r5, 0 adds r2, 0x32 @@ -834,7 +834,7 @@ _080D7D20: movs r1, 0x1 bl sub_807A3FC _080D7D32: - ldr r0, _080D7D54 @ =gBattleAnimBankAttacker + ldr r0, _080D7D54 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -848,8 +848,8 @@ _080D7D32: adds r1, r0, 0 b _080D7D66 .align 2, 0 -_080D7D50: .4byte gBattleAnimBankTarget -_080D7D54: .4byte gBattleAnimBankAttacker +_080D7D50: .4byte gAnimBankTarget +_080D7D54: .4byte gAnimBankAttacker _080D7D58: .4byte gBattleAnimArgs _080D7D5C: ldr r1, _080D7E10 @ =gBattleAnimArgs @@ -1002,7 +1002,7 @@ _080D7E2C: bge _080D7E82 _080D7E7C: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D7E82: pop {r4} pop {r0} @@ -1029,7 +1029,7 @@ sub_80D7E88: @ 80D7E88 .align 2, 0 _080D7EA8: .4byte gBattleAnimArgs _080D7EAC: - ldr r0, _080D7EEC @ =gBattleAnimBankTarget + ldr r0, _080D7EEC @ =gAnimBankTarget ldrb r0, [r0] adds r2, r4, 0 adds r2, 0x20 @@ -1037,7 +1037,7 @@ _080D7EAC: adds r3, 0x22 movs r1, 0 bl sub_807A3FC - ldr r0, _080D7EF0 @ =gBattleAnimBankAttacker + ldr r0, _080D7EF0 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -1061,8 +1061,8 @@ _080D7EE2: strh r0, [r4, 0x2E] b _080D7F08 .align 2, 0 -_080D7EEC: .4byte gBattleAnimBankTarget -_080D7EF0: .4byte gBattleAnimBankAttacker +_080D7EEC: .4byte gAnimBankTarget +_080D7EF0: .4byte gAnimBankAttacker _080D7EF4: adds r0, r4, 0 adds r0, 0x3F @@ -1072,7 +1072,7 @@ _080D7EF4: cmp r0, 0 beq _080D7F08 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D7F08: pop {r4,r5} pop {r0} @@ -1099,7 +1099,7 @@ sub_80D7F10: @ 80D7F10 .align 2, 0 _080D7F30: .4byte gBattleAnimArgs _080D7F34: - ldr r4, _080D7F5C @ =gBattleAnimBankAttacker + ldr r4, _080D7F5C @ =gAnimBankAttacker ldrb r0, [r4] adds r2, r5, 0 adds r2, 0x20 @@ -1117,7 +1117,7 @@ _080D7F34: subs r0, r1 b _080D7F66 .align 2, 0 -_080D7F5C: .4byte gBattleAnimBankAttacker +_080D7F5C: .4byte gAnimBankAttacker _080D7F60: ldrh r0, [r6] ldrh r1, [r5, 0x20] @@ -1130,11 +1130,11 @@ _080D7F66: adds r0, r1 strh r0, [r5, 0x22] _080D7F72: - ldr r0, _080D7F7C @ =gBattleAnimBankAttacker + ldr r0, _080D7F7C @ =gAnimBankAttacker b _080D7FD0 .align 2, 0 _080D7F78: .4byte gBattleAnimArgs -_080D7F7C: .4byte gBattleAnimBankAttacker +_080D7F7C: .4byte gAnimBankAttacker _080D7F80: movs r1, 0xA ldrsh r0, [r6, r1] @@ -1145,7 +1145,7 @@ _080D7F80: bl sub_8078764 b _080D7FCE _080D7F92: - ldr r4, _080D7FB8 @ =gBattleAnimBankTarget + ldr r4, _080D7FB8 @ =gAnimBankTarget ldrb r0, [r4] adds r2, r5, 0 adds r2, 0x20 @@ -1163,7 +1163,7 @@ _080D7F92: subs r0, r1 b _080D7FC2 .align 2, 0 -_080D7FB8: .4byte gBattleAnimBankTarget +_080D7FB8: .4byte gAnimBankTarget _080D7FBC: ldrh r0, [r6] ldrh r1, [r5, 0x20] @@ -1176,7 +1176,7 @@ _080D7FC2: adds r0, r1 strh r0, [r5, 0x22] _080D7FCE: - ldr r0, _080D7FF0 @ =gBattleAnimBankTarget + ldr r0, _080D7FF0 @ =gAnimBankTarget _080D7FD0: ldrb r0, [r0] strh r0, [r5, 0x3C] @@ -1194,12 +1194,12 @@ _080D7FE8: b _080D7FF6 .align 2, 0 _080D7FEC: .4byte gBattleAnimArgs -_080D7FF0: .4byte gBattleAnimBankTarget +_080D7FF0: .4byte gAnimBankTarget _080D7FF4: movs r0, 0x40 _080D7FF6: strh r0, [r5, 0x3A] - ldr r0, _080D803C @ =gBattleAnimBankTarget + ldr r0, _080D803C @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -1232,7 +1232,7 @@ _080D800C: pop {r0} bx r0 .align 2, 0 -_080D803C: .4byte gBattleAnimBankTarget +_080D803C: .4byte gAnimBankTarget _080D8040: .4byte gBattleAnimArgs _080D8044: .4byte sub_80D8048 thumb_func_end sub_80D7F10 @@ -1307,7 +1307,7 @@ _080D80C6: b _080D80D8 _080D80D2: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D80D8: pop {r4} pop {r0} @@ -1341,7 +1341,7 @@ sub_80D80E0: @ 80D80E0 movs r0, 0x3F ands r0, r1 strb r0, [r4, 0x1] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080D812A @@ -1353,10 +1353,10 @@ sub_80D80E0: @ 80D80E0 orrs r1, r0 strb r1, [r4] _080D812A: - ldr r0, _080D81B4 @ =gUnknown_030042C0 + ldr r0, _080D81B4 @ =gBattle_BG1_X movs r1, 0 strh r1, [r0] - ldr r0, _080D81B8 @ =gUnknown_030041B4 + ldr r0, _080D81B8 @ =gBattle_BG1_Y strh r1, [r0] ldr r0, _080D81BC @ =REG_BG1HOFS strh r1, [r0] @@ -1389,7 +1389,7 @@ _080D812A: lsls r1, 4 movs r2, 0x20 bl LoadPalette - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080D8190 @@ -1415,8 +1415,8 @@ _080D8190: _080D81A8: .4byte REG_BLDCNT _080D81AC: .4byte 0x00003f42 _080D81B0: .4byte REG_BG1CNT -_080D81B4: .4byte gUnknown_030042C0 -_080D81B8: .4byte gUnknown_030041B4 +_080D81B4: .4byte gBattle_BG1_X +_080D81B8: .4byte gBattle_BG1_Y _080D81BC: .4byte REG_BG1HOFS _080D81C0: .4byte 0x040000d4 _080D81C4: .4byte 0x85000400 @@ -1438,13 +1438,13 @@ sub_80D81E0: @ 80D81E0 sub sp, 0x10 lsls r0, 24 lsrs r6, r0, 24 - ldr r2, _080D8220 @ =gUnknown_030042C0 + ldr r2, _080D8220 @ =gBattle_BG1_X ldr r1, _080D8224 @ =0x0000ffff adds r0, r1, 0 ldrh r4, [r2] adds r0, r4 strh r0, [r2] - ldr r1, _080D8228 @ =gUnknown_030041B4 + ldr r1, _080D8228 @ =gBattle_BG1_Y ldr r3, _080D822C @ =gTasks lsls r0, r6, 2 adds r0, r6 @@ -1463,9 +1463,9 @@ _080D8214: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080D8220: .4byte gUnknown_030042C0 +_080D8220: .4byte gBattle_BG1_X _080D8224: .4byte 0x0000ffff -_080D8228: .4byte gUnknown_030041B4 +_080D8228: .4byte gBattle_BG1_Y _080D822C: .4byte gTasks _080D8230: .4byte _080D8234 .align 2, 0 @@ -1620,7 +1620,7 @@ _080D832A: ldr r1, _080D83C8 @ =0x85000200 str r1, [r0, 0x8] ldr r0, [r0, 0x8] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080D8378 @@ -1639,8 +1639,8 @@ _080D8378: ldrh r0, [r1, 0x20] adds r0, 0x1 strh r0, [r1, 0x20] - ldr r2, _080D83D4 @ =gUnknown_030042C0 - ldr r4, _080D83D8 @ =gUnknown_030041B4 + ldr r2, _080D83D4 @ =gBattle_BG1_X + ldr r4, _080D83D8 @ =gBattle_BG1_Y _080D838C: movs r1, 0 strh r1, [r2] @@ -1674,8 +1674,8 @@ _080D83C4: .4byte 0x85000400 _080D83C8: .4byte 0x85000200 _080D83CC: .4byte REG_BG1CNT _080D83D0: .4byte gTasks -_080D83D4: .4byte gUnknown_030042C0 -_080D83D8: .4byte gUnknown_030041B4 +_080D83D4: .4byte gBattle_BG1_X +_080D83D8: .4byte gBattle_BG1_Y _080D83DC: .4byte REG_BLDCNT thumb_func_end sub_80D81E0 @@ -1683,16 +1683,16 @@ _080D83DC: .4byte REG_BLDCNT sub_80D83E0: @ 80D83E0 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _080D840C @ =gBattleAnimBankAttacker + ldr r5, _080D840C @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x20] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] @@ -1702,7 +1702,7 @@ sub_80D83E0: @ 80D83E0 pop {r0} bx r0 .align 2, 0 -_080D840C: .4byte gBattleAnimBankAttacker +_080D840C: .4byte gAnimBankAttacker _080D8410: .4byte sub_807941C thumb_func_end sub_80D83E0 @@ -1733,7 +1733,7 @@ sub_80D8414: @ 80D8414 movs r0, 0x3F ands r0, r1 strb r0, [r4, 0x1] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080D845E @@ -1745,10 +1745,10 @@ sub_80D8414: @ 80D8414 orrs r1, r0 strb r1, [r4] _080D845E: - ldr r0, _080D84EC @ =gUnknown_030042C0 + ldr r0, _080D84EC @ =gBattle_BG1_X movs r1, 0 strh r1, [r0] - ldr r0, _080D84F0 @ =gUnknown_030041B4 + ldr r0, _080D84F0 @ =gBattle_BG1_Y strh r1, [r0] ldr r0, _080D84F4 @ =REG_BG1HOFS strh r1, [r0] @@ -1781,7 +1781,7 @@ _080D845E: lsls r1, 4 movs r2, 0x20 bl LoadPalette - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080D84C4 @@ -1809,8 +1809,8 @@ _080D84C4: _080D84E0: .4byte REG_BLDCNT _080D84E4: .4byte 0x00003f42 _080D84E8: .4byte REG_BG1CNT -_080D84EC: .4byte gUnknown_030042C0 -_080D84F0: .4byte gUnknown_030041B4 +_080D84EC: .4byte gBattle_BG1_X +_080D84F0: .4byte gBattle_BG1_Y _080D84F4: .4byte REG_BG1HOFS _080D84F8: .4byte 0x040000d4 _080D84FC: .4byte 0x85000400 @@ -1833,7 +1833,7 @@ sub_80D851C: @ 80D851C sub sp, 0x10 lsls r0, 24 lsrs r6, r0, 24 - ldr r3, _080D8558 @ =gUnknown_030042C0 + ldr r3, _080D8558 @ =gBattle_BG1_X ldr r4, _080D855C @ =gTasks lsls r1, r6, 2 adds r1, r6 @@ -1843,7 +1843,7 @@ sub_80D851C: @ 80D851C ldrh r2, [r3] adds r0, r2 strh r0, [r3] - ldr r2, _080D8560 @ =gUnknown_030041B4 + ldr r2, _080D8560 @ =gBattle_BG1_Y movs r5, 0x20 ldrsh r0, [r1, r5] cmp r0, 0x4 @@ -1856,9 +1856,9 @@ _080D854C: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080D8558: .4byte gUnknown_030042C0 +_080D8558: .4byte gBattle_BG1_X _080D855C: .4byte gTasks -_080D8560: .4byte gUnknown_030041B4 +_080D8560: .4byte gBattle_BG1_Y _080D8564: .4byte _080D8568 .align 2, 0 _080D8568: @@ -2002,7 +2002,7 @@ _080D864A: ldr r1, _080D86E8 @ =0x85000200 str r1, [r0, 0x8] ldr r0, [r0, 0x8] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080D8698 @@ -2021,8 +2021,8 @@ _080D8698: ldrh r0, [r1, 0x20] adds r0, 0x1 strh r0, [r1, 0x20] - ldr r3, _080D86F4 @ =gUnknown_030042C0 - ldr r2, _080D86F8 @ =gUnknown_030041B4 + ldr r3, _080D86F4 @ =gBattle_BG1_X + ldr r2, _080D86F8 @ =gBattle_BG1_Y _080D86AC: movs r1, 0 strh r1, [r3] @@ -2056,8 +2056,8 @@ _080D86E4: .4byte 0x85000400 _080D86E8: .4byte 0x85000200 _080D86EC: .4byte REG_BG1CNT _080D86F0: .4byte gTasks -_080D86F4: .4byte gUnknown_030042C0 -_080D86F8: .4byte gUnknown_030041B4 +_080D86F4: .4byte gBattle_BG1_X +_080D86F8: .4byte gBattle_BG1_Y _080D86FC: .4byte REG_BLDCNT thumb_func_end sub_80D851C @@ -2070,16 +2070,16 @@ sub_80D8700: @ 80D8700 ldr r6, _080D87E8 @ =gBattleAnimArgs ldrh r0, [r6] strh r0, [r5, 0x2E] - ldr r0, _080D87EC @ =gBattleAnimBankAttacker + ldr r0, _080D87EC @ =gAnimBankAttacker mov r8, r0 ldrb r0, [r0] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 - ldr r7, _080D87F0 @ =gBattleAnimBankTarget + ldr r7, _080D87F0 @ =gAnimBankTarget ldrb r0, [r7] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -2137,16 +2137,16 @@ _080D8790: movs r0, 0x1 strh r0, [r5, 0x3A] _080D8794: - ldr r4, _080D87EC @ =gBattleAnimBankAttacker + ldr r4, _080D87EC @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -2159,10 +2159,10 @@ _080D8794: ldrh r1, [r5, 0x20] adds r0, r1 strh r0, [r5, 0x30] - ldr r4, _080D87F0 @ =gBattleAnimBankTarget + ldr r4, _080D87F0 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r6, 0x6] @@ -2177,8 +2177,8 @@ _080D8794: b _080D8824 .align 2, 0 _080D87E8: .4byte gBattleAnimArgs -_080D87EC: .4byte gBattleAnimBankAttacker -_080D87F0: .4byte gBattleAnimBankTarget +_080D87EC: .4byte gAnimBankAttacker +_080D87F0: .4byte gAnimBankTarget _080D87F4: .4byte gBanksBySide _080D87F8: .4byte gSprites _080D87FC: @@ -2186,10 +2186,10 @@ _080D87FC: ldrh r1, [r5, 0x20] adds r0, r1 strh r0, [r5, 0x30] - ldr r4, _080D886C @ =gBattleAnimBankTarget + ldr r4, _080D886C @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r6, 0x6] @@ -2202,7 +2202,7 @@ _080D87FC: ldrb r0, [r4] movs r1, 0x1 _080D8824: - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r6, [r6, 0x8] @@ -2215,7 +2215,7 @@ _080D8824: ldrh r1, [r5, 0x3C] orrs r0, r1 strh r0, [r5, 0x3C] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080D8858 @@ -2236,7 +2236,7 @@ _080D8858: pop {r0} bx r0 .align 2, 0 -_080D886C: .4byte gBattleAnimBankTarget +_080D886C: .4byte gAnimBankTarget _080D8870: .4byte sub_80D8874 thumb_func_end sub_80D8700 @@ -2298,10 +2298,10 @@ _080D88C8: _080D88D6: movs r5, 0x50 strh r5, [r4, 0x2E] - ldr r6, _080D8928 @ =gBattleAnimBankTarget + ldr r6, _080D8928 @ =gAnimBankTarget ldrb r0, [r6] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x20] @@ -2337,7 +2337,7 @@ _080D88D6: strh r0, [r4, 0x38] b _080D893A .align 2, 0 -_080D8928: .4byte gBattleAnimBankTarget +_080D8928: .4byte gAnimBankTarget _080D892C: .4byte gMain _080D8930: .4byte 0x0000043d _080D8934: .4byte gBanksBySide @@ -2486,7 +2486,7 @@ _080D8A12: cmp r0, 0 beq _080D8A78 ldr r1, _080D8A70 @ =gBanksBySide - ldr r0, _080D8A74 @ =gBattleAnimBankTarget + ldr r0, _080D8A74 @ =gAnimBankTarget ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -2501,7 +2501,7 @@ _080D8A12: _080D8A68: .4byte gMain _080D8A6C: .4byte 0x0000043d _080D8A70: .4byte gBanksBySide -_080D8A74: .4byte gBattleAnimBankTarget +_080D8A74: .4byte gAnimBankTarget _080D8A78: ldr r0, _080D8A90 @ =0x0000fff0 _080D8A7A: @@ -2713,12 +2713,12 @@ sub_80D8BA8: @ 80D8BA8 str r0, [sp, 0x4] adds r0, r5, 0 movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r7, r0, 24 adds r0, r5, 0 movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r6, r0, 24 mov r1, r8 @@ -3008,7 +3008,7 @@ _080D8E48: .4byte gTasks unc_080B06FC: @ 80D8E4C push {r4-r6,lr} adds r5, r0, 0 - ldr r0, _080D8ECC @ =gDisableStructMoveAnim + ldr r0, _080D8ECC @ =gAnimDisableStructPtr ldr r0, [r0] ldrb r1, [r0, 0x11] lsrs r0, r1, 4 @@ -3030,7 +3030,7 @@ _080D8E6A: ldr r6, _080D8ED0 @ =gBattleAnimArgs ldrh r0, [r6, 0x8] strh r0, [r5, 0x2E] - ldr r0, _080D8ED4 @ =gBattleAnimBankAttacker + ldr r0, _080D8ED4 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -3040,10 +3040,10 @@ _080D8E6A: negs r0, r0 strh r0, [r6, 0x4] _080D8E92: - ldr r4, _080D8ED8 @ =gBattleAnimBankTarget + ldr r4, _080D8ED8 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r6, 0x4] @@ -3051,7 +3051,7 @@ _080D8E92: strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r6, 0x6] @@ -3067,10 +3067,10 @@ _080D8E92: pop {r0} bx r0 .align 2, 0 -_080D8ECC: .4byte gDisableStructMoveAnim +_080D8ECC: .4byte gAnimDisableStructPtr _080D8ED0: .4byte gBattleAnimArgs -_080D8ED4: .4byte gBattleAnimBankAttacker -_080D8ED8: .4byte gBattleAnimBankTarget +_080D8ED4: .4byte gAnimBankAttacker +_080D8ED8: .4byte gAnimBankTarget _080D8EDC: .4byte sub_80D8EE0 thumb_func_end unc_080B06FC @@ -3087,7 +3087,7 @@ sub_80D8EE0: @ 80D8EE0 bl StartSpriteAnim ldr r0, _080D8F08 @ =sub_8078600 str r0, [r4, 0x1C] - ldr r1, _080D8F0C @ =move_anim_8072740 + ldr r1, _080D8F0C @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData _080D8F02: @@ -3096,7 +3096,7 @@ _080D8F02: bx r0 .align 2, 0 _080D8F08: .4byte sub_8078600 -_080D8F0C: .4byte move_anim_8072740 +_080D8F0C: .4byte DestroyAnimSprite thumb_func_end sub_80D8EE0 thumb_func_start sub_80D8F10 @@ -3185,7 +3185,7 @@ _080D8F9C: cmp r0, 0x15 bne _080D8FBA adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D8FBA: pop {r4} pop {r0} @@ -3201,7 +3201,7 @@ sub_80D8FC0: @ 80D8FC0 ldrb r3, [r1] lsls r3, 1 adds r3, r1 - ldr r1, _080D8FEC @ =gDisableStructMoveAnim + ldr r1, _080D8FEC @ =gAnimDisableStructPtr ldr r1, [r1] ldrb r1, [r1, 0x11] lsrs r2, r1, 4 @@ -3215,7 +3215,7 @@ sub_80D8FC0: @ 80D8FC0 bx r0 .align 2, 0 _080D8FE8: .4byte gBattleAnimArgs -_080D8FEC: .4byte gDisableStructMoveAnim +_080D8FEC: .4byte gAnimDisableStructPtr thumb_func_end sub_80D8FC0 .align 2, 0 @ Don't pad with nop. diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 5dd1d5a1a..e4fa0c454 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -34,19 +34,19 @@ .byte 0x04 .endm - .macro atk5 + .macro damagecalc .byte 0x05 .endm - .macro atk6 + .macro typecalc .byte 0x06 .endm - .macro atk7 + .macro adjustnormaldamage .byte 0x07 .endm - .macro atk8 + .macro adjustnormaldamage2 .byte 0x08 .endm @@ -58,7 +58,7 @@ .byte 0x0a .endm - .macro graphicalhpupdate bank + .macro healthbarupdate bank .byte 0x0b .byte \bank .endm @@ -72,7 +72,7 @@ .byte 0x0d .endm - .macro missmessage + .macro effectivenesssound .byte 0x0e .endm @@ -85,7 +85,7 @@ .2byte \string .endm - .macro printstring2 string + .macro printselectionstring string .byte 0x11 .2byte \string .endm @@ -100,41 +100,41 @@ .4byte \table .endm - .macro printfromtable2 table + .macro printselectionstringfromtable table .byte 0x14 .4byte \table .endm - .macro seteffectwithchancetarget + .macro seteffectwithchance .byte 0x15 .endm - .macro seteffecttarget + .macro seteffectprimary .byte 0x16 .endm - .macro seteffectuser + .macro seteffectsecondary .byte 0x17 .endm - .macro clearstatus bank + .macro clearstatusfromeffect bank .byte 0x18 .byte \bank .endm - .macro faintpokemon bank, param2, param3 + .macro tryfaintmon bank, param2, param3 .byte 0x19 .byte \bank .byte \param2 .4byte \param3 .endm - .macro atk1a param1 + .macro dofaintanimation param1 .byte 0x1a .byte \param1 .endm - .macro atk1b bank + .macro cleareffectsonfaint bank .byte 0x1b .byte \bank .endm @@ -146,7 +146,7 @@ .4byte \address .endm - .macro jumpifsecondarytstatus bank, status, address + .macro jumpifstatus2 bank, status, address .byte 0x1d .byte \bank .4byte \status @@ -160,7 +160,7 @@ .4byte \address .endm - .macro jumpifhalverset bank, status, address + .macro jumpifsideaffecting bank, status, address .byte 0x1f .byte \bank .2byte \status @@ -176,7 +176,7 @@ .4byte \address .endm - .macro jumpifspecialstatusflag bank, mask, status, address + .macro jumpifstatus3condition bank, mask, status, address .byte 0x21 .byte \bank .4byte \mask @@ -191,7 +191,7 @@ .4byte \address .endm - .macro atk23 bank + .macro getexp bank .byte 0x23 .byte \bank .endm @@ -201,21 +201,21 @@ .4byte \address .endm - .macro atk25 + .macro movevaluescleanup .byte 0x25 .endm - .macro atk26 param1 + .macro setmultihit param1 .byte 0x26 .byte \param1 .endm - .macro atk27 address + .macro decrementmultihit address .byte 0x27 .4byte \address .endm - .macro jump address + .macro goto address .byte 0x28 .4byte \address .endm @@ -272,7 +272,7 @@ .byte \value .endm - .macro subtractbyte pointer, value + .macro subbyte pointer, value .byte 0x30 .4byte \pointer .byte \value @@ -285,7 +285,7 @@ .byte \size .endm - .macro atk32 param1, param2, param3, byte + .macro copyarraywithindex param1, param2, param3, byte .byte 0x32 .4byte \param1 .4byte \param2 @@ -334,11 +334,11 @@ .2byte \pause_duration .endm - .macro waitstateatk + .macro waitstate .byte 0x3a .endm - .macro somethinghealatk3b bank + .macro healthbar_update bank .byte 0x3b .byte \bank .endm @@ -359,12 +359,12 @@ .byte 0x3f .endm - .macro atk40 address + .macro jumpifaffectedbyprotect address .byte 0x40 .4byte \address .endm - .macro callatk address + .macro call address .byte 0x41 .4byte \address .endm @@ -382,7 +382,7 @@ .4byte \address .endm - .macro atk44 + .macro endselectionscript .byte 0x44 .endm @@ -393,14 +393,14 @@ .4byte \var_address .endm - .macro atk46 bank, address, int + .macro playanimation2 bank, address, int .byte 0x46 .byte \bank .4byte \address .4byte \int .endm - .macro atk47 + .macro setgraphicalstatchangevalues .byte 0x47 .endm @@ -411,37 +411,37 @@ .byte \byte .endm - .macro atk49 byte1, byte2 + .macro moveend byte1, byte2 .byte 0x49 .byte \byte1 .byte \byte2 .endm - .macro damagecalc2 + .macro typecalc2 .byte 0x4a .endm - .macro atk4b + .macro returnatktoball .byte 0x4b .endm - .macro switch1 bank + .macro getswitchedmondata bank .byte 0x4c .byte \bank .endm - .macro switch2 bank + .macro switchindataupdate bank .byte 0x4d .byte \bank .endm - .macro switch3 bank, byte + .macro switchinanim bank, byte .byte 0x4e .byte \bank .byte \byte .endm - .macro jumpifcannotswitch bank, address + .macro jumpifcantswitch bank, address .byte 0x4f .byte \bank .4byte \address @@ -453,33 +453,33 @@ .4byte \address .endm - .macro atk51 bank, param2 + .macro switchhandleorder bank, param2 .byte 0x51 .byte \bank .byte \param2 .endm - .macro atk52 bank + .macro switchineffects bank .byte 0x52 .byte \bank .endm - .macro atk53 bank + .macro trainerslidein bank .byte 0x53 .byte \bank .endm - .macro atk54 word + .macro playse word .byte 0x54 .2byte \word .endm - .macro atk55 int + .macro fanfare int .byte 0x55 - .4byte \int + .2byte \int .endm - .macro atk56 bank_or_side + .macro playfaintcry bank_or_side .byte 0x56 .byte \bank_or_side .endm @@ -488,34 +488,34 @@ .byte 0x57 .endm - .macro atk58 bank + .macro returntoball bank .byte 0x58 .byte \bank .endm - .macro checkiflearnmoveinbattle param1, param2, bank_maybe + .macro handlelearnnewmove param1, param2, bank_maybe .byte 0x59 .4byte \param1 .4byte \param2 .byte \bank_maybe .endm - .macro atk5a address + .macro yesnoboxlearnmove address .byte 0x5a .4byte \address .endm - .macro atk5b address + .macro yesnoboxstoplearningmove address .byte 0x5b .4byte \address .endm - .macro atk5c bank + .macro hitanimation bank .byte 0x5c .byte \bank .endm - .macro atk5d + .macro getmoneyreward .byte 0x5d .endm @@ -528,12 +528,12 @@ .byte 0x5f .endm - .macro atk60 byte + .macro incrementgamestat byte .byte 0x60 .byte \byte .endm - .macro atk61 bank_or_side + .macro drawpartystatussummary bank_or_side .byte 0x61 .byte \bank_or_side .endm @@ -543,7 +543,7 @@ .byte \bank_or_side .endm - .macro jumptoattack bank + .macro jumptorandomattack bank .byte 0x63 .byte \bank .endm @@ -553,28 +553,28 @@ .byte \bank .endm - .macro atk65 bank_or_side, address + .macro status2animation bank_or_side, address .byte 0x65 .byte \bank_or_side .4byte \address .endm - .macro atk66 bank_or_side, bank_or_side2, address + .macro chosenstatusanimation bank_or_side, bank_or_side2, address .byte 0x66 .byte \bank_or_side .byte \bank_or_side2 .4byte \address .endm - .macro atk67 + .macro yesnobox .byte 0x67 .endm - .macro atk68 + .macro cancelallactions .byte 0x68 .endm - .macro atk69 + .macro adjustsetdamage .byte 0x69 .endm @@ -583,62 +583,62 @@ .byte \bank .endm - .macro atk6b + .macro atknameinbuff1 .byte 0x6b .endm - .macro atk6c + .macro drawlvlupbox .byte 0x6c .endm - .macro atk6d + .macro resetsentmonsvalue .byte 0x6d .endm - .macro atk6e + .macro setatktoplayer0 .byte 0x6e .endm - .macro atk6f bank + .macro makevisible bank .byte 0x6f .byte \bank .endm - .macro atk70 bank + .macro recordlastability bank .byte 0x70 .byte \bank .endm - .macro atk71 + .macro buffermovetolearn .byte 0x71 .endm - .macro atk72 address + .macro jumpifplayerran address .byte 0x72 .4byte \address .endm - .macro atk73 bank + .macro hpthresholds bank .byte 0x73 .byte \bank .endm - .macro atk74 bank + .macro hpthresholds2 bank .byte 0x74 .byte \bank .endm - .macro atk75 + .macro useitemonopponent .byte 0x75 .endm - .macro atk76 bank, byte + .macro various bank, byte .byte 0x76 .byte \bank .byte \byte .endm - .macro setprotect + .macro setprotectlike .byte 0x77 .endm @@ -646,22 +646,22 @@ .byte 0x78 .endm - .macro setuserhptozero + .macro setatkhptozero .byte 0x79 .endm - .macro jumpwhiletargetvalid address + .macro jumpifnexttargetvalid address .byte 0x7a .4byte \address .endm - .macro setdamageasrestorehalfmaxhp address, byte + .macro tryhealhalfhealth address, byte .byte 0x7b .4byte \address .byte \byte .endm - .macro jumptolastusedattack + .macro trymirrormove .byte 0x7c .endm @@ -673,7 +673,7 @@ .byte 0x7e .endm - .macro setleechseed + .macro setseeded .byte 0x7f .endm @@ -682,7 +682,7 @@ .byte \id .endm - .macro setrest address + .macro trysetrest address .byte 0x81 .4byte \address .endm @@ -692,11 +692,11 @@ .4byte \address .endm - .macro nop3 + .macro nop .byte 0x83 .endm - .macro jumpifcannotsleep address + .macro jumpifcantmakeasleep address .byte 0x84 .4byte \address .endm @@ -710,7 +710,7 @@ .4byte \address .endm - .macro stockpiletohprecovery address + .macro stockpiletohpheal address .byte 0x87 .4byte \address .endm @@ -737,12 +737,12 @@ .byte 0x8c .endm - .macro setloopcounter count + .macro setmultihitcounter count .byte 0x8d .byte \count .endm - .macro atk8e + .macro initmultihitstring .byte 0x8e .endm @@ -751,12 +751,12 @@ .4byte \address .endm - .macro changetypestoenemyattacktype address + .macro tryconversiontypechange address .byte 0x90 .4byte \address .endm - .macro givemoney + .macro givepaydaymoney .byte 0x91 .endm @@ -764,12 +764,12 @@ .byte 0x92 .endm - .macro koplussomethings address + .macro tryKO address .byte 0x93 .4byte \address .endm - .macro gethalfcurrentenemyhp + .macro damagetohalftargethp .byte 0x94 .endm @@ -781,21 +781,21 @@ .byte 0x96 .endm - .macro tryinfatuatetarget address + .macro tryinfatuating address .byte 0x97 .4byte \address .endm - .macro atk98 byte + .macro updatestatusicon byte .byte 0x98 .byte \byte .endm - .macro setmisteffect + .macro setmist .byte 0x99 .endm - .macro setincreasedcriticalchance + .macro setfocusenergy .byte 0x9a .endm @@ -803,20 +803,20 @@ .byte 0x9b .endm - .macro setsubstituteeffect + .macro setsubstitute .byte 0x9c .endm - .macro copyattack address + .macro mimicattackcopy address .byte 0x9d .4byte \address .endm - .macro metronomeeffect + .macro metronome .byte 0x9e .endm - .macro nightshadedamageeffect + .macro dmgtolevel .byte 0x9f .endm @@ -839,12 +839,12 @@ .4byte \address .endm - .macro setencore address + .macro trysetencore address .byte 0xa4 .4byte \address .endm - .macro painsplitdamagecalculator address + .macro painsplitdmgcalc address .byte 0xa5 .4byte \address .endm @@ -863,16 +863,16 @@ .4byte \address .endm - .macro selectrandommovefromusermoves address + .macro trychoosesleeptalkmove address .byte 0xa9 .4byte \address .endm - .macro destinybondeffect + .macro setdestinybond .byte 0xaa .endm - .macro atkab + .macro trysetdestinybondtohappen .byte 0xab .endm @@ -880,12 +880,12 @@ .byte 0xac .endm - .macro reducepprandom address + .macro tryspiteppreduce address .byte 0xad .4byte \address .endm - .macro clearstatusifnotsoundproofed + .macro healpartystatus .byte 0xae .endm @@ -894,7 +894,7 @@ .4byte \address .endm - .macro setspikes address + .macro trysetspikes address .byte 0xb0 .4byte \address .endm @@ -903,7 +903,7 @@ .byte 0xb1 .endm - .macro setperishsong address + .macro trysetperishsong address .byte 0xb2 .4byte \address .endm @@ -912,13 +912,13 @@ .byte 0xb3 .endm - .macro jumpifconfusedandattackmaxed bank, address + .macro jumpifconfusedandstatmaxed bank, address .byte 0xb4 .byte \bank .4byte \address .endm - .macro furycutterdamagecalculation + .macro furycuttercalc .byte 0xb5 .endm @@ -938,7 +938,7 @@ .byte 0xb9 .endm - .macro atkba address + .macro jumpifnopursuitswitchdmg address .byte 0xba .4byte \address .endm @@ -957,11 +957,11 @@ .4byte \address .endm - .macro breakfree + .macro rapidspinfree .byte 0xbe .endm - .macro setcurled + .macro setdefensecurlbit .byte 0xbf .endm @@ -970,30 +970,30 @@ .4byte \address .endm - .macro hiddenpowerdamagecalculation + .macro hiddenpowercalc .byte 0xc1 .endm - .macro selectnexttarget + .macro selectfirstvalidtarget .byte 0xc2 .endm - .macro setfutureattack address + .macro trysetfutureattack address .byte 0xc3 .4byte \address .endm - .macro beatupcalculation address1, address2 + .macro trydobeatup address1, address2 .byte 0xc4 .4byte \address1 .4byte \address2 .endm - .macro hidepreattack + .macro setsemiinvulnerablebit .byte 0xc5 .endm - .macro unhidepostattack + .macro clearsemiinvulnerablebit .byte 0xc6 .endm @@ -1042,28 +1042,28 @@ .4byte \address .endm - .macro sethelpinghand address + .macro trysethelpinghand address .byte 0xd1 .4byte \address .endm - .macro itemswap address + .macro tryswapitems address .byte 0xd2 .4byte \address .endm - .macro copyability address + .macro trycopyability address .byte 0xd3 .4byte \address .endm - .macro atkd4 byte, address + .macro trywish byte, address .byte 0xd4 .byte \byte .4byte \address .endm - .macro setroots address + .macro trysetroots address .byte 0xd5 .4byte \address .endm @@ -1086,17 +1086,17 @@ .byte 0xd9 .endm - .macro abilityswap address + .macro tryswapabilities address .byte 0xda .4byte \address .endm - .macro imprisoneffect address + .macro tryimprision address .byte 0xdb .4byte \address .endm - .macro setgrudge address + .macro trysetgrudge address .byte 0xdc .4byte \address .endm @@ -1110,45 +1110,45 @@ .4byte \address .endm - .macro setmagiccoat address + .macro trysetmagiccoat address .byte 0xdf .4byte \address .endm - .macro setstealstatchange address + .macro trysetsnatch address .byte 0xe0 .4byte \address .endm - .macro atke1 address + .macro trygetintimidatetarget address .byte 0xe1 .4byte \address .endm - .macro atke2 bank + .macro switchoutabilities bank .byte 0xe2 .byte \bank .endm - .macro jumpiffainted bank, address + .macro jumpifhasnohp bank, address .byte 0xe3 .byte \bank .4byte \address .endm - .macro naturepowereffect + .macro getsecretpowereffect .byte 0xe4 .endm - .macro pickupitemcalculation + .macro pickup .byte 0xe5 .endm - .macro actualcastformswitch + .macro docastformchangeanimation .byte 0xe6 .endm - .macro castformswitch + .macro trycastformdatachange .byte 0xe7 .endm @@ -1157,11 +1157,11 @@ .4byte \address .endm - .macro seteffectbyweather + .macro setweatherballtype .byte 0xe9 .endm - .macro recycleitem address + .macro tryrecycleitem address .byte 0xea .4byte \address .endm @@ -1171,58 +1171,244 @@ .4byte \address .endm - .macro pursuitwhenswitched address + .macro pursuitrelated address .byte 0xec .4byte \address .endm - .macro snatchmove + .macro snatchsetbanks .byte 0xed .endm - .macro removereflectlightscreen + .macro removelightscreenreflect .byte 0xee .endm - .macro pokemoncatchfunction + .macro handleballthrow .byte 0xef .endm - .macro catchpoke + .macro givecaughtmon .byte 0xf0 .endm - .macro capturesomethingf1 address + .macro trysetcaughtmondexflags address .byte 0xf1 .4byte \address .endm - .macro capturesomethingf2 + .macro displaydexinfo .byte 0xf2 .endm - .macro capturesomethingf3 address + .macro trygivecaughtmonnick address .byte 0xf3 .4byte \address .endm - .macro removehp + .macro subattackerhpbydmg .byte 0xf4 .endm - .macro curestatusfirstword + .macro removeattackerstatus1 .byte 0xf5 .endm - .macro atkf6 + .macro finishaction .byte 0xf6 .endm - .macro activesidesomething + .macro finishturn .byte 0xf7 .endm - .macro atkf8 bank + .macro trainerslideout bank .byte 0xf8 .byte \bank .endm + +@ various command changed to more readable macros + .macro cancelmultiturnmoves bank + various \bank, VARIOUS_CANCEL_MULTI_TURN_MOVES + .endm + + .macro setmagiccoattarget bank + various \bank, VARIOUS_SET_MAGIC_COAT_TARGET + .endm + + .macro getifcantrunfrombattle bank + various \bank, VARIOUS_IS_RUNNING_IMPOSSIBLE + .endm + + .macro getmovetarget bank + various \bank, VARIOUS_GET_MOVE_TARGET + .endm + + .macro various4 bank + various \bank, 4 + .endm + + .macro resetintrimidatetracebits bank + various \bank, VARIOUS_RESET_INTIMIDATE_TRACE_BITS + .endm + + .macro updatechoicemoveonlvlup bank + various \bank, VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP + .endm + + .macro various7 bank + various \bank, 7 + .endm + + .macro various8 bank + various \bank, 8 + .endm + + .macro various9 bank + various \bank, 9 + .endm + + .macro various10 bank + various \bank, 10 + .endm + + .macro various11 bank + various \bank, 11 + .endm + + .macro various12 bank + various \bank, 12 + .endm + + .macro forfeityesnobox bank + various \bank, VARIOUS_EMIT_YESNOBOX + .endm + + .macro various14 bank + various \bank, 14 + .endm + + .macro various15 bank + various \bank, 15 + .endm + + .macro various16 bank + various \bank, 16 + .endm + + .macro various17 bank + various \bank, 17 + .endm + + .macro waitcry bank + various \bank, VARIOUS_WAIT_CRY + .endm + + .macro returnopponentmon1toball bank + various \bank, VARIOUS_RETURN_OPPONENT_MON1 + .endm + + .macro returnopponentmon2toball bank + various \bank, VARIOUS_RETURN_OPPONENT_MON2 + .endm + + .macro various21 bank + various \bank, 21 + .endm + + .macro various22 bank + various \bank, 22 + .endm + + .macro various23 bank + various \bank, 23 + .endm + + .macro various24 bank + various \bank, 24 + .endm + + .macro setoutcomeonteleport bank + various \bank, VARIOUS_SET_TELEPORT_OUTCOME + .endm + + .macro playtrainerdefeatbgm bank + various \bank, VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC + .endm + +@ helpful macros + .macro setstatchanger stat, stages, down + setbyte sSTATCHANGER \stat | \stages << 4 | \down << 7 + .endm + + .macro setmoveeffect effect + setbyte cEFFECT_CHOOSER \effect + .endm + + .macro chosenstatus1animation bank, status + chosenstatusanimation \bank 0x0 \status + .endm + + .macro chosenstatus2animation bank, status + chosenstatusanimation \bank 0x1 \status + .endm + + .macro sethword dst, value + setbyte \dst, \value & 0xFF + setbyte \dst + 1, (\value >> 8) & 0xFF + .endm + + .macro setword dst, value + setbyte \dst, \value & 0xFF + setbyte \dst + 1, (\value >> 8) & 0xFF + setbyte \dst + 2, (\value >> 16) & 0xFF + setbyte \dst + 3, (\value >> 24) & 0xFF + .endm + + .macro copybyte dst, src + copyarray \dst, \src, 0x1 + .endm + + .macro copyhword dst, src + copyarray \dst, \src, 0x2 + .endm + + .macro copyword dst, src + copyarray \dst, \src, 0x4 + .endm + + .macro jumpifbytenotequal byte1, byte2, jumpptr + jumpifarraynotequal \byte1, \byte2, 0x1, \jumpptr + .endm + + .macro jumpifbyteequal byte1, byte2, jumpptr + jumpifarrayequal \byte1, \byte2, 0x1, \jumpptr + .endm + + .macro jumpifmove move, jumpptr + jumpifhalfword EQUAL, gCurrentMove, \move, \jumpptr + .endm + + .macro jumpifnotmove move, jumpptr + jumpifhalfword NOT_EQUAL, gCurrentMove, \move, \jumpptr + .endm + + .macro jumpifstatus3 bank, status, jumpptr + jumpifstatus3condition \bank, \status, 0x0, \jumpptr + .endm + + .macro jumpifnostatus3 bank, status, jumpptr + jumpifstatus3condition \bank, \status, 0x1, \jumpptr + .endm + + .macro jumpifmovehadnoeffect jumpptr + jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, \jumpptr + .endm + + .macro jumpifbattletype flags, jumpptr + jumpifhalfword COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr + .endm + + .macro jumpifnotbattletype flags, jumpptr + jumpifhalfword NO_COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr + .endm diff --git a/asm/normal.s b/asm/normal.s index 2d084dcf1..a800b348a 100755 --- a/asm/normal.s +++ b/asm/normal.s @@ -22,7 +22,7 @@ sub_80E1CB4: @ 80E1CB4 strh r0, [r4, 0x22] ldrh r0, [r5, 0x4] strh r0, [r4, 0x2E] - ldr r0, _080E1CF0 @ =gBattleAnimBankAttacker + ldr r0, _080E1CF0 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -37,7 +37,7 @@ sub_80E1CB4: @ 80E1CB4 b _080E1D02 .align 2, 0 _080E1CEC: .4byte gBattleAnimArgs -_080E1CF0: .4byte gBattleAnimBankAttacker +_080E1CF0: .4byte gAnimBankAttacker _080E1CF4: ldrh r0, [r5, 0x6] strh r0, [r4, 0x30] @@ -108,7 +108,7 @@ _080E1D5A: cmp r0, r1 bne _080E1D7E adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080E1D7E: pop {r4} pop {r0} @@ -198,7 +198,7 @@ sub_80E1E0C: @ 80E1E0C cmp r0, 0 bne _080E1E22 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080E1E22: pop {r0} bx r0 @@ -338,7 +338,7 @@ sub_80E1F0C: @ 80E1F0C movs r2, 0 bl BlendPalettes adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080E1F32: pop {r4} pop {r0} @@ -875,9 +875,9 @@ sub_80E2324: @ 80E2324 lsrs r0, 24 mov r8, r0 movs r2, 0 - ldr r0, _080E239C @ =gBattleAnimBankAttacker + ldr r0, _080E239C @ =gAnimBankAttacker ldrb r6, [r0] - ldr r0, _080E23A0 @ =gBattleAnimBankTarget + ldr r0, _080E23A0 @ =gAnimBankTarget ldrb r7, [r0] ldr r4, _080E23A4 @ =gBattleAnimArgs ldrh r1, [r4] @@ -927,8 +927,8 @@ _080E2382: pop {r0} bx r0 .align 2, 0 -_080E239C: .4byte gBattleAnimBankAttacker -_080E23A0: .4byte gBattleAnimBankTarget +_080E239C: .4byte gAnimBankAttacker +_080E23A0: .4byte gAnimBankTarget _080E23A4: .4byte gBattleAnimArgs thumb_func_end sub_80E2324 @@ -971,10 +971,10 @@ _080E23EA: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - ldr r0, _080E24A4 @ =gBattleAnimBankAttacker + ldr r0, _080E24A4 @ =gAnimBankAttacker ldrb r0, [r0] mov r9, r0 - ldr r0, _080E24A8 @ =gBattleAnimBankTarget + ldr r0, _080E24A8 @ =gAnimBankTarget ldrb r0, [r0] mov r10, r0 ldrh r1, [r4, 0xC] @@ -1061,8 +1061,8 @@ _080E248E: .align 2, 0 _080E249C: .4byte gTasks _080E24A0: .4byte gBattleAnimArgs -_080E24A4: .4byte gBattleAnimBankAttacker -_080E24A8: .4byte gBattleAnimBankTarget +_080E24A4: .4byte gAnimBankAttacker +_080E24A8: .4byte gAnimBankTarget _080E24AC: .4byte 0x0000ffff _080E24B0: .4byte gSprites _080E24B4: .4byte gHealthboxIDs @@ -1237,7 +1237,7 @@ _080E25D2: bcc _080E25D2 _080E25F4: adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080E25FA: pop {r4-r7} pop {r0} @@ -1253,7 +1253,7 @@ sub_80E260C: @ 80E260C push {r4-r6,lr} ldr r6, _080E2680 @ =gSprites ldr r4, _080E2684 @ =gObjectBankIDs - ldr r5, _080E2688 @ =gBattleAnimBankAttacker + ldr r5, _080E2688 @ =gAnimBankAttacker ldrb r0, [r5] adds r0, r4 ldrb r0, [r0] @@ -1268,7 +1268,7 @@ sub_80E260C: @ 80E260C adds r0, r2, 0 ands r0, r3 strb r0, [r1] - ldr r3, _080E268C @ =gBattleAnimBankTarget + ldr r3, _080E268C @ =gAnimBankTarget ldrb r0, [r3] adds r0, r4 ldrb r1, [r0] @@ -1310,8 +1310,8 @@ sub_80E260C: @ 80E260C .align 2, 0 _080E2680: .4byte gSprites _080E2684: .4byte gObjectBankIDs -_080E2688: .4byte gBattleAnimBankAttacker -_080E268C: .4byte gBattleAnimBankTarget +_080E2688: .4byte gAnimBankAttacker +_080E268C: .4byte gAnimBankTarget _080E2690: .4byte gBattleAnimArgs _080E2694: cmp r0, 0 @@ -1482,7 +1482,7 @@ _080E27C4: _080E27CC: ldr r0, _080E27E0 @ =sub_80785E4 str r0, [r5, 0x1C] - ldr r1, _080E27E4 @ =move_anim_8072740 + ldr r1, _080E27E4 @ =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData pop {r4,r5} @@ -1490,7 +1490,7 @@ _080E27CC: bx r0 .align 2, 0 _080E27E0: .4byte sub_80785E4 -_080E27E4: .4byte move_anim_8072740 +_080E27E4: .4byte DestroyAnimSprite thumb_func_end sub_80E27A0 thumb_func_start sub_80E27E8 @@ -1536,13 +1536,13 @@ _080E2834: .4byte sub_80DA48C sub_80E2838: @ 80E2838 push {r4,lr} adds r4, r0, 0 - ldr r0, _080E2868 @ =gBattleAnimBankAttacker + ldr r0, _080E2868 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080E285C - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E285C @@ -1557,7 +1557,7 @@ _080E285C: pop {r0} bx r0 .align 2, 0 -_080E2868: .4byte gBattleAnimBankAttacker +_080E2868: .4byte gAnimBankAttacker _080E286C: .4byte gBattleAnimArgs thumb_func_end sub_80E2838 @@ -1706,7 +1706,7 @@ _080E299C: ldr r0, _080E29B4 @ =gBattleAnimArgs ldrh r0, [r0, 0x6] strh r0, [r4, 0x2E] - ldr r1, _080E29B8 @ =move_anim_8072740 + ldr r1, _080E29B8 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData ldr r0, _080E29BC @ =sub_80782D8 @@ -1716,7 +1716,7 @@ _080E299C: bx r0 .align 2, 0 _080E29B4: .4byte gBattleAnimArgs -_080E29B8: .4byte move_anim_8072740 +_080E29B8: .4byte DestroyAnimSprite _080E29BC: .4byte sub_80782D8 thumb_func_end sub_80E2978 @@ -1778,7 +1778,7 @@ sub_80E29FC: @ 80E29FC cmp r0, 0xC ble _080E2A32 adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080E2A32: pop {r0} bx r0 @@ -1857,33 +1857,33 @@ _080E2AD0: movs r5, 0 _080E2AD2: mov r0, sp - ldr r1, _080E2AD8 @ =gBattleAnimBankAttacker + ldr r1, _080E2AD8 @ =gAnimBankAttacker b _080E2AE2 .align 2, 0 -_080E2AD8: .4byte gBattleAnimBankAttacker +_080E2AD8: .4byte gAnimBankAttacker _080E2ADC: movs r5, 0 _080E2ADE: mov r0, sp - ldr r1, _080E2AE8 @ =gBattleAnimBankTarget + ldr r1, _080E2AE8 @ =gAnimBankTarget _080E2AE2: ldrb r1, [r1] strb r1, [r0] b _080E2B26 .align 2, 0 -_080E2AE8: .4byte gBattleAnimBankTarget +_080E2AE8: .4byte gAnimBankTarget _080E2AEC: mov r1, sp - ldr r0, _080E2AFC @ =gBattleAnimBankAttacker + ldr r0, _080E2AFC @ =gAnimBankAttacker ldrb r0, [r0] strb r0, [r1] - ldr r0, _080E2B00 @ =gBattleAnimBankTarget + ldr r0, _080E2B00 @ =gAnimBankTarget ldrb r0, [r0] strb r0, [r1, 0x1] b _080E2B26 .align 2, 0 -_080E2AFC: .4byte gBattleAnimBankAttacker -_080E2B00: .4byte gBattleAnimBankTarget +_080E2AFC: .4byte gAnimBankAttacker +_080E2B00: .4byte gAnimBankTarget _080E2B04: mov r1, sp movs r0, 0xFF @@ -1892,14 +1892,14 @@ _080E2B04: _080E2B0C: movs r5, 0 mov r2, sp - ldr r0, _080E2B14 @ =gBattleAnimBankAttacker + ldr r0, _080E2B14 @ =gAnimBankAttacker b _080E2B1E .align 2, 0 -_080E2B14: .4byte gBattleAnimBankAttacker +_080E2B14: .4byte gAnimBankAttacker _080E2B18: movs r5, 0 mov r2, sp - ldr r0, _080E2B70 @ =gBattleAnimBankTarget + ldr r0, _080E2B70 @ =gAnimBankTarget _080E2B1E: ldrb r0, [r0] movs r1, 0x2 @@ -1942,7 +1942,7 @@ _080E2B54: pop {r0} bx r0 .align 2, 0 -_080E2B70: .4byte gBattleAnimBankTarget +_080E2B70: .4byte gAnimBankTarget thumb_func_end sub_80E2A7C thumb_func_start sub_80E2B74 @@ -2447,9 +2447,9 @@ sub_80E2F2C: @ 80E2F2C lsrs r0, 24 mov r9, r0 movs r7, 0 - ldr r0, _080E3038 @ =gUnknown_030042C4 + ldr r0, _080E3038 @ =gBattle_WIN0H strh r7, [r0] - ldr r0, _080E303C @ =gUnknown_03004240 + ldr r0, _080E303C @ =gBattle_WIN0V strh r7, [r0] ldr r1, _080E3040 @ =REG_WININ ldr r2, _080E3044 @ =0x00003f3f @@ -2490,7 +2490,7 @@ sub_80E2F2C: @ 80E2F2C movs r1, 0x20 orrs r0, r1 strb r0, [r4, 0x1] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E2FAC @@ -2506,11 +2506,11 @@ _080E2FAC: lsls r0, 24 cmp r0, 0 beq _080E3028 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E3028 - ldr r5, _080E305C @ =gBattleAnimBankAttacker + ldr r5, _080E305C @ =gAnimBankAttacker ldrb r0, [r5] bl GetBankIdentity lsls r0, 24 @@ -2561,7 +2561,7 @@ _080E2FDC: strb r0, [r4] movs r7, 0x1 _080E3028: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080E306C @@ -2569,8 +2569,8 @@ _080E3028: ldrh r4, [r0] b _080E30B4 .align 2, 0 -_080E3038: .4byte gUnknown_030042C4 -_080E303C: .4byte gUnknown_03004240 +_080E3038: .4byte gBattle_WIN0H +_080E303C: .4byte gBattle_WIN0V _080E3040: .4byte REG_WININ _080E3044: .4byte 0x00003f3f _080E3048: .4byte 0x00003f3d @@ -2578,12 +2578,12 @@ _080E304C: .4byte REG_BLDCNT _080E3050: .4byte 0x00003f42 _080E3054: .4byte 0x00000c08 _080E3058: .4byte REG_BG1CNT -_080E305C: .4byte gBattleAnimBankAttacker +_080E305C: .4byte gAnimBankAttacker _080E3060: .4byte gSprites _080E3064: .4byte gObjectBankIDs _080E3068: .4byte gSharedMem + 0x19348 _080E306C: - ldr r4, _080E308C @ =gBattleAnimBankAttacker + ldr r4, _080E308C @ =gAnimBankAttacker ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -2599,7 +2599,7 @@ _080E306C: ldr r1, _080E3094 @ =gEnemyParty b _080E30A8 .align 2, 0 -_080E308C: .4byte gBattleAnimBankAttacker +_080E308C: .4byte gAnimBankAttacker _080E3090: .4byte gBattlePartyID _080E3094: .4byte gEnemyParty _080E3098: @@ -2622,7 +2622,7 @@ _080E30B4: bl GetAnimBankSpriteId lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080E3168 @ =gBattleAnimBankAttacker + ldr r0, _080E3168 @ =gAnimBankAttacker ldrb r0, [r0] adds r1, r5, 0 adds r2, r4, 0 @@ -2643,7 +2643,7 @@ _080E30B4: ldr r0, [r2, 0x8] ldr r0, _080E3174 @ =gUnknown_08D20A30 bl LZDecompressVram - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080E3106 @@ -2664,7 +2664,7 @@ _080E3106: adds r1, 0x1 movs r2, 0x2 bl LoadPalette - ldr r2, _080E3180 @ =gUnknown_030042C0 + ldr r2, _080E3180 @ =gBattle_BG1_X ldr r0, _080E3184 @ =gSprites lsls r1, r5, 4 adds r1, r5 @@ -2674,7 +2674,7 @@ _080E3106: negs r0, r0 adds r0, 0x20 strh r0, [r2] - ldr r2, _080E3188 @ =gUnknown_030041B4 + ldr r2, _080E3188 @ =gBattle_BG1_Y ldrh r0, [r1, 0x22] negs r0, r0 adds r0, 0x20 @@ -2699,15 +2699,15 @@ _080E3106: .align 2, 0 _080E3160: .4byte gBattlePartyID _080E3164: .4byte gPlayerParty -_080E3168: .4byte gBattleAnimBankAttacker +_080E3168: .4byte gAnimBankAttacker _080E316C: .4byte 0x040000d4 _080E3170: .4byte 0x85000400 _080E3174: .4byte gUnknown_08D20A30 _080E3178: .4byte gUnknown_08D20A14 _080E317C: .4byte gUnknown_083DB568 -_080E3180: .4byte gUnknown_030042C0 +_080E3180: .4byte gBattle_BG1_X _080E3184: .4byte gSprites -_080E3188: .4byte gUnknown_030041B4 +_080E3188: .4byte gBattle_BG1_Y _080E318C: .4byte gTasks _080E3190: .4byte sub_80E3194 thumb_func_end sub_80E2F2C @@ -2729,7 +2729,7 @@ sub_80E3194: @ 80E3194 adds r0, 0x4 movs r5, 0 strh r0, [r4, 0x1C] - ldr r7, _080E32B0 @ =gUnknown_030041B4 + ldr r7, _080E32B0 @ =gBattle_BG1_Y ldrh r2, [r7] subs r1, r2, 0x4 strh r1, [r7] @@ -2750,9 +2750,9 @@ sub_80E3194: @ 80E3194 bne _080E329E movs r0, 0 bl sub_8076464 - ldr r0, _080E32B4 @ =gUnknown_030042C4 + ldr r0, _080E32B4 @ =gBattle_WIN0H strh r5, [r0] - ldr r0, _080E32B8 @ =gUnknown_03004240 + ldr r0, _080E32B8 @ =gBattle_WIN0V strh r5, [r0] ldr r0, _080E32BC @ =REG_WININ ldr r2, _080E32C0 @ =0x00003f3f @@ -2760,7 +2760,7 @@ sub_80E3194: @ 80E3194 strh r1, [r0] adds r0, 0x2 strh r1, [r0] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E3208 @@ -2810,7 +2810,7 @@ _080E3208: cmp r0, 0x1 bne _080E3288 ldr r2, _080E32D8 @ =gObjectBankIDs - ldr r0, _080E32DC @ =gBattleAnimBankAttacker + ldr r0, _080E32DC @ =gAnimBankAttacker ldrb r1, [r0] movs r0, 0x2 eors r0, r1 @@ -2852,9 +2852,9 @@ _080E329E: bx r0 .align 2, 0 _080E32AC: .4byte gTasks -_080E32B0: .4byte gUnknown_030041B4 -_080E32B4: .4byte gUnknown_030042C4 -_080E32B8: .4byte gUnknown_03004240 +_080E32B0: .4byte gBattle_BG1_Y +_080E32B4: .4byte gBattle_WIN0H +_080E32B8: .4byte gBattle_WIN0V _080E32BC: .4byte REG_WININ _080E32C0: .4byte 0x00003f3f _080E32C4: .4byte REG_BG1CNT @@ -2863,7 +2863,7 @@ _080E32CC: .4byte gSprites _080E32D0: .4byte 0x040000d4 _080E32D4: .4byte 0x85000200 _080E32D8: .4byte gObjectBankIDs -_080E32DC: .4byte gBattleAnimBankAttacker +_080E32DC: .4byte gAnimBankAttacker thumb_func_end sub_80E3194 thumb_func_start sub_80E32E0 @@ -2954,13 +2954,13 @@ _080E336C: ldrsh r0, [r7, r1] cmp r0, 0 bne _080E3390 - ldr r0, _080E338C @ =gBattleAnimBankAttacker + ldr r0, _080E338C @ =gAnimBankAttacker b _080E3392 .align 2, 0 _080E3388: .4byte gTasks -_080E338C: .4byte gBattleAnimBankAttacker +_080E338C: .4byte gAnimBankAttacker _080E3390: - ldr r0, _080E34B4 @ =gBattleAnimBankTarget + ldr r0, _080E34B4 @ =gAnimBankTarget _080E3392: ldrb r5, [r0] movs r0, 0x2 @@ -2968,7 +2968,7 @@ _080E3392: mov r2, r8 eors r2, r0 mov r8, r2 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E33BC @@ -2985,10 +2985,10 @@ _080E33BC: movs r0, 0 strh r0, [r7, 0x6] _080E33C0: - ldr r0, _080E34B8 @ =gUnknown_030042C4 + ldr r0, _080E34B8 @ =gBattle_WIN0H movs r1, 0 strh r1, [r0] - ldr r0, _080E34BC @ =gUnknown_03004240 + ldr r0, _080E34BC @ =gBattle_WIN0V strh r1, [r0] ldr r1, _080E34C0 @ =REG_WININ ldr r2, _080E34C4 @ =0x00003f3f @@ -3030,7 +3030,7 @@ _080E33C0: movs r1, 0x20 orrs r0, r1 strb r0, [r4, 0x1] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E3432 @@ -3097,7 +3097,7 @@ _080E345E: movs r2, 0x1 str r2, [sp, 0x20] _080E34A4: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080E34E4 @@ -3105,9 +3105,9 @@ _080E34A4: ldrh r4, [r0] b _080E3522 .align 2, 0 -_080E34B4: .4byte gBattleAnimBankTarget -_080E34B8: .4byte gUnknown_030042C4 -_080E34BC: .4byte gUnknown_03004240 +_080E34B4: .4byte gAnimBankTarget +_080E34B8: .4byte gBattle_WIN0H +_080E34BC: .4byte gBattle_WIN0V _080E34C0: .4byte REG_WININ _080E34C4: .4byte 0x00003f3f _080E34C8: .4byte 0x00003f3d @@ -3191,7 +3191,7 @@ _080E3578: ldr r1, [sp, 0x4] bl LZDecompressVram _080E3580: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080E3598 @@ -3272,10 +3272,10 @@ _080E3610: movs r2, 0x20 bl LoadCompressedPalette _080E361E: - ldr r2, _080E3648 @ =gUnknown_030042C0 + ldr r2, _080E3648 @ =gBattle_BG1_X movs r1, 0 strh r1, [r2] - ldr r0, _080E364C @ =gUnknown_030041B4 + ldr r0, _080E364C @ =gBattle_BG1_Y strh r1, [r0] movs r3, 0 ldrsh r0, [r7, r3] @@ -3293,8 +3293,8 @@ _080E361E: b _080E3668 .align 2, 0 _080E3644: .4byte gBattleStatMask5_Pal -_080E3648: .4byte gUnknown_030042C0 -_080E364C: .4byte gUnknown_030041B4 +_080E3648: .4byte gBattle_BG1_X +_080E364C: .4byte gBattle_BG1_Y _080E3650: .4byte gTasks _080E3654: .4byte 0x0000fffd _080E3658: @@ -3356,7 +3356,7 @@ _080E3692: bne _080E36E0 movs r0, 0x40 negs r0, r0 - bl sub_8077094 + bl BattleAnimAdjustPanning2 adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -3369,7 +3369,7 @@ _080E36DC: .4byte sub_80E3704 _080E36E0: movs r0, 0x40 negs r0, r0 - bl sub_8077094 + bl BattleAnimAdjustPanning2 adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -3391,7 +3391,7 @@ sub_80E3704: @ 80E3704 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r2, _080E3730 @ =gUnknown_030041B4 + ldr r2, _080E3730 @ =gBattle_BG1_Y ldr r1, _080E3734 @ =gTasks lsls r0, r6, 2 adds r0, r6 @@ -3411,7 +3411,7 @@ sub_80E3704: @ 80E3704 beq _080E373E b _080E3866 .align 2, 0 -_080E3730: .4byte gUnknown_030041B4 +_080E3730: .4byte gBattle_BG1_Y _080E3734: .4byte gTasks _080E3738: cmp r2, 0x2 @@ -3484,9 +3484,9 @@ _080E378E: bne _080E3866 movs r0, 0 bl sub_8076464 - ldr r0, _080E3870 @ =gUnknown_030042C4 + ldr r0, _080E3870 @ =gBattle_WIN0H strh r5, [r0] - ldr r0, _080E3874 @ =gUnknown_03004240 + ldr r0, _080E3874 @ =gBattle_WIN0V strh r5, [r0] ldr r0, _080E3878 @ =REG_WININ ldr r2, _080E387C @ =0x00003f3f @@ -3494,7 +3494,7 @@ _080E378E: strh r1, [r0] adds r0, 0x2 strh r1, [r0] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E37E8 @@ -3573,8 +3573,8 @@ _080E3866: bx r0 .align 2, 0 _080E386C: .4byte REG_BLDALPHA -_080E3870: .4byte gUnknown_030042C4 -_080E3874: .4byte gUnknown_03004240 +_080E3870: .4byte gBattle_WIN0H +_080E3874: .4byte gBattle_WIN0V _080E3878: .4byte REG_WININ _080E387C: .4byte 0x00003f3f _080E3880: .4byte REG_BG1CNT @@ -3791,7 +3791,7 @@ sub_80E3A08: @ 80E3A08 lsrs r6, r0, 24 movs r4, 0 movs r2, 0 - ldr r0, _080E3A50 @ =gBattleAnimBankAttacker + ldr r0, _080E3A50 @ =gAnimBankAttacker ldrb r3, [r0] movs r5, 0x1 _080E3A18: @@ -3824,7 +3824,7 @@ _080E3A34: pop {r0} bx r0 .align 2, 0 -_080E3A50: .4byte gBattleAnimBankAttacker +_080E3A50: .4byte gAnimBankAttacker _080E3A54: .4byte gBattleAnimArgs thumb_func_end sub_80E3A08 @@ -3845,7 +3845,7 @@ sub_80E3A58: @ 80E3A58 ldrsh r0, [r4, r1] cmp r0, 0 beq _080E3A94 - ldr r0, _080E3AC8 @ =gBattleAnimBankAttacker + ldr r0, _080E3AC8 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -3881,7 +3881,7 @@ _080E3A94: .align 2, 0 _080E3AC0: .4byte sub_80E3AD0 _080E3AC4: .4byte gBattleAnimArgs -_080E3AC8: .4byte gBattleAnimBankAttacker +_080E3AC8: .4byte gAnimBankAttacker _080E3ACC: .4byte gTasks thumb_func_end sub_80E3A58 @@ -3953,7 +3953,7 @@ sub_80E3B4C: @ 80E3B4C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080E3B70 @ =gBattleAnimBankAttacker + ldr r0, _080E3B70 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide ldr r1, _080E3B74 @ =gBattleAnimArgs @@ -3966,7 +3966,7 @@ sub_80E3B4C: @ 80E3B4C pop {r0} bx r0 .align 2, 0 -_080E3B70: .4byte gBattleAnimBankAttacker +_080E3B70: .4byte gAnimBankAttacker _080E3B74: .4byte gBattleAnimArgs thumb_func_end sub_80E3B4C @@ -3976,7 +3976,7 @@ sub_80E3B78: @ 80E3B78 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080E3B9C @ =gBattleAnimBankTarget + ldr r0, _080E3B9C @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide ldr r1, _080E3BA0 @ =gBattleAnimArgs @@ -3989,7 +3989,7 @@ sub_80E3B78: @ 80E3B78 pop {r0} bx r0 .align 2, 0 -_080E3B9C: .4byte gBattleAnimBankTarget +_080E3B9C: .4byte gAnimBankTarget _080E3BA0: .4byte gBattleAnimArgs thumb_func_end sub_80E3B78 @@ -4000,10 +4000,10 @@ sub_80E3BA4: @ 80E3BA4 lsrs r3, r0, 24 ldr r5, _080E3BD0 @ =gBattleAnimArgs movs r4, 0 - ldr r0, _080E3BD4 @ =gBattleAnimBankAttacker + ldr r0, _080E3BD4 @ =gAnimBankAttacker ldrb r2, [r0] movs r0, 0x2 - ldr r1, _080E3BD8 @ =gBattleAnimBankTarget + ldr r1, _080E3BD8 @ =gAnimBankTarget eors r0, r2 ldrb r1, [r1] cmp r0, r1 @@ -4018,8 +4018,8 @@ _080E3BC0: bx r0 .align 2, 0 _080E3BD0: .4byte gBattleAnimArgs -_080E3BD4: .4byte gBattleAnimBankAttacker -_080E3BD8: .4byte gBattleAnimBankTarget +_080E3BD4: .4byte gAnimBankAttacker +_080E3BD8: .4byte gAnimBankTarget thumb_func_end sub_80E3BA4 thumb_func_start sub_80E3BDC @@ -4030,7 +4030,7 @@ sub_80E3BDC: @ 80E3BDC movs r4, 0 ldr r6, _080E3C3C @ =gSprites _080E3BE6: - ldr r0, _080E3C40 @ =gBattleAnimBankAttacker + ldr r0, _080E3C40 @ =gAnimBankAttacker ldrb r0, [r0] cmp r4, r0 beq _080E3C24 @@ -4073,7 +4073,7 @@ _080E3C24: bx r0 .align 2, 0 _080E3C3C: .4byte gSprites -_080E3C40: .4byte gBattleAnimBankAttacker +_080E3C40: .4byte gAnimBankAttacker _080E3C44: .4byte gObjectBankIDs _080E3C48: .4byte gBattleAnimArgs thumb_func_end sub_80E3BDC @@ -4115,7 +4115,7 @@ sub_80E3C4C: @ 80E3C4C movs r0, 0x2 adds r6, r7, 0 eors r6, r0 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E3CAE @@ -4131,10 +4131,10 @@ _080E3CAE: movs r2, 0 mov r8, r2 _080E3CB2: - ldr r0, _080E3D34 @ =gUnknown_030042C4 + ldr r0, _080E3D34 @ =gBattle_WIN0H movs r1, 0 strh r1, [r0] - ldr r0, _080E3D38 @ =gUnknown_03004240 + ldr r0, _080E3D38 @ =gBattle_WIN0V strh r1, [r0] ldr r1, _080E3D3C @ =REG_WININ ldr r3, _080E3D40 @ =0x00003f3f @@ -4175,7 +4175,7 @@ _080E3CB2: movs r1, 0x20 orrs r0, r1 strb r0, [r4, 0x1] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E3D22 @@ -4187,7 +4187,7 @@ _080E3CB2: orrs r1, r0 strb r1, [r4] _080E3D22: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080E3D58 @@ -4195,8 +4195,8 @@ _080E3D22: ldrh r4, [r0] b _080E3D96 .align 2, 0 -_080E3D34: .4byte gUnknown_030042C4 -_080E3D38: .4byte gUnknown_03004240 +_080E3D34: .4byte gBattle_WIN0H +_080E3D38: .4byte gBattle_WIN0V _080E3D3C: .4byte REG_WININ _080E3D40: .4byte 0x00003f3f _080E3D44: .4byte 0x00003f3d @@ -4261,7 +4261,7 @@ _080E3DC0: ldr r1, [sp, 0x4] ldr r0, [sp, 0x50] bl LZDecompressVram - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080E3DE6 @@ -4281,10 +4281,10 @@ _080E3DE6: ldr r0, [sp, 0x54] movs r2, 0x20 bl LoadCompressedPalette - ldr r0, _080E3E54 @ =gUnknown_030042C0 + ldr r0, _080E3E54 @ =gBattle_BG1_X movs r1, 0 strh r1, [r0] - ldr r0, _080E3E58 @ =gUnknown_030041B4 + ldr r0, _080E3E58 @ =gBattle_BG1_Y strh r1, [r0] ldr r1, _080E3E5C @ =gTasks mov r2, r9 @@ -4323,8 +4323,8 @@ _080E3DE6: _080E3E48: .4byte gBattlePartyID _080E3E4C: .4byte gPlayerParty _080E3E50: .4byte gObjectBankIDs -_080E3E54: .4byte gUnknown_030042C0 -_080E3E58: .4byte gUnknown_030041B4 +_080E3E54: .4byte gBattle_BG1_X +_080E3E58: .4byte gBattle_BG1_Y _080E3E5C: .4byte gTasks _080E3E60: .4byte sub_80E3E64 thumb_func_end sub_80E3C4C @@ -4353,7 +4353,7 @@ _080E3E80: ldrsh r0, [r3, r1] cmp r0, 0 bge _080E3EA4 - ldr r2, _080E3EA0 @ =gUnknown_030041B4 + ldr r2, _080E3EA0 @ =gBattle_BG1_Y lsls r1, r4, 16 asrs r1, 24 ldrh r0, [r2] @@ -4362,9 +4362,9 @@ _080E3E80: b _080E3EB0 .align 2, 0 _080E3E9C: .4byte gTasks -_080E3EA0: .4byte gUnknown_030041B4 +_080E3EA0: .4byte gBattle_BG1_Y _080E3EA4: - ldr r1, _080E3ED4 @ =gUnknown_030041B4 + ldr r1, _080E3ED4 @ =gBattle_BG1_Y lsls r0, r4, 16 asrs r0, 24 ldrh r2, [r1] @@ -4390,7 +4390,7 @@ _080E3EB0: beq _080E3EDE b _080E3FE2 .align 2, 0 -_080E3ED4: .4byte gUnknown_030041B4 +_080E3ED4: .4byte gBattle_BG1_Y _080E3ED8: cmp r0, 0x2 beq _080E3F32 @@ -4465,9 +4465,9 @@ _080E3F32: bne _080E3FE2 movs r0, 0 bl sub_8076464 - ldr r0, _080E3FEC @ =gUnknown_030042C4 + ldr r0, _080E3FEC @ =gBattle_WIN0H strh r5, [r0] - ldr r0, _080E3FF0 @ =gUnknown_03004240 + ldr r0, _080E3FF0 @ =gBattle_WIN0V strh r5, [r0] ldr r0, _080E3FF4 @ =REG_WININ ldr r2, _080E3FF8 @ =0x00003f3f @@ -4475,7 +4475,7 @@ _080E3F32: strh r1, [r0] adds r0, 0x2 strh r1, [r0] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E3F90 @@ -4531,8 +4531,8 @@ _080E3FE2: bx r0 .align 2, 0 _080E3FE8: .4byte REG_BLDALPHA -_080E3FEC: .4byte gUnknown_030042C4 -_080E3FF0: .4byte gUnknown_03004240 +_080E3FEC: .4byte gBattle_WIN0H +_080E3FF0: .4byte gBattle_WIN0V _080E3FF4: .4byte REG_WININ _080E3FF8: .4byte 0x00003f3f _080E3FFC: .4byte REG_BG1CNT @@ -4596,14 +4596,14 @@ _080E4068: .4byte gBattleAnimArgs _080E406C: cmp r0, 0x1 bne _080E4078 - ldr r0, _080E4074 @ =gBattleAnimBankAttacker + ldr r0, _080E4074 @ =gAnimBankAttacker b _080E407E .align 2, 0 -_080E4074: .4byte gBattleAnimBankAttacker +_080E4074: .4byte gAnimBankAttacker _080E4078: cmp r0, 0x2 bne _080E4084 - ldr r0, _080E409C @ =gBattleAnimBankTarget + ldr r0, _080E409C @ =gAnimBankTarget _080E407E: ldrb r0, [r0] adds r4, r0, 0 @@ -4613,14 +4613,14 @@ _080E4084: movs r1, 0x2 ldrsh r0, [r0, r1] lsls r5, r0, 5 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080E40A8 ldr r0, _080E40A4 @ =gSharedMem + 0x14800 b _080E40AA .align 2, 0 -_080E409C: .4byte gBattleAnimBankTarget +_080E409C: .4byte gAnimBankTarget _080E40A0: .4byte gBattleAnimArgs _080E40A4: .4byte gSharedMem + 0x14800 _080E40A8: @@ -4683,14 +4683,14 @@ _080E4110: .4byte gBattleAnimArgs _080E4114: cmp r0, 0x1 bne _080E4120 - ldr r0, _080E411C @ =gBattleAnimBankAttacker + ldr r0, _080E411C @ =gAnimBankAttacker b _080E4126 .align 2, 0 -_080E411C: .4byte gBattleAnimBankAttacker +_080E411C: .4byte gAnimBankAttacker _080E4120: cmp r0, 0x2 bne _080E412C - ldr r0, _080E4148 @ =gBattleAnimBankTarget + ldr r0, _080E4148 @ =gAnimBankTarget _080E4126: ldrb r0, [r0] adds r4, r0, 0 @@ -4703,14 +4703,14 @@ _080E412C: movs r1, 0x2 ldrsh r0, [r0, r1] lsls r4, r0, 5 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080E4158 ldr r0, _080E4154 @ =gSharedMem + 0x14800 b _080E415A .align 2, 0 -_080E4148: .4byte gBattleAnimBankTarget +_080E4148: .4byte gAnimBankTarget _080E414C: .4byte gPlttBufferUnfaded _080E4150: .4byte gBattleAnimArgs _080E4154: .4byte gSharedMem + 0x14800 @@ -4770,14 +4770,14 @@ _080E41B8: .4byte gBattleAnimArgs _080E41BC: cmp r0, 0x1 bne _080E41C8 - ldr r0, _080E41C4 @ =gBattleAnimBankAttacker + ldr r0, _080E41C4 @ =gAnimBankAttacker b _080E41CE .align 2, 0 -_080E41C4: .4byte gBattleAnimBankAttacker +_080E41C4: .4byte gAnimBankAttacker _080E41C8: cmp r0, 0x2 bne _080E41D4 - ldr r0, _080E41F4 @ =gBattleAnimBankTarget + ldr r0, _080E41F4 @ =gAnimBankTarget _080E41CE: ldrb r0, [r0] adds r4, r0, 0 @@ -4797,7 +4797,7 @@ _080E41D4: pop {r0} bx r0 .align 2, 0 -_080E41F4: .4byte gBattleAnimBankTarget +_080E41F4: .4byte gAnimBankTarget _080E41F8: .4byte gPlttBufferUnfaded _080E41FC: .4byte gPlttBufferFaded thumb_func_end sub_80E4178 @@ -4807,7 +4807,7 @@ sub_80E4200: @ 80E4200 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl NotInBattle + bl IsContest lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 @@ -4836,11 +4836,11 @@ sub_80E4234: @ 80E4234 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080E4254 @ =gBattleAnimBankAttacker + ldr r2, _080E4254 @ =gAnimBankAttacker ldr r1, _080E4258 @ =gBankTarget ldrb r1, [r1] strb r1, [r2] - ldr r2, _080E425C @ =gBattleAnimBankTarget + ldr r2, _080E425C @ =gAnimBankTarget ldr r1, _080E4260 @ =gEffectBank ldrb r1, [r1] strb r1, [r2] @@ -4848,9 +4848,9 @@ sub_80E4234: @ 80E4234 pop {r0} bx r0 .align 2, 0 -_080E4254: .4byte gBattleAnimBankAttacker +_080E4254: .4byte gAnimBankAttacker _080E4258: .4byte gBankTarget -_080E425C: .4byte gBattleAnimBankTarget +_080E425C: .4byte gAnimBankTarget _080E4260: .4byte gEffectBank thumb_func_end sub_80E4234 @@ -4859,11 +4859,11 @@ sub_80E4264: @ 80E4264 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080E428C @ =gBattleAnimBankAttacker + ldr r0, _080E428C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide adds r4, r0, 0 - ldr r0, _080E4290 @ =gBattleAnimBankTarget + ldr r0, _080E4290 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r4, 24 @@ -4874,8 +4874,8 @@ sub_80E4264: @ 80E4264 movs r0, 0x1 b _080E429C .align 2, 0 -_080E428C: .4byte gBattleAnimBankAttacker -_080E4290: .4byte gBattleAnimBankTarget +_080E428C: .4byte gAnimBankAttacker +_080E4290: .4byte gAnimBankTarget _080E4294: .4byte gBattleAnimArgs _080E4298: ldr r1, _080E42AC @ =gBattleAnimArgs @@ -4896,7 +4896,7 @@ sub_80E42B0: @ 80E42B0 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080E42C8 @ =gBattleAnimBankTarget + ldr r2, _080E42C8 @ =gAnimBankTarget ldr r1, _080E42CC @ =gBankTarget ldrb r1, [r1] strb r1, [r2] @@ -4904,7 +4904,7 @@ sub_80E42B0: @ 80E42B0 pop {r0} bx r0 .align 2, 0 -_080E42C8: .4byte gBattleAnimBankTarget +_080E42C8: .4byte gAnimBankTarget _080E42CC: .4byte gBankTarget thumb_func_end sub_80E42B0 @@ -4913,11 +4913,11 @@ sub_80E42D0: @ 80E42D0 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080E42F0 @ =gBattleAnimBankAttacker + ldr r2, _080E42F0 @ =gAnimBankAttacker ldr r1, _080E42F4 @ =gBankAttacker ldrb r1, [r1] strb r1, [r2] - ldr r2, _080E42F8 @ =gBattleAnimBankTarget + ldr r2, _080E42F8 @ =gAnimBankTarget ldr r1, _080E42FC @ =gEffectBank ldrb r1, [r1] strb r1, [r2] @@ -4925,9 +4925,9 @@ sub_80E42D0: @ 80E42D0 pop {r0} bx r0 .align 2, 0 -_080E42F0: .4byte gBattleAnimBankAttacker +_080E42F0: .4byte gAnimBankAttacker _080E42F4: .4byte gBankAttacker -_080E42F8: .4byte gBattleAnimBankTarget +_080E42F8: .4byte gAnimBankTarget _080E42FC: .4byte gEffectBank thumb_func_end sub_80E42D0 @@ -4936,7 +4936,7 @@ sub_80E4300: @ 80E4300 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080E4318 @@ -4949,7 +4949,7 @@ _080E4318: adds r3, r4 lsls r3, 3 adds r3, r0 - ldr r1, _080E4358 @ =gBattleAnimBankAttacker + ldr r1, _080E4358 @ =gAnimBankAttacker ldrb r0, [r1] lsls r0, 2 ldr r2, _080E435C @ =gSharedMem + 0x17800 @@ -4977,7 +4977,7 @@ _080E434E: bx r0 .align 2, 0 _080E4354: .4byte gTasks -_080E4358: .4byte gBattleAnimBankAttacker +_080E4358: .4byte gAnimBankAttacker _080E435C: .4byte gSharedMem + 0x17800 _080E4360: .4byte sub_80E4368 _080E4364: .4byte gAnimVisualTaskCount @@ -4995,7 +4995,7 @@ sub_80E4368: @ 80E4368 lsls r0, 5 cmp r1, r0 bne _080E43A8 - ldr r0, _080E43B4 @ =gBattleAnimBankAttacker + ldr r0, _080E43B4 @ =gAnimBankAttacker ldrb r3, [r0] lsls r3, 2 ldr r0, _080E43B8 @ =gSharedMem + 0x17800 @@ -5022,7 +5022,7 @@ _080E43A8: bx r0 .align 2, 0 _080E43B0: .4byte gBattleAnimArgs -_080E43B4: .4byte gBattleAnimBankAttacker +_080E43B4: .4byte gAnimBankAttacker _080E43B8: .4byte gSharedMem + 0x17800 _080E43BC: .4byte gTasks thumb_func_end sub_80E4368 diff --git a/asm/poison.s b/asm/poison.s index 4411027e9..234348df2 100755 --- a/asm/poison.s +++ b/asm/poison.s @@ -25,16 +25,16 @@ _080D9D86: bl sub_80787B0 ldrh r0, [r4, 0x4] strh r0, [r5, 0x2E] - ldr r4, _080D9DC8 @ =gBattleAnimBankTarget + ldr r4, _080D9DC8 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] @@ -49,7 +49,7 @@ _080D9D86: bx r0 .align 2, 0 _080D9DC4: .4byte gBattleAnimArgs -_080D9DC8: .4byte gBattleAnimBankTarget +_080D9DC8: .4byte gAnimBankTarget _080D9DCC: .4byte 0x0000ffe2 _080D9DD0: .4byte sub_80D9DD4 thumb_func_end sub_80D9D70 @@ -63,7 +63,7 @@ sub_80D9DD4: @ 80D9DD4 cmp r0, 0 beq _080D9DE8 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D9DE8: pop {r4} pop {r0} @@ -87,7 +87,7 @@ _080D9E08: adds r0, r4, 0 movs r1, 0x1 bl sub_80787B0 - ldr r0, _080D9E68 @ =gBattleAnimBankTarget + ldr r0, _080D9E68 @ =gAnimBankTarget ldrb r0, [r0] mov r6, sp adds r6, 0x2 @@ -95,7 +95,7 @@ _080D9E08: mov r2, sp adds r3, r6, 0 bl sub_807A3FC - ldr r0, _080D9E6C @ =gBattleAnimBankAttacker + ldr r0, _080D9E6C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -128,8 +128,8 @@ _080D9E36: bx r0 .align 2, 0 _080D9E64: .4byte gBattleAnimArgs -_080D9E68: .4byte gBattleAnimBankTarget -_080D9E6C: .4byte gBattleAnimBankAttacker +_080D9E68: .4byte gAnimBankTarget +_080D9E6C: .4byte gAnimBankAttacker _080D9E70: .4byte 0x0000ffe2 _080D9E74: .4byte sub_80D9E78 thumb_func_end sub_80D9DF0 @@ -143,7 +143,7 @@ sub_80D9E78: @ 80D9E78 cmp r0, 0 beq _080D9E8C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D9E8C: pop {r4} pop {r0} @@ -209,7 +209,7 @@ sub_80D9EE8: @ 80D9EE8 cmp r0, 0 bne _080D9F0E adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D9F0E: pop {r4} pop {r0} @@ -220,7 +220,7 @@ _080D9F0E: sub_80D9F14: @ 80D9F14 push {r4,lr} adds r4, r0, 0 - ldr r0, _080D9F74 @ =gBattleAnimBankTarget + ldr r0, _080D9F74 @ =gAnimBankTarget ldrb r0, [r0] adds r2, r4, 0 adds r2, 0x20 @@ -228,7 +228,7 @@ sub_80D9F14: @ 80D9F14 adds r3, 0x22 movs r1, 0x1 bl sub_807A3FC - ldr r0, _080D9F78 @ =gBattleAnimBankAttacker + ldr r0, _080D9F78 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -257,18 +257,18 @@ _080D9F40: strh r1, [r4, 0x36] ldr r0, _080D9F80 @ =sub_8078B34 str r0, [r4, 0x1C] - ldr r1, _080D9F84 @ =move_anim_8072740 + ldr r1, _080D9F84 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData pop {r4} pop {r0} bx r0 .align 2, 0 -_080D9F74: .4byte gBattleAnimBankTarget -_080D9F78: .4byte gBattleAnimBankAttacker +_080D9F74: .4byte gAnimBankTarget +_080D9F78: .4byte gAnimBankAttacker _080D9F7C: .4byte gBattleAnimArgs _080D9F80: .4byte sub_8078B34 -_080D9F84: .4byte move_anim_8072740 +_080D9F84: .4byte DestroyAnimSprite thumb_func_end sub_80D9F14 thumb_func_start sub_80D9F88 @@ -287,7 +287,7 @@ sub_80D9F88: @ 80D9F88 .align 2, 0 _080D9FA0: .4byte gBattleAnimArgs _080D9FA4: - ldr r0, _080D9FE4 @ =gBattleAnimBankTarget + ldr r0, _080D9FE4 @ =gAnimBankTarget ldrb r0, [r0] adds r2, r4, 0 adds r2, 0x20 @@ -295,7 +295,7 @@ _080D9FA4: adds r3, 0x22 movs r1, 0x1 bl sub_807A3FC - ldr r0, _080D9FE8 @ =gBattleAnimBankAttacker + ldr r0, _080D9FE8 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -320,8 +320,8 @@ _080D9FDA: pop {r0} bx r0 .align 2, 0 -_080D9FE4: .4byte gBattleAnimBankTarget -_080D9FE8: .4byte gBattleAnimBankAttacker +_080D9FE4: .4byte gAnimBankTarget +_080D9FE8: .4byte gAnimBankAttacker _080D9FEC: .4byte sub_80D9FF0 thumb_func_end sub_80D9F88 @@ -354,7 +354,7 @@ sub_80D9FF0: @ 80D9FF0 cmp r0, 0 beq _080DA02C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DA02C: pop {r4} pop {r0} diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 7670d867d..69c6d9e4f 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -87,8 +87,8 @@ _08095B66: bx r1 thumb_func_end sub_8095B24 - thumb_func_start sub_8095B6C -sub_8095B6C: @ 8095B6C + thumb_func_start GetNumValidDaycarePartyMons +GetNumValidDaycarePartyMons: @ 8095B6C push {r4-r6,lr} movs r5, 0 movs r6, 0 @@ -124,7 +124,7 @@ _08095B9A: bx r1 .align 2, 0 _08095BB0: .4byte gPlayerParty - thumb_func_end sub_8095B6C + thumb_func_end GetNumValidDaycarePartyMons thumb_func_start CountAlivePartyMonsExceptOne CountAlivePartyMonsExceptOne: @ 8095BB4 @@ -174,8 +174,8 @@ _08095BF6: _08095C0C: .4byte gPlayerParty thumb_func_end CountAlivePartyMonsExceptOne - thumb_func_start sub_8095C10 -sub_8095C10: @ 8095C10 + thumb_func_start CountAlivePartyMonsExceptSelectedOne +CountAlivePartyMonsExceptSelectedOne: @ 8095C10 push {lr} ldr r0, _08095C24 @ =gSpecialVar_0x8004 ldrb r0, [r0] @@ -186,7 +186,7 @@ sub_8095C10: @ 8095C10 bx r1 .align 2, 0 _08095C24: .4byte gSpecialVar_0x8004 - thumb_func_end sub_8095C10 + thumb_func_end CountAlivePartyMonsExceptSelectedOne thumb_func_start StorageSystemGetPartySize StorageSystemGetPartySize: @ 8095C28 diff --git a/asm/pokenav.s b/asm/pokenav.s index 066d16d5d..83ceed00f 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -4038,7 +4038,7 @@ sub_80F2598: @ 80F2598 asrs r1, 24 lsls r1, 16 lsrs r1, 16 - bl sub_8082C0C + bl DoesSomeoneWantRematchIn cmp r0, 0x1 bne _080F2618 ldr r0, _080F25FC @ =gSpriteSheet_PokenavBlueLight diff --git a/asm/psychic.s b/asm/psychic.s index fb024a00d..7a6000335 100755 --- a/asm/psychic.s +++ b/asm/psychic.s @@ -11,13 +11,13 @@ sub_80DB74C: @ 80DB74C push {r4-r7,lr} adds r6, r0, 0 - ldr r0, _080DB804 @ =gBattleAnimBankAttacker + ldr r0, _080DB804 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080DB768 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DB77E @@ -34,7 +34,7 @@ _080DB768: movs r0, 0xC8 strb r0, [r1] _080DB77E: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080DB7DA @@ -75,7 +75,7 @@ _080DB7BC: adds r1, r5, 0 bl sub_8076034 _080DB7DA: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080DB810 @@ -83,7 +83,7 @@ _080DB7DA: lsls r0, 24 cmp r0, 0 beq _080DB810 - ldr r0, _080DB804 @ =gBattleAnimBankAttacker + ldr r0, _080DB804 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -94,14 +94,14 @@ _080DB7DA: movs r0, 0x50 b _080DB84A .align 2, 0 -_080DB804: .4byte gBattleAnimBankAttacker +_080DB804: .4byte gAnimBankAttacker _080DB808: movs r0, 0xB0 strh r0, [r6, 0x20] movs r0, 0x28 b _080DB84A _080DB810: - ldr r5, _080DB880 @ =gBattleAnimBankAttacker + ldr r5, _080DB880 @ =gAnimBankAttacker ldrb r0, [r5] bl GetBankSide lsls r0, 24 @@ -114,7 +114,7 @@ _080DB810: _080DB826: ldrb r0, [r5] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 ldr r4, _080DB884 @ =gBattleAnimArgs lsrs r0, 24 @@ -123,14 +123,14 @@ _080DB826: strh r0, [r6, 0x20] ldrb r0, [r5] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r4, [r4, 0x2] adds r0, r4 _080DB84A: strh r0, [r6, 0x22] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DB85C @@ -155,7 +155,7 @@ _080DB85C: pop {r0} bx r0 .align 2, 0 -_080DB880: .4byte gBattleAnimBankAttacker +_080DB880: .4byte gAnimBankAttacker _080DB884: .4byte gBattleAnimArgs _080DB888: .4byte sub_80DB88C thumb_func_end sub_80DB74C @@ -269,7 +269,7 @@ sub_80DB92C: @ 80DB92C negs r1, r1 cmp r0, r1 bne _080DB9CC - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080DB9BC @@ -344,7 +344,7 @@ _080DB9E0: .4byte sub_80DB9E4 sub_80DB9E4: @ 80DB9E4 push {r4-r6,lr} adds r6, r0, 0 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080DBA3C @@ -381,13 +381,13 @@ _080DBA22: adds r0, r5, 0 bl sub_8076464 _080DBA3C: - ldr r0, _080DBA48 @ =move_anim_8072740 + ldr r0, _080DBA48 @ =DestroyAnimSprite str r0, [r6, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080DBA48: .4byte move_anim_8072740 +_080DBA48: .4byte DestroyAnimSprite thumb_func_end sub_80DB9E4 thumb_func_start sub_80DBA4C @@ -406,7 +406,7 @@ sub_80DBA4C: @ 80DBA4C bne _080DBA66 movs r6, 0x1 _080DBA66: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080DBAAE @@ -414,7 +414,7 @@ _080DBA66: lsls r0, 24 cmp r0, 0 beq _080DBAAE - ldr r0, _080DBA9C @ =gBattleAnimBankAttacker + ldr r0, _080DBA9C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -430,7 +430,7 @@ _080DBA66: b _080DBAD0 .align 2, 0 _080DBA98: .4byte gBattleAnimArgs -_080DBA9C: .4byte gBattleAnimBankAttacker +_080DBA9C: .4byte gAnimBankAttacker _080DBAA0: ldrh r0, [r5] adds r0, 0xB0 @@ -480,16 +480,16 @@ _080DBAEC: sub_80DBAF4: @ 80DBAF4 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _080DBB3C @ =gBattleAnimBankAttacker + ldr r4, _080DBB3C @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -510,7 +510,7 @@ sub_80DBAF4: @ 80DBAF4 ldr r0, _080DBB40 @ =0x0000ffff b _080DBB52 .align 2, 0 -_080DBB3C: .4byte gBattleAnimBankAttacker +_080DBB3C: .4byte gAnimBankAttacker _080DBB40: .4byte 0x0000ffff _080DBB44: ldrh r0, [r5, 0x20] @@ -522,7 +522,7 @@ _080DBB44: movs r0, 0x1 _080DBB52: strh r0, [r5, 0x30] - ldr r1, _080DBB68 @ =move_anim_8072740 + ldr r1, _080DBB68 @ =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData ldr r0, _080DBB6C @ =sub_8078600 @@ -531,7 +531,7 @@ _080DBB52: pop {r0} bx r0 .align 2, 0 -_080DBB68: .4byte move_anim_8072740 +_080DBB68: .4byte DestroyAnimSprite _080DBB6C: .4byte sub_8078600 thumb_func_end sub_80DBAF4 @@ -539,7 +539,7 @@ _080DBB6C: .4byte sub_8078600 sub_80DBB70: @ 80DBB70 push {r4-r7,lr} adds r5, r0, 0 - ldr r6, _080DBBF4 @ =gBattleAnimBankAttacker + ldr r6, _080DBBF4 @ =gAnimBankAttacker ldrb r0, [r6] movs r1, 0x1 bl sub_807A100 @@ -572,14 +572,14 @@ sub_80DBB70: @ 80DBB70 _080DBBB6: ldrb r0, [r6] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, r4 strh r0, [r5, 0x20] ldrb r0, [r6] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, r7 @@ -600,7 +600,7 @@ _080DBBE2: pop {r0} bx r0 .align 2, 0 -_080DBBF4: .4byte gBattleAnimBankAttacker +_080DBBF4: .4byte gAnimBankAttacker _080DBBF8: .4byte sub_80DBC00 _080DBBFC: .4byte sub_8078600 thumb_func_end sub_80DBB70 @@ -677,7 +677,7 @@ _080DBC74: cmp r0, r1 bne _080DBC8C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DBC8C: pop {r4} pop {r0} @@ -756,7 +756,7 @@ sub_80DBCFC: @ 80DBCFC strh r0, [r4, 0x8] strh r1, [r4, 0xA] strh r1, [r4, 0xC] - ldr r0, _080DBD4C @ =gBattleAnimBankAttacker + ldr r0, _080DBD4C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -777,7 +777,7 @@ _080DBD30: bx r0 .align 2, 0 _080DBD48: .4byte gTasks -_080DBD4C: .4byte gBattleAnimBankAttacker +_080DBD4C: .4byte gAnimBankAttacker _080DBD50: .4byte gUnknown_083DA8C4 _080DBD54: .4byte sub_80DBD58 thumb_func_end sub_80DBCFC @@ -884,16 +884,16 @@ sub_80DBE00: @ 80DBE00 movs r7, 0x10 strh r7, [r5, 0xE] strh r0, [r5, 0x10] - ldr r4, _080DBE88 @ =gBattleAnimBankAttacker + ldr r4, _080DBE88 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x24] @@ -935,7 +935,7 @@ _080DBE6A: bx r0 .align 2, 0 _080DBE84: .4byte gTasks -_080DBE88: .4byte gBattleAnimBankAttacker +_080DBE88: .4byte gAnimBankAttacker _080DBE8C: .4byte REG_BLDCNT _080DBE90: .4byte REG_BLDALPHA _080DBE94: .4byte sub_80DBE98 @@ -1185,7 +1185,7 @@ _080DC04A: cmp r1, r0 bne _080DC05C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DC05C: ldrh r0, [r4, 0x30] adds r0, 0x1 @@ -1204,16 +1204,16 @@ sub_80DC068: @ 80DC068 ldrsh r0, [r6, r1] cmp r0, 0 bne _080DC094 - ldr r4, _080DC0A8 @ =gBattleAnimBankAttacker + ldr r4, _080DC0A8 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -1227,7 +1227,7 @@ _080DC094: bx r0 .align 2, 0 _080DC0A4: .4byte gBattleAnimArgs -_080DC0A8: .4byte gBattleAnimBankAttacker +_080DC0A8: .4byte gAnimBankAttacker _080DC0AC: .4byte sub_80DC020 thumb_func_end sub_80DC068 @@ -1241,7 +1241,7 @@ sub_80DC0B0: @ 80DC0B0 lsls r1, 3 ldr r0, _080DC10C @ =gTasks adds r5, r1, r0 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DC154 @@ -1252,7 +1252,7 @@ sub_80DC0B0: @ 80DC0B0 bne _080DC120 ldr r0, _080DC114 @ =0x0000fff6 strh r0, [r5, 0x1C] - ldr r4, _080DC118 @ =gBattleAnimBankTarget + ldr r4, _080DC118 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x5 bl sub_807A100 @@ -1263,7 +1263,7 @@ sub_80DC0B0: @ 80DC0B0 bl sub_807A100 adds r0, 0x8 strh r0, [r5, 0x20] - ldr r4, _080DC11C @ =gBattleAnimBankAttacker + ldr r4, _080DC11C @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x5 bl sub_807A100 @@ -1278,12 +1278,12 @@ sub_80DC0B0: @ 80DC0B0 _080DC10C: .4byte gTasks _080DC110: .4byte gBattleAnimArgs _080DC114: .4byte 0x0000fff6 -_080DC118: .4byte gBattleAnimBankTarget -_080DC11C: .4byte gBattleAnimBankAttacker +_080DC118: .4byte gAnimBankTarget +_080DC11C: .4byte gAnimBankAttacker _080DC120: movs r0, 0xA strh r0, [r5, 0x1C] - ldr r4, _080DC14C @ =gBattleAnimBankAttacker + ldr r4, _080DC14C @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x4 bl sub_807A100 @@ -1294,15 +1294,15 @@ _080DC120: bl sub_807A100 subs r0, 0x8 strh r0, [r5, 0x20] - ldr r4, _080DC150 @ =gBattleAnimBankTarget + ldr r4, _080DC150 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x4 bl sub_807A100 adds r0, 0x8 b _080DC1D2 .align 2, 0 -_080DC14C: .4byte gBattleAnimBankAttacker -_080DC150: .4byte gBattleAnimBankTarget +_080DC14C: .4byte gAnimBankAttacker +_080DC150: .4byte gAnimBankTarget _080DC154: ldr r0, _080DC198 @ =gBattleAnimArgs movs r1, 0 @@ -1311,7 +1311,7 @@ _080DC154: bne _080DC1A8 ldr r0, _080DC19C @ =0x0000fff6 strh r0, [r5, 0x1C] - ldr r4, _080DC1A0 @ =gBattleAnimBankTarget + ldr r4, _080DC1A0 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x4 bl sub_807A100 @@ -1322,7 +1322,7 @@ _080DC154: bl sub_807A100 adds r0, 0x8 strh r0, [r5, 0x20] - ldr r4, _080DC1A4 @ =gBattleAnimBankAttacker + ldr r4, _080DC1A4 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x4 bl sub_807A100 @@ -1336,12 +1336,12 @@ _080DC154: .align 2, 0 _080DC198: .4byte gBattleAnimArgs _080DC19C: .4byte 0x0000fff6 -_080DC1A0: .4byte gBattleAnimBankTarget -_080DC1A4: .4byte gBattleAnimBankAttacker +_080DC1A0: .4byte gAnimBankTarget +_080DC1A4: .4byte gAnimBankAttacker _080DC1A8: movs r0, 0xA strh r0, [r5, 0x1C] - ldr r4, _080DC1F0 @ =gBattleAnimBankAttacker + ldr r4, _080DC1F0 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x5 bl sub_807A100 @@ -1352,7 +1352,7 @@ _080DC1A8: bl sub_807A100 subs r0, 0x8 strh r0, [r5, 0x20] - ldr r4, _080DC1F4 @ =gBattleAnimBankTarget + ldr r4, _080DC1F4 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x5 bl sub_807A100 @@ -1373,8 +1373,8 @@ _080DC1DE: pop {r0} bx r0 .align 2, 0 -_080DC1F0: .4byte gBattleAnimBankAttacker -_080DC1F4: .4byte gBattleAnimBankTarget +_080DC1F0: .4byte gAnimBankAttacker +_080DC1F4: .4byte gAnimBankTarget _080DC1F8: .4byte sub_80DC1FC thumb_func_end sub_80DC0B0 @@ -1499,7 +1499,7 @@ sub_80DC2D4: @ 80DC2D4 lsls r1, 3 ldr r0, _080DC30C @ =gTasks adds r4, r1, r0 - ldr r0, _080DC310 @ =gBattleAnimBankTarget + ldr r0, _080DC310 @ =gAnimBankTarget ldrb r0, [r0] bl sub_8077FC0 lsls r0, 24 @@ -1519,7 +1519,7 @@ sub_80DC2D4: @ 80DC2D4 b _080DC346 .align 2, 0 _080DC30C: .4byte gTasks -_080DC310: .4byte gBattleAnimBankTarget +_080DC310: .4byte gAnimBankTarget _080DC314: .4byte gBattleAnimArgs _080DC318: cmp r0, 0x2 @@ -1557,24 +1557,24 @@ _080DC346: movs r0, 0 strh r0, [r4, 0x24] _080DC352: - ldr r0, _080DC36C @ =gBattleAnimBankTarget + ldr r0, _080DC36C @ =gAnimBankTarget ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _080DC378 - ldr r0, _080DC370 @ =gUnknown_030042C0 + ldr r0, _080DC370 @ =gBattle_BG1_X ldrh r0, [r0] strh r0, [r4, 0x1C] ldr r0, _080DC374 @ =REG_BG1HOFS b _080DC380 .align 2, 0 -_080DC36C: .4byte gBattleAnimBankTarget -_080DC370: .4byte gUnknown_030042C0 +_080DC36C: .4byte gAnimBankTarget +_080DC370: .4byte gBattle_BG1_X _080DC374: .4byte REG_BG1HOFS _080DC378: - ldr r0, _080DC3E0 @ =gUnknown_03004288 + ldr r0, _080DC3E0 @ =gBattle_BG2_X ldrh r0, [r0] strh r0, [r4, 0x1C] ldr r0, _080DC3E4 @ =REG_BG2HOFS @@ -1629,7 +1629,7 @@ _080DC3BA: pop {r0} bx r0 .align 2, 0 -_080DC3E0: .4byte gUnknown_03004288 +_080DC3E0: .4byte gBattle_BG2_X _080DC3E4: .4byte REG_BG2HOFS _080DC3E8: .4byte gUnknown_03004DE0 _080DC3EC: .4byte 0xa2600001 @@ -2051,20 +2051,20 @@ _080DC716: beq _080DC808 b _080DC818 _080DC720: - ldr r4, _080DC76C @ =gBattleAnimBankAttacker + ldr r4, _080DC76C @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DC74E @@ -2088,7 +2088,7 @@ _080DC74E: strh r0, [r2] b _080DC7A2 .align 2, 0 -_080DC76C: .4byte gBattleAnimBankAttacker +_080DC76C: .4byte gAnimBankAttacker _080DC770: .4byte REG_BLDCNT _080DC774: .4byte REG_BLDALPHA _080DC778: @@ -2101,7 +2101,7 @@ _080DC778: beq _080DC818 movs r0, 0x40 negs r0, r0 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -2171,7 +2171,7 @@ _080DC808: adds r0, 0x2 strh r1, [r0] adds r0, r5, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DC818: pop {r4,r5} pop {r0} diff --git a/asm/rock.s b/asm/rock.s index 66c698577..923c842be 100755 --- a/asm/rock.s +++ b/asm/rock.s @@ -16,7 +16,7 @@ sub_80DCE9C: @ 80DCE9C ldrsh r0, [r6, r1] cmp r0, 0 beq _080DCEBC - ldr r0, _080DCF0C @ =gBattleAnimBankTarget + ldr r0, _080DCF0C @ =gAnimBankTarget ldrb r0, [r0] adds r2, r5, 0 adds r2, 0x20 @@ -60,7 +60,7 @@ _080DCEBC: bx r0 .align 2, 0 _080DCF08: .4byte gBattleAnimArgs -_080DCF0C: .4byte gBattleAnimBankTarget +_080DCF0C: .4byte gAnimBankTarget _080DCF10: .4byte 0x0000ffba _080DCF14: .4byte sub_80DCF1C _080DCF18: .4byte sub_8078278 @@ -108,7 +108,7 @@ sub_80DCF60: @ 80DCF60 bl StartSpriteAnim adds r0, r5, 0 bl AnimateSprite - ldr r0, _080DCF8C @ =gBattleAnimBankAttacker + ldr r0, _080DCF8C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -120,7 +120,7 @@ sub_80DCF60: @ 80DCF60 b _080DCF96 .align 2, 0 _080DCF88: .4byte gBattleAnimArgs -_080DCF8C: .4byte gBattleAnimBankAttacker +_080DCF8C: .4byte gAnimBankAttacker _080DCF90: ldrh r0, [r4] ldrh r1, [r5, 0x20] @@ -235,7 +235,7 @@ sub_80DD02C: @ 80DD02C cmp r0, r1 bne _080DD072 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DD072: pop {r4} pop {r0} @@ -270,7 +270,7 @@ do_boulder_dust: @ 80DD078 movs r0, 0x3F ands r0, r1 strb r0, [r4, 0x1] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080DD0C4 @@ -282,9 +282,9 @@ do_boulder_dust: @ 80DD078 orrs r1, r0 strb r1, [r4] _080DD0C4: - ldr r0, _080DD160 @ =gUnknown_030042C0 + ldr r0, _080DD160 @ =gBattle_BG1_X strh r5, [r0] - ldr r0, _080DD164 @ =gUnknown_030041B4 + ldr r0, _080DD164 @ =gBattle_BG1_Y strh r5, [r0] ldr r0, _080DD168 @ =REG_BG1HOFS strh r5, [r0] @@ -312,7 +312,7 @@ _080DD0C4: lsls r1, 4 movs r2, 0x20 bl LoadCompressedPalette - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DD120 @@ -328,7 +328,7 @@ _080DD120: ldrsh r0, [r0, r1] cmp r0, 0 beq _080DD13A - ldr r0, _080DD184 @ =gBattleAnimBankAttacker + ldr r0, _080DD184 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -352,8 +352,8 @@ _080DD13A: _080DD154: .4byte REG_BLDCNT _080DD158: .4byte 0x00003f42 _080DD15C: .4byte REG_BG1CNT -_080DD160: .4byte gUnknown_030042C0 -_080DD164: .4byte gUnknown_030041B4 +_080DD160: .4byte gBattle_BG1_X +_080DD164: .4byte gBattle_BG1_Y _080DD168: .4byte REG_BG1HOFS _080DD16C: .4byte 0x040000d4 _080DD170: .4byte 0x85000400 @@ -361,7 +361,7 @@ _080DD174: .4byte gBattleAnimBackgroundTilemap_SandstormBrew _080DD178: .4byte gBattleAnimBackgroundImage_SandstormBrew _080DD17C: .4byte gBattleAnimSpritePalette_261 _080DD180: .4byte gBattleAnimArgs -_080DD184: .4byte gBattleAnimBankAttacker +_080DD184: .4byte gAnimBankAttacker _080DD188: .4byte gTasks _080DD18C: .4byte sub_80DD190 thumb_func_end do_boulder_dust @@ -386,7 +386,7 @@ sub_80DD190: @ 80DD190 adds r3, r1, 0 cmp r0, 0 bne _080DD1CC - ldr r1, _080DD1C4 @ =gUnknown_030042C0 + ldr r1, _080DD1C4 @ =gBattle_BG1_X ldr r5, _080DD1C8 @ =0x0000fffa adds r0, r5, 0 ldrh r2, [r1] @@ -394,16 +394,16 @@ sub_80DD190: @ 80DD190 b _080DD1D2 .align 2, 0 _080DD1C0: .4byte gTasks -_080DD1C4: .4byte gUnknown_030042C0 +_080DD1C4: .4byte gBattle_BG1_X _080DD1C8: .4byte 0x0000fffa _080DD1CC: - ldr r1, _080DD204 @ =gUnknown_030042C0 + ldr r1, _080DD204 @ =gBattle_BG1_X ldrh r0, [r1] adds r0, 0x6 _080DD1D2: strh r0, [r1] adds r4, r1, 0 - ldr r1, _080DD208 @ =gUnknown_030041B4 + ldr r1, _080DD208 @ =gBattle_BG1_Y ldr r5, _080DD20C @ =0x0000ffff adds r0, r5, 0 ldrh r2, [r1] @@ -427,8 +427,8 @@ _080DD1F8: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080DD204: .4byte gUnknown_030042C0 -_080DD208: .4byte gUnknown_030041B4 +_080DD204: .4byte gBattle_BG1_X +_080DD208: .4byte gBattle_BG1_Y _080DD20C: .4byte 0x0000ffff _080DD210: .4byte _080DD214 .align 2, 0 @@ -574,7 +574,7 @@ _080DD2F6: ldr r1, _080DD394 @ =0x85000200 str r1, [r0, 0x8] ldr r0, [r0, 0x8] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080DD344 @@ -593,8 +593,8 @@ _080DD344: ldrh r0, [r1, 0x20] adds r0, 0x1 strh r0, [r1, 0x20] - ldr r4, _080DD3A0 @ =gUnknown_030042C0 - ldr r2, _080DD3A4 @ =gUnknown_030041B4 + ldr r4, _080DD3A0 @ =gBattle_BG1_X + ldr r2, _080DD3A4 @ =gBattle_BG1_Y _080DD358: movs r1, 0 strh r1, [r4] @@ -628,8 +628,8 @@ _080DD390: .4byte 0x85000400 _080DD394: .4byte 0x85000200 _080DD398: .4byte REG_BG1CNT _080DD39C: .4byte gTasks -_080DD3A0: .4byte gUnknown_030042C0 -_080DD3A4: .4byte gUnknown_030041B4 +_080DD3A0: .4byte gBattle_BG1_X +_080DD3A4: .4byte gBattle_BG1_Y _080DD3A8: .4byte REG_BLDCNT thumb_func_end sub_80DD190 @@ -646,7 +646,7 @@ sub_80DD3AC: @ 80DD3AC ldrsh r0, [r4, r2] cmp r0, 0 beq _080DD3F8 - ldr r0, _080DD3F4 @ =gBattleAnimBankAttacker + ldr r0, _080DD3F4 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -669,7 +669,7 @@ sub_80DD3AC: @ 80DD3AC b _080DD3FC .align 2, 0 _080DD3F0: .4byte gBattleAnimArgs -_080DD3F4: .4byte gBattleAnimBankAttacker +_080DD3F4: .4byte gAnimBankAttacker _080DD3F8: ldr r0, _080DD41C @ =0x0000ffc0 strh r0, [r5, 0x20] @@ -739,14 +739,14 @@ _080DD46E: cmp r0, r1 bge _080DD484 _080DD480: - ldr r0, _080DD48C @ =move_anim_8072740 + ldr r0, _080DD48C @ =DestroyAnimSprite str r0, [r5, 0x1C] _080DD484: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080DD48C: .4byte move_anim_8072740 +_080DD48C: .4byte DestroyAnimSprite thumb_func_end sub_80DD3AC thumb_func_start sub_80DD490 @@ -769,7 +769,7 @@ sub_80DD490: @ 80DD490 strh r0, [r4, 0x36] ldr r0, _080DD4CC @ =sub_8078B34 str r0, [r4, 0x1C] - ldr r1, _080DD4D0 @ =move_anim_8072740 + ldr r1, _080DD4D0 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData pop {r4,r5} @@ -778,7 +778,7 @@ sub_80DD490: @ 80DD490 .align 2, 0 _080DD4C8: .4byte gBattleAnimArgs _080DD4CC: .4byte sub_8078B34 -_080DD4D0: .4byte move_anim_8072740 +_080DD4D0: .4byte DestroyAnimSprite thumb_func_end sub_80DD490 thumb_func_start sub_80DD4D4 @@ -795,32 +795,32 @@ sub_80DD4D4: @ 80DD4D4 lsls r1, 3 ldr r0, _080DD554 @ =gTasks adds r6, r1, r0 - ldr r5, _080DD558 @ =gBattleAnimBankAttacker + ldr r5, _080DD558 @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 mov r9, r0 ldrb r0, [r5] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 8 movs r1, 0xC0 lsls r1, 13 adds r0, r1 lsrs r7, r0, 16 - ldr r4, _080DD55C @ =gBattleAnimBankTarget + ldr r4, _080DD55C @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 mov r10, r0 ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 8 movs r2, 0xC0 @@ -845,8 +845,8 @@ _080DD544: b _080DD566 .align 2, 0 _080DD554: .4byte gTasks -_080DD558: .4byte gBattleAnimBankAttacker -_080DD55C: .4byte gBattleAnimBankTarget +_080DD558: .4byte gAnimBankAttacker +_080DD55C: .4byte gAnimBankTarget _080DD560: lsls r1, r5, 3 movs r0, 0x30 @@ -891,13 +891,13 @@ _080DD57E: strh r4, [r6, 0x16] movs r0, 0x40 negs r0, r0 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r4, r0, 0 lsls r4, 24 asrs r4, 8 lsrs r4, 16 movs r0, 0x3F - bl sub_8076F98 + bl BattleAnimAdjustPanning lsls r0, 24 strh r4, [r6, 0x22] asrs r0, 24 @@ -1283,7 +1283,7 @@ _080DD8B8: .4byte gTasks thumb_func_start sub_80DD8BC sub_80DD8BC: @ 80DD8BC push {lr} - ldr r0, _080DD8E4 @ =gDisableStructMoveAnim + ldr r0, _080DD8E4 @ =gAnimDisableStructPtr ldr r0, [r0] ldrb r1, [r0, 0x11] lsrs r0, r1, 4 @@ -1304,7 +1304,7 @@ _080DD8DE: pop {r1} bx r1 .align 2, 0 -_080DD8E4: .4byte gDisableStructMoveAnim +_080DD8E4: .4byte gAnimDisableStructPtr thumb_func_end sub_80DD8BC thumb_func_start sub_80DD8E8 @@ -1379,7 +1379,7 @@ _080DD960: cmp r0, 0 bne _080DD972 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DD972: pop {r0} bx r0 @@ -1389,7 +1389,7 @@ _080DD972: sub_80DD978: @ 80DD978 push {r4,lr} adds r4, r0, 0 - ldr r0, _080DD9A0 @ =gBattleAnimBankAttacker + ldr r0, _080DD9A0 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -1406,23 +1406,23 @@ _080DD994: pop {r0} bx r0 .align 2, 0 -_080DD9A0: .4byte gBattleAnimBankAttacker +_080DD9A0: .4byte gAnimBankAttacker thumb_func_end sub_80DD978 thumb_func_start sub_80DD9A4 sub_80DD9A4: @ 80DD9A4 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _080DD9F0 @ =gBattleAnimBankTarget + ldr r5, _080DD9F0 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x20] ldrb r0, [r5] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldr r2, _080DD9F4 @ =gBattleAnimArgs @@ -1446,7 +1446,7 @@ sub_80DD9A4: @ 80DD9A4 pop {r0} bx r0 .align 2, 0 -_080DD9F0: .4byte gBattleAnimBankTarget +_080DD9F0: .4byte gAnimBankTarget _080DD9F4: .4byte gBattleAnimArgs _080DD9F8: .4byte sub_80DD9FC thumb_func_end sub_80DD9A4 @@ -1486,7 +1486,7 @@ sub_80DD9FC: @ 80DD9FC cmp r0, 0x8C ble _080DDA46 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DDA46: pop {r4} pop {r0} @@ -1498,7 +1498,7 @@ sub_80DDA4C: @ 80DDA4C push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _080DDA84 @ =gMoveDmgMoveAnim + ldr r2, _080DDA84 @ =gAnimMoveDmg ldr r0, [r2] cmp r0, 0x20 bgt _080DDA60 @@ -1526,7 +1526,7 @@ _080DDA7A: pop {r0} bx r0 .align 2, 0 -_080DDA84: .4byte gMoveDmgMoveAnim +_080DDA84: .4byte gAnimMoveDmg _080DDA88: .4byte gBattleAnimArgs thumb_func_end sub_80DDA4C diff --git a/asm/water.s b/asm/water.s index 4bf95ab59..d72f9438c 100755 --- a/asm/water.s +++ b/asm/water.s @@ -23,16 +23,16 @@ sub_80D3B60: @ 80D3B60 lsls r4, 3 adds r4, r0 ldrh r0, [r4, 0x8] - ldr r1, _080D3D48 @ =gUnknown_030042C0 + ldr r1, _080D3D48 @ =gBattle_BG1_X ldrh r1, [r1] adds r0, r1 - ldr r2, _080D3D48 @ =gUnknown_030042C0 + ldr r2, _080D3D48 @ =gBattle_BG1_X strh r0, [r2] ldrh r0, [r4, 0xA] - ldr r3, _080D3D4C @ =gUnknown_030041B4 + ldr r3, _080D3D4C @ =gBattle_BG1_Y ldrh r3, [r3] adds r0, r3 - ldr r1, _080D3D4C @ =gUnknown_030041B4 + ldr r1, _080D3D4C @ =gBattle_BG1_Y strh r0, [r1] add r5, sp, 0x4 adds r0, r5, 0 @@ -211,7 +211,7 @@ _080D3CAA: ldr r1, _080D3D58 @ =0x85000400 str r1, [r0, 0x8] ldr r0, [r0, 0x8] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080D3D02 @@ -222,9 +222,9 @@ _080D3CAA: ands r0, r1 strb r0, [r2] _080D3D02: - ldr r0, _080D3D48 @ =gUnknown_030042C0 + ldr r0, _080D3D48 @ =gBattle_BG1_X strh r4, [r0] - ldr r1, _080D3D4C @ =gUnknown_030041B4 + ldr r1, _080D3D4C @ =gBattle_BG1_Y strh r4, [r1] ldr r0, _080D3D60 @ =REG_BLDCNT strh r4, [r0] @@ -256,8 +256,8 @@ _080D3D32: bx r0 .align 2, 0 _080D3D44: .4byte gTasks -_080D3D48: .4byte gUnknown_030042C0 -_080D3D4C: .4byte gUnknown_030041B4 +_080D3D48: .4byte gBattle_BG1_X +_080D3D4C: .4byte gBattle_BG1_Y _080D3D50: .4byte gPlttBufferFaded _080D3D54: .4byte 0x040000d4 _080D3D58: .4byte 0x85000400 @@ -739,7 +739,7 @@ _080D40D0: cmp r0, 0x15 bne _080D40EE adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D40EE: pop {r4} pop {r0} @@ -1083,7 +1083,7 @@ _080D438A: thumb_func_start sub_80D4394 sub_80D4394: @ 80D4394 push {r4,r5,lr} - ldr r4, _080D43B8 @ =gBattleAnimBankAttacker + ldr r4, _080D43B8 @ =gAnimBankAttacker ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -1099,7 +1099,7 @@ sub_80D4394: @ 80D4394 ldr r0, _080D43C0 @ =gPlayerParty b _080D43D8 .align 2, 0 -_080D43B8: .4byte gBattleAnimBankAttacker +_080D43B8: .4byte gAnimBankAttacker _080D43BC: .4byte gBattlePartyID _080D43C0: .4byte gPlayerParty _080D43C4: @@ -1160,16 +1160,16 @@ sub_80D4418: @ 80D4418 lsls r1, 24 lsrs r1, 24 str r1, [sp] - ldr r4, _080D4520 @ =gBattleAnimBankAttacker + ldr r4, _080D4520 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 mov r8, r0 ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r6, r0, 24 movs r5, 0xAC @@ -1280,7 +1280,7 @@ _080D44EA: pop {r0} bx r0 .align 2, 0 -_080D4520: .4byte gBattleAnimBankAttacker +_080D4520: .4byte gAnimBankAttacker _080D4524: .4byte gSpriteTemplate_83D9378 _080D4528: .4byte gSprites thumb_func_end sub_80D4418 @@ -1390,7 +1390,7 @@ sub_80D45D8: @ 80D45D8 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0xA] - ldr r0, _080D460C @ =gBattleAnimBankAttacker + ldr r0, _080D460C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -1402,7 +1402,7 @@ sub_80D45D8: @ 80D45D8 b _080D4616 .align 2, 0 _080D4608: .4byte gTasks -_080D460C: .4byte gBattleAnimBankAttacker +_080D460C: .4byte gAnimBankAttacker _080D4610: movs r0, 0x10 strh r0, [r4, 0x10] @@ -1788,17 +1788,17 @@ sub_80D48F4: @ 80D48F4 lsls r1, 3 ldr r0, _080D4978 @ =gTasks adds r5, r1, r0 - ldr r4, _080D497C @ =gBattleAnimBankAttacker + ldr r4, _080D497C @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 movs r6, 0 strh r0, [r5, 0xE] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x10] @@ -1813,7 +1813,7 @@ sub_80D48F4: @ 80D48F4 movs r1, 0x1 _080D4938: strh r1, [r5, 0x16] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080D494C @@ -1845,7 +1845,7 @@ _080D494C: bx r0 .align 2, 0 _080D4978: .4byte gTasks -_080D497C: .4byte gBattleAnimBankAttacker +_080D497C: .4byte gAnimBankAttacker _080D4980: .4byte 0x0000ffe0 _080D4984: .4byte sub_80D4988 thumb_func_end sub_80D48F4 @@ -2218,7 +2218,7 @@ sub_80D4C18: @ 80D4C18 cmp r0, 0 bne _080D4C5C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D4C5C: pop {r4} pop {r0} @@ -2265,16 +2265,16 @@ sub_80D4CA4: @ 80D4CA4 adds r4, r0, 0 movs r1, 0x1 bl sub_80787B0 - ldr r5, _080D4CE0 @ =gBattleAnimBankTarget + ldr r5, _080D4CE0 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x30] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] @@ -2289,7 +2289,7 @@ sub_80D4CA4: @ 80D4CA4 pop {r0} bx r0 .align 2, 0 -_080D4CE0: .4byte gBattleAnimBankTarget +_080D4CE0: .4byte gAnimBankTarget _080D4CE4: .4byte gBattleAnimArgs _080D4CE8: .4byte sub_80D4CEC thumb_func_end sub_80D4CA4 @@ -2345,7 +2345,7 @@ _080D4D44: cmp r1, r0 bne _080D4D56 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D4D56: ldrh r0, [r4, 0x2E] adds r0, 0x1 @@ -2443,7 +2443,7 @@ _080D4DF2: strh r0, [r4, 0x2E] mov r0, r9 strh r0, [r4, 0x30] - ldr r0, _080D4E3C @ =gBattleAnimBankAttacker + ldr r0, _080D4E3C @ =gAnimBankAttacker ldrb r0, [r0] bl sub_8079E90 subs r0, 0x1 @@ -2459,7 +2459,7 @@ _080D4DF2: .align 2, 0 _080D4E34: .4byte gSpriteTemplate_83D9420 _080D4E38: .4byte gSprites -_080D4E3C: .4byte gBattleAnimBankAttacker +_080D4E3C: .4byte gAnimBankAttacker _080D4E40: strh r7, [r4, 0x32] _080D4E42: @@ -2501,7 +2501,7 @@ _080D4E68: strh r0, [r4, 0x2E] mov r0, r9 strh r0, [r4, 0x30] - ldr r0, _080D4EB4 @ =gBattleAnimBankAttacker + ldr r0, _080D4EB4 @ =gAnimBankAttacker ldrb r0, [r0] bl sub_8079E90 subs r0, 0x1 @@ -2517,7 +2517,7 @@ _080D4E68: .align 2, 0 _080D4EAC: .4byte gSpriteTemplate_83D9420 _080D4EB0: .4byte gSprites -_080D4EB4: .4byte gBattleAnimBankAttacker +_080D4EB4: .4byte gAnimBankAttacker _080D4EB8: strh r7, [r4, 0x32] _080D4EBA: diff --git a/asm/wisp_fire.s b/asm/wisp_fire.s index a22903e6b..a6407589f 100755 --- a/asm/wisp_fire.s +++ b/asm/wisp_fire.s @@ -63,7 +63,7 @@ _080D5CD8: lsrs r0, 16 cmp r0, 0x83 bls _080D5D5C - ldr r0, _080D5D58 @ =gBattleAnimBankTarget + ldr r0, _080D5D58 @ =gAnimBankTarget ldrb r0, [r0] bl sub_8079ED4 movs r1, 0x3 @@ -80,9 +80,9 @@ _080D5CD8: _080D5D4C: .4byte gBattleAnimArgs _080D5D50: .4byte gMain _080D5D54: .4byte 0x0000043d -_080D5D58: .4byte gBattleAnimBankTarget +_080D5D58: .4byte gAnimBankTarget _080D5D5C: - ldr r0, _080D5D80 @ =gBattleAnimBankTarget + ldr r0, _080D5D80 @ =gAnimBankTarget ldrb r0, [r0] bl sub_8079ED4 lsls r0, 24 @@ -99,7 +99,7 @@ _080D5D5C: strb r1, [r4, 0x5] b _080D5DA0 .align 2, 0 -_080D5D80: .4byte gBattleAnimBankTarget +_080D5D80: .4byte gAnimBankTarget _080D5D84: adds r0, r2, 0 subs r0, 0x40 @@ -144,7 +144,7 @@ _080D5DC8: cmp r0, 0x1E bne _080D5DD6 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D5DD6: pop {r4} pop {r0} @@ -161,7 +161,7 @@ sub_80D5DDC: @ 80D5DDC lsls r1, 3 ldr r0, _080D5E3C @ =gTasks adds r4, r1, r0 - ldr r0, _080D5E40 @ =gBattleAnimBankAttacker + ldr r0, _080D5E40 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -173,7 +173,7 @@ sub_80D5DDC: @ 80D5DDC movs r1, 0x1 _080D5E02: strh r1, [r4, 0x20] - ldr r0, _080D5E44 @ =gBattleAnimBankTarget + ldr r0, _080D5E44 @ =gAnimBankTarget ldrb r1, [r0] movs r0, 0x2 eors r0, r1 @@ -199,8 +199,8 @@ _080D5E02: bx r0 .align 2, 0 _080D5E3C: .4byte gTasks -_080D5E40: .4byte gBattleAnimBankAttacker -_080D5E44: .4byte gBattleAnimBankTarget +_080D5E40: .4byte gAnimBankAttacker +_080D5E44: .4byte gAnimBankTarget _080D5E48: .4byte sub_80D5E4C thumb_func_end sub_80D5DDC @@ -570,7 +570,7 @@ _080D60EA: adds r0, 0x1 strh r0, [r2, 0x8] ldr r1, _080D6114 @ =gObjectBankIDs - ldr r0, _080D6118 @ =gBattleAnimBankTarget + ldr r0, _080D6118 @ =gAnimBankTarget ldrb r0, [r0] adds r0, r1 ldrb r6, [r0] @@ -586,7 +586,7 @@ _080D60EA: _080D610C: .4byte gTasks _080D6110: .4byte gBattleAnimArgs _080D6114: .4byte gObjectBankIDs -_080D6118: .4byte gBattleAnimBankTarget +_080D6118: .4byte gAnimBankTarget _080D611C: .4byte gUnknown_083D9794 _080D6120: ldr r4, _080D616C @ =gUnknown_083D97A4 diff --git a/constants/battle.inc b/constants/battle.inc index dfaa14779..287e9abf6 100644 --- a/constants/battle.inc +++ b/constants/battle.inc @@ -53,49 +53,3 @@ enum SP_DEFENSE enum ACCURACY enum EVASION - -@ status animation table -.equiv B_ANIM_STATUS_PSN, 0x0 -.equiv B_ANIM_STATUS_CONFUSION, 0x1 -.equiv B_ANIM_STATUS_BRN, 0x2 -.equiv B_ANIM_STATUS_INFATUATION, 0x3 -.equiv B_ANIM_STATUS_SLP, 0x4 -.equiv B_ANIM_STATUS_PRZ, 0x5 -.equiv B_ANIM_STATUS_FRZ, 0x6 -.equiv B_ANIM_STATUS_CURSED, 0x7 -.equiv B_ANIM_STATUS_NIGHTMARE, 0x8 -.equiv B_ANIM_STATUS_WRAPPED, 0x9 - -@ general animation table -.equiv B_ANIM_CASTFORM_CHANGE, 0x0 -.equiv B_ANIM_STATS_CHANGE, 0x1 -.equiv B_ANIM_SUBSTITUTE_FADE, 0x2 -.equiv B_ANIM_SUBSTITUTE_APPEAR, 0x3 -.equiv B_ANIM_POKEBLOCK_THROW, 0x4 -.equiv B_ANIM_ITEM_KNOCKOFF, 0x5 -.equiv B_ANIM_TURN_TRAP, 0x6 -.equiv B_ANIM_ITEM_EFFECT, 0x7 -.equiv B_ANIM_SMOKEBALL_ESCAPE, 0x8 -.equiv B_ANIM_HANGED_ON, 0x9 -.equiv B_ANIM_RAIN_CONTINUES, 0xA -.equiv B_ANIM_SUN_CONTINUES, 0xB -.equiv B_ANIM_SANDSTORM_CONTINUES, 0xC -.equiv B_ANIM_HAIL_CONTINUES, 0xD -.equiv B_ANIM_LEECH_SEED_DRAIN, 0xE -.equiv B_ANIM_MON_HIT, 0xF -.equiv B_ANIM_ITEM_STEAL, 0x10 -.equiv B_ANIM_SNATCH_MOVE, 0x11 -.equiv B_ANIM_FUTURE_SIGHT_HIT, 0x12 -.equiv B_ANIM_DOOM_DESIRE_HIT, 0x13 -.equiv B_ANIM_FOCUS_PUNCH_SET_UP, 0x14 -.equiv B_ANIM_INGRAIN_HEAL, 0x15 -.equiv B_ANIM_WISH_HEAL, 0x16 - -@ special animation table -.equiv B_ANIM_LVL_UP, 0x0 -.equiv B_ANIM_SWITCH_OUT_PLAYER_MON, 0x1 -.equiv B_ANIM_SWITCH_OUT_OPPONENT_MON, 0x2 -.equiv B_ANIM_BALL_THROW, 0x3 -.equiv B_ANIM_SAFARI_BALL_THROW, 0x4 -.equiv B_ANIM_SUBSTITUTE_TO_MON, 0x5 -.equiv B_ANIM_MON_TO_SUBSTITUTE, 0x6 diff --git a/constants/battle_move_constants.inc b/constants/battle_move_constants.inc deleted file mode 100644 index a05da3db3..000000000 --- a/constants/battle_move_constants.inc +++ /dev/null @@ -1,15 +0,0 @@ - .set TARGET_SELECTED_POKEMON, 0 - - .set F_TARGET_SPECIAL, 1 << 0 - .set F_TARGET_RANDOM, 1 << 2 - .set F_TARGET_BOTH_ENEMIES, 1 << 3 - .set F_TARGET_USER, 1 << 4 - .set F_TARGET_ALL_EXCEPT_USER, 1 << 5 - .set F_TARGET_ENEMY_SIDE, 1 << 6 - - .set F_MAKES_CONTACT, 1 << 0 - .set F_AFFECTED_BY_PROTECT, 1 << 1 - .set F_AFFECTED_BY_MAGIC_COAT, 1 << 2 - .set F_AFFECTED_BY_SNATCH, 1 << 3 - .set F_MIRROR_MOVE_COMPATIBLE, 1 << 4 - .set F_AFFECTED_BY_KINGS_ROCK, 1 << 5 diff --git a/constants/battle_script_constants.inc b/constants/battle_script_constants.inc new file mode 100644 index 000000000..f35c80543 --- /dev/null +++ b/constants/battle_script_constants.inc @@ -0,0 +1,162 @@ +@ animation ids + .set ANIM_CASTFORM_CHANGE, 0x0 + .set ANIM_STATS_CHANGE, 0x1 + .set ANIM_SUBSTITUTE_FADE, 0x2 + .set ANIM_SUBSTITUTE_APPEAR, 0x3 + .set ANIM_x4, 0x4 + .set ANIM_ITEM_KNOCKOFF, 0x5 + .set ANIM_TURN_TRAP, 0x6 + .set ANIM_ITEM_EFFECT, 0x7 + .set ANIM_SMOKEBALL_ESCAPE, 0x8 + .set ANIM_HANGED_ON, 0x9 + .set ANIM_RAIN_CONTINUES, 0xA + .set ANIM_SUN_CONTINUES, 0xB + .set ANIM_SANDSTORM_CONTINUES, 0xC + .set ANIM_HAIL_CONTINUES, 0xD + .set ANIM_LEECH_SEED_DRAIN, 0xE + .set ANIM_MON_HIT, 0xF + .set ANIM_ITEM_STEAL, 0x10 + .set ANIM_SNATCH_MOVE, 0x11 + .set ANIM_FUTURE_SIGHT_HIT, 0x12 + .set ANIM_DOOM_DESIRE_HIT, 0x13 + .set ANIM_x14, 0x14 + .set ANIM_INGRAIN_HEAL, 0x15 + .set ANIM_WISH_HEAL, 0x16 + +@ atk 80 + .set ATK80_DMG_CHANGE_SIGN, 0x0 + .set ATK80_DMG_HALF_BY_TWO_NOT_MORE_THAN_HALF_MAX_HP, 0x1 + .set ATK80_DMG_DOUBLED, 0x2 + +@ compare operands + .set EQUAL, 0x0 + .set NOT_EQUAL, 0x1 + .set GREATER_THAN, 0x2 + .set LESS_THAN, 0x3 + .set COMMON_BITS, 0x4 + .set NO_COMMON_BITS, 0x5 + +@ move effects + .set EFFECT_SLEEP, 0x1 + .set EFFECT_POISON, 0x2 + .set EFFECT_BURN, 0x3 + .set EFFECT_FREEZE, 0x4 + .set EFFECT_PARALYSIS, 0x5 + .set EFFECT_TOXIC, 0x6 + .set EFFECT_CONFUSION, 0x7 + .set EFFECT_FLINCH, 0x8 + .set EFFECT_TRI_ATTACK, 0x9 + .set EFFECT_UPROAR, 0xA + .set EFFECT_PAYDAY, 0xB + .set EFFECT_CHARGING, 0xC + .set EFFECT_WRAP, 0xD + .set EFFECT_RECOIL_25, 0xE + .set EFFECT_ATK_PLUS_1, 0xF + .set EFFECT_DEF_PLUS_1, 0x10 + .set EFFECT_SPD_PLUS_1, 0x11 + .set EFFECT_SP_ATK_PLUS_1, 0x12 + .set EFFECT_SP_DEF_PLUS_1, 0x13 + .set EFFECT_ACC_PLUS_1, 0x14 + .set EFFECT_EVS_PLUS_1, 0x15 + .set EFFECT_ATK_MINUS_1, 0x16 + .set EFFECT_DEF_MINUS_1, 0x17 + .set EFFECT_SPD_MINUS_1, 0x18 + .set EFFECT_SP_ATK_MINUS_1, 0x19 + .set EFFECT_SP_DEF_MINUS_1, 0x1A + .set EFFECT_ACC_MINUS_1, 0x1B + .set EFFECT_EVS_MINUS_1, 0x1C + .set EFFECT_RECHARGE, 0x1D + .set EFFECT_RAGE, 0x1E + .set EFFECT_STEAL_ITEM, 0x1F + .set EFFECT_PREVENT_ESCAPE, 0x20 + .set EFFECT_NIGHTMARE, 0x21 + .set EFFECT_ALL_STATS_UP, 0x22 + .set EFFECT_RAPIDSPIN, 0x23 + .set EFFECT_REMOVE_PARALYSIS, 0x24 + .set EFFECT_ATK_DEF_DOWN, 0x25 + .set EFFECT_RECOIL_33_PARALYSIS, 0x26 + .set EFFECT_ATK_PLUS_2, 0x27 + .set EFFECT_DEF_PLUS_2, 0x28 + .set EFFECT_SPD_PLUS_2, 0x29 + .set EFFECT_SP_ATK_PLUS_2, 0x2A + .set EFFECT_SP_DEF_PLUS_2, 0x2B + .set EFFECT_ACC_PLUS_2, 0x2C + .set EFFECT_EVS_PLUS_2, 0x2D + .set EFFECT_ATK_MINUS_2, 0x2E + .set EFFECT_DEF_MINUS_2, 0x2F + .set EFFECT_SPD_MINUS_2, 0x30 + .set EFFECT_SP_ATK_MINUS_2, 0x31 + .set EFFECT_SP_DEF_MINUS_2, 0x32 + .set EFFECT_ACC_MINUS_2, 0x33 + .set EFFECT_EVS_MINUS_2, 0x34 + .set EFFECT_THRASH, 0x35 + .set EFFECT_KNOCK_OFF, 0x36 + .set EFFECT_NOTHING_37, 0x37 + .set EFFECT_NOTHING_38, 0x38 + .set EFFECT_NOTHING_39, 0x39 + .set EFFECT_NOTHING_3A, 0x3A + .set EFFECT_SP_ATK_TWO_DOWN, 0x3B + .set EFFECT_NOTHING_3C, 0x3C + .set EFFECT_NOTHING_3D, 0x3D + .set EFFECT_NOTHING_3E, 0x3E + .set EFFECT_NOTHING_3F, 0x3F + + .set AFFECTS_USER, 0x40 + .set CERTAIN, 0x80 + +@ accuracy calc + .set NO_ACC_CALC, 0xFFFE + .set NO_ACC_CALC_CHECK_LOCK_ON, 0xFFFF + .set ACC_CURR_MOVE, 0x0 + +@ bank values + .set EFFECT_BANK, 0x2 + .set GBANK_1, 0x3 + .set ATTACKER_WITH_PARTNER, 0x4 @ only for cmd98 + .set BANK0, 0x7 + .set SCRIPTING_BANK, 0xA + .set OPPONENT1, 0xC + +@ various + .set VARIOUS_CANCEL_MULTI_TURN_MOVES, 0 + .set VARIOUS_SET_MAGIC_COAT_TARGET, 1 + .set VARIOUS_IS_RUNNING_IMPOSSIBLE, 2 + .set VARIOUS_GET_MOVE_TARGET, 3 + .set VARIOUS_RESET_INTIMIDATE_TRACE_BITS, 5 + .set VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP, 6 + .set VARIOUS_EMIT_YESNOBOX, 13 + .set VARIOUS_WAIT_CRY, 18 + .set VARIOUS_RETURN_OPPONENT_MON1, 19 + .set VARIOUS_RETURN_OPPONENT_MON2, 20 + .set VARIOUS_SET_TELEPORT_OUTCOME, 25 + .set VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC, 26 + +@ jumpifcant switch flag argument + .set ATK4F_DONT_CHECK_STATUSES, 0x80 + +@ battle scripting struct + .equiv sANIM_TURN, gSharedMem + 0x16002 + .equiv sBANK, gSharedMem + 0x16003 + .equiv sMOVEEND_STATE, gSharedMem + 0x1600C + .equiv sGIVEEXP_STATE, gSharedMem + 0x1600F + .equiv sPAINSPLIT_HP, gSharedMem + 0x16014 + .equiv sLEARNMOVE_STATE, gSharedMem + 0x1601A + .equiv sSTATCHANGER, gSharedMem + 0x1601E + .equiv sDMG_MULTIPLIER, gSharedMem + 0x1601F + .equiv sTWOTURN_STRINGID, gSharedMem + 0x16055 + .equiv sBATTLE_STYLE, gSharedMem + 0x16084 + .equiv sBIDE_DMG, gSharedMem + 0x16090 + .equiv sLVLBOX_STATE, gSharedMem + 0x1609C + .equiv sANIM_TARGETS_HIT, gSharedMem + 0x160A1 + .equiv sANIM_ARG1, gSharedMem + 0x160A4 + .equiv sANIM_ARG2, gSharedMem + 0x160A5 + .equiv sFIELD_1B, gSharedMem + 0x160DC + .equiv sTRIPLE_KICK_POWER, gSharedMem + 0x160DE + .equiv sMULTIHIT_STRING, gSharedMem + 0x160E0 + .equiv sBANK_WITH_ABILITY, gSharedMem + 0x160F8 + .equiv sMULTIHIT_EFFECT, gSharedMem + 0x16112 + + +@ battle communication struct + .equiv cEFFECT_CHOOSER, gBattleCommunication + 3 + .equiv cMULTISTRING_CHOOSER, gBattleCommunication + 5 diff --git a/constants/constants.inc b/constants/constants.inc index 1ec25462f..57b6ae2a5 100644 --- a/constants/constants.inc +++ b/constants/constants.inc @@ -3,7 +3,6 @@ .include "constants/type_constants.inc" .include "constants/contest_constants.inc" .include "constants/item_data_constants.inc" - .include "constants/battle_move_constants.inc" .include "constants/trainer_constants.inc" .include "constants/berry_constants.inc" .include "constants/version.inc" diff --git a/constants/misc_constants.inc b/constants/misc_constants.inc index 5f4330928..bf90fcd1e 100644 --- a/constants/misc_constants.inc +++ b/constants/misc_constants.inc @@ -45,7 +45,3 @@ .equiv PLAYER_TYPE1, 2 .equiv PLAYER_TYPE2, 3 .equiv CURRENT_MOVE, 4 - - .equiv LESS_THAN, 0 - .equiv GREATER_THAN, 1 - .equiv EQUAL, 2 diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 64b211199..e786a6ab1 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -490,7 +490,7 @@ EventScript_15F4A1: goto_if_eq EventScript_15F4E0 compare RESULT, 2 goto_if_eq EventScript_15F503 - special sub_80BC224 + special BufferSecretBaseOwnerName msgbox UnknownString_81A3958, 5 compare RESULT, 0 goto_if_eq EventScript_15F452 @@ -1815,7 +1815,7 @@ DewfordTown_EventScript_1A0102:: @ 81A0102 DewfordTown_Hall_EventScript_1A0102:: @ 81A0102 dodailyevents setvar VAR_SPECIAL_4, 0 - special sub_80FA5BC + special BufferTrendyPhraseString return DewfordTown_EventScript_1A010C:: @ 81A010C @@ -2544,7 +2544,7 @@ MossdeepCity_StevensHouse_EventScript_1A0678:: @ 81A0678 RustboroCity_DevonCorp_2F_EventScript_1A0678:: @ 81A0678 SlateportCity_House1_EventScript_1A0678:: @ 81A0678 fadescreen 1 - special sub_80BF9F8 + special ChangePokemonNickname waitstate return @@ -3813,7 +3813,7 @@ EventScript_1A2E45: compare RESULT, 0 goto_if_eq EventScript_1A2F3A fadescreen 1 - special sub_80BC50C + special MoveSecretBase closemessage fadescreen 0 msgbox UnknownString_81A3CC9, 5 @@ -4317,7 +4317,7 @@ SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A special sub_80BCE1C setvar VAR_SPECIAL_4, 1 setvar VAR_SPECIAL_5, 0 - special sub_813556C + special StartSpecialBattle waitstate special ScrSpecial_HealPlayerParty release @@ -4415,14 +4415,14 @@ BattleTower_Lobby_EventScript_1ADE46:: @ 81ADE46 FallarborTown_ContestLobby_EventScript_1ADE46:: @ 81ADE46 SlateportCity_OceanicMuseum_1F_EventScript_1ADE46:: @ 81ADE46 SlateportCity_PokemonFanClub_EventScript_1ADE46:: @ 81ADE46 - special sub_80BDE48 + special InterviewAfter incrementgamestat GAME_STAT_GOT_INTERVIEWED release end SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D setvar VAR_SPECIAL_5, 1 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADED6 copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 @@ -4467,7 +4467,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 lock faceplayer setvar VAR_SPECIAL_5, 2 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 @@ -4522,11 +4522,11 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF96:: @ 81ADF96 SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 lock faceplayer - specialvar RESULT, sub_80BF544 + specialvar RESULT, LeadMonNicknamed compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE4D setvar VAR_SPECIAL_5, 3 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0AC copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 @@ -4603,7 +4603,7 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 checkflag FLAG_TEMP_2 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E setvar VAR_SPECIAL_5, 6 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 @@ -4663,7 +4663,7 @@ VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 compare VAR_LINK_CONTEST_ROOM_STATE, 2 goto_if 5, FallarborTown_ContestLobby_EventScript_1AE1FE setvar VAR_SPECIAL_5, 6 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE1FE switch VAR_CONTEST_LOCATION @@ -4700,7 +4700,7 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF checkflag FLAG_TEMP_2 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 setvar VAR_SPECIAL_5, 7 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 @@ -4769,7 +4769,7 @@ BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE30F setvar VAR_SPECIAL_5, 7 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE30F clearflag FLAG_HIDE_REPORTER_BATTLE_TOWER diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc index 2b86dc4dc..edecb0312 100644 --- a/data-de/field_move_scripts.inc +++ b/data-de/field_move_scripts.inc @@ -90,7 +90,7 @@ DoRockSmashMovement: @ 81B0F0C applymovement LAST_TALKED, RockSmashMovement waitmovement 0 removeobject LAST_TALKED - specialvar RESULT, sub_810F5BC + specialvar RESULT, TryUpdateRusturfTunnelState compare RESULT, 1 goto_if_eq DoRockSmashMovement_Done special ScrSpecial_RockSmashWildEncounter diff --git a/data/battle_moves.s b/data/battle_moves.s index 9a7398999..2c65bd3a5 100644 --- a/data/battle_moves.s +++ b/data/battle_moves.s @@ -1,3 +1,4 @@ +#include "constants/battle_constants.h" #include "constants/battle_move_effects.h" .include "asm/macros.inc" .include "constants/constants.inc" @@ -156,7 +157,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -167,7 +168,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -420,7 +421,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 100 @ secondary effect chance - .byte F_TARGET_RANDOM + .byte TARGET_RANDOM .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags @@ -442,7 +443,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags @@ -486,7 +487,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags @@ -508,7 +509,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 40 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags @@ -574,7 +575,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 30 @ PP .byte 10 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -607,7 +608,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -640,7 +641,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 15 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -662,7 +663,7 @@ gBattleMoves:: @ 81FB12C .byte 70 @ accuracy .byte 5 @ PP .byte 10 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -761,7 +762,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL + .byte TARGET_SPECIAL .byte -5 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_MAKES_CONTACT @ misc. flags @@ -827,7 +828,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 40 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -838,7 +839,7 @@ gBattleMoves:: @ 81FB12C .byte 95 @ accuracy .byte 25 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -893,7 +894,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 100 @ secondary effect chance - .byte F_TARGET_RANDOM + .byte TARGET_RANDOM .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags @@ -904,7 +905,7 @@ gBattleMoves:: @ 81FB12C .byte 95 @ accuracy .byte 40 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags @@ -992,7 +993,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_ALL_EXCEPT_USER + .byte TARGET_ALL_EXCEPT_USER .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -1069,7 +1070,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 40 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1080,7 +1081,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1113,7 +1114,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -1157,7 +1158,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 15 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1168,7 +1169,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1179,7 +1180,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1190,7 +1191,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1223,7 +1224,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 40 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1234,7 +1235,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 40 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1245,7 +1246,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1256,7 +1257,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1267,7 +1268,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_PROTECT @ misc. flags @@ -1278,7 +1279,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1289,7 +1290,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1300,7 +1301,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags @@ -1311,7 +1312,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL + .byte TARGET_SPECIAL .byte 0 @ priority .4byte 0 @ misc. flags @@ -1322,7 +1323,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL + .byte TARGET_SPECIAL .byte 0 @ priority .4byte 0 @ misc. flags @@ -1333,7 +1334,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_ALL_EXCEPT_USER + .byte TARGET_ALL_EXCEPT_USER .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -1432,7 +1433,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -1476,7 +1477,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1498,7 +1499,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_SNATCH @ misc. flags @@ -1608,7 +1609,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 30 @ PP .byte 10 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -1663,7 +1664,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 40 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -1674,7 +1675,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 40 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1696,7 +1697,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_ALL_EXCEPT_USER + .byte TARGET_ALL_EXCEPT_USER .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -1729,7 +1730,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1740,7 +1741,7 @@ gBattleMoves:: @ 81FB12C .byte 90 @ accuracy .byte 10 @ PP .byte 30 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -1762,7 +1763,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1773,7 +1774,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -1817,7 +1818,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1949,7 +1950,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -2004,7 +2005,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 25 @ PP .byte 10 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -2015,7 +2016,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 3 @ priority .4byte 0 @ misc. flags @@ -2070,7 +2071,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -2114,7 +2115,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_ENEMY_SIDE + .byte TARGET_ENEMY_SIDE .byte 0 @ priority .4byte 0 @ misc. flags @@ -2147,7 +2148,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -2158,7 +2159,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -2169,7 +2170,7 @@ gBattleMoves:: @ 81FB12C .byte 95 @ accuracy .byte 15 @ PP .byte 100 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -2180,7 +2181,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 3 @ priority .4byte 0 @ misc. flags @@ -2213,7 +2214,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 15 @ PP .byte 100 @ secondary effect chance - .byte F_TARGET_RANDOM + .byte TARGET_RANDOM .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags @@ -2224,7 +2225,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -2246,7 +2247,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 3 @ priority .4byte 0 @ misc. flags @@ -2301,7 +2302,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH | F_AFFECTED_BY_PROTECT @ misc. flags @@ -2367,7 +2368,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL + .byte TARGET_SPECIAL .byte 0 @ priority .4byte 0 @ misc. flags @@ -2378,7 +2379,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -2422,7 +2423,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 25 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -2455,7 +2456,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_ALL_EXCEPT_USER + .byte TARGET_ALL_EXCEPT_USER .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -2499,7 +2500,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 40 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -2543,7 +2544,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags @@ -2587,7 +2588,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -2598,7 +2599,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -2609,7 +2610,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -2642,7 +2643,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 20 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -2653,7 +2654,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -2664,7 +2665,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -2686,7 +2687,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL + .byte TARGET_SPECIAL .byte -5 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE @ misc. flags @@ -2796,7 +2797,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 10 @ PP .byte 100 @ secondary effect chance - .byte F_TARGET_RANDOM + .byte TARGET_RANDOM .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -2807,7 +2808,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -2829,7 +2830,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -2840,7 +2841,7 @@ gBattleMoves:: @ 81FB12C .byte 90 @ accuracy .byte 10 @ PP .byte 10 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -2851,7 +2852,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_PROTECT @ misc. flags @@ -2939,7 +2940,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 3 @ priority .4byte 0 @ misc. flags @@ -2950,7 +2951,7 @@ gBattleMoves:: @ 81FB12C .byte 95 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL + .byte TARGET_SPECIAL .byte 0 @ priority .4byte 0 @ misc. flags @@ -2961,7 +2962,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -2983,7 +2984,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 5 @ priority .4byte 0 @ misc. flags @@ -3016,7 +3017,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_PROTECT @ misc. flags @@ -3027,7 +3028,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL + .byte TARGET_SPECIAL .byte 0 @ priority .4byte 0 @ misc. flags @@ -3038,7 +3039,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -3060,7 +3061,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 15 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL + .byte TARGET_SPECIAL .byte 4 @ priority .4byte 0 @ misc. flags @@ -3071,7 +3072,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -3137,7 +3138,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -3159,7 +3160,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_PROTECT @ misc. flags @@ -3170,7 +3171,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -3181,7 +3182,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -3192,7 +3193,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL + .byte TARGET_SPECIAL .byte 4 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE @ misc. flags @@ -3236,7 +3237,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -3247,7 +3248,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -3291,7 +3292,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_ALL_EXCEPT_USER + .byte TARGET_ALL_EXCEPT_USER .byte 0 @ priority .4byte F_AFFECTED_BY_PROTECT @ misc. flags @@ -3313,7 +3314,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 15 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -3346,7 +3347,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -3357,7 +3358,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -3445,7 +3446,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -3467,7 +3468,7 @@ gBattleMoves:: @ 81FB12C .byte 95 @ accuracy .byte 25 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -3555,7 +3556,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -3566,7 +3567,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -3643,7 +3644,7 @@ gBattleMoves:: @ 81FB12C .byte 85 @ accuracy .byte 10 @ PP .byte 30 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -3687,7 +3688,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 15 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -3709,7 +3710,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 40 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -3742,7 +3743,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -3819,7 +3820,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 15 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -3830,7 +3831,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -3852,7 +3853,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 4e41bcc20..3c255b461 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1,607 +1,611 @@ #include "constants/abilities.h" +#include "constants/battle_constants.h" +#include "constants/moves.h" +#include "constants/songs.h" .include "asm/macros.inc" - .include "constants/constants.inc" .include "asm/macros/battle_script.inc" + .include "constants/constants.inc" + .include "constants/battle_script_constants.inc" .section script_data, "aw", %progbits -gBattleScriptsEffectsTable:: @ 81D6BBC - .4byte MoveEffect_Hit - .4byte MoveEffect_Sleep - .4byte MoveEffect_PoisonHit - .4byte MoveEffect_Absorb - .4byte MoveEffect_BurnHit - .4byte MoveEffect_FreezeHit - .4byte MoveEffect_ParalyzeHit - .4byte MoveEffect_Explosion - .4byte MoveEffect_DreamEater - .4byte MoveEffect_MirrorMove - .4byte MoveEffect_AttackUp - .4byte MoveEffect_DefenseUp - .4byte MoveEffect_SpeedUp - .4byte MoveEffect_SpecialAttackUp - .4byte MoveEffect_SpecialDefenseUp - .4byte MoveEffect_AccuracyUp - .4byte MoveEffect_EvasionUp - .4byte MoveEffect_AlwaysHit - .4byte MoveEffect_AttackDown - .4byte MoveEffect_DefenseDown - .4byte MoveEffect_SpeedDown - .4byte MoveEffect_SpecialAttackDown - .4byte MoveEffect_SpecialDefenseDown - .4byte MoveEffect_AccuracyDown - .4byte MoveEffect_EvasionDown - .4byte MoveEffect_Haze - .4byte MoveEffect_Bide - .4byte MoveEffect_Rampage - .4byte MoveEffect_Roar - .4byte MoveEffect_MultiHit - .4byte MoveEffect_Conversion - .4byte MoveEffect_FlinchHit - .4byte MoveEffect_RestoreHp - .4byte MoveEffect_Toxic - .4byte MoveEffect_PayDay - .4byte MoveEffect_LightScreen - .4byte MoveEffect_TriAttack - .4byte MoveEffect_Rest - .4byte MoveEffect_Ohko - .4byte MoveEffect_RazorWind - .4byte MoveEffect_SuperFang - .4byte MoveEffect_DragonRage - .4byte MoveEffect_Trap - .4byte MoveEffect_HighCritical - .4byte MoveEffect_DoubleHit - .4byte MoveEffect_RecoilIfMiss - .4byte MoveEffect_Mist - .4byte MoveEffect_FocusEnergy - .4byte MoveEffect_Recoil - .4byte MoveEffect_Confuse - .4byte MoveEffect_AttackUp2 - .4byte MoveEffect_DefenseUp2 - .4byte MoveEffect_SpeedUp2 - .4byte MoveEffect_SpecialAttackUp2 - .4byte MoveEffect_SpecialDefenseUp2 - .4byte MoveEffect_AccuracyUp2 - .4byte MoveEffect_EvasionUp2 - .4byte MoveEffect_Transform - .4byte MoveEffect_AttackDown2 - .4byte MoveEffect_DefenseDown2 - .4byte MoveEffect_SpeedDown2 - .4byte MoveEffect_SpecialAttackDown2 - .4byte MoveEffect_SpecialDefenseDown2 - .4byte MoveEffect_AccuracyDown2 - .4byte MoveEffect_EvasionDown2 - .4byte MoveEffect_Reflect - .4byte MoveEffect_Poison - .4byte MoveEffect_Paralyze - .4byte MoveEffect_AttackDownHit - .4byte MoveEffect_DefenseDownHit - .4byte MoveEffect_SpeedDownHit - .4byte MoveEffect_SpecialAttackDownHit - .4byte MoveEffect_SpecialDefenseDownHit - .4byte MoveEffect_AccuracyDownHit - .4byte MoveEffect_EvasionDownHit - .4byte MoveEffect_SkyAttack - .4byte MoveEffect_ConfuseHit - .4byte MoveEffect_Twineedle - .4byte MoveEffect_VitalThrow - .4byte MoveEffect_Substitute - .4byte MoveEffect_Recharge - .4byte MoveEffect_Rage - .4byte MoveEffect_Mimic - .4byte MoveEffect_Metronome - .4byte MoveEffect_LeechSeed - .4byte MoveEffect_Splash - .4byte MoveEffect_Disable - .4byte MoveEffect_LevelDamage - .4byte MoveEffect_Psywave - .4byte MoveEffect_Counter - .4byte MoveEffect_Encore - .4byte MoveEffect_PainSplit - .4byte MoveEffect_Snore - .4byte MoveEffect_Conversion2 - .4byte MoveEffect_LockOn - .4byte MoveEffect_Sketch - .4byte MoveEffect_Unused60 - .4byte MoveEffect_SleepTalk - .4byte MoveEffect_DestinyBond - .4byte MoveEffect_Flail - .4byte MoveEffect_Spite - .4byte MoveEffect_FalseSwipe - .4byte MoveEffect_HealBell - .4byte MoveEffect_QuickAttack - .4byte MoveEffect_TripleKick - .4byte MoveEffect_Thief - .4byte MoveEffect_MeanLook - .4byte MoveEffect_Nightmare - .4byte MoveEffect_Minimize - .4byte MoveEffect_Curse - .4byte MoveEffect_Unused6E - .4byte MoveEffect_Protect - .4byte MoveEffect_Spikes - .4byte MoveEffect_Foresight - .4byte MoveEffect_PerishSong - .4byte MoveEffect_Sandstorm - .4byte MoveEffect_Endure - .4byte MoveEffect_Rollout - .4byte MoveEffect_Swagger - .4byte MoveEffect_FuryCutter - .4byte MoveEffect_Attract - .4byte MoveEffect_Return - .4byte MoveEffect_Present - .4byte MoveEffect_Frustration - .4byte MoveEffect_Safeguard - .4byte MoveEffect_ThawHit - .4byte MoveEffect_Magnitude - .4byte MoveEffect_BatonPass - .4byte MoveEffect_Pursuit - .4byte MoveEffect_RapidSpin - .4byte MoveEffect_Sonicboom - .4byte MoveEffect_Unused83 - .4byte MoveEffect_MorningSun - .4byte MoveEffect_Synthesis - .4byte MoveEffect_Moonlight - .4byte MoveEffect_HiddenPower - .4byte MoveEffect_RainDance - .4byte MoveEffect_SunnyDay - .4byte MoveEffect_DefenseUpHit - .4byte MoveEffect_AttackUpHit - .4byte MoveEffect_AllStatsUpHit - .4byte MoveEffect_Unused8D - .4byte MoveEffect_BellyDrum - .4byte MoveEffect_PsychUp - .4byte MoveEffect_MirrorCoat - .4byte MoveEffect_SkullBash - .4byte MoveEffect_Twister - .4byte MoveEffect_Earthquake - .4byte MoveEffect_FutureSight - .4byte MoveEffect_Gust - .4byte MoveEffect_FlinchHit2 - .4byte MoveEffect_Solarbeam - .4byte MoveEffect_Thunder - .4byte MoveEffect_Teleport - .4byte MoveEffect_BeatUp - .4byte MoveEffect_Fly - .4byte MoveEffect_DefenseCurl - .4byte MoveEffect_Softboiled - .4byte MoveEffect_FakeOut - .4byte MoveEffect_Uproar - .4byte MoveEffect_Stockpile - .4byte MoveEffect_SpitUp - .4byte MoveEffect_Swallow - .4byte MoveEffect_UnusedA3 - .4byte MoveEffect_Hail - .4byte MoveEffect_Torment - .4byte MoveEffect_Flatter - .4byte MoveEffect_WillOWisp - .4byte MoveEffect_Memento - .4byte MoveEffect_Facade - .4byte MoveEffect_FocusPunch - .4byte MoveEffect_Smellingsalt - .4byte MoveEffect_FollowMe - .4byte MoveEffect_NaturePower - .4byte MoveEffect_Charge - .4byte MoveEffect_Taunt - .4byte MoveEffect_HelpingHand - .4byte MoveEffect_Trick - .4byte MoveEffect_RolePlay - .4byte MoveEffect_Wish - .4byte MoveEffect_Assist - .4byte MoveEffect_Ingrain - .4byte MoveEffect_Superpower - .4byte MoveEffect_MagicCoat - .4byte MoveEffect_Recycle - .4byte MoveEffect_Revenge - .4byte MoveEffect_BrickBreak - .4byte MoveEffect_Yawn - .4byte MoveEffect_KnockOff - .4byte MoveEffect_Endeavor - .4byte MoveEffect_Eruption - .4byte MoveEffect_SkillSwap - .4byte MoveEffect_Imprison - .4byte MoveEffect_Refresh - .4byte MoveEffect_Grudge - .4byte MoveEffect_Snatch - .4byte MoveEffect_LowKick - .4byte MoveEffect_SecretPower - .4byte MoveEffect_DoubleEdge - .4byte MoveEffect_TeeterDance - .4byte MoveEffect_BlazeKick - .4byte MoveEffect_MudSport - .4byte MoveEffect_PoisonFang - .4byte MoveEffect_WeatherBall - .4byte MoveEffect_Overheat - .4byte MoveEffect_Tickle - .4byte MoveEffect_CosmicPower - .4byte MoveEffect_SkyUppercut - .4byte MoveEffect_BulkUp - .4byte MoveEffect_PoisonTail - .4byte MoveEffect_WaterSport - .4byte MoveEffect_CalmMind - .4byte MoveEffect_DragonDance - .4byte MoveEffect_Camouflage - -BattleScript_1D6F14: @ 81D6F14 -MoveEffect_AccuracyDown2: @ 81D6F14 -MoveEffect_AccuracyUp2: @ 81D6F14 -MoveEffect_AccuracyUp: @ 81D6F14 -MoveEffect_AlwaysHit: @ 81D6F14 -MoveEffect_EvasionDown2: @ 81D6F14 -MoveEffect_EvasionDownHit: @ 81D6F14 -MoveEffect_EvasionUp2: @ 81D6F14 -MoveEffect_FalseSwipe: @ 81D6F14 -MoveEffect_HighCritical: @ 81D6F14 -MoveEffect_Hit: @ 81D6F14 -MoveEffect_Pursuit: @ 81D6F14 -MoveEffect_QuickAttack: @ 81D6F14 -MoveEffect_SpecialAttackDown2: @ 81D6F14 -MoveEffect_SpecialAttackDown: @ 81D6F14 -MoveEffect_SpecialDefenseDown: @ 81D6F14 -MoveEffect_SpecialDefenseUp: @ 81D6F14 -MoveEffect_SpeedUp: @ 81D6F14 -MoveEffect_Unused60: @ 81D6F14 -MoveEffect_Unused6E: @ 81D6F14 -MoveEffect_Unused83: @ 81D6F14 -MoveEffect_Unused8D: @ 81D6F14 -MoveEffect_UnusedA3: @ 81D6F14 -MoveEffect_VitalThrow: @ 81D6F14 - jumpifhalfword 1, gCurrentMove, 57, BattleScript_1D6F3A - jumpifspecialstatusflag TARGET, 0x40000, 1, BattleScript_1D6F3A - orword gHitMarker, 0x40000 - setbyte gSharedMem + 0x1601F, 2 - -BattleScript_1D6F3A: @ 81D6F3A - attackcanceler - -BattleScript_1D6F3B: @ 81D6F3B - accuracycheck BattleScript_1D6F72, 0 - -BattleScript_1D6F42: @ 81D6F42 - attackstring - ppreduce - -BattleScript_1D6F44:: @ 81D6F44 +gBattleScriptsForMoveEffects:: @ 81D6BBC + .4byte BattleScript_EffectHit + .4byte BattleScript_EffectSleep + .4byte BattleScript_EffectPoisonHit + .4byte BattleScript_EffectAbsorb + .4byte BattleScript_EffectBurnHit + .4byte BattleScript_EffectFreezeHit + .4byte BattleScript_EffectParalyzeHit + .4byte BattleScript_EffectExplosion + .4byte BattleScript_EffectDreamEater + .4byte BattleScript_EffectMirrorMove + .4byte BattleScript_EffectAttackUp + .4byte BattleScript_EffectDefenseUp + .4byte BattleScript_EffectSpeedUp + .4byte BattleScript_EffectSpecialAttackUp + .4byte BattleScript_EffectSpecialDefenseUp + .4byte BattleScript_EffectAccuracyUp + .4byte BattleScript_EffectEvasionUp + .4byte BattleScript_EffectAlwaysHit + .4byte BattleScript_EffectAttackDown + .4byte BattleScript_EffectDefenseDown + .4byte BattleScript_EffectSpeedDown + .4byte BattleScript_EffectSpecialAttackDown + .4byte BattleScript_EffectSpecialDefenseDown + .4byte BattleScript_EffectAccuracyDown + .4byte BattleScript_EffectEvasionDown + .4byte BattleScript_EffectHaze + .4byte BattleScript_EffectBide + .4byte BattleScript_EffectRampage + .4byte BattleScript_EffectRoar + .4byte BattleScript_EffectMultiHit + .4byte BattleScript_EffectConversion + .4byte BattleScript_EffectFlinchHit + .4byte BattleScript_EffectRestoreHp + .4byte BattleScript_EffectToxic + .4byte BattleScript_EffectPayDay + .4byte BattleScript_EffectLightScreen + .4byte BattleScript_EffectTriAttack + .4byte BattleScript_EffectRest + .4byte BattleScript_EffectOHKO + .4byte BattleScript_EffectRazorWind + .4byte BattleScript_EffectSuperFang + .4byte BattleScript_EffectDragonRage + .4byte BattleScript_EffectTrap + .4byte BattleScript_EffectHighCritical + .4byte BattleScript_EffectDoubleHit + .4byte BattleScript_EffectRecoilIfMiss + .4byte BattleScript_EffectMist + .4byte BattleScript_EffectFocusEnergy + .4byte BattleScript_EffectRecoil + .4byte BattleScript_EffectConfuse + .4byte BattleScript_EffectAttackUp2 + .4byte BattleScript_EffectDefenseUp2 + .4byte BattleScript_EffectSpeedUp2 + .4byte BattleScript_EffectSpecialAttackUp2 + .4byte BattleScript_EffectSpecialDefenseUp2 + .4byte BattleScript_EffectAccuracyUp2 + .4byte BattleScript_EffectEvasionUp2 + .4byte BattleScript_EffectTransform + .4byte BattleScript_EffectAttackDown2 + .4byte BattleScript_EffectDefenseDown2 + .4byte BattleScript_EffectSpeedDown2 + .4byte BattleScript_EffectSpecialAttackDown2 + .4byte BattleScript_EffectSpecialDefenseDown2 + .4byte BattleScript_EffectAccuracyDown2 + .4byte BattleScript_EffectEvasionDown2 + .4byte BattleScript_EffectReflect + .4byte BattleScript_EffectPoison + .4byte BattleScript_EffectParalyze + .4byte BattleScript_EffectAttackDownHit + .4byte BattleScript_EffectDefenseDownHit + .4byte BattleScript_EffectSpeedDownHit + .4byte BattleScript_EffectSpecialAttackDownHit + .4byte BattleScript_EffectSpecialDefenseDownHit + .4byte BattleScript_EffectAccuracyDownHit + .4byte BattleScript_EffectEvasionDownHit + .4byte BattleScript_EffectSkyAttack + .4byte BattleScript_EffectConfuseHit + .4byte BattleScript_EffectTwineedle + .4byte BattleScript_EffectVitalThrow + .4byte BattleScript_EffectSubstitute + .4byte BattleScript_EffectRecharge + .4byte BattleScript_EffectRage + .4byte BattleScript_EffectMimic + .4byte BattleScript_EffectMetronome + .4byte BattleScript_EffectLeechSeed + .4byte BattleScript_EffectSplash + .4byte BattleScript_EffectDisable + .4byte BattleScript_EffectLevelDamage + .4byte BattleScript_EffectPsywave + .4byte BattleScript_EffectCounter + .4byte BattleScript_EffectEncore + .4byte BattleScript_EffectPainSplit + .4byte BattleScript_EffectSnore + .4byte BattleScript_EffectConversion2 + .4byte BattleScript_EffectLockOn + .4byte BattleScript_EffectSketch + .4byte BattleScript_EffectUnused60//Thaw + .4byte BattleScript_EffectSleepTalk + .4byte BattleScript_EffectDestinyBond + .4byte BattleScript_EffectFlail + .4byte BattleScript_EffectSpite + .4byte BattleScript_EffectFalseSwipe + .4byte BattleScript_EffectHealBell + .4byte BattleScript_EffectQuickAttack + .4byte BattleScript_EffectTripleKick + .4byte BattleScript_EffectThief + .4byte BattleScript_EffectMeanLook + .4byte BattleScript_EffectNightmare + .4byte BattleScript_EffectMinimize + .4byte BattleScript_EffectCurse + .4byte BattleScript_EffectUnused6E + .4byte BattleScript_EffectProtect + .4byte BattleScript_EffectSpikes + .4byte BattleScript_EffectForesight + .4byte BattleScript_EffectPerishSong + .4byte BattleScript_EffectSandstorm + .4byte BattleScript_EffectEndure + .4byte BattleScript_EffectRollout + .4byte BattleScript_EffectSwagger + .4byte BattleScript_EffectFuryCutter + .4byte BattleScript_EffectAttract + .4byte BattleScript_EffectReturn + .4byte BattleScript_EffectPresent + .4byte BattleScript_EffectFrustration + .4byte BattleScript_EffectSafeguard + .4byte BattleScript_EffectThawHit + .4byte BattleScript_EffectMagnitude + .4byte BattleScript_EffectBatonPass + .4byte BattleScript_EffectPursuit + .4byte BattleScript_EffectRapidSpin + .4byte BattleScript_EffectSonicboom + .4byte BattleScript_EffectUnused83 + .4byte BattleScript_EffectMorningSun + .4byte BattleScript_EffectSynthesis + .4byte BattleScript_EffectMoonlight + .4byte BattleScript_EffectHiddenPower + .4byte BattleScript_EffectRainDance + .4byte BattleScript_EffectSunnyDay + .4byte BattleScript_EffectDefenseUpHit + .4byte BattleScript_EffectAttackUpHit + .4byte BattleScript_EffectAllStatsUpHit + .4byte BattleScript_EffectUnused8D + .4byte BattleScript_EffectBellyDrum + .4byte BattleScript_EffectPsychUp + .4byte BattleScript_EffectMirrorCoat + .4byte BattleScript_EffectSkullBash + .4byte BattleScript_EffectTwister + .4byte BattleScript_EffectEarthquake + .4byte BattleScript_EffectFutureSight + .4byte BattleScript_EffectGust + .4byte BattleScript_EffectStomp + .4byte BattleScript_EffectSolarbeam + .4byte BattleScript_EffectThunder + .4byte BattleScript_EffectTeleport + .4byte BattleScript_EffectBeatUp + .4byte BattleScript_EffectSemiInvulnerable + .4byte BattleScript_EffectDefenseCurl + .4byte BattleScript_EffectSoftboiled + .4byte BattleScript_EffectFakeOut + .4byte BattleScript_EffectUproar + .4byte BattleScript_EffectStockpile + .4byte BattleScript_EffectSpitUp + .4byte BattleScript_EffectSwallow + .4byte BattleScript_EffectUnusedA3 + .4byte BattleScript_EffectHail + .4byte BattleScript_EffectTorment + .4byte BattleScript_EffectFlatter + .4byte BattleScript_EffectWillOWisp + .4byte BattleScript_EffectMemento + .4byte BattleScript_EffectFacade + .4byte BattleScript_EffectFocusPunch + .4byte BattleScript_EffectSmellingsalt + .4byte BattleScript_EffectFollowMe + .4byte BattleScript_EffectNaturePower + .4byte BattleScript_EffectCharge + .4byte BattleScript_EffectTaunt + .4byte BattleScript_EffectHelpingHand + .4byte BattleScript_EffectTrick + .4byte BattleScript_EffectRolePlay + .4byte BattleScript_EffectWish + .4byte BattleScript_EffectAssist + .4byte BattleScript_EffectIngrain + .4byte BattleScript_EffectSuperpower + .4byte BattleScript_EffectMagicCoat + .4byte BattleScript_EffectRecycle + .4byte BattleScript_EffectRevenge + .4byte BattleScript_EffectBrickBreak + .4byte BattleScript_EffectYawn + .4byte BattleScript_EffectKnockOff + .4byte BattleScript_EffectEndeavor + .4byte BattleScript_EffectEruption + .4byte BattleScript_EffectSkillSwap + .4byte BattleScript_EffectImprison + .4byte BattleScript_EffectRefresh + .4byte BattleScript_EffectGrudge + .4byte BattleScript_EffectSnatch + .4byte BattleScript_EffectLowKick + .4byte BattleScript_EffectSecretPower + .4byte BattleScript_EffectDoubleEdge + .4byte BattleScript_EffectTeeterDance + .4byte BattleScript_EffectBlazeKick + .4byte BattleScript_EffectMudSport + .4byte BattleScript_EffectPoisonFang + .4byte BattleScript_EffectWeatherBall + .4byte BattleScript_EffectOverheat + .4byte BattleScript_EffectTickle + .4byte BattleScript_EffectCosmicPower + .4byte BattleScript_EffectSkyUppercut + .4byte BattleScript_EffectBulkUp + .4byte BattleScript_EffectPoisonTail + .4byte BattleScript_EffectWaterSport + .4byte BattleScript_EffectCalmMind + .4byte BattleScript_EffectDragonDance + .4byte BattleScript_EffectCamouflage + +BattleScript_EffectHit: @ 81D6F14 +BattleScript_EffectAccuracyDown2: @ 81D6F14 +BattleScript_EffectAccuracyUp2: @ 81D6F14 +BattleScript_EffectAccuracyUp: @ 81D6F14 +BattleScript_EffectAlwaysHit: @ 81D6F14 +BattleScript_EffectEvasionDown2: @ 81D6F14 +BattleScript_EffectEvasionDownHit: @ 81D6F14 +BattleScript_EffectEvasionUp2: @ 81D6F14 +BattleScript_EffectFalseSwipe: @ 81D6F14 +BattleScript_EffectHighCritical: @ 81D6F14 +BattleScript_EffectHit: @ 81D6F14 +BattleScript_EffectPursuit: @ 81D6F14 +BattleScript_EffectQuickAttack: @ 81D6F14 +BattleScript_EffectSpecialAttackDown2: @ 81D6F14 +BattleScript_EffectSpecialAttackDown: @ 81D6F14 +BattleScript_EffectSpecialDefenseDown: @ 81D6F14 +BattleScript_EffectSpecialDefenseUp: @ 81D6F14 +BattleScript_EffectSpeedUp: @ 81D6F14 +BattleScript_EffectUnused60: @ 81D6F14 +BattleScript_EffectUnused6E: @ 81D6F14 +BattleScript_EffectUnused83: @ 81D6F14 +BattleScript_EffectUnused8D: @ 81D6F14 +BattleScript_EffectUnusedA3: @ 81D6F14 +BattleScript_EffectVitalThrow: @ 81D6F14 + jumpifnotmove MOVE_SURF, BattleScript_HitFromAtkCanceler + jumpifnostatus3 TARGET, STATUS3_UNDERWATER, BattleScript_HitFromAtkCanceler + orword gHitMarker, HITMARKER_IGNORE_UNDERWATER + setbyte sDMG_MULTIPLIER, 2 + +BattleScript_HitFromAtkCanceler: @ 81D6F3A + attackcanceler + +BattleScript_HitFromAccCheck: @ 81D6F3B + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE + +BattleScript_HitFromAtkString: @ 81D6F42 + attackstring + ppreduce + +BattleScript_HitFromCritCalc:: @ 81D6F44 critcalc - atk5 - atk6 - atk7 + damagecalc + typecalc + adjustnormaldamage -BattleScript_1D6F48: @ 81D6F48 +BattleScript_HitFromAtkAnimation: @ 81D6F48 attackanimation waitanimation - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET critmessage waitmessage 64 resultmessage waitmessage 64 - seteffectwithchancetarget - faintpokemon TARGET, 0, 0x0 + seteffectwithchance + tryfaintmon TARGET, FALSE, NULL -BattleScript_EndTurn:: @ 81D6F62 - setbyte gSharedMem + 0x1600C, 0 - atk49 0, 0 +BattleScript_MoveEnd:: @ 81D6F62 + setbyte sMOVEEND_STATE, 0 + moveend 0, 0 end -BattleScript_1D6F6C: @ 81D6F6C - orbyte gBattleMoveFlags, 1 +BattleScript_MakeMoveMissed: @ 81D6F6C + orbyte gBattleMoveFlags, MOVESTATUS_MISSED -BattleScript_1D6F72: @ 81D6F72 +BattleScript_PrintMoveMissed: @ 81D6F72 attackstring ppreduce -BattleScript_1D6F74:: @ 81D6F74 +BattleScript_MoveMissedPause:: @ 81D6F74 pause 32 -BattleScript_1D6F77: @ 81D6F77 - missmessage +BattleScript_MoveMissed: @ 81D6F77 + effectivenesssound resultmessage waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Sleep: @ 81D6F81 +BattleScript_EffectSleep: @ 81D6F81 attackcanceler attackstring ppreduce - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - jumpifstatus TARGET, SLP, BattleScript_1D6FC4 - jumpifcannotsleep BattleScript_1D6FE0 + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus TARGET, SLP, BattleScript_AlreadyAsleep + jumpifcantmakeasleep BattleScript_CantMakeAsleep jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_ButItFailed - accuracycheck BattleScript_ButItFailed, 0 - jumpifhalverset TARGET, 32, BattleScript_1D9037 + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected attackanimation waitanimation - setbyte gUnknown_02024D1F + 0x2, 1 - seteffecttarget - jump BattleScript_EndTurn + setmoveeffect EFFECT_SLEEP + seteffectprimary + goto BattleScript_MoveEnd -BattleScript_1D6FC4: @ 81D6FC4 +BattleScript_AlreadyAsleep: @ 81D6FC4 pause 32 printstring BATTLE_TEXT_DefendingAsleep waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D6FD2: @ 81D6FD2 +BattleScript_WasntAffected: @ 81D6FD2 pause 32 printstring BATTLE_TEXT_WasntAffected waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D6FE0: @ 81D6FE0 +BattleScript_CantMakeAsleep: @ 81D6FE0 pause 32 - printfromtable BattleTextList_40156A + printfromtable gUproarAwakeStringIds waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_PoisonHit: @ 81D6FF0 -MoveEffect_PoisonTail: @ 81D6FF0 - setbyte gUnknown_02024D1F + 0x2, 2 - jump BattleScript_1D6F14 +BattleScript_EffectPoisonHit: @ 81D6FF0 +BattleScript_EffectPoisonTail: @ 81D6FF0 + setmoveeffect EFFECT_POISON + goto BattleScript_EffectHit -MoveEffect_Absorb: @ 81D6FFB +BattleScript_EffectAbsorb: @ 81D6FFB attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce critcalc - atk5 - atk6 - atk7 + damagecalc + typecalc + adjustnormaldamage attackanimation waitanimation - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET critmessage waitmessage 64 resultmessage waitmessage 64 negativedamage - orword gHitMarker, 0x100 - jumpifability TARGET, ABILITY_LIQUID_OOZE, BattleScript_1D7037 - setbyte gUnknown_02024D1F + 0x4, 0 - jump BattleScript_1D703F + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE + jumpifability TARGET, ABILITY_LIQUID_OOZE, BattleScript_AbsorbLiquidOoze + setbyte cMULTISTRING_CHOOSER, 0 + goto BattleScript_AbsorbUpdateHp -BattleScript_1D7037: @ 81D7037 +BattleScript_AbsorbLiquidOoze: @ 81D7037 manipulatedamage 0 - setbyte gUnknown_02024D1F + 0x4, 1 + setbyte cMULTISTRING_CHOOSER, 1 -BattleScript_1D703F: @ 81D703F - graphicalhpupdate USER +BattleScript_AbsorbUpdateHp: @ 81D703F + healthbarupdate USER datahpupdate USER - jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7056 - printfromtable BattleTextList_4015D0 + jumpifmovehadnoeffect BattleScript_AbsorbTryFainting + printfromtable gLeechSeedDrainStringIds waitmessage 64 -BattleScript_1D7056: @ 81D7056 - faintpokemon USER, 0, 0x0 - faintpokemon TARGET, 0, 0x0 - jump BattleScript_EndTurn +BattleScript_AbsorbTryFainting: @ 81D7056 + tryfaintmon USER, FALSE, NULL + tryfaintmon TARGET, FALSE, NULL + goto BattleScript_MoveEnd -MoveEffect_BlazeKick: @ 81D7069 -MoveEffect_BurnHit: @ 81D7069 - setbyte gUnknown_02024D1F + 0x2, 3 - jump BattleScript_1D6F14 +BattleScript_EffectBlazeKick: @ 81D7069 +BattleScript_EffectBurnHit: @ 81D7069 + setmoveeffect EFFECT_BURN + goto BattleScript_EffectHit -MoveEffect_FreezeHit: @ 81D7074 - setbyte gUnknown_02024D1F + 0x2, 4 - jump BattleScript_1D6F14 +BattleScript_EffectFreezeHit: @ 81D7074 + setmoveeffect EFFECT_FREEZE + goto BattleScript_EffectHit -MoveEffect_ParalyzeHit: @ 81D707F - setbyte gUnknown_02024D1F + 0x2, 5 - jump BattleScript_1D6F14 +BattleScript_EffectParalyzeHit: @ 81D707F + setmoveeffect EFFECT_PARALYSIS + goto BattleScript_EffectHit -MoveEffect_Explosion: @ 81D708A +BattleScript_EffectExplosion: @ 81D708A attackcanceler attackstring ppreduce faintifabilitynotdamp - setuserhptozero - waitstateatk - jumpifbyte 5, gBattleMoveFlags, 1, BattleScript_1D70A5 - callatk BattleScript_1D70FB - jump BattleScript_1D70A7 + setatkhptozero + waitstate + jumpifbyte NO_COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED, BattleScript_1D70A5 + call BattleScript_1D70FB + goto BattleScript_1D70A7 BattleScript_1D70A5: @ 81D70A5 attackanimation waitanimation BattleScript_1D70A7: @ 81D70A7 - atk25 + movevaluescleanup critcalc - atk5 - atk6 - atk7 - accuracycheck BattleScript_1D70E0, 0 - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET + damagecalc + typecalc + adjustnormaldamage + accuracycheck BattleScript_1D70E0, ACC_CURR_MOVE + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET critmessage waitmessage 64 resultmessage waitmessage 64 - faintpokemon TARGET, 0, 0x0 - setbyte gSharedMem + 0x1600C, 0 - atk49 2, 16 - jumpwhiletargetvalid BattleScript_1D70A7 - faintpokemon USER, 0, 0x0 + tryfaintmon TARGET, FALSE, NULL + setbyte sMOVEEND_STATE, 0 + moveend 2, 16 + jumpifnexttargetvalid BattleScript_1D70A7 + tryfaintmon USER, FALSE, NULL end BattleScript_1D70E0: @ 81D70E0 - missmessage + effectivenesssound resultmessage waitmessage 64 - setbyte gSharedMem + 0x1600C, 0 - atk49 2, 16 - jumpwhiletargetvalid BattleScript_1D70A7 - faintpokemon USER, 0, 0x0 + setbyte sMOVEEND_STATE, 0 + moveend 2, 16 + jumpifnexttargetvalid BattleScript_1D70A7 + tryfaintmon USER, FALSE, NULL end BattleScript_1D70FB: @ 81D70FB - bicbyte gBattleMoveFlags, 1 + bicbyte gBattleMoveFlags, MOVESTATUS_MISSED attackanimation waitanimation - orbyte gBattleMoveFlags, 1 + orbyte gBattleMoveFlags, MOVESTATUS_MISSED return -MoveEffect_DreamEater: @ 81D710A +BattleScript_EffectDreamEater: @ 81D710A attackcanceler - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D711F + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_1D711F jumpifstatus TARGET, SLP, BattleScript_1D7129 BattleScript_1D711F: @ 81D711F attackstring ppreduce waitmessage 64 - jump BattleScript_1D6FD2 + goto BattleScript_WasntAffected BattleScript_1D7129: @ 81D7129 - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce critcalc - atk5 - atk6 - atk7 + damagecalc + typecalc + adjustnormaldamage attackanimation waitanimation - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET critmessage waitmessage 64 resultmessage waitmessage 64 negativedamage - orword gHitMarker, 0x100 - graphicalhpupdate USER + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE + healthbarupdate USER datahpupdate USER - jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7167 + jumpifmovehadnoeffect BattleScript_DreamEaterTryFaintEnd printstring BATTLE_TEXT_DreamEaten waitmessage 64 -BattleScript_1D7167: @ 81D7167 - faintpokemon TARGET, 0, 0x0 - jump BattleScript_EndTurn +BattleScript_DreamEaterTryFaintEnd: @ 81D7167 + tryfaintmon TARGET, FALSE, NULL + goto BattleScript_MoveEnd -MoveEffect_MirrorMove: @ 81D7173 +BattleScript_EffectMirrorMove: @ 81D7173 attackcanceler attackstring pause 64 - jumptolastusedattack + trymirrormove ppreduce - orbyte gBattleMoveFlags, 32 + orbyte gBattleMoveFlags, MOVESTATUS_FAILED printstring BATTLE_TEXT_MirrorFail waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_AttackUp: @ 81D718B - setbyte gSharedMem + 0x1601E, 17 - jump BattleScript_1D71B2 +BattleScript_EffectAttackUp: @ 81D718B + setstatchanger ATTACK, 1, FALSE + goto BattleScript_EffectStatUp -MoveEffect_DefenseUp: @ 81D7196 - setbyte gSharedMem + 0x1601E, 18 - jump BattleScript_1D71B2 +BattleScript_EffectDefenseUp: @ 81D7196 + setstatchanger DEFENSE, 1, FALSE + goto BattleScript_EffectStatUp -MoveEffect_SpecialAttackUp: @ 81D71A1 - setbyte gSharedMem + 0x1601E, 20 - jump BattleScript_1D71B2 +BattleScript_EffectSpecialAttackUp: @ 81D71A1 + setstatchanger SP_ATTACK, 1, FALSE + goto BattleScript_EffectStatUp -MoveEffect_EvasionUp: @ 81D71AC - setbyte gSharedMem + 0x1601E, 23 +BattleScript_EffectEvasionUp: @ 81D71AC + setstatchanger EVASION, 1, FALSE -BattleScript_1D71B2: @ 81D71B2 +BattleScript_EffectStatUp: @ 81D71B2 attackcanceler -BattleScript_1D71B3: @ 81D71B3 +BattleScript_EffectStatUpAfterAtkCanceler: @ 81D71B3 attackstring ppreduce - statbuffchange 65, BattleScript_1D71E0 - jumpifbyte 1, gUnknown_02024D1F + 0x4, 2, BattleScript_1D71CE + statbuffchange AFFECTS_USER | 0x1, BattleScript_StatUpEnd + jumpifbyte NOT_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_StatUpAttackAnim pause 32 - jump BattleScript_1D71D8 + goto BattleScript_StatUpPrintString -BattleScript_1D71CE: @ 81D71CE +BattleScript_StatUpAttackAnim: @ 81D71CE attackanimation waitanimation -BattleScript_1D71D0: @ 81D71D0 - atk47 - playanimation USER, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 +BattleScript_StatUpDoAnim: @ 81D71D0 + setgraphicalstatchangevalues + playanimation USER, B_ANIM_STATS_CHANGE, sANIM_ARG1 -BattleScript_1D71D8: @ 81D71D8 - printfromtable BattleTextList_401570 +BattleScript_StatUpPrintString: @ 81D71D8 + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D71E0: @ 81D71E0 - jump BattleScript_EndTurn +BattleScript_StatUpEnd: @ 81D71E0 + goto BattleScript_MoveEnd BattleScript_StatUp:: @ 81D71E5 - playanimation 2, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 - printfromtable BattleTextList_401570 + playanimation 2, B_ANIM_STATS_CHANGE, sANIM_ARG1 + printfromtable gStatUpStringIds waitmessage 64 return -MoveEffect_AttackDown: @ 81D71F5 - setbyte gSharedMem + 0x1601E, 145 - jump BattleScript_1D7227 +BattleScript_EffectAttackDown: @ 81D71F5 + setstatchanger ATTACK, 1, TRUE + goto BattleScript_EffectStatDown -MoveEffect_DefenseDown: @ 81D7200 - setbyte gSharedMem + 0x1601E, 146 - jump BattleScript_1D7227 +BattleScript_EffectDefenseDown: @ 81D7200 + setstatchanger DEFENSE, 1, TRUE + goto BattleScript_EffectStatDown -MoveEffect_SpeedDown: @ 81D720B - setbyte gSharedMem + 0x1601E, 147 - jump BattleScript_1D7227 +BattleScript_EffectSpeedDown: @ 81D720B + setstatchanger SPEED, 1, TRUE + goto BattleScript_EffectStatDown -MoveEffect_AccuracyDown: @ 81D7216 - setbyte gSharedMem + 0x1601E, 150 - jump BattleScript_1D7227 +BattleScript_EffectAccuracyDown: @ 81D7216 + setstatchanger ACCURACY, 1, TRUE + goto BattleScript_EffectStatDown -MoveEffect_EvasionDown: @ 81D7221 - setbyte gSharedMem + 0x1601E, 151 +BattleScript_EffectEvasionDown: @ 81D7221 + setstatchanger EVASION, 1, TRUE -BattleScript_1D7227: @ 81D7227 +BattleScript_EffectStatDown: @ 81D7227 attackcanceler - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D4 - accuracycheck BattleScript_1D6F72, 0 + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailedAtkStringPpReduce + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce - statbuffchange 1, BattleScript_1D7271 - jumpifbyte 3, gUnknown_02024D1F + 0x4, 2, BattleScript_1D725F - jumpifbyte 0, gUnknown_02024D1F + 0x4, 3, BattleScript_1D7271 + statbuffchange 1, BattleScript_StatDownEnd + jumpifbyte LESS_THAN, cMULTISTRING_CHOOSER, 2, BattleScript_StatDownDoAnim + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 3, BattleScript_StatDownEnd pause 32 - jump BattleScript_1D7269 + goto BattleScript_StatDownPrintString -BattleScript_1D725F: @ 81D725F +BattleScript_StatDownDoAnim: @ 81D725F attackanimation waitanimation - atk47 - playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 + setgraphicalstatchangevalues + playanimation TARGET, B_ANIM_STATS_CHANGE, sANIM_ARG1 -BattleScript_1D7269: @ 81D7269 - printfromtable BattleTextList_40157C +BattleScript_StatDownPrintString: @ 81D7269 + printfromtable gStatDownStringIds waitmessage 64 -BattleScript_1D7271: @ 81D7271 - jump BattleScript_EndTurn +BattleScript_StatDownEnd: @ 81D7271 + goto BattleScript_MoveEnd BattleScript_StatDown:: @ 81D7276 - playanimation 2, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 - printfromtable BattleTextList_40157C + playanimation 2, B_ANIM_STATS_CHANGE, sANIM_ARG1 + printfromtable gStatDownStringIds waitmessage 64 return -MoveEffect_Haze: @ 81D7286 +BattleScript_EffectHaze: @ 81D7286 attackcanceler attackstring ppreduce @@ -610,728 +614,725 @@ MoveEffect_Haze: @ 81D7286 normalisebuffs printstring BATTLE_TEXT_StatElim waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Bide: @ 81D7297 +BattleScript_EffectBide: @ 81D7297 attackcanceler attackstring ppreduce attackanimation waitanimation - orword gHitMarker, 0x8000000 + orword gHitMarker, HITMARKER_x8000000 setbide - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Rampage: @ 81D72AB +BattleScript_EffectRampage: @ 81D72AB attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring - jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D72BF + jumpifstatus2 USER, STATUS2_MULTIPLETURNS, BattleScript_1D72BF ppreduce BattleScript_1D72BF: @ 81D72BF confuseifrepeatingattackends - jump BattleScript_1D6F44 + goto BattleScript_HitFromCritCalc -MoveEffect_Roar: @ 81D72C5 +BattleScript_EffectRoar: @ 81D72C5 attackcanceler attackstring ppreduce - jumpifability TARGET, ABILITY_SUCTION_CUPS, BattleScript_1D988D - jumpifspecialstatusflag TARGET, 0x400, 0, BattleScript_1D93EC - accuracycheck BattleScript_ButItFailed, 65535 - accuracycheck BattleScript_1D6F77, 0 + jumpifability TARGET, ABILITY_SUCTION_CUPS, BattleScript_AbilityPreventsPhasingOut + jumpifstatus3 TARGET, STATUS3_ROOTED, BattleScript_PrintMonIsRooted + accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON + accuracycheck BattleScript_MoveMissed, ACC_CURR_MOVE forcerandomswitch BattleScript_ButItFailed -MoveEffect_MultiHit: @ 81D72ED +BattleScript_EffectMultiHit: @ 81D72ED attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce - setloopcounter 0 - atk8e - setbyte gSharedMem + 0x16112, 0 + setmultihitcounter 0 + initmultihitstring + setbyte sMULTIHIT_EFFECT, 0 -BattleScript_1D7300: @ 81D7300 - jumpiffainted USER, BattleScript_1D7396 - jumpiffainted TARGET, BattleScript_1D7377 - jumpifhalfword 0, gUnknown_02024BE8, 214, BattleScript_1D7322 - jumpifstatus USER, SLP, BattleScript_1D7377 +BattleScript_MultiHitLoop: @ 81D7300 + jumpifhasnohp USER, BattleScript_MultiHitEnd + jumpifhasnohp TARGET, BattleScript_MultiHitPrintStrings + jumpifhalfword EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoMultiHit + jumpifstatus USER, SLP, BattleScript_MultiHitPrintStrings -BattleScript_1D7322: @ 81D7322 - atk25 - copyarray gUnknown_02024D1F + 0x2, gSharedMem + 0x16112, 1 +BattleScript_DoMultiHit: @ 81D7322 + movevaluescleanup + copybyte cEFFECT_CHOOSER, sMULTIHIT_EFFECT critcalc - atk5 - atk6 - jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7374 - atk7 + damagecalc + typecalc + jumpifmovehadnoeffect BattleScript_MultiHitNoMoreHits + adjustnormaldamage attackanimation waitanimation - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET critmessage waitmessage 64 printstring BATTLE_TEXT_Terminator2 waitmessage 1 - addbyte gSharedMem + 0x160E4, 1 - setbyte gSharedMem + 0x1600C, 0 - atk49 2, 16 - jumpifbyte 4, gBattleMoveFlags, 64, BattleScript_1D7377 - atk27 BattleScript_1D7300 - jump BattleScript_1D7377 - -BattleScript_1D7374: @ 81D7374 + addbyte sMULTIHIT_STRING + 4, 1 + setbyte sMOVEEND_STATE, 0 + moveend 2, 16 + jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_ENDURED, BattleScript_MultiHitPrintStrings + decrementmultihit BattleScript_MultiHitLoop + goto BattleScript_MultiHitPrintStrings + +BattleScript_MultiHitNoMoreHits: @ 81D7374 pause 32 -BattleScript_1D7377: @ 81D7377 +BattleScript_MultiHitPrintStrings: @ 81D7377 resultmessage waitmessage 64 - jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7396 - copyarray gBattleTextBuff1, gSharedMem + 0x160E0, 6 + jumpifmovehadnoeffect BattleScript_MultiHitEnd + copyarray gBattleTextBuff1, sMULTIHIT_STRING, 6 printstring BATTLE_TEXT_HitMulti waitmessage 64 -BattleScript_1D7396: @ 81D7396 - seteffectwithchancetarget - faintpokemon TARGET, 0, 0x0 - setbyte gSharedMem + 0x1600C, 2 - atk49 1, 0 - setbyte gSharedMem + 0x1600C, 4 - atk49 0, 0 +BattleScript_MultiHitEnd: @ 81D7396 + seteffectwithchance + tryfaintmon TARGET, FALSE, NULL + setbyte sMOVEEND_STATE, 2 + moveend 1, 0 + setbyte sMOVEEND_STATE, 4 + moveend 0, 0 end -MoveEffect_Conversion: @ 81D73B1 +BattleScript_EffectConversion: @ 81D73B1 attackcanceler attackstring ppreduce - changetypestoenemyattacktype BattleScript_ButItFailed + tryconversiontypechange BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_TypeTransform waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_FlinchHit: @ 81D73C6 - setbyte gUnknown_02024D1F + 0x2, 8 - jump BattleScript_1D6F14 +BattleScript_EffectFlinchHit: @ 81D73C6 + setmoveeffect EFFECT_FLINCH + goto BattleScript_EffectHit -MoveEffect_RestoreHp: @ 81D73D1 +BattleScript_EffectRestoreHp: @ 81D73D1 attackcanceler attackstring ppreduce - setdamageasrestorehalfmaxhp BattleScript_1D83B5, 1 + tryhealhalfhealth BattleScript_AlreadyAtFullHp, 1 attackanimation waitanimation - orword gHitMarker, 0x100 - graphicalhpupdate USER + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE + healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_RegainedHealth waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Toxic: @ 81D73F4 +BattleScript_EffectToxic: @ 81D73F4 attackcanceler attackstring ppreduce - jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_1D7463 - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - jumpifstatus TARGET, PSN, BattleScript_1D7455 - jumpifstatus TARGET, TOX, BattleScript_1D7455 + jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus TARGET, PSN, BattleScript_AlreadyPoisoned + jumpifstatus TARGET, TOX, BattleScript_AlreadyPoisoned jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_ButItFailed - jumpiftype TARGET, TYPE_POISON, BattleScript_1D83E8 - jumpiftype TARGET, TYPE_STEEL, BattleScript_1D83E8 - accuracycheck BattleScript_ButItFailed, 0 - jumpifhalverset TARGET, 32, BattleScript_1D9037 + jumpiftype TARGET, TYPE_POISON, BattleScript_NotAffected + jumpiftype TARGET, TYPE_STEEL, BattleScript_NotAffected + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected attackanimation waitanimation - setbyte gUnknown_02024D1F + 0x2, 6 - seteffecttarget + setmoveeffect EFFECT_TOXIC + seteffectprimary resultmessage waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D7455: @ 81D7455 +BattleScript_AlreadyPoisoned: @ 81D7455 pause 64 printstring BATTLE_TEXT_AlreadyPoisoned waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D7463: @ 81D7463 - copyarray gEffectBank, gBankTarget, 1 - setbyte gUnknown_02024D1F + 0x4, 0 - callatk BattleScript_PSNPrevention - jump BattleScript_EndTurn +BattleScript_ImmunityProtected: @ 81D7463 + copybyte gEffectBank, gBankTarget + setbyte cMULTISTRING_CHOOSER, 0 + call BattleScript_PSNPrevention + goto BattleScript_MoveEnd -MoveEffect_PayDay: @ 81D747D - setbyte gUnknown_02024D1F + 0x2, 11 - jump BattleScript_1D6F14 +BattleScript_EffectPayDay: @ 81D747D + setmoveeffect EFFECT_PAYDAY + goto BattleScript_EffectHit -MoveEffect_LightScreen: @ 81D7488 +BattleScript_EffectLightScreen: @ 81D7488 attackcanceler attackstring ppreduce setlightscreen - jump BattleScript_1D7786 + goto BattleScript_PrintReflectLightScreenSafeguardString -MoveEffect_TriAttack: @ 81D7491 - setbyte gUnknown_02024D1F + 0x2, 9 - jump BattleScript_1D6F14 +BattleScript_EffectTriAttack: @ 81D7491 + setmoveeffect EFFECT_TRI_ATTACK + goto BattleScript_EffectHit -MoveEffect_Rest: @ 81D749C +BattleScript_EffectRest: @ 81D749C attackcanceler attackstring ppreduce - jumpifstatus USER, SLP, BattleScript_1D74D6 - jumpifcannotsleep BattleScript_1D74C6 - setrest BattleScript_1D83B5 + jumpifstatus USER, SLP, BattleScript_RestIsAlreadyAsleep + jumpifcantmakeasleep BattleScript_RestCantSleep + trysetrest BattleScript_AlreadyAtFullHp pause 32 - printfromtable BattleTextList_401556 + printfromtable gRestUsedStringIds waitmessage 64 - atk98 1 - waitstateatk - jump BattleScript_1D839B + updatestatusicon USER + waitstate + goto BattleScript_PresentHealTarget -BattleScript_1D74C6: @ 81D74C6 +BattleScript_RestCantSleep: @ 81D74C6 pause 64 - printfromtable BattleTextList_40156A + printfromtable gUproarAwakeStringIds waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D74D6: @ 81D74D6 +BattleScript_RestIsAlreadyAsleep: @ 81D74D6 pause 32 printstring BATTLE_TEXT_AttackingAsleep waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Ohko: @ 81D74E4 +BattleScript_EffectOHKO: @ 81D74E4 attackcanceler attackstring ppreduce - accuracycheck BattleScript_ButItFailed, 65535 - atk6 - jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D6F48 - koplussomethings BattleScript_1D7505 - atkab - jump BattleScript_1D6F48 + accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON + typecalc + jumpifmovehadnoeffect BattleScript_HitFromAtkAnimation + tryKO BattleScript_KOFail + trysetdestinybondtohappen + goto BattleScript_HitFromAtkAnimation -BattleScript_1D7505: @ 81D7505 +BattleScript_KOFail: @ 81D7505 pause 64 - printfromtable BattleTextList_4015C8 + printfromtable gKOFailedStringIds waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_RazorWind: @ 81D7515 - jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D - jumpifword 4, gHitMarker, 0x200, BattleScript_1D753D - setbyte gSharedMem + 0x16055, 0 - callatk BattleScript_1D756C - jump BattleScript_EndTurn +BattleScript_EffectRazorWind: @ 81D7515 + jumpifstatus2 USER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn + jumpifword COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn + setbyte sTWOTURN_STRINGID, 0 + call BattleScriptFirstChargingTurn + goto BattleScript_MoveEnd -BattleScript_1D753D: @ 81D753D +BattleScript_TwoTurnMovesSecondTurn: @ 81D753D attackcanceler - setbyte gUnknown_02024D1F + 0x2, 12 - setbyte gSharedMem + 0x16002, 1 - clearstatus USER - orword gHitMarker, 0x800 - jumpifhalfword 1, gCurrentMove, 143, BattleScript_1D6F3B - setbyte gUnknown_02024D1F + 0x2, 8 - jump BattleScript_1D6F3B + setmoveeffect EFFECT_CHARGING + setbyte sANIM_TURN, 1 + clearstatusfromeffect USER + orword gHitMarker, HITMARKER_NO_PPDEDUCT + jumpifnotmove MOVE_SKY_ATTACK, BattleScript_HitFromAccCheck + setmoveeffect EFFECT_FLINCH + goto BattleScript_HitFromAccCheck -BattleScript_1D756C: @ 81D756C +BattleScriptFirstChargingTurn: @ 81D756C attackcanceler printstring BATTLE_TEXT_Terminator2 ppreduce attackanimation waitanimation - orword gHitMarker, 0x8000000 - setbyte gUnknown_02024D1F + 0x2, 76 - seteffecttarget - copyarray gUnknown_02024D1F + 0x4, gSharedMem + 0x16055, 1 - printfromtable BattleTextList_401584 + orword gHitMarker, HITMARKER_x8000000 + setbyte cEFFECT_CHOOSER, 76 + seteffectprimary + copybyte cMULTISTRING_CHOOSER, sTWOTURN_STRINGID + printfromtable gFirstTurnOfTwoStringIds waitmessage 64 return -MoveEffect_SuperFang: @ 81D7596 +BattleScript_EffectSuperFang: @ 81D7596 attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce - atk6 - bicbyte gBattleMoveFlags, 6 - gethalfcurrentenemyhp - jump BattleScript_1D6F48 + typecalc + bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE + damagetohalftargethp + goto BattleScript_HitFromAtkAnimation -MoveEffect_DragonRage: @ 81D75AD +BattleScript_EffectDragonRage: @ 81D75AD attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce - atk6 - bicbyte gBattleMoveFlags, 6 - setbyte gBattleMoveDamage, 40 - setbyte gBattleMoveDamage + 0x1, 0 - setbyte gBattleMoveDamage + 0x2, 0 - setbyte gBattleMoveDamage + 0x3, 0 - atk69 - jump BattleScript_1D6F48 + typecalc + bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE + setword gBattleMoveDamage, 40 + adjustsetdamage + goto BattleScript_HitFromAtkAnimation -MoveEffect_Trap: @ 81D75DC - jumpifhalfword 1, gCurrentMove, 250, BattleScript_1D7602 - jumpifspecialstatusflag TARGET, 0x40000, 1, BattleScript_1D7602 - orword gHitMarker, 0x40000 - setbyte gSharedMem + 0x1601F, 2 +BattleScript_EffectTrap: @ 81D75DC + jumpifnotmove MOVE_WHIRLPOOL, BattleScript_DoWrapEffect + jumpifnostatus3 TARGET, STATUS3_UNDERWATER, BattleScript_DoWrapEffect + orword gHitMarker, HITMARKER_IGNORE_UNDERWATER + setbyte sDMG_MULTIPLIER, 2 -BattleScript_1D7602: @ 81D7602 - setbyte gUnknown_02024D1F + 0x2, 13 - jump BattleScript_1D6F14 +BattleScript_DoWrapEffect: @ 81D7602 + setmoveeffect EFFECT_WRAP + goto BattleScript_EffectHit -MoveEffect_DoubleHit: @ 81D760D +BattleScript_EffectDoubleHit: @ 81D760D attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce - setloopcounter 2 - atk8e - setbyte gSharedMem + 0x16112, 0 - jump BattleScript_1D7300 + setmultihitcounter 2 + initmultihitstring + setbyte sMULTIHIT_EFFECT, 0 + goto BattleScript_MultiHitLoop -MoveEffect_RecoilIfMiss: @ 81D7625 +BattleScript_EffectRecoilIfMiss: @ 81D7625 attackcanceler - accuracycheck BattleScript_1D7632, 0 - jump BattleScript_1D6F42 + accuracycheck BattleScript_MoveMissedDoDamage, ACC_CURR_MOVE + goto BattleScript_HitFromAtkString -BattleScript_1D7632: @ 81D7632 +BattleScript_MoveMissedDoDamage: @ 81D7632 attackstring ppreduce pause 64 resultmessage waitmessage 64 - jumpifbyte 4, gBattleMoveFlags, 8, BattleScript_EndTurn + jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_NOTAFFECTED, BattleScript_MoveEnd printstring BATTLE_TEXT_KeptGoingCrash waitmessage 64 - atk5 - atk6 - atk7 + damagecalc + typecalc + adjustnormaldamage manipulatedamage 1 - bicbyte gBattleMoveFlags, 1 - orword gHitMarker, 0x100 - graphicalhpupdate USER + bicbyte gBattleMoveFlags, MOVESTATUS_MISSED + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE + healthbarupdate USER datahpupdate USER - faintpokemon USER, 0, 0x0 - orbyte gBattleMoveFlags, 1 - jump BattleScript_EndTurn + tryfaintmon USER, FALSE, NULL + orbyte gBattleMoveFlags, MOVESTATUS_MISSED + goto BattleScript_MoveEnd -MoveEffect_Mist: @ 81D7676 +BattleScript_EffectMist: @ 81D7676 attackcanceler attackstring ppreduce - setmisteffect + setmist attackanimation waitanimation - printfromtable BattleTextList_4015A0 + printfromtable gMistUsedStringIds waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_FocusEnergy: @ 81D7689 +BattleScript_EffectFocusEnergy: @ 81D7689 attackcanceler attackstring ppreduce - jumpifsecondarytstatus USER, S_FOCUS_ENERGY, BattleScript_ButItFailed - setincreasedcriticalchance + jumpifstatus2 USER, STATUS2_FOCUS_ENERGY, BattleScript_ButItFailed + setfocusenergy attackanimation waitanimation - printfromtable BattleTextList_4015A4 + printfromtable gFocusEnergyUsedStringIds waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Recoil: @ 81D76A6 - setbyte gUnknown_02024D1F + 0x2, 206 - jumpifhalfword 1, gCurrentMove, 165, BattleScript_1D6F14 - atk60 27 - jump BattleScript_1D6F14 +BattleScript_EffectRecoil: @ 81D76A6 + setmoveeffect EFFECT_RECOIL_25 | AFFECTS_USER | CERTAIN + jumpifnotmove MOVE_STRUGGLE, BattleScript_EffectHit + incrementgamestat 27 + goto BattleScript_EffectHit -MoveEffect_Confuse: @ 81D76BF +BattleScript_EffectConfuse: @ 81D76BF attackcanceler attackstring ppreduce - jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D98E5 - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - jumpifsecondarytstatus TARGET, S_CONFUSED, BattleScript_1D76FE - accuracycheck BattleScript_ButItFailed, 0 - jumpifhalverset TARGET, 32, BattleScript_1D9037 + jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus2 TARGET, STATUS2_CONFUSION, BattleScript_AlreadyConfused + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected attackanimation waitanimation - setbyte gUnknown_02024D1F + 0x2, 7 - seteffecttarget + setmoveeffect EFFECT_CONFUSION + seteffectprimary resultmessage waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D76FE: @ 81D76FE +BattleScript_AlreadyConfused: @ 81D76FE pause 32 printstring BATTLE_TEXT_AlreadyConfused waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_AttackUp2: @ 81D770C - setbyte gSharedMem + 0x1601E, 33 - jump BattleScript_1D71B2 +BattleScript_EffectAttackUp2: @ 81D770C + setstatchanger ATTACK, 2, FALSE + goto BattleScript_EffectStatUp -MoveEffect_DefenseUp2: @ 81D7717 - setbyte gSharedMem + 0x1601E, 34 - jump BattleScript_1D71B2 +BattleScript_EffectDefenseUp2: @ 81D7717 + setstatchanger DEFENSE, 2, FALSE + goto BattleScript_EffectStatUp -MoveEffect_SpeedUp2: @ 81D7722 - setbyte gSharedMem + 0x1601E, 35 - jump BattleScript_1D71B2 +BattleScript_EffectSpeedUp2: @ 81D7722 + setstatchanger SPEED, 2, FALSE + goto BattleScript_EffectStatUp -MoveEffect_SpecialAttackUp2: @ 81D772D - setbyte gSharedMem + 0x1601E, 36 - jump BattleScript_1D71B2 +BattleScript_EffectSpecialAttackUp2: @ 81D772D + setstatchanger SP_ATTACK, 2, FALSE + goto BattleScript_EffectStatUp -MoveEffect_SpecialDefenseUp2: @ 81D7738 - setbyte gSharedMem + 0x1601E, 37 - jump BattleScript_1D71B2 +BattleScript_EffectSpecialDefenseUp2: @ 81D7738 + setstatchanger SP_DEFENSE, 2, FALSE + goto BattleScript_EffectStatUp -MoveEffect_Transform: @ 81D7743 +BattleScript_EffectTransform: @ 81D7743 attackcanceler attackstring ppreduce transformdataexecution attackanimation waitanimation - printfromtable BattleTextList_4015A8 + printfromtable gTransformUsedStringIds waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_AttackDown2: @ 81D7756 - setbyte gSharedMem + 0x1601E, 161 - jump BattleScript_1D7227 +BattleScript_EffectAttackDown2: @ 81D7756 + setstatchanger ATTACK, 2, TRUE + goto BattleScript_EffectStatDown -MoveEffect_DefenseDown2: @ 81D7761 - setbyte gSharedMem + 0x1601E, 162 - jump BattleScript_1D7227 +BattleScript_EffectDefenseDown2: @ 81D7761 + setstatchanger DEFENSE, 2, TRUE + goto BattleScript_EffectStatDown -MoveEffect_SpeedDown2: @ 81D776C - setbyte gSharedMem + 0x1601E, 163 - jump BattleScript_1D7227 +BattleScript_EffectSpeedDown2: @ 81D776C + setstatchanger SPEED, 2, TRUE + goto BattleScript_EffectStatDown -MoveEffect_SpecialDefenseDown2: @ 81D7777 - setbyte gSharedMem + 0x1601E, 165 - jump BattleScript_1D7227 +BattleScript_EffectSpecialDefenseDown2: @ 81D7777 + setstatchanger SP_DEFENSE, 2, TRUE + goto BattleScript_EffectStatDown -MoveEffect_Reflect: @ 81D7782 +BattleScript_EffectReflect: @ 81D7782 attackcanceler attackstring ppreduce setreflect -BattleScript_1D7786: @ 81D7786 +BattleScript_PrintReflectLightScreenSafeguardString: @ 81D7786 attackanimation waitanimation - printfromtable BattleTextList_401540 + printfromtable gReflectLightScreenSafeguardStringIds waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Poison: @ 81D7795 +BattleScript_EffectPoison: @ 81D7795 attackcanceler attackstring ppreduce - jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_1D7463 - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - jumpifstatus TARGET, PSN, BattleScript_1D7455 - jumpifstatus TARGET, TOX, BattleScript_1D7455 - jumpiftype TARGET, TYPE_POISON, BattleScript_1D83E8 - jumpiftype TARGET, TYPE_STEEL, BattleScript_1D83E8 + jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus TARGET, PSN, BattleScript_AlreadyPoisoned + jumpifstatus TARGET, TOX, BattleScript_AlreadyPoisoned + jumpiftype TARGET, TYPE_POISON, BattleScript_NotAffected + jumpiftype TARGET, TYPE_STEEL, BattleScript_NotAffected jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_ButItFailed - accuracycheck BattleScript_ButItFailed, 0 - jumpifhalverset TARGET, 32, BattleScript_1D9037 + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected attackanimation waitanimation - setbyte gUnknown_02024D1F + 0x2, 2 - seteffecttarget + setmoveeffect EFFECT_POISON + seteffectprimary resultmessage waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Paralyze: @ 81D77F6 +BattleScript_EffectParalyze: @ 81D77F6 attackcanceler attackstring ppreduce - jumpifability TARGET, ABILITY_LIMBER, BattleScript_1D7859 - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - atk6 - jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_ButItFailed - jumpifstatus TARGET, PAR, BattleScript_1D784B + jumpifability TARGET, ABILITY_LIMBER, BattleScript_LimberProtected + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + typecalc + jumpifmovehadnoeffect BattleScript_ButItFailed + jumpifstatus TARGET, PAR, BattleScript_AlreadyParalyzed jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_ButItFailed - accuracycheck BattleScript_ButItFailed, 0 - jumpifhalverset TARGET, 32, BattleScript_1D9037 + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected attackanimation waitanimation - setbyte gUnknown_02024D1F + 0x2, 5 - seteffecttarget + setmoveeffect EFFECT_PARALYSIS + seteffectprimary resultmessage waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D784B: @ 81D784B +BattleScript_AlreadyParalyzed: @ 81D784B pause 32 printstring BATTLE_TEXT_AlreadyParalyzed waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D7859: @ 81D7859 - copyarray gEffectBank, gBankTarget, 1 - setbyte gUnknown_02024D1F + 0x4, 0 - callatk BattleScript_PRLZPrevention - jump BattleScript_EndTurn +BattleScript_LimberProtected: @ 81D7859 + copybyte gEffectBank, gBankTarget + setbyte cMULTISTRING_CHOOSER, 0 + call BattleScript_PRLZPrevention + goto BattleScript_MoveEnd -MoveEffect_AttackDownHit: @ 81D7873 - setbyte gUnknown_02024D1F + 0x2, 22 - jump BattleScript_1D6F14 +BattleScript_EffectAttackDownHit: @ 81D7873 + setmoveeffect EFFECT_ATK_MINUS_1 + goto BattleScript_EffectHit -MoveEffect_DefenseDownHit: @ 81D787E - setbyte gUnknown_02024D1F + 0x2, 23 - jump BattleScript_1D6F14 +BattleScript_EffectDefenseDownHit: @ 81D787E + setmoveeffect EFFECT_DEF_MINUS_1 + goto BattleScript_EffectHit -MoveEffect_SpeedDownHit: @ 81D7889 - setbyte gUnknown_02024D1F + 0x2, 24 - jump BattleScript_1D6F14 +BattleScript_EffectSpeedDownHit: @ 81D7889 + setmoveeffect EFFECT_SPD_MINUS_1 + goto BattleScript_EffectHit -MoveEffect_SpecialAttackDownHit: @ 81D7894 - setbyte gUnknown_02024D1F + 0x2, 25 - jump BattleScript_1D6F14 +BattleScript_EffectSpecialAttackDownHit: @ 81D7894 + setmoveeffect EFFECT_SP_ATK_MINUS_1 + goto BattleScript_EffectHit -MoveEffect_SpecialDefenseDownHit: @ 81D789F - setbyte gUnknown_02024D1F + 0x2, 26 - jump BattleScript_1D6F14 +BattleScript_EffectSpecialDefenseDownHit: @ 81D789F + setmoveeffect EFFECT_SP_DEF_MINUS_1 + goto BattleScript_EffectHit -MoveEffect_AccuracyDownHit: @ 81D78AA - setbyte gUnknown_02024D1F + 0x2, 27 - jump BattleScript_1D6F14 +BattleScript_EffectAccuracyDownHit: @ 81D78AA + setmoveeffect EFFECT_ACC_MINUS_1 + goto BattleScript_EffectHit -MoveEffect_SkyAttack: @ 81D78B5 - jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D - jumpifword 4, gHitMarker, 0x200, BattleScript_1D753D - setbyte gSharedMem + 0x16055, 3 - callatk BattleScript_1D756C - jump BattleScript_EndTurn +BattleScript_EffectSkyAttack: @ 81D78B5 + jumpifstatus2 USER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn + jumpifword COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn + setbyte sTWOTURN_STRINGID, 3 + call BattleScriptFirstChargingTurn + goto BattleScript_MoveEnd -MoveEffect_ConfuseHit: @ 81D78DD - setbyte gUnknown_02024D1F + 0x2, 7 - jump BattleScript_1D6F14 +BattleScript_EffectConfuseHit: @ 81D78DD + setmoveeffect EFFECT_CONFUSION + goto BattleScript_EffectHit -MoveEffect_Twineedle: @ 81D78E8 +BattleScript_EffectTwineedle: @ 81D78E8 attackcanceler - accuracycheck BattleScript_1D6F72, 0 - setbyte gSharedMem + 0x16112, 2 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE + setbyte sMULTIHIT_EFFECT, 2 attackstring ppreduce - setloopcounter 2 - atk8e - jump BattleScript_1D7300 + setmultihitcounter 2 + initmultihitstring + goto BattleScript_MultiHitLoop -MoveEffect_Substitute: @ 81D7900 +BattleScript_EffectSubstitute: @ 81D7900 attackcanceler ppreduce attackstring - waitstateatk - jumpifsecondarytstatus USER, S_SUBSTITUTE, BattleScript_1D7935 - setsubstituteeffect - jumpifbyte 1, gUnknown_02024D1F + 0x4, 1, BattleScript_1D7922 + waitstate + jumpifstatus2 USER, STATUS2_SUBSTITUTE, BattleScript_AlreadyHasSubstitute + setsubstitute + jumpifbyte NOT_EQUAL, cMULTISTRING_CHOOSER, 1, BattleScript_SubstituteAnim pause 32 - jump BattleScript_1D7928 + goto BattleScript_SubstituteString -BattleScript_1D7922: @ 81D7922 +BattleScript_SubstituteAnim: @ 81D7922 attackanimation waitanimation - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER -BattleScript_1D7928: @ 81D7928 - printfromtable BattleTextList_4015AC +BattleScript_SubstituteString: @ 81D7928 + printfromtable gSubsituteUsedStringIds waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D7935: @ 81D7935 +BattleScript_AlreadyHasSubstitute: @ 81D7935 pause 32 printstring BATTLE_TEXT_SubAlready waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Recharge: @ 81D7943 +BattleScript_EffectRecharge: @ 81D7943 attackcanceler - accuracycheck BattleScript_1D6F72, 0 - setbyte gUnknown_02024D1F + 0x2, 221 - jump BattleScript_1D6F42 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE + setmoveeffect EFFECT_RECHARGE | AFFECTS_USER | CERTAIN + goto BattleScript_HitFromAtkString BattleScript_MoveUsedMustRecharge:: @ 81D7956 printstring BATTLE_TEXT_MustRecharge waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Rage: @ 81D7961 +BattleScript_EffectRage: @ 81D7961 attackcanceler - accuracycheck BattleScript_1D797B, 0 - setbyte gUnknown_02024D1F + 0x2, 30 - seteffecttarget - setbyte gUnknown_02024D1F + 0x2, 0 - jump BattleScript_1D6F42 + accuracycheck BattleScript_RageMiss, ACC_CURR_MOVE + setmoveeffect EFFECT_RAGE + seteffectprimary + setmoveeffect 0 + goto BattleScript_HitFromAtkString -BattleScript_1D797B: @ 81D797B - setbyte gUnknown_02024D1F + 0x2, 30 - clearstatus USER - jump BattleScript_1D6F72 +BattleScript_RageMiss: @ 81D797B + setmoveeffect EFFECT_RAGE + clearstatusfromeffect USER + goto BattleScript_PrintMoveMissed -MoveEffect_Mimic: @ 81D7988 +BattleScript_EffectMimic: @ 81D7988 attackcanceler attackstring ppreduce - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - accuracycheck BattleScript_ButItFailed, 65535 - copyattack BattleScript_ButItFailed + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON + mimicattackcopy BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_LearnedMove2 waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Metronome: @ 81D79AE +BattleScript_EffectMetronome: @ 81D79AE attackcanceler attackstring pause 32 attackanimation waitanimation - setbyte gSharedMem + 0x16002, 0 - setbyte gSharedMem + 0x160A1, 0 - metronomeeffect + setbyte sANIM_TURN, 0 + setbyte sANIM_TARGETS_HIT, 0 + metronome -MoveEffect_LeechSeed: @ 81D79C2 +BattleScript_EffectLeechSeed: @ 81D79C2 attackcanceler attackstring pause 32 ppreduce - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - accuracycheck BattleScript_1D79D9, 0 + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + accuracycheck BattleScript_DoLeechSeed, ACC_CURR_MOVE -BattleScript_1D79D9: @ 81D79D9 - setleechseed +BattleScript_DoLeechSeed: @ 81D79D9 + setseeded attackanimation waitanimation - printfromtable BattleTextList_40154C + printfromtable gLeechSeedStringIds waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Splash: @ 81D79E9 +BattleScript_EffectSplash: @ 81D79E9 attackcanceler attackstring ppreduce attackanimation waitanimation - atk60 26 + incrementgamestat 26 printstring BATTLE_TEXT_Nothing waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Disable: @ 81D79FB +BattleScript_EffectDisable: @ 81D79FB attackcanceler attackstring ppreduce - accuracycheck BattleScript_ButItFailed, 0 + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE disablelastusedattack BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_MoveWasDisabled waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_LevelDamage: @ 81D7A17 +BattleScript_EffectLevelDamage: @ 81D7A17 attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce - atk6 - bicbyte gBattleMoveFlags, 6 - nightshadedamageeffect - atk69 - jump BattleScript_1D6F48 + typecalc + bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE + dmgtolevel + adjustsetdamage + goto BattleScript_HitFromAtkAnimation -MoveEffect_Psywave: @ 81D7A2F +BattleScript_EffectPsywave: @ 81D7A2F attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce - atk6 - bicbyte gBattleMoveFlags, 6 + typecalc + bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE psywavedamageeffect - atk69 - jump BattleScript_1D6F48 + adjustsetdamage + goto BattleScript_HitFromAtkAnimation -MoveEffect_Counter: @ 81D7A47 +BattleScript_EffectCounter: @ 81D7A47 attackcanceler - counterdamagecalculator BattleScript_1D83D4 - accuracycheck BattleScript_1D6F72, 0 + counterdamagecalculator BattleScript_ButItFailedAtkStringPpReduce + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce - damagecalc2 - atk69 - jump BattleScript_1D6F48 + typecalc2 + adjustsetdamage + goto BattleScript_HitFromAtkAnimation -MoveEffect_Encore: @ 81D7A5D +BattleScript_EffectEncore: @ 81D7A5D attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce - setencore BattleScript_ButItFailed + trysetencore BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_EncoreGot waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_PainSplit: @ 81D7A79 +BattleScript_EffectPainSplit: @ 81D7A79 attackcanceler attackstring ppreduce - accuracycheck BattleScript_ButItFailed, 65535 - painsplitdamagecalculator BattleScript_ButItFailed + accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON + painsplitdmgcalc BattleScript_ButItFailed attackanimation waitanimation - orword gHitMarker, 0x100 - graphicalhpupdate USER + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE + healthbarupdate USER datahpupdate USER - copyarray gBattleMoveDamage, gSharedMem + 0x16014, 4 - graphicalhpupdate TARGET + copyword gBattleMoveDamage, sPAINSPLIT_HP + healthbarupdate TARGET datahpupdate TARGET printstring BATTLE_TEXT_PainSplit waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Snore: @ 81D7AB0 +BattleScript_EffectSnore: @ 81D7AB0 attackcanceler - jumpifstatus USER, SLP, BattleScript_1D7AC2 + jumpifstatus USER, SLP, BattleScript_SnoreIsAsleep attackstring ppreduce - jump BattleScript_ButItFailed + goto BattleScript_ButItFailed -BattleScript_1D7AC2: @ 81D7AC2 - jumpifhalfword 0, gUnknown_02024BE8, 214, BattleScript_1D7AD6 +BattleScript_SnoreIsAsleep: @ 81D7AC2 + jumpifhalfword EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoSnore printstring BATTLE_TEXT_FastAsleep waitmessage 64 statusanimation USER -BattleScript_1D7AD6: @ 81D7AD6 +BattleScript_DoSnore: @ 81D7AD6 attackstring ppreduce - accuracycheck BattleScript_1D6F77, 0 - setbyte gUnknown_02024D1F + 0x2, 8 - jump BattleScript_1D6F44 + accuracycheck BattleScript_MoveMissed, ACC_CURR_MOVE + setmoveeffect EFFECT_FLINCH + goto BattleScript_HitFromCritCalc -MoveEffect_Conversion2: @ 81D7AEA +BattleScript_EffectConversion2: @ 81D7AEA attackcanceler attackstring ppreduce @@ -1340,39 +1341,39 @@ MoveEffect_Conversion2: @ 81D7AEA waitanimation printstring BATTLE_TEXT_TypeTransform waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_LockOn: @ 81D7AFF +BattleScript_EffectLockOn: @ 81D7AFF attackcanceler attackstring ppreduce - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - accuracycheck BattleScript_ButItFailed, 0 + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE setalwayshitflag attackanimation waitanimation printstring BATTLE_TEXT_TookAim waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Sketch: @ 81D7B21 +BattleScript_EffectSketch: @ 81D7B21 attackcanceler attackstring ppreduce - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed copymovepermanently BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_SketchedMove waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_SleepTalk: @ 81D7B40 +BattleScript_EffectSleepTalk: @ 81D7B40 attackcanceler jumpifstatus USER, SLP, BattleScript_1D7B52 attackstring ppreduce - jump BattleScript_ButItFailed + goto BattleScript_ButItFailed BattleScript_1D7B52: @ 81D7B52 printstring BATTLE_TEXT_FastAsleep @@ -1380,254 +1381,253 @@ BattleScript_1D7B52: @ 81D7B52 statusanimation USER attackstring ppreduce - orword gHitMarker, 0x800 - selectrandommovefromusermoves BattleScript_1D7B72 + orword gHitMarker, HITMARKER_NO_PPDEDUCT + trychoosesleeptalkmove BattleScript_SleepTalkIsAsleep pause 64 - jump BattleScript_ButItFailed + goto BattleScript_ButItFailed -BattleScript_1D7B72: @ 81D7B72 +BattleScript_SleepTalkIsAsleep: @ 81D7B72 attackanimation waitanimation - setbyte gSharedMem + 0x16002, 0 - setbyte gSharedMem + 0x160A1, 0 - jumptoattack USER + setbyte sANIM_TURN, 0 + setbyte sANIM_TARGETS_HIT, 0 + jumptorandomattack USER -MoveEffect_DestinyBond: @ 81D7B82 +BattleScript_EffectDestinyBond: @ 81D7B82 attackcanceler attackstring ppreduce - destinybondeffect + setdestinybond attackanimation waitanimation printstring BATTLE_TEXT_DestinyBondTake waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Flail: @ 81D7B93 +BattleScript_EffectFlail: @ 81D7B93 remaininghptopower - jump BattleScript_1D6F14 + goto BattleScript_EffectHit -MoveEffect_Spite: @ 81D7B99 +BattleScript_EffectSpite: @ 81D7B99 attackcanceler attackstring ppreduce - accuracycheck BattleScript_ButItFailed, 0 - reducepprandom BattleScript_ButItFailed + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE + tryspiteppreduce BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_ReducedBy waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_HealBell: @ 81D7BB5 +BattleScript_EffectHealBell: @ 81D7BB5 attackcanceler attackstring ppreduce - clearstatusifnotsoundproofed - waitstateatk + healpartystatus + waitstate attackanimation waitanimation - printfromtable BattleTextList_4015D8 + printfromtable gPartyStatusHealStringIds waitmessage 64 - jumpifhalfword 1, gCurrentMove, 215, BattleScript_1D7BF2 - jumpifbyte 5, gUnknown_02024D1F + 0x4, 1, BattleScript_1D7BE1 + jumpifnotmove MOVE_HEAL_BELL, BattleScript_PartyHealEnd + jumpifbyte NO_COMMON_BITS, cMULTISTRING_CHOOSER, 1, BattleScript_CheckHealBellMon2Unaffected printstring BATTLE_TEXT_BlocksOther waitmessage 64 -BattleScript_1D7BE1: @ 81D7BE1 - jumpifbyte 5, gUnknown_02024D1F + 0x4, 2, BattleScript_1D7BF2 +BattleScript_CheckHealBellMon2Unaffected: @ 81D7BE1 + jumpifbyte NO_COMMON_BITS, cMULTISTRING_CHOOSER, 2, BattleScript_PartyHealEnd printstring BATTLE_TEXT_BlocksOther2 waitmessage 64 -BattleScript_1D7BF2: @ 81D7BF2 - atk98 4 - waitstateatk - jump BattleScript_EndTurn +BattleScript_PartyHealEnd: @ 81D7BF2 + updatestatusicon ATTACKER_WITH_PARTNER + waitstate + goto BattleScript_MoveEnd -MoveEffect_TripleKick: @ 81D7BFA +BattleScript_EffectTripleKick: @ 81D7BFA attackcanceler attackstring ppreduce - setbyte gSharedMem + 0x160DE, 0 - setbyte gSharedMem + 0x160DF, 0 - atk8e - atk26 3 + sethword sTRIPLE_KICK_POWER, 0 + initmultihitstring + setmultihit 3 -BattleScript_1D7C0C: @ 81D7C0C - jumpiffainted USER, BattleScript_1D7CAF - jumpiffainted TARGET, BattleScript_1D7C8D - jumpifhalfword 0, gUnknown_02024BE8, 214, BattleScript_1D7C2E - jumpifstatus USER, SLP, BattleScript_1D7C8D +BattleScript_TripleKickLoop: @ 81D7C0C + jumpifhasnohp USER, BattleScript_TripleKickEnd + jumpifhasnohp TARGET, BattleScript_TripleKickNoMoreHits + jumpifhalfword EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoTripleKickAttack + jumpifstatus USER, SLP, BattleScript_TripleKickNoMoreHits -BattleScript_1D7C2E: @ 81D7C2E - atk25 - accuracycheck BattleScript_1D7C8D, 0 - addbyte gSharedMem + 0x160DE, 10 - addbyte gSharedMem + 0x160E4, 1 - copyarray gDynamicBasePower, gSharedMem + 0x160DE, 2 +BattleScript_DoTripleKickAttack: @ 81D7C2E + movevaluescleanup + accuracycheck BattleScript_TripleKickNoMoreHits, ACC_CURR_MOVE + addbyte sTRIPLE_KICK_POWER, 10 + addbyte sMULTIHIT_STRING + 4, 1 + copyhword gDynamicBasePower, sTRIPLE_KICK_POWER critcalc - atk5 - atk6 - atk7 - jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7C8D + damagecalc + typecalc + adjustnormaldamage + jumpifmovehadnoeffect BattleScript_TripleKickNoMoreHits attackanimation waitanimation - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET critmessage waitmessage 64 printstring BATTLE_TEXT_Terminator2 waitmessage 1 - setbyte gSharedMem + 0x1600C, 0 - atk49 2, 16 - jumpifbyte 4, gBattleMoveFlags, 64, BattleScript_1D7C90 - atk27 BattleScript_1D7C0C - jump BattleScript_1D7C90 + setbyte sMOVEEND_STATE, 0 + moveend 2, 16 + jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_ENDURED, BattleScript_TripleKickPrintStrings + decrementmultihit BattleScript_TripleKickLoop + goto BattleScript_TripleKickPrintStrings -BattleScript_1D7C8D: @ 81D7C8D +BattleScript_TripleKickNoMoreHits: @ 81D7C8D pause 32 -BattleScript_1D7C90: @ 81D7C90 +BattleScript_TripleKickPrintStrings: @ 81D7C90 resultmessage waitmessage 64 - jumpifbyte 0, gSharedMem + 0x160E4, 0, BattleScript_1D7CAF - copyarray gBattleTextBuff1, gSharedMem + 0x160E0, 6 + jumpifbyte EQUAL, sMULTIHIT_STRING + 4, 0, BattleScript_TripleKickEnd + copyarray gBattleTextBuff1,sMULTIHIT_STRING, 6 printstring BATTLE_TEXT_HitMulti waitmessage 64 -BattleScript_1D7CAF: @ 81D7CAF - seteffectwithchancetarget - faintpokemon TARGET, 0, 0x0 - setbyte gSharedMem + 0x1600C, 14 - atk49 0, 0 +BattleScript_TripleKickEnd: @ 81D7CAF + seteffectwithchance + tryfaintmon TARGET, FALSE, NULL + setbyte sMOVEEND_STATE, 14 + moveend 0, 0 end -MoveEffect_Thief: @ 81D7CC1 - setbyte gUnknown_02024D1F + 0x2, 31 - jump BattleScript_1D6F14 +BattleScript_EffectThief: @ 81D7CC1 + setmoveeffect EFFECT_STEAL_ITEM + goto BattleScript_EffectHit -MoveEffect_MeanLook: @ 81D7CCC +BattleScript_EffectMeanLook: @ 81D7CCC attackcanceler attackstring ppreduce - accuracycheck BattleScript_ButItFailed, 65534 - jumpifsecondarytstatus TARGET, S_MEAN_LOOK, BattleScript_ButItFailed + accuracycheck BattleScript_ButItFailed, NO_ACC_CALC + jumpifstatus2 TARGET, STATUS2_ESCAPE_PREVENTION, BattleScript_ButItFailed attackanimation waitanimation - setbyte gUnknown_02024D1F + 0x2, 32 - seteffecttarget + setmoveeffect EFFECT_PREVENT_ESCAPE + seteffectprimary printstring BATTLE_TEXT_CantEscapeNow waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Nightmare: @ 81D7CF4 +BattleScript_EffectNightmare: @ 81D7CF4 attackcanceler attackstring ppreduce - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - jumpifsecondarytstatus TARGET, S_NIGHTMARE, BattleScript_ButItFailed - jumpifstatus TARGET, SLP, BattleScript_1D7D1A - jump BattleScript_ButItFailed + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus2 TARGET, STATUS2_NIGHTMARE, BattleScript_ButItFailed + jumpifstatus TARGET, SLP, BattleScript_NightmareWorked + goto BattleScript_ButItFailed -BattleScript_1D7D1A: @ 81D7D1A +BattleScript_NightmareWorked: @ 81D7D1A attackanimation waitanimation - setbyte gUnknown_02024D1F + 0x2, 33 - seteffecttarget + setmoveeffect EFFECT_NIGHTMARE + seteffectprimary printstring BATTLE_TEXT_NightmareStart waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Minimize: @ 81D7D2E +BattleScript_EffectMinimize: @ 81D7D2E attackcanceler setminimize - setbyte gSharedMem + 0x1601E, 23 - jump BattleScript_1D71B3 + setstatchanger EVASION, 1, FALSE + goto BattleScript_EffectStatUpAfterAtkCanceler -MoveEffect_Curse: @ 81D7D3B - jumpiftype2 USER, TYPE_GHOST, BattleScript_1D7DB3 +BattleScript_EffectCurse: @ 81D7D3B + jumpiftype2 USER, TYPE_GHOST, BattleScript_GhostCurse attackcanceler attackstring ppreduce - jumpifstat USER, 2, 3, 0, BattleScript_1D7D60 - jumpifstat USER, 1, 1, 12, BattleScript_1D7D60 - jumpifstat USER, 0, 2, 12, BattleScript_ButItFailed + jumpifstat USER, GREATER_THAN, SPEED, 0, BattleScript_CurseTrySpeed + jumpifstat USER, NOT_EQUAL, ATTACK, 12, BattleScript_CurseTrySpeed + jumpifstat USER, EQUAL, DEFENSE, 12, BattleScript_ButItFailed -BattleScript_1D7D60: @ 81D7D60 - copyarray gBankTarget, gBankAttacker, 1 - setbyte gSharedMem + 0x16002, 1 +BattleScript_CurseTrySpeed: @ 81D7D60 + copybyte gBankTarget, gBankAttacker + setbyte sANIM_TURN, 1 attackanimation waitanimation - setbyte gSharedMem + 0x1601E, 147 - statbuffchange 65, BattleScript_1D7D86 - printfromtable BattleTextList_40157C + setstatchanger SPEED, 1, TRUE + statbuffchange AFFECTS_USER | 0x1, BattleScript_CurseTryAttack + printfromtable gStatDownStringIds waitmessage 64 -BattleScript_1D7D86: @ 81D7D86 - setbyte gSharedMem + 0x1601E, 17 - statbuffchange 65, BattleScript_1D7D9A - printfromtable BattleTextList_401570 +BattleScript_CurseTryAttack: @ 81D7D86 + setstatchanger ATTACK, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_CurseTryDefence + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D7D9A: @ 81D7D9A - setbyte gSharedMem + 0x1601E, 18 - statbuffchange 65, BattleScript_1D7DAE - printfromtable BattleTextList_401570 +BattleScript_CurseTryDefence: @ 81D7D9A + setstatchanger DEFENSE, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_CurseEnd + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D7DAE: @ 81D7DAE - jump BattleScript_EndTurn +BattleScript_CurseEnd: @ 81D7DAE + goto BattleScript_MoveEnd -BattleScript_1D7DB3: @ 81D7DB3 - jumpifarraynotequal gBankAttacker, gBankTarget, 1, BattleScript_1D7DC4 - atk76 USER, 3 +BattleScript_GhostCurse: @ 81D7DB3 + jumpifbytenotequal gBankAttacker, gBankTarget, BattleScript_DoGhostCurse + getmovetarget USER -BattleScript_1D7DC4: @ 81D7DC4 +BattleScript_DoGhostCurse: @ 81D7DC4 attackcanceler attackstring ppreduce - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed cursetarget BattleScript_ButItFailed - orword gHitMarker, 0x100 - setbyte gSharedMem + 0x16002, 0 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE + setbyte sANIM_TURN, 0 attackanimation waitanimation - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_CurseLay waitmessage 64 - faintpokemon USER, 0, 0x0 - jump BattleScript_EndTurn + tryfaintmon USER, FALSE, NULL + goto BattleScript_MoveEnd -MoveEffect_Endure: @ 81D7DFD -MoveEffect_Protect: @ 81D7DFD +BattleScript_EffectEndure: @ 81D7DFD +BattleScript_EffectProtect: @ 81D7DFD attackcanceler attackstring ppreduce - setprotect + setprotectlike attackanimation waitanimation - printfromtable BattleTextList_40153A + printfromtable gProtectLikeUsedStringIds waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Spikes: @ 81D7E10 +BattleScript_EffectSpikes: @ 81D7E10 attackcanceler - setspikes BattleScript_1D83D4 + trysetspikes BattleScript_ButItFailedAtkStringPpReduce attackstring ppreduce attackanimation waitanimation printstring BATTLE_TEXT_SpikesScattered waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Foresight: @ 81D7E25 +BattleScript_EffectForesight: @ 81D7E25 attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce setforesight @@ -1635,241 +1635,238 @@ MoveEffect_Foresight: @ 81D7E25 waitanimation printstring BATTLE_TEXT_IdentifiedPoke waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_PerishSong: @ 81D7E3D +BattleScript_EffectPerishSong: @ 81D7E3D attackcanceler attackstring ppreduce - setperishsong BattleScript_ButItFailed + trysetperishsong BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_PerishSong waitmessage 64 - setbyte gSharedMem + 0x16003, 0 + setbyte sBANK, 0 -BattleScript_1D7E53: @ 81D7E53 - jumpifability 10, ABILITY_SOUNDPROOF, BattleScript_1D7E73 +BattleScript_PerishSongLoop: @ 81D7E53 + jumpifability SCRIPTING_BANK, ABILITY_SOUNDPROOF, BattleScript_1D7E73 -BattleScript_1D7E5A: @ 81D7E5A - addbyte gSharedMem + 0x16003, 1 - jumpifarraynotequal gSharedMem + 0x16003, gNoOfAllBanks, 1, BattleScript_1D7E53 - jump BattleScript_EndTurn +BattleScript_PerishSongLoopIncrement: @ 81D7E5A + addbyte sBANK, 1 + jumpifbytenotequal sBANK, gNoOfAllBanks, BattleScript_PerishSongLoop + goto BattleScript_MoveEnd BattleScript_1D7E73: @ 81D7E73 printstring BATTLE_TEXT_BlocksOther2 waitmessage 64 - jump BattleScript_1D7E5A + goto BattleScript_PerishSongLoopIncrement -MoveEffect_Sandstorm: @ 81D7E7E +BattleScript_EffectSandstorm: @ 81D7E7E attackcanceler attackstring ppreduce setsandstorm - jump BattleScript_1D7FFA + goto BattleScript_MoveWeatherChange -MoveEffect_Rollout: @ 81D7E87 +BattleScript_EffectRollout: @ 81D7E87 attackcanceler attackstring - jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D7E94 + jumpifstatus2 USER, STATUS2_MULTIPLETURNS, BattleScript_RolloutCheckAccuracy ppreduce -BattleScript_1D7E94: @ 81D7E94 - accuracycheck BattleScript_1D7E9B, 0 +BattleScript_RolloutCheckAccuracy: @ 81D7E94 + accuracycheck BattleScript_RolloutHit, ACC_CURR_MOVE -BattleScript_1D7E9B: @ 81D7E9B - damagecalc2 +BattleScript_RolloutHit: @ 81D7E9B + typecalc2 rolloutdamagecalculation - jump BattleScript_1D6F44 + goto BattleScript_HitFromCritCalc -MoveEffect_Swagger: @ 81D7EA2 +BattleScript_EffectSwagger: @ 81D7EA2 attackcanceler - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D6F6C - accuracycheck BattleScript_1D6F72, 0 + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_MakeMoveMissed + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce - jumpifconfusedandattackmaxed 1, BattleScript_ButItFailed + jumpifconfusedandstatmaxed 1, BattleScript_ButItFailed attackanimation waitanimation - setbyte gSharedMem + 0x1601E, 33 - statbuffchange 1, BattleScript_1D7EE5 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D7EE5 - atk47 - playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 - printfromtable BattleTextList_401570 + setstatchanger ATTACK, 2, FALSE + statbuffchange 1, BattleScript_SwaggerTryConfuse + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_SwaggerTryConfuse + setgraphicalstatchangevalues + playanimation TARGET, B_ANIM_STATS_CHANGE, sANIM_ARG1 + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D7EE5: @ 81D7EE5 - jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D98E5 - jumpifhalverset TARGET, 32, BattleScript_1D9037 - setbyte gUnknown_02024D1F + 0x2, 7 - seteffecttarget - jump BattleScript_EndTurn +BattleScript_SwaggerTryConfuse: @ 81D7EE5 + jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected + setmoveeffect EFFECT_CONFUSION + seteffectprimary + goto BattleScript_MoveEnd -MoveEffect_FuryCutter: @ 81D7F00 +BattleScript_EffectFuryCutter: @ 81D7F00 attackcanceler attackstring ppreduce - accuracycheck BattleScript_1D7F0A, 0 + accuracycheck BattleScript_FuryCutterHit, ACC_CURR_MOVE -BattleScript_1D7F0A: @ 81D7F0A - furycutterdamagecalculation +BattleScript_FuryCutterHit: @ 81D7F0A + furycuttercalc critcalc - atk5 - atk6 - jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7F0A - atk7 - jump BattleScript_1D6F48 + damagecalc + typecalc + jumpifmovehadnoeffect BattleScript_FuryCutterHit + adjustnormaldamage + goto BattleScript_HitFromAtkAnimation -MoveEffect_Attract: @ 81D7F1F +BattleScript_EffectAttract: @ 81D7F1F attackcanceler attackstring ppreduce - accuracycheck BattleScript_ButItFailed, 0 - tryinfatuatetarget BattleScript_ButItFailed + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE + tryinfatuating BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_FellLove waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Frustration: @ 81D7F3B -MoveEffect_Return: @ 81D7F3B +BattleScript_EffectFrustration: @ 81D7F3B +BattleScript_EffectReturn: @ 81D7F3B attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE happinesstodamagecalculation - jump BattleScript_1D6F42 + goto BattleScript_HitFromAtkString -MoveEffect_Present: @ 81D7F49 +BattleScript_EffectPresent: @ 81D7F49 attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce - atk6 + typecalc presentdamagecalculation -MoveEffect_Safeguard: @ 81D7F55 +BattleScript_EffectSafeguard: @ 81D7F55 attackcanceler attackstring ppreduce setsafeguard - jump BattleScript_1D7786 + goto BattleScript_PrintReflectLightScreenSafeguardString -MoveEffect_ThawHit: @ 81D7F5E - setbyte gUnknown_02024D1F + 0x2, 3 - jump BattleScript_1D6F14 +BattleScript_EffectThawHit: @ 81D7F5E + setmoveeffect EFFECT_BURN + goto BattleScript_EffectHit -MoveEffect_Magnitude: @ 81D7F69 +BattleScript_EffectMagnitude: @ 81D7F69 attackcanceler attackstring ppreduce - selectnexttarget + selectfirstvalidtarget magnitudedamagecalculation pause 32 printstring BATTLE_TEXT_MagnitudeCount waitmessage 64 - jump BattleScript_1D80FD + goto BattleScript_HitsAllWithUndergroundBonusLoop -MoveEffect_BatonPass: @ 81D7F7C +BattleScript_EffectBatonPass: @ 81D7F7C attackcanceler attackstring ppreduce - jumpifcannotswitch 129, BattleScript_ButItFailed + jumpifcantswitch ATK4F_DONT_CHECK_STATUSES | USER, BattleScript_ButItFailed attackanimation waitanimation openpartyscreen USER, BattleScript_ButItFailed - atke2 USER - waitstateatk - atk51 USER, 2 - atk58 USER - switch1 USER - switch2 USER - atk73 USER + switchoutabilities USER + waitstate + switchhandleorder USER, 2 + returntoball USER + getswitchedmondata USER + switchindataupdate USER + hpthresholds USER printstring 3 - switch3 USER, 1 - waitstateatk - atk52 USER - jump BattleScript_EndTurn + switchinanim USER, 1 + waitstate + switchineffects USER + goto BattleScript_MoveEnd -MoveEffect_RapidSpin: @ 81D7FA9 - setbyte gUnknown_02024D1F + 0x2, 163 - jump BattleScript_1D6F14 +BattleScript_EffectRapidSpin: @ 81D7FA9 + setmoveeffect EFFECT_RAPIDSPIN | CERTAIN + goto BattleScript_EffectHit -MoveEffect_Sonicboom: @ 81D7FB4 +BattleScript_EffectSonicboom: @ 81D7FB4 attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce - atk6 - bicbyte gBattleMoveFlags, 6 - setbyte gBattleMoveDamage, 20 - setbyte gBattleMoveDamage + 0x1, 0 - setbyte gBattleMoveDamage + 0x2, 0 - setbyte gBattleMoveDamage + 0x3, 0 - atk69 - jump BattleScript_1D6F48 + typecalc + bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE + setword gBattleMoveDamage, 20 + adjustsetdamage + goto BattleScript_HitFromAtkAnimation -MoveEffect_Moonlight: @ 81D7FE3 -MoveEffect_MorningSun: @ 81D7FE3 -MoveEffect_Synthesis: @ 81D7FE3 +BattleScript_EffectMoonlight: @ 81D7FE3 +BattleScript_EffectMorningSun: @ 81D7FE3 +BattleScript_EffectSynthesis: @ 81D7FE3 attackcanceler attackstring ppreduce - recoverbasedonsunlight BattleScript_1D83B5 - jump BattleScript_1D839B + recoverbasedonsunlight BattleScript_AlreadyAtFullHp + goto BattleScript_PresentHealTarget -MoveEffect_HiddenPower: @ 81D7FF0 - hiddenpowerdamagecalculation - jump BattleScript_1D6F14 +BattleScript_EffectHiddenPower: @ 81D7FF0 + hiddenpowercalc + goto BattleScript_EffectHit -MoveEffect_RainDance: @ 81D7FF6 +BattleScript_EffectRainDance: @ 81D7FF6 attackcanceler attackstring ppreduce setrain -BattleScript_1D7FFA: @ 81D7FFA +BattleScript_MoveWeatherChange: @ 81D7FFA attackanimation waitanimation - printfromtable BattleTextList_40151C + printfromtable gMoveWeatherChangeStringIds waitmessage 64 - callatk BattleScript_1D9761 - jump BattleScript_EndTurn + call BattleScript_WeatherFormChanges + goto BattleScript_MoveEnd -MoveEffect_SunnyDay: @ 81D800E +BattleScript_EffectSunnyDay: @ 81D800E attackcanceler attackstring ppreduce setsunny - jump BattleScript_1D7FFA + goto BattleScript_MoveWeatherChange -MoveEffect_DefenseUpHit: @ 81D8017 - setbyte gUnknown_02024D1F + 0x2, 80 - jump BattleScript_1D6F14 +BattleScript_EffectDefenseUpHit: @ 81D8017 + setbyte cEFFECT_CHOOSER, 80 + goto BattleScript_EffectHit -MoveEffect_AttackUpHit: @ 81D8022 - setbyte gUnknown_02024D1F + 0x2, 79 - jump BattleScript_1D6F14 +BattleScript_EffectAttackUpHit: @ 81D8022 + setbyte cEFFECT_CHOOSER, 79 + goto BattleScript_EffectHit -MoveEffect_AllStatsUpHit: @ 81D802D - setbyte gUnknown_02024D1F + 0x2, 98 - jump BattleScript_1D6F14 +BattleScript_EffectAllStatsUpHit: @ 81D802D + setbyte cEFFECT_CHOOSER, 98 + goto BattleScript_EffectHit -MoveEffect_BellyDrum: @ 81D8038 +BattleScript_EffectBellyDrum: @ 81D8038 attackcanceler attackstring ppreduce maxattackhalvehp BattleScript_ButItFailed - orword gHitMarker, 0x100 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE attackanimation waitanimation - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_CutHPMaxATK waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_PsychUp: @ 81D805A +BattleScript_EffectPsychUp: @ 81D805A attackcanceler attackstring ppreduce @@ -1878,72 +1875,72 @@ MoveEffect_PsychUp: @ 81D805A waitanimation printstring BATTLE_TEXT_CopyStatChanges waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_MirrorCoat: @ 81D806F +BattleScript_EffectMirrorCoat: @ 81D806F attackcanceler - mirrorcoatdamagecalculator BattleScript_1D83D4 - accuracycheck BattleScript_1D6F72, 0 + mirrorcoatdamagecalculator BattleScript_ButItFailedAtkStringPpReduce + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce - damagecalc2 - atk69 - jump BattleScript_1D6F48 + typecalc2 + adjustsetdamage + goto BattleScript_HitFromAtkAnimation -MoveEffect_SkullBash: @ 81D8085 - jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D - jumpifword 4, gHitMarker, 0x200, BattleScript_1D753D - setbyte gSharedMem + 0x16055, 2 - callatk BattleScript_1D756C - setbyte gSharedMem + 0x1601E, 18 - statbuffchange 65, BattleScript_1D80CF - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D80CF - atk47 - playanimation USER, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 - printfromtable BattleTextList_401570 +BattleScript_EffectSkullBash: @ 81D8085 + jumpifstatus2 USER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn + jumpifword COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn + setbyte sTWOTURN_STRINGID, 2 + call BattleScriptFirstChargingTurn + setstatchanger DEFENSE, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_SkullBashEnd + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_SkullBashEnd + setgraphicalstatchangevalues + playanimation USER, B_ANIM_STATS_CHANGE, sANIM_ARG1 + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D80CF: @ 81D80CF - jump BattleScript_EndTurn +BattleScript_SkullBashEnd: @ 81D80CF + goto BattleScript_MoveEnd -MoveEffect_Twister: @ 81D80D4 - jumpifspecialstatusflag TARGET, 0x40, 1, BattleScript_1D80EE - orword gHitMarker, 0x10000 - setbyte gSharedMem + 0x1601F, 2 +BattleScript_EffectTwister: @ 81D80D4 + jumpifnostatus3 TARGET, STATUS3_ON_AIR, BattleScript_FlinchEffect + orword gHitMarker, HITMARKER_IGNORE_ON_AIR + setbyte sDMG_MULTIPLIER, 2 -BattleScript_1D80EE: @ 81D80EE - setbyte gUnknown_02024D1F + 0x2, 8 - jump BattleScript_1D6F14 +BattleScript_FlinchEffect: @ 81D80EE + setmoveeffect EFFECT_FLINCH + goto BattleScript_EffectHit -MoveEffect_Earthquake: @ 81D80F9 +BattleScript_EffectEarthquake: @ 81D80F9 attackcanceler attackstring ppreduce - selectnexttarget + selectfirstvalidtarget -BattleScript_1D80FD: @ 81D80FD - atk25 - jumpifspecialstatusflag TARGET, 0x80, 1, BattleScript_1D811D - orword gHitMarker, 0x20000 - setbyte gSharedMem + 0x1601F, 2 - jump BattleScript_1D812C +BattleScript_HitsAllWithUndergroundBonusLoop: @ 81D80FD + movevaluescleanup + jumpifnostatus3 TARGET, STATUS3_UNDERGROUND, BattleScript_HitsAllNoUndergroundBonus + orword gHitMarker, HITMARKER_IGNORE_UNDERGROUND + setbyte sDMG_MULTIPLIER, 2 + goto BattleScript_DoHitAllWithUndergroundBonus -BattleScript_1D811D: @ 81D811D - bicword gHitMarker, 0x20000 - setbyte gSharedMem + 0x1601F, 1 +BattleScript_HitsAllNoUndergroundBonus: @ 81D811D + bicword gHitMarker, HITMARKER_IGNORE_UNDERGROUND + setbyte sDMG_MULTIPLIER, 1 -BattleScript_1D812C: @ 81D812C - accuracycheck BattleScript_1D8165, 0 +BattleScript_DoHitAllWithUndergroundBonus: @ 81D812C + accuracycheck BattleScript_HitAllWithUndergroundBonusMissed, ACC_CURR_MOVE critcalc - atk5 - atk6 - atk7 + damagecalc + typecalc + adjustnormaldamage attackanimation waitanimation - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET critmessage waitmessage 64 @@ -1951,395 +1948,395 @@ BattleScript_1D812C: @ 81D812C waitmessage 64 printstring BATTLE_TEXT_Terminator2 waitmessage 1 - faintpokemon TARGET, 0, 0x0 - setbyte gSharedMem + 0x1600C, 0 - atk49 2, 16 - jumpwhiletargetvalid BattleScript_1D80FD + tryfaintmon TARGET, FALSE, NULL + setbyte sMOVEEND_STATE, 0 + moveend 2, 16 + jumpifnexttargetvalid BattleScript_HitsAllWithUndergroundBonusLoop end -BattleScript_1D8165: @ 81D8165 +BattleScript_HitAllWithUndergroundBonusMissed: @ 81D8165 pause 32 - atk6 - missmessage + typecalc + effectivenesssound resultmessage waitmessage 64 - setbyte gSharedMem + 0x1600C, 0 - atk49 2, 16 - jumpwhiletargetvalid BattleScript_1D80FD + setbyte sMOVEEND_STATE, 0 + moveend 2, 16 + jumpifnexttargetvalid BattleScript_HitsAllWithUndergroundBonusLoop end -MoveEffect_FutureSight: @ 81D817D +BattleScript_EffectFutureSight: @ 81D817D attackcanceler attackstring ppreduce - setfutureattack BattleScript_ButItFailed + trysetfutureattack BattleScript_ButItFailed attackanimation waitanimation - printfromtable BattleTextList_4015E2 + printfromtable gFutureMoveUsedStringIds waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Gust: @ 81D8194 - jumpifspecialstatusflag TARGET, 0x40, 1, BattleScript_1D6F14 - orword gHitMarker, 0x10000 - setbyte gSharedMem + 0x1601F, 2 - jump BattleScript_1D6F14 +BattleScript_EffectGust: @ 81D8194 + jumpifnostatus3 TARGET, STATUS3_ON_AIR, BattleScript_EffectHit + orword gHitMarker, HITMARKER_IGNORE_ON_AIR + setbyte sDMG_MULTIPLIER, 2 + goto BattleScript_EffectHit -MoveEffect_FlinchHit2: @ 81D81B3 - jumpifspecialstatusflag TARGET, 0x100, 1, BattleScript_1D80EE - setbyte gSharedMem + 0x1601F, 2 - jump BattleScript_1D80EE +BattleScript_EffectStomp: @ 81D81B3 + jumpifnostatus3 TARGET, STATUS3_MINIMIZED, BattleScript_FlinchEffect + setbyte sDMG_MULTIPLIER, 2 + goto BattleScript_FlinchEffect -MoveEffect_Solarbeam: @ 81D81C9 - jumpifabilitypresent ABILITY_CLOUD_NINE, BattleScript_1D81E1 - jumpifabilitypresent ABILITY_AIR_LOCK, BattleScript_1D81E1 - jumpifhalfword 4, gBattleWeather, 96, BattleScript_1D8209 +BattleScript_EffectSolarbeam: @ 81D81C9 + jumpifabilitypresent ABILITY_CLOUD_NINE, BattleScript_SolarbeamDecideTurn + jumpifabilitypresent ABILITY_AIR_LOCK, BattleScript_SolarbeamDecideTurn + jumpifhalfword COMMON_BITS, gBattleWeather, 96, BattleScript_SolarbeamOnFirstTurn -BattleScript_1D81E1: @ 81D81E1 - jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D - jumpifword 4, gHitMarker, 0x200, BattleScript_1D753D - setbyte gSharedMem + 0x16055, 1 - callatk BattleScript_1D756C - jump BattleScript_EndTurn +BattleScript_SolarbeamDecideTurn: @ 81D81E1 + jumpifstatus2 USER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn + jumpifword COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn + setbyte sTWOTURN_STRINGID, 1 + call BattleScriptFirstChargingTurn + goto BattleScript_MoveEnd -BattleScript_1D8209: @ 81D8209 - orword gHitMarker, 0x8000000 - setbyte gUnknown_02024D1F + 0x2, 76 - seteffecttarget +BattleScript_SolarbeamOnFirstTurn: @ 81D8209 + orword gHitMarker, HITMARKER_x8000000 + setbyte cEFFECT_CHOOSER, 76 + seteffectprimary ppreduce - jump BattleScript_1D753D + goto BattleScript_TwoTurnMovesSecondTurn -MoveEffect_Thunder: @ 81D821F - setbyte gUnknown_02024D1F + 0x2, 5 - orword gHitMarker, 0x10000 - jump BattleScript_1D6F14 +BattleScript_EffectThunder: @ 81D821F + setmoveeffect EFFECT_PARALYSIS + orword gHitMarker, HITMARKER_IGNORE_ON_AIR + goto BattleScript_EffectHit -MoveEffect_Teleport: @ 81D8233 +BattleScript_EffectTeleport: @ 81D8233 attackcanceler attackstring ppreduce - jumpifhalfword 4, gBattleTypeFlags, 8, BattleScript_ButItFailed - atk76 USER, 2 - jumpifbyte 0, gBattleCommunication, 1, BattleScript_ButItFailed - jumpifbyte 0, gBattleCommunication, 2, BattleScript_1D8839 + jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_ButItFailed + getifcantrunfrombattle USER + jumpifbyte EQUAL, gBattleCommunication, 1, BattleScript_ButItFailed + jumpifbyte EQUAL, gBattleCommunication, 2, BattleScript_PrintAbilityMadeIneffective attackanimation waitanimation printstring BATTLE_TEXT_FledBattle waitmessage 64 setbyte gBattleOutcome, 5 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_BeatUp: @ 81D826E +BattleScript_EffectBeatUp: @ 81D826E attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring pause 32 ppreduce setbyte gBattleCommunication, 0 -BattleScript_1D8281: @ 81D8281 - atk25 - beatupcalculation BattleScript_1D82C4, BattleScript_ButItFailed +BattleScript_BeatUpLoop: @ 81D8281 + movevaluescleanup + trydobeatup BattleScript_BeatUpEnd, BattleScript_ButItFailed printstring BATTLE_TEXT_PokeAttack critcalc - jumpifbyte 1, gCritMultiplier, 2, BattleScript_1D829C + jumpifbyte NOT_EQUAL, gCritMultiplier, 2, BattleScript_BeatUpAttack manipulatedamage 2 -BattleScript_1D829C: @ 81D829C - atk7 +BattleScript_BeatUpAttack: @ 81D829C + adjustnormaldamage attackanimation waitanimation - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET critmessage waitmessage 64 resultmessage waitmessage 64 - faintpokemon TARGET, 0, 0x0 - setbyte gSharedMem + 0x1600C, 0 - atk49 2, 16 - jump BattleScript_1D8281 + tryfaintmon TARGET, FALSE, NULL + setbyte sMOVEEND_STATE, 0 + moveend 2, 16 + goto BattleScript_BeatUpLoop -BattleScript_1D82C4: @ 81D82C4 +BattleScript_BeatUpEnd: @ 81D82C4 end -MoveEffect_Fly: @ 81D82C5 - jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D8333 - jumpifword 4, gHitMarker, 0x200, BattleScript_1D8333 - jumpifhalfword 0, gCurrentMove, 19, BattleScript_1D8322 - jumpifhalfword 0, gCurrentMove, 291, BattleScript_1D8317 - jumpifhalfword 0, gCurrentMove, 340, BattleScript_1D830C - setbyte gSharedMem + 0x16055, 5 - jump BattleScript_1D8328 +BattleScript_EffectSemiInvulnerable: @ 81D82C5 + jumpifstatus2 USER, STATUS2_MULTIPLETURNS, BattleScript_SecondTurnSemiInvulnerable + jumpifword COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_SecondTurnSemiInvulnerable + jumpifmove MOVE_FLY, BattleScript_FirstTurnFly + jumpifmove MOVE_DIVE, BattleScript_FirstTurnDive + jumpifmove MOVE_BOUNCE, BattleScript_FirstTurnBounce + setbyte sTWOTURN_STRINGID, 5 + goto BattleScript_FirstTurnSemiInvulnerable -BattleScript_1D830C: @ 81D830C - setbyte gSharedMem + 0x16055, 7 - jump BattleScript_1D8328 +BattleScript_FirstTurnBounce: @ 81D830C + setbyte sTWOTURN_STRINGID, 7 + goto BattleScript_FirstTurnSemiInvulnerable -BattleScript_1D8317: @ 81D8317 - setbyte gSharedMem + 0x16055, 6 - jump BattleScript_1D8328 +BattleScript_FirstTurnDive: @ 81D8317 + setbyte sTWOTURN_STRINGID, 6 + goto BattleScript_FirstTurnSemiInvulnerable -BattleScript_1D8322: @ 81D8322 - setbyte gSharedMem + 0x16055, 4 +BattleScript_FirstTurnFly: @ 81D8322 + setbyte sTWOTURN_STRINGID, 4 -BattleScript_1D8328: @ 81D8328 - callatk BattleScript_1D756C - hidepreattack - jump BattleScript_EndTurn +BattleScript_FirstTurnSemiInvulnerable: @ 81D8328 + call BattleScriptFirstChargingTurn + setsemiinvulnerablebit + goto BattleScript_MoveEnd -BattleScript_1D8333: @ 81D8333 +BattleScript_SecondTurnSemiInvulnerable: @ 81D8333 attackcanceler - setbyte gUnknown_02024D1F + 0x2, 12 - setbyte gSharedMem + 0x16002, 1 - clearstatus USER - orword gHitMarker, 0x800 - jumpifhalfword 1, gCurrentMove, 340, BattleScript_1D835D - setbyte gUnknown_02024D1F + 0x2, 5 + setmoveeffect EFFECT_CHARGING + setbyte sANIM_TURN, 1 + clearstatusfromeffect USER + orword gHitMarker, HITMARKER_NO_PPDEDUCT + jumpifnotmove MOVE_BOUNCE, BattleScript_SemiInvulnerableTryHit + setmoveeffect EFFECT_PARALYSIS -BattleScript_1D835D: @ 81D835D - accuracycheck BattleScript_1D836A, 0 - unhidepostattack - jump BattleScript_1D6F42 +BattleScript_SemiInvulnerableTryHit: @ 81D835D + accuracycheck BattleScript_SemiInvulnerableMiss, ACC_CURR_MOVE + clearsemiinvulnerablebit + goto BattleScript_HitFromAtkString -BattleScript_1D836A: @ 81D836A - unhidepostattack - jump BattleScript_1D6F72 +BattleScript_SemiInvulnerableMiss: @ 81D836A + clearsemiinvulnerablebit + goto BattleScript_PrintMoveMissed -MoveEffect_DefenseCurl: @ 81D8370 +BattleScript_EffectDefenseCurl: @ 81D8370 attackcanceler attackstring ppreduce - setcurled - setbyte gSharedMem + 0x1601E, 18 - statbuffchange 65, BattleScript_1D838D - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D71D8 + setdefensecurlbit + setstatchanger DEFENSE, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_DefenseCurlDoStatUpAnim + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_StatUpPrintString attackanimation waitanimation -BattleScript_1D838D: @ 81D838D - jump BattleScript_1D71D0 +BattleScript_DefenseCurlDoStatUpAnim: @ 81D838D + goto BattleScript_StatUpDoAnim -MoveEffect_Softboiled: @ 81D8392 +BattleScript_EffectSoftboiled: @ 81D8392 attackcanceler attackstring ppreduce - setdamageasrestorehalfmaxhp BattleScript_1D83B5, 0 + tryhealhalfhealth BattleScript_AlreadyAtFullHp, 0 -BattleScript_1D839B:: @ 81D839B +BattleScript_PresentHealTarget:: @ 81D839B attackanimation waitanimation - orword gHitMarker, 0x100 - graphicalhpupdate TARGET + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE + healthbarupdate TARGET datahpupdate TARGET printstring BATTLE_TEXT_RegainedHealth waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D83B5:: @ 81D83B5 +BattleScript_AlreadyAtFullHp:: @ 81D83B5 pause 32 printstring BATTLE_TEXT_HPFull waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_FakeOut: @ 81D83C3 +BattleScript_EffectFakeOut: @ 81D83C3 attackcanceler - jumpifnotfirstturn BattleScript_1D83D4 - setbyte gUnknown_02024D1F + 0x2, 136 - jump BattleScript_1D6F14 + jumpifnotfirstturn BattleScript_ButItFailedAtkStringPpReduce + setbyte cEFFECT_CHOOSER, 136 + goto BattleScript_EffectHit -BattleScript_1D83D4: @ 81D83D4 +BattleScript_ButItFailedAtkStringPpReduce: @ 81D83D4 attackstring -BattleScript_1D83D5: @ 81D83D5 +BattleScript_ButItFailedPpReduce: @ 81D83D5 ppreduce BattleScript_ButItFailed:: @ 81D83D6 pause 32 - orbyte gBattleMoveFlags, 32 + orbyte gBattleMoveFlags, MOVESTATUS_FAILED resultmessage waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D83E8: @ 81D83E8 +BattleScript_NotAffected: @ 81D83E8 pause 32 - orbyte gBattleMoveFlags, 8 + orbyte gBattleMoveFlags, MOVESTATUS_NOTAFFECTED resultmessage waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Uproar: @ 81D83FA +BattleScript_EffectUproar: @ 81D83FA attackcanceler - accuracycheck BattleScript_1D6F72, 0 - setbyte gUnknown_02024D1F + 0x2, 74 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE + setbyte cEFFECT_CHOOSER, 74 attackstring - jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D8414 + jumpifstatus2 USER, STATUS2_MULTIPLETURNS, BattleScript_UproarHit ppreduce -BattleScript_1D8414: @ 81D8414 - nop3 - jump BattleScript_1D6F44 +BattleScript_UproarHit: @ 81D8414 + nop + goto BattleScript_HitFromCritCalc -MoveEffect_Stockpile: @ 81D841A +BattleScript_EffectStockpile: @ 81D841A attackcanceler attackstring ppreduce stockpile attackanimation waitanimation - printfromtable BattleTextList_40155E + printfromtable gStockpileUsedStringIds waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_SpitUp: @ 81D842D +BattleScript_EffectSpitUp: @ 81D842D attackcanceler - jumpifbyte 0, gUnknown_02024D1F + 0x5, 1, BattleScript_1D845C + jumpifbyte EQUAL, gUnknown_02024D1F + 0x5, 1, BattleScript_SpitUpFail attackstring ppreduce - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE stockpiletobasedamage BattleScript_1D844E - atk6 - atk69 - jump BattleScript_1D6F48 + typecalc + adjustsetdamage + goto BattleScript_HitFromAtkAnimation BattleScript_1D844E: @ 81D844E pause 32 printstring BATTLE_TEXT_SpitUpFail waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D845C: @ 81D845C +BattleScript_SpitUpFail: @ 81D845C attackstring ppreduce pause 64 stockpiletobasedamage BattleScript_1D844E resultmessage waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Swallow: @ 81D846F +BattleScript_EffectSwallow: @ 81D846F attackcanceler attackstring ppreduce - stockpiletohprecovery BattleScript_1D847C - jump BattleScript_1D839B + stockpiletohpheal BattleScript_SwallowFail + goto BattleScript_PresentHealTarget -BattleScript_1D847C: @ 81D847C +BattleScript_SwallowFail: @ 81D847C pause 32 - printfromtable BattleTextList_401566 + printfromtable gSwallowFailStringIds waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Hail: @ 81D848C +BattleScript_EffectHail: @ 81D848C attackcanceler attackstring ppreduce sethail - jump BattleScript_1D7FFA + goto BattleScript_MoveWeatherChange -MoveEffect_Torment: @ 81D8495 +BattleScript_EffectTorment: @ 81D8495 attackcanceler attackstring ppreduce - accuracycheck BattleScript_ButItFailed, 0 + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE settorment BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_TormentSubject waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Flatter: @ 81D84B1 +BattleScript_EffectFlatter: @ 81D84B1 attackcanceler - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D6F6C - accuracycheck BattleScript_1D6F72, 0 + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_MakeMoveMissed + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce - jumpifconfusedandattackmaxed 4, BattleScript_ButItFailed + jumpifconfusedandstatmaxed 4, BattleScript_ButItFailed attackanimation waitanimation - setbyte gSharedMem + 0x1601E, 20 - statbuffchange 1, BattleScript_1D84F4 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D84F4 - atk47 - playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 - printfromtable BattleTextList_401570 + setstatchanger SP_ATTACK, 1, FALSE + statbuffchange 1, BattleScript_FlatterTryConfuse + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_FlatterTryConfuse + setgraphicalstatchangevalues + playanimation TARGET, B_ANIM_STATS_CHANGE, sANIM_ARG1 + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D84F4: @ 81D84F4 - jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D98E5 - jumpifhalverset TARGET, 32, BattleScript_1D9037 - setbyte gUnknown_02024D1F + 0x2, 7 - seteffecttarget - jump BattleScript_EndTurn +BattleScript_FlatterTryConfuse: @ 81D84F4 + jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected + setmoveeffect EFFECT_CONFUSION + seteffectprimary + goto BattleScript_MoveEnd -MoveEffect_WillOWisp: @ 81D850F +BattleScript_EffectWillOWisp: @ 81D850F attackcanceler attackstring ppreduce - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - jumpifstatus TARGET, BRN, BattleScript_1D8575 - jumpiftype TARGET, TYPE_FIRE, BattleScript_1D83E8 - jumpifability TARGET, ABILITY_WATER_VEIL, BattleScript_1D855B + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus TARGET, BRN, BattleScript_AlreadyBurned + jumpiftype TARGET, TYPE_FIRE, BattleScript_NotAffected + jumpifability TARGET, ABILITY_WATER_VEIL, BattleScript_WaterVeilPrevents jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_ButItFailed - accuracycheck BattleScript_ButItFailed, 0 - jumpifhalverset TARGET, 32, BattleScript_1D9037 + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected attackanimation waitanimation - setbyte gUnknown_02024D1F + 0x2, 3 - seteffecttarget - jump BattleScript_EndTurn + setmoveeffect EFFECT_BURN + seteffectprimary + goto BattleScript_MoveEnd -BattleScript_1D855B: @ 81D855B - copyarray gEffectBank, gBankTarget, 1 - setbyte gUnknown_02024D1F + 0x4, 0 - callatk BattleScript_BRNPrevention - jump BattleScript_EndTurn +BattleScript_WaterVeilPrevents: @ 81D855B + copybyte gEffectBank, gBankTarget + setbyte cMULTISTRING_CHOOSER, 0 + call BattleScript_BRNPrevention + goto BattleScript_MoveEnd -BattleScript_1D8575: @ 81D8575 +BattleScript_AlreadyBurned: @ 81D8575 pause 32 printstring BATTLE_TEXT_AlreadyBurned waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Memento: @ 81D8583 +BattleScript_EffectMemento: @ 81D8583 attackcanceler - jumpifbyte 0, gUnknown_02024D1F + 0x5, 1, BattleScript_1D860A + jumpifbyte EQUAL, gUnknown_02024D1F + 0x5, 1, BattleScript_1D860A attackstring ppreduce jumpifattackandspecialattackcannotfall BattleScript_ButItFailed - setuserhptozero + setatkhptozero attackanimation waitanimation - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D85FF - setbyte gSharedMem + 0x160DC, 0 + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_1D85FF + setbyte sFIELD_1B, 0 playstatchangeanimation TARGET, 18, 7 playstatchangeanimation TARGET, 2, 3 - setbyte gSharedMem + 0x1601E, 161 + setstatchanger ATTACK, 2, TRUE statbuffchange 1, BattleScript_1D85D0 - jumpifbyte 2, gUnknown_02024D1F + 0x4, 1, BattleScript_1D85D0 - printfromtable BattleTextList_40157C + jumpifbyte GREATER_THAN, cMULTISTRING_CHOOSER, 1, BattleScript_1D85D0 + printfromtable gStatDownStringIds waitmessage 64 BattleScript_1D85D0: @ 81D85D0 playstatchangeanimation TARGET, 16, 3 - setbyte gSharedMem + 0x1601E, 164 + setstatchanger SP_ATTACK, 2, TRUE statbuffchange 1, BattleScript_1D85F3 - jumpifbyte 2, gUnknown_02024D1F + 0x4, 1, BattleScript_1D85F3 - printfromtable BattleTextList_40157C + jumpifbyte GREATER_THAN, cMULTISTRING_CHOOSER, 1, BattleScript_1D85F3 + printfromtable gStatDownStringIds waitmessage 64 BattleScript_1D85F3: @ 81D85F3 - faintpokemon USER, 0, 0x0 - jump BattleScript_EndTurn + tryfaintmon USER, FALSE, NULL + goto BattleScript_MoveEnd BattleScript_1D85FF: @ 81D85FF printstring BATTLE_TEXT_NoEffect waitmessage 64 - jump BattleScript_1D85F3 + goto BattleScript_1D85F3 BattleScript_1D860A: @ 81D860A attackstring @@ -2347,41 +2344,41 @@ BattleScript_1D860A: @ 81D860A jumpifattackandspecialattackcannotfall BattleScript_1D8611 BattleScript_1D8611: @ 81D8611 - setuserhptozero + setatkhptozero pause 64 - missmessage + effectivenesssound resultmessage waitmessage 64 - faintpokemon USER, 0, 0x0 - jump BattleScript_EndTurn + tryfaintmon USER, FALSE, NULL + goto BattleScript_MoveEnd -MoveEffect_Facade: @ 81D8626 - jumpifstatus USER, PSN | BRN | PAR | TOX, BattleScript_1D8635 - jump BattleScript_1D6F14 +BattleScript_EffectFacade: @ 81D8626 + jumpifstatus USER, PSN | BRN | PAR | TOX, BattleScript_FacadeDoubleDmg + goto BattleScript_EffectHit -BattleScript_1D8635: @ 81D8635 - setbyte gSharedMem + 0x1601F, 2 - jump BattleScript_1D6F14 +BattleScript_FacadeDoubleDmg: @ 81D8635 + setbyte sDMG_MULTIPLIER, 2 + goto BattleScript_EffectHit -MoveEffect_FocusPunch: @ 81D8640 +BattleScript_EffectFocusPunch: @ 81D8640 attackcanceler - jumpifnodamage BattleScript_1D6F3B + jumpifnodamage BattleScript_HitFromAccCheck ppreduce printstring BATTLE_TEXT_LostFocus waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Smellingsalt: @ 81D8652 - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D6F14 - setbyte gUnknown_02024D1F + 0x2, 164 - jumpifstatus TARGET, PAR, BattleScript_1D8671 - jump BattleScript_1D6F14 +BattleScript_EffectSmellingsalt: @ 81D8652 + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_EffectHit + setmoveeffect EFFECT_REMOVE_PARALYSIS | CERTAIN + jumpifstatus TARGET, PAR, BattleScript_SmellingsaltDoubleDmg + goto BattleScript_EffectHit -BattleScript_1D8671: @ 81D8671 - setbyte gSharedMem + 0x1601F, 2 - jump BattleScript_1D6F14 +BattleScript_SmellingsaltDoubleDmg: @ 81D8671 + setbyte sDMG_MULTIPLIER, 2 + goto BattleScript_EffectHit -MoveEffect_FollowMe: @ 81D867C +BattleScript_EffectFollowMe: @ 81D867C attackcanceler attackstring ppreduce @@ -2390,9 +2387,9 @@ MoveEffect_FollowMe: @ 81D867C waitanimation printstring BATTLE_TEXT_CenterAttention waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_NaturePower: @ 81D868D +BattleScript_EffectNaturePower: @ 81D868D attackcanceler attackstring pause 32 @@ -2401,7 +2398,7 @@ MoveEffect_NaturePower: @ 81D868D waitmessage 64 return -MoveEffect_Charge: @ 81D869A +BattleScript_EffectCharge: @ 81D869A attackcanceler attackstring ppreduce @@ -2410,225 +2407,225 @@ MoveEffect_Charge: @ 81D869A waitanimation printstring BATTLE_TEXT_ChargingPower waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Taunt: @ 81D86AB +BattleScript_EffectTaunt: @ 81D86AB attackcanceler attackstring ppreduce - accuracycheck BattleScript_ButItFailed, 0 + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE settaunt BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_TauntFell waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_HelpingHand: @ 81D86C7 +BattleScript_EffectHelpingHand: @ 81D86C7 attackcanceler attackstring ppreduce - sethelpinghand BattleScript_ButItFailed + trysethelpinghand BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_ReadyToHelp waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Trick: @ 81D86DC +BattleScript_EffectTrick: @ 81D86DC attackcanceler attackstring ppreduce - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - accuracycheck BattleScript_ButItFailed, 0 - itemswap BattleScript_ButItFailed + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE + tryswapitems BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_SwitchedItems waitmessage 64 - printfromtable BattleTextList_401642 + printfromtable gItemSwapStringIds waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_RolePlay: @ 81D870A +BattleScript_EffectRolePlay: @ 81D870A attackcanceler attackstring ppreduce - accuracycheck BattleScript_ButItFailed, 65535 - copyability BattleScript_ButItFailed + accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON + trycopyability BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_CopiedObject waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Wish: @ 81D8726 +BattleScript_EffectWish: @ 81D8726 attackcanceler attackstring ppreduce - atkd4 0, BattleScript_ButItFailed + trywish 0, BattleScript_ButItFailed attackanimation waitanimation - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Assist: @ 81D8736 +BattleScript_EffectAssist: @ 81D8736 attackcanceler attackstring - assistattackselect BattleScript_1D83D5 + assistattackselect BattleScript_ButItFailedPpReduce attackanimation waitanimation - setbyte gSharedMem + 0x16002, 0 - setbyte gSharedMem + 0x160A1, 0 - jumptoattack USER + setbyte sANIM_TURN, 0 + setbyte sANIM_TARGETS_HIT, 0 + jumptorandomattack USER -MoveEffect_Ingrain: @ 81D874D +BattleScript_EffectIngrain: @ 81D874D attackcanceler attackstring ppreduce - setroots BattleScript_ButItFailed + trysetroots BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_PlantedRoots waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Superpower: @ 81D8762 - setbyte gUnknown_02024D1F + 0x2, 229 - jump BattleScript_1D6F14 +BattleScript_EffectSuperpower: @ 81D8762 + setmoveeffect EFFECT_ATK_DEF_DOWN | AFFECTS_USER | CERTAIN + goto BattleScript_EffectHit -MoveEffect_MagicCoat: @ 81D876D +BattleScript_EffectMagicCoat: @ 81D876D attackcanceler - setmagiccoat BattleScript_1D83D4 + trysetmagiccoat BattleScript_ButItFailedAtkStringPpReduce attackstring ppreduce attackanimation waitanimation printstring BATTLE_TEXT_ShroudedItself waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Recycle: @ 81D8782 +BattleScript_EffectRecycle: @ 81D8782 attackcanceler attackstring ppreduce - recycleitem BattleScript_ButItFailed + tryrecycleitem BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_FoundOne waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Revenge: @ 81D8797 +BattleScript_EffectRevenge: @ 81D8797 doubledamagedealtifdamaged - jump BattleScript_1D6F14 + goto BattleScript_EffectHit -MoveEffect_BrickBreak: @ 81D879D +BattleScript_EffectBrickBreak: @ 81D879D attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce - removereflectlightscreen + removelightscreenreflect critcalc - atk5 - atk6 - atk7 - jumpifbyte 0, gSharedMem + 0x16002, 0, BattleScript_1D87BD + damagecalc + typecalc + adjustnormaldamage + jumpifbyte EQUAL, sANIM_TURN, 0, BattleScript_BrickBreakAnim bicbyte gBattleMoveFlags, 9 -BattleScript_1D87BD: @ 81D87BD +BattleScript_BrickBreakAnim: @ 81D87BD attackanimation waitanimation - jumpifbyte 3, gSharedMem + 0x16002, 2, BattleScript_1D87D0 + jumpifbyte LESS_THAN, sANIM_TURN, 2, BattleScript_BrickBreakDoHit printstring BATTLE_TEXT_BrokeWall waitmessage 64 -BattleScript_1D87D0: @ 81D87D0 - damagecalc2 - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET +BattleScript_BrickBreakDoHit: @ 81D87D0 + typecalc2 + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET critmessage waitmessage 64 resultmessage waitmessage 64 - seteffectwithchancetarget - faintpokemon TARGET, 0, 0x0 - jump BattleScript_EndTurn + seteffectwithchance + tryfaintmon TARGET, FALSE, NULL + goto BattleScript_MoveEnd -MoveEffect_Yawn: @ 81D87EE +BattleScript_EffectYawn: @ 81D87EE attackcanceler attackstring ppreduce - jumpifability TARGET, ABILITY_VITAL_SPIRIT, BattleScript_1D882F - jumpifability TARGET, ABILITY_INSOMNIA, BattleScript_1D882F - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - jumpifhalverset TARGET, 32, BattleScript_1D9037 - accuracycheck BattleScript_ButItFailed, 65535 - jumpifcannotsleep BattleScript_ButItFailed + jumpifability TARGET, ABILITY_VITAL_SPIRIT, BattleScript_PrintBankAbilityMadeIneffective + jumpifability TARGET, ABILITY_INSOMNIA, BattleScript_PrintBankAbilityMadeIneffective + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected + accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON + jumpifcantmakeasleep BattleScript_ButItFailed setyawn BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_DrowsyMade waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D882F: @ 81D882F - copyarray gSharedMem + 0x16003, gSharedMem + 0x160F8, 1 +BattleScript_PrintBankAbilityMadeIneffective: @ 81D882F + copybyte sBANK, sBANK_WITH_ABILITY -BattleScript_1D8839: @ 81D8839 +BattleScript_PrintAbilityMadeIneffective: @ 81D8839 pause 32 printstring BATTLE_TEXT_MadeIneffective2 waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_KnockOff: @ 81D8847 - setbyte gUnknown_02024D1F + 0x2, 54 - jump BattleScript_1D6F14 +BattleScript_EffectKnockOff: @ 81D8847 + setmoveeffect EFFECT_KNOCK_OFF + goto BattleScript_EffectHit -MoveEffect_Endeavor: @ 81D8852 +BattleScript_EffectEndeavor: @ 81D8852 attackcanceler attackstring ppreduce setdamagetohealthdifference BattleScript_ButItFailed - copyarray gHP_dealt, gBattleMoveDamage, 4 - accuracycheck BattleScript_1D6F77, 0 - atk6 - jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D6F48 - bicbyte gBattleMoveFlags, 6 - copyarray gBattleMoveDamage, gHP_dealt, 4 - atk69 - jump BattleScript_1D6F48 - -MoveEffect_Eruption: @ 81D888D + copyword gHP_dealt, gBattleMoveDamage + accuracycheck BattleScript_MoveMissed, ACC_CURR_MOVE + typecalc + jumpifmovehadnoeffect BattleScript_HitFromAtkAnimation + bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE + copyword gBattleMoveDamage, gHP_dealt + adjustsetdamage + goto BattleScript_HitFromAtkAnimation + +BattleScript_EffectEruption: @ 81D888D scaledamagebyhealthratio - jump BattleScript_1D6F14 + goto BattleScript_EffectHit -MoveEffect_SkillSwap: @ 81D8893 +BattleScript_EffectSkillSwap: @ 81D8893 attackcanceler attackstring ppreduce - accuracycheck BattleScript_ButItFailed, 65535 - abilityswap BattleScript_ButItFailed + accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON + tryswapabilities BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_AbilitySwap waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Imprison: @ 81D88AF +BattleScript_EffectImprison: @ 81D88AF attackcanceler attackstring ppreduce - imprisoneffect BattleScript_ButItFailed + tryimprision BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_SealedMove waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Refresh: @ 81D88C4 +BattleScript_EffectRefresh: @ 81D88C4 attackcanceler attackstring ppreduce @@ -2637,23 +2634,23 @@ MoveEffect_Refresh: @ 81D88C4 waitanimation printstring BATTLE_TEXT_StatusNormal waitmessage 64 - atk98 1 - jump BattleScript_EndTurn + updatestatusicon USER + goto BattleScript_MoveEnd -MoveEffect_Grudge: @ 81D88DB +BattleScript_EffectGrudge: @ 81D88DB attackcanceler attackstring ppreduce - setgrudge BattleScript_ButItFailed + trysetgrudge BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_GrudgeBear waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Snatch: @ 81D88F0 +BattleScript_EffectSnatch: @ 81D88F0 attackcanceler - setstealstatchange BattleScript_1D83D4 + trysetsnatch BattleScript_ButItFailedAtkStringPpReduce attackstring ppreduce attackanimation @@ -2661,267 +2658,267 @@ MoveEffect_Snatch: @ 81D88F0 pause 32 printstring BATTLE_TEXT_AwaitMove waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_LowKick: @ 81D8908 +BattleScript_EffectLowKick: @ 81D8908 attackcanceler attackstring ppreduce weightdamagecalculation - accuracycheck BattleScript_1D6F77, 0 - jump BattleScript_1D6F44 + accuracycheck BattleScript_MoveMissed, ACC_CURR_MOVE + goto BattleScript_HitFromCritCalc -MoveEffect_SecretPower: @ 81D8918 - naturepowereffect - jump BattleScript_1D6F14 +BattleScript_EffectSecretPower: @ 81D8918 + getsecretpowereffect + goto BattleScript_EffectHit -MoveEffect_DoubleEdge: @ 81D891E - setbyte gUnknown_02024D1F + 0x2, 230 - jump BattleScript_1D6F14 +BattleScript_EffectDoubleEdge: @ 81D891E + setmoveeffect EFFECT_RECOIL_33_PARALYSIS | AFFECTS_USER | CERTAIN + goto BattleScript_EffectHit -MoveEffect_TeeterDance: @ 81D8929 +BattleScript_EffectTeeterDance: @ 81D8929 attackcanceler attackstring ppreduce setbyte gBankTarget, 0 -BattleScript_1D8932: @ 81D8932 - atk25 - setbyte gUnknown_02024D1F + 0x2, 7 - jumpifarrayequal gBankAttacker, gBankTarget, 1, BattleScript_1D8978 - jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D8996 - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D89B2 - jumpifsecondarytstatus TARGET, S_CONFUSED, BattleScript_1D89C0 - accuracycheck BattleScript_1D89CE, 0 - jumpifhalverset TARGET, 32, BattleScript_1D89A4 +BattleScript_TeeterDanceLoop: @ 81D8932 + movevaluescleanup + setmoveeffect EFFECT_CONFUSION + jumpifbyteequal gBankAttacker, gBankTarget, BattleScript_TeeterDanceDoMoveEndIncrement + jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_TeeterDanceLoopIncrement + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_TeeterDanceSubstitutePrevents + jumpifstatus2 TARGET, STATUS2_CONFUSION, BattleScript_TeeterDanceAlreadyConfused + accuracycheck BattleScript_TeeterDanceMissed, ACC_CURR_MOVE + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_TeeterDanceSafeguardProtected attackanimation waitanimation - seteffecttarget + seteffectprimary resultmessage waitmessage 64 -BattleScript_1D8978: @ 81D8978 - setbyte gSharedMem + 0x1600C, 0 - atk49 2, 16 +BattleScript_TeeterDanceDoMoveEndIncrement: @ 81D8978 + setbyte sMOVEEND_STATE, 0 + moveend 2, 16 addbyte gBankTarget, 1 - jumpifarraynotequal gBankTarget, gNoOfAllBanks, 1, BattleScript_1D8932 + jumpifbytenotequal gBankTarget, gNoOfAllBanks, BattleScript_TeeterDanceLoop end -BattleScript_1D8996: @ 81D8996 +BattleScript_TeeterDanceLoopIncrement: @ 81D8996 pause 32 printstring BATTLE_TEXT_PreventedConfusion waitmessage 64 - jump BattleScript_1D8978 + goto BattleScript_TeeterDanceDoMoveEndIncrement -BattleScript_1D89A4: @ 81D89A4 +BattleScript_TeeterDanceSafeguardProtected: @ 81D89A4 pause 32 printstring BATTLE_TEXT_SafeguardActive waitmessage 64 - jump BattleScript_1D8978 + goto BattleScript_TeeterDanceDoMoveEndIncrement -BattleScript_1D89B2: @ 81D89B2 +BattleScript_TeeterDanceSubstitutePrevents: @ 81D89B2 pause 32 printstring BATTLE_TEXT_Failed waitmessage 64 - jump BattleScript_1D8978 + goto BattleScript_TeeterDanceDoMoveEndIncrement -BattleScript_1D89C0: @ 81D89C0 +BattleScript_TeeterDanceAlreadyConfused: @ 81D89C0 pause 32 printstring BATTLE_TEXT_AlreadyConfused waitmessage 64 - jump BattleScript_1D8978 + goto BattleScript_TeeterDanceDoMoveEndIncrement -BattleScript_1D89CE: @ 81D89CE +BattleScript_TeeterDanceMissed: @ 81D89CE resultmessage waitmessage 64 - jump BattleScript_1D8978 + goto BattleScript_TeeterDanceDoMoveEndIncrement -MoveEffect_MudSport: @ 81D89D7 -MoveEffect_WaterSport: @ 81D89D7 +BattleScript_EffectMudSport: @ 81D89D7 +BattleScript_EffectWaterSport: @ 81D89D7 attackcanceler attackstring ppreduce settypebasedhalvers BattleScript_ButItFailed attackanimation waitanimation - printfromtable BattleTextList_4015D4 + printfromtable gSportsUsedStringIds waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_PoisonFang: @ 81D89EE - setbyte gUnknown_02024D1F + 0x2, 6 - jump BattleScript_1D6F14 +BattleScript_EffectPoisonFang: @ 81D89EE + setmoveeffect EFFECT_TOXIC + goto BattleScript_EffectHit -MoveEffect_WeatherBall: @ 81D89F9 - seteffectbyweather - jump BattleScript_1D6F14 +BattleScript_EffectWeatherBall: @ 81D89F9 + setweatherballtype + goto BattleScript_EffectHit -MoveEffect_Overheat: @ 81D89FF - setbyte gUnknown_02024D1F + 0x2, 251 - jump BattleScript_1D6F14 +BattleScript_EffectOverheat: @ 81D89FF + setmoveeffect EFFECT_SP_ATK_TWO_DOWN | AFFECTS_USER | CERTAIN + goto BattleScript_EffectHit -MoveEffect_Tickle: @ 81D8A0A +BattleScript_EffectTickle: @ 81D8A0A attackcanceler attackstring ppreduce - jumpifstat TARGET, 2, 1, 0, BattleScript_1D8A1F - jumpifstat TARGET, 0, 2, 0, BattleScript_1D8A7D + jumpifstat TARGET, GREATER_THAN, ATTACK, 0, BattleScript_TickleDoMoveAnim + jumpifstat TARGET, EQUAL, DEFENSE, 0, BattleScript_CantLowerMultipleStats -BattleScript_1D8A1F: @ 81D8A1F - accuracycheck BattleScript_ButItFailed, 0 +BattleScript_TickleDoMoveAnim: @ 81D8A1F + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE attackanimation waitanimation - setbyte gSharedMem + 0x160DC, 0 + setbyte sFIELD_1B, 0 playstatchangeanimation TARGET, 6, 5 playstatchangeanimation TARGET, 2, 1 - setbyte gSharedMem + 0x1601E, 145 - statbuffchange 1, BattleScript_1D8A55 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8A55 - printfromtable BattleTextList_40157C + setstatchanger ATTACK, 1, TRUE + statbuffchange 1, BattleScript_TickleTryLowerDef + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_TickleTryLowerDef + printfromtable gStatDownStringIds waitmessage 64 -BattleScript_1D8A55: @ 81D8A55 +BattleScript_TickleTryLowerDef: @ 81D8A55 playstatchangeanimation TARGET, 4, 1 - setbyte gSharedMem + 0x1601E, 146 - statbuffchange 1, BattleScript_1D8A78 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8A78 - printfromtable BattleTextList_40157C + setstatchanger DEFENSE, 1, TRUE + statbuffchange 1, BattleScript_TickleEnd + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_TickleEnd + printfromtable gStatDownStringIds waitmessage 64 -BattleScript_1D8A78: @ 81D8A78 - jump BattleScript_EndTurn +BattleScript_TickleEnd: @ 81D8A78 + goto BattleScript_MoveEnd -BattleScript_1D8A7D: @ 81D8A7D +BattleScript_CantLowerMultipleStats: @ 81D8A7D pause 32 - orbyte gBattleMoveFlags, 32 + orbyte gBattleMoveFlags, MOVESTATUS_FAILED printstring BATTLE_TEXT_StatNoLower waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_CosmicPower: @ 81D8A91 +BattleScript_EffectCosmicPower: @ 81D8A91 attackcanceler attackstring ppreduce - jumpifstat USER, 3, 2, 12, BattleScript_1D8AA6 - jumpifstat USER, 0, 5, 12, BattleScript_1D8BCB + jumpifstat USER, LESS_THAN, DEFENSE, 12, BattleScript_CosmicPowerDoMoveAnim + jumpifstat USER, EQUAL, SP_DEFENSE, 12, BattleScript_CantRaiseMultipleStats -BattleScript_1D8AA6: @ 81D8AA6 +BattleScript_CosmicPowerDoMoveAnim: @ 81D8AA6 attackanimation waitanimation - setbyte gSharedMem + 0x160DC, 0 + setbyte sFIELD_1B, 0 playstatchangeanimation USER, 36, 0 - setbyte gSharedMem + 0x1601E, 18 - statbuffchange 65, BattleScript_1D8AD1 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8AD1 - printfromtable BattleTextList_401570 + setstatchanger DEFENSE, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_CosmicPowerTrySpDef + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_CosmicPowerTrySpDef + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D8AD1: @ 81D8AD1 - setbyte gSharedMem + 0x1601E, 21 - statbuffchange 65, BattleScript_1D8AF0 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8AF0 - printfromtable BattleTextList_401570 +BattleScript_CosmicPowerTrySpDef: @ 81D8AD1 + setstatchanger SP_DEFENSE, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_CosmicPowerEnd + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_CosmicPowerEnd + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D8AF0: @ 81D8AF0 - jump BattleScript_EndTurn +BattleScript_CosmicPowerEnd: @ 81D8AF0 + goto BattleScript_MoveEnd -MoveEffect_SkyUppercut: @ 81D8AF5 - orword gHitMarker, 0x10000 - jump BattleScript_1D6F14 +BattleScript_EffectSkyUppercut: @ 81D8AF5 + orword gHitMarker, HITMARKER_IGNORE_ON_AIR + goto BattleScript_EffectHit -MoveEffect_BulkUp: @ 81D8B03 +BattleScript_EffectBulkUp: @ 81D8B03 attackcanceler attackstring ppreduce - jumpifstat USER, 3, 1, 12, BattleScript_1D8B18 - jumpifstat USER, 0, 2, 12, BattleScript_1D8BCB + jumpifstat USER, LESS_THAN, ATTACK, 12, BattleScript_BulkUpDoMoveAnim + jumpifstat USER, EQUAL, DEFENSE, 12, BattleScript_CantRaiseMultipleStats -BattleScript_1D8B18: @ 81D8B18 +BattleScript_BulkUpDoMoveAnim: @ 81D8B18 attackanimation waitanimation - setbyte gSharedMem + 0x160DC, 0 + setbyte sFIELD_1B, 0 playstatchangeanimation USER, 6, 0 - setbyte gSharedMem + 0x1601E, 17 - statbuffchange 65, BattleScript_1D8B43 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8B43 - printfromtable BattleTextList_401570 + setstatchanger ATTACK, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_BulkUpTryDef + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_BulkUpTryDef + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D8B43: @ 81D8B43 - setbyte gSharedMem + 0x1601E, 18 - statbuffchange 65, BattleScript_1D8B62 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8B62 - printfromtable BattleTextList_401570 +BattleScript_BulkUpTryDef: @ 81D8B43 + setstatchanger DEFENSE, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_BulkUpEnd + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_BulkUpEnd + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D8B62: @ 81D8B62 - jump BattleScript_EndTurn +BattleScript_BulkUpEnd: @ 81D8B62 + goto BattleScript_MoveEnd -MoveEffect_CalmMind: @ 81D8B67 +BattleScript_EffectCalmMind: @ 81D8B67 attackcanceler attackstring ppreduce - jumpifstat USER, 3, 4, 12, BattleScript_1D8B7C - jumpifstat USER, 0, 5, 12, BattleScript_1D8BCB + jumpifstat USER, LESS_THAN, SP_ATTACK, 12, BattleScript_CalmMindDoMoveAnim + jumpifstat USER, EQUAL, SP_DEFENSE, 12, BattleScript_CantRaiseMultipleStats -BattleScript_1D8B7C: @ 81D8B7C +BattleScript_CalmMindDoMoveAnim: @ 81D8B7C attackanimation waitanimation - setbyte gSharedMem + 0x160DC, 0 + setbyte sFIELD_1B, 0 playstatchangeanimation USER, 48, 0 - setbyte gSharedMem + 0x1601E, 20 - statbuffchange 65, BattleScript_1D8BA7 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8BA7 - printfromtable BattleTextList_401570 + setstatchanger SP_ATTACK, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_CalmMindTrySpDef + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_CalmMindTrySpDef + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D8BA7: @ 81D8BA7 - setbyte gSharedMem + 0x1601E, 21 - statbuffchange 65, BattleScript_1D8BC6 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8BC6 - printfromtable BattleTextList_401570 +BattleScript_CalmMindTrySpDef: @ 81D8BA7 + setstatchanger SP_DEFENSE, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_CalmMindEnd + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_CalmMindEnd + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D8BC6: @ 81D8BC6 - jump BattleScript_EndTurn +BattleScript_CalmMindEnd: @ 81D8BC6 + goto BattleScript_MoveEnd -BattleScript_1D8BCB: @ 81D8BCB +BattleScript_CantRaiseMultipleStats: @ 81D8BCB pause 32 - orbyte gBattleMoveFlags, 32 + orbyte gBattleMoveFlags, MOVESTATUS_FAILED printstring BATTLE_TEXT_StatNoHigher waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_DragonDance: @ 81D8BDF +BattleScript_EffectDragonDance: @ 81D8BDF attackcanceler attackstring ppreduce - jumpifstat USER, 3, 1, 12, BattleScript_1D8BF4 - jumpifstat USER, 0, 3, 12, BattleScript_1D8BCB + jumpifstat USER, LESS_THAN, ATTACK, 12, BattleScript_DragonDanceDoMoveAnim + jumpifstat USER, EQUAL, SPEED, 12, BattleScript_CantRaiseMultipleStats -BattleScript_1D8BF4: @ 81D8BF4 +BattleScript_DragonDanceDoMoveAnim: @ 81D8BF4 attackanimation waitanimation - setbyte gSharedMem + 0x160DC, 0 + setbyte sFIELD_1B, 0 playstatchangeanimation USER, 10, 0 - setbyte gSharedMem + 0x1601E, 17 - statbuffchange 65, BattleScript_1D8C1F - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8C1F - printfromtable BattleTextList_401570 + setstatchanger ATTACK, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_DragonDanceTrySpeed + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_DragonDanceTrySpeed + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D8C1F: @ 81D8C1F - setbyte gSharedMem + 0x1601E, 19 - statbuffchange 65, BattleScript_1D8C3E - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8C3E - printfromtable BattleTextList_401570 +BattleScript_DragonDanceTrySpeed: @ 81D8C1F + setstatchanger SPEED, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_DragonDanceEnd + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_DragonDanceEnd + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D8C3E: @ 81D8C3E - jump BattleScript_EndTurn +BattleScript_DragonDanceEnd: @ 81D8C3E + goto BattleScript_MoveEnd -MoveEffect_Camouflage: @ 81D8C43 +BattleScript_EffectCamouflage: @ 81D8C43 attackcanceler attackstring ppreduce @@ -2930,142 +2927,142 @@ MoveEffect_Camouflage: @ 81D8C43 waitanimation printstring BATTLE_TEXT_TypeTransform waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -gUnknown_081D8C58:: @ 81D8C58 - atk56 1 +BattleScript_FaintAttacker:: @ 81D8C58 + playfaintcry USER pause 64 - atk1a 1 - atk1b 1 + dofaintanimation USER + cleareffectsonfaint USER printstring BATTLE_TEXT_AttackingFainted return -gUnknown_081D8C65:: @ 81D8C65 - atk56 0 +BattleScript_FaintTarget:: @ 81D8C65 + playfaintcry TARGET pause 64 - atk1a 0 - atk1b 0 + dofaintanimation TARGET + cleareffectsonfaint TARGET printstring BATTLE_TEXT_DefendingFainted return -gUnknown_081D8C72:: @ 81D8C72 - setbyte gSharedMem + 0x1600F, 0 - atk23 0 +BattleScript_GiveExp:: @ 81D8C72 + setbyte sGIVEEXP_STATE, 0 + getexp TARGET end2 -gUnknown_081D8C7B:: @ 81D8C7B +BattleScript_HandleFaintedMon:: @ 81D8C7B atk24 BattleScript_1D8D87 - jumpifbyte 1, gBattleOutcome, 0, BattleScript_1D8D86 - jumpifhalfword 4, gBattleTypeFlags, 8, BattleScript_1D8CC2 - jumpifword 5, gHitMarker, 0x400000, BattleScript_1D8CC2 + jumpifbyte NOT_EQUAL, gBattleOutcome, 0, BattleScript_FaintedMonEnd + jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonTryChooseAnother + jumpifword NO_COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonTryChooseAnother printstring BATTLE_TEXT_UseNext setbyte gBattleCommunication, 0 - atk67 - jumpifbyte 0, gUnknown_02024D1F, 0, BattleScript_1D8CC2 - atk72 BattleScript_1D8D86 + yesnobox + jumpifbyte EQUAL, gUnknown_02024D1F, 0, BattleScript_FaintedMonTryChooseAnother + jumpifplayerran BattleScript_FaintedMonEnd printstring BATTLE_TEXT_CantEscape -BattleScript_1D8CC2: @ 81D8CC2 - openpartyscreen 3, BattleScript_1D8D86 - atk51 3, 2 - jumpifhalfword 5, gBattleTypeFlags, 8, BattleScript_1D8D66 - jumpifhalfword 4, gBattleTypeFlags, 2, BattleScript_1D8D66 - jumpifhalfword 4, gBattleTypeFlags, 256, BattleScript_1D8D66 - jumpifhalfword 4, gBattleTypeFlags, 1, BattleScript_1D8D66 - jumpifword 4, gHitMarker, 0x400000, BattleScript_1D8D66 - jumpifbyte 0, gSharedMem + 0x16084, 1, BattleScript_1D8D66 - jumpifcannotswitch USER, BattleScript_1D8D66 +BattleScript_FaintedMonTryChooseAnother: @ 81D8CC2 + openpartyscreen 3, BattleScript_FaintedMonEnd + switchhandleorder 3, 2 + jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonChooseAnother + jumpifbattletype BATTLE_TYPE_LINK, BattleScript_FaintedMonChooseAnother + jumpifbattletype BATTLE_TYPE_BATTLE_TOWER, BattleScript_FaintedMonChooseAnother + jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonChooseAnother + jumpifword COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonChooseAnother + jumpifbyte EQUAL, sBATTLE_STYLE, 1, BattleScript_FaintedMonChooseAnother + jumpifcantswitch USER, BattleScript_FaintedMonChooseAnother printstring BATTLE_TEXT_WillSwitch setbyte gBattleCommunication, 0 - atk67 - jumpifbyte 0, gUnknown_02024D1F, 1, BattleScript_1D8D66 - atk6e - openpartyscreen 129, BattleScript_1D8D66 - atk51 USER, 2 - jumpifbyte 0, gBattleCommunication, 6, BattleScript_1D8D66 - atk6b - atk76 USER, 5 - atk74 1 + yesnobox + jumpifbyte EQUAL, gUnknown_02024D1F, 1, BattleScript_FaintedMonChooseAnother + setatktoplayer0 + openpartyscreen 129, BattleScript_FaintedMonChooseAnother + switchhandleorder USER, 2 + jumpifbyte EQUAL, gBattleCommunication, 6, BattleScript_FaintedMonChooseAnother + atknameinbuff1 + resetintrimidatetracebits USER + hpthresholds2 USER printstring 2 - atke2 USER - waitstateatk - atk4b - waitstateatk - atk61 1 - switch1 USER - switch2 USER - atk73 USER + switchoutabilities USER + waitstate + returnatktoball + waitstate + drawpartystatussummary 1 + getswitchedmondata USER + switchindataupdate USER + hpthresholds USER printstring 3 atk62 1 - switch3 USER, 0 - waitstateatk - atk52 USER - atk6d - -BattleScript_1D8D66: @ 81D8D66 - atk61 3 - switch1 3 - switch2 3 - atk73 3 + switchinanim USER, 0 + waitstate + switchineffects USER + resetsentmonsvalue + +BattleScript_FaintedMonChooseAnother: @ 81D8D66 + drawpartystatussummary 3 + getswitchedmondata 3 + switchindataupdate 3 + hpthresholds 3 printstring 3 atk62 3 - switch3 3, 0 - waitstateatk - atk52 3 - jumpifhalfword 4, gBattleTypeFlags, 1, BattleScript_1D8D86 - atk68 + switchinanim 3, 0 + waitstate + switchineffects 3 + jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonEnd + cancelallactions -BattleScript_1D8D86: @ 81D8D86 +BattleScript_FaintedMonEnd: @ 81D8D86 end2 BattleScript_1D8D87: @ 81D8D87 openpartyscreen 5, BattleScript_1D8D8D BattleScript_1D8D8D: @ 81D8D8D - atk51 3, 0 + switchhandleorder 3, 0 openpartyscreen 6, BattleScript_1D8DBD - atk51 3, 0 + switchhandleorder 3, 0 BattleScript_1D8D99: @ 81D8D99 - atk51 3, 2 - atk61 3 - switch1 3 - switch2 3 - atk73 3 + switchhandleorder 3, 2 + drawpartystatussummary 3 + getswitchedmondata 3 + switchindataupdate 3 + hpthresholds 3 printstring 3 atk62 3 - switch3 3, 0 - waitstateatk - atk52 5 - jumpifarraynotequal gBank1, gNoOfAllBanks, 1, BattleScript_1D8D99 + switchinanim 3, 0 + waitstate + switchineffects 5 + jumpifbytenotequal gBank1, gNoOfAllBanks, BattleScript_1D8D99 BattleScript_1D8DBD: @ 81D8DBD end2 -gUnknown_081D8DBE:: @ 81D8DBE +BattleScript_LocalTrainerBattleWon:: @ 81D8DBE printstring BATTLE_TEXT_PlayerDefeatedTrainer2 - atk53 1 - waitstateatk + trainerslidein 1 + waitstate printstring BATTLE_TEXT_UnknownString - atk5d + getmoneyreward printstring BATTLE_TEXT_WinningPrize waitmessage 64 -gUnknown_081D8DCE:: @ 81D8DCE - givemoney - pickupitemcalculation +BattleScript_PayDayMoneyAndPickUpItems:: @ 81D8DCE + givepaydaymoney + pickup end2 -gUnknown_081D8DD1:: @ 81D8DD1 - jumpifhalfword 4, gBattleTypeFlags, 256, BattleScript_1D8E01 - jumpifhalfword 4, gBattleTypeFlags, 2048, BattleScript_1D8E01 - jumpifhalfword 0, gTrainerBattleOpponent, 1024, BattleScript_1D8E01 +BattleScript_LocalBattleLost:: @ 81D8DD1 + jumpifbattletype BATTLE_TYPE_BATTLE_TOWER, BattleScript_LocalBattleLostEnd + jumpifbattletype BATTLE_TYPE_EREADER_TRAINER, BattleScript_LocalBattleLostEnd + jumpifhalfword EQUAL, gTrainerBattleOpponent, 1024, BattleScript_LocalBattleLostEnd printstring BATTLE_TEXT_OutOfUsablePoke waitmessage 64 printstring BATTLE_TEXT_WhitedOut waitmessage 64 -BattleScript_1D8E01: @ 81D8E01 +BattleScript_LocalBattleLostEnd: @ 81D8E01 end2 gUnknown_081D8E02:: @ 81D8E02 @@ -3077,116 +3074,116 @@ gUnknown_081D8E02:: @ 81D8E02 gUnknown_081D8E0D:: @ 81D8E0D printstring BATTLE_TEXT_PlayerDefeatedTrainer2 - atk53 1 - waitstateatk + trainerslidein 1 + waitstate end2 -gUnknown_081D8E14:: @ 81D8E14 - playanimation USER, B_ANIM_SMOKEBALL_ESCAPE, 0x0 +BattleScript_SmokeBallEscape:: @ 81D8E14 + playanimation USER, B_ANIM_SMOKEBALL_ESCAPE, NULL printstring BATTLE_TEXT_FledUsingItem waitmessage 64 end2 -gUnknown_081D8E22:: @ 81D8E22 +BattleScript_RanAwayUsingMonAbility:: @ 81D8E22 printstring BATTLE_TEXT_FledUsingOther waitmessage 64 end2 -gUnknown_081D8E29:: @ 81D8E29 +BattleScript_GotAwaySafely:: @ 81D8E29 printstring BATTLE_TEXT_GotAwaySafely waitmessage 64 end2 -gUnknown_081D8E30:: @ 81D8E30 +BattleScript_WildMonFled:: @ 81D8E30 printstring BATTLE_TEXT_FledWild waitmessage 64 end2 -gUnknown_081D8E37:: @ 81D8E37 +BattleScript_PrintCantRunFromTrainer:: @ 81D8E37 printstring BATTLE_TEXT_NoRunning end2 -gUnknown_081D8E3B:: @ 81D8E3B - printfromtable BattleTextList_401512 +BattleScript_PrintFailedToRunString:: @ 81D8E3B + printfromtable gNoEscapeStringIds waitmessage 64 end2 -gUnknown_081D8E44:: @ 81D8E44 - printfromtable2 BattleTextList_401512 - atk44 +BattleScript_PrintCantEscapeFromBattle:: @ 81D8E44 + printselectionstringfromtable gNoEscapeStringIds + endselectionscript -gUnknown_081D8E4A:: @ 81D8E4A - printstring2 BATTLE_TEXT_BoxFull - atk44 +BattleScript_PrintFullBox:: @ 81D8E4A + printselectionstring BATTLE_TEXT_BoxFull + endselectionscript -gUnknown_081D8E4E:: @ 81D8E4E - atk74 1 +BattleScript_ActionSwitch:: @ 81D8E4E + hpthresholds2 USER printstring 2 - setbyte gSharedMem + 0x1601F, 2 - jumpifbyte 4, gBattleTypeFlags, 1, BattleScript_1D8E6B - atk26 1 - jump BattleScript_1D8E6D + setbyte sDMG_MULTIPLIER, 2 + jumpifbyte COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_DOUBLE, BattleScript_PursuitSwitchDmgSetMultihit + setmultihit 1 + goto BattleScript_PursuitSwitchDmgLoop -BattleScript_1D8E6B: @ 81D8E6B - atk26 2 +BattleScript_PursuitSwitchDmgSetMultihit: @ 81D8E6B + setmultihit 2 -BattleScript_1D8E6D: @ 81D8E6D - atkba BattleScript_1D8E7A +BattleScript_PursuitSwitchDmgLoop: @ 81D8E6D + jumpifnopursuitswitchdmg BattleScript_DoSwitchOut atk5f - atkab - callatk BattleScript_1D8EAD + trysetdestinybondtohappen + call BattleScript_PursuitDmgOnSwitchOut atk5f -BattleScript_1D8E7A: @ 81D8E7A - atk27 BattleScript_1D8E6D - atke2 USER - waitstateatk - atk4b - waitstateatk - atk61 1 - atk51 USER, 1 - switch1 USER - switch2 USER - atk73 USER +BattleScript_DoSwitchOut: @ 81D8E7A + decrementmultihit BattleScript_PursuitSwitchDmgLoop + switchoutabilities USER + waitstate + returnatktoball + waitstate + drawpartystatussummary 1 + switchhandleorder USER, 1 + getswitchedmondata USER + switchindataupdate USER + hpthresholds USER printstring 3 atk62 1 - switch3 USER, 0 - waitstateatk - atk52 USER - setbyte gSharedMem + 0x1600C, 4 - atk49 1, 0 - setbyte gSharedMem + 0x1600C, 15 - atk49 1, 0 + switchinanim USER, 0 + waitstate + switchineffects USER + setbyte sMOVEEND_STATE, 4 + moveend 1, 0 + setbyte sMOVEEND_STATE, 15 + moveend 1, 0 end2 -BattleScript_1D8EAD: @ 81D8EAD +BattleScript_PursuitDmgOnSwitchOut: @ 81D8EAD pause 32 attackstring ppreduce critcalc - atk5 - atk6 - atk7 + damagecalc + typecalc + adjustnormaldamage attackanimation waitanimation - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET critmessage waitmessage 64 resultmessage waitmessage 64 - faintpokemon TARGET, 0, 0x0 - setbyte gSharedMem + 0x1600C, 3 - atk49 2, 6 - atk76 TARGET, 4 - jumpifbyte 0, gBattleCommunication, 0, BattleScript_1D8EEE - setbyte gSharedMem + 0x1600F, 0 - atk23 0 + tryfaintmon TARGET, FALSE, NULL + setbyte sMOVEEND_STATE, 3 + moveend 2, 6 + various TARGET, 4 + jumpifbyte EQUAL, gBattleCommunication, 0, BattleScript_PursuitDmgOnSwitchOutRet + setbyte sGIVEEXP_STATE, 0 + getexp TARGET -BattleScript_1D8EEE: @ 81D8EEE +BattleScript_PursuitDmgOnSwitchOutRet: @ 81D8EEE return BattleScript_Pausex20:: @ 81D8EEF @@ -3194,197 +3191,197 @@ BattleScript_Pausex20:: @ 81D8EEF return BattleScript_LevelUp:: @ 81D8EF3 - atk55 0xe10016f - attackcanceler - setbyte gSharedMem + 0x1609C, 0 - atk6c - checkiflearnmoveinbattle BattleScript_1D8F4F, BattleScript_1D8F61, 1 - jump BattleScript_1D8F19 - -BattleScript_1D8F0F: @ 81D8F0F - checkiflearnmoveinbattle BattleScript_1D8F4F, BattleScript_1D8F61, 0 - -BattleScript_1D8F19: @ 81D8F19 - atk71 + fanfare BGM_FANFA1 + printstring BATTLE_TEXT_GrewLevel + setbyte sLVLBOX_STATE, 0 + drawlvlupbox + handlelearnnewmove BattleScript_LearnedNewMove, BattleScript_LearnMoveReturn, 1 + goto BattleScript_AskToLearnMove + +BattleScript_TryLearnMoveLoop: @ 81D8F0F + handlelearnnewmove BattleScript_LearnedNewMove, BattleScript_LearnMoveReturn, 0 + +BattleScript_AskToLearnMove: @ 81D8F19 + buffermovetolearn printstring BATTLE_TEXT_TryingToLearnMove printstring BATTLE_TEXT_CantLearnMore printstring BATTLE_TEXT_DeleteMove - waitstateatk - setbyte gSharedMem + 0x1601A, 0 - atk5a BattleScript_1D8F46 + waitstate + setbyte sLEARNMOVE_STATE, 0 + yesnoboxlearnmove BattleScript_ForgotAndLearnedNewMove printstring BATTLE_TEXT_StopLearning - waitstateatk - setbyte gSharedMem + 0x1601A, 0 - atk5b BattleScript_1D8F19 + waitstate + setbyte sLEARNMOVE_STATE, 0 + yesnoboxstoplearningmove BattleScript_AskToLearnMove printstring BATTLE_TEXT_DidNotLearn - jump BattleScript_1D8F0F + goto BattleScript_TryLearnMoveLoop -BattleScript_1D8F46: @ 81D8F46 +BattleScript_ForgotAndLearnedNewMove: @ 81D8F46 printstring BATTLE_TEXT_MoveForget123 printstring BATTLE_TEXT_DeletedMove printstring BATTLE_TEXT_MoveForgetAnd -BattleScript_1D8F4F: @ 81D8F4F - atk71 - atk55 0xf10016f - attackcanceler +BattleScript_LearnedNewMove: @ 81D8F4F + buffermovetolearn + fanfare BGM_FANFA1 + printstring BATTLE_TEXT_LearnedMove waitmessage 64 - atk76 USER, 6 - jump BattleScript_1D8F0F + updatechoicemoveonlvlup USER + goto BattleScript_TryLearnMoveLoop -BattleScript_1D8F61: @ 81D8F61 +BattleScript_LearnMoveReturn: @ 81D8F61 return -gUnknown_081D8F62:: @ 81D8F62 - printfromtable BattleTextList_401534 +BattleScript_RainContinuesOrEnds:: @ 81D8F62 + printfromtable gRainContinuesStringIds waitmessage 64 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8F7C - playanimation USER, B_ANIM_RAIN_CONTINUES, 0x0 + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_RainContinuesOrEndsEnd + playanimation USER, B_ANIM_RAIN_CONTINUES, NULL -BattleScript_1D8F7C: @ 81D8F7C +BattleScript_RainContinuesOrEndsEnd: @ 81D8F7C end2 -gUnknown_081D8F7D:: @ 81D8F7D - printfromtable BattleTextList_401528 +BattleScript_DamagingWeatherContinues:: @ 81D8F7D + printfromtable gSandStormHailContinuesStringIds waitmessage 64 - atk46 1, gSharedMem + 0x160A4, 0x0 + playanimation2 USER, sANIM_ARG1, NULL setbyte gBattleCommunication, 0 -BattleScript_1D8F95: @ 81D8F95 - atk32 gBankAttacker, gTurnOrder, gBattleCommunication, 1 +BattleScript_DamagingWeatherLoop: @ 81D8F95 + copyarraywithindex gBankAttacker, gTurnOrder, gBattleCommunication, 1 weatherdamage - jumpifword 0, gBattleMoveDamage, 0x0, BattleScript_1D8FD6 - printfromtable BattleTextList_40152C + jumpifword EQUAL, gBattleMoveDamage, 0x0, BattleScript_DamagingWeatherLoopIncrement + printfromtable gSandStormHailDmgStringIds waitmessage 64 - orword gHitMarker, 0x1100120 - missmessage - atk5c USER - graphicalhpupdate USER + orword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 | HITMARKER_GRUDGE + effectivenesssound + hitanimation USER + healthbarupdate USER datahpupdate USER - faintpokemon USER, 0, 0x0 - atk24 BattleScript_1D8FD6 + tryfaintmon USER, FALSE, NULL + atk24 BattleScript_DamagingWeatherLoopIncrement -BattleScript_1D8FD6: @ 81D8FD6 - jumpifbyte 1, gBattleOutcome, 0, BattleScript_1D8FF5 +BattleScript_DamagingWeatherLoopIncrement: @ 81D8FD6 + jumpifbyte NOT_EQUAL, gBattleOutcome, 0, BattleScript_DamagingWeatherContinuesEnd addbyte gBattleCommunication, 1 - jumpifarraynotequal gBattleCommunication, gNoOfAllBanks, 1, BattleScript_1D8F95 + jumpifbytenotequal gBattleCommunication, gNoOfAllBanks, BattleScript_DamagingWeatherLoop -BattleScript_1D8FF5: @ 81D8FF5 - bicword gHitMarker, 0x1100120 +BattleScript_DamagingWeatherContinuesEnd: @ 81D8FF5 + bicword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 | HITMARKER_GRUDGE end2 -gUnknown_081D8FFF:: @ 81D8FFF - printfromtable BattleTextList_401530 +BattleScript_SandStormHailEnds:: @ 81D8FFF + printfromtable gSandStormHailEndStringIds waitmessage 64 end2 -gUnknown_081D9008:: @ 81D9008 +BattleScript_SunlightContinues:: @ 81D9008 printstring BATTLE_TEXT_SunStrong waitmessage 64 - playanimation USER, B_ANIM_SUN_CONTINUES, 0x0 + playanimation USER, B_ANIM_SUN_CONTINUES, NULL end2 -gUnknown_081D9016:: @ 81D9016 +BattleScript_SunlightFaded:: @ 81D9016 printstring BATTLE_TEXT_SunFaded waitmessage 64 end2 -gUnknown_081D901D:: @ 81D901D - printfromtable BattleTextList_4015EE +BattleScript_OverworldWeatherStarts:: @ 81D901D + printfromtable gWeatherContinuesStringIds waitmessage 64 - atk46 1, gSharedMem + 0x160A4, 0x0 + playanimation2 USER, sANIM_ARG1, NULL end3 -gUnknown_081D9030:: @ 81D9030 +BattleScript_SideStatusWoreOff:: @ 81D9030 printstring BATTLE_TEXT_WoreOff waitmessage 64 end2 -BattleScript_1D9037: @ 81D9037 +BattleScript_SafeguardProtected: @ 81D9037 pause 32 printstring BATTLE_TEXT_SafeguardActive waitmessage 64 end2 -gUnknown_081D9041:: @ 81D9041 +BattleScript_SafeguardEnds:: @ 81D9041 pause 32 printstring BATTLE_TEXT_SafeguardFaded waitmessage 64 end2 BattleScript_LeechSeedTurnDrain:: @ 81D904B - playanimation USER, B_ANIM_LEECH_SEED_DRAIN, gSharedMem + 0x160A4 - orword gHitMarker, 0x100100 - graphicalhpupdate USER + playanimation USER, B_ANIM_LEECH_SEED_DRAIN, sANIM_ARG1 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 + healthbarupdate USER datahpupdate USER - copyarray gBattleMoveDamage, gHP_dealt, 4 - jumpifability USER, ABILITY_LIQUID_OOZE, BattleScript_1D907D + copyword gBattleMoveDamage, gHP_dealt + jumpifability USER, ABILITY_LIQUID_OOZE, BattleScript_LeechSeedTurnPrintLiquidOoze manipulatedamage 0 - setbyte gUnknown_02024D1F + 0x4, 3 - jump BattleScript_1D9083 + setbyte cMULTISTRING_CHOOSER, 3 + goto BattleScript_LeechSeedTurnPrintAndUpdateHp -BattleScript_1D907D: @ 81D907D - setbyte gUnknown_02024D1F + 0x4, 4 +BattleScript_LeechSeedTurnPrintLiquidOoze: @ 81D907D + setbyte cMULTISTRING_CHOOSER, 4 -BattleScript_1D9083: @ 81D9083 - orword gHitMarker, 0x100100 - graphicalhpupdate TARGET +BattleScript_LeechSeedTurnPrintAndUpdateHp: @ 81D9083 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 + healthbarupdate TARGET datahpupdate TARGET - printfromtable BattleTextList_40154C + printfromtable gLeechSeedStringIds waitmessage 64 - faintpokemon USER, 0, 0x0 - faintpokemon TARGET, 0, 0x0 + tryfaintmon USER, FALSE, NULL + tryfaintmon TARGET, FALSE, NULL end2 BattleScript_BideStoringEnergy:: @ 81D90A7 printstring BATTLE_TEXT_StoringEnergy waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_BideAttack:: @ 81D90B2 printstring BATTLE_TEXT_UnleashedEnergy waitmessage 64 - accuracycheck BattleScript_1D6F77, 0 - atk6 - bicbyte gBattleMoveFlags, 6 - copyarray gBattleMoveDamage, gSharedMem + 0x16090, 4 - atk69 - setbyte gSharedMem + 0x16002, 1 + accuracycheck BattleScript_MoveMissed, ACC_CURR_MOVE + typecalc + bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE + copyword gBattleMoveDamage, sBIDE_DMG + adjustsetdamage + setbyte sANIM_TURN, 1 attackanimation waitanimation - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET resultmessage waitmessage 64 - faintpokemon TARGET, 0, 0x0 - jump BattleScript_EndTurn + tryfaintmon TARGET, FALSE, NULL + goto BattleScript_MoveEnd BattleScript_BideNoEnergyToAttack:: @ 81D90F1 printstring BATTLE_TEXT_UnleashedEnergy waitmessage 64 - jump BattleScript_ButItFailed + goto BattleScript_ButItFailed -gUnknown_081D90FC:: @ 81D90FC +BattleScript_SuccessForceOut:: @ 81D90FC attackanimation waitanimation - atke2 TARGET - atk58 TARGET - waitstateatk - jumpifhalfword 4, gBattleTypeFlags, 8, BattleScript_1D9116 + switchoutabilities TARGET + returntoball TARGET + waitstate + jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_TrainerBattleForceOut setbyte gBattleOutcome, 5 - atkf6 + finishaction -BattleScript_1D9116: @ 81D9116 - switch1 TARGET - switch2 TARGET - switch3 TARGET, 0 - waitstateatk +BattleScript_TrainerBattleForceOut: @ 81D9116 + getswitchedmondata TARGET + switchindataupdate TARGET + switchinanim TARGET, 0 + waitstate printstring BATTLE_TEXT_DraggedOut - atk52 TARGET - jump BattleScript_EndTurn + switchineffects TARGET + goto BattleScript_MoveEnd BattleScript_MistProtected:: @ 81D9128 pause 32 @@ -3392,7 +3389,7 @@ BattleScript_MistProtected:: @ 81D9128 waitmessage 64 return -gUnknown_081D9132:: @ 81D9132 +BattleScript_RageIsBuilding:: @ 81D9132 printstring BATTLE_TEXT_RageBuilding waitmessage 64 return @@ -3400,11 +3397,11 @@ gUnknown_081D9132:: @ 81D9132 BattleScript_MoveUsedIsDisabled:: @ 81D9139 printstring BATTLE_TEXT_MoveIsDisabled waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_MoveSelectionDisabledMove:: @ 81D9144 - printstring2 BATTLE_TEXT_MoveIsDisabled - atk44 + printselectionstring BATTLE_TEXT_MoveIsDisabled + endselectionscript BattleScript_DisabledNoMore:: @ 81D9148 printstring BATTLE_TEXT_DisabledNoMore @@ -3416,58 +3413,58 @@ BattleScript_EncoredNoMore:: @ 81D914F waitmessage 64 end2 -gUnknown_081D9156:: @ 81D9156 +BattleScript_DestinyBondTakesLife:: @ 81D9156 printstring BATTLE_TEXT_DestinyBondTaken waitmessage 64 - orword gHitMarker, 0x100100 - graphicalhpupdate USER + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 + healthbarupdate USER datahpupdate USER - faintpokemon USER, 0, 0x0 + tryfaintmon USER, FALSE, NULL return -gUnknown_081D9171:: @ 81D9171 - orword gHitMarker, 0x100100 - graphicalhpupdate USER +BattleScript_SpikesOnAttacker:: @ 81D9171 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 + healthbarupdate USER datahpupdate USER - callatk BattleScript_1D91FB - faintpokemon USER, 0, 0x0 - faintpokemon USER, 1, BattleScript_1D9192 + call BattleScript_PrintHurtBySpikes + tryfaintmon USER, FALSE, NULL + tryfaintmon USER, TRUE, BattleScript_SpikesOnAttackerFainted return -BattleScript_1D9192: @ 81D9192 - setbyte gSharedMem + 0x1600F, 0 - atk23 1 - jump gUnknown_081D8C7B +BattleScript_SpikesOnAttackerFainted: @ 81D9192 + setbyte sGIVEEXP_STATE, 0 + getexp USER + goto BattleScript_HandleFaintedMon -gUnknown_081D919F:: @ 81D919F - orword gHitMarker, 0x100100 - graphicalhpupdate TARGET +BattleScript_SpikesOnTarget:: @ 81D919F + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 + healthbarupdate TARGET datahpupdate TARGET - callatk BattleScript_1D91FB - faintpokemon TARGET, 0, 0x0 - faintpokemon TARGET, 1, BattleScript_1D91C0 + call BattleScript_PrintHurtBySpikes + tryfaintmon TARGET, FALSE, NULL + tryfaintmon TARGET, TRUE, BattleScript_SpikesOnTargetFainted return -BattleScript_1D91C0: @ 81D91C0 - setbyte gSharedMem + 0x1600F, 0 - atk23 0 - jump gUnknown_081D8C7B +BattleScript_SpikesOnTargetFainted: @ 81D91C0 + setbyte sGIVEEXP_STATE, 0 + getexp TARGET + goto BattleScript_HandleFaintedMon -gUnknown_081D91CD:: @ 81D91CD - orword gHitMarker, 0x100100 - graphicalhpupdate 3 +BattleScript_SpikesOngBank1:: @ 81D91CD + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 + healthbarupdate 3 datahpupdate 3 - callatk BattleScript_1D91FB - faintpokemon 3, 0, 0x0 - faintpokemon 3, 1, BattleScript_1D91EE + call BattleScript_PrintHurtBySpikes + tryfaintmon GBANK_1, FALSE, NULL + tryfaintmon GBANK_1, TRUE, BattleScript_SpikesOngBank1Fainted return -BattleScript_1D91EE: @ 81D91EE - setbyte gSharedMem + 0x1600F, 0 - atk23 3 - jump gUnknown_081D8C7B +BattleScript_SpikesOngBank1Fainted: @ 81D91EE + setbyte sGIVEEXP_STATE, 0 + getexp 3 + goto BattleScript_HandleFaintedMon -BattleScript_1D91FB: @ 81D91FB +BattleScript_PrintHurtBySpikes: @ 81D91FB printstring BATTLE_TEXT_SpikesHurt waitmessage 64 return @@ -3475,10 +3472,10 @@ BattleScript_1D91FB: @ 81D91FB BattleScript_PerishSongHits:: @ 81D9202 printstring BATTLE_TEXT_PerishSongFell waitmessage 64 - orword gHitMarker, 0x100100 - graphicalhpupdate USER + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 + healthbarupdate USER datahpupdate USER - faintpokemon USER, 0, 0x0 + tryfaintmon USER, FALSE, NULL end2 BattleScript_PerishSongTimerGoesDown:: @ 81D921D @@ -3487,49 +3484,49 @@ BattleScript_PerishSongTimerGoesDown:: @ 81D921D end2 BattleScript_AllStatsUp:: @ 81D9224 - jumpifstat USER, 3, 1, 12, BattleScript_1D9251 - jumpifstat USER, 3, 2, 12, BattleScript_1D9251 - jumpifstat USER, 3, 3, 12, BattleScript_1D9251 - jumpifstat USER, 3, 4, 12, BattleScript_1D9251 - jumpifstat USER, 0, 5, 12, BattleScript_1D92BF - -BattleScript_1D9251: @ 81D9251 - setbyte gSharedMem + 0x160DC, 0 + jumpifstat USER, LESS_THAN, ATTACK, 12, BattleScript_AllStatsUpAtk + jumpifstat USER, LESS_THAN, DEFENSE, 12, BattleScript_AllStatsUpAtk + jumpifstat USER, LESS_THAN, SPEED, 12, BattleScript_AllStatsUpAtk + jumpifstat USER, LESS_THAN, SP_ATTACK, 12, BattleScript_AllStatsUpAtk + jumpifstat USER, EQUAL, SP_DEFENSE, 12, BattleScript_AllStatsUpRet + +BattleScript_AllStatsUpAtk: @ 81D9251 + setbyte sFIELD_1B, 0 playstatchangeanimation USER, 62, 0 - setbyte gSharedMem + 0x1601E, 17 - statbuffchange 65, BattleScript_1D926F - printfromtable BattleTextList_401570 + setstatchanger ATTACK, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpDef + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D926F: @ 81D926F - setbyte gSharedMem + 0x1601E, 18 - statbuffchange 65, BattleScript_1D9283 - printfromtable BattleTextList_401570 +BattleScript_AllStatsUpDef: @ 81D926F + setstatchanger DEFENSE, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpeed + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D9283: @ 81D9283 - setbyte gSharedMem + 0x1601E, 19 - statbuffchange 65, BattleScript_1D9297 - printfromtable BattleTextList_401570 +BattleScript_AllStatsUpSpeed: @ 81D9283 + setstatchanger SPEED, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpAtk + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D9297: @ 81D9297 - setbyte gSharedMem + 0x1601E, 20 - statbuffchange 65, BattleScript_1D92AB - printfromtable BattleTextList_401570 +BattleScript_AllStatsUpSpAtk: @ 81D9297 + setstatchanger SP_ATTACK, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpDef + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D92AB: @ 81D92AB - setbyte gSharedMem + 0x1601E, 21 - statbuffchange 65, BattleScript_1D92BF - printfromtable BattleTextList_401570 +BattleScript_AllStatsUpSpDef: @ 81D92AB + setstatchanger SP_DEFENSE, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpRet + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D92BF: @ 81D92BF +BattleScript_AllStatsUpRet: @ 81D92BF return BattleScript_RapidSpinAway:: @ 81D92C0 - breakfree + rapidspinfree return BattleScript_WrapFree:: @ 81D92C2 @@ -3547,97 +3544,97 @@ BattleScript_SpikesFree:: @ 81D92D0 waitmessage 64 return -BattleScript_FutureSightHits:: @ 81D92D7 +BattleScript_MonTookFutureAttack:: @ 81D92D7 printstring BATTLE_TEXT_TookAttack waitmessage 64 - jumpifbyte 1, gUnknown_02024D1F + 0x4, 0, BattleScript_1D92F4 - accuracycheck BattleScript_1D934B, 248 - jump BattleScript_1D92FB + jumpifbyte NOT_EQUAL, cMULTISTRING_CHOOSER, 0, BattleScript_CheckDoomDesireMiss + accuracycheck BattleScript_FutureAttackMiss, 248 + goto BattleScript_FutureAttackAnimate -BattleScript_1D92F4: @ 81D92F4 - accuracycheck BattleScript_1D934B, 353 +BattleScript_CheckDoomDesireMiss: @ 81D92F4 + accuracycheck BattleScript_FutureAttackMiss, 353 -BattleScript_1D92FB: @ 81D92FB - atk8 - jumpifbyte 1, gUnknown_02024D1F + 0x4, 0, BattleScript_1D9313 - playanimation USER, B_ANIM_FUTURE_SIGHT_HIT, 0x0 - jump BattleScript_1D931A +BattleScript_FutureAttackAnimate: @ 81D92FB + adjustnormaldamage2 + jumpifbyte NOT_EQUAL, cMULTISTRING_CHOOSER, 0, BattleScript_FutureHitAnimDoomDesire + playanimation USER, B_ANIM_FUTURE_SIGHT_HIT, NULL + goto BattleScript_DoFutureAttackHit -BattleScript_1D9313: @ 81D9313 - playanimation USER, B_ANIM_DOOM_DESIRE_HIT, 0x0 +BattleScript_FutureHitAnimDoomDesire: @ 81D9313 + playanimation USER, B_ANIM_DOOM_DESIRE_HIT, NULL -BattleScript_1D931A: @ 81D931A - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET +BattleScript_DoFutureAttackHit: @ 81D931A + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET resultmessage waitmessage 64 - faintpokemon TARGET, 0, 0x0 - atk24 BattleScript_1D9332 + tryfaintmon TARGET, FALSE, NULL + atk24 BattleScript_FutureAttackEnd -BattleScript_1D9332: @ 81D9332 - setbyte gSharedMem + 0x1600C, 0 - atk49 1, 0 - setbyte gSharedMem + 0x1600C, 8 - atk49 2, 14 +BattleScript_FutureAttackEnd: @ 81D9332 + setbyte sMOVEEND_STATE, 0 + moveend 1, 0 + setbyte sMOVEEND_STATE, 8 + moveend 2, 14 setbyte gBattleMoveFlags, 0 end2 -BattleScript_1D934B: @ 81D934B +BattleScript_FutureAttackMiss: @ 81D934B pause 32 setbyte gBattleMoveFlags, 0 - orbyte gBattleMoveFlags, 32 + orbyte gBattleMoveFlags, MOVESTATUS_FAILED resultmessage waitmessage 64 setbyte gBattleMoveFlags, 0 end2 BattleScript_NoMovesLeft:: @ 81D9365 - printstring2 BATTLE_TEXT_NoMovesLeft - atk44 + printselectionstring BATTLE_TEXT_NoMovesLeft + endselectionscript BattleScript_MoveSelectionNoPP:: @ 81D9369 - printstring2 BATTLE_TEXT_NoPP1 - atk44 + printselectionstring BATTLE_TEXT_NoPP1 + endselectionscript BattleScript_NoPPForMove:: @ 81D936D attackstring pause 32 printstring BATTLE_TEXT_NoPP2 waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_MoveSelectionTormented:: @ 81D937C - printstring2 BATTLE_TEXT_TormentNoUse - atk44 + printselectionstring BATTLE_TEXT_TormentNoUse + endselectionscript printstring BATTLE_TEXT_TormentNoUse waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_MoveSelectionTaunted:: @ 81D938B - printstring2 BATTLE_TEXT_TauntNoUse - atk44 + printselectionstring BATTLE_TEXT_TauntNoUse + endselectionscript BattleScript_MoveUsedIsTaunted:: @ 81D938F printstring BATTLE_TEXT_TauntNoUse waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_WishComesTrue:: @ 81D939A - atkd4 1, BattleScript_1D93C1 - playanimation TARGET, B_ANIM_WISH_HEAL, 0x0 + trywish 1, BattleScript_WishButFullHp + playanimation TARGET, B_ANIM_WISH_HEAL, NULL printstring BATTLE_TEXT_WishTrue waitmessage 64 - orword gHitMarker, 0x100 - graphicalhpupdate TARGET + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE + healthbarupdate TARGET datahpupdate TARGET printstring BATTLE_TEXT_RegainedHealth waitmessage 64 end2 -BattleScript_1D93C1: @ 81D93C1 +BattleScript_WishButFullHp: @ 81D93C1 printstring BATTLE_TEXT_WishTrue waitmessage 64 pause 32 @@ -3646,43 +3643,43 @@ BattleScript_1D93C1: @ 81D93C1 end2 BattleScript_IngrainTurnHeal:: @ 81D93D1 - playanimation USER, B_ANIM_INGRAIN_HEAL, 0x0 + playanimation USER, B_ANIM_INGRAIN_HEAL, NULL printstring BATTLE_TEXT_AbsorbNutrients waitmessage 64 - orword gHitMarker, 0x100 - graphicalhpupdate USER + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE + healthbarupdate USER datahpupdate USER end2 -BattleScript_1D93EC: @ 81D93EC +BattleScript_PrintMonIsRooted: @ 81D93EC pause 32 printstring BATTLE_TEXT_AnchoredItself waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_AtkDefDown:: @ 81D93FA - setbyte gSharedMem + 0x160DC, 0 + setbyte sFIELD_1B, 0 playstatchangeanimation USER, 6, 13 playstatchangeanimation USER, 2, 9 - setbyte gSharedMem + 0x1601E, 145 - statbuffchange 193, BattleScript_1D9427 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D9427 - printfromtable BattleTextList_40157C + setstatchanger ATTACK, 1, TRUE + statbuffchange AFFECTS_USER | CERTAIN | 0x1, BattleScript_1D9427 + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_1D9427 + printfromtable gStatDownStringIds waitmessage 64 BattleScript_1D9427: @ 81D9427 playstatchangeanimation USER, 4, 9 - setbyte gSharedMem + 0x1601E, 146 - statbuffchange 193, BattleScript_1D944A - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D944A - printfromtable BattleTextList_40157C + setstatchanger DEFENSE, 1, TRUE + statbuffchange AFFECTS_USER | CERTAIN | 0x1, BattleScript_1D944A + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_1D944A + printfromtable gStatDownStringIds waitmessage 64 BattleScript_1D944A: @ 81D944A return BattleScript_KnockedOff:: @ 81D944B - playanimation TARGET, B_ANIM_ITEM_KNOCKOFF, 0x0 + playanimation TARGET, B_ANIM_ITEM_KNOCKOFF, NULL printstring BATTLE_TEXT_KnockedOffItem waitmessage 64 return @@ -3690,13 +3687,13 @@ BattleScript_KnockedOff:: @ 81D944B BattleScript_MoveUsedIsImprisoned:: @ 81D9459 printstring BATTLE_TEXT_SealedNoUse waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_MoveSelectionImprisoned:: @ 81D9464 - printstring2 BATTLE_TEXT_SealedNoUse - atk44 + printselectionstring BATTLE_TEXT_SealedNoUse + endselectionscript -gUnknown_081D9468:: @ 81D9468 +BattleScript_SelectingImprisionedMoveInPalace:: @ 81D9468 printstring BATTLE_TEXT_GrudgeLosePP waitmessage 64 return @@ -3707,18 +3704,18 @@ BattleScript_MagicCoatBounce:: @ 81D946F pause 32 printstring BATTLE_TEXT_MagicCoatBounce waitmessage 64 - orword gHitMarker, 0x800c00 - atk76 USER, 1 + orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_x800000 + setmagiccoattarget USER return BattleScript_SnatchedMove:: @ 81D9487 attackstring ppreduce - snatchmove - playanimation TARGET, B_ANIM_SNATCH_MOVE, 0x0 + snatchsetbanks + playanimation TARGET, B_ANIM_SNATCH_MOVE, NULL printstring BATTLE_TEXT_SnatchedMove waitmessage 64 - orword gHitMarker, 0x800c00 + orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_x800000 atk5f return @@ -3733,12 +3730,12 @@ BattleScript_OneHitKOMsg:: @ 81D94A9 return BattleScript_SAtkDown2:: @ 81D94B0 - setbyte gSharedMem + 0x160DC, 0 + setbyte sFIELD_1B, 0 playstatchangeanimation USER, 16, 11 - setbyte gSharedMem + 0x1601E, 164 - statbuffchange 193, BattleScript_1D94D9 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D94D9 - printfromtable BattleTextList_40157C + setstatchanger SP_ATTACK, 2, TRUE + statbuffchange AFFECTS_USER | CERTAIN | 0x1, BattleScript_1D94D9 + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_1D94D9 + printfromtable gStatDownStringIds waitmessage 64 BattleScript_1D94D9: @ 81D94D9 @@ -3747,7 +3744,7 @@ BattleScript_1D94D9: @ 81D94D9 BattleScript_FocusPunchSetUp:: @ 81D94DA printstring BATTLE_TEXT_Terminator2 waitmessage 1 - playanimation USER, B_ANIM_FOCUS_PUNCH_SET_UP, 0x0 + playanimation USER, B_ANIM_FOCUS_PUNCH_SET_UP, NULL printstring BATTLE_TEXT_TightenFocus waitmessage 64 end2 @@ -3756,79 +3753,79 @@ BattleScript_MoveUsedIsAsleep:: @ 81D94EE printstring BATTLE_TEXT_FastAsleep waitmessage 64 statusanimation USER - jump BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_MoveUsedWokeUp:: @ 81D94FB - bicword gHitMarker, 0x10 - printfromtable BattleTextList_401562 + bicword gHitMarker, HITMARKER_x10 + printfromtable gWokeUpStringIds waitmessage 64 - atk98 1 + updatestatusicon USER return -gUnknown_081D950F:: @ 81D950F +BattleScript_MonWokeUpInUproar:: @ 81D950F printstring BATTLE_TEXT_UproarWoke waitmessage 64 - atk98 1 + updatestatusicon USER end2 BattleScript_PoisonTurnDmg:: @ 81D9518 printstring BATTLE_TEXT_PoisonHurt waitmessage 64 -BattleScript_1D951E: @ 81D951E +BattleScript_DoStatusTurnDmg: @ 81D951E statusanimation USER -BattleScript_1D9520: @ 81D9520 - orword gHitMarker, 0x100100 - graphicalhpupdate USER +BattleScript_DoTurnDmg: @ 81D9520 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 + healthbarupdate USER datahpupdate USER - faintpokemon USER, 0, 0x0 - atk24 BattleScript_1D9539 + tryfaintmon USER, FALSE, NULL + atk24 BattleScript_DoTurnDmgEnd -BattleScript_1D9539: @ 81D9539 +BattleScript_DoTurnDmgEnd: @ 81D9539 end2 BattleScript_BurnTurnDmg:: @ 81D953A printstring BATTLE_TEXT_BurnHurt waitmessage 64 - jump BattleScript_1D951E + goto BattleScript_DoStatusTurnDmg BattleScript_MoveUsedIsFrozen:: @ 81D9545 printstring BATTLE_TEXT_FrozenSolid waitmessage 64 statusanimation USER - jump BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_MoveUsedUnfroze:: @ 81D9552 - printfromtable BattleTextList_4015C4 + printfromtable gGotDefrostedStringIds waitmessage 64 - atk98 1 + updatestatusicon USER return -gUnknown_081D955D:: @ 81D955D +BattleScript_DefrostedViaFireMove:: @ 81D955D printstring BATTLE_TEXT_DefendingDefrosted waitmessage 64 - atk98 0 + updatestatusicon TARGET return BattleScript_MoveUsedIsParalyzed:: @ 81D9566 printstring BATTLE_TEXT_Paralyzed3 waitmessage 64 statusanimation USER - jump BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_MoveUsedFlinched:: @ 81D9573 printstring BATTLE_TEXT_Flinched waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -gUnknown_081D957E:: @ 81D957E - printfromtable BattleTextList_40155A +BattleScript_PrintUproarOverTurns:: @ 81D957E + printfromtable gUproarOverTurnStringIds waitmessage 64 end2 BattleScript_ThrashConfuses:: @ 81D9587 - atk66 1, 1, S_CONFUSED + chosenstatus2animation USER, STATUS2_CONFUSION printstring BATTLE_TEXT_FatigueConfuse waitmessage 64 end2 @@ -3836,24 +3833,24 @@ BattleScript_ThrashConfuses:: @ 81D9587 BattleScript_MoveUsedIsConfused:: @ 81D9595 printstring BATTLE_TEXT_Confused waitmessage 64 - atk65 1, 0x7 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 0, BattleScript_1D95D3 + status2animation USER, STATUS2_CONFUSION + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0, BattleScript_MoveUsedIsConfusedRet -BattleScript_1D95AC: @ 81D95AC - atk76 USER, 0 - atk8 +BattleScript_DoSelfConfusionDmg: @ 81D95AC + cancelmultiturnmoves USER + adjustnormaldamage2 printstring BATTLE_TEXT_HurtItself waitmessage 64 - missmessage - atk5c USER - waitstateatk - orword gHitMarker, 0x100100 - graphicalhpupdate USER + effectivenesssound + hitanimation USER + waitstate + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 + healthbarupdate USER datahpupdate USER - faintpokemon USER, 0, 0x0 - jump BattleScript_EndTurn + tryfaintmon USER, FALSE, NULL + goto BattleScript_MoveEnd -BattleScript_1D95D3: @ 81D95D3 +BattleScript_MoveUsedIsConfusedRet: @ 81D95D3 return BattleScript_MoveUsedIsConfusedNoMore:: @ 81D95D4 @@ -3861,16 +3858,16 @@ BattleScript_MoveUsedIsConfusedNoMore:: @ 81D95D4 waitmessage 64 return -gUnknown_081D95DB:: @ 81D95DB +BattleScript_PrintPayDayMoneyString:: @ 81D95DB printstring BATTLE_TEXT_PickedUpYen waitmessage 64 return BattleScript_WrapTurnDmg:: @ 81D95E2 - playanimation USER, B_ANIM_TURN_TRAP, gSharedMem + 0x160A4 + playanimation USER, B_ANIM_TURN_TRAP, sANIM_ARG1 printstring BATTLE_TEXT_HurtBy waitmessage 64 - jump BattleScript_1D9520 + goto BattleScript_DoTurnDmg BattleScript_WrapEnds:: @ 81D95F4 printstring BATTLE_TEXT_FreedFrom @@ -3880,119 +3877,119 @@ BattleScript_WrapEnds:: @ 81D95F4 BattleScript_MoveUsedIsInLove:: @ 81D95FB printstring BATTLE_TEXT_InLoveWith waitmessage 64 - atk65 1, 0xf0000 + status2animation USER, STATUS2_INFATUATION return BattleScript_MoveUsedIsParalyzedCantAttack:: @ 81D9608 printstring BATTLE_TEXT_ImmobilizedBy waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_NightmareTurnDmg:: @ 81D9613 printstring BATTLE_TEXT_NightmareLock waitmessage 64 - atk65 1, Start - jump BattleScript_1D9520 + status2animation USER, STATUS2_NIGHTMARE + goto BattleScript_DoTurnDmg BattleScript_CurseTurnDmg:: @ 81D9624 printstring BATTLE_TEXT_CurseAfflict waitmessage 64 - atk65 1, 0x10000000 - jump BattleScript_1D9520 + status2animation USER, STATUS2_CURSED + goto BattleScript_DoTurnDmg BattleScript_TargetPRLZHeal:: @ 81D9635 printstring BATTLE_TEXT_ParalysisHealed waitmessage 64 - atk98 0 + updatestatusicon TARGET return -BattleScript_1D963E:: @ 81D963E - statusanimation 2 - printfromtable BattleTextList_4015B8 +BattleScript_MoveEffectSleep:: @ 81D963E + statusanimation EFFECT_BANK + printfromtable gFellAsleepStringIds waitmessage 64 -BattleScript_1D9648: @ 81D9648 - atk98 2 - waitstateatk +BattleScript_UpdateEffectStatusIconRet: @ 81D9648 + updatestatusicon EFFECT_BANK + waitstate return BattleScript_YawnMakesAsleep:: @ 81D964C - statusanimation 2 + statusanimation EFFECT_BANK printstring BATTLE_TEXT_FellAsleep waitmessage 64 - atk98 2 - waitstateatk - atk6f 2 + updatestatusicon EFFECT_BANK + waitstate + makevisible 2 end2 -BattleScript_1D965A:: @ 81D965A - statusanimation 2 - printfromtable BattleTextList_4015B0 +BattleScript_MoveEffectPoison:: @ 81D965A + statusanimation EFFECT_BANK + printfromtable gGotPoisonedStringIds waitmessage 64 - jump BattleScript_1D9648 + goto BattleScript_UpdateEffectStatusIconRet -BattleScript_1D9669:: @ 81D9669 - statusanimation 2 - printfromtable BattleTextList_4015BC +BattleScript_MoveEffectBurn:: @ 81D9669 + statusanimation EFFECT_BANK + printfromtable gGotBurnedStringIds waitmessage 64 - jump BattleScript_1D9648 + goto BattleScript_UpdateEffectStatusIconRet -BattleScript_1D9678:: @ 81D9678 - statusanimation 2 - printfromtable BattleTextList_4015C0 +BattleScript_MoveEffectFreeze:: @ 81D9678 + statusanimation EFFECT_BANK + printfromtable gGotFrozenStringIds waitmessage 64 - jump BattleScript_1D9648 + goto BattleScript_UpdateEffectStatusIconRet -BattleScript_1D9687:: @ 81D9687 - statusanimation 2 - printfromtable BattleTextList_4015B4 +BattleScript_MoveEffectParalysis:: @ 81D9687 + statusanimation EFFECT_BANK + printfromtable gGotParalyzedStringIds waitmessage 64 - jump BattleScript_1D9648 + goto BattleScript_UpdateEffectStatusIconRet -BattleScript_1D9696:: @ 81D9696 +BattleScript_MoveEffectUproar:: @ 81D9696 printstring BATTLE_TEXT_UproarCaused waitmessage 64 return -BattleScript_1D969D:: @ 81D969D - statusanimation 2 +BattleScript_MoveEffectToxic:: @ 81D969D + statusanimation EFFECT_BANK printstring BATTLE_TEXT_BadlyPoisoned waitmessage 64 - jump BattleScript_1D9648 + goto BattleScript_UpdateEffectStatusIconRet -BattleScript_1D96AA:: @ 81D96AA +BattleScript_MoveEffectPayDay:: @ 81D96AA printstring BATTLE_TEXT_CoinScatter waitmessage 64 return -BattleScript_1D96B1:: @ 81D96B1 - printfromtable BattleTextList_401594 +BattleScript_MoveEffectWrap:: @ 81D96B1 + printfromtable gWrappedStringIds waitmessage 64 return -BattleScript_1D96BA:: @ 81D96BA - atk66 2, 1, S_CONFUSED +BattleScript_MoveEffectConfusion:: @ 81D96BA + chosenstatus2animation EFFECT_BANK, STATUS2_CONFUSION printstring BATTLE_TEXT_BecameConfused waitmessage 64 return -BattleScript_1D96C8:: @ 81D96C8 - jumpifhalfword 0, gCurrentMove, 165, BattleScript_1D96DB - jumpifability USER, ABILITY_ROCK_HEAD, BattleScript_1D96F5 +BattleScript_MoveEffectRecoil33:: @ 81D96C8 + jumpifmove MOVE_STRUGGLE, BattleScript_DoRecoil33 + jumpifability USER, ABILITY_ROCK_HEAD, BattleScript_Recoil33End -BattleScript_1D96DB: @ 81D96DB - orword gHitMarker, 0x100100 - graphicalhpupdate USER +BattleScript_DoRecoil33: @ 81D96DB + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 + healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_HitRecoil waitmessage 64 - faintpokemon USER, 0, 0x0 + tryfaintmon USER, FALSE, NULL -BattleScript_1D96F5: @ 81D96F5 +BattleScript_Recoil33End: @ 81D96F5 return BattleScript_ItemSteal:: @ 81D96F6 - playanimation TARGET, B_ANIM_ITEM_STEAL, 0x0 + playanimation TARGET, B_ANIM_ITEM_STEAL, NULL printstring BATTLE_TEXT_StoleSomething waitmessage 64 return @@ -4000,13 +3997,13 @@ BattleScript_ItemSteal:: @ 81D96F6 BattleScript_DrizzleActivates:: @ 81D9704 pause 32 printstring BATTLE_TEXT_RainMade - waitstateatk - playanimation 7, B_ANIM_RAIN_CONTINUES, 0x0 - callatk BattleScript_1D9761 + waitstate + playanimation 7, B_ANIM_RAIN_CONTINUES, NULL + call BattleScript_WeatherFormChanges end3 BattleScript_SpeedBoostActivates:: @ 81D9718 - playanimation USER, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 + playanimation USER, B_ANIM_STATS_CHANGE, sANIM_ARG1 printstring BATTLE_TEXT_SpeedRisen waitmessage 64 end3 @@ -4020,47 +4017,47 @@ BattleScript_TraceActivates:: @ 81D9726 BattleScript_RainDishActivates:: @ 81D9730 printstring BATTLE_TEXT_RestoredHPByItem waitmessage 64 - orword gHitMarker, 0x100 - graphicalhpupdate USER + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE + healthbarupdate USER datahpupdate USER end3 BattleScript_SandstreamActivates:: @ 81D9744 pause 32 printstring BATTLE_TEXT_WhipSandstorm - waitstateatk - playanimation 7, B_ANIM_SANDSTORM_CONTINUES, 0x0 - callatk BattleScript_1D9761 + waitstate + playanimation 7, B_ANIM_SANDSTORM_CONTINUES, NULL + call BattleScript_WeatherFormChanges end3 BattleScript_ShedSkinActivates:: @ 81D9758 printstring BATTLE_TEXT_CuredProblem waitmessage 64 - atk98 1 + updatestatusicon USER end3 -BattleScript_1D9761: @ 81D9761 - setbyte gSharedMem + 0x16003, 0 +BattleScript_WeatherFormChanges: @ 81D9761 + setbyte sBANK, 0 -BattleScript_1D9767: @ 81D9767 - castformswitch - addbyte gSharedMem + 0x16003, 1 - jumpifarraynotequal gSharedMem + 0x16003, gNoOfAllBanks, 1, BattleScript_1D9767 +BattleScript_WeatherFormChangesLoop: @ 81D9767 + trycastformdatachange + addbyte sBANK, 1 + jumpifbytenotequal sBANK, gNoOfAllBanks, BattleScript_WeatherFormChangesLoop return BattleScript_CastformChange:: @ 81D977D - callatk BattleScript_1D9783 + call BattleScript_1D9783 end3 BattleScript_1D9783: @ 81D9783 - actualcastformswitch - waitstateatk + docastformchangeanimation + waitstate printstring BATTLE_TEXT_Transformed2 waitmessage 64 return gUnknown_081D978C:: @ 81D978C - callatk BattleScript_1D9792 + call BattleScript_1D9792 end3 BattleScript_1D9792: @ 81D9792 @@ -4068,24 +4065,24 @@ BattleScript_1D9792: @ 81D9792 gUnknown_081D9795:: @ 81D9795 setbyte gBankTarget, 0 - setbyte gSharedMem + 0x1601E, 145 + setstatchanger ATTACK, 1, TRUE BattleScript_1D97A1: @ 81D97A1 - atke1 BattleScript_1D97EF - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D97E4 + trygetintimidatetarget BattleScript_1D97EF + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_1D97E4 jumpifability TARGET, ABILITY_CLEAR_BODY, BattleScript_1D97F0 jumpifability TARGET, ABILITY_HYPER_CUTTER, BattleScript_1D97F0 jumpifability TARGET, ABILITY_WHITE_SMOKE, BattleScript_1D97F0 statbuffchange 33, BattleScript_1D97E4 - jumpifbyte 2, gUnknown_02024D1F + 0x4, 1, BattleScript_1D97E4 - atk47 - playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 + jumpifbyte GREATER_THAN, cMULTISTRING_CHOOSER, 1, BattleScript_1D97E4 + setgraphicalstatchangevalues + playanimation TARGET, B_ANIM_STATS_CHANGE, sANIM_ARG1 printstring BATTLE_TEXT_CutsAttack waitmessage 64 BattleScript_1D97E4: @ 81D97E4 addbyte gBankTarget, 1 - jump BattleScript_1D97A1 + goto BattleScript_1D97A1 BattleScript_1D97EF: @ 81D97EF return @@ -4094,14 +4091,14 @@ BattleScript_1D97F0: @ 81D97F0 pause 32 printstring BATTLE_TEXT_PreventedOther waitmessage 64 - jump BattleScript_1D97E4 + goto BattleScript_1D97E4 BattleScript_DroughtActivates:: @ 81D97FE pause 32 printstring BATTLE_TEXT_SunIntensified - waitstateatk - playanimation 7, B_ANIM_SUN_CONTINUES, 0x0 - callatk BattleScript_1D9761 + waitstate + playanimation 7, B_ANIM_SUN_CONTINUES, NULL + call BattleScript_WeatherFormChanges end3 BattleScript_TookAttack:: @ 81D9812 @@ -4109,20 +4106,20 @@ BattleScript_TookAttack:: @ 81D9812 pause 32 printstring BATTLE_TEXT_TookAttack2 waitmessage 64 - orword gHitMarker, 0x400 + orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED return -gUnknown_081D9826:: @ 81D9826 +BattleScript_SturdyPreventsOHKO:: @ 81D9826 pause 32 printstring BATTLE_TEXT_ProtectedBy pause 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -gUnknown_081D9834:: @ 81D9834 +BattleScript_DampStopsExplosion:: @ 81D9834 pause 32 printstring BATTLE_TEXT_PreventedBy pause 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_MoveHPDrain_PPLoss:: @ 81D9842 ppreduce @@ -4130,13 +4127,13 @@ BattleScript_MoveHPDrain_PPLoss:: @ 81D9842 BattleScript_MoveHPDrain:: @ 81D9843 attackstring pause 32 - orword gHitMarker, 0x100 - graphicalhpupdate TARGET + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE + healthbarupdate TARGET datahpupdate TARGET printstring BATTLE_TEXT_HPRestoredUsing waitmessage 64 - orbyte gBattleMoveFlags, 8 - jump BattleScript_EndTurn + orbyte gBattleMoveFlags, MOVESTATUS_NOTAFFECTED + goto BattleScript_MoveEnd BattleScript_MoveHPDrain_FullHP_PPLoss:: @ 81D9865 ppreduce @@ -4146,8 +4143,8 @@ BattleScript_MoveHPDrain_FullHP:: @ 81D9866 pause 32 printstring BATTLE_TEXT_MadeUseless waitmessage 64 - orbyte gBattleMoveFlags, 8 - jump BattleScript_EndTurn + orbyte gBattleMoveFlags, MOVESTATUS_NOTAFFECTED + goto BattleScript_MoveEnd BattleScript_FlashFireBoost_PPLoss:: @ 81D987B ppreduce @@ -4155,15 +4152,15 @@ BattleScript_FlashFireBoost_PPLoss:: @ 81D987B BattleScript_FlashFireBoost:: @ 81D987C attackstring pause 32 - printfromtable BattleTextList_401648 + printfromtable gFlashFireStringIds waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D988D: @ 81D988D +BattleScript_AbilityPreventsPhasingOut: @ 81D988D pause 32 printstring BATTLE_TEXT_AnchorsItself waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_AbilityNoStatLoss:: @ 81D989B pause 32 @@ -4173,19 +4170,19 @@ BattleScript_AbilityNoStatLoss:: @ 81D989B BattleScript_BRNPrevention:: @ 81D98A5 pause 32 - printfromtable BattleTextList_401630 + printfromtable gBRNPreventionStringIds waitmessage 64 return BattleScript_PRLZPrevention:: @ 81D98B1 pause 32 - printfromtable BattleTextList_401636 + printfromtable gPRLZPreventionStringIds waitmessage 64 return BattleScript_PSNPrevention:: @ 81D98BD pause 32 - printfromtable BattleTextList_40163C + printfromtable gPSNPreventionStringIds waitmessage 64 return @@ -4193,19 +4190,19 @@ BattleScript_ObliviousPreventsAttraction:: @ 81D98C9 pause 32 printstring BATTLE_TEXT_PreventedRomance waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_FlinchPrevention:: @ 81D98D7 pause 32 printstring BATTLE_TEXT_PreventedFlinching waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D98E5: @ 81D98E5 +BattleScript_OwnTempoPrevents: @ 81D98E5 pause 32 printstring BATTLE_TEXT_PreventedConfusion waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_SoundproofProtected:: @ 81D98F3 attackstring @@ -4213,20 +4210,20 @@ BattleScript_SoundproofProtected:: @ 81D98F3 pause 32 printstring BATTLE_TEXT_BlocksOther waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_AbilityNoSpecificStatLoss:: @ 81D9903 pause 32 printstring BATTLE_TEXT_PreventedLoss waitmessage 64 - setbyte gUnknown_02024D1F + 0x4, 3 + setbyte cMULTISTRING_CHOOSER, 3 return BattleScript_NoItemSteal:: @ 81D9913 pause 32 printstring BATTLE_TEXT_MadeIneffective waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_ColorChangeActivates:: @ 81D9921 printstring BATTLE_TEXT_MadeType @@ -4234,242 +4231,242 @@ BattleScript_ColorChangeActivates:: @ 81D9921 return BattleScript_RoughSkinActivates:: @ 81D9928 - orword gHitMarker, 0x100100 - graphicalhpupdate USER + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 + healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_HurtOther waitmessage 64 - faintpokemon USER, 0, 0x0 + tryfaintmon USER, FALSE, NULL return BattleScript_CuteCharmActivates:: @ 81D9943 - atk65 1, 0xf0000 + status2animation USER, STATUS2_INFATUATION printstring BATTLE_TEXT_InfatuatedPoke waitmessage 64 return BattleScript_ApplySecondaryEffect:: @ 81D9950 - waitstateatk - seteffectuser + waitstate + seteffectsecondary return BattleScript_SynchronizeActivates:: @ 81D9953 - waitstateatk - seteffecttarget + waitstate + seteffectprimary return -gUnknown_081D9956:: @ 81D9956 +BattleScript_AbilityCuredStatus:: @ 81D9956 printstring BATTLE_TEXT_CuredOfProblem waitmessage 64 - atk98 10 + updatestatusicon SCRIPTING_BANK return gUnknown_081D995F:: @ 81D995F printstring BATTLE_TEXT_IgnoredOrdersSLP waitmessage 64 - setbyte gSharedMem + 0x1600C, 0 - atk49 2, 16 + setbyte sMOVEEND_STATE, 0 + moveend 2, 16 end -gUnknown_081D996F:: @ 81D996F +BattleScript_IgnoresAndUsesRandomMove:: @ 81D996F printstring BATTLE_TEXT_IgnoredOrders waitmessage 64 - jumptoattack TARGET + jumptorandomattack TARGET BattleScript_MoveUsedLoafingAround:: @ 81D9977 - printfromtable BattleTextList_40160E + printfromtable gInobedientStringIds waitmessage 64 - setbyte gSharedMem + 0x1600C, 0 - atk49 2, 16 + setbyte sMOVEEND_STATE, 0 + moveend 2, 16 end -gUnknown_081D9989:: @ 81D9989 +BattleScript_IgnoresAndFallsAsleep:: @ 81D9989 printstring BATTLE_TEXT_BeganNap waitmessage 64 - setbyte gUnknown_02024D1F + 0x2, 65 - seteffecttarget - setbyte gSharedMem + 0x1600C, 0 - atk49 2, 16 + setmoveeffect EFFECT_SLEEP | AFFECTS_USER + seteffectprimary + setbyte sMOVEEND_STATE, 0 + moveend 2, 16 end gUnknown_081D99A0:: @ 81D99A0 printstring BATTLE_TEXT_WontObey waitmessage 64 - jump BattleScript_1D95AC + goto BattleScript_DoSelfConfusionDmg BattleScript_SubstituteFade:: @ 81D99AB - playanimation TARGET, B_ANIM_SUBSTITUTE_FADE, 0x0 + playanimation TARGET, B_ANIM_SUBSTITUTE_FADE, NULL printstring BATTLE_TEXT_SubFaded return BattleScript_BerryCurePrlzEnd2:: @ 81D99B6 - callatk BattleScript_BerryCureParRet + call BattleScript_BerryCureParRet end2 BattleScript_BerryCureParRet:: @ 81D99BC - playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_CuredParalysis waitmessage 64 - atk98 10 - removeitem 10 + updatestatusicon SCRIPTING_BANK + removeitem SCRIPTING_BANK return BattleScript_BerryCurePsnEnd2:: @ 81D99CE - callatk BattleScript_BerryCurePsnRet + call BattleScript_BerryCurePsnRet end2 BattleScript_BerryCurePsnRet:: @ 81D99D4 - playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_CuredPoison waitmessage 64 - atk98 10 - removeitem 10 + updatestatusicon SCRIPTING_BANK + removeitem SCRIPTING_BANK return BattleScript_BerryCureBrnEnd2:: @ 81D99E6 - callatk BattleScript_BerryCureBrnRet + call BattleScript_BerryCureBrnRet end2 BattleScript_BerryCureBrnRet:: @ 81D99EC - playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_CuredBurn waitmessage 64 - atk98 10 - removeitem 10 + updatestatusicon SCRIPTING_BANK + removeitem SCRIPTING_BANK return BattleScript_BerryCureFrzEnd2:: @ 81D99FE - callatk BattleScript_BerryCureFrzRet + call BattleScript_BerryCureFrzRet end2 BattleScript_BerryCureFrzRet:: @ 81D9A04 - playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_CuredFreeze waitmessage 64 - atk98 10 - removeitem 10 + updatestatusicon SCRIPTING_BANK + removeitem SCRIPTING_BANK return BattleScript_BerryCureSlpEnd2:: @ 81D9A16 - callatk BattleScript_BerryCureSlpRet + call BattleScript_BerryCureSlpRet end2 BattleScript_BerryCureSlpRet:: @ 81D9A1C - playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_CuredSleep waitmessage 64 - atk98 10 - removeitem 10 + updatestatusicon SCRIPTING_BANK + removeitem SCRIPTING_BANK return BattleScript_BerryCureConfusionEnd2:: @ 81D9A2E - callatk BattleScript_BerryCureConfusionRet + call BattleScript_BerryCureConfusionRet end2 BattleScript_BerryCureConfusionRet:: @ 81D9A34 - playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_CuredConfusion waitmessage 64 - removeitem 10 + removeitem SCRIPTING_BANK return -gUnknown_081D9A44:: @ 81D9A44 - callatk gUnknown_081D9A4A +BattleScript_BerryCureChosenStatusEnd2:: @ 81D9A44 + call BattleScript_BerryCureChosenStatusRet end2 -gUnknown_081D9A4A:: @ 81D9A4A - playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 - printfromtable BattleTextList_40162C +BattleScript_BerryCureChosenStatusRet:: @ 81D9A4A + playanimation 10, B_ANIM_ITEM_EFFECT, NULL + printfromtable gBerryEffectStringIds waitmessage 64 - atk98 10 - removeitem 10 + updatestatusicon SCRIPTING_BANK + removeitem SCRIPTING_BANK return BattleScript_WhiteHerbEnd2:: @ 81D9A5E - callatk BattleScript_WhiteHerbRet + call BattleScript_WhiteHerbRet end2 BattleScript_WhiteHerbRet:: @ 81D9A64 - playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_RestoredStatus waitmessage 64 - removeitem 10 + removeitem SCRIPTING_BANK return BattleScript_ItemHealHP_RemoveItem:: @ 81D9A74 - playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_RestoredHealth waitmessage 64 - orword gHitMarker, 0x100 - graphicalhpupdate USER + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE + healthbarupdate USER datahpupdate USER removeitem USER end2 BattleScript_BerryPPHealEnd2:: @ 81D9A91 - playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_RestoredPP waitmessage 64 removeitem USER end2 BattleScript_ItemHealHP_End2:: @ 81D9AA1 - callatk BattleScript_ItemHealHP_Ret + call BattleScript_ItemHealHP_Ret end2 BattleScript_ItemHealHP_Ret:: @ 81D9AA7 - playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_RestoredHPLittle waitmessage 64 - orword gHitMarker, 0x100 - graphicalhpupdate USER + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE + healthbarupdate USER datahpupdate USER return BattleScript_MoveSelectionChoiceBanded:: @ 81D9AC2 - printstring2 BATTLE_TEXT_ChoiceBand - atk44 + printselectionstring BATTLE_TEXT_ChoiceBand + endselectionscript BattleScript_HangedOnMsg:: @ 81D9AC6 - playanimation TARGET, B_ANIM_HANGED_ON, 0x0 + playanimation TARGET, B_ANIM_HANGED_ON, NULL printstring BATTLE_TEXT_FocusSash waitmessage 64 return BattleScript_BerryConfuseHealEnd2:: @ 81D9AD4 - playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_RestoredHealth waitmessage 64 - orword gHitMarker, 0x100 - graphicalhpupdate USER + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE + healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_UnknownString2 waitmessage 64 - setbyte gUnknown_02024D1F + 0x2, 71 - seteffecttarget + setmoveeffect EFFECT_CONFUSION | AFFECTS_USER + seteffectprimary removeitem USER end2 BattleScript_BerryStatRaiseEnd2:: @ 81D9AFE - playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 - statbuffchange 65, BattleScript_1D9B0B + playanimation USER, B_ANIM_ITEM_EFFECT, NULL + statbuffchange AFFECTS_USER | 0x1, BattleScript_1D9B0B BattleScript_1D9B0B: @ 81D9B0B - setbyte gUnknown_02024D1F + 0x4, 4 - callatk BattleScript_StatUp + setbyte cMULTISTRING_CHOOSER, 0x4 + call BattleScript_StatUp removeitem USER end2 BattleScript_BerryFocusEnergyEnd2:: @ 81D9B19 - playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_HustleUse waitmessage 64 removeitem USER end2 -gUnknown_081D9B29:: @ 81D9B29 - printstring2 BATTLE_TEXT_CantUseItems - atk44 +BattleScript_ActionSelectionItemsCantBeUsed:: @ 81D9B29 + printselectionstring BATTLE_TEXT_CantUseItems + endselectionscript gUnknown_081D9B2D:: @ 81D9B2D printstring BATTLE_TEXT_Terminator2 diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 22ecc7769..26f28726d 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -1,97 +1,101 @@ +#include "constants/battle_constants.h" +#include "constants/items.h" +#include "constants/songs.h" .include "asm/macros.inc" - .include "constants/constants.inc" .include "asm/macros/battle_script.inc" + .include "constants/constants.inc" + .include "constants/battle_script_constants.inc" .section script_data, "aw", %progbits .align 2 gBattlescriptsForBallThrow:: @ 81D9E48 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EBC - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - -gUnknown_081D9E7C:: @ 81D9E7C - .4byte BattleScript_1D9F45 - .4byte BattleScript_1D9F4F - .4byte BattleScript_1D9F4F - .4byte BattleScript_1D9F7B - .4byte BattleScript_1D9F9C - .4byte BattleScript_1D9FBB + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_SafariBallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + +gBattlescriptsForUsingItem:: @ 81D9E7C + .4byte BattleScript_PlayerUsesItem + .4byte BattleScript_OpponentUsesHealItem + .4byte BattleScript_OpponentUsesHealItem + .4byte BattleScript_OpponentUsesStatusCureItem + .4byte BattleScript_OpponentUsesXItem + .4byte BattleScript_OpponentUsesGuardSpecs gBattlescriptsForRunningByItem:: @ 81D9E94 - .4byte BattleScript_1D9FDA + .4byte BattleScript_RunByUsingItem gBattlescriptsForSafariActions:: @ 81D9E98 - .4byte BattleScript_1D9FE4 - .4byte BattleScript_1D9FEB - .4byte BattleScript_1D9FF4 + .4byte BattleScript_ActionWatchesCarefully + .4byte BattleScript_ActionGetNear + .4byte BattleScript_ActionThrowPokeblock .4byte BattleScript_1DA00A -BattleScript_1D9EA8: @ 81D9EA8 - jumpifhalfword 4, gBattleTypeFlags, 512, BattleScript_1D9EB8 +BattleScript_BallThrow: @ 81D9EA8 + jumpifhalfword COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_WALLY_TUTORIAL, BattleScript_BallThrowByWally printstring BATTLE_TEXT_Used1 - pokemoncatchfunction + handleballthrow -BattleScript_1D9EB8: @ 81D9EB8 +BattleScript_BallThrowByWally: @ 81D9EB8 printstring BATTLE_TEXT_TutorialUsed - pokemoncatchfunction + handleballthrow -BattleScript_1D9EBC: @ 81D9EBC +BattleScript_SafariBallThrow: @ 81D9EBC printstring BATTLE_TEXT_Used1 - atk98 1 - pokemoncatchfunction + updatestatusicon USER + handleballthrow BattleScript_SuccessBallThrow:: @ 81D9EC2 - jumpifhalfword 0, gLastUsedItem, 5, BattleScript_1D9ED0 - atk60 11 + jumpifhalfword EQUAL, gLastUsedItem, ITEM_SAFARI_BALL, BattleScript_PrintCaughtMonInfo + incrementgamestat 11 -BattleScript_1D9ED0: @ 81D9ED0 +BattleScript_PrintCaughtMonInfo: @ 81D9ED0 printstring BATTLE_TEXT_BallCaught1 - capturesomethingf1 BattleScript_1D9EE3 + trysetcaughtmondexflags BattleScript_TryNicknameCaughtMon printstring BATTLE_TEXT_AddedToDex - waitstateatk + waitstate setbyte gBattleCommunication, 0 - capturesomethingf2 + displaydexinfo -BattleScript_1D9EE3: @ 81D9EE3 +BattleScript_TryNicknameCaughtMon: @ 81D9EE3 printstring BATTLE_TEXT_GiveNickname - waitstateatk + waitstate setbyte gBattleCommunication, 0 - capturesomethingf3 BattleScript_1D9EF8 + trygivecaughtmonnick BattleScript_GiveCaughtMonEnd printstring BATTLE_TEXT_SentToPC waitmessage 64 -BattleScript_1D9EF8: @ 81D9EF8 - catchpoke - setbyte gBattleOutcome, 7 - activesidesomething +BattleScript_GiveCaughtMonEnd: @ 81D9EF8 + givecaughtmon + setbyte gBattleOutcome, BATTLE_CAUGHT + finishturn BattleScript_WallyBallThrow:: @ 81D9F00 printstring BATTLE_TEXT_BallCaught2 - setbyte gBattleOutcome, 7 - activesidesomething + setbyte gBattleOutcome, BATTLE_CAUGHT + finishturn BattleScript_ShakeBallThrow:: @ 81D9F0A - printfromtable BattleTextList_4015E6 + printfromtable gBallEscapeStringIds waitmessage 64 - jumpifbyte 5, gBattleTypeFlags, 128, BattleScript_1D9F34 - jumpifbyte 1, gNumSafariBalls, 0, BattleScript_1D9F34 + jumpifbyte NO_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_SAFARI, BattleScript_ShakeBallThrowEnd + jumpifbyte NOT_EQUAL, gNumSafariBalls, 0, BattleScript_ShakeBallThrowEnd printstring BATTLE_TEXT_SafariOver waitmessage 64 - setbyte gBattleOutcome, 8 + setbyte gBattleOutcome, BATTLE_OUT_OF_BALLS -BattleScript_1D9F34: @ 81D9F34 - atkf6 +BattleScript_ShakeBallThrowEnd: @ 81D9F34 + finishaction BattleScript_TrainerBallBlock:: @ 81D9F35 waitmessage 64 @@ -99,96 +103,96 @@ BattleScript_TrainerBallBlock:: @ 81D9F35 waitmessage 64 printstring BATTLE_TEXT_DontBeAThief waitmessage 64 - atkf6 + finishaction -BattleScript_1D9F45: @ 81D9F45 - setbyte gSharedMem + 0x1600C, 15 - atk49 1, 0 +BattleScript_PlayerUsesItem: @ 81D9F45 + setbyte sMOVEEND_STATE, 15 + moveend 1, 0 end -BattleScript_1D9F4F: @ 81D9F4F +BattleScript_OpponentUsesHealItem: @ 81D9F4F pause 48 - atk54 1 + playse SE_KAIFUKU printstring BATTLE_TEXT_Used2 waitmessage 64 - atk75 - orword gHitMarker, 0x100 - graphicalhpupdate USER + useitemonopponent + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE + healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_RestoredHealth waitmessage 64 - atk98 1 - setbyte gSharedMem + 0x1600C, 15 - atk49 1, 0 - atkf6 + updatestatusicon USER + setbyte sMOVEEND_STATE, 15 + moveend 1, 0 + finishaction -BattleScript_1D9F7B: @ 81D9F7B +BattleScript_OpponentUsesStatusCureItem: @ 81D9F7B pause 48 - atk54 1 + playse SE_KAIFUKU printstring BATTLE_TEXT_Used2 waitmessage 64 - atk75 - printfromtable BattleTextList_401620 + useitemonopponent + printfromtable gTrainerItemCuredStatusStringIds waitmessage 64 - atk98 1 - setbyte gSharedMem + 0x1600C, 15 - atk49 1, 0 - atkf6 + updatestatusicon USER + setbyte sMOVEEND_STATE, 15 + moveend 1, 0 + finishaction -BattleScript_1D9F9C: @ 81D9F9C +BattleScript_OpponentUsesXItem: @ 81D9F9C pause 48 - atk54 1 + playse SE_KAIFUKU printstring BATTLE_TEXT_Used2 waitmessage 64 - atk75 - printfromtable BattleTextList_401570 + useitemonopponent + printfromtable gStatUpStringIds waitmessage 64 - setbyte gSharedMem + 0x1600C, 15 - atk49 1, 0 - atkf6 + setbyte sMOVEEND_STATE, 15 + moveend 1, 0 + finishaction -BattleScript_1D9FBB: @ 81D9FBB +BattleScript_OpponentUsesGuardSpecs: @ 81D9FBB pause 48 - atk54 1 + playse SE_KAIFUKU printstring BATTLE_TEXT_Used2 waitmessage 64 - atk75 - printfromtable BattleTextList_4015A0 + useitemonopponent + printfromtable gMistUsedStringIds waitmessage 64 - setbyte gSharedMem + 0x1600C, 15 - atk49 1, 0 - atkf6 + setbyte sMOVEEND_STATE, 15 + moveend 1, 0 + finishaction -BattleScript_1D9FDA: @ 81D9FDA - atk54 17 - setbyte gBattleOutcome, 4 - activesidesomething +BattleScript_RunByUsingItem: @ 81D9FDA + playse 17 + setbyte gBattleOutcome, BATTLE_RAN + finishturn -BattleScript_1D9FE4: @ 81D9FE4 +BattleScript_ActionWatchesCarefully: @ 81D9FE4 printstring BATTLE_TEXT_WatchingCarefully waitmessage 64 end2 -BattleScript_1D9FEB: @ 81D9FEB - printfromtable BattleTextList_401616 +BattleScript_ActionGetNear: @ 81D9FEB + printfromtable gSafariGetNearStringIds waitmessage 64 end2 -BattleScript_1D9FF4: @ 81D9FF4 +BattleScript_ActionThrowPokeblock: @ 81D9FF4 printstring BATTLE_TEXT_ThrewBlock waitmessage 64 playanimation USER, B_ANIM_POKEBLOCK_THROW, 0x0 - printfromtable BattleTextList_40161A + printfromtable gSafariPokeblockResultStringIds waitmessage 64 end2 BattleScript_1DA00A: @ 81DA00A printstring 2 waitmessage 64 - atk4b - waitstateatk - atk53 0 - waitstateatk + returnatktoball + waitstate + trainerslidein TARGET + waitstate printstring BATTLE_TEXT_WallyBall waitmessage 64 end2 diff --git a/data/event_scripts.s b/data/event_scripts.s index 7b69ac338..7d59b5234 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -490,7 +490,7 @@ EventScript_15F4A1: goto_if_eq EventScript_15F4E0 compare RESULT, 2 goto_if_eq EventScript_15F503 - special sub_80BC224 + special BufferSecretBaseOwnerName msgbox UnknownString_81A3958, 5 compare RESULT, 0 goto_if_eq EventScript_15F452 @@ -1809,7 +1809,7 @@ DewfordTown_EventScript_1A0102:: @ 81A0102 DewfordTown_Hall_EventScript_1A0102:: @ 81A0102 dodailyevents setvar VAR_SPECIAL_4, 0 - special sub_80FA5BC + special BufferTrendyPhraseString return DewfordTown_EventScript_1A010C:: @ 81A010C @@ -2538,7 +2538,7 @@ MossdeepCity_StevensHouse_EventScript_1A0678:: @ 81A0678 RustboroCity_DevonCorp_2F_EventScript_1A0678:: @ 81A0678 SlateportCity_House1_EventScript_1A0678:: @ 81A0678 fadescreen 1 - special sub_80BF9F8 + special ChangePokemonNickname waitstate return @@ -3792,7 +3792,7 @@ EventScript_1A2E45: compare RESULT, 0 goto_if_eq EventScript_1A2F3A fadescreen 1 - special sub_80BC50C + special MoveSecretBase closemessage fadescreen 0 msgbox UnknownString_81A3CC9, 5 @@ -4296,7 +4296,7 @@ SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A special sub_80BCE1C setvar VAR_SPECIAL_4, 1 setvar VAR_SPECIAL_5, 0 - special sub_813556C + special StartSpecialBattle waitstate special ScrSpecial_HealPlayerParty release @@ -4383,14 +4383,14 @@ BattleTower_Lobby_EventScript_1ADE46:: @ 81ADE46 FallarborTown_ContestLobby_EventScript_1ADE46:: @ 81ADE46 SlateportCity_OceanicMuseum_1F_EventScript_1ADE46:: @ 81ADE46 SlateportCity_PokemonFanClub_EventScript_1ADE46:: @ 81ADE46 - special sub_80BDE48 + special InterviewAfter incrementgamestat GAME_STAT_GOT_INTERVIEWED release end SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D setvar VAR_SPECIAL_5, 1 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADED6 copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 @@ -4435,7 +4435,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 lock faceplayer setvar VAR_SPECIAL_5, 2 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 @@ -4490,11 +4490,11 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF96:: @ 81ADF96 SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 lock faceplayer - specialvar RESULT, sub_80BF544 + specialvar RESULT, LeadMonNicknamed compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE4D setvar VAR_SPECIAL_5, 3 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0AC copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 @@ -4571,7 +4571,7 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 checkflag FLAG_TEMP_2 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E setvar VAR_SPECIAL_5, 6 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 @@ -4631,7 +4631,7 @@ VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 compare VAR_LINK_CONTEST_ROOM_STATE, 2 goto_if 5, FallarborTown_ContestLobby_EventScript_1AE1FE setvar VAR_SPECIAL_5, 6 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE1FE switch VAR_CONTEST_LOCATION @@ -4668,7 +4668,7 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF checkflag FLAG_TEMP_2 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 setvar VAR_SPECIAL_5, 7 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 @@ -4737,7 +4737,7 @@ BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE30F setvar VAR_SPECIAL_5, 7 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE30F clearflag FLAG_HIDE_REPORTER_BATTLE_TOWER diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 0a0eeaa73..0a7112125 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -87,7 +87,7 @@ DoRockSmashMovement: @ 81B0F0C applymovement LAST_TALKED, RockSmashMovement waitmovement 0 removeobject LAST_TALKED - specialvar RESULT, sub_810F5BC + specialvar RESULT, TryUpdateRusturfTunnelState compare RESULT, 1 goto_if_eq DoRockSmashMovement_Done special ScrSpecial_RockSmashWildEncounter diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 7664a14ca..8c2325e04 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -96,7 +96,7 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 end Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C - specialvar RESULT, sub_8095B6C + specialvar RESULT, GetNumValidDaycarePartyMons compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B23F3 msgbox Route117_PokemonDayCare_Text_1B2947, 4 @@ -105,7 +105,7 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C waitstate compare VAR_SPECIAL_4, 255 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 - specialvar RESULT, sub_8095C10 + specialvar RESULT, CountAlivePartyMonsExceptSelectedOne compare RESULT, 0 goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD specialvar VAR_SPECIAL_5, GetSelectedDaycareMonNickname @@ -196,7 +196,7 @@ Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8 end Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4 - specialvar RESULT, sub_80B7CE8 + specialvar RESULT, HasEnoughMoneyFor compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B24DE msgbox Route117_PokemonDayCare_Text_1B2A30, 4 @@ -207,7 +207,7 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE applymovement 1, Route117_PokemonDayCare_Movement_1B2543 waitmovement 0 specialvar RESULT, TakePokemonFromDaycare - special sub_80B7D0C + special PayMoneyFor playse 95 msgbox Route117_PokemonDayCare_Text_1B2B75, 4 waitse diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index ff45d2cff..e2f43b77e 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -248,7 +248,7 @@ Route120_EventScript_1AE60F:: @ 81AE60F compare RESULT, 0 goto_if_eq Route111_EventScript_1AE69F msgbox Route111_Text_1AC10A, 4 - specialvar RESULT, sub_80BDD18 + specialvar RESULT, GabbyAndTyGetLastBattleTrivia switch RESULT case 0, Route111_EventScript_1AE6AD case 1, Route111_EventScript_1AE6BB @@ -310,7 +310,7 @@ Route111_EventScript_1AE6F3:: @ 81AE6F3 compare RESULT, 0 goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC487, 4 - special sub_80BDC14 + special GabbyAndTyAfterInterview setflag FLAG_TEMP_1 release end diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index 343ef4233..9ad419da1 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -43,7 +43,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B setfieldeffectargument 1, 10 setfieldeffectargument 2, 0 dofieldeffect 54 - specialvar RESULT, sub_810F4D4 + specialvar RESULT, FoundAbandonedShipRoom4Key compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B waitfieldeffect 54 @@ -54,7 +54,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4 end AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 - specialvar RESULT, sub_810F488 + specialvar RESULT, FoundAbandonedShipRoom1Key compare RESULT, 1 goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA delay 20 @@ -77,7 +77,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB setfieldeffectargument 1, 3 setfieldeffectargument 2, 0 dofieldeffect 54 - specialvar RESULT, sub_810F4FC + specialvar RESULT, FoundAbandonedShipRoom6Key compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B waitfieldeffect 54 @@ -98,7 +98,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 setfieldeffectargument 1, 6 setfieldeffectargument 2, 0 dofieldeffect 54 - specialvar RESULT, sub_810F4B0 + specialvar RESULT, FoundAbandonedShipRoom2Key compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B waitfieldeffect 54 diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc index 5e8ab1062..e1e903cc0 100644 --- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc @@ -3,7 +3,7 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 815EA67 AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EA93 msgbox AbandonedShip_Rooms2_1F_Text_198835, 6 @@ -16,7 +16,7 @@ AbandonedShip_Rooms2_1F_EventScript_15EA93:: @ 815EA93 AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9 msgbox AbandonedShip_Rooms2_1F_Text_198934, 6 diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 87ba8c01a..7853b3598 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -23,16 +23,16 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA special ScrSpecial_HealPlayerParty setvar VAR_SPECIAL_4, 0 setvar VAR_SPECIAL_5, 0 - special sub_813556C + special StartSpecialBattle waitstate switch RESULT case 1, BattleTower_BattleRoom_EventScript_160961 special LoadPlayerParty setvar VAR_SPECIAL_4, 0 setvar VAR_SPECIAL_5, 5 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 14 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 @@ -40,7 +40,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA BattleTower_BattleRoom_EventScript_160961:: @ 8160961 setvar VAR_SPECIAL_4, 6 - special sub_8135668 + special SetBattleTowerProperty switch RESULT case 8, BattleTower_BattleRoom_EventScript_160A56 applymovement 1, BattleTower_BattleRoom_Movement_160AC6 @@ -53,7 +53,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 msgbox BattleTower_BattleRoom_Text_19ACDC, 4 special LoadPlayerParty special SavePlayerParty - special sub_8135A14 + special SetBattleTowerParty playfanfare 368 waitfanfare special ScrSpecial_HealPlayerParty @@ -91,14 +91,14 @@ BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 special LoadPlayerParty setvar VAR_SPECIAL_4, 0 setvar VAR_SPECIAL_5, 4 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 2 setvar VAR_SPECIAL_5, 1 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 7 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 14 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 @@ -106,7 +106,7 @@ BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 setvar VAR_SPECIAL_4, 2 - special sub_8135BA0 + special SaveBattleTowerProgress message BattleTower_BattleRoom_Text_1C6CE1 delay 60 waitmessage diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc index fccfcdb2c..6749c5623 100644 --- a/data/scripts/maps/BattleTower_Elevator.inc +++ b/data/scripts/maps/BattleTower_Elevator.inc @@ -12,7 +12,7 @@ BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 applymovement 1, BattleTower_Elevator_Movement_160835 applymovement 255, BattleTower_Elevator_Movement_160839 waitmovement 0 - special sub_810EBEC + special ShakeScreenInElevator waitstate delay 64 applymovement 1, BattleTower_Elevator_Movement_16083D diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 527bae389..4058d5aae 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -6,18 +6,18 @@ BattleTower_Lobby_MapScripts:: @ 816027E .byte 0 BattleTower_Lobby_MapScript1_160293:: @ 8160293 - special sub_813610C + special TryEnableBravoTrainerBattleTower call BattleTower_Lobby_EventScript_16029C end BattleTower_Lobby_EventScript_16029C:: @ 816029C setvar VAR_SPECIAL_4, 10 - special sub_8135668 + special SetBattleTowerProperty checkflag FLAG_RECEIVED_GOLD_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602E4 checkflag FLAG_RECEIVED_SILVER_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602CD - specialvar VAR_SPECIAL_7, sub_810F404 + specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak compare VAR_SPECIAL_7, 50 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER @@ -25,7 +25,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C return BattleTower_Lobby_EventScript_1602CD:: @ 81602CD - specialvar VAR_SPECIAL_7, sub_810F404 + specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak compare VAR_SPECIAL_7, 100 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER @@ -76,7 +76,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 message BattleTower_Lobby_Text_19A487 waitmessage setvar VAR_SPECIAL_4, 0 - special sub_81358A4 + special BattleTowerUtil compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_16037D special AwardBattleTowerRibbons @@ -90,23 +90,23 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 BattleTower_Lobby_EventScript_16037D:: @ 816037D setvar VAR_SPECIAL_4, 8 - special sub_81358A4 + special BattleTowerUtil compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1603AD message BattleTower_Lobby_Text_19A589 waitmessage setvar VAR_SPECIAL_4, 13 - special sub_8135668 + special SetBattleTowerProperty special DetermineBattleTowerPrize setvar VAR_SPECIAL_4, 3 - special sub_8135BA0 + special SaveBattleTowerProgress playse 55 waitse BattleTower_Lobby_EventScript_1603AD:: @ 81603AD setvar VAR_SPECIAL_4, 0 setvar VAR_SPECIAL_5, 3 - special sub_8135668 + special SetBattleTowerProperty message BattleTower_Lobby_Text_19A4BB waitmessage special GiveBattleTowerPrize @@ -117,7 +117,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD playfanfare 370 waitfanfare setvar VAR_SPECIAL_4, 9 - special sub_81358A4 + special BattleTowerUtil compare RESULT, 49 goto_if 5, BattleTower_Lobby_EventScript_1603F8 msgbox BattleTower_Lobby_Text_19A617, 4 @@ -145,9 +145,9 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 message BattleTower_Lobby_Text_19A589 waitmessage setvar VAR_SPECIAL_4, 13 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 0 - special sub_8135BA0 + special SaveBattleTowerProgress playse 55 waitse msgbox BattleTower_Lobby_Text_199FA9, 4 @@ -165,15 +165,15 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B message BattleTower_Lobby_Text_19A5CE waitmessage setvar VAR_SPECIAL_4, 1 - special sub_8135BA0 + special SaveBattleTowerProgress playse 55 waitse setvar VAR_SPECIAL_4, 8 setvar VAR_SPECIAL_5, 0 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_TEMP_0, 5 special SavePlayerParty - special sub_8135A14 + special SetBattleTowerParty msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage call BattleTower_Lobby_EventScript_160664 @@ -185,7 +185,7 @@ BattleTower_Lobby_EventScript_16049E:: @ 816049E lock faceplayer setvar VAR_SPECIAL_4, 0 - special sub_81358A4 + special BattleTowerUtil compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_160342 special SavePlayerParty @@ -214,7 +214,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA setvar VAR_SPECIAL_4, 1 copyvar VAR_SPECIAL_5, RESULT copyvar VAR_SPECIAL_6, RESULT - special sub_8135668 + special SetBattleTowerProperty msgbox BattleTower_Lobby_Text_19A07B, 4 fadescreen 1 special ChooseBattleTowerPlayerParty @@ -229,16 +229,16 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA BattleTower_Lobby_EventScript_160587:: @ 8160587 setvar VAR_SPECIAL_4, 5 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_TEMP_0, 0 setvar VAR_SPECIAL_4, 11 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 0 setvar VAR_SPECIAL_5, 1 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 8 setvar VAR_SPECIAL_5, 0 - special sub_8135668 + special SetBattleTowerProperty special LoadPlayerParty closemessage delay 2 @@ -249,7 +249,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 goto_if_eq BattleTower_Lobby_EventScript_160642 incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER special SavePlayerParty - special sub_8135A14 + special SetBattleTowerParty setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1 msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage @@ -277,7 +277,7 @@ BattleTower_Lobby_EventScript_160635:: @ 8160635 BattleTower_Lobby_EventScript_160642:: @ 8160642 setvar VAR_SPECIAL_4, 12 - special sub_8135668 + special SetBattleTowerProperty goto BattleTower_Lobby_EventScript_160652 BattleTower_Lobby_EventScript_16064F:: @ 816064F @@ -286,7 +286,7 @@ BattleTower_Lobby_EventScript_16064F:: @ 816064F BattleTower_Lobby_EventScript_160652:: @ 8160652 msgbox BattleTower_Lobby_Text_199FA9, 4 setvar VAR_SPECIAL_4, 11 - special sub_8135668 + special SetBattleTowerProperty BattleTower_Lobby_EventScript_160662:: @ 8160662 release @@ -402,7 +402,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 end BattleTower_Lobby_EventScript_160773:: @ 8160773 - specialvar RESULT, sub_810F404 + specialvar RESULT, GetBestBattleTowerStreak compare RESULT, 100 goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index ee702c102..669b0a5fe 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -65,7 +65,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 special ScrSpecial_StartGroudonKyogreBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar RESULT, sub_810E300 + specialvar RESULT, GetBattleOutcome compare RESULT, 1 call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 setflag FLAG_HIDE_WALLACE_SOOTOPOLIS diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index e54ef8e50..530a4e04d 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -5,7 +5,7 @@ DewfordTown_Hall_EventScript_153293:: @ 8153293 lock faceplayer call DewfordTown_Hall_EventScript_1A0102 - special sub_80FA5E4 + special TrendyPhraseIsOld compare RESULT, 1 goto_if_eq DewfordTown_Hall_EventScript_1532B2 msgbox DewfordTown_Hall_Text_1754C9, 4 @@ -29,7 +29,7 @@ DewfordTown_Hall_EventScript_1532CD:: @ 81532CD lock faceplayer call DewfordTown_Hall_EventScript_1A0102 - special sub_80EB83C + special BufferRandomHobbyOrLifestyleString msgbox DewfordTown_Hall_Text_1755F9, 5 compare RESULT, 1 goto_if_eq DewfordTown_Hall_EventScript_1532F6 @@ -87,7 +87,7 @@ DewfordTown_Hall_EventScript_153353:: @ 8153353 DewfordTown_Hall_EventScript_153363:: @ 8153363 lockall call DewfordTown_Hall_EventScript_1A0102 - special sub_80FA648 + special GetDewfordHallPaintingNameIndex switch RESULT case 0, DewfordTown_Hall_EventScript_1533CA case 4, DewfordTown_Hall_EventScript_1533CA @@ -133,7 +133,7 @@ DewfordTown_Hall_EventScript_1533FE:: @ 81533FE DewfordTown_Hall_EventScript_15340A:: @ 815340A call DewfordTown_Hall_EventScript_1A0102 - special sub_80FA648 + special GetDewfordHallPaintingNameIndex switch RESULT case 0, DewfordTown_Hall_EventScript_153470 case 1, DewfordTown_Hall_EventScript_153470 diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index a0fd0ac3d..270575bcb 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -11,7 +11,7 @@ FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD setvar CONTEST_RANK, 1 call FallarborTown_ContestLobby_EventScript_1A4E92 call FallarborTown_ContestLobby_EventScript_1539F8 - special sub_80C4BF0 + special SetContestTrainerGfxIds call FallarborTown_ContestLobby_EventScript_15FBDB setvar VAR_CONTEST_LOCATION, 2 warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 081850326..0546ef5be 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -24,11 +24,11 @@ FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 msgbox FallarborTown_House2_Text_177C3F, 4 - special sub_80F9A4C + special SelectMoveTutorMon waitstate compare VAR_SPECIAL_4, 255 goto_if_eq FallarborTown_House2_EventScript_153D60 - special sub_80FA148 + special IsSelectedMonEgg compare RESULT, 1 goto_if_eq FallarborTown_House2_EventScript_153D52 compare VAR_SPECIAL_5, 0 @@ -38,7 +38,7 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 FallarborTown_House2_EventScript_153D1A:: @ 8153D1A msgbox FallarborTown_House2_Text_177C5D, 4 - special sub_8132670 + special TeachMoveTutorMove waitstate compare VAR_SPECIAL_4, 0 goto_if_eq FallarborTown_House2_EventScript_153CE4 diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index aee4141a8..f6f8aafa6 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -8,25 +8,25 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 goto_if_eq FortreeCity_House1_EventScript_157EAD setvar VAR_SPECIAL_8, 1 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 - specialvar RESULT, sub_804D89C + specialvar RESULT, GetInGameTradeSpeciesInfo copyvar VAR_SPECIAL_9, RESULT msgbox FortreeCity_House1_Text_18568C, 5 compare RESULT, 0 goto_if_eq FortreeCity_House1_EventScript_157E95 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 compare VAR_SPECIAL_4, 255 goto_if_eq FortreeCity_House1_EventScript_157E95 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - specialvar RESULT, sub_804DB2C + specialvar RESULT, GetTradeSpecies copyvar VAR_SPECIAL_B, RESULT compare RESULT, VAR_SPECIAL_9 goto_if 5, FortreeCity_House1_EventScript_157E9F copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - special sub_804DB68 - special sub_804E174 + special CreateInGameTradePokemon + special DoInGameTradeScene waitstate bufferspeciesname 0, VAR_SPECIAL_9 msgbox FortreeCity_House1_Text_1856F7, 4 diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index 1a4fd9bdc..bf1f0233d 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -24,7 +24,7 @@ JaggedPass_EventScript_15D285:: @ 815D285 JaggedPass_EventScript_15D29C:: @ 815D29C trainerbattle 0, OPPONENT_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq JaggedPass_EventScript_15D2C3 msgbox JaggedPass_Text_195F04, 6 @@ -37,7 +37,7 @@ JaggedPass_EventScript_15D2C3:: @ 815D2C3 JaggedPass_EventScript_15D2DA:: @ 815D2DA trainerbattle 0, OPPONENT_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq JaggedPass_EventScript_15D301 msgbox JaggedPass_Text_196077, 6 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 7a13b1c48..377c2908d 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -575,7 +575,7 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 setvar CONTEST_RANK, 3 call LilycoveCity_ContestLobby_EventScript_1A4E92 call LilycoveCity_ContestLobby_EventScript_158F86 - special sub_80C4BF0 + special SetContestTrainerGfxIds call LilycoveCity_ContestLobby_EventScript_15FBDB setvar VAR_CONTEST_LOCATION, 4 call LilycoveCity_ContestLobby_EventScript_158F08 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 00a10b655..7e221122b 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -8,7 +8,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1 call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 checkflag FLAG_TEMP_2 call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD - specialvar RESULT, sub_8090FC0 + specialvar RESULT, CompletedHoennPokedex compare RESULT, 1 goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 release diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 8233504dd..1198054f0 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C checkflag FLAG_TEMP_2 call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF copyvar VAR_SPECIAL_5, VAR_DEPT_STORE_FLOOR - special sub_810E944 + special DisplayCurrentElevatorFloor message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 waitmessage multichoice 0, 0, 57, 0 @@ -74,7 +74,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8 erasebox 0, 0, 29, 19 applymovement LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_1A0845 waitmovement 0 - special sub_810EBEC + special ShakeScreenInElevator waitstate setflag FLAG_TEMP_2 return diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index a9680e3a5..d4dedb0c2 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -21,7 +21,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E waitmessage special RetrieveLotteryNumber copyvar VAR_SPECIAL_8, RESULT - special sub_810F9AC + special BufferLottoTicketNumber msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 waitmovement 0 diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 1024d30e9..a3c8d23af 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -14,11 +14,11 @@ LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate compare VAR_SPECIAL_4, 255 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B - special sub_80FA148 + special IsSelectedMonEgg compare RESULT, 1 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B71 special ScrSpecial_CountPokemonMoves @@ -26,7 +26,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64 msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4 fadescreen 1 - special sub_80F9EEC + special SelectMove fadescreen 0 compare VAR_SPECIAL_5, 4 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE @@ -39,7 +39,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE end LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53 - special sub_80FA0DC + special DeleteMonMove playfanfare 378 waitfanfare msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, 4 diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index 2db702ffc..4656f0182 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -68,37 +68,37 @@ LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 end LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 - special sub_810FCE8 + special UpdateMovedLilycoveFanClubMembers setvar VAR_SPECIAL_4, 8 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 setvar VAR_SPECIAL_4, 9 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD setvar VAR_SPECIAL_4, 10 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 setvar VAR_SPECIAL_4, 11 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED setvar VAR_SPECIAL_4, 12 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 setvar VAR_SPECIAL_4, 13 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD setvar VAR_SPECIAL_4, 14 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 setvar VAR_SPECIAL_4, 15 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D end @@ -147,13 +147,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F lock faceplayer setvar VAR_SPECIAL_4, 13 - special sub_810FDAC + special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159592 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A400, 4 @@ -161,7 +161,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F end LilycoveCity_PokemonTrainerFanClub_EventScript_15956E:: @ 815956E - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159588 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, 4 @@ -187,13 +187,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 lock faceplayer setvar VAR_SPECIAL_4, 8 - special sub_810FDAC + special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159609 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A629, 4 @@ -201,7 +201,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 end LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5:: @ 81595E5 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, 4 @@ -227,13 +227,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D lock faceplayer setvar VAR_SPECIAL_4, 9 - special sub_810FDAC + special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159680 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A814, 4 @@ -241,7 +241,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D end LilycoveCity_PokemonTrainerFanClub_EventScript_15965C:: @ 815965C - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159676 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, 4 @@ -267,13 +267,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 lock faceplayer setvar VAR_SPECIAL_4, 10 - special sub_810FDAC + special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB0A, 4 @@ -281,7 +281,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 end LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3:: @ 81596D3 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, 4 @@ -307,11 +307,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B lock faceplayer setvar VAR_SPECIAL_4, 11 - special sub_810FDAC - specialvar RESULT, sub_810FD60 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159763 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ACC7, 4 @@ -319,7 +319,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B end LilycoveCity_PokemonTrainerFanClub_EventScript_15973F:: @ 815973F - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159759 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, 4 @@ -340,11 +340,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D lock faceplayer setvar VAR_SPECIAL_4, 12 - special sub_810FDAC - specialvar RESULT, sub_810FD60 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AE63, 4 @@ -352,7 +352,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D end LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1:: @ 81597A1 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, 4 @@ -373,11 +373,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF lock faceplayer setvar VAR_SPECIAL_4, 14 - special sub_810FDAC - specialvar RESULT, sub_810FD60 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159803 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159827 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B030, 4 @@ -385,7 +385,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF end LilycoveCity_PokemonTrainerFanClub_EventScript_159803:: @ 8159803 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, 4 @@ -406,11 +406,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 lock faceplayer setvar VAR_SPECIAL_4, 15 - special sub_810FDAC - specialvar RESULT, sub_810FD60 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159865 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159889 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B1FD, 4 @@ -418,7 +418,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 end LilycoveCity_PokemonTrainerFanClub_EventScript_159865:: @ 8159865 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, 4 diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 6befb5fb9..c2b785254 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -525,7 +525,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 0 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -536,7 +536,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 1 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -547,7 +547,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 2 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -558,7 +558,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 3 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -569,7 +569,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 4 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -580,7 +580,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 5 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -591,7 +591,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 6 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -602,7 +602,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 7 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -613,7 +613,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 8 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -624,7 +624,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 9 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -635,7 +635,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 10 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -646,7 +646,7 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 11 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/scripts/maps/MeteorFalls_1F_2R.inc index b3a0c51fe..49d629294 100644 --- a/data/scripts/maps/MeteorFalls_1F_2R.inc +++ b/data/scripts/maps/MeteorFalls_1F_2R.inc @@ -3,7 +3,7 @@ MeteorFalls_1F_2R_MapScripts:: @ 815C678 MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 trainerbattle 0, OPPONENT_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6A0 msgbox MeteorFalls_1F_2R_Text_193A60, 6 @@ -16,7 +16,7 @@ MeteorFalls_1F_2R_EventScript_15C6A0:: @ 815C6A0 MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7 trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6E2 msgbox MeteorFalls_1F_2R_Text_193C35, 6 @@ -29,7 +29,7 @@ MeteorFalls_1F_2R_EventScript_15C6E2:: @ 815C6E2 MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C728 msgbox MeteorFalls_1F_2R_Text_193D9A, 6 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 1e7c26511..ad3b366a8 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -92,7 +92,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 special SavePlayerParty - special sub_810F414 + special BufferEReaderTrainerName msgbox MossdeepCity_GameCorner_1F_Text_18E650, 5 compare RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 9395633e7..9f20b6310 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -20,7 +20,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E closemessage setvar VAR_SPECIAL_4, 2 setvar VAR_SPECIAL_5, 0 - special sub_813556C + special StartSpecialBattle waitstate compare RESULT, 3 call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AED5 diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index a831f0dcc..d93ec772a 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -440,7 +440,7 @@ MtChimney_EventScript_15D1DA:: @ 815D1DA MtChimney_EventScript_15D1E3:: @ 815D1E3 trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MtChimney_EventScript_15D20A msgbox MtChimney_Text_195A04, 6 diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/scripts/maps/MtPyre_6F.inc index 433b533b3..ae09300a3 100644 --- a/data/scripts/maps/MtPyre_6F.inc +++ b/data/scripts/maps/MtPyre_6F.inc @@ -3,7 +3,7 @@ MtPyre_6F_MapScripts:: @ 815D447 MtPyre_6F_EventScript_15D448:: @ 815D448 trainerbattle 0, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MtPyre_6F_EventScript_15D46F msgbox MtPyre_6F_Text_196A4C, 6 diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index f073201ca..df7f42a8b 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -25,7 +25,7 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK goto_if 0, PacifidlogTown_House2_EventScript_1A14DC - specialvar RESULT, sub_810F908 + specialvar RESULT, GetDaysUntilPacifidlogTMAvailable compare RESULT, 0 call_if 1, PacifidlogTown_House2_EventScript_1541E8 return @@ -49,7 +49,7 @@ PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK - special sub_810F950 + special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_179283, 4 release end @@ -65,13 +65,13 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK - special sub_810F950 + special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_179283, 4 release end PacifidlogTown_House2_EventScript_154254:: @ 8154254 - specialvar RESULT, sub_810F908 + specialvar RESULT, GetDaysUntilPacifidlogTMAvailable buffernumberstring 0, RESULT msgbox PacifidlogTown_House2_Text_1792F2, 4 release diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index b65c2e67d..f5f93f05a 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -8,25 +8,25 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E goto_if_eq PacifidlogTown_House3_EventScript_154338 setvar VAR_SPECIAL_8, 2 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 - specialvar RESULT, sub_804D89C + specialvar RESULT, GetInGameTradeSpeciesInfo copyvar VAR_SPECIAL_9, RESULT msgbox PacifidlogTown_House3_Text_17940E, 5 compare RESULT, 0 goto_if_eq PacifidlogTown_House3_EventScript_154320 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 compare VAR_SPECIAL_4, 255 goto_if_eq PacifidlogTown_House3_EventScript_154320 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - specialvar RESULT, sub_804DB2C + specialvar RESULT, GetTradeSpecies copyvar VAR_SPECIAL_B, RESULT compare RESULT, VAR_SPECIAL_9 goto_if 5, PacifidlogTown_House3_EventScript_15432A copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - special sub_804DB68 - special sub_804E174 + special CreateInGameTradePokemon + special DoInGameTradeScene waitstate bufferspeciesname 0, VAR_SPECIAL_9 msgbox PacifidlogTown_House3_Text_1794C4, 4 diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 83bfe7da4..73eb4f661 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -271,7 +271,7 @@ PetalburgWoods_EventScript_15CF27:: @ 815CF27 PetalburgWoods_EventScript_15CF3E:: @ 815CF3E trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq PetalburgWoods_EventScript_15CF65 msgbox PetalburgWoods_Text_1952CC, 6 diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc index 95a0a4a1f..ad1571caa 100644 --- a/data/scripts/maps/Route102.inc +++ b/data/scripts/maps/Route102.inc @@ -19,7 +19,7 @@ Route102_EventScript_14EAF5:: @ 814EAF5 Route102_EventScript_14EAFE:: @ 814EAFE trainerbattle 0, OPPONENT_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route102_EventScript_14EB25 msgbox Route102_Text_1B7A60, 6 diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 35994cd45..bfcbeb87a 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -173,7 +173,7 @@ Route103_EventScript_14ED94:: @ 814ED94 Route103_EventScript_14EDAB:: @ 814EDAB trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route103_EventScript_14EDD6 msgbox Route103_Text_1B7E50, 6 @@ -186,7 +186,7 @@ Route103_EventScript_14EDD6:: @ 814EDD6 Route103_EventScript_14EDF1:: @ 814EDF1 trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route103_EventScript_14EE1C msgbox Route103_Text_1B7F40, 6 @@ -204,7 +204,7 @@ Route103_EventScript_14EE37:: @ 814EE37 Route103_EventScript_14EE4E:: @ 814EE4E trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route103_EventScript_14EE75 msgbox Route103_Text_1B830D, 6 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index b97d92c7d..c90a97531 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -409,7 +409,7 @@ Route104_EventScript_14F189:: @ 814F189 Route104_EventScript_14F1A0:: @ 814F1A0 trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F1C7 msgbox Route104_Text_1B87C3, 6 @@ -422,7 +422,7 @@ Route104_EventScript_14F1C7:: @ 814F1C7 Route104_EventScript_14F1DE:: @ 814F1DE trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F205 msgbox Route104_Text_1B8925, 6 @@ -435,7 +435,7 @@ Route104_EventScript_14F205:: @ 814F205 Route104_EventScript_14F21C:: @ 814F21C trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F243 msgbox Route104_Text_1B8A69, 6 diff --git a/data/scripts/maps/Route106.inc b/data/scripts/maps/Route106.inc index 2ec903363..ae65c7013 100644 --- a/data/scripts/maps/Route106.inc +++ b/data/scripts/maps/Route106.inc @@ -17,7 +17,7 @@ Route106_EventScript_14F34F:: @ 814F34F Route106_EventScript_14F366:: @ 814F366 trainerbattle 0, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route106_EventScript_14F38D msgbox Route106_Text_1B8F55, 6 diff --git a/data/scripts/maps/Route107.inc b/data/scripts/maps/Route107.inc index b6973407b..ad2d293fc 100644 --- a/data/scripts/maps/Route107.inc +++ b/data/scripts/maps/Route107.inc @@ -8,7 +8,7 @@ Route107_EventScript_14F3BC:: @ 814F3BC Route107_EventScript_14F3D3:: @ 814F3D3 trainerbattle 0, OPPONENT_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route107_EventScript_14F3FA msgbox Route107_Text_1B938E, 6 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index f56081097..28bf046a4 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -396,7 +396,7 @@ Route109_EventScript_14F7F2:: @ 814F7F2 Route109_EventScript_14F809:: @ 814F809 trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route109_EventScript_14F830 msgbox Route109_Text_1B9C6E, 6 @@ -409,7 +409,7 @@ Route109_EventScript_14F830:: @ 814F830 Route109_EventScript_14F847:: @ 814F847 trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route109_EventScript_14F86E msgbox Route109_Text_1B9D8E, 6 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 2b4293ed4..586031a1a 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -177,7 +177,7 @@ Route110_EventScript_14FAA5:: @ 814FAA5 Route110_EventScript_14FABC:: @ 814FABC trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FAE3 msgbox Route110_Text_1BA829, 6 @@ -205,7 +205,7 @@ Route110_EventScript_14FB28:: @ 814FB28 Route110_EventScript_14FB3F:: @ 814FB3F trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FB66 msgbox Route110_Text_1BA3A5, 6 @@ -223,7 +223,7 @@ Route110_EventScript_14FB7D:: @ 814FB7D Route110_EventScript_14FB94:: @ 814FB94 trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FBBB msgbox Route110_Text_1BA52E, 6 @@ -236,7 +236,7 @@ Route110_EventScript_14FBBB:: @ 814FBBB Route110_EventScript_14FBD2:: @ 814FBD2 trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FBF9 msgbox Route110_Text_1BA9E9, 6 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index aa136559b..5336bd510 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -392,7 +392,7 @@ Route111_EventScript_1503EC:: @ 81503EC Route111_EventScript_150403:: @ 8150403 trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_15042A msgbox Route111_Text_1BAF5B, 6 @@ -420,7 +420,7 @@ Route111_EventScript_15046F:: @ 815046F Route111_EventScript_150486:: @ 8150486 trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_1504AD msgbox Route111_Text_1BB33E, 6 @@ -433,7 +433,7 @@ Route111_EventScript_1504AD:: @ 81504AD Route111_EventScript_1504C4:: @ 81504C4 trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_1504EB msgbox Route111_Text_1BB4CE, 6 diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc index f38a296e7..83d93f222 100644 --- a/data/scripts/maps/Route112.inc +++ b/data/scripts/maps/Route112.inc @@ -38,7 +38,7 @@ Route112_EventScript_150549:: @ 8150549 Route112_EventScript_150560:: @ 8150560 trainerbattle 0, OPPONENT_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route112_EventScript_150587 msgbox Route112_Text_1BB721, 6 diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 82f7855e1..1b589fcde 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -60,7 +60,7 @@ Route113_EventScript_150652:: @ 8150652 Route113_EventScript_150669:: @ 8150669 trainerbattle 0, OPPONENT_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route113_EventScript_150690 msgbox Route113_Text_1BBB9A, 6 @@ -73,7 +73,7 @@ Route113_EventScript_150690:: @ 8150690 Route113_EventScript_1506A7:: @ 81506A7 trainerbattle 0, OPPONENT_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route113_EventScript_1506CE msgbox Route113_Text_1BBCAB, 6 diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 302c162b0..f6bb6d8ba 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -87,7 +87,7 @@ Route114_EventScript_150836:: @ 8150836 Route114_EventScript_15084D:: @ 815084D trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route114_EventScript_150874 msgbox Route114_Text_1BC337, 6 @@ -100,7 +100,7 @@ Route114_EventScript_150874:: @ 8150874 Route114_EventScript_15088B:: @ 815088B trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route114_EventScript_1508B2 msgbox Route114_Text_1BC4B5, 6 diff --git a/data/scripts/maps/Route115.inc b/data/scripts/maps/Route115.inc index 8e0eb7855..f16c2088a 100644 --- a/data/scripts/maps/Route115.inc +++ b/data/scripts/maps/Route115.inc @@ -15,7 +15,7 @@ Route115_EventScript_150940:: @ 8150940 Route115_EventScript_150949:: @ 8150949 trainerbattle 0, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route115_EventScript_150970 msgbox Route115_Text_1BCA0E, 6 @@ -33,7 +33,7 @@ Route115_EventScript_150987:: @ 8150987 Route115_EventScript_15099E:: @ 815099E trainerbattle 0, OPPONENT_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route115_EventScript_1509C5 msgbox Route115_Text_1BCBDE, 6 @@ -46,7 +46,7 @@ Route115_EventScript_1509C5:: @ 81509C5 Route115_EventScript_1509DC:: @ 81509DC trainerbattle 0, OPPONENT_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route115_EventScript_150A03 msgbox Route115_Text_1BCD4C, 6 diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 5fab808bc..4e08705cf 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -240,7 +240,7 @@ Route116_EventScript_150C79:: @ 8150C79 Route116_EventScript_150C90:: @ 8150C90 trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route116_EventScript_150CB7 msgbox Route116_Text_1BD248, 6 @@ -263,7 +263,7 @@ Route116_EventScript_150CE5:: @ 8150CE5 Route116_EventScript_150CFC:: @ 8150CFC trainerbattle 0, OPPONENT_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route116_EventScript_150D23 msgbox Route116_Text_1BD3C3, 6 diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 44c4c156c..fa648f79e 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -40,7 +40,7 @@ Route117_EventScript_150D84:: @ 8150D84 Route117_EventScript_150D8D:: @ 8150D8D trainerbattle 0, OPPONENT_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150DB4 msgbox Route117_Text_1BD4F9, 6 @@ -53,7 +53,7 @@ Route117_EventScript_150DB4:: @ 8150DB4 Route117_EventScript_150DCB:: @ 8150DCB trainerbattle 0, OPPONENT_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150DF2 msgbox Route117_Text_1BD69B, 6 @@ -66,7 +66,7 @@ Route117_EventScript_150DF2:: @ 8150DF2 Route117_EventScript_150E09:: @ 8150E09 trainerbattle 0, OPPONENT_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150E30 msgbox Route117_Text_1BD7F5, 6 @@ -79,7 +79,7 @@ Route117_EventScript_150E30:: @ 8150E30 Route117_EventScript_150E47:: @ 8150E47 trainerbattle 0, OPPONENT_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150E6E msgbox Route117_Text_1BD98F, 6 @@ -97,7 +97,7 @@ Route117_EventScript_150E85:: @ 8150E85 Route117_EventScript_150E9C:: @ 8150E9C trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150EC7 msgbox Route117_Text_1BDC44, 6 @@ -110,7 +110,7 @@ Route117_EventScript_150EC7:: @ 8150EC7 Route117_EventScript_150EE2:: @ 8150EE2 trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150F0D msgbox Route117_Text_1BDD4E, 6 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index b34c22a50..63decb5d6 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -161,7 +161,7 @@ Route118_Movement_151086:: @ 8151086 Route118_EventScript_15108F:: @ 815108F trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route118_EventScript_1510B6 msgbox Route118_Text_1BE05E, 6 @@ -184,7 +184,7 @@ Route118_EventScript_1510E4:: @ 81510E4 Route118_EventScript_1510FB:: @ 81510FB trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route118_EventScript_151122 msgbox Route118_Text_1BE413, 6 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 95edf346c..e82d7b313 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -296,7 +296,7 @@ Route119_EventScript_1514A8:: @ 81514A8 Route119_EventScript_1514BF:: @ 81514BF trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route119_EventScript_1514E6 msgbox Route119_Text_1BE937, 6 @@ -309,7 +309,7 @@ Route119_EventScript_1514E6:: @ 81514E6 Route119_EventScript_1514FD:: @ 81514FD trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route119_EventScript_151524 msgbox Route119_Text_1BEAB3, 6 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 9e5ff95be..d2866cceb 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -292,7 +292,7 @@ Route120_EventScript_1519B3:: @ 81519B3 Route120_EventScript_1519CA:: @ 81519CA trainerbattle 0, OPPONENT_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route120_EventScript_1519F1 msgbox Route120_Text_1BF0C3, 6 @@ -315,7 +315,7 @@ Route120_EventScript_151A1F:: @ 8151A1F Route120_EventScript_151A36:: @ 8151A36 trainerbattle 0, OPPONENT_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route120_EventScript_151A5D msgbox Route120_Text_1BF38D, 6 diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index d1f153117..6108b129d 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -73,7 +73,7 @@ Route121_EventScript_151B72:: @ 8151B72 Route121_EventScript_151B89:: @ 8151B89 trainerbattle 0, OPPONENT_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route121_EventScript_151BB0 msgbox Route121_Text_1BFA9D, 6 @@ -101,7 +101,7 @@ Route121_EventScript_151BF9:: @ 8151BF9 Route121_EventScript_151C14:: @ 8151C14 trainerbattle 0, OPPONENT_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route121_EventScript_151C3B msgbox Route121_Text_1BFEAE, 6 diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index adfebfe08..a25c306cc 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -62,7 +62,7 @@ Route123_EventScript_151CFF:: @ 8151CFF Route123_EventScript_151D16:: @ 8151D16 trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route123_EventScript_151D3D msgbox Route123_Text_1C01B1, 6 @@ -75,7 +75,7 @@ Route123_EventScript_151D3D:: @ 8151D3D Route123_EventScript_151D54:: @ 8151D54 trainerbattle 0, OPPONENT_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route123_EventScript_151D7B msgbox Route123_Text_1C030F, 6 diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index 3e062bfdc..289ea2d29 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -23,7 +23,7 @@ Route124_EventScript_151E0F:: @ 8151E0F Route124_EventScript_151E26:: @ 8151E26 trainerbattle 0, OPPONENT_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route124_EventScript_151E4D msgbox Route124_Text_1C080E, 6 @@ -46,7 +46,7 @@ Route124_EventScript_151E7B:: @ 8151E7B Route124_EventScript_151E92:: @ 8151E92 trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route124_EventScript_151EBD msgbox Route124_Text_1C0B72, 6 @@ -59,7 +59,7 @@ Route124_EventScript_151EBD:: @ 8151EBD Route124_EventScript_151ED8:: @ 8151ED8 trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route124_EventScript_151F03 msgbox Route124_Text_1C0C7F, 6 diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index ea24434e2..58bf75c51 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -29,7 +29,7 @@ Route125_EventScript_151F73:: @ 8151F73 Route125_EventScript_151F8A:: @ 8151F8A trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route125_EventScript_151FB1 msgbox Route125_Text_1C1208, 6 diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 7a08d0acb..a97a1e93f 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -182,7 +182,7 @@ Route128_Movement_1522A1:: @ 81522A1 Route128_EventScript_1522A4:: @ 81522A4 trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route128_EventScript_1522CB msgbox Route128_Text_1C1CC3, 6 @@ -195,7 +195,7 @@ Route128_EventScript_1522CB:: @ 81522CB Route128_EventScript_1522E2:: @ 81522E2 trainerbattle 0, OPPONENT_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route128_EventScript_152309 msgbox Route128_Text_1C1E4A, 6 diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index cf91c31bd..2e0d106bb 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -8,25 +8,25 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D goto_if_eq RustboroCity_House1_EventScript_157D13 setvar VAR_SPECIAL_8, 0 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 - specialvar RESULT, sub_804D89C + specialvar RESULT, GetInGameTradeSpeciesInfo copyvar VAR_SPECIAL_9, RESULT msgbox RustboroCity_House1_Text_184EBA, 5 compare RESULT, 0 goto_if_eq RustboroCity_House1_EventScript_157CFB - special sub_80F9A0C + special SelectMonForNPCTrade waitstate copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 compare VAR_SPECIAL_4, 255 goto_if_eq RustboroCity_House1_EventScript_157CFB copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - specialvar RESULT, sub_804DB2C + specialvar RESULT, GetTradeSpecies copyvar VAR_SPECIAL_B, RESULT compare RESULT, VAR_SPECIAL_9 goto_if 5, RustboroCity_House1_EventScript_157D05 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - special sub_804DB68 - special sub_804E174 + special CreateInGameTradePokemon + special DoInGameTradeScene waitstate msgbox RustboroCity_House1_Text_184F6B, 4 setflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index 72528a929..2fd62e9af 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -11,7 +11,7 @@ SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D setvar CONTEST_RANK, 2 call SlateportCity_ContestLobby_EventScript_1A4E92 call SlateportCity_ContestLobby_EventScript_155448 - special sub_80C4BF0 + special SetContestTrainerGfxIds call SlateportCity_ContestLobby_EventScript_15FBDB setvar VAR_CONTEST_LOCATION, 3 warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index e760beab5..aa1157d7e 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -13,7 +13,7 @@ SlateportCity_House1_EventScript_15567B:: @ 815567B SlateportCity_House1_EventScript_15569C:: @ 815569C msgbox SlateportCity_House1_Text_17D4DB, 4 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate compare VAR_SPECIAL_4, 255 goto_if 5, SlateportCity_House1_EventScript_1556C9 @@ -30,12 +30,12 @@ SlateportCity_House1_EventScript_1556C9:: @ 81556C9 specialvar RESULT, ScriptGetPartyMonSpecies compare RESULT, SPECIES_EGG goto_if_eq SlateportCity_House1_EventScript_15571C - special sub_80BFAE0 - special sub_80BFB10 + special TV_CopyNicknameToStringVar1AndEnsureTerminated + special TV_CheckMonOTIDEqualsPlayerID compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 - specialvar RESULT, sub_810F96C - special sub_80BFAE0 + specialvar RESULT, MonOTNameMatchesPlayer + special TV_CopyNicknameToStringVar1AndEnsureTerminated compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 msgbox SlateportCity_House1_Text_17D505, 5 @@ -58,8 +58,8 @@ SlateportCity_House1_EventScript_155726:: @ 8155726 SlateportCity_House1_EventScript_155730:: @ 8155730 msgbox SlateportCity_House1_Text_17D580, 4 call SlateportCity_House1_EventScript_1A0678 - specialvar RESULT, sub_80BF9B4 - special sub_80BFAE0 + specialvar RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged + special TV_CopyNicknameToStringVar1AndEnsureTerminated compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_15575A msgbox SlateportCity_House1_Text_17D63A, 4 diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 9f2d6c35b..38514b03b 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -15,7 +15,7 @@ SootopolisCity_Gym_1F_MapScript1_15AF22:: @ 815AF22 SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 call SootopolisCity_Gym_1F_EventScript_15AF2E - special sub_8069D78 + special SetSootopolisGymCrackedIceMetatiles end SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index 6a72ec1da..91dd3490b 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -6,7 +6,7 @@ SootopolisCity_House8_EventScript_15B401:: @ 815B401 lock faceplayer msgbox SootopolisCity_House8_Text_1900F7, 4 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate copyvar RESULT, VAR_SPECIAL_4 compare RESULT, 255 @@ -55,7 +55,7 @@ SootopolisCity_House8_EventScript_15B492:: @ 815B492 lock faceplayer msgbox SootopolisCity_House8_Text_190431, 4 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate copyvar RESULT, VAR_SPECIAL_4 compare RESULT, 255 diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 568d9b207..016b2e7ba 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -11,7 +11,7 @@ VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76 setvar CONTEST_RANK, 0 call VerdanturfTown_ContestLobby_EventScript_1A4E92 call VerdanturfTown_ContestLobby_EventScript_153DA1 - special sub_80C4BF0 + special SetContestTrainerGfxIds call VerdanturfTown_ContestLobby_EventScript_15FBDB setvar VAR_CONTEST_LOCATION, 1 warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index a206d5531..ed0440343 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -93,7 +93,7 @@ VictoryRoad_1F_EventScript_15DF28:: @ 815DF28 VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 trainerbattle 0, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq VictoryRoad_1F_EventScript_15DF58 msgbox VictoryRoad_1F_Text_197A47, 6 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 4a659f469..eb12ab148 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -53,7 +53,7 @@ FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B770E msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 - specialvar RESULT, sub_810CA00 + specialvar RESULT, GetFirstFreePokeblockSlot compare RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B76EF compare RESULT, 65535 @@ -94,7 +94,7 @@ FallarborTown_ContestLobby_EventScript_1B7734:: @ 81B7734 FallarborTown_ContestLobby_EventScript_1B7742:: @ 81B7742 copyvar VAR_SPECIAL_4, VAR_SPECIAL_9 fadescreen 1 - special sub_804E538 + special DoBerryBlending waitstate releaseall end @@ -214,7 +214,7 @@ VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B checkitem ITEM_POKEBLOCK_CASE, 1 compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942 - specialvar RESULT, sub_810CA00 + specialvar RESULT, GetFirstFreePokeblockSlot compare RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B7878 compare RESULT, 65535 @@ -276,7 +276,7 @@ FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D removeobject 239 removeobject 238 removeobject 237 - special sub_804E538 + special DoBerryBlending waitstate releaseall end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index ca48bb41f..5dba65b8a 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -53,7 +53,7 @@ gUnknown_081C346A:: @ 81C346A EventScript_1C348E: fadescreen 1 - special sub_810BAF4 + special OpenPokeblockCaseOnFeeder waitstate compare RESULT, 0xFFFF goto_if 5, EventScript_1C34A0 diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 4b55e505f..cf82cf943 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -1,7 +1,7 @@ Event_TV:: @ 81A6E72 lockall incrementgamestat GAME_STAT_WATCHED_TV - special sub_80C2014 + special ResetTVShowState specialvar RESULT, CheckForBigMovieOrEmergencyNewsOnTV compare RESULT, 2 goto_if_eq EventScript_1A6F01 @@ -21,11 +21,11 @@ EventScript_1A6EBB: specialvar VAR_SPECIAL_4, special_0x44 compare VAR_SPECIAL_4, 255 goto_if_eq EventScript_1A6F3F - specialvar RESULT, special_0x4a + specialvar RESULT, GetNonMassOutbreakActiveTVShow compare RESULT, 255 goto_if_eq EventScript_1A6F3F copyvar VAR_SPECIAL_4, RESULT - specialvar RESULT, sub_80BDA0C + specialvar RESULT, GetTVShowType compare RESULT, 0 goto_if 5, EventScript_1A6F21 end @@ -77,7 +77,7 @@ EventScript_1A6F3F: end EventScript_1A6F50: - special sub_80BECE8 + special DoPokeNews compare RESULT, 0 goto_if_eq EventScript_1A6EBB waitmessage diff --git a/data/specials.inc b/data/specials.inc index f39af822b..032a3884c 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -64,25 +64,25 @@ gSpecials:: def_special ScrSpecial_HasTrainerBeenFought def_special ScrSpecial_EndTrainerApproach def_special PlayTrainerEncounterMusic - def_special sub_8082C68 + def_special ShouldTryRematchBattle def_special ScrSpecial_GetTrainerEyeRematchFlag def_special ScrSpecial_StartTrainerEyeRematch def_special ShowPokemonStorageSystem def_special CheckForAlivePartyMons def_special TurnOffTVScreen def_special DoTVShow - def_special sub_80BECE8 + def_special DoPokeNews def_special special_0x44 - def_special sub_80BDA0C - def_special sub_80BF2C4 - def_special sub_80BDE48 - def_special sub_80BF544 + def_special GetTVShowType + def_special InterviewBefore + def_special InterviewAfter + def_special LeadMonNicknamed def_special SetContestCategoryStringVarForInterview - def_special special_0x4a - def_special sub_80BF974 + def_special GetNonMassOutbreakActiveTVShow + def_special TV_IsScriptShowKindAlreadyInQueue def_special CheckForBigMovieOrEmergencyNewsOnTV def_special GetMomOrDadStringForTVMessage - def_special sub_80C2014 + def_special ResetTVShowState def_special sub_80C47C0 def_special sub_80C496C def_special sub_80C4C28 @@ -90,7 +90,7 @@ gSpecials:: def_special sub_80C4858 def_special sub_80C4C64 def_special sub_80C4758 - def_special sub_80C4BF0 + def_special SetContestTrainerGfxIds def_special sub_80C43F4 def_special sub_80C4D80 def_special sub_80C4F70 @@ -130,17 +130,17 @@ gSpecials:: def_special CompareShroomishSize def_special GetBarboachSizeRecordInfo def_special CompareBarboachSize - def_special sub_80BF9B4 - def_special sub_80BFAE0 - def_special sub_80BFB10 - def_special sub_80FA5BC - def_special sub_80FA5E4 - def_special sub_80EB83C - def_special sub_80FA648 + def_special TV_PutNameRaterShowOnTheAirIfNicnkameChanged + def_special TV_CopyNicknameToStringVar1AndEnsureTerminated + def_special TV_CheckMonOTIDEqualsPlayerID + def_special BufferTrendyPhraseString + def_special TrendyPhraseIsOld + def_special BufferRandomHobbyOrLifestyleString + def_special GetDewfordHallPaintingNameIndex def_special SwapRegisteredBike def_special CalculatePlayerPartyCount - def_special sub_8095B6C - def_special sub_8095C10 + def_special GetNumValidDaycarePartyMons + def_special CountAlivePartyMonsExceptSelectedOne def_special sub_80C4CF8 def_special sub_80C4CEC def_special sub_80C4C78 @@ -165,29 +165,29 @@ gSpecials:: def_special ScrSpecial_ViewWallClock def_special ScrSpecial_ChooseStarter def_special ScrSpecial_StartWallyTutorialBattle - def_special sub_80BF9F8 - def_special sub_80F9A0C - def_special sub_810CA00 - def_special sub_804E538 + def_special ChangePokemonNickname + def_special SelectMonForNPCTrade + def_special GetFirstFreePokeblockSlot + def_special DoBerryBlending def_special PlayRoulette - def_special sub_810FD60 - def_special sub_810FCB0 - def_special sub_810FDAC + def_special ShouldMoveLilycoveFanClubMember + def_special GetNumMovedLilycoveFanClubMembers + def_special BufferStreakTrainerText def_special sub_810FA74 - def_special sub_810FCE8 + def_special UpdateMovedLilycoveFanClubMembers def_special sub_810FF48 def_special sub_810FAA0 def_special sub_810FF60 def_special ScrSpecial_RockSmashWildEncounter def_special GabbyAndTyGetBattleNum - def_special sub_80BDC14 + def_special GabbyAndTyAfterInterview def_special GabbyAndTyBeforeInterview def_special DoTVShowInSearchOfTrainers def_special IsTVShowInSearchOfTrainersAiring def_special GabbyAndTyGetLastQuote - def_special sub_80BDD18 + def_special GabbyAndTyGetLastBattleTrivia def_special GabbyAndTySetScriptVarsToFieldObjectLocalIds - def_special sub_810E300 + def_special GetBattleOutcome def_special GetDaycareMonNicknames def_special GetDaycareState def_special RejectEggFromDayCare @@ -204,8 +204,8 @@ gSpecials:: def_special EggHatch def_special sub_8042B4C def_special ShowLinkBattleRecords - def_special sub_80B7CE8 - def_special sub_80B7D0C + def_special HasEnoughMoneyFor + def_special PayMoneyFor def_special ExecuteWhiteOut def_special sp0C8_whiteout_maybe def_special RotatingGate_InitPuzzle @@ -215,7 +215,7 @@ gSpecials:: def_special EnterSafariMode def_special ExitSafariMode def_special SafariZoneGetPokeblockNameInFeeder - def_special sub_810BAF4 + def_special OpenPokeblockCaseOnFeeder def_special IsMirageIslandPresent def_special UpdateShoalTideFlag def_special InitBirchState @@ -226,12 +226,12 @@ gSpecials:: def_special SetDepartmentStoreFloorVar def_special DoLotteryCornerComputerEffect def_special EndLotteryCornerComputerEffect - def_special sub_80F9A4C - def_special sub_80F9EEC - def_special sub_80FA0DC + def_special SelectMoveTutorMon + def_special SelectMove + def_special DeleteMonMove def_special ScrSpecial_GetPokemonNicknameAndMoveName def_special ScrSpecial_CountPokemonMoves - def_special sub_8132670 + def_special TeachMoveTutorMove def_special GetRecordedCyclingRoadResults def_special ScrSpecial_BeginCyclingRoadChallenge def_special GetPlayerAvatarBike @@ -243,26 +243,26 @@ gSpecials:: def_special CheckPartyBattleTowerBanlist def_special PrintBattleTowerTrainerGreeting def_special PrintEReaderTrainerGreeting - def_special sub_813556C - def_special sub_8135668 - def_special sub_81358A4 - def_special sub_8135A14 - def_special sub_8135BA0 + def_special StartSpecialBattle + def_special SetBattleTowerProperty + def_special BattleTowerUtil + def_special SetBattleTowerParty + def_special SaveBattleTowerProgress def_special BattleTower_SoftReset def_special DetermineBattleTowerPrize def_special GiveBattleTowerPrize def_special AwardBattleTowerRibbons def_special ChooseBattleTowerPlayerParty def_special ValidateEReaderTrainer - def_special sub_810F404 + def_special GetBestBattleTowerStreak def_special ReducePlayerPartyToThree def_special BedroomPC def_special PlayerPC def_special FieldShowRegionMap - def_special sub_804D89C - def_special sub_804DB68 - def_special sub_804E174 - def_special sub_804DB2C + def_special GetInGameTradeSpeciesInfo + def_special CreateInGameTradePokemon + def_special DoInGameTradeScene + def_special GetTradeSpecies def_special GetWeekCount def_special RetrieveLotteryNumber def_special PickLotteryCornerTicket @@ -280,7 +280,7 @@ gSpecials:: def_special sub_80C7958 def_special DoSoftReset def_special GameClear - def_special sub_810EBEC + def_special ShakeScreenInElevator def_special ShowGlassWorkshopMenu def_special SpawnCameraDummy def_special RemoveCameraDummy @@ -292,31 +292,31 @@ gSpecials:: def_special sub_80818FC def_special ShowBattleTowerRecords def_special WaitWeather - def_special sub_810F414 - def_special sub_810F424 + def_special BufferEReaderTrainerName + def_special GetSlotMachineId def_special player_get_direction_lower_nybble - def_special sub_810F488 - def_special sub_810F4B0 - def_special sub_810F4D4 - def_special sub_810F4FC + def_special FoundAbandonedShipRoom1Key + def_special FoundAbandonedShipRoom2Key + def_special FoundAbandonedShipRoom4Key + def_special FoundAbandonedShipRoom6Key def_special LeadMonHasEffortRibbon def_special GivLeadMonEffortRibbon def_special ScrSpecial_AreLeadMonEVsMaxedOut def_special sub_8064EAC def_special sub_8064ED4 def_special InitRoamer - def_special sub_810F5BC + def_special TryUpdateRusturfTunnelState def_special IsGrassTypeInParty def_special sub_8081334 def_special PutZigzagoonInPlayerParty def_special IsStarterInParty - def_special sub_80BC224 + def_special BufferSecretBaseOwnerName def_special CheckFreePokemonStorageSpace def_special DoSealedChamberShakingEffect1 - def_special sub_810E944 + def_special DisplayCurrentElevatorFloor def_special GetShieldToyTVDecorationInfo def_special IsPokerusInParty - def_special sub_8069D78 + def_special SetSootopolisGymCrackedIceMetatiles def_special sub_810F758 def_special ScrSpecial_StartGroudonKyogreBattle def_special ScrSpecial_StartRayquazaBattle @@ -335,17 +335,17 @@ gSpecials:: def_special SetRoute123Weather def_special ScriptGetMultiplayerId def_special ScriptGetPartyMonSpecies - def_special sub_80FA148 + def_special IsSelectedMonEgg def_special sub_810F8FC - def_special sub_80BC50C + def_special MoveSecretBase def_special LoadPlayerBag def_special sub_8081924 - def_special sub_810F950 - def_special sub_810F908 - def_special sub_8090FC0 - def_special sub_810F96C - def_special sub_810F9AC - def_special sub_813610C + def_special SetPacifidlogTMReceivedDay + def_special GetDaysUntilPacifidlogTMAvailable + def_special CompletedHoennPokedex + def_special MonOTNameMatchesPlayer + def_special BufferLottoTicketNumber + def_special TryEnableBravoTrainerBattleTower def_special GetNameOfEnigmaBerryInPlayerParty def_special ScriptRandom def_special sub_80835D8 diff --git a/include/battle.h b/include/battle.h index dda71e562..0881cf82c 100644 --- a/include/battle.h +++ b/include/battle.h @@ -2,240 +2,7 @@ #define GUARD_BATTLE_H #include "sprite.h" - -#define F_TARGET_SELECTED_POKEMON 0 -#define F_TARGET_SPECIAL (1 << 0) -#define F_TARGET_UNK2 (1 << 1) -#define F_TARGET_RANDOM (1 << 2) -#define F_TARGET_BOTH_ENEMIES (1 << 3) -#define F_TARGET_USER (1 << 4) -#define F_TARGET_ALL_EXCEPT_USER (1 << 5) -#define F_TARGET_ENEMY_SIDE (1 << 6) - -#define F_MAKES_CONTACT (1 << 0) -#define F_AFFECTED_BY_PROTECT (1 << 1) -#define F_AFFECTED_BY_MAGIC_COAT (1 << 2) -#define F_AFFECTED_BY_SNATCH (1 << 3) -#define F_MIRROR_MOVE_COMPATIBLE (1 << 4) -#define F_AFFECTED_BY_KINGS_ROCK (1 << 5) - -#define BATTLE_TYPE_DOUBLE 0x0001 -#define BATTLE_TYPE_LINK 0x0002 -#define BATTLE_TYPE_WILD 0x0004 -#define BATTLE_TYPE_TRAINER 0x0008 -#define BATTLE_TYPE_FIRST_BATTLE 0x0010 -#define BATTLE_TYPE_20 0x0020 -#define BATTLE_TYPE_MULTI 0x0040 -#define BATTLE_TYPE_SAFARI 0x0080 -#define BATTLE_TYPE_BATTLE_TOWER 0x0100 -#define BATTLE_TYPE_WALLY_TUTORIAL 0x0200 -#define BATTLE_TYPE_ROAMER 0x0400 -#define BATTLE_TYPE_EREADER_TRAINER 0x0800 -#define BATTLE_TYPE_KYOGRE_GROUDON 0x1000 -#define BATTLE_TYPE_LEGENDARY 0x2000 -#define BATTLE_TYPE_REGI 0x4000 - -#define BATTLE_TYPE_LINK_DOUBLE (BATTLE_TYPE_MULTI | BATTLE_TYPE_TRAINER | BATTLE_TYPE_LINK | BATTLE_TYPE_DOUBLE) - -#define BATTLE_WON 0x1 -#define BATTLE_LOST 0x2 -#define BATTLE_DREW 0x3 -#define BATTLE_RAN 0x4 -#define BATTLE_PLAYER_TELEPORTED 0x5 -#define BATTLE_POKE_FLED 0x6 -#define BATTLE_CAUGHT 0x7 -#define BATTLE_OPPONENT_TELEPORTED 0xA - -#define AI_ACTION_DONE 0x0001 -#define AI_ACTION_FLEE 0x0002 -#define AI_ACTION_WATCH 0x0004 -#define AI_ACTION_DO_NOT_ATTACK 0x0008 -#define AI_ACTION_UNK5 0x0010 -#define AI_ACTION_UNK6 0x0020 -#define AI_ACTION_UNK7 0x0040 -#define AI_ACTION_UNK8 0x0080 - -#define STATUS_SLEEP 0x7 -#define STATUS_POISON 0x8 -#define STATUS_BURN 0x10 -#define STATUS_FREEZE 0x20 -#define STATUS_PARALYSIS 0x40 -#define STATUS_TOXIC_POISON 0x80 -#define STATUS_TOXIC_COUNTER 0xF00 - -#define STATUS_PSN_ANY ((STATUS_POISON | STATUS_TOXIC_POISON)) -#define STATUS_ANY ((STATUS_SLEEP | STATUS_POISON | STATUS_BURN | STATUS_FREEZE | STATUS_PARALYSIS | STATUS_TOXIC_POISON)) - -#define STATUS2_CONFUSION 0x00000007 -#define STATUS2_FLINCHED 0x00000008 -#define STATUS2_UPROAR 0x00000070 -#define STATUS2_BIDE 0x00000300 //two bits 0x100 0x200 -#define STATUS2_LOCK_CONFUSE 0x00000C00 -#define STATUS2_MULTIPLETURNS 0x00001000 -#define STATUS2_WRAPPED 0x0000E000 -#define STATUS2_INFATUATION 0x000F0000 -#define STATUS2_FOCUS_ENERGY 0x00100000 -#define STATUS2_TRANSFORMED 0x00200000 -#define STATUS2_RECHARGE 0x00400000 -#define STATUS2_RAGE 0x00800000 -#define STATUS2_SUBSTITUTE 0x01000000 -#define STATUS2_DESTINY_BOND 0x02000000 -#define STATUS2_ESCAPE_PREVENTION 0x04000000 -#define STATUS2_NIGHTMARE 0x08000000 -#define STATUS2_CURSED 0x10000000 -#define STATUS2_FORESIGHT 0x20000000 -#define STATUS2_DEFENSE_CURL 0x40000000 -#define STATUS2_TORMENT 0x80000000 - -#define STATUS3_LEECHSEED_BANK 0x3 -#define STATUS3_LEECHSEED 0x4 -#define STATUS3_ALWAYS_HITS 0x18 //two bits -#define STATUS3_PERISH_SONG 0x20 -#define STATUS3_ON_AIR 0x40 -#define STATUS3_UNDERGROUND 0x80 -#define STATUS3_MINIMIZED 0x100 -#define STATUS3_ROOTED 0x400 -#define STATUS3_CHARGED_UP 0x200 -#define STATUS3_YAWN 0x1800 //two bits -#define STATUS3_IMPRISIONED 0x2000 -#define STATUS3_GRUDGE 0x4000 -#define STATUS3_CANT_SCORE_A_CRIT 0x8000 -#define STATUS3_MUDSPORT 0x10000 -#define STATUS3_WATERSPORT 0x20000 -#define STATUS3_UNDERWATER 0x40000 -#define STATUS3_INTIMIDATE_POKES 0x80000 -#define STATUS3_TRACE 0x100000 - -#define STATUS3_SEMI_INVULNERABLE ((STATUS3_UNDERGROUND | STATUS3_ON_AIR | STATUS3_UNDERWATER)) - -#define HITMARKER_x20 0x00000020 -#define HITMARKER_DESTINYBOND 0x00000040 -#define HITMARKER_NO_ANIMATIONS 0x00000080 -#define HITMARKER_IGNORE_SUBSTITUTE 0x00000100 -#define HITMARKER_NO_ATTACKSTRING 0x00000200 -#define HITMARKER_ATTACKSTRING_PRINTED 0x00000400 -#define HITMARKER_NO_PPDEDUCT 0x00000800 -#define HITMARKER_PURSUIT_TRAP 0x00001000 -#define HITMARKER_IGNORE_SAFEGUARD 0x00002000 -#define HITMARKER_SYNCHRONISE_EFFECT 0x00004000 -#define HITMARKER_IGNORE_ON_AIR 0x00010000 -#define HITMARKER_IGNORE_UNDERGROUND 0x00020000 -#define HITMARKER_IGNORE_UNDERWATER 0x00040000 -#define HITMARKER_UNABLE_TO_USE_MOVE 0x00080000 -#define HITMARKER_x100000 0x00100000 -#define HITMARKER_x200000 0x00200000 -#define HITMARKER_x400000 0x00400000 -#define HITMARKER_x800000 0x00800000 -#define HITMARKER_GRUDGE 0x01000000 -#define HITMARKER_OBEYS 0x02000000 -#define HITMARKER_x8000000 0x08000000 -#define HITMARKER_FAINTED(bank) ((gBitTable[bank] << 0x1C)) -#define HITMARKER_UNK(bank) ((0x10000000 << bank)) - -#define SIDE_STATUS_REFLECT (1 << 0) -#define SIDE_STATUS_LIGHTSCREEN (1 << 1) -#define SIDE_STATUS_X4 (1 << 2) -#define SIDE_STATUS_SPIKES (1 << 4) -#define SIDE_STATUS_SAFEGUARD (1 << 5) -#define SIDE_STATUS_FUTUREATTACK (1 << 6) -#define SIDE_STATUS_MIST (1 << 8) -#define SIDE_STATUS_SPIKES_DAMAGED (1 << 9) - -#define ABILITYEFFECT_ON_SWITCHIN 0x0 -#define ABILITYEFFECT_ENDTURN 0x1 -#define ABILITYEFFECT_MOVES_BLOCK 0x2 -#define ABILITYEFFECT_ABSORBING 0x3 -#define ABILITYEFFECT_CONTACT 0x4 -#define ABILITYEFFECT_IMMUNITY 0x5 -#define ABILITYEFFECT_FORECAST 0x6 -#define ABILITYEFFECT_SYNCHRONIZE 0x7 -#define ABILITYEFFECT_ATK_SYNCHRONIZE 0x8 -#define ABILITYEFFECT_INTIMIDATE1 0x9 -#define ABILITYEFFECT_INTIMIDATE2 0xA -#define ABILITYEFFECT_TRACE 0xB -#define ABILITYEFFECT_CHECK_OTHER_SIDE 0xC -#define ABILITYEFFECT_CHECK_BANK_SIDE 0xD -#define ABILITYEFFECT_FIELD_SPORT 0xE -#define ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK 0xF -#define ABILITYEFFECT_COUNT_OTHER_SIZE 0x10 -#define ABILITYEFFECT_COUNT_BANK_SIDE 0x11 -#define ABILITYEFFECT_COUNT_ON_FIELD 0x12 -#define ABILITYEFFECT_CHECK_ON_FIELD 0x13 - -#define WEATHER_HAS_EFFECT ((!AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_AIR_LOCK, 0, 0))) - -#define MOVESTATUS_MISSED (1 << 0) -#define MOVESTATUS_SUPEREFFECTIVE (1 << 1) -#define MOVESTATUS_NOTVERYEFFECTIVE (1 << 2) -#define MOVESTATUS_NOTAFFECTED (1 << 3) -#define MOVESTATUS_ONEHITKO (1 << 4) -#define MOVESTATUS_FAILED (1 << 5) -#define MOVESTATUS_ENDURED (1 << 6) -#define MOVESTATUS_HUNGON (1 << 7) - -#define MOVESTATUS_NOEFFECT ((MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED)) - -#define MAX_TRAINER_ITEMS 4 -#define MAX_MON_MOVES 4 -#define MAX_BANKS_BATTLE 4 - -#define WEATHER_RAIN_TEMPORARY (1 << 0) -#define WEATHER_RAIN_DOWNPOUR (1 << 1) -#define WEATHER_RAIN_PERMANENT (1 << 2) -#define WEATHER_RAIN_ANY ((WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_DOWNPOUR | WEATHER_RAIN_PERMANENT)) -#define WEATHER_SANDSTORM_TEMPORARY (1 << 3) -#define WEATHER_SANDSTORM_PERMANENT (1 << 4) -#define WEATHER_SANDSTORM_ANY ((WEATHER_SANDSTORM_TEMPORARY | WEATHER_SANDSTORM_PERMANENT)) -#define WEATHER_SUN_TEMPORARY (1 << 5) -#define WEATHER_SUN_PERMANENT (1 << 6) -#define WEATHER_SUN_ANY ((WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT)) -#define WEATHER_HAIL (1 << 7) - -// status animation table -#define B_ANIM_STATUS_PSN 0x0 -#define B_ANIM_STATUS_CONFUSION 0x1 -#define B_ANIM_STATUS_BRN 0x2 -#define B_ANIM_STATUS_INFATUATION 0x3 -#define B_ANIM_STATUS_SLP 0x4 -#define B_ANIM_STATUS_PRZ 0x5 -#define B_ANIM_STATUS_FRZ 0x6 -#define B_ANIM_STATUS_CURSED 0x7 -#define B_ANIM_STATUS_NIGHTMARE 0x8 -#define B_ANIM_STATUS_WRAPPED 0x9 - -// general animation table -#define B_ANIM_CASTFORM_CHANGE 0x0 -#define B_ANIM_STATS_CHANGE 0x1 -#define B_ANIM_SUBSTITUTE_FADE 0x2 -#define B_ANIM_SUBSTITUTE_APPEAR 0x3 -#define B_ANIM_POKEBLOCK_THROW 0x4 -#define B_ANIM_ITEM_KNOCKOFF 0x5 -#define B_ANIM_TURN_TRAP 0x6 -#define B_ANIM_ITEM_EFFECT 0x7 -#define B_ANIM_SMOKEBALL_ESCAPE 0x8 -#define B_ANIM_HANGED_ON 0x9 -#define B_ANIM_RAIN_CONTINUES 0xA -#define B_ANIM_SUN_CONTINUES 0xB -#define B_ANIM_SANDSTORM_CONTINUES 0xC -#define B_ANIM_HAIL_CONTINUES 0xD -#define B_ANIM_LEECH_SEED_DRAIN 0xE -#define B_ANIM_MON_HIT 0xF -#define B_ANIM_ITEM_STEAL 0x10 -#define B_ANIM_SNATCH_MOVE 0x11 -#define B_ANIM_FUTURE_SIGHT_HIT 0x12 -#define B_ANIM_DOOM_DESIRE_HIT 0x13 -#define B_ANIM_FOCUS_PUNCH_SET_UP 0x14 -#define B_ANIM_INGRAIN_HEAL 0x15 -#define B_ANIM_WISH_HEAL 0x16 - -// special animation table -#define B_ANIM_LVL_UP 0x0 -#define B_ANIM_SWITCH_OUT_PLAYER_MON 0x1 -#define B_ANIM_SWITCH_OUT_OPPONENT_MON 0x2 -#define B_ANIM_BALL_THROW 0x3 -#define B_ANIM_SAFARI_BALL_THROW 0x4 -#define B_ANIM_SUBSTITUTE_TO_MON 0x5 -#define B_ANIM_MON_TO_SUBSTITUTE 0x6 +#include "constants/battle_constants.h" enum { @@ -312,7 +79,7 @@ struct BattleStruct /* 0x2000000 */ /*0x1600C*/ u8 cmd49StateTracker; /*0x1600D*/ u8 unk1600D; /*0x1600E*/ u8 turncountersTracker; - /*0x1600F*/ u8 atk23StateTracker; + /*0x1600F*/ u8 getexpStateTracker; /*0x16010*/ u8 moveTarget[4]; /*0x16014*/ u8 unk16014; /*0x16015*/ u8 unk16015; @@ -539,7 +306,7 @@ struct BattleStruct /* 0x2000000 */ struct DisableStruct { - /*0x00*/ u32 unk0; + /*0x00*/ u32 transformedMonPersonality; /*0x04*/ u16 disabledMove; /*0x06*/ u16 encoredMove; /*0x08*/ u8 protectUses; @@ -838,7 +605,7 @@ extern u8 gBattleTextBuff1[]; // asm/battle_1.o void sub_800D6D4(); void sub_800D74C(); -void sub_800D7B8(void); +void DrawMainBattleBackground(void); void sub_800DAB8(); void sub_800DE30(u8); void sub_800E23C(); diff --git a/include/battle_anim.h b/include/battle_anim.h index 9decb8f95..d456950f6 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -9,6 +9,14 @@ #define REG_BG2CNT_BITFIELD REG_BGnCNT_BITFIELD(2) #define REG_BG3CNT_BITFIELD REG_BGnCNT_BITFIELD(3) +enum +{ + ANIM_BANK_ATTACKER, + ANIM_BANK_TARGET, + ANIM_BANK_ATK_PARTNER, + ANIM_BANK_DEF_PARTNER, +}; + struct BattleAnimBackground { void *image; @@ -36,20 +44,21 @@ struct UnknownStruct3 extern void (*gAnimScriptCallback)(void); extern u8 gAnimScriptActive; -extern u8 gHappinessMoveAnim; -extern u8 gUnknown_0202F7C4; +extern u8 gAnimFriendship; +extern u8 gAnimMoveTurn; +extern struct DisableStruct *gAnimDisableStructPtr; -void ExecuteMoveAnim(u16 move); -void DoMoveAnim(const u8 *const moveAnims[], u16 b, u8 c); +void DoMoveAnim(u16 move); +void LaunchBattleAnimation(const u8 *const moveAnims[], u16 b, u8 c); bool8 IsAnimBankSpriteVisible(u8 a); void sub_8076034(u8, u8); -bool8 NotInBattle(void); -void battle_anim_clear_some_data(void); -void move_anim_8072740(struct Sprite *sprite); +bool8 IsContest(void); +void ClearBattleAnimationVars(void); +void DestroyAnimSprite(struct Sprite *sprite); void DestroyAnimVisualTask(u8 task); void DestroyAnimVisualTask(u8 task); bool8 IsAnimBankSpriteVisible(u8); -s8 sub_8076F98(s8 a); +s8 BattleAnimAdjustPanning(s8 a); void sub_80763FC(u16 a, u16 *b, u32 c, u8 d); #endif diff --git a/include/battle_interface.h b/include/battle_interface.h index db41ee735..a3e00fd12 100644 --- a/include/battle_interface.h +++ b/include/battle_interface.h @@ -22,7 +22,7 @@ void sub_8043D84(u8, u8, u32, u32, u32); void sub_8043DB0(u8); void sub_8043DFC(u8); void nullsub_11(); -void sub_8043EB4(u8); +void UpdateOamPriorityInAllHealthboxes(u8); void sub_8043F44(u8); void sub_804454C(void); u8 sub_8044804(u8, const struct BattleInterfaceStruct2 *, u8, u8); diff --git a/include/battle_setup.h b/include/battle_setup.h index 444ab5467..8423a6e6e 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -56,16 +56,15 @@ u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data); void TrainerWantsBattle(u8, u8 *); bool32 GetTrainerFlagFromScriptPointer(u8 *data); -//void sub_8082524(void); //u8 ScrSpecial_GetTrainerBattleMode(void); //u8 ScrSpecial_HasTrainerBeenFought(void); //void sub_808257C(void); //void unref_sub_8082590(void); // unused u8 HasTrainerAlreadyBeenFought(u16); -void trainer_flag_set(u16); -void trainer_flag_clear(u16); +void SetTrainerFlag(u16); +void ClearTrainerFlag(u16); void BattleSetup_StartTrainerBattle(void); -void sub_808260C(void); +void CB2_EndTrainerBattle(void); void do_choose_name_or_words_screen(void); //void ScrSpecial_StartTrainerEyeRematch(void); //void ScrSpecial_ShowTrainerIntroSpeech(void); @@ -74,10 +73,8 @@ u8 *BattleSetup_GetTrainerPostBattleScript(void); //void ScrSpecial_ShowTrainerNonBattlingSpeech(void); //void PlayTrainerEncounterMusic(void); //u8 *SanitizeString(u8 *str); -u8 *sub_808281C(void); -u8 *sub_8082830(void); +u8 *GetTrainerLoseText(void); //u8 *unref_sub_808286C(void); -u8 *sub_8082880(void); //s32 sub_8082894(const struct TrainerEyeTrainer *trainers, u16 trainerNum); //s32 sub_80828B8(const struct TrainerEyeTrainer *trainers, u16 trainerNum); //bool32 sub_80828FC(const struct TrainerEyeTrainer *trainers, u16 mapGroup, u16 mapNum); @@ -89,14 +86,12 @@ u8 *sub_8082880(void); //void sub_8082AE4(const struct TrainerEyeTrainer *trainers, u16 trainerNum); //bool8 sub_8082B10(const struct TrainerEyeTrainer *trainers, u16 trainerNum); //bool32 sub_8082B44(void); -void sub_8082B78(void); +void IncrementRematchStepCounter(void); //bool32 sub_8082BA4(void); -void sub_8082BD0(u16, u16); -s32 sub_8082C0C(u16 mapGroup, u16 mapNum); -s32 unref_sub_8082C2C(u16 mapGroup, u16 mapNum); -u16 sub_8082C4C(u16 a1); -//s32 sub_8082C68(void); +void TryUpdateRandomTrainerRematches(u16, u16); +s32 DoesSomeoneWantRematchIn(u16 mapGroup, u16 mapNum); +s32 IsRematchTrainerIn(u16 mapGroup, u16 mapNum); +u16 GetRematchTrainerId(u16 a1); //u8 ScrSpecial_GetTrainerEyeRematchFlag(void); -void sub_8082CB8(void); #endif // GUARD_BATTLE_SETUP_H diff --git a/include/constants/battle_constants.h b/include/constants/battle_constants.h new file mode 100644 index 000000000..f7efb0dfd --- /dev/null +++ b/include/constants/battle_constants.h @@ -0,0 +1,241 @@ +#ifndef GUARD_CONSTANTS_BATTLE_CONSTANTS_H +#define GUARD_CONSTANTS_BATTLE_CONSTANTS_H + +#define STATUS_SLEEP 0x7 +#define STATUS_POISON 0x8 +#define STATUS_BURN 0x10 +#define STATUS_FREEZE 0x20 +#define STATUS_PARALYSIS 0x40 +#define STATUS_TOXIC_POISON 0x80 +#define STATUS_TOXIC_COUNTER 0xF00 + +#define STATUS_PSN_ANY ((STATUS_POISON | STATUS_TOXIC_POISON)) +#define STATUS_ANY ((STATUS_SLEEP | STATUS_POISON | STATUS_BURN | STATUS_FREEZE | STATUS_PARALYSIS | STATUS_TOXIC_POISON)) + +#define STATUS2_CONFUSION 0x00000007 +#define STATUS2_FLINCHED 0x00000008 +#define STATUS2_UPROAR 0x00000070 +#define STATUS2_BIDE 0x00000300 //two bits 0x100 0x200 +#define STATUS2_LOCK_CONFUSE 0x00000C00 +#define STATUS2_MULTIPLETURNS 0x00001000 +#define STATUS2_WRAPPED 0x0000E000 +#define STATUS2_INFATUATION 0x000F0000 +#define STATUS2_FOCUS_ENERGY 0x00100000 +#define STATUS2_TRANSFORMED 0x00200000 +#define STATUS2_RECHARGE 0x00400000 +#define STATUS2_RAGE 0x00800000 +#define STATUS2_SUBSTITUTE 0x01000000 +#define STATUS2_DESTINY_BOND 0x02000000 +#define STATUS2_ESCAPE_PREVENTION 0x04000000 +#define STATUS2_NIGHTMARE 0x08000000 +#define STATUS2_CURSED 0x10000000 +#define STATUS2_FORESIGHT 0x20000000 +#define STATUS2_DEFENSE_CURL 0x40000000 +#define STATUS2_TORMENT 0x80000000 + +#define STATUS3_LEECHSEED_BANK 0x3 +#define STATUS3_LEECHSEED 0x4 +#define STATUS3_ALWAYS_HITS 0x18 //two bits +#define STATUS3_PERISH_SONG 0x20 +#define STATUS3_ON_AIR 0x40 +#define STATUS3_UNDERGROUND 0x80 +#define STATUS3_MINIMIZED 0x100 +#define STATUS3_ROOTED 0x400 +#define STATUS3_CHARGED_UP 0x200 +#define STATUS3_YAWN 0x1800 //two bits +#define STATUS3_IMPRISIONED 0x2000 +#define STATUS3_GRUDGE 0x4000 +#define STATUS3_CANT_SCORE_A_CRIT 0x8000 +#define STATUS3_MUDSPORT 0x10000 +#define STATUS3_WATERSPORT 0x20000 +#define STATUS3_UNDERWATER 0x40000 +#define STATUS3_INTIMIDATE_POKES 0x80000 +#define STATUS3_TRACE 0x100000 + +#define STATUS3_SEMI_INVULNERABLE ((STATUS3_UNDERGROUND | STATUS3_ON_AIR | STATUS3_UNDERWATER)) + +#define HITMARKER_x10 0x00000010 +#define HITMARKER_x20 0x00000020 +#define HITMARKER_DESTINYBOND 0x00000040 +#define HITMARKER_NO_ANIMATIONS 0x00000080 +#define HITMARKER_IGNORE_SUBSTITUTE 0x00000100 +#define HITMARKER_NO_ATTACKSTRING 0x00000200 +#define HITMARKER_ATTACKSTRING_PRINTED 0x00000400 +#define HITMARKER_NO_PPDEDUCT 0x00000800 +#define HITMARKER_PURSUIT_TRAP 0x00001000 +#define HITMARKER_IGNORE_SAFEGUARD 0x00002000 +#define HITMARKER_SYNCHRONISE_EFFECT 0x00004000 +#define HITMARKER_IGNORE_ON_AIR 0x00010000 +#define HITMARKER_IGNORE_UNDERGROUND 0x00020000 +#define HITMARKER_IGNORE_UNDERWATER 0x00040000 +#define HITMARKER_UNABLE_TO_USE_MOVE 0x00080000 +#define HITMARKER_x100000 0x00100000 +#define HITMARKER_x200000 0x00200000 +#define HITMARKER_x400000 0x00400000 +#define HITMARKER_x800000 0x00800000 +#define HITMARKER_GRUDGE 0x01000000 +#define HITMARKER_OBEYS 0x02000000 +#define HITMARKER_x8000000 0x08000000 +#define HITMARKER_FAINTED(bank) ((gBitTable[bank] << 0x1C)) +#define HITMARKER_UNK(bank) ((0x10000000 << bank)) + +#define MOVESTATUS_MISSED (1 << 0) +#define MOVESTATUS_SUPEREFFECTIVE (1 << 1) +#define MOVESTATUS_NOTVERYEFFECTIVE (1 << 2) +#define MOVESTATUS_NOTAFFECTED (1 << 3) +#define MOVESTATUS_ONEHITKO (1 << 4) +#define MOVESTATUS_FAILED (1 << 5) +#define MOVESTATUS_ENDURED (1 << 6) +#define MOVESTATUS_HUNGON (1 << 7) + +#define BATTLE_TYPE_DOUBLE 0x0001 +#define BATTLE_TYPE_LINK 0x0002 +#define BATTLE_TYPE_WILD 0x0004 +#define BATTLE_TYPE_TRAINER 0x0008 +#define BATTLE_TYPE_FIRST_BATTLE 0x0010 +#define BATTLE_TYPE_20 0x0020 +#define BATTLE_TYPE_MULTI 0x0040 +#define BATTLE_TYPE_SAFARI 0x0080 +#define BATTLE_TYPE_BATTLE_TOWER 0x0100 +#define BATTLE_TYPE_WALLY_TUTORIAL 0x0200 +#define BATTLE_TYPE_ROAMER 0x0400 +#define BATTLE_TYPE_EREADER_TRAINER 0x0800 +#define BATTLE_TYPE_KYOGRE_GROUDON 0x1000 +#define BATTLE_TYPE_LEGENDARY 0x2000 +#define BATTLE_TYPE_REGI 0x4000 +#define BATTLE_TYPE_LINK_DOUBLE (BATTLE_TYPE_MULTI | BATTLE_TYPE_TRAINER | BATTLE_TYPE_LINK | BATTLE_TYPE_DOUBLE) + +#define SECRET_BASE_OPPONENT 0x400 + +#define BATTLE_WON 0x1 +#define BATTLE_LOST 0x2 +#define BATTLE_DREW 0x3 +#define BATTLE_RAN 0x4 +#define BATTLE_PLAYER_TELEPORTED 0x5 +#define BATTLE_POKE_FLED 0x6 +#define BATTLE_CAUGHT 0x7 +#define BATTLE_OUT_OF_BALLS 0x8 +#define BATTLE_OPPONENT_TELEPORTED 0xA + +#define SIDE_STATUS_REFLECT (1 << 0) +#define SIDE_STATUS_LIGHTSCREEN (1 << 1) +#define SIDE_STATUS_X4 (1 << 2) +#define SIDE_STATUS_SPIKES (1 << 4) +#define SIDE_STATUS_SAFEGUARD (1 << 5) +#define SIDE_STATUS_FUTUREATTACK (1 << 6) +#define SIDE_STATUS_MIST (1 << 8) +#define SIDE_STATUS_SPIKES_DAMAGED (1 << 9) + +#define TARGET_SELECTED_POKEMON 0 +#define TARGET_SPECIAL (1 << 0) +#define TARGET_UNK2 (1 << 1) +#define TARGET_RANDOM (1 << 2) +#define TARGET_BOTH_ENEMIES (1 << 3) +#define TARGET_USER (1 << 4) +#define TARGET_ALL_EXCEPT_USER (1 << 5) +#define TARGET_ENEMY_SIDE (1 << 6) + +#define F_MAKES_CONTACT (1 << 0) +#define F_AFFECTED_BY_PROTECT (1 << 1) +#define F_AFFECTED_BY_MAGIC_COAT (1 << 2) +#define F_AFFECTED_BY_SNATCH (1 << 3) +#define F_MIRROR_MOVE_COMPATIBLE (1 << 4) +#define F_AFFECTED_BY_KINGS_ROCK (1 << 5) + +#define AI_ACTION_DONE 0x0001 +#define AI_ACTION_FLEE 0x0002 +#define AI_ACTION_WATCH 0x0004 +#define AI_ACTION_DO_NOT_ATTACK 0x0008 +#define AI_ACTION_UNK5 0x0010 +#define AI_ACTION_UNK6 0x0020 +#define AI_ACTION_UNK7 0x0040 +#define AI_ACTION_UNK8 0x0080 + +#define ABILITYEFFECT_ON_SWITCHIN 0x0 +#define ABILITYEFFECT_ENDTURN 0x1 +#define ABILITYEFFECT_MOVES_BLOCK 0x2 +#define ABILITYEFFECT_ABSORBING 0x3 +#define ABILITYEFFECT_CONTACT 0x4 +#define ABILITYEFFECT_IMMUNITY 0x5 +#define ABILITYEFFECT_FORECAST 0x6 +#define ABILITYEFFECT_SYNCHRONIZE 0x7 +#define ABILITYEFFECT_ATK_SYNCHRONIZE 0x8 +#define ABILITYEFFECT_INTIMIDATE1 0x9 +#define ABILITYEFFECT_INTIMIDATE2 0xA +#define ABILITYEFFECT_TRACE 0xB +#define ABILITYEFFECT_CHECK_OTHER_SIDE 0xC +#define ABILITYEFFECT_CHECK_BANK_SIDE 0xD +#define ABILITYEFFECT_FIELD_SPORT 0xE +#define ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK 0xF +#define ABILITYEFFECT_COUNT_OTHER_SIZE 0x10 +#define ABILITYEFFECT_COUNT_BANK_SIDE 0x11 +#define ABILITYEFFECT_COUNT_ON_FIELD 0x12 +#define ABILITYEFFECT_CHECK_ON_FIELD 0x13 + +#define WEATHER_HAS_EFFECT ((!AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_AIR_LOCK, 0, 0))) + +#define MOVESTATUS_NOEFFECT ((MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED)) + +#define MAX_TRAINER_ITEMS 4 +#define MAX_MON_MOVES 4 +#define MAX_BANKS_BATTLE 4 + +#define WEATHER_RAIN_TEMPORARY (1 << 0) +#define WEATHER_RAIN_DOWNPOUR (1 << 1) +#define WEATHER_RAIN_PERMANENT (1 << 2) +#define WEATHER_RAIN_ANY ((WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_DOWNPOUR | WEATHER_RAIN_PERMANENT)) +#define WEATHER_SANDSTORM_TEMPORARY (1 << 3) +#define WEATHER_SANDSTORM_PERMANENT (1 << 4) +#define WEATHER_SANDSTORM_ANY ((WEATHER_SANDSTORM_TEMPORARY | WEATHER_SANDSTORM_PERMANENT)) +#define WEATHER_SUN_TEMPORARY (1 << 5) +#define WEATHER_SUN_PERMANENT (1 << 6) +#define WEATHER_SUN_ANY ((WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT)) +#define WEATHER_HAIL (1 << 7) + +// status animation table +#define B_ANIM_STATUS_PSN 0x0 +#define B_ANIM_STATUS_CONFUSION 0x1 +#define B_ANIM_STATUS_BRN 0x2 +#define B_ANIM_STATUS_INFATUATION 0x3 +#define B_ANIM_STATUS_SLP 0x4 +#define B_ANIM_STATUS_PRZ 0x5 +#define B_ANIM_STATUS_FRZ 0x6 +#define B_ANIM_STATUS_CURSED 0x7 +#define B_ANIM_STATUS_NIGHTMARE 0x8 +#define B_ANIM_STATUS_WRAPPED 0x9 + +// general animation table +#define B_ANIM_CASTFORM_CHANGE 0x0 +#define B_ANIM_STATS_CHANGE 0x1 +#define B_ANIM_SUBSTITUTE_FADE 0x2 +#define B_ANIM_SUBSTITUTE_APPEAR 0x3 +#define B_ANIM_POKEBLOCK_THROW 0x4 +#define B_ANIM_ITEM_KNOCKOFF 0x5 +#define B_ANIM_TURN_TRAP 0x6 +#define B_ANIM_ITEM_EFFECT 0x7 +#define B_ANIM_SMOKEBALL_ESCAPE 0x8 +#define B_ANIM_HANGED_ON 0x9 +#define B_ANIM_RAIN_CONTINUES 0xA +#define B_ANIM_SUN_CONTINUES 0xB +#define B_ANIM_SANDSTORM_CONTINUES 0xC +#define B_ANIM_HAIL_CONTINUES 0xD +#define B_ANIM_LEECH_SEED_DRAIN 0xE +#define B_ANIM_MON_HIT 0xF +#define B_ANIM_ITEM_STEAL 0x10 +#define B_ANIM_SNATCH_MOVE 0x11 +#define B_ANIM_FUTURE_SIGHT_HIT 0x12 +#define B_ANIM_DOOM_DESIRE_HIT 0x13 +#define B_ANIM_FOCUS_PUNCH_SET_UP 0x14 +#define B_ANIM_INGRAIN_HEAL 0x15 +#define B_ANIM_WISH_HEAL 0x16 + +// special animation table +#define B_ANIM_LVL_UP 0x0 +#define B_ANIM_SWITCH_OUT_PLAYER_MON 0x1 +#define B_ANIM_SWITCH_OUT_OPPONENT_MON 0x2 +#define B_ANIM_BALL_THROW 0x3 +#define B_ANIM_SAFARI_BALL_THROW 0x4 +#define B_ANIM_SUBSTITUTE_TO_MON 0x5 +#define B_ANIM_MON_TO_SUBSTITUTE 0x6 + +#endif // GUARD_CONSTANTS_BATTLE_CONSTANTS_H diff --git a/include/constants/vars.h b/include/constants/vars.h index 13114e09b..682d45003 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -3,6 +3,8 @@ #define VAR_0x3F20 0x3F20 +#define VARS_START 0x4000 + // temporary vars // The first 0x10 vars are are temporary--they are cleared every time a map is loaded. #define VAR_TEMP_0 0x4000 @@ -60,7 +62,8 @@ #define VAR_ENIGMA_BERRY_AVAILABLE 0x402D #define VAR_DAYS 0x4040 - +#define VAR_FANCLUB_UNKNOWN_1 0x4041 // TODO: document these two fanclub vars +#define VAR_FANCLUB_UNKNOWN_2 0x4042 #define VAR_DEPT_STORE_FLOOR 0x4043 #define VAR_TRICK_HOUSE_ROOMS_COMPLETED 0x4044 #define VAR_LOTTERY_PRIZE 0x4045 diff --git a/include/contest.h b/include/contest.h index ae2767aef..10392c00e 100644 --- a/include/contest.h +++ b/include/contest.h @@ -73,14 +73,14 @@ extern const struct ContestEffect gContestEffects[]; extern const u8 *const gContestEffectStrings[]; void ResetLinkContestBoolean(void); -void sub_80AB2AC(void); +void LoadContestBgAfterMoveAnim(void); void CB2_StartContest(void); void Contest_CreatePlayerMon(u8); void Contest_InitAllPokemon(u8, u8); u8 sub_80AE47C(struct Pokemon *party); u16 sub_80AE770(u8, u8); void sub_80AE82C(u8); -u8 sub_80AEB1C(u16); +u8 IsSpeciesNotUnown(u16); void sub_80AF668(void); void sub_80B0F28(u8); bool8 Contest_SaveWinner(u8); diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h index 111dc92a6..4377367f7 100644 --- a/include/field_fadetransition.h +++ b/include/field_fadetransition.h @@ -13,7 +13,7 @@ void sub_8080A3C(void); void sub_8080AC4(void); void mapldr_default(); void sub_8080B60(void); -void atk17_seteffectuser(void); +void atk17_seteffectsecondary(void); void sub_8080E28(void); void sub_8080E44(void); bool32 sub_8080E70(void); diff --git a/include/global.h b/include/global.h index 2ea69a1e1..17dd0a88d 100644 --- a/include/global.h +++ b/include/global.h @@ -241,8 +241,8 @@ struct EasyChatPair struct TVShowCommon { - /*0x00*/ u8 var00; - /*0x01*/ u8 var01; + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; /*0x02*/ u8 pad02[20]; /*0x16*/ u16 var16[3]; /*0x1C*/ u8 srcTrainerId3Lo; @@ -257,8 +257,8 @@ struct TVShowCommon struct TVShowFanClubLetter { - /*0x00*/ u8 var00; - /*0x01*/ u8 var01; + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; /*0x02*/ u16 species; /*0x04*/ u16 pad04[6]; /*0x10*/ u8 playerName[8]; @@ -267,8 +267,8 @@ struct TVShowFanClubLetter struct TVShowRecentHappenings { - /*0x00*/ u8 var00; - /*0x01*/ u8 var01; + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; /*0x02*/ u16 var02; /*0x04*/ u16 var04[6]; /*0x10*/ u8 playerName[8]; @@ -278,8 +278,8 @@ struct TVShowRecentHappenings struct TVShowFanclubOpinions { - /*0x00*/ u8 var00; - /*0x01*/ u8 var01; + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; /*0x02*/ u16 var02; /*0x04*/ u8 var04A:4; /*0x04*/ u8 var04B:4; @@ -294,16 +294,16 @@ struct TVShowFanclubOpinions struct TVShowUnknownType04 { - /*0x00*/ u8 var00; - /*0x01*/ u8 var01; + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; /*0x02*/ u8 pad02[4]; /*0x06*/ u16 var06; }; struct TVShowNameRaterShow { - /*0x00*/ u8 var00; - /*0x01*/ u8 var01; + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; /*0x02*/ u16 species; /*0x04*/ u8 pokemonName[11]; /*0x0F*/ u8 trainerName[11]; @@ -316,8 +316,8 @@ struct TVShowNameRaterShow struct TVShowBravoTrainerPokemonProfiles { - /*0x00*/ u8 var00; - /*0x01*/ u8 var01; + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; /*0x02*/ u16 species; /*0x04*/ u16 var04[2]; /*0x08*/ u8 pokemonNickname[11]; @@ -333,8 +333,8 @@ struct TVShowBravoTrainerPokemonProfiles struct TVShowBravoTrainerBattleTowerSpotlight { - /*0x00*/ u8 var00; - /*0x01*/ u8 var01; + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; /*0x02*/ u8 trainerName[8]; /*0x0A*/ u16 species; /*0x0C*/ u8 pokemonName[8]; @@ -349,8 +349,8 @@ struct TVShowBravoTrainerBattleTowerSpotlight struct TVShowPokemonToday { - /*0x00*/ u8 var00; - /*0x01*/ u8 var01; + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; /*0x02*/ u8 language; /*0x03*/ u8 language2; /*0x04*/ u8 nickname[11]; @@ -362,8 +362,8 @@ struct TVShowPokemonToday struct TVShowSmartShopper { - /*0x00*/ u8 var00; - /*0x01*/ u8 var01; + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; /*0x02*/ u8 priceReduced; /*0x03*/ u8 language; /*0x04*/ u8 pad04[2]; @@ -375,8 +375,8 @@ struct TVShowSmartShopper struct TVShowPokemonTodayFailed { - /*0x00*/ u8 var00; - /*0x01*/ u8 var01; + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; /*0x02*/ u8 language; /*0x03*/ u8 pad03[9]; /*0x0c*/ u16 species; @@ -389,8 +389,8 @@ struct TVShowPokemonTodayFailed struct TVShowPokemonAngler { - /*0x00*/ u8 var00; - /*0x01*/ u8 var01; + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; /*0x02*/ u8 var02; /*0x03*/ u8 var03; /*0x04*/ u16 var04; @@ -401,8 +401,8 @@ struct TVShowPokemonAngler struct TVShowWorldOfMasters { - /*0x00*/ u8 var00; - /*0x01*/ u8 var01; + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; /*0x02*/ u16 var02; /*0x04*/ u16 var04; /*0x06*/ u16 var06; @@ -415,8 +415,8 @@ struct TVShowWorldOfMasters struct TVShowMassOutbreak { - /*0x00*/ u8 var00; - /*0x01*/ u8 var01; + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; /*0x02*/ u8 var02; /*0x03*/ u8 var03; /*0x04*/ u16 moves[4]; @@ -428,7 +428,7 @@ struct TVShowMassOutbreak /*0x13*/ u8 probability; /*0x14*/ u8 level; /*0x15*/ u8 var15; - /*0x16*/ u16 var16; + /*0x16*/ u16 daysLeft; /*0x18*/ u8 language; u8 pad19[11]; }; @@ -524,11 +524,11 @@ union MauvilleMan u8 filler[0x40]; // needed to pad out the struct }; -struct UnknownSaveStruct2ABC +struct PokeNews { - u8 val0; - u8 val1; - u16 val2; + u8 kind; + u8 state; + u16 days; }; struct GabbyAndTyData @@ -671,7 +671,7 @@ struct SaveBlock1 /* 0x02025734 */ /*0x272C*/ u8 decorCushion[10]; /*0x2736*/ u8 padding_2736[2]; /*0x2738*/ TVShow tvShows[25]; - /*0x2ABC*/ struct UnknownSaveStruct2ABC unknown_2ABC[16]; + /*0x2ABC*/ struct PokeNews pokeNews[16]; /*0x2AFC*/ u16 outbreakPokemonSpecies; /*0x2AFE*/ u8 outbreakLocationMapNum; /*0x2AFF*/ u8 outbreakLocationMapGroup; diff --git a/include/learn_move.h b/include/learn_move.h index 85fbf046e..fca236ec9 100644 --- a/include/learn_move.h +++ b/include/learn_move.h @@ -1,6 +1,6 @@ #ifndef GUARD_LEARN_MOVE_H #define GUARD_LEARN_MOVE_H -void sub_8132670(void); +void TeachMoveTutorMove(void); #endif // GUARD_LEARN_MOVE_H diff --git a/include/money.h b/include/money.h index 5a0acd482..9f4ef71bc 100644 --- a/include/money.h +++ b/include/money.h @@ -11,7 +11,7 @@ void sub_80B7B34(u8, u8, int); void UpdateMoneyWindow(u32, u8, u8); void OpenMoneyWindow(u32, u8, u8); void CloseMoneyWindow(u8, u8); -bool8 sub_80B7CE8(void); -void sub_80B7D0C(void); +bool8 HasEnoughMoneyFor(void); +void PayMoneyFor(void); #endif // GUARD_MONEY_H diff --git a/include/pokedex.h b/include/pokedex.h index c47494e1f..d8416889a 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -22,7 +22,7 @@ s8 GetSetPokedexFlag(u16, u8); u16 GetNationalPokedexCount(u8); u16 GetHoennPokedexCount(u8); -bool8 sub_8090FC0(void); +bool8 CompletedHoennPokedex(void); u16 sub_8090FF4(void); #endif // GUARD_POKEDEX_H diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 70bd6fe5a..04d996a21 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -4,21 +4,13 @@ #include "sprite.h" #include "task.h" -enum -{ - ANIM_BANK_ATK, - ANIM_BANK_DEF, - ANIM_BANK_ATK_PARTNER, - ANIM_BANK_DEF_PARTNER -}; - struct Struct_sub_8078914 { u8 *field_0; u8 *field_4; u8 field_8; }; -u8 sub_8077ABC(u8, u8); +u8 GetBankPosition(u8, u8); u8 sub_8077E44(u8 slot, u16 species, u8 a3); u8 GetAnimBankSpriteId(u8 side); void StoreSpriteCallbackInData(struct Sprite *sprite, void(*callback)(struct Sprite *)); @@ -36,8 +28,7 @@ u8 GetBankIdentity(u8 slot); u8 GetBankByPlayerAI(u8); u8 GetBankByPlayerAI(u8); u8 GetBankByPlayerAI(u8 state); -u8 AnimBankSpriteExists(u8); -bool8 AnimBankSpriteExists(u8); +bool8 IsBankSpritePresent(u8); bool8 IsDoubleBattle(); u8 IsDoubleBattle(void); bool8 IsDoubleBattle(void); diff --git a/include/secret_base.h b/include/secret_base.h index abe5d781f..a3fa22c05 100644 --- a/include/secret_base.h +++ b/include/secret_base.h @@ -17,7 +17,7 @@ u8 sub_80BC050(); u8 *GetSecretBaseMapName(u8 *dest); void sub_80BC300(); u8 sub_80BCCA4(u8 secretBaseIndex); -const u8 *sub_80BCCE8(void); +const u8 *GetSecretBaseTrainerLoseText(void); void sub_80BCF1C(u8 taskId); void sub_80BD674(void *playerRecords, u32 size, u8 c); diff --git a/include/sprite.h b/include/sprite.h index 37a318206..2b7960f6f 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -250,7 +250,7 @@ void BuildOamBuffer(void); u8 CreateSprite(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); u8 CreateSpriteAtEnd(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); u8 CreateInvisibleSprite(void (*callback)(struct Sprite *)); -u8 CreateSpriteAndAnimate(struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); +u8 CreateSpriteAndAnimate(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); void DestroySprite(struct Sprite *sprite); void ResetOamRange(u8 a, u8 b); void LoadOam(void); diff --git a/include/trade.h b/include/trade.h index 642bdcd65..46f58a802 100644 --- a/include/trade.h +++ b/include/trade.h @@ -51,14 +51,11 @@ extern const u32 gUnknown_0820CA98[]; extern const u16 gUnknown_0820F798[]; void sub_8047CD8(void); -u16 sub_804DB2C(void); -void sub_804DB68(void); void sub_804E174(void); extern const u8 gOtherText_MaleSymbol3[2]; extern const u8 gOtherText_FemaleSymbol3[2]; extern const u8 gOtherText_GenderlessSymbol[2]; void sub_804E22C(void); -u16 sub_804D89C(void); #endif //POKERUBY_TRADE_H diff --git a/include/tv.h b/include/tv.h index c2158ece0..91b871f71 100644 --- a/include/tv.h +++ b/include/tv.h @@ -43,7 +43,7 @@ void sub_80BEA5C(u16); void sub_80BEA88(void); void sub_80BEA88(void); void sub_80BEB20(void); -int sub_80BEBC8(struct UnknownSaveStruct2ABC *arg0); +int sub_80BEBC8(struct PokeNews *arg0); extern void sub_80BEBF4(void); void sub_80BEC10(u8); bool8 GetPriceReduction(u8); @@ -80,7 +80,7 @@ void sub_80C01D4(void); void sub_80C03A8(u8 showidx); void sub_80C03C8(u16 species, u8 showidx); void sub_80C0408(void); -bool8 sub_80C06E8(struct UnknownSaveStruct2ABC *arg0, struct UnknownSaveStruct2ABC *arg1, s8 arg2); +bool8 sub_80C06E8(struct PokeNews *arg0, struct PokeNews *arg1, s8 arg2); void TVShowConvertInternationalString(u8 *, u8 *, u8); void DoTVShowTheNameRaterShow(void); void DoTVShowPokemonTodaySuccessfulCapture(void); diff --git a/src/battle/anim/alert.c b/src/battle/anim/alert.c index 538008be0..7cd42c17b 100755 --- a/src/battle/anim/alert.c +++ b/src/battle/anim/alert.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // alert (red thunder from the sides of a Pokemon, simulating more alert behavior.) // Used in Kinesis. @@ -16,7 +16,7 @@ void sub_80CF610(struct Sprite* sprite) sub_8078650(sprite); sub_807867C(sprite, gBattleAnimArgs[0]); sprite->pos1.y += gBattleAnimArgs[1]; - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { sprite->hFlip = 1; if (gBattleAnimArgs[2] != 0) @@ -29,5 +29,5 @@ void sub_80CF610(struct Sprite* sprite) } sprite->callback = sub_8078600; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/angel.c b/src/battle/anim/angel.c index 916ebfdfd..5ec083887 100755 --- a/src/battle/anim/angel.c +++ b/src/battle/anim/angel.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // angel (a little angel descends from somewhere towards a position) // Used in Sweet Kiss. @@ -33,5 +33,5 @@ void sub_80D2938(struct Sprite* sprite) } if (sprite->data[0] > 0x64) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/angel_kiss.c b/src/battle/anim/angel_kiss.c index 453c4d802..d5be6e2af 100755 --- a/src/battle/anim/angel_kiss.c +++ b/src/battle/anim/angel_kiss.c @@ -6,8 +6,8 @@ #include "random.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // angel_kiss (a different variation of kiss_fountain.) // Used in Sweet Kiss. @@ -22,7 +22,7 @@ void sub_80D29CC(struct Sprite* sprite) sprite->invisible = sprite->data[5] % 2; if (sprite->data[5] > 30) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void sub_80D2A38(struct Sprite* sprite) @@ -62,7 +62,7 @@ void sub_80D2A38(struct Sprite* sprite) sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; StartSpriteAnim(sprite, 0); - sprite->subpriority = sub_8079E90(gBattleAnimBankTarget) - 1; + sprite->subpriority = sub_8079E90(gAnimBankTarget) - 1; sprite->data[2] = 1; } diff --git a/src/battle/anim/anger.c b/src/battle/anim/anger.c index 8962e0855..011aa68ce 100755 --- a/src/battle/anim/anger.c +++ b/src/battle/anim/anger.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // anger (anger emotes, usually above the Pokemon's head, indicating annoyed emotions.) // Used in Frustration, Rage, Swagger, Torment, and Taunt. @@ -15,17 +15,17 @@ void sub_80D09C0(struct Sprite* sprite) { u8 bank; if (gBattleAnimArgs[0] == 0) - bank = gBattleAnimBankAttacker; + bank = gAnimBankAttacker; else - bank = gBattleAnimBankTarget; + bank = gAnimBankTarget; if (GetBankSide(bank) == 1) { gBattleAnimArgs[1] *= -1; } - sprite->pos1.x = sub_8077ABC(bank, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = sub_8077ABC(bank, 3) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBankPosition(bank, 2) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBankPosition(bank, 3) + gBattleAnimArgs[2]; if (sprite->pos1.y <= 7) sprite->pos1.y = 8; diff --git a/src/battle/anim/aurora.c b/src/battle/anim/aurora.c index 1ca5e649f..90fa5c879 100644 --- a/src/battle/anim/aurora.c +++ b/src/battle/anim/aurora.c @@ -6,8 +6,8 @@ #include "task.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D344C(struct Sprite *); static void sub_80D34D4(u8); @@ -17,15 +17,15 @@ void sub_80D33B4(struct Sprite *sprite) s16 r6; sub_80787B0(sprite, 1); - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) r6 = -gBattleAnimArgs[2]; else r6 = gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + r6; + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + r6; sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[3]; + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3]; obj_translate_based_on_private_1_2_3_4(sprite); sprite->callback = sub_80D344C; sprite->affineAnimPaused = TRUE; @@ -40,7 +40,7 @@ static void sub_80D344C(struct Sprite *sprite) sprite->affineAnimPaused = FALSE; } if (sub_8078B5C(sprite) != 0) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void sub_80D3490(u8 taskId) diff --git a/src/battle/anim/beta_beat_up.c b/src/battle/anim/beta_beat_up.c index 499e52a80..3af6dd926 100644 --- a/src/battle/anim/beta_beat_up.c +++ b/src/battle/anim/beta_beat_up.c @@ -4,8 +4,8 @@ #include "trig.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D6278(struct Sprite *); @@ -13,7 +13,7 @@ static void sub_80D6278(struct Sprite *); void sub_80D6234(struct Sprite *sprite) { - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { sprite->pos1.x -= gBattleAnimArgs[0]; } diff --git a/src/battle/anim/blow_kiss.c b/src/battle/anim/blow_kiss.c index e63f7189d..e7b49471d 100755 --- a/src/battle/anim/blow_kiss.c +++ b/src/battle/anim/blow_kiss.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D1FA4(struct Sprite* sprite); @@ -18,9 +18,9 @@ void sub_80D1F58(struct Sprite* sprite) sub_80787B0(sprite, 1); sprite->data[0] = 0x5F; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); obj_translate_based_on_private_1_2_3_4(sprite); sprite->callback = sub_80D1FA4; } @@ -34,6 +34,6 @@ void sub_80D1FA4(struct Sprite* sprite) } else { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/bottle.c b/src/battle/anim/bottle.c index ac5e51881..5485bcf5d 100755 --- a/src/battle/anim/bottle.c +++ b/src/battle/anim/bottle.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CCF70(struct Sprite* sprite); static void sub_80CD0CC(struct Sprite* sprite, int unk1, int unk2); @@ -16,8 +16,8 @@ static void sub_80CD0CC(struct Sprite* sprite, int unk1, int unk2); void sub_80CCF04(struct Sprite* sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3) + 0xFFE8; + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2); + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + 0xFFE8; sprite->data[0] = 0; sprite->data[1] = 0; sprite->data[2] = 0; @@ -98,7 +98,7 @@ void sub_80CCF70(struct Sprite* sprite) case 4: REG_BLDCNT = 0; REG_BLDALPHA = 0; - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); break; } } diff --git a/src/battle/anim/brace.c b/src/battle/anim/brace.c index 7b084efbb..19ea4297b 100755 --- a/src/battle/anim/brace.c +++ b/src/battle/anim/brace.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CDF70(struct Sprite* sprite); @@ -17,13 +17,13 @@ void sub_80CDF0C(struct Sprite* sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 0) + gBattleAnimArgs[1]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[2]; } else { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 0) + gBattleAnimArgs[1]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 1) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1) + gBattleAnimArgs[2]; } sprite->data[0] = 0; @@ -41,5 +41,5 @@ void sub_80CDF70(struct Sprite* sprite) sprite->pos1.y -= sprite->data[0]; if (sprite->animEnded) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/breath.c b/src/battle/anim/breath.c index 0fcc7fa08..831b222ad 100755 --- a/src/battle/anim/breath.c +++ b/src/battle/anim/breath.c @@ -5,32 +5,32 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // breath (a puff of smoke, usually from the mouth or nose of the Pokemon.) // Used in Swagger and Bulk Up. void sub_80D0930(struct Sprite* sprite) { - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) { StartSpriteAnim(sprite, 0); - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + 32; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + 32; sprite->data[1] = 0x40; } else { StartSpriteAnim(sprite, 1); - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) - 32; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) - 32; sprite->data[1] = -0x40; } - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); sprite->data[0] = 0x34; sprite->data[2] = 0; sprite->data[3] = 0; sprite->data[4] = 0; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sprite->callback = sub_8078394; } diff --git a/src/battle/anim/bubble.c b/src/battle/anim/bubble.c index 5da0d9929..403003ce3 100644 --- a/src/battle/anim/bubble.c +++ b/src/battle/anim/bubble.c @@ -5,8 +5,8 @@ #include "util.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D32E8(struct Sprite *sprite); static void sub_80D3370(struct Sprite *sprite); @@ -19,29 +19,29 @@ void sub_80D31C8(struct Sprite* sprite) { u8 newSpriteId; - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) - gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) - gBattleAnimArgs[0]; + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[1]; } else { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[1]; } sprite->animPaused = 1; - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sprite->data[0] = gBattleAnimArgs[6]; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); obj_translate_based_on_private_1_2_3_4(sprite); diff --git a/src/battle/anim/bullet.c b/src/battle/anim/bullet.c index 11306873a..90b2021f1 100755 --- a/src/battle/anim/bullet.c +++ b/src/battle/anim/bullet.c @@ -6,8 +6,8 @@ #include "random.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D0030(struct Sprite* sprite); static void sub_80D00B4(struct Sprite* sprite); @@ -19,8 +19,8 @@ void sub_80CFFD8(struct Sprite* sprite) { sub_80787B0(sprite, 1); sprite->data[0] = 20; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); sprite->callback = sub_8078B34; sprite->affineAnimPaused = 1; StoreSpriteCallbackInData(sprite, sub_80D0030); @@ -31,7 +31,7 @@ void sub_80D0030(struct Sprite* sprite) int i; u16 rand; s16* ptr; - PlaySE12WithPanning(0xA6, sub_8076F98(0x3F)); + PlaySE12WithPanning(0xA6, BattleAnimAdjustPanning(0x3F)); sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; sprite->pos2.y = 0; @@ -64,6 +64,6 @@ void sub_80D00B4(struct Sprite* sprite) sprite->data[1] = 0; sprite->data[2] /= 2; if (++sprite->data[3] == 1) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/copy_orb.c b/src/battle/anim/copy_orb.c index 96d2910f0..4fa8ea163 100755 --- a/src/battle/anim/copy_orb.c +++ b/src/battle/anim/copy_orb.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // copy_orb // Used in Mimic. @@ -16,14 +16,14 @@ void sub_80CB4CC(struct Sprite* sprite) { case 0: { - if (GetBankSide(gBattleAnimBankTarget) == 0) + if (GetBankSide(gAnimBankTarget) == 0) { s16 a = gBattleAnimArgs[0]; gBattleAnimArgs[0] = -a; } - sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 0) + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 1) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1) + gBattleAnimArgs[1]; sprite->invisible = 1; sprite->data[0]++; break; @@ -35,10 +35,10 @@ void sub_80CB4CC(struct Sprite* sprite) { ChangeSpriteAffineAnim(sprite, 1); sprite->data[0] = 25; - sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2); + sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3); sprite->callback = sub_8078CC0; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); break; } } diff --git a/src/battle/anim/cube.c b/src/battle/anim/cube.c index 07b3ea517..9adf46e32 100755 --- a/src/battle/anim/cube.c +++ b/src/battle/anim/cube.c @@ -6,8 +6,8 @@ #include "constants/songs.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CE000(struct Sprite* sprite); @@ -16,14 +16,14 @@ static void sub_80CE000(struct Sprite* sprite); void sub_80CDFB0(struct Sprite* sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) - 12; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) - 12; sprite->data[0] = 0; sprite->data[1] = 2; sprite->data[2] = 0; sprite->data[3] = 0; sprite->data[4] = 0; - sprite->data[5] = sub_8076F98(-0x40); + sprite->data[5] = BattleAnimAdjustPanning(-0x40); sprite->callback = sub_80CE000; } @@ -48,5 +48,5 @@ void sub_80CE000(struct Sprite* sprite) } if (sprite->animEnded && sprite->data[1] > 16 && sprite->invisible) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/curtain.c b/src/battle/anim/curtain.c index 1f34cb173..3c9e4e84c 100755 --- a/src/battle/anim/curtain.c +++ b/src/battle/anim/curtain.c @@ -6,11 +6,11 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; -extern u16 gUnknown_03004240; -extern u16 gUnknown_030042C4; +extern u16 gBattle_WIN0V; +extern u16 gBattle_WIN0H; static void sub_80D1D48(u8 taskId); static void sub_80D1D9C(u8 taskId); @@ -21,7 +21,7 @@ static void sub_80D1D9C(u8 taskId); void sub_80D1CD0(u8 taskId) { int zero; - bool8 result = NotInBattle(); + bool8 result = IsContest(); u16 var = 0xF0; if (result) { @@ -33,8 +33,8 @@ void sub_80D1CD0(u8 taskId) zero = 0; } - gUnknown_030042C4 = var; - gUnknown_03004240 = 0xA0; + gBattle_WIN0H = var; + gBattle_WIN0V = 0xA0; REG_WIN0H = var; REG_WIN0V = 0xA0; REG_WININ = 0x3F1F; @@ -52,12 +52,12 @@ void sub_80D1D48(u8 taskId) gTasks[taskId].data[1] -= 13; if (gTasks[taskId].data[0] >= gTasks[taskId].data[1]) { - gUnknown_030042C4 = 0; + gBattle_WIN0H = 0; gTasks[taskId].func = sub_80D1D9C; } else { - gUnknown_030042C4 = gTasks[taskId].data[1] | (gTasks[taskId].data[0] << 8); + gBattle_WIN0H = gTasks[taskId].data[1] | (gTasks[taskId].data[0] << 8); } } @@ -71,8 +71,8 @@ void sub_80D1D9C(u8 taskId) } else if (gTasks[taskId].data[10] > 4) { - gUnknown_030042C4 = 0; - gUnknown_03004240 = 0; + gBattle_WIN0H = 0; + gBattle_WIN0V = 0; REG_WININ = 0x3F3F; REG_WINOUT = 0x3F3F; REG_BLDCNT = 0; diff --git a/src/battle/anim/cutter.c b/src/battle/anim/cutter.c index 9859497e5..2234ebacb 100755 --- a/src/battle/anim/cutter.c +++ b/src/battle/anim/cutter.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CB09C(struct Sprite* sprite); static void sub_80CB1A4(struct Sprite* sprite); @@ -16,7 +16,7 @@ static void sub_80CB1A4(struct Sprite* sprite); void sub_80CAFD0(struct Sprite* sprite) { sub_80787B0(sprite, 1); - if (GetBankSide(gBattleAnimBankAttacker)) + if (GetBankSide(gAnimBankAttacker)) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } @@ -24,19 +24,19 @@ void sub_80CAFD0(struct Sprite* sprite) sprite->data[0] = gBattleAnimArgs[4]; if (!(gBattleAnimArgs[6])) { - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[2]; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[3]; + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3]; } else { - sub_807A3FC(gBattleAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]); + sub_807A3FC(gAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]); sprite->data[2] += gBattleAnimArgs[2]; sprite->data[4] += gBattleAnimArgs[3]; } sprite->data[5] = gBattleAnimArgs[5]; sub_80786EC(sprite); - if (GetBankSide(gBattleAnimBankAttacker) == GetBankSide(gBattleAnimBankTarget)) + if (GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget)) { sprite->data[0] = 1; } @@ -77,14 +77,14 @@ void sub_80CB09C(struct Sprite* sprite) c = TRUE; if (c) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void sub_80CB144(struct Sprite* sprite) { - if (!NotInBattle() && IsDoubleBattle() == TRUE) + if (!IsContest() && IsDoubleBattle() == TRUE) { - sub_807A3FC(gBattleAnimBankTarget, 1, &sprite->pos1.x, &sprite->pos1.y); + sub_807A3FC(gAnimBankTarget, 1, &sprite->pos1.x, &sprite->pos1.y); } sprite->pos1.y += 32; @@ -117,14 +117,14 @@ void sub_80CB1A4(struct Sprite* sprite) sprite->pos2.y = Sin(sprite->data[5], 5); if (sprite->data[5] <= 0x7F) { - sprite->oam.priority = sub_8079ED4(gBattleAnimBankTarget) - 1; + sprite->oam.priority = sub_8079ED4(gAnimBankTarget) - 1; } else { - sprite->oam.priority = sub_8079ED4(gBattleAnimBankTarget) + 1; + sprite->oam.priority = sub_8079ED4(gAnimBankTarget) + 1; } sprite->data[0]--; if (!sprite->data[0]) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/cyclone.c b/src/battle/anim/cyclone.c index b19304f17..0f83df211 100755 --- a/src/battle/anim/cyclone.c +++ b/src/battle/anim/cyclone.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // cyclone (creates a circling motion like a cyclone, usually a wind sprite.) // Used in Razor Wind. @@ -14,7 +14,7 @@ extern u8 gBattleAnimBankTarget; void sub_80D0118(struct Sprite* sprite) { sub_80787B0(sprite, 0); - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) sprite->pos1.y += 16; sprite->data[0] = gBattleAnimArgs[4]; @@ -23,6 +23,6 @@ void sub_80D0118(struct Sprite* sprite) sprite->data[3] = gBattleAnimArgs[6]; sprite->data[4] = gBattleAnimArgs[3]; sprite->callback = sub_8078114; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sprite->callback(sprite); } diff --git a/src/battle/anim/devil.c b/src/battle/anim/devil.c index 345ee53ea..c628abfc0 100644 --- a/src/battle/anim/devil.c +++ b/src/battle/anim/devil.c @@ -5,7 +5,7 @@ #include "trig.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankTarget; void sub_80D2ABC(struct Sprite *sprite) { @@ -14,7 +14,7 @@ void sub_80D2ABC(struct Sprite *sprite) sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; StartSpriteAnim(sprite, 0); - sprite->subpriority = sub_8079E90(gBattleAnimBankTarget) - 1; + sprite->subpriority = sub_8079E90(gAnimBankTarget) - 1; sprite->data[2] = 1; } sprite->data[0] += sprite->data[2]; @@ -33,5 +33,5 @@ void sub_80D2ABC(struct Sprite *sprite) else sprite->invisible = FALSE; if (sprite->data[3] > 0x5A) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/draw.c b/src/battle/anim/draw.c index c075af097..3adb62e06 100755 --- a/src/battle/anim/draw.c +++ b/src/battle/anim/draw.c @@ -6,11 +6,11 @@ #include "unknown_task.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; -extern u16 gUnknown_03004288; -extern u16 gUnknown_030042C0; +extern u16 gBattle_BG2_X; +extern u16 gBattle_BG1_X; static void sub_80D0D68(u8 taskId); static void sub_80D0E8C(struct Sprite* sprite); @@ -23,21 +23,21 @@ void sub_80D0C88(u8 taskId) struct Task* task = &gTasks[taskId]; struct UnknownTaskStruct sp; s16 i; - task->data[0] = sub_8077FC0(gBattleAnimBankTarget) + 32; + task->data[0] = sub_8077FC0(gAnimBankTarget) + 32; task->data[1] = 4; task->data[2] = 0; task->data[3] = 0; task->data[4] = 0; task->data[5] = 0; - task->data[15] = sub_807A100(gBattleAnimBankTarget, 0); - if (GetBankIdentity_permutated(gBattleAnimBankTarget) == 1) + task->data[15] = sub_807A100(gAnimBankTarget, 0); + if (GetBankIdentity_permutated(gAnimBankTarget) == 1) { - task->data[6] = gUnknown_030042C0; + task->data[6] = gBattle_BG1_X; sp.dest = (u16 *)REG_ADDR_BG1HOFS; } else { - task->data[6] = gUnknown_03004288; + task->data[6] = gBattle_BG2_X; sp.dest = (u16 *)REG_ADDR_BG2HOFS; } @@ -220,15 +220,15 @@ _080D0E2C: .4byte gUnknown_03004DC0\n\ void sub_80D0E30(struct Sprite* sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 0) - 16; - sprite->pos1.y = sub_8077FC0(gBattleAnimBankTarget) + 16; + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0) - 16; + sprite->pos1.y = sub_8077FC0(gAnimBankTarget) + 16; sprite->data[0] = 0; sprite->data[1] = 0; sprite->data[2] = 0; sprite->data[3] = 16; sprite->data[4] = 0; - sprite->data[5] = sub_807A100(gBattleAnimBankTarget, 0) + 2; - sprite->data[6] = sub_8076F98(0x3F); + sprite->data[5] = sub_807A100(gAnimBankTarget, 0) + 2; + sprite->data[6] = BattleAnimAdjustPanning(0x3F); sprite->callback = sub_80D0E8C; } @@ -285,7 +285,7 @@ void sub_80D0E8C(struct Sprite* sprite) if (++sprite->data[1] > 16) { sprite->invisible = 0; - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } break; } diff --git a/src/battle/anim/drum.c b/src/battle/anim/drum.c index 60cb2acc1..6306778ae 100755 --- a/src/battle/anim/drum.c +++ b/src/battle/anim/drum.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // drum (using hands to slap the Pokemon's belly in a rhythm.) // Used in Belly Drum. @@ -24,9 +24,9 @@ void sub_80CEDF0(struct Sprite* sprite) a = -16; } - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + a; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) + 8; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + a; + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + 8; sprite->data[0] = 8; sprite->callback = sub_80782D8; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/egg.c b/src/battle/anim/egg.c index a5bcffa6d..8004b3bf5 100755 --- a/src/battle/anim/egg.c +++ b/src/battle/anim/egg.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D13AC(struct Sprite* sprite); static void sub_80D1424(struct Sprite* sprite); @@ -23,7 +23,7 @@ void sub_80D1368(struct Sprite* sprite) { s16 r1; sub_80787B0(sprite, 0); - r1 = (GetBankSide(gBattleAnimBankAttacker)) ? -0xA0 : 0xA0; + r1 = (GetBankSide(gAnimBankAttacker)) ? -0xA0 : 0xA0; sprite->data[0] = 0x380; sprite->data[1] = r1; sprite->data[7] = gBattleAnimArgs[2]; @@ -36,7 +36,7 @@ void sub_80D13AC(struct Sprite* sprite) sprite->pos2.y -= (sprite->data[0] >> 8); sprite->pos2.x = sprite->data[1] >> 8; sprite->data[0] -= 32; - add = (GetBankSide(gBattleAnimBankAttacker)) ? -0xA0 : 0xA0; + add = (GetBankSide(gAnimBankAttacker)) ? -0xA0 : 0xA0; sprite->data[1] += add; if (sprite->pos2.y > 0) { @@ -110,7 +110,7 @@ void sub_80D154C(struct Sprite* sprite) if (sprite->data[7] == 0) sprite->callback = sub_80D158C; else - sprite->callback = move_anim_8072740; + sprite->callback = DestroyAnimSprite; } } @@ -118,5 +118,5 @@ void sub_80D158C(struct Sprite* sprite) { REG_BLDCNT = 0; REG_BLDALPHA = 0; - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/energy_wave.c b/src/battle/anim/energy_wave.c index ffba5c300..15045f5bd 100644 --- a/src/battle/anim/energy_wave.c +++ b/src/battle/anim/energy_wave.c @@ -6,8 +6,8 @@ #include "trig.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern const struct SpriteTemplate gSpriteTemplate_83D9130[]; static void sub_80D35DC(struct Sprite *); @@ -24,9 +24,9 @@ void sub_80D3554(struct Sprite *sprite) sprite->data[0] = 30; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); obj_translate_based_on_private_1_2_3_4(sprite); @@ -51,7 +51,7 @@ static void sub_80D35DC(struct Sprite *sprite) { if (sub_8078B5C(sprite)) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } sprite->pos2.y += Sin(sprite->data[6] >> 8, sprite->data[7]); @@ -86,15 +86,15 @@ void sub_80D3698(struct Sprite *sprite) { u8 subpriority; - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 0); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1); + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1); sprite->pos2.y = -10; - subpriority = sub_8079E90(gBattleAnimBankAttacker); + subpriority = sub_8079E90(gAnimBankAttacker); - if (!NotInBattle()) + if (!IsContest()) { - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) { sprite->pos2.x = 10; sprite->subpriority = subpriority + 2; @@ -118,7 +118,7 @@ static void sub_80D370C(struct Sprite *sprite) { if (sprite->affineAnimEnded) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } @@ -126,11 +126,11 @@ void sub_80D3728(struct Sprite *sprite) { int var1, var2; - if (GetBankSide(gBattleAnimBankAttacker) == GetBankSide(gBattleAnimBankTarget)) + if (GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget)) { gBattleAnimArgs[0] *= -1; - if (GetBankIdentity(gBattleAnimBankAttacker) == 0 || GetBankIdentity(gBattleAnimBankAttacker) == 1) + if (GetBankIdentity(gAnimBankAttacker) == 0 || GetBankIdentity(gAnimBankAttacker) == 1) { gBattleAnimArgs[0] *= -1; } @@ -149,14 +149,14 @@ void sub_80D3728(struct Sprite *sprite) sub_80787B0(sprite, var1); - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[2]; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, var2) + gBattleAnimArgs[3]; + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBankPosition(gAnimBankTarget, var2) + gBattleAnimArgs[3]; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/espeed.c b/src/battle/anim/espeed.c index 621d386e1..469522092 100755 --- a/src/battle/anim/espeed.c +++ b/src/battle/anim/espeed.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern s8 gUnknown_083D7A00[4][2]; @@ -51,7 +51,7 @@ void sub_80D1638(u8 taskId) task->data[2] = 0; task->data[3] = 0; task->data[12] = 3; - if (GetBankSide(gBattleAnimBankTarget) == 0) + if (GetBankSide(gAnimBankTarget) == 0) { task->data[13] = 0xFFFF; task->data[14] = 8; @@ -169,8 +169,8 @@ void sub_80D18D4(u8 taskId) task->data[7] = 0; task->data[8] = 0; task->data[13] = 0; - task->data[14] = sub_8077ABC(gBattleAnimBankAttacker, 0); - task->data[15] = sub_8077ABC(gBattleAnimBankAttacker, 1); + task->data[14] = GetBankPosition(gAnimBankAttacker, 0); + task->data[15] = GetBankPosition(gAnimBankAttacker, 1); task->func = sub_80D1930; } diff --git a/src/battle/anim/evasion.c b/src/battle/anim/evasion.c index b4e81009b..ded8428d4 100755 --- a/src/battle/anim/evasion.c +++ b/src/battle/anim/evasion.c @@ -7,8 +7,8 @@ #include "blend_palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CE910(u8 taskId); static void sub_80CE974(struct Sprite* sprite); @@ -47,7 +47,7 @@ void sub_80CE7E0(u8 taskId) } task->func = sub_80CE910; - if (GetBankIdentity_permutated(gBattleAnimBankAttacker) == 1) + if (GetBankIdentity_permutated(gAnimBankAttacker) == 1) { REG_DISPCNT &= 0xFDFF; } @@ -62,7 +62,7 @@ void sub_80CE910(u8 taskId) struct Task* task = &gTasks[taskId]; if (!task->data[3]) { - if (GetBankIdentity_permutated(gBattleAnimBankAttacker) == 1) + if (GetBankIdentity_permutated(gAnimBankAttacker) == 1) REG_DISPCNT |= 0x200; else REG_DISPCNT |= 0x400; diff --git a/src/battle/anim/fang.c b/src/battle/anim/fang.c index 4df450691..5ed7372a8 100755 --- a/src/battle/anim/fang.c +++ b/src/battle/anim/fang.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // fang // Used by Super Fang (and probably Hyper Fang, but the actual callbacks are not in this file.) @@ -14,6 +14,6 @@ extern u8 gBattleAnimBankTarget; void sub_80CEA04(struct Sprite* sprite) { - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sprite->callback = sub_8078600; } diff --git a/src/battle/anim/flash.c b/src/battle/anim/flash.c index 0e087ec2d..eaa38e5b7 100755 --- a/src/battle/anim/flash.c +++ b/src/battle/anim/flash.c @@ -6,8 +6,8 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FC8; extern struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FF8; diff --git a/src/battle/anim/flying_hearts.c b/src/battle/anim/flying_hearts.c index 5b7d31a51..d2d22602a 100755 --- a/src/battle/anim/flying_hearts.c +++ b/src/battle/anim/flying_hearts.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D2094(struct Sprite* sprite); @@ -35,6 +35,6 @@ void sub_80D2094(struct Sprite* sprite) { sprite->invisible = sprite->data[3] % 2; if (y <= 0x40) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/flying_path.c b/src/battle/anim/flying_path.c index 017f89858..441ac0e6d 100755 --- a/src/battle/anim/flying_path.c +++ b/src/battle/anim/flying_path.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern struct SpriteTemplate gSpriteTemplate_83D6884; @@ -22,12 +22,12 @@ void sub_80CBDF4(u8 taskId) { struct Task *task = &gTasks[taskId]; - task->data[4] = sub_8079E90(gBattleAnimBankTarget) - 1; - task->data[6] = sub_8077ABC(gBattleAnimBankTarget, 2); - task->data[7] = sub_8077ABC(gBattleAnimBankTarget, 3); - task->data[10] = sub_807A100(gBattleAnimBankTarget, 1); - task->data[11] = sub_807A100(gBattleAnimBankTarget, 0); - task->data[5] = (GetBankSide(gBattleAnimBankTarget) == 1) ? 1 : -1; + task->data[4] = sub_8079E90(gAnimBankTarget) - 1; + task->data[6] = GetBankPosition(gAnimBankTarget, 2); + task->data[7] = GetBankPosition(gAnimBankTarget, 3); + task->data[10] = sub_807A100(gAnimBankTarget, 1); + task->data[11] = sub_807A100(gAnimBankTarget, 0); + task->data[5] = (GetBankSide(gAnimBankTarget) == 1) ? 1 : -1; task->data[9] = 0x38 - (task->data[5] * 64); task->data[8] = task->data[7] - task->data[9] + task->data[6]; task->data[2] = CreateSprite(&gSpriteTemplate_83D6884, task->data[8], task->data[9], task->data[4]); diff --git a/src/battle/anim/flying_petals.c b/src/battle/anim/flying_petals.c index ed6497b7a..4eeaa5215 100755 --- a/src/battle/anim/flying_petals.c +++ b/src/battle/anim/flying_petals.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CC580(struct Sprite* sprite); @@ -17,9 +17,9 @@ void sub_80CC474(struct Sprite* sprite) { u8 bank; if (!gBattleAnimArgs[6]) - bank = gBattleAnimBankAttacker; + bank = gAnimBankAttacker; else - bank = gBattleAnimBankTarget; + bank = gAnimBankTarget; if (GetBankSide(bank) != 0) { @@ -48,11 +48,11 @@ void sub_80CC474(struct Sprite* sprite) sprite->oam.priority = sub_8079ED4(bank) + 1; break; case 2: - sprite->pos1.y = sub_8077ABC(bank, 3) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBankPosition(bank, 3) + gBattleAnimArgs[0]; sprite->oam.priority = sub_8079ED4(bank); break; case 3: - sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[0]; GetAnimBankSpriteId(1); sprite->oam.priority = sub_8079ED4(bank) + 1; break; diff --git a/src/battle/anim/fury_cutter_count.c b/src/battle/anim/fury_cutter_count.c index 17b084585..6b41055cb 100644 --- a/src/battle/anim/fury_cutter_count.c +++ b/src/battle/anim/fury_cutter_count.c @@ -1,20 +1,20 @@ #include "global.h" +#include "battle.h" #include "battle_anim.h" extern s16 gBattleAnimArgs[8]; -extern u8 *gDisableStructMoveAnim; // TODO: this is declared with a different type in different files // fury_cutter (updates the direction and count of the fury cutter animation) // Used in Fury Cutter. void UpdateFuryCutterAnimDirection(u8 taskId) { - gBattleAnimArgs[7] = gDisableStructMoveAnim[16] & 1; + gBattleAnimArgs[7] = gAnimDisableStructPtr->furyCutterCounter & 1; DestroyAnimVisualTask(taskId); } void UpdateFuryCutterAnimCount(u8 taskId) { - gBattleAnimArgs[7] = gDisableStructMoveAnim[16]; + gBattleAnimArgs[7] = gAnimDisableStructPtr->furyCutterCounter; DestroyAnimVisualTask(taskId); } diff --git a/src/battle/anim/glitter.c b/src/battle/anim/glitter.c index 548397932..e4577f1e1 100755 --- a/src/battle/anim/glitter.c +++ b/src/battle/anim/glitter.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // glitter (the sparkling effect seen on Pokemon, usually after healing or a beneficial effect.) // Used by Heal Bell, Cosmic Power, and Aromatherapy. @@ -21,7 +21,7 @@ void sub_80CD140(struct Sprite* sprite) sprite->data[0] = gBattleAnimArgs[5]; sprite->data[1] = gBattleAnimArgs[3]; sprite->data[2] = gBattleAnimArgs[4]; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sprite->callback = sub_8078394; } @@ -29,9 +29,9 @@ void sub_80CD190(struct Sprite* sprite) { u8 bank; if (!gBattleAnimArgs[2]) - bank = gBattleAnimBankAttacker; + bank = gAnimBankAttacker; else - bank = gBattleAnimBankTarget; + bank = gAnimBankTarget; if (IsDoubleBattle() && IsAnimBankSpriteVisible(bank ^ 2)) { @@ -43,13 +43,13 @@ void sub_80CD190(struct Sprite* sprite) { if (!gBattleAnimArgs[6]) { - sprite->pos1.x = sub_8077ABC(bank, 0); - sprite->pos1.y = sub_8077ABC(bank, 1) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBankPosition(bank, 0); + sprite->pos1.y = GetBankPosition(bank, 1) + gBattleAnimArgs[1]; } else { - sprite->pos1.x = sub_8077ABC(bank, 2); - sprite->pos1.y = sub_8077ABC(bank, 3) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBankPosition(bank, 2); + sprite->pos1.y = GetBankPosition(bank, 3) + gBattleAnimArgs[1]; } sub_807867C(sprite, gBattleAnimArgs[0]); @@ -58,6 +58,6 @@ void sub_80CD190(struct Sprite* sprite) sprite->data[0] = gBattleAnimArgs[5]; sprite->data[1] = gBattleAnimArgs[3]; sprite->data[2] = gBattleAnimArgs[4]; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sprite->callback = sub_8078394; } diff --git a/src/battle/anim/glow.c b/src/battle/anim/glow.c index 6038825af..63466c0ff 100755 --- a/src/battle/anim/glow.c +++ b/src/battle/anim/glow.c @@ -8,8 +8,8 @@ #include "decompress.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u16 gUnknown_083D7A5C[5]; @@ -32,11 +32,11 @@ void sub_80D1ADC(u8 taskId) } src = &gBattleAnimSpritePalette_206; - dest = (NotInBattle()) ? gSharedMem + 0x18000 - 0x3800: gSharedMem + 0x18000; + dest = (IsContest()) ? gSharedMem + 0x18000 - 0x3800: gSharedMem + 0x18000; LZDecompressWram(src, dest); for (i = 0; i <= 4; i++) { - what = ((NotInBattle()) ? gSharedMem + 0x14800 : gSharedMem + 0x18000) + (i << 5); + what = ((IsContest()) ? gSharedMem + 0x14800 : gSharedMem + 0x18000) + (i << 5); LoadPalette(what, (u16)((sp[i] << 4) + 0x100), 32); } diff --git a/src/battle/anim/grip.c b/src/battle/anim/grip.c index 93c3dba96..c4d7b1cef 100755 --- a/src/battle/anim/grip.c +++ b/src/battle/anim/grip.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D020C(struct Sprite* sprite); @@ -31,8 +31,8 @@ void sub_80D0178(struct Sprite* sprite) sprite->pos1.x += r7; sprite->pos1.y += r4; sprite->data[0] = 6; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + r8; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + r6; + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + r8; + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + r6; sprite->callback = sub_8078B34; StoreSpriteCallbackInData(sprite, sub_80D020C); } @@ -40,5 +40,5 @@ void sub_80D0178(struct Sprite* sprite) void sub_80D020C(struct Sprite* sprite) { if (sprite->animEnded == 1) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/grow.c b/src/battle/anim/grow.c index 35047c8b0..8788b32fe 100755 --- a/src/battle/anim/grow.c +++ b/src/battle/anim/grow.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern struct AffineAnimFrameCmd gUnknown_083D7714; diff --git a/src/battle/anim/guard.c b/src/battle/anim/guard.c index 4769db2e4..ab093eab1 100644 --- a/src/battle/anim/guard.c +++ b/src/battle/anim/guard.c @@ -3,8 +3,8 @@ #include "rom_8077ABC.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u16 gBattleTypeFlags; // guard (moves guard rings upwards) @@ -12,17 +12,17 @@ extern u16 gBattleTypeFlags; void sub_80D3014(struct Sprite *sprite) { - if ((gBattleTypeFlags & 1) && IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2)) + if ((gBattleTypeFlags & 1) && IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) { - sub_807A3FC(gBattleAnimBankAttacker, 0, &sprite->pos1.x, &sprite->pos1.y); + sub_807A3FC(gAnimBankAttacker, 0, &sprite->pos1.x, &sprite->pos1.y); sprite->pos1.y += 40; StartSpriteAffineAnim(sprite, 1); } else { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 0); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1) + 40; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + 40; } sprite->data[0] = 13; @@ -30,5 +30,5 @@ void sub_80D3014(struct Sprite *sprite) sprite->data[4] = sprite->pos1.y - 72; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/guillotine.c b/src/battle/anim/guillotine.c index b710f372a..b3d842cdf 100755 --- a/src/battle/anim/guillotine.c +++ b/src/battle/anim/guillotine.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D02D0(struct Sprite* sprite); static void sub_80D0344(struct Sprite* sprite); @@ -34,9 +34,9 @@ void sub_80D0228(struct Sprite* sprite) sprite->pos1.y += r4; sprite->data[0] = 6; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + r9; + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + r9; sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + r6; + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + r6; obj_translate_based_on_private_1_2_3_4(sprite); sprite->data[5] = gBattleAnimArgs[0]; sprite->data[6] = sprite->data[0]; @@ -86,5 +86,5 @@ void sub_80D0344(struct Sprite* sprite) void sub_80D03A8(struct Sprite* sprite) { if (sub_8078B5C(sprite) != 0) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/heal.c b/src/battle/anim/heal.c index c5950650c..a8c14ea1c 100755 --- a/src/battle/anim/heal.c +++ b/src/battle/anim/heal.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // heal (healing sparkles on a Pokemon) // Used in Present, if the move heals instead of damages. @@ -22,6 +22,6 @@ void sub_80CBAA4(struct Sprite* sprite) sprite->pos2.y = sprite->data[1] * sprite->data[0]; if (sprite->animEnded) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/heart_1.c b/src/battle/anim/heart_1.c index 1ab83136c..5df89f929 100755 --- a/src/battle/anim/heart_1.c +++ b/src/battle/anim/heart_1.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // heart_1 (a floating heart in a wave pattern upward.) // Used in Charm, Covet, and when a Pokemon is infatuated. @@ -21,5 +21,5 @@ void sub_80D1C80(struct Sprite* sprite) sprite->data[1] = (sprite->data[1] + 7) & 0xFF; sprite->data[2] -= 0x80; if (sprite->data[0] == 0x3C) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/heated_rock.c b/src/battle/anim/heated_rock.c index 1d59669cf..51cfbd007 100644 --- a/src/battle/anim/heated_rock.c +++ b/src/battle/anim/heated_rock.c @@ -3,8 +3,8 @@ #include "rom_8077ABC.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u16 gBattleTypeFlags; void sub_80D59B0(struct Sprite *); @@ -28,7 +28,7 @@ u16 sub_80D5940(u8 spriteId) { u16 var1 = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y + gSprites[spriteId].centerToCornerVecY; - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) { var1 = ((var1 << 16) + 0x4A0000) >> 16; } @@ -198,7 +198,7 @@ static void sub_80D5A74(struct Sprite *sprite) if (++sprite->data[3] > 16) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } break; } diff --git a/src/battle/anim/homing.c b/src/battle/anim/homing.c index c5e372d78..6fb4a76d8 100755 --- a/src/battle/anim/homing.c +++ b/src/battle/anim/homing.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CC7D4(struct Sprite* sprite); @@ -23,19 +23,19 @@ void sub_80CC6CC(struct Sprite* sprite) if (gBattleAnimArgs[4] == 0) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } else { if (gBattleAnimArgs[0] == 0) { - a = sub_8077ABC(gBattleAnimBankAttacker, 2); - b = sub_8077ABC(gBattleAnimBankAttacker, 3); + a = GetBankPosition(gAnimBankAttacker, 2); + b = GetBankPosition(gAnimBankAttacker, 3); } else { - a = sub_8077ABC(gBattleAnimBankTarget, 2); - b = sub_8077ABC(gBattleAnimBankTarget, 3); + a = GetBankPosition(gAnimBankTarget, 2); + b = GetBankPosition(gAnimBankTarget, 3); } sprite->data[0] = gBattleAnimArgs[4]; @@ -61,7 +61,7 @@ void sub_80CC6CC(struct Sprite* sprite) sprite->data[3] = (sprite->data[5] - sprite->pos1.x) * 16 / gBattleAnimArgs[4]; sprite->data[4] = (sprite->data[6] - sprite->pos1.y) * 16 / gBattleAnimArgs[4]; c = sub_80790F0(sprite->data[5] - x, sprite->data[6] - y); - if (NotInBattle()) + if (IsContest()) c -= 0x8000; sub_8078FDC(sprite, 0, 0x100, 0x100, c); diff --git a/src/battle/anim/hop.c b/src/battle/anim/hop.c index 60f3b8a48..4006e2d43 100755 --- a/src/battle/anim/hop.c +++ b/src/battle/anim/hop.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // hop (where a sprite "hops" across the screen) // Used by Present, Trick, and the item knock off effect. @@ -65,7 +65,7 @@ void sub_80CB8B8(struct Sprite* sprite) sprite->data[0]++; if (sprite->data[0] > 50) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } @@ -92,9 +92,9 @@ void sub_80CB94C(struct Sprite* sprite) s16 e1; s16 e2; sub_80787B0(sprite, 0); - e1 = sub_8077ABC(gBattleAnimBankTarget, 0); - e2 = sub_8077ABC(gBattleAnimBankTarget, 1); - if ((gBattleAnimBankAttacker ^ 2) == gBattleAnimBankTarget) + e1 = GetBankPosition(gAnimBankTarget, 0); + e2 = GetBankPosition(gAnimBankTarget, 1); + if ((gAnimBankAttacker ^ 2) == gAnimBankTarget) { sprite->data[6] = e1; sprite->data[7] = e2 + 10; @@ -129,14 +129,14 @@ void sub_80CB9C4(struct Sprite* sprite) { sprite->pos2.y = zero; sprite->data[0] = zero; - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } void sub_80CBA28(struct Sprite* sprite) { - s16 e = sub_8077ABC(gBattleAnimBankTarget, 1); - if (GetBankSide(gBattleAnimBankTarget) == 0) + s16 e = GetBankPosition(gAnimBankTarget, 1); + if (GetBankSide(gAnimBankTarget) == 0) { sprite->data[6] = 0; sprite->data[7] = e + 10; @@ -149,7 +149,7 @@ void sub_80CBA28(struct Sprite* sprite) { sprite->data[6] = 255; sprite->data[7] = e + 10; - if (NotInBattle()) + if (IsContest()) sprite->data[6] = 0; sub_80CB7EC(sprite, 0x28); diff --git a/src/battle/anim/hop_2.c b/src/battle/anim/hop_2.c index 5458c4599..1bc3f46af 100755 --- a/src/battle/anim/hop_2.c +++ b/src/battle/anim/hop_2.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern void sub_80CB7EC(struct Sprite* sprite, s16 c); extern bool8 sub_80CB814(struct Sprite* sprite); @@ -22,9 +22,9 @@ void sub_80CBAE8(struct Sprite* sprite) s16 p1; s16 p2; sub_8078764(sprite, 0); - p1 = sub_8077ABC(gBattleAnimBankAttacker, 0); - p2 = sub_8077ABC(gBattleAnimBankAttacker, 1); - if ((gBattleAnimBankTarget ^ 2) == gBattleAnimBankAttacker) + p1 = GetBankPosition(gAnimBankAttacker, 0); + p2 = GetBankPosition(gAnimBankAttacker, 1); + if ((gAnimBankTarget ^ 2) == gAnimBankAttacker) { sprite->data[6] = p1; sprite->data[7] = p2 + 10; @@ -57,7 +57,7 @@ void sub_80CBB60(struct Sprite* sprite) sprite->pos2.y = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8); if (sprite->pos2.y == 0) { - PlaySE12WithPanning(0x7D, sub_8076F98(0x3F)); + PlaySE12WithPanning(0x7D, BattleAnimAdjustPanning(0x3F)); } if (sub_80CB814(sprite)) @@ -65,6 +65,6 @@ void sub_80CBB60(struct Sprite* sprite) sprite->pos2.y = 0; sprite->data[0] = 0; sprite->callback = sub_80CB8B8; - PlaySE12WithPanning(0x7D, sub_8076F98(-0x40)); + PlaySE12WithPanning(0x7D, BattleAnimAdjustPanning(-0x40)); } } diff --git a/src/battle/anim/kiss_fountain.c b/src/battle/anim/kiss_fountain.c index 2e7f64c11..d3270ee65 100755 --- a/src/battle/anim/kiss_fountain.c +++ b/src/battle/anim/kiss_fountain.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // kiss_fountain (a series of hearts pour out of a target Pokemon.) // Used in Attract and Sweet Kiss. @@ -32,7 +32,7 @@ void sub_80D1FDC(struct Sprite* sprite) if (sprite->data[3] > 0x78) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } } diff --git a/src/battle/anim/leaf.c b/src/battle/anim/leaf.c index 13d1bc9f5..676734717 100755 --- a/src/battle/anim/leaf.c +++ b/src/battle/anim/leaf.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CAF20(struct Sprite* sprite); static void sub_80CAF6C(struct Sprite* sprite); @@ -15,8 +15,8 @@ static void sub_80CAF6C(struct Sprite* sprite); void sub_80CAED8(struct Sprite* sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); sprite->data[0] = gBattleAnimArgs[0]; sprite->data[1] = gBattleAnimArgs[1]; sprite->data[2] = gBattleAnimArgs[2]; @@ -51,7 +51,7 @@ void sub_80CAF20(struct Sprite* sprite) void sub_80CAF6C(struct Sprite* sprite) { - if (GetBankSide(gBattleAnimBankAttacker)) + if (GetBankSide(gAnimBankAttacker)) { sprite->pos2.x = -Sin(sprite->data[0], 0x19); } @@ -69,6 +69,6 @@ void sub_80CAF6C(struct Sprite* sprite) if (sprite->data[1] > 0x50) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/love_bg.c b/src/battle/anim/love_bg.c index 1e49b536c..bd3d22ca6 100755 --- a/src/battle/anim/love_bg.c +++ b/src/battle/anim/love_bg.c @@ -7,15 +7,15 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern struct INCBIN_U8 gAttractTilemap; extern struct INCBIN_U8 gAttractGfx; extern struct INCBIN_U8 gAttractPal; -extern u16 gUnknown_030041B4; -extern u16 gUnknown_030042C0; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG1_X; static void sub_80D21F0(u8 taskId); @@ -30,11 +30,11 @@ void sub_80D2100(u8 taskId) REG_BLDALPHA = 0x1000; REG_BG1CNT_BITFIELD.priority = 3; REG_BG1CNT_BITFIELD.screenSize = 0; - if (!NotInBattle()) + if (!IsContest()) REG_BG1CNT_BITFIELD.charBaseBlock = 1; - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; REG_BG1HOFS = 0; REG_BG1VOFS = 0; sub_8078914(&subStruct); @@ -43,7 +43,7 @@ void sub_80D2100(u8 taskId) LZDecompressVram(&gAttractTilemap, tempvar); LZDecompressVram(&gAttractGfx, subStruct.field_0); LoadCompressedPalette(&gAttractPal, subStruct.field_8 << 4, 32); - if (NotInBattle()) + if (IsContest()) sub_80763FC(subStruct.field_8, (u16 *)subStruct.field_4, 0, 0); gTasks[taskId].func = sub_80D21F0; @@ -106,7 +106,7 @@ void sub_80D21F0(u8 taskId) } } DmaClear32(3, subStruct.field_4, 0x800); - if (!NotInBattle()) + if (!IsContest()) REG_BG1CNT_BITFIELD.charBaseBlock = 0; gTasks[taskId].data[12]++; diff --git a/src/battle/anim/lunge_1.c b/src/battle/anim/lunge_1.c index f1e1e35b6..d379c8f09 100755 --- a/src/battle/anim/lunge_1.c +++ b/src/battle/anim/lunge_1.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u8 gObjectBankIDs[]; @@ -44,9 +44,9 @@ void sub_80CD774(struct Sprite* sprite) void sub_80CD7CC(struct Sprite* sprite) { sprite->data[0] = 6; - sprite->data[1] = (GetBankSide(gBattleAnimBankAttacker)) ? 2 : -2; + sprite->data[1] = (GetBankSide(gAnimBankAttacker)) ? 2 : -2; sprite->data[2] = 0; - sprite->data[3] = gObjectBankIDs[gBattleAnimBankAttacker]; + sprite->data[3] = gObjectBankIDs[gAnimBankAttacker]; StoreSpriteCallbackInData(sprite, sub_80CD81C); sprite->callback = sub_8078458; } @@ -55,9 +55,9 @@ void sub_80CD81C(struct Sprite* sprite) { if (sprite->data[0] == 0) { - sprite->data[3] = gObjectBankIDs[gBattleAnimBankAttacker]; + sprite->data[3] = gObjectBankIDs[gAnimBankAttacker]; sub_8078E70(sprite->data[3], 0); - sprite->data[4] = (sprite->data[6] = GetBankSide(gBattleAnimBankAttacker)) ? 0x300 : 0xFFFFFD00; + sprite->data[4] = (sprite->data[6] = GetBankSide(gAnimBankAttacker)) ? 0x300 : 0xFFFFFD00; sprite->data[5] = 0; } @@ -74,9 +74,9 @@ void sub_80CD81C(struct Sprite* sprite) void sub_80CD8A8(struct Sprite* sprite) { sprite->data[0] = 4; - sprite->data[1] = (GetBankSide(gBattleAnimBankAttacker)) ? -3 : 3; + sprite->data[1] = (GetBankSide(gAnimBankAttacker)) ? -3 : 3; sprite->data[2] = 0; - sprite->data[3] = gObjectBankIDs[gBattleAnimBankAttacker]; + sprite->data[3] = gObjectBankIDs[gAnimBankAttacker]; StoreSpriteCallbackInData(sprite, sub_80CD9B8); sprite->callback = sub_8078458; } @@ -94,9 +94,9 @@ void sub_80CD91C(struct Sprite* sprite) { if (sprite->data[0] == 0) { - sprite->data[3] = gObjectBankIDs[gBattleAnimBankAttacker]; - sprite->data[6] = GetBankSide(gBattleAnimBankAttacker); - if (GetBankSide(gBattleAnimBankAttacker)) + sprite->data[3] = gObjectBankIDs[gAnimBankAttacker]; + sprite->data[6] = GetBankSide(gAnimBankAttacker); + if (GetBankSide(gAnimBankAttacker)) { sprite->data[4] = 0xFC00; sprite->data[5] = 0xC00; @@ -120,5 +120,5 @@ void sub_80CD91C(struct Sprite* sprite) void sub_80CD9B8(struct Sprite* sprite) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/lunge_2.c b/src/battle/anim/lunge_2.c index 3972bee59..fe2470567 100755 --- a/src/battle/anim/lunge_2.c +++ b/src/battle/anim/lunge_2.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u8 gObjectBankIDs[]; @@ -20,8 +20,8 @@ void sub_80CDAC8(u8 taskId) { u8 a; - gTasks[taskId].data[0] = gObjectBankIDs[gBattleAnimBankAttacker]; - a = GetBankSide(gBattleAnimBankAttacker); + gTasks[taskId].data[0] = gObjectBankIDs[gAnimBankAttacker]; + a = GetBankSide(gAnimBankAttacker); gTasks[taskId].data[1] = a; gTasks[taskId].data[2] = 0; switch (gBattleAnimArgs[0]) diff --git a/src/battle/anim/money.c b/src/battle/anim/money.c index 91eaf20b1..8358d23db 100755 --- a/src/battle/anim/money.c +++ b/src/battle/anim/money.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CFF68(struct Sprite* sprite); @@ -20,9 +20,9 @@ void sub_80CFE9C(struct Sprite* sprite) u16 var; sub_80787B0(sprite, 1); - r6 = sub_8077ABC(gBattleAnimBankTarget, 2); - r7 = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[3]; - if (GetBankSide(gBattleAnimBankAttacker) != 0) + r6 = GetBankPosition(gAnimBankTarget, 2); + r7 = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3]; + if (GetBankSide(gAnimBankAttacker) != 0) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; r6 += gBattleAnimArgs[2]; @@ -33,7 +33,7 @@ void sub_80CFE9C(struct Sprite* sprite) sprite->data[2] = r6; sprite->data[4] = r7; sprite->callback = sub_8078C00; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } void sub_80CFF50(struct Sprite* sprite) @@ -47,7 +47,7 @@ void sub_80CFF68(struct Sprite* sprite) { sprite->data[0] += 0x80; sprite->pos2.x = sprite->data[0] >> 8; - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) sprite->pos2.x = -sprite->pos2.x; sprite->pos2.y = Sin(sprite->data[1], sprite->data[2]); @@ -57,6 +57,6 @@ void sub_80CFF68(struct Sprite* sprite) sprite->data[1] = 0; sprite->data[2] /= 2; if (++sprite->data[3] == 2) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/moon.c b/src/battle/anim/moon.c index e2a31d14d..c532e8057 100755 --- a/src/battle/anim/moon.c +++ b/src/battle/anim/moon.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CE354(struct Sprite* sprite); @@ -15,7 +15,7 @@ static void sub_80CE354(struct Sprite* sprite); void sub_80CE30C(struct Sprite* sprite) { - if (NotInBattle()) + if (IsContest()) { sprite->pos1.x = 0x30; sprite->pos1.y = 0x28; @@ -35,5 +35,5 @@ void sub_80CE30C(struct Sprite* sprite) void sub_80CE354(struct Sprite* sprite) { if (sprite->data[0]) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/noise.c b/src/battle/anim/noise.c index 78953d96a..369650d82 100644 --- a/src/battle/anim/noise.c +++ b/src/battle/anim/noise.c @@ -3,8 +3,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D2E30(struct Sprite *); @@ -14,15 +14,15 @@ static void sub_80D2E30(struct Sprite *); void sub_80D2D68(struct Sprite* sprite) { int var1; - u8 slot = gBattleAnimArgs[0] == 0 ? gBattleAnimBankAttacker : gBattleAnimBankTarget; + u8 slot = gBattleAnimArgs[0] == 0 ? gAnimBankAttacker : gAnimBankTarget; if (GetBankSide(slot) == 1) { gBattleAnimArgs[1] *= -1; } - sprite->pos1.x = sub_8077ABC(slot, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = sub_8077ABC(slot, 3) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBankPosition(slot, 2) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBankPosition(slot, 3) + gBattleAnimArgs[2]; sprite->data[0] = 0; sprite->data[1] = (u16)sprite->pos1.x << 3; sprite->data[2] = (u16)sprite->pos1.y << 3; @@ -51,6 +51,6 @@ static void sub_80D2E30(struct Sprite *sprite) if (++sprite->data[0] > 16) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/note_rain.c b/src/battle/anim/note_rain.c index fd62b7176..715462d73 100755 --- a/src/battle/anim/note_rain.c +++ b/src/battle/anim/note_rain.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u16 gUnknown_083D7A5C[5]; @@ -25,13 +25,13 @@ void sub_80D1BA8(struct Sprite* sprite, u8 a, u8 b) void sub_80D1C08(struct Sprite* sprite) { sub_80787B0(sprite, 0); - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 0) + gBattleAnimArgs[2]; - sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 1) + gBattleAnimArgs[3]; + sprite->data[2] = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[2]; + sprite->data[4] = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[3]; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sub_80D1BA8(sprite, gBattleAnimArgs[5], gBattleAnimArgs[6]); } diff --git a/src/battle/anim/note_scatter.c b/src/battle/anim/note_scatter.c index 9ff49ee9d..8564c58fe 100755 --- a/src/battle/anim/note_scatter.c +++ b/src/battle/anim/note_scatter.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CED78(struct Sprite* sprite); @@ -16,14 +16,14 @@ static void sub_80CED78(struct Sprite* sprite); void sub_80CECE8(struct Sprite* sprite) { int a; - if (GetBankSide(gBattleAnimBankAttacker) == 1) + if (GetBankSide(gAnimBankAttacker) == 1) { a = gBattleAnimArgs[1]; (u16)gBattleAnimArgs[1] = -a; } - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; StartSpriteAnim(sprite, gBattleAnimArgs[0]); sprite->data[2] = 0; sprite->data[3] = 0; diff --git a/src/battle/anim/note_scatter_2.c b/src/battle/anim/note_scatter_2.c index a163aa9a5..524c51c08 100755 --- a/src/battle/anim/note_scatter_2.c +++ b/src/battle/anim/note_scatter_2.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u16 gUnknown_083D712C[4][6]; @@ -52,6 +52,6 @@ void sub_80CEEE8(struct Sprite* sprite) } else { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/note_spin.c b/src/battle/anim/note_spin.c index bdc0f4615..026ee1856 100644 --- a/src/battle/anim/note_spin.c +++ b/src/battle/anim/note_spin.c @@ -4,8 +4,8 @@ #include "trig.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D2F80(struct Sprite *); static void sub_80D2FA4(struct Sprite *); @@ -28,7 +28,7 @@ void sub_80D2E68(struct Sprite *sprite) if (sprite->data[0] == sprite->data[1] + 80) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } @@ -100,11 +100,11 @@ static void sub_80D2FA4(struct Sprite *sprite) { int var1 = sprite->data[2]; sprite->invisible = var1 - (((s32)(var1 + ((u32)var1 >> 31)) >> 1) << 1); - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } if (sprite->data[4] == 4) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/note_wave.c b/src/battle/anim/note_wave.c index 4dc3ceb75..80ed2256f 100755 --- a/src/battle/anim/note_wave.c +++ b/src/battle/anim/note_wave.c @@ -6,8 +6,8 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u16 gUnknown_083D712C[4][6]; @@ -74,15 +74,15 @@ void sub_80CEB0C(struct Sprite* sprite) sprite->data[1] = gBattleAnimArgs[1]; sprite->data[2] = 0; sprite->data[3] = gBattleAnimArgs[2]; - if (NotInBattle()) + if (IsContest()) { a = 0x30; b = 0x28; } else { - a = sub_8077ABC(gBattleAnimBankTarget, 2); - b = sub_8077ABC(gBattleAnimBankTarget, 3); + a = GetBankPosition(gAnimBankTarget, 2); + b = GetBankPosition(gAnimBankTarget, 3); } sprite->data[4] = sprite->pos1.x << 4; diff --git a/src/battle/anim/orbit.c b/src/battle/anim/orbit.c index 9b77552fa..c8cf339d2 100755 --- a/src/battle/anim/orbit.c +++ b/src/battle/anim/orbit.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CAC44(struct Sprite* sprite); static void sub_80CADA8(struct Sprite* sprite); @@ -37,11 +37,11 @@ void sub_80CAC44(struct Sprite* sprite) sprite->pos2.y = Cos(sprite->data[1], -3) + ((sprite->data[2] += 24) >> 8); if ((u16)(sprite->data[1] - 0x40) < 0x80) { - sprite->oam.priority = (sub_8079ED4(gBattleAnimBankTarget) & 3); + sprite->oam.priority = (sub_8079ED4(gAnimBankTarget) & 3); } else { - var1 = sub_8079ED4(gBattleAnimBankTarget) + 1; + var1 = sub_8079ED4(gAnimBankTarget) + 1; if (var1 > 3) { var1 = 3; @@ -53,18 +53,18 @@ void sub_80CAC44(struct Sprite* sprite) sprite->data[1] = (sprite->data[1] + 2) & 0xFF; sprite->data[0]--; if (sprite->data[0] == -1) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void sub_80CACEC(u8 taskId) { - if (NotInBattle() || !IsDoubleBattle()) + if (IsContest() || !IsDoubleBattle()) { DestroyAnimVisualTask(taskId); } else { - if (GetBankIdentity_permutated(gBattleAnimBankTarget) == 1) + if (GetBankIdentity_permutated(gAnimBankTarget) == 1) { REG_BG2CNT_BITFIELD.priority = 3; } @@ -84,7 +84,7 @@ void sub_80CAD54(struct Sprite* sprite) sprite->data[1] = sprite->pos1.x; sprite->data[2] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[2]; + sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; obj_translate_based_on_private_1_2_3_4(sprite); sprite->data[5] = 0x40; sprite->callback = sub_80CADA8; @@ -99,18 +99,18 @@ void sub_80CADA8(struct Sprite* sprite) sprite->pos2.y += Cos(sprite->data[5], -5); if ((u16)(sprite->data[5] - 0x40) < 0x80) { - sprite->subpriority = sub_8079E90(gBattleAnimBankAttacker) - 1; + sprite->subpriority = sub_8079E90(gAnimBankAttacker) - 1; } else { - sprite->subpriority = sub_8079E90(gBattleAnimBankAttacker) + 1; + sprite->subpriority = sub_8079E90(gAnimBankAttacker) + 1; } sprite->data[5] = (sprite->data[5] + 5) & 0xFF; } else { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } @@ -121,7 +121,7 @@ void sub_80CAE20(struct Sprite* sprite) sprite->data[1] = sprite->pos1.x; sprite->data[2] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[2]; + sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; obj_translate_based_on_private_1_2_3_4(sprite); sprite->data[5] = 0x40; sprite->callback = sub_80CAE74; @@ -142,6 +142,6 @@ void sub_80CAE74(struct Sprite* sprite) } else { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/orbit_fast.c b/src/battle/anim/orbit_fast.c index 30396f398..92b67672b 100755 --- a/src/battle/anim/orbit_fast.c +++ b/src/battle/anim/orbit_fast.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D2704(struct Sprite* sprite); @@ -15,12 +15,12 @@ static void sub_80D2704(struct Sprite* sprite); void sub_80D26A4(struct Sprite* sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); sprite->affineAnimPaused = 1; sprite->data[0] = gBattleAnimArgs[0]; sprite->data[1] = gBattleAnimArgs[1]; - sprite->data[7] = sub_8079E90(gBattleAnimBankAttacker); + sprite->data[7] = sub_8079E90(gAnimBankAttacker); sprite->callback = sub_80D2704; sub_80D2704(sprite); } @@ -58,5 +58,5 @@ void sub_80D2704(struct Sprite* sprite) } if ((u16)gBattleAnimArgs[7] == 0xFFFF) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/orbit_scatter.c b/src/battle/anim/orbit_scatter.c index 6cebc9375..54c157839 100755 --- a/src/battle/anim/orbit_scatter.c +++ b/src/battle/anim/orbit_scatter.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D2834(struct Sprite* sprite); @@ -15,8 +15,8 @@ static void sub_80D2834(struct Sprite* sprite); void sub_80D27E0(struct Sprite* sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); sprite->data[0] = Sin(gBattleAnimArgs[0], 10); sprite->data[1] = Cos(gBattleAnimArgs[0], 7); sprite->callback = sub_80D2834; @@ -27,5 +27,5 @@ void sub_80D2834(struct Sprite* sprite) sprite->pos2.x += sprite->data[0]; sprite->pos2.y += sprite->data[1]; if (sprite->pos1.x + sprite->pos2.x + 16 > 0x110u || sprite->pos1.y + sprite->pos2.y > 0xA0 || sprite->pos1.y + sprite->pos2.y < -16) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/orbs.c b/src/battle/anim/orbs.c index 22e7d3895..6ca2fa71c 100755 --- a/src/battle/anim/orbs.c +++ b/src/battle/anim/orbs.c @@ -5,8 +5,8 @@ #include "random.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CA8B4(struct Sprite* sprite); static void sub_80CA9F8(struct Sprite* sprite); @@ -21,8 +21,8 @@ void sub_80CA7B0(struct Sprite* sprite) { sub_80787B0(sprite, 1); sprite->data[0] = gBattleAnimArgs[2]; - sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2); + sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3); sprite->callback = sub_8078B34; StoreSpriteCallbackInData(sprite, move_anim_8074EE0); } @@ -32,10 +32,10 @@ void sub_80CA800(struct Sprite* sprite) sub_80787B0(sprite, 1); StartSpriteAnim(sprite, gBattleAnimArgs[3]); sprite->data[0] = gBattleAnimArgs[2]; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } void sub_80CA858(struct Sprite* sprite) @@ -43,9 +43,9 @@ void sub_80CA858(struct Sprite* sprite) sub_80787B0(sprite, 1); sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); obj_translate_based_on_private_1_2_3_4(sprite); sprite->data[5] = gBattleAnimArgs[3]; sprite->callback = sub_80CA8B4; @@ -62,11 +62,11 @@ void sub_80CA8B4(struct Sprite* sprite) { if (sprite->data[5] > 0x7F) { - sprite->subpriority = sub_8079E90(gBattleAnimBankTarget) + 1; + sprite->subpriority = sub_8079E90(gAnimBankTarget) + 1; } else { - sprite->subpriority = sub_8079E90(gBattleAnimBankTarget) + 6; + sprite->subpriority = sub_8079E90(gAnimBankTarget) + 6; } sprite->pos2.x += Sin(sprite->data[5], 5); sprite->pos2.y += Cos(sprite->data[5], 14); @@ -85,7 +85,7 @@ void sub_80CA928(u8 taskId) gBattleAnimArgs[1] = 0; gBattleAnimArgs[2] = 80; gBattleAnimArgs[3] = 0; - CreateSpriteAndAnimate(&gSpriteTemplate_83D631C, 0, 0, sub_8079E90(gBattleAnimBankTarget) + 1); + CreateSpriteAndAnimate(&gSpriteTemplate_83D631C, 0, 0, sub_8079E90(gAnimBankTarget) + 1); } if (gTasks[taskId].data[1] == 15) @@ -96,8 +96,8 @@ void sub_80CA9A8(struct Sprite* sprite) { sub_8078764(sprite, 1); sprite->data[0] = gBattleAnimArgs[3]; - sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2); + sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3); sprite->data[5] = gBattleAnimArgs[2]; sub_80786EC(sprite); sprite->callback = sub_80CA9F8; @@ -106,7 +106,7 @@ void sub_80CA9A8(struct Sprite* sprite) void sub_80CA9F8(struct Sprite* sprite) { if (sub_8078718(sprite)) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void sub_80CAA14(struct Sprite* sprite) @@ -115,9 +115,9 @@ void sub_80CAA14(struct Sprite* sprite) u16 b; StartSpriteAnim(sprite, a & 7); - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); - if (GetBankSide(gBattleAnimBankAttacker)) + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); + if (GetBankSide(gAnimBankAttacker)) { sprite->pos1.x -= 20; } @@ -129,9 +129,9 @@ void sub_80CAA14(struct Sprite* sprite) b = Random(); sprite->data[0] = (b & 31) + 64; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); sub_8078D60(sprite); sprite->data[5] = Random() & 0xFF; sprite->data[6] = sprite->subpriority; @@ -143,7 +143,7 @@ void sub_80CAACC(struct Sprite* sprite) { if (sub_8078CE8(sprite)) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } else { diff --git a/src/battle/anim/osmose.c b/src/battle/anim/osmose.c index f1f1b25ff..1140aa34a 100755 --- a/src/battle/anim/osmose.c +++ b/src/battle/anim/osmose.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // osmose (I didn't want to use "absorb" as thats confusing) // Used by Ingrain. @@ -14,8 +14,8 @@ void sub_80CB768(struct Sprite* sprite) { if (!sprite->data[0]) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[1]; sprite->data[1] = gBattleAnimArgs[2]; sprite->data[2] = gBattleAnimArgs[3]; sprite->data[3] = gBattleAnimArgs[4]; @@ -25,5 +25,5 @@ void sub_80CB768(struct Sprite* sprite) sprite->pos2.x = sprite->data[1] * sprite->data[0]; sprite->pos2.y = Sin((sprite->data[0] * 20) & 0xFF, sprite->data[2]); if (sprite->data[0] > sprite->data[3]) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/perceive.c b/src/battle/anim/perceive.c index 27afcbc0c..3b3153428 100755 --- a/src/battle/anim/perceive.c +++ b/src/battle/anim/perceive.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // perceive (shows a sparkle in a set of eyes, usually for heightened perception.) // Used in Glare, Tickle, and Scary Face. @@ -14,7 +14,7 @@ extern u8 gBattleAnimBankTarget; void sub_80D2904(struct Sprite* sprite) { if (sprite->animEnded) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void sub_80D2920(struct Sprite* sprite) diff --git a/src/battle/anim/powder.c b/src/battle/anim/powder.c index 178a61737..a0be20d6f 100755 --- a/src/battle/anim/powder.c +++ b/src/battle/anim/powder.c @@ -4,7 +4,7 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; +extern u8 gAnimBankAttacker; static void sub_80CA768(struct Sprite* sprite); @@ -18,7 +18,7 @@ void sub_80CA710(struct Sprite* sprite) sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = gBattleAnimArgs[3]; - if (GetBankSide(gBattleAnimBankAttacker)) + if (GetBankSide(gAnimBankAttacker)) { sprite->data[3] = -gBattleAnimArgs[4]; } @@ -43,6 +43,6 @@ void sub_80CA768(struct Sprite* sprite) } else { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/ring.c b/src/battle/anim/ring.c index 0a5816b23..915cadcbc 100755 --- a/src/battle/anim/ring.c +++ b/src/battle/anim/ring.c @@ -7,8 +7,8 @@ #include "blend_palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u8 gObjectBankIDs[]; @@ -25,18 +25,18 @@ void sub_80D0FD8(struct Sprite* sprite) u8 r4; if (gBattleAnimArgs[2] == 0) - bank = gBattleAnimBankAttacker; + bank = gAnimBankAttacker; else - bank = gBattleAnimBankTarget; + bank = gAnimBankTarget; r4 = gBattleAnimArgs[3] ^ 1; if (IsDoubleBattle() && IsAnimBankSpriteVisible(bank ^ 2)) { sub_807A3FC(bank, r4, &sp0, &sp1); if (r4 == 0) - r4 = sub_8077ABC(bank, 0); + r4 = GetBankPosition(bank, 0); else - r4 = sub_8077ABC(bank, 2); + r4 = GetBankPosition(bank, 2); if (GetBankSide(bank) != 0) gBattleAnimArgs[0] -= (sp0 - r4) - gBattleAnimArgs[0]; // This is weird. @@ -53,7 +53,7 @@ void sub_80D1098(struct Sprite* sprite) if (sub_8078B5C(sprite)) { FreeSpriteOamMatrix(sprite); - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } @@ -70,13 +70,13 @@ void sub_80D10B8(struct Sprite* sprite) if (gBattleAnimArgs[5] == 0) { - bankr7 = gBattleAnimBankAttacker; - bankr8 = gBattleAnimBankTarget; + bankr7 = gAnimBankAttacker; + bankr8 = gAnimBankTarget; } else { - bankr7 = gBattleAnimBankTarget; - bankr8 = gBattleAnimBankAttacker; + bankr7 = gAnimBankTarget; + bankr8 = gAnimBankAttacker; } if (gBattleAnimArgs[6] == 0) @@ -92,7 +92,7 @@ void sub_80D10B8(struct Sprite* sprite) if (GetBankSide(bankr7) != 0) { - r9 = sub_8077ABC(bankr7, r10) + gBattleAnimArgs[0]; + r9 = GetBankPosition(bankr7, r10) + gBattleAnimArgs[0]; if (IsAnimBankSpriteVisible(bankr8 ^ 2)) sprite->subpriority = gSprites[gObjectBankIDs[bankr8 ^ 2]].subpriority - 1; else @@ -100,7 +100,7 @@ void sub_80D10B8(struct Sprite* sprite) } else { - r9 = sub_8077ABC(bankr7, r10) - gBattleAnimArgs[0]; + r9 = GetBankPosition(bankr7, r10) - gBattleAnimArgs[0]; if (gMain.inBattle && IsAnimBankSpriteVisible(bankr7 ^ 2)) { if (gSprites[gObjectBankIDs[bankr7]].pos1.x < gSprites[gObjectBankIDs[bankr7 ^ 2]].pos1.x) @@ -115,15 +115,15 @@ void sub_80D10B8(struct Sprite* sprite) } - r6 = sub_8077ABC(bankr7, sp4) + gBattleAnimArgs[1]; + r6 = GetBankPosition(bankr7, sp4) + gBattleAnimArgs[1]; if (gMain.inBattle && IsAnimBankSpriteVisible(bankr8 ^ 2)) { sub_807A3FC(bankr8, gBattleAnimArgs[6], &sp0, &sp1); } else { - sp0 = sub_8077ABC(bankr8, r10); - sp1 = sub_8077ABC(bankr8, sp4); + sp0 = GetBankPosition(bankr8, r10); + sp1 = GetBankPosition(bankr8, sp4); } if (GetBankSide(bankr8)) diff --git a/src/battle/anim/roots.c b/src/battle/anim/roots.c index 40c51808a..68f8a3e2f 100755 --- a/src/battle/anim/roots.c +++ b/src/battle/anim/roots.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern s16 gUnknown_03000728[]; @@ -18,8 +18,8 @@ void sub_80CB59C(struct Sprite* sprite) { if (!sprite->data[0]) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1); + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1); sprite->pos2.x = gBattleAnimArgs[0]; sprite->pos2.y = gBattleAnimArgs[1]; sprite->subpriority = gBattleAnimArgs[2] + 30; @@ -36,10 +36,10 @@ void sub_80CB59C(struct Sprite* sprite) void sub_80CB620(struct Sprite *sprite) { - s16 p1 = sub_8077ABC(gBattleAnimBankAttacker, 2); - s16 p2 = sub_8077ABC(gBattleAnimBankAttacker, 3); - s16 e1 = sub_8077ABC(gBattleAnimBankTarget, 2); - s16 e2 = sub_8077ABC(gBattleAnimBankTarget, 3); + s16 p1 = GetBankPosition(gAnimBankAttacker, 2); + s16 p2 = GetBankPosition(gAnimBankAttacker, 3); + s16 e1 = GetBankPosition(gAnimBankTarget, 2); + s16 e2 = GetBankPosition(gAnimBankTarget, 3); e1 -= p1; e2 -= p2; @@ -63,5 +63,5 @@ void sub_80CB710(struct Sprite* sprite) sprite->invisible = sprite->data[0] % 2; if (sprite->data[0] > sprite->data[2]) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/scan.c b/src/battle/anim/scan.c index 5573758c3..22bb26973 100755 --- a/src/battle/anim/scan.c +++ b/src/battle/anim/scan.c @@ -6,8 +6,8 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern s8 gUnknown_083D6DDC[4][2]; @@ -50,7 +50,7 @@ void sub_80CD408(struct Sprite* sprite) sprite->callback = sub_8078B34; StoreSpriteCallbackInData(sprite, sub_80CD4B8); sprite->data[5] += 0x100; - PlaySE12WithPanning(0xD2, sub_8076F98(0x3F)); + PlaySE12WithPanning(0xD2, BattleAnimAdjustPanning(0x3F)); break; } @@ -110,8 +110,8 @@ void sub_80CD4EC(struct Sprite* sprite) sprite->pos2.y = 0; sprite->pos2.x = 0; sprite->data[0] = 6; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + a; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + b; + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + a; + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + b; sprite->callback = sub_8078B34; StoreSpriteCallbackInData(sprite, sub_80CD654); } @@ -136,7 +136,7 @@ void sub_80CD5A8(struct Sprite* sprite) sprite->data[2]++; pal = sprite->oam.paletteNum; LoadPalette(&gPlttBufferUnfaded[0x108 + pal * 16], pal * 16 | 0x101, 4); - PlaySE12WithPanning(0xC0, sub_8076F98(0x3F)); + PlaySE12WithPanning(0xC0, BattleAnimAdjustPanning(0x3F)); } else if (sprite->data[1] == 0) { @@ -164,7 +164,7 @@ void sub_80CD67C(struct Sprite* sprite) sprite->data[0]++; if (sprite->data[1] == 8) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void sub_80CD6CC(struct Sprite* sprite) diff --git a/src/battle/anim/scary_face.c b/src/battle/anim/scary_face.c index 0c5056704..47776a3cb 100755 --- a/src/battle/anim/scary_face.c +++ b/src/battle/anim/scary_face.c @@ -7,8 +7,8 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern struct INCBIN_U8 gBattleAnimBackgroundTilemap_ScaryFaceContest; extern struct INCBIN_U8 gBattleAnimBackgroundTilemap_ScaryFacePlayer; @@ -16,8 +16,8 @@ extern struct INCBIN_U8 gBattleAnimBackgroundTilemap_ScaryFaceOpponent; extern struct INCBIN_U8 gBattleAnimBackgroundImage_ScaryFace; extern struct INCBIN_U8 gBattleAnimBackgroundPalette_ScaryFace; -extern u16 gUnknown_030041B4; -extern u16 gUnknown_030042C0; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG1_X; static void sub_80D24E0(u8 taskId); @@ -32,26 +32,26 @@ void sub_80D23B4(u8 taskId) REG_BLDALPHA = 0x1000; REG_BG1CNT_BITFIELD.priority = 1; REG_BG1CNT_BITFIELD.screenSize = 0; - if (!NotInBattle()) + if (!IsContest()) REG_BG1CNT_BITFIELD.charBaseBlock = 1; - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; REG_BG1HOFS = 0; REG_BG1VOFS = 0; sub_8078914(&subStruct); tempvar = subStruct.field_4; DmaFill32(3, 0x0, tempvar, 0x1000); - if (NotInBattle()) + if (IsContest()) LZDecompressVram(&gBattleAnimBackgroundTilemap_ScaryFaceContest, subStruct.field_4); - else if (GetBankSide(gBattleAnimBankTarget) == 1) + else if (GetBankSide(gAnimBankTarget) == 1) LZDecompressVram(&gBattleAnimBackgroundTilemap_ScaryFacePlayer, subStruct.field_4); else LZDecompressVram(&gBattleAnimBackgroundTilemap_ScaryFaceOpponent, subStruct.field_4); LZDecompressVram(&gBattleAnimBackgroundImage_ScaryFace, subStruct.field_0); LoadCompressedPalette(&gBattleAnimBackgroundPalette_ScaryFace, subStruct.field_8 << 4, 32); - if (NotInBattle()) + if (IsContest()) sub_80763FC(subStruct.field_8, (u16 *)subStruct.field_4, 0, 0); gTasks[taskId].func = sub_80D24E0; @@ -114,7 +114,7 @@ void sub_80D24E0(u8 taskId) } } DmaClear32(3, subStruct.field_4, 0x800); - if (!NotInBattle()) + if (!IsContest()) REG_BG1CNT_BITFIELD.charBaseBlock = 0; gTasks[taskId].data[12]++; diff --git a/src/battle/anim/seed.c b/src/battle/anim/seed.c index bd072849a..be8613a74 100755 --- a/src/battle/anim/seed.c +++ b/src/battle/anim/seed.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CAB88(struct Sprite* sprite); static void sub_80CABC0(struct Sprite* sprite); @@ -16,14 +16,14 @@ static void sub_80CABC0(struct Sprite* sprite); void sub_80CAB18(struct Sprite* sprite) { sub_80787B0(sprite, 1); - if (GetBankSide(gBattleAnimBankAttacker)) + if (GetBankSide(gAnimBankAttacker)) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 0) + gBattleAnimArgs[2]; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 1) + gBattleAnimArgs[3]; + sprite->data[2] = GetBankPosition(gAnimBankTarget, 0) + gBattleAnimArgs[2]; + sprite->data[4] = GetBankPosition(gAnimBankTarget, 1) + gBattleAnimArgs[3]; sprite->data[5] = gBattleAnimArgs[5]; sub_80786EC(sprite); sprite->callback = sub_80CAB88; @@ -46,5 +46,5 @@ void sub_80CABC0(struct Sprite* sprite) StartSpriteAnim(sprite, 1); sprite->data[0] = 60; sprite->callback = sub_80782D8; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/shadow_enlarge.c b/src/battle/anim/shadow_enlarge.c index bed6c7ea3..399cf1ba4 100755 --- a/src/battle/anim/shadow_enlarge.c +++ b/src/battle/anim/shadow_enlarge.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D0428(u8 taskId); diff --git a/src/battle/anim/shadow_minimize.c b/src/battle/anim/shadow_minimize.c index 22ebeab7a..94069374f 100755 --- a/src/battle/anim/shadow_minimize.c +++ b/src/battle/anim/shadow_minimize.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D04E0(u8 taskId); void sub_80D0614(struct Task* task, u8 taskId); @@ -27,7 +27,7 @@ void sub_80D0488(u8 taskId) task->data[4] = 0x100; task->data[5] = 0; task->data[6] = 0; - task->data[7] = sub_8079E90(gBattleAnimBankAttacker); + task->data[7] = sub_8079E90(gAnimBankAttacker); task->func = sub_80D04E0; } diff --git a/src/battle/anim/shield.c b/src/battle/anim/shield.c index 8ed4f9796..676318545 100755 --- a/src/battle/anim/shield.c +++ b/src/battle/anim/shield.c @@ -6,8 +6,8 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CCE0C(struct Sprite* sprite); @@ -16,17 +16,17 @@ static void sub_80CCE0C(struct Sprite* sprite); void sub_80CCD24(struct Sprite* sprite) { - if (NotInBattle() != 0) + if (IsContest() != 0) { gBattleAnimArgs[1] += 8; } - sprite->pos1.x = sub_8077EE4(gBattleAnimBankAttacker, 0) + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077EE4(gBattleAnimBankAttacker, 1) + gBattleAnimArgs[1]; - if (GetBankSide(gBattleAnimBankAttacker) == 0 || NotInBattle()) - sprite->oam.priority = sub_8079ED4(gBattleAnimBankAttacker) + 1; + sprite->pos1.x = sub_8077EE4(gAnimBankAttacker, 0) + gBattleAnimArgs[0]; + sprite->pos1.y = sub_8077EE4(gAnimBankAttacker, 1) + gBattleAnimArgs[1]; + if (GetBankSide(gAnimBankAttacker) == 0 || IsContest()) + sprite->oam.priority = sub_8079ED4(gAnimBankAttacker) + 1; else - sprite->oam.priority = sub_8079ED4(gBattleAnimBankAttacker); + sprite->oam.priority = sub_8079ED4(gAnimBankAttacker); sprite->data[0] = gBattleAnimArgs[2]; sprite->data[2] = (IndexOfSpritePaletteTag(0x2828) << 4) + 0x100; diff --git a/src/battle/anim/shimmer.c b/src/battle/anim/shimmer.c index ecb3dcdf9..9e7bea1e4 100755 --- a/src/battle/anim/shimmer.c +++ b/src/battle/anim/shimmer.c @@ -6,8 +6,8 @@ #include "blend_palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u16 gUnknown_083D6984[]; diff --git a/src/battle/anim/shock.c b/src/battle/anim/shock.c index 35c380f23..16e04c9db 100644 --- a/src/battle/anim/shock.c +++ b/src/battle/anim/shock.c @@ -4,8 +4,8 @@ #include "trig.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern struct OamMatrix gOamMatrices[]; extern void sub_80DA48C(struct Sprite *); @@ -15,10 +15,10 @@ extern void sub_80DA48C(struct Sprite *); void sub_80D6294(struct Sprite *sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2); + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3); - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { sprite->pos1.x -= gBattleAnimArgs[0]; sprite->pos1.y -= gBattleAnimArgs[1]; @@ -47,43 +47,43 @@ void sub_80D6328(struct Sprite *sprite) switch (gBattleAnimArgs[4]) { case 0: - slot = gBattleAnimBankAttacker; + slot = gAnimBankAttacker; break; case 1: default: - slot = gBattleAnimBankTarget; + slot = gAnimBankTarget; break; case 2: - if (!IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2)) + if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) { - slot = gBattleAnimBankAttacker; + slot = gAnimBankAttacker; } else { - slot = gBattleAnimBankAttacker ^ 2; + slot = gAnimBankAttacker ^ 2; } break; case 3: - if (IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2)) + if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) { - slot = gBattleAnimBankTarget ^ 2; + slot = gAnimBankTarget ^ 2; } else { - slot = gBattleAnimBankTarget; + slot = gAnimBankTarget; } break; } if (gBattleAnimArgs[5] == 0) { - sprite->pos1.x = sub_8077ABC(slot, 0); - sprite->pos1.y = sub_8077ABC(slot, 1); + sprite->pos1.x = GetBankPosition(slot, 0); + sprite->pos1.y = GetBankPosition(slot, 1); } else { - sprite->pos1.x = sub_8077ABC(slot, 2); - sprite->pos1.y = sub_8077ABC(slot, 3); + sprite->pos1.x = GetBankPosition(slot, 2); + sprite->pos1.y = GetBankPosition(slot, 3); } sprite->pos2.x = (gSineTable[gBattleAnimArgs[0]] * gBattleAnimArgs[1]) >> 8; diff --git a/src/battle/anim/silhouette.c b/src/battle/anim/silhouette.c index 71ff3dae2..a3147f598 100755 --- a/src/battle/anim/silhouette.c +++ b/src/battle/anim/silhouette.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CB3A8(u8 taskId); static void sub_80CB438(u8 taskId); @@ -35,7 +35,7 @@ void sub_80CB3A8(u8 taskId) u8 spriteId = GetAnimBankSpriteId(1); gTasks[taskId].data[10] += gTasks[taskId].data[0]; gSprites[spriteId].pos2.x = gTasks[taskId].data[10] >> 8; - if (GetBankSide(gBattleAnimBankTarget)) + if (GetBankSide(gAnimBankTarget)) { gSprites[spriteId].pos2.x = -gSprites[spriteId].pos2.x; } diff --git a/src/battle/anim/slash.c b/src/battle/anim/slash.c index c5869c4ab..6adcaf098 100755 --- a/src/battle/anim/slash.c +++ b/src/battle/anim/slash.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CDE78(struct Sprite* sprite); static void sub_80CDEB0(struct Sprite* sprite); @@ -19,13 +19,13 @@ void sub_80CDD74(struct Sprite* sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; } else { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[2]; } sprite->data[0] = 0; @@ -36,16 +36,16 @@ void sub_80CDD74(struct Sprite* sprite) void sub_80CDDDC(struct Sprite* sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2) + 0xFFD0; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + 0xFFD0; + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3); StoreSpriteCallbackInData(sprite, sub_80CDE78); sprite->callback = sub_8078600; } void sub_80CDE24(struct Sprite* sprite) { - sprite->pos1.x = sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2) + 0xFFD0 + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->pos1.x = sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + 0xFFD0 + gBattleAnimArgs[0]; + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3); StartSpriteAnim(sprite, 1); sprite->data[0] = 0; sprite->data[1] = 0; @@ -78,6 +78,6 @@ void sub_80CDEC0(struct Sprite* sprite) sprite->data[0] = 0; sprite->invisible = !sprite->invisible; if (++sprite->data[1] > 8) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/sleep.c b/src/battle/anim/sleep.c index 58ecc702f..0f0e54f80 100755 --- a/src/battle/anim/sleep.c +++ b/src/battle/anim/sleep.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CD394(struct Sprite* sprite); @@ -16,7 +16,7 @@ static void sub_80CD394(struct Sprite* sprite); void sub_80CD328(struct Sprite* sprite) { sub_8078650(sprite); - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) { sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; diff --git a/src/battle/anim/slice.c b/src/battle/anim/slice.c index 8e33dcb06..fe8745483 100755 --- a/src/battle/anim/slice.c +++ b/src/battle/anim/slice.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CCB00(struct Sprite* sprite); @@ -15,9 +15,9 @@ static void sub_80CCB00(struct Sprite* sprite); void sub_80CC914(struct Sprite* sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 0); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 1); - if (GetBankSide(gBattleAnimBankTarget) == 0) + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0); + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1); + if (GetBankSide(gAnimBankTarget) == 0) sprite->pos1.y += 8; sprite->callback = sub_80CCB00; @@ -46,28 +46,28 @@ void sub_80CC9BC(struct Sprite* sprite) switch (gBattleAnimArgs[3]) { case 1: - a = sub_8077ABC(gBattleAnimBankTarget ^ 2, 0); - b = sub_8077ABC(gBattleAnimBankTarget ^ 2, 1); + a = GetBankPosition(gAnimBankTarget ^ 2, 0); + b = GetBankPosition(gAnimBankTarget ^ 2, 1); break; case 2: - a = sub_8077ABC(gBattleAnimBankTarget, 0); - b = sub_8077ABC(gBattleAnimBankTarget, 1); - if (IsAnimBankSpriteVisible(gBattleAnimBankTarget ^ 2)) + a = GetBankPosition(gAnimBankTarget, 0); + b = GetBankPosition(gAnimBankTarget, 1); + if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) { - a = (sub_8077ABC(gBattleAnimBankTarget ^ 2, 0) + a) / 2; - b = (sub_8077ABC(gBattleAnimBankTarget ^ 2, 1) + b) / 2; + a = (GetBankPosition(gAnimBankTarget ^ 2, 0) + a) / 2; + b = (GetBankPosition(gAnimBankTarget ^ 2, 1) + b) / 2; } break; case 0: default: - a = sub_8077ABC(gBattleAnimBankTarget, 0); - b = sub_8077ABC(gBattleAnimBankTarget, 1); + a = GetBankPosition(gAnimBankTarget, 0); + b = GetBankPosition(gAnimBankTarget, 1); break; } sprite->pos1.x = a; sprite->pos1.y = b; - if (GetBankSide(gBattleAnimBankTarget) == 0) + if (GetBankSide(gAnimBankTarget) == 0) sprite->pos1.y += 8; sprite->callback = sub_80CCB00; @@ -104,7 +104,7 @@ void sub_80CCB00(struct Sprite* sprite) sprite->data[0]++; if (sprite->data[0] == 20) { - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sprite->data[0] = 3; sprite->callback = sub_80782D8; } diff --git a/src/battle/anim/smoke.c b/src/battle/anim/smoke.c index c6ce91b76..7ab873e63 100755 --- a/src/battle/anim/smoke.c +++ b/src/battle/anim/smoke.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // smoke (smoke on the ground around a sprite.) // Used in Extremespeed. diff --git a/src/battle/anim/sonic.c b/src/battle/anim/sonic.c index 684516ba7..0897ec6e3 100755 --- a/src/battle/anim/sonic.c +++ b/src/battle/anim/sonic.c @@ -6,8 +6,8 @@ #include "battle_anim_80CA710.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // sonic (shoots a projectile towards the target.) // Used in Sonic Boom and Air Cutter. @@ -18,11 +18,11 @@ void sub_80CF6DC(struct Sprite* sprite) s16 b; u16 c; - if (NotInBattle()) + if (IsContest()) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } - else if (GetBankSide(gBattleAnimBankAttacker) != 0) + else if (GetBankSide(gAnimBankAttacker) != 0) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; gBattleAnimArgs[1] = -gBattleAnimArgs[1]; @@ -30,11 +30,11 @@ void sub_80CF6DC(struct Sprite* sprite) } sub_80787B0(sprite, 1); - a = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[2]; - b = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[3]; + a = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2]; + b = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3]; c = sub_80790F0(a - sprite->pos1.x, b - sprite->pos1.y); c += 0xF000; - if (NotInBattle()) + if (IsContest()) c -= 0x6000; sub_8078FDC(sprite, 0, 0x100, 0x100, c); @@ -42,7 +42,7 @@ void sub_80CF6DC(struct Sprite* sprite) sprite->data[2] = a; sprite->data[4] = b; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } void sub_80CF7E0(struct Sprite* sprite) diff --git a/src/battle/anim/sonic_task.c b/src/battle/anim/sonic_task.c index efd13dff6..924b1b568 100755 --- a/src/battle/anim/sonic_task.c +++ b/src/battle/anim/sonic_task.c @@ -7,8 +7,8 @@ #include "battle.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u8 gBanksBySide[]; extern u16 gBattleTypeFlags; @@ -46,7 +46,7 @@ void sub_80CFA20(u8 taskId) gTasks[taskId].data[gTasks[taskId].data[1] + 13] = spriteId; gTasks[taskId].data[0] = gTasks[taskId].data[3]; gTasks[taskId].data[1]++; - PlaySE12WithPanning(0x9A, sub_8076F98(-0x3F)); + PlaySE12WithPanning(0x9A, BattleAnimAdjustPanning(-0x3F)); if (gTasks[taskId].data[1] > 2) gTasks[taskId].func = sub_80CF9F8; } @@ -60,7 +60,7 @@ void sub_80CFB04(u8 taskId) s16 sp2 = 0; s16 r4; - if (NotInBattle()) + if (IsContest()) { gTasks[taskId].data[4] = 2; gBattleAnimArgs[0] = -gBattleAnimArgs[0]; @@ -71,7 +71,7 @@ void sub_80CFB04(u8 taskId) } else { - if ((gBanksBySide[gBattleAnimBankTarget] & 1) == 0) + if ((gBanksBySide[gAnimBankTarget] & 1) == 0) { gTasks[taskId].data[4] = 1; gBattleAnimArgs[0] = -gBattleAnimArgs[0]; @@ -82,17 +82,17 @@ void sub_80CFB04(u8 taskId) gBattleAnimArgs[2] |= 1; } } - r6 = gTasks[taskId].data[9] = sub_8077ABC(gBattleAnimBankAttacker, 0); - r9 = gTasks[taskId].data[10] = sub_8077ABC(gBattleAnimBankAttacker, 1); + r6 = gTasks[taskId].data[9] = GetBankPosition(gAnimBankAttacker, 0); + r9 = gTasks[taskId].data[10] = GetBankPosition(gAnimBankAttacker, 1); if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) - && IsAnimBankSpriteVisible(gBattleAnimBankTarget ^ 2)) + && IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) { - sub_807A3FC(gBattleAnimBankTarget, 0, &sp1, &sp2); + sub_807A3FC(gAnimBankTarget, 0, &sp1, &sp2); } else { - sp1 = sub_8077ABC(gBattleAnimBankTarget, 0); - sp2 = sub_8077ABC(gBattleAnimBankTarget, 1); + sp1 = GetBankPosition(gAnimBankTarget, 0); + sp2 = GetBankPosition(gAnimBankTarget, 1); } sp1 = gTasks[taskId].data[11] = sp1 + gBattleAnimArgs[0]; @@ -122,12 +122,12 @@ void sub_80CFB04(u8 taskId) gBattleAnimArgs[4] ^= 0x80; if (gBattleAnimArgs[4] >= 64) { - u16 var = sub_8079E90(gBattleAnimBankTarget) + (gBattleAnimArgs[4] - 64); + u16 var = sub_8079E90(gAnimBankTarget) + (gBattleAnimArgs[4] - 64); gTasks[taskId].data[2] = var; } else { - u16 var = sub_8079E90(gBattleAnimBankTarget) - gBattleAnimArgs[4]; + u16 var = sub_8079E90(gAnimBankTarget) - gBattleAnimArgs[4]; gTasks[taskId].data[2] = var; } } @@ -135,12 +135,12 @@ void sub_80CFB04(u8 taskId) { if (gBattleAnimArgs[4] >= 64) { - u16 var = sub_8079E90(gBattleAnimBankTarget) + (gBattleAnimArgs[4] - 64); + u16 var = sub_8079E90(gAnimBankTarget) + (gBattleAnimArgs[4] - 64); gTasks[taskId].data[2] = var; } else { - u16 var = sub_8079E90(gBattleAnimBankTarget) - gBattleAnimArgs[4]; + u16 var = sub_8079E90(gAnimBankTarget) - gBattleAnimArgs[4]; gTasks[taskId].data[2] = var; } } diff --git a/src/battle/anim/spin_finger.c b/src/battle/anim/spin_finger.c index adf41b261..8eb060358 100755 --- a/src/battle/anim/spin_finger.c +++ b/src/battle/anim/spin_finger.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern void sub_80CF088(struct Sprite* sprite); static void sub_80CF138(struct Sprite* sprite); @@ -19,11 +19,11 @@ void sub_80CF0BC(struct Sprite* sprite) { u8 bank; if (gBattleAnimArgs[0] == 0) - bank = gBattleAnimBankAttacker; + bank = gAnimBankAttacker; else - bank = gBattleAnimBankTarget; + bank = gAnimBankTarget; - sprite->pos1.x = sub_8077ABC(bank, 0); + sprite->pos1.x = GetBankPosition(bank, 0); sprite->pos1.y = sub_807A100(bank, 2); if (sprite->pos1.y <= 9) sprite->pos1.y = 10; diff --git a/src/battle/anim/spit.c b/src/battle/anim/spit.c index f9ad462ae..1e65ba53e 100755 --- a/src/battle/anim/spit.c +++ b/src/battle/anim/spit.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // spit (hurls sprites outward from the pokemon. Similar to orbit_fast, but takes another argument.) // Used in Spit Up. @@ -16,13 +16,13 @@ void sub_80D287C(struct Sprite* sprite) sprite->pos2.x += sprite->data[0]; sprite->pos2.y += sprite->data[1]; if (sprite->data[3]++ >= sprite->data[2]) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void sub_80D28AC(struct Sprite* sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); sprite->data[0] = Sin(gBattleAnimArgs[0], 10); sprite->data[1] = Cos(gBattleAnimArgs[0], 7); sprite->data[2] = gBattleAnimArgs[1]; diff --git a/src/battle/anim/splash.c b/src/battle/anim/splash.c index 1b0ceba93..570ef0dca 100755 --- a/src/battle/anim/splash.c +++ b/src/battle/anim/splash.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern struct AffineAnimFrameCmd gUnknown_083D76F4; diff --git a/src/battle/anim/startle.c b/src/battle/anim/startle.c index acbf80fec..50e78af37 100755 --- a/src/battle/anim/startle.c +++ b/src/battle/anim/startle.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern struct AffineAnimFrameCmd gUnknown_083D7A98; diff --git a/src/battle/anim/strike.c b/src/battle/anim/strike.c index f2fbdb5a4..bfa1dc4f7 100755 --- a/src/battle/anim/strike.c +++ b/src/battle/anim/strike.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CE798(struct Sprite* sprite); @@ -23,11 +23,11 @@ void sub_80CE670(struct Sprite* sprite) sprite->data[0] = 0; sprite->data[1] = gBattleAnimArgs[2]; - sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[1]; sprite->data[6] = sprite->pos1.x; sprite->data[7] = sprite->pos1.y; - if (NotInBattle() != 0) + if (IsContest() != 0) { sprite->oam.matrixNum = 8; sprite->pos1.x += 40; @@ -37,7 +37,7 @@ void sub_80CE670(struct Sprite* sprite) sprite->data[4] = sprite->pos1.y << 7; sprite->data[5] = -0xA00 / sprite->data[1]; } - else if (GetBankSide(gBattleAnimBankAttacker) == 0) + else if (GetBankSide(gAnimBankAttacker) == 0) { sprite->pos1.x -= 40; sprite->pos1.y += 20; @@ -73,5 +73,5 @@ void sub_80CE798(struct Sprite* sprite) } if (sprite->data[1] == 0) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/struggle.c b/src/battle/anim/struggle.c index 63a01a79e..20dbaf2dc 100644 --- a/src/battle/anim/struggle.c +++ b/src/battle/anim/struggle.c @@ -4,8 +4,8 @@ #include "sprite.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D2CC4(struct Sprite *); @@ -13,19 +13,19 @@ void sub_80D2C38(struct Sprite *sprite) { if (gBattleAnimArgs[2] == 0) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } else { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); } else { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2); + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3); } if (gBattleAnimArgs[1] == 0) @@ -47,6 +47,6 @@ static void sub_80D2CC4(struct Sprite *sprite) if (--sprite->data[0] != 0) StartSpriteAnim(sprite, sprite->data[1]); else - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/sunlight.c b/src/battle/anim/sunlight.c index f6cb8a077..e6fd49a11 100644 --- a/src/battle/anim/sunlight.c +++ b/src/battle/anim/sunlight.c @@ -13,5 +13,5 @@ void sub_80D517C(struct Sprite *sprite) sprite->data[2] = 140; sprite->data[4] = 80; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/swipe.c b/src/battle/anim/swipe.c index 15bee06ee..922b11a5f 100644 --- a/src/battle/anim/swipe.c +++ b/src/battle/anim/swipe.c @@ -15,6 +15,6 @@ void sub_80D2BE8(struct Sprite *sprite) } else if (sprite->animEnded) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/switch.c b/src/battle/anim/switch.c index a1be144df..c4082b6aa 100755 --- a/src/battle/anim/switch.c +++ b/src/battle/anim/switch.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern s8 gUnknown_083D680C[11][3]; @@ -24,7 +24,7 @@ void sub_80CBBF0(struct Sprite* sprite) if (sprite->data[0] == 0) { - if (!NotInBattle()) + if (!IsContest()) { sprite->data[1] = gBattleAnimArgs[1]; sprite->pos1.x = 0x78; @@ -101,7 +101,7 @@ void sub_80CBCF8(struct Sprite* sprite) { sprite->data[2]++; sprite->data[1] = (gUnknown_083D680C[sprite->data[0]][0] * gUnknown_083D680C[sprite->data[0]][2] + sprite->data[1]) & 0xFF; - if (!NotInBattle()) + if (!IsContest()) { if ((u16)(sprite->data[1] - 1) <= 0xBE) { @@ -121,7 +121,7 @@ void sub_80CBCF8(struct Sprite* sprite) void sub_80CBDB0(struct Sprite* sprite) { if (sprite->data[0] > 20) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); sprite->invisible = sprite->data[0] % 2; sprite->data[0]++; diff --git a/src/battle/anim/sword.c b/src/battle/anim/sword.c index 536f89b26..b46fe6759 100755 --- a/src/battle/anim/sword.c +++ b/src/battle/anim/sword.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CF6B4(struct Sprite* sprite); @@ -26,5 +26,5 @@ void sub_80CF6B4(struct Sprite* sprite) sprite->data[2] = sprite->pos1.x; sprite->data[4] = sprite->pos1.y - 32; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/taunt_finger.c b/src/battle/anim/taunt_finger.c index 7024f85a0..023e14e45 100755 --- a/src/battle/anim/taunt_finger.c +++ b/src/battle/anim/taunt_finger.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern void sub_80CEF44(u8 bank, struct Sprite* sprite); static void sub_80CF228(struct Sprite* sprite); @@ -19,9 +19,9 @@ void sub_80CF1C8(struct Sprite* sprite) { u8 bank; if (gBattleAnimArgs[0] == 0) - bank = gBattleAnimBankAttacker; + bank = gAnimBankAttacker; else - bank = gBattleAnimBankTarget; + bank = gAnimBankTarget; sub_80CEF44(bank, sprite); if (GetBankSide(bank) == 0) @@ -52,5 +52,5 @@ void sub_80CF228(struct Sprite* sprite) void sub_80CF264(struct Sprite* sprite) { if (++sprite->data[1] > 5) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/tendrils.c b/src/battle/anim/tendrils.c index ba1014d2f..9f57ffd45 100755 --- a/src/battle/anim/tendrils.c +++ b/src/battle/anim/tendrils.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CB298(struct Sprite* sprite); static void sub_80CB2D4(struct Sprite* sprite); @@ -61,7 +61,7 @@ void sub_80CB2D4(struct Sprite* sprite) } else { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } }
\ No newline at end of file diff --git a/src/battle/anim/thought.c b/src/battle/anim/thought.c index 9cffafe14..c3ab6f82c 100755 --- a/src/battle/anim/thought.c +++ b/src/battle/anim/thought.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CF008(struct Sprite* sprite); @@ -20,7 +20,7 @@ void sub_80CEF44(u8 bank, struct Sprite* sprite) else sprite->pos1.x = sub_807A100(bank, 4) - 8; - sprite->pos1.y = sub_8077ABC(bank, 3) - (s16)sub_807A100(bank, 0) / 4; + sprite->pos1.y = GetBankPosition(bank, 3) - (s16)sub_807A100(bank, 0) / 4; } void sub_80CEF9C(struct Sprite* sprite) @@ -28,9 +28,9 @@ void sub_80CEF9C(struct Sprite* sprite) u8 a; u8 bank; if (gBattleAnimArgs[0] == 0) - bank = gBattleAnimBankAttacker; + bank = gAnimBankAttacker; else - bank = gBattleAnimBankTarget; + bank = gAnimBankTarget; sub_80CEF44(bank, sprite); a = (GetBankSide(bank) == 0) ? 0 : 1; @@ -45,7 +45,7 @@ void sub_80CF008(struct Sprite* sprite) { if (--sprite->data[0] == 0) { - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); StartSpriteAnim(sprite, sprite->data[1]); sprite->callback = sub_8078600; } diff --git a/src/battle/anim/thrashing.c b/src/battle/anim/thrashing.c index 9811c546a..3fde815ae 100755 --- a/src/battle/anim/thrashing.c +++ b/src/battle/anim/thrashing.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern struct AffineAnimFrameCmd gUnknown_083D77B0; @@ -48,7 +48,7 @@ void sub_80D0AB8(u8 taskId) task->data[7] = 0; task->data[8] = 0; task->data[9] = 2; - if (GetBankSide(gBattleAnimBankAttacker) == 1) + if (GetBankSide(gAnimBankAttacker) == 1) task->data[2] *= -1; task->func = sub_80D0B3C; diff --git a/src/battle/anim/thunder.c b/src/battle/anim/thunder.c index 5064148ef..2ed073221 100644 --- a/src/battle/anim/thunder.c +++ b/src/battle/anim/thunder.c @@ -3,8 +3,8 @@ #include "rom_8077ABC.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u16 gBattleTypeFlags; static void sub_80D6218(struct Sprite *); @@ -14,7 +14,7 @@ static void sub_80D6218(struct Sprite *); void sub_80D61C8(struct Sprite *sprite) { - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { sprite->pos1.x -= gBattleAnimArgs[0]; } @@ -31,6 +31,6 @@ static void sub_80D6218(struct Sprite *sprite) { if (sprite->animEnded) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/tile_in.c b/src/battle/anim/tile_in.c index 5fcbadbb7..a4a544a0c 100755 --- a/src/battle/anim/tile_in.c +++ b/src/battle/anim/tile_in.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // tile_in (flips a white tile from the scene into facing the player.) // Used in Conversion. @@ -15,15 +15,15 @@ void sub_80CE09C(struct Sprite* sprite) { if (sprite->data[0] == 0) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 0) + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1) + gBattleAnimArgs[1]; - if (NotInBattle()) + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[1]; + if (IsContest()) sprite->pos1.y += 10; sprite->data[0]++; } if ((u16)gBattleAnimArgs[7] == 0xFFFF) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void sub_80CE108(u8 taskId) diff --git a/src/battle/anim/tile_out.c b/src/battle/anim/tile_out.c index 8b710268f..50468a440 100755 --- a/src/battle/anim/tile_out.c +++ b/src/battle/anim/tile_out.c @@ -6,8 +6,8 @@ #include "battle_interface.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u8 gNoOfAllBanks; extern u8 gHealthboxIDs[]; @@ -35,10 +35,10 @@ void sub_80CE1AC(struct Sprite* sprite) { sprite->animPaused = 0; sprite->data[0] = 30; - sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2); + sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3); sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } } diff --git a/src/battle/anim/twinkle.c b/src/battle/anim/twinkle.c index 56095c29d..e26669f63 100755 --- a/src/battle/anim/twinkle.c +++ b/src/battle/anim/twinkle.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CE3B0(struct Sprite* sprite); @@ -15,7 +15,7 @@ static void sub_80CE3B0(struct Sprite* sprite); void sub_80CE36C(struct Sprite* sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + gBattleAnimArgs[0]; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[0]; sprite->pos1.y = gBattleAnimArgs[1]; sprite->data[0] = 0; sprite->data[1] = 0; @@ -38,5 +38,5 @@ void sub_80CE3B0(struct Sprite* sprite) } if (sprite->data[0]) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/unused_1.c b/src/battle/anim/unused_1.c index fdcef0de9..d7e5fbfe4 100755 --- a/src/battle/anim/unused_1.c +++ b/src/battle/anim/unused_1.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // unused effect file. // Seems to be a beta effect for Beat Up, possibly. diff --git a/src/battle/anim/unused_2.c b/src/battle/anim/unused_2.c index f7f5be88d..122f39e02 100755 --- a/src/battle/anim/unused_2.c +++ b/src/battle/anim/unused_2.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CCCB4(struct Sprite* sprite); @@ -42,14 +42,14 @@ void unref_sub_80CCB6C(struct Sprite* sprite) { DestroySprite(&gSprites[sprite->data[0]]); DestroySprite(&gSprites[sprite->data[1]]); - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } void sub_80CCC50(struct Sprite* sprite) { sprite->data[0] = gBattleAnimArgs[2]; - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) sprite->pos1.x -= gBattleAnimArgs[0]; else sprite->pos1.x += gBattleAnimArgs[0]; @@ -76,5 +76,5 @@ void sub_80CCCB4(struct Sprite* sprite) sprite->pos2.y += sprite->data[5] >> 8; sprite->data[2]++; if (sprite->data[2] == sprite->data[3]) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/unused_3.c b/src/battle/anim/unused_3.c index 049e0ca1b..6dbcbfefe 100755 --- a/src/battle/anim/unused_3.c +++ b/src/battle/anim/unused_3.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CD2D4(struct Sprite* sprite); @@ -16,7 +16,7 @@ static void sub_80CD2D4(struct Sprite* sprite); void sub_80CD274(struct Sprite* sprite) { sub_8078650(sprite); - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) { sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; @@ -41,5 +41,5 @@ void sub_80CD2D4(struct Sprite* sprite) } if (sprite->animEnded) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/unused_4.c b/src/battle/anim/unused_4.c index 72ecde05c..bda476a0a 100755 --- a/src/battle/anim/unused_4.c +++ b/src/battle/anim/unused_4.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u8 gObjectBankIDs[]; @@ -27,8 +27,8 @@ void sub_80CD9D4(struct Sprite* sprite) { case 0: sprite->data[1] = 0; - sprite->data[2] = gObjectBankIDs[gBattleAnimBankAttacker]; - sprite->data[3] = GetBankSide(gBattleAnimBankAttacker); + sprite->data[2] = gObjectBankIDs[gAnimBankAttacker]; + sprite->data[3] = GetBankSide(gAnimBankAttacker); sprite->data[4] = (sprite->data[3] != 0) ? 0x200 : -0x200; sprite->data[5] = 0; sub_8078E70(sprite->data[2], 0); @@ -51,7 +51,7 @@ void sub_80CD9D4(struct Sprite* sprite) if (++sprite->data[1] > 3) { sub_8078F40(sprite->data[2]); - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } break; } diff --git a/src/battle/anim/unused_5.c b/src/battle/anim/unused_5.c index 4dc2da70d..421cdd6bf 100755 --- a/src/battle/anim/unused_5.c +++ b/src/battle/anim/unused_5.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // unused_5 diff --git a/src/battle/anim/unused_6.c b/src/battle/anim/unused_6.c index f7c87647f..37e2031b0 100755 --- a/src/battle/anim/unused_6.c +++ b/src/battle/anim/unused_6.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern void sub_80CEF44(u8 bank, struct Sprite* sprite); static void sub_80CF310(struct Sprite* sprite); @@ -17,9 +17,9 @@ void sub_80CF2D0(struct Sprite* sprite) { u8 bank; if (gBattleAnimArgs[0] == 0) - bank = gBattleAnimBankAttacker; + bank = gAnimBankAttacker; else - bank = gBattleAnimBankTarget; + bank = gAnimBankTarget; sub_80CEF44(bank, sprite); sprite->data[0] = 0; @@ -43,7 +43,7 @@ void sub_80CF310(struct Sprite* sprite) break; case 2: if (++sprite->data[1] == 0x40) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); break; } } diff --git a/src/battle/anim/unused_7.c b/src/battle/anim/unused_7.c index 3a8998f1d..2be6e7633 100755 --- a/src/battle/anim/unused_7.c +++ b/src/battle/anim/unused_7.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u8 gObjectBankIDs[]; @@ -30,10 +30,10 @@ void sub_80CF374(struct Sprite* sprite) void sub_80CF3C4(struct Sprite* sprite) { u8 a; - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); - a = gObjectBankIDs[gBattleAnimBankTarget]; - if (GetBankSide(gBattleAnimBankAttacker) != 0) + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); + a = gObjectBankIDs[gAnimBankTarget]; + if (GetBankSide(gAnimBankAttacker) != 0) { sprite->pos1.x -= gBattleAnimArgs[0]; } diff --git a/src/battle/anim/unused_8.c b/src/battle/anim/unused_8.c index bcebfcd2b..03772f951 100755 --- a/src/battle/anim/unused_8.c +++ b/src/battle/anim/unused_8.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CF490(struct Sprite* sprite); static void sub_80CF4B8(struct Sprite* sprite); @@ -35,7 +35,7 @@ void sub_80CF490(struct Sprite* sprite) void sub_80CF4B8(struct Sprite* sprite) { if (sprite->data[5] == 0) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); else sprite->data[5]--; } diff --git a/src/battle/anim/unused_9.c b/src/battle/anim/unused_9.c index 579238fbc..cf3ccb0d4 100755 --- a/src/battle/anim/unused_9.c +++ b/src/battle/anim/unused_9.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern struct SpriteTemplate gSpriteTemplate_83D75AC; @@ -44,7 +44,7 @@ void sub_80CFE2C(struct Sprite* sprite) gPlttBufferFaded[sprite->data[0] + 15] = r7; if (++sprite->data[2] == 0x18) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } #else @@ -101,7 +101,7 @@ _080CFE64:\n\ cmp r0, 0x18\n\ bne _080CFE90\n\ adds r0, r4, 0\n\ - bl move_anim_8072740\n\ + bl DestroyAnimSprite\n\ _080CFE90:\n\ pop {r4-r7}\n\ pop {r0}\n\ diff --git a/src/battle/anim/water.c b/src/battle/anim/water.c index 396a4637d..4068cbe78 100644 --- a/src/battle/anim/water.c +++ b/src/battle/anim/water.c @@ -5,8 +5,8 @@ #include "util.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D3874(struct Sprite *); @@ -19,7 +19,7 @@ void sub_80D37FC(struct Sprite *sprite) sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[4]; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } void sub_80D3838(struct Sprite *sprite) @@ -47,7 +47,7 @@ static void sub_80D3874(struct Sprite *sprite) if (--sprite->data[7] == -1) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } @@ -139,7 +139,7 @@ _080D3920:\n\ ldr r1, _080D399C @ =0x85000400\n\ str r1, [r0, 0x8]\n\ ldr r0, [r0, 0x8]\n\ - bl NotInBattle\n\ + bl IsContest\n\ lsls r0, 24\n\ cmp r0, 0\n\ bne _080D39B8\n\ @@ -151,7 +151,7 @@ _080D3920:\n\ movs r1, 0x4\n\ orrs r0, r1\n\ strb r0, [r2]\n\ - ldr r0, _080D39A0 @ =gBattleAnimBankAttacker\n\ + ldr r0, _080D39A0 @ =gAnimBankAttacker\n\ ldrb r0, [r0]\n\ bl GetBankSide\n\ lsls r0, 24\n\ @@ -166,7 +166,7 @@ _080D3990: .4byte 0x00003f42\n\ _080D3994: .4byte REG_BG1CNT\n\ _080D3998: .4byte 0x040000d4\n\ _080D399C: .4byte 0x85000400\n\ -_080D39A0: .4byte gBattleAnimBankAttacker\n\ +_080D39A0: .4byte gAnimBankAttacker\n\ _080D39A4: .4byte gUnknown_08E70968\n\ _080D39A8:\n\ ldr r0, _080D39B4 @ =gUnknown_08E70C38\n\ @@ -245,18 +245,18 @@ _080D3A0E:\n\ lsls r0, 5\n\ strh r0, [r7, 0xA]\n\ strh r0, [r7, 0xC]\n\ - bl NotInBattle\n\ + bl IsContest\n\ lsls r0, 24\n\ lsrs r4, r0, 24\n\ cmp r4, 0\n\ beq _080D3A94\n\ ldr r3, _080D3A84 @ =0x0000ffb0\n\ adds r0, r3, 0\n\ - ldr r1, _080D3A88 @ =gUnknown_030042C0\n\ + ldr r1, _080D3A88 @ =gBattle_BG1_X\n\ strh r0, [r1]\n\ ldr r2, _080D3A8C @ =0x0000ffd0\n\ adds r0, r2, 0\n\ - ldr r3, _080D3A90 @ =gUnknown_030041B4\n\ + ldr r3, _080D3A90 @ =gBattle_BG1_Y\n\ strh r0, [r3]\n\ movs r0, 0x2\n\ strh r0, [r6, 0x8]\n\ @@ -270,11 +270,11 @@ _080D3A78: .4byte gBattleAnimBackgroundImageMuddyWater_Pal\n\ _080D3A7C: .4byte sub_80D3D68\n\ _080D3A80: .4byte gTasks\n\ _080D3A84: .4byte 0x0000ffb0\n\ -_080D3A88: .4byte gUnknown_030042C0\n\ +_080D3A88: .4byte gBattle_BG1_X\n\ _080D3A8C: .4byte 0x0000ffd0\n\ -_080D3A90: .4byte gUnknown_030041B4\n\ +_080D3A90: .4byte gBattle_BG1_Y\n\ _080D3A94:\n\ - ldr r0, _080D3AC4 @ =gBattleAnimBankAttacker\n\ + ldr r0, _080D3AC4 @ =gAnimBankAttacker\n\ ldrb r0, [r0]\n\ bl GetBankSide\n\ lsls r0, 24\n\ @@ -283,12 +283,12 @@ _080D3A94:\n\ bne _080D3AD8\n\ ldr r2, _080D3AC8 @ =0x0000ff20\n\ adds r0, r2, 0\n\ - ldr r3, _080D3ACC @ =gUnknown_030042C0\n\ + ldr r3, _080D3ACC @ =gBattle_BG1_X\n\ strh r0, [r3]\n\ movs r2, 0x80\n\ lsls r2, 1\n\ adds r0, r2, 0\n\ - ldr r3, _080D3AD0 @ =gUnknown_030041B4\n\ + ldr r3, _080D3AD0 @ =gBattle_BG1_Y\n\ strh r0, [r3]\n\ movs r0, 0x2\n\ strh r0, [r6, 0x8]\n\ @@ -297,17 +297,17 @@ _080D3A94:\n\ strh r1, [r7, 0xE]\n\ b _080D3AEE\n\ .align 2, 0\n\ -_080D3AC4: .4byte gBattleAnimBankAttacker\n\ +_080D3AC4: .4byte gAnimBankAttacker\n\ _080D3AC8: .4byte 0x0000ff20\n\ -_080D3ACC: .4byte gUnknown_030042C0\n\ -_080D3AD0: .4byte gUnknown_030041B4\n\ +_080D3ACC: .4byte gBattle_BG1_X\n\ +_080D3AD0: .4byte gBattle_BG1_Y\n\ _080D3AD4: .4byte 0x0000ffff\n\ _080D3AD8:\n\ - ldr r0, _080D3B1C @ =gUnknown_030042C0\n\ + ldr r0, _080D3B1C @ =gBattle_BG1_X\n\ strh r4, [r0]\n\ ldr r1, _080D3B20 @ =0x0000ffd0\n\ adds r0, r1, 0\n\ - ldr r2, _080D3B24 @ =gUnknown_030041B4\n\ + ldr r2, _080D3B24 @ =gBattle_BG1_Y\n\ strh r0, [r2]\n\ ldr r0, _080D3B28 @ =0x0000fffe\n\ strh r0, [r6, 0x8]\n\ @@ -316,11 +316,11 @@ _080D3AD8:\n\ strh r4, [r7, 0xE]\n\ _080D3AEE:\n\ ldr r1, _080D3B2C @ =REG_BG1HOFS\n\ - ldr r3, _080D3B1C @ =gUnknown_030042C0\n\ + ldr r3, _080D3B1C @ =gBattle_BG1_X\n\ ldrh r0, [r3]\n\ strh r0, [r1]\n\ adds r1, 0x2\n\ - ldr r2, _080D3B24 @ =gUnknown_030041B4\n\ + ldr r2, _080D3B24 @ =gBattle_BG1_Y\n\ ldrh r0, [r2]\n\ strh r0, [r1]\n\ ldr r1, _080D3B30 @ =gTasks\n\ @@ -338,9 +338,9 @@ _080D3AEE:\n\ movs r0, 0x70\n\ b _080D3B38\n\ .align 2, 0\n\ -_080D3B1C: .4byte gUnknown_030042C0\n\ +_080D3B1C: .4byte gBattle_BG1_X\n\ _080D3B20: .4byte 0x0000ffd0\n\ -_080D3B24: .4byte gUnknown_030041B4\n\ +_080D3B24: .4byte gBattle_BG1_Y\n\ _080D3B28: .4byte 0x0000fffe\n\ _080D3B2C: .4byte REG_BG1HOFS\n\ _080D3B30: .4byte gTasks\n\ diff --git a/src/battle/anim/wave_finger.c b/src/battle/anim/wave_finger.c index 58f0f8778..2cf68c34c 100755 --- a/src/battle/anim/wave_finger.c +++ b/src/battle/anim/wave_finger.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern void sub_80CEF44(u8 bank, struct Sprite* sprite); void sub_80CF088(struct Sprite* sprite); @@ -18,9 +18,9 @@ void sub_80CF040(struct Sprite* sprite) { u8 bank; if (gBattleAnimArgs[0] == 0) - bank = gBattleAnimBankAttacker; + bank = gAnimBankAttacker; else - bank = gBattleAnimBankTarget; + bank = gAnimBankTarget; sub_80CEF44(bank, sprite); sprite->data[0] = 0; diff --git a/src/battle/anim/whip.c b/src/battle/anim/whip.c index 3aa0758a9..cb3ce327e 100755 --- a/src/battle/anim/whip.c +++ b/src/battle/anim/whip.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // whip (does a hitting animation that uses a rotating sprite to invoke the sprite getting hit.) // Used by Slam and Vine Whip. @@ -14,13 +14,13 @@ extern u8 gBattleAnimBankTarget; void sub_80CC810(struct Sprite* sprite) { if (sprite->animEnded) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } // unused, beta effect for diagonal sprite movement? void sub_80CC82C(struct Sprite* sprite) { - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { sprite->pos1.x -= gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; @@ -32,12 +32,12 @@ void sub_80CC82C(struct Sprite* sprite) } sprite->callback = sub_8078600; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } void sub_80CC884(struct Sprite* sprite) { - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) StartSpriteAnim(sprite, 1); sprite->callback = sub_80CC810; diff --git a/src/battle/anim/wisp_orb.c b/src/battle/anim/wisp_orb.c index 0e13fa119..0cbe6eed7 100644 --- a/src/battle/anim/wisp_orb.c +++ b/src/battle/anim/wisp_orb.c @@ -6,8 +6,8 @@ #include "trig.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u16 gBattleTypeFlags; extern u8 gUnknown_0202F7D2; @@ -25,7 +25,7 @@ void sub_80D5B0C(struct Sprite *sprite) StartSpriteAnim(sprite, gBattleAnimArgs[2]); sprite->data[7] = gBattleAnimArgs[2]; - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { sprite->data[4] = 4; } @@ -34,12 +34,12 @@ void sub_80D5B0C(struct Sprite *sprite) sprite->data[4] = -4; } - sprite->oam.priority = sub_8079ED4(gBattleAnimBankTarget); + sprite->oam.priority = sub_8079ED4(gAnimBankTarget); sprite->data[0]++; break; case 1: sprite->data[1] += 192; - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { sprite->pos2.y = -(sprite->data[1] >> 8); } @@ -70,9 +70,9 @@ void sub_80D5B0C(struct Sprite *sprite) sprite->data[0] = 256; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); sub_8078BD4(sprite); sprite->callback = sub_80D5C5C; @@ -100,6 +100,6 @@ static void sub_80D5C5C(struct Sprite *sprite) } else { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/withdraw.c b/src/battle/anim/withdraw.c index 9abcff32d..e67248b9f 100755 --- a/src/battle/anim/withdraw.c +++ b/src/battle/anim/withdraw.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u8 gObjectBankIDs[]; @@ -17,15 +17,15 @@ static void sub_80CF514(u8 taskId); void sub_80CF4D8(u8 taskId) { - sub_8078E70(gObjectBankIDs[gBattleAnimBankAttacker], 0); + sub_8078E70(gObjectBankIDs[gAnimBankAttacker], 0); gTasks[taskId].func = sub_80CF514; } void sub_80CF514(u8 taskId) { - u8 a = gObjectBankIDs[gBattleAnimBankAttacker]; + u8 a = gObjectBankIDs[gAnimBankAttacker]; s16 b; - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) { b = -gTasks[taskId].data[0]; } diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index ff3df7235..b0654950b 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -96,21 +96,21 @@ extern u8 gActionSelectionCursor[]; extern u8 gMoveSelectionCursor[]; extern u8 gUnknown_02038470[]; extern u16 gUnknown_030041B0; -extern u16 gUnknown_030041B4; +extern u16 gBattle_BG1_Y; extern u16 gUnknown_030041B8; extern struct Window gUnknown_030041D0; -extern u16 gUnknown_03004200; +extern u16 gBattle_WIN1H; extern struct Window gUnknown_03004210; -extern u16 gUnknown_03004244; +extern u16 gBattle_WIN1V; extern struct Window gUnknown_03004250; -extern u16 gUnknown_03004240; -extern u16 gUnknown_03004280; +extern u16 gBattle_WIN0V; +extern u16 gBattle_BG2_Y; extern u32 gUnknown_03004284; -extern u16 gUnknown_03004288; +extern u16 gBattle_BG2_X; extern u16 gUnknown_030042A0; extern u16 gUnknown_030042A4; -extern u16 gUnknown_030042C0; -extern u16 gUnknown_030042C4; +extern u16 gBattle_BG1_X; +extern u16 gBattle_WIN0H; extern MainCallback gPreBattleCallback1; extern void (*gBattleMainFunc)(void); extern u8 gLeveledUpInBattle; @@ -160,8 +160,8 @@ void InitBattle(void) REG_WIN0V = 0x5051; REG_WININ = 0; REG_WINOUT = 0; - gUnknown_030042C4 = 0xF0; - gUnknown_03004240 = 0x5051; + gBattle_WIN0H = 0xF0; + gBattle_WIN0V = 0x5051; dp12_8087EA4(); for (i = 0; i < 80; i++) @@ -181,10 +181,10 @@ void InitBattle(void) ResetPaletteFade(); gUnknown_030042A4 = 0; gUnknown_030042A0 = 0; - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; - gUnknown_03004288 = 0; - gUnknown_03004280 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; gUnknown_030041B0 = 0; gUnknown_030041B8 = 0; gBattleTerrain = BattleSetup_GetTerrain(); @@ -1003,16 +1003,16 @@ void sub_800FCFC(void) Random(); // unused return value REG_BG0HOFS = gUnknown_030042A4; REG_BG0VOFS = gUnknown_030042A0; - REG_BG1HOFS = gUnknown_030042C0; - REG_BG1VOFS = gUnknown_030041B4; - REG_BG2HOFS = gUnknown_03004288; - REG_BG2VOFS = gUnknown_03004280; + REG_BG1HOFS = gBattle_BG1_X; + REG_BG1VOFS = gBattle_BG1_Y; + REG_BG2HOFS = gBattle_BG2_X; + REG_BG2VOFS = gBattle_BG2_Y; REG_BG3HOFS = gUnknown_030041B0; REG_BG3VOFS = gUnknown_030041B8; - REG_WIN0H = gUnknown_030042C4; - REG_WIN0V = gUnknown_03004240; - REG_WIN1H = gUnknown_03004200; - REG_WIN1V = gUnknown_03004244; + REG_WIN0H = gBattle_WIN0H; + REG_WIN0V = gBattle_WIN0V; + REG_WIN1H = gBattle_WIN1H; + REG_WIN1V = gBattle_WIN1V; LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); @@ -1138,8 +1138,8 @@ void c2_8011A1C(void) REG_WIN0V = 0x5051; REG_WININ = 0; REG_WINOUT = 0; - gUnknown_030042C4 = 0xF0; - gUnknown_03004240 = 0x5051; + gBattle_WIN0H = 0xF0; + gBattle_WIN0V = 0x5051; dp12_8087EA4(); for (i = 0; i < 80; i++) @@ -1157,10 +1157,10 @@ void c2_8011A1C(void) ResetPaletteFade(); gUnknown_030042A4 = 0; gUnknown_030042A0 = 0; - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; - gUnknown_03004288 = 0; - gUnknown_03004280 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; gUnknown_030041B0 = 0; gUnknown_030041B8 = 0; diff --git a/src/battle/battle_3.c b/src/battle/battle_3.c index b21ec1572..e5a730598 100644 --- a/src/battle/battle_3.c +++ b/src/battle/battle_3.c @@ -110,22 +110,22 @@ extern u8 BattleScript_WrapEnds[]; extern u8 BattleScript_DisabledNoMore[]; extern u8 BattleScript_EncoredNoMore[]; -extern u8 gUnknown_081D9030[]; -extern u8 gUnknown_081D8F62[]; -extern u8 gUnknown_081D8FFF[]; -extern u8 gUnknown_081D8F7D[]; -extern u8 gUnknown_081D9016[]; -extern u8 gUnknown_081D9008[]; -extern u8 gUnknown_081D9041[]; -extern u8 gUnknown_081D950F[]; //uproar wakeup BS -extern u8 gUnknown_081D957E[]; //uproar BS +extern u8 BattleScript_SideStatusWoreOff[]; +extern u8 BattleScript_RainContinuesOrEnds[]; +extern u8 BattleScript_SandStormHailEnds[]; +extern u8 BattleScript_DamagingWeatherContinues[]; +extern u8 BattleScript_SunlightFaded[]; +extern u8 BattleScript_SunlightContinues[]; +extern u8 BattleScript_SafeguardEnds[]; +extern u8 BattleScript_MonWokeUpInUproar[]; //uproar wakeup BS +extern u8 BattleScript_PrintUproarOverTurns[]; //uproar BS extern u8 BattleScript_ThrashConfuses[]; extern u8 BattleScript_YawnMakesAsleep[]; -extern u8 BattleScript_FutureSightHits[]; +extern u8 BattleScript_MonTookFutureAttack[]; extern u8 BattleScript_PerishSongHits[]; extern u8 BattleScript_PerishSongTimerGoesDown[]; -extern u8 gUnknown_081D8C72[]; -extern u8 gUnknown_081D8C7B[]; +extern u8 BattleScript_GiveExp[]; +extern u8 BattleScript_HandleFaintedMon[]; extern u8 BattleScript_MoveUsedIsAsleep[]; extern u8 BattleScript_MoveUsedWokeUp[]; @@ -146,7 +146,7 @@ extern u8 BattleScript_BideStoringEnergy[]; extern u8 BattleScript_BideAttack[]; extern u8 BattleScript_BideNoEnergyToAttack[]; -extern u8 gUnknown_081D901D[]; //load weather from overworld +extern u8 BattleScript_OverworldWeatherStarts[]; //load weather from overworld extern u8 BattleScript_DrizzleActivates[]; extern u8 BattleScript_SandstreamActivates[]; extern u8 BattleScript_DroughtActivates[]; @@ -165,7 +165,7 @@ extern u8 BattleScript_ColorChangeActivates[]; extern u8 BattleScript_RoughSkinActivates[]; extern u8 BattleScript_ApplySecondaryEffect[]; extern u8 BattleScript_CuteCharmActivates[]; -extern u8 gUnknown_081D9956[]; //ability status clear +extern u8 BattleScript_AbilityCuredStatus[]; //ability status clear extern u8 BattleScript_SynchronizeActivates[]; extern u8 gUnknown_081D978C[]; //intimidate1 extern u8 gUnknown_081D9795[]; //intimidate2 @@ -185,20 +185,20 @@ extern u8 BattleScript_BerryCureBrnEnd2[]; extern u8 BattleScript_BerryCureFrzEnd2[]; extern u8 BattleScript_BerryCureSlpEnd2[]; extern u8 BattleScript_BerryCureConfusionEnd2[]; -extern u8 gUnknown_081D9A44[]; //berry cure any status end2 +extern u8 BattleScript_BerryCureChosenStatusEnd2[]; //berry cure any status end2 extern u8 BattleScript_BerryCureParRet[]; extern u8 BattleScript_BerryCurePsnRet[]; extern u8 BattleScript_BerryCureBrnRet[]; extern u8 BattleScript_BerryCureFrzRet[]; extern u8 BattleScript_BerryCureSlpRet[]; extern u8 BattleScript_BerryCureConfusionRet[]; -extern u8 gUnknown_081D9A4A[]; //berry cure any status return +extern u8 BattleScript_BerryCureChosenStatusRet[]; //berry cure any status return extern u8 BattleScript_ItemHealHP_Ret[]; extern u8 gUnknown_081D995F[]; //disobedient while asleep -extern u8 gUnknown_081D996F[]; //disobedient, uses a random move -extern u8 gUnknown_081D9989[]; //disobedient, went to sleep +extern u8 BattleScript_IgnoresAndUsesRandomMove[]; //disobedient, uses a random move +extern u8 BattleScript_IgnoresAndFallsAsleep[]; //disobedient, went to sleep extern u8 gUnknown_081D99A0[]; //disobedient, hits itself //array entries for battle communication @@ -396,7 +396,7 @@ u8 UpdateTurnCounters(void) { gSideAffecting[sideBank] &= ~SIDE_STATUS_REFLECT; - b_call_bc_move_exec(gUnknown_081D9030); + b_call_bc_move_exec(BattleScript_SideStatusWoreOff); gBattleTextBuff1[0] = 0xFD; gBattleTextBuff1[1] = 2; gBattleTextBuff1[2] = MOVE_REFLECT; @@ -424,7 +424,7 @@ u8 UpdateTurnCounters(void) if (--gSideTimer[sideBank].lightscreenTimer == 0) { gSideAffecting[sideBank] &= ~SIDE_STATUS_LIGHTSCREEN; - b_call_bc_move_exec(gUnknown_081D9030); + b_call_bc_move_exec(BattleScript_SideStatusWoreOff); gBattleCommunication[MULTISTRING_CHOOSER] = sideBank; gBattleTextBuff1[0] = 0xFD; gBattleTextBuff1[1] = 2; @@ -451,7 +451,7 @@ u8 UpdateTurnCounters(void) if (gSideTimer[sideBank].mistTimer && --gSideTimer[sideBank].mistTimer == 0) { gSideAffecting[sideBank] &= ~SIDE_STATUS_MIST; - b_call_bc_move_exec(gUnknown_081D9030); + b_call_bc_move_exec(BattleScript_SideStatusWoreOff); gBattleCommunication[MULTISTRING_CHOOSER] = sideBank; gBattleTextBuff1[0] = 0xFD; gBattleTextBuff1[1] = 2; @@ -479,7 +479,7 @@ u8 UpdateTurnCounters(void) if (--gSideTimer[sideBank].safeguardTimer == 0) { gSideAffecting[sideBank] &= ~SIDE_STATUS_SAFEGUARD; - b_call_bc_move_exec(gUnknown_081D9041); + b_call_bc_move_exec(BattleScript_SafeguardEnds); effect++; } } @@ -532,7 +532,7 @@ u8 UpdateTurnCounters(void) gBattleCommunication[MULTISTRING_CHOOSER] = 1; else gBattleCommunication[MULTISTRING_CHOOSER] = 0; - b_call_bc_move_exec(gUnknown_081D8F62); + b_call_bc_move_exec(BattleScript_RainContinuesOrEnds); effect++; } BATTLE_STRUCT->turncountersTracker++; @@ -543,10 +543,10 @@ u8 UpdateTurnCounters(void) if (!(gBattleWeather & WEATHER_SANDSTORM_PERMANENT) && --gWishFutureKnock.weatherDuration == 0) { gBattleWeather &= ~WEATHER_SANDSTORM_TEMPORARY; - gBattlescriptCurrInstr = gUnknown_081D8FFF; + gBattlescriptCurrInstr = BattleScript_SandStormHailEnds; } else - gBattlescriptCurrInstr = gUnknown_081D8F7D; + gBattlescriptCurrInstr = BattleScript_DamagingWeatherContinues; BATTLE_STRUCT->animArg1 = B_ANIM_SANDSTORM_CONTINUES; gBattleCommunication[MULTISTRING_CHOOSER] = 0; @@ -561,10 +561,10 @@ u8 UpdateTurnCounters(void) if (!(gBattleWeather & WEATHER_SUN_PERMANENT) && --gWishFutureKnock.weatherDuration == 0) { gBattleWeather &= ~WEATHER_SUN_TEMPORARY; - gBattlescriptCurrInstr = gUnknown_081D9016; + gBattlescriptCurrInstr = BattleScript_SunlightFaded; } else - gBattlescriptCurrInstr = gUnknown_081D9008; + gBattlescriptCurrInstr = BattleScript_SunlightContinues; b_call_bc_move_exec(gBattlescriptCurrInstr); effect++; @@ -577,10 +577,10 @@ u8 UpdateTurnCounters(void) if (--gWishFutureKnock.weatherDuration == 0) { gBattleWeather &= ~WEATHER_HAIL; - gBattlescriptCurrInstr = gUnknown_081D8FFF; + gBattlescriptCurrInstr = BattleScript_SandStormHailEnds; } else - gBattlescriptCurrInstr = gUnknown_081D8F7D; + gBattlescriptCurrInstr = BattleScript_DamagingWeatherContinues; BATTLE_STRUCT->animArg1 = B_ANIM_HAIL_CONTINUES; gBattleCommunication[MULTISTRING_CHOOSER] = 1; @@ -760,7 +760,7 @@ u8 TurnBasedEffects(void) gBattleMons[gBankAttacker].status1 &= ~(STATUS_SLEEP); gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE); gBattleCommunication[MULTISTRING_CHOOSER] = 1; - b_call_bc_move_exec(gUnknown_081D950F); + b_call_bc_move_exec(BattleScript_MonWokeUpInUproar); gActiveBank = gBankAttacker; EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1); MarkBufferBankForExecution(gActiveBank); @@ -791,7 +791,7 @@ u8 TurnBasedEffects(void) gBattleCommunication[MULTISTRING_CHOOSER] = 1; CancelMultiTurnMoves(gActiveBank); } - b_call_bc_move_exec(gUnknown_081D957E); + b_call_bc_move_exec(BattleScript_PrintUproarOverTurns); effect = 1; } } @@ -938,7 +938,7 @@ bool8 sub_80170DC(void) // handle future sight and perish song gBankAttacker = gWishFutureKnock.futureSightAttacker[gActiveBank]; gBattleMoveDamage = gWishFutureKnock.futureSightDmg[gActiveBank]; gSpecialStatuses[gBankTarget].moveturnLostHP = 0xFFFF; - b_call_bc_move_exec(BattleScript_FutureSightHits); + b_call_bc_move_exec(BattleScript_MonTookFutureAttack); return 1; } } @@ -1009,7 +1009,7 @@ bool8 sub_80173A4(void) gBank1 = gBankTarget = BATTLE_STRUCT->unk1605A; if (gBattleMons[BATTLE_STRUCT->unk1605A].hp == 0 && !(BATTLE_STRUCT->unk16113 & gBitTable[gBattlePartyID[BATTLE_STRUCT->unk1605A]]) && !(gAbsentBankFlags & gBitTable[BATTLE_STRUCT->unk1605A])) { - b_call_bc_move_exec(gUnknown_081D8C72); + b_call_bc_move_exec(BattleScript_GiveExp); BATTLE_STRUCT->sub80173A4_Tracker = 2; return 1; } @@ -1032,7 +1032,7 @@ bool8 sub_80173A4(void) gBank1 = gBankTarget = BATTLE_STRUCT->unk1605A; //or should banks be switched? if (gBattleMons[BATTLE_STRUCT->unk1605A].hp == 0 && !(gAbsentBankFlags & gBitTable[BATTLE_STRUCT->unk1605A])) { - b_call_bc_move_exec(gUnknown_081D8C7B); + b_call_bc_move_exec(BattleScript_HandleFaintedMon); BATTLE_STRUCT->sub80173A4_Tracker = 5; return 1; } @@ -1534,7 +1534,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) if (effect) { gBattleCommunication[MULTISTRING_CHOOSER] = weather_get_current(); - b_push_move_exec(gUnknown_081D901D); + b_push_move_exec(BattleScript_OverworldWeatherStarts); } break; case ABILITY_DRIZZLE: @@ -1969,7 +1969,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) break; } b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = gUnknown_081D9956; + gBattlescriptCurrInstr = BattleScript_AbilityCuredStatus; BATTLE_STRUCT->scriptingActive = bank; gActiveBank = bank; EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1); @@ -2768,7 +2768,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) gBattleCommunication[MULTISTRING_CHOOSER] = 1; gBattleMons[bank].status1 = 0; gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION); - b_call_bc_move_exec(gUnknown_081D9A44); + b_call_bc_move_exec(BattleScript_BerryCureChosenStatusEnd2); effect = ITEM_STATUS_CHANGE; } break; @@ -2777,7 +2777,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) { gBattleMons[bank].status2 &= ~(STATUS2_INFATUATION); StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn); - b_call_bc_move_exec(gUnknown_081D9A44); + b_call_bc_move_exec(BattleScript_BerryCureChosenStatusEnd2); gBattleCommunication[MULTISTRING_CHOOSER] = 0; effect = ITEM_EFFECT_OTHER; } @@ -2882,7 +2882,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn); b_movescr_stack_push_cursor(); gBattleCommunication[MULTISTRING_CHOOSER] = 0; - gBattlescriptCurrInstr = gUnknown_081D9A4A; + gBattlescriptCurrInstr = BattleScript_BerryCureChosenStatusRet; effect = ITEM_EFFECT_OTHER; } break; @@ -2918,7 +2918,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION); b_movescr_stack_push_cursor(); gBattleCommunication[MULTISTRING_CHOOSER] = 0; - gBattlescriptCurrInstr = gUnknown_081D9A4A; + gBattlescriptCurrInstr = BattleScript_BerryCureChosenStatusRet; effect = ITEM_STATUS_CHANGE; } break; @@ -3186,7 +3186,7 @@ u8 IsPokeDisobedient(void) gBattleCommunication[3] = 0; gDynamicBasePower = 0; BATTLE_STRUCT->dynamicMoveType = 0; - gBattlescriptCurrInstr = gUnknown_081D996F; + gBattlescriptCurrInstr = BattleScript_IgnoresAndUsesRandomMove; gBankTarget = GetMoveTarget(gRandomMove, 0); gHitMarker |= HITMARKER_x200000; return 2; @@ -3208,7 +3208,7 @@ u8 IsPokeDisobedient(void) } if (i == gNoOfAllBanks) { - gBattlescriptCurrInstr = gUnknown_081D9989; + gBattlescriptCurrInstr = BattleScript_IgnoresAndFallsAsleep; return 1; } } diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index 18585cebb..0c147e471 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -87,8 +87,8 @@ extern u8 gPlayerPartyCount; extern u16 gMoveToLearn; //move to learn extern const u8 gTrainerMoney[]; extern u16 gRandomMove; -extern u8* gBattleScriptsEffectsTable[]; -extern u16 gUnknown_02024BE8; //last used move in battle +extern u8* gBattleScriptsForMoveEffects[]; +extern u16 gChosenMove; //last used move in battle extern u8 gBankInMenu; extern u8 gActionForBanks[4]; extern u16 gUnknown_02024C2C[4]; //last used moves 2, used by sketch @@ -167,7 +167,7 @@ bool8 IsLinkDoubleBattle(void); void sub_8094B6C(u8 bank, u8 partyID, u8 r2); //extern BattleScripts -extern u8 BattleScript_EndTurn[]; +extern u8 BattleScript_MoveEnd[]; extern u8 BattleScript_NoPPForMove[]; extern u8 BattleScript_MagicCoatBounce[]; extern u8 BattleScript_TookAttack[]; @@ -205,21 +205,21 @@ extern u8 BattleScript_AllStatsUp[]; extern u8 BattleScript_AtkDefDown[]; extern u8 BattleScript_SAtkDown2[]; -extern u8 gUnknown_081D919F[]; //spikes1 -extern u8 gUnknown_081D9171[]; //spikes2 -extern u8 gUnknown_081D91CD[]; //spikes3 -extern u8 BattleScript_1D6F44[]; //present dmg -extern u8 BattleScript_1D83B5[]; //present full hp -extern u8 BattleScript_1D839B[]; //present hp heal -extern u8 BattleScript_1D6F74[]; +extern u8 BattleScript_SpikesOnTarget[]; //spikes1 +extern u8 BattleScript_SpikesOnAttacker[]; //spikes2 +extern u8 BattleScript_SpikesOngBank1[]; //spikes3 +extern u8 BattleScript_HitFromCritCalc[]; //present dmg +extern u8 BattleScript_AlreadyAtFullHp[]; //present full hp +extern u8 BattleScript_PresentHealTarget[]; //present hp heal +extern u8 BattleScript_MoveMissedPause[]; extern u8 BattleScript_CastformChange[]; -extern u8 gUnknown_081D9834[]; -extern u8 gUnknown_081D90FC[]; //bs random switchout -extern u8 gUnknown_081D95DB[]; //bs payday money give -extern u8 gUnknown_081D8C58[]; -extern u8 gUnknown_081D8C65[]; -extern u8 gUnknown_081D9156[]; -extern u8 gUnknown_081D9468[]; +extern u8 BattleScript_DampStopsExplosion[]; +extern u8 BattleScript_SuccessForceOut[]; //bs random switchout +extern u8 BattleScript_PrintPayDayMoneyString[]; //bs payday money give +extern u8 BattleScript_FaintAttacker[]; +extern u8 BattleScript_FaintTarget[]; +extern u8 BattleScript_DestinyBondTakesLife[]; +extern u8 BattleScript_SelectingImprisionedMoveInPalace[]; // read via orr #define BSScriptRead32(ptr) ((ptr)[0] | (ptr)[1] << 8 | (ptr)[2] << 16 | (ptr)[3] << 24) @@ -282,41 +282,41 @@ static void atk01_accuracycheck(void); static void atk02_attackstring(void); static void atk03_ppreduce(void); static void atk04_critcalc(void); -static void atk05_damagecalc1(void); +static void atk05_damagecalc(void); static void atk06_typecalc(void); -static void atk07_dmg_adjustment(void); -static void atk08_dmg_adjustment2(void); +static void atk07_adjustnormaldamage(void); +static void atk08_adjustnormaldamage2(void); static void atk09_attackanimation(void); static void atk0A_waitanimation(void); static void atk0B_healthbarupdate(void); static void atk0C_datahpupdate(void); static void atk0D_critmessage(void); -static void atk0E_effectiveness_sound(void); +static void atk0E_effectivenesssound(void); static void atk0F_resultmessage(void); static void atk10_printstring(void); -static void atk11_printstring_playeronly(void); +static void atk11_printselectionstring(void); static void atk12_waitmessage(void); static void atk13_printfromtable(void); -static void atk14_printfromtable_playeronly(void); -static void atk15_seteffectwithchancetarget(void); +static void atk14_printselectionstringfromtable(void); +static void atk15_seteffectwithchance(void); static void atk16_seteffectprimary(void); static void atk17_seteffectsecondary(void); -static void atk18_status_effect_clear(void); -static void atk19_faint_pokemon(void); -static void atk1A_faint_animation(void); -static void atk1B_faint_effects_clear(void); +static void atk18_clearstatusfromeffect(void); +static void atk19_tryfaintmon(void); +static void atk1A_dofaintanimation(void); +static void atk1B_cleareffectsonfaint(void); static void atk1C_jumpifstatus(void); static void atk1D_jumpifstatus2(void); static void atk1E_jumpifability(void); static void atk1F_jumpifsideaffecting(void); static void atk20_jumpifstat(void); -static void atk21_jumpifstatus3(void); +static void atk21_jumpifstatus3condition(void); static void atk22_jumpiftype(void); static void atk23_getexp(void); static void atk24(void); -static void atk25_move_values_cleanup(void); -static void atk26_set_multihit(void); -static void atk27_decrement_multihit(void); +static void atk25_movevaluescleanup(void); +static void atk26_setmultihit(void); +static void atk27_decrementmultihit(void); static void atk28_goto(void); static void atk29_jumpifbyte(void); static void atk2A_jumpifhalfword(void); @@ -327,7 +327,7 @@ static void atk2E_setbyte(void); static void atk2F_addbyte(void); static void atk30_subbyte(void); static void atk31_copyarray(void); -static void atk32_copyarray_withindex(void); +static void atk32_copyarraywithindex(void); static void atk33_orbyte(void); static void atk34_orhalfword(void); static void atk35_orword(void); @@ -341,75 +341,75 @@ static void atk3C_return(void); static void atk3D_end(void); static void atk3E_end2(void); static void atk3F_end3(void); -static void atk40_jump_if_move_affected_by_protect(void); +static void atk40_jumpifaffectedbyprotect(void); static void atk41_call(void); static void atk42_jumpiftype2(void); static void atk43_jumpifabilitypresent(void); -static void atk44(void); +static void atk44_endselectionscript(void); static void atk45_playanimation(void); static void atk46_playanimation2(void); static void atk47_setgraphicalstatchangevalues(void); static void atk48_playstatchangeanimation(void); -static void atk49_moveendturn(void); +static void atk49_moveend(void); static void atk4A_typecalc2(void); -static void atk4B_return_atk_to_ball(void); -static void atk4C_copy_poke_data(void); -static void atk4D_switch_data_update(void); -static void atk4E_switchin_anim(void); -static void atk4F_jump_if_cannot_switch(void); +static void atk4B_returnatktoball(void); +static void atk4C_getswitchedmondata(void); +static void atk4D_switchindataupdate(void); +static void atk4E_switchinanim(void); +static void atk4F_jumpifcantswitch(void); static void atk50_openpartyscreen(void); -static void atk51_switch_handle_order(void); -static void atk52_switch_in_effects(void); -static void atk53_trainer_slide(void); -static void atk54_effectiveness_sound(void); -static void atk55_play_sound(void); -static void atk56_fainting_cry(void); +static void atk51_switchhandleorder(void); +static void atk52_switchineffects(void); +static void atk53_trainerslidein(void); +static void atk54_playse(void); +static void atk55_fanfare(void); +static void atk56_playfaintcry(void); static void atk57(void); -static void atk58_return_to_ball(void); -void atk59_learnmove_inbattle(void); -static void atk5A(void); -static void atk5B_80256E0(void); +static void atk58_returntoball(void); +void atk59_handlelearnnewmove(void); +static void atk5A_yesnoboxlearnmove(void); +static void atk5B_yesnoboxstoplearningmove(void); static void atk5C_hitanimation(void); static void atk5D_getmoneyreward(void); static void atk5E_8025A70(void); static void atk5F_8025B24(void); -static void atk60_increment_gamestat(void); -static void atk61_8025BA4(void); +static void atk60_incrementgamestat(void); +static void atk61_drawpartystatussummary(void); static void atk62_08025C6C(void); static void atk63_jumptorandomattack(void); static void atk64_statusanimation(void); static void atk65_status2animation(void); static void atk66_chosenstatusanimation(void); -static void atk67_8025ECC(void); -static void atk68_80246A0(void); -static void atk69_dmg_adjustment2(void); +static void atk67_yesnobox(void); +static void atk68_cancelallactions(void); +static void atk69_adjustsetdamage(void); void atk6A_removeitem(void); static void atk6B_atknameinbuff1(void); -static void atk6C_lvlbox_display(void); -static void atk6D_set_sentpokes_values(void); -static void atk6E_set_atk_to_player0(void); -static void atk6F_set_visible(void); -static void atk70_record_ability(void); -static void atk71_buffer_move_to_learn(void); -static void atk72_jump_if_can_run_frombattle(void); -static void atk73_hp_thresholds(void); -static void atk74_hp_thresholds2(void); -static void atk75_8026A58(void); +static void atk6C_drawlvlupbox(void); +static void atk6D_resetsentmonsvalue(void); +static void atk6E_setatktoplayer0(void); +static void atk6F_makevisible(void); +static void atk70_recordlastability(void); +static void atk71_buffermovetolearn(void); +static void atk72_jumpifplayerran(void); +static void atk73_hpthresholds(void); +static void atk74_hpthresholds2(void); +static void atk75_useitemonopponent(void); static void atk76_various(void); -static void atk77_setprotect(void); +static void atk77_setprotectlike(void); static void atk78_faintifabilitynotdamp(void); static void atk79_setatkhptozero(void); -static void atk7A_jumpwhiletargetvalid(void); -static void atk7B_healhalfHP_if_possible(void); -static void atk7C_8025508(void); -static void atk7D_set_rain(void); +static void atk7A_jumpifnexttargetvalid(void); +static void atk7B_tryhealhalfhealth(void); +static void atk7C_trymirrormove(void); +static void atk7D_setrain(void); static void atk7E_setreflect(void); static void atk7F_setseeded(void); static void atk80_manipulatedamage(void); -static void atk81_setrest(void); +static void atk81_trysetrest(void); static void atk82_jumpifnotfirstturn(void); static void atk83_nop(void); -static void atk84_jump_if_cant_sleep(void); +static void atk84_jumpifcantmakeasleep(void); static void atk85_stockpile(void); static void atk86_stockpiletobasedamage(void); static void atk87_stockpiletohpheal(void); @@ -419,64 +419,64 @@ static void atk89_statbuffchange(void); static void atk8A_normalisebuffs(void); static void atk8B_setbide(void); static void atk8C_confuseifrepeatingattackends(void); -static void atk8D_setmultihit_counter(void); -static void atk8E_prepare_multihit(void); +static void atk8D_setmultihitcounter(void); +static void atk8E_initmultihitstring(void); static void atk8F_forcerandomswitch(void); -static void atk90_conversion_type_change(void); +static void atk90_tryconversiontypechange(void); static void atk91_givepaydaymoney(void); static void atk92_setlightscreen(void); -static void atk93_ko_move(void); -static void atk94_gethalfcurrentenemyhp(void); +static void atk93_tryKO(void); +static void atk94_damagetohalftargethp(void); static void atk95_setsandstorm(void); static void atk96_weatherdamage(void); -static void atk97_try_infatuation(void); -static void atk98_status_icon_update(void); +static void atk97_tryinfatuating(void); +static void atk98_updatestatusicon(void); static void atk99_setmist(void); -static void atk9A_set_focusenergy(void); +static void atk9A_setfocusenergy(void); static void atk9B_transformdataexecution(void); -static void atk9C_set_substitute(void); -static void atk9D_copyattack(void); +static void atk9C_setsubstitute(void); +static void atk9D_mimicattackcopy(void); static void atk9E_metronome(void); static void atk9F_dmgtolevel(void); static void atkA0_psywavedamageeffect(void); static void atkA1_counterdamagecalculator(void); static void atkA2_mirrorcoatdamagecalculator(void); static void atkA3_disablelastusedattack(void); -static void atkA4_setencore(void); +static void atkA4_trysetencore(void); static void atkA5_painsplitdmgcalc(void); static void atkA6_settypetorandomresistance(void); static void atkA7_setalwayshitflag(void); static void atkA8_copymovepermanently(void); -static void atkA9_sleeptalk_choose_move(void); -static void atkAA_set_destinybond(void); -static void atkAB_DestinyBondFlagUpdate(void); +static void atkA9_trychoosesleeptalkmove(void); +static void atkAA_setdestinybond(void); +static void atkAB_trysetdestinybondtohappen(void); static void atkAC_remaininghptopower(void); -static void atkAD_spite_ppreduce(void); -static void atkAE_heal_party_status(void); +static void atkAD_tryspiteppreduce(void); +static void atkAE_healpartystatus(void); static void atkAF_cursetarget(void); -static void atkB0_set_spikes(void); -static void atkB1_set_foresight(void); -static void atkB2_setperishsong(void); +static void atkB0_trysetspikes(void); +static void atkB1_setforesight(void); +static void atkB2_trysetperishsong(void); static void atkB3_rolloutdamagecalculation(void); static void atkB4_jumpifconfusedandstatmaxed(void); static void atkB5_furycuttercalc(void); static void atkB6_happinesstodamagecalculation(void); static void atkB7_presentdamagecalculation(void); -static void atkB8_set_safeguard(void); +static void atkB8_setsafeguard(void); static void atkB9_magnitudedamagecalculation(void); static void atkBA_jumpifnopursuitswitchdmg(void); static void atkBB_setsunny(void); static void atkBC_maxattackhalvehp(void); static void atkBD_copyfoestats(void); -static void atkBE_breakfree(void); -static void atkBF_set_defense_curl(void); +static void atkBE_rapidspinfree(void); +static void atkBF_setdefensecurlbit(void); static void atkC0_recoverbasedonsunlight(void); -static void atkC1_hidden_power(void); -static void atkC2_selectnexttarget(void); -static void atkC3_setfutureattack(void); -static void atkC4_beat_up(void); -static void atkC5_hidepreattack(void); -static void atkC6_unhidepostattack(void); +static void atkC1_hiddenpowercalc(void); +static void atkC2_selectfirstvalidtarget(void); +static void atkC3_trysetfutureattack(void); +static void atkC4_trydobeatup(void); +static void atkC5_setsemiinvulnerablebit(void); +static void atkC6_clearsemiinvulnerablebit(void); static void atkC7_setminimize(void); static void atkC8_sethail(void); static void atkC9_jumpifattackandspecialattackcannotfall(void); @@ -487,45 +487,45 @@ static void atkCD_cureifburnedparalysedorpoisoned(void); static void atkCE_settorment(void); static void atkCF_jumpifnodamage(void); static void atkD0_settaunt(void); -static void atkD1_set_helpinghand(void); -static void atkD2_swap_items(void); -static void atkD3_copy_ability(void); -static void atkD4_wish_effect(void); -static void atkD5_setroots(void); +static void atkD1_trysethelpinghand(void); +static void atkD2_tryswapitems(void); +static void atkD3_trycopyability(void); +static void atkD4_trywish(void); +static void atkD5_trysetroots(void); static void atkD6_doubledamagedealtifdamaged(void); static void atkD7_setyawn(void); static void atkD8_setdamagetohealthdifference(void); static void atkD9_scaledamagebyhealthratio(void); -static void atkDA_abilityswap(void); -static void atkDB_imprisoneffect(void); -static void atkDC_setgrudge(void); +static void atkDA_tryswapabilities(void); +static void atkDB_tryimprision(void); +static void atkDC_trysetgrudge(void); static void atkDD_weightdamagecalculation(void); static void atkDE_asistattackselect(void); -static void atkDF_setmagiccoat(void); -static void atkE0_setstealstatchange(void); -static void atkE1_intimidate_string_loader(void); -static void atkE2_switchout_abilities(void); -static void atkE3_jumpiffainted(void); +static void atkDF_trysetmagiccoat(void); +static void atkE0_trysetsnatch(void); +static void atkE1_trygetintimidatetarget(void); +static void atkE2_switchoutabilities(void); +static void atkE3_jumpifhasnohp(void); static void atkE4_getsecretpowereffect(void); static void atkE5_pickup(void); -static void atkE6_castform_change_animation(void); -static void atkE7_castform_data_change(void); +static void atkE6_docastformchangeanimation(void); +static void atkE7_trycastformdatachange(void); static void atkE8_settypebasedhalvers(void); static void atkE9_setweatherballtype(void); -static void atkEA_recycleitem(void); +static void atkEA_tryrecycleitem(void); static void atkEB_settypetoterrain(void); -static void atkEC_pursuit_sth(void); -static void atkED_802B4B4(void); +static void atkEC_pursuitrelated(void); +static void atkED_snatchsetbanks(void); static void atkEE_removelightscreenreflect(void); -void atkEF_pokeball_catch_calculation(void); -static void atkF0_copy_caught_poke(void); -static void atkF1_setpoke_as_caught(void); -static void atkF2_display_dex_info(void); -static void atkF3_nickname_caught_poke(void); -static void atkF4_802BEF0(void); +void atkEF_handleballthrow(void); +static void atkF0_givecaughtmon(void); +static void atkF1_trysetcaughtmondexflags(void); +static void atkF2_displaydexinfo(void); +static void atkF3_trygivecaughtmonnick(void); +static void atkF4_subattackerhpbydmg(void); static void atkF5_removeattackerstatus1(void); -static void atkF6_802BF48(void); -static void atkF7_802BF54(void); +static void atkF6_finishaction(void); +static void atkF7_finishturn(void); const BattleCmdFunc gBattleScriptingCommandsTable[] = { @@ -534,41 +534,41 @@ const BattleCmdFunc gBattleScriptingCommandsTable[] = atk02_attackstring, atk03_ppreduce, atk04_critcalc, - atk05_damagecalc1, + atk05_damagecalc, atk06_typecalc, - atk07_dmg_adjustment, - atk08_dmg_adjustment2, + atk07_adjustnormaldamage, + atk08_adjustnormaldamage2, atk09_attackanimation, atk0A_waitanimation, atk0B_healthbarupdate, atk0C_datahpupdate, atk0D_critmessage, - atk0E_effectiveness_sound, + atk0E_effectivenesssound, atk0F_resultmessage, atk10_printstring, - atk11_printstring_playeronly, + atk11_printselectionstring, atk12_waitmessage, atk13_printfromtable, - atk14_printfromtable_playeronly, - atk15_seteffectwithchancetarget, + atk14_printselectionstringfromtable, + atk15_seteffectwithchance, atk16_seteffectprimary, atk17_seteffectsecondary, - atk18_status_effect_clear, - atk19_faint_pokemon, - atk1A_faint_animation, - atk1B_faint_effects_clear, + atk18_clearstatusfromeffect, + atk19_tryfaintmon, + atk1A_dofaintanimation, + atk1B_cleareffectsonfaint, atk1C_jumpifstatus, atk1D_jumpifstatus2, atk1E_jumpifability, atk1F_jumpifsideaffecting, atk20_jumpifstat, - atk21_jumpifstatus3, + atk21_jumpifstatus3condition, atk22_jumpiftype, atk23_getexp, atk24, - atk25_move_values_cleanup, - atk26_set_multihit, - atk27_decrement_multihit, + atk25_movevaluescleanup, + atk26_setmultihit, + atk27_decrementmultihit, atk28_goto, atk29_jumpifbyte, atk2A_jumpifhalfword, @@ -579,7 +579,7 @@ const BattleCmdFunc gBattleScriptingCommandsTable[] = atk2F_addbyte, atk30_subbyte, atk31_copyarray, - atk32_copyarray_withindex, + atk32_copyarraywithindex, atk33_orbyte, atk34_orhalfword, atk35_orword, @@ -593,75 +593,75 @@ const BattleCmdFunc gBattleScriptingCommandsTable[] = atk3D_end, atk3E_end2, atk3F_end3, - atk40_jump_if_move_affected_by_protect, + atk40_jumpifaffectedbyprotect, atk41_call, atk42_jumpiftype2, atk43_jumpifabilitypresent, - atk44, + atk44_endselectionscript, atk45_playanimation, atk46_playanimation2, atk47_setgraphicalstatchangevalues, atk48_playstatchangeanimation, - atk49_moveendturn, + atk49_moveend, atk4A_typecalc2, - atk4B_return_atk_to_ball, - atk4C_copy_poke_data, - atk4D_switch_data_update, - atk4E_switchin_anim, - atk4F_jump_if_cannot_switch, + atk4B_returnatktoball, + atk4C_getswitchedmondata, + atk4D_switchindataupdate, + atk4E_switchinanim, + atk4F_jumpifcantswitch, atk50_openpartyscreen, - atk51_switch_handle_order, - atk52_switch_in_effects, - atk53_trainer_slide, - atk54_effectiveness_sound, - atk55_play_sound, - atk56_fainting_cry, + atk51_switchhandleorder, + atk52_switchineffects, + atk53_trainerslidein, + atk54_playse, + atk55_fanfare, + atk56_playfaintcry, atk57, - atk58_return_to_ball, - atk59_learnmove_inbattle, - atk5A, - atk5B_80256E0, + atk58_returntoball, + atk59_handlelearnnewmove, + atk5A_yesnoboxlearnmove, + atk5B_yesnoboxstoplearningmove, atk5C_hitanimation, atk5D_getmoneyreward, atk5E_8025A70, atk5F_8025B24, - atk60_increment_gamestat, - atk61_8025BA4, + atk60_incrementgamestat, + atk61_drawpartystatussummary, atk62_08025C6C, atk63_jumptorandomattack, atk64_statusanimation, atk65_status2animation, atk66_chosenstatusanimation, - atk67_8025ECC, - atk68_80246A0, - atk69_dmg_adjustment2, + atk67_yesnobox, + atk68_cancelallactions, + atk69_adjustsetdamage, atk6A_removeitem, atk6B_atknameinbuff1, - atk6C_lvlbox_display, - atk6D_set_sentpokes_values, - atk6E_set_atk_to_player0, - atk6F_set_visible, - atk70_record_ability, - atk71_buffer_move_to_learn, - atk72_jump_if_can_run_frombattle, - atk73_hp_thresholds, - atk74_hp_thresholds2, - atk75_8026A58, + atk6C_drawlvlupbox, + atk6D_resetsentmonsvalue, + atk6E_setatktoplayer0, + atk6F_makevisible, + atk70_recordlastability, + atk71_buffermovetolearn, + atk72_jumpifplayerran, + atk73_hpthresholds, + atk74_hpthresholds2, + atk75_useitemonopponent, atk76_various, - atk77_setprotect, + atk77_setprotectlike, atk78_faintifabilitynotdamp, atk79_setatkhptozero, - atk7A_jumpwhiletargetvalid, - atk7B_healhalfHP_if_possible, - atk7C_8025508, - atk7D_set_rain, + atk7A_jumpifnexttargetvalid, + atk7B_tryhealhalfhealth, + atk7C_trymirrormove, + atk7D_setrain, atk7E_setreflect, atk7F_setseeded, atk80_manipulatedamage, - atk81_setrest, + atk81_trysetrest, atk82_jumpifnotfirstturn, atk83_nop, - atk84_jump_if_cant_sleep, + atk84_jumpifcantmakeasleep, atk85_stockpile, atk86_stockpiletobasedamage, atk87_stockpiletohpheal, @@ -670,64 +670,64 @@ const BattleCmdFunc gBattleScriptingCommandsTable[] = atk8A_normalisebuffs, atk8B_setbide, atk8C_confuseifrepeatingattackends, - atk8D_setmultihit_counter, - atk8E_prepare_multihit, + atk8D_setmultihitcounter, + atk8E_initmultihitstring, atk8F_forcerandomswitch, - atk90_conversion_type_change, + atk90_tryconversiontypechange, atk91_givepaydaymoney, atk92_setlightscreen, - atk93_ko_move, - atk94_gethalfcurrentenemyhp, + atk93_tryKO, + atk94_damagetohalftargethp, atk95_setsandstorm, atk96_weatherdamage, - atk97_try_infatuation, - atk98_status_icon_update, + atk97_tryinfatuating, + atk98_updatestatusicon, atk99_setmist, - atk9A_set_focusenergy, + atk9A_setfocusenergy, atk9B_transformdataexecution, - atk9C_set_substitute, - atk9D_copyattack, + atk9C_setsubstitute, + atk9D_mimicattackcopy, atk9E_metronome, atk9F_dmgtolevel, atkA0_psywavedamageeffect, atkA1_counterdamagecalculator, atkA2_mirrorcoatdamagecalculator, atkA3_disablelastusedattack, - atkA4_setencore, + atkA4_trysetencore, atkA5_painsplitdmgcalc, atkA6_settypetorandomresistance, atkA7_setalwayshitflag, atkA8_copymovepermanently, - atkA9_sleeptalk_choose_move, - atkAA_set_destinybond, - atkAB_DestinyBondFlagUpdate, + atkA9_trychoosesleeptalkmove, + atkAA_setdestinybond, + atkAB_trysetdestinybondtohappen, atkAC_remaininghptopower, - atkAD_spite_ppreduce, - atkAE_heal_party_status, + atkAD_tryspiteppreduce, + atkAE_healpartystatus, atkAF_cursetarget, - atkB0_set_spikes, - atkB1_set_foresight, - atkB2_setperishsong, + atkB0_trysetspikes, + atkB1_setforesight, + atkB2_trysetperishsong, atkB3_rolloutdamagecalculation, atkB4_jumpifconfusedandstatmaxed, atkB5_furycuttercalc, atkB6_happinesstodamagecalculation, atkB7_presentdamagecalculation, - atkB8_set_safeguard, + atkB8_setsafeguard, atkB9_magnitudedamagecalculation, atkBA_jumpifnopursuitswitchdmg, atkBB_setsunny, atkBC_maxattackhalvehp, atkBD_copyfoestats, - atkBE_breakfree, - atkBF_set_defense_curl, + atkBE_rapidspinfree, + atkBF_setdefensecurlbit, atkC0_recoverbasedonsunlight, - atkC1_hidden_power, - atkC2_selectnexttarget, - atkC3_setfutureattack, - atkC4_beat_up, - atkC5_hidepreattack, - atkC6_unhidepostattack, + atkC1_hiddenpowercalc, + atkC2_selectfirstvalidtarget, + atkC3_trysetfutureattack, + atkC4_trydobeatup, + atkC5_setsemiinvulnerablebit, + atkC6_clearsemiinvulnerablebit, atkC7_setminimize, atkC8_sethail, atkC9_jumpifattackandspecialattackcannotfall, @@ -738,45 +738,45 @@ const BattleCmdFunc gBattleScriptingCommandsTable[] = atkCE_settorment, atkCF_jumpifnodamage, atkD0_settaunt, - atkD1_set_helpinghand, - atkD2_swap_items, - atkD3_copy_ability, - atkD4_wish_effect, - atkD5_setroots, + atkD1_trysethelpinghand, + atkD2_tryswapitems, + atkD3_trycopyability, + atkD4_trywish, + atkD5_trysetroots, atkD6_doubledamagedealtifdamaged, atkD7_setyawn, atkD8_setdamagetohealthdifference, atkD9_scaledamagebyhealthratio, - atkDA_abilityswap, - atkDB_imprisoneffect, - atkDC_setgrudge, + atkDA_tryswapabilities, + atkDB_tryimprision, + atkDC_trysetgrudge, atkDD_weightdamagecalculation, atkDE_asistattackselect, - atkDF_setmagiccoat, - atkE0_setstealstatchange, - atkE1_intimidate_string_loader, - atkE2_switchout_abilities, - atkE3_jumpiffainted, + atkDF_trysetmagiccoat, + atkE0_trysetsnatch, + atkE1_trygetintimidatetarget, + atkE2_switchoutabilities, + atkE3_jumpifhasnohp, atkE4_getsecretpowereffect, atkE5_pickup, - atkE6_castform_change_animation, - atkE7_castform_data_change, + atkE6_docastformchangeanimation, + atkE7_trycastformdatachange, atkE8_settypebasedhalvers, atkE9_setweatherballtype, - atkEA_recycleitem, + atkEA_tryrecycleitem, atkEB_settypetoterrain, - atkEC_pursuit_sth, - atkED_802B4B4, + atkEC_pursuitrelated, + atkED_snatchsetbanks, atkEE_removelightscreenreflect, - atkEF_pokeball_catch_calculation, - atkF0_copy_caught_poke, - atkF1_setpoke_as_caught, - atkF2_display_dex_info, - atkF3_nickname_caught_poke, - atkF4_802BEF0, + atkEF_handleballthrow, + atkF0_givecaughtmon, + atkF1_trysetcaughtmondexflags, + atkF2_displaydexinfo, + atkF3_trygivecaughtmonnick, + atkF4_subattackerhpbydmg, atkF5_removeattackerstatus1, - atkF6_802BF48, - atkF7_802BF54, + atkF6_finishaction, + atkF7_finishturn, }; struct statFractions @@ -869,59 +869,59 @@ static const u32 gStatusFlagsForMoveEffects[] = 0x00000000 }; -extern u8 BattleScript_1D963E[]; -extern u8 BattleScript_1D965A[]; -extern u8 BattleScript_1D9669[]; -extern u8 BattleScript_1D9678[]; -extern u8 BattleScript_1D9687[]; -extern u8 BattleScript_1D969D[]; -extern u8 BattleScript_1D96BA[]; -extern u8 BattleScript_1D9696[]; -extern u8 BattleScript_1D96B1[]; -extern u8 BattleScript_1D96AA[]; -extern u8 BattleScript_1D96C8[]; +extern u8 BattleScript_MoveEffectSleep[]; +extern u8 BattleScript_MoveEffectPoison[]; +extern u8 BattleScript_MoveEffectBurn[]; +extern u8 BattleScript_MoveEffectFreeze[]; +extern u8 BattleScript_MoveEffectParalysis[]; +extern u8 BattleScript_MoveEffectToxic[]; +extern u8 BattleScript_MoveEffectConfusion[]; +extern u8 BattleScript_MoveEffectUproar[]; +extern u8 BattleScript_MoveEffectWrap[]; +extern u8 BattleScript_MoveEffectPayDay[]; +extern u8 BattleScript_MoveEffectRecoil33[]; u8* const gMoveEffectBS_Ptrs[] = { - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D965A, - BattleScript_1D9669, - BattleScript_1D9678, - BattleScript_1D9687, - BattleScript_1D969D, - BattleScript_1D96BA, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D9696, - BattleScript_1D96AA, - BattleScript_1D963E, - BattleScript_1D96B1, - BattleScript_1D96C8, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D963E, - BattleScript_1D96C8 + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectPoison, + BattleScript_MoveEffectBurn, + BattleScript_MoveEffectFreeze, + BattleScript_MoveEffectParalysis, + BattleScript_MoveEffectToxic, + BattleScript_MoveEffectConfusion, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectUproar, + BattleScript_MoveEffectPayDay, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectWrap, + BattleScript_MoveEffectRecoil33, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectSleep, + BattleScript_MoveEffectRecoil33 }; const u8 sUnreferencedBitMask1[] = {0, 1, 3, 7, 0xF, 0x1F, 0x3F}; @@ -1034,7 +1034,7 @@ static void atk00_attackcanceler(void) if (gBattleMons[gBankAttacker].hp == 0 && !(gHitMarker & HITMARKER_NO_ATTACKSTRING)) { gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; - gBattlescriptCurrInstr = BattleScript_EndTurn; + gBattlescriptCurrInstr = BattleScript_MoveEnd; return; } if (AtkCanceller_UnableToUseMove()) @@ -1127,7 +1127,7 @@ static void JumpIfMoveFailed(u8 adder, u16 move) gBattlescriptCurrInstr = to_store; } -static void atk40_jump_if_move_affected_by_protect(void) +static void atk40_jumpifaffectedbyprotect(void) { if (TargetProtectAffected) { @@ -1383,7 +1383,7 @@ static void atk04_critcalc(void) gBattlescriptCurrInstr++; } -static void atk05_damagecalc1(void) +static void atk05_damagecalc(void) { u16 side_hword = gSideAffecting[GetBankIdentity(gBankTarget) & 1]; gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankTarget], gCurrentMove, @@ -1744,7 +1744,7 @@ void Unused_ApplyRandomDmgMultiplier(void) ApplyRandomDmgMultiplier(); } -static void atk07_dmg_adjustment(void) +static void atk07_adjustnormaldamage(void) { u8 hold_effect, quality; ApplyRandomDmgMultiplier(); @@ -1791,7 +1791,7 @@ static void atk07_dmg_adjustment(void) gBattlescriptCurrInstr++; } -static void atk08_dmg_adjustment2(void) //literally the same as 0x7 except it doesn't check for false swipe move effect... +static void atk08_adjustnormaldamage2(void) //literally the same as 0x7 except it doesn't check for false swipe move effect... { u8 hold_effect, quality; ApplyRandomDmgMultiplier(); @@ -2050,7 +2050,7 @@ static void atk0D_critmessage(void) } } -static void atk0E_effectiveness_sound(void) +static void atk0E_effectivenesssound(void) { if (gBattleExecBuffer) return; @@ -2192,7 +2192,7 @@ static void atk10_printstring(void) } } -static void atk11_printstring_playeronly(void) +static void atk11_printselectionstring(void) { gActiveBank = gBankAttacker; EmitPrintStringPlayerOnly(0, T2_READ_16(gBattlescriptCurrInstr + 1)); @@ -2234,7 +2234,7 @@ static void atk13_printfromtable(void) } } -static void atk14_printfromtable_playeronly(void) +static void atk14_printselectionstringfromtable(void) { if (gBattleExecBuffer == 0) { @@ -4919,7 +4919,7 @@ _0801F610: .4byte BattleScript_SAtkDown2\n\ #endif // NONMATCHING -static void atk15_seteffectwithchancetarget(void) +static void atk15_seteffectwithchance(void) { u32 PercentChance; if (gBattleMons[gBankAttacker].ability == ABILITY_SERENE_GRACE) @@ -4954,7 +4954,7 @@ static void atk17_seteffectsecondary(void) SetMoveEffect(0, 0); } -static void atk18_status_effect_clear(void) +static void atk18_clearstatusfromeffect(void) { gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); if (gBattleCommunication[MOVE_EFFECT_BYTE] <= 6) @@ -4967,7 +4967,7 @@ static void atk18_status_effect_clear(void) BATTLE_STRUCT->unk16112 = 0; } -static void atk19_faint_pokemon(void) +static void atk19_tryfaintmon(void) { u8 *r4; @@ -4995,13 +4995,13 @@ static void atk19_faint_pokemon(void) { gActiveBank = gBankAttacker; bank = gBankTarget; - r4 = gUnknown_081D8C58; + r4 = BattleScript_FaintAttacker; } else { gActiveBank = gBankTarget; bank = gBankAttacker; - r4 = gUnknown_081D8C65; + r4 = BattleScript_FaintTarget; } if (!(gAbsentBankFlags & gBitTable[gActiveBank]) && gBattleMons[gActiveBank].hp == 0) @@ -5039,7 +5039,7 @@ static void atk19_faint_pokemon(void) { b_movescr_stack_push(gBattlescriptCurrInstr); gBattleMoveDamage = gBattleMons[bank].hp; - gBattlescriptCurrInstr = gUnknown_081D9156; + gBattlescriptCurrInstr = BattleScript_DestinyBondTakesLife; } if ((gStatuses3[gBankTarget] & STATUS3_GRUDGE) && !(gHitMarker & HITMARKER_GRUDGE) @@ -5051,7 +5051,7 @@ static void atk19_faint_pokemon(void) gBattleMons[gBankAttacker].pp[moveIndex] = 0; b_movescr_stack_push(gBattlescriptCurrInstr); - gBattlescriptCurrInstr = gUnknown_081D9468; + gBattlescriptCurrInstr = BattleScript_SelectingImprisionedMoveInPalace; gActiveBank = gBankAttacker; EmitSetAttributes(0, moveIndex + 9, 0, 1, &gBattleMons[gActiveBank].pp[moveIndex]); MarkBufferBankForExecution(gActiveBank); @@ -5070,7 +5070,7 @@ static void atk19_faint_pokemon(void) } } -static void atk1A_faint_animation(void) +static void atk1A_dofaintanimation(void) { if (gBattleExecBuffer == 0) { @@ -5081,7 +5081,7 @@ static void atk1A_faint_animation(void) } } -static void atk1B_faint_effects_clear(void) +static void atk1B_cleareffectsonfaint(void) { //Clears things like attraction or trapping to other banks if (gBattleExecBuffer == 0) @@ -5220,7 +5220,7 @@ static void atk20_jumpifstat(void) gBattlescriptCurrInstr += 9; } -static void atk21_jumpifstatus3(void) +static void atk21_jumpifstatus3condition(void) { u32 flags; void* jump_loc; @@ -5265,14 +5265,14 @@ static void atk23_getexp(void) u16* exp = &BATTLE_STRUCT->exp; gBank1 = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); sent_in = gSentPokesToOpponent[(gBank1 & 2) >> 1]; - switch (BATTLE_STRUCT->atk23StateTracker) + switch (BATTLE_STRUCT->getexpStateTracker) { case 0: //check if should receive exp at all if (GetBankSide(gBank1) != 1 || (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_SAFARI | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER))) - BATTLE_STRUCT->atk23StateTracker = 6; //goto last case + BATTLE_STRUCT->getexpStateTracker = 6; //goto last case else { - BATTLE_STRUCT->atk23StateTracker++; + BATTLE_STRUCT->getexpStateTracker++; ((u8*)ewram)[0x16113] |= gBitTable[gBattlePartyID[gBank1]]; } break; @@ -5317,7 +5317,7 @@ static void atk23_getexp(void) *exp = 1; gExpShareExp = 0; } - BATTLE_STRUCT->atk23StateTracker++; + BATTLE_STRUCT->getexpStateTracker++; BATTLE_STRUCT->expGetterID = 0; BATTLE_STRUCT->sentInPokes = sent_in; } //no break statement @@ -5334,7 +5334,7 @@ static void atk23_getexp(void) if ((hold_effect != HOLD_EFFECT_EXP_SHARE && !(BATTLE_STRUCT->sentInPokes & 1))) { BATTLE_STRUCT->sentInPokes >>= 1; - tracker = &BATTLE_STRUCT->atk23StateTracker; + tracker = &BATTLE_STRUCT->getexpStateTracker; zero = 0; *tracker = 5; //increment looper gBattleMoveDamage = zero; //used for exp @@ -5342,7 +5342,7 @@ static void atk23_getexp(void) else if (GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_LEVEL) == 100) { BATTLE_STRUCT->sentInPokes >>= 1; - tracker = &BATTLE_STRUCT->atk23StateTracker; + tracker = &BATTLE_STRUCT->getexpStateTracker; zero = 0; *tracker = 5; //increment looper gBattleMoveDamage = zero; //used for exp @@ -5428,7 +5428,7 @@ static void atk23_getexp(void) MonGainEVs(&gPlayerParty[BATTLE_STRUCT->expGetterID], gBattleMons[gBank1].species); } BATTLE_STRUCT->sentInPokes >>= 1; - BATTLE_STRUCT->atk23StateTracker++; + BATTLE_STRUCT->getexpStateTracker++; } } break; @@ -5450,7 +5450,7 @@ static void atk23_getexp(void) EmitExpBarUpdate(0, BATTLE_STRUCT->expGetterID, gBattleMoveDamage); MarkBufferBankForExecution(gActiveBank); } - BATTLE_STRUCT->atk23StateTracker++; + BATTLE_STRUCT->getexpStateTracker++; } break; case 4: //lvl up if necessary @@ -5508,24 +5508,24 @@ static void atk23_getexp(void) gBattleMons[2].spAttack = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_SPEED /*RIP*/); gBattleMons[2].spDefense = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_SPATK); } - BATTLE_STRUCT->atk23StateTracker = 5; + BATTLE_STRUCT->getexpStateTracker = 5; } else { gBattleMoveDamage = 0; - BATTLE_STRUCT->atk23StateTracker = 5; + BATTLE_STRUCT->getexpStateTracker = 5; } } break; case 5: //looper increment if (gBattleMoveDamage) //there is exp to give, goto case 3 that gives exp - BATTLE_STRUCT->atk23StateTracker = 3; + BATTLE_STRUCT->getexpStateTracker = 3; else { if (++BATTLE_STRUCT->expGetterID <= 5) - BATTLE_STRUCT->atk23StateTracker = 2; //loop again + BATTLE_STRUCT->getexpStateTracker = 2; //loop again else - BATTLE_STRUCT->atk23StateTracker = 6; //we're done + BATTLE_STRUCT->getexpStateTracker = 6; //we're done } break; case 6: //increment instruction @@ -6966,19 +6966,19 @@ static void MoveValuesCleanUp(void) gHitMarker &= ~(HITMARKER_SYNCHRONISE_EFFECT); } -static void atk25_move_values_cleanup(void) +static void atk25_movevaluescleanup(void) { MoveValuesCleanUp(); gBattlescriptCurrInstr += 1; } -static void atk26_set_multihit(void) +static void atk26_setmultihit(void) { gMultiHitCounter = T2_READ_8(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr += 2; } -static void atk27_decrement_multihit(void) +static void atk27_decrementmultihit(void) { if (--gMultiHitCounter == 0) gBattlescriptCurrInstr += 5; @@ -7184,7 +7184,7 @@ static void atk31_copyarray(void) gBattlescriptCurrInstr += 10; } -static void atk32_copyarray_withindex(void) +static void atk32_copyarraywithindex(void) { u8* mem1 = T2_READ_PTR(gBattlescriptCurrInstr + 1); u8* mem2 = T2_READ_PTR(gBattlescriptCurrInstr + 5); @@ -7332,7 +7332,7 @@ static void atk43_jumpifabilitypresent(void) gBattlescriptCurrInstr += 6; } -static void atk44(void) +static void atk44_endselectionscript(void) { ewram16060(gBankAttacker) = 1; } @@ -7796,7 +7796,7 @@ _080217E6:\n\ #endif // NONMATCHING #ifdef NONMATCHING -static void atk49_moveendturn(void) +static void atk49_moveend(void) { int i; int effect = 0; @@ -7831,7 +7831,7 @@ static void atk49_moveendturn(void) { gBattleMons[gBankTarget].statStages[STAT_STAGE_ATK]++; b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = gUnknown_081D9132; + gBattlescriptCurrInstr = BattleScript_RageIsBuilding; effect = 1; } BATTLE_STRUCT->cmd49StateTracker++; @@ -7847,7 +7847,7 @@ static void atk49_moveendturn(void) EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBankTarget].status1); MarkBufferBankForExecution(gActiveBank); b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = gUnknown_081D955D; + gBattlescriptCurrInstr = BattleScript_DefrostedViaFireMove; effect = 1; } BATTLE_STRUCT->cmd49StateTracker++; @@ -7936,7 +7936,7 @@ static void atk49_moveendturn(void) } #else __attribute__((naked)) -static void atk49_moveendturn(void) +static void atk49_moveend(void) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ @@ -8008,7 +8008,7 @@ _08021874:\n\ adds r0, r3\n\ strb r4, [r0]\n\ bl MoveValuesCleanUp\n\ - ldr r2, _080218B4 @ =gBattleScriptsEffectsTable\n\ + ldr r2, _080218B4 @ =gBattleScriptsForMoveEffects\n\ mov r4, r8\n\ ldrh r1, [r4]\n\ lsls r0, r1, 1\n\ @@ -8026,7 +8026,7 @@ _08021874:\n\ .align 2, 0\n\ _080218AC: .4byte gSharedMem\n\ _080218B0: .4byte 0x0001600c\n\ -_080218B4: .4byte gBattleScriptsEffectsTable\n\ +_080218B4: .4byte gBattleScriptsForMoveEffects\n\ _080218B8: .4byte gBattlescriptCurrInstr\n\ _080218BC: .4byte gUnknown_081D9B2D\n\ _080218C0:\n\ @@ -8166,7 +8166,7 @@ _080219C8:\n\ strb r0, [r1, 0x19]\n\ bl b_movescr_stack_push_cursor\n\ ldr r1, _08021A24 @ =gBattlescriptCurrInstr\n\ - ldr r0, _08021A28 @ =gUnknown_081D9132\n\ + ldr r0, _08021A28 @ =BattleScript_RageIsBuilding\n\ str r0, [r1]\n\ movs r5, 0x1\n\ mov r10, r5\n\ @@ -8184,7 +8184,7 @@ _08021A18: .4byte gProtectStructs\n\ _08021A1C: .4byte gBattleMoves\n\ _08021A20: .4byte gCurrentMove\n\ _08021A24: .4byte gBattlescriptCurrInstr\n\ -_08021A28: .4byte gUnknown_081D9132\n\ +_08021A28: .4byte BattleScript_RageIsBuilding\n\ _08021A2C: .4byte gSharedMem\n\ _08021A30: .4byte 0x0001600c\n\ _08021A34:\n\ @@ -8264,7 +8264,7 @@ _08021A92:\n\ bl MarkBufferBankForExecution\n\ bl b_movescr_stack_push_cursor\n\ ldr r1, _08021AE8 @ =gBattlescriptCurrInstr\n\ - ldr r0, _08021AEC @ =gUnknown_081D955D\n\ + ldr r0, _08021AEC @ =BattleScript_DefrostedViaFireMove\n\ str r0, [r1]\n\ movs r2, 0x1\n\ mov r10, r2\n\ @@ -8277,7 +8277,7 @@ _08021ADC: .4byte gSpecialStatuses\n\ _08021AE0: .4byte gBattleMoveFlags\n\ _08021AE4: .4byte gActiveBank\n\ _08021AE8: .4byte gBattlescriptCurrInstr\n\ -_08021AEC: .4byte gUnknown_081D955D\n\ +_08021AEC: .4byte BattleScript_DefrostedViaFireMove\n\ _08021AF0:\n\ ldr r0, _08021B14 @ =gBankTarget\n\ ldrb r1, [r0]\n\ @@ -8376,7 +8376,7 @@ _08021B9C:\n\ ldr r4, [sp, 0x8]\n\ cmp r4, 0x1D\n\ bne _08021BE0\n\ - ldr r0, _08021C2C @ =gUnknown_02024BE8\n\ + ldr r0, _08021C2C @ =gChosenMove\n\ ldrh r2, [r0]\n\ adds r7, r0, 0\n\ cmp r2, 0xA5\n\ @@ -8444,7 +8444,7 @@ _08021C22:\n\ b _08022244\n\ .align 2, 0\n\ _08021C28: .4byte gHitMarker\n\ -_08021C2C: .4byte gUnknown_02024BE8\n\ +_08021C2C: .4byte gChosenMove\n\ _08021C30: .4byte 0x0000ffff\n\ _08021C34: .4byte gBattleMoveFlags\n\ _08021C38: .4byte gBattleMons\n\ @@ -8733,7 +8733,7 @@ _08021E70:\n\ str r3, [r5]\n\ _08021E9A:\n\ ldr r1, _08021F40 @ =gBattleMoves\n\ - ldr r2, _08021F44 @ =gUnknown_02024BE8\n\ + ldr r2, _08021F44 @ =gChosenMove\n\ ldrh r3, [r2]\n\ lsls r0, r3, 1\n\ adds r0, r3\n\ @@ -8816,7 +8816,7 @@ _08021F34: .4byte gActiveBank\n\ _08021F38: .4byte gBankTarget\n\ _08021F3C: .4byte 0xffffefff\n\ _08021F40: .4byte gBattleMoves\n\ -_08021F44: .4byte gUnknown_02024BE8\n\ +_08021F44: .4byte gChosenMove\n\ _08021F48: .4byte gBattleMoveFlags\n\ _08021F4C: .4byte gUnknown_02024C2C\n\ _08021F50: .4byte gAbsentBankFlags\n\ @@ -8967,7 +8967,7 @@ _08022082:\n\ b _08022244\n\ _08022090:\n\ ldr r1, _0802213C @ =gBattleMoves\n\ - ldr r4, _08022140 @ =gUnknown_02024BE8\n\ + ldr r4, _08022140 @ =gChosenMove\n\ ldrh r3, [r4]\n\ lsls r0, r3, 1\n\ adds r0, r3\n\ @@ -9051,7 +9051,7 @@ _08022130: .4byte gBitTable\n\ _08022134: .4byte gBankAttacker\n\ _08022138: .4byte 0x000160a6\n\ _0802213C: .4byte gBattleMoves\n\ -_08022140: .4byte gUnknown_02024BE8\n\ +_08022140: .4byte gChosenMove\n\ _08022144: .4byte gHitMarker\n\ _08022148: .4byte gBankTarget\n\ _0802214C: .4byte gBattleMoveFlags\n\ @@ -9322,7 +9322,7 @@ static void atk4A_typecalc2(void) gBattlescriptCurrInstr++; } -static void atk4B_return_atk_to_ball(void) +static void atk4B_returnatktoball(void) { gActiveBank = gBankAttacker; if (!(gHitMarker & HITMARKER_FAINTED(gActiveBank))) @@ -9333,7 +9333,7 @@ static void atk4B_return_atk_to_ball(void) gBattlescriptCurrInstr++; } -static void atk4C_copy_poke_data(void) +static void atk4C_getswitchedmondata(void) { if (gBattleExecBuffer) return; @@ -9357,7 +9357,7 @@ static inline u8 get_knocked_off_byte(u8 bank) return *cc; } -static void atk4D_switch_data_update(void) +static void atk4D_switchindataupdate(void) { struct BattlePokemon OldData; int i; @@ -9401,7 +9401,7 @@ static void atk4D_switch_data_update(void) gBattlescriptCurrInstr += 2; } -static void atk4E_switchin_anim(void) +static void atk4E_switchinanim(void) { if (gBattleExecBuffer) return; @@ -9417,7 +9417,7 @@ static void atk4E_switchin_anim(void) gBattlescriptCurrInstr += 3; } -static void atk4F_jump_if_cannot_switch(void) +static void atk4F_jumpifcantswitch(void) { int val, to_cmp; register struct Pokemon *party; @@ -10565,7 +10565,7 @@ _08023318: .4byte gBitTable\n\ .syntax divided"); } -static void atk51_switch_handle_order(void) +static void atk51_switchhandleorder(void) { int i; if (gBattleExecBuffer) @@ -10616,7 +10616,7 @@ static void atk51_switch_handle_order(void) gBattlescriptCurrInstr += 3; } -static void atk52_switch_in_effects(void) +static void atk52_switchineffects(void) { int i; @@ -10641,11 +10641,11 @@ static void atk52_switch_in_effects(void) b_movescr_stack_push_cursor(); if (T2_READ_8(gBattlescriptCurrInstr + 1) == 0) - gBattlescriptCurrInstr = gUnknown_081D919F; + gBattlescriptCurrInstr = BattleScript_SpikesOnTarget; else if (T2_READ_8(gBattlescriptCurrInstr + 1) == 1) - gBattlescriptCurrInstr = gUnknown_081D9171; + gBattlescriptCurrInstr = BattleScript_SpikesOnAttacker; else - gBattlescriptCurrInstr = gUnknown_081D91CD; + gBattlescriptCurrInstr = BattleScript_SpikesOngBank1; } else { @@ -10687,7 +10687,7 @@ static void atk52_switch_in_effects(void) } } -static void atk53_trainer_slide(void) +static void atk53_trainerslidein(void) { if (!T2_READ_8(gBattlescriptCurrInstr + 1)) gActiveBank = GetBankByPlayerAI(0); @@ -10699,7 +10699,7 @@ static void atk53_trainer_slide(void) gBattlescriptCurrInstr += 2; } -static void atk54_effectiveness_sound(void) +static void atk54_playse(void) { gActiveBank = gBankAttacker; EmitEffectivenessSound(0, T2_READ_16(gBattlescriptCurrInstr + 1)); @@ -10707,7 +10707,7 @@ static void atk54_effectiveness_sound(void) gBattlescriptCurrInstr += 3; } -static void atk55_play_sound(void) +static void atk55_fanfare(void) { gActiveBank = gBankAttacker; Emitcmd44(0, T2_READ_16(gBattlescriptCurrInstr + 1)); @@ -10715,7 +10715,7 @@ static void atk55_play_sound(void) gBattlescriptCurrInstr += 3; } -static void atk56_fainting_cry(void) +static void atk56_playfaintcry(void) { gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); EmitFaintingCry(0); @@ -10731,7 +10731,7 @@ static void atk57(void) gBattlescriptCurrInstr += 1; } -static void atk58_return_to_ball(void) +static void atk58_returntoball(void) { gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); EmitReturnPokeToBall(0, 1); @@ -10739,7 +10739,7 @@ static void atk58_return_to_ball(void) gBattlescriptCurrInstr += 2; } -void atk59_learnmove_inbattle(void) +void atk59_handlelearnnewmove(void) { u8* loc1 = T1_READ_PTR(gBattlescriptCurrInstr + 1); u8* loc2 = T1_READ_PTR(gBattlescriptCurrInstr + 5); @@ -10785,7 +10785,7 @@ void sub_8023AD8(void) DestroyMenuCursor(); } -static void atk5A(void) +static void atk5A_yesnoboxlearnmove(void) { gActiveBank = 0; switch (BATTLE_STRUCT->atk5A_StateTracker) @@ -10898,7 +10898,7 @@ static void atk5A(void) } } -static void atk5B_80256E0(void) +static void atk5B_yesnoboxstoplearningmove(void) { switch (BATTLE_STRUCT->atk5A_StateTracker) { @@ -11253,7 +11253,7 @@ static void atk5F_8025B24(void) gBattlescriptCurrInstr++; } -static void atk60_increment_gamestat(void) +static void atk60_incrementgamestat(void) { if (GetBankSide(gBankAttacker) == 0) { @@ -11262,7 +11262,7 @@ static void atk60_increment_gamestat(void) gBattlescriptCurrInstr += 2; } -static void atk61_8025BA4(void) +static void atk61_drawpartystatussummary(void) { int i; struct Pokemon* party; @@ -11307,8 +11307,8 @@ static void atk63_jumptorandomattack(void) if (T2_READ_8(gBattlescriptCurrInstr + 1)) gCurrentMove = gRandomMove; else - gUnknown_02024BE8 = gCurrentMove = gRandomMove; - gBattlescriptCurrInstr = gBattleScriptsEffectsTable[gBattleMoves[gCurrentMove].effect]; + gChosenMove = gCurrentMove = gRandomMove; + gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]; } static void atk64_statusanimation(void) @@ -11357,7 +11357,7 @@ static void atk66_chosenstatusanimation(void) } } -static void atk67_8025ECC(void) +static void atk67_yesnobox(void) { switch (gBattleCommunication[0]) { @@ -11399,7 +11399,7 @@ static void atk67_8025ECC(void) } } -static void atk68_80246A0(void) +static void atk68_cancelallactions(void) { int i; for (i = 0; i < gNoOfAllBanks; i++) @@ -11409,7 +11409,7 @@ static void atk68_80246A0(void) gBattlescriptCurrInstr++; } -static void atk69_dmg_adjustment2(void) //literally a copy of atk07 except theres no rand dmg modifier... +static void atk69_adjustsetdamage(void) //literally a copy of atk07 except theres no rand dmg modifier... { u8 hold_effect, quality; if (gBattleMons[gBankTarget].item == ITEM_ENIGMA_BERRY) @@ -11474,7 +11474,7 @@ static void atk6B_atknameinbuff1(void) } #ifdef NONMATCHING -static void atk6C_lvlbox_display(void) +static void atk6C_drawlvlupbox(void) { u8 r1 = 0; u8 r7 = 0; @@ -11489,7 +11489,7 @@ static void atk6C_lvlbox_display(void) #else __attribute__((naked)) -static void atk6C_lvlbox_display(void) +static void atk6C_drawlvlupbox(void) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ @@ -11899,19 +11899,19 @@ _08024C48: .4byte gBattlescriptCurrInstr\n\ #endif -static void atk6D_set_sentpokes_values(void) +static void atk6D_resetsentmonsvalue(void) { sub_80156DC(); gBattlescriptCurrInstr++; } -static void atk6E_set_atk_to_player0(void) +static void atk6E_setatktoplayer0(void) { gBankAttacker = GetBankByPlayerAI(0); gBattlescriptCurrInstr++; } -static void atk6F_set_visible(void) +static void atk6F_makevisible(void) { gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); EmitSpriteInvisibility(0, 0); @@ -11919,7 +11919,7 @@ static void atk6F_set_visible(void) gBattlescriptCurrInstr += 2; } -static void atk70_record_ability(void) +static void atk70_recordlastability(void) { gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); RecordAbilityBattle(gActiveBank, gLastUsedAbility); @@ -11935,13 +11935,13 @@ void sub_8024CEC(void) gBattleTextBuff2[4] = 0xFF; } -static void atk71_buffer_move_to_learn(void) +static void atk71_buffermovetolearn(void) { sub_8024CEC(); gBattlescriptCurrInstr++; } -static void atk72_jump_if_can_run_frombattle(void) +static void atk72_jumpifplayerran(void) { if (sub_8014AB8(gBank1)) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -11949,7 +11949,7 @@ static void atk72_jump_if_can_run_frombattle(void) gBattlescriptCurrInstr += 5; } -static void atk73_hp_thresholds(void) +static void atk73_hpthresholds(void) { u8 opposing_bank; s32 result; @@ -11975,7 +11975,7 @@ static void atk73_hp_thresholds(void) gBattlescriptCurrInstr += 2; } -static void atk74_hp_thresholds2(void) +static void atk74_hpthresholds2(void) { u8 opposing_bank; u8 hp_switchout; @@ -12000,7 +12000,7 @@ static void atk74_hp_thresholds2(void) gBattlescriptCurrInstr += 2; } -static void atk75_8026A58(void) +static void atk75_useitemonopponent(void) { gBankInMenu = gBankAttacker; sub_803E1B0(&gEnemyParty[gBattlePartyID[gBankAttacker]], gLastUsedItem, gBattlePartyID[gBankAttacker], 0, 1); @@ -12073,7 +12073,7 @@ static void atk76_various(void) gBattlescriptCurrInstr += 3; } -static void atk77_setprotect(void) //protect and endure +static void atk77_setprotectlike(void) //protect and endure { bool8 not_last_turn = 1; u16 last_move = gUnknown_02024C4C[gBankAttacker]; @@ -12138,7 +12138,7 @@ static void atk78_faintifabilitynotdamp(void) { gLastUsedAbility = ABILITY_DAMP; RecordAbilityBattle(gBankTarget, gBattleMons[gBankTarget].ability); - gBattlescriptCurrInstr = gUnknown_081D9834; + gBattlescriptCurrInstr = BattleScript_DampStopsExplosion; } } @@ -12155,7 +12155,7 @@ static void atk79_setatkhptozero(void) gBattlescriptCurrInstr++; } -static void atk7A_jumpwhiletargetvalid(void) //used by intimidate to loop through all targets +static void atk7A_jumpifnexttargetvalid(void) //used by intimidate to loop through all targets { u8* jump_loc = T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -12178,7 +12178,7 @@ static void atk7A_jumpwhiletargetvalid(void) //used by intimidate to loop throug gBattlescriptCurrInstr += 5; } -static void atk7B_healhalfHP_if_possible(void) +static void atk7B_tryhealhalfhealth(void) { u8* fail_loc = T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -12196,7 +12196,7 @@ static void atk7B_healhalfHP_if_possible(void) gBattlescriptCurrInstr += 6; } -static void atk7C_8025508(void) +static void atk7C_trymirrormove(void) { u16 r7 = ewram160ACarr2(0, gBankAttacker) | (ewram160ACarr2(1, gBankAttacker) << 8); u16 r6 = ewram16100arr2(0, gBankAttacker) | (ewram16100arr2(1, gBankAttacker) << 8); @@ -12207,7 +12207,7 @@ static void atk7C_8025508(void) gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); gCurrentMove = r7; gBankTarget = GetMoveTarget(gCurrentMove, 0); - gBattlescriptCurrInstr = gBattleScriptsEffectsTable[gBattleMoves[gCurrentMove].effect]; + gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]; } else if (r6 != 0 && r5 != 0 && r6 != 0xFFFF && r5 != 0xFFFF) { @@ -12217,21 +12217,21 @@ static void atk7C_8025508(void) else gCurrentMove = r5; gBankTarget = GetMoveTarget(gCurrentMove, 0); - gBattlescriptCurrInstr = gBattleScriptsEffectsTable[gBattleMoves[gCurrentMove].effect]; + gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]; } else if (r6 != 0 && r6 != 0xFFFF) { gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); gCurrentMove = r6; gBankTarget = GetMoveTarget(gCurrentMove, 0); - gBattlescriptCurrInstr = gBattleScriptsEffectsTable[gBattleMoves[gCurrentMove].effect]; + gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]; } else if (r5 != 0 && r5 != 0xFFFF) { gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); gCurrentMove = r5; gBankTarget = GetMoveTarget(gCurrentMove, 0); - gBattlescriptCurrInstr = gBattleScriptsEffectsTable[gBattleMoves[gCurrentMove].effect]; + gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]; } else { @@ -12240,7 +12240,7 @@ static void atk7C_8025508(void) } } -static void atk7D_set_rain(void) +static void atk7D_setrain(void) { if (gBattleWeather & WEATHER_RAIN_ANY) { @@ -12319,7 +12319,7 @@ static void atk80_manipulatedamage(void) gBattlescriptCurrInstr += 2; } -static void atk81_setrest(void) +static void atk81_trysetrest(void) { u8* fail_loc = T1_READ_PTR(gBattlescriptCurrInstr + 1); gActiveBank = gBankTarget = gBankAttacker; @@ -12377,7 +12377,7 @@ bool8 UproarWakeUpCheck(u8 bank) return 1; } -static void atk84_jump_if_cant_sleep(void) +static void atk84_jumpifcantmakeasleep(void) { u8* jump_loc = T1_READ_PTR(gBattlescriptCurrInstr + 1); if (UproarWakeUpCheck(gBankTarget)) @@ -13264,7 +13264,7 @@ static void atk8C_confuseifrepeatingattackends(void) gBattlescriptCurrInstr++; } -static void atk8D_setmultihit_counter(void) +static void atk8D_setmultihitcounter(void) { if (T2_READ_8(gBattlescriptCurrInstr + 1)) gMultiHitCounter = T2_READ_8(gBattlescriptCurrInstr + 1); @@ -13279,7 +13279,7 @@ static void atk8D_setmultihit_counter(void) gBattlescriptCurrInstr += 2; } -static void atk8E_prepare_multihit(void) +static void atk8E_initmultihitstring(void) { ewram160E0(0) = 0xFD; ewram160E0(1) = 1; @@ -13306,7 +13306,7 @@ static bool8 sub_80264C0(void) } ewram16064arr(gBankTarget) = gBattlePartyID[gBankTarget]; } - gBattlescriptCurrInstr = gUnknown_081D90FC; + gBattlescriptCurrInstr = BattleScript_SuccessForceOut; return 1; } @@ -13399,7 +13399,7 @@ static void atk8F_forcerandomswitch(void) } } -static void atk90_conversion_type_change(void) +static void atk90_tryconversiontypechange(void) { //randomly changes user's type to one of its moves' type u8 valid_moves = 0; @@ -13472,7 +13472,7 @@ static void atk91_givepaydaymoney(void) gBattleTextBuff1[5] = uBYTE1_16(gPaydayMoney); gBattleTextBuff1[6] = 0xFF; b_movescr_stack_push(gBattlescriptCurrInstr + 1); - gBattlescriptCurrInstr = gUnknown_081D95DB; + gBattlescriptCurrInstr = BattleScript_PrintPayDayMoneyString; } else gBattlescriptCurrInstr++; @@ -13498,7 +13498,7 @@ static void atk92_setlightscreen(void) } #ifdef NOTMATCHING -static void atk93_ko_move(void) +static void atk93_tryKO(void) { if (gBattleMons[gBankTarget].item == ITEM_ENIGMA_BERRY) hold_effect = gEnigmaBerries[gBankTarget].holdEffect, quality = gEnigmaBerries[gBankTarget].holdEffectParam; @@ -13552,7 +13552,7 @@ MOVESTATUS_MISSED_LABEL: #else __attribute((naked)) -static void atk93_ko_move(void) +static void atk93_tryKO(void) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ @@ -13647,7 +13647,7 @@ _08026C0C:\n\ ldr r0, _08026C60 @ =gLastUsedAbility\n\ strb r3, [r0]\n\ ldr r1, _08026C64 @ =gBattlescriptCurrInstr\n\ - ldr r0, _08026C68 @ =gUnknown_081D9826\n\ + ldr r0, _08026C68 @ =BattleScript_SturdyPreventsOHKO\n\ str r0, [r1]\n\ ldr r1, _08026C50 @ =gBankTarget\n\ ldrb r0, [r1]\n\ @@ -13662,7 +13662,7 @@ _08026C58: .4byte gBattleMons\n\ _08026C5C: .4byte gBattleMoveFlags\n\ _08026C60: .4byte gLastUsedAbility\n\ _08026C64: .4byte gBattlescriptCurrInstr\n\ -_08026C68: .4byte gUnknown_081D9826\n\ +_08026C68: .4byte BattleScript_SturdyPreventsOHKO\n\ _08026C6C:\n\ ldr r1, _08026CE0 @ =gStatuses3\n\ lsls r0, r2, 2\n\ @@ -13903,7 +13903,7 @@ _08026E54: .4byte gBattlescriptCurrInstr\n\ } #endif // NOTMATCHING -static void atk94_gethalfcurrentenemyhp(void) //super fang +static void atk94_damagetohalftargethp(void) //super fang { gBattleMoveDamage = gBattleMons[gBankTarget].hp / 2; if (gBattleMoveDamage == 0) @@ -13969,7 +13969,7 @@ static void atk96_weatherdamage(void) gBattlescriptCurrInstr++; } -static void atk97_try_infatuation(void) +static void atk97_tryinfatuating(void) { struct Pokemon *attacker, *target; u16 atk_species, def_species; @@ -14012,7 +14012,7 @@ static void atk97_try_infatuation(void) } } -static void atk98_status_icon_update(void) +static void atk98_updatestatusicon(void) { if (gBattleExecBuffer) return; @@ -14061,7 +14061,7 @@ static void atk99_setmist(void) gBattlescriptCurrInstr++; } -static void atk9A_set_focusenergy(void) +static void atk9A_setfocusenergy(void) { if (gBattleMons[gBankAttacker].status2 & STATUS2_FOCUS_ENERGY) { @@ -14078,7 +14078,7 @@ static void atk9A_set_focusenergy(void) static void atk9B_transformdataexecution(void) { - gUnknown_02024BE8 = 0xFFFF; + gChosenMove = 0xFFFF; gBattlescriptCurrInstr++; if (gBattleMons[gBankTarget].status2 & STATUS2_TRANSFORMED || gStatuses3[gBankTarget] & STATUS3_SEMI_INVULNERABLE) { @@ -14092,7 +14092,7 @@ static void atk9B_transformdataexecution(void) gBattleMons[gBankAttacker].status2 |= STATUS2_TRANSFORMED; gDisableStructs[gBankAttacker].disabledMove = 0; gDisableStructs[gBankAttacker].disableTimer1 = 0; - gDisableStructs[gBankAttacker].unk0 = gBattleMons[gBankTarget].personality; + gDisableStructs[gBankAttacker].transformedMonPersonality = gBattleMons[gBankTarget].personality; gDisableStructs[gBankAttacker].unk18_b = 0; gBattleTextBuff1[0] = 0xFD; @@ -14122,7 +14122,7 @@ static void atk9B_transformdataexecution(void) } } -static void atk9C_set_substitute(void) +static void atk9C_setsubstitute(void) { u32 hp = gBattleMons[gBankAttacker].maxHP / 4; if (gBattleMons[gBankAttacker].maxHP / 4 == 0) @@ -14153,9 +14153,9 @@ static bool8 IsMoveUncopyable(u16 move) return (sUnknown_081FACFE[i] != 0xFFFE); } -static void atk9D_copyattack(void) +static void atk9D_mimicattackcopy(void) { - gUnknown_02024BE8 = 0xFFFF; + gChosenMove = 0xFFFF; if (IsMoveUncopyable(gLastUsedMove[gBankTarget]) || gBattleMons[gBankAttacker].status2 & STATUS2_TRANSFORMED || gLastUsedMove[gBankTarget] == 0 || gLastUsedMove[gBankTarget] == 0xFFFF) { @@ -14203,7 +14203,7 @@ static void atk9E_metronome(void) } while (sUnknown_081FACFE[i] != 0xFFFF); gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); - gBattlescriptCurrInstr = gBattleScriptsEffectsTable[gBattleMoves[gCurrentMove].effect]; + gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]; gBankTarget = GetMoveTarget(gCurrentMove, 0); } @@ -14255,7 +14255,7 @@ _080278F8:\n\ ldr r1, _08027950 @ =0xfffffbff\n\ ands r0, r1\n\ str r0, [r2]\n\ - ldr r3, _08027954 @ =gBattleScriptsEffectsTable\n\ + ldr r3, _08027954 @ =gBattleScriptsForMoveEffects\n\ ldr r2, _08027958 @ =gBattleMoves\n\ ldrh r1, [r4]\n\ lsls r0, r1, 1\n\ @@ -14286,7 +14286,7 @@ _08027944: .4byte 0x000001ff\n\ _08027948: .4byte 0x0000ffff\n\ _0802794C: .4byte gHitMarker\n\ _08027950: .4byte 0xfffffbff\n\ -_08027954: .4byte gBattleScriptsEffectsTable\n\ +_08027954: .4byte gBattleScriptsForMoveEffects\n\ _08027958: .4byte gBattleMoves\n\ _0802795C: .4byte gBankTarget\n\ .syntax divided"); @@ -14375,7 +14375,7 @@ static void atkA3_disablelastusedattack(void) } } -static void atkA4_setencore(void) +static void atkA4_trysetencore(void) { int i; for (i = 0; i < 4; i++) @@ -14742,7 +14742,7 @@ struct move_pp static void atkA8_copymovepermanently(void) { - gUnknown_02024BE8 = 0xFFFF; + gChosenMove = 0xFFFF; if (!(gBattleMons[gBankAttacker].status2 & STATUS2_TRANSFORMED) && gUnknown_02024C2C[gBankTarget] != MOVE_STRUGGLE && gUnknown_02024C2C[gBankTarget] != 0 && gUnknown_02024C2C[gBankTarget] != 0xFFFF && gUnknown_02024C2C[gBankTarget] != MOVE_SKETCH) { int i; @@ -14813,7 +14813,7 @@ static u8 AttacksThisTurn(u8 bank, u16 move) //Note: returns 1 if it's a chargin return 2; } -static void atkA9_sleeptalk_choose_move(void) +static void atkA9_trychoosesleeptalkmove(void) { u8 unusable_moves = 0; int i; @@ -14843,7 +14843,7 @@ static void atkA9_sleeptalk_choose_move(void) } } -static void atkAA_set_destinybond(void) +static void atkAA_setdestinybond(void) { gBattleMons[gBankAttacker].status2 |= STATUS2_DESTINY_BOND; gBattlescriptCurrInstr++; @@ -14857,7 +14857,7 @@ static void DestinyBondFlagUpdate(void) gHitMarker |= HITMARKER_DESTINYBOND; } -static void atkAB_DestinyBondFlagUpdate(void) +static void atkAB_trysetdestinybondtohappen(void) { DestinyBondFlagUpdate(); gBattlescriptCurrInstr++; @@ -14876,7 +14876,7 @@ static void atkAC_remaininghptopower(void) gBattlescriptCurrInstr++; } -static void atkAD_spite_ppreduce(void) +static void atkAD_tryspiteppreduce(void) { if (gLastUsedMove[gBankTarget] != 0 && gLastUsedMove[gBankTarget] != 0xFFFF && !(gStatuses3[gBankTarget] & STATUS3_SEMI_INVULNERABLE)) { @@ -14922,7 +14922,7 @@ static void atkAD_spite_ppreduce(void) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } -static void atkAE_heal_party_status(void) +static void atkAE_healpartystatus(void) { register u32 zero2 asm("r4") = 0; u32 zero = zero2; @@ -15015,7 +15015,7 @@ static void atkAF_cursetarget(void) } } -static void atkB0_set_spikes(void) +static void atkB0_trysetspikes(void) { u8 side = GetBankSide(gBankAttacker) ^ 1; if (gSideTimer[side].spikesAmount == 3) @@ -15031,13 +15031,13 @@ static void atkB0_set_spikes(void) } } -static void atkB1_set_foresight(void) +static void atkB1_setforesight(void) { gBattleMons[gBankTarget].status2 |= STATUS2_FORESIGHT; gBattlescriptCurrInstr++; } -static void atkB2_setperishsong(void) +static void atkB2_trysetperishsong(void) { int not_affected_pokes = 0, i; @@ -15065,7 +15065,7 @@ static void atkB3_rolloutdamagecalculation(void) if (gBattleMoveFlags & MOVESTATUS_NOEFFECT) { CancelMultiTurnMoves(gBankAttacker); - gBattlescriptCurrInstr = BattleScript_1D6F74; + gBattlescriptCurrInstr = BattleScript_MoveMissedPause; } else { @@ -15104,7 +15104,7 @@ static void atkB5_furycuttercalc(void) if (gBattleMoveFlags & MOVESTATUS_NOEFFECT) { gDisableStructs[gBankAttacker].furyCutterCounter = 0; - gBattlescriptCurrInstr = BattleScript_1D6F74; + gBattlescriptCurrInstr = BattleScript_MoveMissedPause; } else { @@ -15147,17 +15147,17 @@ static void atkB7_presentdamagecalculation(void) gBattleMoveDamage *= -1; } if (rand < 204) - gBattlescriptCurrInstr = BattleScript_1D6F44; + gBattlescriptCurrInstr = BattleScript_HitFromCritCalc; else if (gBattleMons[gBankTarget].maxHP == gBattleMons[gBankTarget].hp) - gBattlescriptCurrInstr = BattleScript_1D83B5; + gBattlescriptCurrInstr = BattleScript_AlreadyAtFullHp; else { //gBattleMoveFlags &= ~(MOVESTATUS_NOTAFFECTED); only in Emerald - gBattlescriptCurrInstr = BattleScript_1D839B; + gBattlescriptCurrInstr = BattleScript_PresentHealTarget; } } -static void atkB8_set_safeguard(void) +static void atkB8_setsafeguard(void) { if (gSideAffecting[GetBankIdentity(gBankAttacker) & 1] & SIDE_STATUS_SAFEGUARD) { @@ -15310,7 +15310,7 @@ static void atkBD_copyfoestats(void) //psych up gBattlescriptCurrInstr += 5; //why not 1? possible unused fail possibility? } -static void atkBE_breakfree(void) //rapid spin +static void atkBE_rapidspinfree(void) //rapid spin { if (gBattleMons[gBankAttacker].status2 & STATUS2_WRAPPED) { @@ -15342,7 +15342,7 @@ static void atkBE_breakfree(void) //rapid spin gBattlescriptCurrInstr++; } -static void atkBF_set_defense_curl(void) +static void atkBF_setdefensecurlbit(void) { gBattleMons[gBankAttacker].status2 |= STATUS2_DEFENSE_CURL; gBattlescriptCurrInstr++; @@ -15371,7 +15371,7 @@ static void atkC0_recoverbasedonsunlight(void) } __attribute__((naked)) -static void atkC1_hidden_power(void) +static void atkC1_hiddenpowercalc(void) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ @@ -15519,7 +15519,7 @@ _080298A8: .4byte gBattlescriptCurrInstr\n\ .syntax divided"); } -static void atkC2_selectnexttarget(void) +static void atkC2_selectfirstvalidtarget(void) { for (gBankTarget = 0; gBankTarget < gNoOfAllBanks; gBankTarget++) { @@ -15531,7 +15531,7 @@ static void atkC2_selectnexttarget(void) gBattlescriptCurrInstr++; } -static void atkC3_setfutureattack(void) +static void atkC3_trysetfutureattack(void) { if (gWishFutureKnock.futureSightCounter[gBankTarget] != 0) { @@ -15559,7 +15559,7 @@ static void atkC3_setfutureattack(void) } #ifdef NONMATCHING -static void atkC4_beat_up(void) +static void atkC4_trydobeatup(void) { register struct Pokemon* party asm("r7"); if (GetBankSide(gBankAttacker) == 0) @@ -15605,7 +15605,7 @@ static void atkC4_beat_up(void) } #else __attribute__((naked)) -static void atkC4_beat_up(void) +static void atkC4_trydobeatup(void) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ @@ -15858,7 +15858,7 @@ _08029C54: .4byte gBattlescriptCurrInstr\n\ } #endif // NONMATCHING -static void atkC5_hidepreattack(void) +static void atkC5_setsemiinvulnerablebit(void) { switch (gCurrentMove) { @@ -15876,7 +15876,7 @@ static void atkC5_hidepreattack(void) gBattlescriptCurrInstr++; } -static void atkC6_unhidepostattack(void) +static void atkC6_clearsemiinvulnerablebit(void) { switch (gCurrentMove) { @@ -15953,7 +15953,7 @@ static void atkCC_callterrainattack(void) //nature power gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); gCurrentMove = sNaturePowerMoves[gBattleTerrain]; gBankTarget = GetMoveTarget(gCurrentMove, 0); - b_movescr_stack_push(gBattleScriptsEffectsTable[gBattleMoves[gCurrentMove].effect]); + b_movescr_stack_push(gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]); gBattlescriptCurrInstr++; } @@ -16002,7 +16002,7 @@ static void atkD0_settaunt(void) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } -static void atkD1_set_helpinghand(void) +static void atkD1_trysethelpinghand(void) { gBankTarget = GetBankByPlayerAI(GetBankIdentity(gBankAttacker) ^ 2); if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gAbsentBankFlags & gBitTable[gBankTarget]) @@ -16016,7 +16016,7 @@ static void atkD1_set_helpinghand(void) } #ifdef NONMATCHING -static void atkD2_swap_items(void) +static void atkD2_tryswapitems(void) { if ((GetBankSide(gBankAttacker) != 1 || gBattleTypeFlags & (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER) || gTrainerBattleOpponent == 0x400)) { @@ -16029,7 +16029,7 @@ static void atkD2_swap_items(void) #else __attribute__((naked)) -static void atkD2_swap_items(void) +static void atkD2_tryswapitems(void) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ @@ -16348,7 +16348,7 @@ _0802A4AC: .4byte gBattleCommunication\n\ } #endif // NONMATCHING -static void atkD3_copy_ability(void) //role play +static void atkD3_trycopyability(void) //role play { if (gBattleMons[gBankTarget].ability != 0 && gBattleMons[gBankTarget].ability != ABILITY_WONDER_GUARD) { @@ -16360,7 +16360,7 @@ static void atkD3_copy_ability(void) //role play gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } -static void atkD4_wish_effect(void) +static void atkD4_trywish(void) { switch (T2_READ_8(gBattlescriptCurrInstr + 1)) { @@ -16392,7 +16392,7 @@ static void atkD4_wish_effect(void) } } -static void atkD5_setroots(void) //ingrain +static void atkD5_trysetroots(void) //ingrain { if (gStatuses3[gBankAttacker] & STATUS3_ROOTED) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -16447,7 +16447,7 @@ static void atkD9_scaledamagebyhealthratio(void) gBattlescriptCurrInstr++; } -static void atkDA_abilityswap(void) +static void atkDA_tryswapabilities(void) { if ((gBattleMons[gBankAttacker].ability == 0 && gBattleMons[gBankTarget].ability == 0) || gBattleMons[gBankAttacker].ability == ABILITY_WONDER_GUARD || gBattleMons[gBankTarget].ability == ABILITY_WONDER_GUARD @@ -16462,7 +16462,7 @@ static void atkDA_abilityswap(void) } } -static void atkDB_imprisoneffect(void) +static void atkDB_tryimprision(void) { u8 r8 = 0; if ((gStatuses3[gBankAttacker] & STATUS3_IMPRISIONED)) @@ -16502,7 +16502,7 @@ static void atkDB_imprisoneffect(void) } } -static void atkDC_setgrudge(void) +static void atkDC_trysetgrudge(void) { if (gStatuses3[gBankAttacker] & STATUS3_GRUDGE) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -16770,7 +16770,7 @@ _0802ABF8: .4byte gBattlescriptCurrInstr\n\ #endif // NONMATCHING -static void atkDF_setmagiccoat(void) +static void atkDF_trysetmagiccoat(void) { gBankTarget = gBankAttacker; gSpecialStatuses[gBankAttacker].flag20 = 1; @@ -16783,7 +16783,7 @@ static void atkDF_setmagiccoat(void) } } -static void atkE0_setstealstatchange(void) +static void atkE0_trysetsnatch(void) { gSpecialStatuses[gBankAttacker].flag20 = 1; if (gCurrentMoveTurn == gNoOfAllBanks - 1) //last turn @@ -16795,7 +16795,7 @@ static void atkE0_setstealstatchange(void) } } -static void atkE1_intimidate_string_loader(void) +static void atkE1_trygetintimidatetarget(void) { u8 side; @@ -16820,7 +16820,7 @@ static void atkE1_intimidate_string_loader(void) gBattlescriptCurrInstr += 5; } -static void atkE2_switchout_abilities(void) +static void atkE2_switchoutabilities(void) { gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); switch (gBattleMons[gActiveBank].ability) @@ -16834,7 +16834,7 @@ static void atkE2_switchout_abilities(void) gBattlescriptCurrInstr += 2; } -static void atkE3_jumpiffainted(void) +static void atkE3_jumpifhasnohp(void) { gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); if (gBattleMons[gActiveBank].hp == 0) @@ -16906,7 +16906,7 @@ static void atkE5_pickup(void) gBattlescriptCurrInstr++; } -static void atkE6_castform_change_animation(void) +static void atkE6_docastformchangeanimation(void) { gActiveBank = BATTLE_STRUCT->scriptingActive; if (gBattleMons[gActiveBank].status2 & STATUS2_SUBSTITUTE) @@ -16916,7 +16916,7 @@ static void atkE6_castform_change_animation(void) gBattlescriptCurrInstr++; } -static void atkE7_castform_data_change(void) +static void atkE7_trycastformdatachange(void) { u8 form; gBattlescriptCurrInstr++; @@ -16975,7 +16975,7 @@ static void atkE9_setweatherballtype(void) gBattlescriptCurrInstr++; } -static void atkEA_recycleitem(void) +static void atkEA_tryrecycleitem(void) { u16* used_item; gActiveBank = gBankAttacker; @@ -17009,7 +17009,7 @@ static void atkEB_settypetoterrain(void) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } -static void atkEC_pursuit_sth(void) +static void atkEC_pursuitrelated(void) { gActiveBank = GetBankByPlayerAI(GetBankIdentity(gBankAttacker) ^ 2); if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gAbsentBankFlags & gBitTable[gActiveBank]) && gActionForBanks[gActiveBank] == 0 && gChosenMovesByBanks[gActiveBank] == MOVE_PURSUIT) @@ -17025,7 +17025,7 @@ static void atkEC_pursuit_sth(void) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } -static void atkED_802B4B4(void) +static void atkED_snatchsetbanks(void) { gEffectBank = gBankAttacker; if (gBankAttacker == gBankTarget) @@ -17056,7 +17056,7 @@ static void atkEE_removelightscreenreflect(void) //brick break gBattlescriptCurrInstr++; } -void atkEF_pokeball_catch_calculation(void) +void atkEF_handleballthrow(void) { u8 ball_multiplier = 0; if (gBattleExecBuffer) @@ -17187,7 +17187,7 @@ void atkEF_pokeball_catch_calculation(void) } } -static void atkF0_copy_caught_poke(void) +static void atkF0_givecaughtmon(void) { GiveMonToPlayer(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]]); gBattleResults.caughtPoke = gBattleMons[gBankAttacker ^ 1].species; @@ -17195,7 +17195,7 @@ static void atkF0_copy_caught_poke(void) gBattlescriptCurrInstr++; } -static void atkF1_setpoke_as_caught(void) +static void atkF1_trysetcaughtmondexflags(void) { if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gBankTarget].species), 1)) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -17214,7 +17214,7 @@ extern const u32 gBattleTerrainTiles_Building[]; extern const u32 gBattleTerrainTilemap_Building[]; extern const u32 gBattleTerrainPalette_BattleTower[]; -static void atkF2_display_dex_info(void) +static void atkF2_displaydexinfo(void) { switch (gBattleCommunication[0]) { @@ -17348,7 +17348,7 @@ void nullsub_6(void) return; } -static void atkF3_nickname_caught_poke(void) +static void atkF3_trygivecaughtmonnick(void) { switch (gBattleCommunication[0]) { @@ -17414,7 +17414,7 @@ static void atkF3_nickname_caught_poke(void) } } -static void atkF4_802BEF0(void) +static void atkF4_subattackerhpbydmg(void) { gBattleMons[gBankAttacker].hp -= gBattleMoveDamage; gBattlescriptCurrInstr++; @@ -17426,12 +17426,12 @@ static void atkF5_removeattackerstatus1(void) gBattlescriptCurrInstr++; } -static void atkF6_802BF48(void) +static void atkF6_finishaction(void) { gFightStateTracker = 0xC; } -static void atkF7_802BF54(void) +static void atkF7_finishturn(void) { gFightStateTracker = 0xC; gCurrentMoveTurn = gNoOfAllBanks; diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c index 5a30e012d..7ca9ac3c4 100644 --- a/src/battle/battle_7.c +++ b/src/battle/battle_7.c @@ -28,7 +28,7 @@ extern u8 gBanksBySide[]; extern u8 gObjectBankIDs[]; extern u16 gUnknown_02024DE8; extern u8 gDoingBattleAnim; -extern u32 gPID_perBank[]; +extern u32 gTransformedPersonalities[]; extern struct Window gUnknown_03004210; extern void (*gBattleBankFunc[])(void); extern u8 gHealthboxIDs[]; @@ -39,8 +39,8 @@ extern struct MusicPlayerInfo gMPlay_BGM; extern u32 gBitTable[]; extern u16 gBattleTypeFlags; extern u8 gBattleMonForms[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern void (*gAnimScriptCallback)(void); extern u8 gAnimScriptActive; extern const u8 *const gBattleAnims_General[]; @@ -66,8 +66,8 @@ extern void c3_0802FDF4(u8); extern void sub_80440EC(); extern void sub_804777C(); extern void sub_8141828(); -extern u8 sub_8077ABC(); -extern u8 AnimBankSpriteExists(u8); +extern u8 GetBankPosition(); +extern u8 IsBankSpritePresent(u8); extern u8 sub_8077F68(u8); extern u8 sub_8077F7C(u8); extern void sub_8094958(void); @@ -174,10 +174,10 @@ bool8 move_anim_start_t3(u8 a, u8 b, u8 c, u8 d, u16 e) sub_80324E0(a); return TRUE; } - gBattleAnimBankAttacker = b; - gBattleAnimBankTarget = c; + gAnimBankAttacker = b; + gAnimBankTarget = c; ewram17840.unk0 = e; - DoMoveAnim(gBattleAnims_General, d, 0); + LaunchBattleAnimation(gBattleAnims_General, d, 0); taskId = CreateTask(sub_80315E8, 10); gTasks[taskId].data[0] = a; ewram17810[gTasks[taskId].data[0]].unk0_5 = 1; @@ -214,9 +214,9 @@ void move_anim_start_t4(u8 a, u8 b, u8 c, u8 d) { u8 taskId; - gBattleAnimBankAttacker = b; - gBattleAnimBankTarget = c; - DoMoveAnim(gBattleAnims_Special, d, 0); + gAnimBankAttacker = b; + gAnimBankTarget = c; + LaunchBattleAnimation(gBattleAnims_Special, d, 0); taskId = CreateTask(sub_80316CC, 10); gTasks[taskId].data[0] = a; ewram17810[gTasks[taskId].data[0]].unk0_6 = 1; @@ -276,7 +276,7 @@ void BattleLoadOpponentMonSprite(struct Pokemon *pkmn, u8 b) else { species = ewram17800[b].transformedSpecies; - r7 = gPID_perBank[b]; + r7 = gTransformedPersonalities[b]; } otId = GetMonData(pkmn, MON_DATA_OT_ID); var = GetBankIdentity(b); @@ -328,7 +328,7 @@ void BattleLoadPlayerMonSprite(struct Pokemon *pkmn, u8 b) else { species = ewram17800[b].transformedSpecies; - r7 = gPID_perBank[b]; + r7 = gTransformedPersonalities[b]; } otId = GetMonData(pkmn, MON_DATA_OT_ID); var = GetBankIdentity(b); @@ -626,7 +626,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) const void *src; void *dst; - if (NotInBattle()) + if (IsContest()) { r10 = 0; species = ewram19348.unk2; @@ -659,7 +659,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) eVoidSharedArr2, gUnknown_081FAF4C[r10], species, - gPID_perBank[a]); + gTransformedPersonalities[a]); } else { @@ -672,7 +672,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) eVoidSharedArr2, gUnknown_081FAF4C[r10], species, - gPID_perBank[a]); + gTransformedPersonalities[a]); } } src = gUnknown_081FAF4C[r10]; @@ -691,7 +691,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) } BlendPalette(paletteOffset, 16, 6, 0x7FFF); CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32); - if (!NotInBattle()) + if (!IsContest()) { ewram17800[a].transformedSpecies = species; gBattleMonForms[a] = gBattleMonForms[b]; @@ -711,11 +711,11 @@ void BattleLoadSubstituteSprite(u8 a, u8 b) if (b == 0) { - if (NotInBattle()) + if (IsContest()) r4 = 0; else r4 = GetBankIdentity(a); - if (NotInBattle()) + if (IsContest()) LZDecompressVram(gSubstituteDollTilemap, gUnknown_081FAF4C[r4]); else if (GetBankSide(a) != 0) LZDecompressVram(gSubstituteDollGfx, gUnknown_081FAF4C[r4]); @@ -731,7 +731,7 @@ void BattleLoadSubstituteSprite(u8 a, u8 b) } else { - if (!NotInBattle()) + if (!IsContest()) { if (GetBankSide(a) != 0) BattleLoadOpponentMonSprite(&gEnemyParty[gBattlePartyID[a]], a); @@ -835,7 +835,7 @@ void sub_80326EC(u8 a) for (i = 0; i < gNoOfAllBanks; i++) { - if (AnimBankSpriteExists(i) != 0) + if (IsBankSpritePresent(i) != 0) { gSprites[gObjectBankIDs[i]].oam.affineMode = a; if (a == 0) @@ -857,12 +857,12 @@ void sub_80327CC(void) LoadCompressedObjectPic(&gUnknown_081FAF24); r5 = GetBankByPlayerAI(1); - ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, sub_8077ABC(r5, 0), sub_8077ABC(r5, 1) + 32, 0xC8); + ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, GetBankPosition(r5, 0), GetBankPosition(r5, 1) + 32, 0xC8); gSprites[ewram17810[r5].unk7].data[0] = r5; if (IsDoubleBattle()) { r5 = GetBankByPlayerAI(3); - ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, sub_8077ABC(r5, 0), sub_8077ABC(r5, 1) + 32, 0xC8); + ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, GetBankPosition(r5, 0), GetBankPosition(r5, 1) + 32, 0xC8); gSprites[ewram17810[r5].unk7].data[0] = r5; } } @@ -873,7 +873,7 @@ void sub_80328A4(struct Sprite *sprite) u8 r4 = sprite->data[0]; struct Sprite *r7 = &gSprites[gObjectBankIDs[r4]]; - if (!r7->inUse || AnimBankSpriteExists(r4) == 0) + if (!r7->inUse || IsBankSpritePresent(r4) == 0) { sprite->callback = sub_8032978; return; diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c index 1a78b2863..8242a1ddd 100644 --- a/src/battle/battle_anim.c +++ b/src/battle/battle_anim.c @@ -17,42 +17,45 @@ // sprites start at 10000 and thus must be subtracted of 10000 to account for the true index. #define GET_TRUE_SPRITE_INDEX(i) (i - 10000) +#define ANIM_SPRITE_INDEX_COUNT 8 +#define ANIM_ARGS_COUNT 8 + extern u16 gBattlePartyID[4]; extern u8 gObjectBankIDs[]; extern u8 gBankAttacker; extern u8 gBankTarget; -EWRAM_DATA const u8 *gBattleAnimScriptPtr = NULL; +EWRAM_DATA const u8 *sBattleAnimScriptPtr = NULL; EWRAM_DATA const u8 *gBattleAnimScriptRetAddr = NULL; EWRAM_DATA void (*gAnimScriptCallback)(void) = NULL; EWRAM_DATA s8 gAnimFramesToWait = 0; EWRAM_DATA u8 gAnimScriptActive = FALSE; EWRAM_DATA u8 gAnimVisualTaskCount = 0; EWRAM_DATA u8 gAnimSoundTaskCount = 0; -EWRAM_DATA u32 gDisableStructMoveAnim = 0; -EWRAM_DATA u32 gMoveDmgMoveAnim = 0; -EWRAM_DATA u16 gMovePowerMoveAnim = 0; -EWRAM_DATA u8 gHappinessMoveAnim = 0; +EWRAM_DATA struct DisableStruct *gAnimDisableStructPtr = NULL; +EWRAM_DATA u32 gAnimMoveDmg = 0; +EWRAM_DATA u16 gAnimMovePower = 0; +EWRAM_DATA u8 gAnimFriendship = 0; EWRAM_DATA u16 gWeatherMoveAnim = 0; EWRAM_DATA u8 gMonAnimTaskIdArray[2] = {0}; -EWRAM_DATA u8 gUnknown_0202F7C4 = 0; -EWRAM_DATA u8 gUnknown_0202F7C5 = 0; -EWRAM_DATA u16 gAnimMoveIndex = 0; // set but unused. -EWRAM_DATA u8 gBattleAnimBankAttacker = 0; -EWRAM_DATA u8 gBattleAnimBankTarget = 0; -EWRAM_DATA u16 gUnknown_0202F7CA[4] = {0}; +EWRAM_DATA u8 gAnimMoveTurn = 0; +EWRAM_DATA u8 sAnimBackgroundFadeState = 0; +EWRAM_DATA u16 sAnimMoveIndex = 0; // set but unused. +EWRAM_DATA u8 gAnimBankAttacker = 0; +EWRAM_DATA u8 gAnimBankTarget = 0; +EWRAM_DATA u16 gAnimSpeciesByBanks[4] = {0}; EWRAM_DATA u8 gUnknown_0202F7D2 = 0; -extern u16 gUnknown_030041B4; -extern u16 gUnknown_03004200; -extern u16 gUnknown_03004240; -extern u16 gUnknown_03004244; -extern u16 gUnknown_03004280; -extern u16 gUnknown_03004288; -extern u16 gUnknown_030042C0; -extern u16 gUnknown_030042C4; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_WIN1H; +extern u16 gBattle_WIN0V; +extern u16 gBattle_WIN1V; +extern u16 gBattle_BG2_Y; +extern u16 gBattle_BG2_X; +extern u16 gBattle_BG1_X; +extern u16 gBattle_WIN0H; u16 gSoundAnimFramesToWait; -s16 gBattleAnimArgs[8]; -u16 gAnimSpriteIndexArray[8]; +s16 gBattleAnimArgs[ANIM_ARGS_COUNT]; +u16 gAnimSpriteIndexArray[ANIM_SPRITE_INDEX_COUNT]; extern struct MusicPlayerInfo gMPlay_BGM; extern struct MusicPlayerInfo gMPlay_SE1; @@ -65,10 +68,10 @@ extern const struct CompressedSpritePalette gBattleAnimPaletteTable[]; extern const struct BattleAnimBackground gBattleAnimBackgroundTable[]; static void RunAnimScriptCommand(void); -static void ScriptCmd_loadsprite(void); -static void ScriptCmd_unloadsprite(void); -static void ScriptCmd_sprite(void); -static void ScriptCmd_createtask(void); +static void ScriptCmd_loadspritegfx(void); +static void ScriptCmd_unloadspritegfx(void); +static void ScriptCmd_createsprite(void); +static void ScriptCmd_createvisualtask(void); static void ScriptCmd_delay(void); static void ScriptCmd_waitforvisualfinish(void); static void ScriptCmd_hang1(void); @@ -88,33 +91,33 @@ static void ScriptCmd_setbldcnt(void); static void ScriptCmd_blendoff(void); static void ScriptCmd_call(void); static void ScriptCmd_return(void); -static void ScriptCmd_setvar(void); -static void ScriptCmd_ifelse(void); -static void ScriptCmd_jumpif(void); +static void ScriptCmd_setarg(void); +static void ScriptCmd_choosetwoturnanim(void); +static void ScriptCmd_jumpifmoveturn(void); static void ScriptCmd_jump(void); static void ScriptCmd_fadetobg(void); -static void ScriptCmd_fadetobg_25(void); -static void task_p5_load_battle_screen_elements(u8); -static void sub_8076DB8(u16); -static void dp01t_11_3_message_for_player_only(void); +static void ScriptCmd_fadetobgfromset(void); +static void Task_FadeToBg(u8); +static void LoadMoveBg(u16); +static void LoadDefaultBg(void); static void ScriptCmd_restorebg(void); static void ScriptCmd_waitbgfadeout(void); static void ScriptCmd_waitbgfadein(void); static void ScriptCmd_changebg(void); -static void ScriptCmd_panse_19(void); +static void ScriptCmd_playsewithpan(void); static void ScriptCmd_setpan(void); static void ScriptCmd_panse_1B(void); -static void c3_08073CEC(u8); +static void Task_PanFromInitialToTarget(u8); static void ScriptCmd_panse_26(void); static void ScriptCmd_panse_27(void); -static void ScriptCmd_panse_1C(void); -static void sub_80774FC(u8); -static void ScriptCmd_panse_1D(void); -static void sub_80775CC(u8); -static void ScriptCmd_createtask_1F(void); +static void ScriptCmd_loopsewithpan(void); +static void Task_LoopAndPlaySE(u8); +static void ScriptCmd_waitplaysewithpan(void); +static void Task_WaitAndPlaySE(u8); +static void ScriptCmd_createsoundtask(void); static void ScriptCmd_waitsound(void); -static void ScriptCmd_jumpvareq(void); -static void ScriptCmd_jumpunkcond(void); +static void ScriptCmd_jumpargeq(void); +static void ScriptCmd_jumpifcontest(void); static void ScriptCmd_monbgprio_28(void); static void ScriptCmd_monbgprio_29(void); static void ScriptCmd_monbgprio_2A(void); @@ -125,10 +128,10 @@ static void ScriptCmd_doublebattle_2E(void); static void ScriptCmd_stopsound(void); static void (*const sScriptCmdTable[])(void) = { - ScriptCmd_loadsprite, - ScriptCmd_unloadsprite, - ScriptCmd_sprite, - ScriptCmd_createtask, + ScriptCmd_loadspritegfx, + ScriptCmd_unloadspritegfx, + ScriptCmd_createsprite, + ScriptCmd_createvisualtask, ScriptCmd_delay, ScriptCmd_waitforvisualfinish, ScriptCmd_hang1, @@ -141,28 +144,28 @@ static void (*const sScriptCmdTable[])(void) = { ScriptCmd_blendoff, ScriptCmd_call, ScriptCmd_return, - ScriptCmd_setvar, - ScriptCmd_ifelse, - ScriptCmd_jumpif, + ScriptCmd_setarg, + ScriptCmd_choosetwoturnanim, + ScriptCmd_jumpifmoveturn, ScriptCmd_jump, ScriptCmd_fadetobg, ScriptCmd_restorebg, ScriptCmd_waitbgfadeout, ScriptCmd_waitbgfadein, ScriptCmd_changebg, - ScriptCmd_panse_19, + ScriptCmd_playsewithpan, ScriptCmd_setpan, ScriptCmd_panse_1B, - ScriptCmd_panse_1C, - ScriptCmd_panse_1D, + ScriptCmd_loopsewithpan, + ScriptCmd_waitplaysewithpan, ScriptCmd_setbldcnt, - ScriptCmd_createtask_1F, + ScriptCmd_createsoundtask, ScriptCmd_waitsound, - ScriptCmd_jumpvareq, + ScriptCmd_jumpargeq, ScriptCmd_monbg_22, ScriptCmd_clearmonbg_23, - ScriptCmd_jumpunkcond, - ScriptCmd_fadetobg_25, + ScriptCmd_jumpifcontest, + ScriptCmd_fadetobgfromset, ScriptCmd_panse_26, ScriptCmd_panse_27, ScriptCmd_monbgprio_28, @@ -175,7 +178,7 @@ static void (*const sScriptCmdTable[])(void) = { ScriptCmd_stopsound, }; -void battle_anim_clear_some_data(void) +void ClearBattleAnimationVars(void) { s32 i; @@ -183,77 +186,77 @@ void battle_anim_clear_some_data(void) gAnimScriptActive = FALSE; gAnimVisualTaskCount = 0; gAnimSoundTaskCount = 0; - gDisableStructMoveAnim = 0; - gMoveDmgMoveAnim = 0; - gMovePowerMoveAnim = 0; - gHappinessMoveAnim = 0; + gAnimDisableStructPtr = NULL; + gAnimMoveDmg = 0; + gAnimMovePower = 0; + gAnimFriendship = 0; // clear index array. - for (i = 0; i < 8; i++) + for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) gAnimSpriteIndexArray[i] |= 0xFFFF; // clear anim args. - for (i = 0; i < 8; i++) + for (i = 0; i < ANIM_ARGS_COUNT; i++) gBattleAnimArgs[i] = 0; gMonAnimTaskIdArray[0] = 0xFF; gMonAnimTaskIdArray[1] = 0xFF; - gUnknown_0202F7C4 = 0; - gUnknown_0202F7C5 = 0; - gAnimMoveIndex = 0; - gBattleAnimBankAttacker = 0; - gBattleAnimBankTarget = 0; + gAnimMoveTurn = 0; + sAnimBackgroundFadeState = 0; + sAnimMoveIndex = 0; + gAnimBankAttacker = 0; + gAnimBankTarget = 0; gUnknown_0202F7D2 = 0; } -void ExecuteMoveAnim(u16 move) +void DoMoveAnim(u16 move) { - gBattleAnimBankAttacker = gBankAttacker; - gBattleAnimBankTarget = gBankTarget; - DoMoveAnim(gBattleAnims_Moves, move, 1); + gAnimBankAttacker = gBankAttacker; + gAnimBankTarget = gBankTarget; + LaunchBattleAnimation(gBattleAnims_Moves, move, TRUE); } -void DoMoveAnim(const u8 *const moveAnims[], u16 move, u8 c) +void LaunchBattleAnimation(const u8 *const moveAnims[], u16 move, u8 isMoveAnim) { s32 i; - if (NotInBattle() == 0) + if (!IsContest()) { sub_8079E24(); - sub_8043EB4(0); + UpdateOamPriorityInAllHealthboxes(0); for (i = 0; i < 4; i++) { if (GetBankSide(i) != 0) - gUnknown_0202F7CA[i] = GetMonData(&gEnemyParty[gBattlePartyID[i]], MON_DATA_SPECIES); + gAnimSpeciesByBanks[i] = GetMonData(&gEnemyParty[gBattlePartyID[i]], MON_DATA_SPECIES); else - gUnknown_0202F7CA[i] = GetMonData(&gPlayerParty[gBattlePartyID[i]], MON_DATA_SPECIES); + gAnimSpeciesByBanks[i] = GetMonData(&gPlayerParty[gBattlePartyID[i]], MON_DATA_SPECIES); } } else { for (i = 0; i < 4; i++) - gUnknown_0202F7CA[i] = EWRAM_19348; + gAnimSpeciesByBanks[i] = EWRAM_19348; } - if (c == 0) - gAnimMoveIndex = 0; + if (isMoveAnim == 0) + sAnimMoveIndex = 0; else - gAnimMoveIndex = move; + sAnimMoveIndex = move; - for (i = 0; i < 8; i++) + for (i = 0; i < ANIM_ARGS_COUNT; i++) gBattleAnimArgs[i] = 0; gMonAnimTaskIdArray[0] = 0xFF; gMonAnimTaskIdArray[1] = 0xFF; - gBattleAnimScriptPtr = moveAnims[move]; + sBattleAnimScriptPtr = moveAnims[move]; gAnimScriptActive = TRUE; gAnimFramesToWait = 0; gAnimScriptCallback = RunAnimScriptCommand; - for (i = 0; i < 8; i++) + for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) gAnimSpriteIndexArray[i] |= 0xFFFF; - if (c != 0) + if (isMoveAnim) { for (i = 0; gUnknown_081C7160[i] != 0xFFFF; i++) { @@ -265,13 +268,13 @@ void DoMoveAnim(const u8 *const moveAnims[], u16 move, u8 c) } } - gUnknown_030042C4 = 0; - gUnknown_03004240 = 0; - gUnknown_03004200 = 0; - gUnknown_03004244 = 0; + gBattle_WIN0H = 0; + gBattle_WIN0V = 0; + gBattle_WIN1H = 0; + gBattle_WIN1V = 0; } -void move_anim_8072740(struct Sprite *sprite) +void DestroyAnimSprite(struct Sprite *sprite) { FreeSpriteOamMatrix(sprite); DestroySprite(sprite); @@ -294,7 +297,7 @@ static void AddSpriteIndex(u16 index) { s32 i; - for (i = 0; i < 8; i++) + for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) { if (gAnimSpriteIndexArray[i] == 0xFFFF) { @@ -308,7 +311,7 @@ static void ClearSpriteIndex(u16 index) { s32 i; - for (i = 0; i < 8; i++) + for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) { if (gAnimSpriteIndexArray[i] == index) { @@ -335,222 +338,87 @@ static void RunAnimScriptCommand(void) { do { - sScriptCmdTable[T1_READ_8(gBattleAnimScriptPtr)](); - } while (gAnimFramesToWait == 0 && gAnimScriptActive != FALSE); + sScriptCmdTable[T1_READ_8(sBattleAnimScriptPtr)](); + } while (gAnimFramesToWait == 0 && gAnimScriptActive); } -static void ScriptCmd_loadsprite(void) +static void ScriptCmd_loadspritegfx(void) { u16 index; - gBattleAnimScriptPtr++; - index = T1_READ_16(gBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + index = T1_READ_16(sBattleAnimScriptPtr); LoadCompressedObjectPic(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)]); LoadCompressedObjectPalette(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(index)]); - gBattleAnimScriptPtr += 2; + sBattleAnimScriptPtr += 2; AddSpriteIndex(GET_TRUE_SPRITE_INDEX(index)); gAnimFramesToWait = 1; gAnimScriptCallback = WaitAnimFrameCount; } -static void ScriptCmd_unloadsprite(void) +static void ScriptCmd_unloadspritegfx(void) { u16 index; - gBattleAnimScriptPtr++; - index = T1_READ_16(gBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + index = T1_READ_16(sBattleAnimScriptPtr); FreeSpriteTilesByTag(gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)].tag); FreeSpritePaletteByTag(gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)].tag); - gBattleAnimScriptPtr += 2; + sBattleAnimScriptPtr += 2; ClearSpriteIndex(GET_TRUE_SPRITE_INDEX(index)); } -#ifdef NONMATCHING -static void ScriptCmd_sprite(void) +static void ScriptCmd_createsprite(void) { s32 i; - struct SpriteTemplate *r7; - u8 r4; - u8 r0; - u8 _r0; - u16 r6; - u8 r2; - s8 r1; - - gBattleAnimScriptPtr++; - r7 = (struct SpriteTemplate *)(T2_READ_32(gBattleAnimScriptPtr)); - gBattleAnimScriptPtr += 4; - r4 = T1_READ_8(gBattleAnimScriptPtr); - gBattleAnimScriptPtr++; - r0 = T1_READ_8(gBattleAnimScriptPtr); - gBattleAnimScriptPtr++; - for (i = 0; i < r0; i++) + const struct SpriteTemplate *template; + u8 argVar; + u8 argsCount; + s16 subpriority; + + sBattleAnimScriptPtr++; + template = (const struct SpriteTemplate *)(T2_READ_32(sBattleAnimScriptPtr)); + sBattleAnimScriptPtr += 4; + + argVar = T1_READ_8(sBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + + argsCount = T1_READ_8(sBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + for (i = 0; i < argsCount; i++) { - gBattleAnimArgs[i] = T1_READ_16(gBattleAnimScriptPtr); - gBattleAnimScriptPtr += 2; + gBattleAnimArgs[i] = T1_READ_16(sBattleAnimScriptPtr); + sBattleAnimScriptPtr += 2; } - if (r4 & 0x80) + + if (argVar & 0x80) { - r4 ^= 0x80; - if (r4 > 0x3F) - r4 -= 0x40; + argVar ^= 0x80; + if (argVar >= 0x40) + argVar -= 0x40; else - r4 = -r4; - _r0 = sub_8079E90(gBattleAnimBankTarget); - r1 = r4; + argVar *= -1; + subpriority = sub_8079E90(gAnimBankTarget) + (s8)(argVar); } else { - //_08075B44 - if (r4 > 0x3F) - r4 -= 0x40; + if (argVar >= 0x40) + argVar -= 0x40; else - r4 = -r4; - _r0 = sub_8079E90(gBattleAnimBankAttacker); - r1 = r4; + argVar *= -1; + + subpriority = sub_8079E90(gAnimBankAttacker) + (s8)(argVar); } - r6 = _r0 + r1; - if ((s16)r6 < 3) - r6 = 3; - r4 = sub_8077ABC(gBattleAnimBankTarget, 2); - r2 = sub_8077ABC(gBattleAnimBankTarget, 3); - CreateSpriteAndAnimate(r7, r4, r2, r6); + if (subpriority < 3) + subpriority = 3; + + CreateSpriteAndAnimate(template, GetBankPosition(gAnimBankTarget, 2), GetBankPosition(gAnimBankTarget, 3), subpriority); gAnimVisualTaskCount++; } -#else -__attribute__((naked)) -static void ScriptCmd_sprite(void) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - ldr r5, _08075B2C @ =gBattleAnimScriptPtr\n\ - ldr r1, [r5]\n\ - adds r3, r1, 0x1\n\ - str r3, [r5]\n\ - ldrb r2, [r1, 0x1]\n\ - ldrb r0, [r3, 0x1]\n\ - lsls r0, 8\n\ - adds r2, r0\n\ - ldrb r0, [r3, 0x2]\n\ - lsls r0, 16\n\ - adds r2, r0\n\ - ldrb r0, [r3, 0x3]\n\ - lsls r0, 24\n\ - adds r7, r2, r0\n\ - adds r0, r1, 0x5\n\ - str r0, [r5]\n\ - ldrb r4, [r1, 0x5]\n\ - adds r0, r1, 0x6\n\ - str r0, [r5]\n\ - ldrb r0, [r1, 0x6]\n\ - adds r1, 0x7\n\ - str r1, [r5]\n\ - cmp r0, 0\n\ - beq _08075B14\n\ - adds r6, r5, 0\n\ - ldr r5, _08075B30 @ =gBattleAnimArgs\n\ - adds r3, r0, 0\n\ -_08075AFC:\n\ - ldr r2, [r6]\n\ - ldrb r1, [r2]\n\ - ldrb r0, [r2, 0x1]\n\ - lsls r0, 8\n\ - orrs r1, r0\n\ - strh r1, [r5]\n\ - adds r2, 0x2\n\ - str r2, [r6]\n\ - adds r5, 0x2\n\ - subs r3, 0x1\n\ - cmp r3, 0\n\ - bne _08075AFC\n\ -_08075B14:\n\ - movs r0, 0x80\n\ - ands r0, r4\n\ - cmp r0, 0\n\ - beq _08075B44\n\ - movs r0, 0x80\n\ - eors r4, r0\n\ - cmp r4, 0x3F\n\ - bls _08075B34\n\ - adds r0, r4, 0\n\ - subs r0, 0x40\n\ - b _08075B36\n\ - .align 2, 0\n\ -_08075B2C: .4byte gBattleAnimScriptPtr\n\ -_08075B30: .4byte gBattleAnimArgs\n\ -_08075B34:\n\ - negs r0, r4\n\ -_08075B36:\n\ - lsls r0, 24\n\ - lsrs r4, r0, 24\n\ - ldr r0, _08075B40 @ =gBattleAnimBankTarget\n\ - b _08075B56\n\ - .align 2, 0\n\ -_08075B40: .4byte gBattleAnimBankTarget\n\ -_08075B44:\n\ - cmp r4, 0x3F\n\ - bls _08075B4E\n\ - adds r0, r4, 0\n\ - subs r0, 0x40\n\ - b _08075B50\n\ -_08075B4E:\n\ - negs r0, r4\n\ -_08075B50:\n\ - lsls r0, 24\n\ - lsrs r4, r0, 24\n\ - ldr r0, _08075BAC @ =gBattleAnimBankAttacker\n\ -_08075B56:\n\ - ldrb r0, [r0]\n\ - bl sub_8079E90\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - lsls r1, r4, 24\n\ - asrs r1, 24\n\ - adds r0, r1\n\ - lsls r0, 16\n\ - lsrs r6, r0, 16\n\ - lsls r0, r6, 16\n\ - asrs r0, 16\n\ - cmp r0, 0x2\n\ - bgt _08075B74\n\ - movs r6, 0x3\n\ -_08075B74:\n\ - ldr r5, _08075BB0 @ =gBattleAnimBankTarget\n\ - ldrb r0, [r5]\n\ - movs r1, 0x2\n\ - bl sub_8077ABC\n\ - adds r4, r0, 0\n\ - lsls r4, 24\n\ - lsrs r4, 24\n\ - ldrb r0, [r5]\n\ - movs r1, 0x3\n\ - bl sub_8077ABC\n\ - adds r2, r0, 0\n\ - lsls r2, 24\n\ - lsrs r2, 24\n\ - lsls r3, r6, 24\n\ - lsrs r3, 24\n\ - adds r0, r7, 0\n\ - adds r1, r4, 0\n\ - bl CreateSpriteAndAnimate\n\ - ldr r1, _08075BB4 @ =gAnimVisualTaskCount\n\ - ldrb r0, [r1]\n\ - adds r0, 0x1\n\ - strb r0, [r1]\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_08075BAC: .4byte gBattleAnimBankAttacker\n\ -_08075BB0: .4byte gBattleAnimBankTarget\n\ -_08075BB4: .4byte gAnimVisualTaskCount\n\ - .syntax divided\n"); -} -#endif -static void ScriptCmd_createtask(void) +static void ScriptCmd_createvisualtask(void) { TaskFunc taskFunc; u8 taskPriority; @@ -558,18 +426,21 @@ static void ScriptCmd_createtask(void) u8 numArgs; s32 i; - gBattleAnimScriptPtr++; - taskFunc = (TaskFunc)T2_READ_32(gBattleAnimScriptPtr); - gBattleAnimScriptPtr += 4; - taskPriority = T1_READ_8(gBattleAnimScriptPtr); - gBattleAnimScriptPtr++; - numArgs = T1_READ_8(gBattleAnimScriptPtr); - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; + + taskFunc = (TaskFunc)T2_READ_32(sBattleAnimScriptPtr); + sBattleAnimScriptPtr += 4; + + taskPriority = T1_READ_8(sBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + + numArgs = T1_READ_8(sBattleAnimScriptPtr); + sBattleAnimScriptPtr++; for (i = 0; i < numArgs; i++) { - gBattleAnimArgs[i] = T1_READ_16(gBattleAnimScriptPtr); - gBattleAnimScriptPtr += 2; + gBattleAnimArgs[i] = T1_READ_16(sBattleAnimScriptPtr); + sBattleAnimScriptPtr += 2; } taskId = CreateTask(taskFunc, taskPriority); @@ -579,11 +450,11 @@ static void ScriptCmd_createtask(void) static void ScriptCmd_delay(void) { - gBattleAnimScriptPtr++; - gAnimFramesToWait = T1_READ_8(gBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + gAnimFramesToWait = T1_READ_8(sBattleAnimScriptPtr); if (gAnimFramesToWait == 0) gAnimFramesToWait = -1; - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; gAnimScriptCallback = WaitAnimFrameCount; } @@ -592,7 +463,7 @@ static void ScriptCmd_waitforvisualfinish(void) { if (gAnimVisualTaskCount == 0) { - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; gAnimFramesToWait = 0; } else @@ -641,7 +512,7 @@ static void ScriptCmd_end(void) // the SE has halted, so set the SE Frame Counter to 0 and continue. gSoundAnimFramesToWait = 0; - for (i = 0; i < 8; i++) + for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) { if (gAnimSpriteIndexArray[i] != 0xFFFF) { @@ -651,13 +522,13 @@ static void ScriptCmd_end(void) } } - if (continuousAnim == FALSE) // may have been used for debug? + if (!continuousAnim) // may have been used for debug? { m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256); - if (NotInBattle() == 0) + if (IsContest() == 0) { sub_8079E24(); - sub_8043EB4(1); + UpdateOamPriorityInAllHealthboxes(1); } gAnimScriptActive = FALSE; } @@ -665,178 +536,114 @@ static void ScriptCmd_end(void) static void ScriptCmd_playse(void) { - gBattleAnimScriptPtr++; - PlaySE(T1_READ_16(gBattleAnimScriptPtr)); - gBattleAnimScriptPtr += 2; + sBattleAnimScriptPtr++; + PlaySE(T1_READ_16(sBattleAnimScriptPtr)); + sBattleAnimScriptPtr += 2; } static void ScriptCmd_monbg(void) { - u8 r6; - u8 r5; - u8 r0; - u8 r7; + u8 animBank; + u8 bank; + u8 identity; + bool8 toBG_2; u16 r4; u8 taskId; - gBattleAnimScriptPtr++; - r6 = T1_READ_8(gBattleAnimScriptPtr); - if (r6 == 0) - r6 = 2; - else if (r6 == 1) - r6 = 3; - if (r6 == 0 || r6 == 2) - r5 = gBattleAnimBankAttacker; + sBattleAnimScriptPtr++; + animBank = T1_READ_8(sBattleAnimScriptPtr); + if (animBank == ANIM_BANK_ATTACKER) + animBank = ANIM_BANK_ATK_PARTNER; + else if (animBank == ANIM_BANK_TARGET) + animBank = ANIM_BANK_DEF_PARTNER; + + if (animBank == ANIM_BANK_ATTACKER || animBank == ANIM_BANK_ATK_PARTNER) + bank = gAnimBankAttacker; else - r5 = gBattleAnimBankTarget; - if (IsAnimBankSpriteVisible(r5)) + bank = gAnimBankTarget; + + if (IsAnimBankSpriteVisible(bank)) { - r0 = GetBankIdentity(r5); - r0 += 0xFF; - if (r0 <= 1 || NotInBattle() != 0) - r7 = 0; + identity = GetBankIdentity(bank); + identity += 0xFF; + if (identity <= 1 || IsContest() != 0) + toBG_2 = 0; else - r7 = 1; - sub_8076034(r5, r7); - r4 = gObjectBankIDs[r5]; + toBG_2 = 1; + + sub_8076034(bank, toBG_2); + r4 = gObjectBankIDs[bank]; taskId = CreateTask(task_pA_ma0A_obj_to_bg_pal, 10); gTasks[taskId].data[0] = r4; gTasks[taskId].data[1] = gSprites[r4].pos1.x + gSprites[r4].pos2.x; gTasks[taskId].data[2] = gSprites[r4].pos1.y + gSprites[r4].pos2.y; - if (r7 == 0) + if (toBG_2 == 0) { - gTasks[taskId].data[3] = gUnknown_030042C0; - gTasks[taskId].data[4] = gUnknown_030041B4; + gTasks[taskId].data[3] = gBattle_BG1_X; + gTasks[taskId].data[4] = gBattle_BG1_Y; } else { - gTasks[taskId].data[3] = gUnknown_03004288; - gTasks[taskId].data[4] = gUnknown_03004280; + gTasks[taskId].data[3] = gBattle_BG2_X; + gTasks[taskId].data[4] = gBattle_BG2_Y; } - gTasks[taskId].data[5] = r7; - gTasks[taskId].data[6] = r5; + gTasks[taskId].data[5] = toBG_2; + gTasks[taskId].data[6] = bank; gMonAnimTaskIdArray[0] = taskId; } - r5 ^= 2; - if (r6 > 1 && IsAnimBankSpriteVisible(r5)) + bank ^= 2; + if (animBank > 1 && IsAnimBankSpriteVisible(bank)) { - r0 = GetBankIdentity(r5); - r0 += 0xFF; - if (r0 <= 1 || NotInBattle() != 0) - r7 = 0; + identity = GetBankIdentity(bank); + identity += 0xFF; + if (identity <= 1 || IsContest() != 0) + toBG_2 = 0; else - r7 = 1; - sub_8076034(r5, r7); - r4 = gObjectBankIDs[r5]; + toBG_2 = 1; + sub_8076034(bank, toBG_2); + r4 = gObjectBankIDs[bank]; taskId = CreateTask(task_pA_ma0A_obj_to_bg_pal, 10); gTasks[taskId].data[0] = r4; gTasks[taskId].data[1] = gSprites[r4].pos1.x + gSprites[r4].pos2.x; gTasks[taskId].data[2] = gSprites[r4].pos1.y + gSprites[r4].pos2.y; - if (r7 == 0) + if (toBG_2 == 0) { - gTasks[taskId].data[3] = gUnknown_030042C0; - gTasks[taskId].data[4] = gUnknown_030041B4; + gTasks[taskId].data[3] = gBattle_BG1_X; + gTasks[taskId].data[4] = gBattle_BG1_Y; } else { - gTasks[taskId].data[3] = gUnknown_03004288; - gTasks[taskId].data[4] = gUnknown_03004280; + gTasks[taskId].data[3] = gBattle_BG2_X; + gTasks[taskId].data[4] = gBattle_BG2_Y; } - gTasks[taskId].data[5] = r7; - gTasks[taskId].data[6] = r5; + + gTasks[taskId].data[5] = toBG_2; + gTasks[taskId].data[6] = bank; gMonAnimTaskIdArray[1] = taskId; } - gBattleAnimScriptPtr++; + + sBattleAnimScriptPtr++; } -#ifdef NONMATCHING -bool8 IsAnimBankSpriteVisible(u8 a) +bool8 IsAnimBankSpriteVisible(u8 bank) { - if (NotInBattle()) + if (IsContest()) { - if (a == gBattleAnimBankAttacker) + if (bank == gAnimBankAttacker) return TRUE; else return FALSE; } - if (!AnimBankSpriteExists(a)) + if (!IsBankSpritePresent(bank)) return FALSE; - if (NotInBattle()) + if (IsContest()) return TRUE; // this line wont ever be reached. - if (!(EWRAM_17800[a].unk0 & 1)) + if (!(EWRAM_17800[bank].unk0 & 1) || !gSprites[gObjectBankIDs[bank]].invisible) return TRUE; - if (gSprites[gObjectBankIDs[a]].invisible) - return FALSE; - return TRUE; -} -#else -__attribute__((naked)) -bool8 IsAnimBankSpriteVisible(u8 a) -{ - asm(".syntax unified\n\ - push {r4,r5,lr}\n\ - lsls r0, 24\n\ - lsrs r4, r0, 24\n\ - adds r5, r4, 0\n\ - bl NotInBattle\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - beq _08075FDC\n\ - ldr r0, _08075FD8 @ =gBattleAnimBankAttacker\n\ - ldrb r0, [r0]\n\ - cmp r4, r0\n\ - beq _0807601C\n\ - b _0807602C\n\ - .align 2, 0\n\ -_08075FD8: .4byte gBattleAnimBankAttacker\n\ -_08075FDC:\n\ - adds r0, r4, 0\n\ - bl AnimBankSpriteExists\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - beq _0807602C\n\ - bl NotInBattle\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - bne _0807601C\n\ - lsls r0, r5, 2\n\ - ldr r1, _08076020 @ =gSharedMem + 0x17800\n\ - adds r0, r1\n\ - ldrb r1, [r0]\n\ - movs r0, 0x1\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _0807601C\n\ - ldr r2, _08076024 @ =gSprites\n\ - ldr r0, _08076028 @ =gObjectBankIDs\n\ - adds r0, r5, r0\n\ - ldrb r1, [r0]\n\ - lsls r0, r1, 4\n\ - adds r0, r1\n\ - lsls r0, 2\n\ - adds r0, r2\n\ - adds r0, 0x3E\n\ - ldrb r0, [r0]\n\ - lsls r0, 29\n\ - cmp r0, 0\n\ - blt _0807602C\n\ -_0807601C:\n\ - movs r0, 0x1\n\ - b _0807602E\n\ - .align 2, 0\n\ -_08076020: .4byte gSharedMem + 0x17800\n\ -_08076024: .4byte gSprites\n\ -_08076028: .4byte gObjectBankIDs\n\ -_0807602C:\n\ - movs r0, 0\n\ -_0807602E:\n\ - pop {r4,r5}\n\ - pop {r1}\n\ - bx r1\n\ - .syntax divided\n"); + + return FALSE; } -#endif void sub_8076034(u8 a, u8 b) { @@ -876,25 +683,25 @@ void sub_8076034(u8 a, u8 b) REG_BG1CNT_BITFIELD.areaOverflowMode = 0; spriteId = gObjectBankIDs[a]; - gUnknown_030042C0 = -(gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x) + 32; - if (NotInBattle() != 0 && sub_80AEB1C(EWRAM_19348) != 0) - gUnknown_030042C0--; - gUnknown_030041B4 = -(gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) + 32; + gBattle_BG1_X = -(gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x) + 32; + if (IsContest() != 0 && IsSpeciesNotUnown(EWRAM_19348) != 0) + gBattle_BG1_X--; + gBattle_BG1_Y = -(gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) + 32; gSprites[gObjectBankIDs[a]].invisible = TRUE; - REG_BG1HOFS = gUnknown_030042C0; - REG_BG1VOFS = gUnknown_030041B4; + REG_BG1HOFS = gBattle_BG1_X; + REG_BG1VOFS = gBattle_BG1_Y; LoadPalette(gPlttBufferUnfaded + 0x100 + a * 16, s.unk8 * 16, 32); addr3 = (u16 *)PLTT + s.unk8 * 16; DmaCopy32(3, gPlttBufferUnfaded + 0x100 + a * 16, addr3, 32); - if (NotInBattle() != 0) + if (IsContest() != 0) r2 = 0; else r2 = GetBankIdentity(a); sub_80E4EF8(0, 0, r2, s.unk8, (u32)s.unk0, (((s32)s.unk4 - VRAM) / 2048), REG_BG1CNT_BITFIELD.charBaseBlock); - if (NotInBattle() != 0) + if (IsContest() != 0) sub_8076380(); } else @@ -926,12 +733,12 @@ void sub_8076034(u8 a, u8 b) REG_BG2CNT_BITFIELD.areaOverflowMode = 0; spriteId = gObjectBankIDs[a]; - gUnknown_03004288 = -(gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x) + 32; - gUnknown_03004280 = -(gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) + 32; + gBattle_BG2_X = -(gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x) + 32; + gBattle_BG2_Y = -(gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) + 32; gSprites[gObjectBankIDs[a]].invisible = TRUE; - REG_BG2HOFS = gUnknown_03004288; - REG_BG2VOFS = gUnknown_03004280; + REG_BG2HOFS = gBattle_BG2_X; + REG_BG2VOFS = gBattle_BG2_Y; LoadPalette(gPlttBufferUnfaded + 0x100 + a * 16, 0x90, 32); addr3 = (void *)(PLTT + 0x120); @@ -948,7 +755,7 @@ static void sub_8076380(void) struct UnknownStruct2 s; u16 *ptr; - if (sub_80AEB1C(EWRAM_19348) != 0) + if (IsSpeciesNotUnown(EWRAM_19348)) { sub_8078914(&s); ptr = s.unk4; @@ -996,7 +803,7 @@ void sub_8076464(u8 a) struct UnknownStruct2 s; sub_8078914(&s); - if (a == 0 || NotInBattle() != 0) + if (a == 0 || IsContest() != 0) { u16 *addr2; @@ -1017,8 +824,8 @@ void sub_8076464(u8 a) pointlessZero = 0; addr2 = s.unk4; DmaFill32(3, 0, addr2, 0x800); - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; } else { @@ -1041,32 +848,31 @@ void sub_8076464(u8 a) pointlessZero = 0; addr2 = (void *)(VRAM + 0xF000); DmaFill32(3, 0, addr2, 0x800); - gUnknown_03004288 = 0; - gUnknown_03004280 = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; } } static void task_pA_ma0A_obj_to_bg_pal(u8 taskId) { - u8 r4; - u8 r6; - s16 r3; - s16 r2; + u8 spriteId, palIndex; + s16 x, y; struct UnknownStruct2 s; - r4 = gTasks[taskId].data[0]; - r6 = gTasks[taskId].data[6]; + spriteId = gTasks[taskId].data[0]; + palIndex = gTasks[taskId].data[6]; sub_8078914(&s); - r3 = gTasks[taskId].data[1] - (gSprites[r4].pos1.x + gSprites[r4].pos2.x); - r2 = gTasks[taskId].data[2] - (gSprites[r4].pos1.y + gSprites[r4].pos2.y); + x = gTasks[taskId].data[1] - (gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x); + y = gTasks[taskId].data[2] - (gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y); + if (gTasks[taskId].data[5] == 0) { u16 *src; u16 *dst; - gUnknown_030042C0 = r3 + gTasks[taskId].data[3]; - gUnknown_030041B4 = r2 + gTasks[taskId].data[4]; - src = gPlttBufferFaded + 0x100 + r6 * 16; + gBattle_BG1_X = x + gTasks[taskId].data[3]; + gBattle_BG1_Y = y + gTasks[taskId].data[4]; + src = gPlttBufferFaded + 0x100 + palIndex * 16; dst = gPlttBufferFaded + 0x100 + s.unk8 * 16 - 256; DmaCopy32(3, src, dst, 32); } @@ -1075,9 +881,9 @@ static void task_pA_ma0A_obj_to_bg_pal(u8 taskId) u16 *src; u16 *dst; - gUnknown_03004288 = r3 + gTasks[taskId].data[3]; - gUnknown_03004280 = r2 + gTasks[taskId].data[4]; - src = gPlttBufferFaded + 0x100 + r6 * 16; + gBattle_BG2_X = x + gTasks[taskId].data[3]; + gBattle_BG2_Y = y + gTasks[taskId].data[4]; + src = gPlttBufferFaded + 0x100 + palIndex * 16; dst = gPlttBufferFaded + 0x100 - 112; DmaCopy32(3, src, dst, 32); } @@ -1085,55 +891,59 @@ static void task_pA_ma0A_obj_to_bg_pal(u8 taskId) static void ScriptCmd_clearmonbg(void) { - u8 r4; - u8 r5; + u8 animBankId; + u8 bank; u8 taskId; - gBattleAnimScriptPtr++; - r4 = T1_READ_8(gBattleAnimScriptPtr); - if (r4 == 0) - r4 = 2; - else if (r4 == 1) - r4 = 3; - if (r4 == 0 || r4 == 2) - r5 = gBattleAnimBankAttacker; + sBattleAnimScriptPtr++; + animBankId = T1_READ_8(sBattleAnimScriptPtr); + + if (animBankId == ANIM_BANK_ATTACKER) + animBankId = ANIM_BANK_ATK_PARTNER; + else if (animBankId == ANIM_BANK_TARGET) + animBankId = ANIM_BANK_DEF_PARTNER; + + if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER) + bank = gAnimBankAttacker; else - r5 = gBattleAnimBankTarget; + bank = gAnimBankTarget; + if (gMonAnimTaskIdArray[0] != 0xFF) - gSprites[gObjectBankIDs[r5]].invisible = FALSE; - if (r4 > 1 && gMonAnimTaskIdArray[1] != 0xFF) - gSprites[gObjectBankIDs[r5 ^ 2]].invisible = FALSE; + gSprites[gObjectBankIDs[bank]].invisible = FALSE; + if (animBankId > 1 && gMonAnimTaskIdArray[1] != 0xFF) + gSprites[gObjectBankIDs[bank ^ 2]].invisible = FALSE; else - r4 = 0; + animBankId = 0; + taskId = CreateTask(sub_807672C, 5); - gTasks[taskId].data[0] = r4; - gTasks[taskId].data[2] = r5; - gBattleAnimScriptPtr++; + gTasks[taskId].data[0] = animBankId; + gTasks[taskId].data[2] = bank; + sBattleAnimScriptPtr++; } static void sub_807672C(u8 taskId) { - u8 var; - u8 r4; + u8 identity; + u8 to_BG2; gTasks[taskId].data[1]++; if (gTasks[taskId].data[1] != 1) { - var = GetBankIdentity(gTasks[taskId].data[2]); - var += 0xFF; - if (var <= 1 || NotInBattle() != 0) - r4 = 0; + identity = GetBankIdentity(gTasks[taskId].data[2]); + identity += 0xFF; + if (identity <= 1 || IsContest() != 0) + to_BG2 = 0; else - r4 = 1; + to_BG2 = 1; if (gMonAnimTaskIdArray[0] != 0xFF) { - sub_8076464(r4); + sub_8076464(to_BG2); DestroyTask(gMonAnimTaskIdArray[0]); gMonAnimTaskIdArray[0] = 0xFF; } if (gTasks[taskId].data[0] > 1) { - sub_8076464(r4 ^ 1); + sub_8076464(to_BG2 ^ 1); DestroyTask(gMonAnimTaskIdArray[1]); gMonAnimTaskIdArray[1] = 0xFF; } @@ -1143,187 +953,195 @@ static void sub_807672C(u8 taskId) static void ScriptCmd_monbg_22(void) { - u8 r5; - u8 r4; - u8 r0; + u8 animBankId; + u8 bank; + u8 identity; u8 r1; - gBattleAnimScriptPtr++; - r5 = T1_READ_8(gBattleAnimScriptPtr); - if (r5 == 0) - r5 = 2; - else if (r5 == 1) - r5 = 3; - if (r5 == 0 || r5 == 2) - r4 = gBattleAnimBankAttacker; + sBattleAnimScriptPtr++; + animBankId = T1_READ_8(sBattleAnimScriptPtr); + + if (animBankId == ANIM_BANK_ATTACKER) + animBankId = ANIM_BANK_ATK_PARTNER; + else if (animBankId == ANIM_BANK_TARGET) + animBankId = ANIM_BANK_DEF_PARTNER; + + if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER) + bank = gAnimBankAttacker; else - r4 = gBattleAnimBankTarget; - if (IsAnimBankSpriteVisible(r4)) + bank = gAnimBankTarget; + + if (IsAnimBankSpriteVisible(bank)) { - r0 = GetBankIdentity(r4); - r0 += 0xFF; - if (r0 <= 1 || NotInBattle() != 0) + identity = GetBankIdentity(bank); + identity += 0xFF; + if (identity <= 1 || IsContest() != 0) r1 = 0; else r1 = 1; - sub_8076034(r4, r1); - gSprites[gObjectBankIDs[r4]].invisible = FALSE; + sub_8076034(bank, r1); + gSprites[gObjectBankIDs[bank]].invisible = FALSE; } - r4 ^= 2; - if (r5 > 1 && IsAnimBankSpriteVisible(r4)) + + bank ^= 2; + if (animBankId > ANIM_BANK_TARGET && IsAnimBankSpriteVisible(bank)) { - r0 = GetBankIdentity(r4); - r0 += 0xFF; - if (r0 <= 1 || NotInBattle() != 0) + identity = GetBankIdentity(bank); + identity += 0xFF; + if (identity <= 1 || IsContest() != 0) r1 = 0; else r1 = 1; - sub_8076034(r4, r1); - gSprites[gObjectBankIDs[r4]].invisible = FALSE; + sub_8076034(bank, r1); + gSprites[gObjectBankIDs[bank]].invisible = FALSE; } - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; } static void ScriptCmd_clearmonbg_23(void) { - u8 r5; - u8 r6; + u8 animBankId; + u8 bank; u8 taskId; - gBattleAnimScriptPtr++; - r5 = T1_READ_8(gBattleAnimScriptPtr); - if (r5 == 0) - r5 = 2; - else if (r5 == 1) - r5 = 3; - if (r5 == 0 || r5 == 2) - r6 = gBattleAnimBankAttacker; + sBattleAnimScriptPtr++; + animBankId = T1_READ_8(sBattleAnimScriptPtr); + + if (animBankId == ANIM_BANK_ATTACKER) + animBankId = ANIM_BANK_ATK_PARTNER; + else if (animBankId == ANIM_BANK_TARGET) + animBankId = ANIM_BANK_DEF_PARTNER; + + if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER) + bank = gAnimBankAttacker; else - r6 = gBattleAnimBankTarget; - if (IsAnimBankSpriteVisible(r6)) - gSprites[gObjectBankIDs[r6]].invisible = FALSE; - if (r5 > 1 && IsAnimBankSpriteVisible(r6 ^ 2)) - gSprites[gObjectBankIDs[r6 ^ 2]].invisible = FALSE; + bank = gAnimBankTarget; + + if (IsAnimBankSpriteVisible(bank)) + gSprites[gObjectBankIDs[bank]].invisible = FALSE; + if (animBankId > 1 && IsAnimBankSpriteVisible(bank ^ 2)) + gSprites[gObjectBankIDs[bank ^ 2]].invisible = FALSE; else - r5 = 0; + animBankId = 0; + taskId = CreateTask(sub_80769A4, 5); - gTasks[taskId].data[0] = r5; - gTasks[taskId].data[2] = r6; - gBattleAnimScriptPtr++; + gTasks[taskId].data[0] = animBankId; + gTasks[taskId].data[2] = bank; + + sBattleAnimScriptPtr++; } static void sub_80769A4(u8 taskId) { - u8 r0; - u8 r4; - u8 r5; + u8 identity; + u8 bank; + u8 toBG_2; gTasks[taskId].data[1]++; if (gTasks[taskId].data[1] != 1) { - r4 = gTasks[taskId].data[2]; - r0 = GetBankIdentity(r4); - r0 += 0xFF; - if (r0 <= 1 || NotInBattle() != 0) - r5 = 0; + bank = gTasks[taskId].data[2]; + identity = GetBankIdentity(bank); + identity += 0xFF; + if (identity <= 1 || IsContest() != 0) + toBG_2 = 0; else - r5 = 1; - if (IsAnimBankSpriteVisible(r4)) - sub_8076464(r5); - if (gTasks[taskId].data[0] > 1 && IsAnimBankSpriteVisible(r4 ^ 2)) - sub_8076464(r5 ^ 1); + toBG_2 = 1; + if (IsAnimBankSpriteVisible(bank)) + sub_8076464(toBG_2); + if (gTasks[taskId].data[0] > 1 && IsAnimBankSpriteVisible(bank ^ 2)) + sub_8076464(toBG_2 ^ 1); DestroyTask(taskId); } } static void ScriptCmd_setalpha(void) { - u16 r3; - u16 r1; + u16 half1, half2; - gBattleAnimScriptPtr++; - r3 = *(gBattleAnimScriptPtr++); - r1 = *(gBattleAnimScriptPtr++) << 8; + sBattleAnimScriptPtr++; + half1 = *(sBattleAnimScriptPtr++); + half2 = *(sBattleAnimScriptPtr++) << 8; REG_BLDCNT = 0x3F40; - REG_BLDALPHA = r3 | r1; + REG_BLDALPHA = half1 | half2; } static void ScriptCmd_setbldcnt(void) { - u16 r3; - u16 r1; + u16 half1, half2; - gBattleAnimScriptPtr++; - r3 = *(gBattleAnimScriptPtr++); - r1 = *(gBattleAnimScriptPtr++) << 8; - REG_BLDCNT = r3 | r1; + sBattleAnimScriptPtr++; + half1 = *(sBattleAnimScriptPtr++); + half2 = *(sBattleAnimScriptPtr++) << 8; + REG_BLDCNT = half1 | half2; } static void ScriptCmd_blendoff(void) { - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; REG_BLDCNT = 0; REG_BLDALPHA = 0; } static void ScriptCmd_call(void) { - gBattleAnimScriptPtr++; - gBattleAnimScriptRetAddr = gBattleAnimScriptPtr + 4; - gBattleAnimScriptPtr = T2_READ_PTR(gBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + gBattleAnimScriptRetAddr = sBattleAnimScriptPtr + 4; + sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr); } static void ScriptCmd_return(void) { - gBattleAnimScriptPtr = gBattleAnimScriptRetAddr; + sBattleAnimScriptPtr = gBattleAnimScriptRetAddr; } -static void ScriptCmd_setvar(void) +static void ScriptCmd_setarg(void) { - const u8 *addr = gBattleAnimScriptPtr; - u16 r4; - u8 r2; + const u8 *addr = sBattleAnimScriptPtr; + u16 value; + u8 argId; - gBattleAnimScriptPtr++; - r2 = T1_READ_8(gBattleAnimScriptPtr); - gBattleAnimScriptPtr++; - r4 = T1_READ_16(gBattleAnimScriptPtr); - gBattleAnimScriptPtr = addr + 4; - gBattleAnimArgs[r2] = r4; + sBattleAnimScriptPtr++; + argId = T1_READ_8(sBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + value = T1_READ_16(sBattleAnimScriptPtr); + sBattleAnimScriptPtr = addr + 4; + gBattleAnimArgs[argId] = value; } -static void ScriptCmd_ifelse(void) +static void ScriptCmd_choosetwoturnanim(void) { - gBattleAnimScriptPtr++; - if (gUnknown_0202F7C4 & 1) - gBattleAnimScriptPtr += 4; - gBattleAnimScriptPtr = T2_READ_PTR(gBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + if (gAnimMoveTurn & 1) + sBattleAnimScriptPtr += 4; + sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr); } -static void ScriptCmd_jumpif(void) +static void ScriptCmd_jumpifmoveturn(void) { - u8 r1; + u8 toCheck; - gBattleAnimScriptPtr++; - r1 = T1_READ_8(gBattleAnimScriptPtr); - gBattleAnimScriptPtr++; - if (r1 == gUnknown_0202F7C4) + sBattleAnimScriptPtr++; + toCheck = T1_READ_8(sBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + + if (toCheck == gAnimMoveTurn) { - gBattleAnimScriptPtr = T2_READ_PTR(gBattleAnimScriptPtr); + sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr); } else { - gBattleAnimScriptPtr += 4; + sBattleAnimScriptPtr += 4; } } static void ScriptCmd_jump(void) { - gBattleAnimScriptPtr++; - gBattleAnimScriptPtr = T2_READ_PTR(gBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr); } -bool8 NotInBattle(void) +bool8 IsContest(void) { if (!gMain.inBattle) return TRUE; @@ -1331,124 +1149,131 @@ bool8 NotInBattle(void) return FALSE; } +#define tBackgroundId data[0] +#define tState data[10] + static void ScriptCmd_fadetobg(void) { - u8 r4; + u8 backgroundId; u8 taskId; - gBattleAnimScriptPtr++; - r4 = T1_READ_8(gBattleAnimScriptPtr); - gBattleAnimScriptPtr++; - taskId = CreateTask(task_p5_load_battle_screen_elements, 5); - gTasks[taskId].data[0] = r4; - gUnknown_0202F7C5 = 1; + sBattleAnimScriptPtr++; + backgroundId = T1_READ_8(sBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + taskId = CreateTask(Task_FadeToBg, 5); + gTasks[taskId].tBackgroundId = backgroundId; + sAnimBackgroundFadeState = 1; } -static void ScriptCmd_fadetobg_25(void) +static void ScriptCmd_fadetobgfromset(void) { - u8 r8; - u8 r7; - u8 r6; + u8 bg1, bg2, bg3; u8 taskId; - gBattleAnimScriptPtr++; - r8 = gBattleAnimScriptPtr[0]; - r7 = gBattleAnimScriptPtr[1]; - r6 = gBattleAnimScriptPtr[2]; - gBattleAnimScriptPtr += 3; - taskId = CreateTask(task_p5_load_battle_screen_elements, 5); - if (NotInBattle() != 0) - gTasks[taskId].data[0] = r6; - else if (GetBankSide(gBattleAnimBankTarget) == 0) - gTasks[taskId].data[0] = r7; + sBattleAnimScriptPtr++; + bg1 = sBattleAnimScriptPtr[0]; + bg2 = sBattleAnimScriptPtr[1]; + bg3 = sBattleAnimScriptPtr[2]; + sBattleAnimScriptPtr += 3; + taskId = CreateTask(Task_FadeToBg, 5); + + if (IsContest()) + gTasks[taskId].tBackgroundId = bg3; + else if (GetBankSide(gAnimBankTarget) == 0) + gTasks[taskId].tBackgroundId = bg2; else - gTasks[taskId].data[0] = r8; - gUnknown_0202F7C5 = 1; + gTasks[taskId].tBackgroundId = bg1; + + sAnimBackgroundFadeState = 1; } -static void task_p5_load_battle_screen_elements(u8 taskId) +static void Task_FadeToBg(u8 taskId) { - if (gTasks[taskId].data[10] == 0) + if (gTasks[taskId].tState == 0) { BeginHardwarePaletteFade(0xE8, 0, 0, 16, 0); - gTasks[taskId].data[10]++; + gTasks[taskId].tState++; return; } if (gPaletteFade.active) return; - if (gTasks[taskId].data[10] == 1) + if (gTasks[taskId].tState == 1) { - gTasks[taskId].data[10]++; - gUnknown_0202F7C5 = 2; + gTasks[taskId].tState++; + sAnimBackgroundFadeState = 2; } - else if (gTasks[taskId].data[10] == 2) + else if (gTasks[taskId].tState == 2) { - s16 data0 = (u16)gTasks[taskId].data[0]; + s16 bgId = (u16)gTasks[taskId].tBackgroundId; - if (data0 == -1) - dp01t_11_3_message_for_player_only(); + if (bgId == -1) + LoadDefaultBg(); else - sub_8076DB8(data0); + LoadMoveBg(bgId); + BeginHardwarePaletteFade(0xE8, 0, 16, 0, 1); - gTasks[taskId].data[10]++; + gTasks[taskId].tState++; return; } if (gPaletteFade.active) return; - if (gTasks[taskId].data[10] == 3) + if (gTasks[taskId].tState == 3) { DestroyTask(taskId); - gUnknown_0202F7C5 = 0; + sAnimBackgroundFadeState = 0; } } -static void sub_8076DB8(u16 a) +static void LoadMoveBg(u16 bgId) { - if (NotInBattle()) + if (IsContest()) { - void *tilemap = gBattleAnimBackgroundTable[a].tilemap; + void *tilemap = gBattleAnimBackgroundTable[bgId].tilemap; void *dmaSrc; void *dmaDest; - LZDecompressWram(tilemap, NotInBattle() ? EWRAM_14800 : EWRAM_18000); - sub_80763FC(sub_80789BC(), NotInBattle() ? EWRAM_14800 : EWRAM_18000, 0x100, 0); - dmaSrc = NotInBattle() ? EWRAM_14800 : EWRAM_18000; + LZDecompressWram(tilemap, IsContest() ? EWRAM_14800 : EWRAM_18000); + sub_80763FC(sub_80789BC(), IsContest() ? EWRAM_14800 : EWRAM_18000, 0x100, 0); + dmaSrc = IsContest() ? EWRAM_14800 : EWRAM_18000; dmaDest = (void *)(VRAM + 0xD000); DmaCopy32(3, dmaSrc, dmaDest, 0x800); - LZDecompressVram(gBattleAnimBackgroundTable[a].image, (void *)(VRAM + 0x2000)); - LoadCompressedPalette(gBattleAnimBackgroundTable[a].palette, sub_80789BC() * 16, 32); + LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(VRAM + 0x2000)); + LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, sub_80789BC() * 16, 32); } else { - LZDecompressVram(gBattleAnimBackgroundTable[a].tilemap, (void *)(VRAM + 0xD000)); - LZDecompressVram(gBattleAnimBackgroundTable[a].image, (void *)(VRAM + 0x8000)); - LoadCompressedPalette(gBattleAnimBackgroundTable[a].palette, 32, 32); + LZDecompressVram(gBattleAnimBackgroundTable[bgId].tilemap, (void *)(VRAM + 0xD000)); + LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(VRAM + 0x8000)); + LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, 32, 32); } } -static void dp01t_11_3_message_for_player_only(void) +static void LoadDefaultBg(void) { - if (NotInBattle()) - sub_80AB2AC(); + if (IsContest()) + LoadContestBgAfterMoveAnim(); else - sub_800D7B8(); + DrawMainBattleBackground(); } static void ScriptCmd_restorebg(void) { u8 taskId; - gBattleAnimScriptPtr++; - taskId = CreateTask(task_p5_load_battle_screen_elements, 5); - gTasks[taskId].data[0] = 0xFFFF; - gUnknown_0202F7C5 = 1; + sBattleAnimScriptPtr++; + taskId = CreateTask(Task_FadeToBg, 5); + gTasks[taskId].tBackgroundId = 0xFFFF; + sAnimBackgroundFadeState = 1; } +#undef tBackgroundId +#undef tState + static void ScriptCmd_waitbgfadeout(void) { - if (gUnknown_0202F7C5 == 2) + if (sAnimBackgroundFadeState == 2) { - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; gAnimFramesToWait = 0; } else @@ -1459,9 +1284,9 @@ static void ScriptCmd_waitbgfadeout(void) static void ScriptCmd_waitbgfadein(void) { - if (gUnknown_0202F7C5 == 0) + if (sAnimBackgroundFadeState == 0) { - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; gAnimFramesToWait = 0; } else @@ -1472,25 +1297,25 @@ static void ScriptCmd_waitbgfadein(void) static void ScriptCmd_changebg(void) { - gBattleAnimScriptPtr++; - sub_8076DB8(T1_READ_8(gBattleAnimScriptPtr)); - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; + LoadMoveBg(T1_READ_8(sBattleAnimScriptPtr)); + sBattleAnimScriptPtr++; } //Weird control flow /* -s8 sub_8076F98(s8 a) +s8 BattleAnimAdjustPanning(s8 a) { - if (!NotInBattle() && (EWRAM_17810[gBattleAnimBankAttacker].unk0 & 0x10)) + if (!IsContest() && (EWRAM_17810[gAnimBankAttacker].unk0 & 0x10)) { - a = GetBankSide(gBattleAnimBankAttacker) ? 0xC0 : 0x3F; + a = GetBankSide(gAnimBankAttacker) ? 0xC0 : 0x3F; } //_08076FDC else { - if (NotInBattle()) + if (IsContest()) { - if (gBattleAnimBankAttacker == gBattleAnimBankTarget && gBattleAnimBankAttacker == 2 + if (gAnimBankAttacker == gAnimBankTarget && gAnimBankAttacker == 2 && a == 0x3F) { //jump to _0807707A @@ -1502,9 +1327,9 @@ s8 sub_8076F98(s8 a) //_08077004 else { - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) { - if (GetBankSide(gBattleAnimBankTarget) == 0) + if (GetBankSide(gAnimBankTarget) == 0) } //_08077042 else @@ -1518,17 +1343,17 @@ s8 sub_8076F98(s8 a) } */ __attribute__((naked)) -s8 sub_8076F98(s8 a) +s8 BattleAnimAdjustPanning(s8 a) { asm(".syntax unified\n\ push {r4,lr}\n\ lsls r0, 24\n\ lsrs r4, r0, 24\n\ - bl NotInBattle\n\ + bl IsContest\n\ lsls r0, 24\n\ cmp r0, 0\n\ bne _08076FDC\n\ - ldr r0, _08076FD4 @ =gBattleAnimBankAttacker\n\ + ldr r0, _08076FD4 @ =gAnimBankAttacker\n\ ldrb r2, [r0]\n\ lsls r0, r2, 1\n\ adds r0, r2\n\ @@ -1549,15 +1374,15 @@ s8 sub_8076F98(s8 a) movs r4, 0x3F\n\ b _0807706E\n\ .align 2, 0\n\ -_08076FD4: .4byte gBattleAnimBankAttacker\n\ +_08076FD4: .4byte gAnimBankAttacker\n\ _08076FD8: .4byte gSharedMem + 0x17810\n\ _08076FDC:\n\ - bl NotInBattle\n\ + bl IsContest\n\ lsls r0, 24\n\ cmp r0, 0\n\ beq _08077004\n\ - ldr r0, _08076FFC @ =gBattleAnimBankAttacker\n\ - ldr r1, _08077000 @ =gBattleAnimBankTarget\n\ + ldr r0, _08076FFC @ =gAnimBankAttacker\n\ + ldr r1, _08077000 @ =gAnimBankTarget\n\ ldrb r0, [r0]\n\ ldrb r1, [r1]\n\ cmp r0, r1\n\ @@ -1568,16 +1393,16 @@ _08076FDC:\n\ beq _0807707A\n\ b _08077068\n\ .align 2, 0\n\ -_08076FFC: .4byte gBattleAnimBankAttacker\n\ -_08077000: .4byte gBattleAnimBankTarget\n\ +_08076FFC: .4byte gAnimBankAttacker\n\ +_08077000: .4byte gAnimBankTarget\n\ _08077004:\n\ - ldr r0, _0807702C @ =gBattleAnimBankAttacker\n\ + ldr r0, _0807702C @ =gAnimBankAttacker\n\ ldrb r0, [r0]\n\ bl GetBankSide\n\ lsls r0, 24\n\ cmp r0, 0\n\ bne _08077042\n\ - ldr r0, _08077030 @ =gBattleAnimBankTarget\n\ + ldr r0, _08077030 @ =gAnimBankTarget\n\ ldrb r0, [r0]\n\ bl GetBankSide\n\ lsls r0, 24\n\ @@ -1590,8 +1415,8 @@ _08077004:\n\ movs r4, 0xC0\n\ b _0807706E\n\ .align 2, 0\n\ -_0807702C: .4byte gBattleAnimBankAttacker\n\ -_08077030: .4byte gBattleAnimBankTarget\n\ +_0807702C: .4byte gAnimBankAttacker\n\ +_08077030: .4byte gAnimBankTarget\n\ _08077034:\n\ movs r0, 0x40\n\ negs r0, r0\n\ @@ -1601,7 +1426,7 @@ _08077034:\n\ lsls r0, 24\n\ b _0807706C\n\ _08077042:\n\ - ldr r0, _08077064 @ =gBattleAnimBankTarget\n\ + ldr r0, _08077064 @ =gAnimBankTarget\n\ ldrb r0, [r0]\n\ bl GetBankSide\n\ lsls r0, 24\n\ @@ -1617,7 +1442,7 @@ _08077042:\n\ movs r4, 0x3F\n\ b _0807706E\n\ .align 2, 0\n\ -_08077064: .4byte gBattleAnimBankTarget\n\ +_08077064: .4byte gAnimBankTarget\n\ _08077068:\n\ lsls r0, r4, 24\n\ negs r0, r0\n\ @@ -1647,21 +1472,21 @@ _08077088:\n\ .syntax divided\n"); } -s8 sub_8077094(s8 a) +s8 BattleAnimAdjustPanning2(s8 pan) { - if (!NotInBattle() && (EWRAM_17810[gBattleAnimBankAttacker].unk0 & 0x10)) + if (!IsContest() && (EWRAM_17810[gAnimBankAttacker].unk0 & 0x10)) { - if (GetBankSide(gBattleAnimBankAttacker) != 0) - a = 0x3F; + if (GetBankSide(gAnimBankAttacker) != 0) + pan = 0x3F; else - a = 0xC0; + pan = 0xC0; } else { - if (GetBankSide(gBattleAnimBankAttacker) != 0 || NotInBattle() != 0) - a = -a; + if (GetBankSide(gAnimBankAttacker) != 0 || IsContest() != 0) + pan = -pan; } - return a; + return pan; } s16 sub_8077104(s16 a) @@ -1675,310 +1500,232 @@ s16 sub_8077104(s16 a) return var; } -s16 sub_807712C(s16 a, s16 b, s16 c) +s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan) { - u16 var; + u16 ret; - if (a < b) - var = ((c < 0) ? -c : c); - else if (a > b) - var = -((c < 0) ? -c : c); + if (sourcePan < targetPan) + ret = ((incrementPan < 0) ? -incrementPan : incrementPan); + else if (sourcePan > targetPan) + ret = -((incrementPan < 0) ? -incrementPan : incrementPan); else - var = 0; - return var; + ret = 0; + + return ret; } -static void ScriptCmd_panse_19(void) +static void ScriptCmd_playsewithpan(void) { - u16 r4; - s8 r0; + u16 songId; + s8 pan; - gBattleAnimScriptPtr++; - r4 = T1_READ_16(gBattleAnimScriptPtr); - r0 = T1_READ_8(gBattleAnimScriptPtr + 2); - PlaySE12WithPanning(r4, sub_8076F98(r0)); - gBattleAnimScriptPtr += 3; + sBattleAnimScriptPtr++; + songId = T1_READ_16(sBattleAnimScriptPtr); + pan = T1_READ_8(sBattleAnimScriptPtr + 2); + PlaySE12WithPanning(songId, BattleAnimAdjustPanning(pan)); + sBattleAnimScriptPtr += 3; } static void ScriptCmd_setpan(void) { - s8 r0; + s8 pan; - gBattleAnimScriptPtr++; - r0 = T1_READ_8(gBattleAnimScriptPtr); - SE12PanpotControl(sub_8076F98(r0)); - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; + pan = T1_READ_8(sBattleAnimScriptPtr); + SE12PanpotControl(BattleAnimAdjustPanning(pan)); + sBattleAnimScriptPtr++; } +#define tInitialPan data[0] +#define tTargetPan data[1] +#define tIncrementPan data[2] +#define tFramesToWait data[3] +#define tCurrentPan data[4] +#define tFrameCounter data[8] + static void ScriptCmd_panse_1B(void) { u16 songNum; - s8 r0; - s8 r4; - s8 r6; - u8 r7; - s8 panning; - s8 r8; + s8 currentPanArg, incrementPan, incrementPanArg, currentPan, targetPan; + u8 framesToWait; u8 taskId; - gBattleAnimScriptPtr++; - songNum = T1_READ_16(gBattleAnimScriptPtr); - r0 = T1_READ_8(gBattleAnimScriptPtr + 2); - r4 = T1_READ_8(gBattleAnimScriptPtr + 3); - r6 = T1_READ_8(gBattleAnimScriptPtr + 4); - r7 = T1_READ_8(gBattleAnimScriptPtr + 5); - panning = sub_8076F98(r0); - r8 = sub_8076F98(r4); - r4 = sub_807712C(panning, r8, r6); - taskId = CreateTask(c3_08073CEC, 1); - gTasks[taskId].data[0] = panning; - gTasks[taskId].data[1] = r8; - gTasks[taskId].data[2] = r4; - gTasks[taskId].data[3] = r7; - gTasks[taskId].data[4] = panning; - PlaySE12WithPanning(songNum, panning); + sBattleAnimScriptPtr++; + songNum = T1_READ_16(sBattleAnimScriptPtr); + currentPanArg = T1_READ_8(sBattleAnimScriptPtr + 2); + incrementPan = T1_READ_8(sBattleAnimScriptPtr + 3); + incrementPanArg = T1_READ_8(sBattleAnimScriptPtr + 4); + framesToWait = T1_READ_8(sBattleAnimScriptPtr + 5); + + currentPan = BattleAnimAdjustPanning(currentPanArg); + targetPan = BattleAnimAdjustPanning(incrementPan); + incrementPan = CalculatePanIncrement(currentPan, targetPan, incrementPanArg); + taskId = CreateTask(Task_PanFromInitialToTarget, 1); + gTasks[taskId].tInitialPan = currentPan; + gTasks[taskId].tTargetPan = targetPan; + gTasks[taskId].tIncrementPan = incrementPan; + gTasks[taskId].tFramesToWait = framesToWait; + gTasks[taskId].tCurrentPan = currentPan; + + PlaySE12WithPanning(songNum, currentPan); + gAnimSoundTaskCount++; - gBattleAnimScriptPtr += 6; + sBattleAnimScriptPtr += 6; } -#ifdef NONMATCHING -static void c3_08073CEC(u8 taskId) +void Task_PanFromInitialToTarget(u8 taskId) { - u16 r7 = 0; - s16 r0; - s16 r6; - s16 r3; - s16 r4; - int foo; - - r0 = gTasks[taskId].data[8]; - gTasks[taskId].data[8]++; - if (r0 >= gTasks[taskId].data[3]) + bool32 destroyTask = FALSE; + if (gTasks[taskId].tFrameCounter++ >= gTasks[taskId].tFramesToWait) { - gTasks[taskId].data[8] = r7; - r6 = gTasks[taskId].data[0]; - r3 = gTasks[taskId].data[1]; - foo = gTasks[taskId].data[4] + gTasks[taskId].data[2]; - r4 = foo; - gTasks[taskId].data[4] = r4; - if (gTasks[taskId].data[2] == 0) + s16 pan; + s16 initialPanning, targetPanning, currentPan, incrementPan; + + gTasks[taskId].tFrameCounter = 0; + initialPanning = gTasks[taskId].tInitialPan; + targetPanning = gTasks[taskId].tTargetPan; + currentPan = gTasks[taskId].tCurrentPan; + incrementPan = gTasks[taskId].tIncrementPan; + pan = currentPan + incrementPan; + gTasks[taskId].tCurrentPan = pan; + + if (incrementPan == 0) // If we're not incrementing, just cancel the task immediately { - r4 = r3; - DestroyTask(taskId); - gAnimSoundTaskCount--; + destroyTask = TRUE; } - //_080772D8 - else + else if (initialPanning < targetPanning) // Panning increasing { - if (r6 < r3) - { - if (r4 < r3) - goto check; - DestroyTask(taskId); - gAnimSoundTaskCount--; - } - else - { - if (r4 <= r3) - r7 = 1; - check: - if (r7 != 0) - { - DestroyTask(taskId); - gAnimSoundTaskCount--; - } - } + if (pan >= targetPanning) // Target reached + destroyTask = TRUE; } - //_080772F8 - SE12PanpotControl(r4); + else // Panning decreasing + { + if (pan <= targetPanning) // Target reached + destroyTask = TRUE; + } + + if (destroyTask) + { + pan = targetPanning; + DestroyTask(taskId); + gAnimSoundTaskCount--; + } + + SE12PanpotControl(pan); } - //_08077314 -} -#else -__attribute__((naked)) -static void c3_08073CEC(u8 taskId) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - movs r7, 0\n\ - ldr r1, _080772D4 @ =gTasks\n\ - lsls r0, r5, 2\n\ - adds r0, r5\n\ - lsls r0, 3\n\ - adds r2, r0, r1\n\ - ldrh r0, [r2, 0x18]\n\ - adds r1, r0, 0x1\n\ - strh r1, [r2, 0x18]\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - movs r3, 0xE\n\ - ldrsh r1, [r2, r3]\n\ - cmp r0, r1\n\ - blt _08077314\n\ - strh r7, [r2, 0x18]\n\ - ldrh r6, [r2, 0x8]\n\ - ldrh r3, [r2, 0xA]\n\ - movs r4, 0x10\n\ - ldrsh r0, [r2, r4]\n\ - movs r4, 0xC\n\ - ldrsh r1, [r2, r4]\n\ - adds r0, r1\n\ - lsls r0, 16\n\ - lsrs r4, r0, 16\n\ - strh r4, [r2, 0x10]\n\ - cmp r1, 0\n\ - bne _080772D8\n\ - lsls r2, r3, 16\n\ - b _080772FC\n\ - .align 2, 0\n\ -_080772D4: .4byte gTasks\n\ -_080772D8:\n\ - lsls r1, r6, 16\n\ - lsls r0, r3, 16\n\ - asrs r3, r0, 16\n\ - adds r2, r0, 0\n\ - cmp r1, r2\n\ - bge _080772EE\n\ - lsls r0, r4, 16\n\ - asrs r0, 16\n\ - cmp r0, r3\n\ - blt _080772F8\n\ - b _080772FC\n\ -_080772EE:\n\ - lsls r0, r4, 16\n\ - asrs r0, 16\n\ - cmp r0, r3\n\ - bgt _080772F8\n\ - movs r7, 0x1\n\ -_080772F8:\n\ - cmp r7, 0\n\ - beq _0807730C\n\ -_080772FC:\n\ - lsrs r4, r2, 16\n\ - adds r0, r5, 0\n\ - bl DestroyTask\n\ - ldr r1, _0807731C @ =gAnimSoundTaskCount\n\ - ldrb r0, [r1]\n\ - subs r0, 0x1\n\ - strb r0, [r1]\n\ -_0807730C:\n\ - lsls r0, r4, 24\n\ - asrs r0, 24\n\ - bl SE12PanpotControl\n\ -_08077314:\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_0807731C: .4byte gAnimSoundTaskCount\n\ - .syntax divided\n"); } -#endif static void ScriptCmd_panse_26(void) { - u16 r8; - s8 r4; - s8 r5; - s8 r6; - u8 r10; + u16 songId; + s8 currentPan, targetPan, incrementPan; + u8 framesToWait; u8 taskId; - gBattleAnimScriptPtr++; - r8 = T1_READ_16(gBattleAnimScriptPtr); - r4 = T1_READ_8(gBattleAnimScriptPtr + 2); - r5 = T1_READ_8(gBattleAnimScriptPtr + 3); - r6 = T1_READ_8(gBattleAnimScriptPtr + 4); - r10 = T1_READ_8(gBattleAnimScriptPtr + 5); - taskId = CreateTask(c3_08073CEC, 1); - gTasks[taskId].data[0] = r4; - gTasks[taskId].data[1] = r5; - gTasks[taskId].data[2] = r6; - gTasks[taskId].data[3] = r10; - gTasks[taskId].data[4] = r4; - PlaySE12WithPanning(r8, r4); + sBattleAnimScriptPtr++; + songId = T1_READ_16(sBattleAnimScriptPtr); + currentPan = T1_READ_8(sBattleAnimScriptPtr + 2); + targetPan = T1_READ_8(sBattleAnimScriptPtr + 3); + incrementPan = T1_READ_8(sBattleAnimScriptPtr + 4); + framesToWait = T1_READ_8(sBattleAnimScriptPtr + 5); + + taskId = CreateTask(Task_PanFromInitialToTarget, 1); + gTasks[taskId].tInitialPan = currentPan; + gTasks[taskId].tTargetPan = targetPan; + gTasks[taskId].tIncrementPan = incrementPan; + gTasks[taskId].tFramesToWait = framesToWait; + gTasks[taskId].tCurrentPan = currentPan; + + PlaySE12WithPanning(songId, currentPan); + gAnimSoundTaskCount++; - gBattleAnimScriptPtr += 6; + sBattleAnimScriptPtr += 6; } static void ScriptCmd_panse_27(void) { - u16 r9; - u8 r4; - u8 r8; - u8 r7; - u8 r0; - s8 r6; - s8 r5; - s8 r4_2; + u16 songId; + u8 targetPanArg, incrementPanArg, currentPan, currentPanArg; + s8 targetPan, incrementPan, framesToWait; u8 taskId; - gBattleAnimScriptPtr++; - r9 = T1_READ_16(gBattleAnimScriptPtr); - r0 = T1_READ_8(gBattleAnimScriptPtr + 2); - r4 = T1_READ_8(gBattleAnimScriptPtr + 3); - r8 = T1_READ_8(gBattleAnimScriptPtr + 4); - r7 = T1_READ_8(gBattleAnimScriptPtr + 5); - r6 = sub_8077094(r0); - r5 = sub_8077094(r4); - r4_2 = sub_8077094(r8); - taskId = CreateTask(c3_08073CEC, 1); - gTasks[taskId].data[0] = r6; - gTasks[taskId].data[1] = r5; - gTasks[taskId].data[2] = r4_2; - gTasks[taskId].data[3] = r7; - gTasks[taskId].data[4] = r6; - PlaySE12WithPanning(r9, r6); + sBattleAnimScriptPtr++; + songId = T1_READ_16(sBattleAnimScriptPtr); + currentPanArg = T1_READ_8(sBattleAnimScriptPtr + 2); + targetPanArg = T1_READ_8(sBattleAnimScriptPtr + 3); + incrementPanArg = T1_READ_8(sBattleAnimScriptPtr + 4); + currentPan = T1_READ_8(sBattleAnimScriptPtr + 5); + + targetPan = BattleAnimAdjustPanning2(currentPanArg); + incrementPan = BattleAnimAdjustPanning2(targetPanArg); + framesToWait = BattleAnimAdjustPanning2(incrementPanArg); + + taskId = CreateTask(Task_PanFromInitialToTarget, 1); + gTasks[taskId].data[0] = targetPan; + gTasks[taskId].data[1] = incrementPan; + gTasks[taskId].data[2] = framesToWait; + gTasks[taskId].data[3] = currentPan; + gTasks[taskId].data[4] = targetPan; + + PlaySE12WithPanning(songId, targetPan); + gAnimSoundTaskCount++; - gBattleAnimScriptPtr += 6; + sBattleAnimScriptPtr += 6; } -static void ScriptCmd_panse_1C(void) +#undef tInitialPan +#undef tTargetPan +#undef tIncrementPan +#undef tFramesToWait +#undef tCurrentPan +#undef tFrameCounter + +#define tSongId data[0] +#define tPanning data[1] +#define tFramesToWait data[2] +#define tNumberOfPlays data[3] +#define tFrameCounter data[8] + +static void ScriptCmd_loopsewithpan(void) { - u16 r5; - u8 r0; - u8 r8; - u8 r9; - s8 r4; + u16 songId; + s8 panningArg, panning; + u8 framesToWait, numberOfPlays; u8 taskId; - gBattleAnimScriptPtr++; - r5 = T1_READ_16(gBattleAnimScriptPtr); - r0 = T1_READ_8(gBattleAnimScriptPtr + 2); - r8 = T1_READ_8(gBattleAnimScriptPtr + 3); - r9 = T1_READ_8(gBattleAnimScriptPtr + 4); - r4 = sub_8076F98(r0); - taskId = CreateTask(sub_80774FC, 1); - gTasks[taskId].data[0] = r5; - gTasks[taskId].data[1] = r4; - gTasks[taskId].data[2] = r8; - gTasks[taskId].data[3] = r9; - gTasks[taskId].data[8] = r8; + sBattleAnimScriptPtr++; + songId = T1_READ_16(sBattleAnimScriptPtr); + panningArg = T1_READ_8(sBattleAnimScriptPtr + 2); + framesToWait = T1_READ_8(sBattleAnimScriptPtr + 3); + numberOfPlays = T1_READ_8(sBattleAnimScriptPtr + 4); + panning = BattleAnimAdjustPanning(panningArg); + + taskId = CreateTask(Task_LoopAndPlaySE, 1); + gTasks[taskId].tSongId = songId; + gTasks[taskId].tPanning = panning; + gTasks[taskId].tFramesToWait = framesToWait; + gTasks[taskId].tNumberOfPlays = numberOfPlays; + gTasks[taskId].tFrameCounter = framesToWait; gTasks[taskId].func(taskId); + gAnimSoundTaskCount++; - gBattleAnimScriptPtr += 5; + sBattleAnimScriptPtr += 5; } -static void sub_80774FC(u8 taskId) +static void Task_LoopAndPlaySE(u8 taskId) { - s16 data8; - u16 r0; - s8 r1; - u8 r4; - - data8 = gTasks[taskId].data[8]; - gTasks[taskId].data[8]++; - if (data8 >= gTasks[taskId].data[2]) + if (gTasks[taskId].tFrameCounter++ >= gTasks[taskId].tFramesToWait) { - gTasks[taskId].data[8] = 0; - r0 = gTasks[taskId].data[0]; - r1 = gTasks[taskId].data[1]; - gTasks[taskId].data[3]--; - r4 = gTasks[taskId].data[3]; - PlaySE12WithPanning(r0, r1); - if (r4 == 0) + u16 songId; + s8 panning; + u8 numberOfPlays; + + gTasks[taskId].tFrameCounter = 0; + songId = gTasks[taskId].tSongId; + panning = gTasks[taskId].tPanning; + numberOfPlays = --gTasks[taskId].tNumberOfPlays; + PlaySE12WithPanning(songId, panning); + if (numberOfPlays == 0) { DestroyTask(taskId); gAnimSoundTaskCount--; @@ -1986,57 +1733,67 @@ static void sub_80774FC(u8 taskId) } } -static void ScriptCmd_panse_1D(void) +#undef tSongId +#undef tPanning +#undef tFramesToWait +#undef tNumberOfPlays +#undef tFrameCounter + +#define tSongId data[0] +#define tPanning data[1] +#define tFramesToWait data[2] + +static void ScriptCmd_waitplaysewithpan(void) { - u16 r5; - u8 r0; - u8 r8; - s8 r4; + u16 songId; + s8 panningArg, panning; + u8 framesToWait; u8 taskId; - gBattleAnimScriptPtr++; - r5 = T1_READ_16(gBattleAnimScriptPtr); - r0 = T1_READ_8(gBattleAnimScriptPtr + 2); - r8 = T1_READ_8(gBattleAnimScriptPtr + 3); - r4 = sub_8076F98(r0); - taskId = CreateTask(sub_80775CC, 1); - gTasks[taskId].data[0] = r5; - gTasks[taskId].data[1] = r4; - gTasks[taskId].data[2] = r8; + sBattleAnimScriptPtr++; + songId = T1_READ_16(sBattleAnimScriptPtr); + panningArg = T1_READ_8(sBattleAnimScriptPtr + 2); + framesToWait = T1_READ_8(sBattleAnimScriptPtr + 3); + panning = BattleAnimAdjustPanning(panningArg); + + taskId = CreateTask(Task_WaitAndPlaySE, 1); + gTasks[taskId].tSongId = songId; + gTasks[taskId].tPanning = panning; + gTasks[taskId].tFramesToWait = framesToWait; + gAnimSoundTaskCount++; - gBattleAnimScriptPtr += 4; + sBattleAnimScriptPtr += 4; } -static void sub_80775CC(u8 taskId) +static void Task_WaitAndPlaySE(u8 taskId) { - s16 r0; - - r0 = gTasks[taskId].data[2]; - gTasks[taskId].data[2]--; - if (r0 <= 0) + if (gTasks[taskId].tFramesToWait-- <= 0) { - PlaySE12WithPanning(gTasks[taskId].data[0], gTasks[taskId].data[1]); + PlaySE12WithPanning(gTasks[taskId].tSongId, gTasks[taskId].tPanning); DestroyTask(taskId); gAnimSoundTaskCount--; } } -static void ScriptCmd_createtask_1F(void) +#undef tSongId +#undef tPanning +#undef tFramesToWait + +static void ScriptCmd_createsoundtask(void) { TaskFunc func; - u8 numArgs; - int i; - u8 taskId; + u8 numArgs, taskId; + s32 i; - gBattleAnimScriptPtr++; - func = (TaskFunc)T2_READ_32(gBattleAnimScriptPtr); - gBattleAnimScriptPtr += 4; - numArgs = T1_READ_8(gBattleAnimScriptPtr); - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; + func = (TaskFunc)T2_READ_32(sBattleAnimScriptPtr); + sBattleAnimScriptPtr += 4; + numArgs = T1_READ_8(sBattleAnimScriptPtr); + sBattleAnimScriptPtr++; for (i = 0; i < numArgs; i++) { - gBattleAnimArgs[i] = T1_READ_16(gBattleAnimScriptPtr); - gBattleAnimScriptPtr += 2; + gBattleAnimArgs[i] = T1_READ_16(sBattleAnimScriptPtr); + sBattleAnimScriptPtr += 2; } taskId = CreateTask(func, 1); func(taskId); @@ -2066,61 +1823,51 @@ static void ScriptCmd_waitsound(void) else { gSoundAnimFramesToWait = 0; - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; gAnimFramesToWait = 0; } } -static void ScriptCmd_jumpvareq(void) +static void ScriptCmd_jumpargeq(void) { - u8 r2; - s16 r1; - u8 *addr; + u8 argId; + s16 valueToCheck; - gBattleAnimScriptPtr++; - r2 = T1_READ_8(gBattleAnimScriptPtr); - r1 = T1_READ_16(gBattleAnimScriptPtr + 1); - if (r1 == gBattleAnimArgs[r2]) - { - addr = T2_READ_PTR(gBattleAnimScriptPtr + 3); - gBattleAnimScriptPtr = addr; - } + sBattleAnimScriptPtr++; + argId = T1_READ_8(sBattleAnimScriptPtr); + valueToCheck = T1_READ_16(sBattleAnimScriptPtr + 1); + + if (valueToCheck == gBattleAnimArgs[argId]) + sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr + 3); else - { - gBattleAnimScriptPtr += 7; - } + sBattleAnimScriptPtr += 7; } -static void ScriptCmd_jumpunkcond(void) +static void ScriptCmd_jumpifcontest(void) { - u8 *addr; - - gBattleAnimScriptPtr++; - if (NotInBattle()) - { - addr = T2_READ_PTR(gBattleAnimScriptPtr); - gBattleAnimScriptPtr = addr; - } + sBattleAnimScriptPtr++; + if (IsContest()) + sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr); else - { - gBattleAnimScriptPtr += 4; - } + sBattleAnimScriptPtr += 4; } static void ScriptCmd_monbgprio_28(void) { - u8 r2; - u8 r0; - u8 r4; + u8 wantedBank; + u8 bank; + u8 bankIdentity; + + wantedBank = T1_READ_8(sBattleAnimScriptPtr + 1); + sBattleAnimScriptPtr += 2; - r2 = T1_READ_8(gBattleAnimScriptPtr + 1); - gBattleAnimScriptPtr += 2; - if (r2 != 0) - r0 = gBattleAnimBankTarget; + if (wantedBank != 0) + bank = gAnimBankTarget; else - r0 = gBattleAnimBankAttacker; - r4 = GetBankIdentity(r0); - if (!NotInBattle() && (r4 == 0 || r4 == 3)) + bank = gAnimBankAttacker; + + bankIdentity = GetBankIdentity(bank); + if (!IsContest() && (bankIdentity == 0 || bankIdentity == 3)) { REG_BG1CNT_BITFIELD.priority = 1; REG_BG2CNT_BITFIELD.priority = 2; @@ -2129,8 +1876,8 @@ static void ScriptCmd_monbgprio_28(void) static void ScriptCmd_monbgprio_29(void) { - gBattleAnimScriptPtr++; - if (!NotInBattle()) + sBattleAnimScriptPtr++; + if (!IsContest()) { REG_BG1CNT_BITFIELD.priority = 1; REG_BG2CNT_BITFIELD.priority = 2; @@ -2139,20 +1886,20 @@ static void ScriptCmd_monbgprio_29(void) static void ScriptCmd_monbgprio_2A(void) { - u8 r6; - u8 r4; - u8 r0; + u8 wantedBank; + u8 bankIdentity; + u8 bank; - r6 = T1_READ_8(gBattleAnimScriptPtr + 1); - gBattleAnimScriptPtr += 2; - if (GetBankSide(gBattleAnimBankAttacker) != GetBankSide(gBattleAnimBankTarget)) + wantedBank = T1_READ_8(sBattleAnimScriptPtr + 1); + sBattleAnimScriptPtr += 2; + if (GetBankSide(gAnimBankAttacker) != GetBankSide(gAnimBankTarget)) { - if (r6 != 0) - r0 = gBattleAnimBankTarget; + if (wantedBank != 0) + bank = gAnimBankTarget; else - r0 = gBattleAnimBankAttacker; - r4 = GetBankIdentity(r0); - if (!NotInBattle() && (r4 == 0 || r4 == 3)) + bank = gAnimBankAttacker; + bankIdentity = GetBankIdentity(bank); + if (!IsContest() && (bankIdentity == 0 || bankIdentity == 3)) { REG_BG1CNT_BITFIELD.priority = 1; REG_BG2CNT_BITFIELD.priority = 2; @@ -2162,51 +1909,45 @@ static void ScriptCmd_monbgprio_2A(void) static void ScriptCmd_invisible(void) { - u8 r0; u8 spriteId; - r0 = T1_READ_8(gBattleAnimScriptPtr + 1); - spriteId = GetAnimBankSpriteId(r0); + spriteId = GetAnimBankSpriteId(T1_READ_8(sBattleAnimScriptPtr + 1)); if (spriteId != 0xFF) - { gSprites[spriteId].invisible = TRUE; - } - gBattleAnimScriptPtr += 2; + + sBattleAnimScriptPtr += 2; } static void ScriptCmd_visible(void) { - u8 r0; u8 spriteId; - r0 = T1_READ_8(gBattleAnimScriptPtr + 1); - spriteId = GetAnimBankSpriteId(r0); + spriteId = GetAnimBankSpriteId(T1_READ_8(sBattleAnimScriptPtr + 1)); if (spriteId != 0xFF) - { gSprites[spriteId].invisible = FALSE; - } - gBattleAnimScriptPtr += 2; + + sBattleAnimScriptPtr += 2; } static void ScriptCmd_doublebattle_2D(void) { - u8 r7; + u8 wantedBank; u8 r4; u8 spriteId; - r7 = T1_READ_8(gBattleAnimScriptPtr + 1); - gBattleAnimScriptPtr += 2; - if (!NotInBattle() && IsDoubleBattle() - && GetBankSide(gBattleAnimBankAttacker) == GetBankSide(gBattleAnimBankTarget)) + wantedBank = T1_READ_8(sBattleAnimScriptPtr + 1); + sBattleAnimScriptPtr += 2; + if (!IsContest() && IsDoubleBattle() + && GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget)) { - if (r7 == 0) + if (wantedBank == 0) { - r4 = GetBankIdentity_permutated(gBattleAnimBankAttacker); + r4 = GetBankIdentity_permutated(gAnimBankAttacker); spriteId = GetAnimBankSpriteId(0); } else { - r4 = GetBankIdentity_permutated(gBattleAnimBankTarget); + r4 = GetBankIdentity_permutated(gAnimBankTarget); spriteId = GetAnimBankSpriteId(1); } if (spriteId != 0xFF) @@ -2224,23 +1965,23 @@ static void ScriptCmd_doublebattle_2D(void) static void ScriptCmd_doublebattle_2E(void) { - u8 r7; + u8 wantedBank; u8 r4; u8 spriteId; - r7 = T1_READ_8(gBattleAnimScriptPtr + 1); - gBattleAnimScriptPtr += 2; - if (!NotInBattle() && IsDoubleBattle() - && GetBankSide(gBattleAnimBankAttacker) == GetBankSide(gBattleAnimBankTarget)) + wantedBank = T1_READ_8(sBattleAnimScriptPtr + 1); + sBattleAnimScriptPtr += 2; + if (!IsContest() && IsDoubleBattle() + && GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget)) { - if (r7 == 0) + if (wantedBank == 0) { - r4 = GetBankIdentity_permutated(gBattleAnimBankAttacker); + r4 = GetBankIdentity_permutated(gAnimBankAttacker); spriteId = GetAnimBankSpriteId(0); } else { - r4 = GetBankIdentity_permutated(gBattleAnimBankTarget); + r4 = GetBankIdentity_permutated(gAnimBankTarget); spriteId = GetAnimBankSpriteId(1); } if (spriteId != 0xFF && r4 == 2) @@ -2254,5 +1995,5 @@ static void ScriptCmd_stopsound(void) { m4aMPlayStop(&gMPlay_SE1); m4aMPlayStop(&gMPlay_SE2); - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; } diff --git a/src/battle/battle_anim_807B69C.c b/src/battle/battle_anim_807B69C.c index 6c35a85c9..058a45769 100644 --- a/src/battle/battle_anim_807B69C.c +++ b/src/battle/battle_anim_807B69C.c @@ -9,12 +9,12 @@ #include "trig.h" #include "ewram.h" -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern bool8 gAnimScriptActive; extern void (*gAnimScriptCallback)(void); extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankTarget; extern u8 gObjectBankIDs[]; extern const struct CompressedSpriteSheet gBattleAnimPicTable[]; extern const struct CompressedSpritePalette gBattleAnimPaletteTable[]; @@ -22,7 +22,7 @@ extern const u8 *const gBattleAnims_StatusConditions[]; extern const struct OamData gOamData_837E05C; extern const struct OamData gOamData_837DF24; -extern u8 sub_8077ABC(u8, u8); +extern u8 GetBankPosition(u8, u8); extern void sub_80E32E0(u8); @@ -180,11 +180,11 @@ static void sub_807B8A4(struct Sprite *sprite) void sub_807B920(u8 taskId) { - s16 x = sub_8077ABC(gBattleAnimBankTarget, 2) - 32; - s16 y = sub_8077ABC(gBattleAnimBankTarget, 3) - 36; + s16 x = GetBankPosition(gAnimBankTarget, 2) - 32; + s16 y = GetBankPosition(gAnimBankTarget, 3) - 36; u8 spriteId; - if (NotInBattle()) + if (IsContest()) x -= 6; REG_BLDCNT = 0x3F40; REG_BLDALPHA = 0x1000; @@ -336,9 +336,9 @@ void move_anim_start_t2(u8 a, u8 b) { u8 taskId; - gBattleAnimBankAttacker = a; - gBattleAnimBankTarget = a; - DoMoveAnim(gBattleAnims_StatusConditions, b, 0); + gAnimBankAttacker = a; + gAnimBankTarget = a; + LaunchBattleAnimation(gBattleAnims_StatusConditions, b, 0); taskId = CreateTask(sub_807BDAC, 10); gTasks[taskId].data[0] = a; } diff --git a/src/battle/battle_anim_80A7E7C.c b/src/battle/battle_anim_80A7E7C.c index a1d916f0f..3097f1a0e 100644 --- a/src/battle/battle_anim_80A7E7C.c +++ b/src/battle/battle_anim_80A7E7C.c @@ -10,10 +10,10 @@ extern s16 gBattleAnimArgs[8]; extern u8 gObjectBankIDs[]; -extern s32 gMoveDmgMoveAnim; -extern u16 gMovePowerMoveAnim; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern s32 gAnimMoveDmg; +extern u16 gAnimMovePower; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80A7EF0(u8 taskId); static void sub_80A808C(u8 taskId); @@ -129,7 +129,7 @@ void sub_80A7FA0(u8 taskId) } else { - sprite = gObjectBankIDs[gBattleAnimBankAttacker]; + sprite = gObjectBankIDs[gAnimBankAttacker]; } if (r6) { @@ -328,7 +328,7 @@ static void sub_80A8488(u8 taskId) void sub_80A8500(u8 taskId) { - if (GetBankSide(gBattleAnimBankAttacker)) + if (GetBankSide(gAnimBankAttacker)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; } @@ -338,7 +338,7 @@ void sub_80A8500(u8 taskId) void sub_80A8530(struct Sprite *sprite) { sprite->invisible = TRUE; - if (GetBankSide(gBattleAnimBankAttacker)) + if (GetBankSide(gAnimBankAttacker)) { sprite->data[1] = -gBattleAnimArgs[1]; } @@ -348,7 +348,7 @@ void sub_80A8530(struct Sprite *sprite) } sprite->data[0] = gBattleAnimArgs[0]; sprite->data[2] = 0; - sprite->data[3] = gObjectBankIDs[gBattleAnimBankAttacker]; + sprite->data[3] = gObjectBankIDs[gAnimBankAttacker]; sprite->data[4] = gBattleAnimArgs[0]; StoreSpriteCallbackInData(sprite, sub_80A85A4); sprite->callback = sub_8078458; @@ -359,7 +359,7 @@ static void sub_80A85A4(struct Sprite *sprite) sprite->data[0] = sprite->data[4]; sprite->data[1] = -sprite->data[1]; sprite->callback = sub_8078458; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } void sub_80A85C8(struct Sprite *sprite) @@ -381,7 +381,7 @@ void sub_80A8614(struct Sprite *sprite) sprite->data[0] = sprite->data[4]; sprite->data[2] = -sprite->data[2]; sprite->callback = sub_8078458; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } void sub_80A8638(struct Sprite *sprite) @@ -390,11 +390,11 @@ void sub_80A8638(struct Sprite *sprite) int spriteId; if (!gBattleAnimArgs[0]) { - spriteId = gObjectBankIDs[gBattleAnimBankAttacker]; + spriteId = gObjectBankIDs[gAnimBankAttacker]; } else { - spriteId = gObjectBankIDs[gBattleAnimBankTarget]; + spriteId = gObjectBankIDs[gAnimBankTarget]; } sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x; @@ -439,7 +439,7 @@ static void sub_80A86F4(struct Sprite *sprite) { sprite2->pos2.y = 0; } - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } else { @@ -457,11 +457,11 @@ void sub_80A8764(struct Sprite *sprite) u8 spriteId; if (!gBattleAnimArgs[0]) { - v1 = gBattleAnimBankAttacker; + v1 = gAnimBankAttacker; } else { - v1 = gBattleAnimBankTarget; + v1 = gAnimBankTarget; } spriteId = gObjectBankIDs[v1]; if (GetBankSide(v1)) @@ -482,7 +482,7 @@ void sub_80A8764(struct Sprite *sprite) sprite->data[4] = 0; sprite->data[5] = spriteId; sprite->invisible = TRUE; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sprite->callback = sub_80784A8; } @@ -493,11 +493,11 @@ void sub_80A8818(struct Sprite *sprite) sprite->invisible = TRUE; if (!gBattleAnimArgs[0]) { - v1 = gBattleAnimBankAttacker; + v1 = gAnimBankAttacker; } else { - v1 = gBattleAnimBankTarget; + v1 = gAnimBankTarget; } spriteId = gObjectBankIDs[v1]; if (GetBankSide(v1)) @@ -520,7 +520,7 @@ void sub_80A8818(struct Sprite *sprite) sprite->data[6] = gBattleAnimArgs[5]; if (!gBattleAnimArgs[5]) { - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } else { @@ -534,14 +534,14 @@ static void sub_80A88F0(struct Sprite *sprite) { gSprites[sprite->data[5]].pos2.x = 0; gSprites[sprite->data[5]].pos2.y = 0; - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void sub_80A8920(u8 taskId) { s16 r7; r7 = 0x8000 / gBattleAnimArgs[3]; - if (GetBankSide(gBattleAnimBankAttacker)) + if (GetBankSide(gAnimBankAttacker)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; gBattleAnimArgs[5] = -gBattleAnimArgs[5]; @@ -603,27 +603,27 @@ void sub_80A8A80(u8 taskId) spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]); break; case 2: - if (!IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2)) + if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) { DestroyAnimVisualTask(taskId); return; } - spriteId = gObjectBankIDs[gBattleAnimBankAttacker ^ 2]; + spriteId = gObjectBankIDs[gAnimBankAttacker ^ 2]; break; case 3: - if (!IsAnimBankSpriteVisible(gBattleAnimBankTarget ^ 2)) + if (!IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) { DestroyAnimVisualTask(taskId); return; } - spriteId = gObjectBankIDs[gBattleAnimBankTarget ^ 2]; + spriteId = gObjectBankIDs[gAnimBankTarget ^ 2]; break; default: DestroyAnimVisualTask(taskId); return; } TASK.data[0] = spriteId; - if (GetBankSide(gBattleAnimBankTarget)) + if (GetBankSide(gAnimBankTarget)) { TASK.data[1] = gBattleAnimArgs[1]; } @@ -648,7 +648,7 @@ static void sub_80A8B3C(u8 taskId) void sub_80A8B88(u8 taskId) { u8 spriteId; - if (GetBankSide(gBattleAnimBankAttacker)) + if (GetBankSide(gAnimBankAttacker)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; } @@ -660,11 +660,11 @@ void sub_80A8B88(u8 taskId) TASK.data[4] = spriteId; if (gBattleAnimArgs[4] == 0) { - TASK.data[5] = gBattleAnimBankAttacker; + TASK.data[5] = gAnimBankAttacker; } else { - TASK.data[5] = gBattleAnimBankTarget; + TASK.data[5] = gAnimBankTarget; } TASK.data[12] = 1; TASK.func = sub_80A8C0C; @@ -769,7 +769,7 @@ void sub_80A8E04(u8 taskId) TASK.data[4] = gBattleAnimArgs[1]; TASK.data[5] = spriteId; TASK.data[6] = gBattleAnimArgs[3]; - if (NotInBattle()) + if (IsContest()) { TASK.data[7] = 1; } @@ -777,16 +777,16 @@ void sub_80A8E04(u8 taskId) { if (gBattleAnimArgs[2] == 0) { - TASK.data[7] = !GetBankSide(gBattleAnimBankAttacker); + TASK.data[7] = !GetBankSide(gAnimBankAttacker); } else { - TASK.data[7] = !GetBankSide(gBattleAnimBankTarget); + TASK.data[7] = !GetBankSide(gAnimBankTarget); } } if (TASK.data[7]) { - if (!NotInBattle()) + if (!IsContest()) { TASK.data[3] *= -1; TASK.data[4] *= -1; @@ -804,14 +804,14 @@ void sub_80A8EFC(u8 taskId) TASK.data[2] = gBattleAnimArgs[0]; if (gBattleAnimArgs[2] == 0) { - if (GetBankSide(gBattleAnimBankAttacker)) + if (GetBankSide(gAnimBankAttacker)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; } } else { - if (GetBankSide(gBattleAnimBankTarget)) + if (GetBankSide(gAnimBankTarget)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; } @@ -864,7 +864,7 @@ void sub_80A9058(u8 taskId) { if (!gBattleAnimArgs[0]) { - TASK.data[15] = gMovePowerMoveAnim / 12; + TASK.data[15] = gAnimMovePower / 12; if (TASK.data[15] < 1) { TASK.data[15] = 1; @@ -876,7 +876,7 @@ void sub_80A9058(u8 taskId) } else { - TASK.data[15] = gMoveDmgMoveAnim / 12; + TASK.data[15] = gAnimMoveDmg / 12; if (TASK.data[15] < 1) { TASK.data[15] = 1; diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c index 3259fc7ee..35d8f33c8 100644 --- a/src/battle/battle_controller_linkopponent.c +++ b/src/battle/battle_controller_linkopponent.c @@ -1,5 +1,6 @@ #include "global.h" #include "battle.h" +#include "battle_anim.h" #include "battle_interface.h" #include "data2.h" #include "link.h" @@ -17,7 +18,7 @@ #include "util.h" #include "ewram.h" -struct UnknownStruct3 +struct MovePpInfo { u16 moves[4]; u8 pp[4]; @@ -32,12 +33,11 @@ extern u8 gHealthboxIDs[]; extern u16 gBattleTypeFlags; extern u8 gBattleMonForms[]; extern void (*gBattleBankFunc[])(void); -extern u32 *gDisableStructMoveAnim; -extern u32 gMoveDmgMoveAnim; -extern u16 gMovePowerMoveAnim; -extern u8 gHappinessMoveAnim; +extern u32 gAnimMoveDmg; +extern u16 gAnimMovePower; +extern u8 gAnimFriendship; extern u16 gWeatherMoveAnim; -extern u32 gPID_perBank[]; +extern u32 gTransformedPersonalities[]; extern u8 gAnimScriptActive; extern void (*gAnimScriptCallback)(void); extern u8 gDisplayedStringBattle[]; @@ -46,7 +46,7 @@ extern u8 gBattleOutcome; extern u16 gUnknown_02024DE8; extern u8 gUnknown_02024E68[]; extern struct SpriteTemplate gUnknown_02024E8C; -extern u8 gUnknown_0202F7C4; +extern u8 gAnimMoveTurn; extern struct Window gUnknown_03004210; extern u16 gUnknown_030042A0; extern u16 gUnknown_030042A4; @@ -79,7 +79,7 @@ extern void sub_8010384(struct Sprite *); extern void sub_8037B78(void); extern u8 sub_8031720(); extern bool8 mplay_80342A4(u8); -extern void ExecuteMoveAnim(); +extern void DoMoveAnim(); extern void sub_80326EC(); extern void sub_8031F24(void); extern void sub_80324BC(); @@ -100,7 +100,7 @@ extern void nullsub_47(void); extern bool8 IsDoubleBattle(void); extern void sub_8037840(void); extern void sub_8031B74(); -extern u8 AnimBankSpriteExists(); +extern u8 IsBankSpritePresent(); extern u8 move_anim_start_t3(); extern void sub_8037FD8(void); extern void sub_8037F34(void); @@ -596,7 +596,7 @@ void LinkOpponentHandleGetAttributes(void) u32 dp01_getattr_by_ch1_for_player_pokemon__(u8 a, u8 *buffer) { struct BattlePokemon battlePokemon; - struct UnknownStruct3 moveData; + struct MovePpInfo moveData; u8 nickname[20]; u8 *src; s16 data16; @@ -925,7 +925,7 @@ void LinkOpponentHandleSetAttributes(void) void sub_8038900(u8 a) { struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3]; - struct UnknownStruct3 *moveData = (struct UnknownStruct3 *)&gBattleBufferA[gActiveBank][3]; + struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3]; s32 i; switch (gBattleBufferA[gActiveBank][1]) @@ -1157,7 +1157,7 @@ void LinkOpponentHandleLoadPokeSprite(void) GetMonSpriteTemplate_803C56C(species, GetBankIdentity(gActiveBank)); gObjectBankIDs[gActiveBank] = CreateSprite( &gUnknown_02024E8C, - sub_8077ABC(gActiveBank, 2), + GetBankPosition(gActiveBank, 2), sub_8077F68(gActiveBank), sub_8079E90(gActiveBank)); gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -240; @@ -1187,7 +1187,7 @@ void sub_8039430(u8 a, u8 b) GetMonSpriteTemplate_803C56C(species, GetBankIdentity(a)); gObjectBankIDs[a] = CreateSprite( &gUnknown_02024E8C, - sub_8077ABC(a, 2), + GetBankPosition(a, 2), sub_8077F68(a), sub_8079E90(a)); gSprites[gUnknown_0300434C[a]].data[1] = gObjectBankIDs[a]; @@ -1331,21 +1331,21 @@ void LinkOpponentHandleMoveAnimation(void) u32 r0 = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8); - gUnknown_0202F7C4 = gBattleBufferA[gActiveBank][3]; - gMovePowerMoveAnim = gBattleBufferA[gActiveBank][4] + gAnimMoveTurn = gBattleBufferA[gActiveBank][3]; + gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8); - gMoveDmgMoveAnim = gBattleBufferA[gActiveBank][6] + gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24); - gHappinessMoveAnim = gBattleBufferA[gActiveBank][10]; + gAnimFriendship = gBattleBufferA[gActiveBank][10]; gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8); - gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16]; - gPID_perBank[gActiveBank] = *gDisableStructMoveAnim; + gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16]; + gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality; // Dead code. sub_8031720 always returns 0. - if (sub_8031720(r0, gUnknown_0202F7C4) != 0) + if (sub_8031720(r0, gAnimMoveTurn) != 0) { LinkOpponentBufferExecCompleted(); } @@ -1377,7 +1377,7 @@ void sub_8039B64(void) if (!ewram17810[gActiveBank].unk0_6) { sub_80326EC(0); - ExecuteMoveAnim(r4); + DoMoveAnim(r4); ewram17810[gActiveBank].unk4 = 2; } break; @@ -1731,7 +1731,7 @@ void LinkOpponentHandlecmd50(void) void LinkOpponentHandleSpriteInvisibility(void) { - if (AnimBankSpriteExists(gActiveBank) != 0) + if (IsBankSpritePresent(gActiveBank) != 0) { gSprites[gObjectBankIDs[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1]; sub_8031F88(gActiveBank); diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c index fc3fde661..adc3c1c85 100644 --- a/src/battle/battle_controller_linkpartner.c +++ b/src/battle/battle_controller_linkpartner.c @@ -1,5 +1,6 @@ #include "global.h" #include "battle.h" +#include "battle_anim.h" #include "battle_interface.h" #include "data2.h" #include "battle_811DA74.h" @@ -21,15 +22,7 @@ #include "util.h" #include "ewram.h" -struct UnknownStruct1 -{ - u8 unk0; - u8 unk1; - u8 unk2[0x1FE]; -}; - -//Possibly PokemonSubstruct1 -struct UnknownStruct3 +struct MovePpInfo { u16 moves[4]; u8 pp[4]; @@ -47,14 +40,13 @@ extern u8 gBattleOutcome; extern u16 gUnknown_02024DE8; extern u8 gUnknown_02024E68[]; extern u8 gDoingBattleAnim; -extern u32 gPID_perBank[]; +extern u32 gTransformedPersonalities[]; extern struct SpriteTemplate gUnknown_02024E8C; -extern u32 *gDisableStructMoveAnim; -extern u32 gMoveDmgMoveAnim; -extern u16 gMovePowerMoveAnim; -extern u8 gHappinessMoveAnim; +extern u32 gAnimMoveDmg; +extern u16 gAnimMovePower; +extern u8 gAnimFriendship; extern u16 gWeatherMoveAnim; -extern u8 gUnknown_0202F7C4; +extern u8 gAnimMoveTurn; extern struct Window gUnknown_03004210; extern u16 gUnknown_030042A0; extern u16 gUnknown_030042A4; @@ -67,7 +59,7 @@ extern u8 gAnimScriptActive; extern void (*gAnimScriptCallback)(void); extern u8 move_anim_start_t3(); -extern u8 AnimBankSpriteExists(); +extern u8 IsBankSpritePresent(); extern void sub_8044CA0(u8); extern void sub_8030E38(struct Sprite *); extern void sub_80E43C0(); @@ -78,7 +70,7 @@ extern void sub_8043D84(); extern void BufferStringBattle(); extern void sub_8031F24(void); extern void sub_80326EC(); -extern void ExecuteMoveAnim(); +extern void DoMoveAnim(); extern void sub_80324BC(); extern u8 sub_8031720(); extern u8 mplay_80342A4(); @@ -93,7 +85,7 @@ extern u8 sub_8046400(); extern void sub_80312F0(struct Sprite *); extern u8 CreateInvisibleSpriteWithCallback(); extern void BattleLoadPlayerMonSprite(); -extern u8 sub_8077ABC(); +extern u8 GetBankPosition(); extern u8 sub_8077F68(); extern u8 sub_8079E90(); extern void nullsub_10(); @@ -552,7 +544,7 @@ void LinkPartnerHandleGetAttributes(void) u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *buffer) { struct BattlePokemon battlePokemon; - struct UnknownStruct3 moveData; + struct MovePpInfo moveData; u8 nickname[20]; u8 *src; s16 data16; @@ -881,7 +873,7 @@ void LinkPartnerHandleSetAttributes(void) void sub_811EC68(u8 a) { struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3]; - struct UnknownStruct3 *moveData = (struct UnknownStruct3 *)&gBattleBufferA[gActiveBank][3]; + struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3]; s32 i; switch (gBattleBufferA[gActiveBank][1]) @@ -1114,7 +1106,7 @@ void LinkPartnerHandleLoadPokeSprite(void) GetBankIdentity(gActiveBank)); gObjectBankIDs[gActiveBank] = CreateSprite( &gUnknown_02024E8C, - sub_8077ABC(gActiveBank, 2), + GetBankPosition(gActiveBank, 2), sub_8077F68(gActiveBank), sub_8079E90(gActiveBank)); gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -240; @@ -1144,7 +1136,7 @@ void sub_811F864(u8 a, u8 b) GetMonSpriteTemplate_803C56C(species, GetBankIdentity(a)); gObjectBankIDs[a] = CreateSprite( &gUnknown_02024E8C, - sub_8077ABC(a, 2), + GetBankPosition(a, 2), sub_8077F68(a), sub_8079E90(a)); gSprites[gUnknown_0300434C[a]].data[1] = gObjectBankIDs[a]; @@ -1287,20 +1279,20 @@ void LinkPartnerHandleMoveAnimation(void) u32 r0 = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8); - gUnknown_0202F7C4 = gBattleBufferA[gActiveBank][3]; - gMovePowerMoveAnim = gBattleBufferA[gActiveBank][4] + gAnimMoveTurn = gBattleBufferA[gActiveBank][3]; + gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8); - gMoveDmgMoveAnim = gBattleBufferA[gActiveBank][6] + gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24); - gHappinessMoveAnim = gBattleBufferA[gActiveBank][10]; + gAnimFriendship = gBattleBufferA[gActiveBank][10]; gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8); - gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16]; - gPID_perBank[gActiveBank] = *gDisableStructMoveAnim; + gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16]; + gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality; - if (sub_8031720(r0, gUnknown_0202F7C4) != 0) + if (sub_8031720(r0, gAnimMoveTurn) != 0) LinkPartnerBufferExecCompleted(); else { @@ -1330,7 +1322,7 @@ void sub_811FF30(void) if (!ewram17810[gActiveBank].unk0_6) { sub_80326EC(0); - ExecuteMoveAnim(r4); + DoMoveAnim(r4); ewram17810[gActiveBank].unk4 = 2; } break; @@ -1679,7 +1671,7 @@ void LinkPartnerHandlecmd50(void) void LinkPartnerHandleSpriteInvisibility(void) { - if (AnimBankSpriteExists(gActiveBank) != 0) + if (IsBankSpritePresent(gActiveBank) != 0) { gSprites[gObjectBankIDs[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1]; sub_8031F88(gActiveBank); diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c index a35687796..54bb9d7f9 100644 --- a/src/battle/battle_controller_opponent.c +++ b/src/battle/battle_controller_opponent.c @@ -1,5 +1,6 @@ #include "global.h" #include "battle.h" +#include "battle_anim.h" #include "battle_interface.h" #include "data2.h" #include "battle_811DA74.h" @@ -22,7 +23,7 @@ #include "util.h" #include "ewram.h" -struct UnknownStruct3 +struct MovePpInfo { u16 moves[4]; u8 pp[4]; @@ -40,13 +41,12 @@ extern u8 gUnknown_0300434C[]; extern u8 gHealthboxIDs[]; extern u16 gBattleTypeFlags; extern u16 gTrainerBattleOpponent; -extern u32 *gDisableStructMoveAnim; -extern u32 gMoveDmgMoveAnim; -extern u16 gMovePowerMoveAnim; -extern u8 gHappinessMoveAnim; +extern u32 gAnimMoveDmg; +extern u16 gAnimMovePower; +extern u8 gAnimFriendship; extern u16 gWeatherMoveAnim; -extern u32 gPID_perBank[]; -extern u8 gUnknown_0202F7C4; +extern u32 gTransformedPersonalities[]; +extern u8 gAnimMoveTurn; extern u8 gAnimScriptActive; extern void (*gAnimScriptCallback)(void); extern struct Window gUnknown_03004210; @@ -65,7 +65,7 @@ extern struct MusicPlayerInfo gMPlay_SE2; extern struct MusicPlayerInfo gMPlay_BGM; extern u32 gBattleExecBuffer; -extern u8 sub_8077ABC(); +extern u8 GetBankPosition(); extern u8 sub_8077F68(); extern u8 sub_8079E90(); extern void sub_8033018(void); @@ -91,7 +91,7 @@ extern void sub_803311C(void); extern void sub_8010384(struct Sprite *); extern bool8 mplay_80342A4(u8); extern u8 sub_8031720(); -extern void ExecuteMoveAnim(); +extern void DoMoveAnim(); extern void sub_80326EC(); extern void sub_8031F24(void); extern void sub_80324BC(); @@ -114,7 +114,7 @@ extern void nullsub_45(void); extern void sub_8031B74(); extern bool8 IsDoubleBattle(void); extern void sub_8032E2C(void); -extern u8 AnimBankSpriteExists(); +extern u8 IsBankSpritePresent(); extern u8 move_anim_start_t3(); extern void sub_80334C0(void); @@ -560,7 +560,7 @@ void OpponentHandleGetAttributes(void) u32 sub_8033598(u8 a, u8 *buffer) { struct BattlePokemon battlePokemon; - struct UnknownStruct3 moveData; + struct MovePpInfo moveData; u8 nickname[20]; u8 *src; s16 data16; @@ -896,7 +896,7 @@ void OpponentHandleSetAttributes(void) void sub_8033E24(u8 a) { struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3]; - struct UnknownStruct3 *moveData = (struct UnknownStruct3 *)&gBattleBufferA[gActiveBank][3]; + struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3]; s32 i; switch (gBattleBufferA[gActiveBank][1]) @@ -1127,7 +1127,7 @@ void OpponentHandleLoadPokeSprite(void) GetMonSpriteTemplate_803C56C(species, GetBankIdentity(gActiveBank)); gObjectBankIDs[gActiveBank] = CreateSprite( &gUnknown_02024E8C, - sub_8077ABC(gActiveBank, 2), + GetBankPosition(gActiveBank, 2), sub_8077F68(gActiveBank), sub_8079E90(gActiveBank)); gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -240; @@ -1159,7 +1159,7 @@ void sub_803495C(u8 a, u8 b) GetMonSpriteTemplate_803C56C(species, GetBankIdentity(a)); gObjectBankIDs[a] = CreateSprite( &gUnknown_02024E8C, - sub_8077ABC(a, 2), + GetBankPosition(a, 2), sub_8077F68(a), sub_8079E90(a)); gSprites[gObjectBankIDs[a]].data[0] = a; @@ -1325,21 +1325,21 @@ void OpponentHandleMoveAnimation(void) u32 r0 = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8); - gUnknown_0202F7C4 = gBattleBufferA[gActiveBank][3]; - gMovePowerMoveAnim = gBattleBufferA[gActiveBank][4] + gAnimMoveTurn = gBattleBufferA[gActiveBank][3]; + gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8); - gMoveDmgMoveAnim = gBattleBufferA[gActiveBank][6] + gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24); - gHappinessMoveAnim = gBattleBufferA[gActiveBank][10]; + gAnimFriendship = gBattleBufferA[gActiveBank][10]; gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8); - gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16]; - gPID_perBank[gActiveBank] = *gDisableStructMoveAnim; + gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16]; + gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality; // Dead code. sub_8031720 always returns 0. - if (sub_8031720(r0, gUnknown_0202F7C4) != 0) + if (sub_8031720(r0, gAnimMoveTurn) != 0) { OpponentBufferExecCompleted(); } @@ -1371,7 +1371,7 @@ void sub_8035238(void) if (!ewram17810[gActiveBank].unk0_6) { sub_80326EC(0); - ExecuteMoveAnim(r4); + DoMoveAnim(r4); ewram17810[gActiveBank].unk4 = 2; } break; @@ -2003,7 +2003,7 @@ void OpponentHandlecmd50(void) void OpponentHandleSpriteInvisibility(void) { - if (AnimBankSpriteExists(gActiveBank) != 0) + if (IsBankSpritePresent(gActiveBank) != 0) { gSprites[gObjectBankIDs[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1]; sub_8031F88(gActiveBank); diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index c2d34db0d..70773473d 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -1,6 +1,7 @@ #include "global.h" #include "data2.h" #include "battle.h" +#include "battle_anim.h" #include "battle_interface.h" #include "battle_message.h" #include "item.h" @@ -21,8 +22,7 @@ #include "util.h" #include "ewram.h" -//Possibly PokemonSubstruct1 -struct UnknownStruct3 +struct MovePpInfo { u16 moves[4]; u8 pp[4]; @@ -56,25 +56,24 @@ extern u16 gBattleTypeFlags; extern u8 gBattleOutcome; extern void (*gAnimScriptCallback)(void); extern bool8 gAnimScriptActive; -extern u16 gMovePowerMoveAnim; -extern u32 gMoveDmgMoveAnim; -extern u8 gHappinessMoveAnim; +extern u16 gAnimMovePower; +extern u32 gAnimMoveDmg; +extern u8 gAnimFriendship; extern u16 gWeatherMoveAnim; -extern u32 *gDisableStructMoveAnim; -extern u32 gPID_perBank[]; +extern u32 gTransformedPersonalities[]; extern u8 gBattleMonForms[]; extern u16 gUnknown_02024DE8; extern u8 gUnknown_02024E68[]; extern struct SpriteTemplate gUnknown_02024E8C; -extern u8 gUnknown_0202F7C4; +extern u8 gAnimMoveTurn; extern u8 gUnknown_02038470[]; extern u16 gUnknown_030041B0; -extern u16 gUnknown_030041B4; +extern u16 gBattle_BG1_Y; extern u16 gUnknown_030041B8; -extern u16 gUnknown_03004280; -extern u16 gUnknown_03004288; +extern u16 gBattle_BG2_Y; +extern u16 gBattle_BG2_X; extern u16 gUnknown_030042A4; -extern u16 gUnknown_030042C0; +extern u16 gBattle_BG1_X; extern u8 gUnknown_03004344; extern u8 gUnknown_0300434C[]; @@ -106,7 +105,7 @@ extern void StoreSpriteCallbackInData(); extern void BattleLoadPlayerMonSprite(); extern bool8 IsDoubleBattle(void); extern void sub_802D500(void); -extern bool8 AnimBankSpriteExists(u8); +extern bool8 IsBankSpritePresent(u8); extern bool8 move_anim_start_t3(); extern void sub_802E460(void); extern void b_link_standby_message(void); @@ -114,7 +113,7 @@ extern void sub_802D18C(void); extern void sub_802DF18(void); extern void BufferStringBattle(); extern void sub_80326EC(); -extern void ExecuteMoveAnim(); +extern void DoMoveAnim(); extern void sub_8031F24(void); extern void sub_80324BC(); extern u8 sub_8031720(); @@ -131,7 +130,7 @@ extern void sub_802D204(void); extern u8 sub_8079E90(); extern void sub_802DEAC(void); extern void sub_80312F0(struct Sprite *); -extern u8 sub_8077ABC(); +extern u8 GetBankPosition(); extern u8 sub_8077F68(); extern u8 sub_8046400(); extern void sub_802D798(void); @@ -606,7 +605,7 @@ void sub_802C2EC(void) } } -struct UnknownStruct1 +struct ChooseMoveStruct { u16 moves[4]; u8 pp[4]; @@ -621,7 +620,7 @@ const u8 gUnknown_081FAE80[] = _("{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW WHITE LIGHT void sub_802C68C(void) { u32 r8 = 0; - struct UnknownStruct1 *r6 = (struct UnknownStruct1 *)(gBattleBufferA[gActiveBank] + 4); + struct ChooseMoveStruct *r6 = (struct ChooseMoveStruct *)(gBattleBufferA[gActiveBank] + 4); if (gMain.newKeys & A_BUTTON) { @@ -764,7 +763,7 @@ void sub_802CA60(void) u8 pp[4]; u8 filler18[8]; // what is this? } sp0; - //struct UnknownStruct1 sp0; + //struct ChooseMoveStruct sp0; u8 totalPPBonuses; if (gMain.newKeys & (A_BUTTON | SELECT_BUTTON)) @@ -772,7 +771,7 @@ void sub_802CA60(void) PlaySE(SE_SELECT); if (gMoveSelectionCursor[gActiveBank] != gUnknown_03004344) { - struct UnknownStruct1 *r9 = (struct UnknownStruct1 *)&gBattleBufferA[gActiveBank][4]; + struct ChooseMoveStruct *r9 = (struct ChooseMoveStruct *)&gBattleBufferA[gActiveBank][4]; s32 i; i = r9->moves[gMoveSelectionCursor[gActiveBank]]; @@ -1554,7 +1553,7 @@ void bx_blink_t1(void) void sub_802E12C(s32 a, const u8 *b) { - struct UnknownStruct1 *r4 = (struct UnknownStruct1 *)&gBattleBufferA[gActiveBank][4]; + struct ChooseMoveStruct *r4 = (struct ChooseMoveStruct *)&gBattleBufferA[gActiveBank][4]; StringCopy(gDisplayedStringBattle, b); StringAppend(gDisplayedStringBattle, gMoveNames[r4->moves[a]]); @@ -1569,7 +1568,7 @@ void sub_802E12C(s32 a, const u8 *b) void sub_802E1B0(void) { - struct UnknownStruct1 *r4 = (struct UnknownStruct1 *)&gBattleBufferA[gActiveBank][4]; + struct ChooseMoveStruct *r4 = (struct ChooseMoveStruct *)&gBattleBufferA[gActiveBank][4]; s32 i; gUnknown_03004348 = 0; @@ -1587,7 +1586,7 @@ void sub_802E220(void) { if (gBattleBufferA[gActiveBank][2] != 1) { - struct UnknownStruct1 *r4 = (struct UnknownStruct1 *)&gBattleBufferA[gActiveBank][4]; + struct ChooseMoveStruct *r4 = (struct ChooseMoveStruct *)&gBattleBufferA[gActiveBank][4]; u8 *str = gDisplayedStringBattle; str = StringCopy(str, BattleText_Format); @@ -1619,7 +1618,7 @@ void sub_802E2D4(void) } else { - struct UnknownStruct1 *r4 = (struct UnknownStruct1 *)&gBattleBufferA[gActiveBank][4]; + struct ChooseMoveStruct *r4 = (struct ChooseMoveStruct *)&gBattleBufferA[gActiveBank][4]; u8 *str = gDisplayedStringBattle; str = StringCopy(str, BattleText_Format); @@ -1731,7 +1730,7 @@ void PlayerHandleGetAttributes(void) u32 dp01_getattr_by_ch1_for_player_pokemon_(u8 a, u8 *buffer) { struct BattlePokemon battlePokemon; - struct UnknownStruct3 moveData; + struct MovePpInfo moveData; u8 nickname[20]; u8 *src; s16 data16; @@ -2068,7 +2067,7 @@ void PlayerHandleSetAttributes(void) void dp01_setattr_by_ch1_for_player_pokemon(u8 a) { struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3]; - struct UnknownStruct3 *moveData = (struct UnknownStruct3 *)&gBattleBufferA[gActiveBank][3]; + struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3]; s32 i; switch (gBattleBufferA[gActiveBank][1]) @@ -2321,7 +2320,7 @@ void sub_802F934(u8 bank, u8 b) GetMonSpriteTemplate_803C56C(species, GetBankIdentity(bank)); gObjectBankIDs[bank] = CreateSprite( &gUnknown_02024E8C, - sub_8077ABC(bank, 2), + GetBankPosition(bank, 2), sub_8077F68(bank), sub_8079E90(bank)); gSprites[gUnknown_0300434C[bank]].data[1] = gObjectBankIDs[bank]; @@ -2490,14 +2489,14 @@ void PlayerHandleMoveAnimation(void) { u16 r0 = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8); - gUnknown_0202F7C4 = gBattleBufferA[gActiveBank][3]; - gMovePowerMoveAnim = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8); - gMoveDmgMoveAnim = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24); - gHappinessMoveAnim = gBattleBufferA[gActiveBank][10]; + gAnimMoveTurn = gBattleBufferA[gActiveBank][3]; + gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8); + gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24); + gAnimFriendship = gBattleBufferA[gActiveBank][10]; gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8); - gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16]; - gPID_perBank[gActiveBank] = *gDisableStructMoveAnim; - if (sub_8031720(r0, gUnknown_0202F7C4) != 0) + gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16]; + gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality; + if (sub_8031720(r0, gAnimMoveTurn) != 0) { // Dead code. sub_8031720 always returns 0. PlayerBufferExecCompleted(); @@ -2529,7 +2528,7 @@ void sub_8030190(void) if (ewram17810[gActiveBank].unk0_6 == 0) { sub_80326EC(0); - ExecuteMoveAnim(r4); + DoMoveAnim(r4); ewram17810[gActiveBank].unk4 = 2; } break; @@ -2990,7 +2989,7 @@ void PlayerHandlecmd50(void) void PlayerHandleSpriteInvisibility(void) { - if (AnimBankSpriteExists(gActiveBank)) + if (IsBankSpritePresent(gActiveBank)) { gSprites[gObjectBankIDs[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1]; sub_8031F88(gActiveBank); diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c index d81c43381..8ace11fc1 100644 --- a/src/battle/battle_controller_wally.c +++ b/src/battle/battle_controller_wally.c @@ -1,5 +1,6 @@ #include "global.h" #include "battle.h" +#include "battle_anim.h" #include "battle_interface.h" #include "battle_message.h" #include "data2.h" @@ -19,8 +20,7 @@ #include "util.h" #include "ewram.h" -//Possibly PokemonSubstruct1 -struct UnknownStruct3 +struct MovePpInfo { u16 moves[4]; u8 pp[4]; @@ -37,12 +37,11 @@ extern bool8 gDoingBattleAnim; extern u16 gBattlePartyID[]; extern u8 gHealthboxIDs[]; extern u16 gBattleTypeFlags; -extern u16 gMovePowerMoveAnim; -extern u32 gMoveDmgMoveAnim; -extern u8 gHappinessMoveAnim; +extern u16 gAnimMovePower; +extern u32 gAnimMoveDmg; +extern u8 gAnimFriendship; extern u16 gWeatherMoveAnim; -extern u32 *gDisableStructMoveAnim; -extern u32 gPID_perBank[]; +extern u32 gTransformedPersonalities[]; extern void (*gAnimScriptCallback)(void); extern bool8 gAnimScriptActive; extern u8 gDisplayedStringBattle[]; @@ -52,7 +51,7 @@ extern u8 gBattleOutcome; extern u16 gUnknown_02024DE8; extern u8 gUnknown_02024E68[]; extern struct SpriteTemplate gUnknown_02024E8C; -extern u8 gUnknown_0202F7C4; +extern u8 gAnimMoveTurn; extern struct Window gUnknown_03004210; extern u16 gUnknown_030042A0; extern u16 gUnknown_030042A4; @@ -78,7 +77,7 @@ extern u8 GetBankIdentity(u8); extern void sub_80313A0(struct Sprite *); extern u8 GetBankByPlayerAI(u8); extern u8 sub_8031720(); -extern void ExecuteMoveAnim(); +extern void DoMoveAnim(); extern void sub_80326EC(); extern void sub_8031F24(void); extern void sub_80324BC(); @@ -92,7 +91,7 @@ extern void sub_8078B34(struct Sprite *); extern void sub_8030E38(struct Sprite *); extern void StoreSpriteCallbackInData(); extern u8 sub_8046400(); -extern u8 sub_8077ABC(); +extern u8 GetBankPosition(); extern u8 sub_8077F68(); extern u8 sub_8079E90(); extern void sub_80312F0(struct Sprite *); @@ -528,7 +527,7 @@ void WallyHandleGetAttributes(void) u32 sub_8137A84(u8 a, u8 *buffer) { struct BattlePokemon battlePokemon; - struct UnknownStruct3 moveData; + struct MovePpInfo moveData; u8 nickname[20]; u8 *src; s16 data16; @@ -856,7 +855,7 @@ void WallyHandleSetAttributes(void) void sub_8138294(u8 a) { struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3]; - struct UnknownStruct3 *moveData = (struct UnknownStruct3 *)&gBattleBufferA[gActiveBank][3]; + struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3]; s32 i; switch (gBattleBufferA[gActiveBank][1]) @@ -1171,16 +1170,16 @@ void WallyHandlePuase(void) void WallyHandleMoveAnimation(void) { - u16 r0 = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8); + u16 move = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8); - gUnknown_0202F7C4 = gBattleBufferA[gActiveBank][3]; - gMovePowerMoveAnim = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8); - gMoveDmgMoveAnim = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24); - gHappinessMoveAnim = gBattleBufferA[gActiveBank][10]; + gAnimMoveTurn = gBattleBufferA[gActiveBank][3]; + gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8); + gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24); + gAnimFriendship = gBattleBufferA[gActiveBank][10]; gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8); - gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16]; - gPID_perBank[gActiveBank] = *gDisableStructMoveAnim; - if (sub_8031720(r0, gUnknown_0202F7C4) != 0) + gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16]; + gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality; + if (sub_8031720(move, gAnimMoveTurn) != 0) { // Dead code. sub_8031720 always returns 0. WallyBufferExecCompleted(); @@ -1211,7 +1210,7 @@ void sub_81390D0(void) if (ewram17810[gActiveBank].unk0_6 == 0) { sub_80326EC(0); - ExecuteMoveAnim(r4); + DoMoveAnim(r4); ewram17810[gActiveBank].unk4 = 2; } break; @@ -1511,7 +1510,7 @@ void sub_81398BC(u8 bank) GetMonSpriteTemplate_803C56C(species, GetBankIdentity(bank)); gObjectBankIDs[bank] = CreateSprite( &gUnknown_02024E8C, - sub_8077ABC(bank, 2), + GetBankPosition(bank, 2), sub_8077F68(bank), sub_8079E90(bank)); gSprites[gUnknown_0300434C[bank]].data[1] = gObjectBankIDs[bank]; diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c index ea393277e..97568d254 100644 --- a/src/battle/battle_interface.c +++ b/src/battle/battle_interface.c @@ -583,7 +583,7 @@ void nullsub_11() { } -void sub_8043EB4(u8 priority) +void UpdateOamPriorityInAllHealthboxes(u8 priority) { s32 i; diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c index 6faa3ace3..4ac8c7a6f 100644 --- a/src/battle/battle_message.c +++ b/src/battle/battle_message.c @@ -756,7 +756,7 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst) toCpy = gSaveBlock2.playerName; break; case 33: // ? - toCpy = sub_8082830(); + toCpy = GetTrainerLoseText(); break; case 34: // ? HANDLE_NICKNAME_STRING_CASE(BATTLE_STRUCT->scriptingActive, BATTLE_STRUCT->unk1605E) diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index 2f94dd407..b4ff407fc 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -802,7 +802,7 @@ static u8 GetTrainerBattleTransition(void) u8 enemyLevel; u8 playerLevel; - if (gTrainerBattleOpponent == 1024) // link battle? + if (gTrainerBattleOpponent == SECRET_BASE_OPPONENT) // link battle? return B_TRANSITION_STEVEN; trainer = gTrainers; @@ -915,20 +915,21 @@ static bool32 IsPlayerDefeated(u32 battleOutcome) { switch (battleOutcome) { - case 2: - case 3: + case BATTLE_LOST: + case BATTLE_DREW: return TRUE; - case 1: - case 4: - case 5: - case 6: - case 7: + case BATTLE_WON: + case BATTLE_RAN: + case BATTLE_PLAYER_TELEPORTED: + case BATTLE_POKE_FLED: + case BATTLE_CAUGHT: + return FALSE; + default: return FALSE; } - return FALSE; } -static void sub_80822BC(void) +static void ResetTrainerOpponentIds(void) { sTrainerBattleMode = 0; gTrainerBattleOpponent = 0; @@ -976,7 +977,7 @@ static void TrainerBattleLoadArgs(const struct TrainerBattleParameter *specs, co } } -static void battle_80801F0(void) +static void SetMapVarsToTrainer(void) { if (sTrainerMapObjectLocalId) { @@ -987,7 +988,7 @@ static void battle_80801F0(void) u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) { - sub_80822BC(); + ResetTrainerOpponentIds(); sTrainerBattleMode = TrainerBattleLoadArg8(data); switch (sTrainerBattleMode) @@ -997,31 +998,31 @@ u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) return gUnknown_0819F878; case 4: TrainerBattleLoadArgs(gTrainerBattleSpecs_2, data); - battle_80801F0(); + SetMapVarsToTrainer(); return gUnknown_0819F840; case 1: case 2: TrainerBattleLoadArgs(gTrainerBattleSpecs_1, data); - battle_80801F0(); + SetMapVarsToTrainer(); return gUnknown_0819F818; case 6: case 8: TrainerBattleLoadArgs(gTrainerBattleSpecs_4, data); - battle_80801F0(); + SetMapVarsToTrainer(); return gUnknown_0819F840; case 7: TrainerBattleLoadArgs(gTrainerBattleSpecs_2, data); - battle_80801F0(); - gTrainerBattleOpponent = sub_8082C4C(gTrainerBattleOpponent); + SetMapVarsToTrainer(); + gTrainerBattleOpponent = GetRematchTrainerId(gTrainerBattleOpponent); return gUnknown_0819F8AE; case 5: TrainerBattleLoadArgs(gTrainerBattleSpecs_0, data); - battle_80801F0(); - gTrainerBattleOpponent = sub_8082C4C(gTrainerBattleOpponent); + SetMapVarsToTrainer(); + gTrainerBattleOpponent = GetRematchTrainerId(gTrainerBattleOpponent); return gUnknown_0819F887; default: TrainerBattleLoadArgs(gTrainerBattleSpecs_0, data); - battle_80801F0(); + SetMapVarsToTrainer(); return gUnknown_0819F818; } } @@ -1073,12 +1074,12 @@ u8 HasTrainerAlreadyBeenFought(u16 flag) return FlagGet(TRAINER_FLAG_START + flag); } -void trainer_flag_set(u16 flag) +void SetTrainerFlag(u16 flag) { FlagSet(TRAINER_FLAG_START + flag); } -void trainer_flag_clear(u16 flag) +void ClearTrainerFlag(u16 flag) { FlagClear(TRAINER_FLAG_START + flag); } @@ -1086,14 +1087,14 @@ void trainer_flag_clear(u16 flag) void BattleSetup_StartTrainerBattle(void) { gBattleTypeFlags = BATTLE_TYPE_TRAINER; - gMain.savedCallback = sub_808260C; + gMain.savedCallback = CB2_EndTrainerBattle; StartTheBattle(); ScriptContext1_Stop(); } -void sub_808260C(void) +void CB2_EndTrainerBattle(void) { - if (gTrainerBattleOpponent == 1024) + if (gTrainerBattleOpponent == SECRET_BASE_OPPONENT) { SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); // link battle? } @@ -1110,7 +1111,7 @@ void sub_808260C(void) void CB2_EndTrainerEyeRematchBattle(void) { - if (gTrainerBattleOpponent == 1024) + if (gTrainerBattleOpponent == SECRET_BASE_OPPONENT) { SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); // link battle? } @@ -1231,12 +1232,12 @@ static const u8 *GetTrainerIntroSpeech(void) return SanitizeString(sTrainerIntroSpeech); } -u8 *sub_8082830(void) +u8 *GetTrainerLoseText(void) { const u8 *str; - if (gTrainerBattleOpponent == 1024) - str = sub_80BCCE8(); + if (gTrainerBattleOpponent == SECRET_BASE_OPPONENT) + str = GetSecretBaseTrainerLoseText(); else str = sTrainerDefeatSpeech; @@ -1254,7 +1255,7 @@ static const u8 *GetTrainerNonBattlingSpeech(void) return SanitizeString(sTrainerCannotBattleSpeech); } -s32 sub_8082894(const struct TrainerEyeTrainer *trainers, u16 opponentId) +s32 FirstBattleTrainerIdToRematchTableId(const struct TrainerEyeTrainer *trainers, u16 opponentId) { s32 i; @@ -1266,7 +1267,7 @@ s32 sub_8082894(const struct TrainerEyeTrainer *trainers, u16 opponentId) return -1; } -s32 sub_80828B8(const struct TrainerEyeTrainer *trainers, u16 opponentId) +s32 TrainerIdToRematchTableId(const struct TrainerEyeTrainer *trainers, u16 opponentId) { s32 i; s32 j; @@ -1312,7 +1313,7 @@ bool32 UpdateRandomTrainerEyeRematches(const struct TrainerEyeTrainer *trainers, return ret; } -s32 sub_80829A8(const struct TrainerEyeTrainer *trainers, u16 mapGroup, u16 mapNum) +s32 DoesSomeoneWantRematchIn_(const struct TrainerEyeTrainer *trainers, u16 mapGroup, u16 mapNum) { s32 i; @@ -1324,7 +1325,7 @@ s32 sub_80829A8(const struct TrainerEyeTrainer *trainers, u16 mapGroup, u16 mapN return 0; } -s32 sub_80829E8(const struct TrainerEyeTrainer *trainers, u16 mapGroup, u16 mapNum) +s32 IsRematchTrainerIn_(const struct TrainerEyeTrainer *trainers, u16 mapGroup, u16 mapNum) { s32 i; @@ -1336,9 +1337,9 @@ s32 sub_80829E8(const struct TrainerEyeTrainer *trainers, u16 mapGroup, u16 mapN return 0; } -bool8 sub_8082A18(const struct TrainerEyeTrainer *trainers, u16 opponentId) +bool8 IsFirstTrainerIdReadyForRematch(const struct TrainerEyeTrainer *trainers, u16 opponentId) { - s32 trainerEyeIndex = sub_8082894(trainers, opponentId); + s32 trainerEyeIndex = FirstBattleTrainerIdToRematchTableId(trainers, opponentId); if (trainerEyeIndex != -1 && trainerEyeIndex < 100 && gSaveBlock1.trainerRematches[trainerEyeIndex]) return TRUE; @@ -1348,7 +1349,7 @@ bool8 sub_8082A18(const struct TrainerEyeTrainer *trainers, u16 opponentId) bool8 GetTrainerEyeRematchFlag(const struct TrainerEyeTrainer *trainers, u16 opponentId) { - s32 trainerEyeIndex = sub_80828B8(trainers, opponentId); + s32 trainerEyeIndex = TrainerIdToRematchTableId(trainers, opponentId); if (trainerEyeIndex != -1 && trainerEyeIndex < 100 && gSaveBlock1.trainerRematches[trainerEyeIndex]) return TRUE; @@ -1356,11 +1357,11 @@ bool8 GetTrainerEyeRematchFlag(const struct TrainerEyeTrainer *trainers, u16 opp return FALSE; } -u16 sub_8082A90(const struct TrainerEyeTrainer *trainers, u16 opponentId) +u16 GetRematchTrainerIdFromTable(const struct TrainerEyeTrainer *trainers, u16 opponentId) { int i; const struct TrainerEyeTrainer *trainer; - s32 trainerEyeIndex = sub_8082894(trainers, opponentId); + s32 trainerEyeIndex = FirstBattleTrainerIdToRematchTableId(trainers, opponentId); if (trainerEyeIndex == -1) return 0; @@ -1377,15 +1378,15 @@ u16 sub_8082A90(const struct TrainerEyeTrainer *trainers, u16 opponentId) void ClearTrainerEyeRematchFlag(const struct TrainerEyeTrainer *trainers, u16 opponentId) { - s32 trainerEyeIndex = sub_80828B8(trainers, opponentId); + s32 trainerEyeIndex = TrainerIdToRematchTableId(trainers, opponentId); if (trainerEyeIndex != -1) gSaveBlock1.trainerRematches[trainerEyeIndex] = 0; } -bool8 sub_8082B10(const struct TrainerEyeTrainer *trainers, u16 opponentId) +bool8 WasSecondRematchWon(const struct TrainerEyeTrainer *trainers, u16 opponentId) { - s32 trainerEyeIndex = sub_8082894(trainers, opponentId); + s32 trainerEyeIndex = FirstBattleTrainerIdToRematchTableId(trainers, opponentId); if (trainerEyeIndex != -1 && HasTrainerAlreadyBeenFought(trainers[trainerEyeIndex].opponentIDs[1])) return TRUE; @@ -1393,7 +1394,7 @@ bool8 sub_8082B10(const struct TrainerEyeTrainer *trainers, u16 opponentId) return FALSE; } -bool32 sub_8082B44(void) +bool32 HasAtLeastFiveBadges(void) { int badgeCount = 0; u32 i; @@ -1410,9 +1411,9 @@ bool32 sub_8082B44(void) return FALSE; } -void sub_8082B78(void) +void IncrementRematchStepCounter(void) { - if (sub_8082B44()) + if (HasAtLeastFiveBadges()) { if (gSaveBlock1.trainerRematchStepCounter >= TRAINER_REMATCH_STEPS) gSaveBlock1.trainerRematchStepCounter = TRAINER_REMATCH_STEPS; @@ -1421,41 +1422,41 @@ void sub_8082B78(void) } } -bool32 sub_8082BA4(void) +bool32 IsRematchStepCounterMaxed(void) { - if (sub_8082B44() && gSaveBlock1.trainerRematchStepCounter >= TRAINER_REMATCH_STEPS) + if (HasAtLeastFiveBadges() && gSaveBlock1.trainerRematchStepCounter >= TRAINER_REMATCH_STEPS) return TRUE; else return FALSE; } -void sub_8082BD0(u16 mapGroup, u16 mapNum) +void TryUpdateRandomTrainerRematches(u16 mapGroup, u16 mapNum) { - if (sub_8082BA4() && UpdateRandomTrainerEyeRematches(gTrainerEyeTrainers, mapGroup, mapNum) == TRUE) + if (IsRematchStepCounterMaxed() && UpdateRandomTrainerEyeRematches(gTrainerEyeTrainers, mapGroup, mapNum) == TRUE) gSaveBlock1.trainerRematchStepCounter = 0; } -s32 sub_8082C0C(u16 mapGroup, u16 mapNum) +s32 DoesSomeoneWantRematchIn(u16 mapGroup, u16 mapNum) { - return sub_80829A8(gTrainerEyeTrainers, mapGroup, mapNum); + return DoesSomeoneWantRematchIn_(gTrainerEyeTrainers, mapGroup, mapNum); } -s32 unref_sub_8082C2C(u16 mapGroup, u16 mapNum) +s32 IsRematchTrainerIn(u16 mapGroup, u16 mapNum) { - return sub_80829E8(gTrainerEyeTrainers, mapGroup, mapNum); + return IsRematchTrainerIn_(gTrainerEyeTrainers, mapGroup, mapNum); } -u16 sub_8082C4C(u16 opponentId) +u16 GetRematchTrainerId(u16 opponentId) { - return sub_8082A90(gTrainerEyeTrainers, opponentId); + return GetRematchTrainerIdFromTable(gTrainerEyeTrainers, opponentId); } -s32 sub_8082C68(void) +bool8 ShouldTryRematchBattle(void) { - if (sub_8082A18(gTrainerEyeTrainers, gTrainerBattleOpponent)) + if (IsFirstTrainerIdReadyForRematch(gTrainerEyeTrainers, gTrainerBattleOpponent)) return 1; else - return sub_8082B10(gTrainerEyeTrainers, gTrainerBattleOpponent); + return WasSecondRematchWon(gTrainerEyeTrainers, gTrainerBattleOpponent); } u8 ScrSpecial_GetTrainerEyeRematchFlag(void) diff --git a/src/battle/pokeball.c b/src/battle/pokeball.c index 12fd5e5d9..bcaaebcda 100644 --- a/src/battle/pokeball.c +++ b/src/battle/pokeball.c @@ -376,8 +376,8 @@ static void sub_8046464(u8 taskId) gSprites[spriteId].callback = sub_8047074; break; case 0xFE: - gSprites[spriteId].pos1.x = sub_8077ABC(r5, 0); - gSprites[spriteId].pos1.y = sub_8077ABC(r5, 1) + 24; + gSprites[spriteId].pos1.x = GetBankPosition(r5, 0); + gSprites[spriteId].pos1.y = GetBankPosition(r5, 1) + 24; gBankTarget = r5; gSprites[spriteId].data[0] = 0; gSprites[spriteId].callback = sub_8047254; @@ -394,8 +394,8 @@ static void sub_8046464(u8 taskId) return; } gSprites[spriteId].data[0] = 0x22; - gSprites[spriteId].data[2] = sub_8077ABC(gBankTarget, 0); - gSprites[spriteId].data[4] = sub_8077ABC(gBankTarget, 1) - 16; + gSprites[spriteId].data[2] = GetBankPosition(gBankTarget, 0); + gSprites[spriteId].data[4] = GetBankPosition(gBankTarget, 1) - 16; gSprites[spriteId].data[5] = -40; sub_80786EC(&gSprites[spriteId]); gSprites[spriteId].oam.affineParam = taskId; @@ -830,8 +830,8 @@ static void sub_8046FBC(struct Sprite *sprite) static void sub_8047074(struct Sprite *sprite) { sprite->data[0] = 25; - sprite->data[2] = sub_8077ABC(sprite->data[6], 2); - sprite->data[4] = sub_8077ABC(sprite->data[6], 3) + 24; + sprite->data[2] = GetBankPosition(sprite->data[6], 2); + sprite->data[4] = GetBankPosition(sprite->data[6], 3) + 24; sprite->data[5] = -30; sprite->oam.affineParam = sprite->data[6]; sub_80786EC(sprite); diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c index 03b5660fe..49b0854cc 100644 --- a/src/battle/reshow_battle_screen.c +++ b/src/battle/reshow_battle_screen.c @@ -11,12 +11,12 @@ extern struct SpriteTemplate gUnknown_02024E8C; extern struct Window gUnknown_03004210; -extern u16 gUnknown_03004280; -extern u16 gUnknown_03004288; +extern u16 gBattle_BG2_Y; +extern u16 gBattle_BG2_X; extern u16 gUnknown_030042A4; -extern u16 gUnknown_030042C0; +extern u16 gBattle_BG1_X; extern u16 gUnknown_030041B0; -extern u16 gUnknown_030041B4; +extern u16 gBattle_BG1_Y; extern u16 gUnknown_030041B8; extern u16 gUnknown_030042A0; extern u8 gReservedSpritePaletteCount; @@ -83,10 +83,10 @@ static void CB2_ReshowBattleScreenAfterMenu(void) InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58); gUnknown_030042A4 = 0; gUnknown_030042A0 = 0; - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; - gUnknown_03004288 = 0; - gUnknown_03004280 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; gUnknown_030041B0 = 0; gUnknown_030041B8 = 0; break; @@ -243,7 +243,7 @@ static void sub_807B184(u8 bank) if (GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_HP) == 0) return; GetMonSpriteTemplate_803C56C(GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBankIdentity(bank)); - gObjectBankIDs[bank] = CreateSprite(&gUnknown_02024E8C, sub_8077ABC(bank, 2), posY, sub_8079E90(bank)); + gObjectBankIDs[bank] = CreateSprite(&gUnknown_02024E8C, GetBankPosition(bank, 2), posY, sub_8079E90(bank)); gSprites[gObjectBankIDs[bank]].oam.paletteNum = bank; gSprites[gObjectBankIDs[bank]].callback = SpriteCallbackDummy; gSprites[gObjectBankIDs[bank]].data[0] = bank; @@ -275,7 +275,7 @@ static void sub_807B184(u8 bank) if (GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_HP) == 0) return; GetMonSpriteTemplate_803C56C(GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBankIdentity(bank)); - gObjectBankIDs[bank] = CreateSprite(&gUnknown_02024E8C, sub_8077ABC(bank, 2), posY, sub_8079E90(bank)); + gObjectBankIDs[bank] = CreateSprite(&gUnknown_02024E8C, GetBankPosition(bank, 2), posY, sub_8079E90(bank)); gSprites[gObjectBankIDs[bank]].oam.paletteNum = bank; gSprites[gObjectBankIDs[bank]].callback = SpriteCallbackDummy; gSprites[gObjectBankIDs[bank]].data[0] = bank; diff --git a/src/contest.c b/src/contest.c index 3aa3c8f59..f5aab709d 100644 --- a/src/contest.c +++ b/src/contest.c @@ -217,18 +217,18 @@ extern u8 gObjectBankIDs[]; extern u8 gIsLinkContest; extern u8 gContestPlayerMonIndex; extern u16 gUnknown_030041B0; -extern s16 gUnknown_030041B4; +extern s16 gBattle_BG1_Y; extern u16 gUnknown_030041B8; -extern u16 gUnknown_03004200; +extern u16 gBattle_WIN1H; extern struct Window gUnknown_03004210; -extern u16 gUnknown_03004240; -extern u16 gUnknown_03004244; -extern u16 gUnknown_03004280; -extern u16 gUnknown_03004288; +extern u16 gBattle_WIN0V; +extern u16 gBattle_WIN1V; +extern u16 gBattle_BG2_Y; +extern u16 gBattle_BG2_X; extern u16 gUnknown_030042A0; extern u16 gUnknown_030042A4; -extern u16 gUnknown_030042C0; -extern u16 gUnknown_030042C4; +extern u16 gBattle_BG1_X; +extern u16 gBattle_WIN0H; extern u32 gUnknown_03005D28; // saved RNG value extern s16 gUnknown_02038680[]; @@ -364,7 +364,7 @@ void sub_80AE6E4(u8, u8); u8 CreateJudgeSprite(void); u8 sub_80AE8B4(void); u8 sub_80AE9FC(u16, u32, u32); -bool8 sub_80AEB1C(u16); +bool8 IsSpeciesNotUnown(u16); void sub_80AEB30(void); void sub_80AEBEC(u16); void sub_80AED58(void); @@ -491,19 +491,19 @@ void ResetContestGpuRegs(void) gUnknown_030042A4 = 0; gUnknown_030042A0 = 0; - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; - gUnknown_03004288 = 0; - gUnknown_03004280 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; gUnknown_030041B0 = 0; gUnknown_030041B8 = 0; - gUnknown_030042C4 = 0; - gUnknown_03004240 = 0; - gUnknown_03004200 = 0; - gUnknown_03004244 = 0; + gBattle_WIN0H = 0; + gBattle_WIN0V = 0; + gBattle_WIN1H = 0; + gBattle_WIN1V = 0; } -void sub_80AB2AC(void) +void LoadContestBgAfterMoveAnim(void) { s32 i; @@ -603,8 +603,8 @@ void CB2_StartContest(void) break; case 3: sub_80B2184(); - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; BeginFastPaletteFade(2); gPaletteFade.bufferTransferDisabled = FALSE; SetVBlankCallback(ContestVBlankCallback); @@ -749,8 +749,8 @@ void sub_80AB9A0(u8 taskId) gTasks[taskId].data[0]++; break; case 1: - gUnknown_030041B4 += 7; - if (gUnknown_030041B4 <= 160) + gBattle_BG1_Y += 7; + if (gBattle_BG1_Y <= 160) break; gTasks[taskId].data[0]++; break; @@ -787,16 +787,16 @@ void ContestVBlankCallback(void) { REG_BG0HOFS = gUnknown_030042A4; REG_BG0VOFS = gUnknown_030042A0; - REG_BG1HOFS = gUnknown_030042C0; - REG_BG1VOFS = gUnknown_030041B4; - REG_BG2HOFS = gUnknown_03004288; - REG_BG2VOFS = gUnknown_03004280; + REG_BG1HOFS = gBattle_BG1_X; + REG_BG1VOFS = gBattle_BG1_Y; + REG_BG2HOFS = gBattle_BG2_X; + REG_BG2VOFS = gBattle_BG2_Y; REG_BG3HOFS = gUnknown_030041B0; REG_BG3VOFS = gUnknown_030041B8; - REG_WIN0H = gUnknown_030042C4; - REG_WIN0V = gUnknown_03004240; - REG_WIN1H = gUnknown_03004200; - REG_WIN1V = gUnknown_03004244; + REG_WIN0H = gBattle_WIN0H; + REG_WIN0V = gBattle_WIN0V; + REG_WIN1H = gBattle_WIN1H; + REG_WIN1V = gBattle_WIN1V; TransferPlttBuffer(); LoadOam(); ProcessSpriteCopyRequests(); @@ -806,7 +806,7 @@ void ContestVBlankCallback(void) void sub_80ABB70(u8 taskId) { gUnknown_030042A0 = 0; - gUnknown_03004280 = 0; + gBattle_BG2_Y = 0; sub_80B0D7C(); DmaCopy32Defvars(3, gPlttBufferUnfaded, shared18000.unk18204, 0x400); if (!Contest_IsMonsTurnDisabled(gContestPlayerMonIndex)) @@ -850,7 +850,7 @@ void sub_80ABCDC(u8 taskId) u8 sp8[32]; gUnknown_030042A0 = 0xA0; - gUnknown_03004280 = 0xA0; + gBattle_BG2_Y = 0xA0; FillWindowRect_DefaultPalette( &gUnknown_03004210, 0, @@ -938,7 +938,7 @@ void sub_80ABEA0(u8 taskId) StringExpandPlaceholders(gStringVar4, gDisplayedStringBattle); sub_8003460(&gMenuWindow, gStringVar4, 776, 1, 15); gUnknown_030042A0 = 0; - gUnknown_03004280 = 0; + gBattle_BG2_Y = 0; gTasks[taskId].func = sub_80ABC70; break; case DPAD_LEFT: @@ -1012,7 +1012,7 @@ void sub_80AC188(u8 taskId) { sub_80AF138(); gUnknown_030042A0 = 0; - gUnknown_03004280 = 0; + gBattle_BG2_Y = 0; sub_80AFFE0(FALSE); DmaCopy32Defvars(3, gPlttBufferFaded, shared18000.unk18604, 0x400); LoadPalette(shared18000.unk18204, 0, 0x400); @@ -1159,7 +1159,7 @@ void sub_80AC2CC(u8 taskId) sub_80B2790(sContest.unk19215); sub_80B28F0(sContest.unk19215); SelectContestMoveBankTarget(move); - ExecuteMoveAnim(move); + DoMoveAnim(move); gTasks[taskId].data[0] = 8; } return; @@ -1970,7 +1970,7 @@ void sub_80ADDA4(u8 taskId) s32 i; gUnknown_030042A0 = 0; - gUnknown_03004280 = 0; + gBattle_BG2_Y = 0; for (i = 0; i < 4; i++) gUnknown_02038680[i] = sContestantStatus[i].unk4; sub_80AF668(); @@ -1988,8 +1988,8 @@ void sub_80ADE54(u8 taskId) if (sub_80037A0(&gMenuWindow) == 1) { sub_80B2184(); - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 160; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 160; PlaySE12WithPanning(SE_C_MAKU_D, 0); gTasks[taskId].data[0] = 0; gTasks[taskId].func = sub_80ADEAC; @@ -1998,10 +1998,10 @@ void sub_80ADE54(u8 taskId) void sub_80ADEAC(u8 taskId) { - gUnknown_030041B4 -= 7; - if (gUnknown_030041B4 < 0) - gUnknown_030041B4 = 0; - if (*(u16 *)&gUnknown_030041B4 == 0) // Why cast? + gBattle_BG1_Y -= 7; + if (gBattle_BG1_Y < 0) + gBattle_BG1_Y = 0; + if (*(u16 *)&gBattle_BG1_Y == 0) // Why cast? { gTasks[taskId].func = sub_80ADEEC; gTasks[taskId].data[0] = 0; @@ -2491,7 +2491,7 @@ u8 sub_80AE9FC(u16 species, u32 otId, u32 personality) gSprites[spriteId].callback = SpriteCallbackDummy; gSprites[spriteId].data[0] = gSprites[spriteId].oam.paletteNum; gSprites[spriteId].data[2] = species; - if (sub_80AEB1C(species)) + if (IsSpeciesNotUnown(species)) gSprites[spriteId].affineAnims = gSpriteAffineAnimTable_81E7C18; else gSprites[spriteId].affineAnims = gSpriteAffineAnimTable_81E7BEC; @@ -2499,7 +2499,7 @@ u8 sub_80AE9FC(u16 species, u32 otId, u32 personality) return spriteId; } -bool8 sub_80AEB1C(u16 species) +bool8 IsSpeciesNotUnown(u16 species) { if (species == SPECIES_UNOWN) return FALSE; @@ -3116,7 +3116,7 @@ bool8 sub_80AF828(s32 a, s32 b, struct UnknownContestStruct6 *c) void sub_80AF860(void) { gUnknown_030042A0 = 0; - gUnknown_03004280 = 0; + gBattle_BG2_Y = 0; sub_80AF138(); sub_8003460(&gMenuWindow, gUnknownText_LinkStandbyAndWinner, 776, 1, 15); } @@ -5113,8 +5113,8 @@ void sub_80B2184(void) ((vBgCnt *)®_BG1CNT)->screenSize = 1; ((vBgCnt *)®_BG1CNT)->areaOverflowMode = 0; - gUnknown_030042C0 = DISPLAY_WIDTH; - gUnknown_030041B4 = DISPLAY_HEIGHT; + gBattle_BG1_X = DISPLAY_WIDTH; + gBattle_BG1_Y = DISPLAY_HEIGHT; REG_BG1HOFS = DISPLAY_WIDTH; REG_BG1VOFS = DISPLAY_HEIGHT; @@ -5141,8 +5141,8 @@ void sub_80B2280(void) DmaClearLarge32(3, (void *)(VRAM + 0x8000), 0x2000, 0x1000); DmaClear32(3, (void *)(VRAM + 0xF000), 0x1000); - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; ((vBgCnt *)®_BG1CNT)->priority = 1; ((vBgCnt *)®_BG1CNT)->screenSize = 0; @@ -5158,18 +5158,18 @@ void sub_80B2280(void) void sub_80B237C(u8 taskId) { - gUnknown_030042C0 = 0; - gUnknown_030041B4 = DISPLAY_HEIGHT; + gBattle_BG1_X = 0; + gBattle_BG1_Y = DISPLAY_HEIGHT; PlaySE12WithPanning(SE_C_MAKU_D, 0); gTasks[taskId].func = sub_80B23BC; } void sub_80B23BC(u8 taskId) { - gUnknown_030041B4 -= 7; - if (gUnknown_030041B4 < 0) - gUnknown_030041B4 = 0; - if (*(u16 *)&gUnknown_030041B4 == 0) // Why cast? + gBattle_BG1_Y -= 7; + if (gBattle_BG1_Y < 0) + gBattle_BG1_Y = 0; + if (*(u16 *)&gBattle_BG1_Y == 0) // Why cast? { gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 0; @@ -5229,8 +5229,8 @@ void sub_80B2400(u8 taskId) void sub_80B2508(u8 taskId) { - gUnknown_030041B4 += 7; - if (gUnknown_030041B4 > DISPLAY_HEIGHT) + gBattle_BG1_Y += 7; + if (gBattle_BG1_Y > DISPLAY_HEIGHT) gTasks[taskId].func = sub_80ADCDC; } @@ -5340,16 +5340,16 @@ void sub_80B2790(u8 a) u8 r5_2; memset(&shared19348_, 0, sizeof(shared19348_)); - battle_anim_clear_some_data(); + ClearBattleAnimationVars(); for (i = 0; i < 4; i++) gBattleMonForms[i] = 0; switch (move) { case MOVE_CURSE: if (gBaseStats[species].type1 == TYPE_GHOST || gBaseStats[species].type2 == TYPE_GHOST) - gUnknown_0202F7C4 = 0; + gAnimMoveTurn = 0; else - gUnknown_0202F7C4 = 1; + gAnimMoveTurn = 1; break; case MOVE_TRANSFORM: case MOVE_ROLE_PLAY: @@ -5359,10 +5359,10 @@ void sub_80B2790(u8 a) shared19348_.unk4_0 = 1; break; case MOVE_RETURN: - gHappinessMoveAnim = 0xFF; + gAnimFriendship = 0xFF; break; case MOVE_FRUSTRATION: - gHappinessMoveAnim = 0; + gAnimFriendship = 0; break; case MOVE_SOLAR_BEAM: case MOVE_RAZOR_WIND: @@ -5371,11 +5371,11 @@ void sub_80B2790(u8 a) if (sContest.unk1925E == 0) { sContest.unk1925E = 2; - gUnknown_0202F7C4 = 0; + gAnimMoveTurn = 0; } else { - gUnknown_0202F7C4 = 1; + gAnimMoveTurn = 1; } break; } @@ -5410,8 +5410,8 @@ void sub_80B2968(void) sprite->pos2.x = 0; sprite->pos2.y = 0; - sprite->pos1.x = sub_8077ABC(3, 0); - sprite->pos1.y = sub_8077ABC(3, 1); + sprite->pos1.x = GetBankPosition(3, 0); + sprite->pos1.y = GetBankPosition(3, 1); sprite->invisible = TRUE; } @@ -5419,14 +5419,14 @@ void SelectContestMoveBankTarget(u16 move) { switch (gBattleMoves[move].target) { - case F_TARGET_UNK2: - case F_TARGET_USER: + case TARGET_UNK2: + case TARGET_USER: gBankTarget = 2; break; - case F_TARGET_SELECTED_POKEMON: - case F_TARGET_RANDOM: - case F_TARGET_BOTH_ENEMIES: - case F_TARGET_ALL_EXCEPT_USER: + case TARGET_SELECTED_POKEMON: + case TARGET_RANDOM: + case TARGET_BOTH_ENEMIES: + case TARGET_ALL_EXCEPT_USER: default: gBankTarget = 3; break; diff --git a/src/data/battle_strings_de.h b/src/data/battle_strings_de.h index f78d0bf14..a3d51f2a5 100755 --- a/src/data/battle_strings_de.h +++ b/src/data/battle_strings_de.h @@ -1227,7 +1227,7 @@ const u16 gMissStrings[] = BATTLE_TEXT_GroundMoveNegate, }; -const u16 BattleTextList_401512[] = +const u16 gNoEscapeStringIds[] = { BATTLE_TEXT_CantEscape2, BATTLE_TEXT_BirchDontLeaveMe, @@ -1236,7 +1236,7 @@ const u16 BattleTextList_401512[] = BATTLE_TEXT_AttackingCantEscape, }; -const u16 BattleTextList_40151C[] = +const u16 gMoveWeatherChangeStringIds[] = { BATTLE_TEXT_RainStart, BATTLE_TEXT_PourStart, @@ -1246,39 +1246,39 @@ const u16 BattleTextList_40151C[] = BATTLE_TEXT_HailStart, }; -const u16 BattleTextList_401528[] = +const u16 gSandStormHailContinuesStringIds[] = { BATTLE_TEXT_SandRages, BATTLE_TEXT_HailCont, }; -const u16 BattleTextList_40152C[] = +const u16 gSandStormHailDmgStringIds[] = { BATTLE_TEXT_SandBuffeted, BATTLE_TEXT_HailStricken, }; -const u16 BattleTextList_401530[] = +const u16 gSandStormHailEndStringIds[] = { BATTLE_TEXT_SandSubsided, BATTLE_TEXT_HailStop, }; -const u16 BattleTextList_401534[] = +const u16 gRainContinuesStringIds[] = { BATTLE_TEXT_RainCont1, BATTLE_TEXT_PourCont, BATTLE_TEXT_RainStop, }; -const u16 BattleTextList_40153A[] = +const u16 gProtectLikeUsedStringIds[] = { BATTLE_TEXT_ProtectedItself2, BATTLE_TEXT_BracedItself, BATTLE_TEXT_Failed, }; -const u16 BattleTextList_401540[] = +const u16 gReflectLightScreenSafeguardStringIds[] = { BATTLE_TEXT_Failed, BATTLE_TEXT_RaisedDefense, @@ -1288,7 +1288,7 @@ const u16 BattleTextList_401540[] = BATTLE_TEXT_CoveredVeil, }; -const u16 BattleTextList_40154C[] = +const u16 gLeechSeedStringIds[] = { BATTLE_TEXT_WasSeeded, BATTLE_TEXT_EvadedAttack, @@ -1297,44 +1297,44 @@ const u16 BattleTextList_40154C[] = BATTLE_TEXT_OozeSuckup, }; -const u16 BattleTextList_401556[] = +const u16 gRestUsedStringIds[] = { BATTLE_TEXT_WentToSleep, BATTLE_TEXT_SpeltHealthy, }; -const u16 BattleTextList_40155A[] = +const u16 gUproarOverTurnStringIds[] = { BATTLE_TEXT_UproarMaking, BATTLE_TEXT_CalmedDown, }; -const u16 BattleTextList_40155E[] = +const u16 gStockpileUsedStringIds[] = { BATTLE_TEXT_Stockpiled, BATTLE_TEXT_StockpiledCant, }; -const u16 BattleTextList_401562[] = +const u16 gWokeUpStringIds[] = { BATTLE_TEXT_WokeUp, BATTLE_TEXT_UproarWoke, }; -const u16 BattleTextList_401566[] = +const u16 gSwallowFailStringIds[] = { BATTLE_TEXT_SwallowFail, BATTLE_TEXT_HPFull, }; -const u16 BattleTextList_40156A[] = +const u16 gUproarAwakeStringIds[] = { BATTLE_TEXT_UproarCantSleep2, BATTLE_TEXT_UproarKeptAwake, BATTLE_TEXT_StayedAwake, }; -const u16 BattleTextList_401570[] = +const u16 gStatUpStringIds[] = { BATTLE_TEXT_UnknownString7, BATTLE_TEXT_UnknownString3, @@ -1344,7 +1344,7 @@ const u16 BattleTextList_401570[] = BATTLE_TEXT_HustleUse, }; -const u16 BattleTextList_40157C[] = +const u16 gStatDownStringIds[] = { BATTLE_TEXT_UnknownString5, BATTLE_TEXT_UnknownString6, @@ -1352,7 +1352,7 @@ const u16 BattleTextList_40157C[] = BATTLE_TEXT_Terminator2, }; -const u16 BattleTextList_401584[] = +const u16 gFirstTurnOfTwoStringIds[] = { BATTLE_TEXT_WhipWhirlwind, BATTLE_TEXT_TookSunlight, @@ -1364,7 +1364,7 @@ const u16 BattleTextList_401584[] = BATTLE_TEXT_SprangUp, }; -const u16 BattleTextList_401594[] = +const u16 gWrappedStringIds[] = { BATTLE_TEXT_SqueezedBind, BATTLE_TEXT_Wrapped, @@ -1374,67 +1374,67 @@ const u16 BattleTextList_401594[] = BATTLE_TEXT_SandTombTrapped, }; -const u16 BattleTextList_4015A0[] = +const u16 gMistUsedStringIds[] = { BATTLE_TEXT_MistShroud, BATTLE_TEXT_Failed, }; -const u16 BattleTextList_4015A4[] = +const u16 gFocusEnergyUsedStringIds[] = { BATTLE_TEXT_GetPumped, BATTLE_TEXT_Failed, }; -const u16 BattleTextList_4015A8[] = +const u16 gTransformUsedStringIds[] = { BATTLE_TEXT_Transformed, BATTLE_TEXT_Failed, }; -const u16 BattleTextList_4015AC[] = +const u16 gSubsituteUsedStringIds[] = { BATTLE_TEXT_SubMade, BATTLE_TEXT_SubWeak, }; -const u16 BattleTextList_4015B0[] = +const u16 gGotPoisonedStringIds[] = { BATTLE_TEXT_Poisoned, BATTLE_TEXT_Poisoned2, }; -const u16 BattleTextList_4015B4[] = +const u16 gGotParalyzedStringIds[] = { BATTLE_TEXT_Paralyzed, BATTLE_TEXT_Paralyzed2, }; -const u16 BattleTextList_4015B8[] = +const u16 gFellAsleepStringIds[] = { BATTLE_TEXT_FellAsleep, BATTLE_TEXT_MadeAsleep, }; -const u16 BattleTextList_4015BC[] = +const u16 gGotBurnedStringIds[] = { BATTLE_TEXT_Burned, BATTLE_TEXT_Burned2, }; -const u16 BattleTextList_4015C0[] = +const u16 gGotFrozenStringIds[] = { BATTLE_TEXT_Frozen, BATTLE_TEXT_Frozen2, }; -const u16 BattleTextList_4015C4[] = +const u16 gGotDefrostedStringIds[] = { BATTLE_TEXT_AttackingDefrosted, BATTLE_TEXT_Defrosted, }; -const u16 BattleTextList_4015C8[] = +const u16 gKOFailedStringIds[] = { BATTLE_TEXT_AttackMissed, BATTLE_TEXT_Unaffected, @@ -1442,19 +1442,19 @@ const u16 BattleTextList_4015C8[] = BATTLE_TEXT_InfatuatedPoke, }; -const u16 BattleTextList_4015D0[] = +const u16 gLeechSeedDrainStringIds[] = { BATTLE_TEXT_EnergyDrained, BATTLE_TEXT_OozeSuckup, }; -const u16 BattleTextList_4015D4[] = +const u16 gSportsUsedStringIds[] = { BATTLE_TEXT_ElecWeakened, BATTLE_TEXT_FireWeakened, }; -const u16 BattleTextList_4015D8[] = +const u16 gPartyStatusHealStringIds[] = { BATTLE_TEXT_BellChime, BATTLE_TEXT_BellChime, @@ -1463,13 +1463,13 @@ const u16 BattleTextList_4015D8[] = BATTLE_TEXT_SoothingAroma, }; -const u16 BattleTextList_4015E2[] = +const u16 gFutureMoveUsedStringIds[] = { BATTLE_TEXT_ForesawAttack, BATTLE_TEXT_ChoseDestiny, }; -const u16 BattleTextList_4015E6[] = +const u16 gBallEscapeStringIds[] = { BATTLE_TEXT_BallBrokeOhNo, BATTLE_TEXT_BallBrokeAppeared, @@ -1477,7 +1477,7 @@ const u16 BattleTextList_4015E6[] = BATTLE_TEXT_BallBrokeSoClose, }; -const u16 BattleTextList_4015EE[] = +const u16 gWeatherContinuesStringIds[] = { BATTLE_TEXT_Raining, BATTLE_TEXT_Raining, @@ -1497,7 +1497,7 @@ const u16 BattleTextList_4015EE[] = BATTLE_TEXT_Raining, }; -const u16 BattleTextList_40160E[] = +const u16 gInobedientStringIds[] = { BATTLE_TEXT_LoafingAround, BATTLE_TEXT_WontObey, @@ -1505,20 +1505,20 @@ const u16 BattleTextList_40160E[] = BATTLE_TEXT_NotNotice, }; -const u16 BattleTextList_401616[] = +const u16 gSafariGetNearStringIds[] = { BATTLE_TEXT_CreptCloser, BATTLE_TEXT_CantGetCloser, }; -const u16 BattleTextList_40161A[] = +const u16 gSafariPokeblockResultStringIds[] = { BATTLE_TEXT_CuriousAbout, BATTLE_TEXT_EnthralledBy, BATTLE_TEXT_IgnoredThing, }; -const u16 BattleTextList_401620[] = +const u16 gTrainerItemCuredStatusStringIds[] = { BATTLE_TEXT_CuredConfusion, BATTLE_TEXT_CuredParalysis, @@ -1528,41 +1528,41 @@ const u16 BattleTextList_401620[] = BATTLE_TEXT_CuredSleep, }; -const u16 BattleTextList_40162C[] = +const u16 gBerryEffectStringIds[] = { BATTLE_TEXT_CuredStatus, BATTLE_TEXT_NormalizedStatus, }; -const u16 BattleTextList_401630[] = +const u16 gBRNPreventionStringIds[] = { BATTLE_TEXT_PreventedBurn, BATTLE_TEXT_PreventedOther2, BATTLE_TEXT_NoEffectOn, }; -const u16 BattleTextList_401636[] = +const u16 gPRLZPreventionStringIds[] = { BATTLE_TEXT_PreventedPara, BATTLE_TEXT_PreventedOther2, BATTLE_TEXT_NoEffectOn, }; -const u16 BattleTextList_40163C[] = +const u16 gPSNPreventionStringIds[] = { BATTLE_TEXT_PreventedPoison, BATTLE_TEXT_PreventedOther2, BATTLE_TEXT_NoEffectOn, }; -const u16 BattleTextList_401642[] = +const u16 gItemSwapStringIds[] = { BATTLE_TEXT_Obtained1, BATTLE_TEXT_Obtained2, BATTLE_TEXT_Obtained3, }; -const u16 BattleTextList_401648[] = +const u16 gFlashFireStringIds[] = { BATTLE_TEXT_RaisedFirePower, BATTLE_TEXT_MadeIneffective, diff --git a/src/data/battle_strings_en.h b/src/data/battle_strings_en.h index 26523d2e0..f29e48410 100755 --- a/src/data/battle_strings_en.h +++ b/src/data/battle_strings_en.h @@ -1227,7 +1227,7 @@ const u16 gMissStrings[] = BATTLE_TEXT_GroundMoveNegate, }; -const u16 BattleTextList_401512[] = +const u16 gNoEscapeStringIds[] = { BATTLE_TEXT_CantEscape2, BATTLE_TEXT_BirchDontLeaveMe, @@ -1236,7 +1236,7 @@ const u16 BattleTextList_401512[] = BATTLE_TEXT_AttackingCantEscape, }; -const u16 BattleTextList_40151C[] = +const u16 gMoveWeatherChangeStringIds[] = { BATTLE_TEXT_RainStart, BATTLE_TEXT_PourStart, @@ -1246,39 +1246,39 @@ const u16 BattleTextList_40151C[] = BATTLE_TEXT_HailStart, }; -const u16 BattleTextList_401528[] = +const u16 gSandStormHailContinuesStringIds[] = { BATTLE_TEXT_SandRages, BATTLE_TEXT_HailCont, }; -const u16 BattleTextList_40152C[] = +const u16 gSandStormHailDmgStringIds[] = { BATTLE_TEXT_SandBuffeted, BATTLE_TEXT_HailStricken, }; -const u16 BattleTextList_401530[] = +const u16 gSandStormHailEndStringIds[] = { BATTLE_TEXT_SandSubsided, BATTLE_TEXT_HailStop, }; -const u16 BattleTextList_401534[] = +const u16 gRainContinuesStringIds[] = { BATTLE_TEXT_RainCont1, BATTLE_TEXT_PourCont, BATTLE_TEXT_RainStop, }; -const u16 BattleTextList_40153A[] = +const u16 gProtectLikeUsedStringIds[] = { BATTLE_TEXT_ProtectedItself2, BATTLE_TEXT_BracedItself, BATTLE_TEXT_Failed, }; -const u16 BattleTextList_401540[] = +const u16 gReflectLightScreenSafeguardStringIds[] = { BATTLE_TEXT_Failed, BATTLE_TEXT_RaisedDefense, @@ -1288,7 +1288,7 @@ const u16 BattleTextList_401540[] = BATTLE_TEXT_CoveredVeil, }; -const u16 BattleTextList_40154C[] = +const u16 gLeechSeedStringIds[] = { BATTLE_TEXT_WasSeeded, BATTLE_TEXT_EvadedAttack, @@ -1297,44 +1297,44 @@ const u16 BattleTextList_40154C[] = BATTLE_TEXT_OozeSuckup, }; -const u16 BattleTextList_401556[] = +const u16 gRestUsedStringIds[] = { BATTLE_TEXT_WentToSleep, BATTLE_TEXT_SpeltHealthy, }; -const u16 BattleTextList_40155A[] = +const u16 gUproarOverTurnStringIds[] = { BATTLE_TEXT_UproarMaking, BATTLE_TEXT_CalmedDown, }; -const u16 BattleTextList_40155E[] = +const u16 gStockpileUsedStringIds[] = { BATTLE_TEXT_Stockpiled, BATTLE_TEXT_StockpiledCant, }; -const u16 BattleTextList_401562[] = +const u16 gWokeUpStringIds[] = { BATTLE_TEXT_WokeUp, BATTLE_TEXT_UproarWoke, }; -const u16 BattleTextList_401566[] = +const u16 gSwallowFailStringIds[] = { BATTLE_TEXT_SwallowFail, BATTLE_TEXT_HPFull, }; -const u16 BattleTextList_40156A[] = +const u16 gUproarAwakeStringIds[] = { BATTLE_TEXT_UproarCantSleep2, BATTLE_TEXT_UproarKeptAwake, BATTLE_TEXT_StayedAwake, }; -const u16 BattleTextList_401570[] = +const u16 gStatUpStringIds[] = { BATTLE_TEXT_UnknownString7, BATTLE_TEXT_UnknownString3, @@ -1344,7 +1344,7 @@ const u16 BattleTextList_401570[] = BATTLE_TEXT_HustleUse, }; -const u16 BattleTextList_40157C[] = +const u16 gStatDownStringIds[] = { BATTLE_TEXT_UnknownString5, BATTLE_TEXT_UnknownString6, @@ -1352,7 +1352,7 @@ const u16 BattleTextList_40157C[] = BATTLE_TEXT_Terminator2, }; -const u16 BattleTextList_401584[] = +const u16 gFirstTurnOfTwoStringIds[] = { BATTLE_TEXT_WhipWhirlwind, BATTLE_TEXT_TookSunlight, @@ -1364,7 +1364,7 @@ const u16 BattleTextList_401584[] = BATTLE_TEXT_SprangUp, }; -const u16 BattleTextList_401594[] = +const u16 gWrappedStringIds[] = { BATTLE_TEXT_SqueezedBind, BATTLE_TEXT_Wrapped, @@ -1374,67 +1374,67 @@ const u16 BattleTextList_401594[] = BATTLE_TEXT_SandTombTrapped, }; -const u16 BattleTextList_4015A0[] = +const u16 gMistUsedStringIds[] = { BATTLE_TEXT_MistShroud, BATTLE_TEXT_Failed, }; -const u16 BattleTextList_4015A4[] = +const u16 gFocusEnergyUsedStringIds[] = { BATTLE_TEXT_GetPumped, BATTLE_TEXT_Failed, }; -const u16 BattleTextList_4015A8[] = +const u16 gTransformUsedStringIds[] = { BATTLE_TEXT_Transformed, BATTLE_TEXT_Failed, }; -const u16 BattleTextList_4015AC[] = +const u16 gSubsituteUsedStringIds[] = { BATTLE_TEXT_SubMade, BATTLE_TEXT_SubWeak, }; -const u16 BattleTextList_4015B0[] = +const u16 gGotPoisonedStringIds[] = { BATTLE_TEXT_Poisoned, BATTLE_TEXT_Poisoned2, }; -const u16 BattleTextList_4015B4[] = +const u16 gGotParalyzedStringIds[] = { BATTLE_TEXT_Paralyzed, BATTLE_TEXT_Paralyzed2, }; -const u16 BattleTextList_4015B8[] = +const u16 gFellAsleepStringIds[] = { BATTLE_TEXT_FellAsleep, BATTLE_TEXT_MadeAsleep, }; -const u16 BattleTextList_4015BC[] = +const u16 gGotBurnedStringIds[] = { BATTLE_TEXT_Burned, BATTLE_TEXT_Burned2, }; -const u16 BattleTextList_4015C0[] = +const u16 gGotFrozenStringIds[] = { BATTLE_TEXT_Frozen, BATTLE_TEXT_Frozen2, }; -const u16 BattleTextList_4015C4[] = +const u16 gGotDefrostedStringIds[] = { BATTLE_TEXT_AttackingDefrosted, BATTLE_TEXT_Defrosted, }; -const u16 BattleTextList_4015C8[] = +const u16 gKOFailedStringIds[] = { BATTLE_TEXT_AttackMissed, BATTLE_TEXT_Unaffected, @@ -1442,19 +1442,19 @@ const u16 BattleTextList_4015C8[] = BATTLE_TEXT_InfatuatedPoke, }; -const u16 BattleTextList_4015D0[] = +const u16 gLeechSeedDrainStringIds[] = { BATTLE_TEXT_EnergyDrained, BATTLE_TEXT_OozeSuckup, }; -const u16 BattleTextList_4015D4[] = +const u16 gSportsUsedStringIds[] = { BATTLE_TEXT_ElecWeakened, BATTLE_TEXT_FireWeakened, }; -const u16 BattleTextList_4015D8[] = +const u16 gPartyStatusHealStringIds[] = { BATTLE_TEXT_BellChime, BATTLE_TEXT_BellChime, @@ -1463,13 +1463,13 @@ const u16 BattleTextList_4015D8[] = BATTLE_TEXT_SoothingAroma, }; -const u16 BattleTextList_4015E2[] = +const u16 gFutureMoveUsedStringIds[] = { BATTLE_TEXT_ForesawAttack, BATTLE_TEXT_ChoseDestiny, }; -const u16 BattleTextList_4015E6[] = +const u16 gBallEscapeStringIds[] = { BATTLE_TEXT_BallBrokeOhNo, BATTLE_TEXT_BallBrokeAppeared, @@ -1477,7 +1477,7 @@ const u16 BattleTextList_4015E6[] = BATTLE_TEXT_BallBrokeSoClose, }; -const u16 BattleTextList_4015EE[] = +const u16 gWeatherContinuesStringIds[] = { BATTLE_TEXT_Raining, BATTLE_TEXT_Raining, @@ -1497,7 +1497,7 @@ const u16 BattleTextList_4015EE[] = BATTLE_TEXT_Raining, }; -const u16 BattleTextList_40160E[] = +const u16 gInobedientStringIds[] = { BATTLE_TEXT_LoafingAround, BATTLE_TEXT_WontObey, @@ -1505,20 +1505,20 @@ const u16 BattleTextList_40160E[] = BATTLE_TEXT_NotNotice, }; -const u16 BattleTextList_401616[] = +const u16 gSafariGetNearStringIds[] = { BATTLE_TEXT_CreptCloser, BATTLE_TEXT_CantGetCloser, }; -const u16 BattleTextList_40161A[] = +const u16 gSafariPokeblockResultStringIds[] = { BATTLE_TEXT_CuriousAbout, BATTLE_TEXT_EnthralledBy, BATTLE_TEXT_IgnoredThing, }; -const u16 BattleTextList_401620[] = +const u16 gTrainerItemCuredStatusStringIds[] = { BATTLE_TEXT_CuredConfusion, BATTLE_TEXT_CuredParalysis, @@ -1528,41 +1528,41 @@ const u16 BattleTextList_401620[] = BATTLE_TEXT_CuredSleep, }; -const u16 BattleTextList_40162C[] = +const u16 gBerryEffectStringIds[] = { BATTLE_TEXT_CuredStatus, BATTLE_TEXT_NormalizedStatus, }; -const u16 BattleTextList_401630[] = +const u16 gBRNPreventionStringIds[] = { BATTLE_TEXT_PreventedBurn, BATTLE_TEXT_PreventedOther2, BATTLE_TEXT_NoEffectOn, }; -const u16 BattleTextList_401636[] = +const u16 gPRLZPreventionStringIds[] = { BATTLE_TEXT_PreventedPara, BATTLE_TEXT_PreventedOther2, BATTLE_TEXT_NoEffectOn, }; -const u16 BattleTextList_40163C[] = +const u16 gPSNPreventionStringIds[] = { BATTLE_TEXT_PreventedPoison, BATTLE_TEXT_PreventedOther2, BATTLE_TEXT_NoEffectOn, }; -const u16 BattleTextList_401642[] = +const u16 gItemSwapStringIds[] = { BATTLE_TEXT_Obtained1, BATTLE_TEXT_Obtained2, BATTLE_TEXT_Obtained3, }; -const u16 BattleTextList_401648[] = +const u16 gFlashFireStringIds[] = { BATTLE_TEXT_RaisedFirePower, BATTLE_TEXT_MadeIneffective, diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c index d797e8850..bb80de6fe 100644 --- a/src/debug/matsuda_debug_menu.c +++ b/src/debug/matsuda_debug_menu.c @@ -31,10 +31,10 @@ extern u16 gSpecialVar_ContestRank; extern u16 gUnknown_030042A4; extern u16 gUnknown_030042A0; -extern u16 gUnknown_030042C0; -extern u16 gUnknown_030041B4; -extern u16 gUnknown_03004288; -extern u16 gUnknown_03004280; +extern u16 gBattle_BG1_X; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG2_X; +extern u16 gBattle_BG2_Y; extern u16 gUnknown_030041B0; extern u16 gUnknown_030041B8; extern struct Window gUnknown_03004210; @@ -459,10 +459,10 @@ static void sub_80A9F50(void) REG_BG0VOFS = 0; gUnknown_030042A4 = 0; gUnknown_030042A0 = 0; - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; - gUnknown_03004288 = 0; - gUnknown_03004280 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; gUnknown_030041B0 = 0; gUnknown_030041B8 = 0; } @@ -507,10 +507,10 @@ static void sub_80AA090(void) { REG_BG0HOFS = gUnknown_030042A4; REG_BG0VOFS = gUnknown_030042A0; - REG_BG1HOFS = gUnknown_030042C0; - REG_BG1VOFS = gUnknown_030041B4; - REG_BG2HOFS = gUnknown_03004288; - REG_BG2VOFS = gUnknown_03004280; + REG_BG1HOFS = gBattle_BG1_X; + REG_BG1VOFS = gBattle_BG1_Y; + REG_BG2HOFS = gBattle_BG2_X; + REG_BG2VOFS = gBattle_BG2_Y; REG_BG3HOFS = gUnknown_030041B0; REG_BG3VOFS = gUnknown_030041B8; LoadOam(); diff --git a/src/debug/mori_debug_menu.c b/src/debug/mori_debug_menu.c index 2c937bb28..83dba8b73 100644 --- a/src/debug/mori_debug_menu.c +++ b/src/debug/mori_debug_menu.c @@ -136,7 +136,7 @@ u8 MoriDebugMenu_10000Steps(void) u8 MoriDebugMenu_MoveTutor(void) { - sub_8132670(); + TeachMoveTutorMove(); CloseMenu(); return 1; } diff --git a/src/engine/record_mixing.c b/src/engine/record_mixing.c index 997a257f5..c8e2e34d5 100644 --- a/src/engine/record_mixing.c +++ b/src/engine/record_mixing.c @@ -36,7 +36,7 @@ static u8 gUnknown_0300071C[4]; void *recordMixingSecretBases = &gSaveBlock1.secretBases; void *recordMixingTvShows = &gSaveBlock1.tvShows; -void *gUnknown_083D0274 = &gSaveBlock1.unknown_2ABC; +void *gUnknown_083D0274 = &gSaveBlock1.pokeNews; void *gUnknown_083D0278 = &gSaveBlock1.mauvilleMan; void *recordMixingEasyChatPairs = &gSaveBlock1.easyChatPairs; struct RecordMixingDayCareMail *gUnknown_083D0280 = &gUnknown_02038738; diff --git a/src/engine/sprite.c b/src/engine/sprite.c index c1bb36917..cf35e12a3 100644 --- a/src/engine/sprite.c +++ b/src/engine/sprite.c @@ -598,7 +598,7 @@ static u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x, return index; } -u8 CreateSpriteAndAnimate(struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority) +u8 CreateSpriteAndAnimate(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority) { u8 i; diff --git a/src/engine/trade.c b/src/engine/trade.c index 0567b4d2f..0bc589ff4 100644 --- a/src/engine/trade.c +++ b/src/engine/trade.c @@ -5391,7 +5391,7 @@ static void sub_804D80C(struct Sprite *sprite) } } -u16 sub_804D89C(void) +u16 GetInGameTradeSpeciesInfo(void) { const struct InGameTrade *inGameTrade = &gIngameTrades[gSpecialVar_0x8004]; StringCopy(gStringVar1, gSpeciesNames[inGameTrade->playerSpecies]); @@ -5408,7 +5408,7 @@ static void sub_804D8E4(void) StringCopy(gStringVar2, gSpeciesNames[inGameTrade->species]); } -static void sub_804D948(u8 whichPlayerMon, u8 whichInGameTrade) +static void _CreateInGameTradePokemon(u8 whichPlayerMon, u8 whichInGameTrade) { const struct InGameTrade *inGameTrade = &gIngameTrades[whichInGameTrade]; u8 level = GetMonData(&gPlayerParty[whichPlayerMon], MON_DATA_LEVEL); @@ -5478,16 +5478,16 @@ static void sub_804DAD4(struct MailStruct *mail, const struct InGameTrade *trade mail->itemId = trade->heldItem; } -u16 sub_804DB2C(void) +u16 GetTradeSpecies(void) { if (GetMonData(&gPlayerParty[gSpecialVar_0x8005], MON_DATA_IS_EGG)) return SPECIES_NONE; return GetMonData(&gPlayerParty[gSpecialVar_0x8005], MON_DATA_SPECIES); } -void sub_804DB68(void) +void CreateInGameTradePokemon(void) { - sub_804D948(gSpecialVar_0x8005, gSpecialVar_0x8004); + _CreateInGameTradePokemon(gSpecialVar_0x8005, gSpecialVar_0x8004); } #ifdef NONMATCHING @@ -5670,7 +5670,7 @@ static void sub_804E144(void) UpdatePaletteFade(); } -void sub_804E174(void) +void DoInGameTradeScene(void) { ScriptContext2_Enable(); CreateTask(sub_804E1A0, 10); diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c index dcd1197cb..ffa4cbd08 100644 --- a/src/engine/trainer_card.c +++ b/src/engine/trainer_card.c @@ -321,7 +321,7 @@ void sub_8093390(struct TrainerCard *trainerCard) trainerCard->firstHallOfFameC = playTime & 0xFF; trainerCard->hasPokedex = FlagGet(FLAG_SYS_POKEDEX_GET); - trainerCard->var_3 = sub_8090FC0(); + trainerCard->var_3 = CompletedHoennPokedex(); trainerCard->pokedexSeen = GetPokedexSeenCount(); trainerCard->trainerId = (gSaveBlock2.playerTrainerId[1] << 8) | gSaveBlock2.playerTrainerId[0]; diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c index 12337631f..caebc6a7b 100644 --- a/src/field/battle_tower.c +++ b/src/field/battle_tower.c @@ -1608,7 +1608,7 @@ void sub_8135534(u8 taskId) } } -void sub_813556C(void) +void StartSpecialBattle(void) { s32 i; u16 heldItem; @@ -1616,7 +1616,7 @@ void sub_813556C(void) switch (gSpecialVar_0x8004) { - case 0: + case 0: // battle tower battle gBattleTypeFlags = (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_TRAINER); gTrainerBattleOpponent = 0; @@ -1627,7 +1627,7 @@ void sub_813556C(void) transition = BattleSetup_GetBattleTowerBattleTransition(); BattleTransition_StartOnField(transition); break; - case 1: + case 1: // secret base battle for (i = 0; i < PARTY_SIZE; i++) { heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM); @@ -1639,7 +1639,7 @@ void sub_813556C(void) transition = BattleSetup_GetBattleTowerBattleTransition(); BattleTransition_StartOnField(transition); break; - case 2: + case 2: // e-reader trainer battle ZeroEnemyPartyMons(); for (i = 0; i < 3; i++) @@ -1658,7 +1658,7 @@ void sub_813556C(void) } } -void sub_8135668(void) +void SetBattleTowerProperty(void) { s32 i; u8 battleTowerLevelType = gSaveBlock2.battleTower.battleTowerLevelType; @@ -1740,7 +1740,7 @@ void sub_8135668(void) } } -void sub_81358A4(void) +void BattleTowerUtil(void) { u8 battleTowerLevelType = gSaveBlock2.battleTower.battleTowerLevelType; @@ -1789,7 +1789,7 @@ void sub_81358A4(void) } } -void sub_8135A14(void) +void SetBattleTowerParty(void) { s32 i; @@ -1954,7 +1954,7 @@ void sub_8135AC4(void) sub_8135A3C(); } -void sub_8135BA0(void) +void SaveBattleTowerProgress(void) { u8 battleTowerLevelType = gSaveBlock2.battleTower.battleTowerLevelType; @@ -2336,7 +2336,7 @@ void PrintEReaderTrainerFarewellMessage(void) } } -void sub_813610C(void) +void TryEnableBravoTrainerBattleTower(void) { s32 i; diff --git a/src/field/berry_tag_screen.c b/src/field/berry_tag_screen.c index 2abbac287..960a163c1 100644 --- a/src/field/berry_tag_screen.c +++ b/src/field/berry_tag_screen.c @@ -29,7 +29,7 @@ struct Struct2000000 }; extern struct Struct2000000 gSharedMem; -extern u16 gUnknown_030041B4; +extern u16 gBattle_BG1_Y; static EWRAM_DATA u8 gUnknown_0203932C = 0; static EWRAM_DATA s16 gUnknown_0203932E[5] = {0}; @@ -77,8 +77,8 @@ static void sub_8146014(void) static void sub_814602C(void) { - REG_BG0VOFS = gUnknown_030041B4; - REG_BG1VOFS = gUnknown_030041B4; + REG_BG0VOFS = gBattle_BG1_Y; + REG_BG1VOFS = gBattle_BG1_Y; LoadOam(); ProcessSpriteCopyRequests(); @@ -183,7 +183,7 @@ static void sub_8146288(void) REG_BG1CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(5) | BGCNT_16COLOR | BGCNT_TXT256x256; REG_BG2CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(6) | BGCNT_16COLOR | BGCNT_TXT256x256; REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7) | BGCNT_16COLOR | BGCNT_TXT256x256; - gUnknown_030041B4 = 0; + gBattle_BG1_Y = 0; } bool8 sub_81462B8(void) @@ -394,17 +394,17 @@ static void sub_8146798(u8 taskId) { s16 *taskData = gTasks[taskId].data; - gUnknown_030041B4 = (gUnknown_030041B4 + taskData[0]) & 0xFF; - if ((taskData[0] > 0 && gUnknown_030041B4 == 144) - || (taskData[0] < 0 && gUnknown_030041B4 == 112)) + gBattle_BG1_Y = (gBattle_BG1_Y + taskData[0]) & 0xFF; + if ((taskData[0] > 0 && gBattle_BG1_Y == 144) + || (taskData[0] < 0 && gBattle_BG1_Y == 112)) { sub_8146810(gTasks[taskId].data[1]); sub_81468BC(); } - if (gUnknown_030041B4 == 0) + if (gBattle_BG1_Y == 0) { - gTasks[taskId].data[0] = gUnknown_030041B4; - gTasks[taskId].data[1] = gUnknown_030041B4; + gTasks[taskId].data[0] = gBattle_BG1_Y; + gTasks[taskId].data[1] = gBattle_BG1_Y; gTasks[taskId].func = sub_8146480; } } diff --git a/src/field/dewford_trend.c b/src/field/dewford_trend.c index b67f3a2bd..9afb7a16d 100644 --- a/src/field/dewford_trend.c +++ b/src/field/dewford_trend.c @@ -202,14 +202,14 @@ void sub_80FA4E4(void *a, u32 b, u8 unused) *(dst++) = *(src++); } -void sub_80FA5BC(void) +void BufferTrendyPhraseString(void) { struct EasyChatPair *s = &gSaveBlock1.easyChatPairs[gSpecialVar_0x8004]; ConvertEasyChatWordsToString(gStringVar1, s->words, 2, 1); } -void sub_80FA5E4(void) +void TrendyPhraseIsOld(void) { u16 result = 0; @@ -222,7 +222,7 @@ void sub_80FA5E4(void) gSpecialVar_Result = result; } -void sub_80FA648(void) +void GetDewfordHallPaintingNameIndex(void) { gSpecialVar_Result = (gSaveBlock1.easyChatPairs[0].words[0] + gSaveBlock1.easyChatPairs[0].words[1]) & 7; } diff --git a/src/field/easy_chat.c b/src/field/easy_chat.c index 1dce5863e..94532506f 100644 --- a/src/field/easy_chat.c +++ b/src/field/easy_chat.c @@ -314,7 +314,7 @@ void sub_80EB7C4(void) ShowFieldAutoScrollMessage(gStringVar4); } -void sub_80EB83C(void) +void BufferRandomHobbyOrLifestyleString(void) { u16 group, local2; diff --git a/src/field/event_data.c b/src/field/event_data.c index 86045df15..9d6d2372b 100644 --- a/src/field/event_data.c +++ b/src/field/event_data.c @@ -112,10 +112,10 @@ bool32 CanResetRTC(void) u16 *GetVarPointer(u16 id) { - if (id < 0x4000) + if (id < VARS_START) return NULL; if (id < 0x8000) - return &gSaveBlock1.vars[id - 0x4000]; + return &gSaveBlock1.vars[id - VARS_START]; return gSpecialVars[id - 0x8000]; } diff --git a/src/field/field_control_avatar.c b/src/field/field_control_avatar.c index 947dc3e56..52e66f16e 100644 --- a/src/field/field_control_avatar.c +++ b/src/field/field_control_avatar.c @@ -493,7 +493,7 @@ bool8 sub_8068870(u16 a) bool8 sub_8068894(void) { - sub_8082B78(); + IncrementRematchStepCounter(); happiness_algorithm_step(); if (overworld_poison_step() == TRUE) { diff --git a/src/field/field_fadetransition.c b/src/field/field_fadetransition.c index 829ce2dfa..5014e97e3 100644 --- a/src/field/field_fadetransition.c +++ b/src/field/field_fadetransition.c @@ -327,7 +327,7 @@ void sub_8080DC4(u8 taskId) } } -void atk17_seteffectuser(void) +void atk17_seteffectsecondary(void) { pal_fill_black(); CreateStartMenuTask(sub_8080DC4); diff --git a/src/field/field_specials.c b/src/field/field_specials.c index 1a4ebe1af..fc6f690a3 100644 --- a/src/field/field_specials.c +++ b/src/field/field_specials.c @@ -688,7 +688,7 @@ void GetRivalSonDaughterString(void) } } -u8 sub_810E300(void) +u8 GetBattleOutcome(void) { return gBattleOutcome; } @@ -958,11 +958,11 @@ void EndLotteryCornerComputerEffect(void) } static void sub_810E874(void); -void sub_810E944(void); +void DisplayCurrentElevatorFloor(void); void sub_810E984(u8); bool8 sub_810EAC8(u8, u8); void sub_810EB90(u8, u8); -void sub_810EBEC(void); +void ShakeScreenInElevator(void); void sub_810EC34(u8); void sub_810EC9C(u8); void sub_810ECB0(void); @@ -1074,11 +1074,11 @@ static void sub_810E874(void) { MenuPrint(gUnknown_083F8380[gUnknown_03000760[i].var0], 1, 2 * i + 1); } - sub_810E944(); + DisplayCurrentElevatorFloor(); CreateTask(sub_810E984, 8); } -void sub_810E944(void) +void DisplayCurrentElevatorFloor(void) { MenuDrawTextWindow(20, 0, 29, 5); sub_8072BD8(gOtherText_NowOn, 21, 1, 64); @@ -1116,7 +1116,7 @@ void sub_810E984(u8 taskId) { gSpecialVar_Result = 1; gSpecialVar_0x8005 = gUnknown_0203925B; - sub_810EBEC(); + ShakeScreenInElevator(); FieldObjectTurnByLocalIdAndMap(gSpecialVar_LastTalked, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, DIR_SOUTH); sub_810EEDC(); MenuZeroFillScreen(); @@ -1300,7 +1300,7 @@ void sub_810EB90(u8 newPos, u8 maxItems) } } -void sub_810EBEC(void) +void ShakeScreenInElevator(void) { u8 taskId = CreateTask(sub_810EC34, 9); gTasks[taskId].data[0] = 1; @@ -1779,12 +1779,12 @@ void GetSecretBaseNearbyMapName(void) GetMapSectionName(gStringVar1, VarGet(VAR_SECRET_BASE_MAP), 0); } -u16 sub_810F404(void) +u16 GetBestBattleTowerStreak(void) { return GetGameStat(GAME_STAT_BATTLE_TOWER_BEST_STREAK); } -void sub_810F414(void) +void BufferEReaderTrainerName(void) { SetEReaderTrainerName(gStringVar1); } @@ -1793,7 +1793,7 @@ const u8 gUnknown_083F83E0[] = {12, 2, 4, 5, 1, 8, 7, 11, 3, 10, 9, 6}; const u8 gUnknown_083F83EC[] = {0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5}; const u8 gUnknown_083F83F8[] = {3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5}; -u8 sub_810F424(void) +u8 GetSlotMachineId(void) { u32 v0 = gSaveBlock1.easyChatPairs[0].unk0_0 + gSaveBlock1.easyChatPairs[0].unk2 + gUnknown_083F83E0[gSpecialVar_0x8004]; if (GetPriceReduction(2)) @@ -1803,10 +1803,10 @@ u8 sub_810F424(void) return gUnknown_083F83EC[v0 % 12]; } -bool8 sub_810F488(void) +bool8 FoundAbandonedShipRoom1Key(void) { u16 *specVar = &gSpecialVar_0x8004; - u16 flag = 0x277; + u16 flag = FLAG_HIDDEN_ITEM_1F; *specVar = flag; if (!FlagGet(flag)) { @@ -1815,10 +1815,10 @@ bool8 sub_810F488(void) return TRUE; } -bool8 sub_810F4B0(void) +bool8 FoundAbandonedShipRoom2Key(void) { u16 *specVar = &gSpecialVar_0x8004; - u16 flag = 0x278; + u16 flag = FLAG_HIDDEN_ITEM_20; *specVar = flag; if (!FlagGet(flag)) { @@ -1827,10 +1827,10 @@ bool8 sub_810F4B0(void) return TRUE; } -bool8 sub_810F4D4(void) +bool8 FoundAbandonedShipRoom4Key(void) { u16 *specVar = &gSpecialVar_0x8004; - u16 flag = 0x279; + u16 flag = FLAG_HIDDEN_ITEM_21; *specVar = flag; if (!FlagGet(flag)) { @@ -1839,10 +1839,10 @@ bool8 sub_810F4D4(void) return TRUE; } -bool8 sub_810F4FC(void) +bool8 FoundAbandonedShipRoom6Key(void) { u16 *specVar = &gSpecialVar_0x8004; - u16 flag = 0x27a; + u16 flag = FLAG_HIDDEN_ITEM_22; *specVar = flag; if (!FlagGet(flag)) { @@ -1874,7 +1874,7 @@ bool8 ScrSpecial_AreLeadMonEVsMaxedOut(void) return FALSE; } -u8 sub_810F5BC(void) +u8 TryUpdateRusturfTunnelState(void) { if (!FlagGet(FLAG_RUSTURF_TUNNEL_OPENED) && gSaveBlock1.location.mapGroup == MAP_GROUP(RUSTURF_TUNNEL) && gSaveBlock1.location.mapNum == MAP_NUM(RUSTURF_TUNNEL)) { @@ -2040,7 +2040,7 @@ void sub_810F8FC(void) sub_805ADDC(6); } -u16 sub_810F908(void) +u16 GetDaysUntilPacifidlogTMAvailable(void) { u16 tmReceivedDay = VarGet(VAR_PACIFIDLOG_TM_RECEIVED_DAY); if (gLocalTime.days - tmReceivedDay >= 7) @@ -2054,13 +2054,13 @@ u16 sub_810F908(void) return 7 - (gLocalTime.days - tmReceivedDay); } -u16 sub_810F950(void) +u16 SetPacifidlogTMReceivedDay(void) { VarSet(VAR_PACIFIDLOG_TM_RECEIVED_DAY, gLocalTime.days); return gLocalTime.days; } -bool8 sub_810F96C(void) +bool8 MonOTNameMatchesPlayer(void) { GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_OT_NAME, gStringVar1); if (!StringCompareWithoutExtCtrlCodes(gSaveBlock2.playerName, gStringVar1)) @@ -2070,7 +2070,7 @@ bool8 sub_810F96C(void) return TRUE; } -void sub_810F9AC(void) +void BufferLottoTicketNumber(void) { if (gSpecialVar_Result >= 10000) { @@ -2109,38 +2109,38 @@ const u8 gUnknown_083F8408[] = {8, 9, 10, 11, 12, 13, 14, 15}; const u8 gUnknown_083F8410[] = {8, 13, 14, 11, 10, 12, 15, 9}; bool8 sub_810FF30(void); -void sub_810FCE8(void); +void UpdateMovedLilycoveFanClubMembers(void); void sub_810FF48(void); void sub_810FD80(void); -u16 sub_810FCB0(void); +u16 GetNumMovedLilycoveFanClubMembers(void); int sub_810FB9C(void); void ResetFanClub(void) { - gSaveBlock1.vars[0x41] = 0; - gSaveBlock1.vars[0x42] = 0; + gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] = 0; + gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_2 - VARS_START] = 0; } void sub_810FA74(void) { if (sub_810FF30()) { - sub_810FCE8(); - gSaveBlock1.vars[0x42] = gSaveBlock2.playTimeHours; + UpdateMovedLilycoveFanClubMembers(); + gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_2 - VARS_START] = gSaveBlock2.playTimeHours; } } void sub_810FAA0(void) { - if (!((gSaveBlock1.vars[0x41] >> 7) & 1)) + if (!((gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> 7) & 1)) { sub_810FF48(); sub_810FD80(); - gSaveBlock1.vars[0x42] = gSaveBlock2.playTimeHours; - FlagClear(0x315); - FlagClear(0x316); - FlagClear(0x317); - FlagClear(0x318); + gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_2 - VARS_START] = gSaveBlock2.playTimeHours; + FlagClear(FLAG_HIDE_FANCLUB_OLD_LADY); + FlagClear(FLAG_HIDE_FANCLUB_BOY); + FlagClear(FLAG_HIDE_FANCLUB_LITTLE_BOY); + FlagClear(FLAG_HIDE_FANCLUB_LADY); VarSet(VAR_LILYCOVE_FAN_CLUB_STATE, 1); } } @@ -2149,24 +2149,24 @@ u8 sub_810FB10(u8 a0) { if (VarGet(VAR_LILYCOVE_FAN_CLUB_STATE) == 2) { - if ((gSaveBlock1.vars[0x41] & 0x7f) + gUnknown_083F8404[a0] >= 20) + if ((gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] & 0x7f) + gUnknown_083F8404[a0] >= 20) { - if (sub_810FCB0() < 3) + if (GetNumMovedLilycoveFanClubMembers() < 3) { sub_810FB9C(); - gSaveBlock1.vars[0x41] &= 0xff80; + gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] &= 0xff80; } else { - gSaveBlock1.vars[0x41] = (gSaveBlock1.vars[0x41] & 0xff80) | 20; + gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] = (gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] & 0xff80) | 20; } } else { - gSaveBlock1.vars[0x41] += gUnknown_083F8404[a0]; + gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] += gUnknown_083F8404[a0]; } } - return gSaveBlock1.vars[0x41] & 0x7f; + return gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] & 0x7f; } int sub_810FB9C(void) @@ -2175,17 +2175,17 @@ int sub_810FB9C(void) int retval = 0; for (i=0; i<8; i++) { - if (!((gSaveBlock1.vars[0x41] >> gUnknown_083F8408[i]) & 0x01)) + if (!((gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> gUnknown_083F8408[i]) & 0x01)) { retval = i; if (Random() & 1) { - gSaveBlock1.vars[0x41] |= (1 << gUnknown_083F8408[i]); + gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] |= (1 << gUnknown_083F8408[i]); return retval; } } } - gSaveBlock1.vars[0x41] |= (1 << gUnknown_083F8408[retval]); + gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] |= (1 << gUnknown_083F8408[retval]); return retval; } @@ -2193,85 +2193,86 @@ int sub_810FC18(void) { u8 i; int retval = 0; - if (sub_810FCB0() == TRUE) + if (GetNumMovedLilycoveFanClubMembers() == 1) { return 0; } for (i=0; i<8; i++) { - if ((gSaveBlock1.vars[0x41] >> gUnknown_083F8410[i]) & 1) + if ((gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> gUnknown_083F8410[i]) & 1) { retval = i; if (Random() & 1) { - gSaveBlock1.vars[0x41] ^= (1 << gUnknown_083F8410[i]); + gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] ^= (1 << gUnknown_083F8410[i]); return retval; } } } - if ((gSaveBlock1.vars[0x41] >> gUnknown_083F8410[retval]) & 1) + if ((gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> gUnknown_083F8410[retval]) & 1) { - gSaveBlock1.vars[0x41] ^= (1 << gUnknown_083F8410[retval]); + gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] ^= (1 << gUnknown_083F8410[retval]); } return retval; } -u16 sub_810FCB0(void) +u16 GetNumMovedLilycoveFanClubMembers(void) { u8 i; u8 retval = 0; - for (i=0; i<8; i++) + for (i = 0; i < 8; i++) { - if ((gSaveBlock1.vars[0x41] >> (i + 8)) & 1) + if ((gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> (i + 8)) & 1) { - retval ++; + retval++; } } + return retval; } -void sub_810FCE8(void) +void UpdateMovedLilycoveFanClubMembers(void) { u8 i = 0; if (gSaveBlock2.playTimeHours < 999) { while (1) { - if (sub_810FCB0() < 5) + if (GetNumMovedLilycoveFanClubMembers() < 5) { - gSaveBlock1.vars[0x42] = gSaveBlock2.playTimeHours; + gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_2 - VARS_START] = gSaveBlock2.playTimeHours; break; } else if (i == 8) { break; } - else if (gSaveBlock2.playTimeHours - gSaveBlock1.vars[0x42] < 12) + else if (gSaveBlock2.playTimeHours - gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_2 - VARS_START] < 12) { return; } sub_810FC18(); - gSaveBlock1.vars[0x42] += 12; + gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_2 - VARS_START] += 12; i++; } } } -bool8 sub_810FD60(void) +bool8 ShouldMoveLilycoveFanClubMember(void) { - return (gSaveBlock1.vars[0x41] >> gSpecialVar_0x8004) & 0x01; + return (gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> gSpecialVar_0x8004) & 0x01; } void sub_810FD80(void) { - gSaveBlock1.vars[0x41] |= 0x2000; - gSaveBlock1.vars[0x41] |= 0x100; - gSaveBlock1.vars[0x41] |= 0x400; + gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] |= 0x2000; + gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] |= 0x100; + gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] |= 0x400; } void sub_810FE1C(void *, u8, u8); -void sub_810FDAC(void) +void BufferStreakTrainerText(void) { u8 a = 0; u8 b = 0; @@ -2366,12 +2367,12 @@ void sub_810FEFC(void) bool8 sub_810FF30(void) { - return (gSaveBlock1.vars[0x41] >> 7) & 0x01; + return (gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> 7) & 0x01; } void sub_810FF48(void) { - gSaveBlock1.vars[0x41] |= 0x80; + gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] |= 0x80; } u8 sub_810FF60(void) diff --git a/src/field/field_tasks.c b/src/field/field_tasks.c index 393c7d75a..ce5fc6c0e 100644 --- a/src/field/field_tasks.c +++ b/src/field/field_tasks.c @@ -608,14 +608,14 @@ bool32 sub_8069D34(s16 x, s16 y) return FALSE; } -void sub_8069D78(void) +void SetSootopolisGymCrackedIceMetatiles(void) { s32 x, y; s32 width = gMapHeader.mapData->width; s32 height = gMapHeader.mapData->height; - for (x=0; x<width; x++) + for (x = 0; x < width; x++) { - for (y=0; y<height; y++) + for (y = 0; y < height; y++) { if (sub_8069D34(x, y) == TRUE) { diff --git a/src/field/item_menu.c b/src/field/item_menu.c index 4e283ffe9..e9b8b24d3 100644 --- a/src/field/item_menu.c +++ b/src/field/item_menu.c @@ -153,7 +153,7 @@ static const u8 *sPopupMenuActionList; // common void (*gFieldItemUseCallback)(u8) = NULL; -extern u16 gUnknown_030041B4; +extern u16 gBattle_BG1_Y; extern struct PocketScrollState gBagPocketScrollStates[]; extern struct ItemSlot *gCurrentBagPocketItemSlots; // selected pocket item slots extern const u8 Event_NoRegisteredItem[]; @@ -4499,7 +4499,7 @@ u8 CreateBerrySprite(u8 berryId, s16 x, s16 y) static void SpriteCB_BerrySprite(struct Sprite *sprite) { - sprite->pos2.y = -gUnknown_030041B4; + sprite->pos2.y = -gBattle_BG1_Y; } void sub_80A7DD4(void) diff --git a/src/field/money.c b/src/field/money.c index f277ac905..d0f0ab1f6 100644 --- a/src/field/money.c +++ b/src/field/money.c @@ -291,12 +291,12 @@ void CloseMoneyWindow(u8 x, u8 y) MenuZeroFillWindowRect(x, y, x + 13, y + 3); } -bool8 sub_80B7CE8(void) +bool8 HasEnoughMoneyFor(void) { return IsEnoughMoney(gSaveBlock1.money, gSpecialVar_0x8005); } -void sub_80B7D0C(void) +void PayMoneyFor(void) { RemoveMoney(&gSaveBlock1.money, gSpecialVar_0x8005); } diff --git a/src/field/overworld.c b/src/field/overworld.c index d0e40eac3..e239daec7 100644 --- a/src/field/overworld.c +++ b/src/field/overworld.c @@ -600,7 +600,7 @@ void sub_80538F0(u8 mapGroup, u8 mapNum) ClearTempFieldEventData(); ResetCyclingRoadChallengeData(); prev_quest_postbuffer_cursor_backup_reset(); - sub_8082BD0(mapGroup, mapNum); + TryUpdateRandomTrainerRematches(mapGroup, mapNum); DoTimeBasedEvents(); SetSav1WeatherFromCurrMapHeader(); ChooseAmbientCrySpecies(); @@ -635,7 +635,7 @@ void sub_8053994(u32 a1) ClearTempFieldEventData(); ResetCyclingRoadChallengeData(); prev_quest_postbuffer_cursor_backup_reset(); - sub_8082BD0(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum); + TryUpdateRandomTrainerRematches(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum); if (a1 != 1) DoTimeBasedEvents(); SetSav1WeatherFromCurrMapHeader(); @@ -1329,7 +1329,7 @@ void sub_805465C(void) void sub_805469C(void) { FieldClearVBlankHBlankCallbacks(); - gFieldCallback = atk17_seteffectuser; + gFieldCallback = atk17_seteffectsecondary; c2_exit_to_overworld_2_switch(); } diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c index 4a904fbb1..640d4731f 100644 --- a/src/field/pokeblock.c +++ b/src/field/pokeblock.c @@ -426,7 +426,7 @@ void sub_810BADC(void) SetMainCallback2(sub_810B96C); } -void sub_810BAF4(void) +void OpenPokeblockCaseOnFeeder(void) { sub_810BA7C(3); SetMainCallback2(sub_810B96C); @@ -1041,7 +1041,7 @@ u8 sub_810C9E8(struct Pokeblock *pokeblock) return feel; } -s8 sub_810CA00(void) +s8 GetFirstFreePokeblockSlot(void) { u8 i; for (i=0; i<ARRAY_COUNT(gSaveBlock1.pokeblocks); i++) @@ -1056,7 +1056,7 @@ s8 sub_810CA00(void) bool8 sub_810CA34(struct Pokeblock *pokeblock) { - s8 idx = sub_810CA00(); + s8 idx = GetFirstFreePokeblockSlot(); if (idx == -1) { return FALSE; diff --git a/src/field/scrcmd.c b/src/field/scrcmd.c index d5fc56e8d..05a909e81 100644 --- a/src/field/scrcmd.c +++ b/src/field/scrcmd.c @@ -1722,7 +1722,7 @@ bool8 ScrCmd_settrainerflag(struct ScriptContext *ctx) { u16 index = VarGet(ScriptReadHalfword(ctx)); - trainer_flag_set(index); + SetTrainerFlag(index); return FALSE; } @@ -1730,7 +1730,7 @@ bool8 ScrCmd_cleartrainerflag(struct ScriptContext *ctx) { u16 index = VarGet(ScriptReadHalfword(ctx)); - trainer_flag_clear(index); + ClearTrainerFlag(index); return FALSE; } diff --git a/src/field/secret_base.c b/src/field/secret_base.c index 400074604..2e4138a3b 100644 --- a/src/field/secret_base.c +++ b/src/field/secret_base.c @@ -575,7 +575,7 @@ u8 *GetSecretBaseMapName(u8 *dest) { return sub_80BC190(dest, VarGet(VAR_CURRENT_SECRET_BASE)); } -void sub_80BC224(void) { +void BufferSecretBaseOwnerName(void) { u8 *var0 = gSaveBlock1.secretBases[(u8)VarGet(VAR_CURRENT_SECRET_BASE)].playerName; u8 *var1 = gStringVar1; u8 var2 = sub_80BB8A8(var0); @@ -830,7 +830,7 @@ void sub_80BC474(void) } } -void sub_80BC50C(void) +void MoveSecretBase(void) { u16 backupValue; sub_80BC474(); @@ -1197,7 +1197,7 @@ u8 sub_80BCCA4(u8 secretBaseIndex) + gSaveBlock1.secretBases[secretBaseIndex].gender * 5; } -const u8 *sub_80BCCE8(void) +const u8 *GetSecretBaseTrainerLoseText(void) { u8 param = sub_80BCCA4(VarGet(VAR_CURRENT_SECRET_BASE)); if (param == 0) return UnknownString_81A1BB2; diff --git a/src/field/tv.c b/src/field/tv.c index c38da1f4c..d7a75a709 100644 --- a/src/field/tv.c +++ b/src/field/tv.c @@ -80,7 +80,7 @@ extern u16 gLastUsedItem; static EWRAM_DATA u16 gUnknown_020387E0 = 0; static EWRAM_DATA u16 gUnknown_020387E2 = 0; static EWRAM_DATA u8 gUnknown_020387E4 = 0; -static EWRAM_DATA ALIGNED(4) u8 gUnknown_020387E8 = 0; // why is this aligned to a 4-byte boundary? +static EWRAM_DATA ALIGNED(4) u8 sTVShowState = 0; // why is this aligned to a 4-byte boundary? static u8 gUnknown_03000720; static u8 gUnknown_03000721; @@ -436,8 +436,8 @@ void ClearTVShowData(void) u8 showidx; u8 extradataidx; for (showidx=0; showidx<25; showidx++) { - gSaveBlock1.tvShows[showidx].common.var00 = 0; - gSaveBlock1.tvShows[showidx].common.var01 = 0; + gSaveBlock1.tvShows[showidx].common.kind = 0; + gSaveBlock1.tvShows[showidx].common.active = 0; for (extradataidx=0; extradataidx<34; extradataidx++) { gSaveBlock1.tvShows[showidx].common.pad02[extradataidx] = 0; } @@ -452,20 +452,20 @@ extern u8 gSpecialVar_ContestRank; extern u8 gUnknown_03004316[11]; extern u8 gBattleOutcome; -void sub_80BF334(void); -void sub_80BF3A4(void); -void sub_80BF3DC(void); -void sub_80BF46C(void); -void sub_80BF478(void); -void sub_80BF484(void); -void sub_80BF4BC(void); +void InterviewBefore_FanClubLetter(void); +void InterviewBefore_RecentHappenings(void); +void InterviewBefore_PkmnFanClubOpinions(void); +void InterviewBefore_Dummy(void); +void InterviewBefore_NameRater(void); +void InterviewBefore_BravoTrainerPkmnProfile(void); +void InterviewBefore_BravoTrainerBTProfile(void); void sub_80BE028(void); void sub_80BE074(void); void sub_80BE778(void); void sub_80BEB20(void); -u8 sub_80BFB54(u8); +u8 GetTVChannelByShowType(u8); s8 sub_80BF74C(TVShow tvShow[]); @@ -476,53 +476,62 @@ void sub_80BE138(TVShow *show); void sub_80BE160(TVShow *show); extern u16 gLastUsedItem; -void sub_80BE5FC(void); -void sub_80BE65C(void); -void sub_80BE6A0(void); -void nullsub_21(void); -void sub_80BE188(void); -void sub_80BE320(void); +void InterviewAfter_FanClubLetter(void); +void InterviewAfter_RecentHappenings(void); +void InterviewAfter_PkmnFanClubOpinions(void); +void InterviewAfter_DummyShow4(void); +void InterviewAfter_BravoTrainerPokemonProfile(void); +void InterviewAfter_BravoTrainerBattleTowerProfile(void); u8 special_0x44(void) { u8 i; u8 j; + u8 selIdx; + TVShow *show; -#ifndef NONMATCHING - asm("":::"r5"); -#endif - - for (i = 5; i < 24; i++) + for (i = 5; i < ARRAY_COUNT(gSaveBlock1.tvShows) - 1; i++) { - if (gSaveBlock1.tvShows[i].common.var00 == 0) + if (gSaveBlock1.tvShows[i].common.kind == 0) + { break; + } } - i = Random() % i; - j = i; + + j = Random() % i; + selIdx = j; + do { - if (sub_80BFB54(gSaveBlock1.tvShows[i].common.var00) != 4) + if (GetTVChannelByShowType(gSaveBlock1.tvShows[j].common.kind) != 4) { - if (gSaveBlock1.tvShows[i].common.var01 == 1) - return i; + if (gSaveBlock1.tvShows[j].common.active == TRUE) + { + return j; + } } else { - struct TVShowMassOutbreak *massOutbreak = &gSaveBlock1.tvShows[i].massOutbreak; - - if (massOutbreak->var16 == 0 && massOutbreak->var01 == 1) - return i; + show = &gSaveBlock1.tvShows[j]; + if (show->massOutbreak.daysLeft == 0 && show->massOutbreak.active == TRUE) + { + return j; + } + } + if (j == 0) + { + j = ARRAY_COUNT(gSaveBlock1.tvShows) - 2; } - - if (i == 0) - i = 23; else - i--; - } while (i != j); + { + j--; + } + } while (j != selIdx); + return 0xFF; } -u8 sub_80BDA30(void); +u8 FindNonMassOutbreakActiveTVShow(void); u8 sub_80BD8B8(void) { @@ -530,14 +539,14 @@ u8 sub_80BD8B8(void) if (retval == 0xff) return 0xff; - if (gSaveBlock1.outbreakPokemonSpecies != 0 && gSaveBlock1.tvShows[retval].common.var00 == TVSHOW_MASS_OUTBREAK) - return sub_80BDA30(); + if (gSaveBlock1.outbreakPokemonSpecies != 0 && gSaveBlock1.tvShows[retval].common.kind == TVSHOW_MASS_OUTBREAK) + return FindNonMassOutbreakActiveTVShow(); return retval; } u8 CheckForBigMovieOrEmergencyNewsOnTV(void); void SetTVMetatilesOnMap(int, int, u16); -bool8 sub_80BECA0(void); +bool8 FindAnyTVNewsOnTheAir(void); bool8 IsTVShowInSearchOfTrainersAiring(void); void UpdateTVScreensOnMap(int width, int height) @@ -556,7 +565,7 @@ void UpdateTVScreensOnMap(int width, int height) { SetTVMetatilesOnMap(width, height, 0x3); } - else if (FlagGet(FLAG_SYS_TV_START) && (sub_80BD8B8() != 0xff || sub_80BECA0() != 0xff || IsTVShowInSearchOfTrainersAiring())) + else if (FlagGet(FLAG_SYS_TV_START) && (sub_80BD8B8() != 0xff || FindAnyTVNewsOnTheAir() != 0xff || IsTVShowInSearchOfTrainersAiring())) { FlagClear(FLAG_SYS_TV_WATCH); SetTVMetatilesOnMap(width, height, 0x3); @@ -586,28 +595,28 @@ void TurnOffTVScreen(void) DrawWholeMapView(); } -u8 sub_80BDA0C(void) +u8 GetTVShowType(void) { - return gSaveBlock1.tvShows[gSpecialVar_0x8004].common.var00; + return gSaveBlock1.tvShows[gSpecialVar_0x8004].common.kind; } -u8 sub_80BDA30(void) +u8 FindNonMassOutbreakActiveTVShow(void) { u8 showIdx; for (showIdx=0; showIdx<24; showIdx++) { - if (gSaveBlock1.tvShows[showIdx].common.var00 != 0 && gSaveBlock1.tvShows[showIdx].common.var00 != TVSHOW_MASS_OUTBREAK && gSaveBlock1.tvShows[showIdx].common.var01 == 1) + if (gSaveBlock1.tvShows[showIdx].common.kind != 0 && gSaveBlock1.tvShows[showIdx].common.kind != TVSHOW_MASS_OUTBREAK && gSaveBlock1.tvShows[showIdx].common.active == 1) return showIdx; } return 0xff; } -u8 special_0x4a(void) +u8 GetNonMassOutbreakActiveTVShow(void) { TVShow *tvShow; tvShow = &gSaveBlock1.tvShows[gSpecialVar_0x8004]; - if (tvShow->common.var00 == TVSHOW_MASS_OUTBREAK && gSaveBlock1.outbreakPokemonSpecies) - return sub_80BDA30(); + if (tvShow->common.kind == TVSHOW_MASS_OUTBREAK && gSaveBlock1.outbreakPokemonSpecies) + return FindNonMassOutbreakActiveTVShow(); return gSpecialVar_0x8004; } @@ -677,7 +686,7 @@ void GabbyAndTyBeforeInterview(void) FlagSet(FLAG_TEMP_1); } -void sub_80BDC14(void) +void GabbyAndTyAfterInterview(void) { gSaveBlock1.gabbyAndTyData.valB_0 = gSaveBlock1.gabbyAndTyData.valA_0; gSaveBlock1.gabbyAndTyData.valB_1 = gSaveBlock1.gabbyAndTyData.valA_1; @@ -716,7 +725,7 @@ bool8 GabbyAndTyGetLastQuote(void) return TRUE; } -u8 sub_80BDD18(void) +u8 GabbyAndTyGetLastBattleTrivia(void) { if (!gSaveBlock1.gabbyAndTyData.valB_0) return 1; @@ -768,27 +777,27 @@ void GabbyAndTySetScriptVarsToFieldObjectLocalIds(void) } } -void sub_80BDE48(void) +void InterviewAfter(void) { switch (gSpecialVar_0x8005) { case TVSHOW_FAN_CLUB_LETTER: - sub_80BE5FC(); + InterviewAfter_FanClubLetter(); break; case TVSHOW_RECENT_HAPPENINGS: - sub_80BE65C(); + InterviewAfter_RecentHappenings(); break; case TVSHOW_PKMN_FAN_CLUB_OPINIONS: - sub_80BE6A0(); + InterviewAfter_PkmnFanClubOpinions(); break; case TVSHOW_UNKN_SHOWTYPE_04: - nullsub_21(); + InterviewAfter_DummyShow4(); break; case TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE: - sub_80BE188(); + InterviewAfter_BravoTrainerPokemonProfile(); break; case TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE: - sub_80BE320(); + InterviewAfter_BravoTrainerBattleTowerProfile(); break; } } @@ -832,8 +841,8 @@ void sub_80BDEC8(void) total = 0; pokemonToday = &gSaveBlock1.tvShows[gUnknown_03005D38.var0].pokemonToday; - pokemonToday->var00 = TVSHOW_POKEMON_TODAY_CAUGHT; - pokemonToday->var01 = total; + pokemonToday->kind = TVSHOW_POKEMON_TODAY_CAUGHT; + pokemonToday->active = total; if (gBattleResults.unk5_1 != 0) { total = 1; @@ -866,11 +875,11 @@ void sub_80BE028(void) { struct TVShowWorldOfMasters *worldOfMasters = &gSaveBlock1.tvShows[24].worldOfMasters; - if (worldOfMasters->var00 != TVSHOW_WORLD_OF_MASTERS) + if (worldOfMasters->kind != TVSHOW_WORLD_OF_MASTERS) { sub_80BF55C(gSaveBlock1.tvShows, 24); worldOfMasters->var06 = GetGameStat(GAME_STAT_STEPS); - worldOfMasters->var00 = TVSHOW_WORLD_OF_MASTERS; + worldOfMasters->kind = TVSHOW_WORLD_OF_MASTERS; } worldOfMasters->var02++; worldOfMasters->var04 = gBattleResults.caughtPoke; @@ -898,8 +907,8 @@ void sub_80BE074(void) struct TVShowPokemonTodayFailed *pokemonTodayFailed = &gSaveBlock1.tvShows[gUnknown_03005D38.var0].pokemonTodayFailed; zero = 0; - pokemonTodayFailed->var00 = TVSHOW_POKEMON_TODAY_FAILED; - pokemonTodayFailed->var01 = zero; + pokemonTodayFailed->kind = TVSHOW_POKEMON_TODAY_FAILED; + pokemonTodayFailed->active = zero; pokemonTodayFailed->species = gBattleResults.poke1Species; pokemonTodayFailed->species2 = gBattleResults.lastOpponentSpecies; pokemonTodayFailed->var10 = total; @@ -936,16 +945,16 @@ void sub_80BE160(TVShow *show) show->common.trainerIdHi = playerId >> 8; } -void sub_80BE188(void) +void InterviewAfter_BravoTrainerPokemonProfile(void) { struct TVShowBravoTrainerPokemonProfiles *bravoTrainerSrc = &gSaveBlock1.tvShows[24].bravoTrainer; - if (bravoTrainerSrc->var00 == TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE) + if (bravoTrainerSrc->kind == TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE) { struct TVShowBravoTrainerPokemonProfiles *bravoTrainerNew = &gSaveBlock1.tvShows[gUnknown_03005D38.var0].bravoTrainer; - bravoTrainerNew->var00 = TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE; - bravoTrainerNew->var01 = 1; + bravoTrainerNew->kind = TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE; + bravoTrainerNew->active = 1; bravoTrainerNew->species = bravoTrainerSrc->species; StringCopy(bravoTrainerNew->playerName, gSaveBlock2.playerName); StringCopy(bravoTrainerNew->pokemonNickname, bravoTrainerSrc->pokemonNickname); @@ -965,13 +974,13 @@ void sub_80BE23C(u16 a0) { struct TVShowBravoTrainerPokemonProfiles *bravoTrainer = &gSaveBlock1.tvShows[24].bravoTrainer; - sub_80BF484(); + InterviewBefore_BravoTrainerPkmnProfile(); gUnknown_03005D38.var0 = sub_80BF720(gSaveBlock1.tvShows); if (gUnknown_03005D38.var0 != -1) { sub_80BF55C(gSaveBlock1.tvShows, 24); bravoTrainer->var14 = a0; - bravoTrainer->var00 = TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE; + bravoTrainer->kind = TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE; } } @@ -990,12 +999,12 @@ void sub_80BE284(u8 a0) } } -void sub_80BE320(void) +void InterviewAfter_BravoTrainerBattleTowerProfile(void) { struct TVShowBravoTrainerBattleTowerSpotlight *bravoTrainerTower = &gSaveBlock1.tvShows[gUnknown_03005D38.var0].bravoTrainerTower; - bravoTrainerTower->var00 = TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE; - bravoTrainerTower->var01 = 1; + bravoTrainerTower->kind = TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE; + bravoTrainerTower->active = 1; StringCopy(bravoTrainerTower->trainerName, gSaveBlock2.playerName); StringCopy(bravoTrainerTower->pokemonName, gSaveBlock2.battleTower.defeatedByTrainerName); bravoTrainerTower->species = gSaveBlock2.battleTower.firstMonSpecies; @@ -1027,8 +1036,8 @@ void sub_80BE3BC(void) { struct TVShowSmartShopper *smartShopper = &gSaveBlock1.tvShows[gUnknown_03005D38.var0].smartshopperShow; - smartShopper->var00 = TVSHOW_SMART_SHOPPER; - smartShopper->var01 = rval; + smartShopper->kind = TVSHOW_SMART_SHOPPER; + smartShopper->active = rval; smartShopper->shopLocation = gMapHeader.regionMapSectionId; for (i=0; i<3; i++) { @@ -1046,7 +1055,7 @@ void sub_80BE3BC(void) void sub_80BE478(void) { - sub_80BF478(); + InterviewBefore_NameRater(); if (gSpecialVar_Result == 1) return; @@ -1055,8 +1064,8 @@ void sub_80BE478(void) { struct TVShowNameRaterShow *nameRaterShow = &gSaveBlock1.tvShows[gUnknown_03005D38.var0].nameRaterShow; - nameRaterShow->var00 = TVSHOW_NAME_RATER_SHOW; - nameRaterShow->var01 = 1; + nameRaterShow->kind = TVSHOW_NAME_RATER_SHOW; + nameRaterShow->active = 1; nameRaterShow->species = GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_SPECIES, NULL); nameRaterShow->random = Random() % 3; nameRaterShow->random2 = Random() % 2; @@ -1089,37 +1098,37 @@ void StartMassOutbreak(void) gSaveBlock1.outbreakUnk5 = 2; } -void sub_80BE5FC(void) +void InterviewAfter_FanClubLetter(void) { struct TVShowFanClubLetter *fanclubLetter = &gSaveBlock1.tvShows[gUnknown_03005D38.var0].fanclubLetter; - fanclubLetter->var00 = TVSHOW_FAN_CLUB_LETTER; - fanclubLetter->var01 = 1; + fanclubLetter->kind = TVSHOW_FAN_CLUB_LETTER; + fanclubLetter->active = 1; StringCopy(fanclubLetter->playerName, gSaveBlock2.playerName); fanclubLetter->species = GetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_SPECIES, NULL); sub_80BE160((TVShow *)fanclubLetter); fanclubLetter->language = GAME_LANGUAGE; } -void sub_80BE65C(void) +void InterviewAfter_RecentHappenings(void) { struct TVShowRecentHappenings *recentHappenings = &gSaveBlock1.tvShows[gUnknown_03005D38.var0].recentHappenings; - recentHappenings->var00 = TVSHOW_RECENT_HAPPENINGS; - recentHappenings->var01 = 1; + recentHappenings->kind = TVSHOW_RECENT_HAPPENINGS; + recentHappenings->active = 1; StringCopy(recentHappenings->playerName, gSaveBlock2.playerName); recentHappenings->var02 = 0; sub_80BE160((TVShow *)recentHappenings); recentHappenings->language = GAME_LANGUAGE; } -void sub_80BE6A0(void) +void InterviewAfter_PkmnFanClubOpinions(void) { u8 monIndex; struct TVShowFanclubOpinions *fanclubOpinions = &gSaveBlock1.tvShows[gUnknown_03005D38.var0].fanclubOpinions; - fanclubOpinions->var00 = TVSHOW_PKMN_FAN_CLUB_OPINIONS; - fanclubOpinions->var01 = 1; + fanclubOpinions->kind = TVSHOW_PKMN_FAN_CLUB_OPINIONS; + fanclubOpinions->active = 1; monIndex = GetLeadMonIndex(); fanclubOpinions->var04A = GetMonData(&gPlayerParty[monIndex], MON_DATA_FRIENDSHIP, NULL) / 16; fanclubOpinions->var04B = gSpecialVar_0x8007; @@ -1132,7 +1141,7 @@ void sub_80BE6A0(void) StripExtCtrlCodes(fanclubOpinions->var10); } -void nullsub_21(void) +void InterviewAfter_DummyShow4(void) { } @@ -1144,7 +1153,7 @@ void sub_80BE778(void) for (i = 0; i < 24; i++) { - if (gSaveBlock1.tvShows[i].massOutbreak.var00 == TVSHOW_MASS_OUTBREAK) + if (gSaveBlock1.tvShows[i].massOutbreak.kind == TVSHOW_MASS_OUTBREAK) return; } if (sub_80BF77C(0x147)) @@ -1158,8 +1167,8 @@ void sub_80BE778(void) s32 val2 = gUnknown_03005D38.var0; struct TVShowMassOutbreak *massOutbreak = &gSaveBlock1.tvShows[val2].massOutbreak; - massOutbreak->var00 = TVSHOW_MASS_OUTBREAK; - massOutbreak->var01 = 1; + massOutbreak->kind = TVSHOW_MASS_OUTBREAK; + massOutbreak->active = 1; massOutbreak->level = gPokeOutbreakSpeciesList[val].level; massOutbreak->var02 = 0; massOutbreak->var03 = 0; @@ -1174,7 +1183,7 @@ void sub_80BE778(void) massOutbreak->var12 = 0; massOutbreak->probability = 0x32; massOutbreak->var15 = 0; - massOutbreak->var16 = 0x01; + massOutbreak->daysLeft = 0x01; sub_80BE160((TVShow *)massOutbreak); massOutbreak->language = GAME_LANGUAGE; } @@ -1214,15 +1223,15 @@ void sub_80BE8EC(u16 arg0) { for (showidx=0; showidx<24; showidx++) { - if (gSaveBlock1.tvShows[showidx].massOutbreak.var00 == TVSHOW_MASS_OUTBREAK - && gSaveBlock1.tvShows[showidx].massOutbreak.var01 == 0x01) + if (gSaveBlock1.tvShows[showidx].massOutbreak.kind == TVSHOW_MASS_OUTBREAK + && gSaveBlock1.tvShows[showidx].massOutbreak.active == 0x01) { struct TVShowMassOutbreak *massOutbreak = &gSaveBlock1.tvShows[showidx].massOutbreak; - if (massOutbreak->var16 < arg0) - massOutbreak->var16 = 0; + if (massOutbreak->daysLeft < arg0) + massOutbreak->daysLeft = 0; else - massOutbreak->var16 -= arg0; + massOutbreak->daysLeft -= arg0; break; } } @@ -1272,8 +1281,8 @@ void sub_80BE9D4(void) register u8 zero asm("r1") = 0; asm(""::"r"(zero)); - pokemonAngler->var00 = TVSHOW_FISHING_ADVICE; - pokemonAngler->var01 = zero; + pokemonAngler->kind = TVSHOW_FISHING_ADVICE; + pokemonAngler->active = zero; pokemonAngler->var02 = gUnknown_020387E2 & 0xFF; pokemonAngler->var03 = gUnknown_020387E2 >> 8; pokemonAngler->var04 = gUnknown_020387E0; @@ -1294,7 +1303,7 @@ void sub_80BEA5C(u16 arg0) { struct TVShowWorldOfMasters *worldOfMasters = &gSaveBlock1.tvShows[24].worldOfMasters; - if (worldOfMasters->var00 == TVSHOW_WORLD_OF_MASTERS) + if (worldOfMasters->kind == TVSHOW_WORLD_OF_MASTERS) { if (worldOfMasters->var02 < 20) sub_80BF55C(gSaveBlock1.tvShows, 0x18); @@ -1313,8 +1322,8 @@ void sub_80BEA88(void) { struct TVShowWorldOfMasters *worldOfMastersDst = &gSaveBlock1.tvShows[gUnknown_03005D38.var0].worldOfMasters; - worldOfMastersDst->var00 = TVSHOW_WORLD_OF_MASTERS; - worldOfMastersDst->var01 = 0; + worldOfMastersDst->kind = TVSHOW_WORLD_OF_MASTERS; + worldOfMastersDst->active = 0; worldOfMastersDst->var02 = worldOfMastersSrc->var02; worldOfMastersDst->var06 = GetGameStat(GAME_STAT_STEPS) - worldOfMastersSrc->var06; worldOfMastersDst->var04 = worldOfMastersSrc->var04; @@ -1333,27 +1342,27 @@ void sub_80BEB20(void) if (FlagGet(FLAG_SYS_GAME_CLEAR) != 0) { - gUnknown_03005D38.var0 = sub_80BEBC8(gSaveBlock1.unknown_2ABC); + gUnknown_03005D38.var0 = sub_80BEBC8(gSaveBlock1.pokeNews); if (gUnknown_03005D38.var0 != -1 && sub_80BF77C(0x28f) != 1) { rval = (Random() % 3) + 1; if (sub_80BEE48(rval) != 1) { - gSaveBlock1.unknown_2ABC[gUnknown_03005D38.var0].val0 = rval; - gSaveBlock1.unknown_2ABC[gUnknown_03005D38.var0].val2 = 4; - gSaveBlock1.unknown_2ABC[gUnknown_03005D38.var0].val1 = 1; + gSaveBlock1.pokeNews[gUnknown_03005D38.var0].kind = rval; + gSaveBlock1.pokeNews[gUnknown_03005D38.var0].days = 4; + gSaveBlock1.pokeNews[gUnknown_03005D38.var0].state = 1; } } } } -int sub_80BEBC8(struct UnknownSaveStruct2ABC *arg0) +int sub_80BEBC8(struct PokeNews *pokeNews) { s8 i; for (i = 0; i < 16; i++) { - if (arg0[i].val0 == 0) + if (pokeNews[i].kind == 0) return i; } return -1; @@ -1369,9 +1378,9 @@ void sub_80BEBF4(void) void sub_80BEC10(u8 arg0) { - gSaveBlock1.unknown_2ABC[arg0].val0 = 0; - gSaveBlock1.unknown_2ABC[arg0].val1 = 0; - gSaveBlock1.unknown_2ABC[arg0].val2 = 0; + gSaveBlock1.pokeNews[arg0].kind = 0; + gSaveBlock1.pokeNews[arg0].state = 0; + gSaveBlock1.pokeNews[arg0].days = 0; } void sub_80BEC40(void) @@ -1380,13 +1389,13 @@ void sub_80BEC40(void) for (i = 0; i < 15; i++) { - if (gSaveBlock1.unknown_2ABC[i].val0 == 0) + if (gSaveBlock1.pokeNews[i].kind == 0) { for (j = i + 1; j < 16; j++) { - if (gSaveBlock1.unknown_2ABC[j].val0 != 0) + if (gSaveBlock1.pokeNews[j].kind != 0) { - gSaveBlock1.unknown_2ABC[i] = gSaveBlock1.unknown_2ABC[j]; + gSaveBlock1.pokeNews[i] = gSaveBlock1.pokeNews[j]; sub_80BEC10(j); break; } @@ -1395,43 +1404,43 @@ void sub_80BEC40(void) } } -u8 sub_80BECA0(void) +u8 FindAnyTVNewsOnTheAir(void) { u8 i; for (i = 0; i < 16; i++) { - if (gSaveBlock1.unknown_2ABC[i].val0 != 0 - && gSaveBlock1.unknown_2ABC[i].val1 == 1 - && gSaveBlock1.unknown_2ABC[i].val2 < 3) + if (gSaveBlock1.pokeNews[i].kind != 0 + && gSaveBlock1.pokeNews[i].state == 1 + && gSaveBlock1.pokeNews[i].days < 3) return i; } return 0xFF; } -void sub_80BECE8(void) +void DoPokeNews(void) { - u8 arg0; - arg0 = sub_80BECA0(); - if (arg0 == 0xff) + u8 i; + i = FindAnyTVNewsOnTheAir(); + if (i == 0xff) { gSpecialVar_Result = 0; return; } - if (gSaveBlock1.unknown_2ABC[arg0].val2 == 0) + if (gSaveBlock1.pokeNews[i].days == 0) { - gSaveBlock1.unknown_2ABC[arg0].val1 = 2; + gSaveBlock1.pokeNews[i].state = 2; if (gLocalTime.hours < 20) - ShowFieldMessage(gTVNewsTextGroup2[gSaveBlock1.unknown_2ABC[arg0].val0]); + ShowFieldMessage(gTVNewsTextGroup2[gSaveBlock1.pokeNews[i].kind]); else - ShowFieldMessage(gTVNewsTextGroup3[gSaveBlock1.unknown_2ABC[arg0].val0]); + ShowFieldMessage(gTVNewsTextGroup3[gSaveBlock1.pokeNews[i].kind]); } else { - u16 value = gSaveBlock1.unknown_2ABC[arg0].val2; + u16 value = gSaveBlock1.pokeNews[i].days; ConvertIntToDecimalStringN(gStringVar1, value, 0, 1); - gSaveBlock1.unknown_2ABC[arg0].val1 = 0; - ShowFieldMessage(gTVNewsTextGroup1[gSaveBlock1.unknown_2ABC[arg0].val0]); + gSaveBlock1.pokeNews[i].state = 0; + ShowFieldMessage(gTVNewsTextGroup1[gSaveBlock1.pokeNews[i].kind]); } gSpecialVar_Result = 1; } @@ -1444,9 +1453,9 @@ bool8 GetPriceReduction(u8 arg0) return FALSE; for (i=0; i<16; i++) { - if (gSaveBlock1.unknown_2ABC[i].val0 == arg0) + if (gSaveBlock1.pokeNews[i].kind == arg0) { - if (gSaveBlock1.unknown_2ABC[i].val1 == 2 && IsPriceDiscounted(arg0) != 0) + if (gSaveBlock1.pokeNews[i].state == 2 && IsPriceDiscounted(arg0) != 0) return TRUE; else return FALSE; @@ -1487,7 +1496,7 @@ bool8 sub_80BEE48(u8 arg0) return TRUE; for (i=0; i<16; i++) { - if (gSaveBlock1.unknown_2ABC[i].val0 == arg0) + if (gSaveBlock1.pokeNews[i].kind == arg0) return TRUE; } return FALSE; @@ -1499,17 +1508,17 @@ void sub_80BEE84(u16 var0) for (i=0; i<16; i++) { - if (gSaveBlock1.unknown_2ABC[i].val0) + if (gSaveBlock1.pokeNews[i].kind) { - if (gSaveBlock1.unknown_2ABC[i].val2 < var0) + if (gSaveBlock1.pokeNews[i].days < var0) { sub_80BEC10(i); } else { - if (!gSaveBlock1.unknown_2ABC[i].val1 && FlagGet(FLAG_SYS_GAME_CLEAR) == 1) - gSaveBlock1.unknown_2ABC[i].val1 = 1; - gSaveBlock1.unknown_2ABC[i].val2 -= var0; + if (!gSaveBlock1.pokeNews[i].state && FlagGet(FLAG_SYS_GAME_CLEAR) == 1) + gSaveBlock1.pokeNews[i].state = 1; + gSaveBlock1.pokeNews[i].days -= var0; } } } @@ -1619,7 +1628,7 @@ bool8 sub_80BF1B4(u8 showIdx) for (i = 5; i < 24; i++) { - if (tvShows[i].common.var00 == showIdx) + if (tvShows[i].common.kind == showIdx) { if ((trainerId & 0xFF) == tvShows[i].common.trainerIdLo && ((trainerId >> 8) & 0xFF) == tvShows[i].common.trainerIdHi) return TRUE; @@ -1656,9 +1665,9 @@ void sub_80BF25C(u8 showType) for (i = 0; i < 5; i++) { - if (gSaveBlock1.tvShows[i].common.var00 == showType) + if (gSaveBlock1.tvShows[i].common.kind == showType) { - if(gSaveBlock1.tvShows[i].common.var01 == 1) + if(gSaveBlock1.tvShows[i].common.active == 1) { gSpecialVar_Result = 1; } @@ -1674,36 +1683,36 @@ void sub_80BF25C(u8 showType) sub_80BF6D8(); } -void sub_80BF2C4(void) +void InterviewBefore(void) { - gSpecialVar_Result = 0; + gSpecialVar_Result = FALSE; switch (gSpecialVar_0x8005) { case TVSHOW_FAN_CLUB_LETTER: - sub_80BF334(); + InterviewBefore_FanClubLetter(); break; case TVSHOW_RECENT_HAPPENINGS: - sub_80BF3A4(); + InterviewBefore_RecentHappenings(); break; case TVSHOW_PKMN_FAN_CLUB_OPINIONS: - sub_80BF3DC(); + InterviewBefore_PkmnFanClubOpinions(); break; case TVSHOW_UNKN_SHOWTYPE_04: - sub_80BF46C(); + InterviewBefore_Dummy(); break; case TVSHOW_NAME_RATER_SHOW: - sub_80BF478(); + InterviewBefore_NameRater(); break; case TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE: - sub_80BF484(); + InterviewBefore_BravoTrainerPkmnProfile(); break; case TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE: - sub_80BF4BC(); + InterviewBefore_BravoTrainerBTProfile(); break; } } -void sub_80BF334(void) +void InterviewBefore_FanClubLetter(void) { struct TVShowFanClubLetter *fanclubLetter; @@ -1716,7 +1725,7 @@ void sub_80BF334(void) } } -void sub_80BF3A4(void) +void InterviewBefore_RecentHappenings(void) { struct TVShowRecentHappenings *recentHappenings; @@ -1728,7 +1737,7 @@ void sub_80BF3A4(void) } } -void sub_80BF3DC(void) +void InterviewBefore_PkmnFanClubOpinions(void) { struct TVShowFanclubOpinions *fanclubOpinions; @@ -1743,17 +1752,17 @@ void sub_80BF3DC(void) } } -void sub_80BF46C(void) +void InterviewBefore_Dummy(void) { gSpecialVar_Result = 1; } -void sub_80BF478(void) +void InterviewBefore_NameRater(void) { sub_80BF25C(TVSHOW_NAME_RATER_SHOW); } -void sub_80BF484(void) +void InterviewBefore_BravoTrainerPkmnProfile(void) { struct TVShowBravoTrainerPokemonProfiles *bravoTrainer; @@ -1765,7 +1774,7 @@ void sub_80BF484(void) } } -void sub_80BF4BC(void) +void InterviewBefore_BravoTrainerBTProfile(void) { struct TVShowBravoTrainerBattleTowerSpotlight *bravoTrainerTower; @@ -1778,32 +1787,32 @@ void sub_80BF4BC(void) } #if ENGLISH -u8 sub_80BF4F4(u8 arg0) +u8 NicknameDiffersFromSpeciesName(u8 monIndex) { u32 species; - GetMonData(&gPlayerParty[arg0], MON_DATA_NICKNAME, &gStringVar1); - species = GetMonData(&gPlayerParty[arg0], MON_DATA_SPECIES, NULL); - if (StringCompareWithoutExtCtrlCodes(gSpeciesNames[species], gStringVar1) == FALSE) + GetMonData(&gPlayerParty[monIndex], MON_DATA_NICKNAME, &gStringVar1); + species = GetMonData(&gPlayerParty[monIndex], MON_DATA_SPECIES, NULL); + if (StringCompareWithoutExtCtrlCodes(gSpeciesNames[species], gStringVar1) == 0) return FALSE; return TRUE; } #elif GERMAN -u8 sub_80BF4F4(u8 arg0) +u8 NicknameDiffersFromSpeciesName(u8 monIndex) { u8 langData[4]; u32 species; u8 *tmp; - GetMonData(&gPlayerParty[arg0], MON_DATA_NICKNAME, &gStringVar1); + GetMonData(&gPlayerParty[monIndex], MON_DATA_NICKNAME, &gStringVar1); tmp = langData; - tmp[0] = GetMonData(&gPlayerParty[arg0], MON_DATA_LANGUAGE, &langData); + tmp[0] = GetMonData(&gPlayerParty[monIndex], MON_DATA_LANGUAGE, &langData); if (tmp[0] != GAME_LANGUAGE) return TRUE; - species = GetMonData(&gPlayerParty[arg0], MON_DATA_SPECIES, NULL); + species = GetMonData(&gPlayerParty[monIndex], MON_DATA_SPECIES, NULL); if (StringCompareWithoutExtCtrlCodes(gSpeciesNames[species], gStringVar1)) return TRUE; @@ -1811,17 +1820,17 @@ u8 sub_80BF4F4(u8 arg0) } #endif -u8 sub_80BF544(void) +u8 LeadMonNicknamed(void) { - return sub_80BF4F4(GetLeadMonIndex()); + return NicknameDiffersFromSpeciesName(GetLeadMonIndex()); } void sub_80BF55C(TVShow tvShow[], u8 showidx) { u8 idx; - tvShow[showidx].common.var00 = 0; - tvShow[showidx].common.var01 = 0; + tvShow[showidx].common.kind = 0; + tvShow[showidx].common.active = 0; for (idx = 0; idx < 34; idx++) tvShow[showidx].common.pad02[idx] = 0; } @@ -1833,11 +1842,11 @@ void sub_80BF588(TVShow tvShow[]) for (showidx = 0; showidx < 4; showidx++) { - if (tvShow[showidx].common.var00 == 0) + if (tvShow[showidx].common.kind == 0) { for (showidx2 = showidx + 1; showidx2 < 5; showidx2++) { - if (tvShow[showidx2].common.var00 != 0) + if (tvShow[showidx2].common.kind != 0) { tvShow[showidx] = tvShow[showidx2]; sub_80BF55C(tvShow, showidx2); @@ -1848,11 +1857,11 @@ void sub_80BF588(TVShow tvShow[]) } for (showidx = 5; showidx < 24; showidx++) { - if (tvShow[showidx].common.var00 == 0) + if (tvShow[showidx].common.kind == 0) { for (showidx2 = showidx + 1; showidx2 < 24; showidx2++) { - if (tvShow[showidx2].common.var00 != 0) + if (tvShow[showidx2].common.kind != 0) { tvShow[showidx] = tvShow[showidx2]; sub_80BF55C(gSaveBlock1.tvShows, showidx2); @@ -1909,7 +1918,7 @@ s8 sub_80BF720(TVShow tvShow[]) for (idx = 0; idx < 5; idx++) { - if (tvShow[idx].common.var00 == 0) + if (tvShow[idx].common.kind == 0) return idx; } return -1; @@ -1921,7 +1930,7 @@ s8 sub_80BF74C(TVShow tvShow[]) for (idx = 5; idx < 24; idx++) { - if (tvShow[idx].common.var00 == 0) + if (tvShow[idx].common.kind == 0) return idx; } return -1; @@ -2043,19 +2052,19 @@ void sub_80BF820(u8 arg0, u8 arg1, u8 arg2, u16 arg3, u16 arg4, struct TVShowNam StringCopy(gUnknown_083D1464[arg0], flags); } -bool8 sub_80BF974(void) +bool8 TV_IsScriptShowKindAlreadyInQueue(void) { u8 i; for (i = 0; i < 5; i++) { - if (gSaveBlock1.tvShows[i].common.var00 == gSpecialVar_0x8004) + if (gSaveBlock1.tvShows[i].common.kind == gSpecialVar_0x8004) return TRUE; } return FALSE; } -bool8 sub_80BF9B4(void) +bool8 TV_PutNameRaterShowOnTheAirIfNicnkameChanged(void) { GetMonData(&(gPlayerParty[gSpecialVar_0x8004]), MON_DATA_NICKNAME, &gStringVar1); if (!StringCompareWithoutExtCtrlCodes(gStringVar3, gStringVar1)) @@ -2064,9 +2073,9 @@ bool8 sub_80BF9B4(void) return TRUE; } -void c2_080CC144(void); +void ChangePokemonNickname_CB(void); -void sub_80BF9F8(void) +void ChangePokemonNickname(void) { u16 spec; u16 gender; @@ -2077,22 +2086,22 @@ void sub_80BF9F8(void) spec = GetMonData(&(gPlayerParty[gSpecialVar_0x8004]), MON_DATA_SPECIES, 0); gender = GetMonGender(&(gPlayerParty[gSpecialVar_0x8004])); pval = GetMonData(&(gPlayerParty[gSpecialVar_0x8004]), MON_DATA_PERSONALITY, 0); - DoNamingScreen(3, gStringVar2, spec, gender, pval, c2_080CC144); + DoNamingScreen(3, gStringVar2, spec, gender, pval, ChangePokemonNickname_CB); } -void c2_080CC144(void) +void ChangePokemonNickname_CB(void) { SetMonData(&(gPlayerParty[gSpecialVar_0x8004]), MON_DATA_NICKNAME, gStringVar2); c2_exit_to_overworld_1_continue_scripts_restart_music(); } -void sub_80BFAE0(void) +void TV_CopyNicknameToStringVar1AndEnsureTerminated(void) { GetMonData(&(gPlayerParty[gSpecialVar_0x8004]), MON_DATA_NICKNAME, &gStringVar1); StringGetEnd10(gStringVar1); } -void sub_80BFB10(void) +void TV_CheckMonOTIDEqualsPlayerID(void) { if (GetPlayerTrainerId() == GetMonData(&(gPlayerParty[gSpecialVar_0x8004]), MON_DATA_OT_ID, 0)) gSpecialVar_Result = 0; @@ -2100,7 +2109,7 @@ void sub_80BFB10(void) gSpecialVar_Result = 1; } -u8 sub_80BFB54(u8 arg0) +u8 GetTVChannelByShowType(u8 arg0) { if (arg0 == 0) return 0; @@ -2200,7 +2209,7 @@ void sub_80BFD20(void) typedef union ewramStruct_02007000 { TVShow tvshows[4][25]; - struct UnknownSaveStruct2ABC unknown_2abc[4][16]; + struct PokeNews pokeNews[4][16]; } ewramStruct_02007000; void sub_80BFE24(TVShow arg0[25], TVShow arg1[25], TVShow arg2[25], TVShow arg3[25]); @@ -2294,7 +2303,7 @@ bool8 sub_80BFF68(TVShow * arg1[25], TVShow * arg2[25], u8 idx) tv1 = *arg1; tv2 = *arg2; value = FALSE; - switchval = sub_80BFB54(tv2[gUnknown_03000722].common.var00); + switchval = GetTVChannelByShowType(tv2[gUnknown_03000722].common.kind); switch (switchval) { case 2: @@ -2329,7 +2338,7 @@ u8 sub_80C004C(TVShow *tv1, TVShow *tv2, u8 idx) tv2->common.srcTrainerIdLo = linkTrainerId & 0xFF; tv2->common.srcTrainerIdHi = linkTrainerId >> 8; *tv1 = *tv2; - tv1->common.var01 = 1; + tv1->common.active = 1; return TRUE; } @@ -2345,7 +2354,7 @@ u8 sub_80C00B4(TVShow *tv1, TVShow *tv2, u8 idx) tv2->common.srcTrainerId2Lo = linkTrainerId & 0xFF; tv2->common.srcTrainerId2Hi = linkTrainerId >> 8; *tv1 = *tv2; - tv1->common.var01 = 1; + tv1->common.active = 1; return TRUE; } @@ -2359,7 +2368,7 @@ u8 sub_80C0134(TVShow *tv1, TVShow *tv2, u8 idx) tv2->common.srcTrainerIdLo = linkTrainerId & 0xFF; tv2->common.srcTrainerIdHi = linkTrainerId >> 8; *tv1 = *tv2; - tv1->common.var01 = 1; + tv1->common.active = 1; tv1->common.var16[0] = 1; return TRUE; } @@ -2369,7 +2378,7 @@ s8 sub_80C019C(TVShow tvShows[]) u8 i; for (i = 0; i < 24; i++) { - if (tvShows[i].common.var01 == 0 && (u8)(tvShows[i].common.var00 - 1) < 60) + if (tvShows[i].common.active == 0 && (u8)(tvShows[i].common.kind - 1) < 60) return i; } return -1; @@ -2381,7 +2390,7 @@ void sub_80C01D4(void) u16 i; for (i=0; i<24; i++) { - switch (gSaveBlock1.tvShows[i].common.var00) + switch (gSaveBlock1.tvShows[i].common.kind) { case 0: case TVSHOW_RECENT_HAPPENINGS: @@ -2637,13 +2646,13 @@ _080C03A0:\n\ void sub_80C03A8(u8 showidx) { - gSaveBlock1.tvShows[showidx].common.var01 = 0; + gSaveBlock1.tvShows[showidx].common.active = 0; } void sub_80C03C8(u16 species, u8 showidx) { if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), 0) == 0) - gSaveBlock1.tvShows[showidx].common.var01 = 0; + gSaveBlock1.tvShows[showidx].common.active = 0; } void sub_80C0408(void) @@ -2654,10 +2663,10 @@ void sub_80C0408(void) return; for (i = 0; i < 24; i++) { - if (gSaveBlock1.tvShows[i].common.var00 == TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE) - gSaveBlock1.tvShows[i].common.var01 = 0; - else if (gSaveBlock1.tvShows[i].common.var00 == TVSHOW_MASS_OUTBREAK) - gSaveBlock1.tvShows[i].common.var01 = 0; + if (gSaveBlock1.tvShows[i].common.kind == TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE) + gSaveBlock1.tvShows[i].common.active = 0; + else if (gSaveBlock1.tvShows[i].common.kind == TVSHOW_MASS_OUTBREAK) + gSaveBlock1.tvShows[i].common.active = 0; } } @@ -2667,8 +2676,8 @@ void sub_80C045C(void) for (i = 0; i < 5; i++) { - if (sub_80BFB54(gSaveBlock1.tvShows[i].common.var00) == 2) - gSaveBlock1.tvShows[i].common.var01 = 0; + if (GetTVChannelByShowType(gSaveBlock1.tvShows[i].common.kind) == 2) + gSaveBlock1.tvShows[i].common.active = 0; } } @@ -2680,18 +2689,18 @@ void sub_80C04A0(void) for (showIdx = 5; showIdx < 24; showIdx++) { - if (gSaveBlock1.tvShows[showIdx].common.var00 == 0) + if (gSaveBlock1.tvShows[showIdx].common.kind == 0) count++; } for (showIdx = 0; showIdx < 5 - count; showIdx++) sub_80BF55C(gSaveBlock1.tvShows, showIdx+5); } -void sub_80C05C4(struct UnknownSaveStruct2ABC[16], struct UnknownSaveStruct2ABC[16], struct UnknownSaveStruct2ABC[16], struct UnknownSaveStruct2ABC[16]); +void sub_80C05C4(struct PokeNews[16], struct PokeNews[16], struct PokeNews[16], struct PokeNews[16]); void sub_80C0750(void); void sub_80C0788(void); -s8 sub_80C0730(struct UnknownSaveStruct2ABC[16], u8); -void sub_80C06BC(struct UnknownSaveStruct2ABC *[16], struct UnknownSaveStruct2ABC *[16]); +s8 sub_80C0730(struct PokeNews[16], u8); +void sub_80C06BC(struct PokeNews *[16], struct PokeNews *[16]); void sub_80C0514(void *a0, u32 a1, u8 a2) { @@ -2699,33 +2708,33 @@ void sub_80C0514(void *a0, u32 a1, u8 a2) u8 i; for (i = 0; i < 4; i++) - memcpy(gUnknown_02007000.unknown_2abc[i], a0 + i * a1, 64); + memcpy(gUnknown_02007000.pokeNews[i], a0 + i * a1, 64); struct02007000 = &gUnknown_02007000; switch (a2) { case 0: - sub_80C05C4(gSaveBlock1.unknown_2ABC, struct02007000->unknown_2abc[1], struct02007000->unknown_2abc[2], struct02007000->unknown_2abc[3]); + sub_80C05C4(gSaveBlock1.pokeNews, struct02007000->pokeNews[1], struct02007000->pokeNews[2], struct02007000->pokeNews[3]); break; case 1: - sub_80C05C4(struct02007000->unknown_2abc[0], gSaveBlock1.unknown_2ABC, struct02007000->unknown_2abc[2], struct02007000->unknown_2abc[3]); + sub_80C05C4(struct02007000->pokeNews[0], gSaveBlock1.pokeNews, struct02007000->pokeNews[2], struct02007000->pokeNews[3]); break; case 2: - sub_80C05C4(struct02007000->unknown_2abc[0], struct02007000->unknown_2abc[1], gSaveBlock1.unknown_2ABC, struct02007000->unknown_2abc[3]); + sub_80C05C4(struct02007000->pokeNews[0], struct02007000->pokeNews[1], gSaveBlock1.pokeNews, struct02007000->pokeNews[3]); break; case 3: - sub_80C05C4(struct02007000->unknown_2abc[0], struct02007000->unknown_2abc[1], struct02007000->unknown_2abc[2], gSaveBlock1.unknown_2ABC); + sub_80C05C4(struct02007000->pokeNews[0], struct02007000->pokeNews[1], struct02007000->pokeNews[2], gSaveBlock1.pokeNews); break; } sub_80C0750(); sub_80C0788(); } -void sub_80C05C4(struct UnknownSaveStruct2ABC a0[16], struct UnknownSaveStruct2ABC a1[16], struct UnknownSaveStruct2ABC a2[16], struct UnknownSaveStruct2ABC a3[16]) +void sub_80C05C4(struct PokeNews a0[16], struct PokeNews a1[16], struct PokeNews a2[16], struct PokeNews a3[16]) { u8 i; u8 j; u8 k; - struct UnknownSaveStruct2ABC ** arglist[4]; + struct PokeNews ** arglist[4]; arglist[0] = &a0; arglist[1] = &a1; @@ -2750,10 +2759,10 @@ void sub_80C05C4(struct UnknownSaveStruct2ABC a0[16], struct UnknownSaveStruct2A } } -void sub_80C06BC(struct UnknownSaveStruct2ABC *arg0[16], struct UnknownSaveStruct2ABC *arg1[16]) +void sub_80C06BC(struct PokeNews *arg0[16], struct PokeNews *arg1[16]) { - struct UnknownSaveStruct2ABC *str0; - struct UnknownSaveStruct2ABC *str1; + struct PokeNews *str0; + struct PokeNews *str1; str0 = arg0[0]; str1 = arg1[0]; @@ -2761,26 +2770,26 @@ void sub_80C06BC(struct UnknownSaveStruct2ABC *arg0[16], struct UnknownSaveStruc sub_80C06E8(str0, str1, gUnknown_03005D38.var0); } -bool8 sub_80C06E8(struct UnknownSaveStruct2ABC *arg0, struct UnknownSaveStruct2ABC *arg1, s8 arg2) +bool8 sub_80C06E8(struct PokeNews *arg0, struct PokeNews *arg1, s8 arg2) { u8 i; - if (arg1->val0 == 0) + if (arg1->kind == 0) return FALSE; for (i = 0; i < 16; i++) { - if (arg0[i].val0 == arg1->val0) + if (arg0[i].kind == arg1->kind) return FALSE; } - arg0[arg2].val0 = arg1->val0; - arg0[arg2].val1 = 1; - arg0[arg2].val2 = arg1->val2; + arg0[arg2].kind = arg1->kind; + arg0[arg2].state = 1; + arg0[arg2].days = arg1->days; return TRUE; } -s8 sub_80C0730(struct UnknownSaveStruct2ABC *arg0, u8 arg1) +s8 sub_80C0730(struct PokeNews *arg0, u8 arg1) { - if (arg0[arg1].val0 == 0) + if (arg0[arg1].kind == 0) return -1; return arg1; } @@ -2791,7 +2800,7 @@ void sub_80C0750(void) for (i = 0; i < 16; i++) { - if (gSaveBlock1.unknown_2ABC[i].val0 > 3) + if (gSaveBlock1.pokeNews[i].kind > 3) sub_80BEC10(i); } sub_80BEC40(); @@ -2804,15 +2813,15 @@ void sub_80C0788(void) if (FlagGet(FLAG_SYS_GAME_CLEAR) != 1) { for (i = 0; i < 16; i++) - gSaveBlock1.unknown_2ABC[i].val1 = 0; + gSaveBlock1.pokeNews[i].state = 0; } } void DoTVShow(void) { - if (gSaveBlock1.tvShows[gSpecialVar_0x8004].common.var01 != 0) + if (gSaveBlock1.tvShows[gSpecialVar_0x8004].common.active != 0) { - switch (gSaveBlock1.tvShows[gSpecialVar_0x8004].common.var00) + switch (gSaveBlock1.tvShows[gSpecialVar_0x8004].common.kind) { case TVSHOW_FAN_CLUB_LETTER: DoTVShowPokemonFanClubLetter(); @@ -2870,7 +2879,7 @@ void DoTVShowBravoTrainerPokemonProfile(void) u8 state; gSpecialVar_Result = 0; - state = gUnknown_020387E8; + state = sTVShowState; switch(state) { case 0: @@ -2878,49 +2887,49 @@ void DoTVShowBravoTrainerPokemonProfile(void) CopyContestCategoryToStringVar(1, bravoTrainer->contestCategory); sub_80BEF10(2, bravoTrainer->contestRank); if (!StringCompareWithoutExtCtrlCodes(gSpeciesNames[bravoTrainer->species], bravoTrainer->pokemonNickname)) - gUnknown_020387E8 = 8; + sTVShowState = 8; else - gUnknown_020387E8 = 1; + sTVShowState = 1; break; case 1: StringCopy(gStringVar1, gSpeciesNames[bravoTrainer->species]); TVShowConvertInternationalString(gStringVar2, bravoTrainer->pokemonNickname, bravoTrainer->var1f); CopyContestCategoryToStringVar(2, bravoTrainer->contestCategory); - gUnknown_020387E8 = 2; + sTVShowState = 2; break; case 2: TVShowConvertInternationalString(gStringVar1, bravoTrainer->playerName, bravoTrainer->language); if (bravoTrainer->contestResult == 0) // placed first - gUnknown_020387E8 = 3; + sTVShowState = 3; else - gUnknown_020387E8 = 4; + sTVShowState = 4; break; case 3: TVShowConvertInternationalString(gStringVar1, bravoTrainer->playerName, bravoTrainer->language); EasyChat_GetWordText(gStringVar2, bravoTrainer->var04[0]); sub_80BF088(2, bravoTrainer->contestResult + 1); - gUnknown_020387E8 = 5; + sTVShowState = 5; break; case 4: TVShowConvertInternationalString(gStringVar1, bravoTrainer->playerName, bravoTrainer->language); EasyChat_GetWordText(gStringVar2, bravoTrainer->var04[0]); sub_80BF088(2, bravoTrainer->contestResult + 1); - gUnknown_020387E8 = 5; + sTVShowState = 5; break; case 5: TVShowConvertInternationalString(gStringVar1, bravoTrainer->playerName, bravoTrainer->language); CopyContestCategoryToStringVar(1, bravoTrainer->contestCategory); EasyChat_GetWordText(gStringVar3, bravoTrainer->var04[1]); if (bravoTrainer->var14) - gUnknown_020387E8 = 6; + sTVShowState = 6; else - gUnknown_020387E8 = 7; + sTVShowState = 7; break; case 6: StringCopy(gStringVar1, gSpeciesNames[bravoTrainer->species]); StringCopy(gStringVar2, gMoveNames[bravoTrainer->var14]); EasyChat_GetWordText(gStringVar3, bravoTrainer->var04[1]); - gUnknown_020387E8 = 7; + sTVShowState = 7; break; case 7: TVShowConvertInternationalString(gStringVar1, bravoTrainer->playerName, bravoTrainer->language); @@ -2929,7 +2938,7 @@ void DoTVShowBravoTrainerPokemonProfile(void) break; case 8: StringCopy(gStringVar1, gSpeciesNames[bravoTrainer->species]); - gUnknown_020387E8 = 2; + sTVShowState = 2; break; } ShowFieldMessage(gTVBravoTrainerTextGroup[state]); @@ -2941,79 +2950,79 @@ void DoTVShowBravoTrainerBattleTowerProfile(void) u8 state; gSpecialVar_Result = 0; - state = gUnknown_020387E8; + state = sTVShowState; switch(state) { case 0: TVShowConvertInternationalString(gStringVar1, bravoTrainerTower->trainerName, bravoTrainerTower->language); StringCopy(gStringVar2, gSpeciesNames[bravoTrainerTower->species]); if (bravoTrainerTower->var16 >= 7) - gUnknown_020387E8 = 1; + sTVShowState = 1; else - gUnknown_020387E8 = 2; + sTVShowState = 2; break; case 1: sub_80BF088(0, bravoTrainerTower->btLevel); sub_80BF088(1, bravoTrainerTower->var16); if (bravoTrainerTower->var1c == 1) - gUnknown_020387E8 = 3; + sTVShowState = 3; else - gUnknown_020387E8 = 4; + sTVShowState = 4; break; case 2: TVShowConvertInternationalString(gStringVar1, bravoTrainerTower->pokemonName, bravoTrainerTower->language); sub_80BF088(1, bravoTrainerTower->var16 + 1); if (bravoTrainerTower->var1b == 0) - gUnknown_020387E8 = 5; + sTVShowState = 5; else - gUnknown_020387E8 = 6; + sTVShowState = 6; break; case 3: TVShowConvertInternationalString(gStringVar1, bravoTrainerTower->pokemonName, bravoTrainerTower->language); StringCopy(gStringVar2, gSpeciesNames[bravoTrainerTower->defeatedSpecies]); if (bravoTrainerTower->var1b == 0) - gUnknown_020387E8 = 5; + sTVShowState = 5; else - gUnknown_020387E8 = 6; + sTVShowState = 6; break; case 4: TVShowConvertInternationalString(gStringVar1, bravoTrainerTower->pokemonName, bravoTrainerTower->language); StringCopy(gStringVar2, gSpeciesNames[bravoTrainerTower->defeatedSpecies]); if (bravoTrainerTower->var1b == 0) - gUnknown_020387E8 = 5; + sTVShowState = 5; else - gUnknown_020387E8 = 6; + sTVShowState = 6; break; case 5: TVShowConvertInternationalString(gStringVar1, bravoTrainerTower->pokemonName, bravoTrainerTower->language); - gUnknown_020387E8 = 11; + sTVShowState = 11; break; case 6: TVShowConvertInternationalString(gStringVar1, bravoTrainerTower->pokemonName, bravoTrainerTower->language); - gUnknown_020387E8 = 11; + sTVShowState = 11; break; case 7: - gUnknown_020387E8 = 11; + sTVShowState = 11; break; case 8: case 9: case 10: TVShowConvertInternationalString(gStringVar1, bravoTrainerTower->trainerName, bravoTrainerTower->language); - gUnknown_020387E8 = 11; + sTVShowState = 11; break; case 11: EasyChat_GetWordText(gStringVar1, bravoTrainerTower->var18[0]); if (bravoTrainerTower->var1b == 0) - gUnknown_020387E8 = 12; + sTVShowState = 12; else - gUnknown_020387E8 = 13; + sTVShowState = 13; break; case 12: case 13: EasyChat_GetWordText(gStringVar1, bravoTrainerTower->var18[0]); TVShowConvertInternationalString(gStringVar2, bravoTrainerTower->trainerName, bravoTrainerTower->language); TVShowConvertInternationalString(gStringVar3, bravoTrainerTower->pokemonName, bravoTrainerTower->language); - gUnknown_020387E8 = 14; + sTVShowState = 14; break; case 14: TVShowConvertInternationalString(gStringVar1, bravoTrainerTower->trainerName, bravoTrainerTower->language); @@ -3030,61 +3039,61 @@ void DoTVShowTodaysSmartShopper(void) u8 state; gSpecialVar_Result = 0; - state = gUnknown_020387E8; + state = sTVShowState; switch(state) { case 0: TVShowConvertInternationalString(gStringVar1, smartShopper->playerName, smartShopper->language); GetMapSectionName(gStringVar2, smartShopper->shopLocation, 0); if (smartShopper->itemAmounts[0] >= 0xff) - gUnknown_020387E8 = 11; + sTVShowState = 11; else - gUnknown_020387E8 = 1; + sTVShowState = 1; break; case 1: TVShowConvertInternationalString(gStringVar1, smartShopper->playerName, smartShopper->language); StringCopy(gStringVar2, ItemId_GetItem(smartShopper->itemIds[0])->name); sub_80BF088(2, smartShopper->itemAmounts[0]); - gUnknown_020387E8 += (Random() % 4) + 1; + sTVShowState += (Random() % 4) + 1; break; case 2: case 4: case 5: if (smartShopper->itemIds[1] != 0) - gUnknown_020387E8 = 6; + sTVShowState = 6; else - gUnknown_020387E8 = 10; + sTVShowState = 10; break; case 3: sub_80BF088(2, smartShopper->itemAmounts[0] + 1); if (smartShopper->itemIds[1] != 0) - gUnknown_020387E8 = 6; + sTVShowState = 6; else - gUnknown_020387E8 = 10; + sTVShowState = 10; break; case 6: StringCopy(gStringVar2, ItemId_GetItem(smartShopper->itemIds[1])->name); sub_80BF088(2, smartShopper->itemAmounts[1]); if (smartShopper->itemIds[2] != 0) - gUnknown_020387E8 = 7; + sTVShowState = 7; else if (smartShopper->priceReduced == 1) - gUnknown_020387E8 = 8; + sTVShowState = 8; else - gUnknown_020387E8 = 9; + sTVShowState = 9; break; case 7: StringCopy(gStringVar2, ItemId_GetItem(smartShopper->itemIds[2])->name); sub_80BF088(2, smartShopper->itemAmounts[2]); if (smartShopper->priceReduced == 1) - gUnknown_020387E8 = 8; + sTVShowState = 8; else - gUnknown_020387E8 = 9; + sTVShowState = 9; break; case 8: if (smartShopper->itemAmounts[0] < 0xff) - gUnknown_020387E8 = 9; + sTVShowState = 9; else - gUnknown_020387E8 = 12; + sTVShowState = 12; break; case 9: sub_80BF154(1, smartShopper); @@ -3092,17 +3101,17 @@ void DoTVShowTodaysSmartShopper(void) break; case 10: if (smartShopper->priceReduced == 1) - gUnknown_020387E8 = 8; + sTVShowState = 8; else - gUnknown_020387E8 = 9; + sTVShowState = 9; break; case 11: TVShowConvertInternationalString(gStringVar1, smartShopper->playerName, smartShopper->language); StringCopy(gStringVar2, ItemId_GetItem(smartShopper->itemIds[0])->name); if (smartShopper->priceReduced == 1) - gUnknown_020387E8 = 8; + sTVShowState = 8; else - gUnknown_020387E8 = 12; + sTVShowState = 12; break; case 12: TVShowConvertInternationalString(gStringVar1, smartShopper->playerName, smartShopper->language); @@ -3118,14 +3127,14 @@ void DoTVShowTheNameRaterShow(void) u8 state; gSpecialVar_Result = 0; - state = gUnknown_020387E8; + state = sTVShowState; switch (state) { case 0: TVShowConvertInternationalString(gStringVar1, nameRaterShow->trainerName, nameRaterShow->language); StringCopy(gStringVar2, gSpeciesNames[nameRaterShow->species]); TVShowConvertInternationalString(gStringVar3, nameRaterShow->pokemonName, nameRaterShow->pokemonNameLanguage); - gUnknown_020387E8 = sub_80BF7E8(nameRaterShow) + 1; + sTVShowState = sub_80BF7E8(nameRaterShow) + 1; break; case 1: case 3: @@ -3135,20 +3144,20 @@ void DoTVShowTheNameRaterShow(void) case 7: case 8: if (nameRaterShow->random == 0) - gUnknown_020387E8 = 9; + sTVShowState = 9; else if (nameRaterShow->random == 1) - gUnknown_020387E8 = 10; + sTVShowState = 10; else if (nameRaterShow->random == 2) - gUnknown_020387E8 = 11; + sTVShowState = 11; break; case 2: TVShowConvertInternationalString(gStringVar1, nameRaterShow->trainerName, nameRaterShow->language); if (nameRaterShow->random == 0) - gUnknown_020387E8 = 9; + sTVShowState = 9; else if (nameRaterShow->random == 1) - gUnknown_020387E8 = 10; + sTVShowState = 10; else if (nameRaterShow->random == 2) - gUnknown_020387E8 = 11; + sTVShowState = 11; break; case 9: case 10: @@ -3158,7 +3167,7 @@ void DoTVShowTheNameRaterShow(void) sub_80BF820(0, 0, 0, 1, 0, nameRaterShow); TVShowConvertInternationalString(gStringVar2, gStringVar1, nameRaterShow->pokemonNameLanguage); TVShowConvertInternationalString(gStringVar1, nameRaterShow->pokemonName, nameRaterShow->pokemonNameLanguage); - gUnknown_020387E8 = 12; + sTVShowState = 12; break; case 13: sub_80BF820(0, 0, 3, 1, 0, nameRaterShow); @@ -3166,7 +3175,7 @@ void DoTVShowTheNameRaterShow(void) sub_80BF820(0, 0, 2, 0, 0, nameRaterShow); TVShowConvertInternationalString(gStringVar2, gStringVar1, nameRaterShow->language); TVShowConvertInternationalString(gStringVar1, nameRaterShow->trainerName, nameRaterShow->language); - gUnknown_020387E8 = 14; + sTVShowState = 14; break; case 14: sub_80BF820(0, 0, 3, 0, 0, nameRaterShow); @@ -3174,31 +3183,31 @@ void DoTVShowTheNameRaterShow(void) sub_80BF820(0, 0, 2, 1, 0, nameRaterShow); TVShowConvertInternationalString(gStringVar2, gStringVar1, nameRaterShow->pokemonNameLanguage); TVShowConvertInternationalString(gStringVar1, nameRaterShow->trainerName, nameRaterShow->language); - gUnknown_020387E8 = 18; + sTVShowState = 18; break; case 15: sub_80BF820(1, 0, 2, 1, 0, nameRaterShow); TVShowConvertInternationalString(gStringVar1, gStringVar2, nameRaterShow->pokemonNameLanguage); StringCopy(gStringVar2, gSpeciesNames[nameRaterShow->species]); sub_80BF820(2, 0, 3, 2, nameRaterShow->species, nameRaterShow); - gUnknown_020387E8 = 16; + sTVShowState = 16; break; case 16: sub_80BF820(0, 0, 3, 1, 0, nameRaterShow); TVShowConvertInternationalString(gStringVar3, gStringVar1, nameRaterShow->pokemonNameLanguage); sub_80BF820(0, 0, 2, 2, nameRaterShow->species, nameRaterShow); - gUnknown_020387E8 = 17; + sTVShowState = 17; break; case 17: sub_80BF820(1, 0, 2, 1, 0, nameRaterShow); TVShowConvertInternationalString(gStringVar1, gStringVar2, nameRaterShow->pokemonNameLanguage); sub_80BF820(2, 0, 3, 2, nameRaterShow->var1C, nameRaterShow); StringCopy(gStringVar2, gSpeciesNames[nameRaterShow->var1C]); - gUnknown_020387E8 = 18; + sTVShowState = 18; break; case 12: state = 18; - gUnknown_020387E8 = 18; + sTVShowState = 18; case 18: TVShowConvertInternationalString(gStringVar1, nameRaterShow->pokemonName, nameRaterShow->pokemonNameLanguage); TVShowConvertInternationalString(gStringVar2, nameRaterShow->trainerName, nameRaterShow->language); @@ -3214,7 +3223,7 @@ void DoTVShowPokemonTodaySuccessfulCapture(void) u8 state; gSpecialVar_Result = 0; - state = gUnknown_020387E8; + state = sTVShowState; switch (state) { case 0: @@ -3222,53 +3231,53 @@ void DoTVShowPokemonTodaySuccessfulCapture(void) StringCopy(gStringVar2, gSpeciesNames[pokemonToday->species]); TVShowConvertInternationalString(gStringVar3, pokemonToday->nickname, pokemonToday->language2); if (pokemonToday->ball == ITEM_MASTER_BALL) - gUnknown_020387E8 = 5; + sTVShowState = 5; else - gUnknown_020387E8 = 1; + sTVShowState = 1; break; case 1: - gUnknown_020387E8 = 2; + sTVShowState = 2; break; case 2: StringCopy(gStringVar2, ItemId_GetItem(pokemonToday->ball)->name); sub_80BF088(2, pokemonToday->var12); if (pokemonToday->var12 < 4) - gUnknown_020387E8 = 3; + sTVShowState = 3; else - gUnknown_020387E8 = 4; + sTVShowState = 4; break; case 3: TVShowConvertInternationalString(gStringVar1, pokemonToday->playerName, pokemonToday->language); StringCopy(gStringVar2, gSpeciesNames[pokemonToday->species]); TVShowConvertInternationalString(gStringVar3, pokemonToday->nickname, pokemonToday->language2); - gUnknown_020387E8 = 6; + sTVShowState = 6; break; case 4: - gUnknown_020387E8 = 6; + sTVShowState = 6; break; case 5: TVShowConvertInternationalString(gStringVar1, pokemonToday->playerName, pokemonToday->language); StringCopy(gStringVar2, gSpeciesNames[pokemonToday->species]); - gUnknown_020387E8 = 6; + sTVShowState = 6; break; case 6: TVShowConvertInternationalString(gStringVar1, pokemonToday->playerName, pokemonToday->language); StringCopy(gStringVar2, gSpeciesNames[pokemonToday->species]); TVShowConvertInternationalString(gStringVar3, pokemonToday->nickname, pokemonToday->language2); - gUnknown_020387E8 += (Random() % 4) + 1; + sTVShowState += (Random() % 4) + 1; break; case 7: case 8: StringCopy(gStringVar1, gSpeciesNames[pokemonToday->species]); TVShowConvertInternationalString(gStringVar2, pokemonToday->nickname, pokemonToday->language2); sub_80BF638(2, pokemonToday->species); - gUnknown_020387E8 = 11; + sTVShowState = 11; break; case 9: case 10: StringCopy(gStringVar1, gSpeciesNames[pokemonToday->species]); TVShowConvertInternationalString(gStringVar2, pokemonToday->nickname, pokemonToday->language2); - gUnknown_020387E8 = 11; + sTVShowState = 11; break; case 11: TVShowDone(); @@ -3283,36 +3292,36 @@ void DoTVShowPokemonTodayFailedCapture(void) u8 state; gSpecialVar_Result = 0; - state = gUnknown_020387E8; + state = sTVShowState; switch (state) { case 0: TVShowConvertInternationalString(gStringVar1, pokemonTodayFailed->playerName, pokemonTodayFailed->language); StringCopy(gStringVar2, gSpeciesNames[pokemonTodayFailed->species]); - gUnknown_020387E8 = 1; + sTVShowState = 1; break; case 1: TVShowConvertInternationalString(gStringVar1, pokemonTodayFailed->playerName, pokemonTodayFailed->language); GetMapSectionName(gStringVar2, pokemonTodayFailed->var12, 0); StringCopy(gStringVar3, gSpeciesNames[pokemonTodayFailed->species2]); if (pokemonTodayFailed->var11 == 1) - gUnknown_020387E8 = 3; + sTVShowState = 3; else - gUnknown_020387E8 = 2; + sTVShowState = 2; break; case 2: case 3: TVShowConvertInternationalString(gStringVar1, pokemonTodayFailed->playerName, pokemonTodayFailed->language); sub_80BF088(1, pokemonTodayFailed->var10); if ((Random() % 3) == 0) - gUnknown_020387E8 = 5; + sTVShowState = 5; else - gUnknown_020387E8 = 4; + sTVShowState = 4; break; case 4: case 5: TVShowConvertInternationalString(gStringVar1, pokemonTodayFailed->playerName, pokemonTodayFailed->language); - gUnknown_020387E8 = 6; + sTVShowState = 6; break; case 6: TVShowDone(); @@ -3328,32 +3337,32 @@ void DoTVShowPokemonFanClubLetter(void) u16 rval; gSpecialVar_Result = 0; - state = gUnknown_020387E8; + state = sTVShowState; switch (state) { case 0: TVShowConvertInternationalString(gStringVar1, fanclubLetter->playerName, fanclubLetter->language); StringCopy(gStringVar2, gSpeciesNames[fanclubLetter->species]); - gUnknown_020387E8 = 50; + sTVShowState = 50; break; case 1: rval = (Random() % 4) + 1; if (rval == 1) - gUnknown_020387E8 = 2; + sTVShowState = 2; else - gUnknown_020387E8 = rval + 2; + sTVShowState = rval + 2; break; case 2: - gUnknown_020387E8 = 51; + sTVShowState = 51; break; case 3: - gUnknown_020387E8 += (Random() % 3) + 1; + sTVShowState += (Random() % 3) + 1; break; case 4: case 5: case 6: sub_80BF79C((TVShow *)fanclubLetter); - gUnknown_020387E8 = 7; + sTVShowState = 7; break; case 7: rval = (Random() % 0x1f) + 0x46; @@ -3363,12 +3372,12 @@ void DoTVShowPokemonFanClubLetter(void) case 50: ConvertEasyChatWordsToString(gStringVar4, fanclubLetter->pad04, 2, 2); ShowFieldMessage(gStringVar4); - gUnknown_020387E8 = 1; + sTVShowState = 1; return; case 51: ConvertEasyChatWordsToString(gStringVar4, fanclubLetter->pad04, 2, 2); ShowFieldMessage(gStringVar4); - gUnknown_020387E8 = 3; + sTVShowState = 3; return; } ShowFieldMessage(gTVFanClubTextGroup[state]); @@ -3380,21 +3389,21 @@ void DoTVShowRecentHappenings(void) u8 state; gSpecialVar_Result = 0; - state = gUnknown_020387E8; + state = sTVShowState; switch (state) { case 0: TVShowConvertInternationalString(gStringVar1, recentHappenings->playerName, recentHappenings->language); sub_80BF79C((TVShow *)recentHappenings); - gUnknown_020387E8 = 50; + sTVShowState = 50; break; case 1: - gUnknown_020387E8 += 1 + (Random() % 3); + sTVShowState += 1 + (Random() % 3); break; case 2: case 3: case 4: - gUnknown_020387E8 = 5; + sTVShowState = 5; break; case 5: TVShowDone(); @@ -3402,7 +3411,7 @@ void DoTVShowRecentHappenings(void) case 50: ConvertEasyChatWordsToString(gStringVar4, recentHappenings->var04, 2, 2); ShowFieldMessage(gStringVar4); - gUnknown_020387E8 = 1; + sTVShowState = 1; return; } ShowFieldMessage(gTVRecentHappeningsTextGroup[state]); @@ -3414,14 +3423,14 @@ void DoTVShowPokemonFanClubOpinions(void) u8 state; gSpecialVar_Result = 0; - state = gUnknown_020387E8; + state = sTVShowState; switch (state) { case 0: TVShowConvertInternationalString(gStringVar1, fanclubOpinions->playerName, fanclubOpinions->language); StringCopy(gStringVar2, gSpeciesNames[fanclubOpinions->var02]); TVShowConvertInternationalString(gStringVar3, fanclubOpinions->var10, fanclubOpinions->var0E); - gUnknown_020387E8 = fanclubOpinions->var04B + 1; + sTVShowState = fanclubOpinions->var04B + 1; break; case 1: case 2: @@ -3429,7 +3438,7 @@ void DoTVShowPokemonFanClubOpinions(void) TVShowConvertInternationalString(gStringVar1, fanclubOpinions->playerName, fanclubOpinions->language); StringCopy(gStringVar2, gSpeciesNames[fanclubOpinions->var02]); EasyChat_GetWordText(gStringVar3, fanclubOpinions->var1C[0]); - gUnknown_020387E8 = 4; + sTVShowState = 4; break; case 4: TVShowConvertInternationalString(gStringVar1, fanclubOpinions->playerName, fanclubOpinions->language); @@ -3452,7 +3461,7 @@ void DoTVShowPokemonNewsMassOutbreak(void) StringCopy(gStringVar2, gSpeciesNames[massOutbreak->species]); TVShowDone(); StartMassOutbreak(); - ShowFieldMessage(gTVPokemonOutbreakTextGroup[gUnknown_020387E8]); + ShowFieldMessage(gTVPokemonOutbreakTextGroup[sTVShowState]); } void DoTVShowInSearchOfTrainers(void) @@ -3460,49 +3469,49 @@ void DoTVShowInSearchOfTrainers(void) u8 state; gSpecialVar_Result = 0; - state = gUnknown_020387E8; + state = sTVShowState; switch (state) { case 0: GetMapSectionName(gStringVar1, gSaveBlock1.gabbyAndTyData.mapnum, 0); if (gSaveBlock1.gabbyAndTyData.battleNum > 1) - gUnknown_020387E8 = 1; + sTVShowState = 1; else - gUnknown_020387E8 = 2; + sTVShowState = 2; break; case 1: - gUnknown_020387E8 = 2; + sTVShowState = 2; break; case 2: if (gSaveBlock1.gabbyAndTyData.valA_0 == 0) - gUnknown_020387E8 = 4; + sTVShowState = 4; else if (gSaveBlock1.gabbyAndTyData.valA_3 != 0) - gUnknown_020387E8 = 5; + sTVShowState = 5; else if (gSaveBlock1.gabbyAndTyData.valA_2 != 0) - gUnknown_020387E8 = 6; + sTVShowState = 6; else if (gSaveBlock1.gabbyAndTyData.valA_1 != 0) - gUnknown_020387E8 = 7; + sTVShowState = 7; else - gUnknown_020387E8 = 3; + sTVShowState = 3; break; case 3: StringCopy(gStringVar1, gSpeciesNames[gSaveBlock1.gabbyAndTyData.mon1]); StringCopy(gStringVar2, gMoveNames[gSaveBlock1.gabbyAndTyData.lastMove]); StringCopy(gStringVar3, gSpeciesNames[gSaveBlock1.gabbyAndTyData.mon2]); - gUnknown_020387E8 = 8; + sTVShowState = 8; break; case 4: case 5: case 6: case 7: - gUnknown_020387E8 = 8; + sTVShowState = 8; break; case 8: EasyChat_GetWordText(gStringVar1, gSaveBlock1.gabbyAndTyData.quote); StringCopy(gStringVar2, gSpeciesNames[gSaveBlock1.gabbyAndTyData.mon1]); StringCopy(gStringVar3, gSpeciesNames[gSaveBlock1.gabbyAndTyData.mon2]); gSpecialVar_Result = 1; - gUnknown_020387E8 = 0;; + sTVShowState = 0;; TakeTVShowInSearchOfTrainersOffTheAir(); break; } @@ -3516,10 +3525,10 @@ void DoTVShowPokemonAngler(void) gSpecialVar_Result = 0; if (pokemonAngler->var02 < pokemonAngler->var03) - gUnknown_020387E8 = 0; + sTVShowState = 0; else - gUnknown_020387E8 = 1; - state = gUnknown_020387E8; + sTVShowState = 1; + state = sTVShowState; switch (state) { case 0: @@ -3544,7 +3553,7 @@ void DoTVShowTheWorldOfMasters(void) u8 state; gSpecialVar_Result = 0; - state = gUnknown_020387E8; + state = sTVShowState; switch (state) { case 0: @@ -3552,11 +3561,11 @@ void DoTVShowTheWorldOfMasters(void) worldOfMasters->language); sub_80BF088(1, worldOfMasters->var06); sub_80BF088(2, worldOfMasters->var02); - gUnknown_020387E8 = 1; + sTVShowState = 1; break; case 1: StringCopy(gStringVar1, gSpeciesNames[worldOfMasters->var08]); - gUnknown_020387E8 = 2; + sTVShowState = 2; break; case 2: TVShowConvertInternationalString(gStringVar1, worldOfMasters->playerName, @@ -3572,11 +3581,11 @@ void DoTVShowTheWorldOfMasters(void) void TVShowDone(void) { gSpecialVar_Result = 1; - gUnknown_020387E8 = 0; - gSaveBlock1.tvShows[gSpecialVar_0x8004].common.var01 = 0; + sTVShowState = 0; + gSaveBlock1.tvShows[gSpecialVar_0x8004].common.active = 0; } -void sub_80C2014(void) +void ResetTVShowState(void) { - gUnknown_020387E8 = 0; + sTVShowState = 0; } diff --git a/src/pokemon/learn_move.c b/src/pokemon/learn_move.c index 5eee45b23..ef1d66349 100644 --- a/src/pokemon/learn_move.c +++ b/src/pokemon/learn_move.c @@ -239,7 +239,7 @@ void VBlankCB_LearnMove(void) TransferPlttBuffer(); } -void sub_8132670(void) +void TeachMoveTutorMove(void) { ScriptContext2_Enable(); CreateTask(sub_813269C, 10); diff --git a/src/pokemon/pokedex.c b/src/pokemon/pokedex.c index a4d84bebd..1c1c71454 100644 --- a/src/pokemon/pokedex.c +++ b/src/pokemon/pokedex.c @@ -4109,7 +4109,7 @@ u16 GetHoennPokedexCount(u8 caseID) return count; } -bool8 sub_8090FC0(void) +bool8 CompletedHoennPokedex(void) { u16 i; diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c index cd3793cb5..9563bc08f 100644 --- a/src/pokemon/pokemon_summary_screen.c +++ b/src/pokemon/pokemon_summary_screen.c @@ -124,10 +124,10 @@ extern struct MusicPlayerInfo gMPlay_BGM; extern u8 gUnknown_020384F0; extern u8 gUnknown_08208238[]; extern u16 gUnknown_030041B8; -extern u16 gUnknown_03004280; -extern u16 gUnknown_030041B4; -extern u16 gUnknown_030042C0; -extern u16 gUnknown_03004288; +extern u16 gBattle_BG2_Y; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG1_X; +extern u16 gBattle_BG2_X; extern u16 gUnknown_030041B0; extern TaskFunc gUnknown_03005CF0; extern struct Sprite *gUnknown_020384F4; @@ -582,10 +582,10 @@ void sub_809D844(void) void sub_809D85C(void) { - REG_BG1HOFS = gUnknown_030042C0; - REG_BG1VOFS = gUnknown_030041B4; - REG_BG2HOFS = gUnknown_03004288; - REG_BG2VOFS = gUnknown_03004280; + REG_BG1HOFS = gBattle_BG1_X; + REG_BG1VOFS = gBattle_BG1_Y; + REG_BG2HOFS = gBattle_BG2_X; + REG_BG2VOFS = gBattle_BG2_Y; REG_BG3HOFS = gUnknown_030041B0; REG_BG3VOFS = gUnknown_030041B8; @@ -868,10 +868,10 @@ static void sub_809DE64(void) REG_BG2CNT = 0x4A02; REG_BG3CNT = 0x5C03; - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; - gUnknown_03004288 = 0; - gUnknown_03004280 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; gUnknown_030041B0 = 0; gUnknown_030041B8 = 0; @@ -1522,7 +1522,7 @@ static void sub_809EBC4(void) if (pssData.page != PSS_PAGE_INFO) { DrawSummaryScreenNavigationDots(); - gUnknown_030042C0 = 0x100; + gBattle_BG1_X = 0x100; if (pssData.page == PSS_PAGE_SKILLS) REG_BG1CNT = (REG_BG1CNT & 0xE0FF) + 0x800; @@ -1547,7 +1547,7 @@ void sub_809EC38(u8 taskId) { if (pssData.page != PSS_PAGE_INFO) { - gUnknown_03004288 = 0x100; + gBattle_BG2_X = 0x100; } if (pssData.page == PSS_PAGE_SKILLS) @@ -1564,7 +1564,7 @@ void sub_809EC38(u8 taskId) { if (pssData.page != PSS_PAGE_INFO) { - gUnknown_030042C0 = 0x100; + gBattle_BG1_X = 0x100; } if (pssData.page == PSS_PAGE_SKILLS) @@ -1583,8 +1583,8 @@ void sub_809EC38(u8 taskId) case 1: if (pssData.bgToggle == 0) { - int var2 = gUnknown_030042C0 - 0x20; - gUnknown_030042C0 = var2; + int var2 = gBattle_BG1_X - 0x20; + gBattle_BG1_X = var2; if (var2 << 16 == 0) { REG_BG1CNT = (REG_BG1CNT & 0xFFFC) + 2; @@ -1594,8 +1594,8 @@ void sub_809EC38(u8 taskId) } else { - int var2 = gUnknown_03004288 - 0x20; - gUnknown_03004288 = var2; + int var2 = gBattle_BG2_X - 0x20; + gBattle_BG2_X = var2; if (var2 << 16 == 0) { REG_BG1CNT = (REG_BG1CNT & 0xFFFC) + 1; @@ -1663,12 +1663,12 @@ void sub_809EE74(u8 taskId) var1 = pssData.bgToggle; if (var1 == 0) { - gUnknown_03004288 = pssData.bgToggle; + gBattle_BG2_X = pssData.bgToggle; taskData[0]++; } else { - gUnknown_030042C0 = 0; + gBattle_BG1_X = 0; taskData[0]++; } break; @@ -1705,8 +1705,8 @@ void sub_809EE74(u8 taskId) case 2: if (pssData.bgToggle == 0) { - int var2 = gUnknown_03004288 + 0x20; - gUnknown_03004288 = var2; + int var2 = gBattle_BG2_X + 0x20; + gBattle_BG2_X = var2; if ((var2 << 16) == 0x1000000) { taskData[0]++; @@ -1714,8 +1714,8 @@ void sub_809EE74(u8 taskId) } else { - int var2 = gUnknown_030042C0 + 0x20; - gUnknown_030042C0 = var2; + int var2 = gBattle_BG1_X + 0x20; + gBattle_BG1_X = var2; if ((var2 << 16) == 0x1000000) { taskData[0]++; diff --git a/src/rom3.c b/src/rom3.c index dd520a839..cdc66989c 100644 --- a/src/rom3.c +++ b/src/rom3.c @@ -35,7 +35,7 @@ extern u8 gNoOfAllBanks; extern u16 gBattlePartyID[]; extern u8 gBanksBySide[]; extern u16 gCurrentMove; -extern u16 gUnknown_02024BE8; +extern u16 gChosenMove; extern u16 gLastUsedItem; extern u8 gLastUsedAbility; extern u8 gBankAttacker; @@ -80,7 +80,7 @@ void setup_poochyena_battle(void) } sub_800B858(); gBattleExecBuffer = 0; - battle_anim_clear_some_data(); + ClearBattleAnimationVars(); ClearBattleMonForms(); BattleAI_HandleItemUseBeforeAISetup(); if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE) @@ -745,7 +745,7 @@ void EmitPrintString(u8 a, u16 stringID) stringInfo = (struct StringInfoBattle*)(&gBattleBuffersTransferData[4]); stringInfo->currentMove = gCurrentMove; - stringInfo->lastMove = gUnknown_02024BE8; + stringInfo->lastMove = gChosenMove; stringInfo->lastItem = gLastUsedItem; stringInfo->lastAbility = gLastUsedAbility; stringInfo->scrActive = BATTLE_STRUCT->scriptingActive; @@ -777,7 +777,7 @@ void EmitPrintStringPlayerOnly(u8 a, u16 stringID) stringInfo = (struct StringInfoBattle*)(&gBattleBuffersTransferData[4]); stringInfo->currentMove = gCurrentMove; - stringInfo->lastMove = gUnknown_02024BE8; + stringInfo->lastMove = gChosenMove; stringInfo->lastItem = gLastUsedItem; stringInfo->lastAbility = gLastUsedAbility; stringInfo->scrActive = BATTLE_STRUCT->scriptingActive; diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index 347f113c3..cf57f8823 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -28,7 +28,7 @@ #define gBattleMonPartyPositions gBattlePartyID #define gCastformElevations gUnknownCastformData_0837F5A8 #define gCastformBackSpriteYCoords gUnknown_0837F5AC -#define gTransformPersonalities gPID_perBank +#define gTransformPersonalities gTransformedPersonalities #define gBattleMonSprites gObjectBankIDs @@ -86,16 +86,16 @@ extern u16 gBattleMonPartyPositions[]; extern u16 gBattleTypeFlags; extern u32 gTransformPersonalities[NUM_BATTLE_SLOTS]; extern u8 gBattleMonForms[NUM_BATTLE_SLOTS]; -extern u16 gUnknown_0202F7CA[]; +extern u16 gAnimSpeciesByBanks[]; extern u8 gBattleMonSprites[NUM_BATTLE_SLOTS]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern s16 gBattleAnimArgs[8]; extern u8 gBanksBySide[NUM_BATTLE_SLOTS]; extern u8 gNoOfAllBanks; // gNumBattleMons? extern struct OamMatrix gOamMatrices[]; extern struct Struct_2017810 unk_2017810[]; -extern u8 gHappinessMoveAnim; +extern u8 gAnimFriendship; extern u8 UpdateMonIconFrame(struct Sprite *sprite); @@ -168,12 +168,12 @@ const struct SpriteSheet gUnknown_0837F5E0[] = { }; -u8 sub_8077ABC(u8 slot, u8 a2) { +u8 GetBankPosition(u8 slot, u8 a2) { u8 var; u16 species; struct TransformStatus *transform; - if (NotInBattle()) { + if (IsContest()) { if (a2 == 3 && slot == 3) { a2 = 1; } @@ -189,7 +189,7 @@ u8 sub_8077ABC(u8 slot, u8 a2) { case 3: case 4: default: - if (NotInBattle()) { + if (IsContest()) { if (ewram19348.unk4 & 1) { species = ewram19348.unk2; } else { @@ -229,9 +229,9 @@ u8 sub_8077BFC(u8 slot, u16 species) { u8 ret; u16 var; - if (!GetBankSide(slot) || NotInBattle()) { + if (!GetBankSide(slot) || IsContest()) { if (species == SPECIES_UNOWN) { - if (NotInBattle()) { + if (IsContest()) { if (ewram19348.unk4 & 1) { personality = ewram19348.unk10; } else { @@ -288,7 +288,7 @@ u8 sub_8077BFC(u8 slot, u16 species) { u8 sub_8077DD8(u8 slot, u16 species) { u8 ret = 0; if (GetBankSide(slot) == 1) { - if (!NotInBattle()) { + if (!IsContest()) { if (species == SPECIES_CASTFORM) { ret = gCastformElevations[gBattleMonForms[slot]]; } else if (species > NUM_SPECIES) { @@ -304,7 +304,7 @@ u8 sub_8077DD8(u8 slot, u16 species) { u8 sub_8077E44(u8 slot, u16 species, u8 a3) { u16 offset; u8 y; - if (GetBankSide(slot) == 0 || NotInBattle()) { + if (GetBankSide(slot) == 0 || IsContest()) { offset = sub_8077BFC(slot, species); } else { offset = sub_8077BFC(slot, species); @@ -324,7 +324,7 @@ u8 sub_8077EE4(u8 slot, u8 a2) { u16 species; struct TransformStatus *transform; if (a2 == 3 || a2 == 4) { - if (NotInBattle()) { + if (IsContest()) { if (ewram19348.unk4 & 1) { species = ewram19348.unk2; } else { @@ -333,7 +333,7 @@ u8 sub_8077EE4(u8 slot, u8 a2) { } else { transform = &eTransformStatuses[slot]; if (!transform->species) { - species = gUnknown_0202F7CA[slot]; + species = gAnimSpeciesByBanks[slot]; } else { species = transform->species; } @@ -344,20 +344,20 @@ u8 sub_8077EE4(u8 slot, u8 a2) { return sub_8077E44(slot, species, 0); } } else { - return sub_8077ABC(slot, a2); + return GetBankPosition(slot, a2); } } u8 sub_8077F68(u8 slot) { - return sub_8077ABC(slot, 4); + return GetBankPosition(slot, 4); } u8 sub_8077F7C(u8 slot) { u16 var; if (GetBankSide(slot)) { - var = sub_8077ABC(slot, 1) + 16; + var = GetBankPosition(slot, 1) + 16; } else { - var = sub_8077ABC(slot, 1) + 17; + var = GetBankPosition(slot, 1) + 17; } return var; } @@ -366,8 +366,8 @@ u8 sub_8077FC0(u8 slot) { u16 var; u8 r6; struct TransformStatus *transform; - r6 = sub_8077ABC(slot, 1); - if (!NotInBattle()) { + r6 = GetBankPosition(slot, 1); + if (!IsContest()) { if (GetBankSide(slot)) { transform = &eTransformStatuses[slot]; if (!transform->species) { @@ -392,29 +392,29 @@ u8 sub_8077FC0(u8 slot) { u8 GetAnimBankSpriteId(u8 whichBank) { u8 *sprites; - if (whichBank == ANIM_BANK_ATK) { - if (AnimBankSpriteExists(gBattleAnimBankAttacker)) { + if (whichBank == ANIM_BANK_ATTACKER) { + if (IsBankSpritePresent(gAnimBankAttacker)) { sprites = gBattleMonSprites; - return sprites[gBattleAnimBankAttacker]; + return sprites[gAnimBankAttacker]; } else { return 0xff; } - } else if (whichBank == ANIM_BANK_DEF) { - if (AnimBankSpriteExists(gBattleAnimBankTarget)) { + } else if (whichBank == ANIM_BANK_TARGET) { + if (IsBankSpritePresent(gAnimBankTarget)) { sprites = gBattleMonSprites; - return sprites[gBattleAnimBankTarget]; + return sprites[gAnimBankTarget]; } else { return 0xff; } } else if (whichBank == ANIM_BANK_ATK_PARTNER) { - if (!IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2)) { + if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) { return 0xff; } else { - return gBattleMonSprites[gBattleAnimBankAttacker ^ 2]; + return gBattleMonSprites[gAnimBankAttacker ^ 2]; } } else { - if (IsAnimBankSpriteVisible(gBattleAnimBankTarget ^ 2)) { - return gBattleMonSprites[gBattleAnimBankTarget ^ 2]; + if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) { + return gBattleMonSprites[gAnimBankTarget ^ 2]; } else { return 0xff; } @@ -567,8 +567,8 @@ void sub_80783D0(struct Sprite *sprite) { void unref_sub_8078414(struct Sprite *sprite) { sprite->data[1] = sprite->pos1.x + sprite->pos2.x; sprite->data[3] = sprite->pos1.y + sprite->pos2.y; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); sprite->callback = sub_80782F8; } @@ -613,14 +613,14 @@ void sub_8078504(struct Sprite *sprite) { void move_anim_8074EE0(struct Sprite *sprite) { FreeSpriteOamMatrix(sprite); - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void unref_sub_8078588(struct Sprite *sprite) { sprite->data[1] = sprite->pos1.x + sprite->pos2.x; sprite->data[3] = sprite->pos1.y + sprite->pos2.y; - sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2); + sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3); sprite->callback = sub_80782F8; } @@ -644,7 +644,7 @@ void sub_8078600(struct Sprite *sprite) { void sub_807861C(struct Sprite *sprite) { REG_BLDCNT = 0; REG_BLDALPHA = 0; - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void sub_8078634(u8 task) { @@ -654,19 +654,19 @@ void sub_8078634(u8 task) { } void sub_8078650(struct Sprite *sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); } void sub_807867C(struct Sprite *sprite, s16 a2) { - u16 v1 = sub_8077ABC(gBattleAnimBankAttacker, 0); - u16 v2 = sub_8077ABC(gBattleAnimBankTarget, 0); + u16 v1 = GetBankPosition(gAnimBankAttacker, 0); + u16 v2 = GetBankPosition(gAnimBankTarget, 0); if (v1 > v2) { sprite->pos1.x -= a2; } else if (v1 < v2) { sprite->pos1.x += a2; } else { - if (GetBankSide(gBattleAnimBankAttacker)) { + if (GetBankSide(gAnimBankAttacker)) { sprite->pos1.x -= a2; } else { sprite->pos1.x += a2; @@ -700,8 +700,8 @@ void oamt_add_pos2_onto_pos1(struct Sprite *sprite) { void sub_8078764(struct Sprite *sprite, u8 a2) { if (!a2) { - sprite->pos1.x = sub_8077EE4(gBattleAnimBankTarget, 0); - sprite->pos1.y = sub_8077EE4(gBattleAnimBankTarget, 1); + sprite->pos1.x = sub_8077EE4(gAnimBankTarget, 0); + sprite->pos1.y = sub_8077EE4(gAnimBankTarget, 1); } sub_807867C(sprite, gBattleAnimArgs[0]); sprite->pos1.y += gBattleAnimArgs[1]; @@ -709,11 +709,11 @@ void sub_8078764(struct Sprite *sprite, u8 a2) { void sub_80787B0(struct Sprite *sprite, u8 a2) { if (!a2) { - sprite->pos1.x = sub_8077EE4(gBattleAnimBankAttacker, 0); - sprite->pos1.y = sub_8077EE4(gBattleAnimBankAttacker, 1); + sprite->pos1.x = sub_8077EE4(gAnimBankAttacker, 0); + sprite->pos1.y = sub_8077EE4(gAnimBankAttacker, 1); } else { - sprite->pos1.x = sub_8077EE4(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077EE4(gBattleAnimBankAttacker, 3); + sprite->pos1.x = sub_8077EE4(gAnimBankAttacker, 2); + sprite->pos1.y = sub_8077EE4(gAnimBankAttacker, 3); } sub_807867C(sprite, gBattleAnimArgs[0]); sprite->pos1.y += gBattleAnimArgs[1]; @@ -737,12 +737,12 @@ u8 GetBankByPlayerAI(u8 slot) { return i; } -bool8 AnimBankSpriteExists(u8 slot) { - if (NotInBattle()) { - if (gBattleAnimBankAttacker == slot) { +bool8 IsBankSpritePresent(u8 slot) { + if (IsContest()) { + if (gAnimBankAttacker == slot) { return TRUE; } - if (gBattleAnimBankTarget == slot) { + if (gAnimBankTarget == slot) { return TRUE; } return FALSE; @@ -768,7 +768,7 @@ bool8 IsDoubleBattle() { } void sub_8078914(struct Struct_sub_8078914 *unk) { - if (NotInBattle()) { + if (IsContest()) { unk->field_0 = (u8 *)0x6008000; unk->field_4 = (u8 *)0x600f000; unk->field_8 = 0xe; @@ -780,11 +780,11 @@ void sub_8078914(struct Struct_sub_8078914 *unk) { } void sub_8078954(struct Struct_sub_8078914 *unk) { - if (NotInBattle()) { + if (IsContest()) { unk->field_0 = (u8 *)0x6008000; unk->field_4 = (u8 *)0x600f000; unk->field_8 = 0xe; - } else if (GetBankIdentity_permutated(gBattleAnimBankAttacker) == 1) { + } else if (GetBankIdentity_permutated(gAnimBankAttacker) == 1) { unk->field_0 = (u8 *)0x6004000; unk->field_4 = (u8 *)0x600e000; unk->field_8 = 0x8; @@ -796,7 +796,7 @@ void sub_8078954(struct Struct_sub_8078914 *unk) { } u8 sub_80789BC() { - if (NotInBattle()) { + if (IsContest()) { return 1; } return 2; @@ -806,7 +806,7 @@ void sub_80789D4(bool8 a1) { if (!a1) { BG3CNT.size = 0; BG3CNT.overflow = 1; - } else if (NotInBattle()) { + } else if (IsContest()) { BG3CNT.size = 0; BG3CNT.overflow = 1; } else { @@ -1011,7 +1011,7 @@ void obj_id_set_rotscale(u8 sprite, s16 xScale, s16 yScale, u16 rotation) { } bool8 sub_8078E38() { - if (NotInBattle()) { + if (IsContest()) { if (gSprites[GetAnimBankSpriteId(0)].data[2] == 0xc9 /* XXX SPECIES_UNOWN? */) { return FALSE; } @@ -1022,12 +1022,12 @@ bool8 sub_8078E38() { void sub_8078E70(u8 sprite, u8 a2) { u8 r7 = gSprites[sprite].data[0]; - if (NotInBattle() || IsAnimBankSpriteVisible(r7)) { + if (IsContest() || IsAnimBankSpriteVisible(r7)) { gSprites[sprite].invisible = FALSE; } gSprites[sprite].oam.objMode = a2; gSprites[sprite].affineAnimPaused = TRUE; - if (!NotInBattle() && !gSprites[sprite].oam.affineMode) { + if (!IsContest() && !gSprites[sprite].oam.affineMode) { gSprites[sprite].oam.matrixNum = ewram17810[r7].unk6; } gSprites[sprite].oam.affineMode = 3; @@ -1119,41 +1119,41 @@ u32 sub_80791A8(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) { u32 var = 0; u32 shift; if (a1) { - if (!NotInBattle()) { + if (!IsContest()) { var = 0xe; } else { var = 1 << sub_80789BC(); } } if (a2) { - shift = gBattleAnimBankAttacker + 16; + shift = gAnimBankAttacker + 16; var |= 1 << shift; } if (a3) { - shift = gBattleAnimBankTarget + 16; + shift = gAnimBankTarget + 16; var |= 1 << shift; } if (a4) { - if (IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2)) { - shift = (gBattleAnimBankAttacker ^ 2) + 16; + if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) { + shift = (gAnimBankAttacker ^ 2) + 16; var |= 1 << shift; } } if (a5) { - if (IsAnimBankSpriteVisible(gBattleAnimBankTarget ^ 2)) { - shift = (gBattleAnimBankTarget ^ 2) + 16; + if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) { + shift = (gAnimBankTarget ^ 2) + 16; var |= 1 << shift; } } if (a6) { - if (!NotInBattle()) { + if (!IsContest()) { var |= 0x100; } else { var |= 0x4000; } } if (a7) { - if (!NotInBattle()) { + if (!IsContest()) { var |= 0x200; } } @@ -1163,7 +1163,7 @@ u32 sub_80791A8(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) { u32 sub_80792C0(u8 a1, u8 a2, u8 a3, u8 a4) { u32 var = 0; u32 shift; - if (NotInBattle()) { + if (IsContest()) { if (a1) { var |= 1 << 18; return var; @@ -1238,24 +1238,24 @@ void sub_807941C(struct Sprite *sprite) { v2 = 1; } sub_80787B0(sprite, v1); - if (GetBankSide(gBattleAnimBankAttacker)) { + if (GetBankSide(gAnimBankAttacker)) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[2]; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, v2) + gBattleAnimArgs[3]; + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBankPosition(gAnimBankTarget, v2) + gBattleAnimArgs[3]; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } void sub_80794A8(struct Sprite *sprite) { sub_80787B0(sprite, 1); - if (GetBankSide(gBattleAnimBankAttacker)) { + if (GetBankSide(gAnimBankAttacker)) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[2]; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[3]; + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3]; sprite->data[5] = gBattleAnimArgs[5]; sub_80786EC(sprite); sprite->callback = sub_8079518; @@ -1263,7 +1263,7 @@ void sub_80794A8(struct Sprite *sprite) { void sub_8079518(struct Sprite *sprite) { if (sub_8078718(sprite)) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } @@ -1278,20 +1278,20 @@ void sub_8079534(struct Sprite *sprite) { } if (!gBattleAnimArgs[5]) { sub_80787B0(sprite, r4); - slot = gBattleAnimBankAttacker; + slot = gAnimBankAttacker; } else { sub_8078764(sprite, r4); - slot = gBattleAnimBankTarget; + slot = gAnimBankTarget; } - if (GetBankSide(gBattleAnimBankAttacker)) { + if (GetBankSide(gAnimBankAttacker)) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sub_8078764(sprite, r4); sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = sub_8077ABC(slot, 2) + gBattleAnimArgs[2]; - sprite->data[4] = sub_8077ABC(slot, r7) + gBattleAnimArgs[3]; + sprite->data[2] = GetBankPosition(slot, 2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBankPosition(slot, r7) + gBattleAnimArgs[3]; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } s16 duplicate_obj_of_side_rel2move_in_transparent_mode(u8 a1) { @@ -1524,7 +1524,7 @@ u16 sub_8079B10(u8 sprite) { u16 i; for (i = 0; i < (sizeof(gBattleMonSprites) / sizeof(u8)); i++) { if (gBattleMonSprites[i] == sprite) { - if (NotInBattle()) { + if (IsContest()) { species = ewram19348.unk0; return gMonBackPicCoords[species].y_offset; } else { @@ -1596,11 +1596,11 @@ u8 sub_8079C74(struct Task *task) { void sub_8079CEC(u8 task) { u16 v1; - if (gHappinessMoveAnim <= 30) { + if (gAnimFriendship <= 30) { v1 = 0; - } else if (gHappinessMoveAnim <= 100) { + } else if (gAnimFriendship <= 100) { v1 = 1; - } else if (gHappinessMoveAnim <= 200) { + } else if (gAnimFriendship <= 200) { v1 = 2; } else { v1 = 3; @@ -1610,17 +1610,17 @@ void sub_8079CEC(u8 task) { } void unref_sub_8079D20(u8 priority) { - if (IsAnimBankSpriteVisible(gBattleAnimBankTarget)) { - gSprites[gBattleMonSprites[gBattleAnimBankTarget]].oam.priority = priority; + if (IsAnimBankSpriteVisible(gAnimBankTarget)) { + gSprites[gBattleMonSprites[gAnimBankTarget]].oam.priority = priority; } - if (IsAnimBankSpriteVisible(gBattleAnimBankAttacker)) { - gSprites[gBattleMonSprites[gBattleAnimBankAttacker]].oam.priority = priority; + if (IsAnimBankSpriteVisible(gAnimBankAttacker)) { + gSprites[gBattleMonSprites[gAnimBankAttacker]].oam.priority = priority; } - if (IsAnimBankSpriteVisible(gBattleAnimBankTarget ^ 2)) { - gSprites[gBattleMonSprites[gBattleAnimBankTarget ^ 2]].oam.priority = priority; + if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) { + gSprites[gBattleMonSprites[gAnimBankTarget ^ 2]].oam.priority = priority; } - if (IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2)) { - gSprites[gBattleMonSprites[gBattleAnimBankAttacker ^ 2]].oam.priority = priority; + if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) { + gSprites[gBattleMonSprites[gAnimBankAttacker ^ 2]].oam.priority = priority; } } @@ -1637,7 +1637,7 @@ void sub_8079E24() { u8 sub_8079E90(u8 slot) { u8 status; u8 ret; - if (NotInBattle()) { + if (IsContest()) { if (slot == 2) { return 30; } else { @@ -1660,7 +1660,7 @@ u8 sub_8079E90(u8 slot) { u8 sub_8079ED4(u8 slot) { u8 status = GetBankIdentity(slot); - if (NotInBattle()) { + if (IsContest()) { return 2; } if (status == 0 || status == 3) { @@ -1672,7 +1672,7 @@ u8 sub_8079ED4(u8 slot) { u8 GetBankIdentity_permutated(u8 slot) { u8 status; - if (!NotInBattle()) { + if (!IsContest()) { status = GetBankIdentity(slot); if (status == 0 || status == 3) { return 2; @@ -1728,7 +1728,7 @@ u8 sub_8079F44(u16 species, u8 isBackpic, u8 a3, s16 a4, s16 a5, u8 a6, u32 a7, } else { sprite = CreateSprite(&gSpriteTemplate_837F5B0[a3], a4, a5 + gMonBackPicCoords[species].y_offset, a6); } - if (NotInBattle()) { + if (IsContest()) { gSprites[sprite].affineAnims = gSpriteAffineAnimTable_81E7C18; StartSpriteAffineAnim(&gSprites[sprite], 0); } @@ -1747,7 +1747,7 @@ int sub_807A100(u8 slot, u8 a2) { int ret; const struct MonCoords *coords; struct TransformStatus *transform; - if (NotInBattle()) { + if (IsContest()) { if (ewram19348.unk4 & 1) { species = ewram19348.unk2; personality = ewram19348.unk10; @@ -1826,15 +1826,15 @@ int sub_807A100(u8 slot, u8 a2) { case 1: return (coords->coords >> 4) * 8; case 4: - return sub_8077ABC(slot, 2) - ((coords->coords >> 4) * 4); + return GetBankPosition(slot, 2) - ((coords->coords >> 4) * 4); case 5: - return sub_8077ABC(slot, 2) + ((coords->coords >> 4) * 4); + return GetBankPosition(slot, 2) + ((coords->coords >> 4) * 4); case 2: - return sub_8077ABC(slot, 3) - ((coords->coords & 0xf) * 4); + return GetBankPosition(slot, 3) - ((coords->coords & 0xf) * 4); case 3: - return sub_8077ABC(slot, 3) + ((coords->coords & 0xf) * 4); + return GetBankPosition(slot, 3) + ((coords->coords & 0xf) * 4); case 6: - ret = sub_8077ABC(slot, 1) + 0x1f; + ret = GetBankPosition(slot, 1) + 0x1f; return ret - coords->y_offset; default: return 0; @@ -1852,11 +1852,11 @@ void sub_807A3FC(u8 slot, u8 a2, s16 *a3, s16 *a4) { v1 = 2; v2 = 3; } - v3 = sub_8077ABC(slot, v1); - v4 = sub_8077ABC(slot, v2); - if (IsDoubleBattle() && !NotInBattle()) { - v5 = sub_8077ABC(slot ^ 2, v1); - v6 = sub_8077ABC(slot ^ 2, v2); + v3 = GetBankPosition(slot, v1); + v4 = GetBankPosition(slot, v2); + if (IsDoubleBattle() && !IsContest()) { + v5 = GetBankPosition(slot ^ 2, v1); + v6 = GetBankPosition(slot ^ 2, v2); } else { v5 = v3; v6 = v4; @@ -1878,7 +1878,7 @@ u8 sub_807A4A0(int a1, u8 sprite, int a3) { void sub_807A544(struct Sprite *sprite) { sub_8078650(sprite); - if (GetBankSide(gBattleAnimBankAttacker)) { + if (GetBankSide(gAnimBankAttacker)) { sprite->pos1.x -= gBattleAnimArgs[0]; gBattleAnimArgs[3] = -gBattleAnimArgs[3]; sprite->hFlip = TRUE; @@ -1895,7 +1895,7 @@ void sub_807A544(struct Sprite *sprite) { } void sub_807A5C4(struct Sprite *sprite) { - if (GetBankSide(gBattleAnimBankAttacker)) { + if (GetBankSide(gAnimBankAttacker)) { sprite->pos1.x -= gBattleAnimArgs[0]; gBattleAnimArgs[3] *= -1; } else { @@ -1913,14 +1913,14 @@ void sub_807A5C4(struct Sprite *sprite) { void sub_807A63C(struct Sprite *sprite) { sub_8078650(sprite); - if (GetBankSide(gBattleAnimBankAttacker)) { + if (GetBankSide(gAnimBankAttacker)) { sprite->pos1.x -= gBattleAnimArgs[0]; } else { sprite->pos1.x += gBattleAnimArgs[0]; } sprite->pos1.y += gBattleAnimArgs[1]; sprite->callback = sub_8078600; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } void sub_807A69C(u8 taskId) { @@ -1928,7 +1928,7 @@ void sub_807A69C(u8 taskId) { u16 dest; struct Task *task = &gTasks[taskId]; task->data[0] = GetAnimBankSpriteId(0); - task->data[1] = (GetBankSide(gBattleAnimBankAttacker)) ? -8 : 8; + task->data[1] = (GetBankSide(gAnimBankAttacker)) ? -8 : 8; task->data[2] = 0; task->data[3] = 0; gSprites[task->data[0]].pos2.x -= task->data[0]; @@ -1937,7 +1937,7 @@ void sub_807A69C(u8 taskId) { dest = (task->data[4] + 0x10) * 0x10; src = (gSprites[task->data[0]].oam.paletteNum + 0x10) * 0x10; - task->data[6] = sub_8079E90(gBattleAnimBankAttacker); + task->data[6] = sub_8079E90(gAnimBankAttacker); if (task->data[6] == 20 || task->data[6] == 40) { task->data[6] = 2; } else { @@ -1998,9 +1998,9 @@ void sub_807A8D4(struct Sprite *sprite) { } void sub_807A908(struct Sprite *sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); - if (!GetBankSide(gBattleAnimBankAttacker)) { + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); + if (!GetBankSide(gAnimBankAttacker)) { sprite->data[0] = 5; } else { sprite->data[0] = -10; @@ -2018,7 +2018,7 @@ void sub_807A960(struct Sprite *sprite) { sprite->data[1]++; } if ((sprite->pos1.y + sprite->pos2.y) < -32) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } @@ -2027,7 +2027,7 @@ void sub_807A9BC(struct Sprite *sprite) { sprite->data[0] = gBattleAnimArgs[2]; sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[4]; sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[5]; - if (!GetBankSide(gBattleAnimBankTarget)) { + if (!GetBankSide(gAnimBankTarget)) { x = (u16)gBattleAnimArgs[4] + 30; sprite->pos1.x += x; sprite->pos1.y = gBattleAnimArgs[5] - 20; @@ -2037,5 +2037,5 @@ void sub_807A9BC(struct Sprite *sprite) { sprite->pos1.y = gBattleAnimArgs[5] - 80; } sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c index d147d11ce..53308e856 100644 --- a/src/scene/berry_blender.c +++ b/src/scene/berry_blender.c @@ -200,7 +200,7 @@ void sub_80A6978(void); u8 sub_80A7DEC(u8 berryId, u8 x, u8 y, bool8 animate); void sub_814A880(u8 a1, u8 a2); u8 sub_814A5C0(u8 a1, u16 a2, u8 a3, u16 a4, u8 a5); -s8 sub_810CA00(void); +s8 GetFirstFreePokeblockSlot(void); bool8 sub_810CA34(struct Pokeblock *pokeblock); #ifdef GERMAN extern void de_sub_8073110(); @@ -933,7 +933,7 @@ static void sub_804E4FC(void) REG_BG1VOFS = 0; } -void sub_804E538(void) +void DoBerryBlending(void) { u8* field6F; //this temp value is needed to match @@ -2621,7 +2621,7 @@ static void sub_8050954(void) gBerryBlenderData->field_7C = 2; gSendCmd[1] = 0x9999; } - else if (sub_810CA00() == -1) + else if (GetFirstFreePokeblockSlot() == -1) { gBerryBlenderData->field_7C = 3; gSendCmd[1] = 0xAAAA; @@ -2816,7 +2816,7 @@ static void sub_8050E30(void) if (!gPaletteFade.active) { if (gBerryBlenderData->field_70[0] == 0x2222) - SetMainCallback2(sub_804E538); + SetMainCallback2(DoBerryBlending); else { gBerryBlenderData->framesToWait = 0; @@ -2880,7 +2880,7 @@ static void sub_80510E8(void) if (!gPaletteFade.active) { if (gBerryBlenderData->field_7C == 0) - SetMainCallback2(sub_804E538); + SetMainCallback2(DoBerryBlending); else SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); } diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c index e0b42e1c7..f307f5979 100644 --- a/src/scene/evolution_scene.c +++ b/src/scene/evolution_scene.c @@ -67,10 +67,10 @@ bool32 IsHMMove2(u16 move); extern struct Window gUnknown_03004210; extern u16 gUnknown_030042A4; extern u16 gUnknown_030042A0; -extern u16 gUnknown_030042C0; -extern u16 gUnknown_030041B4; -extern u16 gUnknown_03004288; -extern u16 gUnknown_03004280; +extern u16 gBattle_BG1_X; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG2_X; +extern u16 gBattle_BG2_Y; extern u16 gUnknown_030041B0; extern u16 gUnknown_030041B8; extern u8 gBattleTerrain; @@ -202,10 +202,10 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, gUnknown_030042A4 = 0; gUnknown_030042A0 = 0; - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; - gUnknown_03004288 = 0; - gUnknown_03004280 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; gUnknown_030041B0 = 256; gUnknown_030041B8 = 0; @@ -310,10 +310,10 @@ static void CB2_EvolutionSceneLoadGraphics(void) ResetPaletteFade(); gUnknown_030042A4 = 0; gUnknown_030042A0 = 0; - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; - gUnknown_03004288 = 0; - gUnknown_03004280 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; gUnknown_030041B0 = 256; gUnknown_030041B8 = 0; @@ -364,10 +364,10 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) gReservedSpritePaletteCount = 4; gUnknown_030042A4 = 0; gUnknown_030042A0 = 0; - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; - gUnknown_03004288 = 0; - gUnknown_03004280 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; gUnknown_030041B0 = 256; gUnknown_030041B8 = 0; gMain.state++; @@ -3925,10 +3925,10 @@ static void VBlankCB_EvolutionScene(void) REG_BG0CNT = BGCNT_SCREENBASE(24) | BGCNT_16COLOR | BGCNT_TXT256x256 | BGCNT_AFF512x512 | BGCNT_PRIORITY(3); // 0x9803 REG_BG0HOFS = gUnknown_030042A4; REG_BG0VOFS = gUnknown_030042A0; - REG_BG1HOFS = gUnknown_030042C0; - REG_BG1VOFS = gUnknown_030041B4; - REG_BG2HOFS = gUnknown_03004288; - REG_BG2VOFS = gUnknown_03004280; + REG_BG1HOFS = gBattle_BG1_X; + REG_BG1VOFS = gBattle_BG1_Y; + REG_BG2HOFS = gBattle_BG2_X; + REG_BG2VOFS = gBattle_BG2_Y; REG_BG3HOFS = gUnknown_030041B0; REG_BG3VOFS = gUnknown_030041B8; LoadOam(); @@ -3941,10 +3941,10 @@ static void VBlankCB_TradeEvolutionScene(void) { REG_BG0HOFS = gUnknown_030042A4; REG_BG0VOFS = gUnknown_030042A0; - REG_BG1HOFS = gUnknown_030042C0; - REG_BG1VOFS = gUnknown_030041B4; - REG_BG2HOFS = gUnknown_03004288; - REG_BG2VOFS = gUnknown_03004280; + REG_BG1HOFS = gBattle_BG1_X; + REG_BG1VOFS = gBattle_BG1_Y; + REG_BG2HOFS = gBattle_BG2_X; + REG_BG2VOFS = gBattle_BG2_Y; REG_BG3HOFS = gUnknown_030041B0; REG_BG3VOFS = gUnknown_030041B8; LoadOam(); diff --git a/src/scene/title_screen.c b/src/scene/title_screen.c index f158500fe..26fe088d5 100644 --- a/src/scene/title_screen.c +++ b/src/scene/title_screen.c @@ -41,8 +41,8 @@ extern u8 gReservedSpritePaletteCount; extern struct MusicPlayerInfo gMPlay_BGM; -extern u16 gUnknown_030041B4; -extern u16 gUnknown_030042C0; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG1_X; extern const u8 gUnknown_08E9D8CC[]; extern const u16 gUnknown_08E9F624[]; extern const u8 gUnknown_08E9F7E4[]; @@ -602,7 +602,7 @@ static void VBlankCB(void) LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); - REG_BG1VOFS = gUnknown_030041B4; + REG_BG1VOFS = gBattle_BG1_Y; } @@ -836,8 +836,8 @@ static void Task_TitleScreenPhase3(u8 taskId) if (gTasks[taskId].tCounter & 1) { gTasks[taskId].data[4]++; - gUnknown_030041B4 = gTasks[taskId].data[4]; - gUnknown_030042C0 = 0; + gBattle_BG1_Y = gTasks[taskId].data[4]; + gBattle_BG1_X = 0; } UpdateLegendaryMarkingColor(gTasks[taskId].tCounter); if ((gMPlay_BGM.status & 0xFFFF) == 0) diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c index fc94b1b01..f397e5ebb 100644 --- a/src/script_pokemon_util_80C4BF0.c +++ b/src/script_pokemon_util_80C4BF0.c @@ -53,11 +53,11 @@ extern u8 gContestFinalStandings[]; extern s16 gUnknown_02038670[]; extern s16 gUnknown_02038678[]; -void sub_80C4BF0(void) +void SetContestTrainerGfxIds(void) { - gSaveBlock1.vars[0x10] = gContestMons[0].trainerGfxId; - gSaveBlock1.vars[0x11] = gContestMons[1].trainerGfxId; - gSaveBlock1.vars[0x12] = gContestMons[2].trainerGfxId; + gSaveBlock1.vars[VAR_OBJ_GFX_ID_0 - VARS_START] = gContestMons[0].trainerGfxId; + gSaveBlock1.vars[VAR_OBJ_GFX_ID_1 - VARS_START] = gContestMons[1].trainerGfxId; + gSaveBlock1.vars[VAR_OBJ_GFX_ID_2 - VARS_START] = gContestMons[2].trainerGfxId; } void sub_80C4C28(void) diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c index b58363d31..df83d3e2d 100644 --- a/src/script_pokemon_util_80F99CC.c +++ b/src/script_pokemon_util_80F99CC.c @@ -39,7 +39,7 @@ void sub_80F99CC(void) BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); } -void sub_80F9A0C(void) +void SelectMonForNPCTrade(void) { u8 taskId; @@ -49,7 +49,7 @@ void sub_80F9A0C(void) BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); } -void sub_80F9A4C(void) +void SelectMoveTutorMon(void) { u8 taskId; @@ -272,7 +272,7 @@ void HandleMoveTutorPartyMenu(u8 var) } } -void sub_80F9EEC(void) +void SelectMove(void) { ShowSelectMovePokemonSummaryScreen(&gPlayerParty[0], gSpecialVar_0x8004, gPlayerPartyCount - 1, c2_exit_to_overworld_2_switch, 0); UNK_2018000_STRUCT.unk8 = 3; @@ -321,7 +321,7 @@ void sub_80F9FDC(struct Pokemon *pkmn, u8 moveIndex1, u8 moveIndex2) SetMonData(pkmn, MON_DATA_PP_BONUSES, &bonuses); } -void sub_80FA0DC(void) +void DeleteMonMove(void) { u16 i; @@ -332,7 +332,7 @@ void sub_80FA0DC(void) sub_80F9FDC(&gPlayerParty[gSpecialVar_0x8004], i, i + 1); } -void sub_80FA148(void) +void IsSelectedMonEgg(void) { struct Pokemon *party = &gPlayerParty[gSpecialVar_0x8004]; gSpecialVar_Result = 0; diff --git a/src/unknown_task.c b/src/unknown_task.c index 0cc59fc66..c9ba95d42 100644 --- a/src/unknown_task.c +++ b/src/unknown_task.c @@ -8,13 +8,13 @@ static void sub_80896F4(void); static void sub_8089714(void); extern u16 gUnknown_030041B0; -extern u16 gUnknown_030041B4; +extern u16 gBattle_BG1_Y; extern u16 gUnknown_030041B8; -extern u16 gUnknown_03004280; -extern u16 gUnknown_03004288; +extern u16 gBattle_BG2_Y; +extern u16 gBattle_BG2_X; extern u16 gUnknown_030042A0; extern u16 gUnknown_030042A4; -extern u16 gUnknown_030042C0; +extern u16 gBattle_BG1_X; extern u8 gUnknown_0202FFA4; @@ -125,16 +125,16 @@ static void task00_for_dp12(u8 taskId) value = gUnknown_030042A0; break; case 0x4: - value = gUnknown_030042C0; + value = gBattle_BG1_X; break; case 0x6: - value = gUnknown_030041B4; + value = gBattle_BG1_Y; break; case 0x8: - value = gUnknown_03004288; + value = gBattle_BG2_X; break; case 0xA: - value = gUnknown_03004280; + value = gBattle_BG2_Y; break; case 0xC: value = gUnknown_030041B0; diff --git a/sym_common.txt b/sym_common.txt index e271074d4..87b411ff4 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -11,7 +11,7 @@ gUnknown_030041B0: @ 30041B0 .space 0x4 -gUnknown_030041B4: @ 30041B4 +gBattle_BG1_Y: @ 30041B4 .space 0x4 gUnknown_030041B8: @ 30041B8 @@ -23,28 +23,28 @@ gBattleTextBuff1: @ 30041C0 gUnknown_030041D0: @ 30041D0 .space 0x30 -gUnknown_03004200: @ 3004200 +gBattle_WIN1H: @ 3004200 .space 0x10 gUnknown_03004210: @ 3004210 .space 0x30 -gUnknown_03004240: @ 3004240 +gBattle_WIN0V: @ 3004240 .space 0x4 -gUnknown_03004244: @ 3004244 +gBattle_WIN1V: @ 3004244 .space 0xC gUnknown_03004250: @ 3004250 .space 0x30 -gUnknown_03004280: @ 3004280 +gBattle_BG2_Y: @ 3004280 .space 0x4 gUnknown_03004284: @ 3004284 .space 0x4 -gUnknown_03004288: @ 3004288 +gBattle_BG2_X: @ 3004288 .space 0x4 gBattleTerrain: @ 300428C @@ -62,10 +62,10 @@ gUnknown_030042A4: @ 30042A4 gBattleTextBuff3: @ 30042B0 .space 0x10 -gUnknown_030042C0: @ 30042C0 +gBattle_BG1_X: @ 30042C0 .space 0x4 -gUnknown_030042C4: @ 30042C4 +gBattle_WIN0H: @ 30042C4 .space 0xC gPreBattleCallback1: @ 30042D0 diff --git a/sym_ewram.txt b/sym_ewram.txt index 3f2ba7660..6f7be47c1 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -110,7 +110,7 @@ gUnknown_02024BE5: @ 2024BE5 gCurrentMove: @ 2024BE6 .space 0x2 -gUnknown_02024BE8: @ 2024BE8 +gChosenMove: @ 2024BE8 .space 0x2 gRandomMove: @ 2024BEA @@ -281,7 +281,7 @@ gBankInMenu: @ 2024E6C gDoingBattleAnim: @ 2024E6D .space 0x3 -gPID_perBank: @ 2024E70 +gTransformedPersonalities: @ 2024E70 .space 0x10 gBattleMovePower: @ 2024E80 |