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/UnionRoom/scripts.inc | |
| parent | 6cb4c677cdf156d9d78f5f27bf3168882c1447ec (diff) | |
| parent | 231355f84dccd11329d81d074fa36135cfad4f94 (diff) | |
Merge branch 'master' into main-menu-state-machine
Diffstat (limited to 'data/maps/UnionRoom/scripts.inc')
| -rw-r--r-- | data/maps/UnionRoom/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc index f71c40e3d..0871ae033 100644 --- a/data/maps/UnionRoom/scripts.inc +++ b/data/maps/UnionRoom/scripts.inc @@ -1,6 +1,6 @@ UnionRoom_MapScripts:: @ 823D1A6 - map_script 5, UnionRoom_MapScript1_23D1B1 - map_script 3, UnionRoom_MapScript1_23D1E5 + map_script MAP_SCRIPT_ON_RESUME, UnionRoom_MapScript1_23D1B1 + map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_MapScript1_23D1E5 .byte 0 UnionRoom_MapScript1_23D1B1: @ 823D1B1 |