Merge pull request #1746 from mrgriffin/ui-standardize

pokeemerald.sym

@@ -831,11 +831,11 @@
 030011f6 l 00000001 sVarsInitialized
 030011f7 l 00000001 sWindowId
 030011f8 l 00000002 sStarterLabelWindowId
-030011fc l 00000002 x.48
-030011fe l 00000002 y.49
-03001200 l 00000002 i.50
-03001202 l 00000002 mapSecId.51
-03001204 l 00000002 numSprites.52
+030011fc l 00000002 x.54
+030011fe l 00000002 y.55
+03001200 l 00000002 i.56
+03001202 l 00000002 mapSecId.57
+03001204 l 00000002 numSprites.58
 03001208 l 00000002 sDebug_RectangularSpiralData
 0300120a l 00000001 sTestingTransitionId
 0300120b l 00000001 sTestingTransitionState
@@ -7554,7 +7554,7 @@
 080baf0c l 000000c0 FrameType_DrawChoices
 080bafcc l 0000005c ButtonMode_ProcessInput
 080bb028 l 000000a8 ButtonMode_DrawChoices
-080bb0d0 l 00000034 DrawTextOption
+080bb0d0 l 00000034 DrawHeaderText
 080bb104 l 00000050 DrawOptionMenuTexts
 080bb154 l 0000017c DrawBgWindowFrames
 080bb2d0 g 00000088 ResetPokedex
@@ -37637,7 +37637,7 @@
 082fb2d4 l 00000004 sAnims_Cloud
 082fb308 l 0000000a sUnusedSounds
 082fb31c l 00000008 sBerryIconXCoords
-082fb354 l 00000000 moveDelays.372
+082fb354 l 00000000 moveDelays.378
 082fb356 l 00000008 sCloudStartCoords
 082fb380 l 0000000c sTextColorTable
 082fb38c l 00000004 sNameWindowCoords_1Player
@@ -45395,14 +45395,14 @@
 0850e5c4 g 00000008 gMovementActionFuncs_Levitate
 0850e5cc g 00000008 gMovementActionFuncs_StopLevitate
 0850e5d4 g 00000008 gMovementActionFuncs_StopLevitateAtTop
-0850e5e4 l 00000000 metatileFuncs.2250
-0850e5fc l 00000000 jumpLandingFlags.2251
-0850e614 l 00000010 ledgeBehaviorFuncs.2261
+0850e5e4 l 00000000 metatileFuncs.2256
+0850e5fc l 00000000 jumpLandingFlags.2257
+0850e614 l 00000010 ledgeBehaviorFuncs.2267
 0850e624 l 00000010 sElevationToSubpriority
 0850e634 l 00000010 sElevationToPriority
 0850e644 l 00000010 sElevationToSubspriteTableNum
 0850e654 l 0000000c sGroundEffectTracksFuncs
-0850e664 l 00000010 bikeTireTracks_Transitions.2325
+0850e664 l 00000010 bikeTireTracks_Transitions.2331
 0850e674 l 00000050 sGroundEffectFuncs
 0850e6c4 l 00000040 sStep1Funcs
 0850e704 l 00000020 sStep2Funcs
@@ -48562,13 +48562,13 @@
 0856fb20 l 00000006 sTrainerPicFacilityClass
 0856fb28 l 00000018 sTrainerCardFlipTasks
 0856fb40 l 00000008 sTimeColonTextColors
-0856fb48 l 00000000 yOffsetsLine1.96
-0856fb4a l 00000000 yOffsetsLine2.97
+0856fb48 l 00000000 yOffsetsLine1.102
+0856fb4a l 00000000 yOffsetsLine2.103
 0856fb4c l 00000009 sText_HofTime
-0856fb55 l 00000000 xOffsets.110
-0856fb57 l 00000000 widths.111
+0856fb55 l 00000000 xOffsets.116
+0856fb57 l 00000000 widths.117
 0856fb5c l 0000000c sLinkBattleTexts
-0856fb78 l 00000000 yOffsets.184
+0856fb78 l 00000000 yOffsets.190
 0856fb7c l 00000020 sMaleHead_Pal
 0856fb9c l 00000020 sFemaleHead_Pal
 0856fbbc l 00000fec sMapScreen_Gfx
@@ -48798,18 +48798,18 @@
 0857b0f8 l 00000020 sHandCursor_Pal
 0857b118 l 00000800 sHandCursor_Gfx
 0857b918 l 00000080 sHandCursorShadow_Gfx
-0857b998 l 0000000c placeChangeFuncs.570
+0857b998 l 0000000c placeChangeFuncs.576
 0857b9a4 l 00000018 sRestrictedReleaseMoves
