Game-Decompilation/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2025-02-10 23:23:34 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

rename savedata to saveData

Browse Source
This commit is contained in:
red031000 2023-08-22 17:56:55 +01:00
parent bca5e347bb
commit ee2ad104a7
No known key found for this signature in database
GPG Key ID: D27E50C050AE0CE1
136 changed files with 1019 additions and 1019 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/battle_setup.s
View File

@ -378,7 +378,7 @@ sub_02051AAC: ; 0x02051AAC
lsl r0, r0, #2
strb r1, [r4, r0]
ldr r0, [r5, #0xc]
bl GetStoragePCPointer
bl Save_PCStorage_Get
mov r1, #0x45
lsl r1, r1, #2
str r0, [r4, r1]
@ -695,7 +695,7 @@ _02051E14:
mov r2, #0
bl sub_02051D04
add r0, r4, #0
bl GetStoragePCPointer
bl Save_PCStorage_Get
mov r1, #0x45
lsl r1, r1, #2
str r0, [r5, r1]
@ -919,7 +919,7 @@ _02052004:
bl sub_02051D04
ldr r0, [sp]
ldr r0, [r0, #0xc]
bl GetStoragePCPointer
bl Save_PCStorage_Get
mov r1, #0x45
lsl r1, r1, #2
str r0, [r5, r1]
@ -1147,7 +1147,7 @@ _020521F6:
bl sub_02051D04
ldr r0, [sp]
ldr r0, [r0, #0xc]
bl GetStoragePCPointer
bl Save_PCStorage_Get
mov r1, #0x45
lsl r1, r1, #2
str r0, [r5, r1]

10
asm/field_take_photo.s
View File

@ -58,7 +58,7 @@ FieldSystem_TakePhoto: ; 0x0206A798
strb r0, [r1]
_0206A7FE:
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_PhotoAlbum_Get
bl PhotoAlbum_GetIndexOfFirstEmptySlot
cmp r0, #0xff
@ -653,7 +653,7 @@ _0206AC36:
ldr r0, _0206AEAC ; =NNS_G3dGlb + 0x80
str r1, [r0, #0x20]
add r0, r6, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_PlayerData_GetProfileAddr
bl PlayerProfile_GetTrainerGender
add r5, #0x30
@ -1124,7 +1124,7 @@ sub_0206B014: ; 0x0206B014
add r0, r4, #0
str r2, [sp]
str r3, [sp, #4]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
add r7, r0, #0
bl Save_PlayerData_GetProfileAddr
add r6, r0, #0
@ -1512,7 +1512,7 @@ _0206B332:
b _0206B824
_0206B346:
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_PlayerData_GetProfileAddr
bl PlayerProfile_GetTrainerGender
ldr r1, [r4, #0x40]
@ -1898,7 +1898,7 @@ _0206B652:
cmp r0, #0
beq _0206B6EA
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_PhotoAlbum_Get
add r5, r0, #0
bl PhotoAlbum_GetIndexOfFirstEmptySlot

2
asm/include/battle_setup.inc
View File

@ -12,7 +12,7 @@
.public String_New
.public String_Delete
.public String_cstr
.public GetStoragePCPointer
.public Save_PCStorage_Get
.public Save_SysInfo_RTC_Get
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetOptionsAddr

2
asm/include/field_take_photo.inc
View File

@ -32,7 +32,7 @@
.public PhotoAlbum_GetPhotoByIndex
.public Photo_Init
.public sub_0203E33C
.public FieldSystem_GetSaveDataPtr
.public FieldSystem_GetSaveData
.public sub_0203EBA4
.public TaskManager_Call
.public FieldSystem_ApplicationIsRunning

4
asm/include/overlay_01_021E5900.inc
View File

@ -50,7 +50,7 @@
.public Thunk_G3X_Reset
.public sub_02026E50
.public Save_GetGymmickPtr
.public SavGymmick_GetType
.public Save_Gymmick_GetType
.public MapMatrix_GetMapHeader
.public MapHeader_GetAreaDataBank
.public MapHeader_GetMoveModelBank
@ -62,7 +62,7 @@
.public LocalFieldData_GetWeatherType
.public LocalFieldData_GetCameraType
.public Save_LocalFieldData_Get
.public FieldSystem_GetSaveDataPtr
.public FieldSystem_GetSaveData
.public sub_0203E348
.public TryStartMapScriptByType
.public Save_VarsFlags_Get

2
asm/include/overlay_01_021E6880.inc
View File

@ -142,7 +142,7 @@
.public CheckBattledRedGyarados
.public Save_VarsFlags_GetVar404B
.public Save_VarsFlags_SetVar404B
.public FieldSystem_IsSavGymmickTypeEqualTo
.public FieldSystem_IsSave_GymmickTypeEqualTo
.public FollowingPokemon_GetMapObject
.public FollowingPokemon_IsActive
.public sub_02069FB0

2
asm/include/overlay_02.inc
View File

@ -201,7 +201,7 @@
.public Save_LocalFieldData_Get
.public GetFlyWarpData
.public GetSpecialSpawnWarpData
.public FieldSystem_GetSaveDataPtr
.public FieldSystem_GetSaveData
.public StartMapSceneScript
.public QueueScript
.public FlagGet

2
asm/include/overlay_03.inc
View File

@ -163,7 +163,7 @@
.public sub_02037EC0
.public sub_020398D4
.public MapHeader_GetMapSec
.public FieldSystem_GetSaveDataPtr
.public FieldSystem_GetSaveData
.public sub_0203E3D4
.public sub_0203EB08
.public SetupNativeScript

6
asm/include/overlay_04.inc
View File

@ -20,9 +20,9 @@
.public sub_02023F90
.public GF_AssertFail
.public Save_GetGymmickPtr
.public SavGymmick_AssertMagic_GetData
.public SavGymmick_GetType
.public FieldSystem_GetSaveDataPtr
.public Save_Gymmick_AssertMagic_GetData
.public Save_Gymmick_GetType
.public FieldSystem_GetSaveData
.public FieldSysGetAttrAddr
.public FieldSystem_CreateTask
.public TaskManager_Call

2
asm/include/overlay_101.inc
View File

@ -168,7 +168,7 @@
.public String_CountLines
.public String_GetLineN
.public String_RadioAddStatic
.public GetStoragePCPointer
.public Save_PCStorage_Get
.public Save_SysInfo_RTC_Get
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetOptionsAddr

2
asm/include/overlay_112.inc
View File

@ -200,7 +200,7 @@
.public CopyStringToU16Array
.public String_Cat
.public String_AddChar
.public GetStoragePCPointer
.public Save_PCStorage_Get
.public SaveGameNormal
.public Save_ClearStatusFlags
.public Save_PlayerData_GetProfileAddr

2
asm/include/overlay_14.inc
View File

@ -202,7 +202,7 @@
.public sub_02025380
.public String_New
.public String_Delete
.public GetStoragePCPointer
.public Save_PCStorage_Get
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetOptionsAddr
.public Options_GetFrame

2
asm/include/overlay_40.inc
View File

@ -180,7 +180,7 @@
.public sub_02026E50
.public GF_3DVramMan_Create
.public GF_3DVramMan_Delete
.public GetStoragePCPointer
.public Save_PCStorage_Get
.public sub_02027134
.public SaveGameNormal
.public Save_NumModifiedPCBoxesIsMany

2
asm/include/overlay_97.inc
View File

@ -74,7 +74,7 @@
.public String_New
.public String_Delete
.public CopyU16ArrayToString
.public GetStoragePCPointer
.public Save_PCStorage_Get
.public Save_Pokeathlon_Get
.public sub_020319A8
.public sub_0203A994

2
asm/include/scrcmd_11.inc
View File

@ -44,7 +44,7 @@
.public Save_Pokewalker_Get
.public Pokewalker_CourseIsUnlocked
.public Pokewalker_UnlockCourse
.public FieldSystem_GetSaveDataPtr
.public FieldSystem_GetSaveData
.public ScriptReadHalfword
.public FieldSysGetAttrAddr
.public GetVarPointer

2
asm/include/scrcmd_9.inc
View File

@ -55,7 +55,7 @@
.public sub_02037C0C
.public LocalFieldData_GetDynamicWarp
.public Save_LocalFieldData_Get
.public FieldSystem_GetSaveDataPtr
.public FieldSystem_GetSaveData
.public SetupNativeScript
.public ScriptReadHalfword
.public FieldSysGetAttrAddr

4
asm/include/unk_0203E348.inc
View File

@ -16,7 +16,7 @@
.public CopyU16ArrayToString
.public String_cstr
.public sub_020270C4
.public GetStoragePCPointer
.public Save_PCStorage_Get
.public LoadHallOfFame
.public SaveArray_Get
.public Save_SysInfo_Get
@ -61,7 +61,7 @@
.public LocalFieldData_GetCurrentPosition
.public Save_LocalFieldData_Get
.public FieldSystem_LaunchApplication
.public FieldSystem_GetSaveDataPtr
.public FieldSystem_GetSaveData
.public LocationData_BackUp
.public LocationData_Restore
.public Save_CurrentLocation_BackUp

2
asm/include/unk_02058034.inc
View File

@ -40,7 +40,7 @@
.public sub_0203993C
.public sub_02039980
.public sub_020399FC
.public FieldSystem_GetSaveDataPtr
.public FieldSystem_GetSaveData
.public StartMapSceneScript
.public sub_02051598
.public sub_020515FC

2
asm/include/unk_02058AEC.inc
View File

@ -76,7 +76,7 @@
.public sub_0203996C
.public FieldSystem_LaunchApplication
.public sub_0203E2F4
.public FieldSystem_GetSaveDataPtr
.public FieldSystem_GetSaveData
.public sub_0203F7B0
.public FieldSystem_CreateTask
.public FieldSystem_TaskIsRunning

2
asm/include/unk_0205CB48.inc
View File

@ -113,7 +113,7 @@
.public MapObject_ClearHeldMovement
.public sub_0206234C
.public sub_02062390
.public FieldSystem_IsSavGymmickTypeEqualTo
.public FieldSystem_IsSave_GymmickTypeEqualTo
.public FollowingPokemon_IsActive
.public sub_0206D494
.public Field_PlayerAvatar_ApplyTransitionFlags

10
asm/include/unk_02068DE0.inc
View File

@ -4,10 +4,10 @@
.public Save_PlayerData_GetProfileAddr
.public PlayerProfile_TestBadgeFlag
.public Save_GetGymmickPtr
.public SavGymmick_Init
.public SavGymmick_AssertMagic_GetData
.public SavGymmick_GetType
.public FieldSystem_GetSaveDataPtr
.public Save_Gymmick_Init
.public Save_Gymmick_AssertMagic_GetData
.public Save_Gymmick_GetType
.public FieldSystem_GetSaveData
.public InitEcruteakGym
.public InitCianwoodGym
.public InitVermilionGym
@ -17,5 +17,5 @@
.public InitBlackthornGym
.public InitFuchsiaGym
.public InitViridianGym
.public FieldSystem_IsSavGymmickTypeEqualTo
.public FieldSystem_IsSave_GymmickTypeEqualTo
.public _s32_div_f

2
asm/include/unk_02068FC8.inc
View File

@ -27,7 +27,7 @@
.public GameStats_GetStat2
.public sub_0203107C
.public sub_020310BC
.public FieldSystem_GetSaveDataPtr
.public FieldSystem_GetSaveData
.public sub_0203F7B0
.public Save_VarsFlags_Get
.public CheckFlagInArray

6
asm/include/unk_0206D494.inc
View File

@ -18,14 +18,14 @@
.public Save_Misc_Get
.public Save_GetGymmickPtr
.public SaveMisc_GetTogepiPersonalityGender
.public SavGymmick_Init
.public SavGymmick_AssertMagic_GetData
.public Save_Gymmick_Init
.public Save_Gymmick_AssertMagic_GetData
.public Save_TrainerHouse_Get
.public TrainerHouseSet_CheckHasData
.public LocalFieldData_GetDynamicWarp
.public LocalFieldData_SetDynamicWarp
.public Save_LocalFieldData_Get
.public FieldSystem_GetSaveDataPtr
.public FieldSystem_GetSaveData
.public sub_0203EDDC
.public ScriptReadHalfword
.public GetVarPointer

2
asm/include/unk_020910D8.inc
View File

@ -6,7 +6,7 @@
.public Save_PlayerData_GetOptionsAddr
.public UpdatePokedexWithReceivedSpecies
.public MapHeader_GetMapSec
.public FieldSystem_GetSaveDataPtr
.public FieldSystem_GetSaveData
.public TaskManager_Call
.public CallApplicationAsTask
.public TaskManager_GetFieldSystem

2
asm/include/unk_02095DF4.inc
View File

@ -3,7 +3,7 @@
.public AllocFromHeapAtEnd
.public FreeToHeap
.public sub_0203E30C
.public FieldSystem_GetSaveDataPtr
.public FieldSystem_GetSaveData
.public FieldSystem_LaunchPokeathlonCourseApplication
.public TaskManager_Call
.public FieldSystem_ApplicationIsRunning

2
asm/include/unk_02097D3C.inc
View File

@ -5,7 +5,7 @@
.public AllocFromHeapAtEnd
.public FreeToHeap
.public sub_0203E30C
.public FieldSystem_GetSaveDataPtr
.public FieldSystem_GetSaveData
.public sub_0203FD08
.public TaskManager_Call
.public FieldSystem_ApplicationIsRunning

4
asm/overlay_01_021E5900.s
View File

@ -634,9 +634,9 @@ _021E5EB4: .word FS_OVERLAY_ID(OVY_3)
thumb_func_start ov01_021E5EB8
ov01_021E5EB8: ; 0x021E5EB8
push {r3, lr}
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
bl SavGymmick_GetType
bl Save_Gymmick_GetType
cmp r0, #0
bne _021E5ECE
mov r0, #1

2
asm/overlay_01_021E6880.s
View File

@ -1698,7 +1698,7 @@ ov01_021E7628: ; 0x021E7628
push {r3, r4, r5, r6, r7, lr}
mov r1, #6
add r5, r0, #0
bl FieldSystem_IsSavGymmickTypeEqualTo
bl FieldSystem_IsSave_GymmickTypeEqualTo
cmp r0, #0
beq _021E7644
add r0, r5, #0

2
asm/overlay_02.s
View File

@ -18288,7 +18288,7 @@ ov02_0224E4EC: ; 0x0224E4EC
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
str r0, [r4]
mov r0, #0x43
lsl r0, r0, #2

2
asm/overlay_03.s
View File

@ -207,7 +207,7 @@ _02253F84:
str r0, [r2, #0x74]
ldr r0, [r1]
ldr r0, [r0, #0x68]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_PlayerData_GetProfileAddr
ldr r1, _02254050 ; =ov03_022598A0
ldr r1, [r1]

94
asm/overlay_04.s
View File

@ -11,10 +11,10 @@ ov04_02253E20: ; 0x02253E20
push {r3, r4, r5, r6, lr}
sub sp, #0x24
add r5, r0, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #4
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
add r3, sp, #0x18
ldr r6, _02253ECC ; =_02257328
add r4, r0, #0
@ -104,10 +104,10 @@ ov04_02253ED4: ; 0x02253ED4
str r0, [r4]
add r0, r5, #0
str r5, [r4, #4]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #4
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
add r6, r0, #0
ldr r0, [r5, #0x40]
add r1, sp, #0
@ -433,10 +433,10 @@ ov04_02254190: ; 0x02254190
push {r3, r4, r5, r6, r7, lr}
sub sp, #0x10
add r4, r0, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #5
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
add r7, r0, #0
mov r0, #4
mov r1, #0x54
@ -720,10 +720,10 @@ FlipAzaleaGymSwitch: ; 0x02254404
sub sp, #0xc
add r5, r0, #0
add r6, r1, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #5
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
add r4, r0, #0
ldr r0, _02254560 ; =SEQ_SE_DP_KI_GASYAN
bl PlaySE
@ -898,10 +898,10 @@ BeginAzaleaGymSpinarakRide: ; 0x02254568
strb r0, [r4, #0x16]
add r0, r6, #0
str r1, [r4, #0x1c]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #5
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
add r2, r0, #0
ldr r0, [r2, #4]
mov r1, #0
@ -1452,10 +1452,10 @@ _02254992:
cmp r0, r1
blt _022549FE
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #5
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
ldr r1, [sp, #0x1c]
add r1, r1, r7
ldrh r2, [r1, #2]
@ -1809,10 +1809,10 @@ ov04_02254CBC: ; 0x02254CBC
push {r4, r5, r6, r7, lr}
sub sp, #0x34
add r5, r0, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #1
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
add r7, r0, #0
mov r0, #4
mov r1, #0x1c
@ -2050,10 +2050,10 @@ _02254E86:
mov r1, #1
bl ov01_021F3B2C
ldr r0, [r4, #0xc]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #1
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
ldr r1, [r5, #0x10]
mov r2, #1
strb r2, [r0, r1]
@ -2176,10 +2176,10 @@ ov04_02254F8C: ; 0x02254F8C
ldr r0, [r3]
str r0, [r2]
ldr r0, [sp, #4]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #6
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
str r0, [sp, #0x10]
ldr r1, _02255074 ; =0x00000754
mov r0, #4
@ -2297,9 +2297,9 @@ ov04_0225507C: ; 0x0225507C
ov04_02255090: ; 0x02255090
push {r4, r5, r6, lr}
add r5, r0, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
bl SavGymmick_GetType
bl Save_Gymmick_GetType
cmp r0, #6
beq _022550A8
mov r0, #0
@ -3651,10 +3651,10 @@ _02255A16:
mul r1, r2
add r5, r0, r1
add r0, r6, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #6
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
ldr r1, [sp, #4]
lsl r1, r1, #0x10
lsr r2, r1, #0x10
@ -3825,10 +3825,10 @@ _02255BA6:
add r0, #0x4f
strb r1, [r0]
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #6
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
add r3, r0, #0
mov ip, r0
add r0, r4, #0
@ -4328,10 +4328,10 @@ _02255FBC: .word SEQ_SE_GS_GONDORA_KABEHIT
ov04_02255FC0: ; 0x02255FC0
push {r3, r4, r5, r6, r7, lr}
add r5, r0, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #2
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
add r4, r0, #0
mov r0, #4
add r1, r0, #0
@ -4402,10 +4402,10 @@ ov04_02256044: ; 0x02256044
ov04_02256058: ; 0x02256058
push {r3, r4, r5, lr}
add r5, r0, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
add r4, r0, #0
bl SavGymmick_GetType
bl Save_Gymmick_GetType
cmp r0, #2
beq _02256072
mov r0, #0
@ -4413,7 +4413,7 @@ ov04_02256058: ; 0x02256058
_02256072:
add r0, r4, #0
mov r1, #2
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
ldr r1, [r5, #4]
ldr r1, [r1, #0x24]
cmp r1, #0
@ -4439,10 +4439,10 @@ ov04_0225609C: ; 0x0225609C
push {r3, r4, r5, lr}
add r5, r0, #0
ldr r0, [r5]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #2
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
add r4, r0, #0
mov r0, #0xb
mov r1, #0xc
@ -4733,10 +4733,10 @@ _022562EC:
ov04_02256304: ; 0x02256304
push {r3, r4, r5, r6, r7, lr}
add r5, r0, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #3
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
str r0, [sp]
mov r0, #4
add r1, r0, #0
@ -4829,10 +4829,10 @@ ov04_022563B0: ; 0x022563B0
ov04_022563C4: ; 0x022563C4
push {r4, lr}
add r4, r1, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #3
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
ldrb r2, [r0, #2]
cmp r2, #0
beq _022563E6
@ -4873,10 +4873,10 @@ ov04_0225640C: ; 0x0225640C
add r5, r0, #0
add r7, r1, #0
str r2, [sp]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #3
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
add r6, r0, #0
mov r0, #0xb
mov r1, #0x18
@ -5157,10 +5157,10 @@ _0225664C: .word SEQ_SE_DP_UG_020
ov04_02256650: ; 0x02256650
push {r4, lr}
add r4, r0, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #7
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
ldr r1, _02256698 ; =0x00001DD8
mov r0, #4
bl AllocFromHeap
@ -5833,10 +5833,10 @@ ov04_02256B3C: ; 0x02256B3C
ov04_02256B64: ; 0x02256B64
push {r4, lr}
add r4, r0, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #8
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
ldr r1, _02256B9C ; =0x00000708
mov r0, #4
bl AllocFromHeap
@ -6228,10 +6228,10 @@ _02256E5A:
ov04_02256E60: ; 0x02256E60
push {r3, r4, r5, lr}
add r5, r0, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #9
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
mov r1, #0x8e
mov r0, #4
lsl r1, r1, #2
@ -6326,10 +6326,10 @@ _02256F14:
bl GF_AssertFail
_02256F24:
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #9
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
str r6, [r0]
mov r0, #0x23
mov r1, #1
@ -6613,10 +6613,10 @@ ov04_02257148: ; 0x02257148
strb r0, [r1, #1]
strb r0, [r1, #2]
ldr r0, [r7]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #9
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
ldr r0, [r0]
cmp r0, #3
bhi _0225719A

2
asm/overlay_101.s
View File

@ -24741,7 +24741,7 @@ _021F3634:
pop {r4, r5, r6, pc}
_021F3642:
ldr r0, [r4, #0x1c]
bl GetStoragePCPointer
bl Save_PCStorage_Get
add r6, r0, #0
bl PCStorage_GetActiveBox
add r1, r0, #0

18
asm/overlay_112.s
View File

@ -10118,7 +10118,7 @@ ov112_021EAC5C: ; 0x021EAC5C
sub sp, #0x14
add r5, r0, #0
ldr r0, [r5, #0x20]
bl GetStoragePCPointer
bl Save_PCStorage_Get
add r4, r0, #0
mov r0, #6
str r0, [sp]
@ -12781,7 +12781,7 @@ ov112_021EC134: ; 0x021EC134
mov r0, #0
str r0, [sp, #4]
ldr r0, [r5, #0x20]
bl GetStoragePCPointer
bl Save_PCStorage_Get
add r4, r0, #0
ldr r0, _021EC1A0 ; =0x0001E440
add r1, sp, #0
@ -17459,7 +17459,7 @@ ov112_021EE628: ; 0x021EE628
push {r3, r4, r5, r6, r7, lr}
add r5, r0, #0
ldr r0, [r5, #0x20]
bl GetStoragePCPointer
bl Save_PCStorage_Get
add r7, r0, #0
ldr r0, _021EE67C ; =0x0001D770
mov r1, #2
@ -17678,7 +17678,7 @@ ov112_021EE7A8: ; 0x021EE7A8
sub sp, #0x14
add r5, r0, #0
ldr r0, [r5, #0x20]
bl GetStoragePCPointer
bl Save_PCStorage_Get
str r0, [sp, #4]
mov r0, #0x9a
bl AllocMonZeroed
@ -18079,7 +18079,7 @@ ov112_021EEAF0: ; 0x021EEAF0
add r5, r0, #0
ldr r0, [r5, #0x20]
add r6, r1, #0
bl GetStoragePCPointer
bl Save_PCStorage_Get
add r7, r0, #0
mov r0, #0x9a
bl AllocMonZeroed
@ -18672,7 +18672,7 @@ _021EEF86:
add r0, r6, #0
str r1, [r5, r0]
ldr r0, [r5, #0x20]
bl GetStoragePCPointer
bl Save_PCStorage_Get
add r4, r0, #0
ldr r0, [r5, #0x20]
bl SaveArray_Party_Get
@ -19154,7 +19154,7 @@ ov112_021EF31C: ; 0x021EF31C
str r1, [r4, r0]
pop {r4, r5, r6, pc}
_021EF38C:
bl GetStoragePCPointer
bl Save_PCStorage_Get
ldr r2, [r5, #0x10]
add r1, r6, #0
bl PCStorage_GetMonByIndexPair
@ -19171,7 +19171,7 @@ _021EF38C:
str r1, [r4, r0]
_021EF3B0:
ldr r0, [r4, #0x20]
bl GetStoragePCPointer
bl Save_PCStorage_Get
ldr r1, [r5, #0xc]
ldr r2, [r5, #0x10]
add r3, sp, #0
@ -19311,7 +19311,7 @@ _021EF4A2:
add sp, #0x60
pop {r3, r4, r5, r6, r7, pc}
_021EF4D6:
bl GetStoragePCPointer
bl Save_PCStorage_Get
add r1, r5, #0
add r2, r4, #0
add r3, sp, #4

2
asm/overlay_14.s
View File

@ -26,7 +26,7 @@ ov14_021E5900: ; 0x021E5900
bl OverlayManager_GetArgs
str r0, [r4]
ldr r0, [r0]
bl GetStoragePCPointer
bl Save_PCStorage_Get
str r0, [r4, #4]
bl PCStorage_GetActiveBox
strb r0, [r4, #0x1f]

6
asm/overlay_40.s
View File

@ -21741,7 +21741,7 @@ ov40_022365A0: ; 0x022365A0
mov r0, #0x83
lsl r0, r0, #4
ldr r0, [r5, r0]
bl GetStoragePCPointer
bl Save_PCStorage_Get
str r0, [r4]
mov r0, #0x83
mov r2, #0x1a
@ -23674,7 +23674,7 @@ ov40_0223757C: ; 0x0223757C
ldr r4, [r5, r0]
sub r0, #0x30
ldr r0, [r5, r0]
bl GetStoragePCPointer
bl Save_PCStorage_Get
ldr r0, _0223763C ; =0x0000017A
ldrb r1, [r4, r0]
cmp r1, #0x10
@ -23769,7 +23769,7 @@ ov40_02237644: ; 0x02237644
ldr r4, [r5, r0]
sub r0, #0x30
ldr r0, [r5, r0]
bl GetStoragePCPointer
bl Save_PCStorage_Get
ldr r1, _022376F8 ; =0x0000017A
ldrb r2, [r4, r1]
cmp r2, #0x10

10
asm/overlay_97.s
View File

@ -216,7 +216,7 @@ ov97_0221E700: ; 0x0221E700
mov r6, #1
_0221E76A:
ldr r0, [r5]
bl GetStoragePCPointer
bl Save_PCStorage_Get
add r7, r0, #0
ldr r0, [r5]
bl SaveArray_Party_Get
@ -559,7 +559,7 @@ _0221E9B4:
b _0221EA6A
_0221EA20:
ldr r0, [r0]
bl GetStoragePCPointer
bl Save_PCStorage_Get
ldr r2, [r5, #0x14]
add r1, r6, #0
add r3, sp, #0xc
@ -583,7 +583,7 @@ _0221EA20:
strb r0, [r4, #0x1d]
ldr r0, [r7]
ldr r0, [r0]
bl GetStoragePCPointer
bl Save_PCStorage_Get
ldr r1, [r5, #0x10]
ldr r2, [r5, #0x14]
bl PCStorage_GetMonByIndexPair
@ -931,7 +931,7 @@ _0221ED04:
add sp, #0xc0
pop {r3, r4, r5, r6, r7, pc}
_0221ED1C:
bl GetStoragePCPointer
bl Save_PCStorage_Get
add r1, r6, #0
add r2, r4, #0
add r3, sp, #0x2c
@ -956,7 +956,7 @@ _0221ED1C:
ldrh r1, [r1, #0x3e]
strb r1, [r0, #8]
ldr r0, [r5, #0x2c]
bl GetStoragePCPointer
bl Save_PCStorage_Get
add r1, r6, #0
add r2, r4, #0
bl PCStorage_GetMonByIndexPair

2
asm/scrcmd_11.s
View File

@ -1414,7 +1414,7 @@ MGGive_MemorialPhoto: ; 0x0204C798
bl FieldSystem_GetDataOfNextMG
add r5, r0, #0
add r0, r4, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_PhotoAlbum_Get
add r4, r0, #0
bl PhotoAlbum_GetIndexOfFirstEmptySlot

2
asm/scrcmd_9.s
View File

@ -71,7 +71,7 @@ ScrCmd_410: ; 0x02049CA8
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
add r1, r4, #0
add r2, r6, #0
bl sub_0204A824

40
asm/unk_0203E348.s
View File

@ -1165,7 +1165,7 @@ sub_0203EB08: ; 0x0203EB08
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
str r0, [r4]
mov r0, #0x43
lsl r0, r0, #2
@ -1250,7 +1250,7 @@ sub_0203EBA4: ; 0x0203EBA4
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
str r0, [r4, #0xc]
mov r0, #0x43
lsl r0, r0, #2
@ -1300,7 +1300,7 @@ FieldSystem_CreateApplication_AlphPuzzle: ; 0x0203EC04
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
str r0, [r4, #0xc]
mov r0, #0x43
lsl r0, r0, #2
@ -1349,7 +1349,7 @@ CreateUnownReportWork: ; 0x0203EC64
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
str r0, [r4, #4]
mov r0, #0x43
lsl r0, r0, #2
@ -1397,7 +1397,7 @@ BerryPotsArgs_New: ; 0x0203ECC0
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
str r0, [r4, #0xc]
mov r0, #0x43
lsl r0, r0, #2
@ -1450,7 +1450,7 @@ CreateApricornBoxWork: ; 0x0203ED24
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
str r0, [r4, #0x18]
mov r0, #0x43
lsl r0, r0, #2
@ -1495,7 +1495,7 @@ sub_0203ED80: ; 0x0203ED80
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
str r0, [r4, #0x18]
mov r0, #0x43
lsl r0, r0, #2
@ -1576,7 +1576,7 @@ sub_0203EE24: ; 0x0203EE24
bl AllocFromHeapAtEnd
add r4, r0, #0
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_PlayerData_GetOptionsAddr
str r0, [r4, #4]
mov r0, #0x43
@ -1640,7 +1640,7 @@ sub_0203EEA0: ; 0x0203EEA0
bl AllocFromHeapAtEnd
add r4, r0, #0
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
add r6, r0, #0
bl Save_Pokeathlon_Get
bl sub_02031974
@ -1675,7 +1675,7 @@ sub_0203EEE4: ; 0x0203EEE4
bl AllocFromHeapAtEnd
add r4, r0, #0
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
add r6, r0, #0
bl Save_Pokeathlon_Get
add r7, r0, #0
@ -1720,7 +1720,7 @@ sub_0203EF40: ; 0x0203EF40
bl AllocFromHeapAtEnd
add r4, r0, #0
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
add r6, r0, #0
bl Save_Pokeathlon_Get
add r7, r0, #0
@ -1766,7 +1766,7 @@ sub_0203EFA0: ; 0x0203EFA0
bl AllocFromHeapAtEnd
add r4, r0, #0
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
add r7, r0, #0
bl Save_PlayerData_GetProfileAddr
add r6, r0, #0
@ -1804,7 +1804,7 @@ sub_0203EFEC: ; 0x0203EFEC
add r4, r1, #0
add r6, r2, #0
add r7, r3, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
mov r1, #0xb
str r1, [sp]
add r1, r4, #0
@ -1829,13 +1829,13 @@ CreateUseMailWork: ; 0x0203F018
add r6, r3, #0
cmp r5, #3
bne _0203F034
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
add r1, r4, #0
add r2, r6, #0
bl sub_02090F38
b _0203F042
_0203F034:
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
add r1, r5, #0
add r2, r4, #0
add r3, r6, #0
@ -1855,7 +1855,7 @@ sub_0203F050: ; 0x0203F050
add r4, r1, #0
add r6, r2, #0
add r5, r0, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
add r1, r4, #0
add r2, r6, #0
bl sub_02090F00
@ -1877,7 +1877,7 @@ sub_0203F074: ; 0x0203F074
bl AllocFromHeap
add r4, r0, #0
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
str r0, [r4]
mov r0, #0x43
lsl r0, r0, #2
@ -2891,7 +2891,7 @@ sub_0203F844: ; 0x0203F844
bl SaveArray_Get
str r0, [r4, #8]
ldr r0, [r5, #0xc]
bl GetStoragePCPointer
bl Save_PCStorage_Get
str r0, [r4, #0xc]
ldr r0, [r5, #0xc]
bl Save_Pokedex_Get
@ -3119,7 +3119,7 @@ LaunchVoltorbFlipApp: ; 0x0203FA38
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
add r6, r0, #0
bl Save_PlayerData_GetCoinsAddr
str r0, [r4, #4]
@ -3437,7 +3437,7 @@ sub_0203FCB8: ; 0x0203FCB8
add r4, r0, #0
bl memset
add r0, r6, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
str r0, [r4]
add r3, r4, #4
mov r2, #9

4
asm/unk_02058034.s
View File

@ -113,7 +113,7 @@ sub_020580E4: ; 0x020580E4
cmp r0, #0
bne _0205811C
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
mov r1, #0
add r3, r5, #0
str r1, [sp]
@ -145,7 +145,7 @@ sub_02058124: ; 0x02058124
cmp r0, #0
bne _0205815C
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
mov r1, #0
add r3, r5, #0
str r1, [sp]

2
asm/unk_02058AEC.s
View File

@ -2475,7 +2475,7 @@ sub_02059E1C: ; 0x02059E1C
mov r0, #0
pop {r4, r5, r6, pc}
_02059E2E:
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
add r6, r0, #0
bl sub_02037F18
mov r1, #0x19

2
asm/unk_0205CB48.s
View File

@ -1250,7 +1250,7 @@ _0205D4DE:
bl MapObject_GetFieldSysPtr
mov r1, #7
str r0, [sp, #8]
bl FieldSystem_IsSavGymmickTypeEqualTo
bl FieldSystem_IsSave_GymmickTypeEqualTo
cmp r0, #0
beq _0205D52E
add r0, r5, #0

58
asm/unk_02068DE0.s
View File

@ -41,14 +41,14 @@ sTrashCanData:
thumb_func_start InitEcruteakGym
InitEcruteakGym: ; 0x02068DE0
push {r4, lr}
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
add r4, r0, #0
mov r1, #1
bl SavGymmick_Init
bl Save_Gymmick_Init
add r0, r4, #0
mov r1, #1
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
mov r2, #0
add r1, r2, #0
_02068DFE:
@ -62,14 +62,14 @@ _02068DFE:
thumb_func_start InitCianwoodGym
InitCianwoodGym: ; 0x02068E08
push {r4, lr}
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
add r4, r0, #0
mov r1, #2
bl SavGymmick_Init
bl Save_Gymmick_Init
add r0, r4, #0
mov r1, #2
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
pop {r4, pc}
thumb_func_end InitCianwoodGym
@ -77,14 +77,14 @@ InitCianwoodGym: ; 0x02068E08
InitVermilionGym: ; 0x02068E24
push {r3, r4, r5, lr}
add r5, r0, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
add r4, r0, #0
mov r1, #3
bl SavGymmick_Init
bl Save_Gymmick_Init
add r0, r4, #0
mov r1, #3
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
add r4, r0, #0
ldr r0, [r5, #0xc]
bl Save_PlayerData_GetProfileAddr
@ -112,10 +112,10 @@ _02068E60:
thumb_func_start PlaceVermilionGymSwitches
PlaceVermilionGymSwitches: ; 0x02068E70
push {r3, r4, r5, r6, r7, lr}
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #3
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
add r5, r0, #0
bl LCRandom
mov r1, #0xf
@ -141,14 +141,14 @@ _02068EAC: .word sTrashCanData
thumb_func_start InitVioletGym
InitVioletGym: ; 0x02068EB0
push {r4, lr}
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
add r4, r0, #0
mov r1, #4
bl SavGymmick_Init
bl Save_Gymmick_Init
add r0, r4, #0
mov r1, #4
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
mov r1, #0
str r1, [r0]
pop {r4, pc}
@ -157,14 +157,14 @@ InitVioletGym: ; 0x02068EB0
thumb_func_start InitAzaleaGym
InitAzaleaGym: ; 0x02068ED0
push {r4, lr}
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
add r4, r0, #0
mov r1, #5
bl SavGymmick_Init
bl Save_Gymmick_Init
add r0, r4, #0
mov r1, #5
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
mov r2, #0
strb r2, [r0]
mov r1, #1
@ -181,14 +181,14 @@ InitAzaleaGym: ; 0x02068ED0
thumb_func_start InitBlackthornGym
InitBlackthornGym: ; 0x02068F00
push {r4, lr}
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
add r4, r0, #0
mov r1, #6
bl SavGymmick_Init
bl Save_Gymmick_Init
add r0, r4, #0
mov r1, #6
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
mov r1, #0xd
strh r1, [r0]
mov r1, #0x4b
@ -213,10 +213,10 @@ InitBlackthornGym: ; 0x02068F00
thumb_func_start InitFuchsiaGym
InitFuchsiaGym: ; 0x02068F40
push {r3, lr}
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #7
bl SavGymmick_Init
bl Save_Gymmick_Init
pop {r3, pc}
.balign 4, 0
thumb_func_end InitFuchsiaGym
@ -224,21 +224,21 @@ InitFuchsiaGym: ; 0x02068F40
thumb_func_start InitViridianGym
InitViridianGym: ; 0x02068F54
push {r3, lr}
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
mov r1, #8
bl SavGymmick_Init
bl Save_Gymmick_Init
pop {r3, pc}
.balign 4, 0
thumb_func_end InitViridianGym
thumb_func_start FieldSystem_IsSavGymmickTypeEqualTo
FieldSystem_IsSavGymmickTypeEqualTo: ; 0x02068F68
thumb_func_start FieldSystem_IsSave_GymmickTypeEqualTo
FieldSystem_IsSave_GymmickTypeEqualTo: ; 0x02068F68
push {r4, lr}
add r4, r1, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
bl SavGymmick_GetType
bl Save_Gymmick_GetType
cmp r4, r0
bne _02068F80
mov r0, #1
@ -246,4 +246,4 @@ FieldSystem_IsSavGymmickTypeEqualTo: ; 0x02068F68
_02068F80:
mov r0, #0
pop {r4, pc}
thumb_func_end FieldSystem_IsSavGymmickTypeEqualTo
thumb_func_end FieldSystem_IsSave_GymmickTypeEqualTo

4
asm/unk_02068FC8.s
View File

@ -16,7 +16,7 @@ sub_02068FC8: ; 0x02068FC8
add r0, r6, #0
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, #0
@ -249,7 +249,7 @@ _020691E4: .word FreeToHeap
thumb_func_start sub_020691E8
sub_020691E8: ; 0x020691E8
push {r3, r4, r5, r6, r7, lr}
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
add r7, r0, #0
bl Save_GameStats_Get
add r0, r7, #0

6
asm/unk_0206D494.s
View File

@ -1055,14 +1055,14 @@ _0206DCC0: .word 0x00004021
thumb_func_start FieldSystem_InitMystriStageGymmick
FieldSystem_InitMystriStageGymmick: ; 0x0206DCC4
push {r4, lr}
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_GetGymmickPtr
add r4, r0, #0
mov r1, #9
bl SavGymmick_Init
bl Save_Gymmick_Init
add r0, r4, #0
mov r1, #9
bl SavGymmick_AssertMagic_GetData
bl Save_Gymmick_AssertMagic_GetData
mov r1, #0
str r1, [r0]
pop {r4, pc}

6
asm/unk_020910D8.s
View File

@ -62,7 +62,7 @@ _0209112E:
bl TaskManager_GetFieldSystem
add r6, r0, #0
ldr r5, [r4, #0xc]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_PlayerData_GetProfileAddr
add r7, r0, #0
ldr r0, [r6, #0x20]
@ -90,7 +90,7 @@ _0209112E:
add r1, r5, #0
bl sub_02093134
add r0, r6, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
ldr r1, [r4, #0xc]
bl UpdatePokedexWithReceivedSpecies
ldr r0, [r4, #4]
@ -113,7 +113,7 @@ _0209119A:
bl GetMonData
add r7, r0, #0
add r0, r6, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_PlayerData_GetOptionsAddr
str r0, [sp]
mov r0, #0

2
asm/unk_02095DF4.s
View File

@ -80,7 +80,7 @@ _02095E72:
ldr r0, [r4, #4]
str r1, [r0, #4]
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
ldr r1, [r4, #4]
str r0, [r1]
ldrh r1, [r4, #0xc]

2
asm/unk_02097D3C.s
View File

@ -26,7 +26,7 @@ sub_02097D3C: ; 0x02097D3C
bl AllocFromHeapAtEnd
str r0, [r4, #4]
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
ldr r1, [r4, #4]
add r2, r4, #0
str r0, [r1, #4]

10
include/battle_arcade_game_board.h
View File

@ -16,7 +16,7 @@
typedef struct GAME_BOARD_ARGS {
SaveData *savedata;
SaveData *saveData;
u8 type;
u8 level;
u8 unk6;
@ -68,7 +68,7 @@ typedef struct GAME_BOARD_SUB_3E8 {
typedef struct GAME_BOARD_WORK {
OVY_MANAGER *man;
FRONTIER_SAVE *frontierSavedata;
FRONTIER_SAVE *frontierSaveData;
u8 substate;
u8 type;
u8 unkA;
@ -113,9 +113,9 @@ typedef struct GAME_BOARD_WORK {
GAME_BOARD_SUB_3C4 unk3C4[2];
void *unk3D4;
OPTIONS *options;
SaveData *savedata;
void *arcadeSavedata;
void *arcadeScoreSavedata;
SaveData *saveData;
void *arcadeSaveData;
void *arcadeScoreSaveData;
GAME_BOARD_SUB_3E8 unk3E8;
void *cursor;
void *panel[16];

2
include/daycare.h
View File

@ -41,7 +41,7 @@ BOOL Save_Daycare_MasudaCheck(Daycare *daycare);
void DaycareMon_Copy(DaycareMon *dest, const DaycareMon *src);
void DaycareMon_Extras_Init(DaycareMail *mail);
void DaycareMon_Init(DaycareMon *mon);
Daycare *Save_Daycare_Get(SaveData *savedata);
Daycare *Save_Daycare_Get(SaveData *saveData);
BOOL Save_Daycare_HasEgg(Daycare *daycare);
#endif

2
include/field_player_avatar.h
View File

@ -32,7 +32,7 @@ struct PlayerAvatar {
int sub_0205C268(u32 unkA);
u8 sub_0205C278(void);
u8 sub_0205C298(SaveData *savedata);
u8 sub_0205C298(SaveData *saveData);
u8 sub_0205C2C0(u32 unkA);
u8 sub_0205C2E8(u32 unkA);
u8 sub_0205C310(u32 unkA);

4
include/field_system.h
View File

@ -112,7 +112,7 @@ struct FieldSystem {
struct FieldSystemUnkSub0 *unk0;
FieldSystemUnkSub4 *unk4;
BgConfig *bgConfig;
SaveData *savedata;
SaveData *saveData;
TaskManager *taskman;
MapEvents *mapEvents;
u32 unk18;
@ -198,7 +198,7 @@ void sub_0203E30C();
int sub_0203E324();
void sub_0203E33C(FieldSystem *fieldSystem, int a1);
BgConfig *FieldSystem_GetBgConfigPtr(FieldSystem *fieldSystem);
SaveData *FieldSystem_GetSaveDataPtr(FieldSystem *fieldSystem);
SaveData *FieldSystem_GetSaveData(FieldSystem *fieldSystem);
void sub_0203E348();
void sub_0203E354();

8
include/gymmick.h
View File

@ -48,9 +48,9 @@ struct Gymmick {
union GymmickUnion data;
};
void SavGymmick_Clear(struct Gymmick *gymmick);
union GymmickUnion *SavGymmick_Init(struct Gymmick *gymmick, int kind);
union GymmickUnion *SavGymmick_AssertMagic_GetData(struct Gymmick *gymmick, int kind);
int SavGymmick_GetType(struct Gymmick *gymmick);
void Save_Gymmick_Clear(struct Gymmick *gymmick);
union GymmickUnion *Save_Gymmick_Init(struct Gymmick *gymmick, int kind);
union GymmickUnion *Save_Gymmick_AssertMagic_GetData(struct Gymmick *gymmick, int kind);
int Save_Gymmick_GetType(struct Gymmick *gymmick);
#endif //POKEHEARTGOLD_GYMMICK_H

2
include/main.h
View File

@ -7,7 +7,7 @@
struct UnkStruct_02111868_sub {
int unk_00;
u32 unk_04;
SaveData *savedata;
SaveData *saveData;
};
void NitroMain(void);

4
include/map_matrix.h
View File

@ -40,8 +40,8 @@ MAPDATA* MapMatrix_MapData_New(HeapID heapId);
void MapMatrix_MapData_Free(MAPDATA* map_data);
u16 GetMapModelNo(u32 map_no, MAPMATRIX* map_matrix);
void RemoveMahoganyTownAntennaTree(MAPMATRIX* map_matrix);
BOOL ShouldUseAlternateLakeOfRage(SaveData* savedata, u32 map_no);
BOOL ShouldUseAlternateLakeOfRage(SaveData* saveData, u32 map_no);
void SetLakeOfRageWaterLevel(MAPMATRIX* map_matrix, BOOL lower_water_level);
void PlaceSafariZoneAreas(MAPMATRIX* map_matrix, SaveData* savedata);
void PlaceSafariZoneAreas(MAPMATRIX* map_matrix, SaveData* saveData);
#endif

2
include/options.h
View File

@ -17,7 +17,7 @@ typedef struct OPTIONS {
OPTIONS* Options_New(HeapID heapId);
void Options_Copy(OPTIONS* src, OPTIONS* dest);
void Options_Init(OPTIONS* options);
void Options_SetButtonModeOnMain(SaveData* savedata, u32 buttonMode);
void Options_SetButtonModeOnMain(SaveData* saveData, u32 buttonMode);
u16 Options_GetTextSpeed(OPTIONS* options);
void Options_SetTextSpeed(OPTIONS* options, u32 textSpeed);
u8 Options_GetTextFrameDelay(OPTIONS* options);

2
include/overlay_26.h
View File

@ -3,7 +3,7 @@
#include "script.h"
u16 TryGetRematchTrainerIdByBaseTrainerId(SaveData* savedata, u16 trainer_no);
u16 TryGetRematchTrainerIdByBaseTrainerId(SaveData* saveData, u16 trainer_no);
void ov26_022599D8(FieldSystem *fieldSystem, LocalMapObject *lastTalked);
#endif //POKEHEARTGOLD_OVERLAY_26_H

2
include/overlay_55.h
View File

@ -36,7 +36,7 @@ typedef struct UnkArgs_ov55 {
u32 unk4;
u8 unk8[0x7];
u8 mailType;
SaveData *savedata;
SaveData *saveData;
Mail *mail;
u8 unk18[4];
u32 *unk1C;

8
include/player_data.h
View File

@ -33,10 +33,10 @@ typedef struct PLAYERDATA {
u32 Save_PlayerData_sizeof(void);
void Save_PlayerData_Init(PLAYERDATA* player);
PlayerProfile* Save_PlayerData_GetProfileAddr(SaveData* savedata);
OPTIONS* Save_PlayerData_GetOptionsAddr(SaveData* savedata);
u16* Save_PlayerData_GetCoinsAddr(SaveData* savedata);
IGT* Save_PlayerData_GetIGTAddr(SaveData* savedata);
PlayerProfile* Save_PlayerData_GetProfileAddr(SaveData* saveData);
OPTIONS* Save_PlayerData_GetOptionsAddr(SaveData* saveData);
u16* Save_PlayerData_GetCoinsAddr(SaveData* saveData);
IGT* Save_PlayerData_GetIGTAddr(SaveData* saveData);
u32 PlayerProfile_sizeof(void);
PlayerProfile* PlayerProfile_New(HeapID heapId);
void PlayerProfile_Copy(const PlayerProfile* src, PlayerProfile* dest);

2
include/pokedex_util.h
View File

@ -5,7 +5,7 @@
#include "save.h"
BOOL Pokedex_IsNatDexEnabled(const Pokedex* pokedex);
BOOL SaveArray_IsNatDexEnabled(SaveData* savedata);
BOOL SaveArray_IsNatDexEnabled(SaveData* saveData);
u32 Pokedex_ConvertToCurrentDexNo(BOOL natDexFlag, u32 species);
#endif //POKEHEARTGOLD_POKEDEX_UTIL_H

2
include/safari_zone.h
View File

@ -59,7 +59,7 @@ typedef struct SafariZone {
} SafariZone;
u32 Save_SafariZone_sizeof(void);
SafariZone* Save_SafariZone_Get(SaveData* savedata);
SafariZone* Save_SafariZone_Get(SaveData* saveData);
void Save_SafariZone_Init(SafariZone* safari_zone);
void SafariZone_ResetAreaSetToDefaultSet(SAFARIZONE_AREASET* area_set, u32 default_set_no);
void sub_0202F5F8(SafariZone* safari_zone, s32 areaSetNo);

4
include/sav_system_info.h
View File

@ -27,8 +27,8 @@ typedef struct SysInfo {
u32 Save_SysInfo_sizeof(void);
void Save_SysInfo_Init(SysInfo* sys_info);
SysInfo* Save_SysInfo_Get(SaveData* savedata);
SysInfo_RTC *Save_SysInfo_RTC_Get(SaveData* savedata);
SysInfo* Save_SysInfo_Get(SaveData* saveData);
SysInfo_RTC *Save_SysInfo_RTC_Get(SaveData* saveData);
void Save_SysInfo_InitFromSystem(SysInfo* sys_info);
BOOL Save_SysInfo_MacAddressIsMine(SysInfo* sys_info);
BOOL Save_SysInfo_RTCOffsetIsMine(SysInfo* sys_info);

2
include/save_arrays.h
View File

@ -33,7 +33,7 @@ extern const struct ExtraSaveChunkHeader gExtraSaveChunkHeaders[];
extern const int gNumExtraSaveChunkHeaders;
struct UnkStruct_0202E474 *sub_020270C4(SaveData *saveData);
PC_STORAGE *GetStoragePCPointer(SaveData *saveData);
PC_STORAGE *Save_PCStorage_Get(SaveData *saveData);
MYSTERY_GIFT_SAVE *Save_MysteryGift_Get(SaveData *saveData);
struct MigratedPokemonSav *Save_MigratedPokemon_Get(SaveData *saveData);
HALL_OF_FAME *LoadHallOfFame(SaveData *saveData, HeapID heapId, int *ret_p);

2
include/scrcmd.h
View File

@ -889,7 +889,7 @@ BOOL ScrCmd_Capitalize(ScriptContext* ctx);
BOOL ScrCmd_BufferDeptStoreFloorNo(ScriptContext* ctx);
MessageFormat *sub_0204B538(SaveData *savedata, u16 numEligblePokemon, u16 a2, u8 a3, u8 *numLegendaryPokemonSeen);
MessageFormat *sub_0204B538(SaveData *saveData, u16 numEligblePokemon, u16 a2, u8 a3, u8 *numLegendaryPokemonSeen);
void ov01_021EF564(ScriptContext *ctx, u16 messageBank, u16 messageNum, u16 word1, s16 word2, u8 canABSpeedUp);
#endif

4
include/sys_vars.h
View File

@ -26,10 +26,10 @@ BOOL sub_02066C74(SaveVarsFlags* state, s32 a1);
void Save_VarsFlags_SetLotoId(SaveVarsFlags* state, u32 id);
u32 Save_VarsFlags_GetLotoId(SaveVarsFlags* state);
void Save_VarsFlags_RollLotoId(SaveVarsFlags* state);
void Save_LCRNGAdvanceLotoID(SaveData* savedata, u16 var);
void Save_LCRNGAdvanceLotoID(SaveData* saveData, u16 var);
u16 Save_VarsFlags_GetVar4041(SaveVarsFlags* state);
void Save_VarsFlags_SetVar4041(SaveVarsFlags* state, u16 value);
void sub_02066D60(SaveData* savedata);
void sub_02066D60(SaveData* saveData);
void sub_02066D80(SaveVarsFlags* state);
u16 Save_VarsFlags_GetVar4042(SaveVarsFlags* state);
u16 Save_VarsFlags_GetVar404B(SaveVarsFlags* state);

2
include/unk_02031AF0.h
View File

@ -16,6 +16,6 @@ typedef struct {
u32 sub_02031AF0(void);
void sub_02031AF4(SavePokeathlonFriendshipRecords* unk);
SavePokeathlonFriendshipRecords* sub_02031B00(SaveData* savedata);
SavePokeathlonFriendshipRecords* sub_02031B00(SaveData* saveData);
#endif //POKEHEARTGOLD_UNK_02031AF0_H

2
include/unk_02034354.h
View File

@ -4,6 +4,6 @@
#include "player_data.h"
PlayerProfile* sub_02034818(u32 a0);
void sub_02034AC0(SaveData *savedata, int a1);
void sub_02034AC0(SaveData *saveData, int a1);
#endif //POKEHEARTGOLD_UNK_02034354_H

6
include/unk_0203E348.h
View File

@ -21,7 +21,7 @@ typedef struct BerryPotsArgs {
u8 unk0[4];
u32 unk4;
BagCursor *cursor;
SaveData *savedata;
SaveData *saveData;
} BerryPotsArgs;
typedef struct PartyMenuAppData {
@ -131,12 +131,12 @@ static inline void InitUnkStructScrCmd408(struct UnkStruct_ScrCmd408 *data, u16
MI_CpuClear8(data, sizeof(struct UnkStruct_ScrCmd408));
data->unk_4 = a1;
data->unk_6 = a2;
data->saveData = ctx->fieldSystem->savedata;
data->saveData = ctx->fieldSystem->saveData;
}
static inline PCBoxAppData *PCBoxAppData_New(ScriptContext *ctx) {
PCBoxAppData *ret = AllocFromHeap(HEAP_ID_FIELD, sizeof(PCBoxAppData));
ret->saveData = ctx->fieldSystem->savedata;
ret->saveData = ctx->fieldSystem->saveData;
ret->unk8 = ScriptReadByte(ctx);
ret->fieldSystemUnk10C = &ctx->fieldSystem->unk_10C;
return ret;

2
include/voltorb_flip/voltorb_flip.h
View File

@ -11,7 +11,7 @@ typedef struct VoltorbFlipAppArgs {
u16 *coins;
u32 *unk8;
PlayerProfile *profile;
SaveData *savedata;
SaveData *saveData;
} VoltorbFlipAppArgs;
BOOL VoltorbFlipApp_OvyInit(OVY_MANAGER *man, int *state);

12
src/battle_arcade_game_board.c
View File

@ -105,20 +105,20 @@ BOOL BattleArcadeGameBoard_InitOverlay(OVY_MANAGER *man, int *state) {
work->bgConfig = BgConfig_Alloc(HEAP_ID_GAME_BOARD);
work->man = man;
args = (GAME_BOARD_ARGS *) OverlayManager_GetArgs(man);
work->savedata = args->savedata;
work->arcadeSavedata = sub_02030E88(work->savedata);
work->arcadeScoreSavedata = sub_02030FA0(work->savedata);
work->saveData = args->saveData;
work->arcadeSaveData = sub_02030E88(work->saveData);
work->arcadeScoreSaveData = sub_02030FA0(work->saveData);
work->type = args->type;
work->unk2A = args->unk1E;
work->winstreak = args->winstreak;
work->multiWinstreak = args->multiWinstreak;
work->unk12 = args->unk7;
work->returnWork = &args->returnWork;
work->options = Save_PlayerData_GetOptionsAddr(work->savedata);
work->options = Save_PlayerData_GetOptionsAddr(work->saveData);
work->playerParty = args->playerParty;
work->opponentParty = args->opponentParty;
work->unkE = 0xff;
work->frontierSavedata = sub_0203107C(work->savedata);
work->frontierSaveData = sub_0203107C(work->saveData);
work->weather = args->weather;
work->cursorSpeed = args->cursorSpeed;
work->unk20 = args->unk10;
@ -809,7 +809,7 @@ static BOOL ov84_0223ECBC(GAME_BOARD_WORK *work, u16 type, u16 a2) {
static void ov84_0223ED00(GAME_BOARD_WORK *work, u16 type) {
int i, offset;
Save_PlayerData_GetProfileAddr(work->savedata);
Save_PlayerData_GetProfileAddr(work->saveData);
work->sendBuffer[0] = type;

10
src/choose_starter.c
View File

@ -49,10 +49,10 @@ static BOOL CreateStarter(TaskManager *taskManager) {
env->args = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(struct ChooseStarterAppArgs));
env->args->cursorPos = 0;
env->args->options = Save_PlayerData_GetOptionsAddr(fieldSystem->savedata);
env->args->options = Save_PlayerData_GetOptionsAddr(fieldSystem->saveData);
for (i = 0; i < (int)NELEMS(species); i++) {
Pokemon *mon = &env->args->starters[i];
PlayerProfile *profile = Save_PlayerData_GetProfileAddr(fieldSystem->savedata);
PlayerProfile *profile = Save_PlayerData_GetProfileAddr(fieldSystem->saveData);
ZeroMonData(mon);
CreateMon(mon, species[i], 5, 32, FALSE, 0, OT_ID_PLAYER_ID, 0);
sub_020720FC(mon, profile, BALL_POKE, mapsec, 12, HEAP_ID_FIELD);
@ -73,11 +73,11 @@ static BOOL CreateStarter(TaskManager *taskManager) {
env->state = 3;
break;
case 3: {
Pokedex *pokedex = Save_Pokedex_Get(fieldSystem->savedata);
party = SaveArray_Party_Get(fieldSystem->savedata);
Pokedex *pokedex = Save_Pokedex_Get(fieldSystem->saveData);
party = SaveArray_Party_Get(fieldSystem->saveData);
Pokemon *myChoice = &env->args->starters[env->args->cursorPos];
if (Party_AddMon(party, myChoice)) {
UpdatePokedexWithReceivedSpecies(fieldSystem->savedata, myChoice);
UpdatePokedexWithReceivedSpecies(fieldSystem->saveData, myChoice);
}
Pokedex_SetMonCaughtFlag(pokedex, Party_GetMonByIndex(party, 0));
env->state = 4;

4
src/daycare.c
View File

@ -95,6 +95,6 @@ void DaycareMon_Init(DaycareMon *mon) {
DaycareMon_Extras_Init(&mon->mail);
}
Daycare *Save_Daycare_Get(SaveData *savedata) {
return SaveArray_Get(savedata, SAVE_DAYCARE);
Daycare *Save_Daycare_Get(SaveData *saveData) {
return SaveArray_Get(saveData, SAVE_DAYCARE);
}

70
src/encounter.c
View File

@ -133,15 +133,15 @@ static BOOL sub_02050738(TaskManager *man) {
if (sub_020506F4(encounter, fieldSystem) == 0) {
if (encounter->setup->flags & (1 << 11)) {
HealParty(SaveArray_Party_Get(fieldSystem->savedata));
HealParty(SaveArray_Party_Get(fieldSystem->saveData));
} else {
Encounter_Delete(encounter);
return TRUE;
}
}
if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(fieldSystem->savedata))) {
HealParty(SaveArray_Party_Get(fieldSystem->savedata));
if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(fieldSystem->saveData))) {
HealParty(SaveArray_Party_Get(fieldSystem->saveData));
}
sub_02051660(fieldSystem, encounter->setup);
@ -170,11 +170,11 @@ static void sub_0205087C(int a0, FieldSystem *fieldSystem) {
switch(a0 & 15) {
case 1:
case 6:
sub_02034AC0(fieldSystem->savedata, 1);
sub_02034AC0(fieldSystem->saveData, 1);
break;
case 2:
case 5:
sub_02034AC0(fieldSystem->savedata, -1);
sub_02034AC0(fieldSystem->saveData, -1);
break;
}
@ -201,7 +201,7 @@ static BOOL sub_020508B8(TaskManager *man) {
case 3:
sub_0205087C(encounter->setup->winFlag, fieldSystem);
sub_02052444(encounter->setup, fieldSystem);
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->savedata), GAME_STAT_UNK20);
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK20);
sub_020506F4(encounter, fieldSystem);
sub_020552A4(man);
(*state)++;
@ -229,7 +229,7 @@ static BOOL sub_02050960(TaskManager *man) {
case 1:
sub_0205087C(encounter->setup->winFlag, fieldSystem);
sub_02052444(encounter->setup, fieldSystem);
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->savedata), GAME_STAT_UNK20);
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK20);
sub_020506F4(encounter, fieldSystem);
(*state)++;
break;
@ -310,7 +310,7 @@ static BOOL Task_BugContestEncounter(TaskManager *man);
static BOOL Task_WildEncounter(TaskManager *man);
void sub_02050B08(FieldSystem *fieldSystem, BattleSetup *setup) {
SaveVarsFlags *flags = Save_VarsFlags_Get(fieldSystem->savedata);
SaveVarsFlags *flags = Save_VarsFlags_Get(fieldSystem->saveData);
int a0 = sub_020517E8(setup);
int a1 = sub_020517FC(setup);
@ -327,7 +327,7 @@ void sub_02050B08(FieldSystem *fieldSystem, BattleSetup *setup) {
}
void sub_02050B90(FieldSystem *fieldSystem, TaskManager *man, BattleSetup *setup) {
SaveVarsFlags *flags = Save_VarsFlags_Get(fieldSystem->savedata);
SaveVarsFlags *flags = Save_VarsFlags_Get(fieldSystem->saveData);
int a0 = sub_020517E8(setup);
int a1 = sub_020517FC(setup);
@ -350,7 +350,7 @@ static BOOL Task_WildEncounter(TaskManager *man) {
switch (encounter->state) {
case 0:
MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan);
GameStats_Inc(Save_GameStats_Get(fieldSystem->savedata), 8);
GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), 8);
sub_02055218(man, encounter->effect, encounter->bgm);
encounter->state++;
break;
@ -373,8 +373,8 @@ static BOOL Task_WildEncounter(TaskManager *man) {
return FALSE;
}
if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(fieldSystem->savedata))) {
HealParty(SaveArray_Party_Get(fieldSystem->savedata));
if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(fieldSystem->saveData))) {
HealParty(SaveArray_Party_Get(fieldSystem->saveData));
}
sub_02051660(fieldSystem, encounter->setup);
@ -400,12 +400,12 @@ static BOOL Task_SafariEncounter(TaskManager *man) {
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man);
ENCOUNTER *encounter = TaskManager_GetEnv(man);
int *state = TaskManager_GetStatePtr(man);
u16 *safariBall = LocalFieldData_GetSafariBallsCounter(Save_LocalFieldData_Get(fieldSystem->savedata));
u16 *safariBall = LocalFieldData_GetSafariBallsCounter(Save_LocalFieldData_Get(fieldSystem->saveData));
switch (*state) {
case 0:
MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan);
GameStats_Inc(Save_GameStats_Get(fieldSystem->savedata), 8);
GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), 8);
sub_02055218(man, encounter->effect, encounter->bgm);
(*state)++;
break;
@ -420,7 +420,7 @@ static BOOL Task_SafariEncounter(TaskManager *man) {
case 3:
sub_02050724(encounter->setup, fieldSystem);
if (encounter->setup->winFlag == BATTLE_OUTCOME_MON_CAUGHT) {
sub_020270C4(fieldSystem->savedata);
sub_020270C4(fieldSystem->saveData);
Party_GetMonByIndex(encounter->setup->party[1], 0);
sub_02093070(fieldSystem);
sub_020930C4(fieldSystem);
@ -429,7 +429,7 @@ static BOOL Task_SafariEncounter(TaskManager *man) {
sub_02051660(fieldSystem, encounter->setup);
if (*safariBall == 0 && encounter->setup->winFlag != BATTLE_OUTCOME_MON_CAUGHT) {
Location *loc = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->savedata));
Location *loc = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->saveData));
sub_020537A8(man, loc);
} else {
*state = 5;
@ -457,8 +457,8 @@ static BOOL Task_SafariEncounter(TaskManager *man) {
QueueScript(man, std_safari_balls_out, NULL, NULL);
}
} else {
PC_STORAGE *pc = GetStoragePCPointer(fieldSystem->savedata);
Party *party = SaveArray_Party_Get(fieldSystem->savedata);
PC_STORAGE *pc = Save_PCStorage_Get(fieldSystem->saveData);
Party *party = SaveArray_Party_Get(fieldSystem->saveData);
if (PCStorage_FindFirstBoxWithEmptySlot(pc) == 18 && Party_GetCount(party) == 6) {
QueueScript(man, std_safari_storage_out, NULL, NULL);
}
@ -482,7 +482,7 @@ static BOOL Task_BugContestEncounter(TaskManager *man) {
switch (*state) {
case 0:
MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan);
GameStats_Inc(Save_GameStats_Get(fieldSystem->savedata), 8);
GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), 8);
sub_02055218(man, encounter->effect, encounter->bgm);
(*state)++;
break;
@ -548,7 +548,7 @@ void SetupAndStartWildBattle(TaskManager *man, u16 mon, u8 level, u32 *winFlag,
setup->unkCC |= 8;
}
GameStats_Inc(Save_GameStats_Get(fieldSystem->savedata), 8);
GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), 8);
sub_0205085C(man, setup, sub_020517E8(setup), sub_020517FC(setup), winFlag);
}
@ -572,7 +572,7 @@ void sub_02051090(TaskManager *man, u16 species, u8 level, u32 *winFlag, BOOL ca
setup->unkCC |= 8;
}
GameStats_Inc(Save_GameStats_Get(fieldSystem->savedata), 8);
GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), 8);
sub_0205085C(man, setup, sub_020517E8(setup), sub_020517FC(setup), winFlag);
}
@ -585,7 +585,7 @@ static BOOL Task_PalParkEncounter(TaskManager *man) {
switch(*state) {
case 0:
MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan);
GameStats_Inc(Save_GameStats_Get(fieldSystem->savedata), 8);
GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), 8);
sub_02055218(man, encounter->effect, encounter->bgm);
(*state)++;
break;
@ -641,7 +641,7 @@ void sub_02051228(TaskManager *man, u16 species, u8 level) {
setup->unkCC = 1;
GameStats_Inc(Save_GameStats_Get(fieldSystem->savedata), 8);
GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), 8);
sub_0205085C(man, setup, sub_020517E8(setup), sub_020517FC(setup), NULL);
}
@ -723,9 +723,9 @@ void SetupAndStartTrainerBattle(TaskManager *man, u32 opponentTrainer1, u32 oppo
setup->trainerId[3] = opponentTrainer2;
setup->trainerId[2] = followerTrainerNum;
EnemyTrainerSet_Init(setup, fieldSystem->savedata, heapId);
EnemyTrainerSet_Init(setup, fieldSystem->saveData, heapId);
GameStats_Inc(Save_GameStats_Get(fieldSystem->savedata), GAME_STAT_UNK9);
GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK9);
if (a5) {
if (battleType & BATTLE_TYPE_MULTI) {
@ -792,13 +792,13 @@ void sub_020514A4(TaskManager *man, int target, int maxLevel, int flag) {
setup->trainerId[1] = 1;
setup->trainerId[3] = 2;
EnemyTrainerSet_Init(setup, fieldSystem->savedata, HEAP_ID_FIELD);
EnemyTrainerSet_Init(setup, fieldSystem->saveData, HEAP_ID_FIELD);
mode = 14;
}
sub_02051F2C(setup, fieldSystem, maxLevel);
sub_0202FBF0(fieldSystem->savedata, HEAP_ID_FIELD, &result);
sub_0202FBF0(fieldSystem->saveData, HEAP_ID_FIELD, &result);
setup->unk1B2 = mode;
@ -835,7 +835,7 @@ void sub_02051598(FieldSystem *fieldSystem, void *a1, int battleType) {
setup = BattleSetup_New(HEAP_ID_FIELD, battleType);
sub_020522F0(setup, fieldSystem, a1);
sub_0202FBF0(fieldSystem->savedata, HEAP_ID_FIELD, &var);
sub_0202FBF0(fieldSystem->saveData, HEAP_ID_FIELD, &var);
setup->unk1B2 = sub_02051474(fieldSystem->unkA4, battleType);
@ -851,7 +851,7 @@ void sub_020515FC(FieldSystem *fieldSystem, Party *party, int battleType) {
setup = BattleSetup_New(HEAP_ID_FIELD, battleType);
sub_020520B0(setup, fieldSystem, party, NULL);
sub_0202FBF0(fieldSystem->savedata, HEAP_ID_FIELD, &var);
sub_0202FBF0(fieldSystem->saveData, HEAP_ID_FIELD, &var);
setup->unk1B2 = sub_02051474(fieldSystem->unkA4, battleType);
@ -871,25 +871,25 @@ static void sub_02051660(FieldSystem *fieldSystem, BattleSetup *setup) {
if (battleType == 0 || battleType == BATTLE_TYPE_8 || battleType == (BATTLE_TYPE_DOUBLES | BATTLE_TYPE_MULTI | BATTLE_TYPE_6)) {
if (winFlag == BATTLE_OUTCOME_WIN) {
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->savedata), GAME_STAT_UNK9);
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK9);
} else if (winFlag == BATTLE_OUTCOME_MON_CAUGHT) {
mon = Party_GetMonByIndex(setup->party[1], 0);
if (Pokedex_ConvertToCurrentDexNo(0, GetMonData(mon, MON_DATA_SPECIES, NULL)) != 0) {
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->savedata), GAME_STAT_UNK10);
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK10);
} else {
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->savedata), GAME_STAT_UNK11);
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK11);
}
}
} else if ((battleType & BATTLE_TYPE_TRAINER) || (battleType & BATTLE_TYPE_INGAME_PARTNER)) {
if (winFlag == BATTLE_OUTCOME_WIN) {
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->savedata), GAME_STAT_UNK12);
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK12);
}
} else if ((battleType & BATTLE_TYPE_SAFARI || battleType & BATTLE_TYPE_PAL_PARK) && winFlag == BATTLE_OUTCOME_MON_CAUGHT) {
mon = Party_GetMonByIndex(setup->party[1], 0);
if (Pokedex_ConvertToCurrentDexNo(0, GetMonData(mon, MON_DATA_SPECIES, NULL)) != 0) {
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->savedata), GAME_STAT_UNK10);
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK10);
} else {
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->savedata), GAME_STAT_UNK11);
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK11);
}
}
}

2
src/field/overlay_01_rock_smash_item.c
View File

@ -138,7 +138,7 @@ static BOOL CheckRockSmashItemDrop(FieldSystem *fieldSystem, RockSmashItemCheckW
GF_ASSERT(FALSE);
return FALSE;
}
Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), 0);
Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->saveData), 0);
if (GetMonData(mon, MON_DATA_IS_EGG, NULL) == 0) {
ability = GetMonData(mon, MON_DATA_ABILITY, NULL);
} else {

10
src/field/scrcmd_message.c
View File

@ -121,7 +121,7 @@ BOOL ScrCmd_444(ScriptContext *ctx) {
u16 r2 = ScriptReadHalfword(ctx);
u8 r3 = ScriptReadByte(ctx);
u8 numLegendaryPokemonSeen = 0;
MessageFormat *messageFormat = sub_0204B538(fieldSystem->savedata, numEligiblePokemon, r2, r3, &numLegendaryPokemonSeen);
MessageFormat *messageFormat = sub_0204B538(fieldSystem->saveData, numEligiblePokemon, r2, r3, &numLegendaryPokemonSeen);
ov01_021EF5C8(ctx, messageFormat, baseMessageNum + numLegendaryPokemonSeen, TRUE);
MessageFormat_Delete(messageFormat);
SetupNativeScript(ctx, ov01_021EF348);
@ -175,10 +175,10 @@ BOOL ScrCmd_NpcMsgVar(ScriptContext *ctx) {
}
BOOL ScrCmd_GenderMsgbox(ScriptContext *ctx) {
void *unused = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem));
void *unused = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveData(ctx->fieldSystem));
u8 messageNumMale = ScriptReadByte(ctx);
u8 messageNumFemale = ScriptReadByte(ctx);
u32 gender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem)));
u32 gender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveData(ctx->fieldSystem)));
if (gender != PLAYER_GENDER_MALE) {
ov01_021EF4DC(ctx, ctx->msgdata, messageNumFemale, TRUE, NULL);
} else {
@ -252,7 +252,7 @@ static void ov01_021EF5C8(ScriptContext *ctx, MessageFormat *messageFormat, u8 m
}
static u32 ovFieldMain_GetTextFrameDelay(ScriptContext *ctx) {
return Options_GetTextFrameDelay(Save_PlayerData_GetOptionsAddr(ctx->fieldSystem->savedata));
return Options_GetTextFrameDelay(Save_PlayerData_GetOptionsAddr(ctx->fieldSystem->saveData));
}
static void ovFieldMain_GetMsgBoxParameters(FieldSystem *fieldSystem, MessageBox *messageBox) {
@ -276,7 +276,7 @@ static void ovFieldMain_GetMsgBoxParametersEx(FieldSystem *fieldSystem, MessageF
static void ovFieldMain_CreateMessageBox(FieldSystem *fieldSystem, MessageBox *messageBox) {
if (*(messageBox->unk10) == 0) {
sub_0205B514(fieldSystem->bgConfig, messageBox->window, 3);
sub_0205B564(messageBox->window, Save_PlayerData_GetOptionsAddr(fieldSystem->savedata));
sub_0205B564(messageBox->window, Save_PlayerData_GetOptionsAddr(fieldSystem->saveData));
*(messageBox->unk10) = 1;
fieldSystem->unkD2_6 = TRUE;
}

96
src/field/scrcmd_pokemon_misc.c
View File

@ -128,13 +128,13 @@ BOOL ScrCmd_648(ScriptContext *ctx) {
unkPtr = ov01_02200D9C(fieldSystem, 20, 1, 0, 1, input, *msgfmt, window, msgdata, cursorPos, itemsAbove);
unkG = sub_020312C4(fieldSystem->savedata, 0xb, &out_1);
unkG = sub_020312C4(fieldSystem->saveData, 0xb, &out_1);
if (out_1 == 1) {
data = ov01_02200C94(HEAP_ID_32, ov01_02209AE0[fileIndex], &out_2);
for (i = 0; i < out_2; i++) {
unkPtr_2 = sub_020312E0(fieldSystem->savedata, unkG, sub_0205C144(unkA), data[i]);
unkPtr_2 = sub_020312E0(fieldSystem->saveData, unkG, sub_0205C144(unkA), data[i]);
if (unkPtr_2 != 0) {
ov01_02200DF8(unkPtr, data[i], 0xff, data[i]);
}
@ -357,7 +357,7 @@ BOOL ScrCmd_StatJudge(ScriptContext *ctx) {
u16 *ivTotal = ScriptGetVarPointer(ctx);
u16 *highestIvIndex = ScriptGetVarPointer(ctx);
u16 *highestIv = ScriptGetVarPointer(ctx);
Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), monIndex);
Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->saveData), monIndex);
ivList[0] = GetMonData(mon, MON_DATA_HP_IV, 0);
ivList[1] = GetMonData(mon, MON_DATA_ATK_IV, 0);
ivList[2] = GetMonData(mon, MON_DATA_DEF_IV, 0);
@ -401,7 +401,7 @@ BOOL ScrCmd_CommSanitizeParty(ScriptContext *ctx) {
int count = 0;
FieldSystem *fieldSystem = ctx->fieldSystem;
u16 *success = ScriptGetVarPointer(ctx);
Party *party = SaveArray_Party_Get(fieldSystem->savedata);
Party *party = SaveArray_Party_Get(fieldSystem->saveData);
partyCount = Party_GetCount(party);
*success = FALSE;
@ -414,7 +414,7 @@ BOOL ScrCmd_CommSanitizeParty(ScriptContext *ctx) {
}
}
if (count > 0) {
if (Bag_AddItem(Save_Bag_Get(fieldSystem->savedata), ITEM_GRISEOUS_ORB, count, HEAP_ID_4) == FALSE) {
if (Bag_AddItem(Save_Bag_Get(fieldSystem->saveData), ITEM_GRISEOUS_ORB, count, HEAP_ID_4) == FALSE) {
*success = 255;
return FALSE;
}
@ -453,7 +453,7 @@ BOOL ScrCmd_SetMonForm(ScriptContext *ctx) {
FieldSystem *fieldSystem = ctx->fieldSystem;
u16 index = ScriptGetVar(ctx);
u16 form = ScriptGetVar(ctx);
Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), index);
Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->saveData), index);
SetMonData(mon, MON_DATA_FORM, &form);
return FALSE;
}
@ -470,7 +470,7 @@ BOOL ScrCmd_CountTranformedRotomsInParty(ScriptContext *ctx) {
count = 0;
*firstIndex = 255;
party = SaveArray_Party_Get(fieldSystem->savedata);
party = SaveArray_Party_Get(fieldSystem->saveData);
partyCount = Party_GetCount(party);
for (i = 0; i < partyCount; i++) {
mon = Party_GetMonByIndex(party, i);
@ -494,9 +494,9 @@ BOOL ScrCmd_UpdateRotomForm(ScriptContext *ctx) {
int defaultSlot = ScriptGetVar(ctx);
ScriptGetVar(ctx); //unsused variable
u32 form = ScriptGetVar(ctx);
Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), rotomIndex);
Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->saveData), rotomIndex);
Mon_UpdateRotomForm(mon, form, defaultSlot);
Pokedex_SetMonCaughtFlag(Save_Pokedex_Get(fieldSystem->savedata), mon);
Pokedex_SetMonCaughtFlag(Save_Pokedex_Get(fieldSystem->saveData), mon);
return FALSE;
}
@ -505,7 +505,7 @@ BOOL ScrCmd_GetHiddenPowerType(ScriptContext *ctx) {
FieldSystem *fieldSystem = ctx->fieldSystem;
int partyIndex = ScriptGetVar(ctx);
u16 *typePtr = ScriptGetVarPointer(ctx);
Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), partyIndex);
Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->saveData), partyIndex);
u16 species = GetMonData(mon, MON_DATA_SPECIES, 0);
@ -571,8 +571,8 @@ static void GetHiddenPowerPowerType(Pokemon *mon, s32 *power, s32 *type) {
BOOL ScrCmd_SetFavoriteMon(ScriptContext *ctx) {
FieldSystem *fieldSystem = ctx->fieldSystem;
Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), 0);
SAVE_MISC_DATA *data = Save_Misc_Get(fieldSystem->savedata);
Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->saveData), 0);
SAVE_MISC_DATA *data = Save_Misc_Get(fieldSystem->saveData);
u32 species = GetMonData(mon, MON_DATA_SPECIES, 0);
u32 form = GetMonData(mon, MON_DATA_FORM, 0);
u32 isEgg = GetMonData(mon, MON_DATA_IS_EGG, 0);
@ -586,7 +586,7 @@ BOOL ScrCmd_GetFavoriteMon(ScriptContext *ctx) {
u16 *species = ScriptGetVarPointer(ctx);
u16 *formPtr = ScriptGetVarPointer(ctx);
u16 *isEgg = ScriptGetVarPointer(ctx);
SAVE_MISC_DATA *data = Save_Misc_Get(fieldSystem->savedata);
SAVE_MISC_DATA *data = Save_Misc_Get(fieldSystem->saveData);
SaveMisc_GetFavoriteMon(data, &sp, &form, &egg);
*species = sp;
*formPtr = form;
@ -598,7 +598,7 @@ BOOL ScrCmd_GetPartyMonForm(ScriptContext *ctx) {
FieldSystem *fieldSystem = ctx->fieldSystem;
u32 index = ScriptGetVar(ctx);
u16 *form = ScriptGetVarPointer(ctx);
Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), index);
Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->saveData), index);
*form = GetMonData(mon, MON_DATA_FORM, 0);
return FALSE;
}
@ -662,7 +662,7 @@ BOOL ScrCmd_700(ScriptContext *ctx) {
}
BOOL ScrCmd_BattleTowerSetUpMultiBattle(ScriptContext *ctx) {
sub_0202CA44(ctx->fieldSystem->savedata);
sub_0202CA44(ctx->fieldSystem->saveData);
sub_02039F68();
return TRUE;
}
@ -676,7 +676,7 @@ BOOL ScrCmd_CheckMonSeen(ScriptContext *ctx) {
u16 monNumber = ScriptGetVar(ctx);
u16 *seenFlag = ScriptGetVarPointer(ctx);
*seenFlag = Pokedex_CheckMonSeenFlag(Save_Pokedex_Get(ctx->fieldSystem->savedata), monNumber);
*seenFlag = Pokedex_CheckMonSeenFlag(Save_Pokedex_Get(ctx->fieldSystem->saveData), monNumber);
return FALSE;
}
@ -740,7 +740,7 @@ BOOL ScrCmd_724(ScriptContext *ctx) {
u8 unkVar = ScriptGetVar(ctx);
u16 *unkPtrA = ScriptGetVarPointer(ctx);
Pokeathlon_UnkSubStruct_B00 *unkPtrB = sub_0203199C(Save_Pokeathlon_Get(ctx->fieldSystem->savedata));
Pokeathlon_UnkSubStruct_B00 *unkPtrB = sub_0203199C(Save_Pokeathlon_Get(ctx->fieldSystem->saveData));
if (unkVar <= 9) {
*unkPtrA = ov01_02201B2C(unkPtrB->unk44[unkVar]);
@ -787,7 +787,7 @@ BOOL ScrCmd_725(ScriptContext *ctx) {
u8 unkA = ScriptReadByte(ctx);
u32 unkB = ScriptGetVar(ctx);
Pokeathlon_UnkSubStruct_B00 *unkPtr = sub_020319F0(Save_Pokeathlon_Get(ctx->fieldSystem->savedata));
Pokeathlon_UnkSubStruct_B00 *unkPtr = sub_020319F0(Save_Pokeathlon_Get(ctx->fieldSystem->saveData));
if (unkA == 0) {
val = unkPtr->unk70 + unkB;
@ -816,19 +816,19 @@ BOOL ScrCmd_726(ScriptContext *ctx) {
//Related to Kurt
BOOL ScrCmd_735(ScriptContext *ctx) {
u16 *apricornQuantity = ScriptGetVarPointer(ctx);
*apricornQuantity = ApricornBox_GetKurtQuantity(Save_ApricornBox_Get(ctx->fieldSystem->savedata));
*apricornQuantity = ApricornBox_GetKurtQuantity(Save_ApricornBox_Get(ctx->fieldSystem->saveData));
return FALSE;
}
BOOL ScrCmd_ClearKurtApricorn(ScriptContext *ctx) {
ApricornBox_SetKurtApricorn(Save_ApricornBox_Get(ctx->fieldSystem->savedata), 0, 0);
ApricornBox_SetKurtApricorn(Save_ApricornBox_Get(ctx->fieldSystem->saveData), 0, 0);
return FALSE;
}
//Related to Kurt
BOOL ScrCmd_737(ScriptContext *ctx) {
u16 *unkPtr = ScriptGetVarPointer(ctx);
*unkPtr = ApricornBox_GetKurtBall(Save_ApricornBox_Get(ctx->fieldSystem->savedata));
*unkPtr = ApricornBox_GetKurtBall(Save_ApricornBox_Get(ctx->fieldSystem->saveData));
return FALSE;
}
@ -838,7 +838,7 @@ BOOL ScrCmd_GetTotalApricornCount(ScriptContext *ctx) {
u32 cnt;
u16 *unkPtr = ScriptGetVarPointer(ctx);
cnt = 0;
SaveApricornBox *apricornBox = Save_ApricornBox_Get(ctx->fieldSystem->savedata);
SaveApricornBox *apricornBox = Save_ApricornBox_Get(ctx->fieldSystem->saveData);
for (i = 0; i < 7; i = i + 1) {
cnt += ApricornBox_CountApricorn(apricornBox, i);
}
@ -876,7 +876,7 @@ BOOL ScrCmd_741(ScriptContext *ctx) {
u16 *unkPtrC;
String *str;
apricornBox = Save_ApricornBox_Get(ctx->fieldSystem->savedata);
apricornBox = Save_ApricornBox_Get(ctx->fieldSystem->saveData);
msgfmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT);
unkVar = ScriptGetVar(ctx);
unkPtrA = ScriptGetVarPointer(ctx);
@ -926,7 +926,7 @@ BOOL ScrCmd_CreatePokeathlonFriendshipRoomStatues(ScriptContext *ctx) {
u16 species;
FieldSystem *fieldSystem = ctx->fieldSystem;
SavePokeathlonFriendshipRecords *unkPtr = sub_02031B00(fieldSystem->savedata);
SavePokeathlonFriendshipRecords *unkPtr = sub_02031B00(fieldSystem->saveData);
for (i = 0; i < 3; i++) {
LocalMapObject *mapObj = GetMapObjectByID(fieldSystem->mapObjectMan, 0xf6 + i);
@ -982,7 +982,7 @@ BOOL ScrCmd_CheckSeenAllLetterUnown(ScriptContext *ctx) {
u16 *allUnownSeen;
allUnownSeen = ScriptGetVarPointer(ctx);
pokedex = Save_Pokedex_Get(ctx->fieldSystem->savedata);
pokedex = Save_Pokedex_Get(ctx->fieldSystem->saveData);
unownForms = Pokedex_GetSeenFormNum_Unown(pokedex, 1);
if (unownForms < 26) {
@ -1016,8 +1016,8 @@ BOOL ScrCmd_GiveTogepiEgg(ScriptContext *ctx) {
Party *party;
FieldSystem *fieldSystem = ctx->fieldSystem;
profile = Save_PlayerData_GetProfileAddr(fieldSystem->savedata);
party = SaveArray_Party_Get(fieldSystem->savedata);
profile = Save_PlayerData_GetProfileAddr(fieldSystem->saveData);
party = SaveArray_Party_Get(fieldSystem->saveData);
if (Party_GetCount(party) >= 6) {
return FALSE;
@ -1048,7 +1048,7 @@ BOOL ScrCmd_GiveTogepiEgg(ScriptContext *ctx) {
FreeToHeap(mon);
SaveMisc_SetTogepiPersonalityGender(Save_Misc_Get(fieldSystem->savedata), GetMonData(mon, MON_DATA_PERSONALITY, 0), GetMonData(mon, MON_DATA_GENDER, 0));
SaveMisc_SetTogepiPersonalityGender(Save_Misc_Get(fieldSystem->saveData), GetMonData(mon, MON_DATA_PERSONALITY, 0), GetMonData(mon, MON_DATA_GENDER, 0));
return FALSE;
}
@ -1058,9 +1058,9 @@ BOOL ScrCmd_777(ScriptContext *ctx) {
u32 partyIndex = ScriptGetVar(ctx);
u16 *unkPtr = ScriptGetVarPointer(ctx);
Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), partyIndex);
Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->saveData), partyIndex);
*unkPtr = sub_0206D8D0(mon, ctx->fieldSystem->savedata);
*unkPtr = sub_0206D8D0(mon, ctx->fieldSystem->saveData);
return FALSE;
}
@ -1079,8 +1079,8 @@ BOOL ScrCmd_GiveSpikyEarPichu(ScriptContext *ctx) {
fieldSystem = ctx->fieldSystem;
profile = Save_PlayerData_GetProfileAddr(fieldSystem->savedata);
party = SaveArray_Party_Get(fieldSystem->savedata);
profile = Save_PlayerData_GetProfileAddr(fieldSystem->saveData);
party = SaveArray_Party_Get(fieldSystem->saveData);
if (Party_GetCount(party) >= 6) {
return FALSE;
}
@ -1111,7 +1111,7 @@ BOOL ScrCmd_GiveSpikyEarPichu(ScriptContext *ctx) {
FreeToHeap(mon);
UpdatePokedexWithReceivedSpecies(fieldSystem->savedata, mon);
UpdatePokedexWithReceivedSpecies(fieldSystem->saveData, mon);
return FALSE;
}
@ -1120,7 +1120,7 @@ BOOL ScrCmd_PhotoAlbumIsFull(ScriptContext *ctx) {
FieldSystem *fieldSystem = ctx->fieldSystem;
u16 *albumIsFull = ScriptGetVarPointer(ctx);
*albumIsFull = (PhotoAlbum_GetNumSaved(Save_PhotoAlbum_Get(fieldSystem->savedata)) >= 36);
*albumIsFull = (PhotoAlbum_GetNumSaved(Save_PhotoAlbum_Get(fieldSystem->saveData)) >= 36);
return FALSE;
}
@ -1137,7 +1137,7 @@ BOOL ScrCmd_RadioMusicIsPlaying(ScriptContext *ctx) {
extern s32 sSlotLuckDistribution[2][2];
// Return value is unused outside of Japanese copies.
static u32 SlotLuckiness(SaveData *savedata, u8 machineId, u8 city) {
static u32 SlotLuckiness(SaveData *saveData, u8 machineId, u8 city) {
SAV_FRIEND_GRP *friendGroup;
u8 *luckValues;
s32 *dist;
@ -1148,7 +1148,7 @@ static u32 SlotLuckiness(SaveData *savedata, u8 machineId, u8 city) {
u32 i;
s32 j;
friendGroup = Save_FriendGroup_Get(savedata);
friendGroup = Save_FriendGroup_Get(saveData);
if (city != 0) { //1 = celadon; 0 = goldenrod
numMachines = 14;
@ -1191,7 +1191,7 @@ BOOL ScrCmd_CasinoGame(ScriptContext *ctx) {
u8 city = ScriptReadByte(ctx); //1 = celadon; 0 = goldenrod
u32 **unkPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); //VoltorbFlipAppData
*unkPtr = LaunchVoltorbFlipApp(ctx->fieldSystem, SlotLuckiness(ctx->fieldSystem->savedata, machineId, city)); //this is messy, very very messy
*unkPtr = LaunchVoltorbFlipApp(ctx->fieldSystem, SlotLuckiness(ctx->fieldSystem->saveData, machineId, city)); //this is messy, very very messy
SetupNativeScript(ctx, ScrNative_WaitApplication_DestroyTaskData);
return TRUE;
@ -1209,14 +1209,14 @@ BOOL ScrCmd_811(ScriptContext *ctx) {
u16 *unkPtr1 = ScriptGetVarPointer(ctx);
u16 *unkPtr2 = ScriptGetVarPointer(ctx);
*unkPtr2 = sub_0202F224(SaveData_GetMomsSavingsAddr(ctx->fieldSystem->savedata), 0, unkPtr1);
*unkPtr2 = sub_0202F224(SaveData_GetMomsSavingsAddr(ctx->fieldSystem->saveData), 0, unkPtr1);
return FALSE;
}
//Gets called when getting a package from your mom
BOOL ScrCmd_812(ScriptContext *ctx) {
sub_0202F1F4(SaveData_GetMomsSavingsAddr(ctx->fieldSystem->savedata));
sub_0202F1F4(SaveData_GetMomsSavingsAddr(ctx->fieldSystem->saveData));
return FALSE;
}
@ -1224,7 +1224,7 @@ BOOL ScrCmd_GetBuenasPassword(ScriptContext *ctx) {
u16 *msgPtr = ScriptGetVarPointer(ctx);
u16 *unkPtr2 = ScriptGetVarPointer(ctx);
u8 unkVar = Save_VarsFlags_GetBuenasPasswordSet(Save_VarsFlags_Get(ctx->fieldSystem->savedata)) % 30;
u8 unkVar = Save_VarsFlags_GetBuenasPasswordSet(Save_VarsFlags_Get(ctx->fieldSystem->saveData)) % 30;
*msgPtr = 2*(unkVar / 3) + unkVar / 3 + msg_0066_D23R0102_00040;
@ -1249,15 +1249,15 @@ static u32 MonGetShinyLeafCount(Pokemon *mon) {
BOOL ScrCmd_GetShinyLeafCount(ScriptContext *ctx) {
u32 monIndex = ScriptGetVar(ctx);
u16 *shinyLeafCount = ScriptGetVarPointer(ctx);
*shinyLeafCount = MonGetShinyLeafCount(Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), monIndex));
*shinyLeafCount = MonGetShinyLeafCount(Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->saveData), monIndex));
return FALSE;
}
BOOL ScrCmd_TryGiveShinyLeafCrown(ScriptContext *ctx) {
u32 monIndex = ScriptGetVar(ctx);
Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), monIndex);
if (MonGetShinyLeafCount(Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), monIndex)) == 5) {
Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->saveData), monIndex);
if (MonGetShinyLeafCount(Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->saveData), monIndex)) == 5) {
u8 data = TRUE;
SetMonData(mon, MON_DATA_SHINY_LEAF_CROWN, &data);
}
@ -1268,7 +1268,7 @@ BOOL ScrCmd_TryGiveShinyLeafCrown(ScriptContext *ctx) {
BOOL ScrCmd_GetUniqueSealsQuantity(ScriptContext *ctx) {
u16 *uniqueSeals = ScriptGetVarPointer(ctx);
*uniqueSeals = SealCase_CountUniqueSeals(Save_SealCase_Get(ctx->fieldSystem->savedata));
*uniqueSeals = SealCase_CountUniqueSeals(Save_SealCase_Get(ctx->fieldSystem->saveData));
return FALSE;
}
@ -1277,7 +1277,7 @@ BOOL ScrCmd_GetSealQuantity(ScriptContext *ctx) {
u32 sealId = ScriptGetVar(ctx);
u16 *sealQuantity = ScriptGetVarPointer(ctx);
*sealQuantity = SealCase_CountSealOccurrenceAnywhere(Save_SealCase_Get(ctx->fieldSystem->savedata), sealId);
*sealQuantity = SealCase_CountSealOccurrenceAnywhere(Save_SealCase_Get(ctx->fieldSystem->saveData), sealId);
return FALSE;
}
@ -1286,7 +1286,7 @@ BOOL ScrCmd_GiveOrTakeSeal(ScriptContext *ctx) {
u32 sealId = ScriptGetVar(ctx);
u32 quantity = ScriptGetVar(ctx);
GiveOrTakeSeal(Save_SealCase_Get(ctx->fieldSystem->savedata), sealId, quantity);
GiveOrTakeSeal(Save_SealCase_Get(ctx->fieldSystem->saveData), sealId, quantity);
return FALSE;
}
@ -1322,7 +1322,7 @@ BOOL ScrCmd_GiveRandomSeal(ScriptContext *ctx) {
seal2 = ScriptGetVarPointer(ctx);
seal3 = ScriptGetVarPointer(ctx);
sealcase = Save_SealCase_Get(ctx->fieldSystem->savedata);
sealcase = Save_SealCase_Get(ctx->fieldSystem->saveData);
sealThresholds = AllocFromHeapAtEnd(HEAP_ID_32, sizeof(u16)*SEAL_MYSTERY);
@ -1379,7 +1379,7 @@ BOOL ScrCmd_CheckKyogreGroudonInParty(ScriptContext *ctx) {
u8 kyogreGroudonFlags = 0;
unkPtr = ScriptGetVarPointer(ctx);
playerParty = SaveArray_Party_Get(ctx->fieldSystem->savedata);
playerParty = SaveArray_Party_Get(ctx->fieldSystem->saveData);
partyCount = Party_GetCount(playerParty);
unkVar = *(ctx->script_ptr);

6
src/field_alph_checks.c
View File

@ -3,7 +3,7 @@
#include "save_local_field_data.h"
BOOL CheckUseEscapeRopeInAlphChamber(FieldSystem* fieldSystem) {
Location* position = LocalFieldData_GetCurrentPosition(Save_LocalFieldData_Get(fieldSystem->savedata));
Location* position = LocalFieldData_GetCurrentPosition(Save_LocalFieldData_Get(fieldSystem->saveData));
if (position->mapId != MAP_D24R0202) {
return FALSE;
@ -17,7 +17,7 @@ BOOL CheckUseEscapeRopeInAlphChamber(FieldSystem* fieldSystem) {
}
BOOL CheckUseFlashInAlphChamber(FieldSystem* fieldSystem) {
Location* position = LocalFieldData_GetCurrentPosition(Save_LocalFieldData_Get(fieldSystem->savedata));
Location* position = LocalFieldData_GetCurrentPosition(Save_LocalFieldData_Get(fieldSystem->saveData));
if (position->mapId != MAP_D24R0204) {
return FALSE;
@ -31,7 +31,7 @@ BOOL CheckUseFlashInAlphChamber(FieldSystem* fieldSystem) {
}
BOOL CheckUseWaterStoneInAlphChamber(FieldSystem* fieldSystem) {
Location* position = LocalFieldData_GetCurrentPosition(Save_LocalFieldData_Get(fieldSystem->savedata));
Location* position = LocalFieldData_GetCurrentPosition(Save_LocalFieldData_Get(fieldSystem->saveData));
if (position->mapId != MAP_D24R0206) {
return FALSE;

8
src/field_black_out.c
View File

@ -98,7 +98,7 @@ static void DrawBlackoutMessage(FieldSystem *fieldSystem, TaskManager *taskManag
AddWindow(env->bgConfig, &env->window, &_020FC51C);
}
BufferPlayersName(env->msgFmt, 0, Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(fieldSystem)));
BufferPlayersName(env->msgFmt, 0, Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveData(fieldSystem)));
if (fieldSystem->location->mapId == MAP_T20R0201) {
_PrintMessage(env, msg_0203_00004, 0, 0);
} else {
@ -175,13 +175,13 @@ BOOL FieldTask_BlackOut(TaskManager *taskManager) {
switch (*state) {
case 0:
localFieldData = Save_LocalFieldData_Get(fieldSystem->savedata);
localFieldData = Save_LocalFieldData_Get(fieldSystem->saveData);
deathSpawn = LocalFieldData_GetBlackoutSpawn(localFieldData);
GetDeathWarpData(deathSpawn, &deathWarp);
GetSpecialSpawnWarpData(deathSpawn, LocalFieldData_GetSpecialSpawnWarpPtr(localFieldData));
sub_020537A8(taskManager, &deathWarp);
FieldSystem_ClearFollowingTrainer(fieldSystem);
HealParty(SaveArray_Party_Get(fieldSystem->savedata));
HealParty(SaveArray_Party_Get(fieldSystem->saveData));
(*state)++;
break;
case 1:
@ -206,7 +206,7 @@ BOOL FieldTask_BlackOut(TaskManager *taskManager) {
break;
case 5:
SetBlendBrightness(0, (GXBlendPlaneMask)(GX_BLEND_PLANEMASK_BD | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG0), SCREEN_MASK_MAIN | SCREEN_MASK_SUB);
if (GetMomSpawnId() == LocalFieldData_GetBlackoutSpawn(Save_LocalFieldData_Get(fieldSystem->savedata))) {
if (GetMomSpawnId() == LocalFieldData_GetBlackoutSpawn(Save_LocalFieldData_Get(fieldSystem->saveData))) {
QueueScript(taskManager, std_whited_out_to_mom, NULL, NULL);
} else {
QueueScript(taskManager, std_whited_out_to_pokecenter, NULL, NULL);

26
src/field_follow_poke.c
View File

@ -1515,10 +1515,10 @@ LocalMapObject *sub_020699F8(MapObjectManager *mapObjectMan, int x, int y, int d
int player_unk;
fieldSystem = MapObjectManager_GetFieldSysPtr(mapObjectMan);
party = SaveArray_Party_Get(fieldSystem->savedata);
party = SaveArray_Party_Get(fieldSystem->saveData);
partyCount = Party_GetCount(party);
FieldSystemFollowMonClear(&fieldSystem->followMon);
SavFollowPoke_SetUnused2bitField(0, Save_FollowPoke_Get(fieldSystem->savedata));
SavFollowPoke_SetUnused2bitField(0, Save_FollowPoke_Get(fieldSystem->saveData));
if (partyCount != 0) {
if (CountAlivePokemon(party) == 0) {
mon = GetFirstNonEggInParty(party);
@ -1537,19 +1537,19 @@ LocalMapObject *sub_020699F8(MapObjectManager *mapObjectMan, int x, int y, int d
FieldSystemUnkSub108_Set(fieldSystem->unk108, mon, species, GetMonData(mon, MON_DATA_PERSONALITY, NULL));
player_unk = PlayerAvatar_GetState(fieldSystem->playerAvatar);
if (player_unk == 0 || player_unk == 3) {
SavFollowPoke_SetUnused2bitField(1, Save_FollowPoke_Get(fieldSystem->savedata));
SavFollowPoke_SetUnused2bitField(1, Save_FollowPoke_Get(fieldSystem->saveData));
} else if (player_unk == 1) {
SavFollowPoke_SetUnused2bitField(2, Save_FollowPoke_Get(fieldSystem->savedata));
SavFollowPoke_SetUnused2bitField(2, Save_FollowPoke_Get(fieldSystem->saveData));
sub_0206A054(fieldSystem);
sub_0205FC94(FollowingPokemon_GetMapObject(fieldSystem), 56);
} else if (player_unk == 2) {
SavFollowPoke_SetUnused2bitField(2, Save_FollowPoke_Get(fieldSystem->savedata));
SavFollowPoke_SetUnused2bitField(2, Save_FollowPoke_Get(fieldSystem->saveData));
sub_0206A054(fieldSystem);
sub_0205FC94(FollowingPokemon_GetMapObject(fieldSystem), 56);
} else {
GF_ASSERT(0);
}
if (SavFollowPoke_GetInhibitFlagState(Save_FollowPoke_Get(fieldSystem->savedata))) {
if (SavFollowPoke_GetInhibitFlagState(Save_FollowPoke_Get(fieldSystem->saveData))) {
sub_0206A054(fieldSystem);
}
}
@ -1571,7 +1571,7 @@ void sub_02069B74(MapObjectManager *mapObjectMan, u32 mapno) {
LocalMapObject *followPokeObj;
fieldSystem = MapObjectManager_GetFieldSysPtr(mapObjectMan);
party = SaveArray_Party_Get(fieldSystem->savedata);
party = SaveArray_Party_Get(fieldSystem->saveData);
partyCount = Party_GetCount(party);
FieldSystemFollowMonClear(&fieldSystem->followMon);
if (partyCount != 0) {
@ -1593,12 +1593,12 @@ void sub_02069B74(MapObjectManager *mapObjectMan, u32 mapno) {
MapObject_SetGfxID(fieldSystem->followMon.mapObject, FollowingPokemon_GetSpriteID(species, form, gender));
player_unk = PlayerAvatar_GetState(fieldSystem->playerAvatar);
if (player_unk == 0 || player_unk == 3) {
SavFollowPoke_SetUnused2bitField(1, Save_FollowPoke_Get(fieldSystem->savedata));
SavFollowPoke_SetUnused2bitField(1, Save_FollowPoke_Get(fieldSystem->saveData));
} else if (player_unk == 1) {
SavFollowPoke_SetUnused2bitField(2, Save_FollowPoke_Get(fieldSystem->savedata));
SavFollowPoke_SetUnused2bitField(2, Save_FollowPoke_Get(fieldSystem->saveData));
sub_0206A040(fieldSystem->followMon.mapObject, TRUE);
} else if (player_unk == 2) {
SavFollowPoke_SetUnused2bitField(2, Save_FollowPoke_Get(fieldSystem->savedata));
SavFollowPoke_SetUnused2bitField(2, Save_FollowPoke_Get(fieldSystem->saveData));
sub_0206A040(fieldSystem->followMon.mapObject, TRUE);
} else {
GF_ASSERT(0);
@ -1606,7 +1606,7 @@ void sub_02069B74(MapObjectManager *mapObjectMan, u32 mapno) {
if (sub_02069E14(fieldSystem->followMon.mapObject)) {
sub_0206A040(fieldSystem->followMon.mapObject, TRUE);
}
if (SavFollowPoke_GetInhibitFlagState(Save_FollowPoke_Get(fieldSystem->savedata))) {
if (SavFollowPoke_GetInhibitFlagState(Save_FollowPoke_Get(fieldSystem->saveData))) {
sub_0206A054(fieldSystem);
}
MapObject_ClearFlag18(fieldSystem->followMon.mapObject, FALSE);
@ -1778,7 +1778,7 @@ BOOL FollowingPokemon_IsActive(FieldSystem *fieldSystem) {
return FALSE;
}
if (CountAlivePokemon(SaveArray_Party_Get(fieldSystem->savedata)) != 0) {
if (CountAlivePokemon(SaveArray_Party_Get(fieldSystem->saveData)) != 0) {
return TRUE;
} else {
return FALSE;
@ -1800,7 +1800,7 @@ BOOL sub_02069FB0(FieldSystem *fieldSystem) {
BOOL GetFollowPokePermission(FieldSystem *fieldSystem) {
u32 mapno;
mapno = SavFollowPoke_GetMapId(Save_FollowPoke_Get(fieldSystem->savedata));
mapno = SavFollowPoke_GetMapId(Save_FollowPoke_Get(fieldSystem->saveData));
return GetFollowPokePermissionBySpeciesAndMap(FollowPokeObj_GetSpecies(fieldSystem->followMon.mapObject), mapno);
}

50
src/field_move.c
View File

@ -85,8 +85,8 @@ static const struct FieldMoveFuncDat sFieldMoveFuncTable[] = {
};
static inline BOOL MoveUseCheck_SafariOrPalPark(const struct FieldMoveCheckData *checkData) {
if (Save_VarsFlags_CheckSafariSysFlag(Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE || Save_VarsFlags_CheckPalParkSysFlag(
Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) {
if (Save_VarsFlags_CheckSafariSysFlag(Save_VarsFlags_Get(checkData->fieldSystem->saveData)) == TRUE || Save_VarsFlags_CheckPalParkSysFlag(
Save_VarsFlags_Get(checkData->fieldSystem->saveData)) == TRUE) {
return TRUE;
} else {
return FALSE;
@ -95,7 +95,7 @@ static inline BOOL MoveUseCheck_SafariOrPalPark(const struct FieldMoveCheckData
static inline BOOL MoveUseCheck_PalPark(const struct FieldMoveCheckData *checkData) {
if (Save_VarsFlags_CheckPalParkSysFlag(
Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) {
Save_VarsFlags_Get(checkData->fieldSystem->saveData)) == TRUE) {
return TRUE;
} else {
return FALSE;
@ -161,7 +161,7 @@ void FieldSystem_MakeFieldMoveCheckData(FieldSystem *fieldSystem, struct FieldMo
if (MetatileBehavior_IsWhirlpool(facingTile)) {
checkData->flag |= (1 << FIELD_MOVE_CHECK_WHIRLPOOL_F);
}
if (LocalFieldData_GetWeatherType(Save_LocalFieldData_Get(fieldSystem->savedata)) == 11) {
if (LocalFieldData_GetWeatherType(Save_LocalFieldData_Get(fieldSystem->saveData)) == 11) {
checkData->flag |= (1 << FIELD_MOVE_CHECK_FLASH_F);
}
if (MetatileBehavior_IsHeadbutt(facingTile) || FieldSystem_FacingModelIsHeadbuttTree(fieldSystem)) {
@ -186,7 +186,7 @@ static u32 FieldMoveMenuCheck_Cut(const struct FieldMoveCheckData *checkData) {
if (checkData->fieldSystem->unk70 == 2 || checkData->fieldSystem->unk70 == 3) {
return PARTY_MENU_RESPONSE_NOT_HERE;
}
if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->savedata), BADGE_HIVE)) {
if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->saveData), BADGE_HIVE)) {
return PARTY_MENU_RESPONSE_NEED_BADGE;
}
if (MoveUseCheck_FieldContextFlagCheck(checkData, FIELD_MOVE_CHECK_TREE_F)) {
@ -218,7 +218,7 @@ static u32 FieldMoveMenuCheck_Fly(const struct FieldMoveCheckData *checkData) {
if (checkData->fieldSystem->unk70 == 2 || checkData->fieldSystem->unk70 == 3) {
return PARTY_MENU_RESPONSE_NOT_HERE;
}
if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->savedata), BADGE_STORM)) {
if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->saveData), BADGE_STORM)) {
return PARTY_MENU_RESPONSE_NEED_BADGE;
}
@ -226,11 +226,11 @@ static u32 FieldMoveMenuCheck_Fly(const struct FieldMoveCheckData *checkData) {
return PARTY_MENU_RESPONSE_NOT_HERE;
}
if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) {
if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(checkData->fieldSystem->saveData)) == TRUE) {
return PARTY_MENU_RESPONSE_HAVE_FOLLOWER;
}
if (Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) {
if (Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(checkData->fieldSystem->saveData)) == TRUE) {
return PARTY_MENU_RESPONSE_NOT_NOW;
}
@ -255,7 +255,7 @@ static u32 FieldMoveMenuCheck_Surf(const struct FieldMoveCheckData *checkData) {
if (checkData->fieldSystem->unk70 == 2 || checkData->fieldSystem->unk70 == 3) {
return PARTY_MENU_RESPONSE_NOT_HERE;
}
if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->savedata), BADGE_FOG)) {
if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->saveData), BADGE_FOG)) {
return PARTY_MENU_RESPONSE_NEED_BADGE;
}
@ -267,11 +267,11 @@ static u32 FieldMoveMenuCheck_Surf(const struct FieldMoveCheckData *checkData) {
return PARTY_MENU_RESPONSE_NOT_HERE;
}
if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) {
if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(checkData->fieldSystem->saveData)) == TRUE) {
return PARTY_MENU_RESPONSE_HAVE_FOLLOWER;
}
if (Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) {
if (Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(checkData->fieldSystem->saveData)) == TRUE) {
return PARTY_MENU_RESPONSE_NOT_NOW;
}
@ -300,7 +300,7 @@ static u32 FieldMoveMenuCheck_Strength(const struct FieldMoveCheckData *checkDat
if (checkData->fieldSystem->unk70 == 2 || checkData->fieldSystem->unk70 == 3) {
return PARTY_MENU_RESPONSE_NOT_HERE;
}
if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->savedata), BADGE_PLAIN)) {
if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->saveData), BADGE_PLAIN)) {
return PARTY_MENU_RESPONSE_NEED_BADGE;
}
@ -336,7 +336,7 @@ static u32 FieldMoveMenuCheck_RockSmash(const struct FieldMoveCheckData *checkDa
if (checkData->fieldSystem->unk70 == 2 || checkData->fieldSystem->unk70 == 3) {
return PARTY_MENU_RESPONSE_NOT_HERE;
}
if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->savedata), BADGE_ZEPHYR)) {
if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->saveData), BADGE_ZEPHYR)) {
return PARTY_MENU_RESPONSE_NEED_BADGE;
}
@ -371,7 +371,7 @@ static u32 FieldMoveMenuCheck_Waterfall(const struct FieldMoveCheckData *checkDa
if (PlayerAvatar_GetState(checkData->fieldSystem->playerAvatar) != PLAYER_STATE_SURFING) {
return PARTY_MENU_RESPONSE_NOT_HERE;
}
if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->savedata), BADGE_RISING)) {
if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->saveData), BADGE_RISING)) {
return PARTY_MENU_RESPONSE_NEED_BADGE;
}
@ -403,7 +403,7 @@ static u32 FieldMoveMenuCheck_RockClimb(const struct FieldMoveCheckData *checkDa
if (checkData->fieldSystem->unk70 == 2 || checkData->fieldSystem->unk70 == 3) {
return PARTY_MENU_RESPONSE_NOT_HERE;
}
if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->savedata), BADGE_EARTH)) {
if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->saveData), BADGE_EARTH)) {
return PARTY_MENU_RESPONSE_NEED_BADGE;
}
@ -411,11 +411,11 @@ static u32 FieldMoveMenuCheck_RockClimb(const struct FieldMoveCheckData *checkDa
return PARTY_MENU_RESPONSE_NOT_HERE;
}
if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) {
if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(checkData->fieldSystem->saveData)) == TRUE) {
return PARTY_MENU_RESPONSE_HAVE_FOLLOWER;
}
if (Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) {
if (Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(checkData->fieldSystem->saveData)) == TRUE) {
return PARTY_MENU_RESPONSE_NOT_NOW;
}
@ -486,11 +486,11 @@ static u32 FieldMoveMenuCheck_Teleport(const struct FieldMoveCheckData *checkDat
return PARTY_MENU_RESPONSE_NOT_HERE;
}
if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) {
if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(checkData->fieldSystem->saveData)) == TRUE) {
return PARTY_MENU_RESPONSE_HAVE_FOLLOWER;
}
if (Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) {
if (Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(checkData->fieldSystem->saveData)) == TRUE) {
return PARTY_MENU_RESPONSE_NOT_NOW;
}
@ -505,7 +505,7 @@ static void FieldMoveMenuUse_Teleport(struct FieldMoveUseData *useData, const st
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(useData->taskManager);
struct BagViewAppWork *menuEnv = TaskManager_GetEnv(useData->taskManager);
sub_020505C0(fieldSystem);
struct TeleportFieldEnv *retEnv = sub_020689A4(HEAP_ID_FIELD, useData->partySlot, fieldSystem->savedata);
struct TeleportFieldEnv *retEnv = sub_020689A4(HEAP_ID_FIELD, useData->partySlot, fieldSystem->saveData);
struct FlyTaskStruct *retSub = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(struct FlyTaskStruct));
retEnv->flySub = retSub;
retSub->partySlot = useData->partySlot;
@ -532,11 +532,11 @@ static u32 FieldMoveMenuCheck_Dig(const struct FieldMoveCheckData *checkData) {
return PARTY_MENU_RESPONSE_NOT_HERE;
}
if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) {
if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(checkData->fieldSystem->saveData)) == TRUE) {
return PARTY_MENU_RESPONSE_HAVE_FOLLOWER;
}
if (Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) {
if (Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(checkData->fieldSystem->saveData)) == TRUE) {
return PARTY_MENU_RESPONSE_NOT_NOW;
}
@ -547,7 +547,7 @@ static void FieldMoveMenuUse_Dig(struct FieldMoveUseData *useData, const struct
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(useData->taskManager);
struct BagViewAppWork *menuEnv = TaskManager_GetEnv(useData->taskManager);
sub_020505C0(fieldSystem);
struct TeleportFieldEnv *retEnv = sub_020689A4(HEAP_ID_FIELD, useData->partySlot, fieldSystem->savedata);
struct TeleportFieldEnv *retEnv = sub_020689A4(HEAP_ID_FIELD, useData->partySlot, fieldSystem->saveData);
struct FlyTaskStruct *retSub = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(struct FlyTaskStruct));
retEnv->flySub = retSub;
retSub->partySlot = useData->partySlot;
@ -581,7 +581,7 @@ static u32 FieldMoveMenuCheck_SweetScent(const struct FieldMoveCheckData *checkD
static void FieldMoveMenuUse_SweetScent(struct FieldMoveUseData *useData, const struct FieldMoveCheckData *checkData) {
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(useData->taskManager);
struct BagViewAppWork *menuEnv = TaskManager_GetEnv(useData->taskManager);
struct TeleportFieldEnv *retEnv = sub_020689A4(HEAP_ID_FIELD, useData->partySlot, fieldSystem->savedata);
struct TeleportFieldEnv *retEnv = sub_020689A4(HEAP_ID_FIELD, useData->partySlot, fieldSystem->saveData);
struct FlyTaskStruct *retSub = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(struct FlyTaskStruct));
retEnv->flySub = retSub;
retSub->partySlot = useData->partySlot;
@ -627,7 +627,7 @@ static u32 FieldMoveMenuCheck_Whirlpool(const struct FieldMoveCheckData *checkDa
return PARTY_MENU_RESPONSE_NOT_HERE;
}
if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->savedata), BADGE_GLACIER)) {
if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->saveData), BADGE_GLACIER)) {
return PARTY_MENU_RESPONSE_NEED_BADGE;
}

4
src/field_player_avatar.c
View File

@ -29,8 +29,8 @@ u8 sub_0205C278(void) {
return PlayerProfile_GetVersion(profile);
}
u8 sub_0205C298(SaveData* savedata) {
u8 ver = PlayerProfile_GetVersion(Save_PlayerData_GetProfileAddr(savedata));
u8 sub_0205C298(SaveData* saveData) {
u8 ver = PlayerProfile_GetVersion(Save_PlayerData_GetProfileAddr(saveData));
if (ver == 0) {
return 1;
}

4
src/field_system.c
View File

@ -307,8 +307,8 @@ BgConfig *FieldSystem_GetBgConfigPtr(FieldSystem *fieldSystem) {
return fieldSystem->bgConfig;
}
SaveData *FieldSystem_GetSaveDataPtr(FieldSystem *fieldSystem) {
return fieldSystem->savedata;
SaveData *FieldSystem_GetSaveData(FieldSystem *fieldSystem) {
return fieldSystem->saveData;
}
void sub_0203E348() {

2
src/field_system_rtc_weather.c
View File

@ -21,7 +21,7 @@ u32 FieldSystem_GetWeather_HandleDiamondDust(FieldSystem *fieldSystem, u32 mapId
if (mapId != MAP_D41R0108) {
return weatherType;
}
SysInfo_RTC *sysinfo_rtc = Save_SysInfo_RTC_Get(fieldSystem->savedata);
SysInfo_RTC *sysinfo_rtc = Save_SysInfo_RTC_Get(fieldSystem->saveData);
for (c = 0; c < NELEMS(DiamondDustDates); c++) {
u8 month = DiamondDustDates[c].month;
u8 day = DiamondDustDates[c].day;

58
src/field_use_item.c
View File

@ -139,8 +139,8 @@ void ItemCheckUseData_Init(FieldSystem *fieldSystem, struct ItemCheckUseData *da
dat->fieldSystem = fieldSystem;
dat->mapId = fieldSystem->location->mapId;
dat->haveFollower = Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(fieldSystem->savedata));
dat->haveRocketCostume = Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(fieldSystem->savedata));
dat->haveFollower = Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(fieldSystem->saveData));
dat->haveRocketCostume = Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(fieldSystem->saveData));
dat->playerState = PlayerAvatar_GetState(fieldSystem->playerAvatar);
x = GetPlayerXCoord(fieldSystem->playerAvatar);
@ -218,11 +218,11 @@ static void ItemMenuUseFunc_HealingItem(struct ItemMenuUseData *data, const stru
struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager);
struct UseItemInPartyTaskEnv *usedat = AllocFromHeap(HEAP_ID_FIELD, sizeof(struct UseItemInPartyTaskEnv));
memset(usedat, 0, sizeof(struct UseItemInPartyTaskEnv));
usedat->party = SaveArray_Party_Get(fieldSystem->savedata);
usedat->bag = Save_Bag_Get(fieldSystem->savedata);
usedat->mailbox = Save_Mailbox_Get(fieldSystem->savedata);
usedat->options = Save_PlayerData_GetOptionsAddr(fieldSystem->savedata);
usedat->unk10 = sub_020270C4(fieldSystem->savedata);
usedat->party = SaveArray_Party_Get(fieldSystem->saveData);
usedat->bag = Save_Bag_Get(fieldSystem->saveData);
usedat->mailbox = Save_Mailbox_Get(fieldSystem->saveData);
usedat->options = Save_PlayerData_GetOptionsAddr(fieldSystem->saveData);
usedat->unk10 = sub_020270C4(fieldSystem->saveData);
usedat->unk18 = &env->unk_0370;
usedat->unk25 = 0;
usedat->unk24 = 5;
@ -341,10 +341,10 @@ static void ItemMenuUseFunc_TMHM(struct ItemMenuUseData *data, const struct Item
struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager);
struct UseItemInPartyTaskEnv *usedat = AllocFromHeap(HEAP_ID_FIELD, sizeof(struct UseItemInPartyTaskEnv));
memset(usedat, 0, sizeof(struct UseItemInPartyTaskEnv));
usedat->party = SaveArray_Party_Get(fieldSystem->savedata);
usedat->bag = Save_Bag_Get(fieldSystem->savedata);
usedat->mailbox = Save_Mailbox_Get(fieldSystem->savedata);
usedat->options = Save_PlayerData_GetOptionsAddr(fieldSystem->savedata);
usedat->party = SaveArray_Party_Get(fieldSystem->saveData);
usedat->bag = Save_Bag_Get(fieldSystem->saveData);
usedat->mailbox = Save_Mailbox_Get(fieldSystem->saveData);
usedat->options = Save_PlayerData_GetOptionsAddr(fieldSystem->saveData);
usedat->unk18 = &env->unk_0370;
usedat->unk25 = 0;
usedat->unk24 = 6;
@ -386,7 +386,7 @@ BOOL Leftover_CanPlantBerry(const struct ItemCheckUseData *data) {
static void ItemMenuUseFunc_PalPad(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) {
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager);
struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager);
env->atexit_TaskEnv = CreatePalPadWork(fieldSystem, fieldSystem->savedata, HEAP_ID_FIELD);
env->atexit_TaskEnv = CreatePalPadWork(fieldSystem, fieldSystem->saveData, HEAP_ID_FIELD);
sub_0203C8F0(env, sub_0203D718);
}
@ -396,7 +396,7 @@ static BOOL ItemFieldUseFunc_PalPad(struct ItemFieldUseData *data) {
}
static struct PalPadWork *_CreatePalPadWork(FieldSystem *fieldSystem) {
return CreatePalPadWork(fieldSystem, fieldSystem->savedata, HEAP_ID_FIELD);
return CreatePalPadWork(fieldSystem, fieldSystem->saveData, HEAP_ID_FIELD);
}
static void ItemMenuUseFunc_Honey(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) {
@ -411,7 +411,7 @@ static void ItemMenuUseFunc_Honey(struct ItemMenuUseData *data, const struct Ite
env->atexit_TaskFunc = Task_HoneyOrSweetScent;
env->atexit_TaskEnv = honey_work;
env->state = 12;
Bag_TakeItem(Save_Bag_Get(fieldSystem->savedata), data->itemId, 1, HEAP_ID_FIELD);
Bag_TakeItem(Save_Bag_Get(fieldSystem->saveData), data->itemId, 1, HEAP_ID_FIELD);
}
static void ItemMenuUseFunc_OldRod(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) {
@ -478,7 +478,7 @@ static BOOL ItemFieldUseFunc_Generic(struct ItemFieldUseData *data) {
struct RegisteredKeyItemUseMessagePrintTaskData *env = AllocFromHeap(HEAP_ID_FIELD, sizeof(struct RegisteredKeyItemUseMessagePrintTaskData));
env->state = 0;
env->strbuf = String_New(128, HEAP_ID_FIELD);
TryFormatRegisteredKeyItemUseMessage(data->fieldSystem->savedata, env->strbuf, data->itemId, HEAP_ID_FIELD);
TryFormatRegisteredKeyItemUseMessage(data->fieldSystem->saveData, env->strbuf, data->itemId, HEAP_ID_FIELD);
FieldSystem_CreateTask(data->fieldSystem, Task_PrintRegisteredKeyItemUseMessage, env);
return FALSE;
}
@ -493,7 +493,7 @@ static BOOL Task_PrintRegisteredKeyItemUseMessage(TaskManager *taskManager) {
fieldSystem->unkD2_6 = TRUE;
MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan);
sub_0205B514(fieldSystem->bgConfig, &env->window, 3);
options = Save_PlayerData_GetOptionsAddr(fieldSystem->savedata);
options = Save_PlayerData_GetOptionsAddr(fieldSystem->saveData);
sub_0205B564(&env->window, options);
env->printerId = sub_0205B5B4(&env->window, env->strbuf, options, TRUE);
env->state++;
@ -531,11 +531,11 @@ static void ItemMenuUseFunc_EvoStone(struct ItemMenuUseData *data, const struct
env = TaskManager_GetEnv(data->taskManager);
usedat = AllocFromHeap(HEAP_ID_FIELD, sizeof(struct UseItemInPartyTaskEnv));
memset(usedat, 0, sizeof(struct UseItemInPartyTaskEnv));
usedat->party = SaveArray_Party_Get(fieldSystem->savedata);
usedat->bag = Save_Bag_Get(fieldSystem->savedata);
usedat->mailbox = Save_Mailbox_Get(fieldSystem->savedata);
usedat->options = Save_PlayerData_GetOptionsAddr(fieldSystem->savedata);
usedat->unk10 = sub_020270C4(fieldSystem->savedata);
usedat->party = SaveArray_Party_Get(fieldSystem->saveData);
usedat->bag = Save_Bag_Get(fieldSystem->saveData);
usedat->mailbox = Save_Mailbox_Get(fieldSystem->saveData);
usedat->options = Save_PlayerData_GetOptionsAddr(fieldSystem->saveData);
usedat->unk10 = sub_020270C4(fieldSystem->saveData);
usedat->unk18 = &env->unk_0370;
usedat->unk25 = 0;
usedat->unk24 = 16;
@ -563,7 +563,7 @@ static void ItemMenuUseFunc_EscapeRope(struct ItemMenuUseData *data, const struc
env->atexit_TaskFunc = Task_JumpToFieldEscapeRope;
env->atexit_TaskEnv = NULL;
env->state = 12;
Bag_TakeItem(Save_Bag_Get(fieldSystem->savedata), data->itemId, 1, HEAP_ID_FIELD);
Bag_TakeItem(Save_Bag_Get(fieldSystem->saveData), data->itemId, 1, HEAP_ID_FIELD);
}
static enum ItemUseError ItemCheckUseFunc_EscapeRope(const struct ItemCheckUseData *data) {
@ -704,7 +704,7 @@ static struct GracideaWork *_CreateGracideaWork(FieldSystem *fieldSystem) {
static void ItemMenuUseFunc_VSRecorder(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) {
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager);
struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager);
sub_0203F570(fieldSystem, fieldSystem->savedata);
sub_0203F570(fieldSystem, fieldSystem->saveData);
env->atexit_TaskEnv = NULL;
sub_0203C8F0(env, sub_0203D9B4);
}
@ -716,7 +716,7 @@ static BOOL ItemFieldUseFunc_VSRecorder(struct ItemFieldUseData *data) {
static void *_VsRecorderInit(FieldSystem *fieldSystem) {
ov01_021F4440(fieldSystem);
sub_0203F570(fieldSystem, fieldSystem->savedata);
sub_0203F570(fieldSystem, fieldSystem->saveData);
return NULL;
}
@ -756,19 +756,19 @@ int UseRegisteredItemButtonInField(FieldSystem *fieldSystem, u8 slot) {
if (sub_02067584(fieldSystem) == TRUE) {
return 0;
}
if (Save_VarsFlags_CheckPalParkSysFlag(Save_VarsFlags_Get(fieldSystem->savedata)) == TRUE) {
if (Save_VarsFlags_CheckPalParkSysFlag(Save_VarsFlags_Get(fieldSystem->saveData)) == TRUE) {
return 0;
}
if (CheckFlag996(Save_VarsFlags_Get(fieldSystem->savedata)) == TRUE) {
if (CheckFlag996(Save_VarsFlags_Get(fieldSystem->saveData)) == TRUE) {
return 0;
}
if (ov01_021F6B10(fieldSystem) != TRUE) {
return 0;
}
if (slot == 1) {
itemId = Bag_GetRegisteredItem1(Save_Bag_Get(fieldSystem->savedata));
itemId = Bag_GetRegisteredItem1(Save_Bag_Get(fieldSystem->saveData));
} else {
itemId = Bag_GetRegisteredItem2(Save_Bag_Get(fieldSystem->savedata));
itemId = Bag_GetRegisteredItem2(Save_Bag_Get(fieldSystem->saveData));
}
if (itemId == ITEM_DOWSING_MCHN && ov01_021F6B00(fieldSystem) == 4) {
return 0;
@ -807,7 +807,7 @@ static void RegisteredItem_GoToPrintErrorTask(struct ItemFieldUseData *data, enu
struct RegisteredKeyItemUseMessagePrintTaskData *env = AllocFromHeap(HEAP_ID_FIELD, sizeof(struct RegisteredKeyItemUseMessagePrintTaskData));
env->state = 0;
env->strbuf = String_New(128, HEAP_ID_FIELD);
GetItemUseErrorMessage(Save_PlayerData_GetProfileAddr(data->fieldSystem->savedata), env->strbuf, data->itemId, error, HEAP_ID_FIELD);
GetItemUseErrorMessage(Save_PlayerData_GetProfileAddr(data->fieldSystem->saveData), env->strbuf, data->itemId, error, HEAP_ID_FIELD);
FieldSystem_CreateTask(data->fieldSystem, Task_PrintRegisteredKeyItemUseMessage, env);
}

50
src/field_warp_tasks.c
View File

@ -138,7 +138,7 @@ static void sub_02052F30(FieldSystem *fieldSystem) {
}
static void sub_02052F94(FieldSystem *fieldSystem, Location *location) {
LocalFieldData *localFieldData = Save_LocalFieldData_Get(fieldSystem->savedata);
LocalFieldData *localFieldData = Save_LocalFieldData_Get(fieldSystem->saveData);
Location *r2 = LocalFieldData_GetPreviousPosition(localFieldData);
const WARP_EVENT *warp;
if (location != NULL) {
@ -163,7 +163,7 @@ void sub_02053018(FieldSystem *fieldSystem) {
void sub_02053038(FieldSystem *fieldSystem, BOOL isConnection) {
u32 mapId = fieldSystem->location->mapId;
LocalFieldData *localFieldData = Save_LocalFieldData_Get(fieldSystem->savedata);
LocalFieldData *localFieldData = Save_LocalFieldData_Get(fieldSystem->saveData);
SaveVarsFlags *varsFlags;
u16 weather;
u16 spawnId;
@ -181,10 +181,10 @@ void sub_02053038(FieldSystem *fieldSystem, BOOL isConnection) {
FieldSystem_StartBugContestTimer(fieldSystem);
}
if (!isConnection) {
SavGymmick_Clear(Save_GetGymmickPtr(fieldSystem->savedata));
SetLakeOfRageWaterLevel(fieldSystem->mapMatrix, ShouldUseAlternateLakeOfRage(fieldSystem->savedata, mapId));
Save_Gymmick_Clear(Save_GetGymmickPtr(fieldSystem->saveData));
SetLakeOfRageWaterLevel(fieldSystem->mapMatrix, ShouldUseAlternateLakeOfRage(fieldSystem->saveData, mapId));
}
varsFlags = Save_VarsFlags_Get(fieldSystem->savedata);
varsFlags = Save_VarsFlags_Get(fieldSystem->saveData);
weather = FieldSystem_GetWeather_HandleDiamondDust(fieldSystem, mapId);
if (sub_02066C74(varsFlags, 1) && mapId == MAP_T29) {
weather = 0;
@ -211,21 +211,21 @@ void sub_02053038(FieldSystem *fieldSystem, BOOL isConnection) {
fieldSystem->unk7E = 0;
fieldSystem->unk7C = 0;
fieldSystem->unk78 = 0;
SavFollowPoke_SetInhibitFlagState(Save_FollowPoke_Get(fieldSystem->savedata), FALSE);
ClearFlag99A(Save_VarsFlags_Get(fieldSystem->savedata));
SavFollowPoke_SetInhibitFlagState(Save_FollowPoke_Get(fieldSystem->saveData), FALSE);
ClearFlag99A(Save_VarsFlags_Get(fieldSystem->saveData));
}
static void sub_0205316C(FieldSystem *fieldSystem) {
u32 gender;
struct PlayerSaveData *playerSaveData;
if (fieldSystem->unkAC) {
gender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(fieldSystem->savedata));
playerSaveData = LocalFieldData_GetPlayer(Save_LocalFieldData_Get(fieldSystem->savedata));
gender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(fieldSystem->saveData));
playerSaveData = LocalFieldData_GetPlayer(Save_LocalFieldData_Get(fieldSystem->saveData));
fieldSystem->playerAvatar = sub_0205C390(fieldSystem->mapObjectMan, fieldSystem->location->x, fieldSystem->location->y, fieldSystem->location->direction, playerSaveData->unk4, gender, 2, playerSaveData);
} else {
fieldSystem->mapObjectMan = sub_0205E0BC(fieldSystem, 64, HEAP_ID_BATTLE);
gender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(fieldSystem->savedata));
playerSaveData = LocalFieldData_GetPlayer(Save_LocalFieldData_Get(fieldSystem->savedata));
gender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(fieldSystem->saveData));
playerSaveData = LocalFieldData_GetPlayer(Save_LocalFieldData_Get(fieldSystem->saveData));
fieldSystem->playerAvatar = sub_0205C390(fieldSystem->mapObjectMan, fieldSystem->location->x, fieldSystem->location->y, fieldSystem->location->direction, playerSaveData->unk4, gender, 2, playerSaveData);
sub_020699F8(fieldSystem->mapObjectMan, fieldSystem->location->x, fieldSystem->location->y, fieldSystem->location->direction, fieldSystem->location->mapId);
Field_InitMapObjectsFromZoneEventData(fieldSystem);
@ -250,8 +250,8 @@ static void sub_0205323C(FieldSystem *fieldSystem) {
fieldSystem->mapObjectMan = sub_0205E0BC(fieldSystem, 64, HEAP_ID_BATTLE);
FieldSystem_RestoreMapObjectsFromSave(fieldSystem);
playerSaveData = LocalFieldData_GetPlayer(Save_LocalFieldData_Get(fieldSystem->savedata));
gender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(fieldSystem->savedata));
playerSaveData = LocalFieldData_GetPlayer(Save_LocalFieldData_Get(fieldSystem->saveData));
gender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(fieldSystem->saveData));
fieldSystem->playerAvatar = sub_0205C408(fieldSystem->mapObjectMan, playerSaveData, gender);
sub_02069B74(fieldSystem->mapObjectMan, fieldSystem->location->mapId);
sub_0205F55C(fieldSystem->mapObjectMan);
@ -263,12 +263,12 @@ static void sub_02053284(FieldSystem *fieldSystem) {
sub_02052F30(fieldSystem);
GF_ASSERT(fieldSystem->unk60 == 0);
MapMatrix_Load(fieldSystem->location->mapId, fieldSystem->mapMatrix);
varsFlags = Save_VarsFlags_Get(fieldSystem->savedata);
varsFlags = Save_VarsFlags_Get(fieldSystem->saveData);
if (sub_02066C74(varsFlags, 0)) {
RemoveMahoganyTownAntennaTree(fieldSystem->mapMatrix);
}
SetLakeOfRageWaterLevel(fieldSystem->mapMatrix, sub_02066C74(varsFlags, 1));
PlaceSafariZoneAreas(fieldSystem->mapMatrix, fieldSystem->savedata);
PlaceSafariZoneAreas(fieldSystem->mapMatrix, fieldSystem->saveData);
GF_ASSERT(fieldSystem->unk70 < 6);
fieldSystem->unk74 = &_020FC5CC[fieldSystem->unk70];
fieldSystem->unk64 = fieldSystem->unk74->unk0_04;
@ -313,8 +313,8 @@ static BOOL _IsPlayerStandingInFrontOfUnionRoomReception(FieldSystem *fieldSyste
}
static void _SetDynamicWarpToUnionRoomExit(FieldSystem *fieldSystem) {
Location *dynamicWarp = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->savedata));
SaveVarsFlags *varsFlags = Save_VarsFlags_Get(fieldSystem->savedata); // unused
Location *dynamicWarp = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->saveData));
SaveVarsFlags *varsFlags = Save_VarsFlags_Get(fieldSystem->saveData); // unused
if (MapHeader_MapIsPokemonLeagueLobby(fieldSystem->location->mapId) == TRUE) {
InitLocation(dynamicWarp, fieldSystem->location->mapId, -1, 4, 11, DIR_SOUTH);
} else {
@ -353,14 +353,14 @@ TaskManager *CallFieldTask_NewGame(FieldSystem *fieldSystem) {
static BOOL FieldTask_ContinueGame_Normal(TaskManager *taskManager) {
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
SaveVarsFlags *varsFlags = Save_VarsFlags_Get(fieldSystem->savedata);
SaveVarsFlags *varsFlags = Save_VarsFlags_Get(fieldSystem->saveData);
LocalFieldData *localFieldData;
u32 *state_p = TaskManager_GetStatePtr(taskManager);
switch (*state_p) {
case 0:
if (CheckFlag966(varsFlags)) {
localFieldData = Save_LocalFieldData_Get(fieldSystem->savedata);
localFieldData = Save_LocalFieldData_Get(fieldSystem->saveData);
if (_IsPlayerStandingInFrontOfUnionRoomReception(fieldSystem)) {
_SetDynamicWarpToUnionRoomExit(fieldSystem);
}
@ -397,7 +397,7 @@ TaskManager *CallFieldTask_ContinueGame_Normal(FieldSystem *fieldSystem) {
static BOOL FieldTask_ContinueGame_CommError(TaskManager *taskManager) {
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
struct ErrorContinueEnv *env = TaskManager_GetEnv(taskManager);
SaveVarsFlags *varsFlags = Save_VarsFlags_Get(fieldSystem->savedata);
SaveVarsFlags *varsFlags = Save_VarsFlags_Get(fieldSystem->saveData);
u32 *state_p = TaskManager_GetStatePtr(taskManager);
switch (*state_p) {
@ -442,7 +442,7 @@ TaskManager *CallFieldTask_ContinueGame_CommError(FieldSystem *fieldSystem) {
struct ErrorContinueEnv *env;
if (!MapHeader_MapIsUnionRoom(fieldSystem->location->mapId)) {
if (_IsPlayerStandingInFrontOfUnionRoomReception(fieldSystem)) {
varsFlags = Save_VarsFlags_Get(fieldSystem->savedata);
varsFlags = Save_VarsFlags_Get(fieldSystem->saveData);
_SetDynamicWarpToUnionRoomExit(fieldSystem);
SetFlag966(varsFlags);
} else {
@ -936,7 +936,7 @@ static BOOL sub_02053E5C(TaskManager *taskManager) {
}
void sub_02053F14(FieldSystem *fieldSystem) {
Location *location = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->savedata));
Location *location = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->saveData));
struct UnkTaskEnv_02053E5C *env = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(struct UnkTaskEnv_02053E5C));
MI_CpuClear8(env, sizeof(struct UnkTaskEnv_02053E5C));
env->location = *location;
@ -995,7 +995,7 @@ static BOOL sub_02053F70(TaskManager *taskManager) {
void sub_02054030(TaskManager *taskManager) {
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
Location *location = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->savedata));
Location *location = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->saveData));
struct UnkTaskEnv_02053E5C *env = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(struct UnkTaskEnv_02053E5C));
MI_CpuClear8(env, sizeof(struct UnkTaskEnv_02053E5C));
_CopyPlayerPosToLocationWorkFacingSouth(location, fieldSystem);
@ -1040,7 +1040,7 @@ static BOOL sub_020540A4(TaskManager *taskManager) {
void sub_0205412C(TaskManager *taskManager, u32 mapId, int warpId, int x, int y, int direction) {
struct UnkTaskEnv_02053688 *env;
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
_CopyPlayerPosToLocationWorkFacingSouth(LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->savedata)), fieldSystem);
_CopyPlayerPosToLocationWorkFacingSouth(LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->saveData)), fieldSystem);
fieldSystem->unk70 = 3;
env = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(struct UnkTaskEnv_02053688));
{
@ -1059,7 +1059,7 @@ void sub_0205412C(TaskManager *taskManager, u32 mapId, int warpId, int x, int y,
void sub_02054190(TaskManager *taskManager) {
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
Location *location = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->savedata));
Location *location = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->saveData));
fieldSystem->unk70 = 0;
sub_02053710(fieldSystem->taskman, location);
}

12
src/fieldmap.c
View File

@ -348,7 +348,7 @@ u32 GetCurrentMapMessageBank(u32 mapno) {
}
u16 *GetVarPointer(FieldSystem *fieldSystem, u16 varIdx) {
SaveVarsFlags *state = Save_VarsFlags_Get(fieldSystem->savedata);
SaveVarsFlags *state = Save_VarsFlags_Get(fieldSystem->saveData);
if (varIdx < VAR_BASE) {
return NULL;
} else if (varIdx < SPECIAL_VAR_BASE) {
@ -381,22 +381,22 @@ u16 VarGetObjectEventGraphicsId(FieldSystem *fieldSystem, u16 varobjId) {
}
BOOL FlagGet(FieldSystem *fieldSystem, u16 flagId) {
return CheckFlagInArray(Save_VarsFlags_Get(fieldSystem->savedata), flagId);
return CheckFlagInArray(Save_VarsFlags_Get(fieldSystem->saveData), flagId);
}
void FlagSet(FieldSystem *fieldSystem, u16 flagId) {
return SetFlagInArray(Save_VarsFlags_Get(fieldSystem->savedata), flagId);
return SetFlagInArray(Save_VarsFlags_Get(fieldSystem->saveData), flagId);
}
void FlagClear(FieldSystem *fieldSystem, u16 flagId) {
return ClearFlagInArray(Save_VarsFlags_Get(fieldSystem->savedata), flagId);
return ClearFlagInArray(Save_VarsFlags_Get(fieldSystem->saveData), flagId);
}
void ClearTempFieldEventData(FieldSystem *fieldSystem) {
u8 *flags;
u16 *vars;
SaveVarsFlags *state = Save_VarsFlags_Get(fieldSystem->savedata);
SaveVarsFlags *state = Save_VarsFlags_Get(fieldSystem->saveData);
flags = GetFlagAddr(state, MAPTEMP_FLAG_BASE);
memset(flags, 0, NUM_MAPTEMP_FLAGS / 8);
vars = GetVarAddr(state, TEMP_VAR_BASE);
@ -406,7 +406,7 @@ void ClearTempFieldEventData(FieldSystem *fieldSystem) {
void ClearDailyFlags(FieldSystem *fieldSystem) {
u8 *flags;
SaveVarsFlags *state = Save_VarsFlags_Get(fieldSystem->savedata);
SaveVarsFlags *state = Save_VarsFlags_Get(fieldSystem->saveData);
flags = GetFlagAddr(state, DAILY_FLAG_BASE);
memset(flags, 0, NUM_DAILY_FLAGS / 8);
}

40
src/game_clear.c
View File

@ -100,7 +100,7 @@ BOOL sub_0205298C(TaskManager *taskman) {
case 0:
sub_0206DB58(taskman, fieldSystem);
FieldSystem_ClearFollowingTrainer(fieldSystem);
HealParty(SaveArray_Party_Get(fieldSystem->savedata));
HealParty(SaveArray_Party_Get(fieldSystem->saveData));
*state += 1;
break;
case 1:
@ -136,15 +136,15 @@ static void AddHallOfFameEntry(FieldSystem *fieldSystem, BOOL gameCleared) {
int val;
RTCDate date;
HALL_OF_FAME *hof = LoadHallOfFame(fieldSystem->savedata, HEAP_ID_FIELD, &val);
HALL_OF_FAME *hof = LoadHallOfFame(fieldSystem->saveData, HEAP_ID_FIELD, &val);
if (val != 1 || !gameCleared) {
Save_HOF_Init(hof);
}
Party *party = SaveArray_Party_Get(fieldSystem->savedata);
Party *party = SaveArray_Party_Get(fieldSystem->saveData);
GF_RTC_CopyDate(&date);
Save_HOF_RecordParty(hof, party, &date);
SaveHallOfFame(fieldSystem->savedata, hof);
SaveHallOfFame(fieldSystem->saveData, hof);
FreeToHeap(hof);
}
@ -176,7 +176,7 @@ static BOOL Task_GameClear(TaskManager *taskman) {
break;
case 2:
if (IsPaletteFadeFinished()) {
if (!Save_FileDoesNotBelongToPlayer(fieldSystem->savedata)) {
if (!Save_FileDoesNotBelongToPlayer(fieldSystem->saveData)) {
GameClearSave_PrintSaving(fieldSystem, env);
*state += 1;
break;
@ -190,8 +190,8 @@ static BOOL Task_GameClear(TaskManager *taskman) {
}
break;
case 4:
HealParty(SaveArray_Party_Get(fieldSystem->savedata));
int writeStatus = SaveGameNormal(fieldSystem->savedata);
HealParty(SaveArray_Party_Get(fieldSystem->saveData));
int writeStatus = SaveGameNormal(fieldSystem->saveData);
if (!env->vsTrainerRed) {
AddHallOfFameEntry(fieldSystem, env->gameCleared);
}
@ -267,23 +267,23 @@ void CallTask_GameClear(TaskManager *taskman, u16 vsTrainerRed) {
fieldSystem = TaskManager_GetFieldSystem(taskman);
env = AllocFromHeap(HEAP_ID_32, sizeof(GameClearWork));
varsFlags = Save_VarsFlags_Get(fieldSystem->savedata);
profile = Save_PlayerData_GetProfileAddr(fieldSystem->savedata);
dynamicWarp = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->savedata));
spawnWarp = LocalFieldData_GetSpecialSpawnWarpPtr(Save_LocalFieldData_Get(fieldSystem->savedata));
varsFlags = Save_VarsFlags_Get(fieldSystem->saveData);
profile = Save_PlayerData_GetProfileAddr(fieldSystem->saveData);
dynamicWarp = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->saveData));
spawnWarp = LocalFieldData_GetSpecialSpawnWarpPtr(Save_LocalFieldData_Get(fieldSystem->saveData));
env->gameCleared = CheckGameClearFlag(varsFlags);
env->hofCongratsArgs.profile = Save_PlayerData_GetProfileAddr(fieldSystem->savedata);
env->hofCongratsArgs.party = SaveArray_Party_Get(fieldSystem->savedata);
env->hofCongratsArgs.igt = Save_PlayerData_GetIGTAddr(fieldSystem->savedata);
env->creditsArgs.gender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(fieldSystem->savedata));
env->hofCongratsArgs.profile = Save_PlayerData_GetProfileAddr(fieldSystem->saveData);
env->hofCongratsArgs.party = SaveArray_Party_Get(fieldSystem->saveData);
env->hofCongratsArgs.igt = Save_PlayerData_GetIGTAddr(fieldSystem->saveData);
env->creditsArgs.gender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(fieldSystem->saveData));
env->creditsArgs.gameCleared = CheckGameClearFlag(varsFlags);
env->vsTrainerRed = vsTrainerRed;
if (!CheckGameClearFlag(varsFlags)) {
FieldSystem_SetGameClearTime(fieldSystem);
}
SaveArray_Party_Get(fieldSystem->savedata);
SaveArray_Party_Get(fieldSystem->saveData);
LocationData_BackUp(dynamicWarp);
LocationData_Restore(spawnWarp);
SetFlag966(varsFlags);
@ -291,7 +291,7 @@ void CallTask_GameClear(TaskManager *taskman, u16 vsTrainerRed) {
PlayerProfile_SetGameClearFlag(profile);
if (!env->vsTrainerRed) {
GameStats_Inc(Save_GameStats_Get(fieldSystem->savedata), 74);
GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), 74);
}
TaskManager_Call(taskman, Task_GameClear, env);
}
@ -312,7 +312,7 @@ static void GameClearSave_InitGraphics(FieldSystem *fieldSystem, GameClearWork *
}
static void GameClearSave_PrintSaving(FieldSystem *fieldSystem, GameClearWork *env) {
OPTIONS *options = Save_PlayerData_GetOptionsAddr(fieldSystem->savedata);
OPTIONS *options = Save_PlayerData_GetOptionsAddr(fieldSystem->saveData);
env->windowText = ReadMsgData_NewNarc_NewString(NARC_msgdata_msg, NARC_msg_msg_0040_bin, msg_0040_00015, HEAP_ID_32);
sub_0205B514(env->bgConfig, &env->window, 3);
sub_0205B564(&env->window, options);
@ -335,14 +335,14 @@ static void GameClearSave_PrintSaveStatus(FieldSystem *fieldSystem, GameClearWor
if (writeStatus == 2) {
MessageFormat *msgFmt = MessageFormat_New(HEAP_ID_4);
BufferPlayersName(msgFmt, 0, Save_PlayerData_GetProfileAddr(fieldSystem->savedata));
BufferPlayersName(msgFmt, 0, Save_PlayerData_GetProfileAddr(fieldSystem->saveData));
env->windowText = ReadMsgData_ExpandPlaceholders(msgFmt, msgData, msg_0040_00016, HEAP_ID_4);
MessageFormat_Delete(msgFmt);
} else {
env->windowText = NewString_ReadMsgData(msgData, msg_0040_00018);
}
DestroyMsgData(msgData);
OPTIONS *options = Save_PlayerData_GetOptionsAddr(fieldSystem->savedata);
OPTIONS *options = Save_PlayerData_GetOptionsAddr(fieldSystem->saveData);
env->printerId = sub_0205B5B4(&env->window, env->windowText, options, 1);
}

6
src/main.c
View File

@ -59,14 +59,14 @@ void NitroMain(void) {
FontID_Alloc(1, HEAP_ID_3);
FontID_Alloc(3, HEAP_ID_3);
_02111868.unk_10.unk_00 = -1;
_02111868.unk_10.savedata = SaveData_New();
_02111868.unk_10.saveData = SaveData_New();
sub_02005D00();
InitSoundData(Save_Chatot_Get(_02111868.unk_10.savedata), Save_PlayerData_GetOptionsAddr(_02111868.unk_10.savedata));
InitSoundData(Save_Chatot_Get(_02111868.unk_10.saveData), Save_PlayerData_GetOptionsAddr(_02111868.unk_10.saveData));
Init_Timer3();
if (sub_02039FFC(3) == 3) {
ShowWFCUserInfoWarning(HEAP_ID_3, 0);
}
if (!Save_FlashChipIsDetected(_02111868.unk_10.savedata)) {
if (!Save_FlashChipIsDetected(_02111868.unk_10.saveData)) {
ShowSaveDataReadError(HEAP_ID_DEFAULT);
} else {
switch (OS_GetResetParameter()) {

4
src/map_matrix.c
View File

@ -157,9 +157,9 @@ static inline BOOL MapAndDayCheck(u32 map_no, RTCDate* date) {
return (map_no == MAP_T29 || map_no == MAP_R43) && date->week == RTC_WEEK_WEDNESDAY;
}
BOOL ShouldUseAlternateLakeOfRage(SaveData* savedata, u32 map_no) {
BOOL ShouldUseAlternateLakeOfRage(SaveData* saveData, u32 map_no) {
RTCDate date;
SaveVarsFlags *state = Save_VarsFlags_Get(savedata);
SaveVarsFlags *state = Save_VarsFlags_Get(saveData);
GF_RTC_CopyDate(&date);

14
src/npc_trade.c
View File

@ -60,8 +60,8 @@ void NPCTrade_MakeAndGiveLoanMon(FieldSystem *fieldSystem, u8 tradeno, u8 level,
mon = AllocMonZeroed(HEAP_ID_FIELD);
trade_dat = GfGfxLoader_LoadFromNarc(NARC_a_1_1_2, tradeno, FALSE, HEAP_ID_FIELD, TRUE);
_CreateTradeMon(mon, trade_dat, level, tradeno, mapno, 7, HEAP_ID_FIELD);
UpdatePokedexWithReceivedSpecies(fieldSystem->savedata, mon);
party = SaveArray_Party_Get(fieldSystem->savedata);
UpdatePokedexWithReceivedSpecies(fieldSystem->saveData, mon);
party = SaveArray_Party_Get(fieldSystem->saveData);
Party_AddMon(party, mon);
if (tradeno == 7) {
kenya = Party_GetMonByIndex(party, Party_GetCount(party) - 1);
@ -102,7 +102,7 @@ int NPCTrade_CanGiveUpLoanMon(FieldSystem *fieldSystem, u8 tradeno, u8 idx) {
u16 heldItem;
int i, n, party_count;
party = SaveArray_Party_Get(fieldSystem->savedata);
party = SaveArray_Party_Get(fieldSystem->saveData);
mon = Party_GetMonByIndex(party, idx);
if (!MonIsInGameTradePoke(mon, tradeno)) {
return 1;
@ -146,15 +146,15 @@ int NPCTradeApp_GetUnusedFlag(NPCTradeAppData *work) {
}
void NPCTrade_ReceiveMonToSlot(FieldSystem *fieldSystem, NPCTradeAppData *work, int slot) {
Party_SafeCopyMonToSlot_ResetUnkSub(SaveArray_Party_Get(fieldSystem->savedata), slot, work->mon);
UpdatePokedexWithReceivedSpecies(fieldSystem->savedata, work->mon);
Party_SafeCopyMonToSlot_ResetUnkSub(SaveArray_Party_Get(fieldSystem->saveData), slot, work->mon);
UpdatePokedexWithReceivedSpecies(fieldSystem->saveData, work->mon);
}
void NPCTrade_CreateTradeAnim(FieldSystem *fieldSystem, NPCTradeAppData *work, int slot, TRADE_ANIM_WORK *anim_work, Pokemon *my_mon_buf, Pokemon *trade_mon_buf) {
Pokemon *my_poke;
u32 time_of_day;
my_poke = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), slot);
my_poke = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->saveData), slot);
_CreateTradeMon(work->mon, work->trade_dat, GetMonData(my_poke, MON_DATA_LEVEL, NULL), work->tradeno, fieldSystem->location->mapId, 1, work->heapId);
CopyPokemonToPokemon(my_poke, my_mon_buf);
CopyPokemonToPokemon(work->mon, trade_mon_buf);
@ -162,7 +162,7 @@ void NPCTrade_CreateTradeAnim(FieldSystem *fieldSystem, NPCTradeAppData *work, i
anim_work->trade_boxmon = Mon_GetBoxMon(trade_mon_buf);
anim_work->trade_profile = work->profile;
anim_work->is_ingame = 1;
anim_work->options = Save_PlayerData_GetOptionsAddr(fieldSystem->savedata);
anim_work->options = Save_PlayerData_GetOptionsAddr(fieldSystem->saveData);
time_of_day = Field_GetTimeOfDay(fieldSystem);
if (time_of_day == RTC_TIMEOFDAY_MORN || time_of_day == RTC_TIMEOFDAY_DAY) {
anim_work->time_of_day = 0;

6
src/options.c
View File

@ -24,9 +24,9 @@ void Options_Init(OPTIONS* options) {
options->frame = 0; // frame 1
}
void Options_SetButtonModeOnMain(SaveData* savedata, u32 buttonMode) {
if (savedata != NULL) {
buttonMode = Options_GetButtonMode(Save_PlayerData_GetOptionsAddr(savedata));
void Options_SetButtonModeOnMain(SaveData* saveData, u32 buttonMode) {
if (saveData != NULL) {
buttonMode = Options_GetButtonMode(Save_PlayerData_GetOptionsAddr(saveData));
}
switch (buttonMode) {

2
src/overlay_01_02204ED8.c
View File

@ -106,7 +106,7 @@ static BOOL ov01_02204EFC(TaskManager *taskManager) {
u32 x;
u32 y;
ov01_022050F8(fieldSystem, &x, &y);
u32 trainerId = PlayerProfile_GetTrainerID(Save_PlayerData_GetProfileAddr(fieldSystem->savedata));
u32 trainerId = PlayerProfile_GetTrainerID(Save_PlayerData_GetProfileAddr(fieldSystem->saveData));
s32 unk0 = ov01_02204FE0(unk4->unk00, unk4->unk02, trainerId, x, y, unk4->unk4c);
if (unk0 == -1) {
FreeToHeap(unk4);

6
src/overlay_16_02201948.c
View File

@ -150,20 +150,20 @@ static u32 ov16_02201A78(UnkStruct_ov16_0220196C *unk) {
}
static u32 ov16_02201AA0(UnkStruct_ov16_0220196C *unk) {
Bag *bag = Save_Bag_Get(unk->args->savedata);
Bag *bag = Save_Bag_Get(unk->args->saveData);
switch (unk->unk14) {
case 1:
unused_02201BA0 = (u8*)ov16_02201B60;
unk->bagView = Bag_CreateView(bag, ov16_02201B60, unk->heapId);
sub_0207789C(unk->bagView, unk->args->savedata, 6, unk->cursor2, unk->args->unk4);
sub_0207789C(unk->bagView, unk->args->saveData, 6, unk->cursor2, unk->args->unk4);
break;
case 2:
unused_02201BA0 = (u8*)ov16_02201B64;
unk->bagView = Bag_CreateView(bag, ov16_02201B64, unk->heapId);
sub_0207789C(unk->bagView, unk->args->savedata, 6, unk->cursor1, unk->args->unk4);
sub_0207789C(unk->bagView, unk->args->saveData, 6, unk->cursor1, unk->args->unk4);
break;
default:
GF_ASSERT(FALSE);

20
src/overlay_22.c
View File

@ -32,28 +32,28 @@ BOOL ScrCmd_118(ScriptContext *ctx) {
BOOL ScrCmd_GetCoinAmount(ScriptContext *ctx) {
u16 *ptr = ScriptGetVarPointer(ctx);
*ptr = CheckCoins(Save_PlayerData_GetCoinsAddr(ctx->fieldSystem->savedata));
*ptr = CheckCoins(Save_PlayerData_GetCoinsAddr(ctx->fieldSystem->saveData));
return FALSE;
}
BOOL ScrCmd_GiveCoins(ScriptContext *ctx) {
FieldSystem *fieldSystem = ctx->fieldSystem;
u16 amount = ScriptGetVar(ctx);
GiveCoins(Save_PlayerData_GetCoinsAddr(fieldSystem->savedata), amount);
GiveCoins(Save_PlayerData_GetCoinsAddr(fieldSystem->saveData), amount);
return FALSE;
}
BOOL ScrCmd_TakeCoins(ScriptContext *ctx) {
FieldSystem *fieldSystem = ctx->fieldSystem;
u16 amount = ScriptGetVar(ctx);
TakeCoins(Save_PlayerData_GetCoinsAddr(fieldSystem->savedata), amount);
TakeCoins(Save_PlayerData_GetCoinsAddr(fieldSystem->saveData), amount);
return FALSE;
}
BOOL ScrCmd_569(ScriptContext *ctx) {
FieldSystem *fieldSystem = ctx->fieldSystem;
u16 *ptr = ScriptGetVarPointer(ctx);
TakeCoins(Save_PlayerData_GetCoinsAddr(fieldSystem->savedata), *ptr);
TakeCoins(Save_PlayerData_GetCoinsAddr(fieldSystem->saveData), *ptr);
return FALSE;
}
@ -61,7 +61,7 @@ BOOL ScrCmd_CheckCoinsImmediate(ScriptContext *ctx) {
FieldSystem *fieldSystem = ctx->fieldSystem;
u16 *ptr = ScriptGetVarPointer(ctx);
u32 amount = ScriptReadWord(ctx);
u16 coins = CheckCoins(Save_PlayerData_GetCoinsAddr(fieldSystem->savedata));
u16 coins = CheckCoins(Save_PlayerData_GetCoinsAddr(fieldSystem->saveData));
if (coins < amount) {
*ptr = FALSE;
} else {
@ -74,7 +74,7 @@ BOOL ScrCmd_CheckCoinsVar(ScriptContext *ctx) {
FieldSystem *fieldSystem = ctx->fieldSystem;
u16 *resultPtr = ScriptGetVarPointer(ctx);
u16 *amountPtr = ScriptGetVarPointer(ctx);
u16 coins = CheckCoins(Save_PlayerData_GetCoinsAddr(fieldSystem->savedata));
u16 coins = CheckCoins(Save_PlayerData_GetCoinsAddr(fieldSystem->saveData));
if (coins < *amountPtr) {
*resultPtr = FALSE;
} else {
@ -87,21 +87,21 @@ BOOL ScrCmd_CheckGiveCoins(ScriptContext *ctx) {
FieldSystem *fieldSystem = ctx->fieldSystem;
u16 *ptr = ScriptGetVarPointer(ctx);
u16 amount = ScriptGetVar(ctx);
*ptr = CanGiveCoins(Save_PlayerData_GetCoinsAddr(fieldSystem->savedata), amount);
*ptr = CanGiveCoins(Save_PlayerData_GetCoinsAddr(fieldSystem->saveData), amount);
return FALSE;
}
BOOL ScrCmd_GiveAthletePoints(ScriptContext *ctx) {
FieldSystem *fieldSystem = ctx->fieldSystem;
u16 amount = ScriptGetVar(ctx);
SavePokeathlon_AddAthletePoints(Save_Pokeathlon_Get(fieldSystem->savedata), amount);
SavePokeathlon_AddAthletePoints(Save_Pokeathlon_Get(fieldSystem->saveData), amount);
return FALSE;
}
BOOL ScrCmd_TakeAthletePoints(ScriptContext *ctx) {
FieldSystem *fieldSystem = ctx->fieldSystem;
u16 amount = ScriptGetVar(ctx);
SavePokeathlon_SubAthletePoints(Save_Pokeathlon_Get(fieldSystem->savedata), amount);
SavePokeathlon_SubAthletePoints(Save_Pokeathlon_Get(fieldSystem->saveData), amount);
return FALSE;
}
@ -109,7 +109,7 @@ BOOL ScrCmd_CheckAthletePoints(ScriptContext *ctx) {
FieldSystem *fieldSystem = ctx->fieldSystem;
u16 *ptr = ScriptGetVarPointer(ctx);
u16 amount = ScriptGetVar(ctx);
u32 points = SavePokeathlon_GetAthletePoints(Save_Pokeathlon_Get(fieldSystem->savedata));
u32 points = SavePokeathlon_GetAthletePoints(Save_Pokeathlon_Get(fieldSystem->saveData));
if (points < amount) {
*ptr = FALSE;
} else {

18
src/overlay_26_022598C0.c
View File

@ -4,8 +4,8 @@
#include "sys_flags.h"
static u16 GetRematchIdByBaseTrainerId(u16 trainer_no);
static u16 GetIndexOfFirstUnbeatenRematch(SaveData* savedata, u16 rematch_set_no);
static u32 CheckUnlockedRematchGroup(SaveData* savedata, u16 rematch_set_no, u16 rematch_no);
static u16 GetIndexOfFirstUnbeatenRematch(SaveData* saveData, u16 rematch_set_no);
static u32 CheckUnlockedRematchGroup(SaveData* saveData, u16 rematch_set_no, u16 rematch_no);
static u16 GetPreviousRematchIndexForTrainer(u32 rematch_set_no, u16 rematch_no);
static u16 GetRematchTrainerIdByIndexPair(u16 rematch_set_no, u32 rematch_no);
@ -75,14 +75,14 @@ static const u16 sTrainerRematchSets[][6] = {
{ TRAINER_LEADER_BLUE_BLUE, TRAINER_LEADER_BLUE_BLUE, TRAINER_LEADER_BLUE_BLUE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE },
};
u16 TryGetRematchTrainerIdByBaseTrainerId(SaveData* savedata, u16 trainer_id) {
u16 TryGetRematchTrainerIdByBaseTrainerId(SaveData* saveData, u16 trainer_id) {
u16 rematch_set_no = GetRematchIdByBaseTrainerId(trainer_id);
if (rematch_set_no == 0xFF) {
return 0;
}
u16 rematch_no = GetIndexOfFirstUnbeatenRematch(savedata, rematch_set_no);
u32 checked_rematch_no = CheckUnlockedRematchGroup(savedata, rematch_set_no, rematch_no);
u16 rematch_no = GetIndexOfFirstUnbeatenRematch(saveData, rematch_set_no);
u32 checked_rematch_no = CheckUnlockedRematchGroup(saveData, rematch_set_no, rematch_no);
return GetRematchTrainerIdByIndexPair(rematch_set_no, checked_rematch_no);
}
@ -96,7 +96,7 @@ static u16 GetRematchIdByBaseTrainerId(u16 trainer_no) {
return 0xFF;
}
static u16 GetIndexOfFirstUnbeatenRematch(SaveData* savedata, u16 rematch_set_no) {
static u16 GetIndexOfFirstUnbeatenRematch(SaveData* saveData, u16 rematch_set_no) {
int i;
for (i = 1; i < 6; i++) {
u16 trainer_no = sTrainerRematchSets[rematch_set_no][i];
@ -104,7 +104,7 @@ static u16 GetIndexOfFirstUnbeatenRematch(SaveData* savedata, u16 rematch_set_no
return i - 1;
}
if (trainer_no != 0xFFFF && !TrainerFlagCheck(savedata, trainer_no)) {
if (trainer_no != 0xFFFF && !TrainerFlagCheck(saveData, trainer_no)) {
return i;
}
}
@ -112,8 +112,8 @@ static u16 GetIndexOfFirstUnbeatenRematch(SaveData* savedata, u16 rematch_set_no
return i - 1;
}
static u32 CheckUnlockedRematchGroup(SaveData* savedata, u16 rematch_set_no, u16 rematch_no) {
SaveVarsFlags* state = Save_VarsFlags_Get(savedata);
static u32 CheckUnlockedRematchGroup(SaveData* saveData, u16 rematch_set_no, u16 rematch_no) {
SaveVarsFlags* state = Save_VarsFlags_Get(saveData);
if (rematch_no == 0) {
return rematch_no;

70
src/overlay_36.c
View File

@ -42,9 +42,9 @@ static BOOL ov36_App_InitGameState_AfterOakSpeech_AppExit(OVY_MANAGER* man, int*
static BOOL ov36_TitleScreen_NewGame_AppInit(OVY_MANAGER* man, int* state);
static BOOL ov36_TitleScreen_NewGame_AppExec(OVY_MANAGER* man, int* state);
static BOOL ov36_TitleScreen_NewGame_AppExit(OVY_MANAGER* man, int* state);
static void InitGameStateAfterOakSpeech_Internal(HeapID heapId, SaveData* savedata, BOOL set_trainer_id);
static void Continue_LoadSaveData_HandleError(HeapID heapId, SaveData* savedata);
static void NewGame_InitSaveData(HeapID heapId, SaveData* savedata);
static void InitGameStateAfterOakSpeech_Internal(HeapID heapId, SaveData* saveData, BOOL set_trainer_id);
static void Continue_LoadSaveData_HandleError(HeapID heapId, SaveData* saveData);
static void NewGame_InitSaveData(HeapID heapId, SaveData* saveData);
const OVY_MGR_TEMPLATE ov36_App_MainMenu_SelectOption_NewGame = {
.init = ov36_TitleScreen_NewGame_AppInit,
@ -94,8 +94,8 @@ BOOL ov36_TitleScreen_NewGame_AppInit(OVY_MANAGER* man, int* state) {
BOOL ov36_TitleScreen_NewGame_AppExec(OVY_MANAGER* man, int* state) {
#pragma unused(state)
SaveData* savedata = ((struct UnkStruct_02111868_sub*)OverlayManager_GetArgs(man))->savedata;
NewGame_InitSaveData(HEAPID_OV36, savedata);
SaveData* saveData = ((struct UnkStruct_02111868_sub*)OverlayManager_GetArgs(man))->saveData;
NewGame_InitSaveData(HEAPID_OV36, saveData);
return TRUE;
}
@ -119,9 +119,9 @@ BOOL ov36_App_InitGameState_AfterOakSpeech_AppInit(OVY_MANAGER* man, int* state)
BOOL ov36_App_InitGameState_AfterOakSpeech_AppExec(OVY_MANAGER* man, int* state) {
#pragma unused(state)
struct UnkStruct_02111868_sub* unk_work = OverlayManager_GetArgs(man);
SaveData* savedata = unk_work->savedata;
InitGameStateAfterOakSpeech_Internal(HEAPID_OV36, savedata, TRUE);
sub_0201838C(Save_PlayerData_GetIGTAddr(savedata));
SaveData* saveData = unk_work->saveData;
InitGameStateAfterOakSpeech_Internal(HEAPID_OV36, saveData, TRUE);
sub_0201838C(Save_PlayerData_GetIGTAddr(saveData));
return TRUE;
}
@ -145,21 +145,21 @@ BOOL ov36_App_MainMenu_SelectOption_Continue_AppInit(OVY_MANAGER* man, int* stat
BOOL ov36_App_MainMenu_SelectOption_Continue_AppExec(OVY_MANAGER* man, int* state) {
#pragma unused(state)
struct UnkStruct_02111868_sub* unk_work = OverlayManager_GetArgs(man);
SaveData* savedata = unk_work->savedata;
SysInfo* sys_info = Save_SysInfo_Get(savedata);
SaveData* saveData = unk_work->saveData;
SysInfo* sys_info = Save_SysInfo_Get(saveData);
Continue_LoadSaveData_HandleError(HEAPID_OV36, savedata);
Continue_LoadSaveData_HandleError(HEAPID_OV36, saveData);
Options_SetButtonModeOnMain(savedata, 0);
Options_SetButtonModeOnMain(saveData, 0);
if (!Save_SysInfo_MacAddressIsMine(sys_info) || !Save_SysInfo_RTCOffsetIsMine(sys_info)) {
SysInfoRTC_HandleContinueOnNewConsole(Save_SysInfo_RTC_Get(savedata));
Save_BerryPotRTC_Init(Save_BerryPotRTC_Get(savedata));
SysInfoRTC_HandleContinueOnNewConsole(Save_SysInfo_RTC_Get(saveData));
Save_BerryPotRTC_Init(Save_BerryPotRTC_Get(saveData));
Save_SysInfo_InitFromSystem(sys_info);
Party_ResetAllShayminToLandForm(SaveArray_Party_Get(savedata));
Party_ResetAllShayminToLandForm(SaveArray_Party_Get(saveData));
}
sub_0201838C(Save_PlayerData_GetIGTAddr(savedata));
sub_0201838C(Save_PlayerData_GetIGTAddr(saveData));
return TRUE;
}
@ -172,40 +172,40 @@ BOOL ov36_App_MainMenu_SelectOption_Continue_AppExit(OVY_MANAGER* man, int* stat
return TRUE;
}
static void InitGameStateAfterOakSpeech_Internal(HeapID heapId, SaveData* savedata, BOOL set_trainer_id) {
static void InitGameStateAfterOakSpeech_Internal(HeapID heapId, SaveData* saveData, BOOL set_trainer_id) {
#pragma unused(heapId)
s32 i;
MsgData* friend_names_msgdata;
String* author_name;
Save_SysInfo_InitFromSystem(Save_SysInfo_Get(savedata));
Save_SysInfo_RTC_Init(Save_SysInfo_RTC_Get(savedata));
Save_BerryPotRTC_Init(Save_BerryPotRTC_Get(savedata));
sub_0202C7C0(Save_FriendGroup_Get(savedata), 1, MTRandom());
sub_020674BC(savedata);
Save_SysInfo_InitFromSystem(Save_SysInfo_Get(saveData));
Save_SysInfo_RTC_Init(Save_SysInfo_RTC_Get(saveData));
Save_BerryPotRTC_Init(Save_BerryPotRTC_Get(saveData));
sub_0202C7C0(Save_FriendGroup_Get(saveData), 1, MTRandom());
sub_020674BC(saveData);
PlayerProfile* profile = Save_PlayerData_GetProfileAddr(savedata);
PlayerProfile* profile = Save_PlayerData_GetProfileAddr(saveData);
u32 rand = MTRandom();
if (set_trainer_id) {
PlayerProfile_SetTrainerID(profile, rand);
}
SafariZone* safari_zone = Save_SafariZone_Get(savedata);
SafariZone* safari_zone = Save_SafariZone_Get(saveData);
SafariZone_ResetAreaSetToDefaultSet(safari_zone->area_sets, rand);
PlayerProfile_SetAvatar(profile, sub_0205B418(rand, PlayerProfile_GetTrainerGender(profile), 0));
sub_0202AE0C(Save_FieldApricornTrees_Get(savedata));
sub_0202AE0C(Save_FieldApricornTrees_Get(saveData));
u32* pokewalker_unk = sub_02032728(Save_Pokewalker_Get(savedata));
u32* pokewalker_unk = sub_02032728(Save_Pokewalker_Get(saveData));
for (i = 0; i < 10; i++) {
pokewalker_unk[i] = MTRandom();
}
// Put an email from your friend into your PC.
friend_names_msgdata = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0445_bin, HEAP_ID_3);
MAILBOX* mailbox = Save_Mailbox_Get(savedata);
MAILBOX* mailbox = Save_Mailbox_Get(saveData);
Pokemon *mon = AllocMonZeroed(HEAP_ID_3);
CreateMon(mon, SPECIES_MARILL, 1, 0, FALSE, 0, OT_ID_PLAYER_ID, 0);
@ -236,21 +236,21 @@ static void InitGameStateAfterOakSpeech_Internal(HeapID heapId, SaveData* saveda
DestroyMsgData(friend_names_msgdata);
}
static void Continue_LoadSaveData_HandleError(HeapID heapId, SaveData* savedata) {
static void Continue_LoadSaveData_HandleError(HeapID heapId, SaveData* saveData) {
#pragma unused(heapId)
if (!SaveData_TryLoadOnContinue(savedata)) {
if (!SaveData_TryLoadOnContinue(saveData)) {
OS_ResetSystem(0);
}
}
static void NewGame_InitSaveData(HeapID heapId, SaveData* savedata) {
static void NewGame_InitSaveData(HeapID heapId, SaveData* saveData) {
#pragma unused(heapId)
Save_InitDynamicRegion(savedata);
Save_CurrentLocation_BackUp(savedata);
Save_InitDynamicRegion(saveData);
Save_CurrentLocation_BackUp(saveData);
PlayerProfile_SetMoney(Save_PlayerData_GetProfileAddr(savedata), 3000);
PlayerProfile_SetMoney(Save_PlayerData_GetProfileAddr(saveData), 3000);
Save_VarsFlags_SetFishingCompetitionLengthRecord(Save_VarsFlags_Get(savedata), 56150); // 3'6"
Save_VarsFlags_SetFishingCompetitionLengthRecord(Save_VarsFlags_Get(saveData), 56150); // 3'6"
SetFlag960(Save_VarsFlags_Get(savedata));
SetFlag960(Save_VarsFlags_Get(saveData));
}

8
src/overlay_55.c
View File

@ -56,7 +56,7 @@ BOOL ov55_UnkApp_Init(OVY_MANAGER *manager, int *state) {
overlayData->heapId = HEAP_ID_OV55;
overlayData->unk10 = ov55_021E5B08(args->mail, HEAP_ID_OV55);
overlayData->unk10->options = Save_PlayerData_GetOptionsAddr(args->savedata);
overlayData->unk10->options = Save_PlayerData_GetOptionsAddr(args->saveData);
if (args->unk0 == 1) {
overlayData->unk10->mailType = args->mailType;
}
@ -102,8 +102,8 @@ BOOL ov55_UnkApp_Main(OVY_MANAGER *manager, int *state) {
if (args->unk0 == 1) {
if (overlayData->unk10->unk0 == 3) {
ov55_021E5BC4(args->mail, overlayData->unk10);
GameStats_AddSpecial(Save_GameStats_Get(args->savedata), GAME_STAT_UNK2);
GameStats_Inc(Save_GameStats_Get(args->savedata), GAME_STAT_UNK46);
GameStats_AddSpecial(Save_GameStats_Get(args->saveData), GAME_STAT_UNK2);
GameStats_Inc(Save_GameStats_Get(args->saveData), GAME_STAT_UNK46);
args->unk4 = 1;
} else {
args->unk4 = 0;
@ -113,7 +113,7 @@ BOOL ov55_UnkApp_Main(OVY_MANAGER *manager, int *state) {
return TRUE;
case 3:
overlayData->unk8 = sub_02090C94(2, 0, args->savedata, args->unk1C, overlayData->heapId);
overlayData->unk8 = sub_02090C94(2, 0, args->saveData, args->unk1C, overlayData->heapId);
if (MailMsg_IsInit(&overlayData->unk10->mailMessages[overlayData->unk10->mailMessageIdx])) {
MailMsg_Copy(&overlayData->unk14, &overlayData->unk10->mailMessages[overlayData->unk10->mailMessageIdx]);
} else {

2
src/overlay_94.c
View File

@ -65,7 +65,7 @@ BOOL PartyMenu_AnimateIconFormChange(PartyMenuStruct* unkPtr) {
GF_ASSERT(FALSE);
break;
}
Pokedex_SetMonCaughtFlag(Save_Pokedex_Get(FieldSystem_GetSaveDataPtr(unkPtr->unk654->fieldSystem)), mon);
Pokedex_SetMonCaughtFlag(Save_Pokedex_Get(FieldSystem_GetSaveData(unkPtr->unk654->fieldSystem)), mon);
work->state++;
break;
case 1:

4
src/overlay_bug_contest.c
View File

@ -37,7 +37,7 @@ BUGCONTEST *BugContest_New(FieldSystem *fieldSystem, u32 weekday) {
bugContest = (BUGCONTEST *)AllocFromHeap(HEAP_ID_3, sizeof(BUGCONTEST));
MI_CpuClear8(bugContest, sizeof(BUGCONTEST));
bugContest->heapId = HEAP_ID_3;
bugContest->saveData = fieldSystem->savedata;
bugContest->saveData = fieldSystem->saveData;
bugContest->sport_balls = 20;
bugContest->mon = AllocMonZeroed(bugContest->heapId);
bugContest->national_dex = Pokedex_GetNatDexFlag(Save_Pokedex_Get(bugContest->saveData));
@ -220,7 +220,7 @@ void BugContest_RestoreParty_RetrieveCaughtPokemon(BUGCONTEST *bugContest) {
if (bugContest->caught_poke) {
if (bugContest->party_cur_num >= PARTY_SIZE) {
PCStorage_PlaceMonInFirstEmptySlotInAnyBox(GetStoragePCPointer(bugContest->saveData), Mon_GetBoxMon(bugContest->mon));
PCStorage_PlaceMonInFirstEmptySlotInAnyBox(Save_PCStorage_Get(bugContest->saveData), Mon_GetBoxMon(bugContest->mon));
} else {
Party_AddMon(bugContest->party_cur, bugContest->mon);
}

6
src/pal_park.c
View File

@ -62,7 +62,7 @@ void PalPark_InitFromSave(FieldSystem* fieldSystem) {
void PalPark_StopClock(FieldSystem* fieldSystem) {
struct PalParkLocal* local = &sPalParkLocalState;
GAME_STATS* stats = Save_GameStats_Get(fieldSystem->savedata);
GAME_STATS* stats = Save_GameStats_Get(fieldSystem->saveData);
s64 elapsed = GF_RTC_TimeDelta(local->timestamp, GF_RTC_DateTimeToSec());
if (elapsed < 1000) {
local->timeRemainingFactor = 2 * (1000 - elapsed);
@ -111,7 +111,7 @@ static void LoadMonPalParkStats(u16 species, u8* dest) {
}
static void InitPalParkMonsData(FieldSystem* fieldSystem, struct PalParkLocal* palpark) {
struct MigratedPokemonSav* migrated = Save_MigratedPokemon_Get(fieldSystem->savedata);
struct MigratedPokemonSav* migrated = Save_MigratedPokemon_Get(fieldSystem->saveData);
Pokemon* mon = AllocMonZeroed(HEAP_ID_4);
u8 narc_data[6];
u16 species;
@ -233,7 +233,7 @@ static void HandleBattleEnd(FieldSystem *fieldSystem, BattleSetup *setup, struct
static BattleSetup* SetupEncounter(FieldSystem* fieldSystem, struct PalParkLocal* palpark) {
Pokemon* mon = AllocMonZeroed(HEAP_ID_32);
struct MigratedPokemonSav* migratedMons = Save_MigratedPokemon_Get(fieldSystem->savedata);
struct MigratedPokemonSav* migratedMons = Save_MigratedPokemon_Get(fieldSystem->saveData);
BattleSetup* ret = BattleSetup_New_PalPark(HEAP_ID_FIELD, PalPark_CountMonsNotCaught(fieldSystem));
BattleSetup_InitFromFieldSystem(ret, fieldSystem);
GetMigratedPokemonByIndex(migratedMons, palpark->encounterIndex, mon);

Some files were not shown because too many files have changed in this diff Show More