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

Merge branch 'master' into movement-action

Browse Source
This commit is contained in:
cbt6
2022-08-15 12:54:47 +08:00
committed by GitHub
parent 7233b2ed0a b3c2c7291f
commit 2644dd9c21
286 changed files with 8970 additions and 9432 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scripts/white_out.inc
+7 -10
View File
@@ -1,6 +1,6 @@
EventScript_AfterWhiteOutHeal::
lockall
textcolor 1
textcolor NPC_TEXT_COLOR_FEMALE
msgbox Text_FirstShouldRestoreMonsHealth
call EventScript_PkmnCenterNurse_TakeAndHealPkmn
call_if_unset FLAG_DEFEATED_BROCK, EventScript_AfterWhiteOutHealMsgPreBrock
@@ -23,7 +23,7 @@ EventScript_AfterWhiteOutHealMsg::
EventScript_AfterWhiteOutMomHeal::
lockall
textcolor 1
textcolor NPC_TEXT_COLOR_FEMALE
applymovement LOCALID_MOM, Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox Text_HadQuiteAnExperienceTakeRest
@@ -35,20 +35,17 @@ EventScript_AfterWhiteOutMomHeal::
EventScript_FieldPoison::
lockall
textcolor 3
textcolor NPC_TEXT_COLOR_NEUTRAL
special TryFieldPoisonWhiteOut
waitstate
compare VAR_RESULT, TRUE
goto_if_eq EventScript_FieldWhiteOut
goto_if_eq VAR_RESULT, TRUE, EventScript_FieldWhiteOut
releaseall
end
EventScript_FieldWhiteOut::
checkmoney 1, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_FieldWhiteOutNoMoney
compare VAR_RESULT, TRUE
goto_if_eq EventScript_FieldWhiteOutHasMoney
checkmoney 1
goto_if_eq VAR_RESULT, FALSE, EventScript_FieldWhiteOutNoMoney
goto_if_eq VAR_RESULT, TRUE, EventScript_FieldWhiteOutHasMoney
end
EventScript_FieldWhiteOutNoMoney::