-0857b9bc l 00000000 inputFuncs.718
-0857ba0c l 00000008 sOamData_Cursor.737
-0857ba14 l 00000008 sOamData_CursorShadow.738
-0857ba1c l 00000000 sAnim_Cursor_Bouncing.739
-0857ba28 l 00000000 sAnim_Cursor_Still.740
-0857ba30 l 00000000 sAnim_Cursor_Open.741
-0857ba38 l 00000000 sAnim_Cursor_Fist.742
-0857ba40 l 00000000 sAnims_Cursor.743
-0857ba50 l 00000018 sSpriteTemplate_Cursor.744
-0857ba68 l 00000018 sSpriteTemplate_CursorShadow.745
+0857b9bc l 00000000 inputFuncs.724
+0857ba0c l 00000008 sOamData_Cursor.743
+0857ba14 l 00000008 sOamData_CursorShadow.744
+0857ba1c l 00000000 sAnim_Cursor_Bouncing.745
+0857ba28 l 00000000 sAnim_Cursor_Still.746
+0857ba30 l 00000000 sAnim_Cursor_Open.747
+0857ba38 l 00000000 sAnim_Cursor_Fist.748
+0857ba40 l 00000000 sAnims_Cursor.749
+0857ba50 l 00000018 sSpriteTemplate_Cursor.750
+0857ba68 l 00000018 sSpriteTemplate_CursorShadow.751
 0857ba80 l 0000009c sMenuTexts
 0857bb1c l 00000008 sWindowTemplate_MultiMove
 0857bb24 l 00000080 sItemInfoFrame_Gfx
@@ -49633,7 +49633,7 @@
 0858d8c8 l 00000018 sSpriteTemplate_WirelessIndicatorWindow
 0858d8e0 l 00000008 sSpriteSheet_WirelessIndicatorWindow
 0858d8e8 l 00000004 sContestLinkTextColors
-0858d8ec l 00000004 sContestantLocalIds.288
+0858d8ec l 00000004 sContestantLocalIds.294
 0858d8f0 l 00000080 sBigMonSizeTable
 0858d970 l 00000007 sGiftRibbonsMonDataIds
 0858d978 l 00000280 sSecretPowerCave_Gfx
@@ -52721,50 +52721,50 @@
 085b2b68 l 00000010 sMauvilleGymSwitchCoords
 085b2b78 l 00000005 sSlidingDoorNextFrameDelay
 085b2b7e l 0000000a sPetalburgGymSlidingDoorMetatiles
-085b2b88 l 0000000c sSlotMachineRandomSeeds.198
-085b2b94 l 0000000c sSlotMachineIds.199
-085b2ba0 l 0000000c sSlotMachineServiceDayIds.200
+085b2b88 l 0000000c sSlotMachineRandomSeeds.204
+085b2b94 l 0000000c sSlotMachineIds.205
+085b2ba0 l 0000000c sSlotMachineServiceDayIds.206
 085b2bac g 00000008 gElevatorFloor_WindowTemplate
 085b2bb4 g 00000040 gDeptStoreFloorNames
 085b2bf4 l 00000012 sElevatorWindowTiles_Ascending
 085b2c06 l 00000012 sElevatorWindowTiles_Descending
-085b2c18 l 00000000 sElevatorTripLength.303
-085b2c21 l 00000000 sElevatorLightCycles.316
-085b2c2a l 00000000 sPokemonCenters.326
-085b2c50 l 00000000 sFrontierManiacMessages.336
-085b2cc8 l 00000000 sFrontierManiacStreakThresholds.337
-085b2cdc l 00000000 sBattleTowerStreakThresholds.341
+085b2c18 l 00000000 sElevatorTripLength.309
+085b2c21 l 00000000 sElevatorLightCycles.322
+085b2c2a l 00000000 sPokemonCenters.332
+085b2c50 l 00000000 sFrontierManiacMessages.342
+085b2cc8 l 00000000 sFrontierManiacStreakThresholds.343
+085b2cdc l 00000000 sBattleTowerStreakThresholds.347
 085b2cf0 l 00000340 sScrollableMultichoiceOptions
