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

Merge master into ObjEvent rename and prune accidental inclusions

Browse Source
This commit is contained in:
GriffinR
2020-01-08 05:43:06 -05:00
parent 68cdd7b1cb
commit ef67f2d33b
85 changed files with 4548 additions and 4729 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/battle_frontier/battle_tower.inc
+30 -1
View File
@@ -53,7 +53,36 @@
special CallBattleTowerFunc special CallBattleTowerFunc
.endm .endm
@ TODO: Document and add macros for BATTLE_TOWER_FUNC_10 - BATTLE_TOWER_FUNC_14 @ Load the parties, gfx, and other data (like Apprentice id) for the multi partner candidates
.macro tower_loadpartners
setvar VAR_0x8004, BATTLE_TOWER_FUNC_LOAD_PARTNERS
special CallBattleTowerFunc
.endm
@ Print message from potential multi partner. msgId is any PARTNER_MSGID_*
.macro tower_dopartnermsg msgId:req
setvar VAR_0x8004, BATTLE_TOWER_FUNC_PARTNER_MSG
setvar VAR_0x8005, \msgId
special CallBattleTowerFunc
.endm
@ Receives/loads the opponent data for a link multi challenge. Returns 6 when finished, and finishes immediately if not doing a link multi battle.
.macro tower_loadlinkopponents
setvar VAR_0x8004, BATTLE_TOWER_FUNC_LOAD_LINK_OPPONENTS
special CallBattleTowerFunc
.endm
@ Unknown. Destroys some link task if using wireless link. Wait for link?
.macro tower_unklink
setvar VAR_0x8004, BATTLE_TOWER_FUNC_13
special CallBattleTowerFunc
.endm
@ Set VAR_OBJ_GFX_ID_E to the gfx id of the selected multi partner
.macro tower_setpartnergfx
setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_PARTNER_GFX
special CallBattleTowerFunc
.endm
@ Set the data used for the post-challenge Battle Tower interview @ Set the data used for the post-challenge Battle Tower interview
.macro tower_setinterviewdata .macro tower_setinterviewdata
data/event_scripts.s
+2 -2
View File
@@ -473,9 +473,9 @@ gStdScripts_End:: @ 81DC2CC
.include "data/maps/SafariZone_Northeast/scripts.inc" .include "data/maps/SafariZone_Northeast/scripts.inc"
.include "data/maps/SafariZone_Southeast/scripts.inc" .include "data/maps/SafariZone_Southeast/scripts.inc"
.include "data/maps/BattleFrontier_OutsideEast/scripts.inc" .include "data/maps/BattleFrontier_OutsideEast/scripts.inc"
.include "data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc"
.include "data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc"
.include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc" .include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc"
.include "data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc"
.include "data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc"
.include "data/maps/BattleFrontier_BattleDomeLobby/scripts.inc" .include "data/maps/BattleFrontier_BattleDomeLobby/scripts.inc"
.include "data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc" .include "data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc"
.include "data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc" .include "data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc"
data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin → data/layouts/BattleFrontier_BattleTowerMultiCorridor/border.bin
View File
data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin → data/layouts/BattleFrontier_BattleTowerMultiCorridor/map.bin
View File
data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin → data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/border.bin
View File
data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin → data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/map.bin
View File
data/layouts/layouts.json
+8 -8
View File
@@ -3892,24 +3892,24 @@
"blockdata_filepath": "data/layouts/DesertUnderpass/map.bin" "blockdata_filepath": "data/layouts/DesertUnderpass/map.bin"
}, },
{ {
"id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM", "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM",
"name": "BattleFrontier_BattleTowerMultiBattleRoom_Layout", "name": "BattleFrontier_BattleTowerMultiPartnerRoom_Layout",
"width": 21, "width": 21,
"height": 15, "height": 15,
"primary_tileset": "gTileset_Building", "primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_BattleFrontier", "secondary_tileset": "gTileset_BattleFrontier",
"border_filepath": "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin", "border_filepath": "data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/border.bin",
"blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin" "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/map.bin"
}, },
{ {
"id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2", "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR",
"name": "BattleFrontier_BattleTowerCorridor2_Layout", "name": "BattleFrontier_BattleTowerMultiCorridor_Layout",
"width": 17, "width": 17,
"height": 5, "height": 5,
"primary_tileset": "gTileset_Building", "primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_BattleFrontier", "secondary_tileset": "gTileset_BattleFrontier",
"border_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin", "border_filepath": "data/layouts/BattleFrontier_BattleTowerMultiCorridor/border.bin",
"blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin" "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerMultiCorridor/map.bin"
}, },
{ {
"id": "LAYOUT_ROUTE111_NO_MIRAGE_TOWER", "id": "LAYOUT_ROUTE111_NO_MIRAGE_TOWER",
data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+6 -6
View File
@@ -48,7 +48,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom:: @ 82574DC
applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceDown applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceDown
applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceLeft applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceLeft
setvar VAR_TEMP_2, 1 setvar VAR_TEMP_2, 1
frontier_set FRONTIER_DATA_6, 1 frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
goto BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent goto BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E
@@ -143,8 +143,8 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent:: @ 82576B0
call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor6thOpponent call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor6thOpponent
compare VAR_RESULT, 6 compare VAR_RESULT, 6
call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor7thOpponent call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor7thOpponent
call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponentNoRecord goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponentNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
switch VAR_RESULT switch VAR_RESULT
@@ -252,8 +252,8 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_TycoonUpNext:: @ 82578BC
BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon:: @ 82578D4 BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon:: @ 82578D4
message BattleFrontier_BattleArenaBattleRoom_Text_PreparedForTycoon message BattleFrontier_BattleArenaBattleRoom_Text_PreparedForTycoon
waitmessage waitmessage
call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoonNoRecord goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoonNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
switch VAR_RESULT switch VAR_RESULT
@@ -380,7 +380,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_StartArenaBattle:: @ 8257B5E
BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle:: @ 8257B6C BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle:: @ 8257B6C
closemessage closemessage
setvar VAR_TEMP_2, 0 setvar VAR_TEMP_2, 0
frontier_set FRONTIER_DATA_6, 0 frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, SPECIAL_BATTLE_ARENA setvar VAR_0x8004, SPECIAL_BATTLE_ARENA
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
+2 -2
View File
@@ -77,8 +77,8 @@ BattleFrontier_BattleArenaLobby_EventScript_SaveAfterChallenge:: @ 8255D59
arena_save 0 arena_save 0
playse SE_SAVE playse SE_SAVE
waitse waitse
call BattleFrontier_BattleArenaLobby_EventScript_23E8E0 call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_EndSaveAfterChallenge goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_EndSaveAfterChallenge
message BattleFrontier_BattleArenaLobby_Text_RecordLastMatch message BattleFrontier_BattleArenaLobby_Text_RecordLastMatch
waitmessage waitmessage
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+1 -1
View File
@@ -465,7 +465,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C436:: @ 824C436
goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7 goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7
BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440 BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440
frontier_set FRONTIER_DATA_6, 0 frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, SPECIAL_BATTLE_DOME setvar VAR_0x8004, SPECIAL_BATTLE_DOME
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+2 -2
View File
@@ -86,8 +86,8 @@ BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991
dome_save 0 dome_save 0
playse SE_SAVE playse SE_SAVE
waitse waitse
call BattleFrontier_BattleDomeLobby_EventScript_23E8E0 call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_2499E9 goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_2499E9
message BattleFrontier_BattleDomeLobby_Text_24AE17 message BattleFrontier_BattleDomeLobby_Text_24AE17
waitmessage waitmessage
data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
+3 -3
View File
@@ -19,7 +19,7 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222
compare VAR_0x8006, 1 compare VAR_0x8006, 1
goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7 goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7
frontier_set FRONTIER_DATA_6, 1 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_24B652
waitmovement 0 waitmovement 0
@@ -29,8 +29,8 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F:: @ 824B24F
call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB
waitmessage waitmessage
switch VAR_RESULT switch VAR_RESULT
call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8E0 call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1 goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1
multichoice 16, 0, MULTI_TOURNEY_WITH_RECORD, 1 multichoice 16, 0, MULTI_TOURNEY_WITH_RECORD, 1
switch VAR_RESULT switch VAR_RESULT
data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
+2 -2
View File
@@ -82,7 +82,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleOpponent:: @ 825AEA7
msgbox gStringVar4, MSGBOX_DEFAULT msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage waitmessage
closemessage closemessage
frontier_set FRONTIER_DATA_6, 0 frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
@@ -180,7 +180,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandGold:: @ 825B09
BattleFrontier_BattleFactoryBattleRoom_EventScript_DoNolandBattle:: @ 825B0E0 BattleFrontier_BattleFactoryBattleRoom_EventScript_DoNolandBattle:: @ 825B0E0
closemessage closemessage
frontier_set FRONTIER_DATA_6, 0 frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
+2 -2
View File
@@ -75,8 +75,8 @@ BattleFrontier_BattleFactoryLobby_EventScript_LostChallenge:: @ 8258506
waitse waitse
BattleFrontier_BattleFactoryLobby_EventScript_AskRecordBattle:: @ 825853B BattleFrontier_BattleFactoryLobby_EventScript_AskRecordBattle:: @ 825853B
call BattleFrontier_BattleFactoryLobby_EventScript_23E8E0 call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_EndRecordBattle goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_EndRecordBattle
message BattleFrontier_BattleFactoryLobby_Text_RecordLastMatch message BattleFrontier_BattleFactoryLobby_Text_RecordLastMatch
waitmessage waitmessage
data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
+5 -5
View File
@@ -100,8 +100,8 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor6thOpponent call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor6thOpponent
compare VAR_RESULT, 6 compare VAR_RESULT, 6
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor7thOpponent call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor7thOpponent
call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0 call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponentNoRecord goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponentNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
switch VAR_RESULT switch VAR_RESULT
@@ -215,7 +215,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_PauseChallenge:: @ 8259E47
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ResumeChallenge:: @ 8259E69 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ResumeChallenge:: @ 8259E69
special SavePlayerParty special SavePlayerParty
factory_setparties 0 factory_setparties 0
frontier_set FRONTIER_DATA_6, 1 frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
special CalculatePlayerPartyCount special CalculatePlayerPartyCount
goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
@@ -391,8 +391,8 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleFlexible:: @ 825A0B0
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead:: @ 825A0B9 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead:: @ 825A0B9
message BattleFrontier_BattleFactoryPreBattleRoom_Text_PreparedToFaceHead message BattleFrontier_BattleFactoryPreBattleRoom_Text_PreparedToFaceHead
waitmessage waitmessage
call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0 call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHeadNoRecord goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHeadNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
switch VAR_RESULT switch VAR_RESULT
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+6 -6
View File
@@ -45,7 +45,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_EnterRoom:: @ 824F86B
waitmovement 0 waitmovement 0
applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown
setvar VAR_TEMP_2, 1 setvar VAR_TEMP_2, 1
frontier_set FRONTIER_DATA_6, 1 frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent goto BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
BattleFrontier_BattlePalaceBattleRoom_EventScript_BeginChallenge:: @ 824F8B5 BattleFrontier_BattlePalaceBattleRoom_EventScript_BeginChallenge:: @ 824F8B5
@@ -104,8 +104,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent:: @ 824F98
call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor6thOpponent call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor6thOpponent
compare VAR_RESULT, 6 compare VAR_RESULT, 6
call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor7thOpponent call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor7thOpponent
call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0 call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponentNoRecord goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponentNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
switch VAR_RESULT switch VAR_RESULT
@@ -180,8 +180,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_MavenUpNext:: @ 824FB61
BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven:: @ 824FB79 BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven:: @ 824FB79
message BattleFrontier_BattlePalaceBattleRoom_Text_ReadyForPalaceMaven message BattleFrontier_BattlePalaceBattleRoom_Text_ReadyForPalaceMaven
waitmessage waitmessage
call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0 call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMavenNoRecord goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMavenNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
switch VAR_RESULT switch VAR_RESULT
@@ -290,7 +290,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserGold:: @ 824FD8
BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle:: @ 824FDF7 BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle:: @ 824FDF7
closemessage closemessage
setvar VAR_TEMP_2, 0 setvar VAR_TEMP_2, 0
frontier_set FRONTIER_DATA_6, 0 frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, SPECIAL_BATTLE_PALACE setvar VAR_0x8004, SPECIAL_BATTLE_PALACE
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+2 -2
View File
@@ -77,8 +77,8 @@ BattleFrontier_BattlePalaceLobby_EventScript_SaveAfterChallenge:: @ 824D8A1
palace_save 0 palace_save 0
playse SE_SAVE playse SE_SAVE
waitse waitse
call BattleFrontier_BattlePalaceLobby_EventScript_23E8E0 call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_EndSaveAfterChallenge goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_EndSaveAfterChallenge
message BattleFrontier_BattlePalaceLobby_Text_LikeToRecordMatch message BattleFrontier_BattlePalaceLobby_Text_LikeToRecordMatch
waitmessage waitmessage
data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
+201 -211
View File
@@ -1,147 +1,145 @@
BattleFrontier_BattleTowerBattleRoom_MapScripts:: @ 8241B40 BattleFrontier_BattleTowerBattleRoom_MapScripts:: @ 8241B40
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62 map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom_OnWarp
.byte 0 .byte 0
BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B: @ 8241B4B BattleFrontier_BattleTowerBattleRoom_OnWarp: @ 8241B4B
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241B55 map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_SetUpObjects
.2byte 0 .2byte 0
BattleFrontier_BattleTowerBattleRoom_EventScript_241B55:: @ 8241B55 BattleFrontier_BattleTowerBattleRoom_EventScript_SetUpObjects:: @ 8241B55
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_242198 applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_SetInvisible
end end
BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62: @ 8241B62 BattleFrontier_BattleTowerBattleRoom_OnFrame: @ 8241B62
map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_EnterRoom
.2byte 0 .2byte 0
BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C BattleFrontier_BattleTowerBattleRoom_EventScript_EnterRoom:: @ 8241B6C
setvar VAR_TEMP_0, 1 setvar VAR_TEMP_0, 1
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242179 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerEnter
waitmovement 0 waitmovement 0
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3 goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant
waitmovement 0 waitmovement 0
setvar VAR_TEMP_2, 1 setvar VAR_TEMP_2, 1
frontier_set FRONTIER_DATA_6, 1 frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F goto BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3 BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter:: @ 8241BC3
tower_setopponent tower_setopponent
addobject 1 addobject 1
applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242182 applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_OpponentEnter
waitmovement 0 waitmovement 0
tower_getopponentintro 0 tower_getopponentintro 0
msgbox gStringVar4, MSGBOX_DEFAULT msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage waitmessage
call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle
switch VAR_RESULT switch VAR_RESULT
case B_OUTCOME_WON, BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F case B_OUTCOME_WON, BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent
BattleFrontier_BattleTowerBattleRoom_EventScript_241C03:: @ 8241C03 BattleFrontier_BattleTower_EventScript_WarpToLobbyLost:: @ 8241C03
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03:: @ 8241C03
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
tower_set TOWER_DATA_LVL_MODE tower_set TOWER_DATA_LVL_MODE
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
special Script_TryGainNewFanFromCounter special Script_TryGainNewFanFromCounter
goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8 goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby
BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent:: @ 8241C2F
call BattleFrontier_EventScript_IncrementWinStreak call BattleFrontier_EventScript_IncrementWinStreak
tower_setbattlewon tower_setbattlewon
switch VAR_RESULT switch VAR_RESULT
case 7, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 case 7, BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon
applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242188 applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_OpponentExit
waitmovement 0 waitmovement 0
removeobject 1 removeobject 1
frontier_getbrainstatus frontier_getbrainstatus
compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
call_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3 call_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_SecondAttendantEnter
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT
playfanfare MUS_ME_ASA playfanfare MUS_ME_ASA
waitfanfare waitfanfare
special HealPlayerParty special HealPlayerParty
BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent:: @ 8241C8F
BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F
frontier_getbrainstatus frontier_getbrainstatus
copyvar VAR_TEMP_F, VAR_RESULT copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_MaidenUpNext
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
call BattleFrontier_BattleTowerBattleRoom_EventScript_241E44 call BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyForOpponent
call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0 call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponentNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge
case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D40 case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRecordBattle
case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_AskPauseChallenge
case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A:: @ 8241D0A BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @ 8241D0A
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge
case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskPauseChallenge
case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
BattleFrontier_BattleTowerBattleRoom_EventScript_241D40:: @ 8241D40 BattleFrontier_BattleTowerBattleRoom_EventScript_AskRecordBattle:: @ 8241D40
message BattleFrontier_BattleTowerBattleRoom_Text_2423A3 message BattleFrontier_BattleTowerBattleRoom_Text_RecordYourBattle
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_BattleTowerBattleRoom_EventScript_241C8F case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241D72 case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_RecordBattle
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
BattleFrontier_BattleTowerBattleRoom_EventScript_241D72:: @ 8241D72 BattleFrontier_BattleTowerBattleRoom_EventScript_RecordBattle:: @ 8241D72
call BattleFrontier_EventScript_SaveBattle call BattleFrontier_EventScript_SaveBattle
goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F goto BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C:: @ 8241D7C BattleFrontier_BattleTowerBattleRoom_EventScript_AskPauseChallenge:: @ 8241D7C
msgbox BattleFrontier_BattleTowerBattleRoom_Text_2423FC, MSGBOX_YESNO msgbox BattleFrontier_BattleTowerBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
switch VAR_RESULT switch VAR_RESULT
case NO, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F case NO, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
case YES, BattleFrontier_BattleTowerBattleRoom_EventScript_241E22 case YES, BattleFrontier_BattleTowerBattleRoom_EventScript_PauseChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA:: @ 8241DAA BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge:: @ 8241DAA
message BattleFrontier_BattleTowerBattleRoom_Text_24244C message BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge
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_BattleTowerBattleRoom_EventScript_241C8F case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_24220E case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_RetireChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC:: @ 8241DDC BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge:: @ 8241DDC
closemessage closemessage
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242180 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle
waitmovement 0 waitmovement 0
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos
waitmovement 0 waitmovement 0
goto BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3 goto BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter
BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6 BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon:: @ 8241DF6
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
tower_set TOWER_DATA_LVL_MODE tower_set TOWER_DATA_LVL_MODE
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
special Script_TryGainNewFanFromCounter special Script_TryGainNewFanFromCounter
goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8 goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby
BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22 BattleFrontier_BattleTowerBattleRoom_EventScript_PauseChallenge:: @ 8241E22
message BattleFrontier_BattleTowerBattleRoom_Text_242426 message BattleFrontier_BattleTowerBattleRoom_Text_SavingPleaseWait
waitmessage waitmessage
tower_save CHALLENGE_STATUS_PAUSED tower_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE playse SE_SAVE
@@ -150,43 +148,43 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22
frontier_reset frontier_reset
end end
BattleFrontier_BattleTowerBattleRoom_EventScript_241E44:: @ 8241E44 BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyForOpponent:: @ 8241E44
copyvar VAR_TEMP_F, VAR_RESULT copyvar VAR_TEMP_F, VAR_RESULT
switch VAR_TEMP_F switch VAR_TEMP_F
case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241E90 case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor2ndOpponent
case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241E97 case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor3rdOpponent
case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241E9E case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor4thOpponent
case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_241EA5 case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor5thOpponent
case 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241EAC case 5, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor6thOpponent
case 6, BattleFrontier_BattleTowerBattleRoom_EventScript_241EB3 case 6, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor7thOpponent
BattleFrontier_BattleTowerBattleRoom_EventScript_241E90:: @ 8241E90 BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor2ndOpponent:: @ 8241E90
message BattleFrontier_BattleTowerBattleRoom_Text_242277 message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor2ndOpponent
waitmessage waitmessage
return return
BattleFrontier_BattleTowerBattleRoom_EventScript_241E97:: @ 8241E97 BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor3rdOpponent:: @ 8241E97
message BattleFrontier_BattleTowerBattleRoom_Text_2422A9 message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor3rdOpponent
waitmessage waitmessage
return return
BattleFrontier_BattleTowerBattleRoom_EventScript_241E9E:: @ 8241E9E BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor4thOpponent:: @ 8241E9E
message BattleFrontier_BattleTowerBattleRoom_Text_2422DB message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor4thOpponent
waitmessage waitmessage
return return
BattleFrontier_BattleTowerBattleRoom_EventScript_241EA5:: @ 8241EA5 BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor5thOpponent:: @ 8241EA5
message BattleFrontier_BattleTowerBattleRoom_Text_24230D message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor5thOpponent
waitmessage waitmessage
return return
BattleFrontier_BattleTowerBattleRoom_EventScript_241EAC:: @ 8241EAC BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor6thOpponent:: @ 8241EAC
message BattleFrontier_BattleTowerBattleRoom_Text_24233F message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor6thOpponent
waitmessage waitmessage
return return
BattleFrontier_BattleTowerBattleRoom_EventScript_241EB3:: @ 8241EB3 BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor7thOpponent:: @ 8241EB3
message BattleFrontier_BattleTowerBattleRoom_Text_242371 message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor7thOpponent
waitmessage waitmessage
return return
@@ -194,8 +192,8 @@ BattleFrontier_EventScript_IncrementWinStreak:: @ 8241EBA
frontier_incrementstreak frontier_incrementstreak
return return
BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 BattleFrontier_BattleTowerBattleRoom_EventScript_SecondAttendantEnter:: @ 8241EC3
applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_24219A applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantEnter
waitmovement 0 waitmovement 0
applymovement 3, Common_Movement_WalkInPlaceLeft applymovement 3, Common_Movement_WalkInPlaceLeft
waitmovement 0 waitmovement 0
@@ -204,113 +202,111 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3
waitmovement 0 waitmovement 0
applymovement 2, Common_Movement_Delay48 applymovement 2, Common_Movement_Delay48
waitmovement 0 waitmovement 0
applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2421A6 applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantDelay
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_2421AB applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantFaceSecondAttendant
waitmovement 0 waitmovement 0
applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2421A1 applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantExit
waitmovement 0 waitmovement 0
return return
BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A:: @ 8241F0A BattleFrontier_BattleTowerBattleRoom_EventScript_MaidenUpNext:: @ 8241F0A
compare VAR_TEMP_2, 1 compare VAR_TEMP_2, 1
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden
msgbox BattleFrontier_BattleTowerBattleRoom_Text_2424C2, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerBattleRoom_Text_SalonMaidenOnHerWay, MSGBOX_DEFAULT
setvar VAR_TEMP_2, 1 setvar VAR_TEMP_2, 1
BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden:: @ 8241F22
BattleFrontier_BattleTowerBattleRoom_EventScript_241F22:: @ 8241F22 message BattleFrontier_BattleTowerBattleRoom_Text_ReadyForSalonMaiden
message BattleFrontier_BattleTowerBattleRoom_Text_242542
waitmessage waitmessage
call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0 call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F79 goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaidenNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel
case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D40 case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRecordBattle
case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_AskPauseChallenge
case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden
BattleFrontier_BattleTowerBattleRoom_EventScript_241F79:: @ 8241F79 BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaidenNoRecord:: @ 8241F79
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel
case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskPauseChallenge
case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden
BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel:: @ 8241FAF
call BattleFrontier_EventScript_SetBrainObjectGfx call BattleFrontier_EventScript_SetBrainObjectGfx
closemessage closemessage
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242180 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle
waitmovement 0 waitmovement 0
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos
waitmovement 0 waitmovement 0
addobject 1 addobject 1
applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_2421B2 applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_AnabelEnter
waitmovement 0 waitmovement 0
switch VAR_TEMP_F switch VAR_TEMP_F
case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleTowerBattleRoom_EventScript_242085 case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleTowerBattleRoom_EventScript_AnabelGoldIntro
case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleTowerBattleRoom_EventScript_242029 case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelSilver
case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelGold
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_242029 goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelSilver
msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerBattleRoom_Text_GreetingsImAnabel, MSGBOX_DEFAULT
frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029 BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelSilver:: @ 8242029
msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerBattleRoom_Text_LetMeSeeYourTalent, MSGBOX_DEFAULT
call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle
compare VAR_RESULT, 1 compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_242046 goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver
goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03 goto BattleFrontier_BattleTower_EventScript_WarpToLobbyLost
BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046 BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver:: @ 8242046
call BattleFrontier_EventScript_IncrementWinStreak call BattleFrontier_EventScript_IncrementWinStreak
frontier_getsymbols frontier_getsymbols
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon
msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelTalentShallBeRecognized, MSGBOX_DEFAULT
playfanfare MUS_ME_SYMBOLGET playfanfare MUS_ME_SYMBOLGET
message BattleFrontier_BattleTowerBattleRoom_Text_24270E message BattleFrontier_BattleTowerBattleRoom_Text_ReceivedAbilitySymbol
waitmessage waitmessage
waitfanfare waitfanfare
frontier_givesymbol frontier_givesymbol
msgbox BattleFrontier_BattleTowerBattleRoom_Text_242744, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerBattleRoom_Text_UntilNextTime, MSGBOX_DEFAULT
goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon
BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085 BattleFrontier_BattleTowerBattleRoom_EventScript_AnabelGoldIntro:: @ 8242085
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelGold
msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelYouCameBack, MSGBOX_DEFAULT
frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2 BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelGold:: @ 82420B2
msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerBattleRoom_Text_LetsBeginShallWe, MSGBOX_DEFAULT
call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle
compare VAR_RESULT, 1 compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelGold
goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03 goto BattleFrontier_BattleTower_EventScript_WarpToLobbyLost
BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelGold:: @ 82420CF
call BattleFrontier_EventScript_IncrementWinStreak call BattleFrontier_EventScript_IncrementWinStreak
frontier_getsymbols frontier_getsymbols
compare VAR_RESULT, 2 compare VAR_RESULT, 2
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon
msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelCongratsYourPassPlease, MSGBOX_DEFAULT
playfanfare MUS_ME_SYMBOLGET playfanfare MUS_ME_SYMBOLGET
message BattleFrontier_BattleTowerBattleRoom_Text_242932 message BattleFrontier_BattleTowerBattleRoom_Text_AbilitySymbolTookGoldenShine
waitmessage waitmessage
waitfanfare waitfanfare
frontier_givesymbol frontier_givesymbol
msgbox BattleFrontier_BattleTowerBattleRoom_Text_24295D, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerBattleRoom_Text_WishICouldBattleYouAgain, MSGBOX_DEFAULT
goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon
BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E:: @ 824210E BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle:: @ 824210E
BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
closemessage closemessage
setvar VAR_TEMP_2, 0 setvar VAR_TEMP_2, 0
frontier_set FRONTIER_DATA_6, 0 frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, SPECIAL_BATTLE_TOWER setvar VAR_0x8004, SPECIAL_BATTLE_TOWER
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
@@ -318,11 +314,11 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
waitstate waitstate
copyvar VAR_0x8004, VAR_FRONTIER_BATTLE_MODE copyvar VAR_0x8004, VAR_FRONTIER_BATTLE_MODE
compare VAR_0x8004, FRONTIER_MODE_LINK_MULTIS compare VAR_0x8004, FRONTIER_MODE_LINK_MULTIS
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_EndTowerBattle
frontier_restorehelditems frontier_restorehelditems
special HealPlayerParty special HealPlayerParty
frontier_resetsketch frontier_resetsketch
BattleFrontier_BattleTowerBattleRoom_EventScript_24215A:: @ 824215A BattleFrontier_BattleTowerBattleRoom_EventScript_EndTowerBattle:: @ 824215A
tower_setinterviewdata tower_setinterviewdata
frontier_get FRONTIER_DATA_BATTLE_OUTCOME frontier_get FRONTIER_DATA_BATTLE_OUTCOME
return return
@@ -331,22 +327,22 @@ BattleFrontier_EventScript_SetBrainObjectGfx:: @ 8242170
frontier_setbrainobj frontier_setbrainobj
return return
BattleFrontier_BattleTowerBattleRoom_Movement_242179: @ 8242179 BattleFrontier_BattleTowerBattleRoom_Movement_PlayerEnter: @ 8242179
walk_up walk_up
walk_up walk_up
walk_up walk_up
face_right face_right
step_end step_end
BattleFrontier_BattleTowerBattleRoom_Movement_24217E: @ 824217E BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant: @ 824217E
face_down face_down
step_end step_end
BattleFrontier_BattleTowerBattleRoom_Movement_242180: @ 8242180 BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle: @ 8242180
face_right face_right
step_end step_end
BattleFrontier_BattleTowerBattleRoom_Movement_242182: @ 8242182 BattleFrontier_BattleTowerBattleRoom_Movement_OpponentEnter: @ 8242182
walk_down walk_down
walk_down walk_down
walk_down walk_down
@@ -354,21 +350,21 @@ BattleFrontier_BattleTowerBattleRoom_Movement_242182: @ 8242182
face_left face_left
step_end step_end
BattleFrontier_BattleTowerBattleRoom_Movement_242188: @ 8242188 BattleFrontier_BattleTowerBattleRoom_Movement_OpponentExit: @ 8242188
walk_up walk_up
walk_up walk_up
walk_up walk_up
walk_up walk_up
step_end step_end
BattleFrontier_BattleTowerBattleRoom_Movement_24218D: @ 824218D BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer: @ 824218D
walk_right walk_right
walk_right walk_right
walk_right walk_right
walk_up walk_up
step_end step_end
BattleFrontier_BattleTowerBattleRoom_Movement_242192: @ 8242192 BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos: @ 8242192
walk_down walk_down
walk_left walk_left
walk_left walk_left
@@ -376,11 +372,11 @@ BattleFrontier_BattleTowerBattleRoom_Movement_242192: @ 8242192
face_right face_right
step_end step_end
BattleFrontier_BattleTowerBattleRoom_Movement_242198: @ 8242198 BattleFrontier_BattleTowerBattleRoom_Movement_SetInvisible: @ 8242198
set_invisible set_invisible
step_end step_end
BattleFrontier_BattleTowerBattleRoom_Movement_24219A: @ 824219A BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantEnter: @ 824219A
set_visible set_visible
delay_16 delay_16
walk_up walk_up
@@ -389,21 +385,21 @@ BattleFrontier_BattleTowerBattleRoom_Movement_24219A: @ 824219A
delay_8 delay_8
step_end step_end
BattleFrontier_BattleTowerBattleRoom_Movement_2421A1: @ 82421A1 BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantExit: @ 82421A1
walk_right walk_right
walk_right walk_right
walk_down walk_down
set_invisible set_invisible
step_end step_end
BattleFrontier_BattleTowerBattleRoom_Movement_2421A6: @ 82421A6 BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantDelay: @ 82421A6
delay_16 delay_16
delay_16 delay_16
delay_16 delay_16
delay_16 delay_16
step_end step_end
BattleFrontier_BattleTowerBattleRoom_Movement_2421AB: @ 82421AB BattleFrontier_BattleTowerBattleRoom_Movement_AttendantFaceSecondAttendant: @ 82421AB
face_right face_right
delay_16 delay_16
delay_16 delay_16
@@ -412,7 +408,7 @@ BattleFrontier_BattleTowerBattleRoom_Movement_2421AB: @ 82421AB
walk_in_place_right walk_in_place_right
step_end step_end
BattleFrontier_BattleTowerBattleRoom_Movement_2421B2: @ 82421B2 BattleFrontier_BattleTowerBattleRoom_Movement_AnabelEnter: @ 82421B2
walk_slow_down walk_slow_down
walk_slow_down walk_slow_down
walk_slow_down walk_slow_down
@@ -420,113 +416,107 @@ BattleFrontier_BattleTowerBattleRoom_Movement_2421B2: @ 82421B2
face_left face_left
step_end step_end
BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8:: @ 82421B8 BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby:: @ 82421B8
BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8:: @ 82421B8
copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
compare VAR_RESULT, FRONTIER_MODE_DOUBLES compare VAR_RESULT, FRONTIER_MODE_DOUBLES
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8 goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyDoubles
compare VAR_RESULT, FRONTIER_MODE_MULTIS compare VAR_RESULT, FRONTIER_MODE_MULTIS
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2 goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyMultis
compare VAR_RESULT, FRONTIER_MODE_LINK_MULTIS compare VAR_RESULT, FRONTIER_MODE_LINK_MULTIS
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyLinkMultis
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6
waitstate waitstate
end end
BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8:: @ 82421E8 BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyDoubles:: @ 82421E8
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 10, 6 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 10, 6
waitstate waitstate
end end
BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2:: @ 82421F2 BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyMultis:: @ 82421F2
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 14, 6 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 14, 6
waitstate waitstate
end end
BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC:: @ 82421FC BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyLinkMultis:: @ 82421FC
setvar VAR_0x8004, BATTLE_TOWER_FUNC_13 tower_unklink
special CallBattleTowerFunc
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6
waitstate waitstate
end end
BattleFrontier_BattleTowerBattleRoom_EventScript_24220E:: @ 824220E BattleFrontier_BattleTowerBattleRoom_EventScript_RetireChallenge:: @ 824220E
setflag FLAG_CANCEL_BATTLE_ROOM_CHALLENGE setflag FLAG_CANCEL_BATTLE_ROOM_CHALLENGE
goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03 goto BattleFrontier_BattleTower_EventScript_WarpToLobbyLost
end end
BattleFrontier_BattleTowerBattleRoom2_Text_242217: @ 8242217 BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth: @ 8242217
BattleFrontier_BattleTowerBattleRoom_Text_242217: @ 8242217
.string "We will restore your POKéMON to\n" .string "We will restore your POKéMON to\n"
.string "full health.$" .string "full health.$"
BattleFrontier_BattleTowerBattleRoom_Text_242244: @ 8242244 @ Unused
BattleFrontier_BattleTowerBattleRoom_Text_ReadyForOpponent: @ 8242244
.string "You will be facing opponent no. {STR_VAR_1}.\n" .string "You will be facing opponent no. {STR_VAR_1}.\n"
.string "Are you ready?$" .string "Are you ready?$"
BattleFrontier_BattleTowerBattleRoom_Text_242277: @ 8242277 BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor2ndOpponent: @ 8242277
.string "You will be facing opponent no. 2.\n" .string "You will be facing opponent no. 2.\n"
.string "Are you ready?$" .string "Are you ready?$"
BattleFrontier_BattleTowerBattleRoom_Text_2422A9: @ 82422A9 BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor3rdOpponent: @ 82422A9
.string "You will be facing opponent no. 3.\n" .string "You will be facing opponent no. 3.\n"
.string "Are you ready?$" .string "Are you ready?$"
BattleFrontier_BattleTowerBattleRoom_Text_2422DB: @ 82422DB BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor4thOpponent: @ 82422DB
.string "You will be facing opponent no. 4.\n" .string "You will be facing opponent no. 4.\n"
.string "Are you ready?$" .string "Are you ready?$"
BattleFrontier_BattleTowerBattleRoom_Text_24230D: @ 824230D BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor5thOpponent: @ 824230D
.string "You will be facing opponent no. 5.\n" .string "You will be facing opponent no. 5.\n"
.string "Are you ready?$" .string "Are you ready?$"
BattleFrontier_BattleTowerBattleRoom_Text_24233F: @ 824233F BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor6thOpponent: @ 824233F
.string "You will be facing opponent no. 6.\n" .string "You will be facing opponent no. 6.\n"
.string "Are you ready?$" .string "Are you ready?$"
BattleFrontier_BattleTowerBattleRoom_Text_242371: @ 8242371 BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor7thOpponent: @ 8242371
.string "You will be facing opponent no. 7.\n" .string "You will be facing opponent no. 7.\n"
.string "Are you ready?$" .string "Are you ready?$"
BattleFrontier_BattleTowerBattleRoom2_Text_2423A3: @ 82423A3 BattleFrontier_BattleTowerBattleRoom_Text_RecordYourBattle: @ 82423A3
BattleFrontier_BattleTowerBattleRoom_Text_2423A3: @ 82423A3
.string "Record your battle on your\n" .string "Record your battle on your\n"
.string "FRONTIER PASS?$" .string "FRONTIER PASS?$"
BattleFrontier_BattleTowerLobby_Text_2423CD: @ 82423CD BattleFrontier_BattleTowerLobby_Text_BattleRecordedOnPass: @ 82423CD
.string "{PLAYER}'s battle was recorded\n" .string "{PLAYER}'s battle was recorded\n"
.string "on the FRONTIER PASS.$" .string "on the FRONTIER PASS.$"
BattleFrontier_BattleTowerBattleRoom2_Text_2423FC: @ 82423FC BattleFrontier_BattleTowerBattleRoom_Text_SaveAndQuitGame: @ 82423FC
BattleFrontier_BattleTowerBattleRoom_Text_2423FC: @ 82423FC
.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_BattleTowerBattleRoom2_Text_242426: @ 8242426 BattleFrontier_BattleTowerBattleRoom_Text_SavingPleaseWait: @ 8242426
BattleFrontier_BattleTowerBattleRoom_Text_242426: @ 8242426
.string "Saving your battle data.\n" .string "Saving your battle data.\n"
.string "Please wait.$" .string "Please wait.$"
BattleFrontier_BattleTowerBattleRoom2_Text_24244C: @ 824244C BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge: @ 824244C
BattleFrontier_BattleTowerBattleRoom_Text_24244C: @ 824244C
.string "Would you like to cancel your BATTLE\n" .string "Would you like to cancel your BATTLE\n"
.string "ROOM challenge?$" .string "ROOM challenge?$"
gText_BattleRecordCouldntBeSaved:: @ 8242481 BattleFrontier_BattleTowerBattleRoom_Text_RecordCouldntBeSaved:: @ 8242481
.string "There was an error of some sort.\n" .string "There was an error of some sort.\n"
.string "Your record could not be saved.$" .string "Your record could not be saved.$"
BattleFrontier_BattleTowerBattleRoom_Text_2424C2: @ 82424C2 BattleFrontier_BattleTowerBattleRoom_Text_SalonMaidenOnHerWay: @ 82424C2
.string "Excuse me, but…\p" .string "Excuse me, but…\p"
.string "Our leader, the SALON MAIDEN, is on\n" .string "Our leader, the SALON MAIDEN, is on\n"
.string "her way here in hopes of battling you.\p" .string "her way here in hopes of battling you.\p"
.string "She should be arriving very shortly.$" .string "She should be arriving very shortly.$"
BattleFrontier_BattleTowerBattleRoom_Text_242542: @ 8242542 BattleFrontier_BattleTowerBattleRoom_Text_ReadyForSalonMaiden: @ 8242542
.string "You will be facing the SALON MAIDEN.\n" .string "You will be facing the SALON MAIDEN.\n"
.string "Are you prepared?$" .string "Are you prepared?$"
BattleFrontier_BattleTowerBattleRoom_Text_242579: @ 8242579 BattleFrontier_BattleTowerBattleRoom_Text_GreetingsImAnabel: @ 8242579
.string "Greetings…\n" .string "Greetings…\n"
.string "My name is ANABEL.\p" .string "My name is ANABEL.\p"
.string "I am the SALON MAIDEN, and I am in\n" .string "I am the SALON MAIDEN, and I am in\n"
@@ -538,20 +528,20 @@ BattleFrontier_BattleTowerBattleRoom_Text_242579: @ 8242579
.string "The reason I've come to see you…\n" .string "The reason I've come to see you…\n"
.string "Well, there is but one reason…$" .string "Well, there is but one reason…$"
BattleFrontier_BattleTowerBattleRoom_Text_24268C: @ 824268C BattleFrontier_BattleTowerBattleRoom_Text_LetMeSeeYourTalent: @ 824268C
.string "Let me see your talent in\n" .string "Let me see your talent in\n"
.string "its entirety…$" .string "its entirety…$"
BattleFrontier_BattleTowerBattleRoom_Text_2426B4: @ 82426B4 BattleFrontier_BattleTowerBattleRoom_Text_AnabelTalentShallBeRecognized: @ 82426B4
.string "ANABEL: Fufufu, nicely done…\p" .string "ANABEL: Fufufu, nicely done…\p"
.string "Your FRONTIER PASS, please…\n" .string "Your FRONTIER PASS, please…\n"
.string "Your talent shall be recognized.$" .string "Your talent shall be recognized.$"
BattleFrontier_BattleTowerBattleRoom_Text_24270E: @ 824270E BattleFrontier_BattleTowerBattleRoom_Text_ReceivedAbilitySymbol: @ 824270E
.string "The Ability Symbol was embossed on\n" .string "The Ability Symbol was embossed on\n"
.string "the FRONTIER PASS!$" .string "the FRONTIER PASS!$"
BattleFrontier_BattleTowerBattleRoom_Text_242744: @ 8242744 BattleFrontier_BattleTowerBattleRoom_Text_UntilNextTime: @ 8242744
.string "… … … … … …\p" .string "… … … … … …\p"
.string "You have confidence in your POKéMON\n" .string "You have confidence in your POKéMON\n"
.string "battling talent, don't you?\p" .string "battling talent, don't you?\p"
@@ -560,7 +550,7 @@ BattleFrontier_BattleTowerBattleRoom_Text_242744: @ 8242744
.string "I will be waiting for you.\n" .string "I will be waiting for you.\n"
.string "Until the next time we meet…$" .string "Until the next time we meet…$"
BattleFrontier_BattleTowerBattleRoom_Text_2427F9: @ 82427F9 BattleFrontier_BattleTowerBattleRoom_Text_AnabelYouCameBack: @ 82427F9
.string "ANABEL: You really did come back to\n" .string "ANABEL: You really did come back to\n"
.string "see me…\p" .string "see me…\p"
.string "… … … … … …\p" .string "… … … … … …\p"
@@ -570,18 +560,18 @@ BattleFrontier_BattleTowerBattleRoom_Text_2427F9: @ 82427F9
.string "Too long since I've been able to battle\n" .string "Too long since I've been able to battle\n"
.string "without thinking about anything…$" .string "without thinking about anything…$"
BattleFrontier_BattleTowerBattleRoom_Text_2428E0: @ 82428E0 BattleFrontier_BattleTowerBattleRoom_Text_LetsBeginShallWe: @ 82428E0
.string "Let's begin, shall we?$" .string "Let's begin, shall we?$"
BattleFrontier_BattleTowerBattleRoom_Text_2428F7: @ 82428F7 BattleFrontier_BattleTowerBattleRoom_Text_AnabelCongratsYourPassPlease: @ 82428F7
.string "ANABEL: Fufu, congratulations…\n" .string "ANABEL: Fufu, congratulations…\n"
.string "Your FRONTIER PASS, please…$" .string "Your FRONTIER PASS, please…$"
BattleFrontier_BattleTowerBattleRoom_Text_242932: @ 8242932 BattleFrontier_BattleTowerBattleRoom_Text_AbilitySymbolTookGoldenShine: @ 8242932
.string "The Ability Symbol took on\n" .string "The Ability Symbol took on\n"
.string "a golden shine!$" .string "a golden shine!$"
BattleFrontier_BattleTowerBattleRoom_Text_24295D: @ 824295D BattleFrontier_BattleTowerBattleRoom_Text_WishICouldBattleYouAgain: @ 824295D
.string "That was fun…\p" .string "That was fun…\p"
.string "I have never had a POKéMON battle\n" .string "I have never had a POKéMON battle\n"
.string "so enjoyable before…\p" .string "so enjoyable before…\p"
data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json
-99
View File
@@ -1,99 +0,0 @@
{
"id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2",
"name": "BattleFrontier_BattleTowerBattleRoom2",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM",
"music": "MUS_SATTOWER",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_INDOOR",
"allow_bike": false,
"allow_escape_rope": false,
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
"connections": null,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 5,
"y": 1,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "0x0",
"flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT"
},
{
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 1,
"y": 4,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "0x0",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 1,
"y": 5,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "0x0",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_1",
"x": 4,
"y": 1,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "0x0",
"flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_F",
"x": 4,
"y": 8,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_UP",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "0x0",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_E",
"x": 5,
"y": 8,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_UP",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "0x0",
"flag": "0"
}
],
"warp_events": [],
"coord_events": [],
"bg_events": []
}
data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
-507
View File
@@ -1,507 +0,0 @@
BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43
.byte 0
BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F
setvar VAR_0x8004, BATTLE_TOWER_FUNC_14
special CallBattleTowerFunc
checkplayergender
compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29
setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29:: @ 8248F29
setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_MAY_NORMAL
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F
special SetBattleTowerLinkPlayerGfx
return
BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D
.2byte 0
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2
end
BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43
map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D
.2byte 0
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D
setvar VAR_TEMP_0, 1
applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249518
applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_24951E
waitmovement 0
frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4
applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
waitmovement 0
applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
waitmovement 0
frontier_set FRONTIER_DATA_6, 1
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
tower_setopponent
addobject 1
addobject 4
applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249528
applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_24952E
waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026
tower_getopponentintro 0
delay 15
applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
waitmovement 0
msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage
tower_getopponentintro 1
applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
waitmovement 0
msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249069
BattleFrontier_BattleTowerBattleRoom2_EventScript_249026:: @ 8249026
tower_getopponentintro 0
delay 15
applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
waitmovement 0
messageautoscroll gStringVar4
waitmessage
delay 48
tower_getopponentintro 1
applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
waitmovement 0
messageautoscroll gStringVar4
waitmessage
delay 48
BattleFrontier_BattleTowerBattleRoom2_EventScript_249069:: @ 8249069
call BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E
switch VAR_RESULT
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA
BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
tower_set TOWER_DATA_LVL_MODE
setvar VAR_0x8004, 3
special Script_TryGainNewFanFromCounter
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8
BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA
call BattleFrontier_EventScript_IncrementWinStreak
tower_setbattlewon
switch VAR_RESULT
case 7, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF
applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249534
applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249539
waitmovement 0
removeobject 1
removeobject 4
applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
waitmovement 0
applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118
msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, MSGBOX_DEFAULT
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121
BattleFrontier_BattleTowerBattleRoom2_EventScript_249118:: @ 8249118
messageautoscroll BattleFrontier_BattleTowerBattleRoom2_Text_242217
waitmessage
delay 48
BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121
special LoadPlayerParty
frontier_setpartyorder FRONTIER_MULTI_PARTY_SIZE
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249514
playfanfare MUS_ME_ASA
waitfanfare
special HealPlayerParty
BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143
frontier_get FRONTIER_DATA_BATTLE_NUM
call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0
compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7
case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223
case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1:: @ 82491B1
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223
case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7:: @ 82491E7
message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
switch VAR_RESULT
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249219
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_249219:: @ 8249219
call BattleFrontier_EventScript_SaveBattle
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_249223:: @ 8249223
msgbox BattleFrontier_BattleTowerBattleRoom2_Text_2423FC, MSGBOX_YESNO
switch VAR_RESULT
case NO, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
case YES, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_249251:: @ 8249251
message BattleFrontier_BattleTowerBattleRoom2_Text_24244C
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
switch VAR_RESULT
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283
closemessage
clearflag FLAG_TEMP_2
applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249526
applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249526
waitmovement 0
applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_249541
applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_249541
waitmovement 0
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
tower_set TOWER_DATA_LVL_MODE
setvar VAR_0x8004, 3
special Script_TryGainNewFanFromCounter
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8
BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB
message BattleFrontier_BattleTowerBattleRoom2_Text_242426
waitmessage
tower_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE
waitse
fadescreen FADE_TO_BLACK
frontier_reset
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E
copyvar VAR_TEMP_F, VAR_RESULT
switch VAR_TEMP_F
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249354
case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_24935B
case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249362
case 4, BattleFrontier_BattleTowerBattleRoom2_EventScript_249369
case 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_249370
case 6, BattleFrontier_BattleTowerBattleRoom2_EventScript_249377
BattleFrontier_BattleTowerBattleRoom2_EventScript_249354:: @ 8249354
message BattleFrontier_BattleTowerBattleRoom2_Text_249547
waitmessage
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_24935B:: @ 824935B
message BattleFrontier_BattleTowerBattleRoom2_Text_249578
waitmessage
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_249362:: @ 8249362
message BattleFrontier_BattleTowerBattleRoom2_Text_2495A9
waitmessage
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_249369:: @ 8249369
message BattleFrontier_BattleTowerBattleRoom2_Text_2495DA
waitmessage
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_249370:: @ 8249370
message BattleFrontier_BattleTowerBattleRoom2_Text_24960B
waitmessage
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_249377:: @ 8249377
message BattleFrontier_BattleTowerBattleRoom2_Text_24963C
waitmessage
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E:: @ 824937E
copyvar VAR_TEMP_F, VAR_RESULT
switch VAR_TEMP_F
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493CA
case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493D6
case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493E2
case 4, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493EE
case 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493FA
case 6, BattleFrontier_BattleTowerBattleRoom2_EventScript_249406
BattleFrontier_BattleTowerBattleRoom2_EventScript_2493CA:: @ 82493CA
message BattleFrontier_BattleTowerBattleRoom2_Text_249547
waitmessage
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_2493D6:: @ 82493D6
message BattleFrontier_BattleTowerBattleRoom2_Text_249578
waitmessage
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_2493E2:: @ 82493E2
message BattleFrontier_BattleTowerBattleRoom2_Text_2495A9
waitmessage
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_2493EE:: @ 82493EE
message BattleFrontier_BattleTowerBattleRoom2_Text_2495DA
waitmessage
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_2493FA:: @ 82493FA
message BattleFrontier_BattleTowerBattleRoom2_Text_24960B
waitmessage
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_249406:: @ 8249406
message BattleFrontier_BattleTowerBattleRoom2_Text_24963C
waitmessage
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_249412:: @ 8249412
waitmessage
delay 48
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_249417:: @ 8249417
goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249457
multichoice 19, 6, MULTI_GO_ON_RECORD_RETIRE, 1
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8
case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_249457:: @ 8249457
multichoice 20, 8, MULTI_GO_ON_RETIRE, 1
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_249483:: @ 8249483
setvar VAR_0x8004, 0
setvar VAR_0x8005, 0
message gText_LinkStandby3
waitmessage
special sub_813B568
waitstate
compare VAR_RESULT, 0
goto_if_ne BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249412
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8:: @ 82494A8
message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
switch VAR_RESULT
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
call BattleFrontier_EventScript_SaveBattle
setflag FLAG_TEMP_2
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD:: @ 82494DD
message BattleFrontier_BattleTowerBattleRoom2_Text_24244C
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA:: @ 82494FA
setvar VAR_0x8004, 1
setvar VAR_0x8005, 0
message gText_LinkStandby3
waitmessage
special sub_813B568
waitstate
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_249514:: @ 8249514
special sub_813B534
return
BattleFrontier_BattleTowerBattleRoom2_Movement_249518: @ 8249518
walk_up
walk_up
walk_up
walk_up
face_right
step_end
BattleFrontier_BattleTowerBattleRoom2_Movement_24951E: @ 824951E
walk_left
walk_up
walk_up
walk_up
face_right
step_end
BattleFrontier_BattleTowerBattleRoom2_Movement_249524: @ 8249524
face_left
step_end
BattleFrontier_BattleTowerBattleRoom2_Movement_249526: @ 8249526
walk_in_place_fastest_right
step_end
BattleFrontier_BattleTowerBattleRoom2_Movement_249528: @ 8249528
walk_down
walk_down
walk_down
walk_down
face_left
step_end
BattleFrontier_BattleTowerBattleRoom2_Movement_24952E: @ 824952E
walk_right
walk_down
walk_down
walk_down
face_left
step_end
BattleFrontier_BattleTowerBattleRoom2_Movement_249534: @ 8249534
walk_up
walk_up
walk_up
set_invisible
step_end
BattleFrontier_BattleTowerBattleRoom2_Movement_249539: @ 8249539
walk_up
walk_up
walk_up
walk_up
step_end
BattleFrontier_BattleTowerBattleRoom2_Movement_24953E: @ 824953E
walk_right
walk_right
step_end
BattleFrontier_BattleTowerBattleRoom2_Movement_249541: @ 8249541
walk_left
walk_left
walk_in_place_fastest_right
step_end
BattleFrontier_BattleTowerBattleRoom2_Movement_249545: @ 8249545
walk_in_place_left
step_end
BattleFrontier_BattleTowerBattleRoom2_Text_249547: @ 8249547
.string "The 2nd set of opponents is next.\n"
.string "Are you ready?$"
BattleFrontier_BattleTowerBattleRoom2_Text_249578: @ 8249578
.string "The 3rd set of opponents is next.\n"
.string "Are you ready?$"
BattleFrontier_BattleTowerBattleRoom2_Text_2495A9: @ 82495A9
.string "The 4th set of opponents is next.\n"
.string "Are you ready?$"
BattleFrontier_BattleTowerBattleRoom2_Text_2495DA: @ 82495DA
.string "The 5th set of opponents is next.\n"
.string "Are you ready?$"
BattleFrontier_BattleTowerBattleRoom2_Text_24960B: @ 824960B
.string "The 6th set of opponents is next.\n"
.string "Are you ready?$"
BattleFrontier_BattleTowerBattleRoom2_Text_24963C: @ 824963C
.string "The 7th set of opponents is next.\n"
.string "Are you ready?$"
BattleFrontier_BattleTowerBattleRoom2_Text_24966D: @ 824966D
.string "The 2nd set of opponents is next.\n"
.string "Do your best!$"
BattleFrontier_BattleTowerBattleRoom2_Text_24969D: @ 824969D
.string "The 3rd set of opponents is next.\n"
.string "Do your best!$"
BattleFrontier_BattleTowerBattleRoom2_Text_2496CD: @ 82496CD
.string "The 4th set of opponents is next.\n"
.string "Do your best!$"
BattleFrontier_BattleTowerBattleRoom2_Text_2496FD: @ 82496FD
.string "The 5th set of opponents is next.\n"
.string "Do your best!$"
BattleFrontier_BattleTowerBattleRoom2_Text_24972D: @ 824972D
.string "The 6th set of opponents is next.\n"
.string "Do your best!$"
BattleFrontier_BattleTowerBattleRoom2_Text_24975D: @ 824975D
.string "The 7th set of opponents is next.\n"
.string "Do your best!$"
gText_LinkStandby3:: @ 824978D
.string "Link standby…$"
gText_YourPartnerHasRetired:: @ 824979B
.string "Your partner has retired.\p"
.string "Your BATTLE ROOM challenge\n"
.string "will be canceled.$"
data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc
+20 -23
View File
@@ -1,55 +1,52 @@
BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA
map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_BattleTowerCorridor_MapScript1_241AB5 map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_BattleTowerCorridor_OnLoad
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor_MapScript2_241AE6 map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor_OnFrame
.byte 0 .byte 0
BattleFrontier_BattleTowerCorridor_MapScript1_241AB5: @ 8241AB5 BattleFrontier_BattleTowerCorridor_OnLoad: @ 8241AB5
compare VAR_0x8006, 1 compare VAR_0x8006, 1
goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_241AD3 goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_OpenFarDoor
setmetatile 12, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, 0 setmetatile 12, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, 0
setmetatile 12, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, 0 setmetatile 12, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, 0
end end
BattleFrontier_BattleTowerCorridor_EventScript_241AD3:: @ 8241AD3 BattleFrontier_BattleTowerCorridor_EventScript_OpenFarDoor:: @ 8241AD3
setmetatile 15, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, 0 setmetatile 15, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, 0
setmetatile 15, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, 0 setmetatile 15, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, 0
end end
BattleFrontier_BattleTowerCorridor_MapScript2_241AE6: @ 8241AE6 BattleFrontier_BattleTowerCorridor_OnFrame: @ 8241AE6
map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerCorridor_EventScript_241AF0 map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerCorridor_EventScript_EnterCorridor
.2byte 0 .2byte 0
BattleFrontier_BattleTowerCorridor_EventScript_241AF0:: @ 8241AF0 BattleFrontier_BattleTowerCorridor_EventScript_EnterCorridor:: @ 8241AF0
setvar VAR_TEMP_0, 1 setvar VAR_TEMP_0, 1
compare VAR_0x8006, 1 compare VAR_0x8006, 1
goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_241B16 goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor
applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B3A applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B39 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToDoor
waitmovement 0 waitmovement 0
goto BattleFrontier_BattleTowerCorridor_EventScript_241B27 goto BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom
BattleFrontier_BattleTowerCorridor_EventScript_241B16:: @ 8241B16 BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor:: @ 8241B16
applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B37 applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToFarDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B36 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToFarDoor
waitmovement 0 waitmovement 0
BattleFrontier_BattleTowerCorridor_EventScript_241B27:: @ 8241B27 BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom:: @ 8241B27
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8
waitstate waitstate
end end
BattleFrontier_BattleTowerCorridor_Movement_241B36: @ 8241B36 BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToFarDoor: @ 8241B36
walk_right walk_right
BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToFarDoor: @ 8241B37
BattleFrontier_BattleTowerCorridor_Movement_241B37: @ 8241B37
walk_right walk_right
walk_right walk_right
BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToDoor: @ 8241B39
BattleFrontier_BattleTowerCorridor_Movement_241B39: @ 8241B39
walk_right walk_right
BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToDoor: @ 8241B3A
BattleFrontier_BattleTowerCorridor_Movement_241B3A: @ 8241B3A
walk_right walk_right
walk_right walk_right
walk_right walk_right
data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
-172
View File
@@ -1,172 +0,0 @@
BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerCorridor2_MapScript2_248D95
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2
.byte 0
BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D71
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D91
end
BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71
setvar VAR_0x8004, BATTLE_TOWER_FUNC_14
special CallBattleTowerFunc
checkplayergender
compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B
setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL
return
BattleFrontier_BattleTowerCorridor2_EventScript_248D8B:: @ 8248D8B
setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_MAY_NORMAL
return
BattleFrontier_BattleTowerCorridor2_EventScript_248D91:: @ 8248D91
special SetBattleTowerLinkPlayerGfx
return
BattleFrontier_BattleTowerCorridor2_MapScript2_248D95: @ 8248D95
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerCorridor2_EventScript_248D9F
.2byte 0
BattleFrontier_BattleTowerCorridor2_EventScript_248D9F:: @ 8248D9F
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
special OffsetCameraForBattle
end
BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2: @ 8248DB2
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerCorridor2_EventScript_248DBC
.2byte 0
BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC
lockall
setflag FLAG_SPECIAL_FLAG_0x4002
setvar VAR_0x8004, 14
setvar VAR_0x8005, 1
opendoor 1, 1
waitdooranim
clearflag FLAG_SPECIAL_FLAG_0x4002
showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
showobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
applymovement 1, BattleFrontier_BattleTowerCorridor2_Movement_248EE6
applymovement 4, BattleFrontier_BattleTowerCorridor2_Movement_248EE6
waitmovement 0
setflag FLAG_SPECIAL_FLAG_0x4002
setvar VAR_0x8004, 14
setvar VAR_0x8005, 1
closedoor 1, 1
waitdooranim
clearflag FLAG_SPECIAL_FLAG_0x4002
applymovement 1, BattleFrontier_BattleTowerCorridor2_Movement_248EBC
applymovement 4, BattleFrontier_BattleTowerCorridor2_Movement_248EC4
applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_248ECC
applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248ED5
waitmovement 0
delay 40
applymovement 3, Common_Movement_WalkInPlaceFastestUp
applymovement 2, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
opendoor 7, 1
waitdooranim
applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_248EE3
applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248EE3
applymovement 1, BattleFrontier_BattleTowerCorridor2_Movement_248EDE
applymovement 4, BattleFrontier_BattleTowerCorridor2_Movement_248EDE
waitmovement 0
closedoor 7, 1
waitdooranim
delay 30
setvar VAR_TEMP_1, 1
call BattleFrontier_BattleTowerCorridor2_EventScript_248E71
releaseall
end
BattleFrontier_BattleTowerCorridor2_EventScript_248E71:: @ 8248E71
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248E9E
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248E9E
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248EA8
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248EB2
return
BattleFrontier_BattleTowerCorridor2_EventScript_248E9E:: @ 8248E9E
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8
waitstate
return
BattleFrontier_BattleTowerCorridor2_EventScript_248EA8:: @ 8248EA8
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2, 255, 4, 5
waitstate
return
BattleFrontier_BattleTowerCorridor2_EventScript_248EB2:: @ 8248EB2
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2, 255, 4, 5
waitstate
return
BattleFrontier_BattleTowerCorridor2_Movement_248EBC: @ 8248EBC
walk_down
walk_right
walk_right
walk_right
walk_right
walk_right
walk_right
step_end
BattleFrontier_BattleTowerCorridor2_Movement_248EC4: @ 8248EC4
walk_down
walk_left
walk_left
walk_left
walk_left
walk_left
walk_left
step_end
BattleFrontier_BattleTowerCorridor2_Movement_248ECC: @ 8248ECC
walk_right
walk_right
walk_right
walk_right
walk_right
walk_right
walk_up
walk_in_place_fastest_right
step_end
BattleFrontier_BattleTowerCorridor2_Movement_248ED5: @ 8248ED5
walk_left
walk_left
walk_left
walk_left
walk_left
walk_left
walk_up
walk_in_place_fastest_left
step_end
BattleFrontier_BattleTowerCorridor2_Movement_248EDE: @ 8248EDE
delay_16
walk_up
walk_up
set_invisible
step_end
BattleFrontier_BattleTowerCorridor2_Movement_248EE3: @ 8248EE3
walk_up
set_invisible
step_end
BattleFrontier_BattleTowerCorridor2_Movement_248EE6: @ 8248EE6
walk_down
step_end
data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
+30 -30
View File
@@ -1,89 +1,89 @@
BattleFrontier_BattleTowerElevator_MapScripts:: @ 82419DB BattleFrontier_BattleTowerElevator_MapScripts:: @ 82419DB
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerElevator_MapScript2_2419E6 map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerElevator_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerElevator_MapScript2_241A96 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerElevator_OnWarp
.byte 0 .byte 0
BattleFrontier_BattleTowerElevator_MapScript2_2419E6: @ 82419E6 BattleFrontier_BattleTowerElevator_OnFrame: @ 82419E6
map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerElevator_EventScript_2419F0 map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerElevator_EventScript_EnterElevator
.2byte 0 .2byte 0
BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0 BattleFrontier_BattleTowerElevator_EventScript_EnterElevator:: @ 82419F0
setvar VAR_TEMP_0, 1 setvar VAR_TEMP_0, 1
applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A86 applymovement 1, BattleFrontier_BattleTowerElevator_Movement_AttendantEnter
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A8A applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_PlayerEnter
waitmovement 0 waitmovement 0
special BufferBattleTowerElevatorFloors special BufferBattleTowerElevatorFloors
waitse waitse
special MoveElevator special MoveElevator
waitstate waitstate
delay 48 delay 48
applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E applymovement 1, BattleFrontier_BattleTowerElevator_Movement_AttendantExit
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A92 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_PlayerExit
waitmovement 0 waitmovement 0
call BattleFrontier_BattleTowerElevator_EventScript_241A28 call BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom
end end
BattleFrontier_BattleTowerElevator_EventScript_241A28:: @ 8241A28 BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom:: @ 8241A28
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A55 call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A55 call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A5F call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoomMulti
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A72 call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridorMulti
return return
BattleFrontier_BattleTowerElevator_EventScript_241A55:: @ 8241A55 BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor:: @ 8241A55
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR, 255, 8, 1 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR, 255, 8, 1
waitstate waitstate
return return
BattleFrontier_BattleTowerElevator_EventScript_241A5F:: @ 8241A5F BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoomMulti:: @ 8241A5F
goto_if_unset FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerElevator_EventScript_241A7C goto_if_unset FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerElevator_EventScript_WarpToPartnerRoom
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR, 255, 7, 2
waitstate waitstate
return return
BattleFrontier_BattleTowerElevator_EventScript_241A72:: @ 8241A72 BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridorMulti:: @ 8241A72
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR, 255, 7, 2
waitstate waitstate
return return
BattleFrontier_BattleTowerElevator_EventScript_241A7C:: @ 8241A7C BattleFrontier_BattleTowerElevator_EventScript_WarpToPartnerRoom:: @ 8241A7C
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 1 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM, 255, 10, 1
waitstate waitstate
return return
BattleFrontier_BattleTowerElevator_Movement_241A86: @ 8241A86 BattleFrontier_BattleTowerElevator_Movement_AttendantEnter: @ 8241A86
walk_up walk_up
walk_right walk_right
face_down face_down
step_end step_end
BattleFrontier_BattleTowerElevator_Movement_241A8A: @ 8241A8A BattleFrontier_BattleTowerElevator_Movement_PlayerEnter: @ 8241A8A
walk_up walk_up
walk_up walk_up
face_down face_down
step_end step_end
BattleFrontier_BattleTowerElevator_Movement_241A8E: @ 8241A8E BattleFrontier_BattleTowerElevator_Movement_AttendantExit: @ 8241A8E
walk_down walk_down
walk_down walk_down
set_invisible set_invisible
step_end step_end
BattleFrontier_BattleTowerElevator_Movement_241A92: @ 8241A92 BattleFrontier_BattleTowerElevator_Movement_PlayerExit: @ 8241A92
walk_right walk_right
walk_down walk_down
walk_down walk_down
step_end step_end
BattleFrontier_BattleTowerElevator_MapScript2_241A96: @ 8241A96 BattleFrontier_BattleTowerElevator_OnWarp: @ 8241A96
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerElevator_EventScript_241AA0 map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerElevator_EventScript_TurnPlayerNorth
.2byte 0 .2byte 0
BattleFrontier_BattleTowerElevator_EventScript_241AA0:: @ 8241AA0 BattleFrontier_BattleTowerElevator_EventScript_TurnPlayerNorth:: @ 8241AA0
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
data/maps/BattleFrontier_BattleTowerLobby/map.json
+12 -12
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerLobby_EventScript_23E936", "script": "BattleFrontier_BattleTowerLobby_EventScript_SinglesAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerLobby_EventScript_23EEE7", "script": "BattleFrontier_BattleTowerLobby_EventScript_FeelingsMan",
"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_BattleTowerLobby_EventScript_23EFB5", "script": "BattleFrontier_BattleTowerLobby_EventScript_Woman",
"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_BattleTowerLobby_EventScript_23EFBE", "script": "BattleFrontier_BattleTowerLobby_EventScript_Boy",
"flag": "0" "flag": "0"
}, },
{ {
@@ -102,7 +102,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerLobby_EventScript_23EA9F", "script": "BattleFrontier_BattleTowerLobby_EventScript_DoublesAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -115,7 +115,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerLobby_EventScript_23EC08", "script": "BattleFrontier_BattleTowerLobby_EventScript_MultisAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -128,7 +128,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerLobby_EventScript_23ED74", "script": "BattleFrontier_BattleTowerLobby_EventScript_LinkMultisAttendant",
"flag": "0" "flag": "0"
} }
], ],
@@ -163,7 +163,7 @@
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "BattleFrontier_BattleTowerLobby_EventScript_23EFC7" "script": "BattleFrontier_BattleTowerLobby_EventScript_ShowSinglesResults"
}, },
{ {
"type": "sign", "type": "sign",
@@ -171,7 +171,7 @@
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "BattleFrontier_BattleTowerLobby_EventScript_23EFE0" "script": "BattleFrontier_BattleTowerLobby_EventScript_ShowDoublesResults"
}, },
{ {
"type": "sign", "type": "sign",
@@ -179,7 +179,7 @@
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "BattleFrontier_BattleTowerLobby_EventScript_23EFF9" "script": "BattleFrontier_BattleTowerLobby_EventScript_ShowMultisResults"
}, },
{ {
"type": "sign", "type": "sign",
@@ -187,7 +187,7 @@
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "BattleFrontier_BattleTowerLobby_EventScript_23F012" "script": "BattleFrontier_BattleTowerLobby_EventScript_ShowLinkMultisResults"
}, },
{ {
"type": "sign", "type": "sign",
@@ -195,7 +195,7 @@
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "BattleFrontier_BattleTowerLobby_EventScript_23F4BE" "script": "BattleFrontier_BattleTowerLobby_EventScript_RulesBoard"
} }
] ]
} }
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+427 -436
View File
File diff suppressed because it is too large Load Diff
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json
+52 -91
View File
@@ -1,7 +1,7 @@
{ {
"id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM", "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM",
"name": "BattleFrontier_BattleTowerMultiBattleRoom", "name": "BattleFrontier_BattleTowerMultiBattleRoom",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM",
"music": "MUS_SATTOWER", "music": "MUS_SATTOWER",
"region_map_section": "MAPSEC_BATTLE_FRONTIER", "region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false, "requires_flash": false,
@@ -9,127 +9,88 @@
"map_type": "MAP_TYPE_INDOOR", "map_type": "MAP_TYPE_INDOOR",
"allow_bike": false, "allow_bike": false,
"allow_escape_rope": false, "allow_escape_rope": false,
"allow_running": true, "allow_running": false,
"show_map_name": false, "show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL", "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
"connections": null, "connections": null,
"object_events": [ "object_events": [
{ {
"graphics_id": "OBJ_EVENT_GFX_TEALA", "graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 11, "x": 5,
"y": 2, "y": 1,
"elevation": 3, "elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1, "movement_range_x": 0,
"movement_range_y": 1, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A", "script": "0x0",
"flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT"
},
{
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 1,
"y": 4,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "0x0",
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "OBJ_EVENT_GFX_VAR_0", "graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 2, "x": 1,
"y": 10, "y": 5,
"elevation": 3, "elevation": 3,
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
"movement_range_x": 1, "movement_range_x": 0,
"movement_range_y": 1, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29", "script": "0x0",
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1" "flag": "0"
}, },
{ {
"graphics_id": "OBJ_EVENT_GFX_VAR_1", "graphics_id": "OBJ_EVENT_GFX_VAR_1",
"x": 17, "x": 4,
"y": 11, "y": 1,
"elevation": 3, "elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1, "movement_range_x": 0,
"movement_range_y": 1, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB", "script": "0x0",
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2" "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT"
}, },
{ {
"graphics_id": "OBJ_EVENT_GFX_VAR_2", "graphics_id": "OBJ_EVENT_GFX_VAR_F",
"x": 6, "x": 4,
"y": 9, "y": 8,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008",
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_3",
"x": 8,
"y": 13,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015",
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_4",
"x": 10,
"y": 11,
"elevation": 3, "elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_type": "MOVEMENT_TYPE_FACE_UP",
"movement_range_x": 1, "movement_range_x": 0,
"movement_range_y": 1, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022", "script": "0x0",
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5" "flag": "0"
}, },
{ {
"graphics_id": "OBJ_EVENT_GFX_VAR_5", "graphics_id": "OBJ_EVENT_GFX_VAR_E",
"x": 13, "x": 5,
"y": 10, "y": 8,
"elevation": 3, "elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_type": "MOVEMENT_TYPE_FACE_UP",
"movement_range_x": 1, "movement_range_x": 0,
"movement_range_y": 1, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F", "script": "0x0",
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6" "flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_6",
"x": 15,
"y": 13,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C",
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_7",
"x": 4,
"y": 12,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049",
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2"
} }
], ],
"warp_events": [], "warp_events": [],
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+474 -1777
View File
File diff suppressed because it is too large Load Diff
data/maps/BattleFrontier_BattleTowerCorridor2/map.json → data/maps/BattleFrontier_BattleTowerMultiCorridor/map.json
+3 -3
View File
@@ -1,7 +1,7 @@
{ {
"id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2", "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR",
"name": "BattleFrontier_BattleTowerCorridor2", "name": "BattleFrontier_BattleTowerMultiCorridor",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR",
"music": "MUS_SATTOWER", "music": "MUS_SATTOWER",
"region_map_section": "MAPSEC_BATTLE_FRONTIER", "region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false, "requires_flash": false,
data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc
+176
View File
@@ -0,0 +1,176 @@
BattleFrontier_BattleTowerMultiCorridor_MapScripts:: @ 8248D4A
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerMultiCorridor_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerMultiCorridor_OnWarp
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerMultiCorridor_OnFrame
.byte 0
@ On this map the player (OBJ_EVENT_ID_PLAYER) is hidden
@ The player is represented instead by object event 1, which has the gfx id VAR_OBJ_GFX_ID_F
@ The multi partner is represented by object event 4, which has the gfx id VAR_OBJ_GFX_ID_E
BattleFrontier_BattleTowerMultiCorridor_OnTransition: @ 8248D5A
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_SetLinkPlayerGfx
end
BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx:: @ 8248D71
tower_setpartnergfx
checkplayergender
compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_SetPlayerGfxFemale
setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL
return
BattleFrontier_BattleTowerMultiCorridor_EventScript_SetPlayerGfxFemale:: @ 8248D8B
setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_MAY_NORMAL
return
BattleFrontier_BattleTowerMultiCorridor_EventScript_SetLinkPlayerGfx:: @ 8248D91
special SetBattleTowerLinkPlayerGfx
return
BattleFrontier_BattleTowerMultiCorridor_OnWarp: @ 8248D95
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiCorridor_EventScript_SetUpObjects
.2byte 0
BattleFrontier_BattleTowerMultiCorridor_EventScript_SetUpObjects:: @ 8248D9F
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
special OffsetCameraForBattle
end
BattleFrontier_BattleTowerMultiCorridor_OnFrame: @ 8248DB2
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiCorridor_EventScript_EnterCorridor
.2byte 0
BattleFrontier_BattleTowerMultiCorridor_EventScript_EnterCorridor:: @ 8248DBC
lockall
setflag FLAG_ENABLE_MULTI_CORRIDOR_DOOR
setvar VAR_0x8004, 14 @ x coord of far door, used by DrawDoor
setvar VAR_0x8005, 1 @ y coord of far door, used by DrawDoor
opendoor 1, 1
waitdooranim
clearflag FLAG_ENABLE_MULTI_CORRIDOR_DOOR
showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
showobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
applymovement 1, BattleFrontier_BattleTowerMultiCorridor_Movement_ExitElevator
applymovement 4, BattleFrontier_BattleTowerMultiCorridor_Movement_ExitElevator
waitmovement 0
setflag FLAG_ENABLE_MULTI_CORRIDOR_DOOR
setvar VAR_0x8004, 14 @ x coord of far door, used by DrawDoor
setvar VAR_0x8005, 1 @ y coord of far door, used by DrawDoor
closedoor 1, 1
waitdooranim
clearflag FLAG_ENABLE_MULTI_CORRIDOR_DOOR
applymovement 1, BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerWalkToDoor
applymovement 4, BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerWalkToDoor
applymovement 3, BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerAttendantWalkToDoor
applymovement 2, BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerAttendantWalkToDoor
waitmovement 0
delay 40
applymovement 3, Common_Movement_WalkInPlaceFastestUp
applymovement 2, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
opendoor 7, 1
waitdooranim
applymovement 3, BattleFrontier_BattleTowerMultiCorridor_Movement_AttendantEnterDoor
applymovement 2, BattleFrontier_BattleTowerMultiCorridor_Movement_AttendantEnterDoor
applymovement 1, BattleFrontier_BattleTowerMultiCorridor_Movement_TrainerEnterDoor
applymovement 4, BattleFrontier_BattleTowerMultiCorridor_Movement_TrainerEnterDoor
waitmovement 0
closedoor 7, 1
waitdooranim
delay 30
setvar VAR_TEMP_1, 1
call BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToBattleRoom
releaseall
end
BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToBattleRoom:: @ 8248E71
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToMultiBattleRoom
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToLinkMultiBattleRoom
return
BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom:: @ 8248E9E
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8
waitstate
return
BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToMultiBattleRoom:: @ 8248EA8
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 4, 5
waitstate
return
@ Unnecessary duplicate of the above
BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToLinkMultiBattleRoom:: @ 8248EB2
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 4, 5
waitstate
return
BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerWalkToDoor: @ 8248EBC
walk_down
walk_right
walk_right
walk_right
walk_right
walk_right
walk_right
step_end
BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerWalkToDoor: @ 8248EC4
walk_down
walk_left
walk_left
walk_left
walk_left
walk_left
walk_left
step_end
BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerAttendantWalkToDoor: @ 8248ECC
walk_right
walk_right
walk_right
walk_right
walk_right
walk_right
walk_up
walk_in_place_fastest_right
step_end
BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerAttendantWalkToDoor: @ 8248ED5
walk_left
walk_left
walk_left
walk_left
walk_left
walk_left
walk_up
walk_in_place_fastest_left
step_end
BattleFrontier_BattleTowerMultiCorridor_Movement_TrainerEnterDoor: @ 8248EDE
delay_16
walk_up
walk_up
set_invisible
step_end
BattleFrontier_BattleTowerMultiCorridor_Movement_AttendantEnterDoor: @ 8248EE3
walk_up
set_invisible
step_end
BattleFrontier_BattleTowerMultiCorridor_Movement_ExitElevator: @ 8248EE6
walk_down
step_end
data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json
+138
View File
@@ -0,0 +1,138 @@
{
"id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM",
"name": "BattleFrontier_BattleTowerMultiPartnerRoom",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM",
"music": "MUS_SATTOWER",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_INDOOR",
"allow_bike": false,
"allow_escape_rope": false,
"allow_running": true,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 11,
"y": 2,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Attendant",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 2,
"y": 10,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner1",
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_1",
"x": 17,
"y": 11,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner2",
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_2",
"x": 6,
"y": 9,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner3",
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_3",
"x": 8,
"y": 13,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner4",
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_4",
"x": 10,
"y": 11,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_UP",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner5",
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_5",
"x": 13,
"y": 10,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner6",
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_6",
"x": 15,
"y": 13,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner7",
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_7",
"x": 4,
"y": 12,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner8",
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2"
}
],
"warp_events": [],
"coord_events": [],
"bg_events": []
}
data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc
+1809
View File
File diff suppressed because it is too large Load Diff
data/maps/map_groups.json
+2 -2
View File
@@ -510,9 +510,9 @@
"SafariZone_Northeast", "SafariZone_Northeast",
"SafariZone_Southeast", "SafariZone_Southeast",
"BattleFrontier_OutsideEast", "BattleFrontier_OutsideEast",
"BattleFrontier_BattleTowerMultiPartnerRoom",
"BattleFrontier_BattleTowerMultiCorridor",
"BattleFrontier_BattleTowerMultiBattleRoom", "BattleFrontier_BattleTowerMultiBattleRoom",
"BattleFrontier_BattleTowerCorridor2",
"BattleFrontier_BattleTowerBattleRoom2",
"BattleFrontier_BattleDomeLobby", "BattleFrontier_BattleDomeLobby",
"BattleFrontier_BattleDomeCorridor", "BattleFrontier_BattleDomeCorridor",
"BattleFrontier_BattleDomePreBattleRoom", "BattleFrontier_BattleDomePreBattleRoom",
data/specials.inc
+1 -1
View File
@@ -513,7 +513,7 @@ gSpecials:: @ 81DBA64
def_special TurnOnTVScreen def_special TurnOnTVScreen
def_special sub_81D4A90 def_special sub_81D4A90
def_special ShouldDistributeEonTicket def_special ShouldDistributeEonTicket
def_special sub_813B568 def_special LinkRetireStatusWithBattleTowerPartner
def_special sub_813B534 def_special sub_813B534
def_special CallTrainerHillFunction def_special CallTrainerHillFunction
def_special Script_DoRayquazaScene @ Listed twice def_special Script_DoRayquazaScene @ Listed twice
graphics/event_objects/pics/effects/lavaridge_gym_warp.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 406 B

include/battle_pyramid_bag.h
+2 -2
View File
@@ -41,10 +41,10 @@ void sub_81C5924(void);
void sub_81C59BC(void); void sub_81C59BC(void);
void sub_81C4EFC(void); void sub_81C4EFC(void);
void GoToBattlePyramidBagMenu(u8 a0, void (*callback)(void)); void GoToBattlePyramidBagMenu(u8 a0, void (*callback)(void));
void sub_81C6714(u8 taskId); void Task_CloseBattlePyramidBagMessage(u8 taskId);
void TryStoreHeldItemsInPyramidBag(void); void TryStoreHeldItemsInPyramidBag(void);
void ChooseItemsToTossFromPyramidBag(void); void ChooseItemsToTossFromPyramidBag(void);
void sub_81C5B14(u8 taskId); void CloseBattlePyramidBagAndSetCallback(u8 taskId);
void DisplayItemMessageInBattlePyramid(u8 taskId, const u8 *str, void (*callback)(u8 taskId)); void DisplayItemMessageInBattlePyramid(u8 taskId, const u8 *str, void (*callback)(u8 taskId));
#endif // GUARD_BATTLE_PYRAMID_BAG_H #endif // GUARD_BATTLE_PYRAMID_BAG_H
include/constants/apprentice.h
+2
View File
@@ -6,6 +6,8 @@
#define NUM_WHICH_MON_QUESTIONS MULTI_PARTY_SIZE #define NUM_WHICH_MON_QUESTIONS MULTI_PARTY_SIZE
#define NUM_WHICH_MOVE_QUESTIONS 5 #define NUM_WHICH_MOVE_QUESTIONS 5
// + 2 below is 1 each for the lead mon question and the win speech question
#define MAX_APPRENTICE_QUESTIONS NUM_WHICH_MON_QUESTIONS + NUM_WHICH_MOVE_QUESTIONS + 2
#define APPRENTICE_LVL_MODE_50 (FRONTIER_LVL_50 + 1) #define APPRENTICE_LVL_MODE_50 (FRONTIER_LVL_50 + 1)
#define APPRENTICE_LVL_MODE_OPEN (FRONTIER_LVL_OPEN + 1) #define APPRENTICE_LVL_MODE_OPEN (FRONTIER_LVL_OPEN + 1)
include/constants/battle_tower.h
+20 -4
View File
@@ -11,15 +11,31 @@
#define BATTLE_TOWER_FUNC_GET_OPPONENT_INTRO 7 #define BATTLE_TOWER_FUNC_GET_OPPONENT_INTRO 7
#define BATTLE_TOWER_FUNC_NOP 8 #define BATTLE_TOWER_FUNC_NOP 8
#define BATTLE_TOWER_FUNC_NOP2 9 #define BATTLE_TOWER_FUNC_NOP2 9
#define BATTLE_TOWER_FUNC_10 10 #define BATTLE_TOWER_FUNC_LOAD_PARTNERS 10
#define BATTLE_TOWER_FUNC_11 11 #define BATTLE_TOWER_FUNC_PARTNER_MSG 11
#define BATTLE_TOWER_FUNC_12 12 #define BATTLE_TOWER_FUNC_LOAD_LINK_OPPONENTS 12
#define BATTLE_TOWER_FUNC_13 13 #define BATTLE_TOWER_FUNC_13 13
#define BATTLE_TOWER_FUNC_14 14 #define BATTLE_TOWER_FUNC_SET_PARTNER_GFX 14
#define BATTLE_TOWER_FUNC_SET_INTERVIEW_DATA 15 #define BATTLE_TOWER_FUNC_SET_INTERVIEW_DATA 15
#define TOWER_DATA_WIN_STREAK 1 #define TOWER_DATA_WIN_STREAK 1
#define TOWER_DATA_WIN_STREAK_ACTIVE 2 #define TOWER_DATA_WIN_STREAK_ACTIVE 2
#define TOWER_DATA_LVL_MODE 3 #define TOWER_DATA_LVL_MODE 3
// IDs for the messages printed by potential partners in the Battle Tower Multi Partner Room
#define PARTNER_MSGID_INTRO 0
#define PARTNER_MSGID_MON1 1
#define PARTNER_MSGID_MON2_ASK 2
#define PARTNER_MSGID_ACCEPT 3
#define PARTNER_MSGID_REJECT 4
// IDs for communicating with the Link Multi partner
#define BATTLE_TOWER_LINK_CONTINUE 0
#define BATTLE_TOWER_LINK_RETIRE 1
#define BATTLE_TOWER_LINKSTAT_CONTINUE 0
#define BATTLE_TOWER_LINKSTAT_BOTH_RETIRE 1
#define BATTLE_TOWER_LINKSTAT_PARTNER_RETIRE 2
#define BATTLE_TOWER_LINKSTAT_PLAYER_RETIRE 3
#endif //GUARD_CONSTANTS_BATTLE_TOWER_H #endif //GUARD_CONSTANTS_BATTLE_TOWER_H
include/constants/flags.h
+7 -7
View File
@@ -1637,13 +1637,13 @@
#define DAILY_FLAGS_END FLAG_UNUSED_0x95F #define DAILY_FLAGS_END FLAG_UNUSED_0x95F
// Special Flags (Stored in EWRAM (gSpecialFlags), not in the SaveBlock) // Special Flags (Stored in EWRAM (gSpecialFlags), not in the SaveBlock)
#define SPECIAL_FLAGS_START 0x4000 #define SPECIAL_FLAGS_START 0x4000
#define FLAG_HIDE_MAP_NAME_POPUP (SPECIAL_FLAGS_START + 0x0) #define FLAG_HIDE_MAP_NAME_POPUP (SPECIAL_FLAGS_START + 0x0)
#define FLAG_DONT_TRANSITION_MUSIC (SPECIAL_FLAGS_START + 0x1) #define FLAG_DONT_TRANSITION_MUSIC (SPECIAL_FLAGS_START + 0x1)
#define FLAG_SPECIAL_FLAG_0x4002 (SPECIAL_FLAGS_START + 0x2) #define FLAG_ENABLE_MULTI_CORRIDOR_DOOR (SPECIAL_FLAGS_START + 0x2)
#define FLAG_SPECIAL_FLAG_UNUSED_0x4003 (SPECIAL_FLAGS_START + 0x3) // Unused Flag #define FLAG_SPECIAL_FLAG_UNUSED_0x4003 (SPECIAL_FLAGS_START + 0x3) // Unused Flag
#define FLAG_STORING_ITEMS_IN_PYRAMID_BAG (SPECIAL_FLAGS_START + 0x4) #define FLAG_STORING_ITEMS_IN_PYRAMID_BAG (SPECIAL_FLAGS_START + 0x4)
// FLAG_SPECIAL_FLAG_0x4005 - 0x407F also exist and are unused // FLAG_SPECIAL_FLAG_0x4005 - 0x407F also exist and are unused
#define SPECIAL_FLAGS_END (SPECIAL_FLAGS_START + 0x7F) #define SPECIAL_FLAGS_END (SPECIAL_FLAGS_START + 0x7F)
#endif // GUARD_CONSTANTS_FLAGS_H #endif // GUARD_CONSTANTS_FLAGS_H
include/constants/frontier_util.h
+1 -1
View File
@@ -42,7 +42,7 @@
#define FRONTIER_DATA_PAUSED 3 #define FRONTIER_DATA_PAUSED 3
#define FRONTIER_DATA_SELECTED_MON_ORDER 4 #define FRONTIER_DATA_SELECTED_MON_ORDER 4
#define FRONTIER_DATA_BATTLE_OUTCOME 5 #define FRONTIER_DATA_BATTLE_OUTCOME 5
#define FRONTIER_DATA_6 6 #define FRONTIER_DATA_RECORD_DISABLED 6
#define FRONTIER_DATA_HEARD_BRAIN_SPEECH 7 #define FRONTIER_DATA_HEARD_BRAIN_SPEECH 7
#define STREAK_TOWER_SINGLES_50 (1 << 0) #define STREAK_TOWER_SINGLES_50 (1 << 0)
include/constants/item_effects.h
+2 -2
View File
@@ -3,7 +3,7 @@
// field 0 masks // field 0 masks
#define ITEM0_X_ATTACK 0x0F #define ITEM0_X_ATTACK 0x0F
#define ITEM0_HIGH_CRIT 0x30 // For Dire Hit, works the same way as move Focus Energy. #define ITEM0_DIRE_HIT 0x30 // Works the same way as the move Focus Energy.
#define ITEM0_SACRED_ASH 0x40 #define ITEM0_SACRED_ASH 0x40
#define ITEM0_INFATUATION 0x80 #define ITEM0_INFATUATION 0x80
@@ -23,7 +23,7 @@
#define ITEM3_POISON 0x10 #define ITEM3_POISON 0x10
#define ITEM3_SLEEP 0x20 #define ITEM3_SLEEP 0x20
#define ITEM3_LEVEL_UP 0x40 #define ITEM3_LEVEL_UP 0x40
#define ITEM3_MIST 0x80 // For Guard Specs, works the same way as move Mist. #define ITEM3_GUARD_SPEC 0x80 // Works the same way as the move Mist.
#define ITEM3_STATUS_ALL (ITEM3_CONFUSION | ITEM3_PARALYSIS | ITEM3_FREEZE | ITEM3_BURN | ITEM3_POISON | ITEM3_SLEEP) #define ITEM3_STATUS_ALL (ITEM3_CONFUSION | ITEM3_PARALYSIS | ITEM3_FREEZE | ITEM3_BURN | ITEM3_POISON | ITEM3_SLEEP)
include/constants/layouts.h
+2 -2
View File
@@ -390,8 +390,8 @@
#define LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM 387 #define LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM 387
#define LAYOUT_MIRAGE_TOWER_4F 388 #define LAYOUT_MIRAGE_TOWER_4F 388
#define LAYOUT_DESERT_UNDERPASS 389 #define LAYOUT_DESERT_UNDERPASS 389
#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM 390 #define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM 390
#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 391 #define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR 391
#define LAYOUT_ROUTE111_NO_MIRAGE_TOWER 392 #define LAYOUT_ROUTE111_NO_MIRAGE_TOWER 392
#define LAYOUT_UNION_ROOM 393 #define LAYOUT_UNION_ROOM 393
#define LAYOUT_SAFARI_ZONE_NORTHEAST 394 #define LAYOUT_SAFARI_ZONE_NORTHEAST 394
include/constants/map_groups.h
+89 -89
View File
@@ -461,95 +461,95 @@
#define MAP_UNION_ROOM (60 | (25 << 8)) #define MAP_UNION_ROOM (60 | (25 << 8))
// Map Group 26 // Map Group 26
#define MAP_SAFARI_ZONE_NORTHWEST (0 | (26 << 8)) #define MAP_SAFARI_ZONE_NORTHWEST (0 | (26 << 8))
#define MAP_SAFARI_ZONE_NORTH (1 | (26 << 8)) #define MAP_SAFARI_ZONE_NORTH (1 | (26 << 8))
#define MAP_SAFARI_ZONE_SOUTHWEST (2 | (26 << 8)) #define MAP_SAFARI_ZONE_SOUTHWEST (2 | (26 << 8))
#define MAP_SAFARI_ZONE_SOUTH (3 | (26 << 8)) #define MAP_SAFARI_ZONE_SOUTH (3 | (26 << 8))
#define MAP_BATTLE_FRONTIER_OUTSIDE_WEST (4 | (26 << 8)) #define MAP_BATTLE_FRONTIER_OUTSIDE_WEST (4 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY (5 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY (5 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR (6 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR (6 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR (7 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR (7 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM (8 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM (8 | (26 << 8))
#define MAP_SOUTHERN_ISLAND_EXTERIOR (9 | (26 << 8)) #define MAP_SOUTHERN_ISLAND_EXTERIOR (9 | (26 << 8))
#define MAP_SOUTHERN_ISLAND_INTERIOR (10 | (26 << 8)) #define MAP_SOUTHERN_ISLAND_INTERIOR (10 | (26 << 8))
#define MAP_SAFARI_ZONE_REST_HOUSE (11 | (26 << 8)) #define MAP_SAFARI_ZONE_REST_HOUSE (11 | (26 << 8))
#define MAP_SAFARI_ZONE_NORTHEAST (12 | (26 << 8)) #define MAP_SAFARI_ZONE_NORTHEAST (12 | (26 << 8))
#define MAP_SAFARI_ZONE_SOUTHEAST (13 | (26 << 8)) #define MAP_SAFARI_ZONE_SOUTHEAST (13 | (26 << 8))
#define MAP_BATTLE_FRONTIER_OUTSIDE_EAST (14 | (26 << 8)) #define MAP_BATTLE_FRONTIER_OUTSIDE_EAST (14 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM (15 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM (15 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 (16 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR (16 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 (17 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM (17 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY (18 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY (18 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR (19 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR (19 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM (20 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM (20 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM (21 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM (21 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY (22 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY (22 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR (23 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR (23 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM (24 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM (24 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY (25 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY (25 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR (26 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR (26 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP (27 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP (27 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY (28 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY (28 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR (29 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR (29 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM (30 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM (30 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY (31 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY (31 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM (32 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM (32 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM (33 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM (33 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY (34 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY (34 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR (35 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR (35 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM (36 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM (36 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL (37 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL (37 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL (38 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL (38 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS (39 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS (39 | (26 << 8))
#define MAP_BATTLE_FRONTIER_RANKING_HALL (40 | (26 << 8)) #define MAP_BATTLE_FRONTIER_RANKING_HALL (40 | (26 << 8))
#define MAP_BATTLE_FRONTIER_LOUNGE1 (41 | (26 << 8)) #define MAP_BATTLE_FRONTIER_LOUNGE1 (41 | (26 << 8))
#define MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER (42 | (26 << 8)) #define MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER (42 | (26 << 8))
#define MAP_BATTLE_FRONTIER_LOUNGE2 (43 | (26 << 8)) #define MAP_BATTLE_FRONTIER_LOUNGE2 (43 | (26 << 8))
#define MAP_BATTLE_FRONTIER_LOUNGE3 (44 | (26 << 8)) #define MAP_BATTLE_FRONTIER_LOUNGE3 (44 | (26 << 8))
#define MAP_BATTLE_FRONTIER_LOUNGE4 (45 | (26 << 8)) #define MAP_BATTLE_FRONTIER_LOUNGE4 (45 | (26 << 8))
#define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE (46 | (26 << 8)) #define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE (46 | (26 << 8))
#define MAP_BATTLE_FRONTIER_LOUNGE5 (47 | (26 << 8)) #define MAP_BATTLE_FRONTIER_LOUNGE5 (47 | (26 << 8))
#define MAP_BATTLE_FRONTIER_LOUNGE6 (48 | (26 << 8)) #define MAP_BATTLE_FRONTIER_LOUNGE6 (48 | (26 << 8))
#define MAP_BATTLE_FRONTIER_LOUNGE7 (49 | (26 << 8)) #define MAP_BATTLE_FRONTIER_LOUNGE7 (49 | (26 << 8))
#define MAP_BATTLE_FRONTIER_RECEPTION_GATE (50 | (26 << 8)) #define MAP_BATTLE_FRONTIER_RECEPTION_GATE (50 | (26 << 8))
#define MAP_BATTLE_FRONTIER_LOUNGE8 (51 | (26 << 8)) #define MAP_BATTLE_FRONTIER_LOUNGE8 (51 | (26 << 8))
#define MAP_BATTLE_FRONTIER_LOUNGE9 (52 | (26 << 8)) #define MAP_BATTLE_FRONTIER_LOUNGE9 (52 | (26 << 8))
#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F (53 | (26 << 8)) #define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F (53 | (26 << 8))
#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F (54 | (26 << 8)) #define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F (54 | (26 << 8))
#define MAP_BATTLE_FRONTIER_MART (55 | (26 << 8)) #define MAP_BATTLE_FRONTIER_MART (55 | (26 << 8))
#define MAP_FARAWAY_ISLAND_ENTRANCE (56 | (26 << 8)) #define MAP_FARAWAY_ISLAND_ENTRANCE (56 | (26 << 8))
#define MAP_FARAWAY_ISLAND_INTERIOR (57 | (26 << 8)) #define MAP_FARAWAY_ISLAND_INTERIOR (57 | (26 << 8))
#define MAP_BIRTH_ISLAND_EXTERIOR (58 | (26 << 8)) #define MAP_BIRTH_ISLAND_EXTERIOR (58 | (26 << 8))
#define MAP_BIRTH_ISLAND_HARBOR (59 | (26 << 8)) #define MAP_BIRTH_ISLAND_HARBOR (59 | (26 << 8))
#define MAP_TRAINER_HILL_ENTRANCE (60 | (26 << 8)) #define MAP_TRAINER_HILL_ENTRANCE (60 | (26 << 8))
#define MAP_TRAINER_HILL_1F (61 | (26 << 8)) #define MAP_TRAINER_HILL_1F (61 | (26 << 8))
#define MAP_TRAINER_HILL_2F (62 | (26 << 8)) #define MAP_TRAINER_HILL_2F (62 | (26 << 8))
#define MAP_TRAINER_HILL_3F (63 | (26 << 8)) #define MAP_TRAINER_HILL_3F (63 | (26 << 8))
#define MAP_TRAINER_HILL_4F (64 | (26 << 8)) #define MAP_TRAINER_HILL_4F (64 | (26 << 8))
#define MAP_TRAINER_HILL_ROOF (65 | (26 << 8)) #define MAP_TRAINER_HILL_ROOF (65 | (26 << 8))
#define MAP_NAVEL_ROCK_EXTERIOR (66 | (26 << 8)) #define MAP_NAVEL_ROCK_EXTERIOR (66 | (26 << 8))
#define MAP_NAVEL_ROCK_HARBOR (67 | (26 << 8)) #define MAP_NAVEL_ROCK_HARBOR (67 | (26 << 8))
#define MAP_NAVEL_ROCK_ENTRANCE (68 | (26 << 8)) #define MAP_NAVEL_ROCK_ENTRANCE (68 | (26 << 8))
#define MAP_NAVEL_ROCK_B1F (69 | (26 << 8)) #define MAP_NAVEL_ROCK_B1F (69 | (26 << 8))
#define MAP_NAVEL_ROCK_FORK (70 | (26 << 8)) #define MAP_NAVEL_ROCK_FORK (70 | (26 << 8))
#define MAP_NAVEL_ROCK_UP1 (71 | (26 << 8)) #define MAP_NAVEL_ROCK_UP1 (71 | (26 << 8))
#define MAP_NAVEL_ROCK_UP2 (72 | (26 << 8)) #define MAP_NAVEL_ROCK_UP2 (72 | (26 << 8))
#define MAP_NAVEL_ROCK_UP3 (73 | (26 << 8)) #define MAP_NAVEL_ROCK_UP3 (73 | (26 << 8))
#define MAP_NAVEL_ROCK_UP4 (74 | (26 << 8)) #define MAP_NAVEL_ROCK_UP4 (74 | (26 << 8))
#define MAP_NAVEL_ROCK_TOP (75 | (26 << 8)) #define MAP_NAVEL_ROCK_TOP (75 | (26 << 8))
#define MAP_NAVEL_ROCK_DOWN01 (76 | (26 << 8)) #define MAP_NAVEL_ROCK_DOWN01 (76 | (26 << 8))
#define MAP_NAVEL_ROCK_DOWN02 (77 | (26 << 8)) #define MAP_NAVEL_ROCK_DOWN02 (77 | (26 << 8))
#define MAP_NAVEL_ROCK_DOWN03 (78 | (26 << 8)) #define MAP_NAVEL_ROCK_DOWN03 (78 | (26 << 8))
#define MAP_NAVEL_ROCK_DOWN04 (79 | (26 << 8)) #define MAP_NAVEL_ROCK_DOWN04 (79 | (26 << 8))
#define MAP_NAVEL_ROCK_DOWN05 (80 | (26 << 8)) #define MAP_NAVEL_ROCK_DOWN05 (80 | (26 << 8))
#define MAP_NAVEL_ROCK_DOWN06 (81 | (26 << 8)) #define MAP_NAVEL_ROCK_DOWN06 (81 | (26 << 8))
#define MAP_NAVEL_ROCK_DOWN07 (82 | (26 << 8)) #define MAP_NAVEL_ROCK_DOWN07 (82 | (26 << 8))
#define MAP_NAVEL_ROCK_DOWN08 (83 | (26 << 8)) #define MAP_NAVEL_ROCK_DOWN08 (83 | (26 << 8))
#define MAP_NAVEL_ROCK_DOWN09 (84 | (26 << 8)) #define MAP_NAVEL_ROCK_DOWN09 (84 | (26 << 8))
#define MAP_NAVEL_ROCK_DOWN10 (85 | (26 << 8)) #define MAP_NAVEL_ROCK_DOWN10 (85 | (26 << 8))
#define MAP_NAVEL_ROCK_DOWN11 (86 | (26 << 8)) #define MAP_NAVEL_ROCK_DOWN11 (86 | (26 << 8))
#define MAP_NAVEL_ROCK_BOTTOM (87 | (26 << 8)) #define MAP_NAVEL_ROCK_BOTTOM (87 | (26 << 8))
#define MAP_TRAINER_HILL_ELEVATOR (88 | (26 << 8)) #define MAP_TRAINER_HILL_ELEVATOR (88 | (26 << 8))
// Map Group 27 // Map Group 27
#define MAP_ROUTE104_PROTOTYPE (0 | (27 << 8)) #define MAP_ROUTE104_PROTOTYPE (0 | (27 << 8))
include/event_scripts.h
+5
View File
@@ -582,4 +582,9 @@ extern const u8 SecretBase_EventScript_ShrubUseSecretPower[];
// trainer hill // trainer hill
extern const u8 TrainerHill_EventScript_TrainerBattle[]; extern const u8 TrainerHill_EventScript_TrainerBattle[];
// Item Use
extern u8 BerryTree_EventScript_ItemUsePlantBerry[];
extern u8 BerryTree_EventScript_ItemUseWailmerPail[];
extern u8 BattleFrontier_OutsideEast_EventScript_WaterSudowoodo[];
#endif // GUARD_EVENT_SCRIPTS_H #endif // GUARD_EVENT_SCRIPTS_H
include/field_player_avatar.h
+1
View File
@@ -63,5 +63,6 @@ bool32 sub_808D1B4(void);
bool32 sub_808D1E8(void); bool32 sub_808D1E8(void);
void SetPlayerInvisibility(bool8 invisible); void SetPlayerInvisibility(bool8 invisible);
u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y); u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y);
void StartFishing(u8 taskId);
#endif // GUARD_FIELD_PLAYER_AVATAR_H #endif // GUARD_FIELD_PLAYER_AVATAR_H
include/field_specials.h
+1 -1
View File
@@ -7,7 +7,7 @@ extern u8 gBikeCollisions;
u8 GetLeadMonIndex(void); u8 GetLeadMonIndex(void);
u8 IsDestinationBoxFull(void); u8 IsDestinationBoxFull(void);
u16 GetPCBoxToSendMon(void); u16 GetPCBoxToSendMon(void);
bool8 InMultiBattleRoom(void); bool8 InMultiPartnerRoom(void);
void UpdateTrainerFansAfterLinkBattle(void); void UpdateTrainerFansAfterLinkBattle(void);
void IncrementBirthIslandRockStepCount(void); void IncrementBirthIslandRockStepCount(void);
bool8 AbnormalWeatherHasExpired(void); bool8 AbnormalWeatherHasExpired(void);
include/fieldmap.h
+1 -1
View File
@@ -42,7 +42,7 @@ void copy_map_tileset2_to_vram_2(struct MapLayout const *mapLayout);
void copy_map_tileset1_to_vram(const struct MapLayout *); void copy_map_tileset1_to_vram(const struct MapLayout *);
void copy_map_tileset2_to_vram(const struct MapLayout *); void copy_map_tileset2_to_vram(const struct MapLayout *);
struct MapHeader const *const mapconnection_get_mapheader(struct MapConnection *connection); struct MapHeader const *const mapconnection_get_mapheader(struct MapConnection *connection);
struct MapConnection *sub_8088A8C(s16 x, s16 y); struct MapConnection *GetConnectionAtCoords(s16 x, s16 y);
void SpriteCB_PokeballGlow(struct Sprite *); void SpriteCB_PokeballGlow(struct Sprite *);
void SpriteCB_PokecenterMonitor(struct Sprite *); void SpriteCB_PokecenterMonitor(struct Sprite *);
include/global.fieldmap.h
+10
View File
@@ -143,6 +143,16 @@ struct MapHeader
/* 0x1B */ u8 battleType; /* 0x1B */ u8 battleType;
}; };
// Flags for gMapHeader.flags, as defined in the map_header_flags macro
#define MAP_ALLOW_BIKE (1 << 0)
#define MAP_ALLOW_ESCAPE_ROPE (1 << 1)
#define MAP_ALLOW_RUN (1 << 2)
#define MAP_SHOW_MAP_NAME (1 << 3)
#define UNUSED_MAP_FLAGS (1 << 4 | 1 << 5 | 1 << 6 | 1 << 7)
#define SHOW_MAP_NAME_ENABLED ((gMapHeader.flags & (MAP_SHOW_MAP_NAME | UNUSED_MAP_FLAGS)) == MAP_SHOW_MAP_NAME)
struct ObjectEvent struct ObjectEvent
{ {
/*0x00*/ u32 active:1; /*0x00*/ u32 active:1;
include/global.h
+1 -1
View File
@@ -331,7 +331,7 @@ struct BattleFrontier
/*0xCA8*/ u8 challengeStatus; /*0xCA8*/ u8 challengeStatus;
/*0xCA9*/ u8 lvlMode:2; /*0xCA9*/ u8 lvlMode:2;
/*0xCA9*/ u8 challengePaused:1; /*0xCA9*/ u8 challengePaused:1;
/*0xCA9*/ u8 field_CA9_b:1; /*0xCA9*/ u8 disableRecordBattle:1;
/*0xCA9*/ u8 unused_CA9_c:1; /*0xCA9*/ u8 unused_CA9_c:1;
/*0xCA9*/ u8 unused_CA9_d:1; /*0xCA9*/ u8 unused_CA9_d:1;
/*0xCA9*/ u8 unused_CA9_e:1; /*0xCA9*/ u8 unused_CA9_e:1;
include/item_menu.h
+7 -3
View File
@@ -74,7 +74,7 @@ void QuizLadyOpenBagMenu(void);
void ApprenticeOpenBagMenu(void); void ApprenticeOpenBagMenu(void);
void sub_81AABB0(void); void sub_81AABB0(void);
void SetInitialScrollAndCursorPositions(u8 pocketId); void SetInitialScrollAndCursorPositions(u8 pocketId);
void bag_menu_mail_related(void); void CB2_ReturnToBagMenuPocket(void);
void CB2_BagMenuFromStartMenu(void); void CB2_BagMenuFromStartMenu(void);
u8 GetItemListPosition(u8 pocketId); u8 GetItemListPosition(u8 pocketId);
bool8 UseRegisteredKeyItemOnField(void); bool8 UseRegisteredKeyItemOnField(void);
@@ -84,9 +84,13 @@ void DoWallyTutorialBagMenu(void);
void ResetBagScrollPositions(void); void ResetBagScrollPositions(void);
void ChooseBerrySetCallback(void (*callback)(void)); void ChooseBerrySetCallback(void (*callback)(void));
void CB2_ChooseBerry(void); void CB2_ChooseBerry(void);
void unknown_ItemMenu_Confirm(u8 taskId); void Task_FadeAndCloseBagMenu(u8 taskId);
void BagMenu_YesNo(u8, u8, const struct YesNoFuncTable*); void BagMenu_YesNo(u8, u8, const struct YesNoFuncTable*);
void sub_81AB9A8(u8 pocketId); void BagMenu_InitListsMenu(u8 taskId);
void UpdatePocketItemList(u8 pocketId);
void DisplayItemMessage(u8 taskId, u8 fontId, const u8 *str, void ( *callback)(u8 taskId));
void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
#endif //GUARD_item_menu_H #endif //GUARD_item_menu_H
include/item_use.h
+6 -24
View File
@@ -3,27 +3,13 @@
void ItemUseOutOfBattle_Mail(u8); void ItemUseOutOfBattle_Mail(u8);
void ItemUseOutOfBattle_Bike(u8); void ItemUseOutOfBattle_Bike(u8);
void ItemUseOnFieldCB_Bike(u8);
void ItemUseOutOfBattle_Rod(u8); void ItemUseOutOfBattle_Rod(u8);
void ItemUseOnFieldCB_Rod(u8);
void ItemUseOutOfBattle_Itemfinder(u8); void ItemUseOutOfBattle_Itemfinder(u8);
void ItemUseOnFieldCB_Itemfinder(u8);
void RunItemfinderResults(u8);
void ExitItemfinder(u8);
bool8 ItemfinderCheckForHiddenItems(const struct MapEvents *, u8);
void sub_80C9720(u8);
void sub_80C9838(u8, s16, s16);
u8 GetPlayerDirectionTowardsHiddenItem(s16, s16);
void SetPlayerDirectionTowardsItem(u8);
void DisplayItemRespondingMessageAndExitItemfinder(u8);
void RotatePlayerAndExitItemfinder(u8);
void ItemUseOutOfBattle_PokeblockCase(u8); void ItemUseOutOfBattle_PokeblockCase(u8);
void ItemUseOutOfBattle_CoinCase(u8); void ItemUseOutOfBattle_CoinCase(u8);
void ItemUseOutOfBattle_PowderJar(u8); void ItemUseOutOfBattle_PowderJar(u8);
void ItemUseOutOfBattle_SSTicket(u8); void ItemUseOutOfBattle_SSTicket(u8);
void sub_80C9D00(u8);
void ItemUseOutOfBattle_WailmerPail(u8); void ItemUseOutOfBattle_WailmerPail(u8);
void sub_80C9D74(u8);
void ItemUseOutOfBattle_Medicine(u8); void ItemUseOutOfBattle_Medicine(u8);
void ItemUseOutOfBattle_ReduceEV(u8); void ItemUseOutOfBattle_ReduceEV(u8);
void ItemUseOutOfBattle_SacredAsh(u8); void ItemUseOutOfBattle_SacredAsh(u8);
@@ -31,25 +17,21 @@ void ItemUseOutOfBattle_PPRecovery(u8);
void ItemUseOutOfBattle_PPUp(u8); void ItemUseOutOfBattle_PPUp(u8);
void ItemUseOutOfBattle_RareCandy(u8); void ItemUseOutOfBattle_RareCandy(u8);
void ItemUseOutOfBattle_TMHM(u8); void ItemUseOutOfBattle_TMHM(u8);
void sub_80C9EE4(u8);
void sub_80C9F10(u8);
void sub_80C9F80(u8);
void sub_80C9FC0(u8);
void ItemUseOutOfBattle_Repel(u8); void ItemUseOutOfBattle_Repel(u8);
void ItemUseOutOfBattle_BlackWhiteFlute(u8);
void task08_080A1C44(u8);
u8 CanUseEscapeRopeOnCurrMap(void);
void ItemUseOutOfBattle_EscapeRope(u8); void ItemUseOutOfBattle_EscapeRope(u8);
void ItemUseOutOfBattle_BlackWhiteFlute(u8);
void ItemUseOutOfBattle_EvolutionStone(u8); void ItemUseOutOfBattle_EvolutionStone(u8);
void ItemUseOutOfBattle_Berry(u8);
void ItemUseOutOfBattle_EnigmaBerry(u8);
void ItemUseOutOfBattle_CannotUse(u8);
void ItemUseInBattle_PokeBall(u8); void ItemUseInBattle_PokeBall(u8);
void ItemUseInBattle_StatIncrease(u8); void ItemUseInBattle_StatIncrease(u8);
void ItemUseInBattle_Medicine(u8); void ItemUseInBattle_Medicine(u8);
void ItemUseInBattle_PPRecovery(u8); void ItemUseInBattle_PPRecovery(u8);
void ItemUseInBattle_Escape(u8); void ItemUseInBattle_Escape(u8);
void ItemUseOutOfBattle_EnigmaBerry(u8);
void ItemUseInBattle_EnigmaBerry(u8); void ItemUseInBattle_EnigmaBerry(u8);
void ItemUseOutOfBattle_CannotUse(u8); void Task_UseDigEscapeRopeOnField(u8 taskId);
u8 CanUseEscapeRopeOnCurrMap(void);
u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId); u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId);
void ItemUseOutOfBattle_Berry(u8);
#endif // GUARD_ITEM_USE_H #endif // GUARD_ITEM_USE_H
include/menu.h
-1
View File
@@ -28,7 +28,6 @@ void DrawDialogueFrame(u8 windowId, bool8 copyToVram);
void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram); void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram);
u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 fgColor, u8 bgColor, u8 shadowColor); u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 fgColor, u8 bgColor, u8 shadowColor);
void PrintPlayerNameOnWindow(u8, const u8*, u16, u16); void PrintPlayerNameOnWindow(u8, const u8*, u16, u16);
void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram); void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram);
void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram); void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram);
void DisplayYesNoMenuDefaultYes(void); void DisplayYesNoMenuDefaultYes(void);
include/pokemon.h
+1 -1
View File
@@ -342,7 +342,7 @@ bool8 ExecuteTableBasedItemEffect(struct Pokemon *mon, u16 item, u8 partyIndex,
bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex, u8 e); bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex, u8 e);
bool8 HealStatusConditions(struct Pokemon *mon, u32 battlePartyId, u32 healMask, u8 battlerId); bool8 HealStatusConditions(struct Pokemon *mon, u32 battlePartyId, u32 healMask, u8 battlerId);
u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit); u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit);
u8 *sub_806CF78(u16 itemId); u8 *UseStatIncreaseItem(u16 itemId);
u8 GetNature(struct Pokemon *mon); u8 GetNature(struct Pokemon *mon);
u8 GetNatureFromPersonality(u32 personality); u8 GetNatureFromPersonality(u32 personality);
u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem); u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem);
include/strings.h
+331 -331
View File
@@ -1373,336 +1373,336 @@ extern const u8 gText_LucyDefeatGold[];
extern const u8 gText_BrandonDefeatGold[]; extern const u8 gText_BrandonDefeatGold[];
// Battle Tower. // Battle Tower.
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Intro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248297[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Mon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Mon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Accept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Reject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Intro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Mon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Mon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Accept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247749[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Reject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Intro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Mon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246864[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Mon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Accept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Reject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248661[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Intro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Mon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Mon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Accept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Reject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246662[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Intro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248321[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Mon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Mon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Accept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2465B5[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Reject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Intro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Mon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244549[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Mon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246244[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Accept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Reject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Intro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Mon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Mon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244383[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Accept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Reject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Intro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F7B[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Mon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247268[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Mon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244643[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Accept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Reject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Intro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Mon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Mon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Accept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247348[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Reject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Intro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Mon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244989[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Mon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Accept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Reject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Intro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Mon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248467[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Mon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Accept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Reject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Intro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Mon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Mon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Accept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Reject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248553[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Intro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246741[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Mon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245656[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Mon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Accept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248725[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Reject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244939[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Intro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2471FB[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Mon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247291[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Mon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Accept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Reject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248614[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Intro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Mon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Mon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Accept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Reject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Intro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248031[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Mon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Mon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245464[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Accept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Reject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247313[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247470[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246529[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247238[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247655[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245535[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246FCC[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247991[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246605[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246020[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246449[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246831[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247854[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246051[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248401[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248671[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247484[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247629[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244413[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248369[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248892[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247889[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248781[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246791[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246571[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248431[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2487C9[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247807[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246002[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247838[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248151[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247942[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248751[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247724[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248908[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244618[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467C4[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245406[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248517[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245087[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248221[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245196[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245740[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248128[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247013[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248477[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245923[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248829[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245013[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246686[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247438[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246082[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245851[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246760[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246478[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFReject[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMIntro[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMMon1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMAccept[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D[]; extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMReject[];
// Battle Dome. // Battle Dome.
extern const u8 gBattleDomeOpponentPotentialText1[]; extern const u8 gBattleDomeOpponentPotentialText1[];
@@ -2026,7 +2026,7 @@ extern const u8 gText_JustOnePkmn[];
// battle main // battle main
extern const u8 gText_LinkStandby3[]; extern const u8 gText_LinkStandby3[];
extern const u8 gText_BattleRecordCouldntBeSaved[]; extern const u8 BattleFrontier_BattleTowerBattleRoom_Text_RecordCouldntBeSaved[];
extern const u8 gText_Poison[]; extern const u8 gText_Poison[];
extern const u8 gText_Sleep[]; extern const u8 gText_Sleep[];
extern const u8 gText_Paralysis[]; extern const u8 gText_Paralysis[];
src/battle_ai_switch_items.c
+3 -3
View File
@@ -787,9 +787,9 @@ static u8 GetAI_ItemType(u8 itemId, const u8 *itemEffect) // NOTE: should take u
return AI_ITEM_HEAL_HP; return AI_ITEM_HEAL_HP;
else if (itemEffect[3] & ITEM3_STATUS_ALL) else if (itemEffect[3] & ITEM3_STATUS_ALL)
return AI_ITEM_CURE_CONDITION; return AI_ITEM_CURE_CONDITION;
else if (itemEffect[0] & (ITEM0_HIGH_CRIT | ITEM0_X_ATTACK) || itemEffect[1] != 0 || itemEffect[2] != 0) else if (itemEffect[0] & (ITEM0_DIRE_HIT | ITEM0_X_ATTACK) || itemEffect[1] != 0 || itemEffect[2] != 0)
return AI_ITEM_X_STAT; return AI_ITEM_X_STAT;
else if (itemEffect[3] & ITEM3_MIST) else if (itemEffect[3] & ITEM3_GUARD_SPEC)
return AI_ITEM_GUARD_SPECS; return AI_ITEM_GUARD_SPECS;
else else
return AI_ITEM_NOT_RECOGNIZABLE; return AI_ITEM_NOT_RECOGNIZABLE;
@@ -907,7 +907,7 @@ static bool8 ShouldUseItem(void)
*(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x8; *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x8;
if (itemEffects[2] & ITEM2_X_ACCURACY) if (itemEffects[2] & ITEM2_X_ACCURACY)
*(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x20; *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x20;
if (itemEffects[0] & ITEM0_HIGH_CRIT) if (itemEffects[0] & ITEM0_DIRE_HIT)
*(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x80; *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x80;
shouldUse = TRUE; shouldUse = TRUE;
break; break;
src/battle_arena.c
+1 -1
View File
@@ -791,7 +791,7 @@ static void InitArenaChallenge(void)
gSaveBlock2Ptr->frontier.challengeStatus = 0; gSaveBlock2Ptr->frontier.challengeStatus = 0;
gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0;
gSaveBlock2Ptr->frontier.challengePaused = FALSE; gSaveBlock2Ptr->frontier.challengePaused = FALSE;
gSaveBlock2Ptr->frontier.field_CA9_b = 0; gSaveBlock2Ptr->frontier.disableRecordBattle = FALSE;
if (lvlMode != FRONTIER_LVL_50) if (lvlMode != FRONTIER_LVL_50)
isCurrent = gSaveBlock2Ptr->frontier.winStreakActiveFlags & STREAK_ARENA_OPEN; isCurrent = gSaveBlock2Ptr->frontier.winStreakActiveFlags & STREAK_ARENA_OPEN;
else else
src/battle_controller_link_opponent.c
+1 -1
View File
@@ -1846,7 +1846,7 @@ static void LinkOpponentHandleCmd55(void)
else else
gBattleOutcome = gBattleBufferA[gActiveBattler][1] ^ B_OUTCOME_DREW; gBattleOutcome = gBattleBufferA[gActiveBattler][1] ^ B_OUTCOME_DREW;
gSaveBlock2Ptr->frontier.field_CA9_b = gBattleBufferA[gActiveBattler][2]; gSaveBlock2Ptr->frontier.disableRecordBattle = gBattleBufferA[gActiveBattler][2];
FadeOutMapMusic(5); FadeOutMapMusic(5);
BeginFastPaletteFade(3); BeginFastPaletteFade(3);
LinkOpponentBufferExecCompleted(); LinkOpponentBufferExecCompleted();
src/battle_controller_link_partner.c
+1 -1
View File
@@ -1676,7 +1676,7 @@ static void LinkPartnerHandleCmd55(void)
{ {
sub_81851A8(&gBattleBufferA[gActiveBattler][4]); sub_81851A8(&gBattleBufferA[gActiveBattler][4]);
gBattleOutcome = gBattleBufferA[gActiveBattler][1]; gBattleOutcome = gBattleBufferA[gActiveBattler][1];
gSaveBlock2Ptr->frontier.field_CA9_b = gBattleBufferA[gActiveBattler][2]; gSaveBlock2Ptr->frontier.disableRecordBattle = gBattleBufferA[gActiveBattler][2];
FadeOutMapMusic(5); FadeOutMapMusic(5);
BeginFastPaletteFade(3); BeginFastPaletteFade(3);
LinkPartnerBufferExecCompleted(); LinkPartnerBufferExecCompleted();
src/battle_controller_player.c
+1 -1
View File
@@ -3093,7 +3093,7 @@ static void PlayerHandleCmd55(void)
{ {
sub_81851A8(&gBattleBufferA[gActiveBattler][4]); sub_81851A8(&gBattleBufferA[gActiveBattler][4]);
gBattleOutcome = gBattleBufferA[gActiveBattler][1]; gBattleOutcome = gBattleBufferA[gActiveBattler][1];
gSaveBlock2Ptr->frontier.field_CA9_b = gBattleBufferA[gActiveBattler][2]; gSaveBlock2Ptr->frontier.disableRecordBattle = gBattleBufferA[gActiveBattler][2];
FadeOutMapMusic(5); FadeOutMapMusic(5);
BeginFastPaletteFade(3); BeginFastPaletteFade(3);
PlayerBufferExecCompleted(); PlayerBufferExecCompleted();
src/battle_controllers.c
+2 -2
View File
@@ -1509,8 +1509,8 @@ void BtlController_EmitCmd55(u8 bufferId, u8 battleOutcome)
{ {
sBattleBuffersTransferData[0] = CONTROLLER_55; sBattleBuffersTransferData[0] = CONTROLLER_55;
sBattleBuffersTransferData[1] = battleOutcome; sBattleBuffersTransferData[1] = battleOutcome;
sBattleBuffersTransferData[2] = gSaveBlock2Ptr->frontier.field_CA9_b; sBattleBuffersTransferData[2] = gSaveBlock2Ptr->frontier.disableRecordBattle;
sBattleBuffersTransferData[3] = gSaveBlock2Ptr->frontier.field_CA9_b; sBattleBuffersTransferData[3] = gSaveBlock2Ptr->frontier.disableRecordBattle;
sBattleBuffersTransferData[5] = sBattleBuffersTransferData[4] = sub_81850DC(&sBattleBuffersTransferData[6]); sBattleBuffersTransferData[5] = sBattleBuffersTransferData[4] = sub_81850DC(&sBattleBuffersTransferData[6]);
PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, sBattleBuffersTransferData[4] + 6); PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, sBattleBuffersTransferData[4] + 6);
} }
src/battle_dome.c
+1 -1
View File
@@ -2259,7 +2259,7 @@ static void InitDomeChallenge(void)
gSaveBlock2Ptr->frontier.challengeStatus = 0; gSaveBlock2Ptr->frontier.challengeStatus = 0;
gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0;
gSaveBlock2Ptr->frontier.challengePaused = FALSE; gSaveBlock2Ptr->frontier.challengePaused = FALSE;
gSaveBlock2Ptr->frontier.field_CA9_b = 0; gSaveBlock2Ptr->frontier.disableRecordBattle = FALSE;
if (!(gSaveBlock2Ptr->frontier.winStreakActiveFlags & sWinStreakFlags[battleMode][lvlMode])) if (!(gSaveBlock2Ptr->frontier.winStreakActiveFlags & sWinStreakFlags[battleMode][lvlMode]))
gSaveBlock2Ptr->frontier.domeWinStreaks[battleMode][lvlMode] = 0; gSaveBlock2Ptr->frontier.domeWinStreaks[battleMode][lvlMode] = 0;
src/battle_factory.c
+1 -1
View File
@@ -193,7 +193,7 @@ static void InitFactoryChallenge(void)
gSaveBlock2Ptr->frontier.challengeStatus = 0; gSaveBlock2Ptr->frontier.challengeStatus = 0;
gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0;
gSaveBlock2Ptr->frontier.challengePaused = FALSE; gSaveBlock2Ptr->frontier.challengePaused = FALSE;
gSaveBlock2Ptr->frontier.field_CA9_b = 0; gSaveBlock2Ptr->frontier.disableRecordBattle = FALSE;
if (!(gSaveBlock2Ptr->frontier.winStreakActiveFlags & sWinStreakFlags[battleMode][lvlMode])) if (!(gSaveBlock2Ptr->frontier.winStreakActiveFlags & sWinStreakFlags[battleMode][lvlMode]))
{ {
gSaveBlock2Ptr->frontier.factoryWinStreaks[battleMode][lvlMode] = 0; gSaveBlock2Ptr->frontier.factoryWinStreaks[battleMode][lvlMode] = 0;
src/battle_main.c
+6 -6
View File
@@ -715,7 +715,7 @@ static void CB2_InitBattleInternal(void)
} }
gMain.inBattle = TRUE; gMain.inBattle = TRUE;
gSaveBlock2Ptr->frontier.field_CA9_b = 0; gSaveBlock2Ptr->frontier.disableRecordBattle = FALSE;
for (i = 0; i < PARTY_SIZE; i++) for (i = 0; i < PARTY_SIZE; i++)
AdjustFriendship(&gPlayerParty[i], 3); AdjustFriendship(&gPlayerParty[i], 3);
@@ -2315,7 +2315,7 @@ static void sub_8038F34(void)
for (i = 0; i < monsCount && (gLinkPlayers[i].version & 0xFF) == VERSION_EMERALD; i++); for (i = 0; i < monsCount && (gLinkPlayers[i].version & 0xFF) == VERSION_EMERALD; i++);
if (!gSaveBlock2Ptr->frontier.field_CA9_b && i == monsCount) if (!gSaveBlock2Ptr->frontier.disableRecordBattle && i == monsCount)
{ {
if (FlagGet(FLAG_SYS_FRONTIER_PASS)) if (FlagGet(FLAG_SYS_FRONTIER_PASS))
{ {
@@ -2594,7 +2594,7 @@ static void sub_803939C(void)
} }
else else
{ {
BattleStringExpandPlaceholdersToDisplayedString(gText_BattleRecordCouldntBeSaved); BattleStringExpandPlaceholdersToDisplayedString(BattleFrontier_BattleTowerBattleRoom_Text_RecordCouldntBeSaved);
BattlePutTextOnWindow(gDisplayedStringBattle, 0); BattlePutTextOnWindow(gDisplayedStringBattle, 0);
gBattleCommunication[1] = 0x80; gBattleCommunication[1] = 0x80;
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
@@ -5070,7 +5070,7 @@ static void HandleEndTurn_BattleLost(void)
{ {
gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeitedLinkBattle; gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeitedLinkBattle;
gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN); gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
gSaveBlock2Ptr->frontier.field_CA9_b = 1; gSaveBlock2Ptr->frontier.disableRecordBattle = TRUE;
} }
else else
{ {
@@ -5102,7 +5102,7 @@ static void HandleEndTurn_RanFromBattle(void)
{ {
gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeited; gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeited;
gBattleOutcome = B_OUTCOME_FORFEITED; gBattleOutcome = B_OUTCOME_FORFEITED;
gSaveBlock2Ptr->frontier.field_CA9_b = 1; gSaveBlock2Ptr->frontier.disableRecordBattle = TRUE;
} }
else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL)
{ {
@@ -5721,7 +5721,7 @@ static void HandleAction_Run(void)
} }
gBattleOutcome |= B_OUTCOME_LINK_BATTLE_RAN; gBattleOutcome |= B_OUTCOME_LINK_BATTLE_RAN;
gSaveBlock2Ptr->frontier.field_CA9_b = 1; gSaveBlock2Ptr->frontier.disableRecordBattle = TRUE;
} }
else else
{ {
src/battle_palace.c
+1 -1
View File
@@ -89,7 +89,7 @@ static void InitPalaceChallenge(void)
gSaveBlock2Ptr->frontier.challengeStatus = 0; gSaveBlock2Ptr->frontier.challengeStatus = 0;
gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0;
gSaveBlock2Ptr->frontier.challengePaused = FALSE; gSaveBlock2Ptr->frontier.challengePaused = FALSE;
gSaveBlock2Ptr->frontier.field_CA9_b = 0; gSaveBlock2Ptr->frontier.disableRecordBattle = FALSE;
if (!(gSaveBlock2Ptr->frontier.winStreakActiveFlags & sWinStreakFlags[battleMode][lvlMode])) if (!(gSaveBlock2Ptr->frontier.winStreakActiveFlags & sWinStreakFlags[battleMode][lvlMode]))
gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode] = 0; gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode] = 0;
src/battle_pyramid_bag.c
+10 -10
View File
@@ -67,7 +67,7 @@ static void sub_81C700C(void);
static void sub_81C6E98(void); static void sub_81C6E98(void);
static void sub_81C6F20(void); static void sub_81C6F20(void);
static void sub_81C6404(void); static void sub_81C6404(void);
static void sub_81C6E1C(void); static void CloseBattlePyramidBagTextWindow(void);
static bool8 sub_81C5238(void); static bool8 sub_81C5238(void);
static bool8 sub_81C5078(void); static bool8 sub_81C5078(void);
static void ShowItemImage(u16 itemId, u8 itemSpriteArrayId); static void ShowItemImage(u16 itemId, u8 itemSpriteArrayId);
@@ -809,7 +809,7 @@ static void sub_81C5AB8(u8 y, u8 arg1)
PrintOnWindow_Font1(0, gText_SelectorArrow2, 0, y, 0, 0, 0, arg1); PrintOnWindow_Font1(0, gText_SelectorArrow2, 0, y, 0, 0, 0, arg1);
} }
void sub_81C5B14(u8 taskId) void CloseBattlePyramidBagAndSetCallback(u8 taskId)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gTasks[taskId].func = sub_81C5B4C; gTasks[taskId].func = sub_81C5B4C;
@@ -862,7 +862,7 @@ static void Task_HandlePyramidBagInput(u8 taskId)
case LIST_CANCEL: case LIST_CANCEL:
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
gSpecialVar_ItemId = 0; gSpecialVar_ItemId = 0;
sub_81C5B14(taskId); CloseBattlePyramidBagAndSetCallback(taskId);
break; break;
default: default:
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
@@ -1043,7 +1043,7 @@ static void BagAction_UseOnField(u8 taskId)
|| ItemIsMail(gSpecialVar_ItemId) == TRUE) || ItemIsMail(gSpecialVar_ItemId) == TRUE)
{ {
sub_81C61A8(); sub_81C61A8();
DisplayItemMessageInBattlePyramid(taskId, gText_DadsAdvice, sub_81C6714); DisplayItemMessageInBattlePyramid(taskId, gText_DadsAdvice, Task_CloseBattlePyramidBagMessage);
} }
else if (ItemId_GetFieldFunc(gSpecialVar_ItemId) != NULL) else if (ItemId_GetFieldFunc(gSpecialVar_ItemId) != NULL)
{ {
@@ -1203,7 +1203,7 @@ static void BagAction_Give(u8 taskId)
else if (!ItemId_GetImportance(gSpecialVar_ItemId)) else if (!ItemId_GetImportance(gSpecialVar_ItemId))
{ {
gPyramidBagResources->callback2 = CB2_ChooseMonToGiveItem; gPyramidBagResources->callback2 = CB2_ChooseMonToGiveItem;
sub_81C5B14(taskId); CloseBattlePyramidBagAndSetCallback(taskId);
} }
else else
{ {
@@ -1223,15 +1223,15 @@ static void sub_81C66EC(u8 taskId)
if (gMain.newKeys & A_BUTTON) if (gMain.newKeys & A_BUTTON)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
sub_81C6714(taskId); Task_CloseBattlePyramidBagMessage(taskId);
} }
} }
void sub_81C6714(u8 taskId) void Task_CloseBattlePyramidBagMessage(u8 taskId)
{ {
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
sub_81C6E1C(); CloseBattlePyramidBagTextWindow();
PrintItemDescription(data[1]); PrintItemDescription(data[1]);
sub_81C5A98(data[0], 0); sub_81C5A98(data[0], 0);
SetTaskToMainPyramidBagInputHandler(taskId); SetTaskToMainPyramidBagInputHandler(taskId);
@@ -1242,7 +1242,7 @@ static void sub_81C674C(u8 taskId)
if (!itemid_80BF6D8_mail_related(gSpecialVar_ItemId)) if (!itemid_80BF6D8_mail_related(gSpecialVar_ItemId))
DisplayItemMessageInBattlePyramid(taskId, gText_CantWriteMail, sub_81C66EC); DisplayItemMessageInBattlePyramid(taskId, gText_CantWriteMail, sub_81C66EC);
else if (!ItemId_GetImportance(gSpecialVar_ItemId)) else if (!ItemId_GetImportance(gSpecialVar_ItemId))
sub_81C5B14(taskId); CloseBattlePyramidBagAndSetCallback(taskId);
else else
sub_81C66AC(taskId); sub_81C66AC(taskId);
} }
@@ -1462,7 +1462,7 @@ void DisplayItemMessageInBattlePyramid(u8 taskId, const u8 *str, void (*callback
schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(1);
} }
static void sub_81C6E1C(void) static void CloseBattlePyramidBagTextWindow(void)
{ {
ClearDialogWindowAndFrameToTransparent(2, FALSE); ClearDialogWindowAndFrameToTransparent(2, FALSE);
// This ClearWindowTilemap call is redundant, since ClearDialogWindowAndFrameToTransparent already calls it. // This ClearWindowTilemap call is redundant, since ClearDialogWindowAndFrameToTransparent already calls it.
src/battle_tower.c
+260 -512
View File
File diff suppressed because it is too large Load Diff
src/berry_tag_screen.c
+1 -1
View File
@@ -527,7 +527,7 @@ static void Task_CloseBerryTagScreen(u8 taskId)
DestroyFlavorCircleSprites(); DestroyFlavorCircleSprites();
Free(sBerryTag); Free(sBerryTag);
FreeAllWindowBuffers(); FreeAllWindowBuffers();
SetMainCallback2(bag_menu_mail_related); SetMainCallback2(CB2_ReturnToBagMenuPocket);
DestroyTask(taskId); DestroyTask(taskId);
} }
} }
src/bike.c
+1 -1
View File
@@ -1056,7 +1056,7 @@ void Bike_HandleBumpySlopeJump(void)
bool32 IsRunningDisallowed(u8 metatile) bool32 IsRunningDisallowed(u8 metatile)
{ {
if (!(gMapHeader.flags & 4) || IsRunningDisallowedByMetatile(metatile) == TRUE) if (!(gMapHeader.flags & MAP_ALLOW_RUN) || IsRunningDisallowedByMetatile(metatile) == TRUE)
return TRUE; return TRUE;
else else
return FALSE; return FALSE;
src/data/battle_frontier/apprentice.h
+1 -1
View File
@@ -934,7 +934,7 @@ static const bool8 sValidApprenticeMoves[MOVES_COUNT] =
// WHICH_MOVE has max 5 occurrences, defined as NUM_WHICH_MOVE_QUESTIONS // WHICH_MOVE has max 5 occurrences, defined as NUM_WHICH_MOVE_QUESTIONS
// WHICH_FIRST has max 1 occurrence, lead mon should only be chosen once // WHICH_FIRST has max 1 occurrence, lead mon should only be chosen once
// WHICH_SPEECH has max 1 occurrence, as the apprentice leaves after its asked // WHICH_SPEECH has max 1 occurrence, as the apprentice leaves after its asked
static const u8 sQuestionPossibilities[] = static const u8 sQuestionPossibilities[MAX_APPRENTICE_QUESTIONS] =
{ {
QUESTION_ID_WHAT_ITEM, QUESTION_ID_WHAT_ITEM,
QUESTION_ID_WHAT_ITEM, QUESTION_ID_WHAT_ITEM,
src/data/pokemon/item_effects.h
+1 -1
View File
@@ -236,7 +236,7 @@ const u8 gItemEffect_PPMax[9] = {
}; };
const u8 gItemEffect_GuardSpec[8] = { const u8 gItemEffect_GuardSpec[8] = {
[3] = ITEM3_MIST, [3] = ITEM3_GUARD_SPEC,
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
[6] = 1, [6] = 1,
[7] = 1, [7] = 1,
src/decoration.c
+1
View File
@@ -14,6 +14,7 @@
#include "graphics.h" #include "graphics.h"
#include "international_string_util.h" #include "international_string_util.h"
#include "item_icon.h" #include "item_icon.h"
#include "item_menu.h"
#include "list_menu.h" #include "list_menu.h"
#include "main.h" #include "main.h"
#include "menu.h" #include "menu.h"
src/field_door.c
+8 -6
View File
@@ -9,7 +9,7 @@
#include "constants/maps.h" #include "constants/maps.h"
#include "constants/songs.h" #include "constants/songs.h"
bool8 sub_808A964(void); static bool8 ShouldUseMultiCorridorDoor(void);
const u8 DoorAnimTiles_04[][0x100] = const u8 DoorAnimTiles_04[][0x100] =
{ {
@@ -698,14 +698,14 @@ static void DrawDoor(const struct DoorGraphics *gfx, const struct DoorAnimFrame
if (frame->offset == 0xFFFF) if (frame->offset == 0xFFFF)
{ {
DrawClosedDoorTiles(gfx, x, y); DrawClosedDoorTiles(gfx, x, y);
if (sub_808A964()) if (ShouldUseMultiCorridorDoor())
DrawClosedDoorTiles(gfx, gSpecialVar_0x8004 + 7, gSpecialVar_0x8005 + 7); DrawClosedDoorTiles(gfx, gSpecialVar_0x8004 + 7, gSpecialVar_0x8005 + 7);
} }
else else
{ {
CopyDoorTilesToVram(gfx, frame); CopyDoorTilesToVram(gfx, frame);
DrawCurrentDoorAnimFrame(gfx, x, y, gfx->palette); DrawCurrentDoorAnimFrame(gfx, x, y, gfx->palette);
if (sub_808A964()) if (ShouldUseMultiCorridorDoor())
DrawCurrentDoorAnimFrame(gfx, gSpecialVar_0x8004 + 7, gSpecialVar_0x8005 + 7, gfx->palette); DrawCurrentDoorAnimFrame(gfx, gSpecialVar_0x8004 + 7, gSpecialVar_0x8005 + 7, gfx->palette);
} }
} }
@@ -885,11 +885,13 @@ u32 GetDoorSoundEffect(u32 x, u32 y)
return SE_DOOR; return SE_DOOR;
} }
bool8 sub_808A964(void) // Opens the Battle Tower multi partner's door in sync with the player's door
static bool8 ShouldUseMultiCorridorDoor(void)
{ {
if (FlagGet(FLAG_SPECIAL_FLAG_0x4002)) if (FlagGet(FLAG_ENABLE_MULTI_CORRIDOR_DOOR))
{ {
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2)) if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR)
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR))
{ {
return TRUE; return TRUE;
} }
src/field_specials.c
+23 -19
View File
@@ -46,6 +46,7 @@
#include "wallclock.h" #include "wallclock.h"
#include "window.h" #include "window.h"
#include "constants/battle_frontier.h" #include "constants/battle_frontier.h"
#include "constants/battle_tower.h"
#include "constants/decorations.h" #include "constants/decorations.h"
#include "constants/event_objects.h" #include "constants/event_objects.h"
#include "constants/event_object_movement.h" #include "constants/event_object_movement.h"
@@ -83,7 +84,7 @@ static EWRAM_DATA u8 sScrollableMultichoice_ItemSpriteId = 0;
static EWRAM_DATA u8 sBattlePointsWindowId = 0; static EWRAM_DATA u8 sBattlePointsWindowId = 0;
static EWRAM_DATA u8 sFrontierExchangeCorner_ItemIconWindowId = 0; static EWRAM_DATA u8 sFrontierExchangeCorner_ItemIconWindowId = 0;
static EWRAM_DATA u8 sPCBoxToSendMon = 0; static EWRAM_DATA u8 sPCBoxToSendMon = 0;
static EWRAM_DATA u32 sUnknown_0203AB70 = 0; static EWRAM_DATA u32 sBattleTowerMultiBattleTypeFlags = 0;
struct ListMenuTemplate gScrollableMultichoice_ListMenuTemplate; struct ListMenuTemplate gScrollableMultichoice_ListMenuTemplate;
@@ -128,7 +129,7 @@ static void ShowFrontierExchangeCornerItemIcon(u16 item);
static void Task_DeoxysRockInteraction(u8 taskId); static void Task_DeoxysRockInteraction(u8 taskId);
static void ChangeDeoxysRockLevel(u8 a0); static void ChangeDeoxysRockLevel(u8 a0);
static void WaitForDeoxysRockMovement(u8 taskId); static void WaitForDeoxysRockMovement(u8 taskId);
static void sub_813B57C(u8 taskId); static void Task_LinkRetireStatusWithBattleTowerPartner(u8 taskId);
static void Task_LoopWingFlapSE(u8 taskId); static void Task_LoopWingFlapSE(u8 taskId);
static void Task_CloseBattlePikeCurtain(u8 taskId); static void Task_CloseBattlePikeCurtain(u8 taskId);
static u8 DidPlayerGetFirstFans(void); static u8 DidPlayerGetFirstFans(void);
@@ -1701,10 +1702,10 @@ bool8 IsBadEggInParty(void)
return FALSE; return FALSE;
} }
bool8 InMultiBattleRoom(void) bool8 InMultiPartnerRoom(void)
{ {
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM) if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM)
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM) && && gSaveBlock1Ptr->location.mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM) &&
VarGet(VAR_FRONTIER_BATTLE_MODE) == FRONTIER_MODE_MULTIS) VarGet(VAR_FRONTIER_BATTLE_MODE) == FRONTIER_MODE_MULTIS)
return TRUE; return TRUE;
return FALSE; return FALSE;
@@ -3746,7 +3747,7 @@ bool32 ShouldDistributeEonTicket(void)
void sub_813B534(void) void sub_813B534(void)
{ {
sUnknown_0203AB70 = gBattleTypeFlags; sBattleTowerMultiBattleTypeFlags = gBattleTypeFlags;
gBattleTypeFlags = 0; gBattleTypeFlags = 0;
if (!gReceivedRemoteLinkPlayers) if (!gReceivedRemoteLinkPlayers)
{ {
@@ -3754,12 +3755,12 @@ void sub_813B534(void)
} }
} }
void sub_813B568(void) void LinkRetireStatusWithBattleTowerPartner(void)
{ {
CreateTask(sub_813B57C, 5); CreateTask(Task_LinkRetireStatusWithBattleTowerPartner, 5);
} }
static void sub_813B57C(u8 taskId) static void Task_LinkRetireStatusWithBattleTowerPartner(u8 taskId)
{ {
switch (gTasks[taskId].data[0]) switch (gTasks[taskId].data[0])
{ {
@@ -3790,21 +3791,24 @@ static void sub_813B57C(u8 taskId)
{ {
gSpecialVar_0x8005 = gBlockRecvBuffer[1][0]; gSpecialVar_0x8005 = gBlockRecvBuffer[1][0];
ResetBlockReceivedFlag(1); ResetBlockReceivedFlag(1);
if (gSpecialVar_0x8004 == 1 && gSpecialVar_0x8005 == 1) if (gSpecialVar_0x8004 == BATTLE_TOWER_LINK_RETIRE
&& gSpecialVar_0x8005 == BATTLE_TOWER_LINK_RETIRE)
{ {
gSpecialVar_Result = 1; gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_BOTH_RETIRE;
} }
else if (gSpecialVar_0x8004 == 0 && gSpecialVar_0x8005 == 1) else if (gSpecialVar_0x8004 == BATTLE_TOWER_LINK_CONTINUE
&& gSpecialVar_0x8005 == BATTLE_TOWER_LINK_RETIRE)
{ {
gSpecialVar_Result = 2; gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_PARTNER_RETIRE;
} }
else if (gSpecialVar_0x8004 == 1 && gSpecialVar_0x8005 == 0) else if (gSpecialVar_0x8004 == BATTLE_TOWER_LINK_RETIRE
&& gSpecialVar_0x8005 == BATTLE_TOWER_LINK_CONTINUE)
{ {
gSpecialVar_Result = 3; gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_PLAYER_RETIRE;
} }
else else
{ {
gSpecialVar_Result = 0; gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_CONTINUE;
} }
} }
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
@@ -3842,14 +3846,14 @@ static void sub_813B57C(u8 taskId)
case 5: case 5:
if (GetMultiplayerId() == 0) if (GetMultiplayerId() == 0)
{ {
if (gSpecialVar_Result == 2) if (gSpecialVar_Result == BATTLE_TOWER_LINKSTAT_PARTNER_RETIRE)
{ {
ShowFieldAutoScrollMessage(gText_YourPartnerHasRetired); ShowFieldAutoScrollMessage(gText_YourPartnerHasRetired);
} }
} }
else else
{ {
if (gSpecialVar_Result == 3) if (gSpecialVar_Result == BATTLE_TOWER_LINKSTAT_PLAYER_RETIRE)
{ {
ShowFieldAutoScrollMessage(gText_YourPartnerHasRetired); ShowFieldAutoScrollMessage(gText_YourPartnerHasRetired);
} }
@@ -3880,7 +3884,7 @@ static void sub_813B57C(u8 taskId)
{ {
sub_800AC34(); sub_800AC34();
} }
gBattleTypeFlags = sUnknown_0203AB70; gBattleTypeFlags = sBattleTowerMultiBattleTypeFlags;
EnableBothScriptContexts(); EnableBothScriptContexts();
DestroyTask(taskId); DestroyTask(taskId);
break; break;
src/fieldmap.c
+1 -1
View File
@@ -859,7 +859,7 @@ int sub_8088A4C(struct MapConnection *connection, int x, int y)
return FALSE; return FALSE;
} }
struct MapConnection *sub_8088A8C(s16 x, s16 y) struct MapConnection *GetConnectionAtCoords(s16 x, s16 y)
{ {
int count; int count;
struct MapConnection *connection; struct MapConnection *connection;
src/fldeff_dig.c
+1 -1
View File
@@ -57,7 +57,7 @@ static void sub_8135780(void)
} }
else else
{ {
taskId = CreateTask(task08_080A1C44, 8); taskId = CreateTask(Task_UseDigEscapeRopeOnField, 8);
gTasks[taskId].data[0] = 0; gTasks[taskId].data[0] = 0;
} }
} }
src/frontier_pass.c
+1 -1
View File
@@ -1531,7 +1531,7 @@ static void Task_HandleFrontierMap(u8 taskId)
static u8 MapNumToFrontierFacilityId(u16 mapNum) // id + 1, zero means not a frontier map number static u8 MapNumToFrontierFacilityId(u16 mapNum) // id + 1, zero means not a frontier map number
{ {
if ((mapNum >= MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_LOBBY) && mapNum <= MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM)) if ((mapNum >= MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_LOBBY) && mapNum <= MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM))
|| (mapNum >= MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM) && mapNum <= MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2))) || (mapNum >= MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM) && mapNum <= MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM)))
return FRONTIER_FACILITY_TOWER + 1; return FRONTIER_FACILITY_TOWER + 1;
else if (mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_DOME_LOBBY) else if (mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_DOME_LOBBY)
|| mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR) || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR)
src/frontier_util.c
+5 -5
View File
@@ -840,8 +840,8 @@ static void GetFrontierData(void)
gSpecialVar_Result = gBattleOutcome; gSpecialVar_Result = gBattleOutcome;
gBattleOutcome = 0; gBattleOutcome = 0;
break; break;
case FRONTIER_DATA_6: case FRONTIER_DATA_RECORD_DISABLED:
gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_CA9_b; gSpecialVar_Result = gSaveBlock2Ptr->frontier.disableRecordBattle;
break; break;
case FRONTIER_DATA_HEARD_BRAIN_SPEECH: case FRONTIER_DATA_HEARD_BRAIN_SPEECH:
gSpecialVar_Result = gSaveBlock2Ptr->frontier.battledBrainFlags & sBattledBrainBitFlags[facility][hasSymbol]; gSpecialVar_Result = gSaveBlock2Ptr->frontier.battledBrainFlags & sBattledBrainBitFlags[facility][hasSymbol];
@@ -875,8 +875,8 @@ static void SetFrontierData(void)
for (i = 0; i < MAX_FRONTIER_PARTY_SIZE; i++) for (i = 0; i < MAX_FRONTIER_PARTY_SIZE; i++)
gSaveBlock2Ptr->frontier.selectedPartyMons[i] = gSelectedOrderFromParty[i]; gSaveBlock2Ptr->frontier.selectedPartyMons[i] = gSelectedOrderFromParty[i];
break; break;
case FRONTIER_DATA_6: case FRONTIER_DATA_RECORD_DISABLED:
gSaveBlock2Ptr->frontier.field_CA9_b = gSpecialVar_0x8006; gSaveBlock2Ptr->frontier.disableRecordBattle = gSpecialVar_0x8006;
break; break;
case FRONTIER_DATA_HEARD_BRAIN_SPEECH: case FRONTIER_DATA_HEARD_BRAIN_SPEECH:
gSaveBlock2Ptr->frontier.battledBrainFlags |= sBattledBrainBitFlags[facility][hasSymbol]; gSaveBlock2Ptr->frontier.battledBrainFlags |= sBattledBrainBitFlags[facility][hasSymbol];
@@ -2173,7 +2173,7 @@ static void RestoreHeldItems(void)
static void SaveRecordBattle(void) static void SaveRecordBattle(void)
{ {
gSpecialVar_Result = MoveRecordedBattleToSaveData(); gSpecialVar_Result = MoveRecordedBattleToSaveData();
gSaveBlock2Ptr->frontier.field_CA9_b = 1; gSaveBlock2Ptr->frontier.disableRecordBattle = TRUE;
} }
static void BufferFrontierTrainerName(void) static void BufferFrontierTrainerName(void)
src/item_menu.c
+27 -21
View File
@@ -136,7 +136,7 @@ void ItemMenu_Give(u8 taskId);
void ItemMenu_Cancel(u8 taskId); void ItemMenu_Cancel(u8 taskId);
void ItemMenu_UseInBattle(u8 taskId); void ItemMenu_UseInBattle(u8 taskId);
void ItemMenu_CheckTag(u8 taskId); void ItemMenu_CheckTag(u8 taskId);
void unknown_ItemMenu_Confirm(u8 taskId); void Task_FadeAndCloseBagMenu(u8 taskId);
void unknown_ItemMenu_Show(u8 taskId); void unknown_ItemMenu_Show(u8 taskId);
void unknown_ItemMenu_Give2(u8 taskId); void unknown_ItemMenu_Give2(u8 taskId);
void unknown_ItemMenu_Confirm2(u8 taskId); void unknown_ItemMenu_Confirm2(u8 taskId);
@@ -216,7 +216,7 @@ const struct MenuAction sItemMenuActions[] = {
{gMenuText_Walk, ItemMenu_UseOutOfBattle}, {gMenuText_Walk, ItemMenu_UseOutOfBattle},
{gMenuText_Deselect, ItemMenu_Register}, {gMenuText_Deselect, ItemMenu_Register},
{gMenuText_CheckTag, ItemMenu_CheckTag}, {gMenuText_CheckTag, ItemMenu_CheckTag},
{gMenuText_Confirm, unknown_ItemMenu_Confirm}, {gMenuText_Confirm, Task_FadeAndCloseBagMenu},
{gMenuText_Show, unknown_ItemMenu_Show}, {gMenuText_Show, unknown_ItemMenu_Show},
{gMenuText_Give2, unknown_ItemMenu_Give2}, {gMenuText_Give2, unknown_ItemMenu_Give2},
{gMenuText_Confirm, unknown_ItemMenu_Confirm2}, {gMenuText_Confirm, unknown_ItemMenu_Confirm2},
@@ -241,7 +241,7 @@ const TaskFunc gUnknown_08614054[] = {
unknown_item_menu_type, unknown_item_menu_type,
item_menu_type_2, item_menu_type_2,
DisplaySellItemAskString, DisplaySellItemAskString,
unknown_ItemMenu_Confirm, Task_FadeAndCloseBagMenu,
unknown_item_menu_type, unknown_item_menu_type,
DisplayDepositItemAskString, DisplayDepositItemAskString,
unknown_item_menu_type, unknown_item_menu_type,
@@ -942,7 +942,7 @@ void FreeBagItemListBuffers(void)
Free(gBagMenu); Free(gBagMenu);
} }
void unknown_ItemMenu_Confirm(u8 taskId) void Task_FadeAndCloseBagMenu(u8 taskId)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
gTasks[taskId].func = TaskCloseBagMenu_2; gTasks[taskId].func = TaskCloseBagMenu_2;
@@ -966,7 +966,7 @@ void TaskCloseBagMenu_2(u8 taskId)
} }
} }
void sub_81AB9A8(u8 pocketId) void UpdatePocketItemList(u8 pocketId)
{ {
u16 i; u16 i;
struct BagPocket *pocket = &gBagPockets[pocketId]; struct BagPocket *pocket = &gBagPockets[pocketId];
@@ -997,7 +997,7 @@ void sub_81ABA6C(void)
{ {
u8 i; u8 i;
for (i = 0; i < POCKETS_COUNT; i++) for (i = 0; i < POCKETS_COUNT; i++)
sub_81AB9A8(i); UpdatePocketItemList(i);
} }
void SetInitialScrollAndCursorPositions(u8 pocketId) void SetInitialScrollAndCursorPositions(u8 pocketId)
@@ -1041,7 +1041,7 @@ void BagMenu_InitListsMenu(u8 taskId)
u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]; u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket];
bag_menu_RemoveBagItem_message_window(4); bag_menu_RemoveBagItem_message_window(4);
DestroyListMenuTask(data[0], scrollPos, cursorPos); DestroyListMenuTask(data[0], scrollPos, cursorPos);
sub_81AB9A8(gBagPositionStruct.pocket); UpdatePocketItemList(gBagPositionStruct.pocket);
SetInitialScrollAndCursorPositions(gBagPositionStruct.pocket); SetInitialScrollAndCursorPositions(gBagPositionStruct.pocket);
LoadBagItemListBuffers(gBagPositionStruct.pocket); LoadBagItemListBuffers(gBagPositionStruct.pocket);
data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos);
@@ -1117,7 +1117,7 @@ void Task_BagMenu(u8 taskId)
} }
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
gSpecialVar_ItemId = select; gSpecialVar_ItemId = select;
gTasks[taskId].func = unknown_ItemMenu_Confirm; gTasks[taskId].func = Task_FadeAndCloseBagMenu;
break; break;
default: // A_BUTTON default: // A_BUTTON
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
@@ -1744,7 +1744,7 @@ void Task_ActuallyToss(u8 taskId)
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
RemoveBagItem(gSpecialVar_ItemId, data[8]); RemoveBagItem(gSpecialVar_ItemId, data[8]);
DestroyListMenuTask(data[0], scrollPos, cursorPos); DestroyListMenuTask(data[0], scrollPos, cursorPos);
sub_81AB9A8(gBagPositionStruct.pocket); UpdatePocketItemList(gBagPositionStruct.pocket);
SetInitialScrollAndCursorPositions(gBagPositionStruct.pocket); SetInitialScrollAndCursorPositions(gBagPositionStruct.pocket);
LoadBagItemListBuffers(gBagPositionStruct.pocket); LoadBagItemListBuffers(gBagPositionStruct.pocket);
data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos);
@@ -1784,7 +1784,7 @@ void ItemMenu_Give(u8 taskId)
else else
{ {
gBagMenu->mainCallback2 = CB2_ChooseMonToGiveItem; gBagMenu->mainCallback2 = CB2_ChooseMonToGiveItem;
unknown_ItemMenu_Confirm(taskId); Task_FadeAndCloseBagMenu(taskId);
} }
} }
else else
@@ -1817,7 +1817,7 @@ void sub_81AD350(u8 taskId)
void ItemMenu_CheckTag(u8 taskId) void ItemMenu_CheckTag(u8 taskId)
{ {
gBagMenu->mainCallback2 = DoBerryTagScreen; gBagMenu->mainCallback2 = DoBerryTagScreen;
unknown_ItemMenu_Confirm(taskId); Task_FadeAndCloseBagMenu(taskId);
} }
void ItemMenu_Cancel(u8 taskId) void ItemMenu_Cancel(u8 taskId)
@@ -1841,7 +1841,7 @@ void ItemMenu_UseInBattle(u8 taskId)
} }
} }
void bag_menu_mail_related(void) void CB2_ReturnToBagMenuPocket(void)
{ {
GoToBagMenu(RETURN_LOCATION_UNCHANGED, POCKETS_COUNT, NULL); GoToBagMenu(RETURN_LOCATION_UNCHANGED, POCKETS_COUNT, NULL);
} }
@@ -1860,7 +1860,7 @@ void item_menu_type_2(u8 taskId)
} }
else if (gBagPositionStruct.pocket != KEYITEMS_POCKET && !ItemId_GetImportance(gSpecialVar_ItemId)) else if (gBagPositionStruct.pocket != KEYITEMS_POCKET && !ItemId_GetImportance(gSpecialVar_ItemId))
{ {
unknown_ItemMenu_Confirm(taskId); Task_FadeAndCloseBagMenu(taskId);
} }
else else
{ {
@@ -1873,16 +1873,18 @@ void item_menu_type_b(u8 taskId)
if (ItemIsMail(gSpecialVar_ItemId) == TRUE) if (ItemIsMail(gSpecialVar_ItemId) == TRUE)
DisplayItemMessage(taskId, 1, gText_CantWriteMail, sub_81AD350); DisplayItemMessage(taskId, 1, gText_CantWriteMail, sub_81AD350);
else if (gBagPositionStruct.pocket != KEYITEMS_POCKET && !ItemId_GetImportance(gSpecialVar_ItemId)) else if (gBagPositionStruct.pocket != KEYITEMS_POCKET && !ItemId_GetImportance(gSpecialVar_ItemId))
gTasks[taskId].func = unknown_ItemMenu_Confirm; gTasks[taskId].func = Task_FadeAndCloseBagMenu;
else else
BagMenu_PrintItemCantBeHeld(taskId); BagMenu_PrintItemCantBeHeld(taskId);
} }
#define tUsingRegisteredKeyItem data[3]
bool8 UseRegisteredKeyItemOnField(void) bool8 UseRegisteredKeyItemOnField(void)
{ {
u8 taskId; u8 taskId;
if (InUnionRoom() == TRUE || InBattlePyramid() || InBattlePike() || InMultiBattleRoom() == TRUE) if (InUnionRoom() == TRUE || InBattlePyramid() || InBattlePike() || InMultiPartnerRoom() == TRUE)
return FALSE; return FALSE;
HideMapNamePopUpWindow(); HideMapNamePopUpWindow();
ChangeBgY_ScreenOff(0, 0, 0); ChangeBgY_ScreenOff(0, 0, 0);
@@ -1896,16 +1898,20 @@ bool8 UseRegisteredKeyItemOnField(void)
sub_808BCF4(); sub_808BCF4();
gSpecialVar_ItemId = gSaveBlock1Ptr->registeredItem; gSpecialVar_ItemId = gSaveBlock1Ptr->registeredItem;
taskId = CreateTask(ItemId_GetFieldFunc(gSaveBlock1Ptr->registeredItem), 8); taskId = CreateTask(ItemId_GetFieldFunc(gSaveBlock1Ptr->registeredItem), 8);
gTasks[taskId].data[3] = 1; gTasks[taskId].tUsingRegisteredKeyItem = TRUE;
return TRUE; return TRUE;
} }
else else
{
gSaveBlock1Ptr->registeredItem = ITEM_NONE; gSaveBlock1Ptr->registeredItem = ITEM_NONE;
}
} }
ScriptContext1_SetupScript(EventScript_SelectWithoutRegisteredItem); ScriptContext1_SetupScript(EventScript_SelectWithoutRegisteredItem);
return TRUE; return TRUE;
} }
#undef tUsingRegisteredKeyItem
void DisplaySellItemAskString(u8 taskId) void DisplaySellItemAskString(u8 taskId)
{ {
s16* data = gTasks[taskId].data; s16* data = gTasks[taskId].data;
@@ -2012,7 +2018,7 @@ void sub_81AD8C8(u8 taskId)
RemoveBagItem(gSpecialVar_ItemId, data[8]); RemoveBagItem(gSpecialVar_ItemId, data[8]);
AddMoney(&gSaveBlock1Ptr->money, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * data[8]); AddMoney(&gSaveBlock1Ptr->money, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * data[8]);
DestroyListMenuTask(data[0], scrollPos, cursorPos); DestroyListMenuTask(data[0], scrollPos, cursorPos);
sub_81AB9A8(gBagPositionStruct.pocket); UpdatePocketItemList(gBagPositionStruct.pocket);
SetInitialScrollAndCursorPositions(gBagPositionStruct.pocket); SetInitialScrollAndCursorPositions(gBagPositionStruct.pocket);
LoadBagItemListBuffers(gBagPositionStruct.pocket); LoadBagItemListBuffers(gBagPositionStruct.pocket);
data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos);
@@ -2186,7 +2192,7 @@ void Task_WallyTutorialBagMenu(u8 taskId)
BagMenu_RemoveSomeWindow(); BagMenu_RemoveSomeWindow();
DestroyListMenuTask(data[0], 0, 0); DestroyListMenuTask(data[0], 0, 0);
RestoreBagAfterWallyTutorial(); RestoreBagAfterWallyTutorial();
unknown_ItemMenu_Confirm(taskId); Task_FadeAndCloseBagMenu(taskId);
break; break;
default: default:
data[8]++; data[8]++;
@@ -2200,7 +2206,7 @@ void unknown_ItemMenu_Show(u8 taskId)
gSpecialVar_0x8005 = gSpecialVar_ItemId; gSpecialVar_0x8005 = gSpecialVar_ItemId;
gSpecialVar_Result = 1; gSpecialVar_Result = 1;
BagMenu_RemoveSomeWindow(); BagMenu_RemoveSomeWindow();
unknown_ItemMenu_Confirm(taskId); Task_FadeAndCloseBagMenu(taskId);
} }
void CB2_ApprenticeExitBagMenu(void) void CB2_ApprenticeExitBagMenu(void)
@@ -2214,7 +2220,7 @@ void unknown_ItemMenu_Give2(u8 taskId)
RemoveBagItem(gSpecialVar_ItemId, 1); RemoveBagItem(gSpecialVar_ItemId, 1);
gSpecialVar_Result = 1; gSpecialVar_Result = 1;
BagMenu_RemoveSomeWindow(); BagMenu_RemoveSomeWindow();
unknown_ItemMenu_Confirm(taskId); Task_FadeAndCloseBagMenu(taskId);
} }
void CB2_FavorLadyExitBagMenu(void) void CB2_FavorLadyExitBagMenu(void)
@@ -2227,7 +2233,7 @@ void unknown_ItemMenu_Confirm2(u8 taskId)
{ {
gSpecialVar_Result = 1; gSpecialVar_Result = 1;
BagMenu_RemoveSomeWindow(); BagMenu_RemoveSomeWindow();
unknown_ItemMenu_Confirm(taskId); Task_FadeAndCloseBagMenu(taskId);
} }
void CB2_QuizLadyExitBagMenu(void) void CB2_QuizLadyExitBagMenu(void)
src/item_use.c
+258 -232
View File
File diff suppressed because it is too large Load Diff
src/overworld.c
+3 -3
View File
@@ -978,7 +978,7 @@ static u16 GetCenterScreenMetatileBehavior(void)
bool32 Overworld_IsBikingAllowed(void) bool32 Overworld_IsBikingAllowed(void)
{ {
if (!(gMapHeader.flags & 1)) if (!(gMapHeader.flags & MAP_ALLOW_BIKE))
return FALSE; return FALSE;
else else
return TRUE; return TRUE;
@@ -1702,7 +1702,7 @@ void sub_80861E8(void)
static void sub_8086204(void) static void sub_8086204(void)
{ {
if ((gMapHeader.flags & 0xF8) == 8 && SecretBaseMapPopupEnabled() == TRUE) if (SHOW_MAP_NAME_ENABLED && SecretBaseMapPopupEnabled() == TRUE)
ShowMapNamePopup(); ShowMapNamePopup();
FieldCB_WarpExitFadeFromBlack(); FieldCB_WarpExitFadeFromBlack();
} }
@@ -1948,7 +1948,7 @@ static bool32 load_map_stuff(u8 *state, u32 a2)
(*state)++; (*state)++;
break; break;
case 11: case 11:
if ((gMapHeader.flags & 0xF8) == 8 && SecretBaseMapPopupEnabled() == TRUE) if (SHOW_MAP_NAME_ENABLED && SecretBaseMapPopupEnabled() == TRUE)
ShowMapNamePopup(); ShowMapNamePopup();
(*state)++; (*state)++;
break; break;
src/party_menu.c
+2 -2
View File
@@ -2572,7 +2572,7 @@ static u8 GetPartyMenuActionsType(struct Pokemon *mon)
switch (gPartyMenu.menuType) switch (gPartyMenu.menuType)
{ {
case PARTY_MENU_TYPE_FIELD: case PARTY_MENU_TYPE_FIELD:
if (InMultiBattleRoom() == TRUE || GetMonData(mon, MON_DATA_IS_EGG)) if (InMultiPartnerRoom() == TRUE || GetMonData(mon, MON_DATA_IS_EGG))
actionType = ACTIONS_SWITCH; actionType = ACTIONS_SWITCH;
else else
actionType = ACTIONS_NONE; // actions populated by SetPartyMonFieldSelectionActions actionType = ACTIONS_NONE; // actions populated by SetPartyMonFieldSelectionActions
@@ -5186,7 +5186,7 @@ u8 GetItemEffectType(u16 item)
else else
itemEffect = gItemEffectTable[item - ITEM_POTION]; itemEffect = gItemEffectTable[item - ITEM_POTION];
if ((itemEffect[0] & (ITEM0_HIGH_CRIT | ITEM0_X_ATTACK)) || itemEffect[1] || itemEffect[2] || (itemEffect[3] & ITEM3_MIST)) if ((itemEffect[0] & (ITEM0_DIRE_HIT | ITEM0_X_ATTACK)) || itemEffect[1] || itemEffect[2] || (itemEffect[3] & ITEM3_GUARD_SPEC))
return ITEM_EFFECT_X_ITEM; return ITEM_EFFECT_X_ITEM;
else if (itemEffect[0] & ITEM0_SACRED_ASH) else if (itemEffect[0] & ITEM0_SACRED_ASH)
return ITEM_EFFECT_SACRED_ASH; return ITEM_EFFECT_SACRED_ASH;
src/pokeblock.c
+1 -1
View File
@@ -451,7 +451,7 @@ void OpenPokeblockCase(u8 caseId, void (*callback)(void))
sPokeblockMenu->pokeblockOptionsIds = sActionsWhenGivingToLady; sPokeblockMenu->pokeblockOptionsIds = sActionsWhenGivingToLady;
sPokeblockMenu->optionsNo = ARRAY_COUNT(sActionsWhenGivingToLady); sPokeblockMenu->optionsNo = ARRAY_COUNT(sActionsWhenGivingToLady);
break; break;
default: default: // PBLOCK_CASE_FIELD
sPokeblockMenu->pokeblockOptionsIds = sActionsOnField; sPokeblockMenu->pokeblockOptionsIds = sActionsOnField;
sPokeblockMenu->optionsNo = ARRAY_COUNT(sActionsOnField); sPokeblockMenu->optionsNo = ARRAY_COUNT(sActionsOnField);
break; break;
src/pokemon.c
+14 -12
View File
@@ -2043,7 +2043,8 @@ static const u8 sGetMonDataEVConstants[] =
MON_DATA_SPATK_EV MON_DATA_SPATK_EV
}; };
static const u8 gUnknown_08329EC8[] = // For stat-raising items
static const u8 sStatsToRaise[] =
{ {
STAT_ATK, STAT_ATK, STAT_SPEED, STAT_DEF, STAT_SPATK, STAT_ACC STAT_ATK, STAT_ATK, STAT_SPEED, STAT_DEF, STAT_SPATK, STAT_ACC
}; };
@@ -4691,7 +4692,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
gBattleMons[battlerId].status2 &= ~STATUS2_INFATUATION; gBattleMons[battlerId].status2 &= ~STATUS2_INFATUATION;
retVal = FALSE; retVal = FALSE;
} }
if ((itemEffect[cmdIndex] & ITEM0_HIGH_CRIT) if ((itemEffect[cmdIndex] & ITEM0_DIRE_HIT)
&& !(gBattleMons[gActiveBattler].status2 & STATUS2_FOCUS_ENERGY)) && !(gBattleMons[gActiveBattler].status2 & STATUS2_FOCUS_ENERGY))
{ {
gBattleMons[gActiveBattler].status2 |= STATUS2_FOCUS_ENERGY; gBattleMons[gActiveBattler].status2 |= STATUS2_FOCUS_ENERGY;
@@ -4745,7 +4746,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
} }
break; break;
case 3: case 3:
if ((itemEffect[cmdIndex] & ITEM3_MIST) if ((itemEffect[cmdIndex] & ITEM3_GUARD_SPEC)
&& gSideTimers[GetBattlerSide(gActiveBattler)].mistTimer == 0) && gSideTimers[GetBattlerSide(gActiveBattler)].mistTimer == 0)
{ {
gSideTimers[GetBattlerSide(gActiveBattler)].mistTimer = 5; gSideTimers[GetBattlerSide(gActiveBattler)].mistTimer = 5;
@@ -5285,15 +5286,15 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit)
return offset; return offset;
} }
static void sub_806CF24(s32 arg0) static void BufferStatRoseMessage(s32 arg0)
{ {
gBattlerTarget = gBattlerInMenuId; gBattlerTarget = gBattlerInMenuId;
StringCopy(gBattleTextBuff1, gStatNamesTable[gUnknown_08329EC8[arg0]]); StringCopy(gBattleTextBuff1, gStatNamesTable[sStatsToRaise[arg0]]);
StringCopy(gBattleTextBuff2, gText_StatRose); StringCopy(gBattleTextBuff2, gText_StatRose);
BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnsStatChanged2); BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnsStatChanged2);
} }
u8 *sub_806CF78(u16 itemId) u8 *UseStatIncreaseItem(u16 itemId)
{ {
int i; int i;
const u8 *itemEffect; const u8 *itemEffect;
@@ -5314,13 +5315,14 @@ u8 *sub_806CF78(u16 itemId)
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
if (itemEffect[i] & 0xF) if (itemEffect[i] & (ITEM0_X_ATTACK | ITEM1_X_SPEED | ITEM2_X_SPATK))
sub_806CF24(i * 2); BufferStatRoseMessage(i * 2);
if (itemEffect[i] & 0xF0)
if (itemEffect[i] & (ITEM0_DIRE_HIT | ITEM1_X_DEFEND | ITEM2_X_ACCURACY))
{ {
if (i) if (i != 0) // Dire Hit is the only ITEM0 above
{ {
sub_806CF24(i * 2 + 1); BufferStatRoseMessage(i * 2 + 1);
} }
else else
{ {
@@ -5330,7 +5332,7 @@ u8 *sub_806CF78(u16 itemId)
} }
} }
if (itemEffect[3] & ITEM3_MIST) if (itemEffect[3] & ITEM3_GUARD_SPEC)
{ {
gBattlerAttacker = gBattlerInMenuId; gBattlerAttacker = gBattlerInMenuId;
BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnShroudedInMist); BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnShroudedInMist);
src/region_map.c
+1 -1
View File
@@ -997,7 +997,7 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void)
break; break;
case MAP_TYPE_UNDERGROUND: case MAP_TYPE_UNDERGROUND:
case MAP_TYPE_UNUSED_2: case MAP_TYPE_UNUSED_2:
if (gMapHeader.flags & 0x02) if (gMapHeader.flags & MAP_ALLOW_ESCAPE_ROPE)
{ {
mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->escapeWarp.mapGroup, gSaveBlock1Ptr->escapeWarp.mapNum); mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->escapeWarp.mapGroup, gSaveBlock1Ptr->escapeWarp.mapNum);
gRegionMap->mapSecId = mapHeader->regionMapSectionId; gRegionMap->mapSecId = mapHeader->regionMapSectionId;
src/secret_base.c
+1
View File
@@ -16,6 +16,7 @@
#include "fldeff.h" #include "fldeff.h"
#include "fldeff_misc.h" #include "fldeff_misc.h"
#include "international_string_util.h" #include "international_string_util.h"
#include "item_menu.h"
#include "link.h" #include "link.h"
#include "list_menu.h" #include "list_menu.h"
#include "main.h" #include "main.h"
src/start_menu.c
+4 -4
View File
@@ -201,7 +201,7 @@ static void BuildLinkModeStartMenu(void);
static void BuildUnionRoomStartMenu(void); static void BuildUnionRoomStartMenu(void);
static void BuildBattlePikeStartMenu(void); static void BuildBattlePikeStartMenu(void);
static void BuildBattlePyramidStartMenu(void); static void BuildBattlePyramidStartMenu(void);
static void BuildMultiBattleRoomStartMenu(void); static void BuildMultiPartnerRoomStartMenu(void);
static void ShowSafariBallsWindow(void); static void ShowSafariBallsWindow(void);
static void ShowPyramidFloorWindow(void); static void ShowPyramidFloorWindow(void);
static void RemoveExtraStartMenuWindows(void); static void RemoveExtraStartMenuWindows(void);
@@ -256,9 +256,9 @@ static void BuildStartMenuActions(void)
{ {
BuildBattlePyramidStartMenu(); BuildBattlePyramidStartMenu();
} }
else if (InMultiBattleRoom()) else if (InMultiPartnerRoom())
{ {
BuildMultiBattleRoomStartMenu(); BuildMultiPartnerRoomStartMenu();
} }
else else
{ {
@@ -356,7 +356,7 @@ static void BuildBattlePyramidStartMenu(void)
AddStartMenuAction(MENU_ACTION_EXIT); AddStartMenuAction(MENU_ACTION_EXIT);
} }
static void BuildMultiBattleRoomStartMenu(void) static void BuildMultiPartnerRoomStartMenu(void)
{ {
AddStartMenuAction(MENU_ACTION_POKEMON); AddStartMenuAction(MENU_ACTION_POKEMON);
AddStartMenuAction(MENU_ACTION_PLAYER); AddStartMenuAction(MENU_ACTION_PLAYER);