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

Document Battle Pyramid scripts

Browse Source
This commit is contained in:
GriffinR
2019-12-11 03:28:55 -05:00
committed by huderlem
parent aa72c0ada3
commit 75b0c9d7a9
34 changed files with 946 additions and 937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/battle_frontier/battle_pyramid.inc
+23 -16
View File
@@ -1,5 +1,3 @@
@ TODO: Add explanatory comments to macros
@ Initialize the Battle Pyramid challenge @ Initialize the Battle Pyramid challenge
.macro pyramid_init .macro pyramid_init
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT
@@ -28,37 +26,43 @@
special CallBattlePyramidFunction special CallBattlePyramidFunction
.endm .endm
@ @ Set the prize item to give from one of two lists of possible prizes, depending on streak.
.macro pyramid_setprize .macro pyramid_setprize
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_PRIZE setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_PRIZE
special CallBattlePyramidFunction special CallBattlePyramidFunction
.endm .endm
@ @ Unused. Give the set prize item to the player. TRUE if room in Bag for prize, FALSE otherwise
.macro pyramid_giveprize
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GIVE_PRIZE
special CallBattlePyramidFunction
.endm
@ Set the random values for the floor (used to determine object positions, e.g.), and clear trainer flags
.macro pyramid_seedfloor .macro pyramid_seedfloor
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR
special CallBattlePyramidFunction special CallBattlePyramidFunction
.endm .endm
@ @ Set the item to pick up depending on the random seed and quantity (always 1) to the arguments for STD_FIND_ITEM
.macro pyramid_setitem .macro pyramid_setitem
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_ITEM setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_ITEM
special CallBattlePyramidFunction special CallBattlePyramidFunction
.endm .endm
@ @ Hide the picked-up item (technically it moves the item far offscreen)
.macro pyramid_hideitem .macro pyramid_hideitem
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_HIDE_ITEM setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_HIDE_ITEM
special CallBattlePyramidFunction special CallBattlePyramidFunction
.endm .endm
@ @ Set the facility trainers to gBattleFrontierTrainers
.macro pyramid_inittrainers .macro pyramid_settrainers
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_TRAINERS
special CallBattlePyramidFunction special CallBattlePyramidFunction
.endm .endm
@ @ Show the post-battle hint text
.macro pyramid_showhint .macro pyramid_showhint
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SHOW_HINT_TEXT setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SHOW_HINT_TEXT
special CallBattlePyramidFunction special CallBattlePyramidFunction
@@ -70,28 +74,31 @@
special CallBattlePyramidFunction special CallBattlePyramidFunction
.endm .endm
@ @ Update the light around the player. 2 different modes, for setting or incrementing light. See PYRAMID_LIGHT_*
.macro pyramid_updatelight radius:req, mode:req .macro pyramid_updatelight radius:req, mode:req, sound=0xFFFF
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
setvar VAR_0x8005, \radius setvar VAR_0x8005, \radius
setvar VAR_0x8006, \mode setvar VAR_0x8006, \mode
.if \sound != 0xFFFF
setvar VAR_0x8007, \sound
.endif
special CallBattlePyramidFunction special CallBattlePyramidFunction
.endm .endm
@ @ Reset the held items to what they were at the start of the challenge
.macro pyramid_clearhelditems .macro pyramid_clearhelditems
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS
special CallBattlePyramidFunction special CallBattlePyramidFunction
.endm .endm
@ @ Set the palette depending on current floor number
.macro pyramid_setfloorpal .macro pyramid_setfloorpal
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE
special CallBattlePyramidFunction special CallBattlePyramidFunction
.endm .endm
@ @ Reset sketched moves and update the party order in the saveblock
.macro pyramid_healparty .macro pyramid_resetparty
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY
special CallBattlePyramidFunction special CallBattlePyramidFunction
.endm .endm
data/event_scripts.s
+1 -1
View File
@@ -483,7 +483,7 @@ gStdScripts_End:: @ 81DC2CC
.include "data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc" .include "data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc"
.include "data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc" .include "data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc"
.include "data/maps/BattleFrontier_BattlePyramidLobby/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_BattlePyramidTop/scripts.inc"
.include "data/maps/BattleFrontier_BattleArenaLobby/scripts.inc" .include "data/maps/BattleFrontier_BattleArenaLobby/scripts.inc"
.include "data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc" .include "data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc"
data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin → data/layouts/BattleFrontier_BattlePyramidFloor/border.bin
View File
data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin → data/layouts/BattleFrontier_BattlePyramidFloor/map.bin
View File
data/layouts/layouts.json
+4 -4
View File
@@ -3602,14 +3602,14 @@
"blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin" "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin"
}, },
{ {
"id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR",
"name": "BattleFrontier_BattlePyramidEmptySquare_Layout", "name": "BattleFrontier_BattlePyramidFloor_Layout",
"width": 8, "width": 8,
"height": 8, "height": 8,
"primary_tileset": "gTileset_Building", "primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_BattlePyramid", "secondary_tileset": "gTileset_BattlePyramid",
"border_filepath": "data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin", "border_filepath": "data/layouts/BattleFrontier_BattlePyramidFloor/border.bin",
"blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin" "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidFloor/map.bin"
}, },
{ {
"id": "LAYOUT_BATTLE_PYRAMID_SQUARE01", "id": "LAYOUT_BATTLE_PYRAMID_SQUARE01",
data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+2 -3
View File
@@ -1,15 +1,14 @@
BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2 BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeLobby_MapScript1_2497F2 map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeLobby_MapScript1_2497F2
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_24980F 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 .byte 0
BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2 BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2
dome_21 dome_21
end end
BattleFrontier_BattleDomeLobby_MapScript2_2497FB: @ 82497FB BattleFrontier_BattleDomeLobby_OnWarp: @ 82497FB
BattleFrontier_BattlePyramidLobby_MapScript2_2497FB: @ 82497FB
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeLobby_EventScript_249805 map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeLobby_EventScript_249805
.2byte 0 .2byte 0
data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json → data/maps/BattleFrontier_BattlePyramidFloor/map.json
+3 -3
View File
@@ -1,7 +1,7 @@
{ {
"id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR",
"name": "BattleFrontier_BattlePyramidEmptySquare", "name": "BattleFrontier_BattlePyramidFloor",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR",
"music": "MUS_NONE", "music": "MUS_NONE",
"region_map_section": "MAPSEC_BATTLE_FRONTIER", "region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false, "requires_flash": false,
data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc → data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
+168 -168
View File
@@ -1,73 +1,72 @@
BattleFrontier_BattlePyramidEmptySquare_MapScripts:: @ 8252A33 BattleFrontier_BattlePyramidFloor_MapScripts:: @ 8252A33
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2 map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidFloor_OnResume
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43 map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidFloor_OnFrame
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidFloor_OnTransition
.byte 0 .byte 0
BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43: @ 8252A43 BattleFrontier_BattlePyramidFloor_OnFrame: @ 8252A43
map_script_2 VAR_TEMP_D, 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D map_script_2 VAR_TEMP_D, 1, BattleFrontier_BattlePyramidFloor_EventScript_UpdateLight
map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98 map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidFloor_EventScript_PlayPyramidMusic
map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidFloor_EventScript_ShowMapName
.2byte 0 .2byte 0
BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D BattleFrontier_BattlePyramidFloor_EventScript_UpdateLight:: @ 8252A5D
lockall lockall
@ pyramid_updatelight, cant use macro because it straddles the loop
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
setvar VAR_0x8006, PYRAMID_LIGHT_INCR_RADIUS setvar VAR_0x8006, PYRAMID_LIGHT_INCR_RADIUS
setvar VAR_0x8007, SE_SAVE setvar VAR_0x8007, SE_SAVE
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77 BattleFrontier_BattlePyramidFloor_EventScript_UpdateLightLoop:: @ 8252A77
special CallBattlePyramidFunction special CallBattlePyramidFunction
delay 2 delay 2
compare VAR_RESULT, 2 compare VAR_RESULT, 2
goto_if_ne BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77 goto_if_ne BattleFrontier_BattlePyramidFloor_EventScript_UpdateLightLoop
setvar VAR_TEMP_D, 0 setvar VAR_TEMP_D, 0
releaseall releaseall
end end
BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F:: @ 8252A8F BattleFrontier_BattlePyramidFloor_EventScript_ShowMapName:: @ 8252A8F
special ShowMapNamePopup special ShowMapNamePopup
setvar VAR_TEMP_F, 0 setvar VAR_TEMP_F, 0
end end
BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98 BattleFrontier_BattlePyramidFloor_EventScript_PlayPyramidMusic:: @ 8252A98
playbgm MUS_PYRAMID, 0 playbgm MUS_PYRAMID, 0
setvar VAR_TEMP_E, 1 setvar VAR_TEMP_E, 1
end end
BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 BattleFrontier_BattlePyramidFloor_OnResume: @ 8252AA2
pyramid_setfloorpal pyramid_setfloorpal
frontier_getstatus frontier_getstatus
switch VAR_TEMP_0 switch VAR_TEMP_0
case 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D case 0, BattleFrontier_BattlePyramidFloor_EventScript_ReadyChallenge
case CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66 case CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramid_EventScript_WarpToLobby
case CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D case CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidFloor_EventScript_ReadyChallenge
frontier_get FRONTIER_DATA_BATTLE_OUTCOME frontier_get FRONTIER_DATA_BATTLE_OUTCOME
compare VAR_RESULT, B_OUTCOME_RAN 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 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 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 goto_if_eq BattleFrontier_BattlePyramidFloor_EventScript_ResetParty
compare VAR_RESULT, B_OUTCOME_LOST 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 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 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 frontier_isbattletype BATTLE_TYPE_TRAINER @ VAR_RESULT seems to be ignored here
setvar VAR_TEMP_D, 1 setvar VAR_TEMP_D, 1
BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39 BattleFrontier_BattlePyramidFloor_EventScript_ResetParty:: @ 8252B39
pyramid_healparty pyramid_resetparty
end end
BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42:: @ 8252B42 BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost:: @ 8252B42
BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
pyramid_set PYRAMID_DATA_TRAINER_FLAGS, 255 pyramid_set PYRAMID_DATA_TRAINER_FLAGS, 255
BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66:: @ 8252B66 BattleFrontier_BattlePyramid_EventScript_WarpToLobby:: @ 8252B66
BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66
pyramid_updatelight 0, PYRAMID_LIGHT_SET_RADIUS pyramid_updatelight 0, PYRAMID_LIGHT_SET_RADIUS
pyramid_clearhelditems pyramid_clearhelditems
special HealPlayerParty special HealPlayerParty
@@ -75,39 +74,39 @@ BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66
waitstate waitstate
end end
BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D BattleFrontier_BattlePyramidFloor_EventScript_ReadyChallenge:: @ 8252B8D
pyramid_save CHALLENGE_STATUS_SAVING pyramid_save CHALLENGE_STATUS_SAVING
special SavePlayerParty special SavePlayerParty
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
pyramid_inittrainers pyramid_settrainers
frontier_setpartyorder FRONTIER_PARTY_SIZE frontier_setpartyorder FRONTIER_PARTY_SIZE
setvar VAR_TEMP_F, 1 setvar VAR_TEMP_F, 1
end end
BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA: @ 8252BCA BattleFrontier_BattlePyramidFloor_OnTransition: @ 8252BCA
call BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5 call BattleFrontier_BattlePyramidFloor_EventScript_SetLightRadius
setvar VAR_TEMP_F, 1 setvar VAR_TEMP_F, 1
end end
BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5 BattleFrontier_BattlePyramidFloor_EventScript_SetLightRadius:: @ 8252BD5
pyramid_updatelight 32, PYRAMID_LIGHT_SET_RADIUS pyramid_updatelight 32, PYRAMID_LIGHT_SET_RADIUS
return return
BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8 BattlePyramid_WarpToNextFloor:: @ 8252BE8
call BattleFrontier_EventScript_IncrementWinStreak call BattleFrontier_EventScript_IncrementWinStreak
frontier_get FRONTIER_DATA_BATTLE_NUM @ Floor number frontier_get FRONTIER_DATA_BATTLE_NUM @ Floor number
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45 goto_if_eq BattlePyramid_WarpToTop
pyramid_seedfloor pyramid_seedfloor
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
setvar VAR_RESULT, 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 waitstate
end end
BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45 BattlePyramid_WarpToTop:: @ 8252C45
warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP, 255, 17, 17 warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP, 255, 17, 17
waitstate waitstate
end end
@@ -126,14 +125,15 @@ BattlePyramid_FindItemBall:: @ 8252C6A
pyramid_setitem pyramid_setitem
callstd STD_FIND_ITEM callstd STD_FIND_ITEM
compare VAR_0x8007, 0 compare VAR_0x8007, 0
goto_if_eq BattlePyramid_FindItemBall_End goto_if_eq BattlePyramid_FindItemBallEnd
pyramid_hideitem pyramid_hideitem
BattlePyramid_FindItemBall_End:: @ 8252C87 BattlePyramid_FindItemBallEnd:: @ 8252C87
end end
BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88:: @ 8252C88 BattlePyramid_Retire:: @ 8252C88
goto BattleFrontier_BattlePyramidTop_EventScript_252B42 goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
@ Also used by Trainer Hill
BattleFacility_TrainerBattle_PlaceholderText: @ 8252C8D BattleFacility_TrainerBattle_PlaceholderText: @ 8252C8D
.string "This is a sample message.$" .string "This is a sample message.$"
@@ -146,595 +146,595 @@ gText_BattlePyramidConfirmRetire:: @ 8252CFB
.string "Are you sure you want to quit your\n" .string "Are you sure you want to quit your\n"
.string "PYRAMID quest?$" .string "PYRAMID quest?$"
BattlePyramid_ExitHintUp_Text1:: @ 8252D2D BattlePyramid_Text_ExitHintUp1:: @ 8252D2D
.string "This floor's exit is in\n" .string "This floor's exit is in\n"
.string "that direction: {UP_ARROW}$" .string "that direction: {UP_ARROW}$"
BattlePyramid_ExitHintLeft_Text1:: @ 8252D57 BattlePyramid_Text_ExitHintLeft1:: @ 8252D57
.string "This floor's exit is in\n" .string "This floor's exit is in\n"
.string "that direction: {LEFT_ARROW}$" .string "that direction: {LEFT_ARROW}$"
BattlePyramid_ExitHintRight_Text1:: @ 8252D81 BattlePyramid_Text_ExitHintRight1:: @ 8252D81
.string "This floor's exit is in\n" .string "This floor's exit is in\n"
.string "that direction: {RIGHT_ARROW}$" .string "that direction: {RIGHT_ARROW}$"
BattlePyramid_ExitHintDown_Text1:: @ 8252DAB BattlePyramid_Text_ExitHintDown1:: @ 8252DAB
.string "This floor's exit is in\n" .string "This floor's exit is in\n"
.string "that direction: {DOWN_ARROW}$" .string "that direction: {DOWN_ARROW}$"
BattlePyramid_ExitHintUp_Text2:: @ 8252DD5 BattlePyramid_Text_ExitHintUp2:: @ 8252DD5
.string "The exit on this floor is in\n" .string "The exit on this floor is in\n"
.string "the {UP_ARROW} direction.$" .string "the {UP_ARROW} direction.$"
BattlePyramid_ExitHintLeft_Text2:: @ 8252E03 BattlePyramid_Text_ExitHintLeft2:: @ 8252E03
.string "The exit on this floor is in\n" .string "The exit on this floor is in\n"
.string "the {LEFT_ARROW} direction.$" .string "the {LEFT_ARROW} direction.$"
BattlePyramid_ExitHintRight_Text2:: @ 8252E31 BattlePyramid_Text_ExitHintRight2:: @ 8252E31
.string "The exit on this floor is in\n" .string "The exit on this floor is in\n"
.string "the {RIGHT_ARROW} direction.$" .string "the {RIGHT_ARROW} direction.$"
BattlePyramid_ExitHintDown_Text2:: @ 8252E5F BattlePyramid_Text_ExitHintDown2:: @ 8252E5F
.string "The exit on this floor is in\n" .string "The exit on this floor is in\n"
.string "the {DOWN_ARROW} direction.$" .string "the {DOWN_ARROW} direction.$"
BattlePyramid_ExitHintUp_Text3:: @ 8252E8D BattlePyramid_Text_ExitHintUp3:: @ 8252E8D
.string "The exit is over\n" .string "The exit is over\n"
.string "that {UP_ARROW} way.$" .string "that {UP_ARROW} way.$"
BattlePyramid_ExitHintLeft_Text3:: @ 8252EAA BattlePyramid_Text_ExitHintLeft3:: @ 8252EAA
.string "The exit is over\n" .string "The exit is over\n"
.string "that {LEFT_ARROW} way.$" .string "that {LEFT_ARROW} way.$"
BattlePyramid_ExitHintRight_Text3:: @ 8252EC7 BattlePyramid_Text_ExitHintRight3:: @ 8252EC7
.string "The exit is over\n" .string "The exit is over\n"
.string "that {RIGHT_ARROW} way.$" .string "that {RIGHT_ARROW} way.$"
BattlePyramid_ExitHintDown_Text3:: @ 8252EE4 BattlePyramid_Text_ExitHintDown3:: @ 8252EE4
.string "The exit is over\n" .string "The exit is over\n"
.string "that {DOWN_ARROW} way.$" .string "that {DOWN_ARROW} way.$"
BattlePyramid_ExitHintUp_Text4:: @ 8252F01 BattlePyramid_Text_ExitHintUp4:: @ 8252F01
.string "On this floor, the exit is somewhere\n" .string "On this floor, the exit is somewhere\n"
.string "in the {UP_ARROW} direction.$" .string "in the {UP_ARROW} direction.$"
BattlePyramid_ExitHintLeft_Text4:: @ 8252F3A BattlePyramid_Text_ExitHintLeft4:: @ 8252F3A
.string "On this floor, the exit is somewhere\n" .string "On this floor, the exit is somewhere\n"
.string "in the {LEFT_ARROW} direction.$" .string "in the {LEFT_ARROW} direction.$"
BattlePyramid_ExitHintRight_Text4:: @ 8252F73 BattlePyramid_Text_ExitHintRight4:: @ 8252F73
.string "On this floor, the exit is somewhere\n" .string "On this floor, the exit is somewhere\n"
.string "in the {RIGHT_ARROW} direction.$" .string "in the {RIGHT_ARROW} direction.$"
BattlePyramid_ExitHintDown_Text4:: @ 8252FAC BattlePyramid_Text_ExitHintDown4:: @ 8252FAC
.string "On this floor, the exit is somewhere\n" .string "On this floor, the exit is somewhere\n"
.string "in the {DOWN_ARROW} direction.$" .string "in the {DOWN_ARROW} direction.$"
BattlePyramid_ExitHintUp_Text5:: @ 8252FE5 BattlePyramid_Text_ExitHintUp5:: @ 8252FE5
.string "The exit?\n" .string "The exit?\n"
.string "It's that {UP_ARROW} way.$" .string "It's that {UP_ARROW} way.$"
BattlePyramid_ExitHintLeft_Text5:: @ 8253000 BattlePyramid_Text_ExitHintLeft5:: @ 8253000
.string "The exit?\n" .string "The exit?\n"
.string "It's that {LEFT_ARROW} way.$" .string "It's that {LEFT_ARROW} way.$"
BattlePyramid_ExitHintRight_Text5:: @ 825301B BattlePyramid_Text_ExitHintRight5:: @ 825301B
.string "The exit?\n" .string "The exit?\n"
.string "It's that {RIGHT_ARROW} way.$" .string "It's that {RIGHT_ARROW} way.$"
BattlePyramid_ExitHintDown_Text5:: @ 8253036 BattlePyramid_Text_ExitHintDown5:: @ 8253036
.string "The exit?\n" .string "The exit?\n"
.string "It's that {DOWN_ARROW} way.$" .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 exit happens to be in\n"
.string "the {UP_ARROW} direction.$" .string "the {UP_ARROW} direction.$"
BattlePyramid_ExitHintLeft_Text6:: @ 825307C BattlePyramid_Text_ExitHintLeft6:: @ 825307C
.string "The exit happens to be in\n" .string "The exit happens to be in\n"
.string "the {LEFT_ARROW} direction.$" .string "the {LEFT_ARROW} direction.$"
BattlePyramid_ExitHintRight_Text6:: @ 82530A7 BattlePyramid_Text_ExitHintRight6:: @ 82530A7
.string "The exit happens to be in\n" .string "The exit happens to be in\n"
.string "the {RIGHT_ARROW} direction.$" .string "the {RIGHT_ARROW} direction.$"
BattlePyramid_ExitHintDown_Text6:: @ 82530D2 BattlePyramid_Text_ExitHintDown6:: @ 82530D2
.string "The exit happens to be in\n" .string "The exit happens to be in\n"
.string "the {DOWN_ARROW} direction.$" .string "the {DOWN_ARROW} direction.$"
BattlePyramid_EightItemsRemaining_Text1:: @ 82530FD BattlePyramid_Text_EightItemsRemaining1:: @ 82530FD
.string "Are you looking for items?\p" .string "Are you looking for items?\p"
.string "There are eight items left to\n" .string "There are eight items left to\n"
.string "be found.$" .string "be found.$"
BattlePyramid_SevenItemsRemaining_Text1:: @ 8253140 BattlePyramid_Text_SevenItemsRemaining1:: @ 8253140
.string "Are you looking for items?\p" .string "Are you looking for items?\p"
.string "There are seven items left to\n" .string "There are seven items left to\n"
.string "be found.$" .string "be found.$"
BattlePyramid_SixItemsRemaining_Text1:: @ 8253183 BattlePyramid_Text_SixItemsRemaining1:: @ 8253183
.string "Are you looking for items?\p" .string "Are you looking for items?\p"
.string "There are six items left to\n" .string "There are six items left to\n"
.string "be found.$" .string "be found.$"
BattlePyramid_FiveItemsRemaining_Text1:: @ 82531C4 BattlePyramid_Text_FiveItemsRemaining1:: @ 82531C4
.string "Are you looking for items?\p" .string "Are you looking for items?\p"
.string "There are five items left to\n" .string "There are five items left to\n"
.string "be found.$" .string "be found.$"
BattlePyramid_FourItemsRemaining_Text1:: @ 8253206 BattlePyramid_Text_FourItemsRemaining1:: @ 8253206
.string "Are you looking for items?\p" .string "Are you looking for items?\p"
.string "There are four items left to\n" .string "There are four items left to\n"
.string "be found.$" .string "be found.$"
BattlePyramid_ThreeItemsRemaining_Text1:: @ 8253248 BattlePyramid_Text_ThreeItemsRemaining1:: @ 8253248
.string "Are you looking for items?\p" .string "Are you looking for items?\p"
.string "There are three items left to\n" .string "There are three items left to\n"
.string "be found.$" .string "be found.$"
BattlePyramid_TwoItemsRemaining_Text1:: @ 825328B BattlePyramid_Text_TwoItemsRemaining1:: @ 825328B
.string "Are you looking for items?\p" .string "Are you looking for items?\p"
.string "There are two items left to\n" .string "There are two items left to\n"
.string "be found.$" .string "be found.$"
BattlePyramid_OneItemRemaining_Text1:: @ 82532CC BattlePyramid_Text_OneItemRemaining1:: @ 82532CC
.string "Are you looking for items?\p" .string "Are you looking for items?\p"
.string "There is one item left to\n" .string "There is one item left to\n"
.string "be found.$" .string "be found.$"
BattlePyramid_ZeroItemsRemaining_Text1:: @ 825330B BattlePyramid_Text_ZeroItemsRemaining1:: @ 825330B
.string "Are you looking for items?\p" .string "Are you looking for items?\p"
.string "There isn't anything left to\n" .string "There isn't anything left to\n"
.string "be found!$" .string "be found!$"
BattlePyramid_EightItemsRemaining_Text2:: @ 825334D BattlePyramid_Text_EightItemsRemaining2:: @ 825334D
.string "Because you won, I'll tell you\n" .string "Because you won, I'll tell you\n"
.string "a little secret!\p" .string "a little secret!\p"
.string "There are eight items\n" .string "There are eight items\n"
.string "lying around here.$" .string "lying around here.$"
BattlePyramid_SevenItemsRemaining_Text2:: @ 82533A6 BattlePyramid_Text_SevenItemsRemaining2:: @ 82533A6
.string "Because you won, I'll tell you\n" .string "Because you won, I'll tell you\n"
.string "a little secret!\p" .string "a little secret!\p"
.string "There are seven items left\n" .string "There are seven items left\n"
.string "lying around here.$" .string "lying around here.$"
BattlePyramid_SixItemsRemaining_Text2:: @ 8253404 BattlePyramid_Text_SixItemsRemaining2:: @ 8253404
.string "Because you won, I'll tell you\n" .string "Because you won, I'll tell you\n"
.string "a little secret!\p" .string "a little secret!\p"
.string "There are six items left\n" .string "There are six items left\n"
.string "lying around here.$" .string "lying around here.$"
BattlePyramid_FiveItemsRemaining_Text2:: @ 8253460 BattlePyramid_Text_FiveItemsRemaining2:: @ 8253460
.string "Because you won, I'll tell you\n" .string "Because you won, I'll tell you\n"
.string "a little secret!\p" .string "a little secret!\p"
.string "There are five items left\n" .string "There are five items left\n"
.string "lying around here.$" .string "lying around here.$"
BattlePyramid_FourItemsRemaining_Text2:: @ 82534BD BattlePyramid_Text_FourItemsRemaining2:: @ 82534BD
.string "Because you won, I'll tell you\n" .string "Because you won, I'll tell you\n"
.string "a little secret!\p" .string "a little secret!\p"
.string "There are four items left\n" .string "There are four items left\n"
.string "lying around here.$" .string "lying around here.$"
BattlePyramid_ThreeItemsRemaining_Text2:: @ 825351A BattlePyramid_Text_ThreeItemsRemaining2:: @ 825351A
.string "Because you won, I'll tell you\n" .string "Because you won, I'll tell you\n"
.string "a little secret!\p" .string "a little secret!\p"
.string "There are three items left\n" .string "There are three items left\n"
.string "lying around here.$" .string "lying around here.$"
BattlePyramid_TwoItemsRemaining_Text2:: @ 8253578 BattlePyramid_Text_TwoItemsRemaining2:: @ 8253578
.string "Because you won, I'll tell you\n" .string "Because you won, I'll tell you\n"
.string "a little secret!\p" .string "a little secret!\p"
.string "There are two items left\n" .string "There are two items left\n"
.string "lying around here.$" .string "lying around here.$"
BattlePyramid_OneItemRemaining_Text2:: @ 82535D4 BattlePyramid_Text_OneItemRemaining2:: @ 82535D4
.string "Because you won, I'll tell you\n" .string "Because you won, I'll tell you\n"
.string "a little secret!\p" .string "a little secret!\p"
.string "There is just one item\n" .string "There is just one item\n"
.string "lying around here.$" .string "lying around here.$"
BattlePyramid_ZeroItemsRemaining_Text2:: @ 825362E BattlePyramid_Text_ZeroItemsRemaining2:: @ 825362E
.string "Because you won, I'll tell you\n" .string "Because you won, I'll tell you\n"
.string "a little secret!\p" .string "a little secret!\p"
.string "There isn't anything left\n" .string "There isn't anything left\n"
.string "lying around here.$" .string "lying around here.$"
BattlePyramid_EightItemsRemaining_Text3:: @ 825368B BattlePyramid_Text_EightItemsRemaining3:: @ 825368B
.string "How's your stock of items holding up?\p" .string "How's your stock of items holding up?\p"
.string "I reckon there are eight items left\n" .string "I reckon there are eight items left\n"
.string "waiting to be found on this floor.$" .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 "How's your stock of items holding up?\p"
.string "I reckon there are seven items left\n" .string "I reckon there are seven items left\n"
.string "waiting to be found on this floor.$" .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 "How's your stock of items holding up?\p"
.string "I reckon there are six items left\n" .string "I reckon there are six items left\n"
.string "waiting to be found on this floor.$" .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 "How's your stock of items holding up?\p"
.string "I reckon there are five items left\n" .string "I reckon there are five items left\n"
.string "waiting to be found on this floor.$" .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 "How's your stock of items holding up?\p"
.string "I reckon there are four items left\n" .string "I reckon there are four items left\n"
.string "waiting to be found on this floor.$" .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 "How's your stock of items holding up?\p"
.string "I reckon there are three items left\n" .string "I reckon there are three items left\n"
.string "waiting to be found on this floor.$" .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 "How's your stock of items holding up?\p"
.string "I reckon there are two items left\n" .string "I reckon there are two items left\n"
.string "waiting to be found on this floor.$" .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 "How's your stock of items holding up?\p"
.string "I reckon there's but one item left\n" .string "I reckon there's but one item left\n"
.string "waiting to be found on this floor.$" .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 "How's your stock of items holding up?\p"
.string "I reckon there are no more items\n" .string "I reckon there are no more items\n"
.string "waiting to be found on this floor.\l" .string "waiting to be found on this floor.\l"
.string "You take care now!$" .string "You take care now!$"
BattlePyramid_EightItemsRemaining_Text4:: @ 8253A69 BattlePyramid_Text_EightItemsRemaining4:: @ 8253A69
.string "You're strong, so you've earned\n" .string "You're strong, so you've earned\n"
.string "a hint!\p" .string "a hint!\p"
.string "There appear to be eight more\n" .string "There appear to be eight more\n"
.string "items on the ground.$" .string "items on the ground.$"
BattlePyramid_SevenItemsRemaining_Text4:: @ 8253AC4 BattlePyramid_Text_SevenItemsRemaining4:: @ 8253AC4
.string "You're strong, so you've earned\n" .string "You're strong, so you've earned\n"
.string "a hint!\p" .string "a hint!\p"
.string "There appear to be seven more\n" .string "There appear to be seven more\n"
.string "items on the ground.$" .string "items on the ground.$"
BattlePyramid_SixItemsRemaining_Text4:: @ 8253B1F BattlePyramid_Text_SixItemsRemaining4:: @ 8253B1F
.string "You're strong, so you've earned\n" .string "You're strong, so you've earned\n"
.string "a hint!\p" .string "a hint!\p"
.string "There appear to be six more\n" .string "There appear to be six more\n"
.string "items on the ground.$" .string "items on the ground.$"
BattlePyramid_FiveItemsRemaining_Text4:: @ 8253B78 BattlePyramid_Text_FiveItemsRemaining4:: @ 8253B78
.string "You're strong, so you've earned\n" .string "You're strong, so you've earned\n"
.string "a hint!\p" .string "a hint!\p"
.string "There appear to be five more\n" .string "There appear to be five more\n"
.string "items on the ground.$" .string "items on the ground.$"
BattlePyramid_FourItemsRemaining_Text4:: @ 8253BD2 BattlePyramid_Text_FourItemsRemaining4:: @ 8253BD2
.string "You're strong, so you've earned\n" .string "You're strong, so you've earned\n"
.string "a hint!\p" .string "a hint!\p"
.string "There appear to be four more\n" .string "There appear to be four more\n"
.string "items on the ground.$" .string "items on the ground.$"
BattlePyramid_ThreeItemsRemaining_Text4:: @ 8253C2C BattlePyramid_Text_ThreeItemsRemaining4:: @ 8253C2C
.string "You're strong, so you've earned\n" .string "You're strong, so you've earned\n"
.string "a hint!\p" .string "a hint!\p"
.string "There appear to be three more\n" .string "There appear to be three more\n"
.string "items on the ground.$" .string "items on the ground.$"
BattlePyramid_TwoItemsRemaining_Text4:: @ 8253C87 BattlePyramid_Text_TwoItemsRemaining4:: @ 8253C87
.string "You're strong, so you've earned\n" .string "You're strong, so you've earned\n"
.string "a hint!\p" .string "a hint!\p"
.string "There appear to be two more\n" .string "There appear to be two more\n"
.string "items on the ground.$" .string "items on the ground.$"
BattlePyramid_OneItemRemaining_Text4:: @ 8253CE0 BattlePyramid_Text_OneItemRemaining4:: @ 8253CE0
.string "You're strong, so you've earned\n" .string "You're strong, so you've earned\n"
.string "a hint!\p" .string "a hint!\p"
.string "There appears to be only one more\n" .string "There appears to be only one more\n"
.string "item on the ground.$" .string "item on the ground.$"
BattlePyramid_ZeroItemsRemaining_Text4:: @ 8253D3E BattlePyramid_Text_ZeroItemsRemaining4:: @ 8253D3E
.string "You're strong, so you've earned\n" .string "You're strong, so you've earned\n"
.string "a hint!\p" .string "a hint!\p"
.string "There appear to be no more\n" .string "There appear to be no more\n"
.string "items on the ground.$" .string "items on the ground.$"
BattlePyramid_EightItemsRemaining_Text5:: @ 8253D96 BattlePyramid_Text_EightItemsRemaining5:: @ 8253D96
.string "On this floor of the PYRAMID,\n" .string "On this floor of the PYRAMID,\n"
.string "I hear there are eight items…$" .string "I hear there are eight items…$"
BattlePyramid_SevenItemsRemaining_Text5:: @ 8253DD2 BattlePyramid_Text_SevenItemsRemaining5:: @ 8253DD2
.string "On this floor of the PYRAMID,\n" .string "On this floor of the PYRAMID,\n"
.string "I hear there are seven items…$" .string "I hear there are seven items…$"
BattlePyramid_SixItemsRemaining_Text5:: @ 8253E0E BattlePyramid_Text_SixItemsRemaining5:: @ 8253E0E
.string "On this floor of the PYRAMID,\n" .string "On this floor of the PYRAMID,\n"
.string "I hear there are six items…$" .string "I hear there are six items…$"
BattlePyramid_FiveItemsRemaining_Text5:: @ 8253E48 BattlePyramid_Text_FiveItemsRemaining5:: @ 8253E48
.string "On this floor of the PYRAMID,\n" .string "On this floor of the PYRAMID,\n"
.string "I hear there are five items…$" .string "I hear there are five items…$"
BattlePyramid_FourItemsRemaining_Text5:: @ 8253E83 BattlePyramid_Text_FourItemsRemaining5:: @ 8253E83
.string "On this floor of the PYRAMID,\n" .string "On this floor of the PYRAMID,\n"
.string "I hear there are four items…$" .string "I hear there are four items…$"
BattlePyramid_ThreeItemsRemaining_Text5:: @ 8253EBE BattlePyramid_Text_ThreeItemsRemaining5:: @ 8253EBE
.string "On this floor of the PYRAMID,\n" .string "On this floor of the PYRAMID,\n"
.string "I hear there are three items…$" .string "I hear there are three items…$"
BattlePyramid_TwoItemsRemaining_Text5:: @ 8253EFA BattlePyramid_Text_TwoItemsRemaining5:: @ 8253EFA
.string "On this floor of the PYRAMID,\n" .string "On this floor of the PYRAMID,\n"
.string "I hear there are two items…$" .string "I hear there are two items…$"
BattlePyramid_OneItemRemaining_Text5:: @ 8253F34 BattlePyramid_Text_OneItemRemaining5:: @ 8253F34
.string "On this floor of the PYRAMID,\n" .string "On this floor of the PYRAMID,\n"
.string "I hear there is one item…$" .string "I hear there is one item…$"
BattlePyramid_ZeroItemsRemaining_Text5:: @ 8253F6C BattlePyramid_Text_ZeroItemsRemaining5:: @ 8253F6C
.string "On this floor of the PYRAMID,\n" .string "On this floor of the PYRAMID,\n"
.string "I hear there are no items…$" .string "I hear there are no items…$"
BattlePyramid_EightItemsRemaining_Text6:: @ 8253FA5 BattlePyramid_Text_EightItemsRemaining6:: @ 8253FA5
.string "Have you collected any items?\p" .string "Have you collected any items?\p"
.string "I believe there are eight more\n" .string "I believe there are eight more\n"
.string "items on this floor.$" .string "items on this floor.$"
BattlePyramid_SevenItemsRemaining_Text6:: @ 8253FF7 BattlePyramid_Text_SevenItemsRemaining6:: @ 8253FF7
.string "Have you collected any items?\p" .string "Have you collected any items?\p"
.string "I believe there are seven more\n" .string "I believe there are seven more\n"
.string "items on this floor.$" .string "items on this floor.$"
BattlePyramid_SixItemsRemaining_Text6:: @ 8254049 BattlePyramid_Text_SixItemsRemaining6:: @ 8254049
.string "Have you collected any items?\p" .string "Have you collected any items?\p"
.string "I believe there are six more\n" .string "I believe there are six more\n"
.string "items on this floor.$" .string "items on this floor.$"
BattlePyramid_FiveItemsRemaining_Text6:: @ 8254099 BattlePyramid_Text_FiveItemsRemaining6:: @ 8254099
.string "Have you collected any items?\p" .string "Have you collected any items?\p"
.string "I believe there are five more\n" .string "I believe there are five more\n"
.string "items on this floor.$" .string "items on this floor.$"
BattlePyramid_FourItemsRemaining_Text6:: @ 82540EA BattlePyramid_Text_FourItemsRemaining6:: @ 82540EA
.string "Have you collected any items?\p" .string "Have you collected any items?\p"
.string "I believe there are four more\n" .string "I believe there are four more\n"
.string "items on this floor.$" .string "items on this floor.$"
BattlePyramid_ThreeItemsRemaining_Text6:: @ 825413B BattlePyramid_Text_ThreeItemsRemaining6:: @ 825413B
.string "Have you collected any items?\p" .string "Have you collected any items?\p"
.string "I believe there are three more\n" .string "I believe there are three more\n"
.string "items on this floor.$" .string "items on this floor.$"
BattlePyramid_TwoItemsRemaining_Text6:: @ 825418D BattlePyramid_Text_TwoItemsRemaining6:: @ 825418D
.string "Have you collected any items?\p" .string "Have you collected any items?\p"
.string "I believe there are two more\n" .string "I believe there are two more\n"
.string "items on this floor.$" .string "items on this floor.$"
BattlePyramid_OneItemRemaining_Text6:: @ 82541DD BattlePyramid_Text_OneItemRemaining6:: @ 82541DD
.string "Have you collected any items?\p" .string "Have you collected any items?\p"
.string "I believe there is one more\n" .string "I believe there is one more\n"
.string "item on this floor.$" .string "item on this floor.$"
BattlePyramid_ZeroItemsRemaining_Text6:: @ 825422B BattlePyramid_Text_ZeroItemsRemaining6:: @ 825422B
.string "Have you collected any items?\p" .string "Have you collected any items?\p"
.string "I believe there are no more\n" .string "I believe there are no more\n"
.string "items on this floor.$" .string "items on this floor.$"
BattlePyramid_SevenTrainersRemaining_Text1:: @ 825427A BattlePyramid_Text_SevenTrainersRemaining1:: @ 825427A
.string "You were really awesome!\p" .string "You were really awesome!\p"
.string "But there are still seven tough\n" .string "But there are still seven tough\n"
.string "TRAINERS other than me!$" .string "TRAINERS other than me!$"
BattlePyramid_SixTrainersRemaining_Text1:: @ 82542CB BattlePyramid_Text_SixTrainersRemaining1:: @ 82542CB
.string "You were really awesome!\p" .string "You were really awesome!\p"
.string "But there are still six tough\n" .string "But there are still six tough\n"
.string "TRAINERS other than me!$" .string "TRAINERS other than me!$"
BattlePyramid_FiveTrainersRemaining_Text1:: @ 825431A BattlePyramid_Text_FiveTrainersRemaining1:: @ 825431A
.string "You were really awesome!\p" .string "You were really awesome!\p"
.string "But there are still five tough\n" .string "But there are still five tough\n"
.string "TRAINERS other than me!$" .string "TRAINERS other than me!$"
BattlePyramid_FourTrainersRemaining_Text1:: @ 825436A BattlePyramid_Text_FourTrainersRemaining1:: @ 825436A
.string "You were really awesome!\p" .string "You were really awesome!\p"
.string "But there are still four tough\n" .string "But there are still four tough\n"
.string "TRAINERS other than me!$" .string "TRAINERS other than me!$"
BattlePyramid_ThreeTrainersRemaining_Text1:: @ 82543BA BattlePyramid_Text_ThreeTrainersRemaining1:: @ 82543BA
.string "You were really awesome!\p" .string "You were really awesome!\p"
.string "But there are still three tough\n" .string "But there are still three tough\n"
.string "TRAINERS other than me!$" .string "TRAINERS other than me!$"
BattlePyramid_TwoTrainersRemaining_Text1:: @ 825440B BattlePyramid_Text_TwoTrainersRemaining1:: @ 825440B
.string "You were really awesome!\p" .string "You were really awesome!\p"
.string "But there are still two tough\n" .string "But there are still two tough\n"
.string "TRAINERS other than me!$" .string "TRAINERS other than me!$"
BattlePyramid_OneTrainersRemaining_Text1:: @ 825445A BattlePyramid_Text_OneTrainersRemaining1:: @ 825445A
.string "You were really awesome!\p" .string "You were really awesome!\p"
.string "But there's still one tough\n" .string "But there's still one tough\n"
.string "TRAINER other than me!$" .string "TRAINER other than me!$"
BattlePyramid_ZeroTrainersRemaining_Text1:: @ 82544A6 BattlePyramid_Text_ZeroTrainersRemaining1:: @ 82544A6
.string "You were really awesome!\p" .string "You were really awesome!\p"
.string "There's no one left that\n" .string "There's no one left that\n"
.string "can beat you!$" .string "can beat you!$"
BattlePyramid_SevenTrainersRemaining_Text2:: @ 82544E6 BattlePyramid_Text_SevenTrainersRemaining2:: @ 82544E6
.string "This is so upsetting!\p" .string "This is so upsetting!\p"
.string "But there are seven TRAINERS left!\n" .string "But there are seven TRAINERS left!\n"
.string "Someone will humble you!$" .string "Someone will humble you!$"
BattlePyramid_SixTrainersRemaining_Text2:: @ 8254538 BattlePyramid_Text_SixTrainersRemaining2:: @ 8254538
.string "This is so upsetting!\p" .string "This is so upsetting!\p"
.string "But there are six TRAINERS left!\n" .string "But there are six TRAINERS left!\n"
.string "Someone will humble you!$" .string "Someone will humble you!$"
BattlePyramid_FiveTrainersRemaining_Text2:: @ 8254588 BattlePyramid_Text_FiveTrainersRemaining2:: @ 8254588
.string "This is so upsetting!\p" .string "This is so upsetting!\p"
.string "But there are five TRAINERS left!\n" .string "But there are five TRAINERS left!\n"
.string "Someone will humble you!$" .string "Someone will humble you!$"
BattlePyramid_FourTrainersRemaining_Text2:: @ 82545D9 BattlePyramid_Text_FourTrainersRemaining2:: @ 82545D9
.string "This is so upsetting!\p" .string "This is so upsetting!\p"
.string "But there are four TRAINERS left!\n" .string "But there are four TRAINERS left!\n"
.string "Someone will humble you!$" .string "Someone will humble you!$"
BattlePyramid_ThreeTrainersRemaining_Text2:: @ 825462A BattlePyramid_Text_ThreeTrainersRemaining2:: @ 825462A
.string "This is so upsetting!\p" .string "This is so upsetting!\p"
.string "But there are three TRAINERS left!\n" .string "But there are three TRAINERS left!\n"
.string "Someone will humble you!$" .string "Someone will humble you!$"
BattlePyramid_TwoTrainersRemaining_Text2:: @ 825467C BattlePyramid_Text_TwoTrainersRemaining2:: @ 825467C
.string "This is so upsetting!\p" .string "This is so upsetting!\p"
.string "But there are two TRAINERS left!\n" .string "But there are two TRAINERS left!\n"
.string "Someone will humble you!$" .string "Someone will humble you!$"
BattlePyramid_OneTrainersRemaining_Text2:: @ 82546CC BattlePyramid_Text_OneTrainersRemaining2:: @ 82546CC
.string "This is so upsetting!\p" .string "This is so upsetting!\p"
.string "But there's one TRAINER left!\n" .string "But there's one TRAINER left!\n"
.string "I'm sure you will be humbled!$" .string "I'm sure you will be humbled!$"
BattlePyramid_ZeroTrainersRemaining_Text2:: @ 825471E BattlePyramid_Text_ZeroTrainersRemaining2:: @ 825471E
.string "This is so upsetting!\p" .string "This is so upsetting!\p"
.string "But there are no more TRAINERS\n" .string "But there are no more TRAINERS\n"
.string "who can engage you!$" .string "who can engage you!$"
BattlePyramid_SevenTrainersRemaining_Text3:: @ 8254767 BattlePyramid_Text_SevenTrainersRemaining3:: @ 8254767
.string "That's pretty impressive!\p" .string "That's pretty impressive!\p"
.string "But there are seven more TRAINERS\n" .string "But there are seven more TRAINERS\n"
.string "on this floor. Can you beat them all?$" .string "on this floor. Can you beat them all?$"
BattlePyramid_SixTrainersRemaining_Text3:: @ 82547C9 BattlePyramid_Text_SixTrainersRemaining3:: @ 82547C9
.string "That's pretty impressive!\p" .string "That's pretty impressive!\p"
.string "But there are six more TRAINERS\n" .string "But there are six more TRAINERS\n"
.string "on this floor. Can you beat them all?$" .string "on this floor. Can you beat them all?$"
BattlePyramid_FiveTrainersRemaining_Text3:: @ 8254829 BattlePyramid_Text_FiveTrainersRemaining3:: @ 8254829
.string "That's pretty impressive!\p" .string "That's pretty impressive!\p"
.string "But there are five more TRAINERS\n" .string "But there are five more TRAINERS\n"
.string "on this floor. Can you beat them all?$" .string "on this floor. Can you beat them all?$"
BattlePyramid_FourTrainersRemaining_Text3:: @ 825488A BattlePyramid_Text_FourTrainersRemaining3:: @ 825488A
.string "That's pretty impressive!\p" .string "That's pretty impressive!\p"
.string "But there are four more TRAINERS\n" .string "But there are four more TRAINERS\n"
.string "on this floor. Can you beat them all?$" .string "on this floor. Can you beat them all?$"
BattlePyramid_ThreeTrainersRemaining_Text3:: @ 82548EB BattlePyramid_Text_ThreeTrainersRemaining3:: @ 82548EB
.string "That's pretty impressive!\p" .string "That's pretty impressive!\p"
.string "But there are three more TRAINERS\n" .string "But there are three more TRAINERS\n"
.string "on this floor. Can you beat them all?$" .string "on this floor. Can you beat them all?$"
BattlePyramid_TwoTrainersRemaining_Text3:: @ 825494D BattlePyramid_Text_TwoTrainersRemaining3:: @ 825494D
.string "That's pretty impressive!\p" .string "That's pretty impressive!\p"
.string "But there are two more TRAINERS\n" .string "But there are two more TRAINERS\n"
.string "on this floor. Can you beat them both?$" .string "on this floor. Can you beat them both?$"
BattlePyramid_OneTrainersRemaining_Text3:: @ 82549AE BattlePyramid_Text_OneTrainersRemaining3:: @ 82549AE
.string "That's pretty impressive!\p" .string "That's pretty impressive!\p"
.string "But there's still one more TRAINER\n" .string "But there's still one more TRAINER\n"
.string "on this floor. Can you prevail?$" .string "on this floor. Can you prevail?$"
BattlePyramid_ZeroTrainersRemaining_Text3:: @ 8254A0B BattlePyramid_Text_ZeroTrainersRemaining3:: @ 8254A0B
.string "That's pretty impressive!\p" .string "That's pretty impressive!\p"
.string "You've gone through all the TRAINERS\n" .string "You've gone through all the TRAINERS\n"
.string "on this floor.$" .string "on this floor.$"
BattlePyramid_SevenTrainersRemaining_Text4:: @ 8254A59 BattlePyramid_Text_SevenTrainersRemaining4:: @ 8254A59
.string "Maybe you could sweep through\n" .string "Maybe you could sweep through\n"
.string "the seven TRAINERS left on this floor.$" .string "the seven TRAINERS left on this floor.$"
BattlePyramid_SixTrainersRemaining_Text4:: @ 8254A9E BattlePyramid_Text_SixTrainersRemaining4:: @ 8254A9E
.string "Maybe you could sweep through\n" .string "Maybe you could sweep through\n"
.string "the six TRAINERS left on this floor.$" .string "the six TRAINERS left on this floor.$"
BattlePyramid_FiveTrainersRemaining_Text4:: @ 8254AE1 BattlePyramid_Text_FiveTrainersRemaining4:: @ 8254AE1
.string "Maybe you could sweep through\n" .string "Maybe you could sweep through\n"
.string "the five TRAINERS left on this floor.$" .string "the five TRAINERS left on this floor.$"
BattlePyramid_FourTrainersRemaining_Text4:: @ 8254B25 BattlePyramid_Text_FourTrainersRemaining4:: @ 8254B25
.string "Maybe you could sweep through\n" .string "Maybe you could sweep through\n"
.string "the four TRAINERS left on this floor.$" .string "the four TRAINERS left on this floor.$"
BattlePyramid_ThreeTrainersRemaining_Text4:: @ 8254B69 BattlePyramid_Text_ThreeTrainersRemaining4:: @ 8254B69
.string "Maybe you could sweep through\n" .string "Maybe you could sweep through\n"
.string "the three TRAINERS left on this floor.$" .string "the three TRAINERS left on this floor.$"
BattlePyramid_TwoTrainersRemaining_Text4:: @ 8254BAE BattlePyramid_Text_TwoTrainersRemaining4:: @ 8254BAE
.string "Maybe you could sweep through\n" .string "Maybe you could sweep through\n"
.string "the two TRAINERS left on this floor.$" .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 "Maybe you could complete your sweep\n"
.string "with the one TRAINER left on this floor.$" .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 "There isn't a single person left who\n"
.string "can defeat you now…$" .string "can defeat you now…$"
BattlePyramid_SevenTrainersRemaining_Text5:: @ 8254C77 BattlePyramid_Text_SevenTrainersRemaining5:: @ 8254C77
.string "You may have what it takes to beat\n" .string "You may have what it takes to beat\n"
.string "the seven expert TRAINERS who remain.$" .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 "You may have what it takes to beat\n"
.string "the six expert TRAINERS who remain.$" .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 "You may have what it takes to beat\n"
.string "the five expert TRAINERS who remain.$" .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 "You may have what it takes to beat\n"
.string "the four expert TRAINERS who remain.$" .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 "You may have what it takes to beat\n"
.string "the three expert TRAINERS who remain.$" .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 "You may have what it takes to beat\n"
.string "the two expert TRAINERS who remain.$" .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 "You may have what it takes to beat\n"
.string "the one expert TRAINER who remains.$" .string "the one expert TRAINER who remains.$"
BattlePyramid_ZeroTrainersRemaining_Text5:: @ 8254E6E BattlePyramid_Text_ZeroTrainersRemaining5:: @ 8254E6E
.string "Your skills are beyond reproach.\p" .string "Your skills are beyond reproach.\p"
.string "There are no more TRAINERS here\n" .string "There are no more TRAINERS here\n"
.string "who have any chance of beating you.$" .string "who have any chance of beating you.$"
BattlePyramid_SevenTrainersRemaining_Text6:: @ 8254ED3 BattlePyramid_Text_SevenTrainersRemaining6:: @ 8254ED3
.string "Can you keep winning against\n" .string "Can you keep winning against\n"
.string "the seven remaining TRAINERS?$" .string "the seven remaining TRAINERS?$"
BattlePyramid_SixTrainersRemaining_Text6:: @ 8254F0E BattlePyramid_Text_SixTrainersRemaining6:: @ 8254F0E
.string "Can you keep winning against\n" .string "Can you keep winning against\n"
.string "the six remaining TRAINERS?$" .string "the six remaining TRAINERS?$"
BattlePyramid_FiveTrainersRemaining_Text6:: @ 8254F47 BattlePyramid_Text_FiveTrainersRemaining6:: @ 8254F47
.string "Can you keep winning against\n" .string "Can you keep winning against\n"
.string "the five remaining TRAINERS?$" .string "the five remaining TRAINERS?$"
BattlePyramid_FourTrainersRemaining_Text6:: @ 8254F81 BattlePyramid_Text_FourTrainersRemaining6:: @ 8254F81
.string "Can you keep winning against\n" .string "Can you keep winning against\n"
.string "the four remaining TRAINERS?$" .string "the four remaining TRAINERS?$"
BattlePyramid_ThreeTrainersRemaining_Text6:: @ 8254FBB BattlePyramid_Text_ThreeTrainersRemaining6:: @ 8254FBB
.string "Can you keep winning against\n" .string "Can you keep winning against\n"
.string "the three remaining TRAINERS?$" .string "the three remaining TRAINERS?$"
BattlePyramid_TwoTrainersRemaining_Text6:: @ 8254FF6 BattlePyramid_Text_TwoTrainersRemaining6:: @ 8254FF6
.string "Can you keep winning against\n" .string "Can you keep winning against\n"
.string "the two remaining TRAINERS?$" .string "the two remaining TRAINERS?$"
BattlePyramid_OneTrainersRemaining_Text6:: @ 825502F BattlePyramid_Text_OneTrainersRemaining6:: @ 825502F
.string "Can you keep winning against\n" .string "Can you keep winning against\n"
.string "the last remaining TRAINER?$" .string "the last remaining TRAINER?$"
BattlePyramid_ZeroTrainersRemaining_Text6:: @ 8255068 BattlePyramid_Text_ZeroTrainersRemaining6:: @ 8255068
.string "There aren't any TRAINERS left that\n" .string "There aren't any TRAINERS left that\n"
.string "can take you on now…$" .string "can take you on now…$"
data/maps/BattleFrontier_BattlePyramidLobby/map.json
+6 -6
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattlePyramidLobby_EventScript_2508B1", "script": "BattleFrontier_BattlePyramidLobby_EventScript_Attendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattlePyramidLobby_EventScript_250ACE", "script": "BattleFrontier_BattlePyramidLobby_EventScript_HintGiver",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattlePyramidLobby_EventScript_250E83", "script": "BattleFrontier_BattlePyramidLobby_EventScript_Woman",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattlePyramidLobby_EventScript_250E8C", "script": "BattleFrontier_BattlePyramidLobby_EventScript_FatMan",
"flag": "0" "flag": "0"
} }
], ],
@@ -84,7 +84,7 @@
"y": 12, "y": 12,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "BattleFrontier_BattlePyramidLobby_EventScript_250D42" "script": "BattleFrontier_BattlePyramidLobby_EventScript_ShowResults"
}, },
{ {
"type": "sign", "type": "sign",
@@ -92,7 +92,7 @@
"y": 12, "y": 12,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "BattleFrontier_BattlePyramidLobby_EventScript_250E95" "script": "BattleFrontier_BattlePyramidLobby_EventScript_RulesBoard"
} }
] ]
} }
data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+303 -297
View File
File diff suppressed because it is too large Load Diff
data/maps/BattleFrontier_BattlePyramidTop/map.json
+2 -2
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "3", "trainer_sight_or_berry_tree_id": "3",
"script": "BattleFrontier_BattlePyramidTop_EventScript_2551D0", "script": "BattleFrontier_BattlePyramidTop_EventScript_Attendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"elevation": 4, "elevation": 4,
"var": "VAR_TEMP_2", "var": "VAR_TEMP_2",
"var_value": "0", "var_value": "0",
"script": "BattleFrontier_BattlePyramidTop_EventScript_255256" "script": "BattleFrontier_BattlePyramidTop_EventScript_BattleBrandon"
} }
], ],
"bg_events": [] "bg_events": []
data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
+105 -109
View File
@@ -1,201 +1,197 @@
BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1 BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidTop_MapScript1_2550F4 map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidTop_OnResume
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidTop_MapScript2_25516E map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidTop_OnFrame
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidTop_MapScript1_2550B6 map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidTop_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidTop_MapScript2_2550CE map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidTop_OnWarp
.byte 0 .byte 0
BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6 BattleFrontier_BattlePyramidTop_OnTransition: @ 82550B6
pyramid_updatelight 200, PYRAMID_LIGHT_SET_RADIUS pyramid_updatelight 200, PYRAMID_LIGHT_SET_RADIUS
setvar VAR_TEMP_F, 1 setvar VAR_TEMP_F, 1
end end
BattleFrontier_BattlePyramidTop_MapScript2_2550CE: @ 82550CE BattleFrontier_BattlePyramidTop_OnWarp: @ 82550CE
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidTop_EventScript_2550D8 map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidTop_EventScript_SetUpObjects
.2byte 0 .2byte 0
BattleFrontier_BattlePyramidTop_EventScript_2550D8:: @ 82550D8 BattleFrontier_BattlePyramidTop_EventScript_SetUpObjects:: @ 82550D8
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
compare VAR_TEMP_C, 0 compare VAR_TEMP_C, 0
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2550F3 goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_EndSetUpObjects
setobjectxyperm 2, 0, 0 setobjectxyperm 2, 0, 0
BattleFrontier_BattlePyramidTop_EventScript_EndSetUpObjects:: @ 82550F3
BattleFrontier_BattlePyramidTop_EventScript_2550F3:: @ 82550F3
end end
BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4 BattleFrontier_BattlePyramidTop_OnResume: @ 82550F4
frontier_getbrainstatus frontier_getbrainstatus
compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY 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 call BattleFrontier_EventScript_SetBrainObjectGfx
BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C BattleFrontier_BattlePyramidTop_EventScript_CheckChallengeStatus:: @ 825510C
copyvar VAR_TEMP_C, VAR_RESULT copyvar VAR_TEMP_C, VAR_RESULT
frontier_getstatus frontier_getstatus
switch VAR_TEMP_0 switch VAR_TEMP_0
case 0, BattleFrontier_BattlePyramidTop_EventScript_255193 case 0, BattleFrontier_BattlePyramidTop_EventScript_ReadyChallenge
case CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramidTop_EventScript_252B66 case CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramid_EventScript_WarpToLobby
case CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidTop_EventScript_255193 case CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidTop_EventScript_ReadyChallenge
frontier_get FRONTIER_DATA_BATTLE_OUTCOME frontier_get FRONTIER_DATA_BATTLE_OUTCOME
compare VAR_RESULT, B_OUTCOME_LOST 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 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 compare VAR_RESULT, B_OUTCOME_FORFEITED
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
end end
BattleFrontier_BattlePyramidTop_MapScript2_25516E: @ 825516E BattleFrontier_BattlePyramidTop_OnFrame: @ 825516E
map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidTop_EventScript_255180 map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidTop_EventScript_PlayPyramidMusic
map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidTop_EventScript_25518A map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidTop_EventScript_ShowMapName
.2byte 0 .2byte 0
BattleFrontier_BattlePyramidTop_EventScript_255180:: @ 8255180 BattleFrontier_BattlePyramidTop_EventScript_PlayPyramidMusic:: @ 8255180
playbgm MUS_PYRAMID_TOP, 0 playbgm MUS_PYRAMID_TOP, 0
setvar VAR_TEMP_E, 1 setvar VAR_TEMP_E, 1
end end
BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A BattleFrontier_BattlePyramidTop_EventScript_ShowMapName:: @ 825518A
special ShowMapNamePopup special ShowMapNamePopup
setvar VAR_TEMP_F, 0 setvar VAR_TEMP_F, 0
end end
BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193 BattleFrontier_BattlePyramidTop_EventScript_ReadyChallenge:: @ 8255193
pyramid_save CHALLENGE_STATUS_SAVING pyramid_save CHALLENGE_STATUS_SAVING
special SavePlayerParty special SavePlayerParty
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
pyramid_inittrainers pyramid_settrainers
frontier_setpartyorder FRONTIER_PARTY_SIZE frontier_setpartyorder FRONTIER_PARTY_SIZE
setvar VAR_TEMP_F, 1 setvar VAR_TEMP_F, 1
end end
BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0 BattleFrontier_BattlePyramidTop_EventScript_Attendant:: @ 82551D0
lock lock
faceplayer faceplayer
compare VAR_TEMP_D, 0 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 compare VAR_TEMP_C, FRONTIER_BRAIN_NOT_READY
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255240 goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_BrandonHereMoveAside
msgbox BattleFrontier_BattlePyramidTop_Text_255410, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidTop_Text_ReachedSummitUpYouGo, MSGBOX_DEFAULT
closemessage closemessage
applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD applymovement 1, BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidTop_Movement_255403 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidTop_Movement_PlayerClimbToTop
waitmovement 0 waitmovement 0
applymovement 1, BattleFrontier_BattlePyramidTop_Movement_255400 applymovement 1, BattleFrontier_BattlePyramidTop_Movement_AttendantBlockPath
waitmovement 0 waitmovement 0
message BattleFrontier_BattlePyramidTop_Text_2554E8 message BattleFrontier_BattlePyramidTop_Text_PlayerConqueredPyramid
waitmessage waitmessage
playfanfare MUS_ME_POINTGET playfanfare MUS_ME_POINTGET
waitfanfare waitfanfare
closemessage closemessage
BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon:: @ 825521A
BattleFrontier_BattlePyramidTop_EventScript_25521A:: @ 825521A
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13
waitstate waitstate
end end
BattleFrontier_BattlePyramidTop_EventScript_255236:: @ 8255236 BattleFrontier_BattlePyramidTop_EventScript_StepForwardWhenReady:: @ 8255236
msgbox BattleFrontier_BattlePyramidTop_Text_255BFE, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidTop_Text_StepForwardWhenReady, MSGBOX_DEFAULT
closemessage closemessage
end end
BattleFrontier_BattlePyramidTop_EventScript_255240:: @ 8255240 BattleFrontier_BattlePyramidTop_EventScript_BrandonHereMoveAside:: @ 8255240
msgbox BattleFrontier_BattlePyramidTop_Text_25551F, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidTop_Text_ChiefBeatYouHere, MSGBOX_DEFAULT
applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD applymovement 1, BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside
setvar VAR_TEMP_D, 1 setvar VAR_TEMP_D, 1
closemessage closemessage
end end
BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256 BattleFrontier_BattlePyramidTop_EventScript_BattleBrandon:: @ 8255256
lockall lockall
switch VAR_TEMP_C switch VAR_TEMP_C
case FRONTIER_BRAIN_GOLD, BattleFrontier_BattlePyramidTop_EventScript_255335 case FRONTIER_BRAIN_GOLD, BattleFrontier_BattlePyramidTop_EventScript_BrandonIntroGold
case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePyramidTop_EventScript_2552D0 case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech
case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePyramidTop_EventScript_255388 case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2552D0 goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech
special SpawnCameraObject special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_CameraPanUp
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattlePyramidTop_Text_255669, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidTop_Text_ExplorationsAreGrandestAdventure, MSGBOX_DEFAULT
closemessage closemessage
frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A applymovement 2, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattlePyramidTop_Text_25573E, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidTop_Text_ImPyramidKingBrandon, MSGBOX_DEFAULT
goto BattleFrontier_BattlePyramidTop_EventScript_2552DA goto BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonSilver
end end
BattleFrontier_BattlePyramidTop_EventScript_2552D0:: @ 82552D0 BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech:: @ 82552D0
applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A applymovement 2, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer
waitmovement 0 waitmovement 0
BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonSilver:: @ 82552DA
BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA msgbox BattleFrontier_BattlePyramidTop_Text_BringCourageToOurBattle, MSGBOX_DEFAULT
msgbox BattleFrontier_BattlePyramidTop_Text_255846, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle
call BattleFrontier_BattlePyramidTop_EventScript_2553ED
playbgm MUS_PYRAMID_TOP, 0 playbgm MUS_PYRAMID_TOP, 0
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_2552FB goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver
goto BattleFrontier_BattlePyramidTop_EventScript_252B42 goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver:: @ 82552FB
frontier_getsymbols frontier_getsymbols
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_25521A goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
msgbox BattleFrontier_BattlePyramidTop_Text_255873, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidTop_Text_BrandonFrontierPassPlease, MSGBOX_DEFAULT
playfanfare MUS_ME_SYMBOLGET playfanfare MUS_ME_SYMBOLGET
message BattleFrontier_BattlePyramidTop_Text_2558E9 message BattleFrontier_BattlePyramidTop_Text_ReceivedBraveSymbol
waitmessage waitmessage
waitfanfare waitfanfare
frontier_givesymbol frontier_givesymbol
msgbox BattleFrontier_BattlePyramidTop_Text_25591D, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidTop_Text_LookForwardToNextMeeting, MSGBOX_DEFAULT
goto BattleFrontier_BattlePyramidTop_EventScript_25521A goto BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 BattleFrontier_BattlePyramidTop_EventScript_BrandonIntroGold:: @ 8255335
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255388 goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech
special SpawnCameraObject special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_CameraPanUp
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattlePyramidTop_Text_255951, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidTop_Text_BrandonYouveReturned, MSGBOX_DEFAULT
closemessage closemessage
frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A applymovement 2, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattlePyramidTop_Text_255A6D, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidTop_Text_MyCourageIsOffMeter, MSGBOX_DEFAULT
goto BattleFrontier_BattlePyramidTop_EventScript_255392 goto BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonGold
end end
BattleFrontier_BattlePyramidTop_EventScript_255388:: @ 8255388 BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech:: @ 8255388
applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A applymovement 2, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer
waitmovement 0 waitmovement 0
BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonGold:: @ 8255392
BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392 msgbox BattleFrontier_BattlePyramidTop_Text_EverythingYouHave, MSGBOX_DEFAULT
msgbox BattleFrontier_BattlePyramidTop_Text_255AA1, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle
call BattleFrontier_BattlePyramidTop_EventScript_2553ED
playbgm MUS_PYRAMID_TOP, 0 playbgm MUS_PYRAMID_TOP, 0
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_2553B3 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold
goto BattleFrontier_BattlePyramidTop_EventScript_252B42 goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3 BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold:: @ 82553B3
frontier_getsymbols frontier_getsymbols
compare VAR_RESULT, 2 compare VAR_RESULT, 2
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_25521A goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidTop_Text_BrandonRemarkableHaveThis, MSGBOX_DEFAULT
playfanfare MUS_ME_SYMBOLGET playfanfare MUS_ME_SYMBOLGET
message BattleFrontier_BattlePyramidTop_Text_255B59 message BattleFrontier_BattlePyramidTop_Text_BraveSymbolTookGoldenShine
waitmessage waitmessage
waitfanfare waitfanfare
frontier_givesymbol frontier_givesymbol
msgbox BattleFrontier_BattlePyramidTop_Text_255B82, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidTop_Text_FarewellForNow, MSGBOX_DEFAULT
goto BattleFrontier_BattlePyramidTop_EventScript_25521A goto BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
BattleFrontier_BattlePyramidTop_EventScript_2553ED:: @ 82553ED BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle:: @ 82553ED
closemessage closemessage
setvar VAR_0x8004, SPECIAL_BATTLE_PYRAMID setvar VAR_0x8004, SPECIAL_BATTLE_PYRAMID
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
@@ -203,17 +199,17 @@ BattleFrontier_BattlePyramidTop_EventScript_2553ED:: @ 82553ED
waitstate waitstate
return return
BattleFrontier_BattlePyramidTop_Movement_2553FD: @ 82553FD BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside: @ 82553FD
walk_right walk_right
walk_in_place_fastest_left walk_in_place_fastest_left
step_end step_end
BattleFrontier_BattlePyramidTop_Movement_255400: @ 8255400 BattleFrontier_BattlePyramidTop_Movement_AttendantBlockPath: @ 8255400
walk_left walk_left
walk_in_place_fastest_up walk_in_place_fastest_up
step_end step_end
BattleFrontier_BattlePyramidTop_Movement_255403: @ 8255403 BattleFrontier_BattlePyramidTop_Movement_PlayerClimbToTop: @ 8255403
walk_up walk_up
walk_up walk_up
walk_up walk_up
@@ -222,17 +218,17 @@ BattleFrontier_BattlePyramidTop_Movement_255403: @ 8255403
walk_in_place_fastest_down walk_in_place_fastest_down
step_end step_end
BattleFrontier_BattlePyramidTop_Movement_25540A: @ 825540A BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer: @ 825540A
walk_fast_down walk_fast_down
step_end step_end
BattleFrontier_BattlePyramidTop_Movement_25540C: @ 825540C BattleFrontier_BattlePyramidTop_Movement_CameraPanUp: @ 825540C
walk_slow_up walk_slow_up
walk_slow_up walk_slow_up
delay_16 delay_16
step_end step_end
BattleFrontier_BattlePyramidTop_Text_255410: @ 8255410 BattleFrontier_BattlePyramidTop_Text_ReachedSummitUpYouGo: @ 8255410
.string "It is a delight to see you here!\n" .string "It is a delight to see you here!\n"
.string "You have reached the summit of\l" .string "You have reached the summit of\l"
.string "the BATTLE PYRAMID!\p" .string "the BATTLE PYRAMID!\p"
@@ -243,11 +239,11 @@ BattleFrontier_BattlePyramidTop_Text_255410: @ 8255410
.string "Now, please!\n" .string "Now, please!\n"
.string "Up you go!$" .string "Up you go!$"
BattleFrontier_BattlePyramidTop_Text_2554E8: @ 82554E8 BattleFrontier_BattlePyramidTop_Text_PlayerConqueredPyramid: @ 82554E8
.string "The PYRAMID's new conqueror!\n" .string "The PYRAMID's new conqueror!\n"
.string "Let the name {PLAYER} be known!$" .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 "It is a delight to see you here!\p"
.string "Unfortunately, you were second by\n" .string "Unfortunately, you were second by\n"
.string "a mere fraction of time!\p" .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 "Now, please! When you are ready,\n"
.string "take one more step of courage!$" .string "take one more step of courage!$"
BattleFrontier_BattlePyramidTop_Text_255669: @ 8255669 BattleFrontier_BattlePyramidTop_Text_ExplorationsAreGrandestAdventure: @ 8255669
.string "Young adventurer…\p" .string "Young adventurer…\p"
.string "Wouldn't you agree that explorations\n" .string "Wouldn't you agree that explorations\n"
.string "are the grandest of adventures?\p" .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 "And, above all, only your own courage\n"
.string "to lead you through unknown worlds…$" .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 "Aah, yes, indeed this life is grand!\n"
.string "Grand, it is! Eh?\p" .string "Grand, it is! Eh?\p"
.string "I'm BRANDON!\p" .string "I'm BRANDON!\p"
@@ -283,25 +279,25 @@ BattleFrontier_BattlePyramidTop_Text_25573E: @ 825573E
.string "Hahahah!\n" .string "Hahahah!\n"
.string "This should be exciting!$" .string "This should be exciting!$"
BattleFrontier_BattlePyramidTop_Text_255846: @ 8255846 BattleFrontier_BattlePyramidTop_Text_BringCourageToOurBattle: @ 8255846
.string "Now, then!\n" .string "Now, then!\n"
.string "Bring your courage to our battle!$" .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 "BRANDON: Hahahah! Grand it was!\n"
.string "Grand, yes, indeed!\p" .string "Grand, yes, indeed!\p"
.string "Well done! You've earned recognition!\n" .string "Well done! You've earned recognition!\n"
.string "Your FRONTIER PASS, please!$" .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 Brave Symbol was embossed on\n"
.string "the FRONTIER PASS!$" .string "the FRONTIER PASS!$"
BattleFrontier_BattlePyramidTop_Text_25591D: @ 825591D BattleFrontier_BattlePyramidTop_Text_LookForwardToNextMeeting: @ 825591D
.string "Young explorer!\n" .string "Young explorer!\n"
.string "I look forward to our next meeting!$" .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 "BRANDON: …You've finally returned,\n"
.string "young explorer…\p" .string "young explorer…\p"
.string "Your love of adventure seems to come\n" .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 "Those days of death-defying,\n"
.string "life-affirming adventures are back…$" .string "life-affirming adventures are back…$"
BattleFrontier_BattlePyramidTop_Text_255A6D: @ 8255A6D BattleFrontier_BattlePyramidTop_Text_MyCourageIsOffMeter: @ 8255A6D
.string "Now, then!\p" .string "Now, then!\p"
.string "I sense my own courage is off\n" .string "I sense my own courage is off\n"
.string "the meter!$" .string "the meter!$"
BattleFrontier_BattlePyramidTop_Text_255AA1: @ 8255AA1 BattleFrontier_BattlePyramidTop_Text_EverythingYouHave: @ 8255AA1
.string "Everything you have!\n" .string "Everything you have!\n"
.string "I'm braced for it all!$" .string "I'm braced for it all!$"
BattleFrontier_BattlePyramidTop_Text_255ACD: @ 8255ACD BattleFrontier_BattlePyramidTop_Text_BrandonRemarkableHaveThis: @ 8255ACD
.string "BRANDON: Hahahah!\n" .string "BRANDON: Hahahah!\n"
.string "Remarkable!\l" .string "Remarkable!\l"
.string "Yes, it's grand, indeed!\p" .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 "You've bested me through and through!\n"
.string "Here! I want you to have this!$" .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 "The Brave Symbol took on\n"
.string "a golden shine!$" .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 "Ah, yes! It just goes to show that\n"
.string "I have much to learn still!\p" .string "I have much to learn still!\p"
.string "May our paths cross again!\n" .string "May our paths cross again!\n"
.string "Farewell for now, young explorer!$" .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 "Now, when you are ready, take courage\n"
.string "and step forward.$" .string "and step forward.$"
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+4 -4
View File
@@ -209,7 +209,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984
waitmessage waitmessage
multichoice 17, 6, MULTI_LEVEL_MODE, 0 multichoice 17, 6, MULTI_LEVEL_MODE, 0
switch VAR_RESULT 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 case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
frontier_checkineligible frontier_checkineligible
compare VAR_0x8004, TRUE compare VAR_0x8004, TRUE
@@ -276,7 +276,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED
waitmessage waitmessage
multichoice 17, 6, MULTI_LEVEL_MODE, 0 multichoice 17, 6, MULTI_LEVEL_MODE, 0
switch VAR_RESULT 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 case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
frontier_checkineligible frontier_checkineligible
compare VAR_0x8004, TRUE compare VAR_0x8004, TRUE
@@ -344,7 +344,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59
waitmessage waitmessage
multichoice 17, 6, MULTI_LEVEL_MODE, 0 multichoice 17, 6, MULTI_LEVEL_MODE, 0
switch VAR_RESULT 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 case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
frontier_checkineligible frontier_checkineligible
compare VAR_0x8004, TRUE compare VAR_0x8004, TRUE
@@ -411,7 +411,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2
waitmessage waitmessage
multichoice 17, 6, MULTI_LEVEL_MODE, 0 multichoice 17, 6, MULTI_LEVEL_MODE, 0
switch VAR_RESULT 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 case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
frontier_checkineligible frontier_checkineligible
compare VAR_0x8004, TRUE compare VAR_0x8004, TRUE
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+1 -1
View File
@@ -6,7 +6,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92
.byte 0 .byte 0
BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7 BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7
pyramid_healparty pyramid_resetparty
end end
BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0 BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0
data/maps/map_groups.json
+1 -1
View File
@@ -521,7 +521,7 @@
"BattleFrontier_BattlePalaceCorridor", "BattleFrontier_BattlePalaceCorridor",
"BattleFrontier_BattlePalaceBattleRoom", "BattleFrontier_BattlePalaceBattleRoom",
"BattleFrontier_BattlePyramidLobby", "BattleFrontier_BattlePyramidLobby",
"BattleFrontier_BattlePyramidEmptySquare", "BattleFrontier_BattlePyramidFloor",
"BattleFrontier_BattlePyramidTop", "BattleFrontier_BattlePyramidTop",
"BattleFrontier_BattleArenaLobby", "BattleFrontier_BattleArenaLobby",
"BattleFrontier_BattleArenaCorridor", "BattleFrontier_BattleArenaCorridor",
data/scripts/field_poison.inc
+2 -2
View File
@@ -34,9 +34,9 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8
goto_if_eq BattleFrontier_BattlePike_EventScript_Retire goto_if_eq BattleFrontier_BattlePike_EventScript_Retire
pyramid_inchallenge pyramid_inchallenge
compare VAR_RESULT, 1 @ On Pyramid floor 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 compare VAR_RESULT, 2 @ On Pyramid peak
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
trainerhill_inchallenge trainerhill_inchallenge
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
goto_if_eq TrainerHill_1F_EventScript_Lost goto_if_eq TrainerHill_1F_EventScript_Lost
data/specials.inc
+1 -1
View File
@@ -458,7 +458,7 @@ gSpecials:: @ 81DBA64
def_special sub_813A630 def_special sub_813A630
def_special BufferBattleTowerElevatorFloors def_special BufferBattleTowerElevatorFloors
def_special TryStoreHeldItemsInPyramidBag def_special TryStoreHeldItemsInPyramidBag
def_special sub_81C4F24 def_special ChooseItemsToTossFromPyramidBag
def_special DoBattlePyramidMonsHaveHeldItem def_special DoBattlePyramidMonsHaveHeldItem
def_special BattlePyramidChooseMonHeldItems def_special BattlePyramidChooseMonHeldItems
def_special SetBattleTowerLinkPlayerGfx def_special SetBattleTowerLinkPlayerGfx
include/battle_pyramid.h
+1 -1
View File
@@ -9,7 +9,7 @@ void GenerateBattlePyramidWildMon(void);
u8 GetPyramidRunMultiplier(void); u8 GetPyramidRunMultiplier(void);
u8 InBattlePyramid(void); u8 InBattlePyramid(void);
bool8 InBattlePyramid_(void); bool8 InBattlePyramid_(void);
void sub_81A9E90(void); void PausePyramidChallenge(void);
void SoftResetInBattlePyramid(void); void SoftResetInBattlePyramid(void);
void CopyPyramidTrainerSpeechBefore(u16 trainerId); void CopyPyramidTrainerSpeechBefore(u16 trainerId);
void CopyPyramidTrainerWinSpeech(u16 trainerId); void CopyPyramidTrainerWinSpeech(u16 trainerId);
include/battle_pyramid_bag.h
+1 -1
View File
@@ -43,7 +43,7 @@ void sub_81C4EFC(void);
void GoToBattlePyramidBagMenu(u8 a0, void (*callback)(void)); void GoToBattlePyramidBagMenu(u8 a0, void (*callback)(void));
void sub_81C6714(u8 taskId); void sub_81C6714(u8 taskId);
void TryStoreHeldItemsInPyramidBag(void); void TryStoreHeldItemsInPyramidBag(void);
void sub_81C4F24(void); void ChooseItemsToTossFromPyramidBag(void);
void sub_81C5B14(u8 taskId); void sub_81C5B14(u8 taskId);
void DisplayItemMessageInBattlePyramid(u8 taskId, const u8 *str, void (*callback)(u8 taskId)); void DisplayItemMessageInBattlePyramid(u8 taskId, const u8 *str, void (*callback)(u8 taskId));
include/constants/battle_pyramid.h
+2 -2
View File
@@ -36,14 +36,14 @@
#define BATTLE_PYRAMID_FUNC_SEED_FLOOR 6 #define BATTLE_PYRAMID_FUNC_SEED_FLOOR 6
#define BATTLE_PYRAMID_FUNC_SET_ITEM 7 #define BATTLE_PYRAMID_FUNC_SET_ITEM 7
#define BATTLE_PYRAMID_FUNC_HIDE_ITEM 8 #define BATTLE_PYRAMID_FUNC_HIDE_ITEM 8
#define BATTLE_PYRAMID_FUNC_INIT_TRAINERS 9 #define BATTLE_PYRAMID_FUNC_SET_TRAINERS 9
#define BATTLE_PYRAMID_FUNC_SHOW_HINT_TEXT 10 #define BATTLE_PYRAMID_FUNC_SHOW_HINT_TEXT 10
#define BATTLE_PYRAMID_FUNC_UPDATE_STREAK 11 // unused #define BATTLE_PYRAMID_FUNC_UPDATE_STREAK 11 // unused
#define BATTLE_PYRAMID_FUNC_IS_IN 12 #define BATTLE_PYRAMID_FUNC_IS_IN 12
#define BATTLE_PYRAMID_FUNC_UPDATE_LIGHT 13 #define BATTLE_PYRAMID_FUNC_UPDATE_LIGHT 13
#define BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS 14 #define BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS 14
#define BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE 15 #define BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE 15
#define BATTLE_PYRAMID_FUNC_16 16 // unused #define BATTLE_PYRAMID_FUNC_START_MENU 16 // unused
#define BATTLE_PYRAMID_FUNC_RESTORE_PARTY 17 #define BATTLE_PYRAMID_FUNC_RESTORE_PARTY 17
#define PYRAMID_DATA_PRIZE 0 #define PYRAMID_DATA_PRIZE 0
include/constants/layouts.h
+1 -1
View File
@@ -361,7 +361,7 @@
#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS 358 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS 358
#define LAYOUT_UNKNOWN_084693AC 359 #define LAYOUT_UNKNOWN_084693AC 359
#define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY 360 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY 360
#define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE 361 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR 361
#define LAYOUT_BATTLE_PYRAMID_SQUARE01 362 #define LAYOUT_BATTLE_PYRAMID_SQUARE01 362
#define LAYOUT_BATTLE_PYRAMID_SQUARE02 363 #define LAYOUT_BATTLE_PYRAMID_SQUARE02 363
#define LAYOUT_BATTLE_PYRAMID_SQUARE03 364 #define LAYOUT_BATTLE_PYRAMID_SQUARE03 364
include/constants/map_groups.h
+1 -1
View File
@@ -487,7 +487,7 @@
#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR (23 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR (23 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM (24 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM (24 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY (25 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY (25 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE (26 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR (26 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP (27 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP (27 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY (28 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY (28 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR (29 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR (29 | (26 << 8))
include/event_scripts.h
+2 -4
View File
@@ -371,8 +371,6 @@ extern const u8 SecretBase_Text_Trainer7Defeated[];
extern const u8 SecretBase_Text_Trainer8Defeated[]; extern const u8 SecretBase_Text_Trainer8Defeated[];
extern const u8 SecretBase_Text_Trainer9Defeated[]; extern const u8 SecretBase_Text_Trainer9Defeated[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88[];
//field effects //field effects
extern const u8 EventScript_FldEffStrength[]; extern const u8 EventScript_FldEffStrength[];
extern const u8 EventScript_FailSweetScent[]; extern const u8 EventScript_FailSweetScent[];
@@ -543,7 +541,6 @@ extern const u8 EventScript_CannotUseWaterfall[];
extern const u8 EventScript_UseDive[]; extern const u8 EventScript_UseDive[];
extern const u8 EventScript_UseDiveUnderwater[]; extern const u8 EventScript_UseDiveUnderwater[];
extern const u8 EventScript_FallDownHole[]; extern const u8 EventScript_FallDownHole[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8[];
extern const u8 EventScript_FieldPoison[]; extern const u8 EventScript_FieldPoison[];
extern const u8 EventScript_EggHatch[]; extern const u8 EventScript_EggHatch[];
extern const u8 AbnormalWeather_EventScript_EndEventAndCleanup_1[]; extern const u8 AbnormalWeather_EventScript_EndEventAndCleanup_1[];
@@ -572,7 +569,8 @@ extern const u8 SecretBase_EventScript_PutAwayDecoration[];
extern const u8 SecretBase_EventScript_SetDecoration[]; extern const u8 SecretBase_EventScript_SetDecoration[];
// Battle Pyramid. // Battle Pyramid.
extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88[]; extern const u8 BattlePyramid_Retire[];
extern const u8 BattlePyramid_WarpToNextFloor[];
extern const u8 BattlePyramid_TrainerBattle[]; extern const u8 BattlePyramid_TrainerBattle[];
extern const u8 BattlePyramid_FindItemBall[]; extern const u8 BattlePyramid_FindItemBall[];
include/start_menu.h
+2 -2
View File
@@ -4,9 +4,9 @@
extern bool8 (*gMenuCallback)(void); extern bool8 (*gMenuCallback)(void);
void sub_809FA18(void); void sub_809FA18(void);
void sub_809FA34(u8 taskId); void Task_ShowStartMenu(u8 taskId);
void ShowStartMenu(void); void ShowStartMenu(void);
void sub_809FDD4(void); void ShowBattlePyramidStartMenu(void);
void SaveGame(void); void SaveGame(void);
void sub_80A0514(void); void sub_80A0514(void);
void sub_80A08CC(void); void sub_80A08CC(void);
include/strings.h
+126 -126
View File
@@ -1805,132 +1805,132 @@ extern const u8 gBattleDomeWinText6[];
extern const u8 gBattleDomeWinText7[]; extern const u8 gBattleDomeWinText7[];
// Battle Pyramid. // Battle Pyramid.
extern const u8 BattlePyramid_ExitHintUp_Text1[]; extern const u8 BattlePyramid_Text_ExitHintUp1[];
extern const u8 BattlePyramid_ExitHintLeft_Text1[]; extern const u8 BattlePyramid_Text_ExitHintLeft1[];
extern const u8 BattlePyramid_ExitHintRight_Text1[]; extern const u8 BattlePyramid_Text_ExitHintRight1[];
extern const u8 BattlePyramid_ExitHintDown_Text1[]; extern const u8 BattlePyramid_Text_ExitHintDown1[];
extern const u8 BattlePyramid_ZeroItemsRemaining_Text1[]; extern const u8 BattlePyramid_Text_ZeroItemsRemaining1[];
extern const u8 BattlePyramid_OneItemRemaining_Text1[]; extern const u8 BattlePyramid_Text_OneItemRemaining1[];
extern const u8 BattlePyramid_TwoItemsRemaining_Text1[]; extern const u8 BattlePyramid_Text_TwoItemsRemaining1[];
extern const u8 BattlePyramid_ThreeItemsRemaining_Text1[]; extern const u8 BattlePyramid_Text_ThreeItemsRemaining1[];
extern const u8 BattlePyramid_FourItemsRemaining_Text1[]; extern const u8 BattlePyramid_Text_FourItemsRemaining1[];
extern const u8 BattlePyramid_FiveItemsRemaining_Text1[]; extern const u8 BattlePyramid_Text_FiveItemsRemaining1[];
extern const u8 BattlePyramid_SixItemsRemaining_Text1[]; extern const u8 BattlePyramid_Text_SixItemsRemaining1[];
extern const u8 BattlePyramid_SevenItemsRemaining_Text1[]; extern const u8 BattlePyramid_Text_SevenItemsRemaining1[];
extern const u8 BattlePyramid_EightItemsRemaining_Text1[]; extern const u8 BattlePyramid_Text_EightItemsRemaining1[];
extern const u8 BattlePyramid_ZeroTrainersRemaining_Text1[]; extern const u8 BattlePyramid_Text_ZeroTrainersRemaining1[];
extern const u8 BattlePyramid_OneTrainersRemaining_Text1[]; extern const u8 BattlePyramid_Text_OneTrainersRemaining1[];
extern const u8 BattlePyramid_TwoTrainersRemaining_Text1[]; extern const u8 BattlePyramid_Text_TwoTrainersRemaining1[];
extern const u8 BattlePyramid_ThreeTrainersRemaining_Text1[]; extern const u8 BattlePyramid_Text_ThreeTrainersRemaining1[];
extern const u8 BattlePyramid_FourTrainersRemaining_Text1[]; extern const u8 BattlePyramid_Text_FourTrainersRemaining1[];
extern const u8 BattlePyramid_FiveTrainersRemaining_Text1[]; extern const u8 BattlePyramid_Text_FiveTrainersRemaining1[];
extern const u8 BattlePyramid_SixTrainersRemaining_Text1[]; extern const u8 BattlePyramid_Text_SixTrainersRemaining1[];
extern const u8 BattlePyramid_SevenTrainersRemaining_Text1[]; extern const u8 BattlePyramid_Text_SevenTrainersRemaining1[];
extern const u8 BattlePyramid_ExitHintUp_Text2[]; extern const u8 BattlePyramid_Text_ExitHintUp2[];
extern const u8 BattlePyramid_ExitHintLeft_Text2[]; extern const u8 BattlePyramid_Text_ExitHintLeft2[];
extern const u8 BattlePyramid_ExitHintRight_Text2[]; extern const u8 BattlePyramid_Text_ExitHintRight2[];
extern const u8 BattlePyramid_ExitHintDown_Text2[]; extern const u8 BattlePyramid_Text_ExitHintDown2[];
extern const u8 BattlePyramid_ZeroItemsRemaining_Text2[]; extern const u8 BattlePyramid_Text_ZeroItemsRemaining2[];
extern const u8 BattlePyramid_OneItemRemaining_Text2[]; extern const u8 BattlePyramid_Text_OneItemRemaining2[];
extern const u8 BattlePyramid_TwoItemsRemaining_Text2[]; extern const u8 BattlePyramid_Text_TwoItemsRemaining2[];
extern const u8 BattlePyramid_ThreeItemsRemaining_Text2[]; extern const u8 BattlePyramid_Text_ThreeItemsRemaining2[];
extern const u8 BattlePyramid_FourItemsRemaining_Text2[]; extern const u8 BattlePyramid_Text_FourItemsRemaining2[];
extern const u8 BattlePyramid_FiveItemsRemaining_Text2[]; extern const u8 BattlePyramid_Text_FiveItemsRemaining2[];
extern const u8 BattlePyramid_SixItemsRemaining_Text2[]; extern const u8 BattlePyramid_Text_SixItemsRemaining2[];
extern const u8 BattlePyramid_SevenItemsRemaining_Text2[]; extern const u8 BattlePyramid_Text_SevenItemsRemaining2[];
extern const u8 BattlePyramid_EightItemsRemaining_Text2[]; extern const u8 BattlePyramid_Text_EightItemsRemaining2[];
extern const u8 BattlePyramid_ZeroTrainersRemaining_Text2[]; extern const u8 BattlePyramid_Text_ZeroTrainersRemaining2[];
extern const u8 BattlePyramid_OneTrainersRemaining_Text2[]; extern const u8 BattlePyramid_Text_OneTrainersRemaining2[];
extern const u8 BattlePyramid_TwoTrainersRemaining_Text2[]; extern const u8 BattlePyramid_Text_TwoTrainersRemaining2[];
extern const u8 BattlePyramid_ThreeTrainersRemaining_Text2[]; extern const u8 BattlePyramid_Text_ThreeTrainersRemaining2[];
extern const u8 BattlePyramid_FourTrainersRemaining_Text2[]; extern const u8 BattlePyramid_Text_FourTrainersRemaining2[];
extern const u8 BattlePyramid_FiveTrainersRemaining_Text2[]; extern const u8 BattlePyramid_Text_FiveTrainersRemaining2[];
extern const u8 BattlePyramid_SixTrainersRemaining_Text2[]; extern const u8 BattlePyramid_Text_SixTrainersRemaining2[];
extern const u8 BattlePyramid_SevenTrainersRemaining_Text2[]; extern const u8 BattlePyramid_Text_SevenTrainersRemaining2[];
extern const u8 BattlePyramid_ExitHintUp_Text3[]; extern const u8 BattlePyramid_Text_ExitHintUp3[];
extern const u8 BattlePyramid_ExitHintLeft_Text3[]; extern const u8 BattlePyramid_Text_ExitHintLeft3[];
extern const u8 BattlePyramid_ExitHintRight_Text3[]; extern const u8 BattlePyramid_Text_ExitHintRight3[];
extern const u8 BattlePyramid_ExitHintDown_Text3[]; extern const u8 BattlePyramid_Text_ExitHintDown3[];
extern const u8 BattlePyramid_ZeroItemsRemaining_Text3[]; extern const u8 BattlePyramid_Text_ZeroItemsRemaining3[];
extern const u8 BattlePyramid_OneItemRemaining_Text3[]; extern const u8 BattlePyramid_Text_OneItemRemaining3[];
extern const u8 BattlePyramid_TwoItemsRemaining_Text3[]; extern const u8 BattlePyramid_Text_TwoItemsRemaining3[];
extern const u8 BattlePyramid_ThreeItemsRemaining_Text3[]; extern const u8 BattlePyramid_Text_ThreeItemsRemaining3[];
extern const u8 BattlePyramid_FourItemsRemaining_Text3[]; extern const u8 BattlePyramid_Text_FourItemsRemaining3[];
extern const u8 BattlePyramid_FiveItemsRemaining_Text3[]; extern const u8 BattlePyramid_Text_FiveItemsRemaining3[];
extern const u8 BattlePyramid_SixItemsRemaining_Text3[]; extern const u8 BattlePyramid_Text_SixItemsRemaining3[];
extern const u8 BattlePyramid_SevenItemsRemaining_Text3[]; extern const u8 BattlePyramid_Text_SevenItemsRemaining3[];
extern const u8 BattlePyramid_EightItemsRemaining_Text3[]; extern const u8 BattlePyramid_Text_EightItemsRemaining3[];
extern const u8 BattlePyramid_ZeroTrainersRemaining_Text3[]; extern const u8 BattlePyramid_Text_ZeroTrainersRemaining3[];
extern const u8 BattlePyramid_OneTrainersRemaining_Text3[]; extern const u8 BattlePyramid_Text_OneTrainersRemaining3[];
extern const u8 BattlePyramid_TwoTrainersRemaining_Text3[]; extern const u8 BattlePyramid_Text_TwoTrainersRemaining3[];
extern const u8 BattlePyramid_ThreeTrainersRemaining_Text3[]; extern const u8 BattlePyramid_Text_ThreeTrainersRemaining3[];
extern const u8 BattlePyramid_FourTrainersRemaining_Text3[]; extern const u8 BattlePyramid_Text_FourTrainersRemaining3[];
extern const u8 BattlePyramid_FiveTrainersRemaining_Text3[]; extern const u8 BattlePyramid_Text_FiveTrainersRemaining3[];
extern const u8 BattlePyramid_SixTrainersRemaining_Text3[]; extern const u8 BattlePyramid_Text_SixTrainersRemaining3[];
extern const u8 BattlePyramid_SevenTrainersRemaining_Text3[]; extern const u8 BattlePyramid_Text_SevenTrainersRemaining3[];
extern const u8 BattlePyramid_ExitHintUp_Text4[]; extern const u8 BattlePyramid_Text_ExitHintUp4[];
extern const u8 BattlePyramid_ExitHintLeft_Text4[]; extern const u8 BattlePyramid_Text_ExitHintLeft4[];
extern const u8 BattlePyramid_ExitHintRight_Text4[]; extern const u8 BattlePyramid_Text_ExitHintRight4[];
extern const u8 BattlePyramid_ExitHintDown_Text4[]; extern const u8 BattlePyramid_Text_ExitHintDown4[];
extern const u8 BattlePyramid_ZeroItemsRemaining_Text4[]; extern const u8 BattlePyramid_Text_ZeroItemsRemaining4[];
extern const u8 BattlePyramid_OneItemRemaining_Text4[]; extern const u8 BattlePyramid_Text_OneItemRemaining4[];
extern const u8 BattlePyramid_TwoItemsRemaining_Text4[]; extern const u8 BattlePyramid_Text_TwoItemsRemaining4[];
extern const u8 BattlePyramid_ThreeItemsRemaining_Text4[]; extern const u8 BattlePyramid_Text_ThreeItemsRemaining4[];
extern const u8 BattlePyramid_FourItemsRemaining_Text4[]; extern const u8 BattlePyramid_Text_FourItemsRemaining4[];
extern const u8 BattlePyramid_FiveItemsRemaining_Text4[]; extern const u8 BattlePyramid_Text_FiveItemsRemaining4[];
extern const u8 BattlePyramid_SixItemsRemaining_Text4[]; extern const u8 BattlePyramid_Text_SixItemsRemaining4[];
extern const u8 BattlePyramid_SevenItemsRemaining_Text4[]; extern const u8 BattlePyramid_Text_SevenItemsRemaining4[];
extern const u8 BattlePyramid_EightItemsRemaining_Text4[]; extern const u8 BattlePyramid_Text_EightItemsRemaining4[];
extern const u8 BattlePyramid_ZeroTrainersRemaining_Text4[]; extern const u8 BattlePyramid_Text_ZeroTrainersRemaining4[];
extern const u8 BattlePyramid_OneTrainersRemaining_Text4[]; extern const u8 BattlePyramid_Text_OneTrainersRemaining4[];
extern const u8 BattlePyramid_TwoTrainersRemaining_Text4[]; extern const u8 BattlePyramid_Text_TwoTrainersRemaining4[];
extern const u8 BattlePyramid_ThreeTrainersRemaining_Text4[]; extern const u8 BattlePyramid_Text_ThreeTrainersRemaining4[];
extern const u8 BattlePyramid_FourTrainersRemaining_Text4[]; extern const u8 BattlePyramid_Text_FourTrainersRemaining4[];
extern const u8 BattlePyramid_FiveTrainersRemaining_Text4[]; extern const u8 BattlePyramid_Text_FiveTrainersRemaining4[];
extern const u8 BattlePyramid_SixTrainersRemaining_Text4[]; extern const u8 BattlePyramid_Text_SixTrainersRemaining4[];
extern const u8 BattlePyramid_SevenTrainersRemaining_Text4[]; extern const u8 BattlePyramid_Text_SevenTrainersRemaining4[];
extern const u8 BattlePyramid_ExitHintUp_Text5[]; extern const u8 BattlePyramid_Text_ExitHintUp5[];
extern const u8 BattlePyramid_ExitHintLeft_Text5[]; extern const u8 BattlePyramid_Text_ExitHintLeft5[];
extern const u8 BattlePyramid_ExitHintRight_Text5[]; extern const u8 BattlePyramid_Text_ExitHintRight5[];
extern const u8 BattlePyramid_ExitHintDown_Text5[]; extern const u8 BattlePyramid_Text_ExitHintDown5[];
extern const u8 BattlePyramid_ZeroItemsRemaining_Text5[]; extern const u8 BattlePyramid_Text_ZeroItemsRemaining5[];
extern const u8 BattlePyramid_OneItemRemaining_Text5[]; extern const u8 BattlePyramid_Text_OneItemRemaining5[];
extern const u8 BattlePyramid_TwoItemsRemaining_Text5[]; extern const u8 BattlePyramid_Text_TwoItemsRemaining5[];
extern const u8 BattlePyramid_ThreeItemsRemaining_Text5[]; extern const u8 BattlePyramid_Text_ThreeItemsRemaining5[];
extern const u8 BattlePyramid_FourItemsRemaining_Text5[]; extern const u8 BattlePyramid_Text_FourItemsRemaining5[];
extern const u8 BattlePyramid_FiveItemsRemaining_Text5[]; extern const u8 BattlePyramid_Text_FiveItemsRemaining5[];
extern const u8 BattlePyramid_SixItemsRemaining_Text5[]; extern const u8 BattlePyramid_Text_SixItemsRemaining5[];
extern const u8 BattlePyramid_SevenItemsRemaining_Text5[]; extern const u8 BattlePyramid_Text_SevenItemsRemaining5[];
extern const u8 BattlePyramid_EightItemsRemaining_Text5[]; extern const u8 BattlePyramid_Text_EightItemsRemaining5[];
extern const u8 BattlePyramid_ZeroTrainersRemaining_Text5[]; extern const u8 BattlePyramid_Text_ZeroTrainersRemaining5[];
extern const u8 BattlePyramid_OneTrainersRemaining_Text5[]; extern const u8 BattlePyramid_Text_OneTrainersRemaining5[];
extern const u8 BattlePyramid_TwoTrainersRemaining_Text5[]; extern const u8 BattlePyramid_Text_TwoTrainersRemaining5[];
extern const u8 BattlePyramid_ThreeTrainersRemaining_Text5[]; extern const u8 BattlePyramid_Text_ThreeTrainersRemaining5[];
extern const u8 BattlePyramid_FourTrainersRemaining_Text5[]; extern const u8 BattlePyramid_Text_FourTrainersRemaining5[];
extern const u8 BattlePyramid_FiveTrainersRemaining_Text5[]; extern const u8 BattlePyramid_Text_FiveTrainersRemaining5[];
extern const u8 BattlePyramid_SixTrainersRemaining_Text5[]; extern const u8 BattlePyramid_Text_SixTrainersRemaining5[];
extern const u8 BattlePyramid_SevenTrainersRemaining_Text5[]; extern const u8 BattlePyramid_Text_SevenTrainersRemaining5[];
extern const u8 BattlePyramid_ExitHintUp_Text6[]; extern const u8 BattlePyramid_Text_ExitHintUp6[];
extern const u8 BattlePyramid_ExitHintLeft_Text6[]; extern const u8 BattlePyramid_Text_ExitHintLeft6[];
extern const u8 BattlePyramid_ExitHintRight_Text6[]; extern const u8 BattlePyramid_Text_ExitHintRight6[];
extern const u8 BattlePyramid_ExitHintDown_Text6[]; extern const u8 BattlePyramid_Text_ExitHintDown6[];
extern const u8 BattlePyramid_ZeroItemsRemaining_Text6[]; extern const u8 BattlePyramid_Text_ZeroItemsRemaining6[];
extern const u8 BattlePyramid_OneItemRemaining_Text6[]; extern const u8 BattlePyramid_Text_OneItemRemaining6[];
extern const u8 BattlePyramid_TwoItemsRemaining_Text6[]; extern const u8 BattlePyramid_Text_TwoItemsRemaining6[];
extern const u8 BattlePyramid_ThreeItemsRemaining_Text6[]; extern const u8 BattlePyramid_Text_ThreeItemsRemaining6[];
extern const u8 BattlePyramid_FourItemsRemaining_Text6[]; extern const u8 BattlePyramid_Text_FourItemsRemaining6[];
extern const u8 BattlePyramid_FiveItemsRemaining_Text6[]; extern const u8 BattlePyramid_Text_FiveItemsRemaining6[];
extern const u8 BattlePyramid_SixItemsRemaining_Text6[]; extern const u8 BattlePyramid_Text_SixItemsRemaining6[];
extern const u8 BattlePyramid_SevenItemsRemaining_Text6[]; extern const u8 BattlePyramid_Text_SevenItemsRemaining6[];
extern const u8 BattlePyramid_EightItemsRemaining_Text6[]; extern const u8 BattlePyramid_Text_EightItemsRemaining6[];
extern const u8 BattlePyramid_ZeroTrainersRemaining_Text6[]; extern const u8 BattlePyramid_Text_ZeroTrainersRemaining6[];
extern const u8 BattlePyramid_OneTrainersRemaining_Text6[]; extern const u8 BattlePyramid_Text_OneTrainersRemaining6[];
extern const u8 BattlePyramid_TwoTrainersRemaining_Text6[]; extern const u8 BattlePyramid_Text_TwoTrainersRemaining6[];
extern const u8 BattlePyramid_ThreeTrainersRemaining_Text6[]; extern const u8 BattlePyramid_Text_ThreeTrainersRemaining6[];
extern const u8 BattlePyramid_FourTrainersRemaining_Text6[]; extern const u8 BattlePyramid_Text_FourTrainersRemaining6[];
extern const u8 BattlePyramid_FiveTrainersRemaining_Text6[]; extern const u8 BattlePyramid_Text_FiveTrainersRemaining6[];
extern const u8 BattlePyramid_SixTrainersRemaining_Text6[]; extern const u8 BattlePyramid_Text_SixTrainersRemaining6[];
extern const u8 BattlePyramid_SevenTrainersRemaining_Text6[]; extern const u8 BattlePyramid_Text_SevenTrainersRemaining6[];
src/battle_pyramid.c
+156 -154
View File
@@ -77,14 +77,14 @@ static void GiveBattlePyramidPrize(void);
static void SeedPyramidFloor(void); static void SeedPyramidFloor(void);
static void SetPickupItem(void); static void SetPickupItem(void);
static void HidePyramidItem(void); static void HidePyramidItem(void);
static void InitPyramidFacilityTrainers(void); static void SetPyramidFacilityTrainers(void);
static void ShowPostBattleHintText(void); static void ShowPostBattleHintText(void);
static void UpdatePyramidWinStreak(void); static void UpdatePyramidWinStreak(void);
static void GetInBattlePyramid(void); static void GetInBattlePyramid(void);
static void UpdatePyramidLightRadius(void); static void UpdatePyramidLightRadius(void);
static void ClearPyramidPartyHeldItems(void); static void ClearPyramidPartyHeldItems(void);
static void SetPyramidFloorPalette(void); static void SetPyramidFloorPalette(void);
static void sub_81A9828(void); static void BattlePyramidStartMenu(void);
static void RestorePyramidPlayerParty(void); static void RestorePyramidPlayerParty(void);
static void InitPyramidBagItems(u8 lvlMode); static void InitPyramidBagItems(u8 lvlMode);
static u8 GetPyramidFloorTemplateId(void); static u8 GetPyramidFloorTemplateId(void);
@@ -525,200 +525,200 @@ static const u8 sTrainerTextGroups[50][2] =
static const u8 *const sExitDirectionHintTexts1[] = static const u8 *const sExitDirectionHintTexts1[] =
{ {
BattlePyramid_ExitHintUp_Text1, BattlePyramid_Text_ExitHintUp1,
BattlePyramid_ExitHintLeft_Text1, BattlePyramid_Text_ExitHintLeft1,
BattlePyramid_ExitHintRight_Text1, BattlePyramid_Text_ExitHintRight1,
BattlePyramid_ExitHintDown_Text1, BattlePyramid_Text_ExitHintDown1,
}; };
static const u8 *const sRemainingItemsHintTexts1[] = static const u8 *const sRemainingItemsHintTexts1[] =
{ {
BattlePyramid_ZeroItemsRemaining_Text1, BattlePyramid_Text_ZeroItemsRemaining1,
BattlePyramid_OneItemRemaining_Text1, BattlePyramid_Text_OneItemRemaining1,
BattlePyramid_TwoItemsRemaining_Text1, BattlePyramid_Text_TwoItemsRemaining1,
BattlePyramid_ThreeItemsRemaining_Text1, BattlePyramid_Text_ThreeItemsRemaining1,
BattlePyramid_FourItemsRemaining_Text1, BattlePyramid_Text_FourItemsRemaining1,
BattlePyramid_FiveItemsRemaining_Text1, BattlePyramid_Text_FiveItemsRemaining1,
BattlePyramid_SixItemsRemaining_Text1, BattlePyramid_Text_SixItemsRemaining1,
BattlePyramid_SevenItemsRemaining_Text1, BattlePyramid_Text_SevenItemsRemaining1,
BattlePyramid_EightItemsRemaining_Text1, BattlePyramid_Text_EightItemsRemaining1,
}; };
static const u8 *const sRemainingTrainersHintTexts1[] = static const u8 *const sRemainingTrainersHintTexts1[] =
{ {
BattlePyramid_ZeroTrainersRemaining_Text1, BattlePyramid_Text_ZeroTrainersRemaining1,
BattlePyramid_OneTrainersRemaining_Text1, BattlePyramid_Text_OneTrainersRemaining1,
BattlePyramid_TwoTrainersRemaining_Text1, BattlePyramid_Text_TwoTrainersRemaining1,
BattlePyramid_ThreeTrainersRemaining_Text1, BattlePyramid_Text_ThreeTrainersRemaining1,
BattlePyramid_FourTrainersRemaining_Text1, BattlePyramid_Text_FourTrainersRemaining1,
BattlePyramid_FiveTrainersRemaining_Text1, BattlePyramid_Text_FiveTrainersRemaining1,
BattlePyramid_SixTrainersRemaining_Text1, BattlePyramid_Text_SixTrainersRemaining1,
BattlePyramid_SevenTrainersRemaining_Text1, BattlePyramid_Text_SevenTrainersRemaining1,
}; };
static const u8 *const sExitDirectionHintTexts2[] = static const u8 *const sExitDirectionHintTexts2[] =
{ {
BattlePyramid_ExitHintUp_Text2, BattlePyramid_Text_ExitHintUp2,
BattlePyramid_ExitHintLeft_Text2, BattlePyramid_Text_ExitHintLeft2,
BattlePyramid_ExitHintRight_Text2, BattlePyramid_Text_ExitHintRight2,
BattlePyramid_ExitHintDown_Text2, BattlePyramid_Text_ExitHintDown2,
}; };
static const u8 *const sRemainingItemsHintTexts2[] = static const u8 *const sRemainingItemsHintTexts2[] =
{ {
BattlePyramid_ZeroItemsRemaining_Text2, BattlePyramid_Text_ZeroItemsRemaining2,
BattlePyramid_OneItemRemaining_Text2, BattlePyramid_Text_OneItemRemaining2,
BattlePyramid_TwoItemsRemaining_Text2, BattlePyramid_Text_TwoItemsRemaining2,
BattlePyramid_ThreeItemsRemaining_Text2, BattlePyramid_Text_ThreeItemsRemaining2,
BattlePyramid_FourItemsRemaining_Text2, BattlePyramid_Text_FourItemsRemaining2,
BattlePyramid_FiveItemsRemaining_Text2, BattlePyramid_Text_FiveItemsRemaining2,
BattlePyramid_SixItemsRemaining_Text2, BattlePyramid_Text_SixItemsRemaining2,
BattlePyramid_SevenItemsRemaining_Text2, BattlePyramid_Text_SevenItemsRemaining2,
BattlePyramid_EightItemsRemaining_Text2, BattlePyramid_Text_EightItemsRemaining2,
}; };
static const u8 *const sRemainingTrainersHintTexts2[] = static const u8 *const sRemainingTrainersHintTexts2[] =
{ {
BattlePyramid_ZeroTrainersRemaining_Text2, BattlePyramid_Text_ZeroTrainersRemaining2,
BattlePyramid_OneTrainersRemaining_Text2, BattlePyramid_Text_OneTrainersRemaining2,
BattlePyramid_TwoTrainersRemaining_Text2, BattlePyramid_Text_TwoTrainersRemaining2,
BattlePyramid_ThreeTrainersRemaining_Text2, BattlePyramid_Text_ThreeTrainersRemaining2,
BattlePyramid_FourTrainersRemaining_Text2, BattlePyramid_Text_FourTrainersRemaining2,
BattlePyramid_FiveTrainersRemaining_Text2, BattlePyramid_Text_FiveTrainersRemaining2,
BattlePyramid_SixTrainersRemaining_Text2, BattlePyramid_Text_SixTrainersRemaining2,
BattlePyramid_SevenTrainersRemaining_Text2, BattlePyramid_Text_SevenTrainersRemaining2,
}; };
static const u8 *const sExitDirectionHintTexts3[] = static const u8 *const sExitDirectionHintTexts3[] =
{ {
BattlePyramid_ExitHintUp_Text3, BattlePyramid_Text_ExitHintUp3,
BattlePyramid_ExitHintLeft_Text3, BattlePyramid_Text_ExitHintLeft3,
BattlePyramid_ExitHintRight_Text3, BattlePyramid_Text_ExitHintRight3,
BattlePyramid_ExitHintDown_Text3, BattlePyramid_Text_ExitHintDown3,
}; };
static const u8 *const sRemainingItemsHintTexts3[] = static const u8 *const sRemainingItemsHintTexts3[] =
{ {
BattlePyramid_ZeroItemsRemaining_Text3, BattlePyramid_Text_ZeroItemsRemaining3,
BattlePyramid_OneItemRemaining_Text3, BattlePyramid_Text_OneItemRemaining3,
BattlePyramid_TwoItemsRemaining_Text3, BattlePyramid_Text_TwoItemsRemaining3,
BattlePyramid_ThreeItemsRemaining_Text3, BattlePyramid_Text_ThreeItemsRemaining3,
BattlePyramid_FourItemsRemaining_Text3, BattlePyramid_Text_FourItemsRemaining3,
BattlePyramid_FiveItemsRemaining_Text3, BattlePyramid_Text_FiveItemsRemaining3,
BattlePyramid_SixItemsRemaining_Text3, BattlePyramid_Text_SixItemsRemaining3,
BattlePyramid_SevenItemsRemaining_Text3, BattlePyramid_Text_SevenItemsRemaining3,
BattlePyramid_EightItemsRemaining_Text3, BattlePyramid_Text_EightItemsRemaining3,
}; };
static const u8 *const sRemainingTrainersHintTexts3[] = static const u8 *const sRemainingTrainersHintTexts3[] =
{ {
BattlePyramid_ZeroTrainersRemaining_Text3, BattlePyramid_Text_ZeroTrainersRemaining3,
BattlePyramid_OneTrainersRemaining_Text3, BattlePyramid_Text_OneTrainersRemaining3,
BattlePyramid_TwoTrainersRemaining_Text3, BattlePyramid_Text_TwoTrainersRemaining3,
BattlePyramid_ThreeTrainersRemaining_Text3, BattlePyramid_Text_ThreeTrainersRemaining3,
BattlePyramid_FourTrainersRemaining_Text3, BattlePyramid_Text_FourTrainersRemaining3,
BattlePyramid_FiveTrainersRemaining_Text3, BattlePyramid_Text_FiveTrainersRemaining3,
BattlePyramid_SixTrainersRemaining_Text3, BattlePyramid_Text_SixTrainersRemaining3,
BattlePyramid_SevenTrainersRemaining_Text3, BattlePyramid_Text_SevenTrainersRemaining3,
}; };
static const u8 *const sExitDirectionHintTexts4[] = static const u8 *const sExitDirectionHintTexts4[] =
{ {
BattlePyramid_ExitHintUp_Text4, BattlePyramid_Text_ExitHintUp4,
BattlePyramid_ExitHintLeft_Text4, BattlePyramid_Text_ExitHintLeft4,
BattlePyramid_ExitHintRight_Text4, BattlePyramid_Text_ExitHintRight4,
BattlePyramid_ExitHintDown_Text4, BattlePyramid_Text_ExitHintDown4,
}; };
static const u8 *const sRemainingItemsHintTexts4[] = static const u8 *const sRemainingItemsHintTexts4[] =
{ {
BattlePyramid_ZeroItemsRemaining_Text4, BattlePyramid_Text_ZeroItemsRemaining4,
BattlePyramid_OneItemRemaining_Text4, BattlePyramid_Text_OneItemRemaining4,
BattlePyramid_TwoItemsRemaining_Text4, BattlePyramid_Text_TwoItemsRemaining4,
BattlePyramid_ThreeItemsRemaining_Text4, BattlePyramid_Text_ThreeItemsRemaining4,
BattlePyramid_FourItemsRemaining_Text4, BattlePyramid_Text_FourItemsRemaining4,
BattlePyramid_FiveItemsRemaining_Text4, BattlePyramid_Text_FiveItemsRemaining4,
BattlePyramid_SixItemsRemaining_Text4, BattlePyramid_Text_SixItemsRemaining4,
BattlePyramid_SevenItemsRemaining_Text4, BattlePyramid_Text_SevenItemsRemaining4,
BattlePyramid_EightItemsRemaining_Text4, BattlePyramid_Text_EightItemsRemaining4,
}; };
static const u8 *const sRemainingTrainersHintTexts4[] = static const u8 *const sRemainingTrainersHintTexts4[] =
{ {
BattlePyramid_ZeroTrainersRemaining_Text4, BattlePyramid_Text_ZeroTrainersRemaining4,
BattlePyramid_OneTrainersRemaining_Text4, BattlePyramid_Text_OneTrainersRemaining4,
BattlePyramid_TwoTrainersRemaining_Text4, BattlePyramid_Text_TwoTrainersRemaining4,
BattlePyramid_ThreeTrainersRemaining_Text4, BattlePyramid_Text_ThreeTrainersRemaining4,
BattlePyramid_FourTrainersRemaining_Text4, BattlePyramid_Text_FourTrainersRemaining4,
BattlePyramid_FiveTrainersRemaining_Text4, BattlePyramid_Text_FiveTrainersRemaining4,
BattlePyramid_SixTrainersRemaining_Text4, BattlePyramid_Text_SixTrainersRemaining4,
BattlePyramid_SevenTrainersRemaining_Text4, BattlePyramid_Text_SevenTrainersRemaining4,
}; };
static const u8 *const sExitDirectionHintTexts5[] = static const u8 *const sExitDirectionHintTexts5[] =
{ {
BattlePyramid_ExitHintUp_Text5, BattlePyramid_Text_ExitHintUp5,
BattlePyramid_ExitHintLeft_Text5, BattlePyramid_Text_ExitHintLeft5,
BattlePyramid_ExitHintRight_Text5, BattlePyramid_Text_ExitHintRight5,
BattlePyramid_ExitHintDown_Text5, BattlePyramid_Text_ExitHintDown5,
}; };
static const u8 *const sRemainingItemsHintTexts5[] = static const u8 *const sRemainingItemsHintTexts5[] =
{ {
BattlePyramid_ZeroItemsRemaining_Text5, BattlePyramid_Text_ZeroItemsRemaining5,
BattlePyramid_OneItemRemaining_Text5, BattlePyramid_Text_OneItemRemaining5,
BattlePyramid_TwoItemsRemaining_Text5, BattlePyramid_Text_TwoItemsRemaining5,
BattlePyramid_ThreeItemsRemaining_Text5, BattlePyramid_Text_ThreeItemsRemaining5,
BattlePyramid_FourItemsRemaining_Text5, BattlePyramid_Text_FourItemsRemaining5,
BattlePyramid_FiveItemsRemaining_Text5, BattlePyramid_Text_FiveItemsRemaining5,
BattlePyramid_SixItemsRemaining_Text5, BattlePyramid_Text_SixItemsRemaining5,
BattlePyramid_SevenItemsRemaining_Text5, BattlePyramid_Text_SevenItemsRemaining5,
BattlePyramid_EightItemsRemaining_Text5, BattlePyramid_Text_EightItemsRemaining5,
}; };
static const u8 *const sRemainingTrainersHintTexts5[] = static const u8 *const sRemainingTrainersHintTexts5[] =
{ {
BattlePyramid_ZeroTrainersRemaining_Text5, BattlePyramid_Text_ZeroTrainersRemaining5,
BattlePyramid_OneTrainersRemaining_Text5, BattlePyramid_Text_OneTrainersRemaining5,
BattlePyramid_TwoTrainersRemaining_Text5, BattlePyramid_Text_TwoTrainersRemaining5,
BattlePyramid_ThreeTrainersRemaining_Text5, BattlePyramid_Text_ThreeTrainersRemaining5,
BattlePyramid_FourTrainersRemaining_Text5, BattlePyramid_Text_FourTrainersRemaining5,
BattlePyramid_FiveTrainersRemaining_Text5, BattlePyramid_Text_FiveTrainersRemaining5,
BattlePyramid_SixTrainersRemaining_Text5, BattlePyramid_Text_SixTrainersRemaining5,
BattlePyramid_SevenTrainersRemaining_Text5, BattlePyramid_Text_SevenTrainersRemaining5,
}; };
static const u8 *const sExitDirectionHintTexts6[] = static const u8 *const sExitDirectionHintTexts6[] =
{ {
BattlePyramid_ExitHintUp_Text6, BattlePyramid_Text_ExitHintUp6,
BattlePyramid_ExitHintLeft_Text6, BattlePyramid_Text_ExitHintLeft6,
BattlePyramid_ExitHintRight_Text6, BattlePyramid_Text_ExitHintRight6,
BattlePyramid_ExitHintDown_Text6, BattlePyramid_Text_ExitHintDown6,
}; };
static const u8 *const sRemainingItemsHintTexts6[] = static const u8 *const sRemainingItemsHintTexts6[] =
{ {
BattlePyramid_ZeroItemsRemaining_Text6, BattlePyramid_Text_ZeroItemsRemaining6,
BattlePyramid_OneItemRemaining_Text6, BattlePyramid_Text_OneItemRemaining6,
BattlePyramid_TwoItemsRemaining_Text6, BattlePyramid_Text_TwoItemsRemaining6,
BattlePyramid_ThreeItemsRemaining_Text6, BattlePyramid_Text_ThreeItemsRemaining6,
BattlePyramid_FourItemsRemaining_Text6, BattlePyramid_Text_FourItemsRemaining6,
BattlePyramid_FiveItemsRemaining_Text6, BattlePyramid_Text_FiveItemsRemaining6,
BattlePyramid_SixItemsRemaining_Text6, BattlePyramid_Text_SixItemsRemaining6,
BattlePyramid_SevenItemsRemaining_Text6, BattlePyramid_Text_SevenItemsRemaining6,
BattlePyramid_EightItemsRemaining_Text6, BattlePyramid_Text_EightItemsRemaining6,
}; };
static const u8 *const sRemainingTrainersHintTexts6[] = static const u8 *const sRemainingTrainersHintTexts6[] =
{ {
BattlePyramid_ZeroTrainersRemaining_Text6, BattlePyramid_Text_ZeroTrainersRemaining6,
BattlePyramid_OneTrainersRemaining_Text6, BattlePyramid_Text_OneTrainersRemaining6,
BattlePyramid_TwoTrainersRemaining_Text6, BattlePyramid_Text_TwoTrainersRemaining6,
BattlePyramid_ThreeTrainersRemaining_Text6, BattlePyramid_Text_ThreeTrainersRemaining6,
BattlePyramid_FourTrainersRemaining_Text6, BattlePyramid_Text_FourTrainersRemaining6,
BattlePyramid_FiveTrainersRemaining_Text6, BattlePyramid_Text_FiveTrainersRemaining6,
BattlePyramid_SixTrainersRemaining_Text6, BattlePyramid_Text_SixTrainersRemaining6,
BattlePyramid_SevenTrainersRemaining_Text6, BattlePyramid_Text_SevenTrainersRemaining6,
}; };
static const u8 *const *const sPostBattleHintTexts1[] = static const u8 *const *const sPostBattleHintTexts1[] =
@@ -787,24 +787,24 @@ static const u8 sHintTextTypes[] =
static void (* const sBattlePyramidFunctions[])(void) = static void (* const sBattlePyramidFunctions[])(void) =
{ {
[BATTLE_PYRAMID_FUNC_INIT] = InitPyramidChallenge, [BATTLE_PYRAMID_FUNC_INIT] = InitPyramidChallenge,
[BATTLE_PYRAMID_FUNC_GET_DATA] = GetBattlePyramidData, [BATTLE_PYRAMID_FUNC_GET_DATA] = GetBattlePyramidData,
[BATTLE_PYRAMID_FUNC_SET_DATA] = SetBattlePyramidData, [BATTLE_PYRAMID_FUNC_SET_DATA] = SetBattlePyramidData,
[BATTLE_PYRAMID_FUNC_SAVE] = SavePyramidChallenge, [BATTLE_PYRAMID_FUNC_SAVE] = SavePyramidChallenge,
[BATTLE_PYRAMID_FUNC_SET_PRIZE] = SetBattlePyramidPrize, [BATTLE_PYRAMID_FUNC_SET_PRIZE] = SetBattlePyramidPrize,
[BATTLE_PYRAMID_FUNC_GIVE_PRIZE] = GiveBattlePyramidPrize, [BATTLE_PYRAMID_FUNC_GIVE_PRIZE] = GiveBattlePyramidPrize,
[BATTLE_PYRAMID_FUNC_SEED_FLOOR] = SeedPyramidFloor, [BATTLE_PYRAMID_FUNC_SEED_FLOOR] = SeedPyramidFloor,
[BATTLE_PYRAMID_FUNC_SET_ITEM] = SetPickupItem, [BATTLE_PYRAMID_FUNC_SET_ITEM] = SetPickupItem,
[BATTLE_PYRAMID_FUNC_HIDE_ITEM] = HidePyramidItem, [BATTLE_PYRAMID_FUNC_HIDE_ITEM] = HidePyramidItem,
[BATTLE_PYRAMID_FUNC_INIT_TRAINERS] = InitPyramidFacilityTrainers, [BATTLE_PYRAMID_FUNC_SET_TRAINERS] = SetPyramidFacilityTrainers,
[BATTLE_PYRAMID_FUNC_SHOW_HINT_TEXT] = ShowPostBattleHintText, [BATTLE_PYRAMID_FUNC_SHOW_HINT_TEXT] = ShowPostBattleHintText,
[BATTLE_PYRAMID_FUNC_UPDATE_STREAK] = UpdatePyramidWinStreak, [BATTLE_PYRAMID_FUNC_UPDATE_STREAK] = UpdatePyramidWinStreak,
[BATTLE_PYRAMID_FUNC_IS_IN] = GetInBattlePyramid, [BATTLE_PYRAMID_FUNC_IS_IN] = GetInBattlePyramid,
[BATTLE_PYRAMID_FUNC_UPDATE_LIGHT] = UpdatePyramidLightRadius, [BATTLE_PYRAMID_FUNC_UPDATE_LIGHT] = UpdatePyramidLightRadius,
[BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS] = ClearPyramidPartyHeldItems, [BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS] = ClearPyramidPartyHeldItems,
[BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE] = SetPyramidFloorPalette, [BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE] = SetPyramidFloorPalette,
[BATTLE_PYRAMID_FUNC_16] = sub_81A9828, [BATTLE_PYRAMID_FUNC_START_MENU] = BattlePyramidStartMenu,
[BATTLE_PYRAMID_FUNC_RESTORE_PARTY] = RestorePyramidPlayerParty, [BATTLE_PYRAMID_FUNC_RESTORE_PARTY] = RestorePyramidPlayerParty,
}; };
static const u16 sShortStreakRewardItems[] = {ITEM_HP_UP, ITEM_PROTEIN, ITEM_IRON, ITEM_CALCIUM, ITEM_CARBOS, ITEM_ZINC}; static const u16 sShortStreakRewardItems[] = {ITEM_HP_UP, ITEM_PROTEIN, ITEM_IRON, ITEM_CALCIUM, ITEM_CARBOS, ITEM_ZINC};
@@ -1029,7 +1029,7 @@ static void HidePyramidItem(void)
} }
} }
static void InitPyramidFacilityTrainers(void) static void SetPyramidFacilityTrainers(void)
{ {
gFacilityTrainers = gBattleFrontierTrainers; gFacilityTrainers = gBattleFrontierTrainers;
} }
@@ -1193,9 +1193,10 @@ static void Task_SetPyramidFloorPalette(u8 taskId)
} }
} }
static void sub_81A9828(void) // Unused. Handled by BuildStartMenuActions
static void BattlePyramidStartMenu(void)
{ {
sub_809FDD4(); ShowBattlePyramidStartMenu();
} }
static void RestorePyramidPlayerParty(void) static void RestorePyramidPlayerParty(void)
@@ -1417,7 +1418,7 @@ u8 GetPyramidRunMultiplier(void)
u8 InBattlePyramid(void) u8 InBattlePyramid(void)
{ {
if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR)
return 1; return 1;
else if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP) else if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP)
return 2; return 2;
@@ -1427,11 +1428,11 @@ u8 InBattlePyramid(void)
bool8 InBattlePyramid_(void) bool8 InBattlePyramid_(void)
{ {
return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR
|| gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP; || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP;
} }
void sub_81A9E90(void) void PausePyramidChallenge(void)
{ {
if (InBattlePyramid()) if (InBattlePyramid())
{ {
@@ -1475,9 +1476,10 @@ u8 GetBattlePyramindTrainerEncounterMusicId(u16 trainerId)
return TRAINER_ENCOUNTER_MUSIC_MALE; return TRAINER_ENCOUNTER_MUSIC_MALE;
} }
void sub_81A9F80(void) // Unused
static void BattlePyramidRetireChallenge(void)
{ {
ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88); ScriptContext1_SetupScript(BattlePyramid_Retire);
} }
static u16 GetUniqueTrainerId(u8 eventObjectId) static u16 GetUniqueTrainerId(u8 eventObjectId)
@@ -1528,7 +1530,7 @@ void GenerateBattlePyramidFloorLayout(u16 *backupMapData, bool8 setPlayerPositio
{ {
u16 *map; u16 *map;
int yOffset, xOffset; int yOffset, xOffset;
const struct MapLayout *mapLayout = gMapLayouts[floorLayoutOffsets[i] + LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE]; const struct MapLayout *mapLayout = gMapLayouts[floorLayoutOffsets[i] + LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR];
const u16 *layoutMap = mapLayout->map; const u16 *layoutMap = mapLayout->map;
gBackupMapLayout.map = backupMapData; gBackupMapLayout.map = backupMapData;
src/battle_pyramid_bag.c
+4 -4
View File
@@ -39,7 +39,7 @@ EWRAM_DATA struct PyramidBagCursorData gPyramidBagCursorData = {0};
// This file's functions. // This file's functions.
static void Task_HandlePyramidBagInput(u8 taskId); static void Task_HandlePyramidBagInput(u8 taskId);
static void sub_81C4F44(u8 taskId); static void Task_ChooseItemsToTossFromPyramidBag(u8 taskId);
static void sub_81C5B4C(u8 taskId); static void sub_81C5B4C(u8 taskId);
static void Task_BeginItemSwap(u8 taskId); static void Task_BeginItemSwap(u8 taskId);
static void sub_81C5D20(u8 taskId); static void sub_81C5D20(u8 taskId);
@@ -354,14 +354,14 @@ static void sub_81C4F10(void)
GoToBattlePyramidBagMenu(1, CB2_SetUpReshowBattleScreenAfterMenu2); GoToBattlePyramidBagMenu(1, CB2_SetUpReshowBattleScreenAfterMenu2);
} }
void sub_81C4F24(void) void ChooseItemsToTossFromPyramidBag(void)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
FadeScreen(1, 0); FadeScreen(1, 0);
CreateTask(sub_81C4F44, 10); CreateTask(Task_ChooseItemsToTossFromPyramidBag, 10);
} }
static void sub_81C4F44(u8 taskId) static void Task_ChooseItemsToTossFromPyramidBag(u8 taskId)
{ {
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
src/field_control_avatar.c
+1 -1
View File
@@ -517,7 +517,7 @@ static bool8 TryStartMiscWalkingScripts(u16 metatileBehavior)
} }
else if (MetatileBehavior_IsBattlePyramidWarp(metatileBehavior)) else if (MetatileBehavior_IsBattlePyramidWarp(metatileBehavior))
{ {
ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8); ScriptContext1_SetupScript(BattlePyramid_WarpToNextFloor);
return TRUE; return TRUE;
} }
else if (MetatileBehavior_IsSecretBaseGlitterMat(metatileBehavior) == TRUE) else if (MetatileBehavior_IsSecretBaseGlitterMat(metatileBehavior) == TRUE)
src/field_screen_effect.c
+1 -1
View File
@@ -429,7 +429,7 @@ static void sub_80AF660(u8 taskId)
if (WaitForWeatherFadeIn() == TRUE) if (WaitForWeatherFadeIn() == TRUE)
{ {
DestroyTask(taskId); DestroyTask(taskId);
CreateTask(sub_809FA34, 80); CreateTask(Task_ShowStartMenu, 80);
} }
} }
src/frontier_pass.c
+1 -1
View File
@@ -1558,7 +1558,7 @@ static u8 MapNumToFrontierFacilityId(u16 mapNum) // id + 1, zero means not a fro
|| mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS)) || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS))
return FRONTIER_FACILITY_PIKE + 1; return FRONTIER_FACILITY_PIKE + 1;
else if (mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY) else if (mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY)
|| mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR)
|| mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PYRAMID_TOP)) || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PYRAMID_TOP))
return FRONTIER_FACILITY_PYRAMID + 1; return FRONTIER_FACILITY_PYRAMID + 1;
else else
src/overworld.c
+4 -4
View File
@@ -852,7 +852,7 @@ static void mli0_load_map(u32 a1)
LoadCurrentMapData(); LoadCurrentMapData();
if (!(sUnknown_020322D8 & 1)) if (!(sUnknown_020322D8 & 1))
{ {
if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR)
LoadBattlePyramidEventObjectTemplates(); LoadBattlePyramidEventObjectTemplates();
else if (InTrainerHill()) else if (InTrainerHill())
LoadTrainerHillEventObjectTemplates(); LoadTrainerHillEventObjectTemplates();
@@ -880,7 +880,7 @@ static void mli0_load_map(u32 a1)
RunOnTransitionMapScript(); RunOnTransitionMapScript();
UpdateLocationHistoryForRoamer(); UpdateLocationHistoryForRoamer();
RoamerMoveToOtherLocationSet(); RoamerMoveToOtherLocationSet();
if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR)
InitBattlePyramidMap(FALSE); InitBattlePyramidMap(FALSE);
else if (InTrainerHill()) else if (InTrainerHill())
InitTrainerHillMap(); InitTrainerHillMap();
@@ -1720,7 +1720,7 @@ void CB2_ContinueSavedGame(void)
LoadSaveblockMapHeader(); LoadSaveblockMapHeader();
ClearDiveAndHoleWarps(); ClearDiveAndHoleWarps();
trainerHillMapId = GetCurrentTrainerHillMapId(); trainerHillMapId = GetCurrentTrainerHillMapId();
if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR)
LoadBattlePyramidFloorEventObjectScripts(); LoadBattlePyramidFloorEventObjectScripts();
else if (trainerHillMapId != 0 && trainerHillMapId != TRAINER_HILL_ENTRANCE) else if (trainerHillMapId != 0 && trainerHillMapId != TRAINER_HILL_ENTRANCE)
LoadTrainerHillFloorEventObjectScripts(); LoadTrainerHillFloorEventObjectScripts();
@@ -1730,7 +1730,7 @@ void CB2_ContinueSavedGame(void)
UnfreezeEventObjects(); UnfreezeEventObjects();
DoTimeBasedEvents(); DoTimeBasedEvents();
sub_8084788(); sub_8084788();
if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR)
InitBattlePyramidMap(TRUE); InitBattlePyramidMap(TRUE);
else if (trainerHillMapId != 0) else if (trainerHillMapId != 0)
InitTrainerHillMap(); InitTrainerHillMap();
src/start_menu.c
+13 -12
View File
@@ -512,14 +512,14 @@ static bool8 sub_809FA00(void)
return TRUE; return TRUE;
} }
void sub_809FA18(void) // Called from field_screen.s void sub_809FA18(void)
{ {
sUnknown_02037619[0] = 0; sUnknown_02037619[0] = 0;
sUnknown_02037619[1] = 0; sUnknown_02037619[1] = 0;
gFieldCallback2 = sub_809FA00; gFieldCallback2 = sub_809FA00;
} }
void sub_809FA34(u8 taskId) // Referenced in field_screen.s and rom_8011DC0.s void Task_ShowStartMenu(u8 taskId)
{ {
struct Task* task = &gTasks[taskId]; struct Task* task = &gTasks[taskId];
@@ -539,7 +539,7 @@ void sub_809FA34(u8 taskId) // Referenced in field_screen.s and rom_8011DC0.s
} }
} }
void ShowStartMenu(void) // Called from overworld.c and field_control_avatar.s void ShowStartMenu(void)
{ {
if (!IsUpdateLinkStateCBActive()) if (!IsUpdateLinkStateCBActive())
{ {
@@ -547,7 +547,7 @@ void ShowStartMenu(void) // Called from overworld.c and field_control_avatar.s
sub_808B864(); sub_808B864();
sub_808BCF4(); sub_808BCF4();
} }
CreateStartMenuTask(sub_809FA34); CreateStartMenuTask(Task_ShowStartMenu);
ScriptContext2_Enable(); ScriptContext2_Enable();
} }
@@ -743,11 +743,12 @@ static bool8 StartMenuBattlePyramidRetireCallback(void)
return FALSE; return FALSE;
} }
void sub_809FDD4(void) // Functionally unused
void ShowBattlePyramidStartMenu(void)
{ {
ClearDialogWindowAndFrameToTransparent(0, FALSE); ClearDialogWindowAndFrameToTransparent(0, FALSE);
ScriptUnfreezeEventObjects(); ScriptUnfreezeEventObjects();
CreateStartMenuTask(sub_809FA34); CreateStartMenuTask(Task_ShowStartMenu);
ScriptContext2_Enable(); ScriptContext2_Enable();
} }
@@ -827,7 +828,7 @@ static bool8 BattlePyramidRetireCallback(void)
ClearDialogWindowAndFrameToTransparent(0, TRUE); ClearDialogWindowAndFrameToTransparent(0, TRUE);
ScriptUnfreezeEventObjects(); ScriptUnfreezeEventObjects();
ScriptContext2_Disable(); ScriptContext2_Disable();
ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88); ScriptContext1_SetupScript(BattlePyramid_Retire);
return TRUE; return TRUE;
} }
@@ -853,7 +854,7 @@ static u8 RunSaveCallback(void)
return sSaveDialogCallback(); return sSaveDialogCallback();
} }
void SaveGame(void) // Called from cable_club.s void SaveGame(void)
{ {
InitSave(); InitSave();
CreateTask(SaveGameTask, 0x50); CreateTask(SaveGameTask, 0x50);
@@ -1048,7 +1049,7 @@ static u8 SaveDoSaveCallback(void)
u8 saveStatus; u8 saveStatus;
IncrementGameStat(GAME_STAT_SAVED_GAME); IncrementGameStat(GAME_STAT_SAVED_GAME);
sub_81A9E90(); PausePyramidChallenge();
if (gDifferentSaveFile == TRUE) if (gDifferentSaveFile == TRUE)
{ {
@@ -1202,7 +1203,7 @@ static bool32 sub_80A03E4(u8 *par1)
return FALSE; return FALSE;
} }
void sub_80A0514(void) // Called from cable_club.s void sub_80A0514(void)
{ {
if (sub_80A03E4(&gMain.state)) if (sub_80A03E4(&gMain.state))
{ {
@@ -1371,7 +1372,7 @@ static void sub_80A08A4(u8 taskId)
} }
} }
void sub_80A08CC(void) // Referenced in data/specials.inc and data/scripts/maps/BattleFrontier_BattleTowerLobby.inc void sub_80A08CC(void)
{ {
u8 taskId = CreateTask(sub_8153688, 0x5); u8 taskId = CreateTask(sub_8153688, 0x5);
gTasks[taskId].data[2] = 1; gTasks[taskId].data[2] = 1;
@@ -1386,7 +1387,7 @@ static void HideStartMenuWindow(void)
ScriptContext2_Disable(); ScriptContext2_Disable();
} }
void HideStartMenu(void) // Called from map_name_popup.s void HideStartMenu(void)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
HideStartMenuWindow(); HideStartMenuWindow();
src/union_room.c
+1 -1
View File
@@ -2423,7 +2423,7 @@ void sub_80156E0(u8 taskId)
} }
break; break;
case 23: case 23:
if (!FuncIsActiveTask(sub_809FA34)) if (!FuncIsActiveTask(Task_ShowStartMenu))
{ {
sub_8011090(0x40, 0, 0); sub_8011090(0x40, 0, 0);
data->state = 4; data->state = 4;
src/wild_encounter.c
+3 -3
View File
@@ -485,7 +485,7 @@ static bool8 DoWildEncounterRateTest(u32 encounterRate, bool8 ignoreAbility)
{ {
u32 ability = GetMonAbility(&gPlayerParty[0]); u32 ability = GetMonAbility(&gPlayerParty[0]);
if (ability == ABILITY_STENCH && gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) if (ability == ABILITY_STENCH && gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR)
encounterRate = encounterRate * 3 / 4; encounterRate = encounterRate * 3 / 4;
else if (ability == ABILITY_STENCH) else if (ability == ABILITY_STENCH)
encounterRate /= 2; encounterRate /= 2;
@@ -548,7 +548,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi
BattleSetup_StartBattlePikeWildBattle(); BattleSetup_StartBattlePikeWildBattle();
return TRUE; return TRUE;
} }
if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR)
{ {
headerId = gSaveBlock2Ptr->frontier.curChallengeBattleNum; headerId = gSaveBlock2Ptr->frontier.curChallengeBattleNum;
if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll()) if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll())
@@ -686,7 +686,7 @@ bool8 SweetScentWildEncounter(void)
BattleSetup_StartBattlePikeWildBattle(); BattleSetup_StartBattlePikeWildBattle();
return TRUE; return TRUE;
} }
if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR)
{ {
headerId = gSaveBlock2Ptr->frontier.curChallengeBattleNum; headerId = gSaveBlock2Ptr->frontier.curChallengeBattleNum;
if (TryGenerateWildMon(gBattlePyramidWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0) != TRUE) if (TryGenerateWildMon(gBattlePyramidWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0) != TRUE)