diff options
| -rw-r--r-- | data/event_scripts.s | 56 | ||||
| -rw-r--r-- | data/maps/EverGrandeCity_HallOfFame/scripts.inc | 2 | ||||
| -rw-r--r-- | data/scripts/hall_of_fame.inc | 53 | ||||
| -rw-r--r-- | data/specials.inc | 4 | ||||
| -rw-r--r-- | include/save_location.h | 2 | ||||
| -rw-r--r-- | src/field_specials.c | 2 | ||||
| -rw-r--r-- | src/save_location.c | 2 |
7 files changed, 60 insertions, 61 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 213784708..7bd77505c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -645,61 +645,7 @@ Std_MsgboxAutoclose:: @ 8271494 return .include "data/scripts/new_game.inc" - -@ Below seems to be hall_of_fame.inc and briney.inc together? -EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 - special sub_81AFDD0 - setflag FLAG_IS_CHAMPION - call EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries - compare VAR_FOSSIL_MANIAC_STATE, 0 - call_if_eq EverGrandeCity_HallOfFame_EventScript_271839 - 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 sub_813BA60 - call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_271843 - call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_27183F - 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_271851 - 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_271839:: @ 8271839 - setvar VAR_FOSSIL_MANIAC_STATE, 1 - return - -EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F - clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL - return - -EverGrandeCity_HallOfFame_EventScript_271843:: @ 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_271851:: @ 8271851 - setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1 - return + .include "data/scripts/hall_of_fame.inc" EventScript_WhiteOut:: @ 8271857 call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 638e18eb5..53b6626a1 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -42,7 +42,7 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 waitfieldeffect FLDEFF_HALL_OF_FAME_RECORD delay 40 setvar VAR_TEMP_1, 1 - call EverGrandeCity_HallOfFame_EventScript_2717C1 + call EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags checkplayergender compare VAR_RESULT, MALE goto_if_eq EverGrandeCity_HallOfFame_EventScript_2298E9 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 diff --git a/data/specials.inc b/data/specials.inc index 1ec8bb230..9954ba9dc 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -180,7 +180,7 @@ gSpecials:: @ 81DBA64 def_special sub_813BA30 def_special UpdateMovedLilycoveFanClubMembers def_special sub_813BF60 - def_special sub_813BA60 + def_special UpdateTrainerFanClubGameClear def_special sub_813BF7C def_special RockSmashWildEncounter def_special GabbyAndTyGetBattleNum @@ -351,7 +351,7 @@ gSpecials:: @ 81DBA64 def_special sub_81653CC def_special DoesPartyHaveEnigmaBerry def_special ScriptRandom - def_special sub_81AFDD0 + def_special SetChampionSaveWarp def_special TryPutTreasureInvestigatorsOnAir def_special TryPutLotteryWinnerReportOnAir def_special sub_80EE72C diff --git a/include/save_location.h b/include/save_location.h index c330124ad..2eb550b1a 100644 --- a/include/save_location.h +++ b/include/save_location.h @@ -9,6 +9,6 @@ void TrySetMapSaveWarpStatus(void); void sub_81AFDA0(void); -void sub_81AFDD0(void); +void SetChampionSaveWarp(void); #endif // GUARD_SAVE_LOCATION_H diff --git a/src/field_specials.c b/src/field_specials.c index 65bc3a095..b84e4dde9 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -4033,7 +4033,7 @@ void sub_813BA30(void) } } -void sub_813BA60(void) +void UpdateTrainerFanClubGameClear(void) { if (!((gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> 7) & 1)) { diff --git a/src/save_location.c b/src/save_location.c index 7a9b08a09..b31d1ac9e 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -131,7 +131,7 @@ void sub_81AFDA0(void) gSaveBlock2Ptr->field_A8 |= 0x8; } -void sub_81AFDD0(void) +void SetChampionSaveWarp(void) { gSaveBlock2Ptr->specialSaveWarpFlags |= 0x80; } |