summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/event_scripts.s22
-rw-r--r--data/maps/EverGrandeCity/map.json28
-rw-r--r--data/maps/EverGrandeCity/scripts.inc20
-rw-r--r--data/maps/EverGrandeCity_Hall1/scripts.inc8
-rw-r--r--data/maps/EverGrandeCity_Hall2/scripts.inc8
-rw-r--r--data/maps/EverGrandeCity_Hall3/scripts.inc8
-rw-r--r--data/maps/EverGrandeCity_Hall4/scripts.inc8
-rw-r--r--data/maps/EverGrandeCity_Hall5/scripts.inc8
-rw-r--r--data/maps/EverGrandeCity_HallOfFame/scripts.inc46
-rw-r--r--data/specials.inc4
-rw-r--r--include/save_location.h7
-rw-r--r--src/field_specials.c2
-rw-r--r--src/save_location.c4
-rw-r--r--src/union_room.c3
14 files changed, 91 insertions, 85 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index b1e637bf0..b131d2cb5 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -647,12 +647,12 @@ Std_MsgboxAutoclose:: @ 8271494
.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
+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_271839
+ 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
@@ -666,13 +666,13 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1
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
+ 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_271851
+ call_if_eq EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent
return
EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries:: @ 8271829
@@ -683,21 +683,21 @@ EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries:: @ 8271829
clearflag FLAG_DEFEATED_HO_OH
return
-EverGrandeCity_HallOfFame_EventScript_271839:: @ 8271839
+EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady:: @ 8271839
setvar VAR_FOSSIL_MANIAC_STATE, 1
return
-EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F
+EverGrandeCity_HallOfFame_EventScript_ShowStevensHouseBeldum:: @ 827183F
clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL
return
-EverGrandeCity_HallOfFame_EventScript_271843:: @ 8271843
+EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent:: @ 8271843
setvar VAR_LITTLEROOT_HOUSES_STATE, 3
setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3
clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD
return
-EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851
+EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent:: @ 8271851
setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1
return
diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json
index 90175db1d..0fd6e9eca 100644
--- a/data/maps/EverGrandeCity/map.json
+++ b/data/maps/EverGrandeCity/map.json
@@ -58,7 +58,7 @@
"elevation": 1,
"var": "VAR_TEMP_1",
"var_value": "0",
- "script": "EverGrandeCity_EventScript_1E7D46"
+ "script": "EverGrandeCity_EventScript_SetVisitedEverGrande"
},
{
"type": "trigger",
@@ -67,7 +67,7 @@
"elevation": 1,
"var": "VAR_TEMP_1",
"var_value": "0",
- "script": "EverGrandeCity_EventScript_1E7D46"
+ "script": "EverGrandeCity_EventScript_SetVisitedEverGrande"
},
{
"type": "trigger",
@@ -76,7 +76,7 @@
"elevation": 1,
"var": "VAR_TEMP_1",
"var_value": "0",
- "script": "EverGrandeCity_EventScript_1E7D46"
+ "script": "EverGrandeCity_EventScript_SetVisitedEverGrande"
},
{
"type": "trigger",
@@ -85,7 +85,7 @@
"elevation": 1,
"var": "VAR_TEMP_1",
"var_value": "0",
- "script": "EverGrandeCity_EventScript_1E7D46"
+ "script": "EverGrandeCity_EventScript_SetVisitedEverGrande"
},
{
"type": "trigger",
@@ -94,7 +94,7 @@
"elevation": 1,
"var": "VAR_TEMP_1",
"var_value": "0",
- "script": "EverGrandeCity_EventScript_1E7D46"
+ "script": "EverGrandeCity_EventScript_SetVisitedEverGrande"
},
{
"type": "trigger",
@@ -103,7 +103,7 @@
"elevation": 1,
"var": "VAR_TEMP_1",
"var_value": "0",
- "script": "EverGrandeCity_EventScript_1E7D46"
+ "script": "EverGrandeCity_EventScript_SetVisitedEverGrande"
},
{
"type": "trigger",
@@ -112,7 +112,7 @@
"elevation": 1,
"var": "VAR_TEMP_1",
"var_value": "0",
- "script": "EverGrandeCity_EventScript_1E7D46"
+ "script": "EverGrandeCity_EventScript_SetVisitedEverGrande"
},
{
"type": "trigger",
@@ -121,7 +121,7 @@
"elevation": 1,
"var": "VAR_TEMP_1",
"var_value": "0",
- "script": "EverGrandeCity_EventScript_1E7D46"
+ "script": "EverGrandeCity_EventScript_SetVisitedEverGrande"
},
{
"type": "trigger",
@@ -130,7 +130,7 @@
"elevation": 1,
"var": "VAR_TEMP_1",
"var_value": "0",
- "script": "EverGrandeCity_EventScript_1E7D46"
+ "script": "EverGrandeCity_EventScript_SetVisitedEverGrande"
},
{
"type": "trigger",
@@ -139,7 +139,7 @@
"elevation": 1,
"var": "VAR_TEMP_1",
"var_value": "0",
- "script": "EverGrandeCity_EventScript_1E7D46"
+ "script": "EverGrandeCity_EventScript_SetVisitedEverGrande"
},
{
"type": "trigger",
@@ -148,7 +148,7 @@
"elevation": 1,
"var": "VAR_TEMP_1",
"var_value": "0",
- "script": "EverGrandeCity_EventScript_1E7D46"
+ "script": "EverGrandeCity_EventScript_SetVisitedEverGrande"
}
],
"bg_events": [
@@ -158,7 +158,7 @@
"y": 43,
"elevation": 5,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "EverGrandeCity_EventScript_1E7D2B"
+ "script": "EverGrandeCity_EventScript_VictoryRoadSign"
},
{
"type": "sign",
@@ -174,7 +174,7 @@
"y": 52,
"elevation": 5,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "EverGrandeCity_EventScript_1E7D34"
+ "script": "EverGrandeCity_EventScript_CitySign"
},
{
"type": "sign",
@@ -182,7 +182,7 @@
"y": 15,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "EverGrandeCity_EventScript_1E7D3D"
+ "script": "EverGrandeCity_EventScript_PokemonLeagueSign"
},
{
"type": "sign",
diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc
index 39e57f563..93e047dd0 100644
--- a/data/maps/EverGrandeCity/scripts.inc
+++ b/data/maps/EverGrandeCity/scripts.inc
@@ -6,31 +6,31 @@ EverGrandeCity_OnTransition: @ 81E7D21
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
end
-EverGrandeCity_EventScript_1E7D2B:: @ 81E7D2B
- msgbox EverGrandeCity_Text_1E7D4F, MSGBOX_SIGN
+EverGrandeCity_EventScript_VictoryRoadSign:: @ 81E7D2B
+ msgbox EverGrandeCity_Text_EnteringVictoryRoad, MSGBOX_SIGN
end
-EverGrandeCity_EventScript_1E7D34:: @ 81E7D34
- msgbox EverGrandeCity_Text_1E7D89, MSGBOX_SIGN
+EverGrandeCity_EventScript_CitySign:: @ 81E7D34
+ msgbox EverGrandeCity_Text_CitySign, MSGBOX_SIGN
end
-EverGrandeCity_EventScript_1E7D3D:: @ 81E7D3D
- msgbox EverGrandeCity_Text_1E7D65, MSGBOX_SIGN
+EverGrandeCity_EventScript_PokemonLeagueSign:: @ 81E7D3D
+ msgbox EverGrandeCity_Text_EnteringPokemonLeague, MSGBOX_SIGN
end
-EverGrandeCity_EventScript_1E7D46:: @ 81E7D46
+EverGrandeCity_EventScript_SetVisitedEverGrande:: @ 81E7D46
setflag FLAG_VISITED_EVER_GRANDE_CITY
setvar VAR_TEMP_1, 1
end
-EverGrandeCity_Text_1E7D4F: @ 81E7D4F
+EverGrandeCity_Text_EnteringVictoryRoad: @ 81E7D4F
.string "ENTERING VICTORY ROAD$"
-EverGrandeCity_Text_1E7D65: @ 81E7D65
+EverGrandeCity_Text_EnteringPokemonLeague: @ 81E7D65
.string "ENTERING POKéMON LEAGUE\n"
.string "CENTER GATE$"
-EverGrandeCity_Text_1E7D89: @ 81E7D89
+EverGrandeCity_Text_CitySign: @ 81E7D89
.string "EVER GRANDE CITY\p"
.string "“The paradise of flowers, the sea,\n"
.string "and POKéMON.”$"
diff --git a/data/maps/EverGrandeCity_Hall1/scripts.inc b/data/maps/EverGrandeCity_Hall1/scripts.inc
index c2ffaca47..cd9bd27c1 100644
--- a/data/maps/EverGrandeCity_Hall1/scripts.inc
+++ b/data/maps/EverGrandeCity_Hall1/scripts.inc
@@ -1,12 +1,12 @@
EverGrandeCity_Hall1_MapScripts:: @ 8229569
- map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall1_MapScript2_22956F
+ map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall1_OnWarp
.byte 0
-EverGrandeCity_Hall1_MapScript2_22956F: @ 822956F
- map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall1_EventScript_229579
+EverGrandeCity_Hall1_OnWarp: @ 822956F
+ map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall1_EventScript_TurnPlayerNorth
.2byte 0
-EverGrandeCity_Hall1_EventScript_229579:: @ 8229579
+EverGrandeCity_Hall1_EventScript_TurnPlayerNorth:: @ 8229579
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
end
diff --git a/data/maps/EverGrandeCity_Hall2/scripts.inc b/data/maps/EverGrandeCity_Hall2/scripts.inc
index be19992ef..4591aa111 100644
--- a/data/maps/EverGrandeCity_Hall2/scripts.inc
+++ b/data/maps/EverGrandeCity_Hall2/scripts.inc
@@ -1,12 +1,12 @@
EverGrandeCity_Hall2_MapScripts:: @ 822957E
- map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall2_MapScript2_229584
+ map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall2_OnWarp
.byte 0
-EverGrandeCity_Hall2_MapScript2_229584: @ 8229584
- map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall2_EventScript_22958E
+EverGrandeCity_Hall2_OnWarp: @ 8229584
+ map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall2_EventScript_TurnPlayerNorth
.2byte 0
-EverGrandeCity_Hall2_EventScript_22958E:: @ 822958E
+EverGrandeCity_Hall2_EventScript_TurnPlayerNorth:: @ 822958E
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
end
diff --git a/data/maps/EverGrandeCity_Hall3/scripts.inc b/data/maps/EverGrandeCity_Hall3/scripts.inc
index eaf2f4e5a..7bd895fd0 100644
--- a/data/maps/EverGrandeCity_Hall3/scripts.inc
+++ b/data/maps/EverGrandeCity_Hall3/scripts.inc
@@ -1,12 +1,12 @@
EverGrandeCity_Hall3_MapScripts:: @ 8229593
- map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall3_MapScript2_229599
+ map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall3_OnWarp
.byte 0
-EverGrandeCity_Hall3_MapScript2_229599: @ 8229599
- map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall3_EventScript_2295A3
+EverGrandeCity_Hall3_OnWarp: @ 8229599
+ map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall3_EventScript_TurnPlayerNorth
.2byte 0
-EverGrandeCity_Hall3_EventScript_2295A3:: @ 82295A3
+EverGrandeCity_Hall3_EventScript_TurnPlayerNorth:: @ 82295A3
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
end
diff --git a/data/maps/EverGrandeCity_Hall4/scripts.inc b/data/maps/EverGrandeCity_Hall4/scripts.inc
index e36890874..54d7adfc3 100644
--- a/data/maps/EverGrandeCity_Hall4/scripts.inc
+++ b/data/maps/EverGrandeCity_Hall4/scripts.inc
@@ -1,12 +1,12 @@
EverGrandeCity_Hall4_MapScripts:: @ 82295A8
- map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall4_MapScript2_2295AE
+ map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall4_OnWarp
.byte 0
-EverGrandeCity_Hall4_MapScript2_2295AE: @ 82295AE
- map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall4_EventScript_2295B8
+EverGrandeCity_Hall4_OnWarp: @ 82295AE
+ map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall4_EventScript_TurnPlayerNorth
.2byte 0
-EverGrandeCity_Hall4_EventScript_2295B8:: @ 82295B8
+EverGrandeCity_Hall4_EventScript_TurnPlayerNorth:: @ 82295B8
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
end
diff --git a/data/maps/EverGrandeCity_Hall5/scripts.inc b/data/maps/EverGrandeCity_Hall5/scripts.inc
index 6079bbd42..1ba85b999 100644
--- a/data/maps/EverGrandeCity_Hall5/scripts.inc
+++ b/data/maps/EverGrandeCity_Hall5/scripts.inc
@@ -1,12 +1,12 @@
EverGrandeCity_Hall5_MapScripts:: @ 82295BD
- map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall5_MapScript2_2295C3
+ map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall5_OnWarp
.byte 0
-EverGrandeCity_Hall5_MapScript2_2295C3: @ 82295C3
- map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall5_EventScript_2295CD
+EverGrandeCity_Hall5_OnWarp: @ 82295C3
+ map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall5_EventScript_TurnPlayerNorth
.2byte 0
-EverGrandeCity_Hall5_EventScript_2295CD:: @ 82295CD
+EverGrandeCity_Hall5_EventScript_TurnPlayerNorth:: @ 82295CD
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
end
diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
index 638e18eb5..3fe146f99 100644
--- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
@@ -1,38 +1,38 @@
EverGrandeCity_HallOfFame_MapScripts:: @ 822982C
- map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_HallOfFame_MapScript2_229846
- map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_HallOfFame_MapScript2_229837
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_HallOfFame_OnFrame
+ map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_HallOfFame_OnWarp
.byte 0
-EverGrandeCity_HallOfFame_MapScript2_229837: @ 8229837
- map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_229841
+EverGrandeCity_HallOfFame_OnWarp: @ 8229837
+ map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_TurnPlayerNorth
.2byte 0
-EverGrandeCity_HallOfFame_EventScript_229841:: @ 8229841
+EverGrandeCity_HallOfFame_EventScript_TurnPlayerNorth:: @ 8229841
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
end
-EverGrandeCity_HallOfFame_MapScript2_229846: @ 8229846
- map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_229850
+EverGrandeCity_HallOfFame_OnFrame: @ 8229846
+ map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_EnterHallOfFame
.2byte 0
-EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
+EverGrandeCity_HallOfFame_EventScript_EnterHallOfFame:: @ 8229850
lockall
- applymovement 1, EverGrandeCity_HallOfFame_Movement_229901
- applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229901
+ applymovement 1, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1
+ applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1
waitmovement 0
applymovement 1, Common_Movement_WalkInPlaceFastestRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
- msgbox EverGrandeCity_HallOfFame_Text_22990E, MSGBOX_DEFAULT
+ msgbox EverGrandeCity_HallOfFame_Text_HereWeHonorLeagueChampions, MSGBOX_DEFAULT
closemessage
- applymovement 1, EverGrandeCity_HallOfFame_Movement_229908
- applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229908
+ applymovement 1, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2
+ applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2
waitmovement 0
delay 20
applymovement 1, Common_Movement_WalkInPlaceFastestRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
- msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT
+ msgbox EverGrandeCity_HallOfFame_Text_LetsRecordYouAndYourPartnersNames, MSGBOX_DEFAULT
closemessage
applymovement 1, Common_Movement_WalkInPlaceFastestUp
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
@@ -42,15 +42,15 @@ 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
+ goto_if_eq EverGrandeCity_HallOfFame_EventScript_GameClearMale
compare VAR_RESULT, FEMALE
- goto_if_eq EverGrandeCity_HallOfFame_EventScript_2298F5
+ goto_if_eq EverGrandeCity_HallOfFame_EventScript_GameClearFemale
end
-EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9
+EverGrandeCity_HallOfFame_EventScript_GameClearMale:: @ 82298E9
setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
fadescreenspeed 1, 24
special GameClear
@@ -58,7 +58,7 @@ EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9
releaseall
end
-EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5
+EverGrandeCity_HallOfFame_EventScript_GameClearFemale:: @ 82298F5
setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F
fadescreenspeed 1, 24
special GameClear
@@ -66,7 +66,7 @@ EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5
releaseall
end
-EverGrandeCity_HallOfFame_Movement_229901: @ 8229901
+EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1: @ 8229901
walk_up
walk_up
walk_up
@@ -75,7 +75,7 @@ EverGrandeCity_HallOfFame_Movement_229901: @ 8229901
walk_up
step_end
-EverGrandeCity_HallOfFame_Movement_229908: @ 8229908
+EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2: @ 8229908
walk_up
walk_up
walk_up
@@ -83,7 +83,7 @@ EverGrandeCity_HallOfFame_Movement_229908: @ 8229908
walk_up
step_end
-EverGrandeCity_HallOfFame_Text_22990E: @ 822990E
+EverGrandeCity_HallOfFame_Text_HereWeHonorLeagueChampions: @ 822990E
.string "WALLACE: This room…\p"
.string "This is where we keep records of\n"
.string "POKéMON that prevailed through\l"
@@ -91,7 +91,7 @@ EverGrandeCity_HallOfFame_Text_22990E: @ 822990E
.string "It is here that the LEAGUE CHAMPIONS\n"
.string "are honored.$"
-EverGrandeCity_HallOfFame_Text_2299A3: @ 82299A3
+EverGrandeCity_HallOfFame_Text_LetsRecordYouAndYourPartnersNames: @ 82299A3
.string "WALLACE: Come on, let's record your\n"
.string "name as a TRAINER who triumphed over\l"
.string "the POKéMON LEAGUE, and the names of\l"
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..6c2ae0e6b 100644
--- a/include/save_location.h
+++ b/include/save_location.h
@@ -6,9 +6,14 @@
#define POKECENTER_SAVEWARP (1 << 1)
#define LOBBY_SAVEWARP (1 << 2)
#define UNK_SPECIAL_SAVE_WARP_FLAG_3 (1 << 3)
+//
+//
+//
+//
+#define CHAMPION_SAVEWARP (1 << 7)
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 2443b3161..b9d852cf3 100644
--- a/src/save_location.c
+++ b/src/save_location.c
@@ -129,7 +129,7 @@ void sub_81AFDA0(void)
gSaveBlock2Ptr->field_A8 |= 0x8;
}
-void sub_81AFDD0(void)
+void SetChampionSaveWarp(void)
{
- gSaveBlock2Ptr->specialSaveWarpFlags |= 0x80;
+ gSaveBlock2Ptr->specialSaveWarpFlags |= CHAMPION_SAVEWARP;
}
diff --git a/src/union_room.c b/src/union_room.c
index 5952b03eb..d22373ea0 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -30,6 +30,7 @@
#include "party_menu.h"
#include "pokemon_jump.h"
#include "random.h"
+#include "save_location.h"
#include "script.h"
#include "script_pokemon_util_80F87D8.h"
#include "sound.h"
@@ -1078,7 +1079,7 @@ u32 sub_8013B8C(struct UnkStruct_Group *arg0, s32 id)
if (gUnknown_02022C2C == 4 && structPtr->unk.field_0.unk_00.unk_01_2 != 3)
{
- if (!(gSaveBlock2Ptr->specialSaveWarpFlags & 0x80))
+ if (!(gSaveBlock2Ptr->specialSaveWarpFlags & CHAMPION_SAVEWARP))
return 1;
else if (structPtr->unk.field_0.unk_00.isChampion)
return 0;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 06:14:13 +0000