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

Document a bunch of battle pyramid

Browse Source
This commit is contained in:
Marcus Huderle
2019-02-06 20:01:29 -06:00
committed by huderlem
parent 1253cbf5f6
commit a1ad1bad3a
15 changed files with 1094 additions and 1051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
+126 -126
View File
@@ -189,595 +189,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?$"
BattleFrontier_BattlePyramidEmptySquare_Text_252D2D:: @ 8252D2D BattlePyramid_ExitHintUp_Text1:: @ 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}$"
BattleFrontier_BattlePyramidEmptySquare_Text_252D57:: @ 8252D57 BattlePyramid_ExitHintLeft_Text1:: @ 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}$"
BattleFrontier_BattlePyramidEmptySquare_Text_252D81:: @ 8252D81 BattlePyramid_ExitHintRight_Text1:: @ 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}$"
BattleFrontier_BattlePyramidEmptySquare_Text_252DAB:: @ 8252DAB BattlePyramid_ExitHintDown_Text1:: @ 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}$"
BattleFrontier_BattlePyramidEmptySquare_Text_252DD5:: @ 8252DD5 BattlePyramid_ExitHintUp_Text2:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252E03:: @ 8252E03 BattlePyramid_ExitHintLeft_Text2:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252E31:: @ 8252E31 BattlePyramid_ExitHintRight_Text2:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252E5F:: @ 8252E5F BattlePyramid_ExitHintDown_Text2:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252E8D:: @ 8252E8D BattlePyramid_ExitHintUp_Text3:: @ 8252E8D
.string "The exit is over\n" .string "The exit is over\n"
.string "that {UP_ARROW} way.$" .string "that {UP_ARROW} way.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252EAA:: @ 8252EAA BattlePyramid_ExitHintLeft_Text3:: @ 8252EAA
.string "The exit is over\n" .string "The exit is over\n"
.string "that {LEFT_ARROW} way.$" .string "that {LEFT_ARROW} way.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252EC7:: @ 8252EC7 BattlePyramid_ExitHintRight_Text3:: @ 8252EC7
.string "The exit is over\n" .string "The exit is over\n"
.string "that {RIGHT_ARROW} way.$" .string "that {RIGHT_ARROW} way.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252EE4:: @ 8252EE4 BattlePyramid_ExitHintDown_Text3:: @ 8252EE4
.string "The exit is over\n" .string "The exit is over\n"
.string "that {DOWN_ARROW} way.$" .string "that {DOWN_ARROW} way.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252F01:: @ 8252F01 BattlePyramid_ExitHintUp_Text4:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252F3A:: @ 8252F3A BattlePyramid_ExitHintLeft_Text4:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252F73:: @ 8252F73 BattlePyramid_ExitHintRight_Text4:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252FAC:: @ 8252FAC BattlePyramid_ExitHintDown_Text4:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252FE5:: @ 8252FE5 BattlePyramid_ExitHintUp_Text5:: @ 8252FE5
.string "The exit?\n" .string "The exit?\n"
.string "It's that {UP_ARROW} way.$" .string "It's that {UP_ARROW} way.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253000:: @ 8253000 BattlePyramid_ExitHintLeft_Text5:: @ 8253000
.string "The exit?\n" .string "The exit?\n"
.string "It's that {LEFT_ARROW} way.$" .string "It's that {LEFT_ARROW} way.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25301B:: @ 825301B BattlePyramid_ExitHintRight_Text5:: @ 825301B
.string "The exit?\n" .string "The exit?\n"
.string "It's that {RIGHT_ARROW} way.$" .string "It's that {RIGHT_ARROW} way.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253036:: @ 8253036 BattlePyramid_ExitHintDown_Text5:: @ 8253036
.string "The exit?\n" .string "The exit?\n"
.string "It's that {DOWN_ARROW} way.$" .string "It's that {DOWN_ARROW} way.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253051:: @ 8253051 BattlePyramid_ExitHintUp_Text6:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25307C:: @ 825307C BattlePyramid_ExitHintLeft_Text6:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2530A7:: @ 82530A7 BattlePyramid_ExitHintRight_Text6:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2530D2:: @ 82530D2 BattlePyramid_ExitHintDown_Text6:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2530FD:: @ 82530FD BattlePyramid_EightItemsRemaining_Text1:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253140:: @ 8253140 BattlePyramid_SevenItemsRemaining_Text1:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253183:: @ 8253183 BattlePyramid_SixItemsRemaining_Text1:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2531C4:: @ 82531C4 BattlePyramid_FiveItemsRemaining_Text1:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253206:: @ 8253206 BattlePyramid_FourItemsRemaining_Text1:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253248:: @ 8253248 BattlePyramid_ThreeItemsRemaining_Text1:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25328B:: @ 825328B BattlePyramid_TwoItemsRemaining_Text1:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2532CC:: @ 82532CC BattlePyramid_OneItemRemaining_Text1:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25330B:: @ 825330B BattlePyramid_ZeroItemsRemaining_Text1:: @ 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!$"
BattleFrontier_BattlePyramidEmptySquare_Text_25334D:: @ 825334D BattlePyramid_EightItemsRemaining_Text2:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2533A6:: @ 82533A6 BattlePyramid_SevenItemsRemaining_Text2:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253404:: @ 8253404 BattlePyramid_SixItemsRemaining_Text2:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253460:: @ 8253460 BattlePyramid_FiveItemsRemaining_Text2:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2534BD:: @ 82534BD BattlePyramid_FourItemsRemaining_Text2:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25351A:: @ 825351A BattlePyramid_ThreeItemsRemaining_Text2:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253578:: @ 8253578 BattlePyramid_TwoItemsRemaining_Text2:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2535D4:: @ 82535D4 BattlePyramid_OneItemRemaining_Text2:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25362E:: @ 825362E BattlePyramid_ZeroItemsRemaining_Text2:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25368B:: @ 825368B BattlePyramid_EightItemsRemaining_Text3:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2536F8:: @ 82536F8 BattlePyramid_SevenItemsRemaining_Text3:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253765:: @ 8253765 BattlePyramid_SixItemsRemaining_Text3:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2537D0:: @ 82537D0 BattlePyramid_FiveItemsRemaining_Text3:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25383C:: @ 825383C BattlePyramid_FourItemsRemaining_Text3:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2538A8:: @ 82538A8 BattlePyramid_ThreeItemsRemaining_Text3:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253915:: @ 8253915 BattlePyramid_TwoItemsRemaining_Text3:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253980:: @ 8253980 BattlePyramid_OneItemRemaining_Text3:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2539EC:: @ 82539EC BattlePyramid_ZeroItemsRemaining_Text3:: @ 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!$"
BattleFrontier_BattlePyramidEmptySquare_Text_253A69:: @ 8253A69 BattlePyramid_EightItemsRemaining_Text4:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253AC4:: @ 8253AC4 BattlePyramid_SevenItemsRemaining_Text4:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253B1F:: @ 8253B1F BattlePyramid_SixItemsRemaining_Text4:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253B78:: @ 8253B78 BattlePyramid_FiveItemsRemaining_Text4:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253BD2:: @ 8253BD2 BattlePyramid_FourItemsRemaining_Text4:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253C2C:: @ 8253C2C BattlePyramid_ThreeItemsRemaining_Text4:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253C87:: @ 8253C87 BattlePyramid_TwoItemsRemaining_Text4:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253CE0:: @ 8253CE0 BattlePyramid_OneItemRemaining_Text4:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253D3E:: @ 8253D3E BattlePyramid_ZeroItemsRemaining_Text4:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253D96:: @ 8253D96 BattlePyramid_EightItemsRemaining_Text5:: @ 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…$"
BattleFrontier_BattlePyramidEmptySquare_Text_253DD2:: @ 8253DD2 BattlePyramid_SevenItemsRemaining_Text5:: @ 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…$"
BattleFrontier_BattlePyramidEmptySquare_Text_253E0E:: @ 8253E0E BattlePyramid_SixItemsRemaining_Text5:: @ 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…$"
BattleFrontier_BattlePyramidEmptySquare_Text_253E48:: @ 8253E48 BattlePyramid_FiveItemsRemaining_Text5:: @ 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…$"
BattleFrontier_BattlePyramidEmptySquare_Text_253E83:: @ 8253E83 BattlePyramid_FourItemsRemaining_Text5:: @ 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…$"
BattleFrontier_BattlePyramidEmptySquare_Text_253EBE:: @ 8253EBE BattlePyramid_ThreeItemsRemaining_Text5:: @ 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…$"
BattleFrontier_BattlePyramidEmptySquare_Text_253EFA:: @ 8253EFA BattlePyramid_TwoItemsRemaining_Text5:: @ 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…$"
BattleFrontier_BattlePyramidEmptySquare_Text_253F34:: @ 8253F34 BattlePyramid_OneItemRemaining_Text5:: @ 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…$"
BattleFrontier_BattlePyramidEmptySquare_Text_253F6C:: @ 8253F6C BattlePyramid_ZeroItemsRemaining_Text5:: @ 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…$"
BattleFrontier_BattlePyramidEmptySquare_Text_253FA5:: @ 8253FA5 BattlePyramid_EightItemsRemaining_Text6:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_253FF7:: @ 8253FF7 BattlePyramid_SevenItemsRemaining_Text6:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254049:: @ 8254049 BattlePyramid_SixItemsRemaining_Text6:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254099:: @ 8254099 BattlePyramid_FiveItemsRemaining_Text6:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2540EA:: @ 82540EA BattlePyramid_FourItemsRemaining_Text6:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25413B:: @ 825413B BattlePyramid_ThreeItemsRemaining_Text6:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25418D:: @ 825418D BattlePyramid_TwoItemsRemaining_Text6:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_2541DD:: @ 82541DD BattlePyramid_OneItemRemaining_Text6:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25422B:: @ 825422B BattlePyramid_ZeroItemsRemaining_Text6:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_25427A:: @ 825427A BattlePyramid_SevenTrainersRemaining_Text1:: @ 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!$"
BattleFrontier_BattlePyramidEmptySquare_Text_2542CB:: @ 82542CB BattlePyramid_SixTrainersRemaining_Text1:: @ 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!$"
BattleFrontier_BattlePyramidEmptySquare_Text_25431A:: @ 825431A BattlePyramid_FiveTrainersRemaining_Text1:: @ 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!$"
BattleFrontier_BattlePyramidEmptySquare_Text_25436A:: @ 825436A BattlePyramid_FourTrainersRemaining_Text1:: @ 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!$"
BattleFrontier_BattlePyramidEmptySquare_Text_2543BA:: @ 82543BA BattlePyramid_ThreeTrainersRemaining_Text1:: @ 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!$"
BattleFrontier_BattlePyramidEmptySquare_Text_25440B:: @ 825440B BattlePyramid_TwoTrainersRemaining_Text1:: @ 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!$"
BattleFrontier_BattlePyramidEmptySquare_Text_25445A:: @ 825445A BattlePyramid_OneTrainersRemaining_Text1:: @ 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!$"
BattleFrontier_BattlePyramidEmptySquare_Text_2544A6:: @ 82544A6 BattlePyramid_ZeroTrainersRemaining_Text1:: @ 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!$"
BattleFrontier_BattlePyramidEmptySquare_Text_2544E6:: @ 82544E6 BattlePyramid_SevenTrainersRemaining_Text2:: @ 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!$"
BattleFrontier_BattlePyramidEmptySquare_Text_254538:: @ 8254538 BattlePyramid_SixTrainersRemaining_Text2:: @ 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!$"
BattleFrontier_BattlePyramidEmptySquare_Text_254588:: @ 8254588 BattlePyramid_FiveTrainersRemaining_Text2:: @ 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!$"
BattleFrontier_BattlePyramidEmptySquare_Text_2545D9:: @ 82545D9 BattlePyramid_FourTrainersRemaining_Text2:: @ 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!$"
BattleFrontier_BattlePyramidEmptySquare_Text_25462A:: @ 825462A BattlePyramid_ThreeTrainersRemaining_Text2:: @ 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!$"
BattleFrontier_BattlePyramidEmptySquare_Text_25467C:: @ 825467C BattlePyramid_TwoTrainersRemaining_Text2:: @ 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!$"
BattleFrontier_BattlePyramidEmptySquare_Text_2546CC:: @ 82546CC BattlePyramid_OneTrainersRemaining_Text2:: @ 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!$"
BattleFrontier_BattlePyramidEmptySquare_Text_25471E:: @ 825471E BattlePyramid_ZeroTrainersRemaining_Text2:: @ 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!$"
BattleFrontier_BattlePyramidEmptySquare_Text_254767:: @ 8254767 BattlePyramid_SevenTrainersRemaining_Text3:: @ 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?$"
BattleFrontier_BattlePyramidEmptySquare_Text_2547C9:: @ 82547C9 BattlePyramid_SixTrainersRemaining_Text3:: @ 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?$"
BattleFrontier_BattlePyramidEmptySquare_Text_254829:: @ 8254829 BattlePyramid_FiveTrainersRemaining_Text3:: @ 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?$"
BattleFrontier_BattlePyramidEmptySquare_Text_25488A:: @ 825488A BattlePyramid_FourTrainersRemaining_Text3:: @ 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?$"
BattleFrontier_BattlePyramidEmptySquare_Text_2548EB:: @ 82548EB BattlePyramid_ThreeTrainersRemaining_Text3:: @ 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?$"
BattleFrontier_BattlePyramidEmptySquare_Text_25494D:: @ 825494D BattlePyramid_TwoTrainersRemaining_Text3:: @ 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?$"
BattleFrontier_BattlePyramidEmptySquare_Text_2549AE:: @ 82549AE BattlePyramid_OneTrainersRemaining_Text3:: @ 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?$"
BattleFrontier_BattlePyramidEmptySquare_Text_254A0B:: @ 8254A0B BattlePyramid_ZeroTrainersRemaining_Text3:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254A59:: @ 8254A59 BattlePyramid_SevenTrainersRemaining_Text4:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254A9E:: @ 8254A9E BattlePyramid_SixTrainersRemaining_Text4:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254AE1:: @ 8254AE1 BattlePyramid_FiveTrainersRemaining_Text4:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254B25:: @ 8254B25 BattlePyramid_FourTrainersRemaining_Text4:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254B69:: @ 8254B69 BattlePyramid_ThreeTrainersRemaining_Text4:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254BAE:: @ 8254BAE BattlePyramid_TwoTrainersRemaining_Text4:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254BF1:: @ 8254BF1 BattlePyramid_OneTrainersRemaining_Text4:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254C3E:: @ 8254C3E BattlePyramid_ZeroTrainersRemaining_Text4:: @ 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…$"
BattleFrontier_BattlePyramidEmptySquare_Text_254C77:: @ 8254C77 BattlePyramid_SevenTrainersRemaining_Text5:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254CC0:: @ 8254CC0 BattlePyramid_SixTrainersRemaining_Text5:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254D07:: @ 8254D07 BattlePyramid_FiveTrainersRemaining_Text5:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254D4F:: @ 8254D4F BattlePyramid_FourTrainersRemaining_Text5:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254D97:: @ 8254D97 BattlePyramid_ThreeTrainersRemaining_Text5:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254DE0:: @ 8254DE0 BattlePyramid_TwoTrainersRemaining_Text5:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254E27:: @ 8254E27 BattlePyramid_OneTrainersRemaining_Text5:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254E6E:: @ 8254E6E BattlePyramid_ZeroTrainersRemaining_Text5:: @ 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.$"
BattleFrontier_BattlePyramidEmptySquare_Text_254ED3:: @ 8254ED3 BattlePyramid_SevenTrainersRemaining_Text6:: @ 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?$"
BattleFrontier_BattlePyramidEmptySquare_Text_254F0E:: @ 8254F0E BattlePyramid_SixTrainersRemaining_Text6:: @ 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?$"
BattleFrontier_BattlePyramidEmptySquare_Text_254F47:: @ 8254F47 BattlePyramid_FiveTrainersRemaining_Text6:: @ 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?$"
BattleFrontier_BattlePyramidEmptySquare_Text_254F81:: @ 8254F81 BattlePyramid_FourTrainersRemaining_Text6:: @ 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?$"
BattleFrontier_BattlePyramidEmptySquare_Text_254FBB:: @ 8254FBB BattlePyramid_ThreeTrainersRemaining_Text6:: @ 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?$"
BattleFrontier_BattlePyramidEmptySquare_Text_254FF6:: @ 8254FF6 BattlePyramid_TwoTrainersRemaining_Text6:: @ 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?$"
BattleFrontier_BattlePyramidEmptySquare_Text_25502F:: @ 825502F BattlePyramid_OneTrainersRemaining_Text6:: @ 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?$"
BattleFrontier_BattlePyramidEmptySquare_Text_255068:: @ 8255068 BattlePyramid_ZeroTrainersRemaining_Text6:: @ 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…$"
include/battle_pyramid.h
+2 -2
View File
@@ -15,10 +15,10 @@ void CopyPyramidTrainerSpeechBefore(u16 trainerId);
void CopyPyramidTrainerWinSpeech(u16 trainerId); void CopyPyramidTrainerWinSpeech(u16 trainerId);
void CopyPyramidTrainerLoseSpeech(u16 trainerId); void CopyPyramidTrainerLoseSpeech(u16 trainerId);
u8 GetTrainerEncounterMusicIdInBattlePyramind(u16 trainerId); u8 GetTrainerEncounterMusicIdInBattlePyramind(u16 trainerId);
void sub_81AA078(u16 *mapArg, u8 arg1); void GenerateBattlePyramidFloorLayout(u16 *mapArg, bool8 setPlayerPosition);
void sub_81AA1D8(void); void sub_81AA1D8(void);
void sub_81AA2F8(void); void sub_81AA2F8(void);
u8 sub_81AAA40(void); u8 GetNumBattlePyramidEventObjects(void);
u16 GetBattlePyramidPickupItemId(void); u16 GetBattlePyramidPickupItemId(void);
#endif // GUARD_BATTLE_PYRAMID_H #endif // GUARD_BATTLE_PYRAMID_H
include/battle_pyramid_bag.h
+1 -1
View File
@@ -34,7 +34,7 @@ struct PyramidBagCursorData
extern struct PyramidBagResources *gPyramidBagResources; extern struct PyramidBagResources *gPyramidBagResources;
extern struct PyramidBagCursorData gPyramidBagCursorData; extern struct PyramidBagCursorData gPyramidBagCursorData;
void sub_81C4EEC(void); void InitBattlePyramidBagCursorPosition(void);
void CB2_PyramidBagMenuFromStartMenu(void); void CB2_PyramidBagMenuFromStartMenu(void);
void sub_81C4F84(void); void sub_81C4F84(void);
void sub_81C5924(void); void sub_81C5924(void);
include/field_screen_effect.h
+1 -1
View File
@@ -34,7 +34,7 @@ void sub_80AF948(void);
void sub_80AF9F8(void); void sub_80AF9F8(void);
void sub_80AFC60(void); void sub_80AFC60(void);
void sub_80B009C(u8 flashLevel); void sub_80B009C(u8 flashLevel);
void door_upload_tiles(void); void WriteBattlePyramidViewScanlineEffectBuffer(void);
void sub_80B0244(void); void sub_80B0244(void);
void sub_80B0268(void); void sub_80B0268(void);
void sub_80B0534(void); void sub_80B0534(void);
include/fieldmap.h
+1 -1
View File
@@ -32,7 +32,7 @@ void sub_8088B3C(u16 x, u16 y);
void InitMap(void); void InitMap(void);
void InitMapFromSavedGame(void); void InitMapFromSavedGame(void);
void InitTrainerHillMap(void); void InitTrainerHillMap(void);
void InitBattlePyramidMap(u8 a0); void InitBattlePyramidMap(bool8 setPlayerPosition);
void SpriteCB_PokeballGlow(struct Sprite *); void SpriteCB_PokeballGlow(struct Sprite *);
void SpriteCB_PokecenterMonitor(struct Sprite *); void SpriteCB_PokecenterMonitor(struct Sprite *);
include/global.h
+4 -4
View File
@@ -360,13 +360,13 @@ struct BattleFrontier
/*0xE10*/ u8 field_E10_2:4; /*0xE10*/ u8 field_E10_2:4;
/*0xE10*/ u8 field_E10_3:1; /*0xE10*/ u8 field_E10_3:1;
/*0xE12*/ u16 field_E12[3]; /*0xE12*/ u16 field_E12[3];
/*0xE18*/ u16 field_E18; /*0xE18*/ u16 pyramidRewardItem;
/*0xE1A*/ u16 pyramidWinStreaks[2]; /*0xE1A*/ u16 pyramidWinStreaks[2];
/*0xE1E*/ u16 pyramidRecordStreaks[2]; /*0xE1E*/ u16 pyramidRecordStreaks[2];
/*0xE22*/ u16 field_E22[4]; /*0xE22*/ u16 pyramidRandoms[4];
/*0xE2A*/ u8 field_E2A; /*0xE2A*/ u8 pyramidTrainerFlags;
/*0xE2C*/ struct PyramidBag pyramidBag; /*0xE2C*/ struct PyramidBag pyramidBag;
/*0xE68*/ u8 field_E68; /*0xE68*/ u8 pyramidLightRadius;
/*0xE6A*/ u16 field_E6A; /*0xE6A*/ u16 field_E6A;
/*0xE6C*/ u16 field_E6C; /*0xE6C*/ u16 field_E6C;
/*0xE6E*/ u16 field_E6E; /*0xE6E*/ u16 field_E6E;
include/rom_818CFC8.h
+1 -1
View File
@@ -6,6 +6,6 @@
#define GUARD_ROM_818CFC8_H #define GUARD_ROM_818CFC8_H
bool8 InBattlePyramid(void); bool8 InBattlePyramid(void);
u8 sub_81AAA40(void); u8 GetNumBattlePyramidEventObjects(void);
#endif //GUARD_ROM_818CFC8_H #endif //GUARD_ROM_818CFC8_H
include/strings.h
+126 -126
View File
@@ -1688,132 +1688,132 @@ extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D[]; extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D[];
// Battle Pyramid. // Battle Pyramid.
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D2D[]; extern const u8 BattlePyramid_ExitHintUp_Text1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D57[]; extern const u8 BattlePyramid_ExitHintLeft_Text1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D81[]; extern const u8 BattlePyramid_ExitHintRight_Text1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252DAB[]; extern const u8 BattlePyramid_ExitHintDown_Text1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25330B[]; extern const u8 BattlePyramid_ZeroItemsRemaining_Text1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2532CC[]; extern const u8 BattlePyramid_OneItemRemaining_Text1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25328B[]; extern const u8 BattlePyramid_TwoItemsRemaining_Text1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253248[]; extern const u8 BattlePyramid_ThreeItemsRemaining_Text1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253206[]; extern const u8 BattlePyramid_FourItemsRemaining_Text1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2531C4[]; extern const u8 BattlePyramid_FiveItemsRemaining_Text1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253183[]; extern const u8 BattlePyramid_SixItemsRemaining_Text1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253140[]; extern const u8 BattlePyramid_SevenItemsRemaining_Text1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2530FD[]; extern const u8 BattlePyramid_EightItemsRemaining_Text1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2544A6[]; extern const u8 BattlePyramid_ZeroTrainersRemaining_Text1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25445A[]; extern const u8 BattlePyramid_OneTrainersRemaining_Text1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25440B[]; extern const u8 BattlePyramid_TwoTrainersRemaining_Text1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2543BA[]; extern const u8 BattlePyramid_ThreeTrainersRemaining_Text1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25436A[]; extern const u8 BattlePyramid_FourTrainersRemaining_Text1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25431A[]; extern const u8 BattlePyramid_FiveTrainersRemaining_Text1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2542CB[]; extern const u8 BattlePyramid_SixTrainersRemaining_Text1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25427A[]; extern const u8 BattlePyramid_SevenTrainersRemaining_Text1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252DD5[]; extern const u8 BattlePyramid_ExitHintUp_Text2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E03[]; extern const u8 BattlePyramid_ExitHintLeft_Text2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E31[]; extern const u8 BattlePyramid_ExitHintRight_Text2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E5F[]; extern const u8 BattlePyramid_ExitHintDown_Text2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25362E[]; extern const u8 BattlePyramid_ZeroItemsRemaining_Text2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2535D4[]; extern const u8 BattlePyramid_OneItemRemaining_Text2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253578[]; extern const u8 BattlePyramid_TwoItemsRemaining_Text2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25351A[]; extern const u8 BattlePyramid_ThreeItemsRemaining_Text2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2534BD[]; extern const u8 BattlePyramid_FourItemsRemaining_Text2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253460[]; extern const u8 BattlePyramid_FiveItemsRemaining_Text2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253404[]; extern const u8 BattlePyramid_SixItemsRemaining_Text2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2533A6[]; extern const u8 BattlePyramid_SevenItemsRemaining_Text2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25334D[]; extern const u8 BattlePyramid_EightItemsRemaining_Text2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25471E[]; extern const u8 BattlePyramid_ZeroTrainersRemaining_Text2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2546CC[]; extern const u8 BattlePyramid_OneTrainersRemaining_Text2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25467C[]; extern const u8 BattlePyramid_TwoTrainersRemaining_Text2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25462A[]; extern const u8 BattlePyramid_ThreeTrainersRemaining_Text2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2545D9[]; extern const u8 BattlePyramid_FourTrainersRemaining_Text2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254588[]; extern const u8 BattlePyramid_FiveTrainersRemaining_Text2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254538[]; extern const u8 BattlePyramid_SixTrainersRemaining_Text2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2544E6[]; extern const u8 BattlePyramid_SevenTrainersRemaining_Text2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E8D[]; extern const u8 BattlePyramid_ExitHintUp_Text3[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252EAA[]; extern const u8 BattlePyramid_ExitHintLeft_Text3[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252EC7[]; extern const u8 BattlePyramid_ExitHintRight_Text3[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252EE4[]; extern const u8 BattlePyramid_ExitHintDown_Text3[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2539EC[]; extern const u8 BattlePyramid_ZeroItemsRemaining_Text3[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253980[]; extern const u8 BattlePyramid_OneItemRemaining_Text3[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253915[]; extern const u8 BattlePyramid_TwoItemsRemaining_Text3[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2538A8[]; extern const u8 BattlePyramid_ThreeItemsRemaining_Text3[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25383C[]; extern const u8 BattlePyramid_FourItemsRemaining_Text3[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2537D0[]; extern const u8 BattlePyramid_FiveItemsRemaining_Text3[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253765[]; extern const u8 BattlePyramid_SixItemsRemaining_Text3[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2536F8[]; extern const u8 BattlePyramid_SevenItemsRemaining_Text3[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25368B[]; extern const u8 BattlePyramid_EightItemsRemaining_Text3[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254A0B[]; extern const u8 BattlePyramid_ZeroTrainersRemaining_Text3[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2549AE[]; extern const u8 BattlePyramid_OneTrainersRemaining_Text3[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25494D[]; extern const u8 BattlePyramid_TwoTrainersRemaining_Text3[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2548EB[]; extern const u8 BattlePyramid_ThreeTrainersRemaining_Text3[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25488A[]; extern const u8 BattlePyramid_FourTrainersRemaining_Text3[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254829[]; extern const u8 BattlePyramid_FiveTrainersRemaining_Text3[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2547C9[]; extern const u8 BattlePyramid_SixTrainersRemaining_Text3[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254767[]; extern const u8 BattlePyramid_SevenTrainersRemaining_Text3[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252F01[]; extern const u8 BattlePyramid_ExitHintUp_Text4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252F3A[]; extern const u8 BattlePyramid_ExitHintLeft_Text4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252F73[]; extern const u8 BattlePyramid_ExitHintRight_Text4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252FAC[]; extern const u8 BattlePyramid_ExitHintDown_Text4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253D3E[]; extern const u8 BattlePyramid_ZeroItemsRemaining_Text4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253CE0[]; extern const u8 BattlePyramid_OneItemRemaining_Text4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253C87[]; extern const u8 BattlePyramid_TwoItemsRemaining_Text4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253C2C[]; extern const u8 BattlePyramid_ThreeItemsRemaining_Text4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253BD2[]; extern const u8 BattlePyramid_FourItemsRemaining_Text4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253B78[]; extern const u8 BattlePyramid_FiveItemsRemaining_Text4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253B1F[]; extern const u8 BattlePyramid_SixItemsRemaining_Text4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253AC4[]; extern const u8 BattlePyramid_SevenItemsRemaining_Text4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253A69[]; extern const u8 BattlePyramid_EightItemsRemaining_Text4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254C3E[]; extern const u8 BattlePyramid_ZeroTrainersRemaining_Text4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254BF1[]; extern const u8 BattlePyramid_OneTrainersRemaining_Text4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254BAE[]; extern const u8 BattlePyramid_TwoTrainersRemaining_Text4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254B69[]; extern const u8 BattlePyramid_ThreeTrainersRemaining_Text4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254B25[]; extern const u8 BattlePyramid_FourTrainersRemaining_Text4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254AE1[]; extern const u8 BattlePyramid_FiveTrainersRemaining_Text4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254A9E[]; extern const u8 BattlePyramid_SixTrainersRemaining_Text4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254A59[]; extern const u8 BattlePyramid_SevenTrainersRemaining_Text4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252FE5[]; extern const u8 BattlePyramid_ExitHintUp_Text5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253000[]; extern const u8 BattlePyramid_ExitHintLeft_Text5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25301B[]; extern const u8 BattlePyramid_ExitHintRight_Text5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253036[]; extern const u8 BattlePyramid_ExitHintDown_Text5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253F6C[]; extern const u8 BattlePyramid_ZeroItemsRemaining_Text5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253F34[]; extern const u8 BattlePyramid_OneItemRemaining_Text5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253EFA[]; extern const u8 BattlePyramid_TwoItemsRemaining_Text5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253EBE[]; extern const u8 BattlePyramid_ThreeItemsRemaining_Text5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253E83[]; extern const u8 BattlePyramid_FourItemsRemaining_Text5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253E48[]; extern const u8 BattlePyramid_FiveItemsRemaining_Text5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253E0E[]; extern const u8 BattlePyramid_SixItemsRemaining_Text5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253DD2[]; extern const u8 BattlePyramid_SevenItemsRemaining_Text5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253D96[]; extern const u8 BattlePyramid_EightItemsRemaining_Text5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254E6E[]; extern const u8 BattlePyramid_ZeroTrainersRemaining_Text5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254E27[]; extern const u8 BattlePyramid_OneTrainersRemaining_Text5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254DE0[]; extern const u8 BattlePyramid_TwoTrainersRemaining_Text5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254D97[]; extern const u8 BattlePyramid_ThreeTrainersRemaining_Text5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254D4F[]; extern const u8 BattlePyramid_FourTrainersRemaining_Text5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254D07[]; extern const u8 BattlePyramid_FiveTrainersRemaining_Text5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254CC0[]; extern const u8 BattlePyramid_SixTrainersRemaining_Text5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254C77[]; extern const u8 BattlePyramid_SevenTrainersRemaining_Text5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253051[]; extern const u8 BattlePyramid_ExitHintUp_Text6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25307C[]; extern const u8 BattlePyramid_ExitHintLeft_Text6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2530A7[]; extern const u8 BattlePyramid_ExitHintRight_Text6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2530D2[]; extern const u8 BattlePyramid_ExitHintDown_Text6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25422B[]; extern const u8 BattlePyramid_ZeroItemsRemaining_Text6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2541DD[]; extern const u8 BattlePyramid_OneItemRemaining_Text6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25418D[]; extern const u8 BattlePyramid_TwoItemsRemaining_Text6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25413B[]; extern const u8 BattlePyramid_ThreeItemsRemaining_Text6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2540EA[]; extern const u8 BattlePyramid_FourItemsRemaining_Text6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254099[]; extern const u8 BattlePyramid_FiveItemsRemaining_Text6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254049[]; extern const u8 BattlePyramid_SixItemsRemaining_Text6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253FF7[]; extern const u8 BattlePyramid_SevenItemsRemaining_Text6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253FA5[]; extern const u8 BattlePyramid_EightItemsRemaining_Text6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_255068[]; extern const u8 BattlePyramid_ZeroTrainersRemaining_Text6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25502F[]; extern const u8 BattlePyramid_OneTrainersRemaining_Text6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254FF6[]; extern const u8 BattlePyramid_TwoTrainersRemaining_Text6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254FBB[]; extern const u8 BattlePyramid_ThreeTrainersRemaining_Text6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F81[]; extern const u8 BattlePyramid_FourTrainersRemaining_Text6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F47[]; extern const u8 BattlePyramid_FiveTrainersRemaining_Text6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F0E[]; extern const u8 BattlePyramid_SixTrainersRemaining_Text6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254ED3[]; extern const u8 BattlePyramid_SevenTrainersRemaining_Text6[];
// PC strings // PC strings
extern const u8 gText_ExitFromBox[]; extern const u8 gText_ExitFromBox[];
src/battle_pyramid.c
+820 -774
View File
File diff suppressed because it is too large Load Diff
src/battle_pyramid_bag.c
+1 -1
View File
@@ -338,7 +338,7 @@ static const struct SpriteTemplate gUnknown_0861F3D4 =
}; };
// code // code
void sub_81C4EEC(void) void InitBattlePyramidBagCursorPosition(void)
{ {
gPyramidBagCursorData.cursorPosition = 0; gPyramidBagCursorData.cursorPosition = 0;
gPyramidBagCursorData.scrollPosition = 0; gPyramidBagCursorData.scrollPosition = 0;
src/event_object_movement.c
+2 -2
View File
@@ -1420,7 +1420,7 @@ u8 Unref_TryInitLocalEventObject(u8 localId)
{ {
if (InBattlePyramid()) if (InBattlePyramid())
{ {
eventObjectCount = sub_81AAA40(); eventObjectCount = GetNumBattlePyramidEventObjects();
} }
else if (InTrainerHill()) else if (InTrainerHill())
{ {
@@ -1746,7 +1746,7 @@ void TrySpawnEventObjects(s16 cameraX, s16 cameraY)
if (InBattlePyramid()) if (InBattlePyramid())
{ {
objectCount = sub_81AAA40(); objectCount = GetNumBattlePyramidEventObjects();
} }
else if (InTrainerHill()) else if (InTrainerHill())
{ {
src/field_screen_effect.c
+2 -2
View File
@@ -1004,9 +1004,9 @@ void WriteFlashScanlineEffectBuffer(u8 flashLevel)
} }
} }
void door_upload_tiles(void) void WriteBattlePyramidViewScanlineEffectBuffer(void)
{ {
SetFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], 120, 80, gSaveBlock2Ptr->frontier.field_E68); SetFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], 120, 80, gSaveBlock2Ptr->frontier.pyramidLightRadius);
CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480);
} }
src/fieldmap.c
+3 -4
View File
@@ -1,4 +1,5 @@
#include "global.h" #include "global.h"
#include "battle_pyramid.h"
#include "bg.h" #include "bg.h"
#include "fieldmap.h" #include "fieldmap.h"
#include "fldeff.h" #include "fldeff.h"
@@ -15,8 +16,6 @@
#include "tv.h" #include "tv.h"
#include "constants/rgb.h" #include "constants/rgb.h"
extern void sub_81AA078(u16*, u8);
struct ConnectionFlags struct ConnectionFlags
{ {
u8 south:1; u8 south:1;
@@ -67,10 +66,10 @@ void InitMapFromSavedGame(void)
UpdateTVScreensOnMap(gBackupMapLayout.width, gBackupMapLayout.height); UpdateTVScreensOnMap(gBackupMapLayout.width, gBackupMapLayout.height);
} }
void InitBattlePyramidMap(u8 a0) void InitBattlePyramidMap(bool8 setPlayerPosition)
{ {
CpuFastFill(0x03ff03ff, gBackupMapData, sizeof(gBackupMapData)); CpuFastFill(0x03ff03ff, gBackupMapData, sizeof(gBackupMapData));
sub_81AA078(gBackupMapData, a0); GenerateBattlePyramidFloorLayout(gBackupMapData, setPlayerPosition);
} }
void InitTrainerHillMap(void) void InitTrainerHillMap(void)
src/overworld.c
+3 -5
View File
@@ -110,7 +110,6 @@ extern void ShowMapNamePopup(void);
extern bool32 sub_808651C(void); extern bool32 sub_808651C(void);
extern bool8 sub_80AF6A4(void); extern bool8 sub_80AF6A4(void);
extern bool8 sub_80E909C(void); extern bool8 sub_80E909C(void);
extern void sub_81AA1D8(void);
extern void c2_change_map(void); extern void c2_change_map(void);
extern void sub_81D5DF8(void); extern void sub_81D5DF8(void);
extern void sub_80EB218(void); extern void sub_80EB218(void);
@@ -119,7 +118,6 @@ extern void sub_808B578(void);
extern void sub_80AF314(void); extern void sub_80AF314(void);
extern void sub_80AF214(void); extern void sub_80AF214(void);
extern void sub_80AF188(void); extern void sub_80AF188(void);
extern void door_upload_tiles(void);
extern void RotatingGate_InitPuzzleAndGraphics(void); extern void RotatingGate_InitPuzzleAndGraphics(void);
extern void sub_80AF168(void); extern void sub_80AF168(void);
extern void sub_80AF3C8(void); extern void sub_80AF3C8(void);
@@ -916,7 +914,7 @@ static void mli0_load_map(u32 a1)
UpdateLocationHistoryForRoamer(); UpdateLocationHistoryForRoamer();
RoamerMoveToOtherLocationSet(); RoamerMoveToOtherLocationSet();
if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
InitBattlePyramidMap(0); InitBattlePyramidMap(FALSE);
else if (InTrainerHill()) else if (InTrainerHill())
InitTrainerHillMap(); InitTrainerHillMap();
else else
@@ -1765,7 +1763,7 @@ void CB2_ContinueSavedGame(void)
DoTimeBasedEvents(); DoTimeBasedEvents();
sub_8084788(); sub_8084788();
if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
InitBattlePyramidMap(1); InitBattlePyramidMap(TRUE);
else if (trainerHillMapId != 0) else if (trainerHillMapId != 0)
InitTrainerHillMap(); InitTrainerHillMap();
else else
@@ -1836,7 +1834,7 @@ static void InitCurrentFlashLevelScanlineEffect(void)
if (InBattlePyramid_()) if (InBattlePyramid_())
{ {
door_upload_tiles(); WriteBattlePyramidViewScanlineEffectBuffer();
ScanlineEffect_SetParams(sFlashEffectParams); ScanlineEffect_SetParams(sFlashEffectParams);
} }
else if ((flashLevel = Overworld_GetFlashLevel())) else if ((flashLevel = Overworld_GetFlashLevel()))
src/start_menu.c
+1 -1
View File
@@ -751,7 +751,7 @@ static bool8 StartMenuBattlePyramidRetireCallback(void)
return FALSE; return FALSE;
} }
void sub_809FDD4(void) // Called from battle_frontier_2.s void sub_809FDD4(void)
{ {
sub_8197DF8(0, FALSE); sub_8197DF8(0, FALSE);
ScriptUnfreezeEventObjects(); ScriptUnfreezeEventObjects();