Fix some labels and include decorations.h

Include decorations.h in shop.c

Include decorations.h in event_scripts.s
This commit is contained in:
Fontbane
2019-04-22 16:31:51 -04:00
committed by huderlem
parent 6cf06d5f95
commit 901a83d249
150 changed files with 282 additions and 296 deletions

View File

@@ -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