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
2022-08-17 15:41:50 -04:00
committed by GitHub
parent 2b93687ade 56f8b1a47c
commit ab56ac41a1
322 changed files with 12564 additions and 12748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/PokemonTower_6F/scripts.inc
+3 -4
View File
@@ -3,15 +3,14 @@ PokemonTower_6F_MapScripts::
PokemonTower_6F_EventScript_MarowakGhost::
lockall
textcolor 2
textcolor NPC_TEXT_COLOR_MON
msgbox PokemonTower_6F_Text_BeGoneIntruders
goto_if_questlog EventScript_ReleaseEnd
setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE
setwildbattle SPECIES_MAROWAK, 30
special StartMarowakBattle
waitstate
special QuestLog_CutRecording
compare VAR_RESULT, FALSE @ Set by CB2_EndMarowakBattle
goto_if_eq PokemonTower_6F_EventScript_DefeatedMarowakGhost
goto_if_eq VAR_RESULT, FALSE, PokemonTower_6F_EventScript_DefeatedMarowakGhost @ VAR_RESULT set by CB2_EndMarowakBattle
applymovement OBJ_EVENT_ID_PLAYER, PokemonTower_6F_Movement_ForcePlayerUp
waitmovement 0
releaseall