dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync event macros

Browse Source
This commit is contained in:
GriffinR
2020-01-10 00:44:57 -05:00
parent 94fbc3ac48
commit 4a6f15ba24
220 changed files with 3209 additions and 3580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeruleanCave_B1F/scripts.inc
+7 -9
View File
@@ -4,20 +4,18 @@ CeruleanCave_B1F_MapScripts:: @ 81624BE
.byte 0
CeruleanCave_B1F_OnResume:: @ 81624C9
checkflag FLAG_SYS_SPECIAL_WILD_BATTLE
call_if TRUE, EventScript_1624D3
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_1624D3
end
EventScript_1624D3:: @ 81624D3
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
goto_if_ne EventScript_1A77A9
removeobject VAR_LAST_TALKED
return
CeruleanCave_B1F_OnTransition:: @ 81624E7
checkflag FLAG_FOUGHT_MEWTWO
call_if FALSE, EventScript_1624F1
call_if_unset FLAG_FOUGHT_MEWTWO, EventScript_1624F1
end
EventScript_1624F1:: @ 81624F1
@@ -27,7 +25,7 @@ EventScript_1624F1:: @ 81624F1
CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
lock
faceplayer
@@ -46,11 +44,11 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_162558
goto_if_eq EventScript_162558
compare VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_162561
goto_if_eq EventScript_162561
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_162561
goto_if_eq EventScript_162561
setflag FLAG_FOUGHT_MEWTWO
release
end