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

Use B_OUTCOME constants for GetBattleOutcome

Browse Source
This commit is contained in:
GriffinR
2019-10-06 23:07:59 -04:00
committed by huderlem
parent 7ba11b7a1b
commit bcf74df27f
17 changed files with 79 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/maps/Route120/scripts.inc
View File

@@ -25,7 +25,7 @@ Route120_EventScript_1F5406:: @ 81F5406
Route120_EventScript_1F5449:: @ 81F5449
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn
removeobject 30
removeobject 36
@@ -33,7 +33,7 @@ Route120_EventScript_1F5449:: @ 81F5449
Route120_EventScript_1F5460:: @ 81F5460
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return
@@ -215,11 +215,11 @@ Route120_EventScript_1F568B:: @ 81F568B
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq Route120_EventScript_1F571C
compare VAR_RESULT, 4
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq Route120_EventScript_1F571C
compare VAR_RESULT, 5
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq Route120_EventScript_1F571C
goto Route120_EventScript_1F572C
end