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,11 +1,11 @@
PetalburgCity_Gym_MapScripts:: @ 8204889
map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_OnTransition
map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_Gym_MapScript1_20492D
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_Gym_MapScript2_20498B
map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_Gym_MapScript2_20499A
.byte 0
PetalburgCity_Gym_MapScript1_OnTransition: @ 820489E
PetalburgCity_Gym_OnTransition: @ 820489E
compare VAR_PETALBURG_GYM_STATE, 6
goto_if_eq PetalburgCity_Gym_EventScript_2048B5
compare VAR_PETALBURG_GYM_STATE, 7