Merge pull request #1678 from GriffinRichards/const-frontier

This commit is contained in:
GriffinRichards
2022-06-18 14:27:43 +00:00
parent e3c9d2a629
commit 2688122846
+17 -17
View File
@@ -854,7 +854,7 @@
0300128e l 00000001 sInWildMonRoom 0300128e l 00000001 sInWildMonRoom
03001290 l 00000004 sStatusFlags 03001290 l 00000004 sStatusFlags
03001294 l 00000001 sNpcId 03001294 l 00000001 sNpcId
03001298 l 00000002 sRandMonSetId 03001298 l 00000002 sRandMonId
0300129c l 00000006 MultiBoot_required_data 0300129c l 00000006 MultiBoot_required_data
030012a8 l 00000010 sDebug_DisintegrationData 030012a8 l 00000010 sDebug_DisintegrationData
030012b8 l 00000004 sBerryFix 030012b8 l 00000004 sBerryFix
@@ -30479,21 +30479,21 @@
0827f9fd g 00000000 BattleFrontier_BattleTowerLobby_Text_ThatsGreatLine 0827f9fd g 00000000 BattleFrontier_BattleTowerLobby_Text_ThatsGreatLine
0827fa6f g 00000000 BattleFrontier_BattleTowerLobby_Text_SilentType 0827fa6f g 00000000 BattleFrontier_BattleTowerLobby_Text_SilentType
0827faf3 g 00000000 BattleFrontier_BattleTowerLobby_Text_LookingForwardToNextBattle 0827faf3 g 00000000 BattleFrontier_BattleTowerLobby_Text_LookingForwardToNextBattle
0827fb20 g 00000000 gTVBravoTrainerBattleTowerText00 0827fb20 g 00000000 BravoTrainerBattleTower_Text_Intro
0827fbb3 g 00000000 gTVBravoTrainerBattleTowerText01 0827fbb3 g 00000000 BravoTrainerBattleTower_Text_NewRecord
0827fc04 g 00000000 gTVBravoTrainerBattleTowerText02 0827fc04 g 00000000 BravoTrainerBattleTower_Text_Lost
0827fcd1 g 00000000 gTVBravoTrainerBattleTowerText03 0827fcd1 g 00000000 BravoTrainerBattleTower_Text_Won
0827fd91 g 00000000 gTVBravoTrainerBattleTowerText04 0827fd91 g 00000000 BravoTrainerBattleTower_Text_LostFinal
0827fe93 g 00000000 gTVBravoTrainerBattleTowerText05 0827fe93 g 00000000 BravoTrainerBattleTower_Text_Satisfied
0827ff89 g 00000000 gTVBravoTrainerBattleTowerText06 0827ff89 g 00000000 BravoTrainerBattleTower_Text_Unsatisfied
0828009c g 00000000 gTVBravoTrainerBattleTowerText07 0828009c g 00000000 BravoTrainerBattleTower_Text_None1
082800a1 g 00000000 gTVBravoTrainerBattleTowerText08 082800a1 g 00000000 BravoTrainerBattleTower_Text_None2
082800a6 g 00000000 gTVBravoTrainerBattleTowerText09 082800a6 g 00000000 BravoTrainerBattleTower_Text_None3
082800ab g 00000000 gTVBravoTrainerBattleTowerText10 082800ab g 00000000 BravoTrainerBattleTower_Text_None4
082800b0 g 00000000 gTVBravoTrainerBattleTowerText11 082800b0 g 00000000 BravoTrainerBattleTower_Text_Response
082800b6 g 00000000 gTVBravoTrainerBattleTowerText12 082800b6 g 00000000 BravoTrainerBattleTower_Text_ResponseSatisfied
0828013d g 00000000 gTVBravoTrainerBattleTowerText13 0828013d g 00000000 BravoTrainerBattleTower_Text_ResponseUnsatisfied
082801e6 g 00000000 gTVBravoTrainerBattleTowerText14 082801e6 g 00000000 BravoTrainerBattleTower_Text_Outro
08280270 l 00000000 SlateportCity_PokemonFanClub_Text_InterviewRequestHasName 08280270 l 00000000 SlateportCity_PokemonFanClub_Text_InterviewRequestHasName
0828034f l 00000000 SlateportCity_PokemonFanClub_Text_HereGoesQuickAnswers 0828034f l 00000000 SlateportCity_PokemonFanClub_Text_HereGoesQuickAnswers
08280393 l 00000000 SlateportCity_PokemonFanClub_Text_DescribeFeelingsFirstMetMon 08280393 l 00000000 SlateportCity_PokemonFanClub_Text_DescribeFeelingsFirstMetMon
@@ -57430,7 +57430,7 @@
08613600 l 00000050 sOpenLevelWildMonPointers 08613600 l 00000050 sOpenLevelWildMonPointers
08613650 l 00000100 sPyramidFloorTemplates 08613650 l 00000100 sPyramidFloorTemplates
08613750 l 00000044 sPyramidFloorTemplateOptions 08613750 l 00000044 sPyramidFloorTemplateOptions
08613794 l 00000008 sFloorTemplateOffsets 08613794 l 00000007 sFloorTemplateOffsets
0861379c l 00000190 sPickupItemsLvl50 0861379c l 00000190 sPickupItemsLvl50
0861392c l 00000190 sPickupItemsLvlOpen 0861392c l 00000190 sPickupItemsLvlOpen
08613abc l 0000007e sPickupItemSlots 08613abc l 0000007e sPickupItemSlots