From 3ebaa450520f02c8192308b46a3fe4b4d2ee7334 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Sat, 30 Nov 2024 00:30:47 +0000 Subject: [PATCH] Identify more bit flags (#1153) --- pokecrystal.map | 110 ++++++++++++++++++------------------- pokecrystal.sym | 110 ++++++++++++++++++------------------- pokecrystal11.map | 110 ++++++++++++++++++------------------- pokecrystal11.sym | 110 ++++++++++++++++++------------------- pokecrystal11_debug.map | 116 ++++++++++++++++++++-------------------- pokecrystal11_debug.sym | 116 ++++++++++++++++++++-------------------- pokecrystal11_vc.map | 110 ++++++++++++++++++------------------- pokecrystal11_vc.sym | 110 ++++++++++++++++++------------------- pokecrystal_au.map | 110 ++++++++++++++++++------------------- pokecrystal_au.sym | 110 ++++++++++++++++++------------------- pokecrystal_debug.map | 116 ++++++++++++++++++++-------------------- pokecrystal_debug.sym | 116 ++++++++++++++++++++-------------------- 12 files changed, 672 insertions(+), 672 deletions(-) diff --git a/pokecrystal.map b/pokecrystal.map index 7941a7894..202fa6b66 100644 --- a/pokecrystal.map +++ b/pokecrystal.map @@ -565,8 +565,8 @@ ROM0 bank #0: $1c9c = PlaceVerticalMenuItems.loop $1cbb = MenuBox $1cc6 = GetMenuTextStartCoord - $1cd8 = GetMenuTextStartCoord.bit_6_set - $1ce0 = GetMenuTextStartCoord.bit_7_clear + $1cd8 = GetMenuTextStartCoord.no_top_spacing + $1ce0 = GetMenuTextStartCoord.no_cursor $1ce1 = ClearMenuBoxInterior $1cf1 = ClearWholeMenuBox $1cfd = MenuBoxCoord2Tile @@ -612,7 +612,7 @@ ROM0 bank #0: $1ee1 = RunMenuItemPrintingFunction.loop $1efb = RunMenuItemPrintingFunction._hl_ $1eff = InitMenuCursorAndButtonPermissions - $1f0e = InitMenuCursorAndButtonPermissions.disallow_select + $1f0e = InitMenuCursorAndButtonPermissions.disallow_start $1f19 = InitMenuCursorAndButtonPermissions.disallow_left_right $1f1a = GetScrollingMenuJoypad $1f23 = GetStaticMenuJoypad @@ -4538,7 +4538,7 @@ ROMX bank #5: $4089 = StartClock $4097 = StartClock.skip_set $409b = _FixDays - $40a8 = _FixDays.set_bit_7 + $40a8 = _FixDays.reset_rtc $40ae = ClockContinue $40c8 = ClockContinue.time_overflow $40eb = ClockContinue.dont_update @@ -4549,8 +4549,8 @@ ROMX bank #5: $4128 = _InitTime.okay_days $412a = GetEmote2bpp $4135 = _UpdatePlayerSprite - $4146 = _RefreshSprites - $4157 = _ClearSprites + $4146 = LoadStandingSpritesGFX + $4157 = LoadWalkingSpritesGFX $4168 = RefreshSprites $416f = RefreshSprites.Refresh $4183 = GetPlayerSprite @@ -5746,8 +5746,8 @@ ROMX bank #9: $436b = Place2DMenuCursor.cursor_on $4374 = _PushWindow $4387 = _PushWindow.loop - $4398 = _PushWindow.bit_6 - $43ae = _PushWindow.not_bit_7 + $4398 = _PushWindow.backup_tiles + $43ae = _PushWindow.no_backup_tiles $43b5 = _PushWindow.done $43cd = _PushWindow.copy $43d5 = _PushWindow.row @@ -7201,7 +7201,7 @@ ROMX bank #11: $49a8 = _TMHM_ExitPack $49af = TMHM_ExitPocket $49b1 = TMHM_ScrollPocket - $49c5 = TMHM_ScrollPocket.skip + $49c5 = TMHM_ScrollPocket.down $49ca = TMHM_ScrollPocket.loop $49e2 = TMHM_DisplayPocketItems $49fa = TMHM_DisplayPocketItems.loop2 @@ -44097,8 +44097,8 @@ SRAM bank #1: $ade8 = sBoxMon7Moves $adec = sBoxMon7ID $adee = sBoxMon7Exp - $adf1 = sBoxMon7StatExp $adf1 = sBoxMon7HPExp + $adf1 = sBoxMon7StatExp $adf3 = sBoxMon7AtkExp $adf5 = sBoxMon7DefExp $adf7 = sBoxMon7SpdExp @@ -44199,8 +44199,8 @@ SRAM bank #1: $ae7d = sBoxMon11PP $ae81 = sBoxMon11Happiness $ae82 = sBoxMon11PokerusStatus - $ae83 = sBoxMon11CaughtTime $ae83 = sBoxMon11CaughtLevel + $ae83 = sBoxMon11CaughtTime $ae83 = sBoxMon11CaughtData $ae84 = sBoxMon11CaughtGender $ae84 = sBoxMon11CaughtLocation @@ -44361,8 +44361,8 @@ SRAM bank #1: $af61 = sBoxMon18Happiness $af62 = sBoxMon18PokerusStatus $af63 = sBoxMon18CaughtData - $af63 = sBoxMon18CaughtLevel $af63 = sBoxMon18CaughtTime + $af63 = sBoxMon18CaughtLevel $af64 = sBoxMon18CaughtGender $af64 = sBoxMon18CaughtLocation $af65 = sBoxMon18Level @@ -44462,9 +44462,9 @@ SRAM bank #1: $b260 = sLinkBattleStats $b262 = sLinkBattleLosses $b264 = sLinkBattleDraws + $b266 = sLinkBattleRecord1 $b266 = sLinkBattleRecord $b266 = sLinkBattleRecord1ID - $b266 = sLinkBattleRecord1 $b268 = sLinkBattleRecord1Name $b272 = sLinkBattleRecord1Wins $b274 = sLinkBattleRecord1Losses @@ -44951,8 +44951,8 @@ SRAM bank #1: $b689 = sHallOfFame10Mon6Nickname $b693 = sHallOfFame10Mon6End $b693 = sHallOfFame10End - $b694 = sHallOfFame11 $b694 = sHallOfFame11WinCount + $b694 = sHallOfFame11 $b695 = sHallOfFame11Mon1 $b695 = sHallOfFame11Mon1Species $b696 = sHallOfFame11Mon1ID @@ -45268,8 +45268,8 @@ SRAM bank #1: $b941 = sHallOfFame17Mon6End $b942 = sHallOfFame18WinCount $b942 = sHallOfFame18 - $b943 = sHallOfFame18Mon1 $b943 = sHallOfFame18Mon1Species + $b943 = sHallOfFame18Mon1 $b944 = sHallOfFame18Mon1ID $b946 = sHallOfFame18Mon1DVs $b948 = sHallOfFame18Mon1Level @@ -46501,8 +46501,8 @@ SRAM bank #2: $a504 = sBox2Mon5CaughtGender $a504 = sBox2Mon5CaughtLocation $a505 = sBox2Mon5Level - $a506 = sBox2Mon6 $a506 = sBox2Mon5BoxEnd + $a506 = sBox2Mon6 $a506 = sBox2Mon6Species $a507 = sBox2Mon6Item $a508 = sBox2Mon6Moves @@ -46731,8 +46731,8 @@ SRAM bank #2: $a644 = sBox2Mon15CaughtGender $a644 = sBox2Mon15CaughtLocation $a645 = sBox2Mon15Level - $a646 = sBox2Mon16Species $a646 = sBox2Mon15BoxEnd + $a646 = sBox2Mon16Species $a646 = sBox2Mon16 $a647 = sBox2Mon16Item $a648 = sBox2Mon16Moves @@ -47478,8 +47478,8 @@ SRAM bank #2: $ad68 = sBox4Mon4Moves $ad6c = sBox4Mon4ID $ad6e = sBox4Mon4Exp - $ad71 = sBox4Mon4HPExp $ad71 = sBox4Mon4StatExp + $ad71 = sBox4Mon4HPExp $ad73 = sBox4Mon4AtkExp $ad75 = sBox4Mon4DefExp $ad77 = sBox4Mon4SpdExp @@ -47488,21 +47488,21 @@ SRAM bank #2: $ad7d = sBox4Mon4PP $ad81 = sBox4Mon4Happiness $ad82 = sBox4Mon4PokerusStatus - $ad83 = sBox4Mon4CaughtLevel $ad83 = sBox4Mon4CaughtTime $ad83 = sBox4Mon4CaughtData + $ad83 = sBox4Mon4CaughtLevel $ad84 = sBox4Mon4CaughtLocation $ad84 = sBox4Mon4CaughtGender $ad85 = sBox4Mon4Level - $ad86 = sBox4Mon4BoxEnd $ad86 = sBox4Mon5Species + $ad86 = sBox4Mon4BoxEnd $ad86 = sBox4Mon5 $ad87 = sBox4Mon5Item $ad88 = sBox4Mon5Moves $ad8c = sBox4Mon5ID $ad8e = sBox4Mon5Exp - $ad91 = sBox4Mon5StatExp $ad91 = sBox4Mon5HPExp + $ad91 = sBox4Mon5StatExp $ad93 = sBox4Mon5AtkExp $ad95 = sBox4Mon5DefExp $ad97 = sBox4Mon5SpdExp @@ -47511,21 +47511,21 @@ SRAM bank #2: $ad9d = sBox4Mon5PP $ada1 = sBox4Mon5Happiness $ada2 = sBox4Mon5PokerusStatus + $ada3 = sBox4Mon5CaughtLevel $ada3 = sBox4Mon5CaughtTime $ada3 = sBox4Mon5CaughtData - $ada3 = sBox4Mon5CaughtLevel - $ada4 = sBox4Mon5CaughtGender $ada4 = sBox4Mon5CaughtLocation + $ada4 = sBox4Mon5CaughtGender $ada5 = sBox4Mon5Level - $ada6 = sBox4Mon5BoxEnd $ada6 = sBox4Mon6Species + $ada6 = sBox4Mon5BoxEnd $ada6 = sBox4Mon6 $ada7 = sBox4Mon6Item $ada8 = sBox4Mon6Moves $adac = sBox4Mon6ID $adae = sBox4Mon6Exp - $adb1 = sBox4Mon6StatExp $adb1 = sBox4Mon6HPExp + $adb1 = sBox4Mon6StatExp $adb3 = sBox4Mon6AtkExp $adb5 = sBox4Mon6DefExp $adb7 = sBox4Mon6SpdExp @@ -47534,21 +47534,21 @@ SRAM bank #2: $adbd = sBox4Mon6PP $adc1 = sBox4Mon6Happiness $adc2 = sBox4Mon6PokerusStatus - $adc3 = sBox4Mon6CaughtData - $adc3 = sBox4Mon6CaughtTime $adc3 = sBox4Mon6CaughtLevel + $adc3 = sBox4Mon6CaughtTime + $adc3 = sBox4Mon6CaughtData $adc4 = sBox4Mon6CaughtGender $adc4 = sBox4Mon6CaughtLocation $adc5 = sBox4Mon6Level - $adc6 = sBox4Mon6BoxEnd $adc6 = sBox4Mon7 $adc6 = sBox4Mon7Species + $adc6 = sBox4Mon6BoxEnd $adc7 = sBox4Mon7Item $adc8 = sBox4Mon7Moves $adcc = sBox4Mon7ID $adce = sBox4Mon7Exp - $add1 = sBox4Mon7StatExp $add1 = sBox4Mon7HPExp + $add1 = sBox4Mon7StatExp $add3 = sBox4Mon7AtkExp $add5 = sBox4Mon7DefExp $add7 = sBox4Mon7SpdExp @@ -47557,21 +47557,21 @@ SRAM bank #2: $addd = sBox4Mon7PP $ade1 = sBox4Mon7Happiness $ade2 = sBox4Mon7PokerusStatus - $ade3 = sBox4Mon7CaughtData $ade3 = sBox4Mon7CaughtLevel $ade3 = sBox4Mon7CaughtTime + $ade3 = sBox4Mon7CaughtData $ade4 = sBox4Mon7CaughtLocation $ade4 = sBox4Mon7CaughtGender $ade5 = sBox4Mon7Level $ade6 = sBox4Mon8 - $ade6 = sBox4Mon7BoxEnd $ade6 = sBox4Mon8Species + $ade6 = sBox4Mon7BoxEnd $ade7 = sBox4Mon8Item $ade8 = sBox4Mon8Moves $adec = sBox4Mon8ID $adee = sBox4Mon8Exp - $adf1 = sBox4Mon8StatExp $adf1 = sBox4Mon8HPExp + $adf1 = sBox4Mon8StatExp $adf3 = sBox4Mon8AtkExp $adf5 = sBox4Mon8DefExp $adf7 = sBox4Mon8SpdExp @@ -48747,8 +48747,8 @@ SRAM bank #2: $b768 = sBox6Mon15Moves $b76c = sBox6Mon15ID $b76e = sBox6Mon15Exp - $b771 = sBox6Mon15StatExp $b771 = sBox6Mon15HPExp + $b771 = sBox6Mon15StatExp $b773 = sBox6Mon15AtkExp $b775 = sBox6Mon15DefExp $b777 = sBox6Mon15SpdExp @@ -49341,8 +49341,8 @@ SRAM bank #2: $bc34 = sBox7Mon18CaughtGender $bc35 = sBox7Mon18Level $bc36 = sBox7Mon19 - $bc36 = sBox7Mon18BoxEnd $bc36 = sBox7Mon19Species + $bc36 = sBox7Mon18BoxEnd $bc37 = sBox7Mon19Item $bc38 = sBox7Mon19Moves $bc3c = sBox7Mon19ID @@ -50531,8 +50531,8 @@ SRAM bank #3: $a918 = sBox10Mon4Moves $a91c = sBox10Mon4ID $a91e = sBox10Mon4Exp - $a921 = sBox10Mon4StatExp $a921 = sBox10Mon4HPExp + $a921 = sBox10Mon4StatExp $a923 = sBox10Mon4AtkExp $a925 = sBox10Mon4DefExp $a927 = sBox10Mon4SpdExp @@ -50709,8 +50709,8 @@ SRAM bank #3: $aa14 = sBox10Mon11CaughtLocation $aa15 = sBox10Mon11Level $aa16 = sBox10Mon12Species - $aa16 = sBox10Mon12 $aa16 = sBox10Mon11BoxEnd + $aa16 = sBox10Mon12 $aa17 = sBox10Mon12Item $aa18 = sBox10Mon12Moves $aa1c = sBox10Mon12ID @@ -51102,8 +51102,8 @@ SRAM bank #3: $adc4 = sBox11Mon6CaughtGender $adc5 = sBox11Mon6Level $adc6 = sBox11Mon7 - $adc6 = sBox11Mon7Species $adc6 = sBox11Mon6BoxEnd + $adc6 = sBox11Mon7Species $adc7 = sBox11Mon7Item $adc8 = sBox11Mon7Moves $adcc = sBox11Mon7ID @@ -51557,9 +51557,9 @@ SRAM bank #3: $b1cd = sBox12Mon4PP $b1d1 = sBox12Mon4Happiness $b1d2 = sBox12Mon4PokerusStatus - $b1d3 = sBox12Mon4CaughtLevel $b1d3 = sBox12Mon4CaughtData $b1d3 = sBox12Mon4CaughtTime + $b1d3 = sBox12Mon4CaughtLevel $b1d4 = sBox12Mon4CaughtGender $b1d4 = sBox12Mon4CaughtLocation $b1d5 = sBox12Mon4Level @@ -52942,8 +52942,8 @@ SRAM bank #3: $bc71 = sBox14Mon20Happiness $bc72 = sBox14Mon20PokerusStatus $bc73 = sBox14Mon20CaughtLevel - $bc73 = sBox14Mon20CaughtTime $bc73 = sBox14Mon20CaughtData + $bc73 = sBox14Mon20CaughtTime $bc74 = sBox14Mon20CaughtLocation $bc74 = sBox14Mon20CaughtGender $bc75 = sBox14Mon20Level @@ -54023,11 +54023,11 @@ WRAM0 bank #0: $c608 = wBoxPartialData $c608 = wTimeSetBuffer $c608 = wHallOfFameTemp + $c608 = wBT_OTTempName $c608 = wc608 $c608 = wUnknownGender $c608 = wDebugLightColor $c608 = wHallOfFameTempWinCount - $c608 = wBT_OTTempName $c608 = wMobileMonSender $c608 = wBT_OTTemp $c608 = wEnemyMoveStruct @@ -54295,10 +54295,10 @@ WRAM0 bank #0: $c64c = wHallOfFameTempMon5DVs $c64c = wBattleMonStructEnd $c64e = wBT_OTTempMon2 - $c64e = wHallOfFameTempMon5Level $c64e = wWildMon $c64e = wBT_OTTempMon2Species $c64e = wOfferMonHappiness + $c64e = wHallOfFameTempMon5Level $c64f = wHallOfFameTempMon5Nickname $c64f = wBT_OTTempMon2Item $c64f = wOfferMonPokerusStatus @@ -54359,9 +54359,9 @@ WRAM0 bank #0: $c669 = wPlayerSubStatus2 $c66a = wPlayerSubStatus3 $c66a = wBT_OTTempMon2PokerusStatus - $c66b = wPlayerSubStatus4 $c66b = wUnknownMonMailMessageEnd $c66b = wBT_OTTempMon2CaughtData + $c66b = wPlayerSubStatus4 $c66b = wBT_OTTempMon2CaughtTime $c66b = wBT_OTTempMon2CaughtLevel $c66c = wBT_OTTempMon2CaughtLocation @@ -54861,8 +54861,8 @@ WRAM0 bank #0: $c830 = wLinkPlayerPartyMon1CaughtData $c830 = wTimeCapsulePartyMon1PP $c830 = wLinkPlayerPartyMon1CaughtLevel - $c831 = wHallOfFamePokemonListMon3End $c831 = wHallOfFamePokemonListMon4Species + $c831 = wHallOfFamePokemonListMon3End $c831 = wHallOfFamePokemonListMon4 $c831 = wLinkPlayerPartyMon1CaughtGender $c831 = wLinkPlayerPartyMon1CaughtLocation @@ -55562,12 +55562,12 @@ WRAM0 bank #0: $cf64 = wPrevDexEntryJumptableIndex $cf64 = wcf64 $cf64 = wDebugTilesetCurPalette + $cf64 = wCardFlipCursorY $cf64 = wStatsScreenFlags $cf64 = wNrOfBeatenBattleTowerTrainers $cf64 = wTrainerCardBadgeFrameCounter $cf64 = wCreditsBorderFrame $cf64 = wNamingScreenLetterCase - $cf64 = wCardFlipCursorY $cf64 = wPokegearCard $cf64 = wPackJumptableIndex $cf64 = wSlotsDelay @@ -55756,6 +55756,7 @@ WRAMX bank #1: $d003 = wTempPokedexCaughtCount $d003 = wFinishedPrintingBox $d003 = wSeerNickname + $d003 = wTownMapCursorCoordinates $d003 = wMovementBufferObject $d003 = wPlaceBallsDirection $d003 = wBillsPCTempListIndex @@ -55764,7 +55765,6 @@ WRAMX bank #1: $d003 = wDebugColorIsShiny $d003 = wNextRadioLine $d003 = wPhoneCaller - $d003 = wTownMapCursorCoordinates $d004 = wAddrOfBoxToPrint $d004 = wBugContestFirstPlaceScore $d004 = wTrainerHUDTiles @@ -55796,8 +55796,8 @@ WRAMX bank #1: $d00c = wRadioText $d00c = wBugContestThirdPlaceScore $d00c = wMobileParticipant2Nickname - $d00d = wLinkBattleRecordWins $d00d = wBufferMonOT + $d00d = wLinkBattleRecordWins $d00e = wMartItem5BCD $d00e = wBugContestTempWinnerID $d00e = wSeerCaughtLocation @@ -55998,8 +55998,8 @@ WRAMX bank #1: $d102 = wUnusedNamesPointer $d104 = wItemAttributesPointer $d106 = wCurItem - $d107 = wCurItemQuantity $d107 = wMartItemID + $d107 = wCurItemQuantity $d108 = wCurPartySpecies $d109 = wCurPartyMon $d10a = wWhichHPBar @@ -56137,12 +56137,13 @@ WRAMX bank #1: $d1ea = wListMovesLineSpacing $d1ea = wFinalCatchRate $d1ea = wCurDecoration - $d1ea = wCurMapScriptBank $d1ea = wCurMailAuthorID + $d1ea = wEvolutionOldSpecies $d1ea = wPPUpPPBuffer $d1ea = wTempMysteryGiftTimer $d1ea = wSkipMovesBeforeLevelUp $d1ea = wExpToNextLevel + $d1ea = wCurMapScriptBank $d1ea = wFieldMoveData $d1ea = wHPBuffer1 $d1ea = wCurHPAnimMaxHP @@ -56161,7 +56162,6 @@ WRAMX bank #1: $d1ea = wMagikarpLength $d1ea = wRestartClockCurDivision $d1ea = wd1ea - $d1ea = wEvolutionOldSpecies $d1eb = wHealMachineTempOBP1 $d1eb = wSurfingPlayerState $d1eb = wPCItemQuantity @@ -56318,8 +56318,8 @@ WRAMX bank #1: SECTION: $d26b-$dcd6 ($0a6c bytes) ["Enemy Party"] $d26b = wPokedexShowPointerAddr $d26b = wUnusedEggHatchFlag - $d26b = wOTPlayerName $d26b = wOTPartyData + $d26b = wOTPlayerName $d26d = wPokedexShowPointerBank $d271 = wd271 $d276 = wOTPlayerID @@ -56995,8 +56995,8 @@ WRAMX bank #1: $d684 = wObject10Field1e $d685 = wObject10JumpHeight $d686 = wObject10Range - $d68e = wObject11Struct $d68e = wObject11Sprite + $d68e = wObject11Struct $d68e = wObject10StructEnd $d68f = wObject11MapObjectIndex $d690 = wObject11SpriteTile @@ -57308,7 +57308,7 @@ WRAMX bank #1: $d81a = wMap15ObjectEventFlag $d81e = wObjectMasks $d82e = wVariableSprites - $d83e = wEnteredMapFromContinue + $d83e = wMapNameSignFlags $d841 = wTimeOfDayPal $d846 = wTimeOfDayPalFlags $d847 = wTimeOfDayPalset @@ -57778,8 +57778,8 @@ WRAMX bank #1: $df0e = wBreedMon1Moves $df12 = wBreedMon1ID $df14 = wBreedMon1Exp - $df17 = wBreedMon1HPExp $df17 = wBreedMon1StatExp + $df17 = wBreedMon1HPExp $df19 = wBreedMon1AtkExp $df1b = wBreedMon1DefExp $df1d = wBreedMon1SpdExp @@ -58146,8 +58146,8 @@ WRAMX bank #3: $d272 = w3_d202Mon2Speed $d274 = w3_d202Mon2SpclAtk $d276 = w3_d202Mon2SpclDef - $d278 = w3_d202Mon2StructEnd $d278 = w3_d202Mon2Name + $d278 = w3_d202Mon2StructEnd $d283 = w3_d202Mon3 $d283 = w3_d202Mon3Species $d284 = w3_d202Mon3Item @@ -58754,8 +58754,8 @@ WRAMX bank #3: $d764 = w3_d742Mon1PP $d768 = w3_d742Mon1Happiness $d769 = w3_d742Mon1PokerusStatus - $d76a = w3_d742Mon1CaughtTime $d76a = w3_d742Mon1CaughtData + $d76a = w3_d742Mon1CaughtTime $d76a = w3_d742Mon1CaughtLevel $d76b = w3_d742Mon1CaughtLocation $d76b = w3_d742Mon1CaughtGender diff --git a/pokecrystal.sym b/pokecrystal.sym index 3e38e2261..6deaddc96 100644 --- a/pokecrystal.sym +++ b/pokecrystal.sym @@ -530,8 +530,8 @@ 00:1c9c PlaceVerticalMenuItems.loop 00:1cbb MenuBox 00:1cc6 GetMenuTextStartCoord -00:1cd8 GetMenuTextStartCoord.bit_6_set -00:1ce0 GetMenuTextStartCoord.bit_7_clear +00:1cd8 GetMenuTextStartCoord.no_top_spacing +00:1ce0 GetMenuTextStartCoord.no_cursor 00:1ce1 ClearMenuBoxInterior 00:1cf1 ClearWholeMenuBox 00:1cfd MenuBoxCoord2Tile @@ -577,7 +577,7 @@ 00:1ee1 RunMenuItemPrintingFunction.loop 00:1efb RunMenuItemPrintingFunction._hl_ 00:1eff InitMenuCursorAndButtonPermissions -00:1f0e InitMenuCursorAndButtonPermissions.disallow_select +00:1f0e InitMenuCursorAndButtonPermissions.disallow_start 00:1f19 InitMenuCursorAndButtonPermissions.disallow_left_right 00:1f1a GetScrollingMenuJoypad 00:1f23 GetStaticMenuJoypad @@ -4478,7 +4478,7 @@ 05:4089 StartClock 05:4097 StartClock.skip_set 05:409b _FixDays -05:40a8 _FixDays.set_bit_7 +05:40a8 _FixDays.reset_rtc 05:40ae ClockContinue 05:40c8 ClockContinue.time_overflow 05:40eb ClockContinue.dont_update @@ -4489,8 +4489,8 @@ 05:4128 _InitTime.okay_days 05:412a GetEmote2bpp 05:4135 _UpdatePlayerSprite -05:4146 _RefreshSprites -05:4157 _ClearSprites +05:4146 LoadStandingSpritesGFX +05:4157 LoadWalkingSpritesGFX 05:4168 RefreshSprites 05:416f RefreshSprites.Refresh 05:4183 GetPlayerSprite @@ -5662,8 +5662,8 @@ 09:436b Place2DMenuCursor.cursor_on 09:4374 _PushWindow 09:4387 _PushWindow.loop -09:4398 _PushWindow.bit_6 -09:43ae _PushWindow.not_bit_7 +09:4398 _PushWindow.backup_tiles +09:43ae _PushWindow.no_backup_tiles 09:43b5 _PushWindow.done 09:43cd _PushWindow.copy 09:43d5 _PushWindow.row @@ -7106,7 +7106,7 @@ 0b:49a8 _TMHM_ExitPack 0b:49af TMHM_ExitPocket 0b:49b1 TMHM_ScrollPocket -0b:49c5 TMHM_ScrollPocket.skip +0b:49c5 TMHM_ScrollPocket.down 0b:49ca TMHM_ScrollPocket.loop 0b:49e2 TMHM_DisplayPocketItems 0b:49fa TMHM_DisplayPocketItems.loop2 @@ -43380,8 +43380,8 @@ 01:ade8 sBoxMon7Moves 01:adec sBoxMon7ID 01:adee sBoxMon7Exp -01:adf1 sBoxMon7StatExp 01:adf1 sBoxMon7HPExp +01:adf1 sBoxMon7StatExp 01:adf3 sBoxMon7AtkExp 01:adf5 sBoxMon7DefExp 01:adf7 sBoxMon7SpdExp @@ -43482,8 +43482,8 @@ 01:ae7d sBoxMon11PP 01:ae81 sBoxMon11Happiness 01:ae82 sBoxMon11PokerusStatus -01:ae83 sBoxMon11CaughtTime 01:ae83 sBoxMon11CaughtLevel +01:ae83 sBoxMon11CaughtTime 01:ae83 sBoxMon11CaughtData 01:ae84 sBoxMon11CaughtGender 01:ae84 sBoxMon11CaughtLocation @@ -43644,8 +43644,8 @@ 01:af61 sBoxMon18Happiness 01:af62 sBoxMon18PokerusStatus 01:af63 sBoxMon18CaughtData -01:af63 sBoxMon18CaughtLevel 01:af63 sBoxMon18CaughtTime +01:af63 sBoxMon18CaughtLevel 01:af64 sBoxMon18CaughtGender 01:af64 sBoxMon18CaughtLocation 01:af65 sBoxMon18Level @@ -43744,9 +43744,9 @@ 01:b260 sLinkBattleStats 01:b262 sLinkBattleLosses 01:b264 sLinkBattleDraws +01:b266 sLinkBattleRecord1 01:b266 sLinkBattleRecord 01:b266 sLinkBattleRecord1ID -01:b266 sLinkBattleRecord1 01:b268 sLinkBattleRecord1Name 01:b272 sLinkBattleRecord1Wins 01:b274 sLinkBattleRecord1Losses @@ -44232,8 +44232,8 @@ 01:b689 sHallOfFame10Mon6Nickname 01:b693 sHallOfFame10Mon6End 01:b693 sHallOfFame10End -01:b694 sHallOfFame11 01:b694 sHallOfFame11WinCount +01:b694 sHallOfFame11 01:b695 sHallOfFame11Mon1 01:b695 sHallOfFame11Mon1Species 01:b696 sHallOfFame11Mon1ID @@ -44549,8 +44549,8 @@ 01:b941 sHallOfFame17Mon6End 01:b942 sHallOfFame18WinCount 01:b942 sHallOfFame18 -01:b943 sHallOfFame18Mon1 01:b943 sHallOfFame18Mon1Species +01:b943 sHallOfFame18Mon1 01:b944 sHallOfFame18Mon1ID 01:b946 sHallOfFame18Mon1DVs 01:b948 sHallOfFame18Mon1Level @@ -45775,8 +45775,8 @@ 02:a504 sBox2Mon5CaughtGender 02:a504 sBox2Mon5CaughtLocation 02:a505 sBox2Mon5Level -02:a506 sBox2Mon6 02:a506 sBox2Mon5BoxEnd +02:a506 sBox2Mon6 02:a506 sBox2Mon6Species 02:a507 sBox2Mon6Item 02:a508 sBox2Mon6Moves @@ -46005,8 +46005,8 @@ 02:a644 sBox2Mon15CaughtGender 02:a644 sBox2Mon15CaughtLocation 02:a645 sBox2Mon15Level -02:a646 sBox2Mon16Species 02:a646 sBox2Mon15BoxEnd +02:a646 sBox2Mon16Species 02:a646 sBox2Mon16 02:a647 sBox2Mon16Item 02:a648 sBox2Mon16Moves @@ -46752,8 +46752,8 @@ 02:ad68 sBox4Mon4Moves 02:ad6c sBox4Mon4ID 02:ad6e sBox4Mon4Exp -02:ad71 sBox4Mon4HPExp 02:ad71 sBox4Mon4StatExp +02:ad71 sBox4Mon4HPExp 02:ad73 sBox4Mon4AtkExp 02:ad75 sBox4Mon4DefExp 02:ad77 sBox4Mon4SpdExp @@ -46762,21 +46762,21 @@ 02:ad7d sBox4Mon4PP 02:ad81 sBox4Mon4Happiness 02:ad82 sBox4Mon4PokerusStatus -02:ad83 sBox4Mon4CaughtLevel 02:ad83 sBox4Mon4CaughtTime 02:ad83 sBox4Mon4CaughtData +02:ad83 sBox4Mon4CaughtLevel 02:ad84 sBox4Mon4CaughtLocation 02:ad84 sBox4Mon4CaughtGender 02:ad85 sBox4Mon4Level -02:ad86 sBox4Mon4BoxEnd 02:ad86 sBox4Mon5Species +02:ad86 sBox4Mon4BoxEnd 02:ad86 sBox4Mon5 02:ad87 sBox4Mon5Item 02:ad88 sBox4Mon5Moves 02:ad8c sBox4Mon5ID 02:ad8e sBox4Mon5Exp -02:ad91 sBox4Mon5StatExp 02:ad91 sBox4Mon5HPExp +02:ad91 sBox4Mon5StatExp 02:ad93 sBox4Mon5AtkExp 02:ad95 sBox4Mon5DefExp 02:ad97 sBox4Mon5SpdExp @@ -46785,21 +46785,21 @@ 02:ad9d sBox4Mon5PP 02:ada1 sBox4Mon5Happiness 02:ada2 sBox4Mon5PokerusStatus +02:ada3 sBox4Mon5CaughtLevel 02:ada3 sBox4Mon5CaughtTime 02:ada3 sBox4Mon5CaughtData -02:ada3 sBox4Mon5CaughtLevel -02:ada4 sBox4Mon5CaughtGender 02:ada4 sBox4Mon5CaughtLocation +02:ada4 sBox4Mon5CaughtGender 02:ada5 sBox4Mon5Level -02:ada6 sBox4Mon5BoxEnd 02:ada6 sBox4Mon6Species +02:ada6 sBox4Mon5BoxEnd 02:ada6 sBox4Mon6 02:ada7 sBox4Mon6Item 02:ada8 sBox4Mon6Moves 02:adac sBox4Mon6ID 02:adae sBox4Mon6Exp -02:adb1 sBox4Mon6StatExp 02:adb1 sBox4Mon6HPExp +02:adb1 sBox4Mon6StatExp 02:adb3 sBox4Mon6AtkExp 02:adb5 sBox4Mon6DefExp 02:adb7 sBox4Mon6SpdExp @@ -46808,21 +46808,21 @@ 02:adbd sBox4Mon6PP 02:adc1 sBox4Mon6Happiness 02:adc2 sBox4Mon6PokerusStatus -02:adc3 sBox4Mon6CaughtData -02:adc3 sBox4Mon6CaughtTime 02:adc3 sBox4Mon6CaughtLevel +02:adc3 sBox4Mon6CaughtTime +02:adc3 sBox4Mon6CaughtData 02:adc4 sBox4Mon6CaughtGender 02:adc4 sBox4Mon6CaughtLocation 02:adc5 sBox4Mon6Level -02:adc6 sBox4Mon6BoxEnd 02:adc6 sBox4Mon7 02:adc6 sBox4Mon7Species +02:adc6 sBox4Mon6BoxEnd 02:adc7 sBox4Mon7Item 02:adc8 sBox4Mon7Moves 02:adcc sBox4Mon7ID 02:adce sBox4Mon7Exp -02:add1 sBox4Mon7StatExp 02:add1 sBox4Mon7HPExp +02:add1 sBox4Mon7StatExp 02:add3 sBox4Mon7AtkExp 02:add5 sBox4Mon7DefExp 02:add7 sBox4Mon7SpdExp @@ -46831,21 +46831,21 @@ 02:addd sBox4Mon7PP 02:ade1 sBox4Mon7Happiness 02:ade2 sBox4Mon7PokerusStatus -02:ade3 sBox4Mon7CaughtData 02:ade3 sBox4Mon7CaughtLevel 02:ade3 sBox4Mon7CaughtTime +02:ade3 sBox4Mon7CaughtData 02:ade4 sBox4Mon7CaughtLocation 02:ade4 sBox4Mon7CaughtGender 02:ade5 sBox4Mon7Level 02:ade6 sBox4Mon8 -02:ade6 sBox4Mon7BoxEnd 02:ade6 sBox4Mon8Species +02:ade6 sBox4Mon7BoxEnd 02:ade7 sBox4Mon8Item 02:ade8 sBox4Mon8Moves 02:adec sBox4Mon8ID 02:adee sBox4Mon8Exp -02:adf1 sBox4Mon8StatExp 02:adf1 sBox4Mon8HPExp +02:adf1 sBox4Mon8StatExp 02:adf3 sBox4Mon8AtkExp 02:adf5 sBox4Mon8DefExp 02:adf7 sBox4Mon8SpdExp @@ -48021,8 +48021,8 @@ 02:b768 sBox6Mon15Moves 02:b76c sBox6Mon15ID 02:b76e sBox6Mon15Exp -02:b771 sBox6Mon15StatExp 02:b771 sBox6Mon15HPExp +02:b771 sBox6Mon15StatExp 02:b773 sBox6Mon15AtkExp 02:b775 sBox6Mon15DefExp 02:b777 sBox6Mon15SpdExp @@ -48615,8 +48615,8 @@ 02:bc34 sBox7Mon18CaughtGender 02:bc35 sBox7Mon18Level 02:bc36 sBox7Mon19 -02:bc36 sBox7Mon18BoxEnd 02:bc36 sBox7Mon19Species +02:bc36 sBox7Mon18BoxEnd 02:bc37 sBox7Mon19Item 02:bc38 sBox7Mon19Moves 02:bc3c sBox7Mon19ID @@ -49800,8 +49800,8 @@ 03:a918 sBox10Mon4Moves 03:a91c sBox10Mon4ID 03:a91e sBox10Mon4Exp -03:a921 sBox10Mon4StatExp 03:a921 sBox10Mon4HPExp +03:a921 sBox10Mon4StatExp 03:a923 sBox10Mon4AtkExp 03:a925 sBox10Mon4DefExp 03:a927 sBox10Mon4SpdExp @@ -49978,8 +49978,8 @@ 03:aa14 sBox10Mon11CaughtLocation 03:aa15 sBox10Mon11Level 03:aa16 sBox10Mon12Species -03:aa16 sBox10Mon12 03:aa16 sBox10Mon11BoxEnd +03:aa16 sBox10Mon12 03:aa17 sBox10Mon12Item 03:aa18 sBox10Mon12Moves 03:aa1c sBox10Mon12ID @@ -50371,8 +50371,8 @@ 03:adc4 sBox11Mon6CaughtGender 03:adc5 sBox11Mon6Level 03:adc6 sBox11Mon7 -03:adc6 sBox11Mon7Species 03:adc6 sBox11Mon6BoxEnd +03:adc6 sBox11Mon7Species 03:adc7 sBox11Mon7Item 03:adc8 sBox11Mon7Moves 03:adcc sBox11Mon7ID @@ -50826,9 +50826,9 @@ 03:b1cd sBox12Mon4PP 03:b1d1 sBox12Mon4Happiness 03:b1d2 sBox12Mon4PokerusStatus -03:b1d3 sBox12Mon4CaughtLevel 03:b1d3 sBox12Mon4CaughtData 03:b1d3 sBox12Mon4CaughtTime +03:b1d3 sBox12Mon4CaughtLevel 03:b1d4 sBox12Mon4CaughtGender 03:b1d4 sBox12Mon4CaughtLocation 03:b1d5 sBox12Mon4Level @@ -52211,8 +52211,8 @@ 03:bc71 sBox14Mon20Happiness 03:bc72 sBox14Mon20PokerusStatus 03:bc73 sBox14Mon20CaughtLevel -03:bc73 sBox14Mon20CaughtTime 03:bc73 sBox14Mon20CaughtData +03:bc73 sBox14Mon20CaughtTime 03:bc74 sBox14Mon20CaughtLocation 03:bc74 sBox14Mon20CaughtGender 03:bc75 sBox14Mon20Level @@ -53261,11 +53261,11 @@ 00:c608 wBoxPartialData 00:c608 wTimeSetBuffer 00:c608 wHallOfFameTemp +00:c608 wBT_OTTempName 00:c608 wc608 00:c608 wUnknownGender 00:c608 wDebugLightColor 00:c608 wHallOfFameTempWinCount -00:c608 wBT_OTTempName 00:c608 wMobileMonSender 00:c608 wBT_OTTemp 00:c608 wEnemyMoveStruct @@ -53533,10 +53533,10 @@ 00:c64c wHallOfFameTempMon5DVs 00:c64c wBattleMonStructEnd 00:c64e wBT_OTTempMon2 -00:c64e wHallOfFameTempMon5Level 00:c64e wWildMon 00:c64e wBT_OTTempMon2Species 00:c64e wOfferMonHappiness +00:c64e wHallOfFameTempMon5Level 00:c64f wHallOfFameTempMon5Nickname 00:c64f wBT_OTTempMon2Item 00:c64f wOfferMonPokerusStatus @@ -53597,9 +53597,9 @@ 00:c669 wPlayerSubStatus2 00:c66a wPlayerSubStatus3 00:c66a wBT_OTTempMon2PokerusStatus -00:c66b wPlayerSubStatus4 00:c66b wUnknownMonMailMessageEnd 00:c66b wBT_OTTempMon2CaughtData +00:c66b wPlayerSubStatus4 00:c66b wBT_OTTempMon2CaughtTime 00:c66b wBT_OTTempMon2CaughtLevel 00:c66c wBT_OTTempMon2CaughtLocation @@ -54097,8 +54097,8 @@ 00:c830 wLinkPlayerPartyMon1CaughtData 00:c830 wTimeCapsulePartyMon1PP 00:c830 wLinkPlayerPartyMon1CaughtLevel -00:c831 wHallOfFamePokemonListMon3End 00:c831 wHallOfFamePokemonListMon4Species +00:c831 wHallOfFamePokemonListMon3End 00:c831 wHallOfFamePokemonListMon4 00:c831 wLinkPlayerPartyMon1CaughtGender 00:c831 wLinkPlayerPartyMon1CaughtLocation @@ -54796,12 +54796,12 @@ 00:cf64 wPrevDexEntryJumptableIndex 00:cf64 wcf64 00:cf64 wDebugTilesetCurPalette +00:cf64 wCardFlipCursorY 00:cf64 wStatsScreenFlags 00:cf64 wNrOfBeatenBattleTowerTrainers 00:cf64 wTrainerCardBadgeFrameCounter 00:cf64 wCreditsBorderFrame 00:cf64 wNamingScreenLetterCase -00:cf64 wCardFlipCursorY 00:cf64 wPokegearCard 00:cf64 wPackJumptableIndex 00:cf64 wSlotsDelay @@ -54984,6 +54984,7 @@ 01:d003 wTempPokedexCaughtCount 01:d003 wFinishedPrintingBox 01:d003 wSeerNickname +01:d003 wTownMapCursorCoordinates 01:d003 wMovementBufferObject 01:d003 wPlaceBallsDirection 01:d003 wBillsPCTempListIndex @@ -54992,7 +54993,6 @@ 01:d003 wDebugColorIsShiny 01:d003 wNextRadioLine 01:d003 wPhoneCaller -01:d003 wTownMapCursorCoordinates 01:d004 wAddrOfBoxToPrint 01:d004 wBugContestFirstPlaceScore 01:d004 wTrainerHUDTiles @@ -55024,8 +55024,8 @@ 01:d00c wRadioText 01:d00c wBugContestThirdPlaceScore 01:d00c wMobileParticipant2Nickname -01:d00d wLinkBattleRecordWins 01:d00d wBufferMonOT +01:d00d wLinkBattleRecordWins 01:d00e wMartItem5BCD 01:d00e wBugContestTempWinnerID 01:d00e wSeerCaughtLocation @@ -55225,8 +55225,8 @@ 01:d102 wUnusedNamesPointer 01:d104 wItemAttributesPointer 01:d106 wCurItem -01:d107 wCurItemQuantity 01:d107 wMartItemID +01:d107 wCurItemQuantity 01:d108 wCurPartySpecies 01:d109 wCurPartyMon 01:d10a wWhichHPBar @@ -55364,12 +55364,13 @@ 01:d1ea wListMovesLineSpacing 01:d1ea wFinalCatchRate 01:d1ea wCurDecoration -01:d1ea wCurMapScriptBank 01:d1ea wCurMailAuthorID +01:d1ea wEvolutionOldSpecies 01:d1ea wPPUpPPBuffer 01:d1ea wTempMysteryGiftTimer 01:d1ea wSkipMovesBeforeLevelUp 01:d1ea wExpToNextLevel +01:d1ea wCurMapScriptBank 01:d1ea wFieldMoveData 01:d1ea wHPBuffer1 01:d1ea wCurHPAnimMaxHP @@ -55388,7 +55389,6 @@ 01:d1ea wMagikarpLength 01:d1ea wRestartClockCurDivision 01:d1ea wd1ea -01:d1ea wEvolutionOldSpecies 01:d1eb wHealMachineTempOBP1 01:d1eb wSurfingPlayerState 01:d1eb wPCItemQuantity @@ -55544,8 +55544,8 @@ 01:d269 wTimeOfDay 01:d26b wPokedexShowPointerAddr 01:d26b wUnusedEggHatchFlag -01:d26b wOTPlayerName 01:d26b wOTPartyData +01:d26b wOTPlayerName 01:d26d wPokedexShowPointerBank 01:d271 wd271 01:d276 wOTPlayerID @@ -56221,8 +56221,8 @@ 01:d684 wObject10Field1e 01:d685 wObject10JumpHeight 01:d686 wObject10Range -01:d68e wObject11Struct 01:d68e wObject11Sprite +01:d68e wObject11Struct 01:d68e wObject10StructEnd 01:d68f wObject11MapObjectIndex 01:d690 wObject11SpriteTile @@ -56534,7 +56534,7 @@ 01:d81a wMap15ObjectEventFlag 01:d81e wObjectMasks 01:d82e wVariableSprites -01:d83e wEnteredMapFromContinue +01:d83e wMapNameSignFlags 01:d841 wTimeOfDayPal 01:d846 wTimeOfDayPalFlags 01:d847 wTimeOfDayPalset @@ -57003,8 +57003,8 @@ 01:df0e wBreedMon1Moves 01:df12 wBreedMon1ID 01:df14 wBreedMon1Exp -01:df17 wBreedMon1HPExp 01:df17 wBreedMon1StatExp +01:df17 wBreedMon1HPExp 01:df19 wBreedMon1AtkExp 01:df1b wBreedMon1DefExp 01:df1d wBreedMon1SpdExp @@ -57361,8 +57361,8 @@ 03:d272 w3_d202Mon2Speed 03:d274 w3_d202Mon2SpclAtk 03:d276 w3_d202Mon2SpclDef -03:d278 w3_d202Mon2StructEnd 03:d278 w3_d202Mon2Name +03:d278 w3_d202Mon2StructEnd 03:d283 w3_d202Mon3 03:d283 w3_d202Mon3Species 03:d284 w3_d202Mon3Item @@ -57969,8 +57969,8 @@ 03:d764 w3_d742Mon1PP 03:d768 w3_d742Mon1Happiness 03:d769 w3_d742Mon1PokerusStatus -03:d76a w3_d742Mon1CaughtTime 03:d76a w3_d742Mon1CaughtData +03:d76a w3_d742Mon1CaughtTime 03:d76a w3_d742Mon1CaughtLevel 03:d76b w3_d742Mon1CaughtLocation 03:d76b w3_d742Mon1CaughtGender diff --git a/pokecrystal11.map b/pokecrystal11.map index fcbee894f..b9bb8bf65 100644 --- a/pokecrystal11.map +++ b/pokecrystal11.map @@ -565,8 +565,8 @@ ROM0 bank #0: $1c9c = PlaceVerticalMenuItems.loop $1cbb = MenuBox $1cc6 = GetMenuTextStartCoord - $1cd8 = GetMenuTextStartCoord.bit_6_set - $1ce0 = GetMenuTextStartCoord.bit_7_clear + $1cd8 = GetMenuTextStartCoord.no_top_spacing + $1ce0 = GetMenuTextStartCoord.no_cursor $1ce1 = ClearMenuBoxInterior $1cf1 = ClearWholeMenuBox $1cfd = MenuBoxCoord2Tile @@ -612,7 +612,7 @@ ROM0 bank #0: $1ee1 = RunMenuItemPrintingFunction.loop $1efb = RunMenuItemPrintingFunction._hl_ $1eff = InitMenuCursorAndButtonPermissions - $1f0e = InitMenuCursorAndButtonPermissions.disallow_select + $1f0e = InitMenuCursorAndButtonPermissions.disallow_start $1f19 = InitMenuCursorAndButtonPermissions.disallow_left_right $1f1a = GetScrollingMenuJoypad $1f23 = GetStaticMenuJoypad @@ -4538,7 +4538,7 @@ ROMX bank #5: $4089 = StartClock $4097 = StartClock.skip_set $409b = _FixDays - $40a8 = _FixDays.set_bit_7 + $40a8 = _FixDays.reset_rtc $40ae = ClockContinue $40c8 = ClockContinue.time_overflow $40eb = ClockContinue.dont_update @@ -4549,8 +4549,8 @@ ROMX bank #5: $4128 = _InitTime.okay_days $412a = GetEmote2bpp $4135 = _UpdatePlayerSprite - $4146 = _RefreshSprites - $4157 = _ClearSprites + $4146 = LoadStandingSpritesGFX + $4157 = LoadWalkingSpritesGFX $4168 = RefreshSprites $416f = RefreshSprites.Refresh $4183 = GetPlayerSprite @@ -5746,8 +5746,8 @@ ROMX bank #9: $436b = Place2DMenuCursor.cursor_on $4374 = _PushWindow $4387 = _PushWindow.loop - $4398 = _PushWindow.bit_6 - $43ae = _PushWindow.not_bit_7 + $4398 = _PushWindow.backup_tiles + $43ae = _PushWindow.no_backup_tiles $43b5 = _PushWindow.done $43cd = _PushWindow.copy $43d5 = _PushWindow.row @@ -7201,7 +7201,7 @@ ROMX bank #11: $49a8 = _TMHM_ExitPack $49af = TMHM_ExitPocket $49b1 = TMHM_ScrollPocket - $49c5 = TMHM_ScrollPocket.skip + $49c5 = TMHM_ScrollPocket.down $49ca = TMHM_ScrollPocket.loop $49e2 = TMHM_DisplayPocketItems $49fa = TMHM_DisplayPocketItems.loop2 @@ -44097,8 +44097,8 @@ SRAM bank #1: $ade8 = sBoxMon7Moves $adec = sBoxMon7ID $adee = sBoxMon7Exp - $adf1 = sBoxMon7StatExp $adf1 = sBoxMon7HPExp + $adf1 = sBoxMon7StatExp $adf3 = sBoxMon7AtkExp $adf5 = sBoxMon7DefExp $adf7 = sBoxMon7SpdExp @@ -44199,8 +44199,8 @@ SRAM bank #1: $ae7d = sBoxMon11PP $ae81 = sBoxMon11Happiness $ae82 = sBoxMon11PokerusStatus - $ae83 = sBoxMon11CaughtTime $ae83 = sBoxMon11CaughtLevel + $ae83 = sBoxMon11CaughtTime $ae83 = sBoxMon11CaughtData $ae84 = sBoxMon11CaughtGender $ae84 = sBoxMon11CaughtLocation @@ -44361,8 +44361,8 @@ SRAM bank #1: $af61 = sBoxMon18Happiness $af62 = sBoxMon18PokerusStatus $af63 = sBoxMon18CaughtData - $af63 = sBoxMon18CaughtLevel $af63 = sBoxMon18CaughtTime + $af63 = sBoxMon18CaughtLevel $af64 = sBoxMon18CaughtGender $af64 = sBoxMon18CaughtLocation $af65 = sBoxMon18Level @@ -44462,9 +44462,9 @@ SRAM bank #1: $b260 = sLinkBattleStats $b262 = sLinkBattleLosses $b264 = sLinkBattleDraws + $b266 = sLinkBattleRecord1 $b266 = sLinkBattleRecord $b266 = sLinkBattleRecord1ID - $b266 = sLinkBattleRecord1 $b268 = sLinkBattleRecord1Name $b272 = sLinkBattleRecord1Wins $b274 = sLinkBattleRecord1Losses @@ -44951,8 +44951,8 @@ SRAM bank #1: $b689 = sHallOfFame10Mon6Nickname $b693 = sHallOfFame10Mon6End $b693 = sHallOfFame10End - $b694 = sHallOfFame11 $b694 = sHallOfFame11WinCount + $b694 = sHallOfFame11 $b695 = sHallOfFame11Mon1 $b695 = sHallOfFame11Mon1Species $b696 = sHallOfFame11Mon1ID @@ -45268,8 +45268,8 @@ SRAM bank #1: $b941 = sHallOfFame17Mon6End $b942 = sHallOfFame18WinCount $b942 = sHallOfFame18 - $b943 = sHallOfFame18Mon1 $b943 = sHallOfFame18Mon1Species + $b943 = sHallOfFame18Mon1 $b944 = sHallOfFame18Mon1ID $b946 = sHallOfFame18Mon1DVs $b948 = sHallOfFame18Mon1Level @@ -46501,8 +46501,8 @@ SRAM bank #2: $a504 = sBox2Mon5CaughtGender $a504 = sBox2Mon5CaughtLocation $a505 = sBox2Mon5Level - $a506 = sBox2Mon6 $a506 = sBox2Mon5BoxEnd + $a506 = sBox2Mon6 $a506 = sBox2Mon6Species $a507 = sBox2Mon6Item $a508 = sBox2Mon6Moves @@ -46731,8 +46731,8 @@ SRAM bank #2: $a644 = sBox2Mon15CaughtGender $a644 = sBox2Mon15CaughtLocation $a645 = sBox2Mon15Level - $a646 = sBox2Mon16Species $a646 = sBox2Mon15BoxEnd + $a646 = sBox2Mon16Species $a646 = sBox2Mon16 $a647 = sBox2Mon16Item $a648 = sBox2Mon16Moves @@ -47478,8 +47478,8 @@ SRAM bank #2: $ad68 = sBox4Mon4Moves $ad6c = sBox4Mon4ID $ad6e = sBox4Mon4Exp - $ad71 = sBox4Mon4HPExp $ad71 = sBox4Mon4StatExp + $ad71 = sBox4Mon4HPExp $ad73 = sBox4Mon4AtkExp $ad75 = sBox4Mon4DefExp $ad77 = sBox4Mon4SpdExp @@ -47488,21 +47488,21 @@ SRAM bank #2: $ad7d = sBox4Mon4PP $ad81 = sBox4Mon4Happiness $ad82 = sBox4Mon4PokerusStatus - $ad83 = sBox4Mon4CaughtLevel $ad83 = sBox4Mon4CaughtTime $ad83 = sBox4Mon4CaughtData + $ad83 = sBox4Mon4CaughtLevel $ad84 = sBox4Mon4CaughtLocation $ad84 = sBox4Mon4CaughtGender $ad85 = sBox4Mon4Level - $ad86 = sBox4Mon4BoxEnd $ad86 = sBox4Mon5Species + $ad86 = sBox4Mon4BoxEnd $ad86 = sBox4Mon5 $ad87 = sBox4Mon5Item $ad88 = sBox4Mon5Moves $ad8c = sBox4Mon5ID $ad8e = sBox4Mon5Exp - $ad91 = sBox4Mon5StatExp $ad91 = sBox4Mon5HPExp + $ad91 = sBox4Mon5StatExp $ad93 = sBox4Mon5AtkExp $ad95 = sBox4Mon5DefExp $ad97 = sBox4Mon5SpdExp @@ -47511,21 +47511,21 @@ SRAM bank #2: $ad9d = sBox4Mon5PP $ada1 = sBox4Mon5Happiness $ada2 = sBox4Mon5PokerusStatus + $ada3 = sBox4Mon5CaughtLevel $ada3 = sBox4Mon5CaughtTime $ada3 = sBox4Mon5CaughtData - $ada3 = sBox4Mon5CaughtLevel - $ada4 = sBox4Mon5CaughtGender $ada4 = sBox4Mon5CaughtLocation + $ada4 = sBox4Mon5CaughtGender $ada5 = sBox4Mon5Level - $ada6 = sBox4Mon5BoxEnd $ada6 = sBox4Mon6Species + $ada6 = sBox4Mon5BoxEnd $ada6 = sBox4Mon6 $ada7 = sBox4Mon6Item $ada8 = sBox4Mon6Moves $adac = sBox4Mon6ID $adae = sBox4Mon6Exp - $adb1 = sBox4Mon6StatExp $adb1 = sBox4Mon6HPExp + $adb1 = sBox4Mon6StatExp $adb3 = sBox4Mon6AtkExp $adb5 = sBox4Mon6DefExp $adb7 = sBox4Mon6SpdExp @@ -47534,21 +47534,21 @@ SRAM bank #2: $adbd = sBox4Mon6PP $adc1 = sBox4Mon6Happiness $adc2 = sBox4Mon6PokerusStatus - $adc3 = sBox4Mon6CaughtData - $adc3 = sBox4Mon6CaughtTime $adc3 = sBox4Mon6CaughtLevel + $adc3 = sBox4Mon6CaughtTime + $adc3 = sBox4Mon6CaughtData $adc4 = sBox4Mon6CaughtGender $adc4 = sBox4Mon6CaughtLocation $adc5 = sBox4Mon6Level - $adc6 = sBox4Mon6BoxEnd $adc6 = sBox4Mon7 $adc6 = sBox4Mon7Species + $adc6 = sBox4Mon6BoxEnd $adc7 = sBox4Mon7Item $adc8 = sBox4Mon7Moves $adcc = sBox4Mon7ID $adce = sBox4Mon7Exp - $add1 = sBox4Mon7StatExp $add1 = sBox4Mon7HPExp + $add1 = sBox4Mon7StatExp $add3 = sBox4Mon7AtkExp $add5 = sBox4Mon7DefExp $add7 = sBox4Mon7SpdExp @@ -47557,21 +47557,21 @@ SRAM bank #2: $addd = sBox4Mon7PP $ade1 = sBox4Mon7Happiness $ade2 = sBox4Mon7PokerusStatus - $ade3 = sBox4Mon7CaughtData $ade3 = sBox4Mon7CaughtLevel $ade3 = sBox4Mon7CaughtTime + $ade3 = sBox4Mon7CaughtData $ade4 = sBox4Mon7CaughtLocation $ade4 = sBox4Mon7CaughtGender $ade5 = sBox4Mon7Level $ade6 = sBox4Mon8 - $ade6 = sBox4Mon7BoxEnd $ade6 = sBox4Mon8Species + $ade6 = sBox4Mon7BoxEnd $ade7 = sBox4Mon8Item $ade8 = sBox4Mon8Moves $adec = sBox4Mon8ID $adee = sBox4Mon8Exp - $adf1 = sBox4Mon8StatExp $adf1 = sBox4Mon8HPExp + $adf1 = sBox4Mon8StatExp $adf3 = sBox4Mon8AtkExp $adf5 = sBox4Mon8DefExp $adf7 = sBox4Mon8SpdExp @@ -48747,8 +48747,8 @@ SRAM bank #2: $b768 = sBox6Mon15Moves $b76c = sBox6Mon15ID $b76e = sBox6Mon15Exp - $b771 = sBox6Mon15StatExp $b771 = sBox6Mon15HPExp + $b771 = sBox6Mon15StatExp $b773 = sBox6Mon15AtkExp $b775 = sBox6Mon15DefExp $b777 = sBox6Mon15SpdExp @@ -49341,8 +49341,8 @@ SRAM bank #2: $bc34 = sBox7Mon18CaughtGender $bc35 = sBox7Mon18Level $bc36 = sBox7Mon19 - $bc36 = sBox7Mon18BoxEnd $bc36 = sBox7Mon19Species + $bc36 = sBox7Mon18BoxEnd $bc37 = sBox7Mon19Item $bc38 = sBox7Mon19Moves $bc3c = sBox7Mon19ID @@ -50531,8 +50531,8 @@ SRAM bank #3: $a918 = sBox10Mon4Moves $a91c = sBox10Mon4ID $a91e = sBox10Mon4Exp - $a921 = sBox10Mon4StatExp $a921 = sBox10Mon4HPExp + $a921 = sBox10Mon4StatExp $a923 = sBox10Mon4AtkExp $a925 = sBox10Mon4DefExp $a927 = sBox10Mon4SpdExp @@ -50709,8 +50709,8 @@ SRAM bank #3: $aa14 = sBox10Mon11CaughtLocation $aa15 = sBox10Mon11Level $aa16 = sBox10Mon12Species - $aa16 = sBox10Mon12 $aa16 = sBox10Mon11BoxEnd + $aa16 = sBox10Mon12 $aa17 = sBox10Mon12Item $aa18 = sBox10Mon12Moves $aa1c = sBox10Mon12ID @@ -51102,8 +51102,8 @@ SRAM bank #3: $adc4 = sBox11Mon6CaughtGender $adc5 = sBox11Mon6Level $adc6 = sBox11Mon7 - $adc6 = sBox11Mon7Species $adc6 = sBox11Mon6BoxEnd + $adc6 = sBox11Mon7Species $adc7 = sBox11Mon7Item $adc8 = sBox11Mon7Moves $adcc = sBox11Mon7ID @@ -51557,9 +51557,9 @@ SRAM bank #3: $b1cd = sBox12Mon4PP $b1d1 = sBox12Mon4Happiness $b1d2 = sBox12Mon4PokerusStatus - $b1d3 = sBox12Mon4CaughtLevel $b1d3 = sBox12Mon4CaughtData $b1d3 = sBox12Mon4CaughtTime + $b1d3 = sBox12Mon4CaughtLevel $b1d4 = sBox12Mon4CaughtGender $b1d4 = sBox12Mon4CaughtLocation $b1d5 = sBox12Mon4Level @@ -52942,8 +52942,8 @@ SRAM bank #3: $bc71 = sBox14Mon20Happiness $bc72 = sBox14Mon20PokerusStatus $bc73 = sBox14Mon20CaughtLevel - $bc73 = sBox14Mon20CaughtTime $bc73 = sBox14Mon20CaughtData + $bc73 = sBox14Mon20CaughtTime $bc74 = sBox14Mon20CaughtLocation $bc74 = sBox14Mon20CaughtGender $bc75 = sBox14Mon20Level @@ -54023,11 +54023,11 @@ WRAM0 bank #0: $c608 = wBoxPartialData $c608 = wTimeSetBuffer $c608 = wHallOfFameTemp + $c608 = wBT_OTTempName $c608 = wc608 $c608 = wUnknownGender $c608 = wDebugLightColor $c608 = wHallOfFameTempWinCount - $c608 = wBT_OTTempName $c608 = wMobileMonSender $c608 = wBT_OTTemp $c608 = wEnemyMoveStruct @@ -54295,10 +54295,10 @@ WRAM0 bank #0: $c64c = wHallOfFameTempMon5DVs $c64c = wBattleMonStructEnd $c64e = wBT_OTTempMon2 - $c64e = wHallOfFameTempMon5Level $c64e = wWildMon $c64e = wBT_OTTempMon2Species $c64e = wOfferMonHappiness + $c64e = wHallOfFameTempMon5Level $c64f = wHallOfFameTempMon5Nickname $c64f = wBT_OTTempMon2Item $c64f = wOfferMonPokerusStatus @@ -54359,9 +54359,9 @@ WRAM0 bank #0: $c669 = wPlayerSubStatus2 $c66a = wPlayerSubStatus3 $c66a = wBT_OTTempMon2PokerusStatus - $c66b = wPlayerSubStatus4 $c66b = wUnknownMonMailMessageEnd $c66b = wBT_OTTempMon2CaughtData + $c66b = wPlayerSubStatus4 $c66b = wBT_OTTempMon2CaughtTime $c66b = wBT_OTTempMon2CaughtLevel $c66c = wBT_OTTempMon2CaughtLocation @@ -54862,8 +54862,8 @@ WRAM0 bank #0: $c830 = wLinkPlayerPartyMon1CaughtData $c830 = wTimeCapsulePartyMon1PP $c830 = wLinkPlayerPartyMon1CaughtLevel - $c831 = wHallOfFamePokemonListMon3End $c831 = wHallOfFamePokemonListMon4Species + $c831 = wHallOfFamePokemonListMon3End $c831 = wHallOfFamePokemonListMon4 $c831 = wLinkPlayerPartyMon1CaughtGender $c831 = wLinkPlayerPartyMon1CaughtLocation @@ -55563,12 +55563,12 @@ WRAM0 bank #0: $cf64 = wPrevDexEntryJumptableIndex $cf64 = wcf64 $cf64 = wDebugTilesetCurPalette + $cf64 = wCardFlipCursorY $cf64 = wStatsScreenFlags $cf64 = wNrOfBeatenBattleTowerTrainers $cf64 = wTrainerCardBadgeFrameCounter $cf64 = wCreditsBorderFrame $cf64 = wNamingScreenLetterCase - $cf64 = wCardFlipCursorY $cf64 = wPokegearCard $cf64 = wPackJumptableIndex $cf64 = wSlotsDelay @@ -55756,6 +55756,7 @@ WRAMX bank #1: $d003 = wTempPokedexCaughtCount $d003 = wFinishedPrintingBox $d003 = wSeerNickname + $d003 = wTownMapCursorCoordinates $d003 = wMovementBufferObject $d003 = wPlaceBallsDirection $d003 = wBillsPCTempListIndex @@ -55764,7 +55765,6 @@ WRAMX bank #1: $d003 = wDebugColorIsShiny $d003 = wNextRadioLine $d003 = wPhoneCaller - $d003 = wTownMapCursorCoordinates $d004 = wAddrOfBoxToPrint $d004 = wBugContestFirstPlaceScore $d004 = wTrainerHUDTiles @@ -55796,8 +55796,8 @@ WRAMX bank #1: $d00c = wRadioText $d00c = wBugContestThirdPlaceScore $d00c = wMobileParticipant2Nickname - $d00d = wLinkBattleRecordWins $d00d = wBufferMonOT + $d00d = wLinkBattleRecordWins $d00e = wMartItem5BCD $d00e = wBugContestTempWinnerID $d00e = wSeerCaughtLocation @@ -55998,8 +55998,8 @@ WRAMX bank #1: $d102 = wUnusedNamesPointer $d104 = wItemAttributesPointer $d106 = wCurItem - $d107 = wCurItemQuantity $d107 = wMartItemID + $d107 = wCurItemQuantity $d108 = wCurPartySpecies $d109 = wCurPartyMon $d10a = wWhichHPBar @@ -56137,12 +56137,13 @@ WRAMX bank #1: $d1ea = wListMovesLineSpacing $d1ea = wFinalCatchRate $d1ea = wCurDecoration - $d1ea = wCurMapScriptBank $d1ea = wCurMailAuthorID + $d1ea = wEvolutionOldSpecies $d1ea = wPPUpPPBuffer $d1ea = wTempMysteryGiftTimer $d1ea = wSkipMovesBeforeLevelUp $d1ea = wExpToNextLevel + $d1ea = wCurMapScriptBank $d1ea = wFieldMoveData $d1ea = wHPBuffer1 $d1ea = wCurHPAnimMaxHP @@ -56161,7 +56162,6 @@ WRAMX bank #1: $d1ea = wMagikarpLength $d1ea = wRestartClockCurDivision $d1ea = wd1ea - $d1ea = wEvolutionOldSpecies $d1eb = wHealMachineTempOBP1 $d1eb = wSurfingPlayerState $d1eb = wPCItemQuantity @@ -56318,8 +56318,8 @@ WRAMX bank #1: SECTION: $d26b-$dcd6 ($0a6c bytes) ["Enemy Party"] $d26b = wPokedexShowPointerAddr $d26b = wUnusedEggHatchFlag - $d26b = wOTPlayerName $d26b = wOTPartyData + $d26b = wOTPlayerName $d26d = wPokedexShowPointerBank $d271 = wd271 $d276 = wOTPlayerID @@ -56995,8 +56995,8 @@ WRAMX bank #1: $d684 = wObject10Field1e $d685 = wObject10JumpHeight $d686 = wObject10Range - $d68e = wObject11Struct $d68e = wObject11Sprite + $d68e = wObject11Struct $d68e = wObject10StructEnd $d68f = wObject11MapObjectIndex $d690 = wObject11SpriteTile @@ -57308,7 +57308,7 @@ WRAMX bank #1: $d81a = wMap15ObjectEventFlag $d81e = wObjectMasks $d82e = wVariableSprites - $d83e = wEnteredMapFromContinue + $d83e = wMapNameSignFlags $d841 = wTimeOfDayPal $d846 = wTimeOfDayPalFlags $d847 = wTimeOfDayPalset @@ -57778,8 +57778,8 @@ WRAMX bank #1: $df0e = wBreedMon1Moves $df12 = wBreedMon1ID $df14 = wBreedMon1Exp - $df17 = wBreedMon1HPExp $df17 = wBreedMon1StatExp + $df17 = wBreedMon1HPExp $df19 = wBreedMon1AtkExp $df1b = wBreedMon1DefExp $df1d = wBreedMon1SpdExp @@ -58146,8 +58146,8 @@ WRAMX bank #3: $d272 = w3_d202Mon2Speed $d274 = w3_d202Mon2SpclAtk $d276 = w3_d202Mon2SpclDef - $d278 = w3_d202Mon2StructEnd $d278 = w3_d202Mon2Name + $d278 = w3_d202Mon2StructEnd $d283 = w3_d202Mon3 $d283 = w3_d202Mon3Species $d284 = w3_d202Mon3Item @@ -58754,8 +58754,8 @@ WRAMX bank #3: $d764 = w3_d742Mon1PP $d768 = w3_d742Mon1Happiness $d769 = w3_d742Mon1PokerusStatus - $d76a = w3_d742Mon1CaughtTime $d76a = w3_d742Mon1CaughtData + $d76a = w3_d742Mon1CaughtTime $d76a = w3_d742Mon1CaughtLevel $d76b = w3_d742Mon1CaughtLocation $d76b = w3_d742Mon1CaughtGender diff --git a/pokecrystal11.sym b/pokecrystal11.sym index 086f7d139..fdbaff86d 100644 --- a/pokecrystal11.sym +++ b/pokecrystal11.sym @@ -530,8 +530,8 @@ 00:1c9c PlaceVerticalMenuItems.loop 00:1cbb MenuBox 00:1cc6 GetMenuTextStartCoord -00:1cd8 GetMenuTextStartCoord.bit_6_set -00:1ce0 GetMenuTextStartCoord.bit_7_clear +00:1cd8 GetMenuTextStartCoord.no_top_spacing +00:1ce0 GetMenuTextStartCoord.no_cursor 00:1ce1 ClearMenuBoxInterior 00:1cf1 ClearWholeMenuBox 00:1cfd MenuBoxCoord2Tile @@ -577,7 +577,7 @@ 00:1ee1 RunMenuItemPrintingFunction.loop 00:1efb RunMenuItemPrintingFunction._hl_ 00:1eff InitMenuCursorAndButtonPermissions -00:1f0e InitMenuCursorAndButtonPermissions.disallow_select +00:1f0e InitMenuCursorAndButtonPermissions.disallow_start 00:1f19 InitMenuCursorAndButtonPermissions.disallow_left_right 00:1f1a GetScrollingMenuJoypad 00:1f23 GetStaticMenuJoypad @@ -4478,7 +4478,7 @@ 05:4089 StartClock 05:4097 StartClock.skip_set 05:409b _FixDays -05:40a8 _FixDays.set_bit_7 +05:40a8 _FixDays.reset_rtc 05:40ae ClockContinue 05:40c8 ClockContinue.time_overflow 05:40eb ClockContinue.dont_update @@ -4489,8 +4489,8 @@ 05:4128 _InitTime.okay_days 05:412a GetEmote2bpp 05:4135 _UpdatePlayerSprite -05:4146 _RefreshSprites -05:4157 _ClearSprites +05:4146 LoadStandingSpritesGFX +05:4157 LoadWalkingSpritesGFX 05:4168 RefreshSprites 05:416f RefreshSprites.Refresh 05:4183 GetPlayerSprite @@ -5662,8 +5662,8 @@ 09:436b Place2DMenuCursor.cursor_on 09:4374 _PushWindow 09:4387 _PushWindow.loop -09:4398 _PushWindow.bit_6 -09:43ae _PushWindow.not_bit_7 +09:4398 _PushWindow.backup_tiles +09:43ae _PushWindow.no_backup_tiles 09:43b5 _PushWindow.done 09:43cd _PushWindow.copy 09:43d5 _PushWindow.row @@ -7106,7 +7106,7 @@ 0b:49a8 _TMHM_ExitPack 0b:49af TMHM_ExitPocket 0b:49b1 TMHM_ScrollPocket -0b:49c5 TMHM_ScrollPocket.skip +0b:49c5 TMHM_ScrollPocket.down 0b:49ca TMHM_ScrollPocket.loop 0b:49e2 TMHM_DisplayPocketItems 0b:49fa TMHM_DisplayPocketItems.loop2 @@ -43380,8 +43380,8 @@ 01:ade8 sBoxMon7Moves 01:adec sBoxMon7ID 01:adee sBoxMon7Exp -01:adf1 sBoxMon7StatExp 01:adf1 sBoxMon7HPExp +01:adf1 sBoxMon7StatExp 01:adf3 sBoxMon7AtkExp 01:adf5 sBoxMon7DefExp 01:adf7 sBoxMon7SpdExp @@ -43482,8 +43482,8 @@ 01:ae7d sBoxMon11PP 01:ae81 sBoxMon11Happiness 01:ae82 sBoxMon11PokerusStatus -01:ae83 sBoxMon11CaughtTime 01:ae83 sBoxMon11CaughtLevel +01:ae83 sBoxMon11CaughtTime 01:ae83 sBoxMon11CaughtData 01:ae84 sBoxMon11CaughtGender 01:ae84 sBoxMon11CaughtLocation @@ -43644,8 +43644,8 @@ 01:af61 sBoxMon18Happiness 01:af62 sBoxMon18PokerusStatus 01:af63 sBoxMon18CaughtData -01:af63 sBoxMon18CaughtLevel 01:af63 sBoxMon18CaughtTime +01:af63 sBoxMon18CaughtLevel 01:af64 sBoxMon18CaughtGender 01:af64 sBoxMon18CaughtLocation 01:af65 sBoxMon18Level @@ -43744,9 +43744,9 @@ 01:b260 sLinkBattleStats 01:b262 sLinkBattleLosses 01:b264 sLinkBattleDraws +01:b266 sLinkBattleRecord1 01:b266 sLinkBattleRecord 01:b266 sLinkBattleRecord1ID -01:b266 sLinkBattleRecord1 01:b268 sLinkBattleRecord1Name 01:b272 sLinkBattleRecord1Wins 01:b274 sLinkBattleRecord1Losses @@ -44232,8 +44232,8 @@ 01:b689 sHallOfFame10Mon6Nickname 01:b693 sHallOfFame10Mon6End 01:b693 sHallOfFame10End -01:b694 sHallOfFame11 01:b694 sHallOfFame11WinCount +01:b694 sHallOfFame11 01:b695 sHallOfFame11Mon1 01:b695 sHallOfFame11Mon1Species 01:b696 sHallOfFame11Mon1ID @@ -44549,8 +44549,8 @@ 01:b941 sHallOfFame17Mon6End 01:b942 sHallOfFame18WinCount 01:b942 sHallOfFame18 -01:b943 sHallOfFame18Mon1 01:b943 sHallOfFame18Mon1Species +01:b943 sHallOfFame18Mon1 01:b944 sHallOfFame18Mon1ID 01:b946 sHallOfFame18Mon1DVs 01:b948 sHallOfFame18Mon1Level @@ -45775,8 +45775,8 @@ 02:a504 sBox2Mon5CaughtGender 02:a504 sBox2Mon5CaughtLocation 02:a505 sBox2Mon5Level -02:a506 sBox2Mon6 02:a506 sBox2Mon5BoxEnd +02:a506 sBox2Mon6 02:a506 sBox2Mon6Species 02:a507 sBox2Mon6Item 02:a508 sBox2Mon6Moves @@ -46005,8 +46005,8 @@ 02:a644 sBox2Mon15CaughtGender 02:a644 sBox2Mon15CaughtLocation 02:a645 sBox2Mon15Level -02:a646 sBox2Mon16Species 02:a646 sBox2Mon15BoxEnd +02:a646 sBox2Mon16Species 02:a646 sBox2Mon16 02:a647 sBox2Mon16Item 02:a648 sBox2Mon16Moves @@ -46752,8 +46752,8 @@ 02:ad68 sBox4Mon4Moves 02:ad6c sBox4Mon4ID 02:ad6e sBox4Mon4Exp -02:ad71 sBox4Mon4HPExp 02:ad71 sBox4Mon4StatExp +02:ad71 sBox4Mon4HPExp 02:ad73 sBox4Mon4AtkExp 02:ad75 sBox4Mon4DefExp 02:ad77 sBox4Mon4SpdExp @@ -46762,21 +46762,21 @@ 02:ad7d sBox4Mon4PP 02:ad81 sBox4Mon4Happiness 02:ad82 sBox4Mon4PokerusStatus -02:ad83 sBox4Mon4CaughtLevel 02:ad83 sBox4Mon4CaughtTime 02:ad83 sBox4Mon4CaughtData +02:ad83 sBox4Mon4CaughtLevel 02:ad84 sBox4Mon4CaughtLocation 02:ad84 sBox4Mon4CaughtGender 02:ad85 sBox4Mon4Level -02:ad86 sBox4Mon4BoxEnd 02:ad86 sBox4Mon5Species +02:ad86 sBox4Mon4BoxEnd 02:ad86 sBox4Mon5 02:ad87 sBox4Mon5Item 02:ad88 sBox4Mon5Moves 02:ad8c sBox4Mon5ID 02:ad8e sBox4Mon5Exp -02:ad91 sBox4Mon5StatExp 02:ad91 sBox4Mon5HPExp +02:ad91 sBox4Mon5StatExp 02:ad93 sBox4Mon5AtkExp 02:ad95 sBox4Mon5DefExp 02:ad97 sBox4Mon5SpdExp @@ -46785,21 +46785,21 @@ 02:ad9d sBox4Mon5PP 02:ada1 sBox4Mon5Happiness 02:ada2 sBox4Mon5PokerusStatus +02:ada3 sBox4Mon5CaughtLevel 02:ada3 sBox4Mon5CaughtTime 02:ada3 sBox4Mon5CaughtData -02:ada3 sBox4Mon5CaughtLevel -02:ada4 sBox4Mon5CaughtGender 02:ada4 sBox4Mon5CaughtLocation +02:ada4 sBox4Mon5CaughtGender 02:ada5 sBox4Mon5Level -02:ada6 sBox4Mon5BoxEnd 02:ada6 sBox4Mon6Species +02:ada6 sBox4Mon5BoxEnd 02:ada6 sBox4Mon6 02:ada7 sBox4Mon6Item 02:ada8 sBox4Mon6Moves 02:adac sBox4Mon6ID 02:adae sBox4Mon6Exp -02:adb1 sBox4Mon6StatExp 02:adb1 sBox4Mon6HPExp +02:adb1 sBox4Mon6StatExp 02:adb3 sBox4Mon6AtkExp 02:adb5 sBox4Mon6DefExp 02:adb7 sBox4Mon6SpdExp @@ -46808,21 +46808,21 @@ 02:adbd sBox4Mon6PP 02:adc1 sBox4Mon6Happiness 02:adc2 sBox4Mon6PokerusStatus -02:adc3 sBox4Mon6CaughtData -02:adc3 sBox4Mon6CaughtTime 02:adc3 sBox4Mon6CaughtLevel +02:adc3 sBox4Mon6CaughtTime +02:adc3 sBox4Mon6CaughtData 02:adc4 sBox4Mon6CaughtGender 02:adc4 sBox4Mon6CaughtLocation 02:adc5 sBox4Mon6Level -02:adc6 sBox4Mon6BoxEnd 02:adc6 sBox4Mon7 02:adc6 sBox4Mon7Species +02:adc6 sBox4Mon6BoxEnd 02:adc7 sBox4Mon7Item 02:adc8 sBox4Mon7Moves 02:adcc sBox4Mon7ID 02:adce sBox4Mon7Exp -02:add1 sBox4Mon7StatExp 02:add1 sBox4Mon7HPExp +02:add1 sBox4Mon7StatExp 02:add3 sBox4Mon7AtkExp 02:add5 sBox4Mon7DefExp 02:add7 sBox4Mon7SpdExp @@ -46831,21 +46831,21 @@ 02:addd sBox4Mon7PP 02:ade1 sBox4Mon7Happiness 02:ade2 sBox4Mon7PokerusStatus -02:ade3 sBox4Mon7CaughtData 02:ade3 sBox4Mon7CaughtLevel 02:ade3 sBox4Mon7CaughtTime +02:ade3 sBox4Mon7CaughtData 02:ade4 sBox4Mon7CaughtLocation 02:ade4 sBox4Mon7CaughtGender 02:ade5 sBox4Mon7Level 02:ade6 sBox4Mon8 -02:ade6 sBox4Mon7BoxEnd 02:ade6 sBox4Mon8Species +02:ade6 sBox4Mon7BoxEnd 02:ade7 sBox4Mon8Item 02:ade8 sBox4Mon8Moves 02:adec sBox4Mon8ID 02:adee sBox4Mon8Exp -02:adf1 sBox4Mon8StatExp 02:adf1 sBox4Mon8HPExp +02:adf1 sBox4Mon8StatExp 02:adf3 sBox4Mon8AtkExp 02:adf5 sBox4Mon8DefExp 02:adf7 sBox4Mon8SpdExp @@ -48021,8 +48021,8 @@ 02:b768 sBox6Mon15Moves 02:b76c sBox6Mon15ID 02:b76e sBox6Mon15Exp -02:b771 sBox6Mon15StatExp 02:b771 sBox6Mon15HPExp +02:b771 sBox6Mon15StatExp 02:b773 sBox6Mon15AtkExp 02:b775 sBox6Mon15DefExp 02:b777 sBox6Mon15SpdExp @@ -48615,8 +48615,8 @@ 02:bc34 sBox7Mon18CaughtGender 02:bc35 sBox7Mon18Level 02:bc36 sBox7Mon19 -02:bc36 sBox7Mon18BoxEnd 02:bc36 sBox7Mon19Species +02:bc36 sBox7Mon18BoxEnd 02:bc37 sBox7Mon19Item 02:bc38 sBox7Mon19Moves 02:bc3c sBox7Mon19ID @@ -49800,8 +49800,8 @@ 03:a918 sBox10Mon4Moves 03:a91c sBox10Mon4ID 03:a91e sBox10Mon4Exp -03:a921 sBox10Mon4StatExp 03:a921 sBox10Mon4HPExp +03:a921 sBox10Mon4StatExp 03:a923 sBox10Mon4AtkExp 03:a925 sBox10Mon4DefExp 03:a927 sBox10Mon4SpdExp @@ -49978,8 +49978,8 @@ 03:aa14 sBox10Mon11CaughtLocation 03:aa15 sBox10Mon11Level 03:aa16 sBox10Mon12Species -03:aa16 sBox10Mon12 03:aa16 sBox10Mon11BoxEnd +03:aa16 sBox10Mon12 03:aa17 sBox10Mon12Item 03:aa18 sBox10Mon12Moves 03:aa1c sBox10Mon12ID @@ -50371,8 +50371,8 @@ 03:adc4 sBox11Mon6CaughtGender 03:adc5 sBox11Mon6Level 03:adc6 sBox11Mon7 -03:adc6 sBox11Mon7Species 03:adc6 sBox11Mon6BoxEnd +03:adc6 sBox11Mon7Species 03:adc7 sBox11Mon7Item 03:adc8 sBox11Mon7Moves 03:adcc sBox11Mon7ID @@ -50826,9 +50826,9 @@ 03:b1cd sBox12Mon4PP 03:b1d1 sBox12Mon4Happiness 03:b1d2 sBox12Mon4PokerusStatus -03:b1d3 sBox12Mon4CaughtLevel 03:b1d3 sBox12Mon4CaughtData 03:b1d3 sBox12Mon4CaughtTime +03:b1d3 sBox12Mon4CaughtLevel 03:b1d4 sBox12Mon4CaughtGender 03:b1d4 sBox12Mon4CaughtLocation 03:b1d5 sBox12Mon4Level @@ -52211,8 +52211,8 @@ 03:bc71 sBox14Mon20Happiness 03:bc72 sBox14Mon20PokerusStatus 03:bc73 sBox14Mon20CaughtLevel -03:bc73 sBox14Mon20CaughtTime 03:bc73 sBox14Mon20CaughtData +03:bc73 sBox14Mon20CaughtTime 03:bc74 sBox14Mon20CaughtLocation 03:bc74 sBox14Mon20CaughtGender 03:bc75 sBox14Mon20Level @@ -53261,11 +53261,11 @@ 00:c608 wBoxPartialData 00:c608 wTimeSetBuffer 00:c608 wHallOfFameTemp +00:c608 wBT_OTTempName 00:c608 wc608 00:c608 wUnknownGender 00:c608 wDebugLightColor 00:c608 wHallOfFameTempWinCount -00:c608 wBT_OTTempName 00:c608 wMobileMonSender 00:c608 wBT_OTTemp 00:c608 wEnemyMoveStruct @@ -53533,10 +53533,10 @@ 00:c64c wHallOfFameTempMon5DVs 00:c64c wBattleMonStructEnd 00:c64e wBT_OTTempMon2 -00:c64e wHallOfFameTempMon5Level 00:c64e wWildMon 00:c64e wBT_OTTempMon2Species 00:c64e wOfferMonHappiness +00:c64e wHallOfFameTempMon5Level 00:c64f wHallOfFameTempMon5Nickname 00:c64f wBT_OTTempMon2Item 00:c64f wOfferMonPokerusStatus @@ -53597,9 +53597,9 @@ 00:c669 wPlayerSubStatus2 00:c66a wPlayerSubStatus3 00:c66a wBT_OTTempMon2PokerusStatus -00:c66b wPlayerSubStatus4 00:c66b wUnknownMonMailMessageEnd 00:c66b wBT_OTTempMon2CaughtData +00:c66b wPlayerSubStatus4 00:c66b wBT_OTTempMon2CaughtTime 00:c66b wBT_OTTempMon2CaughtLevel 00:c66c wBT_OTTempMon2CaughtLocation @@ -54098,8 +54098,8 @@ 00:c830 wLinkPlayerPartyMon1CaughtData 00:c830 wTimeCapsulePartyMon1PP 00:c830 wLinkPlayerPartyMon1CaughtLevel -00:c831 wHallOfFamePokemonListMon3End 00:c831 wHallOfFamePokemonListMon4Species +00:c831 wHallOfFamePokemonListMon3End 00:c831 wHallOfFamePokemonListMon4 00:c831 wLinkPlayerPartyMon1CaughtGender 00:c831 wLinkPlayerPartyMon1CaughtLocation @@ -54797,12 +54797,12 @@ 00:cf64 wPrevDexEntryJumptableIndex 00:cf64 wcf64 00:cf64 wDebugTilesetCurPalette +00:cf64 wCardFlipCursorY 00:cf64 wStatsScreenFlags 00:cf64 wNrOfBeatenBattleTowerTrainers 00:cf64 wTrainerCardBadgeFrameCounter 00:cf64 wCreditsBorderFrame 00:cf64 wNamingScreenLetterCase -00:cf64 wCardFlipCursorY 00:cf64 wPokegearCard 00:cf64 wPackJumptableIndex 00:cf64 wSlotsDelay @@ -54984,6 +54984,7 @@ 01:d003 wTempPokedexCaughtCount 01:d003 wFinishedPrintingBox 01:d003 wSeerNickname +01:d003 wTownMapCursorCoordinates 01:d003 wMovementBufferObject 01:d003 wPlaceBallsDirection 01:d003 wBillsPCTempListIndex @@ -54992,7 +54993,6 @@ 01:d003 wDebugColorIsShiny 01:d003 wNextRadioLine 01:d003 wPhoneCaller -01:d003 wTownMapCursorCoordinates 01:d004 wAddrOfBoxToPrint 01:d004 wBugContestFirstPlaceScore 01:d004 wTrainerHUDTiles @@ -55024,8 +55024,8 @@ 01:d00c wRadioText 01:d00c wBugContestThirdPlaceScore 01:d00c wMobileParticipant2Nickname -01:d00d wLinkBattleRecordWins 01:d00d wBufferMonOT +01:d00d wLinkBattleRecordWins 01:d00e wMartItem5BCD 01:d00e wBugContestTempWinnerID 01:d00e wSeerCaughtLocation @@ -55225,8 +55225,8 @@ 01:d102 wUnusedNamesPointer 01:d104 wItemAttributesPointer 01:d106 wCurItem -01:d107 wCurItemQuantity 01:d107 wMartItemID +01:d107 wCurItemQuantity 01:d108 wCurPartySpecies 01:d109 wCurPartyMon 01:d10a wWhichHPBar @@ -55364,12 +55364,13 @@ 01:d1ea wListMovesLineSpacing 01:d1ea wFinalCatchRate 01:d1ea wCurDecoration -01:d1ea wCurMapScriptBank 01:d1ea wCurMailAuthorID +01:d1ea wEvolutionOldSpecies 01:d1ea wPPUpPPBuffer 01:d1ea wTempMysteryGiftTimer 01:d1ea wSkipMovesBeforeLevelUp 01:d1ea wExpToNextLevel +01:d1ea wCurMapScriptBank 01:d1ea wFieldMoveData 01:d1ea wHPBuffer1 01:d1ea wCurHPAnimMaxHP @@ -55388,7 +55389,6 @@ 01:d1ea wMagikarpLength 01:d1ea wRestartClockCurDivision 01:d1ea wd1ea -01:d1ea wEvolutionOldSpecies 01:d1eb wHealMachineTempOBP1 01:d1eb wSurfingPlayerState 01:d1eb wPCItemQuantity @@ -55544,8 +55544,8 @@ 01:d269 wTimeOfDay 01:d26b wPokedexShowPointerAddr 01:d26b wUnusedEggHatchFlag -01:d26b wOTPlayerName 01:d26b wOTPartyData +01:d26b wOTPlayerName 01:d26d wPokedexShowPointerBank 01:d271 wd271 01:d276 wOTPlayerID @@ -56221,8 +56221,8 @@ 01:d684 wObject10Field1e 01:d685 wObject10JumpHeight 01:d686 wObject10Range -01:d68e wObject11Struct 01:d68e wObject11Sprite +01:d68e wObject11Struct 01:d68e wObject10StructEnd 01:d68f wObject11MapObjectIndex 01:d690 wObject11SpriteTile @@ -56534,7 +56534,7 @@ 01:d81a wMap15ObjectEventFlag 01:d81e wObjectMasks 01:d82e wVariableSprites -01:d83e wEnteredMapFromContinue +01:d83e wMapNameSignFlags 01:d841 wTimeOfDayPal 01:d846 wTimeOfDayPalFlags 01:d847 wTimeOfDayPalset @@ -57003,8 +57003,8 @@ 01:df0e wBreedMon1Moves 01:df12 wBreedMon1ID 01:df14 wBreedMon1Exp -01:df17 wBreedMon1HPExp 01:df17 wBreedMon1StatExp +01:df17 wBreedMon1HPExp 01:df19 wBreedMon1AtkExp 01:df1b wBreedMon1DefExp 01:df1d wBreedMon1SpdExp @@ -57361,8 +57361,8 @@ 03:d272 w3_d202Mon2Speed 03:d274 w3_d202Mon2SpclAtk 03:d276 w3_d202Mon2SpclDef -03:d278 w3_d202Mon2StructEnd 03:d278 w3_d202Mon2Name +03:d278 w3_d202Mon2StructEnd 03:d283 w3_d202Mon3 03:d283 w3_d202Mon3Species 03:d284 w3_d202Mon3Item @@ -57969,8 +57969,8 @@ 03:d764 w3_d742Mon1PP 03:d768 w3_d742Mon1Happiness 03:d769 w3_d742Mon1PokerusStatus -03:d76a w3_d742Mon1CaughtTime 03:d76a w3_d742Mon1CaughtData +03:d76a w3_d742Mon1CaughtTime 03:d76a w3_d742Mon1CaughtLevel 03:d76b w3_d742Mon1CaughtLocation 03:d76b w3_d742Mon1CaughtGender diff --git a/pokecrystal11_debug.map b/pokecrystal11_debug.map index 2be67e4af..a8c8e4d96 100644 --- a/pokecrystal11_debug.map +++ b/pokecrystal11_debug.map @@ -565,8 +565,8 @@ ROM0 bank #0: $1c9c = PlaceVerticalMenuItems.loop $1cbb = MenuBox $1cc6 = GetMenuTextStartCoord - $1cd8 = GetMenuTextStartCoord.bit_6_set - $1ce0 = GetMenuTextStartCoord.bit_7_clear + $1cd8 = GetMenuTextStartCoord.no_top_spacing + $1ce0 = GetMenuTextStartCoord.no_cursor $1ce1 = ClearMenuBoxInterior $1cf1 = ClearWholeMenuBox $1cfd = MenuBoxCoord2Tile @@ -612,7 +612,7 @@ ROM0 bank #0: $1ee1 = RunMenuItemPrintingFunction.loop $1efb = RunMenuItemPrintingFunction._hl_ $1eff = InitMenuCursorAndButtonPermissions - $1f0e = InitMenuCursorAndButtonPermissions.disallow_select + $1f0e = InitMenuCursorAndButtonPermissions.disallow_start $1f19 = InitMenuCursorAndButtonPermissions.disallow_left_right $1f1a = GetScrollingMenuJoypad $1f23 = GetStaticMenuJoypad @@ -4543,7 +4543,7 @@ ROMX bank #5: $4089 = StartClock $4097 = StartClock.skip_set $409b = _FixDays - $40a8 = _FixDays.set_bit_7 + $40a8 = _FixDays.reset_rtc $40ae = ClockContinue $40c8 = ClockContinue.time_overflow $40eb = ClockContinue.dont_update @@ -4554,8 +4554,8 @@ ROMX bank #5: $4128 = _InitTime.okay_days $412a = GetEmote2bpp $4135 = _UpdatePlayerSprite - $4146 = _RefreshSprites - $4157 = _ClearSprites + $4146 = LoadStandingSpritesGFX + $4157 = LoadWalkingSpritesGFX $4168 = RefreshSprites $416f = RefreshSprites.Refresh $4183 = GetPlayerSprite @@ -5751,8 +5751,8 @@ ROMX bank #9: $436b = Place2DMenuCursor.cursor_on $4374 = _PushWindow $4387 = _PushWindow.loop - $4398 = _PushWindow.bit_6 - $43ae = _PushWindow.not_bit_7 + $4398 = _PushWindow.backup_tiles + $43ae = _PushWindow.no_backup_tiles $43b5 = _PushWindow.done $43cd = _PushWindow.copy $43d5 = _PushWindow.row @@ -7206,7 +7206,7 @@ ROMX bank #11: $49a8 = _TMHM_ExitPack $49af = TMHM_ExitPocket $49b1 = TMHM_ScrollPocket - $49c5 = TMHM_ScrollPocket.skip + $49c5 = TMHM_ScrollPocket.down $49ca = TMHM_ScrollPocket.loop $49e2 = TMHM_DisplayPocketItems $49fa = TMHM_DisplayPocketItems.loop2 @@ -43971,8 +43971,8 @@ SRAM bank #0: $a8c0 = sMailbox3Species $a8c1 = sMailbox3Type $a8c2 = sMailbox3End - $a8c2 = sMailbox4Message $a8c2 = sMailbox4 + $a8c2 = sMailbox4Message $a8e2 = sMailbox4MessageEnd $a8e3 = sMailbox4Author $a8eb = sMailbox4Nationality @@ -44322,8 +44322,8 @@ SRAM bank #1: $ade8 = sBoxMon7Moves $adec = sBoxMon7ID $adee = sBoxMon7Exp - $adf1 = sBoxMon7StatExp $adf1 = sBoxMon7HPExp + $adf1 = sBoxMon7StatExp $adf3 = sBoxMon7AtkExp $adf5 = sBoxMon7DefExp $adf7 = sBoxMon7SpdExp @@ -44424,8 +44424,8 @@ SRAM bank #1: $ae7d = sBoxMon11PP $ae81 = sBoxMon11Happiness $ae82 = sBoxMon11PokerusStatus - $ae83 = sBoxMon11CaughtTime $ae83 = sBoxMon11CaughtLevel + $ae83 = sBoxMon11CaughtTime $ae83 = sBoxMon11CaughtData $ae84 = sBoxMon11CaughtGender $ae84 = sBoxMon11CaughtLocation @@ -44687,9 +44687,9 @@ SRAM bank #1: $b260 = sLinkBattleStats $b262 = sLinkBattleLosses $b264 = sLinkBattleDraws + $b266 = sLinkBattleRecord1 $b266 = sLinkBattleRecord $b266 = sLinkBattleRecord1ID - $b266 = sLinkBattleRecord1 $b268 = sLinkBattleRecord1Name $b272 = sLinkBattleRecord1Wins $b274 = sLinkBattleRecord1Losses @@ -45176,8 +45176,8 @@ SRAM bank #1: $b689 = sHallOfFame10Mon6Nickname $b693 = sHallOfFame10Mon6End $b693 = sHallOfFame10End - $b694 = sHallOfFame11 $b694 = sHallOfFame11WinCount + $b694 = sHallOfFame11 $b695 = sHallOfFame11Mon1 $b695 = sHallOfFame11Mon1Species $b696 = sHallOfFame11Mon1ID @@ -45493,8 +45493,8 @@ SRAM bank #1: $b941 = sHallOfFame17Mon6End $b942 = sHallOfFame18WinCount $b942 = sHallOfFame18 - $b943 = sHallOfFame18Mon1 $b943 = sHallOfFame18Mon1Species + $b943 = sHallOfFame18Mon1 $b944 = sHallOfFame18Mon1ID $b946 = sHallOfFame18Mon1DVs $b948 = sHallOfFame18Mon1Level @@ -45634,9 +45634,9 @@ SRAM bank #1: $ba6c = sHallOfFame21Mon1DVs $ba6e = sHallOfFame21Mon1Level $ba6f = sHallOfFame21Mon1Nickname + $ba79 = sHallOfFame21Mon2 $ba79 = sHallOfFame21Mon1End $ba79 = sHallOfFame21Mon2Species - $ba79 = sHallOfFame21Mon2 $ba7a = sHallOfFame21Mon2ID $ba7c = sHallOfFame21Mon2DVs $ba7e = sHallOfFame21Mon2Level @@ -46726,8 +46726,8 @@ SRAM bank #2: $a504 = sBox2Mon5CaughtGender $a504 = sBox2Mon5CaughtLocation $a505 = sBox2Mon5Level - $a506 = sBox2Mon6 $a506 = sBox2Mon5BoxEnd + $a506 = sBox2Mon6 $a506 = sBox2Mon6Species $a507 = sBox2Mon6Item $a508 = sBox2Mon6Moves @@ -46956,8 +46956,8 @@ SRAM bank #2: $a644 = sBox2Mon15CaughtGender $a644 = sBox2Mon15CaughtLocation $a645 = sBox2Mon15Level - $a646 = sBox2Mon16Species $a646 = sBox2Mon15BoxEnd + $a646 = sBox2Mon16Species $a646 = sBox2Mon16 $a647 = sBox2Mon16Item $a648 = sBox2Mon16Moves @@ -47657,8 +47657,8 @@ SRAM bank #2: $ad28 = sBox4Mon2Moves $ad2c = sBox4Mon2ID $ad2e = sBox4Mon2Exp - $ad31 = sBox4Mon2StatExp $ad31 = sBox4Mon2HPExp + $ad31 = sBox4Mon2StatExp $ad33 = sBox4Mon2AtkExp $ad35 = sBox4Mon2DefExp $ad37 = sBox4Mon2SpdExp @@ -47667,21 +47667,21 @@ SRAM bank #2: $ad3d = sBox4Mon2PP $ad41 = sBox4Mon2Happiness $ad42 = sBox4Mon2PokerusStatus - $ad43 = sBox4Mon2CaughtData - $ad43 = sBox4Mon2CaughtTime $ad43 = sBox4Mon2CaughtLevel - $ad44 = sBox4Mon2CaughtGender + $ad43 = sBox4Mon2CaughtTime + $ad43 = sBox4Mon2CaughtData $ad44 = sBox4Mon2CaughtLocation + $ad44 = sBox4Mon2CaughtGender $ad45 = sBox4Mon2Level - $ad46 = sBox4Mon3 $ad46 = sBox4Mon3Species + $ad46 = sBox4Mon3 $ad46 = sBox4Mon2BoxEnd $ad47 = sBox4Mon3Item $ad48 = sBox4Mon3Moves $ad4c = sBox4Mon3ID $ad4e = sBox4Mon3Exp - $ad51 = sBox4Mon3HPExp $ad51 = sBox4Mon3StatExp + $ad51 = sBox4Mon3HPExp $ad53 = sBox4Mon3AtkExp $ad55 = sBox4Mon3DefExp $ad57 = sBox4Mon3SpdExp @@ -47691,20 +47691,20 @@ SRAM bank #2: $ad61 = sBox4Mon3Happiness $ad62 = sBox4Mon3PokerusStatus $ad63 = sBox4Mon3CaughtLevel - $ad63 = sBox4Mon3CaughtTime $ad63 = sBox4Mon3CaughtData - $ad64 = sBox4Mon3CaughtGender + $ad63 = sBox4Mon3CaughtTime $ad64 = sBox4Mon3CaughtLocation + $ad64 = sBox4Mon3CaughtGender $ad65 = sBox4Mon3Level + $ad66 = sBox4Mon4 $ad66 = sBox4Mon3BoxEnd $ad66 = sBox4Mon4Species - $ad66 = sBox4Mon4 $ad67 = sBox4Mon4Item $ad68 = sBox4Mon4Moves $ad6c = sBox4Mon4ID $ad6e = sBox4Mon4Exp - $ad71 = sBox4Mon4HPExp $ad71 = sBox4Mon4StatExp + $ad71 = sBox4Mon4HPExp $ad73 = sBox4Mon4AtkExp $ad75 = sBox4Mon4DefExp $ad77 = sBox4Mon4SpdExp @@ -47713,21 +47713,21 @@ SRAM bank #2: $ad7d = sBox4Mon4PP $ad81 = sBox4Mon4Happiness $ad82 = sBox4Mon4PokerusStatus - $ad83 = sBox4Mon4CaughtLevel $ad83 = sBox4Mon4CaughtTime $ad83 = sBox4Mon4CaughtData + $ad83 = sBox4Mon4CaughtLevel $ad84 = sBox4Mon4CaughtLocation $ad84 = sBox4Mon4CaughtGender $ad85 = sBox4Mon4Level - $ad86 = sBox4Mon4BoxEnd $ad86 = sBox4Mon5Species + $ad86 = sBox4Mon4BoxEnd $ad86 = sBox4Mon5 $ad87 = sBox4Mon5Item $ad88 = sBox4Mon5Moves $ad8c = sBox4Mon5ID $ad8e = sBox4Mon5Exp - $ad91 = sBox4Mon5StatExp $ad91 = sBox4Mon5HPExp + $ad91 = sBox4Mon5StatExp $ad93 = sBox4Mon5AtkExp $ad95 = sBox4Mon5DefExp $ad97 = sBox4Mon5SpdExp @@ -47736,14 +47736,14 @@ SRAM bank #2: $ad9d = sBox4Mon5PP $ada1 = sBox4Mon5Happiness $ada2 = sBox4Mon5PokerusStatus + $ada3 = sBox4Mon5CaughtLevel $ada3 = sBox4Mon5CaughtTime $ada3 = sBox4Mon5CaughtData - $ada3 = sBox4Mon5CaughtLevel - $ada4 = sBox4Mon5CaughtGender $ada4 = sBox4Mon5CaughtLocation + $ada4 = sBox4Mon5CaughtGender $ada5 = sBox4Mon5Level - $ada6 = sBox4Mon5BoxEnd $ada6 = sBox4Mon6Species + $ada6 = sBox4Mon5BoxEnd $ada6 = sBox4Mon6 $ada7 = sBox4Mon6Item $ada8 = sBox4Mon6Moves @@ -48972,8 +48972,8 @@ SRAM bank #2: $b768 = sBox6Mon15Moves $b76c = sBox6Mon15ID $b76e = sBox6Mon15Exp - $b771 = sBox6Mon15StatExp $b771 = sBox6Mon15HPExp + $b771 = sBox6Mon15StatExp $b773 = sBox6Mon15AtkExp $b775 = sBox6Mon15DefExp $b777 = sBox6Mon15SpdExp @@ -49566,8 +49566,8 @@ SRAM bank #2: $bc34 = sBox7Mon18CaughtGender $bc35 = sBox7Mon18Level $bc36 = sBox7Mon19 - $bc36 = sBox7Mon18BoxEnd $bc36 = sBox7Mon19Species + $bc36 = sBox7Mon18BoxEnd $bc37 = sBox7Mon19Item $bc38 = sBox7Mon19Moves $bc3c = sBox7Mon19ID @@ -50756,8 +50756,8 @@ SRAM bank #3: $a918 = sBox10Mon4Moves $a91c = sBox10Mon4ID $a91e = sBox10Mon4Exp - $a921 = sBox10Mon4StatExp $a921 = sBox10Mon4HPExp + $a921 = sBox10Mon4StatExp $a923 = sBox10Mon4AtkExp $a925 = sBox10Mon4DefExp $a927 = sBox10Mon4SpdExp @@ -50934,8 +50934,8 @@ SRAM bank #3: $aa14 = sBox10Mon11CaughtLocation $aa15 = sBox10Mon11Level $aa16 = sBox10Mon12Species - $aa16 = sBox10Mon12 $aa16 = sBox10Mon11BoxEnd + $aa16 = sBox10Mon12 $aa17 = sBox10Mon12Item $aa18 = sBox10Mon12Moves $aa1c = sBox10Mon12ID @@ -51327,8 +51327,8 @@ SRAM bank #3: $adc4 = sBox11Mon6CaughtGender $adc5 = sBox11Mon6Level $adc6 = sBox11Mon7 - $adc6 = sBox11Mon7Species $adc6 = sBox11Mon6BoxEnd + $adc6 = sBox11Mon7Species $adc7 = sBox11Mon7Item $adc8 = sBox11Mon7Moves $adcc = sBox11Mon7ID @@ -51782,9 +51782,9 @@ SRAM bank #3: $b1cd = sBox12Mon4PP $b1d1 = sBox12Mon4Happiness $b1d2 = sBox12Mon4PokerusStatus - $b1d3 = sBox12Mon4CaughtLevel $b1d3 = sBox12Mon4CaughtData $b1d3 = sBox12Mon4CaughtTime + $b1d3 = sBox12Mon4CaughtLevel $b1d4 = sBox12Mon4CaughtGender $b1d4 = sBox12Mon4CaughtLocation $b1d5 = sBox12Mon4Level @@ -53167,8 +53167,8 @@ SRAM bank #3: $bc71 = sBox14Mon20Happiness $bc72 = sBox14Mon20PokerusStatus $bc73 = sBox14Mon20CaughtLevel - $bc73 = sBox14Mon20CaughtTime $bc73 = sBox14Mon20CaughtData + $bc73 = sBox14Mon20CaughtTime $bc74 = sBox14Mon20CaughtLocation $bc74 = sBox14Mon20CaughtGender $bc75 = sBox14Mon20Level @@ -54248,11 +54248,11 @@ WRAM0 bank #0: $c608 = wBoxPartialData $c608 = wTimeSetBuffer $c608 = wHallOfFameTemp + $c608 = wBT_OTTempName $c608 = wc608 $c608 = wUnknownGender $c608 = wDebugLightColor $c608 = wHallOfFameTempWinCount - $c608 = wBT_OTTempName $c608 = wMobileMonSender $c608 = wBT_OTTemp $c608 = wEnemyMoveStruct @@ -54520,10 +54520,10 @@ WRAM0 bank #0: $c64c = wHallOfFameTempMon5DVs $c64c = wBattleMonStructEnd $c64e = wBT_OTTempMon2 - $c64e = wHallOfFameTempMon5Level $c64e = wWildMon $c64e = wBT_OTTempMon2Species $c64e = wOfferMonHappiness + $c64e = wHallOfFameTempMon5Level $c64f = wHallOfFameTempMon5Nickname $c64f = wBT_OTTempMon2Item $c64f = wOfferMonPokerusStatus @@ -54584,9 +54584,9 @@ WRAM0 bank #0: $c669 = wPlayerSubStatus2 $c66a = wPlayerSubStatus3 $c66a = wBT_OTTempMon2PokerusStatus - $c66b = wPlayerSubStatus4 $c66b = wUnknownMonMailMessageEnd $c66b = wBT_OTTempMon2CaughtData + $c66b = wPlayerSubStatus4 $c66b = wBT_OTTempMon2CaughtTime $c66b = wBT_OTTempMon2CaughtLevel $c66c = wBT_OTTempMon2CaughtLocation @@ -55058,8 +55058,8 @@ WRAM0 bank #0: $c819 = wc819 $c81a = wDebugRoomItemID $c81a = wTimeCapsulePartyMon1CatchRate - $c81a = wc81a $c81a = wDebugRoomMonSpecies + $c81a = wc81a $c81a = wDebugRoomMon $c81a = wDebugRoomGBID $c81b = wLinkPlayerPartyMon1Exp @@ -55122,8 +55122,8 @@ WRAM0 bank #0: $c830 = wTimeCapsulePartyMon1PP $c830 = wLinkPlayerPartyMon1CaughtLevel $c831 = wDebugRoomMonPP - $c831 = wHallOfFamePokemonListMon3End $c831 = wHallOfFamePokemonListMon4Species + $c831 = wHallOfFamePokemonListMon3End $c831 = wHallOfFamePokemonListMon4 $c831 = wLinkPlayerPartyMon1CaughtGender $c831 = wLinkPlayerPartyMon1CaughtLocation @@ -55833,12 +55833,12 @@ WRAM0 bank #0: $cf64 = wPrevDexEntryJumptableIndex $cf64 = wcf64 $cf64 = wDebugTilesetCurPalette + $cf64 = wCardFlipCursorY $cf64 = wStatsScreenFlags $cf64 = wNrOfBeatenBattleTowerTrainers $cf64 = wTrainerCardBadgeFrameCounter $cf64 = wCreditsBorderFrame $cf64 = wNamingScreenLetterCase - $cf64 = wCardFlipCursorY $cf64 = wPokegearCard $cf64 = wPackJumptableIndex $cf64 = wSlotsDelay @@ -56026,6 +56026,7 @@ WRAMX bank #1: $d003 = wTempPokedexCaughtCount $d003 = wFinishedPrintingBox $d003 = wSeerNickname + $d003 = wTownMapCursorCoordinates $d003 = wMovementBufferObject $d003 = wPlaceBallsDirection $d003 = wBillsPCTempListIndex @@ -56034,7 +56035,6 @@ WRAMX bank #1: $d003 = wDebugColorIsShiny $d003 = wNextRadioLine $d003 = wPhoneCaller - $d003 = wTownMapCursorCoordinates $d004 = wAddrOfBoxToPrint $d004 = wBugContestFirstPlaceScore $d004 = wTrainerHUDTiles @@ -56066,8 +56066,8 @@ WRAMX bank #1: $d00c = wRadioText $d00c = wBugContestThirdPlaceScore $d00c = wMobileParticipant2Nickname - $d00d = wLinkBattleRecordWins $d00d = wBufferMonOT + $d00d = wLinkBattleRecordWins $d00e = wMartItem5BCD $d00e = wBugContestTempWinnerID $d00e = wSeerCaughtLocation @@ -56268,8 +56268,8 @@ WRAMX bank #1: $d102 = wUnusedNamesPointer $d104 = wItemAttributesPointer $d106 = wCurItem - $d107 = wCurItemQuantity $d107 = wMartItemID + $d107 = wCurItemQuantity $d108 = wCurPartySpecies $d109 = wCurPartyMon $d10a = wWhichHPBar @@ -56407,12 +56407,13 @@ WRAMX bank #1: $d1ea = wListMovesLineSpacing $d1ea = wFinalCatchRate $d1ea = wCurDecoration - $d1ea = wCurMapScriptBank $d1ea = wCurMailAuthorID + $d1ea = wEvolutionOldSpecies $d1ea = wPPUpPPBuffer $d1ea = wTempMysteryGiftTimer $d1ea = wSkipMovesBeforeLevelUp $d1ea = wExpToNextLevel + $d1ea = wCurMapScriptBank $d1ea = wFieldMoveData $d1ea = wHPBuffer1 $d1ea = wCurHPAnimMaxHP @@ -56431,7 +56432,6 @@ WRAMX bank #1: $d1ea = wMagikarpLength $d1ea = wRestartClockCurDivision $d1ea = wd1ea - $d1ea = wEvolutionOldSpecies $d1eb = wHealMachineTempOBP1 $d1eb = wSurfingPlayerState $d1eb = wPCItemQuantity @@ -56588,8 +56588,8 @@ WRAMX bank #1: SECTION: $d26b-$dcd6 ($0a6c bytes) ["Enemy Party"] $d26b = wPokedexShowPointerAddr $d26b = wUnusedEggHatchFlag - $d26b = wOTPlayerName $d26b = wOTPartyData + $d26b = wOTPlayerName $d26d = wPokedexShowPointerBank $d271 = wd271 $d276 = wOTPlayerID @@ -57265,8 +57265,8 @@ WRAMX bank #1: $d684 = wObject10Field1e $d685 = wObject10JumpHeight $d686 = wObject10Range - $d68e = wObject11Struct $d68e = wObject11Sprite + $d68e = wObject11Struct $d68e = wObject10StructEnd $d68f = wObject11MapObjectIndex $d690 = wObject11SpriteTile @@ -57578,7 +57578,7 @@ WRAMX bank #1: $d81a = wMap15ObjectEventFlag $d81e = wObjectMasks $d82e = wVariableSprites - $d83e = wEnteredMapFromContinue + $d83e = wMapNameSignFlags $d841 = wTimeOfDayPal $d846 = wTimeOfDayPalFlags $d847 = wTimeOfDayPalset @@ -58048,8 +58048,8 @@ WRAMX bank #1: $df0e = wBreedMon1Moves $df12 = wBreedMon1ID $df14 = wBreedMon1Exp - $df17 = wBreedMon1HPExp $df17 = wBreedMon1StatExp + $df17 = wBreedMon1HPExp $df19 = wBreedMon1AtkExp $df1b = wBreedMon1DefExp $df1d = wBreedMon1SpdExp @@ -58416,8 +58416,8 @@ WRAMX bank #3: $d272 = w3_d202Mon2Speed $d274 = w3_d202Mon2SpclAtk $d276 = w3_d202Mon2SpclDef - $d278 = w3_d202Mon2StructEnd $d278 = w3_d202Mon2Name + $d278 = w3_d202Mon2StructEnd $d283 = w3_d202Mon3 $d283 = w3_d202Mon3Species $d284 = w3_d202Mon3Item @@ -59024,8 +59024,8 @@ WRAMX bank #3: $d764 = w3_d742Mon1PP $d768 = w3_d742Mon1Happiness $d769 = w3_d742Mon1PokerusStatus - $d76a = w3_d742Mon1CaughtTime $d76a = w3_d742Mon1CaughtData + $d76a = w3_d742Mon1CaughtTime $d76a = w3_d742Mon1CaughtLevel $d76b = w3_d742Mon1CaughtLocation $d76b = w3_d742Mon1CaughtGender diff --git a/pokecrystal11_debug.sym b/pokecrystal11_debug.sym index a46bca4bb..f6ec577c1 100644 --- a/pokecrystal11_debug.sym +++ b/pokecrystal11_debug.sym @@ -530,8 +530,8 @@ 00:1c9c PlaceVerticalMenuItems.loop 00:1cbb MenuBox 00:1cc6 GetMenuTextStartCoord -00:1cd8 GetMenuTextStartCoord.bit_6_set -00:1ce0 GetMenuTextStartCoord.bit_7_clear +00:1cd8 GetMenuTextStartCoord.no_top_spacing +00:1ce0 GetMenuTextStartCoord.no_cursor 00:1ce1 ClearMenuBoxInterior 00:1cf1 ClearWholeMenuBox 00:1cfd MenuBoxCoord2Tile @@ -577,7 +577,7 @@ 00:1ee1 RunMenuItemPrintingFunction.loop 00:1efb RunMenuItemPrintingFunction._hl_ 00:1eff InitMenuCursorAndButtonPermissions -00:1f0e InitMenuCursorAndButtonPermissions.disallow_select +00:1f0e InitMenuCursorAndButtonPermissions.disallow_start 00:1f19 InitMenuCursorAndButtonPermissions.disallow_left_right 00:1f1a GetScrollingMenuJoypad 00:1f23 GetStaticMenuJoypad @@ -4483,7 +4483,7 @@ 05:4089 StartClock 05:4097 StartClock.skip_set 05:409b _FixDays -05:40a8 _FixDays.set_bit_7 +05:40a8 _FixDays.reset_rtc 05:40ae ClockContinue 05:40c8 ClockContinue.time_overflow 05:40eb ClockContinue.dont_update @@ -4494,8 +4494,8 @@ 05:4128 _InitTime.okay_days 05:412a GetEmote2bpp 05:4135 _UpdatePlayerSprite -05:4146 _RefreshSprites -05:4157 _ClearSprites +05:4146 LoadStandingSpritesGFX +05:4157 LoadWalkingSpritesGFX 05:4168 RefreshSprites 05:416f RefreshSprites.Refresh 05:4183 GetPlayerSprite @@ -5667,8 +5667,8 @@ 09:436b Place2DMenuCursor.cursor_on 09:4374 _PushWindow 09:4387 _PushWindow.loop -09:4398 _PushWindow.bit_6 -09:43ae _PushWindow.not_bit_7 +09:4398 _PushWindow.backup_tiles +09:43ae _PushWindow.no_backup_tiles 09:43b5 _PushWindow.done 09:43cd _PushWindow.copy 09:43d5 _PushWindow.row @@ -7111,7 +7111,7 @@ 0b:49a8 _TMHM_ExitPack 0b:49af TMHM_ExitPocket 0b:49b1 TMHM_ScrollPocket -0b:49c5 TMHM_ScrollPocket.skip +0b:49c5 TMHM_ScrollPocket.down 0b:49ca TMHM_ScrollPocket.loop 0b:49e2 TMHM_DisplayPocketItems 0b:49fa TMHM_DisplayPocketItems.loop2 @@ -43262,8 +43262,8 @@ 00:a8c0 sMailbox3Species 00:a8c1 sMailbox3Type 00:a8c2 sMailbox3End -00:a8c2 sMailbox4Message 00:a8c2 sMailbox4 +00:a8c2 sMailbox4Message 00:a8e2 sMailbox4MessageEnd 00:a8e3 sMailbox4Author 00:a8eb sMailbox4Nationality @@ -43605,8 +43605,8 @@ 01:ade8 sBoxMon7Moves 01:adec sBoxMon7ID 01:adee sBoxMon7Exp -01:adf1 sBoxMon7StatExp 01:adf1 sBoxMon7HPExp +01:adf1 sBoxMon7StatExp 01:adf3 sBoxMon7AtkExp 01:adf5 sBoxMon7DefExp 01:adf7 sBoxMon7SpdExp @@ -43707,8 +43707,8 @@ 01:ae7d sBoxMon11PP 01:ae81 sBoxMon11Happiness 01:ae82 sBoxMon11PokerusStatus -01:ae83 sBoxMon11CaughtTime 01:ae83 sBoxMon11CaughtLevel +01:ae83 sBoxMon11CaughtTime 01:ae83 sBoxMon11CaughtData 01:ae84 sBoxMon11CaughtGender 01:ae84 sBoxMon11CaughtLocation @@ -43969,9 +43969,9 @@ 01:b260 sLinkBattleStats 01:b262 sLinkBattleLosses 01:b264 sLinkBattleDraws +01:b266 sLinkBattleRecord1 01:b266 sLinkBattleRecord 01:b266 sLinkBattleRecord1ID -01:b266 sLinkBattleRecord1 01:b268 sLinkBattleRecord1Name 01:b272 sLinkBattleRecord1Wins 01:b274 sLinkBattleRecord1Losses @@ -44457,8 +44457,8 @@ 01:b689 sHallOfFame10Mon6Nickname 01:b693 sHallOfFame10Mon6End 01:b693 sHallOfFame10End -01:b694 sHallOfFame11 01:b694 sHallOfFame11WinCount +01:b694 sHallOfFame11 01:b695 sHallOfFame11Mon1 01:b695 sHallOfFame11Mon1Species 01:b696 sHallOfFame11Mon1ID @@ -44774,8 +44774,8 @@ 01:b941 sHallOfFame17Mon6End 01:b942 sHallOfFame18WinCount 01:b942 sHallOfFame18 -01:b943 sHallOfFame18Mon1 01:b943 sHallOfFame18Mon1Species +01:b943 sHallOfFame18Mon1 01:b944 sHallOfFame18Mon1ID 01:b946 sHallOfFame18Mon1DVs 01:b948 sHallOfFame18Mon1Level @@ -44915,9 +44915,9 @@ 01:ba6c sHallOfFame21Mon1DVs 01:ba6e sHallOfFame21Mon1Level 01:ba6f sHallOfFame21Mon1Nickname +01:ba79 sHallOfFame21Mon2 01:ba79 sHallOfFame21Mon1End 01:ba79 sHallOfFame21Mon2Species -01:ba79 sHallOfFame21Mon2 01:ba7a sHallOfFame21Mon2ID 01:ba7c sHallOfFame21Mon2DVs 01:ba7e sHallOfFame21Mon2Level @@ -46000,8 +46000,8 @@ 02:a504 sBox2Mon5CaughtGender 02:a504 sBox2Mon5CaughtLocation 02:a505 sBox2Mon5Level -02:a506 sBox2Mon6 02:a506 sBox2Mon5BoxEnd +02:a506 sBox2Mon6 02:a506 sBox2Mon6Species 02:a507 sBox2Mon6Item 02:a508 sBox2Mon6Moves @@ -46230,8 +46230,8 @@ 02:a644 sBox2Mon15CaughtGender 02:a644 sBox2Mon15CaughtLocation 02:a645 sBox2Mon15Level -02:a646 sBox2Mon16Species 02:a646 sBox2Mon15BoxEnd +02:a646 sBox2Mon16Species 02:a646 sBox2Mon16 02:a647 sBox2Mon16Item 02:a648 sBox2Mon16Moves @@ -46931,8 +46931,8 @@ 02:ad28 sBox4Mon2Moves 02:ad2c sBox4Mon2ID 02:ad2e sBox4Mon2Exp -02:ad31 sBox4Mon2StatExp 02:ad31 sBox4Mon2HPExp +02:ad31 sBox4Mon2StatExp 02:ad33 sBox4Mon2AtkExp 02:ad35 sBox4Mon2DefExp 02:ad37 sBox4Mon2SpdExp @@ -46941,21 +46941,21 @@ 02:ad3d sBox4Mon2PP 02:ad41 sBox4Mon2Happiness 02:ad42 sBox4Mon2PokerusStatus -02:ad43 sBox4Mon2CaughtData -02:ad43 sBox4Mon2CaughtTime 02:ad43 sBox4Mon2CaughtLevel -02:ad44 sBox4Mon2CaughtGender +02:ad43 sBox4Mon2CaughtTime +02:ad43 sBox4Mon2CaughtData 02:ad44 sBox4Mon2CaughtLocation +02:ad44 sBox4Mon2CaughtGender 02:ad45 sBox4Mon2Level -02:ad46 sBox4Mon3 02:ad46 sBox4Mon3Species +02:ad46 sBox4Mon3 02:ad46 sBox4Mon2BoxEnd 02:ad47 sBox4Mon3Item 02:ad48 sBox4Mon3Moves 02:ad4c sBox4Mon3ID 02:ad4e sBox4Mon3Exp -02:ad51 sBox4Mon3HPExp 02:ad51 sBox4Mon3StatExp +02:ad51 sBox4Mon3HPExp 02:ad53 sBox4Mon3AtkExp 02:ad55 sBox4Mon3DefExp 02:ad57 sBox4Mon3SpdExp @@ -46965,20 +46965,20 @@ 02:ad61 sBox4Mon3Happiness 02:ad62 sBox4Mon3PokerusStatus 02:ad63 sBox4Mon3CaughtLevel -02:ad63 sBox4Mon3CaughtTime 02:ad63 sBox4Mon3CaughtData -02:ad64 sBox4Mon3CaughtGender +02:ad63 sBox4Mon3CaughtTime 02:ad64 sBox4Mon3CaughtLocation +02:ad64 sBox4Mon3CaughtGender 02:ad65 sBox4Mon3Level +02:ad66 sBox4Mon4 02:ad66 sBox4Mon3BoxEnd 02:ad66 sBox4Mon4Species -02:ad66 sBox4Mon4 02:ad67 sBox4Mon4Item 02:ad68 sBox4Mon4Moves 02:ad6c sBox4Mon4ID 02:ad6e sBox4Mon4Exp -02:ad71 sBox4Mon4HPExp 02:ad71 sBox4Mon4StatExp +02:ad71 sBox4Mon4HPExp 02:ad73 sBox4Mon4AtkExp 02:ad75 sBox4Mon4DefExp 02:ad77 sBox4Mon4SpdExp @@ -46987,21 +46987,21 @@ 02:ad7d sBox4Mon4PP 02:ad81 sBox4Mon4Happiness 02:ad82 sBox4Mon4PokerusStatus -02:ad83 sBox4Mon4CaughtLevel 02:ad83 sBox4Mon4CaughtTime 02:ad83 sBox4Mon4CaughtData +02:ad83 sBox4Mon4CaughtLevel 02:ad84 sBox4Mon4CaughtLocation 02:ad84 sBox4Mon4CaughtGender 02:ad85 sBox4Mon4Level -02:ad86 sBox4Mon4BoxEnd 02:ad86 sBox4Mon5Species +02:ad86 sBox4Mon4BoxEnd 02:ad86 sBox4Mon5 02:ad87 sBox4Mon5Item 02:ad88 sBox4Mon5Moves 02:ad8c sBox4Mon5ID 02:ad8e sBox4Mon5Exp -02:ad91 sBox4Mon5StatExp 02:ad91 sBox4Mon5HPExp +02:ad91 sBox4Mon5StatExp 02:ad93 sBox4Mon5AtkExp 02:ad95 sBox4Mon5DefExp 02:ad97 sBox4Mon5SpdExp @@ -47010,14 +47010,14 @@ 02:ad9d sBox4Mon5PP 02:ada1 sBox4Mon5Happiness 02:ada2 sBox4Mon5PokerusStatus +02:ada3 sBox4Mon5CaughtLevel 02:ada3 sBox4Mon5CaughtTime 02:ada3 sBox4Mon5CaughtData -02:ada3 sBox4Mon5CaughtLevel -02:ada4 sBox4Mon5CaughtGender 02:ada4 sBox4Mon5CaughtLocation +02:ada4 sBox4Mon5CaughtGender 02:ada5 sBox4Mon5Level -02:ada6 sBox4Mon5BoxEnd 02:ada6 sBox4Mon6Species +02:ada6 sBox4Mon5BoxEnd 02:ada6 sBox4Mon6 02:ada7 sBox4Mon6Item 02:ada8 sBox4Mon6Moves @@ -48246,8 +48246,8 @@ 02:b768 sBox6Mon15Moves 02:b76c sBox6Mon15ID 02:b76e sBox6Mon15Exp -02:b771 sBox6Mon15StatExp 02:b771 sBox6Mon15HPExp +02:b771 sBox6Mon15StatExp 02:b773 sBox6Mon15AtkExp 02:b775 sBox6Mon15DefExp 02:b777 sBox6Mon15SpdExp @@ -48840,8 +48840,8 @@ 02:bc34 sBox7Mon18CaughtGender 02:bc35 sBox7Mon18Level 02:bc36 sBox7Mon19 -02:bc36 sBox7Mon18BoxEnd 02:bc36 sBox7Mon19Species +02:bc36 sBox7Mon18BoxEnd 02:bc37 sBox7Mon19Item 02:bc38 sBox7Mon19Moves 02:bc3c sBox7Mon19ID @@ -50025,8 +50025,8 @@ 03:a918 sBox10Mon4Moves 03:a91c sBox10Mon4ID 03:a91e sBox10Mon4Exp -03:a921 sBox10Mon4StatExp 03:a921 sBox10Mon4HPExp +03:a921 sBox10Mon4StatExp 03:a923 sBox10Mon4AtkExp 03:a925 sBox10Mon4DefExp 03:a927 sBox10Mon4SpdExp @@ -50203,8 +50203,8 @@ 03:aa14 sBox10Mon11CaughtLocation 03:aa15 sBox10Mon11Level 03:aa16 sBox10Mon12Species -03:aa16 sBox10Mon12 03:aa16 sBox10Mon11BoxEnd +03:aa16 sBox10Mon12 03:aa17 sBox10Mon12Item 03:aa18 sBox10Mon12Moves 03:aa1c sBox10Mon12ID @@ -50596,8 +50596,8 @@ 03:adc4 sBox11Mon6CaughtGender 03:adc5 sBox11Mon6Level 03:adc6 sBox11Mon7 -03:adc6 sBox11Mon7Species 03:adc6 sBox11Mon6BoxEnd +03:adc6 sBox11Mon7Species 03:adc7 sBox11Mon7Item 03:adc8 sBox11Mon7Moves 03:adcc sBox11Mon7ID @@ -51051,9 +51051,9 @@ 03:b1cd sBox12Mon4PP 03:b1d1 sBox12Mon4Happiness 03:b1d2 sBox12Mon4PokerusStatus -03:b1d3 sBox12Mon4CaughtLevel 03:b1d3 sBox12Mon4CaughtData 03:b1d3 sBox12Mon4CaughtTime +03:b1d3 sBox12Mon4CaughtLevel 03:b1d4 sBox12Mon4CaughtGender 03:b1d4 sBox12Mon4CaughtLocation 03:b1d5 sBox12Mon4Level @@ -52436,8 +52436,8 @@ 03:bc71 sBox14Mon20Happiness 03:bc72 sBox14Mon20PokerusStatus 03:bc73 sBox14Mon20CaughtLevel -03:bc73 sBox14Mon20CaughtTime 03:bc73 sBox14Mon20CaughtData +03:bc73 sBox14Mon20CaughtTime 03:bc74 sBox14Mon20CaughtLocation 03:bc74 sBox14Mon20CaughtGender 03:bc75 sBox14Mon20Level @@ -53486,11 +53486,11 @@ 00:c608 wBoxPartialData 00:c608 wTimeSetBuffer 00:c608 wHallOfFameTemp +00:c608 wBT_OTTempName 00:c608 wc608 00:c608 wUnknownGender 00:c608 wDebugLightColor 00:c608 wHallOfFameTempWinCount -00:c608 wBT_OTTempName 00:c608 wMobileMonSender 00:c608 wBT_OTTemp 00:c608 wEnemyMoveStruct @@ -53758,10 +53758,10 @@ 00:c64c wHallOfFameTempMon5DVs 00:c64c wBattleMonStructEnd 00:c64e wBT_OTTempMon2 -00:c64e wHallOfFameTempMon5Level 00:c64e wWildMon 00:c64e wBT_OTTempMon2Species 00:c64e wOfferMonHappiness +00:c64e wHallOfFameTempMon5Level 00:c64f wHallOfFameTempMon5Nickname 00:c64f wBT_OTTempMon2Item 00:c64f wOfferMonPokerusStatus @@ -53822,9 +53822,9 @@ 00:c669 wPlayerSubStatus2 00:c66a wPlayerSubStatus3 00:c66a wBT_OTTempMon2PokerusStatus -00:c66b wPlayerSubStatus4 00:c66b wUnknownMonMailMessageEnd 00:c66b wBT_OTTempMon2CaughtData +00:c66b wPlayerSubStatus4 00:c66b wBT_OTTempMon2CaughtTime 00:c66b wBT_OTTempMon2CaughtLevel 00:c66c wBT_OTTempMon2CaughtLocation @@ -54294,8 +54294,8 @@ 00:c819 wc819 00:c81a wDebugRoomItemID 00:c81a wTimeCapsulePartyMon1CatchRate -00:c81a wc81a 00:c81a wDebugRoomMonSpecies +00:c81a wc81a 00:c81a wDebugRoomMon 00:c81a wDebugRoomGBID 00:c81b wLinkPlayerPartyMon1Exp @@ -54358,8 +54358,8 @@ 00:c830 wTimeCapsulePartyMon1PP 00:c830 wLinkPlayerPartyMon1CaughtLevel 00:c831 wDebugRoomMonPP -00:c831 wHallOfFamePokemonListMon3End 00:c831 wHallOfFamePokemonListMon4Species +00:c831 wHallOfFamePokemonListMon3End 00:c831 wHallOfFamePokemonListMon4 00:c831 wLinkPlayerPartyMon1CaughtGender 00:c831 wLinkPlayerPartyMon1CaughtLocation @@ -55067,12 +55067,12 @@ 00:cf64 wPrevDexEntryJumptableIndex 00:cf64 wcf64 00:cf64 wDebugTilesetCurPalette +00:cf64 wCardFlipCursorY 00:cf64 wStatsScreenFlags 00:cf64 wNrOfBeatenBattleTowerTrainers 00:cf64 wTrainerCardBadgeFrameCounter 00:cf64 wCreditsBorderFrame 00:cf64 wNamingScreenLetterCase -00:cf64 wCardFlipCursorY 00:cf64 wPokegearCard 00:cf64 wPackJumptableIndex 00:cf64 wSlotsDelay @@ -55254,6 +55254,7 @@ 01:d003 wTempPokedexCaughtCount 01:d003 wFinishedPrintingBox 01:d003 wSeerNickname +01:d003 wTownMapCursorCoordinates 01:d003 wMovementBufferObject 01:d003 wPlaceBallsDirection 01:d003 wBillsPCTempListIndex @@ -55262,7 +55263,6 @@ 01:d003 wDebugColorIsShiny 01:d003 wNextRadioLine 01:d003 wPhoneCaller -01:d003 wTownMapCursorCoordinates 01:d004 wAddrOfBoxToPrint 01:d004 wBugContestFirstPlaceScore 01:d004 wTrainerHUDTiles @@ -55294,8 +55294,8 @@ 01:d00c wRadioText 01:d00c wBugContestThirdPlaceScore 01:d00c wMobileParticipant2Nickname -01:d00d wLinkBattleRecordWins 01:d00d wBufferMonOT +01:d00d wLinkBattleRecordWins 01:d00e wMartItem5BCD 01:d00e wBugContestTempWinnerID 01:d00e wSeerCaughtLocation @@ -55495,8 +55495,8 @@ 01:d102 wUnusedNamesPointer 01:d104 wItemAttributesPointer 01:d106 wCurItem -01:d107 wCurItemQuantity 01:d107 wMartItemID +01:d107 wCurItemQuantity 01:d108 wCurPartySpecies 01:d109 wCurPartyMon 01:d10a wWhichHPBar @@ -55634,12 +55634,13 @@ 01:d1ea wListMovesLineSpacing 01:d1ea wFinalCatchRate 01:d1ea wCurDecoration -01:d1ea wCurMapScriptBank 01:d1ea wCurMailAuthorID +01:d1ea wEvolutionOldSpecies 01:d1ea wPPUpPPBuffer 01:d1ea wTempMysteryGiftTimer 01:d1ea wSkipMovesBeforeLevelUp 01:d1ea wExpToNextLevel +01:d1ea wCurMapScriptBank 01:d1ea wFieldMoveData 01:d1ea wHPBuffer1 01:d1ea wCurHPAnimMaxHP @@ -55658,7 +55659,6 @@ 01:d1ea wMagikarpLength 01:d1ea wRestartClockCurDivision 01:d1ea wd1ea -01:d1ea wEvolutionOldSpecies 01:d1eb wHealMachineTempOBP1 01:d1eb wSurfingPlayerState 01:d1eb wPCItemQuantity @@ -55814,8 +55814,8 @@ 01:d269 wTimeOfDay 01:d26b wPokedexShowPointerAddr 01:d26b wUnusedEggHatchFlag -01:d26b wOTPlayerName 01:d26b wOTPartyData +01:d26b wOTPlayerName 01:d26d wPokedexShowPointerBank 01:d271 wd271 01:d276 wOTPlayerID @@ -56491,8 +56491,8 @@ 01:d684 wObject10Field1e 01:d685 wObject10JumpHeight 01:d686 wObject10Range -01:d68e wObject11Struct 01:d68e wObject11Sprite +01:d68e wObject11Struct 01:d68e wObject10StructEnd 01:d68f wObject11MapObjectIndex 01:d690 wObject11SpriteTile @@ -56804,7 +56804,7 @@ 01:d81a wMap15ObjectEventFlag 01:d81e wObjectMasks 01:d82e wVariableSprites -01:d83e wEnteredMapFromContinue +01:d83e wMapNameSignFlags 01:d841 wTimeOfDayPal 01:d846 wTimeOfDayPalFlags 01:d847 wTimeOfDayPalset @@ -57273,8 +57273,8 @@ 01:df0e wBreedMon1Moves 01:df12 wBreedMon1ID 01:df14 wBreedMon1Exp -01:df17 wBreedMon1HPExp 01:df17 wBreedMon1StatExp +01:df17 wBreedMon1HPExp 01:df19 wBreedMon1AtkExp 01:df1b wBreedMon1DefExp 01:df1d wBreedMon1SpdExp @@ -57631,8 +57631,8 @@ 03:d272 w3_d202Mon2Speed 03:d274 w3_d202Mon2SpclAtk 03:d276 w3_d202Mon2SpclDef -03:d278 w3_d202Mon2StructEnd 03:d278 w3_d202Mon2Name +03:d278 w3_d202Mon2StructEnd 03:d283 w3_d202Mon3 03:d283 w3_d202Mon3Species 03:d284 w3_d202Mon3Item @@ -58239,8 +58239,8 @@ 03:d764 w3_d742Mon1PP 03:d768 w3_d742Mon1Happiness 03:d769 w3_d742Mon1PokerusStatus -03:d76a w3_d742Mon1CaughtTime 03:d76a w3_d742Mon1CaughtData +03:d76a w3_d742Mon1CaughtTime 03:d76a w3_d742Mon1CaughtLevel 03:d76b w3_d742Mon1CaughtLocation 03:d76b w3_d742Mon1CaughtGender diff --git a/pokecrystal11_vc.map b/pokecrystal11_vc.map index 35cbcbb6a..ba59630a7 100644 --- a/pokecrystal11_vc.map +++ b/pokecrystal11_vc.map @@ -571,8 +571,8 @@ ROM0 bank #0: $1c9c = PlaceVerticalMenuItems.loop $1cbb = MenuBox $1cc6 = GetMenuTextStartCoord - $1cd8 = GetMenuTextStartCoord.bit_6_set - $1ce0 = GetMenuTextStartCoord.bit_7_clear + $1cd8 = GetMenuTextStartCoord.no_top_spacing + $1ce0 = GetMenuTextStartCoord.no_cursor $1ce1 = ClearMenuBoxInterior $1cf1 = ClearWholeMenuBox $1cfd = MenuBoxCoord2Tile @@ -618,7 +618,7 @@ ROM0 bank #0: $1ee1 = RunMenuItemPrintingFunction.loop $1efb = RunMenuItemPrintingFunction._hl_ $1eff = InitMenuCursorAndButtonPermissions - $1f0e = InitMenuCursorAndButtonPermissions.disallow_select + $1f0e = InitMenuCursorAndButtonPermissions.disallow_start $1f19 = InitMenuCursorAndButtonPermissions.disallow_left_right $1f1a = GetScrollingMenuJoypad $1f23 = GetStaticMenuJoypad @@ -4545,7 +4545,7 @@ ROMX bank #5: $4089 = StartClock $4097 = StartClock.skip_set $409b = _FixDays - $40a8 = _FixDays.set_bit_7 + $40a8 = _FixDays.reset_rtc $40ae = ClockContinue $40c8 = ClockContinue.time_overflow $40eb = ClockContinue.dont_update @@ -4556,8 +4556,8 @@ ROMX bank #5: $4128 = _InitTime.okay_days $412a = GetEmote2bpp $4135 = _UpdatePlayerSprite - $4146 = _RefreshSprites - $4157 = _ClearSprites + $4146 = LoadStandingSpritesGFX + $4157 = LoadWalkingSpritesGFX $4168 = RefreshSprites $416f = RefreshSprites.Refresh $4183 = GetPlayerSprite @@ -5758,8 +5758,8 @@ ROMX bank #9: $436b = Place2DMenuCursor.cursor_on $4374 = _PushWindow $4387 = _PushWindow.loop - $4398 = _PushWindow.bit_6 - $43ae = _PushWindow.not_bit_7 + $4398 = _PushWindow.backup_tiles + $43ae = _PushWindow.no_backup_tiles $43b5 = _PushWindow.done $43cd = _PushWindow.copy $43d5 = _PushWindow.row @@ -7242,7 +7242,7 @@ ROMX bank #11: $49a8 = _TMHM_ExitPack $49af = TMHM_ExitPocket $49b1 = TMHM_ScrollPocket - $49c5 = TMHM_ScrollPocket.skip + $49c5 = TMHM_ScrollPocket.down $49ca = TMHM_ScrollPocket.loop $49e2 = TMHM_DisplayPocketItems $49fa = TMHM_DisplayPocketItems.loop2 @@ -44168,8 +44168,8 @@ SRAM bank #1: $ade8 = sBoxMon7Moves $adec = sBoxMon7ID $adee = sBoxMon7Exp - $adf1 = sBoxMon7StatExp $adf1 = sBoxMon7HPExp + $adf1 = sBoxMon7StatExp $adf3 = sBoxMon7AtkExp $adf5 = sBoxMon7DefExp $adf7 = sBoxMon7SpdExp @@ -44270,8 +44270,8 @@ SRAM bank #1: $ae7d = sBoxMon11PP $ae81 = sBoxMon11Happiness $ae82 = sBoxMon11PokerusStatus - $ae83 = sBoxMon11CaughtTime $ae83 = sBoxMon11CaughtLevel + $ae83 = sBoxMon11CaughtTime $ae83 = sBoxMon11CaughtData $ae84 = sBoxMon11CaughtGender $ae84 = sBoxMon11CaughtLocation @@ -44432,8 +44432,8 @@ SRAM bank #1: $af61 = sBoxMon18Happiness $af62 = sBoxMon18PokerusStatus $af63 = sBoxMon18CaughtData - $af63 = sBoxMon18CaughtLevel $af63 = sBoxMon18CaughtTime + $af63 = sBoxMon18CaughtLevel $af64 = sBoxMon18CaughtGender $af64 = sBoxMon18CaughtLocation $af65 = sBoxMon18Level @@ -44533,9 +44533,9 @@ SRAM bank #1: $b260 = sLinkBattleStats $b262 = sLinkBattleLosses $b264 = sLinkBattleDraws + $b266 = sLinkBattleRecord1 $b266 = sLinkBattleRecord $b266 = sLinkBattleRecord1ID - $b266 = sLinkBattleRecord1 $b268 = sLinkBattleRecord1Name $b272 = sLinkBattleRecord1Wins $b274 = sLinkBattleRecord1Losses @@ -45022,8 +45022,8 @@ SRAM bank #1: $b689 = sHallOfFame10Mon6Nickname $b693 = sHallOfFame10Mon6End $b693 = sHallOfFame10End - $b694 = sHallOfFame11 $b694 = sHallOfFame11WinCount + $b694 = sHallOfFame11 $b695 = sHallOfFame11Mon1 $b695 = sHallOfFame11Mon1Species $b696 = sHallOfFame11Mon1ID @@ -45339,8 +45339,8 @@ SRAM bank #1: $b941 = sHallOfFame17Mon6End $b942 = sHallOfFame18WinCount $b942 = sHallOfFame18 - $b943 = sHallOfFame18Mon1 $b943 = sHallOfFame18Mon1Species + $b943 = sHallOfFame18Mon1 $b944 = sHallOfFame18Mon1ID $b946 = sHallOfFame18Mon1DVs $b948 = sHallOfFame18Mon1Level @@ -46572,8 +46572,8 @@ SRAM bank #2: $a504 = sBox2Mon5CaughtGender $a504 = sBox2Mon5CaughtLocation $a505 = sBox2Mon5Level - $a506 = sBox2Mon6 $a506 = sBox2Mon5BoxEnd + $a506 = sBox2Mon6 $a506 = sBox2Mon6Species $a507 = sBox2Mon6Item $a508 = sBox2Mon6Moves @@ -46802,8 +46802,8 @@ SRAM bank #2: $a644 = sBox2Mon15CaughtGender $a644 = sBox2Mon15CaughtLocation $a645 = sBox2Mon15Level - $a646 = sBox2Mon16Species $a646 = sBox2Mon15BoxEnd + $a646 = sBox2Mon16Species $a646 = sBox2Mon16 $a647 = sBox2Mon16Item $a648 = sBox2Mon16Moves @@ -47549,8 +47549,8 @@ SRAM bank #2: $ad68 = sBox4Mon4Moves $ad6c = sBox4Mon4ID $ad6e = sBox4Mon4Exp - $ad71 = sBox4Mon4HPExp $ad71 = sBox4Mon4StatExp + $ad71 = sBox4Mon4HPExp $ad73 = sBox4Mon4AtkExp $ad75 = sBox4Mon4DefExp $ad77 = sBox4Mon4SpdExp @@ -47559,21 +47559,21 @@ SRAM bank #2: $ad7d = sBox4Mon4PP $ad81 = sBox4Mon4Happiness $ad82 = sBox4Mon4PokerusStatus - $ad83 = sBox4Mon4CaughtLevel $ad83 = sBox4Mon4CaughtTime $ad83 = sBox4Mon4CaughtData + $ad83 = sBox4Mon4CaughtLevel $ad84 = sBox4Mon4CaughtLocation $ad84 = sBox4Mon4CaughtGender $ad85 = sBox4Mon4Level - $ad86 = sBox4Mon4BoxEnd $ad86 = sBox4Mon5Species + $ad86 = sBox4Mon4BoxEnd $ad86 = sBox4Mon5 $ad87 = sBox4Mon5Item $ad88 = sBox4Mon5Moves $ad8c = sBox4Mon5ID $ad8e = sBox4Mon5Exp - $ad91 = sBox4Mon5StatExp $ad91 = sBox4Mon5HPExp + $ad91 = sBox4Mon5StatExp $ad93 = sBox4Mon5AtkExp $ad95 = sBox4Mon5DefExp $ad97 = sBox4Mon5SpdExp @@ -47582,21 +47582,21 @@ SRAM bank #2: $ad9d = sBox4Mon5PP $ada1 = sBox4Mon5Happiness $ada2 = sBox4Mon5PokerusStatus + $ada3 = sBox4Mon5CaughtLevel $ada3 = sBox4Mon5CaughtTime $ada3 = sBox4Mon5CaughtData - $ada3 = sBox4Mon5CaughtLevel - $ada4 = sBox4Mon5CaughtGender $ada4 = sBox4Mon5CaughtLocation + $ada4 = sBox4Mon5CaughtGender $ada5 = sBox4Mon5Level - $ada6 = sBox4Mon5BoxEnd $ada6 = sBox4Mon6Species + $ada6 = sBox4Mon5BoxEnd $ada6 = sBox4Mon6 $ada7 = sBox4Mon6Item $ada8 = sBox4Mon6Moves $adac = sBox4Mon6ID $adae = sBox4Mon6Exp - $adb1 = sBox4Mon6StatExp $adb1 = sBox4Mon6HPExp + $adb1 = sBox4Mon6StatExp $adb3 = sBox4Mon6AtkExp $adb5 = sBox4Mon6DefExp $adb7 = sBox4Mon6SpdExp @@ -47605,21 +47605,21 @@ SRAM bank #2: $adbd = sBox4Mon6PP $adc1 = sBox4Mon6Happiness $adc2 = sBox4Mon6PokerusStatus - $adc3 = sBox4Mon6CaughtData - $adc3 = sBox4Mon6CaughtTime $adc3 = sBox4Mon6CaughtLevel + $adc3 = sBox4Mon6CaughtTime + $adc3 = sBox4Mon6CaughtData $adc4 = sBox4Mon6CaughtGender $adc4 = sBox4Mon6CaughtLocation $adc5 = sBox4Mon6Level - $adc6 = sBox4Mon6BoxEnd $adc6 = sBox4Mon7 $adc6 = sBox4Mon7Species + $adc6 = sBox4Mon6BoxEnd $adc7 = sBox4Mon7Item $adc8 = sBox4Mon7Moves $adcc = sBox4Mon7ID $adce = sBox4Mon7Exp - $add1 = sBox4Mon7StatExp $add1 = sBox4Mon7HPExp + $add1 = sBox4Mon7StatExp $add3 = sBox4Mon7AtkExp $add5 = sBox4Mon7DefExp $add7 = sBox4Mon7SpdExp @@ -47628,21 +47628,21 @@ SRAM bank #2: $addd = sBox4Mon7PP $ade1 = sBox4Mon7Happiness $ade2 = sBox4Mon7PokerusStatus - $ade3 = sBox4Mon7CaughtData $ade3 = sBox4Mon7CaughtLevel $ade3 = sBox4Mon7CaughtTime + $ade3 = sBox4Mon7CaughtData $ade4 = sBox4Mon7CaughtLocation $ade4 = sBox4Mon7CaughtGender $ade5 = sBox4Mon7Level $ade6 = sBox4Mon8 - $ade6 = sBox4Mon7BoxEnd $ade6 = sBox4Mon8Species + $ade6 = sBox4Mon7BoxEnd $ade7 = sBox4Mon8Item $ade8 = sBox4Mon8Moves $adec = sBox4Mon8ID $adee = sBox4Mon8Exp - $adf1 = sBox4Mon8StatExp $adf1 = sBox4Mon8HPExp + $adf1 = sBox4Mon8StatExp $adf3 = sBox4Mon8AtkExp $adf5 = sBox4Mon8DefExp $adf7 = sBox4Mon8SpdExp @@ -48818,8 +48818,8 @@ SRAM bank #2: $b768 = sBox6Mon15Moves $b76c = sBox6Mon15ID $b76e = sBox6Mon15Exp - $b771 = sBox6Mon15StatExp $b771 = sBox6Mon15HPExp + $b771 = sBox6Mon15StatExp $b773 = sBox6Mon15AtkExp $b775 = sBox6Mon15DefExp $b777 = sBox6Mon15SpdExp @@ -49412,8 +49412,8 @@ SRAM bank #2: $bc34 = sBox7Mon18CaughtGender $bc35 = sBox7Mon18Level $bc36 = sBox7Mon19 - $bc36 = sBox7Mon18BoxEnd $bc36 = sBox7Mon19Species + $bc36 = sBox7Mon18BoxEnd $bc37 = sBox7Mon19Item $bc38 = sBox7Mon19Moves $bc3c = sBox7Mon19ID @@ -50602,8 +50602,8 @@ SRAM bank #3: $a918 = sBox10Mon4Moves $a91c = sBox10Mon4ID $a91e = sBox10Mon4Exp - $a921 = sBox10Mon4StatExp $a921 = sBox10Mon4HPExp + $a921 = sBox10Mon4StatExp $a923 = sBox10Mon4AtkExp $a925 = sBox10Mon4DefExp $a927 = sBox10Mon4SpdExp @@ -50780,8 +50780,8 @@ SRAM bank #3: $aa14 = sBox10Mon11CaughtLocation $aa15 = sBox10Mon11Level $aa16 = sBox10Mon12Species - $aa16 = sBox10Mon12 $aa16 = sBox10Mon11BoxEnd + $aa16 = sBox10Mon12 $aa17 = sBox10Mon12Item $aa18 = sBox10Mon12Moves $aa1c = sBox10Mon12ID @@ -51173,8 +51173,8 @@ SRAM bank #3: $adc4 = sBox11Mon6CaughtGender $adc5 = sBox11Mon6Level $adc6 = sBox11Mon7 - $adc6 = sBox11Mon7Species $adc6 = sBox11Mon6BoxEnd + $adc6 = sBox11Mon7Species $adc7 = sBox11Mon7Item $adc8 = sBox11Mon7Moves $adcc = sBox11Mon7ID @@ -51628,9 +51628,9 @@ SRAM bank #3: $b1cd = sBox12Mon4PP $b1d1 = sBox12Mon4Happiness $b1d2 = sBox12Mon4PokerusStatus - $b1d3 = sBox12Mon4CaughtLevel $b1d3 = sBox12Mon4CaughtData $b1d3 = sBox12Mon4CaughtTime + $b1d3 = sBox12Mon4CaughtLevel $b1d4 = sBox12Mon4CaughtGender $b1d4 = sBox12Mon4CaughtLocation $b1d5 = sBox12Mon4Level @@ -53013,8 +53013,8 @@ SRAM bank #3: $bc71 = sBox14Mon20Happiness $bc72 = sBox14Mon20PokerusStatus $bc73 = sBox14Mon20CaughtLevel - $bc73 = sBox14Mon20CaughtTime $bc73 = sBox14Mon20CaughtData + $bc73 = sBox14Mon20CaughtTime $bc74 = sBox14Mon20CaughtLocation $bc74 = sBox14Mon20CaughtGender $bc75 = sBox14Mon20Level @@ -54094,11 +54094,11 @@ WRAM0 bank #0: $c608 = wBoxPartialData $c608 = wTimeSetBuffer $c608 = wHallOfFameTemp + $c608 = wBT_OTTempName $c608 = wc608 $c608 = wUnknownGender $c608 = wDebugLightColor $c608 = wHallOfFameTempWinCount - $c608 = wBT_OTTempName $c608 = wMobileMonSender $c608 = wBT_OTTemp $c608 = wEnemyMoveStruct @@ -54366,10 +54366,10 @@ WRAM0 bank #0: $c64c = wHallOfFameTempMon5DVs $c64c = wBattleMonStructEnd $c64e = wBT_OTTempMon2 - $c64e = wHallOfFameTempMon5Level $c64e = wWildMon $c64e = wBT_OTTempMon2Species $c64e = wOfferMonHappiness + $c64e = wHallOfFameTempMon5Level $c64f = wHallOfFameTempMon5Nickname $c64f = wBT_OTTempMon2Item $c64f = wOfferMonPokerusStatus @@ -54430,9 +54430,9 @@ WRAM0 bank #0: $c669 = wPlayerSubStatus2 $c66a = wPlayerSubStatus3 $c66a = wBT_OTTempMon2PokerusStatus - $c66b = wPlayerSubStatus4 $c66b = wUnknownMonMailMessageEnd $c66b = wBT_OTTempMon2CaughtData + $c66b = wPlayerSubStatus4 $c66b = wBT_OTTempMon2CaughtTime $c66b = wBT_OTTempMon2CaughtLevel $c66c = wBT_OTTempMon2CaughtLocation @@ -54933,8 +54933,8 @@ WRAM0 bank #0: $c830 = wLinkPlayerPartyMon1CaughtData $c830 = wTimeCapsulePartyMon1PP $c830 = wLinkPlayerPartyMon1CaughtLevel - $c831 = wHallOfFamePokemonListMon3End $c831 = wHallOfFamePokemonListMon4Species + $c831 = wHallOfFamePokemonListMon3End $c831 = wHallOfFamePokemonListMon4 $c831 = wLinkPlayerPartyMon1CaughtGender $c831 = wLinkPlayerPartyMon1CaughtLocation @@ -55634,12 +55634,12 @@ WRAM0 bank #0: $cf64 = wPrevDexEntryJumptableIndex $cf64 = wcf64 $cf64 = wDebugTilesetCurPalette + $cf64 = wCardFlipCursorY $cf64 = wStatsScreenFlags $cf64 = wNrOfBeatenBattleTowerTrainers $cf64 = wTrainerCardBadgeFrameCounter $cf64 = wCreditsBorderFrame $cf64 = wNamingScreenLetterCase - $cf64 = wCardFlipCursorY $cf64 = wPokegearCard $cf64 = wPackJumptableIndex $cf64 = wSlotsDelay @@ -55827,6 +55827,7 @@ WRAMX bank #1: $d003 = wTempPokedexCaughtCount $d003 = wFinishedPrintingBox $d003 = wSeerNickname + $d003 = wTownMapCursorCoordinates $d003 = wMovementBufferObject $d003 = wPlaceBallsDirection $d003 = wBillsPCTempListIndex @@ -55835,7 +55836,6 @@ WRAMX bank #1: $d003 = wDebugColorIsShiny $d003 = wNextRadioLine $d003 = wPhoneCaller - $d003 = wTownMapCursorCoordinates $d004 = wAddrOfBoxToPrint $d004 = wBugContestFirstPlaceScore $d004 = wTrainerHUDTiles @@ -55867,8 +55867,8 @@ WRAMX bank #1: $d00c = wRadioText $d00c = wBugContestThirdPlaceScore $d00c = wMobileParticipant2Nickname - $d00d = wLinkBattleRecordWins $d00d = wBufferMonOT + $d00d = wLinkBattleRecordWins $d00e = wMartItem5BCD $d00e = wBugContestTempWinnerID $d00e = wSeerCaughtLocation @@ -56069,8 +56069,8 @@ WRAMX bank #1: $d102 = wUnusedNamesPointer $d104 = wItemAttributesPointer $d106 = wCurItem - $d107 = wCurItemQuantity $d107 = wMartItemID + $d107 = wCurItemQuantity $d108 = wCurPartySpecies $d109 = wCurPartyMon $d10a = wWhichHPBar @@ -56209,11 +56209,12 @@ WRAMX bank #1: $d1ea = wFinalCatchRate $d1ea = wCurDecoration $d1ea = wCurMailAuthorID - $d1ea = wCurMapScriptBank + $d1ea = wEvolutionOldSpecies $d1ea = wPPUpPPBuffer $d1ea = wTempMysteryGiftTimer $d1ea = wSkipMovesBeforeLevelUp $d1ea = wExpToNextLevel + $d1ea = wCurMapScriptBank $d1ea = wFieldMoveData $d1ea = wHPBuffer1 $d1ea = wCurHPAnimMaxHP @@ -56232,7 +56233,6 @@ WRAMX bank #1: $d1ea = wMagikarpLength $d1ea = wRestartClockCurDivision $d1ea = wd1ea - $d1ea = wEvolutionOldSpecies $d1eb = wHealMachineTempOBP1 $d1eb = wSurfingPlayerState $d1eb = wPCItemQuantity @@ -56389,8 +56389,8 @@ WRAMX bank #1: SECTION: $d26b-$dcd6 ($0a6c bytes) ["Enemy Party"] $d26b = wPokedexShowPointerAddr $d26b = wUnusedEggHatchFlag - $d26b = wOTPlayerName $d26b = wOTPartyData + $d26b = wOTPlayerName $d26d = wPokedexShowPointerBank $d271 = wd271 $d276 = wOTPlayerID @@ -57066,8 +57066,8 @@ WRAMX bank #1: $d684 = wObject10Field1e $d685 = wObject10JumpHeight $d686 = wObject10Range - $d68e = wObject11Struct $d68e = wObject11Sprite + $d68e = wObject11Struct $d68e = wObject10StructEnd $d68f = wObject11MapObjectIndex $d690 = wObject11SpriteTile @@ -57379,7 +57379,7 @@ WRAMX bank #1: $d81a = wMap15ObjectEventFlag $d81e = wObjectMasks $d82e = wVariableSprites - $d83e = wEnteredMapFromContinue + $d83e = wMapNameSignFlags $d841 = wTimeOfDayPal $d846 = wTimeOfDayPalFlags $d847 = wTimeOfDayPalset @@ -57849,8 +57849,8 @@ WRAMX bank #1: $df0e = wBreedMon1Moves $df12 = wBreedMon1ID $df14 = wBreedMon1Exp - $df17 = wBreedMon1HPExp $df17 = wBreedMon1StatExp + $df17 = wBreedMon1HPExp $df19 = wBreedMon1AtkExp $df1b = wBreedMon1DefExp $df1d = wBreedMon1SpdExp @@ -58217,8 +58217,8 @@ WRAMX bank #3: $d272 = w3_d202Mon2Speed $d274 = w3_d202Mon2SpclAtk $d276 = w3_d202Mon2SpclDef - $d278 = w3_d202Mon2StructEnd $d278 = w3_d202Mon2Name + $d278 = w3_d202Mon2StructEnd $d283 = w3_d202Mon3 $d283 = w3_d202Mon3Species $d284 = w3_d202Mon3Item @@ -58825,8 +58825,8 @@ WRAMX bank #3: $d764 = w3_d742Mon1PP $d768 = w3_d742Mon1Happiness $d769 = w3_d742Mon1PokerusStatus - $d76a = w3_d742Mon1CaughtTime $d76a = w3_d742Mon1CaughtData + $d76a = w3_d742Mon1CaughtTime $d76a = w3_d742Mon1CaughtLevel $d76b = w3_d742Mon1CaughtLocation $d76b = w3_d742Mon1CaughtGender diff --git a/pokecrystal11_vc.sym b/pokecrystal11_vc.sym index 478a2895a..283c5810d 100644 --- a/pokecrystal11_vc.sym +++ b/pokecrystal11_vc.sym @@ -536,8 +536,8 @@ 00:1c9c PlaceVerticalMenuItems.loop 00:1cbb MenuBox 00:1cc6 GetMenuTextStartCoord -00:1cd8 GetMenuTextStartCoord.bit_6_set -00:1ce0 GetMenuTextStartCoord.bit_7_clear +00:1cd8 GetMenuTextStartCoord.no_top_spacing +00:1ce0 GetMenuTextStartCoord.no_cursor 00:1ce1 ClearMenuBoxInterior 00:1cf1 ClearWholeMenuBox 00:1cfd MenuBoxCoord2Tile @@ -583,7 +583,7 @@ 00:1ee1 RunMenuItemPrintingFunction.loop 00:1efb RunMenuItemPrintingFunction._hl_ 00:1eff InitMenuCursorAndButtonPermissions -00:1f0e InitMenuCursorAndButtonPermissions.disallow_select +00:1f0e InitMenuCursorAndButtonPermissions.disallow_start 00:1f19 InitMenuCursorAndButtonPermissions.disallow_left_right 00:1f1a GetScrollingMenuJoypad 00:1f23 GetStaticMenuJoypad @@ -4485,7 +4485,7 @@ 05:4089 StartClock 05:4097 StartClock.skip_set 05:409b _FixDays -05:40a8 _FixDays.set_bit_7 +05:40a8 _FixDays.reset_rtc 05:40ae ClockContinue 05:40c8 ClockContinue.time_overflow 05:40eb ClockContinue.dont_update @@ -4496,8 +4496,8 @@ 05:4128 _InitTime.okay_days 05:412a GetEmote2bpp 05:4135 _UpdatePlayerSprite -05:4146 _RefreshSprites -05:4157 _ClearSprites +05:4146 LoadStandingSpritesGFX +05:4157 LoadWalkingSpritesGFX 05:4168 RefreshSprites 05:416f RefreshSprites.Refresh 05:4183 GetPlayerSprite @@ -5674,8 +5674,8 @@ 09:436b Place2DMenuCursor.cursor_on 09:4374 _PushWindow 09:4387 _PushWindow.loop -09:4398 _PushWindow.bit_6 -09:43ae _PushWindow.not_bit_7 +09:4398 _PushWindow.backup_tiles +09:43ae _PushWindow.no_backup_tiles 09:43b5 _PushWindow.done 09:43cd _PushWindow.copy 09:43d5 _PushWindow.row @@ -7147,7 +7147,7 @@ 0b:49a8 _TMHM_ExitPack 0b:49af TMHM_ExitPocket 0b:49b1 TMHM_ScrollPocket -0b:49c5 TMHM_ScrollPocket.skip +0b:49c5 TMHM_ScrollPocket.down 0b:49ca TMHM_ScrollPocket.loop 0b:49e2 TMHM_DisplayPocketItems 0b:49fa TMHM_DisplayPocketItems.loop2 @@ -43451,8 +43451,8 @@ 01:ade8 sBoxMon7Moves 01:adec sBoxMon7ID 01:adee sBoxMon7Exp -01:adf1 sBoxMon7StatExp 01:adf1 sBoxMon7HPExp +01:adf1 sBoxMon7StatExp 01:adf3 sBoxMon7AtkExp 01:adf5 sBoxMon7DefExp 01:adf7 sBoxMon7SpdExp @@ -43553,8 +43553,8 @@ 01:ae7d sBoxMon11PP 01:ae81 sBoxMon11Happiness 01:ae82 sBoxMon11PokerusStatus -01:ae83 sBoxMon11CaughtTime 01:ae83 sBoxMon11CaughtLevel +01:ae83 sBoxMon11CaughtTime 01:ae83 sBoxMon11CaughtData 01:ae84 sBoxMon11CaughtGender 01:ae84 sBoxMon11CaughtLocation @@ -43715,8 +43715,8 @@ 01:af61 sBoxMon18Happiness 01:af62 sBoxMon18PokerusStatus 01:af63 sBoxMon18CaughtData -01:af63 sBoxMon18CaughtLevel 01:af63 sBoxMon18CaughtTime +01:af63 sBoxMon18CaughtLevel 01:af64 sBoxMon18CaughtGender 01:af64 sBoxMon18CaughtLocation 01:af65 sBoxMon18Level @@ -43815,9 +43815,9 @@ 01:b260 sLinkBattleStats 01:b262 sLinkBattleLosses 01:b264 sLinkBattleDraws +01:b266 sLinkBattleRecord1 01:b266 sLinkBattleRecord 01:b266 sLinkBattleRecord1ID -01:b266 sLinkBattleRecord1 01:b268 sLinkBattleRecord1Name 01:b272 sLinkBattleRecord1Wins 01:b274 sLinkBattleRecord1Losses @@ -44303,8 +44303,8 @@ 01:b689 sHallOfFame10Mon6Nickname 01:b693 sHallOfFame10Mon6End 01:b693 sHallOfFame10End -01:b694 sHallOfFame11 01:b694 sHallOfFame11WinCount +01:b694 sHallOfFame11 01:b695 sHallOfFame11Mon1 01:b695 sHallOfFame11Mon1Species 01:b696 sHallOfFame11Mon1ID @@ -44620,8 +44620,8 @@ 01:b941 sHallOfFame17Mon6End 01:b942 sHallOfFame18WinCount 01:b942 sHallOfFame18 -01:b943 sHallOfFame18Mon1 01:b943 sHallOfFame18Mon1Species +01:b943 sHallOfFame18Mon1 01:b944 sHallOfFame18Mon1ID 01:b946 sHallOfFame18Mon1DVs 01:b948 sHallOfFame18Mon1Level @@ -45846,8 +45846,8 @@ 02:a504 sBox2Mon5CaughtGender 02:a504 sBox2Mon5CaughtLocation 02:a505 sBox2Mon5Level -02:a506 sBox2Mon6 02:a506 sBox2Mon5BoxEnd +02:a506 sBox2Mon6 02:a506 sBox2Mon6Species 02:a507 sBox2Mon6Item 02:a508 sBox2Mon6Moves @@ -46076,8 +46076,8 @@ 02:a644 sBox2Mon15CaughtGender 02:a644 sBox2Mon15CaughtLocation 02:a645 sBox2Mon15Level -02:a646 sBox2Mon16Species 02:a646 sBox2Mon15BoxEnd +02:a646 sBox2Mon16Species 02:a646 sBox2Mon16 02:a647 sBox2Mon16Item 02:a648 sBox2Mon16Moves @@ -46823,8 +46823,8 @@ 02:ad68 sBox4Mon4Moves 02:ad6c sBox4Mon4ID 02:ad6e sBox4Mon4Exp -02:ad71 sBox4Mon4HPExp 02:ad71 sBox4Mon4StatExp +02:ad71 sBox4Mon4HPExp 02:ad73 sBox4Mon4AtkExp 02:ad75 sBox4Mon4DefExp 02:ad77 sBox4Mon4SpdExp @@ -46833,21 +46833,21 @@ 02:ad7d sBox4Mon4PP 02:ad81 sBox4Mon4Happiness 02:ad82 sBox4Mon4PokerusStatus -02:ad83 sBox4Mon4CaughtLevel 02:ad83 sBox4Mon4CaughtTime 02:ad83 sBox4Mon4CaughtData +02:ad83 sBox4Mon4CaughtLevel 02:ad84 sBox4Mon4CaughtLocation 02:ad84 sBox4Mon4CaughtGender 02:ad85 sBox4Mon4Level -02:ad86 sBox4Mon4BoxEnd 02:ad86 sBox4Mon5Species +02:ad86 sBox4Mon4BoxEnd 02:ad86 sBox4Mon5 02:ad87 sBox4Mon5Item 02:ad88 sBox4Mon5Moves 02:ad8c sBox4Mon5ID 02:ad8e sBox4Mon5Exp -02:ad91 sBox4Mon5StatExp 02:ad91 sBox4Mon5HPExp +02:ad91 sBox4Mon5StatExp 02:ad93 sBox4Mon5AtkExp 02:ad95 sBox4Mon5DefExp 02:ad97 sBox4Mon5SpdExp @@ -46856,21 +46856,21 @@ 02:ad9d sBox4Mon5PP 02:ada1 sBox4Mon5Happiness 02:ada2 sBox4Mon5PokerusStatus +02:ada3 sBox4Mon5CaughtLevel 02:ada3 sBox4Mon5CaughtTime 02:ada3 sBox4Mon5CaughtData -02:ada3 sBox4Mon5CaughtLevel -02:ada4 sBox4Mon5CaughtGender 02:ada4 sBox4Mon5CaughtLocation +02:ada4 sBox4Mon5CaughtGender 02:ada5 sBox4Mon5Level -02:ada6 sBox4Mon5BoxEnd 02:ada6 sBox4Mon6Species +02:ada6 sBox4Mon5BoxEnd 02:ada6 sBox4Mon6 02:ada7 sBox4Mon6Item 02:ada8 sBox4Mon6Moves 02:adac sBox4Mon6ID 02:adae sBox4Mon6Exp -02:adb1 sBox4Mon6StatExp 02:adb1 sBox4Mon6HPExp +02:adb1 sBox4Mon6StatExp 02:adb3 sBox4Mon6AtkExp 02:adb5 sBox4Mon6DefExp 02:adb7 sBox4Mon6SpdExp @@ -46879,21 +46879,21 @@ 02:adbd sBox4Mon6PP 02:adc1 sBox4Mon6Happiness 02:adc2 sBox4Mon6PokerusStatus -02:adc3 sBox4Mon6CaughtData -02:adc3 sBox4Mon6CaughtTime 02:adc3 sBox4Mon6CaughtLevel +02:adc3 sBox4Mon6CaughtTime +02:adc3 sBox4Mon6CaughtData 02:adc4 sBox4Mon6CaughtGender 02:adc4 sBox4Mon6CaughtLocation 02:adc5 sBox4Mon6Level -02:adc6 sBox4Mon6BoxEnd 02:adc6 sBox4Mon7 02:adc6 sBox4Mon7Species +02:adc6 sBox4Mon6BoxEnd 02:adc7 sBox4Mon7Item 02:adc8 sBox4Mon7Moves 02:adcc sBox4Mon7ID 02:adce sBox4Mon7Exp -02:add1 sBox4Mon7StatExp 02:add1 sBox4Mon7HPExp +02:add1 sBox4Mon7StatExp 02:add3 sBox4Mon7AtkExp 02:add5 sBox4Mon7DefExp 02:add7 sBox4Mon7SpdExp @@ -46902,21 +46902,21 @@ 02:addd sBox4Mon7PP 02:ade1 sBox4Mon7Happiness 02:ade2 sBox4Mon7PokerusStatus -02:ade3 sBox4Mon7CaughtData 02:ade3 sBox4Mon7CaughtLevel 02:ade3 sBox4Mon7CaughtTime +02:ade3 sBox4Mon7CaughtData 02:ade4 sBox4Mon7CaughtLocation 02:ade4 sBox4Mon7CaughtGender 02:ade5 sBox4Mon7Level 02:ade6 sBox4Mon8 -02:ade6 sBox4Mon7BoxEnd 02:ade6 sBox4Mon8Species +02:ade6 sBox4Mon7BoxEnd 02:ade7 sBox4Mon8Item 02:ade8 sBox4Mon8Moves 02:adec sBox4Mon8ID 02:adee sBox4Mon8Exp -02:adf1 sBox4Mon8StatExp 02:adf1 sBox4Mon8HPExp +02:adf1 sBox4Mon8StatExp 02:adf3 sBox4Mon8AtkExp 02:adf5 sBox4Mon8DefExp 02:adf7 sBox4Mon8SpdExp @@ -48092,8 +48092,8 @@ 02:b768 sBox6Mon15Moves 02:b76c sBox6Mon15ID 02:b76e sBox6Mon15Exp -02:b771 sBox6Mon15StatExp 02:b771 sBox6Mon15HPExp +02:b771 sBox6Mon15StatExp 02:b773 sBox6Mon15AtkExp 02:b775 sBox6Mon15DefExp 02:b777 sBox6Mon15SpdExp @@ -48686,8 +48686,8 @@ 02:bc34 sBox7Mon18CaughtGender 02:bc35 sBox7Mon18Level 02:bc36 sBox7Mon19 -02:bc36 sBox7Mon18BoxEnd 02:bc36 sBox7Mon19Species +02:bc36 sBox7Mon18BoxEnd 02:bc37 sBox7Mon19Item 02:bc38 sBox7Mon19Moves 02:bc3c sBox7Mon19ID @@ -49871,8 +49871,8 @@ 03:a918 sBox10Mon4Moves 03:a91c sBox10Mon4ID 03:a91e sBox10Mon4Exp -03:a921 sBox10Mon4StatExp 03:a921 sBox10Mon4HPExp +03:a921 sBox10Mon4StatExp 03:a923 sBox10Mon4AtkExp 03:a925 sBox10Mon4DefExp 03:a927 sBox10Mon4SpdExp @@ -50049,8 +50049,8 @@ 03:aa14 sBox10Mon11CaughtLocation 03:aa15 sBox10Mon11Level 03:aa16 sBox10Mon12Species -03:aa16 sBox10Mon12 03:aa16 sBox10Mon11BoxEnd +03:aa16 sBox10Mon12 03:aa17 sBox10Mon12Item 03:aa18 sBox10Mon12Moves 03:aa1c sBox10Mon12ID @@ -50442,8 +50442,8 @@ 03:adc4 sBox11Mon6CaughtGender 03:adc5 sBox11Mon6Level 03:adc6 sBox11Mon7 -03:adc6 sBox11Mon7Species 03:adc6 sBox11Mon6BoxEnd +03:adc6 sBox11Mon7Species 03:adc7 sBox11Mon7Item 03:adc8 sBox11Mon7Moves 03:adcc sBox11Mon7ID @@ -50897,9 +50897,9 @@ 03:b1cd sBox12Mon4PP 03:b1d1 sBox12Mon4Happiness 03:b1d2 sBox12Mon4PokerusStatus -03:b1d3 sBox12Mon4CaughtLevel 03:b1d3 sBox12Mon4CaughtData 03:b1d3 sBox12Mon4CaughtTime +03:b1d3 sBox12Mon4CaughtLevel 03:b1d4 sBox12Mon4CaughtGender 03:b1d4 sBox12Mon4CaughtLocation 03:b1d5 sBox12Mon4Level @@ -52282,8 +52282,8 @@ 03:bc71 sBox14Mon20Happiness 03:bc72 sBox14Mon20PokerusStatus 03:bc73 sBox14Mon20CaughtLevel -03:bc73 sBox14Mon20CaughtTime 03:bc73 sBox14Mon20CaughtData +03:bc73 sBox14Mon20CaughtTime 03:bc74 sBox14Mon20CaughtLocation 03:bc74 sBox14Mon20CaughtGender 03:bc75 sBox14Mon20Level @@ -53332,11 +53332,11 @@ 00:c608 wBoxPartialData 00:c608 wTimeSetBuffer 00:c608 wHallOfFameTemp +00:c608 wBT_OTTempName 00:c608 wc608 00:c608 wUnknownGender 00:c608 wDebugLightColor 00:c608 wHallOfFameTempWinCount -00:c608 wBT_OTTempName 00:c608 wMobileMonSender 00:c608 wBT_OTTemp 00:c608 wEnemyMoveStruct @@ -53604,10 +53604,10 @@ 00:c64c wHallOfFameTempMon5DVs 00:c64c wBattleMonStructEnd 00:c64e wBT_OTTempMon2 -00:c64e wHallOfFameTempMon5Level 00:c64e wWildMon 00:c64e wBT_OTTempMon2Species 00:c64e wOfferMonHappiness +00:c64e wHallOfFameTempMon5Level 00:c64f wHallOfFameTempMon5Nickname 00:c64f wBT_OTTempMon2Item 00:c64f wOfferMonPokerusStatus @@ -53668,9 +53668,9 @@ 00:c669 wPlayerSubStatus2 00:c66a wPlayerSubStatus3 00:c66a wBT_OTTempMon2PokerusStatus -00:c66b wPlayerSubStatus4 00:c66b wUnknownMonMailMessageEnd 00:c66b wBT_OTTempMon2CaughtData +00:c66b wPlayerSubStatus4 00:c66b wBT_OTTempMon2CaughtTime 00:c66b wBT_OTTempMon2CaughtLevel 00:c66c wBT_OTTempMon2CaughtLocation @@ -54169,8 +54169,8 @@ 00:c830 wLinkPlayerPartyMon1CaughtData 00:c830 wTimeCapsulePartyMon1PP 00:c830 wLinkPlayerPartyMon1CaughtLevel -00:c831 wHallOfFamePokemonListMon3End 00:c831 wHallOfFamePokemonListMon4Species +00:c831 wHallOfFamePokemonListMon3End 00:c831 wHallOfFamePokemonListMon4 00:c831 wLinkPlayerPartyMon1CaughtGender 00:c831 wLinkPlayerPartyMon1CaughtLocation @@ -54868,12 +54868,12 @@ 00:cf64 wPrevDexEntryJumptableIndex 00:cf64 wcf64 00:cf64 wDebugTilesetCurPalette +00:cf64 wCardFlipCursorY 00:cf64 wStatsScreenFlags 00:cf64 wNrOfBeatenBattleTowerTrainers 00:cf64 wTrainerCardBadgeFrameCounter 00:cf64 wCreditsBorderFrame 00:cf64 wNamingScreenLetterCase -00:cf64 wCardFlipCursorY 00:cf64 wPokegearCard 00:cf64 wPackJumptableIndex 00:cf64 wSlotsDelay @@ -55055,6 +55055,7 @@ 01:d003 wTempPokedexCaughtCount 01:d003 wFinishedPrintingBox 01:d003 wSeerNickname +01:d003 wTownMapCursorCoordinates 01:d003 wMovementBufferObject 01:d003 wPlaceBallsDirection 01:d003 wBillsPCTempListIndex @@ -55063,7 +55064,6 @@ 01:d003 wDebugColorIsShiny 01:d003 wNextRadioLine 01:d003 wPhoneCaller -01:d003 wTownMapCursorCoordinates 01:d004 wAddrOfBoxToPrint 01:d004 wBugContestFirstPlaceScore 01:d004 wTrainerHUDTiles @@ -55095,8 +55095,8 @@ 01:d00c wRadioText 01:d00c wBugContestThirdPlaceScore 01:d00c wMobileParticipant2Nickname -01:d00d wLinkBattleRecordWins 01:d00d wBufferMonOT +01:d00d wLinkBattleRecordWins 01:d00e wMartItem5BCD 01:d00e wBugContestTempWinnerID 01:d00e wSeerCaughtLocation @@ -55296,8 +55296,8 @@ 01:d102 wUnusedNamesPointer 01:d104 wItemAttributesPointer 01:d106 wCurItem -01:d107 wCurItemQuantity 01:d107 wMartItemID +01:d107 wCurItemQuantity 01:d108 wCurPartySpecies 01:d109 wCurPartyMon 01:d10a wWhichHPBar @@ -55436,11 +55436,12 @@ 01:d1ea wFinalCatchRate 01:d1ea wCurDecoration 01:d1ea wCurMailAuthorID -01:d1ea wCurMapScriptBank +01:d1ea wEvolutionOldSpecies 01:d1ea wPPUpPPBuffer 01:d1ea wTempMysteryGiftTimer 01:d1ea wSkipMovesBeforeLevelUp 01:d1ea wExpToNextLevel +01:d1ea wCurMapScriptBank 01:d1ea wFieldMoveData 01:d1ea wHPBuffer1 01:d1ea wCurHPAnimMaxHP @@ -55459,7 +55460,6 @@ 01:d1ea wMagikarpLength 01:d1ea wRestartClockCurDivision 01:d1ea wd1ea -01:d1ea wEvolutionOldSpecies 01:d1eb wHealMachineTempOBP1 01:d1eb wSurfingPlayerState 01:d1eb wPCItemQuantity @@ -55615,8 +55615,8 @@ 01:d269 wTimeOfDay 01:d26b wPokedexShowPointerAddr 01:d26b wUnusedEggHatchFlag -01:d26b wOTPlayerName 01:d26b wOTPartyData +01:d26b wOTPlayerName 01:d26d wPokedexShowPointerBank 01:d271 wd271 01:d276 wOTPlayerID @@ -56292,8 +56292,8 @@ 01:d684 wObject10Field1e 01:d685 wObject10JumpHeight 01:d686 wObject10Range -01:d68e wObject11Struct 01:d68e wObject11Sprite +01:d68e wObject11Struct 01:d68e wObject10StructEnd 01:d68f wObject11MapObjectIndex 01:d690 wObject11SpriteTile @@ -56605,7 +56605,7 @@ 01:d81a wMap15ObjectEventFlag 01:d81e wObjectMasks 01:d82e wVariableSprites -01:d83e wEnteredMapFromContinue +01:d83e wMapNameSignFlags 01:d841 wTimeOfDayPal 01:d846 wTimeOfDayPalFlags 01:d847 wTimeOfDayPalset @@ -57074,8 +57074,8 @@ 01:df0e wBreedMon1Moves 01:df12 wBreedMon1ID 01:df14 wBreedMon1Exp -01:df17 wBreedMon1HPExp 01:df17 wBreedMon1StatExp +01:df17 wBreedMon1HPExp 01:df19 wBreedMon1AtkExp 01:df1b wBreedMon1DefExp 01:df1d wBreedMon1SpdExp @@ -57432,8 +57432,8 @@ 03:d272 w3_d202Mon2Speed 03:d274 w3_d202Mon2SpclAtk 03:d276 w3_d202Mon2SpclDef -03:d278 w3_d202Mon2StructEnd 03:d278 w3_d202Mon2Name +03:d278 w3_d202Mon2StructEnd 03:d283 w3_d202Mon3 03:d283 w3_d202Mon3Species 03:d284 w3_d202Mon3Item @@ -58040,8 +58040,8 @@ 03:d764 w3_d742Mon1PP 03:d768 w3_d742Mon1Happiness 03:d769 w3_d742Mon1PokerusStatus -03:d76a w3_d742Mon1CaughtTime 03:d76a w3_d742Mon1CaughtData +03:d76a w3_d742Mon1CaughtTime 03:d76a w3_d742Mon1CaughtLevel 03:d76b w3_d742Mon1CaughtLocation 03:d76b w3_d742Mon1CaughtGender diff --git a/pokecrystal_au.map b/pokecrystal_au.map index 828481267..38020ad53 100644 --- a/pokecrystal_au.map +++ b/pokecrystal_au.map @@ -565,8 +565,8 @@ ROM0 bank #0: $1c9c = PlaceVerticalMenuItems.loop $1cbb = MenuBox $1cc6 = GetMenuTextStartCoord - $1cd8 = GetMenuTextStartCoord.bit_6_set - $1ce0 = GetMenuTextStartCoord.bit_7_clear + $1cd8 = GetMenuTextStartCoord.no_top_spacing + $1ce0 = GetMenuTextStartCoord.no_cursor $1ce1 = ClearMenuBoxInterior $1cf1 = ClearWholeMenuBox $1cfd = MenuBoxCoord2Tile @@ -612,7 +612,7 @@ ROM0 bank #0: $1ee1 = RunMenuItemPrintingFunction.loop $1efb = RunMenuItemPrintingFunction._hl_ $1eff = InitMenuCursorAndButtonPermissions - $1f0e = InitMenuCursorAndButtonPermissions.disallow_select + $1f0e = InitMenuCursorAndButtonPermissions.disallow_start $1f19 = InitMenuCursorAndButtonPermissions.disallow_left_right $1f1a = GetScrollingMenuJoypad $1f23 = GetStaticMenuJoypad @@ -4538,7 +4538,7 @@ ROMX bank #5: $4089 = StartClock $4097 = StartClock.skip_set $409b = _FixDays - $40a8 = _FixDays.set_bit_7 + $40a8 = _FixDays.reset_rtc $40ae = ClockContinue $40c8 = ClockContinue.time_overflow $40eb = ClockContinue.dont_update @@ -4549,8 +4549,8 @@ ROMX bank #5: $4128 = _InitTime.okay_days $412a = GetEmote2bpp $4135 = _UpdatePlayerSprite - $4146 = _RefreshSprites - $4157 = _ClearSprites + $4146 = LoadStandingSpritesGFX + $4157 = LoadWalkingSpritesGFX $4168 = RefreshSprites $416f = RefreshSprites.Refresh $4183 = GetPlayerSprite @@ -5746,8 +5746,8 @@ ROMX bank #9: $436b = Place2DMenuCursor.cursor_on $4374 = _PushWindow $4387 = _PushWindow.loop - $4398 = _PushWindow.bit_6 - $43ae = _PushWindow.not_bit_7 + $4398 = _PushWindow.backup_tiles + $43ae = _PushWindow.no_backup_tiles $43b5 = _PushWindow.done $43cd = _PushWindow.copy $43d5 = _PushWindow.row @@ -7201,7 +7201,7 @@ ROMX bank #11: $49a8 = _TMHM_ExitPack $49af = TMHM_ExitPocket $49b1 = TMHM_ScrollPocket - $49c5 = TMHM_ScrollPocket.skip + $49c5 = TMHM_ScrollPocket.down $49ca = TMHM_ScrollPocket.loop $49e2 = TMHM_DisplayPocketItems $49fa = TMHM_DisplayPocketItems.loop2 @@ -44097,8 +44097,8 @@ SRAM bank #1: $ade8 = sBoxMon7Moves $adec = sBoxMon7ID $adee = sBoxMon7Exp - $adf1 = sBoxMon7StatExp $adf1 = sBoxMon7HPExp + $adf1 = sBoxMon7StatExp $adf3 = sBoxMon7AtkExp $adf5 = sBoxMon7DefExp $adf7 = sBoxMon7SpdExp @@ -44199,8 +44199,8 @@ SRAM bank #1: $ae7d = sBoxMon11PP $ae81 = sBoxMon11Happiness $ae82 = sBoxMon11PokerusStatus - $ae83 = sBoxMon11CaughtTime $ae83 = sBoxMon11CaughtLevel + $ae83 = sBoxMon11CaughtTime $ae83 = sBoxMon11CaughtData $ae84 = sBoxMon11CaughtGender $ae84 = sBoxMon11CaughtLocation @@ -44361,8 +44361,8 @@ SRAM bank #1: $af61 = sBoxMon18Happiness $af62 = sBoxMon18PokerusStatus $af63 = sBoxMon18CaughtData - $af63 = sBoxMon18CaughtLevel $af63 = sBoxMon18CaughtTime + $af63 = sBoxMon18CaughtLevel $af64 = sBoxMon18CaughtGender $af64 = sBoxMon18CaughtLocation $af65 = sBoxMon18Level @@ -44462,9 +44462,9 @@ SRAM bank #1: $b260 = sLinkBattleStats $b262 = sLinkBattleLosses $b264 = sLinkBattleDraws + $b266 = sLinkBattleRecord1 $b266 = sLinkBattleRecord $b266 = sLinkBattleRecord1ID - $b266 = sLinkBattleRecord1 $b268 = sLinkBattleRecord1Name $b272 = sLinkBattleRecord1Wins $b274 = sLinkBattleRecord1Losses @@ -44951,8 +44951,8 @@ SRAM bank #1: $b689 = sHallOfFame10Mon6Nickname $b693 = sHallOfFame10Mon6End $b693 = sHallOfFame10End - $b694 = sHallOfFame11 $b694 = sHallOfFame11WinCount + $b694 = sHallOfFame11 $b695 = sHallOfFame11Mon1 $b695 = sHallOfFame11Mon1Species $b696 = sHallOfFame11Mon1ID @@ -45268,8 +45268,8 @@ SRAM bank #1: $b941 = sHallOfFame17Mon6End $b942 = sHallOfFame18WinCount $b942 = sHallOfFame18 - $b943 = sHallOfFame18Mon1 $b943 = sHallOfFame18Mon1Species + $b943 = sHallOfFame18Mon1 $b944 = sHallOfFame18Mon1ID $b946 = sHallOfFame18Mon1DVs $b948 = sHallOfFame18Mon1Level @@ -46501,8 +46501,8 @@ SRAM bank #2: $a504 = sBox2Mon5CaughtGender $a504 = sBox2Mon5CaughtLocation $a505 = sBox2Mon5Level - $a506 = sBox2Mon6 $a506 = sBox2Mon5BoxEnd + $a506 = sBox2Mon6 $a506 = sBox2Mon6Species $a507 = sBox2Mon6Item $a508 = sBox2Mon6Moves @@ -46731,8 +46731,8 @@ SRAM bank #2: $a644 = sBox2Mon15CaughtGender $a644 = sBox2Mon15CaughtLocation $a645 = sBox2Mon15Level - $a646 = sBox2Mon16Species $a646 = sBox2Mon15BoxEnd + $a646 = sBox2Mon16Species $a646 = sBox2Mon16 $a647 = sBox2Mon16Item $a648 = sBox2Mon16Moves @@ -47478,8 +47478,8 @@ SRAM bank #2: $ad68 = sBox4Mon4Moves $ad6c = sBox4Mon4ID $ad6e = sBox4Mon4Exp - $ad71 = sBox4Mon4HPExp $ad71 = sBox4Mon4StatExp + $ad71 = sBox4Mon4HPExp $ad73 = sBox4Mon4AtkExp $ad75 = sBox4Mon4DefExp $ad77 = sBox4Mon4SpdExp @@ -47488,21 +47488,21 @@ SRAM bank #2: $ad7d = sBox4Mon4PP $ad81 = sBox4Mon4Happiness $ad82 = sBox4Mon4PokerusStatus - $ad83 = sBox4Mon4CaughtLevel $ad83 = sBox4Mon4CaughtTime $ad83 = sBox4Mon4CaughtData + $ad83 = sBox4Mon4CaughtLevel $ad84 = sBox4Mon4CaughtLocation $ad84 = sBox4Mon4CaughtGender $ad85 = sBox4Mon4Level - $ad86 = sBox4Mon4BoxEnd $ad86 = sBox4Mon5Species + $ad86 = sBox4Mon4BoxEnd $ad86 = sBox4Mon5 $ad87 = sBox4Mon5Item $ad88 = sBox4Mon5Moves $ad8c = sBox4Mon5ID $ad8e = sBox4Mon5Exp - $ad91 = sBox4Mon5StatExp $ad91 = sBox4Mon5HPExp + $ad91 = sBox4Mon5StatExp $ad93 = sBox4Mon5AtkExp $ad95 = sBox4Mon5DefExp $ad97 = sBox4Mon5SpdExp @@ -47511,21 +47511,21 @@ SRAM bank #2: $ad9d = sBox4Mon5PP $ada1 = sBox4Mon5Happiness $ada2 = sBox4Mon5PokerusStatus + $ada3 = sBox4Mon5CaughtLevel $ada3 = sBox4Mon5CaughtTime $ada3 = sBox4Mon5CaughtData - $ada3 = sBox4Mon5CaughtLevel - $ada4 = sBox4Mon5CaughtGender $ada4 = sBox4Mon5CaughtLocation + $ada4 = sBox4Mon5CaughtGender $ada5 = sBox4Mon5Level - $ada6 = sBox4Mon5BoxEnd $ada6 = sBox4Mon6Species + $ada6 = sBox4Mon5BoxEnd $ada6 = sBox4Mon6 $ada7 = sBox4Mon6Item $ada8 = sBox4Mon6Moves $adac = sBox4Mon6ID $adae = sBox4Mon6Exp - $adb1 = sBox4Mon6StatExp $adb1 = sBox4Mon6HPExp + $adb1 = sBox4Mon6StatExp $adb3 = sBox4Mon6AtkExp $adb5 = sBox4Mon6DefExp $adb7 = sBox4Mon6SpdExp @@ -47534,21 +47534,21 @@ SRAM bank #2: $adbd = sBox4Mon6PP $adc1 = sBox4Mon6Happiness $adc2 = sBox4Mon6PokerusStatus - $adc3 = sBox4Mon6CaughtData - $adc3 = sBox4Mon6CaughtTime $adc3 = sBox4Mon6CaughtLevel + $adc3 = sBox4Mon6CaughtTime + $adc3 = sBox4Mon6CaughtData $adc4 = sBox4Mon6CaughtGender $adc4 = sBox4Mon6CaughtLocation $adc5 = sBox4Mon6Level - $adc6 = sBox4Mon6BoxEnd $adc6 = sBox4Mon7 $adc6 = sBox4Mon7Species + $adc6 = sBox4Mon6BoxEnd $adc7 = sBox4Mon7Item $adc8 = sBox4Mon7Moves $adcc = sBox4Mon7ID $adce = sBox4Mon7Exp - $add1 = sBox4Mon7StatExp $add1 = sBox4Mon7HPExp + $add1 = sBox4Mon7StatExp $add3 = sBox4Mon7AtkExp $add5 = sBox4Mon7DefExp $add7 = sBox4Mon7SpdExp @@ -47557,21 +47557,21 @@ SRAM bank #2: $addd = sBox4Mon7PP $ade1 = sBox4Mon7Happiness $ade2 = sBox4Mon7PokerusStatus - $ade3 = sBox4Mon7CaughtData $ade3 = sBox4Mon7CaughtLevel $ade3 = sBox4Mon7CaughtTime + $ade3 = sBox4Mon7CaughtData $ade4 = sBox4Mon7CaughtLocation $ade4 = sBox4Mon7CaughtGender $ade5 = sBox4Mon7Level $ade6 = sBox4Mon8 - $ade6 = sBox4Mon7BoxEnd $ade6 = sBox4Mon8Species + $ade6 = sBox4Mon7BoxEnd $ade7 = sBox4Mon8Item $ade8 = sBox4Mon8Moves $adec = sBox4Mon8ID $adee = sBox4Mon8Exp - $adf1 = sBox4Mon8StatExp $adf1 = sBox4Mon8HPExp + $adf1 = sBox4Mon8StatExp $adf3 = sBox4Mon8AtkExp $adf5 = sBox4Mon8DefExp $adf7 = sBox4Mon8SpdExp @@ -48747,8 +48747,8 @@ SRAM bank #2: $b768 = sBox6Mon15Moves $b76c = sBox6Mon15ID $b76e = sBox6Mon15Exp - $b771 = sBox6Mon15StatExp $b771 = sBox6Mon15HPExp + $b771 = sBox6Mon15StatExp $b773 = sBox6Mon15AtkExp $b775 = sBox6Mon15DefExp $b777 = sBox6Mon15SpdExp @@ -49341,8 +49341,8 @@ SRAM bank #2: $bc34 = sBox7Mon18CaughtGender $bc35 = sBox7Mon18Level $bc36 = sBox7Mon19 - $bc36 = sBox7Mon18BoxEnd $bc36 = sBox7Mon19Species + $bc36 = sBox7Mon18BoxEnd $bc37 = sBox7Mon19Item $bc38 = sBox7Mon19Moves $bc3c = sBox7Mon19ID @@ -50531,8 +50531,8 @@ SRAM bank #3: $a918 = sBox10Mon4Moves $a91c = sBox10Mon4ID $a91e = sBox10Mon4Exp - $a921 = sBox10Mon4StatExp $a921 = sBox10Mon4HPExp + $a921 = sBox10Mon4StatExp $a923 = sBox10Mon4AtkExp $a925 = sBox10Mon4DefExp $a927 = sBox10Mon4SpdExp @@ -50709,8 +50709,8 @@ SRAM bank #3: $aa14 = sBox10Mon11CaughtLocation $aa15 = sBox10Mon11Level $aa16 = sBox10Mon12Species - $aa16 = sBox10Mon12 $aa16 = sBox10Mon11BoxEnd + $aa16 = sBox10Mon12 $aa17 = sBox10Mon12Item $aa18 = sBox10Mon12Moves $aa1c = sBox10Mon12ID @@ -51102,8 +51102,8 @@ SRAM bank #3: $adc4 = sBox11Mon6CaughtGender $adc5 = sBox11Mon6Level $adc6 = sBox11Mon7 - $adc6 = sBox11Mon7Species $adc6 = sBox11Mon6BoxEnd + $adc6 = sBox11Mon7Species $adc7 = sBox11Mon7Item $adc8 = sBox11Mon7Moves $adcc = sBox11Mon7ID @@ -51557,9 +51557,9 @@ SRAM bank #3: $b1cd = sBox12Mon4PP $b1d1 = sBox12Mon4Happiness $b1d2 = sBox12Mon4PokerusStatus - $b1d3 = sBox12Mon4CaughtLevel $b1d3 = sBox12Mon4CaughtData $b1d3 = sBox12Mon4CaughtTime + $b1d3 = sBox12Mon4CaughtLevel $b1d4 = sBox12Mon4CaughtGender $b1d4 = sBox12Mon4CaughtLocation $b1d5 = sBox12Mon4Level @@ -52942,8 +52942,8 @@ SRAM bank #3: $bc71 = sBox14Mon20Happiness $bc72 = sBox14Mon20PokerusStatus $bc73 = sBox14Mon20CaughtLevel - $bc73 = sBox14Mon20CaughtTime $bc73 = sBox14Mon20CaughtData + $bc73 = sBox14Mon20CaughtTime $bc74 = sBox14Mon20CaughtLocation $bc74 = sBox14Mon20CaughtGender $bc75 = sBox14Mon20Level @@ -54023,11 +54023,11 @@ WRAM0 bank #0: $c608 = wBoxPartialData $c608 = wTimeSetBuffer $c608 = wHallOfFameTemp + $c608 = wBT_OTTempName $c608 = wc608 $c608 = wUnknownGender $c608 = wDebugLightColor $c608 = wHallOfFameTempWinCount - $c608 = wBT_OTTempName $c608 = wMobileMonSender $c608 = wBT_OTTemp $c608 = wEnemyMoveStruct @@ -54295,10 +54295,10 @@ WRAM0 bank #0: $c64c = wHallOfFameTempMon5DVs $c64c = wBattleMonStructEnd $c64e = wBT_OTTempMon2 - $c64e = wHallOfFameTempMon5Level $c64e = wWildMon $c64e = wBT_OTTempMon2Species $c64e = wOfferMonHappiness + $c64e = wHallOfFameTempMon5Level $c64f = wHallOfFameTempMon5Nickname $c64f = wBT_OTTempMon2Item $c64f = wOfferMonPokerusStatus @@ -54359,9 +54359,9 @@ WRAM0 bank #0: $c669 = wPlayerSubStatus2 $c66a = wPlayerSubStatus3 $c66a = wBT_OTTempMon2PokerusStatus - $c66b = wPlayerSubStatus4 $c66b = wUnknownMonMailMessageEnd $c66b = wBT_OTTempMon2CaughtData + $c66b = wPlayerSubStatus4 $c66b = wBT_OTTempMon2CaughtTime $c66b = wBT_OTTempMon2CaughtLevel $c66c = wBT_OTTempMon2CaughtLocation @@ -54862,8 +54862,8 @@ WRAM0 bank #0: $c830 = wLinkPlayerPartyMon1CaughtData $c830 = wTimeCapsulePartyMon1PP $c830 = wLinkPlayerPartyMon1CaughtLevel - $c831 = wHallOfFamePokemonListMon3End $c831 = wHallOfFamePokemonListMon4Species + $c831 = wHallOfFamePokemonListMon3End $c831 = wHallOfFamePokemonListMon4 $c831 = wLinkPlayerPartyMon1CaughtGender $c831 = wLinkPlayerPartyMon1CaughtLocation @@ -55563,12 +55563,12 @@ WRAM0 bank #0: $cf64 = wPrevDexEntryJumptableIndex $cf64 = wcf64 $cf64 = wDebugTilesetCurPalette + $cf64 = wCardFlipCursorY $cf64 = wStatsScreenFlags $cf64 = wNrOfBeatenBattleTowerTrainers $cf64 = wTrainerCardBadgeFrameCounter $cf64 = wCreditsBorderFrame $cf64 = wNamingScreenLetterCase - $cf64 = wCardFlipCursorY $cf64 = wPokegearCard $cf64 = wPackJumptableIndex $cf64 = wSlotsDelay @@ -55756,6 +55756,7 @@ WRAMX bank #1: $d003 = wTempPokedexCaughtCount $d003 = wFinishedPrintingBox $d003 = wSeerNickname + $d003 = wTownMapCursorCoordinates $d003 = wMovementBufferObject $d003 = wPlaceBallsDirection $d003 = wBillsPCTempListIndex @@ -55764,7 +55765,6 @@ WRAMX bank #1: $d003 = wDebugColorIsShiny $d003 = wNextRadioLine $d003 = wPhoneCaller - $d003 = wTownMapCursorCoordinates $d004 = wAddrOfBoxToPrint $d004 = wBugContestFirstPlaceScore $d004 = wTrainerHUDTiles @@ -55796,8 +55796,8 @@ WRAMX bank #1: $d00c = wRadioText $d00c = wBugContestThirdPlaceScore $d00c = wMobileParticipant2Nickname - $d00d = wLinkBattleRecordWins $d00d = wBufferMonOT + $d00d = wLinkBattleRecordWins $d00e = wMartItem5BCD $d00e = wBugContestTempWinnerID $d00e = wSeerCaughtLocation @@ -55998,8 +55998,8 @@ WRAMX bank #1: $d102 = wUnusedNamesPointer $d104 = wItemAttributesPointer $d106 = wCurItem - $d107 = wCurItemQuantity $d107 = wMartItemID + $d107 = wCurItemQuantity $d108 = wCurPartySpecies $d109 = wCurPartyMon $d10a = wWhichHPBar @@ -56137,12 +56137,13 @@ WRAMX bank #1: $d1ea = wListMovesLineSpacing $d1ea = wFinalCatchRate $d1ea = wCurDecoration - $d1ea = wCurMapScriptBank $d1ea = wCurMailAuthorID + $d1ea = wEvolutionOldSpecies $d1ea = wPPUpPPBuffer $d1ea = wTempMysteryGiftTimer $d1ea = wSkipMovesBeforeLevelUp $d1ea = wExpToNextLevel + $d1ea = wCurMapScriptBank $d1ea = wFieldMoveData $d1ea = wHPBuffer1 $d1ea = wCurHPAnimMaxHP @@ -56161,7 +56162,6 @@ WRAMX bank #1: $d1ea = wMagikarpLength $d1ea = wRestartClockCurDivision $d1ea = wd1ea - $d1ea = wEvolutionOldSpecies $d1eb = wHealMachineTempOBP1 $d1eb = wSurfingPlayerState $d1eb = wPCItemQuantity @@ -56318,8 +56318,8 @@ WRAMX bank #1: SECTION: $d26b-$dcd6 ($0a6c bytes) ["Enemy Party"] $d26b = wPokedexShowPointerAddr $d26b = wUnusedEggHatchFlag - $d26b = wOTPlayerName $d26b = wOTPartyData + $d26b = wOTPlayerName $d26d = wPokedexShowPointerBank $d271 = wd271 $d276 = wOTPlayerID @@ -56995,8 +56995,8 @@ WRAMX bank #1: $d684 = wObject10Field1e $d685 = wObject10JumpHeight $d686 = wObject10Range - $d68e = wObject11Struct $d68e = wObject11Sprite + $d68e = wObject11Struct $d68e = wObject10StructEnd $d68f = wObject11MapObjectIndex $d690 = wObject11SpriteTile @@ -57308,7 +57308,7 @@ WRAMX bank #1: $d81a = wMap15ObjectEventFlag $d81e = wObjectMasks $d82e = wVariableSprites - $d83e = wEnteredMapFromContinue + $d83e = wMapNameSignFlags $d841 = wTimeOfDayPal $d846 = wTimeOfDayPalFlags $d847 = wTimeOfDayPalset @@ -57778,8 +57778,8 @@ WRAMX bank #1: $df0e = wBreedMon1Moves $df12 = wBreedMon1ID $df14 = wBreedMon1Exp - $df17 = wBreedMon1HPExp $df17 = wBreedMon1StatExp + $df17 = wBreedMon1HPExp $df19 = wBreedMon1AtkExp $df1b = wBreedMon1DefExp $df1d = wBreedMon1SpdExp @@ -58146,8 +58146,8 @@ WRAMX bank #3: $d272 = w3_d202Mon2Speed $d274 = w3_d202Mon2SpclAtk $d276 = w3_d202Mon2SpclDef - $d278 = w3_d202Mon2StructEnd $d278 = w3_d202Mon2Name + $d278 = w3_d202Mon2StructEnd $d283 = w3_d202Mon3 $d283 = w3_d202Mon3Species $d284 = w3_d202Mon3Item @@ -58754,8 +58754,8 @@ WRAMX bank #3: $d764 = w3_d742Mon1PP $d768 = w3_d742Mon1Happiness $d769 = w3_d742Mon1PokerusStatus - $d76a = w3_d742Mon1CaughtTime $d76a = w3_d742Mon1CaughtData + $d76a = w3_d742Mon1CaughtTime $d76a = w3_d742Mon1CaughtLevel $d76b = w3_d742Mon1CaughtLocation $d76b = w3_d742Mon1CaughtGender diff --git a/pokecrystal_au.sym b/pokecrystal_au.sym index eb793f841..15cd071bf 100644 --- a/pokecrystal_au.sym +++ b/pokecrystal_au.sym @@ -530,8 +530,8 @@ 00:1c9c PlaceVerticalMenuItems.loop 00:1cbb MenuBox 00:1cc6 GetMenuTextStartCoord -00:1cd8 GetMenuTextStartCoord.bit_6_set -00:1ce0 GetMenuTextStartCoord.bit_7_clear +00:1cd8 GetMenuTextStartCoord.no_top_spacing +00:1ce0 GetMenuTextStartCoord.no_cursor 00:1ce1 ClearMenuBoxInterior 00:1cf1 ClearWholeMenuBox 00:1cfd MenuBoxCoord2Tile @@ -577,7 +577,7 @@ 00:1ee1 RunMenuItemPrintingFunction.loop 00:1efb RunMenuItemPrintingFunction._hl_ 00:1eff InitMenuCursorAndButtonPermissions -00:1f0e InitMenuCursorAndButtonPermissions.disallow_select +00:1f0e InitMenuCursorAndButtonPermissions.disallow_start 00:1f19 InitMenuCursorAndButtonPermissions.disallow_left_right 00:1f1a GetScrollingMenuJoypad 00:1f23 GetStaticMenuJoypad @@ -4478,7 +4478,7 @@ 05:4089 StartClock 05:4097 StartClock.skip_set 05:409b _FixDays -05:40a8 _FixDays.set_bit_7 +05:40a8 _FixDays.reset_rtc 05:40ae ClockContinue 05:40c8 ClockContinue.time_overflow 05:40eb ClockContinue.dont_update @@ -4489,8 +4489,8 @@ 05:4128 _InitTime.okay_days 05:412a GetEmote2bpp 05:4135 _UpdatePlayerSprite -05:4146 _RefreshSprites -05:4157 _ClearSprites +05:4146 LoadStandingSpritesGFX +05:4157 LoadWalkingSpritesGFX 05:4168 RefreshSprites 05:416f RefreshSprites.Refresh 05:4183 GetPlayerSprite @@ -5662,8 +5662,8 @@ 09:436b Place2DMenuCursor.cursor_on 09:4374 _PushWindow 09:4387 _PushWindow.loop -09:4398 _PushWindow.bit_6 -09:43ae _PushWindow.not_bit_7 +09:4398 _PushWindow.backup_tiles +09:43ae _PushWindow.no_backup_tiles 09:43b5 _PushWindow.done 09:43cd _PushWindow.copy 09:43d5 _PushWindow.row @@ -7106,7 +7106,7 @@ 0b:49a8 _TMHM_ExitPack 0b:49af TMHM_ExitPocket 0b:49b1 TMHM_ScrollPocket -0b:49c5 TMHM_ScrollPocket.skip +0b:49c5 TMHM_ScrollPocket.down 0b:49ca TMHM_ScrollPocket.loop 0b:49e2 TMHM_DisplayPocketItems 0b:49fa TMHM_DisplayPocketItems.loop2 @@ -43380,8 +43380,8 @@ 01:ade8 sBoxMon7Moves 01:adec sBoxMon7ID 01:adee sBoxMon7Exp -01:adf1 sBoxMon7StatExp 01:adf1 sBoxMon7HPExp +01:adf1 sBoxMon7StatExp 01:adf3 sBoxMon7AtkExp 01:adf5 sBoxMon7DefExp 01:adf7 sBoxMon7SpdExp @@ -43482,8 +43482,8 @@ 01:ae7d sBoxMon11PP 01:ae81 sBoxMon11Happiness 01:ae82 sBoxMon11PokerusStatus -01:ae83 sBoxMon11CaughtTime 01:ae83 sBoxMon11CaughtLevel +01:ae83 sBoxMon11CaughtTime 01:ae83 sBoxMon11CaughtData 01:ae84 sBoxMon11CaughtGender 01:ae84 sBoxMon11CaughtLocation @@ -43644,8 +43644,8 @@ 01:af61 sBoxMon18Happiness 01:af62 sBoxMon18PokerusStatus 01:af63 sBoxMon18CaughtData -01:af63 sBoxMon18CaughtLevel 01:af63 sBoxMon18CaughtTime +01:af63 sBoxMon18CaughtLevel 01:af64 sBoxMon18CaughtGender 01:af64 sBoxMon18CaughtLocation 01:af65 sBoxMon18Level @@ -43744,9 +43744,9 @@ 01:b260 sLinkBattleStats 01:b262 sLinkBattleLosses 01:b264 sLinkBattleDraws +01:b266 sLinkBattleRecord1 01:b266 sLinkBattleRecord 01:b266 sLinkBattleRecord1ID -01:b266 sLinkBattleRecord1 01:b268 sLinkBattleRecord1Name 01:b272 sLinkBattleRecord1Wins 01:b274 sLinkBattleRecord1Losses @@ -44232,8 +44232,8 @@ 01:b689 sHallOfFame10Mon6Nickname 01:b693 sHallOfFame10Mon6End 01:b693 sHallOfFame10End -01:b694 sHallOfFame11 01:b694 sHallOfFame11WinCount +01:b694 sHallOfFame11 01:b695 sHallOfFame11Mon1 01:b695 sHallOfFame11Mon1Species 01:b696 sHallOfFame11Mon1ID @@ -44549,8 +44549,8 @@ 01:b941 sHallOfFame17Mon6End 01:b942 sHallOfFame18WinCount 01:b942 sHallOfFame18 -01:b943 sHallOfFame18Mon1 01:b943 sHallOfFame18Mon1Species +01:b943 sHallOfFame18Mon1 01:b944 sHallOfFame18Mon1ID 01:b946 sHallOfFame18Mon1DVs 01:b948 sHallOfFame18Mon1Level @@ -45775,8 +45775,8 @@ 02:a504 sBox2Mon5CaughtGender 02:a504 sBox2Mon5CaughtLocation 02:a505 sBox2Mon5Level -02:a506 sBox2Mon6 02:a506 sBox2Mon5BoxEnd +02:a506 sBox2Mon6 02:a506 sBox2Mon6Species 02:a507 sBox2Mon6Item 02:a508 sBox2Mon6Moves @@ -46005,8 +46005,8 @@ 02:a644 sBox2Mon15CaughtGender 02:a644 sBox2Mon15CaughtLocation 02:a645 sBox2Mon15Level -02:a646 sBox2Mon16Species 02:a646 sBox2Mon15BoxEnd +02:a646 sBox2Mon16Species 02:a646 sBox2Mon16 02:a647 sBox2Mon16Item 02:a648 sBox2Mon16Moves @@ -46752,8 +46752,8 @@ 02:ad68 sBox4Mon4Moves 02:ad6c sBox4Mon4ID 02:ad6e sBox4Mon4Exp -02:ad71 sBox4Mon4HPExp 02:ad71 sBox4Mon4StatExp +02:ad71 sBox4Mon4HPExp 02:ad73 sBox4Mon4AtkExp 02:ad75 sBox4Mon4DefExp 02:ad77 sBox4Mon4SpdExp @@ -46762,21 +46762,21 @@ 02:ad7d sBox4Mon4PP 02:ad81 sBox4Mon4Happiness 02:ad82 sBox4Mon4PokerusStatus -02:ad83 sBox4Mon4CaughtLevel 02:ad83 sBox4Mon4CaughtTime 02:ad83 sBox4Mon4CaughtData +02:ad83 sBox4Mon4CaughtLevel 02:ad84 sBox4Mon4CaughtLocation 02:ad84 sBox4Mon4CaughtGender 02:ad85 sBox4Mon4Level -02:ad86 sBox4Mon4BoxEnd 02:ad86 sBox4Mon5Species +02:ad86 sBox4Mon4BoxEnd 02:ad86 sBox4Mon5 02:ad87 sBox4Mon5Item 02:ad88 sBox4Mon5Moves 02:ad8c sBox4Mon5ID 02:ad8e sBox4Mon5Exp -02:ad91 sBox4Mon5StatExp 02:ad91 sBox4Mon5HPExp +02:ad91 sBox4Mon5StatExp 02:ad93 sBox4Mon5AtkExp 02:ad95 sBox4Mon5DefExp 02:ad97 sBox4Mon5SpdExp @@ -46785,21 +46785,21 @@ 02:ad9d sBox4Mon5PP 02:ada1 sBox4Mon5Happiness 02:ada2 sBox4Mon5PokerusStatus +02:ada3 sBox4Mon5CaughtLevel 02:ada3 sBox4Mon5CaughtTime 02:ada3 sBox4Mon5CaughtData -02:ada3 sBox4Mon5CaughtLevel -02:ada4 sBox4Mon5CaughtGender 02:ada4 sBox4Mon5CaughtLocation +02:ada4 sBox4Mon5CaughtGender 02:ada5 sBox4Mon5Level -02:ada6 sBox4Mon5BoxEnd 02:ada6 sBox4Mon6Species +02:ada6 sBox4Mon5BoxEnd 02:ada6 sBox4Mon6 02:ada7 sBox4Mon6Item 02:ada8 sBox4Mon6Moves 02:adac sBox4Mon6ID 02:adae sBox4Mon6Exp -02:adb1 sBox4Mon6StatExp 02:adb1 sBox4Mon6HPExp +02:adb1 sBox4Mon6StatExp 02:adb3 sBox4Mon6AtkExp 02:adb5 sBox4Mon6DefExp 02:adb7 sBox4Mon6SpdExp @@ -46808,21 +46808,21 @@ 02:adbd sBox4Mon6PP 02:adc1 sBox4Mon6Happiness 02:adc2 sBox4Mon6PokerusStatus -02:adc3 sBox4Mon6CaughtData -02:adc3 sBox4Mon6CaughtTime 02:adc3 sBox4Mon6CaughtLevel +02:adc3 sBox4Mon6CaughtTime +02:adc3 sBox4Mon6CaughtData 02:adc4 sBox4Mon6CaughtGender 02:adc4 sBox4Mon6CaughtLocation 02:adc5 sBox4Mon6Level -02:adc6 sBox4Mon6BoxEnd 02:adc6 sBox4Mon7 02:adc6 sBox4Mon7Species +02:adc6 sBox4Mon6BoxEnd 02:adc7 sBox4Mon7Item 02:adc8 sBox4Mon7Moves 02:adcc sBox4Mon7ID 02:adce sBox4Mon7Exp -02:add1 sBox4Mon7StatExp 02:add1 sBox4Mon7HPExp +02:add1 sBox4Mon7StatExp 02:add3 sBox4Mon7AtkExp 02:add5 sBox4Mon7DefExp 02:add7 sBox4Mon7SpdExp @@ -46831,21 +46831,21 @@ 02:addd sBox4Mon7PP 02:ade1 sBox4Mon7Happiness 02:ade2 sBox4Mon7PokerusStatus -02:ade3 sBox4Mon7CaughtData 02:ade3 sBox4Mon7CaughtLevel 02:ade3 sBox4Mon7CaughtTime +02:ade3 sBox4Mon7CaughtData 02:ade4 sBox4Mon7CaughtLocation 02:ade4 sBox4Mon7CaughtGender 02:ade5 sBox4Mon7Level 02:ade6 sBox4Mon8 -02:ade6 sBox4Mon7BoxEnd 02:ade6 sBox4Mon8Species +02:ade6 sBox4Mon7BoxEnd 02:ade7 sBox4Mon8Item 02:ade8 sBox4Mon8Moves 02:adec sBox4Mon8ID 02:adee sBox4Mon8Exp -02:adf1 sBox4Mon8StatExp 02:adf1 sBox4Mon8HPExp +02:adf1 sBox4Mon8StatExp 02:adf3 sBox4Mon8AtkExp 02:adf5 sBox4Mon8DefExp 02:adf7 sBox4Mon8SpdExp @@ -48021,8 +48021,8 @@ 02:b768 sBox6Mon15Moves 02:b76c sBox6Mon15ID 02:b76e sBox6Mon15Exp -02:b771 sBox6Mon15StatExp 02:b771 sBox6Mon15HPExp +02:b771 sBox6Mon15StatExp 02:b773 sBox6Mon15AtkExp 02:b775 sBox6Mon15DefExp 02:b777 sBox6Mon15SpdExp @@ -48615,8 +48615,8 @@ 02:bc34 sBox7Mon18CaughtGender 02:bc35 sBox7Mon18Level 02:bc36 sBox7Mon19 -02:bc36 sBox7Mon18BoxEnd 02:bc36 sBox7Mon19Species +02:bc36 sBox7Mon18BoxEnd 02:bc37 sBox7Mon19Item 02:bc38 sBox7Mon19Moves 02:bc3c sBox7Mon19ID @@ -49800,8 +49800,8 @@ 03:a918 sBox10Mon4Moves 03:a91c sBox10Mon4ID 03:a91e sBox10Mon4Exp -03:a921 sBox10Mon4StatExp 03:a921 sBox10Mon4HPExp +03:a921 sBox10Mon4StatExp 03:a923 sBox10Mon4AtkExp 03:a925 sBox10Mon4DefExp 03:a927 sBox10Mon4SpdExp @@ -49978,8 +49978,8 @@ 03:aa14 sBox10Mon11CaughtLocation 03:aa15 sBox10Mon11Level 03:aa16 sBox10Mon12Species -03:aa16 sBox10Mon12 03:aa16 sBox10Mon11BoxEnd +03:aa16 sBox10Mon12 03:aa17 sBox10Mon12Item 03:aa18 sBox10Mon12Moves 03:aa1c sBox10Mon12ID @@ -50371,8 +50371,8 @@ 03:adc4 sBox11Mon6CaughtGender 03:adc5 sBox11Mon6Level 03:adc6 sBox11Mon7 -03:adc6 sBox11Mon7Species 03:adc6 sBox11Mon6BoxEnd +03:adc6 sBox11Mon7Species 03:adc7 sBox11Mon7Item 03:adc8 sBox11Mon7Moves 03:adcc sBox11Mon7ID @@ -50826,9 +50826,9 @@ 03:b1cd sBox12Mon4PP 03:b1d1 sBox12Mon4Happiness 03:b1d2 sBox12Mon4PokerusStatus -03:b1d3 sBox12Mon4CaughtLevel 03:b1d3 sBox12Mon4CaughtData 03:b1d3 sBox12Mon4CaughtTime +03:b1d3 sBox12Mon4CaughtLevel 03:b1d4 sBox12Mon4CaughtGender 03:b1d4 sBox12Mon4CaughtLocation 03:b1d5 sBox12Mon4Level @@ -52211,8 +52211,8 @@ 03:bc71 sBox14Mon20Happiness 03:bc72 sBox14Mon20PokerusStatus 03:bc73 sBox14Mon20CaughtLevel -03:bc73 sBox14Mon20CaughtTime 03:bc73 sBox14Mon20CaughtData +03:bc73 sBox14Mon20CaughtTime 03:bc74 sBox14Mon20CaughtLocation 03:bc74 sBox14Mon20CaughtGender 03:bc75 sBox14Mon20Level @@ -53261,11 +53261,11 @@ 00:c608 wBoxPartialData 00:c608 wTimeSetBuffer 00:c608 wHallOfFameTemp +00:c608 wBT_OTTempName 00:c608 wc608 00:c608 wUnknownGender 00:c608 wDebugLightColor 00:c608 wHallOfFameTempWinCount -00:c608 wBT_OTTempName 00:c608 wMobileMonSender 00:c608 wBT_OTTemp 00:c608 wEnemyMoveStruct @@ -53533,10 +53533,10 @@ 00:c64c wHallOfFameTempMon5DVs 00:c64c wBattleMonStructEnd 00:c64e wBT_OTTempMon2 -00:c64e wHallOfFameTempMon5Level 00:c64e wWildMon 00:c64e wBT_OTTempMon2Species 00:c64e wOfferMonHappiness +00:c64e wHallOfFameTempMon5Level 00:c64f wHallOfFameTempMon5Nickname 00:c64f wBT_OTTempMon2Item 00:c64f wOfferMonPokerusStatus @@ -53597,9 +53597,9 @@ 00:c669 wPlayerSubStatus2 00:c66a wPlayerSubStatus3 00:c66a wBT_OTTempMon2PokerusStatus -00:c66b wPlayerSubStatus4 00:c66b wUnknownMonMailMessageEnd 00:c66b wBT_OTTempMon2CaughtData +00:c66b wPlayerSubStatus4 00:c66b wBT_OTTempMon2CaughtTime 00:c66b wBT_OTTempMon2CaughtLevel 00:c66c wBT_OTTempMon2CaughtLocation @@ -54098,8 +54098,8 @@ 00:c830 wLinkPlayerPartyMon1CaughtData 00:c830 wTimeCapsulePartyMon1PP 00:c830 wLinkPlayerPartyMon1CaughtLevel -00:c831 wHallOfFamePokemonListMon3End 00:c831 wHallOfFamePokemonListMon4Species +00:c831 wHallOfFamePokemonListMon3End 00:c831 wHallOfFamePokemonListMon4 00:c831 wLinkPlayerPartyMon1CaughtGender 00:c831 wLinkPlayerPartyMon1CaughtLocation @@ -54797,12 +54797,12 @@ 00:cf64 wPrevDexEntryJumptableIndex 00:cf64 wcf64 00:cf64 wDebugTilesetCurPalette +00:cf64 wCardFlipCursorY 00:cf64 wStatsScreenFlags 00:cf64 wNrOfBeatenBattleTowerTrainers 00:cf64 wTrainerCardBadgeFrameCounter 00:cf64 wCreditsBorderFrame 00:cf64 wNamingScreenLetterCase -00:cf64 wCardFlipCursorY 00:cf64 wPokegearCard 00:cf64 wPackJumptableIndex 00:cf64 wSlotsDelay @@ -54984,6 +54984,7 @@ 01:d003 wTempPokedexCaughtCount 01:d003 wFinishedPrintingBox 01:d003 wSeerNickname +01:d003 wTownMapCursorCoordinates 01:d003 wMovementBufferObject 01:d003 wPlaceBallsDirection 01:d003 wBillsPCTempListIndex @@ -54992,7 +54993,6 @@ 01:d003 wDebugColorIsShiny 01:d003 wNextRadioLine 01:d003 wPhoneCaller -01:d003 wTownMapCursorCoordinates 01:d004 wAddrOfBoxToPrint 01:d004 wBugContestFirstPlaceScore 01:d004 wTrainerHUDTiles @@ -55024,8 +55024,8 @@ 01:d00c wRadioText 01:d00c wBugContestThirdPlaceScore 01:d00c wMobileParticipant2Nickname -01:d00d wLinkBattleRecordWins 01:d00d wBufferMonOT +01:d00d wLinkBattleRecordWins 01:d00e wMartItem5BCD 01:d00e wBugContestTempWinnerID 01:d00e wSeerCaughtLocation @@ -55225,8 +55225,8 @@ 01:d102 wUnusedNamesPointer 01:d104 wItemAttributesPointer 01:d106 wCurItem -01:d107 wCurItemQuantity 01:d107 wMartItemID +01:d107 wCurItemQuantity 01:d108 wCurPartySpecies 01:d109 wCurPartyMon 01:d10a wWhichHPBar @@ -55364,12 +55364,13 @@ 01:d1ea wListMovesLineSpacing 01:d1ea wFinalCatchRate 01:d1ea wCurDecoration -01:d1ea wCurMapScriptBank 01:d1ea wCurMailAuthorID +01:d1ea wEvolutionOldSpecies 01:d1ea wPPUpPPBuffer 01:d1ea wTempMysteryGiftTimer 01:d1ea wSkipMovesBeforeLevelUp 01:d1ea wExpToNextLevel +01:d1ea wCurMapScriptBank 01:d1ea wFieldMoveData 01:d1ea wHPBuffer1 01:d1ea wCurHPAnimMaxHP @@ -55388,7 +55389,6 @@ 01:d1ea wMagikarpLength 01:d1ea wRestartClockCurDivision 01:d1ea wd1ea -01:d1ea wEvolutionOldSpecies 01:d1eb wHealMachineTempOBP1 01:d1eb wSurfingPlayerState 01:d1eb wPCItemQuantity @@ -55544,8 +55544,8 @@ 01:d269 wTimeOfDay 01:d26b wPokedexShowPointerAddr 01:d26b wUnusedEggHatchFlag -01:d26b wOTPlayerName 01:d26b wOTPartyData +01:d26b wOTPlayerName 01:d26d wPokedexShowPointerBank 01:d271 wd271 01:d276 wOTPlayerID @@ -56221,8 +56221,8 @@ 01:d684 wObject10Field1e 01:d685 wObject10JumpHeight 01:d686 wObject10Range -01:d68e wObject11Struct 01:d68e wObject11Sprite +01:d68e wObject11Struct 01:d68e wObject10StructEnd 01:d68f wObject11MapObjectIndex 01:d690 wObject11SpriteTile @@ -56534,7 +56534,7 @@ 01:d81a wMap15ObjectEventFlag 01:d81e wObjectMasks 01:d82e wVariableSprites -01:d83e wEnteredMapFromContinue +01:d83e wMapNameSignFlags 01:d841 wTimeOfDayPal 01:d846 wTimeOfDayPalFlags 01:d847 wTimeOfDayPalset @@ -57003,8 +57003,8 @@ 01:df0e wBreedMon1Moves 01:df12 wBreedMon1ID 01:df14 wBreedMon1Exp -01:df17 wBreedMon1HPExp 01:df17 wBreedMon1StatExp +01:df17 wBreedMon1HPExp 01:df19 wBreedMon1AtkExp 01:df1b wBreedMon1DefExp 01:df1d wBreedMon1SpdExp @@ -57361,8 +57361,8 @@ 03:d272 w3_d202Mon2Speed 03:d274 w3_d202Mon2SpclAtk 03:d276 w3_d202Mon2SpclDef -03:d278 w3_d202Mon2StructEnd 03:d278 w3_d202Mon2Name +03:d278 w3_d202Mon2StructEnd 03:d283 w3_d202Mon3 03:d283 w3_d202Mon3Species 03:d284 w3_d202Mon3Item @@ -57969,8 +57969,8 @@ 03:d764 w3_d742Mon1PP 03:d768 w3_d742Mon1Happiness 03:d769 w3_d742Mon1PokerusStatus -03:d76a w3_d742Mon1CaughtTime 03:d76a w3_d742Mon1CaughtData +03:d76a w3_d742Mon1CaughtTime 03:d76a w3_d742Mon1CaughtLevel 03:d76b w3_d742Mon1CaughtLocation 03:d76b w3_d742Mon1CaughtGender diff --git a/pokecrystal_debug.map b/pokecrystal_debug.map index 9d7431a57..6fd9ded67 100644 --- a/pokecrystal_debug.map +++ b/pokecrystal_debug.map @@ -565,8 +565,8 @@ ROM0 bank #0: $1c9c = PlaceVerticalMenuItems.loop $1cbb = MenuBox $1cc6 = GetMenuTextStartCoord - $1cd8 = GetMenuTextStartCoord.bit_6_set - $1ce0 = GetMenuTextStartCoord.bit_7_clear + $1cd8 = GetMenuTextStartCoord.no_top_spacing + $1ce0 = GetMenuTextStartCoord.no_cursor $1ce1 = ClearMenuBoxInterior $1cf1 = ClearWholeMenuBox $1cfd = MenuBoxCoord2Tile @@ -612,7 +612,7 @@ ROM0 bank #0: $1ee1 = RunMenuItemPrintingFunction.loop $1efb = RunMenuItemPrintingFunction._hl_ $1eff = InitMenuCursorAndButtonPermissions - $1f0e = InitMenuCursorAndButtonPermissions.disallow_select + $1f0e = InitMenuCursorAndButtonPermissions.disallow_start $1f19 = InitMenuCursorAndButtonPermissions.disallow_left_right $1f1a = GetScrollingMenuJoypad $1f23 = GetStaticMenuJoypad @@ -4543,7 +4543,7 @@ ROMX bank #5: $4089 = StartClock $4097 = StartClock.skip_set $409b = _FixDays - $40a8 = _FixDays.set_bit_7 + $40a8 = _FixDays.reset_rtc $40ae = ClockContinue $40c8 = ClockContinue.time_overflow $40eb = ClockContinue.dont_update @@ -4554,8 +4554,8 @@ ROMX bank #5: $4128 = _InitTime.okay_days $412a = GetEmote2bpp $4135 = _UpdatePlayerSprite - $4146 = _RefreshSprites - $4157 = _ClearSprites + $4146 = LoadStandingSpritesGFX + $4157 = LoadWalkingSpritesGFX $4168 = RefreshSprites $416f = RefreshSprites.Refresh $4183 = GetPlayerSprite @@ -5751,8 +5751,8 @@ ROMX bank #9: $436b = Place2DMenuCursor.cursor_on $4374 = _PushWindow $4387 = _PushWindow.loop - $4398 = _PushWindow.bit_6 - $43ae = _PushWindow.not_bit_7 + $4398 = _PushWindow.backup_tiles + $43ae = _PushWindow.no_backup_tiles $43b5 = _PushWindow.done $43cd = _PushWindow.copy $43d5 = _PushWindow.row @@ -7206,7 +7206,7 @@ ROMX bank #11: $49a8 = _TMHM_ExitPack $49af = TMHM_ExitPocket $49b1 = TMHM_ScrollPocket - $49c5 = TMHM_ScrollPocket.skip + $49c5 = TMHM_ScrollPocket.down $49ca = TMHM_ScrollPocket.loop $49e2 = TMHM_DisplayPocketItems $49fa = TMHM_DisplayPocketItems.loop2 @@ -43971,8 +43971,8 @@ SRAM bank #0: $a8c0 = sMailbox3Species $a8c1 = sMailbox3Type $a8c2 = sMailbox3End - $a8c2 = sMailbox4Message $a8c2 = sMailbox4 + $a8c2 = sMailbox4Message $a8e2 = sMailbox4MessageEnd $a8e3 = sMailbox4Author $a8eb = sMailbox4Nationality @@ -44322,8 +44322,8 @@ SRAM bank #1: $ade8 = sBoxMon7Moves $adec = sBoxMon7ID $adee = sBoxMon7Exp - $adf1 = sBoxMon7StatExp $adf1 = sBoxMon7HPExp + $adf1 = sBoxMon7StatExp $adf3 = sBoxMon7AtkExp $adf5 = sBoxMon7DefExp $adf7 = sBoxMon7SpdExp @@ -44424,8 +44424,8 @@ SRAM bank #1: $ae7d = sBoxMon11PP $ae81 = sBoxMon11Happiness $ae82 = sBoxMon11PokerusStatus - $ae83 = sBoxMon11CaughtTime $ae83 = sBoxMon11CaughtLevel + $ae83 = sBoxMon11CaughtTime $ae83 = sBoxMon11CaughtData $ae84 = sBoxMon11CaughtGender $ae84 = sBoxMon11CaughtLocation @@ -44687,9 +44687,9 @@ SRAM bank #1: $b260 = sLinkBattleStats $b262 = sLinkBattleLosses $b264 = sLinkBattleDraws + $b266 = sLinkBattleRecord1 $b266 = sLinkBattleRecord $b266 = sLinkBattleRecord1ID - $b266 = sLinkBattleRecord1 $b268 = sLinkBattleRecord1Name $b272 = sLinkBattleRecord1Wins $b274 = sLinkBattleRecord1Losses @@ -45176,8 +45176,8 @@ SRAM bank #1: $b689 = sHallOfFame10Mon6Nickname $b693 = sHallOfFame10Mon6End $b693 = sHallOfFame10End - $b694 = sHallOfFame11 $b694 = sHallOfFame11WinCount + $b694 = sHallOfFame11 $b695 = sHallOfFame11Mon1 $b695 = sHallOfFame11Mon1Species $b696 = sHallOfFame11Mon1ID @@ -45493,8 +45493,8 @@ SRAM bank #1: $b941 = sHallOfFame17Mon6End $b942 = sHallOfFame18WinCount $b942 = sHallOfFame18 - $b943 = sHallOfFame18Mon1 $b943 = sHallOfFame18Mon1Species + $b943 = sHallOfFame18Mon1 $b944 = sHallOfFame18Mon1ID $b946 = sHallOfFame18Mon1DVs $b948 = sHallOfFame18Mon1Level @@ -45634,9 +45634,9 @@ SRAM bank #1: $ba6c = sHallOfFame21Mon1DVs $ba6e = sHallOfFame21Mon1Level $ba6f = sHallOfFame21Mon1Nickname + $ba79 = sHallOfFame21Mon2 $ba79 = sHallOfFame21Mon1End $ba79 = sHallOfFame21Mon2Species - $ba79 = sHallOfFame21Mon2 $ba7a = sHallOfFame21Mon2ID $ba7c = sHallOfFame21Mon2DVs $ba7e = sHallOfFame21Mon2Level @@ -46726,8 +46726,8 @@ SRAM bank #2: $a504 = sBox2Mon5CaughtGender $a504 = sBox2Mon5CaughtLocation $a505 = sBox2Mon5Level - $a506 = sBox2Mon6 $a506 = sBox2Mon5BoxEnd + $a506 = sBox2Mon6 $a506 = sBox2Mon6Species $a507 = sBox2Mon6Item $a508 = sBox2Mon6Moves @@ -46956,8 +46956,8 @@ SRAM bank #2: $a644 = sBox2Mon15CaughtGender $a644 = sBox2Mon15CaughtLocation $a645 = sBox2Mon15Level - $a646 = sBox2Mon16Species $a646 = sBox2Mon15BoxEnd + $a646 = sBox2Mon16Species $a646 = sBox2Mon16 $a647 = sBox2Mon16Item $a648 = sBox2Mon16Moves @@ -47657,8 +47657,8 @@ SRAM bank #2: $ad28 = sBox4Mon2Moves $ad2c = sBox4Mon2ID $ad2e = sBox4Mon2Exp - $ad31 = sBox4Mon2StatExp $ad31 = sBox4Mon2HPExp + $ad31 = sBox4Mon2StatExp $ad33 = sBox4Mon2AtkExp $ad35 = sBox4Mon2DefExp $ad37 = sBox4Mon2SpdExp @@ -47667,21 +47667,21 @@ SRAM bank #2: $ad3d = sBox4Mon2PP $ad41 = sBox4Mon2Happiness $ad42 = sBox4Mon2PokerusStatus - $ad43 = sBox4Mon2CaughtData - $ad43 = sBox4Mon2CaughtTime $ad43 = sBox4Mon2CaughtLevel - $ad44 = sBox4Mon2CaughtGender + $ad43 = sBox4Mon2CaughtTime + $ad43 = sBox4Mon2CaughtData $ad44 = sBox4Mon2CaughtLocation + $ad44 = sBox4Mon2CaughtGender $ad45 = sBox4Mon2Level - $ad46 = sBox4Mon3 $ad46 = sBox4Mon3Species + $ad46 = sBox4Mon3 $ad46 = sBox4Mon2BoxEnd $ad47 = sBox4Mon3Item $ad48 = sBox4Mon3Moves $ad4c = sBox4Mon3ID $ad4e = sBox4Mon3Exp - $ad51 = sBox4Mon3HPExp $ad51 = sBox4Mon3StatExp + $ad51 = sBox4Mon3HPExp $ad53 = sBox4Mon3AtkExp $ad55 = sBox4Mon3DefExp $ad57 = sBox4Mon3SpdExp @@ -47691,20 +47691,20 @@ SRAM bank #2: $ad61 = sBox4Mon3Happiness $ad62 = sBox4Mon3PokerusStatus $ad63 = sBox4Mon3CaughtLevel - $ad63 = sBox4Mon3CaughtTime $ad63 = sBox4Mon3CaughtData - $ad64 = sBox4Mon3CaughtGender + $ad63 = sBox4Mon3CaughtTime $ad64 = sBox4Mon3CaughtLocation + $ad64 = sBox4Mon3CaughtGender $ad65 = sBox4Mon3Level + $ad66 = sBox4Mon4 $ad66 = sBox4Mon3BoxEnd $ad66 = sBox4Mon4Species - $ad66 = sBox4Mon4 $ad67 = sBox4Mon4Item $ad68 = sBox4Mon4Moves $ad6c = sBox4Mon4ID $ad6e = sBox4Mon4Exp - $ad71 = sBox4Mon4HPExp $ad71 = sBox4Mon4StatExp + $ad71 = sBox4Mon4HPExp $ad73 = sBox4Mon4AtkExp $ad75 = sBox4Mon4DefExp $ad77 = sBox4Mon4SpdExp @@ -47713,21 +47713,21 @@ SRAM bank #2: $ad7d = sBox4Mon4PP $ad81 = sBox4Mon4Happiness $ad82 = sBox4Mon4PokerusStatus - $ad83 = sBox4Mon4CaughtLevel $ad83 = sBox4Mon4CaughtTime $ad83 = sBox4Mon4CaughtData + $ad83 = sBox4Mon4CaughtLevel $ad84 = sBox4Mon4CaughtLocation $ad84 = sBox4Mon4CaughtGender $ad85 = sBox4Mon4Level - $ad86 = sBox4Mon4BoxEnd $ad86 = sBox4Mon5Species + $ad86 = sBox4Mon4BoxEnd $ad86 = sBox4Mon5 $ad87 = sBox4Mon5Item $ad88 = sBox4Mon5Moves $ad8c = sBox4Mon5ID $ad8e = sBox4Mon5Exp - $ad91 = sBox4Mon5StatExp $ad91 = sBox4Mon5HPExp + $ad91 = sBox4Mon5StatExp $ad93 = sBox4Mon5AtkExp $ad95 = sBox4Mon5DefExp $ad97 = sBox4Mon5SpdExp @@ -47736,14 +47736,14 @@ SRAM bank #2: $ad9d = sBox4Mon5PP $ada1 = sBox4Mon5Happiness $ada2 = sBox4Mon5PokerusStatus + $ada3 = sBox4Mon5CaughtLevel $ada3 = sBox4Mon5CaughtTime $ada3 = sBox4Mon5CaughtData - $ada3 = sBox4Mon5CaughtLevel - $ada4 = sBox4Mon5CaughtGender $ada4 = sBox4Mon5CaughtLocation + $ada4 = sBox4Mon5CaughtGender $ada5 = sBox4Mon5Level - $ada6 = sBox4Mon5BoxEnd $ada6 = sBox4Mon6Species + $ada6 = sBox4Mon5BoxEnd $ada6 = sBox4Mon6 $ada7 = sBox4Mon6Item $ada8 = sBox4Mon6Moves @@ -48972,8 +48972,8 @@ SRAM bank #2: $b768 = sBox6Mon15Moves $b76c = sBox6Mon15ID $b76e = sBox6Mon15Exp - $b771 = sBox6Mon15StatExp $b771 = sBox6Mon15HPExp + $b771 = sBox6Mon15StatExp $b773 = sBox6Mon15AtkExp $b775 = sBox6Mon15DefExp $b777 = sBox6Mon15SpdExp @@ -49566,8 +49566,8 @@ SRAM bank #2: $bc34 = sBox7Mon18CaughtGender $bc35 = sBox7Mon18Level $bc36 = sBox7Mon19 - $bc36 = sBox7Mon18BoxEnd $bc36 = sBox7Mon19Species + $bc36 = sBox7Mon18BoxEnd $bc37 = sBox7Mon19Item $bc38 = sBox7Mon19Moves $bc3c = sBox7Mon19ID @@ -50756,8 +50756,8 @@ SRAM bank #3: $a918 = sBox10Mon4Moves $a91c = sBox10Mon4ID $a91e = sBox10Mon4Exp - $a921 = sBox10Mon4StatExp $a921 = sBox10Mon4HPExp + $a921 = sBox10Mon4StatExp $a923 = sBox10Mon4AtkExp $a925 = sBox10Mon4DefExp $a927 = sBox10Mon4SpdExp @@ -50934,8 +50934,8 @@ SRAM bank #3: $aa14 = sBox10Mon11CaughtLocation $aa15 = sBox10Mon11Level $aa16 = sBox10Mon12Species - $aa16 = sBox10Mon12 $aa16 = sBox10Mon11BoxEnd + $aa16 = sBox10Mon12 $aa17 = sBox10Mon12Item $aa18 = sBox10Mon12Moves $aa1c = sBox10Mon12ID @@ -51327,8 +51327,8 @@ SRAM bank #3: $adc4 = sBox11Mon6CaughtGender $adc5 = sBox11Mon6Level $adc6 = sBox11Mon7 - $adc6 = sBox11Mon7Species $adc6 = sBox11Mon6BoxEnd + $adc6 = sBox11Mon7Species $adc7 = sBox11Mon7Item $adc8 = sBox11Mon7Moves $adcc = sBox11Mon7ID @@ -51782,9 +51782,9 @@ SRAM bank #3: $b1cd = sBox12Mon4PP $b1d1 = sBox12Mon4Happiness $b1d2 = sBox12Mon4PokerusStatus - $b1d3 = sBox12Mon4CaughtLevel $b1d3 = sBox12Mon4CaughtData $b1d3 = sBox12Mon4CaughtTime + $b1d3 = sBox12Mon4CaughtLevel $b1d4 = sBox12Mon4CaughtGender $b1d4 = sBox12Mon4CaughtLocation $b1d5 = sBox12Mon4Level @@ -53167,8 +53167,8 @@ SRAM bank #3: $bc71 = sBox14Mon20Happiness $bc72 = sBox14Mon20PokerusStatus $bc73 = sBox14Mon20CaughtLevel - $bc73 = sBox14Mon20CaughtTime $bc73 = sBox14Mon20CaughtData + $bc73 = sBox14Mon20CaughtTime $bc74 = sBox14Mon20CaughtLocation $bc74 = sBox14Mon20CaughtGender $bc75 = sBox14Mon20Level @@ -54248,11 +54248,11 @@ WRAM0 bank #0: $c608 = wBoxPartialData $c608 = wTimeSetBuffer $c608 = wHallOfFameTemp + $c608 = wBT_OTTempName $c608 = wc608 $c608 = wUnknownGender $c608 = wDebugLightColor $c608 = wHallOfFameTempWinCount - $c608 = wBT_OTTempName $c608 = wMobileMonSender $c608 = wBT_OTTemp $c608 = wEnemyMoveStruct @@ -54520,10 +54520,10 @@ WRAM0 bank #0: $c64c = wHallOfFameTempMon5DVs $c64c = wBattleMonStructEnd $c64e = wBT_OTTempMon2 - $c64e = wHallOfFameTempMon5Level $c64e = wWildMon $c64e = wBT_OTTempMon2Species $c64e = wOfferMonHappiness + $c64e = wHallOfFameTempMon5Level $c64f = wHallOfFameTempMon5Nickname $c64f = wBT_OTTempMon2Item $c64f = wOfferMonPokerusStatus @@ -54584,9 +54584,9 @@ WRAM0 bank #0: $c669 = wPlayerSubStatus2 $c66a = wPlayerSubStatus3 $c66a = wBT_OTTempMon2PokerusStatus - $c66b = wPlayerSubStatus4 $c66b = wUnknownMonMailMessageEnd $c66b = wBT_OTTempMon2CaughtData + $c66b = wPlayerSubStatus4 $c66b = wBT_OTTempMon2CaughtTime $c66b = wBT_OTTempMon2CaughtLevel $c66c = wBT_OTTempMon2CaughtLocation @@ -55057,8 +55057,8 @@ WRAM0 bank #0: $c819 = wc819 $c81a = wDebugRoomItemID $c81a = wTimeCapsulePartyMon1CatchRate - $c81a = wc81a $c81a = wDebugRoomMonSpecies + $c81a = wc81a $c81a = wDebugRoomMon $c81a = wDebugRoomGBID $c81b = wLinkPlayerPartyMon1Exp @@ -55121,8 +55121,8 @@ WRAM0 bank #0: $c830 = wTimeCapsulePartyMon1PP $c830 = wLinkPlayerPartyMon1CaughtLevel $c831 = wDebugRoomMonPP - $c831 = wHallOfFamePokemonListMon3End $c831 = wHallOfFamePokemonListMon4Species + $c831 = wHallOfFamePokemonListMon3End $c831 = wHallOfFamePokemonListMon4 $c831 = wLinkPlayerPartyMon1CaughtGender $c831 = wLinkPlayerPartyMon1CaughtLocation @@ -55832,12 +55832,12 @@ WRAM0 bank #0: $cf64 = wPrevDexEntryJumptableIndex $cf64 = wcf64 $cf64 = wDebugTilesetCurPalette + $cf64 = wCardFlipCursorY $cf64 = wStatsScreenFlags $cf64 = wNrOfBeatenBattleTowerTrainers $cf64 = wTrainerCardBadgeFrameCounter $cf64 = wCreditsBorderFrame $cf64 = wNamingScreenLetterCase - $cf64 = wCardFlipCursorY $cf64 = wPokegearCard $cf64 = wPackJumptableIndex $cf64 = wSlotsDelay @@ -56026,6 +56026,7 @@ WRAMX bank #1: $d003 = wTempPokedexCaughtCount $d003 = wFinishedPrintingBox $d003 = wSeerNickname + $d003 = wTownMapCursorCoordinates $d003 = wMovementBufferObject $d003 = wPlaceBallsDirection $d003 = wBillsPCTempListIndex @@ -56034,7 +56035,6 @@ WRAMX bank #1: $d003 = wDebugColorIsShiny $d003 = wNextRadioLine $d003 = wPhoneCaller - $d003 = wTownMapCursorCoordinates $d004 = wAddrOfBoxToPrint $d004 = wBugContestFirstPlaceScore $d004 = wTrainerHUDTiles @@ -56066,8 +56066,8 @@ WRAMX bank #1: $d00c = wRadioText $d00c = wBugContestThirdPlaceScore $d00c = wMobileParticipant2Nickname - $d00d = wLinkBattleRecordWins $d00d = wBufferMonOT + $d00d = wLinkBattleRecordWins $d00e = wMartItem5BCD $d00e = wBugContestTempWinnerID $d00e = wSeerCaughtLocation @@ -56268,8 +56268,8 @@ WRAMX bank #1: $d102 = wUnusedNamesPointer $d104 = wItemAttributesPointer $d106 = wCurItem - $d107 = wCurItemQuantity $d107 = wMartItemID + $d107 = wCurItemQuantity $d108 = wCurPartySpecies $d109 = wCurPartyMon $d10a = wWhichHPBar @@ -56407,12 +56407,13 @@ WRAMX bank #1: $d1ea = wListMovesLineSpacing $d1ea = wFinalCatchRate $d1ea = wCurDecoration - $d1ea = wCurMapScriptBank $d1ea = wCurMailAuthorID + $d1ea = wEvolutionOldSpecies $d1ea = wPPUpPPBuffer $d1ea = wTempMysteryGiftTimer $d1ea = wSkipMovesBeforeLevelUp $d1ea = wExpToNextLevel + $d1ea = wCurMapScriptBank $d1ea = wFieldMoveData $d1ea = wHPBuffer1 $d1ea = wCurHPAnimMaxHP @@ -56431,7 +56432,6 @@ WRAMX bank #1: $d1ea = wMagikarpLength $d1ea = wRestartClockCurDivision $d1ea = wd1ea - $d1ea = wEvolutionOldSpecies $d1eb = wHealMachineTempOBP1 $d1eb = wSurfingPlayerState $d1eb = wPCItemQuantity @@ -56588,8 +56588,8 @@ WRAMX bank #1: SECTION: $d26b-$dcd6 ($0a6c bytes) ["Enemy Party"] $d26b = wPokedexShowPointerAddr $d26b = wUnusedEggHatchFlag - $d26b = wOTPlayerName $d26b = wOTPartyData + $d26b = wOTPlayerName $d26d = wPokedexShowPointerBank $d271 = wd271 $d276 = wOTPlayerID @@ -57265,8 +57265,8 @@ WRAMX bank #1: $d684 = wObject10Field1e $d685 = wObject10JumpHeight $d686 = wObject10Range - $d68e = wObject11Struct $d68e = wObject11Sprite + $d68e = wObject11Struct $d68e = wObject10StructEnd $d68f = wObject11MapObjectIndex $d690 = wObject11SpriteTile @@ -57578,7 +57578,7 @@ WRAMX bank #1: $d81a = wMap15ObjectEventFlag $d81e = wObjectMasks $d82e = wVariableSprites - $d83e = wEnteredMapFromContinue + $d83e = wMapNameSignFlags $d841 = wTimeOfDayPal $d846 = wTimeOfDayPalFlags $d847 = wTimeOfDayPalset @@ -58048,8 +58048,8 @@ WRAMX bank #1: $df0e = wBreedMon1Moves $df12 = wBreedMon1ID $df14 = wBreedMon1Exp - $df17 = wBreedMon1HPExp $df17 = wBreedMon1StatExp + $df17 = wBreedMon1HPExp $df19 = wBreedMon1AtkExp $df1b = wBreedMon1DefExp $df1d = wBreedMon1SpdExp @@ -58416,8 +58416,8 @@ WRAMX bank #3: $d272 = w3_d202Mon2Speed $d274 = w3_d202Mon2SpclAtk $d276 = w3_d202Mon2SpclDef - $d278 = w3_d202Mon2StructEnd $d278 = w3_d202Mon2Name + $d278 = w3_d202Mon2StructEnd $d283 = w3_d202Mon3 $d283 = w3_d202Mon3Species $d284 = w3_d202Mon3Item @@ -59024,8 +59024,8 @@ WRAMX bank #3: $d764 = w3_d742Mon1PP $d768 = w3_d742Mon1Happiness $d769 = w3_d742Mon1PokerusStatus - $d76a = w3_d742Mon1CaughtTime $d76a = w3_d742Mon1CaughtData + $d76a = w3_d742Mon1CaughtTime $d76a = w3_d742Mon1CaughtLevel $d76b = w3_d742Mon1CaughtLocation $d76b = w3_d742Mon1CaughtGender diff --git a/pokecrystal_debug.sym b/pokecrystal_debug.sym index 9eabbbf21..1a5766d6f 100644 --- a/pokecrystal_debug.sym +++ b/pokecrystal_debug.sym @@ -530,8 +530,8 @@ 00:1c9c PlaceVerticalMenuItems.loop 00:1cbb MenuBox 00:1cc6 GetMenuTextStartCoord -00:1cd8 GetMenuTextStartCoord.bit_6_set -00:1ce0 GetMenuTextStartCoord.bit_7_clear +00:1cd8 GetMenuTextStartCoord.no_top_spacing +00:1ce0 GetMenuTextStartCoord.no_cursor 00:1ce1 ClearMenuBoxInterior 00:1cf1 ClearWholeMenuBox 00:1cfd MenuBoxCoord2Tile @@ -577,7 +577,7 @@ 00:1ee1 RunMenuItemPrintingFunction.loop 00:1efb RunMenuItemPrintingFunction._hl_ 00:1eff InitMenuCursorAndButtonPermissions -00:1f0e InitMenuCursorAndButtonPermissions.disallow_select +00:1f0e InitMenuCursorAndButtonPermissions.disallow_start 00:1f19 InitMenuCursorAndButtonPermissions.disallow_left_right 00:1f1a GetScrollingMenuJoypad 00:1f23 GetStaticMenuJoypad @@ -4483,7 +4483,7 @@ 05:4089 StartClock 05:4097 StartClock.skip_set 05:409b _FixDays -05:40a8 _FixDays.set_bit_7 +05:40a8 _FixDays.reset_rtc 05:40ae ClockContinue 05:40c8 ClockContinue.time_overflow 05:40eb ClockContinue.dont_update @@ -4494,8 +4494,8 @@ 05:4128 _InitTime.okay_days 05:412a GetEmote2bpp 05:4135 _UpdatePlayerSprite -05:4146 _RefreshSprites -05:4157 _ClearSprites +05:4146 LoadStandingSpritesGFX +05:4157 LoadWalkingSpritesGFX 05:4168 RefreshSprites 05:416f RefreshSprites.Refresh 05:4183 GetPlayerSprite @@ -5667,8 +5667,8 @@ 09:436b Place2DMenuCursor.cursor_on 09:4374 _PushWindow 09:4387 _PushWindow.loop -09:4398 _PushWindow.bit_6 -09:43ae _PushWindow.not_bit_7 +09:4398 _PushWindow.backup_tiles +09:43ae _PushWindow.no_backup_tiles 09:43b5 _PushWindow.done 09:43cd _PushWindow.copy 09:43d5 _PushWindow.row @@ -7111,7 +7111,7 @@ 0b:49a8 _TMHM_ExitPack 0b:49af TMHM_ExitPocket 0b:49b1 TMHM_ScrollPocket -0b:49c5 TMHM_ScrollPocket.skip +0b:49c5 TMHM_ScrollPocket.down 0b:49ca TMHM_ScrollPocket.loop 0b:49e2 TMHM_DisplayPocketItems 0b:49fa TMHM_DisplayPocketItems.loop2 @@ -43262,8 +43262,8 @@ 00:a8c0 sMailbox3Species 00:a8c1 sMailbox3Type 00:a8c2 sMailbox3End -00:a8c2 sMailbox4Message 00:a8c2 sMailbox4 +00:a8c2 sMailbox4Message 00:a8e2 sMailbox4MessageEnd 00:a8e3 sMailbox4Author 00:a8eb sMailbox4Nationality @@ -43605,8 +43605,8 @@ 01:ade8 sBoxMon7Moves 01:adec sBoxMon7ID 01:adee sBoxMon7Exp -01:adf1 sBoxMon7StatExp 01:adf1 sBoxMon7HPExp +01:adf1 sBoxMon7StatExp 01:adf3 sBoxMon7AtkExp 01:adf5 sBoxMon7DefExp 01:adf7 sBoxMon7SpdExp @@ -43707,8 +43707,8 @@ 01:ae7d sBoxMon11PP 01:ae81 sBoxMon11Happiness 01:ae82 sBoxMon11PokerusStatus -01:ae83 sBoxMon11CaughtTime 01:ae83 sBoxMon11CaughtLevel +01:ae83 sBoxMon11CaughtTime 01:ae83 sBoxMon11CaughtData 01:ae84 sBoxMon11CaughtGender 01:ae84 sBoxMon11CaughtLocation @@ -43969,9 +43969,9 @@ 01:b260 sLinkBattleStats 01:b262 sLinkBattleLosses 01:b264 sLinkBattleDraws +01:b266 sLinkBattleRecord1 01:b266 sLinkBattleRecord 01:b266 sLinkBattleRecord1ID -01:b266 sLinkBattleRecord1 01:b268 sLinkBattleRecord1Name 01:b272 sLinkBattleRecord1Wins 01:b274 sLinkBattleRecord1Losses @@ -44457,8 +44457,8 @@ 01:b689 sHallOfFame10Mon6Nickname 01:b693 sHallOfFame10Mon6End 01:b693 sHallOfFame10End -01:b694 sHallOfFame11 01:b694 sHallOfFame11WinCount +01:b694 sHallOfFame11 01:b695 sHallOfFame11Mon1 01:b695 sHallOfFame11Mon1Species 01:b696 sHallOfFame11Mon1ID @@ -44774,8 +44774,8 @@ 01:b941 sHallOfFame17Mon6End 01:b942 sHallOfFame18WinCount 01:b942 sHallOfFame18 -01:b943 sHallOfFame18Mon1 01:b943 sHallOfFame18Mon1Species +01:b943 sHallOfFame18Mon1 01:b944 sHallOfFame18Mon1ID 01:b946 sHallOfFame18Mon1DVs 01:b948 sHallOfFame18Mon1Level @@ -44915,9 +44915,9 @@ 01:ba6c sHallOfFame21Mon1DVs 01:ba6e sHallOfFame21Mon1Level 01:ba6f sHallOfFame21Mon1Nickname +01:ba79 sHallOfFame21Mon2 01:ba79 sHallOfFame21Mon1End 01:ba79 sHallOfFame21Mon2Species -01:ba79 sHallOfFame21Mon2 01:ba7a sHallOfFame21Mon2ID 01:ba7c sHallOfFame21Mon2DVs 01:ba7e sHallOfFame21Mon2Level @@ -46000,8 +46000,8 @@ 02:a504 sBox2Mon5CaughtGender 02:a504 sBox2Mon5CaughtLocation 02:a505 sBox2Mon5Level -02:a506 sBox2Mon6 02:a506 sBox2Mon5BoxEnd +02:a506 sBox2Mon6 02:a506 sBox2Mon6Species 02:a507 sBox2Mon6Item 02:a508 sBox2Mon6Moves @@ -46230,8 +46230,8 @@ 02:a644 sBox2Mon15CaughtGender 02:a644 sBox2Mon15CaughtLocation 02:a645 sBox2Mon15Level -02:a646 sBox2Mon16Species 02:a646 sBox2Mon15BoxEnd +02:a646 sBox2Mon16Species 02:a646 sBox2Mon16 02:a647 sBox2Mon16Item 02:a648 sBox2Mon16Moves @@ -46931,8 +46931,8 @@ 02:ad28 sBox4Mon2Moves 02:ad2c sBox4Mon2ID 02:ad2e sBox4Mon2Exp -02:ad31 sBox4Mon2StatExp 02:ad31 sBox4Mon2HPExp +02:ad31 sBox4Mon2StatExp 02:ad33 sBox4Mon2AtkExp 02:ad35 sBox4Mon2DefExp 02:ad37 sBox4Mon2SpdExp @@ -46941,21 +46941,21 @@ 02:ad3d sBox4Mon2PP 02:ad41 sBox4Mon2Happiness 02:ad42 sBox4Mon2PokerusStatus -02:ad43 sBox4Mon2CaughtData -02:ad43 sBox4Mon2CaughtTime 02:ad43 sBox4Mon2CaughtLevel -02:ad44 sBox4Mon2CaughtGender +02:ad43 sBox4Mon2CaughtTime +02:ad43 sBox4Mon2CaughtData 02:ad44 sBox4Mon2CaughtLocation +02:ad44 sBox4Mon2CaughtGender 02:ad45 sBox4Mon2Level -02:ad46 sBox4Mon3 02:ad46 sBox4Mon3Species +02:ad46 sBox4Mon3 02:ad46 sBox4Mon2BoxEnd 02:ad47 sBox4Mon3Item 02:ad48 sBox4Mon3Moves 02:ad4c sBox4Mon3ID 02:ad4e sBox4Mon3Exp -02:ad51 sBox4Mon3HPExp 02:ad51 sBox4Mon3StatExp +02:ad51 sBox4Mon3HPExp 02:ad53 sBox4Mon3AtkExp 02:ad55 sBox4Mon3DefExp 02:ad57 sBox4Mon3SpdExp @@ -46965,20 +46965,20 @@ 02:ad61 sBox4Mon3Happiness 02:ad62 sBox4Mon3PokerusStatus 02:ad63 sBox4Mon3CaughtLevel -02:ad63 sBox4Mon3CaughtTime 02:ad63 sBox4Mon3CaughtData -02:ad64 sBox4Mon3CaughtGender +02:ad63 sBox4Mon3CaughtTime 02:ad64 sBox4Mon3CaughtLocation +02:ad64 sBox4Mon3CaughtGender 02:ad65 sBox4Mon3Level +02:ad66 sBox4Mon4 02:ad66 sBox4Mon3BoxEnd 02:ad66 sBox4Mon4Species -02:ad66 sBox4Mon4 02:ad67 sBox4Mon4Item 02:ad68 sBox4Mon4Moves 02:ad6c sBox4Mon4ID 02:ad6e sBox4Mon4Exp -02:ad71 sBox4Mon4HPExp 02:ad71 sBox4Mon4StatExp +02:ad71 sBox4Mon4HPExp 02:ad73 sBox4Mon4AtkExp 02:ad75 sBox4Mon4DefExp 02:ad77 sBox4Mon4SpdExp @@ -46987,21 +46987,21 @@ 02:ad7d sBox4Mon4PP 02:ad81 sBox4Mon4Happiness 02:ad82 sBox4Mon4PokerusStatus -02:ad83 sBox4Mon4CaughtLevel 02:ad83 sBox4Mon4CaughtTime 02:ad83 sBox4Mon4CaughtData +02:ad83 sBox4Mon4CaughtLevel 02:ad84 sBox4Mon4CaughtLocation 02:ad84 sBox4Mon4CaughtGender 02:ad85 sBox4Mon4Level -02:ad86 sBox4Mon4BoxEnd 02:ad86 sBox4Mon5Species +02:ad86 sBox4Mon4BoxEnd 02:ad86 sBox4Mon5 02:ad87 sBox4Mon5Item 02:ad88 sBox4Mon5Moves 02:ad8c sBox4Mon5ID 02:ad8e sBox4Mon5Exp -02:ad91 sBox4Mon5StatExp 02:ad91 sBox4Mon5HPExp +02:ad91 sBox4Mon5StatExp 02:ad93 sBox4Mon5AtkExp 02:ad95 sBox4Mon5DefExp 02:ad97 sBox4Mon5SpdExp @@ -47010,14 +47010,14 @@ 02:ad9d sBox4Mon5PP 02:ada1 sBox4Mon5Happiness 02:ada2 sBox4Mon5PokerusStatus +02:ada3 sBox4Mon5CaughtLevel 02:ada3 sBox4Mon5CaughtTime 02:ada3 sBox4Mon5CaughtData -02:ada3 sBox4Mon5CaughtLevel -02:ada4 sBox4Mon5CaughtGender 02:ada4 sBox4Mon5CaughtLocation +02:ada4 sBox4Mon5CaughtGender 02:ada5 sBox4Mon5Level -02:ada6 sBox4Mon5BoxEnd 02:ada6 sBox4Mon6Species +02:ada6 sBox4Mon5BoxEnd 02:ada6 sBox4Mon6 02:ada7 sBox4Mon6Item 02:ada8 sBox4Mon6Moves @@ -48246,8 +48246,8 @@ 02:b768 sBox6Mon15Moves 02:b76c sBox6Mon15ID 02:b76e sBox6Mon15Exp -02:b771 sBox6Mon15StatExp 02:b771 sBox6Mon15HPExp +02:b771 sBox6Mon15StatExp 02:b773 sBox6Mon15AtkExp 02:b775 sBox6Mon15DefExp 02:b777 sBox6Mon15SpdExp @@ -48840,8 +48840,8 @@ 02:bc34 sBox7Mon18CaughtGender 02:bc35 sBox7Mon18Level 02:bc36 sBox7Mon19 -02:bc36 sBox7Mon18BoxEnd 02:bc36 sBox7Mon19Species +02:bc36 sBox7Mon18BoxEnd 02:bc37 sBox7Mon19Item 02:bc38 sBox7Mon19Moves 02:bc3c sBox7Mon19ID @@ -50025,8 +50025,8 @@ 03:a918 sBox10Mon4Moves 03:a91c sBox10Mon4ID 03:a91e sBox10Mon4Exp -03:a921 sBox10Mon4StatExp 03:a921 sBox10Mon4HPExp +03:a921 sBox10Mon4StatExp 03:a923 sBox10Mon4AtkExp 03:a925 sBox10Mon4DefExp 03:a927 sBox10Mon4SpdExp @@ -50203,8 +50203,8 @@ 03:aa14 sBox10Mon11CaughtLocation 03:aa15 sBox10Mon11Level 03:aa16 sBox10Mon12Species -03:aa16 sBox10Mon12 03:aa16 sBox10Mon11BoxEnd +03:aa16 sBox10Mon12 03:aa17 sBox10Mon12Item 03:aa18 sBox10Mon12Moves 03:aa1c sBox10Mon12ID @@ -50596,8 +50596,8 @@ 03:adc4 sBox11Mon6CaughtGender 03:adc5 sBox11Mon6Level 03:adc6 sBox11Mon7 -03:adc6 sBox11Mon7Species 03:adc6 sBox11Mon6BoxEnd +03:adc6 sBox11Mon7Species 03:adc7 sBox11Mon7Item 03:adc8 sBox11Mon7Moves 03:adcc sBox11Mon7ID @@ -51051,9 +51051,9 @@ 03:b1cd sBox12Mon4PP 03:b1d1 sBox12Mon4Happiness 03:b1d2 sBox12Mon4PokerusStatus -03:b1d3 sBox12Mon4CaughtLevel 03:b1d3 sBox12Mon4CaughtData 03:b1d3 sBox12Mon4CaughtTime +03:b1d3 sBox12Mon4CaughtLevel 03:b1d4 sBox12Mon4CaughtGender 03:b1d4 sBox12Mon4CaughtLocation 03:b1d5 sBox12Mon4Level @@ -52436,8 +52436,8 @@ 03:bc71 sBox14Mon20Happiness 03:bc72 sBox14Mon20PokerusStatus 03:bc73 sBox14Mon20CaughtLevel -03:bc73 sBox14Mon20CaughtTime 03:bc73 sBox14Mon20CaughtData +03:bc73 sBox14Mon20CaughtTime 03:bc74 sBox14Mon20CaughtLocation 03:bc74 sBox14Mon20CaughtGender 03:bc75 sBox14Mon20Level @@ -53486,11 +53486,11 @@ 00:c608 wBoxPartialData 00:c608 wTimeSetBuffer 00:c608 wHallOfFameTemp +00:c608 wBT_OTTempName 00:c608 wc608 00:c608 wUnknownGender 00:c608 wDebugLightColor 00:c608 wHallOfFameTempWinCount -00:c608 wBT_OTTempName 00:c608 wMobileMonSender 00:c608 wBT_OTTemp 00:c608 wEnemyMoveStruct @@ -53758,10 +53758,10 @@ 00:c64c wHallOfFameTempMon5DVs 00:c64c wBattleMonStructEnd 00:c64e wBT_OTTempMon2 -00:c64e wHallOfFameTempMon5Level 00:c64e wWildMon 00:c64e wBT_OTTempMon2Species 00:c64e wOfferMonHappiness +00:c64e wHallOfFameTempMon5Level 00:c64f wHallOfFameTempMon5Nickname 00:c64f wBT_OTTempMon2Item 00:c64f wOfferMonPokerusStatus @@ -53822,9 +53822,9 @@ 00:c669 wPlayerSubStatus2 00:c66a wPlayerSubStatus3 00:c66a wBT_OTTempMon2PokerusStatus -00:c66b wPlayerSubStatus4 00:c66b wUnknownMonMailMessageEnd 00:c66b wBT_OTTempMon2CaughtData +00:c66b wPlayerSubStatus4 00:c66b wBT_OTTempMon2CaughtTime 00:c66b wBT_OTTempMon2CaughtLevel 00:c66c wBT_OTTempMon2CaughtLocation @@ -54293,8 +54293,8 @@ 00:c819 wc819 00:c81a wDebugRoomItemID 00:c81a wTimeCapsulePartyMon1CatchRate -00:c81a wc81a 00:c81a wDebugRoomMonSpecies +00:c81a wc81a 00:c81a wDebugRoomMon 00:c81a wDebugRoomGBID 00:c81b wLinkPlayerPartyMon1Exp @@ -54357,8 +54357,8 @@ 00:c830 wTimeCapsulePartyMon1PP 00:c830 wLinkPlayerPartyMon1CaughtLevel 00:c831 wDebugRoomMonPP -00:c831 wHallOfFamePokemonListMon3End 00:c831 wHallOfFamePokemonListMon4Species +00:c831 wHallOfFamePokemonListMon3End 00:c831 wHallOfFamePokemonListMon4 00:c831 wLinkPlayerPartyMon1CaughtGender 00:c831 wLinkPlayerPartyMon1CaughtLocation @@ -55066,12 +55066,12 @@ 00:cf64 wPrevDexEntryJumptableIndex 00:cf64 wcf64 00:cf64 wDebugTilesetCurPalette +00:cf64 wCardFlipCursorY 00:cf64 wStatsScreenFlags 00:cf64 wNrOfBeatenBattleTowerTrainers 00:cf64 wTrainerCardBadgeFrameCounter 00:cf64 wCreditsBorderFrame 00:cf64 wNamingScreenLetterCase -00:cf64 wCardFlipCursorY 00:cf64 wPokegearCard 00:cf64 wPackJumptableIndex 00:cf64 wSlotsDelay @@ -55254,6 +55254,7 @@ 01:d003 wTempPokedexCaughtCount 01:d003 wFinishedPrintingBox 01:d003 wSeerNickname +01:d003 wTownMapCursorCoordinates 01:d003 wMovementBufferObject 01:d003 wPlaceBallsDirection 01:d003 wBillsPCTempListIndex @@ -55262,7 +55263,6 @@ 01:d003 wDebugColorIsShiny 01:d003 wNextRadioLine 01:d003 wPhoneCaller -01:d003 wTownMapCursorCoordinates 01:d004 wAddrOfBoxToPrint 01:d004 wBugContestFirstPlaceScore 01:d004 wTrainerHUDTiles @@ -55294,8 +55294,8 @@ 01:d00c wRadioText 01:d00c wBugContestThirdPlaceScore 01:d00c wMobileParticipant2Nickname -01:d00d wLinkBattleRecordWins 01:d00d wBufferMonOT +01:d00d wLinkBattleRecordWins 01:d00e wMartItem5BCD 01:d00e wBugContestTempWinnerID 01:d00e wSeerCaughtLocation @@ -55495,8 +55495,8 @@ 01:d102 wUnusedNamesPointer 01:d104 wItemAttributesPointer 01:d106 wCurItem -01:d107 wCurItemQuantity 01:d107 wMartItemID +01:d107 wCurItemQuantity 01:d108 wCurPartySpecies 01:d109 wCurPartyMon 01:d10a wWhichHPBar @@ -55634,12 +55634,13 @@ 01:d1ea wListMovesLineSpacing 01:d1ea wFinalCatchRate 01:d1ea wCurDecoration -01:d1ea wCurMapScriptBank 01:d1ea wCurMailAuthorID +01:d1ea wEvolutionOldSpecies 01:d1ea wPPUpPPBuffer 01:d1ea wTempMysteryGiftTimer 01:d1ea wSkipMovesBeforeLevelUp 01:d1ea wExpToNextLevel +01:d1ea wCurMapScriptBank 01:d1ea wFieldMoveData 01:d1ea wHPBuffer1 01:d1ea wCurHPAnimMaxHP @@ -55658,7 +55659,6 @@ 01:d1ea wMagikarpLength 01:d1ea wRestartClockCurDivision 01:d1ea wd1ea -01:d1ea wEvolutionOldSpecies 01:d1eb wHealMachineTempOBP1 01:d1eb wSurfingPlayerState 01:d1eb wPCItemQuantity @@ -55814,8 +55814,8 @@ 01:d269 wTimeOfDay 01:d26b wPokedexShowPointerAddr 01:d26b wUnusedEggHatchFlag -01:d26b wOTPlayerName 01:d26b wOTPartyData +01:d26b wOTPlayerName 01:d26d wPokedexShowPointerBank 01:d271 wd271 01:d276 wOTPlayerID @@ -56491,8 +56491,8 @@ 01:d684 wObject10Field1e 01:d685 wObject10JumpHeight 01:d686 wObject10Range -01:d68e wObject11Struct 01:d68e wObject11Sprite +01:d68e wObject11Struct 01:d68e wObject10StructEnd 01:d68f wObject11MapObjectIndex 01:d690 wObject11SpriteTile @@ -56804,7 +56804,7 @@ 01:d81a wMap15ObjectEventFlag 01:d81e wObjectMasks 01:d82e wVariableSprites -01:d83e wEnteredMapFromContinue +01:d83e wMapNameSignFlags 01:d841 wTimeOfDayPal 01:d846 wTimeOfDayPalFlags 01:d847 wTimeOfDayPalset @@ -57273,8 +57273,8 @@ 01:df0e wBreedMon1Moves 01:df12 wBreedMon1ID 01:df14 wBreedMon1Exp -01:df17 wBreedMon1HPExp 01:df17 wBreedMon1StatExp +01:df17 wBreedMon1HPExp 01:df19 wBreedMon1AtkExp 01:df1b wBreedMon1DefExp 01:df1d wBreedMon1SpdExp @@ -57631,8 +57631,8 @@ 03:d272 w3_d202Mon2Speed 03:d274 w3_d202Mon2SpclAtk 03:d276 w3_d202Mon2SpclDef -03:d278 w3_d202Mon2StructEnd 03:d278 w3_d202Mon2Name +03:d278 w3_d202Mon2StructEnd 03:d283 w3_d202Mon3 03:d283 w3_d202Mon3Species 03:d284 w3_d202Mon3Item @@ -58239,8 +58239,8 @@ 03:d764 w3_d742Mon1PP 03:d768 w3_d742Mon1Happiness 03:d769 w3_d742Mon1PokerusStatus -03:d76a w3_d742Mon1CaughtTime 03:d76a w3_d742Mon1CaughtData +03:d76a w3_d742Mon1CaughtTime 03:d76a w3_d742Mon1CaughtLevel 03:d76b w3_d742Mon1CaughtLocation 03:d76b w3_d742Mon1CaughtGender