-085b3030 l 00000010 sScrollableMultichoice_ScrollArrowsTemplate.372
-085b3040 l 00000064 sNatureGirlMessages.385
-085b30a4 l 00000000 sFrontierGamblerLookingMessages.392
-085b30d4 l 00000000 sFrontierGamblerGoMessages.396
-085b3104 l 00000000 sFrontierChallenges.400
-085b311c l 00000008 sBattlePoints_WindowTemplate.407
-085b3124 l 00000008 sFrontierExchangeCorner_ItemIconWindowTemplate.423
-085b312c l 00000000 sFrontierExchangeCorner_Decor1.430
-085b3142 l 00000000 sFrontierExchangeCorner_Decor2.431
-085b314e l 00000000 sFrontierExchangeCorner_Vitamins.432
-085b315c l 00000000 sFrontierExchangeCorner_HoldItems.433
-085b3170 l 00000000 sFrontierExchangeCorner_Decor1Descriptions.434
-085b319c l 00000000 sFrontierExchangeCorner_Decor2Descriptions.435
-085b31b4 l 00000000 sFrontierExchangeCorner_VitaminsDescriptions.436
-085b31d0 l 00000000 sFrontierExchangeCorner_HoldItemsDescriptions.437
+085b3030 l 00000010 sScrollableMultichoice_ScrollArrowsTemplate.378
+085b3040 l 00000064 sNatureGirlMessages.391
+085b30a4 l 00000000 sFrontierGamblerLookingMessages.398
+085b30d4 l 00000000 sFrontierGamblerGoMessages.402
+085b3104 l 00000000 sFrontierChallenges.406
+085b311c l 00000008 sBattlePoints_WindowTemplate.413
+085b3124 l 00000008 sFrontierExchangeCorner_ItemIconWindowTemplate.429
+085b312c l 00000000 sFrontierExchangeCorner_Decor1.436
+085b3142 l 00000000 sFrontierExchangeCorner_Decor2.437
+085b314e l 00000000 sFrontierExchangeCorner_Vitamins.438
+085b315c l 00000000 sFrontierExchangeCorner_HoldItems.439
+085b3170 l 00000000 sFrontierExchangeCorner_Decor1Descriptions.440
+085b319c l 00000000 sFrontierExchangeCorner_Decor2Descriptions.441
+085b31b4 l 00000000 sFrontierExchangeCorner_VitaminsDescriptions.442
+085b31d0 l 00000000 sFrontierExchangeCorner_HoldItemsDescriptions.443
 085b31f8 l 00000014 sBattleFrontier_TutorMoves1
 085b320c l 00000014 sBattleFrontier_TutorMoves2
-085b3220 l 00000008 sBattleFrontierTutor_WindowTemplate.450
-085b3228 l 00000000 sBattleFrontier_TutorMoveDescriptions1.454
-085b3254 l 00000000 sBattleFrontier_TutorMoveDescriptions2.455
+085b3220 l 00000008 sBattleFrontierTutor_WindowTemplate.456
+085b3228 l 00000000 sBattleFrontier_TutorMoveDescriptions1.460
+085b3254 l 00000000 sBattleFrontier_TutorMoveDescriptions2.461
 085b3280 l 00000160 sDeoxysRockPalettes
 085b33e0 l 00000016 sDeoxysRockCoords
-085b33f6 l 00000000 sStoneMaxStepCounts.474
-085b3400 l 00000000 sAbnormalWeatherMapNumbers.505
-085b3410 l 00000000 sAbnormalWeatherMapNumbers.509
-085b3420 l 00000000 sPokeMarts.516
-085b3444 l 00000000 sPokemonCenters.556
-085b3470 l 00000000 sCounterIncrements.569
-085b3474 l 00000008 sFanClubMemberIds.573
-085b347c l 00000008 sFanClubMemberIds.577
+085b33f6 l 00000000 sStoneMaxStepCounts.480
+085b3400 l 00000000 sAbnormalWeatherMapNumbers.511
+085b3410 l 00000000 sAbnormalWeatherMapNumbers.515
+085b3420 l 00000000 sPokeMarts.522
+085b3444 l 00000000 sPokemonCenters.562
+085b3470 l 00000000 sCounterIncrements.575
+085b3474 l 00000008 sFanClubMemberIds.579
+085b347c l 00000008 sFanClubMemberIds.583
 085b3484 l 000000c0 sTrainerHillWindowTileset
 085b3544 l 00000020 sTrainerHillWindowPalette
 085b3564 l 00000800 sTrainerHillWindowTilemap
@@ -57025,7 +57025,7 @@
 0860ae1c l 00000038 sShakeYellowFlashData_Normal
 0860ae54 l 00000028 sShakeYellowFlashData_Slow
 0860ae7c l 0000000c sShakeYellowFlashData
-0860ae88 l 00000000 sColors.687
+0860ae88 l 00000000 sColors.693
 0860ae90 l 000000e4 sRecordedOpponentBufferCommands
 0860af74 l 000000e4 sRecordedPlayerBufferCommands
 0860b058 l 0000000c sDummyPicData