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 @@
Route119_MapScripts:: @ 81F4424
map_script MAP_SCRIPT_ON_RESUME, Route119_MapScript1_1F442F
map_script MAP_SCRIPT_ON_TRANSITION, Route119_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_TRANSITION, Route119_OnTransition
.byte 0
Route119_MapScript1_1F442F: @ 81F442F
@@ -14,7 +14,7 @@ Route119_EventScript_1F4439:: @ 81F4439
removeobject VAR_LAST_TALKED
return
Route119_MapScript1_OnTransition: @ 81F444D
Route119_OnTransition: @ 81F444D
call Common_EventScript_SetupRivalGender
call Common_EventScript_SetupRivalOnBikeGender
compare VAR_WEATHER_INSTITUTE_STATE, 1