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
@@ -1,6 +1,6 @@
Route110_TrickHousePuzzle3_MapScripts:: @ 826BED8
map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle3_MapScript1_26BEE3
map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle3_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle3_OnTransition
.byte 0
Route110_TrickHousePuzzle3_MapScript1_26BEE3: @ 826BEE3
@@ -11,7 +11,7 @@ Route110_TrickHousePuzzle3_MapScript1_26BEE3: @ 826BEE3
call_if_eq Route110_TrickHousePuzzle3_EventScript_26C232
end
Route110_TrickHousePuzzle3_MapScript1_OnTransition: @ 826BEFF
Route110_TrickHousePuzzle3_OnTransition: @ 826BEFF
setvar VAR_TEMP_1, 0
setvar VAR_TEMP_2, 0
setvar VAR_TEMP_3, 0