diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-26 22:34:42 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-26 22:34:42 -0500 |
| commit | 72bb0daccbdcc4db701d05c10c8b968fe7b09c2a (patch) | |
| tree | c80c40148daa9b92dd39ba6a765b61c4fbf7214d /data/maps/SecretBase_YellowCave4/scripts.inc | |
| parent | 6cb4c677cdf156d9d78f5f27bf3168882c1447ec (diff) | |
| parent | 231355f84dccd11329d81d074fa36135cfad4f94 (diff) | |
Merge branch 'master' into main-menu-state-machine
Diffstat (limited to 'data/maps/SecretBase_YellowCave4/scripts.inc')
| -rw-r--r-- | data/maps/SecretBase_YellowCave4/scripts.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/SecretBase_YellowCave4/scripts.inc b/data/maps/SecretBase_YellowCave4/scripts.inc index 32da39388..cb26f924e 100644 --- a/data/maps/SecretBase_YellowCave4/scripts.inc +++ b/data/maps/SecretBase_YellowCave4/scripts.inc @@ -1,8 +1,8 @@ SecretBase_YellowCave4_MapScripts:: @ 823B483 - map_script 4, SecretBase_RedCave1_MapScript2_23B498 - map_script 3, SecretBase_RedCave1_MapScript1_23B4A2 - map_script 2, SecretBase_RedCave1_MapScript2_23B4AE - map_script 5, SecretBase_RedCave1_MapScript1_23B4B8 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_RedCave1_MapScript2_23B498 + map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_RedCave1_MapScript1_23B4A2 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_RedCave1_MapScript2_23B4AE + map_script MAP_SCRIPT_ON_RESUME, SecretBase_RedCave1_MapScript1_23B4B8 .byte 0 SecretBase_RedCave1_MapScript2_23B498: @ 823B498 |