diff options
| author | Fontbane <fontbane@gmail.com> | 2019-04-22 16:31:51 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-04-22 17:23:59 -0500 |
| commit | 901a83d249a511e45a79d3358bdbdf1a594013ab (patch) | |
| tree | 116f0c20df7f8e46d47905318caef0c95714972b /data/maps/Route110_TrickHouseEnd | |
| parent | 6cf06d5f95c8404e0e97210f62c40b0059d24d41 (diff) | |
Fix some labels and include decorations.h
Include decorations.h in shop.c
Include decorations.h in event_scripts.s
Diffstat (limited to 'data/maps/Route110_TrickHouseEnd')
| -rw-r--r-- | data/maps/Route110_TrickHouseEnd/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 33c3dfddf..1c1aa76b4 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHouseEnd_MapScripts:: @ 826ACAF map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHouseEnd_MapScript1_26ACC4 - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEnd_MapScript1_OnTransition + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEnd_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEnd_MapScript2_26ACF5 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEnd_MapScript2_26ACDE .byte 0 @@ -10,7 +10,7 @@ Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4 call_if_eq Route110_TrickHouseEnd_EventScript_26AD0D end -Route110_TrickHouseEnd_MapScript1_OnTransition: @ 826ACD0 +Route110_TrickHouseEnd_OnTransition: @ 826ACD0 setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 special SetTrickHouseEndRoomFlag |