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/BattleFrontier_BattlePikeRandomRoom1 | |
| parent | 6cb4c677cdf156d9d78f5f27bf3168882c1447ec (diff) | |
| parent | 231355f84dccd11329d81d074fa36135cfad4f94 (diff) | |
Merge branch 'master' into main-menu-state-machine
Diffstat (limited to 'data/maps/BattleFrontier_BattlePikeRandomRoom1')
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc index 1c810900c..87f83371c 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattlePikeRandomRoom1_MapScripts:: @ 825D152 - map_script 5, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E - map_script 3, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 - map_script 2, BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167 - map_script 4, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE .byte 0 BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167: @ 825D167 |