diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rom4.c | 4 | ||||
| -rw-r--r-- | src/scrcmd.c | 4 | ||||
| -rw-r--r-- | src/start_menu.c | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/rom4.c b/src/rom4.c index 244e94533..8331e3581 100644 --- a/src/rom4.c +++ b/src/rom4.c @@ -70,7 +70,7 @@ extern u32 gUnknown_08216694[]; extern struct UnkWarpStruct *sub_80FA8CC(u8); extern u16 VarGet(u16); extern u8 FlagGet(u16); -extern u8 sav1_get_weather_probably(void); +extern u8 GetSav1Weather(void); extern void PlayerGetDestCoords(u16 *, u16 *); extern u8 sub_810D32C(void); extern u16 GetLocalWildMon(u8 *); @@ -778,7 +778,7 @@ u16 sav1_map_get_music(void) if (gSaveBlock1.location.mapGroup == 0 && gSaveBlock1.location.mapNum == 26 - && sav1_get_weather_probably() == 8) + && GetSav1Weather() == 8) return BGM_ASHROAD; music = sub_8053D9C(&gSaveBlock1.location); diff --git a/src/scrcmd.c b/src/scrcmd.c index ccd5cbdb3..d613e2c79 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -33,7 +33,7 @@ extern void sub_8081594(u8); extern void sub_8053CE4(u32); extern void fade_screen(u8, u8); extern void DoTimeBasedEvents(void); -extern void sub_80806B4(u32); +extern void SetSav1Weather(u32); extern void sub_80806E4(void); extern void sub_808073C(void); extern void activate_per_step_callback(u8); @@ -724,7 +724,7 @@ bool8 ScrCmd_resetvars(struct ScriptContext *ctx) bool8 ScrCmd_setweather(struct ScriptContext *ctx) { u16 value = VarGet(ScriptReadHalfword(ctx)); - sub_80806B4(value); + SetSav1Weather(value); return FALSE; } diff --git a/src/start_menu.c b/src/start_menu.c index c538c20c2..979199c0b 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -23,7 +23,7 @@ extern bool8 sub_8125D44(u8); //Saving related extern void sub_80945C0(u8, u8); extern void sub_80946C8(u8, u8); extern void save_serialize_map(void); -extern void play_some_sound(void); +extern void PlayRainSoundEffect(void); extern void sub_8093130(u8, void (*)(void)); extern void sub_805469C(void); extern void sub_80C823C(void); @@ -370,7 +370,7 @@ u8 StartMenu_PokedexCallback(void) if(!gPaletteFade.active) { sav12_xor_increment(0x29); - play_some_sound(); + PlayRainSoundEffect(); SetMainCallback2(CB2_InitPokedex); return 1; } @@ -382,7 +382,7 @@ u8 StartMenu_PokemonCallback(void) { if(!gPaletteFade.active) { - play_some_sound(); + PlayRainSoundEffect(); SetMainCallback2(sub_8089A70); return 1; } @@ -394,7 +394,7 @@ u8 StartMenu_BagCallback(void) { if(!gPaletteFade.active) { - play_some_sound(); + PlayRainSoundEffect(); SetMainCallback2(sub_80A53F8); return 1; } @@ -406,7 +406,7 @@ u8 StartMenu_PokenavCallback(void) { if(!gPaletteFade.active) { - play_some_sound(); + PlayRainSoundEffect(); SetMainCallback2(sub_80EBA5C); return 1; } @@ -418,7 +418,7 @@ u8 StartMenu_PlayerCallback(void) { if(!gPaletteFade.active) { - play_some_sound(); + PlayRainSoundEffect(); sub_8093110(sub_805469C); return 1; } @@ -438,7 +438,7 @@ u8 StartMenu_OptionCallback(void) { if(!gPaletteFade.active) { - play_some_sound(); + PlayRainSoundEffect(); SetMainCallback2(CB2_InitOptionMenu); gMain.field_8 = sub_805469C; return 1; @@ -466,7 +466,7 @@ u8 StartMenu_PlayerLinkCallback(void) { if(!gPaletteFade.active) { - play_some_sound(); + PlayRainSoundEffect(); sub_8093130(gUnknown_03004860, sub_805469C); return 1; } |