Merge pull request #40 from imaandrew/stop-radio-playing

Stop radio from playing after warp
JCog · May 30, 2022 · 21885e7 · 21885e7
2 parents 72d1f9b + 0850b2c
commit 21885e7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/lib/libpm-jp.a b/lib/libpm-jp.a
@@ -11,6 +11,7 @@ pm_SetCurtainDrawCallback = 0x8002BEC4;
 pm_SetCurtainFadeGoal = 0x8002BED4;
 pm_SetGameMode = 0x80033180;
 pm_state_step_end_battle = 0x80033850;
+pm_func_800554A4 = 0x80055154;
 pm_RemoveEffect = 0x8005A100;
 __osPiGetAccess = 0x80061474;
 __osPiRelAccess = 0x800614E0;
@@ -63,7 +64,6 @@ pm_player = 0x8010F188;
 draw_ci_image_with_clipping = 0x80133B20;
 set_screen_overlay_alpha = 0x8013D184;
 pm_SetMapTransitionEffect = 0x8013D350;
-pm_PlayAmbientSounds = 0x8014C418;
 pm_PlaySfx = 0x8014ED64;
 pm_SfxStopSound = 0x8014ED1C;
 pm_BgmSetSong = 0x8014F9C8;

diff --git a/lib/libpm-us.a b/lib/libpm-us.a
@@ -11,6 +11,7 @@ pm_SetCurtainDrawCallback = 0x8002BF04;
 pm_SetCurtainFadeGoal = 0x8002BF14;
 pm_SetGameMode = 0x800334F0;
 pm_state_step_end_battle = 0x80033BC0;
+pm_func_800554A4 = 0x800554A4;
 pm_RemoveEffect = 0x8005A450;
 __osPiGetAccess = 0x800614A4;
 __osPiRelAccess = 0x80061510;
@@ -63,7 +64,6 @@ pm_player = 0x8010EFC8;
 draw_ci_image_with_clipping = 0x8012E9A0;
 set_screen_overlay_alpha = 0x801380D4;
 pm_SetMapTransitionEffect = 0x801382A0;
-pm_PlayAmbientSounds = 0x80147368;
 pm_PlaySfx = 0x80149CB4;
 pm_SfxStopSound = 0x80149C6C;
 pm_BgmSetSong = 0x8014A918;

diff --git a/src/commands.c b/src/commands.c
@@ -88,7 +88,10 @@ _Bool fp_warp(u16 area, u16 map, u16 entrance) {
         pm_state_step_end_battle();
     }
 
-    pm_PlayAmbientSounds(-1, 0);   // clear ambient sounds
+    pm_func_800554A4(0); // stop koopa village radio from playing
+    pm_func_800554A4(1);
+    pm_func_800554A4(2);
+    pm_func_800554A4(3);
     pm_BgmSetSong(1, -1, 0, 0, 8); // clear secondary songs
     pm_SfxStopSound(0x19C);        // clear upward vine sound
     pm_SfxStopSound(0x19D);        // clear downward vine sound

diff --git a/src/pm64.h b/src/pm64.h
@@ -1057,7 +1057,6 @@ s32 pm_SetMapTransitionEffect(s32 transition);
 void pm_PlaySfx(s32 sound_id);
 void pm_BgmSetSong(s32 player_index, s32 song_id, s32 variation, s32 fade_out_time, s16 volume);
 void pm_SfxStopSound(s32 sound_id);
-void pm_PlayAmbientSounds(s32 sounds_id, s32 fade_time);
 void pm_SaveGame(void);
 void pm_func_802A472C(void);
 void osSetTime(u64);
@@ -1078,6 +1077,7 @@ void update_player_input(void);
 s32 pm_is_ability_active(s32 arg0);
 void set_screen_overlay_alpha(s32, f32);
 void pm_state_step_end_battle(void);
+s32 pm_func_800554A4(s32);
 
 /* Convenience Values */
 #define STORY_PROGRESS pm_save_data.global_bytes[0]