dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some labels and include decorations.h

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
data/maps/AquaHideout_B1F/scripts.inc
View File

@@ -1,6 +1,6 @@
AquaHideout_B1F_MapScripts:: @ 82339A7
map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_MapScript1_2339B2
map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_OnTransition
.byte 0
AquaHideout_B1F_MapScript1_2339B2: @ 82339B2
@@ -14,7 +14,7 @@ AquaHideout_B1F_EventScript_2339BC:: @ 82339BC
removeobject VAR_LAST_TALKED
return
AquaHideout_B1F_MapScript1_OnTransition: @ 82339D0
AquaHideout_B1F_OnTransition: @ 82339D0
call_if_unset FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_2339E3
call_if_unset FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_2339E7
end