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

remove surf

Browse Source
This commit is contained in:
red031000 2023-06-14 21:48:48 +01:00
parent bc43e0f27f
commit 137ab282d5
No known key found for this signature in database
GPG Key ID: A3C87CFF2DC536C2
12 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/include/overlay_01_021E5900.inc
View File

@ -69,7 +69,7 @@
.public Fsys_TaskIsRunning
.public sub_02053018
.public sub_02053038
.public FieldSystem_GetSurfOverriddenMusicId
.public FieldSystem_GetOverriddenMusicId
.public FieldSystem_PlayOrFadeToNewMusicId
.public sub_02055164
.public FieldSys_StartBugContestTimer

2
asm/include/unk_0203E348.inc
View File

@ -147,7 +147,7 @@
.public TaskManager_GetSys
.public TaskManager_GetEnv
.public TaskManager_GetStatePtr
.public FieldSystem_GetSurfOverriddenMusicId
.public FieldSystem_GetOverriddenMusicId
.public sub_0205525C
.public sub_020552A4
.public Field_GetTimeOfDay

2
asm/include/unk_02054E00.inc
View File

@ -26,7 +26,7 @@
.public sub_02054F14
.public FieldSystem_SetSavedMusicId
.public Fsys_ClearSavedMusicId
.public FieldSystem_GetSurfOverriddenMusicId
.public FieldSystem_GetOverriddenMusicId
.public GetMapMusic
.public FieldSystem_PlayOrFadeToNewMusicId
.public Trainer_GetEncounterMusic

2
asm/include/unk_02087A78.inc
View File

@ -27,7 +27,7 @@
.public SaveArray_Flags_Get
.public BattleSetup_New
.public BattleSetup_Delete
.public FieldSystem_GetSurfOverriddenMusicId
.public FieldSystem_GetOverriddenMusicId
.public GetMapMusic
.public sub_02055198
.public ScriptState_FlypointFlagAction

2
asm/overlay_01_021E5900.s
View File

