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

39
data/maps/Route110_TrickHouseEnd/scripts.inc
View File

@@ -8,8 +8,7 @@ Route110_TrickHouseEnd_MapScripts::
.byte 0
Route110_TrickHouseEnd_OnResume:
compare VAR_TEMP_1, 1
call_if_eq Route110_TrickHouseEnd_EventScript_SetDoorClosedMetatile
call_if_eq VAR_TEMP_1, 1, Route110_TrickHouseEnd_EventScript_SetDoorClosedMetatile
end
Route110_TrickHouseEnd_OnTransition:
@@ -63,8 +62,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle1::
msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
giveitem ITEM_RARE_CANDY
compare VAR_RESULT, FALSE
call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
call_if_eq VAR_RESULT, FALSE, Route110_TrickHouseEnd_EventScript_BagFull
msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
closemessage
call Route110_TrickHouseEnd_EventScript_TrickMasterExit
@@ -76,8 +74,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle2::
msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
giveitem ITEM_TIMER_BALL
compare VAR_RESULT, FALSE
call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
call_if_eq VAR_RESULT, FALSE, Route110_TrickHouseEnd_EventScript_BagFull
msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
closemessage
call Route110_TrickHouseEnd_EventScript_TrickMasterExit
@@ -89,8 +86,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle3::
msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
giveitem ITEM_HARD_STONE
compare VAR_RESULT, FALSE
call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
call_if_eq VAR_RESULT, FALSE, Route110_TrickHouseEnd_EventScript_BagFull
msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
closemessage
call Route110_TrickHouseEnd_EventScript_TrickMasterExit
@@ -102,8 +98,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle4::
msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
giveitem ITEM_SMOKE_BALL
compare VAR_RESULT, FALSE
call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
call_if_eq VAR_RESULT, FALSE, Route110_TrickHouseEnd_EventScript_BagFull
msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
closemessage
call Route110_TrickHouseEnd_EventScript_TrickMasterExit
@@ -115,8 +110,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle5::
msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
giveitem ITEM_TM12
compare VAR_RESULT, FALSE
call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
call_if_eq VAR_RESULT, FALSE, Route110_TrickHouseEnd_EventScript_BagFull
msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
closemessage
call Route110_TrickHouseEnd_EventScript_TrickMasterExit
@@ -128,8 +122,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle6::
msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
giveitem ITEM_MAGNET
compare VAR_RESULT, FALSE
call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
call_if_eq VAR_RESULT, FALSE, Route110_TrickHouseEnd_EventScript_BagFull
msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
closemessage
call Route110_TrickHouseEnd_EventScript_TrickMasterExit
@@ -141,8 +134,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle7::
msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
giveitem ITEM_PP_MAX
compare VAR_RESULT, FALSE
call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
call_if_eq VAR_RESULT, FALSE, Route110_TrickHouseEnd_EventScript_BagFull
msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
closemessage
call Route110_TrickHouseEnd_EventScript_TrickMasterExit
@@ -152,14 +144,10 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle7::
Route110_TrickHouseEnd_EventScript_CompletedPuzzle8::
msgbox Route110_TrickHouseEnd_Text_AllNightPolishingFloors, MSGBOX_DEFAULT
closemessage
compare VAR_FACING, DIR_SOUTH
call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwaySouth
compare VAR_FACING, DIR_NORTH
call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayNorth
compare VAR_FACING, DIR_WEST
call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayWest
compare VAR_FACING, DIR_EAST
call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayEast
call_if_eq VAR_FACING, DIR_SOUTH, Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwaySouth
call_if_eq VAR_FACING, DIR_NORTH, Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayNorth
call_if_eq VAR_FACING, DIR_WEST, Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayWest
call_if_eq VAR_FACING, DIR_EAST, Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayEast
delay 30
msgbox Route110_TrickHouseEnd_Text_FountainOfIdeasRunDry, MSGBOX_DEFAULT
closemessage
@@ -169,8 +157,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle8::
msgbox Route110_TrickHouseEnd_Text_DefeatedMePreferWhichTent, MSGBOX_DEFAULT
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
call Route110_TrickHouseEnd_EventScript_ChooseTent
compare VAR_RESULT, FALSE
call_if_eq Route110_TrickHouseEnd_EventScript_NoRoomForTent
call_if_eq VAR_RESULT, FALSE, Route110_TrickHouseEnd_EventScript_NoRoomForTent
msgbox Route110_TrickHouseEnd_Text_LeavingOnJourney, MSGBOX_DEFAULT
call Route110_TrickHouseEnd_EventScript_TrickMasterExit
special ResetTrickHouseNuggetFlag