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
+2 -2
View File
@@ -1,5 +1,5 @@
BirthIsland_Exterior_MapScripts:: @ 8267F15
map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_OnTransition
map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_MapScript1_267F65
map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_MapScript1_267F25
.byte 0
@@ -8,7 +8,7 @@ BirthIsland_Exterior_MapScript1_267F25: @ 8267F25
special sub_813B1D0
end
BirthIsland_Exterior_MapScript1_OnTransition: @ 8267F29
BirthIsland_Exterior_OnTransition: @ 8267F29
setflag FLAG_MAP_SCRIPT_CHECKED_DEOXYS
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_DEOXYS_ROCK_STEP_COUNT, 0