@ -729,7 +729,7 @@ _021E5F3E:
ldr r1, [r5, #0x20]
add r0, r5, #0
ldr r1, [r1]
bl FieldSystem_GetSurfOverriddenMusicId
bl FieldSystem_GetOverriddenMusicId
add r1, r0, #0
add r0, r5, #0
mov r2, #1

2
asm/unk_0203E348.s
View File

@ -3097,7 +3097,7 @@ _0203FA0C:
ldr r1, [r4, #0x20]
add r0, r4, #0
ldr r1, [r1]
bl FieldSystem_GetSurfOverriddenMusicId
bl FieldSystem_GetOverriddenMusicId
add r1, sp, #0
strh r0, [r1, #0xc]
ldr r0, [r4, #0x10]

8
asm/unk_02054E00.s
View File

@ -208,8 +208,8 @@ Fsys_ClearSavedMusicId: ; 0x02054F4C
.balign 4, 0
thumb_func_end Fsys_ClearSavedMusicId
thumb_func_start FieldSystem_GetSurfOverriddenMusicId
FieldSystem_GetSurfOverriddenMusicId: ; 0x02054F60
thumb_func_start FieldSystem_GetOverriddenMusicId
FieldSystem_GetOverriddenMusicId: ; 0x02054F60
push {r3, r4, r5, lr}
add r4, r0, #0
ldr r0, [r4, #0x40]
@ -241,7 +241,7 @@ _02054F9E:
pop {r3, r4, r5, pc}
nop
_02054FA4: .word SEQ_GS_NAMINORI
thumb_func_end FieldSystem_GetSurfOverriddenMusicId
thumb_func_end FieldSystem_GetOverriddenMusicId
thumb_func_start GetMapMusic
GetMapMusic: ; 0x02054FA8
@ -487,7 +487,7 @@ sub_02055164: ; 0x02055164
push {r4, r5, r6, lr}
add r5, r0, #0
add r4, r1, #0
bl FieldSystem_GetSurfOverriddenMusicId
bl FieldSystem_GetOverriddenMusicId
add r6, r0, #0
add r0, r5, #0
add r1, r4, #0

2
asm/unk_02087A78.s
View File

@ -441,7 +441,7 @@ _02087D88:
ldr r0, [r5, #0x28]
ldr r1, [r0, #0x20]
ldr r1, [r1]
bl FieldSystem_GetSurfOverriddenMusicId
bl FieldSystem_GetOverriddenMusicId
add r4, r0, #0
ldr r0, [r5, #0x28]
ldr r1, [r0, #0x20]

2
include/unk_02054E00.h
View File

@ -6,7 +6,7 @@
void sub_02054F14(void);
void FieldSystem_SetSavedMusicId(FieldSystem *fsys, u16 seqNo);
void Fsys_ClearSavedMusicId(FieldSystem *fsys);
u16 FieldSystem_GetSurfOverriddenMusicId(FieldSystem *fsys, u32 mapId);
u16 FieldSystem_GetOverriddenMusicId(FieldSystem *fsys, u32 mapId);
BOOL FieldSystem_PlayOrFadeToNewMusicId(FieldSystem *fsys, u16 seqNo, int a2);
void Fsys_BeginFadeOutMusic(FieldSystem *fsys, u32 mapId);
void sub_02055110(FieldSystem *fsys, u32 mapId, u32 a2);

2
src/field_use_item.c
View File

@ -282,7 +282,7 @@ static BOOL Task_MountOrDismountBicycle(TaskManager *taskManager) {
Field_PlayerAvatar_ApplyTransitionFlags(fsys->playerAvatar);
FieldSystem_SetSavedMusicId(fsys, 0);
if (SndRadio_GetSeqNo() == 0) {
FieldSystem_PlayOrFadeToNewMusicId(fsys, FieldSystem_GetSurfOverriddenMusicId(fsys, fsys->location->mapId), 1);
FieldSystem_PlayOrFadeToNewMusicId(fsys, FieldSystem_GetOverriddenMusicId(fsys, fsys->location->mapId), 1);
}
ov01_02205790(fsys, PlayerAvatar_GetFacingDirection(fsys->playerAvatar));
if (FollowingPokemon_IsActive(fsys)) {

2
src/scrcmd_c.c
View File

@ -2327,7 +2327,7 @@ BOOL ScrCmd_PlayerOnBikeSet(ScriptContext *ctx) {
Field_PlayerAvatar_OrrTransitionFlags(ctx->fsys->playerAvatar, PLAYER_TRANSITION_WALKING);
Field_PlayerAvatar_ApplyTransitionFlags(ctx->fsys->playerAvatar);
FieldSystem_SetSavedMusicId(ctx->fsys, 0);
FieldSystem_PlayOrFadeToNewMusicId(ctx->fsys, FieldSystem_GetSurfOverriddenMusicId(ctx->fsys, ctx->fsys->location->mapId), 1);
FieldSystem_PlayOrFadeToNewMusicId(ctx->fsys, FieldSystem_GetOverriddenMusicId(ctx->fsys, ctx->fsys->location->mapId), 1);
}
return FALSE;
}

2
src/unk_02092BE8.c
View File

@ -55,7 +55,7 @@ static void sub_02092BE8(FieldSystem* sys, Unk_PokegearSTRUCT_2C* ptr, BOOL a2)
ptr->playerGender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(FieldSys_GetSaveDataPtr(sys)));
ptr->unk28 = &sys->unk_10C;
ptr->unk01 = sub_0203DF3C(sys);
ptr->mapMusicID = FieldSystem_GetSurfOverriddenMusicId(sys, ptr->mapID);
ptr->mapMusicID = FieldSystem_GetOverriddenMusicId(sys, ptr->mapID);
if (a2) {
return;