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

30
data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
View File

@@ -22,25 +22,20 @@ Route124_DivingTreasureHuntersHouse_EventScript_SkipGreeting::
Route124_DivingTreasureHuntersHouse_EventScript_CheckPlayerHasShard::
call Route124_DivingTreasureHuntersHouse_EventScript_GetPlayersShards
compare VAR_TEMP_1, 0
goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_NoShards
goto_if_eq VAR_TEMP_1, 0, Route124_DivingTreasureHuntersHouse_EventScript_NoShards
goto Route124_DivingTreasureHuntersHouse_EventScript_HasShard
end
Route124_DivingTreasureHuntersHouse_EventScript_GetPlayersShards::
setvar VAR_TEMP_1, 0
checkitem ITEM_RED_SHARD
compare VAR_RESULT, TRUE
call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_HasRedShard
call_if_eq VAR_RESULT, TRUE, Route124_DivingTreasureHuntersHouse_EventScript_HasRedShard
checkitem ITEM_YELLOW_SHARD
compare VAR_RESULT, TRUE
call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_HasYellowShard
call_if_eq VAR_RESULT, TRUE, Route124_DivingTreasureHuntersHouse_EventScript_HasYellowShard
checkitem ITEM_BLUE_SHARD
compare VAR_RESULT, TRUE
call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_HasBlueShard
call_if_eq VAR_RESULT, TRUE, Route124_DivingTreasureHuntersHouse_EventScript_HasBlueShard
checkitem ITEM_GREEN_SHARD
compare VAR_RESULT, TRUE
call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_HasGreenShard
call_if_eq VAR_RESULT, TRUE, Route124_DivingTreasureHuntersHouse_EventScript_HasGreenShard
return
Route124_DivingTreasureHuntersHouse_EventScript_HasRedShard::
@@ -246,14 +241,11 @@ Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard::
bufferitemname STR_VAR_1, VAR_0x8008
bufferitemname STR_VAR_2, VAR_0x8009
msgbox Route124_DivingTreasureHuntersHouse_Text_YoullTradeShardForStone, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
goto_if_eq VAR_RESULT, NO, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
checkitemspace VAR_0x8009
compare VAR_RESULT, TRUE
goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_TradeShard
goto_if_eq VAR_RESULT, TRUE, Route124_DivingTreasureHuntersHouse_EventScript_TradeShard
checkitem VAR_0x8008, 2
compare VAR_RESULT, FALSE
goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_TradeShard
goto_if_eq VAR_RESULT, FALSE, Route124_DivingTreasureHuntersHouse_EventScript_TradeShard
goto Route124_DivingTreasureHuntersHouse_EventScript_BagFull
end
@@ -262,11 +254,9 @@ Route124_DivingTreasureHuntersHouse_EventScript_TradeShard::
giveitem VAR_0x8009
msgbox Route124_DivingTreasureHuntersHouse_Text_ItsADeal, MSGBOX_DEFAULT
call Route124_DivingTreasureHuntersHouse_EventScript_GetPlayersShards
compare VAR_TEMP_1, 0
goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_EndTrade
goto_if_eq VAR_TEMP_1, 0, Route124_DivingTreasureHuntersHouse_EventScript_EndTrade
msgbox Route124_DivingTreasureHuntersHouse_Text_TradeSomethingElse, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_ShowTradeOptions
goto_if_eq VAR_RESULT, YES, Route124_DivingTreasureHuntersHouse_EventScript_ShowTradeOptions
goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
end