Skip to content

decompile unk_02031904 to pokeathlon_save #468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nathanfallet wants to merge 20 commits into
base: master
Choose a base branch
from
Open

decompile unk_02031904 to pokeathlon_save #468

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
633a99d
setup the c file
nathanfallet Apr 8, 2026
0626435
struct + init method
nathanfallet Apr 8, 2026
ca089df
pokeathlon save getters
nathanfallet Apr 9, 2026
21a6113
gave some names to those getters
nathanfallet Apr 9, 2026
73e96eb
sub_020319A8
nathanfallet Apr 9, 2026
b53c335
duplicate functions (wtf gf did you do)
nathanfallet Apr 9, 2026
026979a
sub_020319F8
nathanfallet Apr 9, 2026
941d19e
Add/sub/get AthletePoints
nathanfallet Apr 9, 2026
4e1a359
merge the two pokeathlon save header files
nathanfallet Apr 9, 2026
b5069c5
SavePokeathlon_GetUnkB78_AtIndex & set
nathanfallet Apr 9, 2026
e1774f0
all use same prefix (no sometimes _ sometimes not)
nathanfallet Apr 9, 2026
765ed6c
done with unk_02031904
nathanfallet Apr 9, 2026
0ffd631
naming things from the game
nathanfallet Apr 9, 2026
521d1e4
use gf assert false instead of gf assert fail
nathanfallet Apr 11, 2026
a1ddaa2
Merge branch 'master' into unk_02031904
nathanfallet Apr 11, 2026
fba0120
fix error caused by merge (duplicate import)
nathanfallet Apr 11, 2026
5104428
renames
nathanfallet Apr 12, 2026
0a76468
inline loop index
nathanfallet Apr 12, 2026
62f75b7
absorb unk_02031AF0
nathanfallet Apr 12, 2026
facafca
remove unecessary cast
nathanfallet Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions asm/include/overlay_01_021EDAFC.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
.public Save_FrontierData_Get
.public SaveData_GetPhoneCallPersistentState
.public PhoneCallPersistentState_MomSavings_BalanceAction
.public Save_Pokeathlon_Get
.public SavePokeathlon_GetAthletePoints
.public PokeathlonSave_Get
.public PokeathlonSave_GetAthletePoints
.public memset
.public _s32_div_f
.public gSystem
Expand Down
16 changes: 8 additions & 8 deletions asm/include/overlay_03.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,14 @@
.public sub_0202F784
.public SafariZone_SetLinkLeaderFromProfile
.public SafariZone_RemoveObjectFromArea
.public Save_Pokeathlon_Get
.public sub_0203199C
.public SavePokeathlon_SubAthletePoints
.public SavePokeathlon_GetAthletePoints
.public sub_02031A78
.public sub_02031A98
.public sub_02031AB8
.public sub_02031ACC
.public PokeathlonSave_Get
.public PokeathlonSave_GetUnkB00
.public PokeathlonSave_SubAthletePoints
.public PokeathlonSave_GetAthletePoints
.public PokeathlonSave_GetUnkB78_AtIndex
.public PokeathlonSave_SetUnkB78_AtIndex
.public PokeathlonSave_GetUnkB7C_AtIndex
.public PokeathlonSave_SetUnkB7C_AtIndex
.public Save_ApricornBox_Get
.public ApricornBox_GiveApricorn
.public ApricornBox_CountApricorn
Expand Down
8 changes: 4 additions & 4 deletions asm/include/overlay_31.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@
.public PlayerProfile_GetMoney
.public Options_GetTextFrameDelay
.public Options_GetFrame
.public Save_Pokeathlon_Get
.public SavePokeathlon_GetAthletePoints
.public sub_02031A78
.public sub_02031AB8
.public PokeathlonSave_Get
.public PokeathlonSave_GetAthletePoints
.public PokeathlonSave_GetUnkB78_AtIndex
.public PokeathlonSave_GetUnkB7C_AtIndex
.public GetItemAttr
.public GXS_SetGraphicsMode
.public GX_SetBankForSubBG
Expand Down
22 changes: 11 additions & 11 deletions asm/include/overlay_96.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,17 +295,17 @@
.public PlayerProfile_GetTrainerGender
.public PlayerProfile_GetLanguage
.public Options_GetTextFrameDelay
.public Save_Pokeathlon_Get
.public sub_02031978
.public sub_0203197C
.public sub_02031990
.public sub_0203199C
.public sub_020319A4
.public sub_020319DC
.public sub_020319E4
.public sub_020319F0
.public sub_020319F8
.public SavePokeathlon_AddAthletePoints
.public PokeathlonSave_Get
.public PokeathlonSave_GetUnkDC
.public PokeathlonSave_GetRecordsSolo
.public PokeathlonSave_GetUnkAEC
.public PokeathlonSave_GetUnkB00
.public PokeathlonSave_dummy2
.public PokeathlonSave_GetRecordsSolo2
.public PokeathlonSave_GetRecordsLink2
.public PokeathlonSave_GetAgainUnkB00
.public PokeathlonSave_SetUnkDC_AtIndex
.public PokeathlonSave_AddAthletePoints
.public sub_02031B00
.public sub_02031B10
.public Save_ApricornBox_Get
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_97.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@
.public String_Delete
.public CopyU16ArrayToString
.public SaveArray_PCStorage_Get
.public Save_Pokeathlon_Get
.public sub_020319A8
.public PokeathlonSave_Get
.public PokeathlonSave_GetUnkDC_AtIndex
.public sub_0203A994
.public GetMonData
.public GetBoxMonData
Expand Down
8 changes: 4 additions & 4 deletions asm/include/overlay_99.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@
.public Pokedex_GetSeenSpindaPersonality
.public Pokedex_SpeciesGetLastSeenGender
.public Pokedex_GetSeenFormByIdx
.public sub_02031974
.public sub_02031978
.public sub_0203197C
.public sub_02031990
.public PokeathlonSave_dummy1
.public PokeathlonSave_GetUnkDC
.public PokeathlonSave_GetRecordsSolo
.public PokeathlonSave_GetUnkAEC
.public GetGenderBySpeciesAndPersonality
.public G2x_SetBlendAlpha_
.public MI_CpuFill8
Expand Down
28 changes: 0 additions & 28 deletions asm/include/unk_02031904.inc
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions asm/overlay_01_021EDAFC.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2375,8 +2375,8 @@ _021EECEE:
bl NewString_ReadMsgData
add r4, r0, #0
ldr r0, [r5, #0xc]
bl Save_Pokeathlon_Get
bl SavePokeathlon_GetAthletePoints
bl PokeathlonSave_Get
bl PokeathlonSave_GetAthletePoints
add r2, r0, #0
_021EED04:
mov r0, #1
Expand Down
20 changes: 10 additions & 10 deletions asm/overlay_03.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5934,7 +5934,7 @@ InitMartUI: ; 0x02256D34
add r1, #0x40
str r0, [r4, r1]
ldr r0, [r5, #0xc]
bl Save_Pokeathlon_Get
bl PokeathlonSave_Get
mov r1, #0x95
lsl r1, r1, #2
str r0, [r4, r1]
Expand Down Expand Up @@ -7240,7 +7240,7 @@ ov03_022577F4: ; 0x022577F4
mov r1, #0x95
lsl r1, r1, #2
ldr r0, [r0, r1]
bl SavePokeathlon_GetAthletePoints
bl PokeathlonSave_GetAthletePoints
pop {r3, pc}
_02257808:
mov r1, #0x92
Expand Down Expand Up @@ -7268,7 +7268,7 @@ ov03_02257814: ; 0x02257814
ldr r2, [r5, r2]
ldr r0, [r5, r0]
add r1, r2, r1
bl sub_02031AB8
bl PokeathlonSave_GetUnkB7C_AtIndex
cmp r0, #0
beq _0225785E
mov r0, #2
Expand All @@ -7283,7 +7283,7 @@ _02257840:
sub r1, #0x8a
ldr r0, [r5, r0]
sub r1, r2, r1
bl sub_02031A78
bl PokeathlonSave_GetUnkB78_AtIndex
cmp r0, #0
beq _0225785E
mov r0, #3
Expand Down Expand Up @@ -8013,7 +8013,7 @@ ov03_02257DF8: ; 0x02257DF8
lsl r1, r1, #0x10
ldr r0, [r2, r3]
lsr r1, r1, #0x10
bl SavePokeathlon_SubAthletePoints
bl PokeathlonSave_SubAthletePoints
pop {r4, pc}
_02257E18:
add r1, r3, #0
Expand Down Expand Up @@ -8105,7 +8105,7 @@ _02257EA0:
ldr r3, [r4, r1]
ldrb r1, [r4, r2]
add r1, r3, r1
bl sub_02031ACC
bl PokeathlonSave_SetUnkB7C_AtIndex
b _02257EF0
_02257EC6:
cmp r0, #4
Expand All @@ -8117,7 +8117,7 @@ _02257EC6:
sub r2, #0x8a
ldr r0, [r4, r0]
sub r1, r1, r2
bl sub_02031A98
bl PokeathlonSave_SetUnkB78_AtIndex
b _02257EF0
_02257EDE:
add r0, r2, #0
Expand Down Expand Up @@ -9959,9 +9959,9 @@ ov03_02258CFC: ; 0x02258CFC
str r0, [r4, #0xc]
str r5, [r4, #8]
ldr r0, [r5, #0xc]
bl Save_Pokeathlon_Get
bl PokeathlonSave_Get
str r0, [r4, #0x20]
bl sub_0203199C
bl PokeathlonSave_GetUnkB00
str r0, [r4, #0x24]
ldr r0, [r5, #0x10]
ldr r1, _02258D38 ; =ov03_02258D3C
Expand Down Expand Up @@ -10172,7 +10172,7 @@ ov03_02258ECC: ; 0x02258ECC
_02258EDA:
ldr r0, [r0, #0x20]
sub r1, r1, #1
bl sub_02031A78
bl PokeathlonSave_GetUnkB78_AtIndex
pop {r3, pc}
.balign 4, 0
_02258EE4: .word ov03_02259880
Expand Down
10 changes: 5 additions & 5 deletions asm/overlay_31.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ ov31_0225D520: ; 0x0225D520
str r0, [r4, r1]
ldr r0, [r4, #0x1c]
ldr r0, [r0, #0xc]
bl Save_Pokeathlon_Get
bl PokeathlonSave_Get
mov r1, #0x5b
lsl r1, r1, #2
str r0, [r4, r1]
Expand Down Expand Up @@ -1220,7 +1220,7 @@ _0225DEBC:
mov r0, #0x5b
lsl r0, r0, #2
ldr r0, [r5, r0]
bl SavePokeathlon_GetAthletePoints
bl PokeathlonSave_GetAthletePoints
b _0225DF2A
_0225DF12:
mov r0, #0x56
Expand Down Expand Up @@ -1489,7 +1489,7 @@ ov31_0225E12C: ; 0x0225E12C
bne _0225E14E
sub r0, #0x2f
ldr r0, [r5, r0]
bl sub_02031AB8
bl PokeathlonSave_GetUnkB7C_AtIndex
cmp r0, #0
bne _0225E14A
mov r0, #1
Expand All @@ -1511,7 +1511,7 @@ _0225E14E:
mul r1, r2
ldr r0, [r5, r0]
add r1, r4, r1
bl sub_02031A78
bl PokeathlonSave_GetUnkB78_AtIndex
cmp r0, #0
bne _0225E176
mov r0, #1
Expand Down Expand Up @@ -2507,7 +2507,7 @@ ov31_0225E95C: ; 0x0225E95C
bhi _0225E97A
sub r0, #0x2f
ldr r0, [r5, r0]
bl SavePokeathlon_GetAthletePoints
bl PokeathlonSave_GetAthletePoints
b _0225E982
_0225E97A:
sub r0, #0x3b
Expand Down
Loading
Loading