From bef24a45f0249ba867a5a11f34e04c35c64cd9fa Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 8 Nov 2019 02:03:45 -0500 Subject: Document Littleroot scripts --- data/scripts/players_house.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index acb1536e8..3a0675e5e 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -305,9 +305,9 @@ PlayersHouse_1F_Movement_MomReturnToSeatFemale: @ 82929C1 PlayersHouse_1F_EventScript_Mom:: @ 82929C5 lock faceplayer - compare VAR_LITTLEROOT_HOUSES_STATE, 4 + compare VAR_LITTLEROOT_HOUSES_STATE_MAY, 4 goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard - compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 + compare VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4 goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard goto_if_set FLAG_HAS_MATCH_CALL, PlayersHouse_1F_EventScript_TryRegisterMom goto_if_set FLAG_RESCUED_BIRCH, PlayersHouse_1F_EventScript_MomHealsParty @@ -502,8 +502,8 @@ PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV:: @ 8292AF2 copyvar VAR_ROAMER_POKEMON, VAR_RESULT msgbox PlayersHouse_1F_Text_StillUnknownPokemon, MSGBOX_DEFAULT closemessage - setvar VAR_LITTLEROOT_HOUSES_STATE, 4 - setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4 + setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 4 + setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4 releaseall end -- cgit v1.2.3 From e19b9c9d467aa51c1ca550d2d9af4e3e9e5fd11e Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 8 Nov 2019 03:07:19 -0500 Subject: Resolve Littleroot merge conflict --- data/scripts/hall_of_fame.inc | 53 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 data/scripts/hall_of_fame.inc (limited to 'data/scripts') diff --git a/data/scripts/hall_of_fame.inc b/data/scripts/hall_of_fame.inc new file mode 100644 index 000000000..91a88f348 --- /dev/null +++ b/data/scripts/hall_of_fame.inc @@ -0,0 +1,53 @@ +EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags:: @ 82717C1 + special SetChampionSaveWarp + setflag FLAG_IS_CHAMPION + call EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries + compare VAR_FOSSIL_MANIAC_STATE, 0 + call_if_eq EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady + clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS + call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour + setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY + clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY + clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY + setvar VAR_STEVENS_HOUSE_STATE, 2 + setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY + clearflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY + clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL + clearflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL + setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS + clearflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION + setflag FLAG_HIDE_LILYCOVE_CITY_RIVAL + special UpdateTrainerFanClubGameClear + call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent + call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_ShowStevensHouseBeldum + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM + compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 0 + call_if_eq EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent + return + +EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries:: @ 8271829 + clearflag FLAG_DEFEATED_MEW + clearflag FLAG_DEFEATED_LATIAS_OR_LATIOS + clearflag FLAG_DEFEATED_DEOXYS + clearflag FLAG_DEFEATED_LUGIA + clearflag FLAG_DEFEATED_HO_OH + return + +EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady:: @ 8271839 + setvar VAR_FOSSIL_MANIAC_STATE, 1 + return + +EverGrandeCity_HallOfFame_EventScript_ShowStevensHouseBeldum:: @ 827183F + clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL + return + +EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent:: @ 8271843 + setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 3 + clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD + return + +EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent:: @ 8271851 + setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1 + return -- cgit v1.2.3