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

153
data/maps/LittlerootTown/scripts.inc
View File

@@ -42,23 +42,15 @@ LittlerootTown_MapScripts::
LittlerootTown_OnTransition:
setflag FLAG_VISITED_LITTLEROOT_TOWN
call Common_EventScript_SetupRivalGfxId
compare VAR_LITTLEROOT_INTRO_STATE, 2
call_if_eq LittlerootTown_EventScript_MoveMomToMaysDoor
call_if_eq VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_MoveMomToMaysDoor
call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_SetTwinPos
compare VAR_LITTLEROOT_TOWN_STATE, 3
call_if_eq LittlerootTown_EventScript_SetMomStandingInFrontOfDoorPos
compare VAR_LITTLEROOT_HOUSES_STATE_MAY, 4
call_if_eq LittlerootTown_EventScript_SetExitedHouseAfterLatiSSTicketEvent
compare VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4
call_if_eq LittlerootTown_EventScript_SetExitedHouseAfterLatiSSTicketEvent
compare VAR_OLDALE_RIVAL_STATE, 1
call_if_eq LittlerootTown_EventScript_MoveRivalFromOldale
compare VAR_LITTLEROOT_RIVAL_STATE, 3
call_if_eq LittlerootTown_EventScript_SetRivalLeftForRoute103
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1
call_if_eq LittlerootTown_EventScript_HideMapNamePopup
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
call_if_eq LittlerootTown_EventScript_LeftLabAfterDexUpgrade
call_if_eq VAR_LITTLEROOT_TOWN_STATE, 3, LittlerootTown_EventScript_SetMomStandingInFrontOfDoorPos
call_if_eq VAR_LITTLEROOT_HOUSES_STATE_MAY, 4, LittlerootTown_EventScript_SetExitedHouseAfterLatiSSTicketEvent
call_if_eq VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4, LittlerootTown_EventScript_SetExitedHouseAfterLatiSSTicketEvent
call_if_eq VAR_OLDALE_RIVAL_STATE, 1, LittlerootTown_EventScript_MoveRivalFromOldale
call_if_eq VAR_LITTLEROOT_RIVAL_STATE, 3, LittlerootTown_EventScript_SetRivalLeftForRoute103
call_if_eq VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_EventScript_HideMapNamePopup
call_if_eq VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2, LittlerootTown_EventScript_LeftLabAfterDexUpgrade
end
LittlerootTown_EventScript_LeftLabAfterDexUpgrade::
@@ -88,8 +80,7 @@ LittlerootTown_EventScript_MoveMomToMaysDoor::
return
LittlerootTown_EventScript_SetTwinPos::
compare VAR_LITTLEROOT_TOWN_STATE, 0
goto_if_eq LittlerootTown_EventScript_SetTwinGuardingRoutePos
goto_if_eq VAR_LITTLEROOT_TOWN_STATE, 0, LittlerootTown_EventScript_SetTwinGuardingRoutePos
setobjectxyperm LOCALID_TWIN, 10, 1
setobjectmovementtype LOCALID_TWIN, MOVEMENT_TYPE_FACE_UP
return
@@ -103,10 +94,8 @@ LittlerootTown_EventScript_SetMomStandingInFrontOfDoorPos::
clearflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
setobjectmovementtype LOCALID_MOM, MOVEMENT_TYPE_FACE_DOWN
checkplayergender
compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_SetMomInFrontOfDoorMale
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_SetMomInFrontOfDoorFemale
call_if_eq VAR_RESULT, MALE, LittlerootTown_EventScript_SetMomInFrontOfDoorMale
call_if_eq VAR_RESULT, FEMALE, LittlerootTown_EventScript_SetMomInFrontOfDoorFemale
return
LittlerootTown_EventScript_SetMomInFrontOfDoorMale::
@@ -243,8 +232,7 @@ LittlerootTown_EventScript_SetRivalBirchPosForDexUpgrade::
addobject LOCALID_BIRCH
addobject LOCALID_RIVAL
checkplayergender
compare VAR_RESULT, MALE
goto_if_eq LittlerootTown_EventScript_SetRivalBirchPosForDexUpgradeMale
goto_if_eq VAR_RESULT, MALE, LittlerootTown_EventScript_SetRivalBirchPosForDexUpgradeMale
goto LittlerootTown_EventScript_SetRivalBirchPosForDexUpgradeFemale
end
@@ -271,8 +259,7 @@ LittlerootTown_EventScript_Twin::
faceplayer
goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_GoodLuck
goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_YouSavedBirch
compare VAR_LITTLEROOT_TOWN_STATE, 0
goto_if_ne LittlerootTown_EventScript_GoSaveBirch
goto_if_ne VAR_LITTLEROOT_TOWN_STATE, 0, LittlerootTown_EventScript_GoSaveBirch
msgbox LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut, MSGBOX_DEFAULT
release
end
@@ -416,10 +403,8 @@ LittlerootTown_EventScript_BirchsLabSign::
LittlerootTown_EventScript_BrendansHouseSign::
lockall
checkplayergender
compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_PlayersHouseSignMale
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_BirchsHouseSignFemale
call_if_eq VAR_RESULT, MALE, LittlerootTown_EventScript_PlayersHouseSignMale
call_if_eq VAR_RESULT, FEMALE, LittlerootTown_EventScript_BirchsHouseSignFemale
releaseall
end
@@ -434,10 +419,8 @@ LittlerootTown_EventScript_BirchsHouseSignFemale::
LittlerootTown_EventScript_MaysHouseSign::
lockall
checkplayergender
compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_BirchsHouseSignMale
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_PlayersHouseSignFemale
call_if_eq VAR_RESULT, MALE, LittlerootTown_EventScript_BirchsHouseSignMale
call_if_eq VAR_RESULT, FEMALE, LittlerootTown_EventScript_PlayersHouseSignFemale
releaseall
end
@@ -489,28 +472,20 @@ LittlerootTown_EventScript_GiveRunningShoesTrigger5::
LittlerootTown_EventScript_GiveRunningShoesTrigger::
checkplayergender
compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_MomNoticePlayerMale
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_MomNoticePlayerFemale
call_if_eq VAR_RESULT, MALE, LittlerootTown_EventScript_MomNoticePlayerMale
call_if_eq VAR_RESULT, FEMALE, LittlerootTown_EventScript_MomNoticePlayerFemale
checkplayergender
compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_SetHomeDoorCoordsMale
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_SetHomeDoorCoordsFemale
call_if_eq VAR_RESULT, MALE, LittlerootTown_EventScript_SetHomeDoorCoordsMale
call_if_eq VAR_RESULT, FEMALE, LittlerootTown_EventScript_SetHomeDoorCoordsFemale
msgbox LittlerootTown_Text_WaitPlayer, MSGBOX_DEFAULT
closemessage
checkplayergender
compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale
call_if_eq VAR_RESULT, MALE, LittlerootTown_EventScript_MomApproachPlayerMale
call_if_eq VAR_RESULT, FEMALE, LittlerootTown_EventScript_MomApproachPlayerFemale
call LittlerootTown_EventScript_GiveRunningShoes
checkplayergender
compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_MomReturnHomeMale
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale
call_if_eq VAR_RESULT, MALE, LittlerootTown_EventScript_MomReturnHomeMale
call_if_eq VAR_RESULT, FEMALE, LittlerootTown_EventScript_MomReturnHomeFemale
goto LittlerootTown_EventScript_SetReceivedRunningShoes
end
@@ -535,33 +510,21 @@ LittlerootTown_EventScript_MomNoticePlayerFemale::
return
LittlerootTown_EventScript_MomApproachPlayerMale::
compare VAR_0x8008, 0
call_if_eq LittlerootTown_EventScript_MomApproachPlayer0
compare VAR_0x8008, 1
call_if_eq LittlerootTown_EventScript_MomApproachPlayer1
compare VAR_0x8008, 2
call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale2
compare VAR_0x8008, 3
call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale3
compare VAR_0x8008, 4
call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale4
compare VAR_0x8008, 5
call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale5
call_if_eq VAR_0x8008, 0, LittlerootTown_EventScript_MomApproachPlayer0
call_if_eq VAR_0x8008, 1, LittlerootTown_EventScript_MomApproachPlayer1
call_if_eq VAR_0x8008, 2, LittlerootTown_EventScript_MomApproachPlayerMale2
call_if_eq VAR_0x8008, 3, LittlerootTown_EventScript_MomApproachPlayerMale3
call_if_eq VAR_0x8008, 4, LittlerootTown_EventScript_MomApproachPlayerMale4
call_if_eq VAR_0x8008, 5, LittlerootTown_EventScript_MomApproachPlayerMale5
return
LittlerootTown_EventScript_MomApproachPlayerFemale::
compare VAR_0x8008, 0
call_if_eq LittlerootTown_EventScript_MomApproachPlayer0
compare VAR_0x8008, 1
call_if_eq LittlerootTown_EventScript_MomApproachPlayer1
compare VAR_0x8008, 2
call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale2
compare VAR_0x8008, 3
call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale3
compare VAR_0x8008, 4
call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale4
compare VAR_0x8008, 5
call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale5
call_if_eq VAR_0x8008, 0, LittlerootTown_EventScript_MomApproachPlayer0
call_if_eq VAR_0x8008, 1, LittlerootTown_EventScript_MomApproachPlayer1
call_if_eq VAR_0x8008, 2, LittlerootTown_EventScript_MomApproachPlayerFemale2
call_if_eq VAR_0x8008, 3, LittlerootTown_EventScript_MomApproachPlayerFemale3
call_if_eq VAR_0x8008, 4, LittlerootTown_EventScript_MomApproachPlayerFemale4
call_if_eq VAR_0x8008, 5, LittlerootTown_EventScript_MomApproachPlayerFemale5
return
LittlerootTown_EventScript_MomApproachPlayer0::
@@ -635,33 +598,21 @@ LittlerootTown_EventScript_MomApproachPlayerFemale5::
return
LittlerootTown_EventScript_MomReturnHomeMale::
compare VAR_0x8008, 0
call_if_eq LittlerootTown_EventScript_MomReturnHome0
compare VAR_0x8008, 1
call_if_eq LittlerootTown_EventScript_MomReturnHome1
compare VAR_0x8008, 2
call_if_eq LittlerootTown_EventScript_MomReturnHomeMale2
compare VAR_0x8008, 3
call_if_eq LittlerootTown_EventScript_MomReturnHomeMale3
compare VAR_0x8008, 4
call_if_eq LittlerootTown_EventScript_MomReturnHomeMale4
compare VAR_0x8008, 5
call_if_eq LittlerootTown_EventScript_MomReturnHomeMale5
call_if_eq VAR_0x8008, 0, LittlerootTown_EventScript_MomReturnHome0
call_if_eq VAR_0x8008, 1, LittlerootTown_EventScript_MomReturnHome1
call_if_eq VAR_0x8008, 2, LittlerootTown_EventScript_MomReturnHomeMale2
call_if_eq VAR_0x8008, 3, LittlerootTown_EventScript_MomReturnHomeMale3
call_if_eq VAR_0x8008, 4, LittlerootTown_EventScript_MomReturnHomeMale4
call_if_eq VAR_0x8008, 5, LittlerootTown_EventScript_MomReturnHomeMale5
return
LittlerootTown_EventScript_MomReturnHomeFemale::
compare VAR_0x8008, 0
call_if_eq LittlerootTown_EventScript_MomReturnHome0
compare VAR_0x8008, 1
call_if_eq LittlerootTown_EventScript_MomReturnHome1
compare VAR_0x8008, 2
call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale2
compare VAR_0x8008, 3
call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale3
compare VAR_0x8008, 4
call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale4
compare VAR_0x8008, 5
call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale5
call_if_eq VAR_0x8008, 0, LittlerootTown_EventScript_MomReturnHome0
call_if_eq VAR_0x8008, 1, LittlerootTown_EventScript_MomReturnHome1
call_if_eq VAR_0x8008, 2, LittlerootTown_EventScript_MomReturnHomeFemale2
call_if_eq VAR_0x8008, 3, LittlerootTown_EventScript_MomReturnHomeFemale3
call_if_eq VAR_0x8008, 4, LittlerootTown_EventScript_MomReturnHomeFemale4
call_if_eq VAR_0x8008, 5, LittlerootTown_EventScript_MomReturnHomeFemale5
return
LittlerootTown_EventScript_MomReturnHome0::
@@ -924,10 +875,8 @@ LittlerootTown_EventScript_Mom::
lock
faceplayer
checkplayergender
compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_SetHomeDoorCoordsMale
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_SetHomeDoorCoordsFemale
call_if_eq VAR_RESULT, MALE, LittlerootTown_EventScript_SetHomeDoorCoordsMale
call_if_eq VAR_RESULT, FEMALE, LittlerootTown_EventScript_SetHomeDoorCoordsFemale
call LittlerootTown_EventScript_GiveRunningShoes
applymovement LOCALID_MOM, Common_Movement_WalkInPlaceFasterUp
waitmovement 0