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

Merge branch 'master' into clone-union

Browse Source
This commit is contained in:
GriffinR authored and GitHub committed 2022-08-17 15:41:50 -04:00
2 parents 2b93687ade 56f8b1a47c
commit ab56ac41a1
322 files changed
+12564 -12748
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

data/maps/Route12/scripts.inc
+5 -9
View File
@@ -17,10 +17,9 @@ Route12_EventScript_Snorlax::
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_CutRecording
msgbox Text_WantToUsePokeFlute, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq Route12_EventScript_DontUsePokeFlute
goto_if_eq VAR_RESULT, NO, Route12_EventScript_DontUsePokeFlute
call EventScript_AwakenSnorlax
setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE
setwildbattle SPECIES_SNORLAX, 30
waitse
playmoncry SPECIES_SNORLAX, CRY_MODE_ENCOUNTER
delay 40
@@ -31,12 +30,9 @@ Route12_EventScript_Snorlax::
dowildbattle
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq Route12_EventScript_FoughtSnorlax
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq Route12_EventScript_FoughtSnorlax
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq Route12_EventScript_FoughtSnorlax
goto_if_eq VAR_RESULT, B_OUTCOME_WON, Route12_EventScript_FoughtSnorlax
goto_if_eq VAR_RESULT, B_OUTCOME_RAN, Route12_EventScript_FoughtSnorlax
goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, Route12_EventScript_FoughtSnorlax
release
end