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 @@
Route104_MapScripts:: @ 81ECC32
map_script MAP_SCRIPT_ON_FRAME_TABLE, Route104_MapScript2_1ECC3D
map_script MAP_SCRIPT_ON_TRANSITION, Route104_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_TRANSITION, Route104_OnTransition
.byte 0
Route104_MapScript2_1ECC3D: @ 81ECC3D
@@ -12,7 +12,7 @@ Route104_EventScript_1ECC47:: @ 81ECC47
goto Route104_EventScript_1ED099
end
Route104_MapScript1_OnTransition: @ 81ECC4E
Route104_OnTransition: @ 81ECC4E
call Common_EventScript_SetupRivalGender
call Route104_EventScript_1ECC78
call Route104_EventScript_1ECC5E