diff options
| author | Melody <melody@pallet.town> | 2018-12-21 20:28:24 -0500 |
|---|---|---|
| committer | Melody <melody@pallet.town> | 2018-12-21 20:28:24 -0500 |
| commit | ac2e4adf2da2f30a741556e20e5bc9a494997581 (patch) | |
| tree | 1a05a202cfece044d546094581d8463a9b6e452c /data/maps/SouthernIsland_Interior/scripts.inc | |
| parent | 87fd6b8dc21b37b656f16e3f11832c6951328750 (diff) | |
improve goto_if macros
Diffstat (limited to 'data/maps/SouthernIsland_Interior/scripts.inc')
| -rw-r--r-- | data/maps/SouthernIsland_Interior/scripts.inc | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index ff1425196..02013869c 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -11,7 +11,7 @@ SouthernIsland_Interior_MapScript1_242A50: @ 8242A50 SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, SouthernIsland_Interior_EventScript_27374E + goto_if_ne SouthernIsland_Interior_EventScript_27374E removeobject 2 return @@ -36,9 +36,9 @@ SouthernIsland_Interior_EventScript_242A95:: @ 8242A95 SouthernIsland_Interior_EventScript_242AA0:: @ 8242AA0 checkplayergender compare VAR_RESULT, 0 - goto_eq SouthernIsland_Interior_EventScript_242AB8 + goto_if_eq SouthernIsland_Interior_EventScript_242AB8 compare VAR_RESULT, 1 - goto_eq SouthernIsland_Interior_EventScript_242ABE + goto_if_eq SouthernIsland_Interior_EventScript_242ABE end SouthernIsland_Interior_EventScript_242AB8:: @ 8242AB8 @@ -56,14 +56,10 @@ SouthernIsland_Interior_EventScript_242AC4:: @ 8242AC4 end SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 - checkflag FLAG_TEMP_2 - goto_eq SouthernIsland_Interior_EventScript_242B9A - checkflag FLAG_0x1C8 - goto_eq SouthernIsland_Interior_EventScript_242B9A - checkflag FLAG_0x1C9 - goto_eq SouthernIsland_Interior_EventScript_242B9A - checkflag FLAG_SYS_HAS_EON_TICKET - goto_if 0, SouthernIsland_Interior_EventScript_242B9A + goto_if_set FLAG_TEMP_2, SouthernIsland_Interior_EventScript_242B9A + goto_if_set FLAG_0x1C8, SouthernIsland_Interior_EventScript_242B9A + goto_if_set FLAG_0x1C9, SouthernIsland_Interior_EventScript_242B9A + goto_if_unset FLAG_SYS_HAS_EON_TICKET, SouthernIsland_Interior_EventScript_242B9A setflag FLAG_0x0CE setflag FLAG_TEMP_2 special SpawnCameraObject @@ -92,11 +88,11 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq SouthernIsland_Interior_EventScript_242B81 + goto_if_eq SouthernIsland_Interior_EventScript_242B81 compare VAR_RESULT, 4 - goto_eq SouthernIsland_Interior_EventScript_242B8F + goto_if_eq SouthernIsland_Interior_EventScript_242B8F compare VAR_RESULT, 5 - goto_eq SouthernIsland_Interior_EventScript_242B8F + goto_if_eq SouthernIsland_Interior_EventScript_242B8F setflag FLAG_0x1C9 releaseall end |