From 1521acf3f042595803e5d22ccbcdcefc7fcae18c Mon Sep 17 00:00:00 2001 From: red031000 Date: Thu, 10 Aug 2023 20:41:39 +0100 Subject: [PATCH 01/11] begin decompiling encounter.c --- Makefile | 6 +- arm9/arm9.lsf | 3 +- arm9/asm/encounter_asm.s | 505 +++++++ arm9/asm/scrcmd_12.s | 4 +- arm9/asm/scrcmd_3.s | 2 +- arm9/asm/scrcmd_5.s | 6 +- arm9/asm/scrcmd_7.s | 12 +- arm9/asm/scrcmd_9.s | 6 +- arm9/asm/unk_02035068.s | 142 +- arm9/asm/unk_020377F0.s | 54 +- arm9/asm/unk_02038C78.s | 20 +- arm9/asm/unk_02046030.s | 10 +- arm9/asm/unk_0204653C.s | 1932 ------------------------ arm9/asm/unk_020476CC.s | 44 +- arm9/asm/unk_02048120.s | 10 +- arm9/asm/unk_020484A8.s | 16 +- arm9/asm/unk_02048904.s | 110 +- arm9/asm/unk_0204B34C.s | 2 +- arm9/asm/unk_0204B9EC.s | 2 +- arm9/asm/unk_0204C1B4.s | 38 +- arm9/asm/unk_0204FBA8.s | 2 +- arm9/asm/unk_02050E48.s | 24 +- arm9/asm/unk_02054C14.s | 10 +- arm9/asm/unk_02057380.s | 8 +- arm9/asm/unk_0205CE48.s | 98 +- arm9/asm/unk_0205DD18.s | 10 +- arm9/asm/unk_020606B0.s | 10 +- arm9/asm/unk_020607D4.s | 8 +- arm9/asm/unk_02060CCC.s | 2 +- arm9/asm/unk_020625EC.s | 2 +- arm9/asm/unk_0206367C.s | 2 +- arm9/asm/unk_02063888.s | 2 +- arm9/asm/unk_02063948.s | 84 +- arm9/asm/unk_020647A4.s | 4 +- arm9/asm/unk_02064E90.s | 4 +- arm9/asm/unk_020653EC.s | 10 +- arm9/asm/unk_0206BF90.s | 4 +- arm9/asm/unk_0206F1F0.s | 2 +- arm9/asm/unk_02080C38.s | 14 +- arm9/asm/unk_020859C0.s | 6 +- arm9/asm/unk_02086084.s | 4 +- arm9/asm/unk_02087D00.s | 2 +- arm9/asm/unk_0208A258.s | 8 +- arm9/asm/unk_0208A338.s | 4 +- arm9/global.inc | 44 +- arm9/overlays/05/asm/ov05_021D80E8.s | 20 +- arm9/overlays/05/asm/ov05_021DA5B8.s | 12 +- arm9/overlays/05/asm/ov05_021E1374.s | 2 +- arm9/overlays/05/asm/ov05_021E3340.s | 2 +- arm9/overlays/05/asm/ov05_021E5FD8.s | 24 +- arm9/overlays/05/asm/ov05_021EFBF8.s | 4 +- arm9/overlays/05/asm/ov05_021F38CC.s | 6 +- arm9/overlays/05/asm/ov05_021F5518.s | 6 +- arm9/overlays/05/asm/ov05_021F5C44.s | 8 +- arm9/overlays/05/asm/ov05_021F6360.s | 4 +- arm9/overlays/05/src/ov05_021E72FC.c | 8 +- arm9/overlays/06/asm/overlay_06.s | 148 +- arm9/overlays/11/asm/ov11_0222D5C0_1.s | 18 +- arm9/overlays/14/asm/overlay_14.s | 4 +- arm9/overlays/18/asm/overlay_18.s | 24 +- arm9/overlays/27/asm/overlay_27.s | 4 +- arm9/overlays/28/asm/overlay_28.s | 2 +- arm9/overlays/39/asm/overlay_39.s | 2 +- arm9/overlays/56/asm/overlay_56.s | 4 +- arm9/src/encounter.c | 633 ++++++++ arm9/src/hall_of_fame.c | 2 +- arm9/src/mail.c | 4 +- arm9/src/party.c | 36 +- arm9/src/pokemon.c | 14 +- arm9/src/scrcmd.c | 61 +- arm9/src/scrcmd_13.c | 4 +- arm9/src/scrcmd_daycare.c | 16 +- arm9/src/scrcmd_flags.c | 4 +- arm9/src/scrcmd_move_relearner.c | 6 +- arm9/src/scrcmd_names.c | 10 +- arm9/src/scrcmd_party.c | 98 +- arm9/src/scrcmd_sound.c | 3 +- arm9/src/script_pokemon_util.c | 20 +- arm9/src/task.c | 20 +- arm9/src/unk_020040F4.c | 2 +- arm9/src/unk_02022504.c | 2 +- arm9/src/unk_0204AEA8.c | 16 +- arm9/src/unk_0204AF24.c | 26 +- arm9/src/unk_0204B0A0.c | 2 +- arm9/src/unk_0205EC84.c | 11 +- arm9/src/unk_0205FA2C.c | 29 +- arm9/src/unk_0206015C.c | 8 +- arm9/src/unk_0206439C.c | 2 +- arm9/src/use_item_on_mon.c | 6 +- include/battle_setup.h | 41 + include/constants/flags.h | 6 + include/constants/game_stats.h | 7 + include/encounter.h | 34 + include/field_system.h | 71 + include/hall_of_fame.h | 2 +- include/party.h | 24 +- include/pokemon.h | 14 +- include/script.h | 56 +- include/script_pokemon_util.h | 16 +- include/task.h | 12 +- include/trainer_data.h | 2 +- include/unk_020040F4.h | 2 +- include/unk_02022504.h | 2 +- include/unk_020377F0.h | 4 +- include/unk_0204AF24.h | 8 +- include/unk_0205EC84.h | 4 +- include/unk_0205FA2C.h | 7 +- include/use_item_on_mon.h | 8 +- 108 files changed, 2132 insertions(+), 2817 deletions(-) create mode 100644 arm9/asm/encounter_asm.s delete mode 100644 arm9/asm/unk_0204653C.s create mode 100644 arm9/src/encounter.c create mode 100644 include/battle_setup.h create mode 100644 include/constants/flags.h create mode 100644 include/constants/game_stats.h create mode 100644 include/encounter.h create mode 100644 include/field_system.h diff --git a/Makefile b/Makefile index 603a1f86d..356e5f431 100644 --- a/Makefile +++ b/Makefile @@ -311,4 +311,8 @@ diamond: ; @+$(MAKE) GAME_VERSION=DIAMOND pearl: ; @+$(MAKE) GAME_VERSION=PEARL compare_diamond: ; @+$(MAKE) GAME_VERSION=DIAMOND COMPARE=1 compare_pearl: ; @+$(MAKE) GAME_VERSION=PEARL COMPARE=1 -compare: compare_diamond +clean_diamond: ; @+$(MAKE) GAME_VERSION=DIAMOND clean +clean_pearl: ; @+$(MAKE) GAME_VERSION=PEARL clean +compare: compare_diamond + +.PHONY: diamond pearl compare_diamond compare_pearl compare clean_diamond clean_pearl diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf index c1bd13438..9c20ef6b4 100644 --- a/arm9/arm9.lsf +++ b/arm9/arm9.lsf @@ -184,7 +184,8 @@ Static arm9 Object unk_02046030.o Object event_data.o Object task.o - Object unk_0204653C.o + Object encounter.o + Object encounter_asm.o Object unk_02047500.o Object unk_020476CC.o Object unk_02048120.o diff --git a/arm9/asm/encounter_asm.s b/arm9/asm/encounter_asm.s new file mode 100644 index 000000000..8dbab9f4a --- /dev/null +++ b/arm9/asm/encounter_asm.s @@ -0,0 +1,505 @@ + .include "asm/macros.inc" + .include "global.inc" + + .extern Encounter_New + .extern CallTask_StartEncounter + .extern sub_02046758 + .extern sub_020467FC + + .text + + thumb_func_start SetupAndStartTrainerBattle +SetupAndStartTrainerBattle: ; 0x020470E8 + push {r4-r7, lr} + sub sp, #0xc + str r0, [sp, #0x4] + add r6, r1, #0x0 + add r5, r2, #0x0 + str r3, [sp, #0x8] + bl TaskManager_GetFieldSystem + add r7, r0, #0x0 + cmp r5, #0x0 + beq _02047110 + cmp r6, r5 + beq _02047110 + ldr r0, [sp, #0x8] + cmp r0, #0x0 + bne _0204710C + mov r4, #0x13 + b _0204711A +_0204710C: + mov r4, #0x4b + b _0204711A +_02047110: + cmp r6, r5 + bne _02047118 + mov r4, #0x3 + b _0204711A +_02047118: + mov r4, #0x1 +_0204711A: + add r0, r7, #0x0 + add r0, #0x90 + ldr r0, [r0, #0x0] + bl sub_0205DD40 + mov r0, #0xb + add r1, r4, #0x0 + bl BattleSetup_New + add r4, r0, #0x0 + add r1, r7, #0x0 + bl BattleSetup_InitFromFieldSystem + str r6, [r4, #0x1c] + ldr r0, [sp, #0x8] + str r5, [r4, #0x24] + str r0, [r4, #0x20] + ldr r1, [r7, #0xc] + ldr r2, [sp, #0x20] + add r0, r4, #0x0 + bl EnemyTrainerSet_Init + ldr r0, [r7, #0xc] + bl Save_GameStats_Get + mov r1, #0x8 + bl GameStats_Inc + add r0, r4, #0x0 + bl sub_020475A0 + add r5, r0, #0x0 + add r0, r4, #0x0 + bl sub_020475B0 + add r3, r0, #0x0 + ldr r0, [sp, #0x24] + add r1, r4, #0x0 + str r0, [sp, #0x0] + ldr r0, [sp, #0x4] + add r2, r5, #0x0 + bl CallTask_StartEncounter + add sp, #0xc + pop {r4-r7, pc} + + thumb_func_start sub_02047174 +sub_02047174: ; 0x02047174 + push {r3-r7, lr} + add r5, r2, #0x0 + add r7, r0, #0x0 + add r4, r1, #0x0 + bl TaskManager_GetFieldSystem + add r6, r0, #0x0 + mov r0, #0xb + add r1, r5, #0x0 + bl BattleSetup_New + add r5, r0, #0x0 + add r1, r6, #0x0 + add r2, r4, #0x0 + bl sub_02047F1C + add r0, r5, #0x0 + bl sub_020475A0 + add r4, r0, #0x0 + add r0, r5, #0x0 + bl sub_020475B0 + add r2, r0, #0x0 + add r0, r5, #0x0 + add r1, r4, #0x0 + mov r3, #0x0 + bl Encounter_New + add r2, r0, #0x0 + ldr r1, _020471BC ; =sub_02046758 + add r0, r7, #0x0 + bl TaskManager_Call + pop {r3-r7, pc} + nop +_020471BC: .word sub_02046758 + + thumb_func_start sub_020471C0 +sub_020471C0: ; 0x020471C0 + push {r3-r7, lr} + str r0, [sp, #0x0] + add r5, r1, #0x0 + add r6, r2, #0x0 + add r4, r3, #0x0 + bl TaskManager_GetFieldSystem + add r7, r0, #0x0 + cmp r4, #0x0 + beq _020471DE + mov r0, #0xb + mov r1, #0x5 + bl BattleSetup_New + b _020471E6 +_020471DE: + mov r0, #0xb + mov r1, #0x7 + bl BattleSetup_New +_020471E6: + add r4, r0, #0x0 + add r0, r4, #0x0 + add r1, r7, #0x0 + add r2, r6, #0x0 + bl sub_02047BC0 + add r0, r4, #0x0 + bl sub_020475A0 + add r6, r0, #0x0 + add r0, r4, #0x0 + bl sub_020475B0 + add r2, r0, #0x0 + add r0, r4, #0x0 + add r1, r6, #0x0 + mov r3, #0x0 + bl Encounter_New + add r2, r0, #0x0 + ldr r0, [sp, #0x0] + ldr r1, _0204721C ; =sub_020467FC + str r5, [r2, #0xc] + bl TaskManager_Call + pop {r3-r7, pc} + nop +_0204721C: .word sub_020467FC + + thumb_func_start sub_02047220 +sub_02047220: ; 0x02047220 + push {r3-r7, lr} + add r5, r0, #0x0 + bl TaskManager_GetFieldSystem + add r6, r0, #0x0 + add r0, r5, #0x0 + bl TaskManager_GetEnvironment + add r7, r0, #0x0 + add r0, r5, #0x0 + bl TaskManager_GetStatePtr + add r4, r0, #0x0 + ldr r0, [r4, #0x0] + cmp r0, #0x0 + beq _02047246 + cmp r0, #0x1 + beq _02047258 + b _02047262 +_02047246: + ldr r1, _02047268 ; =sub_02046758 + add r0, r5, #0x0 + add r2, r7, #0x0 + bl TaskManager_Call + ldr r0, [r4, #0x0] + add r0, r0, #0x1 + str r0, [r4, #0x0] + b _02047262 +_02047258: + add r0, r6, #0x0 + bl sub_0204FF5C + mov r0, #0x1 + pop {r3-r7, pc} +_02047262: + mov r0, #0x0 + pop {r3-r7, pc} + nop +_02047268: .word sub_02046758 + + thumb_func_start sub_0204726C +sub_0204726C: ; 0x0204726C + push {r4-r6, lr} + add r5, r0, #0x0 + add r6, r1, #0x0 + mov r0, #0xb + add r1, r2, #0x0 + bl BattleSetup_New + add r4, r0, #0x0 + add r1, r5, #0x0 + add r2, r6, #0x0 + bl sub_02047F1C + add r0, r4, #0x0 + bl sub_020475A0 + add r6, r0, #0x0 + add r0, r4, #0x0 + bl sub_020475B0 + add r2, r0, #0x0 + add r0, r4, #0x0 + add r1, r6, #0x0 + mov r3, #0x0 + bl Encounter_New + add r2, r0, #0x0 + ldr r1, _020472AC ; =sub_02047220 + add r0, r5, #0x0 + bl FieldSystem_CreateTask + pop {r4-r6, pc} + nop +_020472AC: .word sub_02047220 + + thumb_func_start sub_020472B0 +sub_020472B0: ; 0x020472B0 + push {r4-r6, lr} + add r5, r0, #0x0 + add r6, r1, #0x0 + mov r0, #0xb + add r1, r2, #0x0 + bl BattleSetup_New + add r4, r0, #0x0 + add r1, r5, #0x0 + add r2, r6, #0x0 + mov r3, #0x0 + bl sub_02047D48 + add r0, r4, #0x0 + bl sub_020475A0 + add r6, r0, #0x0 + add r0, r4, #0x0 + bl sub_020475B0 + add r2, r0, #0x0 + add r0, r4, #0x0 + add r1, r6, #0x0 + mov r3, #0x0 + bl Encounter_New + add r2, r0, #0x0 + ldr r1, _020472F0 ; =sub_02047220 + add r0, r5, #0x0 + bl FieldSystem_CreateTask + pop {r4-r6, pc} + .balign 4 +_020472F0: .word sub_02047220 + + thumb_func_start sub_020472F4 +sub_020472F4: ; 0x020472F4 + push {r3-r5, lr} + add r4, r0, #0x0 + ldr r0, [r1, #0x0] + mov r3, #0x4 + ldr r2, [r1, #0x14] + tst r3, r0 + bne _020473C8 + mov r3, #0x80 + add r5, r0, #0x0 + tst r5, r3 + bne _020473C8 + cmp r0, #0x0 + beq _02047318 + add r3, #0x80 + cmp r0, r3 + beq _02047318 + cmp r0, #0x4a + bne _02047364 +_02047318: + cmp r2, #0x1 + bne _0204732A + ldr r0, [r4, #0xc] + bl Save_GameStats_Get + mov r1, #0x8 + bl GameStats_AddSpecial + pop {r3-r5, pc} +_0204732A: + cmp r2, #0x4 + bne _020473C8 + ldr r0, [r1, #0x8] + mov r1, #0x0 + bl GetPartyMonByIndex + mov r1, #0x5 + mov r2, #0x0 + bl GetMonData + add r1, r0, #0x0 + mov r0, #0x0 + bl sub_0206BB48 + cmp r0, #0x0 + ldr r0, [r4, #0xc] + beq _02047358 + bl Save_GameStats_Get + mov r1, #0x9 + bl GameStats_AddSpecial + pop {r3-r5, pc} +_02047358: + bl Save_GameStats_Get + mov r1, #0xa + bl GameStats_AddSpecial + pop {r3-r5, pc} +_02047364: + mov r3, #0x1 + tst r3, r0 + bne _02047370 + mov r3, #0x10 + tst r3, r0 + beq _02047382 +_02047370: + cmp r2, #0x1 + bne _020473C8 + ldr r0, [r4, #0xc] + bl Save_GameStats_Get + mov r1, #0xb + bl GameStats_AddSpecial + pop {r3-r5, pc} +_02047382: + mov r3, #0x20 + add r5, r0, #0x0 + tst r5, r3 + bne _02047390 + lsl r3, r3, #0x4 + tst r0, r3 + beq _020473C8 +_02047390: + cmp r2, #0x4 + bne _020473C8 + ldr r0, [r1, #0x8] + mov r1, #0x0 + bl GetPartyMonByIndex + mov r1, #0x5 + mov r2, #0x0 + bl GetMonData + add r1, r0, #0x0 + mov r0, #0x0 + bl sub_0206BB48 + cmp r0, #0x0 + ldr r0, [r4, #0xc] + beq _020473BE + bl Save_GameStats_Get + mov r1, #0x9 + bl GameStats_AddSpecial + pop {r3-r5, pc} +_020473BE: + bl Save_GameStats_Get + mov r1, #0xa + bl GameStats_AddSpecial +_020473C8: + pop {r3-r5, pc} + .balign 4 + + thumb_func_start sub_020473CC +sub_020473CC: ; 0x020473CC + push {r4-r7, lr} + sub sp, #0xc + add r4, r1, #0x0 + add r5, r0, #0x0 + ldr r0, [r4, #0x0] + mov r2, #0x4 + ldr r1, [r4, #0x14] + tst r2, r0 + bne _020473EC + mov r3, #0x80 + add r2, r0, #0x0 + tst r2, r3 + bne _020473EC + lsl r2, r3, #0x2 + tst r2, r0 + beq _020473EE +_020473EC: + b _020474FC +_020473EE: + cmp r0, #0x0 + beq _02047400 + add r3, #0x80 + cmp r0, r3 + beq _02047400 + cmp r0, #0x4a + beq _02047400 + cmp r0, #0x20 + bne _020474D2 +_02047400: + cmp r1, #0x1 + bne _02047470 + add r0, r5, #0x0 + add r0, #0x76 + ldrh r0, [r0, #0x0] + add r1, r0, #0x1 + add r0, r5, #0x0 + add r0, #0x76 + strh r1, [r0, #0x0] + add r0, r5, #0x0 + add r0, #0x76 + ldrh r0, [r0, #0x0] + cmp r0, #0x5 + blo _020474FC + ldr r0, [r4, #0x8] + mov r1, #0x0 + bl GetPartyMonByIndex + add r6, r0, #0x0 + ldr r0, [r5, #0xc] + bl Save_PlayerData_GetIGTAddr + str r0, [sp, #0x4] + add r0, r6, #0x0 + mov r1, #0x5 + mov r2, #0x0 + bl GetMonData + add r7, r0, #0x0 + add r0, r6, #0x0 + mov r1, #0x6f + mov r2, #0x0 + bl GetMonData + add r2, r0, #0x0 + mov r3, #0xb + str r3, [sp, #0x0] + lsl r3, r3, #0x5 + ldr r3, [r4, r3] + lsl r1, r7, #0x10 + lsl r2, r2, #0x18 + lsl r3, r3, #0x18 + ldr r0, [sp, #0x4] + lsr r1, r1, #0x10 + lsr r2, r2, #0x18 + lsr r3, r3, #0x18 + bl sub_0202920C + add r5, #0x98 + add r1, r0, #0x0 + ldr r0, [r5, #0x0] + mov r2, #0x2 + bl sub_02028AD4 + add sp, #0xc + pop {r4-r7, pc} +_02047470: + cmp r1, #0x4 + bne _020474FC + mov r0, #0x17 + lsl r0, r0, #0x4 + ldr r0, [r4, r0] + mov r1, #0x0 + lsl r0, r0, #0x2 + add r0, r4, r0 + ldr r0, [r0, #0x4] + bl GetPartyMonByIndex + add r6, r0, #0x0 + ldr r0, [r5, #0xc] + bl Save_PlayerData_GetIGTAddr + str r0, [sp, #0x8] + add r0, r6, #0x0 + mov r1, #0x5 + mov r2, #0x0 + bl GetMonData + add r7, r0, #0x0 + add r0, r6, #0x0 + mov r1, #0x6f + mov r2, #0x0 + bl GetMonData + add r2, r0, #0x0 + mov r3, #0xb + str r3, [sp, #0x0] + lsl r3, r3, #0x5 + ldr r3, [r4, r3] + lsl r1, r7, #0x10 + lsl r2, r2, #0x18 + lsl r3, r3, #0x18 + ldr r0, [sp, #0x8] + lsr r1, r1, #0x10 + lsr r2, r2, #0x18 + lsr r3, r3, #0x18 + bl sub_0202918C + add r5, #0x98 + add r1, r0, #0x0 + ldr r0, [r5, #0x0] + mov r2, #0x2 + bl sub_02028AD4 + add sp, #0xc + pop {r4-r7, pc} +_020474D2: + mov r2, #0x1 + tst r2, r0 + bne _020474DE + mov r2, #0x10 + tst r0, r2 + beq _020474FC +_020474DE: + cmp r1, #0x1 + bne _020474FC + ldr r1, [r5, #0x1c] + add r0, r5, #0x0 + ldr r1, [r1, #0x0] + ldr r2, [r4, #0x1c] + add r0, #0x98 + lsl r1, r1, #0x10 + lsl r2, r2, #0x10 + ldr r0, [r0, #0x0] + lsr r1, r1, #0x10 + lsr r2, r2, #0x10 + mov r3, #0xb + bl sub_020299DC +_020474FC: + add sp, #0xc + pop {r4-r7, pc} diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s index 9b5ec82f7..100e10bca 100644 --- a/arm9/asm/scrcmd_12.s +++ b/arm9/asm/scrcmd_12.s @@ -283,7 +283,7 @@ _02042F0C: .word UNK_020F43E4 sub_02042F10: ; 0x02042F10 push {r3, lr} ldr r0, [r0, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get bl GetPartyCount cmp r0, #0x6 bge _02042F24 @@ -656,7 +656,7 @@ _0204322C: bl CalcMonLevelAndStats ldr r0, [sp, #0x4] ldr r0, [r0, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r1, r4, #0x0 bl AddMonToParty cmp r0, #0x0 diff --git a/arm9/asm/scrcmd_3.s b/arm9/asm/scrcmd_3.s index 29f8fb8d6..f1fa91759 100644 --- a/arm9/asm/scrcmd_3.s +++ b/arm9/asm/scrcmd_3.s @@ -117,7 +117,7 @@ ScrCmd_Unk00FA: ; 0x0203FF10 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r1, r6, #0x0 bl GetPartyMonByIndex str r0, [sp, #0x10] diff --git a/arm9/asm/scrcmd_5.s b/arm9/asm/scrcmd_5.s index f144e002c..d476b517d 100644 --- a/arm9/asm/scrcmd_5.s +++ b/arm9/asm/scrcmd_5.s @@ -40,7 +40,7 @@ ScrCmd_Unk024F: ; 0x020411C4 add r0, #0x80 ldr r7, [r0, #0x0] ldr r0, [r7, #0xc] - bl GetStoragePCPointer + bl Save_PCStorage_Get str r0, [sp, #0x20] add r0, r4, #0x0 bl ScriptReadHalfword @@ -74,7 +74,7 @@ ScrCmd_Unk024F: ; 0x020411C4 bl VarGet str r0, [sp, #0x0] ldr r0, [r7, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get bl GetPartyCount lsl r0, r0, #0x10 lsr r6, r0, #0x10 @@ -85,7 +85,7 @@ ScrCmd_Unk024F: ; 0x020411C4 beq _02041286 _0204123C: ldr r0, [r7, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r1, r5, #0x0 bl GetPartyMonByIndex mov r1, #0x4c diff --git a/arm9/asm/scrcmd_7.s b/arm9/asm/scrcmd_7.s index fb66d27c6..ae9e39db7 100644 --- a/arm9/asm/scrcmd_7.s +++ b/arm9/asm/scrcmd_7.s @@ -266,7 +266,7 @@ ScrCmd_Unk00E5: ; 0x0204188C mov r6, #0x0 ldr r0, [r0, #0xc] bl Save_VarsFlags_Get - bl sub_0205ED3C + bl Save_VarsFlags_CheckHaveFollower cmp r0, #0x1 bne _020418F2 ldr r0, [r4, #0xc] @@ -281,7 +281,7 @@ _020418F2: ldr r1, [sp, #0xc] ldr r2, [sp, #0x8] add r3, r6, #0x0 - bl sub_020470E8 + bl SetupAndStartTrainerBattle mov r0, #0x1 add sp, #0x10 pop {r3-r7, pc} @@ -327,7 +327,7 @@ ScrCmd_Unk02A0: ; 0x0204190C ldr r0, [r5, #0x74] add r1, r7, #0x0 add r3, r6, #0x0 - bl sub_020470E8 + bl SetupAndStartTrainerBattle mov r0, #0x1 add sp, #0x8 pop {r3-r7, pc} @@ -524,7 +524,7 @@ ScrCmd_Unk00EC: ; 0x02041AE0 bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] - bl sub_020480B8 + bl IsBattleResultWin strh r0, [r5, #0x0] mov r0, #0x1 pop {r3-r5, pc} @@ -590,7 +590,7 @@ ScrCmd_Unk00EE: ; 0x02041B70 add r4, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get bl HasEnoughAlivePokemonForDoubleBattle strh r0, [r4, #0x0] mov r0, #0x0 @@ -613,7 +613,7 @@ ScrCmd_Unk00EF: ; 0x02041B9C ldr r0, [r4, #0x74] mov r1, #0x1 add r3, r2, #0x0 - bl sub_020470E8 + bl SetupAndStartTrainerBattle mov r0, #0x1 add sp, #0x8 pop {r4, pc} diff --git a/arm9/asm/scrcmd_9.s b/arm9/asm/scrcmd_9.s index 2de8c9591..7a819ffdc 100644 --- a/arm9/asm/scrcmd_9.s +++ b/arm9/asm/scrcmd_9.s @@ -242,7 +242,7 @@ ScrCmd_Unk02B8: ; 0x02042000 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -407,7 +407,7 @@ _02042170: add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -548,7 +548,7 @@ sub_02042288: ; 0x02042288 push {r4, lr} ldr r0, [r0, #0xc] add r4, r1, #0x0 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get bl GetFirstNonEggInParty bl sub_020690E4 add r2, r0, #0x0 diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index 000524413..b3645a310 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -85,7 +85,7 @@ sub_02035080: ; 0x02035080 add r4, r0, #0x0 ldr r0, [r5, #0xc] bl Save_VarsFlags_Get - bl sub_0205F214 + bl Save_VarsFlags_CheckSafariSysFlag cmp r0, #0x1 bne _020350A6 add r0, r5, #0x0 @@ -141,7 +141,7 @@ _02035106: ldr r1, _02035114 ; =sub_020352E4 add r0, r5, #0x0 add r2, r4, #0x0 - bl sub_020463CC + bl FieldSystem_CreateTask pop {r3-r5, pc} nop _02035114: .word sub_020352E4 @@ -173,7 +173,7 @@ _0203514C: ldr r1, _02035158 ; =sub_020352E4 add r0, r5, #0x0 add r2, r4, #0x0 - bl sub_020463CC + bl FieldSystem_CreateTask pop {r3-r5, pc} .balign 4 _02035158: .word sub_020352E4 @@ -205,7 +205,7 @@ _02035190: ldr r1, _0203519C ; =sub_020352E4 add r0, r5, #0x0 add r2, r4, #0x0 - bl sub_020463CC + bl FieldSystem_CreateTask pop {r3-r5, pc} .balign 4 _0203519C: .word sub_020352E4 @@ -224,7 +224,7 @@ sub_020351A0: ; 0x020351A0 str r1, [r4, r0] ldr r0, [r5, #0xc] bl Save_VarsFlags_Get - bl sub_0205F214 + bl Save_VarsFlags_CheckSafariSysFlag cmp r0, #0x1 bne _020351D4 add r0, r5, #0x0 @@ -288,7 +288,7 @@ _02035240: ldr r0, [r5, #0x10] ldr r1, _02035250 ; =sub_020352E4 add r2, r4, #0x0 - bl sub_020463EC + bl TaskManager_Jump pop {r3-r5, pc} .balign 4 _0203524C: .word 0x000005FD @@ -390,7 +390,7 @@ sub_020352E4: ; 0x020352E4 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r6, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldrh r1, [r4, #0x2a] cmp r1, #0xf @@ -420,7 +420,7 @@ _02035308: ; jump table (using 16-bit offset) .short _02035432 - _02035308 - 2; case 15 _02035328: ldr r0, [r5, #0x34] - bl sub_02058780 + bl MapObjectManager_PauseAllMovement mov r1, #0x73 lsl r1, r1, #0x2 add r0, r5, #0x0 @@ -478,7 +478,7 @@ _02035398: cmp r0, #0x0 beq _02035484 ldr r0, [r5, #0x34] - bl sub_02058780 + bl MapObjectManager_PauseAllMovement add r0, r6, #0x0 bl sub_0203549C add r0, r6, #0x0 @@ -508,7 +508,7 @@ _020353D6: add r0, r4, #0x0 bl FreeToHeap ldr r0, [r5, #0x34] - bl sub_020587B0 + bl MapObjectManager_UnpauseAllMovement mov r0, #0x1 pop {r4-r6, pc} _020353F6: @@ -517,7 +517,7 @@ _020353F6: cmp r0, #0x0 beq _02035484 ldr r0, [r5, #0x34] - bl sub_02058780 + bl MapObjectManager_PauseAllMovement mov r0, #0x1 bl ov05_021D7CA4 mov r0, #0xb @@ -533,14 +533,14 @@ _02035412: add r2, #0x30 ldr r2, [r4, r2] add r0, r6, #0x0 - bl sub_020463EC + bl TaskManager_Jump add r0, r4, #0x0 bl FreeToHeap b _02035484 _02035432: bl FreeToHeap ldr r0, [r5, #0x34] - bl sub_020587B0 + bl MapObjectManager_UnpauseAllMovement mov r0, #0x1 pop {r4-r6, pc} _02035440: @@ -561,7 +561,7 @@ _02035440: add r0, r4, #0x0 bl FreeToHeap ldr r0, [r5, #0x34] - bl sub_020587B0 + bl MapObjectManager_UnpauseAllMovement mov r0, #0x1 pop {r4-r6, pc} _02035478: @@ -591,7 +591,7 @@ sub_0203549C: ; 0x0203549C bl TaskManager_GetFieldSystem str r0, [sp, #0x1c] add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r1, r4, #0x0 add r1, #0x30 @@ -915,11 +915,11 @@ sub_02035734: ; 0x02035734 bl TaskManager_GetFieldSystem add r4, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0x0 ldr r0, [r4, #0xc] bl Save_VarsFlags_Get - bl sub_0205F214 + bl Save_VarsFlags_CheckSafariSysFlag cmp r0, #0x1 bne _0203575A mov r6, #0x0 @@ -1074,11 +1074,11 @@ sub_020358A0: ; 0x020358A0 bl TaskManager_GetFieldSystem add r4, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0x0 ldr r0, [r4, #0xc] bl Save_VarsFlags_Get - bl sub_0205F214 + bl Save_VarsFlags_CheckSafariSysFlag cmp r0, #0x0 bne _020358CE ldr r0, [r4, #0xc] @@ -1105,7 +1105,7 @@ sub_020358E4: ; 0x020358E4 bl TaskManager_GetFieldSystem add r4, r0, #0x0 add r0, r7, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0x0 ldr r0, [r5, #0x20] bl sub_02001E5C @@ -1583,7 +1583,7 @@ sub_02035CA0: ; 0x02035CA0 add r0, r5, #0x0 bl TaskManager_GetFieldSystem add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 bl sub_02035718 add r0, r4, #0x0 @@ -1608,10 +1608,10 @@ sub_02035CDC: ; 0x02035CDC bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r6, #0x0 - bl sub_0204647C + bl FieldSystem_ApplicationIsRunning cmp r0, #0x0 bne _02035D02 mov r1, #0x72 @@ -1634,7 +1634,7 @@ sub_02035D04: ; 0x02035D04 thumb_func_start sub_02035D10 sub_02035D10: ; 0x02035D10 push {r4, lr} - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 mov r0, #0x0 bl ov05_021D7CA4 @@ -1657,7 +1657,7 @@ sub_02035D34: ; 0x02035D34 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r6, r0, #0x0 mov r0, #0xb mov r1, #0x20 @@ -1721,7 +1721,7 @@ sub_02035DC8: ; 0x02035DC8 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 bl sub_0204649C @@ -1741,7 +1741,7 @@ _02035DF0: thumb_func_start sub_02035DF8 sub_02035DF8: ; 0x02035DF8 push {r4, lr} - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 mov r0, #0x0 bl ov05_021D7CA4 @@ -1763,7 +1763,7 @@ sub_02035E1C: ; 0x02035E1C bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment mov r1, #0x7a add r4, r0, #0x0 lsl r1, r1, #0x2 @@ -1790,7 +1790,7 @@ sub_02035E50: ; 0x02035E50 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r7, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 mov r0, #0xb mov r1, #0x40 @@ -1849,7 +1849,7 @@ _02035ECC: bl AllocFromHeap add r7, r0, #0x0 ldr r0, [r5, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [r7, #0x0] ldr r0, [r5, #0xc] bl Save_PlayerData_GetOptionsAddr @@ -1901,7 +1901,7 @@ _02035F4A: bl AllocFromHeap add r7, r0, #0x0 ldr r0, [r5, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [r7, #0x0] ldr r0, [r5, #0xc] bl Save_PlayerData_GetOptionsAddr @@ -1958,7 +1958,7 @@ _02035FD0: bl AllocFromHeap add r7, r0, #0x0 ldr r0, [r5, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [r7, #0x0] ldr r0, [r5, #0xc] bl Save_PlayerData_GetOptionsAddr @@ -2052,7 +2052,7 @@ _0203609C: b _0203625E _020360AC: ldr r0, [r5, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r1, r6, #0x0 add r1, #0x22 ldrb r1, [r1, #0x0] @@ -2271,7 +2271,7 @@ _02036280: .word sub_020362E4 thumb_func_start sub_02036284 sub_02036284: ; 0x02036284 push {r4, lr} - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 mov r0, #0x0 bl ov05_021D7CA4 @@ -2293,7 +2293,7 @@ sub_020362A8: ; 0x020362A8 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment mov r1, #0x73 add r4, r0, #0x0 lsl r1, r1, #0x2 @@ -2323,7 +2323,7 @@ sub_020362E4: ; 0x020362E4 bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 mov r0, #0xb bl BagView_New @@ -2400,7 +2400,7 @@ _0203638A: add r5, r0, #0x0 bl memset ldr r0, [r6, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [r5, #0x0] ldr r0, [r6, #0xc] bl Save_Bag_Get @@ -2439,7 +2439,7 @@ _0203638A: b _020364F8 _020363F6: ldr r0, [r6, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [sp, #0x4] mov r0, #0x7f lsl r0, r0, #0x2 @@ -2566,7 +2566,7 @@ _0203650C: .word sub_02036BDC thumb_func_start sub_02036510 sub_02036510: ; 0x02036510 push {r4, lr} - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 mov r0, #0x0 bl ov05_021D7CA4 @@ -2589,7 +2589,7 @@ sub_02036534: ; 0x02036534 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 mov r0, #0xb bl sub_02065054 @@ -2626,7 +2626,7 @@ sub_02036584: ; 0x02036584 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment mov r1, #0x7e add r4, r0, #0x0 lsl r1, r1, #0x2 @@ -2649,7 +2649,7 @@ sub_02036584: ; 0x02036584 sub_020365BC: ; 0x020365BC push {r3-r5, lr} add r5, r0, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 bl sub_02035718 add r0, r4, #0x0 @@ -2672,7 +2672,7 @@ sub_020365BC: ; 0x020365BC sub_020365F0: ; 0x020365F0 push {r3-r5, lr} add r5, r0, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 bl TaskManager_GetFieldSystem @@ -2684,7 +2684,7 @@ sub_020365F0: ; 0x020365F0 ldr r1, _0203663C ; =0x000007F2 add r0, r5, #0x0 add r3, r2, #0x0 - bl sub_02038CD8 + bl QueueScript b _02036636 _02036618: mov r0, #0x20 @@ -2699,7 +2699,7 @@ _02036618: ldr r1, _02036640 ; =0x000007D5 add r0, r5, #0x0 add r3, r3, #0x4 - bl sub_02038CD8 + bl QueueScript _02036636: mov r0, #0x5 strh r0, [r4, #0x2a] @@ -2715,7 +2715,7 @@ sub_02036644: ; 0x02036644 bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 mov r0, #0x7e lsl r0, r0, #0x2 @@ -2745,7 +2745,7 @@ _02036678: thumb_func_start sub_02036684 sub_02036684: ; 0x02036684 push {r4, lr} - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 mov r0, #0x0 bl ov05_021D7CA4 @@ -2767,7 +2767,7 @@ sub_020366A8: ; 0x020366A8 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 bl sub_02037EF8 @@ -2789,7 +2789,7 @@ sub_020366D4: ; 0x020366D4 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 mov r0, #0x7e lsl r0, r0, #0x2 @@ -2806,7 +2806,7 @@ sub_020366D4: ; 0x020366D4 thumb_func_start sub_02036700 sub_02036700: ; 0x02036700 push {r4, lr} - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 mov r0, #0x0 bl ov05_021D7CA4 @@ -2829,7 +2829,7 @@ sub_02036724: ; 0x02036724 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r2, [r5, #0xc] mov r0, #0x2 @@ -2870,7 +2870,7 @@ sub_0203677C: ; 0x0203677C bl TaskManager_GetFieldSystem add r4, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0x0 mov r0, #0x7e lsl r0, r0, #0x2 @@ -2919,7 +2919,7 @@ sub_020367E8: ; 0x020367E8 bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 bl sub_02035718 add r0, r4, #0x0 @@ -2934,19 +2934,19 @@ sub_020367E8: ; 0x020367E8 bl sub_020358A0 ldr r0, [r6, #0xc] bl Save_VarsFlags_Get - bl sub_0205F214 + bl Save_VarsFlags_CheckSafariSysFlag cmp r0, #0x1 bne _02036834 ldr r1, _02036848 ; =0x00002275 add r0, r5, #0x0 mov r2, #0x0 - bl sub_02038D10 + bl StartScriptFromMenu b _0203683E _02036834: add r0, r5, #0x0 mov r1, #0x4 mov r2, #0x0 - bl sub_02038D10 + bl StartScriptFromMenu _0203683E: add r0, r4, #0x0 bl FreeToHeap @@ -2962,7 +2962,7 @@ sub_0203684C: ; 0x0203684C bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 mov r0, #0xb mov r1, #0x30 @@ -2992,7 +2992,7 @@ sub_0203684C: ; 0x0203684C add r5, r0, #0x0 bl memset ldr r0, [r6, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [r5, #0x0] ldr r0, [r6, #0xc] bl Save_Bag_Get @@ -3089,7 +3089,7 @@ sub_0203695C: ; 0x0203695C bl TaskManager_GetFieldSystem str r0, [sp, #0x4] add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r6, r0, #0x0 mov r0, #0xb bl sub_020851B8 @@ -3172,7 +3172,7 @@ sub_02036A14: ; 0x02036A14 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 mov r0, #0x7e lsl r0, r0, #0x2 @@ -3217,7 +3217,7 @@ sub_02036A78: ; 0x02036A78 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment mov r1, #0x7e add r4, r0, #0x0 lsl r1, r1, #0x2 @@ -3248,7 +3248,7 @@ sub_02036AB8: ; 0x02036AB8 bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 mov r0, #0x7f lsl r0, r0, #0x2 @@ -3281,7 +3281,7 @@ sub_02036AB8: ; 0x02036AB8 b _02036B82 _02036B0E: ldr r0, [r6, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r1, r7, #0x0 bl GetPartyMonByIndex add r2, r0, #0x0 @@ -3346,7 +3346,7 @@ sub_02036B90: ; 0x02036B90 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment mov r1, #0x73 add r4, r0, #0x0 lsl r1, r1, #0x2 @@ -3385,7 +3385,7 @@ sub_02036BDC: ; 0x02036BDC bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 mov r0, #0x7f lsl r0, r0, #0x2 @@ -3521,7 +3521,7 @@ sub_02036CEC: ; 0x02036CEC add r4, r0, #0x0 bl memset ldr r0, [r5, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [r4, #0x0] ldr r0, [r5, #0xc] bl Save_Bag_Get @@ -3585,7 +3585,7 @@ sub_02036D94: ; 0x02036D94 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 mov r0, #0x7e lsl r0, r0, #0x2 @@ -3614,7 +3614,7 @@ sub_02036DD4: ; 0x02036DD4 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment mov r1, #0x73 add r4, r0, #0x0 lsl r1, r1, #0x2 @@ -3640,7 +3640,7 @@ sub_02036E08: ; 0x02036E08 bl TaskManager_GetFieldSystem add r4, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r6, r0, #0x0 mov r0, #0x7e lsl r0, r0, #0x2 @@ -3651,7 +3651,7 @@ sub_02036E08: ; 0x02036E08 lsl r2, r0, #0x10 bl CreateHeap ldr r0, [r4, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get ldrb r1, [r5, #0x0] str r0, [sp, #0x20] bl GetPartyMonByIndex @@ -3760,7 +3760,7 @@ sub_02036F1C: ; 0x02036F1C bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 mov r0, #0x7e lsl r0, r0, #0x2 diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s index 26daef33f..7b536cacc 100644 --- a/arm9/asm/unk_020377F0.s +++ b/arm9/asm/unk_020377F0.s @@ -429,7 +429,7 @@ sub_0203797C: ; 0x0203797C mov r2, #0x40 bl MIi_CpuClearFast ldr r0, [r5, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [r4, #0x0] ldr r0, [r5, #0xc] bl Save_Bag_Get @@ -557,10 +557,10 @@ sub_02037A7C: ; 0x02037A7C bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 - bl sub_02046530 + bl TaskManager_GetStatePtr add r5, r0, #0x0 ldr r0, [r5, #0x0] cmp r0, #0x4 @@ -587,7 +587,7 @@ _02037AB2: b _02037B3A _02037AC2: add r0, r6, #0x0 - bl sub_0204647C + bl FieldSystem_ApplicationIsRunning cmp r0, #0x0 bne _02037B3A ldr r0, [r4, #0x4] @@ -630,7 +630,7 @@ _02037AF8: b _02037B3A _02037B1A: add r0, r6, #0x0 - bl sub_0204647C + bl FieldSystem_ApplicationIsRunning cmp r0, #0x0 bne _02037B3A ldr r0, [r4, #0x8] @@ -755,7 +755,7 @@ sub_02037C00: ; 0x02037C00 bl AllocFromHeap add r4, r0, #0x0 ldr r0, [r5, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [r4, #0x0] ldr r0, [r5, #0xc] bl Save_PlayerData_GetOptionsAddr @@ -814,7 +814,7 @@ sub_02037C7C: ; 0x02037C7C bl Save_PlayerData_GetOptionsAddr str r0, [r4, #0x4] add r0, r5, #0x0 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [r4, #0x0] mov r0, #0x1 strb r0, [r4, #0x11] @@ -860,7 +860,7 @@ sub_02037CF0: ; 0x02037CF0 add r4, r0, #0x0 bl memset ldr r0, [r5, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [r4, #0x0] ldr r0, [r5, #0xc] bl Save_PlayerData_GetOptionsAddr @@ -915,10 +915,10 @@ sub_02037D70: ; 0x02037D70 push {r3-r6, lr} sub sp, #0x4 add r6, r0, #0x0 - bl sub_02046530 + bl TaskManager_GetStatePtr add r4, r0, #0x0 add r0, r6, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0x0 add r0, r6, #0x0 bl TaskManager_GetFieldSystem @@ -938,7 +938,7 @@ _02037D9A: str r0, [r4, #0x0] b _02037E12 _02037DA8: - bl sub_0204647C + bl FieldSystem_ApplicationIsRunning cmp r0, #0x0 bne _02037E12 ldr r0, [r4, #0x0] @@ -1261,7 +1261,7 @@ sub_0203800C: ; 0x0203800C add r4, r0, #0x0 bl memset add r0, r5, #0x0 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r1, r7, #0x0 bl GetPartyMonByIndex str r0, [r4, #0x0] @@ -1298,7 +1298,7 @@ sub_02038070: ; 0x02038070 bl TaskManager_GetFieldSystem add r4, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0x0 ldr r0, [r5, #0x0] cmp r0, #0x0 @@ -1316,7 +1316,7 @@ _0203808E: b _020380C8 _0203809E: add r0, r4, #0x0 - bl sub_0204647C + bl FieldSystem_ApplicationIsRunning cmp r0, #0x0 bne _020380C8 ldr r0, [r5, #0x8] @@ -1410,7 +1410,7 @@ sub_02038144: ; 0x02038144 bl Save_PlayerData_GetProfileAddr str r0, [r5, #0x4] ldr r0, [r4, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [r5, #0x8] ldr r0, [r4, #0xc] mov r1, #0x9 @@ -1493,7 +1493,7 @@ sub_020381FC: ; 0x020381FC bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r6, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x0] cmp r0, #0x7 @@ -1803,7 +1803,7 @@ sub_0203847C: ; 0x0203847C bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x0] cmp r0, #0x3 @@ -1837,7 +1837,7 @@ _020384B6: b _02038544 _020384C8: add r0, r5, #0x0 - bl sub_0204AF84 + bl CallTask_RestoreOverworld ldr r0, [r4, #0x0] add r0, r0, #0x1 str r0, [r4, #0x0] @@ -1907,7 +1907,7 @@ sub_0203854C: ; 0x0203854C bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0xc] ldr r0, [r0, #0x0] @@ -1936,7 +1936,7 @@ _02038580: pop {r3-r5, pc} _02038590: ldr r0, [r5, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get ldr r1, [r4, #0x4] bl GetPartyMonByIndex ldr r2, [r4, #0xc] @@ -2003,7 +2003,7 @@ CreateNamingScreen: ; 0x020385CC b _02038660 _02038620: ldr r0, [r7, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get ldr r1, [r4, #0x4] bl GetPartyMonByIndex mov r1, #0x6f @@ -2127,7 +2127,7 @@ sub_020386E0: ; 0x020386E0 bl SaveArray_Get str r0, [r4, #0x8] ldr r0, [r5, #0xc] - bl GetStoragePCPointer + bl Save_PCStorage_Get str r0, [r4, #0xc] ldr r0, [r5, #0xc] bl Save_Pokedex_Get @@ -2329,7 +2329,7 @@ HatchEggInParty: ; 0x020388B4 sub sp, #0x10 add r4, r0, #0x0 ldr r0, [r4, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get bl ov05_021ED49C add r5, r0, #0x0 bne _020388CC @@ -2379,10 +2379,10 @@ sub_02038914: ; 0x02038914 bl Save_VarsFlags_Get add r7, r0, #0x0 add r0, r6, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0x0 add r0, r6, #0x0 - bl sub_02046530 + bl TaskManager_GetStatePtr add r6, r0, #0x0 ldr r0, [r6, #0x0] cmp r0, #0x0 @@ -2401,7 +2401,7 @@ _02038944: b _020389C6 _02038956: add r0, r4, #0x0 - bl sub_0204647C + bl FieldSystem_ApplicationIsRunning cmp r0, #0x0 bne _020389C6 ldr r0, [r4, #0xc] @@ -2556,7 +2556,7 @@ _02038AAC: .word UNK_020F2BE8 thumb_func_start sub_02038AB0 sub_02038AB0: ; 0x02038AB0 push {r4, lr} - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 bl ov06_0224D79C cmp r0, #0x1 diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index badfe20ab..ff9454bae 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -891,7 +891,7 @@ sub_02038C78: ; 0x02038C78 ldr r1, _02038CA4 ; =sub_02038D48 add r0, r5, #0x0 add r2, r4, #0x0 - bl sub_020463CC + bl FieldSystem_CreateTask pop {r3-r7, pc} nop _02038CA4: .word sub_02038D48 @@ -903,7 +903,7 @@ sub_02038CA8: ; 0x02038CA8 add r5, r1, #0x0 add r4, r2, #0x0 add r6, r3, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment ldr r2, [sp, #0x1c] mov r1, #0x1c add r3, r2, #0x0 @@ -922,8 +922,8 @@ sub_02038CA8: ; 0x02038CA8 pop {r4-r6, pc} .balign 4 - thumb_func_start sub_02038CD8 -sub_02038CD8: ; 0x02038CD8 + thumb_func_start QueueScript +QueueScript: ; 0x02038CD8 push {r4-r7, lr} sub sp, #0xc add r6, r0, #0x0 @@ -949,8 +949,8 @@ sub_02038CD8: ; 0x02038CD8 .balign 4 _02038D0C: .word sub_02038D48 - thumb_func_start sub_02038D10 -sub_02038D10: ; 0x02038D10 + thumb_func_start StartScriptFromMenu +StartScriptFromMenu: ; 0x02038D10 push {r3-r7, lr} sub sp, #0x8 add r5, r0, #0x0 @@ -970,7 +970,7 @@ sub_02038D10: ; 0x02038D10 ldr r1, _02038D44 ; =sub_02038D48 add r0, r5, #0x0 add r2, r4, #0x0 - bl sub_020463EC + bl TaskManager_Jump add sp, #0x8 pop {r3-r7, pc} .balign 4 @@ -981,7 +981,7 @@ sub_02038D48: ; 0x02038D48 push {r3-r7, lr} sub sp, #0x8 add r5, r0, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 bl TaskManager_GetFieldSystem @@ -1874,7 +1874,7 @@ FieldSysGetAttrAddr: ; 0x02039438 push {r3-r5, lr} ldr r0, [r0, #0x10] add r5, r1, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r1, [r4, #0x0] ldr r0, _0203945C ; =0x0003643F @@ -1894,7 +1894,7 @@ sub_02039460: ; 0x02039460 push {r3-r5, lr} add r5, r0, #0x0 ldr r0, [r5, #0x10] - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 bl sub_02035068 diff --git a/arm9/asm/unk_02046030.s b/arm9/asm/unk_02046030.s index c13cd6737..360eecc74 100644 --- a/arm9/asm/unk_02046030.s +++ b/arm9/asm/unk_02046030.s @@ -41,7 +41,7 @@ sub_02046068: ; 0x02046068 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r6, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r5, #0xc] bl Save_VarsFlags_Get @@ -80,7 +80,7 @@ _020460AE: mov r1, #0x1 bl sub_0206367C add r0, r6, #0x0 - bl sub_0204AFC8 + bl CallTask_FadeToBlack ldrb r0, [r4, #0x8] add r0, r0, #0x1 strb r0, [r4, #0x8] @@ -113,7 +113,7 @@ _020460E2: b _020461F8 _0204610A: add r0, r6, #0x0 - bl sub_0204AF84 + bl CallTask_RestoreOverworld ldrb r0, [r4, #0x8] add r0, r0, #0x1 strb r0, [r4, #0x8] @@ -200,7 +200,7 @@ _02046198: b _020461F8 _020461C0: add r0, r6, #0x0 - bl sub_0204AF84 + bl CallTask_RestoreOverworld ldrb r0, [r4, #0x8] add r0, r0, #0x1 strb r0, [r4, #0x8] @@ -210,7 +210,7 @@ _020461CE: mov r1, #0x0 bl sub_02046214 add r0, r6, #0x0 - bl sub_0204B00C + bl CallTask_FadeFromBlack ldrb r0, [r4, #0x8] add r0, r0, #0x1 strb r0, [r4, #0x8] diff --git a/arm9/asm/unk_0204653C.s b/arm9/asm/unk_0204653C.s deleted file mode 100644 index 73fdf0b95..000000000 --- a/arm9/asm/unk_0204653C.s +++ /dev/null @@ -1,1932 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .text - - thumb_func_start sub_0204653C -sub_0204653C: ; 0x0204653C - push {r4-r6, lr} - add r4, r0, #0x0 - bl TaskManager_GetFieldSystem - add r5, r0, #0x0 - add r0, r4, #0x0 - bl sub_0204652C - add r6, r0, #0x0 - add r0, r4, #0x0 - bl sub_02046530 - add r4, r0, #0x0 - ldr r0, [r4, #0x0] - cmp r0, #0x0 - beq _02046562 - cmp r0, #0x1 - beq _02046572 - b _02046580 -_02046562: - add r0, r5, #0x0 - add r1, r6, #0x0 - bl sub_0203780C - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046580 -_02046572: - add r0, r5, #0x0 - bl sub_0204647C - cmp r0, #0x0 - bne _02046580 - mov r0, #0x1 - pop {r4-r6, pc} -_02046580: - mov r0, #0x0 - pop {r4-r6, pc} - - thumb_func_start sub_02046584 -sub_02046584: ; 0x02046584 - ldr r3, _0204658C ; =TaskManager_Call - add r2, r1, #0x0 - ldr r1, _02046590 ; =sub_0204653C - bx r3 - .balign 4 -_0204658C: .word TaskManager_Call -_02046590: .word sub_0204653C - - thumb_func_start sub_02046594 -sub_02046594: ; 0x02046594 - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r1, #0x0 - mov r0, #0xb - mov r1, #0x14 - add r7, r2, #0x0 - add r4, r3, #0x0 - bl AllocFromHeapAtEnd - str r4, [r0, #0x0] - cmp r4, #0x0 - beq _020465B0 - mov r1, #0x0 - str r1, [r4, #0x0] -_020465B0: - str r6, [r0, #0x4] - str r7, [r0, #0x8] - str r5, [r0, #0x10] - pop {r3-r7, pc} - - thumb_func_start sub_020465B8 -sub_020465B8: ; 0x020465B8 - push {r4, lr} - add r4, r0, #0x0 - ldr r0, [r4, #0x10] - bl sub_02047964 - add r0, r4, #0x0 - bl FreeToHeap - pop {r4, pc} - .balign 4 - - thumb_func_start sub_020465CC -sub_020465CC: ; 0x020465CC - ldr r2, [r0, #0x0] - cmp r2, #0x0 - beq _020465D8 - ldr r1, [r0, #0x10] - ldr r1, [r1, #0x14] - str r1, [r2, #0x0] -_020465D8: - ldr r0, [r0, #0x10] - ldr r3, _020465E0 ; =sub_020480B8 - ldr r0, [r0, #0x14] - bx r3 - .balign 4 -_020465E0: .word sub_020480B8 - - thumb_func_start sub_020465E4 -sub_020465E4: ; 0x020465E4 - push {r3, lr} - mov r2, #0x2 - ldr r3, [r0, #0x0] - lsl r2, r2, #0x1e - tst r2, r3 - bne _020465F4 - bl sub_02047F38 -_020465F4: - pop {r3, pc} - .balign 4 - - thumb_func_start sub_020465F8 -sub_020465F8: ; 0x020465F8 - push {r3-r7, lr} - add r7, r0, #0x0 - bl TaskManager_GetFieldSystem - add r6, r0, #0x0 - add r0, r7, #0x0 - bl sub_0204652C - add r5, r0, #0x0 - add r0, r7, #0x0 - bl sub_02046530 - add r4, r0, #0x0 - ldr r0, [r4, #0x0] - cmp r0, #0x5 - bhi _020466F8 - add r0, r0, r0 - add r0, pc - ldrh r0, [r0, #0x6] - lsl r0, r0, #0x10 - asr r0, r0, #0x10 - add pc, r0 -_02046624: ; jump table (using 16-bit offset) - .short _02046630 - _02046624 - 2; case 0 - .short _02046648 - _02046624 - 2; case 1 - .short _02046656 - _02046624 - 2; case 2 - .short _02046666 - _02046624 - 2; case 3 - .short _020466DA - _02046624 - 2; case 4 - .short _020466EE - _02046624 - 2; case 5 -_02046630: - ldr r0, [r6, #0x34] - bl sub_02058780 - ldr r1, [r5, #0x4] - ldr r2, [r5, #0x8] - add r0, r7, #0x0 - bl sub_0204AEF8 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _020466F8 -_02046648: - add r0, r7, #0x0 - bl sub_0204AF3C - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _020466F8 -_02046656: - ldr r1, [r5, #0x10] - add r0, r7, #0x0 - bl sub_02046584 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _020466F8 -_02046666: - ldr r0, [r5, #0x10] - add r1, r6, #0x0 - bl sub_020465E4 - ldr r2, [r5, #0x10] - ldr r1, [r2, #0x0] - cmp r1, #0x0 - beq _02046682 - mov r0, #0x1 - lsl r0, r0, #0x8 - cmp r1, r0 - beq _02046682 - cmp r1, #0x4a - bne _02046690 -_02046682: - mov r1, #0x4d - lsl r1, r1, #0x2 - ldr r1, [r2, r1] - ldr r2, [r2, #0x14] - add r0, r6, #0x0 - bl sub_02061080 -_02046690: - add r0, r5, #0x0 - bl sub_020465CC - cmp r0, #0x0 - bne _020466A4 - add r0, r5, #0x0 - bl sub_020465B8 - mov r0, #0x1 - pop {r3-r7, pc} -_020466A4: - ldr r0, [r6, #0xc] - bl Save_VarsFlags_Get - bl sub_0205ED3C - cmp r0, #0x0 - beq _020466BC - ldr r0, [r6, #0xc] - bl SaveArray_PlayerParty_Get - bl HealParty -_020466BC: - ldr r1, [r5, #0x10] - add r0, r6, #0x0 - bl sub_020472F4 - ldr r1, [r5, #0x10] - add r0, r6, #0x0 - bl sub_020473CC - add r0, r7, #0x0 - bl sub_0204AF84 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _020466F8 -_020466DA: - ldr r0, [r6, #0x34] - bl sub_020587B0 - add r0, r7, #0x0 - bl sub_0204B00C - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _020466F8 -_020466EE: - add r0, r5, #0x0 - bl sub_020465B8 - mov r0, #0x1 - pop {r3-r7, pc} -_020466F8: - mov r0, #0x0 - pop {r3-r7, pc} - - thumb_func_start sub_020466FC -sub_020466FC: ; 0x020466FC - push {r4, lr} - add r4, r0, #0x0 - add r0, r1, #0x0 - add r1, r2, #0x0 - add r2, r3, #0x0 - ldr r3, [sp, #0x8] - bl sub_02046594 - add r2, r0, #0x0 - ldr r1, _02046718 ; =sub_020465F8 - add r0, r4, #0x0 - bl TaskManager_Call - pop {r4, pc} - .balign 4 -_02046718: .word sub_020465F8 - - thumb_func_start sub_0204671C -sub_0204671C: ; 0x0204671C - push {r3, lr} - mov r2, #0xf - and r0, r2 - cmp r0, #0x6 - bhi _02046754 - add r0, r0, r0 - add r0, pc - ldrh r0, [r0, #0x6] - lsl r0, r0, #0x10 - asr r0, r0, #0x10 - add pc, r0 -_02046732: ; jump table (using 16-bit offset) - .short _02046754 - _02046732 - 2; case 0 - .short _02046740 - _02046732 - 2; case 1 - .short _0204674A - _02046732 - 2; case 2 - .short _02046754 - _02046732 - 2; case 3 - .short _02046754 - _02046732 - 2; case 4 - .short _0204674A - _02046732 - 2; case 5 - .short _02046740 - _02046732 - 2; case 6 -_02046740: - ldr r0, [r1, #0xc] - mov r1, #0x1 - bl sub_0202E25C - pop {r3, pc} -_0204674A: - ldr r0, [r1, #0xc] - sub r2, #0x10 - add r1, r2, #0x0 - bl sub_0202E25C -_02046754: - pop {r3, pc} - .balign 4 - - thumb_func_start sub_02046758 -sub_02046758: ; 0x02046758 - push {r3-r7, lr} - add r6, r0, #0x0 - bl TaskManager_GetFieldSystem - add r7, r0, #0x0 - add r0, r6, #0x0 - bl sub_0204652C - add r5, r0, #0x0 - add r0, r6, #0x0 - bl sub_02046530 - add r4, r0, #0x0 - ldr r0, [r4, #0x0] - cmp r0, #0x5 - bhi _020467F6 - add r0, r0, r0 - add r0, pc - ldrh r0, [r0, #0x6] - lsl r0, r0, #0x10 - asr r0, r0, #0x10 - add pc, r0 -_02046784: ; jump table (using 16-bit offset) - .short _02046790 - _02046784 - 2; case 0 - .short _020467A2 - _02046784 - 2; case 1 - .short _020467B0 - _02046784 - 2; case 2 - .short _020467C0 - _02046784 - 2; case 3 - .short _020467EC - _02046784 - 2; case 4 - .short _020467EC - _02046784 - 2; case 5 -_02046790: - ldr r1, [r5, #0x4] - ldr r2, [r5, #0x8] - add r0, r6, #0x0 - bl sub_0204AEF8 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _020467F6 -_020467A2: - add r0, r6, #0x0 - bl sub_0204AF3C - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _020467F6 -_020467B0: - ldr r1, [r5, #0x10] - add r0, r6, #0x0 - bl sub_02046584 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _020467F6 -_020467C0: - ldr r0, [r5, #0x10] - add r1, r7, #0x0 - ldr r0, [r0, #0x14] - bl sub_0204671C - ldr r0, [r5, #0x10] - add r1, r7, #0x0 - bl sub_02047FA4 - ldr r0, [r7, #0xc] - bl Save_GameStats_Get - mov r1, #0x15 - bl GameStats_AddSpecial - add r0, r6, #0x0 - bl sub_0204AF84 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _020467F6 -_020467EC: - add r0, r5, #0x0 - bl sub_020465B8 - mov r0, #0x1 - pop {r3-r7, pc} -_020467F6: - mov r0, #0x0 - pop {r3-r7, pc} - .balign 4 - - thumb_func_start sub_020467FC -sub_020467FC: ; 0x020467FC - push {r3-r7, lr} - add r7, r0, #0x0 - bl TaskManager_GetFieldSystem - add r6, r0, #0x0 - add r0, r7, #0x0 - bl sub_0204652C - add r5, r0, #0x0 - add r0, r7, #0x0 - bl sub_02046530 - add r4, r0, #0x0 - ldr r0, [r4, #0x0] - cmp r0, #0x0 - beq _02046826 - cmp r0, #0x1 - beq _02046844 - cmp r0, #0x2 - beq _0204686A - b _02046874 -_02046826: - ldr r1, [r5, #0x8] - mov r0, #0x5 - lsl r1, r1, #0x10 - lsr r1, r1, #0x10 - mov r2, #0x1 - bl sub_0200433C - ldr r1, [r5, #0x10] - add r0, r7, #0x0 - bl sub_02046584 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046874 -_02046844: - ldr r0, [r5, #0x10] - add r1, r6, #0x0 - ldr r0, [r0, #0x14] - bl sub_0204671C - ldr r0, [r5, #0x10] - add r1, r6, #0x0 - bl sub_02047FA4 - ldr r0, [r6, #0xc] - bl Save_GameStats_Get - mov r1, #0x15 - bl GameStats_AddSpecial - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046874 -_0204686A: - add r0, r5, #0x0 - bl sub_020465B8 - mov r0, #0x1 - pop {r3-r7, pc} -_02046874: - mov r0, #0x0 - pop {r3-r7, pc} - - thumb_func_start sub_02046878 -sub_02046878: ; 0x02046878 - push {r3-r7, lr} - add r6, r0, #0x0 - bl TaskManager_GetFieldSystem - add r7, r0, #0x0 - add r0, r6, #0x0 - bl sub_0204652C - add r5, r0, #0x0 - add r0, r6, #0x0 - bl sub_02046530 - add r4, r0, #0x0 - ldr r0, [r4, #0x0] - cmp r0, #0x5 - bhi _02046922 - add r0, r0, r0 - add r0, pc - ldrh r0, [r0, #0x6] - lsl r0, r0, #0x10 - asr r0, r0, #0x10 - add pc, r0 -_020468A4: ; jump table (using 16-bit offset) - .short _020468B0 - _020468A4 - 2; case 0 - .short _020468C2 - _020468A4 - 2; case 1 - .short _020468D0 - _020468A4 - 2; case 2 - .short _020468E0 - _020468A4 - 2; case 3 - .short _0204690A - _020468A4 - 2; case 4 - .short _02046918 - _020468A4 - 2; case 5 -_020468B0: - ldr r1, [r5, #0x4] - ldr r2, [r5, #0x8] - add r0, r6, #0x0 - bl sub_0204AEF8 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046922 -_020468C2: - add r0, r6, #0x0 - bl sub_0204AF3C - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046922 -_020468D0: - ldr r1, [r5, #0x10] - add r0, r6, #0x0 - bl sub_02046584 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046922 -_020468E0: - ldr r0, [r5, #0x10] - add r1, r7, #0x0 - bl sub_02047FA4 - mov r1, #0x4e - ldr r2, [r5, #0x10] - lsl r1, r1, #0x2 - add r0, r7, #0x0 - add r1, r2, r1 - bl sub_02060044 - add r0, r5, #0x0 - bl sub_020465CC - add r0, r6, #0x0 - bl sub_0204AF84 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046922 -_0204690A: - add r0, r6, #0x0 - bl sub_0204B00C - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046922 -_02046918: - add r0, r5, #0x0 - bl sub_020465B8 - mov r0, #0x1 - pop {r3-r7, pc} -_02046922: - mov r0, #0x0 - pop {r3-r7, pc} - .balign 4 - - thumb_func_start sub_02046928 -sub_02046928: ; 0x02046928 - push {r4, lr} - add r4, r0, #0x0 - add r0, r1, #0x0 - add r1, r2, #0x0 - add r2, r3, #0x0 - ldr r3, [sp, #0x8] - bl sub_02046594 - add r2, r0, #0x0 - ldr r1, _02046944 ; =sub_02046878 - add r0, r4, #0x0 - bl TaskManager_Call - pop {r4, pc} - .balign 4 -_02046944: .word sub_02046878 - - thumb_func_start sub_02046948 -sub_02046948: ; 0x02046948 - push {r3-r7, lr} - add r4, r1, #0x0 - add r7, r0, #0x0 - add r5, r2, #0x0 - bl TaskManager_GetFieldSystem - add r1, r0, #0x0 - add r0, r4, #0x0 - bl ov06_02244558 - add r4, r0, #0x0 - bl sub_020475A0 - add r6, r0, #0x0 - add r0, r4, #0x0 - bl sub_020475B0 - add r3, r0, #0x0 - add r0, r7, #0x0 - add r1, r4, #0x0 - add r2, r6, #0x0 - str r5, [sp, #0x0] - bl sub_02046928 - pop {r3-r7, pc} - .balign 4 - - thumb_func_start sub_0204697C -sub_0204697C: ; 0x0204697C - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r1, #0x0 - mov r0, #0xb - mov r1, #0x14 - add r7, r2, #0x0 - add r4, r3, #0x0 - bl AllocFromHeapAtEnd - str r4, [r0, #0xc] - cmp r4, #0x0 - beq _02046998 - mov r1, #0x0 - str r1, [r4, #0x0] -_02046998: - str r6, [r0, #0x4] - str r7, [r0, #0x8] - str r5, [r0, #0x10] - mov r1, #0x0 - str r1, [r0, #0x0] - pop {r3-r7, pc} - - thumb_func_start sub_020469A4 -sub_020469A4: ; 0x020469A4 - push {r4, lr} - add r4, r0, #0x0 - ldr r0, [r4, #0x10] - bl sub_02047964 - add r0, r4, #0x0 - bl FreeToHeap - pop {r4, pc} - .balign 4 - - thumb_func_start sub_020469B8 -sub_020469B8: ; 0x020469B8 - push {r4-r6, lr} - add r5, r0, #0x0 - ldr r0, [r5, #0xc] - add r4, r1, #0x0 - bl Save_VarsFlags_Get - bl sub_0205F214 - cmp r0, #0x0 - beq _020469F2 - add r0, r4, #0x0 - bl sub_020475A0 - add r6, r0, #0x0 - add r0, r4, #0x0 - bl sub_020475B0 - add r2, r0, #0x0 - add r0, r4, #0x0 - add r1, r6, #0x0 - mov r3, #0x0 - bl sub_02046594 - add r2, r0, #0x0 - ldr r1, _02046A18 ; =sub_02046C1C - add r0, r5, #0x0 - bl sub_020463CC - pop {r4-r6, pc} -_020469F2: - add r0, r4, #0x0 - bl sub_020475A0 - add r6, r0, #0x0 - add r0, r4, #0x0 - bl sub_020475B0 - add r2, r0, #0x0 - add r0, r4, #0x0 - add r1, r6, #0x0 - mov r3, #0x0 - bl sub_0204697C - add r2, r0, #0x0 - ldr r1, _02046A1C ; =sub_02046A88 - add r0, r5, #0x0 - bl sub_020463CC - pop {r4-r6, pc} - .balign 4 -_02046A18: .word sub_02046C1C -_02046A1C: .word sub_02046A88 - - thumb_func_start sub_02046A20 -sub_02046A20: ; 0x02046A20 - push {r4-r6, lr} - ldr r0, [r0, #0xc] - add r5, r1, #0x0 - add r4, r2, #0x0 - bl Save_VarsFlags_Get - bl sub_0205F214 - cmp r0, #0x0 - beq _02046A5A - add r0, r4, #0x0 - bl sub_020475A0 - add r6, r0, #0x0 - add r0, r4, #0x0 - bl sub_020475B0 - add r2, r0, #0x0 - add r0, r4, #0x0 - add r1, r6, #0x0 - mov r3, #0x0 - bl sub_02046594 - add r2, r0, #0x0 - ldr r1, _02046A80 ; =sub_02046C1C - add r0, r5, #0x0 - bl sub_020463EC - pop {r4-r6, pc} -_02046A5A: - add r0, r4, #0x0 - bl sub_020475A0 - add r6, r0, #0x0 - add r0, r4, #0x0 - bl sub_020475B0 - add r2, r0, #0x0 - add r0, r4, #0x0 - add r1, r6, #0x0 - mov r3, #0x0 - bl sub_0204697C - add r2, r0, #0x0 - ldr r1, _02046A84 ; =sub_02046A88 - add r0, r5, #0x0 - bl sub_020463EC - pop {r4-r6, pc} - .balign 4 -_02046A80: .word sub_02046C1C -_02046A84: .word sub_02046A88 - - thumb_func_start sub_02046A88 -sub_02046A88: ; 0x02046A88 - push {r4-r6, lr} - add r6, r0, #0x0 - bl TaskManager_GetFieldSystem - add r5, r0, #0x0 - add r0, r6, #0x0 - bl sub_0204652C - add r4, r0, #0x0 - ldr r0, [r4, #0x0] - cmp r0, #0x6 - bls _02046AA2 - b _02046C12 -_02046AA2: - add r0, r0, r0 - add r0, pc - ldrh r0, [r0, #0x6] - lsl r0, r0, #0x10 - asr r0, r0, #0x10 - add pc, r0 -_02046AAE: ; jump table (using 16-bit offset) - .short _02046ABC - _02046AAE - 2; case 0 - .short _02046AE0 - _02046AAE - 2; case 1 - .short _02046AEE - _02046AAE - 2; case 2 - .short _02046AFE - _02046AAE - 2; case 3 - .short _02046BAE - _02046AAE - 2; case 4 - .short _02046BC4 - _02046AAE - 2; case 5 - .short _02046BF4 - _02046AAE - 2; case 6 -_02046ABC: - ldr r0, [r5, #0x34] - bl sub_02058780 - ldr r0, [r5, #0xc] - bl Save_GameStats_Get - mov r1, #0x7 - bl GameStats_Inc - ldr r1, [r4, #0x4] - ldr r2, [r4, #0x8] - add r0, r6, #0x0 - bl sub_0204AEF8 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046C12 -_02046AE0: - add r0, r6, #0x0 - bl sub_0204AF3C - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046C12 -_02046AEE: - ldr r1, [r4, #0x10] - add r0, r6, #0x0 - bl sub_02046584 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046C12 -_02046AFE: - ldr r0, [r4, #0x10] - add r1, r5, #0x0 - bl sub_020465E4 - mov r1, #0x4d - ldr r2, [r4, #0x10] - lsl r1, r1, #0x2 - ldr r1, [r2, r1] - ldr r2, [r2, #0x14] - add r0, r5, #0x0 - bl sub_02061080 - ldr r0, [r4, #0x10] - ldr r0, [r0, #0x14] - bl sub_020480B8 - cmp r0, #0x0 - bne _02046B3E - add r0, r4, #0x0 - bl sub_020469A4 - add r5, #0x90 - ldr r0, [r5, #0x0] - bl sub_0205DD40 - ldr r1, _02046C18 ; =FieldTask_BlackOut - add r0, r6, #0x0 - mov r2, #0x0 - bl sub_020463EC - mov r0, #0x0 - pop {r4-r6, pc} -_02046B3E: - ldr r0, [r5, #0xc] - bl Save_VarsFlags_Get - bl sub_0205ED3C - cmp r0, #0x0 - beq _02046B56 - ldr r0, [r5, #0xc] - bl SaveArray_PlayerParty_Get - bl HealParty -_02046B56: - ldr r1, [r4, #0x10] - add r0, r5, #0x0 - bl sub_020472F4 - ldr r1, [r4, #0x10] - add r0, r5, #0x0 - bl sub_020473CC - add r0, r5, #0x0 - add r0, #0x90 - ldr r0, [r0, #0x0] - bl sub_0205E128 - cmp r0, #0x0 - beq _02046BA0 - add r0, r5, #0x0 - add r0, #0x90 - ldr r0, [r0, #0x0] - bl sub_0205E0A4 - cmp r0, #0x0 - beq _02046B98 - ldr r0, [r4, #0x10] - ldr r0, [r0, #0x14] - cmp r0, #0x1 - beq _02046BA0 - cmp r0, #0x4 - beq _02046BA0 - add r5, #0x90 - ldr r0, [r5, #0x0] - bl sub_0205DD40 - b _02046BA0 -_02046B98: - add r5, #0x90 - ldr r0, [r5, #0x0] - bl sub_0205DD40 -_02046BA0: - add r0, r6, #0x0 - bl sub_0204AF84 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046C12 -_02046BAE: - ldr r1, [r4, #0x10] - add r0, r5, #0x0 - bl ov06_02248724 - add r0, r6, #0x0 - bl sub_0204B00C - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046C12 -_02046BC4: - add r0, r5, #0x0 - add r0, #0x90 - ldr r0, [r0, #0x0] - bl sub_0205E128 - cmp r0, #0x0 - beq _02046BEC - ldr r1, [r4, #0x10] - add r2, r5, #0x0 - add r2, #0x90 - ldr r1, [r1, #0x14] - ldr r2, [r2, #0x0] - add r0, r5, #0x0 - bl sub_0205DED4 - add r0, r5, #0x0 - add r5, #0x90 - ldr r1, [r5, #0x0] - bl sub_0205DF44 -_02046BEC: - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046C12 -_02046BF4: - add r0, r5, #0x0 - add r0, #0x90 - ldr r0, [r0, #0x0] - bl sub_0205DF9C - cmp r0, #0x0 - beq _02046C12 - ldr r0, [r5, #0x34] - bl sub_020587B0 - add r0, r4, #0x0 - bl sub_020469A4 - mov r0, #0x1 - pop {r4-r6, pc} -_02046C12: - mov r0, #0x0 - pop {r4-r6, pc} - nop -_02046C18: .word FieldTask_BlackOut - - thumb_func_start sub_02046C1C -sub_02046C1C: ; 0x02046C1C - push {r4-r7, lr} - sub sp, #0xc - add r7, r0, #0x0 - bl TaskManager_GetFieldSystem - add r6, r0, #0x0 - add r0, r7, #0x0 - bl sub_0204652C - add r5, r0, #0x0 - add r0, r7, #0x0 - bl sub_02046530 - add r4, r0, #0x0 - ldr r0, [r6, #0xc] - bl Save_LocalFieldData_Get - bl LocalFieldData_GetSafariBallsCounter - str r0, [sp, #0x0] - ldr r0, [r4, #0x0] - cmp r0, #0x7 - bls _02046C4C - b _02046DA0 -_02046C4C: - add r0, r0, r0 - add r0, pc - ldrh r0, [r0, #0x6] - lsl r0, r0, #0x10 - asr r0, r0, #0x10 - add pc, r0 -_02046C58: ; jump table (using 16-bit offset) - .short _02046C68 - _02046C58 - 2; case 0 - .short _02046C8C - _02046C58 - 2; case 1 - .short _02046C9A - _02046C58 - 2; case 2 - .short _02046CAA - _02046C58 - 2; case 3 - .short _02046D0E - _02046C58 - 2; case 4 - .short _02046D1C - _02046C58 - 2; case 5 - .short _02046D30 - _02046C58 - 2; case 6 - .short _02046D94 - _02046C58 - 2; case 7 -_02046C68: - ldr r0, [r6, #0x34] - bl sub_02058780 - ldr r0, [r6, #0xc] - bl Save_GameStats_Get - mov r1, #0x7 - bl GameStats_Inc - ldr r1, [r5, #0x4] - ldr r2, [r5, #0x8] - add r0, r7, #0x0 - bl sub_0204AEF8 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046DA0 -_02046C8C: - add r0, r7, #0x0 - bl sub_0204AF3C - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046DA0 -_02046C9A: - ldr r1, [r5, #0x10] - add r0, r7, #0x0 - bl sub_02046584 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046DA0 -_02046CAA: - ldr r0, [r5, #0x10] - add r1, r6, #0x0 - bl sub_020465E4 - ldr r0, [r5, #0x10] - ldr r0, [r0, #0x14] - cmp r0, #0x4 - bne _02046CD4 - ldr r0, [r6, #0xc] - bl Save_SafariZone_Get - str r0, [sp, #0x4] - ldr r0, [r5, #0x10] - mov r1, #0x0 - ldr r0, [r0, #0x8] - bl GetPartyMonByIndex - add r1, r0, #0x0 - ldr r0, [sp, #0x4] - bl sub_02060FE0 -_02046CD4: - ldr r1, [r5, #0x10] - add r0, r6, #0x0 - bl sub_020472F4 - ldr r0, [sp, #0x0] - ldrh r0, [r0, #0x0] - cmp r0, #0x0 - bne _02046CFE - ldr r0, [r5, #0x10] - ldr r0, [r0, #0x14] - cmp r0, #0x4 - beq _02046CFE - ldr r0, [r6, #0xc] - bl Save_LocalFieldData_Get - bl LocalFieldData_GetDynamicWarp - add r1, r0, #0x0 - add r0, r7, #0x0 - bl sub_02049160 -_02046CFE: - ldr r1, [r5, #0x10] - add r0, r6, #0x0 - bl sub_020473CC - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046DA0 -_02046D0E: - add r0, r7, #0x0 - bl sub_0204AF84 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046DA0 -_02046D1C: - ldr r0, [r6, #0x34] - bl sub_020587B0 - add r0, r7, #0x0 - bl sub_0204B00C - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046DA0 -_02046D30: - ldr r0, [sp, #0x0] - ldrh r0, [r0, #0x0] - cmp r0, #0x0 - bne _02046D5C - ldr r0, [r5, #0x10] - ldr r0, [r0, #0x14] - cmp r0, #0x4 - bne _02046D4E - mov r2, #0x0 - ldr r1, _02046DA8 ; =0x00002262 - add r0, r7, #0x0 - add r3, r2, #0x0 - bl sub_02038CD8 - b _02046D8C -_02046D4E: - mov r2, #0x0 - ldr r1, _02046DAC ; =0x00002269 - add r0, r7, #0x0 - add r3, r2, #0x0 - bl sub_02038CD8 - b _02046D8C -_02046D5C: - ldr r0, [r6, #0xc] - bl GetStoragePCPointer - str r0, [sp, #0x8] - ldr r0, [r6, #0xc] - bl SaveArray_PlayerParty_Get - add r5, r0, #0x0 - ldr r0, [sp, #0x8] - bl PCStorage_FindFirstBoxWithEmptySlot - cmp r0, #0x12 - bne _02046D8C - add r0, r5, #0x0 - bl GetPartyCount - cmp r0, #0x6 - bne _02046D8C - mov r2, #0x0 - ldr r1, _02046DB0 ; =0x00002276 - add r0, r7, #0x0 - add r3, r2, #0x0 - bl sub_02038CD8 -_02046D8C: - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046DA0 -_02046D94: - add r0, r5, #0x0 - bl sub_020465B8 - add sp, #0xc - mov r0, #0x1 - pop {r4-r7, pc} -_02046DA0: - mov r0, #0x0 - add sp, #0xc - pop {r4-r7, pc} - nop -_02046DA8: .word 0x00002262 -_02046DAC: .word 0x00002269 -_02046DB0: .word 0x00002276 - - thumb_func_start SetupAndStartHoneyTreeBattle -SetupAndStartHoneyTreeBattle: ; 0x02046DB4 - push {r3-r7, lr} - add r7, r0, #0x0 - add r6, r1, #0x0 - bl TaskManager_GetFieldSystem - add r5, r0, #0x0 - add r0, #0x90 - ldr r0, [r0, #0x0] - bl sub_0205DD40 - mov r0, #0xb - mov r1, #0x0 - bl sub_020476CC - add r1, r5, #0x0 - add r4, r0, #0x0 - bl sub_02047BB0 - mov r0, #0x15 - mov r1, #0x0 - lsl r0, r0, #0x4 - str r1, [r4, r0] - add r0, r0, #0x4 - str r1, [r4, r0] - add r0, r5, #0x0 - add r1, r4, #0x0 - bl ov06_0223CCDC - ldr r0, [r5, #0xc] - bl Save_GameStats_Get - mov r1, #0x7 - bl GameStats_Inc - add r0, r4, #0x0 - bl sub_020475A0 - add r5, r0, #0x0 - add r0, r4, #0x0 - bl sub_020475B0 - add r3, r0, #0x0 - add r0, r7, #0x0 - add r1, r4, #0x0 - add r2, r5, #0x0 - str r6, [sp, #0x0] - bl sub_020466FC - pop {r3-r7, pc} - .balign 4 - - thumb_func_start SetupAndStartWildBattle -SetupAndStartWildBattle: ; 0x02046E18 - push {r4-r7, lr} - sub sp, #0xc - str r0, [sp, #0x4] - add r7, r1, #0x0 - str r2, [sp, #0x8] - add r6, r3, #0x0 - bl TaskManager_GetFieldSystem - add r5, r0, #0x0 - add r0, #0x90 - ldr r0, [r0, #0x0] - bl sub_0205DD40 - mov r0, #0xb - mov r1, #0x0 - bl sub_020476CC - add r1, r5, #0x0 - add r4, r0, #0x0 - bl sub_02047BB0 - ldr r2, [sp, #0x8] - add r0, r5, #0x0 - add r1, r7, #0x0 - add r3, r4, #0x0 - bl ov06_0223CD7C - ldr r0, [sp, #0x20] - cmp r0, #0x0 - beq _02046E60 - mov r1, #0x63 - lsl r1, r1, #0x2 - ldr r2, [r4, r1] - mov r0, #0x8 - orr r0, r2 - str r0, [r4, r1] -_02046E60: - ldr r0, [r5, #0xc] - bl Save_GameStats_Get - mov r1, #0x7 - bl GameStats_Inc - add r0, r4, #0x0 - bl sub_020475A0 - add r5, r0, #0x0 - add r0, r4, #0x0 - bl sub_020475B0 - add r3, r0, #0x0 - ldr r0, [sp, #0x4] - add r1, r4, #0x0 - add r2, r5, #0x0 - str r6, [sp, #0x0] - bl sub_020466FC - add sp, #0xc - pop {r4-r7, pc} - - thumb_func_start sub_02046E8C -sub_02046E8C: ; 0x02046E8C - push {r3-r7, lr} - add r7, r0, #0x0 - bl TaskManager_GetFieldSystem - add r6, r0, #0x0 - add r0, r7, #0x0 - bl sub_0204652C - add r5, r0, #0x0 - add r0, r7, #0x0 - bl sub_02046530 - add r4, r0, #0x0 - ldr r0, [r4, #0x0] - cmp r0, #0x6 - bhi _02046F6C - add r0, r0, r0 - add r0, pc - ldrh r0, [r0, #0x6] - lsl r0, r0, #0x10 - asr r0, r0, #0x10 - add pc, r0 -_02046EB8: ; jump table (using 16-bit offset) - .short _02046EC6 - _02046EB8 - 2; case 0 - .short _02046EEA - _02046EB8 - 2; case 1 - .short _02046EF8 - _02046EB8 - 2; case 2 - .short _02046F08 - _02046EB8 - 2; case 3 - .short _02046F28 - _02046EB8 - 2; case 4 - .short _02046F36 - _02046EB8 - 2; case 5 - .short _02046F4A - _02046EB8 - 2; case 6 -_02046EC6: - ldr r0, [r6, #0x34] - bl sub_02058780 - ldr r0, [r6, #0xc] - bl Save_GameStats_Get - mov r1, #0x7 - bl GameStats_Inc - ldr r1, [r5, #0x4] - ldr r2, [r5, #0x8] - add r0, r7, #0x0 - bl sub_0204AEF8 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046F6C -_02046EEA: - add r0, r7, #0x0 - bl sub_0204AF3C - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046F6C -_02046EF8: - ldr r1, [r5, #0x10] - add r0, r7, #0x0 - bl sub_02046584 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046F6C -_02046F08: - ldr r0, [r5, #0x10] - add r1, r6, #0x0 - bl sub_020465E4 - ldr r1, [r5, #0x10] - add r0, r6, #0x0 - bl sub_0204BAA0 - ldr r1, [r5, #0x10] - add r0, r6, #0x0 - bl sub_020472F4 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046F6C -_02046F28: - add r0, r7, #0x0 - bl sub_0204AF84 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046F6C -_02046F36: - ldr r0, [r6, #0x34] - bl sub_020587B0 - add r0, r7, #0x0 - bl sub_0204B00C - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02046F6C -_02046F4A: - add r0, r5, #0x0 - bl sub_020465B8 - add r0, r6, #0x0 - bl sub_0204BAB0 - cmp r0, #0x0 - bne _02046F68 - add r0, r7, #0x0 - mov r1, #0x3 - mov r2, #0x0 - bl sub_02038D10 - mov r0, #0x0 - pop {r3-r7, pc} -_02046F68: - mov r0, #0x1 - pop {r3-r7, pc} -_02046F6C: - mov r0, #0x0 - pop {r3-r7, pc} - - thumb_func_start sub_02046F70 -sub_02046F70: ; 0x02046F70 - push {r4-r6, lr} - add r4, r1, #0x0 - add r5, r0, #0x0 - add r0, r4, #0x0 - bl sub_020475A0 - add r6, r0, #0x0 - add r0, r4, #0x0 - bl sub_020475B0 - add r2, r0, #0x0 - add r0, r4, #0x0 - add r1, r6, #0x0 - mov r3, #0x0 - bl sub_02046594 - add r2, r0, #0x0 - ldr r1, _02046F9C ; =sub_02046E8C - add r0, r5, #0x0 - bl sub_020463CC - pop {r4-r6, pc} - .balign 4 -_02046F9C: .word sub_02046E8C - - thumb_func_start SetupAndStartFirstBattle -SetupAndStartFirstBattle: ; 0x02046FA0 - push {r3-r7, lr} - sub sp, #0x8 - str r0, [sp, #0x4] - add r6, r1, #0x0 - add r7, r2, #0x0 - bl TaskManager_GetFieldSystem - add r5, r0, #0x0 - mov r0, #0xb - mov r1, #0x0 - bl sub_020476CC - add r4, r0, #0x0 - add r1, r5, #0x0 - bl sub_02047BB0 - add r0, r5, #0x0 - add r1, r6, #0x0 - add r2, r7, #0x0 - add r3, r4, #0x0 - bl ov06_0223CD7C - mov r0, #0x63 - mov r1, #0x1 - lsl r0, r0, #0x2 - str r1, [r4, r0] - ldr r0, [r5, #0xc] - bl Save_GameStats_Get - mov r1, #0x7 - bl GameStats_Inc - add r0, r4, #0x0 - bl sub_020475A0 - add r5, r0, #0x0 - add r0, r4, #0x0 - bl sub_020475B0 - add r3, r0, #0x0 - mov r0, #0x0 - str r0, [sp, #0x0] - ldr r0, [sp, #0x4] - add r1, r4, #0x0 - add r2, r5, #0x0 - bl sub_020466FC - add sp, #0x8 - pop {r3-r7, pc} - .balign 4 - - thumb_func_start sub_02047004 -sub_02047004: ; 0x02047004 - push {r3-r7, lr} - add r5, r0, #0x0 - bl sub_0204652C - add r6, r0, #0x0 - add r0, r5, #0x0 - bl TaskManager_GetFieldSystem - add r7, r0, #0x0 - add r0, r5, #0x0 - bl sub_02046530 - add r4, r0, #0x0 - ldr r0, [r4, #0x0] - cmp r0, #0x6 - bhi _020470A6 - add r1, r0, r0 - add r1, pc - ldrh r1, [r1, #0x6] - lsl r1, r1, #0x10 - asr r1, r1, #0x10 - add pc, r1 -_02047030: ; jump table (using 16-bit offset) - .short _0204703E - _02047030 - 2; case 0 - .short _02047056 - _02047030 - 2; case 1 - .short _02047064 - _02047030 - 2; case 2 - .short _02047074 - _02047030 - 2; case 3 - .short _0204707A - _02047030 - 2; case 4 - .short _02047088 - _02047030 - 2; case 5 - .short _0204709C - _02047030 - 2; case 6 -_0204703E: - ldr r0, [r7, #0x34] - bl sub_02058780 - ldr r1, [r6, #0x4] - ldr r2, [r6, #0x8] - add r0, r5, #0x0 - bl sub_0204AEF8 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _020470A6 -_02047056: - add r0, r5, #0x0 - bl sub_0204AF3C - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _020470A6 -_02047064: - ldr r1, [r6, #0x10] - add r0, r5, #0x0 - bl sub_02046584 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _020470A6 -_02047074: - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _020470A6 -_0204707A: - add r0, r5, #0x0 - bl sub_0204AF84 - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _020470A6 -_02047088: - ldr r0, [r7, #0x34] - bl sub_020587B0 - add r0, r5, #0x0 - bl sub_0204B00C - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _020470A6 -_0204709C: - add r0, r6, #0x0 - bl sub_020465B8 - mov r0, #0x1 - pop {r3-r7, pc} -_020470A6: - mov r0, #0x0 - pop {r3-r7, pc} - .balign 4 - - thumb_func_start SetupAndStartTutorialBattle -SetupAndStartTutorialBattle: ; 0x020470AC - push {r4-r6, lr} - add r5, r0, #0x0 - bl TaskManager_GetFieldSystem - add r1, r0, #0x0 - mov r0, #0xb - bl sub_02047814 - add r4, r0, #0x0 - bl sub_020475A0 - add r6, r0, #0x0 - add r0, r4, #0x0 - bl sub_020475B0 - add r2, r0, #0x0 - add r0, r4, #0x0 - add r1, r6, #0x0 - mov r3, #0x0 - bl sub_02046594 - add r2, r0, #0x0 - ldr r1, _020470E4 ; =sub_02047004 - add r0, r5, #0x0 - bl TaskManager_Call - pop {r4-r6, pc} - nop -_020470E4: .word sub_02047004 - - thumb_func_start sub_020470E8 -sub_020470E8: ; 0x020470E8 - push {r4-r7, lr} - sub sp, #0xc - str r0, [sp, #0x4] - add r6, r1, #0x0 - add r5, r2, #0x0 - str r3, [sp, #0x8] - bl TaskManager_GetFieldSystem - add r7, r0, #0x0 - cmp r5, #0x0 - beq _02047110 - cmp r6, r5 - beq _02047110 - ldr r0, [sp, #0x8] - cmp r0, #0x0 - bne _0204710C - mov r4, #0x13 - b _0204711A -_0204710C: - mov r4, #0x4b - b _0204711A -_02047110: - cmp r6, r5 - bne _02047118 - mov r4, #0x3 - b _0204711A -_02047118: - mov r4, #0x1 -_0204711A: - add r0, r7, #0x0 - add r0, #0x90 - ldr r0, [r0, #0x0] - bl sub_0205DD40 - mov r0, #0xb - add r1, r4, #0x0 - bl sub_020476CC - add r4, r0, #0x0 - add r1, r7, #0x0 - bl sub_02047BB0 - str r6, [r4, #0x1c] - ldr r0, [sp, #0x8] - str r5, [r4, #0x24] - str r0, [r4, #0x20] - ldr r1, [r7, #0xc] - ldr r2, [sp, #0x20] - add r0, r4, #0x0 - bl EnemyTrainerSet_Init - ldr r0, [r7, #0xc] - bl Save_GameStats_Get - mov r1, #0x8 - bl GameStats_Inc - add r0, r4, #0x0 - bl sub_020475A0 - add r5, r0, #0x0 - add r0, r4, #0x0 - bl sub_020475B0 - add r3, r0, #0x0 - ldr r0, [sp, #0x24] - add r1, r4, #0x0 - str r0, [sp, #0x0] - ldr r0, [sp, #0x4] - add r2, r5, #0x0 - bl sub_020466FC - add sp, #0xc - pop {r4-r7, pc} - - thumb_func_start sub_02047174 -sub_02047174: ; 0x02047174 - push {r3-r7, lr} - add r5, r2, #0x0 - add r7, r0, #0x0 - add r4, r1, #0x0 - bl TaskManager_GetFieldSystem - add r6, r0, #0x0 - mov r0, #0xb - add r1, r5, #0x0 - bl sub_020476CC - add r5, r0, #0x0 - add r1, r6, #0x0 - add r2, r4, #0x0 - bl sub_02047F1C - add r0, r5, #0x0 - bl sub_020475A0 - add r4, r0, #0x0 - add r0, r5, #0x0 - bl sub_020475B0 - add r2, r0, #0x0 - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl sub_02046594 - add r2, r0, #0x0 - ldr r1, _020471BC ; =sub_02046758 - add r0, r7, #0x0 - bl TaskManager_Call - pop {r3-r7, pc} - nop -_020471BC: .word sub_02046758 - - thumb_func_start sub_020471C0 -sub_020471C0: ; 0x020471C0 - push {r3-r7, lr} - str r0, [sp, #0x0] - add r5, r1, #0x0 - add r6, r2, #0x0 - add r4, r3, #0x0 - bl TaskManager_GetFieldSystem - add r7, r0, #0x0 - cmp r4, #0x0 - beq _020471DE - mov r0, #0xb - mov r1, #0x5 - bl sub_020476CC - b _020471E6 -_020471DE: - mov r0, #0xb - mov r1, #0x7 - bl sub_020476CC -_020471E6: - add r4, r0, #0x0 - add r0, r4, #0x0 - add r1, r7, #0x0 - add r2, r6, #0x0 - bl sub_02047BC0 - add r0, r4, #0x0 - bl sub_020475A0 - add r6, r0, #0x0 - add r0, r4, #0x0 - bl sub_020475B0 - add r2, r0, #0x0 - add r0, r4, #0x0 - add r1, r6, #0x0 - mov r3, #0x0 - bl sub_02046594 - add r2, r0, #0x0 - ldr r0, [sp, #0x0] - ldr r1, _0204721C ; =sub_020467FC - str r5, [r2, #0xc] - bl TaskManager_Call - pop {r3-r7, pc} - nop -_0204721C: .word sub_020467FC - - thumb_func_start sub_02047220 -sub_02047220: ; 0x02047220 - push {r3-r7, lr} - add r5, r0, #0x0 - bl TaskManager_GetFieldSystem - add r6, r0, #0x0 - add r0, r5, #0x0 - bl sub_0204652C - add r7, r0, #0x0 - add r0, r5, #0x0 - bl sub_02046530 - add r4, r0, #0x0 - ldr r0, [r4, #0x0] - cmp r0, #0x0 - beq _02047246 - cmp r0, #0x1 - beq _02047258 - b _02047262 -_02047246: - ldr r1, _02047268 ; =sub_02046758 - add r0, r5, #0x0 - add r2, r7, #0x0 - bl TaskManager_Call - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02047262 -_02047258: - add r0, r6, #0x0 - bl sub_0204FF5C - mov r0, #0x1 - pop {r3-r7, pc} -_02047262: - mov r0, #0x0 - pop {r3-r7, pc} - nop -_02047268: .word sub_02046758 - - thumb_func_start sub_0204726C -sub_0204726C: ; 0x0204726C - push {r4-r6, lr} - add r5, r0, #0x0 - add r6, r1, #0x0 - mov r0, #0xb - add r1, r2, #0x0 - bl sub_020476CC - add r4, r0, #0x0 - add r1, r5, #0x0 - add r2, r6, #0x0 - bl sub_02047F1C - add r0, r4, #0x0 - bl sub_020475A0 - add r6, r0, #0x0 - add r0, r4, #0x0 - bl sub_020475B0 - add r2, r0, #0x0 - add r0, r4, #0x0 - add r1, r6, #0x0 - mov r3, #0x0 - bl sub_02046594 - add r2, r0, #0x0 - ldr r1, _020472AC ; =sub_02047220 - add r0, r5, #0x0 - bl sub_020463CC - pop {r4-r6, pc} - nop -_020472AC: .word sub_02047220 - - thumb_func_start sub_020472B0 -sub_020472B0: ; 0x020472B0 - push {r4-r6, lr} - add r5, r0, #0x0 - add r6, r1, #0x0 - mov r0, #0xb - add r1, r2, #0x0 - bl sub_020476CC - add r4, r0, #0x0 - add r1, r5, #0x0 - add r2, r6, #0x0 - mov r3, #0x0 - bl sub_02047D48 - add r0, r4, #0x0 - bl sub_020475A0 - add r6, r0, #0x0 - add r0, r4, #0x0 - bl sub_020475B0 - add r2, r0, #0x0 - add r0, r4, #0x0 - add r1, r6, #0x0 - mov r3, #0x0 - bl sub_02046594 - add r2, r0, #0x0 - ldr r1, _020472F0 ; =sub_02047220 - add r0, r5, #0x0 - bl sub_020463CC - pop {r4-r6, pc} - .balign 4 -_020472F0: .word sub_02047220 - - thumb_func_start sub_020472F4 -sub_020472F4: ; 0x020472F4 - push {r3-r5, lr} - add r4, r0, #0x0 - ldr r0, [r1, #0x0] - mov r3, #0x4 - ldr r2, [r1, #0x14] - tst r3, r0 - bne _020473C8 - mov r3, #0x80 - add r5, r0, #0x0 - tst r5, r3 - bne _020473C8 - cmp r0, #0x0 - beq _02047318 - add r3, #0x80 - cmp r0, r3 - beq _02047318 - cmp r0, #0x4a - bne _02047364 -_02047318: - cmp r2, #0x1 - bne _0204732A - ldr r0, [r4, #0xc] - bl Save_GameStats_Get - mov r1, #0x8 - bl GameStats_AddSpecial - pop {r3-r5, pc} -_0204732A: - cmp r2, #0x4 - bne _020473C8 - ldr r0, [r1, #0x8] - mov r1, #0x0 - bl GetPartyMonByIndex - mov r1, #0x5 - mov r2, #0x0 - bl GetMonData - add r1, r0, #0x0 - mov r0, #0x0 - bl sub_0206BB48 - cmp r0, #0x0 - ldr r0, [r4, #0xc] - beq _02047358 - bl Save_GameStats_Get - mov r1, #0x9 - bl GameStats_AddSpecial - pop {r3-r5, pc} -_02047358: - bl Save_GameStats_Get - mov r1, #0xa - bl GameStats_AddSpecial - pop {r3-r5, pc} -_02047364: - mov r3, #0x1 - tst r3, r0 - bne _02047370 - mov r3, #0x10 - tst r3, r0 - beq _02047382 -_02047370: - cmp r2, #0x1 - bne _020473C8 - ldr r0, [r4, #0xc] - bl Save_GameStats_Get - mov r1, #0xb - bl GameStats_AddSpecial - pop {r3-r5, pc} -_02047382: - mov r3, #0x20 - add r5, r0, #0x0 - tst r5, r3 - bne _02047390 - lsl r3, r3, #0x4 - tst r0, r3 - beq _020473C8 -_02047390: - cmp r2, #0x4 - bne _020473C8 - ldr r0, [r1, #0x8] - mov r1, #0x0 - bl GetPartyMonByIndex - mov r1, #0x5 - mov r2, #0x0 - bl GetMonData - add r1, r0, #0x0 - mov r0, #0x0 - bl sub_0206BB48 - cmp r0, #0x0 - ldr r0, [r4, #0xc] - beq _020473BE - bl Save_GameStats_Get - mov r1, #0x9 - bl GameStats_AddSpecial - pop {r3-r5, pc} -_020473BE: - bl Save_GameStats_Get - mov r1, #0xa - bl GameStats_AddSpecial -_020473C8: - pop {r3-r5, pc} - .balign 4 - - thumb_func_start sub_020473CC -sub_020473CC: ; 0x020473CC - push {r4-r7, lr} - sub sp, #0xc - add r4, r1, #0x0 - add r5, r0, #0x0 - ldr r0, [r4, #0x0] - mov r2, #0x4 - ldr r1, [r4, #0x14] - tst r2, r0 - bne _020473EC - mov r3, #0x80 - add r2, r0, #0x0 - tst r2, r3 - bne _020473EC - lsl r2, r3, #0x2 - tst r2, r0 - beq _020473EE -_020473EC: - b _020474FC -_020473EE: - cmp r0, #0x0 - beq _02047400 - add r3, #0x80 - cmp r0, r3 - beq _02047400 - cmp r0, #0x4a - beq _02047400 - cmp r0, #0x20 - bne _020474D2 -_02047400: - cmp r1, #0x1 - bne _02047470 - add r0, r5, #0x0 - add r0, #0x76 - ldrh r0, [r0, #0x0] - add r1, r0, #0x1 - add r0, r5, #0x0 - add r0, #0x76 - strh r1, [r0, #0x0] - add r0, r5, #0x0 - add r0, #0x76 - ldrh r0, [r0, #0x0] - cmp r0, #0x5 - blo _020474FC - ldr r0, [r4, #0x8] - mov r1, #0x0 - bl GetPartyMonByIndex - add r6, r0, #0x0 - ldr r0, [r5, #0xc] - bl Save_PlayerData_GetIGTAddr - str r0, [sp, #0x4] - add r0, r6, #0x0 - mov r1, #0x5 - mov r2, #0x0 - bl GetMonData - add r7, r0, #0x0 - add r0, r6, #0x0 - mov r1, #0x6f - mov r2, #0x0 - bl GetMonData - add r2, r0, #0x0 - mov r3, #0xb - str r3, [sp, #0x0] - lsl r3, r3, #0x5 - ldr r3, [r4, r3] - lsl r1, r7, #0x10 - lsl r2, r2, #0x18 - lsl r3, r3, #0x18 - ldr r0, [sp, #0x4] - lsr r1, r1, #0x10 - lsr r2, r2, #0x18 - lsr r3, r3, #0x18 - bl sub_0202920C - add r5, #0x98 - add r1, r0, #0x0 - ldr r0, [r5, #0x0] - mov r2, #0x2 - bl sub_02028AD4 - add sp, #0xc - pop {r4-r7, pc} -_02047470: - cmp r1, #0x4 - bne _020474FC - mov r0, #0x17 - lsl r0, r0, #0x4 - ldr r0, [r4, r0] - mov r1, #0x0 - lsl r0, r0, #0x2 - add r0, r4, r0 - ldr r0, [r0, #0x4] - bl GetPartyMonByIndex - add r6, r0, #0x0 - ldr r0, [r5, #0xc] - bl Save_PlayerData_GetIGTAddr - str r0, [sp, #0x8] - add r0, r6, #0x0 - mov r1, #0x5 - mov r2, #0x0 - bl GetMonData - add r7, r0, #0x0 - add r0, r6, #0x0 - mov r1, #0x6f - mov r2, #0x0 - bl GetMonData - add r2, r0, #0x0 - mov r3, #0xb - str r3, [sp, #0x0] - lsl r3, r3, #0x5 - ldr r3, [r4, r3] - lsl r1, r7, #0x10 - lsl r2, r2, #0x18 - lsl r3, r3, #0x18 - ldr r0, [sp, #0x8] - lsr r1, r1, #0x10 - lsr r2, r2, #0x18 - lsr r3, r3, #0x18 - bl sub_0202918C - add r5, #0x98 - add r1, r0, #0x0 - ldr r0, [r5, #0x0] - mov r2, #0x2 - bl sub_02028AD4 - add sp, #0xc - pop {r4-r7, pc} -_020474D2: - mov r2, #0x1 - tst r2, r0 - bne _020474DE - mov r2, #0x10 - tst r0, r2 - beq _020474FC -_020474DE: - cmp r1, #0x1 - bne _020474FC - ldr r1, [r5, #0x1c] - add r0, r5, #0x0 - ldr r1, [r1, #0x0] - ldr r2, [r4, #0x1c] - add r0, #0x98 - lsl r1, r1, #0x10 - lsl r2, r2, #0x10 - ldr r0, [r0, #0x0] - lsr r1, r1, #0x10 - lsr r2, r2, #0x10 - mov r3, #0xb - bl sub_020299DC -_020474FC: - add sp, #0xc - pop {r4-r7, pc} diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s index 1539a4c60..b48be635d 100644 --- a/arm9/asm/unk_020476CC.s +++ b/arm9/asm/unk_020476CC.s @@ -11,8 +11,8 @@ UNK_020F45F8: ; 0x020F45F8 .text - thumb_func_start sub_020476CC -sub_020476CC: ; 0x020476CC + thumb_func_start BattleSetup_New +BattleSetup_New: ; 0x020476CC push {r3-r7, lr} add r4, r1, #0x0 mov r1, #0x67 @@ -156,7 +156,7 @@ sub_020477EC: ; 0x020477EC push {r4, lr} add r4, r1, #0x0 mov r1, #0x20 - bl sub_020476CC + bl BattleSetup_New mov r1, #0x19 lsl r1, r1, #0x4 str r4, [r0, r1] @@ -169,7 +169,7 @@ sub_02047800: ; 0x02047800 add r4, r1, #0x0 mov r1, #0x2 lsl r1, r1, #0x8 - bl sub_020476CC + bl BattleSetup_New mov r1, #0x19 lsl r1, r1, #0x4 str r4, [r0, r1] @@ -190,7 +190,7 @@ sub_02047814: ; 0x02047814 str r0, [sp, #0x14] add r0, r6, #0x0 lsl r1, r1, #0xa - bl sub_020476CC + bl BattleSetup_New add r4, r0, #0x0 ldr r2, _0204795C ; =0x000001F1 mov r0, #0x1 @@ -285,7 +285,7 @@ sub_02047814: ; 0x02047814 add r0, r6, #0x0 bl FreeToHeap ldr r0, [r5, #0xc] - bl GetStoragePCPointer + bl Save_PCStorage_Get mov r1, #0x45 lsl r1, r1, #0x2 str r0, [r4, r1] @@ -317,8 +317,8 @@ sub_02047814: ; 0x02047814 _0204795C: .word 0x000001F1 _02047960: .word 0x0000018F - thumb_func_start sub_02047964 -sub_02047964: ; 0x02047964 + thumb_func_start BattleSetup_Delete +BattleSetup_Delete: ; 0x02047964 push {r3-r7, lr} add r7, r0, #0x0 mov r4, #0x0 @@ -427,7 +427,7 @@ _02047A34: add r1, r5, r1 ldr r1, [r1, #0x4] add r0, r6, #0x0 - bl CopyPlayerParty + bl CopyParty pop {r4-r6, pc} .balign 4 @@ -471,7 +471,7 @@ sub_02047A78: ; 0x02047A78 bl Save_PlayerData_GetProfileAddr add r6, r0, #0x0 ldr r0, [r4, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r7, r0, #0x0 ldr r0, [r4, #0xc] bl Save_Bag_Get @@ -519,7 +519,7 @@ sub_02047A78: ; 0x02047A78 mov r2, #0x0 bl sub_02047A64 ldr r0, [r4, #0xc] - bl GetStoragePCPointer + bl Save_PCStorage_Get mov r1, #0x45 lsl r1, r1, #0x2 str r0, [r5, r1] @@ -594,8 +594,8 @@ sub_02047A78: ; 0x02047A78 pop {r4-r7, pc} .balign 4 - thumb_func_start sub_02047BB0 -sub_02047BB0: ; 0x02047BB0 + thumb_func_start BattleSetup_InitFromFieldSystem +BattleSetup_InitFromFieldSystem: ; 0x02047BB0 push {r4, lr} add r4, r0, #0x0 bl sub_02047A78 @@ -616,7 +616,7 @@ sub_02047BC0: ; 0x02047BC0 add r4, r0, #0x0 ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [sp, #0x14] ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] @@ -719,7 +719,7 @@ _02047C98: bl sub_02047A64 ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] - bl GetStoragePCPointer + bl Save_PCStorage_Get mov r1, #0x45 lsl r1, r1, #0x2 str r0, [r6, r1] @@ -903,7 +903,7 @@ _02047E2C: bl sub_02047A64 ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] - bl GetStoragePCPointer + bl Save_PCStorage_Get mov r1, #0x45 lsl r1, r1, #0x2 str r0, [r5, r1] @@ -995,7 +995,7 @@ sub_02047F1C: ; 0x02047F1C add r5, r0, #0x0 ldr r0, [r4, #0xc] add r6, r2, #0x0 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r2, r0, #0x0 add r0, r5, #0x0 add r1, r4, #0x0 @@ -1013,7 +1013,7 @@ sub_02047F38: ; 0x02047F38 bl Save_PlayerData_GetProfileAddr add r6, r0, #0x0 ldr r0, [r5, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r7, r0, #0x0 ldr r0, [r5, #0xc] bl Save_Bag_Get @@ -1032,7 +1032,7 @@ sub_02047F38: ; 0x02047F38 bl PlayerProfile_Copy ldr r0, [r4, #0x4] add r1, r7, #0x0 - bl CopyPlayerParty + bl CopyParty mov r0, #0x42 lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -1058,7 +1058,7 @@ sub_02047FA4: ; 0x02047FA4 ldr r0, [r5, #0xc] bl Save_PlayerData_GetProfileAddr ldr r0, [r5, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get ldr r0, [r5, #0xc] bl Save_Bag_Get ldr r0, [r5, #0xc] @@ -1191,8 +1191,8 @@ sub_020480AC: ; 0x020480AC bx lr .balign 4 - thumb_func_start sub_020480B8 -sub_020480B8: ; 0x020480B8 + thumb_func_start IsBattleResultWin +IsBattleResultWin: ; 0x020480B8 cmp r0, #0x2 beq _020480C0 cmp r0, #0x3 diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s index 1f376e792..dd42ab385 100644 --- a/arm9/asm/unk_02048120.s +++ b/arm9/asm/unk_02048120.s @@ -137,7 +137,7 @@ _02048210: .word sub_02048214 sub_02048214: ; 0x02048214 push {r3-r4, lr} sub sp, #0xc - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x0] cmp r0, #0x4 @@ -313,7 +313,7 @@ FieldTask_BlackOut: ; 0x0204837C bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r5, #0x0 - bl sub_02046530 + bl TaskManager_GetStatePtr add r4, r0, #0x0 ldr r0, [r4, #0x0] cmp r0, #0x6 @@ -391,7 +391,7 @@ _0204840C: b _02048488 _02048434: add r0, r5, #0x0 - bl sub_0204AF84 + bl CallTask_RestoreOverworld ldr r0, [r4, #0x0] add r0, r0, #0x1 str r0, [r4, #0x0] @@ -412,14 +412,14 @@ _02048442: ldr r1, _02048490 ; =0x000007E4 add r0, r5, #0x0 add r3, r2, #0x0 - bl sub_02038CD8 + bl QueueScript b _0204847A _0204846E: mov r2, #0x0 ldr r1, _02048494 ; =0x000007E5 add r0, r5, #0x0 add r3, r2, #0x0 - bl sub_02038CD8 + bl QueueScript _0204847A: ldr r0, [r4, #0x0] add r0, r0, #0x1 diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s index a9a5ac4e1..a2309dd09 100644 --- a/arm9/asm/unk_020484A8.s +++ b/arm9/asm/unk_020484A8.s @@ -41,7 +41,7 @@ _020484C6: bl Save_HOF_Init _020484CC: ldr r0, [r5, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r6, r0, #0x0 add r0, sp, #0x4 bl GF_RTC_CopyDate @@ -66,10 +66,10 @@ sub_020484F8: ; 0x020484F8 bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_02046530 + bl TaskManager_GetStatePtr add r4, r0, #0x0 ldr r0, [r4, #0x0] cmp r0, #0x9 @@ -101,7 +101,7 @@ _0204853A: b _02048688 _0204854A: add r0, r6, #0x0 - bl sub_0204647C + bl FieldSystem_ApplicationIsRunning cmp r0, #0x0 beq _02048556 _02048554: @@ -158,7 +158,7 @@ _020485AE: b _02048688 _020485C0: ldr r0, [r6, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get bl HealParty bl Save_SetDirtyBit ldr r0, [r6, #0xc] @@ -234,7 +234,7 @@ _02048644: b _02048688 _02048666: add r0, r6, #0x0 - bl sub_0204647C + bl FieldSystem_ApplicationIsRunning cmp r0, #0x0 bne _02048688 add r0, r5, #0x0 @@ -285,7 +285,7 @@ CallTask_GameClear: ; 0x02048694 bl Save_PlayerData_GetProfileAddr str r0, [r5, #0x4] ldr r0, [r4, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [r5, #0x8] ldr r0, [r4, #0xc] bl Save_PlayerData_GetIGTAddr @@ -308,7 +308,7 @@ CallTask_GameClear: ; 0x02048694 bl Script_SavRTC_DateTimeTox2C _0204871E: ldr r0, [r4, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get bl GiveAllMonsTheSinnohChampRibbon ldr r0, [sp, #0x8] bl sub_020377B0 diff --git a/arm9/asm/unk_02048904.s b/arm9/asm/unk_02048904.s index 567ef5861..52e39900f 100644 --- a/arm9/asm/unk_02048904.s +++ b/arm9/asm/unk_02048904.s @@ -554,7 +554,7 @@ sub_02048D34: ; 0x02048D34 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r6, #0x0 - bl sub_02046530 + bl TaskManager_GetStatePtr add r4, r0, #0x0 ldr r0, [r4, #0x0] cmp r0, #0x0 @@ -603,7 +603,7 @@ sub_02048D90: ; 0x02048D90 ldr r1, _02048DA8 ; =sub_02048D34 add r0, r4, #0x0 mov r2, #0x0 - bl sub_020463CC + bl FieldSystem_CreateTask pop {r4, pc} .balign 4 _02048DA8: .word sub_02048D34 @@ -618,7 +618,7 @@ sub_02048DAC: ; 0x02048DAC bl Save_VarsFlags_Get add r6, r0, #0x0 add r0, r7, #0x0 - bl sub_02046530 + bl TaskManager_GetStatePtr add r5, r0, #0x0 ldr r0, [r5, #0x0] cmp r0, #0x4 @@ -724,7 +724,7 @@ _02048EB0: pop {r3-r7, pc} _02048EB4: add r0, r4, #0x0 - bl sub_0204647C + bl FieldSystem_ApplicationIsRunning cmp r0, #0x0 bne _02048EC2 mov r0, #0x1 @@ -736,13 +736,13 @@ _02048EC2: thumb_func_start sub_02048EC8 sub_02048EC8: ; 0x02048EC8 - ldr r3, _02048ED4 ; =sub_020463CC + ldr r3, _02048ED4 ; =FieldSystem_CreateTask mov r2, #0x0 str r2, [r0, #0x6c] ldr r1, _02048ED8 ; =sub_02048DAC bx r3 nop -_02048ED4: .word sub_020463CC +_02048ED4: .word FieldSystem_CreateTask _02048ED8: .word sub_02048DAC thumb_func_start sub_02048EDC @@ -752,13 +752,13 @@ sub_02048EDC: ; 0x02048EDC bl TaskManager_GetFieldSystem add r4, r0, #0x0 add r0, r7, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r6, r0, #0x0 ldr r0, [r4, #0xc] bl Save_VarsFlags_Get str r0, [sp, #0x0] add r0, r7, #0x0 - bl sub_02046530 + bl TaskManager_GetStatePtr add r5, r0, #0x0 ldr r0, [r5, #0x0] cmp r0, #0x5 @@ -823,7 +823,7 @@ _02048F7E: bl sub_02052EE8 str r0, [r4, #0x7c] add r0, r7, #0x0 - bl sub_0204AF84 + bl CallTask_RestoreOverworld ldr r0, [r5, #0x0] add r0, r0, #0x1 str r0, [r5, #0x0] @@ -899,7 +899,7 @@ _02049000: str r0, [r4, #0x6c] ldr r1, _02049034 ; =sub_02048EDC add r0, r4, #0x0 - bl sub_020463CC + bl FieldSystem_CreateTask pop {r3-r5, pc} nop _02049030: .word 0x000001D2 @@ -912,7 +912,7 @@ sub_02049038: ; 0x02049038 bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r1, [r4, #0x0] cmp r1, #0x3 @@ -1003,7 +1003,7 @@ sub_020490F0: ; 0x020490F0 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x0] cmp r0, #0x0 @@ -1107,7 +1107,7 @@ sub_020491C4: ; 0x020491C4 bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r1, [r4, #0x0] cmp r1, #0x3 @@ -1149,7 +1149,7 @@ _02049216: add r0, r6, #0x0 bl sub_0204AD8C add r0, r5, #0x0 - bl sub_0204AF84 + bl CallTask_RestoreOverworld ldr r0, [r4, #0x0] add r0, r0, #0x1 str r0, [r4, #0x0] @@ -1219,7 +1219,7 @@ sub_02049274: ; 0x02049274 ldr r1, _020492B8 ; =sub_02049304 str r0, [r3, #0x0] add r0, r4, #0x0 - bl sub_020463CC + bl FieldSystem_CreateTask add sp, #0x14 pop {r4-r5, pc} nop @@ -1255,7 +1255,7 @@ sub_020492BC: ; 0x020492BC ldr r1, _02049300 ; =sub_02049304 str r0, [r3, #0x0] add r0, r4, #0x0 - bl sub_020463EC + bl TaskManager_Jump add sp, #0x14 pop {r4-r5, pc} nop @@ -1268,7 +1268,7 @@ sub_02049304: ; 0x02049304 bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r7, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r5, r4, #0x0 ldr r1, [r4, #0x0] @@ -1345,7 +1345,7 @@ _020493A0: .word sub_020493A4 sub_020493A4: ; 0x020493A4 push {r3-r5, lr} add r5, r0, #0x0 - bl sub_02046530 + bl TaskManager_GetStatePtr add r4, r0, #0x0 ldr r0, [r4, #0x0] cmp r0, #0x0 @@ -1371,7 +1371,7 @@ _020493CC: sub_020493D0: ; 0x020493D0 push {r4, lr} add r4, r0, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r2, r0, #0x0 ldr r1, _020493E4 ; =sub_020493E8 add r0, r4, #0x0 @@ -1384,7 +1384,7 @@ _020493E4: .word sub_020493E8 sub_020493E8: ; 0x020493E8 push {r3-r5, lr} add r5, r0, #0x0 - bl sub_02046530 + bl TaskManager_GetStatePtr add r4, r0, #0x0 add r0, r5, #0x0 bl TaskManager_GetFieldSystem @@ -1398,7 +1398,7 @@ sub_020493E8: ; 0x020493E8 b _0204942C _02049408: add r0, r5, #0x0 - bl sub_0204AF84 + bl CallTask_RestoreOverworld ldr r0, [r4, #0x0] add r0, r0, #0x1 str r0, [r4, #0x0] @@ -1425,7 +1425,7 @@ sub_02049430: ; 0x02049430 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r6, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 bl sub_0203739C @@ -1451,7 +1451,7 @@ _02049470: .word sub_02049474 thumb_func_start sub_02049474 sub_02049474: ; 0x02049474 push {r4, lr} - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x4] bl ov06_022483E0 @@ -1489,7 +1489,7 @@ sub_02049494: ; 0x02049494 ldr r1, _020494C8 ; =sub_020494CC str r0, [r3, #0x0] add r0, r6, #0x0 - bl sub_020463EC + bl TaskManager_Jump pop {r4-r6, pc} .balign 4 _020494C8: .word sub_020494CC @@ -1501,7 +1501,7 @@ sub_020494CC: ; 0x020494CC bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r7, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r6, r4, #0x0 ldr r1, [r4, #0x0] @@ -1591,7 +1591,7 @@ _02049580: .word sub_02049584 sub_02049584: ; 0x02049584 push {r3-r5, lr} add r5, r0, #0x0 - bl sub_02046530 + bl TaskManager_GetStatePtr add r4, r0, #0x0 ldr r0, [r4, #0x0] cmp r0, #0x0 @@ -1617,7 +1617,7 @@ _020495AC: sub_020495B0: ; 0x020495B0 push {r4, lr} add r4, r0, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r2, r0, #0x0 ldr r1, _020495C4 ; =sub_020495C8 add r0, r4, #0x0 @@ -1630,13 +1630,13 @@ _020495C4: .word sub_020495C8 sub_020495C8: ; 0x020495C8 push {r4-r6, lr} add r5, r0, #0x0 - bl sub_02046530 + bl TaskManager_GetStatePtr add r4, r0, #0x0 add r0, r5, #0x0 bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment ldr r0, [r4, #0x0] cmp r0, #0x0 beq _020495F0 @@ -1647,7 +1647,7 @@ sub_020495C8: ; 0x020495C8 b _02049616 _020495F0: add r0, r5, #0x0 - bl sub_0204AF84 + bl CallTask_RestoreOverworld ldr r0, [r4, #0x0] add r0, r0, #0x1 str r0, [r4, #0x0] @@ -1676,7 +1676,7 @@ sub_0204961C: ; 0x0204961C bl TaskManager_GetFieldSystem add r4, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r6, r0, #0x0 add r0, r4, #0x0 bl sub_0203739C @@ -1704,7 +1704,7 @@ sub_02049658: ; 0x02049658 bl TaskManager_GetFieldSystem add r7, r0, #0x0 add r0, r6, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r5, r4, #0x0 ldr r1, [r4, #0x0] @@ -1763,7 +1763,7 @@ _020496CC: add r0, r7, #0x0 bl sub_0204AD8C add r0, r6, #0x0 - bl sub_0204AF84 + bl CallTask_RestoreOverworld ldr r0, [r4, #0x0] add r0, r0, #0x1 str r0, [r4, #0x0] @@ -1828,7 +1828,7 @@ sub_02049718: ; 0x02049718 str r0, [r2, #0x0] add r0, r5, #0x0 add r2, r7, #0x0 - bl sub_020463CC + bl FieldSystem_CreateTask add sp, #0x14 pop {r4-r7, pc} nop @@ -1943,7 +1943,7 @@ sub_02049824: ; 0x02049824 add r1, r0, #0x0 add r0, r5, #0x0 add r2, r4, #0x0 - bl sub_020463CC + bl FieldSystem_CreateTask _02049840: pop {r3-r5, pc} .balign 4 @@ -1956,7 +1956,7 @@ sub_02049844: ; 0x02049844 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r6, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x0] cmp r0, #0xc @@ -2088,7 +2088,7 @@ _0204995E: ldr r1, _02049AC0 ; =0x000007F2 add r0, r6, #0x0 add r3, r2, #0x0 - bl sub_02038CD8 + bl QueueScript b _0204999C _02049976: ldr r0, [r5, #0xc] @@ -2105,7 +2105,7 @@ _02049976: add r0, r6, #0x0 add r3, #0x1c strh r2, [r4, #0x1c] - bl sub_02038CD8 + bl QueueScript _0204999C: mov r0, #0x4 str r0, [r4, #0x0] @@ -2135,7 +2135,7 @@ _020499CA: b _02049AB2 _020499D0: ldr r0, [r5, #0x34] - bl sub_020587B0 + bl MapObjectManager_UnpauseAllMovement add r0, r4, #0x0 bl FreeToHeap add sp, #0x8 @@ -2196,7 +2196,7 @@ _02049A42: add r0, r5, #0x0 bl sub_0204AB44 add r0, r6, #0x0 - bl sub_0204AF84 + bl CallTask_RestoreOverworld ldr r0, [r4, #0x0] add r0, r0, #0x1 str r0, [r4, #0x0] @@ -2254,7 +2254,7 @@ sub_02049ACC: ; 0x02049ACC bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r6, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r1, [r4, #0x0] cmp r1, #0x7 @@ -2354,7 +2354,7 @@ _02049B9C: add r0, r5, #0x0 bl sub_0204AB44 add r0, r6, #0x0 - bl sub_0204AF84 + bl CallTask_RestoreOverworld ldr r0, [r4, #0x0] add r0, r0, #0x1 str r0, [r4, #0x0] @@ -2410,7 +2410,7 @@ sub_02049C0C: ; 0x02049C0C bl TaskManager_GetFieldSystem add r7, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x4] mov r5, #0x0 @@ -2448,7 +2448,7 @@ sub_02049C54: ; 0x02049C54 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x0] cmp r0, #0x0 @@ -2529,10 +2529,10 @@ sub_02049CF8: ; 0x02049CF8 bl TaskManager_GetFieldSystem add r7, r0, #0x0 add r0, r6, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0x0 add r0, r6, #0x0 - bl sub_02046530 + bl TaskManager_GetStatePtr add r4, r0, #0x0 ldr r0, [r4, #0x0] cmp r0, #0x5 @@ -2584,14 +2584,14 @@ _02049D60: b _02049D98 _02049D72: add r0, r6, #0x0 - bl sub_0204AF84 + bl CallTask_RestoreOverworld ldr r0, [r4, #0x0] add r0, r0, #0x1 str r0, [r4, #0x0] b _02049D98 _02049D80: add r0, r6, #0x0 - bl sub_0204B00C + bl CallTask_FadeFromBlack ldr r0, [r4, #0x0] add r0, r0, #0x1 str r0, [r4, #0x0] @@ -2637,7 +2637,7 @@ sub_02049D9C: ; 0x02049D9C ldr r1, _02049DF0 ; =sub_02049CF8 add r0, r5, #0x0 add r2, r6, #0x0 - bl sub_020463CC + bl FieldSystem_CreateTask mov r0, #0x0 str r0, [r5, #0x78] pop {r4-r6, pc} @@ -2651,10 +2651,10 @@ sub_02049DF4: ; 0x02049DF4 bl TaskManager_GetFieldSystem add r7, r0, #0x0 add r0, r6, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0x0 add r0, r6, #0x0 - bl sub_02046530 + bl TaskManager_GetStatePtr add r4, r0, #0x0 ldr r0, [r4, #0x0] cmp r0, #0x6 @@ -2679,7 +2679,7 @@ _02049E2E: mov r2, #0x0 bl sub_0204ACA8 add r0, r6, #0x0 - bl sub_0204AFC8 + bl CallTask_FadeToBlack ldr r0, [r4, #0x0] add r0, r0, #0x1 str r0, [r4, #0x0] @@ -2702,7 +2702,7 @@ _02049E54: b _02049E9E _02049E66: add r0, r6, #0x0 - bl sub_0204AF84 + bl CallTask_RestoreOverworld ldr r0, [r4, #0x0] add r0, r0, #0x1 str r0, [r4, #0x0] @@ -2788,7 +2788,7 @@ sub_02049F10: ; 0x02049F10 bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r1, [r4, #0x0] cmp r1, #0x3 @@ -2832,7 +2832,7 @@ _02049F68: add r0, r6, #0x0 bl sub_0204AD8C add r0, r5, #0x0 - bl sub_0204AF84 + bl CallTask_RestoreOverworld ldr r0, [r4, #0x0] add r0, r0, #0x1 str r0, [r4, #0x0] diff --git a/arm9/asm/unk_0204B34C.s b/arm9/asm/unk_0204B34C.s index efb3ade8b..daea45a21 100644 --- a/arm9/asm/unk_0204B34C.s +++ b/arm9/asm/unk_0204B34C.s @@ -657,7 +657,7 @@ sub_0204B818: ; 0x0204B818 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x0] cmp r0, #0x4 diff --git a/arm9/asm/unk_0204B9EC.s b/arm9/asm/unk_0204B9EC.s index d59fb3caf..13dd82418 100644 --- a/arm9/asm/unk_0204B9EC.s +++ b/arm9/asm/unk_0204B9EC.s @@ -485,7 +485,7 @@ sub_0204BD40: ; 0x0204BD40 bl sub_02047800 add r1, r5, #0x0 add r7, r0, #0x0 - bl sub_02047BB0 + bl BattleSetup_InitFromFieldSystem ldr r0, [sp, #0x0] ldr r1, [r6, #0x3c] add r2, r4, #0x0 diff --git a/arm9/asm/unk_0204C1B4.s b/arm9/asm/unk_0204C1B4.s index 6f892b84b..ece4bbd21 100644 --- a/arm9/asm/unk_0204C1B4.s +++ b/arm9/asm/unk_0204C1B4.s @@ -60,7 +60,7 @@ sub_0204C1F4: ; 0x0204C1F4 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x0] cmp r0, #0x0 @@ -130,7 +130,7 @@ sub_0204C260: ; 0x0204C260 ldr r0, [sp, #0x20] str r0, [r2, #0x20] add r0, r7, #0x0 - bl sub_020463CC + bl FieldSystem_CreateTask pop {r3-r7, pc} nop _0204C298: .word sub_0204C380 @@ -238,7 +238,7 @@ _0204C36A: add r0, r7, #0x0 add r2, r6, #0x0 str r4, [r6, #0x20] - bl sub_020463CC + bl FieldSystem_CreateTask add sp, #0xc pop {r4-r7, pc} nop @@ -251,7 +251,7 @@ sub_0204C380: ; 0x0204C380 bl TaskManager_GetFieldSystem add r7, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r6, r4, #0x0 ldr r1, [r4, #0x0] @@ -306,7 +306,7 @@ _0204C3E8: b _0204C458 _0204C3F8: add r0, r5, #0x0 - bl sub_0204AF84 + bl CallTask_RestoreOverworld ldr r0, [r4, #0x0] add r0, r0, #0x1 str r0, [r4, #0x0] @@ -365,7 +365,7 @@ sub_0204C468: ; 0x0204C468 add r5, r0, #0x0 bl TaskManager_GetFieldSystem add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x4] cmp r0, #0x0 @@ -377,7 +377,7 @@ _0204C484: ldr r0, _0204C4A0 ; =0x00000603 bl PlaySE add r0, r5, #0x0 - bl sub_0204AFC8 + bl CallTask_FadeToBlack ldr r0, [r4, #0x4] add r0, r0, #0x1 str r0, [r4, #0x4] @@ -398,7 +398,7 @@ sub_0204C4A4: ; 0x0204C4A4 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r6, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x4] cmp r0, #0x3 @@ -444,7 +444,7 @@ _0204C4F6: b _0204C522 _0204C510: add r0, r6, #0x0 - bl sub_0204AFC8 + bl CallTask_FadeToBlack ldr r0, [r4, #0x4] add r0, r0, #0x1 str r0, [r4, #0x4] @@ -464,7 +464,7 @@ sub_0204C528: ; 0x0204C528 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x4] cmp r0, #0x0 @@ -522,7 +522,7 @@ sub_0204C5A0: ; 0x0204C5A0 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x4] cmp r0, #0x3 @@ -603,7 +603,7 @@ sub_0204C644: ; 0x0204C644 bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r6, #0x38] bl PlayerAvatar_GetMapObject @@ -639,7 +639,7 @@ sub_0204C68C: ; 0x0204C68C bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r6, #0x38] bl PlayerAvatar_GetMapObject @@ -675,7 +675,7 @@ sub_0204C6D4: ; 0x0204C6D4 bl TaskManager_GetFieldSystem add r4, r0, #0x0 add r0, r6, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0x0 ldr r0, [r5, #0x4] cmp r0, #0x3 @@ -769,7 +769,7 @@ sub_0204C7A0: ; 0x0204C7A0 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r6, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x4] cmp r0, #0x0 @@ -801,7 +801,7 @@ _0204C7BE: ldr r1, _0204C81C ; =sub_0204C6D4 add r0, r6, #0x0 add r2, r4, #0x0 - bl sub_020463EC + bl TaskManager_Jump b _0204C818 _0204C7FE: bl ov05_021DB030 @@ -830,7 +830,7 @@ sub_0204C824: ; 0x0204C824 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x4] cmp r0, #0x0 @@ -888,7 +888,7 @@ sub_0204C89C: ; 0x0204C89C bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x4] cmp r0, #0x3 @@ -968,7 +968,7 @@ sub_0204C93C: ; 0x0204C93C bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r6, #0x38] bl PlayerAvatar_GetMapObject diff --git a/arm9/asm/unk_0204FBA8.s b/arm9/asm/unk_0204FBA8.s index cadea46b9..bb1fa8508 100644 --- a/arm9/asm/unk_0204FBA8.s +++ b/arm9/asm/unk_0204FBA8.s @@ -1762,7 +1762,7 @@ sub_02050968: ; 0x02050968 ldr r1, [r1, #0x0] add r0, r4, #0x0 ldr r1, [r1, #0x44] - bl CopyPlayerParty + bl CopyParty _02050986: cmp r5, #0x0 beq _02050994 diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s index f7f6b05ac..9987abf21 100644 --- a/arm9/asm/unk_02050E48.s +++ b/arm9/asm/unk_02050E48.s @@ -94,7 +94,7 @@ sub_02050ED4: ; 0x02050ED4 str r0, [r4, #0x14] ldr r0, [r5, #0x24] ldr r0, [r0, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [r4, #0x0] ldr r0, [r5, #0x24] ldr r0, [r0, #0xc] @@ -198,7 +198,7 @@ sub_02050FC8: ; 0x02050FC8 push {r4, lr} add r4, r0, #0x0 add r0, r1, #0x0 - bl sub_0204647C + bl FieldSystem_ApplicationIsRunning cmp r0, #0x0 beq _02050FDA mov r0, #0x0 @@ -246,7 +246,7 @@ sub_02051020: ; 0x02051020 push {r4, lr} add r4, r0, #0x0 add r0, r1, #0x0 - bl sub_0204647C + bl FieldSystem_ApplicationIsRunning cmp r0, #0x0 beq _02051032 mov r0, #0x0 @@ -311,7 +311,7 @@ sub_02051094: ; 0x02051094 push {r3-r5, lr} sub sp, #0x8 add r5, r0, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 bl TaskManager_GetFieldSystem @@ -627,7 +627,7 @@ _02051308: _0205130E: ldr r0, [r4, #0x24] ldr r0, [r0, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r2, r0, #0x0 mov r0, #0x0 str r0, [sp, #0x0] @@ -1408,7 +1408,7 @@ _02051988: ldr r1, _02051994 ; =sub_02051094 add r0, r5, #0x0 add r2, r4, #0x0 - bl sub_020463CC + bl FieldSystem_CreateTask _02051992: pop {r4-r6, pc} .balign 4 @@ -1451,11 +1451,11 @@ _020519BA: thumb_func_start sub_020519E4 sub_020519E4: ; 0x020519E4 - ldr r3, _020519EC ; =sub_0204652C + ldr r3, _020519EC ; =TaskManager_GetEnvironment ldr r0, [r0, #0x10] bx r3 nop -_020519EC: .word sub_0204652C +_020519EC: .word TaskManager_GetEnvironment thumb_func_start sub_020519F0 sub_020519F0: ; 0x020519F0 @@ -1464,7 +1464,7 @@ sub_020519F0: ; 0x020519F0 ldr r0, [r7, #0x24] add r5, r1, #0x0 ldr r0, [r0, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [sp, #0x0] ldr r4, [r7, #0x4c] bl sub_020690C4 @@ -2095,7 +2095,7 @@ sub_02051EB0: ; 0x02051EB0 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 mov r1, #0x0 ldr r0, [r4, #0x24] @@ -2230,7 +2230,7 @@ _02051FDC: b _0205203A _02051FEC: add r0, r5, #0x0 - bl sub_0204647C + bl FieldSystem_ApplicationIsRunning cmp r0, #0x0 bne _0205203A ldr r0, [r4, #0x28] @@ -2306,7 +2306,7 @@ _02052066: str r0, [r2, #0x28] ldr r0, [sp, #0x0] ldr r1, _020520A8 ; =sub_02051EB0 - bl sub_020463CC + bl FieldSystem_CreateTask bl sub_02037760 pop {r3-r7, pc} _0205209C: diff --git a/arm9/asm/unk_02054C14.s b/arm9/asm/unk_02054C14.s index 881208862..fc8c6de65 100644 --- a/arm9/asm/unk_02054C14.s +++ b/arm9/asm/unk_02054C14.s @@ -288,7 +288,7 @@ _02054DE8: .word 0x0000010D sub_02054DEC: ; 0x02054DEC push {r3-r7, lr} add r6, r0, #0x0 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get bl GetPartyCount lsl r0, r0, #0x10 lsr r5, r0, #0x10 @@ -297,7 +297,7 @@ sub_02054DEC: ; 0x02054DEC mov r7, #0x4c _02054E02: add r0, r6, #0x0 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r1, r4, #0x0 bl GetPartyMonByIndex add r1, r7, #0x0 @@ -324,7 +324,7 @@ Save_PlayerHasAllRegisInParty: ; 0x02054E30 push {r3-r7, lr} sub sp, #0x10 mov r7, #0x0 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [sp, #0x0] bl GetPartyCount add r4, r0, #0x0 @@ -388,7 +388,7 @@ sub_02054EA0: ; 0x02054EA0 add r4, r0, #0x0 bl TaskManager_GetFieldSystem add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 mov r0, #0x2 lsl r0, r0, #0xe @@ -538,7 +538,7 @@ sub_02054FE4: ; 0x02054FE4 add r4, r0, #0x0 bl TaskManager_GetFieldSystem add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldrb r1, [r4, #0x9] ldr r0, [r4, #0x0] diff --git a/arm9/asm/unk_02057380.s b/arm9/asm/unk_02057380.s index d5afb3ae6..c00db4692 100644 --- a/arm9/asm/unk_02057380.s +++ b/arm9/asm/unk_02057380.s @@ -2734,8 +2734,8 @@ sub_02058774: ; 0x02058774 nop _0205877C: .word sub_02058384 - thumb_func_start sub_02058780 -sub_02058780: ; 0x02058780 + thumb_func_start MapObjectManager_PauseAllMovement +MapObjectManager_PauseAllMovement: ; 0x02058780 push {r4-r6, lr} add r5, r0, #0x0 bl sub_02058368 @@ -2759,8 +2759,8 @@ _020587A6: pop {r4-r6, pc} .balign 4 - thumb_func_start sub_020587B0 -sub_020587B0: ; 0x020587B0 + thumb_func_start MapObjectManager_UnpauseAllMovement +MapObjectManager_UnpauseAllMovement: ; 0x020587B0 push {r4-r6, lr} add r5, r0, #0x0 bl sub_02058368 diff --git a/arm9/asm/unk_0205CE48.s b/arm9/asm/unk_0205CE48.s index bc78c7fc0..01037cd48 100644 --- a/arm9/asm/unk_0205CE48.s +++ b/arm9/asm/unk_0205CE48.s @@ -76,7 +76,7 @@ sub_0205CE80: ; 0x0205CE80 str r0, [r5, #0x0] ldr r0, [r4, #0xc] bl Save_VarsFlags_Get - bl sub_0205ED3C + bl Save_VarsFlags_CheckHaveFollower str r0, [r5, #0x4] ldr r0, [r4, #0x38] bl PlayerAvatar_GetState @@ -165,7 +165,7 @@ sub_0205CF34: ; 0x0205CF34 bl TaskManager_GetFieldSystem add r7, r0, #0x0 ldr r0, [r5, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r7, #0x0 bl sub_0204649C @@ -202,7 +202,7 @@ sub_0205CF78: ; 0x0205CF78 add r2, r0, #0x0 ldr r0, [r4, #0x0] ldr r1, _0205CF9C ; =sub_0205CFA0 - bl sub_020463CC + bl FieldSystem_CreateTask add sp, #0x4 pop {r3-r4, pc} nop @@ -215,10 +215,10 @@ sub_0205CFA0: ; 0x0205CFA0 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r7, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r7, #0x0 - bl sub_02046530 + bl TaskManager_GetStatePtr add r6, r0, #0x0 ldr r0, [r6, #0x0] cmp r0, #0x0 @@ -236,7 +236,7 @@ _0205CFC6: add r0, r7, #0x0 lsr r1, r1, #0x10 mov r3, #0x0 - bl sub_02038CD8 + bl QueueScript add r0, r5, #0x0 mov r1, #0x29 bl FieldSysGetAttrAddr @@ -278,7 +278,7 @@ sub_0205D024: ; 0x0205D024 bl TaskManager_GetFieldSystem add r5, r0, #0x0 ldr r0, [r6, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment add r7, r0, #0x0 mov r0, #0xb mov r1, #0x40 @@ -288,7 +288,7 @@ sub_0205D024: ; 0x0205D024 add r4, r0, #0x0 bl memset ldr r0, [r5, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [r4, #0x0] ldr r0, [r5, #0xc] bl Save_Bag_Get @@ -344,7 +344,7 @@ sub_0205D0BC: ; 0x0205D0BC bl TaskManager_GetFieldSystem add r5, r0, #0x0 ldr r0, [r4, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 bl sub_02037EB8 @@ -383,7 +383,7 @@ sub_0205D104: ; 0x0205D104 bl TaskManager_GetFieldSystem add r5, r0, #0x0 ldr r0, [r4, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 bl sub_0204649C @@ -414,11 +414,11 @@ sub_0205D144: ; 0x0205D144 add r4, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0x34] - bl sub_02058780 + bl MapObjectManager_PauseAllMovement ldr r0, [r5, #0x0] ldr r1, _0205D16C ; =sub_02049844 add r2, r4, #0x0 - bl sub_020463CC + bl FieldSystem_CreateTask ldr r1, [r5, #0x0] mov r0, #0x0 add r1, #0x8c @@ -458,7 +458,7 @@ _0205D1A4: ldr r0, [r5, #0x18] ldr r0, [r0, #0xc] bl Save_VarsFlags_Get - bl sub_0205F214 + bl Save_VarsFlags_CheckSafariSysFlag cmp r0, #0x1 beq _0205D1C4 ldr r0, [r5, #0x18] @@ -520,7 +520,7 @@ sub_0205D21C: ; 0x0205D21C bl TaskManager_GetFieldSystem add r5, r0, #0x0 ldr r0, [r4, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 bl sub_0204649C @@ -543,7 +543,7 @@ sub_0205D250: ; 0x0205D250 ldr r0, [r0, #0x0] ldr r1, _0205D260 ; =sub_0205D264 mov r2, #0x0 - bl sub_020463CC + bl FieldSystem_CreateTask mov r0, #0x0 pop {r3, pc} .balign 4 @@ -556,7 +556,7 @@ sub_0205D264: ; 0x0205D264 bl TaskManager_GetFieldSystem add r4, r0, #0x0 add r0, r5, #0x0 - bl sub_02046530 + bl TaskManager_GetStatePtr add r5, r0, #0x0 ldr r0, [r5, #0x0] cmp r0, #0x3 @@ -633,7 +633,7 @@ _0205D314: b _0205D324 _0205D31A: ldr r0, [r4, #0x34] - bl sub_020587B0 + bl MapObjectManager_UnpauseAllMovement mov r0, #0x1 pop {r3-r5, pc} _0205D324: @@ -723,7 +723,7 @@ sub_0205D3B8: ; 0x0205D3B8 bl TaskManager_GetFieldSystem add r5, r0, #0x0 ldr r0, [r4, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0x0 @@ -761,7 +761,7 @@ sub_0205D400: ; 0x0205D400 bl TaskManager_GetFieldSystem add r5, r0, #0x0 ldr r0, [r6, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment add r7, r0, #0x0 mov r0, #0xb mov r1, #0x40 @@ -771,7 +771,7 @@ sub_0205D400: ; 0x0205D400 add r4, r0, #0x0 bl memset ldr r0, [r5, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [r4, #0x0] ldr r0, [r5, #0xc] bl Save_Bag_Get @@ -827,7 +827,7 @@ sub_0205D498: ; 0x0205D498 bl TaskManager_GetFieldSystem add r6, r0, #0x0 ldr r0, [r5, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldrh r0, [r5, #0x4] bl ItemToMailId @@ -866,7 +866,7 @@ sub_0205D4E8: ; 0x0205D4E8 add r4, r1, #0x0 bl TaskManager_GetFieldSystem ldr r0, [r5, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment ldrh r1, [r4, #0x10] mov r0, #0x1 tst r0, r1 @@ -902,7 +902,7 @@ sub_0205D528: ; 0x0205D528 bl TaskManager_GetFieldSystem add r5, r0, #0x0 ldr r0, [r4, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0xb @@ -943,7 +943,7 @@ sub_0205D574: ; 0x0205D574 bl TaskManager_GetFieldSystem add r5, r0, #0x0 ldr r0, [r4, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r1, [r5, #0xc] add r0, r5, #0x0 @@ -985,7 +985,7 @@ sub_0205D5C4: ; 0x0205D5C4 bl TaskManager_GetFieldSystem add r6, r0, #0x0 ldr r0, [r4, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0x0 mov r0, #0xb mov r1, #0x4 @@ -1019,7 +1019,7 @@ sub_0205D604: ; 0x0205D604 str r0, [r2, #0x0] ldr r0, [r4, #0x0] ldr r1, _0205D624 ; =sub_0205E30C - bl sub_020463CC + bl FieldSystem_CreateTask mov r0, #0x0 pop {r4, pc} nop @@ -1124,7 +1124,7 @@ sub_0205D6BC: ; 0x0205D6BC bl TaskManager_GetFieldSystem add r6, r0, #0x0 ldr r0, [r5, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r6, #0x0 bl sub_0204649C @@ -1197,7 +1197,7 @@ sub_0205D74C: ; 0x0205D74C bl TaskManager_GetFieldSystem add r5, r0, #0x0 ldr r0, [r4, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 bl sub_0204649C @@ -1229,7 +1229,7 @@ sub_0205D788: ; 0x0205D788 add r2, r0, #0x0 ldr r0, [r4, #0x0] ldr r1, _0205D7A4 ; =ov05_021F5C70 - bl sub_020463CC + bl FieldSystem_CreateTask mov r0, #0x0 pop {r4, pc} .balign 4 @@ -1243,7 +1243,7 @@ sub_0205D7A8: ; 0x0205D7A8 bl TaskManager_GetFieldSystem add r5, r0, #0x0 ldr r0, [r4, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 bl sub_0204649C @@ -1275,7 +1275,7 @@ sub_0205D7E4: ; 0x0205D7E4 add r2, r0, #0x0 ldr r0, [r4, #0x0] ldr r1, _0205D800 ; =ov05_021F5C70 - bl sub_020463CC + bl FieldSystem_CreateTask mov r0, #0x0 pop {r4, pc} .balign 4 @@ -1289,7 +1289,7 @@ sub_0205D804: ; 0x0205D804 bl TaskManager_GetFieldSystem add r5, r0, #0x0 ldr r0, [r4, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 bl sub_0204649C @@ -1321,7 +1321,7 @@ sub_0205D840: ; 0x0205D840 add r2, r0, #0x0 ldr r0, [r4, #0x0] ldr r1, _0205D85C ; =ov05_021F5C70 - bl sub_020463CC + bl FieldSystem_CreateTask mov r0, #0x0 pop {r4, pc} .balign 4 @@ -1402,7 +1402,7 @@ sub_0205D8B8: ; 0x0205D8B8 ldr r0, [r5, #0x0] ldr r1, _0205D900 ; =sub_0205D904 add r2, r4, #0x0 - bl sub_020463CC + bl FieldSystem_CreateTask mov r0, #0x0 pop {r3-r5, pc} .balign 4 @@ -1415,7 +1415,7 @@ sub_0205D904: ; 0x0205D904 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldrh r0, [r4, #0x16] cmp r0, #0x0 @@ -1427,7 +1427,7 @@ sub_0205D904: ; 0x0205D904 b _0205D9A0 _0205D926: ldr r0, [r5, #0x34] - bl sub_02058780 + bl MapObjectManager_PauseAllMovement ldr r0, [r5, #0x8] add r1, r4, #0x0 mov r2, #0x3 @@ -1469,7 +1469,7 @@ _0205D95C: b _0205D9A0 _0205D984: ldr r0, [r5, #0x34] - bl sub_020587B0 + bl MapObjectManager_UnpauseAllMovement add r0, r4, #0x0 bl RemoveWindow ldr r0, [r4, #0x10] @@ -1492,7 +1492,7 @@ sub_0205D9A8: ; 0x0205D9A8 bl TaskManager_GetFieldSystem add r5, r0, #0x0 ldr r0, [r6, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment add r7, r0, #0x0 mov r0, #0xb mov r1, #0x40 @@ -1502,7 +1502,7 @@ sub_0205D9A8: ; 0x0205D9A8 add r4, r0, #0x0 bl memset ldr r0, [r5, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [r4, #0x0] ldr r0, [r5, #0xc] bl Save_Bag_Get @@ -1557,7 +1557,7 @@ sub_0205DA3C: ; 0x0205DA3C bl TaskManager_GetFieldSystem add r6, r0, #0x0 ldr r0, [r5, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r6, #0x0 bl sub_0204649C @@ -1615,7 +1615,7 @@ sub_0205DAAC: ; 0x0205DAAC add r2, r0, #0x0 ldr r1, _0205DAC8 ; =0x0224C721 add r0, r4, #0x0 - bl sub_020463EC + bl TaskManager_Jump mov r0, #0x0 pop {r4, pc} .balign 4 @@ -1796,7 +1796,7 @@ sub_0205DBF0: ; 0x0205DBF0 ldr r0, [r5, #0x0] ldr r1, _0205DC34 ; =sub_0205D904 add r2, r4, #0x0 - bl sub_020463CC + bl FieldSystem_CreateTask add sp, #0x4 pop {r3-r6, pc} .balign 4 @@ -1809,7 +1809,7 @@ sub_0205DC38: ; 0x0205DC38 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, #0x2a ldrb r0, [r0, #0x0] @@ -1829,7 +1829,7 @@ _0205DC5E: ; jump table (using 16-bit offset) .short _0205DCE2 - _0205DC5E - 2; case 4 _0205DC68: ldr r0, [r5, #0x34] - bl sub_02058780 + bl MapObjectManager_PauseAllMovement mov r0, #0x0 bl ov05_021D7CA4 mov r0, #0x1 @@ -1850,7 +1850,7 @@ _0205DC7C: b _0205DCFA _0205DC94: add r0, r5, #0x0 - bl sub_0204647C + bl FieldSystem_ApplicationIsRunning cmp r0, #0x0 bne _0205DCFA ldr r0, [r4, #0x24] @@ -1877,7 +1877,7 @@ _0205DCC4: cmp r0, #0x0 beq _0205DCFA ldr r0, [r5, #0x34] - bl sub_02058780 + bl MapObjectManager_PauseAllMovement mov r0, #0x1 bl ov05_021D7CA4 mov r0, #0x4 @@ -1889,7 +1889,7 @@ _0205DCE2: cmp r0, #0x0 beq _0205DCFA ldr r0, [r5, #0x34] - bl sub_020587B0 + bl MapObjectManager_UnpauseAllMovement add r0, r4, #0x0 bl FreeToHeap mov r0, #0x1 @@ -1904,10 +1904,10 @@ _0205DD00: .word sub_0205D568 sub_0205DD04: ; 0x0205DD04 add r2, r0, #0x0 str r1, [r2, #0x20] - ldr r3, _0205DD10 ; =sub_020463CC + ldr r3, _0205DD10 ; =FieldSystem_CreateTask ldr r0, [r2, #0x0] ldr r1, _0205DD14 ; =sub_0205DC38 bx r3 .balign 4 -_0205DD10: .word sub_020463CC +_0205DD10: .word FieldSystem_CreateTask _0205DD14: .word sub_0205DC38 diff --git a/arm9/asm/unk_0205DD18.s b/arm9/asm/unk_0205DD18.s index ac26ac8f4..01d7603ed 100644 --- a/arm9/asm/unk_0205DD18.s +++ b/arm9/asm/unk_0205DD18.s @@ -836,7 +836,7 @@ sub_0205E30C: ; 0x0205E30C bl TaskManager_GetFieldSystem add r4, r0, #0x0 add r0, r7, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0x0 ldr r1, [r5, #0x0] cmp r1, #0x4 @@ -855,7 +855,7 @@ _0205E330: ; jump table (using 16-bit offset) .short _0205E3DE - _0205E330 - 2; case 4 _0205E33A: ldr r0, [r4, #0x34] - bl sub_02058780 + bl MapObjectManager_PauseAllMovement ldr r0, [r4, #0xc] bl Save_Roamers_Get bl sub_0202AB40 @@ -867,7 +867,7 @@ _0205E33A: ldr r1, _0205E400 ; =0x0000230A add r0, r7, #0x0 add r3, r2, #0x0 - bl sub_02038CD8 + bl QueueScript add r0, r4, #0x0 mov r1, #0x29 bl FieldSysGetAttrAddr @@ -931,7 +931,7 @@ _0205E3CC: _0205E3DE: bl FreeToHeap ldr r0, [r4, #0x34] - bl sub_020587B0 + bl MapObjectManager_UnpauseAllMovement mov r0, #0x1 pop {r3-r7, pc} _0205E3EC: @@ -939,7 +939,7 @@ _0205E3EC: ldr r1, _0205E408 ; =0x0000230B add r0, r7, #0x0 add r3, r2, #0x0 - bl sub_02038CD8 + bl QueueScript mov r0, #0x4 str r0, [r5, #0x0] _0205E3FC: diff --git a/arm9/asm/unk_020606B0.s b/arm9/asm/unk_020606B0.s index b736747a2..e5ce5dd13 100644 --- a/arm9/asm/unk_020606B0.s +++ b/arm9/asm/unk_020606B0.s @@ -15,7 +15,7 @@ sub_020606B0: ; 0x020606B0 add r4, r0, #0x0 bl TaskManager_GetFieldSystem add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r2, r0, #0x0 ldr r1, _020606CC ; =UNK_020F7630 add r0, r4, #0x0 @@ -33,7 +33,7 @@ sub_020606D0: ; 0x020606D0 bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x4] cmp r0, #0x6 @@ -73,7 +73,7 @@ _02060704: b _0206078A _0206072C: add r0, r5, #0x0 - bl sub_0204AFC8 + bl CallTask_FadeToBlack ldr r0, [r4, #0x4] add r0, r0, #0x1 str r0, [r4, #0x4] @@ -94,14 +94,14 @@ _02060748: b _0206078A _02060756: add r0, r5, #0x0 - bl sub_0204AF84 + bl CallTask_RestoreOverworld ldr r0, [r4, #0x4] add r0, r0, #0x1 str r0, [r4, #0x4] b _0206078A _02060764: add r0, r5, #0x0 - bl sub_0204B00C + bl CallTask_FadeFromBlack ldr r0, [r4, #0x4] add r0, r0, #0x1 str r0, [r4, #0x4] diff --git a/arm9/asm/unk_020607D4.s b/arm9/asm/unk_020607D4.s index 9c2d1db9d..42716f242 100644 --- a/arm9/asm/unk_020607D4.s +++ b/arm9/asm/unk_020607D4.s @@ -195,10 +195,10 @@ sub_02060948: ; 0x02060948 bl TaskManager_GetFieldSystem add r4, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r6, r0, #0x0 add r0, r5, #0x0 - bl sub_02046530 + bl TaskManager_GetStatePtr add r5, r0, #0x0 ldr r0, [r5, #0x0] cmp r0, #0x0 @@ -215,7 +215,7 @@ _02060972: b _02060994 _0206097C: add r0, r4, #0x0 - bl sub_0204647C + bl FieldSystem_ApplicationIsRunning cmp r0, #0x0 beq _02060994 mov r0, #0x0 @@ -241,7 +241,7 @@ sub_020609A0: ; 0x020609A0 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r6, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldrb r1, [r4, #0x0] cmp r1, #0x7 diff --git a/arm9/asm/unk_02060CCC.s b/arm9/asm/unk_02060CCC.s index c98a828af..cd7fabfb4 100644 --- a/arm9/asm/unk_02060CCC.s +++ b/arm9/asm/unk_02060CCC.s @@ -2172,7 +2172,7 @@ sub_02061C5C: ; 0x02061C5C add r5, r0, #0x0 ldr r0, [r5, #0xc] add r4, r1, #0x0 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get bl GetFirstNonEggInParty add r1, sp, #0x8 add r2, sp, #0x4 diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s index 842d365c7..3d8618bd9 100644 --- a/arm9/asm/unk_020625EC.s +++ b/arm9/asm/unk_020625EC.s @@ -1963,7 +1963,7 @@ sub_02063524: ; 0x02063524 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r2, [r4, #0x0] ldr r1, [r4, #0x8] diff --git a/arm9/asm/unk_0206367C.s b/arm9/asm/unk_0206367C.s index ac39285f1..36087884f 100644 --- a/arm9/asm/unk_0206367C.s +++ b/arm9/asm/unk_0206367C.s @@ -33,7 +33,7 @@ sub_02063684: ; 0x02063684 strh r1, [r0, #0x0] ldr r0, [r5, #0xc] bl Save_VarsFlags_Get - bl sub_0205F214 + bl Save_VarsFlags_CheckSafariSysFlag cmp r0, #0x0 bne _020636DA ldr r0, [r5, #0xc] diff --git a/arm9/asm/unk_02063888.s b/arm9/asm/unk_02063888.s index c25474fe9..79cdad3b6 100644 --- a/arm9/asm/unk_02063888.s +++ b/arm9/asm/unk_02063888.s @@ -39,7 +39,7 @@ sub_020638BC: ; 0x020638BC add r5, r0, #0x0 bl TaskManager_GetFieldSystem add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x4] cmp r0, #0x0 diff --git a/arm9/asm/unk_02063948.s b/arm9/asm/unk_02063948.s index 3e1c0f8f8..4cfc287f4 100644 --- a/arm9/asm/unk_02063948.s +++ b/arm9/asm/unk_02063948.s @@ -233,7 +233,7 @@ sub_02063AD0: ; 0x02063AD0 add r5, r0, #0x0 ldr r0, [r5, #0x0] add r6, r1, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 @@ -258,7 +258,7 @@ sub_02063B04: ; 0x02063B04 push {r3-r6, lr} sub sp, #0x4 add r5, r0, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 bl TaskManager_GetFieldSystem @@ -266,7 +266,7 @@ sub_02063B04: ; 0x02063B04 ldr r1, _02063B3C ; =0x00002718 ldr r2, [r4, #0x4] add r0, r5, #0x0 - bl sub_02038D10 + bl StartScriptFromMenu mov r2, #0x0 str r2, [sp, #0x0] ldrh r1, [r4, #0xc] @@ -312,7 +312,7 @@ _02063B74: ldr r0, [r4, #0x4] ldr r0, [r0, #0xc] bl Save_VarsFlags_Get - bl sub_0205ED3C + bl Save_VarsFlags_CheckHaveFollower cmp r0, #0x1 bne _02063B88 mov r0, #0x3 @@ -321,7 +321,7 @@ _02063B88: ldr r0, [r4, #0x4] ldr r0, [r0, #0xc] bl Save_VarsFlags_Get - bl sub_0205F214 + bl Save_VarsFlags_CheckSafariSysFlag cmp r0, #0x1 beq _02063BA8 ldr r0, [r4, #0x4] @@ -353,7 +353,7 @@ sub_02063BBC: ; 0x02063BBC bl TaskManager_GetFieldSystem add r6, r0, #0x0 ldr r0, [r5, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 mov r0, #0xb mov r1, #0x4 @@ -424,7 +424,7 @@ _02063C56: ldr r0, [r4, #0x4] ldr r0, [r0, #0xc] bl Save_VarsFlags_Get - bl sub_0205ED3C + bl Save_VarsFlags_CheckHaveFollower cmp r0, #0x1 bne _02063C6A mov r0, #0x3 @@ -440,7 +440,7 @@ sub_02063C70: ; 0x02063C70 add r5, r0, #0x0 ldr r0, [r5, #0x0] add r6, r1, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 @@ -465,7 +465,7 @@ sub_02063CA4: ; 0x02063CA4 push {r3-r6, lr} sub sp, #0x4 add r5, r0, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 bl TaskManager_GetFieldSystem @@ -473,7 +473,7 @@ sub_02063CA4: ; 0x02063CA4 ldr r1, _02063CDC ; =0x0000271C add r0, r5, #0x0 mov r2, #0x0 - bl sub_02038D10 + bl StartScriptFromMenu mov r2, #0x0 str r2, [sp, #0x0] ldrh r1, [r4, #0xc] @@ -526,7 +526,7 @@ sub_02063D18: ; 0x02063D18 add r5, r0, #0x0 ldr r0, [r5, #0x0] add r6, r1, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 @@ -551,7 +551,7 @@ sub_02063D4C: ; 0x02063D4C push {r3-r6, lr} sub sp, #0x4 add r5, r0, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 bl TaskManager_GetFieldSystem @@ -559,7 +559,7 @@ sub_02063D4C: ; 0x02063D4C ldr r1, _02063D84 ; =0x0000271A ldr r2, [r4, #0x4] add r0, r5, #0x0 - bl sub_02038D10 + bl StartScriptFromMenu mov r2, #0x0 str r2, [sp, #0x0] ldrh r1, [r4, #0xc] @@ -612,7 +612,7 @@ sub_02063DC0: ; 0x02063DC0 add r5, r0, #0x0 ldr r0, [r5, #0x0] add r6, r1, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 @@ -637,7 +637,7 @@ sub_02063DF4: ; 0x02063DF4 push {r3-r6, lr} sub sp, #0x4 add r5, r0, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 bl TaskManager_GetFieldSystem @@ -645,7 +645,7 @@ sub_02063DF4: ; 0x02063DF4 ldr r1, _02063E2C ; =0x0000271E add r0, r5, #0x0 mov r2, #0x0 - bl sub_02038D10 + bl StartScriptFromMenu mov r2, #0x0 str r2, [sp, #0x0] ldrh r1, [r4, #0xc] @@ -698,7 +698,7 @@ sub_02063E68: ; 0x02063E68 add r5, r0, #0x0 ldr r0, [r5, #0x0] add r6, r1, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 @@ -723,7 +723,7 @@ sub_02063E9C: ; 0x02063E9C push {r3-r6, lr} sub sp, #0x4 add r5, r0, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 bl TaskManager_GetFieldSystem @@ -731,7 +731,7 @@ sub_02063E9C: ; 0x02063E9C ldr r1, _02063ED4 ; =0x00002719 ldr r2, [r4, #0x4] add r0, r5, #0x0 - bl sub_02038D10 + bl StartScriptFromMenu mov r2, #0x0 str r2, [sp, #0x0] ldrh r1, [r4, #0xc] @@ -784,7 +784,7 @@ sub_02063F10: ; 0x02063F10 add r5, r0, #0x0 ldr r0, [r5, #0x0] add r6, r1, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 @@ -809,7 +809,7 @@ sub_02063F44: ; 0x02063F44 push {r3-r6, lr} sub sp, #0x4 add r5, r0, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 bl TaskManager_GetFieldSystem @@ -817,7 +817,7 @@ sub_02063F44: ; 0x02063F44 ldr r1, _02063F7C ; =0x0000271D add r0, r5, #0x0 mov r2, #0x0 - bl sub_02038D10 + bl StartScriptFromMenu mov r2, #0x0 str r2, [sp, #0x0] ldrh r1, [r4, #0xc] @@ -863,7 +863,7 @@ _02063FB2: ldr r0, [r4, #0x4] ldr r0, [r0, #0xc] bl Save_VarsFlags_Get - bl sub_0205ED3C + bl Save_VarsFlags_CheckHaveFollower cmp r0, #0x1 bne _02063FC6 mov r0, #0x3 @@ -879,7 +879,7 @@ sub_02063FCC: ; 0x02063FCC add r5, r0, #0x0 ldr r0, [r5, #0x0] add r6, r1, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 @@ -904,7 +904,7 @@ sub_02064000: ; 0x02064000 push {r3-r6, lr} sub sp, #0x4 add r5, r0, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 bl TaskManager_GetFieldSystem @@ -912,7 +912,7 @@ sub_02064000: ; 0x02064000 ldr r1, _02064038 ; =0x0000271B add r0, r5, #0x0 mov r2, #0x0 - bl sub_02038D10 + bl StartScriptFromMenu mov r2, #0x0 str r2, [sp, #0x0] ldrh r1, [r4, #0xc] @@ -954,7 +954,7 @@ sub_0206405C: ; 0x0206405C add r5, r0, #0x0 ldr r0, [r5, #0x0] add r6, r1, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 @@ -979,7 +979,7 @@ sub_02064090: ; 0x02064090 push {r3-r6, lr} sub sp, #0x4 add r5, r0, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 bl TaskManager_GetFieldSystem @@ -987,7 +987,7 @@ sub_02064090: ; 0x02064090 ldr r1, _020640C8 ; =0x0000271F add r0, r5, #0x0 mov r2, #0x0 - bl sub_02038D10 + bl StartScriptFromMenu mov r2, #0x0 str r2, [sp, #0x0] ldrh r1, [r4, #0xc] @@ -1024,7 +1024,7 @@ _020640EC: ldr r0, [r4, #0x4] ldr r0, [r0, #0xc] bl Save_VarsFlags_Get - bl sub_0205ED3C + bl Save_VarsFlags_CheckHaveFollower cmp r0, #0x1 bne _02064100 mov r0, #0x3 @@ -1033,7 +1033,7 @@ _02064100: ldr r0, [r4, #0x4] ldr r0, [r0, #0xc] bl Save_VarsFlags_Get - bl sub_0205F214 + bl Save_VarsFlags_CheckSafariSysFlag cmp r0, #0x1 beq _02064120 ldr r0, [r4, #0x4] @@ -1065,7 +1065,7 @@ sub_02064134: ; 0x02064134 bl TaskManager_GetFieldSystem add r6, r0, #0x0 ldr r0, [r5, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r6, #0x0 bl sub_0204649C @@ -1094,7 +1094,7 @@ sub_02064174: ; 0x02064174 bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r1, [r4, #0x0] add r0, r6, #0x0 @@ -1106,7 +1106,7 @@ sub_02064174: ; 0x02064174 ldr r1, _020641A8 ; =ov06_0224CB54 add r0, r5, #0x0 add r2, r6, #0x0 - bl sub_020463EC + bl TaskManager_Jump mov r0, #0x0 pop {r4-r6, pc} nop @@ -1139,7 +1139,7 @@ _020641D6: ldr r0, [r4, #0x4] ldr r0, [r0, #0xc] bl Save_VarsFlags_Get - bl sub_0205ED3C + bl Save_VarsFlags_CheckHaveFollower cmp r0, #0x1 bne _020641EA mov r0, #0x3 @@ -1157,7 +1157,7 @@ sub_020641F0: ; 0x020641F0 bl TaskManager_GetFieldSystem add r6, r0, #0x0 ldr r0, [r5, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r6, #0x0 bl sub_0204649C @@ -1186,7 +1186,7 @@ sub_02064230: ; 0x02064230 bl TaskManager_GetFieldSystem add r4, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r6, r0, #0x0 ldr r1, [r6, #0x0] add r0, r4, #0x0 @@ -1210,7 +1210,7 @@ sub_02064230: ; 0x02064230 ldr r1, _02064280 ; =ov06_0224CAAC add r0, r5, #0x0 add r2, r7, #0x0 - bl sub_020463EC + bl TaskManager_Jump mov r0, #0x0 pop {r3-r7, pc} nop @@ -1253,7 +1253,7 @@ sub_020642B4: ; 0x020642B4 bl TaskManager_GetFieldSystem add r5, r0, #0x0 ldr r0, [r6, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment ldrh r1, [r6, #0x4] add r4, r0, #0x0 ldr r2, [r5, #0xc] @@ -1311,7 +1311,7 @@ sub_02064324: ; 0x02064324 bl TaskManager_GetFieldSystem add r7, r0, #0x0 ldr r0, [r5, #0x0] - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 @@ -1336,7 +1336,7 @@ sub_02064360: ; 0x02064360 push {r3-r6, lr} sub sp, #0x4 add r5, r0, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r5, #0x0 bl TaskManager_GetFieldSystem @@ -1344,7 +1344,7 @@ sub_02064360: ; 0x02064360 ldr r1, _02064398 ; =0x000022C4 add r0, r5, #0x0 mov r2, #0x0 - bl sub_02038D10 + bl StartScriptFromMenu mov r2, #0x0 str r2, [sp, #0x0] ldrh r1, [r4, #0xc] diff --git a/arm9/asm/unk_020647A4.s b/arm9/asm/unk_020647A4.s index 6d2da7a86..7512ae97f 100644 --- a/arm9/asm/unk_020647A4.s +++ b/arm9/asm/unk_020647A4.s @@ -422,7 +422,7 @@ sub_02064A70: ; 0x02064A70 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r1, [r4, #0x0] cmp r1, #0x3 @@ -546,7 +546,7 @@ sub_02064B70: ; 0x02064B70 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r1, [r4, #0x0] cmp r1, #0x3 diff --git a/arm9/asm/unk_02064E90.s b/arm9/asm/unk_02064E90.s index e3143bb0b..41b7a2248 100644 --- a/arm9/asm/unk_02064E90.s +++ b/arm9/asm/unk_02064E90.s @@ -609,7 +609,7 @@ sub_02065370: ; 0x02065370 bl TaskManager_GetFieldSystem add r4, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0x0 ldr r0, [r5, #0x0] cmp r0, #0xa @@ -650,7 +650,7 @@ _020653BA: b _020653E2 _020653C8: add r0, r4, #0x0 - bl sub_0204647C + bl FieldSystem_ApplicationIsRunning cmp r0, #0x0 bne _020653E2 ldr r0, [r4, #0x78] diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index d1289cc2b..b61411d32 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -1808,7 +1808,7 @@ sub_020661F8: ; 0x020661F8 lsl r0, r0, #0x2 ldr r0, [r5, r0] bl FieldSystem_GetSaveDataPtr - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r1, r7, #0x0 bl GetPartyMonByIndex add r2, r0, #0x0 @@ -2377,7 +2377,7 @@ _02066676: lsl r0, r0, #0x2 ldr r0, [r5, r0] bl FieldSystem_GetSaveDataPtr - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [r4, #0x0] mov r0, #0x5b lsl r0, r0, #0x2 @@ -2434,7 +2434,7 @@ _02066708: mov r0, #0x5b lsl r0, r0, #0x2 ldr r0, [r5, r0] - bl sub_0204647C + bl FieldSystem_ApplicationIsRunning cmp r0, #0x0 bne _0206671E mov r0, #0x0 @@ -2495,7 +2495,7 @@ _0206677A: mov r0, #0x5b lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl sub_0204647C + bl FieldSystem_ApplicationIsRunning cmp r0, #0x0 bne _020667D0 mov r0, #0x6a @@ -2544,7 +2544,7 @@ sub_020667D4: ; 0x020667D4 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r4, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r1, [r4, #0x4] cmp r1, #0x0 diff --git a/arm9/asm/unk_0206BF90.s b/arm9/asm/unk_0206BF90.s index 044700f63..d3bb2805e 100644 --- a/arm9/asm/unk_0206BF90.s +++ b/arm9/asm/unk_0206BF90.s @@ -514,7 +514,7 @@ _0206C2E8: add r4, #0x20 ldr r0, [r0, #0x4] add r1, r4, #0x0 - bl CopyPlayerParty + bl CopyParty mov r0, #0x1 pop {r4, pc} @@ -788,7 +788,7 @@ _0206C4DA: add r5, #0x20 ldr r0, [r0, #0x4] add r1, r5, #0x0 - bl CopyPlayerParty + bl CopyParty mov r0, #0x1 pop {r3-r5, pc} .balign 4 diff --git a/arm9/asm/unk_0206F1F0.s b/arm9/asm/unk_0206F1F0.s index 117e57c75..8feb23501 100644 --- a/arm9/asm/unk_0206F1F0.s +++ b/arm9/asm/unk_0206F1F0.s @@ -16,7 +16,7 @@ sub_0206F1F0: ; 0x0206F1F0 bl TaskManager_GetFieldSystem add r5, r0, #0x0 add r0, r6, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x4] cmp r0, #0xb diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s index c0a2d8df9..067c3e25f 100644 --- a/arm9/asm/unk_02080C38.s +++ b/arm9/asm/unk_02080C38.s @@ -68,7 +68,7 @@ sub_02080C60: ; 0x02080C60 bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x4] cmp r0, #0xe @@ -106,7 +106,7 @@ _02080CA6: b _02080DF2 _02080CB4: ldr r0, [r6, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get mov r1, #0x0 bl GetPartyMonByIndex add r7, r0, #0x0 @@ -240,7 +240,7 @@ _02080DCE: b _02080DF2 _02080DD4: add r0, r5, #0x0 - bl sub_0204AF84 + bl CallTask_RestoreOverworld ldr r0, [r4, #0x4] add r0, r0, #0x1 str r0, [r4, #0x4] @@ -308,7 +308,7 @@ sub_02080E5C: ; 0x02080E5C add r5, r0, #0x0 bl TaskManager_GetFieldSystem add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x4] cmp r0, #0xd @@ -491,7 +491,7 @@ _02080FBA: b _02080FDC _02080FC0: add r0, r5, #0x0 - bl sub_0204AF84 + bl CallTask_RestoreOverworld ldr r0, [r4, #0x4] add r0, r0, #0x1 str r0, [r4, #0x4] @@ -523,7 +523,7 @@ sub_02081000: ; 0x02081000 add r5, r0, #0x0 bl TaskManager_GetFieldSystem add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, [r4, #0x4] cmp r0, #0x9 @@ -741,7 +741,7 @@ _0208117E: b _020811B4 _02081196: add r0, r5, #0x0 - bl sub_0204AF84 + bl CallTask_RestoreOverworld ldr r0, [r4, #0x4] add r0, r0, #0x1 str r0, [r4, #0x4] diff --git a/arm9/asm/unk_020859C0.s b/arm9/asm/unk_020859C0.s index 970da73af..b98db5169 100644 --- a/arm9/asm/unk_020859C0.s +++ b/arm9/asm/unk_020859C0.s @@ -627,7 +627,7 @@ sub_02085DA4: ; 0x02085DA4 push {r4-r7, lr} sub sp, #0xc add r5, r0, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r6, r0, #0x0 add r0, r5, #0x0 ldr r7, [r6, #0x8] @@ -662,7 +662,7 @@ _02085DDC: mov r1, #0x0 bl sub_02085D8C ldr r0, [r6, #0x10] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [r7, #0x1c] bl GetPartyCount mov r4, #0x0 @@ -799,7 +799,7 @@ _02085F0E: b _02085F38 _02085F14: add r0, r5, #0x0 - bl sub_0204AF84 + bl CallTask_RestoreOverworld mov r0, #0x6 str r0, [r6, #0x14] b _02085F38 diff --git a/arm9/asm/unk_02086084.s b/arm9/asm/unk_02086084.s index e533c7711..0d38a5f88 100644 --- a/arm9/asm/unk_02086084.s +++ b/arm9/asm/unk_02086084.s @@ -229,7 +229,7 @@ sub_02086280: ; 0x02086280 push {r4-r7, lr} sub sp, #0xc add r5, r0, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r1, [r4, #0x0] cmp r1, #0x6 @@ -369,7 +369,7 @@ _020863A8: b _020863CE _020863B6: add r0, r5, #0x0 - bl sub_0204AF84 + bl CallTask_RestoreOverworld ldr r0, [r4, #0x0] add r0, r0, #0x1 str r0, [r4, #0x0] diff --git a/arm9/asm/unk_02087D00.s b/arm9/asm/unk_02087D00.s index b3ef8d230..86b4836bc 100644 --- a/arm9/asm/unk_02087D00.s +++ b/arm9/asm/unk_02087D00.s @@ -63,7 +63,7 @@ sub_02087D00: ; 0x02087D00 bl Save_PlayerData_GetProfileAddr str r0, [r7, #0xc] add r0, r4, #0x0 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [r7, #0x10] add r0, r4, #0x0 bl Save_Bag_Get diff --git a/arm9/asm/unk_0208A258.s b/arm9/asm/unk_0208A258.s index e02110f4d..48df85f3e 100644 --- a/arm9/asm/unk_0208A258.s +++ b/arm9/asm/unk_0208A258.s @@ -10,7 +10,7 @@ sub_0208A258: ; 0x0208A258 bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r0, _0208A290 ; =0x0000022F ldrb r0, [r4, r0] @@ -40,7 +40,7 @@ sub_0208A294: ; 0x0208A294 push {r3-r5, lr} add r5, r0, #0x0 add r4, r1, #0x0 - bl sub_0204647C + bl FieldSystem_ApplicationIsRunning cmp r0, #0x0 beq _0208A2A6 mov r0, #0x10 @@ -66,7 +66,7 @@ sub_0208A2C4: ; 0x0208A2C4 bl TaskManager_GetFieldSystem add r6, r0, #0x0 add r0, r5, #0x0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 add r0, r6, #0x0 bl sub_020464A4 @@ -77,7 +77,7 @@ sub_0208A2C4: ; 0x0208A2C4 ldr r1, _0208A2F8 ; =0x0223D4AD add r0, r5, #0x0 add r2, r4, #0x0 - bl sub_020463EC + bl TaskManager_Jump ldr r0, _0208A2FC ; =0x0000022F mov r1, #0x12 strb r1, [r4, r0] diff --git a/arm9/asm/unk_0208A338.s b/arm9/asm/unk_0208A338.s index ceab86eba..c7ea6396f 100644 --- a/arm9/asm/unk_0208A338.s +++ b/arm9/asm/unk_0208A338.s @@ -133,7 +133,7 @@ _0208A456: thumb_func_start sub_0208A458 sub_0208A458: ; 0x0208A458 push {r3-r5, lr} - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0x0 ldr r1, [r4, #0x54] cmp r1, #0xd @@ -293,7 +293,7 @@ _0208A57A: b _0208A6C8 _0208A5A6: ldr r0, [r4, #0x0] - bl sub_0204647C + bl FieldSystem_ApplicationIsRunning cmp r0, #0x0 beq _0208A5B2 _0208A5B0: diff --git a/arm9/global.inc b/arm9/global.inc index 10ca26088..52cc038ff 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -1427,7 +1427,7 @@ .extern sub_02022450 .extern Reset_To_File .extern Save_SafariZone_Get -.extern GetStoragePCPointer +.extern Save_PCStorage_Get .extern sub_0202251C .extern sub_02022528 .extern LoadHallOfFame @@ -2673,8 +2673,8 @@ .extern sub_02038B6C .extern sub_02038C78 .extern sub_02038CA8 -.extern sub_02038CD8 -.extern sub_02038D10 +.extern QueueScript +.extern StartScriptFromMenu .extern CreateScriptContext .extern FieldSysGetAttrAddr .extern sub_02039460 @@ -3428,18 +3428,18 @@ .extern ClearFlagInArray .extern GetFlagAddr .extern GetVarAddr -.extern sub_020463CC -.extern sub_020463EC +.extern FieldSystem_CreateTask +.extern TaskManager_Jump .extern TaskManager_Call .extern sub_02046420 .extern sub_0204646C -.extern sub_0204647C +.extern FieldSystem_ApplicationIsRunning .extern sub_0204649C .extern sub_020464A4 .extern sub_02046500 .extern TaskManager_GetFieldSystem -.extern sub_0204652C -.extern sub_02046530 +.extern TaskManager_GetEnvironment +.extern TaskManager_GetStatePtr .extern sub_02046534 .extern sub_02046948 .extern sub_020469B8 @@ -3449,28 +3449,28 @@ .extern sub_02046F70 .extern SetupAndStartFirstBattle .extern SetupAndStartTutorialBattle -.extern sub_020470E8 +.extern SetupAndStartTrainerBattle .extern sub_02047174 .extern sub_020471C0 .extern sub_0204726C .extern sub_020472B0 .extern sub_020475A0 .extern sub_020475B0 -.extern sub_020476CC +.extern BattleSetup_New .extern sub_020477EC .extern sub_02047800 .extern sub_02047814 -.extern sub_02047964 +.extern BattleSetup_Delete .extern sub_020479FC .extern sub_02047A78 -.extern sub_02047BB0 +.extern BattleSetup_InitFromFieldSystem .extern sub_02047BC0 .extern sub_02047D48 .extern sub_02047F1C .extern sub_02047F38 .extern sub_02047FA4 .extern sub_020480AC -.extern sub_020480B8 +.extern IsBattleResultWin .extern sub_020480C8 .extern sub_020480D8 .extern sub_020480E4 @@ -3539,9 +3539,9 @@ .extern sub_0204AE5C .extern sub_0204AEF8 .extern sub_0204AF3C -.extern sub_0204AF84 -.extern sub_0204AFC8 -.extern sub_0204B00C +.extern CallTask_RestoreOverworld +.extern CallTask_FadeToBlack +.extern CallTask_FadeFromBlack .extern sub_0204B090 .extern sub_0204B0E8 .extern sub_0204B0F8 @@ -4076,8 +4076,8 @@ .extern sub_02058750 .extern sub_02058768 .extern sub_02058774 -.extern sub_02058780 -.extern sub_020587B0 +.extern MapObjectManager_PauseAllMovement +.extern MapObjectManager_UnpauseAllMovement .extern sub_020587E0 .extern sub_020587F4 .extern sub_02058804 @@ -4535,7 +4535,7 @@ .extern sub_0205ED0C .extern sub_0205ED1C .extern sub_0205ED2C -.extern sub_0205ED3C +.extern Save_VarsFlags_CheckHaveFollower .extern sub_0205ED4C .extern sub_0205ED5C .extern sub_0205ED6C @@ -4564,7 +4564,7 @@ .extern sub_0205F1E4 .extern Save_VarsFlags_SetSafariSysFlag .extern Save_VarsFlags_ClearSafariSysFlag -.extern sub_0205F214 +.extern Save_VarsFlags_CheckSafariSysFlag .extern sub_0205F224 .extern sub_0205F234 .extern sub_0205F244 @@ -4888,9 +4888,9 @@ .extern GetPartyMonByIndex .extern ReplacePartySlotWithMon .extern SwapSlotsInParty -.extern CopyPlayerParty +.extern CopyParty .extern PartyHasMon -.extern SaveArray_PlayerParty_Get +.extern SaveArray_Party_Get .extern SaveArray_IsNatDexEnabled .extern Pokedex_IsNatDexEnabled .extern sub_0206BB48 diff --git a/arm9/overlays/05/asm/ov05_021D80E8.s b/arm9/overlays/05/asm/ov05_021D80E8.s index 52e3f2f8d..1d51c37cf 100644 --- a/arm9/overlays/05/asm/ov05_021D80E8.s +++ b/arm9/overlays/05/asm/ov05_021D80E8.s @@ -221,7 +221,7 @@ ov05_021D825C: ; 0x021D825C _021D827C: ldr r0, [r4, #0xc] bl Save_VarsFlags_Get - bl sub_0205ED3C + bl Save_VarsFlags_CheckHaveFollower cmp r0, #0 bne _021D8290 add sp, #0x10 @@ -318,12 +318,12 @@ _021D8342: lsr r0, r0, #0x1f bne _021D8384 ldr r0, [r4, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get bl HasEnoughAlivePokemonForDoubleBattle add r6, r0, #0 ldr r0, [r4, #0xc] bl Save_VarsFlags_Get - bl sub_0205ED3C + bl Save_VarsFlags_CheckHaveFollower cmp r0, #1 bne _021D8366 mov r6, #1 @@ -336,7 +336,7 @@ _021D8366: ldr r0, [r4, #0x38] bl sub_02055B14 ldr r0, [r4, #0x34] - bl sub_02058780 + bl MapObjectManager_PauseAllMovement add sp, #8 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -385,7 +385,7 @@ _021D83C2: orr r6, r0 _021D83E4: ldr r0, [r4, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get mov r1, #0x7f bl GetIdxOfFirstPartyMonWithMove cmp r0, #0xff @@ -1471,7 +1471,7 @@ _021D8C88: cmp r0, #0 beq _021D8CE0 ldr r0, [r5, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get mov r1, #0x39 bl GetIdxOfFirstPartyMonWithMove cmp r0, #0xff @@ -1762,7 +1762,7 @@ ov05_021D8F38: ; 0x021D8F38 push {r3, r4, r5, lr} add r4, r0, #0 ldr r0, [r4, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r5, r0, #0 ldr r0, [r4, #0xc] bl Save_Daycare_Get @@ -1842,7 +1842,7 @@ ov05_021D8FD0: ; 0x021D8FD0 push {r3, r4, r5, r6, r7, lr} add r4, r0, #0 ldr r0, [r4, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r6, r0, #0 ldr r0, [r4, #0x1c] ldr r0, [r0] @@ -1874,7 +1874,7 @@ ov05_021D9010: ; 0x021D9010 push {r3, r4, r5, lr} add r5, r0, #0 ldr r0, [r5, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r4, r0, #0 ldr r0, [r5, #0xc] bl Save_LocalFieldData_Get @@ -1938,7 +1938,7 @@ ov05_021D9090: ; 0x021D9090 add r4, r0, #0 ldr r0, [r4, #0xc] bl Save_VarsFlags_Get - bl sub_0205F214 + bl Save_VarsFlags_CheckSafariSysFlag cmp r0, #0 bne _021D90A6 mov r0, #0 diff --git a/arm9/overlays/05/asm/ov05_021DA5B8.s b/arm9/overlays/05/asm/ov05_021DA5B8.s index 39a28b8ce..7cc5f983b 100644 --- a/arm9/overlays/05/asm/ov05_021DA5B8.s +++ b/arm9/overlays/05/asm/ov05_021DA5B8.s @@ -1072,7 +1072,7 @@ ov05_021DAE14: ; 0x021DAE14 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldrb r1, [r4] ldr r0, [r5, #0x50] @@ -1351,7 +1351,7 @@ ov05_021DB040: ; 0x021DB040 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4] cmp r0, #3 @@ -1472,7 +1472,7 @@ ov05_021DB144: ; 0x021DB144 bl TaskManager_GetFieldSystem add r4, r0, #0 add r0, r5, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0 ldr r0, [r5] cmp r0, #0 @@ -1539,7 +1539,7 @@ ov05_021DB1D0: ; 0x021DB1D0 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r5, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4] cmp r0, #0 @@ -1602,7 +1602,7 @@ ov05_021DB250: ; 0x021DB250 bl TaskManager_GetFieldSystem add r5, r0, #0 ldr r0, [sp, #0x10] - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4] cmp r0, #3 @@ -1753,7 +1753,7 @@ ov05_021DB380: ; 0x021DB380 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r7, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4] cmp r0, #3 diff --git a/arm9/overlays/05/asm/ov05_021E1374.s b/arm9/overlays/05/asm/ov05_021E1374.s index 322383361..2ce753451 100644 --- a/arm9/overlays/05/asm/ov05_021E1374.s +++ b/arm9/overlays/05/asm/ov05_021E1374.s @@ -45,7 +45,7 @@ _021E13C0: .word ov05_021E13C4 ov05_021E13C4: ; 0x021E13C4 push {r3, r4, r5, lr} sub sp, #8 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r1, [r4] cmp r1, #8 diff --git a/arm9/overlays/05/asm/ov05_021E3340.s b/arm9/overlays/05/asm/ov05_021E3340.s index e93032ce8..17ca377f6 100644 --- a/arm9/overlays/05/asm/ov05_021E3340.s +++ b/arm9/overlays/05/asm/ov05_021E3340.s @@ -11,7 +11,7 @@ ov05_021E3340: ; 0x021E3340 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4] cmp r0, #4 diff --git a/arm9/overlays/05/asm/ov05_021E5FD8.s b/arm9/overlays/05/asm/ov05_021E5FD8.s index b25da04ee..5468b1046 100644 --- a/arm9/overlays/05/asm/ov05_021E5FD8.s +++ b/arm9/overlays/05/asm/ov05_021E5FD8.s @@ -425,7 +425,7 @@ ov05_021E6304: ; 0x021E6304 ldr r1, _021E6328 ; =ov05_021E632C add r0, r4, #0 str r6, [r2, #0xc] - bl sub_020463CC + bl FieldSystem_CreateTask pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 _021E6328: .word ov05_021E632C @@ -433,7 +433,7 @@ _021E6328: .word ov05_021E632C thumb_func_start ov05_021E632C ov05_021E632C: ; 0x021E632C push {r4, r5, r6, lr} - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4, #0xc] bl PlayerAvatar_GetMapObject @@ -596,7 +596,7 @@ _021E647E: thumb_func_start ov05_021E6484 ov05_021E6484: ; 0x021E6484 push {r3, r4, r5, r6, r7, lr} - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4] cmp r0, #7 @@ -830,7 +830,7 @@ _021E6666: ldr r1, _021E6674 ; =ov05_021E6678 add r0, r5, #0 add r2, r4, #0 - bl sub_020463CC + bl FieldSystem_CreateTask pop {r3, r4, r5, r6, r7, pc} nop _021E6674: .word ov05_021E6678 @@ -838,7 +838,7 @@ _021E6674: .word ov05_021E6678 thumb_func_start ov05_021E6678 ov05_021E6678: ; 0x021E6678 push {r4, lr} - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4] cmp r0, #0 @@ -986,7 +986,7 @@ ov05_021E67A0: ; 0x021E67A0 ldr r1, _021E67BC ; =ov05_021E67C0 add r0, r5, #0 str r4, [r2, #0xc] - bl sub_020463CC + bl FieldSystem_CreateTask pop {r3, r4, r5, pc} .balign 4, 0 _021E67BC: .word ov05_021E67C0 @@ -996,7 +996,7 @@ ov05_021E67C0: ; 0x021E67C0 push {r4, r5, r6, r7, lr} sub sp, #0xc add r6, r0, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4, #0xc] bl PlayerAvatar_GetMapObject @@ -1273,7 +1273,7 @@ _021E69F6: thumb_func_start ov05_021E69FC ov05_021E69FC: ; 0x021E69FC push {r4, r5, r6, lr} - bl sub_0204652C + bl TaskManager_GetEnvironment ldr r6, _021E6A24 ; =ov05_021F7714 add r5, r0, #0 _021E6A06: @@ -1527,7 +1527,7 @@ ov05_021E6BD8: ; 0x021E6BD8 add r2, r0, #0 ldr r1, _021E6BF0 ; =ov05_021E6C30 add r0, r4, #0 - bl sub_020463CC + bl FieldSystem_CreateTask pop {r4, pc} nop _021E6BF0: .word ov05_021E6C30 @@ -1563,7 +1563,7 @@ _021E6C2C: .word ov05_021E6C30 thumb_func_start ov05_021E6C30 ov05_021E6C30: ; 0x021E6C30 push {r4, r5, r6, lr} - bl sub_0204652C + bl TaskManager_GetEnvironment ldr r6, _021E6C70 ; =ov05_021F7700 ldr r4, _021E6C74 ; =ov05_021F76EC add r5, r0, #0 @@ -2112,7 +2112,7 @@ _021E7068: .word ov05_021E706C thumb_func_start ov05_021E706C ov05_021E706C: ; 0x021E706C push {r4, lr} - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4, #0xc] cmp r0, #0 @@ -2421,7 +2421,7 @@ ov05_021E72E8: ; 0x021E72E8 push {r4, lr} ldr r0, [r0, #0xc] add r4, r1, #0 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r1, r4, #0 bl GetPartyMonByIndex pop {r4, pc} diff --git a/arm9/overlays/05/asm/ov05_021EFBF8.s b/arm9/overlays/05/asm/ov05_021EFBF8.s index e8556ee21..69191de91 100644 --- a/arm9/overlays/05/asm/ov05_021EFBF8.s +++ b/arm9/overlays/05/asm/ov05_021EFBF8.s @@ -653,7 +653,7 @@ _021F0122: ov05_021F0128: ; 0x021F0128 push {r3, r4, r5, lr} add r5, r0, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment thumb_func_start ov05_021F0130 ov05_021F0130: ; 0x021F0130 @@ -870,7 +870,7 @@ ov05_021F02C4: ; 0x021F02C4 ldr r1, _021F0300 ; =ov05_021F0128 add r0, r6, #0 add r2, r4, #0 - bl sub_020463CC + bl FieldSystem_CreateTask pop {r4, r5, r6, pc} _021F02F2: ldr r1, _021F0300 ; =ov05_021F0128 diff --git a/arm9/overlays/05/asm/ov05_021F38CC.s b/arm9/overlays/05/asm/ov05_021F38CC.s index ec89ff57a..2d2528871 100644 --- a/arm9/overlays/05/asm/ov05_021F38CC.s +++ b/arm9/overlays/05/asm/ov05_021F38CC.s @@ -168,7 +168,7 @@ Field_CheckPokemonSizeRecord: ; 0x021F3A18 add r4, r0, #0 ldr r0, [r4, #0xc] add r5, r1, #0 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r1, r5, #0 bl GetPartyMonByIndex mov r1, #5 @@ -237,7 +237,7 @@ Field_SetPokemonSizeRecord: ; 0x021F3AB4 add r4, r0, #0 ldr r0, [r4, #0xc] add r5, r1, #0 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r1, r5, #0 bl GetPartyMonByIndex bl ov05_021F38CC @@ -333,7 +333,7 @@ Field_BufferPartyPokemonSize: ; 0x021F3B7C ldr r0, [r5, #0xc] add r4, r3, #0 add r7, r1, #0 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r1, r4, #0 bl GetPartyMonByIndex mov r1, #5 diff --git a/arm9/overlays/05/asm/ov05_021F5518.s b/arm9/overlays/05/asm/ov05_021F5518.s index b05fcde8c..5999288d4 100644 --- a/arm9/overlays/05/asm/ov05_021F5518.s +++ b/arm9/overlays/05/asm/ov05_021F5518.s @@ -395,7 +395,7 @@ ov05_021F57F0: ; 0x021F57F0 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r6, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldrh r1, [r4, #8] cmp r1, #9 @@ -557,7 +557,7 @@ _021F5936: ldr r1, _021F5988 ; =0x000007ED add r0, r6, #0 add r3, r2, #0 - bl sub_02038CD8 + bl QueueScript mov r0, #9 strh r0, [r4, #8] b _021F5980 @@ -566,7 +566,7 @@ _021F5956: ldr r1, _021F598C ; =0x000007EC add r0, r6, #0 add r3, r2, #0 - bl sub_02038CD8 + bl QueueScript mov r0, #9 strh r0, [r4, #8] b _021F5980 diff --git a/arm9/overlays/05/asm/ov05_021F5C44.s b/arm9/overlays/05/asm/ov05_021F5C44.s index 5ff455c73..7dd5fabf6 100644 --- a/arm9/overlays/05/asm/ov05_021F5C44.s +++ b/arm9/overlays/05/asm/ov05_021F5C44.s @@ -34,7 +34,7 @@ ov05_021F5C70: ; 0x021F5C70 bl TaskManager_GetFieldSystem add r4, r0, #0 add r0, r6, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0 ldr r0, [r5] cmp r0, #0 @@ -44,7 +44,7 @@ ov05_021F5C70: ; 0x021F5C70 b _021F5D28 _021F5C8E: ldr r0, [r4, #0x34] - bl sub_02058780 + bl MapObjectManager_PauseAllMovement mov r0, #0 str r0, [r5, #0x10] add r2, r5, #0 @@ -100,10 +100,10 @@ _021F5CBA: _021F5D10: cmp r0, #0 beq _021F5D18 - bl sub_02047964 + bl BattleSetup_Delete _021F5D18: ldr r0, [r4, #0x34] - bl sub_020587B0 + bl MapObjectManager_UnpauseAllMovement add r0, r5, #0 bl FreeToHeap mov r0, #1 diff --git a/arm9/overlays/05/asm/ov05_021F6360.s b/arm9/overlays/05/asm/ov05_021F6360.s index 2c918590a..abd04d0fd 100644 --- a/arm9/overlays/05/asm/ov05_021F6360.s +++ b/arm9/overlays/05/asm/ov05_021F6360.s @@ -10,10 +10,10 @@ ov05_021F6360: ; 0x021F6360 bl TaskManager_GetFieldSystem str r0, [sp] add r0, r7, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r6, r0, #0 add r0, r7, #0 - bl sub_02046530 + bl TaskManager_GetStatePtr add r4, r0, #0 ldr r0, [r4] ldr r5, [r6, #4] diff --git a/arm9/overlays/05/src/ov05_021E72FC.c b/arm9/overlays/05/src/ov05_021E72FC.c index 9f803b3e9..bc0a9ffed 100644 --- a/arm9/overlays/05/src/ov05_021E72FC.c +++ b/arm9/overlays/05/src/ov05_021E72FC.c @@ -4,14 +4,14 @@ #include "heap.h" #include "unk_020051F4.h" -extern void sub_020463CC(u32 param0, void *func, UnkStruct021E7358 *param2); +extern void FieldSystem_CreateTask(u32 param0, void *func, UnkStruct021E7358 *param2); extern u32 PlayerAvatar_GetMapObject(u32 param0); extern u32 sub_02058720(u32 param0); extern BOOL sub_02054B30(u8 param0); extern BOOL sub_02054B3C(u8 param0); extern BOOL sub_02054B48(u8 param0); extern BOOL sub_02054B54(u8 param0); -extern UnkStruct021E7358 *sub_0204652C(UnkStruct021E7358 *param0); +extern UnkStruct021E7358 *TaskManager_GetEnvironment(UnkStruct021E7358 *param0); extern void sub_02058410(u32 param0, u32 param1); extern BOOL sub_02057254(u32 param0); extern u32 sub_0205AFDC(u32 param0, u32 param1); @@ -57,7 +57,7 @@ void ov05_021E7358(u32 param0, u32 param1, u32 param2) res->Unk10 = param1; res->Unk00 = param2; PlaySE(SEQ_SE_DP_F209); - sub_020463CC(param0, ov05_021E73B4, res); + FieldSystem_CreateTask(param0, ov05_021E73B4, res); } u32 ov05_021E7388(u32 param0) @@ -78,7 +78,7 @@ u32 ov05_021E7388(u32 param0) BOOL ov05_021E73B4(UnkStruct021E7358 *param0) { - UnkStruct021E7358 *strct = sub_0204652C(param0); + UnkStruct021E7358 *strct = TaskManager_GetEnvironment(param0); u32 res = PlayerAvatar_GetMapObject(strct->Unk10); u8 res2 = (u8)sub_02058720(res); switch (strct->Unk08) diff --git a/arm9/overlays/06/asm/overlay_06.s b/arm9/overlays/06/asm/overlay_06.s index 0914885ab..7fdca3e51 100644 --- a/arm9/overlays/06/asm/overlay_06.s +++ b/arm9/overlays/06/asm/overlay_06.s @@ -329,7 +329,7 @@ ov06_022398FC: ; 0x022398FC add r4, r0, #0 bl TaskManager_GetFieldSystem add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4, #0xc] cmp r0, #0 @@ -429,7 +429,7 @@ ov06_022399C8: ; 0x022399C8 add r4, r0, #0 bl TaskManager_GetFieldSystem add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4, #0xc] cmp r0, #7 @@ -4844,7 +4844,7 @@ ov06_0223BA04: ; 0x0223BA04 pop {r4, r5, r6, r7, pc} _0223BA42: ldr r0, [r5, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r7, r0, #0 add r0, r5, #0 bl sub_02034CE0 @@ -4943,7 +4943,7 @@ _0223BB0C: _0223BB18: ldr r0, [r5, #0xc] bl Save_VarsFlags_Get - bl sub_0205ED3C + bl Save_VarsFlags_CheckHaveFollower cmp r0, #0 beq _0223BB2C mov r0, #1 @@ -4976,10 +4976,10 @@ _0223BB30: mov r0, #0xb add r1, r0, #0 add r1, #0xf5 - bl sub_020476CC + bl BattleSetup_New str r0, [sp, #0x2c] add r1, r5, #0 - bl sub_02047BB0 + bl BattleSetup_InitFromFieldSystem ldr r0, [sp, #0x30] ldr r1, [sp, #0x28] ldr r2, [sp, #0x2c] @@ -5004,7 +5004,7 @@ _0223BB98: bne _0223BBB6 ldr r0, [r5, #0xc] bl Save_VarsFlags_Get - bl sub_0205F214 + bl Save_VarsFlags_CheckSafariSysFlag str r0, [sp, #0x18] ldr r1, [sp, #0x18] add r0, r5, #0 @@ -5014,12 +5014,12 @@ _0223BB98: _0223BBB6: mov r0, #0xb mov r1, #0x4a - bl sub_020476CC + bl BattleSetup_New str r0, [sp, #0x2c] _0223BBC0: ldr r0, [sp, #0x2c] add r1, r5, #0 - bl sub_02047BB0 + bl BattleSetup_InitFromFieldSystem add r0, sp, #0x24 ldrb r0, [r0, #1] cmp r0, #0 @@ -5135,7 +5135,7 @@ _0223BC90: _0223BCBC: bl GF_AssertFail ldr r0, [sp, #0x2c] - bl sub_02047964 + bl BattleSetup_Delete add sp, #0xb4 mov r0, #0 pop {r4, r5, r6, r7, pc} @@ -5166,7 +5166,7 @@ _0223BCFA: cmp r0, #0 bne _0223BD06 ldr r0, [sp, #0x2c] - bl sub_02047964 + bl BattleSetup_Delete _0223BD06: mov r0, #0 add r5, #0x74 @@ -5193,7 +5193,7 @@ ov06_0223BD14: ; 0x0223BD14 _0223BD2E: ldr r0, [sp, #8] ldr r0, [r0, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get mov r1, #0 bl GetPartyMonByIndex str r0, [sp, #0x14] @@ -5233,7 +5233,7 @@ _0223BD8A: ldr r0, [sp, #8] ldr r0, [r0, #0xc] bl Save_VarsFlags_Get - bl sub_0205F214 + bl Save_VarsFlags_CheckSafariSysFlag add r1, r0, #0 ldr r0, [sp, #8] ldr r2, [sp, #0x10] @@ -5241,7 +5241,7 @@ _0223BD8A: ldr r0, [sp, #0x10] ldr r1, [sp, #8] ldr r0, [r0] - bl sub_02047BB0 + bl BattleSetup_InitFromFieldSystem ldr r0, [sp, #0x10] ldr r0, [r0] bl sub_020480AC @@ -5370,7 +5370,7 @@ ov06_0223BE70: ; 0x0223BE70 pop {r4, r5, r6, r7, pc} _0223BEA4: ldr r0, [r5, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r6, r0, #0 add r0, r5, #0 bl sub_02034CE0 @@ -5395,7 +5395,7 @@ _0223BEA4: str r1, [r0, #0xc] ldr r0, [r5, #0xc] bl Save_VarsFlags_Get - bl sub_0205ED3C + bl Save_VarsFlags_CheckHaveFollower cmp r0, #0 beq _0223BEF0 mov r0, #1 @@ -5416,10 +5416,10 @@ _0223BEF4: mov r0, #0xb add r1, r0, #0 add r1, #0xf5 - bl sub_020476CC + bl BattleSetup_New str r0, [sp, #0x24] add r1, r5, #0 - bl sub_02047BB0 + bl BattleSetup_InitFromFieldSystem ldr r0, [sp, #0x28] ldr r1, [sp, #0x20] ldr r2, [sp, #0x24] @@ -5441,7 +5441,7 @@ _0223BF3C: bne _0223BF5A ldr r0, [r5, #0xc] bl Save_VarsFlags_Get - bl sub_0205F214 + bl Save_VarsFlags_CheckSafariSysFlag str r0, [sp, #0x14] ldr r1, [sp, #0x14] add r0, r5, #0 @@ -5451,12 +5451,12 @@ _0223BF3C: _0223BF5A: mov r0, #0xb mov r1, #0x4a - bl sub_020476CC + bl BattleSetup_New str r0, [sp, #0x24] _0223BF64: ldr r0, [sp, #0x24] add r1, r5, #0 - bl sub_02047BB0 + bl BattleSetup_InitFromFieldSystem add r0, sp, #0x1c ldrb r0, [r0] cmp r0, #0 @@ -5626,7 +5626,7 @@ ov06_0223C08C: ; 0x0223C08C pop {r4, r5, r6, r7, pc} _0223C0CE: ldr r0, [r5, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r6, r0, #0 add r0, r5, #0 bl sub_02034CE0 @@ -5697,7 +5697,7 @@ _0223C162: str r0, [sp, #0x48] ldr r0, [r5, #0xc] bl Save_VarsFlags_Get - bl sub_0205ED3C + bl Save_VarsFlags_CheckHaveFollower cmp r0, #0 beq _0223C184 mov r0, #1 @@ -5727,10 +5727,10 @@ _0223C188: mov r0, #0xb add r1, r0, #0 add r1, #0xf5 - bl sub_020476CC + bl BattleSetup_New str r0, [r4] add r1, r5, #0 - bl sub_02047BB0 + bl BattleSetup_InitFromFieldSystem ldr r0, [sp, #0x28] ldr r1, [sp, #0x24] ldr r2, [r4] @@ -5751,7 +5751,7 @@ _0223C1E0: bne _0223C1FE ldr r0, [r5, #0xc] bl Save_VarsFlags_Get - bl sub_0205F214 + bl Save_VarsFlags_CheckSafariSysFlag str r0, [sp, #0x18] ldr r1, [sp, #0x18] add r0, r5, #0 @@ -5761,12 +5761,12 @@ _0223C1E0: _0223C1FE: mov r0, #0xb mov r1, #0x4a - bl sub_020476CC + bl BattleSetup_New str r0, [r4] _0223C208: ldr r0, [r4] add r1, r5, #0 - bl sub_02047BB0 + bl BattleSetup_InitFromFieldSystem add r0, sp, #0x20 ldrb r0, [r0, #1] cmp r0, #0 @@ -5853,7 +5853,7 @@ _0223C2A2: _0223C2CC: bl GF_AssertFail ldr r0, [r4] - bl sub_02047964 + bl BattleSetup_Delete add sp, #0xac mov r0, #0 pop {r4, r5, r6, r7, pc} @@ -5879,7 +5879,7 @@ _0223C300: cmp r0, #0 bne _0223C30E ldr r0, [r4] - bl sub_02047964 + bl BattleSetup_Delete b _0223C314 _0223C30E: mov r0, #0 @@ -7181,7 +7181,7 @@ ov06_0223CCDC: ; 0x0223CCDC bl ov05_021F51D0 str r0, [sp, #8] ldr r0, [r5, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get mov r1, #0 bl GetPartyMonByIndex str r0, [sp, #0xc] @@ -7257,7 +7257,7 @@ ov06_0223CD7C: ; 0x0223CD7C ldr r0, [r5, #0xc] add r7, r1, #0 add r6, r3, #0 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get mov r1, #0 bl GetPartyMonByIndex add r4, r0, #0 @@ -7588,7 +7588,7 @@ ov06_0223CFD0: ; 0x0223CFD0 bne _0223CFE4 mov r0, #0xb mov r1, #0 - bl sub_020476CC + bl BattleSetup_New str r0, [r4] pop {r4, pc} _0223CFE4: @@ -8219,7 +8219,7 @@ ov06_0223D4AC: ; 0x0223D4AC bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r6, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment ldr r1, _0223D604 ; =0x0000022F add r4, r0, #0 ldrb r1, [r4, r1] @@ -11156,7 +11156,7 @@ ov06_0223ECF0: ; 0x0223ECF0 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r6, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 bl ov06_0223D7B8 ldr r0, [r5, #0xc] @@ -11177,7 +11177,7 @@ ov06_0223ECF0: ; 0x0223ECF0 ldr r1, _0223ED4C ; =sub_0208A258 add r0, r6, #0 add r2, r4, #0 - bl sub_020463EC + bl TaskManager_Jump ldr r0, _0223ED50 ; =0x0000022F mov r1, #0x10 strb r1, [r4, r0] @@ -15300,7 +15300,7 @@ ov06_02240F40: ; 0x02240F40 add r4, r0, #0 ldr r0, [r4, #0x10] ldr r0, [r0, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r1, r0, #0 ldr r0, [r4, #0x10] ldr r2, [r4, #0x6c] @@ -15380,7 +15380,7 @@ ov06_02240FEC: ; 0x02240FEC add r4, r0, #0 bl TaskManager_GetFieldSystem add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r1, [r4, #0x7c] cmp r1, #0xb @@ -15803,7 +15803,7 @@ ov06_02241348: ; 0x02241348 bl TaskManager_GetFieldSystem add r4, r0, #0 add r0, r5, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0 ldr r1, [r5] cmp r1, #3 @@ -15910,7 +15910,7 @@ ov06_02241428: ; 0x02241428 bl TaskManager_GetFieldSystem add r4, r0, #0 add r0, r5, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0 ldr r1, [r5] cmp r1, #5 @@ -16082,7 +16082,7 @@ ov06_0224158C: ; 0x0224158C bl TaskManager_GetFieldSystem add r4, r0, #0 add r0, r5, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0 ldr r1, [r5] cmp r1, #3 @@ -16538,7 +16538,7 @@ ov06_02241974: ; 0x02241974 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r1, [r4] cmp r1, #3 @@ -16637,7 +16637,7 @@ ov06_02241A44: ; 0x02241A44 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r1, [r4] cmp r1, #3 @@ -16897,7 +16897,7 @@ _02241C34: strb r1, [r0] ldr r0, [r5] ldr r1, _02241D70 ; =ov06_02241F7C - bl sub_020463CC + bl FieldSystem_CreateTask add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02241C64: @@ -16958,7 +16958,7 @@ _02241CB2: ldr r0, [r5] ldr r1, _02241D7C ; =ov06_022420CC ldr r2, [sp] - bl sub_020463CC + bl FieldSystem_CreateTask add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02241CDA: @@ -17028,7 +17028,7 @@ _02241D54: ldr r0, [r5] ldr r1, _02241D8C ; =ov06_02241E58 ldr r2, [sp] - bl sub_020463CC + bl FieldSystem_CreateTask add sp, #8 pop {r3, r4, r5, r6, r7, pc} nop @@ -17145,7 +17145,7 @@ ov06_02241E58: ; 0x02241E58 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment ldr r1, [r6, #4] add r4, r0, #0 ldr r5, [r1, #0x24] @@ -17285,7 +17285,7 @@ ov06_02241F7C: ; 0x02241F7C bl TaskManager_GetFieldSystem add r7, r0, #0 add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r7, #4] ldr r5, [r0, #0x24] @@ -17444,7 +17444,7 @@ ov06_022420CC: ; 0x022420CC bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r6, #4] ldr r5, [r0, #0x24] @@ -18047,7 +18047,7 @@ _022425A4: ldr r0, [r5] ldr r1, _022425C4 ; =ov06_02242744 ldr r2, [sp] - bl sub_020463CC + bl FieldSystem_CreateTask pop {r3, r4, r5, r6, r7, pc} nop _022425B8: .word ov06_0224F8BD @@ -18260,7 +18260,7 @@ ov06_02242744: ; 0x02242744 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r6, #4] ldr r5, [r0, #0x24] @@ -18743,7 +18743,7 @@ ov06_02242AEC: ; 0x02242AEC bl TaskManager_GetFieldSystem str r0, [sp, #8] add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment ldr r1, [sp, #8] str r0, [sp, #4] ldr r1, [r1, #4] @@ -19232,7 +19232,7 @@ _02242EB2: thumb_func_start ov06_02242EC0 ov06_02242EC0: ; 0x02242EC0 push {r4, lr} - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 add r1, r4, #0 add r1, #0x5c @@ -19798,7 +19798,7 @@ ov06_022432E4: ; 0x022432E4 sub sp, #0x28 str r0, [sp] add r0, r1, #0 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [sp, #4] bl GetPartyCount lsl r0, r0, #0x18 @@ -20327,7 +20327,7 @@ _02243706: pop {r4, r5, r6, r7, pc} _02243716: add r0, r2, #0 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [sp, #8] ldrb r0, [r5, #0xe] mov r4, #0 @@ -20383,7 +20383,7 @@ ov06_02243780: ; 0x02243780 sub sp, #0x1c str r0, [sp] add r0, r1, #0 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [sp, #4] ldr r0, [sp] mov r5, #0 @@ -20638,7 +20638,7 @@ ov06_02243938: ; 0x02243938 bne _02243980 _0224394A: ldr r0, [r4, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get ldrb r1, [r5, #0xf] cmp r1, #0 bne _0224396C @@ -21506,7 +21506,7 @@ ov06_02243FDC: ; 0x02243FDC mov r2, #1 add r1, sp, #8 strb r2, [r1] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [sp] mov r7, #0 ldrb r0, [r5, #0xe] @@ -21729,7 +21729,7 @@ ov06_02244190: ; 0x02244190 str r0, [sp, #4] bl MI_CpuFill8 add r0, r4, #0 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get ldr r5, [sp, #4] add r7, r0, #0 mov r4, #0 @@ -22186,10 +22186,10 @@ ov06_02244558: ; 0x02244558 bl ov06_02244528 add r1, r0, #0 ldr r0, [r5, #4] - bl sub_020476CC + bl BattleSetup_New add r7, r0, #0 ldr r0, [r4, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [sp, #4] add r0, r7, #0 add r1, r4, #0 @@ -22401,7 +22401,7 @@ ov06_022446FC: ; 0x022446FC ldr r1, _02244750 ; =0x0000083E strh r0, [r6, r1] add r0, r4, #0 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r7, r0, #0 mov r4, #0 add r5, r6, #0 @@ -24010,7 +24010,7 @@ ov06_02245360: ; 0x02245360 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldrb r1, [r4, #5] cmp r1, #5 @@ -31059,7 +31059,7 @@ ov06_022488FC: ; 0x022488FC ldr r0, [r5, #0xc] add r4, r1, #0 add r6, r2, #0 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get ldr r2, [r4, #4] add r1, r6, #0 bl ReplacePartySlotWithMon @@ -31077,7 +31077,7 @@ ov06_0224891C: ; 0x0224891C add r7, r2, #0 add r5, r1, #0 add r4, r3, #0 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r1, r7, #0 bl GetPartyMonByIndex mov r1, #0xa0 @@ -38587,7 +38587,7 @@ ov06_0224C2F4: ; 0x0224C2F4 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldrb r1, [r4, #0xf] cmp r1, #5 @@ -38879,7 +38879,7 @@ ov06_0224C560: ; 0x0224C560 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldrb r1, [r4, #2] cmp r1, #4 @@ -39098,7 +39098,7 @@ ov06_0224C720: ; 0x0224C720 bl TaskManager_GetFieldSystem add r7, r0, #0 add r0, r6, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0 _0224C732: ldr r3, [r5] @@ -39323,7 +39323,7 @@ ov06_0224C8E8: ; 0x0224C8E8 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r5, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment ldr r7, _0224C928 ; =0x02251DF4 add r4, r0, #0 _0224C8FC: @@ -39550,7 +39550,7 @@ ov06_0224CAAC: ; 0x0224CAAC bl TaskManager_GetFieldSystem add r7, r0, #0 add r0, r6, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0 _0224CABE: ldr r3, [r5] @@ -39639,7 +39639,7 @@ ov06_0224CB54: ; 0x0224CB54 bl TaskManager_GetFieldSystem add r7, r0, #0 add r0, r6, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0 _0224CB66: ldr r3, [r5] @@ -40797,7 +40797,7 @@ ov06_0224D410: ; 0x0224D410 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r1, [r4, #4] cmp r1, #0 @@ -42987,7 +42987,7 @@ ov06_0224E5D0: ; 0x0224E5D0 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldrb r1, [r4, #0xf] cmp r1, #5 @@ -43238,7 +43238,7 @@ ov06_0224E7D8: ; 0x0224E7D8 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl sub_02046530 + bl TaskManager_GetStatePtr add r4, r0, #0 ldr r0, [r4] cmp r0, #0 diff --git a/arm9/overlays/11/asm/ov11_0222D5C0_1.s b/arm9/overlays/11/asm/ov11_0222D5C0_1.s index 041ca5000..9aebb028b 100644 --- a/arm9/overlays/11/asm/ov11_0222D5C0_1.s +++ b/arm9/overlays/11/asm/ov11_0222D5C0_1.s @@ -1153,7 +1153,7 @@ _0222DFE4: _0222DFEC: ldr r0, [r5, #0x68] ldr r1, [r6, #4] - bl CopyPlayerParty + bl CopyParty ldr r0, [r5, #0x68] bl FreeToHeap add r1, r6, #0 @@ -1997,7 +1997,7 @@ _0222E734: ldr r0, [sp, #4] ldr r1, [r5, #0x68] ldr r0, [r0, #4] - bl CopyPlayerParty + bl CopyParty ldr r0, [sp, #4] add r6, r6, #1 add r0, r0, #4 @@ -2102,7 +2102,7 @@ _0222E810: ldr r0, [sp, #4] ldr r1, [r5, #0x68] ldr r0, [r0, #4] - bl CopyPlayerParty + bl CopyParty ldr r0, [sp, #4] add r6, r6, #1 add r0, r0, #4 @@ -2212,7 +2212,7 @@ _0222E8FE: ldr r0, [sp, #4] ldr r1, [r5, #0x68] ldr r0, [r0, #4] - bl CopyPlayerParty + bl CopyParty ldr r0, [sp, #4] add r6, r6, #1 add r0, r0, #4 @@ -2342,7 +2342,7 @@ _0222EA0C: ldr r0, [sp, #4] ldr r1, [r7, #0x68] ldr r0, [r0, #4] - bl CopyPlayerParty + bl CopyParty ldr r0, [r7, #0x68] mov r5, #0 bl GetPartyCount @@ -2428,7 +2428,7 @@ _0222EAC0: ldr r0, [sp, #4] ldr r1, [r5, #0x68] ldr r0, [r0, #4] - bl CopyPlayerParty + bl CopyParty ldr r0, [sp, #4] add r6, r6, #1 add r0, r0, #4 @@ -2555,7 +2555,7 @@ _0222EBC6: ldr r0, [sp, #4] ldr r1, [r5, #0x68] ldr r0, [r0, #4] - bl CopyPlayerParty + bl CopyParty ldr r0, [sp, #4] add r6, r6, #1 add r0, r0, #4 @@ -2664,7 +2664,7 @@ _0222ECA6: ldr r0, [sp, #4] ldr r1, [r5, #0x68] ldr r0, [r0, #4] - bl CopyPlayerParty + bl CopyParty ldr r0, [sp, #4] add r6, r6, #1 add r0, r0, #4 @@ -2797,7 +2797,7 @@ _0222EDBC: ldr r0, [sp, #4] ldr r1, [r7, #0x68] ldr r0, [r0, #4] - bl CopyPlayerParty + bl CopyParty ldr r0, [r7, #0x68] mov r5, #0 bl GetPartyCount diff --git a/arm9/overlays/14/asm/overlay_14.s b/arm9/overlays/14/asm/overlay_14.s index d68f1ed1c..1730c48cf 100644 --- a/arm9/overlays/14/asm/overlay_14.s +++ b/arm9/overlays/14/asm/overlay_14.s @@ -7519,7 +7519,7 @@ ov14_021DB220: ; 0x021DB220 add r4, r1, #0 add r5, r0, #0 ldr r0, [r4] - bl GetStoragePCPointer + bl Save_PCStorage_Get mov r1, #0x12 lsl r1, r1, #4 str r0, [r5, r1] @@ -7527,7 +7527,7 @@ ov14_021DB220: ; 0x021DB220 sub r0, r1, #4 str r2, [r5, r0] ldr r0, [r4] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get mov r1, #0x49 lsl r1, r1, #2 str r0, [r5, r1] diff --git a/arm9/overlays/18/asm/overlay_18.s b/arm9/overlays/18/asm/overlay_18.s index cacaf6b23..91e1b7959 100644 --- a/arm9/overlays/18/asm/overlay_18.s +++ b/arm9/overlays/18/asm/overlay_18.s @@ -26733,7 +26733,7 @@ ov18_0224648C: ; 0x0224648C bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4, #0x10] cmp r0, #0 @@ -26770,7 +26770,7 @@ ov18_022464D0: ; 0x022464D0 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4, #0x10] cmp r0, #0 @@ -26808,7 +26808,7 @@ ov18_02246514: ; 0x02246514 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r6, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4, #0xc] cmp r0, #0xd @@ -27213,7 +27213,7 @@ ov18_0224686C: ; 0x0224686C strb r1, [r0] ldr r1, _02246894 ; =ov18_02246514 add r0, r4, #0 - bl sub_020463CC + bl FieldSystem_CreateTask _0224688E: add sp, #8 pop {r3, r4, r5, pc} @@ -37225,7 +37225,7 @@ ov18_0224B84C: ; 0x0224B84C bl TaskManager_GetFieldSystem add r4, r0, #0 add r0, r6, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0 ldr r0, [r5] cmp r0, #5 @@ -37707,7 +37707,7 @@ _0224BC5C: ldr r0, [r4, #0xc] ldr r1, _0224BD50 ; =ov18_0224B84C add r2, r5, #0 - bl sub_020463CC + bl FieldSystem_CreateTask _0224BC86: add r0, r6, #0 add r1, r4, #0 @@ -43203,7 +43203,7 @@ ov18_0224E824: ; 0x0224E824 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r5, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4] cmp r0, #7 @@ -43346,7 +43346,7 @@ ov18_0224E960: ; 0x0224E960 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, _0224EA68 ; =0x00000504 ldr r0, [r4, r0] @@ -43515,7 +43515,7 @@ ov18_0224EAD4: ; 0x0224EAD4 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4, #4] cmp r0, #5 @@ -43886,7 +43886,7 @@ ov18_0224EDDC: ; 0x0224EDDC bl TaskManager_GetFieldSystem add r7, r0, #0 add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4, #4] cmp r0, #6 @@ -44442,7 +44442,7 @@ ov18_0224F258: ; 0x0224F258 bl TaskManager_GetFieldSystem add r7, r0, #0 add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r5, r0, #0 ldr r0, [r5, #4] cmp r0, #0 @@ -44786,7 +44786,7 @@ ov18_0224F528: ; 0x0224F528 bl TaskManager_GetFieldSystem str r0, [sp] add r0, r4, #0 - bl sub_0204652C + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4, #4] cmp r0, #3 diff --git a/arm9/overlays/27/asm/overlay_27.s b/arm9/overlays/27/asm/overlay_27.s index f52c4e79b..6d6bbedc8 100644 --- a/arm9/overlays/27/asm/overlay_27.s +++ b/arm9/overlays/27/asm/overlay_27.s @@ -56,7 +56,7 @@ ov27_0225489C: ; 0x0225489C strb r0, [r5, #2] add r0, r4, #0 bl ov20_02252C40 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r1, r0, #0 add r0, r5, #4 bl ov27_02254A48 @@ -223,7 +223,7 @@ _0225499C: blo _02254A02 ldr r0, [r4, #0x78] bl ov20_02252C40 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get add r1, r0, #0 add r0, r4, #4 bl ov27_02254A48 diff --git a/arm9/overlays/28/asm/overlay_28.s b/arm9/overlays/28/asm/overlay_28.s index 534aa4715..3276355a5 100644 --- a/arm9/overlays/28/asm/overlay_28.s +++ b/arm9/overlays/28/asm/overlay_28.s @@ -57,7 +57,7 @@ ov28_0225489C: ; 0x0225489C strb r0, [r7, #2] str r4, [r7, #0x60] bl sub_020225F8 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get mov r1, #0 str r0, [sp, #4] str r1, [sp] diff --git a/arm9/overlays/39/asm/overlay_39.s b/arm9/overlays/39/asm/overlay_39.s index 17df781a0..8277ef261 100644 --- a/arm9/overlays/39/asm/overlay_39.s +++ b/arm9/overlays/39/asm/overlay_39.s @@ -49,7 +49,7 @@ ov39_0225489C: ; 0x0225489C str r1, [sp, #8] str r2, [sp, #0xc] bl ov20_02252C40 - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [sp, #0x10] bl GetPartyCount ldr r1, [sp, #4] diff --git a/arm9/overlays/56/asm/overlay_56.s b/arm9/overlays/56/asm/overlay_56.s index ae7e3f9b6..f3b52262b 100644 --- a/arm9/overlays/56/asm/overlay_56.s +++ b/arm9/overlays/56/asm/overlay_56.s @@ -210,7 +210,7 @@ ov56_02211F88: ; 0x02211F88 push {r3, r4, r5, r6, r7, lr} add r0, #0xc4 ldr r0, [r0] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [sp] bl GetPartyCount mov r5, #0 @@ -1984,7 +1984,7 @@ ov56_02212E0C: ; 0x02212E0C add r0, r5, #0 add r0, #0xc4 ldr r0, [r0] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [sp, #0xc] add r0, r5, #0 add r0, #0xc4 diff --git a/arm9/src/encounter.c b/arm9/src/encounter.c new file mode 100644 index 000000000..82dd25fd2 --- /dev/null +++ b/arm9/src/encounter.c @@ -0,0 +1,633 @@ +#include "global.h" +#include "encounter.h" +#include "constants/game_stats.h" +#include "event_data.h" +#include "field_system.h" +#include "task.h" +#include "unk_020040F4.h" +#include "unk_02022504.h" +#include "unk_02029FB0.h" +#include "unk_0204AEA8.h" +#include "unk_0204AF24.h" +#include "unk_0205EC84.h" +#include "unk_0205FA2C.h" +#include "use_item_on_mon.h" + +extern void sub_0203780C(FieldSystem *fieldSystem, BattleSetup *battleSetup); +extern void BattleSetup_Delete(BattleSetup *setup); +extern BOOL IsBattleResultWin(u32 winFlag); +extern void sub_02047F38(BattleSetup *setup, FieldSystem *fieldSystem); +extern void sub_02061080(FieldSystem *fieldSystem, u32 param1, u32 winFlag); +extern void MapObjectManager_PauseAllMovement(MapObjectManager *mapObjectManager); +extern void MapObjectManager_UnpauseAllMovement(MapObjectManager *mapObjectManager); +extern void sub_0202E25C(SaveData *saveData, s32 param1); +extern void sub_02047FA4(BattleSetup *setup, FieldSystem *fieldSystem); +extern BattleSetup *ov06_02244558(u32 param0, FieldSystem *fieldSystem); +extern s32 sub_020475A0(BattleSetup *battleSetup); +extern s32 sub_020475B0(BattleSetup *battleSetup); +extern BOOL FieldTask_BlackOut(TaskManager *taskManager); +extern void sub_0205DD40(u32 param0); +extern u32 sub_0205E128(u32 param0); +extern void sub_0205DED4(FieldSystem *fieldSystem, u32 winFlag, u32 param2); +extern void sub_0205DF44(FieldSystem *fieldSystem, u32 param1); +extern BOOL sub_0205DF9C(u32 param0); +extern u32 sub_0205E0A4(u32 param0); +extern void ov06_02248724(FieldSystem *fieldSystem, BattleSetup *setup); +extern void sub_02060FE0(SafariZone *safariZone, Pokemon *pokemon); +extern LocalFieldData *Save_LocalFieldData_Get(SaveData *save); +extern u16 *LocalFieldData_GetSafariBallsCounter(LocalFieldData *localFieldData); +extern Location *LocalFieldData_GetDynamicWarp(LocalFieldData *localFieldData); +extern void sub_02049160(TaskManager *taskManager, Location *location); +extern void QueueScript(TaskManager *taskManager, u16 script, LocalMapObject *lastInteracted, void *param3); +extern BattleSetup *BattleSetup_New(HeapID heapId, u32 flags); +extern void BattleSetup_InitFromFieldSystem(BattleSetup *setup, FieldSystem *fieldSystem); +extern void ov06_0223CCDC(FieldSystem *fieldSystem, BattleSetup *setup); +extern void ov06_0223CD7C(FieldSystem *fieldSystem, u16 species, u8 level, BattleSetup *setup); +extern void sub_0204BAA0(FieldSystem *fieldSystem, BattleSetup *setup); +extern u32 sub_0204BAB0(FieldSystem *fieldSystem); +extern void StartScriptFromMenu(TaskManager *taskManager, u16 script, LocalMapObject *lastInteracted); +extern BattleSetup *sub_02047814(HeapID heapId, FieldSystem *fieldSystem); + +extern void sub_020472F4(FieldSystem *fieldSystem, BattleSetup *setup); +extern void sub_020473CC(FieldSystem *fieldSystem, BattleSetup *setup); + +static BOOL sub_0204653C(TaskManager *taskManager); +static void sub_02046584(TaskManager *taskManager, BattleSetup *setup); +/*static*/ Encounter *Encounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag); +static void Encounter_Delete(Encounter *encounter); +static BOOL GetEncounterResult(Encounter *encounter); +static void sub_020465E4(BattleSetup *setup, FieldSystem *fieldSystem); +static BOOL Task_StartEncounter(TaskManager *taskManager); +/*static*/ void CallTask_StartEncounter(TaskManager *taskManager, BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag); +static void sub_0204671C(s32 flag, FieldSystem *fieldSystem); +/*static*/ BOOL sub_02046758(TaskManager *taskManager); +/*static*/ BOOL sub_020467FC(TaskManager *taskManager); +static BOOL sub_02046878(TaskManager *taskManager); +static void sub_02046928(TaskManager *taskManager, BattleSetup *battleSetup, s32 effect, s32 bgm, u32 *winFlag); +static WildEncounter *WildEncounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag); +static void WildEncounter_Delete(WildEncounter *encounter); +static BOOL Task_WildEncounter(TaskManager *taskManager); +static BOOL Task_SafariEncounter(TaskManager *taskManager); +static BOOL Task_PalParkEncounter(TaskManager *taskManager); +static BOOL Task_TutorialBattle(TaskManager *taskManager); + +static BOOL sub_0204653C(TaskManager *taskManager) { //Task_StartBattle + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + BattleSetup *battleSetup = TaskManager_GetEnvironment(taskManager); + u32 *state = TaskManager_GetStatePtr(taskManager); + + switch (*state) { + case 0: + sub_0203780C(fieldSystem, battleSetup); + (*state)++; + break; + case 1: + if (!FieldSystem_ApplicationIsRunning(fieldSystem)) { + return TRUE; + } + break; + } + + return FALSE; +} + +static void sub_02046584(TaskManager *taskManager, BattleSetup *setup) { //CallTask_StartBattle + TaskManager_Call(taskManager, sub_0204653C, setup); +} + +/*static*/ Encounter *Encounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag) { + Encounter *encounter = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(Encounter)); + encounter->winFlag = winFlag; + if (winFlag != NULL) { + *winFlag = 0; + } + encounter->effect = effect; + encounter->bgm = bgm; + encounter->setup = setup; + return encounter; +} + +static void Encounter_Delete(Encounter *encounter) { + BattleSetup_Delete(encounter->setup); + FreeToHeap(encounter); +} + +static BOOL GetEncounterResult(Encounter *encounter) { + if (encounter->winFlag != NULL) { + *(encounter->winFlag) = encounter->setup->winFlag; + } + return IsBattleResultWin(encounter->setup->winFlag); +} + +static void sub_020465E4(BattleSetup *setup, FieldSystem *fieldSystem) { + if (!(setup->flags & BATTLE_SETUP_FLAG_UNK_31)) { + sub_02047F38(setup, fieldSystem); + } +} + +static BOOL Task_StartEncounter(TaskManager *taskManager) { //todo: better name + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + Encounter *encounter = TaskManager_GetEnvironment(taskManager); + u32 *state = TaskManager_GetStatePtr(taskManager); + + switch (*state) { + case 0: + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectManager); + sub_0204AEF8(taskManager, encounter->effect, encounter->bgm); + (*state)++; + break; + case 1: + sub_0204AF3C(taskManager); + (*state)++; + break; + case 2: + sub_02046584(taskManager, encounter->setup); + (*state)++; + break; + case 3: + sub_020465E4(encounter->setup, fieldSystem); + if (encounter->setup->flags == BATTLE_SETUP_FLAG_NONE || encounter->setup->flags == BATTLE_SETUP_FLAG_UNK_8 || encounter->setup->flags == (BATTLE_SETUP_FLAG_UNK_1 | BATTLE_SETUP_FLAG_UNK_3 | BATTLE_SETUP_FLAG_UNK_6)) { + sub_02061080(fieldSystem, encounter->setup->unk134, encounter->setup->winFlag); + } + + if (GetEncounterResult(encounter) == FALSE) { + Encounter_Delete(encounter); + return TRUE; + } + + if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(fieldSystem->saveData))) { + HealParty(SaveArray_Party_Get(fieldSystem->saveData)); + } + + sub_020472F4(fieldSystem, encounter->setup); + sub_020473CC(fieldSystem, encounter->setup); + CallTask_RestoreOverworld(taskManager); + (*state)++; + break; + case 4: + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectManager); + CallTask_FadeFromBlack(taskManager); + (*state)++; + break; + case 5: + Encounter_Delete(encounter); + return TRUE; + break; + } + + return FALSE; +} + +/*static*/ void CallTask_StartEncounter(TaskManager *taskManager, BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag) { + Encounter *encounter = Encounter_New(setup, effect, bgm, winFlag); + TaskManager_Call(taskManager, Task_StartEncounter, encounter); +} + +static void sub_0204671C(s32 flag, FieldSystem *fieldSystem) { + switch(flag & 0xF) { + case 1: + case 6: + sub_0202E25C(fieldSystem->saveData, 1); + break; + case 2: + case 5: + sub_0202E25C(fieldSystem->saveData, -1); + break; + } +} + +/*static*/ BOOL sub_02046758(TaskManager *taskManager) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + Encounter *encounter = TaskManager_GetEnvironment(taskManager); + u32 *state = TaskManager_GetStatePtr(taskManager); + switch (*state) { + case 0: + sub_0204AEF8(taskManager, encounter->effect, encounter->bgm); + (*state)++; + break; + case 1: + sub_0204AF3C(taskManager); + (*state)++; + break; + case 2: + sub_02046584(taskManager, encounter->setup); + (*state)++; + break; + case 3: + sub_0204671C(encounter->setup->winFlag, fieldSystem); + sub_02047FA4(encounter->setup, fieldSystem); + GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK21); + CallTask_RestoreOverworld(taskManager); + (*state)++; + break; + case 4: + case 5: //?? + Encounter_Delete(encounter); + return TRUE; + } + return FALSE; +} + +/*static*/ BOOL sub_020467FC(TaskManager *taskManager) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + Encounter *encounter = TaskManager_GetEnvironment(taskManager); + u32 *state = TaskManager_GetStatePtr(taskManager); + + switch (*state) { + case 0: + sub_0200433C(5, encounter->bgm, 1); + sub_02046584(taskManager, encounter->setup); + (*state)++; + break; + case 1: + sub_0204671C(encounter->setup->winFlag, fieldSystem); + sub_02047FA4(encounter->setup, fieldSystem); + GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK21); + (*state)++; + break; + case 2: + Encounter_Delete(encounter); + return TRUE; + } + return FALSE; +} + +static BOOL sub_02046878(TaskManager *taskManager) { //Task_02046878 + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + Encounter *encounter = TaskManager_GetEnvironment(taskManager); + u32 *state = TaskManager_GetStatePtr(taskManager); + + switch (*state) { + case 0: + sub_0204AEF8(taskManager, encounter->effect, encounter->bgm); + (*state)++; + break; + case 1: + sub_0204AF3C(taskManager); + (*state)++; + break; + case 2: + sub_02046584(taskManager, encounter->setup); + (*state)++; + break; + case 3: + sub_02047FA4(encounter->setup, fieldSystem); + sub_02060044(fieldSystem, &encounter->setup->unk138); + GetEncounterResult(encounter); + CallTask_RestoreOverworld(taskManager); + (*state)++; + break; + case 4: + CallTask_FadeFromBlack(taskManager); + (*state)++; + break; + case 5: + Encounter_Delete(encounter); + return TRUE; + } + return FALSE; +} + +static void sub_02046928(TaskManager *taskManager, BattleSetup *battleSetup, s32 effect, s32 bgm, u32 *winFlag) { //CallTask_02046878 + Encounter *encounter = Encounter_New(battleSetup, effect, bgm, winFlag); + TaskManager_Call(taskManager, sub_02046878, encounter); +} + +void sub_02046948(TaskManager *taskManager, u32 param1, u32 *winFlag) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + BattleSetup *battleSetup = ov06_02244558(param1, fieldSystem); + s32 effect = sub_020475A0(battleSetup); + s32 bgm = sub_020475B0(battleSetup); + sub_02046928(taskManager, battleSetup, effect, bgm, winFlag); +} + +static WildEncounter *WildEncounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag) { + WildEncounter *encounter = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(WildEncounter)); + encounter->winFlag = winFlag; + if (winFlag != NULL) { + *winFlag = 0; + } + encounter->effect = effect; + encounter->bgm = bgm; + encounter->setup = setup; + encounter->state = 0; + return encounter; +} + +static void WildEncounter_Delete(WildEncounter *encounter) { + BattleSetup_Delete(encounter->setup); + FreeToHeap(encounter); +} + +void sub_020469B8(FieldSystem *fieldSystem, BattleSetup *setup) { + SaveVarsFlags *flags = Save_VarsFlags_Get(fieldSystem->saveData); + + if (Save_VarsFlags_CheckSafariSysFlag(flags)) { + Encounter *encounter = Encounter_New(setup, sub_020475A0(setup), sub_020475B0(setup), NULL); + FieldSystem_CreateTask(fieldSystem, Task_SafariEncounter, encounter); + } else { + WildEncounter *encounter = WildEncounter_New(setup, sub_020475A0(setup), sub_020475B0(setup), NULL); + FieldSystem_CreateTask(fieldSystem, Task_WildEncounter, encounter); + } +} + +void sub_02046A20(FieldSystem *fieldSystem, TaskManager *taskManager, BattleSetup *setup) { + SaveVarsFlags *flags = Save_VarsFlags_Get(fieldSystem->saveData); + + if (Save_VarsFlags_CheckSafariSysFlag(flags)) { + Encounter *encounter = Encounter_New(setup, sub_020475A0(setup), sub_020475B0(setup), NULL); + TaskManager_Jump(taskManager, Task_SafariEncounter, encounter); + } else { + WildEncounter *encounter = WildEncounter_New(setup, sub_020475A0(setup), sub_020475B0(setup), NULL); + TaskManager_Jump(taskManager, Task_WildEncounter, encounter); + } +} + +static BOOL Task_WildEncounter(TaskManager *taskManager) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + WildEncounter *encounter = TaskManager_GetEnvironment(taskManager); + + switch (encounter->state) { + case 0: + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectManager); + GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK7); + sub_0204AEF8(taskManager, encounter->effect, encounter->bgm); + encounter->state++; + break; + case 1: + sub_0204AF3C(taskManager); + encounter->state++; + break; + case 2: + sub_02046584(taskManager, encounter->setup); + encounter->state++; + break; + case 3: + sub_020465E4(encounter->setup, fieldSystem); + sub_02061080(fieldSystem, encounter->setup->unk134, encounter->setup->winFlag); + + if (IsBattleResultWin(encounter->setup->winFlag) == FALSE) { + WildEncounter_Delete(encounter); + sub_0205DD40(fieldSystem->unk90); + TaskManager_Jump(taskManager, FieldTask_BlackOut, NULL); + return FALSE; + } + + if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(fieldSystem->saveData))) { + HealParty(SaveArray_Party_Get(fieldSystem->saveData)); + } + + sub_020472F4(fieldSystem, encounter->setup); + sub_020473CC(fieldSystem, encounter->setup); + + if (sub_0205E128(fieldSystem->unk90) != 0) { + if (sub_0205E0A4(fieldSystem->unk90) != 0) { + if (encounter->setup->winFlag != 1 && encounter->setup->winFlag != 4) { + sub_0205DD40(fieldSystem->unk90); + } + } else { + sub_0205DD40(fieldSystem->unk90); + } + } + CallTask_RestoreOverworld(taskManager); + encounter->state++; + break; + case 4: + ov06_02248724(fieldSystem, encounter->setup); + CallTask_FadeFromBlack(taskManager); + encounter->state++; + break; + case 5: + if (sub_0205E128(fieldSystem->unk90) != 0) { + sub_0205DED4(fieldSystem, encounter->setup->winFlag, fieldSystem->unk90); + sub_0205DF44(fieldSystem, fieldSystem->unk90); + } + encounter->state++; + break; + case 6: + if (sub_0205DF9C(fieldSystem->unk90)) { + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectManager); + WildEncounter_Delete(encounter); + return TRUE; + } + break; + } + return FALSE; +} + +static BOOL Task_SafariEncounter(TaskManager *taskManager) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + Encounter *encounter = TaskManager_GetEnvironment(taskManager); + u32 *state = TaskManager_GetStatePtr(taskManager); + u16 *safariBalls = LocalFieldData_GetSafariBallsCounter(Save_LocalFieldData_Get(fieldSystem->saveData)); + + switch (*state) { + case 0: + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectManager); + GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK7); + sub_0204AEF8(taskManager, encounter->effect, encounter->bgm); + (*state)++; + break; + case 1: + sub_0204AF3C(taskManager); + (*state)++; + break; + case 2: + sub_02046584(taskManager, encounter->setup); + (*state)++; + break; + case 3: + sub_020465E4(encounter->setup, fieldSystem); + if (encounter->setup->winFlag == 4) { + SafariZone *safariZone = Save_SafariZone_Get(fieldSystem->saveData); + Pokemon *pokemon = GetPartyMonByIndex(encounter->setup->party[1], 0); + sub_02060FE0(safariZone, pokemon); + } + + sub_020472F4(fieldSystem, encounter->setup); + + if (*safariBalls == 0 && encounter->setup->winFlag != 4) { + Location *location = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->saveData)); + sub_02049160(taskManager, location); + } + sub_020473CC(fieldSystem, encounter->setup); + (*state)++; + break; + case 4: + CallTask_RestoreOverworld(taskManager); + (*state)++; + break; + case 5: + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectManager); + CallTask_FadeFromBlack(taskManager); + (*state)++; + break; + case 6: + if (*safariBalls == 0) { + if (encounter->setup->winFlag == 4) { + QueueScript(taskManager, 0x2262, NULL, NULL); + } else { + QueueScript(taskManager, 0x2269, NULL, NULL); + } + } else { + PCStorage *pc = Save_PCStorage_Get(fieldSystem->saveData); + Party *party = SaveArray_Party_Get(fieldSystem->saveData); + if (PCStorage_FindFirstBoxWithEmptySlot(pc) == NUM_BOXES && GetPartyCount(party) == PARTY_SIZE) { + QueueScript(taskManager, 0x2276, NULL, NULL); + } + } + (*state)++; + break; + case 7: + Encounter_Delete(encounter); + return TRUE; + } + return FALSE; +} + +void SetupAndStartHoneyTreeBattle(TaskManager *taskManager, u32 *winFlag) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + sub_0205DD40(fieldSystem->unk90); + BattleSetup *setup = BattleSetup_New(HEAP_ID_FIELD, BATTLE_SETUP_FLAG_NONE); + BattleSetup_InitFromFieldSystem(setup, fieldSystem); + + setup->unk150 = 0; + setup->unk154 = 0; + ov06_0223CCDC(fieldSystem, setup); + + GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK7); + + CallTask_StartEncounter(taskManager, setup, sub_020475A0(setup), sub_020475B0(setup), winFlag); +} + +void SetupAndStartWildBattle(TaskManager *taskManager, u16 species, u8 level, u32 *winFlag, BOOL canFlee) { + BattleSetup *setup; + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + sub_0205DD40(fieldSystem->unk90); + setup = BattleSetup_New(HEAP_ID_FIELD, BATTLE_SETUP_FLAG_NONE); + BattleSetup_InitFromFieldSystem(setup, fieldSystem); + ov06_0223CD7C(fieldSystem, species, level, setup); + + if (canFlee) { + setup->unk18C |= 8; + } + + GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK7); + + CallTask_StartEncounter(taskManager, setup, sub_020475A0(setup), sub_020475B0(setup), winFlag); +} + +static BOOL Task_PalParkEncounter(TaskManager *taskManager) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + Encounter *encounter = TaskManager_GetEnvironment(taskManager); + u32 *state = TaskManager_GetStatePtr(taskManager); + + switch (*state) { + case 0: + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectManager); + GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK7); + sub_0204AEF8(taskManager, encounter->effect, encounter->bgm); + (*state)++; + break; + case 1: + sub_0204AF3C(taskManager); + (*state)++; + break; + case 2: + sub_02046584(taskManager, encounter->setup); + (*state)++; + break; + case 3: + sub_020465E4(encounter->setup, fieldSystem); + sub_0204BAA0(fieldSystem, encounter->setup); + sub_020472F4(fieldSystem, encounter->setup); + (*state)++; + break; + case 4: + CallTask_RestoreOverworld(taskManager); + (*state)++; + break; + case 5: + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectManager); + CallTask_FadeFromBlack(taskManager); + (*state)++; + break; + case 6: + Encounter_Delete(encounter); + if (sub_0204BAB0(fieldSystem) == 0) { + StartScriptFromMenu(taskManager, 3, NULL); + return FALSE; + } + return TRUE; + } + + return FALSE; +} + +void sub_02046F70(FieldSystem *fieldSystem, BattleSetup *setup) { + Encounter *encounter = Encounter_New(setup, sub_020475A0(setup), sub_020475B0(setup), NULL); + FieldSystem_CreateTask(fieldSystem, Task_PalParkEncounter, encounter); +} + +void SetupAndStartFirstBattle(TaskManager *taskManager, u16 species, u8 level) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + BattleSetup *setup = BattleSetup_New(HEAP_ID_FIELD, 0); + BattleSetup_InitFromFieldSystem(setup, fieldSystem); + + ov06_0223CD7C(fieldSystem, species, level, setup); + + setup->unk18C = 1; + + GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK7); + + CallTask_StartEncounter(taskManager, setup, sub_020475A0(setup), sub_020475B0(setup), NULL); +} + +static BOOL Task_TutorialBattle(TaskManager *taskManager) { + Encounter *encounter = TaskManager_GetEnvironment(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + u32 *state = TaskManager_GetStatePtr(taskManager); + + switch (*state) { + case 0: + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectManager); + sub_0204AEF8(taskManager, encounter->effect, encounter->bgm); + (*state)++; + break; + case 1: + sub_0204AF3C(taskManager); + (*state)++; + break; + case 2: + sub_02046584(taskManager, encounter->setup); + (*state)++; + break; + case 3: + (*state)++; + break; + case 4: + CallTask_RestoreOverworld(taskManager); + (*state)++; + break; + case 5: + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectManager); + CallTask_FadeFromBlack(taskManager); + (*state)++; + break; + case 6: + Encounter_Delete(encounter); + return TRUE; + } + return FALSE; +} + +void SetupAndStartTutorialBattle(TaskManager *taskManager) { + Encounter *encounter; + BattleSetup *setup; + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + + setup = sub_02047814(HEAP_ID_FIELD, fieldSystem); + encounter = Encounter_New(setup, sub_020475A0(setup), sub_020475B0(setup), NULL); + + TaskManager_Call(taskManager, Task_TutorialBattle, encounter); +} diff --git a/arm9/src/hall_of_fame.c b/arm9/src/hall_of_fame.c index 24a35afec..9dd5e5916 100644 --- a/arm9/src/hall_of_fame.c +++ b/arm9/src/hall_of_fame.c @@ -18,7 +18,7 @@ void Save_HOF_Init(struct HallOfFame * hof) MI_CpuClear32(hof, sizeof(struct HallOfFame)); } -void Save_HOF_RecordParty(struct HallOfFame * hof, struct PlayerParty * party, RTCDate * date) +void Save_HOF_RecordParty(struct HallOfFame * hof, struct Party * party, RTCDate * date) { GF_ASSERT(hof != NULL); GF_ASSERT(hof->next_record < NUM_HOF_RECORDS); diff --git a/arm9/src/mail.c b/arm9/src/mail.c index ffd6ffbf0..a53f6f027 100644 --- a/arm9/src/mail.c +++ b/arm9/src/mail.c @@ -52,7 +52,7 @@ void Mail_SetNewMessageDetails(struct Mail * mail, u8 type, u8 monIdx, struct Sa u32 form; BOOL is_egg; u16 species; - struct PlayerParty * party; + struct Party * party; PlayerProfile * profile; struct Pokemon * pokemon; u16 r7; @@ -60,7 +60,7 @@ void Mail_SetNewMessageDetails(struct Mail * mail, u8 type, u8 monIdx, struct Sa Mail_Init(mail); mail->mail_type = type; - party = SaveArray_PlayerParty_Get(save); + party = SaveArray_Party_Get(save); profile = Save_PlayerData_GetProfileAddr(save); CopyU16StringArray(mail->author_name, PlayerProfile_GetNamePtr(profile)); diff --git a/arm9/src/party.c b/arm9/src/party.c index c1e6b7f04..83a151b6f 100644 --- a/arm9/src/party.c +++ b/arm9/src/party.c @@ -2,38 +2,38 @@ #include "party.h" #include "heap.h" -void SaveArray_Party_Init(struct PlayerParty * party); -void InitPartyWithMaxSize(struct PlayerParty * party, int count); +void SaveArray_Party_Init(struct Party * party); +void InitPartyWithMaxSize(struct Party * party, int count); u32 SaveArray_Party_sizeof(void) { - return sizeof(struct PlayerParty); + return sizeof(struct Party); } -struct PlayerParty * SaveArray_Party_Alloc(HeapID heapId) +struct Party * SaveArray_Party_Alloc(HeapID heapId) { - struct PlayerParty * ret = (struct PlayerParty *)AllocFromHeap(heapId, sizeof(struct PlayerParty)); + struct Party * ret = (struct Party *)AllocFromHeap(heapId, sizeof(struct Party)); SaveArray_Party_Init(ret); return ret; } -void SaveArray_Party_Init(struct PlayerParty * party) +void SaveArray_Party_Init(struct Party * party) { InitPartyWithMaxSize(party, PARTY_SIZE); } -void InitPartyWithMaxSize(struct PlayerParty * party, int count) +void InitPartyWithMaxSize(struct Party * party, int count) { int i; GF_ASSERT(count <= PARTY_SIZE); - memset(party, 0, sizeof(struct PlayerParty)); + memset(party, 0, sizeof(struct Party)); party->curCount = 0; party->maxCount = count; for (i = 0; i < PARTY_SIZE; i++) ZeroMonData(&party->mons[i]); } -BOOL AddMonToParty(struct PlayerParty * party, struct Pokemon * pokemon) +BOOL AddMonToParty(struct Party * party, struct Pokemon * pokemon) { if (party->curCount >= party->maxCount) return FALSE; @@ -42,7 +42,7 @@ BOOL AddMonToParty(struct PlayerParty * party, struct Pokemon * pokemon) return TRUE; } -BOOL RemoveMonFromParty(struct PlayerParty * party, int pos) +BOOL RemoveMonFromParty(struct Party * party, int pos) { int i; @@ -61,12 +61,12 @@ BOOL RemoveMonFromParty(struct PlayerParty * party, int pos) return TRUE; } -int GetPartyCount(struct PlayerParty * party) +int GetPartyCount(struct Party * party) { return party->curCount; } -struct Pokemon * GetPartyMonByIndex(struct PlayerParty * party, int pos) +struct Pokemon * GetPartyMonByIndex(struct Party * party, int pos) { GF_ASSERT(pos >= 0); GF_ASSERT(pos < party->curCount); @@ -74,7 +74,7 @@ struct Pokemon * GetPartyMonByIndex(struct PlayerParty * party, int pos) return &party->mons[pos]; } -void ReplacePartySlotWithMon(struct PlayerParty * party, int pos, struct Pokemon * pokemon) +void ReplacePartySlotWithMon(struct Party * party, int pos, struct Pokemon * pokemon) { int r2; GF_ASSERT(pos >= 0); @@ -85,7 +85,7 @@ void ReplacePartySlotWithMon(struct PlayerParty * party, int pos, struct Pokemon party->curCount += r2; } -BOOL SwapSlotsInParty(struct PlayerParty * party, int pos1, int pos2) +BOOL SwapSlotsInParty(struct Party * party, int pos1, int pos2) { struct Pokemon * buffer; GF_ASSERT(pos1 >= 0); @@ -102,12 +102,12 @@ BOOL SwapSlotsInParty(struct PlayerParty * party, int pos1, int pos2) return FALSE; } -void CopyPlayerParty(struct PlayerParty * src, struct PlayerParty * dest) +void CopyParty(struct Party * src, struct Party * dest) { *dest = *src; } -BOOL PartyHasMon(struct PlayerParty * party, u16 species) +BOOL PartyHasMon(struct Party * party, u16 species) { int i; for (i = 0; i < party->curCount; i++) @@ -118,7 +118,7 @@ BOOL PartyHasMon(struct PlayerParty * party, u16 species) return i != party->curCount; } -struct PlayerParty * SaveArray_PlayerParty_Get(struct SaveData * ptr) +struct Party * SaveArray_Party_Get(struct SaveData * ptr) { - return (struct PlayerParty *)SaveArray_Get(ptr, 2); + return (struct Party *)SaveArray_Get(ptr, 2); } diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c index 9781112df..062ae6600 100644 --- a/arm9/src/pokemon.c +++ b/arm9/src/pokemon.c @@ -39,7 +39,7 @@ void BoxMonSetMoveInSlot(struct BoxPokemon * boxmon, u16 move, u8 slot); void sub_020698E8(struct BoxPokemon * boxmon, int slot1, int slot2); s8 BoxMonGetFlavorPreference(struct BoxPokemon * boxmon, int flavor); s8 GetFlavorPreferenceFromPID(u32 personality, int flavor); -u8 Party_MaskMonsWithPokerus(struct PlayerParty * party_p, u8 mask); +u8 Party_MaskMonsWithPokerus(struct Party * party_p, u8 mask); BOOL BoxMon_HasPokerus(struct BoxPokemon * boxmon); BOOL BoxMon_IsImmuneToPokerus(struct BoxPokemon * boxmon); void BoxMon_UpdateArceusForm(struct BoxPokemon * boxmon); @@ -2498,7 +2498,7 @@ BOOL sub_020690E8(struct Pokemon * pokemon) return FALSE; } -u16 GetMonEvolution(struct PlayerParty * party, struct Pokemon * pokemon, u32 context, u32 usedItem, u32 * method_ret) +u16 GetMonEvolution(struct Party * party, struct Pokemon * pokemon, u32 context, u32 usedItem, u32 * method_ret) { u16 target = SPECIES_NONE; u32 sp40; @@ -3009,7 +3009,7 @@ void CopyBoxPokemonToPokemon(struct BoxPokemon * src, struct Pokemon * dest) CalcMonLevelAndStats(dest); } -u8 Party_GetMaxLevel(struct PlayerParty * party) +u8 Party_GetMaxLevel(struct Party * party) { int i; int r7 = GetPartyCount(party); @@ -3088,7 +3088,7 @@ int Species_LoadLearnsetTable(u16 species, u32 form, u16 * dest) return i; } -void Party_GivePokerusAtRandom(struct PlayerParty * party) +void Party_GivePokerusAtRandom(struct Party * party) { int count = GetPartyCount(party); int idx; @@ -3120,7 +3120,7 @@ void Party_GivePokerusAtRandom(struct PlayerParty * party) } } -u8 Party_MaskMonsWithPokerus(struct PlayerParty * party, u8 mask) +u8 Party_MaskMonsWithPokerus(struct Party * party, u8 mask) { int i = 0; u32 flag = 1; @@ -3151,7 +3151,7 @@ u8 Party_MaskMonsWithPokerus(struct PlayerParty * party, u8 mask) return ret; } -void Party_UpdatePokerus(struct PlayerParty * party, int r5) +void Party_UpdatePokerus(struct Party * party, int r5) { int i; u8 pokerus; @@ -3177,7 +3177,7 @@ void Party_UpdatePokerus(struct PlayerParty * party, int r5) } } -void Party_SpreadPokerus(struct PlayerParty * party) +void Party_SpreadPokerus(struct Party * party) { int count = GetPartyCount(party); int i; diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c index de29515d3..de2605dbc 100644 --- a/arm9/src/scrcmd.c +++ b/arm9/src/scrcmd.c @@ -8,6 +8,8 @@ #include "constants/items.h" #include "constants/sndseq.h" #include "constants/weather.h" +#include "easy_chat.h" +#include "encounter.h" #include "fashion_case.h" #include "gf_rtc.h" #include "hall_of_fame.h" @@ -31,8 +33,8 @@ #include "task.h" #include "text.h" #include "text_02054590.h" +#include "unk_020040F4.h" #include "unk_0200CA44.h" -#include "easy_chat.h" #include "unk_02022504.h" #include "unk_02029FB0.h" #include "unk_020337E8.h" @@ -90,14 +92,14 @@ extern LocalMapObject *sub_020580B4(MapObjectManager *mapObjectManager, u32 para extern LocalMapObject *GetMapObjectByID(MapObjectManager *mapObjectManager, u16 eventId); extern BOOL sub_0205AEF0(u32 param0); extern void sub_0205AEFC(u32 param0); -extern void sub_02058780(MapObjectManager *mapObjectManager); +extern void MapObjectManager_PauseAllMovement(MapObjectManager *mapObjectManager); extern LocalMapObject *PlayerAvatar_GetMapObject(PlayerAvatar *playerAvatar); extern u32 sub_0205AE28(LocalMapObject *event); extern void sub_02058908(LocalMapObject *event); extern u32 sub_02058854(LocalMapObject *event); extern LocalMapObject *sub_0205E7C4(LocalMapObject *event); extern void sub_02058914(LocalMapObject *event); -extern void sub_020587B0(MapObjectManager *mapObjectManager); +extern void MapObjectManager_UnpauseAllMovement(MapObjectManager *mapObjectManager); extern u32 sub_02034B64(FieldSystem *fieldSystem); extern u32 sub_02034B6C(FieldSystem *fieldSystem); extern u32 sub_020575D4(MapObjectManager *mapObjectManager, u16 eventVar, u32 param2, u32 mapId, u32 param4); @@ -133,7 +135,6 @@ extern u16 sub_02037A78(void *runningAppData); extern u16 ov05_021E1858(FieldSystem *fieldSystem, LocalMapObject *event, u16 param2); extern void *sub_02029048(u32 param0); extern void sub_02028AD4(u32 *param0, void *param1, BOOL param2); -extern void sub_0204AF3C(TaskManager *taskManager); extern SaveFashionData *Save_FashionData_Get(SaveData *save); extern BOOL CheckPortraitSlotFull(SaveFashionData *fashionData, u32 portraitSlot); extern BOOL CheckContestPortraitSlotFull(SaveFashionData *fashionData, u32 portraitSlot); @@ -213,12 +214,8 @@ extern u16 MapNumToFloorNo(u32 mapId); extern void PrintCurrentFloorInNewWindow(FieldSystem *fieldSystem, u32 x, u32 y, u16 *var, MessageFormat *messageFormat); extern u16 sub_02054CC8(u32 param0, u16 param1); extern u16 sub_02054D1C(u32 param0, u16 param1); -extern void SetupAndStartWildBattle(TaskManager *taskManager, u16 species, u8 level, u32 *winFlag, BOOL isLegendary); -extern void SetupAndStartFirstBattle(TaskManager *taskManager, u16 species, u8 level); -extern void SetupAndStartTutorialBattle(TaskManager *taskManager); extern void UpdateHoneyTree(FieldSystem *fieldSystem); extern u16 CheckHoneyTree(FieldSystem *fieldSystem); -extern void SetupAndStartHoneyTreeBattle(TaskManager *taskManager, u32 *winFlag); extern void ov05_021F4E7C(FieldSystem *fieldSystem); extern void sub_020386B4(FieldSystem *fieldSystem); extern u16 Field_SaveGame(FieldSystem *fieldSystem); @@ -254,7 +251,7 @@ extern u16 sub_020536D0(PlayerGender playerGender, u16 param1, u16 param2); extern void sub_02049EA4(TaskManager *taskManager); extern void LocalFieldData_SetBlackoutSpawn(LocalFieldData *localFieldData, u16 spawnPoint); extern void CallFieldTask_BlackOut(TaskManager *taskManager); -extern void HealParty(PlayerParty *playerParty); +extern void HealParty(Party *playerParty); extern void sub_02050024(void); extern u32 sub_02031810(void); extern u32 sub_0202EDF8(void); @@ -311,7 +308,6 @@ extern u16 sub_02027100(FashionCase *fashionCase, u16 param1); extern PokedexAppData *sub_02038AF4(FieldSystem *fieldSystem, HeapID heapId, BOOL isNational); extern void ov06_0224CBB0(SaveData *saveData); extern u16 ov06_0224CC24(SaveData *saveData); -extern SafariZone *Save_SafariZone_Get(SaveData *saveData); extern u16 *LocalFieldData_GetSafariBallsCounter(LocalFieldData *localFieldData); extern u16 *LocalFieldData_GetSafariStepsCounter(LocalFieldData *localFieldData); extern void Save_VarsFlags_SetSafariSysFlag(SaveVarsFlags *varsFlags); @@ -319,7 +315,6 @@ extern void sub_02060FD0(SafariZone *safariZone); extern void Save_VarsFlags_ClearSafariSysFlag(SaveVarsFlags *varsFlags); extern void sub_02061574(FieldSystem *fieldSystem); extern u16 SpearPillarSequence(FieldSystem *fieldSystem, u8 operation); -extern void sub_0200433C(u32 param0, u32 param1, u32 param2); extern void ov06_0224525C(FieldSystem *fieldSystem, u16 var, u16 type); extern u16 ov06_02245340(FieldSystem *fieldSystem, u16 position); extern void PlayerAvatar_ToggleAutomaticHeightUpdating(PlayerAvatar *avatar, u8 flag); @@ -1722,7 +1717,7 @@ BOOL ScrCmd_LockAllEvents(ScriptContext *ctx) { //0060 LocalMapObject **lastInteracted = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_LAST_INTERACTED); if (*lastInteracted == NULL) { - sub_02058780(fieldSystem->mapObjectManager); + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectManager); } else { ScrCmd_LockAllEvents2(ctx); } @@ -1776,7 +1771,7 @@ BOOL ScrCmd_LockAllEvents2(ScriptContext *ctx) { //02B4 MapObjectManager *mapObjectManager = fieldSystem->mapObjectManager; UNK_021C5A0C[0] = 0; - sub_02058780(mapObjectManager); + MapObjectManager_PauseAllMovement(mapObjectManager); if (sub_0205AE28(playerAvatar) == 0) { UNK_021C5A0C[0] |= 1; sub_02058914(playerAvatar); @@ -1787,7 +1782,7 @@ BOOL ScrCmd_LockAllEvents2(ScriptContext *ctx) { //02B4 } if (unk1 != NULL) { SaveVarsFlags *state = Save_VarsFlags_Get(fieldSystem->saveData); - if (sub_0205ED3C(state) == TRUE) { + if (Save_VarsFlags_CheckHaveFollower(state) == TRUE) { if (sub_02058854(unk1) != 0) { UNK_021C5A0C[0] |= 2; sub_02058914(unk1); @@ -1805,7 +1800,7 @@ BOOL ScrCmd_LockAllEvents2(ScriptContext *ctx) { //02B4 } BOOL ScrCmd_ReleaseAllEvents(ScriptContext *ctx) { //0061 - sub_020587B0(ctx->fieldSystem->mapObjectManager); + MapObjectManager_UnpauseAllMovement(ctx->fieldSystem->mapObjectManager); return TRUE; } @@ -1985,7 +1980,7 @@ BOOL ScrCmd_GetPokemonForm(ScriptContext *ctx) { //0095 u16 partyPosition = ScriptGetVar(ctx); u16 *variable = ScriptGetVarPointer(ctx); - PlayerParty *party = SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData); + Party *party = SaveArray_Party_Get(ctx->fieldSystem->saveData); *variable = GetMonUnownLetter(GetPartyMonByIndex(party, partyPosition)); return FALSE; @@ -2113,7 +2108,7 @@ BOOL ScrCmd_DummyGetMapPosition(ScriptContext *ctx) { //009F FieldSystem *fieldSystem = ctx->fieldSystem; void **runningAppData = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_RUNNING_APP_DATA); - if (sub_0204647C(fieldSystem)) { + if (FieldSystem_ApplicationIsRunning(fieldSystem)) { return FALSE; } FreeToHeap(*runningAppData); @@ -2125,7 +2120,7 @@ static BOOL sub_0203BBBC(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; PCBoxAppData **pcBoxDataPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); PCBoxAppData *pcBoxData = *pcBoxDataPtr; - if (sub_0204647C(fieldSystem)) { + if (FieldSystem_ApplicationIsRunning(fieldSystem)) { return FALSE; } if (pcBoxData->unk08 == TRUE) { @@ -2137,11 +2132,11 @@ static BOOL sub_0203BBBC(ScriptContext *ctx) { } BOOL sub_0203BC04(ScriptContext *ctx) { - return !sub_0204647C(ctx->fieldSystem); + return !FieldSystem_ApplicationIsRunning(ctx->fieldSystem); } BOOL ScrCmd_RestoreOverworld(ScriptContext *ctx) { //00A1 - sub_0204AF84(ctx->fieldSystem->taskManager); + CallTask_RestoreOverworld(ctx->fieldSystem->taskManager); return TRUE; } @@ -2214,7 +2209,7 @@ BOOL ScrCmd_ShowPokemonPic(ScriptContext *ctx) { //0208 BOOL ScrCmd_ShowPartyPokemonPic(ScriptContext *ctx) { //028C PokepicManager **pokepicManager = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); u16 partyId = ScriptGetVar(ctx); - Pokemon *mon = GetPartyMonByIndex(SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData), partyId); + Pokemon *mon = GetPartyMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->saveData), partyId); LoadUserFrameGfx1(ctx->fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, 0x3D9, 11, 0, HEAP_ID_4); *pokepicManager = DrawPokemonPicFromMon(ctx->fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, 10, 5, 11, 0x3D9, mon, HEAP_ID_4); u32 species = GetMonData(mon, MON_DATA_SPECIES, NULL); @@ -2507,7 +2502,7 @@ BOOL ScrCmd_NamePokemonScreen(ScriptContext *ctx) { //00BB FieldSystem *fieldSystem = ctx->fieldSystem; u16 partyPos = ScriptGetVar(ctx); - PlayerParty *party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + Party *party = SaveArray_Party_Get(fieldSystem->saveData); Pokemon *mon = GetPartyMonByIndex(party, partyPos); u16 monNick[20]; @@ -2660,7 +2655,7 @@ BOOL ScrCmd_Defog(ScriptContext *ctx) { //00C4 BOOL ScrCmd_Cut(ScriptContext *ctx) { //00C5 void **miscData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); //todo identify u16 partyPosition = ScriptGetVar(ctx); - Pokemon *mon = GetPartyMonByIndex(SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData), partyPosition); + Pokemon *mon = GetPartyMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->saveData), partyPosition); u32 gender = PlayerAvatar_GetGender(ctx->fieldSystem->playerAvatar); *miscData = ov06_0224666C(ctx->fieldSystem, 0, mon, gender); SetupNativeScript(ctx, sub_0203C9F8); @@ -3274,7 +3269,7 @@ BOOL ScrCmd_GetPlayerGender(ScriptContext *ctx) { //014D BOOL ScrCmd_HealParty(ScriptContext *ctx) { //014E FieldSystem *fieldSystem = TaskManager_GetFieldSystem(ctx->taskManager); - HealParty(SaveArray_PlayerParty_Get(fieldSystem->saveData)); + HealParty(SaveArray_Party_Get(fieldSystem->saveData)); return FALSE; } @@ -3848,7 +3843,7 @@ BOOL ScrCmd_KeepSafariTrain(ScriptContext *ctx) { //020E BOOL ScrCmd_MoveSafariTrain(ScriptContext *ctx) { //020F u16 *var = ScriptGetVarPointer(ctx); u16 type = ScriptReadHalfword(ctx); - sub_0200433C(65, 0, 0); + sub_0200433C(65, SEQ_PV001, 0); ov06_0224525C(ctx->fieldSystem, *var, type); return TRUE; } @@ -3980,7 +3975,7 @@ BOOL ScrCmd_NationalDex(ScriptContext *ctx) { //022D BOOL ScrCmd_GetTotalPokemonEVs(ScriptContext *ctx) { //0233 u16 *var = ScriptGetVarPointer(ctx); u16 partyPosition = ScriptGetVar(ctx); - Pokemon *mon = GetPartyMonByIndex(SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData), partyPosition); + Pokemon *mon = GetPartyMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->saveData), partyPosition); u32 hpEv = GetMonData(mon, MON_DATA_HP_EV, NULL); u32 atkEv = GetMonData(mon, MON_DATA_ATK_EV, NULL); @@ -4011,7 +4006,7 @@ BOOL ScrCmd_GetPokemonFootprint(ScriptContext *ctx) { //023A u16 *var = ScriptGetVarPointer(ctx); u16 *var2 = ScriptGetVarPointer(ctx); u16 partyPosition = ScriptGetVar(ctx); - Pokemon *mon = GetPartyMonByIndex(SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData), partyPosition); + Pokemon *mon = GetPartyMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->saveData), partyPosition); u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL); *var = ov05_021F61E8(species); *var2 = ov05_021F61DC(species); @@ -4052,7 +4047,7 @@ BOOL ScrCmd_GiveWallpaper(ScriptContext *ctx) { //0249 - used for easy chat unlo FieldSystem *fieldSystem = ctx->fieldSystem; PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(fieldSystem)); u16 *var = ScriptGetVarPointer(ctx); - PCStorage *pcStorage = GetStoragePCPointer(fieldSystem->saveData); + PCStorage *pcStorage = Save_PCStorage_Get(fieldSystem->saveData); u16 unk0 = ScriptGetVar(ctx); u16 unk1 = ScriptGetVar(ctx); u16 unk2 = ScriptGetVar(ctx); @@ -4113,7 +4108,7 @@ static void Script_SetMonSeenFlagBySpecies(FieldSystem *fieldSystem, u16 species BOOL ScrCmd_CountPCFreeSpace(ScriptContext *ctx) { //0252 u16 *var = ScriptGetVarPointer(ctx); - u16 count = PCStorage_CountMonsAndEggsInAllBoxes(GetStoragePCPointer(ctx->fieldSystem->saveData)); + u16 count = PCStorage_CountMonsAndEggsInAllBoxes(Save_PCStorage_Get(ctx->fieldSystem->saveData)); *var = MONS_PER_BOX * NUM_BOXES - count; return FALSE; } @@ -4176,13 +4171,13 @@ BOOL ScrCmd_AddSpecialGameStat(ScriptContext *ctx) { //0260 BOOL ScrCmd_CheckPokemonInParty(ScriptContext *ctx) { //0262 u16 species = ScriptGetVar(ctx); u16 *var = ScriptGetVarPointer(ctx); - *var = PartyHasMon(SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData), species); + *var = PartyHasMon(SaveArray_Party_Get(ctx->fieldSystem->saveData), species); return TRUE; } BOOL ScrCmd_SetDeoxysForm(ScriptContext *ctx) { //0263 u16 form = ScriptGetVar(ctx); - PlayerParty *playerParty = SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData); + Party *playerParty = SaveArray_Party_Get(ctx->fieldSystem->saveData); s32 partyCount = GetPartyCount(playerParty); Pokedex *pokedex = Save_Pokedex_Get(ctx->fieldSystem->saveData); @@ -4200,7 +4195,7 @@ BOOL ScrCmd_SetDeoxysForm(ScriptContext *ctx) { //0263 #ifdef NONMATCHING BOOL ScrCmd_CheckBurmyForms(ScriptContext *ctx) { //0264 u16 *var = ScriptGetVarPointer(ctx); - PlayerParty *playerParty = SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData); + Party *playerParty = SaveArray_Party_Get(ctx->fieldSystem->saveData); s32 partyCount = GetPartyCount(playerParty); u32 unk0[PARTY_SIZE]; @@ -4244,7 +4239,7 @@ asm BOOL ScrCmd_CheckBurmyForms(ScriptContext *ctx) { str r0, [sp, #0x0] ldr r0, [r4, #0x0] ldr r0, [r0, #0xc] - bl SaveArray_PlayerParty_Get + bl SaveArray_Party_Get str r0, [sp, #0xc] bl GetPartyCount add r2, sp, #0x18 diff --git a/arm9/src/scrcmd_13.c b/arm9/src/scrcmd_13.c index 72af3e14b..22fbc7442 100644 --- a/arm9/src/scrcmd_13.c +++ b/arm9/src/scrcmd_13.c @@ -6,7 +6,7 @@ #include "pokemon_storage_system.h" #include "unk_0202C144.h" -extern struct PCStorage* GetStoragePCPointer(struct SaveData* save); +extern struct PCStorage* Save_PCStorage_Get(struct SaveData* save); extern void* sub_02022528(struct SaveData* save); extern void sub_0202BEDC(struct Pokemon* pokemon); extern void sub_0202BFD8(void* a0, s32 a1, struct Pokemon* pokemon); @@ -64,7 +64,7 @@ BOOL ScrCmd_Unk0254(struct ScriptContext* ctx) //0254 BOOL ScrCmd_Unk0255(struct ScriptContext* ctx) //0255 { void* unk = sub_02022528(ctx->fieldSystem->saveData); - struct PCStorage* pc = GetStoragePCPointer(ctx->fieldSystem->saveData); + struct PCStorage* pc = Save_PCStorage_Get(ctx->fieldSystem->saveData); struct Pokemon* pokemon = AllocMonZeroed(HEAP_ID_32); PlayerProfile* player = Save_PlayerData_GetProfileAddr(ctx->fieldSystem->saveData); struct Pokedex* pokedex = Save_Pokedex_Get(ctx->fieldSystem->saveData); // unused diff --git a/arm9/src/scrcmd_daycare.c b/arm9/src/scrcmd_daycare.c index 3632169d3..6521d75d8 100644 --- a/arm9/src/scrcmd_daycare.c +++ b/arm9/src/scrcmd_daycare.c @@ -6,15 +6,15 @@ extern void* FieldSysGetAttrAddr(struct FieldSystem*, int idx); -extern void ov05_021EC57C(struct PlayerParty* party, u8 idx, struct Daycare* daycare, struct SaveData* save); -extern u16 ov05_021EC71C(struct PlayerParty* party, MessageFormat *messageFormat, struct Daycare* daycare, u8 idx); +extern void ov05_021EC57C(struct Party* party, u8 idx, struct Daycare* daycare, struct SaveData* save); +extern u16 ov05_021EC71C(struct Party* party, MessageFormat *messageFormat, struct Daycare* daycare, u8 idx); extern u16 ov05_021EC854(struct Daycare* daycare, u8 idx, MessageFormat *messageFormat); extern u8 ov05_021EC864(struct Daycare* daycare, int idx, MessageFormat *messageFormat); extern void ov05_021ECD64(struct Daycare* daycare); -extern void ov05_Daycare_GiveEggToPlayer(struct Daycare* daycare, struct PlayerParty* party, PlayerProfile* player); +extern void ov05_Daycare_GiveEggToPlayer(struct Daycare* daycare, struct Party* party, PlayerProfile* player); extern void ov05_021ED4E0(struct Daycare* daycare, MessageFormat *messageFormat); extern void ov05_021ED52C(struct Daycare* daycare, u8 idx1, u8 idx2, u8 idx3, u8 idx4, MessageFormat *messageFormat); -extern u16 ov05_021ED5C4(struct PlayerParty* party, int idx, MessageFormat *messageFormat); +extern u16 ov05_021ED5C4(struct Party* party, int idx, MessageFormat *messageFormat); extern u16 ov05_021ED5EC(struct Daycare* daycare); extern u32 ov05_021ED644(struct Daycare* daycare); @@ -53,7 +53,7 @@ BOOL ScrCmd_GiveDaycareEgg(struct ScriptContext* ctx) //01A9 { struct FieldSystem* fieldSystem = ctx->fieldSystem; struct Daycare* daycare = SaveArray_Get(fieldSystem->saveData, 8); - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct SaveData* save = FieldSystem_GetSaveDataPtr(ctx->fieldSystem); PlayerProfile* player = Save_PlayerData_GetProfileAddr(save); @@ -70,7 +70,7 @@ BOOL ScrCmd_Unk01A4(struct ScriptContext* ctx) //01A4 u16* ret_ptr = ScriptGetVarPointer(ctx); u16 idx = ScriptGetVar(ctx); struct Daycare* daycare = SaveArray_Get(save, 8); - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); *ret_ptr = ov05_021EC71C(party, *messageFormat, daycare, (u8)idx); @@ -111,7 +111,7 @@ BOOL ScrCmd_Unk01AF(struct ScriptContext* ctx) //01AF u16 unused = ScriptReadHalfword(ctx); u16 idx = ScriptGetVar(ctx); u16* ret_ptr = ScriptGetVarPointer(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); *ret_ptr = ov05_021ED5C4(party, idx, *messageFormat); @@ -123,7 +123,7 @@ BOOL ScrCmd_Unk01B0(struct ScriptContext* ctx) //01B0 struct FieldSystem* fieldSystem = ctx->fieldSystem; struct SaveData* save = fieldSystem->saveData; u16 idx = ScriptGetVar(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Daycare* daycare = SaveArray_Get(save, 8); ov05_021EC57C(party, (u8)idx, daycare, save); diff --git a/arm9/src/scrcmd_flags.c b/arm9/src/scrcmd_flags.c index 55e81260c..864ff418e 100644 --- a/arm9/src/scrcmd_flags.c +++ b/arm9/src/scrcmd_flags.c @@ -13,7 +13,7 @@ extern void sub_0205ECFC(struct SaveVarsFlags* state); extern BOOL sub_0205ED0C(struct SaveVarsFlags* state); extern void sub_0205ED1C(struct SaveVarsFlags* state); extern void sub_0205ED2C(struct SaveVarsFlags* state); -extern BOOL sub_0205ED3C(struct SaveVarsFlags* state); +extern BOOL Save_VarsFlags_CheckHaveFollower(struct SaveVarsFlags* state); extern void sub_0205ED4C(struct SaveVarsFlags* state); extern void sub_0205ED5C(struct SaveVarsFlags* state); extern BOOL sub_0205ED6C(struct SaveVarsFlags* state); @@ -136,7 +136,7 @@ BOOL ScrCmd_Unk0160(struct ScriptContext* ctx) //0160 - todo: HasPartner? CheckP u16* ret_ptr = ScriptGetVarPointer(ctx); struct SaveVarsFlags* state = Save_VarsFlags_Get(ctx->fieldSystem->saveData); - *ret_ptr = (u16)sub_0205ED3C(state); + *ret_ptr = (u16)Save_VarsFlags_CheckHaveFollower(state); return FALSE; } diff --git a/arm9/src/scrcmd_move_relearner.c b/arm9/src/scrcmd_move_relearner.c index 4731b752b..b786bde2f 100644 --- a/arm9/src/scrcmd_move_relearner.c +++ b/arm9/src/scrcmd_move_relearner.c @@ -46,7 +46,7 @@ BOOL ScrCmd_Unk021E(struct ScriptContext* ctx) //021E BOOL ScrCmd_Unk021F(struct ScriptContext* ctx) { //021F u16* ret_ptr = ScriptGetVarPointer(ctx); u16 mon_idx = ScriptGetVar(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(ctx->fieldSystem->saveData); struct Pokemon* pokemon = GetPartyMonByIndex(party, mon_idx); u16 *eligibleMoves = GetEligibleLevelUpMoves(pokemon, HEAP_ID_32); @@ -84,7 +84,7 @@ BOOL ScrCmd_Unk0220(struct ScriptContext* ctx) //0220 BOOL ScrCmd_Unk0221(struct ScriptContext* ctx) //0221 - todo: RememberMove? { u16 mon_idx = ScriptGetVar(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(ctx->fieldSystem->saveData); struct Pokemon* pokemon = GetPartyMonByIndex(party, mon_idx); u16 *eligibleMoves = GetEligibleLevelUpMoves(pokemon, HEAP_ID_32); @@ -96,7 +96,7 @@ BOOL ScrCmd_Unk0224(struct ScriptContext* ctx) //0224 - todo: TeachMove? { u16 mon_idx = ScriptGetVar(ctx); u16 move = ScriptGetVar(ctx); - struct PlayerParty *party = SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData); + struct Party *party = SaveArray_Party_Get(ctx->fieldSystem->saveData); struct Pokemon *pokemon = GetPartyMonByIndex(party, mon_idx); u16 *eligibleMoves = AllocFromHeap(HEAP_ID_32, 2 * sizeof(u16)); diff --git a/arm9/src/scrcmd_names.c b/arm9/src/scrcmd_names.c index a3648f16d..d0eddd174 100644 --- a/arm9/src/scrcmd_names.c +++ b/arm9/src/scrcmd_names.c @@ -18,7 +18,7 @@ extern void *FieldSysGetAttrAddr(FieldSystem *fieldSystem, int idx); extern u32 sub_020536D0(u32 gender, u32 avatar, u32 a2); extern u32 Save_VarsFlags_GetStarter(SaveVarsFlags *state); extern u32 sub_0205F398(SaveVarsFlags *state); -extern PCStorage *GetStoragePCPointer(SaveData *save); +extern PCStorage *Save_PCStorage_Get(SaveData *save); extern u32 sub_0205F3C0(SaveVarsFlags *state); extern u32 sub_02054C14(u32 number); @@ -65,7 +65,7 @@ BOOL ScrCmd_GetPokemonName(ScriptContext *ctx) //00D0 - todo: BufferPartyPokemon MessageFormat **messageFormat = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 mon_idx = ScriptGetVar(ctx); - PlayerParty *party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + Party *party = SaveArray_Party_Get(fieldSystem->saveData); Pokemon *mon = GetPartyMonByIndex(party, mon_idx); BufferBoxMonSpeciesName(*messageFormat, idx, &mon->box); @@ -157,7 +157,7 @@ BOOL ScrCmd_GetPokemonNickname(ScriptContext *ctx) //00D6 - todo: BufferPartyPok MessageFormat **messageFormat = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 mon_idx = ScriptGetVar(ctx); - PlayerParty *party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + Party *party = SaveArray_Party_Get(fieldSystem->saveData); Pokemon *pokemon = GetPartyMonByIndex(party, mon_idx); BufferBoxMonNickname(*messageFormat, idx, &pokemon->box); @@ -168,7 +168,7 @@ BOOL ScrCmd_GetPokemonNickname(ScriptContext *ctx) //00D6 - todo: BufferPartyPok BOOL ScrCmd_Unk0251(ScriptContext *ctx) //0251 - todo: BufferBoxPokemonNickname? TextBoxPokemonNickname? { FieldSystem *fieldSystem = ctx->fieldSystem; - PCStorage *pc = GetStoragePCPointer(fieldSystem->saveData); + PCStorage *pc = Save_PCStorage_Get(fieldSystem->saveData); MessageFormat **messageFormat = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 box_mon_idx = ScriptGetVar(ctx); @@ -390,7 +390,7 @@ BOOL ScrCmd_GetPokemonMoveName(ScriptContext *ctx) //01CB - todo: BufferPartyPok u8 idx = ScriptReadByte(ctx); u16 mon_idx = ScriptGetVar(ctx); u16 mon_move_idx = ScriptGetVar(ctx); - PlayerParty *party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + Party *party = SaveArray_Party_Get(fieldSystem->saveData); Pokemon *pokemon = GetPartyMonByIndex(party, mon_idx); u16 move = (u16)GetMonData(pokemon, MON_DATA_MOVE1 + mon_move_idx, NULL); diff --git a/arm9/src/scrcmd_party.c b/arm9/src/scrcmd_party.c index 6b2a35183..b6fbd01e2 100644 --- a/arm9/src/scrcmd_party.c +++ b/arm9/src/scrcmd_party.c @@ -22,7 +22,7 @@ BOOL ScrCmd_GiveMon(struct ScriptContext* ctx) //0096 - todo: GivePokemon? u16 level = ScriptGetVar(ctx); u16 item = ScriptGetVar(ctx); u16 * varPtr = ScriptGetVarPointer(ctx); - struct PlayerParty * party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party * party = SaveArray_Party_Get(fieldSystem->saveData); *varPtr = (u16)GiveMon(HEAP_ID_FIELD, fieldSystem->saveData, species, (u8)level, item, mapSec, 12); return FALSE; } @@ -35,7 +35,7 @@ BOOL ScrCmd_GetPartyMonSpecies(struct ScriptContext* ctx) //0198 - todo: GetPart struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* mon_slot = GetVarPointer(ctx->fieldSystem, ScriptReadHalfword(ctx)); //for some reason this is *required* for matching, cannot use ScriptGetVarPointer here ret_ptr = GetVarPointer(ctx->fieldSystem, ScriptReadHalfword(ctx)); - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, *mon_slot); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); @@ -61,7 +61,7 @@ BOOL ScrCmd_CheckPartyMonOTID(struct ScriptContext* ctx) //0199 - todo: CheckPar u16* mon_slot = ScriptGetVarPointer(ctx); u16* ret_ptr = ScriptGetVarPointer(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, *mon_slot); u16 party_mon_otid = (u16)GetMonData(party_mon, MON_DATA_OTID, NULL); @@ -84,7 +84,7 @@ BOOL ScrCmd_GiveEgg(struct ScriptContext* ctx) //0097 PlayerProfile* player = Save_PlayerData_GetProfileAddr(fieldSystem->saveData); u16 species = ScriptGetVar(ctx); u16 unk = ScriptGetVar(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); u8 party_count = (u8)GetPartyCount(party); if (party_count < PARTY_SIZE) @@ -107,7 +107,7 @@ BOOL ScrCmd_SetPartyMonMove(struct ScriptContext* ctx) //0098 - todo: ReplacePar u16 mon_slot = ScriptGetVar(ctx); u16 move_slot = ScriptGetVar(ctx); u16 move = ScriptGetVar(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(ctx->fieldSystem->saveData); PartyMonSetMoveInSlot(party, mon_slot, move_slot, move); @@ -120,7 +120,7 @@ BOOL ScrCmd_PartyMonHasMove(struct ScriptContext* ctx) //0099 u16* ret_ptr = ScriptGetVarPointer(ctx); u16 required_move = ScriptGetVar(ctx); u16 mon_slot = ScriptGetVar(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); *ret_ptr = 0; @@ -147,12 +147,12 @@ BOOL ScrCmd_FindPartyMonWithMove(struct ScriptContext* ctx) //009A - todo: Check struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); u16 required_move = ScriptGetVar(ctx); - u8 party_count = (u8)GetPartyCount(SaveArray_PlayerParty_Get(fieldSystem->saveData)); + u8 party_count = (u8)GetPartyCount(SaveArray_Party_Get(fieldSystem->saveData)); u8 i; for (i = 0, *ret_ptr = PARTY_SIZE; i < party_count; i++) { - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, i); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); @@ -176,7 +176,7 @@ BOOL ScrCmd_SurvivePsn(struct ScriptContext* ctx) //01F7 { u16* ret_ptr = ScriptGetVarPointer(ctx); u16 mon_slot = ScriptGetVar(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(ctx->fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); *ret_ptr = (u16)SurvivePoisoning(party_mon); @@ -191,12 +191,12 @@ BOOL ScrCmd_CountPartyMonsAtOrBelowLevel(struct ScriptContext* ctx) //01F6 struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); u16 highest_level = ScriptGetVar(ctx); - party_count = (u8)GetPartyCount(SaveArray_PlayerParty_Get(fieldSystem->saveData)); + party_count = (u8)GetPartyCount(SaveArray_Party_Get(fieldSystem->saveData)); u8 mons; for (i = 0, mons = 0, *ret_ptr = 0; i < party_count; i++) { - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, i); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); @@ -219,7 +219,7 @@ BOOL ScrCmd_GetPartyMonLevel(struct ScriptContext* ctx) //0278 struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); u16 mon_slot = ScriptGetVar(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); *ret_ptr = 0; @@ -238,7 +238,7 @@ BOOL ScrCmd_GetPartyMonNature(struct ScriptContext* ctx) //0212 struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); u16 mon_slot = ScriptGetVar(ctx); - u8 party_count = (u8)GetPartyCount(SaveArray_PlayerParty_Get(fieldSystem->saveData)); + u8 party_count = (u8)GetPartyCount(SaveArray_Party_Get(fieldSystem->saveData)); if (mon_slot >= party_count) { @@ -246,7 +246,7 @@ BOOL ScrCmd_GetPartyMonNature(struct ScriptContext* ctx) //0212 return FALSE; } - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); @@ -265,12 +265,12 @@ BOOL ScrCmd_FindPartyMonWithNature(struct ScriptContext* ctx) //0213 - todo: Che struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); u16 required_nature = ScriptGetVar(ctx); - u8 party_count = (u8)GetPartyCount(SaveArray_PlayerParty_Get(fieldSystem->saveData)); + u8 party_count = (u8)GetPartyCount(SaveArray_Party_Get(fieldSystem->saveData)); u8 i; for (i = 0, *ret_ptr = 0xFF; i < party_count; i++) { - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, i); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); @@ -293,7 +293,7 @@ BOOL ScrCmd_GetPartyMonFriendship(struct ScriptContext* ctx) //01B9 struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); u16 mon_slot = ScriptGetVar(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); *ret_ptr = (u16)GetMonData(party_mon, MON_DATA_FRIENDSHIP, NULL); @@ -306,7 +306,7 @@ BOOL ScrCmd_AddPartyMonFriendship(struct ScriptContext* ctx) //01BA u16 friendship_to_add = ScriptGetVar(ctx); u16 mon_slot = ScriptGetVar(ctx); u16 map_sec = MapHeader_GetMapSec(ctx->fieldSystem->location->mapId); - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); u16 friendship = (u16)GetMonData(party_mon, MON_DATA_FRIENDSHIP, NULL); @@ -349,7 +349,7 @@ BOOL ScrCmd_SubtractPartyMonFriendship(struct ScriptContext* ctx) //01BB struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 friendship_to_deplete = ScriptGetVar(ctx); u16 mon_slot = ScriptGetVar(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); u16 friendship = (u16)GetMonData(party_mon, MON_DATA_FRIENDSHIP, NULL); @@ -372,7 +372,7 @@ BOOL ScrCmd_GetPartyMonContestCondition(struct ScriptContext* ctx) //0281 u16 mon_slot = ScriptGetVar(ctx); u16 contest_condition_id = ScriptGetVar(ctx); u16* ret_ptr = ScriptGetVarPointer(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(ctx->fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); *ret_ptr = (u16)GetMonData(party_mon, MON_DATA_COOL + contest_condition_id, NULL); @@ -393,7 +393,7 @@ BOOL ScrCmd_GetPartyMonTypes(struct ScriptContext* ctx) //0248 u16* type1 = ScriptGetVarPointer(ctx); u16* type2 = ScriptGetVarPointer(ctx); u16 mon_slot = ScriptGetVar(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); *type1 = (u16)GetMonData(party_mon, MON_DATA_TYPE_1, NULL); @@ -405,7 +405,7 @@ BOOL ScrCmd_CountPartyMons(struct ScriptContext* ctx) //0177 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); *ret_ptr = (u16)GetPartyCount(party); return FALSE; @@ -418,11 +418,11 @@ BOOL ScrCmd_CountPartyMons_OmitEggs(struct ScriptContext* ctx) //019A struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); - s32 party_count = GetPartyCount(SaveArray_PlayerParty_Get(fieldSystem->saveData)); + s32 party_count = GetPartyCount(SaveArray_Party_Get(fieldSystem->saveData)); for (i = 0, non_egg_mons = 0; i < party_count; i++) { - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, i); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); @@ -445,7 +445,7 @@ BOOL ScrCmd_CountAvailablePartyMons_IgnoreSlot(struct ScriptContext* ctx) //019B struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); slot_to_ignore = ScriptGetVar(ctx); - party_count = GetPartyCount(SaveArray_PlayerParty_Get(fieldSystem->saveData)); + party_count = GetPartyCount(SaveArray_Party_Get(fieldSystem->saveData)); u32 available_mons; s32 i; @@ -453,7 +453,7 @@ BOOL ScrCmd_CountAvailablePartyMons_IgnoreSlot(struct ScriptContext* ctx) //019B { if (i != slot_to_ignore) { - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, i); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); @@ -479,14 +479,14 @@ BOOL ScrCmd_CountAvailablePartyAndPCMons(struct ScriptContext* ctx) //019C struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); - pc = GetStoragePCPointer(fieldSystem->saveData); - party_count = GetPartyCount(SaveArray_PlayerParty_Get(fieldSystem->saveData)); + pc = Save_PCStorage_Get(fieldSystem->saveData); + party_count = GetPartyCount(SaveArray_Party_Get(fieldSystem->saveData)); u32 mons; s32 i; for (i = 0, mons = 0; i < party_count; i++) { - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, i); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); @@ -511,12 +511,12 @@ BOOL ScrCmd_GetPartyEggCount(struct ScriptContext* ctx) //019D struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); - party_count = GetPartyCount(SaveArray_PlayerParty_Get(fieldSystem->saveData)); + party_count = GetPartyCount(SaveArray_Party_Get(fieldSystem->saveData)); s32 i; for (i = 0, eggs_in_party = 0; i < party_count; i++) { - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, i); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); @@ -537,11 +537,11 @@ BOOL ScrCmd_CheckPartyForPokerus(struct ScriptContext* ctx) //0119 struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); - party_count = (u16)GetPartyCount(SaveArray_PlayerParty_Get(fieldSystem->saveData)); + party_count = (u16)GetPartyCount(SaveArray_Party_Get(fieldSystem->saveData)); for (i = 0, *ret_ptr = 0; i < party_count; i++) { - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, i); BOOL party_mon_has_pokerus = (BOOL)GetMonData(party_mon, MON_DATA_POKERUS, NULL); @@ -559,7 +559,7 @@ BOOL ScrCmd_GetPartyMonGender(struct ScriptContext* ctx) //011A { u16 mon_slot = ScriptGetVar(ctx); u16* ret_ptr = ScriptGetVarPointer(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(ctx->fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); *ret_ptr = (u16)GetMonData(party_mon, MON_DATA_GENDER, NULL); @@ -574,7 +574,7 @@ BOOL ScrCmd_CountPartyMonMoves(struct ScriptContext* ctx) //01C8 struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); u16 mon_slot = ScriptGetVar(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); party_mon = GetPartyMonByIndex(party, mon_slot); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); @@ -619,7 +619,7 @@ BOOL ScrCmd_ForgetPartyMonMove(struct ScriptContext* ctx) //01C9 struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 mon_slot = ScriptGetVar(ctx); u16 move_slot = ScriptGetVar(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); sub_020699A4(party_mon, move_slot); @@ -633,7 +633,7 @@ BOOL ScrCmd_GetPartyMonMove(struct ScriptContext* ctx) //01CA u16* ret_ptr = ScriptGetVarPointer(ctx); u16 mon_slot = ScriptGetVar(ctx); u16 move_slot = ScriptGetVar(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); *ret_ptr = (u16)GetMonData(party_mon, MON_DATA_MOVE1 + move_slot, NULL); @@ -645,7 +645,7 @@ BOOL ScrCmd_GetPartyMonHeldItem(struct ScriptContext* ctx) //01EE struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); u16 mon_slot = ScriptGetVar(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); *ret_ptr = (u16)GetMonData(party_mon, MON_DATA_HELD_ITEM, NULL); @@ -656,7 +656,7 @@ BOOL ScrCmd_ResetPartyMonHeldItem(struct ScriptContext* ctx) //01F0 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 mon_slot = ScriptGetVar(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); u16 party_mon_held_item = ITEM_NONE; @@ -670,12 +670,12 @@ BOOL ScrCmd_CheckPartyForSpecies(struct ScriptContext* ctx) //01C0 struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); u16 species = ScriptGetVar(ctx); - u8 party_count = (u8)GetPartyCount(SaveArray_PlayerParty_Get(fieldSystem->saveData)); + u8 party_count = (u8)GetPartyCount(SaveArray_Party_Get(fieldSystem->saveData)); u8 i; for (i = 0, *ret_ptr = 0; i < party_count; i++) { - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, i); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); @@ -697,7 +697,7 @@ BOOL ScrCmd_CountPartyMonRibbons(struct ScriptContext* ctx) //022E { u16* ret_ptr = ScriptGetVarPointer(ctx); u16 mon_slot = ScriptGetVar(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(ctx->fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); u16 ribbon_idx; @@ -717,13 +717,13 @@ BOOL ScrCmd_CountPartyMonRibbons(struct ScriptContext* ctx) //022E BOOL ScrCmd_CountTotalPartyRibbons(struct ScriptContext* ctx) //022F { - struct PlayerParty* party; + struct Party* party; u16 ribbon_idx; u16 ribbons; u16* ret_ptr = ScriptGetVarPointer(ctx); - u16 party_count = (u16)GetPartyCount(SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData)); - party = SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData); + u16 party_count = (u16)GetPartyCount(SaveArray_Party_Get(ctx->fieldSystem->saveData)); + party = SaveArray_Party_Get(ctx->fieldSystem->saveData); for (ribbon_idx = 0, ribbons = 0; ribbon_idx < 80; ribbon_idx++) { @@ -757,7 +757,7 @@ BOOL ScrCmd_PartyMonHasRibbon(struct ScriptContext* ctx) //0230 u16* ret_ptr = ScriptGetVarPointer(ctx); u16 mon_slot = ScriptGetVar(ctx); u16 ribbon_idx = ScriptGetVar(ctx); - struct PlayerParty* party = SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(ctx->fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); *ret_ptr = (u16)GetMonData(party_mon, sub_0207FC5C((u8)ribbon_idx, 0), NULL); @@ -769,7 +769,7 @@ BOOL ScrCmd_GivePartyMonRibbon(struct ScriptContext* ctx) //0231 u16 mon_slot = ScriptGetVar(ctx); u16 ribbon_idx = ScriptGetVar(ctx); u8 mon_has_ribbon = TRUE; - struct PlayerParty* party = SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(ctx->fieldSystem->saveData); struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); SetMonData(party_mon, (s32)sub_0207FC5C((u8)ribbon_idx, 0), &mon_has_ribbon); @@ -782,8 +782,8 @@ BOOL ScrCmd_CheckPartyForBadEgg(struct ScriptContext* ctx) //02B7 u16 ribbon_idx; u16* ret_ptr = ScriptGetVarPointer(ctx); - u16 party_count = (u16)GetPartyCount(SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData)); - struct PlayerParty* party = SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData); + u16 party_count = (u16)GetPartyCount(SaveArray_Party_Get(ctx->fieldSystem->saveData)); + struct Party* party = SaveArray_Party_Get(ctx->fieldSystem->saveData); // BUG: Probably a copy-paste fail. Checks if your party has a Bad Egg in it, // 80 times. diff --git a/arm9/src/scrcmd_sound.c b/arm9/src/scrcmd_sound.c index b9d59b0da..7b4c4747d 100644 --- a/arm9/src/scrcmd_sound.c +++ b/arm9/src/scrcmd_sound.c @@ -1,5 +1,6 @@ #include "global.h" #include "scrcmd.h" +#include "constants/sndseq.h" #include "unk_020040F4.h" #include "sound_chatot.h" @@ -245,7 +246,7 @@ BOOL ScrCmd_SaveChatotCry(struct ScriptContext* ctx) //005C BOOL ScrCmd_Unk005D(struct ScriptContext* ctx) //005D - todo: LoadSpearPillarAudio? { #pragma unused(ctx) - sub_0200433C(0x3F, 0, 0); + sub_0200433C(0x3F, SEQ_PV001, 0); return TRUE; } diff --git a/arm9/src/script_pokemon_util.c b/arm9/src/script_pokemon_util.c index 794d37bf8..d1090d000 100644 --- a/arm9/src/script_pokemon_util.c +++ b/arm9/src/script_pokemon_util.c @@ -24,7 +24,7 @@ BOOL GiveMon(HeapID heapId, struct SaveData * save, u16 species, u8 level, u16 i { u32 ptr; PlayerProfile * data = Save_PlayerData_GetProfileAddr(save); - struct PlayerParty * party = SaveArray_PlayerParty_Get(save); + struct Party * party = SaveArray_Party_Get(save); struct Pokemon * mon = AllocMonZeroed(heapId); ZeroMonData(mon); CreateMon(mon, species, level, 32, 0, 0, OT_ID_PLAYER_ID, 0); @@ -45,7 +45,7 @@ BOOL GiveEgg(HeapID heapId, struct SaveData * save, u16 species, int level, int { #pragma unused(heapId) PlayerProfile * data = Save_PlayerData_GetProfileAddr(save); - struct PlayerParty * party = SaveArray_PlayerParty_Get(save); + struct Party * party = SaveArray_Party_Get(save); struct Pokemon * mon = AllocMonZeroed(HEAP_ID_32); ZeroMonData(mon); ov05_SetEggStats(mon, species, level, data, 4, sub_02015CF8(metLocIndex, a3)); @@ -54,13 +54,13 @@ BOOL GiveEgg(HeapID heapId, struct SaveData * save, u16 species, int level, int return isAdded; } -void PartyMonSetMoveInSlot(struct PlayerParty * party, int partySlot, int moveSlot, u16 move) +void PartyMonSetMoveInSlot(struct Party * party, int partySlot, int moveSlot, u16 move) { struct Pokemon * mon = GetPartyMonByIndex(party, partySlot); MonSetMoveInSlot(mon, move, (u8)moveSlot); } -int GetIdxOfFirstPartyMonWithMove(struct PlayerParty * party, int move) +int GetIdxOfFirstPartyMonWithMove(struct Party * party, int move) { int partyCount = GetPartyCount(party); @@ -79,7 +79,7 @@ int GetIdxOfFirstPartyMonWithMove(struct PlayerParty * party, int move) return 0xFF; } -int CountAlivePokemon(struct PlayerParty * party) +int CountAlivePokemon(struct Party * party) { int partyCount = GetPartyCount(party); int i; @@ -95,7 +95,7 @@ int CountAlivePokemon(struct PlayerParty * party) return aliveCount; } -struct Pokemon * GetFirstAliveMonInParty_CrashIfNone(struct PlayerParty * party) +struct Pokemon * GetFirstAliveMonInParty_CrashIfNone(struct Party * party) { int i; int partyCount = GetPartyCount(party); @@ -111,7 +111,7 @@ struct Pokemon * GetFirstAliveMonInParty_CrashIfNone(struct PlayerParty * party) return 0; } -struct Pokemon * GetFirstNonEggInParty(struct PlayerParty * party) +struct Pokemon * GetFirstNonEggInParty(struct Party * party) { u16 i; u16 partyCount = (u16)GetPartyCount(party); @@ -126,12 +126,12 @@ struct Pokemon * GetFirstNonEggInParty(struct PlayerParty * party) return 0; } -BOOL HasEnoughAlivePokemonForDoubleBattle(struct PlayerParty * party) +BOOL HasEnoughAlivePokemonForDoubleBattle(struct Party * party) { return (CountAlivePokemon(party) >= 2); } -void GiveAllMonsTheSinnohChampRibbon(struct PlayerParty * party) +void GiveAllMonsTheSinnohChampRibbon(struct Party * party) { u8 var = 1; int partyCount = GetPartyCount(party); @@ -148,7 +148,7 @@ void GiveAllMonsTheSinnohChampRibbon(struct PlayerParty * party) } } -int ApplyPoisonStep(struct PlayerParty * party, int location) +int ApplyPoisonStep(struct Party * party, int location) { u32 hp; int numPoisoned = 0; diff --git a/arm9/src/task.c b/arm9/src/task.c index 2c4de628d..4d3007aab 100644 --- a/arm9/src/task.c +++ b/arm9/src/task.c @@ -3,7 +3,7 @@ #include "script.h" #include "heap.h" -struct TaskManager *FieldSys_CreateTask(struct FieldSystem * fieldSystem, TaskFunc taskFunc, void *env) +struct TaskManager *Task_New(struct FieldSystem * fieldSystem, TaskFunc taskFunc, void *env) { struct TaskManager *taskManager = AllocFromHeapAtEnd(HEAP_ID_32, sizeof(struct TaskManager)); taskManager->prev = NULL; @@ -17,13 +17,13 @@ struct TaskManager *FieldSys_CreateTask(struct FieldSystem * fieldSystem, TaskFu return taskManager; } -void sub_020463CC(struct FieldSystem * fieldSystem, TaskFunc taskFunc, void *env) +void FieldSystem_CreateTask(struct FieldSystem * fieldSystem, TaskFunc taskFunc, void *env) { GF_ASSERT(fieldSystem->taskManager == NULL); - fieldSystem->taskManager = FieldSys_CreateTask(fieldSystem, taskFunc, env); + fieldSystem->taskManager = Task_New(fieldSystem, taskFunc, env); } -void sub_020463EC(struct TaskManager *taskManager, TaskFunc taskFunc, void *env) +void TaskManager_Jump(struct TaskManager *taskManager, TaskFunc taskFunc, void *env) { taskManager->func = taskFunc; taskManager->state = 0; @@ -38,7 +38,7 @@ void sub_020463EC(struct TaskManager *taskManager, TaskFunc taskFunc, void *env) void TaskManager_Call(struct TaskManager *taskManager, TaskFunc taskFunc, void *env) { - struct TaskManager *taskManager2 = FieldSys_CreateTask(taskManager->fieldSystem, taskFunc, env); + struct TaskManager *taskManager2 = Task_New(taskManager->fieldSystem, taskFunc, env); taskManager2->prev = taskManager; taskManager->fieldSystem->taskManager = taskManager2; } @@ -66,7 +66,7 @@ BOOL sub_0204646C(struct TaskManager *taskManager) return (taskManager->unk10 != NULL); } -BOOL sub_0204647C(struct FieldSystem *fieldSystem) +BOOL FieldSystem_ApplicationIsRunning(struct FieldSystem *fieldSystem) { return (sub_0203739C(fieldSystem) || sub_020373C4(fieldSystem)); } @@ -84,7 +84,7 @@ BOOL sub_020464A4(void * r0) BOOL sub_020464B8(struct TaskManager *taskManager) { struct FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - u32 * r4_2 = sub_0204652C(taskManager); + u32 * r4_2 = TaskManager_GetEnvironment(taskManager); switch (r4_2[0]) { case 0: @@ -92,7 +92,7 @@ BOOL sub_020464B8(struct TaskManager *taskManager) r4_2[0]++; break; case 1: - if (!sub_0204647C(fieldSystem)) + if (!FieldSystem_ApplicationIsRunning(fieldSystem)) { FreeToHeap(r4_2); return TRUE; @@ -116,12 +116,12 @@ struct FieldSystem *TaskManager_GetFieldSystem(struct TaskManager *taskManager) return taskManager->fieldSystem; } -void * sub_0204652C(struct TaskManager *taskManager) +void * TaskManager_GetEnvironment(struct TaskManager *taskManager) { return taskManager->env; } -u32 * sub_02046530(struct TaskManager *taskManager) +u32 * TaskManager_GetStatePtr(struct TaskManager *taskManager) { return &taskManager->state; } diff --git a/arm9/src/unk_020040F4.c b/arm9/src/unk_020040F4.c index d32526388..8614a3db9 100644 --- a/arm9/src/unk_020040F4.c +++ b/arm9/src/unk_020040F4.c @@ -208,7 +208,7 @@ BOOL sub_02004180(s32 param0) return res; } -BOOL sub_0200433C(u8 param0, int param1, u32 param2) +BOOL sub_0200433C(u8 param0, u16 param1, u32 param2) { u8 *st0 = sub_02003D38(20); u8 *st4 = sub_02003D38(21); diff --git a/arm9/src/unk_02022504.c b/arm9/src/unk_02022504.c index 94d5cdc32..fad6b2196 100644 --- a/arm9/src/unk_02022504.c +++ b/arm9/src/unk_02022504.c @@ -7,7 +7,7 @@ SafariZone *Save_SafariZone_Get(struct SaveData *save) return SaveArray_Get(save, SAVE_SAFARI_ZONE); } -struct PCStorage *GetStoragePCPointer(struct SaveData *save) +struct PCStorage *Save_PCStorage_Get(struct SaveData *save) { return SaveArray_Get(save, 35); } diff --git a/arm9/src/unk_0204AEA8.c b/arm9/src/unk_0204AEA8.c index 76255314a..2629d705a 100644 --- a/arm9/src/unk_0204AEA8.c +++ b/arm9/src/unk_0204AEA8.c @@ -9,13 +9,13 @@ extern void ov05_021E3444(u32, struct FieldSystem *, u32); BOOL sub_0204AEA8(struct TaskManager *taskManager) { struct FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - u32 *v1 = sub_0204652C(taskManager); + u32 *v1 = TaskManager_GetEnvironment(taskManager); switch (v1[0]) { case 0: ov05_021E3444(v1[2], fieldSystem, (u32)v1 + 4); - sub_0200433C(5, (u16)v1[3], 1); + sub_0200433C(5, v1[3], 1); v1[0]++; break; case 1: @@ -30,14 +30,14 @@ BOOL sub_0204AEA8(struct TaskManager *taskManager) return FALSE; } -void sub_0204AEF8(struct TaskManager *taskManager, u32 a1, u32 a2) +void sub_0204AEF8(struct TaskManager *taskManager, u32 a1, u32 a2) //taskManager, effect, bgm { - u32 *v0 = AllocFromHeapAtEnd(HEAP_ID_FIELD, 4 * sizeof(u32)); + u32 *v0 = AllocFromHeapAtEnd(HEAP_ID_FIELD, 4 * sizeof(u32)); //todo: make a struct - v0[0] = 0; - v0[1] = 0; - v0[2] = a1; - v0[3] = a2; + v0[0] = 0; //state + v0[1] = 0; //unk + v0[2] = a1; //effect + v0[3] = a2; //bgm TaskManager_Call(taskManager, sub_0204AEA8, v0); } diff --git a/arm9/src/unk_0204AF24.c b/arm9/src/unk_0204AF24.c index f13948334..338490ffb 100644 --- a/arm9/src/unk_0204AF24.c +++ b/arm9/src/unk_0204AF24.c @@ -18,7 +18,7 @@ BOOL sub_0204AF24(struct TaskManager *taskManager) void sub_0204AF3C(struct TaskManager *taskManager) { - struct FieldSystem * fieldSystem= TaskManager_GetFieldSystem(taskManager); + struct FieldSystem * fieldSystem = TaskManager_GetFieldSystem(taskManager); if(!sub_0203739C(fieldSystem)) { GF_ASSERT(FALSE); @@ -37,7 +37,7 @@ BOOL sub_0204AF6C(struct TaskManager *taskManager) return FALSE; } -void sub_0204AF84(struct TaskManager *taskManager) //TODO: RestoreOverworld +void CallTask_RestoreOverworld(struct TaskManager *taskManager) //TODO: RestoreOverworld { struct FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); if(sub_0203739C(fieldSystem)) @@ -49,7 +49,7 @@ void sub_0204AF84(struct TaskManager *taskManager) //TODO: RestoreOverworld TaskManager_Call(taskManager, &sub_0204AF6C, NULL); } -BOOL sub_0204AFB4(struct TaskManager *taskManager) +BOOL Task_ProcessFade(struct TaskManager *taskManager) { #pragma unused(taskManager) if(IsPaletteFadeFinished()) @@ -59,18 +59,18 @@ BOOL sub_0204AFB4(struct TaskManager *taskManager) return FALSE; } -void sub_0204AFC8(struct TaskManager *taskManager) +void CallTask_FadeToBlack(struct TaskManager *taskManager) { if(!sub_0203739C(TaskManager_GetFieldSystem(taskManager))) { GF_ASSERT(0); return; } - BeginNormalPaletteFade(0, 0, 0, GX_RGB_BLACK, 6, 1, HEAP_ID_4); - TaskManager_Call(taskManager, &sub_0204AFB4, 0); + BeginNormalPaletteFade(0, 0, 0, GX_RGB_BLACK, 6, 1, HEAP_ID_4); //TODO: find constants for palette fade + TaskManager_Call(taskManager, Task_ProcessFade, 0); } -void sub_0204B00C(struct TaskManager *taskManager) +void CallTask_FadeFromBlack(struct TaskManager *taskManager) { if(!sub_0203739C(TaskManager_GetFieldSystem(taskManager))) { @@ -78,16 +78,16 @@ void sub_0204B00C(struct TaskManager *taskManager) return; } BeginNormalPaletteFade(0, 1, 1, GX_RGB_BLACK, 6, 1, HEAP_ID_4); - TaskManager_Call(taskManager, sub_0204AFB4, 0); + TaskManager_Call(taskManager, Task_ProcessFade, 0); } BOOL sub_0204B050(struct TaskManager *taskManager) { - u32 * r4 = sub_02046530(taskManager); + u32 * r4 = TaskManager_GetStatePtr(taskManager); switch(r4[0]) { case 0: - sub_0204AFC8(taskManager); + CallTask_FadeToBlack(taskManager); r4[0]++; break; case 1: @@ -109,17 +109,17 @@ void sub_0204B090(struct TaskManager *taskManager) BOOL sub_0204B0A0(struct TaskManager *taskManager) { - u32 * r4 = sub_02046530(taskManager); + u32 * r4 = TaskManager_GetStatePtr(taskManager); struct FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); switch(r4[0]) { case 0: - sub_0204AF84(taskManager); + CallTask_RestoreOverworld(taskManager); r4[0]++; break; case 1: ov05_021E331C(fieldSystem); - sub_0204B00C(taskManager); + CallTask_FadeFromBlack(taskManager); r4[0]++; break; case 2: diff --git a/arm9/src/unk_0204B0A0.c b/arm9/src/unk_0204B0A0.c index a9585bb20..84adcc49e 100644 --- a/arm9/src/unk_0204B0A0.c +++ b/arm9/src/unk_0204B0A0.c @@ -92,7 +92,7 @@ void sub_0204B1DC(struct FieldSystem *fieldSystem, s32 a1) u32 unk1 = sub_020287A4(unk_sav_ptr1); sub_0202A988(unk_sav_ptr2, unk1); - struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData); + struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); Party_UpdatePokerus(party, a1); struct SaveVarsFlags* state = Save_VarsFlags_Get(fieldSystem->saveData); diff --git a/arm9/src/unk_0205EC84.c b/arm9/src/unk_0205EC84.c index 9b7ab8ebe..2f1a650fd 100644 --- a/arm9/src/unk_0205EC84.c +++ b/arm9/src/unk_0205EC84.c @@ -1,6 +1,7 @@ #include "global.h" #include "proto.h" #include "unk_0205EC84.h" +#include "constants/flags.h" #include "constants/sndseq.h" #include "constants/maps.h" @@ -72,7 +73,7 @@ void sub_0205ED2C(struct SaveVarsFlags * state) _flag_clear(state, 0x961); } -BOOL sub_0205ED3C(struct SaveVarsFlags * state) +BOOL Save_VarsFlags_CheckHaveFollower(struct SaveVarsFlags * state) { return _flag_check(state, 0x961); } @@ -353,17 +354,17 @@ BOOL sub_0205F1E4(struct SaveVarsFlags * state) void Save_VarsFlags_SetSafariSysFlag(struct SaveVarsFlags * state) { - _flag_set(state, 0x967); + _flag_set(state, FLAG_SYS_SAFARI); } void Save_VarsFlags_ClearSafariSysFlag(struct SaveVarsFlags * state) { - _flag_clear(state, 0x967); + _flag_clear(state, FLAG_SYS_SAFARI); } -BOOL sub_0205F214(struct SaveVarsFlags * state) +BOOL Save_VarsFlags_CheckSafariSysFlag(struct SaveVarsFlags * state) //Save_VarsFlags_CheckSafariSysFlag? { - return _flag_check(state, 0x967); + return _flag_check(state, FLAG_SYS_SAFARI); } void sub_0205F224(struct SaveVarsFlags * state) diff --git a/arm9/src/unk_0205FA2C.c b/arm9/src/unk_0205FA2C.c index 9ac694493..7f7ba073c 100644 --- a/arm9/src/unk_0205FA2C.c +++ b/arm9/src/unk_0205FA2C.c @@ -1,5 +1,6 @@ #include "global.h" #include "unk_0205FA2C.h" +#include "battle_setup.h" #include "unk_020337E8.h" #include "unk_0202A1E0.h" #include "overlay_manager.h" @@ -40,7 +41,7 @@ u32 sub_0205FA2C( ptr->options = Save_PlayerData_GetOptionsAddr(save); - ptr->player_party = SaveArray_PlayerParty_Get(save); + ptr->player_party = SaveArray_Party_Get(save); ptr->bag = Save_Bag_Get(save); @@ -66,7 +67,7 @@ u32 sub_0205FA2C( u32 sub_0205FAD8( struct UnkCallbackStruct1_0205FA2C *param0, struct FieldSystem *fieldSystem) { - if (sub_0204647C(fieldSystem)) + if (FieldSystem_ApplicationIsRunning(fieldSystem)) { return 1; } @@ -108,7 +109,7 @@ u32 sub_0205FB34( MI_CpuFill8(ptr, 0, sizeof(struct UnkPlayerStruct2_0205FA2C)); ptr->options = Save_PlayerData_GetOptionsAddr(save); - ptr->player_party = SaveArray_PlayerParty_Get(save); + ptr->player_party = SaveArray_Party_Get(save); ptr->IsNatDex = SaveArray_IsNatDexEnabled(save); ptr->unk2c = sub_02079C70(save); @@ -136,7 +137,7 @@ u32 sub_0205FB34( u32 sub_0205FBC0( struct UnkCallbackStruct1_0205FA2C *param0, struct FieldSystem *fieldSystem) { - if (sub_0204647C(fieldSystem)) + if (FieldSystem_ApplicationIsRunning(fieldSystem)) { return 3; } @@ -154,7 +155,7 @@ BOOL sub_0205FBE8(struct TaskManager *taskManager) { struct FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); struct UnkCallbackStruct1_0205FA2C *res2 = - (struct UnkCallbackStruct1_0205FA2C *)sub_0204652C(taskManager); + (struct UnkCallbackStruct1_0205FA2C *)TaskManager_GetEnvironment(taskManager); switch (res2->unk04) { case 0: @@ -220,7 +221,7 @@ u32 sub_0205FC9C( u32 sub_0205FCC4( struct UnkCallbackStruct2_0205FA2C *param0, struct FieldSystem *fieldSystem) { - if (sub_0204647C(fieldSystem)) + if (FieldSystem_ApplicationIsRunning(fieldSystem)) { return 1; } @@ -235,7 +236,7 @@ BOOL sub_0205FCE8(struct TaskManager *taskManager) { struct FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); struct UnkCallbackStruct2_0205FA2C *res2 = - (struct UnkCallbackStruct2_0205FA2C *)sub_0204652C(taskManager); + (struct UnkCallbackStruct2_0205FA2C *)TaskManager_GetEnvironment(taskManager); switch (res2->unk04) { @@ -273,7 +274,7 @@ void sub_0205FD38(struct TaskManager *taskManager, u16 param1, u16 param2, u16 p BOOL sub_0205FD70(struct TaskManager *taskManager) { struct FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - u16 *res2 = (u16 *)sub_0204652C(taskManager); + u16 *res2 = (u16 *)TaskManager_GetEnvironment(taskManager); u8 *res3 = sub_020316E0(1 - sub_02031190()); if (res3 == NULL) { @@ -459,13 +460,11 @@ u32 sub_0205FF5C(struct SaveData *save) return 3; } -void sub_02060044(u16 **param0, u32 *param1) -{ - u16 *ptr = param0[42]; - - ptr[18] += param1[0]; - ptr[20] += param1[1]; - ptr[19] += param1[2]; +void sub_02060044(FieldSystem *fieldSystem, BattleSetupUnkSub138 *battleSetupSub) { + UnkStruct_02046444 *unkA8 = fieldSystem->unkA8; + unkA8->unk24 += battleSetupSub->unk0; + unkA8->unk28 += battleSetupSub->unk4; + unkA8->unk26 += battleSetupSub->unk8; } u32 sub_02060064(u32 param0) diff --git a/arm9/src/unk_0206015C.c b/arm9/src/unk_0206015C.c index f57244692..c743e2a97 100644 --- a/arm9/src/unk_0206015C.c +++ b/arm9/src/unk_0206015C.c @@ -47,7 +47,7 @@ void CallTask_UseGreatMarshBinoculars(struct FieldSystem *fieldSystem) BOOL Task_UseGreatMarshBinoculars(struct TaskManager *taskManager) { struct FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - struct UnkStruct_0204652C *unkStruct1 = (struct UnkStruct_0204652C *)sub_0204652C(taskManager); + struct UnkStruct_0204652C *unkStruct1 = (struct UnkStruct_0204652C *)TaskManager_GetEnvironment(taskManager); switch (unkStruct1->action) { @@ -55,7 +55,7 @@ BOOL Task_UseGreatMarshBinoculars(struct TaskManager *taskManager) sub_0206367C(fieldSystem, 1); ov06_02245198(unkStruct1->unkD, unkStruct1->unk4); unkStruct1->unk8 = ov06_022451F0(unkStruct1->unk4); - sub_0204AFC8(taskManager); + CallTask_FadeToBlack(taskManager); unkStruct1->action = 1; break; @@ -80,7 +80,7 @@ BOOL Task_UseGreatMarshBinoculars(struct TaskManager *taskManager) break; case 3: - sub_0204AF84(taskManager); + CallTask_RestoreOverworld(taskManager); unkStruct1->action = 4; break; @@ -101,7 +101,7 @@ BOOL Task_UseGreatMarshBinoculars(struct TaskManager *taskManager) else { MapObject_SetVisible(playerObject, FALSE); - sub_0204B00C(taskManager); + CallTask_FadeFromBlack(taskManager); unkStruct1->action = 8; } break; diff --git a/arm9/src/unk_0206439C.c b/arm9/src/unk_0206439C.c index e21142ef7..9c69a9540 100644 --- a/arm9/src/unk_0206439C.c +++ b/arm9/src/unk_0206439C.c @@ -7,7 +7,7 @@ struct UnkStruct_0206439C* sub_0206439C(HeapID heapId, u8 mon_idx, struct SaveData* save) { struct UnkStruct_0206439C* ret = AllocFromHeapAtEnd(heapId, sizeof(struct UnkStruct_0206439C)); - struct PlayerParty* party = SaveArray_PlayerParty_Get(save); + struct Party* party = SaveArray_Party_Get(save); ret->pokemon = GetPartyMonByIndex(party, mon_idx); ret->unk4 = NULL; diff --git a/arm9/src/use_item_on_mon.c b/arm9/src/use_item_on_mon.c index 1d14ce6dd..1acb0930e 100644 --- a/arm9/src/use_item_on_mon.c +++ b/arm9/src/use_item_on_mon.c @@ -266,7 +266,7 @@ BOOL CanUseItemOnPokemon(struct Pokemon * pokemon, u16 itemId, s32 moveId, HeapI return FALSE; } -BOOL CanUseItemOnMonInParty(struct PlayerParty * party, u16 itemId, s32 partyIdx, s32 moveIdx, HeapID heapId) +BOOL CanUseItemOnMonInParty(struct Party * party, u16 itemId, s32 partyIdx, s32 moveIdx, HeapID heapId) { struct Pokemon * pokemon = GetPartyMonByIndex(party, partyIdx); return CanUseItemOnPokemon(pokemon, itemId, moveIdx, heapId); @@ -534,7 +534,7 @@ BOOL UseItemOnPokemon(struct Pokemon * pokemon, u16 itemId, s32 moveIdx, u16 loc #undef sp54 #undef sp50 -BOOL UseItemOnMonInParty(struct PlayerParty * party, u16 itemId, s32 partyIdx, s32 moveIdx, u16 location, HeapID heapId) +BOOL UseItemOnMonInParty(struct Party * party, u16 itemId, s32 partyIdx, s32 moveIdx, u16 location, HeapID heapId) { struct Pokemon * pokemon = GetPartyMonByIndex(party, partyIdx); return UseItemOnPokemon(pokemon, itemId, moveIdx, location, heapId); @@ -688,7 +688,7 @@ BOOL DoItemFriendshipMod(struct Pokemon * pokemon, s32 friendship, s32 mod, u16 return TRUE; } -void HealParty(struct PlayerParty * party) +void HealParty(struct Party * party) { u32 sp8; s32 nmons; diff --git a/include/battle_setup.h b/include/battle_setup.h new file mode 100644 index 000000000..a70d70539 --- /dev/null +++ b/include/battle_setup.h @@ -0,0 +1,41 @@ +#ifndef POKEDIAMOND_BATTLE_SETUP_H +#define POKEDIAMOND_BATTLE_SETUP_H + +#include "global.h" +#include "party.h" + +#define BATTLE_SETUP_FLAG_NONE (0) +#define BATTLE_SETUP_FLAG_UNK_0 (1 << 0) +#define BATTLE_SETUP_FLAG_UNK_1 (1 << 1) +#define BATTLE_SETUP_FLAG_UNK_2 (1 << 2) +#define BATTLE_SETUP_FLAG_UNK_3 (1 << 3) +#define BATTLE_SETUP_FLAG_UNK_4 (1 << 4) +#define BATTLE_SETUP_FLAG_UNK_5 (1 << 5) +#define BATTLE_SETUP_FLAG_UNK_6 (1 << 6) +#define BATTLE_SETUP_FLAG_UNK_8 (1 << 8) +#define BATTLE_SETUP_FLAG_UNK_9 (1 << 9) +#define BATTLE_SETUP_FLAG_UNK_10 (1 << 10) +#define BATTLE_SETUP_FLAG_HEAL_AFTER_DEFEAT (1 << 11) +#define BATTLE_SETUP_FLAG_UNK_31 (1 << 31) + +typedef struct BattleSetupUnkSub138 { + u32 unk0; + u32 unk4; + u32 unk8; +} BattleSetupUnkSub138; + +typedef struct BattleSetup { + u32 flags; + Party *party[4]; + u32 winFlag; + u8 padding[0x11C]; + u32 unk134; + BattleSetupUnkSub138 unk138; + u8 padding2[0xC]; + u32 unk150; + u32 unk154; + u8 padding3[0x34]; + u32 unk18C; +} BattleSetup; + +#endif //POKEDIAMOND_BATTLE_SETUP_H \ No newline at end of file diff --git a/include/constants/flags.h b/include/constants/flags.h new file mode 100644 index 000000000..753bf6c8f --- /dev/null +++ b/include/constants/flags.h @@ -0,0 +1,6 @@ +#ifndef POKEDIAMOND_CONSTANTS_FLAGS_H +#define POKEDIAMOND_CONSTANTS_FLAGS_H + +#define FLAG_SYS_SAFARI 0x967 + +#endif //POKEDIAMOND_CONSTANTS_FLAGS_H \ No newline at end of file diff --git a/include/constants/game_stats.h b/include/constants/game_stats.h new file mode 100644 index 000000000..1a031c20a --- /dev/null +++ b/include/constants/game_stats.h @@ -0,0 +1,7 @@ +#ifndef POKEDIAMOND_CONSTANTS_GAME_STATS_H +#define POKEDIAMOND_CONSTANTS_GAME_STATS_H + +#define GAME_STAT_UNK7 7 +#define GAME_STAT_UNK21 21 + +#endif //POKEDIAMOND_CONSTANTS_GAME_STATS_H \ No newline at end of file diff --git a/include/encounter.h b/include/encounter.h new file mode 100644 index 000000000..eca97b542 --- /dev/null +++ b/include/encounter.h @@ -0,0 +1,34 @@ +#ifndef POKEDIAMOND_ENCOUNTER_H +#define POKEDIAMOND_ENCOUNTER_H + +#include "battle_setup.h" +#include "field_system.h" +#include "party.h" +#include "task.h" + +typedef struct Encounter { + u32 *winFlag; + s32 effect; + s32 bgm; + s32 unkC; + BattleSetup *setup; +} Encounter; + +typedef struct WildEncounter { + s32 state; + s32 effect; + s32 bgm; + u32 *winFlag; + BattleSetup *setup; +} WildEncounter; + +void sub_02046948(TaskManager *taskManager, u32 param1, u32 *winFlag); +void sub_020469B8(FieldSystem *fieldSystem, BattleSetup *setup); +void sub_02046A20(FieldSystem *fieldSystem, TaskManager *taskManager, BattleSetup *setup); +void SetupAndStartHoneyTreeBattle(TaskManager *taskManager, u32 *winFlag); +void SetupAndStartWildBattle(TaskManager *taskManager, u16 species, u8 level, u32 *winFlag, BOOL canFlee); +void sub_02046F70(FieldSystem *fieldSystem, BattleSetup *setup); +void SetupAndStartFirstBattle(TaskManager *taskManager, u16 species, u8 level); +void SetupAndStartTutorialBattle(TaskManager *taskManager); + +#endif //POKEDIAMOND_ENCOUNTER_H \ No newline at end of file diff --git a/include/field_system.h b/include/field_system.h new file mode 100644 index 000000000..3858a563c --- /dev/null +++ b/include/field_system.h @@ -0,0 +1,71 @@ +#ifndef POKEDIAMOND_FIELD_SYSTEM_H +#define POKEDIAMOND_FIELD_SYSTEM_H + +#include "global.h" +#include "bg_window.h" +#include "camera.h" +#include "field_player_avatar.h" +#include "save.h" +#include "task.h" + +typedef struct Location { + u32 mapId; + u32 warpId; + u32 x; + u32 y; + u32 direction; +} Location; + +typedef struct UnkFieldStruct04 { + u8 padding[0xC]; + u32 unk0C; +} UnkFieldStruct04; + +typedef struct MapObjectManager { + +} MapObjectManager; //todo: fill out + +typedef struct UnkStruct_020464D4 +{ + u16 unk0[4]; + u8 padding[0x108]; +} UnkStruct_020464D4; + +typedef struct UnkStruct_02046444 +{ + u8 padding[0x24]; + u16 unk24; + u16 unk26; + u16 unk28; + u8 padding2[0x66]; + UnkStruct_020464D4 unk90[1]; //todo find size +} UnkStruct_02046444; + +typedef struct FieldSystem +{ + u32 *unk00; + UnkFieldStruct04 *unk04; + BgConfig *bgConfig; + SaveData *saveData; //0xC + TaskManager *taskManager; + u8 padding2[0x8]; + Location *location; + Camera *camera; + u32 unk24; + u8 padding3[0xC]; + MapObjectManager *mapObjectManager; + PlayerAvatar *playerAvatar; + u8 padding4[0x24]; + u32 unk60; + u8 padding5[0x14]; + u32 unk78; + u32 unk7C; + u8 padding6[0x10]; + u32 unk90; + u8 padding7[0x4]; + u32 *unk98; + u8 padding8[0xC]; + UnkStruct_02046444 * unkA8; +} FieldSystem; + +#endif //POKEDIAMOND_FIELD_SYSTEM_H \ No newline at end of file diff --git a/include/hall_of_fame.h b/include/hall_of_fame.h index d52a20755..72323b650 100644 --- a/include/hall_of_fame.h +++ b/include/hall_of_fame.h @@ -48,7 +48,7 @@ struct HofDisplayMon u32 Save_HOF_sizeof(void); void Save_HOF_Init(struct HallOfFame * hof); -void Save_HOF_RecordParty(struct HallOfFame * hof, struct PlayerParty * party, RTCDate * date); +void Save_HOF_RecordParty(struct HallOfFame * hof, struct Party * party, RTCDate * date); u32 Save_HOF_GetNumRecords(struct HallOfFame * hof); int Save_HOF_TranslateRecordIdx(struct HallOfFame * hof, int a1); u32 Save_HOF_RecordCountMons(struct HallOfFame * hof, int a1); diff --git a/include/party.h b/include/party.h index eb608df5b..44aef7f3a 100644 --- a/include/party.h +++ b/include/party.h @@ -4,18 +4,18 @@ #include "pokemon.h" #include "save.h" -BOOL PartyHasMon(struct PlayerParty * party_p, u16 species); -int GetPartyCount(struct PlayerParty * party_p); -struct Pokemon * GetPartyMonByIndex(struct PlayerParty * party_p, int idx); +BOOL PartyHasMon(struct Party * party_p, u16 species); +int GetPartyCount(struct Party * party_p); +struct Pokemon * GetPartyMonByIndex(struct Party * party_p, int idx); u32 SaveArray_Party_sizeof(void); -struct PlayerParty * SaveArray_Party_Alloc(HeapID heapId); -void SaveArray_Party_Init(struct PlayerParty * party); -void InitPartyWithMaxSize(struct PlayerParty * party, int count); -BOOL AddMonToParty(struct PlayerParty * party, struct Pokemon * pokemon); -BOOL RemoveMonFromParty(struct PlayerParty * party, int pos); -void ReplacePartySlotWithMon(struct PlayerParty * party, int pos, struct Pokemon * pokemon); -BOOL SwapSlotsInParty(struct PlayerParty * party, int pos1, int pos2); -void CopyPlayerParty(struct PlayerParty * src, struct PlayerParty * dest); -struct PlayerParty * SaveArray_PlayerParty_Get(struct SaveData * ptr); +struct Party * SaveArray_Party_Alloc(HeapID heapId); +void SaveArray_Party_Init(struct Party * party); +void InitPartyWithMaxSize(struct Party * party, int count); +BOOL AddMonToParty(struct Party * party, struct Pokemon * pokemon); +BOOL RemoveMonFromParty(struct Party * party, int pos); +void ReplacePartySlotWithMon(struct Party * party, int pos, struct Pokemon * pokemon); +BOOL SwapSlotsInParty(struct Party * party, int pos1, int pos2); +void CopyParty(struct Party * src, struct Party * dest); +struct Party * SaveArray_Party_Get(struct SaveData * ptr); #endif //POKEDIAMOND_PARTY_H diff --git a/include/pokemon.h b/include/pokemon.h index 25a3347dc..39e6df22f 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -193,12 +193,12 @@ struct Evolution #define PARTY_SIZE 6 -typedef struct PlayerParty +typedef struct Party { int maxCount; int curCount; struct Pokemon mons[PARTY_SIZE]; -} PlayerParty; +} Party; void ZeroMonData(struct Pokemon * pokemon); void ZeroBoxMonData(struct BoxPokemon * boxmon); @@ -268,7 +268,7 @@ u8 GetBoxMonUnownLetter(struct BoxPokemon * boxmon); u8 GetMonUnownLetter(struct Pokemon * pokemon); struct BoxPokemon * sub_020690E4(struct Pokemon * pokemon); -u16 GetMonEvolution(struct PlayerParty * party, struct Pokemon * pokemon, u32 context, u32 usedItem, u32 * method_ret); +u16 GetMonEvolution(struct Party * party, struct Pokemon * pokemon, u32 context, u32 usedItem, u32 * method_ret); u16 ReadFromPersonalPmsNarc(u16 species); u16 GetEggSpecies(u16 species); BOOL sub_020690E8(struct Pokemon * pokemon); @@ -281,7 +281,7 @@ void sub_020698E0(struct Pokemon * pokemon, int slot1, int slot2); void sub_020698E8(struct BoxPokemon * boxmon, int slot1, int slot2); void sub_020699A4(struct Pokemon * pokemon, u32 slot); void CopyBoxPokemonToPokemon(struct BoxPokemon * src, struct Pokemon * dest); -u8 Party_GetMaxLevel(struct PlayerParty * party); +u8 Party_GetMaxLevel(struct Party * party); u16 SpeciesToSinnohDexNo(u16 species); u16 SinnohDexNoToSpecies(u16 sinnoh_dex); void CopyPokemonToPokemon(struct Pokemon * src, struct Pokemon * dest); @@ -289,9 +289,9 @@ void CopyPokemonToBoxPokemon(struct Pokemon * src, struct BoxPokemon * dest); void CopyBoxPokemonToBoxPokemon(struct BoxPokemon * src, struct BoxPokemon * dest); s8 MonGetFlavorPreference(struct Pokemon * pokemon, int flavor); int Species_LoadLearnsetTable(u16 species, u32 form, u16 * dest); -void Party_GivePokerusAtRandom(struct PlayerParty * party); -void Party_UpdatePokerus(struct PlayerParty * party, int r5); -void Party_SpreadPokerus(struct PlayerParty * party); +void Party_GivePokerusAtRandom(struct Party * party); +void Party_UpdatePokerus(struct Party * party, int r5); +void Party_SpreadPokerus(struct Party * party); BOOL Pokemon_HasPokerus(struct Pokemon * pokemon); BOOL Pokemon_IsImmuneToPokerus(struct Pokemon * pokemon); void Pokemon_UpdateArceusForm(struct Pokemon * pokemon); diff --git a/include/script.h b/include/script.h index d47e5210b..88de64454 100644 --- a/include/script.h +++ b/include/script.h @@ -10,24 +10,13 @@ #include "render_window.h" #include "save.h" #include "task.h" +#include "field_system.h" struct ScriptContext; typedef u8 (*ScrCmdFunc)(struct ScriptContext *); typedef u8 Script[]; -struct UnkStruct_020464D4 -{ - u16 unk0[4]; - u8 padding[0x108]; -}; - -struct UnkStruct_02046444 -{ - u8 padding[0x90]; - struct UnkStruct_020464D4 unk90[1]; //todo find size -}; - typedef struct LocalMapObject { //todo move to local_map_object.c u8 padding[0x12C]; //todo verify size } LocalMapObject; @@ -78,19 +67,6 @@ typedef struct ScrCmdUnkStruct00F4 { u32 unk2C; } ScrCmdUnkStruct00F4; //todo identify and move to own file -typedef struct Location { - u32 mapId; - u32 warpId; - u32 x; - u32 y; - u32 direction; -} Location; - -typedef struct UnkFieldStruct04 { - u8 padding[0xC]; - u32 unk0C; -} UnkFieldStruct04; - typedef struct LocalFieldData { } LocalFieldData; //todo fill out and move to own file @@ -99,10 +75,6 @@ typedef struct RoamerSaveData { } RoamerSaveData; //todo: fill out and move to own file -typedef struct MapObjectManager { - -} MapObjectManager; //todo: fill out - typedef struct PokedexAppData { } PokedexAppData; //todo: fill out and move to own file @@ -123,32 +95,6 @@ typedef struct SaveStatsPrinter { } SaveStatsPrinter; //todo: fill out and move to own file -typedef struct FieldSystem //todo move to field_system.c -{ - u32 *unk00; - UnkFieldStruct04 *unk04; - struct BgConfig *bgConfig; - struct SaveData *saveData; //0xC - TaskManager *taskManager; - u8 padding2[0x8]; - Location *location; - struct Camera *camera; - u32 unk24; - u8 padding3[0xC]; - MapObjectManager *mapObjectManager; - struct PlayerAvatar *playerAvatar; - u8 padding4[0x24]; - u32 unk60; - u8 padding5[0x14]; - u32 unk78; - u32 unk7C; - u8 padding6[0x10]; - u32 unk90; - u8 padding7[0x4]; - u32 *unk98; - u8 padding8[0xC]; - struct UnkStruct_02046444 * unkA8; -} FieldSystem; typedef struct ScriptContext { diff --git a/include/script_pokemon_util.h b/include/script_pokemon_util.h index c1415f2d9..d4ee42f59 100644 --- a/include/script_pokemon_util.h +++ b/include/script_pokemon_util.h @@ -4,14 +4,14 @@ BOOL MonNotFaintedOrEgg(struct Pokemon * pokemon); BOOL GiveMon(HeapID heapId, struct SaveData * save, u16 species, u8 level, u16 item, u32 mapSec, u32 encounterType); BOOL GiveEgg(HeapID heapId, struct SaveData * save, u16 species, int level, int metLocIndex, int a3); -void PartyMonSetMoveInSlot(struct PlayerParty * party, int partySlot, int moveSlot, u16 move); -int GetIdxOfFirstPartyMonWithMove(struct PlayerParty * party, int move); -int CountAlivePokemon(struct PlayerParty * party); -struct Pokemon * GetFirstAliveMonInParty_CrashIfNone(struct PlayerParty * party); -struct Pokemon * GetFirstNonEggInParty(struct PlayerParty * party); -BOOL HasEnoughAlivePokemonForDoubleBattle(struct PlayerParty * party); -void GiveAllMonsTheSinnohChampRibbon(struct PlayerParty * party); -int ApplyPoisonStep(struct PlayerParty * party, int location); +void PartyMonSetMoveInSlot(struct Party * party, int partySlot, int moveSlot, u16 move); +int GetIdxOfFirstPartyMonWithMove(struct Party * party, int move); +int CountAlivePokemon(struct Party * party); +struct Pokemon * GetFirstAliveMonInParty_CrashIfNone(struct Party * party); +struct Pokemon * GetFirstNonEggInParty(struct Party * party); +BOOL HasEnoughAlivePokemonForDoubleBattle(struct Party * party); +void GiveAllMonsTheSinnohChampRibbon(struct Party * party); +int ApplyPoisonStep(struct Party * party, int location); BOOL SurvivePoisoning(struct Pokemon * mon); #endif //POKEDIAMOND_SCRIPT_POKEMON_UTIL_H diff --git a/include/task.h b/include/task.h index 10bbbdd3e..bb9143e34 100644 --- a/include/task.h +++ b/include/task.h @@ -28,19 +28,19 @@ extern BOOL sub_020373AC(void *); extern BOOL sub_0203739C(struct FieldSystem *fieldSystem); extern BOOL sub_020373C4(struct FieldSystem *fieldSystem); -struct TaskManager *FieldSys_CreateTask(struct FieldSystem *fieldSystem, TaskFunc taskFunc, void *env); -void sub_020463CC(struct FieldSystem *fieldSystem, TaskFunc taskFunc, void *env); -void sub_020463EC(struct TaskManager *taskManager, TaskFunc taskFunc, void *env); +struct TaskManager *Task_New(struct FieldSystem *fieldSystem, TaskFunc taskFunc, void *env); +void FieldSystem_CreateTask(struct FieldSystem *fieldSystem, TaskFunc taskFunc, void *env); +void TaskManager_Jump(struct TaskManager *taskManager, TaskFunc taskFunc, void *env); void TaskManager_Call(struct TaskManager *taskManager, TaskFunc taskFunc, void *env); BOOL sub_02046420(struct TaskManager *taskManager); BOOL sub_0204646C(struct TaskManager *taskManager); -BOOL sub_0204647C(struct FieldSystem *fieldSystem); +BOOL FieldSystem_ApplicationIsRunning(struct FieldSystem *fieldSystem); void sub_0204649C(void * r0); BOOL sub_020464A4(void * r0); BOOL sub_020464B8(struct TaskManager *taskManager); void sub_02046500(struct TaskManager *taskManager, u32 r5, u32 r4); -void * sub_0204652C(struct TaskManager *taskManager); -u32 * sub_02046530(struct TaskManager *taskManager); +void * TaskManager_GetEnvironment(struct TaskManager *taskManager); +u32 * TaskManager_GetStatePtr(struct TaskManager *taskManager); u32 sub_02046534(struct TaskManager *taskManager); struct FieldSystem *TaskManager_GetFieldSystem(struct TaskManager *taskManager); diff --git a/include/trainer_data.h b/include/trainer_data.h index 0a0fe8632..d9261cfb5 100644 --- a/include/trainer_data.h +++ b/include/trainer_data.h @@ -73,7 +73,7 @@ struct TrainerDataLoaded struct BattleSetupStruct { u32 flags; - struct PlayerParty * parties[4]; + struct Party * parties[4]; u16 field_14[2]; u32 trainer_idxs[4]; struct TrainerDataLoaded datas[4]; diff --git a/include/unk_020040F4.h b/include/unk_020040F4.h index 769c41e57..a5f47b456 100644 --- a/include/unk_020040F4.h +++ b/include/unk_020040F4.h @@ -41,7 +41,7 @@ u16 sub_02004140(void); void sub_0200414C(u16 param0); void sub_0200415C(u8 param0); BOOL sub_02004180(s32 param0); -BOOL sub_0200433C(u8 param0, int param1, u32 param2); +BOOL sub_0200433C(u8 param0, u16 param1, u32 param2); void sub_020044A8(s32 param0); void sub_020044D4(int seqNo, u32 param1); void sub_02004568(int seqNo, u16 param1); diff --git a/include/unk_02022504.h b/include/unk_02022504.h index 1c59bf95c..4b9e22a72 100644 --- a/include/unk_02022504.h +++ b/include/unk_02022504.h @@ -8,7 +8,7 @@ #include "unk_0202AC20.h" SafariZone *Save_SafariZone_Get(struct SaveData *save); -struct PCStorage *GetStoragePCPointer(struct SaveData *save); +struct PCStorage *Save_PCStorage_Get(struct SaveData *save); struct UnkStruct_0202AC20 * sub_0202251C(struct SaveData *save); void *sub_02022528(struct SaveData *save); HallOfFame *LoadHallOfFame(struct SaveData *save, HeapID heapId, int *ret_p); diff --git a/include/unk_020377F0.h b/include/unk_020377F0.h index d6522c1ec..ddf4000bc 100644 --- a/include/unk_020377F0.h +++ b/include/unk_020377F0.h @@ -6,13 +6,13 @@ // this file likely has to do with scrcmd apps. struct Options; -struct PlayerParty; +struct Party; // This struct gets created from a bunch of places, not just 0x02037CF0. This was // just the first place I (tgsm) found it being created. struct UnkStruct_02037CF0 { - struct PlayerParty* party; + struct Party* party; struct Options* options; u16* name_buf; u32 trainer_id; diff --git a/include/unk_0204AF24.h b/include/unk_0204AF24.h index ccfdc5b59..4804e15b9 100644 --- a/include/unk_0204AF24.h +++ b/include/unk_0204AF24.h @@ -7,10 +7,10 @@ BOOL sub_0204AF24(struct TaskManager *taskManager); void sub_0204AF3C(struct TaskManager *taskManager); BOOL sub_0204AF6C(struct TaskManager *taskManager); -void sub_0204AF84(struct TaskManager *taskManager); -BOOL sub_0204AFB4(struct TaskManager *taskManager); -void sub_0204AFC8(struct TaskManager *taskManager); -void sub_0204B00C(struct TaskManager *taskManager); +void CallTask_RestoreOverworld(struct TaskManager *taskManager); +BOOL Task_ProcessFade(struct TaskManager *taskManager); +void CallTask_FadeToBlack(struct TaskManager *taskManager); +void CallTask_FadeFromBlack(struct TaskManager *taskManager); BOOL sub_0204B050(struct TaskManager *taskManager); void sub_0204B090(struct TaskManager *taskManager); BOOL sub_0204B0A0(struct TaskManager *taskManager); diff --git a/include/unk_0205EC84.h b/include/unk_0205EC84.h index 2b02d24d1..612692b00 100644 --- a/include/unk_0205EC84.h +++ b/include/unk_0205EC84.h @@ -10,7 +10,7 @@ void sub_0205ECFC(struct SaveVarsFlags * state); BOOL sub_0205ED0C(struct SaveVarsFlags * state); void sub_0205ED1C(struct SaveVarsFlags * state); void sub_0205ED2C(struct SaveVarsFlags * state); -BOOL sub_0205ED3C(struct SaveVarsFlags * state); +BOOL Save_VarsFlags_CheckHaveFollower(struct SaveVarsFlags * state); void sub_0205ED4C(struct SaveVarsFlags * state); void sub_0205ED5C(struct SaveVarsFlags * state); BOOL sub_0205ED6C(struct SaveVarsFlags * state); @@ -39,7 +39,7 @@ void sub_0205F1D4(struct SaveVarsFlags * state); BOOL sub_0205F1E4(struct SaveVarsFlags * state); void Save_VarsFlags_SetSafariSysFlag(struct SaveVarsFlags * state); void Save_VarsFlags_ClearSafariSysFlag(struct SaveVarsFlags * state); -BOOL sub_0205F214(struct SaveVarsFlags * state); +BOOL Save_VarsFlags_CheckSafariSysFlag(struct SaveVarsFlags * state); void sub_0205F224(struct SaveVarsFlags * state); void sub_0205F234(struct SaveVarsFlags * state); BOOL sub_0205F244(struct SaveVarsFlags * state); diff --git a/include/unk_0205FA2C.h b/include/unk_0205FA2C.h index 3326932d7..0d3349960 100644 --- a/include/unk_0205FA2C.h +++ b/include/unk_0205FA2C.h @@ -4,6 +4,7 @@ #include "global.h" #include "MI_memory.h" #include "bag.h" +#include "battle_setup.h" #include "heap.h" #include "party.h" #include "player_data.h" @@ -17,7 +18,7 @@ struct UnkPlayerStruct1_0205FA2C { - /* 0x00 */ struct PlayerParty *player_party; + /* 0x00 */ struct Party *player_party; /* 0x04 */ struct Bag *bag; u32 unk08; /* 0x0c */ struct Options *options; @@ -36,7 +37,7 @@ struct UnkPlayerStruct1_0205FA2C struct UnkPlayerStruct2_0205FA2C { - /* 0x00 */ struct PlayerParty *player_party; + /* 0x00 */ struct Party *player_party; /* 0x04 */ struct Options *options; u32 unk08; u32 unk0c; @@ -110,7 +111,7 @@ void sub_0205FDDC(struct TaskManager *taskManager, u16 param1, u16 param2); u32 sub_0205FE10(struct SaveData *save); u32 sub_0205FF5C(struct SaveData *save); -void sub_02060044(u16 **param0, u32 *param1); +void sub_02060044(FieldSystem *fieldSystem, BattleSetupUnkSub138 *battleSetupSub); u32 sub_02060064(u32 param0); u32 sub_02060070(u32 param0); u32 sub_0206007C(struct SaveData *save); diff --git a/include/use_item_on_mon.h b/include/use_item_on_mon.h index d807f6c0e..df59bac91 100644 --- a/include/use_item_on_mon.h +++ b/include/use_item_on_mon.h @@ -1,10 +1,12 @@ #ifndef POKEDIAMOND_USE_ITEM_ON_MON_H #define POKEDIAMOND_USE_ITEM_ON_MON_H +#include "itemtool.h" + BOOL CanUseItemOnPokemon(struct Pokemon * pokemon, u16 itemId, s32 moveId, HeapID heapId); -BOOL CanUseItemOnMonInParty(struct PlayerParty * party, u16 itemId, s32 partyIdx, s32 moveIdx, HeapID heapId); +BOOL CanUseItemOnMonInParty(struct Party * party, u16 itemId, s32 partyIdx, s32 moveIdx, HeapID heapId); BOOL UseItemOnPokemon(struct Pokemon * pokemon, u16 itemId, s32 moveIdx, u16 location, HeapID heapId); -BOOL UseItemOnMonInParty(struct PlayerParty * party, u16 itemId, s32 partyIdx, s32 moveIdx, u16 location, HeapID heapId); +BOOL UseItemOnMonInParty(struct Party * party, u16 itemId, s32 partyIdx, s32 moveIdx, u16 location, HeapID heapId); u8 MonMoveCanRestorePP(struct Pokemon * pokemon, s32 moveIdx); BOOL MonMoveRestorePP(struct Pokemon * pokemon, s32 moveIdx, s32 ppRestore); BOOL BoostMonMovePpUpBy(struct Pokemon * pokemon, s32 moveIdx, u32 nPpUp); @@ -12,6 +14,6 @@ void RestoreMonHPBy(struct Pokemon * pokemon, u32 hp, u32 maxHp, u32 restoration s32 TryModEV(s32 ev, s32 evSum, s32 by); BOOL CanItemModFriendship(struct Pokemon * pokemon, struct ItemData * itemData); BOOL DoItemFriendshipMod(struct Pokemon * pokemon, s32 friendship, s32 mod, u16 location, HeapID heapId); -void HealParty(struct PlayerParty * party); +void HealParty(struct Party * party); #endif //POKEDIAMOND_USE_ITEM_ON_MON_H From d5a1d28c9935dca1cd739ee256c7240b902054e8 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sat, 12 Aug 2023 00:12:28 +0100 Subject: [PATCH 02/11] switch fully to battle type constants --- arm9/src/encounter.c | 13 +++++++------ include/battle_setup.h | 14 -------------- include/constants/battle.h | 31 ++++++++++++++++++++++++++++--- 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/arm9/src/encounter.c b/arm9/src/encounter.c index 82dd25fd2..fa5efe797 100644 --- a/arm9/src/encounter.c +++ b/arm9/src/encounter.c @@ -1,5 +1,6 @@ #include "global.h" #include "encounter.h" +#include "constants/battle.h" #include "constants/game_stats.h" #include "event_data.h" #include "field_system.h" @@ -120,7 +121,7 @@ static BOOL GetEncounterResult(Encounter *encounter) { } static void sub_020465E4(BattleSetup *setup, FieldSystem *fieldSystem) { - if (!(setup->flags & BATTLE_SETUP_FLAG_UNK_31)) { + if (!(setup->flags & BATTLE_TYPE_DEBUG)) { sub_02047F38(setup, fieldSystem); } } @@ -146,7 +147,7 @@ static BOOL Task_StartEncounter(TaskManager *taskManager) { //todo: better name break; case 3: sub_020465E4(encounter->setup, fieldSystem); - if (encounter->setup->flags == BATTLE_SETUP_FLAG_NONE || encounter->setup->flags == BATTLE_SETUP_FLAG_UNK_8 || encounter->setup->flags == (BATTLE_SETUP_FLAG_UNK_1 | BATTLE_SETUP_FLAG_UNK_3 | BATTLE_SETUP_FLAG_UNK_6)) { + if (encounter->setup->flags == BATTLE_TYPE_NONE || encounter->setup->flags == BATTLE_TYPE_8 || encounter->setup->flags == (BATTLE_TYPE_DOUBLES | BATTLE_TYPE_MULTI | BATTLE_TYPE_6)) { sub_02061080(fieldSystem, encounter->setup->unk134, encounter->setup->winFlag); } @@ -440,7 +441,7 @@ static BOOL Task_SafariEncounter(TaskManager *taskManager) { sub_020465E4(encounter->setup, fieldSystem); if (encounter->setup->winFlag == 4) { SafariZone *safariZone = Save_SafariZone_Get(fieldSystem->saveData); - Pokemon *pokemon = GetPartyMonByIndex(encounter->setup->party[1], 0); + Pokemon *pokemon = GetPartyMonByIndex(encounter->setup->party[BATTLER_ENEMY], 0); sub_02060FE0(safariZone, pokemon); } @@ -488,7 +489,7 @@ static BOOL Task_SafariEncounter(TaskManager *taskManager) { void SetupAndStartHoneyTreeBattle(TaskManager *taskManager, u32 *winFlag) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); sub_0205DD40(fieldSystem->unk90); - BattleSetup *setup = BattleSetup_New(HEAP_ID_FIELD, BATTLE_SETUP_FLAG_NONE); + BattleSetup *setup = BattleSetup_New(HEAP_ID_FIELD, BATTLE_TYPE_NONE); BattleSetup_InitFromFieldSystem(setup, fieldSystem); setup->unk150 = 0; @@ -504,7 +505,7 @@ void SetupAndStartWildBattle(TaskManager *taskManager, u16 species, u8 level, u3 BattleSetup *setup; FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); sub_0205DD40(fieldSystem->unk90); - setup = BattleSetup_New(HEAP_ID_FIELD, BATTLE_SETUP_FLAG_NONE); + setup = BattleSetup_New(HEAP_ID_FIELD, BATTLE_TYPE_NONE); BattleSetup_InitFromFieldSystem(setup, fieldSystem); ov06_0223CD7C(fieldSystem, species, level, setup); @@ -571,7 +572,7 @@ void sub_02046F70(FieldSystem *fieldSystem, BattleSetup *setup) { void SetupAndStartFirstBattle(TaskManager *taskManager, u16 species, u8 level) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - BattleSetup *setup = BattleSetup_New(HEAP_ID_FIELD, 0); + BattleSetup *setup = BattleSetup_New(HEAP_ID_FIELD, BATTLE_TYPE_NONE); BattleSetup_InitFromFieldSystem(setup, fieldSystem); ov06_0223CD7C(fieldSystem, species, level, setup); diff --git a/include/battle_setup.h b/include/battle_setup.h index a70d70539..d69a96ef3 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -4,20 +4,6 @@ #include "global.h" #include "party.h" -#define BATTLE_SETUP_FLAG_NONE (0) -#define BATTLE_SETUP_FLAG_UNK_0 (1 << 0) -#define BATTLE_SETUP_FLAG_UNK_1 (1 << 1) -#define BATTLE_SETUP_FLAG_UNK_2 (1 << 2) -#define BATTLE_SETUP_FLAG_UNK_3 (1 << 3) -#define BATTLE_SETUP_FLAG_UNK_4 (1 << 4) -#define BATTLE_SETUP_FLAG_UNK_5 (1 << 5) -#define BATTLE_SETUP_FLAG_UNK_6 (1 << 6) -#define BATTLE_SETUP_FLAG_UNK_8 (1 << 8) -#define BATTLE_SETUP_FLAG_UNK_9 (1 << 9) -#define BATTLE_SETUP_FLAG_UNK_10 (1 << 10) -#define BATTLE_SETUP_FLAG_HEAL_AFTER_DEFEAT (1 << 11) -#define BATTLE_SETUP_FLAG_UNK_31 (1 << 31) - typedef struct BattleSetupUnkSub138 { u32 unk0; u32 unk4; diff --git a/include/constants/battle.h b/include/constants/battle.h index 21a5f080d..9d699a657 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -1,5 +1,30 @@ -#ifndef POKEDIAMOND_BATTLE_H -#define POKEDIAMOND_BATTLE_H +#ifndef POKEDIAMOND_CONSTANTS_BATTLE_H +#define POKEDIAMOND_CONSTANTS_BATTLE_H + +//Battler IDs +#define BATTLER_NONE 0xFF +#define BATTLER_PLAYER 0 +#define BATTLER_ENEMY 1 +#define BATTLER_PLAYER2 2 +#define BATTLER_ENEMY2 3 + +//Battle Type +#define BATTLE_TYPE_NONE 0 +#define BATTLE_TYPE_TRAINER (1 << 0) +#define BATTLE_TYPE_DOUBLES (1 << 1) +#define BATTLE_TYPE_LINK (1 << 2) +#define BATTLE_TYPE_MULTI (1 << 3) +#define BATTLE_TYPE_INGAME_PARTNER (1 << 4) +#define BATTLE_TYPE_SAFARI (1 << 5) +#define BATTLE_TYPE_6 (1 << 6) +#define BATTLE_TYPE_TOWER (1 << 7) +#define BATTLE_TYPE_8 (1 << 8) +#define BATTLE_TYPE_PAL_PARK (1 << 9) +#define BATTLE_TYPE_TUTORIAL (1 << 10) +#define BATTLE_TYPE_11 (1 << 11) +#define BATTLE_TYPE_DEBUG (1 << 31) + +#define BATTLE_TYPE_NO_EXP (BATTLE_TYPE_LINK | BATTLE_TYPE_SAFARI | BATTLE_TYPE_TOWER | BATTLE_TYPE_PAL_PARK) #define MOVE_EFFECT_NORMAL_HIT 0 #define MOVE_EFFECT_SLEEP 1 @@ -280,4 +305,4 @@ #define MOVE_EFFECT_CHARGE_BEAM 276 -#endif //POKEDIAMOND_BATTLE_H +#endif //POKEDIAMOND_CONSTANTS_BATTLE_H From 400e6aea2b2891d599f5ba5cf3d749ab65053f8f Mon Sep 17 00:00:00 2001 From: red031000 Date: Tue, 15 Aug 2023 04:34:27 +0100 Subject: [PATCH 03/11] decompile SetupAndStartTrainerBattle --- arm9/asm/encounter_asm.s | 68 ---------------------------------- arm9/src/encounter.c | 36 +++++++++++++++++- arm9/src/message_format.c | 4 +- arm9/src/trainer_data.c | 67 ++++++++++++++++----------------- include/battle_setup.h | 9 +++-- include/constants/game_stats.h | 1 + include/encounter.h | 1 + include/message_format.h | 4 +- include/trainer_data.h | 23 ++++-------- 9 files changed, 88 insertions(+), 125 deletions(-) diff --git a/arm9/asm/encounter_asm.s b/arm9/asm/encounter_asm.s index 8dbab9f4a..90068185c 100644 --- a/arm9/asm/encounter_asm.s +++ b/arm9/asm/encounter_asm.s @@ -2,79 +2,11 @@ .include "global.inc" .extern Encounter_New - .extern CallTask_StartEncounter .extern sub_02046758 .extern sub_020467FC .text - thumb_func_start SetupAndStartTrainerBattle -SetupAndStartTrainerBattle: ; 0x020470E8 - push {r4-r7, lr} - sub sp, #0xc - str r0, [sp, #0x4] - add r6, r1, #0x0 - add r5, r2, #0x0 - str r3, [sp, #0x8] - bl TaskManager_GetFieldSystem - add r7, r0, #0x0 - cmp r5, #0x0 - beq _02047110 - cmp r6, r5 - beq _02047110 - ldr r0, [sp, #0x8] - cmp r0, #0x0 - bne _0204710C - mov r4, #0x13 - b _0204711A -_0204710C: - mov r4, #0x4b - b _0204711A -_02047110: - cmp r6, r5 - bne _02047118 - mov r4, #0x3 - b _0204711A -_02047118: - mov r4, #0x1 -_0204711A: - add r0, r7, #0x0 - add r0, #0x90 - ldr r0, [r0, #0x0] - bl sub_0205DD40 - mov r0, #0xb - add r1, r4, #0x0 - bl BattleSetup_New - add r4, r0, #0x0 - add r1, r7, #0x0 - bl BattleSetup_InitFromFieldSystem - str r6, [r4, #0x1c] - ldr r0, [sp, #0x8] - str r5, [r4, #0x24] - str r0, [r4, #0x20] - ldr r1, [r7, #0xc] - ldr r2, [sp, #0x20] - add r0, r4, #0x0 - bl EnemyTrainerSet_Init - ldr r0, [r7, #0xc] - bl Save_GameStats_Get - mov r1, #0x8 - bl GameStats_Inc - add r0, r4, #0x0 - bl sub_020475A0 - add r5, r0, #0x0 - add r0, r4, #0x0 - bl sub_020475B0 - add r3, r0, #0x0 - ldr r0, [sp, #0x24] - add r1, r4, #0x0 - str r0, [sp, #0x0] - ldr r0, [sp, #0x4] - add r2, r5, #0x0 - bl CallTask_StartEncounter - add sp, #0xc - pop {r4-r7, pc} - thumb_func_start sub_02047174 sub_02047174: ; 0x02047174 push {r3-r7, lr} diff --git a/arm9/src/encounter.c b/arm9/src/encounter.c index fa5efe797..7a9512e5c 100644 --- a/arm9/src/encounter.c +++ b/arm9/src/encounter.c @@ -59,7 +59,7 @@ static void Encounter_Delete(Encounter *encounter); static BOOL GetEncounterResult(Encounter *encounter); static void sub_020465E4(BattleSetup *setup, FieldSystem *fieldSystem); static BOOL Task_StartEncounter(TaskManager *taskManager); -/*static*/ void CallTask_StartEncounter(TaskManager *taskManager, BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag); +static void CallTask_StartEncounter(TaskManager *taskManager, BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag); static void sub_0204671C(s32 flag, FieldSystem *fieldSystem); /*static*/ BOOL sub_02046758(TaskManager *taskManager); /*static*/ BOOL sub_020467FC(TaskManager *taskManager); @@ -179,7 +179,7 @@ static BOOL Task_StartEncounter(TaskManager *taskManager) { //todo: better name return FALSE; } -/*static*/ void CallTask_StartEncounter(TaskManager *taskManager, BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag) { +static void CallTask_StartEncounter(TaskManager *taskManager, BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag) { Encounter *encounter = Encounter_New(setup, effect, bgm, winFlag); TaskManager_Call(taskManager, Task_StartEncounter, encounter); } @@ -632,3 +632,35 @@ void SetupAndStartTutorialBattle(TaskManager *taskManager) { TaskManager_Call(taskManager, Task_TutorialBattle, encounter); } + +void SetupAndStartTrainerBattle(TaskManager *taskManager, u32 opponentTrainer1, u32 opponentTrainer2, u32 followerTrainerNum, HeapID heapId, u32 *winFlag) { + u32 battleType; + BattleSetup *setup; + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + + if (opponentTrainer2 != 0 && opponentTrainer1 != opponentTrainer2) { + if (followerTrainerNum == 0) { + battleType = (BATTLE_TYPE_TRAINER | BATTLE_TYPE_DOUBLES | BATTLE_TYPE_INGAME_PARTNER); + } else { + battleType = (BATTLE_TYPE_TRAINER | BATTLE_TYPE_DOUBLES | BATTLE_TYPE_MULTI | BATTLE_TYPE_6); + } + } else if (opponentTrainer1 == opponentTrainer2) { + battleType = (BATTLE_TYPE_TRAINER | BATTLE_TYPE_DOUBLES); + } else { + battleType = BATTLE_TYPE_TRAINER; + } + sub_0205DD40(fieldSystem->unk90); + + setup = BattleSetup_New(HEAP_ID_FIELD, battleType); + BattleSetup_InitFromFieldSystem(setup, fieldSystem); + + setup->trainerId[1] = opponentTrainer1; + setup->trainerId[3] = opponentTrainer2; + setup->trainerId[2] = followerTrainerNum; + + EnemyTrainerSet_Init(setup, fieldSystem->saveData, heapId); + + GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK8); + + CallTask_StartEncounter(taskManager, setup, sub_020475A0(setup), sub_020475B0(setup), winFlag); +} diff --git a/arm9/src/message_format.c b/arm9/src/message_format.c index b690cb000..9f3f9d3ef 100644 --- a/arm9/src/message_format.c +++ b/arm9/src/message_format.c @@ -362,7 +362,7 @@ void BufferTrainerClassNameWithArticle(MessageFormat *messageFormat, u32 idx, u3 } } -void BufferTrainerClassNameFromDataStruct(MessageFormat *messageFormat, u32 idx, struct TrainerDataLoaded * tr) +void BufferTrainerClassNameFromDataStruct(MessageFormat *messageFormat, u32 idx, Trainer * tr) { struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0560_bin, messageFormat->heapId); if (msgData != NULL) @@ -384,7 +384,7 @@ void BufferTrainerName(MessageFormat *messageFormat, u32 idx, u32 msgno) } } -void BufferTrainerNameFromDataStruct(MessageFormat *messageFormat, u32 idx, struct TrainerDataLoaded * trdata) +void BufferTrainerNameFromDataStruct(MessageFormat *messageFormat, u32 idx, Trainer * trdata) { CopyU16ArrayToString(messageFormat->buffer, trdata->name); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); diff --git a/arm9/src/trainer_data.c b/arm9/src/trainer_data.c index eb6e56c6e..ca1625451 100644 --- a/arm9/src/trainer_data.c +++ b/arm9/src/trainer_data.c @@ -1,6 +1,7 @@ #include "global.h" #include "heap.h" #include "trainer_data.h" +#include "battle_setup.h" #include "math_util.h" #include "party.h" #include "proto.h" @@ -10,9 +11,9 @@ #include "unk_02024E64.h" // Loads all battle opponents, including multi-battle partner if exists. -void EnemyTrainerSet_Init(struct BattleSetupStruct * enemies, struct SaveData * save, HeapID heapId) +void EnemyTrainerSet_Init(BattleSetup *setup, struct SaveData * save, HeapID heapId) { - struct TrainerDataLoaded trdata; + Trainer trdata; struct MsgData * msgData; u16 * rivalName; s32 i; @@ -22,30 +23,30 @@ void EnemyTrainerSet_Init(struct BattleSetupStruct * enemies, struct SaveData * rivalName = GetRivalNamePtr(sub_02024EC0(save)); for (i = 0; i < 4; i++) { - if (enemies->trainer_idxs[i] != 0) + if (setup->trainerId[i] != 0) { - TrainerData_ReadTrData(enemies->trainer_idxs[i], &trdata.data); - enemies->datas[i] = trdata; + TrainerData_ReadTrData(setup->trainerId[i], &trdata.data); + setup->trainers[i] = trdata; if (trdata.data.trainerClass == TRAINER_CLASS_PKMN_TRAINER_BARRY) { - CopyU16StringArray(enemies->datas[i].name, rivalName); + CopyU16StringArray(setup->trainers[i].name, rivalName); } else { - str = NewString_ReadMsgData(msgData, enemies->trainer_idxs[i]); - CopyStringToU16Array(str, enemies->datas[i].name, PLAYER_NAME_LENGTH + 1); + str = NewString_ReadMsgData(msgData, setup->trainerId[i]); + CopyStringToU16Array(str, setup->trainers[i].name, PLAYER_NAME_LENGTH + 1); String_Delete(str); } - CreateNPCTrainerParty(enemies, i, heapId); + CreateNPCTrainerParty(setup, i, heapId); } } - enemies->flags |= trdata.data.doubleBattle; + setup->flags |= trdata.data.doubleBattle; DestroyMsgData(msgData); } s32 TrainerData_GetAttr(u32 tr_idx, u32 attr_no) { - struct TrainerDataLoaded trainer; + Trainer trainer; s32 ret; TrainerData_ReadTrData(tr_idx, &trainer.data); @@ -71,7 +72,7 @@ s32 TrainerData_GetAttr(u32 tr_idx, u32 attr_no) ret = trainer.data.items[attr_no]; break; case 8: - ret = (s32)trainer.data.unk_C; + ret = (s32)trainer.data.aiFlags; break; case 9: ret = (s32)trainer.data.doubleBattle; @@ -257,7 +258,7 @@ int TrainerClass_GetGenderOrTrainerCount(int a0) return sTrainerClassGenderCountTbl[a0]; } -void CreateNPCTrainerParty(struct BattleSetupStruct * enemies, s32 party_id, HeapID heapId) +void CreateNPCTrainerParty(BattleSetup *setup, s32 party_id, HeapID heapId) { union TrainerMon * data; s32 i; @@ -276,27 +277,27 @@ void CreateNPCTrainerParty(struct BattleSetupStruct * enemies, s32 party_id, Hea // We abuse the RNG for personality value generation, so back up the overworld // state seed_bak = GetLCRNGSeed(); - InitPartyWithMaxSize(enemies->parties[party_id], PARTY_SIZE); + InitPartyWithMaxSize(setup->party[party_id], PARTY_SIZE); data = (union TrainerMon *)AllocFromHeap(heapId, sizeof(union TrainerMon) * PARTY_SIZE); pokemon = AllocMonZeroed(heapId); - TrainerData_ReadTrPoke(enemies->trainer_idxs[party_id], data); + TrainerData_ReadTrPoke(setup->trainerId[party_id], data); // If a Pokemon's gender ratio is 50/50, the generated Pokemon will be the same // gender as its trainer. Otherwise, it will assume the more abundant gender // according to its species gender ratio. In double battles, the behavior is // identical to that of a solitary male opponent. - pid_gender = (u32)((TrainerClass_GetGenderOrTrainerCount(enemies->datas[party_id].data.trainerClass) == 1) ? 0x78 : 0x88); + pid_gender = (u32)((TrainerClass_GetGenderOrTrainerCount(setup->trainers[party_id].data.trainerClass) == 1) ? 0x78 : 0x88); // The trainer types can be more efficiently and expandibly treated as a flag // array, with bit 0 being custom moveset and bit 1 being held item. // Nintendo didn't do it that way, instead using a switch statement and a lot // of code duplication. This has been the case since the 2nd generation games. - switch (enemies->datas[party_id].data.trainerType) + switch (setup->trainers[party_id].data.trainerType) { case TRTYPE_MON: { monSpecies = &data->species; - for (i = 0; i < enemies->datas[party_id].data.npoke; i++) + for (i = 0; i < setup->trainers[party_id].data.npoke; i++) { // Generate personality by seeding with a value based on the difficulty, // level, species, and opponent ID. Roll the RNG N times, where N is @@ -304,9 +305,9 @@ void CreateNPCTrainerParty(struct BattleSetupStruct * enemies, s32 party_id, Hea // pseudorandom value and add the gender selector. // This guarantees that NPC trainers' Pokemon are generated in a // consistent manner between attempts. - seed = monSpecies[i].difficulty + monSpecies[i].level + monSpecies[i].species + enemies->trainer_idxs[party_id]; + seed = monSpecies[i].difficulty + monSpecies[i].level + monSpecies[i].species + setup->trainerId[party_id]; SetLCRNGSeed(seed); - for (j = 0; j < enemies->datas[party_id].data.trainerClass; j++) + for (j = 0; j < setup->trainers[party_id].data.trainerClass; j++) { seed = LCRandom(); } @@ -321,18 +322,18 @@ void CreateNPCTrainerParty(struct BattleSetupStruct * enemies, s32 party_id, Hea // If you were treating the trainer type as a bitfield, you'd put the // checks for held item and moves here. You'd also treat the trpoke // data as a flat u16 array rather than an array of fixed-width structs. - AddMonToParty(enemies->parties[party_id], pokemon); + AddMonToParty(setup->party[party_id], pokemon); } break; } case TRTYPE_MON_MOVES: { monSpeciesMoves = &data->species_moves; - for (i = 0; i < enemies->datas[party_id].data.npoke; i++) + for (i = 0; i < setup->trainers[party_id].data.npoke; i++) { - seed = monSpeciesMoves[i].difficulty + monSpeciesMoves[i].level + monSpeciesMoves[i].species + enemies->trainer_idxs[party_id]; + seed = monSpeciesMoves[i].difficulty + monSpeciesMoves[i].level + monSpeciesMoves[i].species + setup->trainerId[party_id]; SetLCRNGSeed(seed); - for (j = 0; j < enemies->datas[party_id].data.trainerClass; j++) + for (j = 0; j < setup->trainers[party_id].data.trainerClass; j++) { seed = LCRandom(); } @@ -344,18 +345,18 @@ void CreateNPCTrainerParty(struct BattleSetupStruct * enemies, s32 party_id, Hea { MonSetMoveInSlot(pokemon, monSpeciesMoves[i].moves[j], (u8)j); } - AddMonToParty(enemies->parties[party_id], pokemon); + AddMonToParty(setup->party[party_id], pokemon); } break; } case TRTYPE_MON_ITEM: { monSpeciesItem = &data->species_item; - for (i = 0; i < enemies->datas[party_id].data.npoke; i++) + for (i = 0; i < setup->trainers[party_id].data.npoke; i++) { - seed = monSpeciesItem[i].difficulty + monSpeciesItem[i].level + monSpeciesItem[i].species + enemies->trainer_idxs[party_id]; + seed = monSpeciesItem[i].difficulty + monSpeciesItem[i].level + monSpeciesItem[i].species + setup->trainerId[party_id]; SetLCRNGSeed(seed); - for (j = 0; j < enemies->datas[party_id].data.trainerClass; j++) + for (j = 0; j < setup->trainers[party_id].data.trainerClass; j++) { seed = LCRandom(); } @@ -364,18 +365,18 @@ void CreateNPCTrainerParty(struct BattleSetupStruct * enemies, s32 party_id, Hea iv = (u8)((monSpeciesItem[i].difficulty * 31) / 255); CreateMon(pokemon, monSpeciesItem[i].species, monSpeciesItem[i].level, iv, 1, (s32)personality, 2, 0); SetMonData(pokemon, MON_DATA_HELD_ITEM, &monSpeciesItem[i].item); - AddMonToParty(enemies->parties[party_id], pokemon); + AddMonToParty(setup->party[party_id], pokemon); } break; } case TRTYPE_MON_ITEM_MOVES: { monSpeciesItemMoves = &data->species_item_moves; - for (i = 0; i < enemies->datas[party_id].data.npoke; i++) + for (i = 0; i < setup->trainers[party_id].data.npoke; i++) { - seed = monSpeciesItemMoves[i].difficulty + monSpeciesItemMoves[i].level + monSpeciesItemMoves[i].species + enemies->trainer_idxs[party_id]; + seed = monSpeciesItemMoves[i].difficulty + monSpeciesItemMoves[i].level + monSpeciesItemMoves[i].species + setup->trainerId[party_id]; SetLCRNGSeed(seed); - for (j = 0; j < enemies->datas[party_id].data.trainerClass; j++) + for (j = 0; j < setup->trainers[party_id].data.trainerClass; j++) { seed = LCRandom(); } @@ -388,7 +389,7 @@ void CreateNPCTrainerParty(struct BattleSetupStruct * enemies, s32 party_id, Hea { MonSetMoveInSlot(pokemon, monSpeciesItemMoves[i].moves[j], (u8)j); } - AddMonToParty(enemies->parties[party_id], pokemon); + AddMonToParty(setup->party[party_id], pokemon); } break; } diff --git a/include/battle_setup.h b/include/battle_setup.h index d69a96ef3..c3c9dbcf7 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -3,6 +3,7 @@ #include "global.h" #include "party.h" +#include "trainer_data.h" typedef struct BattleSetupUnkSub138 { u32 unk0; @@ -10,11 +11,13 @@ typedef struct BattleSetupUnkSub138 { u32 unk8; } BattleSetupUnkSub138; -typedef struct BattleSetup { +struct BattleSetup { u32 flags; Party *party[4]; u32 winFlag; - u8 padding[0x11C]; + u32 trainerId[4]; + Trainer trainers[4]; + u8 padding[0x3C]; u32 unk134; BattleSetupUnkSub138 unk138; u8 padding2[0xC]; @@ -22,6 +25,6 @@ typedef struct BattleSetup { u32 unk154; u8 padding3[0x34]; u32 unk18C; -} BattleSetup; +}; #endif //POKEDIAMOND_BATTLE_SETUP_H \ No newline at end of file diff --git a/include/constants/game_stats.h b/include/constants/game_stats.h index 1a031c20a..ff65a3b9f 100644 --- a/include/constants/game_stats.h +++ b/include/constants/game_stats.h @@ -2,6 +2,7 @@ #define POKEDIAMOND_CONSTANTS_GAME_STATS_H #define GAME_STAT_UNK7 7 +#define GAME_STAT_UNK8 8 #define GAME_STAT_UNK21 21 #endif //POKEDIAMOND_CONSTANTS_GAME_STATS_H \ No newline at end of file diff --git a/include/encounter.h b/include/encounter.h index eca97b542..ca74bf829 100644 --- a/include/encounter.h +++ b/include/encounter.h @@ -30,5 +30,6 @@ void SetupAndStartWildBattle(TaskManager *taskManager, u16 species, u8 level, u3 void sub_02046F70(FieldSystem *fieldSystem, BattleSetup *setup); void SetupAndStartFirstBattle(TaskManager *taskManager, u16 species, u8 level); void SetupAndStartTutorialBattle(TaskManager *taskManager); +void SetupAndStartTrainerBattle(TaskManager *taskManager, u32 opponentTrainer1, u32 opponentTrainer2, u32 followerTrainerNum, HeapID heapId, u32 *winFlag); #endif //POKEDIAMOND_ENCOUNTER_H \ No newline at end of file diff --git a/include/message_format.h b/include/message_format.h index 156466a8c..81d759cf5 100644 --- a/include/message_format.h +++ b/include/message_format.h @@ -64,9 +64,9 @@ void BufferLandmarkName(MessageFormat *messageFormat, u32 idx, u32 landmark); void BufferPoketchAppName(MessageFormat *messageFormat, u32 idx, u32 app); void BufferTrainerClassName(MessageFormat *messageFormat, u32 idx, u32 trclass); void BufferTrainerClassNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 trclass); -void BufferTrainerClassNameFromDataStruct(MessageFormat *messageFormat, u32 idx, struct TrainerDataLoaded * tr); +void BufferTrainerClassNameFromDataStruct(MessageFormat *messageFormat, u32 idx, Trainer * tr); void BufferTrainerName(MessageFormat *messageFormat, u32 idx, u32 msgno); -void BufferTrainerNameFromDataStruct(MessageFormat *messageFormat, u32 idx, struct TrainerDataLoaded * trdata); +void BufferTrainerNameFromDataStruct(MessageFormat *messageFormat, u32 idx, Trainer * trdata); void BufferUndergroundItemName(MessageFormat *messageFormat, u32 idx, u32 item); void BufferUndergroundItemNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 item); void BufferUndergroundTrapName(MessageFormat *messageFormat, u32 idx, u32 trap); diff --git a/include/trainer_data.h b/include/trainer_data.h index d9261cfb5..2885fe13c 100644 --- a/include/trainer_data.h +++ b/include/trainer_data.h @@ -52,40 +52,33 @@ union TrainerMon #define TRTYPE_MON_ITEM 2 #define TRTYPE_MON_ITEM_MOVES 3 -struct TrainerData +typedef struct TrainerData { u8 trainerType; u8 trainerClass; u8 unk_2; u8 npoke; u16 items[4]; - u32 unk_C; + u32 aiFlags; u32 doubleBattle; -}; +} TrainerData; -struct TrainerDataLoaded +typedef struct Trainer { struct TrainerData data; u16 name[PLAYER_NAME_LENGTH + 1]; u8 padding[16]; -}; +} Trainer; -struct BattleSetupStruct -{ - u32 flags; - struct Party * parties[4]; - u16 field_14[2]; - u32 trainer_idxs[4]; - struct TrainerDataLoaded datas[4]; -}; +typedef struct BattleSetup BattleSetup; -void EnemyTrainerSet_Init(struct BattleSetupStruct * sp0, struct SaveData * r4, HeapID heapId); +void EnemyTrainerSet_Init(BattleSetup *setup, struct SaveData * r4, HeapID heapId); s32 TrainerData_GetAttr(u32 tr_idx, u32 attr_no); BOOL TrainerMessageWithIdPairExists(u32 pos, u32 idx, HeapID heapId); void GetTrainerMessageByIdPair(u32 pos, u32 idx, struct String * str, HeapID heapId); void TrainerData_ReadTrData(u32 idx, struct TrainerData * dest); void TrainerData_ReadTrPoke(u32 idx, union TrainerMon * dest); int TrainerClass_GetGenderOrTrainerCount(int a0); -void CreateNPCTrainerParty(struct BattleSetupStruct * enemies, s32 party_id, HeapID heapId); +void CreateNPCTrainerParty(BattleSetup *setup, s32 party_id, HeapID heapId); #endif //POKEDIAMOND_TRAINER_DATA_H From 764a3db86964c19c2d9e3af9489c4ac06effb214 Mon Sep 17 00:00:00 2001 From: red031000 Date: Wed, 16 Aug 2023 09:00:05 +0100 Subject: [PATCH 04/11] few more funcs --- arm9/asm/encounter_asm.s | 77 ---------------------------------------- arm9/src/encounter.c | 43 +++++++++++++++++++--- arm9/src/scrcmd.c | 1 - include/encounter.h | 2 ++ include/script.h | 2 +- 5 files changed, 42 insertions(+), 83 deletions(-) diff --git a/arm9/asm/encounter_asm.s b/arm9/asm/encounter_asm.s index 90068185c..fc4d2f844 100644 --- a/arm9/asm/encounter_asm.s +++ b/arm9/asm/encounter_asm.s @@ -7,83 +7,6 @@ .text - thumb_func_start sub_02047174 -sub_02047174: ; 0x02047174 - push {r3-r7, lr} - add r5, r2, #0x0 - add r7, r0, #0x0 - add r4, r1, #0x0 - bl TaskManager_GetFieldSystem - add r6, r0, #0x0 - mov r0, #0xb - add r1, r5, #0x0 - bl BattleSetup_New - add r5, r0, #0x0 - add r1, r6, #0x0 - add r2, r4, #0x0 - bl sub_02047F1C - add r0, r5, #0x0 - bl sub_020475A0 - add r4, r0, #0x0 - add r0, r5, #0x0 - bl sub_020475B0 - add r2, r0, #0x0 - add r0, r5, #0x0 - add r1, r4, #0x0 - mov r3, #0x0 - bl Encounter_New - add r2, r0, #0x0 - ldr r1, _020471BC ; =sub_02046758 - add r0, r7, #0x0 - bl TaskManager_Call - pop {r3-r7, pc} - nop -_020471BC: .word sub_02046758 - - thumb_func_start sub_020471C0 -sub_020471C0: ; 0x020471C0 - push {r3-r7, lr} - str r0, [sp, #0x0] - add r5, r1, #0x0 - add r6, r2, #0x0 - add r4, r3, #0x0 - bl TaskManager_GetFieldSystem - add r7, r0, #0x0 - cmp r4, #0x0 - beq _020471DE - mov r0, #0xb - mov r1, #0x5 - bl BattleSetup_New - b _020471E6 -_020471DE: - mov r0, #0xb - mov r1, #0x7 - bl BattleSetup_New -_020471E6: - add r4, r0, #0x0 - add r0, r4, #0x0 - add r1, r7, #0x0 - add r2, r6, #0x0 - bl sub_02047BC0 - add r0, r4, #0x0 - bl sub_020475A0 - add r6, r0, #0x0 - add r0, r4, #0x0 - bl sub_020475B0 - add r2, r0, #0x0 - add r0, r4, #0x0 - add r1, r6, #0x0 - mov r3, #0x0 - bl Encounter_New - add r2, r0, #0x0 - ldr r0, [sp, #0x0] - ldr r1, _0204721C ; =sub_020467FC - str r5, [r2, #0xc] - bl TaskManager_Call - pop {r3-r7, pc} - nop -_0204721C: .word sub_020467FC - thumb_func_start sub_02047220 sub_02047220: ; 0x02047220 push {r3-r7, lr} diff --git a/arm9/src/encounter.c b/arm9/src/encounter.c index 7a9512e5c..b32d98d5f 100644 --- a/arm9/src/encounter.c +++ b/arm9/src/encounter.c @@ -48,6 +48,8 @@ extern void sub_0204BAA0(FieldSystem *fieldSystem, BattleSetup *setup); extern u32 sub_0204BAB0(FieldSystem *fieldSystem); extern void StartScriptFromMenu(TaskManager *taskManager, u16 script, LocalMapObject *lastInteracted); extern BattleSetup *sub_02047814(HeapID heapId, FieldSystem *fieldSystem); +extern void sub_02047F1C(BattleSetup *setup, FieldSystem *fieldSystem, void *param2); +extern void sub_02047BC0(BattleSetup *setup, FieldSystem *fieldSystem, s32 maxLevel); extern void sub_020472F4(FieldSystem *fieldSystem, BattleSetup *setup); extern void sub_020473CC(FieldSystem *fieldSystem, BattleSetup *setup); @@ -197,7 +199,7 @@ static void sub_0204671C(s32 flag, FieldSystem *fieldSystem) { } } -/*static*/ BOOL sub_02046758(TaskManager *taskManager) { +/*static*/ BOOL sub_02046758(TaskManager *taskManager) { //Task_02046758 FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); Encounter *encounter = TaskManager_GetEnvironment(taskManager); u32 *state = TaskManager_GetStatePtr(taskManager); @@ -654,9 +656,9 @@ void SetupAndStartTrainerBattle(TaskManager *taskManager, u32 opponentTrainer1, setup = BattleSetup_New(HEAP_ID_FIELD, battleType); BattleSetup_InitFromFieldSystem(setup, fieldSystem); - setup->trainerId[1] = opponentTrainer1; - setup->trainerId[3] = opponentTrainer2; - setup->trainerId[2] = followerTrainerNum; + setup->trainerId[BATTLER_ENEMY] = opponentTrainer1; + setup->trainerId[BATTLER_ENEMY2] = opponentTrainer2; + setup->trainerId[BATTLER_PLAYER2] = followerTrainerNum; EnemyTrainerSet_Init(setup, fieldSystem->saveData, heapId); @@ -664,3 +666,36 @@ void SetupAndStartTrainerBattle(TaskManager *taskManager, u32 opponentTrainer1, CallTask_StartEncounter(taskManager, setup, sub_020475A0(setup), sub_020475B0(setup), winFlag); } + +void sub_02047174(TaskManager *taskManager, void *param1, u32 battleType) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + Encounter *encounter; + BattleSetup *setup; + + setup = BattleSetup_New(HEAP_ID_FIELD, battleType); + + sub_02047F1C(setup, fieldSystem, param1); + + encounter = Encounter_New(setup, sub_020475A0(setup), sub_020475B0(setup), NULL); + + TaskManager_Call(taskManager, sub_02046758, encounter); +} + +void sub_020471C0(TaskManager *taskManager, s32 target, s32 maxLevel, u32 flag) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + Encounter *encounter; + BattleSetup *setup; + + if (flag != 0) { + setup = BattleSetup_New(HEAP_ID_FIELD, (BATTLE_TYPE_LINK | BATTLE_TYPE_TRAINER)); + } else { + setup = BattleSetup_New(HEAP_ID_FIELD, (BATTLE_TYPE_LINK | BATTLE_TYPE_DOUBLES | BATTLE_TYPE_TRAINER)); + } + + sub_02047BC0(setup, fieldSystem, maxLevel); + + encounter = Encounter_New(setup, sub_020475A0(setup), sub_020475B0(setup), NULL); + encounter->unkC = target; + + TaskManager_Call(taskManager, sub_020467FC, encounter); +} diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c index de2605dbc..37eae2fc8 100644 --- a/arm9/src/scrcmd.c +++ b/arm9/src/scrcmd.c @@ -206,7 +206,6 @@ extern u32 ov06_022407DC(void); extern void ov06_02240790(FieldSystem *fieldSystem, u16 param1, u16 param2, u16 param3); extern void ov06_022407F8(FieldSystem *fieldSystem, u16 param1, u16 param2, u16 param3); extern u32 ov06_02240844(void); -extern void sub_02047174(TaskManager *taskManager, u32 *param1, u32 param2); extern void LocalFieldData_SetDynamicWarp(LocalFieldData *localFieldData, Location *warp); extern void sub_02080C38(TaskManager *taskManager); extern Location *LocalFieldData_GetDynamicWarp(LocalFieldData *localFieldData); diff --git a/include/encounter.h b/include/encounter.h index ca74bf829..5fa1bb3c9 100644 --- a/include/encounter.h +++ b/include/encounter.h @@ -31,5 +31,7 @@ void sub_02046F70(FieldSystem *fieldSystem, BattleSetup *setup); void SetupAndStartFirstBattle(TaskManager *taskManager, u16 species, u8 level); void SetupAndStartTutorialBattle(TaskManager *taskManager); void SetupAndStartTrainerBattle(TaskManager *taskManager, u32 opponentTrainer1, u32 opponentTrainer2, u32 followerTrainerNum, HeapID heapId, u32 *winFlag); +void sub_02047174(TaskManager *taskManager, void *param1, u32 battleType); +void sub_020471C0(TaskManager *taskManager, s32 target, s32 maxLevel, u32 flag); #endif //POKEDIAMOND_ENCOUNTER_H \ No newline at end of file diff --git a/include/script.h b/include/script.h index 88de64454..af797cda9 100644 --- a/include/script.h +++ b/include/script.h @@ -64,7 +64,7 @@ typedef struct BagScreenAppData { typedef struct ScrCmdUnkStruct00F4 { u8 padding[0x2C]; - u32 unk2C; + void *unk2C; } ScrCmdUnkStruct00F4; //todo identify and move to own file typedef struct LocalFieldData { From c6dd0efc8cd219a88048fdfa364ecbfcd7ec40ad Mon Sep 17 00:00:00 2001 From: red031000 Date: Wed, 16 Aug 2023 23:51:56 +0100 Subject: [PATCH 05/11] finish encounter.c --- arm9/arm9.lsf | 1 - arm9/asm/encounter_asm.s | 360 ------------------------------ arm9/asm/unk_0207D5BC.s | 2 +- arm9/global.inc | 2 +- arm9/overlays/14/asm/overlay_14.s | 2 +- arm9/src/encounter.c | 125 ++++++++++- arm9/src/scrcmd.c | 16 +- arm9/src/unk_0206BB28.c | 2 +- include/battle_setup.h | 6 +- include/constants/game_stats.h | 3 + include/constants/pokemon.h | 2 +- include/encounter.h | 2 + include/field_system.h | 3 +- include/igt.h | 4 +- include/unk_0206BB28.h | 2 +- 15 files changed, 144 insertions(+), 388 deletions(-) delete mode 100644 arm9/asm/encounter_asm.s diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf index 9c20ef6b4..3bf04500e 100644 --- a/arm9/arm9.lsf +++ b/arm9/arm9.lsf @@ -185,7 +185,6 @@ Static arm9 Object event_data.o Object task.o Object encounter.o - Object encounter_asm.o Object unk_02047500.o Object unk_020476CC.o Object unk_02048120.o diff --git a/arm9/asm/encounter_asm.s b/arm9/asm/encounter_asm.s deleted file mode 100644 index fc4d2f844..000000000 --- a/arm9/asm/encounter_asm.s +++ /dev/null @@ -1,360 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .extern Encounter_New - .extern sub_02046758 - .extern sub_020467FC - - .text - - thumb_func_start sub_02047220 -sub_02047220: ; 0x02047220 - push {r3-r7, lr} - add r5, r0, #0x0 - bl TaskManager_GetFieldSystem - add r6, r0, #0x0 - add r0, r5, #0x0 - bl TaskManager_GetEnvironment - add r7, r0, #0x0 - add r0, r5, #0x0 - bl TaskManager_GetStatePtr - add r4, r0, #0x0 - ldr r0, [r4, #0x0] - cmp r0, #0x0 - beq _02047246 - cmp r0, #0x1 - beq _02047258 - b _02047262 -_02047246: - ldr r1, _02047268 ; =sub_02046758 - add r0, r5, #0x0 - add r2, r7, #0x0 - bl TaskManager_Call - ldr r0, [r4, #0x0] - add r0, r0, #0x1 - str r0, [r4, #0x0] - b _02047262 -_02047258: - add r0, r6, #0x0 - bl sub_0204FF5C - mov r0, #0x1 - pop {r3-r7, pc} -_02047262: - mov r0, #0x0 - pop {r3-r7, pc} - nop -_02047268: .word sub_02046758 - - thumb_func_start sub_0204726C -sub_0204726C: ; 0x0204726C - push {r4-r6, lr} - add r5, r0, #0x0 - add r6, r1, #0x0 - mov r0, #0xb - add r1, r2, #0x0 - bl BattleSetup_New - add r4, r0, #0x0 - add r1, r5, #0x0 - add r2, r6, #0x0 - bl sub_02047F1C - add r0, r4, #0x0 - bl sub_020475A0 - add r6, r0, #0x0 - add r0, r4, #0x0 - bl sub_020475B0 - add r2, r0, #0x0 - add r0, r4, #0x0 - add r1, r6, #0x0 - mov r3, #0x0 - bl Encounter_New - add r2, r0, #0x0 - ldr r1, _020472AC ; =sub_02047220 - add r0, r5, #0x0 - bl FieldSystem_CreateTask - pop {r4-r6, pc} - nop -_020472AC: .word sub_02047220 - - thumb_func_start sub_020472B0 -sub_020472B0: ; 0x020472B0 - push {r4-r6, lr} - add r5, r0, #0x0 - add r6, r1, #0x0 - mov r0, #0xb - add r1, r2, #0x0 - bl BattleSetup_New - add r4, r0, #0x0 - add r1, r5, #0x0 - add r2, r6, #0x0 - mov r3, #0x0 - bl sub_02047D48 - add r0, r4, #0x0 - bl sub_020475A0 - add r6, r0, #0x0 - add r0, r4, #0x0 - bl sub_020475B0 - add r2, r0, #0x0 - add r0, r4, #0x0 - add r1, r6, #0x0 - mov r3, #0x0 - bl Encounter_New - add r2, r0, #0x0 - ldr r1, _020472F0 ; =sub_02047220 - add r0, r5, #0x0 - bl FieldSystem_CreateTask - pop {r4-r6, pc} - .balign 4 -_020472F0: .word sub_02047220 - - thumb_func_start sub_020472F4 -sub_020472F4: ; 0x020472F4 - push {r3-r5, lr} - add r4, r0, #0x0 - ldr r0, [r1, #0x0] - mov r3, #0x4 - ldr r2, [r1, #0x14] - tst r3, r0 - bne _020473C8 - mov r3, #0x80 - add r5, r0, #0x0 - tst r5, r3 - bne _020473C8 - cmp r0, #0x0 - beq _02047318 - add r3, #0x80 - cmp r0, r3 - beq _02047318 - cmp r0, #0x4a - bne _02047364 -_02047318: - cmp r2, #0x1 - bne _0204732A - ldr r0, [r4, #0xc] - bl Save_GameStats_Get - mov r1, #0x8 - bl GameStats_AddSpecial - pop {r3-r5, pc} -_0204732A: - cmp r2, #0x4 - bne _020473C8 - ldr r0, [r1, #0x8] - mov r1, #0x0 - bl GetPartyMonByIndex - mov r1, #0x5 - mov r2, #0x0 - bl GetMonData - add r1, r0, #0x0 - mov r0, #0x0 - bl sub_0206BB48 - cmp r0, #0x0 - ldr r0, [r4, #0xc] - beq _02047358 - bl Save_GameStats_Get - mov r1, #0x9 - bl GameStats_AddSpecial - pop {r3-r5, pc} -_02047358: - bl Save_GameStats_Get - mov r1, #0xa - bl GameStats_AddSpecial - pop {r3-r5, pc} -_02047364: - mov r3, #0x1 - tst r3, r0 - bne _02047370 - mov r3, #0x10 - tst r3, r0 - beq _02047382 -_02047370: - cmp r2, #0x1 - bne _020473C8 - ldr r0, [r4, #0xc] - bl Save_GameStats_Get - mov r1, #0xb - bl GameStats_AddSpecial - pop {r3-r5, pc} -_02047382: - mov r3, #0x20 - add r5, r0, #0x0 - tst r5, r3 - bne _02047390 - lsl r3, r3, #0x4 - tst r0, r3 - beq _020473C8 -_02047390: - cmp r2, #0x4 - bne _020473C8 - ldr r0, [r1, #0x8] - mov r1, #0x0 - bl GetPartyMonByIndex - mov r1, #0x5 - mov r2, #0x0 - bl GetMonData - add r1, r0, #0x0 - mov r0, #0x0 - bl sub_0206BB48 - cmp r0, #0x0 - ldr r0, [r4, #0xc] - beq _020473BE - bl Save_GameStats_Get - mov r1, #0x9 - bl GameStats_AddSpecial - pop {r3-r5, pc} -_020473BE: - bl Save_GameStats_Get - mov r1, #0xa - bl GameStats_AddSpecial -_020473C8: - pop {r3-r5, pc} - .balign 4 - - thumb_func_start sub_020473CC -sub_020473CC: ; 0x020473CC - push {r4-r7, lr} - sub sp, #0xc - add r4, r1, #0x0 - add r5, r0, #0x0 - ldr r0, [r4, #0x0] - mov r2, #0x4 - ldr r1, [r4, #0x14] - tst r2, r0 - bne _020473EC - mov r3, #0x80 - add r2, r0, #0x0 - tst r2, r3 - bne _020473EC - lsl r2, r3, #0x2 - tst r2, r0 - beq _020473EE -_020473EC: - b _020474FC -_020473EE: - cmp r0, #0x0 - beq _02047400 - add r3, #0x80 - cmp r0, r3 - beq _02047400 - cmp r0, #0x4a - beq _02047400 - cmp r0, #0x20 - bne _020474D2 -_02047400: - cmp r1, #0x1 - bne _02047470 - add r0, r5, #0x0 - add r0, #0x76 - ldrh r0, [r0, #0x0] - add r1, r0, #0x1 - add r0, r5, #0x0 - add r0, #0x76 - strh r1, [r0, #0x0] - add r0, r5, #0x0 - add r0, #0x76 - ldrh r0, [r0, #0x0] - cmp r0, #0x5 - blo _020474FC - ldr r0, [r4, #0x8] - mov r1, #0x0 - bl GetPartyMonByIndex - add r6, r0, #0x0 - ldr r0, [r5, #0xc] - bl Save_PlayerData_GetIGTAddr - str r0, [sp, #0x4] - add r0, r6, #0x0 - mov r1, #0x5 - mov r2, #0x0 - bl GetMonData - add r7, r0, #0x0 - add r0, r6, #0x0 - mov r1, #0x6f - mov r2, #0x0 - bl GetMonData - add r2, r0, #0x0 - mov r3, #0xb - str r3, [sp, #0x0] - lsl r3, r3, #0x5 - ldr r3, [r4, r3] - lsl r1, r7, #0x10 - lsl r2, r2, #0x18 - lsl r3, r3, #0x18 - ldr r0, [sp, #0x4] - lsr r1, r1, #0x10 - lsr r2, r2, #0x18 - lsr r3, r3, #0x18 - bl sub_0202920C - add r5, #0x98 - add r1, r0, #0x0 - ldr r0, [r5, #0x0] - mov r2, #0x2 - bl sub_02028AD4 - add sp, #0xc - pop {r4-r7, pc} -_02047470: - cmp r1, #0x4 - bne _020474FC - mov r0, #0x17 - lsl r0, r0, #0x4 - ldr r0, [r4, r0] - mov r1, #0x0 - lsl r0, r0, #0x2 - add r0, r4, r0 - ldr r0, [r0, #0x4] - bl GetPartyMonByIndex - add r6, r0, #0x0 - ldr r0, [r5, #0xc] - bl Save_PlayerData_GetIGTAddr - str r0, [sp, #0x8] - add r0, r6, #0x0 - mov r1, #0x5 - mov r2, #0x0 - bl GetMonData - add r7, r0, #0x0 - add r0, r6, #0x0 - mov r1, #0x6f - mov r2, #0x0 - bl GetMonData - add r2, r0, #0x0 - mov r3, #0xb - str r3, [sp, #0x0] - lsl r3, r3, #0x5 - ldr r3, [r4, r3] - lsl r1, r7, #0x10 - lsl r2, r2, #0x18 - lsl r3, r3, #0x18 - ldr r0, [sp, #0x8] - lsr r1, r1, #0x10 - lsr r2, r2, #0x18 - lsr r3, r3, #0x18 - bl sub_0202918C - add r5, #0x98 - add r1, r0, #0x0 - ldr r0, [r5, #0x0] - mov r2, #0x2 - bl sub_02028AD4 - add sp, #0xc - pop {r4-r7, pc} -_020474D2: - mov r2, #0x1 - tst r2, r0 - bne _020474DE - mov r2, #0x10 - tst r0, r2 - beq _020474FC -_020474DE: - cmp r1, #0x1 - bne _020474FC - ldr r1, [r5, #0x1c] - add r0, r5, #0x0 - ldr r1, [r1, #0x0] - ldr r2, [r4, #0x1c] - add r0, #0x98 - lsl r1, r1, #0x10 - lsl r2, r2, #0x10 - ldr r0, [r0, #0x0] - lsr r1, r1, #0x10 - lsr r2, r2, #0x10 - mov r3, #0xb - bl sub_020299DC -_020474FC: - add sp, #0xc - pop {r4-r7, pc} diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s index b15b66e19..57a53e10e 100644 --- a/arm9/asm/unk_0207D5BC.s +++ b/arm9/asm/unk_0207D5BC.s @@ -1188,7 +1188,7 @@ sub_0207DE3C: ; 0x0207DE3C add r1, #0x10 ldrh r1, [r4, r1] ldr r0, [r0, #0x1c] - bl sub_0206BB48 + bl Pokedex_ConvertToCurrentDexNo add r2, r0, #0x0 beq _0207DEFE mov r0, #0x2 diff --git a/arm9/global.inc b/arm9/global.inc index 52cc038ff..ca612999a 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -4893,7 +4893,7 @@ .extern SaveArray_Party_Get .extern SaveArray_IsNatDexEnabled .extern Pokedex_IsNatDexEnabled -.extern sub_0206BB48 +.extern Pokedex_ConvertToCurrentDexNo .extern sub_0206BB5C .extern sub_0206BB74 .extern sub_0206BB84 diff --git a/arm9/overlays/14/asm/overlay_14.s b/arm9/overlays/14/asm/overlay_14.s index 1730c48cf..0ca9e6a5e 100644 --- a/arm9/overlays/14/asm/overlay_14.s +++ b/arm9/overlays/14/asm/overlay_14.s @@ -9207,7 +9207,7 @@ ov14_021DBEAC: ; 0x021DBEAC ldr r0, [r6, r0] bl SaveArray_IsNatDexEnabled ldrh r1, [r4, #4] - bl sub_0206BB48 + bl Pokedex_ConvertToCurrentDexNo strh r0, [r4, #8] add r0, r5, #0 mov r1, #0xac diff --git a/arm9/src/encounter.c b/arm9/src/encounter.c index b32d98d5f..6932d644f 100644 --- a/arm9/src/encounter.c +++ b/arm9/src/encounter.c @@ -4,6 +4,7 @@ #include "constants/game_stats.h" #include "event_data.h" #include "field_system.h" +#include "igt.h" #include "task.h" #include "unk_020040F4.h" #include "unk_02022504.h" @@ -50,21 +51,24 @@ extern void StartScriptFromMenu(TaskManager *taskManager, u16 script, LocalMapOb extern BattleSetup *sub_02047814(HeapID heapId, FieldSystem *fieldSystem); extern void sub_02047F1C(BattleSetup *setup, FieldSystem *fieldSystem, void *param2); extern void sub_02047BC0(BattleSetup *setup, FieldSystem *fieldSystem, s32 maxLevel); - -extern void sub_020472F4(FieldSystem *fieldSystem, BattleSetup *setup); -extern void sub_020473CC(FieldSystem *fieldSystem, BattleSetup *setup); +extern void sub_0204FF5C(FieldSystem *fieldSystem); +extern void sub_02047D48(BattleSetup *setup, FieldSystem *fieldSystem, Party *party, void *param3); +extern void *sub_0202920C(IGT *igt, u16 species, u8 gender, u8 param3, HeapID heapId); +extern void *sub_0202918C(IGT *igt, u16 species, u8 gender, u8 param3, HeapID heapId); +extern void sub_02028AD4(u32 *param0, void *param1, u32 param2); +extern void sub_020299DC(u32 *param0, u16 mapId, u16 trainerId, HeapID heapId); static BOOL sub_0204653C(TaskManager *taskManager); static void sub_02046584(TaskManager *taskManager, BattleSetup *setup); -/*static*/ Encounter *Encounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag); +static Encounter *Encounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag); static void Encounter_Delete(Encounter *encounter); static BOOL GetEncounterResult(Encounter *encounter); static void sub_020465E4(BattleSetup *setup, FieldSystem *fieldSystem); static BOOL Task_StartEncounter(TaskManager *taskManager); static void CallTask_StartEncounter(TaskManager *taskManager, BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag); static void sub_0204671C(s32 flag, FieldSystem *fieldSystem); -/*static*/ BOOL sub_02046758(TaskManager *taskManager); -/*static*/ BOOL sub_020467FC(TaskManager *taskManager); +static BOOL sub_02046758(TaskManager *taskManager); +static BOOL sub_020467FC(TaskManager *taskManager); static BOOL sub_02046878(TaskManager *taskManager); static void sub_02046928(TaskManager *taskManager, BattleSetup *battleSetup, s32 effect, s32 bgm, u32 *winFlag); static WildEncounter *WildEncounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag); @@ -73,6 +77,9 @@ static BOOL Task_WildEncounter(TaskManager *taskManager); static BOOL Task_SafariEncounter(TaskManager *taskManager); static BOOL Task_PalParkEncounter(TaskManager *taskManager); static BOOL Task_TutorialBattle(TaskManager *taskManager); +static BOOL sub_02047220(TaskManager *taskManager); +static void sub_020472F4(FieldSystem *fieldSystem, BattleSetup *setup); +static void sub_020473CC(FieldSystem *fieldSystem, BattleSetup *setup); static BOOL sub_0204653C(TaskManager *taskManager) { //Task_StartBattle FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); @@ -98,7 +105,7 @@ static void sub_02046584(TaskManager *taskManager, BattleSetup *setup) { //CallT TaskManager_Call(taskManager, sub_0204653C, setup); } -/*static*/ Encounter *Encounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag) { +static Encounter *Encounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag) { Encounter *encounter = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(Encounter)); encounter->winFlag = winFlag; if (winFlag != NULL) { @@ -199,7 +206,7 @@ static void sub_0204671C(s32 flag, FieldSystem *fieldSystem) { } } -/*static*/ BOOL sub_02046758(TaskManager *taskManager) { //Task_02046758 +static BOOL sub_02046758(TaskManager *taskManager) { //Task_02046758 FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); Encounter *encounter = TaskManager_GetEnvironment(taskManager); u32 *state = TaskManager_GetStatePtr(taskManager); @@ -231,7 +238,7 @@ static void sub_0204671C(s32 flag, FieldSystem *fieldSystem) { return FALSE; } -/*static*/ BOOL sub_020467FC(TaskManager *taskManager) { +static BOOL sub_020467FC(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); Encounter *encounter = TaskManager_GetEnvironment(taskManager); u32 *state = TaskManager_GetStatePtr(taskManager); @@ -699,3 +706,103 @@ void sub_020471C0(TaskManager *taskManager, s32 target, s32 maxLevel, u32 flag) TaskManager_Call(taskManager, sub_020467FC, encounter); } + +static BOOL sub_02047220(TaskManager *taskManager) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + Encounter *encounter = TaskManager_GetEnvironment(taskManager); + u32 *state = TaskManager_GetStatePtr(taskManager); + + switch (*state) { + case 0: + TaskManager_Call(taskManager, sub_02046758, encounter); + (*state)++; + break; + case 1: + sub_0204FF5C(fieldSystem); + return TRUE; + } + return FALSE; +} + +void sub_0204726C(FieldSystem *fieldSystem, void *param1, s32 battleType) { + Encounter *encounter; + BattleSetup *setup = BattleSetup_New(HEAP_ID_FIELD, battleType); + + sub_02047F1C(setup, fieldSystem, param1); + + encounter = Encounter_New(setup, sub_020475A0(setup), sub_020475B0(setup), NULL); + + FieldSystem_CreateTask(fieldSystem, sub_02047220, encounter); +} + +void sub_020472B0(FieldSystem *fieldSystem, Party *party, s32 battleType) { + Encounter *encounter; + BattleSetup *setup = BattleSetup_New(HEAP_ID_FIELD, battleType); + + sub_02047D48(setup, fieldSystem, party, NULL); + + encounter = Encounter_New(setup, sub_020475A0(setup), sub_020475B0(setup), NULL); + + FieldSystem_CreateTask(fieldSystem, sub_02047220, encounter); +} + +static void sub_020472F4(FieldSystem *fieldSystem, BattleSetup *setup) { + Pokemon *mon; + u32 battleType = setup->flags; + u32 winFlag = setup->winFlag; + + if (battleType & BATTLE_TYPE_LINK || battleType & BATTLE_TYPE_TOWER) { + return; + } + + if (battleType == BATTLE_TYPE_NONE || battleType == BATTLE_TYPE_8 || battleType == (BATTLE_TYPE_DOUBLES | BATTLE_TYPE_MULTI | BATTLE_TYPE_6)) { + if (winFlag == 1) { + GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK8); + } else if (winFlag == 4) { + mon = GetPartyMonByIndex(setup->party[BATTLER_ENEMY], 0); + if (Pokedex_ConvertToCurrentDexNo(FALSE, GetMonData(mon, MON_DATA_SPECIES, NULL)) != 0) { + GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK9); + } else { + GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK10); + } + } + } else if ((battleType & BATTLE_TYPE_TRAINER) || (battleType & BATTLE_TYPE_INGAME_PARTNER)) { + if (winFlag == 1) { + GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK11); + } + } else if ((battleType & BATTLE_TYPE_SAFARI || battleType & BATTLE_TYPE_PAL_PARK) && winFlag == 4) { + mon = GetPartyMonByIndex(setup->party[BATTLER_ENEMY], 0); + if (Pokedex_ConvertToCurrentDexNo(FALSE, GetMonData(mon, MON_DATA_SPECIES, NULL)) != 0) { + GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK9); + } else { + GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK10); + } + } +} + +static void sub_020473CC(FieldSystem *fieldSystem, BattleSetup *setup) { + Pokemon *mon; + u32 battleType = setup->flags; + u32 winFlag = setup->winFlag; + + if (battleType & BATTLE_TYPE_LINK || battleType & BATTLE_TYPE_TOWER || battleType & BATTLE_TYPE_PAL_PARK) { + return; + } + if (battleType == BATTLE_TYPE_NONE || battleType == BATTLE_TYPE_8 || battleType == (BATTLE_TYPE_DOUBLES | BATTLE_TYPE_MULTI | BATTLE_TYPE_6) || battleType == BATTLE_TYPE_SAFARI) { + if (winFlag == 1) { + fieldSystem->unk76++; + if (fieldSystem->unk76 < 5) { + return; + } + mon = GetPartyMonByIndex(setup->party[BATTLER_ENEMY], 0); + sub_02028AD4(fieldSystem->unk98, sub_0202920C(Save_PlayerData_GetIGTAddr(fieldSystem->saveData), GetMonData(mon, MON_DATA_SPECIES, NULL), GetMonData(mon, MON_DATA_GENDER, NULL), setup->unk160, HEAP_ID_FIELD), 2); + } else if (winFlag == 4) { + mon = GetPartyMonByIndex(setup->party[setup->unk170], 0); + sub_02028AD4(fieldSystem->unk98, sub_0202918C(Save_PlayerData_GetIGTAddr(fieldSystem->saveData), GetMonData(mon, MON_DATA_SPECIES, NULL), GetMonData(mon, MON_DATA_GENDER, NULL), setup->unk160, HEAP_ID_FIELD), 2); + } + } else if ((battleType & BATTLE_TYPE_TRAINER) || (battleType & BATTLE_TYPE_INGAME_PARTNER)) { + if (winFlag == 1) { + sub_020299DC(fieldSystem->unk98, fieldSystem->location->mapId, setup->trainerId[BATTLER_ENEMY], HEAP_ID_FIELD); + } + } +} diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c index 37eae2fc8..3ddf4012c 100644 --- a/arm9/src/scrcmd.c +++ b/arm9/src/scrcmd.c @@ -134,7 +134,7 @@ extern void *sub_02037C00(u32 param0, FieldSystem *fieldSystem, u16 param2); extern u16 sub_02037A78(void *runningAppData); extern u16 ov05_021E1858(FieldSystem *fieldSystem, LocalMapObject *event, u16 param2); extern void *sub_02029048(u32 param0); -extern void sub_02028AD4(u32 *param0, void *param1, BOOL param2); +extern void sub_02028AD4(u32 *param0, void *param1, u32 param2); extern SaveFashionData *Save_FashionData_Get(SaveData *save); extern BOOL CheckPortraitSlotFull(SaveFashionData *fashionData, u32 portraitSlot); extern BOOL CheckContestPortraitSlotFull(SaveFashionData *fashionData, u32 portraitSlot); @@ -2123,7 +2123,7 @@ static BOOL sub_0203BBBC(ScriptContext *ctx) { return FALSE; } if (pcBoxData->unk08 == TRUE) { - sub_02028AD4(fieldSystem->unk98, sub_02029048(11), TRUE); + sub_02028AD4(fieldSystem->unk98, sub_02029048(11), 1); } FreeToHeap(*pcBoxDataPtr); *pcBoxDataPtr = NULL; @@ -3636,18 +3636,18 @@ BOOL ScrCmd_Unk01CD(ScriptContext *ctx) { //01CD u16 unk3 = ScriptGetVar(ctx); u16 unk4 = ScriptGetVar(ctx); void **miscDataPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); //todo: identify this - BOOL unk5; //this will literally always be true... GF why? + u32 unk5; //this will literally always be 1... GF why? switch ((unk0 - 16)) { case 0: - unk5 = TRUE; + unk5 = 1; *miscDataPtr = sub_02029120(4); break; case 1: - unk5 = TRUE; + unk5 = 1; *miscDataPtr = sub_0202912C(4); break; case 2: - unk5 = TRUE; + unk5 = 1; *miscDataPtr = sub_02029138(unk1, 4); break; case 3: @@ -3657,7 +3657,7 @@ BOOL ScrCmd_Unk01CD(ScriptContext *ctx) { //01CD case 8: case 9: case 10: - unk5 = TRUE; + unk5 = 1; *miscDataPtr = sub_0202914C(unk0 - 19, unk1, 4); break; default: @@ -3814,7 +3814,7 @@ BOOL ScrCmd_EnableDisableSafariZone(ScriptContext *ctx) { //0202 case 1: //disable Save_VarsFlags_ClearSafariSysFlag(varsFlags); sub_02061574(ctx->fieldSystem); - sub_02028AD4(ctx->fieldSystem->unk98, sub_0202912C(4), TRUE); + sub_02028AD4(ctx->fieldSystem->unk98, sub_0202912C(4), 1); *safariBalls = 0; *safariSteps = 0; break; diff --git a/arm9/src/unk_0206BB28.c b/arm9/src/unk_0206BB28.c index 8a37db592..f64b3b624 100644 --- a/arm9/src/unk_0206BB28.c +++ b/arm9/src/unk_0206BB28.c @@ -14,7 +14,7 @@ BOOL Pokedex_IsNatDexEnabled(struct Pokedex * pokedex) return Pokedex_GetNatDexFlag(pokedex) == TRUE; } -u32 sub_0206BB48(BOOL isNationalDex, u32 species) +u32 Pokedex_ConvertToCurrentDexNo(BOOL isNationalDex, u32 species) { if (!isNationalDex) species = SpeciesToSinnohDexNo((u16)species); diff --git a/include/battle_setup.h b/include/battle_setup.h index c3c9dbcf7..53dee0a29 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -23,7 +23,11 @@ struct BattleSetup { u8 padding2[0xC]; u32 unk150; u32 unk154; - u8 padding3[0x34]; + u8 padding3[0x8]; + u32 unk160; + u8 padding4[0xC]; + u32 unk170; + u8 padding5[0x18]; u32 unk18C; }; diff --git a/include/constants/game_stats.h b/include/constants/game_stats.h index ff65a3b9f..099ecd160 100644 --- a/include/constants/game_stats.h +++ b/include/constants/game_stats.h @@ -3,6 +3,9 @@ #define GAME_STAT_UNK7 7 #define GAME_STAT_UNK8 8 +#define GAME_STAT_UNK9 9 +#define GAME_STAT_UNK10 10 +#define GAME_STAT_UNK11 11 #define GAME_STAT_UNK21 21 #endif //POKEDIAMOND_CONSTANTS_GAME_STATS_H \ No newline at end of file diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index e71bafbfe..944b245e6 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -225,7 +225,7 @@ #define MON_DATA_HOENN_WORLD_RIBBON 109 #define MON_DATA_FATEFUL_ENCOUNTER 110 #define MON_DATA_GENDER 111 -#define MON_DATA_FORM 112 +#define MON_DATA_FORM 112 #define MON_DATA_RESERVED_113 113 // HGSS #define MON_DATA_RESERVED_114 114 // Plat #define MON_DATA_UNUSED_115 115 diff --git a/include/encounter.h b/include/encounter.h index 5fa1bb3c9..4d2a3c08a 100644 --- a/include/encounter.h +++ b/include/encounter.h @@ -33,5 +33,7 @@ void SetupAndStartTutorialBattle(TaskManager *taskManager); void SetupAndStartTrainerBattle(TaskManager *taskManager, u32 opponentTrainer1, u32 opponentTrainer2, u32 followerTrainerNum, HeapID heapId, u32 *winFlag); void sub_02047174(TaskManager *taskManager, void *param1, u32 battleType); void sub_020471C0(TaskManager *taskManager, s32 target, s32 maxLevel, u32 flag); +void sub_0204726C(FieldSystem *fieldSystem, void *param1, s32 battleType); +void sub_020472B0(FieldSystem *fieldSystem, Party *party, s32 battleType); #endif //POKEDIAMOND_ENCOUNTER_H \ No newline at end of file diff --git a/include/field_system.h b/include/field_system.h index 3858a563c..60304057e 100644 --- a/include/field_system.h +++ b/include/field_system.h @@ -57,7 +57,8 @@ typedef struct FieldSystem PlayerAvatar *playerAvatar; u8 padding4[0x24]; u32 unk60; - u8 padding5[0x14]; + u8 padding5[0x12]; + u16 unk76; u32 unk78; u32 unk7C; u8 padding6[0x10]; diff --git a/include/igt.h b/include/igt.h index bf5e5a63b..4d88d2095 100644 --- a/include/igt.h +++ b/include/igt.h @@ -1,12 +1,12 @@ #ifndef POKEDIAMOND_IGT_H #define POKEDIAMOND_IGT_H -struct IGT +typedef struct IGT { u16 hours; u8 minutes; u8 seconds; -}; +} IGT; void InitIGT(struct IGT * igt); void AddIGTSeconds(struct IGT * igt, u32 seconds); diff --git a/include/unk_0206BB28.h b/include/unk_0206BB28.h index 3c28c2727..3a3c6bef0 100644 --- a/include/unk_0206BB28.h +++ b/include/unk_0206BB28.h @@ -7,6 +7,6 @@ BOOL SaveArray_IsNatDexEnabled(struct SaveData * save); BOOL Pokedex_IsNatDexEnabled(struct Pokedex * pokedex); -u32 sub_0206BB48(BOOL isNationalDex, u32 species); +u32 Pokedex_ConvertToCurrentDexNo(BOOL isNationalDex, u32 species); #endif //POKEDIAMOND_UNK_0206BB28_H From 0c1d0cce9a8aadc1816250f9d6cd505d60c73aa7 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 20 Aug 2023 00:12:25 +0100 Subject: [PATCH 06/11] address some review comments --- arm9/asm/scrcmd_10.s | 2 +- arm9/asm/scrcmd_12.s | 2 +- arm9/asm/scrcmd_3.s | 4 +- arm9/asm/scrcmd_5.s | 2 +- arm9/asm/scrcmd_7.s | 2 +- arm9/asm/scrcmd_9.s | 4 +- arm9/asm/unk_02035068.s | 10 +-- arm9/asm/unk_020372D4.s | 4 +- arm9/asm/unk_020377F0.s | 20 +++--- arm9/asm/unk_02038C78.s | 8 +-- arm9/asm/unk_020476CC.s | 10 +-- arm9/asm/unk_02048120.s | 2 +- arm9/asm/unk_0204CB20.s | 12 ++-- arm9/asm/unk_0204FBA8.s | 6 +- arm9/asm/unk_02050E48.s | 8 +-- arm9/asm/unk_020520AC.s | 2 +- arm9/asm/unk_02054C14.s | 4 +- arm9/asm/unk_02057380.s | 2 +- arm9/asm/unk_0205CDB4.s | 6 +- arm9/asm/unk_0205F7A0.s | 2 +- arm9/asm/unk_020647A4.s | 8 +-- arm9/asm/unk_02064CA8.s | 10 +-- arm9/asm/unk_02064E90.s | 4 +- arm9/asm/unk_020653EC.s | 12 ++-- arm9/asm/unk_0206BB5C.s | 4 +- arm9/asm/unk_0206C700.s | 2 +- arm9/asm/unk_0206F3FC.s | 22 +++--- arm9/asm/unk_02072548.s | 8 +-- arm9/asm/unk_02073710.s | 2 +- arm9/asm/unk_02073DA8.s | 12 ++-- arm9/asm/unk_0207550C.s | 32 ++++----- arm9/asm/unk_02079C70.s | 4 +- arm9/asm/unk_02080C38.s | 4 +- arm9/asm/unk_020859C0.s | 2 +- arm9/asm/unk_02086084.s | 6 +- arm9/asm/unk_02087D00.s | 2 +- arm9/global.inc | 12 ++-- arm9/overlays/05/asm/ov05_021D80E8.s | 2 +- arm9/overlays/05/asm/ov05_021E5FD8.s | 2 +- arm9/overlays/05/asm/ov05_021EC458.s | 18 ++--- arm9/overlays/05/asm/ov05_021F38CC.s | 6 +- arm9/overlays/05/asm/ov05_021F5C44.s | 2 +- arm9/overlays/06/asm/overlay_06.s | 84 +++++++++++----------- arm9/overlays/07/asm/overlay_07.s | 8 +-- arm9/overlays/09/asm/overlay_09.s | 2 +- arm9/overlays/11/asm/ov11_0222D5C0_1.s | 24 +++---- arm9/overlays/11/asm/ov11_0222FF68.s | 8 +-- arm9/overlays/11/asm/ov11_02232264.s | 14 ++-- arm9/overlays/11/asm/ov11_0223D1DC.s | 12 ++-- arm9/overlays/11/asm/ov11_02242B78.s | 6 +- arm9/overlays/11/asm/ov11_0224CA64.s | 2 +- arm9/overlays/11/asm/ov11_0224D550.s | 10 +-- arm9/overlays/11/asm/ov11_02254710.s | 14 ++-- arm9/overlays/14/asm/overlay_14.s | 20 +++--- arm9/overlays/16/asm/overlay_16.s | 8 +-- arm9/overlays/18/asm/overlay_18.s | 96 +++++++++++++------------- arm9/overlays/27/asm/overlay_27.s | 2 +- arm9/overlays/28/asm/overlay_28.s | 2 +- arm9/overlays/39/asm/overlay_39.s | 2 +- arm9/overlays/56/asm/overlay_56.s | 4 +- arm9/overlays/69/asm/overlay_69.s | 6 +- arm9/overlays/71/asm/overlay_71.s | 38 +++++----- arm9/overlays/80/asm/overlay_80.s | 18 ++--- arm9/src/encounter.c | 70 +++++++++---------- arm9/src/hall_of_fame.c | 2 +- arm9/src/mail.c | 2 +- arm9/src/party.c | 6 +- arm9/src/pokemon.c | 16 ++--- arm9/src/scrcmd.c | 44 ++++++------ arm9/src/scrcmd_coins.c | 4 +- arm9/src/scrcmd_daycare.c | 2 +- arm9/src/scrcmd_money.c | 10 +-- arm9/src/scrcmd_move_relearner.c | 8 +-- arm9/src/scrcmd_names.c | 10 +-- arm9/src/scrcmd_party.c | 66 +++++++++--------- arm9/src/script_pokemon_util.c | 18 ++--- arm9/src/trainer_data.c | 8 +-- arm9/src/unk_0204B0A0.c | 4 +- arm9/src/unk_0206439C.c | 2 +- arm9/src/unk_02064E20.c | 2 +- arm9/src/unk_0208890C.c | 4 +- arm9/src/use_item_on_mon.c | 6 +- include/party.h | 6 +- include/scrcmd.h | 2 +- 84 files changed, 480 insertions(+), 480 deletions(-) diff --git a/arm9/asm/scrcmd_10.s b/arm9/asm/scrcmd_10.s index 36b315fc6..5ed04d935 100644 --- a/arm9/asm/scrcmd_10.s +++ b/arm9/asm/scrcmd_10.s @@ -49,7 +49,7 @@ ScrCmd_Unk01DB: ; 0x02042364 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData add r1, r4, #0x0 add r2, r6, #0x0 bl ov06_022434D0 diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s index 100e10bca..5aea4d129 100644 --- a/arm9/asm/scrcmd_12.s +++ b/arm9/asm/scrcmd_12.s @@ -658,7 +658,7 @@ _0204322C: ldr r0, [r0, #0xc] bl SaveArray_Party_Get add r1, r4, #0x0 - bl AddMonToParty + bl Party_AddMon cmp r0, #0x0 beq _02043266 ldr r0, [sp, #0x4] diff --git a/arm9/asm/scrcmd_3.s b/arm9/asm/scrcmd_3.s index f1fa91759..32aa21d0e 100644 --- a/arm9/asm/scrcmd_3.s +++ b/arm9/asm/scrcmd_3.s @@ -78,7 +78,7 @@ ScrCmd_Unk00FA: ; 0x0203FF10 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl Save_PlayerData_GetProfileAddr add r4, r0, #0x0 add r0, r5, #0x0 @@ -119,7 +119,7 @@ ScrCmd_Unk00FA: ; 0x0203FF10 ldr r0, [r0, #0xc] bl SaveArray_Party_Get add r1, r6, #0x0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex str r0, [sp, #0x10] add r0, r4, #0x0 mov r1, #0x4 diff --git a/arm9/asm/scrcmd_5.s b/arm9/asm/scrcmd_5.s index d476b517d..53ad47d86 100644 --- a/arm9/asm/scrcmd_5.s +++ b/arm9/asm/scrcmd_5.s @@ -87,7 +87,7 @@ _0204123C: ldr r0, [r7, #0xc] bl SaveArray_Party_Get add r1, r5, #0x0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0x4c mov r2, #0x0 add r4, r0, #0x0 diff --git a/arm9/asm/scrcmd_7.s b/arm9/asm/scrcmd_7.s index ae9e39db7..68d761235 100644 --- a/arm9/asm/scrcmd_7.s +++ b/arm9/asm/scrcmd_7.s @@ -635,7 +635,7 @@ ScrCmd_Unk00F0: ; 0x02041BC4 lsl r1, r1, #0x10 add r0, r4, #0x0 lsr r1, r1, #0x10 - bl TrainerFlagSet + bl TrainerFieldSystem_FlagSet mov r0, #0x0 pop {r3-r5, pc} diff --git a/arm9/asm/scrcmd_9.s b/arm9/asm/scrcmd_9.s index 7a819ffdc..9b29a2626 100644 --- a/arm9/asm/scrcmd_9.s +++ b/arm9/asm/scrcmd_9.s @@ -253,7 +253,7 @@ ScrCmd_Unk02B8: ; 0x02042000 bl VarGet add r1, r0, #0x0 add r0, r4, #0x0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] @@ -417,7 +417,7 @@ _02042170: bl VarGet add r1, r0, #0x0 add r0, r6, #0x0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r0, #0x0 add r0, r4, #0x0 mov r2, #0x4 diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index b3645a310..906a1a571 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -2056,7 +2056,7 @@ _020360AC: add r1, r6, #0x0 add r1, #0x22 ldrb r1, [r1, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r0, #0x0 add r0, r5, #0x0 mov r2, #0xb @@ -2450,7 +2450,7 @@ _020363F6: add r5, r0, #0x0 ldr r0, [sp, #0x4] add r1, r7, #0x0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex str r0, [sp, #0xc] mov r0, #0x7f lsl r0, r0, #0x2 @@ -3283,7 +3283,7 @@ _02036B0E: ldr r0, [r6, #0xc] bl SaveArray_Party_Get add r1, r7, #0x0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r2, r0, #0x0 ldr r0, [r5, #0x14] add r1, r6, #0x0 @@ -3553,7 +3553,7 @@ sub_02036CEC: ; 0x02036CEC str r5, [r4, #0x1c] ldrb r1, [r7, #0x2] ldr r0, [r4, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r0, #0x0 mov r0, #0x7e lsl r0, r0, #0x2 @@ -3654,7 +3654,7 @@ sub_02036E08: ; 0x02036E08 bl SaveArray_Party_Get ldrb r1, [r5, #0x0] str r0, [sp, #0x20] - bl GetPartyMonByIndex + bl Party_GetMonByIndex str r0, [sp, #0x24] ldrb r0, [r5, #0x1] cmp r0, #0x0 diff --git a/arm9/asm/unk_020372D4.s b/arm9/asm/unk_020372D4.s index ed764e0bb..fe76a46f2 100644 --- a/arm9/asm/unk_020372D4.s +++ b/arm9/asm/unk_020372D4.s @@ -632,7 +632,7 @@ sub_020377A8: ; 0x020377A8 ldr r0, [r0, #0x8] bx lr - thumb_func_start FieldSystem_GetSaveDataPtr -FieldSystem_GetSaveDataPtr: ; 0x020377AC + thumb_func_start FieldSystem_GetSaveData +FieldSystem_GetSaveData: ; 0x020377AC ldr r0, [r0, #0xc] bx lr diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s index 7b536cacc..d8ba7be3e 100644 --- a/arm9/asm/unk_020377F0.s +++ b/arm9/asm/unk_020377F0.s @@ -1115,7 +1115,7 @@ sub_02037EF8: ; 0x02037EF8 bl AllocFromHeapAtEnd add r4, r0, #0x0 add r0, r5, #0x0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl Save_PlayerData_GetOptionsAddr add r1, r0, #0x0 add r0, r5, #0x0 @@ -1140,7 +1140,7 @@ sub_02037F2C: ; 0x02037F2C add r4, r1, #0x0 add r6, r2, #0x0 add r7, r3, #0x0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData mov r1, #0xb str r1, [sp, #0x0] add r1, r4, #0x0 @@ -1164,13 +1164,13 @@ sub_02037F58: ; 0x02037F58 add r6, r3, #0x0 cmp r5, #0x3 bne _02037F74 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData add r1, r4, #0x0 add r2, r6, #0x0 bl sub_020855B0 b _02037F82 _02037F74: - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData add r1, r5, #0x0 add r2, r4, #0x0 add r3, r6, #0x0 @@ -1189,7 +1189,7 @@ sub_02037F90: ; 0x02037F90 add r4, r1, #0x0 add r6, r2, #0x0 add r5, r0, #0x0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData add r1, r4, #0x0 add r2, r6, #0x0 bl sub_02085578 @@ -1216,7 +1216,7 @@ sub_02037FC4: ; 0x02037FC4 push {r3-r5, lr} add r5, r1, #0x0 add r4, r0, #0x0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData add r1, r5, #0x0 bl sub_02087D00 add r5, r0, #0x0 @@ -1263,7 +1263,7 @@ sub_0203800C: ; 0x0203800C add r0, r5, #0x0 bl SaveArray_Party_Get add r1, r7, #0x0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex str r0, [r4, #0x0] add r0, r5, #0x0 bl Save_FashionData_Get @@ -1684,7 +1684,7 @@ _02038386: beq _020383C8 ldr r0, [r4, #0xc] ldr r1, [r4, #0x30] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r0, #0x0 ldr r0, [r4, #0x44] bl CopyPokemonToPokemon @@ -1938,7 +1938,7 @@ _02038590: ldr r0, [r5, #0xc] bl SaveArray_Party_Get ldr r1, [r4, #0x4] - bl GetPartyMonByIndex + bl Party_GetMonByIndex ldr r2, [r4, #0xc] mov r1, #0x75 add r2, #0x1c @@ -2005,7 +2005,7 @@ _02038620: ldr r0, [r7, #0xc] bl SaveArray_Party_Get ldr r1, [r4, #0x4] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0x6f mov r2, #0x0 add r6, r0, #0x0 diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index ff9454bae..40324149e 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -2012,8 +2012,8 @@ FlagCheck: ; 0x02039528 pop {r4, pc} .balign 4 - thumb_func_start FlagSet -FlagSet: ; 0x0203953C + thumb_func_start FieldSystem_FlagSet +FieldSystem_FlagSet: ; 0x0203953C push {r4, lr} ldr r0, [r0, #0xc] add r4, r1, #0x0 @@ -2167,8 +2167,8 @@ TrainerFlagCheck: ; 0x02039640 pop {r4, pc} .balign 4 - thumb_func_start TrainerFlagSet -TrainerFlagSet: ; 0x0203965C + thumb_func_start TrainerFieldSystem_FlagSet +TrainerFieldSystem_FlagSet: ; 0x0203965C push {r4, lr} ldr r0, [r0, #0xc] add r4, r1, #0x0 diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s index b48be635d..c1ec14ba0 100644 --- a/arm9/asm/unk_020476CC.s +++ b/arm9/asm/unk_020476CC.s @@ -268,7 +268,7 @@ sub_02047814: ; 0x02047814 bl CreateMon ldr r0, [r4, #0x4] add r1, r6, #0x0 - bl AddMonToParty + bl Party_AddMon mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -281,7 +281,7 @@ sub_02047814: ; 0x02047814 bl CreateMon ldr r0, [r4, #0x8] add r1, r6, #0x0 - bl AddMonToParty + bl Party_AddMon add r0, r6, #0x0 bl FreeToHeap ldr r0, [r5, #0xc] @@ -405,7 +405,7 @@ _02047A0C: add r0, r5, r0 ldr r0, [r0, #0x4] add r1, r6, #0x0 - bl AddMonToParty + bl Party_AddMon cmp r0, #0x0 bne _02047A20 bl GF_AssertFail @@ -661,7 +661,7 @@ sub_02047BC0: ; 0x02047BC0 _02047C40: ldr r0, [sp, #0x14] add r1, r4, #0x0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r5, #0x0 bl CopyPokemonToPokemon add r0, r5, #0x0 @@ -856,7 +856,7 @@ _02047DEE: ldrb r1, [r7, r6] ldr r0, [sp, #0x4] sub r1, r1, #0x1 - bl GetPartyMonByIndex + bl Party_GetMonByIndex ldr r1, [sp, #0x8] bl CopyPokemonToPokemon ldr r1, [sp, #0x8] diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s index dd42ab385..b5c29fbf3 100644 --- a/arm9/asm/unk_02048120.s +++ b/arm9/asm/unk_02048120.s @@ -96,7 +96,7 @@ _0204817A: add r1, #0xc bl AddWindow add r0, r5, #0x0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl Save_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r4, #0x20] diff --git a/arm9/asm/unk_0204CB20.s b/arm9/asm/unk_0204CB20.s index ce963a2b8..f59713403 100644 --- a/arm9/asm/unk_0204CB20.s +++ b/arm9/asm/unk_0204CB20.s @@ -2315,13 +2315,13 @@ sub_0204DCB4: ; 0x0204DCB4 ldr r0, _0204DD10 ; =UNK_021C5A68 ldr r0, [r0, #0x0] ldr r0, [r0, #0x54] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 add r4, r0, #0x0 ldr r0, _0204DD10 ; =UNK_021C5A68 ldr r0, [r0, #0x0] ldr r0, [r0, #0x54] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CB4 ldr r0, _0204DD10 ; =UNK_021C5A68 ldr r1, [r0, #0x0] @@ -4108,7 +4108,7 @@ _0204E9B8: cmp r0, #0x0 bne _0204EA7C ldr r0, [r1, #0x54] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CB4 add r1, r4, #0x0 bl sub_02026908 @@ -4644,7 +4644,7 @@ _0204EE36: str r2, [r3, r0] ldr r5, [r1, #0x0] ldr r0, [r5, #0x54] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 mov r1, #0x29 add r2, r5, r4 @@ -5229,7 +5229,7 @@ sub_0204F2D8: ; 0x0204F2D8 add r5, r2, #0x0 ldr r0, [r0, #0x0] ldr r0, [r0, #0x54] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CB4 add r4, r0, #0x0 ldrb r0, [r5, #0x0] @@ -5466,7 +5466,7 @@ _0204F4D2: ldr r0, _0204F5E0 ; =UNK_021C5A68 ldr r0, [r0, #0x0] ldr r0, [r0, #0x54] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CB4 add r4, r0, #0x0 bl sub_020269A0 diff --git a/arm9/asm/unk_0204FBA8.s b/arm9/asm/unk_0204FBA8.s index bb1fa8508..64f6b2f54 100644 --- a/arm9/asm/unk_0204FBA8.s +++ b/arm9/asm/unk_0204FBA8.s @@ -146,7 +146,7 @@ sub_0204FC5C: ; 0x0204FC5C ldr r1, [r1, #0x0] cmp r1, #0x0 bne _0204FC9A - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02031824 add r0, r4, #0x0 bl sub_0204FBB0 @@ -444,7 +444,7 @@ sub_0204FEB0: ; 0x0204FEB0 cmp r0, #0x0 bne _0204FEE8 add r0, r5, #0x0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData mov r1, #0x0 add r3, r5, #0x0 str r1, [sp, #0x0] @@ -475,7 +475,7 @@ sub_0204FEF0: ; 0x0204FEF0 cmp r0, #0x0 bne _0204FF28 add r0, r5, #0x0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData mov r1, #0x0 add r3, r5, #0x0 str r1, [sp, #0x0] diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s index 9987abf21..3c2261e85 100644 --- a/arm9/asm/unk_02050E48.s +++ b/arm9/asm/unk_02050E48.s @@ -957,7 +957,7 @@ _020515BA: add r1, #0x84 ldrb r1, [r1, #0x0] ldr r0, [r4, #0x50] - bl GetPartyMonByIndex + bl Party_GetMonByIndex bl sub_020690E4 add r2, r0, #0x0 ldr r0, [r4, #0x28] @@ -1482,7 +1482,7 @@ _02051A16: ldrb r1, [r1, #0x0] ldr r0, [sp, #0x0] sub r1, r1, #0x1 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r4, #0x0 add r2, r6, #0x0 bl MI_CpuCopy8 @@ -1619,7 +1619,7 @@ _02051B04: mul r1, r6 ldr r0, [r5, #0x50] add r1, r2, r1 - bl AddMonToParty + bl Party_AddMon add r4, r4, #0x1 cmp r4, #0x3 blt _02051B04 @@ -1658,7 +1658,7 @@ _02051B52: mul r1, r4 ldr r0, [r6, #0x50] add r1, r2, r1 - bl AddMonToParty + bl Party_AddMon add r5, r5, #0x1 cmp r5, #0x3 blt _02051B52 diff --git a/arm9/asm/unk_020520AC.s b/arm9/asm/unk_020520AC.s index 185befac7..eff6043a0 100644 --- a/arm9/asm/unk_020520AC.s +++ b/arm9/asm/unk_020520AC.s @@ -181,7 +181,7 @@ sub_02052110: ; 0x02052110 mov r0, #0x0 pop {r4-r6, pc} _0205211E: - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData add r6, r0, #0x0 bl sub_02031A7C mov r1, #0x19 diff --git a/arm9/asm/unk_02054C14.s b/arm9/asm/unk_02054C14.s index fc8c6de65..f21ffeb46 100644 --- a/arm9/asm/unk_02054C14.s +++ b/arm9/asm/unk_02054C14.s @@ -299,7 +299,7 @@ _02054E02: add r0, r6, #0x0 bl SaveArray_Party_Get add r1, r4, #0x0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r7, #0x0 mov r2, #0x0 bl GetMonData @@ -335,7 +335,7 @@ Save_PlayerHasAllRegisInParty: ; 0x02054E30 _02054E4A: ldr r0, [sp, #0x0] add r1, r6, #0x0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0x5 mov r2, #0x0 bl GetMonData diff --git a/arm9/asm/unk_02057380.s b/arm9/asm/unk_02057380.s index c00db4692..2871ce831 100644 --- a/arm9/asm/unk_02057380.s +++ b/arm9/asm/unk_02057380.s @@ -368,7 +368,7 @@ sub_02057688: ; 0x02057688 bl MapObject_GetFieldSysPtr lsl r1, r5, #0x10 lsr r1, r1, #0x10 - bl FlagSet + bl FieldSystem_FlagSet add r0, r4, #0x0 bl sub_02057654 pop {r3-r5, pc} diff --git a/arm9/asm/unk_0205CDB4.s b/arm9/asm/unk_0205CDB4.s index 80a7ebb49..c5aa35867 100644 --- a/arm9/asm/unk_0205CDB4.s +++ b/arm9/asm/unk_0205CDB4.s @@ -24,7 +24,7 @@ UNK_020F7240: ; 0x020F7240 sub_0205CDB4: ; 0x0205CDB4 push {r4, lr} add r4, r0, #0x0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 bl sub_020254B4 add r1, r0, #0x0 @@ -43,7 +43,7 @@ _0205CDD4: .word UNK_020F7220 sub_0205CDD8: ; 0x0205CDD8 push {r4, lr} add r4, r0, #0x0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 bl sub_020254B4 cmp r0, #0x0 @@ -68,7 +68,7 @@ sub_0205CE00: ; 0x0205CE00 add r4, r1, #0x0 add r7, r2, #0x0 str r3, [sp, #0x4] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 bl sub_020254B4 cmp r0, #0x0 diff --git a/arm9/asm/unk_0205F7A0.s b/arm9/asm/unk_0205F7A0.s index 6f36b15a2..08e398fcf 100644 --- a/arm9/asm/unk_0205F7A0.s +++ b/arm9/asm/unk_0205F7A0.s @@ -70,7 +70,7 @@ _0205F806: str r0, [r5, #0x4] _0205F812: ldr r0, [sp, #0x0] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl Save_PlayerData_GetProfileAddr bl PlayerProfile_GetTrainerGender str r0, [r5, #0xc] diff --git a/arm9/asm/unk_020647A4.s b/arm9/asm/unk_020647A4.s index 7512ae97f..41d28160a 100644 --- a/arm9/asm/unk_020647A4.s +++ b/arm9/asm/unk_020647A4.s @@ -47,7 +47,7 @@ sub_020647A4: ; 0x020647A4 push {r3-r7, lr} sub sp, #0x30 add r4, r0, #0x0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 mov r1, #0x7 bl sub_020254A0 @@ -137,7 +137,7 @@ _02064868: .word UNK_020F7D4C sub_0206486C: ; 0x0206486C push {r3-r5, lr} add r4, r0, #0x0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 add r5, r0, #0x0 mov r1, #0x7 @@ -325,7 +325,7 @@ _020649AC: .word 0x00000125 thumb_func_start sub_020649B0 sub_020649B0: ; 0x020649B0 push {r3, lr} - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 mov r1, #0x7 bl sub_020254A0 @@ -346,7 +346,7 @@ _020649CC: sub_020649D4: ; 0x020649D4 push {r3-r5, lr} add r5, r0, #0x0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 mov r1, #0x7 bl sub_020254A0 diff --git a/arm9/asm/unk_02064CA8.s b/arm9/asm/unk_02064CA8.s index 4b5e7e76b..595fb9bf6 100644 --- a/arm9/asm/unk_02064CA8.s +++ b/arm9/asm/unk_02064CA8.s @@ -17,7 +17,7 @@ UNK_020F7E54: ; 0x020F7E54 thumb_func_start InitPastoriaGym InitPastoriaGym: ; 0x02064CA8 push {r4, lr} - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 add r4, r0, #0x0 mov r1, #0x1 @@ -33,7 +33,7 @@ InitPastoriaGym: ; 0x02064CA8 InitHearthomeGym: ; 0x02064CC8 push {r3-r5, lr} add r5, r0, #0x0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 add r4, r0, #0x0 mov r1, #0x2 @@ -67,7 +67,7 @@ _02064D08: thumb_func_start InitCanalaveGym InitCanalaveGym: ; 0x02064D10 push {r4-r6, lr} - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 add r4, r0, #0x0 mov r1, #0x3 @@ -95,7 +95,7 @@ _02064D48: .word UNK_020F7E54 thumb_func_start InitVeilstoneGym InitVeilstoneGym: ; 0x02064D4C push {r4-r6, lr} - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 add r4, r0, #0x0 mov r1, #0x4 @@ -130,7 +130,7 @@ InitSunyshoreGym: ; 0x02064D88 bl GF_AssertFail _02064D96: add r0, r7, #0x0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 add r4, r0, #0x0 mov r1, #0x5 diff --git a/arm9/asm/unk_02064E90.s b/arm9/asm/unk_02064E90.s index 41b7a2248..4cb4002a3 100644 --- a/arm9/asm/unk_02064E90.s +++ b/arm9/asm/unk_02064E90.s @@ -14,7 +14,7 @@ sub_02064E90: ; 0x02064E90 add r0, r6, #0x0 str r3, [sp, #0x1c] ldr r5, [sp, #0xbc] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData str r0, [sp, #0x20] bl Save_PlayerData_GetProfileAddr add r7, r0, #0x0 @@ -218,7 +218,7 @@ _02065074: .word FreeToHeap thumb_func_start GetTrainerCardLevel GetTrainerCardLevel: ; 0x02065078 push {r3-r7, lr} - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData add r7, r0, #0x0 bl Save_GameStats_Get add r6, r0, #0x0 diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index b61411d32..146405f48 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -55,7 +55,7 @@ sub_020653EC: ; 0x020653EC bl MI_CpuFill8 add r0, r5, #0x0 str r6, [r4, #0x4] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData mov r1, #0x5b lsl r1, r1, #0x2 str r5, [r4, r1] @@ -1807,10 +1807,10 @@ sub_020661F8: ; 0x020661F8 mov r0, #0x5b lsl r0, r0, #0x2 ldr r0, [r5, r0] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl SaveArray_Party_Get add r1, r7, #0x0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r2, r0, #0x0 mov r0, #0x6b lsl r0, r0, #0x2 @@ -2376,19 +2376,19 @@ _02066676: mov r0, #0x5b lsl r0, r0, #0x2 ldr r0, [r5, r0] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl SaveArray_Party_Get str r0, [r4, #0x0] mov r0, #0x5b lsl r0, r0, #0x2 ldr r0, [r5, r0] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl Save_Bag_Get str r0, [r4, #0x4] mov r0, #0x5b lsl r0, r0, #0x2 ldr r0, [r5, r0] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl Save_PlayerData_GetOptionsAddr str r0, [r4, #0xc] mov r0, #0x5b diff --git a/arm9/asm/unk_0206BB5C.s b/arm9/asm/unk_0206BB5C.s index 20b5c9152..fe64bba62 100644 --- a/arm9/asm/unk_0206BB5C.s +++ b/arm9/asm/unk_0206BB5C.s @@ -193,7 +193,7 @@ _0206BCBC: beq _0206BD0A ldr r0, [sp, #0x4] sub r1, r1, #0x1 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r4, r0, #0x0 ldr r0, [sp, #0x0] ldr r2, [sp, #0x8] @@ -423,7 +423,7 @@ sub_0206BE48: ; 0x0206BE48 _0206BE72: ldr r0, [sp, #0x10] add r1, r7, #0x0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex str r0, [sp, #0x24] mov r1, #0x5 mov r2, #0x0 diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index 525c09e9b..6bc4028a6 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -2195,7 +2195,7 @@ _0206D8EA: bl CalcMonLevelAndStats ldr r0, [r4, #0x24] add r1, r5, #0x0 - bl AddMonToParty + bl Party_AddMon ldr r0, [r4, #0x48] add r1, r5, #0x0 bl Pokedex_SetMonCaughtFlag diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index 91bd6b305..9116c6460 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -1680,7 +1680,7 @@ _020700BC: ldr r0, _020701DC ; =0x000005A4 ldr r0, [r5, r0] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0x5 mov r2, #0x0 add r7, r0, #0x0 @@ -2812,7 +2812,7 @@ sub_020709FC: ; 0x020709FC add r6, r1, #0x0 ldr r0, [r5, r0] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex ldr r1, _02070A7C ; =0x00000B23 ldrb r2, [r5, r1] lsl r3, r2, #0x19 @@ -3758,7 +3758,7 @@ sub_0207117C: ; 0x0207117C ldr r1, [sp, #0x0] ldr r0, [r0, #0x0] ldrb r1, [r1, r2] - bl GetPartyMonByIndex + bl Party_GetMonByIndex str r0, [sp, #0x8] ldr r0, [sp, #0x4] mov r1, #0x1 @@ -3999,7 +3999,7 @@ sub_02071340: ; 0x02071340 cmp r0, #0x0 beq _0207136E ldr r0, [r2, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r0, #0x0 ldr r0, _020713E0 ; =0x000005A4 ldr r2, _020713E4 ; =0x00000B34 @@ -5036,7 +5036,7 @@ _02071B34: ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r6, r0, #0x0 ldr r0, _02071C3C ; =0x0000069C mov r1, #0x40 @@ -5247,7 +5247,7 @@ _02071D14: add r1, r6, #0x0 ldr r0, [r5, r0] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex ldrh r1, [r7, r4] add r2, sp, #0x0 str r1, [sp, #0x0] @@ -5429,7 +5429,7 @@ _02071E5A: ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r0, #0x0 ldr r0, _02071F1C ; =0x000005A4 mov r2, #0x3 @@ -5463,7 +5463,7 @@ _02071ECC: ldr r0, [r1, #0x0] ldr r1, _02071F20 ; =0x00000B25 ldrb r1, [r5, r1] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r0, #0x0 ldr r0, _02071F1C ; =0x000005A4 ldr r2, [r5, r0] @@ -5529,7 +5529,7 @@ sub_02071F58: ; 0x02071F58 ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r6, r0, #0x0 mov r7, #0x89 add r0, r5, #0x0 @@ -5807,7 +5807,7 @@ _020721B0: ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r7, r0, #0x0 ldr r0, _020722A8 ; =0x000005A4 ldr r0, [r5, r0] @@ -5971,7 +5971,7 @@ sub_0207230C: ; 0x0207230C ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r7, r0, #0x0 ldr r0, _02072410 ; =0x000005A4 ldr r0, [r5, r0] diff --git a/arm9/asm/unk_02072548.s b/arm9/asm/unk_02072548.s index ba2864568..adec1227a 100644 --- a/arm9/asm/unk_02072548.s +++ b/arm9/asm/unk_02072548.s @@ -582,7 +582,7 @@ _0207297E: ldr r1, _020729CC ; =0x00000B25 ldr r0, [r2, #0x0] ldrb r1, [r5, r1] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r6, r0, #0x0 ldr r0, _020729D0 ; =0x0000069C mov r1, #0x25 @@ -1211,7 +1211,7 @@ _02072E98: add r1, r4, #0x0 ldr r0, [r5, r0] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r0, #0x0 mov r0, #0x0 ldr r3, _02072EE0 ; =0x000005A4 @@ -1280,7 +1280,7 @@ _02072F2C: add r1, r4, #0x0 ldr r0, [r5, r0] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r0, #0x0 add r0, r5, #0x0 bl sub_02076AA0 @@ -1983,7 +1983,7 @@ sub_020734C0: ; 0x020734C0 ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xa3 mov r2, #0x0 add r4, r0, #0x0 diff --git a/arm9/asm/unk_02073710.s b/arm9/asm/unk_02073710.s index 787d6b079..cf1510112 100644 --- a/arm9/asm/unk_02073710.s +++ b/arm9/asm/unk_02073710.s @@ -218,7 +218,7 @@ sub_020737D0: ; 0x020737D0 add r4, r2, #0x0 ldr r0, [r0, #0x0] add r7, r1, #0x0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex lsl r1, r4, #0x10 asr r6, r1, #0x10 mov r1, #0x2c diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s index dc4428e7b..9ce42ac98 100644 --- a/arm9/asm/unk_02073DA8.s +++ b/arm9/asm/unk_02073DA8.s @@ -199,7 +199,7 @@ sub_02073EEC: ; 0x02073EEC bne _02073F66 ldr r0, [r5, r0] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex ldr r2, _02074058 ; =0x0000069C add r6, r0, #0x0 ldr r0, [r5, r2] @@ -238,7 +238,7 @@ _02073F66: ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0x0 str r1, [sp, #0x0] add r6, r0, #0x0 @@ -530,7 +530,7 @@ sub_02074200: ; 0x02074200 ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r0, #0x0 ldr r0, _02074268 ; =0x000005A4 mov r2, #0xc @@ -625,7 +625,7 @@ sub_020742A8: ; 0x020742A8 ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0x0 str r1, [sp, #0x0] add r5, r0, #0x0 @@ -789,7 +789,7 @@ sub_02074428: ; 0x02074428 ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex bl Pokemon_RemoveCapsule ldr r0, _0207444C ; =0x000005A4 mov r1, #0x0 @@ -2383,7 +2383,7 @@ sub_02075118: ; 0x02075118 ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xa1 mov r2, #0x0 bl GetMonData diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s index b4e91ae9d..05a06dc0f 100644 --- a/arm9/asm/unk_0207550C.s +++ b/arm9/asm/unk_0207550C.s @@ -365,7 +365,7 @@ sub_020757F4: ; 0x020757F4 ldrb r1, [r4, r1] ldr r0, [r0, #0x0] add r5, r2, #0x0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex bl sub_020690E4 add r2, r0, #0x0 mov r0, #0x6a @@ -1045,7 +1045,7 @@ sub_02075DC0: ; 0x02075DC0 ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xd mov r2, #0x0 add r4, r0, #0x0 @@ -1243,7 +1243,7 @@ sub_02075F60: ; 0x02075F60 ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xa2 mov r2, #0x0 str r0, [sp, #0x8] @@ -1372,7 +1372,7 @@ sub_020760A0: ; 0x020760A0 ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xa2 mov r2, #0x0 bl GetMonData @@ -1558,7 +1558,7 @@ _02076212: ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r5, r0, #0x0 add r0, r4, #0x0 bl sub_020772CC @@ -1646,7 +1646,7 @@ _020762DC: ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xa2 mov r2, #0x0 bl GetMonData @@ -1782,7 +1782,7 @@ sub_0207640C: ; 0x0207640C ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xa3 mov r2, #0x0 add r4, r0, #0x0 @@ -2056,7 +2056,7 @@ _02076680: ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex ldr r1, _02076878 ; =0x000005A4 add r5, r0, #0x0 ldr r2, [r4, r1] @@ -2196,7 +2196,7 @@ _020767A4: ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex ldr r2, _02076878 ; =0x000005A4 add r1, r0, #0x0 ldr r2, [r4, r2] @@ -2241,7 +2241,7 @@ _02076814: ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r5, r0, #0x0 ldr r0, _02076878 ; =0x000005A4 ldr r0, [r4, r0] @@ -2307,7 +2307,7 @@ sub_02076890: ; 0x02076890 ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r5, r0, #0x0 bl sub_020690E4 add r2, r0, #0x0 @@ -2586,7 +2586,7 @@ sub_02076AF8: ; 0x02076AF8 ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r6, r0, #0x0 add r0, r4, #0x0 add r1, r6, #0x0 @@ -2775,7 +2775,7 @@ sub_02076C94: ; 0x02076C94 ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r5, r0, #0x0 bl sub_020690E4 add r2, r0, #0x0 @@ -2854,7 +2854,7 @@ sub_02076D3C: ; 0x02076D3C ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex ldr r2, _02076DC4 ; =0x000005A4 add r1, r0, #0x0 ldr r2, [r5, r2] @@ -3138,7 +3138,7 @@ sub_02076FB0: ; 0x02076FB0 ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r6, #0x0 add r1, #0x36 mov r2, #0x0 @@ -3375,7 +3375,7 @@ _0207716A: ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r4, #0x36 add r1, r4, #0x0 mov r2, #0x0 diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index ec2dc9f38..83493879b 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -3169,7 +3169,7 @@ _0207B588: _0207B58E: ldr r0, [r1, #0x0] add r1, r4, #0x0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0x5 mov r2, #0x0 add r6, r0, #0x0 @@ -3269,7 +3269,7 @@ _0207B640: _0207B64E: ldrb r1, [r4, #0x14] ldr r0, [r4, #0x0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex pop {r4, pc} _0207B658: bl sub_020690C8 diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s index 067c3e25f..97d73835f 100644 --- a/arm9/asm/unk_02080C38.s +++ b/arm9/asm/unk_02080C38.s @@ -108,10 +108,10 @@ _02080CB4: ldr r0, [r6, #0xc] bl SaveArray_Party_Get mov r1, #0x0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r7, r0, #0x0 add r0, r6, #0x0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl Save_PlayerData_GetProfileAddr mov r1, #0xb str r0, [sp, #0x0] diff --git a/arm9/asm/unk_020859C0.s b/arm9/asm/unk_020859C0.s index b98db5169..04d2f1820 100644 --- a/arm9/asm/unk_020859C0.s +++ b/arm9/asm/unk_020859C0.s @@ -674,7 +674,7 @@ _02085DDC: _02085E0A: ldr r0, [r7, #0x1c] add r1, r4, #0x0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex str r0, [r5, #0x4] ldr r0, [sp, #0x0] add r4, r4, #0x1 diff --git a/arm9/asm/unk_02086084.s b/arm9/asm/unk_02086084.s index 0d38a5f88..60b64c930 100644 --- a/arm9/asm/unk_02086084.s +++ b/arm9/asm/unk_02086084.s @@ -274,7 +274,7 @@ _020862D6: bl TaskManager_GetFieldSystem add r6, r0, #0x0 ldr r5, [r4, #0xc] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl Save_PlayerData_GetProfileAddr add r7, r0, #0x0 ldr r0, [r6, #0x1c] @@ -299,7 +299,7 @@ _020862D6: mov r2, #0x0 bl SetMonData add r0, r6, #0x0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData ldr r1, [r4, #0xc] bl sub_0202C144 ldr r0, [r4, #0x4] @@ -322,7 +322,7 @@ _0208633A: bl GetMonData add r7, r0, #0x0 add r0, r6, #0x0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl Save_PlayerData_GetOptionsAddr str r0, [sp, #0x0] mov r0, #0xb diff --git a/arm9/asm/unk_02087D00.s b/arm9/asm/unk_02087D00.s index 86b4836bc..3cab0dc59 100644 --- a/arm9/asm/unk_02087D00.s +++ b/arm9/asm/unk_02087D00.s @@ -540,7 +540,7 @@ sub_020880A0: ; 0x020880A0 ldr r0, [r5, #0xc] ldrb r1, [r5, #0x8] ldr r0, [r0, #0x10] - bl GetPartyMonByIndex + bl Party_GetMonByIndex str r0, [r4, #0x0] ldr r0, [r5, #0xc] ldr r0, [r0, #0x18] diff --git a/arm9/global.inc b/arm9/global.inc index ca612999a..ae9c461a0 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -2612,7 +2612,7 @@ .extern sub_02037778 .extern sub_02037790 .extern sub_020377A8 -.extern FieldSystem_GetSaveDataPtr +.extern FieldSystem_GetSaveData .extern sub_020377B0 .extern sub_020377C8 .extern sub_020377E0 @@ -2682,7 +2682,7 @@ .extern VarGet .extern sub_02039504 .extern FlagCheck -.extern FlagSet +.extern FieldSystem_FlagSet .extern FlagClear .extern ResetTempFlagsAndVars .extern sub_0203959C @@ -2691,7 +2691,7 @@ .extern sub_02039618 .extern TrainerIsDoubleBattle .extern TrainerFlagCheck -.extern TrainerFlagSet +.extern TrainerFieldSystem_FlagSet .extern TrainerFlagClear .extern sub_02039694 .extern sub_02039754 @@ -4882,10 +4882,10 @@ .extern SaveArray_Party_Alloc .extern SaveArray_Party_Init .extern InitPartyWithMaxSize -.extern AddMonToParty -.extern RemoveMonFromParty +.extern Party_AddMon +.extern Party_RemoveMon .extern GetPartyCount -.extern GetPartyMonByIndex +.extern Party_GetMonByIndex .extern ReplacePartySlotWithMon .extern SwapSlotsInParty .extern CopyParty diff --git a/arm9/overlays/05/asm/ov05_021D80E8.s b/arm9/overlays/05/asm/ov05_021D80E8.s index 1d51c37cf..cebebd396 100644 --- a/arm9/overlays/05/asm/ov05_021D80E8.s +++ b/arm9/overlays/05/asm/ov05_021D80E8.s @@ -1858,7 +1858,7 @@ ov05_021D8FD0: ; 0x021D8FD0 _021D8FF6: add r0, r6, #0 add r1, r4, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #5 add r2, r5, #0 bl MonApplyFriendshipMod diff --git a/arm9/overlays/05/asm/ov05_021E5FD8.s b/arm9/overlays/05/asm/ov05_021E5FD8.s index 5468b1046..15f9979fe 100644 --- a/arm9/overlays/05/asm/ov05_021E5FD8.s +++ b/arm9/overlays/05/asm/ov05_021E5FD8.s @@ -2423,7 +2423,7 @@ ov05_021E72E8: ; 0x021E72E8 add r4, r1, #0 bl SaveArray_Party_Get add r1, r4, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex pop {r4, pc} .balign 4, 0 diff --git a/arm9/overlays/05/asm/ov05_021EC458.s b/arm9/overlays/05/asm/ov05_021EC458.s index 6a0ae4771..5784a2d46 100644 --- a/arm9/overlays/05/asm/ov05_021EC458.s +++ b/arm9/overlays/05/asm/ov05_021EC458.s @@ -92,7 +92,7 @@ ov05_021EC4F0: ; 0x021EC4F0 add r6, r0, #0 str r1, [sp] add r7, r3, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r4, r0, #0 add r0, r5, #0 bl DaycareMon_GetExtras @@ -127,7 +127,7 @@ _021EC544: bl DaycareMon_SetSteps ldr r1, [sp] add r0, r6, #0 - bl RemoveMonFromParty + bl Party_RemoveMon ldr r1, _021EC578 ; =0x000001B9 add r0, r6, #0 bl PartyHasMon @@ -321,7 +321,7 @@ _021EC6E0: _021EC6FA: ldr r0, [sp] add r1, r4, #0 - bl AddMonToParty + bl Party_AddMon add r0, r5, #0 bl ZeroBoxMonData add r0, r6, #0 @@ -1642,7 +1642,7 @@ _021ED168: bl SetMonData ldr r0, [sp, #4] add r1, r4, #0 - bl AddMonToParty + bl Party_AddMon add r0, r5, #0 bl ov05_021ECD64 add r0, r4, #0 @@ -1663,7 +1663,7 @@ ov05_021ED190: ; 0x021ED190 _021ED1A2: add r0, r5, #0 add r1, r4, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r7, #0 mov r2, #0 bl GetMonData @@ -1671,7 +1671,7 @@ _021ED1A2: bne _021ED1D6 add r0, r5, #0 add r1, r4, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xa mov r2, #0 bl GetMonData @@ -1998,7 +1998,7 @@ _021ED3F8: _021ED430: add r0, r7, #0 add r1, r5, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0x4c mov r2, #0 add r4, r0, #0 @@ -2061,7 +2061,7 @@ ov05_021ED49C: ; 0x021ED49C _021ED4AC: add r0, r7, #0 add r1, r5, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0x4c mov r2, #0 add r4, r0, #0 @@ -2197,7 +2197,7 @@ _021ED5B4: ov05_021ED5C4: ; 0x021ED5C4 push {r3, r4, r5, lr} add r5, r2, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r4, r0, #0 bl sub_020690E4 add r2, r0, #0 diff --git a/arm9/overlays/05/asm/ov05_021F38CC.s b/arm9/overlays/05/asm/ov05_021F38CC.s index 2d2528871..b6cc167b7 100644 --- a/arm9/overlays/05/asm/ov05_021F38CC.s +++ b/arm9/overlays/05/asm/ov05_021F38CC.s @@ -170,7 +170,7 @@ Field_CheckPokemonSizeRecord: ; 0x021F3A18 add r5, r1, #0 bl SaveArray_Party_Get add r1, r5, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #5 mov r2, #0 str r0, [sp] @@ -239,7 +239,7 @@ Field_SetPokemonSizeRecord: ; 0x021F3AB4 add r5, r1, #0 bl SaveArray_Party_Get add r1, r5, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex bl ov05_021F38CC add r1, sp, #0 strh r0, [r1] @@ -335,7 +335,7 @@ Field_BufferPartyPokemonSize: ; 0x021F3B7C add r7, r1, #0 bl SaveArray_Party_Get add r1, r4, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #5 mov r2, #0 add r6, r0, #0 diff --git a/arm9/overlays/05/asm/ov05_021F5C44.s b/arm9/overlays/05/asm/ov05_021F5C44.s index 7dd5fabf6..cab8066df 100644 --- a/arm9/overlays/05/asm/ov05_021F5C44.s +++ b/arm9/overlays/05/asm/ov05_021F5C44.s @@ -77,7 +77,7 @@ _021F5CBA: bne _021F5D10 ldr r0, [r0, #8] mov r1, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex ldr r2, [r5, #4] add r3, r0, #0 lsl r2, r2, #0x10 diff --git a/arm9/overlays/06/asm/overlay_06.s b/arm9/overlays/06/asm/overlay_06.s index 7fdca3e51..7e1c2140b 100644 --- a/arm9/overlays/06/asm/overlay_06.s +++ b/arm9/overlays/06/asm/overlay_06.s @@ -4851,7 +4851,7 @@ _0223BA42: add r4, r0, #0 add r0, r7, #0 mov r1, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex str r0, [sp, #0x20] ldr r1, [sp, #0x20] add r0, r5, #0 @@ -5042,7 +5042,7 @@ _0223BBDA: cmp r0, #0xc blt _0223BBDA add r0, r5, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl Save_Pokedex_Get bl Pokedex_GetNatDexFlag add r6, r0, #0 @@ -5195,7 +5195,7 @@ _0223BD2E: ldr r0, [r0, #0xc] bl SaveArray_Party_Get mov r1, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex str r0, [sp, #0x14] ldr r0, [sp, #8] ldr r1, [sp, #0x14] @@ -5377,7 +5377,7 @@ _0223BEA4: add r4, r0, #0 add r0, r6, #0 mov r1, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex str r0, [sp, #0x18] ldr r1, [sp, #0x18] add r0, r5, #0 @@ -5479,7 +5479,7 @@ _0223BF7E: cmp r0, #0xc blt _0223BF7E add r0, r5, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl Save_Pokedex_Get bl Pokedex_GetNatDexFlag add r6, r0, #0 @@ -5633,7 +5633,7 @@ _0223C0CE: str r0, [sp, #0x14] add r0, r6, #0 mov r1, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex str r0, [sp, #0x1c] ldr r1, [sp, #0x1c] ldr r2, [sp, #0x14] @@ -5789,7 +5789,7 @@ _0223C222: cmp r0, #0xc blt _0223C222 add r0, r5, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl Save_Pokedex_Get bl Pokedex_GetNatDexFlag add r6, r0, #0 @@ -5930,7 +5930,7 @@ _0223C350: cmp r0, #1 bne _0223C38C add r0, r5, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl Save_PlayerData_GetProfileAddr bl PlayerProfile_GetTrainerID str r0, [sp] @@ -7183,7 +7183,7 @@ ov06_0223CCDC: ; 0x0223CCDC ldr r0, [r5, #0xc] bl SaveArray_Party_Get mov r1, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex str r0, [sp, #0xc] ldr r1, [sp, #0xc] add r0, r5, #0 @@ -7259,7 +7259,7 @@ ov06_0223CD7C: ; 0x0223CD7C add r6, r3, #0 bl SaveArray_Party_Get mov r1, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r4, r0, #0 add r0, r5, #0 add r1, r4, #0 @@ -7702,7 +7702,7 @@ ov06_0223D044: ; 0x0223D044 bl SetMonData ldr r0, [r6, #8] add r1, r4, #0 - bl AddMonToParty + bl Party_AddMon cmp r0, #0 bne _0223D0D8 bl GF_AssertFail @@ -7911,7 +7911,7 @@ _0223D25C: lsl r0, r0, #2 add r0, r7, r0 ldr r0, [r0, #4] - bl AddMonToParty + bl Party_AddMon add sp, #0xc pop {r4, r5, r6, r7, pc} nop @@ -11442,7 +11442,7 @@ _0223EF28: str r0, [r2, #0x74] ldr r0, [r1] ldr r0, [r0, #0x68] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl Save_PlayerData_GetProfileAddr ldr r1, _0223EFF4 ; =0x02252420 ldr r1, [r1] @@ -15699,7 +15699,7 @@ CheckPastoriaGymButton: ; 0x02241230 cmp r0, #0 beq _022412E0 add r0, r4, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 mov r1, #1 bl sub_020254A0 @@ -16188,7 +16188,7 @@ ov06_02241670: ; 0x02241670 push {r4, r5, r6, r7, lr} sub sp, #0x2c add r4, r0, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 mov r1, #1 bl sub_020254A0 @@ -16412,7 +16412,7 @@ ov06_0224186C: ; 0x0224186C push {r3, r4, r5, r6, lr} sub sp, #0x24 add r5, r0, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 mov r1, #2 bl sub_020254A0 @@ -16499,7 +16499,7 @@ MoveHearthomeGymElevator: ; 0x02241914 mov r0, #0 str r0, [r6] add r0, r5, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 mov r1, #2 bl sub_020254A0 @@ -16820,7 +16820,7 @@ ov06_02241BB0: ; 0x02241BB0 add r5, r0, #0 ldr r0, [r5] add r4, r1, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 mov r1, #3 bl sub_020254A0 @@ -17604,7 +17604,7 @@ ov06_02242224: ; 0x02242224 push {r4, r5, r6, r7, lr} sub sp, #0x5c add r6, r0, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 mov r1, #3 bl sub_020254A0 @@ -17830,7 +17830,7 @@ _02242400: .word 0x000076A0 ov06_02242404: ; 0x02242404 push {r4, lr} add r4, r0, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 bl sub_020254B4 cmp r0, #3 @@ -17989,7 +17989,7 @@ ov06_0224252C: ; 0x0224252C add r5, r0, #0 ldr r0, [r5] add r4, r1, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 mov r1, #4 bl sub_020254A0 @@ -18060,7 +18060,7 @@ ov06_022425C8: ; 0x022425C8 push {r4, r5, r6, r7, lr} sub sp, #0x24 str r0, [sp, #8] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 mov r1, #4 bl sub_020254A0 @@ -18173,7 +18173,7 @@ ov06_02242698: ; 0x02242698 ov06_022426AC: ; 0x022426AC push {r3, r4, r5, lr} add r5, r0, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 bl sub_020254B4 cmp r0, #4 @@ -18472,7 +18472,7 @@ ov06_022428D8: ; 0x022428D8 push {r4, r5, r6, r7, lr} sub sp, #0x2c add r5, r0, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 mov r1, #5 bl sub_020254A0 @@ -18652,7 +18652,7 @@ RotateSunyshoreGymGear: ; 0x02242A38 push {r3, r4, r5, r6, r7, lr} add r7, r0, #0 add r5, r1, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 mov r1, #5 bl sub_020254A0 @@ -19819,7 +19819,7 @@ _02243308: _02243312: ldr r0, [sp, #4] add r1, r7, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #5 mov r2, #0 str r0, [sp, #0xc] @@ -20346,7 +20346,7 @@ _02243726: add r1, #0x2a ldrb r1, [r1] ldr r0, [sp, #8] - bl GetPartyMonByIndex + bl Party_GetMonByIndex lsl r1, r4, #1 add r6, r5, r1 add r7, r0, #0 @@ -20398,7 +20398,7 @@ _0224379C: add r1, r1, r5 add r1, #0x2a ldrb r1, [r1] - bl GetPartyMonByIndex + bl Party_GetMonByIndex str r0, [sp, #8] lsl r6, r5, #1 mov r1, #5 @@ -20644,7 +20644,7 @@ _0224394A: bne _0224396C add r5, #0x2a ldrb r1, [r5] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r2, r0, #0 add r0, r4, #0 add r1, r6, #0 @@ -20654,7 +20654,7 @@ _0224394A: _0224396C: add r5, #0x2a ldrb r1, [r5] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r2, r0, #0 add r0, r4, #0 add r1, r6, #0 @@ -21518,7 +21518,7 @@ _02243FFA: add r1, #0x2a ldrb r1, [r1] ldr r0, [sp] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r6, #0 mov r2, #0 str r0, [sp, #4] @@ -21738,7 +21738,7 @@ _022441B8: add r1, #0x2a ldrb r1, [r1] add r0, r7, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r0, #0 add r0, r5, #0 bl ov06_0224406C @@ -22216,7 +22216,7 @@ _022445A6: add r1, #0x2a ldrb r1, [r1] ldr r0, [sp, #4] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r4, #0 bl CopyPokemonToPokemon add r0, r4, #0 @@ -22410,7 +22410,7 @@ _0224471C: add r1, #0x2a ldrb r1, [r1] add r0, r7, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #5 mov r2, #0 bl GetMonData @@ -23257,7 +23257,7 @@ _02244D8A: bl ov06_02244388 ldr r0, [r7, #4] add r1, r4, #0 - bl AddMonToParty + bl Party_AddMon ldr r0, [sp] add r6, r6, #1 add r5, #0x38 @@ -23652,7 +23652,7 @@ _02245098: cmp r0, #0xc blo _02245098 add r0, r5, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl Save_Pokedex_Get bl Pokedex_GetNatDexFlag add r6, r0, #0 @@ -23816,7 +23816,7 @@ ov06_022451F4: ; 0x022451F4 push {r3, r4, lr} sub sp, #0x14 add r4, r0, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 mov r1, #6 bl sub_020254A0 @@ -23871,7 +23871,7 @@ ov06_0224525C: ; 0x0224525C add r7, r0, #0 add r6, r1, #0 str r2, [sp] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 mov r1, #6 bl sub_020254A0 @@ -23989,7 +23989,7 @@ _0224533C: .word ov06_02245360 ov06_02245340: ; 0x02245340 push {r4, lr} add r4, r1, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02024ED8 mov r1, #6 bl sub_020254A0 @@ -30826,7 +30826,7 @@ ov06_02248724: ; 0x02248724 ldr r0, [r1, #8] str r1, [sp] mov r1, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r6, r0, #0 ldr r0, [r5, #0xc] bl Save_Roamers_Get @@ -31079,7 +31079,7 @@ ov06_0224891C: ; 0x0224891C add r4, r3, #0 bl SaveArray_Party_Get add r1, r7, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xa0 mov r2, #0 add r7, r0, #0 @@ -40845,7 +40845,7 @@ ov06_0224D46C: ; 0x0224D46C bl sub_020377A8 add r5, r0, #0 add r0, r4, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData str r0, [sp, #0x1c] mov r0, #0xb mov r1, #0x18 diff --git a/arm9/overlays/07/asm/overlay_07.s b/arm9/overlays/07/asm/overlay_07.s index ad086f9a9..01ce4a805 100644 --- a/arm9/overlays/07/asm/overlay_07.s +++ b/arm9/overlays/07/asm/overlay_07.s @@ -2329,7 +2329,7 @@ _0221312A: bls _022131B0 ldr r0, [sp] add r1, r4, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #5 mov r2, #0 add r7, r0, #0 @@ -3672,7 +3672,7 @@ _02213C0C: _02213C2E: ldr r0, [sp] add r1, r6, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0x18 add r2, r6, #0 mul r2, r1 @@ -4488,13 +4488,13 @@ ov07_0221428C: ; 0x0221428C bhs _022142B4 ldr r0, [r0, #4] add r1, r4, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex str r0, [sp, #0x18] b _022142BE _022142B4: ldr r0, [r0, #0xc] sub r1, r4, #3 - bl GetPartyMonByIndex + bl Party_GetMonByIndex str r0, [sp, #0x18] _022142BE: add r1, r4, #0 diff --git a/arm9/overlays/09/asm/overlay_09.s b/arm9/overlays/09/asm/overlay_09.s index 81d8118d3..55fb6efdb 100644 --- a/arm9/overlays/09/asm/overlay_09.s +++ b/arm9/overlays/09/asm/overlay_09.s @@ -2437,7 +2437,7 @@ _022131E2: ldr r0, [r0] ldr r1, [sp, #8] ldr r0, [r0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex str r0, [r4, #4] mov r1, #5 mov r2, #0 diff --git a/arm9/overlays/11/asm/ov11_0222D5C0_1.s b/arm9/overlays/11/asm/ov11_0222D5C0_1.s index 9aebb028b..0b7f59bf2 100644 --- a/arm9/overlays/11/asm/ov11_0222D5C0_1.s +++ b/arm9/overlays/11/asm/ov11_0222D5C0_1.s @@ -213,7 +213,7 @@ _0222D752: bl CreateHeap ldr r0, [r5, #4] ldr r1, [sp, #0x24] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r0, #0 mov r0, #0x5a lsl r0, r0, #2 @@ -1141,7 +1141,7 @@ ov11_0222DFA4: ; 0x0222DFA4 beq _0222DFE4 ldr r0, [r4, #0x6c] mov r1, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r0, #0 add r0, r4, #0 bl ov11_02230FA8 @@ -2020,7 +2020,7 @@ _0222E760: _0222E76C: ldr r0, [r7, #0x68] add r1, r5, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #5 mov r2, #0 add r6, r0, #0 @@ -2125,7 +2125,7 @@ _0222E83C: _0222E848: ldr r0, [r7, #0x68] add r1, r5, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #5 mov r2, #0 add r6, r0, #0 @@ -2240,7 +2240,7 @@ _0222E920: _0222E938: ldr r0, [r7, #0x68] add r1, r6, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex ldr r1, [sp, #0x14] add r5, r0, #0 cmp r1, #1 @@ -2351,7 +2351,7 @@ _0222EA0C: _0222EA22: ldr r0, [r7, #0x68] add r1, r5, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #5 mov r2, #0 add r6, r0, #0 @@ -2578,7 +2578,7 @@ _0222EBEA: _0222EBF6: ldr r0, [r7, #0x68] add r1, r5, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #5 mov r2, #0 add r6, r0, #0 @@ -2692,7 +2692,7 @@ _0222ECC8: _0222ECE0: ldr r0, [r7, #0x68] add r1, r6, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex ldr r1, [sp, #0x20] add r5, r0, #0 cmp r1, #1 @@ -2806,7 +2806,7 @@ _0222EDBC: _0222EDD2: ldr r0, [r7, #0x68] add r1, r5, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #5 mov r2, #0 add r6, r0, #0 @@ -2861,7 +2861,7 @@ _0222EE3E: beq _0222EE5A ldr r0, [r4, #0x6c] mov r1, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r2, r4, #0 mov r1, #0x8f add r2, #0xf4 @@ -2893,7 +2893,7 @@ _0222EE7C: _0222EE8C: ldr r0, [r4, #0x68] add r1, r5, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex ldr r2, [r4, r6] add r1, r7, #0 lsl r2, r2, #0x10 @@ -2915,7 +2915,7 @@ _0222EEAC: _0222EEBC: ldr r0, [r4, #0x70] add r1, r5, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex ldr r2, [r4, r6] add r1, r7, #0 lsl r2, r2, #0x10 diff --git a/arm9/overlays/11/asm/ov11_0222FF68.s b/arm9/overlays/11/asm/ov11_0222FF68.s index 8007dde44..879cd7b16 100644 --- a/arm9/overlays/11/asm/ov11_0222FF68.s +++ b/arm9/overlays/11/asm/ov11_0222FF68.s @@ -136,7 +136,7 @@ _02230034: add r0, r5, r0 ldr r0, [r0, #0x68] add r1, r6, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex pop {r4, r5, r6, pc} _02230042: ldr r1, [r5, #0x2c] @@ -148,14 +148,14 @@ _02230042: add r0, r5, r0 ldr r0, [r0, #0x68] add r1, r6, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex pop {r4, r5, r6, pc} _0223005A: lsl r0, r4, #2 add r0, r5, r0 ldr r0, [r0, #0x68] add r1, r6, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex pop {r4, r5, r6, pc} thumb_func_start ov11_02230068 @@ -1938,7 +1938,7 @@ _02230D9C: cmp r1, #6 bge _02230DC4 ldr r0, [r5, #4] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r3, #0x59 str r7, [sp] lsl r3, r3, #2 diff --git a/arm9/overlays/11/asm/ov11_02232264.s b/arm9/overlays/11/asm/ov11_02232264.s index 7f1a498ea..332384c40 100644 --- a/arm9/overlays/11/asm/ov11_02232264.s +++ b/arm9/overlays/11/asm/ov11_02232264.s @@ -8819,7 +8819,7 @@ _0223678C: _02236794: ldr r0, [sp, #0x14] add r1, r5, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #5 mov r2, #0 add r4, r0, #0 @@ -8872,7 +8872,7 @@ _022367EA: beq _022367EA ldr r0, [sp, #0x14] add r1, r5, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r7, #0 mov r2, #0 add r4, r0, #0 @@ -15697,7 +15697,7 @@ _02239DFA: _02239E2A: add r0, r7, #0 add r1, r4, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xad mov r2, #0 add r6, r0, #0 @@ -15746,7 +15746,7 @@ _02239E82: _02239E90: ldr r0, [sp, #8] add r1, r4, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xad mov r2, #0 add r6, r0, #0 @@ -15793,7 +15793,7 @@ _02239EDA: _02239EF8: add r0, r7, #0 add r1, r4, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xad mov r2, #0 add r6, r0, #0 @@ -18327,7 +18327,7 @@ ov11_0223B2DC: ; 0x0223B2DC add r7, r0, #0 ldr r0, [sp] ldr r1, [sp, #4] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #6 add r2, r4, #0 str r0, [sp, #0x14] @@ -19494,7 +19494,7 @@ _0223BC8A: bl ov11_022564A8 ldr r0, [sp, #0x28] add r1, r6, #0 - bl AddMonToParty + bl Party_AddMon cmp r0, #1 bne _0223BD1E ldr r0, [r4, #0x28] diff --git a/arm9/overlays/11/asm/ov11_0223D1DC.s b/arm9/overlays/11/asm/ov11_0223D1DC.s index 27afedb3c..244326048 100644 --- a/arm9/overlays/11/asm/ov11_0223D1DC.s +++ b/arm9/overlays/11/asm/ov11_0223D1DC.s @@ -9880,7 +9880,7 @@ _02241DD2: _02241DFE: add r0, r6, #0 add r1, r5, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xad mov r2, #0 add r4, r0, #0 @@ -9967,7 +9967,7 @@ _02241E8A: _02241EB4: add r0, r6, #0 add r1, r5, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xad mov r2, #0 add r4, r0, #0 @@ -10172,7 +10172,7 @@ _0224200C: _02242056: add r0, r6, #0 add r1, r4, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xad mov r2, #0 add r5, r0, #0 @@ -10252,7 +10252,7 @@ _022420CA: _022420FE: add r0, r7, #0 add r1, r4, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xad mov r2, #0 add r6, r0, #0 @@ -10287,7 +10287,7 @@ _0224213C: _0224214A: ldr r0, [sp, #0x18] add r1, r4, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xad mov r2, #0 add r6, r0, #0 @@ -10356,7 +10356,7 @@ _022421B0: _022421DC: add r0, r6, #0 add r1, r4, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xad mov r2, #0 add r5, r0, #0 diff --git a/arm9/overlays/11/asm/ov11_02242B78.s b/arm9/overlays/11/asm/ov11_02242B78.s index abfd5b33e..4be3a6d43 100644 --- a/arm9/overlays/11/asm/ov11_02242B78.s +++ b/arm9/overlays/11/asm/ov11_02242B78.s @@ -5306,7 +5306,7 @@ _02245384: _022453A4: add r0, r5, #0 add r1, r4, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xa2 mov r2, #0 bl GetMonData @@ -5363,7 +5363,7 @@ _022453F8: _02245418: add r0, r5, #0 add r1, r4, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xa2 mov r2, #0 bl GetMonData @@ -8792,7 +8792,7 @@ _02246E72: _02246E76: ldr r0, [sp, #0x14] add r1, r5, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #5 mov r2, #0 add r4, r0, #0 diff --git a/arm9/overlays/11/asm/ov11_0224CA64.s b/arm9/overlays/11/asm/ov11_0224CA64.s index 2e2809cce..8bfb90f9c 100644 --- a/arm9/overlays/11/asm/ov11_0224CA64.s +++ b/arm9/overlays/11/asm/ov11_0224CA64.s @@ -1313,7 +1313,7 @@ _0224D452: _0224D466: add r0, r6, #0 add r1, r5, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #5 mov r2, #0 add r4, r0, #0 diff --git a/arm9/overlays/11/asm/ov11_0224D550.s b/arm9/overlays/11/asm/ov11_0224D550.s index 805819773..dd3e35be9 100644 --- a/arm9/overlays/11/asm/ov11_0224D550.s +++ b/arm9/overlays/11/asm/ov11_0224D550.s @@ -8065,7 +8065,7 @@ _02251680: ldr r0, [r4, #8] ldr r0, [r0, #4] ldr r0, [r0] - bl AddMonToParty + bl Party_AddMon ldr r1, [r4, #8] ldrb r0, [r5, #0x18] ldr r1, [r1, #4] @@ -9442,7 +9442,7 @@ _022521AE: ldr r0, [r4, #4] add r1, r6, #0 ldr r0, [r0] - bl AddMonToParty + bl Party_AddMon add r5, r5, #1 cmp r5, #6 blt _022521AE @@ -9468,7 +9468,7 @@ _022521DC: ldr r0, [r4, #4] add r1, r6, #0 ldr r0, [r0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r0, #0 ldr r0, [sp, #0x1c] bl CopyPokemonToPokemon @@ -9508,7 +9508,7 @@ _02252232: ldr r0, [r4, #4] ldr r1, [sp, #0xc] ldr r0, [r0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r0, #0 ldr r0, [sp, #0x20] bl CopyPokemonToPokemon @@ -9593,7 +9593,7 @@ _022522E2: add r1, r0, #0 ldr r0, [r4, #4] ldr r0, [r0] - bl AddMonToParty + bl Party_AddMon ldr r0, [r4, #4] ldrb r1, [r6, #0x1c] add r0, r0, r5 diff --git a/arm9/overlays/11/asm/ov11_02254710.s b/arm9/overlays/11/asm/ov11_02254710.s index 5a2b630ab..ddc0ea2d6 100644 --- a/arm9/overlays/11/asm/ov11_02254710.s +++ b/arm9/overlays/11/asm/ov11_02254710.s @@ -1443,7 +1443,7 @@ _0225523A: ldr r1, _022554FC ; =0x0000312C ldr r0, [sp, #0x24] ldrb r1, [r7, r1] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xad mov r2, #0 add r4, r0, #0 @@ -1544,7 +1544,7 @@ _02255304: ldr r1, _022554FC ; =0x0000312C ldr r0, [sp, #0x10] ldrb r1, [r6, r1] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xad mov r2, #0 add r7, r0, #0 @@ -1620,7 +1620,7 @@ _022553A0: ldr r1, _022554FC ; =0x0000312C ldr r0, [sp, #0x14] ldrb r1, [r6, r1] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xad mov r2, #0 add r7, r0, #0 @@ -1686,7 +1686,7 @@ _02255428: ldr r1, _022554FC ; =0x0000312C ldr r0, [sp, #0x18] ldrb r1, [r6, r1] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xad mov r2, #0 add r7, r0, #0 @@ -4626,7 +4626,7 @@ _02256A80: ldr r1, _02256C00 ; =0x0000312C ldr r0, [sp, #0x10] ldrb r1, [r6, r1] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xad mov r2, #0 str r0, [sp, #0x14] @@ -4691,7 +4691,7 @@ _02256B02: ldr r1, _02256C00 ; =0x0000312C ldr r0, [sp, #8] ldrb r1, [r7, r1] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xad mov r2, #0 str r0, [sp, #0x18] @@ -4767,7 +4767,7 @@ _02256B9A: ldr r1, _02256C00 ; =0x0000312C ldr r0, [sp, #0xc] ldrb r1, [r6, r1] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xad mov r2, #0 str r0, [sp, #0x1c] diff --git a/arm9/overlays/14/asm/overlay_14.s b/arm9/overlays/14/asm/overlay_14.s index 0ca9e6a5e..4a4d99d01 100644 --- a/arm9/overlays/14/asm/overlay_14.s +++ b/arm9/overlays/14/asm/overlay_14.s @@ -4711,7 +4711,7 @@ _021D9B9E: lsl r0, r0, #2 ldr r0, [r1, r0] add r1, r6, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r4, r0, #0 bl AcquireMonLock add r7, r0, #0 @@ -5362,7 +5362,7 @@ _021DA0C2: ldr r0, [sp, #4] ldr r1, [sp, #8] ldr r0, [r0, #0x18] - bl GetPartyMonByIndex + bl Party_GetMonByIndex ldr r4, _021DA164 ; =ov14_021E6224 ldr r5, [sp, #4] add r7, r0, #0 @@ -8502,7 +8502,7 @@ _021DB96C: lsl r0, r0, #2 ldr r0, [r5, r0] add r1, r6, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex str r0, [r4] b _021DB998 _021DB98E: @@ -8661,7 +8661,7 @@ _021DBA98: lsl r0, r0, #2 ldrsb r1, [r5, r1] ldr r0, [r7, r0] - bl RemoveMonFromParty + bl Party_RemoveMon mov r0, #1 _021DBAB6: strb r0, [r4, #0xb] @@ -8878,7 +8878,7 @@ _021DBC42: lsl r0, r0, #2 ldr r0, [r5, r0] ldr r1, [r4] - bl AddMonToParty + bl Party_AddMon b _021DBC70 _021DBC56: mov r1, #0x1a @@ -8891,7 +8891,7 @@ _021DBC56: ldr r0, [r5, r1] add r1, #0x7c ldr r1, [r5, r1] - bl AddMonToParty + bl Party_AddMon _021DBC70: mov r0, #0x49 lsl r0, r0, #2 @@ -8902,7 +8902,7 @@ _021DBC70: lsl r0, r0, #2 ldr r0, [r5, r0] sub r1, r1, #1 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r0, #0 _021DBC8A: add r0, r7, #0 @@ -9108,7 +9108,7 @@ ov14_021DBE00: ; 0x021DBE00 lsl r0, r0, #2 ldrsb r1, [r4, r1] ldr r0, [r5, r0] - bl RemoveMonFromParty + bl Party_RemoveMon add r0, r5, #0 bl ov14_021DB934 mov r0, #1 @@ -9154,7 +9154,7 @@ _021DBE70: lsl r0, r0, #2 ldrsb r1, [r4, r1] ldr r0, [r5, r0] - bl RemoveMonFromParty + bl Party_RemoveMon _021DBE7E: add r0, r5, #0 bl ov14_021DB934 @@ -24299,7 +24299,7 @@ _021E3330: add r1, r4, #0 ldr r0, [r0, #0xc] ldr r0, [r0, #4] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r0, #0 mov r0, #1 str r0, [sp] diff --git a/arm9/overlays/16/asm/overlay_16.s b/arm9/overlays/16/asm/overlay_16.s index 5137faca4..6c95c680c 100644 --- a/arm9/overlays/16/asm/overlay_16.s +++ b/arm9/overlays/16/asm/overlay_16.s @@ -55038,7 +55038,7 @@ _021F0E5A: _021F0E68: ldr r0, [sp, #0xc] add r1, r4, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex ldr r1, [sp, #8] add r6, r0, #0 cmp r4, r1 @@ -55588,7 +55588,7 @@ _021F1276: _021F128E: ldr r0, [sp, #0x14] add r1, r5, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex ldr r1, [sp, #8] add r4, r0, #0 cmp r5, r1 @@ -55703,7 +55703,7 @@ _021F136A: _021F1382: ldr r0, [sp, #0x14] add r1, r5, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex ldr r1, [sp, #8] add r4, r0, #0 cmp r5, r1 @@ -62892,7 +62892,7 @@ _021F4A94: _021F4AA8: add r0, r7, #0 add r1, r5, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xa2 mov r2, #0 add r6, r0, #0 diff --git a/arm9/overlays/18/asm/overlay_18.s b/arm9/overlays/18/asm/overlay_18.s index 91e1b7959..72271ce1f 100644 --- a/arm9/overlays/18/asm/overlay_18.s +++ b/arm9/overlays/18/asm/overlay_18.s @@ -2199,7 +2199,7 @@ _0223A7EA: ldr r0, _0223AB04 ; =0x02251380 ldr r0, [r0] ldr r0, [r0] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 add r5, r0, #0 bl ov18_0223D638 @@ -3021,7 +3021,7 @@ ov18_0223AE88: ; 0x0223AE88 ldr r0, _0223AED0 ; =0x02251380 ldr r0, [r0] ldr r0, [r0] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData add r6, r0, #0 bl sub_02026CC4 bl sub_02025C38 @@ -3153,7 +3153,7 @@ ov18_0223AF48: ; 0x0223AF48 ldr r0, [r0] str r2, [sp, #8] ldr r0, [r0] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 str r0, [sp, #0x38] bl ov18_0223AED4 @@ -5023,12 +5023,12 @@ ov18_0223BD94: ; 0x0223BD94 add r4, r1, #0 ldr r0, [r0] ldr r0, [r0] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CB4 ldr r0, _0223BDDC ; =0x02251380 ldr r0, [r0] ldr r0, [r0] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 add r6, r0, #0 add r0, r5, #0 @@ -5057,7 +5057,7 @@ ov18_0223BDE0: ; 0x0223BDE0 ldr r0, _0223BE24 ; =0x02251380 ldr r0, [r0] ldr r0, [r0] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 add r5, r0, #0 add r0, r4, #0 @@ -5583,7 +5583,7 @@ ov18_0223C1F0: ; 0x0223C1F0 ldr r0, _0223C338 ; =0x02251380 ldr r0, [r0] ldr r0, [r0] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 add r6, r0, #0 ldr r0, _0223C338 ; =0x02251380 @@ -6847,7 +6847,7 @@ ov18_0223CB94: ; 0x0223CB94 ldr r0, _0223CC28 ; =0x000004C8 str r4, [r1, r0] add r0, r4, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 mov r4, #0 ldr r7, _0223CC20 ; =0x02251384 @@ -6910,7 +6910,7 @@ ov18_0223CC2C: ; 0x0223CC2C ldr r1, [r0] ldr r0, _0223CC74 ; =0x000004C8 ldr r0, [r1, r0] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 mov r4, #0 ldr r7, _0223CC70 ; =0x02251384 @@ -7769,7 +7769,7 @@ ov18_0223D298: ; 0x0223D298 ldr r1, [r0] ldr r0, _0223D2E8 ; =0x000004C8 ldr r0, [r1, r0] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 add r4, r0, #0 mov r5, #0 @@ -9566,17 +9566,17 @@ ov18_0223E060: ; 0x0223E060 bl AllocFromHeap add r4, r0, #0 add r0, r5, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CB4 add r6, r0, #0 add r0, r5, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData add r2, r0, #0 add r0, r4, #0 add r1, r6, #0 bl ov18_0224D2F0 add r0, r5, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 bl ov18_022492F8 _0223E110: @@ -10646,7 +10646,7 @@ ov18_0223E8A8: ; 0x0223E8A8 ldr r0, _0223E948 ; =0x022513A0 ldr r0, [r0, #4] ldr r0, [r0, #0x40] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 mov r4, #0 ldr r7, _0223E948 ; =0x022513A0 @@ -10739,7 +10739,7 @@ ov18_0223E958: ; 0x0223E958 ldr r0, [r0, #4] str r4, [r0, #0x40] add r0, r4, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 ldr r2, _0223E9B0 ; =0x022513A0 mov r1, #0xa3 @@ -11874,7 +11874,7 @@ ov18_0223F1DC: ; 0x0223F1DC ldr r0, _0223F228 ; =0x022513A0 ldr r0, [r0, #4] ldr r0, [r0, #0x40] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 mov r4, #0 add r7, r0, #0 @@ -12305,7 +12305,7 @@ ov18_0223F50C: ; 0x0223F50C add r6, r2, #0 ldr r0, [r0, #4] ldr r0, [r0, #0x40] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 add r7, r0, #0 add r0, r5, #0 @@ -12817,7 +12817,7 @@ ov18_0223F918: ; 0x0223F918 b _0223FA5E _0223F926: ldr r0, [r0, #0x40] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CB4 add r6, r0, #0 ldr r0, _0223FA64 ; =0x00000622 @@ -15123,7 +15123,7 @@ ov18_02240A44: ; 0x02240A44 add r4, r2, #0 ldr r0, [r0, #4] ldr r0, [r0, #0x40] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CB4 add r5, r0, #0 ldrb r0, [r4, #1] @@ -24144,7 +24144,7 @@ _02245050: .word ov18_02246338 ov18_02245054: ; 0x02245054 push {r4, r5, r6, lr} add r5, r0, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CA8 add r4, r0, #0 bl sub_02026CC0 @@ -27700,7 +27700,7 @@ ov18_02246C94: ; 0x02246C94 add r5, r2, #0 ldr r0, [r0] ldr r0, [r0] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CB4 ldrb r4, [r5] add r7, r0, #0 @@ -28092,13 +28092,13 @@ ov18_02246FB4: ; 0x02246FB4 ldr r0, _02247108 ; =0x022513EC ldr r0, [r0] ldr r0, [r0] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CA8 str r0, [sp, #0xc] ldr r0, _02247108 ; =0x022513EC ldr r0, [r0] ldr r0, [r0] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 add r4, r0, #0 mov r0, #0 @@ -30029,7 +30029,7 @@ ov18_02247EA0: ; 0x02247EA0 add r3, r2, #0 bl ov18_0224DCB8 ldr r0, [r4, #8] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CB4 bl sub_02026940 add r4, #0x2a @@ -31041,7 +31041,7 @@ ov18_022486B8: ; 0x022486B8 cmp r0, #0 beq _02248704 ldr r0, [r4, #4] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CB4 bl sub_02026B90 ldr r0, _0224873C ; =0x000005E3 @@ -32640,7 +32640,7 @@ _02249334: .word FreeToHeap ov18_02249338: ; 0x02249338 push {r3, lr} ldr r0, [r0, #0xc] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 bl sub_0202623C pop {r3, pc} @@ -32651,7 +32651,7 @@ ov18_02249338: ; 0x02249338 ov18_0224934C: ; 0x0224934C push {r3, lr} ldr r0, [r0, #0xc] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 bl sub_02025DB0 pop {r3, pc} @@ -32663,7 +32663,7 @@ ov18_02249360: ; 0x02249360 push {r4, lr} add r4, r0, #0 ldr r0, [r1, #0xc] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 add r1, r4, #0 bl sub_02025DC8 @@ -32675,7 +32675,7 @@ ov18_02249360: ; 0x02249360 ov18_02249378: ; 0x02249378 push {r3, lr} ldr r0, [r0, #0xc] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 bl sub_02025F80 pop {r3, pc} @@ -32687,7 +32687,7 @@ ov18_0224938C: ; 0x0224938C push {r4, lr} add r4, r0, #0 ldr r0, [r1, #0xc] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 add r1, r4, #0 bl sub_02025F98 @@ -32719,7 +32719,7 @@ _022493C4: .word ov18_022513F8 ov18_022493C8: ; 0x022493C8 push {r3, lr} ldr r0, [r0, #0xc] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 bl sub_02026050 pop {r3, pc} @@ -32731,7 +32731,7 @@ ov18_022493DC: ; 0x022493DC push {r4, lr} add r4, r0, #0 ldr r0, [r1, #0xc] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 add r1, r4, #0 bl sub_02026258 @@ -32744,7 +32744,7 @@ ov18_022493F4: ; 0x022493F4 push {r4, lr} add r4, r0, #0 ldr r0, [r1, #0xc] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 add r1, r4, #0 bl sub_02026068 @@ -32757,7 +32757,7 @@ ov18_0224940C: ; 0x0224940C push {r4, lr} add r4, r0, #0 ldr r0, [r1, #0xc] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 add r1, r4, #0 bl sub_02026074 @@ -32769,7 +32769,7 @@ ov18_0224940C: ; 0x0224940C ov18_02249424: ; 0x02249424 push {r3, lr} ldr r0, [r0, #0xc] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 bl sub_0202616C pop {r3, pc} @@ -32781,7 +32781,7 @@ ov18_02249438: ; 0x02249438 push {r4, lr} add r4, r0, #0 ldr r0, [r1, #0xc] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 add r1, r4, #0 bl sub_02026188 @@ -32977,7 +32977,7 @@ _022495BA: cmp r6, #4 bne _022495E2 ldr r0, [r5, #0xc] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl Save_PlayerData_GetProfileAddr mov r1, #4 bl PlayerProfile_GetPlayerName_NewString @@ -35134,7 +35134,7 @@ ov18_0224A78C: ; 0x0224A78C bl ov18_022498EC bl ov18_0224D704 ldr r0, [r4, #0xc] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl Save_PlayerData_GetProfileAddr add r1, r0, #0 mov r0, #1 @@ -35433,7 +35433,7 @@ ov18_0224A9EC: ; 0x0224A9EC add r5, r0, #0 bl ListMenuGetTemplateField ldr r0, [r0, #0xc] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 add r1, r4, #0 bl sub_02025F0C @@ -36386,7 +36386,7 @@ ov18_0224B190: ; 0x0224B190 push {r3, r4, r5, lr} add r5, r0, #0 ldr r0, [r1, #0xc] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 add r4, r0, #0 add r1, r5, #0 @@ -36412,7 +36412,7 @@ ov18_0224B1C4: ; 0x0224B1C4 push {r3, r4, r5, lr} add r5, r0, #0 ldr r0, [r1, #0xc] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 add r1, r5, #0 add r4, r0, #0 @@ -37482,11 +37482,11 @@ _0224BA70: bl ov18_0223D658 bl ov18_0224DD94 ldr r0, [r4, #0xc] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl Save_PlayerData_GetProfileAddr add r5, r0, #0 ldr r0, [r4, #0xc] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 mov r3, #0 str r3, [sp] @@ -38088,7 +38088,7 @@ ov18_0224BFAC: ; 0x0224BFAC add r6, r0, #0 ldr r0, [r6, #0xc] add r4, r1, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 bl sub_02025D40 add r7, r4, r0 @@ -38223,7 +38223,7 @@ ov18_0224C0AC: ; 0x0224C0AC add r6, r0, #0 ldr r0, [r6, #0xc] add r4, r1, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData add r5, r0, #0 bl sub_02026CC4 add r7, r0, #0 @@ -38366,7 +38366,7 @@ ov18_0224C1C0: ; 0x0224C1C0 ldr r0, [r5, #0xc] add r7, r2, #0 add r4, r1, #0 - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 add r6, r0, #0 add r0, r7, #0 @@ -38749,7 +38749,7 @@ ov18_0224C510: ; 0x0224C510 bl ListMenuGetTemplateField add r4, r0, #0 ldr r0, [r4, #0xc] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 str r0, [sp, #0x2c] add r0, r4, #0 @@ -39310,7 +39310,7 @@ ov18_0224C9C4: ; 0x0224C9C4 push {r3, r4, r5, lr} add r5, r0, #0 ldr r0, [r5, #0xc] - bl FieldSystem_GetSaveDataPtr + bl FieldSystem_GetSaveData bl sub_02026CC4 ldr r1, _0224CA24 ; =0x00000215 add r4, r0, #0 diff --git a/arm9/overlays/27/asm/overlay_27.s b/arm9/overlays/27/asm/overlay_27.s index 6d6bbedc8..d7e598678 100644 --- a/arm9/overlays/27/asm/overlay_27.s +++ b/arm9/overlays/27/asm/overlay_27.s @@ -291,7 +291,7 @@ ov27_02254A48: ; 0x02254A48 _02254A62: ldr r0, [sp, #4] add r1, r6, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r4, r0, #0 bl AcquireMonLock add r7, r0, #0 diff --git a/arm9/overlays/28/asm/overlay_28.s b/arm9/overlays/28/asm/overlay_28.s index 3276355a5..87a765eae 100644 --- a/arm9/overlays/28/asm/overlay_28.s +++ b/arm9/overlays/28/asm/overlay_28.s @@ -70,7 +70,7 @@ ov28_0225489C: ; 0x0225489C _022548D6: ldr r0, [sp, #4] add r1, r6, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0x4c mov r2, #0 add r5, r0, #0 diff --git a/arm9/overlays/39/asm/overlay_39.s b/arm9/overlays/39/asm/overlay_39.s index 8277ef261..653a68a98 100644 --- a/arm9/overlays/39/asm/overlay_39.s +++ b/arm9/overlays/39/asm/overlay_39.s @@ -66,7 +66,7 @@ ov39_0225489C: ; 0x0225489C _022548CC: ldr r0, [sp, #0x10] add r1, r6, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r7, r0, #0 bl sub_0206B688 str r0, [r4, #4] diff --git a/arm9/overlays/56/asm/overlay_56.s b/arm9/overlays/56/asm/overlay_56.s index f3b52262b..9b51ae3f7 100644 --- a/arm9/overlays/56/asm/overlay_56.s +++ b/arm9/overlays/56/asm/overlay_56.s @@ -221,7 +221,7 @@ ov56_02211F88: ; 0x02211F88 _02211FA2: ldr r0, [sp] add r1, r4, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xa2 mov r2, #0 add r6, r0, #0 @@ -2001,7 +2001,7 @@ ov56_02212E0C: ; 0x02212E0C _02212E52: ldr r0, [sp, #0xc] add r1, r6, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #5 mov r2, #0 add r7, r0, #0 diff --git a/arm9/overlays/69/asm/overlay_69.s b/arm9/overlays/69/asm/overlay_69.s index a76617020..1d95ee9d7 100644 --- a/arm9/overlays/69/asm/overlay_69.s +++ b/arm9/overlays/69/asm/overlay_69.s @@ -61,7 +61,7 @@ _0222D63A: ldr r0, [r4, #0xc] add r1, r5, #0 ldr r0, [r0, #4] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0x4c mov r2, #0 bl GetMonData @@ -1224,7 +1224,7 @@ _0222DF98: lsl r1, r1, #2 ldr r0, [r0, #4] ldr r1, [r5, r1] - bl GetPartyMonByIndex + bl Party_GetMonByIndex str r0, [sp, #0x2c] ldr r1, [sp, #0x2c] add r0, sp, #0xc4 @@ -2281,7 +2281,7 @@ _0222E860: lsl r1, r1, #2 ldr r0, [r0, #4] ldr r1, [r2, r1] - bl GetPartyMonByIndex + bl Party_GetMonByIndex str r0, [r4, #0x24] ldr r0, [r5, #0xc] mov r2, #0 diff --git a/arm9/overlays/71/asm/overlay_71.s b/arm9/overlays/71/asm/overlay_71.s index 2685b9ebe..d1cb5a086 100644 --- a/arm9/overlays/71/asm/overlay_71.s +++ b/arm9/overlays/71/asm/overlay_71.s @@ -650,7 +650,7 @@ ov71_0222DB5C: ; 0x0222DB5C _0222DB70: add r0, r5, #0 add r1, r4, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex bl sub_020690E4 add r2, r0, #0 add r0, r7, #0 @@ -1097,7 +1097,7 @@ _0222DEF4: ldr r0, _0222E0F8 ; =0x00002218 add r1, r5, #0 ldr r0, [r4, r0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r6, #0 bl ov71_0222E118 ldr r0, [r4, r7] @@ -1121,7 +1121,7 @@ _0222DF28: ldr r0, _0222E0FC ; =0x0000221C add r1, r5, #0 ldr r0, [r4, r0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r5, #6 lsl r1, r1, #4 add r1, r6, r1 @@ -1233,7 +1233,7 @@ _0222E010: ldr r0, _0222E0F8 ; =0x00002218 mov r1, #0 ldr r0, [r4, r0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r2, #0x7f ldr r3, _0222E104 ; =0x000020F0 lsl r2, r2, #4 @@ -1412,7 +1412,7 @@ ov71_0222E1A0: ; 0x0222E1A0 ldr r0, _0222E20C ; =0x0000221C add r7, r1, #0 ldr r0, [r5, r0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r6, r0, #0 add r0, r4, #0 mov r1, #6 @@ -1473,7 +1473,7 @@ ov71_0222E224: ; 0x0222E224 bge _0222E29E ldr r0, _0222E2BC ; =0x00002218 ldr r0, [r5, r0] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r4, r0, #0 add r0, r5, #0 add r0, #0x88 @@ -2694,7 +2694,7 @@ ov71_0222EC5C: ; 0x0222EC5C add r4, r0, #0 add r0, r6, #0 add r1, r7, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0x76 add r2, r4, #0 bl GetMonData @@ -2728,7 +2728,7 @@ ov71_0222ECA8: ; 0x0222ECA8 _0222ECB6: add r0, r1, #0 add r1, r2, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0x4d mov r2, #0 bl GetMonData @@ -2753,7 +2753,7 @@ ov71_0222ECD4: ; 0x0222ECD4 str r2, [sp, #8] str r3, [sp, #0xc] ldr r4, [sp, #0x50] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #2 bl sub_02068E14 str r0, [sp, #0x10] @@ -2929,7 +2929,7 @@ _0222EE14: bl ov71_02230EFC ldr r0, [sp, #8] ldr r1, [sp, #0xc] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xa0 mov r2, #0 bl GetMonData @@ -2975,7 +2975,7 @@ _0222EEA6: bl ov71_02230EFC ldr r0, [sp, #8] ldr r1, [sp, #0xc] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #6 mov r2, #0 bl GetMonData @@ -4875,7 +4875,7 @@ ov71_0222FDD8: ; 0x0222FDD8 add r1, #0x88 ldr r0, [r4, r0] ldr r1, [r1] - bl GetPartyMonByIndex + bl Party_GetMonByIndex bl sub_020690E4 add r2, r0, #0 mov r0, #0x5f @@ -5694,7 +5694,7 @@ ov71_022304AC: ; 0x022304AC add r1, #0x88 ldr r0, [r4, r0] ldr r1, [r1] - bl GetPartyMonByIndex + bl Party_GetMonByIndex bl sub_020690E4 add r2, r0, #0 mov r0, #0x5f @@ -5708,7 +5708,7 @@ ov71_022304AC: ; 0x022304AC ldr r1, [r1] ldr r0, [r4, r0] sub r1, r1, #6 - bl GetPartyMonByIndex + bl Party_GetMonByIndex bl sub_020690E4 add r2, r0, #0 mov r0, #0x5f @@ -6121,7 +6121,7 @@ ov71_02230810: ; 0x02230810 ldr r1, [r1] ldr r0, [r4, r0] sub r1, r1, #6 - bl GetPartyMonByIndex + bl Party_GetMonByIndex bl sub_020690E4 add r2, r0, #0 mov r0, #0x5f @@ -6327,12 +6327,12 @@ ov71_022309E8: ; 0x022309E8 add r4, r0, #0 ldr r0, [sp, #4] add r1, r6, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r7, #0 bl CopyPokemonToPokemon ldr r0, [sp, #8] ldr r1, [sp, #0xc] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r4, #0 bl CopyPokemonToPokemon add r0, r4, #0 @@ -6387,13 +6387,13 @@ _02230A98: bl sub_0202C144 ldr r0, [sp, #4] add r1, r6, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r0, #0 add r0, r4, #0 bl CopyPokemonToPokemon ldr r0, [sp, #8] ldr r1, [sp, #0xc] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r0, #0 add r0, r7, #0 bl CopyPokemonToPokemon diff --git a/arm9/overlays/80/asm/overlay_80.s b/arm9/overlays/80/asm/overlay_80.s index f2f1457c7..c590f4333 100644 --- a/arm9/overlays/80/asm/overlay_80.s +++ b/arm9/overlays/80/asm/overlay_80.s @@ -9976,7 +9976,7 @@ _022325CE: add r1, #0xba ldrh r1, [r1] ldr r0, [r0, #8] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xa1 add r2, r4, #0 bl GetMonData @@ -10216,7 +10216,7 @@ _022327CE: add r1, #0xba ldrh r1, [r1] ldr r0, [r0, #8] - bl GetPartyMonByIndex + bl Party_GetMonByIndex mov r1, #0xa1 add r2, r4, #0 bl GetMonData @@ -11040,7 +11040,7 @@ _02232E4A: ldr r0, [r5] add r1, r4, #0 ldr r0, [r0, #8] - bl GetPartyMonByIndex + bl Party_GetMonByIndex str r0, [sp, #0x24] bl sub_020690E4 ldr r1, _02232F84 ; =0x00001004 @@ -11230,7 +11230,7 @@ ov80_02232FB8: ; 0x02232FB8 _02232FDC: add r0, r5, #0 add r1, r4, #0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex bl sub_020690E4 pop {r3, r4, r5, r6, r7, pc} _02232FEA: @@ -16102,7 +16102,7 @@ _02235590: add r1, #0xba ldrh r1, [r1] ldr r0, [r0, #8] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r4, r0, #0 bl Pokemon_RemoveCapsule add r2, r5, #0 @@ -16117,7 +16117,7 @@ _02235590: add r1, #0xba ldrh r1, [r1] ldr r0, [r0, #8] - bl RemoveMonFromParty + bl Party_RemoveMon ldr r0, [r5] ldr r1, _022355EC ; =0x000001B9 ldr r0, [r0, #8] @@ -16186,7 +16186,7 @@ _02235640: ldr r0, [r5] add r1, r4, #0 ldr r0, [r0, #8] - bl AddMonToParty + bl Party_AddMon ldr r0, [r5] ldr r0, [r0, #8] bl GetPartyCount @@ -16265,7 +16265,7 @@ _022356D2: ldr r0, [r5] add r1, r4, #0 ldr r0, [r0, #8] - bl AddMonToParty + bl Party_AddMon ldr r0, [r5] ldr r0, [r0, #8] bl GetPartyCount @@ -17717,7 +17717,7 @@ ov80_02236218: ; 0x02236218 add r5, #0xd0 ldr r0, [r0, #8] ldr r1, [r5] - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r1, r0, #0 add r0, r4, #0 bl CopyPokemonToPokemon diff --git a/arm9/src/encounter.c b/arm9/src/encounter.c index 6932d644f..c97897654 100644 --- a/arm9/src/encounter.c +++ b/arm9/src/encounter.c @@ -58,19 +58,19 @@ extern void *sub_0202918C(IGT *igt, u16 species, u8 gender, u8 param3, HeapID he extern void sub_02028AD4(u32 *param0, void *param1, u32 param2); extern void sub_020299DC(u32 *param0, u16 mapId, u16 trainerId, HeapID heapId); -static BOOL sub_0204653C(TaskManager *taskManager); -static void sub_02046584(TaskManager *taskManager, BattleSetup *setup); +static BOOL Task_StartBattle(TaskManager *taskManager); +static void CallTask_StartBattle(TaskManager *taskManager, BattleSetup *setup); static Encounter *Encounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag); static void Encounter_Delete(Encounter *encounter); -static BOOL GetEncounterResult(Encounter *encounter); +static BOOL Encounter_GetResult(Encounter *encounter); static void sub_020465E4(BattleSetup *setup, FieldSystem *fieldSystem); static BOOL Task_StartEncounter(TaskManager *taskManager); static void CallTask_StartEncounter(TaskManager *taskManager, BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag); static void sub_0204671C(s32 flag, FieldSystem *fieldSystem); -static BOOL sub_02046758(TaskManager *taskManager); -static BOOL sub_020467FC(TaskManager *taskManager); -static BOOL sub_02046878(TaskManager *taskManager); -static void sub_02046928(TaskManager *taskManager, BattleSetup *battleSetup, s32 effect, s32 bgm, u32 *winFlag); +static BOOL Task_02046758(TaskManager *taskManager); +static BOOL Task_020467FC(TaskManager *taskManager); +static BOOL Task_02046878(TaskManager *taskManager); +static void CallTask_02046878(TaskManager *taskManager, BattleSetup *battleSetup, s32 effect, s32 bgm, u32 *winFlag); static WildEncounter *WildEncounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag); static void WildEncounter_Delete(WildEncounter *encounter); static BOOL Task_WildEncounter(TaskManager *taskManager); @@ -81,7 +81,7 @@ static BOOL sub_02047220(TaskManager *taskManager); static void sub_020472F4(FieldSystem *fieldSystem, BattleSetup *setup); static void sub_020473CC(FieldSystem *fieldSystem, BattleSetup *setup); -static BOOL sub_0204653C(TaskManager *taskManager) { //Task_StartBattle +static BOOL Task_StartBattle(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); BattleSetup *battleSetup = TaskManager_GetEnvironment(taskManager); u32 *state = TaskManager_GetStatePtr(taskManager); @@ -101,8 +101,8 @@ static BOOL sub_0204653C(TaskManager *taskManager) { //Task_StartBattle return FALSE; } -static void sub_02046584(TaskManager *taskManager, BattleSetup *setup) { //CallTask_StartBattle - TaskManager_Call(taskManager, sub_0204653C, setup); +static void CallTask_StartBattle(TaskManager *taskManager, BattleSetup *setup) { + TaskManager_Call(taskManager, Task_StartBattle, setup); } static Encounter *Encounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag) { @@ -122,7 +122,7 @@ static void Encounter_Delete(Encounter *encounter) { FreeToHeap(encounter); } -static BOOL GetEncounterResult(Encounter *encounter) { +static BOOL Encounter_GetResult(Encounter *encounter) { if (encounter->winFlag != NULL) { *(encounter->winFlag) = encounter->setup->winFlag; } @@ -151,7 +151,7 @@ static BOOL Task_StartEncounter(TaskManager *taskManager) { //todo: better name (*state)++; break; case 2: - sub_02046584(taskManager, encounter->setup); + CallTask_StartBattle(taskManager, encounter->setup); (*state)++; break; case 3: @@ -160,7 +160,7 @@ static BOOL Task_StartEncounter(TaskManager *taskManager) { //todo: better name sub_02061080(fieldSystem, encounter->setup->unk134, encounter->setup->winFlag); } - if (GetEncounterResult(encounter) == FALSE) { + if (Encounter_GetResult(encounter) == FALSE) { Encounter_Delete(encounter); return TRUE; } @@ -206,7 +206,7 @@ static void sub_0204671C(s32 flag, FieldSystem *fieldSystem) { } } -static BOOL sub_02046758(TaskManager *taskManager) { //Task_02046758 +static BOOL Task_02046758(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); Encounter *encounter = TaskManager_GetEnvironment(taskManager); u32 *state = TaskManager_GetStatePtr(taskManager); @@ -220,7 +220,7 @@ static BOOL sub_02046758(TaskManager *taskManager) { //Task_02046758 (*state)++; break; case 2: - sub_02046584(taskManager, encounter->setup); + CallTask_StartBattle(taskManager, encounter->setup); (*state)++; break; case 3: @@ -238,7 +238,7 @@ static BOOL sub_02046758(TaskManager *taskManager) { //Task_02046758 return FALSE; } -static BOOL sub_020467FC(TaskManager *taskManager) { +static BOOL Task_020467FC(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); Encounter *encounter = TaskManager_GetEnvironment(taskManager); u32 *state = TaskManager_GetStatePtr(taskManager); @@ -246,7 +246,7 @@ static BOOL sub_020467FC(TaskManager *taskManager) { switch (*state) { case 0: sub_0200433C(5, encounter->bgm, 1); - sub_02046584(taskManager, encounter->setup); + CallTask_StartBattle(taskManager, encounter->setup); (*state)++; break; case 1: @@ -262,7 +262,7 @@ static BOOL sub_020467FC(TaskManager *taskManager) { return FALSE; } -static BOOL sub_02046878(TaskManager *taskManager) { //Task_02046878 +static BOOL Task_02046878(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); Encounter *encounter = TaskManager_GetEnvironment(taskManager); u32 *state = TaskManager_GetStatePtr(taskManager); @@ -277,13 +277,13 @@ static BOOL sub_02046878(TaskManager *taskManager) { //Task_02046878 (*state)++; break; case 2: - sub_02046584(taskManager, encounter->setup); + CallTask_StartBattle(taskManager, encounter->setup); (*state)++; break; case 3: sub_02047FA4(encounter->setup, fieldSystem); sub_02060044(fieldSystem, &encounter->setup->unk138); - GetEncounterResult(encounter); + Encounter_GetResult(encounter); CallTask_RestoreOverworld(taskManager); (*state)++; break; @@ -298,9 +298,9 @@ static BOOL sub_02046878(TaskManager *taskManager) { //Task_02046878 return FALSE; } -static void sub_02046928(TaskManager *taskManager, BattleSetup *battleSetup, s32 effect, s32 bgm, u32 *winFlag) { //CallTask_02046878 +static void CallTask_02046878(TaskManager *taskManager, BattleSetup *battleSetup, s32 effect, s32 bgm, u32 *winFlag) { //CallTask_02046878 Encounter *encounter = Encounter_New(battleSetup, effect, bgm, winFlag); - TaskManager_Call(taskManager, sub_02046878, encounter); + TaskManager_Call(taskManager, Task_02046878, encounter); } void sub_02046948(TaskManager *taskManager, u32 param1, u32 *winFlag) { @@ -308,7 +308,7 @@ void sub_02046948(TaskManager *taskManager, u32 param1, u32 *winFlag) { BattleSetup *battleSetup = ov06_02244558(param1, fieldSystem); s32 effect = sub_020475A0(battleSetup); s32 bgm = sub_020475B0(battleSetup); - sub_02046928(taskManager, battleSetup, effect, bgm, winFlag); + CallTask_02046878(taskManager, battleSetup, effect, bgm, winFlag); } static WildEncounter *WildEncounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag) { @@ -369,7 +369,7 @@ static BOOL Task_WildEncounter(TaskManager *taskManager) { encounter->state++; break; case 2: - sub_02046584(taskManager, encounter->setup); + CallTask_StartBattle(taskManager, encounter->setup); encounter->state++; break; case 3: @@ -443,14 +443,14 @@ static BOOL Task_SafariEncounter(TaskManager *taskManager) { (*state)++; break; case 2: - sub_02046584(taskManager, encounter->setup); + CallTask_StartBattle(taskManager, encounter->setup); (*state)++; break; case 3: sub_020465E4(encounter->setup, fieldSystem); if (encounter->setup->winFlag == 4) { SafariZone *safariZone = Save_SafariZone_Get(fieldSystem->saveData); - Pokemon *pokemon = GetPartyMonByIndex(encounter->setup->party[BATTLER_ENEMY], 0); + Pokemon *pokemon = Party_GetMonByIndex(encounter->setup->party[BATTLER_ENEMY], 0); sub_02060FE0(safariZone, pokemon); } @@ -544,7 +544,7 @@ static BOOL Task_PalParkEncounter(TaskManager *taskManager) { (*state)++; break; case 2: - sub_02046584(taskManager, encounter->setup); + CallTask_StartBattle(taskManager, encounter->setup); (*state)++; break; case 3: @@ -609,7 +609,7 @@ static BOOL Task_TutorialBattle(TaskManager *taskManager) { (*state)++; break; case 2: - sub_02046584(taskManager, encounter->setup); + CallTask_StartBattle(taskManager, encounter->setup); (*state)++; break; case 3: @@ -685,7 +685,7 @@ void sub_02047174(TaskManager *taskManager, void *param1, u32 battleType) { encounter = Encounter_New(setup, sub_020475A0(setup), sub_020475B0(setup), NULL); - TaskManager_Call(taskManager, sub_02046758, encounter); + TaskManager_Call(taskManager, Task_02046758, encounter); } void sub_020471C0(TaskManager *taskManager, s32 target, s32 maxLevel, u32 flag) { @@ -704,7 +704,7 @@ void sub_020471C0(TaskManager *taskManager, s32 target, s32 maxLevel, u32 flag) encounter = Encounter_New(setup, sub_020475A0(setup), sub_020475B0(setup), NULL); encounter->unkC = target; - TaskManager_Call(taskManager, sub_020467FC, encounter); + TaskManager_Call(taskManager, Task_020467FC, encounter); } static BOOL sub_02047220(TaskManager *taskManager) { @@ -714,7 +714,7 @@ static BOOL sub_02047220(TaskManager *taskManager) { switch (*state) { case 0: - TaskManager_Call(taskManager, sub_02046758, encounter); + TaskManager_Call(taskManager, Task_02046758, encounter); (*state)++; break; case 1: @@ -759,7 +759,7 @@ static void sub_020472F4(FieldSystem *fieldSystem, BattleSetup *setup) { if (winFlag == 1) { GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK8); } else if (winFlag == 4) { - mon = GetPartyMonByIndex(setup->party[BATTLER_ENEMY], 0); + mon = Party_GetMonByIndex(setup->party[BATTLER_ENEMY], 0); if (Pokedex_ConvertToCurrentDexNo(FALSE, GetMonData(mon, MON_DATA_SPECIES, NULL)) != 0) { GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK9); } else { @@ -771,7 +771,7 @@ static void sub_020472F4(FieldSystem *fieldSystem, BattleSetup *setup) { GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK11); } } else if ((battleType & BATTLE_TYPE_SAFARI || battleType & BATTLE_TYPE_PAL_PARK) && winFlag == 4) { - mon = GetPartyMonByIndex(setup->party[BATTLER_ENEMY], 0); + mon = Party_GetMonByIndex(setup->party[BATTLER_ENEMY], 0); if (Pokedex_ConvertToCurrentDexNo(FALSE, GetMonData(mon, MON_DATA_SPECIES, NULL)) != 0) { GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK9); } else { @@ -794,10 +794,10 @@ static void sub_020473CC(FieldSystem *fieldSystem, BattleSetup *setup) { if (fieldSystem->unk76 < 5) { return; } - mon = GetPartyMonByIndex(setup->party[BATTLER_ENEMY], 0); + mon = Party_GetMonByIndex(setup->party[BATTLER_ENEMY], 0); sub_02028AD4(fieldSystem->unk98, sub_0202920C(Save_PlayerData_GetIGTAddr(fieldSystem->saveData), GetMonData(mon, MON_DATA_SPECIES, NULL), GetMonData(mon, MON_DATA_GENDER, NULL), setup->unk160, HEAP_ID_FIELD), 2); } else if (winFlag == 4) { - mon = GetPartyMonByIndex(setup->party[setup->unk170], 0); + mon = Party_GetMonByIndex(setup->party[setup->unk170], 0); sub_02028AD4(fieldSystem->unk98, sub_0202918C(Save_PlayerData_GetIGTAddr(fieldSystem->saveData), GetMonData(mon, MON_DATA_SPECIES, NULL), GetMonData(mon, MON_DATA_GENDER, NULL), setup->unk160, HEAP_ID_FIELD), 2); } } else if ((battleType & BATTLE_TYPE_TRAINER) || (battleType & BATTLE_TYPE_INGAME_PARTNER)) { diff --git a/arm9/src/hall_of_fame.c b/arm9/src/hall_of_fame.c index 9dd5e5916..3c51b50de 100644 --- a/arm9/src/hall_of_fame.c +++ b/arm9/src/hall_of_fame.c @@ -31,7 +31,7 @@ void Save_HOF_RecordParty(struct HallOfFame * hof, struct Party * party, RTCDate int i, j; for (i = 0, j = 0; i < nmons; i++) { - struct Pokemon * mon = GetPartyMonByIndex(party, i); + struct Pokemon * mon = Party_GetMonByIndex(party, i); BOOL lock = AcquireMonLock(mon); if (!GetMonData(mon, MON_DATA_IS_EGG, NULL)) { diff --git a/arm9/src/mail.c b/arm9/src/mail.c index a53f6f027..06bf087d4 100644 --- a/arm9/src/mail.c +++ b/arm9/src/mail.c @@ -69,7 +69,7 @@ void Mail_SetNewMessageDetails(struct Mail * mail, u8 type, u8 monIdx, struct Sa for (i = 0; monIdx < GetPartyCount(party); monIdx++) { union MailPatternData * ptr; - pokemon = GetPartyMonByIndex(party, monIdx); + pokemon = Party_GetMonByIndex(party, monIdx); species = (u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL); is_egg = (BOOL)GetMonData(pokemon, MON_DATA_IS_EGG, NULL); form = GetMonData(pokemon, MON_DATA_FORM, NULL); diff --git a/arm9/src/party.c b/arm9/src/party.c index 83a151b6f..e4eafd7ca 100644 --- a/arm9/src/party.c +++ b/arm9/src/party.c @@ -33,7 +33,7 @@ void InitPartyWithMaxSize(struct Party * party, int count) ZeroMonData(&party->mons[i]); } -BOOL AddMonToParty(struct Party * party, struct Pokemon * pokemon) +BOOL Party_AddMon(struct Party * party, struct Pokemon * pokemon) { if (party->curCount >= party->maxCount) return FALSE; @@ -42,7 +42,7 @@ BOOL AddMonToParty(struct Party * party, struct Pokemon * pokemon) return TRUE; } -BOOL RemoveMonFromParty(struct Party * party, int pos) +BOOL Party_RemoveMon(struct Party * party, int pos) { int i; @@ -66,7 +66,7 @@ int GetPartyCount(struct Party * party) return party->curCount; } -struct Pokemon * GetPartyMonByIndex(struct Party * party, int pos) +struct Pokemon * Party_GetMonByIndex(struct Party * party, int pos) { GF_ASSERT(pos >= 0); GF_ASSERT(pos < party->curCount); diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c index 062ae6600..e2a8107af 100644 --- a/arm9/src/pokemon.c +++ b/arm9/src/pokemon.c @@ -3017,7 +3017,7 @@ u8 Party_GetMaxLevel(struct Party * party) u8 level; for (i = 0; i < r7; i++) { - struct Pokemon * pokemon = GetPartyMonByIndex(party, i); + struct Pokemon * pokemon = Party_GetMonByIndex(party, i); if (GetMonData(pokemon, MON_DATA_SPECIES, NULL) != SPECIES_NONE && !GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { @@ -3102,7 +3102,7 @@ void Party_GivePokerusAtRandom(struct Party * party) do { idx = LCRandom() % count; - pokemon = GetPartyMonByIndex(party, idx); + pokemon = Party_GetMonByIndex(party, idx); } while (GetMonData(pokemon, MON_DATA_SPECIES, NULL) == SPECIES_NONE || GetMonData(pokemon, MON_DATA_IS_EGG, NULL)); if (!Party_MaskMonsWithPokerus(party, (u8)MaskOfFlagNo(idx))) { @@ -3132,7 +3132,7 @@ u8 Party_MaskMonsWithPokerus(struct Party * party, u8 mask) { if (mask & 1) { - pokemon = GetPartyMonByIndex(party, i); + pokemon = Party_GetMonByIndex(party, i); if (GetMonData(pokemon, MON_DATA_POKERUS, NULL)) ret |= flag; } @@ -3144,7 +3144,7 @@ u8 Party_MaskMonsWithPokerus(struct Party * party, u8 mask) } else { - pokemon = GetPartyMonByIndex(party, 0); + pokemon = Party_GetMonByIndex(party, 0); if (GetMonData(pokemon, MON_DATA_POKERUS, NULL)) ret++; } @@ -3159,7 +3159,7 @@ void Party_UpdatePokerus(struct Party * party, int r5) int count = GetPartyCount(party); for (i = 0; i < count; i++) { - pokemon = GetPartyMonByIndex(party, i); + pokemon = Party_GetMonByIndex(party, i); if (GetMonData(pokemon, MON_DATA_SPECIES, NULL) != SPECIES_NONE) { pokerus = (u8)GetMonData(pokemon, MON_DATA_POKERUS, NULL); @@ -3187,7 +3187,7 @@ void Party_SpreadPokerus(struct Party * party) { for (i = 0; i < count; i++) { - pokemon = GetPartyMonByIndex(party, i); + pokemon = Party_GetMonByIndex(party, i); if (GetMonData(pokemon, MON_DATA_SPECIES, NULL) != SPECIES_NONE) { pokerus = (u8)GetMonData(pokemon, MON_DATA_POKERUS, NULL); @@ -3195,13 +3195,13 @@ void Party_SpreadPokerus(struct Party * party) { if (i != 0) { - pokemon = GetPartyMonByIndex(party, i - 1); + pokemon = Party_GetMonByIndex(party, i - 1); if (!(GetMonData(pokemon, MON_DATA_POKERUS, NULL) & 0xF0)) SetMonData(pokemon, MON_DATA_POKERUS, &pokerus); } if (i < count - 1) { - pokemon = GetPartyMonByIndex(party, i + 1); + pokemon = Party_GetMonByIndex(party, i + 1); if (!(GetMonData(pokemon, MON_DATA_POKERUS, NULL) & 0xF0)) { SetMonData(pokemon, MON_DATA_POKERUS, &pokerus); diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c index 3ddf4012c..76fc30c42 100644 --- a/arm9/src/scrcmd.c +++ b/arm9/src/scrcmd.c @@ -49,10 +49,10 @@ extern void *FieldSysGetAttrAddr(FieldSystem *fieldSystem, enum ScriptEnvField id); extern ScriptContext *CreateScriptContext(FieldSystem *fieldSystem, u16 id); extern u32 MapObject_GetID(LocalMapObject *lastInteracted); -extern void FlagSet(FieldSystem *fieldSystem, u16 flag); +extern void FieldSystem_FlagSet(FieldSystem *fieldSystem, u16 flag); extern void FlagClear(FieldSystem *fieldSystem, u16 flag); extern u8 FlagCheck(FieldSystem *fieldSystem, u16 flag); -extern void TrainerFlagSet(FieldSystem *fieldSystem, u16 flag); +extern void TrainerFieldSystem_FlagSet(FieldSystem *fieldSystem, u16 flag); extern void TrainerFlagClear(FieldSystem *fieldSystem, u16 flag); extern u8 TrainerFlagCheck(FieldSystem *fieldSystem, u16 flag); extern void ov05_ShowMessageInField(ScriptContext *ctx, MsgData *msgData, u16 id); @@ -745,7 +745,7 @@ BOOL ScrCmd_SetFlag(ScriptContext *ctx) //001E { FieldSystem *fieldSystem = ctx->fieldSystem; u16 flag = ScriptReadHalfword(ctx); - FlagSet(fieldSystem, flag); + FieldSystem_FlagSet(fieldSystem, flag); return FALSE; } @@ -778,7 +778,7 @@ BOOL ScrCmd_SetFlagVar(ScriptContext *ctx) //0022 { FieldSystem *fieldSystem = ctx->fieldSystem; u16 *wk = ScriptGetVarPointer(ctx); - FlagSet(fieldSystem, *wk); + FieldSystem_FlagSet(fieldSystem, *wk); return FALSE; } @@ -786,7 +786,7 @@ BOOL ScrCmd_SetTrainerFlag(ScriptContext *ctx) //0023 { FieldSystem *fieldSystem = ctx->fieldSystem; u16 flag = ScriptGetVar(ctx); - TrainerFlagSet(fieldSystem, flag); + TrainerFieldSystem_FlagSet(fieldSystem, flag); return FALSE; } @@ -1980,7 +1980,7 @@ BOOL ScrCmd_GetPokemonForm(ScriptContext *ctx) { //0095 u16 *variable = ScriptGetVarPointer(ctx); Party *party = SaveArray_Party_Get(ctx->fieldSystem->saveData); - *variable = GetMonUnownLetter(GetPartyMonByIndex(party, partyPosition)); + *variable = GetMonUnownLetter(Party_GetMonByIndex(party, partyPosition)); return FALSE; } @@ -2208,7 +2208,7 @@ BOOL ScrCmd_ShowPokemonPic(ScriptContext *ctx) { //0208 BOOL ScrCmd_ShowPartyPokemonPic(ScriptContext *ctx) { //028C PokepicManager **pokepicManager = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); u16 partyId = ScriptGetVar(ctx); - Pokemon *mon = GetPartyMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->saveData), partyId); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->saveData), partyId); LoadUserFrameGfx1(ctx->fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, 0x3D9, 11, 0, HEAP_ID_4); *pokepicManager = DrawPokemonPicFromMon(ctx->fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, 10, 5, 11, 0x3D9, mon, HEAP_ID_4); u32 species = GetMonData(mon, MON_DATA_SPECIES, NULL); @@ -2502,7 +2502,7 @@ BOOL ScrCmd_NamePokemonScreen(ScriptContext *ctx) { //00BB u16 partyPos = ScriptGetVar(ctx); Party *party = SaveArray_Party_Get(fieldSystem->saveData); - Pokemon *mon = GetPartyMonByIndex(party, partyPos); + Pokemon *mon = Party_GetMonByIndex(party, partyPos); u16 monNick[20]; GetMonData(mon, MON_DATA_NICKNAME, monNick); @@ -2654,7 +2654,7 @@ BOOL ScrCmd_Defog(ScriptContext *ctx) { //00C4 BOOL ScrCmd_Cut(ScriptContext *ctx) { //00C5 void **miscData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); //todo identify u16 partyPosition = ScriptGetVar(ctx); - Pokemon *mon = GetPartyMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->saveData), partyPosition); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->saveData), partyPosition); u32 gender = PlayerAvatar_GetGender(ctx->fieldSystem->playerAvatar); *miscData = ov06_0224666C(ctx->fieldSystem, 0, mon, gender); SetupNativeScript(ctx, sub_0203C9F8); @@ -3065,8 +3065,8 @@ BOOL ScrCmd_Unk013C(ScriptContext *ctx) { //013C LocalMapObject **lastInteracted = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED); MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u16 unk0 = ScriptReadHalfword(ctx); - PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem)); - SaveEasyChat *easyChat = Save_EasyChat_Get(FieldSystem_GetSaveDataPtr(ctx->fieldSystem)); + PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveData(ctx->fieldSystem)); + SaveEasyChat *easyChat = Save_EasyChat_Get(FieldSystem_GetSaveData(ctx->fieldSystem)); u16 objId; if (unk0 == 0) { @@ -3217,14 +3217,14 @@ BOOL ScrCmd_Unk0153(ScriptContext *ctx) { //0153 } BOOL ScrCmd_Unk0154(ScriptContext *ctx) { //0154 - PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem)); + PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveData(ctx->fieldSystem)); MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); sub_0205363C(PlayerProfile_GetTrainerID(playerProfile), PlayerProfile_GetTrainerGender(playerProfile), *messageFormat); return FALSE; } BOOL ScrCmd_Unk0155(ScriptContext *ctx) { //0155 - PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem)); + PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveData(ctx->fieldSystem)); u16 unk0 = ScriptGetVar(ctx); u16 *var = ScriptGetVarPointer(ctx); *var = sub_02053678(PlayerProfile_GetTrainerID(playerProfile), PlayerProfile_GetTrainerGender(playerProfile), unk0); @@ -3233,7 +3233,7 @@ BOOL ScrCmd_Unk0155(ScriptContext *ctx) { //0155 } BOOL ScrCmd_Unk029C(ScriptContext *ctx) { //029C - PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem)); + PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveData(ctx->fieldSystem)); u16 unk0 = ScriptGetVar(ctx); u16 *var = ScriptGetVarPointer(ctx); *var = sub_02053678(PlayerProfile_GetTrainerID(playerProfile), PlayerProfile_GetTrainerGender(playerProfile), unk0); @@ -3241,7 +3241,7 @@ BOOL ScrCmd_Unk029C(ScriptContext *ctx) { //029C } BOOL ScrCmd_SetPlayerAvatar(ScriptContext *ctx) { //0156 - PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem)); + PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveData(ctx->fieldSystem)); u16 avatar = ScriptGetVar(ctx); PlayerProfile_SetAvatar(playerProfile, avatar); return FALSE; @@ -3260,7 +3260,7 @@ BOOL ScrCmd_SetSpawn(ScriptContext *ctx) { //014C } BOOL ScrCmd_GetPlayerGender(ScriptContext *ctx) { //014D - PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem)); + PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveData(ctx->fieldSystem)); u16 *var = ScriptGetVarPointer(ctx); *var = PlayerProfile_GetTrainerGender(playerProfile); return FALSE; @@ -3974,7 +3974,7 @@ BOOL ScrCmd_NationalDex(ScriptContext *ctx) { //022D BOOL ScrCmd_GetTotalPokemonEVs(ScriptContext *ctx) { //0233 u16 *var = ScriptGetVarPointer(ctx); u16 partyPosition = ScriptGetVar(ctx); - Pokemon *mon = GetPartyMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->saveData), partyPosition); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->saveData), partyPosition); u32 hpEv = GetMonData(mon, MON_DATA_HP_EV, NULL); u32 atkEv = GetMonData(mon, MON_DATA_ATK_EV, NULL); @@ -4005,7 +4005,7 @@ BOOL ScrCmd_GetPokemonFootprint(ScriptContext *ctx) { //023A u16 *var = ScriptGetVarPointer(ctx); u16 *var2 = ScriptGetVarPointer(ctx); u16 partyPosition = ScriptGetVar(ctx); - Pokemon *mon = GetPartyMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->saveData), partyPosition); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->saveData), partyPosition); u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL); *var = ov05_021F61E8(species); *var2 = ov05_021F61DC(species); @@ -4044,7 +4044,7 @@ BOOL ScrCmd_GetGameVersion(ScriptContext *ctx) { //0246 BOOL ScrCmd_GiveWallpaper(ScriptContext *ctx) { //0249 - used for easy chat unlock, todo: find better name FieldSystem *fieldSystem = ctx->fieldSystem; - PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(fieldSystem)); + PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveData(fieldSystem)); u16 *var = ScriptGetVarPointer(ctx); PCStorage *pcStorage = Save_PCStorage_Get(fieldSystem->saveData); u16 unk0 = ScriptGetVar(ctx); @@ -4181,7 +4181,7 @@ BOOL ScrCmd_SetDeoxysForm(ScriptContext *ctx) { //0263 Pokedex *pokedex = Save_Pokedex_Get(ctx->fieldSystem->saveData); for (s32 i = 0; i < partyCount; i++) { - Pokemon *mon = GetPartyMonByIndex(playerParty, i); + Pokemon *mon = Party_GetMonByIndex(playerParty, i); if (GetMonData(mon, MON_DATA_SPECIES, NULL) == SPECIES_DEOXYS) { SetMonData(mon, MON_DATA_FORM, &form); CalcMonLevelAndStats(mon); @@ -4204,7 +4204,7 @@ BOOL ScrCmd_CheckBurmyForms(ScriptContext *ctx) { //0264 for (s32 i = 0; i < partyCount; i++) { s32 j; BOOL hasMultiple; - Pokemon *mon = GetPartyMonByIndex(playerParty, i); + Pokemon *mon = Party_GetMonByIndex(playerParty, i); u32 species = GetMonData(mon, MON_DATA_SPECIES, NULL); u32 form = GetMonData(mon, MON_DATA_FORM, NULL); if (species == SPECIES_BURMY) { @@ -4261,7 +4261,7 @@ asm BOOL ScrCmd_CheckBurmyForms(ScriptContext *ctx) { _0203EFA2: ldr r0, [sp, #0xc] add r1, r4, #0x0 - bl GetPartyMonByIndex + bl Party_GetMonByIndex add r6, r0, #0x0 mov r1, #0x5 mov r2, #0x0 diff --git a/arm9/src/scrcmd_coins.c b/arm9/src/scrcmd_coins.c index 9a339d541..ea061b3b5 100644 --- a/arm9/src/scrcmd_coins.c +++ b/arm9/src/scrcmd_coins.c @@ -80,7 +80,7 @@ BOOL ScrCmd_TakeCoinsAddress(struct ScriptContext * ctx) //02A8 - todo: TakeCoin BOOL ScrCmd_HasEnoughCoinsImmediate(struct ScriptContext * ctx) //0274 - todo: CanAffordCoins? { struct FieldSystem* fieldSystem = ctx->fieldSystem; - struct SaveData * save = FieldSystem_GetSaveDataPtr(fieldSystem); + struct SaveData * save = FieldSystem_GetSaveData(fieldSystem); // Created, but discarded. PlayerProfile * player = Save_PlayerData_GetProfileAddr(save); u16 * coins_ptr = Save_PlayerData_GetCoinsAddr(fieldSystem->saveData); @@ -104,7 +104,7 @@ BOOL ScrCmd_HasEnoughCoinsImmediate(struct ScriptContext * ctx) //0274 - todo: C BOOL ScrCmd_HasEnoughCoinsAddress(struct ScriptContext * ctx) //02A9 - todo: CanAffordCoinsVar? { struct FieldSystem* fieldSystem = ctx->fieldSystem; - struct SaveData * save = FieldSystem_GetSaveDataPtr(fieldSystem); + struct SaveData * save = FieldSystem_GetSaveData(fieldSystem); // Created, but discarded PlayerProfile * player = Save_PlayerData_GetProfileAddr(save); u16 * coins_ptr = Save_PlayerData_GetCoinsAddr(fieldSystem->saveData); diff --git a/arm9/src/scrcmd_daycare.c b/arm9/src/scrcmd_daycare.c index 6521d75d8..33ac5e36e 100644 --- a/arm9/src/scrcmd_daycare.c +++ b/arm9/src/scrcmd_daycare.c @@ -54,7 +54,7 @@ BOOL ScrCmd_GiveDaycareEgg(struct ScriptContext* ctx) //01A9 struct FieldSystem* fieldSystem = ctx->fieldSystem; struct Daycare* daycare = SaveArray_Get(fieldSystem->saveData, 8); struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct SaveData* save = FieldSystem_GetSaveDataPtr(ctx->fieldSystem); + struct SaveData* save = FieldSystem_GetSaveData(ctx->fieldSystem); PlayerProfile* player = Save_PlayerData_GetProfileAddr(save); ov05_Daycare_GiveEggToPlayer(daycare, party, player); diff --git a/arm9/src/scrcmd_money.c b/arm9/src/scrcmd_money.c index ee176643a..5985c300d 100644 --- a/arm9/src/scrcmd_money.c +++ b/arm9/src/scrcmd_money.c @@ -10,7 +10,7 @@ extern void ov05_021E28A0(struct FieldSystem *fieldSystem, Window *moneyBox); BOOL ScrCmd_GiveMoney(struct ScriptContext * ctx) //006F { - struct SaveData * save = FieldSystem_GetSaveDataPtr(ctx->fieldSystem); + struct SaveData * save = FieldSystem_GetSaveData(ctx->fieldSystem); PlayerProfile * player = Save_PlayerData_GetProfileAddr(save); u32 amount = ScriptReadWord(ctx); @@ -21,7 +21,7 @@ BOOL ScrCmd_GiveMoney(struct ScriptContext * ctx) //006F BOOL ScrCmd_TakeMoneyImmediate(struct ScriptContext * ctx) //0070 - todo: TakeMoney? { - struct SaveData * save = FieldSystem_GetSaveDataPtr(ctx->fieldSystem); + struct SaveData * save = FieldSystem_GetSaveData(ctx->fieldSystem); PlayerProfile * player = Save_PlayerData_GetProfileAddr(save); u32 amount = ScriptReadWord(ctx); @@ -32,7 +32,7 @@ BOOL ScrCmd_TakeMoneyImmediate(struct ScriptContext * ctx) //0070 - todo: TakeMo BOOL ScrCmd_TakeMoneyAddress(struct ScriptContext * ctx) //01A3 - todo: TakeMoneyVar? { - struct SaveData * save = FieldSystem_GetSaveDataPtr(ctx->fieldSystem); + struct SaveData * save = FieldSystem_GetSaveData(ctx->fieldSystem); PlayerProfile * player = Save_PlayerData_GetProfileAddr(save); u16 amount = ScriptGetVar(ctx); @@ -43,7 +43,7 @@ BOOL ScrCmd_TakeMoneyAddress(struct ScriptContext * ctx) //01A3 - todo: TakeMone BOOL ScrCmd_HasEnoughMoneyImmediate(struct ScriptContext * ctx) //0071 - todo: CanAffordMoney? { - struct SaveData * save = FieldSystem_GetSaveDataPtr(ctx->fieldSystem); + struct SaveData * save = FieldSystem_GetSaveData(ctx->fieldSystem); PlayerProfile * player = Save_PlayerData_GetProfileAddr(save); u16 * ret_ptr = ScriptGetVarPointer(ctx); @@ -64,7 +64,7 @@ BOOL ScrCmd_HasEnoughMoneyImmediate(struct ScriptContext * ctx) //0071 - todo: C BOOL ScrCmd_HasEnoughMoneyAddress(struct ScriptContext * ctx) //01AB - todo: CanAffordMoneyVar? { - struct SaveData * save = FieldSystem_GetSaveDataPtr(ctx->fieldSystem); + struct SaveData * save = FieldSystem_GetSaveData(ctx->fieldSystem); PlayerProfile * player = Save_PlayerData_GetProfileAddr(save); u16 * ret_ptr = ScriptGetVarPointer(ctx); diff --git a/arm9/src/scrcmd_move_relearner.c b/arm9/src/scrcmd_move_relearner.c index b786bde2f..d69eba821 100644 --- a/arm9/src/scrcmd_move_relearner.c +++ b/arm9/src/scrcmd_move_relearner.c @@ -47,7 +47,7 @@ BOOL ScrCmd_Unk021F(struct ScriptContext* ctx) { //021F u16* ret_ptr = ScriptGetVarPointer(ctx); u16 mon_idx = ScriptGetVar(ctx); struct Party* party = SaveArray_Party_Get(ctx->fieldSystem->saveData); - struct Pokemon* pokemon = GetPartyMonByIndex(party, mon_idx); + struct Pokemon* pokemon = Party_GetMonByIndex(party, mon_idx); u16 *eligibleMoves = GetEligibleLevelUpMoves(pokemon, HEAP_ID_32); *ret_ptr = (u16)sub_02088EF8(eligibleMoves); @@ -63,7 +63,7 @@ void sub_02045E74(struct ScriptContext* ctx, u8 a1, struct Pokemon* pokemon, u16 moveRelearner->pokemon = pokemon; - struct SaveData* save = FieldSystem_GetSaveDataPtr(ctx->fieldSystem); + struct SaveData* save = FieldSystem_GetSaveData(ctx->fieldSystem); moveRelearner->player = Save_PlayerData_GetProfileAddr(save); moveRelearner->options = Save_PlayerData_GetOptionsAddr(ctx->fieldSystem->saveData); @@ -85,7 +85,7 @@ BOOL ScrCmd_Unk0221(struct ScriptContext* ctx) //0221 - todo: RememberMove? { u16 mon_idx = ScriptGetVar(ctx); struct Party* party = SaveArray_Party_Get(ctx->fieldSystem->saveData); - struct Pokemon* pokemon = GetPartyMonByIndex(party, mon_idx); + struct Pokemon* pokemon = Party_GetMonByIndex(party, mon_idx); u16 *eligibleMoves = GetEligibleLevelUpMoves(pokemon, HEAP_ID_32); sub_02045E74(ctx, 1, pokemon, eligibleMoves); @@ -97,7 +97,7 @@ BOOL ScrCmd_Unk0224(struct ScriptContext* ctx) //0224 - todo: TeachMove? u16 mon_idx = ScriptGetVar(ctx); u16 move = ScriptGetVar(ctx); struct Party *party = SaveArray_Party_Get(ctx->fieldSystem->saveData); - struct Pokemon *pokemon = GetPartyMonByIndex(party, mon_idx); + struct Pokemon *pokemon = Party_GetMonByIndex(party, mon_idx); u16 *eligibleMoves = AllocFromHeap(HEAP_ID_32, 2 * sizeof(u16)); eligibleMoves[0] = move; diff --git a/arm9/src/scrcmd_names.c b/arm9/src/scrcmd_names.c index d0eddd174..66f0b955f 100644 --- a/arm9/src/scrcmd_names.c +++ b/arm9/src/scrcmd_names.c @@ -29,7 +29,7 @@ BOOL ScrCmd_GetPlayerName(ScriptContext *ctx) //00CD - todo: BufferPlayerName? T FieldSystem *fieldSystem = ctx->fieldSystem; MessageFormat **messageFormat = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); - SaveData *save = FieldSystem_GetSaveDataPtr(fieldSystem); + SaveData *save = FieldSystem_GetSaveData(fieldSystem); PlayerProfile *player = Save_PlayerData_GetProfileAddr(save); BufferPlayersName(*messageFormat, idx, player); @@ -66,7 +66,7 @@ BOOL ScrCmd_GetPokemonName(ScriptContext *ctx) //00D0 - todo: BufferPartyPokemon u8 idx = ScriptReadByte(ctx); u16 mon_idx = ScriptGetVar(ctx); Party *party = SaveArray_Party_Get(fieldSystem->saveData); - Pokemon *mon = GetPartyMonByIndex(party, mon_idx); + Pokemon *mon = Party_GetMonByIndex(party, mon_idx); BufferBoxMonSpeciesName(*messageFormat, idx, &mon->box); @@ -158,7 +158,7 @@ BOOL ScrCmd_GetPokemonNickname(ScriptContext *ctx) //00D6 - todo: BufferPartyPok u8 idx = ScriptReadByte(ctx); u16 mon_idx = ScriptGetVar(ctx); Party *party = SaveArray_Party_Get(fieldSystem->saveData); - Pokemon *pokemon = GetPartyMonByIndex(party, mon_idx); + Pokemon *pokemon = Party_GetMonByIndex(party, mon_idx); BufferBoxMonNickname(*messageFormat, idx, &pokemon->box); @@ -206,7 +206,7 @@ BOOL ScrCmd_GetTrainerClassName(ScriptContext *ctx) //00D8 - todo: BufferTrainer BOOL ScrCmd_Unk00D9(ScriptContext *ctx) //00D9 - todo: BufferPlayerTrainerClassName? TextPlayerTrainerClassName? { FieldSystem *fieldSystem = ctx->fieldSystem; - SaveData *save = FieldSystem_GetSaveDataPtr(fieldSystem); + SaveData *save = FieldSystem_GetSaveData(fieldSystem); PlayerProfile *player = Save_PlayerData_GetProfileAddr(save); MessageFormat **messageFormat = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -391,7 +391,7 @@ BOOL ScrCmd_GetPokemonMoveName(ScriptContext *ctx) //01CB - todo: BufferPartyPok u16 mon_idx = ScriptGetVar(ctx); u16 mon_move_idx = ScriptGetVar(ctx); Party *party = SaveArray_Party_Get(fieldSystem->saveData); - Pokemon *pokemon = GetPartyMonByIndex(party, mon_idx); + Pokemon *pokemon = Party_GetMonByIndex(party, mon_idx); u16 move = (u16)GetMonData(pokemon, MON_DATA_MOVE1 + mon_move_idx, NULL); BufferMoveName(*messageFormat, idx, move); diff --git a/arm9/src/scrcmd_party.c b/arm9/src/scrcmd_party.c index b6fbd01e2..ae421a5df 100644 --- a/arm9/src/scrcmd_party.c +++ b/arm9/src/scrcmd_party.c @@ -36,7 +36,7 @@ BOOL ScrCmd_GetPartyMonSpecies(struct ScriptContext* ctx) //0198 - todo: GetPart u16* mon_slot = GetVarPointer(ctx->fieldSystem, ScriptReadHalfword(ctx)); //for some reason this is *required* for matching, cannot use ScriptGetVarPointer here ret_ptr = GetVarPointer(ctx->fieldSystem, ScriptReadHalfword(ctx)); struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, *mon_slot); + struct Pokemon* party_mon = Party_GetMonByIndex(party, *mon_slot); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); if (party_mon_is_egg == FALSE) @@ -55,14 +55,14 @@ BOOL ScrCmd_GetPartyMonSpecies(struct ScriptContext* ctx) //0198 - todo: GetPart BOOL ScrCmd_CheckPartyMonOTID(struct ScriptContext* ctx) //0199 - todo: CheckPartyPokemonTraded? { struct FieldSystem *fieldSystem = ctx->fieldSystem; - struct SaveData* save = FieldSystem_GetSaveDataPtr(fieldSystem); + struct SaveData* save = FieldSystem_GetSaveData(fieldSystem); PlayerProfile* player = Save_PlayerData_GetProfileAddr(save); u16* mon_slot = ScriptGetVarPointer(ctx); u16* ret_ptr = ScriptGetVarPointer(ctx); struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, *mon_slot); + struct Pokemon* party_mon = Party_GetMonByIndex(party, *mon_slot); u16 party_mon_otid = (u16)GetMonData(party_mon, MON_DATA_OTID, NULL); u16 player_otid = (u16)PlayerProfile_GetTrainerID(player); @@ -95,7 +95,7 @@ BOOL ScrCmd_GiveEgg(struct ScriptContext* ctx) //0097 s32 met_loc = sub_02015CF8(1, unk); ov05_SetEggStats(egg, species, 1, player, 3, met_loc); - AddMonToParty(party, egg); + Party_AddMon(party, egg); FreeToHeap(egg); } @@ -121,7 +121,7 @@ BOOL ScrCmd_PartyMonHasMove(struct ScriptContext* ctx) //0099 u16 required_move = ScriptGetVar(ctx); u16 mon_slot = ScriptGetVar(ctx); struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); + struct Pokemon* party_mon = Party_GetMonByIndex(party, mon_slot); *ret_ptr = 0; @@ -153,7 +153,7 @@ BOOL ScrCmd_FindPartyMonWithMove(struct ScriptContext* ctx) //009A - todo: Check for (i = 0, *ret_ptr = PARTY_SIZE; i < party_count; i++) { struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, i); + struct Pokemon* party_mon = Party_GetMonByIndex(party, i); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); if (party_mon_is_egg == FALSE) @@ -177,7 +177,7 @@ BOOL ScrCmd_SurvivePsn(struct ScriptContext* ctx) //01F7 u16* ret_ptr = ScriptGetVarPointer(ctx); u16 mon_slot = ScriptGetVar(ctx); struct Party* party = SaveArray_Party_Get(ctx->fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); + struct Pokemon* party_mon = Party_GetMonByIndex(party, mon_slot); *ret_ptr = (u16)SurvivePoisoning(party_mon); return FALSE; @@ -197,7 +197,7 @@ BOOL ScrCmd_CountPartyMonsAtOrBelowLevel(struct ScriptContext* ctx) //01F6 for (i = 0, mons = 0, *ret_ptr = 0; i < party_count; i++) { struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, i); + struct Pokemon* party_mon = Party_GetMonByIndex(party, i); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); if (party_mon_is_egg == FALSE) @@ -220,7 +220,7 @@ BOOL ScrCmd_GetPartyMonLevel(struct ScriptContext* ctx) //0278 u16* ret_ptr = ScriptGetVarPointer(ctx); u16 mon_slot = ScriptGetVar(ctx); struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); + struct Pokemon* party_mon = Party_GetMonByIndex(party, mon_slot); *ret_ptr = 0; @@ -247,7 +247,7 @@ BOOL ScrCmd_GetPartyMonNature(struct ScriptContext* ctx) //0212 } struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); + struct Pokemon* party_mon = Party_GetMonByIndex(party, mon_slot); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); if (party_mon_is_egg) @@ -271,7 +271,7 @@ BOOL ScrCmd_FindPartyMonWithNature(struct ScriptContext* ctx) //0213 - todo: Che for (i = 0, *ret_ptr = 0xFF; i < party_count; i++) { struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, i); + struct Pokemon* party_mon = Party_GetMonByIndex(party, i); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); if (party_mon_is_egg == FALSE) @@ -294,7 +294,7 @@ BOOL ScrCmd_GetPartyMonFriendship(struct ScriptContext* ctx) //01B9 u16* ret_ptr = ScriptGetVarPointer(ctx); u16 mon_slot = ScriptGetVar(ctx); struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); + struct Pokemon* party_mon = Party_GetMonByIndex(party, mon_slot); *ret_ptr = (u16)GetMonData(party_mon, MON_DATA_FRIENDSHIP, NULL); return FALSE; @@ -307,7 +307,7 @@ BOOL ScrCmd_AddPartyMonFriendship(struct ScriptContext* ctx) //01BA u16 mon_slot = ScriptGetVar(ctx); u16 map_sec = MapHeader_GetMapSec(ctx->fieldSystem->location->mapId); struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); + struct Pokemon* party_mon = Party_GetMonByIndex(party, mon_slot); u16 friendship = (u16)GetMonData(party_mon, MON_DATA_FRIENDSHIP, NULL); @@ -350,7 +350,7 @@ BOOL ScrCmd_SubtractPartyMonFriendship(struct ScriptContext* ctx) //01BB u16 friendship_to_deplete = ScriptGetVar(ctx); u16 mon_slot = ScriptGetVar(ctx); struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); + struct Pokemon* party_mon = Party_GetMonByIndex(party, mon_slot); u16 friendship = (u16)GetMonData(party_mon, MON_DATA_FRIENDSHIP, NULL); if (friendship_to_deplete > friendship) @@ -373,7 +373,7 @@ BOOL ScrCmd_GetPartyMonContestCondition(struct ScriptContext* ctx) //0281 u16 contest_condition_id = ScriptGetVar(ctx); u16* ret_ptr = ScriptGetVarPointer(ctx); struct Party* party = SaveArray_Party_Get(ctx->fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); + struct Pokemon* party_mon = Party_GetMonByIndex(party, mon_slot); *ret_ptr = (u16)GetMonData(party_mon, MON_DATA_COOL + contest_condition_id, NULL); return FALSE; @@ -394,7 +394,7 @@ BOOL ScrCmd_GetPartyMonTypes(struct ScriptContext* ctx) //0248 u16* type2 = ScriptGetVarPointer(ctx); u16 mon_slot = ScriptGetVar(ctx); struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); + struct Pokemon* party_mon = Party_GetMonByIndex(party, mon_slot); *type1 = (u16)GetMonData(party_mon, MON_DATA_TYPE_1, NULL); *type2 = (u16)GetMonData(party_mon, MON_DATA_TYPE_2, NULL); @@ -423,7 +423,7 @@ BOOL ScrCmd_CountPartyMons_OmitEggs(struct ScriptContext* ctx) //019A for (i = 0, non_egg_mons = 0; i < party_count; i++) { struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, i); + struct Pokemon* party_mon = Party_GetMonByIndex(party, i); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); if (party_mon_is_egg == FALSE) @@ -454,7 +454,7 @@ BOOL ScrCmd_CountAvailablePartyMons_IgnoreSlot(struct ScriptContext* ctx) //019B if (i != slot_to_ignore) { struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, i); + struct Pokemon* party_mon = Party_GetMonByIndex(party, i); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); if (party_mon_is_egg == FALSE) @@ -487,7 +487,7 @@ BOOL ScrCmd_CountAvailablePartyAndPCMons(struct ScriptContext* ctx) //019C for (i = 0, mons = 0; i < party_count; i++) { struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, i); + struct Pokemon* party_mon = Party_GetMonByIndex(party, i); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); if (party_mon_is_egg == FALSE) @@ -517,7 +517,7 @@ BOOL ScrCmd_GetPartyEggCount(struct ScriptContext* ctx) //019D for (i = 0, eggs_in_party = 0; i < party_count; i++) { struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, i); + struct Pokemon* party_mon = Party_GetMonByIndex(party, i); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); if (party_mon_is_egg) @@ -542,7 +542,7 @@ BOOL ScrCmd_CheckPartyForPokerus(struct ScriptContext* ctx) //0119 for (i = 0, *ret_ptr = 0; i < party_count; i++) { struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, i); + struct Pokemon* party_mon = Party_GetMonByIndex(party, i); BOOL party_mon_has_pokerus = (BOOL)GetMonData(party_mon, MON_DATA_POKERUS, NULL); if (party_mon_has_pokerus) @@ -560,7 +560,7 @@ BOOL ScrCmd_GetPartyMonGender(struct ScriptContext* ctx) //011A u16 mon_slot = ScriptGetVar(ctx); u16* ret_ptr = ScriptGetVarPointer(ctx); struct Party* party = SaveArray_Party_Get(ctx->fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); + struct Pokemon* party_mon = Party_GetMonByIndex(party, mon_slot); *ret_ptr = (u16)GetMonData(party_mon, MON_DATA_GENDER, NULL); return FALSE; @@ -575,7 +575,7 @@ BOOL ScrCmd_CountPartyMonMoves(struct ScriptContext* ctx) //01C8 u16* ret_ptr = ScriptGetVarPointer(ctx); u16 mon_slot = ScriptGetVar(ctx); struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - party_mon = GetPartyMonByIndex(party, mon_slot); + party_mon = Party_GetMonByIndex(party, mon_slot); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); if (party_mon_is_egg) @@ -620,7 +620,7 @@ BOOL ScrCmd_ForgetPartyMonMove(struct ScriptContext* ctx) //01C9 u16 mon_slot = ScriptGetVar(ctx); u16 move_slot = ScriptGetVar(ctx); struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); + struct Pokemon* party_mon = Party_GetMonByIndex(party, mon_slot); sub_020699A4(party_mon, move_slot); @@ -634,7 +634,7 @@ BOOL ScrCmd_GetPartyMonMove(struct ScriptContext* ctx) //01CA u16 mon_slot = ScriptGetVar(ctx); u16 move_slot = ScriptGetVar(ctx); struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); + struct Pokemon* party_mon = Party_GetMonByIndex(party, mon_slot); *ret_ptr = (u16)GetMonData(party_mon, MON_DATA_MOVE1 + move_slot, NULL); return FALSE; @@ -646,7 +646,7 @@ BOOL ScrCmd_GetPartyMonHeldItem(struct ScriptContext* ctx) //01EE u16* ret_ptr = ScriptGetVarPointer(ctx); u16 mon_slot = ScriptGetVar(ctx); struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); + struct Pokemon* party_mon = Party_GetMonByIndex(party, mon_slot); *ret_ptr = (u16)GetMonData(party_mon, MON_DATA_HELD_ITEM, NULL); return FALSE; @@ -657,7 +657,7 @@ BOOL ScrCmd_ResetPartyMonHeldItem(struct ScriptContext* ctx) //01F0 struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 mon_slot = ScriptGetVar(ctx); struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); + struct Pokemon* party_mon = Party_GetMonByIndex(party, mon_slot); u16 party_mon_held_item = ITEM_NONE; SetMonData(party_mon, MON_DATA_HELD_ITEM, &party_mon_held_item); @@ -676,7 +676,7 @@ BOOL ScrCmd_CheckPartyForSpecies(struct ScriptContext* ctx) //01C0 for (i = 0, *ret_ptr = 0; i < party_count; i++) { struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, i); + struct Pokemon* party_mon = Party_GetMonByIndex(party, i); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); if (party_mon_is_egg == FALSE) @@ -698,7 +698,7 @@ BOOL ScrCmd_CountPartyMonRibbons(struct ScriptContext* ctx) //022E u16* ret_ptr = ScriptGetVarPointer(ctx); u16 mon_slot = ScriptGetVar(ctx); struct Party* party = SaveArray_Party_Get(ctx->fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); + struct Pokemon* party_mon = Party_GetMonByIndex(party, mon_slot); u16 ribbon_idx; u16 ribbons; @@ -729,7 +729,7 @@ BOOL ScrCmd_CountTotalPartyRibbons(struct ScriptContext* ctx) //022F { for (u16 i = 0; i < party_count; i++) { - struct Pokemon* party_mon = GetPartyMonByIndex(party, i); + struct Pokemon* party_mon = Party_GetMonByIndex(party, i); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); if (party_mon_is_egg) @@ -758,7 +758,7 @@ BOOL ScrCmd_PartyMonHasRibbon(struct ScriptContext* ctx) //0230 u16 mon_slot = ScriptGetVar(ctx); u16 ribbon_idx = ScriptGetVar(ctx); struct Party* party = SaveArray_Party_Get(ctx->fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); + struct Pokemon* party_mon = Party_GetMonByIndex(party, mon_slot); *ret_ptr = (u16)GetMonData(party_mon, sub_0207FC5C((u8)ribbon_idx, 0), NULL); return FALSE; @@ -770,7 +770,7 @@ BOOL ScrCmd_GivePartyMonRibbon(struct ScriptContext* ctx) //0231 u16 ribbon_idx = ScriptGetVar(ctx); u8 mon_has_ribbon = TRUE; struct Party* party = SaveArray_Party_Get(ctx->fieldSystem->saveData); - struct Pokemon* party_mon = GetPartyMonByIndex(party, mon_slot); + struct Pokemon* party_mon = Party_GetMonByIndex(party, mon_slot); SetMonData(party_mon, (s32)sub_0207FC5C((u8)ribbon_idx, 0), &mon_has_ribbon); @@ -791,7 +791,7 @@ BOOL ScrCmd_CheckPartyForBadEgg(struct ScriptContext* ctx) //02B7 { for (u16 i = 0; i < party_count; i++) { - struct Pokemon* party_mon = GetPartyMonByIndex(party, i); + struct Pokemon* party_mon = Party_GetMonByIndex(party, i); BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL); if (party_mon_is_egg) { diff --git a/arm9/src/script_pokemon_util.c b/arm9/src/script_pokemon_util.c index d1090d000..f0acc1226 100644 --- a/arm9/src/script_pokemon_util.c +++ b/arm9/src/script_pokemon_util.c @@ -31,7 +31,7 @@ BOOL GiveMon(HeapID heapId, struct SaveData * save, u16 species, u8 level, u16 i sub_0206A014(mon, data, ITEM_POKE_BALL, mapSec, encounterType, heapId); ptr = item; SetMonData(mon, MON_DATA_HELD_ITEM, &ptr); - BOOL isAdded = AddMonToParty(party, mon); + BOOL isAdded = Party_AddMon(party, mon); if (isAdded) { sub_0202C144(save, mon); @@ -49,14 +49,14 @@ BOOL GiveEgg(HeapID heapId, struct SaveData * save, u16 species, int level, int struct Pokemon * mon = AllocMonZeroed(HEAP_ID_32); ZeroMonData(mon); ov05_SetEggStats(mon, species, level, data, 4, sub_02015CF8(metLocIndex, a3)); - BOOL isAdded = AddMonToParty(party, mon); + BOOL isAdded = Party_AddMon(party, mon); FreeToHeap(mon); return isAdded; } void PartyMonSetMoveInSlot(struct Party * party, int partySlot, int moveSlot, u16 move) { - struct Pokemon * mon = GetPartyMonByIndex(party, partySlot); + struct Pokemon * mon = Party_GetMonByIndex(party, partySlot); MonSetMoveInSlot(mon, move, (u8)moveSlot); } @@ -66,7 +66,7 @@ int GetIdxOfFirstPartyMonWithMove(struct Party * party, int move) for (int i = 0; i < partyCount; i++) { - struct Pokemon * mon = GetPartyMonByIndex(party, i); + struct Pokemon * mon = Party_GetMonByIndex(party, i); if (GetMonData(mon, MON_DATA_IS_EGG, NULL)) continue; @@ -87,7 +87,7 @@ int CountAlivePokemon(struct Party * party) for (i = 0; i < partyCount; i++) { - struct Pokemon * mon = GetPartyMonByIndex(party, i); + struct Pokemon * mon = Party_GetMonByIndex(party, i); if(MonNotFaintedOrEgg(mon)) aliveCount++; @@ -102,7 +102,7 @@ struct Pokemon * GetFirstAliveMonInParty_CrashIfNone(struct Party * party) for (i = 0; i < partyCount; i++) { - struct Pokemon * mon = GetPartyMonByIndex(party, i); + struct Pokemon * mon = Party_GetMonByIndex(party, i); if(MonNotFaintedOrEgg(mon)) return mon; @@ -118,7 +118,7 @@ struct Pokemon * GetFirstNonEggInParty(struct Party * party) for (i = 0; i < partyCount; i++) { - struct Pokemon * mon = GetPartyMonByIndex(party, i); + struct Pokemon * mon = Party_GetMonByIndex(party, i); if (!GetMonData(mon, MON_DATA_IS_EGG, NULL)) return mon; @@ -139,7 +139,7 @@ void GiveAllMonsTheSinnohChampRibbon(struct Party * party) for (int i = 0; i < partyCount; i++) { - struct Pokemon * mon = GetPartyMonByIndex(party, i); + struct Pokemon * mon = Party_GetMonByIndex(party, i); if (GetMonData(mon, MON_DATA_IS_EGG, NULL)) continue; @@ -157,7 +157,7 @@ int ApplyPoisonStep(struct Party * party, int location) for (int i = 0; i < partyCount; i++) { - struct Pokemon * mon = GetPartyMonByIndex(party, i); + struct Pokemon * mon = Party_GetMonByIndex(party, i); if(!MonNotFaintedOrEgg(mon)) continue; diff --git a/arm9/src/trainer_data.c b/arm9/src/trainer_data.c index ca1625451..de0c80e3d 100644 --- a/arm9/src/trainer_data.c +++ b/arm9/src/trainer_data.c @@ -322,7 +322,7 @@ void CreateNPCTrainerParty(BattleSetup *setup, s32 party_id, HeapID heapId) // If you were treating the trainer type as a bitfield, you'd put the // checks for held item and moves here. You'd also treat the trpoke // data as a flat u16 array rather than an array of fixed-width structs. - AddMonToParty(setup->party[party_id], pokemon); + Party_AddMon(setup->party[party_id], pokemon); } break; } @@ -345,7 +345,7 @@ void CreateNPCTrainerParty(BattleSetup *setup, s32 party_id, HeapID heapId) { MonSetMoveInSlot(pokemon, monSpeciesMoves[i].moves[j], (u8)j); } - AddMonToParty(setup->party[party_id], pokemon); + Party_AddMon(setup->party[party_id], pokemon); } break; } @@ -365,7 +365,7 @@ void CreateNPCTrainerParty(BattleSetup *setup, s32 party_id, HeapID heapId) iv = (u8)((monSpeciesItem[i].difficulty * 31) / 255); CreateMon(pokemon, monSpeciesItem[i].species, monSpeciesItem[i].level, iv, 1, (s32)personality, 2, 0); SetMonData(pokemon, MON_DATA_HELD_ITEM, &monSpeciesItem[i].item); - AddMonToParty(setup->party[party_id], pokemon); + Party_AddMon(setup->party[party_id], pokemon); } break; } @@ -389,7 +389,7 @@ void CreateNPCTrainerParty(BattleSetup *setup, s32 party_id, HeapID heapId) { MonSetMoveInSlot(pokemon, monSpeciesItemMoves[i].moves[j], (u8)j); } - AddMonToParty(setup->party[party_id], pokemon); + Party_AddMon(setup->party[party_id], pokemon); } break; } diff --git a/arm9/src/unk_0204B0A0.c b/arm9/src/unk_0204B0A0.c index 84adcc49e..635a50f16 100644 --- a/arm9/src/unk_0204B0A0.c +++ b/arm9/src/unk_0204B0A0.c @@ -22,7 +22,7 @@ extern void* Save_Roamers_Get(struct SaveData* save); extern void sub_02060344(struct SaveData* save, s32); extern void sub_0203959C(struct FieldSystem*); extern void sub_02025A60(struct SaveData* save, s32); -extern struct SaveData* FieldSystem_GetSaveDataPtr(struct FieldSystem*); +extern struct SaveData* FieldSystem_GetSaveData(struct FieldSystem*); void sub_0204B0F8(struct FieldSystem *fieldSystem) { @@ -79,7 +79,7 @@ void sub_0204B158(struct FieldSystem *fieldSystem, SysInfo_RTC *rtc_info, struct void sub_0204B1DC(struct FieldSystem *fieldSystem, s32 a1) { - struct SaveData* save = FieldSystem_GetSaveDataPtr(fieldSystem); + struct SaveData* save = FieldSystem_GetSaveData(fieldSystem); sub_02025A60(save, a1); sub_0203959C(fieldSystem); sub_02060344(fieldSystem->saveData, a1); diff --git a/arm9/src/unk_0206439C.c b/arm9/src/unk_0206439C.c index 9c69a9540..19a2fc49c 100644 --- a/arm9/src/unk_0206439C.c +++ b/arm9/src/unk_0206439C.c @@ -9,7 +9,7 @@ struct UnkStruct_0206439C* sub_0206439C(HeapID heapId, u8 mon_idx, struct SaveDa struct UnkStruct_0206439C* ret = AllocFromHeapAtEnd(heapId, sizeof(struct UnkStruct_0206439C)); struct Party* party = SaveArray_Party_Get(save); - ret->pokemon = GetPartyMonByIndex(party, mon_idx); + ret->pokemon = Party_GetMonByIndex(party, mon_idx); ret->unk4 = NULL; return ret; diff --git a/arm9/src/unk_02064E20.c b/arm9/src/unk_02064E20.c index e13bad886..c6bb169d1 100644 --- a/arm9/src/unk_02064E20.c +++ b/arm9/src/unk_02064E20.c @@ -6,7 +6,7 @@ void KeepSafariTrain(struct FieldSystem* fieldSystem) { - struct unk_2025484 * r4 = (struct unk_2025484 *)sub_02024ED8(FieldSystem_GetSaveDataPtr(fieldSystem)); + struct unk_2025484 * r4 = (struct unk_2025484 *)sub_02024ED8(FieldSystem_GetSaveData(fieldSystem)); if((u32)sub_020254B4(r4) == 6) { return; diff --git a/arm9/src/unk_0208890C.c b/arm9/src/unk_0208890C.c index 577d6d31d..6427b86de 100644 --- a/arm9/src/unk_0208890C.c +++ b/arm9/src/unk_0208890C.c @@ -7,7 +7,7 @@ #include "player_data.h" #include "poke_overlay.h" -extern struct SaveData* FieldSystem_GetSaveDataPtr(struct FieldSystem *); +extern struct SaveData* FieldSystem_GetSaveData(struct FieldSystem *); extern SavePoffinData *Save_PoffinData_Get(struct SaveData* save); extern void sub_020373D4(struct FieldSystem *, struct OverlayManagerTemplate *, void*); extern BOOL sub_020889B0(struct OverlayManager *, u32*); @@ -44,7 +44,7 @@ void sub_02088950(struct FieldSystem *fieldSystem, struct PoffinCaseAppData *par struct PoffinCaseAppData* sub_02088960(struct FieldSystem *fieldSystem, u32 a1, HeapID heapId) { - struct SaveData* save = FieldSystem_GetSaveDataPtr(fieldSystem); + struct SaveData* save = FieldSystem_GetSaveData(fieldSystem); struct PoffinCaseAppData* ret = sub_0208890C(a1, save, heapId, fieldSystem->unk98); sub_02088950(fieldSystem, ret); diff --git a/arm9/src/use_item_on_mon.c b/arm9/src/use_item_on_mon.c index 1acb0930e..c00adb36a 100644 --- a/arm9/src/use_item_on_mon.c +++ b/arm9/src/use_item_on_mon.c @@ -268,7 +268,7 @@ BOOL CanUseItemOnPokemon(struct Pokemon * pokemon, u16 itemId, s32 moveId, HeapI BOOL CanUseItemOnMonInParty(struct Party * party, u16 itemId, s32 partyIdx, s32 moveIdx, HeapID heapId) { - struct Pokemon * pokemon = GetPartyMonByIndex(party, partyIdx); + struct Pokemon * pokemon = Party_GetMonByIndex(party, partyIdx); return CanUseItemOnPokemon(pokemon, itemId, moveIdx, heapId); } @@ -536,7 +536,7 @@ BOOL UseItemOnPokemon(struct Pokemon * pokemon, u16 itemId, s32 moveIdx, u16 loc BOOL UseItemOnMonInParty(struct Party * party, u16 itemId, s32 partyIdx, s32 moveIdx, u16 location, HeapID heapId) { - struct Pokemon * pokemon = GetPartyMonByIndex(party, partyIdx); + struct Pokemon * pokemon = Party_GetMonByIndex(party, partyIdx); return UseItemOnPokemon(pokemon, itemId, moveIdx, location, heapId); } @@ -698,7 +698,7 @@ void HealParty(struct Party * party) nmons = GetPartyCount(party); for (i = 0; i < nmons; i++) { - struct Pokemon * pokemon = GetPartyMonByIndex(party, i); + struct Pokemon * pokemon = Party_GetMonByIndex(party, i); if (GetMonData(pokemon, MON_DATA_SPECIES_EXISTS, NULL)) { sp8 = GetMonData(pokemon, MON_DATA_MAXHP, NULL); diff --git a/include/party.h b/include/party.h index 44aef7f3a..c5921e761 100644 --- a/include/party.h +++ b/include/party.h @@ -6,13 +6,13 @@ BOOL PartyHasMon(struct Party * party_p, u16 species); int GetPartyCount(struct Party * party_p); -struct Pokemon * GetPartyMonByIndex(struct Party * party_p, int idx); +struct Pokemon * Party_GetMonByIndex(struct Party * party_p, int idx); u32 SaveArray_Party_sizeof(void); struct Party * SaveArray_Party_Alloc(HeapID heapId); void SaveArray_Party_Init(struct Party * party); void InitPartyWithMaxSize(struct Party * party, int count); -BOOL AddMonToParty(struct Party * party, struct Pokemon * pokemon); -BOOL RemoveMonFromParty(struct Party * party, int pos); +BOOL Party_AddMon(struct Party * party, struct Pokemon * pokemon); +BOOL Party_RemoveMon(struct Party * party, int pos); void ReplacePartySlotWithMon(struct Party * party, int pos, struct Pokemon * pokemon); BOOL SwapSlotsInParty(struct Party * party, int pos1, int pos2); void CopyParty(struct Party * src, struct Party * dest); diff --git a/include/scrcmd.h b/include/scrcmd.h index 1709471c0..b004ce3a0 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -6,7 +6,7 @@ extern u16 VarGet(FieldSystem *fieldSystem, u16); extern u16* GetVarPointer(FieldSystem *fieldSystem, u16); -extern SaveData* FieldSystem_GetSaveDataPtr(FieldSystem *fieldSystem); +extern SaveData* FieldSystem_GetSaveData(FieldSystem *fieldSystem); static inline u16 ScriptGetVar(ScriptContext *ctx) { From 64646e40d95f3a1f34f4b6dcadab580e5194340f Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 20 Aug 2023 12:52:20 +0100 Subject: [PATCH 07/11] rename some party related funcs --- arm9/asm/scrcmd_12.s | 2 +- arm9/asm/scrcmd_5.s | 2 +- arm9/asm/unk_02035068.s | 2 +- arm9/asm/unk_020377F0.s | 4 +-- arm9/asm/unk_020476CC.s | 10 +++--- arm9/asm/unk_02050E48.s | 8 ++--- arm9/asm/unk_02054C14.s | 4 +-- arm9/asm/unk_0206BB5C.s | 2 +- arm9/asm/unk_0206C700.s | 2 +- arm9/asm/unk_0206F3FC.s | 2 +- arm9/asm/unk_020859C0.s | 2 +- arm9/asm/unk_02087D00.s | 4 +-- arm9/global.inc | 6 ++-- arm9/overlays/05/asm/ov05_021D80E8.s | 2 +- arm9/overlays/05/asm/ov05_021EC458.s | 10 +++--- arm9/overlays/06/asm/overlay_06.s | 4 +-- arm9/overlays/07/asm/overlay_07.s | 4 +-- arm9/overlays/09/asm/overlay_09.s | 14 ++++----- arm9/overlays/11/asm/ov11_0222D5C0_1.s | 36 +++++++++++----------- arm9/overlays/11/asm/ov11_0222FF68.s | 6 ++-- arm9/overlays/11/asm/ov11_02232264.s | 16 +++++----- arm9/overlays/11/asm/ov11_0223D1DC.s | 24 +++++++-------- arm9/overlays/11/asm/ov11_02242B78.s | 8 ++--- arm9/overlays/11/asm/ov11_0224CA64.s | 4 +-- arm9/overlays/11/asm/ov11_0224D550.s | 14 ++++----- arm9/overlays/11/asm/ov11_02254710.s | 28 ++++++++--------- arm9/overlays/14/asm/overlay_14.s | 28 ++++++++--------- arm9/overlays/16/asm/overlay_16.s | 4 +-- arm9/overlays/27/asm/overlay_27.s | 2 +- arm9/overlays/28/asm/overlay_28.s | 2 +- arm9/overlays/39/asm/overlay_39.s | 2 +- arm9/overlays/56/asm/overlay_56.s | 4 +-- arm9/overlays/69/asm/overlay_69.s | 2 +- arm9/overlays/71/asm/overlay_71.s | 42 +++++++++++++------------- arm9/overlays/80/asm/overlay_80.s | 24 +++++++-------- arm9/src/encounter.c | 2 +- arm9/src/hall_of_fame.c | 2 +- arm9/src/mail.c | 2 +- arm9/src/party.c | 10 +++--- arm9/src/pokemon.c | 10 +++--- arm9/src/scrcmd.c | 8 ++--- arm9/src/scrcmd_party.c | 28 ++++++++--------- arm9/src/script_pokemon_util.c | 12 ++++---- arm9/src/trainer_data.c | 2 +- arm9/src/unk_0205FA2C.c | 2 +- arm9/src/use_item_on_mon.c | 2 +- include/party.h | 6 ++-- 47 files changed, 208 insertions(+), 208 deletions(-) diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s index 5aea4d129..986108b1f 100644 --- a/arm9/asm/scrcmd_12.s +++ b/arm9/asm/scrcmd_12.s @@ -284,7 +284,7 @@ sub_02042F10: ; 0x02042F10 push {r3, lr} ldr r0, [r0, #0xc] bl SaveArray_Party_Get - bl GetPartyCount + bl Party_GetCount cmp r0, #0x6 bge _02042F24 mov r0, #0x1 diff --git a/arm9/asm/scrcmd_5.s b/arm9/asm/scrcmd_5.s index 53ad47d86..b1d152af4 100644 --- a/arm9/asm/scrcmd_5.s +++ b/arm9/asm/scrcmd_5.s @@ -75,7 +75,7 @@ ScrCmd_Unk024F: ; 0x020411C4 str r0, [sp, #0x0] ldr r0, [r7, #0xc] bl SaveArray_Party_Get - bl GetPartyCount + bl Party_GetCount lsl r0, r0, #0x10 lsr r6, r0, #0x10 ldr r0, _0204133C ; =0x00000000 diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index 906a1a571..39c0302d4 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -1861,7 +1861,7 @@ _02035ECC: ldrb r0, [r0, #0x0] strb r0, [r7, #0x14] ldr r0, [r7, #0x0] - bl GetPartyCount + bl Party_GetCount strb r0, [r7, #0x13] mov r0, #0x0 strh r0, [r7, #0x18] diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s index d8ba7be3e..10752d799 100644 --- a/arm9/asm/unk_020377F0.s +++ b/arm9/asm/unk_020377F0.s @@ -764,7 +764,7 @@ sub_02037C00: ; 0x02037C00 strb r0, [r4, #0x11] strb r6, [r4, #0x14] ldr r0, [r4, #0x0] - bl GetPartyCount + bl Party_GetCount strb r0, [r4, #0x13] mov r0, #0x0 strh r0, [r4, #0x18] @@ -821,7 +821,7 @@ sub_02037C7C: ; 0x02037C7C mov r0, #0x0 strb r0, [r4, #0x14] ldr r0, [r4, #0x0] - bl GetPartyCount + bl Party_GetCount strb r0, [r4, #0x13] mov r0, #0x0 strh r0, [r4, #0x18] diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s index c1ec14ba0..744b1cf44 100644 --- a/arm9/asm/unk_020476CC.s +++ b/arm9/asm/unk_020476CC.s @@ -649,13 +649,13 @@ sub_02047BC0: ; 0x02047BC0 bl AllocMonZeroed add r5, r0, #0x0 ldr r0, [sp, #0x14] - bl GetPartyCount + bl Party_GetCount add r1, r0, #0x0 ldr r0, [r6, #0x4] - bl InitPartyWithMaxSize + bl Party_InitWithMaxSize ldr r0, [sp, #0x14] mov r4, #0x0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0x0 ble _02047C98 _02047C40: @@ -692,7 +692,7 @@ _02047C82: bl sub_020479FC ldr r0, [sp, #0x14] add r4, r4, #0x1 - bl GetPartyCount + bl Party_GetCount cmp r4, r0 blt _02047C40 _02047C98: @@ -848,7 +848,7 @@ _02047DD8: str r0, [sp, #0x8] ldr r0, [r5, #0x4] add r1, r4, #0x0 - bl InitPartyWithMaxSize + bl Party_InitWithMaxSize mov r6, #0x0 cmp r4, #0x0 ble _02047E0E diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s index 3c2261e85..2acdb5e81 100644 --- a/arm9/asm/unk_02050E48.s +++ b/arm9/asm/unk_02050E48.s @@ -50,7 +50,7 @@ sub_02050E48: ; 0x02050E48 ldr r0, [sp, #0x4] strb r0, [r4, #0x14] ldr r0, [r4, #0x0] - bl GetPartyCount + bl Party_GetCount strb r0, [r4, #0x13] mov r0, #0x0 strh r0, [r4, #0x18] @@ -1380,7 +1380,7 @@ _02051938: bl SaveArray_Party_Alloc mov r1, #0x3 str r0, [r4, #0x50] - bl InitPartyWithMaxSize + bl Party_InitWithMaxSize add r0, r4, #0x0 mov r1, #0x5 add r0, #0x44 @@ -1611,7 +1611,7 @@ sub_02051AF0: ; 0x02051AF0 add r6, r0, #0x0 ldr r0, [r5, #0x50] mov r1, #0x3 - bl InitPartyWithMaxSize + bl Party_InitWithMaxSize mov r4, #0x0 _02051B04: add r1, r4, #0x0 @@ -1650,7 +1650,7 @@ sub_02051B1C: ; 0x02051B1C bl MI_CpuCopy8 ldr r0, [r6, #0x50] mov r1, #0x3 - bl InitPartyWithMaxSize + bl Party_InitWithMaxSize mov r5, #0x0 _02051B52: add r1, r5, #0x0 diff --git a/arm9/asm/unk_02054C14.s b/arm9/asm/unk_02054C14.s index f21ffeb46..b18e70aee 100644 --- a/arm9/asm/unk_02054C14.s +++ b/arm9/asm/unk_02054C14.s @@ -289,7 +289,7 @@ sub_02054DEC: ; 0x02054DEC push {r3-r7, lr} add r6, r0, #0x0 bl SaveArray_Party_Get - bl GetPartyCount + bl Party_GetCount lsl r0, r0, #0x10 lsr r5, r0, #0x10 ldr r4, _02054E2C ; =0x00000000 @@ -326,7 +326,7 @@ Save_PlayerHasAllRegisInParty: ; 0x02054E30 mov r7, #0x0 bl SaveArray_Party_Get str r0, [sp, #0x0] - bl GetPartyCount + bl Party_GetCount add r4, r0, #0x0 add r6, r7, #0x0 cmp r4, #0x0 diff --git a/arm9/asm/unk_0206BB5C.s b/arm9/asm/unk_0206BB5C.s index fe64bba62..ea3dd8a14 100644 --- a/arm9/asm/unk_0206BB5C.s +++ b/arm9/asm/unk_0206BB5C.s @@ -407,7 +407,7 @@ sub_0206BE48: ; 0x0206BE48 add r0, r1, #0x0 str r1, [sp, #0x10] str r2, [sp, #0x14] - bl GetPartyCount + bl Party_GetCount str r0, [sp, #0x20] add r6, r0, #0x0 add r0, sp, #0x30 diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index 6bc4028a6..6b486315f 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -2085,7 +2085,7 @@ _0206D854: cmp r0, #0x0 beq _0206D86C ldr r0, [r4, #0x24] - bl GetPartyCount + bl Party_GetCount cmp r0, #0x6 blt _0206D86E _0206D86C: diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index 9116c6460..5458f8191 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -1669,7 +1669,7 @@ sub_0207008C: ; 0x0207008C ldr r0, _020701DC ; =0x000005A4 ldr r0, [r5, r0] ldr r0, [r0, #0x0] - bl GetPartyCount + bl Party_GetCount ldr r1, [sp, #0x0] cmp r0, r1 bgt _020700BC diff --git a/arm9/asm/unk_020859C0.s b/arm9/asm/unk_020859C0.s index 04d2f1820..59fb20b2c 100644 --- a/arm9/asm/unk_020859C0.s +++ b/arm9/asm/unk_020859C0.s @@ -664,7 +664,7 @@ _02085DDC: ldr r0, [r6, #0x10] bl SaveArray_Party_Get str r0, [r7, #0x1c] - bl GetPartyCount + bl Party_GetCount mov r4, #0x0 str r0, [sp, #0x0] str r0, [r7, #0x0] diff --git a/arm9/asm/unk_02087D00.s b/arm9/asm/unk_02087D00.s index 3cab0dc59..019123e83 100644 --- a/arm9/asm/unk_02087D00.s +++ b/arm9/asm/unk_02087D00.s @@ -446,7 +446,7 @@ _02087FFE: strb r0, [r4, #0x11] strb r6, [r4, #0x14] ldr r0, [r4, #0x0] - bl GetPartyCount + bl Party_GetCount strb r0, [r4, #0x13] mov r1, #0x0 strh r1, [r4, #0x18] @@ -608,7 +608,7 @@ sub_02088130: ; 0x02088130 ldrb r0, [r5, #0x8] strb r0, [r4, #0x14] ldr r0, [r4, #0x0] - bl GetPartyCount + bl Party_GetCount strb r0, [r4, #0x13] mov r1, #0x0 strh r1, [r4, #0x18] diff --git a/arm9/global.inc b/arm9/global.inc index ae9c461a0..60bf34e10 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -4881,15 +4881,15 @@ .extern SaveArray_Party_sizeof .extern SaveArray_Party_Alloc .extern SaveArray_Party_Init -.extern InitPartyWithMaxSize +.extern Party_InitWithMaxSize .extern Party_AddMon .extern Party_RemoveMon -.extern GetPartyCount +.extern Party_GetCount .extern Party_GetMonByIndex .extern ReplacePartySlotWithMon .extern SwapSlotsInParty .extern CopyParty -.extern PartyHasMon +.extern Party_HasMon .extern SaveArray_Party_Get .extern SaveArray_IsNatDexEnabled .extern Pokedex_IsNatDexEnabled diff --git a/arm9/overlays/05/asm/ov05_021D80E8.s b/arm9/overlays/05/asm/ov05_021D80E8.s index cebebd396..2f5b1f820 100644 --- a/arm9/overlays/05/asm/ov05_021D80E8.s +++ b/arm9/overlays/05/asm/ov05_021D80E8.s @@ -1850,7 +1850,7 @@ ov05_021D8FD0: ; 0x021D8FD0 lsl r0, r0, #0x10 lsr r5, r0, #0x10 add r0, r6, #0 - bl GetPartyCount + bl Party_GetCount add r7, r0, #0 mov r4, #0 cmp r7, #0 diff --git a/arm9/overlays/05/asm/ov05_021EC458.s b/arm9/overlays/05/asm/ov05_021EC458.s index 5784a2d46..c1ca33aff 100644 --- a/arm9/overlays/05/asm/ov05_021EC458.s +++ b/arm9/overlays/05/asm/ov05_021EC458.s @@ -130,7 +130,7 @@ _021EC544: bl Party_RemoveMon ldr r1, _021EC578 ; =0x000001B9 add r0, r6, #0 - bl PartyHasMon + bl Party_HasMon cmp r0, #0 bne _021EC572 add r0, r7, #0 @@ -1654,7 +1654,7 @@ _021ED168: ov05_021ED190: ; 0x021ED190 push {r3, r4, r5, r6, r7, lr} add r5, r0, #0 - bl GetPartyCount + bl Party_GetCount add r6, r0, #0 mov r4, #0 cmp r6, #0 @@ -1992,7 +1992,7 @@ _021ED3F8: add r6, r0, #0 add r0, r7, #0 mov r5, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 bls _021ED490 _021ED430: @@ -2039,7 +2039,7 @@ _021ED47E: _021ED484: add r0, r7, #0 add r5, r5, #1 - bl GetPartyCount + bl Party_GetCount cmp r5, r0 blo _021ED430 _021ED490: @@ -2053,7 +2053,7 @@ _021ED498: .word 0x0000FFFF ov05_021ED49C: ; 0x021ED49C push {r3, r4, r5, r6, r7, lr} add r7, r0, #0 - bl GetPartyCount + bl Party_GetCount add r6, r0, #0 mov r5, #0 cmp r6, #0 diff --git a/arm9/overlays/06/asm/overlay_06.s b/arm9/overlays/06/asm/overlay_06.s index 7e1c2140b..5145cfe61 100644 --- a/arm9/overlays/06/asm/overlay_06.s +++ b/arm9/overlays/06/asm/overlay_06.s @@ -19800,7 +19800,7 @@ ov06_022432E4: ; 0x022432E4 add r0, r1, #0 bl SaveArray_Party_Get str r0, [sp, #4] - bl GetPartyCount + bl Party_GetCount lsl r0, r0, #0x18 lsr r1, r0, #0x18 str r1, [sp, #8] @@ -22206,7 +22206,7 @@ ov06_02244558: ; 0x02244558 add r4, r0, #0 ldrb r1, [r5, #0xe] ldr r0, [r7, #4] - bl InitPartyWithMaxSize + bl Party_InitWithMaxSize ldrb r0, [r5, #0xe] mov r6, #0 cmp r0, #0 diff --git a/arm9/overlays/07/asm/overlay_07.s b/arm9/overlays/07/asm/overlay_07.s index 01ce4a805..8d9f321a7 100644 --- a/arm9/overlays/07/asm/overlay_07.s +++ b/arm9/overlays/07/asm/overlay_07.s @@ -2305,7 +2305,7 @@ ov07_02213104: ; 0x02213104 str r1, [sp] str r2, [sp, #4] add r7, r3, #0 - bl GetPartyCount + bl Party_GetCount lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp, #8] @@ -3643,7 +3643,7 @@ ov07_02213BEC: ; 0x02213BEC add r0, r1, #0 str r1, [sp] add r5, r2, #0 - bl GetPartyCount + bl Party_GetCount lsl r0, r0, #0x10 lsr r0, r0, #0x10 str r0, [sp, #8] diff --git a/arm9/overlays/09/asm/overlay_09.s b/arm9/overlays/09/asm/overlay_09.s index 55fb6efdb..ce91ce84a 100644 --- a/arm9/overlays/09/asm/overlay_09.s +++ b/arm9/overlays/09/asm/overlay_09.s @@ -2423,7 +2423,7 @@ ov09_022131C8: ; 0x022131C8 ldr r0, [sp] ldr r0, [r0] ldr r0, [r0] - bl GetPartyCount + bl Party_GetCount cmp r0, #0 bgt _022131E2 b _02213476 @@ -2724,7 +2724,7 @@ _0221345A: ldr r0, [sp] ldr r0, [r0] ldr r0, [r0] - bl GetPartyCount + bl Party_GetCount ldr r1, [sp, #8] cmp r1, r0 bge _02213476 @@ -6734,7 +6734,7 @@ ov09_022155D0: ; 0x022155D0 ldr r0, [r5] mov r4, #0 ldr r0, [r0] - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _02215656 add r0, r4, #0 @@ -6788,7 +6788,7 @@ _0221563E: add r7, #0x50 ldr r0, [r0] add r4, r4, #1 - bl GetPartyCount + bl Party_GetCount cmp r4, r0 blt _022155EE _02215656: @@ -10495,7 +10495,7 @@ ov09_02217580: ; 0x02217580 ldr r0, [r5] mov r4, #0 ldr r0, [r0] - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _022175D8 add r7, r5, #4 @@ -10528,7 +10528,7 @@ _022175C6: lsr r4, r0, #0x10 ldr r0, [r5] ldr r0, [r0] - bl GetPartyCount + bl Party_GetCount cmp r4, r0 blt _02217594 _022175D8: @@ -13506,7 +13506,7 @@ _02218DF2: bl ov11_02230290 add r4, r0, #0 add r0, r6, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #6 bne _02218E32 add r0, r4, #0 diff --git a/arm9/overlays/11/asm/ov11_0222D5C0_1.s b/arm9/overlays/11/asm/ov11_0222D5C0_1.s index 0b7f59bf2..2268a3cb1 100644 --- a/arm9/overlays/11/asm/ov11_0222D5C0_1.s +++ b/arm9/overlays/11/asm/ov11_0222D5C0_1.s @@ -2014,7 +2014,7 @@ _0222E734: _0222E760: ldr r0, [r7, #0x68] mov r5, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _0222E7AA _0222E76C: @@ -2042,7 +2042,7 @@ _0222E76C: _0222E79E: ldr r0, [r7, #0x68] add r5, r5, #1 - bl GetPartyCount + bl Party_GetCount cmp r5, r0 blt _0222E76C _0222E7AA: @@ -2119,7 +2119,7 @@ _0222E810: _0222E83C: ldr r0, [r7, #0x68] mov r5, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _0222E886 _0222E848: @@ -2147,7 +2147,7 @@ _0222E848: _0222E87A: ldr r0, [r7, #0x68] add r5, r5, #1 - bl GetPartyCount + bl Party_GetCount cmp r5, r0 blt _0222E848 _0222E886: @@ -2234,7 +2234,7 @@ _0222E920: add r7, r4, r0 ldr r0, [r7, #0x68] mov r6, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _0222E9B8 _0222E938: @@ -2292,7 +2292,7 @@ _0222E984: _0222E9AC: ldr r0, [r7, #0x68] add r6, r6, #1 - bl GetPartyCount + bl Party_GetCount cmp r6, r0 blt _0222E938 _0222E9B8: @@ -2345,7 +2345,7 @@ _0222EA0C: bl CopyParty ldr r0, [r7, #0x68] mov r5, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _0222EA60 _0222EA22: @@ -2373,7 +2373,7 @@ _0222EA22: _0222EA54: ldr r0, [r7, #0x68] add r5, r5, #1 - bl GetPartyCount + bl Party_GetCount cmp r5, r0 blt _0222EA22 _0222EA60: @@ -2572,7 +2572,7 @@ _0222EBC6: _0222EBEA: ldr r0, [r7, #0x68] mov r5, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _0222EC34 _0222EBF6: @@ -2600,7 +2600,7 @@ _0222EBF6: _0222EC28: ldr r0, [r7, #0x68] add r5, r5, #1 - bl GetPartyCount + bl Party_GetCount cmp r5, r0 blt _0222EBF6 _0222EC34: @@ -2686,7 +2686,7 @@ _0222ECC8: add r7, r4, r0 ldr r0, [r7, #0x68] mov r6, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _0222ED60 _0222ECE0: @@ -2744,7 +2744,7 @@ _0222ED2C: _0222ED54: ldr r0, [r7, #0x68] add r6, r6, #1 - bl GetPartyCount + bl Party_GetCount cmp r6, r0 blt _0222ECE0 _0222ED60: @@ -2800,7 +2800,7 @@ _0222EDBC: bl CopyParty ldr r0, [r7, #0x68] mov r5, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _0222EE10 _0222EDD2: @@ -2828,7 +2828,7 @@ _0222EDD2: _0222EE04: ldr r0, [r7, #0x68] add r5, r5, #1 - bl GetPartyCount + bl Party_GetCount cmp r5, r0 blt _0222EDD2 _0222EE10: @@ -2885,7 +2885,7 @@ _0222EE5A: _0222EE7C: ldr r0, [r4, #0x68] mov r5, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _0222EEAC ldr r6, _0222EEEC ; =0x00002404 @@ -2901,13 +2901,13 @@ _0222EE8C: bl MonApplyFriendshipMod ldr r0, [r4, #0x68] add r5, r5, #1 - bl GetPartyCount + bl Party_GetCount cmp r5, r0 blt _0222EE8C _0222EEAC: ldr r0, [r4, #0x70] mov r5, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _0222EEDC ldr r6, _0222EEEC ; =0x00002404 @@ -2923,7 +2923,7 @@ _0222EEBC: bl MonApplyFriendshipMod ldr r0, [r4, #0x70] add r5, r5, #1 - bl GetPartyCount + bl Party_GetCount cmp r5, r0 blt _0222EEBC _0222EEDC: diff --git a/arm9/overlays/11/asm/ov11_0222FF68.s b/arm9/overlays/11/asm/ov11_0222FF68.s index 879cd7b16..58a8985da 100644 --- a/arm9/overlays/11/asm/ov11_0222FF68.s +++ b/arm9/overlays/11/asm/ov11_0222FF68.s @@ -94,7 +94,7 @@ _0222FFE6: lsl r0, r4, #2 add r0, r5, r0 ldr r0, [r0, #0x68] - bl GetPartyCount + bl Party_GetCount pop {r3, r4, r5, pc} _0222FFF2: ldr r1, [r5, #0x2c] @@ -105,13 +105,13 @@ _0222FFF2: lsr r0, r0, #0x1d add r0, r5, r0 ldr r0, [r0, #0x68] - bl GetPartyCount + bl Party_GetCount pop {r3, r4, r5, pc} _02230008: lsl r0, r4, #2 add r0, r5, r0 ldr r0, [r0, #0x68] - bl GetPartyCount + bl Party_GetCount pop {r3, r4, r5, pc} thumb_func_start ov11_02230014 diff --git a/arm9/overlays/11/asm/ov11_02232264.s b/arm9/overlays/11/asm/ov11_02232264.s index 332384c40..8f56c2096 100644 --- a/arm9/overlays/11/asm/ov11_02232264.s +++ b/arm9/overlays/11/asm/ov11_02232264.s @@ -2917,7 +2917,7 @@ _02233938: add r4, r0, #0 add r0, r7, #0 bl ov11_0222FF88 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _022339C6 _02233950: @@ -2971,7 +2971,7 @@ _022339B4: mov r1, #0 add r4, r4, #1 bl ov11_0222FF88 - bl GetPartyCount + bl Party_GetCount cmp r4, r0 blt _02233950 _022339C6: @@ -15691,7 +15691,7 @@ _02239DFA: bl ov11_0222FF7C add r0, r7, #0 mov r4, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _02239E68 _02239E2A: @@ -15719,7 +15719,7 @@ _02239E2A: _02239E5C: add r0, r7, #0 add r4, r4, #1 - bl GetPartyCount + bl Party_GetCount cmp r4, r0 blt _02239E2A _02239E68: @@ -15739,7 +15739,7 @@ _02239E76: _02239E82: ldr r0, [sp, #8] mov r4, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _02239ECC ldr r7, _02239F48 ; =0x000001EE @@ -15767,7 +15767,7 @@ _02239E90: _02239EC0: ldr r0, [sp, #8] add r4, r4, #1 - bl GetPartyCount + bl Party_GetCount cmp r4, r0 blt _02239E90 _02239ECC: @@ -15787,7 +15787,7 @@ _02239EDA: bl ov11_0222FF7C add r0, r7, #0 mov r4, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _02239F36 _02239EF8: @@ -15815,7 +15815,7 @@ _02239EF8: _02239F2A: add r0, r7, #0 add r4, r4, #1 - bl GetPartyCount + bl Party_GetCount cmp r4, r0 blt _02239EF8 _02239F36: diff --git a/arm9/overlays/11/asm/ov11_0223D1DC.s b/arm9/overlays/11/asm/ov11_0223D1DC.s index 244326048..e46bea518 100644 --- a/arm9/overlays/11/asm/ov11_0223D1DC.s +++ b/arm9/overlays/11/asm/ov11_0223D1DC.s @@ -9868,7 +9868,7 @@ _02241DD2: bl ov11_0222FF7C add r0, r6, #0 add r5, r7, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _02241E4A ldr r0, [sp, #0x2c] @@ -9909,7 +9909,7 @@ _02241DFE: _02241E3E: add r0, r6, #0 add r5, r5, #1 - bl GetPartyCount + bl Party_GetCount cmp r5, r0 blt _02241DFE _02241E4A: @@ -9961,7 +9961,7 @@ _02241E8A: bl ov11_0222FF7C add r0, r6, #0 add r5, r7, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _02241EF2 _02241EB4: @@ -9989,7 +9989,7 @@ _02241EB4: _02241EE6: add r0, r6, #0 add r5, r5, #1 - bl GetPartyCount + bl Party_GetCount cmp r5, r0 blt _02241EB4 _02241EF2: @@ -10166,7 +10166,7 @@ _0224200C: bl ov11_0222FF7C add r0, r6, #0 add r4, r7, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _02242094 _02242056: @@ -10194,7 +10194,7 @@ _02242056: _02242088: add r0, r6, #0 add r4, r4, #1 - bl GetPartyCount + bl Party_GetCount cmp r4, r0 blt _02242056 _02242094: @@ -10246,7 +10246,7 @@ _022420CA: str r0, [sp, #0x14] add r0, r7, #0 add r4, r5, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _0224213C _022420FE: @@ -10274,13 +10274,13 @@ _022420FE: _02242130: add r0, r7, #0 add r4, r4, #1 - bl GetPartyCount + bl Party_GetCount cmp r4, r0 blt _022420FE _0224213C: ldr r0, [sp, #0x18] mov r4, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _02242186 ldr r7, _02242340 ; =0x000001EE @@ -10308,7 +10308,7 @@ _0224214A: _0224217A: ldr r0, [sp, #0x18] add r4, r4, #1 - bl GetPartyCount + bl Party_GetCount cmp r4, r0 blt _0224214A _02242186: @@ -10350,7 +10350,7 @@ _022421B0: str r0, [sp, #0x10] add r0, r6, #0 add r4, r7, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _0224221A _022421DC: @@ -10378,7 +10378,7 @@ _022421DC: _0224220E: add r0, r6, #0 add r4, r4, #1 - bl GetPartyCount + bl Party_GetCount cmp r4, r0 blt _022421DC _0224221A: diff --git a/arm9/overlays/11/asm/ov11_02242B78.s b/arm9/overlays/11/asm/ov11_02242B78.s index 4be3a6d43..98028b957 100644 --- a/arm9/overlays/11/asm/ov11_02242B78.s +++ b/arm9/overlays/11/asm/ov11_02242B78.s @@ -5300,7 +5300,7 @@ _02245384: mov r6, #0 add r5, r0, #0 add r4, r6, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _022453C6 _022453A4: @@ -5316,7 +5316,7 @@ _022453A4: _022453BA: add r0, r5, #0 add r4, r4, #1 - bl GetPartyCount + bl Party_GetCount cmp r4, r0 blt _022453A4 _022453C6: @@ -5357,7 +5357,7 @@ _022453F8: mov r6, #0 add r5, r0, #0 add r4, r6, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _0224543A _02245418: @@ -5373,7 +5373,7 @@ _02245418: _0224542E: add r0, r5, #0 add r4, r4, #1 - bl GetPartyCount + bl Party_GetCount cmp r4, r0 blt _02245418 _0224543A: diff --git a/arm9/overlays/11/asm/ov11_0224CA64.s b/arm9/overlays/11/asm/ov11_0224CA64.s index 8bfb90f9c..2866a49f2 100644 --- a/arm9/overlays/11/asm/ov11_0224CA64.s +++ b/arm9/overlays/11/asm/ov11_0224CA64.s @@ -1307,7 +1307,7 @@ _0224D452: bl ov11_0222FF88 add r6, r0, #0 mov r5, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _0224D4C0 _0224D466: @@ -1348,7 +1348,7 @@ _0224D4A8: _0224D4B4: add r0, r6, #0 add r5, r5, #1 - bl GetPartyCount + bl Party_GetCount cmp r5, r0 blt _0224D466 _0224D4C0: diff --git a/arm9/overlays/11/asm/ov11_0224D550.s b/arm9/overlays/11/asm/ov11_0224D550.s index dd3e35be9..010e2c1f1 100644 --- a/arm9/overlays/11/asm/ov11_0224D550.s +++ b/arm9/overlays/11/asm/ov11_0224D550.s @@ -8047,10 +8047,10 @@ _02251662: mov r1, #6 ldr r0, [r0, #4] ldr r0, [r0] - bl InitPartyWithMaxSize + bl Party_InitWithMaxSize ldr r0, [sp, #0x14] mov r6, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _022516B0 mov r0, #6 @@ -8075,7 +8075,7 @@ _02251680: strb r0, [r1] ldr r0, [sp, #0x14] add r6, r6, #1 - bl GetPartyCount + bl Party_GetCount cmp r6, r0 blt _02251680 _022516B0: @@ -9579,7 +9579,7 @@ _022522C4: bl ov11_0222FF88 str r0, [sp, #0x10] mov r5, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _0225230E mov r0, #6 @@ -9602,7 +9602,7 @@ _022522E2: ldr r0, [sp, #0x10] add r6, r6, #1 add r5, r5, #1 - bl GetPartyCount + bl Party_GetCount cmp r5, r0 blt _022522E2 _0225230E: @@ -9814,7 +9814,7 @@ _0225249A: bl ov11_0222FF88 str r0, [sp, #8] mov r4, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _022524FE ldr r0, [sp, #4] @@ -9839,7 +9839,7 @@ _022524D0: _022524F2: ldr r0, [sp, #8] add r4, r4, #1 - bl GetPartyCount + bl Party_GetCount cmp r4, r0 blt _022524D0 _022524FE: diff --git a/arm9/overlays/11/asm/ov11_02254710.s b/arm9/overlays/11/asm/ov11_02254710.s index ddc0ea2d6..930ea36b7 100644 --- a/arm9/overlays/11/asm/ov11_02254710.s +++ b/arm9/overlays/11/asm/ov11_02254710.s @@ -1425,7 +1425,7 @@ _02255210: bl ov11_0222FF88 str r0, [sp, #0x24] mov r6, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _022552A6 mov r0, #6 @@ -1491,7 +1491,7 @@ _02255298: ldr r0, [sp, #0x24] add r7, r7, #1 add r6, r6, #1 - bl GetPartyCount + bl Party_GetCount cmp r6, r0 blt _0225523A _022552A6: @@ -1531,7 +1531,7 @@ _022552E2: bl ov11_0222FF88 str r0, [sp, #0x10] mov r5, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _0225535E add r1, r4, #0 @@ -1582,7 +1582,7 @@ _02255350: ldr r0, [sp, #0x10] add r6, r6, #1 add r5, r5, #1 - bl GetPartyCount + bl Party_GetCount cmp r5, r0 blt _02255304 _0225535E: @@ -1606,7 +1606,7 @@ _0225537C: bl ov11_0222FF88 str r0, [sp, #0x14] mov r5, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _02255482 add r1, r4, #0 @@ -1658,7 +1658,7 @@ _022553EC: ldr r0, [sp, #0x14] add r6, r6, #1 add r5, r5, #1 - bl GetPartyCount + bl Party_GetCount cmp r5, r0 blt _022553A0 b _02255482 @@ -1673,7 +1673,7 @@ _022553FC: bl ov11_0222FF88 str r0, [sp, #0x18] mov r5, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _02255482 add r1, r4, #0 @@ -1724,7 +1724,7 @@ _02255474: ldr r0, [sp, #0x18] add r6, r6, #1 add r5, r5, #1 - bl GetPartyCount + bl Party_GetCount cmp r5, r0 blt _02255428 _02255482: @@ -4614,7 +4614,7 @@ _02256A60: mov r4, #0 str r0, [sp, #0x10] add r7, r4, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _02256AE0 mov r0, #6 @@ -4667,7 +4667,7 @@ _02256AD2: ldr r0, [sp, #0x10] add r6, r6, #1 add r7, r7, #1 - bl GetPartyCount + bl Party_GetCount cmp r7, r0 blt _02256A80 _02256AE0: @@ -4677,7 +4677,7 @@ _02256AE0: str r0, [sp, #8] mov r4, #3 mov r6, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 bgt _02256AF8 b _02256BFA @@ -4732,7 +4732,7 @@ _02256B54: ldr r0, [sp, #8] add r7, r7, #1 add r6, r6, #1 - bl GetPartyCount + bl Party_GetCount cmp r6, r0 blt _02256B02 add sp, #0x20 @@ -4755,7 +4755,7 @@ _02256B7A: mov r4, #0 str r0, [sp, #0xc] add r7, r4, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _02256BFA ldr r0, [sp, #0x38] @@ -4808,7 +4808,7 @@ _02256BEC: ldr r0, [sp, #0xc] add r6, r6, #1 add r7, r7, #1 - bl GetPartyCount + bl Party_GetCount cmp r7, r0 blt _02256B9A _02256BFA: diff --git a/arm9/overlays/14/asm/overlay_14.s b/arm9/overlays/14/asm/overlay_14.s index 4a4d99d01..959b16bc6 100644 --- a/arm9/overlays/14/asm/overlay_14.s +++ b/arm9/overlays/14/asm/overlay_14.s @@ -116,7 +116,7 @@ StoragePC_Overlay_Teardown: ; 0x021D75B8 lsl r1, r1, #2 ldr r0, [r4, r1] add r1, #0x95 - bl PartyHasMon + bl Party_HasMon cmp r0, #0 bne _021D75DE mov r0, #0x47 @@ -1905,7 +1905,7 @@ _021D8476: add r0, #0x19 strb r2, [r4, r0] ldr r0, [r4, r1] - bl GetPartyCount + bl Party_GetCount ldr r1, _021D8504 ; =0x0000013F strb r0, [r4, r1] add r0, r4, #0 @@ -4031,7 +4031,7 @@ _021D95CA: mov r0, #0x49 lsl r0, r0, #2 ldr r0, [r5, r0] - bl GetPartyCount + bl Party_GetCount sub r0, r0, #1 cmp r6, r0 beq _021D9610 @@ -4238,7 +4238,7 @@ _021D979C: mov r0, #0x49 lsl r0, r0, #2 ldr r0, [r4, r0] - bl GetPartyCount + bl Party_GetCount cmp r0, #6 beq _021D97F2 mov r0, #0x45 @@ -4699,7 +4699,7 @@ ov14_021D9B84: ; 0x021D9B84 lsl r1, r1, #2 str r0, [sp] ldr r0, [r0, r1] - bl GetPartyCount + bl Party_GetCount mov r6, #0 add r5, r6, #0 str r0, [sp, #4] @@ -5351,7 +5351,7 @@ _021DA0A4: _021DA0AE: add r0, r1, #0 ldr r0, [r0, #0x18] - bl GetPartyCount + bl Party_GetCount str r0, [sp, #0x10] mov r0, #0 str r0, [sp, #8] @@ -8416,7 +8416,7 @@ ov14_021DB8D0: ; 0x021DB8D0 mov r0, #0x49 lsl r0, r0, #2 ldr r0, [r5, r0] - bl GetPartyCount + bl Party_GetCount strb r0, [r4, #8] mov r0, #8 ldrsb r0, [r4, r0] @@ -8495,7 +8495,7 @@ _021DB96C: mov r0, #0x49 lsl r0, r0, #2 ldr r0, [r5, r0] - bl GetPartyCount + bl Party_GetCount cmp r6, r0 bge _021DB98E mov r0, #0x49 @@ -8896,7 +8896,7 @@ _021DBC70: mov r0, #0x49 lsl r0, r0, #2 ldr r0, [r5, r0] - bl GetPartyCount + bl Party_GetCount add r1, r0, #0 mov r0, #0x49 lsl r0, r0, #2 @@ -23402,7 +23402,7 @@ ov14_021E2C7C: ; 0x021E2C7C add r6, r0, #0 ldr r0, [r6, #0xc] ldr r0, [r0, #4] - bl GetPartyCount + bl Party_GetCount add r1, r6, #0 add r1, #0x28 ldrb r4, [r1] @@ -23570,7 +23570,7 @@ ov14_021E2DB4: ; 0x021E2DB4 add r5, r0, #0 ldr r0, [r5, #0xc] ldr r0, [r0, #4] - bl GetPartyCount + bl Party_GetCount sub r4, r0, #1 add r0, r5, #0 add r0, #0x28 @@ -23975,7 +23975,7 @@ ov14_021E30C0: ; 0x021E30C0 str r1, [sp] ldr r0, [r0, #4] str r2, [sp, #4] - bl GetPartyCount + bl Party_GetCount sub r6, r0, #1 add r4, r5, #0 mov r0, #0x34 @@ -24281,7 +24281,7 @@ _021E330E: ldr r0, [sp, #0x24] ldr r0, [r0, #0xc] ldr r0, [r0, #4] - bl GetPartyCount + bl Party_GetCount mov r4, #0 str r0, [sp, #0x20] cmp r0, #0 @@ -24347,7 +24347,7 @@ ov14_021E3390: ; 0x021E3390 add r7, r0, #0 ldr r0, [r7, #0xc] ldr r0, [r0, #4] - bl GetPartyCount + bl Party_GetCount mov r6, #0 str r0, [sp] cmp r0, #0 diff --git a/arm9/overlays/16/asm/overlay_16.s b/arm9/overlays/16/asm/overlay_16.s index 6c95c680c..16870d66d 100644 --- a/arm9/overlays/16/asm/overlay_16.s +++ b/arm9/overlays/16/asm/overlay_16.s @@ -62886,7 +62886,7 @@ _021F4A94: bl ov11_0222FF88 add r7, r0, #0 mov r5, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _021F4AF2 _021F4AA8: @@ -62920,7 +62920,7 @@ _021F4AA8: _021F4AE6: add r0, r7, #0 add r5, r5, #1 - bl GetPartyCount + bl Party_GetCount cmp r5, r0 blt _021F4AA8 _021F4AF2: diff --git a/arm9/overlays/27/asm/overlay_27.s b/arm9/overlays/27/asm/overlay_27.s index d7e598678..858429f17 100644 --- a/arm9/overlays/27/asm/overlay_27.s +++ b/arm9/overlays/27/asm/overlay_27.s @@ -281,7 +281,7 @@ ov27_02254A48: ; 0x02254A48 str r0, [sp] add r0, r1, #0 str r1, [sp, #4] - bl GetPartyCount + bl Party_GetCount ldr r1, [sp] mov r6, #0 str r0, [r1] diff --git a/arm9/overlays/28/asm/overlay_28.s b/arm9/overlays/28/asm/overlay_28.s index 87a765eae..c19d23778 100644 --- a/arm9/overlays/28/asm/overlay_28.s +++ b/arm9/overlays/28/asm/overlay_28.s @@ -61,7 +61,7 @@ ov28_0225489C: ; 0x0225489C mov r1, #0 str r0, [sp, #4] str r1, [sp] - bl GetPartyCount + bl Party_GetCount mov r6, #0 str r0, [r7, #4] cmp r0, #0 diff --git a/arm9/overlays/39/asm/overlay_39.s b/arm9/overlays/39/asm/overlay_39.s index 653a68a98..0600e23a9 100644 --- a/arm9/overlays/39/asm/overlay_39.s +++ b/arm9/overlays/39/asm/overlay_39.s @@ -51,7 +51,7 @@ ov39_0225489C: ; 0x0225489C bl ov20_02252C40 bl SaveArray_Party_Get str r0, [sp, #0x10] - bl GetPartyCount + bl Party_GetCount ldr r1, [sp, #4] mov r6, #0 add r1, #0x34 diff --git a/arm9/overlays/56/asm/overlay_56.s b/arm9/overlays/56/asm/overlay_56.s index 9b51ae3f7..7cf28f4bf 100644 --- a/arm9/overlays/56/asm/overlay_56.s +++ b/arm9/overlays/56/asm/overlay_56.s @@ -212,7 +212,7 @@ ov56_02211F88: ; 0x02211F88 ldr r0, [r0] bl SaveArray_Party_Get str r0, [sp] - bl GetPartyCount + bl Party_GetCount mov r5, #0 add r7, r0, #0 add r4, r5, #0 @@ -1992,7 +1992,7 @@ ov56_02212E0C: ; 0x02212E0C bl sub_02029AFC str r0, [sp, #8] ldr r0, [sp, #0xc] - bl GetPartyCount + bl Party_GetCount mov r6, #0 str r0, [sp, #4] cmp r0, #0 diff --git a/arm9/overlays/69/asm/overlay_69.s b/arm9/overlays/69/asm/overlay_69.s index 1d95ee9d7..da9d0f426 100644 --- a/arm9/overlays/69/asm/overlay_69.s +++ b/arm9/overlays/69/asm/overlay_69.s @@ -50,7 +50,7 @@ HOF_OverlayInit: ; 0x0222D5C0 str r0, [r4, #4] ldr r0, [r4, #0xc] ldr r0, [r0, #4] - bl GetPartyCount + bl Party_GetCount add r6, r0, #0 mov r5, #0 cmp r6, #0 diff --git a/arm9/overlays/71/asm/overlay_71.s b/arm9/overlays/71/asm/overlay_71.s index d1cb5a086..565e70044 100644 --- a/arm9/overlays/71/asm/overlay_71.s +++ b/arm9/overlays/71/asm/overlay_71.s @@ -420,11 +420,11 @@ ov71_0222D93C: ; 0x0222D93C bl ov71_0222DB94 ldr r0, _0222D9B8 ; =0x00002218 ldr r0, [r5, r0] - bl GetPartyCount + bl Party_GetCount add r4, r0, #0 ldr r0, _0222D9BC ; =0x0000221C ldr r0, [r5, r0] - bl GetPartyCount + bl Party_GetCount add r2, r0, #0 mov r0, #0x5d lsl r0, r0, #2 @@ -644,7 +644,7 @@ ov71_0222DB5C: ; 0x0222DB5C add r0, r5, #0 add r6, r2, #0 mov r4, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _0222DB92 _0222DB70: @@ -658,7 +658,7 @@ _0222DB70: bl BufferBoxMonNickname add r0, r5, #0 add r4, r4, #1 - bl GetPartyCount + bl Party_GetCount cmp r4, r0 blt _0222DB70 _0222DB92: @@ -676,7 +676,7 @@ ov71_0222DB94: ; 0x0222DB94 str r3, [sp, #0x10] ldr r6, [sp, #0x28] mov r4, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _0222DBE6 add r7, r6, #1 @@ -701,7 +701,7 @@ _0222DBB0: ldr r0, [sp, #0x10] add r5, #0x10 add r4, r4, #1 - bl GetPartyCount + bl Party_GetCount cmp r4, r0 blt _0222DBB0 _0222DBE6: @@ -718,7 +718,7 @@ ov71_0222DBEC: ; 0x0222DBEC str r1, [sp, #0xc] str r2, [sp, #0x20] mov r7, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #0 bgt _0222DC02 b _0222DD10 @@ -847,7 +847,7 @@ _0222DCE2: _0222DD02: ldr r0, [sp, #8] add r7, r7, #1 - bl GetPartyCount + bl Party_GetCount cmp r7, r0 bge _0222DD10 b _0222DC0C @@ -1086,7 +1086,7 @@ _0222DED6: blt _0222DED6 ldr r0, _0222E0F8 ; =0x00002218 ldr r0, [r4, r0] - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _0222DF12 mov r0, #0x69 @@ -1103,14 +1103,14 @@ _0222DEF4: ldr r0, [r4, r7] add r6, #0x10 add r5, r5, #1 - bl GetPartyCount + bl Party_GetCount cmp r5, r0 blt _0222DEF4 _0222DF12: ldr r0, _0222E0FC ; =0x0000221C mov r5, #0 ldr r0, [r4, r0] - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _0222DF48 mov r0, #0x69 @@ -1128,7 +1128,7 @@ _0222DF28: bl ov71_0222E118 ldr r0, [r4, r7] add r5, r5, #1 - bl GetPartyCount + bl Party_GetCount cmp r5, r0 blt _0222DF28 _0222DF48: @@ -1675,7 +1675,7 @@ ov71_0222E3D4: ; 0x0222E3D4 ldr r0, _0222E42C ; =0x00002218 mov r4, #0 ldr r0, [r6, r0] - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _0222E402 ldr r7, _0222E42C ; =0x00002218 @@ -1688,14 +1688,14 @@ _0222E3EA: ldr r0, [r6, r7] add r5, r5, #4 add r4, r4, #1 - bl GetPartyCount + bl Party_GetCount cmp r4, r0 blt _0222E3EA _0222E402: ldr r0, _0222E430 ; =0x0000221C mov r5, #0 ldr r0, [r6, r0] - bl GetPartyCount + bl Party_GetCount cmp r0, #0 ble _0222E42A ldr r7, _0222E430 ; =0x0000221C @@ -1707,7 +1707,7 @@ _0222E414: ldr r0, [r6, r7] add r4, r4, #4 add r5, r5, #1 - bl GetPartyCount + bl Party_GetCount cmp r5, r0 blt _0222E414 _0222E42A: @@ -2151,7 +2151,7 @@ ov71_0222E76C: ; 0x0222E76C str r0, [r5, r1] ldr r0, [r5, r1] mov r1, #6 - bl InitPartyWithMaxSize + bl Party_InitWithMaxSize bl SaveArray_Party_sizeof add r2, r0, #0 ldr r0, _0222E844 ; =0x0000221C @@ -3864,7 +3864,7 @@ ov71_0222F59C: ; 0x0222F59C str r0, [r5, #0xc] ldr r0, [r5, #8] ldr r0, [r0, #8] - bl GetPartyCount + bl Party_GetCount strb r0, [r5, #0x1f] mov r0, #0 str r0, [r5, #0x34] @@ -3880,7 +3880,7 @@ _0222F5CC: ldr r1, [r5, r0] str r1, [r5, #0xc] ldr r0, [r5, r0] - bl GetPartyCount + bl Party_GetCount strb r0, [r5, #0x1f] bl sub_02031190 mov r2, #1 @@ -6375,7 +6375,7 @@ _02230A40: ldr r0, [sp, #4] ldr r1, _02230AE0 ; =0x000001B9 str r6, [r5, #0x2c] - bl PartyHasMon + bl Party_HasMon cmp r0, #0 bne _02230A98 ldr r0, [r5, #0x10] @@ -6538,7 +6538,7 @@ ov71_02230BC4: ; 0x02230BC4 ldr r0, _02230C00 ; =0x00002218 mov r4, #0 ldr r0, [r5, r0] - bl GetPartyCount + bl Party_GetCount add r3, r4, #0 cmp r0, #0 ble _02230BF0 diff --git a/arm9/overlays/80/asm/overlay_80.s b/arm9/overlays/80/asm/overlay_80.s index c590f4333..88d5df9c9 100644 --- a/arm9/overlays/80/asm/overlay_80.s +++ b/arm9/overlays/80/asm/overlay_80.s @@ -4660,7 +4660,7 @@ _0222FA26: beq _0222FA80 ldr r0, [r5] ldr r0, [r0, #8] - bl GetPartyCount + bl Party_GetCount cmp r0, #6 bne _0222FA80 ldr r0, _0222FAE4 ; =0x00000F0F @@ -10458,7 +10458,7 @@ ov80_02232990: ; 0x02232990 beq _022329E6 ldr r0, [r4] ldr r0, [r0, #8] - bl GetPartyCount + bl Party_GetCount cmp r0, #6 bne _022329E6 ldr r0, _02232A2C ; =0x00000F0F @@ -11031,7 +11031,7 @@ _02232E22: _02232E3A: ldr r0, [r5] ldr r0, [r0, #8] - bl GetPartyCount + bl Party_GetCount mov r4, #0 str r0, [sp, #0x14] cmp r0, #0 @@ -11221,7 +11221,7 @@ ov80_02232FB8: ; 0x02232FB8 cmp r0, #0 beq _02232FEA add r0, r5, #0 - bl GetPartyCount + bl Party_GetCount sub r0, r0, #1 cmp r4, r0 ble _02232FDC @@ -11251,7 +11251,7 @@ ov80_02232FF8: ; 0x02232FF8 cmp r0, #0 beq _02233014 add r0, r4, #0 - bl GetPartyCount + bl Party_GetCount cmp r0, #2 bge _02233014 mov r0, #0 @@ -16121,7 +16121,7 @@ _02235590: ldr r0, [r5] ldr r1, _022355EC ; =0x000001B9 ldr r0, [r0, #8] - bl PartyHasMon + bl Party_HasMon cmp r0, #0 bne _022355DC ldr r0, [r5] @@ -16161,7 +16161,7 @@ ov80_022355F0: ; 0x022355F0 str r0, [sp, #0x20] ldr r0, [r5] ldr r0, [r0, #8] - bl GetPartyCount + bl Party_GetCount cmp r0, #6 bne _02235624 mov r0, #0 @@ -16189,7 +16189,7 @@ _02235640: bl Party_AddMon ldr r0, [r5] ldr r0, [r0, #8] - bl GetPartyCount + bl Party_GetCount add r1, r5, #0 mov r2, #0x12 add r1, #0xcc @@ -16246,7 +16246,7 @@ ov80_022356AC: ; 0x022356AC str r0, [sp, #0x20] ldr r0, [r5] ldr r0, [r0, #8] - bl GetPartyCount + bl Party_GetCount cmp r0, #6 bne _022356D2 mov r0, #0 @@ -16268,7 +16268,7 @@ _022356D2: bl Party_AddMon ldr r0, [r5] ldr r0, [r0, #8] - bl GetPartyCount + bl Party_GetCount add r1, r5, #0 mov r2, #0x12 add r1, #0xcc @@ -16395,7 +16395,7 @@ ov80_022357DC: ; 0x022357DC beq _022357FA ldr r0, [r4] ldr r0, [r0, #8] - bl GetPartyCount + bl Party_GetCount cmp r0, #6 bne _022357FA mov r0, #2 @@ -16409,7 +16409,7 @@ _022357FA: bne _02235816 ldr r0, [r4] ldr r0, [r0, #8] - bl GetPartyCount + bl Party_GetCount cmp r0, #6 bne _02235816 mov r0, #1 diff --git a/arm9/src/encounter.c b/arm9/src/encounter.c index c97897654..d29ec6ce4 100644 --- a/arm9/src/encounter.c +++ b/arm9/src/encounter.c @@ -482,7 +482,7 @@ static BOOL Task_SafariEncounter(TaskManager *taskManager) { } else { PCStorage *pc = Save_PCStorage_Get(fieldSystem->saveData); Party *party = SaveArray_Party_Get(fieldSystem->saveData); - if (PCStorage_FindFirstBoxWithEmptySlot(pc) == NUM_BOXES && GetPartyCount(party) == PARTY_SIZE) { + if (PCStorage_FindFirstBoxWithEmptySlot(pc) == NUM_BOXES && Party_GetCount(party) == PARTY_SIZE) { QueueScript(taskManager, 0x2276, NULL, NULL); } } diff --git a/arm9/src/hall_of_fame.c b/arm9/src/hall_of_fame.c index 3c51b50de..be06fae1e 100644 --- a/arm9/src/hall_of_fame.c +++ b/arm9/src/hall_of_fame.c @@ -25,7 +25,7 @@ void Save_HOF_RecordParty(struct HallOfFame * hof, struct Party * party, RTCDate if (hof->num_total < 9999) { struct HOFParty * hof_party = &hof->parties[hof->next_record]; - int nmons = GetPartyCount(party); + int nmons = Party_GetCount(party); struct String * str = String_New(POKEMON_NAME_LENGTH + 1, HEAP_ID_DEFAULT); MI_CpuClear16(hof_party->party, 6 * sizeof(struct HOFMon)); int i, j; diff --git a/arm9/src/mail.c b/arm9/src/mail.c index 06bf087d4..5c53a83da 100644 --- a/arm9/src/mail.c +++ b/arm9/src/mail.c @@ -66,7 +66,7 @@ void Mail_SetNewMessageDetails(struct Mail * mail, u8 type, u8 monIdx, struct Sa CopyU16StringArray(mail->author_name, PlayerProfile_GetNamePtr(profile)); mail->author_gender = (u8)PlayerProfile_GetTrainerGender(profile); mail->author_otId = PlayerProfile_GetTrainerID(profile); - for (i = 0; monIdx < GetPartyCount(party); monIdx++) + for (i = 0; monIdx < Party_GetCount(party); monIdx++) { union MailPatternData * ptr; pokemon = Party_GetMonByIndex(party, monIdx); diff --git a/arm9/src/party.c b/arm9/src/party.c index e4eafd7ca..fa7afa0c0 100644 --- a/arm9/src/party.c +++ b/arm9/src/party.c @@ -3,7 +3,7 @@ #include "heap.h" void SaveArray_Party_Init(struct Party * party); -void InitPartyWithMaxSize(struct Party * party, int count); +void Party_InitWithMaxSize(struct Party * party, int count); u32 SaveArray_Party_sizeof(void) { @@ -19,10 +19,10 @@ struct Party * SaveArray_Party_Alloc(HeapID heapId) void SaveArray_Party_Init(struct Party * party) { - InitPartyWithMaxSize(party, PARTY_SIZE); + Party_InitWithMaxSize(party, PARTY_SIZE); } -void InitPartyWithMaxSize(struct Party * party, int count) +void Party_InitWithMaxSize(struct Party * party, int count) { int i; GF_ASSERT(count <= PARTY_SIZE); @@ -61,7 +61,7 @@ BOOL Party_RemoveMon(struct Party * party, int pos) return TRUE; } -int GetPartyCount(struct Party * party) +int Party_GetCount(struct Party * party) { return party->curCount; } @@ -107,7 +107,7 @@ void CopyParty(struct Party * src, struct Party * dest) *dest = *src; } -BOOL PartyHasMon(struct Party * party, u16 species) +BOOL Party_HasMon(struct Party * party, u16 species) { int i; for (i = 0; i < party->curCount; i++) diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c index e2a8107af..750aeb69e 100644 --- a/arm9/src/pokemon.c +++ b/arm9/src/pokemon.c @@ -2648,7 +2648,7 @@ u16 GetMonEvolution(struct Party * party, struct Pokemon * pokemon, u32 context, } break; case EVO_OTHER_PARTY_MON: - if (party != NULL && PartyHasMon(party, evoTable[i].param) == 1) + if (party != NULL && Party_HasMon(party, evoTable[i].param) == 1) { target = evoTable[i].target; *method_ret = EVO_OTHER_PARTY_MON; @@ -3012,7 +3012,7 @@ void CopyBoxPokemonToPokemon(struct BoxPokemon * src, struct Pokemon * dest) u8 Party_GetMaxLevel(struct Party * party) { int i; - int r7 = GetPartyCount(party); + int r7 = Party_GetCount(party); u8 ret = 1; u8 level; for (i = 0; i < r7; i++) @@ -3090,7 +3090,7 @@ int Species_LoadLearnsetTable(u16 species, u32 form, u16 * dest) void Party_GivePokerusAtRandom(struct Party * party) { - int count = GetPartyCount(party); + int count = Party_GetCount(party); int idx; struct Pokemon * pokemon; u8 sp0; @@ -3156,7 +3156,7 @@ void Party_UpdatePokerus(struct Party * party, int r5) int i; u8 pokerus; struct Pokemon * pokemon; - int count = GetPartyCount(party); + int count = Party_GetCount(party); for (i = 0; i < count; i++) { pokemon = Party_GetMonByIndex(party, i); @@ -3179,7 +3179,7 @@ void Party_UpdatePokerus(struct Party * party, int r5) void Party_SpreadPokerus(struct Party * party) { - int count = GetPartyCount(party); + int count = Party_GetCount(party); int i; struct Pokemon * pokemon; u8 pokerus; diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c index 76fc30c42..ade3501a9 100644 --- a/arm9/src/scrcmd.c +++ b/arm9/src/scrcmd.c @@ -4170,14 +4170,14 @@ BOOL ScrCmd_AddSpecialGameStat(ScriptContext *ctx) { //0260 BOOL ScrCmd_CheckPokemonInParty(ScriptContext *ctx) { //0262 u16 species = ScriptGetVar(ctx); u16 *var = ScriptGetVarPointer(ctx); - *var = PartyHasMon(SaveArray_Party_Get(ctx->fieldSystem->saveData), species); + *var = Party_HasMon(SaveArray_Party_Get(ctx->fieldSystem->saveData), species); return TRUE; } BOOL ScrCmd_SetDeoxysForm(ScriptContext *ctx) { //0263 u16 form = ScriptGetVar(ctx); Party *playerParty = SaveArray_Party_Get(ctx->fieldSystem->saveData); - s32 partyCount = GetPartyCount(playerParty); + s32 partyCount = Party_GetCount(playerParty); Pokedex *pokedex = Save_Pokedex_Get(ctx->fieldSystem->saveData); for (s32 i = 0; i < partyCount; i++) { @@ -4195,7 +4195,7 @@ BOOL ScrCmd_SetDeoxysForm(ScriptContext *ctx) { //0263 BOOL ScrCmd_CheckBurmyForms(ScriptContext *ctx) { //0264 u16 *var = ScriptGetVarPointer(ctx); Party *playerParty = SaveArray_Party_Get(ctx->fieldSystem->saveData); - s32 partyCount = GetPartyCount(playerParty); + s32 partyCount = Party_GetCount(playerParty); u32 unk0[PARTY_SIZE]; memcpy(unk0, UNK_020F34FC, sizeof(unk0)); @@ -4240,7 +4240,7 @@ asm BOOL ScrCmd_CheckBurmyForms(ScriptContext *ctx) { ldr r0, [r0, #0xc] bl SaveArray_Party_Get str r0, [sp, #0xc] - bl GetPartyCount + bl Party_GetCount add r2, sp, #0x18 mov r4, #0x0 ldr r3, =UNK_020F34FC diff --git a/arm9/src/scrcmd_party.c b/arm9/src/scrcmd_party.c index ae421a5df..0648b3275 100644 --- a/arm9/src/scrcmd_party.c +++ b/arm9/src/scrcmd_party.c @@ -85,7 +85,7 @@ BOOL ScrCmd_GiveEgg(struct ScriptContext* ctx) //0097 u16 species = ScriptGetVar(ctx); u16 unk = ScriptGetVar(ctx); struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - u8 party_count = (u8)GetPartyCount(party); + u8 party_count = (u8)Party_GetCount(party); if (party_count < PARTY_SIZE) { @@ -147,7 +147,7 @@ BOOL ScrCmd_FindPartyMonWithMove(struct ScriptContext* ctx) //009A - todo: Check struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); u16 required_move = ScriptGetVar(ctx); - u8 party_count = (u8)GetPartyCount(SaveArray_Party_Get(fieldSystem->saveData)); + u8 party_count = (u8)Party_GetCount(SaveArray_Party_Get(fieldSystem->saveData)); u8 i; for (i = 0, *ret_ptr = PARTY_SIZE; i < party_count; i++) @@ -191,7 +191,7 @@ BOOL ScrCmd_CountPartyMonsAtOrBelowLevel(struct ScriptContext* ctx) //01F6 struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); u16 highest_level = ScriptGetVar(ctx); - party_count = (u8)GetPartyCount(SaveArray_Party_Get(fieldSystem->saveData)); + party_count = (u8)Party_GetCount(SaveArray_Party_Get(fieldSystem->saveData)); u8 mons; for (i = 0, mons = 0, *ret_ptr = 0; i < party_count; i++) @@ -238,7 +238,7 @@ BOOL ScrCmd_GetPartyMonNature(struct ScriptContext* ctx) //0212 struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); u16 mon_slot = ScriptGetVar(ctx); - u8 party_count = (u8)GetPartyCount(SaveArray_Party_Get(fieldSystem->saveData)); + u8 party_count = (u8)Party_GetCount(SaveArray_Party_Get(fieldSystem->saveData)); if (mon_slot >= party_count) { @@ -265,7 +265,7 @@ BOOL ScrCmd_FindPartyMonWithNature(struct ScriptContext* ctx) //0213 - todo: Che struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); u16 required_nature = ScriptGetVar(ctx); - u8 party_count = (u8)GetPartyCount(SaveArray_Party_Get(fieldSystem->saveData)); + u8 party_count = (u8)Party_GetCount(SaveArray_Party_Get(fieldSystem->saveData)); u8 i; for (i = 0, *ret_ptr = 0xFF; i < party_count; i++) @@ -407,7 +407,7 @@ BOOL ScrCmd_CountPartyMons(struct ScriptContext* ctx) //0177 u16* ret_ptr = ScriptGetVarPointer(ctx); struct Party* party = SaveArray_Party_Get(fieldSystem->saveData); - *ret_ptr = (u16)GetPartyCount(party); + *ret_ptr = (u16)Party_GetCount(party); return FALSE; } @@ -418,7 +418,7 @@ BOOL ScrCmd_CountPartyMons_OmitEggs(struct ScriptContext* ctx) //019A struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); - s32 party_count = GetPartyCount(SaveArray_Party_Get(fieldSystem->saveData)); + s32 party_count = Party_GetCount(SaveArray_Party_Get(fieldSystem->saveData)); for (i = 0, non_egg_mons = 0; i < party_count; i++) { @@ -445,7 +445,7 @@ BOOL ScrCmd_CountAvailablePartyMons_IgnoreSlot(struct ScriptContext* ctx) //019B struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); slot_to_ignore = ScriptGetVar(ctx); - party_count = GetPartyCount(SaveArray_Party_Get(fieldSystem->saveData)); + party_count = Party_GetCount(SaveArray_Party_Get(fieldSystem->saveData)); u32 available_mons; s32 i; @@ -480,7 +480,7 @@ BOOL ScrCmd_CountAvailablePartyAndPCMons(struct ScriptContext* ctx) //019C struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); pc = Save_PCStorage_Get(fieldSystem->saveData); - party_count = GetPartyCount(SaveArray_Party_Get(fieldSystem->saveData)); + party_count = Party_GetCount(SaveArray_Party_Get(fieldSystem->saveData)); u32 mons; s32 i; @@ -511,7 +511,7 @@ BOOL ScrCmd_GetPartyEggCount(struct ScriptContext* ctx) //019D struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); - party_count = GetPartyCount(SaveArray_Party_Get(fieldSystem->saveData)); + party_count = Party_GetCount(SaveArray_Party_Get(fieldSystem->saveData)); s32 i; for (i = 0, eggs_in_party = 0; i < party_count; i++) @@ -537,7 +537,7 @@ BOOL ScrCmd_CheckPartyForPokerus(struct ScriptContext* ctx) //0119 struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); - party_count = (u16)GetPartyCount(SaveArray_Party_Get(fieldSystem->saveData)); + party_count = (u16)Party_GetCount(SaveArray_Party_Get(fieldSystem->saveData)); for (i = 0, *ret_ptr = 0; i < party_count; i++) { @@ -670,7 +670,7 @@ BOOL ScrCmd_CheckPartyForSpecies(struct ScriptContext* ctx) //01C0 struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); u16 species = ScriptGetVar(ctx); - u8 party_count = (u8)GetPartyCount(SaveArray_Party_Get(fieldSystem->saveData)); + u8 party_count = (u8)Party_GetCount(SaveArray_Party_Get(fieldSystem->saveData)); u8 i; for (i = 0, *ret_ptr = 0; i < party_count; i++) @@ -722,7 +722,7 @@ BOOL ScrCmd_CountTotalPartyRibbons(struct ScriptContext* ctx) //022F u16 ribbons; u16* ret_ptr = ScriptGetVarPointer(ctx); - u16 party_count = (u16)GetPartyCount(SaveArray_Party_Get(ctx->fieldSystem->saveData)); + u16 party_count = (u16)Party_GetCount(SaveArray_Party_Get(ctx->fieldSystem->saveData)); party = SaveArray_Party_Get(ctx->fieldSystem->saveData); for (ribbon_idx = 0, ribbons = 0; ribbon_idx < 80; ribbon_idx++) @@ -782,7 +782,7 @@ BOOL ScrCmd_CheckPartyForBadEgg(struct ScriptContext* ctx) //02B7 u16 ribbon_idx; u16* ret_ptr = ScriptGetVarPointer(ctx); - u16 party_count = (u16)GetPartyCount(SaveArray_Party_Get(ctx->fieldSystem->saveData)); + u16 party_count = (u16)Party_GetCount(SaveArray_Party_Get(ctx->fieldSystem->saveData)); struct Party* party = SaveArray_Party_Get(ctx->fieldSystem->saveData); // BUG: Probably a copy-paste fail. Checks if your party has a Bad Egg in it, diff --git a/arm9/src/script_pokemon_util.c b/arm9/src/script_pokemon_util.c index f0acc1226..1ef478a8d 100644 --- a/arm9/src/script_pokemon_util.c +++ b/arm9/src/script_pokemon_util.c @@ -62,7 +62,7 @@ void PartyMonSetMoveInSlot(struct Party * party, int partySlot, int moveSlot, u1 int GetIdxOfFirstPartyMonWithMove(struct Party * party, int move) { - int partyCount = GetPartyCount(party); + int partyCount = Party_GetCount(party); for (int i = 0; i < partyCount; i++) { @@ -81,7 +81,7 @@ int GetIdxOfFirstPartyMonWithMove(struct Party * party, int move) int CountAlivePokemon(struct Party * party) { - int partyCount = GetPartyCount(party); + int partyCount = Party_GetCount(party); int i; int aliveCount = 0; @@ -98,7 +98,7 @@ int CountAlivePokemon(struct Party * party) struct Pokemon * GetFirstAliveMonInParty_CrashIfNone(struct Party * party) { int i; - int partyCount = GetPartyCount(party); + int partyCount = Party_GetCount(party); for (i = 0; i < partyCount; i++) { @@ -114,7 +114,7 @@ struct Pokemon * GetFirstAliveMonInParty_CrashIfNone(struct Party * party) struct Pokemon * GetFirstNonEggInParty(struct Party * party) { u16 i; - u16 partyCount = (u16)GetPartyCount(party); + u16 partyCount = (u16)Party_GetCount(party); for (i = 0; i < partyCount; i++) { @@ -134,7 +134,7 @@ BOOL HasEnoughAlivePokemonForDoubleBattle(struct Party * party) void GiveAllMonsTheSinnohChampRibbon(struct Party * party) { u8 var = 1; - int partyCount = GetPartyCount(party); + int partyCount = Party_GetCount(party); for (int i = 0; i < partyCount; i++) @@ -153,7 +153,7 @@ int ApplyPoisonStep(struct Party * party, int location) u32 hp; int numPoisoned = 0; int numHealed = 0; - int partyCount = GetPartyCount(party); + int partyCount = Party_GetCount(party); for (int i = 0; i < partyCount; i++) { diff --git a/arm9/src/trainer_data.c b/arm9/src/trainer_data.c index de0c80e3d..ac0c527fe 100644 --- a/arm9/src/trainer_data.c +++ b/arm9/src/trainer_data.c @@ -277,7 +277,7 @@ void CreateNPCTrainerParty(BattleSetup *setup, s32 party_id, HeapID heapId) // We abuse the RNG for personality value generation, so back up the overworld // state seed_bak = GetLCRNGSeed(); - InitPartyWithMaxSize(setup->party[party_id], PARTY_SIZE); + Party_InitWithMaxSize(setup->party[party_id], PARTY_SIZE); data = (union TrainerMon *)AllocFromHeap(heapId, sizeof(union TrainerMon) * PARTY_SIZE); pokemon = AllocMonZeroed(heapId); TrainerData_ReadTrPoke(setup->trainerId[party_id], data); diff --git a/arm9/src/unk_0205FA2C.c b/arm9/src/unk_0205FA2C.c index 7f7ba073c..cd4dc1312 100644 --- a/arm9/src/unk_0205FA2C.c +++ b/arm9/src/unk_0205FA2C.c @@ -116,7 +116,7 @@ u32 sub_0205FB34( ptr->unk11 = 1; ptr->unk14 = param0->unk0d; - ptr->party_count = (u8)GetPartyCount(ptr->player_party); + ptr->party_count = (u8)Party_GetCount(ptr->player_party); ptr->unk18 = 0; ptr->unk12 = param0->unk09; diff --git a/arm9/src/use_item_on_mon.c b/arm9/src/use_item_on_mon.c index c00adb36a..f72adeb4d 100644 --- a/arm9/src/use_item_on_mon.c +++ b/arm9/src/use_item_on_mon.c @@ -695,7 +695,7 @@ void HealParty(struct Party * party) s32 i; s32 j; - nmons = GetPartyCount(party); + nmons = Party_GetCount(party); for (i = 0; i < nmons; i++) { struct Pokemon * pokemon = Party_GetMonByIndex(party, i); diff --git a/include/party.h b/include/party.h index c5921e761..3ec36a2eb 100644 --- a/include/party.h +++ b/include/party.h @@ -4,13 +4,13 @@ #include "pokemon.h" #include "save.h" -BOOL PartyHasMon(struct Party * party_p, u16 species); -int GetPartyCount(struct Party * party_p); +BOOL Party_HasMon(struct Party * party_p, u16 species); +int Party_GetCount(struct Party * party_p); struct Pokemon * Party_GetMonByIndex(struct Party * party_p, int idx); u32 SaveArray_Party_sizeof(void); struct Party * SaveArray_Party_Alloc(HeapID heapId); void SaveArray_Party_Init(struct Party * party); -void InitPartyWithMaxSize(struct Party * party, int count); +void Party_InitWithMaxSize(struct Party * party, int count); BOOL Party_AddMon(struct Party * party, struct Pokemon * pokemon); BOOL Party_RemoveMon(struct Party * party, int pos); void ReplacePartySlotWithMon(struct Party * party, int pos, struct Pokemon * pokemon); From a6e2a873976259754816d719403e8c572d4494cc Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 20 Aug 2023 17:02:31 +0100 Subject: [PATCH 08/11] rename two pal park funcs --- arm9/asm/unk_02035068.s | 2 +- arm9/asm/unk_0204B9EC.s | 10 +++++----- arm9/global.inc | 4 ++-- arm9/src/encounter.c | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index 39c0302d4..d50c56e4c 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -1023,7 +1023,7 @@ _020357D6: b _0203584C _02035834: add r0, r4, #0x0 - bl sub_0204BAB0 + bl PalPark_CountMonsNotCaught mov r1, #0x0 add r2, r0, #0x0 str r1, [sp, #0x0] diff --git a/arm9/asm/unk_0204B9EC.s b/arm9/asm/unk_0204B9EC.s index 13dd82418..faab51c8d 100644 --- a/arm9/asm/unk_0204B9EC.s +++ b/arm9/asm/unk_0204B9EC.s @@ -99,8 +99,8 @@ sub_0204BA90: ; 0x0204BA90 _0204BA98: .word sub_0204BD40 _0204BA9C: .word UNK_021C5A1C - thumb_func_start sub_0204BAA0 -sub_0204BAA0: ; 0x0204BAA0 + thumb_func_start PalPark_HandleBattleEnd +PalPark_HandleBattleEnd: ; 0x0204BAA0 ldr r3, _0204BAA8 ; =sub_0204BD18 ldr r2, _0204BAAC ; =UNK_021C5A1C bx r3 @@ -108,8 +108,8 @@ sub_0204BAA0: ; 0x0204BAA0 _0204BAA8: .word sub_0204BD18 _0204BAAC: .word UNK_021C5A1C - thumb_func_start sub_0204BAB0 -sub_0204BAB0: ; 0x0204BAB0 + thumb_func_start PalPark_CountMonsNotCaught +PalPark_CountMonsNotCaught: ; 0x0204BAB0 push {r3, lr} ldr r0, _0204BAC0 ; =UNK_021C5A1C bl sub_0204BBA8 @@ -479,7 +479,7 @@ sub_0204BD40: ; 0x0204BD40 bl sub_02022528 str r0, [sp, #0x0] add r0, r5, #0x0 - bl sub_0204BAB0 + bl PalPark_CountMonsNotCaught add r1, r0, #0x0 mov r0, #0xb bl sub_02047800 diff --git a/arm9/global.inc b/arm9/global.inc index 60bf34e10..3e4bf7211 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -3575,8 +3575,8 @@ .extern sub_0204BA1C .extern sub_0204BA68 .extern sub_0204BA90 -.extern sub_0204BAA0 -.extern sub_0204BAB0 +.extern PalPark_HandleBattleEnd +.extern PalPark_CountMonsNotCaught .extern sub_0204BAC4 .extern sub_0204BAD4 .extern sub_0204BAE4 diff --git a/arm9/src/encounter.c b/arm9/src/encounter.c index d29ec6ce4..a5ab4e41f 100644 --- a/arm9/src/encounter.c +++ b/arm9/src/encounter.c @@ -45,8 +45,8 @@ extern BattleSetup *BattleSetup_New(HeapID heapId, u32 flags); extern void BattleSetup_InitFromFieldSystem(BattleSetup *setup, FieldSystem *fieldSystem); extern void ov06_0223CCDC(FieldSystem *fieldSystem, BattleSetup *setup); extern void ov06_0223CD7C(FieldSystem *fieldSystem, u16 species, u8 level, BattleSetup *setup); -extern void sub_0204BAA0(FieldSystem *fieldSystem, BattleSetup *setup); -extern u32 sub_0204BAB0(FieldSystem *fieldSystem); +extern void PalPark_HandleBattleEnd(FieldSystem *fieldSystem, BattleSetup *setup); +extern u32 PalPark_CountMonsNotCaught(FieldSystem *fieldSystem); extern void StartScriptFromMenu(TaskManager *taskManager, u16 script, LocalMapObject *lastInteracted); extern BattleSetup *sub_02047814(HeapID heapId, FieldSystem *fieldSystem); extern void sub_02047F1C(BattleSetup *setup, FieldSystem *fieldSystem, void *param2); @@ -549,7 +549,7 @@ static BOOL Task_PalParkEncounter(TaskManager *taskManager) { break; case 3: sub_020465E4(encounter->setup, fieldSystem); - sub_0204BAA0(fieldSystem, encounter->setup); + PalPark_HandleBattleEnd(fieldSystem, encounter->setup); sub_020472F4(fieldSystem, encounter->setup); (*state)++; break; @@ -564,7 +564,7 @@ static BOOL Task_PalParkEncounter(TaskManager *taskManager) { break; case 6: Encounter_Delete(encounter); - if (sub_0204BAB0(fieldSystem) == 0) { + if (PalPark_CountMonsNotCaught(fieldSystem) == 0) { StartScriptFromMenu(taskManager, 3, NULL); return FALSE; } From 70439f1a6b9b9dd53683327925451556f720d29d Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 20 Aug 2023 18:34:07 +0100 Subject: [PATCH 09/11] battle outcome constants --- arm9/src/encounter.c | 26 +++++++++++++------------- include/constants/battle.h | 10 ++++++++++ 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/arm9/src/encounter.c b/arm9/src/encounter.c index a5ab4e41f..ffb5800eb 100644 --- a/arm9/src/encounter.c +++ b/arm9/src/encounter.c @@ -109,7 +109,7 @@ static Encounter *Encounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *wi Encounter *encounter = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(Encounter)); encounter->winFlag = winFlag; if (winFlag != NULL) { - *winFlag = 0; + *winFlag = BATTLE_OUTCOME_NONE; } encounter->effect = effect; encounter->bgm = bgm; @@ -315,7 +315,7 @@ static WildEncounter *WildEncounter_New(BattleSetup *setup, s32 effect, s32 bgm, WildEncounter *encounter = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(WildEncounter)); encounter->winFlag = winFlag; if (winFlag != NULL) { - *winFlag = 0; + *winFlag = BATTLE_OUTCOME_NONE; } encounter->effect = effect; encounter->bgm = bgm; @@ -392,7 +392,7 @@ static BOOL Task_WildEncounter(TaskManager *taskManager) { if (sub_0205E128(fieldSystem->unk90) != 0) { if (sub_0205E0A4(fieldSystem->unk90) != 0) { - if (encounter->setup->winFlag != 1 && encounter->setup->winFlag != 4) { + if (encounter->setup->winFlag != BATTLE_OUTCOME_WIN && encounter->setup->winFlag != BATTLE_OUTCOME_MON_CAUGHT) { sub_0205DD40(fieldSystem->unk90); } } else { @@ -448,7 +448,7 @@ static BOOL Task_SafariEncounter(TaskManager *taskManager) { break; case 3: sub_020465E4(encounter->setup, fieldSystem); - if (encounter->setup->winFlag == 4) { + if (encounter->setup->winFlag == BATTLE_OUTCOME_MON_CAUGHT) { SafariZone *safariZone = Save_SafariZone_Get(fieldSystem->saveData); Pokemon *pokemon = Party_GetMonByIndex(encounter->setup->party[BATTLER_ENEMY], 0); sub_02060FE0(safariZone, pokemon); @@ -456,7 +456,7 @@ static BOOL Task_SafariEncounter(TaskManager *taskManager) { sub_020472F4(fieldSystem, encounter->setup); - if (*safariBalls == 0 && encounter->setup->winFlag != 4) { + if (*safariBalls == 0 && encounter->setup->winFlag != BATTLE_OUTCOME_MON_CAUGHT) { Location *location = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->saveData)); sub_02049160(taskManager, location); } @@ -474,7 +474,7 @@ static BOOL Task_SafariEncounter(TaskManager *taskManager) { break; case 6: if (*safariBalls == 0) { - if (encounter->setup->winFlag == 4) { + if (encounter->setup->winFlag == BATTLE_OUTCOME_MON_CAUGHT) { QueueScript(taskManager, 0x2262, NULL, NULL); } else { QueueScript(taskManager, 0x2269, NULL, NULL); @@ -756,9 +756,9 @@ static void sub_020472F4(FieldSystem *fieldSystem, BattleSetup *setup) { } if (battleType == BATTLE_TYPE_NONE || battleType == BATTLE_TYPE_8 || battleType == (BATTLE_TYPE_DOUBLES | BATTLE_TYPE_MULTI | BATTLE_TYPE_6)) { - if (winFlag == 1) { + if (winFlag == BATTLE_OUTCOME_WIN) { GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK8); - } else if (winFlag == 4) { + } else if (winFlag == BATTLE_OUTCOME_MON_CAUGHT) { mon = Party_GetMonByIndex(setup->party[BATTLER_ENEMY], 0); if (Pokedex_ConvertToCurrentDexNo(FALSE, GetMonData(mon, MON_DATA_SPECIES, NULL)) != 0) { GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK9); @@ -767,10 +767,10 @@ static void sub_020472F4(FieldSystem *fieldSystem, BattleSetup *setup) { } } } else if ((battleType & BATTLE_TYPE_TRAINER) || (battleType & BATTLE_TYPE_INGAME_PARTNER)) { - if (winFlag == 1) { + if (winFlag == BATTLE_OUTCOME_WIN) { GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK11); } - } else if ((battleType & BATTLE_TYPE_SAFARI || battleType & BATTLE_TYPE_PAL_PARK) && winFlag == 4) { + } else if ((battleType & BATTLE_TYPE_SAFARI || battleType & BATTLE_TYPE_PAL_PARK) && winFlag == BATTLE_OUTCOME_MON_CAUGHT) { mon = Party_GetMonByIndex(setup->party[BATTLER_ENEMY], 0); if (Pokedex_ConvertToCurrentDexNo(FALSE, GetMonData(mon, MON_DATA_SPECIES, NULL)) != 0) { GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK9); @@ -789,19 +789,19 @@ static void sub_020473CC(FieldSystem *fieldSystem, BattleSetup *setup) { return; } if (battleType == BATTLE_TYPE_NONE || battleType == BATTLE_TYPE_8 || battleType == (BATTLE_TYPE_DOUBLES | BATTLE_TYPE_MULTI | BATTLE_TYPE_6) || battleType == BATTLE_TYPE_SAFARI) { - if (winFlag == 1) { + if (winFlag == BATTLE_OUTCOME_WIN) { fieldSystem->unk76++; if (fieldSystem->unk76 < 5) { return; } mon = Party_GetMonByIndex(setup->party[BATTLER_ENEMY], 0); sub_02028AD4(fieldSystem->unk98, sub_0202920C(Save_PlayerData_GetIGTAddr(fieldSystem->saveData), GetMonData(mon, MON_DATA_SPECIES, NULL), GetMonData(mon, MON_DATA_GENDER, NULL), setup->unk160, HEAP_ID_FIELD), 2); - } else if (winFlag == 4) { + } else if (winFlag == BATTLE_OUTCOME_MON_CAUGHT) { mon = Party_GetMonByIndex(setup->party[setup->unk170], 0); sub_02028AD4(fieldSystem->unk98, sub_0202918C(Save_PlayerData_GetIGTAddr(fieldSystem->saveData), GetMonData(mon, MON_DATA_SPECIES, NULL), GetMonData(mon, MON_DATA_GENDER, NULL), setup->unk160, HEAP_ID_FIELD), 2); } } else if ((battleType & BATTLE_TYPE_TRAINER) || (battleType & BATTLE_TYPE_INGAME_PARTNER)) { - if (winFlag == 1) { + if (winFlag == BATTLE_OUTCOME_WIN) { sub_020299DC(fieldSystem->unk98, fieldSystem->location->mapId, setup->trainerId[BATTLER_ENEMY], HEAP_ID_FIELD); } } diff --git a/include/constants/battle.h b/include/constants/battle.h index 9d699a657..6c112b15f 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -8,6 +8,16 @@ #define BATTLER_PLAYER2 2 #define BATTLER_ENEMY2 3 +// Battle outcome +// Used with BattleSetup::winFlag +#define BATTLE_OUTCOME_NONE 0 +#define BATTLE_OUTCOME_WIN 1 +#define BATTLE_OUTCOME_LOSE 2 +#define BATTLE_OUTCOME_DRAW 3 +#define BATTLE_OUTCOME_MON_CAUGHT 4 +#define BATTLE_OUTCOME_PLAYER_FLED 5 +#define BATTLE_OUTCOME_FOE_FLED 6 + //Battle Type #define BATTLE_TYPE_NONE 0 #define BATTLE_TYPE_TRAINER (1 << 0) From 24516ac2a96f58b2e6185ca7dc1c2a41d46ffc5b Mon Sep 17 00:00:00 2001 From: red031000 Date: Thu, 24 Aug 2023 19:47:13 +0100 Subject: [PATCH 10/11] Save_PCStorage_Get -> SaveArray_PCStorage_Get --- arm9/asm/scrcmd_5.s | 2 +- arm9/asm/unk_020377F0.s | 2 +- arm9/asm/unk_020476CC.s | 8 ++++---- arm9/global.inc | 2 +- arm9/overlays/14/asm/overlay_14.s | 2 +- arm9/src/encounter.c | 2 +- arm9/src/scrcmd.c | 4 ++-- arm9/src/scrcmd_13.c | 4 ++-- arm9/src/scrcmd_names.c | 4 ++-- arm9/src/scrcmd_party.c | 2 +- arm9/src/unk_02022504.c | 2 +- include/unk_02022504.h | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/arm9/asm/scrcmd_5.s b/arm9/asm/scrcmd_5.s index b1d152af4..7e93600de 100644 --- a/arm9/asm/scrcmd_5.s +++ b/arm9/asm/scrcmd_5.s @@ -40,7 +40,7 @@ ScrCmd_Unk024F: ; 0x020411C4 add r0, #0x80 ldr r7, [r0, #0x0] ldr r0, [r7, #0xc] - bl Save_PCStorage_Get + bl SaveArray_PCStorage_Get str r0, [sp, #0x20] add r0, r4, #0x0 bl ScriptReadHalfword diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s index 10752d799..4d4557182 100644 --- a/arm9/asm/unk_020377F0.s +++ b/arm9/asm/unk_020377F0.s @@ -2127,7 +2127,7 @@ sub_020386E0: ; 0x020386E0 bl SaveArray_Get str r0, [r4, #0x8] ldr r0, [r5, #0xc] - bl Save_PCStorage_Get + bl SaveArray_PCStorage_Get str r0, [r4, #0xc] ldr r0, [r5, #0xc] bl Save_Pokedex_Get diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s index 744b1cf44..6ca73510b 100644 --- a/arm9/asm/unk_020476CC.s +++ b/arm9/asm/unk_020476CC.s @@ -285,7 +285,7 @@ sub_02047814: ; 0x02047814 add r0, r6, #0x0 bl FreeToHeap ldr r0, [r5, #0xc] - bl Save_PCStorage_Get + bl SaveArray_PCStorage_Get mov r1, #0x45 lsl r1, r1, #0x2 str r0, [r4, r1] @@ -519,7 +519,7 @@ sub_02047A78: ; 0x02047A78 mov r2, #0x0 bl sub_02047A64 ldr r0, [r4, #0xc] - bl Save_PCStorage_Get + bl SaveArray_PCStorage_Get mov r1, #0x45 lsl r1, r1, #0x2 str r0, [r5, r1] @@ -719,7 +719,7 @@ _02047C98: bl sub_02047A64 ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] - bl Save_PCStorage_Get + bl SaveArray_PCStorage_Get mov r1, #0x45 lsl r1, r1, #0x2 str r0, [r6, r1] @@ -903,7 +903,7 @@ _02047E2C: bl sub_02047A64 ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] - bl Save_PCStorage_Get + bl SaveArray_PCStorage_Get mov r1, #0x45 lsl r1, r1, #0x2 str r0, [r5, r1] diff --git a/arm9/global.inc b/arm9/global.inc index 3e4bf7211..6c0e67d3a 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -1427,7 +1427,7 @@ .extern sub_02022450 .extern Reset_To_File .extern Save_SafariZone_Get -.extern Save_PCStorage_Get +.extern SaveArray_PCStorage_Get .extern sub_0202251C .extern sub_02022528 .extern LoadHallOfFame diff --git a/arm9/overlays/14/asm/overlay_14.s b/arm9/overlays/14/asm/overlay_14.s index 959b16bc6..3a13a5d5c 100644 --- a/arm9/overlays/14/asm/overlay_14.s +++ b/arm9/overlays/14/asm/overlay_14.s @@ -7519,7 +7519,7 @@ ov14_021DB220: ; 0x021DB220 add r4, r1, #0 add r5, r0, #0 ldr r0, [r4] - bl Save_PCStorage_Get + bl SaveArray_PCStorage_Get mov r1, #0x12 lsl r1, r1, #4 str r0, [r5, r1] diff --git a/arm9/src/encounter.c b/arm9/src/encounter.c index ffb5800eb..e1316834e 100644 --- a/arm9/src/encounter.c +++ b/arm9/src/encounter.c @@ -480,7 +480,7 @@ static BOOL Task_SafariEncounter(TaskManager *taskManager) { QueueScript(taskManager, 0x2269, NULL, NULL); } } else { - PCStorage *pc = Save_PCStorage_Get(fieldSystem->saveData); + PCStorage *pc = SaveArray_PCStorage_Get(fieldSystem->saveData); Party *party = SaveArray_Party_Get(fieldSystem->saveData); if (PCStorage_FindFirstBoxWithEmptySlot(pc) == NUM_BOXES && Party_GetCount(party) == PARTY_SIZE) { QueueScript(taskManager, 0x2276, NULL, NULL); diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c index ade3501a9..6066d0bb0 100644 --- a/arm9/src/scrcmd.c +++ b/arm9/src/scrcmd.c @@ -4046,7 +4046,7 @@ BOOL ScrCmd_GiveWallpaper(ScriptContext *ctx) { //0249 - used for easy chat unlo FieldSystem *fieldSystem = ctx->fieldSystem; PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveData(fieldSystem)); u16 *var = ScriptGetVarPointer(ctx); - PCStorage *pcStorage = Save_PCStorage_Get(fieldSystem->saveData); + PCStorage *pcStorage = SaveArray_PCStorage_Get(fieldSystem->saveData); u16 unk0 = ScriptGetVar(ctx); u16 unk1 = ScriptGetVar(ctx); u16 unk2 = ScriptGetVar(ctx); @@ -4107,7 +4107,7 @@ static void Script_SetMonSeenFlagBySpecies(FieldSystem *fieldSystem, u16 species BOOL ScrCmd_CountPCFreeSpace(ScriptContext *ctx) { //0252 u16 *var = ScriptGetVarPointer(ctx); - u16 count = PCStorage_CountMonsAndEggsInAllBoxes(Save_PCStorage_Get(ctx->fieldSystem->saveData)); + u16 count = PCStorage_CountMonsAndEggsInAllBoxes(SaveArray_PCStorage_Get(ctx->fieldSystem->saveData)); *var = MONS_PER_BOX * NUM_BOXES - count; return FALSE; } diff --git a/arm9/src/scrcmd_13.c b/arm9/src/scrcmd_13.c index 22fbc7442..5d91c5708 100644 --- a/arm9/src/scrcmd_13.c +++ b/arm9/src/scrcmd_13.c @@ -6,7 +6,7 @@ #include "pokemon_storage_system.h" #include "unk_0202C144.h" -extern struct PCStorage* Save_PCStorage_Get(struct SaveData* save); +extern struct PCStorage* SaveArray_PCStorage_Get(struct SaveData* save); extern void* sub_02022528(struct SaveData* save); extern void sub_0202BEDC(struct Pokemon* pokemon); extern void sub_0202BFD8(void* a0, s32 a1, struct Pokemon* pokemon); @@ -64,7 +64,7 @@ BOOL ScrCmd_Unk0254(struct ScriptContext* ctx) //0254 BOOL ScrCmd_Unk0255(struct ScriptContext* ctx) //0255 { void* unk = sub_02022528(ctx->fieldSystem->saveData); - struct PCStorage* pc = Save_PCStorage_Get(ctx->fieldSystem->saveData); + struct PCStorage* pc = SaveArray_PCStorage_Get(ctx->fieldSystem->saveData); struct Pokemon* pokemon = AllocMonZeroed(HEAP_ID_32); PlayerProfile* player = Save_PlayerData_GetProfileAddr(ctx->fieldSystem->saveData); struct Pokedex* pokedex = Save_Pokedex_Get(ctx->fieldSystem->saveData); // unused diff --git a/arm9/src/scrcmd_names.c b/arm9/src/scrcmd_names.c index 66f0b955f..84f6bf4ff 100644 --- a/arm9/src/scrcmd_names.c +++ b/arm9/src/scrcmd_names.c @@ -18,7 +18,7 @@ extern void *FieldSysGetAttrAddr(FieldSystem *fieldSystem, int idx); extern u32 sub_020536D0(u32 gender, u32 avatar, u32 a2); extern u32 Save_VarsFlags_GetStarter(SaveVarsFlags *state); extern u32 sub_0205F398(SaveVarsFlags *state); -extern PCStorage *Save_PCStorage_Get(SaveData *save); +extern PCStorage *SaveArray_PCStorage_Get(SaveData *save); extern u32 sub_0205F3C0(SaveVarsFlags *state); extern u32 sub_02054C14(u32 number); @@ -168,7 +168,7 @@ BOOL ScrCmd_GetPokemonNickname(ScriptContext *ctx) //00D6 - todo: BufferPartyPok BOOL ScrCmd_Unk0251(ScriptContext *ctx) //0251 - todo: BufferBoxPokemonNickname? TextBoxPokemonNickname? { FieldSystem *fieldSystem = ctx->fieldSystem; - PCStorage *pc = Save_PCStorage_Get(fieldSystem->saveData); + PCStorage *pc = SaveArray_PCStorage_Get(fieldSystem->saveData); MessageFormat **messageFormat = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 box_mon_idx = ScriptGetVar(ctx); diff --git a/arm9/src/scrcmd_party.c b/arm9/src/scrcmd_party.c index 0648b3275..1cab62464 100644 --- a/arm9/src/scrcmd_party.c +++ b/arm9/src/scrcmd_party.c @@ -479,7 +479,7 @@ BOOL ScrCmd_CountAvailablePartyAndPCMons(struct ScriptContext* ctx) //019C struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); - pc = Save_PCStorage_Get(fieldSystem->saveData); + pc = SaveArray_PCStorage_Get(fieldSystem->saveData); party_count = Party_GetCount(SaveArray_Party_Get(fieldSystem->saveData)); u32 mons; diff --git a/arm9/src/unk_02022504.c b/arm9/src/unk_02022504.c index fad6b2196..e99a01913 100644 --- a/arm9/src/unk_02022504.c +++ b/arm9/src/unk_02022504.c @@ -7,7 +7,7 @@ SafariZone *Save_SafariZone_Get(struct SaveData *save) return SaveArray_Get(save, SAVE_SAFARI_ZONE); } -struct PCStorage *Save_PCStorage_Get(struct SaveData *save) +struct PCStorage *SaveArray_PCStorage_Get(struct SaveData *save) { return SaveArray_Get(save, 35); } diff --git a/include/unk_02022504.h b/include/unk_02022504.h index 4b9e22a72..4f6fa6cf6 100644 --- a/include/unk_02022504.h +++ b/include/unk_02022504.h @@ -8,7 +8,7 @@ #include "unk_0202AC20.h" SafariZone *Save_SafariZone_Get(struct SaveData *save); -struct PCStorage *Save_PCStorage_Get(struct SaveData *save); +struct PCStorage *SaveArray_PCStorage_Get(struct SaveData *save); struct UnkStruct_0202AC20 * sub_0202251C(struct SaveData *save); void *sub_02022528(struct SaveData *save); HallOfFame *LoadHallOfFame(struct SaveData *save, HeapID heapId, int *ret_p); From d904e1be5007b2957fe434c59fbaeaf9d32c99e4 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sat, 9 Sep 2023 22:19:40 +0100 Subject: [PATCH 11/11] some renaming to be consistent with heartgold --- arm9/asm/scrcmd_10.s | 22 ++++++++++---------- arm9/asm/scrcmd_3.s | 46 ++++++++++++++++++++--------------------- arm9/asm/scrcmd_5.s | 2 +- arm9/asm/scrcmd_7.s | 18 ++++++++-------- arm9/asm/scrcmd_9.s | 26 +++++++++++------------ arm9/asm/unk_02037024.s | 2 +- arm9/asm/unk_02038C78.s | 10 ++++----- arm9/global.inc | 2 +- include/scrcmd.h | 4 ++-- 9 files changed, 66 insertions(+), 66 deletions(-) diff --git a/arm9/asm/scrcmd_10.s b/arm9/asm/scrcmd_10.s index 5ed04d935..8601133d6 100644 --- a/arm9/asm/scrcmd_10.s +++ b/arm9/asm/scrcmd_10.s @@ -89,7 +89,7 @@ ScrCmd_Unk01DD: ; 0x020423B0 add r0, r7, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r6, r0, #0x0 add r0, r7, #0x0 bl ScriptReadHalfword @@ -516,7 +516,7 @@ ScrCmd_Unk01DE: ; 0x02042700 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -524,7 +524,7 @@ ScrCmd_Unk01DE: ; 0x02042700 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -610,7 +610,7 @@ ScrCmd_Unk01E1: ; 0x020427D0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -618,7 +618,7 @@ ScrCmd_Unk01E1: ; 0x020427D0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r7, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -680,7 +680,7 @@ ScrCmd_Unk01E2: ; 0x02042864 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -882,7 +882,7 @@ ScrCmd_Unk0298: ; 0x020429E8 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl VarGet + bl FieldSystem_VarGet add r5, r0, #0x0 add r0, r4, #0x0 bl Save_FrontierData_Get @@ -905,7 +905,7 @@ ScrCmd_Unk0299: ; 0x02042A18 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl VarGet + bl FieldSystem_VarGet add r5, r0, #0x0 add r0, r4, #0x0 bl Save_FrontierData_Get @@ -929,7 +929,7 @@ ScrCmd_Unk029A: ; 0x02042A48 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -964,7 +964,7 @@ ScrCmd_Unk029B: ; 0x02042A98 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -972,7 +972,7 @@ ScrCmd_Unk029B: ; 0x02042A98 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword diff --git a/arm9/asm/scrcmd_3.s b/arm9/asm/scrcmd_3.s index 32aa21d0e..aa84f9bde 100644 --- a/arm9/asm/scrcmd_3.s +++ b/arm9/asm/scrcmd_3.s @@ -17,7 +17,7 @@ ScrCmd_Unk00F8: ; 0x0203FE90 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl VarGet + bl FieldSystem_VarGet add r1, r0, #0x0 lsl r1, r1, #0x18 ldr r0, [r4, #0x0] @@ -40,7 +40,7 @@ ScrCmd_Unk00F9: ; 0x0203FEC0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet str r0, [r4, #0x64] ldr r1, _0203FEF0 ; =sub_0203FEF4 add r0, r4, #0x0 @@ -87,7 +87,7 @@ ScrCmd_Unk00FA: ; 0x0203FF10 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet str r0, [sp, #0x4] add r0, r5, #0x0 bl ScriptReadHalfword @@ -95,7 +95,7 @@ ScrCmd_Unk00FA: ; 0x0203FF10 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet str r0, [sp, #0x8] add r0, r5, #0x0 bl ScriptReadHalfword @@ -103,7 +103,7 @@ ScrCmd_Unk00FA: ; 0x0203FF10 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet str r0, [sp, #0xc] add r0, r5, #0x0 bl ScriptReadHalfword @@ -111,7 +111,7 @@ ScrCmd_Unk00FA: ; 0x0203FF10 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r6, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -200,7 +200,7 @@ ScrCmd_Unk00FB: ; 0x02040028 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] @@ -241,14 +241,14 @@ ScrCmd_Unk00FC: ; 0x02040074 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl VarGet + bl FieldSystem_VarGet add r3, r0, #0x0 ldr r0, [r4, #0x0] ldr r2, [r6, #0x0] @@ -279,14 +279,14 @@ ScrCmd_Unk00FD: ; 0x020400C8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl VarGet + bl FieldSystem_VarGet add r3, r0, #0x0 ldr r0, [r4, #0x0] ldr r2, [r6, #0x0] @@ -317,14 +317,14 @@ ScrCmd_Unk00FE: ; 0x0204011C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl VarGet + bl FieldSystem_VarGet add r3, r0, #0x0 ldr r0, [r4, #0x0] ldr r2, [r6, #0x0] @@ -355,14 +355,14 @@ ScrCmd_Unk00FF: ; 0x02040170 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl VarGet + bl FieldSystem_VarGet add r1, r0, #0x0 mov r0, #0x0 str r0, [sp, #0x0] @@ -440,7 +440,7 @@ ScrCmd_Unk0102: ; 0x02040220 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl VarGet + bl FieldSystem_VarGet add r2, r0, #0x0 ldr r0, [r4, #0x0] ldr r1, [r6, #0x0] @@ -468,7 +468,7 @@ ScrCmd_Unk0103: ; 0x0204025C add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl VarGet + bl FieldSystem_VarGet add r2, r0, #0x0 ldr r0, [r4, #0x0] ldr r1, [r6, #0x0] @@ -496,7 +496,7 @@ ScrCmd_Unk0104: ; 0x02040298 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl VarGet + bl FieldSystem_VarGet add r2, r0, #0x0 ldr r0, [r4, #0x0] ldr r1, [r6, #0x0] @@ -547,7 +547,7 @@ ScrCmd_Unk0106: ; 0x02040304 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl VarGet + bl FieldSystem_VarGet add r2, r0, #0x0 ldr r0, [r4, #0x0] ldr r1, [r6, #0x0] @@ -639,7 +639,7 @@ ScrCmd_Unk010A: ; 0x020403D0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -670,7 +670,7 @@ ScrCmd_Unk010B: ; 0x02040414 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -803,7 +803,7 @@ ScrCmd_Unk010E: ; 0x0204052C add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl VarGet + bl FieldSystem_VarGet add r2, r0, #0x0 ldr r0, [r4, #0x0] ldr r1, [r6, #0x0] @@ -876,7 +876,7 @@ ScrCmd_Unk0111: ; 0x020405CC add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl VarGet + bl FieldSystem_VarGet add r1, r0, #0x0 ldr r0, [r5, #0x0] bl sub_02082444 diff --git a/arm9/asm/scrcmd_5.s b/arm9/asm/scrcmd_5.s index 7e93600de..bd3ed6c30 100644 --- a/arm9/asm/scrcmd_5.s +++ b/arm9/asm/scrcmd_5.s @@ -71,7 +71,7 @@ ScrCmd_Unk024F: ; 0x020411C4 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl VarGet + bl FieldSystem_VarGet str r0, [sp, #0x0] ldr r0, [r7, #0xc] bl SaveArray_Party_Get diff --git a/arm9/asm/scrcmd_7.s b/arm9/asm/scrcmd_7.s index 68d761235..51bf53d82 100644 --- a/arm9/asm/scrcmd_7.s +++ b/arm9/asm/scrcmd_7.s @@ -15,7 +15,7 @@ ScrCmd_Unk00B6: ; 0x020416A8 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl VarGet + bl FieldSystem_VarGet add r5, r0, #0x0 bne _02041708 add r0, r4, #0x0 @@ -100,7 +100,7 @@ ScrCmd_Unk00B7: ; 0x02041770 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -187,7 +187,7 @@ ScrCmd_Unk00B9: ; 0x02041808 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -250,7 +250,7 @@ ScrCmd_Unk00E5: ; 0x0204188C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet str r0, [sp, #0xc] add r0, r5, #0x0 bl ScriptReadHalfword @@ -258,7 +258,7 @@ ScrCmd_Unk00E5: ; 0x0204188C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet str r0, [sp, #0x8] add r0, r5, #0x0 add r0, #0x80 @@ -303,7 +303,7 @@ ScrCmd_Unk02A0: ; 0x0204190C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -311,7 +311,7 @@ ScrCmd_Unk02A0: ; 0x0204190C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -319,7 +319,7 @@ ScrCmd_Unk02A0: ; 0x0204190C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r2, r0, #0x0 mov r0, #0xb str r0, [sp, #0x0] @@ -492,7 +492,7 @@ ScrCmd_Unk00EA: ; 0x02041AB4 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl VarGet + bl FieldSystem_VarGet bl sub_0204AD0C bl sub_02004724 mov r0, #0x1 diff --git a/arm9/asm/scrcmd_9.s b/arm9/asm/scrcmd_9.s index 9b29a2626..3370b8dac 100644 --- a/arm9/asm/scrcmd_9.s +++ b/arm9/asm/scrcmd_9.s @@ -111,7 +111,7 @@ _02041ECA: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -173,7 +173,7 @@ _02041F68: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -181,7 +181,7 @@ _02041F68: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -226,7 +226,7 @@ ScrCmd_Unk0236: ; 0x02041FDC add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] @@ -250,7 +250,7 @@ ScrCmd_Unk02B8: ; 0x02042000 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r1, r0, #0x0 add r0, r4, #0x0 bl Party_GetMonByIndex @@ -284,7 +284,7 @@ _02042058: add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet str r0, [sp, #0x0] add r0, r5, #0x0 bl ScriptReadHalfword @@ -324,7 +324,7 @@ _020420A8: add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -332,7 +332,7 @@ _020420A8: add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -340,7 +340,7 @@ _020420A8: add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r5, #0x80 add r3, r0, #0x0 ldr r0, [r5, #0x0] @@ -365,7 +365,7 @@ ScrCmd_Unk0238: ; 0x02042110 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl VarGet + bl FieldSystem_VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -414,7 +414,7 @@ _02042170: add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl VarGet + bl FieldSystem_VarGet add r1, r0, #0x0 add r0, r6, #0x0 bl Party_GetMonByIndex @@ -429,7 +429,7 @@ _020421A2: add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl VarGet + bl FieldSystem_VarGet add r1, r0, #0x0 add r0, r4, #0x0 bl sub_02060F9C @@ -440,7 +440,7 @@ _020421BC: add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl VarGet + bl FieldSystem_VarGet add r1, r0, #0x0 add r0, r4, #0x0 bl sub_02060F88 diff --git a/arm9/asm/unk_02037024.s b/arm9/asm/unk_02037024.s index dff013275..9f62a44e1 100644 --- a/arm9/asm/unk_02037024.s +++ b/arm9/asm/unk_02037024.s @@ -359,7 +359,7 @@ _0203728A: bge _020372BE ldrh r1, [r5, #0xe] ldr r0, [sp, #0x0] - bl VarGet + bl FieldSystem_VarGet ldrh r1, [r5, #0xc] cmp r1, r0 bne _020372BE diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index 40324149e..96139b454 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -1969,8 +1969,8 @@ _020394DE: nop _020394EC: .word 0x00007FD7 - thumb_func_start VarGet -VarGet: ; 0x020394F0 + thumb_func_start FieldSystem_VarGet +FieldSystem_VarGet: ; 0x020394F0 push {r4, lr} add r4, r1, #0x0 bl GetVarPointer @@ -1996,7 +1996,7 @@ _02039512: add r1, r4, r1 lsl r1, r1, #0x10 lsr r1, r1, #0x10 - bl VarGet + bl FieldSystem_VarGet pop {r3-r5, pc} nop _02039524: .word 0x00004020 @@ -2592,11 +2592,11 @@ _02039968: lsl r0, r0, #0x10 lsr r6, r0, #0x10 add r0, r5, #0x0 - bl VarGet + bl FieldSystem_VarGet add r7, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 - bl VarGet + bl FieldSystem_VarGet cmp r7, r0 bne _02039996 ldrb r0, [r4, #0x5] diff --git a/arm9/global.inc b/arm9/global.inc index 6c0e67d3a..8d4c183c3 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -2679,7 +2679,7 @@ .extern FieldSysGetAttrAddr .extern sub_02039460 .extern GetVarPointer -.extern VarGet +.extern FieldSystem_VarGet .extern sub_02039504 .extern FlagCheck .extern FieldSystem_FlagSet diff --git a/include/scrcmd.h b/include/scrcmd.h index b004ce3a0..b22bb20ad 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -4,13 +4,13 @@ #include "global.h" #include "script.h" -extern u16 VarGet(FieldSystem *fieldSystem, u16); +extern u16 FieldSystem_VarGet(FieldSystem *fieldSystem, u16); extern u16* GetVarPointer(FieldSystem *fieldSystem, u16); extern SaveData* FieldSystem_GetSaveData(FieldSystem *fieldSystem); static inline u16 ScriptGetVar(ScriptContext *ctx) { - return VarGet(ctx->fieldSystem, ScriptReadHalfword(ctx)); + return FieldSystem_VarGet(ctx->fieldSystem, ScriptReadHalfword(ctx)); } static inline u16 *ScriptGetVarPointer(ScriptContext *ctx)