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/SkyPillar_Top/scripts.inc | |
| 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/SkyPillar_Top/scripts.inc')
| -rw-r--r-- | data/maps/SkyPillar_Top/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index 116bb9a95..6afbbd58c 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -1,6 +1,6 @@ SkyPillar_Top_MapScripts:: @ 82396B8 map_script MAP_SCRIPT_ON_RESUME, SkyPillar_Top_MapScript1_2396C8 - map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Top_MapScript1_OnTransition + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Top_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SkyPillar_Top_MapScript2_239713 .byte 0 @@ -15,7 +15,7 @@ SkyPillar_Top_EventScript_2396D2:: @ 82396D2 removeobject VAR_LAST_TALKED return -SkyPillar_Top_MapScript1_OnTransition: @ 82396E6 +SkyPillar_Top_OnTransition: @ 82396E6 compare VAR_SKY_PILLAR_STATE, 2 call_if_lt SkyPillar_Top_EventScript_2396FD compare VAR_SKY_PILLAR_STATE, 2 |