Skip to content
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

cleanup field_move.c #360

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

cleanup field_move.c #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
988d872
start to cleanup field_move.c
red031000 Nov 24, 2024
d807c28
a thing
red031000 Nov 24, 2024
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
2 changes: 1 addition & 1 deletion asm/frontier_map.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ FrontierMap_Init: ; 0x02238648
bl Frontier_GetLaunchParam
add r4, r0, #0
ldr r0, [r4, #8]
bl Save_PlayerData_GetProfileAddr
bl Save_PlayerData_GetProfile
add r7, r0, #0
mov r0, #0
add r4, #0x20
Expand Down
6 changes: 3 additions & 3 deletions asm/include/overlay_01_021E6880.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
.public StopSE
.public MenuInputStateMgr_SetState
.public GF_AssertFail
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public PlayerProfile_TestBadgeFlag
.public Save_Daycare_Get
.public Save_GameStats_Get
Expand Down Expand Up @@ -64,7 +64,7 @@
.public ApplyPoisonStep
.public sub_02054874
.public sub_020548C0
.public GetMetatileBehaviorAt
.public GetMetatileBehavior
.public MapModel_IsHeadbuttTree
.public MapCoordToMatrixIndex
.public PalPark_TryEncounter
Expand Down Expand Up @@ -167,7 +167,7 @@
.public ov01_021E7F54
.public FieldSystem_FacingModelIsHeadbuttTree
.public ov01_021F1D94
.public Field_PlayerCanStartSurfingByStandingAndFacingTileBehaviors
.public Field_PlayerCanSurfOnTile
.public MetatileBehavior_IsRockClimbInDirection
.public ov01_021F3114
.public ov01_021F6830
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021EDAFC.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
.public GF_AssertFail
.public String_New
.public String_Delete
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetCoinsAddr
.public PlayerProfile_GetMoney
.public CheckCoins
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021F1AFC.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
.public Field_PlayerAvatar_ApplyTransitionFlags
.public ov01_021F1D94
.public CallFieldTask_Surf
.public Field_PlayerCanStartSurfingByStandingAndFacingTileBehaviors
.public Field_PlayerCanSurfOnTile
.public CallFieldTask_RockClimb
.public MetatileBehavior_IsRockClimbInDirection
.public CallFieldTask_Waterfall
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021F3F50.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
.public GF_AssertFail
.public String_Delete
.public SaveGameNormal
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetIGTAddr
.public PlayerProfile_CountBadges
.public Pokedex_CountDexOwned
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021F4704.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
.public GF3dRender_BindModelSet
.public SysTask_GetData
.public GF_AssertFail
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public PlayerProfile_GetTrainerGender
.public Save_SafariZone_Get
.public sub_0202F620
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021FC05C.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
.public QueueScript
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnvironment
.public GetMetatileBehaviorAt
.public GetMetatileBehavior
.public GetPlayerXCoord
.public GetPlayerZCoord
.public G2x_SetBlendAlpha_
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_022053EC.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
.public TaskManager_GetEnvironment
.public TaskManager_GetStatePtr
.public GetIdxOfFirstAliveMonInParty_CrashIfNone
.public GetMetatileBehaviorAt
.public GetMetatileBehavior
.public PlayerAvatar_GetFacingDirection
.public GetPlayerXCoord
.public GetPlayerZCoord
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_02.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
.public String_New
.public String_Delete
.public Save_SysInfo_RTC_Get
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public PlayerProfile_GetTrainerID
.public PlayerProfile_GetTrainerID_VisibleHalf
Expand Down Expand Up @@ -225,7 +225,7 @@
.public GetIdxOfFirstAliveMonInParty_CrashIfNone
.public sub_02054774
.public sub_020548C0
.public GetMetatileBehaviorAt
.public GetMetatileBehavior
.public sub_02054C20
.public sub_02054C90
.public sub_02054DC8
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_03.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
.public String_New
.public String_Delete
.public String16_FormatInteger
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public Save_PlayerData_GetIGTAddr
.public PlayerProfile_New
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_04.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
.public TaskManager_GetEnvironment
.public TaskManager_GetStatePtr
.public sub_020548C0
.public GetMetatileBehaviorAt
.public GetMetatileBehavior
.public sub_0205BAC4
.public PlayerAvatar_GetFacingDirection
.public GetPlayerXCoord
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_100.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
.public Sprite_SetPalIndex
.public TouchscreenHitbox_FindRectAtTouchNew
.public GF_AssertFail
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public SaveData_GSPlayerMisc_Get
.public sub_0202EDF8
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_101.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
.public String_RadioAddStatic
.public SaveArray_PCStorage_Get
.public Save_SysInfo_RTC_Get
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public Save_PlayerData_GetIGTAddr
.public PlayerProfile_GetTrainerGender
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_108.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
.public GF_3DVramMan_InitLinkedListTexVramManager
.public GF_3DVramMan_InitLinkedListPlttVramManager
.public Save_SysInfo_RTC_Get
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public PlayerProfile_GetTrainerID
.public PlayerProfile_GetTrainerGender
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_109.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
.public String_New
.public String_Delete
.public CopyU16ArrayToString
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public Options_GetTextFrameDelay
.public Options_GetFrame
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_112.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
.public SaveArray_PCStorage_Get
.public SaveGameNormal
.public Save_ClearStatusFlags
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public PlayerProfile_GetNamePtr
.public PlayerProfile_GetPlayerName_NewString
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_113.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
.public TouchscreenHitbox_FindHitboxAtTouchNew
.public String_New
.public String_Delete
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public PlayerProfile_GetPlayerName_NewString
.public Pokedex_GetSeenFormByIdx_Unown
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_115.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
.public String_Delete
.public Thunk_G3X_Reset
.public RequestSwap3DBuffers
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public PlayerProfile_GetTrainerGender
.public NNS_G2dGetImagePaletteLocation
.public G2x_SetBlendAlpha_
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_14.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
.public String_New
.public String_Delete
.public SaveArray_PCStorage_Get
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public Options_GetFrame
.public Save_SpecialRibbons_Get
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_15.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
.public String16_FormatInteger
.public Thunk_G3X_Reset
.public RequestSwap3DBuffers
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public PlayerProfile_GetTrainerGender
.public PlayerProfile_GetMoney
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_27.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
.public System_GetTouchNew
.public GF_AssertFail
.public String_Delete
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public PlayerProfile_GetTrainerGender
.public sub_0203769C
.public sub_02037958
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_31.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
.public GF_AssertFail
.public String_New
.public String_Delete
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public PlayerProfile_GetMoney
.public Options_GetTextFrameDelay
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_34.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
.public String_New
.public String_Delete
.public CopyU16ArrayToString
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public PlayerProfile_GetNamePtr
.public PlayerProfile_GetTrainerID
.public PlayerProfile_GetTrainerGender
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_43.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
.public String_atoi
.public CopyU16ArrayToString
.public String_cstr
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public PlayerProfile_New
.public Save_Profile_PlayerName_Set
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_44.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
.public Save_ClearStatusFlags
.public Save_PrepareForAsyncWrite
.public Save_WriteFileAsync
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public PlayerProfile_New
.public Save_Profile_PlayerName_Set
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_45_thumb.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
.public sub_02026E18
.public SaveArray_CalcCRC16
.public Save_SysInfo_RTC_Get
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public PlayerProfile_New
.public Save_Profile_PlayerName_Set
.public PlayerName_StringToFlat
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_49.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
.public RequestSwap3DBuffers
.public GF_3DVramMan_Create
.public GF_3DVramMan_Delete
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public PlayerProfile_New
.public PlayerProfile_GetTrainerID_VisibleHalf
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_73.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
.public SaveSubstruct_UpdateCRC
.public Save_SysInfo_GetField4C
.public Save_SysInfo_SetField4C
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public PlayerProfile_GetNamePtr
.public PlayerName_FlatToString
.public PlayerProfile_GetTrainerID
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_74_thumb.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
.public SaveSubstruct_UpdateCRC
.public Save_SysInfo_Get
.public Save_SysInfo_GetMysteryGiftActive
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public Save_PlayerData_GetIGTAddr
.public PlayerProfile_GetNamePtr
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_75.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
.public Save_SysInfo_Get
.public Save_SysInfo_GetField4C
.public Save_SysInfo_SetField4C
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public Options_GetFrame
.public sub_0202C08C
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_80_02229EE0.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
.public GF_AssertFail
.public String_Delete
.public CopyStringToU16Array
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public PlayerProfile_GetTrainerGender
.public PlayerProfile_GetVersion
.public Save_WiFiHistory_Get
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_80_0222AEF8.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#pragma once
.public FreeToHeap
.public GF_AssertFail
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public sub_02030E08
.public sub_02030FA0
.public Save_Frontier_GetStatic
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_80_0222BDF4.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
.public Save_PrepareForAsyncWrite
.public Save_WriteFileAsync
.public Save_WipeExtraChunks
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public PlayerProfile_GetTrainerGender
.public PlayerProfile_GetVersion
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_80_022324C4.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
.public GF_AssertFail
.public String_New
.public String_Delete
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_GameStats_Get
.public GameStats_Add
.public sub_02030CBC
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_80_02235FC8.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.public AllocFromHeapAtEnd
.public FreeToHeap
.public GF_AssertFail
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public Save_Mailbox_Get
.public Save_SpecialRibbons_Get
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_80_02237A70.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
.public ScheduleBgTilemapBufferTransfer
.public LCRandom
.public GF_AssertFail
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public PlayerProfile_Copy
.public FrontierSave_GetStat
.public sub_02031108
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_80_02238034.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.public FreeToHeap
.public LCRandom
.public GF_AssertFail
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public PlayerProfile_Copy
.public sub_02034818
.public sub_0203769C
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_80_02238648.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
.public RequestSwap3DBuffers
.public GF_3DVramMan_Create
.public GF_3DVramMan_Delete
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Options_GetFrame
.public sub_0203A880
.public sub_0203A914
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_81.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
.public Thunk_G3X_Reset
.public GF_3DVramMan_Create
.public GF_3DVramMan_Delete
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public PlayerProfile_GetNamePtr
.public PlayerName_FlatToString
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_82.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
.public String_Delete
.public String_SetEmpty
.public CopyU16ArrayToString
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public Options_GetTextFrameDelay
.public Options_GetFrame
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_83.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
.public String_New
.public String_Delete
.public CopyU16ArrayToString
.public Save_PlayerData_GetProfileAddr
.public Save_PlayerData_GetProfile
.public Save_PlayerData_GetOptionsAddr
.public PlayerProfile_GetNamePtr
.public PlayerProfile_GetTrainerGender
Expand Down
Loading