diff options
25 files changed, 633 insertions, 590 deletions
diff --git a/asm/macros/battle_frontier/battle_arena.inc b/asm/macros/battle_frontier/battle_arena.inc index c7294145f..b54ab3c25 100644 --- a/asm/macros/battle_frontier/battle_arena.inc +++ b/asm/macros/battle_frontier/battle_arena.inc @@ -1 +1,47 @@ @ To be populated with macros for CallBattleArenaFunction + + @ Initialize the Battle Arena challenge + .macro arena_init + setvar VAR_0x8004, BATTLE_ARENA_FUNC_INIT + special CallBattleArenaFunction + .endm + + @ Unused. Get the value of some ARENA_DATA_*. See GetArenaData for the data types that can be retrieved + .macro arena_get data:req + setvar VAR_0x8004, BATTLE_ARENA_FUNC_GET_DATA + setvar VAR_0x8005, \data + special CallBattleArenaFunction + .endm + + @ Set some ARENA_DATA_* to val. See SetArenaData for the data types that can be set + .macro arena_set data:req, val:req + setvar VAR_0x8004, BATTLE_ARENA_FUNC_SET_DATA + setvar VAR_0x8005, \data + setvar VAR_0x8006, \val + special CallBattleArenaFunction + .endm + + @ Save the game and set the challenge status + .macro arena_save challengeStatus:req + setvar VAR_0x8004, BATTLE_ARENA_FUNC_SAVE + setvar VAR_0x8005, \challengeStatus + special CallBattleArenaFunction + .endm + + @ Unused. Set the reward item to give from one of two lists of possible awards, depending on streak. + .macro arena_setreward + setvar VAR_0x8004, BATTLE_ARENA_FUNC_SET_REWARD + special CallBattleArenaFunction + .endm + + @ Unused. Give the set award item to the player. TRUE if room in Bag for award, FALSE otherwise + .macro arena_givereward + setvar VAR_0x8004, BATTLE_ARENA_FUNC_GIVE_REWARD + special CallBattleArenaFunction + .endm + + @ Buffer the opponents name to STR_VAR_1 + .macro arena_gettrainername + setvar VAR_0x8004, BATTLE_ARENA_FUNC_GET_TRAINER_NAME + special CallBattleArenaFunction + .endm diff --git a/asm/macros/battle_frontier/battle_palace.inc b/asm/macros/battle_frontier/battle_palace.inc index e9a61c952..2b59fd734 100644 --- a/asm/macros/battle_frontier/battle_palace.inc +++ b/asm/macros/battle_frontier/battle_palace.inc @@ -1 +1,7 @@ @ To be populated with macros for CallBattlePalaceFunction + + @ Buffer the opponents intro speech to gStringVar4. Also used by Battle Arena and Factory + .macro palace_getopponentintro + setvar VAR_0x8004, BATTLE_PALACE_FUNC_GET_OPPONENT_INTRO + special CallBattlePalaceFunction + .endm diff --git a/data/event_scripts.s b/data/event_scripts.s index 3600c95a0..1167562ce 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,7 +1,9 @@ #include "constants/global.h" #include "constants/apprentice.h" #include "constants/battle.h" +#include "constants/battle_arena.h" #include "constants/battle_frontier.h" +#include "constants/battle_palace.h" #include "constants/battle_pike.h" #include "constants/battle_pyramid.h" #include "constants/battle_setup.h" diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index bce065d39..4090b6a49 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -1,394 +1,384 @@ BattleFrontier_BattleArenaBattleRoom_MapScripts:: @ 8257487 - map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0 - map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C - map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleArenaBattleRoom_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaBattleRoom_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaBattleRoom_OnWarp + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleArenaBattleRoom_OnResume .byte 0 -BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C: @ 825749C + @ On this map the player (OBJ_EVENT_ID_PLAYER) is hidden + @ The player is represented instead by object event 8, which has the gfx id VAR_OBJ_GFX_ID_1 + +BattleFrontier_BattleArenaBattleRoom_OnResume: @ 825749C special OffsetCameraForBattle end -BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0 +BattleFrontier_BattleArenaBattleRoom_OnTransition: @ 82574A0 frontier_settrainers - call BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE + call BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfx end -BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE +BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfx:: @ 82574AE checkplayergender compare VAR_RESULT, MALE - goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6 + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxMale compare VAR_RESULT, FEMALE - goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxFemale return -BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6:: @ 82574C6 +BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxMale:: @ 82574C6 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return -BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC:: @ 82574CC +BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxFemale:: @ 82574CC setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return -BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2: @ 82574D2 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC +BattleFrontier_BattleArenaBattleRoom_OnFrame: @ 82574D2 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom .2byte 0 -BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC +BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom:: @ 82574DC lockall showobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM - applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE2 + applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerEnter waitmovement 0 frontier_get FRONTIER_DATA_BATTLE_NUM compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25752E - applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08 - applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers + applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceDown + applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceLeft setvar VAR_TEMP_2, 1 frontier_set FRONTIER_DATA_6, 1 - goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + goto BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent -BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E +BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER special CallBattleTowerFunc addobject 7 - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BEF + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentEnter waitmovement 0 - applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 + applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown playse SE_W187 waitse waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C3D, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleArenaBattleRoom_Text_PlayerStepForward, MSGBOX_DEFAULT closemessage - applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE5 + applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForward waitmovement 0 - applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 + applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown playse SE_W187 waitse waitmovement 0 - setvar VAR_0x8004, 6 - special CallBattleArenaFunction - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C68, MSGBOX_DEFAULT + arena_gettrainername + msgbox BattleFrontier_BattleArenaBattleRoom_Text_OpponentStepForward, MSGBOX_DEFAULT closemessage - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2 + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForward waitmovement 0 - applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 + applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown playse SE_W187 waitse waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C93, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleArenaBattleRoom_Text_SetKOTourneyBegin, MSGBOX_DEFAULT closemessage - applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE5 - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2 + applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForward + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForward waitmovement 0 - setvar VAR_0x8004, 5 - special CallBattlePalaceFunction + palace_getopponentintro msgbox gStringVar4, MSGBOX_DEFAULT waitmessage - call BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C + call BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle switch VAR_RESULT - case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257630 - -BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB:: @ 82575DB - applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 - applymovement 1, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 - applymovement 2, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 - applymovement 3, BattleFrontier_BattleArenaBattleRoom_Movement_257C05 - applymovement 4, BattleFrontier_BattleArenaBattleRoom_Movement_257C05 + case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedOpponent +BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner:: @ 82575DB + applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown + applymovement 1, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown + applymovement 2, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown + applymovement 3, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp + applymovement 4, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp playse SE_W173 waitse waitmovement 0 - setvar VAR_0x8004, 6 - special CallBattleArenaFunction - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CCE, MSGBOX_DEFAULT - -BattleFrontier_BattleArenaBattleRoom_EventScript_257615:: @ 8257615 + arena_gettrainername + msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsOpponent, MSGBOX_DEFAULT +BattleFrontier_BattleArenaBattleRoom_EventScript_WarpToLobbyLost:: @ 8257615 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 waitstate -BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630 - call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 +BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedOpponent:: @ 8257630 + call BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner frontier_get FRONTIER_DATA_BATTLE_NUM addvar VAR_RESULT, 1 frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT switch VAR_RESULT - case 7, BattleFrontier_BattleArenaBattleRoom_EventScript_257852 - applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE7 - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BFA + case 7, BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon + applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerWalkBackToLine + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentExit waitmovement 0 removeobject 7 - applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08 - applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB + applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceDown + applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceLeft waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CE9, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleArenaBattleRoom_Text_MonsWillBeRestored, MSGBOX_DEFAULT special LoadPlayerParty special SavePlayerParty frontier_setpartyorder FRONTIER_PARTY_SIZE playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty - -BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0 +BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent:: @ 82576B0 frontier_getbrainstatus copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY - goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC + goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_TycoonUpNext frontier_get FRONTIER_DATA_BATTLE_NUM compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257870 + call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor2ndOpponent compare VAR_RESULT, 2 - call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257877 + call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor3rdOpponent compare VAR_RESULT, 3 - call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25787E + call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor4thOpponent compare VAR_RESULT, 4 - call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257885 + call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor5thOpponent compare VAR_RESULT, 5 - call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25788C + call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor6thOpponent compare VAR_RESULT, 6 - call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257893 + call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor7thOpponent call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257768 + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ProceedChallengeNoRecord multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 switch VAR_RESULT - case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_25783A - case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25779E - case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA - case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257808 - case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_ContinueChallenge + case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_AskRecordBattle + case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_AskPauseChallenge + case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent -BattleFrontier_BattleArenaBattleRoom_EventScript_257768:: @ 8257768 +BattleFrontier_BattleArenaBattleRoom_EventScript_ProceedChallengeNoRecord:: @ 8257768 multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 switch VAR_RESULT - case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_25783A - case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA - case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257808 - case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_ContinueChallenge + case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_AskPauseChallenge + case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent -BattleFrontier_BattleArenaBattleRoom_EventScript_25779E:: @ 825779E - message BattleFrontier_BattleArenaBattleRoom_Text_257F04 +BattleFrontier_BattleArenaBattleRoom_EventScript_AskRecordBattle:: @ 825779E + message BattleFrontier_BattleArenaBattleRoom_Text_RecordLastBattle waitmessage multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT - case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 - case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2577D0 - case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent + case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_RecordBattle + case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent -BattleFrontier_BattleArenaBattleRoom_EventScript_2577D0:: @ 82577D0 +BattleFrontier_BattleArenaBattleRoom_EventScript_RecordBattle:: @ 82577D0 call BattleFrontier_EventScript_SaveBattle - goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + goto BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent -BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA:: @ 82577DA - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257E6B, MSGBOX_YESNO +BattleFrontier_BattleArenaBattleRoom_EventScript_AskPauseChallenge:: @ 82577DA + msgbox BattleFrontier_BattleArenaBattleRoom_Text_SaveAndShutDown, MSGBOX_YESNO switch VAR_RESULT - case NO, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 - case YES, BattleFrontier_BattleArenaBattleRoom_EventScript_25789A - case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + case NO, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent + case YES, BattleFrontier_BattleArenaBattleRoom_EventScript_PauseChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent -BattleFrontier_BattleArenaBattleRoom_EventScript_257808:: @ 8257808 - message BattleFrontier_BattleArenaBattleRoom_Text_257E9E +BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge:: @ 8257808 + message BattleFrontier_BattleArenaBattleRoom_Text_RetireFromChallenge waitmessage multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT - case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 - case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257615 - case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent + case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_WarpToLobbyLost + case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent -BattleFrontier_BattleArenaBattleRoom_EventScript_25783A:: @ 825783A +BattleFrontier_BattleArenaBattleRoom_EventScript_ContinueChallenge:: @ 825783A closemessage - applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BED - applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257BED + applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight + applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight waitmovement 0 - goto BattleFrontier_BattleArenaBattleRoom_EventScript_25752E + goto BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers waitstate - -BattleFrontier_BattleArenaBattleRoom_EventScript_257852:: @ 8257852 +BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon:: @ 8257852 delay 60 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 waitstate -BattleFrontier_BattleArenaBattleRoom_EventScript_257870:: @ 8257870 - message BattleFrontier_BattleArenaBattleRoom_Text_257D17 +BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor2ndOpponent:: @ 8257870 + message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor2ndOpponent waitmessage return -BattleFrontier_BattleArenaBattleRoom_EventScript_257877:: @ 8257877 - message BattleFrontier_BattleArenaBattleRoom_Text_257D50 +BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor3rdOpponent:: @ 8257877 + message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor3rdOpponent waitmessage return -BattleFrontier_BattleArenaBattleRoom_EventScript_25787E:: @ 825787E - message BattleFrontier_BattleArenaBattleRoom_Text_257D88 +BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor4thOpponent:: @ 825787E + message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor4thOpponent waitmessage return -BattleFrontier_BattleArenaBattleRoom_EventScript_257885:: @ 8257885 - message BattleFrontier_BattleArenaBattleRoom_Text_257DC1 +BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor5thOpponent:: @ 8257885 + message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor5thOpponent waitmessage return -BattleFrontier_BattleArenaBattleRoom_EventScript_25788C:: @ 825788C - message BattleFrontier_BattleArenaBattleRoom_Text_257DF9 +BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor6thOpponent:: @ 825788C + message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor6thOpponent waitmessage return -BattleFrontier_BattleArenaBattleRoom_EventScript_257893:: @ 8257893 - message BattleFrontier_BattleArenaBattleRoom_Text_257E31 +BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor7thOpponent:: @ 8257893 + message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor7thOpponent waitmessage return -BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A - message BattleFrontier_BattleArenaBattleRoom_Text_257EDB +BattleFrontier_BattleArenaBattleRoom_EventScript_PauseChallenge:: @ 825789A + message BattleFrontier_BattleArenaBattleRoom_Text_SavingPleaseWait waitmessage - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 2 - special CallBattleArenaFunction + arena_save CHALLENGE_STATUS_PAUSED playse SE_SAVE waitse fadescreen 1 frontier_reset end -BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC:: @ 82578BC +BattleFrontier_BattleArenaBattleRoom_EventScript_TycoonUpNext:: @ 82578BC compare VAR_TEMP_2, 1 - goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257F45, MSGBOX_DEFAULT + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon + msgbox BattleFrontier_BattleArenaBattleRoom_Text_NowFaceTycoon, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 - -BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4:: @ 82578D4 - message BattleFrontier_BattleArenaBattleRoom_Text_257FBB +BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon:: @ 82578D4 + message BattleFrontier_BattleArenaBattleRoom_Text_PreparedForTycoon waitmessage call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25792B + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ProceedChallengeGretaNoRecord multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 switch VAR_RESULT - case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257961 - case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25779E - case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA - case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257808 - case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 + case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta + case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_AskRecordBattle + case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_AskPauseChallenge + case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon -BattleFrontier_BattleArenaBattleRoom_EventScript_25792B:: @ 825792B +BattleFrontier_BattleArenaBattleRoom_EventScript_ProceedChallengeGretaNoRecord:: @ 825792B multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 switch VAR_RESULT - case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257961 - case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA - case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257808 - case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 + case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta + case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_AskPauseChallenge + case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon -BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961 +BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta:: @ 8257961 call BattleFrontier_EventScript_SetBrainObjectGfx - applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BED - applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257BED + applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight + applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight waitmovement 0 - applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 + applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown playse SE_W187 waitse waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C3D, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleArenaBattleRoom_Text_PlayerStepForward, MSGBOX_DEFAULT closemessage - applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE4 + applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForwardLong waitmovement 0 - applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 + applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown playse SE_W187 waitse waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257FED, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleArenaBattleRoom_Text_MakeWayForGreta, MSGBOX_DEFAULT closemessage addobject 7 - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF4 + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_GretaEnter waitmovement 0 - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2 + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForward waitmovement 0 switch VAR_TEMP_F - case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5 - case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F - case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 + case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleArenaBattleRoom_EventScript_IntroGretaGold + case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaSilver + case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaGold frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH compare VAR_RESULT, FALSE - goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F - msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, MSGBOX_DEFAULT + goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaSilver + msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaYoureChallenger, MSGBOX_DEFAULT closemessage frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30 + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_GretaLookAroundPlayer waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_25804E, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleArenaBattleRoom_Text_IsThatRight, MSGBOX_DEFAULT closemessage - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C3A + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_GretaWalkBackToCenter waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_258068, MSGBOX_DEFAULT - -BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F:: @ 8257A3F - msgbox BattleFrontier_BattleArenaBattleRoom_Text_25810D, MSGBOX_DEFAULT - call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E + msgbox BattleFrontier_BattleArenaBattleRoom_Text_YouLookWeakTakeThingsEasy, MSGBOX_DEFAULT +BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaSilver:: @ 8257A3F + msgbox BattleFrontier_BattleArenaBattleRoom_Text_IgniteMyPassionForBattle, MSGBOX_DEFAULT + call BattleFrontier_BattleArenaBattleRoom_EventScript_StartArenaBattle compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C - goto BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaSilver + goto BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner -BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C - call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 +BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaSilver:: @ 8257A5C + call BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner frontier_getsymbols compare VAR_RESULT, 0 - goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257852 - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 + goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_25813F, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaYoureToughAfterAll, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET - message BattleFrontier_BattleArenaBattleRoom_Text_25819C + message BattleFrontier_BattleArenaBattleRoom_Text_ReceivedGutsSymbol waitmessage waitfanfare frontier_givesymbol - msgbox BattleFrontier_BattleArenaBattleRoom_Text_2581CF, MSGBOX_DEFAULT - goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_GoingToBeFunNextTime, MSGBOX_DEFAULT + goto BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon -BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5 +BattleFrontier_BattleArenaBattleRoom_EventScript_IntroGretaGold:: @ 8257AA5 frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH compare VAR_RESULT, FALSE - goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, MSGBOX_DEFAULT + goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaGold + msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaLookingForwardToSeeingAgain, MSGBOX_DEFAULT closemessage frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30 + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_GretaLookAroundPlayer waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582A2, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleArenaBattleRoom_Text_SoAreYouReady, MSGBOX_DEFAULT closemessage - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C3A + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_GretaWalkBackToCenter waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582BB, MSGBOX_DEFAULT - -BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8:: @ 8257AF8 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582F9, MSGBOX_DEFAULT - call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E + msgbox BattleFrontier_BattleArenaBattleRoom_Text_WontAllowHalfheartedEffort, MSGBOX_DEFAULT +BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaGold:: @ 8257AF8 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_LetsGetThisStarted, MSGBOX_DEFAULT + call BattleFrontier_BattleArenaBattleRoom_EventScript_StartArenaBattle compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257B15 - goto BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaGold + goto BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner -BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15 - call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 +BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaGold:: @ 8257B15 + call BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner frontier_getsymbols compare VAR_RESULT, 2 - goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852 - applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon + applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_258323, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaBlownAway, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET - message BattleFrontier_BattleArenaBattleRoom_Text_25835B + message BattleFrontier_BattleArenaBattleRoom_Text_GutsSymbolTookGoldenShine waitmessage waitfanfare frontier_givesymbol - msgbox BattleFrontier_BattleArenaBattleRoom_Text_258383, MSGBOX_DEFAULT - goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_IfWeBattleAgainWontLose, MSGBOX_DEFAULT + goto BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon -BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E:: @ 8257B5E - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C93, MSGBOX_DEFAULT - call BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C +BattleFrontier_BattleArenaBattleRoom_EventScript_StartArenaBattle:: @ 8257B5E + msgbox BattleFrontier_BattleArenaBattleRoom_Text_SetKOTourneyBegin, MSGBOX_DEFAULT + call BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle return -BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C:: @ 8257B6C -FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C +BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle:: @ 8257B6C closemessage setvar VAR_TEMP_2, 0 frontier_set FRONTIER_DATA_6, 0 @@ -402,57 +392,53 @@ FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C frontier_resetsketch return -BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9:: @ 8257BA9 - applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 - applymovement 1, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 - applymovement 2, BattleFrontier_BattleArenaBattleRoom_Movement_257C02 - applymovement 3, BattleFrontier_BattleArenaBattleRoom_Movement_257C05 - applymovement 4, BattleFrontier_BattleArenaBattleRoom_Movement_257C05 +BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner:: @ 8257BA9 + applymovement 9, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown + applymovement 1, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown + applymovement 2, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown + applymovement 3, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp + applymovement 4, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp playse SE_BAN waitse waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CB3, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsPlayer, MSGBOX_DEFAULT closemessage call BattleFrontier_EventScript_IncrementWinStreak return -BattleFrontier_BattleArenaBattleRoom_Movement_257BE2: @ 8257BE2 +BattleFrontier_BattleArenaBattleRoom_Movement_PlayerEnter: @ 8257BE2 walk_right walk_right - -BattleFrontier_BattleArenaBattleRoom_Movement_257BE4: @ 8257BE4 +BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForwardLong: @ 8257BE4 walk_right - -BattleFrontier_BattleArenaBattleRoom_Movement_257BE5: @ 8257BE5 +BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForward: @ 8257BE5 walk_right step_end -BattleFrontier_BattleArenaBattleRoom_Movement_257BE7: @ 8257BE7 +BattleFrontier_BattleArenaBattleRoom_Movement_PlayerWalkBackToLine: @ 8257BE7 walk_left walk_left walk_in_place_fastest_right step_end -BattleFrontier_BattleArenaBattleRoom_Movement_257BEB: @ 8257BEB +BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceLeft: @ 8257BEB walk_in_place_fastest_up step_end -BattleFrontier_BattleArenaBattleRoom_Movement_257BED: @ 8257BED +BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight: @ 8257BED walk_in_place_fastest_right step_end -BattleFrontier_BattleArenaBattleRoom_Movement_257BEF: @ 8257BEF +BattleFrontier_BattleArenaBattleRoom_Movement_OpponentEnter: @ 8257BEF walk_left walk_left - -BattleFrontier_BattleArenaBattleRoom_Movement_257BF1: @ 8257BF1 +BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong: @ 8257BF1 walk_left - -BattleFrontier_BattleArenaBattleRoom_Movement_257BF2: @ 8257BF2 +BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForward: @ 8257BF2 walk_left step_end -BattleFrontier_BattleArenaBattleRoom_Movement_257BF4: @ 8257BF4 +BattleFrontier_BattleArenaBattleRoom_Movement_GretaEnter: @ 8257BF4 walk_fast_left walk_fast_left walk_fast_left @@ -460,7 +446,7 @@ BattleFrontier_BattleArenaBattleRoom_Movement_257BF4: @ 8257BF4 walk_fast_left step_end -BattleFrontier_BattleArenaBattleRoom_Movement_257BFA: @ 8257BFA +BattleFrontier_BattleArenaBattleRoom_Movement_OpponentExit: @ 8257BFA walk_right walk_right walk_right @@ -470,37 +456,38 @@ BattleFrontier_BattleArenaBattleRoom_Movement_257BFA: @ 8257BFA walk_right step_end -BattleFrontier_BattleArenaBattleRoom_Movement_257C02: @ 8257C02 +BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown: @ 8257C02 disable_jump_landing_ground_effect jump_in_place_down step_end -BattleFrontier_BattleArenaBattleRoom_Movement_257C05: @ 8257C05 +BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp: @ 8257C05 disable_jump_landing_ground_effect jump_in_place_up step_end -BattleFrontier_BattleArenaBattleRoom_Movement_257C08: @ 8257C08 +BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceDown: @ 8257C08 walk_in_place_fastest_down step_end -BattleFrontier_BattleArenaBattleRoom_Movement_257C0A: @ 8257C0A +@ Unused, redundant +BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight2: @ 8257C0A walk_in_place_fastest_right step_end -BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C: @ 8257C0C - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257C16 +BattleFrontier_BattleArenaBattleRoom_OnWarp: @ 8257C0C + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_SetUpRoomObjects .2byte 0 -BattleFrontier_BattleArenaBattleRoom_EventScript_257C16:: @ 8257C16 +BattleFrontier_BattleArenaBattleRoom_EventScript_SetUpRoomObjects:: @ 8257C16 hideobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM removeobject 7 - call BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_24C773 + call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible setvar VAR_TEMP_1, 1 end -BattleFrontier_BattleArenaBattleRoom_Movement_257C30: @ 8257C30 +BattleFrontier_BattleArenaBattleRoom_Movement_GretaLookAroundPlayer: @ 8257C30 walk_down walk_in_place_fastest_left delay_16 @@ -512,106 +499,97 @@ BattleFrontier_BattleArenaBattleRoom_Movement_257C30: @ 8257C30 walk_in_place_fastest_left step_end -BattleFrontier_BattleArenaBattleRoom_Movement_257C3A: @ 8257C3A +BattleFrontier_BattleArenaBattleRoom_Movement_GretaWalkBackToCenter: @ 8257C3A walk_down walk_in_place_fastest_left step_end -BattleFrontier_BattleArenaBattleRoom_Text_257C3D: @ 8257C3D +BattleFrontier_BattleArenaBattleRoom_Text_PlayerStepForward: @ 8257C3D .string "REFEREE: TRAINER {PLAYER}!\n" .string "Step forward, please!$" -BattleFrontier_BattleArenaBattleRoom_Text_257C68: @ 8257C68 +BattleFrontier_BattleArenaBattleRoom_Text_OpponentStepForward: @ 8257C68 .string "REFEREE: TRAINER {STR_VAR_1}!\n" .string "Step forward, please!$" -BattleFrontier_BattleArenaBattleRoom_Text_257C93: @ 8257C93 -FallarborTown_BattleTentBattleRoom_Text_257C93: @ 8257C93 +BattleFrontier_BattleArenaBattleRoom_Text_SetKOTourneyBegin: @ 8257C93 .string "REFEREE: Set KO Tourney!\n" .string "Begin!$" -BattleFrontier_BattleArenaBattleRoom_Text_257CB3: @ 8257CB3 -FallarborTown_BattleTentBattleRoom_Text_257CB3: @ 8257CB3 +BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsPlayer: @ 8257CB3 .string "REFEREE: The winner is {PLAYER}!$" -BattleFrontier_BattleArenaBattleRoom_Text_257CCE: @ 8257CCE -FallarborTown_BattleTentBattleRoom_Text_257CCE: @ 8257CCE +BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsOpponent: @ 8257CCE .string "REFEREE: The winner is {STR_VAR_1}!$" -BattleFrontier_BattleArenaBattleRoom_Text_257CE9: @ 8257CE9 -FallarborTown_BattleTentBattleRoom_Text_257CE9: @ 8257CE9 +BattleFrontier_BattleArenaBattleRoom_Text_MonsWillBeRestored: @ 8257CE9 .string "Your POKéMON will be restored to\n" .string "full health.$" -BattleFrontier_BattleArenaBattleRoom_Text_257D17: @ 8257D17 -FallarborTown_BattleTentBattleRoom_Text_257D17: @ 8257D17 +BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor2ndOpponent: @ 8257D17 .string "Next up, your second opponent!\n" .string "Are you ready to move on?$" -BattleFrontier_BattleArenaBattleRoom_Text_257D50: @ 8257D50 -FallarborTown_BattleTentBattleRoom_Text_257D50: @ 8257D50 +BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor3rdOpponent: @ 8257D50 .string "Next up, your third opponent!\n" .string "Are you ready to move on?$" -BattleFrontier_BattleArenaBattleRoom_Text_257D88: @ 8257D88 +BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor4thOpponent: @ 8257D88 .string "Next up, your fourth opponent!\n" .string "Are you ready to move on?$" -BattleFrontier_BattleArenaBattleRoom_Text_257DC1: @ 8257DC1 +BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor5thOpponent: @ 8257DC1 .string "Next up, your fifth opponent!\n" .string "Are you ready to move on?$" -BattleFrontier_BattleArenaBattleRoom_Text_257DF9: @ 8257DF9 +BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor6thOpponent: @ 8257DF9 .string "Next up, your sixth opponent!\n" .string "Are you ready to move on?$" -BattleFrontier_BattleArenaBattleRoom_Text_257E31: @ 8257E31 +BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor7thOpponent: @ 8257E31 .string "Next up, your seventh opponent!\n" .string "Are you ready to move on?$" -BattleFrontier_BattleArenaBattleRoom_Text_257E6B: @ 8257E6B -FallarborTown_BattleTentBattleRoom_Text_257E6B: @ 8257E6B +BattleFrontier_BattleArenaBattleRoom_Text_SaveAndShutDown: @ 8257E6B .string "Would you like to save the game and\n" .string "shut down now?$" -BattleFrontier_BattleArenaBattleRoom_Text_257E9E: @ 8257E9E -FallarborTown_BattleTentBattleRoom_Text_257E9E: @ 8257E9E +BattleFrontier_BattleArenaBattleRoom_Text_RetireFromChallenge: @ 8257E9E .string "Would you like to retire from your\n" .string "Set KO Tourney challenge?$" -BattleFrontier_BattleArenaBattleRoom_Text_257EDB: @ 8257EDB -FallarborTown_BattleTentBattleRoom_Text_257EDB: @ 8257EDB +BattleFrontier_BattleArenaBattleRoom_Text_SavingPleaseWait: @ 8257EDB .string "I am saving your game data.\n" .string "Please wait.$" -BattleFrontier_BattleArenaBattleRoom_Text_257F04: @ 8257F04 +BattleFrontier_BattleArenaBattleRoom_Text_RecordLastBattle: @ 8257F04 .string "Would you like to record your last\n" .string "battle on your FRONTIER PASS?$" -BattleFrontier_BattleArenaBattleRoom_Text_257F45: @ 8257F45 +BattleFrontier_BattleArenaBattleRoom_Text_NowFaceTycoon: @ 8257F45 .string "My dear challenger!\p" .string "Your skill level is truly astounding!\p" .string "We now would like you to face our\n" .string "leader, the ARENA TYCOON!$" -BattleFrontier_BattleArenaBattleRoom_Text_257FBB: @ 8257FBB +BattleFrontier_BattleArenaBattleRoom_Text_PreparedForTycoon: @ 8257FBB .string "A battle with the ARENA TYCOON!\n" .string "Are you prepared?$" -BattleFrontier_BattleArenaBattleRoom_Text_257FED: @ 8257FED +BattleFrontier_BattleArenaBattleRoom_Text_MakeWayForGreta: @ 8257FED .string "REFEREE: The ARENA TYCOON!\n" .string "Make way for GRETA!$" -BattleFrontier_BattleArenaBattleRoom_Text_25801C: @ 825801C +BattleFrontier_BattleArenaBattleRoom_Text_GretaYoureChallenger: @ 825801C .string "GRETA: Hey!\n" .string "Howdy!\p" .string "…Wait, are you the challenger?$" -BattleFrontier_BattleArenaBattleRoom_Text_25804E: @ 825804E +BattleFrontier_BattleArenaBattleRoom_Text_IsThatRight: @ 825804E .string "Is that right? Hmm…\n" .string "Hmhm…$" -BattleFrontier_BattleArenaBattleRoom_Text_258068: @ 8258068 +BattleFrontier_BattleArenaBattleRoom_Text_YouLookWeakTakeThingsEasy: @ 8258068 .string "I don't know how to say it, but…\n" .string "To put it bluntly, you look pretty weak.\l" .string "Are you sure you're up for me?\p" @@ -619,53 +597,53 @@ BattleFrontier_BattleArenaBattleRoom_Text_258068: @ 8258068 .string "Well, all right!\n" .string "We'll take things easy to start with!$" -BattleFrontier_BattleArenaBattleRoom_Text_25810D: @ 825810D +BattleFrontier_BattleArenaBattleRoom_Text_IgniteMyPassionForBattle: @ 825810D .string "Okay! Let's see you ignite my passion\n" .string "for battle!$" -BattleFrontier_BattleArenaBattleRoom_Text_25813F: @ 825813F +BattleFrontier_BattleArenaBattleRoom_Text_GretaYoureToughAfterAll: @ 825813F .string "GRETA: Ow, wait a second!\n" .string "You are tough after all!\p" .string "I like you!\n" .string "Let's see your FRONTIER PASS.$" -BattleFrontier_BattleArenaBattleRoom_Text_25819C: @ 825819C +BattleFrontier_BattleArenaBattleRoom_Text_ReceivedGutsSymbol: @ 825819C .string "The Guts Symbol was embossed on\n" .string "the FRONTIER PASS!$" -BattleFrontier_BattleArenaBattleRoom_Text_2581CF: @ 82581CF +BattleFrontier_BattleArenaBattleRoom_Text_GoingToBeFunNextTime: @ 82581CF .string "Hmm…\p" .string "It's going to be fun the next time!\n" .string "I'm looking forward to it!$" -BattleFrontier_BattleArenaBattleRoom_Text_258213: @ 8258213 +BattleFrontier_BattleArenaBattleRoom_Text_GretaLookingForwardToSeeingAgain: @ 8258213 .string "GRETA: Hey! Howdy!\n" .string "You finally won your way up to me!\p" .string "I was getting worried waiting for you!\n" .string "I was really looking forward to seeing\l" .string "you again!$" -BattleFrontier_BattleArenaBattleRoom_Text_2582A2: @ 82582A2 +BattleFrontier_BattleArenaBattleRoom_Text_SoAreYouReady: @ 82582A2 .string "… … …\n" .string "So, are you ready?$" -BattleFrontier_BattleArenaBattleRoom_Text_2582BB: @ 82582BB +BattleFrontier_BattleArenaBattleRoom_Text_WontAllowHalfheartedEffort: @ 82582BB .string "I won't allow a halfhearted effort!\n" .string "Be ready for a thrashing!$" -BattleFrontier_BattleArenaBattleRoom_Text_2582F9: @ 82582F9 +BattleFrontier_BattleArenaBattleRoom_Text_LetsGetThisStarted: @ 82582F9 .string "Come on, REFEREE!\n" .string "Let's get this started!$" -BattleFrontier_BattleArenaBattleRoom_Text_258323: @ 8258323 +BattleFrontier_BattleArenaBattleRoom_Text_GretaBlownAway: @ 8258323 .string "GRETA: Gaaah! Blown away!\n" .string "Let's see your FRONTIER PASS!$" -BattleFrontier_BattleArenaBattleRoom_Text_25835B: @ 825835B +BattleFrontier_BattleArenaBattleRoom_Text_GutsSymbolTookGoldenShine: @ 825835B .string "The Guts Symbol took on\n" .string "a golden shine!$" -BattleFrontier_BattleArenaBattleRoom_Text_258383: @ 8258383 +BattleFrontier_BattleArenaBattleRoom_Text_IfWeBattleAgainWontLose: @ 8258383 .string "Arrrgh!\n" .string "This is so infuriating!\p" .string "If we ever battle again, I won't lose!\n" diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc index cc362f5f0..465d013fc 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc @@ -1,30 +1,30 @@ BattleFrontier_BattleArenaCorridor_MapScripts:: @ 82573B9 - map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaCorridor_MapScript2_2573BF + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaCorridor_OnFrame .byte 0 -BattleFrontier_BattleArenaCorridor_MapScript2_2573BF: @ 82573BF - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaCorridor_EventScript_2573C9 +BattleFrontier_BattleArenaCorridor_OnFrame: @ 82573BF + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaCorridor_EventScript_WalkToBattleRoom .2byte 0 -BattleFrontier_BattleArenaCorridor_EventScript_2573C9:: @ 82573C9 +BattleFrontier_BattleArenaCorridor_EventScript_WalkToBattleRoom:: @ 82573C9 delay 16 setvar VAR_TEMP_0, 1 - applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_25742F - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_257417 + applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_AttendantWalkToDoor + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_PlayerWalkToDoor waitmovement 0 - applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257444 + applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_AttendantFacePlayer waitmovement 0 - msgbox BattleFrontier_BattleArenaCorridor_Text_257449, MSGBOX_SIGN - applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257446 + msgbox BattleFrontier_BattleArenaCorridor_Text_PleaseStepIn, MSGBOX_SIGN + applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_AttendantMoveOutOfWay waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_25742C + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_PlayerEnterDoor waitmovement 0 setvar VAR_0x8006, 0 warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 255, 7, 5 waitstate end -BattleFrontier_BattleArenaCorridor_Movement_257417: @ 8257417 +BattleFrontier_BattleArenaCorridor_Movement_PlayerWalkToDoor: @ 8257417 walk_up walk_left walk_left @@ -47,12 +47,12 @@ BattleFrontier_BattleArenaCorridor_Movement_257417: @ 8257417 walk_right step_end -BattleFrontier_BattleArenaCorridor_Movement_25742C: @ 825742C +BattleFrontier_BattleArenaCorridor_Movement_PlayerEnterDoor: @ 825742C walk_right set_invisible step_end -BattleFrontier_BattleArenaCorridor_Movement_25742F: @ 825742F +BattleFrontier_BattleArenaCorridor_Movement_AttendantWalkToDoor: @ 825742F walk_left walk_left walk_left @@ -75,16 +75,16 @@ BattleFrontier_BattleArenaCorridor_Movement_25742F: @ 825742F walk_right step_end -BattleFrontier_BattleArenaCorridor_Movement_257444: @ 8257444 +BattleFrontier_BattleArenaCorridor_Movement_AttendantFacePlayer: @ 8257444 walk_in_place_fastest_left step_end -BattleFrontier_BattleArenaCorridor_Movement_257446: @ 8257446 +BattleFrontier_BattleArenaCorridor_Movement_AttendantMoveOutOfWay: @ 8257446 walk_up walk_in_place_fastest_down step_end -BattleFrontier_BattleArenaCorridor_Text_257449: @ 8257449 +BattleFrontier_BattleArenaCorridor_Text_PleaseStepIn: @ 8257449 .string "Your battles shall be waged in\n" .string "the next room. Please step in!$" diff --git a/data/maps/BattleFrontier_BattleArenaLobby/map.json b/data/maps/BattleFrontier_BattleArenaLobby/map.json index 49712c5dd..3bec0b5fb 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/map.json +++ b/data/maps/BattleFrontier_BattleArenaLobby/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattleArenaLobby_EventScript_255DF4", + "script": "BattleFrontier_BattleArenaLobby_EventScript_Attendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattleArenaLobby_EventScript_2560C1", + "script": "BattleFrontier_BattleArenaLobby_EventScript_Woman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattleArenaLobby_EventScript_2560AF", + "script": "BattleFrontier_BattleArenaLobby_EventScript_Man", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattleArenaLobby_EventScript_2560B8", + "script": "BattleFrontier_BattleArenaLobby_EventScript_Camper", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattleArenaLobby_EventScript_2560A6", + "script": "BattleFrontier_BattleArenaLobby_EventScript_Youngster", "flag": "0" } ], @@ -97,7 +97,7 @@ "y": 9, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "BattleFrontier_BattleArenaLobby_EventScript_256092" + "script": "BattleFrontier_BattleArenaLobby_EventScript_ShowResults" }, { "type": "sign", @@ -105,7 +105,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "BattleFrontier_BattleArenaLobby_EventScript_2560CA" + "script": "BattleFrontier_BattleArenaLobby_EventScript_RulesBoard" } ] }
\ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 589e78709..d6c3a3ca5 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -1,176 +1,157 @@ BattleFrontier_BattleArenaLobby_MapScripts:: @ 8255C36 - map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaLobby_MapScript2_255C55 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaLobby_MapScript2_255C41 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaLobby_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaLobby_OnWarp .byte 0 -BattleFrontier_BattleArenaLobby_MapScript2_255C41: @ 8255C41 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleArenaLobby_EventScript_255C4B +BattleFrontier_BattleArenaLobby_OnWarp: @ 8255C41 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleArenaLobby_EventScript_TurnPlayerNorth .2byte 0 -BattleFrontier_BattleArenaLobby_EventScript_255C4B:: @ 8255C4B +BattleFrontier_BattleArenaLobby_EventScript_TurnPlayerNorth:: @ 8255C4B setvar VAR_TEMP_1, 1 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaLobby_EventScript_255C7F - map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattleArenaLobby_EventScript_255C88 - map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleArenaLobby_EventScript_255DC0 - map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattleArenaLobby_EventScript_255CCF - map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattleArenaLobby_EventScript_255D2B +BattleFrontier_BattleArenaLobby_OnFrame: @ 8255C55 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaLobby_EventScript_GetChallengeStatus + map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattleArenaLobby_EventScript_QuitWithoutSaving + map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleArenaLobby_EventScript_ResumeChallenge + map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattleArenaLobby_EventScript_WonChallenge + map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattleArenaLobby_EventScript_LostChallenge .2byte 0 -BattleFrontier_BattleArenaLobby_EventScript_255C7F:: @ 8255C7F +BattleFrontier_BattleArenaLobby_EventScript_GetChallengeStatus:: @ 8255C7F frontier_getstatus end -BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88 +BattleFrontier_BattleArenaLobby_EventScript_QuitWithoutSaving:: @ 8255C88 lockall - msgbox BattleFrontier_BattleArenaLobby_Text_256811, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleArenaLobby_Text_DidntSaveBeforeShuttingDown, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special CallBattleArenaFunction - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 0 - special CallBattleArenaFunction + arena_set ARENA_DATA_WIN_STREAK, 0 + arena_set ARENA_DATA_WIN_STREAK_ACTIVE, FALSE frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 setvar VAR_TEMP_0, 255 releaseall end -BattleFrontier_BattleArenaLobby_EventScript_255CCF:: @ 8255CCF +BattleFrontier_BattleArenaLobby_EventScript_WonChallenge:: @ 8255CCF lockall frontier_isbrain compare VAR_RESULT, TRUE - goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0 - msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, MSGBOX_DEFAULT - goto BattleFrontier_BattleArenaLobby_EventScript_255CF8 - -BattleFrontier_BattleArenaLobby_EventScript_255CF0:: @ 8255CF0 - msgbox BattleFrontier_BattleArenaLobby_Text_2572D9, MSGBOX_DEFAULT - -BattleFrontier_BattleArenaLobby_EventScript_255CF8:: @ 8255CF8 - msgbox BattleFrontier_BattleArenaLobby_Text_257353, MSGBOX_DEFAULT + goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_DefeatedTycoon + msgbox BattleFrontier_BattleArenaLobby_Text_CongratsOnSevenWins, MSGBOX_DEFAULT + goto BattleFrontier_BattleArenaLobby_EventScript_GiveBattlePoints + +BattleFrontier_BattleArenaLobby_EventScript_DefeatedTycoon:: @ 8255CF0 + msgbox BattleFrontier_BattleArenaLobby_Text_CongratsOnDefeatingTycoon, MSGBOX_DEFAULT +BattleFrontier_BattleArenaLobby_EventScript_GiveBattlePoints:: @ 8255CF8 + msgbox BattleFrontier_BattleArenaLobby_Text_PleaseAcceptBattlePoints, MSGBOX_DEFAULT frontier_givepoints msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS - message BattleFrontier_BattleArenaLobby_Text_256931 + message BattleFrontier_BattleArenaLobby_Text_RecordAchievement waitmessage - call BattleFrontier_BattleArenaLobby_EventScript_255D59 - msgbox BattleFrontier_BattleArenaLobby_Text_256A74, MSGBOX_DEFAULT + call BattleFrontier_BattleArenaLobby_EventScript_SaveAfterChallenge + msgbox BattleFrontier_BattleArenaLobby_Text_AwaitAnotherChallenge2, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall end -BattleFrontier_BattleArenaLobby_EventScript_255D2B:: @ 8255D2B +BattleFrontier_BattleArenaLobby_EventScript_LostChallenge:: @ 8255D2B lockall - message BattleFrontier_BattleArenaLobby_Text_256A2C + message BattleFrontier_BattleArenaLobby_Text_ThankYouWaitWhileSave waitmessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 0 - special CallBattleArenaFunction - call BattleFrontier_BattleArenaLobby_EventScript_255D59 - msgbox BattleFrontier_BattleArenaLobby_Text_256A74, MSGBOX_DEFAULT + arena_set ARENA_DATA_WIN_STREAK_ACTIVE, FALSE + call BattleFrontier_BattleArenaLobby_EventScript_SaveAfterChallenge + msgbox BattleFrontier_BattleArenaLobby_Text_AwaitAnotherChallenge2, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall end -BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59 +BattleFrontier_BattleArenaLobby_EventScript_SaveAfterChallenge:: @ 8255D59 frontier_checkairshow special LoadPlayerParty special HealPlayerParty - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special CallBattleArenaFunction + arena_save 0 playse SE_SAVE waitse call BattleFrontier_BattleArenaLobby_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255DBF - message BattleFrontier_BattleArenaLobby_Text_256B19 + goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_EndSaveAfterChallenge + message BattleFrontier_BattleArenaLobby_Text_RecordLastMatch waitmessage multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT - case 1, BattleFrontier_BattleArenaLobby_EventScript_255DBF - case 0, BattleFrontier_BattleArenaLobby_EventScript_255DBA - case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_255DBF + case 1, BattleFrontier_BattleArenaLobby_EventScript_EndSaveAfterChallenge + case 0, BattleFrontier_BattleArenaLobby_EventScript_RecordMatch + case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_EndSaveAfterChallenge -BattleFrontier_BattleArenaLobby_EventScript_255DBA:: @ 8255DBA +BattleFrontier_BattleArenaLobby_EventScript_RecordMatch:: @ 8255DBA call BattleFrontier_EventScript_SaveBattle -BattleFrontier_BattleArenaLobby_EventScript_255DBF:: @ 8255DBF +BattleFrontier_BattleArenaLobby_EventScript_EndSaveAfterChallenge:: @ 8255DBF return -BattleFrontier_BattleArenaLobby_EventScript_255DC0:: @ 8255DC0 +BattleFrontier_BattleArenaLobby_EventScript_ResumeChallenge:: @ 8255DC0 lockall - message BattleFrontier_BattleArenaLobby_Text_256AA1 + message BattleFrontier_BattleArenaLobby_Text_LookingForwardToArrivalSaveGame waitmessage - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 1 - special CallBattleArenaFunction + arena_save CHALLENGE_STATUS_SAVING playse SE_SAVE waitse frontier_set FRONTIER_DATA_PAUSED, FALSE setvar VAR_TEMP_0, 255 - goto BattleFrontier_BattleArenaLobby_EventScript_255F54 + goto BattleFrontier_BattleArenaLobby_EventScript_EnterChallenge -BattleFrontier_BattleArenaLobby_EventScript_255DF4:: @ 8255DF4 +BattleFrontier_BattleArenaLobby_EventScript_Attendant:: @ 8255DF4 lock faceplayer setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_ARENA setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES special SavePlayerParty - msgbox BattleFrontier_BattleArenaLobby_Text_256166, MSGBOX_DEFAULT - -BattleFrontier_BattleArenaLobby_EventScript_255E0B:: @ 8255E0B - message BattleFrontier_BattleArenaLobby_Text_2561EA + msgbox BattleFrontier_BattleArenaLobby_Text_WelcomeToBattleArena, MSGBOX_DEFAULT +BattleFrontier_BattleArenaLobby_EventScript_AskTakeChallenge:: @ 8255E0B + message BattleFrontier_BattleArenaLobby_Text_WishToTakeChallenge waitmessage multichoice 17, 6, MULTI_CHALLENGEINFO, 0 switch VAR_RESULT - case 0, BattleFrontier_BattleArenaLobby_EventScript_255E47 - case 1, BattleFrontier_BattleArenaLobby_EventScript_255F9F - case 2, BattleFrontier_BattleArenaLobby_EventScript_255FFB - case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_255FFB + case 0, BattleFrontier_BattleArenaLobby_EventScript_TryEnterChallenge + case 1, BattleFrontier_BattleArenaLobby_EventScript_ExplainChallenge + case 2, BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge -BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 - message BattleFrontier_BattleArenaLobby_Text_256513 +BattleFrontier_BattleArenaLobby_EventScript_TryEnterChallenge:: @ 8255E47 + message BattleFrontier_BattleArenaLobby_Text_WhichLevelMode waitmessage multichoice 17, 6, MULTI_LEVEL_MODE, 0 switch VAR_RESULT - case FRONTIER_LVL_TENT, BattleFrontier_BattleArenaLobby_EventScript_255FFB - case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_255FFB + case FRONTIER_LVL_TENT, BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge frontier_checkineligible compare VAR_0x8004, TRUE - goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FAC + goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMons frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT - msgbox BattleFrontier_BattleArenaLobby_Text_256573, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleArenaLobby_Text_SelectThreeMons, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 3 - special sub_80F9490 + setvar VAR_0x8005, FRONTIER_PARTY_SIZE + special ChoosePartyForBattleFrontier waitstate compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FF8 - msgbox BattleFrontier_BattleArenaLobby_Text_2564CE, MSGBOX_YESNO + goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_LoadPartyAndCancelChallenge + msgbox BattleFrontier_BattleArenaLobby_Text_OkayToSave, MSGBOX_YESNO switch VAR_RESULT - case NO, BattleFrontier_BattleArenaLobby_EventScript_255FF8 - case YES, BattleFrontier_BattleArenaLobby_EventScript_255EE8 - case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_255FF8 + case NO, BattleFrontier_BattleArenaLobby_EventScript_LoadPartyAndCancelChallenge + case YES, BattleFrontier_BattleArenaLobby_EventScript_SaveBeforeChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_LoadPartyAndCancelChallenge -BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 +BattleFrontier_BattleArenaLobby_EventScript_SaveBeforeChallenge:: @ 8255EE8 setvar VAR_TEMP_0, 0 frontier_set FRONTIER_DATA_SELECTED_MON_ORDER - setvar VAR_0x8004, 0 - special CallBattleArenaFunction - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 1 - special CallBattleArenaFunction + arena_init + arena_set ARENA_DATA_WIN_STREAK_ACTIVE, TRUE frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING frontier_set FRONTIER_DATA_PAUSED, FALSE special LoadPlayerParty @@ -179,66 +160,65 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1 - -BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 + goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_CancelChallengeSaveFailed +BattleFrontier_BattleArenaLobby_EventScript_EnterChallenge:: @ 8255F54 special SavePlayerParty frontier_setpartyorder FRONTIER_PARTY_SIZE - msgbox BattleFrontier_BattleArenaLobby_Text_2567E6, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleArenaLobby_Text_GuideYouToArena, MSGBOX_DEFAULT closemessage frontier_get FRONTIER_DATA_LVL_MODE compare VAR_RESULT, FRONTIER_LVL_50 - call_if_eq BattleFrontier_BattleArenaLobby_EventScript_256005 + call_if_eq BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLv50 compare VAR_RESULT, FRONTIER_LVL_OPEN - call_if_eq BattleFrontier_BattleArenaLobby_EventScript_256050 + call_if_eq BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLvOpen warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13 setvar VAR_TEMP_0, 0 waitstate end -BattleFrontier_BattleArenaLobby_EventScript_255F9F:: @ 8255F9F - msgbox BattleFrontier_BattleArenaLobby_Text_25624C, MSGBOX_DEFAULT - goto BattleFrontier_BattleArenaLobby_EventScript_255E0B +BattleFrontier_BattleArenaLobby_EventScript_ExplainChallenge:: @ 8255F9F + msgbox BattleFrontier_BattleArenaLobby_Text_ExplainChallenge, MSGBOX_DEFAULT + goto BattleFrontier_BattleArenaLobby_EventScript_AskTakeChallenge -BattleFrontier_BattleArenaLobby_EventScript_255FAC:: @ 8255FAC +BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMons:: @ 8255FAC switch VAR_RESULT - case FRONTIER_LVL_50, BattleFrontier_BattleArenaLobby_EventScript_255FC7 - case FRONTIER_LVL_OPEN, BattleFrontier_BattleArenaLobby_EventScript_255FD4 + case FRONTIER_LVL_50, BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMonsLv50 + case FRONTIER_LVL_OPEN, BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMonsLvOpen -BattleFrontier_BattleArenaLobby_EventScript_255FC7:: @ 8255FC7 - msgbox BattleFrontier_BattleArenaLobby_Text_2566A8, MSGBOX_DEFAULT - goto BattleFrontier_BattleArenaLobby_EventScript_256003 +BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMonsLv50:: @ 8255FC7 + msgbox BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT + goto BattleFrontier_BattleArenaLobby_EventScript_EndCancelChallenge -BattleFrontier_BattleArenaLobby_EventScript_255FD4:: @ 8255FD4 - msgbox BattleFrontier_BattleArenaLobby_Text_2565A5, MSGBOX_DEFAULT - goto BattleFrontier_BattleArenaLobby_EventScript_256003 +BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 8255FD4 + msgbox BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT + goto BattleFrontier_BattleArenaLobby_EventScript_EndCancelChallenge -BattleFrontier_BattleArenaLobby_EventScript_255FE1:: @ 8255FE1 +BattleFrontier_BattleArenaLobby_EventScript_CancelChallengeSaveFailed:: @ 8255FE1 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 - goto BattleFrontier_BattleArenaLobby_EventScript_255FFB + goto BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge -BattleFrontier_BattleArenaLobby_EventScript_255FF8:: @ 8255FF8 +BattleFrontier_BattleArenaLobby_EventScript_LoadPartyAndCancelChallenge:: @ 8255FF8 special LoadPlayerParty -BattleFrontier_BattleArenaLobby_EventScript_255FFB:: @ 8255FFB - msgbox BattleFrontier_BattleArenaLobby_Text_25621F, MSGBOX_DEFAULT -BattleFrontier_BattleArenaLobby_EventScript_256003:: @ 8256003 +BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge:: @ 8255FFB + msgbox BattleFrontier_BattleArenaLobby_Text_AwaitAnotherChallenge, MSGBOX_DEFAULT +BattleFrontier_BattleArenaLobby_EventScript_EndCancelChallenge:: @ 8256003 release end -BattleFrontier_BattleArenaLobby_EventScript_256005:: @ 8256005 - applymovement 1, BattleFrontier_BattleArenaLobby_Movement_256034 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_256041 +BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLv50:: @ 8256005 + applymovement 1, BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToLeftDoor + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToLeftDoor waitmovement 0 opendoor 2, 2 waitdooranim - applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25603E - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_25604C + applymovement 1, BattleFrontier_BattleArenaLobby_Movement_AttendantEnterDoor + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor waitmovement 0 closedoor 2, 2 waitdooranim return -BattleFrontier_BattleArenaLobby_Movement_256034: @ 8256034 +BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToLeftDoor: @ 8256034 walk_up walk_up walk_up @@ -250,12 +230,12 @@ BattleFrontier_BattleArenaLobby_Movement_256034: @ 8256034 walk_up step_end -BattleFrontier_BattleArenaLobby_Movement_25603E: @ 825603E +BattleFrontier_BattleArenaLobby_Movement_AttendantEnterDoor: @ 825603E walk_up set_invisible step_end -BattleFrontier_BattleArenaLobby_Movement_256041: @ 8256041 +BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToLeftDoor: @ 8256041 walk_up walk_up walk_up @@ -268,26 +248,26 @@ BattleFrontier_BattleArenaLobby_Movement_256041: @ 8256041 walk_in_place_fastest_up step_end -BattleFrontier_BattleArenaLobby_Movement_25604C: @ 825604C +BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor: @ 825604C walk_up walk_up set_invisible step_end -BattleFrontier_BattleArenaLobby_EventScript_256050:: @ 8256050 - applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25607F - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_256088 +BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLvOpen:: @ 8256050 + applymovement 1, BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToRightDoor + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToRightDoor waitmovement 0 opendoor 11, 2 waitdooranim - applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25603E - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_25604C + applymovement 1, BattleFrontier_BattleArenaLobby_Movement_AttendantEnterDoor + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor waitmovement 0 closedoor 11, 2 waitdooranim return -BattleFrontier_BattleArenaLobby_Movement_25607F: @ 825607F +BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToRightDoor: @ 825607F walk_up walk_up walk_up @@ -298,7 +278,7 @@ BattleFrontier_BattleArenaLobby_Movement_25607F: @ 825607F walk_up step_end -BattleFrontier_BattleArenaLobby_Movement_256088: @ 8256088 +BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToRightDoor: @ 8256088 walk_up walk_up walk_up @@ -310,7 +290,7 @@ BattleFrontier_BattleArenaLobby_Movement_256088: @ 8256088 walk_in_place_fastest_up step_end -BattleFrontier_BattleArenaLobby_EventScript_256092:: @ 8256092 +BattleFrontier_BattleArenaLobby_EventScript_ShowResults:: @ 8256092 lockall frontier_results FRONTIER_FACILITY_ARENA waitbuttonpress @@ -318,80 +298,80 @@ BattleFrontier_BattleArenaLobby_EventScript_256092:: @ 8256092 releaseall end -BattleFrontier_BattleArenaLobby_EventScript_2560A6:: @ 82560A6 - msgbox BattleFrontier_BattleArenaLobby_Text_256B5C, MSGBOX_NPC +BattleFrontier_BattleArenaLobby_EventScript_Youngster:: @ 82560A6 + msgbox BattleFrontier_BattleArenaLobby_Text_BadIdeaToNotAttack, MSGBOX_NPC end -BattleFrontier_BattleArenaLobby_EventScript_2560AF:: @ 82560AF - msgbox BattleFrontier_BattleArenaLobby_Text_256BCB, MSGBOX_NPC +BattleFrontier_BattleArenaLobby_EventScript_Man:: @ 82560AF + msgbox BattleFrontier_BattleArenaLobby_Text_LandingHitsWorked, MSGBOX_NPC end -BattleFrontier_BattleArenaLobby_EventScript_2560B8:: @ 82560B8 - msgbox BattleFrontier_BattleArenaLobby_Text_256C19, MSGBOX_NPC +BattleFrontier_BattleArenaLobby_EventScript_Camper:: @ 82560B8 + msgbox BattleFrontier_BattleArenaLobby_Text_MatchWasDeclaredDraw, MSGBOX_NPC end -BattleFrontier_BattleArenaLobby_EventScript_2560C1:: @ 82560C1 - msgbox BattleFrontier_BattleArenaLobby_Text_256C9A, MSGBOX_NPC +BattleFrontier_BattleArenaLobby_EventScript_Woman:: @ 82560C1 + msgbox BattleFrontier_BattleArenaLobby_Text_OrderOfMonsImportant, MSGBOX_NPC end -BattleFrontier_BattleArenaLobby_EventScript_2560CA:: @ 82560CA +BattleFrontier_BattleArenaLobby_EventScript_RulesBoard:: @ 82560CA lockall - msgbox BattleFrontier_BattleArenaLobby_Text_256DB8, MSGBOX_DEFAULT - goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 + msgbox BattleFrontier_BattleArenaLobby_Text_RulesAreListed, MSGBOX_DEFAULT + goto BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard end -BattleFrontier_BattleArenaLobby_EventScript_2560D9:: @ 82560D9 - message BattleFrontier_BattleArenaLobby_Text_256DDF +BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard:: @ 82560D9 + message BattleFrontier_BattleArenaLobby_Text_ReadWhichHeading waitmessage multichoice 17, 2, MULTI_BATTLE_ARENA_RULES, 0 switch VAR_RESULT - case 0, BattleFrontier_BattleArenaLobby_EventScript_25612C - case 1, BattleFrontier_BattleArenaLobby_EventScript_25613A - case 2, BattleFrontier_BattleArenaLobby_EventScript_256148 - case 3, BattleFrontier_BattleArenaLobby_EventScript_256156 - case 4, BattleFrontier_BattleArenaLobby_EventScript_256164 - case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_256164 + case 0, BattleFrontier_BattleArenaLobby_EventScript_BattleRules + case 1, BattleFrontier_BattleArenaLobby_EventScript_MindRules + case 2, BattleFrontier_BattleArenaLobby_EventScript_SkillRules + case 3, BattleFrontier_BattleArenaLobby_EventScript_BodyRules + case 4, BattleFrontier_BattleArenaLobby_EventScript_ExitRules + case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_ExitRules end -BattleFrontier_BattleArenaLobby_EventScript_25612C:: @ 825612C - msgbox BattleFrontier_BattleArenaLobby_Text_256E02, MSGBOX_DEFAULT - goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 +BattleFrontier_BattleArenaLobby_EventScript_BattleRules:: @ 825612C + msgbox BattleFrontier_BattleArenaLobby_Text_ExplainBattleRules, MSGBOX_DEFAULT + goto BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard end -BattleFrontier_BattleArenaLobby_EventScript_25613A:: @ 825613A - msgbox BattleFrontier_BattleArenaLobby_Text_256F43, MSGBOX_DEFAULT - goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 +BattleFrontier_BattleArenaLobby_EventScript_MindRules:: @ 825613A + msgbox BattleFrontier_BattleArenaLobby_Text_ExplainMindRules, MSGBOX_DEFAULT + goto BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard end -BattleFrontier_BattleArenaLobby_EventScript_256148:: @ 8256148 - msgbox BattleFrontier_BattleArenaLobby_Text_256FF2, MSGBOX_DEFAULT - goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 +BattleFrontier_BattleArenaLobby_EventScript_SkillRules:: @ 8256148 + msgbox BattleFrontier_BattleArenaLobby_Text_ExplainSkillRules, MSGBOX_DEFAULT + goto BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard end -BattleFrontier_BattleArenaLobby_EventScript_256156:: @ 8256156 - msgbox BattleFrontier_BattleArenaLobby_Text_257202, MSGBOX_DEFAULT - goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 +BattleFrontier_BattleArenaLobby_EventScript_BodyRules:: @ 8256156 + msgbox BattleFrontier_BattleArenaLobby_Text_ExplainBodyRules, MSGBOX_DEFAULT + goto BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard end -BattleFrontier_BattleArenaLobby_EventScript_256164:: @ 8256164 +BattleFrontier_BattleArenaLobby_EventScript_ExitRules:: @ 8256164 releaseall end -BattleFrontier_BattleArenaLobby_Text_256166: @ 8256166 +BattleFrontier_BattleArenaLobby_Text_WelcomeToBattleArena: @ 8256166 .string "Where the battling spirit of TRAINERS\n" .string "is put to the test!\p" .string "I welcome you to the BATTLE ARENA!\p" .string "I am your guide to the Set KO Tourney!$" -BattleFrontier_BattleArenaLobby_Text_2561EA: @ 82561EA +BattleFrontier_BattleArenaLobby_Text_WishToTakeChallenge: @ 82561EA .string "Now, do you wish to take\n" .string "the BATTLE ARENA challenge?$" -BattleFrontier_BattleArenaLobby_Text_25621F: @ 825621F +BattleFrontier_BattleArenaLobby_Text_AwaitAnotherChallenge: @ 825621F .string "We await your challenge on\n" .string "another occasion!$" -BattleFrontier_BattleArenaLobby_Text_25624C: @ 825624C +BattleFrontier_BattleArenaLobby_Text_ExplainChallenge: @ 825624C .string "In the BATTLE ARENA, we undertake\n" .string "the Set KO Tourney.\p" .string "All participants enter with a team of\n" @@ -412,20 +392,20 @@ BattleFrontier_BattleArenaLobby_Text_25624C: @ 825624C .string "seven TRAINERS in succession,\l" .string "we will present you with Battle Points.$" -BattleFrontier_BattleArenaLobby_Text_2564CE: @ 82564CE +BattleFrontier_BattleArenaLobby_Text_OkayToSave: @ 82564CE .string "Before showing you to the BATTLE\n" .string "ARENA, you must save. Is that okay?$" -BattleFrontier_BattleArenaLobby_Text_256513: @ 8256513 +BattleFrontier_BattleArenaLobby_Text_WhichLevelMode: @ 8256513 .string "The BATTLE ARENA offers two levels\n" .string "of challenge, Level 50 and Open Level.\l" .string "Which is your choice?$" -BattleFrontier_BattleArenaLobby_Text_256573: @ 8256573 +BattleFrontier_BattleArenaLobby_Text_SelectThreeMons: @ 8256573 .string "Very well, now select your\n" .string "three POKéMON, please.$" -BattleFrontier_BattleArenaLobby_Text_2565A5: @ 82565A5 +BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLvOpen: @ 82565A5 .string "My dear challenger!\p" .string "You do not have the three POKéMON\n" .string "required for entry.\p" @@ -437,7 +417,7 @@ BattleFrontier_BattleArenaLobby_Text_2565A5: @ 82565A5 .string "When you have made your preparations,\n" .string "please do return.$" -BattleFrontier_BattleArenaLobby_Text_2566A8: @ 82566A8 +BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLv50: @ 82566A8 .string "My dear challenger!\p" .string "You do not have the three POKéMON\n" .string "required for entry.\p" @@ -451,11 +431,11 @@ BattleFrontier_BattleArenaLobby_Text_2566A8: @ 82566A8 .string "When you have made your preparations,\n" .string "please do return.$" -BattleFrontier_BattleArenaLobby_Text_2567E6: @ 82567E6 +BattleFrontier_BattleArenaLobby_Text_GuideYouToArena: @ 82567E6 .string "I shall now guide you to\n" .string "the BATTLE ARENA.$" -BattleFrontier_BattleArenaLobby_Text_256811: @ 8256811 +BattleFrontier_BattleArenaLobby_Text_DidntSaveBeforeShuttingDown: @ 8256811 .string "My dear challenger!\p" .string "You did not save the game before\n" .string "shutting down, did you?\p" @@ -465,64 +445,67 @@ BattleFrontier_BattleArenaLobby_Text_256811: @ 8256811 .string "You may, of course, start with a fresh\n" .string "challenge.$" -BattleFrontier_BattleArenaLobby_Text_2568E7: @ 82568E7 +BattleFrontier_BattleArenaLobby_Text_CongratsOnSevenWins: @ 82568E7 .string "We congratulate you for your splendid\n" .string "string of wins over seven TRAINERS!$" -BattleFrontier_BattleArenaLobby_Text_256931: @ 8256931 +BattleFrontier_BattleArenaLobby_Text_RecordAchievement: @ 8256931 .string "Your achievement will be recorded.\n" .string "Please wait while I save the game.$" -BattleFrontier_BattleArenaLobby_Text_256977: @ 8256977 +@ Unused +BattleFrontier_BattleArenaLobby_Text_PresentYouWithPrize: @ 8256977 .string "In commemoration of your 7-win streak,\n" .string "we present you with this prize.$" -BattleFrontier_BattleArenaLobby_Text_2569BE: @ 82569BE +@ Unused +BattleFrontier_BattleArenaLobby_Text_ReceivedPrize: @ 82569BE .string "{PLAYER} received the prize\n" .string "{STR_VAR_1}.$" -BattleFrontier_BattleArenaLobby_Text_2569D8: @ 82569D8 +@ Unused +BattleFrontier_BattleArenaLobby_Text_BagFullReturnForPrize: @ 82569D8 .string "Oh?\n" .string "Your BAG seems to be full.\p" .string "I urge you to clear space and\n" .string "return for your prize.$" -BattleFrontier_BattleArenaLobby_Text_256A2C: @ 8256A2C +BattleFrontier_BattleArenaLobby_Text_ThankYouWaitWhileSave: @ 8256A2C .string "Thank you so much for participating!\p" .string "Please wait while I save the game.$" -BattleFrontier_BattleArenaLobby_Text_256A74: @ 8256A74 +BattleFrontier_BattleArenaLobby_Text_AwaitAnotherChallenge2: @ 8256A74 .string "We await your challenge on\n" .string "another occasion!$" -BattleFrontier_BattleArenaLobby_Text_256AA1: @ 8256AA1 +BattleFrontier_BattleArenaLobby_Text_LookingForwardToArrivalSaveGame: @ 8256AA1 .string "We have been looking forward to\n" .string "your arrival.\p" .string "Before I show you to the BATTLE\n" .string "ARENA, I must save the game.\l" .string "Please wait.$" -BattleFrontier_BattleArenaLobby_Text_256B19: @ 8256B19 +BattleFrontier_BattleArenaLobby_Text_RecordLastMatch: @ 8256B19 .string "Shall I record your last BATTLE ARENA\n" .string "match on your FRONTIER PASS?$" -BattleFrontier_BattleArenaLobby_Text_256B5C: @ 8256B5C +BattleFrontier_BattleArenaLobby_Text_BadIdeaToNotAttack: @ 8256B5C .string "I lost on the REFEREE's decision…\p" .string "I don't think it was a good idea to only\n" .string "use defensive moves and not attack…$" -BattleFrontier_BattleArenaLobby_Text_256BCB: @ 8256BCB +BattleFrontier_BattleArenaLobby_Text_LandingHitsWorked: @ 8256BCB .string "I won in judging!\p" .string "Landing hits consistently on\n" .string "the opponent's POKéMON worked!$" -BattleFrontier_BattleArenaLobby_Text_256C19: @ 8256C19 +BattleFrontier_BattleArenaLobby_Text_MatchWasDeclaredDraw: @ 8256C19 .string "Our match was declared a draw.\p" .string "When we ran out of time, both my\n" .string "POKéMON and the opponent's had about\l" .string "the same amount of HP left.$" -BattleFrontier_BattleArenaLobby_Text_256C9A: @ 8256C9A +BattleFrontier_BattleArenaLobby_Text_OrderOfMonsImportant: @ 8256C9A .string "In the BATTLE ARENA, the order of\n" .string "POKéMON is totally important.\p" .string "For example, if your first POKéMON\n" @@ -533,16 +516,13 @@ BattleFrontier_BattleArenaLobby_Text_256C9A: @ 8256C9A .string "I think that will be a good way of\n" .string "making an effective team.$" -BattleFrontier_BattleArenaLobby_Text_256DB8: @ 8256DB8 -FallarborTown_BattleTentLobby_Text_256DB8: @ 8256DB8 +BattleFrontier_BattleArenaLobby_Text_RulesAreListed: @ 8256DB8 .string "The Set KO Tourney's rules are listed.$" -BattleFrontier_BattleArenaLobby_Text_256DDF: @ 8256DDF -FallarborTown_BattleTentLobby_Text_256DDF: @ 8256DDF +BattleFrontier_BattleArenaLobby_Text_ReadWhichHeading: @ 8256DDF .string "Which heading do you want to read?$" -BattleFrontier_BattleArenaLobby_Text_256E02: @ 8256E02 -FallarborTown_BattleTentLobby_Text_256E02: @ 8256E02 +BattleFrontier_BattleArenaLobby_Text_ExplainBattleRules: @ 8256E02 .string "The Set KO Tourney has special rules,\n" .string "unlike standard battles.\p" .string "First, one battle lasts only\n" @@ -554,8 +534,7 @@ FallarborTown_BattleTentLobby_Text_256E02: @ 8256E02 .string "Also, a POKéMON cannot be switched out\n" .string "until its battle's outcome is decided.$" -BattleFrontier_BattleArenaLobby_Text_256F43: @ 8256F43 -FallarborTown_BattleTentLobby_Text_256F43: @ 8256F43 +BattleFrontier_BattleArenaLobby_Text_ExplainMindRules: @ 8256F43 .string "The first judging factor is “Mind.”\n" .string "This factor evaluates how aggressive\l" .string "the battlers were.\p" @@ -563,8 +542,7 @@ FallarborTown_BattleTentLobby_Text_256F43: @ 8256F43 .string "the TRAINERS ordered the use of\l" .string "offensive moves.$" -BattleFrontier_BattleArenaLobby_Text_256FF2: @ 8256FF2 -FallarborTown_BattleTentLobby_Text_256FF2: @ 8256FF2 +BattleFrontier_BattleArenaLobby_Text_ExplainSkillRules: @ 8256FF2 .string "The second judging factor is “Skill.”\n" .string "This factor evaluates how effectively\l" .string "POKéMON moves were used.\p" @@ -583,8 +561,7 @@ FallarborTown_BattleTentLobby_Text_256FF2: @ 8256FF2 .string "hit with a move, its Skill rating will not\l" .string "go down.$" -BattleFrontier_BattleArenaLobby_Text_257202: @ 8257202 -FallarborTown_BattleTentLobby_Text_257202: @ 8257202 +BattleFrontier_BattleArenaLobby_Text_ExplainBodyRules: @ 8257202 .string "The third judging factor is “Body.”\n" .string "This factor is based on how much HP\l" .string "remained at the end of a battle.\p" @@ -592,13 +569,13 @@ FallarborTown_BattleTentLobby_Text_257202: @ 8257202 .string "HP a POKéMON had at the start of\l" .string "battle, and what remained at the end.$" -BattleFrontier_BattleArenaLobby_Text_2572D9: @ 82572D9 +BattleFrontier_BattleArenaLobby_Text_CongratsOnDefeatingTycoon: @ 82572D9 .string "A victory snatched from the ARENA\n" .string "TYCOON, and a seven-TRAINER sweep!\p" .string "We congratulate you on your most\n" .string "splendid challenge!$" -BattleFrontier_BattleArenaLobby_Text_257353: @ 8257353 +BattleFrontier_BattleArenaLobby_Text_PleaseAcceptBattlePoints: @ 8257353 .string "My dear challenger, in recognition of\n" .string "your indefatigable spirit, please\l" .string "accept these Battle Point(s).$" diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index 566464612..fc9c17977 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -12,23 +12,22 @@ BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1 copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C919 - call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC + call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx end -BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC:: @ 824BCDC -BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC +BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx:: @ 824BCDC checkplayergender compare VAR_RESULT, MALE - goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4 + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxMale compare VAR_RESULT, FEMALE - goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxFemale return -BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4:: @ 824BCF4 +BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxMale:: @ 824BCF4 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return -BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA:: @ 824BCFA +BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxFemale:: @ 824BCFA setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return @@ -511,9 +510,9 @@ BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481: @ 824C481 BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B hideobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM call BattleFrontier_BattleDomeBattleRoom_EventScript_24C502 - call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC + call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx setvar VAR_TEMP_1, 1 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_24C773 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible frontier_get FRONTIER_DATA_BATTLE_NUM compare VAR_RESULT, 3 goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF @@ -626,8 +625,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C652:: @ 824C652 createvobject EVENT_OBJ_GFX_WOMAN_5, 31, 8, 2, 3, DIR_SOUTH return -BattleFrontier_BattleArenaBattleRoom_Movement_24C773: @ 824C773 -BattleFrontier_BattleDomeBattleRoom_Movement_24C773: @ 824C773 +BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible: @ 824C773 set_invisible step_end diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 81cd84dd9..f02c02d98 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -199,8 +199,8 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF fadescreen 1 call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 3 - special sub_80F9490 + setvar VAR_0x8005, FRONTIER_PARTY_SIZE + special ChoosePartyForBattleFrontier waitstate compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C61 diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index b0651bb1e..2c9cb94b8 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -147,8 +147,8 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D fadescreen 1 call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 2 - special sub_80F9490 + setvar VAR_0x8005, 2 @ 2 of the 3 party mons are selected for battle + special ChoosePartyForBattleFrontier waitstate frontier_resetsketch compare VAR_RESULT, 0 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 8e2fb872f..772919552 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -77,8 +77,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 compare VAR_TEMP_F, 0 goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C - setvar VAR_0x8004, 5 - special CallBattlePalaceFunction + palace_getopponentintro lockall msgbox gStringVar4, MSGBOX_DEFAULT waitmessage diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 0f571ebe2..30cbd039a 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -53,8 +53,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF addobject 2 applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1 waitmovement 0 - setvar VAR_0x8004, 5 - special CallBattlePalaceFunction + palace_getopponentintro msgbox gStringVar4, MSGBOX_DEFAULT waitmessage call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index 32bed3022..49e658a38 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -175,8 +175,8 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 fadescreen 1 call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 3 - special sub_80F9490 + setvar VAR_0x8005, FRONTIER_PARTY_SIZE + special ChoosePartyForBattleFrontier waitstate compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB91 diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index 2f966213c..a6d4281a8 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -141,8 +141,8 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB fadescreen 1 call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 3 - special sub_80F9490 + setvar VAR_0x8005, FRONTIER_PARTY_SIZE + special ChoosePartyForBattleFrontier waitstate compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA73 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index 2794c845c..f5f4b0c29 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -150,8 +150,8 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 fadescreen 1 call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 3 - special sub_80F9490 + setvar VAR_0x8005, FRONTIER_PARTY_SIZE + special ChoosePartyForBattleFrontier waitstate compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250AC1 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index e64bd9690..cf6f682f7 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -239,8 +239,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 fadescreen 1 call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 3 - special sub_80F9490 + setvar VAR_0x8005, FRONTIER_PARTY_SIZE + special ChoosePartyForBattleFrontier waitstate compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 @@ -310,8 +310,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED fadescreen 1 call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 4 - special sub_80F9490 + setvar VAR_0x8005, FRONTIER_DOUBLES_PARTY_SIZE + special ChoosePartyForBattleFrontier waitstate compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 @@ -382,8 +382,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 fadescreen 1 call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 2 - special sub_80F9490 + setvar VAR_0x8005, FRONTIER_MULTI_PARTY_SIZE + special ChoosePartyForBattleFrontier waitstate compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 @@ -453,8 +453,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 fadescreen 1 call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 2 - special sub_80F9490 + setvar VAR_0x8005, FRONTIER_MULTI_PARTY_SIZE + special ChoosePartyForBattleFrontier waitstate compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index d8f6470a2..6234fffb1 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -49,12 +49,12 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F playse SE_W187 waitse waitmovement 0 - msgbox FallarborTown_BattleTentBattleRoom_Text_257C93, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleArenaBattleRoom_Text_SetKOTourneyBegin, MSGBOX_DEFAULT setvar VAR_0x8004, 4 special CallVerdanturfTentFunction msgbox gStringVar4, MSGBOX_DEFAULT waitmessage - call FallarborTown_BattleTentBattleRoom_EventScript_257B6C + call BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle switch VAR_RESULT case 1, FallarborTown_BattleTentBattleRoom_EventScript_20099C applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA3 @@ -63,7 +63,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F waitmovement 0 setvar VAR_0x8004, 6 special CallFallarborTentFunction - msgbox FallarborTown_BattleTentBattleRoom_Text_257CCE, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsOpponent, MSGBOX_DEFAULT FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST @@ -76,7 +76,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20099C:: @ 820099C playse SE_BAN waitse waitmovement 0 - msgbox FallarborTown_BattleTentBattleRoom_Text_257CB3, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsPlayer, MSGBOX_DEFAULT closemessage FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3 @@ -92,7 +92,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3 waitmovement 0 applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B94 waitmovement 0 - msgbox FallarborTown_BattleTentBattleRoom_Text_257CE9, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleArenaBattleRoom_Text_MonsWillBeRestored, MSGBOX_DEFAULT special LoadPlayerParty special SavePlayerParty frontier_setpartyorder FRONTIER_PARTY_SIZE @@ -113,14 +113,14 @@ FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A case 2, FallarborTown_BattleTentBattleRoom_EventScript_200AA6 FallarborTown_BattleTentBattleRoom_EventScript_200A78:: @ 8200A78 - msgbox FallarborTown_BattleTentBattleRoom_Text_257E6B, MSGBOX_YESNO + msgbox BattleFrontier_BattleArenaBattleRoom_Text_SaveAndShutDown, MSGBOX_YESNO switch VAR_RESULT case NO, FallarborTown_BattleTentBattleRoom_EventScript_200A2A case YES, FallarborTown_BattleTentBattleRoom_EventScript_200B51 case MULTI_B_PRESSED, FallarborTown_BattleTentBattleRoom_EventScript_200A2A FallarborTown_BattleTentBattleRoom_EventScript_200AA6:: @ 8200AA6 - message FallarborTown_BattleTentBattleRoom_Text_257E9E + message BattleFrontier_BattleArenaBattleRoom_Text_RetireFromChallenge waitmessage multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT @@ -155,17 +155,17 @@ FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3 special CallBattleArenaFunction FallarborTown_BattleTentBattleRoom_EventScript_200B43:: @ 8200B43 - message FallarborTown_BattleTentBattleRoom_Text_257D17 + message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor2ndOpponent waitmessage return FallarborTown_BattleTentBattleRoom_EventScript_200B4A:: @ 8200B4A - message FallarborTown_BattleTentBattleRoom_Text_257D50 + message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor3rdOpponent waitmessage return FallarborTown_BattleTentBattleRoom_EventScript_200B51:: @ 8200B51 - message FallarborTown_BattleTentBattleRoom_Text_257EDB + message BattleFrontier_BattleArenaBattleRoom_Text_SavingPleaseWait waitmessage setvar VAR_0x8004, 3 setvar VAR_0x8005, 2 diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index 0b783e839..2bea29f38 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -139,8 +139,8 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D msgbox FallarborTown_BattleTentLobby_Text_2C4BC8, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - special sub_80F9490 + setvar VAR_0x8005, FRONTIER_PARTY_SIZE + special ChoosePartyForBattleFrontier waitstate compare VAR_RESULT, 0 goto_if_eq FallarborTown_BattleTentLobby_EventScript_2001C2 @@ -272,12 +272,12 @@ FallarborTown_BattleTentLobby_EventScript_200245:: @ 8200245 FallarborTown_BattleTentLobby_EventScript_20024F:: @ 820024F lockall - msgbox FallarborTown_BattleTentLobby_Text_256DB8, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleArenaLobby_Text_RulesAreListed, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end FallarborTown_BattleTentLobby_EventScript_20025E:: @ 820025E - message FallarborTown_BattleTentLobby_Text_256DDF + message BattleFrontier_BattleArenaLobby_Text_ReadWhichHeading waitmessage multichoice 17, 0, MULTI_FALLARBOR_TENT_RULES, 0 switch VAR_RESULT @@ -296,22 +296,22 @@ FallarborTown_BattleTentLobby_EventScript_2002BC:: @ 82002BC end FallarborTown_BattleTentLobby_EventScript_2002CA:: @ 82002CA - msgbox FallarborTown_BattleTentLobby_Text_256E02, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleArenaLobby_Text_ExplainBattleRules, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end FallarborTown_BattleTentLobby_EventScript_2002D8:: @ 82002D8 - msgbox FallarborTown_BattleTentLobby_Text_256F43, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleArenaLobby_Text_ExplainMindRules, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end FallarborTown_BattleTentLobby_EventScript_2002E6:: @ 82002E6 - msgbox FallarborTown_BattleTentLobby_Text_256FF2, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleArenaLobby_Text_ExplainSkillRules, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end FallarborTown_BattleTentLobby_EventScript_2002F4:: @ 82002F4 - msgbox FallarborTown_BattleTentLobby_Text_257202, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleArenaLobby_Text_ExplainBodyRules, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index 348cff47e..0f2ec453e 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -140,8 +140,8 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF msgbox VerdanturfTown_BattleTentLobby_Text_2C5633, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8004, 1 - setvar VAR_0x8005, 3 - special sub_80F9490 + setvar VAR_0x8005, FRONTIER_PARTY_SIZE + special ChoosePartyForBattleFrontier waitstate compare VAR_RESULT, 0 goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_201A34 diff --git a/data/specials.inc b/data/specials.inc index 56a0d02c4..ce307341d 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -256,7 +256,7 @@ gSpecials:: @ 81DBA64 def_special CallVerdanturfTentFunction def_special CallFallarborTentFunction def_special CallSlateportTentFunction - def_special sub_80F9490 + def_special ChoosePartyForBattleFrontier def_special ValidateEReaderTrainer def_special GetBestBattleTowerStreak def_special ReducePlayerPartyToSelectedMons diff --git a/include/constants/battle_arena.h b/include/constants/battle_arena.h new file mode 100644 index 000000000..f91a6f674 --- /dev/null +++ b/include/constants/battle_arena.h @@ -0,0 +1,20 @@ +#ifndef GUARD_CONSTANTS_BATTLE_ARENA_H +#define GUARD_CONSTANTS_BATTLE_ARENA_H + +#define BATTLE_ARENA_FUNC_INIT 0 +#define BATTLE_ARENA_FUNC_GET_DATA 1 +#define BATTLE_ARENA_FUNC_SET_DATA 2 +#define BATTLE_ARENA_FUNC_SAVE 3 +#define BATTLE_ARENA_FUNC_SET_REWARD 4 +#define BATTLE_ARENA_FUNC_GIVE_REWARD 5 +#define BATTLE_ARENA_FUNC_GET_TRAINER_NAME 6 + +#define ARENA_DATA_REWARD 0 +#define ARENA_DATA_WIN_STREAK 1 +#define ARENA_DATA_WIN_STREAK_ACTIVE 2 + +#define ARENA_CATEGORY_MIND 0 +#define ARENA_CATEGORY_SKILL 1 +#define ARENA_CATEGORY_BODY 2 + +#endif //GUARD_CONSTANTS_BATTLE_ARENA_H diff --git a/include/constants/battle_palace.h b/include/constants/battle_palace.h new file mode 100644 index 000000000..027adf7c8 --- /dev/null +++ b/include/constants/battle_palace.h @@ -0,0 +1,15 @@ +#ifndef GUARD_CONSTANTS_BATTLE_PALACE_H +#define GUARD_CONSTANTS_BATTLE_PALACE_H + +#define BATTLE_PALACE_FUNC_0 0 +#define BATTLE_PALACE_FUNC_1 1 +#define BATTLE_PALACE_FUNC_2 2 +#define BATTLE_PALACE_FUNC_3 3 +#define BATTLE_PALACE_FUNC_4 4 +#define BATTLE_PALACE_FUNC_GET_OPPONENT_INTRO 5 +#define BATTLE_PALACE_FUNC_6 6 +#define BATTLE_PALACE_FUNC_7 7 +#define BATTLE_PALACE_FUNC_8 8 +#define BATTLE_PALACE_FUNC_9 9 + +#endif //GUARD_CONSTANTS_BATTLE_PALACE_H diff --git a/src/battle_arena.c b/src/battle_arena.c index c3d227376..e9af29622 100644 --- a/src/battle_arena.c +++ b/src/battle_arena.c @@ -20,6 +20,7 @@ #include "text.h" #include "util.h" #include "constants/songs.h" +#include "constants/battle_arena.h" #include "constants/battle_string_ids.h" #include "constants/battle_frontier.h" #include "constants/frontier_util.h" @@ -31,7 +32,7 @@ static void InitArenaChallenge(void); static void GetArenaData(void); static void SetArenaData(void); -static void sub_81A5AC4(void); +static void SaveArenaChallenge(void); static void SetArenaRewardItem(void); static void GiveArenaRewardItem(void); static void BufferArenaOpponentName(void); @@ -468,13 +469,13 @@ static const struct CompressedSpriteSheet sBattleArenaJudgementSymbolsSpriteShee static void (* const sArenaFunctions[])(void) = { - InitArenaChallenge, - GetArenaData, - SetArenaData, - sub_81A5AC4, - SetArenaRewardItem, - GiveArenaRewardItem, - BufferArenaOpponentName, + [BATTLE_ARENA_FUNC_INIT] = InitArenaChallenge, + [BATTLE_ARENA_FUNC_GET_DATA] = GetArenaData, + [BATTLE_ARENA_FUNC_SET_DATA] = SetArenaData, + [BATTLE_ARENA_FUNC_SAVE] = SaveArenaChallenge, + [BATTLE_ARENA_FUNC_SET_REWARD] = SetArenaRewardItem, + [BATTLE_ARENA_FUNC_GIVE_REWARD] = GiveArenaRewardItem, + [BATTLE_ARENA_FUNC_GET_TRAINER_NAME] = BufferArenaOpponentName, }; static const u16 sShortStreakRewardItems[] = @@ -563,8 +564,8 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state) break; case 4: PlaySE(SE_HANTEI1); - ShowJudgmentSprite(80, 40, 0, 0); - ShowJudgmentSprite(160, 40, 0, 1); + ShowJudgmentSprite(80, 40, ARENA_CATEGORY_MIND, B_POSITION_PLAYER_LEFT); + ShowJudgmentSprite(160, 40, ARENA_CATEGORY_MIND, B_POSITION_OPPONENT_LEFT); BattleStringExpandPlaceholdersToDisplayedString(gText_Judgement); BattlePutTextOnWindow(gDisplayedStringBattle, 21); (*state)++; @@ -572,8 +573,8 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state) break; case 5: PlaySE(SE_HANTEI1); - ShowJudgmentSprite(80, 56, 1, 0); - ShowJudgmentSprite(160, 56, 1, 1); + ShowJudgmentSprite(80, 56, ARENA_CATEGORY_SKILL, B_POSITION_PLAYER_LEFT); + ShowJudgmentSprite(160, 56, ARENA_CATEGORY_SKILL, B_POSITION_OPPONENT_LEFT); BattleStringExpandPlaceholdersToDisplayedString(gText_Judgement); BattlePutTextOnWindow(gDisplayedStringBattle, 21); (*state)++; @@ -581,8 +582,8 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state) break; case 6: PlaySE(SE_HANTEI1); - ShowJudgmentSprite(80, 72, 2, 0); - ShowJudgmentSprite(160, 72, 2, 1); + ShowJudgmentSprite(80, 72, ARENA_CATEGORY_BODY, B_POSITION_PLAYER_LEFT); + ShowJudgmentSprite(160, 72, ARENA_CATEGORY_BODY, B_POSITION_OPPONENT_LEFT); BattleStringExpandPlaceholdersToDisplayedString(gText_Judgement); BattlePutTextOnWindow(gDisplayedStringBattle, 21); (*state)++; @@ -642,15 +643,15 @@ static void ShowJudgmentSprite(u8 x, u8 y, u8 category, u8 battler) switch (category) { - case 0: + case ARENA_CATEGORY_MIND: pointsPlayer = mindPoints[battler]; pointsOpponent = mindPoints[BATTLE_OPPOSITE(battler)]; break; - case 1: + case ARENA_CATEGORY_SKILL: pointsPlayer = skillPoints[battler]; pointsOpponent = skillPoints[BATTLE_OPPOSITE(battler)]; break; - case 2: + case ARENA_CATEGORY_BODY: pointsPlayer = (gBattleMons[battler].hp * 100) / hpAtStart[battler]; pointsOpponent = (gBattleMons[BATTLE_OPPOSITE(battler)].hp * 100) / hpAtStart[BATTLE_OPPOSITE(battler)]; break; @@ -809,13 +810,13 @@ static void GetArenaData(void) switch (gSpecialVar_0x8005) { - case 0: + case ARENA_DATA_REWARD: gSpecialVar_Result = gSaveBlock2Ptr->frontier.arenaRewardItem; break; - case 1: + case ARENA_DATA_WIN_STREAK: gSpecialVar_Result = gSaveBlock2Ptr->frontier.arenaWinStreaks[lvlMode]; break; - case 2: + case ARENA_DATA_WIN_STREAK_ACTIVE: if (lvlMode != FRONTIER_LVL_50) gSpecialVar_Result = gSaveBlock2Ptr->frontier.winStreakActiveFlags & STREAK_ARENA_OPEN; else @@ -830,13 +831,13 @@ static void SetArenaData(void) switch (gSpecialVar_0x8005) { - case 0: + case ARENA_DATA_REWARD: gSaveBlock2Ptr->frontier.arenaRewardItem = gSpecialVar_0x8006; break; - case 1: + case ARENA_DATA_WIN_STREAK: gSaveBlock2Ptr->frontier.arenaWinStreaks[lvlMode] = gSpecialVar_0x8006; break; - case 2: + case ARENA_DATA_WIN_STREAK_ACTIVE: if (lvlMode != FRONTIER_LVL_50) { if (gSpecialVar_0x8006) @@ -855,7 +856,7 @@ static void SetArenaData(void) } } -static void sub_81A5AC4(void) +static void SaveArenaChallenge(void) { gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005; VarSet(VAR_TEMP_0, 0); @@ -878,7 +879,7 @@ static void GiveArenaRewardItem(void) if (AddBagItem(gSaveBlock2Ptr->frontier.arenaRewardItem, 1) == TRUE) { CopyItemName(gSaveBlock2Ptr->frontier.arenaRewardItem, gStringVar1); - gSaveBlock2Ptr->frontier.arenaRewardItem = 0; + gSaveBlock2Ptr->frontier.arenaRewardItem = ITEM_NONE; gSpecialVar_Result = TRUE; } else diff --git a/src/battle_palace.c b/src/battle_palace.c index ed3fb751e..ec909e442 100644 --- a/src/battle_palace.c +++ b/src/battle_palace.c @@ -9,7 +9,9 @@ #include "string_util.h" #include "constants/items.h" #include "constants/battle_frontier.h" +#include "constants/battle_palace.h" #include "constants/frontier_util.h" +#include "constants/trainers.h" // This file's functions. static void sub_8195980(void); @@ -17,7 +19,7 @@ static void sub_8195A38(void); static void sub_8195AE4(void); static void sub_8195BB0(void); static void sub_8195C20(void); -static void sub_8195C50(void); +static void BufferOpponentIntroSpeech(void); static void sub_8195C7C(void); static void sub_8195CE4(void); static void sub_8195D28(void); @@ -26,16 +28,16 @@ static void sub_8195DB8(void); // Const rom data. static void (* const sBattlePalaceFunctions[])(void) = { - sub_8195980, - sub_8195A38, - sub_8195AE4, - sub_8195BB0, - sub_8195C20, - sub_8195C50, - sub_8195C7C, - sub_8195CE4, - sub_8195D28, - sub_8195DB8, + [BATTLE_PALACE_FUNC_0] = sub_8195980, + [BATTLE_PALACE_FUNC_1] = sub_8195A38, + [BATTLE_PALACE_FUNC_2] = sub_8195AE4, + [BATTLE_PALACE_FUNC_3] = sub_8195BB0, + [BATTLE_PALACE_FUNC_4] = sub_8195C20, + [BATTLE_PALACE_FUNC_GET_OPPONENT_INTRO] = BufferOpponentIntroSpeech, + [BATTLE_PALACE_FUNC_6] = sub_8195C7C, + [BATTLE_PALACE_FUNC_7] = sub_8195CE4, + [BATTLE_PALACE_FUNC_8] = sub_8195D28, + [BATTLE_PALACE_FUNC_9] = sub_8195DB8, }; static const u16 gUnknown_0860DE78[] = {ITEM_HP_UP, ITEM_PROTEIN, ITEM_IRON, ITEM_CALCIUM, ITEM_CARBOS, ITEM_ZINC}; @@ -135,9 +137,9 @@ static void sub_8195C20(void) SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0); } -static void sub_8195C50(void) +static void BufferOpponentIntroSpeech(void) { - if (gTrainerBattleOpponent_A < 300) + if (gTrainerBattleOpponent_A < TRAINER_RECORD_MIXING_FRIEND) FrontierSpeechToString(gFacilityTrainers[gTrainerBattleOpponent_A].speechBefore); } diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c index 8c3da5fc8..0e191d652 100755 --- a/src/script_pokemon_util_80F87D8.c +++ b/src/script_pokemon_util_80F87D8.c @@ -43,7 +43,7 @@ static const u8 gUnknown_0858D8EC[] = { 3, 4, 5, 14 }; static void Task_ShowContestEntryMonPic(u8 taskId); static void Task_LinkContestWaitForConnection(u8 taskId); static void CB2_ReturnFromChooseHalfParty(void); -static void sub_80F94B8(void); +static void CB2_ReturnFromChooseBattleFrontierParty(void); void SetContestTrainerGfxIds(void) { @@ -681,21 +681,21 @@ static void CB2_ReturnFromChooseHalfParty(void) SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } -void sub_80F9490(void) +void ChoosePartyForBattleFrontier(void) { - gMain.savedCallback = sub_80F94B8; + gMain.savedCallback = CB2_ReturnFromChooseBattleFrontierParty; InitChooseHalfPartyForBattle(gSpecialVar_0x8004 + 1); } -static void sub_80F94B8(void) +static void CB2_ReturnFromChooseBattleFrontierParty(void) { switch (gSelectedOrderFromParty[0]) { case 0: - gSpecialVar_Result = 0; + gSpecialVar_Result = FALSE; break; default: - gSpecialVar_Result = 1; + gSpecialVar_Result = TRUE; break; } |