Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions asm/frontier.s
Original file line number Diff line number Diff line change
Expand Up @@ -315,11 +315,11 @@ _02096800: .word FS_OVERLAY_ID(OVY_81)
_02096804: .word FS_OVERLAY_ID(OVY_42)
thumb_func_end Frontier_UnloadOverlays

thumb_func_start Frontier_GetLaunchParam
Frontier_GetLaunchParam: ; 0x02096808
thumb_func_start Frontier_GetLaunchArgs
Frontier_GetLaunchArgs: ; 0x02096808
ldr r0, [r0]
bx lr
thumb_func_end Frontier_GetLaunchParam
thumb_func_end Frontier_GetLaunchArgs

thumb_func_start sub_0209680C
sub_0209680C: ; 0x0209680C
Expand Down
10 changes: 5 additions & 5 deletions asm/frontier_map.s
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
FrontierMap_Init: ; 0x02238648
push {r3, r4, r5, r6, r7, lr}
add r6, r0, #0
bl Frontier_GetLaunchParam
bl Frontier_GetLaunchArgs
add r4, r0, #0
ldr r0, [r4, #8]
bl Save_PlayerData_GetProfile
Expand Down Expand Up @@ -223,7 +223,7 @@ FrontierMap_Free: ; 0x0223885C
push {r4, lr}
add r4, r0, #0
ldr r0, [r4, #8]
bl Frontier_GetLaunchParam
bl Frontier_GetLaunchArgs
add r2, r4, #0
add r2, #0xc1
add r1, r4, #0
Expand Down Expand Up @@ -546,7 +546,7 @@ FrontierMap_Scroll: ; 0x02238B28
push {r3, r4, r5, lr}
add r5, r0, #0
ldr r0, [r5, #8]
bl Frontier_GetLaunchParam
bl Frontier_GetLaunchArgs
add r4, r0, #0
add r0, #0x20
ldrb r0, [r0]
Expand Down Expand Up @@ -591,7 +591,7 @@ ov80_02238B7C: ; 0x02238B7C
sub sp, #0x10
add r5, r0, #0
ldr r0, [r5, #8]
bl Frontier_GetLaunchParam
bl Frontier_GetLaunchArgs
add r7, r0, #0
add r0, r5, #0
add r0, #0x1c
Expand Down Expand Up @@ -1026,7 +1026,7 @@ FrontierMap_LoadPaletteData: ; 0x02238F10
mov r3, #0x65
bl PaletteData_LoadNarc
ldr r0, [r4, #8]
bl Frontier_GetLaunchParam
bl Frontier_GetLaunchArgs
ldr r0, [r0, #4]
bl Options_GetFrame
lsl r0, r0, #0x18
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_80_0222BDF4.inc
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
.public NamingScreen_CreateArgs
.public NamingScreen_DeleteArgs
.public HealParty
.public Frontier_GetLaunchParam
.public Frontier_GetLaunchArgs
.public sub_0209680C
.public Frontier_GetData
.public Frontier_SetData
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_80_0222F608.inc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
.public GetMonData
.public Mon_GetBoxMon
.public Party_GetMonByIndex
.public Frontier_GetLaunchParam
.public Frontier_GetLaunchArgs
.public Frontier_GetData
.public Frontier_SetData
.public Frontier_LaunchApplication
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_80_02230B8C.inc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
.public Party_AddMon
.public Party_GetMonByIndex
.public SaveArray_Party_Get
.public Frontier_GetLaunchParam
.public Frontier_GetLaunchArgs
.public Frontier_GetData
.public Frontier_SetData
.public Frontier_LaunchApplication
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_80_02231BF8.inc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
.public Party_GetMonByIndex
.public Party_SafeCopyMonToSlot_ResetAprijuiceModifiers
.public SaveArray_Party_Get
.public Frontier_GetLaunchParam
.public Frontier_GetLaunchArgs
.public Frontier_GetData
.public Frontier_SetData
.public Frontier_LaunchApplication
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_80_02235438.inc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
.public sub_0204B068
.public BattleSetup_Delete
.public IsBattleResultWin
.public Frontier_GetLaunchParam
.public Frontier_GetLaunchArgs
.public Frontier_GetData
.public Frontier_LaunchApplication
.public MI_CpuFill8
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_80_02235900.inc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
.public sub_0205C268
.public SaveArray_Party_Get
.public HealParty
.public Frontier_GetLaunchParam
.public Frontier_GetLaunchArgs
.public Frontier_GetData
.public Frontier_SetData
.public sub_02096910
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_80_02238648.inc
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
.public sub_0203A880
.public sub_0203A914
.public sub_02055198
.public Frontier_GetLaunchParam
.public Frontier_GetLaunchArgs
.public sub_02096864
.public sub_02096868
.public sub_0209686C
Expand Down
2 changes: 1 addition & 1 deletion asm/include/unk_020965A4.inc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
.public OverlayManager_Run
.public Heap_Free
.public GF_AssertFail
.public Frontier_GetLaunchParam
.public Frontier_GetLaunchArgs
.public sub_0209680C
.public Frontier_GetData
.public Frontier_SetData
Expand Down
8 changes: 0 additions & 8 deletions asm/include/unk_020968B0.inc

This file was deleted.

Loading