dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-eventobj

Browse Source
This commit is contained in:
GriffinR
2020-01-12 22:42:43 -05:00
committed by GitHub
parent 635267ce32 fa5816915d
commit 655910a16f
127 changed files with 15606 additions and 21934 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/battle_frontier/battle_dome.inc
+22 -24
View File
@@ -1,5 +1,3 @@
@ TODO: Add explanatory comments to macros
@ Initialize the Battle Dome challenge @ Initialize the Battle Dome challenge
.macro dome_init .macro dome_init
setvar VAR_0x8004, BATTLE_DOME_FUNC_INIT setvar VAR_0x8004, BATTLE_DOME_FUNC_INIT
@@ -23,64 +21,64 @@
special CallBattleDomeFunction special CallBattleDomeFunction
.endm .endm
@ @ Buffer the name of the current round to gStringVar1
.macro dome_getroundtext .macro dome_getroundtext
setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_ROUND_TEXT setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_ROUND_TEXT
special CallBattleDomeFunction special CallBattleDomeFunction
.endm .endm
@ @ Buffer the name of the opponent to gStringVar2 and the name of the round to gStringVar1
.macro dome_getopponentname .macro dome_getopponentname
setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_OPPONENT_NAME setvar VAR_0x8004, BATTLE_DOME_FUNC_GET_OPPONENT_NAME
special CallBattleDomeFunction special CallBattleDomeFunction
.endm .endm
@ @ Choose which of the opponents mons to use in battle and load them into the enemy party
.macro dome_initopponentparty .macro dome_initopponentparty
setvar VAR_0x8004, BATTLE_DOME_FUNC_INIT_OPPONENT_PARTY setvar VAR_0x8004, BATTLE_DOME_FUNC_INIT_OPPONENT_PARTY
special CallBattleDomeFunction special CallBattleDomeFunction
.endm .endm
@ @ Show the page that gives information on the next opponent
.macro dome_showopponentinfo .macro dome_showopponentinfo
setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_OPPONENT_INFO setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_OPPONENT_INFO
special CallBattleDomeFunction special CallBattleDomeFunction
.endm .endm
@ @ Displays the tourney tree for the current tourney
.macro dome_showtourneytree .macro dome_showtourneytree
setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_TOURNEY_TREE setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_TOURNEY_TREE
special CallBattleDomeFunction special CallBattleDomeFunction
.endm .endm
@ @ Displays the tourney tree for the results of the previous tourney. Before the player enters their first tourney this is a random tourney generated by dome_initresultstree
.macro dome_showresultstree .macro dome_showprevtourneytree
setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_PREV_RESULTS_TREE setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_PREV_TOURNEY_TREE
special CallBattleDomeFunction special CallBattleDomeFunction
.endm .endm
@ @ Sets gTrainerBattleOpponent_A to the trainer ID of the next opponent
.macro dome_setopponent .macro dome_setopponent
setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_OPPONENT_ID setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_OPPONENT_ID
special CallBattleDomeFunction special CallBattleDomeFunction
.endm .endm
@ @ Set the object event gfx id for the opponent
.macro dome_setopponentgfx .macro dome_setopponentgfx
setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_OPPONENT_GFX setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_OPPONENT_GFX
special CallBattleDomeFunction special CallBattleDomeFunction
.endm .endm
@ @ A non-interactive version of the tourney tree shown when a round is completed
.macro dome_showstatictourneytree .macro dome_showstatictourneytree
setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_STATIC_TOURNEY_TREE setvar VAR_0x8004, BATTLE_DOME_FUNC_SHOW_STATIC_TOURNEY_TREE
special CallBattleDomeFunction special CallBattleDomeFunction
.endm .endm
@ @ Decides the winners of NPC vs NPC matches, and eliminates either the player or their opponent depending on the playerStatus (DOME_PLAYER_*)
.macro dome_resolvewinners arg:req .macro dome_resolvewinners playerStatus:req
setvar VAR_0x8004, BATTLE_DOME_FUNC_RESOLVE_WINNERS setvar VAR_0x8004, BATTLE_DOME_FUNC_RESOLVE_WINNERS
setvar VAR_0x8005, \arg setvar VAR_0x8005, \playerStatus
special CallBattleDomeFunction special CallBattleDomeFunction
.endm .endm
@@ -97,7 +95,7 @@
special CallBattleDomeFunction special CallBattleDomeFunction
.endm .endm
@ @ Sets the facility trainer/mon set pointers
.macro dome_settrainers .macro dome_settrainers
setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_TRAINERS setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_TRAINERS
special CallBattleDomeFunction special CallBattleDomeFunction
@@ -109,19 +107,19 @@
special CallBattleDomeFunction special CallBattleDomeFunction
.endm .endm
@ @ Reset the held items of the mons that just battled to what they were prior to battling
.macro dome_restorehelditems .macro dome_restorehelditems
setvar VAR_0x8004, BATTLE_DOME_FUNC_RESTORE_HELD_ITEMS setvar VAR_0x8004, BATTLE_DOME_FUNC_RESTORE_HELD_ITEMS
special CallBattleDomeFunction special CallBattleDomeFunction
.endm .endm
@ @ Reduce the players party to the selected mons, used to reduce down to the 2 selected for battle
.macro dome_reduceparty .macro dome_reduceparty
setvar VAR_0x8004, BATTLE_DOME_FUNC_REDUCE_PARTY setvar VAR_0x8004, BATTLE_DOME_FUNC_REDUCE_PARTY
special CallBattleDomeFunction special CallBattleDomeFunction
.endm .endm
@ @ Compares the initial tournament ranking (seed) of the player to opponent A. Returns 1 if the player's seed is better, 2 if the opponent's seed is better.
.macro dome_compareseeds .macro dome_compareseeds
setvar VAR_0x8004, BATTLE_DOME_FUNC_COMPARE_SEEDS setvar VAR_0x8004, BATTLE_DOME_FUNC_COMPARE_SEEDS
special CallBattleDomeFunction special CallBattleDomeFunction
@@ -133,13 +131,13 @@
special CallBattleDomeFunction special CallBattleDomeFunction
.endm .endm
@ TODO: Document this macro and its function @ Performs a random tourney to initialize the results board before the player has entered a challenge
.macro dome_21 .macro dome_initresultstree
setvar VAR_0x8004, BATTLE_DOME_FUNC_21 setvar VAR_0x8004, BATTLE_DOME_FUNC_INIT_RESULTS_TREE
special CallBattleDomeFunction special CallBattleDomeFunction
.endm .endm
@ @ Generates the tourney trainers and their parties, and seeds them in the tourney tree
.macro dome_inittrainers .macro dome_inittrainers
setvar VAR_0x8004, BATTLE_DOME_FUNC_INIT_TRAINERS setvar VAR_0x8004, BATTLE_DOME_FUNC_INIT_TRAINERS
special CallBattleDomeFunction special CallBattleDomeFunction
common_syms/save.txt
+1 -1
View File
@@ -10,4 +10,4 @@ gSaveFileStatus
gGameContinueCallback gGameContinueCallback
gRamSaveSectionLocations gRamSaveSectionLocations
gSaveUnusedVar2 gSaveUnusedVar2
gUnknown_03006294 gSaveAttemptStatus
data/battle_ai_scripts.s
+1 -1
View File
@@ -2395,10 +2395,10 @@ AI_CV_Hail_ScoreDown1:
AI_CV_Hail_End: AI_CV_Hail_End:
end end
@ BUG: Facade score is increased if the target is statused, but should be if the user is. Replace AI_TARGET with AI_USER
AI_CV_Facade: AI_CV_Facade:
if_not_status AI_TARGET, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, AI_CV_Facade_End if_not_status AI_TARGET, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, AI_CV_Facade_End
score +1 score +1
AI_CV_Facade_End: AI_CV_Facade_End:
end end
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+339 -343
View File
File diff suppressed because it is too large Load Diff
data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
+26 -25
View File
@@ -1,48 +1,48 @@
BattleFrontier_BattleDomeCorridor_MapScripts:: @ 824B0FE BattleFrontier_BattleDomeCorridor_MapScripts:: @ 824B0FE
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeCorridor_MapScript2_24B104 map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeCorridor_OnFrame
.byte 0 .byte 0
BattleFrontier_BattleDomeCorridor_MapScript2_24B104: @ 824B104 BattleFrontier_BattleDomeCorridor_OnFrame: @ 824B104
map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeCorridor_EventScript_24B10E map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor
.2byte 0 .2byte 0
BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor:: @ 824B10E
delay 16 delay 16
setvar VAR_TEMP_0, 1 setvar VAR_TEMP_0, 1
frontier_get FRONTIER_DATA_LVL_MODE frontier_get FRONTIER_DATA_LVL_MODE
compare VAR_RESULT, FRONTIER_LVL_OPEN compare VAR_RESULT, FRONTIER_LVL_OPEN
goto_if_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161 goto_if_eq BattleFrontier_BattleDomeCorridor_EventScript_WalkToBattleRoomLvOpen
applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1B2 applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLv50
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1A1 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLv50
waitmovement 0 waitmovement 0
opendoor 13, 3 opendoor 13, 3
waitdooranim waitdooranim
applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1BE applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLv50
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1AE applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLv50
waitmovement 0 waitmovement 0
closedoor 13, 3 closedoor 13, 3
waitdooranim waitdooranim
goto BattleFrontier_BattleDomeCorridor_EventScript_24B18F goto BattleFrontier_BattleDomeCorridor_EventScript_WarpToPreBattleRoom
BattleFrontier_BattleDomeCorridor_EventScript_24B161:: @ 824B161 BattleFrontier_BattleDomeCorridor_EventScript_WalkToBattleRoomLvOpen:: @ 824B161
applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1D6 applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLvOpen
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1C1 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLvOpen
waitmovement 0 waitmovement 0
opendoor 37, 3 opendoor 37, 3
waitdooranim waitdooranim
applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1E6 applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLvOpen
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1D2 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLvOpen
waitmovement 0 waitmovement 0
closedoor 37, 3 closedoor 37, 3
waitdooranim waitdooranim
BattleFrontier_BattleDomeCorridor_EventScript_24B18F:: @ 824B18F BattleFrontier_BattleDomeCorridor_EventScript_WarpToPreBattleRoom:: @ 824B18F
waitmovement 0 waitmovement 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 7 warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 7
waitstate waitstate
end end
BattleFrontier_BattleDomeCorridor_Movement_24B1A1: @ 824B1A1 BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLv50: @ 824B1A1
walk_up walk_up
walk_left walk_left
walk_left walk_left
@@ -57,13 +57,13 @@ BattleFrontier_BattleDomeCorridor_Movement_24B1A1: @ 824B1A1
walk_in_place_fastest_up walk_in_place_fastest_up
step_end step_end
BattleFrontier_BattleDomeCorridor_Movement_24B1AE: @ 824B1AE BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLv50: @ 824B1AE
walk_up walk_up
walk_up walk_up
set_invisible set_invisible
step_end step_end
BattleFrontier_BattleDomeCorridor_Movement_24B1B2: @ 824B1B2 BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLv50: @ 824B1B2
walk_left walk_left
walk_left walk_left
walk_left walk_left
@@ -77,12 +77,12 @@ BattleFrontier_BattleDomeCorridor_Movement_24B1B2: @ 824B1B2
walk_up walk_up
step_end step_end
BattleFrontier_BattleDomeCorridor_Movement_24B1BE: @ 824B1BE BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLv50: @ 824B1BE
walk_up walk_up
set_invisible set_invisible
step_end step_end
BattleFrontier_BattleDomeCorridor_Movement_24B1C1: @ 824B1C1 BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLvOpen: @ 824B1C1
walk_up walk_up
walk_right walk_right
walk_right walk_right
@@ -101,13 +101,13 @@ BattleFrontier_BattleDomeCorridor_Movement_24B1C1: @ 824B1C1
walk_in_place_fastest_up walk_in_place_fastest_up
step_end step_end
BattleFrontier_BattleDomeCorridor_Movement_24B1D2: @ 824B1D2 BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLvOpen: @ 824B1D2
walk_up walk_up
walk_up walk_up
set_invisible set_invisible
step_end step_end
BattleFrontier_BattleDomeCorridor_Movement_24B1D6: @ 824B1D6 BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLvOpen: @ 824B1D6
walk_right walk_right
walk_right walk_right
walk_right walk_right
@@ -125,12 +125,13 @@ BattleFrontier_BattleDomeCorridor_Movement_24B1D6: @ 824B1D6
walk_up walk_up
step_end step_end
BattleFrontier_BattleDomeCorridor_Movement_24B1E6: @ 824B1E6 BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLvOpen: @ 824B1E6
walk_up walk_up
set_invisible set_invisible
step_end step_end
BattleFrontier_BattleDomeCorridor_Movement_24B1E9: @ 824B1E9 @ Unused
BattleFrontier_BattleDomeCorridor_Movement_WalkToBattleRoomMidRight: @ 824B1E9
walk_up walk_up
walk_right walk_right
walk_right walk_right
data/maps/BattleFrontier_BattleDomeLobby/map.json
+10 -10
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleDomeLobby_EventScript_249A35", "script": "BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleDomeLobby_EventScript_249E10", "script": "BattleFrontier_BattleDomeLobby_EventScript_Man",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleDomeLobby_EventScript_249DFE", "script": "BattleFrontier_BattleDomeLobby_EventScript_Lass",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleDomeLobby_EventScript_249E07", "script": "BattleFrontier_BattleDomeLobby_EventScript_FatMan",
"flag": "0" "flag": "0"
}, },
{ {
@@ -76,7 +76,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleDomeLobby_EventScript_249DED", "script": "BattleFrontier_BattleDomeLobby_EventScript_Maniac",
"flag": "0" "flag": "0"
}, },
{ {
@@ -89,7 +89,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleDomeLobby_EventScript_249A47", "script": "BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendant",
"flag": "0" "flag": "0"
} }
], ],
@@ -117,7 +117,7 @@
"y": 10, "y": 10,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "BattleFrontier_BattleDomeLobby_EventScript_249D52" "script": "BattleFrontier_BattleDomeLobby_EventScript_ShowSinglesResults"
}, },
{ {
"type": "sign", "type": "sign",
@@ -125,7 +125,7 @@
"y": 10, "y": 10,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "BattleFrontier_BattleDomeLobby_EventScript_249D84" "script": "BattleFrontier_BattleDomeLobby_EventScript_ShowPrevTourneyTree"
}, },
{ {
"type": "sign", "type": "sign",
@@ -133,7 +133,7 @@
"y": 10, "y": 10,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "BattleFrontier_BattleDomeLobby_EventScript_249D6B" "script": "BattleFrontier_BattleDomeLobby_EventScript_ShowDoublesResults"
}, },
{ {
"type": "sign", "type": "sign",
@@ -141,7 +141,7 @@
"y": 10, "y": 10,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "BattleFrontier_BattleDomeLobby_EventScript_249E34" "script": "BattleFrontier_BattleDomeLobby_EventScript_RulesBoard"
} }
] ]
} }
data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+221 -220
View File
@@ -1,171 +1,168 @@
BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2 BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeLobby_MapScript1_2497F2 map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeLobby_OnResume
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_24980F map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeLobby_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_OnWarp map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_OnWarp
.byte 0 .byte 0
BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2 BattleFrontier_BattleDomeLobby_OnResume: @ 82497F2
dome_21 dome_initresultstree
end end
BattleFrontier_BattleDomeLobby_OnWarp: @ 82497FB BattleFrontier_BattleDomeLobby_OnWarp: @ 82497FB
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeLobby_EventScript_249805 map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeLobby_EventScript_TurnPlayerNorth
.2byte 0 .2byte 0
BattleFrontier_BattleDomeLobby_EventScript_249805:: @ 8249805 BattleFrontier_BattleDomeLobby_EventScript_TurnPlayerNorth:: @ 8249805
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F BattleFrontier_BattleDomeLobby_OnFrame: @ 824980F
map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeLobby_EventScript_249839 map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeLobby_EventScript_GetChallengeStatus
map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattleDomeLobby_EventScript_249842 map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattleDomeLobby_EventScript_QuitWithoutSaving
map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleDomeLobby_EventScript_2499F9 map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleDomeLobby_EventScript_ResumeChallenge
map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattleDomeLobby_EventScript_24989B map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattleDomeLobby_EventScript_WonChallenge
map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattleDomeLobby_EventScript_249940 map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattleDomeLobby_EventScript_LostChallenge
.2byte 0 .2byte 0
BattleFrontier_BattleDomeLobby_EventScript_249839:: @ 8249839 BattleFrontier_BattleDomeLobby_EventScript_GetChallengeStatus:: @ 8249839
frontier_getstatus frontier_getstatus
end end
BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842 BattleFrontier_BattleDomeLobby_EventScript_QuitWithoutSaving:: @ 8249842
lockall lockall
msgbox BattleFrontier_BattleDomeLobby_Text_24A45F, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_DidntSaveBeforeQuitting, MSGBOX_DEFAULT
closemessage closemessage
dome_set DOME_DATA_WIN_STREAK, 0 dome_set DOME_DATA_WIN_STREAK, 0
dome_set DOME_DATA_WIN_STREAK_ACTIVE, FALSE dome_set DOME_DATA_WIN_STREAK_ACTIVE, FALSE
dome_set DOME_DATA_6, 1 dome_set DOME_DATA_ATTEMPTED_CHALLENGE, TRUE
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
releaseall releaseall
end end
BattleFrontier_BattleDomeLobby_EventScript_24989B:: @ 824989B BattleFrontier_BattleDomeLobby_EventScript_WonChallenge:: @ 824989B
call BattleFrontier_EventScript_IncrementWinStreak call BattleFrontier_EventScript_IncrementWinStreak
lockall lockall
frontier_isbrain frontier_isbrain
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1 goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_DefeatedAce
msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_CongratsForWinningTourney, MSGBOX_DEFAULT
goto BattleFrontier_BattleDomeLobby_EventScript_2498C9 goto BattleFrontier_BattleDomeLobby_EventScript_GiveBattlePoints
BattleFrontier_BattleDomeLobby_EventScript_2498C1:: @ 82498C1 BattleFrontier_BattleDomeLobby_EventScript_DefeatedAce:: @ 82498C1
msgbox BattleFrontier_BattleDomeLobby_Text_24AD67, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_CongratsDefeatedTucker, MSGBOX_DEFAULT
BattleFrontier_BattleDomeLobby_EventScript_GiveBattlePoints:: @ 82498C9
BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9 msgbox BattleFrontier_BattleDomeLobby_Text_AwardTheseBattlePoints, MSGBOX_DEFAULT
msgbox BattleFrontier_BattleDomeLobby_Text_24ADB1, MSGBOX_DEFAULT
frontier_givepoints frontier_givepoints
msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
message BattleFrontier_BattleDomeLobby_Text_24A5D6 message BattleFrontier_BattleDomeLobby_Text_RecordWillBeSaved
waitmessage waitmessage
special LoadPlayerParty special LoadPlayerParty
frontier_setpartyorder FRONTIER_PARTY_SIZE frontier_setpartyorder FRONTIER_PARTY_SIZE
frontier_checkairshow frontier_checkairshow
dome_set DOME_DATA_6, 1 dome_set DOME_DATA_ATTEMPTED_CHALLENGE, TRUE
dome_set DOME_DATA_7, 1 dome_set DOME_DATA_HAS_WON_CHALLENGE, TRUE
dome_set DOME_DATA_WIN_STREAK_ACTIVE, TRUE dome_set DOME_DATA_WIN_STREAK_ACTIVE, TRUE
special LoadPlayerParty special LoadPlayerParty
special HealPlayerParty special HealPlayerParty
goto BattleFrontier_BattleDomeLobby_EventScript_249991 goto BattleFrontier_BattleDomeLobby_EventScript_AskRecordBattle
BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940 BattleFrontier_BattleDomeLobby_EventScript_LostChallenge:: @ 8249940
lockall lockall
msgbox BattleFrontier_BattleDomeLobby_Text_24A5BF, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_ThankYouForPlaying, MSGBOX_DEFAULT
message BattleFrontier_BattleDomeLobby_Text_24A5D6 message BattleFrontier_BattleDomeLobby_Text_RecordWillBeSaved
waitmessage waitmessage
special LoadPlayerParty special LoadPlayerParty
frontier_setpartyorder FRONTIER_PARTY_SIZE frontier_setpartyorder FRONTIER_PARTY_SIZE
frontier_checkairshow frontier_checkairshow
dome_set DOME_DATA_WIN_STREAK_ACTIVE, FALSE dome_set DOME_DATA_WIN_STREAK_ACTIVE, FALSE
dome_set DOME_DATA_6, 1 dome_set DOME_DATA_ATTEMPTED_CHALLENGE, TRUE
special LoadPlayerParty special LoadPlayerParty
special HealPlayerParty special HealPlayerParty
BattleFrontier_BattleDomeLobby_EventScript_AskRecordBattle:: @ 8249991
BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991
dome_save 0 dome_save 0
playse SE_SAVE playse SE_SAVE
waitse waitse
call BattleFrontier_EventScript_GetCantRecordBattle call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_2499E9 goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_EndChallenge
message BattleFrontier_BattleDomeLobby_Text_24AE17 message BattleFrontier_BattleDomeLobby_Text_RecordLastMatch
waitmessage waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0 multichoicedefault 20, 8, MULTI_YESNO, 1, 0
switch VAR_RESULT switch VAR_RESULT
case 1, BattleFrontier_BattleDomeLobby_EventScript_2499E9 case 1, BattleFrontier_BattleDomeLobby_EventScript_EndChallenge
case 0, BattleFrontier_BattleDomeLobby_EventScript_2499E4 case 0, BattleFrontier_BattleDomeLobby_EventScript_RecordBattle
case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_2499E9 case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_EndChallenge
BattleFrontier_BattleDomeLobby_EventScript_2499E4:: @ 82499E4 BattleFrontier_BattleDomeLobby_EventScript_RecordBattle:: @ 82499E4
call BattleFrontier_EventScript_SaveBattle call BattleFrontier_EventScript_SaveBattle
BattleFrontier_BattleDomeLobby_EventScript_2499E9:: @ 82499E9 BattleFrontier_BattleDomeLobby_EventScript_EndChallenge:: @ 82499E9
msgbox BattleFrontier_BattleDomeLobby_Text_249F74, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_HopeToSeeYouAgain, MSGBOX_DEFAULT
closemessage closemessage
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
releaseall releaseall
end end
BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9 BattleFrontier_BattleDomeLobby_EventScript_ResumeChallenge:: @ 82499F9
lockall lockall
msgbox BattleFrontier_BattleDomeLobby_Text_24A5FE, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_WeveBeenWaitingForYou, MSGBOX_DEFAULT
message BattleFrontier_BattleDomeLobby_Text_24A61A message BattleFrontier_BattleDomeLobby_Text_OkayToSaveBeforeChallenge2
waitmessage waitmessage
dome_save CHALLENGE_STATUS_SAVING dome_save CHALLENGE_STATUS_SAVING
playse SE_SAVE playse SE_SAVE
waitse waitse
frontier_set FRONTIER_DATA_PAUSED, FALSE frontier_set FRONTIER_DATA_PAUSED, FALSE
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
goto BattleFrontier_BattleDomeLobby_EventScript_249BC2 goto BattleFrontier_BattleDomeLobby_EventScript_EnterChallenge
BattleFrontier_BattleDomeLobby_EventScript_249A35:: @ 8249A35 BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendant:: @ 8249A35
lock lock
faceplayer faceplayer
setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_DOME setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_DOME
setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
goto BattleFrontier_BattleDomeLobby_EventScript_249A59 goto BattleFrontier_BattleDomeLobby_EventScript_AttendantWelcome
end end
BattleFrontier_BattleDomeLobby_EventScript_249A47:: @ 8249A47 BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendant:: @ 8249A47
lock lock
faceplayer faceplayer
setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_DOME setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_DOME
setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
goto BattleFrontier_BattleDomeLobby_EventScript_249A59 goto BattleFrontier_BattleDomeLobby_EventScript_AttendantWelcome
end end
BattleFrontier_BattleDomeLobby_EventScript_249A59:: @ 8249A59 BattleFrontier_BattleDomeLobby_EventScript_AttendantWelcome:: @ 8249A59
special SavePlayerParty special SavePlayerParty
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CFD call_if_eq BattleFrontier_BattleDomeLobby_EventScript_WelcomeSingles
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D06 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_WelcomeDoubles
BattleFrontier_BattleDomeLobby_EventScript_AskTakeChallenge:: @ 8249A72
BattleFrontier_BattleDomeLobby_EventScript_249A72:: @ 8249A72
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D0F call_if_eq BattleFrontier_BattleDomeLobby_EventScript_TakeSinglesChallenge
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D15 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_TakeDoublesChallenge
waitmessage waitmessage
multichoice 17, 6, MULTI_CHALLENGEINFO, 0 multichoice 17, 6, MULTI_CHALLENGEINFO, 0
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattleDomeLobby_EventScript_249ABF case 0, BattleFrontier_BattleDomeLobby_EventScript_TryEnterChallenge
case 1, BattleFrontier_BattleDomeLobby_EventScript_249BFA case 1, BattleFrontier_BattleDomeLobby_EventScript_ExplainChallenge
case 2, BattleFrontier_BattleDomeLobby_EventScript_249C64 case 2, BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_249C64 case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge
BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF BattleFrontier_BattleDomeLobby_EventScript_TryEnterChallenge:: @ 8249ABF
message BattleFrontier_BattleDomeLobby_Text_24A210 message BattleFrontier_BattleDomeLobby_Text_WhichLevelMode
waitmessage waitmessage
multichoice 17, 6, MULTI_LEVEL_MODE, 0 multichoice 17, 6, MULTI_LEVEL_MODE, 0
switch VAR_RESULT switch VAR_RESULT
case FRONTIER_LVL_TENT, BattleFrontier_BattleDomeLobby_EventScript_249C64 case FRONTIER_LVL_TENT, BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_249C64 case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge
frontier_checkineligible frontier_checkineligible
compare VAR_0x8004, TRUE compare VAR_0x8004, TRUE
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C15 goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMons
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_SelectThreeMons, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
call BattleFrontier_EventScript_GetLvlMode call BattleFrontier_EventScript_GetLvlMode
copyvar VAR_0x8004, VAR_RESULT copyvar VAR_0x8004, VAR_RESULT
@@ -173,14 +170,14 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
special ChoosePartyForBattleFrontier special ChoosePartyForBattleFrontier
waitstate waitstate
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C61 goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_LoadPartyCancelChallenge
msgbox BattleFrontier_BattleDomeLobby_Text_24A1C6, MSGBOX_YESNO msgbox BattleFrontier_BattleDomeLobby_Text_OkayToSaveBeforeChallenge, MSGBOX_YESNO
switch VAR_RESULT switch VAR_RESULT
case NO, BattleFrontier_BattleDomeLobby_EventScript_249C61 case NO, BattleFrontier_BattleDomeLobby_EventScript_LoadPartyCancelChallenge
case YES, BattleFrontier_BattleDomeLobby_EventScript_249B60 case YES, BattleFrontier_BattleDomeLobby_EventScript_SaveBeforeChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_249C61 case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_LoadPartyCancelChallenge
BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 BattleFrontier_BattleDomeLobby_EventScript_SaveBeforeChallenge:: @ 8249B60
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
frontier_set FRONTIER_DATA_SELECTED_MON_ORDER frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
dome_init dome_init
@@ -192,137 +189,135 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
call Common_EventScript_SaveGame call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_CancelChallengeSaveFailed
dome_inittrainers dome_inittrainers
BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 BattleFrontier_BattleDomeLobby_EventScript_EnterChallenge:: @ 8249BC2
special SavePlayerParty special SavePlayerParty
frontier_setpartyorder FRONTIER_PARTY_SIZE frontier_setpartyorder FRONTIER_PARTY_SIZE
dome_settrainers dome_settrainers
msgbox BattleFrontier_BattleDomeLobby_Text_24A437, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_ShowYouToBattleDome, MSGBOX_DEFAULT
closemessage closemessage
call BattleFrontier_BattleDomeLobby_EventScript_249C6E call BattleFrontier_BattleDomeLobby_EventScript_WalkToDoor
special HealPlayerParty special HealPlayerParty
warp MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR, 255, 23, 6 warp MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR, 255, 23, 6
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
waitstate waitstate
end end
BattleFrontier_BattleDomeLobby_EventScript_249BFA:: @ 8249BFA BattleFrontier_BattleDomeLobby_EventScript_ExplainChallenge:: @ 8249BFA
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D1B call_if_eq BattleFrontier_BattleDomeLobby_EventScript_ExplainSinglesChallenge
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D24 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_ExplainDoublesChallenge
goto BattleFrontier_BattleDomeLobby_EventScript_249A72 goto BattleFrontier_BattleDomeLobby_EventScript_AskTakeChallenge
BattleFrontier_BattleDomeLobby_EventScript_249C15:: @ 8249C15 BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMons:: @ 8249C15
switch VAR_RESULT switch VAR_RESULT
case FRONTIER_LVL_50, BattleFrontier_BattleDomeLobby_EventScript_249C30 case FRONTIER_LVL_50, BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMonsLv50
case FRONTIER_LVL_OPEN, BattleFrontier_BattleDomeLobby_EventScript_249C3D case FRONTIER_LVL_OPEN, BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMonsLvOpen
BattleFrontier_BattleDomeLobby_EventScript_249C30:: @ 8249C30 BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMonsLv50:: @ 8249C30
msgbox BattleFrontier_BattleDomeLobby_Text_24A353, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
goto BattleFrontier_BattleDomeLobby_EventScript_249C6C goto BattleFrontier_BattleDomeLobby_EventScript_EndCancelChallenge
BattleFrontier_BattleDomeLobby_EventScript_249C3D:: @ 8249C3D BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 8249C3D
msgbox BattleFrontier_BattleDomeLobby_Text_24A2AB, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
goto BattleFrontier_BattleDomeLobby_EventScript_249C6C goto BattleFrontier_BattleDomeLobby_EventScript_EndCancelChallenge
BattleFrontier_BattleDomeLobby_EventScript_249C4A:: @ 8249C4A BattleFrontier_BattleDomeLobby_EventScript_CancelChallengeSaveFailed:: @ 8249C4A
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
goto BattleFrontier_BattleDomeLobby_EventScript_249C64 goto BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge
BattleFrontier_BattleDomeLobby_EventScript_249C61:: @ 8249C61 BattleFrontier_BattleDomeLobby_EventScript_LoadPartyCancelChallenge:: @ 8249C61
special LoadPlayerParty special LoadPlayerParty
BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge:: @ 8249C64
BattleFrontier_BattleDomeLobby_EventScript_249C64:: @ 8249C64 msgbox BattleFrontier_BattleDomeLobby_Text_HopeToSeeYouAgain, MSGBOX_DEFAULT
msgbox BattleFrontier_BattleDomeLobby_Text_249F74, MSGBOX_DEFAULT BattleFrontier_BattleDomeLobby_EventScript_EndCancelChallenge:: @ 8249C6C
BattleFrontier_BattleDomeLobby_EventScript_249C6C:: @ 8249C6C
release release
end end
BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E BattleFrontier_BattleDomeLobby_EventScript_WalkToDoor:: @ 8249C6E
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CDD call_if_eq BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantWalkToDoor
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CE5 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantWalkToDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D45 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_WalkToDoor
waitmovement 0 waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D2D call_if_eq BattleFrontier_BattleDomeLobby_EventScript_OpenSinglesDoor
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D33 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_OpenDoublesDoor
waitdooranim waitdooranim
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CED call_if_eq BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantEnterDoor
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CF5 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantEnterDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D4E applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_PlayerEnterDoor
waitmovement 0 waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D39 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_CloseSinglesDoor
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D3F call_if_eq BattleFrontier_BattleDomeLobby_EventScript_CloseDoublesDoor
waitdooranim waitdooranim
return return
BattleFrontier_BattleDomeLobby_EventScript_249CDD:: @ 8249CDD BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantWalkToDoor:: @ 8249CDD
applymovement 1, BattleFrontier_BattleDomeLobby_Movement_249D45 applymovement 1, BattleFrontier_BattleDomeLobby_Movement_WalkToDoor
return return
BattleFrontier_BattleDomeLobby_EventScript_249CE5:: @ 8249CE5 BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantWalkToDoor:: @ 8249CE5
applymovement 6, BattleFrontier_BattleDomeLobby_Movement_249D45 applymovement 6, BattleFrontier_BattleDomeLobby_Movement_WalkToDoor
return return
BattleFrontier_BattleDomeLobby_EventScript_249CED:: @ 8249CED BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantEnterDoor:: @ 8249CED
applymovement 1, BattleFrontier_BattleDomeLobby_Movement_249D4B applymovement 1, BattleFrontier_BattleDomeLobby_Movement_AttendantEnterDoor
return return
BattleFrontier_BattleDomeLobby_EventScript_249CF5:: @ 8249CF5 BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantEnterDoor:: @ 8249CF5
applymovement 6, BattleFrontier_BattleDomeLobby_Movement_249D4B applymovement 6, BattleFrontier_BattleDomeLobby_Movement_AttendantEnterDoor
return return
BattleFrontier_BattleDomeLobby_EventScript_249CFD:: @ 8249CFD BattleFrontier_BattleDomeLobby_EventScript_WelcomeSingles:: @ 8249CFD
msgbox BattleFrontier_BattleDomeLobby_Text_249EB7, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_WelcomeSingleBattle, MSGBOX_DEFAULT
return return
BattleFrontier_BattleDomeLobby_EventScript_249D06:: @ 8249D06 BattleFrontier_BattleDomeLobby_EventScript_WelcomeDoubles:: @ 8249D06
msgbox BattleFrontier_BattleDomeLobby_Text_24A664, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_WelcomeDoubleBattle, MSGBOX_DEFAULT
return return
BattleFrontier_BattleDomeLobby_EventScript_249D0F:: @ 8249D0F BattleFrontier_BattleDomeLobby_EventScript_TakeSinglesChallenge:: @ 8249D0F
message BattleFrontier_BattleDomeLobby_Text_249F3A message BattleFrontier_BattleDomeLobby_Text_TakeSinglesChallenge
return return
BattleFrontier_BattleDomeLobby_EventScript_249D15:: @ 8249D15 BattleFrontier_BattleDomeLobby_EventScript_TakeDoublesChallenge:: @ 8249D15
message BattleFrontier_BattleDomeLobby_Text_24A6E7 message BattleFrontier_BattleDomeLobby_Text_TakeDoublesChallenge
return return
BattleFrontier_BattleDomeLobby_EventScript_249D1B:: @ 8249D1B BattleFrontier_BattleDomeLobby_EventScript_ExplainSinglesChallenge:: @ 8249D1B
msgbox BattleFrontier_BattleDomeLobby_Text_249F8E, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_ExplainSinglesChallenge, MSGBOX_DEFAULT
return return
BattleFrontier_BattleDomeLobby_EventScript_249D24:: @ 8249D24 BattleFrontier_BattleDomeLobby_EventScript_ExplainDoublesChallenge:: @ 8249D24
msgbox BattleFrontier_BattleDomeLobby_Text_24A721, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_ExplainDoublesChallenge, MSGBOX_DEFAULT
return return
BattleFrontier_BattleDomeLobby_EventScript_249D2D:: @ 8249D2D BattleFrontier_BattleDomeLobby_EventScript_OpenSinglesDoor:: @ 8249D2D
opendoor 5, 4 opendoor 5, 4
return return
BattleFrontier_BattleDomeLobby_EventScript_249D33:: @ 8249D33 BattleFrontier_BattleDomeLobby_EventScript_OpenDoublesDoor:: @ 8249D33
opendoor 17, 4 opendoor 17, 4
return return
BattleFrontier_BattleDomeLobby_EventScript_249D39:: @ 8249D39 BattleFrontier_BattleDomeLobby_EventScript_CloseSinglesDoor:: @ 8249D39
closedoor 5, 4 closedoor 5, 4
return return
BattleFrontier_BattleDomeLobby_EventScript_249D3F:: @ 8249D3F BattleFrontier_BattleDomeLobby_EventScript_CloseDoublesDoor:: @ 8249D3F
closedoor 17, 4 closedoor 17, 4
return return
BattleFrontier_BattleDomeLobby_Movement_249D45: @ 8249D45 BattleFrontier_BattleDomeLobby_Movement_WalkToDoor: @ 8249D45
walk_up walk_up
walk_up walk_up
walk_up walk_up
@@ -330,18 +325,18 @@ BattleFrontier_BattleDomeLobby_Movement_249D45: @ 8249D45
walk_up walk_up
step_end step_end
BattleFrontier_BattleDomeLobby_Movement_249D4B: @ 8249D4B BattleFrontier_BattleDomeLobby_Movement_AttendantEnterDoor: @ 8249D4B
walk_up walk_up
set_invisible set_invisible
step_end step_end
BattleFrontier_BattleDomeLobby_Movement_249D4E: @ 8249D4E BattleFrontier_BattleDomeLobby_Movement_PlayerEnterDoor: @ 8249D4E
walk_up walk_up
walk_up walk_up
set_invisible set_invisible
step_end step_end
BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52 BattleFrontier_BattleDomeLobby_EventScript_ShowSinglesResults:: @ 8249D52
lockall lockall
frontier_results FRONTIER_FACILITY_DOME, FRONTIER_MODE_SINGLES frontier_results FRONTIER_FACILITY_DOME, FRONTIER_MODE_SINGLES
waitbuttonpress waitbuttonpress
@@ -349,7 +344,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52
releaseall releaseall
end end
BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B BattleFrontier_BattleDomeLobby_EventScript_ShowDoublesResults:: @ 8249D6B
lockall lockall
frontier_results FRONTIER_FACILITY_DOME, FRONTIER_MODE_DOUBLES frontier_results FRONTIER_FACILITY_DOME, FRONTIER_MODE_DOUBLES
waitbuttonpress waitbuttonpress
@@ -357,119 +352,121 @@ BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B
releaseall releaseall
end end
BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84 BattleFrontier_BattleDomeLobby_EventScript_ShowPrevTourneyTree:: @ 8249D84
dome_get DOME_DATA_9 dome_get DOME_DATA_PREV_TOURNEY_TYPE
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DC9 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsSinglesLv50
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DD2 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsDoublesLv50
compare VAR_RESULT, 2 compare VAR_RESULT, 2
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DDB call_if_eq BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsSinglesLvOpen
compare VAR_RESULT, 3 compare VAR_RESULT, 3
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DE4 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsDoublesLvOpen
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
dome_showresultstree dome_showprevtourneytree
waitstate waitstate
end end
BattleFrontier_BattleDomeLobby_EventScript_249DC9:: @ 8249DC9 BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsSinglesLv50:: @ 8249DC9
msgbox BattleFrontier_BattleDomeLobby_Text_24A966, MSGBOX_SIGN msgbox BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsSinglesLv50, MSGBOX_SIGN
return return
BattleFrontier_BattleDomeLobby_EventScript_249DD2:: @ 8249DD2 BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsDoublesLv50:: @ 8249DD2
msgbox BattleFrontier_BattleDomeLobby_Text_24A9A9, MSGBOX_SIGN msgbox BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsDoublesLv50, MSGBOX_SIGN
return return
BattleFrontier_BattleDomeLobby_EventScript_249DDB:: @ 8249DDB BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsSinglesLvOpen:: @ 8249DDB
msgbox BattleFrontier_BattleDomeLobby_Text_24A9EC, MSGBOX_SIGN msgbox BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsSinglesLvOpen, MSGBOX_SIGN
return return
BattleFrontier_BattleDomeLobby_EventScript_249DE4:: @ 8249DE4 BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsDoublesLvOpen:: @ 8249DE4
msgbox BattleFrontier_BattleDomeLobby_Text_24AA31, MSGBOX_SIGN msgbox BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsDoublesLvOpen, MSGBOX_SIGN
return return
BattleFrontier_BattleDomeLobby_EventScript_249DED:: @ 8249DED BattleFrontier_BattleDomeLobby_EventScript_Maniac:: @ 8249DED
dome_getwinnersname dome_getwinnersname
msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, MSGBOX_NPC msgbox BattleFrontier_BattleDomeLobby_Text_LastWinnerWasTough, MSGBOX_NPC
end end
BattleFrontier_BattleDomeLobby_EventScript_249DFE:: @ 8249DFE BattleFrontier_BattleDomeLobby_EventScript_Lass:: @ 8249DFE
msgbox BattleFrontier_BattleDomeLobby_Text_24AB94, MSGBOX_NPC msgbox BattleFrontier_BattleDomeLobby_Text_WinnersGainReputation, MSGBOX_NPC
end end
BattleFrontier_BattleDomeLobby_EventScript_249E07:: @ 8249E07 BattleFrontier_BattleDomeLobby_EventScript_FatMan:: @ 8249E07
msgbox BattleFrontier_BattleDomeLobby_Text_24AC76, MSGBOX_NPC msgbox BattleFrontier_BattleDomeLobby_Text_TrashedInFirstRound, MSGBOX_NPC
end end
BattleFrontier_BattleDomeLobby_EventScript_249E10:: @ 8249E10 BattleFrontier_BattleDomeLobby_EventScript_Man:: @ 8249E10
msgbox BattleFrontier_BattleDomeLobby_Text_24ACD3, MSGBOX_NPC msgbox BattleFrontier_BattleDomeLobby_Text_NeedToCheckOpponentCarefully, MSGBOX_NPC
end end
@ A few OutsideWest event scripts are inserted here instead, two of which are unused @ A few OutsideWest event scripts are inserted here instead, two of which are unused
BattleFrontier_OutsideWest_EventScript_Man3:: @ 8249E19 BattleFrontier_OutsideWest_EventScript_Man3:: @ 8249E19
msgbox BattleFrontier_OutsideWest_Text_24AB06, MSGBOX_NPC msgbox BattleFrontier_OutsideWest_Text_LongDreamedAboutBattleFrontier, MSGBOX_NPC
end end
@ Unused
BattleFrontier_OutsideWest_EventScript_BattleDomeSign2:: @ 8249E22 BattleFrontier_OutsideWest_EventScript_BattleDomeSign2:: @ 8249E22
msgbox BattleFrontier_OutsideWest_Text_BattleDomeSign2, MSGBOX_NPC msgbox BattleFrontier_OutsideWest_Text_BattleDomeSign2, MSGBOX_NPC
end end
@ Unused
BattleFrontier_OutsideWest_EventScript_UnderConstructionSign:: @ 8249E2B BattleFrontier_OutsideWest_EventScript_UnderConstructionSign:: @ 8249E2B
msgbox BattleFrontier_OutsideWest_Text_QuestionMarkUnderConstruction, MSGBOX_NPC msgbox BattleFrontier_OutsideWest_Text_QuestionMarkUnderConstruction, MSGBOX_NPC
end end
BattleFrontier_BattleDomeLobby_EventScript_249E34:: @ 8249E34 BattleFrontier_BattleDomeLobby_EventScript_RulesBoard:: @ 8249E34
lockall lockall
msgbox BattleFrontier_BattleDomeLobby_Text_24AE63, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_RulesAreListed, MSGBOX_DEFAULT
goto BattleFrontier_BattleDomeLobby_EventScript_249E43 goto BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard
end end
BattleFrontier_BattleDomeLobby_EventScript_249E43:: @ 8249E43 BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard:: @ 8249E43
message BattleFrontier_BattleDomeLobby_Text_24AE8B message BattleFrontier_BattleDomeLobby_Text_ReadWhichHeading
waitmessage waitmessage
multichoice 17, 4, MULTI_BATTLE_DOME_RULES, 0 multichoice 17, 4, MULTI_BATTLE_DOME_RULES, 0
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattleDomeLobby_EventScript_249E8B case 0, BattleFrontier_BattleDomeLobby_EventScript_RulesMatchup
case 1, BattleFrontier_BattleDomeLobby_EventScript_249E99 case 1, BattleFrontier_BattleDomeLobby_EventScript_RulesTourneyTree
case 2, BattleFrontier_BattleDomeLobby_EventScript_249EA7 case 2, BattleFrontier_BattleDomeLobby_EventScript_RulesDoubleKO
case 3, BattleFrontier_BattleDomeLobby_EventScript_249EB5 case 3, BattleFrontier_BattleDomeLobby_EventScript_ExitRules
case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_249EB5 case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_ExitRules
end end
BattleFrontier_BattleDomeLobby_EventScript_249E8B:: @ 8249E8B BattleFrontier_BattleDomeLobby_EventScript_RulesMatchup:: @ 8249E8B
msgbox BattleFrontier_BattleDomeLobby_Text_24AEAE, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_ExplainMatchupRules, MSGBOX_DEFAULT
goto BattleFrontier_BattleDomeLobby_EventScript_249E43 goto BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard
end end
BattleFrontier_BattleDomeLobby_EventScript_249E99:: @ 8249E99 BattleFrontier_BattleDomeLobby_EventScript_RulesTourneyTree:: @ 8249E99
msgbox BattleFrontier_BattleDomeLobby_Text_24AF4C, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_ExplainTourneyTree, MSGBOX_DEFAULT
goto BattleFrontier_BattleDomeLobby_EventScript_249E43 goto BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard
end end
BattleFrontier_BattleDomeLobby_EventScript_249EA7:: @ 8249EA7 BattleFrontier_BattleDomeLobby_EventScript_RulesDoubleKO:: @ 8249EA7
msgbox BattleFrontier_BattleDomeLobby_Text_24B073, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_ExplainDoubleKORules, MSGBOX_DEFAULT
goto BattleFrontier_BattleDomeLobby_EventScript_249E43 goto BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard
end end
BattleFrontier_BattleDomeLobby_EventScript_249EB5:: @ 8249EB5 BattleFrontier_BattleDomeLobby_EventScript_ExitRules:: @ 8249EB5
releaseall releaseall
end end
BattleFrontier_BattleDomeLobby_Text_249EB7: @ 8249EB7 BattleFrontier_BattleDomeLobby_Text_WelcomeSingleBattle: @ 8249EB7
.string "Where the strategies of TRAINERS\n" .string "Where the strategies of TRAINERS\n"
.string "are put to the test!\p" .string "are put to the test!\p"
.string "Welcome to the BATTLE DOME!\p" .string "Welcome to the BATTLE DOME!\p"
.string "I am your guide to the SINGLE BATTLE\n" .string "I am your guide to the SINGLE BATTLE\n"
.string "Tournament.$" .string "Tournament.$"
BattleFrontier_BattleDomeLobby_Text_249F3A: @ 8249F3A BattleFrontier_BattleDomeLobby_Text_TakeSinglesChallenge: @ 8249F3A
.string "Would you like to challenge\n" .string "Would you like to challenge\n"
.string "the SINGLE BATTLE Tournament?$" .string "the SINGLE BATTLE Tournament?$"
BattleFrontier_BattleDomeLobby_Text_249F74: @ 8249F74 BattleFrontier_BattleDomeLobby_Text_HopeToSeeYouAgain: @ 8249F74
.string "We hope to see you again.$" .string "We hope to see you again.$"
BattleFrontier_BattleDomeLobby_Text_249F8E: @ 8249F8E BattleFrontier_BattleDomeLobby_Text_ExplainSinglesChallenge: @ 8249F8E
.string "The SINGLE BATTLE Tournament\n" .string "The SINGLE BATTLE Tournament\n"
.string "is exactly as the name suggests--\l" .string "is exactly as the name suggests--\l"
.string "a tournament of SINGLE BATTLES.\p" .string "a tournament of SINGLE BATTLES.\p"
@@ -490,20 +487,20 @@ BattleFrontier_BattleDomeLobby_Text_249F8E: @ 8249F8E
.string "If you don't save before interrupting,\n" .string "If you don't save before interrupting,\n"
.string "you will be disqualified.$" .string "you will be disqualified.$"
BattleFrontier_BattleDomeLobby_Text_24A1C6: @ 824A1C6 BattleFrontier_BattleDomeLobby_Text_OkayToSaveBeforeChallenge: @ 824A1C6
.string "Before I show you to the BATTLE DOME,\n" .string "Before I show you to the BATTLE DOME,\n"
.string "I must save the data. Is that okay?$" .string "I must save the data. Is that okay?$"
BattleFrontier_BattleDomeLobby_Text_24A210: @ 824A210 BattleFrontier_BattleDomeLobby_Text_WhichLevelMode: @ 824A210
.string "The tournament offers two levels\n" .string "The tournament offers two levels\n"
.string "of challenge, Level 50 and Open Level.\l" .string "of challenge, Level 50 and Open Level.\l"
.string "Which is your choice?$" .string "Which is your choice?$"
BattleFrontier_BattleDomeLobby_Text_24A26E: @ 824A26E BattleFrontier_BattleDomeLobby_Text_SelectThreeMons: @ 824A26E
.string "Now select the three POKéMON that\n" .string "Now select the three POKéMON that\n"
.string "you wish to enter, please.$" .string "you wish to enter, please.$"
BattleFrontier_BattleDomeLobby_Text_24A2AB: @ 824A2AB BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLvOpen: @ 824A2AB
.string "Excuse me!\p" .string "Excuse me!\p"
.string "You don't have three eligible POKéMON.\p" .string "You don't have three eligible POKéMON.\p"
.string "Also, the POKéMON must be holding\n" .string "Also, the POKéMON must be holding\n"
@@ -511,7 +508,7 @@ BattleFrontier_BattleDomeLobby_Text_24A2AB: @ 824A2AB
.string "EGGS{STR_VAR_1} ineligible.\p" .string "EGGS{STR_VAR_1} ineligible.\p"
.string "Please come see me when you are ready.$" .string "Please come see me when you are ready.$"
BattleFrontier_BattleDomeLobby_Text_24A353: @ 824A353 BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLv50: @ 824A353
.string "Excuse me!\p" .string "Excuse me!\p"
.string "You don't have three eligible POKéMON.\p" .string "You don't have three eligible POKéMON.\p"
.string "You must have three different POKéMON\n" .string "You must have three different POKéMON\n"
@@ -521,25 +518,27 @@ BattleFrontier_BattleDomeLobby_Text_24A353: @ 824A353
.string "EGGS{STR_VAR_1} ineligible.\p" .string "EGGS{STR_VAR_1} ineligible.\p"
.string "Please come see me when you are ready.$" .string "Please come see me when you are ready.$"
BattleFrontier_BattleDomeLobby_Text_24A437: @ 824A437 BattleFrontier_BattleDomeLobby_Text_ShowYouToBattleDome: @ 824A437
.string "I will now show you to\n" .string "I will now show you to\n"
.string "the BATTLE DOME.$" .string "the BATTLE DOME.$"
BattleFrontier_BattleDomeLobby_Text_24A45F: @ 824A45F BattleFrontier_BattleDomeLobby_Text_DidntSaveBeforeQuitting: @ 824A45F
.string "Excuse me!\p" .string "Excuse me!\p"
.string "You didn't save before you quit your\n" .string "You didn't save before you quit your\n"
.string "challenge last time.\p" .string "challenge last time.\p"
.string "Because of that, your challenge so far\n" .string "Because of that, your challenge so far\n"
.string "has been disqualified. Sorry!$" .string "has been disqualified. Sorry!$"
BattleFrontier_BattleDomeLobby_Text_24A4E9: @ 824A4E9 BattleFrontier_BattleDomeLobby_Text_CongratsForWinningTourney: @ 824A4E9
.string "Congratulations for winning\n" .string "Congratulations for winning\n"
.string "your Battle Tournament!$" .string "your Battle Tournament!$"
BattleFrontier_BattleDomeLobby_Text_24A51D: @ 824A51D @ Unused
BattleFrontier_BattleDomeLobby_Text_HereIsYourPrize: @ 824A51D
.string "Here is your prize for your Battle\n" .string "Here is your prize for your Battle\n"
.string "Tournament victory.$" .string "Tournament victory.$"
@ Used by Verdanturf Tent
BattleFrontier_BattleDomeLobby_Text_ReceivedPrize: @ 824A554 BattleFrontier_BattleDomeLobby_Text_ReceivedPrize: @ 824A554
.string "{PLAYER} received the prize\n" .string "{PLAYER} received the prize\n"
.string "{STR_VAR_1}.$" .string "{STR_VAR_1}.$"
@@ -550,32 +549,32 @@ BattleFrontier_BattleDomeLobby_Text_BagFullMakeRoom: @ 824A56E
.string "Please make room in your BAG, then come\n" .string "Please make room in your BAG, then come\n"
.string "see me.$" .string "see me.$"
BattleFrontier_BattleDomeLobby_Text_24A5BF: @ 824A5BF BattleFrontier_BattleDomeLobby_Text_ThankYouForPlaying: @ 824A5BF
.string "Thank you for playing!$" .string "Thank you for playing!$"
BattleFrontier_BattleDomeLobby_Text_24A5D6: @ 824A5D6 BattleFrontier_BattleDomeLobby_Text_RecordWillBeSaved: @ 824A5D6
.string "Your record will be saved.\n" .string "Your record will be saved.\n"
.string "Please wait.$" .string "Please wait.$"
BattleFrontier_BattleDomeLobby_Text_24A5FE: @ 824A5FE BattleFrontier_BattleDomeLobby_Text_WeveBeenWaitingForYou: @ 824A5FE
.string "We've been waiting for you!$" .string "We've been waiting for you!$"
BattleFrontier_BattleDomeLobby_Text_24A61A: @ 824A61A BattleFrontier_BattleDomeLobby_Text_OkayToSaveBeforeChallenge2: @ 824A61A
.string "Before I show you to the BATTLE DOME,\n" .string "Before I show you to the BATTLE DOME,\n"
.string "I must save the data. Is that okay?$" .string "I must save the data. Is that okay?$"
BattleFrontier_BattleDomeLobby_Text_24A664: @ 824A664 BattleFrontier_BattleDomeLobby_Text_WelcomeDoubleBattle: @ 824A664
.string "Where the strategies of TRAINERS\n" .string "Where the strategies of TRAINERS\n"
.string "are put to the test!\p" .string "are put to the test!\p"
.string "Welcome to the BATTLE DOME!\p" .string "Welcome to the BATTLE DOME!\p"
.string "I am your guide to the DOUBLE BATTLE\n" .string "I am your guide to the DOUBLE BATTLE\n"
.string "Tournament.$" .string "Tournament.$"
BattleFrontier_BattleDomeLobby_Text_24A6E7: @ 824A6E7 BattleFrontier_BattleDomeLobby_Text_TakeDoublesChallenge: @ 824A6E7
.string "Would you like to challenge\n" .string "Would you like to challenge\n"
.string "the DOUBLE BATTLE Tournament?$" .string "the DOUBLE BATTLE Tournament?$"
BattleFrontier_BattleDomeLobby_Text_24A721: @ 824A721 BattleFrontier_BattleDomeLobby_Text_ExplainDoublesChallenge: @ 824A721
.string "The DOUBLE BATTLE Tournament\n" .string "The DOUBLE BATTLE Tournament\n"
.string "is exactly as the name suggests--\l" .string "is exactly as the name suggests--\l"
.string "a tournament of DOUBLE BATTLES.\p" .string "a tournament of DOUBLE BATTLES.\p"
@@ -596,23 +595,23 @@ BattleFrontier_BattleDomeLobby_Text_24A721: @ 824A721
.string "If you don't save before interrupting,\n" .string "If you don't save before interrupting,\n"
.string "you will be disqualified.$" .string "you will be disqualified.$"
BattleFrontier_BattleDomeLobby_Text_24A966: @ 824A966 BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsSinglesLv50: @ 824A966
.string "They're the results of the last\n" .string "They're the results of the last\n"
.string "Level 50 SINGLE BATTLE Tournament.$" .string "Level 50 SINGLE BATTLE Tournament.$"
BattleFrontier_BattleDomeLobby_Text_24A9A9: @ 824A9A9 BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsDoublesLv50: @ 824A9A9
.string "They're the results of the last\n" .string "They're the results of the last\n"
.string "Level 50 DOUBLE BATTLE Tournament.$" .string "Level 50 DOUBLE BATTLE Tournament.$"
BattleFrontier_BattleDomeLobby_Text_24A9EC: @ 824A9EC BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsSinglesLvOpen: @ 824A9EC
.string "They're the results of the last\n" .string "They're the results of the last\n"
.string "Open Level SINGLE BATTLE Tournament.$" .string "Open Level SINGLE BATTLE Tournament.$"
BattleFrontier_BattleDomeLobby_Text_24AA31: @ 824AA31 BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsDoublesLvOpen: @ 824AA31
.string "They're the results of the last\n" .string "They're the results of the last\n"
.string "Open Level DOUBLE BATTLE Tournament.$" .string "Open Level DOUBLE BATTLE Tournament.$"
BattleFrontier_BattleDomeLobby_Text_24AA76: @ 824AA76 BattleFrontier_BattleDomeLobby_Text_LastWinnerWasTough: @ 824AA76
.string "Did you see it?\n" .string "Did you see it?\n"
.string "The last Battle Tournament?\p" .string "The last Battle Tournament?\p"
.string "The winner, {STR_VAR_1}, was seriously\n" .string "The winner, {STR_VAR_1}, was seriously\n"
@@ -620,19 +619,21 @@ BattleFrontier_BattleDomeLobby_Text_24AA76: @ 824AA76
.string "You should check out the results\n" .string "You should check out the results\n"
.string "on the monitor beside the PC.$" .string "on the monitor beside the PC.$"
BattleFrontier_OutsideWest_Text_24AB06: @ 824AB06 BattleFrontier_OutsideWest_Text_LongDreamedAboutBattleFrontier: @ 824AB06
.string "The BATTLE FRONTIER…\n" .string "The BATTLE FRONTIER…\n"
.string "I've long dreamed about a place like it.$" .string "I've long dreamed about a place like it.$"
@ Functionally unused
BattleFrontier_OutsideWest_Text_BattleDomeSign2: @ 824AB44 BattleFrontier_OutsideWest_Text_BattleDomeSign2: @ 824AB44
.string "The BATTLE DOME\n" .string "The BATTLE DOME\n"
.string "Become the Unbeatable Superstar!$" .string "Become the Unbeatable Superstar!$"
@ Functionally unused
BattleFrontier_OutsideWest_Text_QuestionMarkUnderConstruction: @ 824AB75 BattleFrontier_OutsideWest_Text_QuestionMarkUnderConstruction: @ 824AB75
.string "The ??????\n" .string "The ??????\n"
.string "Under Construction!$" .string "Under Construction!$"
BattleFrontier_BattleDomeLobby_Text_24AB94: @ 824AB94 BattleFrontier_BattleDomeLobby_Text_WinnersGainReputation: @ 824AB94
.string "When a TRAINER chains tournament\n" .string "When a TRAINER chains tournament\n"
.string "wins at the BATTLE DOME, he or she\l" .string "wins at the BATTLE DOME, he or she\l"
.string "gains a reputation as a star.\p" .string "gains a reputation as a star.\p"
@@ -641,48 +642,48 @@ BattleFrontier_BattleDomeLobby_Text_24AB94: @ 824AB94
.string "A true superstar is a TRAINER who\n" .string "A true superstar is a TRAINER who\n"
.string "can keep winning tournaments.$" .string "can keep winning tournaments.$"
BattleFrontier_BattleDomeLobby_Text_24AC76: @ 824AC76 BattleFrontier_BattleDomeLobby_Text_TrashedInFirstRound: @ 824AC76
.string "I ran into one of the tournament\n" .string "I ran into one of the tournament\n"
.string "favorites in the very first round.\p" .string "favorites in the very first round.\p"
.string "Of course I got trashed…$" .string "Of course I got trashed…$"
BattleFrontier_BattleDomeLobby_Text_24ACD3: @ 824ACD3 BattleFrontier_BattleDomeLobby_Text_NeedToCheckOpponentCarefully: @ 824ACD3
.string "I would've won if I'd kept this POKéMON\n" .string "I would've won if I'd kept this POKéMON\n"
.string "held in reserve.\p" .string "held in reserve.\p"
.string "You need to check your opponent's\n" .string "You need to check your opponent's\n"
.string "POKéMON carefully before choosing\l" .string "POKéMON carefully before choosing\l"
.string "your battling POKéMON.$" .string "your battling POKéMON.$"
BattleFrontier_BattleDomeLobby_Text_24AD67: @ 824AD67 BattleFrontier_BattleDomeLobby_Text_CongratsDefeatedTucker: @ 824AD67
.string "Congratulations!\p" .string "Congratulations!\p"
.string "You defeated the DOME ACE and won\n" .string "You defeated the DOME ACE and won\n"
.string "the Battle Tournament!$" .string "the Battle Tournament!$"
BattleFrontier_BattleDomeLobby_Text_24ADB1: @ 824ADB1 BattleFrontier_BattleDomeLobby_Text_AwardTheseBattlePoints: @ 824ADB1
.string "In recognition of your strategy--\n" .string "In recognition of your strategy--\n"
.string "a thing of beauty it was, too--\l" .string "a thing of beauty it was, too--\l"
.string "we award you these Battle Point(s)!$" .string "we award you these Battle Point(s)!$"
BattleFrontier_BattleDomeLobby_Text_24AE17: @ 824AE17 BattleFrontier_BattleDomeLobby_Text_RecordLastMatch: @ 824AE17
.string "Would you like to record your\n" .string "Would you like to record your\n"
.string "last BATTLE DOME match on your\l" .string "last BATTLE DOME match on your\l"
.string "FRONTIER PASS?$" .string "FRONTIER PASS?$"
BattleFrontier_BattleDomeLobby_Text_24AE63: @ 824AE63 BattleFrontier_BattleDomeLobby_Text_RulesAreListed: @ 824AE63
.string "The Battle Tournament rules\n" .string "The Battle Tournament rules\n"
.string "are listed.$" .string "are listed.$"
BattleFrontier_BattleDomeLobby_Text_24AE8B: @ 824AE8B BattleFrontier_BattleDomeLobby_Text_ReadWhichHeading: @ 824AE8B
.string "Which heading do you want to read?$" .string "Which heading do you want to read?$"
BattleFrontier_BattleDomeLobby_Text_24AEAE: @ 824AEAE BattleFrontier_BattleDomeLobby_Text_ExplainMatchupRules: @ 824AEAE
.string "The tournament matchups are drawn up\n" .string "The tournament matchups are drawn up\n"
.string "based on the toughness of POKéMON\l" .string "based on the toughness of POKéMON\l"
.string "held by TRAINERS.\p" .string "held by TRAINERS.\p"
.string "The matchups avoid having tough\n" .string "The matchups avoid having tough\n"
.string "TRAINERS face each other right away.$" .string "TRAINERS face each other right away.$"
BattleFrontier_BattleDomeLobby_Text_24AF4C: @ 824AF4C BattleFrontier_BattleDomeLobby_Text_ExplainTourneyTree: @ 824AF4C
.string "The tournament chart, or as we call it,\n" .string "The tournament chart, or as we call it,\n"
.string "the “Tree,” is available for viewing\l" .string "the “Tree,” is available for viewing\l"
.string "in the Waiting Room from any guide.\p" .string "in the Waiting Room from any guide.\p"
@@ -693,7 +694,7 @@ BattleFrontier_BattleDomeLobby_Text_24AF4C: @ 824AF4C
.string "by TRAINERS, and the battle styles of\l" .string "by TRAINERS, and the battle styles of\l"
.string "TRAINERS.$" .string "TRAINERS.$"
BattleFrontier_BattleDomeLobby_Text_24B073: @ 824B073 BattleFrontier_BattleDomeLobby_Text_ExplainDoubleKORules: @ 824B073
.string "If battling POKéMON faint at the same\n" .string "If battling POKéMON faint at the same\n"
.string "time--a double KO--in a tournament\l" .string "time--a double KO--in a tournament\l"
.string "match, the REFEREES will review\l" .string "match, the REFEREES will review\l"
data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
+154 -150
View File
@@ -1,92 +1,91 @@
BattleFrontier_BattleDomePreBattleRoom_MapScripts:: @ 824B1F9 BattleFrontier_BattleDomePreBattleRoom_MapScripts:: @ 824B1F9
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218 map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomePreBattleRoom_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomePreBattleRoom_OnWarp
.byte 0 .byte 0
BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204 BattleFrontier_BattleDomePreBattleRoom_OnWarp: @ 824B204
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_TurnPlayerNorth
.2byte 0 .2byte 0
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E:: @ 824B20E BattleFrontier_BattleDomePreBattleRoom_EventScript_TurnPlayerNorth:: @ 824B20E
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218 BattleFrontier_BattleDomePreBattleRoom_OnFrame: @ 824B218
map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222 map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom
.2byte 0 .2byte 0
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222 BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom:: @ 824B222
compare VAR_0x8006, 1 compare VAR_0x8006, 1
goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7 goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle
frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
setvar VAR_TEMP_0, 1 setvar VAR_TEMP_0, 1
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnter
waitmovement 0 waitmovement 0
lockall lockall
BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound:: @ 824B24F
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F:: @ 824B24F call BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForNextRoundMessage
call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB
waitmessage waitmessage
switch VAR_RESULT switch VAR_RESULT @ No case?
call BattleFrontier_EventScript_GetCantRecordBattle call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1 goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRoundNoRecord
multichoice 16, 0, MULTI_TOURNEY_WITH_RECORD, 1 multichoice 16, 0, MULTI_TOURNEY_WITH_RECORD, 1
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowOpponentInfo
case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5 case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowTourneyTree
case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_ContinueChallenge
case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B30D case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRecordBattle
case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349 case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskPauseChallenge
case 5, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377 case 5, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRetireChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1:: @ 824B2C1 BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRoundNoRecord:: @ 824B2C1
multichoice 16, 2, MULTI_TOURNEY_NO_RECORD, 1 multichoice 16, 2, MULTI_TOURNEY_NO_RECORD, 1
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowOpponentInfo
case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5 case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowTourneyTree
case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_ContinueChallenge
case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349 case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskPauseChallenge
case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377 case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRetireChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B30D:: @ 824B30D BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRecordBattle:: @ 824B30D
message BattleFrontier_BattleDomePreBattleRoom_Text_24BAF7 message BattleFrontier_BattleDomePreBattleRoom_Text_RecordLastMatch
waitmessage waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0 multichoicedefault 20, 8, MULTI_YESNO, 1, 0
switch VAR_RESULT switch VAR_RESULT
case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B33F case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_RecordBattle
case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B33F:: @ 824B33F BattleFrontier_BattleDomePreBattleRoom_EventScript_RecordBattle:: @ 824B33F
call BattleFrontier_EventScript_SaveBattle call BattleFrontier_EventScript_SaveBattle
goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F goto BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349:: @ 824B349 BattleFrontier_BattleDomePreBattleRoom_EventScript_AskPauseChallenge:: @ 824B349
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA69, MSGBOX_YESNO msgbox BattleFrontier_BattleDomePreBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
switch VAR_RESULT switch VAR_RESULT
case NO, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F case NO, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
case YES, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB case YES, BattleFrontier_BattleDomePreBattleRoom_EventScript_PauseChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377:: @ 824B377 BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRetireChallenge:: @ 824B377
message BattleFrontier_BattleDomePreBattleRoom_Text_24BA93 message BattleFrontier_BattleDomePreBattleRoom_Text_RetireYourChallenge
waitmessage waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0 multichoicedefault 20, 8, MULTI_YESNO, 1, 0
switch VAR_RESULT switch VAR_RESULT
case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9 case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_RetireChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9:: @ 824B3A9 BattleFrontier_BattleDomePreBattleRoom_EventScript_RetireChallenge:: @ 824B3A9
dome_resolvewinners 9 dome_resolvewinners DOME_PLAYER_RETIRED
goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A goto BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobbyLost
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB BattleFrontier_BattleDomePreBattleRoom_EventScript_PauseChallenge:: @ 824B3BB
message BattleFrontier_BattleDomePreBattleRoom_Text_24BAD3 message BattleFrontier_BattleDomePreBattleRoom_Text_SavingDataPleaseWait
waitmessage waitmessage
dome_save CHALLENGE_STATUS_PAUSED dome_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE playse SE_SAVE
@@ -95,70 +94,70 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB
frontier_reset frontier_reset
end end
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowOpponentInfo:: @ 824B3DD
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomePreBattleRoom_Text_PlayersNextOpponentIsTrainer, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
dome_showopponentinfo dome_showopponentinfo
waitstate waitstate
goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F goto BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5 BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowTourneyTree:: @ 824B3F5
call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A call BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowRoundMessage
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
dome_showtourneytree dome_showtourneytree
waitstate waitstate
goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F goto BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A:: @ 824B40A BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowRoundMessage:: @ 824B40A
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B449 case DOME_ROUND1, BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInRound1
case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B452 case DOME_ROUND2, BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInRound2
case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B45B case DOME_SEMIFINAL, BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInSemifinals
case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B464 case DOME_FINAL, BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInFinals
return return
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B449:: @ 824B449 BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInRound1:: @ 824B449
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9D9, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInRound1, MSGBOX_DEFAULT
return return
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B452:: @ 824B452 BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInRound2:: @ 824B452
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9FD, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInRound2, MSGBOX_DEFAULT
return return
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B45B:: @ 824B45B BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInSemifinals:: @ 824B45B
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA21, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInSemifinals, MSGBOX_DEFAULT
return return
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B464:: @ 824B464 BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInFinals:: @ 824B464
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA46, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInFinals, MSGBOX_DEFAULT
return return
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D BattleFrontier_BattleDomePreBattleRoom_EventScript_ContinueChallenge:: @ 824B46D
message BattleFrontier_BattleDomePreBattleRoom_Text_24B70C message BattleFrontier_BattleDomePreBattleRoom_Text_ChooseTwoMons
waitmessage waitmessage
waitbuttonpress waitbuttonpress
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
call BattleFrontier_EventScript_GetLvlMode call BattleFrontier_EventScript_GetLvlMode
copyvar VAR_0x8004, VAR_RESULT copyvar VAR_0x8004, VAR_RESULT
setvar VAR_0x8005, 2 @ 2 of the 3 party mons are selected for battle setvar VAR_0x8005, DOME_BATTLE_PARTY_SIZE @ 2 of the 3 party mons are selected for battle
special ChoosePartyForBattleFrontier special ChoosePartyForBattleFrontier
waitstate waitstate
frontier_resetsketch frontier_resetsketch
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
dome_set DOME_DATA_8 dome_set DOME_DATA_SELECTED_MONS
dome_reduceparty dome_reduceparty
dome_setopponent dome_setopponent
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B748, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomePreBattleRoom_Text_RightThisWay, MSGBOX_DEFAULT
closemessage closemessage
applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_AttendantMoveAside
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B657 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerWalkToDoor
waitmovement 0 waitmovement 0
opendoor 5, 1 opendoor 5, 1
waitdooranim waitdooranim
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B659 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnterDoor
waitmovement 0 waitmovement 0
closedoor 5, 1 closedoor 5, 1
waitdooranim waitdooranim
@@ -167,224 +166,229 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D
waitstate waitstate
end end
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB:: @ 824B4FB BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForNextRoundMessage:: @ 824B4FB
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B53A case DOME_ROUND1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForRound1
case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B540 case DOME_ROUND2, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForRound2
case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B546 case DOME_SEMIFINAL, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForSemifinals
case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C case DOME_FINAL, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForFinals
return return
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B53A:: @ 824B53A BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForRound1:: @ 824B53A
message BattleFrontier_BattleDomePreBattleRoom_Text_24B65C message BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForRound1
return return
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B540:: @ 824B540 BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForRound2:: @ 824B540
message BattleFrontier_BattleDomePreBattleRoom_Text_24B689 message BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForRound2
return return
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B546:: @ 824B546 BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForSemifinals:: @ 824B546
message BattleFrontier_BattleDomePreBattleRoom_Text_24B6B6 message BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForSemifinals
return return
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForFinals:: @ 824B54C
frontier_getbrainstatus frontier_getbrainstatus
switch VAR_RESULT switch VAR_RESULT
case FRONTIER_BRAIN_SILVER, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B case FRONTIER_BRAIN_SILVER, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerSilver
case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0 case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerGold
case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerSilver
case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0 case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerGold
message BattleFrontier_BattleDomePreBattleRoom_Text_24B6E3 message BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForFinals
return return
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B:: @ 824B58B BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerSilver:: @ 824B58B
goto_if_set FLAG_TEMP_1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5 goto_if_set FLAG_TEMP_1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerSilverShort
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerSilver, MSGBOX_DEFAULT
setflag FLAG_TEMP_1 setflag FLAG_TEMP_1
return return
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0:: @ 824B5A0 BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerGold:: @ 824B5A0
goto_if_set FLAG_TEMP_1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE goto_if_set FLAG_TEMP_1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerGoldShort
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerGold, MSGBOX_DEFAULT
setflag FLAG_TEMP_1 setflag FLAG_TEMP_1
return return
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5:: @ 824B5B5 BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerSilverShort:: @ 824B5B5
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC2A, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerSilverShort, MSGBOX_DEFAULT
return return
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE:: @ 824B5BE BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerGoldShort:: @ 824B5BE
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC63, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerGoldShort, MSGBOX_DEFAULT
return return
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7 BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle:: @ 824B5C7
setvar VAR_TEMP_0, 1 setvar VAR_TEMP_0, 1
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B760, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomePreBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT
special LoadPlayerParty special LoadPlayerParty
frontier_setpartyorder FRONTIER_PARTY_SIZE frontier_setpartyorder FRONTIER_PARTY_SIZE
playfanfare MUS_ME_ASA playfanfare MUS_ME_ASA
waitfanfare waitfanfare
special HealPlayerParty special HealPlayerParty
call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600 call BattleFrontier_BattleDomePreBattleRoom_EventScript_RoundCompleteMessage
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
dome_showstatictourneytree dome_showstatictourneytree
waitstate waitstate
goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F goto BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600:: @ 824B600 BattleFrontier_BattleDomePreBattleRoom_EventScript_RoundCompleteMessage:: @ 824B600
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
switch VAR_RESULT switch VAR_RESULT
case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B634 case DOME_ROUND2, BattleFrontier_BattleDomePreBattleRoom_EventScript_Round1Complete
case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B63D case DOME_SEMIFINAL, BattleFrontier_BattleDomePreBattleRoom_EventScript_Round2Complete
case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B646 case DOME_FINAL, BattleFrontier_BattleDomePreBattleRoom_EventScript_SemifinalsComplete
return return
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B634:: @ 824B634 BattleFrontier_BattleDomePreBattleRoom_EventScript_Round1Complete:: @ 824B634
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7A3, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomePreBattleRoom_Text_Round1Complete, MSGBOX_DEFAULT
return return
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B63D:: @ 824B63D BattleFrontier_BattleDomePreBattleRoom_EventScript_Round2Complete:: @ 824B63D
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7F1, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomePreBattleRoom_Text_Round2Complete, MSGBOX_DEFAULT
return return
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B646:: @ 824B646 BattleFrontier_BattleDomePreBattleRoom_EventScript_SemifinalsComplete:: @ 824B646
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B83F, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomePreBattleRoom_Text_SemifinalsComplete, MSGBOX_DEFAULT
return return
BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F: @ 824B64F BattleFrontier_BattleDomePreBattleRoom_Movement_AttendantMoveAside: @ 824B64F
walk_right walk_right
face_left face_left
step_end step_end
BattleFrontier_BattleDomePreBattleRoom_Movement_24B652: @ 824B652 BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnter: @ 824B652
walk_up walk_up
walk_up walk_up
walk_up walk_up
walk_up walk_up
step_end step_end
BattleFrontier_BattleDomePreBattleRoom_Movement_24B657: @ 824B657 BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerWalkToDoor: @ 824B657
walk_up walk_up
step_end step_end
BattleFrontier_BattleDomePreBattleRoom_Movement_24B659: @ 824B659 BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnterDoor: @ 824B659
walk_up walk_up
set_invisible set_invisible
step_end step_end
BattleFrontier_BattleDomePreBattleRoom_Text_24B65C: @ 824B65C BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForRound1: @ 824B65C
.string "Your 1st-round match is next.\n" .string "Your 1st-round match is next.\n"
.string "Are you ready?$" .string "Are you ready?$"
BattleFrontier_BattleDomePreBattleRoom_Text_24B689: @ 824B689 BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForRound2: @ 824B689
.string "Your 2nd-round match is next.\n" .string "Your 2nd-round match is next.\n"
.string "Are you ready?$" .string "Are you ready?$"
BattleFrontier_BattleDomePreBattleRoom_Text_24B6B6: @ 824B6B6 BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForSemifinals: @ 824B6B6
.string "Your semifinal match is next.\n" .string "Your semifinal match is next.\n"
.string "Are you ready?$" .string "Are you ready?$"
BattleFrontier_BattleDomePreBattleRoom_Text_24B6E3: @ 824B6E3 BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForFinals: @ 824B6E3
.string "Your final match is next.\n" .string "Your final match is next.\n"
.string "Are you ready?$" .string "Are you ready?$"
BattleFrontier_BattleDomePreBattleRoom_Text_24B70C: @ 824B70C BattleFrontier_BattleDomePreBattleRoom_Text_ChooseTwoMons: @ 824B70C
.string "Please choose the two POKéMON\n" .string "Please choose the two POKéMON\n"
.string "that are to appear in battle.$" .string "that are to appear in battle.$"
BattleFrontier_BattleDomePreBattleRoom_Text_24B748: @ 824B748 BattleFrontier_BattleDomePreBattleRoom_Text_RightThisWay: @ 824B748
.string "Right this way, please.$" .string "Right this way, please.$"
BattleFrontier_BattleDomePreBattleRoom_Text_24B760: @ 824B760 BattleFrontier_BattleDomePreBattleRoom_Text_RestoreMonsToFullHealth: @ 824B760
.string "Thank you for competing!\p" .string "Thank you for competing!\p"
.string "I'll restore your POKéMON to\n" .string "I'll restore your POKéMON to\n"
.string "full health.$" .string "full health.$"
BattleFrontier_BattleDomePreBattleRoom_Text_24B7A3: @ 824B7A3 BattleFrontier_BattleDomePreBattleRoom_Text_Round1Complete: @ 824B7A3
.string "All 1st-round matches have been\n" .string "All 1st-round matches have been\n"
.string "completed.\p" .string "completed.\p"
.string "These are the teams that advanced!$" .string "These are the teams that advanced!$"
BattleFrontier_BattleDomePreBattleRoom_Text_24B7F1: @ 824B7F1 BattleFrontier_BattleDomePreBattleRoom_Text_Round2Complete: @ 824B7F1
.string "All 2nd-round matches have been\n" .string "All 2nd-round matches have been\n"
.string "completed.\p" .string "completed.\p"
.string "These are the teams that advanced!$" .string "These are the teams that advanced!$"
BattleFrontier_BattleDomePreBattleRoom_Text_24B83F: @ 824B83F BattleFrontier_BattleDomePreBattleRoom_Text_SemifinalsComplete: @ 824B83F
.string "All semifinal matches have been\n" .string "All semifinal matches have been\n"
.string "completed.\p" .string "completed.\p"
.string "These are the teams that advanced!$" .string "These are the teams that advanced!$"
BattleFrontier_BattleDomePreBattleRoom_Text_24B88D: @ 824B88D @ Unused
BattleFrontier_BattleDomePreBattleRoom_Text_CongratsReadyForRound2: @ 824B88D
.string "Congratulations for getting through\n" .string "Congratulations for getting through\n"
.string "the 1st round.\p" .string "the 1st round.\p"
.string "The 2nd round is next.\n" .string "The 2nd round is next.\n"
.string "Are you ready?$" .string "Are you ready?$"
BattleFrontier_BattleDomePreBattleRoom_Text_24B8E6: @ 824B8E6 @ Unused
BattleFrontier_BattleDomePreBattleRoom_Text_CongratsReadyForSemifinals: @ 824B8E6
.string "Congratulations for advancing\n" .string "Congratulations for advancing\n"
.string "to the semifinals.\p" .string "to the semifinals.\p"
.string "The best four teams meet in this round.\n" .string "The best four teams meet in this round.\n"
.string "Are you ready?$" .string "Are you ready?$"
BattleFrontier_BattleDomePreBattleRoom_Text_24B94E: @ 824B94E @ Unused
BattleFrontier_BattleDomePreBattleRoom_Text_CongratsReadyForFinals: @ 824B94E
.string "Congratulations for advancing\n" .string "Congratulations for advancing\n"
.string "to the final match.\p" .string "to the final match.\p"
.string "You're one win from the championship.\n" .string "You're one win from the championship.\n"
.string "Are you ready?$" .string "Are you ready?$"
BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5: @ 824B9B5 BattleFrontier_BattleDomePreBattleRoom_Text_PlayersNextOpponentIsTrainer: @ 824B9B5
.string "{PLAYER}'s next opponent\n" .string "{PLAYER}'s next opponent\n"
.string "is this TRAINER.$" .string "is this TRAINER.$"
BattleFrontier_BattleDomePreBattleRoom_Text_24B9D9: @ 824B9D9 BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInRound1: @ 824B9D9
.string "The tournament is in the 1st round.$" .string "The tournament is in the 1st round.$"
BattleFrontier_BattleDomePreBattleRoom_Text_24B9FD: @ 824B9FD BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInRound2: @ 824B9FD
.string "The tournament is in the 2nd round.$" .string "The tournament is in the 2nd round.$"
BattleFrontier_BattleDomePreBattleRoom_Text_24BA21: @ 824BA21 BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInSemifinals: @ 824BA21
.string "The tournament is in the semifinals.$" .string "The tournament is in the semifinals.$"
BattleFrontier_BattleDomePreBattleRoom_Text_24BA46: @ 824BA46 BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInFinals: @ 824BA46
.string "The tournament is up to the final.$" .string "The tournament is up to the final.$"
BattleFrontier_BattleDomePreBattleRoom_Text_24BA69: @ 824BA69 BattleFrontier_BattleDomePreBattleRoom_Text_SaveAndQuitGame: @ 824BA69
.string "Would you like to save and\n" .string "Would you like to save and\n"
.string "quit the game?$" .string "quit the game?$"
BattleFrontier_BattleDomePreBattleRoom_Text_24BA93: @ 824BA93 BattleFrontier_BattleDomePreBattleRoom_Text_RetireYourChallenge: @ 824BA93
.string "Would you like to retire from your\n" .string "Would you like to retire from your\n"
.string "Battle Tournament challenge?$" .string "Battle Tournament challenge?$"
BattleFrontier_BattleDomePreBattleRoom_Text_24BAD3: @ 824BAD3 BattleFrontier_BattleDomePreBattleRoom_Text_SavingDataPleaseWait: @ 824BAD3
.string "I am saving your data.\n" .string "I am saving your data.\n"
.string "Please wait.$" .string "Please wait.$"
BattleFrontier_BattleDomePreBattleRoom_Text_24BAF7: @ 824BAF7 BattleFrontier_BattleDomePreBattleRoom_Text_RecordLastMatch: @ 824BAF7
.string "Should I record your last match\n" .string "Should I record your last match\n"
.string "on your FRONTIER PASS?$" .string "on your FRONTIER PASS?$"
BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E: @ 824BB2E BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerSilver: @ 824BB2E
.string "Congratulations for advancing\n" .string "Congratulations for advancing\n"
.string "to the final match.\p" .string "to the final match.\p"
.string "For the final match, you will challenge\n" .string "For the final match, you will challenge\n"
.string "the DOME ACE TUCKER.\p" .string "the DOME ACE TUCKER.\p"
.string "Are you ready?$" .string "Are you ready?$"
BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC: @ 824BBAC @ Identical to ReadyForTuckerSilver
BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerGold: @ 824BBAC
.string "Congratulations for advancing\n" .string "Congratulations for advancing\n"
.string "to the final match.\p" .string "to the final match.\p"
.string "For the final match, you will challenge\n" .string "For the final match, you will challenge\n"
.string "the DOME ACE TUCKER.\p" .string "the DOME ACE TUCKER.\p"
.string "Are you ready?$" .string "Are you ready?$"
BattleFrontier_BattleDomePreBattleRoom_Text_24BC2A: @ 824BC2A BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerSilverShort: @ 824BC2A
.string "Your final battle against TUCKER is\n" .string "Your final battle against TUCKER is\n"
.string "next. Are you ready?$" .string "next. Are you ready?$"
BattleFrontier_BattleDomePreBattleRoom_Text_24BC63: @ 824BC63 @ Identical again
BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerGoldShort: @ 824BC63
.string "Your final battle against TUCKER is\n" .string "Your final battle against TUCKER is\n"
.string "next. Are you ready?$" .string "next. Are you ready?$"
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+2 -2
View File
@@ -6,7 +6,7 @@ BattleFrontier_BattleTowerLobby_MapScripts:: @ 823E67B
.byte 0 .byte 0
BattleFrontier_BattleTowerLobby_OnResume: @ 823E690 BattleFrontier_BattleTowerLobby_OnResume: @ 823E690
special sub_81653CC special TryHideBattleTowerReporter
end end
BattleFrontier_BattleTowerLobby_OnTransition: @ 823E694 BattleFrontier_BattleTowerLobby_OnTransition: @ 823E694
@@ -857,7 +857,7 @@ BattleFrontier_BattleTowerLobby_EventScript_CableLinkSuccessful:: @ 823F3AF
waitstate waitstate
playse SE_SAVE playse SE_SAVE
waitse waitse
special sub_80B3BC4 special TrySetBattleTowerLinkType
goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator
end end
data/maps/DewfordTown_Gym/scripts.inc
+14 -14
View File
@@ -151,7 +151,7 @@ DewfordTown_Gym_EventScript_StopCountingTrainers:: @ 81FC7C1
return return
DewfordTown_Gym_EventScript_Brawly:: @ 81FC7C2 DewfordTown_Gym_EventScript_Brawly:: @ 81FC7C2
trainerbattle_single TRAINER_BRAWLY_1, DewfordTown_Gym_Text_BrawlyPreBattle, DewfordTown_Gym_Text_BrawlyDefeat, DewfordTown_Gym_EventScript_BrawlyDefeated, NO_MUSIC trainerbattle_single TRAINER_BRAWLY_1, DewfordTown_Gym_Text_BrawlyIntro, DewfordTown_Gym_Text_BrawlyDefeat, DewfordTown_Gym_EventScript_BrawlyDefeated, NO_MUSIC
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
goto_if_eq DewfordTown_Gym_EventScript_BrawlyRematch goto_if_eq DewfordTown_Gym_EventScript_BrawlyRematch
@@ -210,7 +210,7 @@ DewfordTown_Gym_EventScript_BrawlyRematch:: @ 81FC89C
end end
DewfordTown_Gym_EventScript_Takao:: @ 81FC8B7 DewfordTown_Gym_EventScript_Takao:: @ 81FC8B7
trainerbattle_single TRAINER_TAKAO, DewfordTown_Gym_Text_TakaoPreBattle, DewfordTown_Gym_Text_TakaoDefeat, DewfordTown_Gym_EventScript_TakaoBrightenRoom trainerbattle_single TRAINER_TAKAO, DewfordTown_Gym_Text_TakaoIntro, DewfordTown_Gym_Text_TakaoDefeat, DewfordTown_Gym_EventScript_TakaoBrightenRoom
msgbox DewfordTown_Gym_Text_TakaoPostBattle, MSGBOX_AUTOCLOSE msgbox DewfordTown_Gym_Text_TakaoPostBattle, MSGBOX_AUTOCLOSE
end end
@@ -220,7 +220,7 @@ DewfordTown_Gym_EventScript_TakaoBrightenRoom:: @ 81FC8D2
end end
DewfordTown_Gym_EventScript_Jocelyn:: @ 81FC8D9 DewfordTown_Gym_EventScript_Jocelyn:: @ 81FC8D9
trainerbattle_single TRAINER_JOCELYN, DewfordTown_Gym_Text_JocelynPreBattle, DewfordTown_Gym_Text_JocelynDefeat, DewfordTown_Gym_EventScript_JocelynBrightenRoom trainerbattle_single TRAINER_JOCELYN, DewfordTown_Gym_Text_JocelynIntro, DewfordTown_Gym_Text_JocelynDefeat, DewfordTown_Gym_EventScript_JocelynBrightenRoom
msgbox DewfordTown_Gym_Text_JocelynPostBattle, MSGBOX_AUTOCLOSE msgbox DewfordTown_Gym_Text_JocelynPostBattle, MSGBOX_AUTOCLOSE
end end
@@ -230,7 +230,7 @@ DewfordTown_Gym_EventScript_JocelynBrightenRoom:: @ 81FC8F4
end end
DewfordTown_Gym_EventScript_Laura:: @ 81FC8FB DewfordTown_Gym_EventScript_Laura:: @ 81FC8FB
trainerbattle_single TRAINER_LAURA, DewfordTown_Gym_Text_LauraPreBattle, DewfordTown_Gym_Text_LauraDefeat, DewfordTown_Gym_EventScript_LauraBrightenRoom trainerbattle_single TRAINER_LAURA, DewfordTown_Gym_Text_LauraIntro, DewfordTown_Gym_Text_LauraDefeat, DewfordTown_Gym_EventScript_LauraBrightenRoom
msgbox DewfordTown_Gym_Text_LauraPostBattle, MSGBOX_AUTOCLOSE msgbox DewfordTown_Gym_Text_LauraPostBattle, MSGBOX_AUTOCLOSE
end end
@@ -240,7 +240,7 @@ DewfordTown_Gym_EventScript_LauraBrightenRoom:: @ 81FC916
end end
DewfordTown_Gym_EventScript_Brenden:: @ 81FC91D DewfordTown_Gym_EventScript_Brenden:: @ 81FC91D
trainerbattle_single TRAINER_BRENDEN, DewfordTown_Gym_Text_BrendenPreBattle, DewfordTown_Gym_Text_BrendenDefeat, DewfordTown_Gym_EventScript_BrendenBrightenRoom trainerbattle_single TRAINER_BRENDEN, DewfordTown_Gym_Text_BrendenIntro, DewfordTown_Gym_Text_BrendenDefeat, DewfordTown_Gym_EventScript_BrendenBrightenRoom
msgbox DewfordTown_Gym_Text_BrendenPostBattle, MSGBOX_AUTOCLOSE msgbox DewfordTown_Gym_Text_BrendenPostBattle, MSGBOX_AUTOCLOSE
end end
@@ -250,7 +250,7 @@ DewfordTown_Gym_EventScript_BrendenBrightenRoom:: @ 81FC938
end end
DewfordTown_Gym_EventScript_Cristian:: @ 81FC93F DewfordTown_Gym_EventScript_Cristian:: @ 81FC93F
trainerbattle_single TRAINER_CRISTIAN, DewfordTown_Gym_Text_CristianPreBattle, DewfordTown_Gym_Text_CristianDefeat, DewfordTown_Gym_EventScript_CristianBrightenRoom trainerbattle_single TRAINER_CRISTIAN, DewfordTown_Gym_Text_CristianIntro, DewfordTown_Gym_Text_CristianDefeat, DewfordTown_Gym_EventScript_CristianBrightenRoom
msgbox DewfordTown_Gym_Text_CristianPostBattle, MSGBOX_AUTOCLOSE msgbox DewfordTown_Gym_Text_CristianPostBattle, MSGBOX_AUTOCLOSE
end end
@@ -260,7 +260,7 @@ DewfordTown_Gym_EventScript_CristianBrightenRoom:: @ 81FC95A
end end
DewfordTown_Gym_EventScript_Lilith:: @ 81FC961 DewfordTown_Gym_EventScript_Lilith:: @ 81FC961
trainerbattle_single TRAINER_LILITH, DewfordTown_Gym_Text_LilithPreBattle, DewfordTown_Gym_Text_LilithDefeat, DewfordTown_Gym_EventScript_LilithBrightenRoom trainerbattle_single TRAINER_LILITH, DewfordTown_Gym_Text_LilithIntro, DewfordTown_Gym_Text_LilithDefeat, DewfordTown_Gym_EventScript_LilithBrightenRoom
msgbox DewfordTown_Gym_Text_LilithPostBattle, MSGBOX_AUTOCLOSE msgbox DewfordTown_Gym_Text_LilithPostBattle, MSGBOX_AUTOCLOSE
end end
@@ -324,7 +324,7 @@ DewfordTown_Gym_Text_GymGuidePostVictory: @ 81FCB5C
.string "Whoah! It's turned too bright in here!\p" .string "Whoah! It's turned too bright in here!\p"
.string "Your future is bright, too!$" .string "Your future is bright, too!$"
DewfordTown_Gym_Text_TakaoPreBattle: @ 81FCB9F DewfordTown_Gym_Text_TakaoIntro: @ 81FCB9F
.string "Might is right!\n" .string "Might is right!\n"
.string "Come on!$" .string "Come on!$"
@@ -335,7 +335,7 @@ DewfordTown_Gym_Text_TakaoPostBattle: @ 81FCBCA
.string "Your skill overcame my strength!\n" .string "Your skill overcame my strength!\n"
.string "Your technique is commendable!$" .string "Your technique is commendable!$"
DewfordTown_Gym_Text_JocelynPreBattle: @ 81FCC0A DewfordTown_Gym_Text_JocelynIntro: @ 81FCC0A
.string "There's no need for BRAWLY to be\n" .string "There's no need for BRAWLY to be\n"
.string "involved!\p" .string "involved!\p"
.string "I'll crush you!$" .string "I'll crush you!$"
@@ -351,7 +351,7 @@ DewfordTown_Gym_Text_JocelynPostBattle: @ 81FCC6B
.string "No, I'll become the POKéMON LEAGUE\n" .string "No, I'll become the POKéMON LEAGUE\n"
.string "CHAMPION!$" .string "CHAMPION!$"
DewfordTown_Gym_Text_LauraPreBattle: @ 81FCD01 DewfordTown_Gym_Text_LauraIntro: @ 81FCD01
.string "Don't you dare brush me off!\n" .string "Don't you dare brush me off!\n"
.string "It's not my fault if you cry!$" .string "It's not my fault if you cry!$"
@@ -365,7 +365,7 @@ DewfordTown_Gym_Text_LauraPostBattle: @ 81FCD4F
.string "But because it's so dark, I can never\n" .string "But because it's so dark, I can never\n"
.string "see BRAWLY's face…$" .string "see BRAWLY's face…$"
DewfordTown_Gym_Text_LilithPreBattle: @ 81FCDB8 DewfordTown_Gym_Text_LilithIntro: @ 81FCDB8
.string "Ufufu…\n" .string "Ufufu…\n"
.string "Are you stumbling around in the dark?$" .string "Are you stumbling around in the dark?$"
@@ -377,7 +377,7 @@ DewfordTown_Gym_Text_LilithPostBattle: @ 81FCE08
.string "You deserve to stay lost and end up\n" .string "You deserve to stay lost and end up\n"
.string "back at the entrance again!$" .string "back at the entrance again!$"
DewfordTown_Gym_Text_BrendenPreBattle: @ 81FCE48 DewfordTown_Gym_Text_BrendenIntro: @ 81FCE48
.string "I'll show you the gumption of\n" .string "I'll show you the gumption of\n"
.string "a sailing man!$" .string "a sailing man!$"
@@ -389,7 +389,7 @@ DewfordTown_Gym_Text_BrendenPostBattle: @ 81FCEAB
.string "Oh, aye! You're worthy of seeing\n" .string "Oh, aye! You're worthy of seeing\n"
.string "our GYM LEADER.$" .string "our GYM LEADER.$"
DewfordTown_Gym_Text_CristianPreBattle: @ 81FCEDC DewfordTown_Gym_Text_CristianIntro: @ 81FCEDC
.string "If you mean to pass, it has to be\n" .string "If you mean to pass, it has to be\n"
.string "through me!$" .string "through me!$"
@@ -401,7 +401,7 @@ DewfordTown_Gym_Text_CristianPostBattle: @ 81FCF26
.string "You win!\n" .string "You win!\n"
.string "Go after that BADGE!$" .string "Go after that BADGE!$"
DewfordTown_Gym_Text_BrawlyPreBattle: @ 81FCF44 DewfordTown_Gym_Text_BrawlyIntro: @ 81FCF44
.string "I'm BRAWLY!\n" .string "I'm BRAWLY!\n"
.string "DEWFORD's GYM LEADER!\p" .string "DEWFORD's GYM LEADER!\p"
.string "I've been churned in the rough waves\n" .string "I've been churned in the rough waves\n"
data/maps/DewfordTown_Hall/scripts.inc
+1 -1
View File
@@ -29,7 +29,7 @@ DewfordTown_Hall_EventScript_Man:: @ 81FD50A
lock lock
faceplayer faceplayer
call Common_EventScript_BufferTrendyPhrase call Common_EventScript_BufferTrendyPhrase
special sub_811EF6C special BufferDeepLinkPhrase
msgbox DewfordTown_Hall_Text_DeepLinkBetweenXAndY, MSGBOX_YESNO msgbox DewfordTown_Hall_Text_DeepLinkBetweenXAndY, MSGBOX_YESNO
compare VAR_RESULT, YES compare VAR_RESULT, YES
goto_if_eq DewfordTown_Hall_EventScript_ConfirmTrendLink goto_if_eq DewfordTown_Hall_EventScript_ConfirmTrendLink
data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+2 -2
View File
@@ -39,7 +39,7 @@ EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace: @ 8228A42
EverGrandeCity_ChampionsRoom_EventScript_Wallace:: @ 8228A45 EverGrandeCity_ChampionsRoom_EventScript_Wallace:: @ 8228A45
playbgm MUS_DAIGO, 0 playbgm MUS_DAIGO, 0
msgbox EverGrandeCity_ChampionsRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT msgbox EverGrandeCity_ChampionsRoom_Text_IntroSpeech, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_WALLACE, EverGrandeCity_ChampionsRoom_Text_Defeat trainerbattle_no_intro TRAINER_WALLACE, EverGrandeCity_ChampionsRoom_Text_Defeat
goto EverGrandeCity_ChampionsRoom_EventScript_Defeated goto EverGrandeCity_ChampionsRoom_EventScript_Defeated
end end
@@ -225,7 +225,7 @@ EverGrandeCity_ChampionsRoom_Movement_BirchArrives: @ 8228C43
walk_in_place_fastest_left walk_in_place_fastest_left
step_end step_end
EverGrandeCity_ChampionsRoom_Text_PreBattleSpeech: @ 8228C4C EverGrandeCity_ChampionsRoom_Text_IntroSpeech: @ 8228C4C
.string "WALLACE: Welcome, {PLAYER}{KUN}.\p" .string "WALLACE: Welcome, {PLAYER}{KUN}.\p"
.string "That incident in SOOTOPOLIS CITY…\n" .string "That incident in SOOTOPOLIS CITY…\n"
.string "That was superb work, putting an end\l" .string "That was superb work, putting an end\l"
data/maps/EverGrandeCity_DrakesRoom/scripts.inc
+2 -2
View File
@@ -43,7 +43,7 @@ EverGrandeCity_DrakesRoom_EventScript_Drake:: @ 82286F3
faceplayer faceplayer
goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_PostBattleSpeech goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_PostBattleSpeech
playbgm MUS_SITENNOU, 0 playbgm MUS_SITENNOU, 0
msgbox EverGrandeCity_DrakesRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT msgbox EverGrandeCity_DrakesRoom_Text_IntroSpeech, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_Defeat trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_Defeat
goto EverGrandeCity_DrakesRoom_EventScript_Defeated goto EverGrandeCity_DrakesRoom_EventScript_Defeated
end end
@@ -62,7 +62,7 @@ EverGrandeCity_DrakesRoom_EventScript_Defeated:: @ 8228724
release release
end end
EverGrandeCity_DrakesRoom_Text_PreBattleSpeech: @ 822873E EverGrandeCity_DrakesRoom_Text_IntroSpeech: @ 822873E
.string "I am the last of the POKéMON LEAGUE\n" .string "I am the last of the POKéMON LEAGUE\n"
.string "ELITE FOUR, DRAKE the DRAGON master!\p" .string "ELITE FOUR, DRAKE the DRAGON master!\p"
.string "In their natural state, POKéMON are\n" .string "In their natural state, POKéMON are\n"
data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
+2 -2
View File
@@ -42,7 +42,7 @@ EverGrandeCity_GlaciasRoom_EventScript_Glacia:: @ 8228469
faceplayer faceplayer
goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_PostBattleSpeech goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_PostBattleSpeech
playbgm MUS_SITENNOU, 0 playbgm MUS_SITENNOU, 0
msgbox EverGrandeCity_GlaciasRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT msgbox EverGrandeCity_GlaciasRoom_Text_IntroSpeech, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_Defeat trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_Defeat
goto EverGrandeCity_GlaciasRoom_EventScript_Defeated goto EverGrandeCity_GlaciasRoom_EventScript_Defeated
end end
@@ -59,7 +59,7 @@ EverGrandeCity_GlaciasRoom_EventScript_Defeated:: @ 822849A
release release
end end
EverGrandeCity_GlaciasRoom_Text_PreBattleSpeech: @ 82284AC EverGrandeCity_GlaciasRoom_Text_IntroSpeech: @ 82284AC
.string "Welcome, my name is GLACIA\n" .string "Welcome, my name is GLACIA\n"
.string "of the ELITE FOUR.\p" .string "of the ELITE FOUR.\p"
.string "I've traveled from afar to HOENN\n" .string "I've traveled from afar to HOENN\n"
data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
+2 -2
View File
@@ -42,7 +42,7 @@ EverGrandeCity_PhoebesRoom_EventScript_Phoebe:: @ 82281CB
faceplayer faceplayer
goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_PostBattleSpeech goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_PostBattleSpeech
playbgm MUS_SITENNOU, 0 playbgm MUS_SITENNOU, 0
msgbox EverGrandeCity_PhoebesRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT msgbox EverGrandeCity_PhoebesRoom_Text_IntroSpeech, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_Defeat trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_Defeat
goto EverGrandeCity_PhoebesRoom_EventScript_Defeated goto EverGrandeCity_PhoebesRoom_EventScript_Defeated
end end
@@ -59,7 +59,7 @@ EverGrandeCity_PhoebesRoom_EventScript_Defeated:: @ 82281FC
release release
end end
EverGrandeCity_PhoebesRoom_Text_PreBattleSpeech: @ 822820E EverGrandeCity_PhoebesRoom_Text_IntroSpeech: @ 822820E
.string "Ahahaha!\p" .string "Ahahaha!\p"
.string "I'm PHOEBE of the ELITE FOUR.\n" .string "I'm PHOEBE of the ELITE FOUR.\n"
.string "I did my training on MT. PYRE.\p" .string "I did my training on MT. PYRE.\p"
data/maps/EverGrandeCity_SidneysRoom/scripts.inc
+2 -2
View File
@@ -48,7 +48,7 @@ EverGrandeCity_SidneysRoom_EventScript_Sidney:: @ 8227F64
faceplayer faceplayer
goto_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_PostBattleSpeech goto_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_PostBattleSpeech
playbgm MUS_SITENNOU, 0 playbgm MUS_SITENNOU, 0
msgbox EverGrandeCity_SidneysRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT msgbox EverGrandeCity_SidneysRoom_Text_IntroSpeech, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_Defeat trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_Defeat
goto EverGrandeCity_SidneysRoom_EventScript_Defeated goto EverGrandeCity_SidneysRoom_EventScript_Defeated
end end
@@ -65,7 +65,7 @@ EverGrandeCity_SidneysRoom_EventScript_Defeated:: @ 8227F95
release release
end end
EverGrandeCity_SidneysRoom_Text_PreBattleSpeech: @ 8227FA7 EverGrandeCity_SidneysRoom_Text_IntroSpeech: @ 8227FA7
.string "Welcome, challenger!\n" .string "Welcome, challenger!\n"
.string "I'm SIDNEY of the ELITE FOUR.\p" .string "I'm SIDNEY of the ELITE FOUR.\p"
.string "I like that look you're giving me.\n" .string "I like that look you're giving me.\n"
data/maps/FortreeCity_Gym/scripts.inc
+14 -14
View File
@@ -16,7 +16,7 @@ FortreeCity_Gym_EventScript_InitRotatingGates:: @ 82165C4
end end
FortreeCity_Gym_EventScript_Winona:: @ 82165C8 FortreeCity_Gym_EventScript_Winona:: @ 82165C8
trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_WinonaPreBattle, FortreeCity_Gym_Text_WinonaDefeat, FortreeCity_Gym_EventScript_WinonaDefeated, NO_MUSIC trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_WinonaIntro, FortreeCity_Gym_Text_WinonaDefeat, FortreeCity_Gym_EventScript_WinonaDefeated, NO_MUSIC
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
goto_if_eq FortreeCity_Gym_EventScript_WinonaRematch goto_if_eq FortreeCity_Gym_EventScript_WinonaRematch
@@ -71,32 +71,32 @@ FortreeCity_Gym_EventScript_WinonaRematch:: @ 821668D
end end
FortreeCity_Gym_EventScript_Jared:: @ 82166A8 FortreeCity_Gym_EventScript_Jared:: @ 82166A8
trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_JaredPreBattle, FortreeCity_Gym_Text_JaredDefeat trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_JaredIntro, FortreeCity_Gym_Text_JaredDefeat
msgbox FortreeCity_Gym_Text_JaredPostBattle, MSGBOX_AUTOCLOSE msgbox FortreeCity_Gym_Text_JaredPostBattle, MSGBOX_AUTOCLOSE
end end
FortreeCity_Gym_EventScript_Edwardo:: @ 82166BF FortreeCity_Gym_EventScript_Edwardo:: @ 82166BF
trainerbattle_single TRAINER_EDWARDO, FortreeCity_Gym_Text_EdwardoPreBattle, FortreeCity_Gym_Text_EdwardoDefeat trainerbattle_single TRAINER_EDWARDO, FortreeCity_Gym_Text_EdwardoIntro, FortreeCity_Gym_Text_EdwardoDefeat
msgbox FortreeCity_Gym_Text_EdwardoPostBattle, MSGBOX_AUTOCLOSE msgbox FortreeCity_Gym_Text_EdwardoPostBattle, MSGBOX_AUTOCLOSE
end end
FortreeCity_Gym_EventScript_Flint:: @ 82166D6 FortreeCity_Gym_EventScript_Flint:: @ 82166D6
trainerbattle_single TRAINER_FLINT, FortreeCity_Gym_Text_FlintPreBattle, FortreeCity_Gym_Text_FlintDefeat trainerbattle_single TRAINER_FLINT, FortreeCity_Gym_Text_FlintIntro, FortreeCity_Gym_Text_FlintDefeat
msgbox FortreeCity_Gym_Text_FlintPostBattle, MSGBOX_AUTOCLOSE msgbox FortreeCity_Gym_Text_FlintPostBattle, MSGBOX_AUTOCLOSE
end end
FortreeCity_Gym_EventScript_Ashley:: @ 82166ED FortreeCity_Gym_EventScript_Ashley:: @ 82166ED
trainerbattle_single TRAINER_ASHLEY, FortreeCity_Gym_Text_AshleyPreBattle, FortreeCity_Gym_Text_AshleyDefeat trainerbattle_single TRAINER_ASHLEY, FortreeCity_Gym_Text_AshleyIntro, FortreeCity_Gym_Text_AshleyDefeat
msgbox FortreeCity_Gym_Text_AshleyPostBattle, MSGBOX_AUTOCLOSE msgbox FortreeCity_Gym_Text_AshleyPostBattle, MSGBOX_AUTOCLOSE
end end
FortreeCity_Gym_EventScript_Humberto:: @ 8216704 FortreeCity_Gym_EventScript_Humberto:: @ 8216704
trainerbattle_single TRAINER_HUMBERTO, FortreeCity_Gym_Text_HumbertoPreBattle, FortreeCity_Gym_Text_HumbertoDefeat trainerbattle_single TRAINER_HUMBERTO, FortreeCity_Gym_Text_HumbertoIntro, FortreeCity_Gym_Text_HumbertoDefeat
msgbox FortreeCity_Gym_Text_HumbertoPostBattle, MSGBOX_AUTOCLOSE msgbox FortreeCity_Gym_Text_HumbertoPostBattle, MSGBOX_AUTOCLOSE
end end
FortreeCity_Gym_EventScript_Darius:: @ 821671B FortreeCity_Gym_EventScript_Darius:: @ 821671B
trainerbattle_single TRAINER_DARIUS, FortreeCity_Gym_Text_DariusPreBattle, FortreeCity_Gym_Text_DariusDefeat trainerbattle_single TRAINER_DARIUS, FortreeCity_Gym_Text_DariusIntro, FortreeCity_Gym_Text_DariusDefeat
msgbox FortreeCity_Gym_Text_DariusPostBattle, MSGBOX_AUTOCLOSE msgbox FortreeCity_Gym_Text_DariusPostBattle, MSGBOX_AUTOCLOSE
end end
@@ -150,7 +150,7 @@ FortreeCity_Gym_Text_GymGuidePostVictory: @ 821687D
.string "You did it!\n" .string "You did it!\n"
.string "You've achieved liftoff!$" .string "You've achieved liftoff!$"
FortreeCity_Gym_Text_JaredPreBattle: @ 82168A2 FortreeCity_Gym_Text_JaredIntro: @ 82168A2
.string "Behold the elegant battle style of\n" .string "Behold the elegant battle style of\n"
.string "BIRD POKéMON!$" .string "BIRD POKéMON!$"
@@ -164,7 +164,7 @@ FortreeCity_Gym_Text_JaredPostBattle: @ 82168E7
.string "Do you have the smarts to get to\n" .string "Do you have the smarts to get to\n"
.string "our LEADER?$" .string "our LEADER?$"
FortreeCity_Gym_Text_EdwardoPreBattle: @ 821695A FortreeCity_Gym_Text_EdwardoIntro: @ 821695A
.string "The lovers of BIRD POKéMON aspire\n" .string "The lovers of BIRD POKéMON aspire\n"
.string "to join this GYM.\p" .string "to join this GYM.\p"
.string "As a member of the FORTREE GYM,\n" .string "As a member of the FORTREE GYM,\n"
@@ -180,7 +180,7 @@ FortreeCity_Gym_Text_EdwardoPostBattle: @ 82169F1
.string "I'm going to keep training and make\n" .string "I'm going to keep training and make\n"
.string "myself even stronger.$" .string "myself even stronger.$"
FortreeCity_Gym_Text_FlintPreBattle: @ 8216A66 FortreeCity_Gym_Text_FlintIntro: @ 8216A66
.string "There's no need for WINONA, our GYM\n" .string "There's no need for WINONA, our GYM\n"
.string "LEADER, to deal with you!\p" .string "LEADER, to deal with you!\p"
.string "I'm plenty good enough for you!$" .string "I'm plenty good enough for you!$"
@@ -194,7 +194,7 @@ FortreeCity_Gym_Text_FlintPostBattle: @ 8216AD7
.string "She's the ultimate LEADER!\p" .string "She's the ultimate LEADER!\p"
.string "Blush…$" .string "Blush…$"
FortreeCity_Gym_Text_AshleyPreBattle: @ 8216B1A FortreeCity_Gym_Text_AshleyIntro: @ 8216B1A
.string "WINONA taught me personally!\n" .string "WINONA taught me personally!\n"
.string "You can't beat me easily!$" .string "You can't beat me easily!$"
@@ -205,7 +205,7 @@ FortreeCity_Gym_Text_AshleyPostBattle: @ 8216B5F
.string "Thanks to WINONA, the people of\n" .string "Thanks to WINONA, the people of\n"
.string "FORTREE can live without fear.$" .string "FORTREE can live without fear.$"
FortreeCity_Gym_Text_HumbertoPreBattle: @ 8216B9E FortreeCity_Gym_Text_HumbertoIntro: @ 8216B9E
.string "When WINONA takes to battle, her face\n" .string "When WINONA takes to battle, her face\n"
.string "shines with beautiful determination…\p" .string "shines with beautiful determination…\p"
.string "I'm not letting you witness that\n" .string "I'm not letting you witness that\n"
@@ -220,7 +220,7 @@ FortreeCity_Gym_Text_HumbertoPostBattle: @ 8216C32
.string "Don't get distracted staring at WINONA\l" .string "Don't get distracted staring at WINONA\l"
.string "or you'll go crashing down in a heap!$" .string "or you'll go crashing down in a heap!$"
FortreeCity_Gym_Text_DariusPreBattle: @ 8216C96 FortreeCity_Gym_Text_DariusIntro: @ 8216C96
.string "You'd better know that there are all\n" .string "You'd better know that there are all\n"
.string "sorts of FLYING-type POKéMON.\p" .string "sorts of FLYING-type POKéMON.\p"
.string "You do know that, right?$" .string "You do know that, right?$"
@@ -233,7 +233,7 @@ FortreeCity_Gym_Text_DariusPostBattle: @ 8216D0F
.string "But you'd better watch it! Our LEADER\l" .string "But you'd better watch it! Our LEADER\l"
.string "WINONA's POKéMON are all business.$" .string "WINONA's POKéMON are all business.$"
FortreeCity_Gym_Text_WinonaPreBattle: @ 8216D75 FortreeCity_Gym_Text_WinonaIntro: @ 8216D75
.string "I am WINONA. I am the LEADER of\n" .string "I am WINONA. I am the LEADER of\n"
.string "the FORTREE POKéMON GYM.\p" .string "the FORTREE POKéMON GYM.\p"
.string "I have become one with BIRD POKéMON\n" .string "I have become one with BIRD POKéMON\n"
data/maps/LavaridgeTown_Gym_1F/scripts.inc
+18 -18
View File
@@ -52,7 +52,7 @@ LavaridgeTown_Gym_1F_EventScript_EndCheckHideTrainers:: @ 81FE78B
return return
LavaridgeTown_Gym_1F_EventScript_Flannery:: @ 81FE78C LavaridgeTown_Gym_1F_EventScript_Flannery:: @ 81FE78C
trainerbattle_single TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_FlanneryPreBattle, LavaridgeTown_Gym_1F_Text_FlanneryDefeat, LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated, NO_MUSIC trainerbattle_single TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_FlanneryIntro, LavaridgeTown_Gym_1F_Text_FlanneryDefeat, LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated, NO_MUSIC
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq LavaridgeTown_Gym_1F_EventScript_FlanneryRematch goto_if_eq LavaridgeTown_Gym_1F_EventScript_FlanneryRematch
@@ -111,7 +111,7 @@ LavaridgeTown_Gym_1F_EventScript_FlanneryRematch:: @ 81FE864
end end
LavaridgeTown_Gym_1F_EventScript_Cole:: @ 81FE87F LavaridgeTown_Gym_1F_EventScript_Cole:: @ 81FE87F
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_ColePreBattle, LavaridgeTown_Gym_1F_Text_ColeDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_ColeIntro, LavaridgeTown_Gym_1F_Text_ColeDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
msgbox LavaridgeTown_Gym_1F_Text_ColePostBattle MSGBOX_AUTOCLOSE msgbox LavaridgeTown_Gym_1F_Text_ColePostBattle MSGBOX_AUTOCLOSE
end end
@@ -124,37 +124,37 @@ LavaridgeTown_Gym_EventScript_CheckTrainerScript:: @ 81FE89A
end end
LavaridgeTown_Gym_1F_EventScript_Axle:: @ 81FE8AF LavaridgeTown_Gym_1F_EventScript_Axle:: @ 81FE8AF
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_AxlePreBattle, LavaridgeTown_Gym_1F_Text_AxleDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_AxleIntro, LavaridgeTown_Gym_1F_Text_AxleDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
msgbox LavaridgeTown_Gym_1F_Text_AxlePostBattle, MSGBOX_AUTOCLOSE msgbox LavaridgeTown_Gym_1F_Text_AxlePostBattle, MSGBOX_AUTOCLOSE
end end
LavaridgeTown_Gym_B1F_EventScript_Keegan:: @ 81FE8CA LavaridgeTown_Gym_B1F_EventScript_Keegan:: @ 81FE8CA
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_KEEGAN, 2, LavaridgeTown_Gym_B1F_Text_KeeganPreBattle, LavaridgeTown_Gym_B1F_Text_KeeganDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_KEEGAN, 2, LavaridgeTown_Gym_B1F_Text_KeeganIntro, LavaridgeTown_Gym_B1F_Text_KeeganDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
msgbox LavaridgeTown_Gym_B1F_Text_KeeganPostBattle, MSGBOX_AUTOCLOSE msgbox LavaridgeTown_Gym_B1F_Text_KeeganPostBattle, MSGBOX_AUTOCLOSE
end end
LavaridgeTown_Gym_1F_EventScript_Danielle:: @ 81FE8E5 LavaridgeTown_Gym_1F_EventScript_Danielle:: @ 81FE8E5
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_DANIELLE, 5, LavaridgeTown_Gym_1F_Text_DaniellePreBattle, LavaridgeTown_Gym_1F_Text_DanielleDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_DANIELLE, 5, LavaridgeTown_Gym_1F_Text_DanielleIntro, LavaridgeTown_Gym_1F_Text_DanielleDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
msgbox LavaridgeTown_Gym_1F_Text_DaniellePostBattle, MSGBOX_AUTOCLOSE msgbox LavaridgeTown_Gym_1F_Text_DaniellePostBattle, MSGBOX_AUTOCLOSE
end end
LavaridgeTown_Gym_1F_EventScript_Gerald:: @ 81FE900 LavaridgeTown_Gym_1F_EventScript_Gerald:: @ 81FE900
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_GERALD, 3, LavaridgeTown_Gym_1F_Text_GeraldPreBattle, LavaridgeTown_Gym_1F_Text_GeraldDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_GERALD, 3, LavaridgeTown_Gym_1F_Text_GeraldIntro, LavaridgeTown_Gym_1F_Text_GeraldDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
msgbox LavaridgeTown_Gym_1F_Text_GeraldPostBattle, MSGBOX_AUTOCLOSE msgbox LavaridgeTown_Gym_1F_Text_GeraldPostBattle, MSGBOX_AUTOCLOSE
end end
LavaridgeTown_Gym_B1F_EventScript_Jace:: @ 81FE91B LavaridgeTown_Gym_B1F_EventScript_Jace:: @ 81FE91B
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JACE, 1, LavaridgeTown_Gym_B1F_Text_JacePreBattle, LavaridgeTown_Gym_B1F_Text_JaceDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JACE, 1, LavaridgeTown_Gym_B1F_Text_JaceIntro, LavaridgeTown_Gym_B1F_Text_JaceDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
msgbox LavaridgeTown_Gym_B1F_Text_JacePostBattle, MSGBOX_AUTOCLOSE msgbox LavaridgeTown_Gym_B1F_Text_JacePostBattle, MSGBOX_AUTOCLOSE
end end
LavaridgeTown_Gym_B1F_EventScript_Jeff:: @ 81FE936 LavaridgeTown_Gym_B1F_EventScript_Jeff:: @ 81FE936
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JEFF, 3, LavaridgeTown_Gym_B1F_Text_JeffPreBattle, LavaridgeTown_Gym_B1F_Text_JeffDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JEFF, 3, LavaridgeTown_Gym_B1F_Text_JeffIntro, LavaridgeTown_Gym_B1F_Text_JeffDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
msgbox LavaridgeTown_Gym_B1F_Text_JeffPostBattle, MSGBOX_AUTOCLOSE msgbox LavaridgeTown_Gym_B1F_Text_JeffPostBattle, MSGBOX_AUTOCLOSE
end end
LavaridgeTown_Gym_B1F_EventScript_Eli:: @ 81FE951 LavaridgeTown_Gym_B1F_EventScript_Eli:: @ 81FE951
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ELI, 4, LavaridgeTown_Gym_B1F_Text_EliPreBattle, LavaridgeTown_Gym_B1F_Text_EliDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ELI, 4, LavaridgeTown_Gym_B1F_Text_EliIntro, LavaridgeTown_Gym_B1F_Text_EliDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
msgbox LavaridgeTown_Gym_B1F_Text_EliPostBattle, MSGBOX_AUTOCLOSE msgbox LavaridgeTown_Gym_B1F_Text_EliPostBattle, MSGBOX_AUTOCLOSE
end end
@@ -207,7 +207,7 @@ LavaridgeTown_Gym_1F_Text_GymGuideAdvice: @ 81FE9BF
LavaridgeTown_Gym_1F_Text_GymGuidePostVictory: @ 81FEAB8 LavaridgeTown_Gym_1F_Text_GymGuidePostVictory: @ 81FEAB8
.string "Yow! That was a scorching-hot battle!$" .string "Yow! That was a scorching-hot battle!$"
LavaridgeTown_Gym_1F_Text_ColePreBattle: @ 81FEADE LavaridgeTown_Gym_1F_Text_ColeIntro: @ 81FEADE
.string "Owowowowow!\n" .string "Owowowowow!\n"
.string "Yikes, it's hot!$" .string "Yikes, it's hot!$"
@@ -220,7 +220,7 @@ LavaridgeTown_Gym_1F_Text_ColePostBattle: @ 81FEB1C
.string "It's effective for healing pain in\n" .string "It's effective for healing pain in\n"
.string "your joints.$" .string "your joints.$"
LavaridgeTown_Gym_1F_Text_AxlePreBattle: @ 81FEB7B LavaridgeTown_Gym_1F_Text_AxleIntro: @ 81FEB7B
.string "I'm trying to relieve my stress.\n" .string "I'm trying to relieve my stress.\n"
.string "Don't come along and stress me out!$" .string "Don't come along and stress me out!$"
@@ -232,7 +232,7 @@ LavaridgeTown_Gym_1F_Text_AxlePostBattle: @ 81FEBE1
.string "If you spend too much time buried in\n" .string "If you spend too much time buried in\n"
.string "hot sand, it tuckers you out…$" .string "hot sand, it tuckers you out…$"
LavaridgeTown_Gym_B1F_Text_KeeganPreBattle: @ 81FEC31 LavaridgeTown_Gym_B1F_Text_KeeganIntro: @ 81FEC31
.string "You must be getting tired by now.\n" .string "You must be getting tired by now.\n"
.string "You'd like to rest in the hot sand,\l" .string "You'd like to rest in the hot sand,\l"
.string "wouldn't you?\p" .string "wouldn't you?\p"
@@ -249,7 +249,7 @@ LavaridgeTown_Gym_B1F_Text_KeeganPostBattle: @ 81FED02
.string "If you don't watch yourself, you'll be\n" .string "If you don't watch yourself, you'll be\n"
.string "burned seriously.$" .string "burned seriously.$"
LavaridgeTown_Gym_1F_Text_GeraldPreBattle: @ 81FED72 LavaridgeTown_Gym_1F_Text_GeraldIntro: @ 81FED72
.string "Can your POKéMON withstand\n" .string "Can your POKéMON withstand\n"
.string "392-degree heat?$" .string "392-degree heat?$"
@@ -262,7 +262,7 @@ LavaridgeTown_Gym_1F_Text_GeraldPostBattle: @ 81FEDBB
.string "Your POKéMON beat me, so they should\n" .string "Your POKéMON beat me, so they should\n"
.string "easily survive in magma.$" .string "easily survive in magma.$"
LavaridgeTown_Gym_1F_Text_DaniellePreBattle: @ 81FEE22 LavaridgeTown_Gym_1F_Text_DanielleIntro: @ 81FEE22
.string "Um…\n" .string "Um…\n"
.string "Okay, I'll battle with you.$" .string "Okay, I'll battle with you.$"
@@ -273,7 +273,7 @@ LavaridgeTown_Gym_1F_Text_DaniellePostBattle: @ 81FEE5D
.string "I'm going to be a pretty and strong\n" .string "I'm going to be a pretty and strong\n"
.string "TRAINER just like FLANNERY.$" .string "TRAINER just like FLANNERY.$"
LavaridgeTown_Gym_B1F_Text_JacePreBattle: @ 81FEE9D LavaridgeTown_Gym_B1F_Text_JaceIntro: @ 81FEE9D
.string "Come on, get with it!\n" .string "Come on, get with it!\n"
.string "Let's go before my feelings cool!$" .string "Let's go before my feelings cool!$"
@@ -286,7 +286,7 @@ LavaridgeTown_Gym_B1F_Text_JacePostBattle: @ 81FEF07
.string "within you, you may stand a chance\l" .string "within you, you may stand a chance\l"
.string "against our LEADER.$" .string "against our LEADER.$"
LavaridgeTown_Gym_B1F_Text_JeffPreBattle: @ 81FEF60 LavaridgeTown_Gym_B1F_Text_JeffIntro: @ 81FEF60
.string "See how the flames blaze wildly?\n" .string "See how the flames blaze wildly?\n"
.string "They flare in anticipation of my win!$" .string "They flare in anticipation of my win!$"
@@ -298,7 +298,7 @@ LavaridgeTown_Gym_B1F_Text_JeffPostBattle: @ 81FEFC2
.string "I can walk on hot coals barefoot!\p" .string "I can walk on hot coals barefoot!\p"
.string "…Don't even think about trying it!$" .string "…Don't even think about trying it!$"
LavaridgeTown_Gym_B1F_Text_EliPreBattle: @ 81FF025 LavaridgeTown_Gym_B1F_Text_EliIntro: @ 81FF025
.string "As much as I love mountains,\n" .string "As much as I love mountains,\n"
.string "I especially love volcanoes.$" .string "I especially love volcanoes.$"
@@ -311,7 +311,7 @@ LavaridgeTown_Gym_B1F_Text_EliPostBattle: @ 81FF09A
.string "of FLANNERY's power.\p" .string "of FLANNERY's power.\p"
.string "Hehehehe.$" .string "Hehehehe.$"
LavaridgeTown_Gym_1F_Text_FlanneryPreBattle: @ 81FF0DC LavaridgeTown_Gym_1F_Text_FlanneryIntro: @ 81FF0DC
.string "Welcome… No, wait.\p" .string "Welcome… No, wait.\p"
.string "Puny TRAINER, how good to see you've\n" .string "Puny TRAINER, how good to see you've\n"
.string "made it here!\p" .string "made it here!\p"
data/maps/LilycoveCity_Harbor/scripts.inc
+1 -2
View File
@@ -457,8 +457,7 @@ LilycoveCity_Harbor_Movement_PlayerBoardFerryNorth: @ 821E633
walk_up walk_up
step_end step_end
@ Unused LilycoveCity_Harbor_Movement_UnusedBoardFerry: @ 821E635
LilycoveCity_Harbor_Movement_21E635: @ 821E635
walk_up walk_up
step_end step_end
data/maps/MauvilleCity_Gym/scripts.inc
+12 -12
View File
@@ -74,7 +74,7 @@ MauvilleCity_Gym_EventScript_DeactivatePuzzle:: @ 820DEE7
end end
MauvilleCity_Gym_EventScript_Wattson:: @ 820DEEB MauvilleCity_Gym_EventScript_Wattson:: @ 820DEEB
trainerbattle_single TRAINER_WATTSON_1, MauvilleCity_Gym_Text_WattsonPreBattle, MauvilleCity_Gym_Text_WattsonDefeat, MauvilleCity_Gym_EventScript_WattsonDefeated, NO_MUSIC trainerbattle_single TRAINER_WATTSON_1, MauvilleCity_Gym_Text_WattsonIntro, MauvilleCity_Gym_Text_WattsonDefeat, MauvilleCity_Gym_EventScript_WattsonDefeated, NO_MUSIC
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
goto_if_eq MauvilleCity_Gym_EventScript_WattsonRematch goto_if_eq MauvilleCity_Gym_EventScript_WattsonRematch
@@ -206,27 +206,27 @@ MauvilleCity_Gym_EventScript_ClearBarriersAltState:: @ 820E0B4
end end
MauvilleCity_Gym_EventScript_Kirk:: @ 820E0B9 MauvilleCity_Gym_EventScript_Kirk:: @ 820E0B9
trainerbattle_single TRAINER_KIRK, MauvilleCity_Gym_Text_KirkPreBattle, MauvilleCity_Gym_Text_KirkDefeat trainerbattle_single TRAINER_KIRK, MauvilleCity_Gym_Text_KirkIntro, MauvilleCity_Gym_Text_KirkDefeat
msgbox MauvilleCity_Gym_Text_KirkPostBattle, MSGBOX_AUTOCLOSE msgbox MauvilleCity_Gym_Text_KirkPostBattle, MSGBOX_AUTOCLOSE
end end
MauvilleCity_Gym_EventScript_Shawn:: @ 820E0D0 MauvilleCity_Gym_EventScript_Shawn:: @ 820E0D0
trainerbattle_single TRAINER_SHAWN, MauvilleCity_Gym_Text_ShawnPreBattle, MauvilleCity_Gym_Text_ShawnDefeat trainerbattle_single TRAINER_SHAWN, MauvilleCity_Gym_Text_ShawnIntro, MauvilleCity_Gym_Text_ShawnDefeat
msgbox MauvilleCity_Gym_Text_ShawnPostBattle, MSGBOX_AUTOCLOSE msgbox MauvilleCity_Gym_Text_ShawnPostBattle, MSGBOX_AUTOCLOSE
end end
MauvilleCity_Gym_EventScript_Ben:: @ 820E0E7 MauvilleCity_Gym_EventScript_Ben:: @ 820E0E7
trainerbattle_single TRAINER_BEN, MauvilleCity_Gym_Text_BenPreBattle, MauvilleCity_Gym_Text_BenDefeat trainerbattle_single TRAINER_BEN, MauvilleCity_Gym_Text_BenIntro, MauvilleCity_Gym_Text_BenDefeat
msgbox MauvilleCity_Gym_Text_BenPostBattle, MSGBOX_AUTOCLOSE msgbox MauvilleCity_Gym_Text_BenPostBattle, MSGBOX_AUTOCLOSE
end end
MauvilleCity_Gym_EventScript_Vivian:: @ 820E0FE MauvilleCity_Gym_EventScript_Vivian:: @ 820E0FE
trainerbattle_single TRAINER_VIVIAN, MauvilleCity_Gym_Text_VivianPreBattle, MauvilleCity_Gym_Text_VivianDefeat trainerbattle_single TRAINER_VIVIAN, MauvilleCity_Gym_Text_VivianIntro, MauvilleCity_Gym_Text_VivianDefeat
msgbox MauvilleCity_Gym_Text_VivianPostBattle, MSGBOX_AUTOCLOSE msgbox MauvilleCity_Gym_Text_VivianPostBattle, MSGBOX_AUTOCLOSE
end end
MauvilleCity_Gym_EventScript_Angelo:: @ 820E115 MauvilleCity_Gym_EventScript_Angelo:: @ 820E115
trainerbattle_single TRAINER_ANGELO, MauvilleCity_Gym_Text_AngeloPreBattle, MauvilleCity_Gym_Text_AngeloDefeat trainerbattle_single TRAINER_ANGELO, MauvilleCity_Gym_Text_AngeloIntro, MauvilleCity_Gym_Text_AngeloDefeat
msgbox MauvilleCity_Gym_Text_AngeloPostBattle, MSGBOX_AUTOCLOSE msgbox MauvilleCity_Gym_Text_AngeloPostBattle, MSGBOX_AUTOCLOSE
end end
@@ -280,7 +280,7 @@ MauvilleCity_Gym_Text_GymGuidePostVictory: @ 820E283
.string "Whoa, you're electrifying!\n" .string "Whoa, you're electrifying!\n"
.string "You've powered the door open!$" .string "You've powered the door open!$"
MauvilleCity_Gym_Text_KirkPreBattle: @ 820E2BC MauvilleCity_Gym_Text_KirkIntro: @ 820E2BC
.string "My electric soul, it'll shatter your\n" .string "My electric soul, it'll shatter your\n"
.string "dreams whole, whoa-yeahah!$" .string "dreams whole, whoa-yeahah!$"
@@ -292,7 +292,7 @@ MauvilleCity_Gym_Text_KirkPostBattle: @ 820E336
.string "POKéMON and rock, it's all about heart,\n" .string "POKéMON and rock, it's all about heart,\n"
.string "whoa-yeah!$" .string "whoa-yeah!$"
MauvilleCity_Gym_Text_ShawnPreBattle: @ 820E369 MauvilleCity_Gym_Text_ShawnIntro: @ 820E369
.string "I trained under WATTSON!\n" .string "I trained under WATTSON!\n"
.string "There ain't no way I'll lose easily!$" .string "There ain't no way I'll lose easily!$"
@@ -305,7 +305,7 @@ MauvilleCity_Gym_Text_ShawnPostBattle: @ 820E3C1
.string "He was battling even before your\n" .string "He was battling even before your\n"
.string "daddy was born, that tough coot.$" .string "daddy was born, that tough coot.$"
MauvilleCity_Gym_Text_BenPreBattle: @ 820E443 MauvilleCity_Gym_Text_BenIntro: @ 820E443
.string "This GYM's got puzzles!\n" .string "This GYM's got puzzles!\n"
.string "Isn't it fun?$" .string "Isn't it fun?$"
@@ -316,7 +316,7 @@ MauvilleCity_Gym_Text_BenPostBattle: @ 820E47E
.string "WATTSON says he likes setting up\n" .string "WATTSON says he likes setting up\n"
.string "little traps with switches.$" .string "little traps with switches.$"
MauvilleCity_Gym_Text_VivianPreBattle: @ 820E4BB MauvilleCity_Gym_Text_VivianIntro: @ 820E4BB
.string "With my charm and my POKéMON's moves,\n" .string "With my charm and my POKéMON's moves,\n"
.string "you'll be shocked!$" .string "you'll be shocked!$"
@@ -330,7 +330,7 @@ MauvilleCity_Gym_Text_VivianPostBattle: @ 820E50F
.string "became TRAINERS.\l" .string "became TRAINERS.\l"
.string "He must know all sorts of things!$" .string "He must know all sorts of things!$"
MauvilleCity_Gym_Text_AngeloPreBattle: @ 820E593 MauvilleCity_Gym_Text_AngeloIntro: @ 820E593
.string "I love shiny things!$" .string "I love shiny things!$"
MauvilleCity_Gym_Text_AngeloDefeat: @ 820E5A8 MauvilleCity_Gym_Text_AngeloDefeat: @ 820E5A8
@@ -341,7 +341,7 @@ MauvilleCity_Gym_Text_AngeloPostBattle: @ 820E5C2
.string "MAUVILLE GYM's WATTSON has a shiny\n" .string "MAUVILLE GYM's WATTSON has a shiny\n"
.string "forehead. It makes me happy!$" .string "forehead. It makes me happy!$"
MauvilleCity_Gym_Text_WattsonPreBattle: @ 820E602 MauvilleCity_Gym_Text_WattsonIntro: @ 820E602
.string "I've given up on my plans to convert\n" .string "I've given up on my plans to convert\n"
.string "the city, I have.\p" .string "the city, I have.\p"
.string "And so, I put my time into making\n" .string "And so, I put my time into making\n"
data/maps/MossdeepCity_Gym/scripts.inc
+26 -26
View File
@@ -49,7 +49,7 @@ MossdeepCity_Gym_EventScript_SetSwitch4Metatiles:: @ 8220885
end end
MossdeepCity_Gym_EventScript_TateAndLiza:: @ 8220898 MossdeepCity_Gym_EventScript_TateAndLiza:: @ 8220898
trainerbattle_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_TateAndLizaPreBattle, MossdeepCity_Gym_Text_TateAndLizaDefeat, MossdeepCity_Gym_Text_TateAndLizaNeedTwoMons, MossdeepCity_Gym_EventScript_TateAndLizaDefeated, NO_MUSIC trainerbattle_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_TateAndLizaIntro, MossdeepCity_Gym_Text_TateAndLizaDefeat, MossdeepCity_Gym_Text_TateAndLizaNeedTwoMons, MossdeepCity_Gym_EventScript_TateAndLizaDefeated, NO_MUSIC
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
goto_if_eq MossdeepCity_Gym_EventScript_TateAndLizaRematch goto_if_eq MossdeepCity_Gym_EventScript_TateAndLizaRematch
@@ -207,62 +207,62 @@ MossdeepCity_Gym_EventScript_WarpToEntrance:: @ 8220AF1
end end
MossdeepCity_Gym_EventScript_Preston:: @ 8220AFD MossdeepCity_Gym_EventScript_Preston:: @ 8220AFD
trainerbattle_single TRAINER_PRESTON, MossdeepCity_Gym_Text_PrestonPreBattle, MossdeepCity_Gym_Text_PrestonDefeat trainerbattle_single TRAINER_PRESTON, MossdeepCity_Gym_Text_PrestonIntro, MossdeepCity_Gym_Text_PrestonDefeat
msgbox MossdeepCity_Gym_Text_PrestonPostBattle, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_PrestonPostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_Virgil:: @ 8220B14 MossdeepCity_Gym_EventScript_Virgil:: @ 8220B14
trainerbattle_single TRAINER_VIRGIL, MossdeepCity_Gym_Text_VirgilPreBattle, MossdeepCity_Gym_Text_VirgilDefeat trainerbattle_single TRAINER_VIRGIL, MossdeepCity_Gym_Text_VirgilIntro, MossdeepCity_Gym_Text_VirgilDefeat
msgbox MossdeepCity_Gym_Text_VirgilPostBattle, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_VirgilPostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_Blake:: @ 8220B2B MossdeepCity_Gym_EventScript_Blake:: @ 8220B2B
trainerbattle_single TRAINER_BLAKE, MossdeepCity_Gym_Text_BlakePreBattle, MossdeepCity_Gym_Text_BlakeDefeat trainerbattle_single TRAINER_BLAKE, MossdeepCity_Gym_Text_BlakeIntro, MossdeepCity_Gym_Text_BlakeDefeat
msgbox MossdeepCity_Gym_Text_BlakePostBattle, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_BlakePostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_Hannah:: @ 8220B42 MossdeepCity_Gym_EventScript_Hannah:: @ 8220B42
trainerbattle_single TRAINER_HANNAH, MossdeepCity_Gym_Text_HannahPreBattle, MossdeepCity_Gym_Text_HannahDefeat trainerbattle_single TRAINER_HANNAH, MossdeepCity_Gym_Text_HannahIntro, MossdeepCity_Gym_Text_HannahDefeat
msgbox MossdeepCity_Gym_Text_HannahPostBattle, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_HannahPostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_Samantha:: @ 8220B59 MossdeepCity_Gym_EventScript_Samantha:: @ 8220B59
trainerbattle_single TRAINER_SAMANTHA, MossdeepCity_Gym_Text_SamanthaPreBattle, MossdeepCity_Gym_Text_SamanthaDefeat trainerbattle_single TRAINER_SAMANTHA, MossdeepCity_Gym_Text_SamanthaIntro, MossdeepCity_Gym_Text_SamanthaDefeat
msgbox MossdeepCity_Gym_Text_SamanthaPostBattle, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_SamanthaPostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_Maura:: @ 8220B70 MossdeepCity_Gym_EventScript_Maura:: @ 8220B70
trainerbattle_single TRAINER_MAURA, MossdeepCity_Gym_Text_MauraPreBattle, MossdeepCity_Gym_Text_MauraDefeat trainerbattle_single TRAINER_MAURA, MossdeepCity_Gym_Text_MauraIntro, MossdeepCity_Gym_Text_MauraDefeat
msgbox MossdeepCity_Gym_Text_MauraPostBattle, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_MauraPostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_Sylvia:: @ 8220B87 MossdeepCity_Gym_EventScript_Sylvia:: @ 8220B87
trainerbattle_single TRAINER_SYLVIA, MossdeepCity_Gym_Text_SylviaPreBattle, MossdeepCity_Gym_Text_SylviaDefeat trainerbattle_single TRAINER_SYLVIA, MossdeepCity_Gym_Text_SylviaIntro, MossdeepCity_Gym_Text_SylviaDefeat
msgbox MossdeepCity_Gym_Text_SylviaPostBattle, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_SylviaPostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_Nate:: @ 8220B9E MossdeepCity_Gym_EventScript_Nate:: @ 8220B9E
trainerbattle_single TRAINER_NATE, MossdeepCity_Gym_Text_NatePreBattle, MossdeepCity_Gym_Text_NateDefeat trainerbattle_single TRAINER_NATE, MossdeepCity_Gym_Text_NateIntro, MossdeepCity_Gym_Text_NateDefeat
msgbox MossdeepCity_Gym_Text_NatePostBattle, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_NatePostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_Macey:: @ 8220BB5 MossdeepCity_Gym_EventScript_Macey:: @ 8220BB5
trainerbattle_single TRAINER_MACEY, MossdeepCity_Gym_Text_MaceyPreBattle, MossdeepCity_Gym_Text_MaceyDefeat trainerbattle_single TRAINER_MACEY, MossdeepCity_Gym_Text_MaceyIntro, MossdeepCity_Gym_Text_MaceyDefeat
msgbox MossdeepCity_Gym_Text_MaceyPostBattle, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_MaceyPostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_Clifford:: @ 8220BCC MossdeepCity_Gym_EventScript_Clifford:: @ 8220BCC
trainerbattle_single TRAINER_CLIFFORD, MossdeepCity_Gym_Text_CliffordPreBattle, MossdeepCity_Gym_Text_CliffordDefeat trainerbattle_single TRAINER_CLIFFORD, MossdeepCity_Gym_Text_CliffordIntro, MossdeepCity_Gym_Text_CliffordDefeat
msgbox MossdeepCity_Gym_Text_CliffordPostBattle, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_CliffordPostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_Nicholas:: @ 8220BE3 MossdeepCity_Gym_EventScript_Nicholas:: @ 8220BE3
trainerbattle_single TRAINER_NICHOLAS, MossdeepCity_Gym_Text_NicholasPreBattle, MossdeepCity_Gym_Text_NicholasDefeat trainerbattle_single TRAINER_NICHOLAS, MossdeepCity_Gym_Text_NicholasIntro, MossdeepCity_Gym_Text_NicholasDefeat
msgbox MossdeepCity_Gym_Text_NicholasPostBattle, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_NicholasPostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_Kathleen:: @ 8220BFA MossdeepCity_Gym_EventScript_Kathleen:: @ 8220BFA
trainerbattle_single TRAINER_KATHLEEN, MossdeepCity_Gym_Text_KathleenPreBattle, MossdeepCity_Gym_Text_KathleenDefeat trainerbattle_single TRAINER_KATHLEEN, MossdeepCity_Gym_Text_KathleenIntro, MossdeepCity_Gym_Text_KathleenDefeat
msgbox MossdeepCity_Gym_Text_KathleenPostBattle, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_KathleenPostBattle, MSGBOX_AUTOCLOSE
end end
@@ -385,7 +385,7 @@ MossdeepCity_Gym_Text_GymGuidePostVictory: @ 8220E2A
.string "Wow, you're astounding!\n" .string "Wow, you're astounding!\n"
.string "You're one great TRAINER!$" .string "You're one great TRAINER!$"
MossdeepCity_Gym_Text_PrestonPreBattle: @ 8220E5C MossdeepCity_Gym_Text_PrestonIntro: @ 8220E5C
.string "Battles hinge on the strength of your\n" .string "Battles hinge on the strength of your\n"
.string "spirit! The weak-spirited will never win!$" .string "spirit! The weak-spirited will never win!$"
@@ -397,7 +397,7 @@ MossdeepCity_Gym_Text_PrestonPostBattle: @ 8220ED3
.string "The indecisive lose.\n" .string "The indecisive lose.\n"
.string "That's my warning to you.$" .string "That's my warning to you.$"
MossdeepCity_Gym_Text_VirgilPreBattle: @ 8220F02 MossdeepCity_Gym_Text_VirgilIntro: @ 8220F02
.string "Let me see your talent!$" .string "Let me see your talent!$"
MossdeepCity_Gym_Text_VirgilDefeat: @ 8220F1A MossdeepCity_Gym_Text_VirgilDefeat: @ 8220F1A
@@ -409,7 +409,7 @@ MossdeepCity_Gym_Text_VirgilPostBattle: @ 8220F3A
.string "However, you may be even more talented\n" .string "However, you may be even more talented\n"
.string "than them…$" .string "than them…$"
MossdeepCity_Gym_Text_BlakePreBattle: @ 8220FB0 MossdeepCity_Gym_Text_BlakeIntro: @ 8220FB0
.string "Fufufufu… Watch me levitate a POKé\n" .string "Fufufufu… Watch me levitate a POKé\n"
.string "BALL telekinetically!\p" .string "BALL telekinetically!\p"
.string "Wrooooooooaaaar!\n" .string "Wrooooooooaaaar!\n"
@@ -428,7 +428,7 @@ MossdeepCity_Gym_Text_BlakePostBattle: @ 8221055
.string "No, I'm not cheating!\n" .string "No, I'm not cheating!\n"
.string "I didn't blow on it! Honestly!$" .string "I didn't blow on it! Honestly!$"
MossdeepCity_Gym_Text_HannahPreBattle: @ 82210EE MossdeepCity_Gym_Text_HannahIntro: @ 82210EE
.string "When you lose to me, don't be too hard\n" .string "When you lose to me, don't be too hard\n"
.string "on yourself.\p" .string "on yourself.\p"
.string "It's not that you're weak--I'm just\n" .string "It's not that you're weak--I'm just\n"
@@ -443,7 +443,7 @@ MossdeepCity_Gym_Text_HannahPostBattle: @ 822116A
.string "Positive thinking--that's my strong\n" .string "Positive thinking--that's my strong\n"
.string "point!$" .string "point!$"
MossdeepCity_Gym_Text_SamanthaPreBattle: @ 82211E2 MossdeepCity_Gym_Text_SamanthaIntro: @ 82211E2
.string "I see it…\n" .string "I see it…\n"
.string "I see your future…\p" .string "I see your future…\p"
.string "If you can beat me, I will tell you\n" .string "If you can beat me, I will tell you\n"
@@ -458,7 +458,7 @@ MossdeepCity_Gym_Text_SamanthaPostBattle: @ 822123D
.string "The result…\n" .string "The result…\n"
.string "You won't hear it from me!$" .string "You won't hear it from me!$"
MossdeepCity_Gym_Text_MauraPreBattle: @ 82212A6 MossdeepCity_Gym_Text_MauraIntro: @ 82212A6
.string "The roads you have traveled…\n" .string "The roads you have traveled…\n"
.string "What you have experienced…\p" .string "What you have experienced…\p"
.string "Come at me with everything you've\n" .string "Come at me with everything you've\n"
@@ -474,7 +474,7 @@ MossdeepCity_Gym_Text_MauraPostBattle: @ 822132E
.string "only despair at the end.\p" .string "only despair at the end.\p"
.string "What goes around comes around…$" .string "What goes around comes around…$"
MossdeepCity_Gym_Text_SylviaPreBattle: @ 82213C2 MossdeepCity_Gym_Text_SylviaIntro: @ 82213C2
.string "Even at the risk of life, I will win\n" .string "Even at the risk of life, I will win\n"
.string "this battle!$" .string "this battle!$"
@@ -487,7 +487,7 @@ MossdeepCity_Gym_Text_SylviaPostBattle: @ 8221412
.string "It won't be my fault if something\n" .string "It won't be my fault if something\n"
.string "horrible befalls you…$" .string "horrible befalls you…$"
MossdeepCity_Gym_Text_NatePreBattle: @ 8221460 MossdeepCity_Gym_Text_NateIntro: @ 8221460
.string "Hohoho.\p" .string "Hohoho.\p"
.string "You need me to show you how tenacious\n" .string "You need me to show you how tenacious\n"
.string "the PSYCHIC type can be.$" .string "the PSYCHIC type can be.$"
@@ -500,7 +500,7 @@ MossdeepCity_Gym_Text_NatePostBattle: @ 82214D3
.string "I… I don't let defeat rattle m-me,\n" .string "I… I don't let defeat rattle m-me,\n"
.string "however b-badly.$" .string "however b-badly.$"
MossdeepCity_Gym_Text_KathleenPreBattle: @ 8221507 MossdeepCity_Gym_Text_KathleenIntro: @ 8221507
.string "Let me show you a perfectly awful,\n" .string "Let me show you a perfectly awful,\n"
.string "horrifying time!$" .string "horrifying time!$"
@@ -511,7 +511,7 @@ MossdeepCity_Gym_Text_KathleenPostBattle: @ 8221545
.string "Your vitality is contagious!\n" .string "Your vitality is contagious!\n"
.string "Get away from me quickly!$" .string "Get away from me quickly!$"
MossdeepCity_Gym_Text_CliffordPreBattle: @ 822157C MossdeepCity_Gym_Text_CliffordIntro: @ 822157C
.string "I may be past my prime, but I suggest\n" .string "I may be past my prime, but I suggest\n"
.string "you not patronize me.$" .string "you not patronize me.$"
@@ -523,7 +523,7 @@ MossdeepCity_Gym_Text_CliffordPostBattle: @ 82215E2
.string "It seems that I could not overcome\n" .string "It seems that I could not overcome\n"
.string "your youthful energy.$" .string "your youthful energy.$"
MossdeepCity_Gym_Text_MaceyPreBattle: @ 822161B MossdeepCity_Gym_Text_MaceyIntro: @ 822161B
.string "You're not getting through to the end!\n" .string "You're not getting through to the end!\n"
.string "Not if I can help it!$" .string "Not if I can help it!$"
@@ -536,7 +536,7 @@ MossdeepCity_Gym_Text_MaceyPostBattle: @ 8221680
.string "not suitable for the PSYCHIC type!\p" .string "not suitable for the PSYCHIC type!\p"
.string "The way you battle is somehow brutal!$" .string "The way you battle is somehow brutal!$"
MossdeepCity_Gym_Text_NicholasPreBattle: @ 82216EE MossdeepCity_Gym_Text_NicholasIntro: @ 82216EE
.string "Wroooar! Have a taste of my super\n" .string "Wroooar! Have a taste of my super\n"
.string "POKéMON hard-battling power!$" .string "POKéMON hard-battling power!$"
@@ -548,7 +548,7 @@ MossdeepCity_Gym_Text_NicholasPostBattle: @ 822173A
.string "All right! I think I'll develop a special\n" .string "All right! I think I'll develop a special\n"
.string "invincible POKéMON power next.$" .string "invincible POKéMON power next.$"
MossdeepCity_Gym_Text_TateAndLizaPreBattle: @ 8221783 MossdeepCity_Gym_Text_TateAndLizaIntro: @ 8221783
.string "TATE: Hehehe… Were you surprised?\p" .string "TATE: Hehehe… Were you surprised?\p"
.string "LIZA: Fufufu… Were you surprised?\p" .string "LIZA: Fufufu… Were you surprised?\p"
.string "TATE: That there are two GYM LEADERS?\n" .string "TATE: That there are two GYM LEADERS?\n"
data/maps/MtChimney/scripts.inc
+15 -30
View File
@@ -184,8 +184,7 @@ MtChimney_Movement_ArchieExitNorth: @ 822EF9C
walk_down walk_down
step_end step_end
@ Unused MtChimney_Movement_Unused1: @ 822EFA6
MtChimney_Movement_22EFA6: @ 822EFA6
walk_down walk_down
walk_down walk_down
walk_down walk_down
@@ -205,8 +204,7 @@ MtChimney_Movement_22EFA6: @ 822EFA6
walk_down walk_down
step_end step_end
@ Unused MtChimney_Movement_Unused2: @ 822EFB8
MtChimney_Movement_22EFB8: @ 822EFB8
walk_down walk_down
walk_down walk_down
walk_down walk_down
@@ -217,8 +215,7 @@ MtChimney_Movement_22EFB8: @ 822EFB8
walk_down walk_down
step_end step_end
@ Unused MtChimney_Movement_Unused3: @ 822EFC1
MtChimney_Movement_22EFC1: @ 822EFC1
walk_right walk_right
walk_down walk_down
walk_down walk_down
@@ -235,8 +232,7 @@ MtChimney_Movement_22EFC1: @ 822EFC1
walk_down walk_down
step_end step_end
@ Unused MtChimney_Movement_Unused4: @ 822EFD0
MtChimney_Movement_22EFD0: @ 822EFD0
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
@@ -263,8 +259,7 @@ MtChimney_Movement_22EFD0: @ 822EFD0
walk_down walk_down
step_end step_end
@ Unused MtChimney_Movement_Unused5: @ 822EFE9
MtChimney_Movement_22EFE9: @ 822EFE9
delay_16 delay_16
delay_16 delay_16
delay_16 delay_16
@@ -277,8 +272,7 @@ MtChimney_Movement_22EFE9: @ 822EFE9
walk_down walk_down
step_end step_end
@ Unused MtChimney_Movement_Unused6: @ 822EFF4
MtChimney_Movement_22EFF4: @ 822EFF4
delay_16 delay_16
walk_left walk_left
walk_down walk_down
@@ -296,8 +290,7 @@ MtChimney_Movement_22EFF4: @ 822EFF4
walk_down walk_down
step_end step_end
@ Unused MtChimney_Movement_Unused7: @ 822F004
MtChimney_Movement_22F004: @ 822F004
delay_16 delay_16
walk_left walk_left
walk_left walk_left
@@ -316,8 +309,7 @@ MtChimney_Movement_22F004: @ 822F004
walk_down walk_down
step_end step_end
@ Unused MtChimney_Movement_Unused8: @ 822F015
MtChimney_Movement_22F015: @ 822F015
delay_16 delay_16
walk_down walk_down
walk_left walk_left
@@ -327,8 +319,7 @@ MtChimney_Movement_22F015: @ 822F015
walk_in_place_fastest_down walk_in_place_fastest_down
step_end step_end
@ Unused MtChimney_Movement_Unused9: @ 822F01D
MtChimney_Movement_22F01D: @ 822F01D
walk_down walk_down
walk_down walk_down
walk_down walk_down
@@ -344,13 +335,11 @@ MtChimney_Movement_22F01D: @ 822F01D
walk_down walk_down
step_end step_end
@ Unused MtChimney_Movement_Unused10: @ 822F02B
MtChimney_Movement_22F02B: @ 822F02B
walk_down walk_down
step_end step_end
@ Unused MtChimney_Movement_Unused11: @ 822F02D
MtChimney_Movement_22F02D: @ 822F02D
walk_down walk_down
walk_down walk_down
walk_down walk_down
@@ -360,8 +349,7 @@ MtChimney_Movement_22F02D: @ 822F02D
walk_down walk_down
step_end step_end
@ Unused MtChimney_Movement_Unused12: @ 822F035
MtChimney_Movement_22F035: @ 822F035
delay_16 delay_16
delay_16 delay_16
walk_in_place_fastest_left walk_in_place_fastest_left
@@ -373,8 +361,7 @@ MtChimney_Movement_22F035: @ 822F035
walk_down walk_down
step_end step_end
@ Unused MtChimney_Movement_Unused13: @ 822F03F
MtChimney_Movement_22F03F: @ 822F03F
delay_16 delay_16
delay_16 delay_16
delay_16 delay_16
@@ -387,16 +374,14 @@ MtChimney_Movement_22F03F: @ 822F03F
walk_down walk_down
step_end step_end
@ Unused MtChimney_Movement_Unused14: @ 822F04A
MtChimney_Movement_22F04A: @ 822F04A
lock_facing_direction lock_facing_direction
walk_fast_left walk_fast_left
unlock_facing_direction unlock_facing_direction
face_right face_right
step_end step_end
@ Unused MtChimney_Movement_Unused15: @ 822F04F
MtChimney_Movement_22F04F: @ 822F04F
walk_left walk_left
walk_in_place_fastest_right walk_in_place_fastest_right
delay_16 delay_16
data/maps/PetalburgCity/scripts.inc
+2 -1
View File
@@ -351,7 +351,8 @@ PetalburgCity_EventScript_LeadPlayerToGym3:: @ 81DC5FF
waitmovement 0 waitmovement 0
return return
PetalburgCity_Movement_1DC611:: @ 81DC611 @ Unused
PetalburgCity_Movement_Delay48:: @ 81DC611
delay_16 delay_16
delay_16 delay_16
delay_16 delay_16
data/maps/PetalburgCity_Gym/scripts.inc
+17 -18
View File
@@ -411,7 +411,7 @@ PetalburgCity_Gym_EventScript_GiveEnigmaBerry:: @ 8204E1D
end end
PetalburgCity_Gym_EventScript_NormanBattle:: @ 8204E3B PetalburgCity_Gym_EventScript_NormanBattle:: @ 8204E3B
msgbox PetalburgCity_Gym_Text_NormanPreBattle, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_NormanIntro, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_NORMAN_1, PetalburgCity_Gym_Text_NormanDefeat trainerbattle_no_intro TRAINER_NORMAN_1, PetalburgCity_Gym_Text_NormanDefeat
message PetalburgCity_Gym_Text_ReceivedBalanceBadge message PetalburgCity_Gym_Text_ReceivedBalanceBadge
waitmessage waitmessage
@@ -673,8 +673,7 @@ PetalburgCity_Gym_Movement_WallysUncleApproachPlayerWest: @ 82050D0
walk_up walk_up
step_end step_end
@ Unused PetalburgCity_Gym_Movement_Unused: @ 82050D8
PetalburgCity_Gym_Movement_2050D8: @ 82050D8
walk_in_place_fastest_up walk_in_place_fastest_up
delay_16 delay_16
delay_16 delay_16
@@ -959,7 +958,7 @@ PetalburgCity_Gym_EventScript_RightGymLeadersRoomDoor:: @ 8205387
end end
PetalburgCity_Gym_EventScript_Randall:: @ 82053BA PetalburgCity_Gym_EventScript_Randall:: @ 82053BA
trainerbattle_single TRAINER_RANDALL, PetalburgCity_Gym_Text_RandallPreBattle, PetalburgCity_Gym_Text_RandallDefeat, PetalburgCity_Gym_EventScript_SlideOpenSpeedRoomDoors trainerbattle_single TRAINER_RANDALL, PetalburgCity_Gym_Text_RandallIntro, PetalburgCity_Gym_Text_RandallDefeat, PetalburgCity_Gym_EventScript_SlideOpenSpeedRoomDoors
goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_RandallPostBadge goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_RandallPostBadge
msgbox PetalburgCity_Gym_Text_RandallPostBattle, MSGBOX_AUTOCLOSE msgbox PetalburgCity_Gym_Text_RandallPostBattle, MSGBOX_AUTOCLOSE
end end
@@ -976,7 +975,7 @@ PetalburgCity_Gym_EventScript_RandallPostBadge:: @ 82053ED
end end
PetalburgCity_Gym_EventScript_Parker:: @ 82053F6 PetalburgCity_Gym_EventScript_Parker:: @ 82053F6
trainerbattle_single TRAINER_PARKER, PetalburgCity_Gym_Text_ParkerPreBattle, PetalburgCity_Gym_Text_ParkerDefeat, PetalburgCity_Gym_EventScript_SlideOpenConfusionRoomDoors trainerbattle_single TRAINER_PARKER, PetalburgCity_Gym_Text_ParkerIntro, PetalburgCity_Gym_Text_ParkerDefeat, PetalburgCity_Gym_EventScript_SlideOpenConfusionRoomDoors
goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_ParkerPostBadge goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_ParkerPostBadge
msgbox PetalburgCity_Gym_Text_ParkerPostBattle, MSGBOX_AUTOCLOSE msgbox PetalburgCity_Gym_Text_ParkerPostBattle, MSGBOX_AUTOCLOSE
end end
@@ -993,7 +992,7 @@ PetalburgCity_Gym_EventScript_ParkerPostBadge:: @ 8205429
end end
PetalburgCity_Gym_EventScript_George:: @ 8205432 PetalburgCity_Gym_EventScript_George:: @ 8205432
trainerbattle_single TRAINER_GEORGE, PetalburgCity_Gym_Text_GeorgePreBattle, PetalburgCity_Gym_Text_GeorgeDefeat, PetalburgCity_Gym_EventScript_SlideOpenRecoveryRoomDoors trainerbattle_single TRAINER_GEORGE, PetalburgCity_Gym_Text_GeorgeIntro, PetalburgCity_Gym_Text_GeorgeDefeat, PetalburgCity_Gym_EventScript_SlideOpenRecoveryRoomDoors
goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_GeorgePostBadge goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_GeorgePostBadge
msgbox PetalburgCity_Gym_Text_GeorgePostBattle, MSGBOX_AUTOCLOSE msgbox PetalburgCity_Gym_Text_GeorgePostBattle, MSGBOX_AUTOCLOSE
end end
@@ -1010,7 +1009,7 @@ PetalburgCity_Gym_EventScript_GeorgePostBadge:: @ 8205465
end end
PetalburgCity_Gym_EventScript_Berke:: @ 820546E PetalburgCity_Gym_EventScript_Berke:: @ 820546E
trainerbattle_single TRAINER_BERKE, PetalburgCity_Gym_Text_BerkePreBattle, PetalburgCity_Gym_Text_BerkeDefeat, PetalburgCity_Gym_EventScript_SlideOpenOHKORoomDoors trainerbattle_single TRAINER_BERKE, PetalburgCity_Gym_Text_BerkeIntro, PetalburgCity_Gym_Text_BerkeDefeat, PetalburgCity_Gym_EventScript_SlideOpenOHKORoomDoors
goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_BerkePostBadge goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_BerkePostBadge
msgbox PetalburgCity_Gym_Text_BerkePostBattle, MSGBOX_AUTOCLOSE msgbox PetalburgCity_Gym_Text_BerkePostBattle, MSGBOX_AUTOCLOSE
end end
@@ -1027,7 +1026,7 @@ PetalburgCity_Gym_EventScript_BerkePostBadge:: @ 82054A1
end end
PetalburgCity_Gym_EventScript_Mary:: @ 82054AA PetalburgCity_Gym_EventScript_Mary:: @ 82054AA
trainerbattle_single TRAINER_MARY, PetalburgCity_Gym_Text_MaryPreBattle, PetalburgCity_Gym_Text_MaryDefeat, PetalburgCity_Gym_EventScript_SlideOpenAccuracyRoomDoors trainerbattle_single TRAINER_MARY, PetalburgCity_Gym_Text_MaryIntro, PetalburgCity_Gym_Text_MaryDefeat, PetalburgCity_Gym_EventScript_SlideOpenAccuracyRoomDoors
goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_MaryPostBadge goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_MaryPostBadge
msgbox PetalburgCity_Gym_Text_MaryPostBattle, MSGBOX_AUTOCLOSE msgbox PetalburgCity_Gym_Text_MaryPostBattle, MSGBOX_AUTOCLOSE
end end
@@ -1044,7 +1043,7 @@ PetalburgCity_Gym_EventScript_MaryPostBadge:: @ 82054DD
end end
PetalburgCity_Gym_EventScript_Alexia:: @ 82054E6 PetalburgCity_Gym_EventScript_Alexia:: @ 82054E6
trainerbattle_single TRAINER_ALEXIA, PetalburgCity_Gym_Text_AlexiaPreBattle, PetalburgCity_Gym_Text_AlexiaDefeat, PetalburgCity_Gym_EventScript_SlideOpenDefenseRoomDoors trainerbattle_single TRAINER_ALEXIA, PetalburgCity_Gym_Text_AlexiaIntro, PetalburgCity_Gym_Text_AlexiaDefeat, PetalburgCity_Gym_EventScript_SlideOpenDefenseRoomDoors
goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_AlexiaPostBadge goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_AlexiaPostBadge
msgbox PetalburgCity_Gym_Text_AlexiaPostBattle, MSGBOX_AUTOCLOSE msgbox PetalburgCity_Gym_Text_AlexiaPostBattle, MSGBOX_AUTOCLOSE
end end
@@ -1061,7 +1060,7 @@ PetalburgCity_Gym_EventScript_AlexiaPostBadge:: @ 8205519
end end
PetalburgCity_Gym_EventScript_Jody:: @ 8205522 PetalburgCity_Gym_EventScript_Jody:: @ 8205522
trainerbattle_single TRAINER_JODY, PetalburgCity_Gym_Text_JodyPreBattle, PetalburgCity_Gym_Text_JodyDefeat, PetalburgCity_Gym_EventScript_SlideOpenStrengthRoomDoors trainerbattle_single TRAINER_JODY, PetalburgCity_Gym_Text_JodyIntro, PetalburgCity_Gym_Text_JodyDefeat, PetalburgCity_Gym_EventScript_SlideOpenStrengthRoomDoors
goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_JodyPostBadge goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_JodyPostBadge
msgbox PetalburgCity_Gym_Text_JodyPostBattle, MSGBOX_AUTOCLOSE msgbox PetalburgCity_Gym_Text_JodyPostBattle, MSGBOX_AUTOCLOSE
end end
@@ -1358,7 +1357,7 @@ PetalburgCity_Gym_Text_YouHaveGottenStronger: @ 8205F87
.string "I can tell by the number of BADGES\n" .string "I can tell by the number of BADGES\n"
.string "that you've earned.$" .string "that you've earned.$"
PetalburgCity_Gym_Text_NormanPreBattle: @ 8205FE5 PetalburgCity_Gym_Text_NormanIntro: @ 8205FE5
.string "DAD: Hm…\n" .string "DAD: Hm…\n"
.string "So, you did get four GYM BADGES.\p" .string "So, you did get four GYM BADGES.\p"
.string "Fine, as I promised, we will have\n" .string "Fine, as I promised, we will have\n"
@@ -1454,7 +1453,7 @@ PetalburgCity_Gym_Text_GymGuidePostVictory: @ 82066F3
.string "Like, whoa!\n" .string "Like, whoa!\n"
.string "What a stunning turn of events!$" .string "What a stunning turn of events!$"
PetalburgCity_Gym_Text_RandallPreBattle: @ 820674F PetalburgCity_Gym_Text_RandallIntro: @ 820674F
.string "The ability to attack before the\n" .string "The ability to attack before the\n"
.string "opponent…\p" .string "opponent…\p"
.string "Just that alone puts me at a great\n" .string "Just that alone puts me at a great\n"
@@ -1477,7 +1476,7 @@ PetalburgCity_Gym_Text_RandallPostBadge: @ 820685E
.string "That's what I think being a\n" .string "That's what I think being a\n"
.string "GYM LEADER is all about.$" .string "GYM LEADER is all about.$"
PetalburgCity_Gym_Text_ParkerPreBattle: @ 82068FD PetalburgCity_Gym_Text_ParkerIntro: @ 82068FD
.string "This is the CONFUSION ROOM.\p" .string "This is the CONFUSION ROOM.\p"
.string "Let me see how well bonded you are\n" .string "Let me see how well bonded you are\n"
.string "with your POKéMON!$" .string "with your POKéMON!$"
@@ -1494,7 +1493,7 @@ PetalburgCity_Gym_Text_ParkerPostBadge: @ 82069D9
.string "After you beat our LEADER, the\n" .string "After you beat our LEADER, the\n"
.string "training has become a lot tougher.$" .string "training has become a lot tougher.$"
PetalburgCity_Gym_Text_GeorgePreBattle: @ 8206A1B PetalburgCity_Gym_Text_GeorgeIntro: @ 8206A1B
.string "Just when you think you're going to\n" .string "Just when you think you're going to\n"
.string "win, your opponent restores HP…\p" .string "win, your opponent restores HP…\p"
.string "Can you just imagine how awful that\n" .string "Can you just imagine how awful that\n"
@@ -1519,7 +1518,7 @@ PetalburgCity_Gym_Text_GeorgePostBadge: @ 8206BB1
.string "I'm going to keep training at GYMS.\n" .string "I'm going to keep training at GYMS.\n"
.string "One day, I'll become a LEADER.$" .string "One day, I'll become a LEADER.$"
PetalburgCity_Gym_Text_BerkePreBattle: @ 8206BF4 PetalburgCity_Gym_Text_BerkeIntro: @ 8206BF4
.string "I'm not going to take it easy just\n" .string "I'm not going to take it easy just\n"
.string "because you're our LEADER's kid.\p" .string "because you're our LEADER's kid.\p"
.string "I'll show you how horrid it is for\n" .string "I'll show you how horrid it is for\n"
@@ -1542,7 +1541,7 @@ PetalburgCity_Gym_Text_BerkePostBadge: @ 8206D56
.string "the TRAINERS of PETALBURG CITY have\l" .string "the TRAINERS of PETALBURG CITY have\l"
.string "become a lot tougher.$" .string "become a lot tougher.$"
PetalburgCity_Gym_Text_MaryPreBattle: @ 8206DB2 PetalburgCity_Gym_Text_MaryIntro: @ 8206DB2
.string "Giggle…\n" .string "Giggle…\n"
.string "This is the ACCURACY ROOM.\p" .string "This is the ACCURACY ROOM.\p"
.string "It's pretty nasty when every attack\n" .string "It's pretty nasty when every attack\n"
@@ -1565,7 +1564,7 @@ PetalburgCity_Gym_Text_MaryPostBadge: @ 8206ED8
.string "We're striving to become soul mates\n" .string "We're striving to become soul mates\n"
.string "with our POKéMON.$" .string "with our POKéMON.$"
PetalburgCity_Gym_Text_AlexiaPreBattle: @ 8206F44 PetalburgCity_Gym_Text_AlexiaIntro: @ 8206F44
.string "The higher the DEFENSE, the more\n" .string "The higher the DEFENSE, the more\n"
.string "reckless I can be in attack.$" .string "reckless I can be in attack.$"
@@ -1585,7 +1584,7 @@ PetalburgCity_Gym_Text_AlexiaPostBattle: @ 8206F9F
PetalburgCity_Gym_Text_AlexiaPostBadge: @ 8207069 PetalburgCity_Gym_Text_AlexiaPostBadge: @ 8207069
.string "Hi! Have you tried using SURF?$" .string "Hi! Have you tried using SURF?$"
PetalburgCity_Gym_Text_JodyPreBattle: @ 8207088 PetalburgCity_Gym_Text_JodyIntro: @ 8207088
.string "Our GYM LEADER told us to go all out\n" .string "Our GYM LEADER told us to go all out\n"
.string "and beat you.\p" .string "and beat you.\p"
.string "Even if you happen to be the\n" .string "Even if you happen to be the\n"
data/maps/Route110_TrickHouseEnd/scripts.inc
+2 -2
View File
@@ -13,7 +13,7 @@ Route110_TrickHouseEnd_OnResume: @ 826ACC4
Route110_TrickHouseEnd_OnTransition: @ 826ACD0 Route110_TrickHouseEnd_OnTransition: @ 826ACD0
setvar VAR_TEMP_1, 0 setvar VAR_TEMP_1, 0
setvar VAR_TEMP_2, 0 setvar VAR_TEMP_2, 0
special SetTrickHouseEndRoomFlag special SetTrickHouseNuggetFlag
end end
Route110_TrickHouseEnd_OnWarp: @ 826ACDE Route110_TrickHouseEnd_OnWarp: @ 826ACDE
@@ -171,7 +171,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle8:: @ 826AF28
call_if_eq Route110_TrickHouseEnd_EventScript_NoRoomForTent call_if_eq Route110_TrickHouseEnd_EventScript_NoRoomForTent
msgbox Route110_TrickHouseEnd_Text_LeavingOnJourney, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_LeavingOnJourney, MSGBOX_DEFAULT
call Route110_TrickHouseEnd_EventScript_TrickMasterExit call Route110_TrickHouseEnd_EventScript_TrickMasterExit
special ResetTrickHouseEndRoomFlag special ResetTrickHouseNuggetFlag
release release
end end
data/maps/Route128/scripts.inc
+2 -4
View File
@@ -78,13 +78,11 @@ Route128_EventScript_KyogreAwakenedScene:: @ 81F6B57
releaseall releaseall
end end
@ Unused Route128_Movement_Unused1: @ 81F6C76
Route128_Movement_1F6C76: @ 81F6C76
walk_fast_left walk_fast_left
step_end step_end
@ Unused Route128_Movement_Unused2: @ 81F6C78
Route128_Movement_1F6C78: @ 81F6C78
walk_left walk_left
walk_left walk_left
walk_left walk_left
data/maps/RustboroCity_DevonCorp_3F/scripts.inc
+1 -2
View File
@@ -72,8 +72,7 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E
releaseall releaseall
end end
@ Unused RustboroCity_DevonCorp_3F_Movement_Unused: @ 821252F
RustboroCity_DevonCorp_3F_Movement_21252F: @ 821252F
walk_up walk_up
walk_up walk_up
walk_up walk_up
data/maps/RustboroCity_Gym/scripts.inc
+8 -8
View File
@@ -2,7 +2,7 @@ RustboroCity_Gym_MapScripts:: @ 8212F30
.byte 0 .byte 0
RustboroCity_Gym_EventScript_Roxanne:: @ 8212F31 RustboroCity_Gym_EventScript_Roxanne:: @ 8212F31
trainerbattle_single TRAINER_ROXANNE_1, RustboroCity_Gym_Text_RoxannePreBattle, RustboroCity_Gym_Text_RoxanneDefeat, RustboroCity_Gym_EventScript_RoxanneDefeated, NO_MUSIC trainerbattle_single TRAINER_ROXANNE_1, RustboroCity_Gym_Text_RoxanneIntro, RustboroCity_Gym_Text_RoxanneDefeat, RustboroCity_Gym_EventScript_RoxanneDefeated, NO_MUSIC
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
goto_if_eq RustboroCity_Gym_EventScript_RoxanneRematch goto_if_eq RustboroCity_Gym_EventScript_RoxanneRematch
@@ -42,17 +42,17 @@ RustboroCity_Gym_EventScript_RoxanneRematch:: @ 8212FC8
end end
RustboroCity_Gym_EventScript_Josh:: @ 8212FE3 RustboroCity_Gym_EventScript_Josh:: @ 8212FE3
trainerbattle_single TRAINER_JOSH, RustboroCity_Gym_Text_JoshPreBattle, RustboroCity_Gym_Text_JoshDefeat trainerbattle_single TRAINER_JOSH, RustboroCity_Gym_Text_JoshIntro, RustboroCity_Gym_Text_JoshDefeat
msgbox RustboroCity_Gym_Text_JoshPostBattle, MSGBOX_AUTOCLOSE msgbox RustboroCity_Gym_Text_JoshPostBattle, MSGBOX_AUTOCLOSE
end end
RustboroCity_Gym_EventScript_Tommy:: @ 8212FFA RustboroCity_Gym_EventScript_Tommy:: @ 8212FFA
trainerbattle_single TRAINER_TOMMY, RustboroCity_Gym_Text_TommyPreBattle, RustboroCity_Gym_Text_TommyDefeat trainerbattle_single TRAINER_TOMMY, RustboroCity_Gym_Text_TommyIntro, RustboroCity_Gym_Text_TommyDefeat
msgbox RustboroCity_Gym_Text_TommyPostBattle, MSGBOX_AUTOCLOSE msgbox RustboroCity_Gym_Text_TommyPostBattle, MSGBOX_AUTOCLOSE
end end
RustboroCity_Gym_EventScript_Marc:: @ 8213011 RustboroCity_Gym_EventScript_Marc:: @ 8213011
trainerbattle_single TRAINER_MARC, RustboroCity_Gym_Text_MarcPreBattle, RustboroCity_Gym_Text_MarcDefeat trainerbattle_single TRAINER_MARC, RustboroCity_Gym_Text_MarcIntro, RustboroCity_Gym_Text_MarcDefeat
msgbox RustboroCity_Gym_Text_MarcPostBattle, MSGBOX_AUTOCLOSE msgbox RustboroCity_Gym_Text_MarcPostBattle, MSGBOX_AUTOCLOSE
end end
@@ -140,7 +140,7 @@ RustboroCity_Gym_Text_GymGuidePostVictory: @ 82132E2
.string "the stairs to the CHAMPIONSHIP!\p" .string "the stairs to the CHAMPIONSHIP!\p"
.string "That's got to feel awesome!$" .string "That's got to feel awesome!$"
RustboroCity_Gym_Text_JoshPreBattle: @ 82133E9 RustboroCity_Gym_Text_JoshIntro: @ 82133E9
.string "Don't take us GYM TRAINERS lightly!\n" .string "Don't take us GYM TRAINERS lightly!\n"
.string "I'll show you why we're better!$" .string "I'll show you why we're better!$"
@@ -151,7 +151,7 @@ RustboroCity_Gym_Text_JoshPostBattle: @ 8213447
.string "You haven't seen anything of the ROCK\n" .string "You haven't seen anything of the ROCK\n"
.string "type's terrifying power!$" .string "type's terrifying power!$"
RustboroCity_Gym_Text_TommyPreBattle: @ 8213486 RustboroCity_Gym_Text_TommyIntro: @ 8213486
.string "If you can't beat me, you won't stand\n" .string "If you can't beat me, you won't stand\n"
.string "a chance against ROXANNE!$" .string "a chance against ROXANNE!$"
@@ -163,7 +163,7 @@ RustboroCity_Gym_Text_TommyPostBattle: @ 82134E6
.string "several times.\p" .string "several times.\p"
.string "You'd better be on your guard!$" .string "You'd better be on your guard!$"
RustboroCity_Gym_Text_MarcPreBattle: @ 8213533 RustboroCity_Gym_Text_MarcIntro: @ 8213533
.string "We might be in the middle of town,\n" .string "We might be in the middle of town,\n"
.string "but so what?\p" .string "but so what?\p"
.string "My ROCK POKéMON need room to\n" .string "My ROCK POKéMON need room to\n"
@@ -178,7 +178,7 @@ RustboroCity_Gym_Text_MarcPostBattle: @ 82135C0
.string "It took smarts and sense for her to\n" .string "It took smarts and sense for her to\n"
.string "pick the ROCK type at her young age.$" .string "pick the ROCK type at her young age.$"
RustboroCity_Gym_Text_RoxannePreBattle: @ 821362A RustboroCity_Gym_Text_RoxanneIntro: @ 821362A
.string "Hello, I am ROXANNE, the RUSTBORO\n" .string "Hello, I am ROXANNE, the RUSTBORO\n"
.string "POKéMON GYM LEADER.\p" .string "POKéMON GYM LEADER.\p"
.string "I became a GYM LEADER so that I might\n" .string "I became a GYM LEADER so that I might\n"
data/maps/RusturfTunnel/scripts.inc
+3 -6
View File
@@ -184,22 +184,19 @@ RusturfTunnel_Movement_PlayerWatchWandaExit: @ 822D02F
walk_in_place_fastest_right walk_in_place_fastest_right
step_end step_end
@ Unused RusturfTunnel_Movement_Unused1: @ 822D035
RusturfTunnel_Movement_22D035: @ 822D035
walk_left walk_left
walk_in_place_fastest_right walk_in_place_fastest_right
step_end step_end
@ Unused RusturfTunnel_Movement_Unused2: @ 822D038
RusturfTunnel_Movement_22D038: @ 822D038
walk_down walk_down
walk_in_place_fastest_up walk_in_place_fastest_up
delay_8 delay_8
walk_in_place_fastest_right walk_in_place_fastest_right
step_end step_end
@ Unused RusturfTunnel_Movement_Unused3: @ 822D03D
RusturfTunnel_Movement_22D03D: @ 822D03D
walk_up walk_up
walk_in_place_fastest_down walk_in_place_fastest_down
delay_8 delay_8
data/maps/SeafloorCavern_Room9/scripts.inc
+2 -4
View File
@@ -153,8 +153,7 @@ SeafloorCavern_Room9_Movement_ArchieApproachPlayer: @ 823502A
walk_right walk_right
step_end step_end
@ Unused SeafloorCavern_Room9_Movement_Unused1: @ 8235032
SeafloorCavern_Room9_Movement_235032: @ 8235032
walk_left walk_left
walk_left walk_left
step_end step_end
@@ -164,8 +163,7 @@ SeafloorCavern_Room9_Movement_ArchieListenMessage: @ 8235035
delay_16 delay_16
step_end step_end
@ Unused SeafloorCavern_Room9_Movement_Unused2: @ 8235038
SeafloorCavern_Room9_Movement_235038: @ 8235038
walk_right walk_right
step_end step_end
data/maps/SlateportCity/scripts.inc
+1 -2
View File
@@ -668,8 +668,7 @@ SlateportCity_Movement_TyExit: @ 81DD326
walk_left walk_left
step_end step_end
@ Unused SlateportCity_Movement_Unused: @ 81DD334
SlateportCity_Movement_1DD334: @ 81DD334
walk_down walk_down
walk_in_place_fastest_up walk_in_place_fastest_up
step_end step_end
data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
+1 -2
View File
@@ -129,8 +129,7 @@ SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest: @ 820BCC2
walk_in_place_fastest_left walk_in_place_fastest_left
step_end step_end
@ Unused SlateportCity_OceanicMuseum_2F_Movement_Unused: @ 820BCC8
SlateportCity_OceanicMuseum_2F_Movement_20BCC8: @ 820BCC8
walk_up walk_up
walk_left walk_left
walk_left walk_left
data/maps/SootopolisCity_Gym_1F/scripts.inc
+2 -2
View File
@@ -83,7 +83,7 @@ SootopolisCity_Gym_1F_Movement_FallThroughIce: @ 8224F42
step_end step_end
SootopolisCity_Gym_1F_EventScript_Juan:: @ 8224F44 SootopolisCity_Gym_1F_EventScript_Juan:: @ 8224F44
trainerbattle_single TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_JuanPreBattle, SootopolisCity_Gym_1F_Text_JuanDefeat, SootopolisCity_Gym_1F_EventScript_JuanDefeated, NO_MUSIC trainerbattle_single TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_JuanIntro, SootopolisCity_Gym_1F_Text_JuanDefeat, SootopolisCity_Gym_1F_EventScript_JuanDefeated, NO_MUSIC
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
goto_if_eq SootopolisCity_Gym_1F_EventScript_JuanRematch goto_if_eq SootopolisCity_Gym_1F_EventScript_JuanRematch
@@ -200,7 +200,7 @@ SootopolisCity_Gym_1F_Text_GymGuidePostVictory: @ 82251AF
.string "If you've gotten all the BADGES, you're\n" .string "If you've gotten all the BADGES, you're\n"
.string "set for the POKéMON LEAGUE challenge!$" .string "set for the POKéMON LEAGUE challenge!$"
SootopolisCity_Gym_1F_Text_JuanPreBattle: @ 8225268 SootopolisCity_Gym_1F_Text_JuanIntro: @ 8225268
.string "Let me ask you.\n" .string "Let me ask you.\n"
.string "Did you know?\l" .string "Did you know?\l"
.string "Ah, I should not be so coy.\p" .string "Ah, I should not be so coy.\p"
data/maps/SootopolisCity_Gym_B1F/scripts.inc
+20 -20
View File
@@ -2,56 +2,56 @@ SootopolisCity_Gym_B1F_MapScripts:: @ 8225C8A
.byte 0 .byte 0
SootopolisCity_Gym_B1F_EventScript_Andrea:: @ 8225C8B SootopolisCity_Gym_B1F_EventScript_Andrea:: @ 8225C8B
trainerbattle_single TRAINER_ANDREA, SootopolisCity_Gym_B1F_Text_AndreaPreBattle, SootopolisCity_Gym_B1F_Text_AndreaDefeat trainerbattle_single TRAINER_ANDREA, SootopolisCity_Gym_B1F_Text_AndreaIntro, SootopolisCity_Gym_B1F_Text_AndreaDefeat
msgbox SootopolisCity_Gym_B1F_Text_AndreaPostBattle, MSGBOX_AUTOCLOSE msgbox SootopolisCity_Gym_B1F_Text_AndreaPostBattle, MSGBOX_AUTOCLOSE
end end
SootopolisCity_Gym_B1F_EventScript_Crissy:: @ 8225CA2 SootopolisCity_Gym_B1F_EventScript_Crissy:: @ 8225CA2
trainerbattle_single TRAINER_CRISSY, SootopolisCity_Gym_B1F_Text_CrissyPreBattle, SootopolisCity_Gym_B1F_Text_CrissyDefeat trainerbattle_single TRAINER_CRISSY, SootopolisCity_Gym_B1F_Text_CrissyIntro, SootopolisCity_Gym_B1F_Text_CrissyDefeat
msgbox SootopolisCity_Gym_B1F_Text_CrissyPostBattle, MSGBOX_AUTOCLOSE msgbox SootopolisCity_Gym_B1F_Text_CrissyPostBattle, MSGBOX_AUTOCLOSE
end end
SootopolisCity_Gym_B1F_EventScript_Brianna:: @ 8225CB9 SootopolisCity_Gym_B1F_EventScript_Brianna:: @ 8225CB9
trainerbattle_single TRAINER_BRIANNA, SootopolisCity_Gym_B1F_Text_BriannaPreBattle, SootopolisCity_Gym_B1F_Text_BriannaDefeat trainerbattle_single TRAINER_BRIANNA, SootopolisCity_Gym_B1F_Text_BriannaIntro, SootopolisCity_Gym_B1F_Text_BriannaDefeat
msgbox SootopolisCity_Gym_B1F_Text_BriannaPostBattle, MSGBOX_AUTOCLOSE msgbox SootopolisCity_Gym_B1F_Text_BriannaPostBattle, MSGBOX_AUTOCLOSE
end end
SootopolisCity_Gym_B1F_EventScript_Connie:: @ 8225CD0 SootopolisCity_Gym_B1F_EventScript_Connie:: @ 8225CD0
trainerbattle_single TRAINER_CONNIE, SootopolisCity_Gym_B1F_Text_ConniePreBattle, SootopolisCity_Gym_B1F_Text_ConnieDefeat trainerbattle_single TRAINER_CONNIE, SootopolisCity_Gym_B1F_Text_ConnieIntro, SootopolisCity_Gym_B1F_Text_ConnieDefeat
msgbox SootopolisCity_Gym_B1F_Text_ConniePostBattle, MSGBOX_AUTOCLOSE msgbox SootopolisCity_Gym_B1F_Text_ConniePostBattle, MSGBOX_AUTOCLOSE
end end
SootopolisCity_Gym_B1F_EventScript_Bridget:: @ 8225CE7 SootopolisCity_Gym_B1F_EventScript_Bridget:: @ 8225CE7
trainerbattle_single TRAINER_BRIDGET, SootopolisCity_Gym_B1F_Text_BridgetPreBattle, SootopolisCity_Gym_B1F_Text_BridgetDefeat trainerbattle_single TRAINER_BRIDGET, SootopolisCity_Gym_B1F_Text_BridgetIntro, SootopolisCity_Gym_B1F_Text_BridgetDefeat
msgbox SootopolisCity_Gym_B1F_Text_BridgetPostBattle, MSGBOX_AUTOCLOSE msgbox SootopolisCity_Gym_B1F_Text_BridgetPostBattle, MSGBOX_AUTOCLOSE
end end
SootopolisCity_Gym_B1F_EventScript_Olivia:: @ 8225CFE SootopolisCity_Gym_B1F_EventScript_Olivia:: @ 8225CFE
trainerbattle_single TRAINER_OLIVIA, SootopolisCity_Gym_B1F_Text_OliviaPreBattle, SootopolisCity_Gym_B1F_Text_OliviaDefeat trainerbattle_single TRAINER_OLIVIA, SootopolisCity_Gym_B1F_Text_OliviaIntro, SootopolisCity_Gym_B1F_Text_OliviaDefeat
msgbox SootopolisCity_Gym_B1F_Text_OliviaPostBattle, MSGBOX_AUTOCLOSE msgbox SootopolisCity_Gym_B1F_Text_OliviaPostBattle, MSGBOX_AUTOCLOSE
end end
SootopolisCity_Gym_B1F_EventScript_Tiffany:: @ 8225D15 SootopolisCity_Gym_B1F_EventScript_Tiffany:: @ 8225D15
trainerbattle_single TRAINER_TIFFANY, SootopolisCity_Gym_B1F_Text_TiffanyPreBattle, SootopolisCity_Gym_B1F_Text_TiffanyDefeat trainerbattle_single TRAINER_TIFFANY, SootopolisCity_Gym_B1F_Text_TiffanyIntro, SootopolisCity_Gym_B1F_Text_TiffanyDefeat
msgbox SootopolisCity_Gym_B1F_Text_TiffanyPostBattle, MSGBOX_AUTOCLOSE msgbox SootopolisCity_Gym_B1F_Text_TiffanyPostBattle, MSGBOX_AUTOCLOSE
end end
SootopolisCity_Gym_B1F_EventScript_Bethany:: @ 8225D2C SootopolisCity_Gym_B1F_EventScript_Bethany:: @ 8225D2C
trainerbattle_single TRAINER_BETHANY, SootopolisCity_Gym_B1F_Text_BethanyPreBattle, SootopolisCity_Gym_B1F_Text_BethanyDefeat trainerbattle_single TRAINER_BETHANY, SootopolisCity_Gym_B1F_Text_BethanyIntro, SootopolisCity_Gym_B1F_Text_BethanyDefeat
msgbox SootopolisCity_Gym_B1F_Text_BethanyPostBattle, MSGBOX_AUTOCLOSE msgbox SootopolisCity_Gym_B1F_Text_BethanyPostBattle, MSGBOX_AUTOCLOSE
end end
SootopolisCity_Gym_B1F_EventScript_Annika:: @ 8225D43 SootopolisCity_Gym_B1F_EventScript_Annika:: @ 8225D43
trainerbattle_single TRAINER_ANNIKA, SootopolisCity_Gym_B1F_Text_AnnikaPreBattle, SootopolisCity_Gym_B1F_Text_AnnikaDefeat trainerbattle_single TRAINER_ANNIKA, SootopolisCity_Gym_B1F_Text_AnnikaIntro, SootopolisCity_Gym_B1F_Text_AnnikaDefeat
msgbox SootopolisCity_Gym_B1F_Text_AnnikaPostBattle, MSGBOX_AUTOCLOSE msgbox SootopolisCity_Gym_B1F_Text_AnnikaPostBattle, MSGBOX_AUTOCLOSE
end end
SootopolisCity_Gym_B1F_EventScript_Daphne:: @ 8225D5A SootopolisCity_Gym_B1F_EventScript_Daphne:: @ 8225D5A
trainerbattle_single TRAINER_DAPHNE, SootopolisCity_Gym_B1F_Text_DaphnePreBattle, SootopolisCity_Gym_B1F_Text_DaphneDefeat trainerbattle_single TRAINER_DAPHNE, SootopolisCity_Gym_B1F_Text_DaphneIntro, SootopolisCity_Gym_B1F_Text_DaphneDefeat
msgbox SootopolisCity_Gym_B1F_Text_DaphnePostBattle, MSGBOX_AUTOCLOSE msgbox SootopolisCity_Gym_B1F_Text_DaphnePostBattle, MSGBOX_AUTOCLOSE
end end
SootopolisCity_Gym_B1F_Text_AndreaPreBattle: @ 8225D71 SootopolisCity_Gym_B1F_Text_AndreaIntro: @ 8225D71
.string "I'll show you the sublime techniques\n" .string "I'll show you the sublime techniques\n"
.string "I learned from our LEADER JUAN!$" .string "I learned from our LEADER JUAN!$"
@@ -62,7 +62,7 @@ SootopolisCity_Gym_B1F_Text_AndreaPostBattle: @ 8225DCF
.string "Watch what happens if you crack all\n" .string "Watch what happens if you crack all\n"
.string "the floor tiles.$" .string "the floor tiles.$"
SootopolisCity_Gym_B1F_Text_CrissyPreBattle: @ 8225E04 SootopolisCity_Gym_B1F_Text_CrissyIntro: @ 8225E04
.string "You came all the way here, but you won't\n" .string "You came all the way here, but you won't\n"
.string "get to see JUAN.\p" .string "get to see JUAN.\p"
.string "Not if you lose to me, you won't!$" .string "Not if you lose to me, you won't!$"
@@ -75,7 +75,7 @@ SootopolisCity_Gym_B1F_Text_CrissyPostBattle: @ 8225E90
.string "You might be good enough to avoid\n" .string "You might be good enough to avoid\n"
.string "being wiped out in one hit by JUAN.$" .string "being wiped out in one hit by JUAN.$"
SootopolisCity_Gym_B1F_Text_DaphnePreBattle: @ 8225ED6 SootopolisCity_Gym_B1F_Text_DaphneIntro: @ 8225ED6
.string "The sight of JUAN conducting\n" .string "The sight of JUAN conducting\n"
.string "a battle…\p" .string "a battle…\p"
.string "The very beauty of it compelled me to\n" .string "The very beauty of it compelled me to\n"
@@ -91,7 +91,7 @@ SootopolisCity_Gym_B1F_Text_DaphnePostBattle: @ 8225F67
.string "Oh… I'm so fortunate to have found\n" .string "Oh… I'm so fortunate to have found\n"
.string "POKéMON.$" .string "POKéMON.$"
SootopolisCity_Gym_B1F_Text_ConniePreBattle: @ 8225FBE SootopolisCity_Gym_B1F_Text_ConnieIntro: @ 8225FBE
.string "I should teach you how harsh battles\n" .string "I should teach you how harsh battles\n"
.string "can be.$" .string "can be.$"
@@ -104,7 +104,7 @@ SootopolisCity_Gym_B1F_Text_ConniePostBattle: @ 8225FFE
.string "If you want to reach JUAN, you\n" .string "If you want to reach JUAN, you\n"
.string "need to walk on each floor tile once.$" .string "need to walk on each floor tile once.$"
SootopolisCity_Gym_B1F_Text_BridgetPreBattle: @ 8226061 SootopolisCity_Gym_B1F_Text_BridgetIntro: @ 8226061
.string "The POKéMON GYM of the highest level\n" .string "The POKéMON GYM of the highest level\n"
.string "in the HOENN region…\p" .string "in the HOENN region…\p"
.string "That's the SOOTOPOLIS GYM.$" .string "That's the SOOTOPOLIS GYM.$"
@@ -118,7 +118,7 @@ SootopolisCity_Gym_B1F_Text_BridgetPostBattle: @ 82260D1
.string "other places will make you stronger.\l" .string "other places will make you stronger.\l"
.string "But above all, it looks more fun.$" .string "But above all, it looks more fun.$"
SootopolisCity_Gym_B1F_Text_OliviaPreBattle: @ 8226164 SootopolisCity_Gym_B1F_Text_OliviaIntro: @ 8226164
.string "I train my POKéMON together with\n" .string "I train my POKéMON together with\n"
.string "JUAN.\p" .string "JUAN.\p"
.string "Don't think I'm a pushover.$" .string "Don't think I'm a pushover.$"
@@ -130,7 +130,7 @@ SootopolisCity_Gym_B1F_Text_OliviaPostBattle: @ 82261B5
.string "I think you have potential.\n" .string "I think you have potential.\n"
.string "Why don't you stay and train with us?$" .string "Why don't you stay and train with us?$"
SootopolisCity_Gym_B1F_Text_TiffanyPreBattle: @ 82261F7 SootopolisCity_Gym_B1F_Text_TiffanyIntro: @ 82261F7
.string "A graceful glide across the ice while\n" .string "A graceful glide across the ice while\n"
.string "crossing no lines…\p" .string "crossing no lines…\p"
.string "A TRAINER putting on that performance\n" .string "A TRAINER putting on that performance\n"
@@ -144,7 +144,7 @@ SootopolisCity_Gym_B1F_Text_TiffanyPostBattle: @ 8226286
.string "you are as a TRAINER has nothing to do\l" .string "you are as a TRAINER has nothing to do\l"
.string "with how young or old you are.$" .string "with how young or old you are.$"
SootopolisCity_Gym_B1F_Text_BethanyPreBattle: @ 82262F3 SootopolisCity_Gym_B1F_Text_BethanyIntro: @ 82262F3
.string "When I'm with my POKéMON, the time\n" .string "When I'm with my POKéMON, the time\n"
.string "flies by before you can say, “Oops!”$" .string "flies by before you can say, “Oops!”$"
@@ -155,7 +155,7 @@ SootopolisCity_Gym_B1F_Text_BethanyPostBattle: @ 8226341
.string "I wish I could forget about lost causes\n" .string "I wish I could forget about lost causes\n"
.string "before I can manage an “Oops!”$" .string "before I can manage an “Oops!”$"
SootopolisCity_Gym_B1F_Text_AnnikaPreBattle: @ 8226388 SootopolisCity_Gym_B1F_Text_AnnikaIntro: @ 8226388
.string "I can battle with really rare POKéMON\n" .string "I can battle with really rare POKéMON\n"
.string "if you'd like.$" .string "if you'd like.$"
@@ -169,7 +169,7 @@ SootopolisCity_Gym_B1F_Text_AnnikaPostBattle: @ 82263F4
.string "Oh, if only I'd met JUAN years ago\n" .string "Oh, if only I'd met JUAN years ago\n"
.string "when I was younger…$" .string "when I was younger…$"
SootopolisCity_Gym_B1F_Text_BriannaPreBattle: @ 822646E SootopolisCity_Gym_B1F_Text_BriannaIntro: @ 822646E
.string "Giggle…\n" .string "Giggle…\n"
.string "Your grim look is so charming.$" .string "Your grim look is so charming.$"
data/scripts/cable_club.inc
+1 -1
View File
@@ -525,7 +525,7 @@ CableClub_EventScript_RecordCorner:: @ 82771DB
goto_if_eq CableClub_EventScript_AbortLink goto_if_eq CableClub_EventScript_AbortLink
message gText_PleaseWaitForLink message gText_PleaseWaitForLink
waitmessage waitmessage
special sub_80B2E74 special TryRecordMixLinkup
waitstate waitstate
special sub_80B2EA8 special sub_80B2EA8
waitstate waitstate
data/scripts/gabby_and_ty.inc
+10 -10
View File
@@ -149,61 +149,61 @@ GabbyAndTy_EventScript_TyBattle1:: @ 828CDF6
end end
GabbyAndTy_EventScript_GabbyBattle2:: @ 828CE16 GabbyAndTy_EventScript_GabbyBattle2:: @ 828CE16
trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
release release
end end
GabbyAndTy_EventScript_TyBattle2:: @ 828CE36 GabbyAndTy_EventScript_TyBattle2:: @ 828CE36
trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
release release
end end
GabbyAndTy_EventScript_GabbyBattle3:: @ 828CE56 GabbyAndTy_EventScript_GabbyBattle3:: @ 828CE56
trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
release release
end end
GabbyAndTy_EventScript_TyBattle3:: @ 828CE76 GabbyAndTy_EventScript_TyBattle3:: @ 828CE76
trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
release release
end end
GabbyAndTy_EventScript_GabbyBattle4:: @ 828CE96 GabbyAndTy_EventScript_GabbyBattle4:: @ 828CE96
trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
release release
end end
GabbyAndTy_EventScript_TyBattle4:: @ 828CEB6 GabbyAndTy_EventScript_TyBattle4:: @ 828CEB6
trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
release release
end end
GabbyAndTy_EventScript_GabbyBattle5:: @ 828CED6 GabbyAndTy_EventScript_GabbyBattle5:: @ 828CED6
trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
release release
end end
GabbyAndTy_EventScript_TyBattle5:: @ 828CEF6 GabbyAndTy_EventScript_TyBattle5:: @ 828CEF6
trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
release release
end end
GabbyAndTy_EventScript_GabbyBattle6:: @ 828CF16 GabbyAndTy_EventScript_GabbyBattle6:: @ 828CF16
trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
release release
end end
GabbyAndTy_EventScript_TyBattle6:: @ 828CF36 GabbyAndTy_EventScript_TyBattle6:: @ 828CF36
trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
release release
end end
data/scripts/mystery_event_club.inc
+1 -1
View File
@@ -41,7 +41,7 @@ MysteryEventClub_EventScript_CancelShowProfile:: @ 82915CB
MysteryEventClub_EventScript_ShowProfile:: @ 82915D5 MysteryEventClub_EventScript_ShowProfile:: @ 82915D5
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_811EECC special ShowEasyChatProfile
waitmessage waitmessage
delay 80 delay 80
msgbox MysteryEventClub_Text_FantasticProfile, MSGBOX_DEFAULT msgbox MysteryEventClub_Text_FantasticProfile, MSGBOX_DEFAULT
data/scripts/secret_base.inc
+31 -31
View File
@@ -346,7 +346,7 @@ SecretBase_EventScript_Trainer0:: @ 8275DD6
goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer0PreChampion goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer0PreChampion
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq SecretBase_EventScript_Trainer0PostBattle goto_if_eq SecretBase_EventScript_Trainer0PostBattle
msgbox SecretBase_Text_Trainer0PreBattle, MSGBOX_YESNO msgbox SecretBase_Text_Trainer0Intro, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_Trainer0DeclineBattle goto_if_eq SecretBase_EventScript_Trainer0DeclineBattle
setvar VAR_RESULT, 1 setvar VAR_RESULT, 1
@@ -364,7 +364,7 @@ SecretBase_EventScript_Trainer0PreChampion:: @ 8275E25
end end
SecretBase_EventScript_Trainer0DeclineBattle:: @ 8275E2F SecretBase_EventScript_Trainer0DeclineBattle:: @ 8275E2F
special sub_80EB300 special DeclinedSecretBaseBattle
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
special SetBattledOwnerFromResult special SetBattledOwnerFromResult
msgbox SecretBase_Text_Trainer0DeclineBattle, MSGBOX_DEFAULT msgbox SecretBase_Text_Trainer0DeclineBattle, MSGBOX_DEFAULT
@@ -383,7 +383,7 @@ SecretBase_EventScript_Trainer1:: @ 8275E4E
goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer1PreChampion goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer1PreChampion
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq SecretBase_EventScript_Trainer1PostBattle goto_if_eq SecretBase_EventScript_Trainer1PostBattle
msgbox SecretBase_Text_Trainer1PreBattle, MSGBOX_YESNO msgbox SecretBase_Text_Trainer1Intro, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_Trainer1DeclineBattle goto_if_eq SecretBase_EventScript_Trainer1DeclineBattle
setvar VAR_RESULT, 1 setvar VAR_RESULT, 1
@@ -401,7 +401,7 @@ SecretBase_EventScript_Trainer1PreChampion:: @ 8275E9D
end end
SecretBase_EventScript_Trainer1DeclineBattle:: @ 8275EA7 SecretBase_EventScript_Trainer1DeclineBattle:: @ 8275EA7
special sub_80EB300 special DeclinedSecretBaseBattle
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
special SetBattledOwnerFromResult special SetBattledOwnerFromResult
msgbox SecretBase_Text_Trainer1DeclineBattle, MSGBOX_DEFAULT msgbox SecretBase_Text_Trainer1DeclineBattle, MSGBOX_DEFAULT
@@ -420,7 +420,7 @@ SecretBase_EventScript_Trainer2:: @ 8275EC6
goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer2PreChampion goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer2PreChampion
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq SecretBase_EventScript_Trainer2PostBattle goto_if_eq SecretBase_EventScript_Trainer2PostBattle
msgbox SecretBase_Text_Trainer2PreBattle, MSGBOX_YESNO msgbox SecretBase_Text_Trainer2Intro, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_Trainer2DeclineBattle goto_if_eq SecretBase_EventScript_Trainer2DeclineBattle
setvar VAR_RESULT, 1 setvar VAR_RESULT, 1
@@ -438,7 +438,7 @@ SecretBase_EventScript_Trainer2PreChampion:: @ 8275F15
end end
SecretBase_EventScript_Trainer2DeclineBattle:: @ 8275F1F SecretBase_EventScript_Trainer2DeclineBattle:: @ 8275F1F
special sub_80EB300 special DeclinedSecretBaseBattle
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
special SetBattledOwnerFromResult special SetBattledOwnerFromResult
msgbox SecretBase_Text_Trainer2DeclineBattle, MSGBOX_DEFAULT msgbox SecretBase_Text_Trainer2DeclineBattle, MSGBOX_DEFAULT
@@ -457,7 +457,7 @@ SecretBase_EventScript_Trainer3:: @ 8275F3E
goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer3PreChampion goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer3PreChampion
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq SecretBase_EventScript_Trainer3PostBattle goto_if_eq SecretBase_EventScript_Trainer3PostBattle
msgbox SecretBase_Text_Trainer3PreBattle, MSGBOX_YESNO msgbox SecretBase_Text_Trainer3Intro, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_Trainer3DeclineBattle goto_if_eq SecretBase_EventScript_Trainer3DeclineBattle
setvar VAR_RESULT, 1 setvar VAR_RESULT, 1
@@ -475,7 +475,7 @@ SecretBase_EventScript_Trainer3PreChampion:: @ 8275F8D
end end
SecretBase_EventScript_Trainer3DeclineBattle:: @ 8275F97 SecretBase_EventScript_Trainer3DeclineBattle:: @ 8275F97
special sub_80EB300 special DeclinedSecretBaseBattle
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
special SetBattledOwnerFromResult special SetBattledOwnerFromResult
msgbox SecretBase_Text_Trainer3DeclineBattle, MSGBOX_DEFAULT msgbox SecretBase_Text_Trainer3DeclineBattle, MSGBOX_DEFAULT
@@ -494,7 +494,7 @@ SecretBase_EventScript_Trainer4:: @ 8275FB6
goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer4PreChampion goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer4PreChampion
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq SecretBase_EventScript_Trainer4PostBattle goto_if_eq SecretBase_EventScript_Trainer4PostBattle
msgbox SecretBase_Text_Trainer4PreBattle, MSGBOX_YESNO msgbox SecretBase_Text_Trainer4Intro, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_Trainer4DeclineBattle goto_if_eq SecretBase_EventScript_Trainer4DeclineBattle
setvar VAR_RESULT, 1 setvar VAR_RESULT, 1
@@ -512,7 +512,7 @@ SecretBase_EventScript_Trainer4PreChampion:: @ 8276005
end end
SecretBase_EventScript_Trainer4DeclineBattle:: @ 827600F SecretBase_EventScript_Trainer4DeclineBattle:: @ 827600F
special sub_80EB300 special DeclinedSecretBaseBattle
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
special SetBattledOwnerFromResult special SetBattledOwnerFromResult
msgbox SecretBase_Text_Trainer4DeclineBattle, MSGBOX_DEFAULT msgbox SecretBase_Text_Trainer4DeclineBattle, MSGBOX_DEFAULT
@@ -531,7 +531,7 @@ SecretBase_EventScript_Trainer5:: @ 827602E
goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer5PreChampion goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer5PreChampion
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq SecretBase_EventScript_Trainer5PostBattle goto_if_eq SecretBase_EventScript_Trainer5PostBattle
msgbox SecretBase_Text_Trainer5PreBattle, MSGBOX_YESNO msgbox SecretBase_Text_Trainer5Intro, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_Trainer5DeclineBattle goto_if_eq SecretBase_EventScript_Trainer5DeclineBattle
setvar VAR_RESULT, 1 setvar VAR_RESULT, 1
@@ -549,7 +549,7 @@ SecretBase_EventScript_Trainer5PreChampion:: @ 827607D
end end
SecretBase_EventScript_Trainer5DeclineBattle:: @ 8276087 SecretBase_EventScript_Trainer5DeclineBattle:: @ 8276087
special sub_80EB300 special DeclinedSecretBaseBattle
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
special SetBattledOwnerFromResult special SetBattledOwnerFromResult
msgbox SecretBase_Text_Trainer5DeclineBattle, MSGBOX_DEFAULT msgbox SecretBase_Text_Trainer5DeclineBattle, MSGBOX_DEFAULT
@@ -568,7 +568,7 @@ SecretBase_EventScript_Trainer6:: @ 82760A6
goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer6PreChampion goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer6PreChampion
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq SecretBase_EventScript_Trainer6PostBattle goto_if_eq SecretBase_EventScript_Trainer6PostBattle
msgbox SecretBase_Text_Trainer6PreBattle, MSGBOX_YESNO msgbox SecretBase_Text_Trainer6Intro, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_Trainer6DeclineBattle goto_if_eq SecretBase_EventScript_Trainer6DeclineBattle
setvar VAR_RESULT, 1 setvar VAR_RESULT, 1
@@ -586,7 +586,7 @@ SecretBase_EventScript_Trainer6PreChampion:: @ 82760F5
end end
SecretBase_EventScript_Trainer6DeclineBattle:: @ 82760FF SecretBase_EventScript_Trainer6DeclineBattle:: @ 82760FF
special sub_80EB300 special DeclinedSecretBaseBattle
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
special SetBattledOwnerFromResult special SetBattledOwnerFromResult
msgbox SecretBase_Text_Trainer6DeclineBattle, MSGBOX_DEFAULT msgbox SecretBase_Text_Trainer6DeclineBattle, MSGBOX_DEFAULT
@@ -605,7 +605,7 @@ SecretBase_EventScript_Trainer7:: @ 827611E
goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer7PreChampion goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer7PreChampion
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq SecretBase_EventScript_Trainer7PostBattle goto_if_eq SecretBase_EventScript_Trainer7PostBattle
msgbox SecretBase_Text_Trainer7PreBattle, MSGBOX_YESNO msgbox SecretBase_Text_Trainer7Intro, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_Trainer7DeclineBattle goto_if_eq SecretBase_EventScript_Trainer7DeclineBattle
setvar VAR_RESULT, 1 setvar VAR_RESULT, 1
@@ -623,7 +623,7 @@ SecretBase_EventScript_Trainer7PreChampion:: @ 827616D
end end
SecretBase_EventScript_Trainer7DeclineBattle:: @ 8276177 SecretBase_EventScript_Trainer7DeclineBattle:: @ 8276177
special sub_80EB300 special DeclinedSecretBaseBattle
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
special SetBattledOwnerFromResult special SetBattledOwnerFromResult
msgbox SecretBase_Text_Trainer7DeclineBattle, MSGBOX_DEFAULT msgbox SecretBase_Text_Trainer7DeclineBattle, MSGBOX_DEFAULT
@@ -642,7 +642,7 @@ SecretBase_EventScript_Trainer8:: @ 8276196
goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer8PreChampion goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer8PreChampion
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq SecretBase_EventScript_Trainer8PostBattle goto_if_eq SecretBase_EventScript_Trainer8PostBattle
msgbox SecretBase_Text_Trainer8PreBattle, MSGBOX_YESNO msgbox SecretBase_Text_Trainer8Intro, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_Trainer8DeclineBattle goto_if_eq SecretBase_EventScript_Trainer8DeclineBattle
setvar VAR_RESULT, 1 setvar VAR_RESULT, 1
@@ -660,7 +660,7 @@ SecretBase_EventScript_Trainer8PreChampion:: @ 82761E5
end end
SecretBase_EventScript_Trainer8DeclineBattle:: @ 82761EF SecretBase_EventScript_Trainer8DeclineBattle:: @ 82761EF
special sub_80EB300 special DeclinedSecretBaseBattle
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
special SetBattledOwnerFromResult special SetBattledOwnerFromResult
msgbox SecretBase_Text_Trainer8DeclineBattle, MSGBOX_DEFAULT msgbox SecretBase_Text_Trainer8DeclineBattle, MSGBOX_DEFAULT
@@ -679,7 +679,7 @@ SecretBase_EventScript_Trainer9:: @ 827620E
goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer9PreChampion goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer9PreChampion
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq SecretBase_EventScript_Trainer9PostBattle goto_if_eq SecretBase_EventScript_Trainer9PostBattle
msgbox SecretBase_Text_Trainer9PreBattle, MSGBOX_YESNO msgbox SecretBase_Text_Trainer9Intro, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_Trainer9DeclineBattle goto_if_eq SecretBase_EventScript_Trainer9DeclineBattle
setvar VAR_RESULT, 1 setvar VAR_RESULT, 1
@@ -697,7 +697,7 @@ SecretBase_EventScript_Trainer9PreChampion:: @ 827625D
end end
SecretBase_EventScript_Trainer9DeclineBattle:: @ 8276267 SecretBase_EventScript_Trainer9DeclineBattle:: @ 8276267
special sub_80EB300 special DeclinedSecretBaseBattle
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
special SetBattledOwnerFromResult special SetBattledOwnerFromResult
msgbox SecretBase_Text_Trainer9DeclineBattle, MSGBOX_DEFAULT msgbox SecretBase_Text_Trainer9DeclineBattle, MSGBOX_DEFAULT
@@ -716,35 +716,35 @@ SecretBase_EventScript_BattleTrainer:: @ 8276286
special DoSpecialTrainerBattle special DoSpecialTrainerBattle
waitstate waitstate
compare VAR_RESULT, B_OUTCOME_DREW compare VAR_RESULT, B_OUTCOME_DREW
call_if_eq SecretBase_EventScript_2762BD call_if_eq SecretBase_EventScript_DrewSecretBaseBattle
compare VAR_RESULT, B_OUTCOME_WON compare VAR_RESULT, B_OUTCOME_WON
call_if_eq SecretBase_EventScript_2762C1 call_if_eq SecretBase_EventScript_WonSecretBaseBattle
compare VAR_RESULT, B_OUTCOME_LOST compare VAR_RESULT, B_OUTCOME_LOST
call_if_eq SecretBase_EventScript_2762C5 call_if_eq SecretBase_EventScript_LostSecretBaseBattle
special HealPlayerParty special HealPlayerParty
release release
end end
SecretBase_EventScript_2762BD:: @ 82762BD SecretBase_EventScript_DrewSecretBaseBattle:: @ 82762BD
special sub_80EB438 special DrewSecretBaseBattle
return return
SecretBase_EventScript_2762C1:: @ 82762C1 SecretBase_EventScript_WonSecretBaseBattle:: @ 82762C1
special sub_80EB368 special WonSecretBaseBattle
return return
SecretBase_EventScript_2762C5:: @ 82762C5 SecretBase_EventScript_LostSecretBaseBattle:: @ 82762C5
special sub_80EB3D0 special LostSecretBaseBattle
return return
.include "data/scripts/secret_power_tm.inc" .include "data/scripts/secret_power_tm.inc"
SecretBase_EventScript_DollInteract:: @ 82766A2 SecretBase_EventScript_DollInteract:: @ 82766A2
special sub_80EB290 special CheckInteractedWithFriendsDollDecor
end end
SecretBase_EventScript_CushionInteract:: @ 82766A6 SecretBase_EventScript_CushionInteract:: @ 82766A6
special sub_80EB2C8 special CheckInteractedWithFriendsCushionDecor
end end
SecretBase_Text_AllDecorationsWillBeReturned: @ 82766AA SecretBase_Text_AllDecorationsWillBeReturned: @ 82766AA
data/scripts/shared_secret_base.inc
+10 -10
View File
@@ -157,33 +157,33 @@ SecretBase_EventScript_PCTurnOff:: @ 823B66E
end end
@ Unused @ Unused
SecretBase_EventScript_23B674:: @ 823B674 SecretBase_EventScript_Poster:: @ 823B674
special SetSecretBaseSecretsTvFlags_Poster special CheckInteractedWithFriendsPosterDecor
end end
@ Unused @ Unused
SecretBase_EventScript_23B678:: @ 823B678 SecretBase_EventScript_FurnitureBottom:: @ 823B678
special SetSecretBaseSecretsTvFlags_MiscFurnature special CheckInteractedWithFriendsFurnitureBottom
end end
@ Unused @ Unused
SecretBase_EventScript_23B67C:: @ 823B67C SecretBase_EventScript_FurnitureMiddle:: @ 823B67C
special SetSecretBaseSecretsTvFlags_LargeDecorationSpot special CheckInteractedWithFriendsFurnitureMiddle
end end
@ Unused @ Unused
SecretBase_EventScript_23B680:: @ 823B680 SecretBase_EventScript_FurnitureTop:: @ 823B680
special SetSecretBaseSecretsTvFlags_SmallDecorationSpot special CheckInteractedWithFriendsFurnitureTop
end end
SecretBase_EventScript_SandOrnament:: @ 823B684 SecretBase_EventScript_SandOrnament:: @ 823B684
special SetSecretBaseSecretsTvFlags_SandOrnament special CheckInteractedWithFriendsSandOrnament
dofieldeffect FLDEFF_SAND_PILLAR dofieldeffect FLDEFF_SAND_PILLAR
waitstate waitstate
end end
SecretBase_EventScript_ShieldOrToyTV:: @ 823B68C SecretBase_EventScript_ShieldOrToyTV:: @ 823B68C
special GetShieldToyTVDecorationInfo special InteractWithShieldOrTVDecoration
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq SecretBase_EventScript_BattleTowerShield goto_if_eq SecretBase_EventScript_BattleTowerShield
compare VAR_RESULT, 1 compare VAR_RESULT, 1
data/specials.inc
+24 -24
View File
@@ -28,7 +28,7 @@ gSpecials:: @ 81DBA64
def_special GetSecretBaseOwnerAndState def_special GetSecretBaseOwnerAndState
def_special InitSecretBaseDecorationSprites def_special InitSecretBaseDecorationSprites
def_special SetDecoration def_special SetDecoration
def_special sub_81297AC def_special GetEventObjectLocalIdByFlag
def_special GetSecretBaseTypeInFrontOfPlayer def_special GetSecretBaseTypeInFrontOfPlayer
def_special SetSecretBaseOwnerGfxId def_special SetSecretBaseOwnerGfxId
def_special sub_8129708 def_special sub_8129708
@@ -38,13 +38,13 @@ gSpecials:: @ 81DBA64
def_special RecordMixingPlayerSpotTriggered def_special RecordMixingPlayerSpotTriggered
def_special TryBattleLinkup def_special TryBattleLinkup
def_special TryTradeLinkup def_special TryTradeLinkup
def_special sub_80B2E74 def_special TryRecordMixLinkup
def_special sub_80B2EA8 def_special sub_80B2EA8
def_special CloseLink def_special CloseLink
def_special ColosseumPlayerSpotTriggered def_special ColosseumPlayerSpotTriggered
def_special PlayerEnteredTradeSeat def_special PlayerEnteredTradeSeat
def_special nullsub_37 def_special nullsub_37
def_special sub_80B3254 def_special CableClubSaveGame
def_special TryBerryBlenderLinkup def_special TryBerryBlenderLinkup
def_special GetLinkPartnerNames def_special GetLinkPartnerNames
def_special SpawnLinkPartnerObjectEvent def_special SpawnLinkPartnerObjectEvent
@@ -107,7 +107,7 @@ gSpecials:: @ 81DBA64
def_special SaveGame def_special SaveGame
def_special DoWateringBerryTreeAnim def_special DoWateringBerryTreeAnim
def_special ShowEasyChatScreen def_special ShowEasyChatScreen
def_special sub_811EECC def_special ShowEasyChatProfile
def_special ScrSpecial_GetCurrentMauvilleMan def_special ScrSpecial_GetCurrentMauvilleMan
def_special ScrSpecial_HasBardSongBeenChanged def_special ScrSpecial_HasBardSongBeenChanged
def_special ScrSpecial_SaveBardSongLyrics def_special ScrSpecial_SaveBardSongLyrics
@@ -139,7 +139,7 @@ gSpecials:: @ 81DBA64
def_special IsMonOTIDNotPlayers def_special IsMonOTIDNotPlayers
def_special BufferTrendyPhraseString def_special BufferTrendyPhraseString
def_special TrendyPhraseIsOld def_special TrendyPhraseIsOld
def_special sub_811EF6C def_special BufferDeepLinkPhrase
def_special GetDewfordHallPaintingNameIndex def_special GetDewfordHallPaintingNameIndex
def_special SwapRegisteredBike def_special SwapRegisteredBike
def_special CalculatePlayerPartyCount def_special CalculatePlayerPartyCount
@@ -147,7 +147,7 @@ gSpecials:: @ 81DBA64
def_special CountPartyAliveNonEggMons_IgnoreVar0x8004Slot def_special CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
def_special ShouldReadyContestArtist def_special ShouldReadyContestArtist
def_special SaveMuseumContestPainting def_special SaveMuseumContestPainting
def_special sub_80F8864 def_special DoesContestCategoryHaveWinner
def_special CountPlayerContestPaintings def_special CountPlayerContestPaintings
def_special ShowContestWinner def_special ShowContestWinner
def_special MauvilleGymSetDefaultBarriers def_special MauvilleGymSetDefaultBarriers
@@ -271,8 +271,8 @@ gSpecials:: @ 81DBA64
def_special RetrieveLotteryNumber def_special RetrieveLotteryNumber
def_special PickLotteryCornerTicket def_special PickLotteryCornerTicket
def_special ShowBerryBlenderRecordWindow def_special ShowBerryBlenderRecordWindow
def_special ResetTrickHouseEndRoomFlag def_special ResetTrickHouseNuggetFlag
def_special SetTrickHouseEndRoomFlag def_special SetTrickHouseNuggetFlag
def_special ScriptMenu_CreatePCMultichoice def_special ScriptMenu_CreatePCMultichoice
def_special AccessHallOfFamePC def_special AccessHallOfFamePC
def_special Special_ShowDiploma def_special Special_ShowDiploma
@@ -317,7 +317,7 @@ gSpecials:: @ 81DBA64
def_special ScriptCheckFreePokemonStorageSpace def_special ScriptCheckFreePokemonStorageSpace
def_special DoSealedChamberShakingEffect1 def_special DoSealedChamberShakingEffect1
def_special ShowDeptStoreElevatorFloorSelect def_special ShowDeptStoreElevatorFloorSelect
def_special GetShieldToyTVDecorationInfo def_special InteractWithShieldOrTVDecoration
def_special IsPokerusInParty def_special IsPokerusInParty
def_special SetSootopolisGymCrackedIceMetatiles def_special SetSootopolisGymCrackedIceMetatiles
def_special ShakeCamera def_special ShakeCamera
@@ -348,7 +348,7 @@ gSpecials:: @ 81DBA64
def_special HasAllHoennMons def_special HasAllHoennMons
def_special MonOTNameNotPlayer def_special MonOTNameNotPlayer
def_special BufferLottoTicketNumber def_special BufferLottoTicketNumber
def_special sub_81653CC def_special TryHideBattleTowerReporter
def_special DoesPartyHaveEnigmaBerry def_special DoesPartyHaveEnigmaBerry
def_special ScriptRandom def_special ScriptRandom
def_special SetChampionSaveWarp def_special SetChampionSaveWarp
@@ -361,17 +361,17 @@ gSpecials:: @ 81DBA64
def_special IncrementDailyPlantedBerries def_special IncrementDailyPlantedBerries
def_special IncrementDailyPickedBerries def_special IncrementDailyPickedBerries
def_special InitSecretBaseVars def_special InitSecretBaseVars
def_special SetSecretBaseSecretsTvFlags_SandOrnament def_special CheckInteractedWithFriendsSandOrnament
def_special sub_80EB300 def_special DeclinedSecretBaseBattle
def_special sub_80EB438 def_special DrewSecretBaseBattle
def_special sub_80EB368 def_special WonSecretBaseBattle
def_special sub_80EB3D0 def_special LostSecretBaseBattle
def_special sub_80EB290 def_special CheckInteractedWithFriendsDollDecor
def_special sub_80EB2C8 def_special CheckInteractedWithFriendsCushionDecor
def_special SetSecretBaseSecretsTvFlags_MiscFurnature def_special CheckInteractedWithFriendsFurnitureBottom
def_special SetSecretBaseSecretsTvFlags_LargeDecorationSpot def_special CheckInteractedWithFriendsFurnitureMiddle
def_special SetSecretBaseSecretsTvFlags_SmallDecorationSpot def_special CheckInteractedWithFriendsFurnitureTop
def_special SetSecretBaseSecretsTvFlags_Poster def_special CheckInteractedWithFriendsPosterDecor
def_special SetLilycoveLadyGfx def_special SetLilycoveLadyGfx
def_special Script_GetLilycoveLadyId def_special Script_GetLilycoveLadyId
def_special GetFavorLadyState def_special GetFavorLadyState
@@ -444,7 +444,7 @@ gSpecials:: @ 81DBA64
def_special GetDeptStoreDefaultFloorChoice def_special GetDeptStoreDefaultFloorChoice
def_special BufferVarsForIVRater def_special BufferVarsForIVRater
def_special LinkContestWaitForConnection def_special LinkContestWaitForConnection
def_special sub_800B518 def_special GetWirelessCommType
def_special LinkContestTryShowWirelessIndicator def_special LinkContestTryShowWirelessIndicator
def_special LinkContestTryHideWirelessIndicator def_special LinkContestTryHideWirelessIndicator
def_special IsWirelessContest def_special IsWirelessContest
@@ -498,7 +498,7 @@ gSpecials:: @ 81DBA64
def_special GetPCBoxToSendMon def_special GetPCBoxToSendMon
def_special ShouldShowBoxWasFullMessage def_special ShouldShowBoxWasFullMessage
def_special SetMatchCallRegisteredFlag def_special SetMatchCallRegisteredFlag
def_special sub_8175280 def_special DoConfettiEffect
def_special CreateAbnormalWeatherEvent def_special CreateAbnormalWeatherEvent
def_special GetAbnormalWeatherMapNameAndType def_special GetAbnormalWeatherMapNameAndType
def_special GetMartEmployeeObjectEventId def_special GetMartEmployeeObjectEventId
@@ -534,4 +534,4 @@ gSpecials:: @ 81DBA64
def_special TryPrepareSecondApproachingTrainer def_special TryPrepareSecondApproachingTrainer
def_special RemoveRecordsWindow def_special RemoveRecordsWindow
def_special CloseDeptStoreElevatorWindow def_special CloseDeptStoreElevatorWindow
def_special sub_80B3BC4 def_special TrySetBattleTowerLinkType
data/text/battle_dome.inc
+114 -114
View File
@@ -1,341 +1,341 @@
gBattleDomeOpponentPotentialText1:: BattleDome_Text_Potential1::
.string "The best candidate to be a champ!$" .string "The best candidate to be a champ!$"
gBattleDomeOpponentPotentialText2:: BattleDome_Text_Potential2::
.string "A sure-finalist team.$" .string "A sure-finalist team.$"
gBattleDomeOpponentPotentialText3:: BattleDome_Text_Potential3::
.string "A likely top-three finisher.$" .string "A likely top-three finisher.$"
gBattleDomeOpponentPotentialText4:: BattleDome_Text_Potential4::
.string "A candidate to finish first.$" .string "A candidate to finish first.$"
gBattleDomeOpponentPotentialText5:: BattleDome_Text_Potential5::
.string "A team with top-class potential.$" .string "A team with top-class potential.$"
gBattleDomeOpponentPotentialText6:: BattleDome_Text_Potential6::
.string "The dark horse team this tournament.$" .string "The dark horse team this tournament.$"
gBattleDomeOpponentPotentialText7:: BattleDome_Text_Potential7::
.string "A better-than-average team.$" .string "A better-than-average team.$"
gBattleDomeOpponentPotentialText8:: BattleDome_Text_Potential8::
.string "This tournament's average team.$" .string "This tournament's average team.$"
gBattleDomeOpponentPotentialText9:: BattleDome_Text_Potential9::
.string "A team with average potential.$" .string "A team with average potential.$"
gBattleDomeOpponentPotentialText10:: BattleDome_Text_Potential10::
.string "A weaker-than-average team.$" .string "A weaker-than-average team.$"
gBattleDomeOpponentPotentialText11:: BattleDome_Text_Potential11::
.string "A team looking for its first win.$" .string "A team looking for its first win.$"
gBattleDomeOpponentPotentialText12:: BattleDome_Text_Potential12::
.string "One win will make this team proud.$" .string "One win will make this team proud.$"
gBattleDomeOpponentPotentialText13:: BattleDome_Text_Potential13::
.string "Overall, a weak team.$" .string "Overall, a weak team.$"
gBattleDomeOpponentPotentialText14:: BattleDome_Text_Potential14::
.string "A team with very low potential.$" .string "A team with very low potential.$"
gBattleDomeOpponentPotentialText15:: BattleDome_Text_Potential15::
.string "A team unlikely to win the tournament.$" .string "A team unlikely to win the tournament.$"
gBattleDomeOpponentPotentialText16:: BattleDome_Text_Potential16::
.string "The team most unlikely to win.$" .string "The team most unlikely to win.$"
gBattleDomeOpponentPotentialText17:: BattleDome_Text_PotentialDomeAceTucker::
.string "The perfect, invincible superstar!$" .string "The perfect, invincible superstar!$"
gBattleDomeOpponentStyleText1:: BattleDome_Text_StyleRiskDisaster::
.string "Willing to risk total disaster at times.$" .string "Willing to risk total disaster at times.$"
gBattleDomeOpponentStyleText2:: BattleDome_Text_StyleEndureLongBattles::
.string "Skilled at enduring long battles.$" .string "Skilled at enduring long battles.$"
gBattleDomeOpponentStyleText3:: BattleDome_Text_StyleVariesTactics::
.string "Varies tactics to suit the opponent.$" .string "Varies tactics to suit the opponent.$"
gBattleDomeOpponentStyleText4:: BattleDome_Text_StyleToughWinningPattern::
.string "Has a tough winning pattern.$" .string "Has a tough winning pattern.$"
gBattleDomeOpponentStyleText5:: BattleDome_Text_StyleUsesVeryRareMove::
.string "Occasionally uses a very rare move.$" .string "Occasionally uses a very rare move.$"
gBattleDomeOpponentStyleText6:: BattleDome_Text_StyleUsesStartlingMoves::
.string "Uses startling and disruptive moves.$" .string "Uses startling and disruptive moves.$"
gBattleDomeOpponentStyleText7:: BattleDome_Text_StyleConstantlyWatchesHP::
.string "Constantly watches HP in battle.$" .string "Constantly watches HP in battle.$"
gBattleDomeOpponentStyleText8:: BattleDome_Text_StyleStoresAndLoosesPower::
.string "Good at storing then loosing power.$" .string "Good at storing then loosing power.$"
gBattleDomeOpponentStyleText9:: BattleDome_Text_StyleEnfeeblesFoes::
.string "Skilled at enfeebling foes.$" .string "Skilled at enfeebling foes.$"
gBattleDomeOpponentStyleText10:: BattleDome_Text_StylePrefersLuckTactics::
.string "Prefers tactics that rely on luck.$" .string "Prefers tactics that rely on luck.$"
gBattleDomeOpponentStyleText11:: BattleDome_Text_StyleRegalAtmosphere::
.string "Attacks with a regal atmosphere.$" .string "Attacks with a regal atmosphere.$"
gBattleDomeOpponentStyleText12:: BattleDome_Text_StylePowerfulLowPPMoves::
.string "Attacks with powerful, low-PP moves.$" .string "Attacks with powerful, low-PP moves.$"
gBattleDomeOpponentStyleText13:: BattleDome_Text_StyleEnfeebleThenAttack::
.string "Skilled at enfeebling, then attacking.$" .string "Skilled at enfeebling, then attacking.$"
gBattleDomeOpponentStyleText14:: BattleDome_Text_StyleBattlesWhileEnduring::
.string "Battles while enduring all attacks.$" .string "Battles while enduring all attacks.$"
gBattleDomeOpponentStyleText15:: BattleDome_Text_StyleUpsetsFoesEmotionally::
.string "Skilled at upsetting foes emotionally.$" .string "Skilled at upsetting foes emotionally.$"
gBattleDomeOpponentStyleText16:: BattleDome_Text_StyleStrongAndStraightforward::
.string "Uses strong and straightforward moves.$" .string "Uses strong and straightforward moves.$"
gBattleDomeOpponentStyleText17:: BattleDome_Text_StyleAggressivelyStrongMoves::
.string "Aggressively uses strong moves.$" .string "Aggressively uses strong moves.$"
gBattleDomeOpponentStyleText18:: BattleDome_Text_StyleCleverlyDodgesAttacks::
.string "Battles while cleverly dodging attacks.$" .string "Battles while cleverly dodging attacks.$"
gBattleDomeOpponentStyleText19:: BattleDome_Text_StyleUsesUpsettingMoves::
.string "Skilled at using upsetting attacks.$" .string "Skilled at using upsetting attacks.$"
gBattleDomeOpponentStyleText20:: BattleDome_Text_StyleUsesPopularMoves::
.string "Uses many popular moves.$" .string "Uses many popular moves.$"
gBattleDomeOpponentStyleText21:: BattleDome_Text_StyleHasPowerfulComboMoves::
.string "Has moves for powerful combinations.$" .string "Has moves for powerful combinations.$"
gBattleDomeOpponentStyleText22:: BattleDome_Text_StyleUsesHighProbabilityMoves::
.string "Uses high-probability attacks.$" .string "Uses high-probability attacks.$"
gBattleDomeOpponentStyleText23:: BattleDome_Text_StyleAggressivelySpectacularMoves::
.string "Aggressively uses spectacular moves.$" .string "Aggressively uses spectacular moves.$"
gBattleDomeOpponentStyleText24:: BattleDome_Text_StyleEmphasizesOffenseOverDefense::
.string "Emphasizes offense over defense.$" .string "Emphasizes offense over defense.$"
gBattleDomeOpponentStyleText25:: BattleDome_Text_StyleEmphasizesDefenseOverOffense::
.string "Emphasizes defense over offense.$" .string "Emphasizes defense over offense.$"
gBattleDomeOpponentStyleText26:: BattleDome_Text_StyleAttacksQuicklyStrongMoves::
.string "Attacks quickly with strong moves.$" .string "Attacks quickly with strong moves.$"
gBattleDomeOpponentStyleText27:: BattleDome_Text_StyleUsesAddedEffectMoves::
.string "Often uses moves with added effects.$" .string "Often uses moves with added effects.$"
gBattleDomeOpponentStyleText28:: BattleDome_Text_StyleUsesBalancedMixOfMoves::
.string "Uses a well-balanced mix of moves.$" .string "Uses a well-balanced mix of moves.$"
gBattleDomeOpponentStyleTextUnused1:: BattleDome_Text_StyleSampleMessage1::
.string "This is sample message 1.$" .string "This is sample message 1.$"
gBattleDomeOpponentStyleTextUnused2:: BattleDome_Text_StyleSampleMessage2::
.string "This is sample message 2.$" .string "This is sample message 2.$"
gBattleDomeOpponentStyleTextUnused3:: BattleDome_Text_StyleSampleMessage3::
.string "This is sample message 3.$" .string "This is sample message 3.$"
gBattleDomeOpponentStyleTextUnused4:: BattleDome_Text_StyleSampleMessage4::
.string "This is sample message 4.$" .string "This is sample message 4.$"
gBattleDomeOpponentStatsText1:: BattleDome_Text_EmphasizesHPAndAtk::
.string "Emphasizes HP and ATTACK.$" .string "Emphasizes HP and ATTACK.$"
gBattleDomeOpponentStatsText2:: BattleDome_Text_EmphasizesHPAndDef::
.string "Emphasizes HP and DEFENSE.$" .string "Emphasizes HP and DEFENSE.$"
gBattleDomeOpponentStatsText3:: BattleDome_Text_EmphasizesHPAndSpeed::
.string "Emphasizes HP and SPEED.$" .string "Emphasizes HP and SPEED.$"
gBattleDomeOpponentStatsText4:: BattleDome_Text_EmphasizesHPAndSpAtk::
.string "Emphasizes HP and SP. ATTACK.$" .string "Emphasizes HP and SP. ATTACK.$"
gBattleDomeOpponentStatsText5:: BattleDome_Text_EmphasizesHPAndSpDef::
.string "Emphasizes HP and SP. DEFENSE.$" .string "Emphasizes HP and SP. DEFENSE.$"
gBattleDomeOpponentStatsText6:: BattleDome_Text_EmphasizesAtkAndDef::
.string "Emphasizes ATTACK and DEFENSE.$" .string "Emphasizes ATTACK and DEFENSE.$"
gBattleDomeOpponentStatsText7:: BattleDome_Text_EmphasizesAtkAndSpeed::
.string "Emphasizes ATTACK and SPEED.$" .string "Emphasizes ATTACK and SPEED.$"
gBattleDomeOpponentStatsText8:: BattleDome_Text_EmphasizesAtkAndSpAtk::
.string "Emphasizes ATTACK and SP. ATTACK.$" .string "Emphasizes ATTACK and SP. ATTACK.$"
gBattleDomeOpponentStatsText9:: BattleDome_Text_EmphasizesAtkAndSpDef::
.string "Emphasizes ATTACK and SP. DEFENSE.$" .string "Emphasizes ATTACK and SP. DEFENSE.$"
gBattleDomeOpponentStatsText10:: BattleDome_Text_EmphasizesDefAndSpeed::
.string "Emphasizes DEFENSE and SPEED.$" .string "Emphasizes DEFENSE and SPEED.$"
gBattleDomeOpponentStatsText11:: BattleDome_Text_EmphasizesDefAndSpAtk::
.string "Emphasizes DEFENSE and SP. ATTACK.$" .string "Emphasizes DEFENSE and SP. ATTACK.$"
gBattleDomeOpponentStatsText12:: BattleDome_Text_EmphasizesDefAndSpDef::
.string "Emphasizes DEFENSE and SP. DEFENSE.$" .string "Emphasizes DEFENSE and SP. DEFENSE.$"
gBattleDomeOpponentStatsText13:: BattleDome_Text_EmphasizesSpeedAndSpAtk::
.string "Emphasizes SPEED and SP. ATTACK.$" .string "Emphasizes SPEED and SP. ATTACK.$"
gBattleDomeOpponentStatsText14:: BattleDome_Text_EmphasizesSpeedAndSpDef::
.string "Emphasizes SPEED and SP. DEFENSE.$" .string "Emphasizes SPEED and SP. DEFENSE.$"
gBattleDomeOpponentStatsText15:: BattleDome_Text_EmphasizesSpAtkAndSpDef::
.string "Emphasizes SP. ATTACK and SP. DEFENSE.$" .string "Emphasizes SP. ATTACK and SP. DEFENSE.$"
gBattleDomeOpponentStatsText16:: BattleDome_Text_EmphasizesHP::
.string "Emphasizes HP.$" .string "Emphasizes HP.$"
gBattleDomeOpponentStatsText17:: BattleDome_Text_EmphasizesAtk::
.string "Emphasizes ATTACK.$" .string "Emphasizes ATTACK.$"
gBattleDomeOpponentStatsText18:: BattleDome_Text_EmphasizesDef::
.string "Emphasizes DEFENSE.$" .string "Emphasizes DEFENSE.$"
gBattleDomeOpponentStatsText19:: BattleDome_Text_EmphasizesSpeed::
.string "Emphasizes SPEED.$" .string "Emphasizes SPEED.$"
gBattleDomeOpponentStatsText20:: BattleDome_Text_EmphasizesSpAtk::
.string "Emphasizes SP. ATTACK.$" .string "Emphasizes SP. ATTACK.$"
gBattleDomeOpponentStatsText21:: BattleDome_Text_EmphasizesSpDef::
.string "Emphasizes SP. DEFENSE.$" .string "Emphasizes SP. DEFENSE.$"
gBattleDomeOpponentStatsText22:: BattleDome_Text_NeglectsHPAndAtk::
.string "Neglects HP and ATTACK.$" .string "Neglects HP and ATTACK.$"
gBattleDomeOpponentStatsText23:: BattleDome_Text_NeglectsHPAndDef::
.string "Neglects HP and DEFENSE.$" .string "Neglects HP and DEFENSE.$"
gBattleDomeOpponentStatsText24:: BattleDome_Text_NeglectsHPAndSpeed::
.string "Neglects HP and SPEED.$" .string "Neglects HP and SPEED.$"
gBattleDomeOpponentStatsText25:: BattleDome_Text_NeglectsHPAndSpAtk::
.string "Neglects HP and SP. ATTACK.$" .string "Neglects HP and SP. ATTACK.$"
gBattleDomeOpponentStatsText26:: BattleDome_Text_NeglectsHPAndSpDef::
.string "Neglects HP and SP. DEFENSE.$" .string "Neglects HP and SP. DEFENSE.$"
gBattleDomeOpponentStatsText27:: BattleDome_Text_NeglectsAtkAndDef::
.string "Neglects ATTACK and DEFENSE.$" .string "Neglects ATTACK and DEFENSE.$"
gBattleDomeOpponentStatsText28:: BattleDome_Text_NeglectsAtkAndSpeed::
.string "Neglects ATTACK and SPEED.$" .string "Neglects ATTACK and SPEED.$"
gBattleDomeOpponentStatsText29:: BattleDome_Text_NeglectsAtkAndSpAtk::
.string "Neglects ATTACK and SP. ATTACK.$" .string "Neglects ATTACK and SP. ATTACK.$"
gBattleDomeOpponentStatsText30:: BattleDome_Text_NeglectsAtkAndSpDef::
.string "Neglects ATTACK and SP. DEFENSE.$" .string "Neglects ATTACK and SP. DEFENSE.$"
gBattleDomeOpponentStatsText31:: BattleDome_Text_NeglectsDefAndSpeed::
.string "Neglects DEFENSE and SPEED.$" .string "Neglects DEFENSE and SPEED.$"
gBattleDomeOpponentStatsText32:: BattleDome_Text_NeglectsDefAndSpAtk::
.string "Neglects DEFENSE and SP. ATTACK.$" .string "Neglects DEFENSE and SP. ATTACK.$"
gBattleDomeOpponentStatsText33:: BattleDome_Text_NeglectsDefAndSpDef::
.string "Neglects DEFENSE and SP. DEFENSE.$" .string "Neglects DEFENSE and SP. DEFENSE.$"
gBattleDomeOpponentStatsText34:: BattleDome_Text_NeglectsSpeedAndSpAtk::
.string "Neglects SPEED and SP. ATTACK.$" .string "Neglects SPEED and SP. ATTACK.$"
gBattleDomeOpponentStatsText35:: BattleDome_Text_NeglectsSpeedAndSpDef::
.string "Neglects SPEED and SP. DEFENSE.$" .string "Neglects SPEED and SP. DEFENSE.$"
gBattleDomeOpponentStatsText36:: BattleDome_Text_NeglectsSpAtkAndSpDef::
.string "Neglects SP. ATTACK and SP. DEFENSE.$" .string "Neglects SP. ATTACK and SP. DEFENSE.$"
gBattleDomeOpponentStatsText37:: BattleDome_Text_NeglectsHP::
.string "Neglects HP.$" .string "Neglects HP.$"
gBattleDomeOpponentStatsText38:: BattleDome_Text_NeglectsAtk::
.string "Neglects ATTACK.$" .string "Neglects ATTACK.$"
gBattleDomeOpponentStatsText39:: BattleDome_Text_NeglectsDef::
.string "Neglects DEFENSE.$" .string "Neglects DEFENSE.$"
gBattleDomeOpponentStatsText40:: BattleDome_Text_NeglectsSpeed::
.string "Neglects SPEED.$" .string "Neglects SPEED.$"
gBattleDomeOpponentStatsText41:: BattleDome_Text_NeglectsSpAtk::
.string "Neglects SP. ATTACK.$" .string "Neglects SP. ATTACK.$"
gBattleDomeOpponentStatsText42:: BattleDome_Text_NeglectsSpDef::
.string "Neglects SP. DEFENSE.$" .string "Neglects SP. DEFENSE.$"
gBattleDomeOpponentStatsText43:: BattleDome_Text_RaisesMonsWellBalanced::
.string "Raises POKéMON in a well-balanced way.$" .string "Raises POKéMON in a well-balanced way.$"
gBattleDomeWinText1:: BattleDome_Text_LetTheBattleBegin::
.string "Let the battle begin!$" .string "Let the battle begin!$"
gBattleDomeWinText2:: BattleDome_Text_TrainerWonUsingMove::
.string "{STR_VAR_1} won using {STR_VAR_2}!$" .string "{STR_VAR_1} won using {STR_VAR_2}!$"
gBattleDomeWinText3:: BattleDome_Text_TrainerBecameChamp::
.string "{STR_VAR_1} became the champ!$" .string "{STR_VAR_1} became the champ!$"
gBattleDomeWinText4:: BattleDome_Text_TrainerWonByDefault::
.string "{STR_VAR_1} won by default!$" .string "{STR_VAR_1} won by default!$"
gBattleDomeWinText5:: BattleDome_Text_TrainerWonOutrightByDefault::
.string "{STR_VAR_1} won outright by default!$" .string "{STR_VAR_1} won outright by default!$"
gBattleDomeWinText6:: BattleDome_Text_TrainerWonNoMoves::
.string "{STR_VAR_1} won without using a move!$" .string "{STR_VAR_1} won without using a move!$"
gBattleDomeWinText7:: BattleDome_Text_TrainerWonOutrightNoMoves::
.string "{STR_VAR_1} won outright with no moves!$" .string "{STR_VAR_1} won outright with no moves!$"
gBattleDomeMatchNumberText1:: BattleDome_Text_Round1Match1::
.string "Round 1, Match 1$" .string "Round 1, Match 1$"
gBattleDomeMatchNumberText2:: BattleDome_Text_Round1Match2::
.string "Round 1, Match 2$" .string "Round 1, Match 2$"
gBattleDomeMatchNumberText3:: BattleDome_Text_Round1Match3::
.string "Round 1, Match 3$" .string "Round 1, Match 3$"
gBattleDomeMatchNumberText4:: BattleDome_Text_Round1Match4::
.string "Round 1, Match 4$" .string "Round 1, Match 4$"
gBattleDomeMatchNumberText5:: BattleDome_Text_Round1Match5::
.string "Round 1, Match 5$" .string "Round 1, Match 5$"
gBattleDomeMatchNumberText6:: BattleDome_Text_Round1Match6::
.string "Round 1, Match 6$" .string "Round 1, Match 6$"
gBattleDomeMatchNumberText7:: BattleDome_Text_Round1Match7::
.string "Round 1, Match 7$" .string "Round 1, Match 7$"
gBattleDomeMatchNumberText8:: BattleDome_Text_Round1Match8::
.string "Round 1, Match 8$" .string "Round 1, Match 8$"
gBattleDomeMatchNumberText9:: BattleDome_Text_Round2Match1::
.string "Round 2, Match 1$" .string "Round 2, Match 1$"
gBattleDomeMatchNumberText10:: BattleDome_Text_Round2Match2::
.string "Round 2, Match 2$" .string "Round 2, Match 2$"
gBattleDomeMatchNumberText11:: BattleDome_Text_Round2Match3::
.string "Round 2, Match 3$" .string "Round 2, Match 3$"
gBattleDomeMatchNumberText12:: BattleDome_Text_Round2Match4::
.string "Round 2, Match 4$" .string "Round 2, Match 4$"
gBattleDomeMatchNumberText13:: BattleDome_Text_SemifinalMatch1::
.string "Semifinal Match 1$" .string "Semifinal Match 1$"
gBattleDomeMatchNumberText14:: BattleDome_Text_SemifinalMatch2::
.string "Semifinal Match 2$" .string "Semifinal Match 2$"
gBattleDomeMatchNumberText15:: BattleDome_Text_FinalMatch::
.string "Final Match$" .string "Final Match$"
data/text/secret_base_trainers.inc
+10 -10
View File
@@ -1,4 +1,4 @@
SecretBase_Text_Trainer0PreBattle: @ 82748A0 SecretBase_Text_Trainer0Intro: @ 82748A0
.string "Have you made a SECRET BASE already?\p" .string "Have you made a SECRET BASE already?\p"
.string "I went here, there, everywhere before\n" .string "I went here, there, everywhere before\n"
.string "choosing this place.\p" .string "choosing this place.\p"
@@ -27,7 +27,7 @@ SecretBase_Text_Trainer0PreChampion: @ 82749ED
.string "choosing this place.\p" .string "choosing this place.\p"
.string "Feel free to hang out!$" .string "Feel free to hang out!$"
SecretBase_Text_Trainer5PreBattle: @ 8274A64 SecretBase_Text_Trainer5Intro: @ 8274A64
.string "There're a lot of places where\n" .string "There're a lot of places where\n"
.string "you can make a SECRET BASE.\p" .string "you can make a SECRET BASE.\p"
.string "But I like this spot best.\n" .string "But I like this spot best.\n"
@@ -56,7 +56,7 @@ SecretBase_Text_Trainer5PreChampion: @ 8274BA2
.string "But I like this spot best.\n" .string "But I like this spot best.\n"
.string "Don't you think it's nice?$" .string "Don't you think it's nice?$"
SecretBase_Text_Trainer1PreBattle: @ 8274C13 SecretBase_Text_Trainer1Intro: @ 8274C13
.string "This is a popular spot.\n" .string "This is a popular spot.\n"
.string "It's always taken.\p" .string "It's always taken.\p"
.string "Oh! Were you thinking about\n" .string "Oh! Were you thinking about\n"
@@ -86,7 +86,7 @@ SecretBase_Text_Trainer1PreChampion: @ 8274D69
.string "I waited a long time for it to open.\n" .string "I waited a long time for it to open.\n"
.string "I finally got to use it!$" .string "I finally got to use it!$"
SecretBase_Text_Trainer6PreBattle: @ 8274DD2 SecretBase_Text_Trainer6Intro: @ 8274DD2
.string "Welcome to my POKéMON LAB.\p" .string "Welcome to my POKéMON LAB.\p"
.string "I carry out research on battling in\n" .string "I carry out research on battling in\n"
.string "secrecy.\p" .string "secrecy.\p"
@@ -112,7 +112,7 @@ SecretBase_Text_Trainer6PreChampion: @ 8274EF1
.string "I carry out research on battling in\n" .string "I carry out research on battling in\n"
.string "secrecy.$" .string "secrecy.$"
SecretBase_Text_Trainer2PreBattle: @ 8274F39 SecretBase_Text_Trainer2Intro: @ 8274F39
.string "A big mansion is nice, but I like this\n" .string "A big mansion is nice, but I like this\n"
.string "sort of place more.\p" .string "sort of place more.\p"
.string "I like it because all kinds of people\n" .string "I like it because all kinds of people\n"
@@ -141,7 +141,7 @@ SecretBase_Text_Trainer2PreChampion: @ 82750A4
.string "I like it because all kinds of people\n" .string "I like it because all kinds of people\n"
.string "come visit me.$" .string "come visit me.$"
SecretBase_Text_Trainer7PreBattle: @ 8275114 SecretBase_Text_Trainer7Intro: @ 8275114
.string "I simply adore shopping for decorations\n" .string "I simply adore shopping for decorations\n"
.string "and furniture.\p" .string "and furniture.\p"
.string "I also love raising POKéMON just\n" .string "I also love raising POKéMON just\n"
@@ -170,7 +170,7 @@ SecretBase_Text_Trainer7PreChampion: @ 8275226
.string "I also love raising POKéMON just\n" .string "I also love raising POKéMON just\n"
.string "as much.$" .string "as much.$"
SecretBase_Text_Trainer3PreBattle: @ 8275287 SecretBase_Text_Trainer3Intro: @ 8275287
.string "Some people make their SECRET BASES in\n" .string "Some people make their SECRET BASES in\n"
.string "hard-to-find places.\l" .string "hard-to-find places.\l"
.string "Do they want to just lie low?\p" .string "Do they want to just lie low?\p"
@@ -196,7 +196,7 @@ SecretBase_Text_Trainer3PreChampion: @ 82753AB
.string "hard-to-find places.\l" .string "hard-to-find places.\l"
.string "Do they want to just lie low?$" .string "Do they want to just lie low?$"
SecretBase_Text_Trainer8PreBattle: @ 8275405 SecretBase_Text_Trainer8Intro: @ 8275405
.string "People have told me that you can get\n" .string "People have told me that you can get\n"
.string "decorations in several ways.\p" .string "decorations in several ways.\p"
.string "We should have a race to see who can\n" .string "We should have a race to see who can\n"
@@ -224,7 +224,7 @@ SecretBase_Text_Trainer8PreChampion: @ 8275546
.string "We should have a race to see who can\n" .string "We should have a race to see who can\n"
.string "get nicer decorations and furniture!$" .string "get nicer decorations and furniture!$"
SecretBase_Text_Trainer4PreBattle: @ 82755D2 SecretBase_Text_Trainer4Intro: @ 82755D2
.string "I found a spot I liked, and I did it up\n" .string "I found a spot I liked, and I did it up\n"
.string "with my favorite decorations.\p" .string "with my favorite decorations.\p"
.string "I raise my favorite POKéMON and grow\n" .string "I raise my favorite POKéMON and grow\n"
@@ -253,7 +253,7 @@ SecretBase_Text_Trainer4PreChampion: @ 827571E
.string "stronger with it.\p" .string "stronger with it.\p"
.string "Every day is a great day.$" .string "Every day is a great day.$"
SecretBase_Text_Trainer9PreBattle: @ 82757B5 SecretBase_Text_Trainer9Intro: @ 82757B5
.string "You can learn a lot about the taste\n" .string "You can learn a lot about the taste\n"
.string "and sense of people by the kinds of\l" .string "and sense of people by the kinds of\l"
.string "decorations they have, and how they\l" .string "decorations they have, and how they\l"
data/text/tv.inc
+45 -45
View File
@@ -2079,7 +2079,7 @@ gTVWhatsNo1InHoennTodayText08:: @ 0828858B
.string "Viewers, take heart from {STR_VAR_1}!\n" .string "Viewers, take heart from {STR_VAR_1}!\n"
.string "You, too, can be no. 1 every day!$" .string "You, too, can be no. 1 every day!$"
gTVSecretBaseSecretsText00:: @ 08288608 TVSecretBaseSecrets_Text_Intro:: @ 08288608
.string "SECRET BASE SECRETS!\p" .string "SECRET BASE SECRETS!\p"
.string "What do TRAINERS do in the secrecy\n" .string "What do TRAINERS do in the secrecy\n"
.string "of SECRET BASES?\p" .string "of SECRET BASES?\p"
@@ -2090,88 +2090,88 @@ gTVSecretBaseSecretsText00:: @ 08288608
.string "Let's have a peek!\p" .string "Let's have a peek!\p"
.string "What will {STR_VAR_2} do?$" .string "What will {STR_VAR_2} do?$"
gTVSecretBaseSecretsText01:: @ 082886C8 TVSecretBaseSecrets_Text_WhatWillPlayerDoNext1:: @ 082886C8
.string "What will {STR_VAR_2} do next?$" .string "What will {STR_VAR_2} do next?$"
gTVSecretBaseSecretsText02:: @ 082886DE TVSecretBaseSecrets_Text_WhatWillPlayerDoNext2:: @ 082886DE
.string "And now, what will {STR_VAR_2} do?$" .string "And now, what will {STR_VAR_2} do?$"
gTVSecretBaseSecretsText03:: @ 082886F8 TVSecretBaseSecrets_Text_TookXStepsBeforeLeaving:: @ 082886F8
.string "In the end, {STR_VAR_2} took {STR_VAR_3} steps\n" .string "In the end, {STR_VAR_2} took {STR_VAR_3} steps\n"
.string "in {STR_VAR_1}'s SECRET BASE before\l" .string "in {STR_VAR_1}'s SECRET BASE before\l"
.string "leaving.$" .string "leaving.$"
gTVSecretBaseSecretsText04:: @ 08288739 TVSecretBaseSecrets_Text_BaseFailedToInterestPlayer:: @ 08288739
.string "Hmm…\p" .string "Hmm…\p"
.string "It appears as if {STR_VAR_1}'s SECRET\n" .string "It appears as if {STR_VAR_1}'s SECRET\n"
.string "BASE failed to interest {STR_VAR_2}…$" .string "BASE failed to interest {STR_VAR_2}…$"
gTVSecretBaseSecretsText05:: @ 08288777 TVSecretBaseSecrets_Text_PlayerEnjoyedBase:: @ 08288777
.string "{STR_VAR_2} appears to have enjoyed\n" .string "{STR_VAR_2} appears to have enjoyed\n"
.string "{STR_VAR_1}'s SECRET BASE thoroughly.$" .string "{STR_VAR_1}'s SECRET BASE thoroughly.$"
gTVSecretBaseSecretsText06:: @ 082887AF TVSecretBaseSecrets_Text_PlayerHugeFanOfBase:: @ 082887AF
.string "{STR_VAR_2} appears to have become\n" .string "{STR_VAR_2} appears to have become\n"
.string "a huge fan of {STR_VAR_1}'s\l" .string "a huge fan of {STR_VAR_1}'s\l"
.string "SECRET BASE.$" .string "SECRET BASE.$"
gTVSecretBaseSecretsText07:: @ 082887E9 TVSecretBaseSecrets_Text_Outro:: @ 082887E9
.string "Viewers may want to check out\n" .string "Viewers may want to check out\n"
.string "{STR_VAR_1}'s SECRET BASE, too.\p" .string "{STR_VAR_1}'s SECRET BASE, too.\p"
.string "Tune in next time as we visit another\n" .string "Tune in next time as we visit another\n"
.string "SECRET BASE! Thanks for joining us!$" .string "SECRET BASE! Thanks for joining us!$"
gTVSecretBaseSecretsText08:: @ 08288868 TVSecretBaseSecrets_Text_StoppedMoving1:: @ 08288868
.string "The visitor has stopped!\p" .string "The visitor has stopped!\p"
.string "The visitor isn't moving at all!\p" .string "The visitor isn't moving at all!\p"
.string "Was {STR_VAR_1}'s SECRET BASE\n" .string "Was {STR_VAR_1}'s SECRET BASE\n"
.string "that unimpressive?$" .string "that unimpressive?$"
gTVSecretBaseSecretsText09:: @ 082888CA TVSecretBaseSecrets_Text_StoppedMoving2:: @ 082888CA
.string "The visitor has stopped!\p" .string "The visitor has stopped!\p"
.string "The visitor isn't moving at all!\p" .string "The visitor isn't moving at all!\p"
.string "Is it fatigue?\n" .string "Is it fatigue?\n"
.string "Has the visitor grown weary?$" .string "Has the visitor grown weary?$"
gTVSecretBaseSecretsText10:: @ 08288930 TVSecretBaseSecrets_Text_UsedChair:: @ 08288930
.string "The visitor sat down on a chair!\n" .string "The visitor sat down on a chair!\n"
.string "The visitor is seated!\p" .string "The visitor is seated!\p"
.string "Look at that look of delight!\p" .string "Look at that look of delight!\p"
.string "That chair must be very comfortable\n" .string "That chair must be very comfortable\n"
.string "to get that response!$" .string "to get that response!$"
gTVSecretBaseSecretsText11:: @ 082889C0 TVSecretBaseSecrets_Text_UsedBalloon:: @ 082889C0
.string "The visitor charged at a balloon!\p" .string "The visitor charged at a balloon!\p"
.string "It burst!\n" .string "It burst!\n"
.string "Oh, my goodness, it popped!\p" .string "Oh, my goodness, it popped!\p"
.string "The visitor appears startled by\n" .string "The visitor appears startled by\n"
.string "the sudden noise!$" .string "the sudden noise!$"
gTVSecretBaseSecretsText12:: @ 08288A3A TVSecretBaseSecrets_Text_UsedTent:: @ 08288A3A
.string "The visitor entered a TENT!\p" .string "The visitor entered a TENT!\p"
.string "The visitor is running around!\p" .string "The visitor is running around!\p"
.string "Oh, my, the visitor is frolicking!\p" .string "Oh, my, the visitor is frolicking!\p"
.string "The visitor appears surprised by\n" .string "The visitor appears surprised by\n"
.string "the TENT's size!$" .string "the TENT's size!$"
gTVSecretBaseSecretsText13:: @ 08288ACA TVSecretBaseSecrets_Text_UsedPlant:: @ 08288ACA
.string "The visitor is examining\n" .string "The visitor is examining\n"
.string "a potted plant!\p" .string "a potted plant!\p"
.string "The visitor has surprisingly\n" .string "The visitor has surprisingly\n"
.string "mature taste!$" .string "mature taste!$"
gTVSecretBaseSecretsText14:: @ 08288B1E TVSecretBaseSecrets_Text_UsedGoldShield:: @ 08288B1E
.string "The visitor is examining\n" .string "The visitor is examining\n"
.string "a GOLD SHIELD!\p" .string "a GOLD SHIELD!\p"
.string "The visitor's eyes appear to be\n" .string "The visitor's eyes appear to be\n"
.string "lit up with wonder!$" .string "lit up with wonder!$"
gTVSecretBaseSecretsText15:: @ 08288B7A TVSecretBaseSecrets_Text_UsedSilverShield:: @ 08288B7A
.string "The visitor is examining\n" .string "The visitor is examining\n"
.string "a SILVER SHIELD!\p" .string "a SILVER SHIELD!\p"
.string "The visitor appears to be wide-eyed!$" .string "The visitor appears to be wide-eyed!$"
gTVSecretBaseSecretsText16:: @ 08288BC9 TVSecretBaseSecrets_Text_UsedGlassOrnament:: @ 08288BC9
.string "The visitor is examining\n" .string "The visitor is examining\n"
.string "a GLASS ORNAMENT!\p" .string "a GLASS ORNAMENT!\p"
.string "Oh, no!\p" .string "Oh, no!\p"
@@ -2179,15 +2179,15 @@ gTVSecretBaseSecretsText16:: @ 08288BC9
.string "It's getting covered with\n" .string "It's getting covered with\n"
.string "fingerprints…$" .string "fingerprints…$"
gTVSecretBaseSecretsText17:: @ 08288C40 TVSecretBaseSecrets_Text_UsedTV:: @ 08288C40
.string "The visitor is watching television!\p" .string "The visitor is watching television!\p"
.string "Looks like we have a big fan of TV!$" .string "Looks like we have a big fan of TV!$"
gTVSecretBaseSecretsText18:: @ 08288C88 TVSecretBaseSecrets_Text_UsedMudBall:: @ 08288C88
.string "The visitor stomped on a MUD BALL!\p" .string "The visitor stomped on a MUD BALL!\p"
.string "The visitor looks delighted!$" .string "The visitor looks delighted!$"
gTVSecretBaseSecretsText19:: @ 08288CC8 TVSecretBaseSecrets_Text_UsedBag:: @ 08288CC8
.string "…Oh?\p" .string "…Oh?\p"
.string "The visitor is reaching for their own\n" .string "The visitor is reaching for their own\n"
.string "BAG and rummaging about in it!\p" .string "BAG and rummaging about in it!\p"
@@ -2197,19 +2197,19 @@ gTVSecretBaseSecretsText19:: @ 08288CC8
.string "holding up the {STR_VAR_2}!\p" .string "holding up the {STR_VAR_2}!\p"
.string "It's like a TV commercial!$" .string "It's like a TV commercial!$"
gTVSecretBaseSecretsText20:: @ 08288D7F TVSecretBaseSecrets_Text_UsedCushion:: @ 08288D7F
.string "The visitor grabs a cushion and…$" .string "The visitor grabs a cushion and…$"
gTVSecretBaseSecretsText21:: @ 08288DA0 TVSecretBaseSecrets_Text_HitCushion:: @ 08288DA0
.string "…begins hitting it!\p" .string "…begins hitting it!\p"
.string "Is the visitor under a lot of stress?$" .string "Is the visitor under a lot of stress?$"
gTVSecretBaseSecretsText22:: @ 08288DDA TVSecretBaseSecrets_Text_HuggedCushion:: @ 08288DDA
.string "…hugs it tight!\p" .string "…hugs it tight!\p"
.string "Could the visitor be feeling happy\n" .string "Could the visitor be feeling happy\n"
.string "about something?$" .string "about something?$"
gTVSecretBaseSecretsText23:: @ 08288E1E TVSecretBaseSecrets_Text_BattledWon:: @ 08288E1E
.string "The visitor is chatting with\n" .string "The visitor is chatting with\n"
.string "{STR_VAR_1}!\p" .string "{STR_VAR_1}!\p"
.string "It looks like they're going to\n" .string "It looks like they're going to\n"
@@ -2220,7 +2220,7 @@ gTVSecretBaseSecretsText23:: @ 08288E1E
.string "The visitor is doing\n" .string "The visitor is doing\n"
.string "a victory dance!$" .string "a victory dance!$"
gTVSecretBaseSecretsText24:: @ 08288EC9 TVSecretBaseSecrets_Text_BattledLost:: @ 08288EC9
.string "The visitor is chatting with\n" .string "The visitor is chatting with\n"
.string "{STR_VAR_1}!\p" .string "{STR_VAR_1}!\p"
.string "It looks like they're going to\n" .string "It looks like they're going to\n"
@@ -2230,7 +2230,7 @@ gTVSecretBaseSecretsText24:: @ 08288EC9
.string "The visitor has lost!\p" .string "The visitor has lost!\p"
.string "The visitor looks dejected!$" .string "The visitor looks dejected!$"
gTVSecretBaseSecretsText25:: @ 08288F58 TVSecretBaseSecrets_Text_DeclinedBattle:: @ 08288F58
.string "The visitor is chatting with\n" .string "The visitor is chatting with\n"
.string "{STR_VAR_1}!\p" .string "{STR_VAR_1}!\p"
.string "It looks like they're going to\n" .string "It looks like they're going to\n"
@@ -2241,7 +2241,7 @@ gTVSecretBaseSecretsText25:: @ 08288F58
.string "Did the visitor find {STR_VAR_1}\n" .string "Did the visitor find {STR_VAR_1}\n"
.string "unappealing?$" .string "unappealing?$"
gTVSecretBaseSecretsText26:: @ 08289011 TVSecretBaseSecrets_Text_UsedPoster:: @ 08289011
.string "The visitor is staring intently\n" .string "The visitor is staring intently\n"
.string "at a poster!\p" .string "at a poster!\p"
.string "Is the poster to the visitor's\n" .string "Is the poster to the visitor's\n"
@@ -2249,12 +2249,12 @@ gTVSecretBaseSecretsText26:: @ 08289011
.string "…But… There's something disturbing\n" .string "…But… There's something disturbing\n"
.string "about the visitor's stares.$" .string "about the visitor's stares.$"
gTVSecretBaseSecretsText27:: @ 082890A4 TVSecretBaseSecrets_Text_UsedNoteMat:: @ 082890A4
.string "The visitor stepped on a NOTE MAT!\p" .string "The visitor stepped on a NOTE MAT!\p"
.string "…Hmm…\n" .string "…Hmm…\n"
.string "The visitor composed a funny tune!$" .string "The visitor composed a funny tune!$"
gTVSecretBaseSecretsText28:: @ 082890F0 TVSecretBaseSecrets_Text_BattledDraw:: @ 082890F0
.string "The visitor is chatting with\n" .string "The visitor is chatting with\n"
.string "{STR_VAR_1}!\p" .string "{STR_VAR_1}!\p"
.string "It looks like they're going to\n" .string "It looks like they're going to\n"
@@ -2265,14 +2265,14 @@ gTVSecretBaseSecretsText28:: @ 082890F0
.string "Both TRAINERS appear to be very\n" .string "Both TRAINERS appear to be very\n"
.string "disappointed!$" .string "disappointed!$"
gTVSecretBaseSecretsText29:: @ 08289193 TVSecretBaseSecrets_Text_UsedSpinMat:: @ 08289193
.string "The visitor stepped on\n" .string "The visitor stepped on\n"
.string "a SPIN MAT!\p" .string "a SPIN MAT!\p"
.string "It looks like the visitor is dizzy!\p" .string "It looks like the visitor is dizzy!\p"
.string "The visitor is tottering about!\n" .string "The visitor is tottering about!\n"
.string "Look out!$" .string "Look out!$"
gTVSecretBaseSecretsText30:: @ 08289204 TVSecretBaseSecrets_Text_UsedSandOrnament:: @ 08289204
.string "The visitor is reaching for\n" .string "The visitor is reaching for\n"
.string "a SAND ORNAMENT!\p" .string "a SAND ORNAMENT!\p"
.string "Oh!\p" .string "Oh!\p"
@@ -2281,7 +2281,7 @@ gTVSecretBaseSecretsText30:: @ 08289204
.string "The visitor looks sheepish\n" .string "The visitor looks sheepish\n"
.string "and guilty!$" .string "and guilty!$"
gTVSecretBaseSecretsText31:: @ 0828927C TVSecretBaseSecrets_Text_UsedDesk:: @ 0828927C
.string "The visitor is rubbing a desktop\n" .string "The visitor is rubbing a desktop\n"
.string "with their finger!\p" .string "with their finger!\p"
.string "Apparently, the visitor disapproves\n" .string "Apparently, the visitor disapproves\n"
@@ -2289,25 +2289,25 @@ gTVSecretBaseSecretsText31:: @ 0828927C
.string "The visitor is surprisingly concerned\n" .string "The visitor is surprisingly concerned\n"
.string "about neatness!$" .string "about neatness!$"
gTVSecretBaseSecretsText32:: @ 08289313 TVSecretBaseSecrets_Text_UsedBrick:: @ 08289313
.string "The visitor is staring at a BRICK!\p" .string "The visitor is staring at a BRICK!\p"
.string "Perhaps the visitor is thinking about\n" .string "Perhaps the visitor is thinking about\n"
.string "the object on the BRICK.$" .string "the object on the BRICK.$"
gTVSecretBaseSecretsText33:: @ 08289375 TVSecretBaseSecrets_Text_UsedSolidBoard:: @ 08289375
.string "The visitor is walking across\n" .string "The visitor is walking across\n"
.string "the SOLID BOARD.\p" .string "the SOLID BOARD.\p"
.string "The visitor keeps looking down.\p" .string "The visitor keeps looking down.\p"
.string "The visitor appears to be surprisingly\n" .string "The visitor appears to be surprisingly\n"
.string "timid and cautious!$" .string "timid and cautious!$"
gTVSecretBaseSecretsText34:: @ 082893FF TVSecretBaseSecrets_Text_UsedFence:: @ 082893FF
.string "The visitor is looking intently\n" .string "The visitor is looking intently\n"
.string "at a FENCE!\p" .string "at a FENCE!\p"
.string "Has a new idea for a trap popped\n" .string "Has a new idea for a trap popped\n"
.string "into the visitor's head?$" .string "into the visitor's head?$"
gTVSecretBaseSecretsText35:: @ 08289465 TVSecretBaseSecrets_Text_UsedGlitterMat:: @ 08289465
.string "The visitor stepped on\n" .string "The visitor stepped on\n"
.string "a GLITTER MAT!\p" .string "a GLITTER MAT!\p"
.string "The visitor is striking a variety\n" .string "The visitor is striking a variety\n"
@@ -2315,13 +2315,13 @@ gTVSecretBaseSecretsText35:: @ 08289465
.string "The visitor appears to be fantasizing\n" .string "The visitor appears to be fantasizing\n"
.string "about being an idol!$" .string "about being an idol!$"
gTVSecretBaseSecretsText36:: @ 082894F2 TVSecretBaseSecrets_Text_UsedTire:: @ 082894F2
.string "The visitor is staring intently\n" .string "The visitor is staring intently\n"
.string "at a TIRE!\p" .string "at a TIRE!\p"
.string "Could the visitor be thinking about\n" .string "Could the visitor be thinking about\n"
.string "the kind of car that would use it?$" .string "the kind of car that would use it?$"
gTVSecretBaseSecretsText37:: @ 08289564 TVSecretBaseSecrets_Text_UsedStand:: @ 08289564
.string "The visitor climbed a STAND!\p" .string "The visitor climbed a STAND!\p"
.string "The visitor is looking out across\n" .string "The visitor is looking out across\n"
.string "{STR_VAR_1}'s BASE from high up!\p" .string "{STR_VAR_1}'s BASE from high up!\p"
@@ -2329,16 +2329,16 @@ gTVSecretBaseSecretsText37:: @ 08289564
.string "Lets loose a roar!\n" .string "Lets loose a roar!\n"
.string "The visitor is roaring!$" .string "The visitor is roaring!$"
gTVSecretBaseSecretsText38:: @ 082895EB TVSecretBaseSecrets_Text_BrokeDoor:: @ 082895EB
.string "The visitor charged headlong into\n" .string "The visitor charged headlong into\n"
.string "a BREAKABLE DOOR!\p" .string "a BREAKABLE DOOR!\p"
.string "The visitor is laughing uproariously!$" .string "The visitor is laughing uproariously!$"
gTVSecretBaseSecretsText39:: @ 08289645 TVSecretBaseSecrets_Text_UsedDoll:: @ 08289645
.string "The visitor is talking to a DOLL!\p" .string "The visitor is talking to a DOLL!\p"
.string "…It's a little creepy…$" .string "…It's a little creepy…$"
gTVSecretBaseSecretsText40:: @ 0828967E TVSecretBaseSecrets_Text_UsedSlide:: @ 0828967E
.string "The visitor is climbing the ladder\n" .string "The visitor is climbing the ladder\n"
.string "on a SLIDE!\p" .string "on a SLIDE!\p"
.string "And…\p" .string "And…\p"
@@ -2346,7 +2346,7 @@ gTVSecretBaseSecretsText40:: @ 0828967E
.string "Looks like the visitor is having\n" .string "Looks like the visitor is having\n"
.string "a grand old time!$" .string "a grand old time!$"
gTVSecretBaseSecretsText41:: @ 082896FC TVSecretBaseSecrets_Text_UsedSlideButDidntGoDown:: @ 082896FC
.string "The visitor is climbing the ladder\n" .string "The visitor is climbing the ladder\n"
.string "on a SLIDE!\p" .string "on a SLIDE!\p"
.string "And…\p" .string "And…\p"
@@ -2354,7 +2354,7 @@ gTVSecretBaseSecretsText41:: @ 082896FC
.string "the ladder!\p" .string "the ladder!\p"
.string "Did the visitor suddenly chicken out?$" .string "Did the visitor suddenly chicken out?$"
gTVSecretBaseSecretsText42:: @ 0828977D TVSecretBaseSecrets_Text_UsedJumpMat:: @ 0828977D
.string "The visitor stepped on\n" .string "The visitor stepped on\n"
.string "a JUMP MAT!\p" .string "a JUMP MAT!\p"
.string "The visitor jumped once!\p" .string "The visitor jumped once!\p"
@@ -2700,7 +2700,7 @@ GabbyAndTy_Text_GabbyPreFirstBattle: @ 0828AF05
.string "Okay, roll camera!\n" .string "Okay, roll camera!\n"
.string "Let's get this interview.$" .string "Let's get this interview.$"
GabbyAndTy_Text_GabbyPreBattle: @ 0828AF7D GabbyAndTy_Text_GabbyIntro: @ 0828AF7D
.string "GABBY: Oh! You're {PLAYER}! Hi!\n" .string "GABBY: Oh! You're {PLAYER}! Hi!\n"
.string "Do you remember us from last time?\p" .string "Do you remember us from last time?\p"
.string "Can you show us how much stronger\n" .string "Can you show us how much stronger\n"
@@ -2806,7 +2806,7 @@ GabbyAndTy_Text_TyPreFirstBattle: @ 0828B75C
.string "TRAINER here, of all places!\l" .string "TRAINER here, of all places!\l"
.string "Camera's rolling!$" .string "Camera's rolling!$"
GabbyAndTy_Text_TyPreBattle: @ 0828B7B1 GabbyAndTy_Text_TyIntro: @ 0828B7B1
.string "TY: Hey, lookie here!\n" .string "TY: Hey, lookie here!\n"
.string "I remember you!\p" .string "I remember you!\p"
.string "I'll get this battle all on this\n" .string "I'll get this battle all on this\n"
graphics/battle_frontier/options_pal1.pal → graphics/battle_frontier/tourney.pal
View File
graphics/battle_frontier/options_pal2.pal → graphics/battle_frontier/tourney_buttons.pal
View File
graphics/battle_frontier/options.png → graphics/battle_frontier/tourney_buttons.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 576 B

After

Width:  |  Height:  |  Size: 576 B

graphics/battle_frontier/misc1.png → graphics/battle_frontier/tourney_info_card.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

graphics/unknown/unknown_D84F00.bin → graphics/battle_frontier/tourney_info_card_bg.bin
View File
graphics/unknown/unknown_D84970.bin → graphics/battle_frontier/tourney_info_card_tilemap.bin
View File
graphics/unknown/unknown_D83B2C.bin → graphics/battle_frontier/tourney_line_down_map.bin
View File
graphics/unknown/unknown_D83900.bin → graphics/battle_frontier/tourney_line_mask_map.bin
View File
graphics/unknown/unknown_D83C3C.bin → graphics/battle_frontier/tourney_line_up_map.bin
View File
graphics/battle_frontier/options_pal3.pal → graphics/battle_frontier/tourney_match_card_bg.pal
View File
include/battle_dome.h
+2 -2
View File
@@ -1,9 +1,9 @@
#ifndef GUARD_BATTLE_DOME_H #ifndef GUARD_BATTLE_DOME_H
#define GUARD_BATTLE_DOME_H #define GUARD_BATTLE_DOME_H
extern u32 gUnknown_0203CD70; extern u32 gPlayerPartyLostHP;
int GetDomeTrainerMonCountInBits(u16 tournamentTrainerId); int GetDomeTrainerSelectedMons(u16 tournamentTrainerId);
int TrainerIdToDomeTournamentId(u16 trainerId); int TrainerIdToDomeTournamentId(u16 trainerId);
#endif // GUARD_BATTLE_DOME_H #endif // GUARD_BATTLE_DOME_H
include/battle_tower.h
+9 -9
View File
@@ -8,8 +8,8 @@ struct RSBattleTowerRecord
/*0x02*/ u16 winStreak; /*0x02*/ u16 winStreak;
/*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1]; /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1];
/*0x0C*/ u8 trainerId[TRAINER_ID_LENGTH]; /*0x0C*/ u8 trainerId[TRAINER_ID_LENGTH];
/*0x10*/ u16 greeting[6]; /*0x10*/ u16 greeting[EASY_CHAT_BATTLE_WORDS_COUNT];
/*0x1C*/ struct BattleTowerPokemon party[3]; /*0x1C*/ struct BattleTowerPokemon party[FRONTIER_PARTY_SIZE];
/*0xA0*/ u32 checksum; /*0xA0*/ u32 checksum;
}; };
@@ -18,10 +18,10 @@ struct BattleFrontierTrainer
u8 facilityClass; u8 facilityClass;
u8 filler1[3]; u8 filler1[3];
u8 trainerName[PLAYER_NAME_LENGTH + 1]; u8 trainerName[PLAYER_NAME_LENGTH + 1];
u16 speechBefore[6]; u16 speechBefore[EASY_CHAT_BATTLE_WORDS_COUNT];
u16 speechWin[6]; u16 speechWin[EASY_CHAT_BATTLE_WORDS_COUNT];
u16 speechLose[6]; u16 speechLose[EASY_CHAT_BATTLE_WORDS_COUNT];
const u16 *monSets; const u16 *monSet;
}; };
struct FacilityMon struct FacilityMon
@@ -49,7 +49,7 @@ extern const struct BattleFrontierTrainer *gFacilityTrainers;
extern const struct FacilityMon *gFacilityTrainerMons; extern const struct FacilityMon *gFacilityTrainerMons;
void CallBattleTowerFunc(void); void CallBattleTowerFunc(void);
u16 sub_8162548(u8 challengeNum, u8 battleNum); u16 GetRandomScaledFrontierTrainerId(u8 challengeNum, u8 battleNum);
void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId); void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId);
void SetEReaderTrainerGfxId(void); void SetEReaderTrainerGfxId(void);
u8 GetBattleFacilityTrainerGfxId(u16 trainerId); u8 GetBattleFacilityTrainerGfxId(u16 trainerId);
@@ -59,7 +59,7 @@ u8 GetFrontierOpponentClass(u16 trainerId);
void GetFrontierTrainerName(u8 *dst, u16 trainerId); void GetFrontierTrainerName(u8 *dst, u16 trainerId);
void FillFrontierTrainerParty(u8 monsCount); void FillFrontierTrainerParty(u8 monsCount);
void FillFrontierTrainersParties(u8 monsCount); void FillFrontierTrainersParties(u8 monsCount);
u16 RandomizeFacilityTrainerMonSet(u16 trainerId); u16 GetRandomFrontierMonFromSet(u16 trainerId);
void FrontierSpeechToString(const u16 *words); void FrontierSpeechToString(const u16 *words);
void DoSpecialTrainerBattle(void); void DoSpecialTrainerBattle(void);
void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *record); void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *record);
@@ -71,7 +71,7 @@ void GetEreaderTrainerName(u8 *dst);
void ValidateEReaderTrainer(void); void ValidateEReaderTrainer(void);
void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *ereaderTrainer); void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *ereaderTrainer);
void CopyEReaderTrainerGreeting(void); void CopyEReaderTrainerGreeting(void);
void sub_81653CC(void); void TryHideBattleTowerReporter(void);
bool32 RubyBattleTowerRecordToEmerald(struct RSBattleTowerRecord *src, struct EmeraldBattleTowerRecord *dst); bool32 RubyBattleTowerRecordToEmerald(struct RSBattleTowerRecord *src, struct EmeraldBattleTowerRecord *dst);
bool32 EmeraldBattleTowerRecordToRuby(struct EmeraldBattleTowerRecord *src, struct RSBattleTowerRecord *dst); bool32 EmeraldBattleTowerRecordToRuby(struct EmeraldBattleTowerRecord *src, struct RSBattleTowerRecord *dst);
void CalcApprenticeChecksum(struct Apprentice *apprentice); void CalcApprenticeChecksum(struct Apprentice *apprentice);
include/constants/battle_dome.h
+133 -15
View File
@@ -1,6 +1,21 @@
#ifndef GUARD_CONSTANTS_BATTLE_DOME_H #ifndef GUARD_CONSTANTS_BATTLE_DOME_H
#define GUARD_CONSTANTS_BATTLE_DOME_H #define GUARD_CONSTANTS_BATTLE_DOME_H
#define DOME_ROUND1 0
#define DOME_ROUND2 1
#define DOME_SEMIFINAL 2
#define DOME_FINAL 3
#define DOME_ROUNDS_COUNT 4
//#define DOME_TOURNAMENT_TRAINERS_COUNT 16 -- defined in global
#define DOME_TOURNAMENT_MATCHES_COUNT DOME_TOURNAMENT_TRAINERS_COUNT - 1
#define DOME_BATTLE_PARTY_SIZE 2
#define DOME_PLAYER_WON_MATCH 1
#define DOME_PLAYER_LOST_MATCH 2
#define DOME_PLAYER_RETIRED 9
#define BATTLE_DOME_FUNC_INIT 0 #define BATTLE_DOME_FUNC_INIT 0
#define BATTLE_DOME_FUNC_GET_DATA 1 #define BATTLE_DOME_FUNC_GET_DATA 1
#define BATTLE_DOME_FUNC_SET_DATA 2 #define BATTLE_DOME_FUNC_SET_DATA 2
@@ -9,7 +24,7 @@
#define BATTLE_DOME_FUNC_INIT_OPPONENT_PARTY 5 #define BATTLE_DOME_FUNC_INIT_OPPONENT_PARTY 5
#define BATTLE_DOME_FUNC_SHOW_OPPONENT_INFO 6 #define BATTLE_DOME_FUNC_SHOW_OPPONENT_INFO 6
#define BATTLE_DOME_FUNC_SHOW_TOURNEY_TREE 7 #define BATTLE_DOME_FUNC_SHOW_TOURNEY_TREE 7
#define BATTLE_DOME_FUNC_SHOW_PREV_RESULTS_TREE 8 #define BATTLE_DOME_FUNC_SHOW_PREV_TOURNEY_TREE 8
#define BATTLE_DOME_FUNC_SET_OPPONENT_ID 9 #define BATTLE_DOME_FUNC_SET_OPPONENT_ID 9
#define BATTLE_DOME_FUNC_SET_OPPONENT_GFX 10 #define BATTLE_DOME_FUNC_SET_OPPONENT_GFX 10
#define BATTLE_DOME_FUNC_SHOW_STATIC_TOURNEY_TREE 11 #define BATTLE_DOME_FUNC_SHOW_STATIC_TOURNEY_TREE 11
@@ -22,24 +37,127 @@
#define BATTLE_DOME_FUNC_REDUCE_PARTY 18 #define BATTLE_DOME_FUNC_REDUCE_PARTY 18
#define BATTLE_DOME_FUNC_COMPARE_SEEDS 19 #define BATTLE_DOME_FUNC_COMPARE_SEEDS 19
#define BATTLE_DOME_FUNC_GET_WINNER_NAME 20 #define BATTLE_DOME_FUNC_GET_WINNER_NAME 20
#define BATTLE_DOME_FUNC_21 21 #define BATTLE_DOME_FUNC_INIT_RESULTS_TREE 21
#define BATTLE_DOME_FUNC_INIT_TRAINERS 22 #define BATTLE_DOME_FUNC_INIT_TRAINERS 22
#define DOME_DATA_WIN_STREAK 0 #define DOME_DATA_WIN_STREAK 0
#define DOME_DATA_WIN_STREAK_ACTIVE 1 #define DOME_DATA_WIN_STREAK_ACTIVE 1
#define DOME_DATA_2 2 #define DOME_DATA_ATTEMPTED_SINGLES_50 2
#define DOME_DATA_3 3 #define DOME_DATA_ATTEMPTED_SINGLES_OPEN 3
#define DOME_DATA_4 4 #define DOME_DATA_HAS_WON_SINGLES_50 4
#define DOME_DATA_5 5 #define DOME_DATA_HAS_WON_SINGLES_OPEN 5
#define DOME_DATA_6 6 #define DOME_DATA_ATTEMPTED_CHALLENGE 6
#define DOME_DATA_7 7 #define DOME_DATA_HAS_WON_CHALLENGE 7
#define DOME_DATA_8 8 #define DOME_DATA_SELECTED_MONS 8
#define DOME_DATA_9 9 #define DOME_DATA_PREV_TOURNEY_TYPE 9
// ID for Exit/Cancel on the tourney tree
#define TOURNEY_TREE_CLOSE_BUTTON 31
// Input IDs on the tourney tree
#define TOURNEY_TREE_SELECTED_CLOSE 0
#define TOURNEY_TREE_NO_SELECTION 1
#define TOURNEY_TREE_SELECTED_TRAINER 2
#define TOURNEY_TREE_SELECTED_MATCH 3
// Modes for showing the tourney tree info card
#define INFOCARD_NEXT_OPPONENT 0
#define INFOCARD_TRAINER 1
#define INFOCARD_MATCH 2
// Input IDs for the info cards
#define INFOCARD_INPUT_NONE 0
#define TRAINERCARD_INPUT_UP 1
#define TRAINERCARD_INPUT_DOWN 2
#define TRAINERCARD_INPUT_LEFT 3
#define TRAINERCARD_INPUT_RIGHT 4
#define MATCHCARD_INPUT_UP 5
#define MATCHCARD_INPUT_DOWN 6
#define MATCHCARD_INPUT_LEFT 7
#define MATCHCARD_INPUT_RIGHT 8
#define INFOCARD_INPUT_AB 9
#define CARD_ALTERNATE_SLOT (1 << 0) // When set, uses an alternate slot to store the incoming card sprites
#define MOVE_CARD_RIGHT (1 << 1)
#define MOVE_CARD_DOWN (1 << 2)
#define MOVE_CARD_LEFT (1 << 3)
#define MOVE_CARD_UP (1 << 4)
#define MOVE_CARD (MOVE_CARD_RIGHT | MOVE_CARD_DOWN | MOVE_CARD_LEFT | MOVE_CARD_UP)
// Text IDs for sBattleDomeWinTexts
#define DOME_TEXT_NO_WINNER_YET 0
#define DOME_TEXT_WON_USING_MOVE 1
#define DOME_TEXT_CHAMP_USING_MOVE 2
#define DOME_TEXT_WON_ON_FORFEIT 3
#define DOME_TEXT_CHAMP_ON_FORFEIT 4
#define DOME_TEXT_WON_NO_MOVES 5
#define DOME_TEXT_CHAMP_NO_MOVES 6
// Offsets/start positions within sBattleDomeOpponentStatsTexts
#define DOME_TEXT_TWO_GOOD_STATS 0
#define DOME_TEXT_ONE_GOOD_STAT 15
#define DOME_TEXT_TWO_BAD_STATS 21
#define DOME_TEXT_ONE_BAD_STAT 36
#define DOME_TEXT_WELL_BALANCED 42
#define DOME_TEXT_HP 0
#define DOME_TEXT_ATK 5
#define DOME_TEXT_DEF 9
#define DOME_TEXT_SPEED 12
#define DOME_TEXT_SPATK 14
// Move point indexes for sBattleStyleMovePoints[][], to determine Battle Dome trainers battle styles
#define MOVE_POINTS_COMBO 0 // Moves that work well in combination (e.g. Rain Dance + Hydro Pump)
#define MOVE_POINTS_STAT_RAISE 1
#define MOVE_POINTS_STAT_LOWER 2
#define MOVE_POINTS_RARE 3 // Uncommon moves. Mostly arbitrary
#define MOVE_POINTS_HEAL 4
#define MOVE_POINTS_RISKY 5
#define MOVE_POINTS_STATUS 6
#define MOVE_POINTS_DMG 7
#define MOVE_POINTS_DEF 8 // Defensive moves, like Amnesia, Light Screen, or accuracy-lowers
#define MOVE_POINTS_ACCURATE 9
#define MOVE_POINTS_POWERFUL 10 // Most of the moves that are >= 100 power
#define MOVE_POINTS_POPULAR 11 // Group seems arbitrary. All using it are TM/HMs, but its only 11/58
#define MOVE_POINTS_LUCK 12
#define MOVE_POINTS_STRONG 13 // Most of the moves that are >= 90 power
#define MOVE_POINTS_LOW_PP 14
#define MOVE_POINTS_EFFECT 15 // Moves with additional effects
#define NUM_MOVE_POINT_TYPES 16
// Battle style IDs for sBattleDomeOpponentStyleTexts
#define DOME_BATTLE_STYLE_RISKY 0
#define DOME_BATTLE_STYLE_STALL 1
#define DOME_BATTLE_STYLE_VARIED 2
#define DOME_BATTLE_STYLE_COMBO_HIGH 3
#define DOME_BATTLE_STYLE_RARE_MOVES 4
#define DOME_BATTLE_STYLE_RARE_MOVE 5
#define DOME_BATTLE_STYLE_HP 6
#define DOME_BATTLE_STYLE_STORE_POWER 7
#define DOME_BATTLE_STYLE_ENFEEBLE_LOW 8
#define DOME_BATTLE_STYLE_LUCK 9
#define DOME_BATTLE_STYLE_REGAL 10
#define DOME_BATTLE_STYLE_LOW_PP 11
#define DOME_BATTLE_STYLE_STATUS_ATK 12
#define DOME_BATTLE_STYLE_ENDURE 13
#define DOME_BATTLE_STYLE_STATUS 14
#define DOME_BATTLE_STYLE_STRAIGHTFORWARD 15
#define DOME_BATTLE_STYLE_AGGRESSIVE 16
#define DOME_BATTLE_STYLE_DEF 17
#define DOME_BATTLE_STYLE_ENFEEBLE_HIGH 18
#define DOME_BATTLE_STYLE_POPULAR_POWER 19
#define DOME_BATTLE_STYLE_COMBO_LOW 20
#define DOME_BATTLE_STYLE_ACCURATE 21
#define DOME_BATTLE_STYLE_POWERFUL 22
#define DOME_BATTLE_STYLE_ATK_OVER_DEF 23
#define DOME_BATTLE_STYLE_DEF_OVER_ATK 24
#define DOME_BATTLE_STYLE_POPULAR_STRONG 25
#define DOME_BATTLE_STYLE_EFFECTS 26
#define DOME_BATTLE_STYLE_BALANCED 27
#define DOME_BATTLE_STYLE_UNUSED1 28
#define DOME_BATTLE_STYLE_UNUSED2 29
#define DOME_BATTLE_STYLE_UNUSED3 30
#define DOME_BATTLE_STYLE_UNUSED4 31
#define NUM_BATTLE_STYLES 32
#define DOME_ROUND1 0
#define DOME_ROUND2 1
#define DOME_SEMIFINAL 2
#define DOME_FINAL 3
#define DOME_ROUNDS_COUNT 4
#endif //GUARD_CONSTANTS_BATTLE_DOME_H #endif //GUARD_CONSTANTS_BATTLE_DOME_H
include/constants/battle_frontier.h
+3 -7
View File
@@ -6,9 +6,9 @@
// Battle Frontier facility ids. // Battle Frontier facility ids.
#define FRONTIER_FACILITY_TOWER 0 #define FRONTIER_FACILITY_TOWER 0
#define FRONTIER_FACILITY_DOME 1 #define FRONTIER_FACILITY_DOME 1
#define FRONTIER_FACILITY_PALACE 2 #define FRONTIER_FACILITY_PALACE 2 // also Verdanturf Tent
#define FRONTIER_FACILITY_ARENA 3 #define FRONTIER_FACILITY_ARENA 3 // also Fallarbor Tent
#define FRONTIER_FACILITY_FACTORY 4 #define FRONTIER_FACILITY_FACTORY 4 // also Slateport Tent
#define FRONTIER_FACILITY_PIKE 5 #define FRONTIER_FACILITY_PIKE 5
#define FRONTIER_FACILITY_PYRAMID 6 #define FRONTIER_FACILITY_PYRAMID 6
#define NUM_FRONTIER_FACILITIES 7 #define NUM_FRONTIER_FACILITIES 7
@@ -17,10 +17,6 @@
#define FACILITY_UNION_ROOM 8 #define FACILITY_UNION_ROOM 8
#define FACILITY_MULTI_OR_EREADER 9 // Direct Corner multi battles, multi battle with Steven, and e-Reader battles #define FACILITY_MULTI_OR_EREADER 9 // Direct Corner multi battles, multi battle with Steven, and e-Reader battles
#define TENT_VERDANTURF 2
#define TENT_FALLARBOR 3
#define TENT_SLATEPORT 4
// Battle Frontier lvl modes. // Battle Frontier lvl modes.
#define FRONTIER_LVL_50 0 #define FRONTIER_LVL_50 0
#define FRONTIER_LVL_OPEN 1 #define FRONTIER_LVL_OPEN 1
include/constants/battle_frontier_mons.h
+899
View File
@@ -0,0 +1,899 @@
#ifndef GUARD_CONSTANTS_BATTLE_FRONTIER_MONS_H
#define GUARD_CONSTANTS_BATTLE_FRONTIER_MONS_H
#define FRONTIER_MON_SUNKERN 0
#define FRONTIER_MON_AZURILL 1
#define FRONTIER_MON_CATERPIE 2
#define FRONTIER_MON_WEEDLE 3
#define FRONTIER_MON_WURMPLE 4
#define FRONTIER_MON_RALTS 5
#define FRONTIER_MON_MAGIKARP 6
#define FRONTIER_MON_FEEBAS 7
#define FRONTIER_MON_METAPOD 8
#define FRONTIER_MON_KAKUNA 9
#define FRONTIER_MON_PICHU 10
#define FRONTIER_MON_SILCOON 11
#define FRONTIER_MON_CASCOON 12
#define FRONTIER_MON_IGGLYBUFF 13
#define FRONTIER_MON_WOOPER 14
#define FRONTIER_MON_TYROGUE 15
#define FRONTIER_MON_SENTRET 16
#define FRONTIER_MON_CLEFFA 17
#define FRONTIER_MON_SEEDOT 18
#define FRONTIER_MON_LOTAD 19
#define FRONTIER_MON_POOCHYENA 20
#define FRONTIER_MON_SHEDINJA 21
#define FRONTIER_MON_MAKUHITA 22
#define FRONTIER_MON_WHISMUR 23
#define FRONTIER_MON_ZIGZAGOON 24
#define FRONTIER_MON_ZUBAT 25
#define FRONTIER_MON_TOGEPI 26
#define FRONTIER_MON_SPINARAK 27
#define FRONTIER_MON_MARILL 28
#define FRONTIER_MON_HOPPIP 29
#define FRONTIER_MON_SLUGMA 30
#define FRONTIER_MON_SWINUB 31
#define FRONTIER_MON_SMEARGLE 32
#define FRONTIER_MON_PIDGEY 33
#define FRONTIER_MON_RATTATA 34
#define FRONTIER_MON_WYNAUT 35
#define FRONTIER_MON_SKITTY 36
#define FRONTIER_MON_SPEAROW 37
#define FRONTIER_MON_HOOTHOOT 38
#define FRONTIER_MON_DIGLETT 39
#define FRONTIER_MON_LEDYBA 40
#define FRONTIER_MON_NINCADA 41
#define FRONTIER_MON_SURSKIT 42
#define FRONTIER_MON_JIGGLYPUFF 43
#define FRONTIER_MON_TAILLOW 44
#define FRONTIER_MON_WINGULL 45
#define FRONTIER_MON_NIDORAN_M 46
#define FRONTIER_MON_NIDORAN_F 47
#define FRONTIER_MON_KIRLIA 48
#define FRONTIER_MON_MAREEP 49
#define FRONTIER_MON_MEDITITE 50
#define FRONTIER_MON_SLAKOTH 51
#define FRONTIER_MON_PARAS 52
#define FRONTIER_MON_EKANS 53
#define FRONTIER_MON_DITTO 54
#define FRONTIER_MON_BARBOACH 55
#define FRONTIER_MON_MEOWTH 56
#define FRONTIER_MON_PINECO 57
#define FRONTIER_MON_TRAPINCH 58
#define FRONTIER_MON_SPHEAL 59
#define FRONTIER_MON_HORSEA 60
#define FRONTIER_MON_SHROOMISH 61
#define FRONTIER_MON_SHUPPET 62
#define FRONTIER_MON_DUSKULL 63
#define FRONTIER_MON_ELECTRIKE 64
#define FRONTIER_MON_VULPIX 65
#define FRONTIER_MON_PIKACHU 66
#define FRONTIER_MON_SANDSHREW 67
#define FRONTIER_MON_POLIWAG 68
#define FRONTIER_MON_BELLSPROUT 69
#define FRONTIER_MON_GEODUDE 70
#define FRONTIER_MON_DRATINI 71
#define FRONTIER_MON_SNUBBULL 72
#define FRONTIER_MON_REMORAID 73
#define FRONTIER_MON_LARVITAR 74
#define FRONTIER_MON_BALTOY 75
#define FRONTIER_MON_SNORUNT 76
#define FRONTIER_MON_BAGON 77
#define FRONTIER_MON_BELDUM 78
#define FRONTIER_MON_GULPIN 79
#define FRONTIER_MON_VENONAT 80
#define FRONTIER_MON_MANKEY 81
#define FRONTIER_MON_MACHOP 82
#define FRONTIER_MON_SHELLDER 83
#define FRONTIER_MON_SMOOCHUM 84
#define FRONTIER_MON_NUMEL 85
#define FRONTIER_MON_CARVANHA 86
#define FRONTIER_MON_CORPHISH 87
#define FRONTIER_MON_CHARMANDER 88
#define FRONTIER_MON_CYNDAQUIL 89
#define FRONTIER_MON_ABRA 90
#define FRONTIER_MON_DODUO 91
#define FRONTIER_MON_GASTLY 92
#define FRONTIER_MON_SWABLU 93
#define FRONTIER_MON_TREECKO 94
#define FRONTIER_MON_TORCHIC 95
#define FRONTIER_MON_MUDKIP 96
#define FRONTIER_MON_SQUIRTLE 97
#define FRONTIER_MON_TOTODILE 98
#define FRONTIER_MON_SLOWPOKE 99
#define FRONTIER_MON_BULBASAUR 100
#define FRONTIER_MON_CHIKORITA 101
#define FRONTIER_MON_ODDISH 102
#define FRONTIER_MON_PSYDUCK 103
#define FRONTIER_MON_CUBONE 104
#define FRONTIER_MON_GOLDEEN 105
#define FRONTIER_MON_NATU 106
#define FRONTIER_MON_CLEFAIRY 107
#define FRONTIER_MON_MAGNEMITE 108
#define FRONTIER_MON_SEEL 109
#define FRONTIER_MON_GRIMER 110
#define FRONTIER_MON_KRABBY 111
#define FRONTIER_MON_EXEGGCUTE 112
#define FRONTIER_MON_EEVEE 113
#define FRONTIER_MON_DROWZEE 114
#define FRONTIER_MON_VOLTORB 115
#define FRONTIER_MON_CHINCHOU 116
#define FRONTIER_MON_TEDDIURSA 117
#define FRONTIER_MON_DELIBIRD 118
#define FRONTIER_MON_HOUNDOUR 119
#define FRONTIER_MON_PHANPY 120
#define FRONTIER_MON_SPOINK 121
#define FRONTIER_MON_ARON 122
#define FRONTIER_MON_LUVDISC 123
#define FRONTIER_MON_TENTACOOL 124
#define FRONTIER_MON_CACNEA 125
#define FRONTIER_MON_UNOWN 126
#define FRONTIER_MON_KOFFING 127
#define FRONTIER_MON_STARYU 128
#define FRONTIER_MON_SKIPLOOM 129
#define FRONTIER_MON_NUZLEAF 130
#define FRONTIER_MON_LOMBRE 131
#define FRONTIER_MON_VIBRAVA 132
#define FRONTIER_MON_RHYHORN 133
#define FRONTIER_MON_CLAMPERL 134
#define FRONTIER_MON_PIDGEOTTO 135
#define FRONTIER_MON_GROWLITHE 136
#define FRONTIER_MON_FARFETCHD 137
#define FRONTIER_MON_OMANYTE 138
#define FRONTIER_MON_KABUTO 139
#define FRONTIER_MON_LILEEP 140
#define FRONTIER_MON_ANORITH 141
#define FRONTIER_MON_AIPOM 142
#define FRONTIER_MON_ELEKID 143
#define FRONTIER_MON_LOUDRED 144
#define FRONTIER_MON_SPINDA 145
#define FRONTIER_MON_NIDORINA 146
#define FRONTIER_MON_NIDORINO 147
#define FRONTIER_MON_FLAAFFY 148
#define FRONTIER_MON_MAGBY 149
#define FRONTIER_MON_NOSEPASS 150
#define FRONTIER_MON_CORSOLA 151
#define FRONTIER_MON_MAWILE 152
#define FRONTIER_MON_BUTTERFREE 153
#define FRONTIER_MON_BEEDRILL 154
#define FRONTIER_MON_POLIWHIRL 155
#define FRONTIER_MON_ONIX 156
#define FRONTIER_MON_BEAUTIFLY 157
#define FRONTIER_MON_DUSTOX 158
#define FRONTIER_MON_LEDIAN 159
#define FRONTIER_MON_ARIADOS 160
#define FRONTIER_MON_YANMA 161
#define FRONTIER_MON_DELCATTY_1 162
#define FRONTIER_MON_SABLEYE_1 163
#define FRONTIER_MON_LICKITUNG_1 164
#define FRONTIER_MON_WEEPINBELL_1 165
#define FRONTIER_MON_GRAVELER_1 166
#define FRONTIER_MON_GLOOM_1 167
#define FRONTIER_MON_PORYGON_1 168
#define FRONTIER_MON_KADABRA_1 169
#define FRONTIER_MON_WAILMER_1 170
#define FRONTIER_MON_ROSELIA_1 171
#define FRONTIER_MON_VOLBEAT_1 172
#define FRONTIER_MON_ILLUMISE_1 173
#define FRONTIER_MON_IVYSAUR_1 174
#define FRONTIER_MON_CHARMELEON_1 175
#define FRONTIER_MON_WARTORTLE_1 176
#define FRONTIER_MON_PARASECT_1 177
#define FRONTIER_MON_MACHOKE_1 178
#define FRONTIER_MON_HAUNTER_1 179
#define FRONTIER_MON_BAYLEEF_1 180
#define FRONTIER_MON_QUILAVA_1 181
#define FRONTIER_MON_CROCONAW_1 182
#define FRONTIER_MON_TOGETIC_1 183
#define FRONTIER_MON_MURKROW_1 184
#define FRONTIER_MON_WOBBUFFET_1 185
#define FRONTIER_MON_PLUSLE_1 186
#define FRONTIER_MON_MINUN_1 187
#define FRONTIER_MON_GROVYLE_1 188
#define FRONTIER_MON_COMBUSKEN_1 189
#define FRONTIER_MON_MARSHTOMP_1 190
#define FRONTIER_MON_PONYTA_1 191
#define FRONTIER_MON_AZUMARILL_1 192
#define FRONTIER_MON_SUDOWOODO_1 193
#define FRONTIER_MON_MAGCARGO_1 194
#define FRONTIER_MON_PUPITAR_1 195
#define FRONTIER_MON_SEALEO_1 196
#define FRONTIER_MON_RATICATE_1 197
#define FRONTIER_MON_MASQUERAIN_1 198
#define FRONTIER_MON_FURRET_1 199
#define FRONTIER_MON_DUNSPARCE_1 200
#define FRONTIER_MON_DRAGONAIR_1 201
#define FRONTIER_MON_MIGHTYENA_1 202
#define FRONTIER_MON_LINOONE_1 203
#define FRONTIER_MON_CASTFORM_1 204
#define FRONTIER_MON_SHELGON_1 205
#define FRONTIER_MON_METANG_1 206
#define FRONTIER_MON_WIGGLYTUFF_1 207
#define FRONTIER_MON_SUNFLORA_1 208
#define FRONTIER_MON_CHIMECHO_1 209
#define FRONTIER_MON_GLIGAR_1 210
#define FRONTIER_MON_QWILFISH_1 211
#define FRONTIER_MON_SNEASEL_1 212
#define FRONTIER_MON_PELIPPER_1 213
#define FRONTIER_MON_SWELLOW_1 214
#define FRONTIER_MON_LAIRON_1 215
#define FRONTIER_MON_TANGELA_1 216
#define FRONTIER_MON_ARBOK_1 217
#define FRONTIER_MON_PERSIAN_1 218
#define FRONTIER_MON_SEADRA_1 219
#define FRONTIER_MON_KECLEON_1 220
#define FRONTIER_MON_VIGOROTH_1 221
#define FRONTIER_MON_LUNATONE_1 222
#define FRONTIER_MON_SOLROCK_1 223
#define FRONTIER_MON_NOCTOWL_1 224
#define FRONTIER_MON_SANDSLASH_1 225
#define FRONTIER_MON_VENOMOTH_1 226
#define FRONTIER_MON_CHANSEY_1 227
#define FRONTIER_MON_SEAKING_1 228
#define FRONTIER_MON_JUMPLUFF_1 229
#define FRONTIER_MON_PILOSWINE_1 230
#define FRONTIER_MON_GOLBAT_1 231
#define FRONTIER_MON_PRIMEAPE_1 232
#define FRONTIER_MON_HITMONLEE_1 233
#define FRONTIER_MON_HITMONCHAN_1 234
#define FRONTIER_MON_GIRAFARIG_1 235
#define FRONTIER_MON_HITMONTOP_1 236
#define FRONTIER_MON_BANETTE_1 237
#define FRONTIER_MON_NINJASK_1 238
#define FRONTIER_MON_SEVIPER_1 239
#define FRONTIER_MON_ZANGOOSE_1 240
#define FRONTIER_MON_CAMERUPT_1 241
#define FRONTIER_MON_SHARPEDO_1 242
#define FRONTIER_MON_TROPIUS_1 243
#define FRONTIER_MON_MAGNETON_1 244
#define FRONTIER_MON_MANTINE_1 245
#define FRONTIER_MON_STANTLER_1 246
#define FRONTIER_MON_ABSOL_1 247
#define FRONTIER_MON_SWALOT_1 248
#define FRONTIER_MON_CRAWDAUNT_1 249
#define FRONTIER_MON_PIDGEOT_1 250
#define FRONTIER_MON_GRUMPIG_1 251
#define FRONTIER_MON_TORKOAL_1 252
#define FRONTIER_MON_KINGLER_1 253
#define FRONTIER_MON_CACTURNE_1 254
#define FRONTIER_MON_BELLOSSOM_1 255
#define FRONTIER_MON_OCTILLERY_1 256
#define FRONTIER_MON_HUNTAIL_1 257
#define FRONTIER_MON_GOREBYSS_1 258
#define FRONTIER_MON_RELICANTH_1 259
#define FRONTIER_MON_OMASTAR_1 260
#define FRONTIER_MON_KABUTOPS_1 261
#define FRONTIER_MON_POLIWRATH_1 262
#define FRONTIER_MON_SCYTHER_1 263
#define FRONTIER_MON_PINSIR_1 264
#define FRONTIER_MON_POLITOED_1 265
#define FRONTIER_MON_CLOYSTER_1 266
#define FRONTIER_MON_DELCATTY_2 267
#define FRONTIER_MON_SABLEYE_2 268
#define FRONTIER_MON_LICKITUNG_2 269
#define FRONTIER_MON_WEEPINBELL_2 270
#define FRONTIER_MON_GRAVELER_2 271
#define FRONTIER_MON_GLOOM_2 272
#define FRONTIER_MON_PORYGON_2 273
#define FRONTIER_MON_KADABRA_2 274
#define FRONTIER_MON_WAILMER_2 275
#define FRONTIER_MON_ROSELIA_2 276
#define FRONTIER_MON_VOLBEAT_2 277
#define FRONTIER_MON_ILLUMISE_2 278
#define FRONTIER_MON_IVYSAUR_2 279
#define FRONTIER_MON_CHARMELEON_2 280
#define FRONTIER_MON_WARTORTLE_2 281
#define FRONTIER_MON_PARASECT_2 282
#define FRONTIER_MON_MACHOKE_2 283
#define FRONTIER_MON_HAUNTER_2 284
#define FRONTIER_MON_BAYLEEF_2 285
#define FRONTIER_MON_QUILAVA_2 286
#define FRONTIER_MON_CROCONAW_2 287
#define FRONTIER_MON_TOGETIC_2 288
#define FRONTIER_MON_MURKROW_2 289
#define FRONTIER_MON_WOBBUFFET_2 290
#define FRONTIER_MON_PLUSLE_2 291
#define FRONTIER_MON_MINUN_2 292
#define FRONTIER_MON_GROVYLE_2 293
#define FRONTIER_MON_COMBUSKEN_2 294
#define FRONTIER_MON_MARSHTOMP_2 295
#define FRONTIER_MON_PONYTA_2 296
#define FRONTIER_MON_AZUMARILL_2 297
#define FRONTIER_MON_SUDOWOODO_2 298
#define FRONTIER_MON_MAGCARGO_2 299
#define FRONTIER_MON_PUPITAR_2 300
#define FRONTIER_MON_SEALEO_2 301
#define FRONTIER_MON_RATICATE_2 302
#define FRONTIER_MON_MASQUERAIN_2 303
#define FRONTIER_MON_FURRET_2 304
#define FRONTIER_MON_DUNSPARCE_2 305
#define FRONTIER_MON_DRAGONAIR_2 306
#define FRONTIER_MON_MIGHTYENA_2 307
#define FRONTIER_MON_LINOONE_2 308
#define FRONTIER_MON_CASTFORM_2 309
#define FRONTIER_MON_SHELGON_2 310
#define FRONTIER_MON_METANG_2 311
#define FRONTIER_MON_WIGGLYTUFF_2 312
#define FRONTIER_MON_SUNFLORA_2 313
#define FRONTIER_MON_CHIMECHO_2 314
#define FRONTIER_MON_GLIGAR_2 315
#define FRONTIER_MON_QWILFISH_2 316
#define FRONTIER_MON_SNEASEL_2 317
#define FRONTIER_MON_PELIPPER_2 318
#define FRONTIER_MON_SWELLOW_2 319
#define FRONTIER_MON_LAIRON_2 320
#define FRONTIER_MON_TANGELA_2 321
#define FRONTIER_MON_ARBOK_2 322
#define FRONTIER_MON_PERSIAN_2 323
#define FRONTIER_MON_SEADRA_2 324
#define FRONTIER_MON_KECLEON_2 325
#define FRONTIER_MON_VIGOROTH_2 326
#define FRONTIER_MON_LUNATONE_2 327
#define FRONTIER_MON_SOLROCK_2 328
#define FRONTIER_MON_NOCTOWL_2 329
#define FRONTIER_MON_SANDSLASH_2 330
#define FRONTIER_MON_VENOMOTH_2 331
#define FRONTIER_MON_CHANSEY_2 332
#define FRONTIER_MON_SEAKING_2 333
#define FRONTIER_MON_JUMPLUFF_2 334
#define FRONTIER_MON_PILOSWINE_2 335
#define FRONTIER_MON_GOLBAT_2 336
#define FRONTIER_MON_PRIMEAPE_2 337
#define FRONTIER_MON_HITMONLEE_2 338
#define FRONTIER_MON_HITMONCHAN_2 339
#define FRONTIER_MON_GIRAFARIG_2 340
#define FRONTIER_MON_HITMONTOP_2 341
#define FRONTIER_MON_BANETTE_2 342
#define FRONTIER_MON_NINJASK_2 343
#define FRONTIER_MON_SEVIPER_2 344
#define FRONTIER_MON_ZANGOOSE_2 345
#define FRONTIER_MON_CAMERUPT_2 346
#define FRONTIER_MON_SHARPEDO_2 347
#define FRONTIER_MON_TROPIUS_2 348
#define FRONTIER_MON_MAGNETON_2 349
#define FRONTIER_MON_MANTINE_2 350
#define FRONTIER_MON_STANTLER_2 351
#define FRONTIER_MON_ABSOL_2 352
#define FRONTIER_MON_SWALOT_2 353
#define FRONTIER_MON_CRAWDAUNT_2 354
#define FRONTIER_MON_PIDGEOT_2 355
#define FRONTIER_MON_GRUMPIG_2 356
#define FRONTIER_MON_TORKOAL_2 357
#define FRONTIER_MON_KINGLER_2 358
#define FRONTIER_MON_CACTURNE_2 359
#define FRONTIER_MON_BELLOSSOM_2 360
#define FRONTIER_MON_OCTILLERY_2 361
#define FRONTIER_MON_HUNTAIL_2 362
#define FRONTIER_MON_GOREBYSS_2 363
#define FRONTIER_MON_RELICANTH_2 364
#define FRONTIER_MON_OMASTAR_2 365
#define FRONTIER_MON_KABUTOPS_2 366
#define FRONTIER_MON_POLIWRATH_2 367
#define FRONTIER_MON_SCYTHER_2 368
#define FRONTIER_MON_PINSIR_2 369
#define FRONTIER_MON_POLITOED_2 370
#define FRONTIER_MON_CLOYSTER_2 371
#define FRONTIER_MON_DUGTRIO_1 372
#define FRONTIER_MON_MEDICHAM_1 373
#define FRONTIER_MON_MISDREAVUS_1 374
#define FRONTIER_MON_FEAROW_1 375
#define FRONTIER_MON_GRANBULL_1 376
#define FRONTIER_MON_JYNX_1 377
#define FRONTIER_MON_DUSCLOPS_1 378
#define FRONTIER_MON_DODRIO_1 379
#define FRONTIER_MON_MR_MIME_1 380
#define FRONTIER_MON_LANTURN_1 381
#define FRONTIER_MON_BRELOOM_1 382
#define FRONTIER_MON_FORRETRESS_1 383
#define FRONTIER_MON_WHISCASH_1 384
#define FRONTIER_MON_XATU_1 385
#define FRONTIER_MON_SKARMORY_1 386
#define FRONTIER_MON_MAROWAK_1 387
#define FRONTIER_MON_QUAGSIRE_1 388
#define FRONTIER_MON_CLEFABLE_1 389
#define FRONTIER_MON_HARIYAMA_1 390
#define FRONTIER_MON_RAICHU_1 391
#define FRONTIER_MON_DEWGONG_1 392
#define FRONTIER_MON_MANECTRIC_1 393
#define FRONTIER_MON_VILEPLUME_1 394
#define FRONTIER_MON_VICTREEBEL_1 395
#define FRONTIER_MON_ELECTRODE_1 396
#define FRONTIER_MON_EXPLOUD_1 397
#define FRONTIER_MON_SHIFTRY_1 398
#define FRONTIER_MON_GLALIE_1 399
#define FRONTIER_MON_LUDICOLO_1 400
#define FRONTIER_MON_HYPNO_1 401
#define FRONTIER_MON_GOLEM_1 402
#define FRONTIER_MON_RHYDON_1 403
#define FRONTIER_MON_ALAKAZAM_1 404
#define FRONTIER_MON_WEEZING_1 405
#define FRONTIER_MON_KANGASKHAN_1 406
#define FRONTIER_MON_ELECTABUZZ_1 407
#define FRONTIER_MON_TAUROS_1 408
#define FRONTIER_MON_SLOWBRO_1 409
#define FRONTIER_MON_SLOWKING_1 410
#define FRONTIER_MON_MILTANK_1 411
#define FRONTIER_MON_ALTARIA_1 412
#define FRONTIER_MON_NIDOQUEEN_1 413
#define FRONTIER_MON_NIDOKING_1 414
#define FRONTIER_MON_MAGMAR_1 415
#define FRONTIER_MON_CRADILY_1 416
#define FRONTIER_MON_ARMALDO_1 417
#define FRONTIER_MON_GOLDUCK_1 418
#define FRONTIER_MON_RAPIDASH_1 419
#define FRONTIER_MON_MUK_1 420
#define FRONTIER_MON_GENGAR_1 421
#define FRONTIER_MON_AMPHAROS_1 422
#define FRONTIER_MON_SCIZOR_1 423
#define FRONTIER_MON_HERACROSS_1 424
#define FRONTIER_MON_URSARING_1 425
#define FRONTIER_MON_HOUNDOOM_1 426
#define FRONTIER_MON_DONPHAN_1 427
#define FRONTIER_MON_CLAYDOL_1 428
#define FRONTIER_MON_WAILORD_1 429
#define FRONTIER_MON_NINETALES_1 430
#define FRONTIER_MON_MACHAMP_1 431
#define FRONTIER_MON_SHUCKLE_1 432
#define FRONTIER_MON_STEELIX_1 433
#define FRONTIER_MON_TENTACRUEL_1 434
#define FRONTIER_MON_AERODACTYL_1 435
#define FRONTIER_MON_PORYGON2_1 436
#define FRONTIER_MON_GARDEVOIR_1 437
#define FRONTIER_MON_EXEGGUTOR_1 438
#define FRONTIER_MON_STARMIE_1 439
#define FRONTIER_MON_FLYGON_1 440
#define FRONTIER_MON_VENUSAUR_1 441
#define FRONTIER_MON_VAPOREON_1 442
#define FRONTIER_MON_JOLTEON_1 443
#define FRONTIER_MON_FLAREON_1 444
#define FRONTIER_MON_MEGANIUM_1 445
#define FRONTIER_MON_ESPEON_1 446
#define FRONTIER_MON_UMBREON_1 447
#define FRONTIER_MON_BLASTOISE_1 448
#define FRONTIER_MON_FERALIGATR_1 449
#define FRONTIER_MON_AGGRON_1 450
#define FRONTIER_MON_BLAZIKEN_1 451
#define FRONTIER_MON_WALREIN_1 452
#define FRONTIER_MON_SCEPTILE_1 453
#define FRONTIER_MON_CHARIZARD_1 454
#define FRONTIER_MON_TYPHLOSION_1 455
#define FRONTIER_MON_LAPRAS_1 456
#define FRONTIER_MON_CROBAT_1 457
#define FRONTIER_MON_SWAMPERT_1 458
#define FRONTIER_MON_GYARADOS_1 459
#define FRONTIER_MON_SNORLAX_1 460
#define FRONTIER_MON_KINGDRA_1 461
#define FRONTIER_MON_BLISSEY_1 462
#define FRONTIER_MON_MILOTIC_1 463
#define FRONTIER_MON_ARCANINE_1 464
#define FRONTIER_MON_SALAMENCE_1 465
#define FRONTIER_MON_METAGROSS_1 466
#define FRONTIER_MON_SLAKING_1 467
#define FRONTIER_MON_DUGTRIO_2 468
#define FRONTIER_MON_MEDICHAM_2 469
#define FRONTIER_MON_MAROWAK_2 470
#define FRONTIER_MON_QUAGSIRE_2 471
#define FRONTIER_MON_MISDREAVUS_2 472
#define FRONTIER_MON_FEAROW_2 473
#define FRONTIER_MON_GRANBULL_2 474
#define FRONTIER_MON_JYNX_2 475
#define FRONTIER_MON_DUSCLOPS_2 476
#define FRONTIER_MON_DODRIO_2 477
#define FRONTIER_MON_MR_MIME_2 478
#define FRONTIER_MON_LANTURN_2 479
#define FRONTIER_MON_BRELOOM_2 480
#define FRONTIER_MON_FORRETRESS_2 481
#define FRONTIER_MON_SKARMORY_2 482
#define FRONTIER_MON_WHISCASH_2 483
#define FRONTIER_MON_XATU_2 484
#define FRONTIER_MON_CLEFABLE_2 485
#define FRONTIER_MON_HARIYAMA_2 486
#define FRONTIER_MON_RAICHU_2 487
#define FRONTIER_MON_DEWGONG_2 488
#define FRONTIER_MON_MANECTRIC_2 489
#define FRONTIER_MON_VILEPLUME_2 490
#define FRONTIER_MON_VICTREEBEL_2 491
#define FRONTIER_MON_ELECTRODE_2 492
#define FRONTIER_MON_EXPLOUD_2 493
#define FRONTIER_MON_SHIFTRY_2 494
#define FRONTIER_MON_GLALIE_2 495
#define FRONTIER_MON_LUDICOLO_2 496
#define FRONTIER_MON_HYPNO_2 497
#define FRONTIER_MON_GOLEM_2 498
#define FRONTIER_MON_RHYDON_2 499
#define FRONTIER_MON_ALAKAZAM_2 500
#define FRONTIER_MON_WEEZING_2 501
#define FRONTIER_MON_KANGASKHAN_2 502
#define FRONTIER_MON_ELECTABUZZ_2 503
#define FRONTIER_MON_TAUROS_2 504
#define FRONTIER_MON_SLOWBRO_2 505
#define FRONTIER_MON_SLOWKING_2 506
#define FRONTIER_MON_MILTANK_2 507
#define FRONTIER_MON_ALTARIA_2 508
#define FRONTIER_MON_NIDOQUEEN_2 509
#define FRONTIER_MON_NIDOKING_2 510
#define FRONTIER_MON_MAGMAR_2 511
#define FRONTIER_MON_CRADILY_2 512
#define FRONTIER_MON_ARMALDO_2 513
#define FRONTIER_MON_GOLDUCK_2 514
#define FRONTIER_MON_RAPIDASH_2 515
#define FRONTIER_MON_MUK_2 516
#define FRONTIER_MON_GENGAR_2 517
#define FRONTIER_MON_AMPHAROS_2 518
#define FRONTIER_MON_SCIZOR_2 519
#define FRONTIER_MON_HERACROSS_2 520
#define FRONTIER_MON_URSARING_2 521
#define FRONTIER_MON_HOUNDOOM_2 522
#define FRONTIER_MON_DONPHAN_2 523
#define FRONTIER_MON_CLAYDOL_2 524
#define FRONTIER_MON_WAILORD_2 525
#define FRONTIER_MON_NINETALES_2 526
#define FRONTIER_MON_MACHAMP_2 527
#define FRONTIER_MON_SHUCKLE_2 528
#define FRONTIER_MON_STEELIX_2 529
#define FRONTIER_MON_TENTACRUEL_2 530
#define FRONTIER_MON_AERODACTYL_2 531
#define FRONTIER_MON_PORYGON2_2 532
#define FRONTIER_MON_GARDEVOIR_2 533
#define FRONTIER_MON_EXEGGUTOR_2 534
#define FRONTIER_MON_STARMIE_2 535
#define FRONTIER_MON_FLYGON_2 536
#define FRONTIER_MON_VENUSAUR_2 537
#define FRONTIER_MON_VAPOREON_2 538
#define FRONTIER_MON_JOLTEON_2 539
#define FRONTIER_MON_FLAREON_2 540
#define FRONTIER_MON_MEGANIUM_2 541
#define FRONTIER_MON_ESPEON_2 542
#define FRONTIER_MON_UMBREON_2 543
#define FRONTIER_MON_BLASTOISE_2 544
#define FRONTIER_MON_FERALIGATR_2 545
#define FRONTIER_MON_AGGRON_2 546
#define FRONTIER_MON_BLAZIKEN_2 547
#define FRONTIER_MON_WALREIN_2 548
#define FRONTIER_MON_SCEPTILE_2 549
#define FRONTIER_MON_CHARIZARD_2 550
#define FRONTIER_MON_TYPHLOSION_2 551
#define FRONTIER_MON_LAPRAS_2 552
#define FRONTIER_MON_CROBAT_2 553
#define FRONTIER_MON_SWAMPERT_2 554
#define FRONTIER_MON_GYARADOS_2 555
#define FRONTIER_MON_SNORLAX_2 556
#define FRONTIER_MON_KINGDRA_2 557
#define FRONTIER_MON_BLISSEY_2 558
#define FRONTIER_MON_MILOTIC_2 559
#define FRONTIER_MON_ARCANINE_2 560
#define FRONTIER_MON_SALAMENCE_2 561
#define FRONTIER_MON_METAGROSS_2 562
#define FRONTIER_MON_SLAKING_2 563
#define FRONTIER_MON_DUGTRIO_3 564
#define FRONTIER_MON_MEDICHAM_3 565
#define FRONTIER_MON_MISDREAVUS_3 566
#define FRONTIER_MON_FEAROW_3 567
#define FRONTIER_MON_GRANBULL_3 568
#define FRONTIER_MON_JYNX_3 569
#define FRONTIER_MON_DUSCLOPS_3 570
#define FRONTIER_MON_DODRIO_3 571
#define FRONTIER_MON_MR_MIME_3 572
#define FRONTIER_MON_LANTURN_3 573
#define FRONTIER_MON_BRELOOM_3 574
#define FRONTIER_MON_FORRETRESS_3 575
#define FRONTIER_MON_WHISCASH_3 576
#define FRONTIER_MON_XATU_3 577
#define FRONTIER_MON_SKARMORY_3 578
#define FRONTIER_MON_MAROWAK_3 579
#define FRONTIER_MON_QUAGSIRE_3 580
#define FRONTIER_MON_CLEFABLE_3 581
#define FRONTIER_MON_HARIYAMA_3 582
#define FRONTIER_MON_RAICHU_3 583
#define FRONTIER_MON_DEWGONG_3 584
#define FRONTIER_MON_MANECTRIC_3 585
#define FRONTIER_MON_VILEPLUME_3 586
#define FRONTIER_MON_VICTREEBEL_3 587
#define FRONTIER_MON_ELECTRODE_3 588
#define FRONTIER_MON_EXPLOUD_3 589
#define FRONTIER_MON_SHIFTRY_3 590
#define FRONTIER_MON_GLALIE_3 591
#define FRONTIER_MON_LUDICOLO_3 592
#define FRONTIER_MON_HYPNO_3 593
#define FRONTIER_MON_GOLEM_3 594
#define FRONTIER_MON_RHYDON_3 595
#define FRONTIER_MON_ALAKAZAM_3 596
#define FRONTIER_MON_WEEZING_3 597
#define FRONTIER_MON_KANGASKHAN_3 598
#define FRONTIER_MON_ELECTABUZZ_3 599
#define FRONTIER_MON_TAUROS_3 600
#define FRONTIER_MON_SLOWBRO_3 601
#define FRONTIER_MON_SLOWKING_3 602
#define FRONTIER_MON_MILTANK_3 603
#define FRONTIER_MON_ALTARIA_3 604
#define FRONTIER_MON_NIDOQUEEN_3 605
#define FRONTIER_MON_NIDOKING_3 606
#define FRONTIER_MON_MAGMAR_3 607
#define FRONTIER_MON_CRADILY_3 608
#define FRONTIER_MON_ARMALDO_3 609
#define FRONTIER_MON_GOLDUCK_3 610
#define FRONTIER_MON_RAPIDASH_3 611
#define FRONTIER_MON_MUK_3 612
#define FRONTIER_MON_GENGAR_3 613
#define FRONTIER_MON_AMPHAROS_3 614
#define FRONTIER_MON_SCIZOR_3 615
#define FRONTIER_MON_HERACROSS_3 616
#define FRONTIER_MON_URSARING_3 617
#define FRONTIER_MON_HOUNDOOM_3 618
#define FRONTIER_MON_DONPHAN_3 619
#define FRONTIER_MON_CLAYDOL_3 620
#define FRONTIER_MON_WAILORD_3 621
#define FRONTIER_MON_NINETALES_3 622
#define FRONTIER_MON_MACHAMP_3 623
#define FRONTIER_MON_SHUCKLE_3 624
#define FRONTIER_MON_STEELIX_3 625
#define FRONTIER_MON_TENTACRUEL_3 626
#define FRONTIER_MON_AERODACTYL_3 627
#define FRONTIER_MON_PORYGON2_3 628
#define FRONTIER_MON_GARDEVOIR_3 629
#define FRONTIER_MON_EXEGGUTOR_3 630
#define FRONTIER_MON_STARMIE_3 631
#define FRONTIER_MON_FLYGON_3 632
#define FRONTIER_MON_VENUSAUR_3 633
#define FRONTIER_MON_VAPOREON_3 634
#define FRONTIER_MON_JOLTEON_3 635
#define FRONTIER_MON_FLAREON_3 636
#define FRONTIER_MON_MEGANIUM_3 637
#define FRONTIER_MON_ESPEON_3 638
#define FRONTIER_MON_UMBREON_3 639
#define FRONTIER_MON_BLASTOISE_3 640
#define FRONTIER_MON_FERALIGATR_3 641
#define FRONTIER_MON_AGGRON_3 642
#define FRONTIER_MON_BLAZIKEN_3 643
#define FRONTIER_MON_WALREIN_3 644
#define FRONTIER_MON_SCEPTILE_3 645
#define FRONTIER_MON_CHARIZARD_3 646
#define FRONTIER_MON_TYPHLOSION_3 647
#define FRONTIER_MON_LAPRAS_3 648
#define FRONTIER_MON_CROBAT_3 649
#define FRONTIER_MON_SWAMPERT_3 650
#define FRONTIER_MON_GYARADOS_3 651
#define FRONTIER_MON_SNORLAX_3 652
#define FRONTIER_MON_KINGDRA_3 653
#define FRONTIER_MON_BLISSEY_3 654
#define FRONTIER_MON_MILOTIC_3 655
#define FRONTIER_MON_ARCANINE_3 656
#define FRONTIER_MON_SALAMENCE_3 657
#define FRONTIER_MON_METAGROSS_3 658
#define FRONTIER_MON_SLAKING_3 659
#define FRONTIER_MON_DUGTRIO_4 660
#define FRONTIER_MON_MEDICHAM_4 661
#define FRONTIER_MON_MISDREAVUS_4 662
#define FRONTIER_MON_FEAROW_4 663
#define FRONTIER_MON_GRANBULL_4 664
#define FRONTIER_MON_JYNX_4 665
#define FRONTIER_MON_DUSCLOPS_4 666
#define FRONTIER_MON_DODRIO_4 667
#define FRONTIER_MON_MR_MIME_4 668
#define FRONTIER_MON_LANTURN_4 669
#define FRONTIER_MON_BRELOOM_4 670
#define FRONTIER_MON_FORRETRESS_4 671
#define FRONTIER_MON_WHISCASH_4 672
#define FRONTIER_MON_XATU_4 673
#define FRONTIER_MON_SKARMORY_4 674
#define FRONTIER_MON_MAROWAK_4 675
#define FRONTIER_MON_QUAGSIRE_4 676
#define FRONTIER_MON_CLEFABLE_4 677
#define FRONTIER_MON_HARIYAMA_4 678
#define FRONTIER_MON_RAICHU_4 679
#define FRONTIER_MON_DEWGONG_4 680
#define FRONTIER_MON_MANECTRIC_4 681
#define FRONTIER_MON_VILEPLUME_4 682
#define FRONTIER_MON_VICTREEBEL_4 683
#define FRONTIER_MON_ELECTRODE_4 684
#define FRONTIER_MON_EXPLOUD_4 685
#define FRONTIER_MON_SHIFTRY_4 686
#define FRONTIER_MON_GLALIE_4 687
#define FRONTIER_MON_LUDICOLO_4 688
#define FRONTIER_MON_HYPNO_4 689
#define FRONTIER_MON_GOLEM_4 690
#define FRONTIER_MON_RHYDON_4 691
#define FRONTIER_MON_ALAKAZAM_4 692
#define FRONTIER_MON_WEEZING_4 693
#define FRONTIER_MON_KANGASKHAN_4 694
#define FRONTIER_MON_ELECTABUZZ_4 695
#define FRONTIER_MON_TAUROS_4 696
#define FRONTIER_MON_SLOWBRO_4 697
#define FRONTIER_MON_SLOWKING_4 698
#define FRONTIER_MON_MILTANK_4 699
#define FRONTIER_MON_ALTARIA_4 700
#define FRONTIER_MON_NIDOQUEEN_4 701
#define FRONTIER_MON_NIDOKING_4 702
#define FRONTIER_MON_MAGMAR_4 703
#define FRONTIER_MON_CRADILY_4 704
#define FRONTIER_MON_ARMALDO_4 705
#define FRONTIER_MON_GOLDUCK_4 706
#define FRONTIER_MON_RAPIDASH_4 707
#define FRONTIER_MON_MUK_4 708
#define FRONTIER_MON_GENGAR_4 709
#define FRONTIER_MON_AMPHAROS_4 710
#define FRONTIER_MON_SCIZOR_4 711
#define FRONTIER_MON_HERACROSS_4 712
#define FRONTIER_MON_URSARING_4 713
#define FRONTIER_MON_HOUNDOOM_4 714
#define FRONTIER_MON_DONPHAN_4 715
#define FRONTIER_MON_CLAYDOL_4 716
#define FRONTIER_MON_WAILORD_4 717
#define FRONTIER_MON_NINETALES_4 718
#define FRONTIER_MON_MACHAMP_4 719
#define FRONTIER_MON_SHUCKLE_4 720
#define FRONTIER_MON_STEELIX_4 721
#define FRONTIER_MON_TENTACRUEL_4 722
#define FRONTIER_MON_AERODACTYL_4 723
#define FRONTIER_MON_PORYGON2_4 724
#define FRONTIER_MON_GARDEVOIR_4 725
#define FRONTIER_MON_EXEGGUTOR_4 726
#define FRONTIER_MON_STARMIE_4 727
#define FRONTIER_MON_FLYGON_4 728
#define FRONTIER_MON_VENUSAUR_4 729
#define FRONTIER_MON_VAPOREON_4 730
#define FRONTIER_MON_JOLTEON_4 731
#define FRONTIER_MON_FLAREON_4 732
#define FRONTIER_MON_MEGANIUM_4 733
#define FRONTIER_MON_ESPEON_4 734
#define FRONTIER_MON_UMBREON_4 735
#define FRONTIER_MON_BLASTOISE_4 736
#define FRONTIER_MON_FERALIGATR_4 737
#define FRONTIER_MON_AGGRON_4 738
#define FRONTIER_MON_BLAZIKEN_4 739
#define FRONTIER_MON_WALREIN_4 740
#define FRONTIER_MON_SCEPTILE_4 741
#define FRONTIER_MON_CHARIZARD_4 742
#define FRONTIER_MON_TYPHLOSION_4 743
#define FRONTIER_MON_LAPRAS_4 744
#define FRONTIER_MON_CROBAT_4 745
#define FRONTIER_MON_SWAMPERT_4 746
#define FRONTIER_MON_GYARADOS_4 747
#define FRONTIER_MON_SNORLAX_4 748
#define FRONTIER_MON_KINGDRA_4 749
#define FRONTIER_MON_BLISSEY_4 750
#define FRONTIER_MON_MILOTIC_4 751
#define FRONTIER_MON_ARCANINE_4 752
#define FRONTIER_MON_SALAMENCE_4 753
#define FRONTIER_MON_METAGROSS_4 754
#define FRONTIER_MON_SLAKING_4 755
#define FRONTIER_MON_ARTICUNO_1 756
#define FRONTIER_MON_ZAPDOS_1 757
#define FRONTIER_MON_MOLTRES_1 758
#define FRONTIER_MON_RAIKOU_1 759
#define FRONTIER_MON_ENTEI_1 760
#define FRONTIER_MON_SUICUNE_1 761
#define FRONTIER_MON_REGIROCK_1 762
#define FRONTIER_MON_REGICE_1 763
#define FRONTIER_MON_REGISTEEL_1 764
#define FRONTIER_MON_LATIAS_1 765
#define FRONTIER_MON_LATIOS_1 766
#define FRONTIER_MON_ARTICUNO_2 767
#define FRONTIER_MON_ZAPDOS_2 768
#define FRONTIER_MON_MOLTRES_2 769
#define FRONTIER_MON_RAIKOU_2 770
#define FRONTIER_MON_ENTEI_2 771
#define FRONTIER_MON_SUICUNE_2 772
#define FRONTIER_MON_REGIROCK_2 773
#define FRONTIER_MON_REGICE_2 774
#define FRONTIER_MON_REGISTEEL_2 775
#define FRONTIER_MON_LATIAS_2 776
#define FRONTIER_MON_LATIOS_2 777
#define FRONTIER_MON_ARTICUNO_3 778
#define FRONTIER_MON_ZAPDOS_3 779
#define FRONTIER_MON_MOLTRES_3 780
#define FRONTIER_MON_RAIKOU_3 781
#define FRONTIER_MON_ENTEI_3 782
#define FRONTIER_MON_SUICUNE_3 783
#define FRONTIER_MON_REGIROCK_3 784
#define FRONTIER_MON_REGICE_3 785
#define FRONTIER_MON_REGISTEEL_3 786
#define FRONTIER_MON_LATIAS_3 787
#define FRONTIER_MON_LATIOS_3 788
#define FRONTIER_MON_ARTICUNO_4 789
#define FRONTIER_MON_ZAPDOS_4 790
#define FRONTIER_MON_MOLTRES_4 791
#define FRONTIER_MON_RAIKOU_4 792
#define FRONTIER_MON_ENTEI_4 793
#define FRONTIER_MON_SUICUNE_4 794
#define FRONTIER_MON_REGIROCK_4 795
#define FRONTIER_MON_REGICE_4 796
#define FRONTIER_MON_REGISTEEL_4 797
#define FRONTIER_MON_LATIAS_4 798
#define FRONTIER_MON_LATIOS_4 799
#define FRONTIER_MON_GENGAR_5 800
#define FRONTIER_MON_GENGAR_6 801
#define FRONTIER_MON_GENGAR_7 802
#define FRONTIER_MON_GENGAR_8 803
#define FRONTIER_MON_URSARING_5 804
#define FRONTIER_MON_URSARING_6 805
#define FRONTIER_MON_URSARING_7 806
#define FRONTIER_MON_URSARING_8 807
#define FRONTIER_MON_MACHAMP_5 808
#define FRONTIER_MON_MACHAMP_6 809
#define FRONTIER_MON_MACHAMP_7 810
#define FRONTIER_MON_MACHAMP_8 811
#define FRONTIER_MON_GARDEVOIR_5 812
#define FRONTIER_MON_GARDEVOIR_6 813
#define FRONTIER_MON_GARDEVOIR_7 814
#define FRONTIER_MON_GARDEVOIR_8 815
#define FRONTIER_MON_STARMIE_5 816
#define FRONTIER_MON_STARMIE_6 817
#define FRONTIER_MON_STARMIE_7 818
#define FRONTIER_MON_STARMIE_8 819
#define FRONTIER_MON_LAPRAS_5 820
#define FRONTIER_MON_LAPRAS_6 821
#define FRONTIER_MON_LAPRAS_7 822
#define FRONTIER_MON_LAPRAS_8 823
#define FRONTIER_MON_SNORLAX_5 824
#define FRONTIER_MON_SNORLAX_6 825
#define FRONTIER_MON_SNORLAX_7 826
#define FRONTIER_MON_SNORLAX_8 827
#define FRONTIER_MON_SALAMENCE_5 828
#define FRONTIER_MON_SALAMENCE_6 829
#define FRONTIER_MON_SALAMENCE_7 830
#define FRONTIER_MON_SALAMENCE_8 831
#define FRONTIER_MON_METAGROSS_5 832
#define FRONTIER_MON_METAGROSS_6 833
#define FRONTIER_MON_METAGROSS_7 834
#define FRONTIER_MON_METAGROSS_8 835
#define FRONTIER_MON_REGIROCK_5 836
#define FRONTIER_MON_REGIROCK_6 837
#define FRONTIER_MON_REGICE_5 838
#define FRONTIER_MON_REGICE_6 839
#define FRONTIER_MON_REGISTEEL_5 840
#define FRONTIER_MON_REGISTEEL_6 841
#define FRONTIER_MON_LATIAS_5 842
#define FRONTIER_MON_LATIAS_6 843
#define FRONTIER_MON_LATIAS_7 844
#define FRONTIER_MON_LATIAS_8 845
#define FRONTIER_MON_LATIOS_5 846
#define FRONTIER_MON_LATIOS_6 847
#define FRONTIER_MON_LATIOS_7 848
#define FRONTIER_MON_LATIOS_8 849
#define FRONTIER_MONS_HIGH_TIER 849 // Mons above this point can only appear > level 50
#define FRONTIER_MON_DRAGONITE_1 850
#define FRONTIER_MON_DRAGONITE_2 851
#define FRONTIER_MON_DRAGONITE_3 852
#define FRONTIER_MON_DRAGONITE_4 853
#define FRONTIER_MON_DRAGONITE_5 854
#define FRONTIER_MON_DRAGONITE_6 855
#define FRONTIER_MON_DRAGONITE_7 856
#define FRONTIER_MON_DRAGONITE_8 857
#define FRONTIER_MON_DRAGONITE_9 858
#define FRONTIER_MON_DRAGONITE_10 859
#define FRONTIER_MON_TYRANITAR_1 860
#define FRONTIER_MON_TYRANITAR_2 861
#define FRONTIER_MON_TYRANITAR_3 862
#define FRONTIER_MON_TYRANITAR_4 863
#define FRONTIER_MON_TYRANITAR_5 864
#define FRONTIER_MON_TYRANITAR_6 865
#define FRONTIER_MON_TYRANITAR_7 866
#define FRONTIER_MON_TYRANITAR_8 867
#define FRONTIER_MON_TYRANITAR_9 868
#define FRONTIER_MON_TYRANITAR_10 869
#define FRONTIER_MON_ARTICUNO_5 870
#define FRONTIER_MON_ARTICUNO_6 871
#define FRONTIER_MON_ZAPDOS_5 872
#define FRONTIER_MON_ZAPDOS_6 873
#define FRONTIER_MON_MOLTRES_5 874
#define FRONTIER_MON_MOLTRES_6 875
#define FRONTIER_MON_RAIKOU_5 876
#define FRONTIER_MON_RAIKOU_6 877
#define FRONTIER_MON_ENTEI_5 878
#define FRONTIER_MON_ENTEI_6 879
#define FRONTIER_MON_SUICUNE_5 880
#define FRONTIER_MON_SUICUNE_6 881
#define NUM_FRONTIER_MONS 882
#endif //GUARD_CONSTANTS_BATTLE_FRONTIER_MONS_H
include/constants/battle_frontier_trainers.h
+309
View File
@@ -0,0 +1,309 @@
#ifndef GUARD_CONSTANTS_BATTLE_FRONTIER_TRAINERS_H
#define GUARD_CONSTANTS_BATTLE_FRONTIER_TRAINERS_H
#define FRONTIER_TRAINER_BRADY 0
#define FRONTIER_TRAINER_CONNER 1
#define FRONTIER_TRAINER_BRADLEY 2
#define FRONTIER_TRAINER_CYBIL 3
#define FRONTIER_TRAINER_RODETTE 4
#define FRONTIER_TRAINER_PEGGY 5
#define FRONTIER_TRAINER_KEITH 6
#define FRONTIER_TRAINER_GRAYSON 7
#define FRONTIER_TRAINER_GLENN 8
#define FRONTIER_TRAINER_LILIANA 9
#define FRONTIER_TRAINER_ELISE 10
#define FRONTIER_TRAINER_ZOEY 11
#define FRONTIER_TRAINER_MANUEL 12
#define FRONTIER_TRAINER_RUSS 13
#define FRONTIER_TRAINER_DUSTIN 14
#define FRONTIER_TRAINER_TINA 15
#define FRONTIER_TRAINER_GILLIAN1 16
#define FRONTIER_TRAINER_ZOE 17
#define FRONTIER_TRAINER_CHEN 18
#define FRONTIER_TRAINER_AL 19
#define FRONTIER_TRAINER_MITCH 20
#define FRONTIER_TRAINER_ANNE 21
#define FRONTIER_TRAINER_ALIZE 22
#define FRONTIER_TRAINER_LAUREN 23
#define FRONTIER_TRAINER_KIPP 24
#define FRONTIER_TRAINER_JASON 25
#define FRONTIER_TRAINER_JOHN 26
#define FRONTIER_TRAINER_ANN 27
#define FRONTIER_TRAINER_EILEEN 28
#define FRONTIER_TRAINER_CARLIE 29
#define FRONTIER_TRAINER_GORDON 30
#define FRONTIER_TRAINER_AYDEN 31
#define FRONTIER_TRAINER_MARCO 32
#define FRONTIER_TRAINER_CIERRA 33
#define FRONTIER_TRAINER_MARCY 34
#define FRONTIER_TRAINER_KATHY 35
#define FRONTIER_TRAINER_PEYTON 36
#define FRONTIER_TRAINER_JULIAN 37
#define FRONTIER_TRAINER_QUINN 38
#define FRONTIER_TRAINER_HAYLEE 39
#define FRONTIER_TRAINER_AMANDA 40
#define FRONTIER_TRAINER_STACY 41
#define FRONTIER_TRAINER_RAFAEL 42
#define FRONTIER_TRAINER_OLIVER 43
#define FRONTIER_TRAINER_PAYTON 44
#define FRONTIER_TRAINER_PAMELA 45
#define FRONTIER_TRAINER_ELIZA 46
#define FRONTIER_TRAINER_MARISA 47
#define FRONTIER_TRAINER_LEWIS 48
#define FRONTIER_TRAINER_YOSHI 49
#define FRONTIER_TRAINER_DESTIN 50
#define FRONTIER_TRAINER_KEON 51
#define FRONTIER_TRAINER_STUART 52
#define FRONTIER_TRAINER_NESTOR 53
#define FRONTIER_TRAINER_DERRICK 54
#define FRONTIER_TRAINER_BRYSON 55
#define FRONTIER_TRAINER_CLAYTON 56
#define FRONTIER_TRAINER_TRENTON 57
#define FRONTIER_TRAINER_JENSON 58
#define FRONTIER_TRAINER_WESLEY 59
#define FRONTIER_TRAINER_ANTON 60
#define FRONTIER_TRAINER_LAWSON 61
#define FRONTIER_TRAINER_SAMMY 62
#define FRONTIER_TRAINER_ARNIE 63
#define FRONTIER_TRAINER_ADRIAN 64
#define FRONTIER_TRAINER_TRISTAN 65
#define FRONTIER_TRAINER_JULIANA 66
#define FRONTIER_TRAINER_RYLEE 67
#define FRONTIER_TRAINER_CHELSEA 68
#define FRONTIER_TRAINER_DANELA 69
#define FRONTIER_TRAINER_LIZBETH 70
#define FRONTIER_TRAINER_AMELIA 71
#define FRONTIER_TRAINER_JILLIAN 72
#define FRONTIER_TRAINER_ABBIE 73
#define FRONTIER_TRAINER_BRIANA 74
#define FRONTIER_TRAINER_ANTONIO 75
#define FRONTIER_TRAINER_JADEN 76
#define FRONTIER_TRAINER_DAKOTA 77
#define FRONTIER_TRAINER_BRAYDEN 78
#define FRONTIER_TRAINER_CORSON 79
#define FRONTIER_TRAINER_TREVIN 80
#define FRONTIER_TRAINER_PATRICK 81
#define FRONTIER_TRAINER_KADEN 82
#define FRONTIER_TRAINER_MAXWELL 83
#define FRONTIER_TRAINER_DARYL 84
#define FRONTIER_TRAINER_KENNETH 85
#define FRONTIER_TRAINER_RICH 86
#define FRONTIER_TRAINER_CADEN 87
#define FRONTIER_TRAINER_MARLON 88
#define FRONTIER_TRAINER_NASH 89
#define FRONTIER_TRAINER_ROBBY 90
#define FRONTIER_TRAINER_REECE 91
#define FRONTIER_TRAINER_KATHRYN 92
#define FRONTIER_TRAINER_ELLEN 93
#define FRONTIER_TRAINER_RAMON 94
#define FRONTIER_TRAINER_ARTHUR 95
#define FRONTIER_TRAINER_ALONDRA 96
#define FRONTIER_TRAINER_ADRIANA 97
#define FRONTIER_TRAINER_MALIK 98
#define FRONTIER_TRAINER_JILL 99
#define FRONTIER_TRAINER_ERIK 100
#define FRONTIER_TRAINER_YAZMIN 101
#define FRONTIER_TRAINER_JAMAL 102
#define FRONTIER_TRAINER_LESLIE 103
#define FRONTIER_TRAINER_DAVE 104
#define FRONTIER_TRAINER_CARLO 105
#define FRONTIER_TRAINER_EMILIA 106
#define FRONTIER_TRAINER_DALIA 107
#define FRONTIER_TRAINER_HITOMI 108
#define FRONTIER_TRAINER_RICARDO 109
#define FRONTIER_TRAINER_SHIZUKA 110
#define FRONTIER_TRAINER_JOANA 111
#define FRONTIER_TRAINER_KELLY 112
#define FRONTIER_TRAINER_RAYNA 113
#define FRONTIER_TRAINER_EVAN 114
#define FRONTIER_TRAINER_JORDAN 115
#define FRONTIER_TRAINER_JOEL 116
#define FRONTIER_TRAINER_KRISTEN 117
#define FRONTIER_TRAINER_SELPHY 118
#define FRONTIER_TRAINER_CHLOE 119
#define FRONTIER_TRAINER_NORTON 120
#define FRONTIER_TRAINER_LUKAS 121
#define FRONTIER_TRAINER_ZACH 122
#define FRONTIER_TRAINER_KAITLYN 123
#define FRONTIER_TRAINER_BREANNA 124
#define FRONTIER_TRAINER_KENDRA 125
#define FRONTIER_TRAINER_MOLLY 126
#define FRONTIER_TRAINER_JAZMIN 127
#define FRONTIER_TRAINER_KELSEY 128
#define FRONTIER_TRAINER_JALEN 129
#define FRONTIER_TRAINER_GRIFFEN 130
#define FRONTIER_TRAINER_XANDER 131
#define FRONTIER_TRAINER_MARVIN 132
#define FRONTIER_TRAINER_BRENNAN 133
#define FRONTIER_TRAINER_BALEY 134
#define FRONTIER_TRAINER_ZACKARY 135
#define FRONTIER_TRAINER_GABRIEL 136
#define FRONTIER_TRAINER_EMILY 137
#define FRONTIER_TRAINER_JORDYN 138
#define FRONTIER_TRAINER_SOFIA 139
#define FRONTIER_TRAINER_BRADEN 140
#define FRONTIER_TRAINER_KAYDEN 141
#define FRONTIER_TRAINER_COOPER 142
#define FRONTIER_TRAINER_JULIA 143
#define FRONTIER_TRAINER_AMARA 144
#define FRONTIER_TRAINER_LYNN 145
#define FRONTIER_TRAINER_JOVAN 146
#define FRONTIER_TRAINER_DOMINIC 147
#define FRONTIER_TRAINER_NIKOLAS 148
#define FRONTIER_TRAINER_VALERIA 149
#define FRONTIER_TRAINER_DELANEY 150
#define FRONTIER_TRAINER_MEGHAN 151
#define FRONTIER_TRAINER_ROBERTO 152
#define FRONTIER_TRAINER_DAMIAN 153
#define FRONTIER_TRAINER_BRODY 154
#define FRONTIER_TRAINER_GRAHAM 155
#define FRONTIER_TRAINER_TYLOR 156
#define FRONTIER_TRAINER_JAREN 157
#define FRONTIER_TRAINER_CORDELL 158
#define FRONTIER_TRAINER_JAZLYN 159
#define FRONTIER_TRAINER_ZACHERY 160
#define FRONTIER_TRAINER_JOHAN 161
#define FRONTIER_TRAINER_SHEA 162
#define FRONTIER_TRAINER_KAILA 163
#define FRONTIER_TRAINER_ISIAH 164
#define FRONTIER_TRAINER_GARRETT 165
#define FRONTIER_TRAINER_HAYLIE 166
#define FRONTIER_TRAINER_MEGAN 167
#define FRONTIER_TRAINER_ISSAC 168
#define FRONTIER_TRAINER_QUINTON 169
#define FRONTIER_TRAINER_SALMA 170
#define FRONTIER_TRAINER_ANSLEY 171
#define FRONTIER_TRAINER_HOLDEN 172
#define FRONTIER_TRAINER_LUCA 173
#define FRONTIER_TRAINER_JAMISON 174
#define FRONTIER_TRAINER_GUNNAR 175
#define FRONTIER_TRAINER_CRAIG 176
#define FRONTIER_TRAINER_PIERCE 177
#define FRONTIER_TRAINER_REGINA 178
#define FRONTIER_TRAINER_ALISON 179
#define FRONTIER_TRAINER_HANK 180
#define FRONTIER_TRAINER_EARL 181
#define FRONTIER_TRAINER_RAMIRO 182
#define FRONTIER_TRAINER_HUNTER 183
#define FRONTIER_TRAINER_AIDEN 184
#define FRONTIER_TRAINER_XAVIER 185
#define FRONTIER_TRAINER_CLINTON 186
#define FRONTIER_TRAINER_JESSE 187
#define FRONTIER_TRAINER_EDUARDO 188
#define FRONTIER_TRAINER_HAL 189
#define FRONTIER_TRAINER_GAGE 190
#define FRONTIER_TRAINER_ARNOLD 191
#define FRONTIER_TRAINER_JARRETT 192
#define FRONTIER_TRAINER_GARETT 193
#define FRONTIER_TRAINER_EMANUEL 194
#define FRONTIER_TRAINER_GUSTAVO 195
#define FRONTIER_TRAINER_KAMERON 196
#define FRONTIER_TRAINER_ALFREDO 197
#define FRONTIER_TRAINER_RUBEN 198
#define FRONTIER_TRAINER_LAMAR 199
#define FRONTIER_TRAINER_JAXON 200
#define FRONTIER_TRAINER_LOGAN 201
#define FRONTIER_TRAINER_EMILEE 202
#define FRONTIER_TRAINER_JOSIE 203
#define FRONTIER_TRAINER_ARMANDO 204
#define FRONTIER_TRAINER_SKYLER 205
#define FRONTIER_TRAINER_RUTH 206
#define FRONTIER_TRAINER_MELODY 207
#define FRONTIER_TRAINER_PEDRO 208
#define FRONTIER_TRAINER_ERICK 209
#define FRONTIER_TRAINER_ELAINE 210
#define FRONTIER_TRAINER_JOYCE 211
#define FRONTIER_TRAINER_TODD 212
#define FRONTIER_TRAINER_GAVIN 213
#define FRONTIER_TRAINER_MALORY 214
#define FRONTIER_TRAINER_ESTHER 215
#define FRONTIER_TRAINER_OSCAR 216
#define FRONTIER_TRAINER_WILSON 217
#define FRONTIER_TRAINER_CLARE 218
#define FRONTIER_TRAINER_TESS 219
#define FRONTIER_TRAINER_LEON 220
#define FRONTIER_TRAINER_ALONZO 221
#define FRONTIER_TRAINER_VINCE 222
#define FRONTIER_TRAINER_BRYON 223
#define FRONTIER_TRAINER_AVA 224
#define FRONTIER_TRAINER_MIRIAM 225
#define FRONTIER_TRAINER_CARRIE 226
#define FRONTIER_TRAINER_GILLIAN2 227
#define FRONTIER_TRAINER_TYLER 228
#define FRONTIER_TRAINER_CHAZ 229
#define FRONTIER_TRAINER_NELSON 230
#define FRONTIER_TRAINER_SHANIA 231
#define FRONTIER_TRAINER_STELLA 232
#define FRONTIER_TRAINER_DORINE 233
#define FRONTIER_TRAINER_MADDOX 234
#define FRONTIER_TRAINER_DAVIN 235
#define FRONTIER_TRAINER_TREVON 236
#define FRONTIER_TRAINER_MATEO 237
#define FRONTIER_TRAINER_BRET 238
#define FRONTIER_TRAINER_RAUL 239
#define FRONTIER_TRAINER_KAY 240
#define FRONTIER_TRAINER_ELENA 241
#define FRONTIER_TRAINER_ALANA 242
#define FRONTIER_TRAINER_ALEXAS 243
#define FRONTIER_TRAINER_WESTON 244
#define FRONTIER_TRAINER_JASPER 245
#define FRONTIER_TRAINER_NADIA 246
#define FRONTIER_TRAINER_MIRANDA 247
#define FRONTIER_TRAINER_EMMA 248
#define FRONTIER_TRAINER_ROLANDO 249
#define FRONTIER_TRAINER_STANLY 250
#define FRONTIER_TRAINER_DARIO 251
#define FRONTIER_TRAINER_KARLEE 252
#define FRONTIER_TRAINER_JAYLIN 253
#define FRONTIER_TRAINER_INGRID 254
#define FRONTIER_TRAINER_DELILAH 255
#define FRONTIER_TRAINER_CARLY 256
#define FRONTIER_TRAINER_LEXIE 257
#define FRONTIER_TRAINER_MILLER 258
#define FRONTIER_TRAINER_MARV 259
#define FRONTIER_TRAINER_LAYTON 260
#define FRONTIER_TRAINER_BROOKS 261
#define FRONTIER_TRAINER_GREGORY 262
#define FRONTIER_TRAINER_REESE 263
#define FRONTIER_TRAINER_MASON 264
#define FRONTIER_TRAINER_TOBY 265
#define FRONTIER_TRAINER_DOROTHY 266
#define FRONTIER_TRAINER_PIPER 267
#define FRONTIER_TRAINER_FINN 268
#define FRONTIER_TRAINER_SAMIR 269
#define FRONTIER_TRAINER_FIONA 270
#define FRONTIER_TRAINER_GLORIA 271
#define FRONTIER_TRAINER_NICO 272
#define FRONTIER_TRAINER_JEREMY 273
#define FRONTIER_TRAINER_CAITLIN 274
#define FRONTIER_TRAINER_REENA 275
#define FRONTIER_TRAINER_AVERY 276
#define FRONTIER_TRAINER_LIAM 277
#define FRONTIER_TRAINER_THEO 278
#define FRONTIER_TRAINER_BAILEY 279
#define FRONTIER_TRAINER_HUGO 280
#define FRONTIER_TRAINER_BRYCE 281
#define FRONTIER_TRAINER_GIDEON 282
#define FRONTIER_TRAINER_TRISTON 283
#define FRONTIER_TRAINER_CHARLES 284
#define FRONTIER_TRAINER_RAYMOND 285
#define FRONTIER_TRAINER_DIRK 286
#define FRONTIER_TRAINER_HAROLD 287
#define FRONTIER_TRAINER_OMAR 288
#define FRONTIER_TRAINER_PETER 289
#define FRONTIER_TRAINER_DEV 290
#define FRONTIER_TRAINER_COREY 291
#define FRONTIER_TRAINER_ANDRE 292
#define FRONTIER_TRAINER_FERRIS 293
#define FRONTIER_TRAINER_ALIVIA 294
#define FRONTIER_TRAINER_PAIGE 295
#define FRONTIER_TRAINER_ANYA 296
#define FRONTIER_TRAINER_DAWN 297
#define FRONTIER_TRAINER_ABBY 298
#define FRONTIER_TRAINER_GRETEL 299
#define FRONTIER_TRAINERS_COUNT 300
// special trainer IDs begin at 300, see constants/trainers.h
#endif // GUARD_CONSTANTS_BATTLE_FRONTIER_TRAINERS_H
include/constants/battle_tent_mons.h
+173
View File
@@ -0,0 +1,173 @@
#ifndef GUARD_CONSTANTS_BATTLE_TENT_MONS_H
#define GUARD_CONSTANTS_BATTLE_TENT_MONS_H
#define SLATEPORT_TENT_MON_ZIGZAGOON_1 0
#define SLATEPORT_TENT_MON_ZIGZAGOON_2 1
#define SLATEPORT_TENT_MON_BEAUTIFLY 2
#define SLATEPORT_TENT_MON_DUSTOX 3
#define SLATEPORT_TENT_MON_WAILMER_1 4
#define SLATEPORT_TENT_MON_WAILMER_2 5
#define SLATEPORT_TENT_MON_MARILL_1 6
#define SLATEPORT_TENT_MON_WINGULL_1 7
#define SLATEPORT_TENT_MON_PELIPPER_1 8
#define SLATEPORT_TENT_MON_CACNEA_1 9
#define SLATEPORT_TENT_MON_LOMBRE_1 10
#define SLATEPORT_TENT_MON_LOTAD 11
#define SLATEPORT_TENT_MON_SEEDOT 12
#define SLATEPORT_TENT_MON_NUZLEAF 13
#define SLATEPORT_TENT_MON_NINJASK_1 14
#define SLATEPORT_TENT_MON_NINJASK_2 15
#define SLATEPORT_TENT_MON_GRAVELER 16
#define SLATEPORT_TENT_MON_BALTOY 17
#define SLATEPORT_TENT_MON_MIGHTYENA_1 18
#define SLATEPORT_TENT_MON_MIGHTYENA_2 19
#define SLATEPORT_TENT_MON_LINOONE 20
#define SLATEPORT_TENT_MON_GOLDEEN 21
#define SLATEPORT_TENT_MON_ELECTRIKE_1 22
#define SLATEPORT_TENT_MON_VOLTORB 23
#define SLATEPORT_TENT_MON_ARON_1 24
#define SLATEPORT_TENT_MON_ARON_2 25
#define SLATEPORT_TENT_MON_TRAPINCH_1 26
#define SLATEPORT_TENT_MON_CACNEA_2 27
#define SLATEPORT_TENT_MON_TAILLOW 28
#define SLATEPORT_TENT_MON_SWELLOW 29
#define SLATEPORT_TENT_MON_GOLBAT_1 30
#define SLATEPORT_TENT_MON_LOUDRED 31
#define SLATEPORT_TENT_MON_SPINDA 32
#define SLATEPORT_TENT_MON_MAGNEMITE 33
#define SLATEPORT_TENT_MON_WHISMUR 34
#define SLATEPORT_TENT_MON_MAKUHITA 35
#define SLATEPORT_TENT_MON_NUMEL_1 36
#define SLATEPORT_TENT_MON_BARBOACH 37
#define SLATEPORT_TENT_MON_TENTACOOL 38
#define SLATEPORT_TENT_MON_VIGOROTH 39
#define SLATEPORT_TENT_MON_MAGIKARP 40
#define SLATEPORT_TENT_MON_SEVIPER_1 41
#define SLATEPORT_TENT_MON_SOLROCK 42
#define SLATEPORT_TENT_MON_KECLEON_1 43
#define SLATEPORT_TENT_MON_KECLEON_2 44
#define SLATEPORT_TENT_MON_SHROOMISH_1 45
#define SLATEPORT_TENT_MON_SHROOMISH_2 46
#define SLATEPORT_TENT_MON_LOMBRE_2 47
#define SLATEPORT_TENT_MON_NUMEL_2 48
#define SLATEPORT_TENT_MON_TRAPINCH_2 49
#define SLATEPORT_TENT_MON_PELIPPER_2 50
#define SLATEPORT_TENT_MON_WINGULL_2 51
#define SLATEPORT_TENT_MON_MARILL_2 52
#define SLATEPORT_TENT_MON_SKITTY 53
#define SLATEPORT_TENT_MON_SEVIPER_2 54
#define SLATEPORT_TENT_MON_GOLBAT_2 55
#define SLATEPORT_TENT_MON_RALTS 56
#define SLATEPORT_TENT_MON_SANDSHREW 57
#define SLATEPORT_TENT_MON_SWALOT 58
#define SLATEPORT_TENT_MON_VOLBEAT 59
#define SLATEPORT_TENT_MON_ILLUMISE 60
#define SLATEPORT_TENT_MON_KADABRA 61
#define SLATEPORT_TENT_MON_KIRLIA 62
#define SLATEPORT_TENT_MON_BRELOOM 63
#define SLATEPORT_TENT_MON_PLUSLE_1 64
#define SLATEPORT_TENT_MON_PLUSLE_2 65
#define SLATEPORT_TENT_MON_ELECTRIKE_2 66
#define SLATEPORT_TENT_MON_SWABLU 67
#define SLATEPORT_TENT_MON_MACHOP 68
#define SLATEPORT_TENT_MON_MACHOKE 69
#define NUM_SLATEPORT_TENT_MONS 70
#define VERDANTURF_TENT_MON_POOCHYENA 0
#define VERDANTURF_TENT_MON_ZIGZAGOON 1
#define VERDANTURF_TENT_MON_DUSTOX 2
#define VERDANTURF_TENT_MON_TAILLOW 3
#define VERDANTURF_TENT_MON_SHROOMISH 4
#define VERDANTURF_TENT_MON_MACHOP 5
#define VERDANTURF_TENT_MON_MAGIKARP 6
#define VERDANTURF_TENT_MON_BARBOACH 7
#define VERDANTURF_TENT_MON_WINGULL 8
#define VERDANTURF_TENT_MON_ARON_1 9
#define VERDANTURF_TENT_MON_NUMEL_1 10
#define VERDANTURF_TENT_MON_SWALOT 11
#define VERDANTURF_TENT_MON_KECLEON 12
#define VERDANTURF_TENT_MON_BALTOY 13
#define VERDANTURF_TENT_MON_NINJASK 14
#define VERDANTURF_TENT_MON_MAKUHITA 15
#define VERDANTURF_TENT_MON_SWABLU 16
#define VERDANTURF_TENT_MON_GOLDEEN_1 17
#define VERDANTURF_TENT_MON_LOTAD 18
#define VERDANTURF_TENT_MON_NUMEL_2 19
#define VERDANTURF_TENT_MON_LINOONE 20
#define VERDANTURF_TENT_MON_SEVIPER 21
#define VERDANTURF_TENT_MON_SKARMORY 22
#define VERDANTURF_TENT_MON_SWELLOW 23
#define VERDANTURF_TENT_MON_GOLDEEN_2 24
#define VERDANTURF_TENT_MON_ELECTRIKE 25
#define VERDANTURF_TENT_MON_NUZLEAF 26
#define VERDANTURF_TENT_MON_ARON_2 27
#define VERDANTURF_TENT_MON_MIGHTYENA 28
#define VERDANTURF_TENT_MON_SOLROCK 29
#define VERDANTURF_TENT_MON_GRAVELER 30
#define VERDANTURF_TENT_MON_KADABRA 31
#define VERDANTURF_TENT_MON_VOLTORB 32
#define VERDANTURF_TENT_MON_MAGNEMITE 33
#define VERDANTURF_TENT_MON_PELIPPER 34
#define VERDANTURF_TENT_MON_LOUDRED 35
#define VERDANTURF_TENT_MON_MARILL 36
#define VERDANTURF_TENT_MON_TRAPINCH 37
#define VERDANTURF_TENT_MON_TENTACOOL 38
#define VERDANTURF_TENT_MON_VIGOROTH 39
#define VERDANTURF_TENT_MON_WAILMER 40
#define VERDANTURF_TENT_MON_ILLUMISE 41
#define VERDANTURF_TENT_MON_MACHOKE 42
#define VERDANTURF_TENT_MON_WHISMUR 43
#define VERDANTURF_TENT_MON_CACNEA 44
#define NUM_VERDANTURF_TENT_MONS 45
#define FALLARBOR_TENT_MON_NUMEL 0
#define FALLARBOR_TENT_MON_LINOONE_1 1
#define FALLARBOR_TENT_MON_PLUSLE 2
#define FALLARBOR_TENT_MON_POOCHYENA 3
#define FALLARBOR_TENT_MON_KECLEON 4
#define FALLARBOR_TENT_MON_MAGIKARP 5
#define FALLARBOR_TENT_MON_SOLROCK 6
#define FALLARBOR_TENT_MON_MAKUHITA 7
#define FALLARBOR_TENT_MON_MACHOKE 8
#define FALLARBOR_TENT_MON_NINCADA 9
#define FALLARBOR_TENT_MON_BEAUTIFLY 10
#define FALLARBOR_TENT_MON_DUSTOX 11
#define FALLARBOR_TENT_MON_ILLUMISE 12
#define FALLARBOR_TENT_MON_VOLBEAT 13
#define FALLARBOR_TENT_MON_NINJASK_1 14
#define FALLARBOR_TENT_MON_NINJASK_2 15
#define FALLARBOR_TENT_MON_ARON_1 16
#define FALLARBOR_TENT_MON_ARON_2 17
#define FALLARBOR_TENT_MON_ELECTRIKE 18
#define FALLARBOR_TENT_MON_MAGNEMITE 19
#define FALLARBOR_TENT_MON_VOLTORB 20
#define FALLARBOR_TENT_MON_WHISMUR 21
#define FALLARBOR_TENT_MON_LOUDRED 22
#define FALLARBOR_TENT_MON_LINOONE_2 23
#define FALLARBOR_TENT_MON_MIGHTYENA 24
#define FALLARBOR_TENT_MON_SWABLU 25
#define FALLARBOR_TENT_MON_SKARMORY 26
#define FALLARBOR_TENT_MON_GOLBAT 27
#define FALLARBOR_TENT_MON_WINGULL 28
#define FALLARBOR_TENT_MON_PELIPPER 29
#define FALLARBOR_TENT_MON_BARBOACH 30
#define FALLARBOR_TENT_MON_WAILMER 31
#define FALLARBOR_TENT_MON_MARILL 32
#define FALLARBOR_TENT_MON_GOLDEEN_1 33
#define FALLARBOR_TENT_MON_GOLDEEN_2 34
#define FALLARBOR_TENT_MON_TRAPINCH 35
#define FALLARBOR_TENT_MON_BALTOY 36
#define FALLARBOR_TENT_MON_GRAVELER 37
#define FALLARBOR_TENT_MON_SANDSHREW 38
#define FALLARBOR_TENT_MON_SWALOT 39
#define FALLARBOR_TENT_MON_SHROOMISH 40
#define FALLARBOR_TENT_MON_KIRLIA 41
#define FALLARBOR_TENT_MON_LOMBRE 42
#define FALLARBOR_TENT_MON_NUZLEAF 43
#define FALLARBOR_TENT_MON_CACNEA 44
#define NUM_FALLARBOR_TENT_MONS 45
#endif // GUARD_CONSTANTS_BATTLE_TENT_MONS_H
include/constants/battle_tent_trainers.h
+99
View File
@@ -0,0 +1,99 @@
#ifndef GUARD_CONSTANTS_BATTLE_TENT_TRAINERS_H
#define GUARD_CONSTANTS_BATTLE_TENT_TRAINERS_H
#define SLATEPORT_TENT_TRAINER_JOLIE 0
#define SLATEPORT_TENT_TRAINER_MALACHI 1
#define SLATEPORT_TENT_TRAINER_KELSIE 2
#define SLATEPORT_TENT_TRAINER_DAVON 3
#define SLATEPORT_TENT_TRAINER_GLENDA 4
#define SLATEPORT_TENT_TRAINER_HELENA 5
#define SLATEPORT_TENT_TRAINER_RODOLFO 6
#define SLATEPORT_TENT_TRAINER_DAVION 7
#define SLATEPORT_TENT_TRAINER_KENDALL 8
#define SLATEPORT_TENT_TRAINER_COLTEN 9
#define SLATEPORT_TENT_TRAINER_IRVIN 10
#define SLATEPORT_TENT_TRAINER_SHAUN 11
#define SLATEPORT_TENT_TRAINER_KYLER 12
#define SLATEPORT_TENT_TRAINER_MAGGIE 13
#define SLATEPORT_TENT_TRAINER_STEPHON 14
#define SLATEPORT_TENT_TRAINER_REBECCA 15
#define SLATEPORT_TENT_TRAINER_REGGIE 16
#define SLATEPORT_TENT_TRAINER_JANAE 17
#define SLATEPORT_TENT_TRAINER_CAIDEN 18
#define SLATEPORT_TENT_TRAINER_KIRSTEN 19
#define SLATEPORT_TENT_TRAINER_KURTIS 20
#define SLATEPORT_TENT_TRAINER_STEFAN 21
#define SLATEPORT_TENT_TRAINER_AVERY 22
#define SLATEPORT_TENT_TRAINER_DWANE 23
#define SLATEPORT_TENT_TRAINER_MCKENNA 24
#define SLATEPORT_TENT_TRAINER_CAMRYN 25
#define SLATEPORT_TENT_TRAINER_NATASHA 26
#define SLATEPORT_TENT_TRAINER_AUSTYN 27
#define SLATEPORT_TENT_TRAINER_DONOVAN 28
#define SLATEPORT_TENT_TRAINER_TAMIA 29
#define VERDANTURF_TENT_TRAINER_BRENNA 0
#define VERDANTURF_TENT_TRAINER_DILAN 1
#define VERDANTURF_TENT_TRAINER_ELIANA 2
#define VERDANTURF_TENT_TRAINER_MARKUS 3
#define VERDANTURF_TENT_TRAINER_CAITLYN 4
#define VERDANTURF_TENT_TRAINER_DESIREE 5
#define VERDANTURF_TENT_TRAINER_RONALD 6
#define VERDANTURF_TENT_TRAINER_ASHTEN 7
#define VERDANTURF_TENT_TRAINER_GERARD 8
#define VERDANTURF_TENT_TRAINER_BRADLY 9
#define VERDANTURF_TENT_TRAINER_DENNIS 10
#define VERDANTURF_TENT_TRAINER_PRESTIN 11
#define VERDANTURF_TENT_TRAINER_ERNESTO 12
#define VERDANTURF_TENT_TRAINER_NALA 13
#define VERDANTURF_TENT_TRAINER_DARNELL 14
#define VERDANTURF_TENT_TRAINER_ASHLYN 15
#define VERDANTURF_TENT_TRAINER_ADDISON 16
#define VERDANTURF_TENT_TRAINER_JUSTINE 17
#define VERDANTURF_TENT_TRAINER_TYSON 18
#define VERDANTURF_TENT_TRAINER_LAILA 19
#define VERDANTURF_TENT_TRAINER_WAREN 20
#define VERDANTURF_TENT_TRAINER_TOBIAS 21
#define VERDANTURF_TENT_TRAINER_JOSIAH 22
#define VERDANTURF_TENT_TRAINER_DION 23
#define VERDANTURF_TENT_TRAINER_KENZIE 24
#define VERDANTURF_TENT_TRAINER_LILLIAN 25
#define VERDANTURF_TENT_TRAINER_LESLEY 26
#define VERDANTURF_TENT_TRAINER_MARQUIS 27
#define VERDANTURF_TENT_TRAINER_FREDDY 28
#define VERDANTURF_TENT_TRAINER_CECILIA 29
#define FALLARBOR_TENT_TRAINER_AMBER 0
#define FALLARBOR_TENT_TRAINER_JAVIER 1
#define FALLARBOR_TENT_TRAINER_NATALIA 2
#define FALLARBOR_TENT_TRAINER_TREVE 3
#define FALLARBOR_TENT_TRAINER_ARIANNA 4
#define FALLARBOR_TENT_TRAINER_JADYN 5
#define FALLARBOR_TENT_TRAINER_GERARDO 6
#define FALLARBOR_TENT_TRAINER_JONN 7
#define FALLARBOR_TENT_TRAINER_ESTEBAN 8
#define FALLARBOR_TENT_TRAINER_JAMESON 9
#define FALLARBOR_TENT_TRAINER_ALANZO 10
#define FALLARBOR_TENT_TRAINER_HOWARD 11
#define FALLARBOR_TENT_TRAINER_CONRAD 12
#define FALLARBOR_TENT_TRAINER_MAKENNA 13
#define FALLARBOR_TENT_TRAINER_BRAYAN 14
#define FALLARBOR_TENT_TRAINER_MARIANA 15
#define FALLARBOR_TENT_TRAINER_SHELDON 16
#define FALLARBOR_TENT_TRAINER_GIANNA 17
#define FALLARBOR_TENT_TRAINER_YAHIR 18
#define FALLARBOR_TENT_TRAINER_BRITNEY 19
#define FALLARBOR_TENT_TRAINER_HECTER 20
#define FALLARBOR_TENT_TRAINER_TANNOR 21
#define FALLARBOR_TENT_TRAINER_BENJI 22
#define FALLARBOR_TENT_TRAINER_RORY 23
#define FALLARBOR_TENT_TRAINER_ELEANOR 24
#define FALLARBOR_TENT_TRAINER_EVELYN 25
#define FALLARBOR_TENT_TRAINER_ARIELLE 26
#define FALLARBOR_TENT_TRAINER_CONNAR 27
#define FALLARBOR_TENT_TRAINER_MAURICE 28
#define FALLARBOR_TENT_TRAINER_KIANNA 29
#define NUM_BATTLE_TENT_TRAINERS 30
#endif // GUARD_CONSTANTS_BATTLE_TENT_TRAINERS_H
include/constants/flags.h
+9 -5
View File
@@ -1,6 +1,8 @@
#ifndef GUARD_CONSTANTS_FLAGS_H #ifndef GUARD_CONSTANTS_FLAGS_H
#define GUARD_CONSTANTS_FLAGS_H #define GUARD_CONSTANTS_FLAGS_H
#include "constants/opponents.h"
// Temporary Flags // Temporary Flags
// These temporary flags are are cleared every time a map is loaded. They are used // These temporary flags are are cleared every time a map is loaded. They are used
// for things like shortening an NPCs introduction text if the player already spoke // for things like shortening an NPCs introduction text if the player already spoke
@@ -533,8 +535,6 @@
#define FLAG_MYSTERY_EVENT_14 0x1F2 #define FLAG_MYSTERY_EVENT_14 0x1F2
#define FLAG_MYSTERY_EVENT_15 0x1F3 #define FLAG_MYSTERY_EVENT_15 0x1F3
#define FLAG_TRICK_HOUSE_END_ROOM 0x1F5 // Trick House End Room Flag
// Hidden Items -- sorted by location // Hidden Items -- sorted by location
#define FLAG_HIDDEN_ITEMS_START 0x1F4 #define FLAG_HIDDEN_ITEMS_START 0x1F4
#define FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x01) #define FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x01)
@@ -1342,13 +1342,17 @@
#define FLAG_UNUSED_0x4FF 0x4FF // Unused Flag #define FLAG_UNUSED_0x4FF 0x4FF // Unused Flag
#define FLAG_TRAINER_FLAG_START 0x500 // Trainer Flags
#define TRAINERS_FLAG_NO 0x356 // Trainer flags occupy 0x500 - 0x85F, the last 9 of which are unused
// See constants/opponents.h. The values there + FLAG_TRAINER_FLAG_START are the flag IDs
#define SYSTEM_FLAGS (FLAG_TRAINER_FLAG_START + TRAINERS_FLAG_NO + 0xA) // 0x860 #define TRAINER_FLAGS_START 0x500
#define TRAINER_FLAGS_END (TRAINER_FLAGS_START + MAX_TRAINERS_COUNT - 1) // 0x85F
// System Flags // System Flags
#define SYSTEM_FLAGS (TRAINER_FLAGS_END + 1) // 0x860
#define FLAG_SYS_POKEMON_GET (SYSTEM_FLAGS + 0) // FLAG_0x860 #define FLAG_SYS_POKEMON_GET (SYSTEM_FLAGS + 0) // FLAG_0x860
#define FLAG_SYS_POKEDEX_GET (SYSTEM_FLAGS + 1) #define FLAG_SYS_POKEDEX_GET (SYSTEM_FLAGS + 1)
#define FLAG_SYS_POKENAV_GET (SYSTEM_FLAGS + 2) #define FLAG_SYS_POKENAV_GET (SYSTEM_FLAGS + 2)
include/constants/global.h
+1
View File
@@ -58,6 +58,7 @@
#define TRAINER_ID_LENGTH 4 #define TRAINER_ID_LENGTH 4
#define MAX_MON_MOVES 4 #define MAX_MON_MOVES 4
#define NUM_STATS 6
// party sizes // party sizes
#define PARTY_SIZE 6 #define PARTY_SIZE 6
include/constants/metatile_labels.h
+172
View File
@@ -25,6 +25,16 @@
#define METATILE_General_RoughWater 0x14E #define METATILE_General_RoughWater 0x14E
#define METATILE_General_RoughDeepWater 0x14F #define METATILE_General_RoughDeepWater 0x14F
#define METATILE_General_ReflectiveWater 0x0A1 #define METATILE_General_ReflectiveWater 0x0A1
#define METATILE_General_SecretBase_TreeLeft 0x026
#define METATILE_General_SecretBase_TreeRight 0x027
#define METATILE_General_SecretBase_VineLeft 0x036
#define METATILE_General_SecretBase_VineRight 0x037
#define METATILE_General_RedCaveIndent 0x1A0
#define METATILE_General_RedCaveOpen 0x1A1
#define METATILE_General_YellowCaveIndent 0x1A8
#define METATILE_General_YellowCaveOpen 0x1A9
#define METATILE_General_BlueCaveIndent 0x1B0
#define METATILE_General_BlueCaveOpen 0x1B1
// gTileset_Building // gTileset_Building
#define METATILE_Building_PC_Off 0x004 #define METATILE_Building_PC_Off 0x004
@@ -143,6 +153,8 @@
#define METATILE_Fortree_BridgeOverGrass_Lowered 0x24F #define METATILE_Fortree_BridgeOverGrass_Lowered 0x24F
#define METATILE_Fortree_BridgeOverTrees_Raised 0x256 #define METATILE_Fortree_BridgeOverTrees_Raised 0x256
#define METATILE_Fortree_BridgeOverTrees_Lowered 0x257 #define METATILE_Fortree_BridgeOverTrees_Lowered 0x257
#define METATILE_Fortree_SecretBase_Shrub 0x271
#define METATILE_Fortree_SecretBase_ShrubOpen 0x278
#define METATILE_Fortree_SecretBase_LongGrass_TopLeft 0x279 #define METATILE_Fortree_SecretBase_LongGrass_TopLeft 0x279
#define METATILE_Fortree_SecretBase_LongGrass_TopMid 0x27A #define METATILE_Fortree_SecretBase_LongGrass_TopMid 0x27A
#define METATILE_Fortree_SecretBase_LongGrass_TopRight 0x27B #define METATILE_Fortree_SecretBase_LongGrass_TopRight 0x27B
@@ -164,6 +176,8 @@
// gTileset_Fallarbor // gTileset_Fallarbor
#define METATILE_Fallarbor_AshGrass 0x20A #define METATILE_Fallarbor_AshGrass 0x20A
#define METATILE_Fallarbor_BrownCaveIndent 0x208
#define METATILE_Fallarbor_BrownCaveOpen 0x210
#define METATILE_Fallarbor_NormalGrass 0x212 #define METATILE_Fallarbor_NormalGrass 0x212
#define METATILE_Fallarbor_AshField 0x218 #define METATILE_Fallarbor_AshField 0x218
#define METATILE_Fallarbor_BrownCaveEntrance_Top 0x259 #define METATILE_Fallarbor_BrownCaveEntrance_Top 0x259
@@ -414,4 +428,162 @@
#define METATILE_Underwater_RockWall 0x21E #define METATILE_Underwater_RockWall 0x21E
#define METATILE_Underwater_FloorShadow 0x228 #define METATILE_Underwater_FloorShadow 0x228
// gTileset_SecretBase
#define METATILE_SecretBase_Wall_TopMid 0x202
#define METATILE_SecretBase_Ground 0x20A
#define METATILE_SecretBase_PC 0x220
#define METATILE_SecretBase_RegisterPC 0x221
#define METATILE_SecretBase_PC_On 0x224
#define METATILE_SecretBase_RedBrick_Top 0x225
#define METATILE_SecretBase_RedBrick_Bottom 0x22D
#define METATILE_SecretBase_YellowBrick_Top 0x226
#define METATILE_SecretBase_YellowBrick_Bottom 0x22E
#define METATILE_SecretBase_BlueBrick_Top 0x227
#define METATILE_SecretBase_BlueBrick_Bottom 0x22F
#define METATILE_SecretBase_MudBall 0x228
#define METATILE_SecretBase_Fence_Horizontal 0x22C
#define METATILE_SecretBase_Fence_Vertical 0x233
#define METATILE_SecretBase_Board_Top 0x234
#define METATILE_SecretBase_Board_Bottom 0x23C
#define METATILE_SecretBase_RedTent_DoorTop 0x239
#define METATILE_SecretBase_RedTent_Door 0x241
#define METATILE_SecretBase_BlueTent_DoorTop 0x251
#define METATILE_SecretBase_BlueTent_Door 0x259
#define METATILE_SecretBase_Slide_Stairs 0x23D
#define METATILE_SecretBase_Slide 0x23E
#define METATILE_SecretBase_Stand_LeftCorner 0x26A
#define METATILE_SecretBase_Stand_RightCorner 0x26D
#define METATILE_SecretBase_BreakableDoor_TopClosed 0x237
#define METATILE_SecretBase_BreakableDoor_BottomClosed 0x23F
#define METATILE_SecretBase_BreakableDoor_TopOpen 0x26E
#define METATILE_SecretBase_BreakableDoor_BottomOpen 0x276
#define METATILE_SecretBase_NoteMat_C 0x278
#define METATILE_SecretBase_NoteMat_D 0x279
#define METATILE_SecretBase_NoteMat_E 0x27A
#define METATILE_SecretBase_NoteMat_F 0x27B
#define METATILE_SecretBase_NoteMat_G 0x27C
#define METATILE_SecretBase_NoteMat_A 0x27D
#define METATILE_SecretBase_NoteMat_B 0x27E
#define METATILE_SecretBase_NoteMat_C_Sharp 0x2B3
#define METATILE_SecretBase_Tire_TopLeft 0x280
#define METATILE_SecretBase_Tire_TopRight 0x281
#define METATILE_SecretBase_Tire_BottomLeft 0x288
#define METATILE_SecretBase_Tire_BottomRight 0x289
#define METATILE_SecretBase_GlassOrnament_Base1 0x28A
#define METATILE_SecretBase_GlassOrnament_Base2 0x28B
#define METATILE_SecretBase_SandOrnament_BrokenTop 0x284
#define METATILE_SecretBase_SandOrnament_BrokenBase 0x28C
#define METATILE_SecretBase_SandOrnament_Top 0x285
#define METATILE_SecretBase_SandOrnament_Base1 0x28D
#define METATILE_SecretBase_SandOrnament_TopWall 0x286
#define METATILE_SecretBase_SandOrnament_Base2 0x28E
#define METATILE_SecretBase_SmallDesk 0x287
#define METATILE_SecretBase_PokemonDesk 0x28F
#define METATILE_SecretBase_HeavyDesk_TopLeft 0x290
#define METATILE_SecretBase_HeavyDesk_TopMid 0x291
#define METATILE_SecretBase_HeavyDesk_TopRight 0x292
#define METATILE_SecretBase_HeavyDesk_BottomLeft 0x298
#define METATILE_SecretBase_HeavyDesk_BottomMid 0x299
#define METATILE_SecretBase_HeavyDesk_BottomRight 0x29A
#define METATILE_SecretBase_RaggedDesk_TopLeft 0x293
#define METATILE_SecretBase_RaggedDesk_TopMid 0x294
#define METATILE_SecretBase_RaggedDesk_TopRight 0x295
#define METATILE_SecretBase_RaggedDesk_BottomLeft 0x29B
#define METATILE_SecretBase_RaggedDesk_BottomMid 0x29C
#define METATILE_SecretBase_RaggedDesk_BottomRight 0x29D
#define METATILE_SecretBase_ComfortDesk_TopLeft 0x296
#define METATILE_SecretBase_ComfortDesk_TopMid 0x297
#define METATILE_SecretBase_ComfortDesk_TopRight 0x2A3
#define METATILE_SecretBase_ComfortDesk_BottomLeft 0x29E
#define METATILE_SecretBase_ComfortDesk_BottomMid 0x29F
#define METATILE_SecretBase_ComfortDesk_BottomRight 0x2AB
#define METATILE_SecretBase_BrickDesk_TopLeft 0x2A0
#define METATILE_SecretBase_BrickDesk_TopMid 0x2A1
#define METATILE_SecretBase_BrickDesk_TopRight 0x2A2
#define METATILE_SecretBase_BrickDesk_MidLeft 0x2A8
#define METATILE_SecretBase_BrickDesk_Center 0x2A9
#define METATILE_SecretBase_BrickDesk_MidRight 0x2AA
#define METATILE_SecretBase_BrickDesk_BottomLeft 0x2B0
#define METATILE_SecretBase_BrickDesk_BottomMid 0x2B1
#define METATILE_SecretBase_BrickDesk_BottomRight 0x2B2
#define METATILE_SecretBase_CampDesk_TopLeft 0x2A4
#define METATILE_SecretBase_CampDesk_TopMid 0x2A5
#define METATILE_SecretBase_CampDesk_TopRight 0x2A6
#define METATILE_SecretBase_CampDesk_MidLeft 0x2AC
#define METATILE_SecretBase_CampDesk_Center 0x2AD
#define METATILE_SecretBase_CampDesk_MidRight 0x2AE
#define METATILE_SecretBase_CampDesk_BottomLeft 0x2B4
#define METATILE_SecretBase_CampDesk_BottomMid 0x2B5
#define METATILE_SecretBase_CampDesk_BottomRight 0x2B6
#define METATILE_SecretBase_HardDesk_TopLeft 0x2A7
#define METATILE_SecretBase_HardDesk_TopMid 0x2BB
#define METATILE_SecretBase_HardDesk_TopRight 0x2BC
#define METATILE_SecretBase_HardDesk_MidLeft 0x2AF
#define METATILE_SecretBase_HardDesk_Center 0x2C3
#define METATILE_SecretBase_HardDesk_MidRight 0x2C4
#define METATILE_SecretBase_HardDesk_BottomLeft 0x2B7
#define METATILE_SecretBase_HardDesk_BottomMid 0x2CB
#define METATILE_SecretBase_HardDesk_BottomRight 0x2CC
#define METATILE_SecretBase_PrettyDesk_TopLeft 0x2BD
#define METATILE_SecretBase_PrettyDesk_TopMid 0x2BE
#define METATILE_SecretBase_PrettyDesk_TopRight 0x2BF
#define METATILE_SecretBase_PrettyDesk_MidLeft 0x2C5
#define METATILE_SecretBase_PrettyDesk_Center 0x2C6
#define METATILE_SecretBase_PrettyDesk_MidRight 0x2C7
#define METATILE_SecretBase_PrettyDesk_BottomLeft 0x2CD
#define METATILE_SecretBase_PrettyDesk_BottomMid 0x2CE
#define METATILE_SecretBase_PrettyDesk_BottomRight 0x2CF
#define METATILE_SecretBase_SmallChair 0x2B8
#define METATILE_SecretBase_PokemonChair 0x2B9
#define METATILE_SecretBase_HeavyChair 0x2BA
#define METATILE_SecretBase_PrettyChair 0x2C0
#define METATILE_SecretBase_ComfortChair 0x2C1
#define METATILE_SecretBase_RaggedChair 0x2C2
#define METATILE_SecretBase_BrickChair 0x2C8
#define METATILE_SecretBase_CampChair 0x2C9
#define METATILE_SecretBase_HardChair 0x2Ca
#define METATILE_SecretBase_RedPlant_Base1 0x2D8
#define METATILE_SecretBase_RedPlant_Base2 0x2D9
#define METATILE_SecretBase_TropicalPlant_Base1 0x2DA
#define METATILE_SecretBase_TropicalPlant_Base2 0x2DB
#define METATILE_SecretBase_PrettyFlower_Base1 0x2DC
#define METATILE_SecretBase_PrettyFlower_Base2 0x2DD
#define METATILE_SecretBase_ColorfulFlowers_BaseLeft1 0x2E8
#define METATILE_SecretBase_ColorfulFlowers_BaseRight1 0x2E9
#define METATILE_SecretBase_ColorfulFlowers_BaseLeft2 0x2EA
#define METATILE_SecretBase_ColorfulFlowers_BaseRight2 0x2EB
#define METATILE_SecretBase_BigPlant_BaseLeft1 0x2EC
#define METATILE_SecretBase_BigPlant_BaseRight1 0x2ED
#define METATILE_SecretBase_BigPlant_BaseLeft2 0x2EE
#define METATILE_SecretBase_BigPlant_BaseRight2 0x2EF
#define METATILE_SecretBase_GorgeousPlant_BaseLeft1 0x2F8
#define METATILE_SecretBase_GorgeousPlant_BaseRight1 0x2F9
#define METATILE_SecretBase_GorgeousPlant_BaseLeft2 0x2FA
#define METATILE_SecretBase_GorgeousPlant_BaseRight2 0x2FB
#define METATILE_SecretBase_TV 0x2F4
#define METATILE_SecretBase_RoundTV 0x2F5
#define METATILE_SecretBase_CuteTV 0x2F6
#define METATILE_SecretBase_PikaPoster_Left 0x31C
#define METATILE_SecretBase_PikaPoster_Right 0x31D
#define METATILE_SecretBase_LongPoster_Left 0x31E
#define METATILE_SecretBase_LongPoster_Right 0x31F
#define METATILE_SecretBase_SeaPoster_Left 0x324
#define METATILE_SecretBase_SeaPoster_Right 0x325
#define METATILE_SecretBase_SkyPoster_Left 0x326
#define METATILE_SecretBase_SkyPoster_Right 0x327
#define METATILE_SecretBase_KissPoster_Left 0x32C
#define METATILE_SecretBase_KissPoster_Right 0x32D
#define METATILE_SecretBase_BallPoster 0x330
#define METATILE_SecretBase_GreenPoster 0x331
#define METATILE_SecretBase_RedPoster 0x332
#define METATILE_SecretBase_BluePoster 0x333
#define METATILE_SecretBase_CutePoster 0x334
#define METATILE_SecretBase_SilverShield_Base1 0x2DE
#define METATILE_SecretBase_SilverShield_Base2 0x2DF
#define METATILE_SecretBase_GoldShield_Base1 0x336
#define METATILE_SecretBase_GoldShield_Base2 0x337
#define METATILE_SecretBase_RedBalloon 0x338
#define METATILE_SecretBase_BlueBalloon 0x33c
#define METATILE_SecretBase_YellowBalloon 0x340
#endif // GUARD_METATILE_LABELS_H #endif // GUARD_METATILE_LABELS_H
include/constants/opponents.h
+4
View File
@@ -857,6 +857,10 @@
#define TRAINER_BRENDAN_PLACEHOLDER 853 #define TRAINER_BRENDAN_PLACEHOLDER 853
#define TRAINER_MAY_PLACEHOLDER 854 #define TRAINER_MAY_PLACEHOLDER 854
// NOTE: Because each Trainer uses a flag to determine when they are defeated, there is only space for 9 additional trainers before trainer flag space overflows
// More space can be made by shifting flags around in constants/flags.h or changing how trainer flags are handled
#define TRAINERS_COUNT 855 #define TRAINERS_COUNT 855
#define MAX_TRAINERS_COUNT 864
#endif // GUARD_CONSTANTS_OPPONENTS_H #endif // GUARD_CONSTANTS_OPPONENTS_H
include/constants/pokemon.h
+4 -2
View File
@@ -80,8 +80,8 @@
#define STAT_ACC 6 // Only in battles. #define STAT_ACC 6 // Only in battles.
#define STAT_EVASION 7 // Only in battles. #define STAT_EVASION 7 // Only in battles.
#define NUM_STATS 6 #define NUM_EV_STATS NUM_STATS - 1 // excludes HP
#define NUM_BATTLE_STATS 8 #define NUM_BATTLE_STATS NUM_STATS + 2 // includes Accuracy and Evasion
// Shiny odds // Shiny odds
#define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536 #define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536
@@ -213,6 +213,8 @@
#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 7 #define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 7
#define FRIENDSHIP_EVENT_FAINT_LARGE 8 #define FRIENDSHIP_EVENT_FAINT_LARGE 8
#define MAX_FRIENDSHIP 0xFF
#define STATUS_PRIMARY_NONE 0 #define STATUS_PRIMARY_NONE 0
#define STATUS_PRIMARY_POISON 1 #define STATUS_PRIMARY_POISON 1
#define STATUS_PRIMARY_PARALYSIS 2 #define STATUS_PRIMARY_PARALYSIS 2
include/constants/trainers.h
+3 -1
View File
@@ -2,9 +2,11 @@
#define GUARD_TRAINERS_H #define GUARD_TRAINERS_H
#include "constants/opponents.h" #include "constants/opponents.h"
#include "constants/battle_frontier_trainers.h"
// Special Trainer Ids. // Special Trainer Ids.
#define TRAINER_RECORD_MIXING_FRIEND 300 // 0-299 are frontier trainers
#define TRAINER_RECORD_MIXING_FRIEND FRONTIER_TRAINERS_COUNT
#define TRAINER_RECORD_MIXING_APPRENTICE 400 #define TRAINER_RECORD_MIXING_APPRENTICE 400
#define TRAINER_EREADER 500 #define TRAINER_EREADER 500
#define TRAINER_FRONTIER_BRAIN 1022 #define TRAINER_FRONTIER_BRAIN 1022
include/constants/tv.h
+88
View File
@@ -46,4 +46,92 @@
// Number of ribbons to put Spot the Cuties on air // Number of ribbons to put Spot the Cuties on air
#define NUM_CUTIES_RIBBONS 4 #define NUM_CUTIES_RIBBONS 4
// TV Show states for Secret Base Secrets
#define SBSECRETS_STATE_INTRO 0
#define SBSECRETS_STATE_DO_NEXT1 1
#define SBSECRETS_STATE_DO_NEXT2 2
#define SBSECRETS_STATE_TOOK_X_STEPS 3
#define SBSECRETS_STATE_BASE_INTEREST_LOW 4
#define SBSECRETS_STATE_BASE_INTEREST_MED 5
#define SBSECRETS_STATE_BASE_INTEREST_HIGH 6
#define SBSECRETS_STATE_OUTRO 7
#define SBSECRETS_STATE_NOTHING_USED1 8
#define SBSECRETS_STATE_NOTHING_USED2 9
#define SBSECRETS_STATE_USED_CHAIR 10
#define SBSECRETS_STATE_USED_BALLOON 11
#define SBSECRETS_STATE_USED_TENT 12
#define SBSECRETS_STATE_USED_PLANT 13
#define SBSECRETS_STATE_USED_GOLD_SHIELD 14
#define SBSECRETS_STATE_USED_SILVER_SHIELD 15
#define SBSECRETS_STATE_USED_GLASS_ORNAMENT 16
#define SBSECRETS_STATE_USED_TV 17
#define SBSECRETS_STATE_USED_MUD_BALL 18
#define SBSECRETS_STATE_USED_BAG 19
#define SBSECRETS_STATE_USED_CUSHION 20
#define SBSECRETS_STATE_HIT_CUSHION 21
#define SBSECRETS_STATE_HUGGED_CUSHION 22
#define SBSECRETS_STATE_BATTLED_WON 23
#define SBSECRETS_STATE_BATTLED_LOST 24
#define SBSECRETS_STATE_DECLINED_BATTLE 25
#define SBSECRETS_STATE_USED_POSTER 26
#define SBSECRETS_STATE_USED_NOTE_MAT 27
#define SBSECRETS_STATE_BATTLED_DRAW 28
#define SBSECRETS_STATE_USED_SPIN_MAT 29
#define SBSECRETS_STATE_USED_SAND_ORNAMENT 30
#define SBSECRETS_STATE_USED_DESK 31
#define SBSECRETS_STATE_USED_BRICK 32
#define SBSECRETS_STATE_USED_SOLID_BOARD 33
#define SBSECRETS_STATE_USED_FENCE 34
#define SBSECRETS_STATE_USED_GLITTER_MAT 35
#define SBSECRETS_STATE_USED_TIRE 36
#define SBSECRETS_STATE_USED_STAND 37
#define SBSECRETS_STATE_USED_BREAKABLE_DOOR 38
#define SBSECRETS_STATE_USED_DOLL 39
#define SBSECRETS_STATE_USED_SLIDE 40
#define SBSECRETS_STATE_DECLINED_SLIDE 41
#define SBSECRETS_STATE_USED_JUMP_MAT 42
#define SBSECRETS_NUM_STATES 43
// The below flags are set when interacting with objects in a friends secret base
// Theyre set as bits in a var, and with 32 flags they're spread across 2 vars
// VAR_SECRET_BASE_LOW_TV_FLAGS
#define SECRET_BASE_USED_CHAIR (1 << 0)
#define SECRET_BASE_USED_BALLOON (1 << 1)
#define SECRET_BASE_USED_TENT (1 << 2)
#define SECRET_BASE_USED_PLANT (1 << 3)
#define SECRET_BASE_USED_GOLD_SHIELD (1 << 4)
#define SECRET_BASE_USED_SILVER_SHIELD (1 << 5)
#define SECRET_BASE_USED_GLASS_ORNAMENT (1 << 6)
#define SECRET_BASE_USED_TV (1 << 7)
#define SECRET_BASE_USED_MUD_BALL (1 << 8)
#define SECRET_BASE_USED_BAG (1 << 9)
#define SECRET_BASE_USED_CUSHION (1 << 10)
#define SECRET_BASE_BATTLED_WON (1 << 11)
#define SECRET_BASE_BATTLED_LOST (1 << 12)
#define SECRET_BASE_DECLINED_BATTLE (1 << 13)
#define SECRET_BASE_USED_POSTER (1 << 14)
#define SECRET_BASE_USED_NOTE_MAT (1 << 15)
// VAR_SECRET_BASE_HIGH_TV_FLAGS
#define SECRET_BASE_BATTLED_DRAW (1 << 0)
#define SECRET_BASE_USED_SPIN_MAT (1 << 1)
#define SECRET_BASE_USED_SAND_ORNAMENT (1 << 2)
#define SECRET_BASE_USED_DESK (1 << 3)
#define SECRET_BASE_USED_BRICK (1 << 4)
#define SECRET_BASE_USED_SOLID_BOARD (1 << 5)
#define SECRET_BASE_USED_FENCE (1 << 6)
#define SECRET_BASE_USED_GLITTER_MAT (1 << 7)
#define SECRET_BASE_USED_TIRE (1 << 8)
#define SECRET_BASE_USED_STAND (1 << 9)
#define SECRET_BASE_USED_BREAKABLE_DOOR (1 << 10)
#define SECRET_BASE_USED_DOLL (1 << 11)
#define SECRET_BASE_USED_SLIDE (1 << 12)
#define SECRET_BASE_DECLINED_SLIDE (1 << 13)
#define SECRET_BASE_USED_JUMP_MAT (1 << 14)
#define SECRET_BASE_UNUSED_FLAG (1 << 15)
#define NUM_SECRET_BASE_FLAGS 32 // by definition, bitfield of 2 u16s
#endif //GUARD_CONSTANTS_TV_H #endif //GUARD_CONSTANTS_TV_H
include/easy_chat.h
+2 -2
View File
@@ -128,10 +128,10 @@ bool32 sub_811F8D8(int word);
void InitializeEasyChatWordArray(u16 *words, u16 length); void InitializeEasyChatWordArray(u16 *words, u16 length);
u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 columns, u16 rows); u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 columns, u16 rows);
bool8 ECWord_CheckIfOutsideOfValidRange(u16 word); bool8 ECWord_CheckIfOutsideOfValidRange(u16 word);
u16 sub_811EE38(u16 group); u16 GetRandomEasyChatWordFromGroup(u16 group);
u16 GetNewHipsterPhraseToTeach(void); u16 GetNewHipsterPhraseToTeach(void);
u16 EasyChat_GetNumWordsInGroup(u8); u16 EasyChat_GetNumWordsInGroup(u8);
u16 sub_811EE90(u16); u16 GetRandomEasyChatWordFromUnlockedGroup(u16);
void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback, u8 displayedPersonType); void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback, u8 displayedPersonType);
void sub_811F8BC(void); void sub_811F8BC(void);
void UnlockAdditionalPhrase(u8 additionalPhraseId); void UnlockAdditionalPhrase(u8 additionalPhraseId);
include/event_scripts.h
+43 -43
View File
@@ -240,49 +240,49 @@ extern const u8 gTVWhatsNo1InHoennTodayText05[];
extern const u8 gTVWhatsNo1InHoennTodayText06[]; extern const u8 gTVWhatsNo1InHoennTodayText06[];
extern const u8 gTVWhatsNo1InHoennTodayText07[]; extern const u8 gTVWhatsNo1InHoennTodayText07[];
extern const u8 gTVWhatsNo1InHoennTodayText08[]; extern const u8 gTVWhatsNo1InHoennTodayText08[];
extern const u8 gTVSecretBaseSecretsText00[]; extern const u8 TVSecretBaseSecrets_Text_Intro[];
extern const u8 gTVSecretBaseSecretsText01[]; extern const u8 TVSecretBaseSecrets_Text_WhatWillPlayerDoNext1[];
extern const u8 gTVSecretBaseSecretsText02[]; extern const u8 TVSecretBaseSecrets_Text_WhatWillPlayerDoNext2[];
extern const u8 gTVSecretBaseSecretsText03[]; extern const u8 TVSecretBaseSecrets_Text_TookXStepsBeforeLeaving[];
extern const u8 gTVSecretBaseSecretsText04[]; extern const u8 TVSecretBaseSecrets_Text_BaseFailedToInterestPlayer[];
extern const u8 gTVSecretBaseSecretsText05[]; extern const u8 TVSecretBaseSecrets_Text_PlayerEnjoyedBase[];
extern const u8 gTVSecretBaseSecretsText06[]; extern const u8 TVSecretBaseSecrets_Text_PlayerHugeFanOfBase[];
extern const u8 gTVSecretBaseSecretsText07[]; extern const u8 TVSecretBaseSecrets_Text_Outro[];
extern const u8 gTVSecretBaseSecretsText08[]; extern const u8 TVSecretBaseSecrets_Text_StoppedMoving1[];
extern const u8 gTVSecretBaseSecretsText09[]; extern const u8 TVSecretBaseSecrets_Text_StoppedMoving2[];
extern const u8 gTVSecretBaseSecretsText10[]; extern const u8 TVSecretBaseSecrets_Text_UsedChair[];
extern const u8 gTVSecretBaseSecretsText11[]; extern const u8 TVSecretBaseSecrets_Text_UsedBalloon[];
extern const u8 gTVSecretBaseSecretsText12[]; extern const u8 TVSecretBaseSecrets_Text_UsedTent[];
extern const u8 gTVSecretBaseSecretsText13[]; extern const u8 TVSecretBaseSecrets_Text_UsedPlant[];
extern const u8 gTVSecretBaseSecretsText14[]; extern const u8 TVSecretBaseSecrets_Text_UsedGoldShield[];
extern const u8 gTVSecretBaseSecretsText15[]; extern const u8 TVSecretBaseSecrets_Text_UsedSilverShield[];
extern const u8 gTVSecretBaseSecretsText16[]; extern const u8 TVSecretBaseSecrets_Text_UsedGlassOrnament[];
extern const u8 gTVSecretBaseSecretsText17[]; extern const u8 TVSecretBaseSecrets_Text_UsedTV[];
extern const u8 gTVSecretBaseSecretsText18[]; extern const u8 TVSecretBaseSecrets_Text_UsedMudBall[];
extern const u8 gTVSecretBaseSecretsText19[]; extern const u8 TVSecretBaseSecrets_Text_UsedBag[];
extern const u8 gTVSecretBaseSecretsText20[]; extern const u8 TVSecretBaseSecrets_Text_UsedCushion[];
extern const u8 gTVSecretBaseSecretsText21[]; extern const u8 TVSecretBaseSecrets_Text_HitCushion[];
extern const u8 gTVSecretBaseSecretsText22[]; extern const u8 TVSecretBaseSecrets_Text_HuggedCushion[];
extern const u8 gTVSecretBaseSecretsText23[]; extern const u8 TVSecretBaseSecrets_Text_BattledWon[];
extern const u8 gTVSecretBaseSecretsText24[]; extern const u8 TVSecretBaseSecrets_Text_BattledLost[];
extern const u8 gTVSecretBaseSecretsText25[]; extern const u8 TVSecretBaseSecrets_Text_DeclinedBattle[];
extern const u8 gTVSecretBaseSecretsText26[]; extern const u8 TVSecretBaseSecrets_Text_UsedPoster[];
extern const u8 gTVSecretBaseSecretsText27[]; extern const u8 TVSecretBaseSecrets_Text_UsedNoteMat[];
extern const u8 gTVSecretBaseSecretsText28[]; extern const u8 TVSecretBaseSecrets_Text_BattledDraw[];
extern const u8 gTVSecretBaseSecretsText29[]; extern const u8 TVSecretBaseSecrets_Text_UsedSpinMat[];
extern const u8 gTVSecretBaseSecretsText30[]; extern const u8 TVSecretBaseSecrets_Text_UsedSandOrnament[];
extern const u8 gTVSecretBaseSecretsText31[]; extern const u8 TVSecretBaseSecrets_Text_UsedDesk[];
extern const u8 gTVSecretBaseSecretsText32[]; extern const u8 TVSecretBaseSecrets_Text_UsedBrick[];
extern const u8 gTVSecretBaseSecretsText33[]; extern const u8 TVSecretBaseSecrets_Text_UsedSolidBoard[];
extern const u8 gTVSecretBaseSecretsText34[]; extern const u8 TVSecretBaseSecrets_Text_UsedFence[];
extern const u8 gTVSecretBaseSecretsText35[]; extern const u8 TVSecretBaseSecrets_Text_UsedGlitterMat[];
extern const u8 gTVSecretBaseSecretsText36[]; extern const u8 TVSecretBaseSecrets_Text_UsedTire[];
extern const u8 gTVSecretBaseSecretsText37[]; extern const u8 TVSecretBaseSecrets_Text_UsedStand[];
extern const u8 gTVSecretBaseSecretsText38[]; extern const u8 TVSecretBaseSecrets_Text_BrokeDoor[];
extern const u8 gTVSecretBaseSecretsText39[]; extern const u8 TVSecretBaseSecrets_Text_UsedDoll[];
extern const u8 gTVSecretBaseSecretsText40[]; extern const u8 TVSecretBaseSecrets_Text_UsedSlide[];
extern const u8 gTVSecretBaseSecretsText41[]; extern const u8 TVSecretBaseSecrets_Text_UsedSlideButDidntGoDown[];
extern const u8 gTVSecretBaseSecretsText42[]; extern const u8 TVSecretBaseSecrets_Text_UsedJumpMat[];
extern const u8 gTVSafariFanClubText00[]; extern const u8 gTVSafariFanClubText00[];
extern const u8 gTVSafariFanClubText01[]; extern const u8 gTVSafariFanClubText01[];
extern const u8 gTVSafariFanClubText02[]; extern const u8 gTVSafariFanClubText02[];
include/fldeff_misc.h
+1 -1
View File
@@ -21,7 +21,7 @@ void ShatterSecretBaseBreakableDoor(s16 x, s16 y);
void PlaySecretBaseMusicNoteMatSound(s16 metatileId); void PlaySecretBaseMusicNoteMatSound(s16 metatileId);
void DoSecretBaseGlitterMatSparkle(void); void DoSecretBaseGlitterMatSparkle(void);
bool8 FldEff_SandPillar(void); bool8 FldEff_SandPillar(void);
void GetShieldToyTVDecorationInfo(void); void InteractWithShieldOrTVDecoration(void);
bool8 sub_80FADE4(u16 arg0, u8 arg1); bool8 sub_80FADE4(u16 arg0, u8 arg1);
void FldEffPoison_Start(void); void FldEffPoison_Start(void);
bool32 FldEffPoison_IsActive(void); bool32 FldEffPoison_IsActive(void);
include/global.h
+25 -28
View File
@@ -297,10 +297,11 @@ struct BattleTowerEReaderTrainer
/*0xB8*/ u32 checksum; /*0xB8*/ u32 checksum;
}; };
struct FrontierMonData // For displaying party information on the player's Battle Dome tourney page
struct DomeMonData
{ {
u16 moves[MAX_MON_MOVES]; u16 moves[MAX_MON_MOVES];
u8 evs[6]; u8 evs[NUM_STATS];
u8 nature; u8 nature;
}; };
@@ -317,7 +318,7 @@ struct BattleDomeTrainer
u16 trainerId:10; u16 trainerId:10;
u16 isEliminated:1; u16 isEliminated:1;
u16 eliminatedAt:2; u16 eliminatedAt:2;
u16 unk3:3; u16 forfeited:3;
}; };
#define DOME_TOURNAMENT_TRAINERS_COUNT 16 #define DOME_TOURNAMENT_TRAINERS_COUNT 16
@@ -332,10 +333,6 @@ struct BattleFrontier
/*0xCA9*/ u8 lvlMode:2; /*0xCA9*/ u8 lvlMode:2;
/*0xCA9*/ u8 challengePaused:1; /*0xCA9*/ u8 challengePaused:1;
/*0xCA9*/ u8 disableRecordBattle:1; /*0xCA9*/ u8 disableRecordBattle:1;
/*0xCA9*/ u8 unused_CA9_c:1;
/*0xCA9*/ u8 unused_CA9_d:1;
/*0xCA9*/ u8 unused_CA9_e:1;
/*0xCA9*/ u8 unused_CA9_f:1;
/*0xCAA*/ u16 selectedPartyMons[MAX_FRONTIER_PARTY_SIZE]; /*0xCAA*/ u16 selectedPartyMons[MAX_FRONTIER_PARTY_SIZE];
/*0xCB2*/ u16 curChallengeBattleNum; // Battle number / room number (Pike) / floor number (Pyramid) /*0xCB2*/ u16 curChallengeBattleNum; // Battle number / room number (Pike) / floor number (Pyramid)
/*0xCB4*/ u16 trainerIds[20]; /*0xCB4*/ u16 trainerIds[20];
@@ -347,17 +344,17 @@ struct BattleFrontier
/*0xD04*/ u16 towerNumWins; // Increments to MAX_STREAK but never read otherwise /*0xD04*/ u16 towerNumWins; // Increments to MAX_STREAK but never read otherwise
/*0xD06*/ u8 towerBattleOutcome; /*0xD06*/ u8 towerBattleOutcome;
/*0xD07*/ u8 towerLvlMode; /*0xD07*/ u8 towerLvlMode;
/*0xD08*/ u8 field_D08_0:1; /*0xD08*/ u8 domeAttemptedSingles50:1;
/*0xD08*/ u8 field_D08_1:1; /*0xD08*/ u8 domeAttemptedSinglesOpen:1;
/*0xD08*/ u8 field_D08_2:1; /*0xD08*/ u8 domeHasWonSingles50:1;
/*0xD08*/ u8 field_D08_3:1; /*0xD08*/ u8 domeHasWonSinglesOpen:1;
/*0xD08*/ u8 field_D08_4:1; /*0xD08*/ u8 domeAttemptedDoubles50:1;
/*0xD08*/ u8 field_D08_5:1; /*0xD08*/ u8 domeAttemptedDoublesOpen:1;
/*0xD08*/ u8 field_D08_6:1; /*0xD08*/ u8 domeHasWonDoubles50:1;
/*0xD08*/ u8 field_D08_7:1; /*0xD08*/ u8 domeHasWonDoublesOpen:1;
/*0xD09*/ u8 filler_D09; /*0xD09*/ u8 domeUnused;
/*0xD0A*/ u8 field_D0A; /*0xD0A*/ u8 domeLvlMode;
/*0xD0B*/ u8 field_D0B; /*0xD0B*/ u8 domeBattleMode;
/*0xD0C*/ u16 domeWinStreaks[2][2]; /*0xD0C*/ u16 domeWinStreaks[2][2];
/*0xD14*/ u16 domeRecordWinStreaks[2][2]; /*0xD14*/ u16 domeRecordWinStreaks[2][2];
/*0xD1C*/ u16 domeTotalChampionships[2][2]; /*0xD1C*/ u16 domeTotalChampionships[2][2];
@@ -392,11 +389,11 @@ struct BattleFrontier
/*0xE6A*/ u16 verdanturfTentPrize; /*0xE6A*/ u16 verdanturfTentPrize;
/*0xE6C*/ u16 fallarborTentPrize; /*0xE6C*/ u16 fallarborTentPrize;
/*0xE6E*/ u16 slateportTentPrize; /*0xE6E*/ u16 slateportTentPrize;
/*0xE70*/ struct RentalMon rentalMons[PARTY_SIZE]; /*0xE70*/ struct RentalMon rentalMons[FRONTIER_PARTY_SIZE * 2];
/*0xEB8*/ u16 battlePoints; /*0xEB8*/ u16 battlePoints;
/*0xEBA*/ u16 cardBattlePoints; /*0xEBA*/ u16 cardBattlePoints;
/*0xEBC*/ u32 battlesCount; /*0xEBC*/ u32 battlesCount;
/*0xEC0*/ u16 field_EC0[16]; /*0xEC0*/ u16 domeWinningMoves[DOME_TOURNAMENT_TRAINERS_COUNT];
/*0xEE0*/ u8 trainerFlags; /*0xEE0*/ u8 trainerFlags;
/*0xEE1*/ u8 opponentNames[2][PLAYER_NAME_LENGTH + 1]; /*0xEE1*/ u8 opponentNames[2][PLAYER_NAME_LENGTH + 1];
/*0xEF1*/ u8 opponentTrainerIds[2][TRAINER_ID_LENGTH]; /*0xEF1*/ u8 opponentTrainerIds[2][TRAINER_ID_LENGTH];
@@ -404,7 +401,7 @@ struct BattleFrontier
/*0xEF9*/ u8 savedGame:1; /*0xEF9*/ u8 savedGame:1;
/*0xEFA*/ u8 unused_EFA; /*0xEFA*/ u8 unused_EFA;
/*0xEFB*/ u8 unused_EFB; /*0xEFB*/ u8 unused_EFB;
/*0xEFC*/ struct FrontierMonData field_EFC[FRONTIER_PARTY_SIZE]; /*0xEFC*/ struct DomeMonData domePlayerPartyData[FRONTIER_PARTY_SIZE];
}; };
struct ApprenticeQuestion struct ApprenticeQuestion
@@ -934,13 +931,13 @@ struct SaveBlock1
/*0x271C*/ u8 playerRoomDecor[DECOR_MAX_PLAYERS_HOUSE]; /*0x271C*/ u8 playerRoomDecor[DECOR_MAX_PLAYERS_HOUSE];
/*0x2728*/ u8 playerRoomDecorPos[DECOR_MAX_PLAYERS_HOUSE]; /*0x2728*/ u8 playerRoomDecorPos[DECOR_MAX_PLAYERS_HOUSE];
/*0x2734*/ u8 decorDesk[10]; /*0x2734*/ u8 decorDesk[10];
/*0x????*/ u8 decorChair[10]; /*0x273E*/ u8 decorChair[10];
/*0x????*/ u8 decorPlant[10]; /*0x2748*/ u8 decorPlant[10];
/*0x????*/ u8 decorOrnament[30]; /*0x2752*/ u8 decorOrnament[30];
/*0x????*/ u8 decorMat[30]; /*0x2770*/ u8 decorMat[30];
/*0x????*/ u8 decorPoster[10]; /*0x278E*/ u8 decorPoster[10];
/*0x????*/ u8 decorDoll[40]; /*0x2798*/ u8 decorDoll[40];
/*0x????*/ u8 decorCushion[10]; /*0x27C0*/ u8 decorCushion[10];
/*0x27CA*/ u8 padding_27CA[2]; /*0x27CA*/ u8 padding_27CA[2];
/*0x27CC*/ TVShow tvShows[TV_SHOWS_COUNT]; /*0x27CC*/ TVShow tvShows[TV_SHOWS_COUNT];
/*0x2B50*/ PokeNews pokeNews[POKE_NEWS_COUNT]; /*0x2B50*/ PokeNews pokeNews[POKE_NEWS_COUNT];
include/graphics.h
+16 -13
View File
@@ -4117,19 +4117,19 @@ extern const u16 gTitleScreenBgPalettes[];
extern const u16 gTitleScreenPressStartPal[]; extern const u16 gTitleScreenPressStartPal[];
extern const u16 gTitleScreenEmeraldVersionPal[]; extern const u16 gTitleScreenEmeraldVersionPal[];
extern const u32 gUnknown_08D83D50[]; // Battle Dome
extern const u32 gUnknown_08D84970[]; extern const u32 gDomeTourneyInfoCard_Gfx[];
extern const u32 gUnknown_08D84F00[]; extern const u32 gDomeTourneyInfoCard_Tilemap[];
extern const u32 gUnknown_08D85444[]; extern const u32 gDomeTourneyInfoCardBg_Tilemap[];
extern const u32 gUnknown_08D85358[]; extern const u32 gDomeTourneyTree_Pal[];
extern const u32 gBattleWindowTextPalette[]; extern const u32 gDomeTourneyTreeButtons_Pal[];
extern const u32 gUnknown_08D854C8[]; extern const u32 gDomeTourneyMatchCardBg_Pal[];
extern const u32 gUnknown_08D82F10[]; extern const u32 gDomeTourneyBg_Gfx[];
extern const u32 gUnknown_08D834FC[]; extern const u32 gDomeTourneyLine_Gfx[];
extern const u32 gUnknown_08D83B2C[]; extern const u32 gDomeTourneyLineDown_Tilemap[];
extern const u32 gUnknown_08D83C3C[]; extern const u32 gDomeTourneyLineUp_Tilemap[];
extern const u32 gUnknown_08D83900[]; extern const u32 gDomeTourneyLineMask_Tilemap[];
extern const u32 gBattleFrontierGfx_DomeOptions[]; extern const u32 gDomeTourneyTreeButtons_Gfx[];
extern const u16 gTilesetAnims_BattleDomePals0_0[]; extern const u16 gTilesetAnims_BattleDomePals0_0[];
extern const u16 gTilesetAnims_BattleDomePals0_1[]; extern const u16 gTilesetAnims_BattleDomePals0_1[];
extern const u16 gTilesetAnims_BattleDomePals0_2[]; extern const u16 gTilesetAnims_BattleDomePals0_2[];
@@ -4137,6 +4137,9 @@ extern const u16 gTilesetAnims_BattleDomePals0_3[];
extern const u32 gBattleArenaJudgementSymbolsGfx[]; extern const u32 gBattleArenaJudgementSymbolsGfx[];
extern const u32 gBattleArenaJudgementSymbolsPalette[]; extern const u32 gBattleArenaJudgementSymbolsPalette[];
extern const u32 gBattleWindowTextPalette[];
extern const u32 gContest2Pal[]; extern const u32 gContest2Pal[];
extern const u32 gBattleAnimSpriteGfx_Bone[]; extern const u32 gBattleAnimSpriteGfx_Bone[];
include/hall_of_fame.h
+1 -1
View File
@@ -4,7 +4,7 @@
void CB2_DoHallOfFameScreen(void); void CB2_DoHallOfFameScreen(void);
void CB2_DoHallOfFameScreenDontSaveData(void); void CB2_DoHallOfFameScreenDontSaveData(void);
void CB2_DoHallOfFamePC(void); void CB2_DoHallOfFamePC(void);
void sub_8175280(void); void DoConfettiEffect(void);
// hof_pc.c // hof_pc.c
void ReturnFromHallOfFamePC(void); void ReturnFromHallOfFamePC(void);
include/link.h
+1 -1
View File
@@ -84,7 +84,7 @@
#define LINKTYPE_MULTI_BATTLE 0x2255 #define LINKTYPE_MULTI_BATTLE 0x2255
#define LINKTYPE_BATTLE_TOWER_50 0x2266 #define LINKTYPE_BATTLE_TOWER_50 0x2266
#define LINKTYPE_BATTLE_TOWER_OPEN 0x2277 #define LINKTYPE_BATTLE_TOWER_OPEN 0x2277
#define LINKTYPE_0x2288 0x2288 // battle? #define LINKTYPE_BATTLE_TOWER 0x2288
#define LINKTYPE_0x3311 0x3311 #define LINKTYPE_0x3311 0x3311
#define LINKTYPE_0x3322 0x3322 #define LINKTYPE_0x3322 0x3322
#define LINKTYPE_BERRY_BLENDER_SETUP 0x4411 #define LINKTYPE_BERRY_BLENDER_SETUP 0x4411
include/pokemon_icon.h
+1 -1
View File
@@ -16,7 +16,7 @@ void LoadMonIconPalette(u16 species);
void FreeMonIconPalettes(void); void FreeMonIconPalettes(void);
u8 sub_80D2D78(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, bool32 extra); u8 sub_80D2D78(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, bool32 extra);
void FreeMonIconPalette(u16 species); void FreeMonIconPalette(u16 species);
void sub_80D2EF8(struct Sprite *sprite); void FreeAndDestroyMonIconSprite(struct Sprite *sprite);
u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, u32 personality, bool32 extra); u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, u32 personality, bool32 extra);
u8 UpdateMonIconFrame(struct Sprite *sprite); u8 UpdateMonIconFrame(struct Sprite *sprite);
void LoadMonIconPalette(u16 species); void LoadMonIconPalette(u16 species);
include/save.h
+16 -5
View File
@@ -55,13 +55,25 @@ enum
SAVE_HALL_OF_FAME_ERASE_BEFORE // unused SAVE_HALL_OF_FAME_ERASE_BEFORE // unused
}; };
#define SECTOR_ID_SAVEBLOCK2 0
#define SECTOR_ID_SAVEBLOCK1_START 1
#define SECTOR_ID_SAVEBLOCK1_END 4
#define SECTOR_ID_PKMN_STORAGE_START 5
#define SECTOR_ID_PKMN_STORAGE_END 13
#define SECTOR_SAVE_SLOT_LENGTH 14 #define SECTOR_SAVE_SLOT_LENGTH 14
// Save Slot 1: 0-13; Save Slot 2: 14-27
#define SECTOR_ID_HOF_1 28 #define SECTOR_ID_HOF_1 28
#define SECTOR_ID_HOF_2 29 #define SECTOR_ID_HOF_2 29
#define SECTOR_ID_TRAINER_HILL 30 #define SECTOR_ID_TRAINER_HILL 30
#define SECTOR_ID_RECORDED_BATTLE 31 #define SECTOR_ID_RECORDED_BATTLE 31
#define SECTORS_COUNT 32 #define SECTORS_COUNT 32
#define SAVE_STATUS_EMPTY 0
#define SAVE_STATUS_OK 1
#define SAVE_STATUS_CORRUPT 2
#define SAVE_STATUS_NO_FLASH 4
#define SAVE_STATUS_ERROR 0xFF
extern u16 gLastWrittenSector; extern u16 gLastWrittenSector;
extern u32 gLastSaveCounter; extern u32 gLastSaveCounter;
extern u16 gLastKnownGoodSector; extern u16 gLastKnownGoodSector;
@@ -82,13 +94,12 @@ u8 HandleSavingData(u8 saveType);
u8 TrySavingData(u8 saveType); u8 TrySavingData(u8 saveType);
bool8 sub_8153380(void); bool8 sub_8153380(void);
bool8 sub_81533AC(void); bool8 sub_81533AC(void);
u8 sub_81533E0(void); bool8 sub_81533E0(void);
u8 sub_8153408(void); bool8 sub_8153408(void);
u8 FullSaveGame(void); bool8 FullSaveGame(void);
bool8 CheckSaveFile(void); bool8 CheckSaveFile(void);
u8 Save_LoadGameData(u8 a1); u8 Save_LoadGameData(u8 saveType);
u16 sub_815355C(void); u16 sub_815355C(void);
u8 sub_81534D0(u8);
u32 TryReadSpecialSaveSection(u8 sector, u8* dst); u32 TryReadSpecialSaveSection(u8 sector, u8* dst);
u32 TryWriteSpecialSaveSection(u8 sector, u8* src); u32 TryWriteSpecialSaveSection(u8 sector, u8* src);
void sub_8153688(u8 taskId); void sub_8153688(u8 taskId);
include/secret_base.h
+5 -5
View File
@@ -12,13 +12,13 @@ void InitSecretBaseAppearance(bool8 hidePC);
bool8 CurMapIsSecretBase(void); bool8 CurMapIsSecretBase(void);
void SecretBasePerStepCallback(u8 taskId); void SecretBasePerStepCallback(u8 taskId);
bool8 TrySetCurSecretBase(void); bool8 TrySetCurSecretBase(void);
void SetSecretBaseSecretsTvFlags_Poster(void); void CheckInteractedWithFriendsPosterDecor(void);
void SetSecretBaseSecretsTvFlags_MiscFurnature(void); void CheckInteractedWithFriendsFurnitureBottom(void);
void SetSecretBaseSecretsTvFlags_LargeDecorationSpot(void); void CheckInteractedWithFriendsFurnitureMiddle(void);
void SetSecretBaseSecretsTvFlags_SmallDecorationSpot(void); void CheckInteractedWithFriendsFurnitureTop(void);
void WarpIntoSecretBase(const struct MapPosition *position, const struct MapEvents *events); void WarpIntoSecretBase(const struct MapPosition *position, const struct MapEvents *events);
bool8 SecretBaseMapPopupEnabled(void); bool8 SecretBaseMapPopupEnabled(void);
void sub_80EB218(void); void CheckLeftFriendsSecretBase(void);
void ClearSecretBases(void); void ClearSecretBases(void);
void SetCurSecretBaseIdFromPosition(const struct MapPosition *position, const struct MapEvents *events); void SetCurSecretBaseIdFromPosition(const struct MapPosition *position, const struct MapEvents *events);
void TrySetCurSecretBaseIndex(void); void TrySetCurSecretBaseIndex(void);
include/strings.h
+114 -116
View File
@@ -1705,120 +1705,120 @@ extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMAccept[]
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMReject[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMReject[];
// Battle Dome. // Battle Dome.
extern const u8 gBattleDomeOpponentPotentialText1[]; extern const u8 BattleDome_Text_Potential1[];
extern const u8 gBattleDomeOpponentPotentialText2[]; extern const u8 BattleDome_Text_Potential2[];
extern const u8 gBattleDomeOpponentPotentialText3[]; extern const u8 BattleDome_Text_Potential3[];
extern const u8 gBattleDomeOpponentPotentialText4[]; extern const u8 BattleDome_Text_Potential4[];
extern const u8 gBattleDomeOpponentPotentialText5[]; extern const u8 BattleDome_Text_Potential5[];
extern const u8 gBattleDomeOpponentPotentialText6[]; extern const u8 BattleDome_Text_Potential6[];
extern const u8 gBattleDomeOpponentPotentialText7[]; extern const u8 BattleDome_Text_Potential7[];
extern const u8 gBattleDomeOpponentPotentialText8[]; extern const u8 BattleDome_Text_Potential8[];
extern const u8 gBattleDomeOpponentPotentialText9[]; extern const u8 BattleDome_Text_Potential9[];
extern const u8 gBattleDomeOpponentPotentialText10[]; extern const u8 BattleDome_Text_Potential10[];
extern const u8 gBattleDomeOpponentPotentialText11[]; extern const u8 BattleDome_Text_Potential11[];
extern const u8 gBattleDomeOpponentPotentialText12[]; extern const u8 BattleDome_Text_Potential12[];
extern const u8 gBattleDomeOpponentPotentialText13[]; extern const u8 BattleDome_Text_Potential13[];
extern const u8 gBattleDomeOpponentPotentialText14[]; extern const u8 BattleDome_Text_Potential14[];
extern const u8 gBattleDomeOpponentPotentialText15[]; extern const u8 BattleDome_Text_Potential15[];
extern const u8 gBattleDomeOpponentPotentialText16[]; extern const u8 BattleDome_Text_Potential16[];
extern const u8 gBattleDomeOpponentPotentialText17[]; extern const u8 BattleDome_Text_PotentialDomeAceTucker[];
extern const u8 gBattleDomeOpponentStyleText1[]; extern const u8 BattleDome_Text_StyleRiskDisaster[];
extern const u8 gBattleDomeOpponentStyleText2[]; extern const u8 BattleDome_Text_StyleEndureLongBattles[];
extern const u8 gBattleDomeOpponentStyleText3[]; extern const u8 BattleDome_Text_StyleVariesTactics[];
extern const u8 gBattleDomeOpponentStyleText4[]; extern const u8 BattleDome_Text_StyleToughWinningPattern[];
extern const u8 gBattleDomeOpponentStyleText5[]; extern const u8 BattleDome_Text_StyleUsesVeryRareMove[];
extern const u8 gBattleDomeOpponentStyleText6[]; extern const u8 BattleDome_Text_StyleUsesStartlingMoves[];
extern const u8 gBattleDomeOpponentStyleText7[]; extern const u8 BattleDome_Text_StyleConstantlyWatchesHP[];
extern const u8 gBattleDomeOpponentStyleText8[]; extern const u8 BattleDome_Text_StyleStoresAndLoosesPower[];
extern const u8 gBattleDomeOpponentStyleText9[]; extern const u8 BattleDome_Text_StyleEnfeeblesFoes[];
extern const u8 gBattleDomeOpponentStyleText10[]; extern const u8 BattleDome_Text_StylePrefersLuckTactics[];
extern const u8 gBattleDomeOpponentStyleText11[]; extern const u8 BattleDome_Text_StyleRegalAtmosphere[];
extern const u8 gBattleDomeOpponentStyleText12[]; extern const u8 BattleDome_Text_StylePowerfulLowPPMoves[];
extern const u8 gBattleDomeOpponentStyleText13[]; extern const u8 BattleDome_Text_StyleEnfeebleThenAttack[];
extern const u8 gBattleDomeOpponentStyleText14[]; extern const u8 BattleDome_Text_StyleBattlesWhileEnduring[];
extern const u8 gBattleDomeOpponentStyleText15[]; extern const u8 BattleDome_Text_StyleUpsetsFoesEmotionally[];
extern const u8 gBattleDomeOpponentStyleText16[]; extern const u8 BattleDome_Text_StyleStrongAndStraightforward[];
extern const u8 gBattleDomeOpponentStyleText17[]; extern const u8 BattleDome_Text_StyleAggressivelyStrongMoves[];
extern const u8 gBattleDomeOpponentStyleText18[]; extern const u8 BattleDome_Text_StyleCleverlyDodgesAttacks[];
extern const u8 gBattleDomeOpponentStyleText19[]; extern const u8 BattleDome_Text_StyleUsesUpsettingMoves[];
extern const u8 gBattleDomeOpponentStyleText20[]; extern const u8 BattleDome_Text_StyleUsesPopularMoves[];
extern const u8 gBattleDomeOpponentStyleText21[]; extern const u8 BattleDome_Text_StyleHasPowerfulComboMoves[];
extern const u8 gBattleDomeOpponentStyleText22[]; extern const u8 BattleDome_Text_StyleUsesHighProbabilityMoves[];
extern const u8 gBattleDomeOpponentStyleText23[]; extern const u8 BattleDome_Text_StyleAggressivelySpectacularMoves[];
extern const u8 gBattleDomeOpponentStyleText24[]; extern const u8 BattleDome_Text_StyleEmphasizesOffenseOverDefense[];
extern const u8 gBattleDomeOpponentStyleText25[]; extern const u8 BattleDome_Text_StyleEmphasizesDefenseOverOffense[];
extern const u8 gBattleDomeOpponentStyleText26[]; extern const u8 BattleDome_Text_StyleAttacksQuicklyStrongMoves[];
extern const u8 gBattleDomeOpponentStyleText27[]; extern const u8 BattleDome_Text_StyleUsesAddedEffectMoves[];
extern const u8 gBattleDomeOpponentStyleText28[]; extern const u8 BattleDome_Text_StyleUsesBalancedMixOfMoves[];
extern const u8 gBattleDomeOpponentStyleTextUnused1[]; extern const u8 BattleDome_Text_StyleSampleMessage1[];
extern const u8 gBattleDomeOpponentStyleTextUnused2[]; extern const u8 BattleDome_Text_StyleSampleMessage2[];
extern const u8 gBattleDomeOpponentStyleTextUnused3[]; extern const u8 BattleDome_Text_StyleSampleMessage3[];
extern const u8 gBattleDomeOpponentStyleTextUnused4[]; extern const u8 BattleDome_Text_StyleSampleMessage4[];
extern const u8 gBattleDomeOpponentStatsText1[]; extern const u8 BattleDome_Text_EmphasizesHPAndAtk[];
extern const u8 gBattleDomeOpponentStatsText2[]; extern const u8 BattleDome_Text_EmphasizesHPAndDef[];
extern const u8 gBattleDomeOpponentStatsText3[]; extern const u8 BattleDome_Text_EmphasizesHPAndSpeed[];
extern const u8 gBattleDomeOpponentStatsText4[]; extern const u8 BattleDome_Text_EmphasizesHPAndSpAtk[];
extern const u8 gBattleDomeOpponentStatsText5[]; extern const u8 BattleDome_Text_EmphasizesHPAndSpDef[];
extern const u8 gBattleDomeOpponentStatsText6[]; extern const u8 BattleDome_Text_EmphasizesAtkAndDef[];
extern const u8 gBattleDomeOpponentStatsText7[]; extern const u8 BattleDome_Text_EmphasizesAtkAndSpeed[];
extern const u8 gBattleDomeOpponentStatsText8[]; extern const u8 BattleDome_Text_EmphasizesAtkAndSpAtk[];
extern const u8 gBattleDomeOpponentStatsText9[]; extern const u8 BattleDome_Text_EmphasizesAtkAndSpDef[];
extern const u8 gBattleDomeOpponentStatsText10[]; extern const u8 BattleDome_Text_EmphasizesDefAndSpeed[];
extern const u8 gBattleDomeOpponentStatsText11[]; extern const u8 BattleDome_Text_EmphasizesDefAndSpAtk[];
extern const u8 gBattleDomeOpponentStatsText12[]; extern const u8 BattleDome_Text_EmphasizesDefAndSpDef[];
extern const u8 gBattleDomeOpponentStatsText13[]; extern const u8 BattleDome_Text_EmphasizesSpeedAndSpAtk[];
extern const u8 gBattleDomeOpponentStatsText14[]; extern const u8 BattleDome_Text_EmphasizesSpeedAndSpDef[];
extern const u8 gBattleDomeOpponentStatsText15[]; extern const u8 BattleDome_Text_EmphasizesSpAtkAndSpDef[];
extern const u8 gBattleDomeOpponentStatsText16[]; extern const u8 BattleDome_Text_EmphasizesHP[];
extern const u8 gBattleDomeOpponentStatsText17[]; extern const u8 BattleDome_Text_EmphasizesAtk[];
extern const u8 gBattleDomeOpponentStatsText18[]; extern const u8 BattleDome_Text_EmphasizesDef[];
extern const u8 gBattleDomeOpponentStatsText19[]; extern const u8 BattleDome_Text_EmphasizesSpeed[];
extern const u8 gBattleDomeOpponentStatsText20[]; extern const u8 BattleDome_Text_EmphasizesSpAtk[];
extern const u8 gBattleDomeOpponentStatsText21[]; extern const u8 BattleDome_Text_EmphasizesSpDef[];
extern const u8 gBattleDomeOpponentStatsText22[]; extern const u8 BattleDome_Text_NeglectsHPAndAtk[];
extern const u8 gBattleDomeOpponentStatsText23[]; extern const u8 BattleDome_Text_NeglectsHPAndDef[];
extern const u8 gBattleDomeOpponentStatsText24[]; extern const u8 BattleDome_Text_NeglectsHPAndSpeed[];
extern const u8 gBattleDomeOpponentStatsText25[]; extern const u8 BattleDome_Text_NeglectsHPAndSpAtk[];
extern const u8 gBattleDomeOpponentStatsText26[]; extern const u8 BattleDome_Text_NeglectsHPAndSpDef[];
extern const u8 gBattleDomeOpponentStatsText27[]; extern const u8 BattleDome_Text_NeglectsAtkAndDef[];
extern const u8 gBattleDomeOpponentStatsText28[]; extern const u8 BattleDome_Text_NeglectsAtkAndSpeed[];
extern const u8 gBattleDomeOpponentStatsText29[]; extern const u8 BattleDome_Text_NeglectsAtkAndSpAtk[];
extern const u8 gBattleDomeOpponentStatsText30[]; extern const u8 BattleDome_Text_NeglectsAtkAndSpDef[];
extern const u8 gBattleDomeOpponentStatsText31[]; extern const u8 BattleDome_Text_NeglectsDefAndSpeed[];
extern const u8 gBattleDomeOpponentStatsText32[]; extern const u8 BattleDome_Text_NeglectsDefAndSpAtk[];
extern const u8 gBattleDomeOpponentStatsText33[]; extern const u8 BattleDome_Text_NeglectsDefAndSpDef[];
extern const u8 gBattleDomeOpponentStatsText34[]; extern const u8 BattleDome_Text_NeglectsSpeedAndSpAtk[];
extern const u8 gBattleDomeOpponentStatsText35[]; extern const u8 BattleDome_Text_NeglectsSpeedAndSpDef[];
extern const u8 gBattleDomeOpponentStatsText36[]; extern const u8 BattleDome_Text_NeglectsSpAtkAndSpDef[];
extern const u8 gBattleDomeOpponentStatsText37[]; extern const u8 BattleDome_Text_NeglectsHP[];
extern const u8 gBattleDomeOpponentStatsText38[]; extern const u8 BattleDome_Text_NeglectsAtk[];
extern const u8 gBattleDomeOpponentStatsText39[]; extern const u8 BattleDome_Text_NeglectsDef[];
extern const u8 gBattleDomeOpponentStatsText40[]; extern const u8 BattleDome_Text_NeglectsSpeed[];
extern const u8 gBattleDomeOpponentStatsText41[]; extern const u8 BattleDome_Text_NeglectsSpAtk[];
extern const u8 gBattleDomeOpponentStatsText42[]; extern const u8 BattleDome_Text_NeglectsSpDef[];
extern const u8 gBattleDomeOpponentStatsText43[]; extern const u8 BattleDome_Text_RaisesMonsWellBalanced[];
extern const u8 gBattleDomeMatchNumberText1[]; extern const u8 BattleDome_Text_Round1Match1[];
extern const u8 gBattleDomeMatchNumberText2[]; extern const u8 BattleDome_Text_Round1Match2[];
extern const u8 gBattleDomeMatchNumberText3[]; extern const u8 BattleDome_Text_Round1Match3[];
extern const u8 gBattleDomeMatchNumberText4[]; extern const u8 BattleDome_Text_Round1Match4[];
extern const u8 gBattleDomeMatchNumberText5[]; extern const u8 BattleDome_Text_Round1Match5[];
extern const u8 gBattleDomeMatchNumberText6[]; extern const u8 BattleDome_Text_Round1Match6[];
extern const u8 gBattleDomeMatchNumberText7[]; extern const u8 BattleDome_Text_Round1Match7[];
extern const u8 gBattleDomeMatchNumberText8[]; extern const u8 BattleDome_Text_Round1Match8[];
extern const u8 gBattleDomeMatchNumberText9[]; extern const u8 BattleDome_Text_Round2Match1[];
extern const u8 gBattleDomeMatchNumberText10[]; extern const u8 BattleDome_Text_Round2Match2[];
extern const u8 gBattleDomeMatchNumberText11[]; extern const u8 BattleDome_Text_Round2Match3[];
extern const u8 gBattleDomeMatchNumberText12[]; extern const u8 BattleDome_Text_Round2Match4[];
extern const u8 gBattleDomeMatchNumberText13[]; extern const u8 BattleDome_Text_SemifinalMatch1[];
extern const u8 gBattleDomeMatchNumberText14[]; extern const u8 BattleDome_Text_SemifinalMatch2[];
extern const u8 gBattleDomeMatchNumberText15[]; extern const u8 BattleDome_Text_FinalMatch[];
extern const u8 gBattleDomeWinText1[]; extern const u8 BattleDome_Text_LetTheBattleBegin[];
extern const u8 gBattleDomeWinText2[]; extern const u8 BattleDome_Text_TrainerWonUsingMove[];
extern const u8 gBattleDomeWinText3[]; extern const u8 BattleDome_Text_TrainerBecameChamp[];
extern const u8 gBattleDomeWinText4[]; extern const u8 BattleDome_Text_TrainerWonByDefault[];
extern const u8 gBattleDomeWinText5[]; extern const u8 BattleDome_Text_TrainerWonOutrightByDefault[];
extern const u8 gBattleDomeWinText6[]; extern const u8 BattleDome_Text_TrainerWonNoMoves[];
extern const u8 gBattleDomeWinText7[]; extern const u8 BattleDome_Text_TrainerWonOutrightNoMoves[];
// Battle Pyramid. // Battle Pyramid.
extern const u8 BattlePyramid_Text_ExitHintUp1[]; extern const u8 BattlePyramid_Text_ExitHintUp1[];
@@ -1948,8 +1948,6 @@ extern const u8 BattlePyramid_Text_FiveTrainersRemaining6[];
extern const u8 BattlePyramid_Text_SixTrainersRemaining6[]; extern const u8 BattlePyramid_Text_SixTrainersRemaining6[];
extern const u8 BattlePyramid_Text_SevenTrainersRemaining6[]; extern const u8 BattlePyramid_Text_SevenTrainersRemaining6[];
// PC strings // PC strings
extern const u8 gText_ExitFromBox[]; extern const u8 gText_ExitFromBox[];
extern const u8 gText_WhatDoYouWantToDo[]; extern const u8 gText_WhatDoYouWantToDo[];
include/tv.h
+2 -2
View File
@@ -18,7 +18,7 @@ void TryPutTrainerFanClubOnAir(void);
void IncrementDailyPlantedBerries(void); void IncrementDailyPlantedBerries(void);
void IncrementDailyPickedBerries(void); void IncrementDailyPickedBerries(void);
void IncrementDailyBattlePoints(u16 delta); void IncrementDailyBattlePoints(u16 delta);
void sub_80F01B8(void); void HideBattleTowerReporter(void);
void ReceiveTvShowsData(void *src, u32 size, u8 masterIdx); void ReceiveTvShowsData(void *src, u32 size, u8 masterIdx);
void TryPutSpotTheCutiesOnAir(struct Pokemon *pokemon, u8 ribbonMonDataIdx); void TryPutSpotTheCutiesOnAir(struct Pokemon *pokemon, u8 ribbonMonDataIdx);
u32 GetPlayerIDAsU32(void); u32 GetPlayerIDAsU32(void);
@@ -29,7 +29,7 @@ u8 GetRibbonCount(struct Pokemon *pokemon);
void AlertTVThatPlayerPlayedSlotMachine(u16 nCoinsSpent); void AlertTVThatPlayerPlayedSlotMachine(u16 nCoinsSpent);
void AlertTVThatPlayerPlayedRoulette(u16 nCoinsSpent); void AlertTVThatPlayerPlayedRoulette(u16 nCoinsSpent);
void AlertTVOfNewCoinTotal(u16 nCoinsPaidOut); void AlertTVOfNewCoinTotal(u16 nCoinsPaidOut);
void sub_80EEA70(void); void TryPutSecretBaseSecretsOnAir(void);
void sub_80EDB44(void); void sub_80EDB44(void);
void sub_80EDC60(const u16 *words); void sub_80EDC60(const u16 *words);
void sub_80EDA80(void); void sub_80EDA80(void);
src/battle_controller_player.c
+2 -1
View File
@@ -2676,8 +2676,9 @@ static void PlayerHandleHealthBarUpdate(void)
LoadBattleBarGfx(0); LoadBattleBarGfx(0);
hpVal = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8); hpVal = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
// gPlayerPartyLostHP used by Battle Dome, but never read
if (hpVal > 0) if (hpVal > 0)
gUnknown_0203CD70 += hpVal; gPlayerPartyLostHP += hpVal;
if (hpVal != INSTANT_HP_BAR_DROP) if (hpVal != INSTANT_HP_BAR_DROP)
{ {
src/battle_dome.c
+2582 -2581
View File
File diff suppressed because it is too large Load Diff
src/battle_factory.c
+4 -3
View File
@@ -12,6 +12,7 @@
#include "constants/battle_ai.h" #include "constants/battle_ai.h"
#include "constants/battle_factory.h" #include "constants/battle_factory.h"
#include "constants/battle_frontier.h" #include "constants/battle_frontier.h"
#include "constants/battle_frontier_mons.h"
#include "constants/frontier_util.h" #include "constants/frontier_util.h"
#include "constants/layouts.h" #include "constants/layouts.h"
#include "constants/trainers.h" #include "constants/trainers.h"
@@ -304,7 +305,7 @@ static void GenerateOpponentMons(void)
do do
{ {
trainerId = sub_8162548(challengeNum, gSaveBlock2Ptr->frontier.curChallengeBattleNum); trainerId = GetRandomScaledFrontierTrainerId(challengeNum, gSaveBlock2Ptr->frontier.curChallengeBattleNum);
for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum; i++) for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum; i++)
{ {
if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId)
@@ -331,7 +332,7 @@ static void GenerateOpponentMons(void)
if (j != 6) if (j != 6)
continue; continue;
if (lvlMode == FRONTIER_LVL_50 && monSetId > 849) if (lvlMode == FRONTIER_LVL_50 && monSetId > FRONTIER_MONS_HIGH_TIER)
continue; continue;
for (k = firstMonId; k < firstMonId + i; k++) for (k = firstMonId; k < firstMonId + i; k++)
@@ -727,7 +728,7 @@ void FillFactoryBrainParty(void)
if (gFacilityTrainerMons[monSetId].species == SPECIES_UNOWN) if (gFacilityTrainerMons[monSetId].species == SPECIES_UNOWN)
continue; continue;
if (monLevel == 50 && monSetId > 849) if (monLevel == 50 && monSetId > FRONTIER_MONS_HIGH_TIER)
continue; continue;
for (j = 0; j < 6; j++) for (j = 0; j < 6; j++)
src/battle_interface.c
+34 -274
View File
@@ -761,62 +761,52 @@ static s32 DummiedOutFunction(s16 unused1, s16 unused2, s32 unused3)
{ {
return 9; return 9;
} }
void sub_8072308(s16 number, u16 *dest, bool8 unk)
#ifdef NONMATCHING
static void sub_8072308(s16 arg0, u16 *arg1, u8 arg2)
{ {
s8 i, j; s8 i, j;
u8 array[4]; u8 buff[4];
u8 *arrayPtr;
s32 r9, vaaa;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
array[i] = 0; {
buff[i] = 0;
}
i = 3; for (i = 3; ; i--)
r9 = -1;
arrayPtr = array;
while (1)
{ {
if (arg0 > 0) if (number > 0)
{ {
array[i] = arg0 % 10; buff[i] = number % 10;
arg0 = arg0 / 10; number /= 10;
i--;
} }
else else
{ {
for (; i > -1; i--)
{
buff[i] = 0xFF;
}
if (buff[3] == 0xFF)
buff[3] = 0;
break; break;
} }
} }
for (; i > -1; i--) if (!unk)
{
array[i] = 0xFF;
}
if (arrayPtr[3] == 0xFF)
arrayPtr[3] = 0;
if (arg2 == 0)
{ {
for (i = 0, j = 0; i < 4; i++) for (i = 0, j = 0; i < 4; i++)
{ {
if (array[j] == 0xFF) if (buff[j] == 0xFF)
{ {
arg1[j] &= 0xFC00; dest[j + 0x00] &= 0xFC00;
arg1[j] |= 0x1E; dest[j + 0x00] |= 0x1E;
dest[i + 0x20] &= 0xFC00;
arg1[i + 0x20] &= 0xFC00; dest[i + 0x20] |= 0x1E;
arg1[i + 0x20] |= 0x1E;
} }
else else
{ {
arg1[j] &= 0xFC00; dest[j + 0x00] &= 0xFC00;
arg1[j] |= array[j] + 0x14; dest[j + 0x00] |= 0x14 + buff[j];
dest[i + 0x20] &= 0xFC00;
arg1[i + 0x20] &= 0xFC00; dest[i + 0x20] |= 0x34 + buff[i];
arg1[i + 0x20] |= array[i] + 0x34;
} }
j++; j++;
} }
@@ -825,254 +815,24 @@ static void sub_8072308(s16 arg0, u16 *arg1, u8 arg2)
{ {
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
if (array[i] == 0xFF) if (buff[i] == 0xFF)
{ {
arg1[i] &= 0xFC00; dest[i + 0x00] &= 0xFC00;
arg1[i] |= 0x1E; dest[i + 0x00] |= 0x1E;
dest[i + 0x20] &= 0xFC00;
arg1[i + 0x20] &= 0xFC00; dest[i + 0x20] |= 0x1E;
arg1[i + 0x20] |= 0x1E;
} }
else else
{ {
arg1[i] &= 0xFC00; dest[i + 0x00] &= 0xFC00;
arg1[i] |= array[i] + 0x14; dest[i + 0x00] |= 0x14 + buff[i];
dest[i + 0x20] &= 0xFC00;
arg1[i + 0x20] &= 0xFC00; dest[i + 0x20] |= 0x34 + buff[i];
arg1[i + 0x20] |= array[i] + 0x34;
} }
} }
} }
} }
#else
NAKED
static void sub_8072308(s16 arg0, u16 *arg1, u8 arg2)
{
asm(".syntax unified\n\
push {r4-r7,lr}\n\
mov r7, r10\n\
mov r6, r9\n\
mov r5, r8\n\
push {r5-r7}\n\
sub sp, 0x4\n\
adds r7, r1, 0\n\
lsls r0, 16\n\
lsrs r5, r0, 16\n\
lsls r2, 24\n\
lsrs r2, 24\n\
mov r10, r2\n\
movs r3, 0\n\
movs r2, 0\n\
_08072324:\n\
lsls r0, r3, 24\n\
asrs r0, 24\n\
mov r3, sp\n\
adds r1, r3, r0\n\
strb r2, [r1]\n\
adds r0, 0x1\n\
lsls r0, 24\n\
lsrs r3, r0, 24\n\
asrs r0, 24\n\
cmp r0, 0x3\n\
ble _08072324\n\
movs r3, 0x3\n\
movs r0, 0x1\n\
negs r0, r0\n\
mov r9, r0\n\
mov r8, sp\n\
_08072344:\n\
lsls r0, r5, 16\n\
asrs r6, r0, 16\n\
cmp r6, 0\n\
ble _08072372\n\
lsls r4, r3, 24\n\
asrs r4, 24\n\
mov r1, sp\n\
adds r5, r1, r4\n\
adds r0, r6, 0\n\
movs r1, 0xA\n\
bl __modsi3\n\
strb r0, [r5]\n\
adds r0, r6, 0\n\
movs r1, 0xA\n\
bl __divsi3\n\
lsls r0, 16\n\
lsrs r5, r0, 16\n\
subs r4, 0x1\n\
lsls r4, 24\n\
lsrs r3, r4, 24\n\
b _08072344\n\
_08072372:\n\
lsls r1, r3, 24\n\
asrs r0, r1, 24\n\
cmp r0, r9\n\
ble _08072396\n\
movs r4, 0xFF\n\
movs r3, 0x1\n\
negs r3, r3\n\
_08072380:\n\
asrs r2, r1, 24\n\
mov r5, sp\n\
adds r1, r5, r2\n\
ldrb r0, [r1]\n\
orrs r0, r4\n\
strb r0, [r1]\n\
subs r2, 0x1\n\
lsls r1, r2, 24\n\
asrs r0, r1, 24\n\
cmp r0, r3\n\
bgt _08072380\n\
_08072396:\n\
mov r1, r8\n\
ldrb r0, [r1, 0x3]\n\
cmp r0, 0xFF\n\
bne _080723A2\n\
movs r0, 0\n\
strb r0, [r1, 0x3]\n\
_080723A2:\n\
mov r2, r10\n\
cmp r2, 0\n\
bne _08072432\n\
movs r3, 0\n\
movs r1, 0\n\
movs r6, 0xFC\n\
lsls r6, 8\n\
movs r5, 0x1E\n\
mov r12, r5\n\
_080723B4:\n\
lsls r1, 24\n\
asrs r2, r1, 24\n\
mov r0, sp\n\
adds r5, r0, r2\n\
ldrb r0, [r5]\n\
mov r8, r1\n\
cmp r0, 0xFF\n\
bne _080723EA\n\
lsls r1, r2, 1\n\
adds r1, r7\n\
ldrh r2, [r1]\n\
adds r0, r6, 0\n\
ands r0, r2\n\
mov r2, r12\n\
orrs r0, r2\n\
strh r0, [r1]\n\
lsls r3, 24\n\
asrs r1, r3, 23\n\
adds r1, r7\n\
adds r1, 0x40\n\
ldrh r2, [r1]\n\
adds r0, r6, 0\n\
ands r0, r2\n\
mov r5, r12\n\
orrs r0, r5\n\
strh r0, [r1]\n\
b _0807241A\n\
_080723EA:\n\
lsls r2, 1\n\
adds r2, r7\n\
ldrh r0, [r2]\n\
adds r1, r6, 0\n\
ands r1, r0\n\
ldrb r0, [r5]\n\
adds r0, 0x14\n\
orrs r1, r0\n\
strh r1, [r2]\n\
lsls r4, r3, 24\n\
asrs r3, r4, 24\n\
lsls r2, r3, 1\n\
adds r2, r7\n\
adds r2, 0x40\n\
ldrh r0, [r2]\n\
adds r1, r6, 0\n\
ands r1, r0\n\
mov r5, sp\n\
adds r0, r5, r3\n\
ldrb r0, [r0]\n\
adds r0, 0x34\n\
orrs r1, r0\n\
strh r1, [r2]\n\
adds r3, r4, 0\n\
_0807241A:\n\
movs r0, 0x80\n\
lsls r0, 17\n\
add r0, r8\n\
lsrs r1, r0, 24\n\
movs r2, 0x80\n\
lsls r2, 17\n\
adds r0, r3, r2\n\
lsrs r3, r0, 24\n\
asrs r0, 24\n\
cmp r0, 0x3\n\
ble _080723B4\n\
b _08072496\n\
_08072432:\n\
movs r3, 0\n\
movs r4, 0xFC\n\
lsls r4, 8\n\
movs r6, 0x1E\n\
_0807243A:\n\
lsls r1, r3, 24\n\
asrs r2, r1, 24\n\
mov r3, sp\n\
adds r5, r3, r2\n\
ldrb r0, [r5]\n\
adds r3, r1, 0\n\
cmp r0, 0xFF\n\
bne _08072466\n\
lsls r1, r2, 1\n\
adds r1, r7\n\
ldrh r2, [r1]\n\
adds r0, r4, 0\n\
ands r0, r2\n\
orrs r0, r6\n\
strh r0, [r1]\n\
adds r1, 0x40\n\
ldrh r2, [r1]\n\
adds r0, r4, 0\n\
ands r0, r2\n\
orrs r0, r6\n\
strh r0, [r1]\n\
b _08072488\n\
_08072466:\n\
lsls r2, 1\n\
adds r2, r7\n\
ldrh r0, [r2]\n\
adds r1, r4, 0\n\
ands r1, r0\n\
ldrb r0, [r5]\n\
adds r0, 0x14\n\
orrs r1, r0\n\
strh r1, [r2]\n\
adds r2, 0x40\n\
ldrh r0, [r2]\n\
adds r1, r4, 0\n\
ands r1, r0\n\
ldrb r0, [r5]\n\
adds r0, 0x34\n\
orrs r1, r0\n\
strh r1, [r2]\n\
_08072488:\n\
movs r5, 0x80\n\
lsls r5, 17\n\
adds r0, r3, r5\n\
lsrs r3, r0, 24\n\
asrs r0, 24\n\
cmp r0, 0x3\n\
ble _0807243A\n\
_08072496:\n\
add sp, 0x4\n\
pop {r3-r5}\n\
mov r8, r3\n\
mov r9, r4\n\
mov r10, r5\n\
pop {r4-r7}\n\
pop {r0}\n\
bx r0\n\
.syntax divided");
}
#endif // NONMATCHING
void sub_80724A8(s16 arg0, s16 arg1, u16 *arg2) void sub_80724A8(s16 arg0, s16 arg1, u16 *arg2)
{ {
src/battle_palace.c
+1 -1
View File
@@ -159,7 +159,7 @@ static void SetPalaceOpponent(void)
static void BufferOpponentIntroSpeech(void) static void BufferOpponentIntroSpeech(void)
{ {
if (gTrainerBattleOpponent_A < TRAINER_RECORD_MIXING_FRIEND) if (gTrainerBattleOpponent_A < FRONTIER_TRAINERS_COUNT)
FrontierSpeechToString(gFacilityTrainers[gTrainerBattleOpponent_A].speechBefore); FrontierSpeechToString(gFacilityTrainers[gTrainerBattleOpponent_A].speechBefore);
} }
src/battle_pike.c
+5 -5
View File
@@ -1400,7 +1400,7 @@ static void PrepareOneTrainer(bool8 difficult)
challengeNum = gSaveBlock2Ptr->frontier.pikeWinStreaks[lvlMode] / 14; challengeNum = gSaveBlock2Ptr->frontier.pikeWinStreaks[lvlMode] / 14;
do do
{ {
trainerId = sub_8162548(challengeNum, battleNum); trainerId = GetRandomScaledFrontierTrainerId(challengeNum, battleNum);
for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum - 1; i++) for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum - 1; i++)
{ {
if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId)
@@ -1425,7 +1425,7 @@ static void PrepareTwoTrainers(void)
gFacilityTrainers = gBattleFrontierTrainers; gFacilityTrainers = gBattleFrontierTrainers;
do do
{ {
trainerId = sub_8162548(challengeNum, 1); trainerId = GetRandomScaledFrontierTrainerId(challengeNum, 1);
for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum - 1; i++) for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum - 1; i++)
{ {
if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId)
@@ -1440,7 +1440,7 @@ static void PrepareTwoTrainers(void)
do do
{ {
trainerId = sub_8162548(challengeNum, 1); trainerId = GetRandomScaledFrontierTrainerId(challengeNum, 1);
for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum; i++) for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum; i++)
{ {
if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId)
@@ -1466,12 +1466,12 @@ static void BufferTrainerIntro(void)
{ {
if (gSpecialVar_0x8005 == 0) if (gSpecialVar_0x8005 == 0)
{ {
if (gTrainerBattleOpponent_A < TRAINER_RECORD_MIXING_FRIEND) if (gTrainerBattleOpponent_A < FRONTIER_TRAINERS_COUNT)
FrontierSpeechToString(gFacilityTrainers[gTrainerBattleOpponent_A].speechBefore); FrontierSpeechToString(gFacilityTrainers[gTrainerBattleOpponent_A].speechBefore);
} }
else if (gSpecialVar_0x8005 == 1) else if (gSpecialVar_0x8005 == 1)
{ {
if (gTrainerBattleOpponent_B < TRAINER_RECORD_MIXING_FRIEND) if (gTrainerBattleOpponent_B < FRONTIER_TRAINERS_COUNT)
FrontierSpeechToString(gFacilityTrainers[gTrainerBattleOpponent_B].speechBefore); FrontierSpeechToString(gFacilityTrainers[gTrainerBattleOpponent_B].speechBefore);
} }
} }
src/battle_pyramid.c
+2 -2
View File
@@ -1493,7 +1493,7 @@ static u16 GetUniqueTrainerId(u8 objectEventId)
{ {
do do
{ {
trainerId = sub_8162548(challengeNum + 1, battleNum); trainerId = GetRandomScaledFrontierTrainerId(challengeNum + 1, battleNum);
for (i = 0; i < objectEventId; i++) for (i = 0; i < objectEventId; i++)
{ {
if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId)
@@ -1505,7 +1505,7 @@ static u16 GetUniqueTrainerId(u8 objectEventId)
{ {
do do
{ {
trainerId = sub_8162548(challengeNum, battleNum); trainerId = GetRandomScaledFrontierTrainerId(challengeNum, battleNum);
for (i = 0; i < objectEventId; i++) for (i = 0; i < objectEventId; i++)
{ {
if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId)
src/battle_setup.c
+6 -6
View File
@@ -961,12 +961,12 @@ static u8 TrainerBattleLoadArg8(const u8 *ptr)
static u16 GetTrainerAFlag(void) static u16 GetTrainerAFlag(void)
{ {
return FLAG_TRAINER_FLAG_START + gTrainerBattleOpponent_A; return TRAINER_FLAGS_START + gTrainerBattleOpponent_A;
} }
static u16 GetTrainerBFlag(void) static u16 GetTrainerBFlag(void)
{ {
return FLAG_TRAINER_FLAG_START + gTrainerBattleOpponent_B; return TRAINER_FLAGS_START + gTrainerBattleOpponent_B;
} }
static bool32 IsPlayerDefeated(u32 battleOutcome) static bool32 IsPlayerDefeated(u32 battleOutcome)
@@ -1193,7 +1193,7 @@ void SetUpTwoTrainersBattle(void)
bool32 GetTrainerFlagFromScriptPointer(const u8 *data) bool32 GetTrainerFlagFromScriptPointer(const u8 *data)
{ {
u32 flag = TrainerBattleLoadArg16(data + 2); u32 flag = TrainerBattleLoadArg16(data + 2);
return FlagGet(FLAG_TRAINER_FLAG_START + flag); return FlagGet(TRAINER_FLAGS_START + flag);
} }
void SetUpTrainerMovement(void) void SetUpTrainerMovement(void)
@@ -1232,17 +1232,17 @@ static void SetBattledTrainerFlag(void)
bool8 HasTrainerBeenFought(u16 trainerId) bool8 HasTrainerBeenFought(u16 trainerId)
{ {
return FlagGet(FLAG_TRAINER_FLAG_START + trainerId); return FlagGet(TRAINER_FLAGS_START + trainerId);
} }
void SetTrainerFlag(u16 trainerId) void SetTrainerFlag(u16 trainerId)
{ {
FlagSet(FLAG_TRAINER_FLAG_START + trainerId); FlagSet(TRAINER_FLAGS_START + trainerId);
} }
void ClearTrainerFlag(u16 trainerId) void ClearTrainerFlag(u16 trainerId)
{ {
FlagClear(FLAG_TRAINER_FLAG_START + trainerId); FlagClear(TRAINER_FLAGS_START + trainerId);
} }
void BattleSetup_StartTrainerBattle(void) void BattleSetup_StartTrainerBattle(void)
src/battle_tent.c
+13 -11
View File
@@ -12,6 +12,8 @@
#include "frontier_util.h" #include "frontier_util.h"
#include "string_util.h" #include "string_util.h"
#include "constants/battle_tent.h" #include "constants/battle_tent.h"
#include "constants/battle_tent_trainers.h"
#include "constants/battle_tent_mons.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/layouts.h" #include "constants/layouts.h"
#include "constants/region_map_sections.h" #include "constants/region_map_sections.h"
@@ -134,7 +136,7 @@ static void SetVerdanturfTentTrainerGfx(void)
static void BufferVerdanturfTentTrainerIntro(void) static void BufferVerdanturfTentTrainerIntro(void)
{ {
if (gTrainerBattleOpponent_A < TRAINER_RECORD_MIXING_FRIEND) if (gTrainerBattleOpponent_A < FRONTIER_TRAINERS_COUNT)
FrontierSpeechToString(gFacilityTrainers[gTrainerBattleOpponent_A].speechBefore); FrontierSpeechToString(gFacilityTrainers[gTrainerBattleOpponent_A].speechBefore);
} }
@@ -311,7 +313,7 @@ static void GenerateInitialRentalMons(void)
while (i != PARTY_SIZE) while (i != PARTY_SIZE)
{ {
// Cannot have two pokemon of the same species. // Cannot have two pokemon of the same species.
monSetId = Random() % 70; monSetId = Random() % NUM_SLATEPORT_TENT_MONS;
for (j = firstMonId; j < firstMonId + i; j++) for (j = firstMonId; j < firstMonId + i; j++)
{ {
u16 monId = monIds[j]; u16 monId = monIds[j];
@@ -353,10 +355,10 @@ static void GenerateOpponentMons(void)
{ {
u16 trainerId; u16 trainerId;
s32 i, j, k; s32 i, j, k;
register const u16 *monSets asm("r9"); // Fix me. Compiler insists on moving that variable into stack. register const u16 *monSet asm("r9"); // Fix me. Compiler insists on moving that variable into stack.
u16 species[FRONTIER_PARTY_SIZE]; u16 species[FRONTIER_PARTY_SIZE];
u16 heldItems[FRONTIER_PARTY_SIZE]; u16 heldItems[FRONTIER_PARTY_SIZE];
s32 setsCount = 0; s32 monId = 0;
gFacilityTrainers = gSlateportBattleTentTrainers; gFacilityTrainers = gSlateportBattleTentTrainers;
gFacilityTrainerMons = gSlateportBattleTentMons; gFacilityTrainerMons = gSlateportBattleTentMons;
@@ -365,7 +367,7 @@ static void GenerateOpponentMons(void)
{ {
do do
{ {
trainerId = Random() % 30; trainerId = Random() % NUM_BATTLE_TENT_TRAINERS;
for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum; i++) for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum; i++)
{ {
if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId)
@@ -374,21 +376,21 @@ static void GenerateOpponentMons(void)
} while (i != gSaveBlock2Ptr->frontier.curChallengeBattleNum); } while (i != gSaveBlock2Ptr->frontier.curChallengeBattleNum);
gTrainerBattleOpponent_A = trainerId; gTrainerBattleOpponent_A = trainerId;
while (gFacilityTrainers[gTrainerBattleOpponent_A].monSets[setsCount] != 0xFFFF) while (gFacilityTrainers[gTrainerBattleOpponent_A].monSet[monId] != 0xFFFF)
setsCount++; monId++;
if (setsCount > 8) if (monId > 8)
break; break;
setsCount = 0; monId = 0;
} }
if (gSaveBlock2Ptr->frontier.curChallengeBattleNum < 2) if (gSaveBlock2Ptr->frontier.curChallengeBattleNum < 2)
gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = gTrainerBattleOpponent_A; gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = gTrainerBattleOpponent_A;
monSets = gFacilityTrainers[gTrainerBattleOpponent_A].monSets; monSet = gFacilityTrainers[gTrainerBattleOpponent_A].monSet;
i = 0; i = 0;
while (i != FRONTIER_PARTY_SIZE) while (i != FRONTIER_PARTY_SIZE)
{ {
sRandMonSetId = monSets[Random() % setsCount]; sRandMonSetId = monSet[Random() % monId];
for (j = 0; j < 6; j++) for (j = 0; j < 6; j++)
{ {
if (gFacilityTrainerMons[sRandMonSetId].species == gFacilityTrainerMons[gSaveBlock2Ptr->frontier.rentalMons[j].monId].species) if (gFacilityTrainerMons[sRandMonSetId].species == gFacilityTrainerMons[gSaveBlock2Ptr->frontier.rentalMons[j].monId].species)
src/battle_tower.c
+185 -168
View File
@@ -25,6 +25,9 @@
#include "battle_factory.h" #include "battle_factory.h"
#include "constants/apprentice.h" #include "constants/apprentice.h"
#include "constants/battle_frontier.h" #include "constants/battle_frontier.h"
#include "constants/battle_frontier_mons.h"
#include "constants/battle_tent_mons.h"
#include "constants/battle_tent_trainers.h"
#include "constants/battle_tower.h" #include "constants/battle_tower.h"
#include "constants/frontier_util.h" #include "constants/frontier_util.h"
#include "constants/items.h" #include "constants/items.h"
@@ -849,30 +852,37 @@ static const u8 sBattleTowerPartySizes2[] =
[FRONTIER_MODE_LINK_MULTIS] = FRONTIER_MULTI_PARTY_SIZE, [FRONTIER_MODE_LINK_MULTIS] = FRONTIER_MULTI_PARTY_SIZE,
}; };
static const u16 gUnknown_085DF9FA[][2] = // Trainer ID ranges for possible frontier trainers to encounter on particular challenges
// Trainers are scaled by difficulty, so higher trainer IDs have better teams
static const u16 sFrontierTrainerIdRanges[][2] =
{ {
{0x0000, 0x0063}, {FRONTIER_TRAINER_BRADY, FRONTIER_TRAINER_JILL}, // 0 - 99
{0x0050, 0x0077}, {FRONTIER_TRAINER_TREVIN, FRONTIER_TRAINER_CHLOE}, // 80 - 119
{0x0064, 0x008b}, {FRONTIER_TRAINER_ERIK, FRONTIER_TRAINER_SOFIA}, // 100 - 139
{0x0078, 0x009f}, {FRONTIER_TRAINER_NORTON, FRONTIER_TRAINER_JAZLYN}, // 120 - 159
{0x008c, 0x00b3}, {FRONTIER_TRAINER_BRADEN, FRONTIER_TRAINER_ALISON}, // 140 - 179
{0x00a0, 0x00c7}, {FRONTIER_TRAINER_ZACHERY, FRONTIER_TRAINER_LAMAR}, // 160 - 199
{0x00b4, 0x00db}, {FRONTIER_TRAINER_HANK, FRONTIER_TRAINER_TESS}, // 180 - 219
{0x00c8, 0x012b}, {FRONTIER_TRAINER_JAXON, FRONTIER_TRAINER_GRETEL}, // 200 - 299
}; };
static const u16 gUnknown_085DFA1A[][2] = static const u16 sFrontierTrainerIdRangesHard[][2] =
{ {
{0x0064, 0x0077}, {FRONTIER_TRAINER_ERIK, FRONTIER_TRAINER_CHLOE}, // 100 - 119
{0x0078, 0x008b}, {FRONTIER_TRAINER_NORTON, FRONTIER_TRAINER_SOFIA}, // 120 - 139
{0x008c, 0x009f}, {FRONTIER_TRAINER_BRADEN, FRONTIER_TRAINER_JAZLYN}, // 140 - 159
{0x00a0, 0x00b3}, {FRONTIER_TRAINER_ZACHERY, FRONTIER_TRAINER_ALISON}, // 160 - 179
{0x00b4, 0x00c7}, {FRONTIER_TRAINER_HANK, FRONTIER_TRAINER_LAMAR}, // 180 - 199
{0x00c8, 0x00db}, {FRONTIER_TRAINER_JAXON, FRONTIER_TRAINER_TESS}, // 200 - 219
{0x00dc, 0x00ef}, {FRONTIER_TRAINER_LEON, FRONTIER_TRAINER_RAUL}, // 220 - 239
{0x00c8, 0x012b}, {FRONTIER_TRAINER_JAXON, FRONTIER_TRAINER_GRETEL}, // 200 - 299
{0x00b3, 0x008d}, };
{0x00c8, 0x00b7},
// Trainer IDs? Don't make sense as part of previous array, min/max relationship reversed and never accessed
static const u16 sUnused_085DFA1A[][2] =
{
{179, 141}, // FRONTIER_TRAINER_ALISON - FRONTIER_TRAINER_KAYDEN
{200, 183}, // FRONTIER_TRAINER_JAXON - FRONTIER_TRAINER_HUNTER
}; };
static const u8 sBattleTowerPartySizes[FRONTIER_MODE_COUNT] = static const u8 sBattleTowerPartySizes[FRONTIER_MODE_COUNT] =
@@ -1077,7 +1087,7 @@ static void SetNextFacilityOpponent(void)
s32 i; s32 i;
while (1) while (1)
{ {
id = sub_8162548(challengeNum, gSaveBlock2Ptr->frontier.curChallengeBattleNum); id = GetRandomScaledFrontierTrainerId(challengeNum, gSaveBlock2Ptr->frontier.curChallengeBattleNum);
// Ensure trainer wasn't previously fought in this challenge. // Ensure trainer wasn't previously fought in this challenge.
for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum; i++) for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum; i++)
@@ -1097,7 +1107,7 @@ static void SetNextFacilityOpponent(void)
} }
} }
u16 sub_8162548(u8 challengeNum, u8 battleNum) u16 GetRandomScaledFrontierTrainerId(u8 challengeNum, u8 battleNum)
{ {
u16 trainerId; u16 trainerId;
@@ -1105,49 +1115,54 @@ u16 sub_8162548(u8 challengeNum, u8 battleNum)
{ {
if (battleNum == 6) if (battleNum == 6)
{ {
trainerId = (gUnknown_085DFA1A[challengeNum][1] - gUnknown_085DFA1A[challengeNum][0]) + 1; // The last battle in each challenge has a jump in difficulty, pulls from a table with higher ranges
trainerId = gUnknown_085DFA1A[challengeNum][0] + (Random() % trainerId); trainerId = (sFrontierTrainerIdRangesHard[challengeNum][1] - sFrontierTrainerIdRangesHard[challengeNum][0]) + 1;
trainerId = sFrontierTrainerIdRangesHard[challengeNum][0] + (Random() % trainerId);
} }
else else
{ {
trainerId = (gUnknown_085DF9FA[challengeNum][1] - gUnknown_085DF9FA[challengeNum][0]) + 1; trainerId = (sFrontierTrainerIdRanges[challengeNum][1] - sFrontierTrainerIdRanges[challengeNum][0]) + 1;
trainerId = gUnknown_085DF9FA[challengeNum][0] + (Random() % trainerId); trainerId = sFrontierTrainerIdRanges[challengeNum][0] + (Random() % trainerId);
} }
} }
else else
{ {
trainerId = (gUnknown_085DF9FA[7][1] - gUnknown_085DF9FA[7][0]) + 1; // After challenge 7, trainer IDs always come from the last, hardest range, which is the same for both trainer ID tables
trainerId = gUnknown_085DF9FA[7][0] + (Random() % trainerId); trainerId = (sFrontierTrainerIdRanges[7][1] - sFrontierTrainerIdRanges[7][0]) + 1;
trainerId = sFrontierTrainerIdRanges[7][0] + (Random() % trainerId);
} }
return trainerId; return trainerId;
} }
static void sub_81625B4(u8 challengeNum, u8 battleNum, u16 *trainerIdPtr, u8 *arg3) // Unused // Unused
static void GetRandomScaledFrontierTrainerIdRange(u8 challengeNum, u8 battleNum, u16 *trainerIdPtr, u8 *rangePtr)
{ {
u16 trainerId, count; u16 trainerId, range;
if (challengeNum <= 7) if (challengeNum <= 7)
{ {
if (battleNum == 6) if (battleNum == 6)
{ {
count = (gUnknown_085DFA1A[challengeNum][1] - gUnknown_085DFA1A[challengeNum][0]) + 1; // The last battle in each challenge has a jump in difficulty, pulls from a table with higher ranges
trainerId = gUnknown_085DFA1A[challengeNum][0]; range = (sFrontierTrainerIdRangesHard[challengeNum][1] - sFrontierTrainerIdRangesHard[challengeNum][0]) + 1;
trainerId = sFrontierTrainerIdRangesHard[challengeNum][0];
} }
else else
{ {
count = (gUnknown_085DF9FA[challengeNum][1] - gUnknown_085DF9FA[challengeNum][0]) + 1; range = (sFrontierTrainerIdRanges[challengeNum][1] - sFrontierTrainerIdRanges[challengeNum][0]) + 1;
trainerId = gUnknown_085DF9FA[challengeNum][0]; trainerId = sFrontierTrainerIdRanges[challengeNum][0];
} }
} }
else else
{ {
count = (gUnknown_085DF9FA[7][1] - gUnknown_085DF9FA[7][0]) + 1; // After challenge 7, trainer IDs always come from the last, hardest range, which is the same for both trainer ID tables
trainerId = gUnknown_085DF9FA[7][0]; range = (sFrontierTrainerIdRanges[7][1] - sFrontierTrainerIdRanges[7][0]) + 1;
trainerId = sFrontierTrainerIdRanges[7][0];
} }
*trainerIdPtr = trainerId; *trainerIdPtr = trainerId;
*arg3 = count; *rangePtr = range;
} }
void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId) void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId)
@@ -1166,7 +1181,7 @@ void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId)
SetFrontierBrainObjEventGfx_2(); SetFrontierBrainObjEventGfx_2();
return; return;
} }
else if (trainerId < TRAINER_RECORD_MIXING_FRIEND) else if (trainerId < FRONTIER_TRAINERS_COUNT)
{ {
facilityClass = gFacilityTrainers[trainerId].facilityClass; facilityClass = gFacilityTrainers[trainerId].facilityClass;
} }
@@ -1258,7 +1273,7 @@ u8 GetBattleFacilityTrainerGfxId(u16 trainerId)
{ {
facilityClass = gSaveBlock2Ptr->frontier.ereaderTrainer.facilityClass; facilityClass = gSaveBlock2Ptr->frontier.ereaderTrainer.facilityClass;
} }
else if (trainerId < TRAINER_RECORD_MIXING_FRIEND) else if (trainerId < FRONTIER_TRAINERS_COUNT)
{ {
facilityClass = gFacilityTrainers[trainerId].facilityClass; facilityClass = gFacilityTrainers[trainerId].facilityClass;
} }
@@ -1400,7 +1415,7 @@ u8 GetFrontierTrainerFrontSpriteId(u16 trainerId)
{ {
return GetFrontierBrainTrainerPicIndex(); return GetFrontierBrainTrainerPicIndex();
} }
else if (trainerId < TRAINER_RECORD_MIXING_FRIEND) else if (trainerId < FRONTIER_TRAINERS_COUNT)
{ {
return gFacilityClassToPicIndex[gFacilityTrainers[trainerId].facilityClass]; return gFacilityClassToPicIndex[gFacilityTrainers[trainerId].facilityClass];
} }
@@ -1437,7 +1452,7 @@ u8 GetFrontierOpponentClass(u16 trainerId)
{ {
trainerClass = gTrainers[TRAINER_STEVEN].trainerClass; trainerClass = gTrainers[TRAINER_STEVEN].trainerClass;
} }
else if (trainerId < TRAINER_RECORD_MIXING_FRIEND) else if (trainerId < FRONTIER_TRAINERS_COUNT)
{ {
trainerClass = gFacilityClassToTrainerClass[gFacilityTrainers[trainerId].facilityClass]; trainerClass = gFacilityClassToTrainerClass[gFacilityTrainers[trainerId].facilityClass];
} }
@@ -1478,7 +1493,7 @@ static u8 GetFrontierTrainerFacilityClass(u16 trainerId)
{ {
facilityClass = gSaveBlock2Ptr->frontier.ereaderTrainer.facilityClass; facilityClass = gSaveBlock2Ptr->frontier.ereaderTrainer.facilityClass;
} }
else if (trainerId < TRAINER_RECORD_MIXING_FRIEND) else if (trainerId < FRONTIER_TRAINERS_COUNT)
{ {
facilityClass = gFacilityTrainers[trainerId].facilityClass; facilityClass = gFacilityTrainers[trainerId].facilityClass;
} }
@@ -1520,7 +1535,7 @@ void GetFrontierTrainerName(u8 *dst, u16 trainerId)
for (i = 0; i < PLAYER_NAME_LENGTH; i++) for (i = 0; i < PLAYER_NAME_LENGTH; i++)
dst[i] = gTrainers[TRAINER_STEVEN].trainerName[i]; dst[i] = gTrainers[TRAINER_STEVEN].trainerName[i];
} }
else if (trainerId < TRAINER_RECORD_MIXING_FRIEND) else if (trainerId < FRONTIER_TRAINERS_COUNT)
{ {
for (i = 0; i < PLAYER_NAME_LENGTH; i++) for (i = 0; i < PLAYER_NAME_LENGTH; i++)
dst[i] = gFacilityTrainers[trainerId].trainerName[i]; dst[i] = gFacilityTrainers[trainerId].trainerName[i];
@@ -1575,7 +1590,7 @@ static bool8 IsFrontierTrainerFemale(u16 trainerId)
{ {
return IsFrontierBrainFemale(); return IsFrontierBrainFemale();
} }
else if (trainerId < TRAINER_RECORD_MIXING_FRIEND) else if (trainerId < FRONTIER_TRAINERS_COUNT)
{ {
facilityClass = gFacilityTrainers[trainerId].facilityClass; facilityClass = gFacilityTrainers[trainerId].facilityClass;
} }
@@ -1623,18 +1638,18 @@ static void FillTrainerParty(u16 trainerId, u8 firstMonId, u8 monCount)
{ {
s32 i, j; s32 i, j;
u16 chosenMonIndices[4]; u16 chosenMonIndices[4];
u8 friendship = 0xFF; u8 friendship = MAX_FRIENDSHIP;
u8 level = SetFacilityPtrsGetLevel(); u8 level = SetFacilityPtrsGetLevel();
u8 fixedIV = 0; u8 fixedIV = 0;
u8 bfMonCount; u8 bfMonCount;
const u16 *monSets = NULL; const u16 *monSet = NULL;
u32 otID = 0; u32 otID = 0;
if (trainerId < TRAINER_RECORD_MIXING_FRIEND) if (trainerId < FRONTIER_TRAINERS_COUNT)
{ {
// Normal battle frontier trainer. // Normal battle frontier trainer.
fixedIV = GetFrontierTrainerFixedIvs(trainerId); fixedIV = GetFrontierTrainerFixedIvs(trainerId);
monSets = gFacilityTrainers[gTrainerBattleOpponent_A].monSets; monSet = gFacilityTrainers[gTrainerBattleOpponent_A].monSet;
} }
else if (trainerId == TRAINER_EREADER) else if (trainerId == TRAINER_EREADER)
{ {
@@ -1672,20 +1687,20 @@ static void FillTrainerParty(u16 trainerId, u8 firstMonId, u8 monCount)
// Attempt to fill the trainer's party with random Pokemon until 3 have been // Attempt to fill the trainer's party with random Pokemon until 3 have been
// successfully chosen. The trainer's party may not have duplicate pokemon species // successfully chosen. The trainer's party may not have duplicate pokemon species
// or duplicate held items. // or duplicate held items.
for (bfMonCount = 0; monSets[bfMonCount] != 0xFFFF; bfMonCount++) for (bfMonCount = 0; monSet[bfMonCount] != 0xFFFF; bfMonCount++)
; ;
i = 0; i = 0;
otID = Random32(); otID = Random32();
while (i != monCount) while (i != monCount)
{ {
u16 monSetId = monSets[Random() % bfMonCount]; u16 monId = monSet[Random() % bfMonCount];
if ((level == 50 || level == 20) && monSetId > 849) if ((level == 50 || level == 20) && monId > FRONTIER_MONS_HIGH_TIER)
continue; continue;
// Ensure this pokemon species isn't a duplicate. // Ensure this pokemon species isn't a duplicate.
for (j = 0; j < i + firstMonId; j++) for (j = 0; j < i + firstMonId; j++)
{ {
if (GetMonData(&gEnemyParty[j], MON_DATA_SPECIES, NULL) == gFacilityTrainerMons[monSetId].species) if (GetMonData(&gEnemyParty[j], MON_DATA_SPECIES, NULL) == gFacilityTrainerMons[monId].species)
break; break;
} }
if (j != i + firstMonId) if (j != i + firstMonId)
@@ -1695,7 +1710,7 @@ static void FillTrainerParty(u16 trainerId, u8 firstMonId, u8 monCount)
for (j = 0; j < i + firstMonId; j++) for (j = 0; j < i + firstMonId; j++)
{ {
if (GetMonData(&gEnemyParty[j], MON_DATA_HELD_ITEM, NULL) != 0 if (GetMonData(&gEnemyParty[j], MON_DATA_HELD_ITEM, NULL) != 0
&& GetMonData(&gEnemyParty[j], MON_DATA_HELD_ITEM, NULL) == gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]) && GetMonData(&gEnemyParty[j], MON_DATA_HELD_ITEM, NULL) == gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId])
break; break;
} }
if (j != i + firstMonId) if (j != i + firstMonId)
@@ -1705,34 +1720,34 @@ static void FillTrainerParty(u16 trainerId, u8 firstMonId, u8 monCount)
// because the species and held items were already checked directly above. // because the species and held items were already checked directly above.
for (j = 0; j < i; j++) for (j = 0; j < i; j++)
{ {
if (chosenMonIndices[j] == monSetId) if (chosenMonIndices[j] == monId)
break; break;
} }
if (j != i) if (j != i)
continue; continue;
chosenMonIndices[i] = monSetId; chosenMonIndices[i] = monId;
// Place the chosen pokemon into the trainer's party. // Place the chosen pokemon into the trainer's party.
CreateMonWithEVSpreadNatureOTID(&gEnemyParty[i + firstMonId], CreateMonWithEVSpreadNatureOTID(&gEnemyParty[i + firstMonId],
gFacilityTrainerMons[monSetId].species, gFacilityTrainerMons[monId].species,
level, level,
gFacilityTrainerMons[monSetId].nature, gFacilityTrainerMons[monId].nature,
fixedIV, fixedIV,
gFacilityTrainerMons[monSetId].evSpread, gFacilityTrainerMons[monId].evSpread,
otID); otID);
friendship = 255; friendship = MAX_FRIENDSHIP;
// Give the chosen pokemon its specified moves. // Give the chosen pokemon its specified moves.
for (j = 0; j < MAX_MON_MOVES; j++) for (j = 0; j < MAX_MON_MOVES; j++)
{ {
SetMonMoveSlot(&gEnemyParty[i + firstMonId], gFacilityTrainerMons[monSetId].moves[j], j); SetMonMoveSlot(&gEnemyParty[i + firstMonId], gFacilityTrainerMons[monId].moves[j], j);
if (gFacilityTrainerMons[monSetId].moves[j] == MOVE_FRUSTRATION) if (gFacilityTrainerMons[monId].moves[j] == MOVE_FRUSTRATION)
friendship = 0; // Frustration is more powerful the lower the pokemon's friendship is. friendship = 0; // Frustration is more powerful the lower the pokemon's friendship is.
} }
SetMonData(&gEnemyParty[i + firstMonId], MON_DATA_FRIENDSHIP, &friendship); SetMonData(&gEnemyParty[i + firstMonId], MON_DATA_FRIENDSHIP, &friendship);
SetMonData(&gEnemyParty[i + firstMonId], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]); SetMonData(&gEnemyParty[i + firstMonId], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId]);
// The pokemon was successfully added to the trainer's party, so it's safe to move on to // The pokemon was successfully added to the trainer's party, so it's safe to move on to
// the next party slot. // the next party slot.
@@ -1744,7 +1759,7 @@ static void FillTrainerParty(u16 trainerId, u8 firstMonId, u8 monCount)
static void Unused_CreateApprenticeMons(u16 trainerId, u8 firstMonId) static void Unused_CreateApprenticeMons(u16 trainerId, u8 firstMonId)
{ {
s32 i, j; s32 i, j;
u8 friendship = 0xFF; u8 friendship = MAX_FRIENDSHIP;
u8 level = 0; u8 level = 0;
u8 fixedIV = 0; u8 fixedIV = 0;
struct Apprentice *apprentice = &gSaveBlock2Ptr->apprentices[0]; struct Apprentice *apprentice = &gSaveBlock2Ptr->apprentices[0];
@@ -1762,7 +1777,7 @@ static void Unused_CreateApprenticeMons(u16 trainerId, u8 firstMonId)
for (i = 0; i != 3; i++) for (i = 0; i != 3; i++)
{ {
CreateMonWithEVSpread(&gEnemyParty[firstMonId + i], apprentice->party[i].species, level, fixedIV, 8); CreateMonWithEVSpread(&gEnemyParty[firstMonId + i], apprentice->party[i].species, level, fixedIV, 8);
friendship = 0xFF; friendship = MAX_FRIENDSHIP;
for (j = 0; j < MAX_MON_MOVES; j++) for (j = 0; j < MAX_MON_MOVES; j++)
{ {
if (apprentice->party[i].moves[j] == MOVE_FRUSTRATION) if (apprentice->party[i].moves[j] == MOVE_FRUSTRATION)
@@ -1773,27 +1788,27 @@ static void Unused_CreateApprenticeMons(u16 trainerId, u8 firstMonId)
} }
} }
u16 RandomizeFacilityTrainerMonSet(u16 trainerId) u16 GetRandomFrontierMonFromSet(u16 trainerId)
{ {
u8 level = SetFacilityPtrsGetLevel(); u8 level = SetFacilityPtrsGetLevel();
const u16 *monSets = gFacilityTrainers[trainerId].monSets; const u16 *monSet = gFacilityTrainers[trainerId].monSet;
u8 bfMonCount = 0; u8 numMons = 0;
u32 monSetId = monSets[bfMonCount]; u32 monId = monSet[numMons];
while (monSetId != 0xFFFF) while (monId != 0xFFFF)
{ {
bfMonCount++; numMons++;
monSetId = monSets[bfMonCount]; monId = monSet[numMons];
if (monSetId == 0xFFFF) if (monId == 0xFFFF)
break; break;
} }
do do
{ {
monSetId = monSets[Random() % bfMonCount]; monId = monSet[Random() % numMons];
} while((level == 50 || level == 20) && monSetId > 849); } while((level == 50 || level == 20) && monId > FRONTIER_MONS_HIGH_TIER);
return monSetId; return monId;
} }
static void FillFactoryTrainerParty(void) static void FillFactoryTrainerParty(void)
@@ -1813,7 +1828,7 @@ static void FillFactoryFrontierTrainerParty(u16 trainerId, u8 firstMonId)
u8 fixedIV; u8 fixedIV;
u32 otID; u32 otID;
if (trainerId < TRAINER_RECORD_MIXING_FRIEND) if (trainerId < FRONTIER_TRAINERS_COUNT)
{ {
u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; // Unused variable. u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; // Unused variable.
u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
@@ -1843,21 +1858,21 @@ static void FillFactoryFrontierTrainerParty(u16 trainerId, u8 firstMonId)
otID = T1_READ_32(gSaveBlock2Ptr->playerTrainerId); otID = T1_READ_32(gSaveBlock2Ptr->playerTrainerId);
for (i = 0; i < FRONTIER_PARTY_SIZE; i++) for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
{ {
u16 monSetId = gUnknown_03006298[i]; u16 monId = gUnknown_03006298[i];
CreateMonWithEVSpreadNatureOTID(&gEnemyParty[firstMonId + i], CreateMonWithEVSpreadNatureOTID(&gEnemyParty[firstMonId + i],
gFacilityTrainerMons[monSetId].species, gFacilityTrainerMons[monId].species,
level, level,
gFacilityTrainerMons[monSetId].nature, gFacilityTrainerMons[monId].nature,
fixedIV, fixedIV,
gFacilityTrainerMons[monSetId].evSpread, gFacilityTrainerMons[monId].evSpread,
otID); otID);
friendship = 0; friendship = 0;
for (j = 0; j < MAX_MON_MOVES; j++) for (j = 0; j < MAX_MON_MOVES; j++)
SetMonMoveAvoidReturn(&gEnemyParty[firstMonId + i], gFacilityTrainerMons[monSetId].moves[j], j); SetMonMoveAvoidReturn(&gEnemyParty[firstMonId + i], gFacilityTrainerMons[monId].moves[j], j);
SetMonData(&gEnemyParty[firstMonId + i], MON_DATA_FRIENDSHIP, &friendship); SetMonData(&gEnemyParty[firstMonId + i], MON_DATA_FRIENDSHIP, &friendship);
SetMonData(&gEnemyParty[firstMonId + i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]); SetMonData(&gEnemyParty[firstMonId + i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId]);
} }
} }
@@ -1871,25 +1886,25 @@ static void FillFactoryTentTrainerParty(u16 trainerId, u8 firstMonId)
for (i = 0; i < FRONTIER_PARTY_SIZE; i++) for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
{ {
u16 monSetId = gUnknown_03006298[i]; u16 monId = gUnknown_03006298[i];
CreateMonWithEVSpreadNatureOTID(&gEnemyParty[firstMonId + i], CreateMonWithEVSpreadNatureOTID(&gEnemyParty[firstMonId + i],
gFacilityTrainerMons[monSetId].species, gFacilityTrainerMons[monId].species,
level, level,
gFacilityTrainerMons[monSetId].nature, gFacilityTrainerMons[monId].nature,
fixedIV, fixedIV,
gFacilityTrainerMons[monSetId].evSpread, gFacilityTrainerMons[monId].evSpread,
otID); otID);
friendship = 0; friendship = 0;
for (j = 0; j < MAX_MON_MOVES; j++) for (j = 0; j < MAX_MON_MOVES; j++)
{ {
SetMonMoveAvoidReturn(&gEnemyParty[firstMonId + i], gFacilityTrainerMons[monSetId].moves[j], j); SetMonMoveAvoidReturn(&gEnemyParty[firstMonId + i], gFacilityTrainerMons[monId].moves[j], j);
if (gFacilityTrainerMons[monSetId].moves[j] == MOVE_FRUSTRATION) if (gFacilityTrainerMons[monId].moves[j] == MOVE_FRUSTRATION)
friendship = 0; friendship = 0;
} }
SetMonData(&gEnemyParty[firstMonId + i], MON_DATA_FRIENDSHIP, &friendship); SetMonData(&gEnemyParty[firstMonId + i], MON_DATA_FRIENDSHIP, &friendship);
SetMonData(&gEnemyParty[firstMonId + i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]); SetMonData(&gEnemyParty[firstMonId + i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId]);
} }
} }
@@ -1922,7 +1937,7 @@ static void GetOpponentIntroSpeech(void)
if (trainerId == TRAINER_EREADER) if (trainerId == TRAINER_EREADER)
FrontierSpeechToString(gSaveBlock2Ptr->frontier.ereaderTrainer.greeting); FrontierSpeechToString(gSaveBlock2Ptr->frontier.ereaderTrainer.greeting);
else if (trainerId < TRAINER_RECORD_MIXING_FRIEND) else if (trainerId < FRONTIER_TRAINERS_COUNT)
FrontierSpeechToString(gFacilityTrainers[trainerId].speechBefore); FrontierSpeechToString(gFacilityTrainers[trainerId].speechBefore);
else if (trainerId < TRAINER_RECORD_MIXING_APPRENTICE) else if (trainerId < TRAINER_RECORD_MIXING_APPRENTICE)
FrontierSpeechToString(gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].greeting); FrontierSpeechToString(gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].greeting);
@@ -2150,7 +2165,7 @@ static void sub_8163EE4(void)
StringCopy7(playerRecord->name, gSaveBlock2Ptr->playerName); StringCopy7(playerRecord->name, gSaveBlock2Ptr->playerName);
playerRecord->winStreak = GetCurrentBattleTowerWinStreak(lvlMode, battleMode); playerRecord->winStreak = GetCurrentBattleTowerWinStreak(lvlMode, battleMode);
for (i = 0; i < 6; i++) for (i = 0; i < EASY_CHAT_BATTLE_WORDS_COUNT; i++)
{ {
playerRecord->greeting[i] = gSaveBlock1Ptr->easyChatBattleStart[i]; playerRecord->greeting[i] = gSaveBlock1Ptr->easyChatBattleStart[i];
playerRecord->speechWon[i] = gSaveBlock1Ptr->easyChatBattleWon[i]; playerRecord->speechWon[i] = gSaveBlock1Ptr->easyChatBattleWon[i];
@@ -2252,7 +2267,7 @@ static void LoadMultiPartnerCandidatesData(void)
u32 spArray[5]; u32 spArray[5];
s32 r10; s32 r10;
u16 trainerId; u16 trainerId;
u16 monSetId; u16 monId;
u32 lvlMode, battleMode; u32 lvlMode, battleMode;
s32 challengeNum; s32 challengeNum;
u32 species1, species2; u32 species1, species2;
@@ -2272,7 +2287,7 @@ static void LoadMultiPartnerCandidatesData(void)
{ {
do do
{ {
trainerId = sub_8162548(challengeNum, 0); trainerId = GetRandomScaledFrontierTrainerId(challengeNum, 0);
for (i = 0; i < j; i++) for (i = 0; i < j; i++)
{ {
if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId)
@@ -2294,24 +2309,24 @@ static void LoadMultiPartnerCandidatesData(void)
{ {
while (1) while (1)
{ {
monSetId = RandomizeFacilityTrainerMonSet(trainerId); monId = GetRandomFrontierMonFromSet(trainerId);
if (j % 2 != 0 && gFacilityTrainerMons[gSaveBlock2Ptr->frontier.trainerIds[r10 - 1]].itemTableId == gFacilityTrainerMons[monSetId].itemTableId) if (j % 2 != 0 && gFacilityTrainerMons[gSaveBlock2Ptr->frontier.trainerIds[r10 - 1]].itemTableId == gFacilityTrainerMons[monId].itemTableId)
continue; continue;
for (k = 8; k < r10; k++) for (k = 8; k < r10; k++)
{ {
if (gFacilityTrainerMons[gSaveBlock2Ptr->frontier.trainerIds[k]].species == gFacilityTrainerMons[monSetId].species) if (gFacilityTrainerMons[gSaveBlock2Ptr->frontier.trainerIds[k]].species == gFacilityTrainerMons[monId].species)
break; break;
if (species1 == gFacilityTrainerMons[monSetId].species) if (species1 == gFacilityTrainerMons[monId].species)
break; break;
if (species2 == gFacilityTrainerMons[monSetId].species) if (species2 == gFacilityTrainerMons[monId].species)
break; break;
} }
if (k == r10) if (k == r10)
break; break;
} }
gSaveBlock2Ptr->frontier.trainerIds[r10] = monSetId; gSaveBlock2Ptr->frontier.trainerIds[r10] = monId;
r10++; r10++;
} }
} }
@@ -2392,7 +2407,7 @@ static void LoadMultiPartnerCandidatesData(void)
} }
} }
static void sub_81646BC(u16 trainerId, u16 monSetId) static void sub_81646BC(u16 trainerId, u16 monId)
{ {
u16 move = 0; u16 move = 0;
u16 species = 0; u16 species = 0;
@@ -2400,10 +2415,10 @@ static void sub_81646BC(u16 trainerId, u16 monSetId)
if (trainerId != TRAINER_EREADER) if (trainerId != TRAINER_EREADER)
{ {
if (trainerId < TRAINER_RECORD_MIXING_FRIEND) if (trainerId < FRONTIER_TRAINERS_COUNT)
{ {
move = gFacilityTrainerMons[monSetId].moves[0]; move = gFacilityTrainerMons[monId].moves[0];
species = gFacilityTrainerMons[monSetId].species; species = gFacilityTrainerMons[monId].species;
} }
else if (trainerId < TRAINER_RECORD_MIXING_APPRENTICE) else if (trainerId < TRAINER_RECORD_MIXING_APPRENTICE)
{ {
@@ -2430,7 +2445,7 @@ static void sub_81646BC(u16 trainerId, u16 monSetId)
static void ShowPartnerCandidateMessage(void) static void ShowPartnerCandidateMessage(void)
{ {
s32 i, j, partnerId; s32 i, j, partnerId;
s32 monSetId; s32 monId;
s32 level = SetFacilityPtrsGetLevel(); s32 level = SetFacilityPtrsGetLevel();
u16 winStreak = GetCurrentFacilityWinStreak(); u16 winStreak = GetCurrentFacilityWinStreak();
s32 challengeNum = winStreak / 7; s32 challengeNum = winStreak / 7;
@@ -2448,7 +2463,7 @@ static void ShowPartnerCandidateMessage(void)
case PARTNER_MSGID_INTRO: case PARTNER_MSGID_INTRO:
if (trainerId == TRAINER_EREADER) if (trainerId == TRAINER_EREADER)
return; return;
if (trainerId < TRAINER_RECORD_MIXING_FRIEND) if (trainerId < FRONTIER_TRAINERS_COUNT)
{ {
GetFrontierTrainerName(gStringVar1, trainerId); GetFrontierTrainerName(gStringVar1, trainerId);
} }
@@ -2468,16 +2483,16 @@ static void ShowPartnerCandidateMessage(void)
} }
break; break;
case PARTNER_MSGID_MON1: case PARTNER_MSGID_MON1:
monSetId = gSaveBlock2Ptr->frontier.trainerIds[8 + k * 2]; monId = gSaveBlock2Ptr->frontier.trainerIds[8 + k * 2];
sub_81646BC(trainerId, monSetId); sub_81646BC(trainerId, monId);
break; break;
case PARTNER_MSGID_MON2_ASK: case PARTNER_MSGID_MON2_ASK:
monSetId = gSaveBlock2Ptr->frontier.trainerIds[9 + k * 2]; monId = gSaveBlock2Ptr->frontier.trainerIds[9 + k * 2];
sub_81646BC(trainerId, monSetId); sub_81646BC(trainerId, monId);
break; break;
case PARTNER_MSGID_ACCEPT: case PARTNER_MSGID_ACCEPT:
gPartnerTrainerId = trainerId; gPartnerTrainerId = trainerId;
if (trainerId < TRAINER_RECORD_MIXING_FRIEND) if (trainerId < FRONTIER_TRAINERS_COUNT)
{ {
gSaveBlock2Ptr->frontier.trainerIds[18] = gSaveBlock2Ptr->frontier.trainerIds[8 + k * 2]; gSaveBlock2Ptr->frontier.trainerIds[18] = gSaveBlock2Ptr->frontier.trainerIds[8 + k * 2];
gSaveBlock2Ptr->frontier.trainerIds[19] = gSaveBlock2Ptr->frontier.trainerIds[9 + k * 2]; gSaveBlock2Ptr->frontier.trainerIds[19] = gSaveBlock2Ptr->frontier.trainerIds[9 + k * 2];
@@ -2496,7 +2511,7 @@ static void ShowPartnerCandidateMessage(void)
{ {
while (1) while (1)
{ {
i = sub_8162548(challengeNum, k / 2); i = GetRandomScaledFrontierTrainerId(challengeNum, k / 2);
if (gPartnerTrainerId == i) if (gPartnerTrainerId == i)
continue; continue;
@@ -2520,7 +2535,7 @@ static void ShowPartnerCandidateMessage(void)
return; return;
// First check is redundant, only needs to make sure it's not an Apprentice // First check is redundant, only needs to make sure it's not an Apprentice
if (trainerId < TRAINER_RECORD_MIXING_FRIEND) if (trainerId < FRONTIER_TRAINERS_COUNT)
{ {
ShowFieldMessage(sPartnerTrainerTextTables[partnerId].strings[gSpecialVar_0x8005]); ShowFieldMessage(sPartnerTrainerTextTables[partnerId].strings[gSpecialVar_0x8005]);
} }
@@ -2575,7 +2590,7 @@ static void LoadLinkMultiOpponentsData(void)
{ {
do do
{ {
trainerId = sub_8162548(challengeNum, i / 2); trainerId = GetRandomScaledFrontierTrainerId(challengeNum, i / 2);
for (j = 0; j < i; j++) for (j = 0; j < i; j++)
{ {
if (gSaveBlock2Ptr->frontier.trainerIds[j] == trainerId) if (gSaveBlock2Ptr->frontier.trainerIds[j] == trainerId)
@@ -2908,13 +2923,13 @@ static void CopyEReaderTrainerFarewellMessage(void)
FrontierSpeechToString(gSaveBlock2Ptr->frontier.ereaderTrainer.farewellPlayerLost); FrontierSpeechToString(gSaveBlock2Ptr->frontier.ereaderTrainer.farewellPlayerLost);
} }
void sub_81653CC(void) void TryHideBattleTowerReporter(void)
{ {
if (gSaveBlock2Ptr->frontier.challengeStatus == CHALLENGE_STATUS_SAVING) if (gSaveBlock2Ptr->frontier.challengeStatus == CHALLENGE_STATUS_SAVING)
sub_80F01B8(); HideBattleTowerReporter();
if (FlagGet(FLAG_CANCEL_BATTLE_ROOM_CHALLENGE) == TRUE) if (FlagGet(FLAG_CANCEL_BATTLE_ROOM_CHALLENGE) == TRUE)
{ {
sub_80F01B8(); HideBattleTowerReporter();
FlagClear(FLAG_CANCEL_BATTLE_ROOM_CHALLENGE); FlagClear(FLAG_CANCEL_BATTLE_ROOM_CHALLENGE);
} }
} }
@@ -2926,7 +2941,7 @@ static void FillPartnerParty(u16 trainerId)
s32 i, j; s32 i, j;
u32 ivs, level; u32 ivs, level;
u32 friendship; u32 friendship;
u16 monSetId; u16 monId;
u32 otID; u32 otID;
u8 trainerName[PLAYER_NAME_LENGTH + 1]; u8 trainerName[PLAYER_NAME_LENGTH + 1];
SetFacilityPtrsGetLevel(); SetFacilityPtrsGetLevel();
@@ -2960,30 +2975,30 @@ static void FillPartnerParty(u16 trainerId)
// Scrapped, lol. // Scrapped, lol.
trainerName[0] = gGameLanguage; trainerName[0] = gGameLanguage;
} }
else if (trainerId < TRAINER_RECORD_MIXING_FRIEND) else if (trainerId < FRONTIER_TRAINERS_COUNT)
{ {
level = SetFacilityPtrsGetLevel(); level = SetFacilityPtrsGetLevel();
ivs = GetFrontierTrainerFixedIvs(trainerId); ivs = GetFrontierTrainerFixedIvs(trainerId);
otID = Random32(); otID = Random32();
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
monSetId = gSaveBlock2Ptr->frontier.trainerIds[i + 18]; monId = gSaveBlock2Ptr->frontier.trainerIds[i + 18];
CreateMonWithEVSpreadNatureOTID(&gPlayerParty[3 + i], CreateMonWithEVSpreadNatureOTID(&gPlayerParty[3 + i],
gFacilityTrainerMons[monSetId].species, gFacilityTrainerMons[monId].species,
level, level,
gFacilityTrainerMons[monSetId].nature, gFacilityTrainerMons[monId].nature,
ivs, ivs,
gFacilityTrainerMons[monSetId].evSpread, gFacilityTrainerMons[monId].evSpread,
otID); otID);
friendship = 0xFF; friendship = MAX_FRIENDSHIP;
for (j = 0; j < MAX_MON_MOVES; j++) for (j = 0; j < MAX_MON_MOVES; j++)
{ {
SetMonMoveSlot(&gPlayerParty[3 + i], gFacilityTrainerMons[monSetId].moves[j], j); SetMonMoveSlot(&gPlayerParty[3 + i], gFacilityTrainerMons[monId].moves[j], j);
if (gFacilityTrainerMons[monSetId].moves[j] == MOVE_FRUSTRATION) if (gFacilityTrainerMons[monId].moves[j] == MOVE_FRUSTRATION)
friendship = 0; friendship = 0;
} }
SetMonData(&gPlayerParty[3 + i], MON_DATA_FRIENDSHIP, &friendship); SetMonData(&gPlayerParty[3 + i], MON_DATA_FRIENDSHIP, &friendship);
SetMonData(&gPlayerParty[3 + i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]); SetMonData(&gPlayerParty[3 + i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId]);
for (j = 0; j < PLAYER_NAME_LENGTH + 1; j++) for (j = 0; j < PLAYER_NAME_LENGTH + 1; j++)
trainerName[j] = gFacilityTrainers[trainerId].trainerName[j]; trainerName[j] = gFacilityTrainers[trainerId].trainerName[j];
SetMonData(&gPlayerParty[3 + i], MON_DATA_OT_NAME, &trainerName); SetMonData(&gPlayerParty[3 + i], MON_DATA_OT_NAME, &trainerName);
@@ -3164,7 +3179,7 @@ void GetBattleTowerTrainerLanguage(u8 *dst, u16 trainerId)
{ {
*dst = gGameLanguage; *dst = gGameLanguage;
} }
else if (trainerId < TRAINER_RECORD_MIXING_FRIEND) else if (trainerId < FRONTIER_TRAINERS_COUNT)
{ {
*dst = gGameLanguage; *dst = gGameLanguage;
} }
@@ -3237,28 +3252,30 @@ s32 GetHighestLevelInPlayerParty(void)
return highestLevel; return highestLevel;
} }
// Frontier Trainer parties are roughly scaled in difficulty with higher trainer IDs, so scale IVs as well
// Duplicated in Battle Dome as GetDomeTrainerMonIvs
static u8 GetFrontierTrainerFixedIvs(u16 trainerId) static u8 GetFrontierTrainerFixedIvs(u16 trainerId)
{ {
u8 fixedIV = 0; u8 fixedIv;
if (trainerId < 100) if (trainerId <= FRONTIER_TRAINER_JILL) // 0 - 99
fixedIV = 3; fixedIv = 3;
else if (trainerId < 120) else if (trainerId <= FRONTIER_TRAINER_CHLOE) // 100 - 119
fixedIV = 6; fixedIv = 6;
else if (trainerId < 140) else if (trainerId <= FRONTIER_TRAINER_SOFIA) // 120 - 139
fixedIV = 9; fixedIv = 9;
else if (trainerId < 160) else if (trainerId <= FRONTIER_TRAINER_JAZLYN) // 140 - 159
fixedIV = 12; fixedIv = 12;
else if (trainerId < 180) else if (trainerId <= FRONTIER_TRAINER_ALISON) // 160 - 179
fixedIV = 15; fixedIv = 15;
else if (trainerId < 200) else if (trainerId <= FRONTIER_TRAINER_LAMAR) // 180 - 199
fixedIV = 18; fixedIv = 18;
else if (trainerId < 220) else if (trainerId <= FRONTIER_TRAINER_TESS) // 200 - 219
fixedIV = 21; fixedIv = 21;
else else // 220+ (- 299)
fixedIV = 31; fixedIv = 31;
return fixedIV; return fixedIv;
} }
static u16 sub_8165D40(void) static u16 sub_8165D40(void)
@@ -3280,19 +3297,19 @@ static u16 sub_8165D40(void)
static u8 SetTentPtrsGetLevel(void) static u8 SetTentPtrsGetLevel(void)
{ {
u8 level = 30; u8 level = 30;
u32 tentFacility = VarGet(VAR_FRONTIER_FACILITY); u32 facility = VarGet(VAR_FRONTIER_FACILITY);
if (tentFacility == TENT_SLATEPORT) if (facility == FRONTIER_FACILITY_FACTORY)
{ {
gFacilityTrainers = gSlateportBattleTentTrainers; gFacilityTrainers = gSlateportBattleTentTrainers;
gFacilityTrainerMons = gSlateportBattleTentMons; gFacilityTrainerMons = gSlateportBattleTentMons;
} }
else if (tentFacility == TENT_VERDANTURF) else if (facility == FRONTIER_FACILITY_PALACE)
{ {
gFacilityTrainers = gVerdanturfBattleTentTrainers; gFacilityTrainers = gVerdanturfBattleTentTrainers;
gFacilityTrainerMons = gVerdanturfBattleTentMons; gFacilityTrainerMons = gVerdanturfBattleTentMons;
} }
else if (tentFacility == TENT_FALLARBOR) else if (facility == FRONTIER_FACILITY_ARENA)
{ {
gFacilityTrainers = gFallarborBattleTentTrainers; gFacilityTrainers = gFallarborBattleTentTrainers;
gFacilityTrainerMons = gFallarborBattleTentMons; gFacilityTrainerMons = gFallarborBattleTentMons;
@@ -3339,19 +3356,19 @@ static void FillTentTrainerParty_(u16 trainerId, u8 firstMonId, u8 monCount)
u8 level = SetTentPtrsGetLevel(); u8 level = SetTentPtrsGetLevel();
u8 fixedIV = 0; u8 fixedIV = 0;
u8 bfMonCount; u8 bfMonCount;
const u16 *monSets = NULL; const u16 *monSet = NULL;
u32 otID = 0; u32 otID = 0;
u16 monSetId; u16 monId;
monSets = gFacilityTrainers[gTrainerBattleOpponent_A].monSets; monSet = gFacilityTrainers[gTrainerBattleOpponent_A].monSet;
bfMonCount = 0; bfMonCount = 0;
monSetId = monSets[bfMonCount]; monId = monSet[bfMonCount];
while (monSetId != 0xFFFF) while (monId != 0xFFFF)
{ {
bfMonCount++; bfMonCount++;
monSetId = monSets[bfMonCount]; monId = monSet[bfMonCount];
if (monSetId == 0xFFFF) if (monId == 0xFFFF)
break; break;
} }
@@ -3359,12 +3376,12 @@ static void FillTentTrainerParty_(u16 trainerId, u8 firstMonId, u8 monCount)
otID = Random32(); otID = Random32();
while (i != monCount) while (i != monCount)
{ {
u16 monSetId = monSets[Random() % bfMonCount]; u16 monId = monSet[Random() % bfMonCount];
// Ensure this pokemon species isn't a duplicate. // Ensure this pokemon species isn't a duplicate.
for (j = 0; j < i + firstMonId; j++) for (j = 0; j < i + firstMonId; j++)
{ {
if (GetMonData(&gEnemyParty[j], MON_DATA_SPECIES, NULL) == gFacilityTrainerMons[monSetId].species) if (GetMonData(&gEnemyParty[j], MON_DATA_SPECIES, NULL) == gFacilityTrainerMons[monId].species)
break; break;
} }
if (j != i + firstMonId) if (j != i + firstMonId)
@@ -3374,7 +3391,7 @@ static void FillTentTrainerParty_(u16 trainerId, u8 firstMonId, u8 monCount)
for (j = 0; j < i + firstMonId; j++) for (j = 0; j < i + firstMonId; j++)
{ {
if (GetMonData(&gEnemyParty[j], MON_DATA_HELD_ITEM, NULL) != 0 if (GetMonData(&gEnemyParty[j], MON_DATA_HELD_ITEM, NULL) != 0
&& GetMonData(&gEnemyParty[j], MON_DATA_HELD_ITEM, NULL) == gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]) && GetMonData(&gEnemyParty[j], MON_DATA_HELD_ITEM, NULL) == gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId])
break; break;
} }
if (j != i + firstMonId) if (j != i + firstMonId)
@@ -3384,34 +3401,34 @@ static void FillTentTrainerParty_(u16 trainerId, u8 firstMonId, u8 monCount)
// because the species and held items were already checked directly above. // because the species and held items were already checked directly above.
for (j = 0; j < i; j++) for (j = 0; j < i; j++)
{ {
if (chosenMonIndices[j] == monSetId) if (chosenMonIndices[j] == monId)
break; break;
} }
if (j != i) if (j != i)
continue; continue;
chosenMonIndices[i] = monSetId; chosenMonIndices[i] = monId;
// Place the chosen pokemon into the trainer's party. // Place the chosen pokemon into the trainer's party.
CreateMonWithEVSpreadNatureOTID(&gEnemyParty[i + firstMonId], CreateMonWithEVSpreadNatureOTID(&gEnemyParty[i + firstMonId],
gFacilityTrainerMons[monSetId].species, gFacilityTrainerMons[monId].species,
level, level,
gFacilityTrainerMons[monSetId].nature, gFacilityTrainerMons[monId].nature,
fixedIV, fixedIV,
gFacilityTrainerMons[monSetId].evSpread, gFacilityTrainerMons[monId].evSpread,
otID); otID);
friendship = 255; friendship = MAX_FRIENDSHIP;
// Give the chosen pokemon its specified moves. // Give the chosen pokemon its specified moves.
for (j = 0; j < MAX_MON_MOVES; j++) for (j = 0; j < MAX_MON_MOVES; j++)
{ {
SetMonMoveSlot(&gEnemyParty[i + firstMonId], gFacilityTrainerMons[monSetId].moves[j], j); SetMonMoveSlot(&gEnemyParty[i + firstMonId], gFacilityTrainerMons[monId].moves[j], j);
if (gFacilityTrainerMons[monSetId].moves[j] == MOVE_FRUSTRATION) if (gFacilityTrainerMons[monId].moves[j] == MOVE_FRUSTRATION)
friendship = 0; // Frustration is more powerful the lower the pokemon's friendship is. friendship = 0; // Frustration is more powerful the lower the pokemon's friendship is.
} }
SetMonData(&gEnemyParty[i + firstMonId], MON_DATA_FRIENDSHIP, &friendship); SetMonData(&gEnemyParty[i + firstMonId], MON_DATA_FRIENDSHIP, &friendship);
SetMonData(&gEnemyParty[i + firstMonId], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]); SetMonData(&gEnemyParty[i + firstMonId], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId]);
// The pokemon was successfully added to the trainer's party, so it's safe to move on to // The pokemon was successfully added to the trainer's party, so it's safe to move on to
// the next party slot. // the next party slot.
src/cable_club.c
+5 -4
View File
@@ -592,7 +592,7 @@ void TryTradeLinkup(void)
sub_80B236C(2, 2); sub_80B236C(2, 2);
} }
void sub_80B2E74(void) void TryRecordMixLinkup(void)
{ {
gSpecialVar_Result = 0; gSpecialVar_Result = 0;
gLinkType = LINKTYPE_0x3311; gLinkType = LINKTYPE_0x3311;
@@ -784,7 +784,8 @@ static void sub_80B3220(u8 taskId)
} }
} }
void sub_80B3254(void) // Unused
void CableClubSaveGame(void)
{ {
SaveGame(); SaveGame();
} }
@@ -1298,10 +1299,10 @@ void sub_80B3AF8(u8 taskId)
} }
} }
void sub_80B3BC4(void) void TrySetBattleTowerLinkType(void)
{ {
if (gWirelessCommType == 0) if (gWirelessCommType == 0)
{ {
gLinkType = LINKTYPE_0x2288; gLinkType = LINKTYPE_BATTLE_TOWER;
} }
} }
src/contest.c
+1 -1
View File
@@ -5093,7 +5093,7 @@ static void sub_80DE864(u8 a)
gContestResources->field_18->unk4_0 = 1; gContestResources->field_18->unk4_0 = 1;
break; break;
case MOVE_RETURN: case MOVE_RETURN:
gAnimFriendship = 0xFF; gAnimFriendship = MAX_FRIENDSHIP;
break; break;
case MOVE_FRUSTRATION: case MOVE_FRUSTRATION:
gAnimFriendship = 0; gAnimFriendship = 0;
src/data/battle_frontier/battle_frontier_mons.h
+883 -883
View File
File diff suppressed because it is too large Load Diff
src/data/battle_frontier/battle_frontier_trainer_mons.h
+6170 -14030
View File
File diff suppressed because it is too large Load Diff
src/data/battle_frontier/battle_frontier_trainers.h
+601 -601
View File
File diff suppressed because it is too large Load Diff
src/data/battle_frontier/battle_tent.h
+1035 -1035
View File
File diff suppressed because it is too large Load Diff
src/decoration.c
+2 -1
View File
@@ -2154,7 +2154,8 @@ void sub_8129708(void)
} }
} }
void sub_81297AC(void) // Unused
void GetEventObjectLocalIdByFlag(void)
{ {
u8 i; u8 i;
src/dewford_trend.c
+3 -3
View File
@@ -25,12 +25,12 @@ void InitDewfordTrend(void)
for (i = 0; i < 5; i++) for (i = 0; i < 5; i++)
{ {
gSaveBlock1Ptr->easyChatPairs[i].words[0] = sub_811EE38(EC_GROUP_CONDITIONS); gSaveBlock1Ptr->easyChatPairs[i].words[0] = GetRandomEasyChatWordFromGroup(EC_GROUP_CONDITIONS);
if (Random() & 1) if (Random() & 1)
gSaveBlock1Ptr->easyChatPairs[i].words[1] = sub_811EE38(EC_GROUP_LIFESTYLE); gSaveBlock1Ptr->easyChatPairs[i].words[1] = GetRandomEasyChatWordFromGroup(EC_GROUP_LIFESTYLE);
else else
gSaveBlock1Ptr->easyChatPairs[i].words[1] = sub_811EE38(EC_GROUP_HOBBIES); gSaveBlock1Ptr->easyChatPairs[i].words[1] = GetRandomEasyChatWordFromGroup(EC_GROUP_HOBBIES);
gSaveBlock1Ptr->easyChatPairs[i].unk1_6 = Random() & 1; gSaveBlock1Ptr->easyChatPairs[i].unk1_6 = Random() & 1;
sub_8122B28(&(gSaveBlock1Ptr->easyChatPairs[i])); sub_8122B28(&(gSaveBlock1Ptr->easyChatPairs[i]));
src/easy_chat.c
+16 -15
View File
@@ -222,7 +222,7 @@ static void sub_811E1A4(s8, s8);
static void sub_811E2DC(struct Sprite *); static void sub_811E2DC(struct Sprite *);
static void sub_811E34C(u8, u8); static void sub_811E34C(u8, u8);
static bool8 EasyChatIsNationalPokedexEnabled(void); static bool8 EasyChatIsNationalPokedexEnabled(void);
static u16 sub_811F108(void); static u16 GetRandomUnlockedEasyChatPokemon(void);
static void sub_811F2D4(void); static void sub_811F2D4(void);
static void sub_811F46C(void); static void sub_811F46C(void);
static u8 *CopyEasyChatWordPadded(u8 *, u16, u16); static u8 *CopyEasyChatWordPadded(u8 *, u16, u16);
@@ -5039,24 +5039,24 @@ static u16 GetEasyChatWordStringLength(u16 easyChatWord)
} }
} }
bool8 sub_811EDC4(const u16 *easyChatWords, u8 arg1, u8 arg2, u16 arg3) static bool8 CanPhraseFitInXRowsYCols(const u16 *easyChatWords, u8 numRows, u8 numColumns, u16 maxLength)
{ {
u8 i, j; u8 i, j;
for (i = 0; i < arg2; i++) for (i = 0; i < numColumns; i++)
{ {
u16 totalLength = arg1 - 1; u16 totalLength = numRows - 1;
for (j = 0; j < arg1; j++) for (j = 0; j < numRows; j++)
totalLength += GetEasyChatWordStringLength(*(easyChatWords++)); totalLength += GetEasyChatWordStringLength(*(easyChatWords++));
if (totalLength > arg3) if (totalLength > maxLength)
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
} }
u16 sub_811EE38(u16 groupId) u16 GetRandomEasyChatWordFromGroup(u16 groupId)
{ {
u16 index = Random() % gEasyChatGroups[groupId].numWords; u16 index = Random() % gEasyChatGroups[groupId].numWords;
if (groupId == EC_GROUP_POKEMON if (groupId == EC_GROUP_POKEMON
@@ -5070,18 +5070,18 @@ u16 sub_811EE38(u16 groupId)
return EC_WORD(groupId, index); return EC_WORD(groupId, index);
} }
u16 sub_811EE90(u16 groupId) u16 GetRandomEasyChatWordFromUnlockedGroup(u16 groupId)
{ {
if (!IsEasyChatGroupUnlocked(groupId)) if (!IsEasyChatGroupUnlocked(groupId))
return 0xFFFF; return 0xFFFF;
if (groupId == EC_GROUP_POKEMON) if (groupId == EC_GROUP_POKEMON)
return sub_811F108(); return GetRandomUnlockedEasyChatPokemon();
return sub_811EE38(groupId); return GetRandomEasyChatWordFromGroup(groupId);
} }
void sub_811EECC(void) void ShowEasyChatProfile(void)
{ {
u16 *easyChatWords; u16 *easyChatWords;
int columns, rows; int columns, rows;
@@ -5094,7 +5094,7 @@ void sub_811EECC(void)
break; break;
case 1: case 1:
easyChatWords = gSaveBlock1Ptr->easyChatBattleStart; easyChatWords = gSaveBlock1Ptr->easyChatBattleStart;
if (sub_811EDC4(gSaveBlock1Ptr->easyChatBattleStart, 3, 2, 18)) if (CanPhraseFitInXRowsYCols(gSaveBlock1Ptr->easyChatBattleStart, 3, 2, 18))
{ {
columns = 2; columns = 2;
rows = 3; rows = 3;
@@ -5123,10 +5123,11 @@ void sub_811EECC(void)
ShowFieldAutoScrollMessage(gStringVar4); ShowFieldAutoScrollMessage(gStringVar4);
} }
void sub_811EF6C(void) // The phrase that a man in Dewford Hall suggests has a "deep link" to the current trendy phrase
void BufferDeepLinkPhrase(void)
{ {
int groupId = Random() & 1 ? EC_GROUP_HOBBIES : EC_GROUP_LIFESTYLE; int groupId = Random() & 1 ? EC_GROUP_HOBBIES : EC_GROUP_LIFESTYLE;
u16 easyChatWord = sub_811EE90(groupId); u16 easyChatWord = GetRandomEasyChatWordFromUnlockedGroup(groupId);
CopyEasyChatWord(gStringVar2, easyChatWord); CopyEasyChatWord(gStringVar2, easyChatWord);
} }
@@ -5217,7 +5218,7 @@ static bool8 EasyChatIsNationalPokedexEnabled(void)
return IsNationalPokedexEnabled(); return IsNationalPokedexEnabled();
} }
static u16 sub_811F108(void) static u16 GetRandomUnlockedEasyChatPokemon(void)
{ {
u16 i; u16 i;
u16 numWords; u16 numWords;
src/ereader_helpers.c
+5 -5
View File
@@ -473,7 +473,7 @@ static bool32 TryWriteTrainerHill_r(struct EReaderTrainerHillSet *ttdata, struct
} }
buffer2->checksum = CalcByteArraySum((u8 *)buffer2->floors, 4 * sizeof(struct TrHillFloor)); buffer2->checksum = CalcByteArraySum((u8 *)buffer2->floors, 4 * sizeof(struct TrHillFloor));
if (TryWriteSpecialSaveSection(SECTOR_ID_TRAINER_HILL, (u8 *)buffer2) != 1) if (TryWriteSpecialSaveSection(SECTOR_ID_TRAINER_HILL, (u8 *)buffer2) != SAVE_STATUS_OK)
return FALSE; return FALSE;
return TRUE; return TRUE;
@@ -487,13 +487,13 @@ bool32 TryWriteTrainerHill(struct EReaderTrainerHillSet *arg0)
return result; return result;
} }
static bool32 TryReadTrainerHill_r(struct EReaderTrainerHillSet *arg0, u8 *arg1) static bool32 TryReadTrainerHill_r(struct EReaderTrainerHillSet *dst, u8 *buffer)
{ {
if (TryReadSpecialSaveSection(SECTOR_ID_TRAINER_HILL, arg1) != 1) if (TryReadSpecialSaveSection(SECTOR_ID_TRAINER_HILL, buffer) != SAVE_STATUS_OK)
return FALSE; return FALSE;
memcpy(arg0, arg1, sizeof(struct EReaderTrainerHillSet)); memcpy(dst, buffer, sizeof(struct EReaderTrainerHillSet));
if (!TrainerHill_VerifyChecksum(arg0)) if (!TrainerHill_VerifyChecksum(dst))
return FALSE; return FALSE;
return TRUE; return TRUE;

Some files were not shown because too many files have changed in this diff Show More