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

Reformat compare + goto_if/call_if to single statements

Browse Source
This commit is contained in:
GriffinR
2021-11-18 23:06:30 -05:00
parent c57efdba5d
commit e66ea0cb99
293 changed files with 2990 additions and 5978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
View File

@@ -11,8 +11,7 @@ MossdeepCity_SpaceCenter_1F_MapScripts::
.byte 0
MossdeepCity_SpaceCenter_1F_OnTransition:
compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_MoveObjectsForTeamMagma
goto_if_eq VAR_MOSSDEEP_CITY_STATE, 2, MossdeepCity_SpaceCenter_1F_EventScript_MoveObjectsForTeamMagma
end
MossdeepCity_SpaceCenter_1F_EventScript_MoveObjectsForTeamMagma::
@@ -25,12 +24,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_MoveObjectsForTeamMagma::
setobjectxyperm LOCALID_SCIENTIST_1, 3, 4
setobjectmovementtype LOCALID_SCIENTIST_1, MOVEMENT_TYPE_FACE_RIGHT
setobjectmovementtype LOCALID_SCIENTIST_2, MOVEMENT_TYPE_FACE_RIGHT
compare VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 1
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardLeft
compare VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardDown
compare VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 3
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardRight
goto_if_eq VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 1, MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardLeft
goto_if_eq VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 2, MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardDown
goto_if_eq VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 3, MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardRight
end
MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardLeft::
@@ -47,8 +43,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardRight::
end
MossdeepCity_SpaceCenter_1F_OnLoad:
compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_le MossdeepCity_SpaceCenter_1F_EventScript_SetMagmaNote
goto_if_le VAR_MOSSDEEP_CITY_STATE, 2, MossdeepCity_SpaceCenter_1F_EventScript_SetMagmaNote
end
MossdeepCity_SpaceCenter_1F_EventScript_SetMagmaNote::
@@ -58,15 +53,12 @@ MossdeepCity_SpaceCenter_1F_EventScript_SetMagmaNote::
MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounter::
lock
faceplayer
compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounterMagma
goto_if_eq VAR_MOSSDEEP_CITY_STATE, 2, MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounterMagma
dotimebasedevents
specialvar VAR_RESULT, GetWeekCount
buffernumberstring STR_VAR_1, VAR_RESULT
compare VAR_RESULT, 0
call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYet
compare VAR_RESULT, 1
call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumber
call_if_eq VAR_RESULT, 0, MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYet
call_if_ge VAR_RESULT, 1, MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumber
closemessage
applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
@@ -85,10 +77,8 @@ MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounterMagma::
dotimebasedevents
specialvar VAR_RESULT, GetWeekCount
buffernumberstring STR_VAR_1, VAR_RESULT
compare VAR_RESULT, 0
call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYetMagma
compare VAR_RESULT, 1
call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumberMagma
call_if_eq VAR_RESULT, 0, MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYetMagma
call_if_ge VAR_RESULT, 1, MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumberMagma
closemessage
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
@@ -106,8 +96,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumberMagma::
MossdeepCity_SpaceCenter_1F_EventScript_Scientist::
lock
faceplayer
compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_ScientistMagma
goto_if_eq VAR_MOSSDEEP_CITY_STATE, 2, MossdeepCity_SpaceCenter_1F_EventScript_ScientistMagma
msgbox MossdeepCity_SpaceCenter_1F_Text_RocketLaunchDemandsPerfection, MSGBOX_DEFAULT
release
end
@@ -122,13 +111,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_ScientistMagma::
MossdeepCity_SpaceCenter_1F_EventScript_SunStoneMan::
lock
faceplayer
compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_SunStoneManMagma
goto_if_eq VAR_MOSSDEEP_CITY_STATE, 2, MossdeepCity_SpaceCenter_1F_EventScript_SunStoneManMagma
goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStone
msgbox MossdeepCity_SpaceCenter_1F_Text_FoundThisYouCanHaveIt, MSGBOX_DEFAULT
giveitem ITEM_SUN_STONE
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP
msgbox MossdeepCity_SpaceCenter_1F_Text_HoennFamousForMeteorShowers, MSGBOX_DEFAULT
release
@@ -143,8 +130,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_SunStoneManMagma::
goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStoneMagma
msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaCantStealFuelTakeThis, MSGBOX_DEFAULT
giveitem ITEM_SUN_STONE
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP
msgbox MossdeepCity_SpaceCenter_1F_Text_CantStrollOnBeachWithMagma, MSGBOX_DEFAULT
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterRight
@@ -163,10 +149,8 @@ MossdeepCity_SpaceCenter_1F_EventScript_Woman::
lock
faceplayer
goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_WomanNormal
compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_WomanMagma
compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_WomanNormal
goto_if_eq VAR_MOSSDEEP_CITY_STATE, 2, MossdeepCity_SpaceCenter_1F_EventScript_WomanMagma
goto_if_lt VAR_MOSSDEEP_CITY_STATE, 2, MossdeepCity_SpaceCenter_1F_EventScript_WomanNormal
goto MossdeepCity_SpaceCenter_1F_EventScript_WomanMagma
end
@@ -184,10 +168,8 @@ MossdeepCity_SpaceCenter_1F_EventScript_OldMan::
lock
faceplayer
goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_OldManNormal
compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_OldManMagma
compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_OldManNormal
goto_if_eq VAR_MOSSDEEP_CITY_STATE, 2, MossdeepCity_SpaceCenter_1F_EventScript_OldManMagma
goto_if_lt VAR_MOSSDEEP_CITY_STATE, 2, MossdeepCity_SpaceCenter_1F_EventScript_OldManNormal
goto MossdeepCity_SpaceCenter_1F_EventScript_OldManMagma
end