diff --git a/pokeblue.map b/pokeblue.map index 1d396b145..58d7920d2 100644 --- a/pokeblue.map +++ b/pokeblue.map @@ -2758,7 +2758,7 @@ ROMX bank #3: $4d7b = SeafoamIslandsB2FHS $4d81 = SeafoamIslandsB3FHS $4d8d = SeafoamIslandsB4FHS - $4d99 = PrintStrengthTxt + $4d99 = PrintStrengthText $4daa = UsedStrengthText $4dbb = CanMoveBouldersText $4dc0 = IsSurfingAllowed @@ -9364,7 +9364,7 @@ ROMX bank #19: $7f81 = EnterMapAnimPredef $7f84 = GetTileTwoStepsInFrontOfPlayerPredef $7f87 = CheckForCollisionWhenPushingBoulderPredef - $7f8a = PrintStrengthTxtPredef + $7f8a = PrintStrengthTextPredef $7f8d = PickUpItemPredef $7f90 = PrintMoveTypePredef $7f93 = LoadMovePPsPredef @@ -12354,8 +12354,8 @@ ROMX bank #26: $402f = Version_GFX $406f = Version_GFXEnd SECTION: $406f-$7fee ($3f80 bytes) ["Tilesets 2"] - $406f = Gym_GFX $406f = Dojo_GFX + $406f = Gym_GFX $466f = Dojo_Block $466f = Gym_Block $4daf = Mart_GFX @@ -15297,7 +15297,7 @@ ROMX bank #32: $6140 = _RocketHideoutB3FRocket1BattleText $6168 = _RocketHideoutB3FRocket1EndBattleText $617a = _RocketHideoutB3FRocket1AfterBattleText - $61b8 = _RocketHideout3BattleTxt + $61b8 = _RocketHideout3BattleText $61e9 = _RocketHideout3EndBattleText3 $61fc = _RocketHide3AfterBattleText3 $623e = _RocketHideoutB4FGiovanniImpressedYouGotHereText @@ -17760,8 +17760,8 @@ VRAM bank #0: $8800 = vFont $8800 = vChars1 $8800 = vNPCSprites2 - $9000 = vChars2 $9000 = vFrontPic + $9000 = vChars2 $9000 = vTileset $9310 = vBackPic $9310 = vTitleLogo2 @@ -17894,8 +17894,8 @@ WRAM0 bank #0: $c11a = wSprite01StateData1YAdjusted $c11b = wSprite01StateData1XAdjusted $c11c = wSprite01StateData1CollisionData - $c120 = wSprite02StateData1PictureID $c120 = wSprite01StateData1End + $c120 = wSprite02StateData1PictureID $c120 = wSprite02StateData1 $c121 = wSprite02StateData1MovementStatus $c122 = wSprite02StateData1ImageIndex @@ -17924,9 +17924,9 @@ WRAM0 bank #0: $c13a = wSprite03StateData1YAdjusted $c13b = wSprite03StateData1XAdjusted $c13c = wSprite03StateData1CollisionData + $c140 = wSprite04StateData1PictureID $c140 = wSprite03StateData1End $c140 = wSprite04StateData1 - $c140 = wSprite04StateData1PictureID $c141 = wSprite04StateData1MovementStatus $c142 = wSprite04StateData1ImageIndex $c143 = wSprite04StateData1YStepVector @@ -18222,9 +18222,9 @@ WRAM0 bank #0: $c289 = wSprite08StateData2OrigFacingDirection $c28d = wSprite08StateData2PictureID $c28e = wSprite08StateData2ImageBaseOffset + $c290 = wSprite09StateData2 $c290 = wSprite08StateData2End $c290 = wSprite09StateData2WalkAnimationCounter - $c290 = wSprite09StateData2 $c292 = wSprite09StateData2YDisplacement $c293 = wSprite09StateData2XDisplacement $c294 = wSprite09StateData2MapY @@ -18261,9 +18261,9 @@ WRAM0 bank #0: $c2b9 = wSprite11StateData2OrigFacingDirection $c2bd = wSprite11StateData2PictureID $c2be = wSprite11StateData2ImageBaseOffset + $c2c0 = wSprite12StateData2 $c2c0 = wSprite12StateData2WalkAnimationCounter $c2c0 = wSprite11StateData2End - $c2c0 = wSprite12StateData2 $c2c2 = wSprite12StateData2YDisplacement $c2c3 = wSprite12StateData2XDisplacement $c2c4 = wSprite12StateData2MapY @@ -18447,8 +18447,8 @@ WRAM0 bank #0: $c365 = wShadowOAMSprite25XCoord $c366 = wShadowOAMSprite25TileID $c367 = wShadowOAMSprite25Attributes - $c368 = wShadowOAMSprite26YCoord $c368 = wShadowOAMSprite26 + $c368 = wShadowOAMSprite26YCoord $c369 = wShadowOAMSprite26XCoord $c36a = wShadowOAMSprite26TileID $c36b = wShadowOAMSprite26Attributes @@ -18482,8 +18482,8 @@ WRAM0 bank #0: $c381 = wShadowOAMSprite32XCoord $c382 = wShadowOAMSprite32TileID $c383 = wShadowOAMSprite32Attributes - $c384 = wShadowOAMSprite33 $c384 = wShadowOAMSprite33YCoord + $c384 = wShadowOAMSprite33 $c385 = wShadowOAMSprite33XCoord $c386 = wShadowOAMSprite33TileID $c387 = wShadowOAMSprite33Attributes @@ -18553,11 +18553,11 @@ WRAM0 bank #0: $cc3d = wSerialExchangeNybbleTempReceiveData $cc3d = wSerialSyncAndExchangeNybbleReceiveData $cc3e = wSerialExchangeNybbleReceiveData - $cc42 = wLinkMenuSelectionSendBuffer $cc42 = wSerialExchangeNybbleSendData + $cc42 = wLinkMenuSelectionSendBuffer + $cc47 = wUnknownSerialCounter $cc47 = wEnteringCableClub $cc47 = wLinkTimeoutCounter - $cc47 = wUnknownSerialCounter $cc49 = wWhichTradeMonSelectionMenu $cc49 = wMonDataLocation $cc4a = wMenuWrappingEnabled @@ -18570,19 +18570,19 @@ WRAM0 bank #0: $cc55 = wTrainerHeaderFlagBit $cc57 = wNPCMovementScriptPointerTableNum $cc58 = wNPCMovementScriptBank - $cc5b = wUnusedCC5B + $cc5b = wBoostExpByExpAll + $cc5b = wAnimationType $cc5b = wNPCMovementDirections - $cc5b = wVermilionDockTileMapBuffer $cc5b = wTrainerCardBlkPacket - $cc5b = wDexRatingNumMonsSeen + $cc5b = wMonPartySpritesSavedOAM + $cc5b = wElevatorWarpMaps + $cc5b = wVermilionDockTileMapBuffer + $cc5b = wSlotMachineSevenAndBarModeChance $cc5b = wOaksAideRewardItemName $cc5b = wHallOfFame - $cc5b = wSlotMachineSevenAndBarModeChance - $cc5b = wElevatorWarpMaps + $cc5b = wDexRatingNumMonsSeen + $cc5b = wUnusedFlag $cc5b = wFilteredBagItems - $cc5b = wMonPartySpritesSavedOAM - $cc5b = wAnimationType - $cc5b = wBoostExpByExpAll $cc5c = wDexRatingNumMonsOwned $cc5d = wDexRatingText $cc5e = wSlotMachineSavedROMBank @@ -18591,11 +18591,11 @@ WRAM0 bank #0: $cc97 = wSwitchPartyMonTempBuffer $cca1 = wNumStepsToTake $ccd2 = wRLEByteCount - $ccd3 = wParentMenuItem $ccd3 = wCanEvolveFlags - $ccd3 = wSimulatedJoypadStatesEnd $ccd3 = wMiscBattleData + $ccd3 = wParentMenuItem $ccd3 = wAddedToParty + $ccd3 = wSimulatedJoypadStatesEnd $ccd4 = wForceEvolution $ccd5 = wAILayer2Encouragement $ccd7 = wPlayerSubstituteHP @@ -18624,12 +18624,12 @@ WRAM0 bank #0: $ccf6 = wLowHealthAlarmDisabled $ccf7 = wPlayerMonMinimized $cd05 = wEnemyNumHits - $cd05 = wEnemyBideAccumulatedDamage $cd05 = wLuckySlotHiddenObjectIndex + $cd05 = wEnemyBideAccumulatedDamage $cd0f = wPlayerMonUnmodifiedLevel + $cd0f = wVermilionDockTileMapBufferEnd $cd0f = wMiscBattleDataEnd $cd0f = wInGameTradeGiveMonSpecies - $cd0f = wVermilionDockTileMapBufferEnd $cd10 = wPlayerMonUnmodifiedMaxHP $cd10 = wInGameTradeTextPointerTablePointer $cd12 = wPlayerMonUnmodifiedAttack @@ -18706,8 +18706,8 @@ WRAM0 bank #0: $cd3d = wCoordIndex $cd3d = wTempSCX $cd3d = wBoxMonCounts - $cd3d = wDayCareStartLevel $cd3d = wUnusedCreditsByte + $cd3d = wDayCareStartLevel $cd3d = wMoveDownSmallStarsOAMCount $cd3d = wWereAnyMonsAsleep $cd3d = wFallingObjectsMovementData @@ -18759,8 +18759,8 @@ WRAM0 bank #0: $cd41 = wHoFTeamIndex2 $cd41 = wNumFieldMoves $cd41 = wTradedPlayerMonOT - $cd41 = wHiddenObjectX $cd41 = wHiddenItemOrCoinsIndex + $cd41 = wHiddenObjectX $cd41 = wTrainerScreenX $cd41 = wDayCarePerLevelCost $cd42 = wSlotMachineWheel1MiddleTile @@ -18801,7 +18801,7 @@ WRAM0 bank #0: $cd5d = wMonPartySpriteSpecies $cd5e = wLeftGBMonSpecies $cd5f = wRightGBMonSpecies - $cd60 = wFlags_0xcd60 + $cd60 = wMiscFlags $cd6a = wActionResultOrTookBattleTurn $cd6b = wJoyIgnore $cd6c = wNumMovesMinusOne @@ -19131,7 +19131,7 @@ WRAM0 bank #0: $d124 = wIsKeyItem $d125 = wTextBoxID $d126 = wCurrentMapScriptFlags - $d127 = wCurEnemyLVL + $d127 = wCurEnemyLevel $d128 = wItemListPointer $d12a = wListCount $d12b = wLinkState @@ -19141,8 +19141,8 @@ WRAM0 bank #0: $d12e = wMenuExitMethod $d12f = wGymGateTileBlock $d12f = wWhichPewterGuy - $d12f = wDungeonWarpDataEntrySize $d12f = wWhichPrizeWindow + $d12f = wDungeonWarpDataEntrySize $d130 = wSavedSpriteScreenY $d131 = wSavedSpriteScreenX $d132 = wSavedSpriteMapY @@ -19227,8 +19227,8 @@ WRAM0 bank #0: $d1c4 = wPartyMon3HP $d1c6 = wPartyMon3BoxLevel $d1c7 = wPartyMon3Status - $d1c8 = wPartyMon3Type $d1c8 = wPartyMon3Type1 + $d1c8 = wPartyMon3Type $d1c9 = wPartyMon3Type2 $d1ca = wPartyMon3CatchRate $d1cb = wPartyMon3Moves @@ -19568,16 +19568,17 @@ WRAM0 bank #0: $d71d = wDungeonWarpDestinationMap $d71e = wWhichDungeonWarp $d71f = wUnusedCardKeyGateID - $d728 = wd728 + $d728 = wStatusFlags1 $d72a = wBeatGymFlags - $d72c = wd72c - $d72d = wd72d - $d72e = wd72e - $d730 = wd730 - $d732 = wd732 - $d733 = wFlags_D733 - $d734 = wBeatLorelei - $d736 = wd736 + $d72c = wStatusFlags2 + $d72d = wStatusFlags3 + $d72d = wCableClubDestinationMap + $d72e = wStatusFlags4 + $d730 = wStatusFlags5 + $d732 = wStatusFlags6 + $d733 = wStatusFlags7 + $d734 = wElite4Flags + $d736 = wMovementFlags $d737 = wCompletedInGameTradeFlags $d73b = wWarpedFromWhichWarp $d73c = wWarpedFromWhichMap @@ -20248,10 +20249,10 @@ HRAM bank #0: $ff8b = hSpriteDataOffset $ff8b = hPreviousTileset $ff8b = hOAMTile + $ff8b = hBaseTileID $ff8b = hItemPrice $ff8b = hEastWestConnectedMapWidth $ff8b = hDexWeight - $ff8b = hBaseTileID $ff8b = hSpriteInterlaceCounter $ff8b = hRLEByteValue $ff8c = hNorthSouthConnectedMapWidth @@ -20287,12 +20288,12 @@ HRAM bank #0: $ff95 = hNPCPlayerYDistance $ff95 = hNPCSpriteOffset $ff95 = hDividend + $ff95 = hSignCoordPointer $ff95 = hQuotient $ff95 = hProduct $ff95 = hNPCMovementDirections2Index $ff95 = hPastLeadingZeros $ff95 = hSwapTemp - $ff95 = hSignCoordPointer $ff96 = hMutateWY $ff96 = hSwapItemQuantity $ff96 = hNumToPrint @@ -20374,8 +20375,8 @@ HRAM bank #0: $ffdc = hDexRatingNumMonsOwned $ffdc = hVendingMachinePrice $ffdc = hPlayerYCoord - $ffdc = hItemToRemoveIndex $ffdc = hOaksAideRewardItem + $ffdc = hItemToRemoveIndex $ffdc = hGymGateAnswer $ffdd = hPlayerXCoord $ffdd = hOaksAideNumMonsOwned diff --git a/pokeblue.sym b/pokeblue.sym index 04e0c371a..83f8085e9 100644 --- a/pokeblue.sym +++ b/pokeblue.sym @@ -2714,7 +2714,7 @@ 03:4d7b SeafoamIslandsB2FHS 03:4d81 SeafoamIslandsB3FHS 03:4d8d SeafoamIslandsB4FHS -03:4d99 PrintStrengthTxt +03:4d99 PrintStrengthText 03:4daa UsedStrengthText 03:4dbb CanMoveBouldersText 03:4dc0 IsSurfingAllowed @@ -9213,7 +9213,7 @@ 13:7f81 EnterMapAnimPredef 13:7f84 GetTileTwoStepsInFrontOfPlayerPredef 13:7f87 CheckForCollisionWhenPushingBoulderPredef -13:7f8a PrintStrengthTxtPredef +13:7f8a PrintStrengthTextPredef 13:7f8d PickUpItemPredef 13:7f90 PrintMoveTypePredef 13:7f93 LoadMovePPsPredef @@ -12152,8 +12152,8 @@ 1a:4026 DecrementPP.DecrementPP 1a:402f Version_GFX 1a:406f Version_GFXEnd -1a:406f Gym_GFX 1a:406f Dojo_GFX +1a:406f Gym_GFX 1a:466f Dojo_Block 1a:466f Gym_Block 1a:4daf Mart_GFX @@ -15057,7 +15057,7 @@ 20:6140 _RocketHideoutB3FRocket1BattleText 20:6168 _RocketHideoutB3FRocket1EndBattleText 20:617a _RocketHideoutB3FRocket1AfterBattleText -20:61b8 _RocketHideout3BattleTxt +20:61b8 _RocketHideout3BattleText 20:61e9 _RocketHideout3EndBattleText3 20:61fc _RocketHide3AfterBattleText3 20:623e _RocketHideoutB4FGiovanniImpressedYouGotHereText @@ -17455,8 +17455,8 @@ 00:8800 vFont 00:8800 vChars1 00:8800 vNPCSprites2 -00:9000 vChars2 00:9000 vFrontPic +00:9000 vChars2 00:9000 vTileset 00:9310 vBackPic 00:9310 vTitleLogo2 @@ -17564,8 +17564,8 @@ 00:c11a wSprite01StateData1YAdjusted 00:c11b wSprite01StateData1XAdjusted 00:c11c wSprite01StateData1CollisionData -00:c120 wSprite02StateData1PictureID 00:c120 wSprite01StateData1End +00:c120 wSprite02StateData1PictureID 00:c120 wSprite02StateData1 00:c121 wSprite02StateData1MovementStatus 00:c122 wSprite02StateData1ImageIndex @@ -17594,9 +17594,9 @@ 00:c13a wSprite03StateData1YAdjusted 00:c13b wSprite03StateData1XAdjusted 00:c13c wSprite03StateData1CollisionData +00:c140 wSprite04StateData1PictureID 00:c140 wSprite03StateData1End 00:c140 wSprite04StateData1 -00:c140 wSprite04StateData1PictureID 00:c141 wSprite04StateData1MovementStatus 00:c142 wSprite04StateData1ImageIndex 00:c143 wSprite04StateData1YStepVector @@ -17892,9 +17892,9 @@ 00:c289 wSprite08StateData2OrigFacingDirection 00:c28d wSprite08StateData2PictureID 00:c28e wSprite08StateData2ImageBaseOffset +00:c290 wSprite09StateData2 00:c290 wSprite08StateData2End 00:c290 wSprite09StateData2WalkAnimationCounter -00:c290 wSprite09StateData2 00:c292 wSprite09StateData2YDisplacement 00:c293 wSprite09StateData2XDisplacement 00:c294 wSprite09StateData2MapY @@ -17931,9 +17931,9 @@ 00:c2b9 wSprite11StateData2OrigFacingDirection 00:c2bd wSprite11StateData2PictureID 00:c2be wSprite11StateData2ImageBaseOffset +00:c2c0 wSprite12StateData2 00:c2c0 wSprite12StateData2WalkAnimationCounter 00:c2c0 wSprite11StateData2End -00:c2c0 wSprite12StateData2 00:c2c2 wSprite12StateData2YDisplacement 00:c2c3 wSprite12StateData2XDisplacement 00:c2c4 wSprite12StateData2MapY @@ -18116,8 +18116,8 @@ 00:c365 wShadowOAMSprite25XCoord 00:c366 wShadowOAMSprite25TileID 00:c367 wShadowOAMSprite25Attributes -00:c368 wShadowOAMSprite26YCoord 00:c368 wShadowOAMSprite26 +00:c368 wShadowOAMSprite26YCoord 00:c369 wShadowOAMSprite26XCoord 00:c36a wShadowOAMSprite26TileID 00:c36b wShadowOAMSprite26Attributes @@ -18151,8 +18151,8 @@ 00:c381 wShadowOAMSprite32XCoord 00:c382 wShadowOAMSprite32TileID 00:c383 wShadowOAMSprite32Attributes -00:c384 wShadowOAMSprite33 00:c384 wShadowOAMSprite33YCoord +00:c384 wShadowOAMSprite33 00:c385 wShadowOAMSprite33XCoord 00:c386 wShadowOAMSprite33TileID 00:c387 wShadowOAMSprite33Attributes @@ -18219,11 +18219,11 @@ 00:cc3d wSerialExchangeNybbleTempReceiveData 00:cc3d wSerialSyncAndExchangeNybbleReceiveData 00:cc3e wSerialExchangeNybbleReceiveData -00:cc42 wLinkMenuSelectionSendBuffer 00:cc42 wSerialExchangeNybbleSendData +00:cc42 wLinkMenuSelectionSendBuffer +00:cc47 wUnknownSerialCounter 00:cc47 wEnteringCableClub 00:cc47 wLinkTimeoutCounter -00:cc47 wUnknownSerialCounter 00:cc49 wWhichTradeMonSelectionMenu 00:cc49 wMonDataLocation 00:cc4a wMenuWrappingEnabled @@ -18236,19 +18236,19 @@ 00:cc55 wTrainerHeaderFlagBit 00:cc57 wNPCMovementScriptPointerTableNum 00:cc58 wNPCMovementScriptBank -00:cc5b wUnusedCC5B +00:cc5b wBoostExpByExpAll +00:cc5b wAnimationType 00:cc5b wNPCMovementDirections -00:cc5b wVermilionDockTileMapBuffer 00:cc5b wTrainerCardBlkPacket -00:cc5b wDexRatingNumMonsSeen +00:cc5b wMonPartySpritesSavedOAM +00:cc5b wElevatorWarpMaps +00:cc5b wVermilionDockTileMapBuffer +00:cc5b wSlotMachineSevenAndBarModeChance 00:cc5b wOaksAideRewardItemName 00:cc5b wHallOfFame -00:cc5b wSlotMachineSevenAndBarModeChance -00:cc5b wElevatorWarpMaps +00:cc5b wDexRatingNumMonsSeen +00:cc5b wUnusedFlag 00:cc5b wFilteredBagItems -00:cc5b wMonPartySpritesSavedOAM -00:cc5b wAnimationType -00:cc5b wBoostExpByExpAll 00:cc5c wDexRatingNumMonsOwned 00:cc5d wDexRatingText 00:cc5e wSlotMachineSavedROMBank @@ -18257,11 +18257,11 @@ 00:cc97 wSwitchPartyMonTempBuffer 00:cca1 wNumStepsToTake 00:ccd2 wRLEByteCount -00:ccd3 wParentMenuItem 00:ccd3 wCanEvolveFlags -00:ccd3 wSimulatedJoypadStatesEnd 00:ccd3 wMiscBattleData +00:ccd3 wParentMenuItem 00:ccd3 wAddedToParty +00:ccd3 wSimulatedJoypadStatesEnd 00:ccd4 wForceEvolution 00:ccd5 wAILayer2Encouragement 00:ccd7 wPlayerSubstituteHP @@ -18290,12 +18290,12 @@ 00:ccf6 wLowHealthAlarmDisabled 00:ccf7 wPlayerMonMinimized 00:cd05 wEnemyNumHits -00:cd05 wEnemyBideAccumulatedDamage 00:cd05 wLuckySlotHiddenObjectIndex +00:cd05 wEnemyBideAccumulatedDamage 00:cd0f wPlayerMonUnmodifiedLevel +00:cd0f wVermilionDockTileMapBufferEnd 00:cd0f wMiscBattleDataEnd 00:cd0f wInGameTradeGiveMonSpecies -00:cd0f wVermilionDockTileMapBufferEnd 00:cd10 wPlayerMonUnmodifiedMaxHP 00:cd10 wInGameTradeTextPointerTablePointer 00:cd12 wPlayerMonUnmodifiedAttack @@ -18372,8 +18372,8 @@ 00:cd3d wCoordIndex 00:cd3d wTempSCX 00:cd3d wBoxMonCounts -00:cd3d wDayCareStartLevel 00:cd3d wUnusedCreditsByte +00:cd3d wDayCareStartLevel 00:cd3d wMoveDownSmallStarsOAMCount 00:cd3d wWereAnyMonsAsleep 00:cd3d wFallingObjectsMovementData @@ -18425,8 +18425,8 @@ 00:cd41 wHoFTeamIndex2 00:cd41 wNumFieldMoves 00:cd41 wTradedPlayerMonOT -00:cd41 wHiddenObjectX 00:cd41 wHiddenItemOrCoinsIndex +00:cd41 wHiddenObjectX 00:cd41 wTrainerScreenX 00:cd41 wDayCarePerLevelCost 00:cd42 wSlotMachineWheel1MiddleTile @@ -18467,7 +18467,7 @@ 00:cd5d wMonPartySpriteSpecies 00:cd5e wLeftGBMonSpecies 00:cd5f wRightGBMonSpecies -00:cd60 wFlags_0xcd60 +00:cd60 wMiscFlags 00:cd6a wActionResultOrTookBattleTurn 00:cd6b wJoyIgnore 00:cd6c wNumMovesMinusOne @@ -18797,7 +18797,7 @@ 00:d124 wIsKeyItem 00:d125 wTextBoxID 00:d126 wCurrentMapScriptFlags -00:d127 wCurEnemyLVL +00:d127 wCurEnemyLevel 00:d128 wItemListPointer 00:d12a wListCount 00:d12b wLinkState @@ -18807,8 +18807,8 @@ 00:d12e wMenuExitMethod 00:d12f wGymGateTileBlock 00:d12f wWhichPewterGuy -00:d12f wDungeonWarpDataEntrySize 00:d12f wWhichPrizeWindow +00:d12f wDungeonWarpDataEntrySize 00:d130 wSavedSpriteScreenY 00:d131 wSavedSpriteScreenX 00:d132 wSavedSpriteMapY @@ -18892,8 +18892,8 @@ 00:d1c4 wPartyMon3HP 00:d1c6 wPartyMon3BoxLevel 00:d1c7 wPartyMon3Status -00:d1c8 wPartyMon3Type 00:d1c8 wPartyMon3Type1 +00:d1c8 wPartyMon3Type 00:d1c9 wPartyMon3Type2 00:d1ca wPartyMon3CatchRate 00:d1cb wPartyMon3Moves @@ -19232,16 +19232,17 @@ 00:d71d wDungeonWarpDestinationMap 00:d71e wWhichDungeonWarp 00:d71f wUnusedCardKeyGateID -00:d728 wd728 +00:d728 wStatusFlags1 00:d72a wBeatGymFlags -00:d72c wd72c -00:d72d wd72d -00:d72e wd72e -00:d730 wd730 -00:d732 wd732 -00:d733 wFlags_D733 -00:d734 wBeatLorelei -00:d736 wd736 +00:d72c wStatusFlags2 +00:d72d wStatusFlags3 +00:d72d wCableClubDestinationMap +00:d72e wStatusFlags4 +00:d730 wStatusFlags5 +00:d732 wStatusFlags6 +00:d733 wStatusFlags7 +00:d734 wElite4Flags +00:d736 wMovementFlags 00:d737 wCompletedInGameTradeFlags 00:d73b wWarpedFromWhichWarp 00:d73c wWarpedFromWhichMap @@ -19904,10 +19905,10 @@ 00:ff8b hSpriteDataOffset 00:ff8b hPreviousTileset 00:ff8b hOAMTile +00:ff8b hBaseTileID 00:ff8b hItemPrice 00:ff8b hEastWestConnectedMapWidth 00:ff8b hDexWeight -00:ff8b hBaseTileID 00:ff8b hSpriteInterlaceCounter 00:ff8b hRLEByteValue 00:ff8c hNorthSouthConnectedMapWidth @@ -19943,12 +19944,12 @@ 00:ff95 hNPCPlayerYDistance 00:ff95 hNPCSpriteOffset 00:ff95 hDividend +00:ff95 hSignCoordPointer 00:ff95 hQuotient 00:ff95 hProduct 00:ff95 hNPCMovementDirections2Index 00:ff95 hPastLeadingZeros 00:ff95 hSwapTemp -00:ff95 hSignCoordPointer 00:ff96 hMutateWY 00:ff96 hSwapItemQuantity 00:ff96 hNumToPrint @@ -20030,8 +20031,8 @@ 00:ffdc hDexRatingNumMonsOwned 00:ffdc hVendingMachinePrice 00:ffdc hPlayerYCoord -00:ffdc hItemToRemoveIndex 00:ffdc hOaksAideRewardItem +00:ffdc hItemToRemoveIndex 00:ffdc hGymGateAnswer 00:ffdd hPlayerXCoord 00:ffdd hOaksAideNumMonsOwned diff --git a/pokeblue_debug.map b/pokeblue_debug.map index 4f003bb05..4e6a3e9c0 100644 --- a/pokeblue_debug.map +++ b/pokeblue_debug.map @@ -2768,7 +2768,7 @@ ROMX bank #3: $4d7b = SeafoamIslandsB2FHS $4d81 = SeafoamIslandsB3FHS $4d8d = SeafoamIslandsB4FHS - $4d99 = PrintStrengthTxt + $4d99 = PrintStrengthText $4daa = UsedStrengthText $4dbb = CanMoveBouldersText $4dc0 = IsSurfingAllowed @@ -9374,7 +9374,7 @@ ROMX bank #19: $7f81 = EnterMapAnimPredef $7f84 = GetTileTwoStepsInFrontOfPlayerPredef $7f87 = CheckForCollisionWhenPushingBoulderPredef - $7f8a = PrintStrengthTxtPredef + $7f8a = PrintStrengthTextPredef $7f8d = PickUpItemPredef $7f90 = PrintMoveTypePredef $7f93 = LoadMovePPsPredef @@ -12364,8 +12364,8 @@ ROMX bank #26: $402f = Version_GFX $406f = Version_GFXEnd SECTION: $406f-$7fee ($3f80 bytes) ["Tilesets 2"] - $406f = Gym_GFX $406f = Dojo_GFX + $406f = Gym_GFX $466f = Dojo_Block $466f = Gym_Block $4daf = Mart_GFX @@ -15307,7 +15307,7 @@ ROMX bank #32: $6140 = _RocketHideoutB3FRocket1BattleText $6168 = _RocketHideoutB3FRocket1EndBattleText $617a = _RocketHideoutB3FRocket1AfterBattleText - $61b8 = _RocketHideout3BattleTxt + $61b8 = _RocketHideout3BattleText $61e9 = _RocketHideout3EndBattleText3 $61fc = _RocketHide3AfterBattleText3 $623e = _RocketHideoutB4FGiovanniImpressedYouGotHereText @@ -17770,8 +17770,8 @@ VRAM bank #0: $8800 = vFont $8800 = vChars1 $8800 = vNPCSprites2 - $9000 = vChars2 $9000 = vFrontPic + $9000 = vChars2 $9000 = vTileset $9310 = vBackPic $9310 = vTitleLogo2 @@ -17904,8 +17904,8 @@ WRAM0 bank #0: $c11a = wSprite01StateData1YAdjusted $c11b = wSprite01StateData1XAdjusted $c11c = wSprite01StateData1CollisionData - $c120 = wSprite02StateData1PictureID $c120 = wSprite01StateData1End + $c120 = wSprite02StateData1PictureID $c120 = wSprite02StateData1 $c121 = wSprite02StateData1MovementStatus $c122 = wSprite02StateData1ImageIndex @@ -17934,9 +17934,9 @@ WRAM0 bank #0: $c13a = wSprite03StateData1YAdjusted $c13b = wSprite03StateData1XAdjusted $c13c = wSprite03StateData1CollisionData + $c140 = wSprite04StateData1PictureID $c140 = wSprite03StateData1End $c140 = wSprite04StateData1 - $c140 = wSprite04StateData1PictureID $c141 = wSprite04StateData1MovementStatus $c142 = wSprite04StateData1ImageIndex $c143 = wSprite04StateData1YStepVector @@ -18232,9 +18232,9 @@ WRAM0 bank #0: $c289 = wSprite08StateData2OrigFacingDirection $c28d = wSprite08StateData2PictureID $c28e = wSprite08StateData2ImageBaseOffset + $c290 = wSprite09StateData2 $c290 = wSprite08StateData2End $c290 = wSprite09StateData2WalkAnimationCounter - $c290 = wSprite09StateData2 $c292 = wSprite09StateData2YDisplacement $c293 = wSprite09StateData2XDisplacement $c294 = wSprite09StateData2MapY @@ -18271,9 +18271,9 @@ WRAM0 bank #0: $c2b9 = wSprite11StateData2OrigFacingDirection $c2bd = wSprite11StateData2PictureID $c2be = wSprite11StateData2ImageBaseOffset + $c2c0 = wSprite12StateData2 $c2c0 = wSprite12StateData2WalkAnimationCounter $c2c0 = wSprite11StateData2End - $c2c0 = wSprite12StateData2 $c2c2 = wSprite12StateData2YDisplacement $c2c3 = wSprite12StateData2XDisplacement $c2c4 = wSprite12StateData2MapY @@ -18457,8 +18457,8 @@ WRAM0 bank #0: $c365 = wShadowOAMSprite25XCoord $c366 = wShadowOAMSprite25TileID $c367 = wShadowOAMSprite25Attributes - $c368 = wShadowOAMSprite26YCoord $c368 = wShadowOAMSprite26 + $c368 = wShadowOAMSprite26YCoord $c369 = wShadowOAMSprite26XCoord $c36a = wShadowOAMSprite26TileID $c36b = wShadowOAMSprite26Attributes @@ -18492,8 +18492,8 @@ WRAM0 bank #0: $c381 = wShadowOAMSprite32XCoord $c382 = wShadowOAMSprite32TileID $c383 = wShadowOAMSprite32Attributes - $c384 = wShadowOAMSprite33 $c384 = wShadowOAMSprite33YCoord + $c384 = wShadowOAMSprite33 $c385 = wShadowOAMSprite33XCoord $c386 = wShadowOAMSprite33TileID $c387 = wShadowOAMSprite33Attributes @@ -18563,11 +18563,11 @@ WRAM0 bank #0: $cc3d = wSerialExchangeNybbleTempReceiveData $cc3d = wSerialSyncAndExchangeNybbleReceiveData $cc3e = wSerialExchangeNybbleReceiveData - $cc42 = wLinkMenuSelectionSendBuffer $cc42 = wSerialExchangeNybbleSendData + $cc42 = wLinkMenuSelectionSendBuffer + $cc47 = wUnknownSerialCounter $cc47 = wEnteringCableClub $cc47 = wLinkTimeoutCounter - $cc47 = wUnknownSerialCounter $cc49 = wWhichTradeMonSelectionMenu $cc49 = wMonDataLocation $cc4a = wMenuWrappingEnabled @@ -18580,19 +18580,19 @@ WRAM0 bank #0: $cc55 = wTrainerHeaderFlagBit $cc57 = wNPCMovementScriptPointerTableNum $cc58 = wNPCMovementScriptBank - $cc5b = wUnusedCC5B + $cc5b = wBoostExpByExpAll + $cc5b = wAnimationType $cc5b = wNPCMovementDirections - $cc5b = wVermilionDockTileMapBuffer $cc5b = wTrainerCardBlkPacket - $cc5b = wDexRatingNumMonsSeen + $cc5b = wMonPartySpritesSavedOAM + $cc5b = wElevatorWarpMaps + $cc5b = wVermilionDockTileMapBuffer + $cc5b = wSlotMachineSevenAndBarModeChance $cc5b = wOaksAideRewardItemName $cc5b = wHallOfFame - $cc5b = wSlotMachineSevenAndBarModeChance - $cc5b = wElevatorWarpMaps + $cc5b = wDexRatingNumMonsSeen + $cc5b = wUnusedFlag $cc5b = wFilteredBagItems - $cc5b = wMonPartySpritesSavedOAM - $cc5b = wAnimationType - $cc5b = wBoostExpByExpAll $cc5c = wDexRatingNumMonsOwned $cc5d = wDexRatingText $cc5e = wSlotMachineSavedROMBank @@ -18601,11 +18601,11 @@ WRAM0 bank #0: $cc97 = wSwitchPartyMonTempBuffer $cca1 = wNumStepsToTake $ccd2 = wRLEByteCount - $ccd3 = wParentMenuItem $ccd3 = wCanEvolveFlags - $ccd3 = wSimulatedJoypadStatesEnd $ccd3 = wMiscBattleData + $ccd3 = wParentMenuItem $ccd3 = wAddedToParty + $ccd3 = wSimulatedJoypadStatesEnd $ccd4 = wForceEvolution $ccd5 = wAILayer2Encouragement $ccd7 = wPlayerSubstituteHP @@ -18634,12 +18634,12 @@ WRAM0 bank #0: $ccf6 = wLowHealthAlarmDisabled $ccf7 = wPlayerMonMinimized $cd05 = wEnemyNumHits - $cd05 = wEnemyBideAccumulatedDamage $cd05 = wLuckySlotHiddenObjectIndex + $cd05 = wEnemyBideAccumulatedDamage $cd0f = wPlayerMonUnmodifiedLevel + $cd0f = wVermilionDockTileMapBufferEnd $cd0f = wMiscBattleDataEnd $cd0f = wInGameTradeGiveMonSpecies - $cd0f = wVermilionDockTileMapBufferEnd $cd10 = wPlayerMonUnmodifiedMaxHP $cd10 = wInGameTradeTextPointerTablePointer $cd12 = wPlayerMonUnmodifiedAttack @@ -18716,8 +18716,8 @@ WRAM0 bank #0: $cd3d = wCoordIndex $cd3d = wTempSCX $cd3d = wBoxMonCounts - $cd3d = wDayCareStartLevel $cd3d = wUnusedCreditsByte + $cd3d = wDayCareStartLevel $cd3d = wMoveDownSmallStarsOAMCount $cd3d = wWereAnyMonsAsleep $cd3d = wFallingObjectsMovementData @@ -18769,8 +18769,8 @@ WRAM0 bank #0: $cd41 = wHoFTeamIndex2 $cd41 = wNumFieldMoves $cd41 = wTradedPlayerMonOT - $cd41 = wHiddenObjectX $cd41 = wHiddenItemOrCoinsIndex + $cd41 = wHiddenObjectX $cd41 = wTrainerScreenX $cd41 = wDayCarePerLevelCost $cd42 = wSlotMachineWheel1MiddleTile @@ -18811,7 +18811,7 @@ WRAM0 bank #0: $cd5d = wMonPartySpriteSpecies $cd5e = wLeftGBMonSpecies $cd5f = wRightGBMonSpecies - $cd60 = wFlags_0xcd60 + $cd60 = wMiscFlags $cd6a = wActionResultOrTookBattleTurn $cd6b = wJoyIgnore $cd6c = wNumMovesMinusOne @@ -19141,7 +19141,7 @@ WRAM0 bank #0: $d124 = wIsKeyItem $d125 = wTextBoxID $d126 = wCurrentMapScriptFlags - $d127 = wCurEnemyLVL + $d127 = wCurEnemyLevel $d128 = wItemListPointer $d12a = wListCount $d12b = wLinkState @@ -19151,8 +19151,8 @@ WRAM0 bank #0: $d12e = wMenuExitMethod $d12f = wGymGateTileBlock $d12f = wWhichPewterGuy - $d12f = wDungeonWarpDataEntrySize $d12f = wWhichPrizeWindow + $d12f = wDungeonWarpDataEntrySize $d130 = wSavedSpriteScreenY $d131 = wSavedSpriteScreenX $d132 = wSavedSpriteMapY @@ -19237,8 +19237,8 @@ WRAM0 bank #0: $d1c4 = wPartyMon3HP $d1c6 = wPartyMon3BoxLevel $d1c7 = wPartyMon3Status - $d1c8 = wPartyMon3Type $d1c8 = wPartyMon3Type1 + $d1c8 = wPartyMon3Type $d1c9 = wPartyMon3Type2 $d1ca = wPartyMon3CatchRate $d1cb = wPartyMon3Moves @@ -19578,16 +19578,17 @@ WRAM0 bank #0: $d71d = wDungeonWarpDestinationMap $d71e = wWhichDungeonWarp $d71f = wUnusedCardKeyGateID - $d728 = wd728 + $d728 = wStatusFlags1 $d72a = wBeatGymFlags - $d72c = wd72c - $d72d = wd72d - $d72e = wd72e - $d730 = wd730 - $d732 = wd732 - $d733 = wFlags_D733 - $d734 = wBeatLorelei - $d736 = wd736 + $d72c = wStatusFlags2 + $d72d = wStatusFlags3 + $d72d = wCableClubDestinationMap + $d72e = wStatusFlags4 + $d730 = wStatusFlags5 + $d732 = wStatusFlags6 + $d733 = wStatusFlags7 + $d734 = wElite4Flags + $d736 = wMovementFlags $d737 = wCompletedInGameTradeFlags $d73b = wWarpedFromWhichWarp $d73c = wWarpedFromWhichMap @@ -20258,10 +20259,10 @@ HRAM bank #0: $ff8b = hSpriteDataOffset $ff8b = hPreviousTileset $ff8b = hOAMTile + $ff8b = hBaseTileID $ff8b = hItemPrice $ff8b = hEastWestConnectedMapWidth $ff8b = hDexWeight - $ff8b = hBaseTileID $ff8b = hSpriteInterlaceCounter $ff8b = hRLEByteValue $ff8c = hNorthSouthConnectedMapWidth @@ -20297,12 +20298,12 @@ HRAM bank #0: $ff95 = hNPCPlayerYDistance $ff95 = hNPCSpriteOffset $ff95 = hDividend + $ff95 = hSignCoordPointer $ff95 = hQuotient $ff95 = hProduct $ff95 = hNPCMovementDirections2Index $ff95 = hPastLeadingZeros $ff95 = hSwapTemp - $ff95 = hSignCoordPointer $ff96 = hMutateWY $ff96 = hSwapItemQuantity $ff96 = hNumToPrint @@ -20384,8 +20385,8 @@ HRAM bank #0: $ffdc = hDexRatingNumMonsOwned $ffdc = hVendingMachinePrice $ffdc = hPlayerYCoord - $ffdc = hItemToRemoveIndex $ffdc = hOaksAideRewardItem + $ffdc = hItemToRemoveIndex $ffdc = hGymGateAnswer $ffdd = hPlayerXCoord $ffdd = hOaksAideNumMonsOwned diff --git a/pokeblue_debug.sym b/pokeblue_debug.sym index 54c421534..48dde19fc 100644 --- a/pokeblue_debug.sym +++ b/pokeblue_debug.sym @@ -2724,7 +2724,7 @@ 03:4d7b SeafoamIslandsB2FHS 03:4d81 SeafoamIslandsB3FHS 03:4d8d SeafoamIslandsB4FHS -03:4d99 PrintStrengthTxt +03:4d99 PrintStrengthText 03:4daa UsedStrengthText 03:4dbb CanMoveBouldersText 03:4dc0 IsSurfingAllowed @@ -9223,7 +9223,7 @@ 13:7f81 EnterMapAnimPredef 13:7f84 GetTileTwoStepsInFrontOfPlayerPredef 13:7f87 CheckForCollisionWhenPushingBoulderPredef -13:7f8a PrintStrengthTxtPredef +13:7f8a PrintStrengthTextPredef 13:7f8d PickUpItemPredef 13:7f90 PrintMoveTypePredef 13:7f93 LoadMovePPsPredef @@ -12162,8 +12162,8 @@ 1a:4026 DecrementPP.DecrementPP 1a:402f Version_GFX 1a:406f Version_GFXEnd -1a:406f Gym_GFX 1a:406f Dojo_GFX +1a:406f Gym_GFX 1a:466f Dojo_Block 1a:466f Gym_Block 1a:4daf Mart_GFX @@ -15067,7 +15067,7 @@ 20:6140 _RocketHideoutB3FRocket1BattleText 20:6168 _RocketHideoutB3FRocket1EndBattleText 20:617a _RocketHideoutB3FRocket1AfterBattleText -20:61b8 _RocketHideout3BattleTxt +20:61b8 _RocketHideout3BattleText 20:61e9 _RocketHideout3EndBattleText3 20:61fc _RocketHide3AfterBattleText3 20:623e _RocketHideoutB4FGiovanniImpressedYouGotHereText @@ -17465,8 +17465,8 @@ 00:8800 vFont 00:8800 vChars1 00:8800 vNPCSprites2 -00:9000 vChars2 00:9000 vFrontPic +00:9000 vChars2 00:9000 vTileset 00:9310 vBackPic 00:9310 vTitleLogo2 @@ -17574,8 +17574,8 @@ 00:c11a wSprite01StateData1YAdjusted 00:c11b wSprite01StateData1XAdjusted 00:c11c wSprite01StateData1CollisionData -00:c120 wSprite02StateData1PictureID 00:c120 wSprite01StateData1End +00:c120 wSprite02StateData1PictureID 00:c120 wSprite02StateData1 00:c121 wSprite02StateData1MovementStatus 00:c122 wSprite02StateData1ImageIndex @@ -17604,9 +17604,9 @@ 00:c13a wSprite03StateData1YAdjusted 00:c13b wSprite03StateData1XAdjusted 00:c13c wSprite03StateData1CollisionData +00:c140 wSprite04StateData1PictureID 00:c140 wSprite03StateData1End 00:c140 wSprite04StateData1 -00:c140 wSprite04StateData1PictureID 00:c141 wSprite04StateData1MovementStatus 00:c142 wSprite04StateData1ImageIndex 00:c143 wSprite04StateData1YStepVector @@ -17902,9 +17902,9 @@ 00:c289 wSprite08StateData2OrigFacingDirection 00:c28d wSprite08StateData2PictureID 00:c28e wSprite08StateData2ImageBaseOffset +00:c290 wSprite09StateData2 00:c290 wSprite08StateData2End 00:c290 wSprite09StateData2WalkAnimationCounter -00:c290 wSprite09StateData2 00:c292 wSprite09StateData2YDisplacement 00:c293 wSprite09StateData2XDisplacement 00:c294 wSprite09StateData2MapY @@ -17941,9 +17941,9 @@ 00:c2b9 wSprite11StateData2OrigFacingDirection 00:c2bd wSprite11StateData2PictureID 00:c2be wSprite11StateData2ImageBaseOffset +00:c2c0 wSprite12StateData2 00:c2c0 wSprite12StateData2WalkAnimationCounter 00:c2c0 wSprite11StateData2End -00:c2c0 wSprite12StateData2 00:c2c2 wSprite12StateData2YDisplacement 00:c2c3 wSprite12StateData2XDisplacement 00:c2c4 wSprite12StateData2MapY @@ -18126,8 +18126,8 @@ 00:c365 wShadowOAMSprite25XCoord 00:c366 wShadowOAMSprite25TileID 00:c367 wShadowOAMSprite25Attributes -00:c368 wShadowOAMSprite26YCoord 00:c368 wShadowOAMSprite26 +00:c368 wShadowOAMSprite26YCoord 00:c369 wShadowOAMSprite26XCoord 00:c36a wShadowOAMSprite26TileID 00:c36b wShadowOAMSprite26Attributes @@ -18161,8 +18161,8 @@ 00:c381 wShadowOAMSprite32XCoord 00:c382 wShadowOAMSprite32TileID 00:c383 wShadowOAMSprite32Attributes -00:c384 wShadowOAMSprite33 00:c384 wShadowOAMSprite33YCoord +00:c384 wShadowOAMSprite33 00:c385 wShadowOAMSprite33XCoord 00:c386 wShadowOAMSprite33TileID 00:c387 wShadowOAMSprite33Attributes @@ -18229,11 +18229,11 @@ 00:cc3d wSerialExchangeNybbleTempReceiveData 00:cc3d wSerialSyncAndExchangeNybbleReceiveData 00:cc3e wSerialExchangeNybbleReceiveData -00:cc42 wLinkMenuSelectionSendBuffer 00:cc42 wSerialExchangeNybbleSendData +00:cc42 wLinkMenuSelectionSendBuffer +00:cc47 wUnknownSerialCounter 00:cc47 wEnteringCableClub 00:cc47 wLinkTimeoutCounter -00:cc47 wUnknownSerialCounter 00:cc49 wWhichTradeMonSelectionMenu 00:cc49 wMonDataLocation 00:cc4a wMenuWrappingEnabled @@ -18246,19 +18246,19 @@ 00:cc55 wTrainerHeaderFlagBit 00:cc57 wNPCMovementScriptPointerTableNum 00:cc58 wNPCMovementScriptBank -00:cc5b wUnusedCC5B +00:cc5b wBoostExpByExpAll +00:cc5b wAnimationType 00:cc5b wNPCMovementDirections -00:cc5b wVermilionDockTileMapBuffer 00:cc5b wTrainerCardBlkPacket -00:cc5b wDexRatingNumMonsSeen +00:cc5b wMonPartySpritesSavedOAM +00:cc5b wElevatorWarpMaps +00:cc5b wVermilionDockTileMapBuffer +00:cc5b wSlotMachineSevenAndBarModeChance 00:cc5b wOaksAideRewardItemName 00:cc5b wHallOfFame -00:cc5b wSlotMachineSevenAndBarModeChance -00:cc5b wElevatorWarpMaps +00:cc5b wDexRatingNumMonsSeen +00:cc5b wUnusedFlag 00:cc5b wFilteredBagItems -00:cc5b wMonPartySpritesSavedOAM -00:cc5b wAnimationType -00:cc5b wBoostExpByExpAll 00:cc5c wDexRatingNumMonsOwned 00:cc5d wDexRatingText 00:cc5e wSlotMachineSavedROMBank @@ -18267,11 +18267,11 @@ 00:cc97 wSwitchPartyMonTempBuffer 00:cca1 wNumStepsToTake 00:ccd2 wRLEByteCount -00:ccd3 wParentMenuItem 00:ccd3 wCanEvolveFlags -00:ccd3 wSimulatedJoypadStatesEnd 00:ccd3 wMiscBattleData +00:ccd3 wParentMenuItem 00:ccd3 wAddedToParty +00:ccd3 wSimulatedJoypadStatesEnd 00:ccd4 wForceEvolution 00:ccd5 wAILayer2Encouragement 00:ccd7 wPlayerSubstituteHP @@ -18300,12 +18300,12 @@ 00:ccf6 wLowHealthAlarmDisabled 00:ccf7 wPlayerMonMinimized 00:cd05 wEnemyNumHits -00:cd05 wEnemyBideAccumulatedDamage 00:cd05 wLuckySlotHiddenObjectIndex +00:cd05 wEnemyBideAccumulatedDamage 00:cd0f wPlayerMonUnmodifiedLevel +00:cd0f wVermilionDockTileMapBufferEnd 00:cd0f wMiscBattleDataEnd 00:cd0f wInGameTradeGiveMonSpecies -00:cd0f wVermilionDockTileMapBufferEnd 00:cd10 wPlayerMonUnmodifiedMaxHP 00:cd10 wInGameTradeTextPointerTablePointer 00:cd12 wPlayerMonUnmodifiedAttack @@ -18382,8 +18382,8 @@ 00:cd3d wCoordIndex 00:cd3d wTempSCX 00:cd3d wBoxMonCounts -00:cd3d wDayCareStartLevel 00:cd3d wUnusedCreditsByte +00:cd3d wDayCareStartLevel 00:cd3d wMoveDownSmallStarsOAMCount 00:cd3d wWereAnyMonsAsleep 00:cd3d wFallingObjectsMovementData @@ -18435,8 +18435,8 @@ 00:cd41 wHoFTeamIndex2 00:cd41 wNumFieldMoves 00:cd41 wTradedPlayerMonOT -00:cd41 wHiddenObjectX 00:cd41 wHiddenItemOrCoinsIndex +00:cd41 wHiddenObjectX 00:cd41 wTrainerScreenX 00:cd41 wDayCarePerLevelCost 00:cd42 wSlotMachineWheel1MiddleTile @@ -18477,7 +18477,7 @@ 00:cd5d wMonPartySpriteSpecies 00:cd5e wLeftGBMonSpecies 00:cd5f wRightGBMonSpecies -00:cd60 wFlags_0xcd60 +00:cd60 wMiscFlags 00:cd6a wActionResultOrTookBattleTurn 00:cd6b wJoyIgnore 00:cd6c wNumMovesMinusOne @@ -18807,7 +18807,7 @@ 00:d124 wIsKeyItem 00:d125 wTextBoxID 00:d126 wCurrentMapScriptFlags -00:d127 wCurEnemyLVL +00:d127 wCurEnemyLevel 00:d128 wItemListPointer 00:d12a wListCount 00:d12b wLinkState @@ -18817,8 +18817,8 @@ 00:d12e wMenuExitMethod 00:d12f wGymGateTileBlock 00:d12f wWhichPewterGuy -00:d12f wDungeonWarpDataEntrySize 00:d12f wWhichPrizeWindow +00:d12f wDungeonWarpDataEntrySize 00:d130 wSavedSpriteScreenY 00:d131 wSavedSpriteScreenX 00:d132 wSavedSpriteMapY @@ -18902,8 +18902,8 @@ 00:d1c4 wPartyMon3HP 00:d1c6 wPartyMon3BoxLevel 00:d1c7 wPartyMon3Status -00:d1c8 wPartyMon3Type 00:d1c8 wPartyMon3Type1 +00:d1c8 wPartyMon3Type 00:d1c9 wPartyMon3Type2 00:d1ca wPartyMon3CatchRate 00:d1cb wPartyMon3Moves @@ -19242,16 +19242,17 @@ 00:d71d wDungeonWarpDestinationMap 00:d71e wWhichDungeonWarp 00:d71f wUnusedCardKeyGateID -00:d728 wd728 +00:d728 wStatusFlags1 00:d72a wBeatGymFlags -00:d72c wd72c -00:d72d wd72d -00:d72e wd72e -00:d730 wd730 -00:d732 wd732 -00:d733 wFlags_D733 -00:d734 wBeatLorelei -00:d736 wd736 +00:d72c wStatusFlags2 +00:d72d wStatusFlags3 +00:d72d wCableClubDestinationMap +00:d72e wStatusFlags4 +00:d730 wStatusFlags5 +00:d732 wStatusFlags6 +00:d733 wStatusFlags7 +00:d734 wElite4Flags +00:d736 wMovementFlags 00:d737 wCompletedInGameTradeFlags 00:d73b wWarpedFromWhichWarp 00:d73c wWarpedFromWhichMap @@ -19914,10 +19915,10 @@ 00:ff8b hSpriteDataOffset 00:ff8b hPreviousTileset 00:ff8b hOAMTile +00:ff8b hBaseTileID 00:ff8b hItemPrice 00:ff8b hEastWestConnectedMapWidth 00:ff8b hDexWeight -00:ff8b hBaseTileID 00:ff8b hSpriteInterlaceCounter 00:ff8b hRLEByteValue 00:ff8c hNorthSouthConnectedMapWidth @@ -19953,12 +19954,12 @@ 00:ff95 hNPCPlayerYDistance 00:ff95 hNPCSpriteOffset 00:ff95 hDividend +00:ff95 hSignCoordPointer 00:ff95 hQuotient 00:ff95 hProduct 00:ff95 hNPCMovementDirections2Index 00:ff95 hPastLeadingZeros 00:ff95 hSwapTemp -00:ff95 hSignCoordPointer 00:ff96 hMutateWY 00:ff96 hSwapItemQuantity 00:ff96 hNumToPrint @@ -20040,8 +20041,8 @@ 00:ffdc hDexRatingNumMonsOwned 00:ffdc hVendingMachinePrice 00:ffdc hPlayerYCoord -00:ffdc hItemToRemoveIndex 00:ffdc hOaksAideRewardItem +00:ffdc hItemToRemoveIndex 00:ffdc hGymGateAnswer 00:ffdd hPlayerXCoord 00:ffdd hOaksAideNumMonsOwned diff --git a/pokeblue_vc.map b/pokeblue_vc.map index 669fab021..8ae876920 100644 --- a/pokeblue_vc.map +++ b/pokeblue_vc.map @@ -2774,7 +2774,7 @@ ROMX bank #3: $4d7b = SeafoamIslandsB2FHS $4d81 = SeafoamIslandsB3FHS $4d8d = SeafoamIslandsB4FHS - $4d99 = PrintStrengthTxt + $4d99 = PrintStrengthText $4daa = UsedStrengthText $4dbb = CanMoveBouldersText $4dc0 = IsSurfingAllowed @@ -9391,7 +9391,7 @@ ROMX bank #19: $7f81 = EnterMapAnimPredef $7f84 = GetTileTwoStepsInFrontOfPlayerPredef $7f87 = CheckForCollisionWhenPushingBoulderPredef - $7f8a = PrintStrengthTxtPredef + $7f8a = PrintStrengthTextPredef $7f8d = PickUpItemPredef $7f90 = PrintMoveTypePredef $7f93 = LoadMovePPsPredef @@ -12381,8 +12381,8 @@ ROMX bank #26: $402f = Version_GFX $406f = Version_GFXEnd SECTION: $406f-$7fee ($3f80 bytes) ["Tilesets 2"] - $406f = Gym_GFX $406f = Dojo_GFX + $406f = Gym_GFX $466f = Dojo_Block $466f = Gym_Block $4daf = Mart_GFX @@ -15347,7 +15347,7 @@ ROMX bank #32: $6140 = _RocketHideoutB3FRocket1BattleText $6168 = _RocketHideoutB3FRocket1EndBattleText $617a = _RocketHideoutB3FRocket1AfterBattleText - $61b8 = _RocketHideout3BattleTxt + $61b8 = _RocketHideout3BattleText $61e9 = _RocketHideout3EndBattleText3 $61fc = _RocketHide3AfterBattleText3 $623e = _RocketHideoutB4FGiovanniImpressedYouGotHereText @@ -17812,8 +17812,8 @@ VRAM bank #0: $8800 = vFont $8800 = vChars1 $8800 = vNPCSprites2 - $9000 = vChars2 $9000 = vFrontPic + $9000 = vChars2 $9000 = vTileset $9310 = vBackPic $9310 = vTitleLogo2 @@ -17946,8 +17946,8 @@ WRAM0 bank #0: $c11a = wSprite01StateData1YAdjusted $c11b = wSprite01StateData1XAdjusted $c11c = wSprite01StateData1CollisionData - $c120 = wSprite02StateData1PictureID $c120 = wSprite01StateData1End + $c120 = wSprite02StateData1PictureID $c120 = wSprite02StateData1 $c121 = wSprite02StateData1MovementStatus $c122 = wSprite02StateData1ImageIndex @@ -17976,9 +17976,9 @@ WRAM0 bank #0: $c13a = wSprite03StateData1YAdjusted $c13b = wSprite03StateData1XAdjusted $c13c = wSprite03StateData1CollisionData + $c140 = wSprite04StateData1PictureID $c140 = wSprite03StateData1End $c140 = wSprite04StateData1 - $c140 = wSprite04StateData1PictureID $c141 = wSprite04StateData1MovementStatus $c142 = wSprite04StateData1ImageIndex $c143 = wSprite04StateData1YStepVector @@ -18274,9 +18274,9 @@ WRAM0 bank #0: $c289 = wSprite08StateData2OrigFacingDirection $c28d = wSprite08StateData2PictureID $c28e = wSprite08StateData2ImageBaseOffset + $c290 = wSprite09StateData2 $c290 = wSprite08StateData2End $c290 = wSprite09StateData2WalkAnimationCounter - $c290 = wSprite09StateData2 $c292 = wSprite09StateData2YDisplacement $c293 = wSprite09StateData2XDisplacement $c294 = wSprite09StateData2MapY @@ -18313,9 +18313,9 @@ WRAM0 bank #0: $c2b9 = wSprite11StateData2OrigFacingDirection $c2bd = wSprite11StateData2PictureID $c2be = wSprite11StateData2ImageBaseOffset + $c2c0 = wSprite12StateData2 $c2c0 = wSprite12StateData2WalkAnimationCounter $c2c0 = wSprite11StateData2End - $c2c0 = wSprite12StateData2 $c2c2 = wSprite12StateData2YDisplacement $c2c3 = wSprite12StateData2XDisplacement $c2c4 = wSprite12StateData2MapY @@ -18499,8 +18499,8 @@ WRAM0 bank #0: $c365 = wShadowOAMSprite25XCoord $c366 = wShadowOAMSprite25TileID $c367 = wShadowOAMSprite25Attributes - $c368 = wShadowOAMSprite26YCoord $c368 = wShadowOAMSprite26 + $c368 = wShadowOAMSprite26YCoord $c369 = wShadowOAMSprite26XCoord $c36a = wShadowOAMSprite26TileID $c36b = wShadowOAMSprite26Attributes @@ -18534,8 +18534,8 @@ WRAM0 bank #0: $c381 = wShadowOAMSprite32XCoord $c382 = wShadowOAMSprite32TileID $c383 = wShadowOAMSprite32Attributes - $c384 = wShadowOAMSprite33 $c384 = wShadowOAMSprite33YCoord + $c384 = wShadowOAMSprite33 $c385 = wShadowOAMSprite33XCoord $c386 = wShadowOAMSprite33TileID $c387 = wShadowOAMSprite33Attributes @@ -18605,11 +18605,11 @@ WRAM0 bank #0: $cc3d = wSerialExchangeNybbleTempReceiveData $cc3d = wSerialSyncAndExchangeNybbleReceiveData $cc3e = wSerialExchangeNybbleReceiveData - $cc42 = wLinkMenuSelectionSendBuffer $cc42 = wSerialExchangeNybbleSendData + $cc42 = wLinkMenuSelectionSendBuffer + $cc47 = wUnknownSerialCounter $cc47 = wEnteringCableClub $cc47 = wLinkTimeoutCounter - $cc47 = wUnknownSerialCounter $cc49 = wWhichTradeMonSelectionMenu $cc49 = wMonDataLocation $cc4a = wMenuWrappingEnabled @@ -18622,19 +18622,19 @@ WRAM0 bank #0: $cc55 = wTrainerHeaderFlagBit $cc57 = wNPCMovementScriptPointerTableNum $cc58 = wNPCMovementScriptBank - $cc5b = wUnusedCC5B + $cc5b = wBoostExpByExpAll + $cc5b = wAnimationType $cc5b = wNPCMovementDirections - $cc5b = wVermilionDockTileMapBuffer $cc5b = wTrainerCardBlkPacket - $cc5b = wDexRatingNumMonsSeen + $cc5b = wMonPartySpritesSavedOAM + $cc5b = wElevatorWarpMaps + $cc5b = wVermilionDockTileMapBuffer + $cc5b = wSlotMachineSevenAndBarModeChance $cc5b = wOaksAideRewardItemName $cc5b = wHallOfFame - $cc5b = wSlotMachineSevenAndBarModeChance - $cc5b = wElevatorWarpMaps + $cc5b = wDexRatingNumMonsSeen + $cc5b = wUnusedFlag $cc5b = wFilteredBagItems - $cc5b = wMonPartySpritesSavedOAM - $cc5b = wAnimationType - $cc5b = wBoostExpByExpAll $cc5c = wDexRatingNumMonsOwned $cc5d = wDexRatingText $cc5e = wSlotMachineSavedROMBank @@ -18643,11 +18643,11 @@ WRAM0 bank #0: $cc97 = wSwitchPartyMonTempBuffer $cca1 = wNumStepsToTake $ccd2 = wRLEByteCount - $ccd3 = wParentMenuItem $ccd3 = wCanEvolveFlags - $ccd3 = wSimulatedJoypadStatesEnd $ccd3 = wMiscBattleData + $ccd3 = wParentMenuItem $ccd3 = wAddedToParty + $ccd3 = wSimulatedJoypadStatesEnd $ccd4 = wForceEvolution $ccd5 = wAILayer2Encouragement $ccd7 = wPlayerSubstituteHP @@ -18676,12 +18676,12 @@ WRAM0 bank #0: $ccf6 = wLowHealthAlarmDisabled $ccf7 = wPlayerMonMinimized $cd05 = wEnemyNumHits - $cd05 = wEnemyBideAccumulatedDamage $cd05 = wLuckySlotHiddenObjectIndex + $cd05 = wEnemyBideAccumulatedDamage $cd0f = wPlayerMonUnmodifiedLevel + $cd0f = wVermilionDockTileMapBufferEnd $cd0f = wMiscBattleDataEnd $cd0f = wInGameTradeGiveMonSpecies - $cd0f = wVermilionDockTileMapBufferEnd $cd10 = wPlayerMonUnmodifiedMaxHP $cd10 = wInGameTradeTextPointerTablePointer $cd12 = wPlayerMonUnmodifiedAttack @@ -18758,8 +18758,8 @@ WRAM0 bank #0: $cd3d = wCoordIndex $cd3d = wTempSCX $cd3d = wBoxMonCounts - $cd3d = wDayCareStartLevel $cd3d = wUnusedCreditsByte + $cd3d = wDayCareStartLevel $cd3d = wMoveDownSmallStarsOAMCount $cd3d = wWereAnyMonsAsleep $cd3d = wFallingObjectsMovementData @@ -18811,8 +18811,8 @@ WRAM0 bank #0: $cd41 = wHoFTeamIndex2 $cd41 = wNumFieldMoves $cd41 = wTradedPlayerMonOT - $cd41 = wHiddenObjectX $cd41 = wHiddenItemOrCoinsIndex + $cd41 = wHiddenObjectX $cd41 = wTrainerScreenX $cd41 = wDayCarePerLevelCost $cd42 = wSlotMachineWheel1MiddleTile @@ -18853,7 +18853,7 @@ WRAM0 bank #0: $cd5d = wMonPartySpriteSpecies $cd5e = wLeftGBMonSpecies $cd5f = wRightGBMonSpecies - $cd60 = wFlags_0xcd60 + $cd60 = wMiscFlags $cd6a = wActionResultOrTookBattleTurn $cd6b = wJoyIgnore $cd6c = wNumMovesMinusOne @@ -19183,7 +19183,7 @@ WRAM0 bank #0: $d124 = wIsKeyItem $d125 = wTextBoxID $d126 = wCurrentMapScriptFlags - $d127 = wCurEnemyLVL + $d127 = wCurEnemyLevel $d128 = wItemListPointer $d12a = wListCount $d12b = wLinkState @@ -19193,8 +19193,8 @@ WRAM0 bank #0: $d12e = wMenuExitMethod $d12f = wGymGateTileBlock $d12f = wWhichPewterGuy - $d12f = wDungeonWarpDataEntrySize $d12f = wWhichPrizeWindow + $d12f = wDungeonWarpDataEntrySize $d130 = wSavedSpriteScreenY $d131 = wSavedSpriteScreenX $d132 = wSavedSpriteMapY @@ -19279,8 +19279,8 @@ WRAM0 bank #0: $d1c4 = wPartyMon3HP $d1c6 = wPartyMon3BoxLevel $d1c7 = wPartyMon3Status - $d1c8 = wPartyMon3Type $d1c8 = wPartyMon3Type1 + $d1c8 = wPartyMon3Type $d1c9 = wPartyMon3Type2 $d1ca = wPartyMon3CatchRate $d1cb = wPartyMon3Moves @@ -19620,16 +19620,17 @@ WRAM0 bank #0: $d71d = wDungeonWarpDestinationMap $d71e = wWhichDungeonWarp $d71f = wUnusedCardKeyGateID - $d728 = wd728 + $d728 = wStatusFlags1 $d72a = wBeatGymFlags - $d72c = wd72c - $d72d = wd72d - $d72e = wd72e - $d730 = wd730 - $d732 = wd732 - $d733 = wFlags_D733 - $d734 = wBeatLorelei - $d736 = wd736 + $d72c = wStatusFlags2 + $d72d = wStatusFlags3 + $d72d = wCableClubDestinationMap + $d72e = wStatusFlags4 + $d730 = wStatusFlags5 + $d732 = wStatusFlags6 + $d733 = wStatusFlags7 + $d734 = wElite4Flags + $d736 = wMovementFlags $d737 = wCompletedInGameTradeFlags $d73b = wWarpedFromWhichWarp $d73c = wWarpedFromWhichMap @@ -20300,10 +20301,10 @@ HRAM bank #0: $ff8b = hSpriteDataOffset $ff8b = hPreviousTileset $ff8b = hOAMTile + $ff8b = hBaseTileID $ff8b = hItemPrice $ff8b = hEastWestConnectedMapWidth $ff8b = hDexWeight - $ff8b = hBaseTileID $ff8b = hSpriteInterlaceCounter $ff8b = hRLEByteValue $ff8c = hNorthSouthConnectedMapWidth @@ -20339,12 +20340,12 @@ HRAM bank #0: $ff95 = hNPCPlayerYDistance $ff95 = hNPCSpriteOffset $ff95 = hDividend + $ff95 = hSignCoordPointer $ff95 = hQuotient $ff95 = hProduct $ff95 = hNPCMovementDirections2Index $ff95 = hPastLeadingZeros $ff95 = hSwapTemp - $ff95 = hSignCoordPointer $ff96 = hMutateWY $ff96 = hSwapItemQuantity $ff96 = hNumToPrint @@ -20426,8 +20427,8 @@ HRAM bank #0: $ffdc = hDexRatingNumMonsOwned $ffdc = hVendingMachinePrice $ffdc = hPlayerYCoord - $ffdc = hItemToRemoveIndex $ffdc = hOaksAideRewardItem + $ffdc = hItemToRemoveIndex $ffdc = hGymGateAnswer $ffdd = hPlayerXCoord $ffdd = hOaksAideNumMonsOwned diff --git a/pokeblue_vc.sym b/pokeblue_vc.sym index bbd6d85de..f4924f0b9 100644 --- a/pokeblue_vc.sym +++ b/pokeblue_vc.sym @@ -2730,7 +2730,7 @@ 03:4d7b SeafoamIslandsB2FHS 03:4d81 SeafoamIslandsB3FHS 03:4d8d SeafoamIslandsB4FHS -03:4d99 PrintStrengthTxt +03:4d99 PrintStrengthText 03:4daa UsedStrengthText 03:4dbb CanMoveBouldersText 03:4dc0 IsSurfingAllowed @@ -9240,7 +9240,7 @@ 13:7f81 EnterMapAnimPredef 13:7f84 GetTileTwoStepsInFrontOfPlayerPredef 13:7f87 CheckForCollisionWhenPushingBoulderPredef -13:7f8a PrintStrengthTxtPredef +13:7f8a PrintStrengthTextPredef 13:7f8d PickUpItemPredef 13:7f90 PrintMoveTypePredef 13:7f93 LoadMovePPsPredef @@ -12179,8 +12179,8 @@ 1a:4026 DecrementPP.DecrementPP 1a:402f Version_GFX 1a:406f Version_GFXEnd -1a:406f Gym_GFX 1a:406f Dojo_GFX +1a:406f Gym_GFX 1a:466f Dojo_Block 1a:466f Gym_Block 1a:4daf Mart_GFX @@ -15107,7 +15107,7 @@ 20:6140 _RocketHideoutB3FRocket1BattleText 20:6168 _RocketHideoutB3FRocket1EndBattleText 20:617a _RocketHideoutB3FRocket1AfterBattleText -20:61b8 _RocketHideout3BattleTxt +20:61b8 _RocketHideout3BattleText 20:61e9 _RocketHideout3EndBattleText3 20:61fc _RocketHide3AfterBattleText3 20:623e _RocketHideoutB4FGiovanniImpressedYouGotHereText @@ -17507,8 +17507,8 @@ 00:8800 vFont 00:8800 vChars1 00:8800 vNPCSprites2 -00:9000 vChars2 00:9000 vFrontPic +00:9000 vChars2 00:9000 vTileset 00:9310 vBackPic 00:9310 vTitleLogo2 @@ -17616,8 +17616,8 @@ 00:c11a wSprite01StateData1YAdjusted 00:c11b wSprite01StateData1XAdjusted 00:c11c wSprite01StateData1CollisionData -00:c120 wSprite02StateData1PictureID 00:c120 wSprite01StateData1End +00:c120 wSprite02StateData1PictureID 00:c120 wSprite02StateData1 00:c121 wSprite02StateData1MovementStatus 00:c122 wSprite02StateData1ImageIndex @@ -17646,9 +17646,9 @@ 00:c13a wSprite03StateData1YAdjusted 00:c13b wSprite03StateData1XAdjusted 00:c13c wSprite03StateData1CollisionData +00:c140 wSprite04StateData1PictureID 00:c140 wSprite03StateData1End 00:c140 wSprite04StateData1 -00:c140 wSprite04StateData1PictureID 00:c141 wSprite04StateData1MovementStatus 00:c142 wSprite04StateData1ImageIndex 00:c143 wSprite04StateData1YStepVector @@ -17944,9 +17944,9 @@ 00:c289 wSprite08StateData2OrigFacingDirection 00:c28d wSprite08StateData2PictureID 00:c28e wSprite08StateData2ImageBaseOffset +00:c290 wSprite09StateData2 00:c290 wSprite08StateData2End 00:c290 wSprite09StateData2WalkAnimationCounter -00:c290 wSprite09StateData2 00:c292 wSprite09StateData2YDisplacement 00:c293 wSprite09StateData2XDisplacement 00:c294 wSprite09StateData2MapY @@ -17983,9 +17983,9 @@ 00:c2b9 wSprite11StateData2OrigFacingDirection 00:c2bd wSprite11StateData2PictureID 00:c2be wSprite11StateData2ImageBaseOffset +00:c2c0 wSprite12StateData2 00:c2c0 wSprite12StateData2WalkAnimationCounter 00:c2c0 wSprite11StateData2End -00:c2c0 wSprite12StateData2 00:c2c2 wSprite12StateData2YDisplacement 00:c2c3 wSprite12StateData2XDisplacement 00:c2c4 wSprite12StateData2MapY @@ -18168,8 +18168,8 @@ 00:c365 wShadowOAMSprite25XCoord 00:c366 wShadowOAMSprite25TileID 00:c367 wShadowOAMSprite25Attributes -00:c368 wShadowOAMSprite26YCoord 00:c368 wShadowOAMSprite26 +00:c368 wShadowOAMSprite26YCoord 00:c369 wShadowOAMSprite26XCoord 00:c36a wShadowOAMSprite26TileID 00:c36b wShadowOAMSprite26Attributes @@ -18203,8 +18203,8 @@ 00:c381 wShadowOAMSprite32XCoord 00:c382 wShadowOAMSprite32TileID 00:c383 wShadowOAMSprite32Attributes -00:c384 wShadowOAMSprite33 00:c384 wShadowOAMSprite33YCoord +00:c384 wShadowOAMSprite33 00:c385 wShadowOAMSprite33XCoord 00:c386 wShadowOAMSprite33TileID 00:c387 wShadowOAMSprite33Attributes @@ -18271,11 +18271,11 @@ 00:cc3d wSerialExchangeNybbleTempReceiveData 00:cc3d wSerialSyncAndExchangeNybbleReceiveData 00:cc3e wSerialExchangeNybbleReceiveData -00:cc42 wLinkMenuSelectionSendBuffer 00:cc42 wSerialExchangeNybbleSendData +00:cc42 wLinkMenuSelectionSendBuffer +00:cc47 wUnknownSerialCounter 00:cc47 wEnteringCableClub 00:cc47 wLinkTimeoutCounter -00:cc47 wUnknownSerialCounter 00:cc49 wWhichTradeMonSelectionMenu 00:cc49 wMonDataLocation 00:cc4a wMenuWrappingEnabled @@ -18288,19 +18288,19 @@ 00:cc55 wTrainerHeaderFlagBit 00:cc57 wNPCMovementScriptPointerTableNum 00:cc58 wNPCMovementScriptBank -00:cc5b wUnusedCC5B +00:cc5b wBoostExpByExpAll +00:cc5b wAnimationType 00:cc5b wNPCMovementDirections -00:cc5b wVermilionDockTileMapBuffer 00:cc5b wTrainerCardBlkPacket -00:cc5b wDexRatingNumMonsSeen +00:cc5b wMonPartySpritesSavedOAM +00:cc5b wElevatorWarpMaps +00:cc5b wVermilionDockTileMapBuffer +00:cc5b wSlotMachineSevenAndBarModeChance 00:cc5b wOaksAideRewardItemName 00:cc5b wHallOfFame -00:cc5b wSlotMachineSevenAndBarModeChance -00:cc5b wElevatorWarpMaps +00:cc5b wDexRatingNumMonsSeen +00:cc5b wUnusedFlag 00:cc5b wFilteredBagItems -00:cc5b wMonPartySpritesSavedOAM -00:cc5b wAnimationType -00:cc5b wBoostExpByExpAll 00:cc5c wDexRatingNumMonsOwned 00:cc5d wDexRatingText 00:cc5e wSlotMachineSavedROMBank @@ -18309,11 +18309,11 @@ 00:cc97 wSwitchPartyMonTempBuffer 00:cca1 wNumStepsToTake 00:ccd2 wRLEByteCount -00:ccd3 wParentMenuItem 00:ccd3 wCanEvolveFlags -00:ccd3 wSimulatedJoypadStatesEnd 00:ccd3 wMiscBattleData +00:ccd3 wParentMenuItem 00:ccd3 wAddedToParty +00:ccd3 wSimulatedJoypadStatesEnd 00:ccd4 wForceEvolution 00:ccd5 wAILayer2Encouragement 00:ccd7 wPlayerSubstituteHP @@ -18342,12 +18342,12 @@ 00:ccf6 wLowHealthAlarmDisabled 00:ccf7 wPlayerMonMinimized 00:cd05 wEnemyNumHits -00:cd05 wEnemyBideAccumulatedDamage 00:cd05 wLuckySlotHiddenObjectIndex +00:cd05 wEnemyBideAccumulatedDamage 00:cd0f wPlayerMonUnmodifiedLevel +00:cd0f wVermilionDockTileMapBufferEnd 00:cd0f wMiscBattleDataEnd 00:cd0f wInGameTradeGiveMonSpecies -00:cd0f wVermilionDockTileMapBufferEnd 00:cd10 wPlayerMonUnmodifiedMaxHP 00:cd10 wInGameTradeTextPointerTablePointer 00:cd12 wPlayerMonUnmodifiedAttack @@ -18424,8 +18424,8 @@ 00:cd3d wCoordIndex 00:cd3d wTempSCX 00:cd3d wBoxMonCounts -00:cd3d wDayCareStartLevel 00:cd3d wUnusedCreditsByte +00:cd3d wDayCareStartLevel 00:cd3d wMoveDownSmallStarsOAMCount 00:cd3d wWereAnyMonsAsleep 00:cd3d wFallingObjectsMovementData @@ -18477,8 +18477,8 @@ 00:cd41 wHoFTeamIndex2 00:cd41 wNumFieldMoves 00:cd41 wTradedPlayerMonOT -00:cd41 wHiddenObjectX 00:cd41 wHiddenItemOrCoinsIndex +00:cd41 wHiddenObjectX 00:cd41 wTrainerScreenX 00:cd41 wDayCarePerLevelCost 00:cd42 wSlotMachineWheel1MiddleTile @@ -18519,7 +18519,7 @@ 00:cd5d wMonPartySpriteSpecies 00:cd5e wLeftGBMonSpecies 00:cd5f wRightGBMonSpecies -00:cd60 wFlags_0xcd60 +00:cd60 wMiscFlags 00:cd6a wActionResultOrTookBattleTurn 00:cd6b wJoyIgnore 00:cd6c wNumMovesMinusOne @@ -18849,7 +18849,7 @@ 00:d124 wIsKeyItem 00:d125 wTextBoxID 00:d126 wCurrentMapScriptFlags -00:d127 wCurEnemyLVL +00:d127 wCurEnemyLevel 00:d128 wItemListPointer 00:d12a wListCount 00:d12b wLinkState @@ -18859,8 +18859,8 @@ 00:d12e wMenuExitMethod 00:d12f wGymGateTileBlock 00:d12f wWhichPewterGuy -00:d12f wDungeonWarpDataEntrySize 00:d12f wWhichPrizeWindow +00:d12f wDungeonWarpDataEntrySize 00:d130 wSavedSpriteScreenY 00:d131 wSavedSpriteScreenX 00:d132 wSavedSpriteMapY @@ -18944,8 +18944,8 @@ 00:d1c4 wPartyMon3HP 00:d1c6 wPartyMon3BoxLevel 00:d1c7 wPartyMon3Status -00:d1c8 wPartyMon3Type 00:d1c8 wPartyMon3Type1 +00:d1c8 wPartyMon3Type 00:d1c9 wPartyMon3Type2 00:d1ca wPartyMon3CatchRate 00:d1cb wPartyMon3Moves @@ -19284,16 +19284,17 @@ 00:d71d wDungeonWarpDestinationMap 00:d71e wWhichDungeonWarp 00:d71f wUnusedCardKeyGateID -00:d728 wd728 +00:d728 wStatusFlags1 00:d72a wBeatGymFlags -00:d72c wd72c -00:d72d wd72d -00:d72e wd72e -00:d730 wd730 -00:d732 wd732 -00:d733 wFlags_D733 -00:d734 wBeatLorelei -00:d736 wd736 +00:d72c wStatusFlags2 +00:d72d wStatusFlags3 +00:d72d wCableClubDestinationMap +00:d72e wStatusFlags4 +00:d730 wStatusFlags5 +00:d732 wStatusFlags6 +00:d733 wStatusFlags7 +00:d734 wElite4Flags +00:d736 wMovementFlags 00:d737 wCompletedInGameTradeFlags 00:d73b wWarpedFromWhichWarp 00:d73c wWarpedFromWhichMap @@ -19956,10 +19957,10 @@ 00:ff8b hSpriteDataOffset 00:ff8b hPreviousTileset 00:ff8b hOAMTile +00:ff8b hBaseTileID 00:ff8b hItemPrice 00:ff8b hEastWestConnectedMapWidth 00:ff8b hDexWeight -00:ff8b hBaseTileID 00:ff8b hSpriteInterlaceCounter 00:ff8b hRLEByteValue 00:ff8c hNorthSouthConnectedMapWidth @@ -19995,12 +19996,12 @@ 00:ff95 hNPCPlayerYDistance 00:ff95 hNPCSpriteOffset 00:ff95 hDividend +00:ff95 hSignCoordPointer 00:ff95 hQuotient 00:ff95 hProduct 00:ff95 hNPCMovementDirections2Index 00:ff95 hPastLeadingZeros 00:ff95 hSwapTemp -00:ff95 hSignCoordPointer 00:ff96 hMutateWY 00:ff96 hSwapItemQuantity 00:ff96 hNumToPrint @@ -20082,8 +20083,8 @@ 00:ffdc hDexRatingNumMonsOwned 00:ffdc hVendingMachinePrice 00:ffdc hPlayerYCoord -00:ffdc hItemToRemoveIndex 00:ffdc hOaksAideRewardItem +00:ffdc hItemToRemoveIndex 00:ffdc hGymGateAnswer 00:ffdd hPlayerXCoord 00:ffdd hOaksAideNumMonsOwned diff --git a/pokered.map b/pokered.map index 8e6ad16a6..f2d89e4e2 100644 --- a/pokered.map +++ b/pokered.map @@ -2758,7 +2758,7 @@ ROMX bank #3: $4d7b = SeafoamIslandsB2FHS $4d81 = SeafoamIslandsB3FHS $4d8d = SeafoamIslandsB4FHS - $4d99 = PrintStrengthTxt + $4d99 = PrintStrengthText $4daa = UsedStrengthText $4dbb = CanMoveBouldersText $4dc0 = IsSurfingAllowed @@ -9364,7 +9364,7 @@ ROMX bank #19: $7f81 = EnterMapAnimPredef $7f84 = GetTileTwoStepsInFrontOfPlayerPredef $7f87 = CheckForCollisionWhenPushingBoulderPredef - $7f8a = PrintStrengthTxtPredef + $7f8a = PrintStrengthTextPredef $7f8d = PickUpItemPredef $7f90 = PrintMoveTypePredef $7f93 = LoadMovePPsPredef @@ -12354,8 +12354,8 @@ ROMX bank #26: $402f = Version_GFX $407f = Version_GFXEnd SECTION: $407f-$7ffe ($3f80 bytes) ["Tilesets 2"] - $407f = Gym_GFX $407f = Dojo_GFX + $407f = Gym_GFX $467f = Dojo_Block $467f = Gym_Block $4dbf = Mart_GFX @@ -15297,7 +15297,7 @@ ROMX bank #32: $6140 = _RocketHideoutB3FRocket1BattleText $6168 = _RocketHideoutB3FRocket1EndBattleText $617a = _RocketHideoutB3FRocket1AfterBattleText - $61b8 = _RocketHideout3BattleTxt + $61b8 = _RocketHideout3BattleText $61e9 = _RocketHideout3EndBattleText3 $61fc = _RocketHide3AfterBattleText3 $623e = _RocketHideoutB4FGiovanniImpressedYouGotHereText @@ -17760,8 +17760,8 @@ VRAM bank #0: $8800 = vFont $8800 = vChars1 $8800 = vNPCSprites2 - $9000 = vChars2 $9000 = vFrontPic + $9000 = vChars2 $9000 = vTileset $9310 = vBackPic $9310 = vTitleLogo2 @@ -17894,8 +17894,8 @@ WRAM0 bank #0: $c11a = wSprite01StateData1YAdjusted $c11b = wSprite01StateData1XAdjusted $c11c = wSprite01StateData1CollisionData - $c120 = wSprite02StateData1PictureID $c120 = wSprite01StateData1End + $c120 = wSprite02StateData1PictureID $c120 = wSprite02StateData1 $c121 = wSprite02StateData1MovementStatus $c122 = wSprite02StateData1ImageIndex @@ -17924,9 +17924,9 @@ WRAM0 bank #0: $c13a = wSprite03StateData1YAdjusted $c13b = wSprite03StateData1XAdjusted $c13c = wSprite03StateData1CollisionData + $c140 = wSprite04StateData1PictureID $c140 = wSprite03StateData1End $c140 = wSprite04StateData1 - $c140 = wSprite04StateData1PictureID $c141 = wSprite04StateData1MovementStatus $c142 = wSprite04StateData1ImageIndex $c143 = wSprite04StateData1YStepVector @@ -18222,9 +18222,9 @@ WRAM0 bank #0: $c289 = wSprite08StateData2OrigFacingDirection $c28d = wSprite08StateData2PictureID $c28e = wSprite08StateData2ImageBaseOffset + $c290 = wSprite09StateData2 $c290 = wSprite08StateData2End $c290 = wSprite09StateData2WalkAnimationCounter - $c290 = wSprite09StateData2 $c292 = wSprite09StateData2YDisplacement $c293 = wSprite09StateData2XDisplacement $c294 = wSprite09StateData2MapY @@ -18261,9 +18261,9 @@ WRAM0 bank #0: $c2b9 = wSprite11StateData2OrigFacingDirection $c2bd = wSprite11StateData2PictureID $c2be = wSprite11StateData2ImageBaseOffset + $c2c0 = wSprite12StateData2 $c2c0 = wSprite12StateData2WalkAnimationCounter $c2c0 = wSprite11StateData2End - $c2c0 = wSprite12StateData2 $c2c2 = wSprite12StateData2YDisplacement $c2c3 = wSprite12StateData2XDisplacement $c2c4 = wSprite12StateData2MapY @@ -18447,8 +18447,8 @@ WRAM0 bank #0: $c365 = wShadowOAMSprite25XCoord $c366 = wShadowOAMSprite25TileID $c367 = wShadowOAMSprite25Attributes - $c368 = wShadowOAMSprite26YCoord $c368 = wShadowOAMSprite26 + $c368 = wShadowOAMSprite26YCoord $c369 = wShadowOAMSprite26XCoord $c36a = wShadowOAMSprite26TileID $c36b = wShadowOAMSprite26Attributes @@ -18482,8 +18482,8 @@ WRAM0 bank #0: $c381 = wShadowOAMSprite32XCoord $c382 = wShadowOAMSprite32TileID $c383 = wShadowOAMSprite32Attributes - $c384 = wShadowOAMSprite33 $c384 = wShadowOAMSprite33YCoord + $c384 = wShadowOAMSprite33 $c385 = wShadowOAMSprite33XCoord $c386 = wShadowOAMSprite33TileID $c387 = wShadowOAMSprite33Attributes @@ -18553,11 +18553,11 @@ WRAM0 bank #0: $cc3d = wSerialExchangeNybbleTempReceiveData $cc3d = wSerialSyncAndExchangeNybbleReceiveData $cc3e = wSerialExchangeNybbleReceiveData - $cc42 = wLinkMenuSelectionSendBuffer $cc42 = wSerialExchangeNybbleSendData + $cc42 = wLinkMenuSelectionSendBuffer + $cc47 = wUnknownSerialCounter $cc47 = wEnteringCableClub $cc47 = wLinkTimeoutCounter - $cc47 = wUnknownSerialCounter $cc49 = wWhichTradeMonSelectionMenu $cc49 = wMonDataLocation $cc4a = wMenuWrappingEnabled @@ -18570,19 +18570,19 @@ WRAM0 bank #0: $cc55 = wTrainerHeaderFlagBit $cc57 = wNPCMovementScriptPointerTableNum $cc58 = wNPCMovementScriptBank - $cc5b = wUnusedCC5B + $cc5b = wBoostExpByExpAll + $cc5b = wAnimationType $cc5b = wNPCMovementDirections - $cc5b = wVermilionDockTileMapBuffer $cc5b = wTrainerCardBlkPacket - $cc5b = wDexRatingNumMonsSeen + $cc5b = wMonPartySpritesSavedOAM + $cc5b = wElevatorWarpMaps + $cc5b = wVermilionDockTileMapBuffer + $cc5b = wSlotMachineSevenAndBarModeChance $cc5b = wOaksAideRewardItemName $cc5b = wHallOfFame - $cc5b = wSlotMachineSevenAndBarModeChance - $cc5b = wElevatorWarpMaps + $cc5b = wDexRatingNumMonsSeen + $cc5b = wUnusedFlag $cc5b = wFilteredBagItems - $cc5b = wMonPartySpritesSavedOAM - $cc5b = wAnimationType - $cc5b = wBoostExpByExpAll $cc5c = wDexRatingNumMonsOwned $cc5d = wDexRatingText $cc5e = wSlotMachineSavedROMBank @@ -18591,11 +18591,11 @@ WRAM0 bank #0: $cc97 = wSwitchPartyMonTempBuffer $cca1 = wNumStepsToTake $ccd2 = wRLEByteCount - $ccd3 = wParentMenuItem $ccd3 = wCanEvolveFlags - $ccd3 = wSimulatedJoypadStatesEnd $ccd3 = wMiscBattleData + $ccd3 = wParentMenuItem $ccd3 = wAddedToParty + $ccd3 = wSimulatedJoypadStatesEnd $ccd4 = wForceEvolution $ccd5 = wAILayer2Encouragement $ccd7 = wPlayerSubstituteHP @@ -18624,12 +18624,12 @@ WRAM0 bank #0: $ccf6 = wLowHealthAlarmDisabled $ccf7 = wPlayerMonMinimized $cd05 = wEnemyNumHits - $cd05 = wEnemyBideAccumulatedDamage $cd05 = wLuckySlotHiddenObjectIndex + $cd05 = wEnemyBideAccumulatedDamage $cd0f = wPlayerMonUnmodifiedLevel + $cd0f = wVermilionDockTileMapBufferEnd $cd0f = wMiscBattleDataEnd $cd0f = wInGameTradeGiveMonSpecies - $cd0f = wVermilionDockTileMapBufferEnd $cd10 = wPlayerMonUnmodifiedMaxHP $cd10 = wInGameTradeTextPointerTablePointer $cd12 = wPlayerMonUnmodifiedAttack @@ -18706,8 +18706,8 @@ WRAM0 bank #0: $cd3d = wCoordIndex $cd3d = wTempSCX $cd3d = wBoxMonCounts - $cd3d = wDayCareStartLevel $cd3d = wUnusedCreditsByte + $cd3d = wDayCareStartLevel $cd3d = wMoveDownSmallStarsOAMCount $cd3d = wWereAnyMonsAsleep $cd3d = wFallingObjectsMovementData @@ -18759,8 +18759,8 @@ WRAM0 bank #0: $cd41 = wHoFTeamIndex2 $cd41 = wNumFieldMoves $cd41 = wTradedPlayerMonOT - $cd41 = wHiddenObjectX $cd41 = wHiddenItemOrCoinsIndex + $cd41 = wHiddenObjectX $cd41 = wTrainerScreenX $cd41 = wDayCarePerLevelCost $cd42 = wSlotMachineWheel1MiddleTile @@ -18801,7 +18801,7 @@ WRAM0 bank #0: $cd5d = wMonPartySpriteSpecies $cd5e = wLeftGBMonSpecies $cd5f = wRightGBMonSpecies - $cd60 = wFlags_0xcd60 + $cd60 = wMiscFlags $cd6a = wActionResultOrTookBattleTurn $cd6b = wJoyIgnore $cd6c = wNumMovesMinusOne @@ -19131,7 +19131,7 @@ WRAM0 bank #0: $d124 = wIsKeyItem $d125 = wTextBoxID $d126 = wCurrentMapScriptFlags - $d127 = wCurEnemyLVL + $d127 = wCurEnemyLevel $d128 = wItemListPointer $d12a = wListCount $d12b = wLinkState @@ -19141,8 +19141,8 @@ WRAM0 bank #0: $d12e = wMenuExitMethod $d12f = wGymGateTileBlock $d12f = wWhichPewterGuy - $d12f = wDungeonWarpDataEntrySize $d12f = wWhichPrizeWindow + $d12f = wDungeonWarpDataEntrySize $d130 = wSavedSpriteScreenY $d131 = wSavedSpriteScreenX $d132 = wSavedSpriteMapY @@ -19227,8 +19227,8 @@ WRAM0 bank #0: $d1c4 = wPartyMon3HP $d1c6 = wPartyMon3BoxLevel $d1c7 = wPartyMon3Status - $d1c8 = wPartyMon3Type $d1c8 = wPartyMon3Type1 + $d1c8 = wPartyMon3Type $d1c9 = wPartyMon3Type2 $d1ca = wPartyMon3CatchRate $d1cb = wPartyMon3Moves @@ -19568,16 +19568,17 @@ WRAM0 bank #0: $d71d = wDungeonWarpDestinationMap $d71e = wWhichDungeonWarp $d71f = wUnusedCardKeyGateID - $d728 = wd728 + $d728 = wStatusFlags1 $d72a = wBeatGymFlags - $d72c = wd72c - $d72d = wd72d - $d72e = wd72e - $d730 = wd730 - $d732 = wd732 - $d733 = wFlags_D733 - $d734 = wBeatLorelei - $d736 = wd736 + $d72c = wStatusFlags2 + $d72d = wStatusFlags3 + $d72d = wCableClubDestinationMap + $d72e = wStatusFlags4 + $d730 = wStatusFlags5 + $d732 = wStatusFlags6 + $d733 = wStatusFlags7 + $d734 = wElite4Flags + $d736 = wMovementFlags $d737 = wCompletedInGameTradeFlags $d73b = wWarpedFromWhichWarp $d73c = wWarpedFromWhichMap @@ -20248,10 +20249,10 @@ HRAM bank #0: $ff8b = hSpriteDataOffset $ff8b = hPreviousTileset $ff8b = hOAMTile + $ff8b = hBaseTileID $ff8b = hItemPrice $ff8b = hEastWestConnectedMapWidth $ff8b = hDexWeight - $ff8b = hBaseTileID $ff8b = hSpriteInterlaceCounter $ff8b = hRLEByteValue $ff8c = hNorthSouthConnectedMapWidth @@ -20287,12 +20288,12 @@ HRAM bank #0: $ff95 = hNPCPlayerYDistance $ff95 = hNPCSpriteOffset $ff95 = hDividend + $ff95 = hSignCoordPointer $ff95 = hQuotient $ff95 = hProduct $ff95 = hNPCMovementDirections2Index $ff95 = hPastLeadingZeros $ff95 = hSwapTemp - $ff95 = hSignCoordPointer $ff96 = hMutateWY $ff96 = hSwapItemQuantity $ff96 = hNumToPrint @@ -20374,8 +20375,8 @@ HRAM bank #0: $ffdc = hDexRatingNumMonsOwned $ffdc = hVendingMachinePrice $ffdc = hPlayerYCoord - $ffdc = hItemToRemoveIndex $ffdc = hOaksAideRewardItem + $ffdc = hItemToRemoveIndex $ffdc = hGymGateAnswer $ffdd = hPlayerXCoord $ffdd = hOaksAideNumMonsOwned diff --git a/pokered.sym b/pokered.sym index bcc654e50..3f79f9154 100644 --- a/pokered.sym +++ b/pokered.sym @@ -2714,7 +2714,7 @@ 03:4d7b SeafoamIslandsB2FHS 03:4d81 SeafoamIslandsB3FHS 03:4d8d SeafoamIslandsB4FHS -03:4d99 PrintStrengthTxt +03:4d99 PrintStrengthText 03:4daa UsedStrengthText 03:4dbb CanMoveBouldersText 03:4dc0 IsSurfingAllowed @@ -9213,7 +9213,7 @@ 13:7f81 EnterMapAnimPredef 13:7f84 GetTileTwoStepsInFrontOfPlayerPredef 13:7f87 CheckForCollisionWhenPushingBoulderPredef -13:7f8a PrintStrengthTxtPredef +13:7f8a PrintStrengthTextPredef 13:7f8d PickUpItemPredef 13:7f90 PrintMoveTypePredef 13:7f93 LoadMovePPsPredef @@ -12152,8 +12152,8 @@ 1a:4026 DecrementPP.DecrementPP 1a:402f Version_GFX 1a:407f Version_GFXEnd -1a:407f Gym_GFX 1a:407f Dojo_GFX +1a:407f Gym_GFX 1a:467f Dojo_Block 1a:467f Gym_Block 1a:4dbf Mart_GFX @@ -15057,7 +15057,7 @@ 20:6140 _RocketHideoutB3FRocket1BattleText 20:6168 _RocketHideoutB3FRocket1EndBattleText 20:617a _RocketHideoutB3FRocket1AfterBattleText -20:61b8 _RocketHideout3BattleTxt +20:61b8 _RocketHideout3BattleText 20:61e9 _RocketHideout3EndBattleText3 20:61fc _RocketHide3AfterBattleText3 20:623e _RocketHideoutB4FGiovanniImpressedYouGotHereText @@ -17455,8 +17455,8 @@ 00:8800 vFont 00:8800 vChars1 00:8800 vNPCSprites2 -00:9000 vChars2 00:9000 vFrontPic +00:9000 vChars2 00:9000 vTileset 00:9310 vBackPic 00:9310 vTitleLogo2 @@ -17564,8 +17564,8 @@ 00:c11a wSprite01StateData1YAdjusted 00:c11b wSprite01StateData1XAdjusted 00:c11c wSprite01StateData1CollisionData -00:c120 wSprite02StateData1PictureID 00:c120 wSprite01StateData1End +00:c120 wSprite02StateData1PictureID 00:c120 wSprite02StateData1 00:c121 wSprite02StateData1MovementStatus 00:c122 wSprite02StateData1ImageIndex @@ -17594,9 +17594,9 @@ 00:c13a wSprite03StateData1YAdjusted 00:c13b wSprite03StateData1XAdjusted 00:c13c wSprite03StateData1CollisionData +00:c140 wSprite04StateData1PictureID 00:c140 wSprite03StateData1End 00:c140 wSprite04StateData1 -00:c140 wSprite04StateData1PictureID 00:c141 wSprite04StateData1MovementStatus 00:c142 wSprite04StateData1ImageIndex 00:c143 wSprite04StateData1YStepVector @@ -17892,9 +17892,9 @@ 00:c289 wSprite08StateData2OrigFacingDirection 00:c28d wSprite08StateData2PictureID 00:c28e wSprite08StateData2ImageBaseOffset +00:c290 wSprite09StateData2 00:c290 wSprite08StateData2End 00:c290 wSprite09StateData2WalkAnimationCounter -00:c290 wSprite09StateData2 00:c292 wSprite09StateData2YDisplacement 00:c293 wSprite09StateData2XDisplacement 00:c294 wSprite09StateData2MapY @@ -17931,9 +17931,9 @@ 00:c2b9 wSprite11StateData2OrigFacingDirection 00:c2bd wSprite11StateData2PictureID 00:c2be wSprite11StateData2ImageBaseOffset +00:c2c0 wSprite12StateData2 00:c2c0 wSprite12StateData2WalkAnimationCounter 00:c2c0 wSprite11StateData2End -00:c2c0 wSprite12StateData2 00:c2c2 wSprite12StateData2YDisplacement 00:c2c3 wSprite12StateData2XDisplacement 00:c2c4 wSprite12StateData2MapY @@ -18116,8 +18116,8 @@ 00:c365 wShadowOAMSprite25XCoord 00:c366 wShadowOAMSprite25TileID 00:c367 wShadowOAMSprite25Attributes -00:c368 wShadowOAMSprite26YCoord 00:c368 wShadowOAMSprite26 +00:c368 wShadowOAMSprite26YCoord 00:c369 wShadowOAMSprite26XCoord 00:c36a wShadowOAMSprite26TileID 00:c36b wShadowOAMSprite26Attributes @@ -18151,8 +18151,8 @@ 00:c381 wShadowOAMSprite32XCoord 00:c382 wShadowOAMSprite32TileID 00:c383 wShadowOAMSprite32Attributes -00:c384 wShadowOAMSprite33 00:c384 wShadowOAMSprite33YCoord +00:c384 wShadowOAMSprite33 00:c385 wShadowOAMSprite33XCoord 00:c386 wShadowOAMSprite33TileID 00:c387 wShadowOAMSprite33Attributes @@ -18219,11 +18219,11 @@ 00:cc3d wSerialExchangeNybbleTempReceiveData 00:cc3d wSerialSyncAndExchangeNybbleReceiveData 00:cc3e wSerialExchangeNybbleReceiveData -00:cc42 wLinkMenuSelectionSendBuffer 00:cc42 wSerialExchangeNybbleSendData +00:cc42 wLinkMenuSelectionSendBuffer +00:cc47 wUnknownSerialCounter 00:cc47 wEnteringCableClub 00:cc47 wLinkTimeoutCounter -00:cc47 wUnknownSerialCounter 00:cc49 wWhichTradeMonSelectionMenu 00:cc49 wMonDataLocation 00:cc4a wMenuWrappingEnabled @@ -18236,19 +18236,19 @@ 00:cc55 wTrainerHeaderFlagBit 00:cc57 wNPCMovementScriptPointerTableNum 00:cc58 wNPCMovementScriptBank -00:cc5b wUnusedCC5B +00:cc5b wBoostExpByExpAll +00:cc5b wAnimationType 00:cc5b wNPCMovementDirections -00:cc5b wVermilionDockTileMapBuffer 00:cc5b wTrainerCardBlkPacket -00:cc5b wDexRatingNumMonsSeen +00:cc5b wMonPartySpritesSavedOAM +00:cc5b wElevatorWarpMaps +00:cc5b wVermilionDockTileMapBuffer +00:cc5b wSlotMachineSevenAndBarModeChance 00:cc5b wOaksAideRewardItemName 00:cc5b wHallOfFame -00:cc5b wSlotMachineSevenAndBarModeChance -00:cc5b wElevatorWarpMaps +00:cc5b wDexRatingNumMonsSeen +00:cc5b wUnusedFlag 00:cc5b wFilteredBagItems -00:cc5b wMonPartySpritesSavedOAM -00:cc5b wAnimationType -00:cc5b wBoostExpByExpAll 00:cc5c wDexRatingNumMonsOwned 00:cc5d wDexRatingText 00:cc5e wSlotMachineSavedROMBank @@ -18257,11 +18257,11 @@ 00:cc97 wSwitchPartyMonTempBuffer 00:cca1 wNumStepsToTake 00:ccd2 wRLEByteCount -00:ccd3 wParentMenuItem 00:ccd3 wCanEvolveFlags -00:ccd3 wSimulatedJoypadStatesEnd 00:ccd3 wMiscBattleData +00:ccd3 wParentMenuItem 00:ccd3 wAddedToParty +00:ccd3 wSimulatedJoypadStatesEnd 00:ccd4 wForceEvolution 00:ccd5 wAILayer2Encouragement 00:ccd7 wPlayerSubstituteHP @@ -18290,12 +18290,12 @@ 00:ccf6 wLowHealthAlarmDisabled 00:ccf7 wPlayerMonMinimized 00:cd05 wEnemyNumHits -00:cd05 wEnemyBideAccumulatedDamage 00:cd05 wLuckySlotHiddenObjectIndex +00:cd05 wEnemyBideAccumulatedDamage 00:cd0f wPlayerMonUnmodifiedLevel +00:cd0f wVermilionDockTileMapBufferEnd 00:cd0f wMiscBattleDataEnd 00:cd0f wInGameTradeGiveMonSpecies -00:cd0f wVermilionDockTileMapBufferEnd 00:cd10 wPlayerMonUnmodifiedMaxHP 00:cd10 wInGameTradeTextPointerTablePointer 00:cd12 wPlayerMonUnmodifiedAttack @@ -18372,8 +18372,8 @@ 00:cd3d wCoordIndex 00:cd3d wTempSCX 00:cd3d wBoxMonCounts -00:cd3d wDayCareStartLevel 00:cd3d wUnusedCreditsByte +00:cd3d wDayCareStartLevel 00:cd3d wMoveDownSmallStarsOAMCount 00:cd3d wWereAnyMonsAsleep 00:cd3d wFallingObjectsMovementData @@ -18425,8 +18425,8 @@ 00:cd41 wHoFTeamIndex2 00:cd41 wNumFieldMoves 00:cd41 wTradedPlayerMonOT -00:cd41 wHiddenObjectX 00:cd41 wHiddenItemOrCoinsIndex +00:cd41 wHiddenObjectX 00:cd41 wTrainerScreenX 00:cd41 wDayCarePerLevelCost 00:cd42 wSlotMachineWheel1MiddleTile @@ -18467,7 +18467,7 @@ 00:cd5d wMonPartySpriteSpecies 00:cd5e wLeftGBMonSpecies 00:cd5f wRightGBMonSpecies -00:cd60 wFlags_0xcd60 +00:cd60 wMiscFlags 00:cd6a wActionResultOrTookBattleTurn 00:cd6b wJoyIgnore 00:cd6c wNumMovesMinusOne @@ -18797,7 +18797,7 @@ 00:d124 wIsKeyItem 00:d125 wTextBoxID 00:d126 wCurrentMapScriptFlags -00:d127 wCurEnemyLVL +00:d127 wCurEnemyLevel 00:d128 wItemListPointer 00:d12a wListCount 00:d12b wLinkState @@ -18807,8 +18807,8 @@ 00:d12e wMenuExitMethod 00:d12f wGymGateTileBlock 00:d12f wWhichPewterGuy -00:d12f wDungeonWarpDataEntrySize 00:d12f wWhichPrizeWindow +00:d12f wDungeonWarpDataEntrySize 00:d130 wSavedSpriteScreenY 00:d131 wSavedSpriteScreenX 00:d132 wSavedSpriteMapY @@ -18892,8 +18892,8 @@ 00:d1c4 wPartyMon3HP 00:d1c6 wPartyMon3BoxLevel 00:d1c7 wPartyMon3Status -00:d1c8 wPartyMon3Type 00:d1c8 wPartyMon3Type1 +00:d1c8 wPartyMon3Type 00:d1c9 wPartyMon3Type2 00:d1ca wPartyMon3CatchRate 00:d1cb wPartyMon3Moves @@ -19232,16 +19232,17 @@ 00:d71d wDungeonWarpDestinationMap 00:d71e wWhichDungeonWarp 00:d71f wUnusedCardKeyGateID -00:d728 wd728 +00:d728 wStatusFlags1 00:d72a wBeatGymFlags -00:d72c wd72c -00:d72d wd72d -00:d72e wd72e -00:d730 wd730 -00:d732 wd732 -00:d733 wFlags_D733 -00:d734 wBeatLorelei -00:d736 wd736 +00:d72c wStatusFlags2 +00:d72d wStatusFlags3 +00:d72d wCableClubDestinationMap +00:d72e wStatusFlags4 +00:d730 wStatusFlags5 +00:d732 wStatusFlags6 +00:d733 wStatusFlags7 +00:d734 wElite4Flags +00:d736 wMovementFlags 00:d737 wCompletedInGameTradeFlags 00:d73b wWarpedFromWhichWarp 00:d73c wWarpedFromWhichMap @@ -19904,10 +19905,10 @@ 00:ff8b hSpriteDataOffset 00:ff8b hPreviousTileset 00:ff8b hOAMTile +00:ff8b hBaseTileID 00:ff8b hItemPrice 00:ff8b hEastWestConnectedMapWidth 00:ff8b hDexWeight -00:ff8b hBaseTileID 00:ff8b hSpriteInterlaceCounter 00:ff8b hRLEByteValue 00:ff8c hNorthSouthConnectedMapWidth @@ -19943,12 +19944,12 @@ 00:ff95 hNPCPlayerYDistance 00:ff95 hNPCSpriteOffset 00:ff95 hDividend +00:ff95 hSignCoordPointer 00:ff95 hQuotient 00:ff95 hProduct 00:ff95 hNPCMovementDirections2Index 00:ff95 hPastLeadingZeros 00:ff95 hSwapTemp -00:ff95 hSignCoordPointer 00:ff96 hMutateWY 00:ff96 hSwapItemQuantity 00:ff96 hNumToPrint @@ -20030,8 +20031,8 @@ 00:ffdc hDexRatingNumMonsOwned 00:ffdc hVendingMachinePrice 00:ffdc hPlayerYCoord -00:ffdc hItemToRemoveIndex 00:ffdc hOaksAideRewardItem +00:ffdc hItemToRemoveIndex 00:ffdc hGymGateAnswer 00:ffdd hPlayerXCoord 00:ffdd hOaksAideNumMonsOwned diff --git a/pokered_vc.map b/pokered_vc.map index e0b1ba721..ddb603ad6 100644 --- a/pokered_vc.map +++ b/pokered_vc.map @@ -2774,7 +2774,7 @@ ROMX bank #3: $4d7b = SeafoamIslandsB2FHS $4d81 = SeafoamIslandsB3FHS $4d8d = SeafoamIslandsB4FHS - $4d99 = PrintStrengthTxt + $4d99 = PrintStrengthText $4daa = UsedStrengthText $4dbb = CanMoveBouldersText $4dc0 = IsSurfingAllowed @@ -9393,7 +9393,7 @@ ROMX bank #19: $7f81 = EnterMapAnimPredef $7f84 = GetTileTwoStepsInFrontOfPlayerPredef $7f87 = CheckForCollisionWhenPushingBoulderPredef - $7f8a = PrintStrengthTxtPredef + $7f8a = PrintStrengthTextPredef $7f8d = PickUpItemPredef $7f90 = PrintMoveTypePredef $7f93 = LoadMovePPsPredef @@ -12383,8 +12383,8 @@ ROMX bank #26: $402f = Version_GFX $407f = Version_GFXEnd SECTION: $407f-$7ffe ($3f80 bytes) ["Tilesets 2"] - $407f = Gym_GFX $407f = Dojo_GFX + $407f = Gym_GFX $467f = Dojo_Block $467f = Gym_Block $4dbf = Mart_GFX @@ -15350,7 +15350,7 @@ ROMX bank #32: $6140 = _RocketHideoutB3FRocket1BattleText $6168 = _RocketHideoutB3FRocket1EndBattleText $617a = _RocketHideoutB3FRocket1AfterBattleText - $61b8 = _RocketHideout3BattleTxt + $61b8 = _RocketHideout3BattleText $61e9 = _RocketHideout3EndBattleText3 $61fc = _RocketHide3AfterBattleText3 $623e = _RocketHideoutB4FGiovanniImpressedYouGotHereText @@ -17815,8 +17815,8 @@ VRAM bank #0: $8800 = vFont $8800 = vChars1 $8800 = vNPCSprites2 - $9000 = vChars2 $9000 = vFrontPic + $9000 = vChars2 $9000 = vTileset $9310 = vBackPic $9310 = vTitleLogo2 @@ -17949,8 +17949,8 @@ WRAM0 bank #0: $c11a = wSprite01StateData1YAdjusted $c11b = wSprite01StateData1XAdjusted $c11c = wSprite01StateData1CollisionData - $c120 = wSprite02StateData1PictureID $c120 = wSprite01StateData1End + $c120 = wSprite02StateData1PictureID $c120 = wSprite02StateData1 $c121 = wSprite02StateData1MovementStatus $c122 = wSprite02StateData1ImageIndex @@ -17979,9 +17979,9 @@ WRAM0 bank #0: $c13a = wSprite03StateData1YAdjusted $c13b = wSprite03StateData1XAdjusted $c13c = wSprite03StateData1CollisionData + $c140 = wSprite04StateData1PictureID $c140 = wSprite03StateData1End $c140 = wSprite04StateData1 - $c140 = wSprite04StateData1PictureID $c141 = wSprite04StateData1MovementStatus $c142 = wSprite04StateData1ImageIndex $c143 = wSprite04StateData1YStepVector @@ -18277,9 +18277,9 @@ WRAM0 bank #0: $c289 = wSprite08StateData2OrigFacingDirection $c28d = wSprite08StateData2PictureID $c28e = wSprite08StateData2ImageBaseOffset + $c290 = wSprite09StateData2 $c290 = wSprite08StateData2End $c290 = wSprite09StateData2WalkAnimationCounter - $c290 = wSprite09StateData2 $c292 = wSprite09StateData2YDisplacement $c293 = wSprite09StateData2XDisplacement $c294 = wSprite09StateData2MapY @@ -18316,9 +18316,9 @@ WRAM0 bank #0: $c2b9 = wSprite11StateData2OrigFacingDirection $c2bd = wSprite11StateData2PictureID $c2be = wSprite11StateData2ImageBaseOffset + $c2c0 = wSprite12StateData2 $c2c0 = wSprite12StateData2WalkAnimationCounter $c2c0 = wSprite11StateData2End - $c2c0 = wSprite12StateData2 $c2c2 = wSprite12StateData2YDisplacement $c2c3 = wSprite12StateData2XDisplacement $c2c4 = wSprite12StateData2MapY @@ -18502,8 +18502,8 @@ WRAM0 bank #0: $c365 = wShadowOAMSprite25XCoord $c366 = wShadowOAMSprite25TileID $c367 = wShadowOAMSprite25Attributes - $c368 = wShadowOAMSprite26YCoord $c368 = wShadowOAMSprite26 + $c368 = wShadowOAMSprite26YCoord $c369 = wShadowOAMSprite26XCoord $c36a = wShadowOAMSprite26TileID $c36b = wShadowOAMSprite26Attributes @@ -18537,8 +18537,8 @@ WRAM0 bank #0: $c381 = wShadowOAMSprite32XCoord $c382 = wShadowOAMSprite32TileID $c383 = wShadowOAMSprite32Attributes - $c384 = wShadowOAMSprite33 $c384 = wShadowOAMSprite33YCoord + $c384 = wShadowOAMSprite33 $c385 = wShadowOAMSprite33XCoord $c386 = wShadowOAMSprite33TileID $c387 = wShadowOAMSprite33Attributes @@ -18608,11 +18608,11 @@ WRAM0 bank #0: $cc3d = wSerialExchangeNybbleTempReceiveData $cc3d = wSerialSyncAndExchangeNybbleReceiveData $cc3e = wSerialExchangeNybbleReceiveData - $cc42 = wLinkMenuSelectionSendBuffer $cc42 = wSerialExchangeNybbleSendData + $cc42 = wLinkMenuSelectionSendBuffer + $cc47 = wUnknownSerialCounter $cc47 = wEnteringCableClub $cc47 = wLinkTimeoutCounter - $cc47 = wUnknownSerialCounter $cc49 = wWhichTradeMonSelectionMenu $cc49 = wMonDataLocation $cc4a = wMenuWrappingEnabled @@ -18625,19 +18625,19 @@ WRAM0 bank #0: $cc55 = wTrainerHeaderFlagBit $cc57 = wNPCMovementScriptPointerTableNum $cc58 = wNPCMovementScriptBank - $cc5b = wUnusedCC5B + $cc5b = wBoostExpByExpAll + $cc5b = wAnimationType $cc5b = wNPCMovementDirections - $cc5b = wVermilionDockTileMapBuffer $cc5b = wTrainerCardBlkPacket - $cc5b = wDexRatingNumMonsSeen + $cc5b = wMonPartySpritesSavedOAM + $cc5b = wElevatorWarpMaps + $cc5b = wVermilionDockTileMapBuffer + $cc5b = wSlotMachineSevenAndBarModeChance $cc5b = wOaksAideRewardItemName $cc5b = wHallOfFame - $cc5b = wSlotMachineSevenAndBarModeChance - $cc5b = wElevatorWarpMaps + $cc5b = wDexRatingNumMonsSeen + $cc5b = wUnusedFlag $cc5b = wFilteredBagItems - $cc5b = wMonPartySpritesSavedOAM - $cc5b = wAnimationType - $cc5b = wBoostExpByExpAll $cc5c = wDexRatingNumMonsOwned $cc5d = wDexRatingText $cc5e = wSlotMachineSavedROMBank @@ -18646,11 +18646,11 @@ WRAM0 bank #0: $cc97 = wSwitchPartyMonTempBuffer $cca1 = wNumStepsToTake $ccd2 = wRLEByteCount - $ccd3 = wParentMenuItem $ccd3 = wCanEvolveFlags - $ccd3 = wSimulatedJoypadStatesEnd $ccd3 = wMiscBattleData + $ccd3 = wParentMenuItem $ccd3 = wAddedToParty + $ccd3 = wSimulatedJoypadStatesEnd $ccd4 = wForceEvolution $ccd5 = wAILayer2Encouragement $ccd7 = wPlayerSubstituteHP @@ -18679,12 +18679,12 @@ WRAM0 bank #0: $ccf6 = wLowHealthAlarmDisabled $ccf7 = wPlayerMonMinimized $cd05 = wEnemyNumHits - $cd05 = wEnemyBideAccumulatedDamage $cd05 = wLuckySlotHiddenObjectIndex + $cd05 = wEnemyBideAccumulatedDamage $cd0f = wPlayerMonUnmodifiedLevel + $cd0f = wVermilionDockTileMapBufferEnd $cd0f = wMiscBattleDataEnd $cd0f = wInGameTradeGiveMonSpecies - $cd0f = wVermilionDockTileMapBufferEnd $cd10 = wPlayerMonUnmodifiedMaxHP $cd10 = wInGameTradeTextPointerTablePointer $cd12 = wPlayerMonUnmodifiedAttack @@ -18761,8 +18761,8 @@ WRAM0 bank #0: $cd3d = wCoordIndex $cd3d = wTempSCX $cd3d = wBoxMonCounts - $cd3d = wDayCareStartLevel $cd3d = wUnusedCreditsByte + $cd3d = wDayCareStartLevel $cd3d = wMoveDownSmallStarsOAMCount $cd3d = wWereAnyMonsAsleep $cd3d = wFallingObjectsMovementData @@ -18814,8 +18814,8 @@ WRAM0 bank #0: $cd41 = wHoFTeamIndex2 $cd41 = wNumFieldMoves $cd41 = wTradedPlayerMonOT - $cd41 = wHiddenObjectX $cd41 = wHiddenItemOrCoinsIndex + $cd41 = wHiddenObjectX $cd41 = wTrainerScreenX $cd41 = wDayCarePerLevelCost $cd42 = wSlotMachineWheel1MiddleTile @@ -18856,7 +18856,7 @@ WRAM0 bank #0: $cd5d = wMonPartySpriteSpecies $cd5e = wLeftGBMonSpecies $cd5f = wRightGBMonSpecies - $cd60 = wFlags_0xcd60 + $cd60 = wMiscFlags $cd6a = wActionResultOrTookBattleTurn $cd6b = wJoyIgnore $cd6c = wNumMovesMinusOne @@ -19186,7 +19186,7 @@ WRAM0 bank #0: $d124 = wIsKeyItem $d125 = wTextBoxID $d126 = wCurrentMapScriptFlags - $d127 = wCurEnemyLVL + $d127 = wCurEnemyLevel $d128 = wItemListPointer $d12a = wListCount $d12b = wLinkState @@ -19196,8 +19196,8 @@ WRAM0 bank #0: $d12e = wMenuExitMethod $d12f = wGymGateTileBlock $d12f = wWhichPewterGuy - $d12f = wDungeonWarpDataEntrySize $d12f = wWhichPrizeWindow + $d12f = wDungeonWarpDataEntrySize $d130 = wSavedSpriteScreenY $d131 = wSavedSpriteScreenX $d132 = wSavedSpriteMapY @@ -19282,8 +19282,8 @@ WRAM0 bank #0: $d1c4 = wPartyMon3HP $d1c6 = wPartyMon3BoxLevel $d1c7 = wPartyMon3Status - $d1c8 = wPartyMon3Type $d1c8 = wPartyMon3Type1 + $d1c8 = wPartyMon3Type $d1c9 = wPartyMon3Type2 $d1ca = wPartyMon3CatchRate $d1cb = wPartyMon3Moves @@ -19623,16 +19623,17 @@ WRAM0 bank #0: $d71d = wDungeonWarpDestinationMap $d71e = wWhichDungeonWarp $d71f = wUnusedCardKeyGateID - $d728 = wd728 + $d728 = wStatusFlags1 $d72a = wBeatGymFlags - $d72c = wd72c - $d72d = wd72d - $d72e = wd72e - $d730 = wd730 - $d732 = wd732 - $d733 = wFlags_D733 - $d734 = wBeatLorelei - $d736 = wd736 + $d72c = wStatusFlags2 + $d72d = wStatusFlags3 + $d72d = wCableClubDestinationMap + $d72e = wStatusFlags4 + $d730 = wStatusFlags5 + $d732 = wStatusFlags6 + $d733 = wStatusFlags7 + $d734 = wElite4Flags + $d736 = wMovementFlags $d737 = wCompletedInGameTradeFlags $d73b = wWarpedFromWhichWarp $d73c = wWarpedFromWhichMap @@ -20303,10 +20304,10 @@ HRAM bank #0: $ff8b = hSpriteDataOffset $ff8b = hPreviousTileset $ff8b = hOAMTile + $ff8b = hBaseTileID $ff8b = hItemPrice $ff8b = hEastWestConnectedMapWidth $ff8b = hDexWeight - $ff8b = hBaseTileID $ff8b = hSpriteInterlaceCounter $ff8b = hRLEByteValue $ff8c = hNorthSouthConnectedMapWidth @@ -20342,12 +20343,12 @@ HRAM bank #0: $ff95 = hNPCPlayerYDistance $ff95 = hNPCSpriteOffset $ff95 = hDividend + $ff95 = hSignCoordPointer $ff95 = hQuotient $ff95 = hProduct $ff95 = hNPCMovementDirections2Index $ff95 = hPastLeadingZeros $ff95 = hSwapTemp - $ff95 = hSignCoordPointer $ff96 = hMutateWY $ff96 = hSwapItemQuantity $ff96 = hNumToPrint @@ -20429,8 +20430,8 @@ HRAM bank #0: $ffdc = hDexRatingNumMonsOwned $ffdc = hVendingMachinePrice $ffdc = hPlayerYCoord - $ffdc = hItemToRemoveIndex $ffdc = hOaksAideRewardItem + $ffdc = hItemToRemoveIndex $ffdc = hGymGateAnswer $ffdd = hPlayerXCoord $ffdd = hOaksAideNumMonsOwned diff --git a/pokered_vc.sym b/pokered_vc.sym index 56a024240..4dbf3f6f9 100644 --- a/pokered_vc.sym +++ b/pokered_vc.sym @@ -2730,7 +2730,7 @@ 03:4d7b SeafoamIslandsB2FHS 03:4d81 SeafoamIslandsB3FHS 03:4d8d SeafoamIslandsB4FHS -03:4d99 PrintStrengthTxt +03:4d99 PrintStrengthText 03:4daa UsedStrengthText 03:4dbb CanMoveBouldersText 03:4dc0 IsSurfingAllowed @@ -9242,7 +9242,7 @@ 13:7f81 EnterMapAnimPredef 13:7f84 GetTileTwoStepsInFrontOfPlayerPredef 13:7f87 CheckForCollisionWhenPushingBoulderPredef -13:7f8a PrintStrengthTxtPredef +13:7f8a PrintStrengthTextPredef 13:7f8d PickUpItemPredef 13:7f90 PrintMoveTypePredef 13:7f93 LoadMovePPsPredef @@ -12181,8 +12181,8 @@ 1a:4026 DecrementPP.DecrementPP 1a:402f Version_GFX 1a:407f Version_GFXEnd -1a:407f Gym_GFX 1a:407f Dojo_GFX +1a:407f Gym_GFX 1a:467f Dojo_Block 1a:467f Gym_Block 1a:4dbf Mart_GFX @@ -15110,7 +15110,7 @@ 20:6140 _RocketHideoutB3FRocket1BattleText 20:6168 _RocketHideoutB3FRocket1EndBattleText 20:617a _RocketHideoutB3FRocket1AfterBattleText -20:61b8 _RocketHideout3BattleTxt +20:61b8 _RocketHideout3BattleText 20:61e9 _RocketHideout3EndBattleText3 20:61fc _RocketHide3AfterBattleText3 20:623e _RocketHideoutB4FGiovanniImpressedYouGotHereText @@ -17510,8 +17510,8 @@ 00:8800 vFont 00:8800 vChars1 00:8800 vNPCSprites2 -00:9000 vChars2 00:9000 vFrontPic +00:9000 vChars2 00:9000 vTileset 00:9310 vBackPic 00:9310 vTitleLogo2 @@ -17619,8 +17619,8 @@ 00:c11a wSprite01StateData1YAdjusted 00:c11b wSprite01StateData1XAdjusted 00:c11c wSprite01StateData1CollisionData -00:c120 wSprite02StateData1PictureID 00:c120 wSprite01StateData1End +00:c120 wSprite02StateData1PictureID 00:c120 wSprite02StateData1 00:c121 wSprite02StateData1MovementStatus 00:c122 wSprite02StateData1ImageIndex @@ -17649,9 +17649,9 @@ 00:c13a wSprite03StateData1YAdjusted 00:c13b wSprite03StateData1XAdjusted 00:c13c wSprite03StateData1CollisionData +00:c140 wSprite04StateData1PictureID 00:c140 wSprite03StateData1End 00:c140 wSprite04StateData1 -00:c140 wSprite04StateData1PictureID 00:c141 wSprite04StateData1MovementStatus 00:c142 wSprite04StateData1ImageIndex 00:c143 wSprite04StateData1YStepVector @@ -17947,9 +17947,9 @@ 00:c289 wSprite08StateData2OrigFacingDirection 00:c28d wSprite08StateData2PictureID 00:c28e wSprite08StateData2ImageBaseOffset +00:c290 wSprite09StateData2 00:c290 wSprite08StateData2End 00:c290 wSprite09StateData2WalkAnimationCounter -00:c290 wSprite09StateData2 00:c292 wSprite09StateData2YDisplacement 00:c293 wSprite09StateData2XDisplacement 00:c294 wSprite09StateData2MapY @@ -17986,9 +17986,9 @@ 00:c2b9 wSprite11StateData2OrigFacingDirection 00:c2bd wSprite11StateData2PictureID 00:c2be wSprite11StateData2ImageBaseOffset +00:c2c0 wSprite12StateData2 00:c2c0 wSprite12StateData2WalkAnimationCounter 00:c2c0 wSprite11StateData2End -00:c2c0 wSprite12StateData2 00:c2c2 wSprite12StateData2YDisplacement 00:c2c3 wSprite12StateData2XDisplacement 00:c2c4 wSprite12StateData2MapY @@ -18171,8 +18171,8 @@ 00:c365 wShadowOAMSprite25XCoord 00:c366 wShadowOAMSprite25TileID 00:c367 wShadowOAMSprite25Attributes -00:c368 wShadowOAMSprite26YCoord 00:c368 wShadowOAMSprite26 +00:c368 wShadowOAMSprite26YCoord 00:c369 wShadowOAMSprite26XCoord 00:c36a wShadowOAMSprite26TileID 00:c36b wShadowOAMSprite26Attributes @@ -18206,8 +18206,8 @@ 00:c381 wShadowOAMSprite32XCoord 00:c382 wShadowOAMSprite32TileID 00:c383 wShadowOAMSprite32Attributes -00:c384 wShadowOAMSprite33 00:c384 wShadowOAMSprite33YCoord +00:c384 wShadowOAMSprite33 00:c385 wShadowOAMSprite33XCoord 00:c386 wShadowOAMSprite33TileID 00:c387 wShadowOAMSprite33Attributes @@ -18274,11 +18274,11 @@ 00:cc3d wSerialExchangeNybbleTempReceiveData 00:cc3d wSerialSyncAndExchangeNybbleReceiveData 00:cc3e wSerialExchangeNybbleReceiveData -00:cc42 wLinkMenuSelectionSendBuffer 00:cc42 wSerialExchangeNybbleSendData +00:cc42 wLinkMenuSelectionSendBuffer +00:cc47 wUnknownSerialCounter 00:cc47 wEnteringCableClub 00:cc47 wLinkTimeoutCounter -00:cc47 wUnknownSerialCounter 00:cc49 wWhichTradeMonSelectionMenu 00:cc49 wMonDataLocation 00:cc4a wMenuWrappingEnabled @@ -18291,19 +18291,19 @@ 00:cc55 wTrainerHeaderFlagBit 00:cc57 wNPCMovementScriptPointerTableNum 00:cc58 wNPCMovementScriptBank -00:cc5b wUnusedCC5B +00:cc5b wBoostExpByExpAll +00:cc5b wAnimationType 00:cc5b wNPCMovementDirections -00:cc5b wVermilionDockTileMapBuffer 00:cc5b wTrainerCardBlkPacket -00:cc5b wDexRatingNumMonsSeen +00:cc5b wMonPartySpritesSavedOAM +00:cc5b wElevatorWarpMaps +00:cc5b wVermilionDockTileMapBuffer +00:cc5b wSlotMachineSevenAndBarModeChance 00:cc5b wOaksAideRewardItemName 00:cc5b wHallOfFame -00:cc5b wSlotMachineSevenAndBarModeChance -00:cc5b wElevatorWarpMaps +00:cc5b wDexRatingNumMonsSeen +00:cc5b wUnusedFlag 00:cc5b wFilteredBagItems -00:cc5b wMonPartySpritesSavedOAM -00:cc5b wAnimationType -00:cc5b wBoostExpByExpAll 00:cc5c wDexRatingNumMonsOwned 00:cc5d wDexRatingText 00:cc5e wSlotMachineSavedROMBank @@ -18312,11 +18312,11 @@ 00:cc97 wSwitchPartyMonTempBuffer 00:cca1 wNumStepsToTake 00:ccd2 wRLEByteCount -00:ccd3 wParentMenuItem 00:ccd3 wCanEvolveFlags -00:ccd3 wSimulatedJoypadStatesEnd 00:ccd3 wMiscBattleData +00:ccd3 wParentMenuItem 00:ccd3 wAddedToParty +00:ccd3 wSimulatedJoypadStatesEnd 00:ccd4 wForceEvolution 00:ccd5 wAILayer2Encouragement 00:ccd7 wPlayerSubstituteHP @@ -18345,12 +18345,12 @@ 00:ccf6 wLowHealthAlarmDisabled 00:ccf7 wPlayerMonMinimized 00:cd05 wEnemyNumHits -00:cd05 wEnemyBideAccumulatedDamage 00:cd05 wLuckySlotHiddenObjectIndex +00:cd05 wEnemyBideAccumulatedDamage 00:cd0f wPlayerMonUnmodifiedLevel +00:cd0f wVermilionDockTileMapBufferEnd 00:cd0f wMiscBattleDataEnd 00:cd0f wInGameTradeGiveMonSpecies -00:cd0f wVermilionDockTileMapBufferEnd 00:cd10 wPlayerMonUnmodifiedMaxHP 00:cd10 wInGameTradeTextPointerTablePointer 00:cd12 wPlayerMonUnmodifiedAttack @@ -18427,8 +18427,8 @@ 00:cd3d wCoordIndex 00:cd3d wTempSCX 00:cd3d wBoxMonCounts -00:cd3d wDayCareStartLevel 00:cd3d wUnusedCreditsByte +00:cd3d wDayCareStartLevel 00:cd3d wMoveDownSmallStarsOAMCount 00:cd3d wWereAnyMonsAsleep 00:cd3d wFallingObjectsMovementData @@ -18480,8 +18480,8 @@ 00:cd41 wHoFTeamIndex2 00:cd41 wNumFieldMoves 00:cd41 wTradedPlayerMonOT -00:cd41 wHiddenObjectX 00:cd41 wHiddenItemOrCoinsIndex +00:cd41 wHiddenObjectX 00:cd41 wTrainerScreenX 00:cd41 wDayCarePerLevelCost 00:cd42 wSlotMachineWheel1MiddleTile @@ -18522,7 +18522,7 @@ 00:cd5d wMonPartySpriteSpecies 00:cd5e wLeftGBMonSpecies 00:cd5f wRightGBMonSpecies -00:cd60 wFlags_0xcd60 +00:cd60 wMiscFlags 00:cd6a wActionResultOrTookBattleTurn 00:cd6b wJoyIgnore 00:cd6c wNumMovesMinusOne @@ -18852,7 +18852,7 @@ 00:d124 wIsKeyItem 00:d125 wTextBoxID 00:d126 wCurrentMapScriptFlags -00:d127 wCurEnemyLVL +00:d127 wCurEnemyLevel 00:d128 wItemListPointer 00:d12a wListCount 00:d12b wLinkState @@ -18862,8 +18862,8 @@ 00:d12e wMenuExitMethod 00:d12f wGymGateTileBlock 00:d12f wWhichPewterGuy -00:d12f wDungeonWarpDataEntrySize 00:d12f wWhichPrizeWindow +00:d12f wDungeonWarpDataEntrySize 00:d130 wSavedSpriteScreenY 00:d131 wSavedSpriteScreenX 00:d132 wSavedSpriteMapY @@ -18947,8 +18947,8 @@ 00:d1c4 wPartyMon3HP 00:d1c6 wPartyMon3BoxLevel 00:d1c7 wPartyMon3Status -00:d1c8 wPartyMon3Type 00:d1c8 wPartyMon3Type1 +00:d1c8 wPartyMon3Type 00:d1c9 wPartyMon3Type2 00:d1ca wPartyMon3CatchRate 00:d1cb wPartyMon3Moves @@ -19287,16 +19287,17 @@ 00:d71d wDungeonWarpDestinationMap 00:d71e wWhichDungeonWarp 00:d71f wUnusedCardKeyGateID -00:d728 wd728 +00:d728 wStatusFlags1 00:d72a wBeatGymFlags -00:d72c wd72c -00:d72d wd72d -00:d72e wd72e -00:d730 wd730 -00:d732 wd732 -00:d733 wFlags_D733 -00:d734 wBeatLorelei -00:d736 wd736 +00:d72c wStatusFlags2 +00:d72d wStatusFlags3 +00:d72d wCableClubDestinationMap +00:d72e wStatusFlags4 +00:d730 wStatusFlags5 +00:d732 wStatusFlags6 +00:d733 wStatusFlags7 +00:d734 wElite4Flags +00:d736 wMovementFlags 00:d737 wCompletedInGameTradeFlags 00:d73b wWarpedFromWhichWarp 00:d73c wWarpedFromWhichMap @@ -19959,10 +19960,10 @@ 00:ff8b hSpriteDataOffset 00:ff8b hPreviousTileset 00:ff8b hOAMTile +00:ff8b hBaseTileID 00:ff8b hItemPrice 00:ff8b hEastWestConnectedMapWidth 00:ff8b hDexWeight -00:ff8b hBaseTileID 00:ff8b hSpriteInterlaceCounter 00:ff8b hRLEByteValue 00:ff8c hNorthSouthConnectedMapWidth @@ -19998,12 +19999,12 @@ 00:ff95 hNPCPlayerYDistance 00:ff95 hNPCSpriteOffset 00:ff95 hDividend +00:ff95 hSignCoordPointer 00:ff95 hQuotient 00:ff95 hProduct 00:ff95 hNPCMovementDirections2Index 00:ff95 hPastLeadingZeros 00:ff95 hSwapTemp -00:ff95 hSignCoordPointer 00:ff96 hMutateWY 00:ff96 hSwapItemQuantity 00:ff96 hNumToPrint @@ -20085,8 +20086,8 @@ 00:ffdc hDexRatingNumMonsOwned 00:ffdc hVendingMachinePrice 00:ffdc hPlayerYCoord -00:ffdc hItemToRemoveIndex 00:ffdc hOaksAideRewardItem +00:ffdc hItemToRemoveIndex 00:ffdc hGymGateAnswer 00:ffdd hPlayerXCoord 00:ffdd hOaksAideNumMonsOwned