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

improve goto_if macros

Browse Source
This commit is contained in:
Melody
2018-12-21 20:28:24 -05:00
parent 87fd6b8dc2
commit ac2e4adf2d
273 changed files with 2555 additions and 3036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@ Route120_EventScript_1F5406:: @ 81F5406
Route120_EventScript_1F5449:: @ 81F5449
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, Route120_EventScript_27374E
goto_if_ne Route120_EventScript_27374E
removeobject 30
removeobject 36
return
@@ -35,7 +35,7 @@ Route120_EventScript_1F5449:: @ 81F5449
Route120_EventScript_1F5460:: @ 81F5460
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, Route120_EventScript_27374E
goto_if_ne Route120_EventScript_27374E
removeobject VAR_LAST_TALKED
return
@@ -72,11 +72,11 @@ Route120_MapScript1_1F54CD: @ 81F54CD
Route120_EventScript_1F54D8:: @ 81F54D8
getplayerxy VAR_TEMP_0, VAR_TEMP_1
compare VAR_TEMP_1, 14
goto_if 3, Route120_EventScript_1F5503
goto_if_le Route120_EventScript_1F5503
compare VAR_TEMP_1, 60
goto_if 3, Route120_EventScript_1F5507
goto_if_le Route120_EventScript_1F5507
compare VAR_TEMP_1, 61
goto_if 4, Route120_EventScript_1F54FF
goto_if_ge Route120_EventScript_1F54FF
return
Route120_EventScript_1F54FF:: @ 81F54FF
@@ -89,9 +89,9 @@ Route120_EventScript_1F5503:: @ 81F5503
Route120_EventScript_1F5507:: @ 81F5507
compare VAR_TEMP_0, 7
goto_if 3, Route120_EventScript_1F5523
goto_if_le Route120_EventScript_1F5523
compare VAR_TEMP_0, 19
goto_if 3, Route120_EventScript_1F5503
goto_if_le Route120_EventScript_1F5503
goto Route120_EventScript_1F5523
end
@@ -103,8 +103,7 @@ Route120_EventScript_1F5527:: @ 81F5527
lock
faceplayer
dodailyevents
checkflag FLAG_0x92E
goto_eq Route120_EventScript_1F5625
goto_if_set FLAG_0x92E, Route120_EventScript_1F5625
msgbox Route120_Text_2A70C7, MSGBOX_YESNO
compare VAR_RESULT, 1
call_if 1, Route120_EventScript_1F562F
@@ -152,7 +151,7 @@ Route120_EventScript_1F55F6:: @ 81F55F6
Route120_EventScript_1F5601:: @ 81F5601
giveitem_std VAR_0x8004
compare VAR_RESULT, 0
goto_eq Route120_EventScript_272054
goto_if_eq Route120_EventScript_272054
setflag FLAG_0x92E
msgbox Route120_Text_2A71D5, MSGBOX_DEFAULT
release
@@ -174,11 +173,10 @@ Route120_EventScript_1F5638:: @ 81F5638
Route120_EventScript_1F5641:: @ 81F5641
lock
faceplayer
checkflag FLAG_0x122
goto_eq Route120_EventScript_1F5672
goto_if_set FLAG_0x122, Route120_EventScript_1F5672
msgbox Route120_Text_1F5998, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq Route120_EventScript_1F5665
goto_if_eq Route120_EventScript_1F5665
goto Route120_EventScript_1F568B
end
@@ -191,7 +189,7 @@ Route120_EventScript_1F5665:: @ 81F5665
Route120_EventScript_1F5672:: @ 81F5672
msgbox Route120_Text_1F5ADE, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq Route120_EventScript_1F5665
goto_if_eq Route120_EventScript_1F5665
goto Route120_EventScript_1F568B
end
@@ -222,11 +220,11 @@ Route120_EventScript_1F568B:: @ 81F568B
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq Route120_EventScript_1F571C
goto_if_eq Route120_EventScript_1F571C
compare VAR_RESULT, 4
goto_eq Route120_EventScript_1F571C
goto_if_eq Route120_EventScript_1F571C
compare VAR_RESULT, 5
goto_eq Route120_EventScript_1F571C
goto_if_eq Route120_EventScript_1F571C
goto Route120_EventScript_1F572C
end
@@ -299,7 +297,7 @@ Route120_EventScript_1F57EE:: @ 81F57EE
trainerbattle_single TRAINER_ROBERT_1, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route120_EventScript_1F5839
goto_if_eq Route120_EventScript_1F5839
msgbox Route120_Text_29E726, MSGBOX_DEFAULT
release
end
@@ -331,7 +329,7 @@ Route120_EventScript_1F587E:: @ 81F587E
trainerbattle_single TRAINER_JEFFREY_1, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route120_EventScript_1F58C9
goto_if_eq Route120_EventScript_1F58C9
msgbox Route120_Text_29EA08, MSGBOX_DEFAULT
release
end