Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-04-26 00:11:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

change heap ids to use an enum

Browse Source
This commit is contained in:
red031000 2023-06-25 02:03:14 +01:00
parent ac3507b9ae
commit 31ff8cec15
No known key found for this signature in database
GPG Key ID: D27E50C050AE0CE1
223 changed files with 2092 additions and 2317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arm9/asm/scrcmd_12.s
View File

@ -1122,7 +1122,7 @@ sub_020435C4: ; 0x020435C4
add r0, r4, #0x0
bl sub_02042D04
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r4, r0, #0x0
ldr r1, _020435F4 ; =0x000001C6
add r0, r5, #0x0
@ -1214,7 +1214,7 @@ sub_02043684: ; 0x02043684
add r0, r4, #0x0
bl sub_02042D04
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #0x71
add r4, r0, #0x0
add r0, r5, #0x0
@ -1305,7 +1305,7 @@ sub_02043740: ; 0x02043740
add r0, r4, #0x0
bl sub_02042D04
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r4, r0, #0x0
ldr r1, _02043770 ; =0x000001C7
add r0, r5, #0x0

2
arm9/asm/scrcmd_3.s
View File

@ -136,7 +136,7 @@ ScrCmd_Unk00FA: ; 0x0203FF10
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205ED0C
add r1, sp, #0x14
strb r0, [r1, #0x3]

4
arm9/asm/scrcmd_5.s
View File

@ -16,7 +16,7 @@ ScrCmd_Unk024E: ; 0x02041194
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@ -219,7 +219,7 @@ ScrCmd_Unk0250: ; 0x02041340
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F5FC
mov r0, #0x0
pop {r3, pc}

4
arm9/asm/scrcmd_7.s
View File

@ -265,12 +265,12 @@ ScrCmd_Unk00E5: ; 0x0204188C
ldr r0, [r0, #0x0]
mov r6, #0x0
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205ED3C
cmp r0, #0x1
bne _020418F2
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F368
add r6, r0, #0x0
_020418F2:

14
arm9/asm/scrcmd_9.s
View File

@ -391,7 +391,7 @@ ScrCmd_Unk027C: ; 0x0204214C
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl sub_02022504
bl Save_SafariZone_Get
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@ -490,7 +490,7 @@ sub_02042214: ; 0x02042214
add r4, r0, #0x0
ldr r0, [r4, #0xc]
add r5, r1, #0x0
bl sub_02022504
bl Save_SafariZone_Get
mov r1, #0x1
add r2, r5, #0x0
bl sub_0202B710
@ -577,7 +577,7 @@ sub_020422C0: ; 0x020422C0
sub sp, #0x20
ldr r0, [r0, #0xc]
add r4, r1, #0x0
bl sub_02022504
bl Save_SafariZone_Get
bl sub_0202B844
ldrh r0, [r0, #0x2]
mov r1, #0x4
@ -600,7 +600,7 @@ sub_020422C0: ; 0x020422C0
sub_020422F4: ; 0x020422F4
push {r3, lr}
ldr r0, [r0, #0xc]
bl sub_02022504
bl Save_SafariZone_Get
bl sub_0202B85C
ldrb r0, [r0, #0x0]
pop {r3, pc}
@ -618,7 +618,7 @@ sub_02042304: ; 0x02042304
sub_02042314: ; 0x02042314
push {r3, lr}
ldr r0, [r0, #0xc]
bl sub_02022504
bl Save_SafariZone_Get
bl sub_0202B838
ldrb r0, [r0, #0x0]
pop {r3, pc}
@ -636,7 +636,7 @@ sub_02042324: ; 0x02042324
sub_02042334: ; 0x02042334
push {r3, lr}
ldr r0, [r0, #0xc]
bl sub_02022504
bl Save_SafariZone_Get
bl sub_0202B850
ldrb r0, [r0, #0x0]
pop {r3, pc}
@ -645,7 +645,7 @@ sub_02042334: ; 0x02042334
sub_02042344: ; 0x02042344
push {r3, lr}
ldr r0, [r0, #0xc]
bl sub_02022504
bl Save_SafariZone_Get
bl sub_0202B844
ldrb r0, [r0, #0x0]
pop {r3, pc}

483
arm9/asm/scrcmd_asm.s
View File

@ -9,465 +9,6 @@
.text
thumb_func_start ScrCmd_Unk01E5
ScrCmd_Unk01E5: ; 0x0203E4F0
push {r3-r5, lr}
add r5, r0, #0x0
bl ScriptReadHalfword
add r5, #0x80
add r4, r0, #0x0
ldr r0, [r5, #0x0]
ldr r0, [r0, #0xc]
bl Save_GameStats_Get
add r1, r4, #0x0
bl GameStats_Inc
mov r0, #0x0
pop {r3-r5, pc}
.balign 4
thumb_func_start ScrCmd_Unk01E6
ScrCmd_Unk01E6: ; 0x0203E510
push {r3-r7, lr}
add r5, r0, #0x0
bl ScriptReadHalfword
add r7, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
add r6, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
add r1, r4, #0x0
bl GetVarPointer
add r4, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
add r1, r6, #0x0
bl GetVarPointer
add r5, #0x80
add r6, r0, #0x0
ldr r0, [r5, #0x0]
ldr r0, [r0, #0xc]
bl Save_GameStats_Get
add r1, r7, #0x0
bl GameStats_GetCapped
ldr r1, _0203E564 ; =0xFFFF0000
and r1, r0
lsr r1, r1, #0x10
strh r1, [r4, #0x0]
strh r0, [r6, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
.balign 4
_0203E564: .word 0xFFFF0000
thumb_func_start ScrCmd_Unk01E7
ScrCmd_Unk01E7: ; 0x0203E568
push {r4-r6, lr}
add r5, r0, #0x0
bl ScriptReadHalfword
add r6, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
ldr r1, [r5, #0x8]
add r2, r1, #0x1
str r2, [r5, #0x8]
lsl r2, r4, #0x10
add r4, r2, #0x0
orr r4, r0
ldrb r0, [r1, #0x0]
cmp r0, #0x0
beq _0203E59C
cmp r0, #0x1
beq _0203E5B0
cmp r0, #0x2
beq _0203E5C4
b _0203E5D6
_0203E59C:
add r5, #0x80
ldr r0, [r5, #0x0]
ldr r0, [r0, #0xc]
bl Save_GameStats_Get
add r1, r6, #0x0
add r2, r4, #0x0
bl GameStats_Add
b _0203E5D6
_0203E5B0:
add r5, #0x80
ldr r0, [r5, #0x0]
ldr r0, [r0, #0xc]
bl Save_GameStats_Get
add r1, r6, #0x0
add r2, r4, #0x0
bl GameStats_SetCapped
b _0203E5D6
_0203E5C4:
add r5, #0x80
ldr r0, [r5, #0x0]
ldr r0, [r0, #0xc]
bl Save_GameStats_Get
add r1, r6, #0x0
add r2, r4, #0x0
bl GameStats_UpdateBounded
_0203E5D6:
mov r0, #0x0
pop {r4-r6, pc}
.balign 4
thumb_func_start ScrCmd_Unk0202
ScrCmd_Unk0202: ; 0x0203E5DC
push {r3-r7, lr}
sub sp, #0x8
add r5, r0, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl Save_LocalFieldData_Get
add r7, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
str r0, [sp, #0x0]
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl sub_02022504
ldr r1, [r5, #0x8]
str r0, [sp, #0x4]
add r0, r1, #0x1
str r0, [r5, #0x8]
ldrb r4, [r1, #0x0]
add r0, r7, #0x0
bl sub_02034E24
add r6, r0, #0x0
add r0, r7, #0x0
bl sub_02034E28
add r7, r0, #0x0
cmp r4, #0x0
beq _0203E62C
cmp r4, #0x1
beq _0203E642
b _0203E66E
_0203E62C:
ldr r0, [sp, #0x0]
bl sub_0205F1F4
ldr r0, [sp, #0x4]
bl sub_02060FD0
mov r0, #0x1e
strh r0, [r6, #0x0]
mov r0, #0x0
strh r0, [r7, #0x0]
b _0203E66E
_0203E642:
ldr r0, [sp, #0x0]
bl sub_0205F204
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl sub_02061574
mov r0, #0x4
bl sub_0202912C
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
mov r2, #0x1
add r0, #0x98
ldr r0, [r0, #0x0]
bl sub_02028AD4
mov r0, #0x0
strh r0, [r6, #0x0]
strh r0, [r7, #0x0]
_0203E66E:
mov r0, #0x0
add sp, #0x8
pop {r3-r7, pc}
thumb_func_start ScrCmd_Unk0206
ScrCmd_Unk0206: ; 0x0203E674
push {r3, lr}
add r0, #0x80
ldr r0, [r0, #0x0]
bl sub_0206015C
mov r0, #0x1
pop {r3, pc}
.balign 4
thumb_func_start ScrCmd_Unk020D
ScrCmd_Unk020D: ; 0x0203E684
push {r4-r6, lr}
add r5, r0, #0x0
ldr r2, [r5, #0x8]
add r1, r2, #0x1
str r1, [r5, #0x8]
ldrb r4, [r2, #0x0]
bl ScriptReadHalfword
add r1, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl GetVarPointer
add r5, #0x80
add r6, r0, #0x0
ldr r0, [r5, #0x0]
add r1, r4, #0x0
bl ov06_022456E8
strh r0, [r6, #0x0]
mov r0, #0x1
pop {r4-r6, pc}
.balign 4
thumb_func_start ScrCmd_Unk020E
ScrCmd_Unk020E: ; 0x0203E6B4
push {r3, lr}
add r0, #0x80
ldr r0, [r0, #0x0]
bl sub_02064E20
mov r0, #0x0
pop {r3, pc}
.balign 4
thumb_func_start ScrCmd_Unk020F
ScrCmd_Unk020F: ; 0x0203E6C4
push {r4-r6, lr}
add r5, r0, #0x0
bl ScriptReadHalfword
add r1, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl GetVarPointer
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
mov r1, #0x0
add r6, r0, #0x0
mov r0, #0x41
add r2, r1, #0x0
bl sub_0200433C
add r5, #0x80
ldrh r1, [r4, #0x0]
ldr r0, [r5, #0x0]
add r2, r6, #0x0
bl ov06_0224525C
mov r0, #0x1
pop {r4-r6, pc}
thumb_func_start ScrCmd_Unk0210
ScrCmd_Unk0210: ; 0x0203E6FC
push {r4-r6, lr}
add r5, r0, #0x0
bl ScriptReadHalfword
add r6, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
add r1, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl GetVarPointer
add r5, #0x80
add r4, r0, #0x0
ldr r0, [r5, #0x0]
add r1, r6, #0x0
bl ov06_02245340
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r4-r6, pc}
.balign 4
thumb_func_start ScrCmd_Unk0211
ScrCmd_Unk0211: ; 0x0203E72C
push {r3, lr}
ldr r2, [r0, #0x8]
add r1, r2, #0x1
str r1, [r0, #0x8]
add r0, #0x80
ldr r0, [r0, #0x0]
ldrb r1, [r2, #0x0]
ldr r0, [r0, #0x38]
bl sub_02055560
mov r0, #0x1
pop {r3, pc}
thumb_func_start ScrCmd_Unk0214
ScrCmd_Unk0214: ; 0x0203E744
push {r3-r5, lr}
add r5, r0, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl GetVarPointer
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0205F688
strh r0, [r5, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
.balign 4
thumb_func_start ScrCmd_Unk0218
ScrCmd_Unk0218: ; 0x0203E774
push {r3-r7, lr}
add r4, r0, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl Save_Pokedex_Get
add r7, r0, #0x0
add r0, r4, #0x0
bl ScriptReadHalfword
add r4, #0x80
add r1, r0, #0x0
ldr r0, [r4, #0x0]
bl GetVarPointer
str r0, [sp, #0x0]
add r0, r7, #0x0
bl Pokedex_CountSinnohDexSeen
add r4, r0, #0x0
bl LCRandom
add r1, r4, #0x0
bl _s32_div_f
lsl r0, r1, #0x10
lsr r6, r0, #0x10
ldr r0, [sp, #0x0]
mov r1, #0x19
strh r1, [r0, #0x0]
mov r4, #0x1
mov r5, #0x0
_0203E7B6:
add r0, r7, #0x0
add r1, r4, #0x0
bl Pokedex_CheckMonSeenFlag
cmp r0, #0x1
bne _0203E7DC
add r0, r4, #0x0
bl SpeciesToSinnohDexNo
cmp r0, #0x0
beq _0203E7DC
cmp r5, r6
bne _0203E7D6
ldr r0, [sp, #0x0]
strh r4, [r0, #0x0]
b _0203E7E8
_0203E7D6:
add r0, r5, #0x1
lsl r0, r0, #0x10
lsr r5, r0, #0x10
_0203E7DC:
add r0, r4, #0x1
lsl r0, r0, #0x10
lsr r4, r0, #0x10
ldr r0, _0203E7EC ; =0x000001ED
cmp r4, r0
bls _0203E7B6
_0203E7E8:
mov r0, #0x0
pop {r3-r7, pc}
.balign 4
_0203E7EC: .word 0x000001ED
thumb_func_start ScrCmd_Unk0219
ScrCmd_Unk0219: ; 0x0203E7F0
push {r3-r5, lr}
add r5, r0, #0x0
bl ScriptReadHalfword
add r1, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
add r5, #0x80
add r4, r0, #0x0
ldr r0, [r5, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
add r1, r4, #0x0
bl sub_0205F5A4
mov r0, #0x0
pop {r3-r5, pc}
.balign 4
thumb_func_start ScrCmd_Unk021A
ScrCmd_Unk021A: ; 0x0203E81C
push {r3-r5, lr}
add r5, r0, #0x0
bl ScriptReadHalfword
add r1, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl GetVarPointer
add r5, #0x80
add r4, r0, #0x0
ldr r0, [r5, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl sub_0205F594
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
.balign 4
thumb_func_start ScrCmd_Unk021B
ScrCmd_Unk021B: ; 0x0203E848
push {r3, lr}
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl sub_0202AA00
mov r0, #0x0
pop {r3, pc}
thumb_func_start ScrCmd_Unk021C
ScrCmd_Unk021C: ; 0x0203E858
push {r3, lr}
ldr r2, [r0, #0x8]
add r1, r2, #0x1
str r1, [r0, #0x8]
add r0, #0x80
ldr r0, [r0, #0x0]
ldrb r1, [r2, #0x0]
ldr r0, [r0, #0xc]
bl sub_02060490
mov r0, #0x0
pop {r3, pc}
thumb_func_start ScrCmd_Unk0226
ScrCmd_Unk0226: ; 0x0203E870
push {r3-r5, lr}
add r5, r0, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
mov r1, #0x14
bl FieldSysGetAttrAddr
ldr r1, [r5, #0x8]
add r4, r0, #0x0
add r0, r1, #0x1
str r0, [r5, #0x8]
ldrb r1, [r1, #0x0]
mov r0, #0xb
bl ov06_0224884C
str r0, [r4, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
thumb_func_start ScrCmd_Unk0227
ScrCmd_Unk0227: ; 0x0203E894
push {r3-r5, lr}
@ -1407,7 +948,7 @@ ScrCmd_Unk0265: ; 0x0203F00C
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F1C4
mov r0, #0x0
pop {r3, pc}
@ -1418,7 +959,7 @@ ScrCmd_Unk0266: ; 0x0203F020
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F1D4
mov r0, #0x0
pop {r3, pc}
@ -1689,7 +1230,7 @@ ScrCmd_Unk026F: ; 0x0203F254
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #0x0
bl sub_0205F698
mov r0, #0x0
@ -1714,7 +1255,7 @@ ScrCmd_Unk0270: ; 0x0203F26C
ldr r0, [r5, #0x0]
ldrb r4, [r1, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
cmp r4, #0x0
beq _0203F2A0
add r1, r6, #0x0
@ -1762,7 +1303,7 @@ ScrCmd_Unk0275: ; 0x0203F2E4
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r5, r0, #0x0
add r0, r4, #0x0
bl ScriptReadHalfword
@ -1798,7 +1339,7 @@ ScrCmd_Unk0277: ; 0x0203F31C
add r4, r0, #0x0
ldr r0, [r5, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F648
strh r0, [r4, #0x0]
mov r0, #0x0
@ -1937,7 +1478,7 @@ ScrCmd_Unk027E: ; 0x0203F44C
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r5, r0, #0x0
add r0, r4, #0x0
bl ScriptReadHalfword
@ -2133,7 +1674,7 @@ ScrCmd_Unk0286: ; 0x0203F5D4
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@ -2156,7 +1697,7 @@ ScrCmd_Unk0287: ; 0x0203F604
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@ -2179,7 +1720,7 @@ ScrCmd_Unk0288: ; 0x0203F634
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@ -2306,7 +1847,7 @@ ScrCmd_Unk028B: ; 0x0203F720
add r6, r0, #0x0
ldr r0, [r5, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r5, r0, #0x0
cmp r4, #0x3
bls _0203F752
@ -2549,7 +2090,7 @@ ScrCmd_Unk0293: ; 0x0203F924
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword

8
arm9/asm/unk_02034D7C.s
View File

@ -140,13 +140,13 @@ sub_02034E20: ; 0x02034E20
add r0, #0x8c
bx lr
thumb_func_start sub_02034E24
sub_02034E24: ; 0x02034E24
thumb_func_start LocalFieldData_GetSafariBallsCounter
LocalFieldData_GetSafariBallsCounter: ; 0x02034E24
add r0, #0x98
bx lr
thumb_func_start sub_02034E28
sub_02034E28: ; 0x02034E28
thumb_func_start LocalFieldData_GetSafariStepsCounter
LocalFieldData_GetSafariStepsCounter: ; 0x02034E28
add r0, #0x96
bx lr

4
arm9/asm/unk_02034E84.s
View File

@ -238,7 +238,7 @@ _02034F8E:
cmp r2, #0x0
beq _02034FAE
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
ldr r2, _02034FBC ; =UNK_020F2224 + 14
lsl r3, r4, #0x4
ldrh r2, [r2, r3]
@ -263,7 +263,7 @@ sub_02034FC0: ; 0x02034FC0
bl sub_02034E78
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
ldr r2, _02034FE0 ; =UNK_020F2224 + 14
lsl r3, r4, #0x4
ldrh r2, [r2, r3]

28
arm9/asm/unk_02035068.s
View File

@ -84,7 +84,7 @@ sub_02035080: ; 0x02035080
bl sub_02035254
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F214
cmp r0, #0x1
bne _020350A6
@ -96,7 +96,7 @@ sub_02035080: ; 0x02035080
b _020350E6
_020350A6:
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F244
cmp r0, #0x1
bne _020350C2
@ -223,7 +223,7 @@ sub_020351A0: ; 0x020351A0
lsl r0, r0, #0x2
str r1, [r4, r0]
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F214
cmp r0, #0x1
bne _020351D4
@ -235,7 +235,7 @@ sub_020351A0: ; 0x020351A0
b _02035240
_020351D4:
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F244
cmp r0, #0x1
bne _020351F0
@ -324,15 +324,15 @@ sub_02035270: ; 0x02035270
orr r4, r0
_02035288:
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl ScriptState_GetStarter
bl Save_VarsFlags_Get
bl Save_VarsFlags_GetStarter
cmp r0, #0x0
bne _0203529A
mov r0, #0x2
orr r4, r0
_0203529A:
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205ECE0
cmp r0, #0x0
bne _020352AC
@ -918,7 +918,7 @@ sub_02035734: ; 0x02035734
bl sub_0204652C
add r5, r0, #0x0
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F214
cmp r0, #0x1
bne _0203575A
@ -926,7 +926,7 @@ sub_02035734: ; 0x02035734
b _0203576C
_0203575A:
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F244
cmp r0, #0x1
beq _0203576A
@ -1010,7 +1010,7 @@ _020357D6:
bne _02035834
ldr r0, [r4, #0xc]
bl Save_LocalFieldData_Get
bl sub_02034E24
bl LocalFieldData_GetSafariBallsCounter
mov r1, #0x0
add r2, r0, #0x0
str r1, [sp, #0x0]
@ -1077,12 +1077,12 @@ sub_020358A0: ; 0x020358A0
bl sub_0204652C
add r5, r0, #0x0
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F214
cmp r0, #0x0
bne _020358CE
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F244
cmp r0, #0x0
beq _020358E0
@ -1670,7 +1670,7 @@ sub_02035D34: ; 0x02035D34
bl Save_PlayerData_GetProfileAddr
str r0, [sp, #0x4]
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r7, r0, #0x0
ldr r0, [sp, #0x0]
str r0, [r4, #0x0]
@ -2933,7 +2933,7 @@ sub_020367E8: ; 0x020367E8
add r0, r5, #0x0
bl sub_020358A0
ldr r0, [r6, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F214
cmp r0, #0x1
bne _02036834

2
arm9/asm/unk_020377F0.s
View File

@ -2376,7 +2376,7 @@ sub_02038914: ; 0x02038914
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r7, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C

44
arm9/asm/unk_02038C78.s
View File

@ -634,9 +634,9 @@ gScriptCmdTable: ; 0x020F355C
.word ScrCmd_Unk01E2
.word ScrCmd_Unk01E3
.word ScrCmd_Unk01E4
.word ScrCmd_Unk01E5
.word ScrCmd_Unk01E6
.word ScrCmd_Unk01E7
.word ScrCmd_IncrementGameStat
.word ScrCmd_GetGameStat
.word ScrCmd_SetGameStat
.word ScrCmd_CheckSinnohDexComplete
.word ScrCmd_CheckNationalDexComplete
.word ScrCmd_RegisterSinnohPokedex
@ -663,25 +663,25 @@ gScriptCmdTable: ; 0x020F355C
.word ScrCmd_Unk01FF
.word ScrCmd_GetPreviousMapID
.word ScrCmd_GetCurrentMapID
.word ScrCmd_Unk0202
.word ScrCmd_EnableDisableSafariZone
.word ScrCmd_BattleRoomWarp
.word ScrCmd_ExitBattleRoom
.word ScrCmd_ShowGeonetScreen
.word ScrCmd_Unk0206
.word ScrCmd_UseGreatMarshBinoculars
.word ScrCmd_Unk0207
.word ScrCmd_ShowPokemonPic
.word ScrCmd_Unk0209
.word ScrCmd_Unk020A
.word ScrCmd_Unk020B
.word ScrCmd_Unk020C
.word ScrCmd_Unk020D
.word ScrCmd_Unk020E
.word ScrCmd_Unk020F
.word ScrCmd_Unk0210
.word ScrCmd_Unk0211
.word ScrCmd_SpearPillarSequence
.word ScrCmd_KeepSafariTrain
.word ScrCmd_MoveSafariTrain
.word ScrCmd_CheckSafariTrainPosition
.word ScrCmd_IgnoreHeights
.word ScrCmd_GetPartyMonNature
.word ScrCmd_FindPartyMonWithNature
.word ScrCmd_Unk0214
.word ScrCmd_GetSpiritombTalkCounter
.word ScrCmd_ClearAmitySquareSteps
.word ScrCmd_CheckAmitySquareSteps
.word ScrCmd_GetAmitySquareAccessory
@ -689,7 +689,7 @@ gScriptCmdTable: ; 0x020F355C
.word ScrCmd_Unk0219
.word ScrCmd_Unk021A
.word ScrCmd_Unk021B
.word ScrCmd_Unk021C
.word ScrCmd_CreateRoamer
.word ScrCmd_UnionGroup
.word ScrCmd_Unk021E
.word ScrCmd_Unk021F
@ -699,7 +699,7 @@ gScriptCmdTable: ; 0x020F355C
.word ScrCmd_Unk0223
.word ScrCmd_Unk0224
.word ScrCmd_Unk0225
.word ScrCmd_Unk0226
.word ScrCmd_NPCTradeInit
.word ScrCmd_Unk0227
.word ScrCmd_Unk0228
.word ScrCmd_Unk0229
@ -1946,7 +1946,7 @@ GetVarPointer: ; 0x020394B8
add r5, r0, #0x0
ldr r0, [r5, #0xc]
add r4, r1, #0x0
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #0x1
lsl r1, r1, #0xe
cmp r4, r1
@ -2006,7 +2006,7 @@ FlagCheck: ; 0x02039528
push {r4, lr}
ldr r0, [r0, #0xc]
add r4, r1, #0x0
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r1, r4, #0x0
bl CheckFlagInArray
pop {r4, pc}
@ -2017,7 +2017,7 @@ FlagSet: ; 0x0203953C
push {r4, lr}
ldr r0, [r0, #0xc]
add r4, r1, #0x0
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r1, r4, #0x0
bl SetFlagInArray
pop {r4, pc}
@ -2028,7 +2028,7 @@ FlagClear: ; 0x02039550
push {r4, lr}
ldr r0, [r0, #0xc]
add r4, r1, #0x0
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r1, r4, #0x0
bl ClearFlagInArray
pop {r4, pc}
@ -2038,7 +2038,7 @@ FlagClear: ; 0x02039550
ResetTempFlagsAndVars: ; 0x02039564
push {r4, lr}
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #0x1
add r4, r0, #0x0
bl GetFlagAddr
@ -2065,7 +2065,7 @@ ResetTempFlagsAndVars: ; 0x02039564
sub_0203959C: ; 0x0203959C
push {r3, lr}
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #0xaa
lsl r1, r1, #0x4
bl GetFlagAddr
@ -2157,7 +2157,7 @@ TrainerFlagCheck: ; 0x02039640
push {r4, lr}
ldr r0, [r0, #0xc]
add r4, r1, #0x0
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #0x55
lsl r1, r1, #0x4
add r1, r4, r1
@ -2172,7 +2172,7 @@ TrainerFlagSet: ; 0x0203965C
push {r4, lr}
ldr r0, [r0, #0xc]
add r4, r1, #0x0
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #0x55
lsl r1, r1, #0x4
add r1, r4, r1
@ -2187,7 +2187,7 @@ TrainerFlagClear: ; 0x02039678
push {r4, lr}
ldr r0, [r0, #0xc]
add r4, r1, #0x0
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #0x55
lsl r1, r1, #0x4
add r1, r4, r1

2
arm9/asm/unk_02046030.s
View File

@ -44,7 +44,7 @@ sub_02046068: ; 0x02046068
bl sub_0204652C
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
ldrb r1, [r4, #0x8]
cmp r1, #0xb
bls _0204608A

12
arm9/asm/unk_0204653C.s
View File

@ -197,7 +197,7 @@ _02046690:
pop {r3-r7, pc}
_020466A4:
ldr r0, [r6, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205ED3C
cmp r0, #0x0
beq _020466BC
@ -594,7 +594,7 @@ sub_020469B8: ; 0x020469B8
add r5, r0, #0x0
ldr r0, [r5, #0xc]
add r4, r1, #0x0
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F214
cmp r0, #0x0
beq _020469F2
@ -639,7 +639,7 @@ sub_02046A20: ; 0x02046A20
ldr r0, [r0, #0xc]
add r5, r1, #0x0
add r4, r2, #0x0
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F214
cmp r0, #0x0
beq _02046A5A
@ -765,7 +765,7 @@ _02046AFE:
pop {r4-r6, pc}
_02046B3E:
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205ED3C
cmp r0, #0x0
beq _02046B56
@ -879,7 +879,7 @@ sub_02046C1C: ; 0x02046C1C
add r4, r0, #0x0
ldr r0, [r6, #0xc]
bl Save_LocalFieldData_Get
bl sub_02034E24
bl LocalFieldData_GetSafariBallsCounter
str r0, [sp, #0x0]
ldr r0, [r4, #0x0]
cmp r0, #0x7
@ -940,7 +940,7 @@ _02046CAA:
cmp r0, #0x4
bne _02046CD4
ldr r0, [r6, #0xc]
bl sub_02022504
bl Save_SafariZone_Get
str r0, [sp, #0x4]
ldr r0, [r5, #0x10]
mov r1, #0x0

6
arm9/asm/unk_020476CC.s
View File

@ -253,7 +253,7 @@ sub_02047814: ; 0x02047814
bl AllocMonZeroed
add r6, r0, #0x0
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F3C0
mov r2, #0x0
str r2, [sp, #0x0]
@ -546,7 +546,7 @@ sub_02047A78: ; 0x02047A78
lsl r1, r1, #0x2
str r0, [r5, r1]
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F1B4
mov r1, #0x5b
lsl r1, r1, #0x2
@ -1023,7 +1023,7 @@ sub_02047F38: ; 0x02047F38
str r0, [sp, #0x4]
ldr r0, [r5, #0xc]
bl Save_LocalFieldData_Get
bl sub_02034E24
bl LocalFieldData_GetSafariBallsCounter
add r5, r0, #0x0
add r0, r4, #0x0
add r0, #0xf8

2
arm9/asm/unk_020484A8.s
View File

@ -265,7 +265,7 @@ CallTask_GameClear: ; 0x02048694
bl AllocFromHeap
add r5, r0, #0x0
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r6, r0, #0x0
ldr r0, [r4, #0xc]
bl Save_PlayerData_GetProfileAddr

16
arm9/asm/unk_02048904.s
View File

@ -177,7 +177,7 @@ _02048A28:
bl sub_02063684
_02048A2E:
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F408
cmp r4, #0x0
bne _02048A42
@ -191,7 +191,7 @@ _02048A42:
bl sub_02025484
_02048A50:
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
str r0, [sp, #0x0]
add r0, r5, #0x0
add r1, r7, #0x0
@ -348,7 +348,7 @@ _02048BA2:
ldr r0, [r0, #0x0]
bl MapMatrix_Load
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #0x3
bl sub_0205F524
cmp r0, #0x0
@ -357,7 +357,7 @@ _02048BA2:
bl sub_020346CC
_02048BC2:
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #0x2
bl sub_0205F524
cmp r0, #0x0
@ -532,7 +532,7 @@ sub_02048D04: ; 0x02048D04
bl LocalFieldData_GetDynamicWarp
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
ldr r0, [r5, #0x1c]
ldr r0, [r0, #0x0]
str r0, [r4, #0x0]
@ -615,7 +615,7 @@ sub_02048DAC: ; 0x02048DAC
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r6, r0, #0x0
add r0, r7, #0x0
bl sub_02046530
@ -755,7 +755,7 @@ sub_02048EDC: ; 0x02048EDC
bl sub_0204652C
add r6, r0, #0x0
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
str r0, [sp, #0x0]
add r0, r7, #0x0
bl sub_02046530
@ -868,7 +868,7 @@ sub_02048FC8: ; 0x02048FC8
cmp r0, #0x0
beq _02048FF8
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_02048D04

2
arm9/asm/unk_0204AB0C.s
View File

@ -129,7 +129,7 @@ _0204ABBE:
_0204ABC4:
add r6, r0, #0x0
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r1, r4, #0x0
bl sub_0205EF20
cmp r0, #0x0

6
arm9/asm/unk_0204CB20.s
View File

@ -4018,7 +4018,7 @@ sub_0204E96C: ; 0x0204E96C
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x54]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r6, r0, #0x0
ldrb r0, [r5, #0x1]
cmp r0, #0x8
@ -4113,7 +4113,7 @@ _0204E9B8:
add r1, r4, #0x0
bl sub_02026908
add r0, r6, #0x0
bl sub_0205F688
bl Save_VarsFlags_GetSpiritombTalkCounter
add r1, r0, #0x0
add r1, r1, #0x1
lsl r1, r1, #0x10
@ -5478,7 +5478,7 @@ _0204F4D2:
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x54]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205EDF8
ldr r0, _0204F5E0 ; =UNK_021C5A68
ldrb r1, [r5, #0x1]

6
arm9/asm/unk_0204FBA8.s
View File

@ -159,7 +159,7 @@ sub_0204FC5C: ; 0x0204FC5C
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x18]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F194
cmp r0, #0x0
bne _0204FC9A
@ -712,7 +712,7 @@ _020500B6:
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x18]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F194
cmp r0, #0x0
bne _020500F8
@ -739,7 +739,7 @@ sub_02050114: ; 0x02050114
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x18]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F194
cmp r0, #0x0
beq _0205013A

4
arm9/asm/unk_02055068.s
View File

@ -746,8 +746,8 @@ sub_02055540: ; 0x02055540
add sp, #0xc
pop {r4-r5, pc}
thumb_func_start sub_02055560
sub_02055560: ; 0x02055560
thumb_func_start PlayerAvatar_ToggleAutomaticHeightUpdating
PlayerAvatar_ToggleAutomaticHeightUpdating: ; 0x02055560
push {r4, lr}
add r4, r1, #0x0
bl PlayerAvatar_GetMapObject

14
arm9/asm/unk_0205CE48.s
View File

@ -75,7 +75,7 @@ sub_0205CE80: ; 0x0205CE80
ldr r0, [r0, #0x0]
str r0, [r5, #0x0]
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205ED3C
str r0, [r5, #0x4]
ldr r0, [r4, #0x38]
@ -300,7 +300,7 @@ sub_0205D024: ; 0x0205D024
bl Save_PlayerData_GetOptionsAddr
str r0, [r4, #0xc]
ldr r0, [r5, #0xc]
bl sub_02022504
bl Save_SafariZone_Get
str r0, [r4, #0x10]
mov r0, #0x7a
lsl r0, r0, #0x2
@ -457,13 +457,13 @@ _0205D194:
_0205D1A4:
ldr r0, [r5, #0x18]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F214
cmp r0, #0x1
beq _0205D1C4
ldr r0, [r5, #0x18]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F244
cmp r0, #0x1
bne _0205D1CA
@ -1514,7 +1514,7 @@ sub_0205D9A8: ; 0x0205D9A8
bl Save_PlayerData_GetOptionsAddr
str r0, [r4, #0xc]
ldr r0, [r5, #0xc]
bl sub_02022504
bl Save_SafariZone_Get
str r0, [r4, #0x10]
mov r0, #0x7a
lsl r0, r0, #0x2
@ -1646,7 +1646,7 @@ sub_0205DAEC: ; 0x0205DAEC
add r4, r0, #0x0
ldr r0, [r4, #0x18]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r5, r0, #0x0
bl sub_0205ED0C
cmp r0, #0x0
@ -1696,7 +1696,7 @@ sub_0205DB44: ; 0x0205DB44
pop {r3-r7, pc}
_0205DB54:
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F244
cmp r0, #0x1
bne _0205DB66

12
arm9/asm/unk_0205F314.s
View File

@ -83,8 +83,8 @@ sub_0205F378: ; 0x0205F378
_0205F380: .word sub_0205F314
_0205F384: .word 0x00004030
thumb_func_start ScriptState_GetStarter
ScriptState_GetStarter: ; 0x0205F388
thumb_func_start Save_VarsFlags_GetStarter
Save_VarsFlags_GetStarter: ; 0x0205F388
ldr r3, _0205F390 ; =sub_0205F344
ldr r1, _0205F394 ; =0x00004030
bx r3
@ -448,7 +448,7 @@ sub_0205F5FC: ; 0x0205F5FC
sub_0205F618: ; 0x0205F618
push {r3-r5, lr}
add r5, r0, #0x0
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0202881C
@ -487,7 +487,7 @@ _0205F664: .word 0x00004041
thumb_func_start sub_0205F668
sub_0205F668: ; 0x0205F668
push {r4, lr}
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r4, r0, #0x0
bl LCRandom
mov r1, #0x62
@ -499,8 +499,8 @@ sub_0205F668: ; 0x0205F668
bl sub_0205F658
pop {r4, pc}
thumb_func_start sub_0205F688
sub_0205F688: ; 0x0205F688
thumb_func_start Save_VarsFlags_GetSpiritombTalkCounter
Save_VarsFlags_GetSpiritombTalkCounter: ; 0x0205F688
ldr r3, _0205F690 ; =sub_0205F344
ldr r1, _0205F694 ; =0x0000403E
bx r3

4
arm9/asm/unk_0205F7A0.s
View File

@ -24,7 +24,7 @@ sub_0205F7A0: ; 0x0205F7A0
ldr r0, [r0, #0xc]
add r5, r1, #0x0
str r2, [sp, #0x4]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r7, r0, #0x0
ldr r0, [sp, #0x0]
ldr r0, [r0, #0xc]
@ -164,7 +164,7 @@ sub_0205F8CC: ; 0x0205F8CC
ldr r0, [r7, #0xc]
add r5, r1, #0x0
add r4, r2, #0x0
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
str r0, [sp, #0x0]
add r0, sp, #0x28
bl FS_InitFile

4
arm9/asm/unk_020603B0.s
View File

@ -197,8 +197,8 @@ sub_02060478: ; 0x02060478
_0206048E:
pop {r3-r5, pc}
thumb_func_start sub_02060490
sub_02060490: ; 0x02060490
thumb_func_start Save_CreateRoamerByID
Save_CreateRoamerByID: ; 0x02060490
push {r3-r7, lr}
sub sp, #0x20
add r5, r1, #0x0

20
arm9/asm/unk_02060CCC.s
View File

@ -246,7 +246,7 @@ sub_02060D74: ; 0x02060D74
add r5, r1, #0x0
add r4, r2, #0x0
add r6, r3, #0x0
bl sub_02022504
bl Save_SafariZone_Get
add r1, r5, #0x0
add r2, r4, #0x0
add r3, r6, #0x0
@ -1284,7 +1284,7 @@ sub_02061574: ; 0x02061574
add r5, r0, #0x0
ldr r0, [r5, #0xc]
add r4, sp, #0x0
bl sub_02022504
bl Save_SafariZone_Get
bl sub_0202B868
ldrb r1, [r0, #0x7]
cmp r1, #0x0
@ -1823,7 +1823,7 @@ sub_02061990: ; 0x02061990
pop {r3-r5, pc}
_020619B0:
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #0x2
mov r2, #0x11
bl sub_0205F2E4
@ -2099,7 +2099,7 @@ sub_02061BCC: ; 0x02061BCC
add r5, r0, #0x0
ldr r0, [r5, #0xc]
add r4, r1, #0x0
bl sub_02022504
bl Save_SafariZone_Get
bl sub_0202B85C
ldrh r2, [r0, #0x0]
add r1, sp, #0x0
@ -2158,7 +2158,7 @@ _02061C42:
sub_02061C48: ; 0x02061C48
push {r3, lr}
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #0x2
mov r2, #0x11
bl sub_0205F2E4
@ -2330,7 +2330,7 @@ sub_02061DA4: ; 0x02061DA4
add r5, r0, #0x0
ldr r0, [r5, #0xc]
add r4, r1, #0x0
bl sub_02022504
bl Save_SafariZone_Get
bl sub_0202B838
ldrh r2, [r0, #0x0]
add r1, sp, #0x0
@ -2522,7 +2522,7 @@ sub_02061F2C: ; 0x02061F2C
add r5, r0, #0x0
ldr r0, [r5, #0xc]
add r4, r1, #0x0
bl sub_02022504
bl Save_SafariZone_Get
bl sub_0202B850
ldrb r2, [r0, #0x0]
add r1, sp, #0x0
@ -2599,7 +2599,7 @@ sub_02061FBC: ; 0x02061FBC
add r5, r0, #0x0
ldr r0, [r5, #0xc]
add r4, r1, #0x0
bl sub_02022504
bl Save_SafariZone_Get
bl sub_0202B844
add r6, r0, #0x0
add r3, sp, #0x0
@ -3081,7 +3081,7 @@ sub_0206234C: ; 0x0206234C
push {r3-r7, lr}
sub sp, #0x88
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
ldr r4, _020623E8 ; =UNK_020F7658
add r7, r0, #0x0
mov r6, #0x0
@ -3221,7 +3221,7 @@ _0206245C: .word UNK_020F79EE
sub_02062460: ; 0x02062460
push {r3, lr}
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #0x2
mov r2, #0x9
bl sub_0205F2E4

24
arm9/asm/unk_0206367C.s
View File

@ -16,7 +16,7 @@ sub_02063684: ; 0x02063684
add r5, r0, #0x0
bl sub_02063818
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #0x0
bl sub_0205F264
ldr r1, [r5, #0x1c]
@ -32,7 +32,7 @@ sub_02063684: ; 0x02063684
add r0, #0x74
strh r1, [r0, #0x0]
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F214
cmp r0, #0x0
bne _020636DA
@ -63,10 +63,10 @@ sub_020636DC: ; 0x020636DC
bl sub_0206384C
_020636F8:
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F254
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #0x0
bl sub_0205F264
ldr r1, [r5, #0x1c]
@ -92,7 +92,7 @@ _020636F8:
cmp r0, #0x0
bne _02063758
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r4, r0, #0x0
bl sub_0205F284
add r0, r4, #0x0
@ -140,8 +140,8 @@ sub_020637A8: ; 0x020637A8
push {r4, lr}
add r4, r0, #0x0
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl sub_0205F204
bl Save_VarsFlags_Get
bl Save_VarsFlags_ClearSafariSysFlag
ldr r0, [r4, #0xc]
bl Save_Roamers_Get
bl sub_020603C8
@ -153,8 +153,8 @@ sub_020637C4: ; 0x020637C4
push {r4, lr}
add r4, r0, #0x0
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl sub_0205F204
bl Save_VarsFlags_Get
bl Save_VarsFlags_ClearSafariSysFlag
ldr r0, [r4, #0xc]
bl Save_Roamers_Get
bl sub_020603C8
@ -165,8 +165,8 @@ sub_020637C4: ; 0x020637C4
sub_020637E0: ; 0x020637E0
push {r3, lr}
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl sub_0205F204
bl Save_VarsFlags_Get
bl Save_VarsFlags_ClearSafariSysFlag
pop {r3, pc}
.balign 4
@ -174,7 +174,7 @@ sub_020637E0: ; 0x020637E0
sub_020637F0: ; 0x020637F0
push {r4, lr}
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r4, r0, #0x0
bl sub_0205ED2C
add r0, r4, #0x0

20
arm9/asm/unk_02063948.s
View File

@ -311,7 +311,7 @@ _02063B66:
_02063B74:
ldr r0, [r4, #0x4]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205ED3C
cmp r0, #0x1
bne _02063B88
@ -320,13 +320,13 @@ _02063B74:
_02063B88:
ldr r0, [r4, #0x4]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F214
cmp r0, #0x1
beq _02063BA8
ldr r0, [r4, #0x4]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F244
cmp r0, #0x1
bne _02063BAC
@ -423,7 +423,7 @@ _02063C4A:
_02063C56:
ldr r0, [r4, #0x4]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205ED3C
cmp r0, #0x1
bne _02063C6A
@ -862,7 +862,7 @@ _02063FA6:
_02063FB2:
ldr r0, [r4, #0x4]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205ED3C
cmp r0, #0x1
bne _02063FC6
@ -1023,7 +1023,7 @@ _020640DE:
_020640EC:
ldr r0, [r4, #0x4]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205ED3C
cmp r0, #0x1
bne _02064100
@ -1032,13 +1032,13 @@ _020640EC:
_02064100:
ldr r0, [r4, #0x4]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F214
cmp r0, #0x1
beq _02064120
ldr r0, [r4, #0x4]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F244
cmp r0, #0x1
bne _02064124
@ -1138,7 +1138,7 @@ _020641D2:
_020641D6:
ldr r0, [r4, #0x4]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205ED3C
cmp r0, #0x1
bne _020641EA
@ -1228,7 +1228,7 @@ sub_02064284: ; 0x02064284
pop {r3, pc}
_02064294:
ldr r0, [r1, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F244
cmp r0, #0x1
bne _020642A6

4
arm9/asm/unk_020647A4.s
View File

@ -441,7 +441,7 @@ _02064A96: ; jump table (using 16-bit offset)
_02064A9E:
ldr r0, [r5, #0x38]
mov r1, #0x0
bl sub_02055560
bl PlayerAvatar_ToggleAutomaticHeightUpdating
ldr r0, [r4, #0xc]
bl sub_02064C64
ldr r0, [r4, #0x0]
@ -565,7 +565,7 @@ _02064B96: ; jump table (using 16-bit offset)
_02064B9E:
ldr r0, [r5, #0x38]
mov r1, #0x0
bl sub_02055560
bl PlayerAvatar_ToggleAutomaticHeightUpdating
ldr r0, [r4, #0xc]
bl sub_02064C64
ldr r0, [r4, #0x0]

2
arm9/asm/unk_02064CA8.s
View File

@ -47,7 +47,7 @@ InitHearthomeGym: ; 0x02064CC8
cmp r0, #0x16
bne _02064D08
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205ECEC
cmp r0, #0x0
beq _02064D02

4
arm9/asm/unk_02064E90.s
View File

@ -82,7 +82,7 @@ sub_02064E90: ; 0x02064E90
add r2, sp, #0x74
bl Script_SavRTC_x2CtoDateTime
ldr r0, [r6, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205ED0C
add r1, sp, #0x74
str r1, [sp, #0x0]
@ -223,7 +223,7 @@ sub_02065078: ; 0x02065078
bl Save_GameStats_Get
add r6, r0, #0x0
add r0, r7, #0x0
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r5, r0, #0x0
add r0, r7, #0x0
bl sub_02026CB4

2
arm9/asm/unk_0206F1F0.s
View File

@ -82,7 +82,7 @@ _0206F26C:
cmp r0, #0x0
beq _0206F280
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F304
_0206F280:
ldr r0, [r4, #0x0]

2
arm9/asm/unk_02079C70.s
View File

@ -49,7 +49,7 @@ UNK_020FA6E8: ; 0x020FA6E8
thumb_func_start sub_02079C70
sub_02079C70: ; 0x02079C70
push {r3, lr}
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F184
pop {r3, pc}

4
arm9/asm/unk_02080C38.s
View File

@ -3547,7 +3547,7 @@ _02082666:
b _02082774
_02082672:
ldr r0, [r4, r0]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r6, r0, #0x0
ldr r0, _02082840 ; =0x00000121
ldrb r1, [r4, r0]
@ -3603,7 +3603,7 @@ _020826DE:
_020826EA:
ldr r0, _02082848 ; =0x0000198C
ldr r0, [r4, r0]
bl sub_02022504
bl Save_SafariZone_Get
ldr r3, _02082854 ; =0x00000123
mov r1, #0xc
ldrb r2, [r4, r3]

2
arm9/asm/unk_020859C0.s
View File

@ -788,7 +788,7 @@ _02085EA6:
add r4, r0, #0x0
ldr r0, [sp, #0x4]
ldr r0, [r0, #0xc]
bl sub_02022504
bl Save_SafariZone_Get
lsl r2, r4, #0x18
add r1, r5, #0x0
lsr r2, r2, #0x18

60
arm9/global.inc
View File

@ -1426,7 +1426,7 @@
.extern sub_020223BC
.extern sub_02022450
.extern Reset_To_File
.extern sub_02022504
.extern Save_SafariZone_Get
.extern GetStoragePCPointer
.extern sub_0202251C
.extern sub_02022528
@ -2562,8 +2562,8 @@
.extern sub_02034E10
.extern sub_02034E18
.extern sub_02034E20
.extern sub_02034E24
.extern sub_02034E28
.extern LocalFieldData_GetSafariBallsCounter
.extern LocalFieldData_GetSafariStepsCounter
.extern sub_02034E2C
.extern Save_LocalFieldData_Get
.extern sub_02034E48
@ -3015,23 +3015,23 @@
.extern ScrCmd_Unk01EC
.extern ScrCmd_Unk01ED
.extern ScrCmd_Unk01EF
.extern ScrCmd_Unk01E5
.extern ScrCmd_Unk01E6
.extern ScrCmd_Unk01E7
.extern ScrCmd_Unk0202
.extern ScrCmd_Unk0206
.extern ScrCmd_Unk020D
.extern ScrCmd_Unk020E
.extern ScrCmd_Unk020F
.extern ScrCmd_Unk0210
.extern ScrCmd_Unk0211
.extern ScrCmd_Unk0214
.extern ScrCmd_IncrementGameStat
.extern ScrCmd_GetGameStat
.extern ScrCmd_SetGameStat
.extern ScrCmd_EnableDisableSafariZone
.extern ScrCmd_UseGreatMarshBinoculars
.extern ScrCmd_SpearPillarSequence
.extern ScrCmd_KeepSafariTrain
.extern ScrCmd_MoveSafariTrain
.extern ScrCmd_CheckSafariTrainPosition
.extern ScrCmd_IgnoreHeights
.extern ScrCmd_GetSpiritombTalkCounter
.extern ScrCmd_Unk0218
.extern ScrCmd_Unk0219
.extern ScrCmd_Unk021A
.extern ScrCmd_Unk021B
.extern ScrCmd_Unk021C
.extern ScrCmd_Unk0226
.extern ScrCmd_CreateRoamer
.extern ScrCmd_NPCTradeInit
.extern ScrCmd_Unk0227
.extern ScrCmd_Unk0228
.extern ScrCmd_Unk0229
@ -3420,9 +3420,9 @@
.extern ScrCmd_Unk0241
.extern ScrCmd_Unk0242
.extern sub_02046030
.extern SaveArray_Flags_sizeof
.extern SaveArray_Flags_Init
.extern SaveArray_Flags_Get
.extern Save_VarsFlags_sizeof
.extern Save_VarsFlags_Init
.extern Save_VarsFlags_Get
.extern CheckFlagInArray
.extern SetFlagInArray
.extern ClearFlagInArray
@ -3939,7 +3939,7 @@
.extern sub_020554EC
.extern sub_02055514
.extern sub_02055540
.extern sub_02055560
.extern PlayerAvatar_ToggleAutomaticHeightUpdating
.extern sub_0205557C
.extern PlayerAvatar_GetSpriteByStateAndGender
.extern sub_02055648
@ -4562,8 +4562,8 @@
.extern sub_0205F1C4
.extern sub_0205F1D4
.extern sub_0205F1E4
.extern sub_0205F1F4
.extern sub_0205F204
.extern Save_VarsFlags_SetSafariSysFlag
.extern Save_VarsFlags_ClearSafariSysFlag
.extern sub_0205F214
.extern sub_0205F224
.extern sub_0205F234
@ -4582,7 +4582,7 @@
.extern sub_0205F358
.extern sub_0205F368
.extern sub_0205F378
.extern ScriptState_GetStarter
.extern Save_VarsFlags_GetStarter
.extern sub_0205F398
.extern sub_0205F3C0
.extern sub_0205F3E8
@ -4607,7 +4607,7 @@
.extern sub_0205F618
.extern sub_0205F648
.extern sub_0205F668
.extern sub_0205F688
.extern Save_VarsFlags_GetSpiritombTalkCounter
.extern sub_0205F698
.extern sub_0205F6A8
.extern sub_0205F6B8
@ -4635,15 +4635,15 @@
.extern sub_020600A0
.extern sub_020600DC
.extern sub_02060144
.extern sub_0206015C
.extern sub_02060194
.extern CallTask_UseGreatMarshBinoculars
.extern Task_UseGreatMarshBinoculars
.extern sub_02060344
.extern sub_020603B0
.extern sub_020603C8
.extern sub_020603F0
.extern sub_0206043C
.extern sub_02060478
.extern sub_02060490
.extern Save_CreateRoamerByID
.extern sub_02060790
.extern sub_020607D4
.extern sub_02060D1C
@ -4715,7 +4715,7 @@
.extern InitCanalaveGym
.extern InitVeilstoneGym
.extern InitSunyshoreGym
.extern sub_02064E20
.extern KeepSafariTrain
.extern sub_02064E4C
.extern sub_02064E60
.extern sub_02064E90
@ -7054,7 +7054,7 @@
.extern ov06_022451F4
.extern ov06_0224525C
.extern ov06_02245340
.extern ov06_022456E8
.extern SpearPillarSequence
.extern ov06_022457A8
.extern ov06_022457CC
.extern ov06_022457F8
@ -7072,7 +7072,7 @@
.extern ov06_022483E0
.extern ov06_022483EC
.extern ov06_02248724
.extern ov06_0224884C
.extern NPCTradeApp_Init
.extern ov06_022488CC
.extern ov06_022488EC
.extern ov06_022488F4

3
arm9/lib/NitroSDK/src/FX_mtx43.c
View File

@ -1,10 +1,9 @@
#include "nitro/types.h"
#include "main.h"
#include "MI_memory.h"
#include "fx.h"
#include "code32.h"
void MI_Copy48B(void *src, void *dst);
void MTX_ScaleApply43(struct Mtx43 *mtx, struct Mtx43 *dst, fx32 x, fx32 y, fx32 z){
//this works because matrices are indexed columns first
MTX_ScaleApply33((struct Mtx33 *)mtx, (struct Mtx33 *)dst, x, y, z);

3
arm9/lib/NitroSDK/src/FX_mtx44.c
View File

@ -1,10 +1,9 @@
#include "nitro/types.h"
#include "main.h"
#include "MI_memory.h"
#include "fx.h"
#include "code32.h"
void MI_Copy48B(void *src, void *dst);
void MTX_TransApply44(struct Mtx44 *mtx, struct Mtx44 *dst, fx32 x, fx32 y, fx32 z){
if(mtx != dst)
MI_Copy48B(mtx, dst);

20
arm9/overlays/05/asm/ov05_021D80E8.s
View File

@ -220,7 +220,7 @@ ov05_021D825C: ; 0x021D825C
pop {r4, r5, r6, pc}
_021D827C:
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205ED3C
cmp r0, #0
bne _021D8290
@ -322,7 +322,7 @@ _021D8342:
bl HasEnoughAlivePokemonForDoubleBattle
add r6, r0, #0
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205ED3C
cmp r0, #1
bne _021D8366
@ -346,7 +346,7 @@ _021D8384:
lsr r0, r0, #0x1f
beq _021D83A6
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205ED5C
add r0, r4, #0
bl ov05_021D8D24
@ -376,7 +376,7 @@ _021D83C2:
bl sub_02057020
add r7, r0, #0
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #2
bl sub_0205F264
cmp r0, #0
@ -1050,7 +1050,7 @@ ov05_021D8954: ; 0x021D8954
add r2, sp, #0
bl ov05_021D90F8
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F244
cmp r0, #1
bne _021D8998
@ -1611,7 +1611,7 @@ _021D8DFC:
bl ov05_021D8FD0
_021D8E0C:
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F56C
mov r0, #0
pop {r3, r4, r5, r6, r7, pc}
@ -1821,7 +1821,7 @@ ov05_021D8FA8: ; 0x021D8FA8
push {r3, r4, r5, lr}
ldr r0, [r0, #0xc]
mov r5, #0
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r4, r0, #0
bl sub_0205F780
add r0, r0, #1
@ -1937,7 +1937,7 @@ ov05_021D9090: ; 0x021D9090
push {r4, lr}
add r4, r0, #0
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F214
cmp r0, #0
bne _021D90A6
@ -1946,7 +1946,7 @@ ov05_021D9090: ; 0x021D9090
_021D90A6:
ldr r0, [r4, #0xc]
bl Save_LocalFieldData_Get
bl sub_02034E24
bl LocalFieldData_GetSafariBallsCounter
ldrh r0, [r0]
cmp r0, #0
bne _021D90C4
@ -1959,7 +1959,7 @@ _021D90A6:
_021D90C4:
ldr r0, [r4, #0xc]
bl Save_LocalFieldData_Get
bl sub_02034E28
bl LocalFieldData_GetSafariStepsCounter
ldrh r1, [r0]
add r1, r1, #1
strh r1, [r0]

8
arm9/overlays/05/asm/ov05_021E1374.s
View File

@ -26,7 +26,7 @@ _021E1396:
bl memset
str r7, [r4, #4]
ldr r0, [r7, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
str r0, [r4, #8]
mov r0, #0x45
lsl r0, r0, #2
@ -388,7 +388,7 @@ ov05_021E1654: ; 0x021E1654
push {r3, r4, r5, r6, r7, lr}
add r7, r0, #0
ldr r0, [r7, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r4, r0, #0
bl sub_0205F41C
add r6, r0, #0
@ -553,7 +553,7 @@ ov05_021E17A0: ; 0x021E17A0
add r5, r0, #0
ldr r0, [r5, #4]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
str r0, [sp]
mov r0, #0x11
lsl r0, r0, #4
@ -737,7 +737,7 @@ ov05_021E1908: ; 0x021E1908
ldr r0, [r0, #0xc]
add r5, r1, #0
add r4, r2, #0
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
cmp r4, #0
beq _021E192C
add r1, r4, #0

6
arm9/overlays/05/asm/ov05_021EFA9C.s
View File

@ -23,7 +23,7 @@ ov05_021EFAAC: ; 0x021EFAAC
bl Save_Poketch_Get
add r4, r0, #0
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r6, r0, #0
add r0, r4, #0
bl Save_Poketch_IsGiven
@ -67,7 +67,7 @@ ov05_021EFB14: ; 0x021EFB14
bl Save_Poketch_Get
add r4, r0, #0
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r6, r0, #0
add r0, r4, #0
bl Save_Poketch_IsGiven
@ -95,7 +95,7 @@ ov05_021EFB50: ; 0x021EFB50
bl Save_Poketch_Get
add r4, r0, #0
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r6, r0, #0
add r0, r4, #0
bl Save_Poketch_IsGiven

6
arm9/overlays/05/asm/ov05_021F38CC.s
View File

@ -186,7 +186,7 @@ Field_CheckPokemonSizeRecord: ; 0x021F3A18
bl ov05_021F39A0
add r6, r0, #0
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F3E8
add r1, sp, #4
strh r0, [r1]
@ -244,7 +244,7 @@ Field_SetPokemonSizeRecord: ; 0x021F3AB4
add r1, sp, #0
strh r0, [r1]
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r1, sp, #0
ldrh r1, [r1]
bl sub_0205F3F8
@ -309,7 +309,7 @@ Field_BufferPokemonRecordSize: ; 0x021F3B4C
add r4, r1, #0
add r6, r2, #0
add r7, r3, #0
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F3E8
add r1, sp, #4
strh r0, [r1]

4
arm9/overlays/05/src/ov05_021E72FC.c
View File

@ -144,7 +144,7 @@ BOOL ov05_021E73B4(UnkStruct021E7358 *param0)
UnkStruct021E7358 *ov05_021E74D4(u32 param0)
{
UnkStruct021E7358 *res = (UnkStruct021E7358 *)AllocFromHeapAtEnd(4, param0);
UnkStruct021E7358 *res = (UnkStruct021E7358 *)AllocFromHeapAtEnd(HEAP_ID_4, param0);
if (res == NULL)
{
GF_AssertFail();
@ -155,5 +155,5 @@ UnkStruct021E7358 *ov05_021E74D4(u32 param0)
void ov05_021E74F8(UnkStruct021E7358 *param0)
{
FreeToHeapExplicit(4, param0);
FreeToHeapExplicit(HEAP_ID_4, param0);
}

78
arm9/overlays/06/asm/overlay_06.s
View File

@ -4942,7 +4942,7 @@ _0223BB0C:
pop {r4, r5, r6, r7, pc}
_0223BB18:
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205ED3C
cmp r0, #0
beq _0223BB2C
@ -5003,7 +5003,7 @@ _0223BB98:
cmp r0, #0
bne _0223BBB6
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F214
str r0, [sp, #0x18]
ldr r1, [sp, #0x18]
@ -5087,7 +5087,7 @@ _0223BBDA:
b _0223BCCC
_0223BC5A:
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F368
ldr r1, [sp, #0x2c]
mov r2, #0xb
@ -5232,7 +5232,7 @@ _0223BD80:
_0223BD8A:
ldr r0, [sp, #8]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F214
add r1, r0, #0
ldr r0, [sp, #8]
@ -5394,7 +5394,7 @@ _0223BEA4:
str r1, [sp, #0x2c]
str r1, [r0, #0xc]
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205ED3C
cmp r0, #0
beq _0223BEF0
@ -5440,7 +5440,7 @@ _0223BF3C:
cmp r0, #0
bne _0223BF5A
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F214
str r0, [sp, #0x14]
ldr r1, [sp, #0x14]
@ -5524,7 +5524,7 @@ _0223BF7E:
b _0223C06A
_0223BFFE:
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F368
ldr r1, [sp, #0x24]
mov r2, #0xb
@ -5696,7 +5696,7 @@ _0223C162:
str r0, [r1, #0xc]
str r0, [sp, #0x48]
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205ED3C
cmp r0, #0
beq _0223C184
@ -5750,7 +5750,7 @@ _0223C1E0:
cmp r0, #0
bne _0223C1FE
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F214
str r0, [sp, #0x18]
ldr r1, [sp, #0x18]
@ -5834,7 +5834,7 @@ _0223C222:
b _0223C2DC
_0223C2A2:
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F368
ldr r1, [r4]
mov r2, #0xb
@ -7594,7 +7594,7 @@ ov06_0223CFD0: ; 0x0223CFD0
_0223CFE4:
ldr r0, [r0, #0xc]
bl Save_LocalFieldData_Get
bl sub_02034E24
bl LocalFieldData_GetSafariBallsCounter
add r1, r0, #0
ldrh r1, [r1]
mov r0, #0xb
@ -8139,7 +8139,7 @@ ov06_0223D3D0: ; 0x0223D3D0
lsl r1, r1, #2
str r0, [r4, r1]
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #0x22
lsl r1, r1, #4
str r0, [r4, r1]
@ -16557,7 +16557,7 @@ _0224199A: ; jump table
_022419A2:
ldr r0, [r5, #0x38]
mov r1, #0
bl sub_02055560
bl PlayerAvatar_ToggleAutomaticHeightUpdating
ldr r0, _02241A38 ; =0x00000611
bl PlaySE
ldr r0, [r4]
@ -16656,7 +16656,7 @@ _02241A6A: ; jump table
_02241A72:
ldr r0, [r5, #0x38]
mov r1, #0
bl sub_02055560
bl PlayerAvatar_ToggleAutomaticHeightUpdating
ldr r0, _02241B04 ; =0x00000611
bl PlaySE
ldr r0, [r4]
@ -17166,7 +17166,7 @@ _02241E82: ; jump table
_02241E8A:
ldr r0, [r6, #0x38]
mov r1, #0
bl sub_02055560
bl PlayerAvatar_ToggleAutomaticHeightUpdating
ldr r0, _02241F70 ; =0x00000611
bl PlaySE
ldr r0, [r4]
@ -19929,7 +19929,7 @@ ov06_022433B8: ; 0x022433B8
mov r0, #0
str r0, [r4, #0x10]
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F154
pop {r4, r5, r6, pc}
.align 2, 0
@ -19938,7 +19938,7 @@ ov06_022433B8: ; 0x022433B8
ov06_022433F8: ; 0x022433F8
push {r3, lr}
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F164
pop {r3, pc}
.align 2, 0
@ -20686,7 +20686,7 @@ _022439A4:
cmp r4, #7
blo _022439F6
add r0, r6, #0
bl sub_02022504
bl Save_SafariZone_Get
add r1, r7, #0
add r2, r4, #0
bl sub_02060FBC
@ -24459,8 +24459,8 @@ _022456E4:
add r0, r4, #0
pop {r4, pc}
thumb_func_start ov06_022456E8
ov06_022456E8: ; 0x022456E8
thumb_func_start SpearPillarSequence
SpearPillarSequence: ; 0x022456E8
push {r3, lr}
cmp r1, #9
bhi _0224579C
@ -30965,8 +30965,8 @@ _0224883C:
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
thumb_func_start ov06_0224884C
ov06_0224884C: ; 0x0224884C
thumb_func_start NPCTradeApp_Init
NPCTradeApp_Init: ; 0x0224884C
push {r3, r4, r5, r6, lr}
sub sp, #0x104
add r6, r1, #0
@ -31157,7 +31157,7 @@ _022489D0: .word 0x00000146
thumb_func_start CreateInGameTradeMon
CreateInGameTradeMon: ; 0x022489D4
; void CreateInGameTradeMon(struct Pokemon * mon, struct InGameTrade * trade, u32 level, u32 name_idx, u32 heap_id)
; void CreateInGameTradeMon(struct Pokemon * mon, struct InGameTrade * trade, u32 level, u32 name_idx, HeapID heapId)
push {r4, r5, r6, r7, lr}
sub sp, #0x14
add r6, r3, #0
@ -31483,7 +31483,7 @@ ov06_02248C68: ; 0x02248C68
ldr r0, [r5, #0xc]
add r4, r1, #0
add r6, r2, #0
bl sub_02022504
bl Save_SafariZone_Get
add r7, r0, #0
cmp r4, #4
bne _02248C86
@ -31525,7 +31525,7 @@ _02248CBC: .word FreeToHeap
ov06_02248CC0: ; 0x02248CC0
push {r3, lr}
ldr r0, [r0, #0xc]
bl sub_02022504
bl Save_SafariZone_Get
mov r1, #1
bl sub_0202B40C
pop {r3, pc}
@ -31534,7 +31534,7 @@ ov06_02248CC0: ; 0x02248CC0
ov06_02248CD0: ; 0x02248CD0
push {r4, lr}
ldr r0, [r0, #0xc]
bl sub_02022504
bl Save_SafariZone_Get
add r4, r0, #0
bl sub_0202B410
cmp r0, #1
@ -31657,7 +31657,7 @@ ov06_02248DB0: ; 0x02248DB0
str r0, [sp]
ldr r0, [r7, #0xc]
str r2, [sp, #4]
bl sub_02022504
bl Save_SafariZone_Get
ldr r0, [sp]
add r1, sp, #8
bl ov06_02248D8C
@ -31788,7 +31788,7 @@ ov06_02248E9C: ; 0x02248E9C
str r2, [sp, #0xc]
str r3, [sp, #0x10]
ldr r5, [sp, #0x44]
bl sub_02022504
bl Save_SafariZone_Get
str r0, [sp, #0x14]
ldrb r0, [r6]
mov r4, #0
@ -31876,7 +31876,7 @@ ov06_02248F44: ; 0x02248F44
push {r4, r5, r6, lr}
ldr r0, [r0, #0xc]
add r5, r1, #0
bl sub_02022504
bl Save_SafariZone_Get
ldrb r1, [r5]
add r4, r0, #0
cmp r1, #0
@ -32000,7 +32000,7 @@ ov06_02249038: ; 0x02249038
add r4, r0, #0
ldr r0, [r4, #0xc]
add r5, r1, #0
bl sub_02022504
bl Save_SafariZone_Get
add r6, r0, #0
add r0, r4, #0
bl ov06_02249018
@ -32066,7 +32066,7 @@ ov06_022490A0: ; 0x022490A0
bl ov06_02248D60
add r7, r0, #0
ldr r0, [r4, #0xc]
bl sub_02022504
bl Save_SafariZone_Get
add r1, r5, #0
bl sub_0202B414
add r0, r4, #0
@ -32098,7 +32098,7 @@ ov06_022490F0: ; 0x022490F0
ov06_022490F4: ; 0x022490F4
push {r3, lr}
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #2
mov r2, #7
bl sub_0205F2E4
@ -32109,7 +32109,7 @@ ov06_022490F4: ; 0x022490F4
ov06_02249108: ; 0x02249108
push {r3, lr}
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #2
add r2, r1, #0
bl sub_0205F2E4
@ -32120,7 +32120,7 @@ ov06_02249108: ; 0x02249108
ov06_0224911C: ; 0x0224911C
push {r3, lr}
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #2
mov r2, #9
bl sub_0205F2E4
@ -32131,7 +32131,7 @@ ov06_0224911C: ; 0x0224911C
ov06_02249130: ; 0x02249130
push {r3, lr}
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #2
mov r2, #0xa
bl sub_0205F2E4
@ -32142,7 +32142,7 @@ ov06_02249130: ; 0x02249130
ov06_02249144: ; 0x02249144
push {r3, lr}
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #2
mov r2, #0xb
bl sub_0205F2E4
@ -32153,7 +32153,7 @@ ov06_02249144: ; 0x02249144
ov06_02249158: ; 0x02249158
push {r3, lr}
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
mov r1, #2
mov r2, #0x11
bl sub_0205F2E4
@ -32196,7 +32196,7 @@ ov06_02249194: ; 0x02249194
ov06_022491A4: ; 0x022491A4
push {r3, lr}
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205ED0C
pop {r3, pc}
.align 2, 0
@ -43183,7 +43183,7 @@ ov06_0224E764: ; 0x0224E764
push {r4, lr}
add r4, r0, #0
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205F1A4
cmp r0, #0
bne _0224E794

16
arm9/overlays/18/asm/overlay_18.s
View File

@ -2713,7 +2713,7 @@ ov18_0223AC24: ; 0x0223AC24
ldr r0, [r0, #0x1c]
bl ov05_021F4608
ldr r0, [r5, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205EDBC
ldr r0, _0223AC78 ; =ov18_0223A64C
add r1, r4, #0
@ -5337,7 +5337,7 @@ _0223C000:
ldr r0, [r0]
ldr r0, [r0]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r6, r0, #0
bl sub_0205F740
add r1, r0, #0
@ -7510,7 +7510,7 @@ _0223D07E:
ldr r0, _0223D0E0 ; =0x000004C8
ldr r0, [r1, r0]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205EDCC
ldr r0, _0223D0DC ; =0x02251384
add r2, r7, #0
@ -8112,7 +8112,7 @@ _0223D536:
ldr r0, [r0]
ldr r0, [r0, #0xc]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205EDAC
mov r1, #0
ldr r0, _0223D59C ; =ov18_0223E7AC
@ -12954,7 +12954,7 @@ _0223FA34:
ldr r0, [r0, #4]
ldr r0, [r0, #0x40]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r5, r0, #0
bl sub_0205F760
add r1, r0, #0
@ -28118,7 +28118,7 @@ ov18_02246FB4: ; 0x02246FB4
ldr r0, [r0]
ldr r0, [r0]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205EDD8
ldr r0, [sp, #0xc]
bl sub_020266E0
@ -30665,7 +30665,7 @@ _022483BC:
bl ov18_02247EA0
ldr r0, [r4, #8]
ldr r0, [r0, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r6, r0, #0
bl sub_0205F720
add r1, r0, #0
@ -37342,7 +37342,7 @@ _0224B946:
add r0, r4, #0
bl ov18_02245054
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
bl sub_0205EDE8
add r0, r4, #0
bl ov18_0224BD54

8
arm9/overlays/19/src/overlay_19.c
View File

@ -28,9 +28,9 @@ void ov19_02252440(struct BgConfig * bgConfig)
GX_SetBankForSubOBJ(0x100);
GXS_SetOBJVRamModeChar(GX_OBJVRAMMODE_CHAR_1D_32K);
InitBgFromTemplate(bgConfig, GF_BG_LYR_SUB_0, &ov19_02252508, GF_BG_TYPE_TEXT);
GfGfxLoader_LoadCharData(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0010_NCGR_lz, bgConfig, GF_BG_LYR_SUB_0, 0, 0, TRUE, 8);
GfGfxLoader_LoadScrnData(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0011_NSCR_lz, bgConfig, GF_BG_LYR_SUB_0, 0, 0, TRUE, 8);
GfGfxLoader_GXLoadPal(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0012_NCLR, GF_PAL_LOCATION_SUB_BG, GF_PAL_SLOT_OFFSET_0, 0x20, 8);
GfGfxLoader_LoadCharData(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0010_NCGR_lz, bgConfig, GF_BG_LYR_SUB_0, 0, 0, TRUE, HEAP_ID_8);
GfGfxLoader_LoadScrnData(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0011_NSCR_lz, bgConfig, GF_BG_LYR_SUB_0, 0, 0, TRUE, HEAP_ID_8);
GfGfxLoader_GXLoadPal(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0012_NCLR, GF_PAL_LOCATION_SUB_BG, GF_PAL_SLOT_OFFSET_0, 0x20, HEAP_ID_8);
GXS_SetVisibleWnd(GX_WNDMASK_NONE);
GXS_SetVisiblePlane(GX_PLANEMASK_BG0);
}
@ -38,7 +38,7 @@ void ov19_02252440(struct BgConfig * bgConfig)
void ov19_022524F4(struct BgConfig * bgConfig)
{
FreeBgTilemapBuffer(bgConfig, GF_BG_LYR_SUB_0);
DestroyHeap(8);
DestroyHeap(HEAP_ID_8);
}
BOOL ov19_02252504(struct BgConfig * bgConfig)

2
arm9/overlays/21/src/ov21_02254854.c
View File

@ -26,7 +26,7 @@ static void ov21_02254840(void)
BOOL ov21_02254854(UnkStruct02254854 **param0, u32 param1, u32 param2, u32 param3)
{
UnkStruct02254854 *alloced = (UnkStruct02254854 *)AllocFromHeap(8, sizeof(UnkStruct02254854));
UnkStruct02254854 *alloced = (UnkStruct02254854 *)AllocFromHeap(HEAP_ID_8, sizeof(UnkStruct02254854));
if (alloced != NULL)
{
if (ov21_0225489C(alloced, param1, param2, param3) && sub_0200CA44((void (*)(u32, void *))ov21_02254930, (void *)alloced, 1))

2
arm9/overlays/21/src/ov21_02254A6C.c
View File

@ -40,7 +40,7 @@ extern void ov11_02252DB4(u32 param0, u32 param1);
BOOL ov21_02254A6C(UnkStruct02254A6C *param0, void *param1)
{
UnkStruct02254A6C *strct = (UnkStruct02254A6C *)AllocFromHeap(8, 3 << 8);
UnkStruct02254A6C *strct = (UnkStruct02254A6C *)AllocFromHeap(HEAP_ID_8, 3 << 8);
u32 sp4;
if (strct != NULL)
{

2
arm9/overlays/42/asm/overlay_42.s
View File

@ -92,7 +92,7 @@ _022548BE:
str r0, [r5, #0xc]
ldr r0, [sp]
bl ov20_02252C40
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r7, r0, #0
mov r4, #0
add r6, r5, #0

2
arm9/overlays/43/asm/overlay_43.s
View File

@ -435,7 +435,7 @@ ov43_02254B60: ; 0x02254B60
add r5, r0, #0
add r0, r1, #0
bl ov20_02252C40
bl SaveArray_Flags_Get
bl Save_VarsFlags_Get
add r6, r0, #0
mov r4, #0
_02254B72:

2
arm9/overlays/52/include/overlay_52.h
View File

@ -30,7 +30,7 @@ BOOL ov52_021D757C(struct OverlayManager *arg1, u32 *status);
BOOL ov52_021D7594(struct OverlayManager *param0, u32 *status);
BOOL ov52_021D75E8(struct OverlayManager *arg1, u32 *status);
void ov52_021D7604(u32 heap_id, struct SaveData *save, BOOL set_trainerid);
void ov52_021D7604(HeapID heapId, struct SaveData *save, BOOL set_trainerid);
void ov52_021D7688(u32 param0, struct SaveData *save);
void ov52_021D769C(u32 param0, struct SaveData *save);

20
arm9/overlays/52/src/overlay_52.c
View File

@ -10,9 +10,9 @@ extern struct OverlayManagerTemplate UNK_020F2B7C;
extern struct OverlayManagerTemplate UNK_020F2B8C;
extern int sub_02053678(u32 random, u32 gender, u32 param2);
extern void sub_020250C4(void *sav_ptr, u32 heap_id, const u16 param2[], u32 param3);
extern void sub_020250C4(void *sav_ptr, HeapID heapId, const u16 param2[], u32 param3);
extern void sub_020377E0(struct SaveData *save);
extern void sub_0205ECD4(struct ScriptState *script_state);
extern void sub_0205ECD4(struct SaveVarsFlags *script_state);
const struct OverlayManagerTemplate ov52_021D76E8 = {
ov52_021D74E0,
@ -171,7 +171,7 @@ BOOL ov52_021D74F8(struct OverlayManager *manager, u32 *status)
#pragma unused(status)
struct SaveData *save = (struct SaveData *)OverlayManager_GetField18(manager)[2]; // weird
ov52_021D769C(0x4d, save);
ov52_021D769C(HEAP_ID_77, save);
return TRUE;
}
@ -180,7 +180,7 @@ BOOL ov52_021D750C(struct OverlayManager *manager, u32 *status)
{
#pragma unused(manager)
#pragma unused(status)
DestroyHeap(0x4d);
DestroyHeap(HEAP_ID_77);
RegisterMainOverlay(SDK_OVERLAY_INVALID_ID, &UNK_020FD144);
return TRUE;
@ -201,7 +201,7 @@ BOOL ov52_021D7540(struct OverlayManager *manager, u32 *status)
#pragma unused(status)
struct SaveData *save = (struct SaveData *)OverlayManager_GetField18(manager)[2]; // weird
ov52_021D7604(0x4d, save, 1);
ov52_021D7604(HEAP_ID_77, save, 1);
struct IGT *igt = Save_PlayerData_GetIGTAddr(save);
PlayTimerStart(igt);
@ -212,7 +212,7 @@ BOOL ov52_021D7560(struct OverlayManager *manager, u32 *status)
{
#pragma unused(manager)
#pragma unused(status)
DestroyHeap(0x4d);
DestroyHeap(HEAP_ID_77);
RegisterMainOverlay(SDK_OVERLAY_INVALID_ID, &UNK_020F2B7C);
return TRUE;
@ -253,13 +253,13 @@ BOOL ov52_021D75E8(struct OverlayManager *manager, u32 *status)
{
#pragma unused(manager)
#pragma unused(status)
DestroyHeap(0x4d);
DestroyHeap(HEAP_ID_77);
RegisterMainOverlay(SDK_OVERLAY_INVALID_ID, &UNK_020F2B8C);
return 1;
}
void ov52_021D7604(u32 heap_id, struct SaveData *save, BOOL set_trainerid)
void ov52_021D7604(HeapID heapId, struct SaveData *save, BOOL set_trainerid)
{
Save_SysInfo_InitFromSystem(Save_SysInfo_Get(save));
Save_SysInfo_RTC_Init(Save_SysInfo_RTC_Get(save));
@ -282,7 +282,7 @@ void ov52_021D7604(u32 heap_id, struct SaveData *save, BOOL set_trainerid)
PlayerProfile_SetAvatar(playerProfile, (u8)avatar);
sub_020250C4(sub_02024ECC(save), heap_id, ov52_021D76F8, NELEMS(ov52_021D76F8) / 2);
sub_020250C4(sub_02024ECC(save), heapId, ov52_021D76F8, NELEMS(ov52_021D76F8) / 2);
}
void ov52_021D7688(u32 unused, struct SaveData *save)
@ -305,5 +305,5 @@ void ov52_021D769C(u32 unused, struct SaveData *save)
sub_020377E0(save);
PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(save);
PlayerProfile_SetMoney(playerProfile, 3000);
sub_0205ECD4(SaveArray_Flags_Get(save));
sub_0205ECD4(Save_VarsFlags_Get(save));
}

14
arm9/overlays/54/asm/overlay_54.s
View File

@ -3780,7 +3780,7 @@ ov54_021D9238: ; 0x021D9238
bl AllocFromHeapAtEnd
add r7, r0, #0
add r0, r5, #0
bl sub_02022504
bl Save_SafariZone_Get
add r6, r0, #0
add r0, r5, #0
bl ov54_021D91AC
@ -3810,7 +3810,7 @@ ov54_021D9274: ; 0x021D9274
bl AllocFromHeapAtEnd
add r7, r0, #0
add r0, r5, #0
bl sub_02022504
bl Save_SafariZone_Get
add r6, r0, #0
add r0, r5, #0
bl ov54_021D91B4
@ -3838,7 +3838,7 @@ ov54_021D92AC: ; 0x021D92AC
bl AllocFromHeapAtEnd
add r7, r0, #0
add r0, r5, #0
bl sub_02022504
bl Save_SafariZone_Get
add r6, r0, #0
add r0, r5, #0
bl ov54_021D91BC
@ -4145,7 +4145,7 @@ ov54_021D94D0: ; 0x021D94D0
push {r4, lr}
add r4, r0, #0
ldr r0, [r4, #4]
bl sub_02022504
bl Save_SafariZone_Get
ldr r1, [r4, #8]
ldr r2, [r4, #0xc]
ldr r3, [r4, #0x10]
@ -4159,7 +4159,7 @@ ov54_021D94E8: ; 0x021D94E8
push {r4, lr}
add r4, r0, #0
ldr r0, [r4, #4]
bl sub_02022504
bl Save_SafariZone_Get
ldr r1, [r4, #8]
ldr r2, [r4, #0xc]
ldr r3, [r4, #0x10]
@ -4173,7 +4173,7 @@ ov54_021D9500: ; 0x021D9500
push {r4, lr}
add r4, r0, #0
ldr r0, [r4, #4]
bl sub_02022504
bl Save_SafariZone_Get
ldr r1, [r4, #8]
ldr r2, [r4, #0xc]
ldr r3, [r4, #0x10]
@ -4361,7 +4361,7 @@ _021D962A:
cmp r0, #7
blo _021D95F8
ldr r0, [sp]
bl sub_02022504
bl Save_SafariZone_Get
add r4, r0, #0
bl sub_0202B390
add r0, r4, #0

3
arm9/overlays/59/include/ov59_Intro.h
View File

@ -2,6 +2,7 @@
#define POKEDIAMOND_ov59_INTRO_H
#include "nitro/types.h"
#include "heap.h"
#include "options.h"
#include "save.h"
#include "main.h"
@ -19,7 +20,7 @@ struct ov59_UnkPlayerStruct
typedef struct ov59_IntroOverlayData
{
u32 heap_id;
HeapID heapId;
struct SaveData *save;
struct Options *options;
u32 controllerCounter;

2
arm9/overlays/59/include/ov59_TV.h
View File

@ -8,7 +8,7 @@
typedef struct ov59_TVOverlayData2
{
u32 heap_id;
HeapID heapId;
struct BgConfig *bgConfig;
struct MsgData *msgData;
u32 unk0C;

140
arm9/overlays/59/src/ov59_Intro.c
View File

@ -26,7 +26,7 @@
#include "unk_020051F4.h"
#include "unk_02024E64.h"
extern void *sub_02077A84(u32 heap_id, u32 param1, u32 param2, u32 param3, struct Options *options);
extern void *sub_02077A84(HeapID heapId, u32 param1, u32 param2, u32 param3, struct Options *options);
extern void sub_0200E3A0(PMLCDTarget, int);
@ -363,19 +363,19 @@ const u8 ov59_021D9FE8[0x64] =
0x5E, 0x5F, 0x62, 0x63
};
extern void BeginNormalPaletteFade(u32 pattern, u32 typeTop, u32 typeBottom, u16 colour, u32 duration, u32 framesPer, u32 heapId);
extern void BeginNormalPaletteFade(u32 pattern, u32 typeTop, u32 typeBottom, u16 colour, u32 duration, u32 framesPer, HeapID heapId);
extern BOOL IsPaletteFadeFinished(void);
extern u32 sub_020142EC(u32 param0, u32 param1, u32 param2, u32 heap_id);
extern u32 sub_020142EC(u32 param0, u32 param1, u32 param2, HeapID heapId);
extern void sub_02077AC4(void *param0);
extern void sub_020143D0(u32 param0);
extern u32 sub_02014590(u32 heap_id);
extern u32 sub_02014590(HeapID heapId);
extern void sub_020145A8(u32 param0);
extern u32 *sub_0201244C(u16 param0, u16 param1, u32 heap_id);
extern u32 *sub_02012470(u16 param0, u16 param1, u32 heap_id);
extern u32 *sub_0201244C(u16 param0, u16 param1, HeapID heapId);
extern u32 *sub_02012470(u16 param0, u16 param1, HeapID heapId);
extern const struct OverlayManagerTemplate UNK_020FA5FC;
@ -388,18 +388,18 @@ FS_EXTERN_OVERLAY(OVERLAY_52);
BOOL ov59_IntroInit(struct OverlayManager *overlayManager, u32 *status)
{
#pragma unused(status)
CreateHeap(3, 0x52, 1 << 18);
ov59_IntroOverlayData *data = (ov59_IntroOverlayData *) OverlayManager_CreateAndGetData(overlayManager, sizeof(ov59_IntroOverlayData), 0x52);
CreateHeap(3, HEAP_ID_INTRO, 0x40000);
ov59_IntroOverlayData *data = (ov59_IntroOverlayData *) OverlayManager_CreateAndGetData(overlayManager, sizeof(ov59_IntroOverlayData), HEAP_ID_INTRO);
(void)memset((void *)data, 0, sizeof(ov59_IntroOverlayData));
data->heap_id = 0x52;
data->heapId = HEAP_ID_INTRO;
s32 *field18 = OverlayManager_GetField18(overlayManager);
data->save = (struct SaveData *)field18[2]; //?
data->options = Save_PlayerData_GetOptionsAddr(data->save);
data->nextControllerCounter = data->controllerCounter = 0;
data->loadedOverlay = NULL;
data->playerStruct = (struct ov59_UnkPlayerStruct *)sub_02077A84(0x52, 0, 0, 7, data->options);
data->rivalStruct = (struct ov59_UnkPlayerStruct *)sub_02077A84(0x52, 3, 0, 7, data->options);
data->playerStruct = (struct ov59_UnkPlayerStruct *)sub_02077A84(HEAP_ID_INTRO, 0, 0, 7, data->options);
data->rivalStruct = (struct ov59_UnkPlayerStruct *)sub_02077A84(HEAP_ID_INTRO, 3, 0, 7, data->options);
data->scrnDataIndexMain = 0;
data->spriteDataIndex0 = 0;
data->spriteDataIndex1 = 0;
@ -445,7 +445,7 @@ BOOL ov59_IntroMain(struct OverlayManager *overlayManager, u32 *status)
case 1:
if (ov59_MasterController(data) == TRUE)
{
BeginNormalPaletteFade(0, 0, 0, GX_RGB_BLACK, 6, 1, data->heap_id);
BeginNormalPaletteFade(0, 0, 0, GX_RGB_BLACK, 6, 1, data->heapId);
*status = 2;
}
@ -454,7 +454,7 @@ BOOL ov59_IntroMain(struct OverlayManager *overlayManager, u32 *status)
break;
}
BeginNormalPaletteFade(0, 0, 0, GX_RGB_BLACK, 6, 1, data->heap_id);
BeginNormalPaletteFade(0, 0, 0, GX_RGB_BLACK, 6, 1, data->heapId);
*status = 3;
break;
@ -517,7 +517,7 @@ BOOL ov59_IntroExit(struct OverlayManager *overlayManager, u32 *status)
#pragma unused(status)
ov59_IntroOverlayData *data = (ov59_IntroOverlayData *) OverlayManager_GetData(overlayManager);
u32 heap_id = data->heap_id;
HeapID heapId = data->heapId;
PlayerName_StringToFlat(Save_PlayerData_GetProfileAddr(data->save), data->playerStruct->name);
PlayerProfile_SetTrainerGender(Save_PlayerData_GetProfileAddr(data->save), data->playerStruct->gender);
@ -527,7 +527,7 @@ BOOL ov59_IntroExit(struct OverlayManager *overlayManager, u32 *status)
sub_02077AC4(data->rivalStruct);
OverlayManager_FreeData(overlayManager);
DestroyHeap(heap_id);
DestroyHeap(heapId);
RegisterMainOverlay(FS_OVERLAY_ID(OVERLAY_52), &ov52_021D76D8);
@ -564,7 +564,7 @@ void ov59_IntroSetupBg(ov59_IntroOverlayData *data)
{
struct GraphicsBanks graphicsBanks = ov59_021D9F18;
GX_SetBanks(&graphicsBanks);
data->bgConfig = BgConfig_Alloc(data->heap_id);
data->bgConfig = BgConfig_Alloc(data->heapId);
struct GraphicsModes graphicsModes = ov59_021D9DCC;
SetBothScreensModesAndDisable(&graphicsModes);
@ -590,10 +590,10 @@ void ov59_IntroSetupBg(ov59_IntroOverlayData *data)
InitBgFromTemplate(data->bgConfig, GF_BG_LYR_MAIN_3, &bgTemplateMain, GF_BG_TYPE_TEXT);
BgClearTilemapBufferAndCommit(data->bgConfig, GF_BG_LYR_MAIN_3);
sub_0200CD68(data->bgConfig, 0, 994, 4, 0, data->heap_id);
LoadUserFrameGfx1(data->bgConfig, GF_BG_LYR_MAIN_0, 985, 3, 0, data->heap_id);
LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_5, data->heap_id);
LoadFontPal1(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_6, data->heap_id);
sub_0200CD68(data->bgConfig, 0, 994, 4, 0, data->heapId);
LoadUserFrameGfx1(data->bgConfig, GF_BG_LYR_MAIN_0, 985, 3, 0, data->heapId);
LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_5, data->heapId);
LoadFontPal1(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_6, data->heapId);
struct BgTemplate bgTemplateSub = ov59_021D9EBC;
bgTemplateSub.screenBase = GX_BG_SCRBASE_0x7800;
@ -657,13 +657,13 @@ void ov59_IntroDestroyBg(ov59_IntroOverlayData *data)
void ov59_IntroSetupMsg(ov59_IntroOverlayData *data)
{
data->msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0341_bin, data->heap_id);
data->msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0341_bin, data->heapId);
ResetAllTextPrinters();
data->unk60 = sub_020142EC(0, 0, 6, data->heap_id);
data->unk60 = sub_020142EC(0, 0, 6, data->heapId);
data->messageFormat = MessageFormat_New(data->heap_id);
data->messageFormat = MessageFormat_New(data->heapId);
data->displayMessageCounter = 0;
data->displayControlMessageCounter = 0;
@ -679,7 +679,7 @@ void ov59_IntroDestroyMsg(ov59_IntroOverlayData *data)
void ov59_021D7A4C(ov59_IntroOverlayData *data) //ov59_Setup... something?
{
data->unk68 = sub_02014590(data->heap_id);
data->unk68 = sub_02014590(data->heapId);
}
void ov59_021D7A5C(ov59_IntroOverlayData *data) //ov59_Destroy... something?
@ -829,8 +829,8 @@ BOOL ov59_DisplayMessage(ov59_IntroOverlayData *data, u32 msgNo, BOOL autoAdvanc
TextFlags_SetCanABSpeedUpPrint(TRUE);
sub_02002B7C(0);
struct String* string = String_New(1024, data->heap_id);
data->string = String_New(1024, data->heap_id);
struct String* string = String_New(1024, data->heapId);
data->string = String_New(1024, data->heapId);
ReadMsgDataIntoString(data->msgData, msgNo, string);
BufferString(data->messageFormat, 0, data->playerStruct->name, data->selectedGender, 1, 2);
BufferString(data->messageFormat, 1, data->rivalStruct->name, 0, 1, 2);
@ -909,7 +909,7 @@ BOOL ov59_CreateListWithText(ov59_IntroOverlayData *data, u32 param1, u32 param2
break;
}
AddWindow(data->bgConfig, &data->listWindow, windowTemplate);
data->listMenuItem = ListMenuItems_New(menuItemsCount, data->heap_id);
data->listMenuItem = ListMenuItems_New(menuItemsCount, data->heapId);
for (i = 0; i < menuItemsCount; i++)
{
ListMenuItems_AppendFromMsgData(data->listMenuItem, data->msgData, listStruct[i].msgNo, listStruct[i].val);
@ -920,7 +920,7 @@ BOOL ov59_CreateListWithText(ov59_IntroOverlayData *data, u32 param1, u32 param2
template.maxShowed = (u16)menuItemsCount;
template.moveCursorFunc = ov59_PlaySelectSound;
template.window = &data->listWindow;
data->listMenu = ListMenuInit(&template, 0, 0, (u8)data->heap_id);
data->listMenu = ListMenuInit(&template, 0, 0, data->heapId);
DrawFrameAndWindow1(template.window, TRUE, 985, 3);
CopyWindowToVram(&data->listWindow);
data->createListCounter = 1;
@ -949,7 +949,7 @@ BOOL ov59_DisplayControlAdventureMessage(ov59_IntroOverlayData *data, u32 msgNo,
{
case 0:
ToggleBgLayer(GF_BG_LYR_MAIN_0, GX_LAYER_TOGGLE_OFF);
data->string = String_New(1024, data->heap_id);
data->string = String_New(1024, data->heapId);
ReadMsgDataIntoString(data->msgData, msgNo, data->string);
struct WindowTemplate template;
if (param2 == 1)
@ -1009,9 +1009,9 @@ BOOL ov59_DisplayControlAdventureMessage(ov59_IntroOverlayData *data, u32 msgNo,
void ov59_LoadInitialTilemap(ov59_IntroOverlayData *data)
{
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, NARC_intro_main_background_tileset_NCGR, data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, FALSE, data->heap_id);
BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, data->heap_id);
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, NARC_intro_sub_background_tileset_NCGR, data->bgConfig, GF_BG_LYR_SUB_3, 0, 0, FALSE, data->heap_id);
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, NARC_intro_main_background_tileset_NCGR, data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, FALSE, data->heapId);
BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, data->heapId);
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, NARC_intro_sub_background_tileset_NCGR, data->bgConfig, GF_BG_LYR_SUB_3, 0, 0, FALSE, data->heapId);
u32 mainPal;
u32 subPal;
@ -1025,8 +1025,8 @@ void ov59_LoadInitialTilemap(ov59_IntroOverlayData *data)
mainPal = NARC_intro_main_background_pearl_NCLR;
subPal = NARC_intro_sub_background_pearl_NCLR;
}
GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, mainPal, GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_0, 0x60, data->heap_id);
GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, subPal, GF_PAL_LOCATION_SUB_BG, GF_PAL_SLOT_OFFSET_0, 0xa0, data->heap_id);
GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, mainPal, GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_0, 0x60, data->heapId);
GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, subPal, GF_PAL_LOCATION_SUB_BG, GF_PAL_SLOT_OFFSET_0, 0xa0, data->heapId);
ov59_LoadMainScrnData(data);
ov59_LoadCharDataFromIndex(data);
ov59_LoadSubScrnData(data);
@ -1041,7 +1041,7 @@ void ov59_LoadMainScrnData(ov59_IntroOverlayData *data)
{
return;
}
GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, scrnData.scrnIds[data->scrnDataIndexMain], data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, FALSE, data->heap_id);
GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, scrnData.scrnIds[data->scrnDataIndexMain], data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, FALSE, data->heapId);
}
void ov59_LoadCharDataFromIndex(ov59_IntroOverlayData *data)
@ -1049,16 +1049,16 @@ void ov59_LoadCharDataFromIndex(ov59_IntroOverlayData *data)
struct ov59_GraphicsPaletteMap021D9F90 graphicsPaletteMap = ov59_021D9F90;
if (data->spriteDataIndex0 != 0 && data->spriteDataIndex0 < 12)
{
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, graphicsPaletteMap.map[data->spriteDataIndex0].charNum, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heap_id);
GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, graphicsPaletteMap.map[data->spriteDataIndex0].palNum, GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_7, 0x20, data->heap_id);
GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, NARC_intro_character_screen_NSCR, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heap_id);
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, graphicsPaletteMap.map[data->spriteDataIndex0].charNum, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heapId);
GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, graphicsPaletteMap.map[data->spriteDataIndex0].palNum, GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_7, 0x20, data->heapId);
GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, NARC_intro_character_screen_NSCR, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heapId);
ov59_TilemapChangePalette(data, GF_BG_LYR_MAIN_1, 7);
}
if (data->spriteDataIndex1 != 0 && data->spriteDataIndex1 < 12)
{
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, graphicsPaletteMap.map[data->spriteDataIndex1].charNum, data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, FALSE, data->heap_id);
GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, graphicsPaletteMap.map[data->spriteDataIndex1].palNum, GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_8, 0x20, data->heap_id);
GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, NARC_intro_character_screen_NSCR, data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, FALSE, data->heap_id);
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, graphicsPaletteMap.map[data->spriteDataIndex1].charNum, data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, FALSE, data->heapId);
GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, graphicsPaletteMap.map[data->spriteDataIndex1].palNum, GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_8, 0x20, data->heapId);
GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, NARC_intro_character_screen_NSCR, data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, FALSE, data->heapId);
ov59_TilemapChangePalette(data, GF_BG_LYR_MAIN_2, 8);
}
}
@ -1070,7 +1070,7 @@ void ov59_LoadSubScrnData(ov59_IntroOverlayData *data)
{
return;
}
GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, scrnData.scrnIds[data->scrnDataIndexSub], data->bgConfig, GF_BG_LYR_SUB_3, 0, 0, FALSE, data->heap_id);
GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, scrnData.scrnIds[data->scrnDataIndexSub], data->bgConfig, GF_BG_LYR_SUB_3, 0, 0, FALSE, data->heapId);
if (data->scrnDataIndexSub == 1)
{
ov59_TilemapChangePalette(data, GF_BG_LYR_SUB_3, 3);
@ -1086,18 +1086,18 @@ void ov59_DrawMunchlax(ov59_IntroOverlayData *data)
{
struct SomeDrawPokemonStruct drawStruct;
sub_02068C00(&drawStruct, SPECIES_MUNCHLAX, MON_MALE, 2, FALSE, 0, 0);
u16 *src = (u16 *)AllocFromHeap(data->heap_id, 0x64 * sizeof(u16));
u16 *src = (u16 *)AllocFromHeap(data->heapId, 0x64 * sizeof(u16));
for (s32 i = 0; i < 0x64; i++)
{
src[i] = ov59_021D9FE8[i] + 1;
}
u32 *charData = sub_0201244C(drawStruct.unk0, drawStruct.unk2, data->heap_id);
u32 *plttData = sub_02012470(drawStruct.unk0, drawStruct.unk4, data->heap_id);
u32 *charData = sub_0201244C(drawStruct.unk0, drawStruct.unk2, data->heapId);
u32 *plttData = sub_02012470(drawStruct.unk0, drawStruct.unk4, data->heapId);
FillBgTilemapRect(data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, 0, 32, 24, 9);
LoadRectToBgTilemapRect(data->bgConfig, GF_BG_LYR_MAIN_2, src, 11, 11, 10, 10);
ov59_TilemapChangePalette(data, GF_BG_LYR_MAIN_2, 9);
BG_ClearCharDataRange(GF_BG_LYR_MAIN_2, 32, 0, data->heap_id);
BG_ClearCharDataRange(GF_BG_LYR_MAIN_2, 32, 0, data->heapId);
BG_LoadCharTilesData(data->bgConfig, GF_BG_LYR_MAIN_2, charData, 0xc80, 1);
BG_LoadPlttData(GF_BG_LYR_MAIN_2, plttData, 32, GF_PAL_SLOT_OFFSET_8); //r2 and r3 regswap
BG_LoadPlttData(GF_BG_LYR_MAIN_2, ov59_021D9ED8, 32, GF_PAL_SLOT_OFFSET_9);
@ -1105,7 +1105,7 @@ void ov59_DrawMunchlax(ov59_IntroOverlayData *data)
FillBgTilemapRect(data->bgConfig, GF_BG_LYR_SUB_1, 0, 0, 0, 32, 24, 10);
LoadRectToBgTilemapRect(data->bgConfig, GF_BG_LYR_SUB_1, src, 11, 7, 10, 10);
ov59_TilemapChangePalette(data, GF_BG_LYR_SUB_1, 10);
BG_ClearCharDataRange(GF_BG_LYR_SUB_1, 32, 0, data->heap_id);
BG_ClearCharDataRange(GF_BG_LYR_SUB_1, 32, 0, data->heapId);
BG_LoadCharTilesData(data->bgConfig, GF_BG_LYR_SUB_1, charData, 0xc80, 1);
BG_LoadPlttData(GF_BG_LYR_SUB_1, plttData, 32, GF_PAL_SLOT_OFFSET_10);
BG_LoadPlttData(GF_BG_LYR_SUB_1, ov59_021D9ED8, 32, GF_PAL_SLOT_OFFSET_10);
@ -1268,11 +1268,11 @@ _021D82C8:
void ov59_LoadPokeballButton(ov59_IntroOverlayData *data)
{
GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, NARC_intro_narc_0038_NSCR, data->bgConfig, GF_BG_LYR_SUB_2, 0, 0, FALSE, data->heap_id);
GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, NARC_intro_narc_0038_NSCR, data->bgConfig, GF_BG_LYR_SUB_2, 0, 0, FALSE, data->heapId);
ov59_TilemapChangePalette(data, GF_BG_LYR_SUB_2, 9);
GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, NARC_intro_narc_0039_NCLR, GF_PAL_LOCATION_SUB_BG, GF_PAL_SLOT_OFFSET_7, 0x60, data->heap_id);
BG_ClearCharDataRange(GF_BG_LYR_SUB_2, 0x20, 0, data->heap_id);
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, NARC_intro_pokeball_button_1_NCGR, data->bgConfig, GF_BG_LYR_SUB_2, 0x20, 0, FALSE, data->heap_id);
GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, NARC_intro_narc_0039_NCLR, GF_PAL_LOCATION_SUB_BG, GF_PAL_SLOT_OFFSET_7, 0x60, data->heapId);
BG_ClearCharDataRange(GF_BG_LYR_SUB_2, 0x20, 0, data->heapId);
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, NARC_intro_pokeball_button_1_NCGR, data->bgConfig, GF_BG_LYR_SUB_2, 0x20, 0, FALSE, data->heapId);
}
BOOL ov59_MoveSprite(ov59_IntroOverlayData *data, u32 layer, u32 param2)
@ -1350,7 +1350,7 @@ void ov59_AnimatePlayerSprite(ov59_IntroOverlayData *data)
data->maleAnimTimer = timer;
G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BG3, 6, 10);
struct ov59_CharStruct021D9DEC charStruct = ov59_021D9DEC;
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, charStruct.narcId[data->maleAnimCounter], data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heap_id);
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, charStruct.narcId[data->maleAnimCounter], data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heapId);
}
else
{
@ -1367,7 +1367,7 @@ void ov59_AnimatePlayerSprite(ov59_IntroOverlayData *data)
data->femaleAnimTimer = timer;
G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG1, GX_BLEND_PLANEMASK_BG3, 6, 10);
struct ov59_CharStruct021D9DEC charStruct = ov59_021D9DFC;
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, charStruct.narcId[data->femaleAnimCounter], data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, FALSE, data->heap_id);
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, charStruct.narcId[data->femaleAnimCounter], data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, FALSE, data->heapId);
}
}
@ -1416,7 +1416,7 @@ BOOL ov59_PlayerShrinkAnimation(ov59_IntroOverlayData *data)
}
else
{
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, addr->charData[data->spriteDataIndex2], data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heap_id);
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, addr->charData[data->spriteDataIndex2], data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heapId);
}
return ret;
}
@ -1860,7 +1860,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
sub_02005350(SEQ_OPENING, 0);
ToggleBgLayer(GF_BG_LYR_MAIN_0, GX_LAYER_TOGGLE_ON);
ToggleBgLayer(GF_BG_LYR_SUB_3, GX_LAYER_TOGGLE_ON);
BeginNormalPaletteFade(0, 1, 1, GX_RGB_BLACK, 6, 1, data->heap_id);
BeginNormalPaletteFade(0, 1, 1, GX_RGB_BLACK, 6, 1, data->heapId);
data->controllerCounter = 1;
break;
@ -1892,7 +1892,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
ov59_LoadCharDataFromIndex(data);
ToggleBgLayer(GF_BG_LYR_MAIN_3, GX_LAYER_TOGGLE_ON);
ToggleBgLayer(GF_BG_LYR_MAIN_1, GX_LAYER_TOGGLE_ON);
BeginNormalPaletteFade(3, 1, 1, GX_RGB_BLACK, 16, 4, data->heap_id);
BeginNormalPaletteFade(3, 1, 1, GX_RGB_BLACK, 16, 4, data->heapId);
data->controllerCounter = 4;
break;
@ -1945,7 +1945,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
break;
case 8: //fade to black
BeginNormalPaletteFade(0, 0, 0, GX_RGB_BLACK, 6, 1, data->heap_id);
BeginNormalPaletteFade(0, 0, 0, GX_RGB_BLACK, 6, 1, data->heapId);
data->controllerCounter = 9;
break;
@ -1964,7 +1964,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
ov59_LoadMainScrnData(data);
data->scrnDataIndexSub = 1;
ov59_LoadSubScrnData(data);
BeginNormalPaletteFade(0, 1, 1, GX_RGB_BLACK, 6, 1, data->heap_id);
BeginNormalPaletteFade(0, 1, 1, GX_RGB_BLACK, 6, 1, data->heapId);
data->controllerCounter = 11;
break;
@ -2096,7 +2096,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
break;
}
sub_020146C4(data->unk68);
BeginNormalPaletteFade(0, 0, 0, GX_RGB_BLACK, 6, 1, data->heap_id);
BeginNormalPaletteFade(0, 0, 0, GX_RGB_BLACK, 6, 1, data->heapId);
data->controllerCounter = 25;
break;
@ -2138,7 +2138,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
ov59_LoadSubScrnData(data);
ToggleBgLayer(GF_BG_LYR_MAIN_1, GX_LAYER_TOGGLE_ON);
BgSetPosTextAndCommit(data->bgConfig, GF_BG_LYR_MAIN_1, BG_POS_OP_SET_X, 0);
BeginNormalPaletteFade(0, 1, 1, GX_RGB_BLACK, 6, 1, data->heap_id);
BeginNormalPaletteFade(0, 1, 1, GX_RGB_BLACK, 6, 1, data->heapId);
data->controllerCounter = 29;
break;
@ -2163,7 +2163,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
ov59_LoadMainScrnData(data);
data->scrnDataIndexSub = 2;
ov59_LoadSubScrnData(data);
BeginNormalPaletteFade(0, 1, 1, GX_RGB_BLACK, 6, 1, data->heap_id);
BeginNormalPaletteFade(0, 1, 1, GX_RGB_BLACK, 6, 1, data->heapId);
data->controllerCounter = 32;
break;
@ -2224,7 +2224,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
break;
case 39: //fade to black
BeginNormalPaletteFade(0, 0, 0, GX_RGB_BLACK, 6, 1, data->heap_id);
BeginNormalPaletteFade(0, 0, 0, GX_RGB_BLACK, 6, 1, data->heapId);
data->controllerCounter = 40;
break;
@ -2255,7 +2255,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
break;
case 43: //fade to black
BeginNormalPaletteFade(4, 0, 0, GX_RGB_BLACK, 6, 1, data->heap_id);
BeginNormalPaletteFade(4, 0, 0, GX_RGB_BLACK, 6, 1, data->heapId);
data->controllerCounter = 44;
break;
@ -2268,7 +2268,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
data->scrnDataIndexSub = 4;
ov59_LoadSubScrnData(data);
ToggleBgLayer(GF_BG_LYR_SUB_2, GX_LAYER_TOGGLE_ON);
BeginNormalPaletteFade(4, 1, 1, GX_RGB_BLACK, 6, 1, data->heap_id);
BeginNormalPaletteFade(4, 1, 1, GX_RGB_BLACK, 6, 1, data->heapId);
data->controllerCounter = 45;
break;
@ -2329,7 +2329,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
}
else
{
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, arr2[data->spriteDataIndex2], data->bgConfig, GF_BG_LYR_SUB_2, 32, 0, FALSE, data->heap_id);
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, arr2[data->spriteDataIndex2], data->bgConfig, GF_BG_LYR_SUB_2, 32, 0, FALSE, data->heapId);
data->spriteDataIndex2++;
data->spriteData2Timer = 4;
}
@ -2596,7 +2596,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
case 76: //load keyboard overlay (except this is not an overlay at all)
data->playerStruct->gender = data->selectedGender;
data->loadedOverlay = OverlayManager_New(&UNK_020FA5FC, (s32 *)data->playerStruct, data->heap_id);
data->loadedOverlay = OverlayManager_New(&UNK_020FA5FC, (s32 *)data->playerStruct, data->heapId);
data->controllerCounter = 77;
break;
@ -2614,7 +2614,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
ToggleBgLayer(GF_BG_LYR_MAIN_2, GX_LAYER_TOGGLE_ON);
BgSetPosTextAndCommit(data->bgConfig, GF_BG_LYR_MAIN_2, BG_POS_OP_SET_X, 0);
}
BeginNormalPaletteFade(0, 1, 1, GX_RGB_BLACK, 6, 1, data->heap_id);
BeginNormalPaletteFade(0, 1, 1, GX_RGB_BLACK, 6, 1, data->heapId);
data->controllerCounter = 78;
break;
@ -2778,7 +2778,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
break;
case 92: //load keyboard
data->loadedOverlay = OverlayManager_New(&UNK_020FA5FC, (s32 *)data->rivalStruct, data->heap_id);
data->loadedOverlay = OverlayManager_New(&UNK_020FA5FC, (s32 *)data->rivalStruct, data->heapId);
data->controllerCounter = 93;
break;
@ -2788,7 +2788,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
ToggleBgLayer(GF_BG_LYR_SUB_3, GX_LAYER_TOGGLE_ON);
ToggleBgLayer(GF_BG_LYR_MAIN_1, GX_LAYER_TOGGLE_ON);
BgSetPosTextAndCommit(data->bgConfig, GF_BG_LYR_MAIN_1, BG_POS_OP_SET_X, 0);
BeginNormalPaletteFade(0, 1, 1, GX_RGB_BLACK, 6, 1, data->heap_id);
BeginNormalPaletteFade(0, 1, 1, GX_RGB_BLACK, 6, 1, data->heapId);
data->controllerCounter = 94;
break;
@ -2927,7 +2927,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
break;
case 108: //load overaly 59 TV
data->loadedOverlay = OverlayManager_New(&ov59_021D9DDC, 0, data->heap_id);
data->loadedOverlay = OverlayManager_New(&ov59_021D9DDC, 0, data->heapId);
data->controllerCounter = 109;
break;

40
arm9/overlays/59/src/ov59_TV.c
View File

@ -17,7 +17,7 @@
extern void sub_0200E3A0(PMLCDTarget, s32);
extern void BeginNormalPaletteFade(u32 pattern, u32 typeTop, u32 typeBottom, u16 colour, u32 duration, u32 framesPer, u32 heapId);
extern void BeginNormalPaletteFade(u32 pattern, u32 typeTop, u32 typeBottom, u16 colour, u32 duration, u32 framesPer, HeapID heapId);
extern BOOL IsPaletteFadeFinished(void);
const struct WindowTemplate ov59_021DA04C =
@ -128,10 +128,10 @@ const struct GraphicsBanks ov59_021DA0D4 =
BOOL ov59_TVInit(struct OverlayManager *overlayManager, u32 *status)
{
#pragma unused(status)
CreateHeap(3, 83, 0x40000);
ov59_TVOverlayData *data = (ov59_TVOverlayData *)OverlayManager_CreateAndGetData(overlayManager, sizeof(ov59_TVOverlayData), 0x53);
CreateHeap(3, HEAP_ID_INTRO_TV, 0x40000);
ov59_TVOverlayData *data = (ov59_TVOverlayData *)OverlayManager_CreateAndGetData(overlayManager, sizeof(ov59_TVOverlayData), HEAP_ID_INTRO_TV);
(void)memset((void *)data, 0, sizeof(ov59_TVOverlayData));
data->heap_id = 0x53;
data->heapId = HEAP_ID_INTRO_TV;
data->unk24 = 0;
return TRUE;
}
@ -193,7 +193,7 @@ BOOL ov59_TVMain(struct OverlayManager *overlayManager, u32 *status)
}
data->unk24 = 0; //??
BeginNormalPaletteFade(0, 1, 1, GX_RGB_BLACK, 6, 1, data->heap_id);
BeginNormalPaletteFade(0, 1, 1, GX_RGB_BLACK, 6, 1, data->heapId);
*status = 3;
break;
@ -217,7 +217,7 @@ BOOL ov59_TVMain(struct OverlayManager *overlayManager, u32 *status)
break;
}
BeginNormalPaletteFade(0, 0, 0, GX_RGB_BLACK, 6, 1, data->heap_id);
BeginNormalPaletteFade(0, 0, 0, GX_RGB_BLACK, 6, 1, data->heapId);
*status = 5;
break;
@ -245,9 +245,9 @@ BOOL ov59_TVMain(struct OverlayManager *overlayManager, u32 *status)
BOOL ov59_TVExit(struct OverlayManager *overlayManager, u32 *status)
{
#pragma unused (status)
u32 heap_id = ((ov59_TVOverlayData *)OverlayManager_GetData(overlayManager))->heap_id;
HeapID heapId = ((ov59_TVOverlayData *)OverlayManager_GetData(overlayManager))->heapId;
OverlayManager_FreeData(overlayManager);
DestroyHeap(heap_id);
DestroyHeap(heapId);
return TRUE;
}
@ -261,7 +261,7 @@ void ov59_TVSetupGraphics(ov59_TVOverlayData *data)
const struct GraphicsBanks banks = ov59_021DA0D4; //sp #0x90
GX_SetBanks(&banks);
data->bgConfig = BgConfig_Alloc(data->heap_id);
data->bgConfig = BgConfig_Alloc(data->heapId);
const struct GraphicsModes modes = ov59_021DA054; //sp #0x80
SetBothScreensModesAndDisable(&modes);
@ -269,30 +269,30 @@ void ov59_TVSetupGraphics(ov59_TVOverlayData *data)
const struct BgTemplate bgTemplateMain2 = ov59_021DA080; //sp #0x64
InitBgFromTemplate(data->bgConfig, GF_BG_LYR_MAIN_2, &bgTemplateMain2, GF_BG_TYPE_TEXT);
BG_ClearCharDataRange(GF_BG_LYR_MAIN_2, 0x20, 0, data->heap_id);
BG_ClearCharDataRange(GF_BG_LYR_MAIN_2, 0x20, 0, data->heapId);
BgClearTilemapBufferAndCommit(data->bgConfig, GF_BG_LYR_MAIN_2);
const struct BgTemplate bgTemplateMain0 = ov59_021DA09C; //sp #0x48
InitBgFromTemplate(data->bgConfig, GF_BG_LYR_MAIN_0, &bgTemplateMain0, GF_BG_TYPE_TEXT);
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0001_NCGR, data->bgConfig, GF_BG_LYR_MAIN_0, 0, 0, FALSE, data->heap_id);
GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0004_NSCR, data->bgConfig, GF_BG_LYR_MAIN_0, 0, 0, FALSE, data->heap_id);
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0001_NCGR, data->bgConfig, GF_BG_LYR_MAIN_0, 0, 0, FALSE, data->heapId);
GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0004_NSCR, data->bgConfig, GF_BG_LYR_MAIN_0, 0, 0, FALSE, data->heapId);
const struct BgTemplate bgTemplateMain1 = ov59_021DA064; //sp #0x2C
InitBgFromTemplate(data->bgConfig, GF_BG_LYR_MAIN_1, &bgTemplateMain1, GF_BG_TYPE_TEXT);
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0002_NCGR, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heap_id);
GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0005_NSCR, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heap_id);
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0002_NCGR, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heapId);
GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0005_NSCR, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heapId);
const struct BgTemplate bgTemplateMain3 = ov59_021DA0B8; //sp #0x10
InitBgFromTemplate(data->bgConfig, GF_BG_LYR_MAIN_3, &bgTemplateMain3, GF_BG_TYPE_TEXT);
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0000_NCGR, data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, FALSE, data->heap_id);
GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0003_NSCR, data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, FALSE, data->heap_id);
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0000_NCGR, data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, FALSE, data->heapId);
GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0003_NSCR, data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, FALSE, data->heapId);
GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0006_NCLR, GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_0, 0, data->heap_id);
GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO_TV, NARC_intro_tv_narc_0006_NCLR, GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_0, 0, data->heapId);
LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_1, data->heap_id);
LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_1, data->heapId);
BG_SetMaskColor(GF_BG_LYR_MAIN_0, 0);
BG_SetMaskColor(GF_BG_LYR_SUB_0, 0);
@ -322,7 +322,7 @@ void ov59_TVDestroyGraphics(ov59_TVOverlayData *data)
void ov59_TVSetupMsg(ov59_TVOverlayData *data)
{
data->msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0549_bin, data->heap_id);
data->msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0549_bin, data->heapId);
ResetAllTextPrinters();
@ -341,7 +341,7 @@ BOOL ov59_021D9C74(ov59_TVOverlayData *data, u32 msgNo, u32 param2, u32 param3)
{
case 0:
ToggleBgLayer(GF_BG_LYR_MAIN_2, GX_LAYER_TOGGLE_OFF);
struct String *string = String_New(1024, data->heap_id);
struct String *string = String_New(1024, data->heapId);
ReadMsgDataIntoString(data->msgData, msgNo, string);
AddWindow(data->bgConfig, &data->window, &ov59_021DA04C);
FillWindowPixelRect(&data->window, 0, 0, 0, 256, 192);

12
arm9/overlays/63/src/ov63_021DB450.c
View File

@ -13,13 +13,13 @@ extern u32 (*NNS_GfdDefaultFuncAllocPlttVram)(u32 param0, u32 param1, u32 param2
extern void sub_0201327C(u32 param0);
extern void sub_020132BC(u32 param0);
extern void * sub_02012CDC(void *, void *, void *, u32, u32, u32);
extern void * sub_02012CDC(void *, void *, void *, u32, u32, HeapID);
extern void sub_02068C00(struct UnkStruct_02006D98_4*, u16, u32, u32, u32, u32, u32);
extern void sub_02012CC8(void);
extern struct Camera * sub_0201343C(void);
extern void sub_02013194(void *, u32, u32, u32);
extern u32 sub_0201318C(u32, u32, u32);
extern u32 sub_0201318C(u32, u32, HeapID);
extern void sub_02012DE4(void *);
@ -67,7 +67,7 @@ void Title_SetupMonAnimationSprites(struct UnkStruct63_021DB450 * arg0) //TODO:
struct UnkStruct_02006D98_4 sp1C;
int introMonArray[3] = {SPECIES_TURTWIG, SPECIES_CHIMCHAR, SPECIES_PIPLUP};
arg0->field_00 = sub_02006D98(76); //this is needed to get into the world view, otherwise it is just black
arg0->field_00 = sub_02006D98(HEAP_ID_76); //this is needed to get into the world view, otherwise it is just black
for (u8 i = 0; i < 3; i++) //some kind of animation assignment TODO: investigate further
{
@ -78,10 +78,10 @@ void Title_SetupMonAnimationSprites(struct UnkStruct63_021DB450 * arg0) //TODO:
sub_02007558(arg0->field_04[1], 35, 1);
arg0->field_10 = 1;
sub_02012CC8();
arg0->field_14 = AllocFromHeap(0x4C, 0x4800);
arg0->field_18 = sub_02012CDC(ov63_021DB450, ov63_021DB474, arg0->field_14, 0x4800, 1, 0x4C);
arg0->field_14 = AllocFromHeap(HEAP_ID_76, 0x4800);
arg0->field_18 = sub_02012CDC(ov63_021DB450, ov63_021DB474, arg0->field_14, 0x4800, 1, HEAP_ID_76);
Camera_SetPerspectiveClippingPlane(0x1000, 0x384000, sub_0201343C());
sub_02013194(arg0->field_18, sub_0201318C(0x3D, 4, 0x4C), 10, 1);
sub_02013194(arg0->field_18, sub_0201318C(0x3D, 4, HEAP_ID_76), 10, 1);
}
void ov63_021DB580(UnkStruct63_021DB450 *param0)

2
arm9/overlays/73/asm/overlay_73.s
View File

@ -2043,7 +2043,7 @@ ov73_021D8590: ; 0x021D8590
add r7, r1, #0
ldr r0, [r0, #0xc]
add r6, r2, #0
bl sub_02022504
bl Save_SafariZone_Get
mov r4, #0
str r0, [sp]
cmp r6, #0

48
arm9/src/bag.c
View File

@ -9,9 +9,9 @@ u32 Save_Bag_sizeof(void)
return sizeof(struct Bag);
}
struct Bag * Save_Bag_New(u32 heap_id)
struct Bag * Save_Bag_New(HeapID heapId)
{
struct Bag * ret = (struct Bag *)AllocFromHeap(heap_id, sizeof(struct Bag));
struct Bag * ret = (struct Bag *)AllocFromHeap(heapId, sizeof(struct Bag));
Save_Bag_Init(ret);
return ret;
}
@ -36,9 +36,9 @@ void Bag_SetRegisteredItem(struct Bag * bag, u32 item)
bag->registeredItem = item;
}
u32 Bag_GetItemPocket(struct Bag * bag, u16 item_id, struct ItemSlot ** slot_p, u32 * count_p, u32 heap_id)
u32 Bag_GetItemPocket(struct Bag * bag, u16 item_id, struct ItemSlot ** slot_p, u32 * count_p, HeapID heapId)
{
u32 pocket = GetItemAttr(item_id, 5, heap_id);
u32 pocket = GetItemAttr(item_id, 5, heapId);
switch (pocket)
{
case POCKET_KEY_ITEMS:
@ -99,11 +99,11 @@ struct ItemSlot * Pocket_GetItemSlotForAdd(struct ItemSlot * slots, u32 count, u
return &slots[found];
}
struct ItemSlot * Bag_GetItemSlotForAdd(struct Bag * bag, u16 item_id, u16 quantity, u32 heap_id)
struct ItemSlot * Bag_GetItemSlotForAdd(struct Bag * bag, u16 item_id, u16 quantity, HeapID heapId)
{
struct ItemSlot * slots;
u32 count;
u32 pocket = Bag_GetItemPocket(bag, item_id, &slots, &count, heap_id);
u32 pocket = Bag_GetItemPocket(bag, item_id, &slots, &count, heapId);
if (pocket == POCKET_TMHMS)
{
return Pocket_GetItemSlotForAdd(slots, count, item_id, quantity, 99);
@ -114,20 +114,20 @@ struct ItemSlot * Bag_GetItemSlotForAdd(struct Bag * bag, u16 item_id, u16 quant
}
}
BOOL Bag_HasSpaceForItem(struct Bag * bag, u16 item_id, u16 quantity, u32 heap_id)
BOOL Bag_HasSpaceForItem(struct Bag * bag, u16 item_id, u16 quantity, HeapID heapId)
{
return Bag_GetItemSlotForAdd(bag, item_id, quantity, heap_id) != NULL;
return Bag_GetItemSlotForAdd(bag, item_id, quantity, heapId) != NULL;
}
BOOL Bag_AddItem(struct Bag * bag, u16 item_id, u16 quantity, u32 heap_id)
BOOL Bag_AddItem(struct Bag * bag, u16 item_id, u16 quantity, HeapID heapId)
{
struct ItemSlot * slots = Bag_GetItemSlotForAdd(bag, item_id, quantity, heap_id);
struct ItemSlot * slots = Bag_GetItemSlotForAdd(bag, item_id, quantity, heapId);
if (slots == NULL)
return FALSE;
slots->id = item_id;
slots->quantity += quantity;
u32 count;
u32 pocket = Bag_GetItemPocket(bag, item_id, &slots, &count, heap_id);
u32 pocket = Bag_GetItemPocket(bag, item_id, &slots, &count, heapId);
if (pocket == POCKET_TMHMS || pocket == POCKET_BERRIES)
{
SortPocket(slots, count);
@ -150,24 +150,24 @@ struct ItemSlot * Pocket_GetItemSlotForRemove(struct ItemSlot * slots, u32 count
return NULL;
}
struct ItemSlot * Bag_GetItemSlotForRemove(struct Bag * bag, u16 item_id, u16 quantity, u32 heap_id)
struct ItemSlot * Bag_GetItemSlotForRemove(struct Bag * bag, u16 item_id, u16 quantity, HeapID heapId)
{
struct ItemSlot * slots;
u32 count;
(void)Bag_GetItemPocket(bag, item_id, &slots, &count, heap_id);
(void)Bag_GetItemPocket(bag, item_id, &slots, &count, heapId);
return Pocket_GetItemSlotForRemove(slots, count, item_id, quantity);
}
BOOL Bag_TakeItem(struct Bag * bag, u16 item_id, u16 quantity, u32 heap_id)
BOOL Bag_TakeItem(struct Bag * bag, u16 item_id, u16 quantity, HeapID heapId)
{
struct ItemSlot * slots = Bag_GetItemSlotForRemove(bag, item_id, quantity, heap_id);
struct ItemSlot * slots = Bag_GetItemSlotForRemove(bag, item_id, quantity, heapId);
if (slots == NULL)
return FALSE;
slots->quantity -= quantity;
if (slots->quantity == 0)
slots->id = ITEM_NONE;
u32 count;
(void)Bag_GetItemPocket(bag, item_id, &slots, &count, heap_id);
(void)Bag_GetItemPocket(bag, item_id, &slots, &count, heapId);
PocketCompaction(slots, count);
return TRUE;
}
@ -184,9 +184,9 @@ BOOL Pocket_TakeItem(struct ItemSlot * slots, u32 count, u16 item_id, u16 quanti
return TRUE;
}
BOOL Bag_HasItem(struct Bag * bag, u16 item_id, u16 quantity, u32 heap_id)
BOOL Bag_HasItem(struct Bag * bag, u16 item_id, u16 quantity, HeapID heapId)
{
return Bag_GetItemSlotForRemove(bag, item_id, quantity, heap_id) != NULL;
return Bag_GetItemSlotForRemove(bag, item_id, quantity, heapId) != NULL;
}
BOOL Bag_PocketNotEmpty(struct Bag * bag, u32 pocket)
@ -239,9 +239,9 @@ BOOL Bag_PocketNotEmpty(struct Bag * bag, u32 pocket)
return FALSE;
}
u16 Bag_GetQuantity(struct Bag * bag, u16 item_id, u32 heap_id)
u16 Bag_GetQuantity(struct Bag * bag, u16 item_id, HeapID heapId)
{
struct ItemSlot * slot = Bag_GetItemSlotForRemove(bag, item_id, 1, heap_id);
struct ItemSlot * slot = Bag_GetItemSlotForRemove(bag, item_id, 1, heapId);
if (slot == NULL)
return 0;
return slot->quantity;
@ -294,9 +294,9 @@ void SortPocket(struct ItemSlot * slots, u32 count)
}
}
struct BagView * CreateBagView(struct Bag * bag, const u8 * pockets, u32 heap_id)
struct BagView * CreateBagView(struct Bag * bag, const u8 * pockets, HeapID heapId)
{
struct BagView * view = BagView_New((u8)heap_id);
struct BagView * view = BagView_New((u8)heapId);
for (u32 i = 0; pockets[i] != 0xFF; i++)
{
@ -380,9 +380,9 @@ struct Bag * Save_Bag_Get(struct SaveData * save)
return (struct Bag *)SaveArray_Get(save, 3);
}
struct UnkStruct_0206F164 * sub_0206F164(u32 heap_id)
struct UnkStruct_0206F164 * sub_0206F164(HeapID heapId)
{
struct UnkStruct_0206F164 * ret = (struct UnkStruct_0206F164 *)AllocFromHeap(heap_id, sizeof(struct UnkStruct_0206F164));
struct UnkStruct_0206F164 * ret = (struct UnkStruct_0206F164 *)AllocFromHeap(heapId, sizeof(struct UnkStruct_0206F164));
MI_CpuClear16(ret, sizeof(struct UnkStruct_0206F164));
return ret;
}

20
arm9/src/bag_view.c
View File

@ -23,9 +23,9 @@ extern u8 SealCase_CountSealOccurrenceAnywhere(struct SealCase *, u32);
static u32 GetCoinCount(struct SaveData *save);
static u32 GetSealCount(struct SaveData *save);
struct BagView *BagView_New(u8 heap_id)
struct BagView *BagView_New(u8 heapId)
{
struct BagView *ptr = AllocFromHeap(heap_id, sizeof(struct BagView));
struct BagView *ptr = AllocFromHeap((HeapID)heapId, sizeof(struct BagView));
memset(ptr, 0, sizeof(struct BagView));
@ -133,10 +133,10 @@ u32 GetNumBattlePoints(struct SaveData *save)
return FrontierData_SetField_0x0(Save_FrontierData_Get(save), 0, DATA_GET);
}
BOOL TryFormatRegisteredKeyItemUseMessage(struct SaveData *save, struct String *dest, u32 item_id, u32 heap_id)
BOOL TryFormatRegisteredKeyItemUseMessage(struct SaveData *save, struct String *dest, u32 item_id, HeapID heapId)
{
struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_DIRECT, NARC_MSGDATA_MSG, NARC_msg_narc_0007_bin, heap_id);
MessageFormat *messageFormat = MessageFormat_New(heap_id);
struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_DIRECT, NARC_MSGDATA_MSG, NARC_msg_narc_0007_bin, heapId);
MessageFormat *messageFormat = MessageFormat_New(heapId);
struct String *string;
if (item_id == ITEM_NONE)
@ -185,7 +185,7 @@ BOOL TryFormatRegisteredKeyItemUseMessage(struct SaveData *save, struct String *
}
void sub_0206E51C( //todo: sync with HG
PlayerProfile *playerData, struct String *dest, u32 r2, u32 r3, u32 heap_id)
PlayerProfile *playerData, struct String *dest, u32 r2, u32 r3, HeapID heapId)
{
#pragma unused(r2)
struct MsgData *msgData;
@ -193,20 +193,20 @@ void sub_0206E51C( //todo: sync with HG
switch (r3)
{
case 1:
msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0007_bin, heap_id);
msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0007_bin, heapId);
ReadMsgDataIntoString(msgData, narc_0007_00056, dest); // You can’t dismount your Bike here.
DestroyMsgData(msgData);
return;
case 2:
msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0007_bin, heap_id);
msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0007_bin, heapId);
ReadMsgDataIntoString(msgData, narc_0007_00111, dest); // It can’t be used when you have someone with you.
DestroyMsgData(msgData);
return;
default:
msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0199_bin, heap_id);
MessageFormat *messageFormat = MessageFormat_New(heap_id);
msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0199_bin, heapId);
MessageFormat *messageFormat = MessageFormat_New(heapId);
struct String *src = NewString_ReadMsgData(msgData, narc_0199_00036); // Rowan’s words echoed... {STRVAR_1 3, 0}! There’s a time and place for everything! But not now.
BufferPlayersName(messageFormat, 0, playerData);

52
arm9/src/bg_window.c
View File

@ -50,20 +50,20 @@ void (*const sClearWindowTilemapFuncs[])(struct Window *) = {
ClearWindowTilemapText,
};
struct BgConfig *BgConfig_Alloc(u32 heap_id)
struct BgConfig *BgConfig_Alloc(HeapID heapId)
{
struct BgConfig *ptr = AllocFromHeap(heap_id, sizeof(struct BgConfig));
struct BgConfig *ptr = AllocFromHeap(heapId, sizeof(struct BgConfig));
memset(ptr, 0, sizeof(struct BgConfig));
ptr->heap_id = heap_id;
ptr->heapId = heapId;
ptr->scrollScheduled = 0;
ptr->bufferTransferScheduled = 0;
return ptr;
}
u32 BgConfig_GetHeapId(struct BgConfig *bgConfig)
HeapID BgConfig_GetHeapId(struct BgConfig *bgConfig)
{
return bgConfig->heap_id;
return bgConfig->heapId;
}
void SetBothScreensModesAndDisable(const struct GraphicsModes *modes)
@ -210,7 +210,7 @@ void InitBgFromTemplate(
if (template->bufferSize != 0)
{
bgConfig->bgs[bgId].tilemapBuffer = AllocFromHeap(bgConfig->heap_id, template->bufferSize);
bgConfig->bgs[bgId].tilemapBuffer = AllocFromHeap(bgConfig->heapId, template->bufferSize);
MI_CpuClear16(bgConfig->bgs[bgId].tilemapBuffer, template->bufferSize);
@ -833,7 +833,7 @@ void BgCopyOrUncompressTilemapBufferRangeToVram(
}
u32 uncompSize = src[0] >> 8;
void *ptr = AllocFromHeapAtEnd(bgConfig->heap_id, uncompSize);
void *ptr = AllocFromHeapAtEnd(bgConfig->heapId, uncompSize);
CopyOrUncompressTilemapData(src, ptr, size);
LoadBgVramScr(bgId, ptr, tileOffset * 2, uncompSize);
FreeToHeap(ptr);
@ -900,7 +900,7 @@ void BG_LoadCharPixelData(
{
u32 uncompressedSize = charData[0] >> 8;
void *ptr = AllocFromHeapAtEnd(bgConfig->heap_id, uncompressedSize);
void *ptr = AllocFromHeapAtEnd(bgConfig->heapId, uncompressedSize);
CopyOrUncompressTilemapData(charData, ptr, size);
LoadBgVramChar(bgId, ptr, offset, uncompressedSize);
FreeToHeap(ptr);
@ -943,13 +943,13 @@ void LoadBgVramChar(u32 bgId, void *buffer_p, u32 offset, u32 size)
}
}
void BG_ClearCharDataRange(u32 bgId, u32 size, u32 offset, u32 heap_id)
void BG_ClearCharDataRange(u32 bgId, u32 size, u32 offset, HeapID heapId)
{
void *ptr = AllocFromHeapAtEnd(heap_id, size);
void *ptr = AllocFromHeapAtEnd(heapId, size);
memset(ptr, 0, size);
LoadBgVramChar(bgId, ptr, offset, size);
FreeToHeapExplicit(heap_id, ptr);
FreeToHeapExplicit(heapId, ptr);
}
void BG_FillCharDataRange(
@ -958,7 +958,7 @@ void BG_FillCharDataRange(
void *st4;
u32 size = count * param0->bgs[bgId].tileSize;
u32 r5 = fillValue;
st4 = AllocFromHeapAtEnd(param0->heap_id, size);
st4 = AllocFromHeapAtEnd(param0->heapId, size);
if (param0->bgs[bgId].tileSize == 0x20)
{
@ -1573,9 +1573,9 @@ void Convert4bppTo8bppInternal(u8 *src4bpp, u32 size, u8 (*dest8bpp), u8 palette
}
}
u8 *Convert4bppTo8bpp(u8 *src4Bpp, u32 size, u8 paletteNum, u32 heap_id)
u8 *Convert4bppTo8bpp(u8 *src4Bpp, u32 size, u8 paletteNum, HeapID heapId)
{
u8 *ptr = (u8*)AllocFromHeap(heap_id, size * 2);
u8 *ptr = (u8*)AllocFromHeap(heapId, size * 2);
Convert4bppTo8bppInternal(src4Bpp, size, ptr, paletteNum);
@ -1853,9 +1853,9 @@ void FillBitmapRect8Bit(
}
}
struct Window *AllocWindows(u32 heap_id, s32 size)
struct Window *AllocWindows(HeapID heapId, s32 size)
{
struct Window *ptr = AllocFromHeap(heap_id, (u32)(size << 4));
struct Window *ptr = AllocFromHeap(heapId, (u32)(size << 4));
for (u16 i = 0; i < size; i++)
{
@ -1906,7 +1906,7 @@ void AddWindowParameterized(struct BgConfig *param0,
return;
}
void *ptr = AllocFromHeap(param0->heap_id, (u32)(width * height * param0->bgs[bgId].tileSize));
void *ptr = AllocFromHeap(param0->heapId, (u32)(width * height * param0->bgs[bgId].tileSize));
if (ptr == NULL)
{
@ -1935,7 +1935,7 @@ void AddTextWindowTopLeftCorner(struct BgConfig *param0,
{
u32 size = (u32)(width * height * 32);
void *ptr = AllocFromHeap(param0->heap_id, size);
void *ptr = AllocFromHeap(param0->heapId, size);
paletteNum |= (paletteNum * 16);
memset(ptr, paletteNum, size);
@ -2469,7 +2469,7 @@ void CopyGlyphToWindow(struct Window *window, u8 *glyphPixels, u16 srcWidth, u16
}
} else { // 8bpp
u8 *convertedSrc;
convertedSrc = Convert4bppTo8bpp(glyphPixels, srcWidth * 4 * srcHeight * 8, window->paletteNum, window->bgConfig->heap_id);
convertedSrc = Convert4bppTo8bpp(glyphPixels, srcWidth * 4 * srcHeight * 8, window->paletteNum, window->bgConfig->heapId);
switch (glyphSizeParam) {
case 0: // 1x1
GLYPH_COPY_8BPP(convertedSrc, 0, 0, srcRight, srcBottom, windowPixels, dstX, dstY, ConvertPixelsToTiles(destWidth), table);
@ -2701,9 +2701,9 @@ void SetWindowPaletteNum(struct Window *window, u8 paletteNum)
window->paletteNum = paletteNum;
}
NNSG2dCharacterData * LoadCharacterDataFromFile(void **char_ret, u32 heap_id, const char *path)
NNSG2dCharacterData * LoadCharacterDataFromFile(void **char_ret, HeapID heapId, const char *path)
{
void *ptr = AllocAndReadFile(heap_id, path);
void *ptr = AllocAndReadFile(heapId, path);
*char_ret = ptr;
NNSG2dCharacterData *st0;
NNS_G2dGetUnpackedBGCharacterData(ptr, &st0);
@ -2711,9 +2711,9 @@ NNSG2dCharacterData * LoadCharacterDataFromFile(void **char_ret, u32 heap_id, co
return st0;
}
NNSG2dPaletteData * LoadPaletteDataFromFile(void **pltt_ret, u32 heap_id, const char *path)
NNSG2dPaletteData * LoadPaletteDataFromFile(void **pltt_ret, HeapID heapId, const char *path)
{
void *ptr = AllocAndReadFile(heap_id, path);
void *ptr = AllocAndReadFile(heapId, path);
*pltt_ret = ptr;
NNSG2dPaletteData *st0;
NNS_G2dGetUnpackedPaletteData(ptr, &st0);
@ -2967,7 +2967,7 @@ u32 DoesPixelAtScreenXYMatchPtrVal(
if (bgConfig->bgs[bgId].colorMode == GX_BG_COLORMODE_16)
{
u16 *tilemapBuffer = bgConfig->bgs[bgId].tilemapBuffer;
u8 *ptr = AllocFromHeapAtEnd(bgConfig->heap_id, 0x40);
u8 *ptr = AllocFromHeapAtEnd(bgConfig->heapId, 0x40);
bgCharPtr += ((tilemapBuffer[tilemapIdx] & 0x3ff) << 5);
for (i = 0; i < 0x20; i++)
@ -2991,7 +2991,7 @@ u32 DoesPixelAtScreenXYMatchPtrVal(
if (bgConfig->bgs[bgId].mode != GF_BG_TYPE_AFFINE)
{
u16 *tilemapBuffer = bgConfig->bgs[bgId].tilemapBuffer;
u8 *ptr = AllocFromHeapAtEnd(bgConfig->heap_id, 0x40);
u8 *ptr = AllocFromHeapAtEnd(bgConfig->heapId, 0x40);
memcpy(ptr, bgCharPtr + ((tilemapBuffer[tilemapIdx] & 0x3ff) << 6), 0x40);
@ -3026,7 +3026,7 @@ void ApplyFlipFlagsToTile(struct BgConfig *bgConfig, u8 flag, u8 *src)
u8 i, j;
if (flag != 0)
{
u8 *ptr = AllocFromHeapAtEnd(bgConfig->heap_id, 0x40);
u8 *ptr = AllocFromHeapAtEnd(bgConfig->heapId, 0x40);
if ((flag & 1) != 0)
{

10
arm9/src/camera.c
View File

@ -93,7 +93,7 @@ void Camera_GetVecFromSomeRingBufferMaybe(struct Camera * camera, const VecFx32
}
}
void Camera_AllocHistory(s32 count, s32 initialWriteIdx, s32 updateEnableFlags, s32 heap_id, struct Camera * camera)
void Camera_AllocHistory(s32 count, s32 initialWriteIdx, s32 updateEnableFlags, HeapID heapId, struct Camera * camera)
{
s32 i;
struct CameraHistory * history;
@ -101,8 +101,8 @@ void Camera_AllocHistory(s32 count, s32 initialWriteIdx, s32 updateEnableFlags,
if (camera->currTarget_p != NULL)
{
GF_ASSERT(initialWriteIdx + 1 <= count);
history = AllocFromHeap(heap_id, sizeof(struct CameraHistory));
history->vecs = AllocFromHeap(heap_id, sizeof(VecFx32) * count);
history = AllocFromHeap(heapId, sizeof(struct CameraHistory));
history->vecs = AllocFromHeap(heapId, sizeof(VecFx32) * count);
for (i = 0; i < count; i++)
{
history->vecs[i].x = 0;
@ -137,9 +137,9 @@ void Camera_FreeHistory(struct Camera * camera)
}
}
struct Camera * Camera_Alloc(u32 heap_id)
struct Camera * Camera_Alloc(HeapID heapId)
{
return AllocFromHeap(heap_id, sizeof(struct Camera));
return AllocFromHeap(heapId, sizeof(struct Camera));
}
void Camera_Free(struct Camera * camera)

18
arm9/src/communication_error.c
View File

@ -67,7 +67,7 @@ static void VBlankIntr(void)
MI_WaitDma(GX_DEFAULT_DMAID);
}
void ShowCommunicationError(u32 heap_id, u32 error, u32 error_code)
void ShowCommunicationError(HeapID heapId, u32 error, u32 error_code)
{
struct Window window;
@ -118,23 +118,23 @@ void ShowCommunicationError(u32 heap_id, u32 error, u32 error_code)
GXS_SetVisibleWnd(0);
GX_SetBanks(&sCommunicationErrorGraphicsBanks);
struct BgConfig* bg_config = BgConfig_Alloc(heap_id);
struct BgConfig* bg_config = BgConfig_Alloc(heapId);
SetBothScreensModesAndDisable(&sCommunicationErrorGraphicsModes);
InitBgFromTemplate(bg_config, 0, &sCommunicationErrorBgTemplate, GX_BGMODE_0);
BgClearTilemapBufferAndCommit(bg_config, GF_BG_LYR_MAIN_0);
LoadUserFrameGfx1(bg_config, GF_BG_LYR_MAIN_0, 0x01F7, 2, 0, heap_id);
LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_1, heap_id);
BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, heap_id);
LoadUserFrameGfx1(bg_config, GF_BG_LYR_MAIN_0, 0x01F7, 2, 0, heapId);
LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_1, heapId);
BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, heapId);
BG_SetMaskColor(GF_BG_LYR_MAIN_0, GX_RGB(1, 1, 27));
BG_SetMaskColor(GF_BG_LYR_SUB_0, GX_RGB(1, 1, 27));
struct MsgData* error_message_data = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0200_bin, heap_id);
struct String* error_message_str = String_New(384, heap_id);
struct String* tmp_str = String_New(384, heap_id);
struct MsgData* error_message_data = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0200_bin, heapId);
struct String* error_message_str = String_New(384, heapId);
struct String* tmp_str = String_New(384, heapId);
ResetAllTextPrinters();
MessageFormat* messageFormat = MessageFormat_New(heap_id);
MessageFormat* messageFormat = MessageFormat_New(heapId);
AddWindow(bg_config, &window, &sCommunicationErrorWindowTemplate);
FillWindowPixelRect(&window, 0xF, 0, 0, 208, 144);

13
arm9/src/error_message_reset.c
View File

@ -2,6 +2,7 @@
#include "error_message_reset.h"
#include "GX_layers.h"
#include "gx.h"
#include "heap.h"
#include "unk_02031734.h"
#include "unk_0202F150.h"
#include "bg_window.h"
@ -114,21 +115,21 @@ void PrintErrorMessageAndReset()
GXS_SetVisibleWnd(0);
GX_SetBanks(&sErrorMessageBanksConfig);
ptr = BgConfig_Alloc(0);
ptr = BgConfig_Alloc(HEAP_ID_DEFAULT);
SetBothScreensModesAndDisable(&sErrorMessageBgModeSet);
InitBgFromTemplate(ptr, 0, &sErrorMessageBgTemplate, GX_BGMODE_0);
BgClearTilemapBufferAndCommit(ptr, GF_BG_LYR_MAIN_0);
LoadUserFrameGfx1(ptr, GF_BG_LYR_MAIN_0, 503, 2, 0, 0);
LoadUserFrameGfx1(ptr, GF_BG_LYR_MAIN_0, 503, 2, 0, HEAP_ID_DEFAULT);
LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_1, 0);
BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, 0);
LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_1, HEAP_ID_DEFAULT);
BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, HEAP_ID_DEFAULT);
BG_SetMaskColor(GF_BG_LYR_MAIN_0, GX_RGB(1, 1, 27));
BG_SetMaskColor(GF_BG_LYR_SUB_0, GX_RGB(1, 1, 27));
struct MsgData *msg_data = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0200_bin, 0);
struct String *str = String_New(6 << 6, 0);
struct MsgData *msg_data = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0200_bin, HEAP_ID_DEFAULT);
struct String *str = String_New(6 << 6, HEAP_ID_DEFAULT);
ResetAllTextPrinters();
AddWindow(ptr, &buf, &sErrorMessageWindowTemplate);

24
arm9/src/event_data.c
View File

@ -4,24 +4,24 @@
u8 UNK_021C5A14[8];
u8 * GetFlagAddr(struct ScriptState * state, u16 flag_id);
u8 * GetFlagAddr(struct SaveVarsFlags * state, u16 flag_id);
u32 SaveArray_Flags_sizeof(void)
u32 Save_VarsFlags_sizeof(void)
{
return sizeof(struct ScriptState);
return sizeof(struct SaveVarsFlags);
}
void SaveArray_Flags_Init(struct ScriptState * state)
void Save_VarsFlags_Init(struct SaveVarsFlags * state)
{
memset(state, 0, sizeof(struct ScriptState));
memset(state, 0, sizeof(struct SaveVarsFlags));
}
struct ScriptState * SaveArray_Flags_Get(struct SaveData * save)
struct SaveVarsFlags * Save_VarsFlags_Get(struct SaveData * save)
{
return (struct ScriptState *)SaveArray_Get(save, 4);
return (struct SaveVarsFlags *)SaveArray_Get(save, 4);
}
BOOL CheckFlagInArray(struct ScriptState * state, u16 flag_id)
BOOL CheckFlagInArray(struct SaveVarsFlags * state, u16 flag_id)
{
u8 * ptr = GetFlagAddr(state, flag_id);
if (ptr != NULL)
@ -33,7 +33,7 @@ BOOL CheckFlagInArray(struct ScriptState * state, u16 flag_id)
return FALSE;
}
void SetFlagInArray(struct ScriptState * state, u16 flag_id)
void SetFlagInArray(struct SaveVarsFlags * state, u16 flag_id)
{
u8 * ptr = GetFlagAddr(state, flag_id);
if (ptr != NULL)
@ -43,7 +43,7 @@ void SetFlagInArray(struct ScriptState * state, u16 flag_id)
}
}
void ClearFlagInArray(struct ScriptState * state, u16 flag_id)
void ClearFlagInArray(struct SaveVarsFlags * state, u16 flag_id)
{
u8 * ptr = GetFlagAddr(state, flag_id);
if (ptr != NULL)
@ -53,7 +53,7 @@ void ClearFlagInArray(struct ScriptState * state, u16 flag_id)
}
}
u8 * GetFlagAddr(struct ScriptState * state, u16 flag_id)
u8 * GetFlagAddr(struct SaveVarsFlags * state, u16 flag_id)
{
if (flag_id == 0)
return 0;
@ -69,7 +69,7 @@ u8 * GetFlagAddr(struct ScriptState * state, u16 flag_id)
}
}
u16 * GetVarAddr(struct ScriptState * state, u16 var_id)
u16 * GetVarAddr(struct SaveVarsFlags * state, u16 var_id)
{
GF_ASSERT((var_id - 0x4000) < 288);
return &state->vars[var_id - 0x4000];

30
arm9/src/filesystem.c
View File

@ -194,7 +194,7 @@ void ReadFromNarcMemberByPathAndId(void * dest, const char * path, s32 file_idx,
FS_CloseFile(&file);
}
void * AllocAndReadFromNarcMemberByPathAndId(const char * path, s32 file_idx, u32 heap_id, u32 offset, u32 size, BOOL r4)
void * AllocAndReadFromNarcMemberByPathAndId(const char * path, s32 file_idx, HeapID heapId, u32 offset, u32 size, BOOL r4)
{
FSFile file;
register u32 chunk_starts[3];
@ -232,10 +232,10 @@ void * AllocAndReadFromNarcMemberByPathAndId(const char * path, s32 file_idx, u3
switch (r4)
{
case 0:
dest = AllocFromHeap(heap_id, chunk_size);
dest = AllocFromHeap(heapId, chunk_size);
break;
default:
dest = AllocFromHeapAtEnd(heap_id, chunk_size);
dest = AllocFromHeapAtEnd(heapId, chunk_size);
break;
}
FS_ReadFile(&file, dest, (s32)chunk_size);
@ -248,14 +248,14 @@ void ReadWholeNarcMemberByIdPair(void * dest, NarcId narc_id, s32 file_id)
ReadFromNarcMemberByPathAndId(dest, sNarcFileList[narc_id], file_id, 0, 0);
}
void * AllocAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, u32 heap_id)
void * AllocAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, HeapID heapId)
{
return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heap_id, 0, 0, FALSE);
return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heapId, 0, 0, FALSE);
}
void * AllocAtEndAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, u32 heap_id)
void * AllocAtEndAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, HeapID heapId)
{
return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heap_id, 0, 0, TRUE);
return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heapId, 0, 0, TRUE);
}
void ReadFromNarcMemberByIdPair(void * dest, NarcId narc_id, s32 file_id, u32 offset, u32 size)
@ -263,14 +263,14 @@ void ReadFromNarcMemberByIdPair(void * dest, NarcId narc_id, s32 file_id, u32 of
ReadFromNarcMemberByPathAndId(dest, sNarcFileList[narc_id], file_id, offset, size);
}
void * AllocAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, u32 heap_id, u32 offset, u32 size)
void * AllocAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, HeapID heapId, u32 offset, u32 size)
{
return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heap_id, offset, size, FALSE);
return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heapId, offset, size, FALSE);
}
void * AllocAtEndAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, u32 heap_id, u32 offset, u32 size)
void * AllocAtEndAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, HeapID heapId, u32 offset, u32 size)
{
return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heap_id, offset, size, TRUE);
return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heapId, offset, size, TRUE);
}
u32 GetNarcMemberSizeByIdPair(NarcId narc_id, s32 file_idx)
@ -308,9 +308,9 @@ u32 GetNarcMemberSizeByIdPair(NarcId narc_id, s32 file_idx)
return chunk_size;
}
NARC * NARC_New(NarcId narc_id, u32 heap_id)
NARC * NARC_New(NarcId narc_id, HeapID heapId)
{
NARC * narc = (NARC *)AllocFromHeap(heap_id, sizeof(NARC));
NARC * narc = (NARC *)AllocFromHeap(heapId, sizeof(NARC));
u32 btnf_start;
u32 chunk_size;
if (narc != NULL)
@ -337,7 +337,7 @@ void NARC_Delete(NARC * narc)
FreeToHeap(narc); // free to heap
}
void * NARC_AllocAndReadWholeMember(NARC * narc, u32 file_id, u32 heap_id)
void * NARC_AllocAndReadWholeMember(NARC * narc, u32 file_id, HeapID heapId)
{
u32 file_start;
u32 file_end;
@ -347,7 +347,7 @@ void * NARC_AllocAndReadWholeMember(NARC * narc, u32 file_id, u32 heap_id)
FS_ReadFile(&narc->file, &file_start, 4);
FS_ReadFile(&narc->file, &file_end, 4);
FS_SeekFile(&narc->file, (s32)(narc->gmif_start + 8 + file_start), FS_SEEK_SET);
dest = AllocFromHeap(heap_id, file_end - file_start);
dest = AllocFromHeap(heapId, file_end - file_start);
if (dest != NULL)
{
FS_ReadFile(&narc->file, dest, (s32)(file_end - file_start));

16
arm9/src/font.c
View File

@ -40,18 +40,18 @@ void sub_02002C14()
SetFontsPointer(&gFontInfos[0]);
}
void sub_02002C50(u32 font_id, u32 heap_id)
void sub_02002C50(u32 font_id, HeapID heapId)
{
UNK_02106FC8->unk94[font_id] =
FontData_New(NARC_GRAPHIC_FONT, UNK_020ECB54[font_id][0], 1, UNK_020ECB54[font_id][1], heap_id);
FontData_New(NARC_GRAPHIC_FONT, UNK_020ECB54[font_id][0], 1, UNK_020ECB54[font_id][1], heapId);
}
void sub_02002C84(s32 param0, u32 param1)
void sub_02002C84(s32 param0, HeapID heapId)
{
GF_ASSERT(param0 < 4);
GF_ASSERT(UNK_02106FC8->unk94[param0] != NULL);
FontData_ModeSwitch(UNK_02106FC8->unk94[param0], 0, param1);
FontData_ModeSwitch(UNK_02106FC8->unk94[param0], 0, heapId);
}
void sub_02002CC0(s32 param0)
@ -59,8 +59,8 @@ void sub_02002CC0(s32 param0)
GF_ASSERT(param0 < 4);
GF_ASSERT(UNK_02106FC8->unk94[param0] != NULL);
FontData_ModeSwitch(UNK_02106FC8->unk94[param0], 1, 0);
}
FontData_ModeSwitch(UNK_02106FC8->unk94[param0], 1, HEAP_ID_DEFAULT);
}
void sub_02002CF8(int param0)
{
@ -163,12 +163,12 @@ s32 GetFontAttribute(u8 fontId, s32 attr)
return ret;
}
void LoadFontPal0(enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, u32 heapId)
void LoadFontPal0(enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, HeapID heapId)
{
GfGfxLoader_GXLoadPal(NARC_GRAPHIC_FONT, NARC_font_narc_0006_NCLR, location, palSlotOffset, 0x20, heapId);
}
void LoadFontPal1(enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, u32 heapId)
void LoadFontPal1(enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, HeapID heapId)
{
GfGfxLoader_GXLoadPal(NARC_GRAPHIC_FONT, NARC_font_narc_0007_NCLR, location, palSlotOffset, 0x20, heapId);
}

10
arm9/src/game_init.c
View File

@ -175,7 +175,7 @@ void InitGraphicMemory(void)
MI_CpuClearFast((void *)HW_DB_PLTT, HW_DB_PLTT_SIZE);
}
void * AllocAndReadFile(u32 heap_id, const char * path)
void * AllocAndReadFile(HeapID heapId, const char * path)
{
void * ret;
@ -184,12 +184,12 @@ void * AllocAndReadFile(u32 heap_id, const char * path)
if (FS_OpenFile(&file, path))
{
u32 size = file.prop.file.bottom - file.prop.file.top;
ret = AllocFromHeap(heap_id, size);
ret = AllocFromHeap(heapId, size);
if (ret != NULL)
{
if (size != FS_ReadFile(&file, ret, (s32)size))
{
FreeToHeapExplicit(heap_id, ret);
FreeToHeapExplicit(heapId, ret);
ret = NULL;
}
}
@ -275,7 +275,7 @@ void ClearFileCache(void)
}
}
void * OpenFileCached(const s8 * str, u32 heap_id)
void * OpenFileCached(const s8 * str, HeapID heapId)
{
s8 filenameBuf[32];
FSFile file;
@ -303,7 +303,7 @@ void * OpenFileCached(const s8 * str, u32 heap_id)
if (FS_OpenFile(&file, (const char *)filenameBuf))
{
u32 size = file.prop.file.bottom - file.prop.file.top;
ret = AllocFromHeap(heap_id, size);
ret = AllocFromHeap(heapId, size);
if (ret != NULL)
{
if (size != FS_ReadFile(&file, ret, (s32)size))

76
arm9/src/gf_gfx_loader.c
View File

@ -3,10 +3,10 @@
#include "NNS_g2d.h"
#include "gf_gfx_loader.h"
u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct BgConfig * unkStruct02016B94_2, u32 layer, u32 numTiles, u32 szByte, BOOL isCompressed, u32 heap_id)
u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct BgConfig * unkStruct02016B94_2, u32 layer, u32 numTiles, u32 szByte, BOOL isCompressed, HeapID heapId)
{
NNSG2dCharacterData * pCharData;
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, isCompressed, heap_id, FALSE);
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, isCompressed, heapId, FALSE);
if (pFile != NULL)
{
if (NNS_G2dGetUnpackedBGCharacterData(pFile, &pCharData))
@ -20,10 +20,10 @@ u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct BgConfig * unkS
return szByte;
}
void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct BgConfig * unkStruct02016B94_2, u32 layer, u32 tileOffset, u32 szByte, BOOL isCompressed, u32 heap_id)
void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct BgConfig * unkStruct02016B94_2, u32 layer, u32 tileOffset, u32 szByte, BOOL isCompressed, HeapID heapId)
{
NNSG2dScreenData * pScreenData;
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, isCompressed, heap_id, TRUE);
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, isCompressed, heapId, TRUE);
if (pFile != NULL)
{
if (NNS_G2dGetUnpackedScreenData(pFile, &pScreenData))
@ -38,12 +38,12 @@ void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct BgConfig * unk
}
}
void GfGfxLoader_GXLoadPal(NarcId narcId, s32 memberNo, enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, u32 szByte, u32 heap_id)
void GfGfxLoader_GXLoadPal(NarcId narcId, s32 memberNo, enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, u32 szByte, HeapID heapId)
{
GfGfxLoader_GXLoadPalWithSrcOffset(narcId, memberNo, location, 0, palSlotOffset, szByte, heap_id);
GfGfxLoader_GXLoadPalWithSrcOffset(narcId, memberNo, location, 0, palSlotOffset, szByte, heapId);
}
void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, enum GFPalLoadLocation location, u32 srcOffset, enum GFPalSlotOffset palSlotOffset, u32 szByte, u32 heap_id)
void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, enum GFPalLoadLocation location, u32 srcOffset, enum GFPalSlotOffset palSlotOffset, u32 szByte, HeapID heapId)
{
static void (*const load_funcs[])(void *, u32, u32) = {
GX_LoadBGPltt,
@ -56,7 +56,7 @@ void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, enum GFPalL
GXS_LoadOBJExtPltt
};
NNSG2dPaletteData * pPltData;
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, FALSE, heap_id, TRUE);
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, FALSE, heapId, TRUE);
if (pFile != NULL)
{
if (NNS_G2dGetUnpackedPaletteData(pFile, &pPltData))
@ -96,7 +96,7 @@ void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, enum GFPalL
}
}
u32 GfGfxLoader_LoadWholePalette(NarcId narcId, s32 memberId, u32 layer, u32 baseAddr, u32 szByte, BOOL isCompressed, u32 heap_id)
u32 GfGfxLoader_LoadWholePalette(NarcId narcId, s32 memberId, u32 layer, u32 baseAddr, u32 szByte, BOOL isCompressed, HeapID heapId)
{
static void (*const load_funcs[])(void *, u32, u32) = {
GX_LoadOBJ,
@ -104,7 +104,7 @@ u32 GfGfxLoader_LoadWholePalette(NarcId narcId, s32 memberId, u32 layer, u32 bas
};
NNSG2dCharacterData* pCharData;
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, TRUE);
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heapId, TRUE);
if (pFile != NULL)
{
if (NNS_G2dGetUnpackedCharacterData(pFile, &pCharData))
@ -119,9 +119,9 @@ u32 GfGfxLoader_LoadWholePalette(NarcId narcId, s32 memberId, u32 layer, u32 bas
return szByte;
}
void GfGfxLoader_PartiallyLoadPalette(NarcId narcId, s32 memberId, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, u32 heap_id, NNSG2dImagePaletteProxy * pPltProxy)
void GfGfxLoader_PartiallyLoadPalette(NarcId narcId, s32 memberId, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, HeapID heapId, NNSG2dImagePaletteProxy * pPltProxy)
{
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, FALSE, heap_id, TRUE);
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, FALSE, heapId, TRUE);
NNSG2dPaletteData* pPlttData;
NNSG2dPaletteCompressInfo* pCompressInfo;
if (pFile != NULL)
@ -142,14 +142,14 @@ void GfGfxLoader_PartiallyLoadPalette(NarcId narcId, s32 memberId, NNS_G2D_VRAM_
}
}
u32 GfGfxLoader_LoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 layer, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, u32 heap_id, NNSG2dImageProxy *pImgProxy)
u32 GfGfxLoader_LoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 layer, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, HeapID heapId, NNSG2dImageProxy *pImgProxy)
{
static void (*const load_funcs[])(const NNSG2dCharacterData *, u32, NNS_G2D_VRAM_TYPE, NNSG2dImageProxy *) = {
NNS_G2dLoadImage1DMapping,
NNS_G2dLoadImage2DMapping
};
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, TRUE);
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heapId, TRUE);
u32 retSize = 0;
NNSG2dCharacterData * pSrcData;
if (pFile != NULL)
@ -166,14 +166,14 @@ u32 GfGfxLoader_LoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed,
return retSize;
}
void GfGfxLoader_SetObjCntFlagsAndLoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 layer, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, u32 heap_id, NNSG2dImageProxy * pImageProxy)
void GfGfxLoader_SetObjCntFlagsAndLoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 layer, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, HeapID heapId, NNSG2dImageProxy * pImageProxy)
{
static void (*const load_funcs[])(const NNSG2dCharacterData *, u32, NNS_G2D_VRAM_TYPE, NNSG2dImageProxy *) = {
NNS_G2dLoadImage1DMapping,
NNS_G2dLoadImage2DMapping
};
NNSG2dCharacterData * pCharacterData;
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, TRUE);
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heapId, TRUE);
if (pFile != NULL)
{
if (NNS_G2dGetUnpackedCharacterData(pFile, &pCharacterData))
@ -197,9 +197,9 @@ void GfGfxLoader_SetObjCntFlagsAndLoadImageMapping(NarcId narcId, s32 memberId,
}
}
void * GfGfxLoader_GetCharData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCharacterData ** ppCharData, u32 heap_id)
void * GfGfxLoader_GetCharData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCharacterData ** ppCharData, HeapID heapId)
{
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, FALSE);
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heapId, FALSE);
if (pFile != NULL)
{
if (!NNS_G2dGetUnpackedBGCharacterData(pFile, ppCharData))
@ -211,9 +211,9 @@ void * GfGfxLoader_GetCharData(NarcId narcId, s32 memberId, BOOL isCompressed, N
return pFile;
}
void * GfGfxLoader_GetScrnData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dScreenData ** ppScrData, u32 heap_id)
void * GfGfxLoader_GetScrnData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dScreenData ** ppScrData, HeapID heapId)
{
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, FALSE);
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heapId, FALSE);
if (pFile != NULL)
{
if (!NNS_G2dGetUnpackedScreenData(pFile, ppScrData))
@ -225,9 +225,9 @@ void * GfGfxLoader_GetScrnData(NarcId narcId, s32 memberId, BOOL isCompressed, N
return pFile;
}
void * GfGfxLoader_GetPlttData(NarcId narcId, s32 memberId, NNSG2dPaletteData ** ppPltData, u32 heap_id)
void * GfGfxLoader_GetPlttData(NarcId narcId, s32 memberId, NNSG2dPaletteData ** ppPltData, HeapID heapId)
{
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, FALSE, heap_id, FALSE);
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, FALSE, heapId, FALSE);
if (pFile != NULL)
{
if (!NNS_G2dGetUnpackedPaletteData(pFile, ppPltData))
@ -239,9 +239,9 @@ void * GfGfxLoader_GetPlttData(NarcId narcId, s32 memberId, NNSG2dPaletteData **
return pFile;
}
void * GfGfxLoader_GetCellBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCellDataBank ** ppCellBank, u32 heap_id)
void * GfGfxLoader_GetCellBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCellDataBank ** ppCellBank, HeapID heapId)
{
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, FALSE);
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heapId, FALSE);
if (pFile != NULL)
{
if (!NNS_G2dGetUnpackedCellBank(pFile, ppCellBank))
@ -253,9 +253,9 @@ void * GfGfxLoader_GetCellBank(NarcId narcId, s32 memberId, BOOL isCompressed, N
return pFile;
}
void * GfGfxLoader_GetAnimBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dAnimBankData ** ppAnimBank, u32 heap_id)
void * GfGfxLoader_GetAnimBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dAnimBankData ** ppAnimBank, HeapID heapId)
{
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, FALSE);
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heapId, FALSE);
if (pFile != NULL)
{
if (!NNS_G2dGetUnpackedAnimBank(pFile, ppAnimBank))
@ -267,24 +267,24 @@ void * GfGfxLoader_GetAnimBank(NarcId narcId, s32 memberId, BOOL isCompressed, N
return pFile;
}
void * GfGfxLoader_UncompressFromNarc(NarcId narcId, s32 memberId, u32 heap_id)
void * GfGfxLoader_UncompressFromNarc(NarcId narcId, s32 memberId, HeapID heapId)
{
return GfGfxLoader_LoadFromNarc(narcId, memberId, TRUE, heap_id, FALSE);
return GfGfxLoader_LoadFromNarc(narcId, memberId, TRUE, heapId, FALSE);
}
void * GfGfxLoader_LoadFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd)
void * GfGfxLoader_LoadFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, HeapID heapId, BOOL allocAtEnd)
{
void * dest;
void * dest2;
if (isCompressed || allocAtEnd == TRUE)
{
u32 size = GetNarcMemberSizeByIdPair(narcId, memberNo);
dest = AllocFromHeapAtEnd(heap_id, size);
dest = AllocFromHeapAtEnd(heapId, size);
}
else
{
u32 size = GetNarcMemberSizeByIdPair(narcId, memberNo);
dest = AllocFromHeap(heap_id, size);
dest = AllocFromHeap(heapId, size);
}
if (dest != NULL)
{
@ -293,11 +293,11 @@ void * GfGfxLoader_LoadFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed,
{
if (allocAtEnd == FALSE)
{
dest2 = AllocFromHeap(heap_id, (*(u32 *)dest) >> 8);
dest2 = AllocFromHeap(heapId, (*(u32 *)dest) >> 8);
}
else
{
dest2 = AllocFromHeapAtEnd(heap_id, (*(u32 *)dest) >> 8);
dest2 = AllocFromHeapAtEnd(heapId, (*(u32 *)dest) >> 8);
}
if (dest2 != NULL)
{
@ -310,18 +310,18 @@ void * GfGfxLoader_LoadFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed,
return dest;
}
void * GfGfxLoader_LoadFromNarc_GetSizeOut(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd, u32 *size_p)
void * GfGfxLoader_LoadFromNarc_GetSizeOut(NarcId narcId, s32 memberNo, BOOL isCompressed, HeapID heapId, BOOL allocAtEnd, u32 *size_p)
{
void * dest;
void * dest2;
*size_p = GetNarcMemberSizeByIdPair(narcId, memberNo);
if (isCompressed || allocAtEnd == TRUE)
{
dest = AllocFromHeapAtEnd(heap_id, *size_p);
dest = AllocFromHeapAtEnd(heapId, *size_p);
}
else
{
dest = AllocFromHeap(heap_id, *size_p);
dest = AllocFromHeap(heapId, *size_p);
}
if (dest != NULL)
{
@ -331,11 +331,11 @@ void * GfGfxLoader_LoadFromNarc_GetSizeOut(NarcId narcId, s32 memberNo, BOOL isC
*size_p = (*(u32 *)dest) >> 8;
if (allocAtEnd == FALSE)
{
dest2 = AllocFromHeap(heap_id, *size_p);
dest2 = AllocFromHeap(heapId, *size_p);
}
else
{
dest2 = AllocFromHeapAtEnd(heap_id, *size_p);
dest2 = AllocFromHeapAtEnd(heapId, *size_p);
}
if (dest2 != NULL)
{

3
arm9/src/hall_of_fame.c
View File

@ -6,6 +6,7 @@
#include "string16.h"
#include "RTC_api.h"
#include "hall_of_fame.h"
#include "heap.h"
u32 Save_HOF_sizeof(void)
{
@ -25,7 +26,7 @@ void Save_HOF_RecordParty(struct HallOfFame * hof, struct PlayerParty * party, R
{
struct HOFParty * hof_party = &hof->parties[hof->next_record];
int nmons = GetPartyCount(party);
struct String * str = String_New(POKEMON_NAME_LENGTH + 1, 0);
struct String * str = String_New(POKEMON_NAME_LENGTH + 1, HEAP_ID_DEFAULT);
MI_CpuClear16(hof_party->party, 6 * sizeof(struct HOFMon));
int i, j;
for (i = 0, j = 0; i < nmons; i++)

88
arm9/src/heap.c
View File

@ -112,7 +112,7 @@ void InitHeapSystem(const struct HeapParam *templates, u32 nTemplates, u32 total
}
}
s32 FindFirstAvailableHeapHandle()
s32 FindFirstAvailableHeapHandle(void)
{
s32 i;
@ -189,17 +189,17 @@ BOOL CreateHeapInternal(u32 parent, u32 child, u32 size, s32 alignment)
return FALSE;
}
void DestroyHeap(u32 heap_id)
void DestroyHeap(HeapID heapId)
{
GF_ASSERT(OS_GetProcMode() != OS_PROCMODE_IRQ);
NNSFndHeapHandle handle = sHeapInfo.heapHandles[sHeapInfo.heapIdxs[heap_id]];
NNSFndHeapHandle handle = sHeapInfo.heapHandles[sHeapInfo.heapIdxs[heapId]];
if (handle != NULL)
{
NNS_FndDestroyExpHeap(handle);
u8 index = sHeapInfo.heapIdxs[heap_id];
u8 index = sHeapInfo.heapIdxs[heapId];
NNSFndHeapHandle parentHeap = sHeapInfo.parentHeapHandles[index];
void *childRaw = sHeapInfo.subHeapRawPtrs[index];
if (parentHeap != NULL && childRaw != NULL)
@ -211,15 +211,15 @@ void DestroyHeap(u32 heap_id)
GF_ASSERT(0);
}
sHeapInfo.heapHandles[sHeapInfo.heapIdxs[heap_id]] = NULL;
sHeapInfo.parentHeapHandles[sHeapInfo.heapIdxs[heap_id]] = NULL;
sHeapInfo.subHeapRawPtrs[sHeapInfo.heapIdxs[heap_id]] = NULL;
sHeapInfo.heapHandles[sHeapInfo.heapIdxs[heapId]] = NULL;
sHeapInfo.parentHeapHandles[sHeapInfo.heapIdxs[heapId]] = NULL;
sHeapInfo.subHeapRawPtrs[sHeapInfo.heapIdxs[heapId]] = NULL;
sHeapInfo.heapIdxs[heap_id] = (u8)sHeapInfo.unallocatedHeapId;
sHeapInfo.heapIdxs[heapId] = (u8)sHeapInfo.unallocatedHeapId;
}
}
void *AllocFromHeapInternal(NNSFndHeapHandle heap, u32 size, s32 alignment, u32 heap_id)
void *AllocFromHeapInternal(NNSFndHeapHandle heap, u32 size, s32 alignment, HeapID heapId)
{
GF_ASSERT(heap);
@ -230,7 +230,7 @@ void *AllocFromHeapInternal(NNSFndHeapHandle heap, u32 size, s32 alignment, u32
OS_RestoreInterrupts(intr_mode);
if (ptr != NULL)
{
((MemoryBlock *)ptr)->heapId = heap_id;
((MemoryBlock *)ptr)->heapId = heapId;
ptr += sizeof(MemoryBlock);
}
@ -238,7 +238,7 @@ void *AllocFromHeapInternal(NNSFndHeapHandle heap, u32 size, s32 alignment, u32
return ptr;
}
void AllocFail()
void AllocFail(void)
{
if (sub_02031810() != 0)
{
@ -246,17 +246,17 @@ void AllocFail()
}
}
void *AllocFromHeap(u32 heap_id, u32 size)
void *AllocFromHeap(HeapID heapId, u32 size)
{
void *ptr = NULL;
if (heap_id < sHeapInfo.totalNumHeaps)
if ((u32)heapId < sHeapInfo.totalNumHeaps)
{
u8 index = sHeapInfo.heapIdxs[heap_id];
ptr = AllocFromHeapInternal(sHeapInfo.heapHandles[index], size, 4, heap_id);
u8 index = sHeapInfo.heapIdxs[heapId];
ptr = AllocFromHeapInternal(sHeapInfo.heapHandles[index], size, 4, heapId);
}
if (ptr != NULL)
{
sHeapInfo.numMemBlocks[heap_id]++;
sHeapInfo.numMemBlocks[heapId]++;
}
else
{
@ -266,18 +266,18 @@ void *AllocFromHeap(u32 heap_id, u32 size)
return ptr;
}
void *AllocFromHeapAtEnd(u32 heap_id, u32 size)
void *AllocFromHeapAtEnd(HeapID heapId, u32 size)
{
void *ptr = NULL;
if (heap_id < sHeapInfo.totalNumHeaps)
if ((u32)heapId < sHeapInfo.totalNumHeaps)
{
u8 index = sHeapInfo.heapIdxs[heap_id];
ptr = AllocFromHeapInternal(sHeapInfo.heapHandles[index], size, -4, heap_id);
u8 index = sHeapInfo.heapIdxs[heapId];
ptr = AllocFromHeapInternal(sHeapInfo.heapHandles[index], size, -4, heapId);
}
if (ptr != NULL)
{
sHeapInfo.numMemBlocks[heap_id]++;
sHeapInfo.numMemBlocks[heapId]++;
}
else
{
@ -290,21 +290,21 @@ void *AllocFromHeapAtEnd(u32 heap_id, u32 size)
void FreeToHeap(void *ptr)
{
ptr -= sizeof(MemoryBlock);
u32 heap_id = ((MemoryBlock *)ptr)->heapId;
HeapID heapId = (HeapID)(((MemoryBlock *)ptr)->heapId);
if (heap_id < sHeapInfo.totalNumHeaps)
if ((u32)heapId < sHeapInfo.totalNumHeaps)
{
u8 index = sHeapInfo.heapIdxs[heap_id];
u8 index = sHeapInfo.heapIdxs[heapId];
NNSFndHeapHandle heap = sHeapInfo.heapHandles[index];
GF_ASSERT(heap != NULL);
if (sHeapInfo.numMemBlocks[heap_id] == 0)
if (sHeapInfo.numMemBlocks[heapId] == 0)
{
GF_heap_c_dummy_return_true(heap_id);
GF_heap_c_dummy_return_true(heapId);
}
GF_ASSERT(sHeapInfo.numMemBlocks[heap_id] != 0);
GF_ASSERT(sHeapInfo.numMemBlocks[heapId] != 0);
sHeapInfo.numMemBlocks[heap_id]--;
sHeapInfo.numMemBlocks[heapId]--;
OSIntrMode intr_mode = OS_DisableInterrupts();
NNS_FndFreeToExpHeap(heap, ptr);
OS_RestoreInterrupts(intr_mode);
@ -314,34 +314,34 @@ void FreeToHeap(void *ptr)
GF_ASSERT(0);
}
void FreeToHeapExplicit(u32 heap_id, void *ptr)
void FreeToHeapExplicit(HeapID heapId, void *ptr)
{
GF_ASSERT(OS_GetProcMode() != OS_PROCMODE_IRQ);
if (heap_id < sHeapInfo.totalNumHeaps)
if ((u32)heapId < sHeapInfo.totalNumHeaps)
{
u8 index = sHeapInfo.heapIdxs[heap_id];
u8 index = sHeapInfo.heapIdxs[heapId];
NNSFndHeapHandle heap = sHeapInfo.heapHandles[index];
GF_ASSERT( heap != NULL );
ptr -= sizeof(MemoryBlock);
GF_ASSERT(((MemoryBlock *)ptr)->heapId == heap_id);
GF_ASSERT(((MemoryBlock *)ptr)->heapId == heapId);
NNS_FndFreeToExpHeap(heap, ptr);
GF_ASSERT(sHeapInfo.numMemBlocks[heap_id] != 0);
GF_ASSERT(sHeapInfo.numMemBlocks[heapId] != 0);
sHeapInfo.numMemBlocks[heap_id]--;
sHeapInfo.numMemBlocks[heapId]--;
return;
}
GF_ASSERT(0);
}
u32 GF_ExpHeap_FndGetTotalFreeSize(u32 heap_id)
u32 GF_ExpHeap_FndGetTotalFreeSize(HeapID heapId)
{
if (heap_id < sHeapInfo.totalNumHeaps)
if ((u32)heapId < sHeapInfo.totalNumHeaps)
{
u8 index = sHeapInfo.heapIdxs[heap_id];
u8 index = sHeapInfo.heapIdxs[heapId];
return NNS_FndGetTotalFreeSizeForExpHeap(sHeapInfo.heapHandles[index]);
}
@ -349,12 +349,12 @@ u32 GF_ExpHeap_FndGetTotalFreeSize(u32 heap_id)
return 0;
}
void GF_ExpHeap_FndInitAllocator(NNSFndAllocator * pAllocator, u32 heap_id, int alignment)
void GF_ExpHeap_FndInitAllocator(NNSFndAllocator * pAllocator, HeapID heapId, int alignment)
{
if (heap_id < sHeapInfo.totalNumHeaps)
if ((u32)heapId < sHeapInfo.totalNumHeaps)
{
u8 index = sHeapInfo.heapIdxs[heap_id];
u8 index = sHeapInfo.heapIdxs[heapId];
NNS_FndInitAllocatorForExpHeap(pAllocator, sHeapInfo.heapHandles[index], alignment);
return;
}
@ -370,9 +370,9 @@ void ReallocFromHeap(void *ptr, u32 newSize)
ptr -= sizeof(MemoryBlock);
if (NNS_FndGetSizeForMBlockExpHeap(ptr) >= newSize)
{
u32 heap_id = ((MemoryBlock *)ptr)->heapId;
u32 heapId = ((MemoryBlock *)ptr)->heapId; //purposefully left as u32, using HeapID casues fuckery with regalloc
u8 index = sHeapInfo.heapIdxs[heap_id];
u8 index = sHeapInfo.heapIdxs[heapId];
NNS_FndResizeForMBlockExpHeap(sHeapInfo.heapHandles[index], ptr, newSize);
return;
@ -380,8 +380,8 @@ void ReallocFromHeap(void *ptr, u32 newSize)
GF_ASSERT(0);
}
BOOL GF_heap_c_dummy_return_true(u32 heap_id)
BOOL GF_heap_c_dummy_return_true(HeapID heapId)
{
#pragma unused(heap_id)
#pragma unused(heapId)
return TRUE;
}

26
arm9/src/itemtool.c
View File

@ -742,43 +742,43 @@ int sub_0206E70C()
return 0;
}
void * LoadItemDataOrGfx(u16 a0, u16 a1, u32 heap_id)
void * LoadItemDataOrGfx(u16 a0, u16 a1, HeapID heapId)
{
if (a0 > NELEMS(sItemIndexMappings) - 1)
a0 = 0;
switch (a1)
{
case 0:
return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_DATA, sItemIndexMappings[a0][0], heap_id);
return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_DATA, sItemIndexMappings[a0][0], heapId);
case 1:
return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_ICON, sItemIndexMappings[a0][1], heap_id);
return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_ICON, sItemIndexMappings[a0][1], heapId);
case 2:
return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_ICON, sItemIndexMappings[a0][2], heap_id);
return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_ICON, sItemIndexMappings[a0][2], heapId);
default:
return NULL;
}
}
void GetItemNameIntoString(struct String * dest, u16 item_id, u32 heap_no)
void GetItemNameIntoString(struct String * dest, u16 item_id, HeapID heapId)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0344_bin, heap_no);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0344_bin, heapId);
ReadMsgDataIntoString(msgData, item_id, dest);
DestroyMsgData(msgData);
}
void GetItemDescIntoString(struct String * dest, u16 item_id, u32 heap_no)
void GetItemDescIntoString(struct String * dest, u16 item_id, HeapID heapId)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0343_bin, heap_no);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0343_bin, heapId);
ReadMsgDataIntoString(msgData, item_id, dest);
DestroyMsgData(msgData);
}
u32 GetItemAttr(u16 item, u32 attr, u32 heap_id)
u32 GetItemAttr(u16 item, u32 attr, HeapID heapId)
{
u32 ret;
struct ItemData * itemData = (struct ItemData *)LoadItemDataOrGfx(item, 0, heap_id);
struct ItemData * itemData = (struct ItemData *)LoadItemDataOrGfx(item, 0, heapId);
ret = GetItemAttr_PreloadedItemData(itemData, attr);
FreeToHeapExplicit(heap_id, itemData);
FreeToHeapExplicit(heapId, itemData);
return ret;
}
@ -1015,9 +1015,9 @@ u8 ItemIsBitter(u16 item_id)
item_id == ITEM_REVIVAL_HERB;
}
struct ItemData * LoadAllItemData(u32 heap_id)
struct ItemData * LoadAllItemData(HeapID heapId)
{
return AllocAndReadFromNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_DATA, 0, heap_id, 0, sizeof(struct ItemData) * GetItemIndexMapping(ITEM_SECRETPOTION, 0));
return AllocAndReadFromNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_DATA, 0, heapId, 0, sizeof(struct ItemData) * GetItemIndexMapping(ITEM_SECRETPOTION, 0));
}
struct ItemData * GetItemDataPtrFromArray(struct ItemData * a0, u16 item_id)

10
arm9/src/list_menu.c
View File

@ -10,18 +10,18 @@ void ListMenuDrawCursor(struct ListMenu * list);
BOOL ListMenuChangeSelection(struct ListMenu * list, u8 updateCursorAndCallCallback, u8 count, u8 movingDown);
void ListMenuCallSelectionChangedCallback(struct ListMenu * list, u8 onInit);
struct ListMenu * ListMenuInit(const struct ListMenuTemplate * template, u16 cursorPos, u16 itemsAbove, u32 heap_id)
struct ListMenu * ListMenuInit(const struct ListMenuTemplate * template, u16 cursorPos, u16 itemsAbove, u8 heapId)
{
struct ListMenu * list = AllocFromHeap(heap_id, sizeof(struct ListMenu));
struct ListMenu * list = AllocFromHeap((HeapID)heapId, sizeof(struct ListMenu));
list->template = *template;
list->cursor = ListMenuCursorNew(heap_id);
list->cursor = ListMenuCursorNew((HeapID)heapId);
list->cursorPos = cursorPos;
list->itemsAbove = itemsAbove;
list->unk_30 = 0;
list->unk_31 = 0;
list->taskId = 0xFF;
list->unk_33 = 0;
list->heap_id = (u8)heap_id;
list->heapId = heapId;
list->cursorPal = list->template.cursorPal;
list->fillValue = list->template.fillValue;
list->cursorShadowPal = list->template.cursorShadowPal;
@ -112,7 +112,7 @@ void DestroyListMenu(struct ListMenu * list, u16 * cursorPos, u16 * itemsAbove)
if (itemsAbove != NULL)
*itemsAbove = list->itemsAbove;
DestroyListMenuCursorObj(list->cursor);
FreeToHeapExplicit(list->heap_id, list);
FreeToHeapExplicit((HeapID)list->heapId, list);
}
void RedrawListMenu(struct ListMenu * list)

24
arm9/src/list_menu_items.c
View File

@ -5,10 +5,10 @@
void ListMenuItems_DestroyMenuStrings(struct ListMenuItem * items);
struct ListMenuItem * ListMenuItems_New(u32 count, u32 heap_id)
struct ListMenuItem * ListMenuItems_New(u32 count, HeapID heapId)
{
s32 i;
struct ListMenuItem * ret = AllocFromHeap(heap_id, (count + 1) * sizeof(struct ListMenuItem));
struct ListMenuItem * ret = AllocFromHeap(heapId, (count + 1) * sizeof(struct ListMenuItem));
if (ret != NULL)
{
for (i = 0; i < count; i++)
@ -17,7 +17,7 @@ struct ListMenuItem * ListMenuItems_New(u32 count, u32 heap_id)
ret[i].value = 0;
}
ret[i].text = (struct String *)-1u;
ret[i].value = (s32)heap_id;
ret[i].value = (s32)heapId;
}
return ret;
}
@ -30,8 +30,8 @@ void ListMenuItems_Delete(struct ListMenuItem * items)
void ListMenuItems_AppendFromMsgData(struct ListMenuItem * items, struct MsgData * msgData, u32 msgNo, s32 value)
{
u32 heap_id;
struct ListMenuItem * newItem = ListMenuItems_SeekEnd(items, &heap_id);
HeapID heapId;
struct ListMenuItem * newItem = ListMenuItems_SeekEnd(items, &heapId);
if (newItem != NULL)
{
newItem->text = NewString_ReadMsgData(msgData, msgNo);
@ -41,19 +41,19 @@ void ListMenuItems_AppendFromMsgData(struct ListMenuItem * items, struct MsgData
void ListMenuItems_AddItem(struct ListMenuItem * items, struct String * str, s32 value)
{
u32 heap_id;
struct ListMenuItem * newItem = ListMenuItems_SeekEnd(items, &heap_id);
HeapID heapId;
struct ListMenuItem * newItem = ListMenuItems_SeekEnd(items, &heapId);
if (newItem != NULL)
{
newItem->text = StringDup(str, heap_id);
newItem->text = StringDup(str, heapId);
newItem->value = value;
}
}
void ListMenuItems_CopyItem(struct ListMenuItem * items, struct ListMenuItem * src)
{
u32 heap_id;
struct ListMenuItem * newItem = ListMenuItems_SeekEnd(items, &heap_id);
HeapID heapId;
struct ListMenuItem * newItem = ListMenuItems_SeekEnd(items, &heapId);
if (newItem != NULL)
{
newItem->text = src->text;
@ -61,7 +61,7 @@ void ListMenuItems_CopyItem(struct ListMenuItem * items, struct ListMenuItem * s
}
}
struct ListMenuItem * ListMenuItems_SeekEnd(struct ListMenuItem * items, u32 * heap_id_p)
struct ListMenuItem * ListMenuItems_SeekEnd(struct ListMenuItem * items, HeapID *heapIdPtr)
{
struct ListMenuItem * ret;
for (; items->text != NULL; items++)
@ -75,7 +75,7 @@ struct ListMenuItem * ListMenuItems_SeekEnd(struct ListMenuItem * items, u32 * h
ret = items;
for (; items->text != (struct String *)-1u; items++)
;
*heap_id_p = (u32)items->value;
*heapIdPtr = (HeapID)items->value;
return ret;
}

8
arm9/src/mail.c
View File

@ -34,9 +34,9 @@ BOOL Mail_TypeIsValid(struct Mail * mail)
return mail->mail_type <= 11;
}
struct Mail * Mail_New(u32 heap_id)
struct Mail * Mail_New(HeapID heapId)
{
struct Mail * ret = (struct Mail *)AllocFromHeapAtEnd(heap_id, sizeof(struct Mail));
struct Mail * ret = (struct Mail *)AllocFromHeapAtEnd(heapId, sizeof(struct Mail));
Mail_Init(ret);
return ret;
}
@ -207,11 +207,11 @@ s32 Mailbox_CountMessages(struct Mail * mail, BOOL r1)
}
}
struct Mail * Mailbox_AllocAndFetchMailI(struct Mail * mail, BOOL r1, s32 idx, u32 heap_id)
struct Mail * Mailbox_AllocAndFetchMailI(struct Mail * mail, BOOL r1, s32 idx, HeapID heapId)
{
struct Mail * ret;
mail = Mailbox_GetPtrToSlotI(mail, r1, idx);
ret = Mail_New(heap_id);
ret = Mail_New(heapId);
if (mail != NULL)
Mail_Copy(mail, ret);
return ret;

14
arm9/src/mail_message.c
View File

@ -74,10 +74,10 @@ void MailMsg_Init_FromTemplate(struct MailMessage * mailMsg, u32 a1)
}
}
struct String * MailMsg_GetExpandedString(struct MailMessage * mailMsg, u32 heap_id)
struct String * MailMsg_GetExpandedString(struct MailMessage * mailMsg, HeapID heapId)
{
s32 i;
MessageFormat * messageFormat = MessageFormat_New(heap_id);
MessageFormat * messageFormat = MessageFormat_New(heapId);
struct MsgData * msgData;
struct String * ret;
for (i = 0; i < MAILMSG_FIELDS_MAX; i++)
@ -86,16 +86,16 @@ struct String * MailMsg_GetExpandedString(struct MailMessage * mailMsg, u32 heap
break;
BufferECWord(messageFormat, (u32)i, mailMsg->fields[i]);
}
msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, sMessageBanks[mailMsg->msg_bank], heap_id);
ret = ReadMsgData_ExpandPlaceholders(messageFormat, msgData, mailMsg->msg_no, heap_id);
msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, sMessageBanks[mailMsg->msg_bank], heapId);
ret = ReadMsgData_ExpandPlaceholders(messageFormat, msgData, mailMsg->msg_no, heapId);
DestroyMsgData(msgData);
MessageFormat_Delete(messageFormat);
return ret;
}
struct String * MailMsg_GetRawString(struct MailMessage * mailMsg, u32 heap_id)
struct String * MailMsg_GetRawString(struct MailMessage * mailMsg, HeapID heapId)
{
return ReadMsgData_NewNarc_NewString(NARC_MSGDATA_MSG, sMessageBanks[mailMsg->msg_bank], mailMsg->msg_no, heap_id);
return ReadMsgData_NewNarc_NewString(NARC_MSGDATA_MSG, sMessageBanks[mailMsg->msg_bank], mailMsg->msg_no, heapId);
}
BOOL MailMsg_IsInit(struct MailMessage * mailMsg)
@ -122,7 +122,7 @@ u32 MailMsg_NumFields(u16 bank, u16 num)
u32 count;
GF_ASSERT(bank < NELEMS(sMessageBanks));
GF_ASSERT(num < MailMsg_NumMsgsInBank(bank));
str = ReadMsgData_NewNarc_NewString(NARC_MSGDATA_MSG, sMessageBanks[bank], num, 0);
str = ReadMsgData_NewNarc_NewString(NARC_MSGDATA_MSG, sMessageBanks[bank], num, HEAP_ID_DEFAULT);
cstr = String_c_str(str);
count = 0;
while (*cstr != EOS)

21
arm9/src/main.c
View File

@ -20,6 +20,7 @@
#include "overlay_52.h"
#include "font.h"
#include "brightness.h"
#include "heap.h"
FS_EXTERN_OVERLAY(OVERLAY_52);
FS_EXTERN_OVERLAY(OVERLAY_63);
@ -61,18 +62,18 @@ void NitroMain(void)
GF_InitRTCWork();
sub_02000DF4();
sub_02002C14();
sub_02002C50(0, 3);
sub_02002C50(1, 3);
sub_02002C50(3, 3);
sub_02002C50(0, HEAP_ID_MAIN);
sub_02002C50(1, HEAP_ID_MAIN);
sub_02002C50(3, HEAP_ID_MAIN);
UNK_02016FA8.unk10 = -1;
UNK_02016FA8.save = SaveData_New();
InitSoundData(Save_Chatot_Get(UNK_02016FA8.save), Save_PlayerData_GetOptionsAddr(UNK_02016FA8.save));
Init_Timer3();
if (sub_020337E8(3) == 3)
ShowWFCUserInfoWarning(3, 0);
ShowWFCUserInfoWarning(HEAP_ID_MAIN, 0);
if (sub_020227FC(UNK_02016FA8.save) == 0)
{
ShowSaveDataReadError(0);
ShowSaveDataReadError(HEAP_ID_DEFAULT);
}
else
{
@ -152,7 +153,7 @@ void Main_RunOverlayManager(void)
if (UNK_02016FA8.queuedMainOverlayId != SDK_OVERLAY_INVALID_ID)
HandleLoadOverlay(UNK_02016FA8.queuedMainOverlayId, 0);
UNK_02016FA8.mainOverlayId = UNK_02016FA8.queuedMainOverlayId;
UNK_02016FA8.overlayManager = OverlayManager_New(UNK_02016FA8.template, &UNK_02016FA8.unk10, 0);
UNK_02016FA8.overlayManager = OverlayManager_New(UNK_02016FA8.template, &UNK_02016FA8.unk10, HEAP_ID_DEFAULT);
UNK_02016FA8.queuedMainOverlayId = SDK_OVERLAY_INVALID_ID;
UNK_02016FA8.template = NULL;
}
@ -230,18 +231,18 @@ void sub_02000F4C(u32 arg0, u32 arg1)
{
if (arg1 == 3)
{
ShowCommunicationError(0, 3, 0);
ShowCommunicationError(HEAP_ID_DEFAULT, 3, 0);
}
else if (arg0 == 0)
{
ShowCommunicationError(0, 2, 0);
ShowCommunicationError(HEAP_ID_DEFAULT, 2, 0);
}
else
{
ShowCommunicationError(0, 0, 0);
ShowCommunicationError(HEAP_ID_DEFAULT, 0, 0);
}
sub_02032DAC();
while (1)
while (TRUE)
{
HandleDSLidAction();
ReadKeypadAndTocuhpad();

10
arm9/src/map_matrix.c
View File

@ -25,7 +25,7 @@ static void MapMatrix_MapMatrixData_Load(
}
void *buffer =
AllocAtEndAndReadWholeNarcMemberByIdPair(NARC_FIELDDATA_MAPMATRIX_MAP_MATRIX, file_id, 11);
AllocAtEndAndReadWholeNarcMemberByIdPair(NARC_FIELDDATA_MAPMATRIX_MAP_MATRIX, file_id, HEAP_ID_FIELD);
u8 *cursor = (u8 *)buffer;
map_matrix->width = *(cursor++);
@ -66,7 +66,7 @@ static void MapMatrix_MapMatrixData_Load(
struct MapMatrix *MapMatrix_New(void)
{
struct MapMatrix *map_matrix = AllocFromHeap(11, sizeof(struct MapMatrix));
struct MapMatrix *map_matrix = AllocFromHeap(HEAP_ID_FIELD, sizeof(struct MapMatrix));
map_matrix->width = 0;
map_matrix->height = 0;
@ -147,11 +147,11 @@ u32 MapMatrix_GetMapAltitude(
return map_matrix->data.altitudes[y * matrix_width + x];
}
struct MapData *MapMatrix_MapData_New(u32 heap_id)
struct MapData *MapMatrix_MapData_New(HeapID heapId)
{
struct MapData *map_data = AllocFromHeap(heap_id, sizeof(struct MapData));
struct MapData *map_data = AllocFromHeap(heapId, sizeof(struct MapData));
void *buffer =
AllocAtEndAndReadWholeNarcMemberByIdPair(NARC_FIELDDATA_MAPMATRIX_MAP_MATRIX, 0, heap_id);
AllocAtEndAndReadWholeNarcMemberByIdPair(NARC_FIELDDATA_MAPMATRIX_MAP_MATRIX, 0, heapId);
u8 *cursor = (u8 *)buffer;
cursor += 4;

129
arm9/src/message_format.c
View File

@ -1,5 +1,6 @@
#include "global.h"
#include "filesystem.h"
#include "gf_gfx_loader.h"
#include "graphic/font.naix"
#include "heap.h"
#include "message_format.h"
@ -15,14 +16,12 @@
#include "string_control_code.h"
#include "text.h"
#include "trainer_data.h"
#include "unk_020139D8.h"
#include "unk_02015CC0.h"
#include "unk_02024E64.h"
#include "unk_020286F8.h"
extern u32 GetCityNamesMsgdataIdByCountry(u32);
extern void GetECWordIntoStringByIndex(u32 a0, struct String * a1);
extern void * GfGfxLoader_GetCharData(NarcId, s32, s32, struct UnkStruct_0200B870_sub **, u32);
extern void * GfGfxLoader_LoadFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd);
const u16 UNK_020ECE6C[][2] = {
{ 0x0140, 0x0008 },
@ -41,31 +40,31 @@ const u16 UNK_020ECE64[] = {
0
};
MessageFormat *MessageFormat_New(u32 heap_id)
MessageFormat *MessageFormat_New(HeapID heapId)
{
return MessageFormat_New_Custom(8, 32, heap_id);
return MessageFormat_New_Custom(8, 32, heapId);
}
MessageFormat *MessageFormat_New_Custom(u32 nstr, u32 strlen, u32 heap_id)
MessageFormat *MessageFormat_New_Custom(u32 nstr, u32 strlen, HeapID heapId)
{
GF_ASSERT(nstr != 0);
GF_ASSERT(strlen != 0);
MessageFormat *messageFormat = AllocFromHeapAtEnd(heap_id, sizeof(MessageFormat));
MessageFormat *messageFormat = AllocFromHeapAtEnd(heapId, sizeof(MessageFormat));
if (messageFormat != NULL)
{
messageFormat->count = nstr;
messageFormat->heap_id = heap_id;
messageFormat->buffer = String_New(strlen, heap_id);
messageFormat->heapId = heapId;
messageFormat->buffer = String_New(strlen, heapId);
if (messageFormat->buffer != NULL)
{
messageFormat->fields = AllocFromHeapAtEnd(heap_id, nstr * sizeof(MessageFormatFields));
messageFormat->fields = AllocFromHeapAtEnd(heapId, nstr * sizeof(MessageFormatFields));
if (messageFormat->fields != NULL)
{
s32 i;
for (i = 0; i < nstr; i++)
{
MessageFormat_InitFields(&messageFormat->fields[i]);
messageFormat->fields[i].msg = String_New(strlen, heap_id);
messageFormat->fields[i].msg = String_New(strlen, heapId);
if (messageFormat->fields[i].msg == NULL)
break;
}
@ -138,7 +137,7 @@ void BufferRivalsName(MessageFormat *messageFormat, u32 idx, struct SaveData * s
void BufferFriendsName(MessageFormat *messageFormat, u32 idx, struct SaveData * save)
{
PlayerProfile *profile = Save_PlayerData_GetProfileAddr(save);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0497_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0497_bin, messageFormat->heapId);
if (PlayerProfile_GetTrainerGender(profile) == PLAYER_GENDER_MALE)
{
ReadMsgDataIntoString(msgData, narc_0497_00001, messageFormat->buffer); //Dawn
@ -153,7 +152,7 @@ void BufferFriendsName(MessageFormat *messageFormat, u32 idx, struct SaveData *
void BufferBoxMonSpeciesName(MessageFormat *messageFormat, u32 idx, struct BoxPokemon * mon)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0362_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0362_bin, messageFormat->heapId);
ReadMsgDataIntoString(msgData, GetBoxMonData(mon, MON_DATA_SPECIES, NULL), messageFormat->buffer);
SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL);
DestroyMsgData(msgData);
@ -166,7 +165,7 @@ void BufferBoxMonSpeciesNameWithArticle(MessageFormat *messageFormat, u32 idx, s
void BufferSpeciesNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 species)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0363_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0363_bin, messageFormat->heapId);
ReadMsgDataIntoString(msgData, species, messageFormat->buffer);
SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL);
DestroyMsgData(msgData);
@ -192,7 +191,7 @@ void BufferIntegerAsString(MessageFormat *messageFormat, u32 idx, s32 num, u32 n
void BufferMoveName(MessageFormat *messageFormat, u32 idx, u32 move)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0588_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0588_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, move, messageFormat->buffer);
@ -203,7 +202,7 @@ void BufferMoveName(MessageFormat *messageFormat, u32 idx, u32 move)
void BufferRibbonNameOrDesc(MessageFormat *messageFormat, u32 idx, u32 ribbon)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0484_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0484_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, ribbon, messageFormat->buffer);
@ -214,7 +213,7 @@ void BufferRibbonNameOrDesc(MessageFormat *messageFormat, u32 idx, u32 ribbon)
void BufferAbilityName(MessageFormat *messageFormat, u32 idx, u32 ability)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0552_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0552_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, ability, messageFormat->buffer);
@ -225,7 +224,7 @@ void BufferAbilityName(MessageFormat *messageFormat, u32 idx, u32 ability)
void BufferNatureName(MessageFormat *messageFormat, u32 idx, u32 nature)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0190_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0190_bin, messageFormat->heapId);
ReadMsgDataIntoString(msgData, nature, messageFormat->buffer);
SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL);
DestroyMsgData(msgData);
@ -233,7 +232,7 @@ void BufferNatureName(MessageFormat *messageFormat, u32 idx, u32 nature)
void BufferItemName(MessageFormat *messageFormat, u32 idx, u32 item)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0344_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0344_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, item, messageFormat->buffer);
@ -244,7 +243,7 @@ void BufferItemName(MessageFormat *messageFormat, u32 idx, u32 item)
void BufferItemNameWithIndefArticle(MessageFormat *messageFormat, u32 idx, u32 item)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0346_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0346_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, item, messageFormat->buffer);
@ -255,7 +254,7 @@ void BufferItemNameWithIndefArticle(MessageFormat *messageFormat, u32 idx, u32 i
void BufferItemNamePlural(MessageFormat *messageFormat, u32 idx, u32 item)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0347_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0347_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, item, messageFormat->buffer);
@ -266,7 +265,7 @@ void BufferItemNamePlural(MessageFormat *messageFormat, u32 idx, u32 item)
void BufferPocketName(MessageFormat *messageFormat, u32 idx, u32 pocket)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0349_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0349_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, pocket, messageFormat->buffer);
@ -277,7 +276,7 @@ void BufferPocketName(MessageFormat *messageFormat, u32 idx, u32 pocket)
void BufferTypeName(MessageFormat *messageFormat, u32 idx, u32 type)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0565_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0565_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, type, messageFormat->buffer);
@ -288,7 +287,7 @@ void BufferTypeName(MessageFormat *messageFormat, u32 idx, u32 type)
void BufferStatName(MessageFormat *messageFormat, u32 idx, u32 stat)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0495_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0495_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, stat, messageFormat->buffer);
@ -299,7 +298,7 @@ void BufferStatName(MessageFormat *messageFormat, u32 idx, u32 stat)
void BufferStatusName(MessageFormat *messageFormat, u32 idx, u32 status)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0205_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0205_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, status, messageFormat->buffer);
@ -310,7 +309,7 @@ void BufferStatusName(MessageFormat *messageFormat, u32 idx, u32 status)
void BufferFlavorDislikeText(MessageFormat *messageFormat, u32 idx, u32 flavor)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0548_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0548_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, flavor, messageFormat->buffer);
@ -321,7 +320,7 @@ void BufferFlavorDislikeText(MessageFormat *messageFormat, u32 idx, u32 flavor)
void BufferLandmarkName(MessageFormat *messageFormat, u32 idx, u32 landmark)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0382_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0382_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, landmark, messageFormat->buffer);
@ -332,7 +331,7 @@ void BufferLandmarkName(MessageFormat *messageFormat, u32 idx, u32 landmark)
void BufferPoketchAppName(MessageFormat *messageFormat, u32 idx, u32 app)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0406_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0406_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, app, messageFormat->buffer);
@ -343,7 +342,7 @@ void BufferPoketchAppName(MessageFormat *messageFormat, u32 idx, u32 app)
void BufferTrainerClassName(MessageFormat *messageFormat, u32 idx, u32 trclass)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0560_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0560_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, trclass, messageFormat->buffer);
@ -354,7 +353,7 @@ void BufferTrainerClassName(MessageFormat *messageFormat, u32 idx, u32 trclass)
void BufferTrainerClassNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 trclass)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0561_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0561_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, trclass, messageFormat->buffer);
@ -365,7 +364,7 @@ void BufferTrainerClassNameWithArticle(MessageFormat *messageFormat, u32 idx, u3
void BufferTrainerClassNameFromDataStruct(MessageFormat *messageFormat, u32 idx, struct TrainerDataLoaded * tr)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0560_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0560_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, tr->data.trainerClass, messageFormat->buffer);
@ -376,7 +375,7 @@ void BufferTrainerClassNameFromDataStruct(MessageFormat *messageFormat, u32 idx,
void BufferTrainerName(MessageFormat *messageFormat, u32 idx, u32 msgno)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0559_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0559_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, msgno, messageFormat->buffer);
@ -393,7 +392,7 @@ void BufferTrainerNameFromDataStruct(MessageFormat *messageFormat, u32 idx, stru
void BufferUndergroundItemName(MessageFormat *messageFormat, u32 idx, u32 item)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0569_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0569_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, item, messageFormat->buffer);
@ -404,7 +403,7 @@ void BufferUndergroundItemName(MessageFormat *messageFormat, u32 idx, u32 item)
void BufferUndergroundItemNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 item)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0570_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0570_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, item, messageFormat->buffer);
@ -415,7 +414,7 @@ void BufferUndergroundItemNameWithArticle(MessageFormat *messageFormat, u32 idx,
void BufferUndergroundTrapName(MessageFormat *messageFormat, u32 idx, u32 trap)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0571_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0571_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, trap, messageFormat->buffer);
@ -426,7 +425,7 @@ void BufferUndergroundTrapName(MessageFormat *messageFormat, u32 idx, u32 trap)
void BufferUndergroundTrapNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 trap)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0572_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0572_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, trap, messageFormat->buffer);
@ -437,7 +436,7 @@ void BufferUndergroundTrapNameWithArticle(MessageFormat *messageFormat, u32 idx,
void BufferContestJudgeName(MessageFormat *messageFormat, u32 idx, u32 judge)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0194_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0194_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, judge, messageFormat->buffer);
@ -448,7 +447,7 @@ void BufferContestJudgeName(MessageFormat *messageFormat, u32 idx, u32 judge)
void BufferContestMessage(MessageFormat *messageFormat, u32 idx, u32 msg)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0191_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0191_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, msg, messageFormat->buffer);
@ -459,7 +458,7 @@ void BufferContestMessage(MessageFormat *messageFormat, u32 idx, u32 msg)
void BufferContestMessage2(MessageFormat *messageFormat, u32 idx, u32 msg)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0191_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0191_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, msg, messageFormat->buffer);
@ -470,7 +469,7 @@ void BufferContestMessage2(MessageFormat *messageFormat, u32 idx, u32 msg)
void BufferInterviewQuestion(MessageFormat *messageFormat, u32 idx, u32 question)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0574_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0574_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, question, messageFormat->buffer);
@ -481,7 +480,7 @@ void BufferInterviewQuestion(MessageFormat *messageFormat, u32 idx, u32 question
void BufferInterviewAnswer(MessageFormat *messageFormat, u32 idx, u32 answer)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0573_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0573_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, answer, messageFormat->buffer);
@ -492,7 +491,7 @@ void BufferInterviewAnswer(MessageFormat *messageFormat, u32 idx, u32 answer)
void BufferDecorationName(MessageFormat *messageFormat, u32 idx, u32 decor)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0567_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0567_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, decor, messageFormat->buffer);
@ -503,7 +502,7 @@ void BufferDecorationName(MessageFormat *messageFormat, u32 idx, u32 decor)
void BufferDecorationNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 decor)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0568_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0568_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, decor, messageFormat->buffer);
@ -514,7 +513,7 @@ void BufferDecorationNameWithArticle(MessageFormat *messageFormat, u32 idx, u32
void BufferGenderSymbol(MessageFormat *messageFormat, u32 idx, u32 gender)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0199_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0199_bin, messageFormat->heapId);
switch (gender)
{
case 0:
@ -539,7 +538,7 @@ void BufferBoxName(MessageFormat *messageFormat, u32 idx, struct PCStorage * pc,
void BufferGymName(MessageFormat *messageFormat, u32 idx, u32 gym)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0331_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0331_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, gym, messageFormat->buffer);
@ -550,7 +549,7 @@ void BufferGymName(MessageFormat *messageFormat, u32 idx, u32 gym)
void BufferTimeOfDayName(MessageFormat *messageFormat, u32 idx, u32 time)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0550_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0550_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, time, messageFormat->buffer);
@ -561,7 +560,7 @@ void BufferTimeOfDayName(MessageFormat *messageFormat, u32 idx, u32 time)
void BufferCountryName(MessageFormat *messageFormat, u32 idx, u32 country)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0612_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0612_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, country, messageFormat->buffer);
@ -575,7 +574,7 @@ void BufferCityName(MessageFormat *messageFormat, u32 idx, u32 countryId, u32 ci
u32 msgBank = GetCityNamesMsgdataIdByCountry(countryId);
if (msgBank != 0 && cityId != 0)
{
struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, (s32)msgBank, messageFormat->heap_id);
struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, (s32)msgBank, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, cityId, messageFormat->buffer);
@ -593,7 +592,7 @@ void BufferECWord(MessageFormat *messageFormat, u32 idx, u32 ecWordIdx)
void BufferSealName(MessageFormat *messageFormat, u32 idx, u32 seal)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0010_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0010_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, seal, messageFormat->buffer);
@ -604,7 +603,7 @@ void BufferSealName(MessageFormat *messageFormat, u32 idx, u32 seal)
void BufferSealNamePlural(MessageFormat *messageFormat, u32 idx, u32 seal)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0011_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0011_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, seal, messageFormat->buffer);
@ -617,7 +616,7 @@ void BufferLocationName(MessageFormat *messageFormat, u32 idx, u16 location)
{
u32 r6 = (u32)sub_02015CC0(location);
u32 r4 = (u32)sub_02015CE0(location);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, UNK_020ECE64[r6], messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, UNK_020ECE64[r6], messageFormat->heapId);
if (msgData != NULL)
{
if (r4 < MsgDataGetCount(msgData))
@ -630,7 +629,7 @@ void BufferLocationName(MessageFormat *messageFormat, u32 idx, u16 location)
// Location is invalid.
// Fallback: Mystery Zone
DestroyMsgData(msgData);
msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0382_bin, messageFormat->heap_id);
msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0382_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, narc_0382_00000, messageFormat->buffer); // Mystery Zone
@ -642,7 +641,7 @@ void BufferLocationName(MessageFormat *messageFormat, u32 idx, u16 location)
void BufferPoffinName(MessageFormat *messageFormat, u32 idx, u32 poffin)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0414_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0414_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, poffin, messageFormat->buffer);
@ -653,7 +652,7 @@ void BufferPoffinName(MessageFormat *messageFormat, u32 idx, u32 poffin)
void BufferFashionName(MessageFormat *messageFormat, u32 idx, u32 fashion)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0338_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0338_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, fashion, messageFormat->buffer);
@ -664,7 +663,7 @@ void BufferFashionName(MessageFormat *messageFormat, u32 idx, u32 fashion)
void BufferFashionNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 fashion)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0339_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0339_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, fashion, messageFormat->buffer);
@ -675,7 +674,7 @@ void BufferFashionNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 fas
void BufferContestBackgroundName(MessageFormat *messageFormat, u32 idx, u32 bg)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0340_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0340_bin, messageFormat->heapId);
if (msgData != NULL)
{
ReadMsgDataIntoString(msgData, bg, messageFormat->buffer);
@ -689,7 +688,7 @@ void BufferGroupName(MessageFormat *messageFormat, struct SaveData * save, u32 r
void * r6 = sub_0202881C(save);
u8 sp10 = sub_020287F8(r6, r5);
u8 r7 = sub_02028804(r6, r5);
struct String * r4 = String_New(64, 4);
struct String * r4 = String_New(64, HEAP_ID_4);
CopyU16ArrayToString(r4, sub_020287A8(r6, r5, sp28));
BufferString(messageFormat, idx, r4, sp10, 1, r7);
String_Delete(r4);
@ -697,7 +696,7 @@ void BufferGroupName(MessageFormat *messageFormat, struct SaveData * save, u32 r
void BufferMonthNameAbbr(MessageFormat *messageFormat, u32 idx, u32 month)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0364_bin, messageFormat->heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0364_bin, messageFormat->heapId);
if (msgData != NULL)
{
if (month < 1 || month > 12)
@ -747,15 +746,15 @@ void MessageFormat_ResetBuffers(MessageFormat *messageFormat)
StringSetEmpty(messageFormat->fields[i].msg);
}
struct UnkStruct_0200B870 * MessagePrinter_New(u32 color1, u32 color2, u32 color3, u32 heap_id)
struct UnkStruct_0200B870 * MessagePrinter_New(u32 color1, u32 color2, u32 color3, HeapID heapId)
{
struct UnkStruct_0200B870 * sp8 = AllocFromHeap(heap_id, sizeof(struct UnkStruct_0200B870));
struct UnkStruct_0200B870 * sp8 = AllocFromHeap(heapId, sizeof(struct UnkStruct_0200B870));
if (sp8 != NULL)
{
sp8->unk_0 = GfGfxLoader_GetCharData(NARC_GRAPHIC_FONT, NARC_font_narc_0004_NCGR_lz, 1, &sp8->unk_4, heap_id);
sp8->unk_0 = GfGfxLoader_GetCharData(NARC_GRAPHIC_FONT, NARC_font_narc_0004_NCGR_lz, 1, &sp8->unk_4, heapId);
int i;
u8 * ptr = sp8->unk_4->unk_14;
for (i = 0; i < sp8->unk_4->unk_10; i++)
u8 * ptr = sp8->unk_4->pRawData;
for (i = 0; i < sp8->unk_4->szByte; i++)
{
switch (ptr[i])
{
@ -805,7 +804,7 @@ void MessagePrinter_Delete(struct UnkStruct_0200B870 * a0)
void sub_0200B9A8(struct UnkStruct_0200B870 * a0, int a1, struct Window *a2, int a3, int a4)
{
BlitBitmapRectToWindow(a2, a0->unk_4->unk_14 + UNK_020ECE6C[a1][0], 0, 0, UNK_020ECE6C[a1][1], 8, (u16)a3, (u16)a4, UNK_020ECE6C[a1][1], 8);
BlitBitmapRectToWindow(a2, a0->unk_4->pRawData + UNK_020ECE6C[a1][0], 0, 0, UNK_020ECE6C[a1][1], 8, (u16)a3, (u16)a4, UNK_020ECE6C[a1][1], 8);
}
void sub_0200B9EC(struct UnkStruct_0200B870 * string, u32 value, u32 n, enum PrintingMode mode, struct Window *window, int x, int y)
@ -815,7 +814,7 @@ void sub_0200B9EC(struct UnkStruct_0200B870 * string, u32 value, u32 n, enum Pri
{
if (string->data[i] >= CHAR_JP_0 && string->data[i] <= CHAR_JP_9)
{
BlitBitmapRectToWindow(window, string->unk_4->unk_14 + (string->data[i] - CHAR_JP_0) * 32, 0, 0, 8, 8, (u16)x, (u16)y, 8, 8);
BlitBitmapRectToWindow(window, string->unk_4->pRawData + (string->data[i] - CHAR_JP_0) * 32, 0, 0, 8, 8, (u16)x, (u16)y, 8, 8);
}
else
{

90
arm9/src/msgdata.c
View File

@ -6,21 +6,21 @@
#include "MI_memory.h"
#include "string16.h"
static void * LoadSingleElementFromNarc(NarcId narc_id, s32 file_id, u32 heap_id);
static void * LoadSingleElementFromNarc(NarcId narc_id, s32 file_id, HeapID heapId);
static void FreeMsgDataRawData(void * data);
static void ReadMsgData_ExistingTable_ExistingArray(struct MsgDataTable * table, u32 num, u16 * dest);
static void ReadMsgData_NewNarc_ExistingArray(NarcId narc_id, u32 group, u32 num, u32 heap_id, u16 * dest);
static void ReadMsgData_NewNarc_ExistingArray(NarcId narc_id, u32 group, u32 num, HeapID heapId, u16 * dest);
static void CopyEncryptedMessage16(u16 * dest, const u16 * src, struct MsgDataAlloc * param);
static void ReadMsgData_ExistingTable_ExistingString(struct MsgDataTable * table, u32 num, struct String * dest);
static struct String * ReadMsgData_ExistingTable_NewString(struct MsgDataTable * table, u32 num, u32 heap_id);
static void ReadMsgData_ExistingNarc_ExistingString(NARC * narc, u32 group, u32 num, u32 heap_id, struct String * dest);
static struct String * ReadMsgData_ExistingNarc_NewString(NARC * narc, u32 group, u32 num, u32 heap_id);
static struct String * ReadMsgData_ExistingTable_NewString(struct MsgDataTable * table, u32 num, HeapID heapId);
static void ReadMsgData_ExistingNarc_ExistingString(NARC * narc, u32 group, u32 num, HeapID heapId, struct String * dest);
static struct String * ReadMsgData_ExistingNarc_NewString(NARC * narc, u32 group, u32 num, HeapID heapId);
static u16 GetMsgCount_ExistingTable(struct MsgDataTable * tbl);
static u16 GetMsgCount_TableFromNarc(NarcId narc_id, s32 file_id);
static void * LoadSingleElementFromNarc(NarcId narc_id, s32 file_id, u32 heap_id)
static void * LoadSingleElementFromNarc(NarcId narc_id, s32 file_id, HeapID heapId)
{
return AllocAndReadWholeNarcMemberByIdPair(narc_id, file_id, heap_id);
return AllocAndReadWholeNarcMemberByIdPair(narc_id, file_id, heapId);
}
static void FreeMsgDataRawData(void * data)
@ -66,9 +66,9 @@ static void ReadMsgData_ExistingTable_ExistingArray(struct MsgDataTable * table,
}
}
static void ReadMsgData_NewNarc_ExistingArray(NarcId narc_id, u32 group, u32 num, u32 heap_id, u16 * dest)
static void ReadMsgData_NewNarc_ExistingArray(NarcId narc_id, u32 group, u32 num, HeapID heapId, u16 * dest)
{
NARC * narc = NARC_New(narc_id, heap_id);
NARC * narc = NARC_New(narc_id, heapId);
u16 header[2];
struct MsgDataAlloc alloc;
if (narc != NULL)
@ -95,7 +95,7 @@ static void ReadMsgData_ExistingTable_ExistingString(struct MsgDataTable * table
{
alloc = table->alloc[num];
Decrypt1(&alloc, num, table->key);
buf = AllocFromHeapAtEnd(0, 2 * alloc.length);
buf = AllocFromHeapAtEnd(HEAP_ID_DEFAULT, 2 * alloc.length);
if (buf != NULL)
{
MI_CpuCopy16((char *)table + alloc.offset, buf, 2 * alloc.length);
@ -111,7 +111,7 @@ static void ReadMsgData_ExistingTable_ExistingString(struct MsgDataTable * table
}
}
static struct String * ReadMsgData_ExistingTable_NewString(struct MsgDataTable * table, u32 num, u32 heap_id)
static struct String * ReadMsgData_ExistingTable_NewString(struct MsgDataTable * table, u32 num, HeapID heapId)
{
struct MsgDataAlloc alloc;
u16 * buf;
@ -120,12 +120,12 @@ static struct String * ReadMsgData_ExistingTable_NewString(struct MsgDataTable *
{
alloc = table->alloc[num];
Decrypt1(&alloc, num, table->key);
buf = AllocFromHeapAtEnd(heap_id, 2 * alloc.length);
buf = AllocFromHeapAtEnd(heapId, 2 * alloc.length);
if (buf != NULL)
{
MI_CpuCopy16((char *)table + alloc.offset, buf, 2 * alloc.length);
Decrypt2(buf, alloc.length, num);
dest = String_New(alloc.length, heap_id);
dest = String_New(alloc.length, heapId);
if (dest != NULL)
CopyU16ArrayToStringN(dest, buf, alloc.length);
FreeToHeap(buf);
@ -139,21 +139,21 @@ static struct String * ReadMsgData_ExistingTable_NewString(struct MsgDataTable *
else
{
GF_ASSERT(FALSE);
return String_New(4, heap_id);
return String_New(4, heapId);
}
}
void ReadMsgData_NewNarc_ExistingString(NarcId narc_id, u32 group, u32 num, u32 heap_id, struct String * dest)
void ReadMsgData_NewNarc_ExistingString(NarcId narc_id, u32 group, u32 num, HeapID heapId, struct String * dest)
{
NARC * narc = NARC_New(narc_id, heap_id);
NARC * narc = NARC_New(narc_id, heapId);
if (narc != NULL)
{
ReadMsgData_ExistingNarc_ExistingString(narc, group, num, heap_id, dest);
ReadMsgData_ExistingNarc_ExistingString(narc, group, num, heapId, dest);
NARC_Delete(narc);
}
}
static void ReadMsgData_ExistingNarc_ExistingString(NARC * narc, u32 group, u32 num, u32 heap_id, struct String * dest)
static void ReadMsgData_ExistingNarc_ExistingString(NARC * narc, u32 group, u32 num, HeapID heapId, struct String * dest)
{
u16 * buf;
u32 size;
@ -166,7 +166,7 @@ static void ReadMsgData_ExistingNarc_ExistingString(NARC * narc, u32 group, u32
NARC_ReadFromMember(narc, group, 8 * num + 4, 8, &alloc);
Decrypt1(&alloc, num, sp10[1]);
size = alloc.length * 2;
buf = AllocFromHeapAtEnd(heap_id, size);
buf = AllocFromHeapAtEnd(heapId, size);
if (buf != NULL)
{
NARC_ReadFromMember(narc, group, alloc.offset, size, buf);
@ -183,23 +183,23 @@ static void ReadMsgData_ExistingNarc_ExistingString(NARC * narc, u32 group, u32
}
}
struct String * ReadMsgData_NewNarc_NewString(NarcId narc_id, u32 group, u32 num, u32 heap_id)
struct String * ReadMsgData_NewNarc_NewString(NarcId narc_id, u32 group, u32 num, HeapID heapId)
{
NARC * narc = NARC_New(narc_id, heap_id);
NARC * narc = NARC_New(narc_id, heapId);
struct String * string;
if (narc != NULL)
{
string = ReadMsgData_ExistingNarc_NewString(narc, group, num, heap_id);
string = ReadMsgData_ExistingNarc_NewString(narc, group, num, heapId);
NARC_Delete(narc);
}
else
{
string = String_New(4, heap_id);
string = String_New(4, heapId);
}
return string;
}
static struct String * ReadMsgData_ExistingNarc_NewString(NARC * narc, u32 group, u32 num, u32 heap_id)
static struct String * ReadMsgData_ExistingNarc_NewString(NARC * narc, u32 group, u32 num, HeapID heapId)
{
struct String * dest;
u16 * buf;
@ -212,11 +212,11 @@ static struct String * ReadMsgData_ExistingNarc_NewString(NARC * narc, u32 group
{
NARC_ReadFromMember(narc, group, 8 * num + 4, 8, &alloc);
Decrypt1(&alloc, num, sp10[1]);
dest = String_New(alloc.length, heap_id);
dest = String_New(alloc.length, heapId);
if (dest != NULL)
{
size = alloc.length * 2;
buf = AllocFromHeapAtEnd(heap_id, size);
buf = AllocFromHeapAtEnd(heapId, size);
if (buf != NULL)
{
NARC_ReadFromMember(narc, group, alloc.offset, size, buf);
@ -230,7 +230,7 @@ static struct String * ReadMsgData_ExistingNarc_NewString(NARC * narc, u32 group
else
{
GF_ASSERT(FALSE);
return String_New(4, heap_id);
return String_New(4, heapId);
}
}
@ -246,14 +246,14 @@ static u16 GetMsgCount_TableFromNarc(NarcId narc_id, s32 file_id)
return n[0];
}
struct MsgData * NewMsgDataFromNarc(MsgDataLoadType type, NarcId narc_id, s32 file_id, u32 heap_id)
struct MsgData * NewMsgDataFromNarc(MsgDataLoadType type, NarcId narc_id, s32 file_id, HeapID heapId)
{
struct MsgData * msgData = AllocFromHeapAtEnd(heap_id, sizeof(struct MsgData));
struct MsgData * msgData = AllocFromHeapAtEnd(heapId, sizeof(struct MsgData));
if (msgData != NULL)
{
if (type == MSGDATA_LOAD_DIRECT)
{
msgData->data.raw = LoadSingleElementFromNarc(narc_id, file_id, heap_id);
msgData->data.raw = LoadSingleElementFromNarc(narc_id, file_id, heapId);
if (msgData->data.raw == NULL)
{
FreeToHeap(msgData);
@ -262,12 +262,12 @@ struct MsgData * NewMsgDataFromNarc(MsgDataLoadType type, NarcId narc_id, s32 fi
}
else
{
msgData->data.narc = NARC_New(narc_id, heap_id);
msgData->data.narc = NARC_New(narc_id, heapId);
}
msgData->type = (u16)type;
msgData->narc_id = (u16)narc_id;
msgData->file_id = (u16)file_id;
msgData->heap_id = (u16)heap_id;
msgData->heapId = (u16)heapId;
}
return msgData;
}
@ -297,7 +297,7 @@ void ReadMsgDataIntoString(struct MsgData * msgData, u32 msg_no, struct String *
ReadMsgData_ExistingTable_ExistingString(msgData->data.raw, msg_no, dest);
break;
case MSGDATA_LOAD_LAZY:
ReadMsgData_ExistingNarc_ExistingString(msgData->data.narc, msgData->file_id, msg_no, msgData->heap_id, dest);
ReadMsgData_ExistingNarc_ExistingString(msgData->data.narc, msgData->file_id, msg_no, (HeapID)msgData->heapId, dest);
break;
}
}
@ -307,9 +307,9 @@ struct String * NewString_ReadMsgData(struct MsgData * msgData, u32 msg_no)
switch (msgData->type)
{
case MSGDATA_LOAD_DIRECT:
return ReadMsgData_ExistingTable_NewString(msgData->data.raw, msg_no, msgData->heap_id);
return ReadMsgData_ExistingTable_NewString(msgData->data.raw, msg_no, (HeapID)msgData->heapId);
case MSGDATA_LOAD_LAZY:
return ReadMsgData_ExistingNarc_NewString(msgData->data.narc, msgData->file_id, msg_no, msgData->heap_id);
return ReadMsgData_ExistingNarc_NewString(msgData->data.narc, msgData->file_id, msg_no, (HeapID)msgData->heapId);
default:
return NULL;
}
@ -336,22 +336,22 @@ void ReadMsgDataIntoU16Array(struct MsgData * msgData, u32 msg_no, u16 * dest)
ReadMsgData_ExistingTable_ExistingArray(msgData->data.raw, msg_no, dest);
break;
case MSGDATA_LOAD_LAZY:
ReadMsgData_NewNarc_ExistingArray((NarcId)msgData->narc_id, msgData->file_id, msg_no, msgData->heap_id, dest);
ReadMsgData_NewNarc_ExistingArray((NarcId)msgData->narc_id, msgData->file_id, msg_no, (HeapID)msgData->heapId, dest);
break;
}
}
void GetSpeciesNameIntoArray(u16 species, u32 heap_id, u16 * dest)
void GetSpeciesNameIntoArray(u16 species, HeapID heapId, u16 * dest)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, 362, heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0362_bin, heapId);
ReadMsgDataIntoU16Array(msgData, species, dest);
DestroyMsgData(msgData);
}
struct String * ReadMsgData_ExpandPlaceholders(MessageFormat *messageFormat, struct MsgData * msgData, u32 msgno, u32 heapId)
struct String * ReadMsgData_ExpandPlaceholders(MessageFormat *messageFormat, struct MsgData * msgData, u32 msgno, HeapID heapId)
{
struct String * ret = NULL;
struct String * r4 = String_New(1024, 0);
struct String * r4 = String_New(1024, HEAP_ID_DEFAULT);
struct String * r5;
if (r4 != NULL)
{
@ -367,13 +367,13 @@ struct String * ReadMsgData_ExpandPlaceholders(MessageFormat *messageFormat, str
return ret;
}
struct String * GetMoveName(u32 move, u32 heapno)
struct String * GetMoveName(u32 move, HeapID heapId)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0588_bin, heapno);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0588_bin, heapId);
struct String * ret;
if (msgData != NULL)
{
ret = String_New(16, heapno);
ret = String_New(16, heapId);
if (ret != NULL)
{
ReadMsgDataIntoString(msgData, move, ret);
@ -384,10 +384,10 @@ struct String * GetMoveName(u32 move, u32 heapno)
return NULL;
}
struct String * GetSpeciesName(u16 species, u32 heap_id)
struct String * GetSpeciesName(u16 species, HeapID heapId)
{
struct String * ret;
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0362_bin, heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0362_bin, heapId);
if (msgData != NULL)
{
ret = NewString_ReadMsgData(msgData, species);

24
arm9/src/nutdata.c
View File

@ -6,14 +6,14 @@
#include "msgdata.h"
#include "constants/items.h"
NARC * OpenNutsDataNarc(u32 heap_id)
NARC * OpenNutsDataNarc(HeapID heapId)
{
return NARC_New(NARC_ITEMTOOL_ITEMDATA_NUTS_DATA, heap_id);
return NARC_New(NARC_ITEMTOOL_ITEMDATA_NUTS_DATA, heapId);
}
struct NutData * ReadNutDataFromNarc(NARC * narc, u32 berry_idx, u32 heap_id)
struct NutData * ReadNutDataFromNarc(NARC * narc, u32 berry_idx, HeapID heapId)
{
return NARC_AllocAndReadWholeMember(narc, berry_idx, heap_id);
return NARC_AllocAndReadWholeMember(narc, berry_idx, heapId);
}
void CloseNutsDataNarc(NARC * narc)
@ -21,14 +21,14 @@ void CloseNutsDataNarc(NARC * narc)
NARC_Delete(narc);
}
struct NutData * LoadNutDataSingle(s32 berry_idx, u32 heap_id)
struct NutData * LoadNutDataSingle(s32 berry_idx, HeapID heapId)
{
return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_NUTS_DATA, berry_idx, heap_id);
return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_NUTS_DATA, berry_idx, heapId);
}
struct NutData * LoadNutDataSingleByItemId(s32 item_id, u32 heap_id)
struct NutData * LoadNutDataSingleByItemId(s32 item_id, HeapID heapId)
{
return LoadNutDataSingle(item_id - FIRST_BERRY_IDX, heap_id);
return LoadNutDataSingle(item_id - FIRST_BERRY_IDX, heapId);
}
u32 GetNutAttr(struct NutData * nut, u32 attr)
@ -62,17 +62,17 @@ u32 GetNutAttr(struct NutData * nut, u32 attr)
}
}
struct String * GetNutName(u32 berry_idx, u32 heap_id)
struct String * GetNutName(u32 berry_idx, HeapID heapId)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, 373, heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, 373, heapId);
struct String * ret = NewString_ReadMsgData(msgData, berry_idx);
DestroyMsgData(msgData);
return ret;
}
struct String * GetNutDesc(u32 berry_idx, u32 heap_id)
struct String * GetNutDesc(u32 berry_idx, HeapID heapId)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, 372, heap_id);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, 372, heapId);
struct String * ret = NewString_ReadMsgData(msgData, berry_idx);
DestroyMsgData(msgData);
return ret;

26
arm9/src/oam.c
View File

@ -12,8 +12,8 @@ extern void sub_0202135C(void *param0,
void (*param4)(void),
u32 param5,
u32 param6);
extern void sub_020203CC(u32 heap_id);
extern void sub_02020404(u32 heap_id);
extern void sub_020203CC(HeapID heapId);
extern void sub_02020404(HeapID heapId);
struct OamData *oamData;
@ -25,7 +25,7 @@ void sub_02009EAC(s32 param0,
u32 param5,
u32 param6,
u32 param7,
u32 param8)
HeapID heapId)
{
s32 r0;
if (param0 < 4)
@ -55,7 +55,7 @@ void sub_02009EAC(s32 param0,
r2 = param2;
}
InitOamData(r0, param1, r2, param3, param4, param5, param6, param7, param8);
InitOamData(r0, param1, r2, param3, param4, param5, param6, param7, heapId);
}
void InitOamData(s32 param0,
@ -66,13 +66,13 @@ void InitOamData(s32 param0,
u32 param5,
u32 param6,
u32 param7,
u32 heap_id)
HeapID heapId)
{
GF_ASSERT(oamData == NULL);
oamData = AllocFromHeap(heap_id, sizeof(struct OamData));
oamData = AllocFromHeap(heapId, sizeof(struct OamData));
GF_ASSERT(oamData);
oamData->heap_id = heap_id;
oamData->heapId = heapId;
GF_ASSERT(NNS_G2dGetNewOamManagerInstance(
&oamData->oamManagers[0], (u16)param0, (u16)param1, (u16)param2, (u16)param3, 0));
@ -93,8 +93,8 @@ void DeinitOamData(void)
{
GF_ASSERT(oamData);
sub_0200A064(oamData->heap_id);
sub_0200A06C(oamData->heap_id);
sub_0200A064(oamData->heapId);
sub_0200A06C(oamData->heapId);
FreeToHeap(oamData);
oamData = NULL;
@ -126,14 +126,14 @@ NNSG2dOamManager *GetOamManager(u32 screen)
}
}
void sub_0200A064(u32 heap_id)
void sub_0200A064(HeapID heapId)
{
sub_020203CC(heap_id);
sub_020203CC(heapId);
}
void sub_0200A06C(u32 heap_id)
void sub_0200A06C(HeapID heapId)
{
sub_02020404(heap_id);
sub_02020404(heapId);
}
u32 EntryOamManagerOamWithAffineIdxMainScreen(u32 param0, u32 param1)

4
arm9/src/options.c
View File

@ -5,8 +5,8 @@
#include "options.h"
#include "player_data.h"
struct Options * Options_New(u32 heap_id) {
struct Options * ret = AllocFromHeap(heap_id, sizeof(struct Options));
struct Options * Options_New(HeapID heapId) {
struct Options * ret = AllocFromHeap(heapId, sizeof(struct Options));
Options_Init(ret);
return ret;
}

8
arm9/src/overlay_manager.c
View File

@ -4,9 +4,9 @@
#include "heap.h"
#include "overlay_manager.h"
struct OverlayManager * OverlayManager_New(const struct OverlayManagerTemplate *template, s32 * a1, u32 heap_id)
struct OverlayManager * OverlayManager_New(const struct OverlayManagerTemplate *template, s32 * a1, HeapID heapId)
{
struct OverlayManager * ret = (struct OverlayManager *)AllocFromHeap(heap_id, sizeof(struct OverlayManager));
struct OverlayManager * ret = (struct OverlayManager *)AllocFromHeap(heapId, sizeof(struct OverlayManager));
ret->template = *template;
ret->managerStatus = 0;
ret->overlayStatus = 0;
@ -22,9 +22,9 @@ void OverlayManager_Delete(struct OverlayManager * overlayManager)
FreeToHeap(overlayManager);
}
void * OverlayManager_CreateAndGetData(struct OverlayManager * overlayManager, u32 size, u32 heap_id)
void * OverlayManager_CreateAndGetData(struct OverlayManager * overlayManager, u32 size, HeapID heapId)
{
return overlayManager->data = AllocFromHeap(heap_id, size);
return overlayManager->data = AllocFromHeap(heapId, size);
}
void * OverlayManager_GetData(struct OverlayManager * overlayManager)

26
arm9/src/palette.c
View File

@ -6,9 +6,9 @@
#include "unk_0200CA44.h"
#include "unk_020222E8.h"
struct PaletteData *sub_02002FD0(u32 heap_id)
struct PaletteData *sub_02002FD0(HeapID heapId)
{
struct PaletteData *ptr = AllocFromHeap(heap_id, sizeof(struct PaletteData));
struct PaletteData *ptr = AllocFromHeap(heapId, sizeof(struct PaletteData));
MI_CpuFill8(ptr, 0, sizeof(struct PaletteData));
return ptr;
@ -28,10 +28,10 @@ void PaletteData_SetBuffers(
}
void PaletteData_AllocBuffers(
struct PaletteData *paletteData, u32 index, u32 size, u32 heap_id)
struct PaletteData *paletteData, u32 index, u32 size, HeapID heapId)
{
void *ptr = AllocFromHeap(heap_id, size);
void *ptr2 = AllocFromHeap(heap_id, size);
void *ptr = AllocFromHeap(heapId, size);
void *ptr2 = AllocFromHeap(heapId, size);
PaletteData_SetBuffers(paletteData, index, ptr, ptr2, size);
}
@ -52,14 +52,14 @@ void PaletteData_LoadPalette(
void PaletteData_LoadFromNarc(struct PaletteData *paletteData,
NarcId narcId,
s32 memberId,
u32 heap_id,
HeapID heapId,
u32 index,
u32 size,
u16 offset,
u16 param7)
{
NNSG2dPaletteData *pltData;
void *ptr = GfGfxLoader_GetPlttData(narcId, memberId, &pltData, heap_id);
void *ptr = GfGfxLoader_GetPlttData(narcId, memberId, &pltData, heapId);
GF_ASSERT(ptr != NULL);
@ -77,12 +77,12 @@ void PaletteData_LoadFromNarc(struct PaletteData *paletteData,
void PaletteData_LoadNarc(struct PaletteData *paletteData,
NarcId narcId,
s32 memberId,
u32 heap_id,
HeapID heapId,
u32 index,
u32 size,
u16 offset)
{
PaletteData_LoadFromNarc(paletteData, narcId, memberId, heap_id, index, size, offset, 0);
PaletteData_LoadFromNarc(paletteData, narcId, memberId, heapId, index, size, offset, 0);
}
void sub_02003108(struct PaletteData *paletteData, u32 index, u16 offset, u32 size)
@ -113,11 +113,11 @@ void sub_02003108(struct PaletteData *paletteData, u32 index, u16 offset, u32 si
}
void CopyPaletteFromNarc(
NarcId narcId, s32 memberId, u32 heap_id, u32 size, u16 offset, void *dest)
NarcId narcId, s32 memberId, HeapID heapId, u32 size, u16 offset, void *dest)
{
NNSG2dPaletteData *pltData;
void *ptr = GfGfxLoader_GetPlttData(narcId, memberId, &pltData, heap_id);
void *ptr = GfGfxLoader_GetPlttData(narcId, memberId, &pltData, heapId);
GF_ASSERT(ptr != NULL);
if (size == 0)
@ -668,7 +668,7 @@ void TintPalette_CustomTone(u16 *palette, s32 count, s32 rTone, s32 gTone, s32 b
void sub_02003B40(struct PaletteData *paletteData,
NarcId narcId,
s32 memberId,
u32 heap_id,
HeapID heapId,
u32 index,
u32 size,
u16 offset,
@ -677,7 +677,7 @@ void sub_02003B40(struct PaletteData *paletteData,
s32 bTone)
{
NNSG2dPaletteData *pltData;
void *ptr = GfGfxLoader_GetPlttData(narcId, memberId, &pltData, heap_id);
void *ptr = GfGfxLoader_GetPlttData(narcId, memberId, &pltData, heapId);
GF_ASSERT(ptr != NULL);
if (size == 0)

6
arm9/src/party.c
View File

@ -10,9 +10,9 @@ u32 SaveArray_Party_sizeof(void)
return sizeof(struct PlayerParty);
}
struct PlayerParty * SaveArray_Party_Alloc(u32 heap_id)
struct PlayerParty * SaveArray_Party_Alloc(HeapID heapId)
{
struct PlayerParty * ret = (struct PlayerParty *)AllocFromHeap(heap_id, sizeof(struct PlayerParty));
struct PlayerParty * ret = (struct PlayerParty *)AllocFromHeap(heapId, sizeof(struct PlayerParty));
SaveArray_Party_Init(ret);
return ret;
}
@ -94,7 +94,7 @@ BOOL SwapSlotsInParty(struct PlayerParty * party, int pos1, int pos2)
GF_ASSERT(pos2 >= 0);
GF_ASSERT(pos2 < party->curCount);
GF_ASSERT(pos2 < party->maxCount);
buffer = AllocFromHeap(0, sizeof(struct Pokemon));
buffer = AllocFromHeap(HEAP_ID_DEFAULT, sizeof(struct Pokemon));
*buffer = party->mons[pos1];
party->mons[pos1] = party->mons[pos2];
party->mons[pos2] = *buffer;

8
arm9/src/player_data.c
View File

@ -48,9 +48,9 @@ u32 PlayerProfile_sizeof(void)
return sizeof(PlayerProfile);
}
PlayerProfile * PlayerProfile_New(u32 heap_id)
PlayerProfile * PlayerProfile_New(HeapID heapId)
{
PlayerProfile * ret = (PlayerProfile *)AllocFromHeap(heap_id, sizeof(PlayerProfile));
PlayerProfile * ret = (PlayerProfile *)AllocFromHeap(heapId, sizeof(PlayerProfile));
PlayerProfile_Init(ret);
return ret;
}
@ -87,9 +87,9 @@ void PlayerName_FlatToString(PlayerProfile * data, struct String * str)
CopyU16ArrayToString(str, data->playerName);
}
struct String * PlayerProfile_GetPlayerName_NewString(PlayerProfile * data, u32 heap_id)
struct String * PlayerProfile_GetPlayerName_NewString(PlayerProfile * data, HeapID heapId)
{
struct String * str = String_New(PLAYER_NAME_LENGTH + 1, heap_id);
struct String * str = String_New(PLAYER_NAME_LENGTH + 1, heapId);
PlayerName_FlatToString(data, str);
return str;
}

4
arm9/src/pokedex.c
View File

@ -44,9 +44,9 @@ u32 Save_Pokedex_sizeof(void)
return sizeof(struct Pokedex);
}
struct Pokedex * Save_Pokedex_New(u32 heap_id)
struct Pokedex * Save_Pokedex_New(HeapID heapId)
{
struct Pokedex * ret = (struct Pokedex *)AllocFromHeap(heap_id, sizeof(struct Pokedex));
struct Pokedex * ret = (struct Pokedex *)AllocFromHeap(heapId, sizeof(struct Pokedex));
Save_Pokedex_Init(ret);
return ret;
}

76
arm9/src/pokemon.c
View File

@ -44,7 +44,7 @@ BOOL BoxMon_HasPokerus(struct BoxPokemon * boxmon);
BOOL BoxMon_IsImmuneToPokerus(struct BoxPokemon * boxmon);
void BoxMon_UpdateArceusForme(struct BoxPokemon * boxmon);
void LoadWotbl_HandleAlternateForme(int species, int forme, u16 * wotbl);
void sub_0206A054(struct BoxPokemon * boxmon, PlayerProfile * a1, u32 pokeball, u32 a3, u32 encounterType, u32 heap_id);
void sub_0206A054(struct BoxPokemon * boxmon, PlayerProfile * a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heapId);
BOOL MonHasMove(struct Pokemon * pokemon, u16 move);
BOOL sub_0206A144(struct BoxPokemon * boxmon, u32 a1);
BOOL sub_0206A16C(u16 species, int forme, u32 a2);
@ -192,9 +192,9 @@ u32 SizeOfStructPokemon(void)
return sizeof(struct Pokemon);
}
struct Pokemon * AllocMonZeroed(u32 heap_id)
struct Pokemon * AllocMonZeroed(HeapID heapId)
{
struct Pokemon * pokemon = (struct Pokemon *)AllocFromHeap(heap_id, sizeof(struct Pokemon));
struct Pokemon * pokemon = (struct Pokemon *)AllocFromHeap(heapId, sizeof(struct Pokemon));
ZeroMonData(pokemon);
return pokemon;
}
@ -267,7 +267,7 @@ void CreateMon(struct Pokemon * pokemon, int species, int level, int fixedIV, in
MonEncryptSegment((u16 *)&pokemon->party, sizeof(pokemon->party), 0);
ENCRYPT_PTY(pokemon);
SetMonData(pokemon, MON_DATA_LEVEL, &level);
mail = Mail_New(0);
mail = Mail_New(HEAP_ID_DEFAULT);
SetMonData(pokemon, MON_DATA_MAIL_STRUCT, mail);
FreeToHeap(mail);
capsule = 0;
@ -466,7 +466,7 @@ void CalcMonStats(struct Pokemon * pokemon)
forme = (int)GetMonData(pokemon, MON_DATA_FORME, NULL);
species = (int)GetMonData(pokemon, MON_DATA_SPECIES, NULL);
baseStats = (struct BaseStats *)AllocFromHeap(0, sizeof(struct BaseStats));
baseStats = (struct BaseStats *)AllocFromHeap(HEAP_ID_DEFAULT, sizeof(struct BaseStats));
LoadMonBaseStats_HandleAlternateForme(species, forme, baseStats);
if (species == SPECIES_SHEDINJA)
@ -848,7 +848,7 @@ u32 GetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * dest)
break;
case MON_DATA_NICKNAME:
if (boxmon->checksum_fail)
GetSpeciesNameIntoArray(SPECIES_MANAPHY_EGG, 0, dest);
GetSpeciesNameIntoArray(SPECIES_MANAPHY_EGG, HEAP_ID_DEFAULT, dest);
else
{
u16 * dest16 = (u16 *)dest;
@ -865,7 +865,7 @@ u32 GetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * dest)
case MON_DATA_NICKNAME_3:
if (boxmon->checksum_fail)
{
struct String * buffer = GetSpeciesName(SPECIES_MANAPHY_EGG, 0);
struct String * buffer = GetSpeciesName(SPECIES_MANAPHY_EGG, HEAP_ID_DEFAULT);
StringCopy(dest, buffer);
String_Delete(buffer);
}
@ -976,14 +976,14 @@ u32 GetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * dest)
case MON_DATA_TYPE_1:
case MON_DATA_TYPE_2:
if (blockA->species == SPECIES_ARCEUS && blockA->ability == ABILITY_MULTITYPE)
ret = (u32)GetArceusTypeByHeldItemEffect((u16)GetItemAttr(blockA->heldItem, 1, 0));
ret = (u32)GetArceusTypeByHeldItemEffect((u16)GetItemAttr(blockA->heldItem, 1, HEAP_ID_DEFAULT));
else
{
ret = (u32)GetMonBaseStat_HandleFormeConversion(blockA->species, blockB->alternateForm, (enum BaseStat)(attr - MON_DATA_TYPE_1 + BASE_TYPE1));
}
break;
case MON_DATA_SPECIES_NAME:
GetSpeciesNameIntoArray(blockA->species, 0, dest);
GetSpeciesNameIntoArray(blockA->species, HEAP_ID_DEFAULT, dest);
break;
}
return ret;
@ -1314,7 +1314,7 @@ void SetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * value)
blockB->Unused = VALUE(u16);
break;
case MON_DATA_NICKNAME_2:
GetSpeciesNameIntoArray(blockA->species, 0, namebuf);
GetSpeciesNameIntoArray(blockA->species, HEAP_ID_DEFAULT, namebuf);
blockB->isNicknamed = StringNotEqual(namebuf, value);
// fallthrough
case MON_DATA_NICKNAME:
@ -1324,7 +1324,7 @@ void SetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * value)
}
break;
case MON_DATA_NICKNAME_4:
GetSpeciesNameIntoArray(blockA->species, 0, namebuf2);
GetSpeciesNameIntoArray(blockA->species, HEAP_ID_DEFAULT, namebuf2);
CopyStringToU16Array(value, namebuf3, POKEMON_NAME_LENGTH + 1);
blockB->isNicknamed = StringNotEqual(namebuf2, namebuf3);
// fallthrough
@ -1425,7 +1425,7 @@ void SetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * value)
blockB->spdefIV = (VALUE(u32) >> 25) & 0x1F;
break;
case MON_DATA_SPECIES_NAME:
speciesName = GetSpeciesName(blockA->species, 0);
speciesName = GetSpeciesName(blockA->species, HEAP_ID_DEFAULT);
CopyStringToU16Array(speciesName, blockC->nickname, POKEMON_NAME_LENGTH + 1);
String_Delete(speciesName);
break;
@ -1774,9 +1774,9 @@ void AddBoxMonData(struct BoxPokemon * boxmon, int attr, int value)
}
}
struct BaseStats * AllocAndLoadMonPersonal(int species, u32 heap_id)
struct BaseStats * AllocAndLoadMonPersonal(int species, HeapID heapId)
{
struct BaseStats * baseStats = (struct BaseStats *)AllocFromHeap(heap_id, sizeof(struct BaseStats));
struct BaseStats * baseStats = (struct BaseStats *)AllocFromHeap(heapId, sizeof(struct BaseStats));
LoadMonPersonal(species, baseStats);
return baseStats;
}
@ -1899,7 +1899,7 @@ void FreeMonPersonal(struct BaseStats * personal)
int GetMonBaseStat_HandleFormeConversion(int species, int forme, enum BaseStat attr)
{
int ret;
struct BaseStats * personal = AllocAndLoadMonPersonal(ResolveMonForme(species, forme), 0);
struct BaseStats * personal = AllocAndLoadMonPersonal(ResolveMonForme(species, forme), HEAP_ID_DEFAULT);
ret = GetPersonalAttr(personal, attr);
FreeMonPersonal(personal);
return ret;
@ -1908,7 +1908,7 @@ int GetMonBaseStat_HandleFormeConversion(int species, int forme, enum BaseStat a
int GetMonBaseStat(int species, enum BaseStat attr)
{
int ret;
struct BaseStats * personal = AllocAndLoadMonPersonal(species, 0);
struct BaseStats * personal = AllocAndLoadMonPersonal(species, HEAP_ID_DEFAULT);
ret = GetPersonalAttr(personal, attr);
FreeMonPersonal(personal);
return ret;
@ -1964,7 +1964,7 @@ u32 GetExpByGrowthRateAndLevel(int growthRate, int level)
u32 ret;
GF_ASSERT(growthRate < 8);
GF_ASSERT(level <= 101);
table = (u32 *)AllocFromHeap(0, 101 * sizeof(u32));
table = (u32 *)AllocFromHeap(HEAP_ID_DEFAULT, 101 * sizeof(u32));
LoadGrowthTable(growthRate, table);
ret = table[level];
FreeToHeap(table);
@ -1988,7 +1988,7 @@ int CalcBoxMonLevel(struct BoxPokemon * boxmon)
int CalcLevelBySpeciesAndExp(u16 species, u32 exp)
{
int level;
struct BaseStats * personal = AllocAndLoadMonPersonal(species, 0);
struct BaseStats * personal = AllocAndLoadMonPersonal(species, HEAP_ID_DEFAULT);
level = CalcLevelBySpeciesAndExp_PreloadedPersonal(personal, species, exp);
FreeMonPersonal(personal);
return level;
@ -2064,7 +2064,7 @@ void MonApplyFriendshipMod(struct Pokemon * pokemon, u32 kind, u32 location)
if (species == SPECIES_NONE || species == SPECIES_EGG)
return;
effect = (u8)GetItemAttr((u16)GetMonData(pokemon, MON_DATA_HELD_ITEM, NULL), 1, 0);
effect = (u8)GetItemAttr((u16)GetMonData(pokemon, MON_DATA_HELD_ITEM, NULL), 1, HEAP_ID_DEFAULT);
r4 = 0;
friendship = (s16)GetMonData(pokemon, MON_DATA_FRIENDSHIP, NULL);
if (friendship >= 100)
@ -2102,7 +2102,7 @@ u8 GetBoxMonGender(struct BoxPokemon * boxmon)
u8 GetGenderBySpeciesAndPersonality(u16 species, u32 pid)
{
struct BaseStats * personal = AllocAndLoadMonPersonal(species, 0);
struct BaseStats * personal = AllocAndLoadMonPersonal(species, HEAP_ID_DEFAULT);
u8 gender = GetGenderBySpeciesAndPersonality_PreloadedPersonal(personal, species, pid);
FreeMonPersonal(personal);
return gender;
@ -2518,12 +2518,12 @@ u16 GetMonEvolution(struct PlayerParty * party, struct Pokemon * pokemon, u32 co
personality = GetMonData(pokemon, MON_DATA_PERSONALITY, NULL);
beauty = (u8)GetMonData(pokemon, MON_DATA_BEAUTY, NULL);
pid_hi = (u16)((personality & 0xFFFF0000) >> 16);
r1 = (u8)GetItemAttr(heldItem, 1, 0);
r1 = (u8)GetItemAttr(heldItem, 1, HEAP_ID_DEFAULT);
if (species != SPECIES_KADABRA && r1 == HOLD_EFFECT_NO_EVOLVE && context != 3)
return SPECIES_NONE;
if (method_ret == NULL)
method_ret = &sp40;
evoTable = AllocFromHeap(0, 7 * sizeof(struct Evolution));
evoTable = AllocFromHeap(HEAP_ID_DEFAULT, 7 * sizeof(struct Evolution));
LoadMonEvolutionTable(species, evoTable);
switch (context)
{
@ -2795,7 +2795,7 @@ void InitBoxMonMoveset(struct BoxPokemon * boxmon)
u32 forme;
u8 level;
u16 move;
wotbl = AllocFromHeap(0, 22 * sizeof(u16));
wotbl = AllocFromHeap(HEAP_ID_DEFAULT, 22 * sizeof(u16));
decry = AcquireBoxMonLock(boxmon);
species = (u16)GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL);
forme = GetBoxMonData(boxmon, MON_DATA_FORME, NULL);
@ -2896,7 +2896,7 @@ void BoxMonSetMoveInSlot(struct BoxPokemon * boxmon, u16 move, u8 slot)
u32 sub_02069818(struct Pokemon * pokemon, u32 * r5, u16 * sp0)
{
u32 ret = 0;
u16 * wotbl = AllocFromHeap(0, 22 * sizeof(u16));
u16 * wotbl = AllocFromHeap(HEAP_ID_DEFAULT, 22 * sizeof(u16));
u16 species = (u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL);
u32 forme = GetMonData(pokemon, MON_DATA_FORME, NULL);
u8 level = (u8)GetMonData(pokemon, MON_DATA_LEVEL, NULL);
@ -3000,7 +3000,7 @@ void CopyBoxPokemonToPokemon(struct BoxPokemon * src, struct Pokemon * dest)
SetMonData(dest, MON_DATA_STATUS, &sp0);
SetMonData(dest, MON_DATA_HP, &sp0);
SetMonData(dest, MON_DATA_MAXHP, &sp0);
mail = Mail_New(0);
mail = Mail_New(HEAP_ID_DEFAULT);
SetMonData(dest, MON_DATA_MAIL_STRUCT, mail);
FreeToHeap(mail);
SetMonData(dest, MON_DATA_CAPSULE, &sp0);
@ -3078,7 +3078,7 @@ s8 GetFlavorPreferenceFromPID(u32 personality, int flavor)
int Species_LoadLearnsetTable(u16 species, u32 forme, u16 * dest)
{
int i;
u16 * wotbl = AllocFromHeap(0, 22 * sizeof(u16));
u16 * wotbl = AllocFromHeap(HEAP_ID_DEFAULT, 22 * sizeof(u16));
LoadWotbl_HandleAlternateForme(species, (int)forme, wotbl);
for (i = 0; wotbl[i] != WOTBL_END; i++)
{
@ -3252,7 +3252,7 @@ void BoxMon_UpdateArceusForme(struct BoxPokemon * boxmon)
u32 forme;
if (species == SPECIES_ARCEUS && ability == ABILITY_MULTITYPE)
{
forme = GetArceusTypeByHeldItemEffect((u16)GetItemAttr((u16)heldItem, 1, 0));
forme = GetArceusTypeByHeldItemEffect((u16)GetItemAttr((u16)heldItem, 1, HEAP_ID_DEFAULT));
SetBoxMonData(boxmon, MON_DATA_FORME, &forme);
}
}
@ -3303,14 +3303,14 @@ void LoadWotbl_HandleAlternateForme(int species, int forme, u16 * wotbl)
ReadWholeNarcMemberByIdPair(wotbl, NARC_POKETOOL_PERSONAL_WOTBL, ResolveMonForme(species, forme));
}
void sub_02069FB0(struct SaveChatotSoundClip *r7, u32 r5, u16 r4, s32 r6, s32 sp18, u32 sp1C, u32 sp20)
void sub_02069FB0(struct SaveChatotSoundClip *r7, u32 r5, u16 r4, s32 r6, s32 sp18, u32 sp1C, HeapID heapId)
{
if (r4 == SPECIES_CHATOT)
{
if (!sub_02005F14((int)r5))
{
sub_02005E80(1);
sub_020056AC(r5, r4, r6, sp18, sp20);
sub_020056AC(r5, r4, r6, sp18, heapId);
}
else
{
@ -3321,14 +3321,14 @@ void sub_02069FB0(struct SaveChatotSoundClip *r7, u32 r5, u16 r4, s32 r6, s32 sp
}
else
{
sub_020056AC(r5, r4, r6, sp18, sp20);
sub_020056AC(r5, r4, r6, sp18, heapId);
}
}
void sub_0206A014(struct Pokemon * pokemon, PlayerProfile * a1, u32 pokeball, u32 a3, u32 encounterType, u32 heap_id)
void sub_0206A014(struct Pokemon * pokemon, PlayerProfile * a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heapId)
{
u32 hp;
sub_0206A054(&pokemon->box, a1, pokeball, a3, encounterType, heap_id);
sub_0206A054(&pokemon->box, a1, pokeball, a3, encounterType, heapId);
if (pokeball == ITEM_HEAL_BALL)
{
hp = GetMonData(pokemon, MON_DATA_MAXHP, NULL);
@ -3338,9 +3338,9 @@ void sub_0206A014(struct Pokemon * pokemon, PlayerProfile * a1, u32 pokeball, u3
}
}
void sub_0206A054(struct BoxPokemon * boxmon, PlayerProfile * a1, u32 pokeball, u32 a3, u32 encounterType, u32 heap_id)
void sub_0206A054(struct BoxPokemon * boxmon, PlayerProfile * a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heapId)
{
sub_020808AC(boxmon, a1, 0, a3, heap_id);
sub_020808AC(boxmon, a1, 0, a3, heapId);
SetBoxMonData(boxmon, MON_DATA_GAME_VERSION, (void *)&gGameVersion);
SetBoxMonData(boxmon, MON_DATA_POKEBALL, &pokeball);
SetBoxMonData(boxmon, MON_DATA_ENCOUNTER_TYPE, &encounterType);
@ -3458,7 +3458,7 @@ void sub_0206A23C(struct Pokemon * r5, u32 personality)
PokemonDataBlockD * sp18;
struct Pokemon * sp4;
sp4 = AllocMonZeroed(0);
sp4 = AllocMonZeroed(HEAP_ID_DEFAULT);
CopyPokemonToPokemon(r5, sp4);
r4 = &GetSubstruct(&sp4->box, r5->box.pid, 0)->blockA;
r6 = &GetSubstruct(&sp4->box, r5->box.pid, 1)->blockB;
@ -3680,14 +3680,14 @@ BOOL sub_0206A998(struct Pokemon * pokemon)
return IsPokemonLegendaryOrMythical(species);
}
BOOL sub_0206A9AC(struct BoxPokemon * boxmon, PlayerProfile * sb2, u32 heap_id)
BOOL sub_0206A9AC(struct BoxPokemon * boxmon, PlayerProfile * sb2, HeapID heapId)
{
u32 myId = PlayerProfile_GetTrainerID(sb2);
u32 otId = GetBoxMonData(boxmon, MON_DATA_OTID, NULL);
u32 myGender = PlayerProfile_GetTrainerGender(sb2);
u32 otGender = GetBoxMonData(boxmon, MON_DATA_MET_GENDER, NULL);
struct String * r7 = PlayerProfile_GetPlayerName_NewString(sb2, heap_id);
struct String * r6 = String_New(PLAYER_NAME_LENGTH + 1, heap_id);
struct String * r7 = PlayerProfile_GetPlayerName_NewString(sb2, heapId);
struct String * r6 = String_New(PLAYER_NAME_LENGTH + 1, heapId);
BOOL ret = FALSE;
GetBoxMonData(boxmon, MON_DATA_OT_NAME_2, r6);
if (myId == otId && myGender == otGender && StringCompare(r7, r6) == 0)

2
arm9/src/pokemon_storage_system.c
View File

@ -34,7 +34,7 @@ void PCStorage_InitializeBoxes(struct PCStorage * pc)
j = 0;
}
pc->unlockedWallpapers = 0;
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, 14, 0);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, 14, HEAP_ID_DEFAULT);
if (msgData != NULL)
{
for (i = 0; i < NUM_BOXES; i++)

95
arm9/src/render_window.c
View File

@ -32,7 +32,7 @@ extern void sub_0201FDEC(u32 param0);
extern void ov05_021D99F8(struct UnkStruct_0200CABC_2 *param0);
extern void *sub_0201B6C8(BOOL);
extern void ov05_021D959C(
struct UnkStruct_0200CABC_2 *param0, void *param1, u32 param2, u32 param3);
struct UnkStruct_0200CABC_2 *param0, void *param1, u32 param2, HeapID heapId);
extern void ov05_021D967C(struct UnkStruct_0200CABC_2 *param0,
NarcId narcId,
s32 memberId,
@ -40,10 +40,8 @@ extern void ov05_021D967C(struct UnkStruct_0200CABC_2 *param0,
u32 param4,
u32 param5,
u32 param6);
extern void ov05_021D96F4(
struct UnkStruct_0200CABC_2 *param0, NarcId narcId, s32 memberId, u32 param3, u32 param4);
extern void ov05_021D9708(
struct UnkStruct_0200CABC_2 *param0, NarcId narcId, s32 memberId, u32 param3, u32 param4);
extern void ov05_021D96F4(struct UnkStruct_0200CABC_2 *param0, NarcId narcId, s32 memberId, u32 param3, u32 param4);
extern void ov05_021D9708(struct UnkStruct_0200CABC_2 *param0, NarcId narcId, s32 memberId, u32 param3, u32 param4);
extern void ov05_021D971C(struct UnkStruct_0200CABC_2 *param0,
NarcId narcId,
s32 memberId,
@ -56,8 +54,7 @@ extern u32 NNS_G2dGetImageLocation(u32, u32);
extern void *sub_02012470(u16, u16, u16);
extern u32 NNS_G2dGetImagePaletteLocation(u32, u32);
u32 sub_0200CABC(
struct BgConfig *bgConfig, u32 layer, u32 numTiles, u32 param3, u32 heap_id)
u32 sub_0200CABC(struct BgConfig *bgConfig, u32 layer, u32 numTiles, u32 param3, HeapID heapId)
{
if (param3 == 0)
{
@ -68,7 +65,7 @@ u32 sub_0200CABC(
numTiles,
0,
FALSE,
heap_id);
heapId);
}
return GfGfxLoader_LoadCharData(NARC_GRAPHIC_WINFRAME,
@ -78,7 +75,7 @@ u32 sub_0200CABC(
numTiles,
0,
FALSE,
heap_id);
heapId);
}
s32 sub_0200CAFC(void)
@ -86,7 +83,7 @@ s32 sub_0200CAFC(void)
return NARC_winframe_narc_0024_NCLR;
}
void LoadUserFrameGfx1(struct BgConfig *bg_config, enum GFBgLayer layer, u32 num_tiles, u32 paletteNumber, u8 frame_id, u32 heap_id)
void LoadUserFrameGfx1(struct BgConfig *bg_config, enum GFBgLayer layer, u32 num_tiles, u32 paletteNumber, u8 frame_id, HeapID heapId)
{
s32 r1;
if (frame_id != 0)
@ -98,7 +95,7 @@ void LoadUserFrameGfx1(struct BgConfig *bg_config, enum GFBgLayer layer, u32 num
r1 = NARC_winframe_narc_0000_NCGR;
}
GfGfxLoader_LoadCharData(NARC_GRAPHIC_WINFRAME, r1, bg_config, layer, num_tiles, 0, FALSE, heap_id);
GfGfxLoader_LoadCharData(NARC_GRAPHIC_WINFRAME, r1, bg_config, layer, num_tiles, 0, FALSE, heapId);
if (frame_id == 2)
{
@ -111,11 +108,11 @@ void LoadUserFrameGfx1(struct BgConfig *bg_config, enum GFBgLayer layer, u32 num
if ((u32)layer < GF_BG_LYR_SUB_FIRST)
{
GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, r1, GF_PAL_LOCATION_MAIN_BG, (enum GFPalSlotOffset)(paletteNumber << 5), 32, heap_id);
GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, r1, GF_PAL_LOCATION_MAIN_BG, (enum GFPalSlotOffset)(paletteNumber << 5), 32, heapId);
return;
}
GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, r1, GF_PAL_LOCATION_SUB_BG, (enum GFPalSlotOffset)(paletteNumber << 5), 32, heap_id);
GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, r1, GF_PAL_LOCATION_SUB_BG, (enum GFPalSlotOffset)(paletteNumber << 5), 32, heapId);
}
void DrawFrame1(struct BgConfig *bgConfig,
@ -188,20 +185,19 @@ s32 sub_0200CD64(s32 param0)
return param0 + 25;
}
void sub_0200CD68(
struct BgConfig *bg_config, u32 layer, u32 num_tiles, u32 palNumber, u8 frame_id, u32 heap_id)
void sub_0200CD68(struct BgConfig *bg_config, u32 layer, u32 num_tiles, u32 palNumber, u8 frame_id, HeapID heapId)
{
GfGfxLoader_LoadCharData(
NARC_GRAPHIC_WINFRAME, sub_0200CD60(frame_id), bg_config, layer, num_tiles, 0, FALSE, heap_id);
NARC_GRAPHIC_WINFRAME, sub_0200CD60(frame_id), bg_config, layer, num_tiles, 0, FALSE, heapId);
if (layer < GF_BG_LYR_SUB_FIRST)
{
GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, sub_0200CD64(frame_id), GF_PAL_LOCATION_MAIN_BG, (enum GFPalSlotOffset)(palNumber << 5), 32, heap_id);
GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, sub_0200CD64(frame_id), GF_PAL_LOCATION_MAIN_BG, (enum GFPalSlotOffset)(palNumber << 5), 32, heapId);
return;
}
GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, sub_0200CD64(frame_id), GF_PAL_LOCATION_SUB_BG, (enum GFPalSlotOffset)(palNumber << 5), 32, heap_id);
GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, sub_0200CD64(frame_id), GF_PAL_LOCATION_SUB_BG, (enum GFPalSlotOffset)(palNumber << 5), 32, heapId);
}
void DrawFrame2(struct BgConfig *bgConfig,
@ -326,17 +322,17 @@ void BlitRect4Bit(u8 *srcPixels,
void sub_0200D18C(struct Window *window, u16 fill_value)
{
u32 heap_id = BgConfig_GetHeapId(window->bgConfig);
HeapID heapId = BgConfig_GetHeapId(window->bgConfig);
u8 bg_id = GetWindowBgId(window);
void *ptr = AllocFromHeap(heap_id, 0x180);
void *ptr = AllocFromHeap(heapId, 0x180);
void *charptr = BgGetCharPtr(bg_id);
NNSG2dCharacterData *pCharData;
void *st30;
void *st2c;
st2c = GfGfxLoader_GetCharData(
NARC_GRAPHIC_WINFRAME, NARC_winframe_narc_0022_NCGR, FALSE, &pCharData, heap_id);
NARC_GRAPHIC_WINFRAME, NARC_winframe_narc_0022_NCGR, FALSE, &pCharData, heapId);
st30 = pCharData->pRawData;
for (u8 i = 0; i < 3; i++)
@ -355,13 +351,13 @@ void sub_0200D18C(struct Window *window, u16 fill_value)
}
void sub_0200D274(
struct BgConfig *bg_config, u8 bg_id, u16 param2, u8 param3, u8 param4, u32 heap_id)
struct BgConfig *bg_config, u8 bg_id, u16 param2, u8 param3, u8 param4, HeapID heapId)
{
NNSG2dCharacterData *pCharData;
void *stc = GfGfxLoader_GetCharData(
NARC_GRAPHIC_WINFRAME, sub_0200CD60(param4), FALSE, &pCharData, heap_id);
u8 *ptr = AllocFromHeap(heap_id, 0x240);
NARC_GRAPHIC_WINFRAME, sub_0200CD60(param4), FALSE, &pCharData, heapId);
u8 *ptr = AllocFromHeap(heapId, 0x240);
memcpy(ptr, pCharData->pRawData, 0x240);
for (u32 r3 = 0; r3 < 0x240; r3++)
@ -385,23 +381,23 @@ void sub_0200D274(
FreeToHeap(ptr);
}
void sub_0200D300(struct BgConfig *bg_config, u8 bg_id, u16 numtiles, u8 palIndex, u8 param4, u16 param5, u32 heap_id) {
GfGfxLoader_LoadCharData(NARC_GRAPHIC_FIELD_BOARD, NARC_field_board_narc_0000_NCGR, bg_config, bg_id, numtiles, 0x3C0, FALSE, heap_id);
void sub_0200D300(struct BgConfig *bg_config, u8 bg_id, u16 numtiles, u8 palIndex, u8 param4, u16 param5, HeapID heapId) {
GfGfxLoader_LoadCharData(NARC_GRAPHIC_FIELD_BOARD, NARC_field_board_narc_0000_NCGR, bg_config, bg_id, numtiles, 0x3C0, FALSE, heapId);
NNSG2dPaletteData *pPltData;
void *st14;
st14 = AllocAndReadWholeNarcMemberByIdPair( NARC_GRAPHIC_FIELD_BOARD, NARC_field_board_narc_0001_NCLR, heap_id);
st14 = AllocAndReadWholeNarcMemberByIdPair( NARC_GRAPHIC_FIELD_BOARD, NARC_field_board_narc_0001_NCLR, heapId);
NNS_G2dGetUnpackedPaletteData(st14, &pPltData);
BG_LoadPlttData(bg_id, pPltData->pRawData + param4 * 0x20, 0x20, (enum GFPalSlotOffset)(u16)(palIndex << 5));
FreeToHeapExplicit(heap_id, st14);
FreeToHeapExplicit(heapId, st14);
if (param4 <= 1) {
sub_0200D378(bg_config, bg_id, (u16)(numtiles + 30), param4, param5, heap_id);
sub_0200D378(bg_config, bg_id, (u16)(numtiles + 30), param4, param5, heapId);
}
}
void sub_0200D378(
struct BgConfig *bg_config, u8 bg_id, u16 numtiles, u8 param3, u16 param4, u32 heap_id)
struct BgConfig *bg_config, u8 bg_id, u16 numtiles, u8 param3, u16 param4, HeapID heapId)
{
if (param3 == 0)
{
@ -412,8 +408,7 @@ void sub_0200D378(
param4 += 2;
}
GfGfxLoader_LoadCharData(
NARC_GRAPHIC_FIELD_BOARD, param4, bg_config, bg_id, numtiles, 0x300, FALSE, heap_id);
GfGfxLoader_LoadCharData(NARC_GRAPHIC_FIELD_BOARD, param4, bg_config, bg_id, numtiles, 0x300, FALSE, heapId);
}
void DrawFrame3(struct BgConfig *bgConfig,
@ -578,12 +573,12 @@ void ClearFrameAndWindow3(struct Window *window, u8 param1, BOOL copy_to_vram)
}
WaitingIcon *WaitingIcon_New(struct Window *window, u32 param1) {
u32 heap_id = BgConfig_GetHeapId(window->bgConfig);
HeapID heapId = BgConfig_GetHeapId(window->bgConfig);
void *charptr = BgGetCharPtr(GetWindowBgId(window));
WaitingIcon *waitingIcon = AllocFromHeap(heap_id, sizeof(WaitingIcon));
WaitingIcon *waitingIcon = AllocFromHeap(heapId, sizeof(WaitingIcon));
memcpy(waitingIcon->unk004[8], charptr + (param1 + 18) * 32, 0x80);
void *ptr2 = AllocFromHeap(heap_id, 0x80);
void *ptr2 = AllocFromHeap(heapId, 0x80);
memcpy(ptr2, charptr + (param1 + 10) * 32, 0x20);
memcpy(ptr2 + 0x20, charptr + (param1 + 11) * 32, 0x20);
memcpy(ptr2 + 0x40, charptr + (param1 + 10) * 32, 0x20);
@ -595,7 +590,7 @@ WaitingIcon *WaitingIcon_New(struct Window *window, u32 param1) {
FreeToHeap(ptr2);
NNSG2dCharacterData *pCharData;
void *r5 = GfGfxLoader_GetCharData(NARC_GRAPHIC_WINFRAME, NARC_winframe_narc_0023_NCGR, FALSE, &pCharData, heap_id);
void *r5 = GfGfxLoader_GetCharData(NARC_GRAPHIC_WINFRAME, NARC_winframe_narc_0023_NCGR, FALSE, &pCharData, heapId);
BlitRect4Bit(pCharData->pRawData, 0, 0, 0x10, 0x80, waitingIcon->unk004[0], 0x10, 0x80, 0, 0, 0x10, 0x80);
FreeToHeap(r5);
@ -671,10 +666,11 @@ void sub_0200DC24(WaitingIcon *waitingIcon) {
waitingIcon->unk488 = 2;
}
PokepicManager *DrawPokemonPicFromSpecies(struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, u8 param4, u16 numTiles, u16 species, u8 gender, s32 heapId)
PokepicManager *DrawPokemonPicFromSpecies(struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, u8 param4, u16 numTiles, u16 species, u8 gender, HeapID heapId)
{
struct UnkStruct_0200CABC_2 *r4 = sub_0200DD70(bg_config, bg_id, param2, param3, heapId);
sub_0200DDAC(r4, heapId);
s32 heap = heapId; //weirdness needed for matching
struct UnkStruct_0200CABC_2 *r4 = sub_0200DD70(bg_config, bg_id, param2, param3, (HeapID)heap);
sub_0200DDAC(r4, (HeapID)heap);
sub_0200DDD8(r4);
sub_0200DE30(r4, param2, param3);
sub_0200DE80(r4, species, gender);
@ -684,10 +680,11 @@ PokepicManager *DrawPokemonPicFromSpecies(struct BgConfig *bg_config, u8 bg_id,
return &r4->pokepicManager;
}
PokepicManager *DrawPokemonPicFromMon(struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, u8 param4, u16 numTiles, struct Pokemon *mon, s32 heapId)
PokepicManager *DrawPokemonPicFromMon(struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, u8 param4, u16 numTiles, struct Pokemon *mon, HeapID heapId)
{
struct UnkStruct_0200CABC_2 *r4 = sub_0200DD70(bg_config, bg_id, param2, param3, heapId);
sub_0200DDAC(r4, heapId);
s32 heap = heapId; //weirdness needed for matching
struct UnkStruct_0200CABC_2 *r4 = sub_0200DD70(bg_config, bg_id, param2, param3, (HeapID)heap);
sub_0200DDAC(r4, (HeapID)heap);
sub_0200DDD8(r4);
sub_0200DE30(r4, param2, param3);
sub_0200DEC0(r4, mon);
@ -724,9 +721,9 @@ void sub_0200DCF8(u32 param0, void *param1)
}
struct UnkStruct_0200CABC_2 *sub_0200DD70(
struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, u32 param4)
struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, HeapID heapId)
{
struct UnkStruct_0200CABC_2 *res = sub_0201B6C8(sub_020061E8(sub_0200DCF8, 0x170, 0, param4));
struct UnkStruct_0200CABC_2 *res = sub_0201B6C8(sub_020061E8(sub_0200DCF8, 0x170, 0, heapId));
res->pokepicManager.unk00 = 0;
res->bgConfig = bg_config;
@ -737,7 +734,7 @@ struct UnkStruct_0200CABC_2 *sub_0200DD70(
return res;
}
void sub_0200DDAC(struct UnkStruct_0200CABC_2 *param0, u32 param1)
void sub_0200DDAC(struct UnkStruct_0200CABC_2 *param0, HeapID heapId)
{
const u32 UNK_020ECEA8[] = {
@ -748,7 +745,7 @@ void sub_0200DDAC(struct UnkStruct_0200CABC_2 *param0, u32 param1)
0x00,
0x00,
};
ov05_021D959C(param0, UNK_020ECEA8, 1, param1);
ov05_021D959C(param0, UNK_020ECEA8, 1, heapId);
}
void sub_0200DDD8(struct UnkStruct_0200CABC_2 *param0)
@ -785,7 +782,7 @@ void sub_0200DE30(struct UnkStruct_0200CABC_2 *param0, u8 param1, u8 param2)
void sub_0200DE80(struct UnkStruct_0200CABC_2 *param0, u16 param1, u8 param2)
{
struct UnkStruct_02006D98 *r7 = sub_02006D98(param0->unk162);
struct UnkStruct_02006D98 *r7 = sub_02006D98((HeapID)param0->unk162);
struct SomeDrawPokemonStruct stc;
sub_02068C00(&stc, param1, param2, 2, 0, 0, 0);
sub_0200DEF4(param0, &stc);
@ -794,7 +791,7 @@ void sub_0200DE80(struct UnkStruct_0200CABC_2 *param0, u16 param1, u8 param2)
void sub_0200DEC0(struct UnkStruct_0200CABC_2 *param0, struct Pokemon *param1)
{
struct UnkStruct_02006D98 *r6 = sub_02006D98(param0->unk162);
struct UnkStruct_02006D98 *r6 = sub_02006D98((HeapID)param0->unk162);
struct SomeDrawPokemonStruct st0;
sub_02068B68(&st0, param1, 2);
sub_0200DEF4(param0, &st0);
@ -804,7 +801,7 @@ void sub_0200DEC0(struct UnkStruct_0200CABC_2 *param0, struct Pokemon *param1)
void sub_0200DEF4(
struct UnkStruct_0200CABC_2 *param0, struct SomeDrawPokemonStruct *param1)
{
void *r4 = AllocFromHeap(param0->unk162, 0x1900);
void *r4 = AllocFromHeap((HeapID)param0->unk162, 0x1900);
struct UnkStruct_0200CABC_3 st18 = UNK_020ECE98;
sub_02012400(param1->unk0, param1->unk2, param0->unk162, &st18, r4);

4
arm9/src/sav_chatot.c
View File

@ -14,9 +14,9 @@ void Save_Chatot_Init(struct SaveChatotSoundClip * chatot)
chatot->exists = FALSE;
}
struct SaveChatotSoundClip * Chatot_New(u32 heap_id)
struct SaveChatotSoundClip * Chatot_New(HeapID heapId)
{
struct SaveChatotSoundClip * ret = (struct SaveChatotSoundClip *)AllocFromHeap(heap_id, sizeof(struct SaveChatotSoundClip));
struct SaveChatotSoundClip * ret = (struct SaveChatotSoundClip *)AllocFromHeap(heapId, sizeof(struct SaveChatotSoundClip));
Save_Chatot_Init(ret);
return ret;
}

16
arm9/src/save.c
View File

@ -18,7 +18,7 @@ static SaveData *sSaveDataPtr;
struct SaveData * SaveData_New(void)
{
struct SaveData * save = AllocFromHeap(1, sizeof(struct SaveData));
struct SaveData * save = AllocFromHeap(HEAP_ID_1, sizeof(struct SaveData));
MI_CpuClearFast(save, sizeof(struct SaveData));
sSaveDataPtr = save;
save->flashOkay = SaveDetectFlash();
@ -69,7 +69,7 @@ void * sub_02022634(struct SaveData * save, int idx)
BOOL sub_0202263C(struct SaveData * save)
{
u8 * r6 = AllocFromHeapAtEnd(3, 0x1000);
u8 * r6 = AllocFromHeapAtEnd(HEAP_ID_MAIN, 0x1000);
sub_02016444(1);
FlashClobberChunkFooter(save, 0, (u32)(save->unk_20220[0] == 0 ? 1 : 0));
FlashClobberChunkFooter(save, 1, (u32)(save->unk_20220[1] == 0 ? 1 : 0));
@ -358,8 +358,8 @@ int sub_02022AD8(struct SaveData * save)
u32 sp8;
u32 sp4;
{
u8 *r6 = AllocFromHeapAtEnd(3, 0x20000);
u8 *r4 = AllocFromHeapAtEnd(3, 0x20000);
u8 *r6 = AllocFromHeapAtEnd(HEAP_ID_MAIN, 0x20000);
u8 *r4 = AllocFromHeapAtEnd(HEAP_ID_MAIN, 0x20000);
if (FlashLoadChunk(0, r6, 0x20000))
{
sub_0202293C(&sp2C[0], save, r6, 0);
@ -763,7 +763,7 @@ int WriteSaveFileToFlash(struct SaveData * save, int idx, u8 * data)
return 3;
}
u8 * ReadSaveFileFromFlash(struct SaveData * save, u32 heap_id, int idx, int * ret_p)
u8 * ReadSaveFileFromFlash(struct SaveData * save, HeapID heapId, int idx, int * ret_p)
{
GF_ASSERT(idx < UNK_020EE6D8);
const struct SaveChunkHeader * sch = &UNK_020EE6E0[idx];
@ -773,7 +773,7 @@ u8 * ReadSaveFileFromFlash(struct SaveData * save, u32 heap_id, int idx, int * r
u32 sp8;
int r7;
u32 sp4;
u8 * r6 = AllocFromHeap(heap_id, sp10);
u8 * r6 = AllocFromHeap(heapId, sp10);
FlashLoadChunk((u32)(sch->linkedId << 12), r6, sp10);
spC = ValidateChunk(save, r6, idx, sch->sizeFunc());
sp8 = sub_020232B4(r6, sch->sizeFunc());
@ -853,7 +853,7 @@ BOOL FlashLoadChunk(u32 src, void * dest, u32 size)
if (!r5)
{
FreeToHeap(sSaveDataPtr);
ShowSaveDataReadError(1);
ShowSaveDataReadError(HEAP_ID_1);
}
return r5;
}
@ -907,5 +907,5 @@ void SaveErrorHandling(int lock, u32 errno)
CARD_UnlockBackup((u16)lock);
OS_ReleaseLockID((u16)lock);
FreeToHeap(sSaveDataPtr);
ShowSaveDataWriteError(1, errno);
ShowSaveDataWriteError(HEAP_ID_1, errno);
}

2
arm9/src/save_arrays.c
View File

@ -68,7 +68,7 @@ const struct SaveChunkHeader UNK_020EE700[] = {
{ 1, 0, (SAVSIZEFN)Save_PlayerData_sizeof, (SAVINITFN)Save_PlayerData_Init },
{ 2, 0, (SAVSIZEFN)SaveArray_Party_sizeof, (SAVINITFN)SaveArray_Party_Init },
{ 3, 0, (SAVSIZEFN)Save_Bag_sizeof, (SAVINITFN)Save_Bag_Init },
{ 4, 0, (SAVSIZEFN)SaveArray_Flags_sizeof, (SAVINITFN)SaveArray_Flags_Init },
{ 4, 0, (SAVSIZEFN)Save_VarsFlags_sizeof, (SAVINITFN)Save_VarsFlags_Init },
{ 5, 0, (SAVSIZEFN)Save_Poketch_sizeof, (SAVINITFN)Save_Poketch_Init },
{ 6, 0, (SAVSIZEFN)sub_02034D7C, (SAVINITFN)sub_02034D98 },
{ 7, 0, (SAVSIZEFN)Save_Pokedex_sizeof, (SAVINITFN)Save_Pokedex_Init },

28
arm9/src/save_data_read_error.c
View File

@ -59,7 +59,7 @@ static const struct GraphicsBanks sSaveDataReadErrorGraphicsBanks = {
.texpltt = GX_VRAM_TEXPLTT_NONE,
};
void ShowSaveDataReadError(u32 heap_id)
void ShowSaveDataReadError(HeapID heapId)
{
struct Window window;
@ -85,20 +85,20 @@ void ShowSaveDataReadError(u32 heap_id)
GXS_SetVisibleWnd(0);
GX_SetBanks(&sSaveDataReadErrorGraphicsBanks);
struct BgConfig* bg_config = BgConfig_Alloc(heap_id);
struct BgConfig* bg_config = BgConfig_Alloc(heapId);
SetBothScreensModesAndDisable(&sSaveDataReadErrorGraphicsModes);
InitBgFromTemplate(bg_config, 0, &sSaveDataReadErrorBgTemplate, 0);
BgClearTilemapBufferAndCommit(bg_config, GF_BG_LYR_MAIN_0);
LoadUserFrameGfx1(bg_config, GF_BG_LYR_MAIN_0, 0x01F7, 2, 0, heap_id);
LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_1, heap_id);
BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, heap_id);
LoadUserFrameGfx1(bg_config, GF_BG_LYR_MAIN_0, 0x01F7, 2, 0, heapId);
LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_1, heapId);
BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, heapId);
BG_SetMaskColor(GF_BG_LYR_MAIN_0, GX_RGB(1, 1, 27));
BG_SetMaskColor(GF_BG_LYR_SUB_0, GX_RGB(1, 1, 27));
struct MsgData* msg_data = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0005_bin, heap_id);
struct String* str = String_New(384, heap_id);
struct MsgData* msg_data = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0005_bin, heapId);
struct String* str = String_New(384, heapId);
ResetAllTextPrinters();
@ -122,7 +122,7 @@ void ShowSaveDataReadError(u32 heap_id)
}
}
void ShowGBACartRemovedError(u32 heap_id)
void ShowGBACartRemovedError(HeapID heapId)
{
struct Window window;
@ -148,20 +148,20 @@ void ShowGBACartRemovedError(u32 heap_id)
GXS_SetVisibleWnd(0);
GX_SetBanks(&sSaveDataReadErrorGraphicsBanks);
struct BgConfig* bg_config = BgConfig_Alloc(heap_id);
struct BgConfig* bg_config = BgConfig_Alloc(heapId);
SetBothScreensModesAndDisable(&sSaveDataReadErrorGraphicsModes);
InitBgFromTemplate(bg_config, 0, &sSaveDataReadErrorBgTemplate, 0);
BgClearTilemapBufferAndCommit(bg_config, GF_BG_LYR_MAIN_0);
LoadUserFrameGfx1(bg_config, GF_BG_LYR_MAIN_0, 0x01F7, 2, 0, heap_id);
LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_1, heap_id);
BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, heap_id);
LoadUserFrameGfx1(bg_config, GF_BG_LYR_MAIN_0, 0x01F7, 2, 0, heapId);
LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_1, heapId);
BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, heapId);
BG_SetMaskColor(GF_BG_LYR_MAIN_0, GX_RGB(1, 1, 27));
BG_SetMaskColor(GF_BG_LYR_SUB_0, GX_RGB(1, 1, 27));
struct MsgData* msg_data = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0005_bin, heap_id);
struct String* str = String_New(384, heap_id);
struct MsgData* msg_data = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0005_bin, heapId);
struct String* str = String_New(384, heapId);
ResetAllTextPrinters();

14
arm9/src/save_data_write_error.c
View File

@ -59,7 +59,7 @@ static const struct GraphicsBanks sSaveDataWriteErrorGraphicsBanks = {
.texpltt = GX_VRAM_TEXPLTT_NONE,
};
void ShowSaveDataWriteError(u32 heap_id, u32 err_no)
void ShowSaveDataWriteError(HeapID heapId, u32 err_no)
{
struct Window window;
@ -93,20 +93,20 @@ void ShowSaveDataWriteError(u32 heap_id, u32 err_no)
GXS_SetVisibleWnd(0);
GX_SetBanks(&sSaveDataWriteErrorGraphicsBanks);
struct BgConfig* bg_config = BgConfig_Alloc(heap_id);
struct BgConfig* bg_config = BgConfig_Alloc(heapId);
SetBothScreensModesAndDisable(&sSaveDataWriteErrorGraphicsModes);
InitBgFromTemplate(bg_config, 0, &sSaveDataWriteErrorBgTemplate, 0);
BgClearTilemapBufferAndCommit(bg_config, GF_BG_LYR_MAIN_0);
LoadUserFrameGfx1(bg_config, GF_BG_LYR_MAIN_0, 0x01F7, 2, 0, heap_id);
LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_1, heap_id);
BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, heap_id);
LoadUserFrameGfx1(bg_config, GF_BG_LYR_MAIN_0, 0x01F7, 2, 0, heapId);
LoadFontPal0(GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_OFFSET_1, heapId);
BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, heapId);
BG_SetMaskColor(GF_BG_LYR_MAIN_0, GX_RGB(1, 1, 27));
BG_SetMaskColor(GF_BG_LYR_SUB_0, GX_RGB(1, 1, 27));
struct MsgData* msg_data = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0006_bin, heap_id);
struct String* str = String_New(384, heap_id);
struct MsgData* msg_data = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0006_bin, heapId);
struct String* str = String_New(384, heapId);
ResetAllTextPrinters();

254
arm9/src/scrcmd.c
View File

@ -19,6 +19,7 @@
#include "poketch.h"
#include "pokedex.h"
#include "render_window.h"
#include "safari_zone.h"
#include "save.h"
#include "seal.h"
#include "task.h"
@ -26,11 +27,14 @@
#include "text_02054590.h"
#include "unk_0200CA44.h"
#include "unk_020139D8.h"
#include "unk_02029FB0.h"
#include "unk_020337E8.h"
#include "unk_020377F0.h"
#include "unk_0204AF24.h"
#include "unk_0204B0A0.h"
#include "unk_0205EC84.h"
#include "unk_0206015C.h"
#include "unk_02064E20.h"
#include "unk_0208890C.h"
extern void *FieldSysGetAttrAddr(FieldSystem *fieldSystem, enum ScriptEnvField id);
@ -154,11 +158,11 @@ extern HallOfFame *sub_02038824(FieldSystem *fieldSystem);
extern void sub_020386E0(FieldSystem *fieldSystem, u16 param1);
extern void sub_0206F3D8(TaskManager *taskManager, u16 *param1);
extern void sub_020386A4(FieldSystem *fieldSystem, StarterSelectionData *starterSelectionData);
extern void sub_0205F378(ScriptState *flags, u16 state);
extern void sub_0205F378(SaveVarsFlags *flags, u16 state);
extern BagScreenAppData *sub_0203789C(FieldSystem *fieldSystem, u8 mode);
extern u16 sub_020378FC(BagScreenAppData *bagScreenAppData);
extern void sub_02037E18(TaskManager *taskManager, u16 *param1, u16 *param2, u16 *param3);
extern void BeginNormalPaletteFade(u32 pattern, u32 typeTop, u32 typeBottom, u16 colour, u32 duration, u32 framesPer, u32 heapId);
extern void BeginNormalPaletteFade(u32 pattern, u32 typeTop, u32 typeBottom, u16 colour, u32 duration, u32 framesPer, HeapID heapId);
extern void sub_0200E388(u32 param0);
extern BOOL IsPaletteFadeFinished(void);
extern void CallTask_ScriptWarp(TaskManager *taskManager, u16 mapId, s32 param2, u16 x, u16 y, u16 dir);
@ -190,7 +194,7 @@ extern void PlayerAvatar_OrrTransitionFlags(PlayerAvatar *playerAvatar, u32 tran
extern RoamerSaveData *Save_Roamers_Get(SaveData *save);
extern u32 Roamers_GetRand(RoamerSaveData *roamerSaveData, u32 index);
extern void GetSwarmInfoFromRand(u32 rand, u16 *map, u16 *species);
extern u16 ScriptState_GetStarter(ScriptState *state);
extern u16 Save_VarsFlags_GetStarter(SaveVarsFlags *state);
extern u32 ov06_022407DC(void);
extern void ov06_02240790(FieldSystem *fieldSystem, u16 param1, u16 param2, u16 param3);
extern void ov06_022407F8(FieldSystem *fieldSystem, u16 param1, u16 param2, u16 param3);
@ -291,16 +295,34 @@ extern void *sub_02029120(u32 param0);
extern void *sub_0202912C(u32 param0);
extern void *sub_02029138(u16 param0, u32 param1);
extern void *sub_0202914C(u8 param0, u16 param1, u32 param2);
extern void sub_0205F3F8(ScriptState *state, u32 param1);
extern void sub_0205F3F8(SaveVarsFlags *state, u32 param1);
extern FashionCase *Save_FashionData_GetFashionCase(SaveFashionData *saveFashionData);
extern void sub_020271A4(FashionCase *fashionCase, u16 param1, u16 param2);
extern u16 sub_020270D8(FashionCase *fashionCase, u16 param1, u16 param2);
extern u16 sub_02027114(FashionCase *fashionCase, u16 param1);
extern void sub_02027264(FashionCase *fashionCase, u16 param1);
extern u16 sub_02027100(FashionCase *fashionCase, u16 param1);
extern PokedexAppData *sub_02038AF4(FieldSystem *fieldSystem, u32 heapId, BOOL isNational);
extern PokedexAppData *sub_02038AF4(FieldSystem *fieldSystem, HeapID heapId, BOOL isNational);
extern void ov06_0224CBB0(SaveData *saveData);
extern u16 ov06_0224CC24(SaveData *saveData);
extern SafariZone *Save_SafariZone_Get(SaveData *saveData);
extern u16 *LocalFieldData_GetSafariBallsCounter(LocalFieldData *localFieldData);
extern u16 *LocalFieldData_GetSafariStepsCounter(LocalFieldData *localFieldData);
extern void Save_VarsFlags_SetSafariSysFlag(SaveVarsFlags *varsFlags);
extern void sub_02060FD0(SafariZone *safariZone);
extern void Save_VarsFlags_ClearSafariSysFlag(SaveVarsFlags *varsFlags);
extern void sub_02061574(FieldSystem *fieldSystem);
extern u16 SpearPillarSequence(FieldSystem *fieldSystem, u8 operation);
extern void sub_0200433C(u32 param0, u32 param1, u32 param2);
extern void ov06_0224525C(FieldSystem *fieldSystem, u16 var, u16 type);
extern u16 ov06_02245340(FieldSystem *fieldSystem, u16 position);
extern void PlayerAvatar_ToggleAutomaticHeightUpdating(PlayerAvatar *avatar, u8 flag);
extern u16 Save_VarsFlags_GetSpiritombTalkCounter(SaveVarsFlags *varsFlags);
extern void sub_0205F5A4(SaveVarsFlags *varsFlags, u16 param1);
extern u16 sub_0205F594(SaveVarsFlags *varsFlags);
extern void sub_0202AA00(SaveData *saveData);
extern void Save_CreateRoamerByID(SaveData *saveData, u8 roamer);
extern NPCTradeAppData *NPCTradeApp_Init(HeapID heapId, u8 tradeId);
u8 UNK_021C5A0C[4];
@ -330,7 +352,7 @@ static BOOL sub_0203B218(ScriptContext *ctx);
static BOOL sub_0203BBBC(ScriptContext *ctx);
/*static*/ BOOL sub_0203BC04(ScriptContext *ctx);
static BOOL CheckPortraitSlotFullInternal(FieldSystem *fieldSystem, BOOL isContest, u32 portraitSlot);
static FashionAppData *sub_0203BC6C(u32 heapId, FieldSystem *fieldSystem, BOOL isContest, u32 portraitSlot);
static FashionAppData *sub_0203BC6C(HeapID heapId, FieldSystem *fieldSystem, BOOL isContest, u32 portraitSlot);
static BOOL sub_0203BE9C(ScriptContext *ctx);
static BOOL sub_0203C71C(ScriptContext *ctx);
static BOOL sub_0203C9F8(ScriptContext *ctx);
@ -765,7 +787,7 @@ BOOL ScrCmd_MessageFrom(ScriptContext *ctx) //01FA - todo: MessageAllFromNarc?
{
u16 arc = ScriptGetVar(ctx);
u16 msg = ScriptGetVar(ctx);
MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, arc, 32);
MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, arc, HEAP_ID_32);
ov05_ShowMessageInField(ctx, msgData, msg);
DestroyMsgData(msgData);
return FALSE;
@ -775,7 +797,7 @@ BOOL ScrCmd_MessageFrom2(ScriptContext *ctx) //01FB - todo: MessageFromNarc?
{
u16 arc = ScriptGetVar(ctx);
u16 msg = ScriptGetVar(ctx);
MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, arc, 32);
MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, arc, HEAP_ID_32);
ov05_021E2BD0(ctx, msgData, msg, 1, NULL);
DestroyMsgData(msgData);
SetupNativeScript(ctx, sub_0203A2F0);
@ -817,7 +839,7 @@ BOOL ScrCmd_Unk01FE(ScriptContext *ctx) //01FE
u16 *unkArr = ctx->fieldSystem->unkA8->unk90[id].unk0;
if (unkArr[0] == 0xFFFF)
{
MsgData *msgdata = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, 0x22b, 32);
MsgData *msgdata = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, 0x22b, HEAP_ID_32);
ov05_021E2BD0(ctx, msgdata, unkArr[1], 1, NULL);
DestroyMsgData(msgdata);
}
@ -1301,7 +1323,7 @@ BOOL ScrCmd_YesNoMenu(ScriptContext *ctx) { //003E
FieldSystem *fieldSystem = ctx->fieldSystem;
u32 *unk = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_LIST_MENU_2D);
u16 wk = ScriptReadHalfword(ctx);
LoadUserFrameGfx1(fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, 985, 11, 0, 4);
LoadUserFrameGfx1(fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, 985, 11, 0, HEAP_ID_4);
*unk = Std_CreateYesNoMenu(fieldSystem->bgConfig, &UNK_020F34E0, 985, 11, 4);
ctx->data[0] = wk;
SetupNativeScript(ctx, sub_0203AB00);
@ -1523,7 +1545,7 @@ BOOL ScrCmd_Unk02A1(ScriptContext *ctx) { //02A1
GF_ASSERT(event);
u16 *unk4 = AllocFromHeap(4, 0x100);
u16 *unk4 = AllocFromHeap(HEAP_ID_4, 0x100);
u16 xVal = (u16)sub_02058B2C(event);
u16 yVal = (u16)sub_02058B4C(event);
@ -1583,7 +1605,7 @@ static BOOL IsAllMovementFinished(ScriptContext *ctx) {
}
static void sub_0203B174(FieldSystem *fieldSystem, u32 param1, void *param2) {
UnkStruct_0203B174 *unkStruct = (UnkStruct_0203B174 *)AllocFromHeap(4, sizeof(UnkStruct_0203B174));
UnkStruct_0203B174 *unkStruct = (UnkStruct_0203B174 *)AllocFromHeap(HEAP_ID_4, sizeof(UnkStruct_0203B174));
if (unkStruct == NULL)
{
GF_AssertFail();
@ -1689,7 +1711,7 @@ BOOL ScrCmd_LockAllEvents2(ScriptContext *ctx) { //02B4
sub_02058914(*lastInteracted);
}
if (unk1 != NULL) {
ScriptState *state = SaveArray_Flags_Get(fieldSystem->saveData);
SaveVarsFlags *state = Save_VarsFlags_Get(fieldSystem->saveData);
if (sub_0205ED3C(state) == TRUE) {
if (sub_02058854(unk1) != 0) {
UNK_021C5A0C[0] |= 2;
@ -2067,7 +2089,7 @@ static BOOL CheckPortraitSlotFullInternal(FieldSystem *fieldSystem, BOOL isConte
return TRUE;
}
static FashionAppData *sub_0203BC6C(u32 heapId, FieldSystem *fieldSystem, BOOL isContest, u32 portraitSlot) {
static FashionAppData *sub_0203BC6C(HeapID heapId, FieldSystem *fieldSystem, BOOL isContest, u32 portraitSlot) {
SaveFashionData *fashionData = Save_FashionData_Get(fieldSystem->saveData);
if (!CheckPortraitSlotFullInternal(fieldSystem, isContest, portraitSlot)) {
return NULL;
@ -2108,8 +2130,8 @@ BOOL ScrCmd_ShowPokemonPic(ScriptContext *ctx) { //0208
PokepicManager **pokepicManager = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR);
u16 species = ScriptGetVar(ctx);
u16 gender = ScriptGetVar(ctx);
LoadUserFrameGfx1(ctx->fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, 0x3D9, 11, 0, 4);
*pokepicManager = DrawPokemonPicFromSpecies(ctx->fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, 10, 5, 11, 0x3D9, species, gender, 4);
LoadUserFrameGfx1(ctx->fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, 0x3D9, 11, 0, HEAP_ID_4);
*pokepicManager = DrawPokemonPicFromSpecies(ctx->fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, 10, 5, 11, 0x3D9, species, gender, HEAP_ID_4);
Script_SetMonSeenFlagBySpecies(ctx->fieldSystem, species);
return FALSE;
}
@ -2118,8 +2140,8 @@ BOOL ScrCmd_ShowPartyPokemonPic(ScriptContext *ctx) { //028C
PokepicManager **pokepicManager = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR);
u16 partyId = ScriptGetVar(ctx);
Pokemon *mon = GetPartyMonByIndex(SaveArray_PlayerParty_Get(ctx->fieldSystem->saveData), partyId);
LoadUserFrameGfx1(ctx->fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, 0x3D9, 11, 0, 4);
*pokepicManager = DrawPokemonPicFromMon(ctx->fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, 10, 5, 11, 0x3D9, mon, 4);
LoadUserFrameGfx1(ctx->fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, 0x3D9, 11, 0, HEAP_ID_4);
*pokepicManager = DrawPokemonPicFromMon(ctx->fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, 10, 5, 11, 0x3D9, mon, HEAP_ID_4);
u32 species = GetMonData(mon, MON_DATA_SPECIES, NULL);
Script_SetMonSeenFlagBySpecies(ctx->fieldSystem, (u16)species);
return FALSE;
@ -2182,7 +2204,7 @@ BOOL ScrCmd_ShowDressedPokemon(ScriptContext *ctx) { //00A7
FashionAppData **fashionAppData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA);
u16 portraitSlot = ScriptReadHalfword(ctx);
u16 *var = ScriptGetVarPointer(ctx);
*fashionAppData = sub_0203BC6C(11, ctx->fieldSystem, FALSE, portraitSlot);
*fashionAppData = sub_0203BC6C(HEAP_ID_FIELD, ctx->fieldSystem, FALSE, portraitSlot);
if (*fashionAppData == NULL) {
*var = 1;
return TRUE;
@ -2197,7 +2219,7 @@ BOOL ScrCmd_ShowContestPokemon(ScriptContext *ctx) { //00A8
FashionAppData **fashionAppData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA);
u16 portraitSlot = ScriptReadHalfword(ctx);
u16 *var = ScriptGetVarPointer(ctx);
*fashionAppData = sub_0203BC6C(11, ctx->fieldSystem, TRUE, portraitSlot);
*fashionAppData = sub_0203BC6C(HEAP_ID_FIELD, ctx->fieldSystem, TRUE, portraitSlot);
if (*fashionAppData == NULL) {
*var = 1;
return TRUE;
@ -2250,7 +2272,7 @@ BOOL ScrCmd_ShowSealCapsuleEditor(ScriptContext *ctx) { //00A9
BOOL ScrCmd_ShowTownMapScreen(ScriptContext *ctx) { //00AA
TownMapAppData **townMap = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA);
*townMap = AllocFromHeap(11, sizeof(TownMapAppData));
*townMap = AllocFromHeap(HEAP_ID_FIELD, sizeof(TownMapAppData));
sub_0205F7A0(ctx->fieldSystem, *townMap, 2); //TownMap_Init?
sub_02037E90(ctx->fieldSystem, *townMap); //ShowTownMap?
SetupNativeScript(ctx, sub_0203BB90);
@ -2260,7 +2282,7 @@ BOOL ScrCmd_ShowTownMapScreen(ScriptContext *ctx) { //00AA
BOOL ScrCmd_Unk01D7(ScriptContext *ctx) { //01D7 - TODO: ShowPoffinCaseScreen?
PoffinCaseAppData **poffinCaseAppData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA);
u8 unk0 = ScriptReadHalfword(ctx);
*poffinCaseAppData = sub_02088960(ctx->fieldSystem, unk0, 11);
*poffinCaseAppData = sub_02088960(ctx->fieldSystem, unk0, HEAP_ID_FIELD);
SetupNativeScript(ctx, sub_0203BB90);
return TRUE;
}
@ -2284,7 +2306,7 @@ BOOL ScrCmd_Unk01D9(ScriptContext *ctx) { //01D9
u16 unk0 = ScriptGetVar(ctx);
u16 unk1 = ScriptGetVar(ctx);
ScrCmdUnkStruct01D9 **unkStructPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA);
*unkStructPtr = AllocFromHeap(11, sizeof(ScrCmdUnkStruct01D9));
*unkStructPtr = AllocFromHeap(HEAP_ID_FIELD, sizeof(ScrCmdUnkStruct01D9));
ScrCmdUnkStruct01D9 *unkStruct = *unkStructPtr;
MI_CpuFill8(unkStruct, 0, sizeof(ScrCmdUnkStruct01D9)); //consider inlining as is in heartgold
unkStruct->unk04 = unk0;
@ -2297,7 +2319,7 @@ BOOL ScrCmd_Unk01D9(ScriptContext *ctx) { //01D9
BOOL ScrCmd_ShowPCBoxScreen(ScriptContext *ctx) { //00AB
PCBoxAppData **pcBoxAppDataPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA);
PCBoxAppData *pcBoxAppData = AllocFromHeap(11, sizeof(PCBoxAppData)); //also seems inlined
PCBoxAppData *pcBoxAppData = AllocFromHeap(HEAP_ID_FIELD, sizeof(PCBoxAppData)); //also seems inlined
pcBoxAppData->save = ctx->fieldSystem->saveData;
pcBoxAppData->operation = (enum PCBoxOperation)ScriptReadByte(ctx);
*pcBoxAppDataPtr = pcBoxAppData;
@ -2362,7 +2384,7 @@ BOOL ScrCmd_Unk00B3(ScriptContext *ctx) { //00B3
BOOL ScrCmd_StarterSelectionScreen(ScriptContext *ctx) { //00B4
StarterSelectionData **starterSelectionPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR);
*starterSelectionPtr = AllocFromHeap(11, sizeof(StarterSelectionData));
*starterSelectionPtr = AllocFromHeap(HEAP_ID_FIELD, sizeof(StarterSelectionData));
StarterSelectionData *starterSelectionData = *starterSelectionPtr; //consider inlining
starterSelectionData->options = Save_PlayerData_GetOptionsAddr(ctx->fieldSystem->saveData);
sub_020386A4(ctx->fieldSystem, *starterSelectionPtr);
@ -2372,7 +2394,7 @@ BOOL ScrCmd_StarterSelectionScreen(ScriptContext *ctx) { //00B4
BOOL ScrCmd_EndStarterSelectionScreen(ScriptContext *ctx) { //00B5
StarterSelectionData **starterSelectionData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR);
ScriptState *flags = SaveArray_Flags_Get(ctx->fieldSystem->saveData);
SaveVarsFlags *flags = Save_VarsFlags_Get(ctx->fieldSystem->saveData);
sub_0205F378(flags, (*starterSelectionData)->state);
FreeToHeap(*starterSelectionData);
return FALSE;
@ -2463,7 +2485,7 @@ BOOL ScrCmd_FadeScreen(ScriptContext *ctx) { //00BC8
u16 speed = ScriptReadHalfword(ctx);
u16 type = ScriptReadHalfword(ctx);
u16 colour = ScriptReadHalfword(ctx);
BeginNormalPaletteFade(0, type, type, colour, duration, speed, 4);
BeginNormalPaletteFade(0, type, type, colour, duration, speed, HEAP_ID_4);
sub_0200E388(0);
sub_0200E388(1);
return FALSE;
@ -2649,7 +2671,7 @@ BOOL ScrCmd_GetSwarmInfo(ScriptContext *ctx) { //00E3
BOOL ScrCmd_GetStarter(ScriptContext *ctx) { //00DE
u16 *var = ScriptGetVarPointer(ctx);
*var = ScriptState_GetStarter(SaveArray_Flags_Get(ctx->fieldSystem->saveData));
*var = Save_VarsFlags_GetStarter(Save_VarsFlags_Get(ctx->fieldSystem->saveData));
return FALSE;
}
@ -2663,7 +2685,7 @@ BOOL ScrCmd_TrainerMessage(ScriptContext *ctx) { //00E6
u16 trainerId = ScriptGetVar(ctx);
u16 msgNo = ScriptGetVar(ctx);
GetTrainerMessageByIdPair(trainerId, msgNo, *string, 11);
GetTrainerMessageByIdPair(trainerId, msgNo, *string, HEAP_ID_FIELD);
FillWindowPixelBuffer(FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_WINDOW), 15);
*printerNumber = sub_02054658(FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_WINDOW), *string, Save_PlayerData_GetOptionsAddr(ctx->fieldSystem->saveData), TRUE);
SetupNativeScript(ctx, sub_0203A2F0);
@ -2806,7 +2828,7 @@ BOOL ScrCmd_GetDexEvaluationMessage(ScriptContext *ctx) { //0123
u8 mode = ScriptReadByte(ctx);
u16 *var = ScriptGetVarPointer(ctx);
if (mode == 0) {
*var = sub_02054CC8(Pokedex_CountSinnohDexSeen_OmitMythicals(pokedex), sub_0205F2E4(SaveArray_Flags_Get(ctx->fieldSystem->saveData), 2, 10));
*var = sub_02054CC8(Pokedex_CountSinnohDexSeen_OmitMythicals(pokedex), sub_0205F2E4(Save_VarsFlags_Get(ctx->fieldSystem->saveData), 2, 10));
} else {
*var = sub_02054D1C(Pokedex_CountNationalDexOwned_OmitMythicals(pokedex), PlayerProfile_GetTrainerGender(playerProfile));
}
@ -3522,14 +3544,14 @@ BOOL ScrCmd_BufferPokemonRecordSize(ScriptContext *ctx) { //01C4
}
BOOL ScrCmd_InitPokemonRecordSize(ScriptContext *ctx) { //01C5
ScriptState *state = SaveArray_Flags_Get(ctx->fieldSystem->saveData);
SaveVarsFlags *state = Save_VarsFlags_Get(ctx->fieldSystem->saveData);
sub_0205F3F8(state, 33280); //todo: what constant is this
return FALSE;
}
BOOL ScrCmd_Unk01CC(ScriptContext *ctx) { //01CC
FieldSystem *fieldSystem = ctx->fieldSystem;
ScriptState *state = SaveArray_Flags_Get(fieldSystem->saveData);
SaveVarsFlags *state = Save_VarsFlags_Get(fieldSystem->saveData);
sub_0205F2D4(state, 1); //set flag
u32 unk0 = sub_020289A4(fieldSystem->saveData);
u32 *unk1 = sub_020289B0(unk0, 1);
@ -3638,14 +3660,14 @@ BOOL ScrCmd_CheckNationalDexComplete(ScriptContext *ctx) { //01E9
BOOL ScrCmd_RegisterSinnohPokedex(ScriptContext *ctx) { //01EA
PokedexAppData **pokedexAppData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA);
*pokedexAppData = sub_02038AF4(ctx->fieldSystem, 32, FALSE);
*pokedexAppData = sub_02038AF4(ctx->fieldSystem, HEAP_ID_32, FALSE);
SetupNativeScript(ctx, sub_0203BB90);
return TRUE;
}
BOOL ScrCmd_RegisterNationalPokedex(ScriptContext *ctx) { //01EB
PokedexAppData **pokedexAppData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA);
*pokedexAppData = sub_02038AF4(ctx->fieldSystem, 32, TRUE);
*pokedexAppData = sub_02038AF4(ctx->fieldSystem, HEAP_ID_32, TRUE);
SetupNativeScript(ctx, sub_0203BB90);
return TRUE;
}
@ -3664,4 +3686,166 @@ BOOL ScrCmd_Unk01ED(ScriptContext *ctx) { //01ED
BOOL ScrCmd_Unk01EF(ScriptContext *ctx) { //01EF
ScriptGetVarPointer(ctx);
return FALSE;
}
}
BOOL ScrCmd_IncrementGameStat(ScriptContext *ctx) { //01E5
u16 stat = ScriptReadHalfword(ctx);
GameStats *gameStats = Save_GameStats_Get(ctx->fieldSystem->saveData);
GameStats_Inc(gameStats, stat);
return FALSE;
}
BOOL ScrCmd_GetGameStat(ScriptContext *ctx) { //01E6
u16 stat = ScriptReadHalfword(ctx);
u16 statHighVarNo = ScriptReadHalfword(ctx);
u16 statLowVarNo = ScriptReadHalfword(ctx);
u16 *statHighVar = GetVarPointer(ctx->fieldSystem, statHighVarNo);
u16 *statLowVar = GetVarPointer(ctx->fieldSystem, statLowVarNo);
u32 statVal = GameStats_GetCapped(Save_GameStats_Get(ctx->fieldSystem->saveData), stat);
*statHighVar = (u16)((statVal & 0xFFFF0000) >> 16);
*statLowVar = (u16)statVal;
return FALSE;
}
BOOL ScrCmd_SetGameStat(ScriptContext *ctx) { //01E7
u16 stat = ScriptReadHalfword(ctx);
u16 valueHigh = ScriptReadHalfword(ctx);
u16 valueLow = ScriptReadHalfword(ctx);
u8 action = ScriptReadByte(ctx);
u32 value = ((valueHigh << 16) | valueLow);
switch (action) {
case 0: //add
GameStats_Add(Save_GameStats_Get(ctx->fieldSystem->saveData), stat, value);
break;
case 1: //direct set
GameStats_SetCapped(Save_GameStats_Get(ctx->fieldSystem->saveData), stat, value);
break;
case 2: //set if higher
GameStats_UpdateBounded(Save_GameStats_Get(ctx->fieldSystem->saveData), stat, value);
break;
}
return FALSE;
}
BOOL ScrCmd_EnableDisableSafariZone(ScriptContext *ctx) { //0202
LocalFieldData *localFieldData = Save_LocalFieldData_Get(ctx->fieldSystem->saveData);
SaveVarsFlags *varsFlags = Save_VarsFlags_Get(ctx->fieldSystem->saveData);
SafariZone *safariZone = Save_SafariZone_Get(ctx->fieldSystem->saveData);
u8 action = ScriptReadByte(ctx);
u16 *safariBalls = LocalFieldData_GetSafariBallsCounter(localFieldData);
u16 *safariSteps = LocalFieldData_GetSafariStepsCounter(localFieldData);
switch (action) {
case 0: //enable
Save_VarsFlags_SetSafariSysFlag(varsFlags);
sub_02060FD0(safariZone);
*safariBalls = 30;
*safariSteps = 0;
break;
case 1: //disable
Save_VarsFlags_ClearSafariSysFlag(varsFlags);
sub_02061574(ctx->fieldSystem);
sub_02028AD4(ctx->fieldSystem->unk98, sub_0202912C(4), TRUE);
*safariBalls = 0;
*safariSteps = 0;
break;
}
return FALSE;
}
BOOL ScrCmd_UseGreatMarshBinoculars(ScriptContext *ctx) { //0206
CallTask_UseGreatMarshBinoculars(ctx->fieldSystem);
return TRUE;
}
BOOL ScrCmd_SpearPillarSequence(ScriptContext *ctx) { //020D
u8 operation = ScriptReadByte(ctx);
u16 *var = ScriptGetVarPointer(ctx);
*var = SpearPillarSequence(ctx->fieldSystem, operation);
return TRUE;
}
BOOL ScrCmd_KeepSafariTrain(ScriptContext *ctx) { //020E
KeepSafariTrain(ctx->fieldSystem);
return FALSE;
}
BOOL ScrCmd_MoveSafariTrain(ScriptContext *ctx) { //020F
u16 *var = ScriptGetVarPointer(ctx);
u16 type = ScriptReadHalfword(ctx);
sub_0200433C(65, 0, 0);
ov06_0224525C(ctx->fieldSystem, *var, type);
return TRUE;
}
BOOL ScrCmd_CheckSafariTrainPosition(ScriptContext *ctx) { //0210
u16 position = ScriptReadHalfword(ctx);
u16 *var = ScriptGetVarPointer(ctx);
*var = ov06_02245340(ctx->fieldSystem, position);
return FALSE;
}
BOOL ScrCmd_IgnoreHeights(ScriptContext *ctx) { //0211
u8 flag = ScriptReadByte(ctx);
PlayerAvatar_ToggleAutomaticHeightUpdating(ctx->fieldSystem->playerAvatar, flag);
return TRUE;
}
BOOL ScrCmd_GetSpiritombTalkCounter(ScriptContext *ctx) { //0214
SaveVarsFlags *varsFlags = Save_VarsFlags_Get(ctx->fieldSystem->saveData);
u16 *var = ScriptGetVarPointer(ctx);
*var = Save_VarsFlags_GetSpiritombTalkCounter(varsFlags);
return FALSE;
}
BOOL ScrCmd_Unk0218(ScriptContext *ctx) { //0218
Pokedex *pokedex = Save_Pokedex_Get(ctx->fieldSystem->saveData);
u16 *speciesVar = ScriptGetVarPointer(ctx);
s32 sinnohSeen = Pokedex_CountSinnohDexSeen(pokedex);
u16 randomSeenCount = LCRandom() % sinnohSeen;
*speciesVar = SPECIES_PIKACHU;
u16 i = SPECIES_BULBASAUR;
u16 speciesIndex = 0;
while (i <= NATIONAL_DEX_COUNT) { //can't do for loop - needed for matching
if (Pokedex_CheckMonSeenFlag(pokedex, i) == TRUE && SpeciesToSinnohDexNo(i) != 0) {
if (speciesIndex == randomSeenCount) {
*speciesVar = i;
break;
}
speciesIndex++;
}
i++;
}
return FALSE;
}
BOOL ScrCmd_Unk0219(ScriptContext *ctx) { //0219
u16 unk0 = ScriptGetVar(ctx);
SaveVarsFlags *varsFlags = Save_VarsFlags_Get(ctx->fieldSystem->saveData);
sub_0205F5A4(varsFlags, unk0);
return FALSE;
}
BOOL ScrCmd_Unk021A(ScriptContext *ctx) { //021A
u16 *var = ScriptGetVarPointer(ctx);
*var = sub_0205F594(Save_VarsFlags_Get(ctx->fieldSystem->saveData));
return FALSE;
}
BOOL ScrCmd_Unk021B(ScriptContext *ctx) { //021B
sub_0202AA00(ctx->fieldSystem->saveData);
return FALSE;
}
BOOL ScrCmd_CreateRoamer(ScriptContext *ctx) { //021C
u8 roamer = ScriptReadByte(ctx);
Save_CreateRoamerByID(ctx->fieldSystem->saveData, roamer);
return FALSE;
}
BOOL ScrCmd_NPCTradeInit(ScriptContext *ctx) { //0226
NPCTradeAppData **tradeAppData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR);
u8 tradeId = ScriptReadByte(ctx);
*tradeAppData = NPCTradeApp_Init(HEAP_ID_FIELD, tradeId);
return FALSE;
}

14
arm9/src/scrcmd_13.c
View File

@ -16,13 +16,13 @@ extern u32 sub_0204BA1C(struct FieldSystem*);
extern u16 sub_0204BAC4(struct FieldSystem*);
extern u16 sub_0204BAD4(struct FieldSystem*);
extern u16 sub_0204BAE4(struct FieldSystem*);
extern void sub_0205F224(struct ScriptState* state);
extern void sub_0205F234(struct ScriptState* state);
extern void sub_0208089C(struct Pokemon* pokemon, PlayerProfile* player, u32 a2, u32 a3, u32 heap_id);
extern void sub_0205F224(struct SaveVarsFlags* state);
extern void sub_0205F234(struct SaveVarsFlags* state);
extern void sub_0208089C(struct Pokemon* pokemon, PlayerProfile* player, u32 a2, u32 a3, HeapID heapId);
BOOL ScrCmd_Unk0253(struct ScriptContext* ctx) //0253
{
struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveData);
struct SaveVarsFlags* state = Save_VarsFlags_Get(ctx->fieldSystem->saveData);
u16 unk = ScriptGetVar(ctx);
if (unk == 0)
@ -46,7 +46,7 @@ BOOL ScrCmd_Unk0253(struct ScriptContext* ctx) //0253
BOOL ScrCmd_Unk0254(struct ScriptContext* ctx) //0254
{
void* unk = sub_02022528(ctx->fieldSystem->saveData);
struct Pokemon* pokemon = AllocMonZeroed(32);
struct Pokemon* pokemon = AllocMonZeroed(HEAP_ID_32);
u16* ret_ptr = ScriptGetVarPointer(ctx);
u16 eggs = sub_0202C000(unk);
@ -65,14 +65,14 @@ BOOL ScrCmd_Unk0255(struct ScriptContext* ctx) //0255
{
void* unk = sub_02022528(ctx->fieldSystem->saveData);
struct PCStorage* pc = GetStoragePCPointer(ctx->fieldSystem->saveData);
struct Pokemon* pokemon = AllocMonZeroed(32);
struct Pokemon* pokemon = AllocMonZeroed(HEAP_ID_32);
PlayerProfile* player = Save_PlayerData_GetProfileAddr(ctx->fieldSystem->saveData);
struct Pokedex* pokedex = Save_Pokedex_Get(ctx->fieldSystem->saveData); // unused
for (s32 i = 0; i < PARTY_SIZE; i++)
{
sub_0202BFD8(unk, i, pokemon);
sub_0208089C(pokemon, player, 2, 0, 32);
sub_0208089C(pokemon, player, 2, 0, HEAP_ID_32);
struct BoxPokemon* box_mon = sub_020690E4(pokemon);
GF_ASSERT(PCStorage_PlaceMonInFirstEmptySlotInAnyBox(pc, box_mon));

8
arm9/src/scrcmd_amity_square.c
View File

@ -4,8 +4,8 @@
#include "constants/pokemon.h"
#include "event_data.h"
extern void sub_0205F54C(struct ScriptState* state);
extern u16 sub_0205F55C(struct ScriptState* state);
extern void sub_0205F54C(struct SaveVarsFlags* state);
extern u16 sub_0205F55C(struct SaveVarsFlags* state);
static const u16 sAmitySquarePossibleAccessoriesByPokemon[6][10] = {
{ // Clefairy and Skitty
@ -101,7 +101,7 @@ static const u16 sAmitySquarePossibleAccessoriesByPokemon[6][10] = {
BOOL ScrCmd_ClearAmitySquareSteps(struct ScriptContext* ctx) //0215
{
struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveData);
struct SaveVarsFlags* state = Save_VarsFlags_Get(ctx->fieldSystem->saveData);
sub_0205F54C(state);
@ -111,7 +111,7 @@ BOOL ScrCmd_ClearAmitySquareSteps(struct ScriptContext* ctx) //0215
BOOL ScrCmd_CheckAmitySquareSteps(struct ScriptContext* ctx) //0216
{
u16* ret_ptr = ScriptGetVarPointer(ctx);
struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveData);
struct SaveVarsFlags* state = Save_VarsFlags_Get(ctx->fieldSystem->saveData);
*ret_ptr = sub_0205F55C(state);
return FALSE;

60
arm9/src/scrcmd_flags.c
View File

@ -7,23 +7,23 @@ extern void* sub_02034E20(void*);
extern void* Save_LocalFieldData_Get(void*);
extern BOOL sub_02055474(void*);
extern void sub_02055488(void*, u32);
extern void sub_0205ECD4(struct ScriptState* state);
extern BOOL sub_0205ECE0(struct ScriptState* state);
extern void sub_0205ECFC(struct ScriptState* state);
extern BOOL sub_0205ED0C(struct ScriptState* state);
extern void sub_0205ED1C(struct ScriptState* state);
extern void sub_0205ED2C(struct ScriptState* state);
extern BOOL sub_0205ED3C(struct ScriptState* state);
extern void sub_0205ED4C(struct ScriptState* state);
extern void sub_0205ED5C(struct ScriptState* state);
extern BOOL sub_0205ED6C(struct ScriptState* state);
extern BOOL sub_0205F264(struct ScriptState* state, u32);
extern void sub_0205F274(struct ScriptState* state);
extern void sub_0205F284(struct ScriptState* state);
extern BOOL sub_0205F294(struct ScriptState* state);
extern void sub_0205F2A4(struct ScriptState* state);
extern void sub_0205F2B4(struct ScriptState* state);
extern BOOL sub_0205F2C4(struct ScriptState* state);
extern void sub_0205ECD4(struct SaveVarsFlags* state);
extern BOOL sub_0205ECE0(struct SaveVarsFlags* state);
extern void sub_0205ECFC(struct SaveVarsFlags* state);
extern BOOL sub_0205ED0C(struct SaveVarsFlags* state);
extern void sub_0205ED1C(struct SaveVarsFlags* state);
extern void sub_0205ED2C(struct SaveVarsFlags* state);
extern BOOL sub_0205ED3C(struct SaveVarsFlags* state);
extern void sub_0205ED4C(struct SaveVarsFlags* state);
extern void sub_0205ED5C(struct SaveVarsFlags* state);
extern BOOL sub_0205ED6C(struct SaveVarsFlags* state);
extern BOOL sub_0205F264(struct SaveVarsFlags* state, u32);
extern void sub_0205F274(struct SaveVarsFlags* state);
extern void sub_0205F284(struct SaveVarsFlags* state);
extern BOOL sub_0205F294(struct SaveVarsFlags* state);
extern void sub_0205F2A4(struct SaveVarsFlags* state);
extern void sub_0205F2B4(struct SaveVarsFlags* state);
extern BOOL sub_0205F2C4(struct SaveVarsFlags* state);
const u8 UNK_020F457F[8] = {
0, 1, 2, 3, 4, 5, 6, 7,
@ -95,7 +95,7 @@ BOOL ScrCmd_GiveBadge(struct ScriptContext* ctx) //015C
BOOL ScrCmd_HasBag(struct ScriptContext* ctx) //015E
{
u16* ret_ptr = ScriptGetVarPointer(ctx);
struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveData);
struct SaveVarsFlags* state = Save_VarsFlags_Get(ctx->fieldSystem->saveData);
*ret_ptr = (u16)sub_0205ECE0(state);
@ -124,7 +124,7 @@ BOOL ScrCmd_GetTotalEarnedBadges(struct ScriptContext* ctx) //015D - todo: Count
BOOL ScrCmd_GiveBag(struct ScriptContext* ctx) //015F
{
struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveData);
struct SaveVarsFlags* state = Save_VarsFlags_Get(ctx->fieldSystem->saveData);
sub_0205ECD4(state);
@ -134,7 +134,7 @@ BOOL ScrCmd_GiveBag(struct ScriptContext* ctx) //015F
BOOL ScrCmd_Unk0160(struct ScriptContext* ctx) //0160 - todo: HasPartner? CheckPartner?
{
u16* ret_ptr = ScriptGetVarPointer(ctx);
struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveData);
struct SaveVarsFlags* state = Save_VarsFlags_Get(ctx->fieldSystem->saveData);
*ret_ptr = (u16)sub_0205ED3C(state);
@ -143,7 +143,7 @@ BOOL ScrCmd_Unk0160(struct ScriptContext* ctx) //0160 - todo: HasPartner? CheckP
BOOL ScrCmd_Unk0161(struct ScriptContext* ctx) //0161 - todo: GivePartner? SetPartner?
{
struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveData);
struct SaveVarsFlags* state = Save_VarsFlags_Get(ctx->fieldSystem->saveData);
sub_0205ED1C(state);
@ -152,7 +152,7 @@ BOOL ScrCmd_Unk0161(struct ScriptContext* ctx) //0161 - todo: GivePartner? SetPa
BOOL ScrCmd_Unk0162(struct ScriptContext* ctx) //0162 - todo: RemovePartner? ClearPartner?
{
struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveData);
struct SaveVarsFlags* state = Save_VarsFlags_Get(ctx->fieldSystem->saveData);
sub_0205ED2C(state);
@ -162,7 +162,7 @@ BOOL ScrCmd_Unk0162(struct ScriptContext* ctx) //0162 - todo: RemovePartner? Cle
BOOL ScrCmd_Unk0163(struct ScriptContext* ctx) //0163 - todo: GetSteps? CheckSteps? GetStepFlag? CheckStepFlag?
{
u16* ret_ptr = ScriptGetVarPointer(ctx);
struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveData);
struct SaveVarsFlags* state = Save_VarsFlags_Get(ctx->fieldSystem->saveData);
*ret_ptr = (u16)sub_0205ED6C(state);
@ -171,7 +171,7 @@ BOOL ScrCmd_Unk0163(struct ScriptContext* ctx) //0163 - todo: GetSteps? CheckSte
BOOL ScrCmd_Unk0164(struct ScriptContext* ctx) //0164 - todo: SetStepFlag?
{
struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveData);
struct SaveVarsFlags* state = Save_VarsFlags_Get(ctx->fieldSystem->saveData);
sub_0205ED4C(state);
@ -180,7 +180,7 @@ BOOL ScrCmd_Unk0164(struct ScriptContext* ctx) //0164 - todo: SetStepFlag?
BOOL ScrCmd_Unk0165(struct ScriptContext* ctx) //0165 - todo: ClearStepFlag?
{
struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveData);
struct SaveVarsFlags* state = Save_VarsFlags_Get(ctx->fieldSystem->saveData);
sub_0205ED5C(state);
@ -190,7 +190,7 @@ BOOL ScrCmd_Unk0165(struct ScriptContext* ctx) //0165 - todo: ClearStepFlag?
BOOL ScrCmd_CheckGameCompleted(struct ScriptContext* ctx) //0166
{
u16* ret_ptr = ScriptGetVarPointer(ctx);
struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveData);
struct SaveVarsFlags* state = Save_VarsFlags_Get(ctx->fieldSystem->saveData);
*ret_ptr = (u16)sub_0205ED0C(state);
@ -199,7 +199,7 @@ BOOL ScrCmd_CheckGameCompleted(struct ScriptContext* ctx) //0166
BOOL ScrCmd_SetGameCompleted(struct ScriptContext* ctx) //0167
{
struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveData);
struct SaveVarsFlags* state = Save_VarsFlags_Get(ctx->fieldSystem->saveData);
sub_0205ECFC(state);
@ -208,7 +208,7 @@ BOOL ScrCmd_SetGameCompleted(struct ScriptContext* ctx) //0167
BOOL ScrCmd_GetSetStrength(struct ScriptContext* ctx) //01CF - todo: Strength?
{
struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveData);
struct SaveVarsFlags* state = Save_VarsFlags_Get(ctx->fieldSystem->saveData);
u8 option = ScriptReadByte(ctx);
u16* ret_ptr;
@ -234,7 +234,7 @@ BOOL ScrCmd_GetSetStrength(struct ScriptContext* ctx) //01CF - todo: Strength?
BOOL ScrCmd_GetSetFlash(struct ScriptContext* ctx) //01D0 - todo Flash?
{
struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveData);
struct SaveVarsFlags* state = Save_VarsFlags_Get(ctx->fieldSystem->saveData);
u8 option = ScriptReadByte(ctx);
u16* ret_ptr;
@ -260,7 +260,7 @@ BOOL ScrCmd_GetSetFlash(struct ScriptContext* ctx) //01D0 - todo Flash?
BOOL ScrCmd_GetSetDefog(struct ScriptContext* ctx) //01D1 - todo: Defog
{
struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveData);
struct SaveVarsFlags* state = Save_VarsFlags_Get(ctx->fieldSystem->saveData);
u8 option = ScriptReadByte(ctx);
u16* ret_ptr;

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