diff options
Diffstat (limited to 'data')
16 files changed, 604 insertions, 603 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 605cf23ac..c7e21e77c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -483,7 +483,7 @@ gStdScripts_End:: @ 81DC2CC .include "data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc" .include "data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc" .include "data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc" - .include "data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc" + .include "data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc" .include "data/maps/BattleFrontier_BattlePyramidTop/scripts.inc" .include "data/maps/BattleFrontier_BattleArenaLobby/scripts.inc" .include "data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc" diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin b/data/layouts/BattleFrontier_BattlePyramidFloor/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin +++ b/data/layouts/BattleFrontier_BattlePyramidFloor/border.bin diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin b/data/layouts/BattleFrontier_BattlePyramidFloor/map.bin index 7c224d524..7c224d524 100644 --- a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin +++ b/data/layouts/BattleFrontier_BattlePyramidFloor/map.bin diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index ffa394fa1..201cd7bdf 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -3602,14 +3602,14 @@ "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin" }, { - "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", - "name": "BattleFrontier_BattlePyramidEmptySquare_Layout", + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR", + "name": "BattleFrontier_BattlePyramidFloor_Layout", "width": 8, "height": 8, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_BattlePyramid", - "border_filepath": "data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin", - "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin" + "border_filepath": "data/layouts/BattleFrontier_BattlePyramidFloor/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidFloor/map.bin" }, { "id": "LAYOUT_BATTLE_PYRAMID_SQUARE01", diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 8d594695c..a96063caa 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -1,15 +1,14 @@ BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2 map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeLobby_MapScript1_2497F2 map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_24980F - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_2497FB + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_OnWarp .byte 0 BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2 dome_21 end -BattleFrontier_BattleDomeLobby_MapScript2_2497FB: @ 82497FB -BattleFrontier_BattlePyramidLobby_MapScript2_2497FB: @ 82497FB +BattleFrontier_BattleDomeLobby_OnWarp: @ 82497FB map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeLobby_EventScript_249805 .2byte 0 diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json b/data/maps/BattleFrontier_BattlePyramidFloor/map.json index 3f4739b26..2b3baf425 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json +++ b/data/maps/BattleFrontier_BattlePyramidFloor/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", - "name": "BattleFrontier_BattlePyramidEmptySquare", - "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", + "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR", + "name": "BattleFrontier_BattlePyramidFloor", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR", "music": "MUS_NONE", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc index e73b9d917..f590ff890 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc @@ -1,73 +1,72 @@ -BattleFrontier_BattlePyramidEmptySquare_MapScripts:: @ 8252A33 - map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2 - map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43 - map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA +BattleFrontier_BattlePyramidFloor_MapScripts:: @ 8252A33 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidFloor_OnResume + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidFloor_OnFrame + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidFloor_OnTransition .byte 0 -BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43: @ 8252A43 - map_script_2 VAR_TEMP_D, 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D - map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98 - map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F +BattleFrontier_BattlePyramidFloor_OnFrame: @ 8252A43 + map_script_2 VAR_TEMP_D, 1, BattleFrontier_BattlePyramidFloor_EventScript_UpdateLight + map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidFloor_EventScript_PlayPyramidMusic + map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidFloor_EventScript_ShowMapName .2byte 0 -BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D +BattleFrontier_BattlePyramidFloor_EventScript_UpdateLight:: @ 8252A5D lockall + @ pyramid_updatelight, cant use macro because it straddles the loop setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT setvar VAR_0x8005, 4 setvar VAR_0x8006, PYRAMID_LIGHT_INCR_RADIUS setvar VAR_0x8007, SE_SAVE setvar VAR_RESULT, 0 -BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77 +BattleFrontier_BattlePyramidFloor_EventScript_UpdateLightLoop:: @ 8252A77 special CallBattlePyramidFunction delay 2 compare VAR_RESULT, 2 - goto_if_ne BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77 + goto_if_ne BattleFrontier_BattlePyramidFloor_EventScript_UpdateLightLoop setvar VAR_TEMP_D, 0 releaseall end -BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F:: @ 8252A8F +BattleFrontier_BattlePyramidFloor_EventScript_ShowMapName:: @ 8252A8F special ShowMapNamePopup setvar VAR_TEMP_F, 0 end -BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98 +BattleFrontier_BattlePyramidFloor_EventScript_PlayPyramidMusic:: @ 8252A98 playbgm MUS_PYRAMID, 0 setvar VAR_TEMP_E, 1 end -BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 +BattleFrontier_BattlePyramidFloor_OnResume: @ 8252AA2 pyramid_setfloorpal frontier_getstatus switch VAR_TEMP_0 - case 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D - case CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66 - case CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D + case 0, BattleFrontier_BattlePyramidFloor_EventScript_ReadyChallenge + case CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramid_EventScript_WarpToLobby + case CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidFloor_EventScript_ReadyChallenge frontier_get FRONTIER_DATA_BATTLE_OUTCOME compare VAR_RESULT, B_OUTCOME_RAN - goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 + goto_if_eq BattleFrontier_BattlePyramidFloor_EventScript_ResetParty compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 + goto_if_eq BattleFrontier_BattlePyramidFloor_EventScript_ResetParty compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 + goto_if_eq BattleFrontier_BattlePyramidFloor_EventScript_ResetParty compare VAR_RESULT, B_OUTCOME_LOST - goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost compare VAR_RESULT, B_OUTCOME_DREW - goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost compare VAR_RESULT, B_OUTCOME_FORFEITED - goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost frontier_isbattletype BATTLE_TYPE_TRAINER @ VAR_RESULT seems to be ignored here setvar VAR_TEMP_D, 1 -BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39 - pyramid_healparty +BattleFrontier_BattlePyramidFloor_EventScript_ResetParty:: @ 8252B39 + pyramid_resetparty end -BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42:: @ 8252B42 -BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42 +BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost:: @ 8252B42 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST pyramid_set PYRAMID_DATA_TRAINER_FLAGS, 255 -BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66:: @ 8252B66 -BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66 +BattleFrontier_BattlePyramid_EventScript_WarpToLobby:: @ 8252B66 pyramid_updatelight 0, PYRAMID_LIGHT_SET_RADIUS pyramid_clearhelditems special HealPlayerParty @@ -75,39 +74,39 @@ BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66 waitstate end -BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D +BattleFrontier_BattlePyramidFloor_EventScript_ReadyChallenge:: @ 8252B8D pyramid_save CHALLENGE_STATUS_SAVING special SavePlayerParty frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 - pyramid_inittrainers + pyramid_settrainers frontier_setpartyorder FRONTIER_PARTY_SIZE setvar VAR_TEMP_F, 1 end -BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA: @ 8252BCA - call BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5 +BattleFrontier_BattlePyramidFloor_OnTransition: @ 8252BCA + call BattleFrontier_BattlePyramidFloor_EventScript_SetLightRadius setvar VAR_TEMP_F, 1 end -BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5 +BattleFrontier_BattlePyramidFloor_EventScript_SetLightRadius:: @ 8252BD5 pyramid_updatelight 32, PYRAMID_LIGHT_SET_RADIUS return -BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8 +BattlePyramid_WarpToNextFloor:: @ 8252BE8 call BattleFrontier_EventScript_IncrementWinStreak frontier_get FRONTIER_DATA_BATTLE_NUM @ Floor number addvar VAR_RESULT, 1 frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT compare VAR_RESULT, 7 - goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45 + goto_if_eq BattlePyramid_WarpToTop pyramid_seedfloor frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 setvar VAR_RESULT, 0 - warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 + warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR, 255, 1, 1 waitstate end -BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45 +BattlePyramid_WarpToTop:: @ 8252C45 warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP, 255, 17, 17 waitstate end @@ -126,14 +125,15 @@ BattlePyramid_FindItemBall:: @ 8252C6A pyramid_setitem callstd STD_FIND_ITEM compare VAR_0x8007, 0 - goto_if_eq BattlePyramid_FindItemBall_End + goto_if_eq BattlePyramid_FindItemBallEnd pyramid_hideitem -BattlePyramid_FindItemBall_End:: @ 8252C87 +BattlePyramid_FindItemBallEnd:: @ 8252C87 end -BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88:: @ 8252C88 - goto BattleFrontier_BattlePyramidTop_EventScript_252B42 +BattlePyramid_Retire:: @ 8252C88 + goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost +@ Also used by Trainer Hill BattleFacility_TrainerBattle_PlaceholderText: @ 8252C8D .string "This is a sample message.$" @@ -146,595 +146,595 @@ gText_BattlePyramidConfirmRetire:: @ 8252CFB .string "Are you sure you want to quit your\n" .string "PYRAMID quest?$" -BattlePyramid_ExitHintUp_Text1:: @ 8252D2D +BattlePyramid_Text_ExitHintUp1:: @ 8252D2D .string "This floor's exit is in\n" .string "that direction: {UP_ARROW}$" -BattlePyramid_ExitHintLeft_Text1:: @ 8252D57 +BattlePyramid_Text_ExitHintLeft1:: @ 8252D57 .string "This floor's exit is in\n" .string "that direction: {LEFT_ARROW}$" -BattlePyramid_ExitHintRight_Text1:: @ 8252D81 +BattlePyramid_Text_ExitHintRight1:: @ 8252D81 .string "This floor's exit is in\n" .string "that direction: {RIGHT_ARROW}$" -BattlePyramid_ExitHintDown_Text1:: @ 8252DAB +BattlePyramid_Text_ExitHintDown1:: @ 8252DAB .string "This floor's exit is in\n" .string "that direction: {DOWN_ARROW}$" -BattlePyramid_ExitHintUp_Text2:: @ 8252DD5 +BattlePyramid_Text_ExitHintUp2:: @ 8252DD5 .string "The exit on this floor is in\n" .string "the {UP_ARROW} direction.$" -BattlePyramid_ExitHintLeft_Text2:: @ 8252E03 +BattlePyramid_Text_ExitHintLeft2:: @ 8252E03 .string "The exit on this floor is in\n" .string "the {LEFT_ARROW} direction.$" -BattlePyramid_ExitHintRight_Text2:: @ 8252E31 +BattlePyramid_Text_ExitHintRight2:: @ 8252E31 .string "The exit on this floor is in\n" .string "the {RIGHT_ARROW} direction.$" -BattlePyramid_ExitHintDown_Text2:: @ 8252E5F +BattlePyramid_Text_ExitHintDown2:: @ 8252E5F .string "The exit on this floor is in\n" .string "the {DOWN_ARROW} direction.$" -BattlePyramid_ExitHintUp_Text3:: @ 8252E8D +BattlePyramid_Text_ExitHintUp3:: @ 8252E8D .string "The exit is over\n" .string "that {UP_ARROW} way.$" -BattlePyramid_ExitHintLeft_Text3:: @ 8252EAA +BattlePyramid_Text_ExitHintLeft3:: @ 8252EAA .string "The exit is over\n" .string "that {LEFT_ARROW} way.$" -BattlePyramid_ExitHintRight_Text3:: @ 8252EC7 +BattlePyramid_Text_ExitHintRight3:: @ 8252EC7 .string "The exit is over\n" .string "that {RIGHT_ARROW} way.$" -BattlePyramid_ExitHintDown_Text3:: @ 8252EE4 +BattlePyramid_Text_ExitHintDown3:: @ 8252EE4 .string "The exit is over\n" .string "that {DOWN_ARROW} way.$" -BattlePyramid_ExitHintUp_Text4:: @ 8252F01 +BattlePyramid_Text_ExitHintUp4:: @ 8252F01 .string "On this floor, the exit is somewhere\n" .string "in the {UP_ARROW} direction.$" -BattlePyramid_ExitHintLeft_Text4:: @ 8252F3A +BattlePyramid_Text_ExitHintLeft4:: @ 8252F3A .string "On this floor, the exit is somewhere\n" .string "in the {LEFT_ARROW} direction.$" -BattlePyramid_ExitHintRight_Text4:: @ 8252F73 +BattlePyramid_Text_ExitHintRight4:: @ 8252F73 .string "On this floor, the exit is somewhere\n" .string "in the {RIGHT_ARROW} direction.$" -BattlePyramid_ExitHintDown_Text4:: @ 8252FAC +BattlePyramid_Text_ExitHintDown4:: @ 8252FAC .string "On this floor, the exit is somewhere\n" .string "in the {DOWN_ARROW} direction.$" -BattlePyramid_ExitHintUp_Text5:: @ 8252FE5 +BattlePyramid_Text_ExitHintUp5:: @ 8252FE5 .string "The exit?\n" .string "It's that {UP_ARROW} way.$" -BattlePyramid_ExitHintLeft_Text5:: @ 8253000 +BattlePyramid_Text_ExitHintLeft5:: @ 8253000 .string "The exit?\n" .string "It's that {LEFT_ARROW} way.$" -BattlePyramid_ExitHintRight_Text5:: @ 825301B +BattlePyramid_Text_ExitHintRight5:: @ 825301B .string "The exit?\n" .string "It's that {RIGHT_ARROW} way.$" -BattlePyramid_ExitHintDown_Text5:: @ 8253036 +BattlePyramid_Text_ExitHintDown5:: @ 8253036 .string "The exit?\n" .string "It's that {DOWN_ARROW} way.$" -BattlePyramid_ExitHintUp_Text6:: @ 8253051 +BattlePyramid_Text_ExitHintUp6:: @ 8253051 .string "The exit happens to be in\n" .string "the {UP_ARROW} direction.$" -BattlePyramid_ExitHintLeft_Text6:: @ 825307C +BattlePyramid_Text_ExitHintLeft6:: @ 825307C .string "The exit happens to be in\n" .string "the {LEFT_ARROW} direction.$" -BattlePyramid_ExitHintRight_Text6:: @ 82530A7 +BattlePyramid_Text_ExitHintRight6:: @ 82530A7 .string "The exit happens to be in\n" .string "the {RIGHT_ARROW} direction.$" -BattlePyramid_ExitHintDown_Text6:: @ 82530D2 +BattlePyramid_Text_ExitHintDown6:: @ 82530D2 .string "The exit happens to be in\n" .string "the {DOWN_ARROW} direction.$" -BattlePyramid_EightItemsRemaining_Text1:: @ 82530FD +BattlePyramid_Text_EightItemsRemaining1:: @ 82530FD .string "Are you looking for items?\p" .string "There are eight items left to\n" .string "be found.$" -BattlePyramid_SevenItemsRemaining_Text1:: @ 8253140 +BattlePyramid_Text_SevenItemsRemaining1:: @ 8253140 .string "Are you looking for items?\p" .string "There are seven items left to\n" .string "be found.$" -BattlePyramid_SixItemsRemaining_Text1:: @ 8253183 +BattlePyramid_Text_SixItemsRemaining1:: @ 8253183 .string "Are you looking for items?\p" .string "There are six items left to\n" .string "be found.$" -BattlePyramid_FiveItemsRemaining_Text1:: @ 82531C4 +BattlePyramid_Text_FiveItemsRemaining1:: @ 82531C4 .string "Are you looking for items?\p" .string "There are five items left to\n" .string "be found.$" -BattlePyramid_FourItemsRemaining_Text1:: @ 8253206 +BattlePyramid_Text_FourItemsRemaining1:: @ 8253206 .string "Are you looking for items?\p" .string "There are four items left to\n" .string "be found.$" -BattlePyramid_ThreeItemsRemaining_Text1:: @ 8253248 +BattlePyramid_Text_ThreeItemsRemaining1:: @ 8253248 .string "Are you looking for items?\p" .string "There are three items left to\n" .string "be found.$" -BattlePyramid_TwoItemsRemaining_Text1:: @ 825328B +BattlePyramid_Text_TwoItemsRemaining1:: @ 825328B .string "Are you looking for items?\p" .string "There are two items left to\n" .string "be found.$" -BattlePyramid_OneItemRemaining_Text1:: @ 82532CC +BattlePyramid_Text_OneItemRemaining1:: @ 82532CC .string "Are you looking for items?\p" .string "There is one item left to\n" .string "be found.$" -BattlePyramid_ZeroItemsRemaining_Text1:: @ 825330B +BattlePyramid_Text_ZeroItemsRemaining1:: @ 825330B .string "Are you looking for items?\p" .string "There isn't anything left to\n" .string "be found!$" -BattlePyramid_EightItemsRemaining_Text2:: @ 825334D +BattlePyramid_Text_EightItemsRemaining2:: @ 825334D .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are eight items\n" .string "lying around here.$" -BattlePyramid_SevenItemsRemaining_Text2:: @ 82533A6 +BattlePyramid_Text_SevenItemsRemaining2:: @ 82533A6 .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are seven items left\n" .string "lying around here.$" -BattlePyramid_SixItemsRemaining_Text2:: @ 8253404 +BattlePyramid_Text_SixItemsRemaining2:: @ 8253404 .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are six items left\n" .string "lying around here.$" -BattlePyramid_FiveItemsRemaining_Text2:: @ 8253460 +BattlePyramid_Text_FiveItemsRemaining2:: @ 8253460 .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are five items left\n" .string "lying around here.$" -BattlePyramid_FourItemsRemaining_Text2:: @ 82534BD +BattlePyramid_Text_FourItemsRemaining2:: @ 82534BD .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are four items left\n" .string "lying around here.$" -BattlePyramid_ThreeItemsRemaining_Text2:: @ 825351A +BattlePyramid_Text_ThreeItemsRemaining2:: @ 825351A .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are three items left\n" .string "lying around here.$" -BattlePyramid_TwoItemsRemaining_Text2:: @ 8253578 +BattlePyramid_Text_TwoItemsRemaining2:: @ 8253578 .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are two items left\n" .string "lying around here.$" -BattlePyramid_OneItemRemaining_Text2:: @ 82535D4 +BattlePyramid_Text_OneItemRemaining2:: @ 82535D4 .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There is just one item\n" .string "lying around here.$" -BattlePyramid_ZeroItemsRemaining_Text2:: @ 825362E +BattlePyramid_Text_ZeroItemsRemaining2:: @ 825362E .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There isn't anything left\n" .string "lying around here.$" -BattlePyramid_EightItemsRemaining_Text3:: @ 825368B +BattlePyramid_Text_EightItemsRemaining3:: @ 825368B .string "How's your stock of items holding up?\p" .string "I reckon there are eight items left\n" .string "waiting to be found on this floor.$" -BattlePyramid_SevenItemsRemaining_Text3:: @ 82536F8 +BattlePyramid_Text_SevenItemsRemaining3:: @ 82536F8 .string "How's your stock of items holding up?\p" .string "I reckon there are seven items left\n" .string "waiting to be found on this floor.$" -BattlePyramid_SixItemsRemaining_Text3:: @ 8253765 +BattlePyramid_Text_SixItemsRemaining3:: @ 8253765 .string "How's your stock of items holding up?\p" .string "I reckon there are six items left\n" .string "waiting to be found on this floor.$" -BattlePyramid_FiveItemsRemaining_Text3:: @ 82537D0 +BattlePyramid_Text_FiveItemsRemaining3:: @ 82537D0 .string "How's your stock of items holding up?\p" .string "I reckon there are five items left\n" .string "waiting to be found on this floor.$" -BattlePyramid_FourItemsRemaining_Text3:: @ 825383C +BattlePyramid_Text_FourItemsRemaining3:: @ 825383C .string "How's your stock of items holding up?\p" .string "I reckon there are four items left\n" .string "waiting to be found on this floor.$" -BattlePyramid_ThreeItemsRemaining_Text3:: @ 82538A8 +BattlePyramid_Text_ThreeItemsRemaining3:: @ 82538A8 .string "How's your stock of items holding up?\p" .string "I reckon there are three items left\n" .string "waiting to be found on this floor.$" -BattlePyramid_TwoItemsRemaining_Text3:: @ 8253915 +BattlePyramid_Text_TwoItemsRemaining3:: @ 8253915 .string "How's your stock of items holding up?\p" .string "I reckon there are two items left\n" .string "waiting to be found on this floor.$" -BattlePyramid_OneItemRemaining_Text3:: @ 8253980 +BattlePyramid_Text_OneItemRemaining3:: @ 8253980 .string "How's your stock of items holding up?\p" .string "I reckon there's but one item left\n" .string "waiting to be found on this floor.$" -BattlePyramid_ZeroItemsRemaining_Text3:: @ 82539EC +BattlePyramid_Text_ZeroItemsRemaining3:: @ 82539EC .string "How's your stock of items holding up?\p" .string "I reckon there are no more items\n" .string "waiting to be found on this floor.\l" .string "You take care now!$" -BattlePyramid_EightItemsRemaining_Text4:: @ 8253A69 +BattlePyramid_Text_EightItemsRemaining4:: @ 8253A69 .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be eight more\n" .string "items on the ground.$" -BattlePyramid_SevenItemsRemaining_Text4:: @ 8253AC4 +BattlePyramid_Text_SevenItemsRemaining4:: @ 8253AC4 .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be seven more\n" .string "items on the ground.$" -BattlePyramid_SixItemsRemaining_Text4:: @ 8253B1F +BattlePyramid_Text_SixItemsRemaining4:: @ 8253B1F .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be six more\n" .string "items on the ground.$" -BattlePyramid_FiveItemsRemaining_Text4:: @ 8253B78 +BattlePyramid_Text_FiveItemsRemaining4:: @ 8253B78 .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be five more\n" .string "items on the ground.$" -BattlePyramid_FourItemsRemaining_Text4:: @ 8253BD2 +BattlePyramid_Text_FourItemsRemaining4:: @ 8253BD2 .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be four more\n" .string "items on the ground.$" -BattlePyramid_ThreeItemsRemaining_Text4:: @ 8253C2C +BattlePyramid_Text_ThreeItemsRemaining4:: @ 8253C2C .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be three more\n" .string "items on the ground.$" -BattlePyramid_TwoItemsRemaining_Text4:: @ 8253C87 +BattlePyramid_Text_TwoItemsRemaining4:: @ 8253C87 .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be two more\n" .string "items on the ground.$" -BattlePyramid_OneItemRemaining_Text4:: @ 8253CE0 +BattlePyramid_Text_OneItemRemaining4:: @ 8253CE0 .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appears to be only one more\n" .string "item on the ground.$" -BattlePyramid_ZeroItemsRemaining_Text4:: @ 8253D3E +BattlePyramid_Text_ZeroItemsRemaining4:: @ 8253D3E .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be no more\n" .string "items on the ground.$" -BattlePyramid_EightItemsRemaining_Text5:: @ 8253D96 +BattlePyramid_Text_EightItemsRemaining5:: @ 8253D96 .string "On this floor of the PYRAMID,\n" .string "I hear there are eight items…$" -BattlePyramid_SevenItemsRemaining_Text5:: @ 8253DD2 +BattlePyramid_Text_SevenItemsRemaining5:: @ 8253DD2 .string "On this floor of the PYRAMID,\n" .string "I hear there are seven items…$" -BattlePyramid_SixItemsRemaining_Text5:: @ 8253E0E +BattlePyramid_Text_SixItemsRemaining5:: @ 8253E0E .string "On this floor of the PYRAMID,\n" .string "I hear there are six items…$" -BattlePyramid_FiveItemsRemaining_Text5:: @ 8253E48 +BattlePyramid_Text_FiveItemsRemaining5:: @ 8253E48 .string "On this floor of the PYRAMID,\n" .string "I hear there are five items…$" -BattlePyramid_FourItemsRemaining_Text5:: @ 8253E83 +BattlePyramid_Text_FourItemsRemaining5:: @ 8253E83 .string "On this floor of the PYRAMID,\n" .string "I hear there are four items…$" -BattlePyramid_ThreeItemsRemaining_Text5:: @ 8253EBE +BattlePyramid_Text_ThreeItemsRemaining5:: @ 8253EBE .string "On this floor of the PYRAMID,\n" .string "I hear there are three items…$" -BattlePyramid_TwoItemsRemaining_Text5:: @ 8253EFA +BattlePyramid_Text_TwoItemsRemaining5:: @ 8253EFA .string "On this floor of the PYRAMID,\n" .string "I hear there are two items…$" -BattlePyramid_OneItemRemaining_Text5:: @ 8253F34 +BattlePyramid_Text_OneItemRemaining5:: @ 8253F34 .string "On this floor of the PYRAMID,\n" .string "I hear there is one item…$" -BattlePyramid_ZeroItemsRemaining_Text5:: @ 8253F6C +BattlePyramid_Text_ZeroItemsRemaining5:: @ 8253F6C .string "On this floor of the PYRAMID,\n" .string "I hear there are no items…$" -BattlePyramid_EightItemsRemaining_Text6:: @ 8253FA5 +BattlePyramid_Text_EightItemsRemaining6:: @ 8253FA5 .string "Have you collected any items?\p" .string "I believe there are eight more\n" .string "items on this floor.$" -BattlePyramid_SevenItemsRemaining_Text6:: @ 8253FF7 +BattlePyramid_Text_SevenItemsRemaining6:: @ 8253FF7 .string "Have you collected any items?\p" .string "I believe there are seven more\n" .string "items on this floor.$" -BattlePyramid_SixItemsRemaining_Text6:: @ 8254049 +BattlePyramid_Text_SixItemsRemaining6:: @ 8254049 .string "Have you collected any items?\p" .string "I believe there are six more\n" .string "items on this floor.$" -BattlePyramid_FiveItemsRemaining_Text6:: @ 8254099 +BattlePyramid_Text_FiveItemsRemaining6:: @ 8254099 .string "Have you collected any items?\p" .string "I believe there are five more\n" .string "items on this floor.$" -BattlePyramid_FourItemsRemaining_Text6:: @ 82540EA +BattlePyramid_Text_FourItemsRemaining6:: @ 82540EA .string "Have you collected any items?\p" .string "I believe there are four more\n" .string "items on this floor.$" -BattlePyramid_ThreeItemsRemaining_Text6:: @ 825413B +BattlePyramid_Text_ThreeItemsRemaining6:: @ 825413B .string "Have you collected any items?\p" .string "I believe there are three more\n" .string "items on this floor.$" -BattlePyramid_TwoItemsRemaining_Text6:: @ 825418D +BattlePyramid_Text_TwoItemsRemaining6:: @ 825418D .string "Have you collected any items?\p" .string "I believe there are two more\n" .string "items on this floor.$" -BattlePyramid_OneItemRemaining_Text6:: @ 82541DD +BattlePyramid_Text_OneItemRemaining6:: @ 82541DD .string "Have you collected any items?\p" .string "I believe there is one more\n" .string "item on this floor.$" -BattlePyramid_ZeroItemsRemaining_Text6:: @ 825422B +BattlePyramid_Text_ZeroItemsRemaining6:: @ 825422B .string "Have you collected any items?\p" .string "I believe there are no more\n" .string "items on this floor.$" -BattlePyramid_SevenTrainersRemaining_Text1:: @ 825427A +BattlePyramid_Text_SevenTrainersRemaining1:: @ 825427A .string "You were really awesome!\p" .string "But there are still seven tough\n" .string "TRAINERS other than me!$" -BattlePyramid_SixTrainersRemaining_Text1:: @ 82542CB +BattlePyramid_Text_SixTrainersRemaining1:: @ 82542CB .string "You were really awesome!\p" .string "But there are still six tough\n" .string "TRAINERS other than me!$" -BattlePyramid_FiveTrainersRemaining_Text1:: @ 825431A +BattlePyramid_Text_FiveTrainersRemaining1:: @ 825431A .string "You were really awesome!\p" .string "But there are still five tough\n" .string "TRAINERS other than me!$" -BattlePyramid_FourTrainersRemaining_Text1:: @ 825436A +BattlePyramid_Text_FourTrainersRemaining1:: @ 825436A .string "You were really awesome!\p" .string "But there are still four tough\n" .string "TRAINERS other than me!$" -BattlePyramid_ThreeTrainersRemaining_Text1:: @ 82543BA +BattlePyramid_Text_ThreeTrainersRemaining1:: @ 82543BA .string "You were really awesome!\p" .string "But there are still three tough\n" .string "TRAINERS other than me!$" -BattlePyramid_TwoTrainersRemaining_Text1:: @ 825440B +BattlePyramid_Text_TwoTrainersRemaining1:: @ 825440B .string "You were really awesome!\p" .string "But there are still two tough\n" .string "TRAINERS other than me!$" -BattlePyramid_OneTrainersRemaining_Text1:: @ 825445A +BattlePyramid_Text_OneTrainersRemaining1:: @ 825445A .string "You were really awesome!\p" .string "But there's still one tough\n" .string "TRAINER other than me!$" -BattlePyramid_ZeroTrainersRemaining_Text1:: @ 82544A6 +BattlePyramid_Text_ZeroTrainersRemaining1:: @ 82544A6 .string "You were really awesome!\p" .string "There's no one left that\n" .string "can beat you!$" -BattlePyramid_SevenTrainersRemaining_Text2:: @ 82544E6 +BattlePyramid_Text_SevenTrainersRemaining2:: @ 82544E6 .string "This is so upsetting!\p" .string "But there are seven TRAINERS left!\n" .string "Someone will humble you!$" -BattlePyramid_SixTrainersRemaining_Text2:: @ 8254538 +BattlePyramid_Text_SixTrainersRemaining2:: @ 8254538 .string "This is so upsetting!\p" .string "But there are six TRAINERS left!\n" .string "Someone will humble you!$" -BattlePyramid_FiveTrainersRemaining_Text2:: @ 8254588 +BattlePyramid_Text_FiveTrainersRemaining2:: @ 8254588 .string "This is so upsetting!\p" .string "But there are five TRAINERS left!\n" .string "Someone will humble you!$" -BattlePyramid_FourTrainersRemaining_Text2:: @ 82545D9 +BattlePyramid_Text_FourTrainersRemaining2:: @ 82545D9 .string "This is so upsetting!\p" .string "But there are four TRAINERS left!\n" .string "Someone will humble you!$" -BattlePyramid_ThreeTrainersRemaining_Text2:: @ 825462A +BattlePyramid_Text_ThreeTrainersRemaining2:: @ 825462A .string "This is so upsetting!\p" .string "But there are three TRAINERS left!\n" .string "Someone will humble you!$" -BattlePyramid_TwoTrainersRemaining_Text2:: @ 825467C +BattlePyramid_Text_TwoTrainersRemaining2:: @ 825467C .string "This is so upsetting!\p" .string "But there are two TRAINERS left!\n" .string "Someone will humble you!$" -BattlePyramid_OneTrainersRemaining_Text2:: @ 82546CC +BattlePyramid_Text_OneTrainersRemaining2:: @ 82546CC .string "This is so upsetting!\p" .string "But there's one TRAINER left!\n" .string "I'm sure you will be humbled!$" -BattlePyramid_ZeroTrainersRemaining_Text2:: @ 825471E +BattlePyramid_Text_ZeroTrainersRemaining2:: @ 825471E .string "This is so upsetting!\p" .string "But there are no more TRAINERS\n" .string "who can engage you!$" -BattlePyramid_SevenTrainersRemaining_Text3:: @ 8254767 +BattlePyramid_Text_SevenTrainersRemaining3:: @ 8254767 .string "That's pretty impressive!\p" .string "But there are seven more TRAINERS\n" .string "on this floor. Can you beat them all?$" -BattlePyramid_SixTrainersRemaining_Text3:: @ 82547C9 +BattlePyramid_Text_SixTrainersRemaining3:: @ 82547C9 .string "That's pretty impressive!\p" .string "But there are six more TRAINERS\n" .string "on this floor. Can you beat them all?$" -BattlePyramid_FiveTrainersRemaining_Text3:: @ 8254829 +BattlePyramid_Text_FiveTrainersRemaining3:: @ 8254829 .string "That's pretty impressive!\p" .string "But there are five more TRAINERS\n" .string "on this floor. Can you beat them all?$" -BattlePyramid_FourTrainersRemaining_Text3:: @ 825488A +BattlePyramid_Text_FourTrainersRemaining3:: @ 825488A .string "That's pretty impressive!\p" .string "But there are four more TRAINERS\n" .string "on this floor. Can you beat them all?$" -BattlePyramid_ThreeTrainersRemaining_Text3:: @ 82548EB +BattlePyramid_Text_ThreeTrainersRemaining3:: @ 82548EB .string "That's pretty impressive!\p" .string "But there are three more TRAINERS\n" .string "on this floor. Can you beat them all?$" -BattlePyramid_TwoTrainersRemaining_Text3:: @ 825494D +BattlePyramid_Text_TwoTrainersRemaining3:: @ 825494D .string "That's pretty impressive!\p" .string "But there are two more TRAINERS\n" .string "on this floor. Can you beat them both?$" -BattlePyramid_OneTrainersRemaining_Text3:: @ 82549AE +BattlePyramid_Text_OneTrainersRemaining3:: @ 82549AE .string "That's pretty impressive!\p" .string "But there's still one more TRAINER\n" .string "on this floor. Can you prevail?$" -BattlePyramid_ZeroTrainersRemaining_Text3:: @ 8254A0B +BattlePyramid_Text_ZeroTrainersRemaining3:: @ 8254A0B .string "That's pretty impressive!\p" .string "You've gone through all the TRAINERS\n" .string "on this floor.$" -BattlePyramid_SevenTrainersRemaining_Text4:: @ 8254A59 +BattlePyramid_Text_SevenTrainersRemaining4:: @ 8254A59 .string "Maybe you could sweep through\n" .string "the seven TRAINERS left on this floor.$" -BattlePyramid_SixTrainersRemaining_Text4:: @ 8254A9E +BattlePyramid_Text_SixTrainersRemaining4:: @ 8254A9E .string "Maybe you could sweep through\n" .string "the six TRAINERS left on this floor.$" -BattlePyramid_FiveTrainersRemaining_Text4:: @ 8254AE1 +BattlePyramid_Text_FiveTrainersRemaining4:: @ 8254AE1 .string "Maybe you could sweep through\n" .string "the five TRAINERS left on this floor.$" -BattlePyramid_FourTrainersRemaining_Text4:: @ 8254B25 +BattlePyramid_Text_FourTrainersRemaining4:: @ 8254B25 .string "Maybe you could sweep through\n" .string "the four TRAINERS left on this floor.$" -BattlePyramid_ThreeTrainersRemaining_Text4:: @ 8254B69 +BattlePyramid_Text_ThreeTrainersRemaining4:: @ 8254B69 .string "Maybe you could sweep through\n" .string "the three TRAINERS left on this floor.$" -BattlePyramid_TwoTrainersRemaining_Text4:: @ 8254BAE +BattlePyramid_Text_TwoTrainersRemaining4:: @ 8254BAE .string "Maybe you could sweep through\n" .string "the two TRAINERS left on this floor.$" -BattlePyramid_OneTrainersRemaining_Text4:: @ 8254BF1 +BattlePyramid_Text_OneTrainersRemaining4:: @ 8254BF1 .string "Maybe you could complete your sweep\n" .string "with the one TRAINER left on this floor.$" -BattlePyramid_ZeroTrainersRemaining_Text4:: @ 8254C3E +BattlePyramid_Text_ZeroTrainersRemaining4:: @ 8254C3E .string "There isn't a single person left who\n" .string "can defeat you now…$" -BattlePyramid_SevenTrainersRemaining_Text5:: @ 8254C77 +BattlePyramid_Text_SevenTrainersRemaining5:: @ 8254C77 .string "You may have what it takes to beat\n" .string "the seven expert TRAINERS who remain.$" -BattlePyramid_SixTrainersRemaining_Text5:: @ 8254CC0 +BattlePyramid_Text_SixTrainersRemaining5:: @ 8254CC0 .string "You may have what it takes to beat\n" .string "the six expert TRAINERS who remain.$" -BattlePyramid_FiveTrainersRemaining_Text5:: @ 8254D07 +BattlePyramid_Text_FiveTrainersRemaining5:: @ 8254D07 .string "You may have what it takes to beat\n" .string "the five expert TRAINERS who remain.$" -BattlePyramid_FourTrainersRemaining_Text5:: @ 8254D4F +BattlePyramid_Text_FourTrainersRemaining5:: @ 8254D4F .string "You may have what it takes to beat\n" .string "the four expert TRAINERS who remain.$" -BattlePyramid_ThreeTrainersRemaining_Text5:: @ 8254D97 +BattlePyramid_Text_ThreeTrainersRemaining5:: @ 8254D97 .string "You may have what it takes to beat\n" .string "the three expert TRAINERS who remain.$" -BattlePyramid_TwoTrainersRemaining_Text5:: @ 8254DE0 +BattlePyramid_Text_TwoTrainersRemaining5:: @ 8254DE0 .string "You may have what it takes to beat\n" .string "the two expert TRAINERS who remain.$" -BattlePyramid_OneTrainersRemaining_Text5:: @ 8254E27 +BattlePyramid_Text_OneTrainersRemaining5:: @ 8254E27 .string "You may have what it takes to beat\n" .string "the one expert TRAINER who remains.$" -BattlePyramid_ZeroTrainersRemaining_Text5:: @ 8254E6E +BattlePyramid_Text_ZeroTrainersRemaining5:: @ 8254E6E .string "Your skills are beyond reproach.\p" .string "There are no more TRAINERS here\n" .string "who have any chance of beating you.$" -BattlePyramid_SevenTrainersRemaining_Text6:: @ 8254ED3 +BattlePyramid_Text_SevenTrainersRemaining6:: @ 8254ED3 .string "Can you keep winning against\n" .string "the seven remaining TRAINERS?$" -BattlePyramid_SixTrainersRemaining_Text6:: @ 8254F0E +BattlePyramid_Text_SixTrainersRemaining6:: @ 8254F0E .string "Can you keep winning against\n" .string "the six remaining TRAINERS?$" -BattlePyramid_FiveTrainersRemaining_Text6:: @ 8254F47 +BattlePyramid_Text_FiveTrainersRemaining6:: @ 8254F47 .string "Can you keep winning against\n" .string "the five remaining TRAINERS?$" -BattlePyramid_FourTrainersRemaining_Text6:: @ 8254F81 +BattlePyramid_Text_FourTrainersRemaining6:: @ 8254F81 .string "Can you keep winning against\n" .string "the four remaining TRAINERS?$" -BattlePyramid_ThreeTrainersRemaining_Text6:: @ 8254FBB +BattlePyramid_Text_ThreeTrainersRemaining6:: @ 8254FBB .string "Can you keep winning against\n" .string "the three remaining TRAINERS?$" -BattlePyramid_TwoTrainersRemaining_Text6:: @ 8254FF6 +BattlePyramid_Text_TwoTrainersRemaining6:: @ 8254FF6 .string "Can you keep winning against\n" .string "the two remaining TRAINERS?$" -BattlePyramid_OneTrainersRemaining_Text6:: @ 825502F +BattlePyramid_Text_OneTrainersRemaining6:: @ 825502F .string "Can you keep winning against\n" .string "the last remaining TRAINER?$" -BattlePyramid_ZeroTrainersRemaining_Text6:: @ 8255068 +BattlePyramid_Text_ZeroTrainersRemaining6:: @ 8255068 .string "There aren't any TRAINERS left that\n" .string "can take you on now…$" diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.json b/data/maps/BattleFrontier_BattlePyramidLobby/map.json index 4f99b9488..0b0d1d1a1 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/map.json +++ b/data/maps/BattleFrontier_BattlePyramidLobby/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattlePyramidLobby_EventScript_2508B1", + "script": "BattleFrontier_BattlePyramidLobby_EventScript_Attendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattlePyramidLobby_EventScript_250ACE", + "script": "BattleFrontier_BattlePyramidLobby_EventScript_HintGiver", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E83", + "script": "BattleFrontier_BattlePyramidLobby_EventScript_Woman", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E8C", + "script": "BattleFrontier_BattlePyramidLobby_EventScript_FatMan", "flag": "0" } ], @@ -84,7 +84,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "BattleFrontier_BattlePyramidLobby_EventScript_250D42" + "script": "BattleFrontier_BattlePyramidLobby_EventScript_ShowResults" }, { "type": "sign", @@ -92,7 +92,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E95" + "script": "BattleFrontier_BattlePyramidLobby_EventScript_RulesBoard" } ] }
\ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index e7db4a459..7d3ddb2f1 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -1,32 +1,33 @@ BattleFrontier_BattlePyramidLobby_MapScripts:: @ 8250716 - map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidLobby_MapScript2_250735 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidLobby_MapScript2_2497FB + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidLobby_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_OnWarp .byte 0 -BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidLobby_EventScript_25072B +@ Unused. Pyramid uses Dome's OnWarp (presumably by mistake). Their effects are identical +BattleFrontier_BattlePyramidLobby_OnWarp: @ 8250721 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidLobby_EventScript_TurnPlayerNorth .2byte 0 -BattleFrontier_BattlePyramidLobby_EventScript_25072B: @ 825072B +BattleFrontier_BattlePyramidLobby_EventScript_TurnPlayerNorth: @ 825072B setvar VAR_TEMP_1, 1 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePyramidLobby_EventScript_25075F - map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramidLobby_EventScript_250768 - map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidLobby_EventScript_2508AC - map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattlePyramidLobby_EventScript_2507B1 - map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattlePyramidLobby_EventScript_250852 +BattleFrontier_BattlePyramidLobby_OnFrame: @ 8250735 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePyramidLobby_EventScript_GetChallengeStatus + map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramidLobby_EventScript_QuitWithoutSaving + map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidLobby_EventScript_ResumeChallenge + map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattlePyramidLobby_EventScript_WonChallenge + map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattlePyramidLobby_EventScript_LostChallenge .2byte 0 -BattleFrontier_BattlePyramidLobby_EventScript_25075F:: @ 825075F +BattleFrontier_BattlePyramidLobby_EventScript_GetChallengeStatus:: @ 825075F frontier_getstatus end -BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768 +BattleFrontier_BattlePyramidLobby_EventScript_QuitWithoutSaving:: @ 8250768 lockall - message BattleFrontier_BattlePyramidLobby_Text_2516D6 + message BattleFrontier_BattlePyramidLobby_Text_DidntSaveBeforeQuittingTakeBag waitmessage playse SE_EXPMAX waitse @@ -38,99 +39,98 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768 releaseall end -BattleFrontier_BattlePyramidLobby_EventScript_2507B1:: @ 82507B1 +BattleFrontier_BattlePyramidLobby_EventScript_WonChallenge:: @ 82507B1 lockall frontier_isbrain compare VAR_RESULT, TRUE - goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2 - msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, MSGBOX_DEFAULT - goto BattleFrontier_BattlePyramidLobby_EventScript_2507DA + goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_DefeatedKing + msgbox BattleFrontier_BattlePyramidLobby_Text_YouveConqueredPyramid, MSGBOX_DEFAULT + goto BattleFrontier_BattlePyramidLobby_EventScript_GiveBattlePoints -BattleFrontier_BattlePyramidLobby_EventScript_2507D2:: @ 82507D2 - msgbox BattleFrontier_BattlePyramidLobby_Text_2525F4, MSGBOX_DEFAULT -BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA +BattleFrontier_BattlePyramidLobby_EventScript_DefeatedKing:: @ 82507D2 + msgbox BattleFrontier_BattlePyramidLobby_Text_YouveDefeatedPyramidKing, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_GiveBattlePoints:: @ 82507DA special DoBattlePyramidMonsHaveHeldItem compare VAR_RESULT, TRUE - call_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250DDB + call_if_eq BattleFrontier_BattlePyramidLobby_EventScript_StoreHeldItemsInPyramidBag clearflag FLAG_STORING_ITEMS_IN_PYRAMID_BAG frontier_checkairshow special LoadPlayerParty pyramid_clearhelditems special HealPlayerParty - message BattleFrontier_BattlePyramidLobby_Text_2519F8 + message BattleFrontier_BattlePyramidLobby_Text_UsedBattleBagWillBeKept waitmessage playse SE_EXPMAX waitse - msgbox BattleFrontier_BattlePyramidLobby_Text_252662, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePyramidLobby_Text_GiveYouTheseBattlePoints, MSGBOX_DEFAULT frontier_givepoints msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS - message BattleFrontier_BattlePyramidLobby_Text_251A77 + message BattleFrontier_BattlePyramidLobby_Text_RecordResultsWait waitmessage pyramid_setprize pyramid_save 0 playse SE_SAVE waitse - msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePyramidLobby_Text_LookForwardToNextChallenge, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall end -BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852 +BattleFrontier_BattlePyramidLobby_EventScript_LostChallenge:: @ 8250852 frontier_checkairshow special LoadPlayerParty pyramid_clearhelditems special HealPlayerParty lockall - message BattleFrontier_BattlePyramidLobby_Text_251B5A + message BattleFrontier_BattlePyramidLobby_Text_DisappointingHereIsBag waitmessage playse SE_EXPMAX waitse - message BattleFrontier_BattlePyramidLobby_Text_251A77 + message BattleFrontier_BattlePyramidLobby_Text_RecordResultsWait waitmessage pyramid_set PYRAMID_DATA_WIN_STREAK_ACTIVE, FALSE pyramid_save 0 playse SE_SAVE waitse - msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePyramidLobby_Text_LookForwardToNextChallenge, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall end -BattleFrontier_BattlePyramidLobby_EventScript_2508AC:: @ 82508AC - goto BattleFrontier_BattlePyramidLobby_EventScript_250A21 +BattleFrontier_BattlePyramidLobby_EventScript_ResumeChallenge:: @ 82508AC + goto BattleFrontier_BattlePyramidLobby_EventScript_EnterChallenge -BattleFrontier_BattlePyramidLobby_EventScript_2508B1:: @ 82508B1 +BattleFrontier_BattlePyramidLobby_EventScript_Attendant:: @ 82508B1 lock faceplayer setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PYRAMID setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES special SavePlayerParty - msgbox BattleFrontier_BattlePyramidLobby_Text_250F31, MSGBOX_DEFAULT - -BattleFrontier_BattlePyramidLobby_EventScript_2508C8:: @ 82508C8 - message BattleFrontier_BattlePyramidLobby_Text_250FA7 + msgbox BattleFrontier_BattlePyramidLobby_Text_WelcomeToBattlePyramid, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_AskTakeChallenge:: @ 82508C8 + message BattleFrontier_BattlePyramidLobby_Text_EmbarkOnChallenge waitmessage multichoice 17, 6, MULTI_CHALLENGEINFO, 0 switch VAR_RESULT - case 0, BattleFrontier_BattlePyramidLobby_EventScript_250904 - case 1, BattleFrontier_BattlePyramidLobby_EventScript_250A68 - case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 - case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 + case 0, BattleFrontier_BattlePyramidLobby_EventScript_TryEnterChallenge + case 1, BattleFrontier_BattlePyramidLobby_EventScript_ExplainChallenge + case 2, BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge + case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge -BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 - message BattleFrontier_BattlePyramidLobby_Text_251248 +BattleFrontier_BattlePyramidLobby_EventScript_TryEnterChallenge:: @ 8250904 + message BattleFrontier_BattlePyramidLobby_Text_WhichLevelMode waitmessage multichoice 17, 6, MULTI_LEVEL_MODE, 0 switch VAR_RESULT - case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 - case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 + case FRONTIER_LVL_TENT, BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge + case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge frontier_checkineligible compare VAR_0x8004, TRUE - goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75 + goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMons frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT - msgbox BattleFrontier_BattlePyramidLobby_Text_251297, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePyramidLobby_Text_SelectThreeMons, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT @@ -138,14 +138,14 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 special ChoosePartyForBattleFrontier waitstate compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250AC1 - msgbox BattleFrontier_BattlePyramidLobby_Text_2514E6, MSGBOX_YESNO + goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_LoadPartyAndCancelChallenge + msgbox BattleFrontier_BattlePyramidLobby_Text_OkayToSaveBeforeChallenge, MSGBOX_YESNO switch VAR_RESULT - case NO, BattleFrontier_BattlePyramidLobby_EventScript_250AC1 - case YES, BattleFrontier_BattlePyramidLobby_EventScript_2509A5 - case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250AC1 + case NO, BattleFrontier_BattlePyramidLobby_EventScript_LoadPartyAndCancelChallenge + case YES, BattleFrontier_BattlePyramidLobby_EventScript_SaveBeforeChallenge + case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_LoadPartyAndCancelChallenge -BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 +BattleFrontier_BattlePyramidLobby_EventScript_SaveBeforeChallenge:: @ 82509A5 setvar VAR_TEMP_0, 0 frontier_set FRONTIER_DATA_SELECTED_MON_ORDER pyramid_init @@ -153,215 +153,215 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING frontier_set FRONTIER_DATA_PAUSED, FALSE pyramid_seedfloor - pyramid_inittrainers + pyramid_settrainers special LoadPlayerParty closemessage delay 2 call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA - -BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 + goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_CancelChallengeSaveFailed +BattleFrontier_BattlePyramidLobby_EventScript_EnterChallenge:: @ 8250A21 special SavePlayerParty frontier_setpartyorder FRONTIER_PARTY_SIZE - msgbox BattleFrontier_BattlePyramidLobby_Text_251531, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePyramidLobby_Text_ShowYouIntoPyramid, MSGBOX_DEFAULT closemessage - call BattleFrontier_BattlePyramidLobby_EventScript_250D56 + call BattleFrontier_BattlePyramidLobby_EventScript_WalkToPanelAndReceiveBag frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 setvar VAR_RESULT, 0 special HealPlayerParty - warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 + warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR, 255, 1, 1 setvar VAR_TEMP_0, 0 waitstate end -BattleFrontier_BattlePyramidLobby_EventScript_250A68:: @ 8250A68 - msgbox BattleFrontier_BattlePyramidLobby_Text_25100C, MSGBOX_DEFAULT - goto BattleFrontier_BattlePyramidLobby_EventScript_2508C8 +BattleFrontier_BattlePyramidLobby_EventScript_ExplainChallenge:: @ 8250A68 + msgbox BattleFrontier_BattlePyramidLobby_Text_ExplainBattlePyramid, MSGBOX_DEFAULT + goto BattleFrontier_BattlePyramidLobby_EventScript_AskTakeChallenge -BattleFrontier_BattlePyramidLobby_EventScript_250A75:: @ 8250A75 +BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMons:: @ 8250A75 switch VAR_RESULT - case FRONTIER_LVL_50, BattleFrontier_BattlePyramidLobby_EventScript_250A90 - case FRONTIER_LVL_OPEN, BattleFrontier_BattlePyramidLobby_EventScript_250A9D + case FRONTIER_LVL_50, BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMonsLv50 + case FRONTIER_LVL_OPEN, BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMonsLvOpen -BattleFrontier_BattlePyramidLobby_EventScript_250A90:: @ 8250A90 - msgbox BattleFrontier_BattlePyramidLobby_Text_2513C1, MSGBOX_DEFAULT - goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC +BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMonsLv50:: @ 8250A90 + msgbox BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT + goto BattleFrontier_BattlePyramidLobby_EventScript_EndCancelChallenge -BattleFrontier_BattlePyramidLobby_EventScript_250A9D:: @ 8250A9D - msgbox BattleFrontier_BattlePyramidLobby_Text_2512E2, MSGBOX_DEFAULT - goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC +BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 8250A9D + msgbox BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT + goto BattleFrontier_BattlePyramidLobby_EventScript_EndCancelChallenge -BattleFrontier_BattlePyramidLobby_EventScript_250AAA:: @ 8250AAA +BattleFrontier_BattlePyramidLobby_EventScript_CancelChallengeSaveFailed:: @ 8250AAA frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 - goto BattleFrontier_BattlePyramidLobby_EventScript_250AC4 + goto BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge -BattleFrontier_BattlePyramidLobby_EventScript_250AC1:: @ 8250AC1 +BattleFrontier_BattlePyramidLobby_EventScript_LoadPartyAndCancelChallenge:: @ 8250AC1 special LoadPlayerParty -BattleFrontier_BattlePyramidLobby_EventScript_250AC4:: @ 8250AC4 - msgbox BattleFrontier_BattlePyramidLobby_Text_250FE5, MSGBOX_DEFAULT -BattleFrontier_BattlePyramidLobby_EventScript_250ACC:: @ 8250ACC +BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge:: @ 8250AC4 + msgbox BattleFrontier_BattlePyramidLobby_Text_AwaitFutureChallenge, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_EndCancelChallenge:: @ 8250ACC release end -BattleFrontier_BattlePyramidLobby_EventScript_250ACE:: @ 8250ACE +BattleFrontier_BattlePyramidLobby_EventScript_HintGiver:: @ 8250ACE lockall applymovement 2, Common_Movement_FacePlayer waitmovement 0 - msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, MSGBOX_DEFAULT - call BattleFrontier_BattlePyramidLobby_EventScript_250AF0 - msgbox BattleFrontier_BattlePyramidLobby_Text_252461, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePyramidLobby_Text_TellYouWhatMisfortunesAwait, MSGBOX_DEFAULT + call BattleFrontier_BattlePyramidLobby_EventScript_GiveHint + msgbox BattleFrontier_BattlePyramidLobby_Text_BelieveMyFortunesOrNot, MSGBOX_DEFAULT releaseall end -BattleFrontier_BattlePyramidLobby_EventScript_250AF0:: @ 8250AF0 +BattleFrontier_BattlePyramidLobby_EventScript_GiveHint:: @ 8250AF0 multichoice 17, 6, MULTI_LEVEL_MODE, 0 switch VAR_RESULT - case 0, BattleFrontier_BattlePyramidLobby_EventScript_250B28 - case 1, BattleFrontier_BattlePyramidLobby_EventScript_250B66 - case 2, BattleFrontier_BattlePyramidLobby_EventScript_250B27 - case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250B27 + case FRONTIER_LVL_50, BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLv50 + case FRONTIER_LVL_OPEN, BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLvOpen + case FRONTIER_LVL_TENT, BattleFrontier_BattlePyramidLobby_EventScript_NoHint + case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_NoHint return -BattleFrontier_BattlePyramidLobby_EventScript_250B27:: @ 8250B27 +@ Shouldnt occur +BattleFrontier_BattlePyramidLobby_EventScript_NoHint:: @ 8250B27 return -BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28 - msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLv50:: @ 8250B28 + msgbox BattleFrontier_BattlePyramidLobby_Text_Aah, MSGBOX_DEFAULT pyramid_get PYRAMID_DATA_WIN_STREAK_ACTIVE_50 compare VAR_RESULT, FALSE - goto_if_ne BattleFrontier_BattlePyramidLobby_EventScript_250B53 + goto_if_ne BattleFrontier_BattlePyramidLobby_EventScript_GiveHintGetLv50Streak setvar VAR_RESULT, 0 - goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 + goto BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment return -BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53 +BattleFrontier_BattlePyramidLobby_EventScript_GiveHintGetLv50Streak:: @ 8250B53 pyramid_get PYRAMID_DATA_WIN_STREAK_50 - goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 + goto BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment return -BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66 - msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLvOpen:: @ 8250B66 + msgbox BattleFrontier_BattlePyramidLobby_Text_Aah, MSGBOX_DEFAULT pyramid_get PYRAMID_DATA_WIN_STREAK_ACTIVE_OPEN compare VAR_RESULT, FALSE - goto_if_ne BattleFrontier_BattlePyramidLobby_EventScript_250B91 + goto_if_ne BattleFrontier_BattlePyramidLobby_EventScript_GiveHintGetLvOpenStreak setvar VAR_RESULT, 0 - goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 + goto BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment return -BattleFrontier_BattlePyramidLobby_EventScript_250B91:: @ 8250B91 +BattleFrontier_BattlePyramidLobby_EventScript_GiveHintGetLvOpenStreak:: @ 8250B91 pyramid_get PYRAMID_DATA_WIN_STREAK_OPEN - goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 + goto BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment return -BattleFrontier_BattlePyramidLobby_EventScript_250BA4:: @ 8250BA4 +BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment:: @ 8250BA4 copyvar VAR_0x8004, VAR_RESULT special GetBattlePyramidHint switch VAR_RESULT - case 0, BattleFrontier_BattlePyramidLobby_EventScript_250C8E - case 1, BattleFrontier_BattlePyramidLobby_EventScript_250C97 - case 2, BattleFrontier_BattlePyramidLobby_EventScript_250CA0 - case 3, BattleFrontier_BattlePyramidLobby_EventScript_250CA9 - case 4, BattleFrontier_BattlePyramidLobby_EventScript_250CB2 - case 5, BattleFrontier_BattlePyramidLobby_EventScript_250CBB - case 6, BattleFrontier_BattlePyramidLobby_EventScript_250CC4 - case 7, BattleFrontier_BattlePyramidLobby_EventScript_250CCD - case 8, BattleFrontier_BattlePyramidLobby_EventScript_250CD6 - case 9, BattleFrontier_BattlePyramidLobby_EventScript_250CDF - case 10, BattleFrontier_BattlePyramidLobby_EventScript_250CE8 - case 11, BattleFrontier_BattlePyramidLobby_EventScript_250CF1 - case 12, BattleFrontier_BattlePyramidLobby_EventScript_250CFA - case 13, BattleFrontier_BattlePyramidLobby_EventScript_250D03 - case 14, BattleFrontier_BattlePyramidLobby_EventScript_250D0C - case 15, BattleFrontier_BattlePyramidLobby_EventScript_250D15 - case 16, BattleFrontier_BattlePyramidLobby_EventScript_250D1E - case 17, BattleFrontier_BattlePyramidLobby_EventScript_250D27 - case 18, BattleFrontier_BattlePyramidLobby_EventScript_250D30 - case 19, BattleFrontier_BattlePyramidLobby_EventScript_250D39 + case 0, BattleFrontier_BattlePyramidLobby_EventScript_HintParalysis + case 1, BattleFrontier_BattlePyramidLobby_EventScript_HintPoison + case 2, BattleFrontier_BattlePyramidLobby_EventScript_HintBurn + case 3, BattleFrontier_BattlePyramidLobby_EventScript_HintPPWaste + case 4, BattleFrontier_BattlePyramidLobby_EventScript_HintLevitate + case 5, BattleFrontier_BattlePyramidLobby_EventScript_HintTrapAbility + case 6, BattleFrontier_BattlePyramidLobby_EventScript_HintIce + case 7, BattleFrontier_BattlePyramidLobby_EventScript_HintExplosion + case 8, BattleFrontier_BattlePyramidLobby_EventScript_HintPsychic + case 9, BattleFrontier_BattlePyramidLobby_EventScript_HintRock + case 10, BattleFrontier_BattlePyramidLobby_EventScript_HintFighting + case 11, BattleFrontier_BattlePyramidLobby_EventScript_HintWeather + case 12, BattleFrontier_BattlePyramidLobby_EventScript_HintBug + case 13, BattleFrontier_BattlePyramidLobby_EventScript_HintDark + case 14, BattleFrontier_BattlePyramidLobby_EventScript_HintWater + case 15, BattleFrontier_BattlePyramidLobby_EventScript_HintGhost + case 16, BattleFrontier_BattlePyramidLobby_EventScript_HintSteel + case 17, BattleFrontier_BattlePyramidLobby_EventScript_HintFlyingDragon + case 18, BattleFrontier_BattlePyramidLobby_EventScript_HintStoneEvolve + case 19, BattleFrontier_BattlePyramidLobby_EventScript_HintNormal return -BattleFrontier_BattlePyramidLobby_EventScript_250C8E:: @ 8250C8E - msgbox BattleFrontier_BattlePyramidLobby_Text_251CB3, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_HintParalysis:: @ 8250C8E + msgbox BattleFrontier_BattlePyramidLobby_Text_HintParalysis, MSGBOX_DEFAULT return -BattleFrontier_BattlePyramidLobby_EventScript_250C97:: @ 8250C97 - msgbox BattleFrontier_BattlePyramidLobby_Text_251D07, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_HintPoison:: @ 8250C97 + msgbox BattleFrontier_BattlePyramidLobby_Text_HintPoison, MSGBOX_DEFAULT return -BattleFrontier_BattlePyramidLobby_EventScript_250CA0:: @ 8250CA0 - msgbox BattleFrontier_BattlePyramidLobby_Text_251D54, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_HintBurn:: @ 8250CA0 + msgbox BattleFrontier_BattlePyramidLobby_Text_HintBurn, MSGBOX_DEFAULT return -BattleFrontier_BattlePyramidLobby_EventScript_250CA9:: @ 8250CA9 - msgbox BattleFrontier_BattlePyramidLobby_Text_251D9C, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_HintPPWaste:: @ 8250CA9 + msgbox BattleFrontier_BattlePyramidLobby_Text_HintPPWaste, MSGBOX_DEFAULT return -BattleFrontier_BattlePyramidLobby_EventScript_250CB2:: @ 8250CB2 - msgbox BattleFrontier_BattlePyramidLobby_Text_251E3D, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_HintLevitate:: @ 8250CB2 + msgbox BattleFrontier_BattlePyramidLobby_Text_HintLevitate, MSGBOX_DEFAULT return -BattleFrontier_BattlePyramidLobby_EventScript_250CBB:: @ 8250CBB - msgbox BattleFrontier_BattlePyramidLobby_Text_251EA1, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_HintTrapAbility:: @ 8250CBB + msgbox BattleFrontier_BattlePyramidLobby_Text_HintTrapAbility, MSGBOX_DEFAULT return -BattleFrontier_BattlePyramidLobby_EventScript_250CC4:: @ 8250CC4 - msgbox BattleFrontier_BattlePyramidLobby_Text_251F17, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_HintIce:: @ 8250CC4 + msgbox BattleFrontier_BattlePyramidLobby_Text_HintIce, MSGBOX_DEFAULT return -BattleFrontier_BattlePyramidLobby_EventScript_250CCD:: @ 8250CCD - msgbox BattleFrontier_BattlePyramidLobby_Text_251F6E, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_HintExplosion:: @ 8250CCD + msgbox BattleFrontier_BattlePyramidLobby_Text_HintExplosion, MSGBOX_DEFAULT return -BattleFrontier_BattlePyramidLobby_EventScript_250CD6:: @ 8250CD6 - msgbox BattleFrontier_BattlePyramidLobby_Text_251FC7, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_HintPsychic:: @ 8250CD6 + msgbox BattleFrontier_BattlePyramidLobby_Text_HintPsychic, MSGBOX_DEFAULT return -BattleFrontier_BattlePyramidLobby_EventScript_250CDF:: @ 8250CDF - msgbox BattleFrontier_BattlePyramidLobby_Text_25201B, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_HintRock:: @ 8250CDF + msgbox BattleFrontier_BattlePyramidLobby_Text_HintRock, MSGBOX_DEFAULT return -BattleFrontier_BattlePyramidLobby_EventScript_250CE8:: @ 8250CE8 - msgbox BattleFrontier_BattlePyramidLobby_Text_252068, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_HintFighting:: @ 8250CE8 + msgbox BattleFrontier_BattlePyramidLobby_Text_HintFighting, MSGBOX_DEFAULT return -BattleFrontier_BattlePyramidLobby_EventScript_250CF1:: @ 8250CF1 - msgbox BattleFrontier_BattlePyramidLobby_Text_2520BA, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_HintWeather:: @ 8250CF1 + msgbox BattleFrontier_BattlePyramidLobby_Text_HintWeather, MSGBOX_DEFAULT return -BattleFrontier_BattlePyramidLobby_EventScript_250CFA:: @ 8250CFA - msgbox BattleFrontier_BattlePyramidLobby_Text_252158, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_HintBug:: @ 8250CFA + msgbox BattleFrontier_BattlePyramidLobby_Text_HintBug, MSGBOX_DEFAULT return -BattleFrontier_BattlePyramidLobby_EventScript_250D03:: @ 8250D03 - msgbox BattleFrontier_BattlePyramidLobby_Text_2521B4, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_HintDark:: @ 8250D03 + msgbox BattleFrontier_BattlePyramidLobby_Text_HintDark, MSGBOX_DEFAULT return -BattleFrontier_BattlePyramidLobby_EventScript_250D0C:: @ 8250D0C - msgbox BattleFrontier_BattlePyramidLobby_Text_252206, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_HintWater:: @ 8250D0C + msgbox BattleFrontier_BattlePyramidLobby_Text_HintWater, MSGBOX_DEFAULT return -BattleFrontier_BattlePyramidLobby_EventScript_250D15:: @ 8250D15 - msgbox BattleFrontier_BattlePyramidLobby_Text_25225A, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_HintGhost:: @ 8250D15 + msgbox BattleFrontier_BattlePyramidLobby_Text_HintGhost, MSGBOX_DEFAULT return -BattleFrontier_BattlePyramidLobby_EventScript_250D1E:: @ 8250D1E - msgbox BattleFrontier_BattlePyramidLobby_Text_2522AE, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_HintSteel:: @ 8250D1E + msgbox BattleFrontier_BattlePyramidLobby_Text_HintSteel, MSGBOX_DEFAULT return -BattleFrontier_BattlePyramidLobby_EventScript_250D27:: @ 8250D27 - msgbox BattleFrontier_BattlePyramidLobby_Text_25230B, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_HintFlyingDragon:: @ 8250D27 + msgbox BattleFrontier_BattlePyramidLobby_Text_HintFlyingDragon, MSGBOX_DEFAULT return -BattleFrontier_BattlePyramidLobby_EventScript_250D30:: @ 8250D30 - msgbox BattleFrontier_BattlePyramidLobby_Text_252364, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_HintStoneEvolve:: @ 8250D30 + msgbox BattleFrontier_BattlePyramidLobby_Text_HintStoneEvolve, MSGBOX_DEFAULT return -BattleFrontier_BattlePyramidLobby_EventScript_250D39:: @ 8250D39 - msgbox BattleFrontier_BattlePyramidLobby_Text_252403, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_HintNormal:: @ 8250D39 + msgbox BattleFrontier_BattlePyramidLobby_Text_HintNormal, MSGBOX_DEFAULT return -BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42 +BattleFrontier_BattlePyramidLobby_EventScript_ShowResults:: @ 8250D42 lockall frontier_results FRONTIER_FACILITY_PYRAMID waitbuttonpress @@ -369,33 +369,33 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42 releaseall end -BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56 - applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DC4 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DCD +BattleFrontier_BattlePyramidLobby_EventScript_WalkToPanelAndReceiveBag:: @ 8250D56 + applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_AttendantWalkToPanel + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_PlayerWalkToPanel waitmovement 0 - msgbox BattleFrontier_BattlePyramidLobby_Text_251569, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePyramidLobby_Text_WeWillHoldBagForSafekeeping, MSGBOX_DEFAULT pyramid_get PYRAMID_DATA_WIN_STREAK compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250D94 - msgbox BattleFrontier_BattlePyramidLobby_Text_2515AD, MSGBOX_DEFAULT - goto BattleFrontier_BattlePyramidLobby_EventScript_250D9C - -BattleFrontier_BattlePyramidLobby_EventScript_250D94:: @ 8250D94 - msgbox BattleFrontier_BattlePyramidLobby_Text_2515F4, MSGBOX_DEFAULT -BattleFrontier_BattlePyramidLobby_EventScript_250D9C:: @ 8250D9C - message BattleFrontier_BattlePyramidLobby_Text_25161E + goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_ReceiveNewBattleBag + msgbox BattleFrontier_BattlePyramidLobby_Text_PleaseTakePreviousBattleBag, MSGBOX_DEFAULT + goto BattleFrontier_BattlePyramidLobby_EventScript_ReceiveBattleBag + +BattleFrontier_BattlePyramidLobby_EventScript_ReceiveNewBattleBag:: @ 8250D94 + msgbox BattleFrontier_BattlePyramidLobby_Text_PleaseTakeThisBattleBag, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_ReceiveBattleBag:: @ 8250D9C + message BattleFrontier_BattlePyramidLobby_Text_ExchangedBagForBattleBag waitmessage playse SE_EXPMAX waitse - msgbox BattleFrontier_BattlePyramidLobby_Text_251647, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePyramidLobby_Text_StepOnFloorPanel, MSGBOX_DEFAULT closemessage - applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DD5 + applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_AttendantMoveAside waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DD8 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_PlayerStepOnPanel waitmovement 0 return -BattleFrontier_BattlePyramidLobby_Movement_250DC4: @ 8250DC4 +BattleFrontier_BattlePyramidLobby_Movement_AttendantWalkToPanel: @ 8250DC4 walk_up walk_up walk_up @@ -406,7 +406,7 @@ BattleFrontier_BattlePyramidLobby_Movement_250DC4: @ 8250DC4 face_down step_end -BattleFrontier_BattlePyramidLobby_Movement_250DCD: @ 8250DCD +BattleFrontier_BattlePyramidLobby_Movement_PlayerWalkToPanel: @ 8250DCD walk_up walk_up walk_up @@ -416,135 +416,136 @@ BattleFrontier_BattlePyramidLobby_Movement_250DCD: @ 8250DCD walk_up step_end -BattleFrontier_BattlePyramidLobby_Movement_250DD5: @ 8250DD5 +BattleFrontier_BattlePyramidLobby_Movement_AttendantMoveAside: @ 8250DD5 walk_right face_left step_end -BattleFrontier_BattlePyramidLobby_Movement_250DD8: @ 8250DD8 +BattleFrontier_BattlePyramidLobby_Movement_PlayerStepOnPanel: @ 8250DD8 walk_up walk_up step_end -BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB - msgbox BattleFrontier_BattlePyramidLobby_Text_2517FC, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_StoreHeldItemsInPyramidBag:: @ 8250DDB + msgbox BattleFrontier_BattlePyramidLobby_Text_MonHoldingItemCannotTake, MSGBOX_DEFAULT setflag FLAG_STORING_ITEMS_IN_PYRAMID_BAG special TryStoreHeldItemsInPyramidBag compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250E00 - message BattleFrontier_BattlePyramidLobby_Text_2518C6 + goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_HeldItemsStoredInPyramidBag + message BattleFrontier_BattlePyramidLobby_Text_BagCannotHoldPickItemsToKeep waitmessage - goto BattleFrontier_BattlePyramidLobby_EventScript_250E09 + goto BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep end -BattleFrontier_BattlePyramidLobby_EventScript_250E00:: @ 8250E00 - msgbox BattleFrontier_BattlePyramidLobby_Text_251881, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidLobby_EventScript_HeldItemsStoredInPyramidBag:: @ 8250E00 + msgbox BattleFrontier_BattlePyramidLobby_Text_HeldItemsMovedToBag, MSGBOX_DEFAULT return -BattleFrontier_BattlePyramidLobby_EventScript_250E09:: @ 8250E09 +@ When exiting Battle Pyramid with a full pyramid bag and held items the player must select to keep/toss party held items and make room for any kept items by tossing from the pyramid bag +BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep:: @ 8250E09 multichoice 17, 6, MULTI_FRONTIER_ITEM_CHOOSE, 0 switch VAR_RESULT - case 0, BattleFrontier_BattlePyramidLobby_EventScript_250E40 - case 1, BattleFrontier_BattlePyramidLobby_EventScript_250E50 - case 2, BattleFrontier_BattlePyramidLobby_EventScript_250E60 - case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250E60 + case 0, BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromBag + case 1, BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromParty + case 2, BattleFrontier_BattlePyramidLobby_EventScript_ExitPickItems + case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_ExitPickItems end -BattleFrontier_BattlePyramidLobby_EventScript_250E40:: @ 8250E40 - special sub_81C4F24 +BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromBag:: @ 8250E40 + special ChooseItemsToTossFromPyramidBag waitstate - message BattleFrontier_BattlePyramidLobby_Text_25197E + message BattleFrontier_BattlePyramidLobby_Text_PickItemsToKeep waitmessage - goto BattleFrontier_BattlePyramidLobby_EventScript_250E09 + goto BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep end -BattleFrontier_BattlePyramidLobby_EventScript_250E50:: @ 8250E50 +BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromParty:: @ 8250E50 special BattlePyramidChooseMonHeldItems waitstate - message BattleFrontier_BattlePyramidLobby_Text_25197E + message BattleFrontier_BattlePyramidLobby_Text_PickItemsToKeep waitmessage - goto BattleFrontier_BattlePyramidLobby_EventScript_250E09 + goto BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep end -BattleFrontier_BattlePyramidLobby_EventScript_250E60:: @ 8250E60 +BattleFrontier_BattlePyramidLobby_EventScript_ExitPickItems:: @ 8250E60 special DoBattlePyramidMonsHaveHeldItem compare VAR_RESULT, TRUE - goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250E6F + goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_PartyStillHasHeldItems return -BattleFrontier_BattlePyramidLobby_EventScript_250E6F:: @ 8250E6F - msgbox BattleFrontier_BattlePyramidLobby_Text_25194F, MSGBOX_DEFAULT - message BattleFrontier_BattlePyramidLobby_Text_25197E +BattleFrontier_BattlePyramidLobby_EventScript_PartyStillHasHeldItems:: @ 8250E6F + msgbox BattleFrontier_BattlePyramidLobby_Text_LeastOneMonHoldingItem, MSGBOX_DEFAULT + message BattleFrontier_BattlePyramidLobby_Text_PickItemsToKeep waitmessage - goto BattleFrontier_BattlePyramidLobby_EventScript_250E09 + goto BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep end -BattleFrontier_BattlePyramidLobby_EventScript_250E83:: @ 8250E83 - msgbox BattleFrontier_BattlePyramidLobby_Text_2524DA, MSGBOX_NPC +BattleFrontier_BattlePyramidLobby_EventScript_Woman:: @ 8250E83 + msgbox BattleFrontier_BattlePyramidLobby_Text_TrainersNoticeRunning, MSGBOX_NPC end -BattleFrontier_BattlePyramidLobby_EventScript_250E8C:: @ 8250E8C - msgbox BattleFrontier_BattlePyramidLobby_Text_252595, MSGBOX_NPC +BattleFrontier_BattlePyramidLobby_EventScript_FatMan:: @ 8250E8C + msgbox BattleFrontier_BattlePyramidLobby_Text_LostLotOfItems, MSGBOX_NPC end -BattleFrontier_BattlePyramidLobby_EventScript_250E95:: @ 8250E95 +BattleFrontier_BattlePyramidLobby_EventScript_RulesBoard:: @ 8250E95 lockall - msgbox BattleFrontier_BattlePyramidLobby_Text_2526B6, MSGBOX_DEFAULT - goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 + msgbox BattleFrontier_BattlePyramidLobby_Text_RulesAreListed, MSGBOX_DEFAULT + goto BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard end -BattleFrontier_BattlePyramidLobby_EventScript_250EA4:: @ 8250EA4 - message BattleFrontier_BattlePyramidLobby_Text_2526D9 +BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard:: @ 8250EA4 + message BattleFrontier_BattlePyramidLobby_Text_ReadWhichHeading waitmessage multichoice 15, 2, MULTI_BATTLE_PYRAMID_RULES, 0 switch VAR_RESULT - case 0, BattleFrontier_BattlePyramidLobby_EventScript_250EF7 - case 1, BattleFrontier_BattlePyramidLobby_EventScript_250F05 - case 2, BattleFrontier_BattlePyramidLobby_EventScript_250F13 - case 3, BattleFrontier_BattlePyramidLobby_EventScript_250F21 - case 4, BattleFrontier_BattlePyramidLobby_EventScript_250F2F - case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250F2F + case 0, BattleFrontier_BattlePyramidLobby_EventScript_RulesPokemon + case 1, BattleFrontier_BattlePyramidLobby_EventScript_RulesTrainers + case 2, BattleFrontier_BattlePyramidLobby_EventScript_RulesMaze + case 3, BattleFrontier_BattlePyramidLobby_EventScript_RulesBag + case 4, BattleFrontier_BattlePyramidLobby_EventScript_ExitRules + case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_ExitRules end -BattleFrontier_BattlePyramidLobby_EventScript_250EF7:: @ 8250EF7 - msgbox BattleFrontier_BattlePyramidLobby_Text_2526FC, MSGBOX_DEFAULT - goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 +BattleFrontier_BattlePyramidLobby_EventScript_RulesPokemon:: @ 8250EF7 + msgbox BattleFrontier_BattlePyramidLobby_Text_ExplainMonRules, MSGBOX_DEFAULT + goto BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard end -BattleFrontier_BattlePyramidLobby_EventScript_250F05:: @ 8250F05 - msgbox BattleFrontier_BattlePyramidLobby_Text_2527A9, MSGBOX_DEFAULT - goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 +BattleFrontier_BattlePyramidLobby_EventScript_RulesTrainers:: @ 8250F05 + msgbox BattleFrontier_BattlePyramidLobby_Text_ExplainTrainerRules, MSGBOX_DEFAULT + goto BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard end -BattleFrontier_BattlePyramidLobby_EventScript_250F13:: @ 8250F13 - msgbox BattleFrontier_BattlePyramidLobby_Text_25285A, MSGBOX_DEFAULT - goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 +BattleFrontier_BattlePyramidLobby_EventScript_RulesMaze:: @ 8250F13 + msgbox BattleFrontier_BattlePyramidLobby_Text_ExplainMazeRules, MSGBOX_DEFAULT + goto BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard end -BattleFrontier_BattlePyramidLobby_EventScript_250F21:: @ 8250F21 - msgbox BattleFrontier_BattlePyramidLobby_Text_252924, MSGBOX_DEFAULT - goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 +BattleFrontier_BattlePyramidLobby_EventScript_RulesBag:: @ 8250F21 + msgbox BattleFrontier_BattlePyramidLobby_Text_ExplainBagRules, MSGBOX_DEFAULT + goto BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard end -BattleFrontier_BattlePyramidLobby_EventScript_250F2F:: @ 8250F2F +BattleFrontier_BattlePyramidLobby_EventScript_ExitRules:: @ 8250F2F releaseall end -BattleFrontier_BattlePyramidLobby_Text_250F31: @ 8250F31 +BattleFrontier_BattlePyramidLobby_Text_WelcomeToBattlePyramid: @ 8250F31 .string "Where the courage of TRAINERS\n" .string "is put to the test!\p" .string "Welcome to the BATTLE PYRAMID!\p" .string "I am your guide to\n" .string "the Battle Quest.$" -BattleFrontier_BattlePyramidLobby_Text_250FA7: @ 8250FA7 +BattleFrontier_BattlePyramidLobby_Text_EmbarkOnChallenge: @ 8250FA7 .string "Have you the courage to embark on\n" .string "the Battle Quest challenge?$" -BattleFrontier_BattlePyramidLobby_Text_250FE5: @ 8250FE5 +BattleFrontier_BattlePyramidLobby_Text_AwaitFutureChallenge: @ 8250FE5 .string "We await your challenge in the future!$" -BattleFrontier_BattlePyramidLobby_Text_25100C: @ 825100C +BattleFrontier_BattlePyramidLobby_Text_ExplainBattlePyramid: @ 825100C .string "The Battle Quest is a battling\n" .string "event in which you must explore\l" .string "the PYRAMID and try to reach the top.\p" @@ -563,16 +564,16 @@ BattleFrontier_BattlePyramidLobby_Text_25100C: @ 825100C .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" -BattleFrontier_BattlePyramidLobby_Text_251248: @ 8251248 +BattleFrontier_BattlePyramidLobby_Text_WhichLevelMode: @ 8251248 .string "The PYRAMID offers two courses,\n" .string "Level 50 and Open Level.\l" .string "Which will you enter?$" -BattleFrontier_BattlePyramidLobby_Text_251297: @ 8251297 +BattleFrontier_BattlePyramidLobby_Text_SelectThreeMons: @ 8251297 .string "Very good. Now, please select the three\n" .string "POKéMON you wish to accompany you.$" -BattleFrontier_BattlePyramidLobby_Text_2512E2: @ 82512E2 +BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLvOpen: @ 82512E2 .string "A slight problem, adventurer!\p" .string "You seem to not have the three\n" .string "POKéMON qualified for the challenge.\p" @@ -582,7 +583,7 @@ BattleFrontier_BattlePyramidLobby_Text_2512E2: @ 82512E2 .string "When you are ready, please have\n" .string "a word with me.$" -BattleFrontier_BattlePyramidLobby_Text_2513C1: @ 82513C1 +BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLv50: @ 82513C1 .string "A slight problem, adventurer!\p" .string "You seem to not have the three\n" .string "POKéMON qualified for the challenge.\p" @@ -594,38 +595,38 @@ BattleFrontier_BattlePyramidLobby_Text_2513C1: @ 82513C1 .string "When you are ready, please have\n" .string "a word with me.$" -BattleFrontier_BattlePyramidLobby_Text_2514E6: @ 82514E6 +BattleFrontier_BattlePyramidLobby_Text_OkayToSaveBeforeChallenge: @ 82514E6 .string "Before you enter the BATTLE PYRAMID,\n" .string "the game must be saved. Is that okay?$" -BattleFrontier_BattlePyramidLobby_Text_251531: @ 8251531 +BattleFrontier_BattlePyramidLobby_Text_ShowYouIntoPyramid: @ 8251531 .string "Very good. I will now show you into\n" .string "the BATTLE PYRAMID.$" -BattleFrontier_BattlePyramidLobby_Text_251569: @ 8251569 +BattleFrontier_BattlePyramidLobby_Text_WeWillHoldBagForSafekeeping: @ 8251569 .string "We will hold your BAG for safekeeping,\n" .string "{PLAYER}, while you are exploring.$" -BattleFrontier_BattlePyramidLobby_Text_2515AD: @ 82515AD +BattleFrontier_BattlePyramidLobby_Text_PleaseTakePreviousBattleBag: @ 82515AD .string "In exchange, please take this BATTLE\n" .string "BAG, the one you used previously.$" -BattleFrontier_BattlePyramidLobby_Text_2515F4: @ 82515F4 +BattleFrontier_BattlePyramidLobby_Text_PleaseTakeThisBattleBag: @ 82515F4 .string "In exchange, please take this\n" .string "BATTLE BAG.$" -BattleFrontier_BattlePyramidLobby_Text_25161E: @ 825161E +BattleFrontier_BattlePyramidLobby_Text_ExchangedBagForBattleBag: @ 825161E .string "{PLAYER} exchanged the BAG for\n" .string "the BATTLE BAG.$" -BattleFrontier_BattlePyramidLobby_Text_251647: @ 8251647 +BattleFrontier_BattlePyramidLobby_Text_StepOnFloorPanel: @ 8251647 .string "When you step on this floor panel,\n" .string "you will be transported to a higher\l" .string "floor in the PYRAMID.\p" .string "I hope for your sake that your\n" .string "quest goes safely!$" -BattleFrontier_BattlePyramidLobby_Text_2516D6: @ 82516D6 +BattleFrontier_BattlePyramidLobby_Text_DidntSaveBeforeQuittingTakeBag: @ 82516D6 .string "A major problem, explorer!\p" .string "You did not save before ending\n" .string "your challenge the last time.\p" @@ -635,107 +636,112 @@ BattleFrontier_BattlePyramidLobby_Text_2516D6: @ 82516D6 .string "for you.\p" .string "{PLAYER} got the BAG back.$" -BattleFrontier_BattlePyramidLobby_Text_2517B5: @ 82517B5 +BattleFrontier_BattlePyramidLobby_Text_YouveConqueredPyramid: @ 82517B5 .string "Excellent to see you back!\p" .string "You've conquered the PYRAMID!\n" .string "How splendid!$" -BattleFrontier_BattlePyramidLobby_Text_2517FC: @ 82517FC +BattleFrontier_BattlePyramidLobby_Text_MonHoldingItemCannotTake: @ 82517FC .string "Ah, a slight problem.\p" .string "At least one POKéMON is holding\n" .string "an item.\p" .string "I'm sorry to say, items obtained in\n" .string "the PYRAMID cannot be taken away.$" -BattleFrontier_BattlePyramidLobby_Text_251881: @ 8251881 +BattleFrontier_BattlePyramidLobby_Text_HeldItemsMovedToBag: @ 8251881 .string "All items held by your POKéMON will be\n" .string "moved to your BATTLE BAG, {PLAYER}.$" -BattleFrontier_BattlePyramidLobby_Text_2518C6: @ 82518C6 +BattleFrontier_BattlePyramidLobby_Text_BagCannotHoldPickItemsToKeep: @ 82518C6 .string "The BATTLE BAG cannot hold all your\n" .string "items, I'm sorry to say.\p" .string "Please pick the items you'll keep in the\n" .string "BATTLE BAG, and with your POKéMON.$" -BattleFrontier_BattlePyramidLobby_Text_25194F: @ 825194F +BattleFrontier_BattlePyramidLobby_Text_LeastOneMonHoldingItem: @ 825194F .string "At least one POKéMON is still\n" .string "holding an item.$" -BattleFrontier_BattlePyramidLobby_Text_25197E: @ 825197E +BattleFrontier_BattlePyramidLobby_Text_PickItemsToKeep: @ 825197E .string "Please pick the items you'll keep in the\n" .string "BATTLE BAG, and with your POKéMON.$" -BattleFrontier_BattlePyramidLobby_Text_2519CA: @ 82519CA +@ Unused +BattleFrontier_BattlePyramidLobby_Text_ReturnedEverythingMonsHeld: @ 82519CA .string "{PLAYER} returned everything that\n" .string "the POKéMON held.$" -BattleFrontier_BattlePyramidLobby_Text_2519F8: @ 82519F8 +BattleFrontier_BattlePyramidLobby_Text_UsedBattleBagWillBeKept: @ 82519F8 .string "The BATTLE BAG you used will be kept\n" .string "in readiness for your next challenge.\p" .string "{PLAYER} turned the BATTLE BAG over\n" .string "for the BAG's return.$" -BattleFrontier_BattlePyramidLobby_Text_251A77: @ 8251A77 +BattleFrontier_BattlePyramidLobby_Text_RecordResultsWait: @ 8251A77 .string "I must record your results.\n" .string "Please wait.$" -BattleFrontier_BattlePyramidLobby_Text_251AA0: @ 8251AA0 +@ Unused +BattleFrontier_BattlePyramidLobby_Text_ForConqueringPyramidTakeThis: @ 8251AA0 .string "As a memento for conquering\n" .string "the BATTLE PYRAMID, please take this.$" -BattleFrontier_BattlePyramidLobby_Text_251AE2: @ 8251AE2 +@ Unused +BattleFrontier_BattlePyramidLobby_Text_ReceivedPrizeItem: @ 8251AE2 .string "{PLAYER} received the prize\n" .string "{STR_VAR_1}.$" -BattleFrontier_BattlePyramidLobby_Text_251AFC: @ 8251AFC +@ Unused +BattleFrontier_BattlePyramidLobby_Text_BagIsFull: @ 8251AFC .string "…Ah…\n" .string "Your BAG appears to be filled.\p" .string "Please return after you've organized\n" .string "your BAG's contents.$" -BattleFrontier_BattlePyramidLobby_Text_251B5A: @ 8251B5A +BattleFrontier_BattlePyramidLobby_Text_DisappointingHereIsBag: @ 8251B5A .string "How disappointing for you…\p" .string "Here is the BAG we've been holding\n" .string "for you.\p" .string "{PLAYER} got the BAG back.$" -BattleFrontier_BattlePyramidLobby_Text_251BB6: @ 8251BB6 +BattleFrontier_BattlePyramidLobby_Text_LookForwardToNextChallenge: @ 8251BB6 .string "We look forward to your\n" .string "next challenge!$" -BattleFrontier_BattlePyramidLobby_Text_251BDE: @ 8251BDE +@ Unused +BattleFrontier_BattlePyramidLobby_Text_HereIsPrize: @ 8251BDE .string "We have been looking forward to\n" .string "your arrival!\p" .string "Here is your prize for conquering\n" .string "the PYRAMID.$" -BattleFrontier_BattlePyramidLobby_Text_251C3B: @ 8251C3B +BattleFrontier_BattlePyramidLobby_Text_TellYouWhatMisfortunesAwait: @ 8251C3B .string "Welcome…\p" .string "I shall be pleased to tell you what\n" .string "misfortunes await in the PYRAMID…$" -BattleFrontier_BattlePyramidLobby_Text_251C8A: @ 8251C8A +BattleFrontier_BattlePyramidLobby_Text_Aah: @ 8251C8A .string "… … … … … …\n" .string "… … … … … …\p" .string "… … … … … …\n" .string "Aah!$" -BattleFrontier_BattlePyramidLobby_Text_251CB3: @ 8251CB3 +BattleFrontier_BattlePyramidLobby_Text_HintParalysis: @ 8251CB3 .string "I see a shower of sparks…\p" .string "…And in it, I see your POKéMON\n" .string "struggling with paralysis…$" -BattleFrontier_BattlePyramidLobby_Text_251D07: @ 8251D07 +BattleFrontier_BattlePyramidLobby_Text_HintPoison: @ 8251D07 .string "I see poison…\p" .string "…And, I see your POKéMON suffering\n" .string "from the effects of poison…$" -BattleFrontier_BattlePyramidLobby_Text_251D54: @ 8251D54 +BattleFrontier_BattlePyramidLobby_Text_HintBurn: @ 8251D54 .string "I see bright red flames…\p" .string "…And, I see your POKéMON suffering\n" .string "from burns…$" -BattleFrontier_BattlePyramidLobby_Text_251D9C: @ 8251D9C +BattleFrontier_BattlePyramidLobby_Text_HintPPWaste: @ 8251D9C .string "I sense the tremendous pressure of\n" .string "unrequited anger…\p" .string "It is a curse…\p" @@ -743,44 +749,44 @@ BattleFrontier_BattlePyramidLobby_Text_251D9C: @ 8251D9C .string "Power Points and having no recourse\l" .string "but to use STRUGGLE…$" -BattleFrontier_BattlePyramidLobby_Text_251E3D: @ 8251E3D +BattleFrontier_BattlePyramidLobby_Text_HintLevitate: @ 8251E3D .string "I see POKéMON loftily airborne…\p" .string "…And, I see your POKéMON frustrated\n" .string "by powerless GROUND-type moves…$" -BattleFrontier_BattlePyramidLobby_Text_251EA1: @ 8251EA1 +BattleFrontier_BattlePyramidLobby_Text_HintTrapAbility: @ 8251EA1 .string "I sense terrific energy rising from\n" .string "the ground below…\p" .string "…And, I see your POKéMON unable to\n" .string "escape the power's clutches…$" -BattleFrontier_BattlePyramidLobby_Text_251F17: @ 8251F17 +BattleFrontier_BattlePyramidLobby_Text_HintIce: @ 8251F17 .string "I see ICE-type POKéMON…\p" .string "…And, I see your POKéMON fighting\n" .string "the freezing effects of ice…$" -BattleFrontier_BattlePyramidLobby_Text_251F6E: @ 8251F6E +BattleFrontier_BattlePyramidLobby_Text_HintExplosion: @ 8251F6E .string "I see a flurry of moves that imperil\n" .string "the user…\p" .string "…And, I see your POKéMON falling\n" .string "to them…$" -BattleFrontier_BattlePyramidLobby_Text_251FC7: @ 8251FC7 +BattleFrontier_BattlePyramidLobby_Text_HintPsychic: @ 8251FC7 .string "I see PSYCHIC-type POKéMON…\p" .string "…And, I see your POKéMON in torment\n" .string "from PSYCHIC moves…$" -BattleFrontier_BattlePyramidLobby_Text_25201B: @ 825201B +BattleFrontier_BattlePyramidLobby_Text_HintRock: @ 825201B .string "I see ROCK-type POKéMON…\p" .string "…And, I see your POKéMON suffering\n" .string "from ROCK moves…$" -BattleFrontier_BattlePyramidLobby_Text_252068: @ 8252068 +BattleFrontier_BattlePyramidLobby_Text_HintFighting: @ 8252068 .string "I see FIGHTING-type POKéMON…\p" .string "…And, I see your POKéMON pummeled\n" .string "by FIGHTING moves…$" -BattleFrontier_BattlePyramidLobby_Text_2520BA: @ 82520BA +BattleFrontier_BattlePyramidLobby_Text_HintWeather: @ 82520BA .string "RAIN DANCE… SUNNY DAY…\n" .string "SANDSTORM… HAIL…\p" .string "I see POKéMON that become stronger\n" @@ -788,37 +794,37 @@ BattleFrontier_BattlePyramidLobby_Text_2520BA: @ 82520BA .string "…And, I see your POKéMON confounded\n" .string "by different types of moves…$" -BattleFrontier_BattlePyramidLobby_Text_252158: @ 8252158 +BattleFrontier_BattlePyramidLobby_Text_HintBug: @ 8252158 .string "I see BUG-type POKéMON…\p" .string "…And, I see your POKéMON suffering\n" .string "from different kinds of attacks…$" -BattleFrontier_BattlePyramidLobby_Text_2521B4: @ 82521B4 +BattleFrontier_BattlePyramidLobby_Text_HintDark: @ 82521B4 .string "I see DARK-type POKéMON…\p" .string "…And, I see your POKéMON suffering\n" .string "from DARK-type moves…$" -BattleFrontier_BattlePyramidLobby_Text_252206: @ 8252206 +BattleFrontier_BattlePyramidLobby_Text_HintWater: @ 8252206 .string "I see WATER-type POKéMON…\p" .string "…And, I see your POKéMON suffering\n" .string "from WATER-type moves…$" -BattleFrontier_BattlePyramidLobby_Text_25225A: @ 825225A +BattleFrontier_BattlePyramidLobby_Text_HintGhost: @ 825225A .string "I see GHOST-type POKéMON…\p" .string "…And, I see your POKéMON suffering\n" .string "from GHOST-type moves…$" -BattleFrontier_BattlePyramidLobby_Text_2522AE: @ 82522AE +BattleFrontier_BattlePyramidLobby_Text_HintSteel: @ 82522AE .string "I see STEEL-type POKéMON…\p" .string "…And, I see your POKéMON suffering\n" .string "from enormously powerful moves…$" -BattleFrontier_BattlePyramidLobby_Text_25230B: @ 825230B +BattleFrontier_BattlePyramidLobby_Text_HintFlyingDragon: @ 825230B .string "I see flying POKéMON…\p" .string "…And, I see your POKéMON suffering\n" .string "from enormously powerful moves…$" -BattleFrontier_BattlePyramidLobby_Text_252364: @ 8252364 +BattleFrontier_BattlePyramidLobby_Text_HintStoneEvolve: @ 8252364 .string "I see those that have evolved from\n" .string "the power of stones…\p" .string "I also sense fire, water,\n" @@ -826,18 +832,18 @@ BattleFrontier_BattlePyramidLobby_Text_252364: @ 8252364 .string "…And, I see your POKéMON suffering\n" .string "from those three powers…$" -BattleFrontier_BattlePyramidLobby_Text_252403: @ 8252403 +BattleFrontier_BattlePyramidLobby_Text_HintNormal: @ 8252403 .string "I see NORMAL-type POKéMON…\p" .string "…And, I see your POKéMON suffering\n" .string "from enormously powerful moves…$" -BattleFrontier_BattlePyramidLobby_Text_252461: @ 8252461 +BattleFrontier_BattlePyramidLobby_Text_BelieveMyFortunesOrNot: @ 8252461 .string "Whether you believe my fortunes\n" .string "or not, the choice is yours…\p" .string "The future can be changed anytime…\n" .string "I wish you safe passage…$" -BattleFrontier_BattlePyramidLobby_Text_2524DA: @ 82524DA +BattleFrontier_BattlePyramidLobby_Text_TrainersNoticeRunning: @ 82524DA .string "Did you know?\p" .string "If you run fast, TRAINERS may notice\n" .string "and come after you for a battle.\p" @@ -845,37 +851,37 @@ BattleFrontier_BattlePyramidLobby_Text_2524DA: @ 82524DA .string "don't catch their eyes, but sneak\l" .string "cautiously and quietly past them.$" -BattleFrontier_BattlePyramidLobby_Text_252595: @ 8252595 +BattleFrontier_BattlePyramidLobby_Text_LostLotOfItems: @ 8252595 .string "Awaaaaaaarrrrgh!\p" .string "I had a whole lot of items, but I lost\n" .string "them all when I lost!\p" .string "Awaaaaaaarrrrgh!$" -BattleFrontier_BattlePyramidLobby_Text_2525F4: @ 82525F4 +BattleFrontier_BattlePyramidLobby_Text_YouveDefeatedPyramidKing: @ 82525F4 .string "Welcome back!\n" .string "You've done the unthinkable!\p" .string "You've defeated the PYRAMID KING\n" .string "and conquered the BATTLE PYRAMID!$" -BattleFrontier_BattlePyramidLobby_Text_252662: @ 8252662 +BattleFrontier_BattlePyramidLobby_Text_GiveYouTheseBattlePoints: @ 8252662 .string "Young explorer!\n" .string "In commendation of your courage,\l" .string "we give you these Battle Point(s)!$" -BattleFrontier_BattlePyramidLobby_Text_2526B6: @ 82526B6 +BattleFrontier_BattlePyramidLobby_Text_RulesAreListed: @ 82526B6 .string "The Battle Quest rules are listed.$" -BattleFrontier_BattlePyramidLobby_Text_2526D9: @ 82526D9 +BattleFrontier_BattlePyramidLobby_Text_ReadWhichHeading: @ 82526D9 .string "Which heading do you want to read?$" -BattleFrontier_BattlePyramidLobby_Text_2526FC: @ 82526FC +BattleFrontier_BattlePyramidLobby_Text_ExplainMonRules: @ 82526FC .string "When the PYRAMID is conquered,\n" .string "the wild POKéMON that appear in it\l" .string "are replaced by different kinds.\p" .string "Explore, observe, and learn what kinds\n" .string "of wild POKéMON you may encounter.$" -BattleFrontier_BattlePyramidLobby_Text_2527A9: @ 82527A9 +BattleFrontier_BattlePyramidLobby_Text_ExplainTrainerRules: @ 82527A9 .string "TRAINERS are lying in wait for you\n" .string "inside the PYRAMID.\p" .string "On each floor, there are up to\n" @@ -883,7 +889,7 @@ BattleFrontier_BattlePyramidLobby_Text_2527A9: @ 82527A9 .string "When you defeat a TRAINER, you will\n" .string "get a helpful hint for your adventure.$" -BattleFrontier_BattlePyramidLobby_Text_25285A: @ 825285A +BattleFrontier_BattlePyramidLobby_Text_ExplainMazeRules: @ 825285A .string "The mazes in the PYRAMID rearrange\n" .string "themselves every time you enter it.\p" .string "The mazes are poorly lit.\n" @@ -891,7 +897,7 @@ BattleFrontier_BattlePyramidLobby_Text_25285A: @ 825285A .string "The light grows brighter whenever you\n" .string "defeat a wild POKéMON or a TRAINER.$" -BattleFrontier_BattlePyramidLobby_Text_252924: @ 8252924 +BattleFrontier_BattlePyramidLobby_Text_ExplainBagRules: @ 8252924 .string "The BATTLE BAG serves as your BAG\n" .string "while in the PYRAMID.\p" .string "There are two separate BATTLE BAGS--\n" diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.json b/data/maps/BattleFrontier_BattlePyramidTop/map.json index d73dc1692..3a304f147 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/map.json +++ b/data/maps/BattleFrontier_BattlePyramidTop/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "3", - "script": "BattleFrontier_BattlePyramidTop_EventScript_2551D0", + "script": "BattleFrontier_BattlePyramidTop_EventScript_Attendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "elevation": 4, "var": "VAR_TEMP_2", "var_value": "0", - "script": "BattleFrontier_BattlePyramidTop_EventScript_255256" + "script": "BattleFrontier_BattlePyramidTop_EventScript_BattleBrandon" } ], "bg_events": [] diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index 2e6b8f3a2..2d9006e9e 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -1,201 +1,197 @@ BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1 - map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidTop_MapScript1_2550F4 - map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidTop_MapScript2_25516E - map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidTop_MapScript1_2550B6 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidTop_MapScript2_2550CE + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidTop_OnResume + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidTop_OnFrame + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidTop_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidTop_OnWarp .byte 0 -BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6 +BattleFrontier_BattlePyramidTop_OnTransition: @ 82550B6 pyramid_updatelight 200, PYRAMID_LIGHT_SET_RADIUS setvar VAR_TEMP_F, 1 end -BattleFrontier_BattlePyramidTop_MapScript2_2550CE: @ 82550CE - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidTop_EventScript_2550D8 +BattleFrontier_BattlePyramidTop_OnWarp: @ 82550CE + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidTop_EventScript_SetUpObjects .2byte 0 -BattleFrontier_BattlePyramidTop_EventScript_2550D8:: @ 82550D8 +BattleFrontier_BattlePyramidTop_EventScript_SetUpObjects:: @ 82550D8 setvar VAR_TEMP_1, 1 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH compare VAR_TEMP_C, 0 - goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2550F3 + goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_EndSetUpObjects setobjectxyperm 2, 0, 0 - -BattleFrontier_BattlePyramidTop_EventScript_2550F3:: @ 82550F3 +BattleFrontier_BattlePyramidTop_EventScript_EndSetUpObjects:: @ 82550F3 end -BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4 +BattleFrontier_BattlePyramidTop_OnResume: @ 82550F4 frontier_getbrainstatus compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY - goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_25510C + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_CheckChallengeStatus call BattleFrontier_EventScript_SetBrainObjectGfx -BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C +BattleFrontier_BattlePyramidTop_EventScript_CheckChallengeStatus:: @ 825510C copyvar VAR_TEMP_C, VAR_RESULT frontier_getstatus switch VAR_TEMP_0 - case 0, BattleFrontier_BattlePyramidTop_EventScript_255193 - case CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramidTop_EventScript_252B66 - case CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidTop_EventScript_255193 + case 0, BattleFrontier_BattlePyramidTop_EventScript_ReadyChallenge + case CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramid_EventScript_WarpToLobby + case CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidTop_EventScript_ReadyChallenge frontier_get FRONTIER_DATA_BATTLE_OUTCOME compare VAR_RESULT, B_OUTCOME_LOST - goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost compare VAR_RESULT, B_OUTCOME_DREW - goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost compare VAR_RESULT, B_OUTCOME_FORFEITED - goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost end -BattleFrontier_BattlePyramidTop_MapScript2_25516E: @ 825516E - map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidTop_EventScript_255180 - map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidTop_EventScript_25518A +BattleFrontier_BattlePyramidTop_OnFrame: @ 825516E + map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidTop_EventScript_PlayPyramidMusic + map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidTop_EventScript_ShowMapName .2byte 0 -BattleFrontier_BattlePyramidTop_EventScript_255180:: @ 8255180 +BattleFrontier_BattlePyramidTop_EventScript_PlayPyramidMusic:: @ 8255180 playbgm MUS_PYRAMID_TOP, 0 setvar VAR_TEMP_E, 1 end -BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A +BattleFrontier_BattlePyramidTop_EventScript_ShowMapName:: @ 825518A special ShowMapNamePopup setvar VAR_TEMP_F, 0 end -BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193 +BattleFrontier_BattlePyramidTop_EventScript_ReadyChallenge:: @ 8255193 pyramid_save CHALLENGE_STATUS_SAVING special SavePlayerParty frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 - pyramid_inittrainers + pyramid_settrainers frontier_setpartyorder FRONTIER_PARTY_SIZE setvar VAR_TEMP_F, 1 end -BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0 +BattleFrontier_BattlePyramidTop_EventScript_Attendant:: @ 82551D0 lock faceplayer compare VAR_TEMP_D, 0 - goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255236 + goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_StepForwardWhenReady compare VAR_TEMP_C, FRONTIER_BRAIN_NOT_READY - goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255240 - msgbox BattleFrontier_BattlePyramidTop_Text_255410, MSGBOX_DEFAULT + goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_BrandonHereMoveAside + msgbox BattleFrontier_BattlePyramidTop_Text_ReachedSummitUpYouGo, MSGBOX_DEFAULT closemessage - applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD + applymovement 1, BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidTop_Movement_255403 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidTop_Movement_PlayerClimbToTop waitmovement 0 - applymovement 1, BattleFrontier_BattlePyramidTop_Movement_255400 + applymovement 1, BattleFrontier_BattlePyramidTop_Movement_AttendantBlockPath waitmovement 0 - message BattleFrontier_BattlePyramidTop_Text_2554E8 + message BattleFrontier_BattlePyramidTop_Text_PlayerConqueredPyramid waitmessage playfanfare MUS_ME_POINTGET waitfanfare closemessage - -BattleFrontier_BattlePyramidTop_EventScript_25521A:: @ 825521A +BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon:: @ 825521A frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 waitstate end -BattleFrontier_BattlePyramidTop_EventScript_255236:: @ 8255236 - msgbox BattleFrontier_BattlePyramidTop_Text_255BFE, MSGBOX_DEFAULT +BattleFrontier_BattlePyramidTop_EventScript_StepForwardWhenReady:: @ 8255236 + msgbox BattleFrontier_BattlePyramidTop_Text_StepForwardWhenReady, MSGBOX_DEFAULT closemessage end -BattleFrontier_BattlePyramidTop_EventScript_255240:: @ 8255240 - msgbox BattleFrontier_BattlePyramidTop_Text_25551F, MSGBOX_DEFAULT - applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD +BattleFrontier_BattlePyramidTop_EventScript_BrandonHereMoveAside:: @ 8255240 + msgbox BattleFrontier_BattlePyramidTop_Text_ChiefBeatYouHere, MSGBOX_DEFAULT + applymovement 1, BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside setvar VAR_TEMP_D, 1 closemessage end -BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256 +BattleFrontier_BattlePyramidTop_EventScript_BattleBrandon:: @ 8255256 lockall switch VAR_TEMP_C - case FRONTIER_BRAIN_GOLD, BattleFrontier_BattlePyramidTop_EventScript_255335 - case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePyramidTop_EventScript_2552D0 - case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePyramidTop_EventScript_255388 + case FRONTIER_BRAIN_GOLD, BattleFrontier_BattlePyramidTop_EventScript_BrandonIntroGold + case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech + case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH compare VAR_RESULT, FALSE - goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2552D0 + goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C + applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_CameraPanUp waitmovement 0 - msgbox BattleFrontier_BattlePyramidTop_Text_255669, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePyramidTop_Text_ExplorationsAreGrandestAdventure, MSGBOX_DEFAULT closemessage frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH - applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A + applymovement 2, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer waitmovement 0 - msgbox BattleFrontier_BattlePyramidTop_Text_25573E, MSGBOX_DEFAULT - goto BattleFrontier_BattlePyramidTop_EventScript_2552DA + msgbox BattleFrontier_BattlePyramidTop_Text_ImPyramidKingBrandon, MSGBOX_DEFAULT + goto BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonSilver end -BattleFrontier_BattlePyramidTop_EventScript_2552D0:: @ 82552D0 - applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A +BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech:: @ 82552D0 + applymovement 2, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer waitmovement 0 - -BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA - msgbox BattleFrontier_BattlePyramidTop_Text_255846, MSGBOX_DEFAULT - call BattleFrontier_BattlePyramidTop_EventScript_2553ED +BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonSilver:: @ 82552DA + msgbox BattleFrontier_BattlePyramidTop_Text_BringCourageToOurBattle, MSGBOX_DEFAULT + call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle playbgm MUS_PYRAMID_TOP, 0 compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_2552FB - goto BattleFrontier_BattlePyramidTop_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver + goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost -BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB +BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver:: @ 82552FB frontier_getsymbols compare VAR_RESULT, 0 - goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_25521A - msgbox BattleFrontier_BattlePyramidTop_Text_255873, MSGBOX_DEFAULT + goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon + msgbox BattleFrontier_BattlePyramidTop_Text_BrandonFrontierPassPlease, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET - message BattleFrontier_BattlePyramidTop_Text_2558E9 + message BattleFrontier_BattlePyramidTop_Text_ReceivedBraveSymbol waitmessage waitfanfare frontier_givesymbol - msgbox BattleFrontier_BattlePyramidTop_Text_25591D, MSGBOX_DEFAULT - goto BattleFrontier_BattlePyramidTop_EventScript_25521A + msgbox BattleFrontier_BattlePyramidTop_Text_LookForwardToNextMeeting, MSGBOX_DEFAULT + goto BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon -BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 +BattleFrontier_BattlePyramidTop_EventScript_BrandonIntroGold:: @ 8255335 frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH compare VAR_RESULT, FALSE - goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255388 + goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C + applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_CameraPanUp waitmovement 0 - msgbox BattleFrontier_BattlePyramidTop_Text_255951, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePyramidTop_Text_BrandonYouveReturned, MSGBOX_DEFAULT closemessage frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH - applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A + applymovement 2, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer waitmovement 0 - msgbox BattleFrontier_BattlePyramidTop_Text_255A6D, MSGBOX_DEFAULT - goto BattleFrontier_BattlePyramidTop_EventScript_255392 + msgbox BattleFrontier_BattlePyramidTop_Text_MyCourageIsOffMeter, MSGBOX_DEFAULT + goto BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonGold end -BattleFrontier_BattlePyramidTop_EventScript_255388:: @ 8255388 - applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A +BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech:: @ 8255388 + applymovement 2, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer waitmovement 0 - -BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392 - msgbox BattleFrontier_BattlePyramidTop_Text_255AA1, MSGBOX_DEFAULT - call BattleFrontier_BattlePyramidTop_EventScript_2553ED +BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonGold:: @ 8255392 + msgbox BattleFrontier_BattlePyramidTop_Text_EverythingYouHave, MSGBOX_DEFAULT + call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle playbgm MUS_PYRAMID_TOP, 0 compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_2553B3 - goto BattleFrontier_BattlePyramidTop_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold + goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost -BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3 +BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold:: @ 82553B3 frontier_getsymbols compare VAR_RESULT, 2 - goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_25521A - msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, MSGBOX_DEFAULT + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon + msgbox BattleFrontier_BattlePyramidTop_Text_BrandonRemarkableHaveThis, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET - message BattleFrontier_BattlePyramidTop_Text_255B59 + message BattleFrontier_BattlePyramidTop_Text_BraveSymbolTookGoldenShine waitmessage waitfanfare frontier_givesymbol - msgbox BattleFrontier_BattlePyramidTop_Text_255B82, MSGBOX_DEFAULT - goto BattleFrontier_BattlePyramidTop_EventScript_25521A + msgbox BattleFrontier_BattlePyramidTop_Text_FarewellForNow, MSGBOX_DEFAULT + goto BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon -BattleFrontier_BattlePyramidTop_EventScript_2553ED:: @ 82553ED +BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle:: @ 82553ED closemessage setvar VAR_0x8004, SPECIAL_BATTLE_PYRAMID setvar VAR_0x8005, 0 @@ -203,17 +199,17 @@ BattleFrontier_BattlePyramidTop_EventScript_2553ED:: @ 82553ED waitstate return -BattleFrontier_BattlePyramidTop_Movement_2553FD: @ 82553FD +BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside: @ 82553FD walk_right walk_in_place_fastest_left step_end -BattleFrontier_BattlePyramidTop_Movement_255400: @ 8255400 +BattleFrontier_BattlePyramidTop_Movement_AttendantBlockPath: @ 8255400 walk_left walk_in_place_fastest_up step_end -BattleFrontier_BattlePyramidTop_Movement_255403: @ 8255403 +BattleFrontier_BattlePyramidTop_Movement_PlayerClimbToTop: @ 8255403 walk_up walk_up walk_up @@ -222,17 +218,17 @@ BattleFrontier_BattlePyramidTop_Movement_255403: @ 8255403 walk_in_place_fastest_down step_end -BattleFrontier_BattlePyramidTop_Movement_25540A: @ 825540A +BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer: @ 825540A walk_fast_down step_end -BattleFrontier_BattlePyramidTop_Movement_25540C: @ 825540C +BattleFrontier_BattlePyramidTop_Movement_CameraPanUp: @ 825540C walk_slow_up walk_slow_up delay_16 step_end -BattleFrontier_BattlePyramidTop_Text_255410: @ 8255410 +BattleFrontier_BattlePyramidTop_Text_ReachedSummitUpYouGo: @ 8255410 .string "It is a delight to see you here!\n" .string "You have reached the summit of\l" .string "the BATTLE PYRAMID!\p" @@ -243,11 +239,11 @@ BattleFrontier_BattlePyramidTop_Text_255410: @ 8255410 .string "Now, please!\n" .string "Up you go!$" -BattleFrontier_BattlePyramidTop_Text_2554E8: @ 82554E8 +BattleFrontier_BattlePyramidTop_Text_PlayerConqueredPyramid: @ 82554E8 .string "The PYRAMID's new conqueror!\n" .string "Let the name {PLAYER} be known!$" -BattleFrontier_BattlePyramidTop_Text_25551F: @ 825551F +BattleFrontier_BattlePyramidTop_Text_ChiefBeatYouHere: @ 825551F .string "It is a delight to see you here!\p" .string "Unfortunately, you were second by\n" .string "a mere fraction of time!\p" @@ -260,7 +256,7 @@ BattleFrontier_BattlePyramidTop_Text_25551F: @ 825551F .string "Now, please! When you are ready,\n" .string "take one more step of courage!$" -BattleFrontier_BattlePyramidTop_Text_255669: @ 8255669 +BattleFrontier_BattlePyramidTop_Text_ExplorationsAreGrandestAdventure: @ 8255669 .string "Young adventurer…\p" .string "Wouldn't you agree that explorations\n" .string "are the grandest of adventures?\p" @@ -270,7 +266,7 @@ BattleFrontier_BattlePyramidTop_Text_255669: @ 8255669 .string "And, above all, only your own courage\n" .string "to lead you through unknown worlds…$" -BattleFrontier_BattlePyramidTop_Text_25573E: @ 825573E +BattleFrontier_BattlePyramidTop_Text_ImPyramidKingBrandon: @ 825573E .string "Aah, yes, indeed this life is grand!\n" .string "Grand, it is! Eh?\p" .string "I'm BRANDON!\p" @@ -283,25 +279,25 @@ BattleFrontier_BattlePyramidTop_Text_25573E: @ 825573E .string "Hahahah!\n" .string "This should be exciting!$" -BattleFrontier_BattlePyramidTop_Text_255846: @ 8255846 +BattleFrontier_BattlePyramidTop_Text_BringCourageToOurBattle: @ 8255846 .string "Now, then!\n" .string "Bring your courage to our battle!$" -BattleFrontier_BattlePyramidTop_Text_255873: @ 8255873 +BattleFrontier_BattlePyramidTop_Text_BrandonFrontierPassPlease: @ 8255873 .string "BRANDON: Hahahah! Grand it was!\n" .string "Grand, yes, indeed!\p" .string "Well done! You've earned recognition!\n" .string "Your FRONTIER PASS, please!$" -BattleFrontier_BattlePyramidTop_Text_2558E9: @ 82558E9 +BattleFrontier_BattlePyramidTop_Text_ReceivedBraveSymbol: @ 82558E9 .string "The Brave Symbol was embossed on\n" .string "the FRONTIER PASS!$" -BattleFrontier_BattlePyramidTop_Text_25591D: @ 825591D +BattleFrontier_BattlePyramidTop_Text_LookForwardToNextMeeting: @ 825591D .string "Young explorer!\n" .string "I look forward to our next meeting!$" -BattleFrontier_BattlePyramidTop_Text_255951: @ 8255951 +BattleFrontier_BattlePyramidTop_Text_BrandonYouveReturned: @ 8255951 .string "BRANDON: …You've finally returned,\n" .string "young explorer…\p" .string "Your love of adventure seems to come\n" @@ -315,16 +311,16 @@ BattleFrontier_BattlePyramidTop_Text_255951: @ 8255951 .string "Those days of death-defying,\n" .string "life-affirming adventures are back…$" -BattleFrontier_BattlePyramidTop_Text_255A6D: @ 8255A6D +BattleFrontier_BattlePyramidTop_Text_MyCourageIsOffMeter: @ 8255A6D .string "Now, then!\p" .string "I sense my own courage is off\n" .string "the meter!$" -BattleFrontier_BattlePyramidTop_Text_255AA1: @ 8255AA1 +BattleFrontier_BattlePyramidTop_Text_EverythingYouHave: @ 8255AA1 .string "Everything you have!\n" .string "I'm braced for it all!$" -BattleFrontier_BattlePyramidTop_Text_255ACD: @ 8255ACD +BattleFrontier_BattlePyramidTop_Text_BrandonRemarkableHaveThis: @ 8255ACD .string "BRANDON: Hahahah!\n" .string "Remarkable!\l" .string "Yes, it's grand, indeed!\p" @@ -332,17 +328,17 @@ BattleFrontier_BattlePyramidTop_Text_255ACD: @ 8255ACD .string "You've bested me through and through!\n" .string "Here! I want you to have this!$" -BattleFrontier_BattlePyramidTop_Text_255B59: @ 8255B59 +BattleFrontier_BattlePyramidTop_Text_BraveSymbolTookGoldenShine: @ 8255B59 .string "The Brave Symbol took on\n" .string "a golden shine!$" -BattleFrontier_BattlePyramidTop_Text_255B82: @ 8255B82 +BattleFrontier_BattlePyramidTop_Text_FarewellForNow: @ 8255B82 .string "Ah, yes! It just goes to show that\n" .string "I have much to learn still!\p" .string "May our paths cross again!\n" .string "Farewell for now, young explorer!$" -BattleFrontier_BattlePyramidTop_Text_255BFE: @ 8255BFE +BattleFrontier_BattlePyramidTop_Text_StepForwardWhenReady: @ 8255BFE .string "Now, when you are ready, take courage\n" .string "and step forward.$" diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index e7842de51..275ac4041 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -209,7 +209,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 waitmessage multichoice 17, 6, MULTI_LEVEL_MODE, 0 switch VAR_RESULT - case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 frontier_checkineligible compare VAR_0x8004, TRUE @@ -276,7 +276,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED waitmessage multichoice 17, 6, MULTI_LEVEL_MODE, 0 switch VAR_RESULT - case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 frontier_checkineligible compare VAR_0x8004, TRUE @@ -344,7 +344,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 waitmessage multichoice 17, 6, MULTI_LEVEL_MODE, 0 switch VAR_RESULT - case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 frontier_checkineligible compare VAR_0x8004, TRUE @@ -411,7 +411,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 waitmessage multichoice 17, 6, MULTI_LEVEL_MODE, 0 switch VAR_RESULT - case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 frontier_checkineligible compare VAR_0x8004, TRUE diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index 4a3d9cb96..e39c9ad94 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -6,7 +6,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92 .byte 0 BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7 - pyramid_healparty + pyramid_resetparty end BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0 diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 521cc5e03..e41499ce0 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -521,7 +521,7 @@ "BattleFrontier_BattlePalaceCorridor", "BattleFrontier_BattlePalaceBattleRoom", "BattleFrontier_BattlePyramidLobby", - "BattleFrontier_BattlePyramidEmptySquare", + "BattleFrontier_BattlePyramidFloor", "BattleFrontier_BattlePyramidTop", "BattleFrontier_BattleArenaLobby", "BattleFrontier_BattleArenaCorridor", diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc index d15da3399..ccdebd5cd 100644 --- a/data/scripts/field_poison.inc +++ b/data/scripts/field_poison.inc @@ -34,9 +34,9 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8 goto_if_eq BattleFrontier_BattlePike_EventScript_Retire pyramid_inchallenge compare VAR_RESULT, 1 @ On Pyramid floor - goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost compare VAR_RESULT, 2 @ On Pyramid peak - goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost trainerhill_inchallenge compare VAR_RESULT, TRUE goto_if_eq TrainerHill_1F_EventScript_Lost diff --git a/data/specials.inc b/data/specials.inc index be9761c03..fef21fe99 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -458,7 +458,7 @@ gSpecials:: @ 81DBA64 def_special sub_813A630 def_special BufferBattleTowerElevatorFloors def_special TryStoreHeldItemsInPyramidBag - def_special sub_81C4F24 + def_special ChooseItemsToTossFromPyramidBag def_special DoBattlePyramidMonsHaveHeldItem def_special BattlePyramidChooseMonHeldItems def_special SetBattleTowerLinkPlayerGfx |