diff options
| -rw-r--r-- | constants/event_constants.asm | 2 | ||||
| -rw-r--r-- | scripts/RocketHideoutB1F.asm | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/constants/event_constants.asm b/constants/event_constants.asm index 7bcef25c..7f4213f1 100644 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -598,7 +598,7 @@ const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 const_skip - const EVENT_677 ; ??? + const EVENT_ENTERED_ROCKET_HIDEOUT const_skip 7 const EVENT_67F ; ??? const_skip diff --git a/scripts/RocketHideoutB1F.asm b/scripts/RocketHideoutB1F.asm index 9354a0c7..fc107001 100644 --- a/scripts/RocketHideoutB1F.asm +++ b/scripts/RocketHideoutB1F.asm @@ -13,7 +13,7 @@ RocketHideoutB1FDoorCallbackScript: bit BIT_CUR_MAP_LOADED_1, [hl] res BIT_CUR_MAP_LOADED_1, [hl] ret z - CheckEvent EVENT_677 + CheckEvent EVENT_ENTERED_ROCKET_HIDEOUT jr nz, .door_open CheckEventReuseA EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 jr nz, .play_sound_door_open @@ -22,7 +22,8 @@ RocketHideoutB1FDoorCallbackScript: .play_sound_door_open ld a, SFX_GO_INSIDE call PlaySound - CheckEventHL EVENT_677 + ; BUG: should be SetEvent to avoid the SFX playing every time you enter the map + CheckEventHL EVENT_ENTERED_ROCKET_HIDEOUT .door_open ld a, $e ; Floor Block .set_door_block |