From 2aefc9c08246f4872dfd0044d86c6c228da0c593 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Sun, 2 Aug 2026 17:04:10 +0000 Subject: [PATCH] Label all unnamed symbols (#184) --------- Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com> --- pokegold-spaceworld-correctheader.sym | 241 +++++++------- pokegold-spaceworld-debug-correctheader.sym | 241 +++++++------- pokegold-spaceworld-debug.map | 308 ++++++++---------- pokegold-spaceworld-debug.sym | 241 +++++++------- pokegold-spaceworld.map | 308 ++++++++---------- pokegold-spaceworld.sym | 241 +++++++------- pokesilver-spaceworld-correctheader.sym | 241 +++++++------- pokesilver-spaceworld-debug-correctheader.sym | 241 +++++++------- pokesilver-spaceworld-debug.map | 308 ++++++++---------- pokesilver-spaceworld-debug.sym | 241 +++++++------- pokesilver-spaceworld.map | 308 ++++++++---------- pokesilver-spaceworld.sym | 241 +++++++------- 12 files changed, 1532 insertions(+), 1628 deletions(-) diff --git a/pokegold-spaceworld-correctheader.sym b/pokegold-spaceworld-correctheader.sym index e4693463..d78c512f 100644 --- a/pokegold-spaceworld-correctheader.sym +++ b/pokegold-spaceworld-correctheader.sym @@ -788,10 +788,10 @@ 00:2ffe TextAsmEnd.stop 00:2fff CallMapTextSubroutine 00:3015 CallMapTextSubroutine.Return -00:3019 Function3055 -00:301c Function3055.Loop -00:3026 asm_3062 -00:303e Function307a +00:3019 CheckAllMapObjects +00:301c CheckAllMapObjects.Loop +00:3026 TalkingToBGObject +00:303e ResetTalkingTarget 00:3049 PrintTextboxDebugNumbers 00:305b PrintTextboxDebugNumbers.CheckSign 00:3062 PrintTextboxDebugNumbers.PrintNum @@ -805,7 +805,7 @@ 00:310e TextboxIdle.next 00:3112 PrepareTextbox 00:3135 TextboxCleanup -00:3153 Function318f +00:3153 ReloadObjectGFX 00:315f TurnNPCTalkingTo 00:317d TurnNPCTalkingTo.Jump 00:3187 Unreferenced_CheckTrainerBattle @@ -916,7 +916,7 @@ 00:35cf RestoreScreenAndReloadTiles 00:35e2 ClearBGPalettes 00:35e5 WaitBGMap -00:35ef SetPalettes +00:35ef SetDefaultBGPAndOBP 00:35f8 ClearPalettes 00:3600 GetMemSGBLayout 00:3602 GetSGBLayout @@ -1231,8 +1231,8 @@ 01:4965 FacePlayerObject.lined_up_horizontal 01:496d FacePlayerObject.done 01:4973 FacePlayerObject.FlipNegativeToPositive -01:4979 Stubbed_UpdateYOffset -01:4994 Stubbed_UpdateYOffset.y_offsets +01:4979 Stubbed_SwayObject +01:4994 Stubbed_SwayObject.y_offsets 01:499c UpdateJumpPosition 01:49d0 UpdateJumpPosition.got_direction 01:49dc UpdateJumpPosition.y_offsets @@ -1253,8 +1253,8 @@ 01:4af6 StepFunction_TeleportTo.InitFinalSpin 01:4b00 StepFunction_TeleportTo.DoFinalSpin 01:4b0c StepFunction_TeleportTo.FinishStep -01:4b22 Unreferenced_Function4b22 -01:4b25 Stub_Function4b25 +01:4b22 Unreferenced_StrengthBoulderDust_Old +01:4b25 Stub_SpawnStrengthBoulderDust_Old 01:4b26 SpawnShadow 01:4b42 SpawnShadow.ShadowObject 01:4b48 SpawnStrengthBoulderDust @@ -1445,8 +1445,8 @@ 01:57de GivePokemon 01:57eb AddRandomPokemonToBox 01:57ed AddRandomPokemonToBox.loop -01:5818 RandomUnder246 -01:5818 RandomUnder246.loop +01:5818 RandomSpecies_RaiEnSuiOrUnder +01:5818 RandomSpecies_RaiEnSuiOrUnder.loop 01:5823 FillTMs 01:582a FillTMs.loop 01:582f DebugGiveKeyItems @@ -1826,9 +1826,8 @@ 02:4242 GetSpriteVTile.VTileOffsets 02:424c CheckObjectEnteringVisibleRange 02:4259 CheckObjectEnteringVisibleRange.dw -02:4261 EmptyFunction8261 -02:4262 Unreferenced_CheckObjectEnteringVisibleRange_Alternate -02:426e Unreferenced_CheckObjectEnteringVisibleRange_Alternate.dw +02:4261 CheckObjectEnteringVisibleRange_Alternate +02:426e CheckObjectEnteringVisibleRange_Alternate.dw 02:4276 CheckVisibleRange_UpAlt 02:427d CheckVisibleRange_DownAlt 02:4284 CheckVisibleRange_LeftAlt @@ -2477,7 +2476,6 @@ 03:5290 FailDig 03:529c Text_CantUseDigHere 03:52aa DigScript -03:52c2 EmptyFunctiond2da 03:52c3 TeleportFunction 03:52c7 TeleportFunction.next 03:52d6 TeleportFunction.finish @@ -2512,7 +2510,7 @@ 03:54cb Unused_IsKeyItem_Old.cant_toss 03:54ce _HandlePlayerStep 03:54e0 _HandlePlayerStep.start -03:54e2 _HandlePlayerStep.unreferenced_d4fa +03:54e2 _HandlePlayerStep.unreferenced_checkobjects 03:54ed _HandlePlayerStep._start 03:54fc _HandlePlayerStep.update_overworld_map 03:5501 _HandlePlayerStep.update_player_coords @@ -2821,16 +2819,13 @@ 03:6fb1 ReviveEffect.skip_to_revive 03:6fc1 ReviveEffect.revive_half_hp 03:6fc4 ReviveEffect.finish_revive -03:6fd5 Unreferenced_EmptyFunctionefed 03:6fd6 FullRestoreEffect 03:7002 FullRestoreEffect.NotAtFullHealth 03:7031 FullRestoreEffect.not_in_battle -03:7042 Unreferenced_EmptyFunctionf05a 03:7043 RestoreHPEffect 03:706e RestoreHPEffect.get_heal_amount 03:7074 RestoreHPEffect.continue_heal 03:7086 RestoreHPEffect.not_in_battle -03:7097 Unreferenced_EmptyFunctionf0af 03:7098 HealHP_SFX_GFX 03:70b7 UseItem_SelectMon 03:70c0 ItemActionTextWaitButton @@ -3322,9 +3317,9 @@ 04:6753 PokemonAskSwapItemText 04:6784 GetPartyItemOffset 04:678c ReceiveItemFromPokemon -04:6798 UnusedHandleItemJumptable -04:67a9 UnusedItemJumptable -04:67b7 EmptyFunction127b7 +04:6798 UnusedHandleRecieveItemJumptable +04:67a9 UnusedRecieveItemJumptable +04:67b7 PartyGiveItem 04:67b8 ChangeBackpackPocket 04:67c0 PartyBallPocket 04:67cb PartyBallPocket.exit @@ -3400,7 +3395,7 @@ 04:6e0f TrainerCardMainInputs.exit 04:6e16 TrainerCardMainInputs.left 04:6e26 TrainerCardMainInputs.right -04:6e37 EmptyFunction12e37 +04:6e37 EmptyTrainerCardFunction 04:6e38 TrainerCardScroll 04:6e49 TrainerCardClearTileMap 04:6e5c TrainerCardSetWindowY @@ -3466,9 +3461,9 @@ 05:410f LoadUsedSpritesGFX.skip 05:4127 LoadUsedSpritesGFX.no_still_sprite_1 05:4132 LoadUsedSpritesGFX.no_still_sprite_2 -05:4133 Function14133 +05:4133 Unreferenced_LoadOverworldSprite_NPCSlot 05:4144 LoadOverworldSprite_PlayerSlot -05:414a LoadOverworldSprite_FollowerSlot +05:414a Unreferenced_LoadOverworldSprite_FollowerSlot 05:4150 LoadOverworldSprite 05:4161 LoadOverworldSprite.dont_copy 05:417d GetOverworldSpriteData @@ -8313,9 +8308,9 @@ 23:42d9 UngroupHealingMachineSprites.ungroup 23:42dc UpdateTimeOfDayPal 23:42e3 _TimeOfDayPals -23:42fe _LABEL_8C2FE_ -23:4313 _LABEL_8C313_ -23:4325 Function8c325 +23:42fe Unreferenced_ResetTimeOfDayPal +23:4313 Unreferenced_SetTimeOfDayPal +23:4325 ChangeTimeOfDayPal 23:4335 _UpdateTimePals 23:433e OverworldFadeIn 23:4349 OverworldFadeOut @@ -8567,7 +8562,7 @@ 23:53ab AnimSeq_GSTitleFlameNote.zero 23:53c2 AnimSeq_GSTitleFlameNote.one 23:53ec AnimSeq_MinigamePikachu -23:540b Data8d40b +23:540b AnimSeq_MinigamePikachu.pikachu_framesets 23:540f AnimSeq_MinigamePikachuTail 23:5418 AnimSeq_MinigameNote 23:541c AnimSeq_MinigameNote.anon_dw @@ -8905,12 +8900,12 @@ 24:47a8 ReelAction_StopReelIgnoreJoypad 24:47b2 ReelAction_StopReelIgnoreJoypad.EndReel 24:47bc ReelAction_StopReelIgnoreJoypad.clear_reel_oam -24:47c8 Function907c8 -24:47f6 Function907c8.asm907f6 -24:4805 Function90805 -24:4814 Function90805.asm90814 -24:481b Function90805.loop -24:4822 Function90822 +24:47c8 Slots_PayoutAnim +24:47f6 Slots_PayoutAnim.seven +24:4805 Slots_PlaceReelTiles +24:4814 Slots_PlaceReelTiles.place +24:481b Slots_PlaceReelTiles.loop +24:4822 Slots_CheckReelTiles 24:486b ReelAction_StopReel1 24:487f ReelAction_StopReel1.NoBias 24:4883 ReelAction_StopReel1.CheckForBias @@ -13094,16 +13089,16 @@ 3a:4070 UpdateChannel.noteover 3a:4076 UpdateChannel.continue_sound_update 3a:407a DisablePitchWheel -3a:4081 Unreferenced_Functione8081 -3a:408c Unreferenced_Functione8081.fail -3a:408e Unreferenced_Functione8081.disable_music -3a:4093 Unreferenced_Functione8081.disable_sfx -3a:409e Unreferenced_Functione8081.clear_loop -3a:40a2 Unreferenced_Functione8081.done +3a:4081 Unreferenced_MuteAudio +3a:408c Unreferenced_MuteAudio.fail +3a:408e Unreferenced_MuteAudio.disable_music +3a:4093 Unreferenced_MuteAudio.disable_sfx +3a:409e Unreferenced_MuteAudio.clear_loop +3a:40a2 Unreferenced_MuteAudio.done 3a:40a4 GetChannelRegisters 3a:40b2 GetChannelRegisters.registers -3a:40b6 Functione80b6 -3a:40f3 Functione80b6.end +3a:40b6 ContinueSoundUpdate +3a:40f3 ContinueSoundUpdate.end 3a:40fa UpdateChannels 3a:410b UpdateChannels.jumptable 3a:411b UpdateChannels.Channel1 @@ -13139,7 +13134,7 @@ 3a:42ce IsChannelSFXOn.off 3a:42d0 IsAnySFXOn 3a:42ee IsAnySFXOn.on -3a:42f0 Functione82f0 +3a:42f0 SetupPlayDanger 3a:4307 PlayDanger 3a:431e PlayDanger.halfway 3a:4323 PlayDanger.begin @@ -13190,7 +13185,7 @@ 3a:45b9 LoadNote.flag_0e 3a:45c2 LoadNote.flag_0d 3a:45cb LoadNote.flag_0b -3a:45d8 Functione85d8 +3a:45d8 CheckChannelFlags2 3a:4605 HandleDuty 3a:461b ApplyPitchSlide 3a:465e ApplyPitchSlide.decreasing @@ -14115,23 +14110,29 @@ 3f:4657 FieldDebug_SpriteViewer.set_following 3f:4663 FieldDebug_SpriteViewer.FollowPromptString 3f:4672 FieldDebug_SpriteViewer.SetStartingPoint -3f:467d LoadUnderDevelopmentString -3f:4681 LoadUnderDevelopmentString.String -3f:4689 Functionfc689 -3f:469c Functionfc69c -3f:46bb Functionfc6bb -3f:46be Functionfc6be -3f:46de Datafc6de -3f:46fe Datafc6fe -3f:470e Datafc70e -3f:471e Datafc71e -3f:472e Datafc72e -3f:473e Datafc73e -3f:474e Datafc74e -3f:475e Datafc75e -3f:476e Datafc76e -3f:477e Datafc77e -3f:478e Datafc78e +3f:467d FieldDebug_SpriteViewer.LoadUnderDevelopmentString +3f:4681 FieldDebug_SpriteViewer.String +3f:4689 SetupSpriteViewerSpriteWalkingTilemap +3f:469c SetupSpriteViewerSpriteWalkingTilemap.loop +3f:46bb SetupSpriteViewerSpriteTilemap +3f:46be SetupSpriteViewerSpriteTilemap.loop +3f:46de SpriteViewerSpriteTilemap +3f:46fe SpriteViewerSpriteTilemap.FacingStepDown0 +3f:46fe SpriteViewerSpriteTilemap.FacingStepDown2 +3f:470e SpriteViewerSpriteTilemap.FacingStepDown1 +3f:471e SpriteViewerSpriteTilemap.FacingStepDown3 +3f:472e SpriteViewerSpriteTilemap.FacingStepUp0 +3f:472e SpriteViewerSpriteTilemap.FacingStepUp2 +3f:473e SpriteViewerSpriteTilemap.FacingStepUp1 +3f:474e SpriteViewerSpriteTilemap.FacingStepUp3 +3f:475e SpriteViewerSpriteTilemap.FacingStepLeft0 +3f:475e SpriteViewerSpriteTilemap.FacingStepLeft2 +3f:476e SpriteViewerSpriteTilemap.FacingStepRight0 +3f:476e SpriteViewerSpriteTilemap.FacingStepRight2 +3f:477e SpriteViewerSpriteTilemap.FacingStepLeft1 +3f:477e SpriteViewerSpriteTilemap.FacingStepLeft3 +3f:478e SpriteViewerSpriteTilemap.FacingStepRight1 +3f:478e SpriteViewerSpriteTilemap.FacingStepRight3 3f:479e FieldDebug_NamePlayer 3f:47cb FieldDebug_Toolgear 3f:47da FieldDebug_Toolgear.Jumptable @@ -18411,6 +18412,61 @@ 02:ba62 sBox5Mon30Nickname 02:ba68 sBox5End 02:ba68 sBox5MonNicknamesEnd +02:ba68 sPartyMailBackup +02:ba68 sPartyMon1MailBackup +02:ba68 sPartyMon1MailBackupMessage +02:ba88 sPartyMon1MailBackupMessageEnd +02:ba89 sPartyMon1MailBackupAuthor +02:ba8f sPartyMon1MailBackupAuthorNationality +02:ba91 sPartyMon1MailBackupAuthorID +02:ba93 sPartyMon1MailBackupSpecies +02:ba94 sPartyMon1MailBackupType +02:ba95 sPartyMon1MailBackupEnd +02:ba95 sPartyMon2MailBackup +02:ba95 sPartyMon2MailBackupMessage +02:bab5 sPartyMon2MailBackupMessageEnd +02:bab6 sPartyMon2MailBackupAuthor +02:babc sPartyMon2MailBackupAuthorNationality +02:babe sPartyMon2MailBackupAuthorID +02:bac0 sPartyMon2MailBackupSpecies +02:bac1 sPartyMon2MailBackupType +02:bac2 sPartyMon2MailBackupEnd +02:bac2 sPartyMon3MailBackup +02:bac2 sPartyMon3MailBackupMessage +02:bae2 sPartyMon3MailBackupMessageEnd +02:bae3 sPartyMon3MailBackupAuthor +02:bae9 sPartyMon3MailBackupAuthorNationality +02:baeb sPartyMon3MailBackupAuthorID +02:baed sPartyMon3MailBackupSpecies +02:baee sPartyMon3MailBackupType +02:baef sPartyMon3MailBackupEnd +02:baef sPartyMon4MailBackup +02:baef sPartyMon4MailBackupMessage +02:bb0f sPartyMon4MailBackupMessageEnd +02:bb10 sPartyMon4MailBackupAuthor +02:bb16 sPartyMon4MailBackupAuthorNationality +02:bb18 sPartyMon4MailBackupAuthorID +02:bb1a sPartyMon4MailBackupSpecies +02:bb1b sPartyMon4MailBackupType +02:bb1c sPartyMon4MailBackupEnd +02:bb1c sPartyMon5MailBackup +02:bb1c sPartyMon5MailBackupMessage +02:bb3c sPartyMon5MailBackupMessageEnd +02:bb3d sPartyMon5MailBackupAuthor +02:bb43 sPartyMon5MailBackupAuthorNationality +02:bb45 sPartyMon5MailBackupAuthorID +02:bb47 sPartyMon5MailBackupSpecies +02:bb48 sPartyMon5MailBackupType +02:bb49 sPartyMon5MailBackupEnd +02:bb49 sPartyMon6MailBackup +02:bb49 sPartyMon6MailBackupMessage +02:bb69 sPartyMon6MailBackupMessageEnd +02:bb6a sPartyMon6MailBackupAuthor +02:bb70 sPartyMon6MailBackupAuthorNationality +02:bb72 sPartyMon6MailBackupAuthorID +02:bb74 sPartyMon6MailBackupSpecies +02:bb75 sPartyMon6MailBackupType +02:bb76 sPartyMon6MailBackupEnd 03:a000 sBox6 03:a000 sBox6Count 03:a001 sBox6Species @@ -22255,62 +22311,7 @@ 03:bb72 sPartyMon6MailAuthorID 03:bb74 sPartyMon6MailSpecies 03:bb75 sPartyMon6MailType -03:bb76 sPartyMailBackup -03:bb76 sPartyMon1MailBackup -03:bb76 sPartyMon1MailBackupMessage 03:bb76 sPartyMon6MailEnd -03:bb96 sPartyMon1MailBackupMessageEnd -03:bb97 sPartyMon1MailBackupAuthor -03:bb9d sPartyMon1MailBackupAuthorNationality -03:bb9f sPartyMon1MailBackupAuthorID -03:bba1 sPartyMon1MailBackupSpecies -03:bba2 sPartyMon1MailBackupType -03:bba3 sPartyMon1MailBackupEnd -03:bba3 sPartyMon2MailBackup -03:bba3 sPartyMon2MailBackupMessage -03:bbc3 sPartyMon2MailBackupMessageEnd -03:bbc4 sPartyMon2MailBackupAuthor -03:bbca sPartyMon2MailBackupAuthorNationality -03:bbcc sPartyMon2MailBackupAuthorID -03:bbce sPartyMon2MailBackupSpecies -03:bbcf sPartyMon2MailBackupType -03:bbd0 sPartyMon2MailBackupEnd -03:bbd0 sPartyMon3MailBackup -03:bbd0 sPartyMon3MailBackupMessage -03:bbf0 sPartyMon3MailBackupMessageEnd -03:bbf1 sPartyMon3MailBackupAuthor -03:bbf7 sPartyMon3MailBackupAuthorNationality -03:bbf9 sPartyMon3MailBackupAuthorID -03:bbfb sPartyMon3MailBackupSpecies -03:bbfc sPartyMon3MailBackupType -03:bbfd sPartyMon3MailBackupEnd -03:bbfd sPartyMon4MailBackup -03:bbfd sPartyMon4MailBackupMessage -03:bc1d sPartyMon4MailBackupMessageEnd -03:bc1e sPartyMon4MailBackupAuthor -03:bc24 sPartyMon4MailBackupAuthorNationality -03:bc26 sPartyMon4MailBackupAuthorID -03:bc28 sPartyMon4MailBackupSpecies -03:bc29 sPartyMon4MailBackupType -03:bc2a sPartyMon4MailBackupEnd -03:bc2a sPartyMon5MailBackup -03:bc2a sPartyMon5MailBackupMessage -03:bc4a sPartyMon5MailBackupMessageEnd -03:bc4b sPartyMon5MailBackupAuthor -03:bc51 sPartyMon5MailBackupAuthorNationality -03:bc53 sPartyMon5MailBackupAuthorID -03:bc55 sPartyMon5MailBackupSpecies -03:bc56 sPartyMon5MailBackupType -03:bc57 sPartyMon5MailBackupEnd -03:bc57 sPartyMon6MailBackup -03:bc57 sPartyMon6MailBackupMessage -03:bc77 sPartyMon6MailBackupMessageEnd -03:bc78 sPartyMon6MailBackupAuthor -03:bc7e sPartyMon6MailBackupAuthorNationality -03:bc80 sPartyMon6MailBackupAuthorID -03:bc82 sPartyMon6MailBackupSpecies -03:bc83 sPartyMon6MailBackupType -03:bc84 sPartyMon6MailBackupEnd 03:bffd sChecksum 00:c000 wChannel1 00:c000 wChannel1MusicID @@ -24043,6 +24044,9 @@ 00:cc3d wSpriteViewerSavedMenuPointerY 00:cc3e wSpriteViewerJumptableIndex 00:cc3f wMovementBuffer +00:cc3f wMovementXBuffer +00:cc40 wMovementYBuffer +00:cc41 wMovementSpriteViewerDirection 00:cc45 wFacingDirectionList_Old 00:cc4c wEmotionBubbleSpriteIndex_Old 00:cc4c wSavedPlayerScreenY_Old @@ -24997,6 +25001,7 @@ 00:d642 wUnusedAddOutdoorSpritesReturnValue 00:d643 wBGMapAnchor 00:d645 wUsedSprites +00:d646 wUsedFollowerSprites 00:d647 wUsedNPCSprites 00:d64f wUsedStaticSprites 00:d651 wUsedSpritesEnd diff --git a/pokegold-spaceworld-debug-correctheader.sym b/pokegold-spaceworld-debug-correctheader.sym index 4db0fd61..2320a42d 100644 --- a/pokegold-spaceworld-debug-correctheader.sym +++ b/pokegold-spaceworld-debug-correctheader.sym @@ -789,10 +789,10 @@ 00:303a TextAsmEnd.stop 00:303b CallMapTextSubroutine 00:3051 CallMapTextSubroutine.Return -00:3055 Function3055 -00:3058 Function3055.Loop -00:3062 asm_3062 -00:307a Function307a +00:3055 CheckAllMapObjects +00:3058 CheckAllMapObjects.Loop +00:3062 TalkingToBGObject +00:307a ResetTalkingTarget 00:3085 PrintTextboxDebugNumbers 00:3097 PrintTextboxDebugNumbers.CheckSign 00:309e PrintTextboxDebugNumbers.PrintNum @@ -806,7 +806,7 @@ 00:314a TextboxIdle.next 00:314e PrepareTextbox 00:3171 TextboxCleanup -00:318f Function318f +00:318f ReloadObjectGFX 00:319b TurnNPCTalkingTo 00:31b9 TurnNPCTalkingTo.Jump 00:31c3 Unreferenced_CheckTrainerBattle @@ -917,7 +917,7 @@ 00:360b RestoreScreenAndReloadTiles 00:361e ClearBGPalettes 00:3621 WaitBGMap -00:362b SetPalettes +00:362b SetDefaultBGPAndOBP 00:3634 ClearPalettes 00:363c GetMemSGBLayout 00:363e GetSGBLayout @@ -1260,8 +1260,8 @@ 01:4965 FacePlayerObject.lined_up_horizontal 01:496d FacePlayerObject.done 01:4973 FacePlayerObject.FlipNegativeToPositive -01:4979 Stubbed_UpdateYOffset -01:4994 Stubbed_UpdateYOffset.y_offsets +01:4979 Stubbed_SwayObject +01:4994 Stubbed_SwayObject.y_offsets 01:499c UpdateJumpPosition 01:49d0 UpdateJumpPosition.got_direction 01:49dc UpdateJumpPosition.y_offsets @@ -1282,8 +1282,8 @@ 01:4af6 StepFunction_TeleportTo.InitFinalSpin 01:4b00 StepFunction_TeleportTo.DoFinalSpin 01:4b0c StepFunction_TeleportTo.FinishStep -01:4b22 Unreferenced_Function4b22 -01:4b25 Stub_Function4b25 +01:4b22 Unreferenced_StrengthBoulderDust_Old +01:4b25 Stub_SpawnStrengthBoulderDust_Old 01:4b26 SpawnShadow 01:4b42 SpawnShadow.ShadowObject 01:4b48 SpawnStrengthBoulderDust @@ -1474,8 +1474,8 @@ 01:57de GivePokemon 01:57eb AddRandomPokemonToBox 01:57ed AddRandomPokemonToBox.loop -01:5818 RandomUnder246 -01:5818 RandomUnder246.loop +01:5818 RandomSpecies_RaiEnSuiOrUnder +01:5818 RandomSpecies_RaiEnSuiOrUnder.loop 01:5823 FillTMs 01:582a FillTMs.loop 01:582f DebugGiveKeyItems @@ -1855,9 +1855,8 @@ 02:4242 GetSpriteVTile.VTileOffsets 02:424c CheckObjectEnteringVisibleRange 02:4259 CheckObjectEnteringVisibleRange.dw -02:4261 EmptyFunction8261 -02:4262 Unreferenced_CheckObjectEnteringVisibleRange_Alternate -02:426e Unreferenced_CheckObjectEnteringVisibleRange_Alternate.dw +02:4261 CheckObjectEnteringVisibleRange_Alternate +02:426e CheckObjectEnteringVisibleRange_Alternate.dw 02:4276 CheckVisibleRange_UpAlt 02:427d CheckVisibleRange_DownAlt 02:4284 CheckVisibleRange_LeftAlt @@ -2508,7 +2507,6 @@ 03:52a8 FailDig 03:52b4 Text_CantUseDigHere 03:52c2 DigScript -03:52da EmptyFunctiond2da 03:52db TeleportFunction 03:52df TeleportFunction.next 03:52ee TeleportFunction.finish @@ -2543,7 +2541,7 @@ 03:54e3 Unused_IsKeyItem_Old.cant_toss 03:54e6 _HandlePlayerStep 03:54f8 _HandlePlayerStep.start -03:54fa _HandlePlayerStep.unreferenced_d4fa +03:54fa _HandlePlayerStep.unreferenced_checkobjects 03:5505 _HandlePlayerStep._start 03:5514 _HandlePlayerStep.update_overworld_map 03:5519 _HandlePlayerStep.update_player_coords @@ -2852,16 +2850,13 @@ 03:6fc9 ReviveEffect.skip_to_revive 03:6fd9 ReviveEffect.revive_half_hp 03:6fdc ReviveEffect.finish_revive -03:6fed Unreferenced_EmptyFunctionefed 03:6fee FullRestoreEffect 03:701a FullRestoreEffect.NotAtFullHealth 03:7049 FullRestoreEffect.not_in_battle -03:705a Unreferenced_EmptyFunctionf05a 03:705b RestoreHPEffect 03:7086 RestoreHPEffect.get_heal_amount 03:708c RestoreHPEffect.continue_heal 03:709e RestoreHPEffect.not_in_battle -03:70af Unreferenced_EmptyFunctionf0af 03:70b0 HealHP_SFX_GFX 03:70cf UseItem_SelectMon 03:70d8 ItemActionTextWaitButton @@ -3359,9 +3354,9 @@ 04:6753 PokemonAskSwapItemText 04:6784 GetPartyItemOffset 04:678c ReceiveItemFromPokemon -04:6798 UnusedHandleItemJumptable -04:67a9 UnusedItemJumptable -04:67b7 EmptyFunction127b7 +04:6798 UnusedHandleRecieveItemJumptable +04:67a9 UnusedRecieveItemJumptable +04:67b7 PartyGiveItem 04:67b8 ChangeBackpackPocket 04:67c0 PartyBallPocket 04:67cb PartyBallPocket.exit @@ -3437,7 +3432,7 @@ 04:6e0f TrainerCardMainInputs.exit 04:6e16 TrainerCardMainInputs.left 04:6e26 TrainerCardMainInputs.right -04:6e37 EmptyFunction12e37 +04:6e37 EmptyTrainerCardFunction 04:6e38 TrainerCardScroll 04:6e49 TrainerCardClearTileMap 04:6e5c TrainerCardSetWindowY @@ -3504,9 +3499,9 @@ 05:410f LoadUsedSpritesGFX.skip 05:4127 LoadUsedSpritesGFX.no_still_sprite_1 05:4132 LoadUsedSpritesGFX.no_still_sprite_2 -05:4133 Function14133 +05:4133 Unreferenced_LoadOverworldSprite_NPCSlot 05:4144 LoadOverworldSprite_PlayerSlot -05:414a LoadOverworldSprite_FollowerSlot +05:414a Unreferenced_LoadOverworldSprite_FollowerSlot 05:4150 LoadOverworldSprite 05:4161 LoadOverworldSprite.dont_copy 05:417d GetOverworldSpriteData @@ -8352,9 +8347,9 @@ 23:42d9 UngroupHealingMachineSprites.ungroup 23:42dc UpdateTimeOfDayPal 23:42e3 _TimeOfDayPals -23:42fe _LABEL_8C2FE_ -23:4313 _LABEL_8C313_ -23:4325 Function8c325 +23:42fe Unreferenced_ResetTimeOfDayPal +23:4313 Unreferenced_SetTimeOfDayPal +23:4325 ChangeTimeOfDayPal 23:4335 _UpdateTimePals 23:433e OverworldFadeIn 23:4349 OverworldFadeOut @@ -8606,7 +8601,7 @@ 23:53ab AnimSeq_GSTitleFlameNote.zero 23:53c2 AnimSeq_GSTitleFlameNote.one 23:53ec AnimSeq_MinigamePikachu -23:540b Data8d40b +23:540b AnimSeq_MinigamePikachu.pikachu_framesets 23:540f AnimSeq_MinigamePikachuTail 23:5418 AnimSeq_MinigameNote 23:541c AnimSeq_MinigameNote.anon_dw @@ -8944,12 +8939,12 @@ 24:47a8 ReelAction_StopReelIgnoreJoypad 24:47b2 ReelAction_StopReelIgnoreJoypad.EndReel 24:47bc ReelAction_StopReelIgnoreJoypad.clear_reel_oam -24:47c8 Function907c8 -24:47f6 Function907c8.asm907f6 -24:4805 Function90805 -24:4814 Function90805.asm90814 -24:481b Function90805.loop -24:4822 Function90822 +24:47c8 Slots_PayoutAnim +24:47f6 Slots_PayoutAnim.seven +24:4805 Slots_PlaceReelTiles +24:4814 Slots_PlaceReelTiles.place +24:481b Slots_PlaceReelTiles.loop +24:4822 Slots_CheckReelTiles 24:486b ReelAction_StopReel1 24:487f ReelAction_StopReel1.NoBias 24:4883 ReelAction_StopReel1.CheckForBias @@ -13133,16 +13128,16 @@ 3a:4070 UpdateChannel.noteover 3a:4076 UpdateChannel.continue_sound_update 3a:407a DisablePitchWheel -3a:4081 Unreferenced_Functione8081 -3a:408c Unreferenced_Functione8081.fail -3a:408e Unreferenced_Functione8081.disable_music -3a:4093 Unreferenced_Functione8081.disable_sfx -3a:409e Unreferenced_Functione8081.clear_loop -3a:40a2 Unreferenced_Functione8081.done +3a:4081 Unreferenced_MuteAudio +3a:408c Unreferenced_MuteAudio.fail +3a:408e Unreferenced_MuteAudio.disable_music +3a:4093 Unreferenced_MuteAudio.disable_sfx +3a:409e Unreferenced_MuteAudio.clear_loop +3a:40a2 Unreferenced_MuteAudio.done 3a:40a4 GetChannelRegisters 3a:40b2 GetChannelRegisters.registers -3a:40b6 Functione80b6 -3a:40f3 Functione80b6.end +3a:40b6 ContinueSoundUpdate +3a:40f3 ContinueSoundUpdate.end 3a:40fa UpdateChannels 3a:410b UpdateChannels.jumptable 3a:411b UpdateChannels.Channel1 @@ -13178,7 +13173,7 @@ 3a:42ce IsChannelSFXOn.off 3a:42d0 IsAnySFXOn 3a:42ee IsAnySFXOn.on -3a:42f0 Functione82f0 +3a:42f0 SetupPlayDanger 3a:4307 PlayDanger 3a:431e PlayDanger.halfway 3a:4323 PlayDanger.begin @@ -13229,7 +13224,7 @@ 3a:45b9 LoadNote.flag_0e 3a:45c2 LoadNote.flag_0d 3a:45cb LoadNote.flag_0b -3a:45d8 Functione85d8 +3a:45d8 CheckChannelFlags2 3a:4605 HandleDuty 3a:461b ApplyPitchSlide 3a:465e ApplyPitchSlide.decreasing @@ -14154,23 +14149,29 @@ 3f:4657 FieldDebug_SpriteViewer.set_following 3f:4663 FieldDebug_SpriteViewer.FollowPromptString 3f:4672 FieldDebug_SpriteViewer.SetStartingPoint -3f:467d LoadUnderDevelopmentString -3f:4681 LoadUnderDevelopmentString.String -3f:4689 Functionfc689 -3f:469c Functionfc69c -3f:46bb Functionfc6bb -3f:46be Functionfc6be -3f:46de Datafc6de -3f:46fe Datafc6fe -3f:470e Datafc70e -3f:471e Datafc71e -3f:472e Datafc72e -3f:473e Datafc73e -3f:474e Datafc74e -3f:475e Datafc75e -3f:476e Datafc76e -3f:477e Datafc77e -3f:478e Datafc78e +3f:467d FieldDebug_SpriteViewer.LoadUnderDevelopmentString +3f:4681 FieldDebug_SpriteViewer.String +3f:4689 SetupSpriteViewerSpriteWalkingTilemap +3f:469c SetupSpriteViewerSpriteWalkingTilemap.loop +3f:46bb SetupSpriteViewerSpriteTilemap +3f:46be SetupSpriteViewerSpriteTilemap.loop +3f:46de SpriteViewerSpriteTilemap +3f:46fe SpriteViewerSpriteTilemap.FacingStepDown0 +3f:46fe SpriteViewerSpriteTilemap.FacingStepDown2 +3f:470e SpriteViewerSpriteTilemap.FacingStepDown1 +3f:471e SpriteViewerSpriteTilemap.FacingStepDown3 +3f:472e SpriteViewerSpriteTilemap.FacingStepUp0 +3f:472e SpriteViewerSpriteTilemap.FacingStepUp2 +3f:473e SpriteViewerSpriteTilemap.FacingStepUp1 +3f:474e SpriteViewerSpriteTilemap.FacingStepUp3 +3f:475e SpriteViewerSpriteTilemap.FacingStepLeft0 +3f:475e SpriteViewerSpriteTilemap.FacingStepLeft2 +3f:476e SpriteViewerSpriteTilemap.FacingStepRight0 +3f:476e SpriteViewerSpriteTilemap.FacingStepRight2 +3f:477e SpriteViewerSpriteTilemap.FacingStepLeft1 +3f:477e SpriteViewerSpriteTilemap.FacingStepLeft3 +3f:478e SpriteViewerSpriteTilemap.FacingStepRight1 +3f:478e SpriteViewerSpriteTilemap.FacingStepRight3 3f:479e FieldDebug_NamePlayer 3f:47cb FieldDebug_Toolgear 3f:47da FieldDebug_Toolgear.Jumptable @@ -18450,6 +18451,61 @@ 02:ba62 sBox5Mon30Nickname 02:ba68 sBox5End 02:ba68 sBox5MonNicknamesEnd +02:ba68 sPartyMailBackup +02:ba68 sPartyMon1MailBackup +02:ba68 sPartyMon1MailBackupMessage +02:ba88 sPartyMon1MailBackupMessageEnd +02:ba89 sPartyMon1MailBackupAuthor +02:ba8f sPartyMon1MailBackupAuthorNationality +02:ba91 sPartyMon1MailBackupAuthorID +02:ba93 sPartyMon1MailBackupSpecies +02:ba94 sPartyMon1MailBackupType +02:ba95 sPartyMon1MailBackupEnd +02:ba95 sPartyMon2MailBackup +02:ba95 sPartyMon2MailBackupMessage +02:bab5 sPartyMon2MailBackupMessageEnd +02:bab6 sPartyMon2MailBackupAuthor +02:babc sPartyMon2MailBackupAuthorNationality +02:babe sPartyMon2MailBackupAuthorID +02:bac0 sPartyMon2MailBackupSpecies +02:bac1 sPartyMon2MailBackupType +02:bac2 sPartyMon2MailBackupEnd +02:bac2 sPartyMon3MailBackup +02:bac2 sPartyMon3MailBackupMessage +02:bae2 sPartyMon3MailBackupMessageEnd +02:bae3 sPartyMon3MailBackupAuthor +02:bae9 sPartyMon3MailBackupAuthorNationality +02:baeb sPartyMon3MailBackupAuthorID +02:baed sPartyMon3MailBackupSpecies +02:baee sPartyMon3MailBackupType +02:baef sPartyMon3MailBackupEnd +02:baef sPartyMon4MailBackup +02:baef sPartyMon4MailBackupMessage +02:bb0f sPartyMon4MailBackupMessageEnd +02:bb10 sPartyMon4MailBackupAuthor +02:bb16 sPartyMon4MailBackupAuthorNationality +02:bb18 sPartyMon4MailBackupAuthorID +02:bb1a sPartyMon4MailBackupSpecies +02:bb1b sPartyMon4MailBackupType +02:bb1c sPartyMon4MailBackupEnd +02:bb1c sPartyMon5MailBackup +02:bb1c sPartyMon5MailBackupMessage +02:bb3c sPartyMon5MailBackupMessageEnd +02:bb3d sPartyMon5MailBackupAuthor +02:bb43 sPartyMon5MailBackupAuthorNationality +02:bb45 sPartyMon5MailBackupAuthorID +02:bb47 sPartyMon5MailBackupSpecies +02:bb48 sPartyMon5MailBackupType +02:bb49 sPartyMon5MailBackupEnd +02:bb49 sPartyMon6MailBackup +02:bb49 sPartyMon6MailBackupMessage +02:bb69 sPartyMon6MailBackupMessageEnd +02:bb6a sPartyMon6MailBackupAuthor +02:bb70 sPartyMon6MailBackupAuthorNationality +02:bb72 sPartyMon6MailBackupAuthorID +02:bb74 sPartyMon6MailBackupSpecies +02:bb75 sPartyMon6MailBackupType +02:bb76 sPartyMon6MailBackupEnd 03:a000 sBox6 03:a000 sBox6Count 03:a001 sBox6Species @@ -22294,62 +22350,7 @@ 03:bb72 sPartyMon6MailAuthorID 03:bb74 sPartyMon6MailSpecies 03:bb75 sPartyMon6MailType -03:bb76 sPartyMailBackup -03:bb76 sPartyMon1MailBackup -03:bb76 sPartyMon1MailBackupMessage 03:bb76 sPartyMon6MailEnd -03:bb96 sPartyMon1MailBackupMessageEnd -03:bb97 sPartyMon1MailBackupAuthor -03:bb9d sPartyMon1MailBackupAuthorNationality -03:bb9f sPartyMon1MailBackupAuthorID -03:bba1 sPartyMon1MailBackupSpecies -03:bba2 sPartyMon1MailBackupType -03:bba3 sPartyMon1MailBackupEnd -03:bba3 sPartyMon2MailBackup -03:bba3 sPartyMon2MailBackupMessage -03:bbc3 sPartyMon2MailBackupMessageEnd -03:bbc4 sPartyMon2MailBackupAuthor -03:bbca sPartyMon2MailBackupAuthorNationality -03:bbcc sPartyMon2MailBackupAuthorID -03:bbce sPartyMon2MailBackupSpecies -03:bbcf sPartyMon2MailBackupType -03:bbd0 sPartyMon2MailBackupEnd -03:bbd0 sPartyMon3MailBackup -03:bbd0 sPartyMon3MailBackupMessage -03:bbf0 sPartyMon3MailBackupMessageEnd -03:bbf1 sPartyMon3MailBackupAuthor -03:bbf7 sPartyMon3MailBackupAuthorNationality -03:bbf9 sPartyMon3MailBackupAuthorID -03:bbfb sPartyMon3MailBackupSpecies -03:bbfc sPartyMon3MailBackupType -03:bbfd sPartyMon3MailBackupEnd -03:bbfd sPartyMon4MailBackup -03:bbfd sPartyMon4MailBackupMessage -03:bc1d sPartyMon4MailBackupMessageEnd -03:bc1e sPartyMon4MailBackupAuthor -03:bc24 sPartyMon4MailBackupAuthorNationality -03:bc26 sPartyMon4MailBackupAuthorID -03:bc28 sPartyMon4MailBackupSpecies -03:bc29 sPartyMon4MailBackupType -03:bc2a sPartyMon4MailBackupEnd -03:bc2a sPartyMon5MailBackup -03:bc2a sPartyMon5MailBackupMessage -03:bc4a sPartyMon5MailBackupMessageEnd -03:bc4b sPartyMon5MailBackupAuthor -03:bc51 sPartyMon5MailBackupAuthorNationality -03:bc53 sPartyMon5MailBackupAuthorID -03:bc55 sPartyMon5MailBackupSpecies -03:bc56 sPartyMon5MailBackupType -03:bc57 sPartyMon5MailBackupEnd -03:bc57 sPartyMon6MailBackup -03:bc57 sPartyMon6MailBackupMessage -03:bc77 sPartyMon6MailBackupMessageEnd -03:bc78 sPartyMon6MailBackupAuthor -03:bc7e sPartyMon6MailBackupAuthorNationality -03:bc80 sPartyMon6MailBackupAuthorID -03:bc82 sPartyMon6MailBackupSpecies -03:bc83 sPartyMon6MailBackupType -03:bc84 sPartyMon6MailBackupEnd 03:bffd sChecksum 00:c000 wChannel1 00:c000 wChannel1MusicID @@ -24082,6 +24083,9 @@ 00:cc3d wSpriteViewerSavedMenuPointerY 00:cc3e wSpriteViewerJumptableIndex 00:cc3f wMovementBuffer +00:cc3f wMovementXBuffer +00:cc40 wMovementYBuffer +00:cc41 wMovementSpriteViewerDirection 00:cc45 wFacingDirectionList_Old 00:cc4c wEmotionBubbleSpriteIndex_Old 00:cc4c wSavedPlayerScreenY_Old @@ -25036,6 +25040,7 @@ 00:d642 wUnusedAddOutdoorSpritesReturnValue 00:d643 wBGMapAnchor 00:d645 wUsedSprites +00:d646 wUsedFollowerSprites 00:d647 wUsedNPCSprites 00:d64f wUsedStaticSprites 00:d651 wUsedSpritesEnd diff --git a/pokegold-spaceworld-debug.map b/pokegold-spaceworld-debug.map index b59f39bd..97ce9230 100644 --- a/pokegold-spaceworld-debug.map +++ b/pokegold-spaceworld-debug.map @@ -2,7 +2,7 @@ SUMMARY: ROM0: 16236 bytes used / 148 free ROMX: 1032192 bytes used / 0 free in 63 banks SRAM: 20395 bytes used / 12373 free in 4 banks - WRAM0: 7742 bytes used / 450 free + WRAM0: 8139 bytes used / 53 free HRAM: 117 bytes used / 10 free ROM0 bank #0: @@ -827,10 +827,10 @@ ROM0 bank #0: $303a = TextAsmEnd.stop $303b = CallMapTextSubroutine $3051 = CallMapTextSubroutine.Return - $3055 = Function3055 - $3058 = Function3055.Loop - $3062 = asm_3062 - $307a = Function307a + $3055 = CheckAllMapObjects + $3058 = CheckAllMapObjects.Loop + $3062 = TalkingToBGObject + $307a = ResetTalkingTarget $3085 = PrintTextboxDebugNumbers $3097 = PrintTextboxDebugNumbers.CheckSign $309e = PrintTextboxDebugNumbers.PrintNum @@ -844,7 +844,7 @@ ROM0 bank #0: $314a = TextboxIdle.next $314e = PrepareTextbox $3171 = TextboxCleanup - $318f = Function318f + $318f = ReloadObjectGFX $319b = TurnNPCTalkingTo $31b9 = TurnNPCTalkingTo.Jump $31c3 = Unreferenced_CheckTrainerBattle @@ -955,7 +955,7 @@ ROM0 bank #0: $360b = RestoreScreenAndReloadTiles $361e = ClearBGPalettes $3621 = WaitBGMap - $362b = SetPalettes + $362b = SetDefaultBGPAndOBP $3634 = ClearPalettes $363c = GetMemSGBLayout $363e = GetSGBLayout @@ -1303,8 +1303,8 @@ ROMX bank #1: $4965 = FacePlayerObject.closer_horizontal $496d = FacePlayerObject.done $4973 = FacePlayerObject.FlipNegativeToPositive - $4979 = Stubbed_UpdateYOffset - $4994 = Stubbed_UpdateYOffset.y_offsets + $4979 = Stubbed_SwayObject + $4994 = Stubbed_SwayObject.y_offsets $499c = UpdateJumpPosition $49d0 = UpdateJumpPosition.got_direction $49dc = UpdateJumpPosition.y_offsets @@ -1325,8 +1325,8 @@ ROMX bank #1: $4af6 = StepFunction_TeleportTo.InitFinalSpin $4b00 = StepFunction_TeleportTo.DoFinalSpin $4b0c = StepFunction_TeleportTo.FinishStep - $4b22 = Unreferenced_Function4b22 - $4b25 = Stub_Function4b25 + $4b22 = Unreferenced_StrengthBoulderDust_Old + $4b25 = Stub_SpawnStrengthBoulderDust_Old $4b26 = SpawnShadow $4b42 = SpawnShadow.ShadowObject $4b48 = SpawnStrengthBoulderDust @@ -1517,8 +1517,8 @@ ROMX bank #1: $57de = GivePokemon $57eb = AddRandomPokemonToBox $57ed = AddRandomPokemonToBox.loop - $5818 = RandomUnder246 - $5818 = RandomUnder246.loop + $5818 = RandomSpecies_RaiEnSuiOrUnder + $5818 = RandomSpecies_RaiEnSuiOrUnder.loop $5823 = FillTMs $582a = FillTMs.loop $582f = DebugGiveKeyItems @@ -1903,9 +1903,8 @@ ROMX bank #2: $4242 = GetSpriteVTile.VTileOffsets $424c = CheckObjectEnteringVisibleRange $4259 = CheckObjectEnteringVisibleRange.dw - $4261 = EmptyFunction8261 - $4262 = Unreferenced_CheckObjectEnteringVisibleRange_Alternate - $426e = Unreferenced_CheckObjectEnteringVisibleRange_Alternate.dw + $4261 = CheckObjectEnteringVisibleRange_Alternate + $426e = CheckObjectEnteringVisibleRange_Alternate.dw $4276 = CheckVisibleRange_UpAlt $427d = CheckVisibleRange_DownAlt $4284 = CheckVisibleRange_LeftAlt @@ -2561,7 +2560,6 @@ ROMX bank #3: $52a8 = FailDig $52b4 = Text_CantUseDigHere $52c2 = DigScript - $52da = EmptyFunctiond2da $52db = TeleportFunction $52df = TeleportFunction.next $52ee = TeleportFunction.finish @@ -2596,7 +2594,7 @@ ROMX bank #3: $54e3 = Unused_IsKeyItem_Old.cant_toss $54e6 = _HandlePlayerStep $54f8 = _HandlePlayerStep.start - $54fa = _HandlePlayerStep.unreferenced_d4fa + $54fa = _HandlePlayerStep.unreferenced_checkobjects $5505 = _HandlePlayerStep._start $5514 = _HandlePlayerStep.update_overworld_map $5519 = _HandlePlayerStep.update_player_coords @@ -2905,16 +2903,13 @@ ROMX bank #3: $6fc9 = ReviveEffect.skip_to_revive $6fd9 = ReviveEffect.revive_half_hp $6fdc = ReviveEffect.finish_revive - $6fed = Unreferenced_EmptyFunctionefed $6fee = FullRestoreEffect $701a = FullRestoreEffect.NotAtFullHealth $7049 = FullRestoreEffect.not_in_battle - $705a = Unreferenced_EmptyFunctionf05a $705b = RestoreHPEffect $7086 = RestoreHPEffect.get_heal_amount $708c = RestoreHPEffect.continue_heal $709e = RestoreHPEffect.not_in_battle - $70af = Unreferenced_EmptyFunctionf0af $70b0 = HealHP_SFX_GFX $70cf = UseItem_SelectMon $70d8 = ItemActionTextWaitButton @@ -3420,9 +3415,9 @@ ROMX bank #4: $6753 = PokemonAskSwapItemText $6784 = GetPartyItemOffset $678c = ReceiveItemFromPokemon - $6798 = UnusedHandleItemJumptable - $67a9 = UnusedItemJumptable - $67b7 = EmptyFunction127b7 + $6798 = UnusedHandleRecieveItemJumptable + $67a9 = UnusedRecieveItemJumptable + $67b7 = PartyGiveItem $67b8 = ChangeBackpackPocket $67c0 = PartyBallPocket $67cb = PartyBallPocket.exit @@ -3498,7 +3493,7 @@ ROMX bank #4: $6e0f = TrainerCardMainInputs.exit $6e16 = TrainerCardMainInputs.left $6e26 = TrainerCardMainInputs.right - $6e37 = EmptyFunction12e37 + $6e37 = EmptyTrainerCardFunction $6e38 = TrainerCardScroll $6e49 = TrainerCardClearTileMap $6e5c = TrainerCardSetWindowY @@ -3570,9 +3565,9 @@ ROMX bank #5: $410f = LoadUsedSpritesGFX.skip $4127 = LoadUsedSpritesGFX.no_still_sprite_1 $4132 = LoadUsedSpritesGFX.no_still_sprite_2 - $4133 = Function14133 + $4133 = Unreferenced_LoadOverworldSprite_NPCSlot $4144 = LoadOverworldSprite_PlayerSlot - $414a = LoadOverworldSprite_FollowerSlot + $414a = Unreferenced_LoadOverworldSprite_FollowerSlot $4150 = LoadOverworldSprite $4161 = LoadOverworldSprite.dont_copy $417d = GetOverworldSpriteData @@ -8569,9 +8564,9 @@ ROMX bank #35: $42d9 = UngroupHealingMachineSprites.ungroup $42dc = UpdateTimeOfDayPal $42e3 = _TimeOfDayPals - $42fe = _LABEL_8C2FE_ - $4313 = _LABEL_8C313_ - $4325 = Function8c325 + $42fe = Unreferenced_ResetTimeOfDayPal + $4313 = Unreferenced_SetTimeOfDayPal + $4325 = ChangeTimeOfDayPal $4335 = _UpdateTimePals $433e = OverworldFadeIn $4349 = OverworldFadeOut @@ -8823,7 +8818,7 @@ ROMX bank #35: $53ab = AnimSeq_GSTitleFlameNote.zero $53c2 = AnimSeq_GSTitleFlameNote.one $53ec = AnimSeq_MinigamePikachu - $540b = Data8d40b + $540b = AnimSeq_MinigamePikachu.pikachu_framesets $540f = AnimSeq_MinigamePikachuTail $5418 = AnimSeq_MinigameNote $541c = AnimSeq_MinigameNote.anon_dw @@ -9168,12 +9163,12 @@ ROMX bank #36: $47a8 = ReelAction_StopReelIgnoreJoypad $47b2 = ReelAction_StopReelIgnoreJoypad.EndReel $47bc = ReelAction_StopReelIgnoreJoypad.clear_reel_oam - $47c8 = Function907c8 - $47f6 = Function907c8.asm907f6 - $4805 = Function90805 - $4814 = Function90805.asm90814 - $481b = Function90805.loop - $4822 = Function90822 + $47c8 = Slots_PayoutAnim + $47f6 = Slots_PayoutAnim.seven + $4805 = Slots_PlaceReelTiles + $4814 = Slots_PlaceReelTiles.place + $481b = Slots_PlaceReelTiles.loop + $4822 = Slots_CheckReelTiles $486b = ReelAction_StopReel1 $487f = ReelAction_StopReel1.NoBias $4883 = ReelAction_StopReel1.CheckForBias @@ -13461,16 +13456,16 @@ ROMX bank #58: $4070 = UpdateChannel.noteover $4076 = UpdateChannel.continue_sound_update $407a = DisablePitchWheel - $4081 = Unreferenced_Functione8081 - $408c = Unreferenced_Functione8081.fail - $408e = Unreferenced_Functione8081.disable_music - $4093 = Unreferenced_Functione8081.disable_sfx - $409e = Unreferenced_Functione8081.clear_loop - $40a2 = Unreferenced_Functione8081.done + $4081 = Unreferenced_MuteAudio + $408c = Unreferenced_MuteAudio.fail + $408e = Unreferenced_MuteAudio.disable_music + $4093 = Unreferenced_MuteAudio.disable_sfx + $409e = Unreferenced_MuteAudio.clear_loop + $40a2 = Unreferenced_MuteAudio.done $40a4 = GetChannelRegisters $40b2 = GetChannelRegisters.registers - $40b6 = Functione80b6 - $40f3 = Functione80b6.end + $40b6 = ContinueSoundUpdate + $40f3 = ContinueSoundUpdate.end $40fa = UpdateChannels $410b = UpdateChannels.jumptable $411b = UpdateChannels.Channel1 @@ -13506,7 +13501,7 @@ ROMX bank #58: $42ce = IsChannelSFXOn.off $42d0 = IsAnySFXOn $42ee = IsAnySFXOn.on - $42f0 = Functione82f0 + $42f0 = SetupPlayDanger $4307 = PlayDanger $431e = PlayDanger.halfway $4323 = PlayDanger.begin @@ -13557,7 +13552,7 @@ ROMX bank #58: $45b9 = LoadNote.flag_0e $45c2 = LoadNote.flag_0d $45cb = LoadNote.flag_0b - $45d8 = Functione85d8 + $45d8 = CheckChannelFlags2 $4605 = HandleDuty $461b = ApplyPitchSlide $465e = ApplyPitchSlide.decreasing @@ -14508,23 +14503,29 @@ ROMX bank #63: $4657 = FieldDebug_SpriteViewer.set_following $4663 = FieldDebug_SpriteViewer.FollowPromptString $4672 = FieldDebug_SpriteViewer.SetStartingPoint - $467d = LoadUnderDevelopmentString - $4681 = LoadUnderDevelopmentString.String - $4689 = Functionfc689 - $469c = Functionfc69c - $46bb = Functionfc6bb - $46be = Functionfc6be - $46de = Datafc6de - $46fe = Datafc6fe - $470e = Datafc70e - $471e = Datafc71e - $472e = Datafc72e - $473e = Datafc73e - $474e = Datafc74e - $475e = Datafc75e - $476e = Datafc76e - $477e = Datafc77e - $478e = Datafc78e + $467d = FieldDebug_SpriteViewer.LoadUnderDevelopmentString + $4681 = FieldDebug_SpriteViewer.String + $4689 = SetupSpriteViewerSpriteWalkingTilemap + $469c = SetupSpriteViewerSpriteWalkingTilemap.loop + $46bb = SetupSpriteViewerSpriteTilemap + $46be = SetupSpriteViewerSpriteTilemap.loop + $46de = SpriteViewerSpriteTilemap + $46fe = SpriteViewerSpriteTilemap.FacingStepDown0 + $46fe = SpriteViewerSpriteTilemap.FacingStepDown2 + $470e = SpriteViewerSpriteTilemap.FacingStepDown1 + $471e = SpriteViewerSpriteTilemap.FacingStepDown3 + $472e = SpriteViewerSpriteTilemap.FacingStepUp0 + $472e = SpriteViewerSpriteTilemap.FacingStepUp2 + $473e = SpriteViewerSpriteTilemap.FacingStepUp1 + $474e = SpriteViewerSpriteTilemap.FacingStepUp3 + $475e = SpriteViewerSpriteTilemap.FacingStepLeft0 + $475e = SpriteViewerSpriteTilemap.FacingStepLeft2 + $476e = SpriteViewerSpriteTilemap.FacingStepRight0 + $476e = SpriteViewerSpriteTilemap.FacingStepRight2 + $477e = SpriteViewerSpriteTilemap.FacingStepLeft1 + $477e = SpriteViewerSpriteTilemap.FacingStepLeft3 + $478e = SpriteViewerSpriteTilemap.FacingStepRight1 + $478e = SpriteViewerSpriteTilemap.FacingStepRight3 $479e = FieldDebug_NamePlayer $47cb = FieldDebug_Toolgear $47da = FieldDebug_Toolgear.Jumptable @@ -15016,7 +15017,7 @@ SRAM bank #0: $a188 = sSpriteBuffer1 $a310 = sSpriteBuffer2 EMPTY: $a498-$a5ff ($0168 bytes) - SECTION: $a600-$ae4a ($084b bytes) ["Unknown, bank 0"] + SECTION: $a600-$ae4a ($084b bytes) ["Save Game Data"] $a600 = sOptions $a608 = sGameData $adda = sGameData2 @@ -15035,7 +15036,7 @@ SRAM bank #1: TOTAL EMPTY: $1c27 bytes SRAM bank #2: - SECTION: $a000-$ba67 ($1a68 bytes) ["Boxes 1-5"] + SECTION: $a000-$bb75 ($1b76 bytes) ["Boxes 1-5"] $a000 = sBox1Count $a000 = sBox1 $a001 = sBox1Species @@ -18824,13 +18825,68 @@ SRAM bank #2: $ba56 = sBox5Mon28Nickname $ba5c = sBox5Mon29Nickname $ba62 = sBox5Mon30Nickname + $ba68 = sPartyMon1MailBackupMessage + $ba68 = sPartyMon1MailBackup + $ba68 = sPartyMailBackup $ba68 = sBox5End $ba68 = sBox5MonNicknamesEnd - EMPTY: $ba68-$bfff ($0598 bytes) - TOTAL EMPTY: $0598 bytes + $ba88 = sPartyMon1MailBackupMessageEnd + $ba89 = sPartyMon1MailBackupAuthor + $ba8f = sPartyMon1MailBackupAuthorNationality + $ba91 = sPartyMon1MailBackupAuthorID + $ba93 = sPartyMon1MailBackupSpecies + $ba94 = sPartyMon1MailBackupType + $ba95 = sPartyMon2MailBackupMessage + $ba95 = sPartyMon2MailBackup + $ba95 = sPartyMon1MailBackupEnd + $bab5 = sPartyMon2MailBackupMessageEnd + $bab6 = sPartyMon2MailBackupAuthor + $babc = sPartyMon2MailBackupAuthorNationality + $babe = sPartyMon2MailBackupAuthorID + $bac0 = sPartyMon2MailBackupSpecies + $bac1 = sPartyMon2MailBackupType + $bac2 = sPartyMon3MailBackupMessage + $bac2 = sPartyMon3MailBackup + $bac2 = sPartyMon2MailBackupEnd + $bae2 = sPartyMon3MailBackupMessageEnd + $bae3 = sPartyMon3MailBackupAuthor + $bae9 = sPartyMon3MailBackupAuthorNationality + $baeb = sPartyMon3MailBackupAuthorID + $baed = sPartyMon3MailBackupSpecies + $baee = sPartyMon3MailBackupType + $baef = sPartyMon4MailBackupMessage + $baef = sPartyMon4MailBackup + $baef = sPartyMon3MailBackupEnd + $bb0f = sPartyMon4MailBackupMessageEnd + $bb10 = sPartyMon4MailBackupAuthor + $bb16 = sPartyMon4MailBackupAuthorNationality + $bb18 = sPartyMon4MailBackupAuthorID + $bb1a = sPartyMon4MailBackupSpecies + $bb1b = sPartyMon4MailBackupType + $bb1c = sPartyMon5MailBackupMessage + $bb1c = sPartyMon5MailBackup + $bb1c = sPartyMon4MailBackupEnd + $bb3c = sPartyMon5MailBackupMessageEnd + $bb3d = sPartyMon5MailBackupAuthor + $bb43 = sPartyMon5MailBackupAuthorNationality + $bb45 = sPartyMon5MailBackupAuthorID + $bb47 = sPartyMon5MailBackupSpecies + $bb48 = sPartyMon5MailBackupType + $bb49 = sPartyMon6MailBackupMessage + $bb49 = sPartyMon6MailBackup + $bb49 = sPartyMon5MailBackupEnd + $bb69 = sPartyMon6MailBackupMessageEnd + $bb6a = sPartyMon6MailBackupAuthor + $bb70 = sPartyMon6MailBackupAuthorNationality + $bb72 = sPartyMon6MailBackupAuthorID + $bb74 = sPartyMon6MailBackupSpecies + $bb75 = sPartyMon6MailBackupType + $bb76 = sPartyMon6MailBackupEnd + EMPTY: $bb76-$bfff ($048a bytes) + TOTAL EMPTY: $048a bytes SRAM bank #3: - SECTION: $a000-$bc83 ($1c84 bytes) ["Boxes 6-10"] + SECTION: $a000-$bb75 ($1b76 bytes) ["Boxes 6-10"] $a000 = sBox6Count $a000 = sBox6 $a001 = sBox6Species @@ -22675,69 +22731,14 @@ SRAM bank #3: $bb72 = sPartyMon6MailAuthorID $bb74 = sPartyMon6MailSpecies $bb75 = sPartyMon6MailType - $bb76 = sPartyMon1MailBackupMessage - $bb76 = sPartyMon1MailBackup - $bb76 = sPartyMailBackup $bb76 = sPartyMon6MailEnd - $bb96 = sPartyMon1MailBackupMessageEnd - $bb97 = sPartyMon1MailBackupAuthor - $bb9d = sPartyMon1MailBackupAuthorNationality - $bb9f = sPartyMon1MailBackupAuthorID - $bba1 = sPartyMon1MailBackupSpecies - $bba2 = sPartyMon1MailBackupType - $bba3 = sPartyMon2MailBackupMessage - $bba3 = sPartyMon2MailBackup - $bba3 = sPartyMon1MailBackupEnd - $bbc3 = sPartyMon2MailBackupMessageEnd - $bbc4 = sPartyMon2MailBackupAuthor - $bbca = sPartyMon2MailBackupAuthorNationality - $bbcc = sPartyMon2MailBackupAuthorID - $bbce = sPartyMon2MailBackupSpecies - $bbcf = sPartyMon2MailBackupType - $bbd0 = sPartyMon3MailBackupMessage - $bbd0 = sPartyMon3MailBackup - $bbd0 = sPartyMon2MailBackupEnd - $bbf0 = sPartyMon3MailBackupMessageEnd - $bbf1 = sPartyMon3MailBackupAuthor - $bbf7 = sPartyMon3MailBackupAuthorNationality - $bbf9 = sPartyMon3MailBackupAuthorID - $bbfb = sPartyMon3MailBackupSpecies - $bbfc = sPartyMon3MailBackupType - $bbfd = sPartyMon4MailBackupMessage - $bbfd = sPartyMon4MailBackup - $bbfd = sPartyMon3MailBackupEnd - $bc1d = sPartyMon4MailBackupMessageEnd - $bc1e = sPartyMon4MailBackupAuthor - $bc24 = sPartyMon4MailBackupAuthorNationality - $bc26 = sPartyMon4MailBackupAuthorID - $bc28 = sPartyMon4MailBackupSpecies - $bc29 = sPartyMon4MailBackupType - $bc2a = sPartyMon5MailBackupMessage - $bc2a = sPartyMon5MailBackup - $bc2a = sPartyMon4MailBackupEnd - $bc4a = sPartyMon5MailBackupMessageEnd - $bc4b = sPartyMon5MailBackupAuthor - $bc51 = sPartyMon5MailBackupAuthorNationality - $bc53 = sPartyMon5MailBackupAuthorID - $bc55 = sPartyMon5MailBackupSpecies - $bc56 = sPartyMon5MailBackupType - $bc57 = sPartyMon6MailBackupMessage - $bc57 = sPartyMon6MailBackup - $bc57 = sPartyMon5MailBackupEnd - $bc77 = sPartyMon6MailBackupMessageEnd - $bc78 = sPartyMon6MailBackupAuthor - $bc7e = sPartyMon6MailBackupAuthorNationality - $bc80 = sPartyMon6MailBackupAuthorID - $bc82 = sPartyMon6MailBackupSpecies - $bc83 = sPartyMon6MailBackupType - $bc84 = sPartyMon6MailBackupEnd - EMPTY: $bc84-$bffc ($0379 bytes) + EMPTY: $bb76-$bffc ($0487 bytes) SECTION: $bffd-$bfff ($0003 bytes) ["Checksum"] $bffd = sChecksum - TOTAL EMPTY: $0379 bytes + TOTAL EMPTY: $0487 bytes WRAM0 bank #0: - SECTION: $c000-$c1bb ($01bc bytes) ["Music engine RAM"] + SECTION: $c000-$c1ff ($0200 bytes) ["Music engine RAM"] $c000 = wMusic $c000 = wChannels $c000 = wChannel1 @@ -23081,7 +23082,6 @@ WRAM0 bank #0: $c1ba = wCryTracks $c1bb = wSFXDuration $c1bc = wMusicInitEnd - EMPTY: $c1bc-$c1ff ($0044 bytes) SECTION: $c200-$c5e7 ($03e8 bytes) ["OAM Buffer"] $c200 = wShadowOAM $c200 = wShadowOAMSprite00 @@ -24314,8 +24314,8 @@ WRAM0 bank #0: $cae3 = wWeatherCount $cb14 = wLinkDataEnd $cb14 = wOverworldMapBlocksEnd - SECTION: $cb14-$cb3b ($0028 bytes) ["CB14"] $cb14 = wBattleEnd + SECTION: $cb14-$ce5e ($034b bytes) ["Video"] $cb14 = wRedrawRowOrColumnSrcTiles $cb14 = wRedrawFlashlightDst0 $cb16 = wRedrawFlashlightSrc0 @@ -24324,9 +24324,7 @@ WRAM0 bank #0: $cb1c = wRedrawFlashlightSrc1 $cb1e = wRedrawFlashlightBlackDst1 $cb20 = wRedrawFlashlightWidthHeight - SECTION: $cb3c-$cb4b ($0010 bytes) ["CB3C"] $cb3c = wTileAnimBuffer - SECTION: $cb4c-$cb5c ($0011 bytes) ["CB4C"] $cb4c = wOtherPlayerLinkMode $cb4c = wLinkReceivedSyncBuffer $cb4d = wOtherPlayerLinkAction @@ -24339,8 +24337,6 @@ WRAM0 bank #0: $cb5b = wSelectedItem $cb5b = wCurSpecies $cb5c = wNamedObjectTypeBuffer - EMPTY: $cb5d-$cb5d ($0001 byte) - SECTION: $cb5e-$cb6f ($0012 bytes) ["CB5E"] $cb5e = wJumptableIndex $cb5f = wSlotsDelay $cb5f = wMemoryGameCardChoice @@ -24369,7 +24365,6 @@ WRAM0 bank #0: $cb6d = wPlayerStepVectorY $cb6e = wPlayerStepFlags $cb6f = wPlayerStepDirection - SECTION: $cb70-$cb7d ($000e bytes) ["CB70"] $cb70 = wQueuedMinorObjectGFX $cb71 = wVBCopyFarSize $cb72 = wVBCopyFarSrc @@ -24380,16 +24375,12 @@ WRAM0 bank #0: $cb79 = wMovementDataBank $cb7a = wMovementDataAddr $cb7c = wIndexedMovement2Pointer - EMPTY: $cb7e-$cb8f ($0012 bytes) - SECTION: $cb90-$cbb1 ($0022 bytes) ["Collision buffer"] $cb90 = wTileDown $cb91 = wTileUp $cb92 = wTileLeft $cb93 = wTileRight $cb94 = wScreenSave - SECTION: $cbb2-$cbf1 ($0040 bytes) ["CBB2"] $cbb2 = wToolgearBuffer - SECTION: $cbf2-$cbf9 ($0008 bytes) ["CBF2"] $cbf2 = wWindowData $cbf2 = wWindowStackPointer $cbf4 = wMenuJoypad @@ -24400,8 +24391,6 @@ WRAM0 bank #0: $cbf7 = wActiveBackpackPocket $cbf8 = wScrollingMenuCursorPosition $cbf9 = wWindowStackSize - EMPTY: $cbfa-$cc01 ($0008 bytes) - SECTION: $cc02-$cc2e ($002d bytes) ["CC02"] $cc02 = wMenuDataHeader $cc02 = wMenuFlags $cc03 = wMenuBorderTopCoord @@ -24446,8 +24435,6 @@ WRAM0 bank #0: $cc2b = wMenuCursorX $cc2c = wCursorOffCharacter $cc2d = wCursorCurrentTile - EMPTY: $cc2f-$cc31 ($0003 bytes) - SECTION: $cc32-$cc75 ($0044 bytes) ["CC32"] $cc32 = wVBlankJoyFrameCounter $cc33 = wVBlankOccurred $cc34 = wLastSpawnMapGroup @@ -24486,12 +24473,13 @@ WRAM0 bank #0: $cc3d = wPlayerSpinInPlaceAnimSoundID_Old $cc3e = wSpriteViewerJumptableIndex $cc3f = wMovementBuffer + $cc3f = wMovementXBuffer + $cc40 = wMovementYBuffer + $cc41 = wMovementSpriteViewerDirection $cc45 = wFacingDirectionList_Old $cc4c = wSavedPlayerScreenY_Old $cc4c = wEmotionBubbleSpriteIndex_Old $cc4d = wSavedPlayerFacingDirection_Old - EMPTY: $cc76-$cc99 ($0024 bytes) - SECTION: $cc9a-$ccc5 ($002c bytes) ["CC9A"] $cc9a = wSkatingDirection $cc9b = wCompanionCollisionFrameCounter $cc9c = wObjectMasks @@ -24515,38 +24503,28 @@ WRAM0 bank #0: $ccc3 = wPlaceBallsY $ccc4 = wLowHealthAlarmBuffer $ccc5 = wTileAnimationTimer - EMPTY: $ccc6-$ccc6 ($0001 byte) - SECTION: $ccc7-$ccc7 ($0001 byte) ["CCC7"] $ccc7 = wDisableVBlankOAMUpdate - EMPTY: $ccc8-$ccc9 ($0002 bytes) - SECTION: $ccca-$cccf ($0006 bytes) ["CCCA"] $ccca = wBGP $cccb = wOBP0 $cccc = wOBP1 $cccd = wNumHits $ccce = wDisableVBlankWYUpdate $cccf = wSGB - SECTION: $ccd0-$cd10 ($0041 bytes) ["CCD0"] $ccd0 = wSGBPalBuffer $ccd1 = wPlayerHPPal $ccd2 = wEnemyHPPal $ccd3 = wHPPals $ccd9 = wCurHPPal $cce1 = wSGBPals - SECTION: $cd11-$cd2f ($001f bytes) ["CD11"] $cd11 = wMonOrItemNameBuffer $cd1d = wTMHMMoveNameBackup $cd26 = wStringBuffer1 - EMPTY: $cd30-$cd30 ($0001 byte) - SECTION: $cd31-$cd3a ($000a bytes) ["CD31"] $cd31 = wStartDay $cd31 = wHPBarTempHP $cd31 = wStringBuffer2 $cd32 = wStartHour $cd33 = wStartMinute $cd33 = wGainBoostedExp - EMPTY: $cd3b-$cd3b ($0001 byte) - SECTION: $cd3c-$cd60 ($0025 bytes) ["CD3C"] $cd3c = wPartyMenuCursor $cd3c = wBillsPCCursor $cd3d = wRegularItemsCursor @@ -24579,8 +24557,6 @@ WRAM0 bank #0: $cd5d = wBattleResult $cd5f = wChosenStarter $cd60 = wCurMartCount - EMPTY: $cd61-$cd6f ($000f bytes) - SECTION: $cd70-$ce3e ($00cf bytes) ["CD70"] $cd70 = wListPointer $cd72 = wNamesPointer $cd74 = wItemAttributesPointer @@ -24771,8 +24747,7 @@ WRAM0 bank #0: $ce3c = wBuffer $ce3d = wTimeOfDay $ce3f = wNewGameWRAMEnd - EMPTY: $ce3f-$ce5e ($0020 bytes) - SECTION: $ce5f-$d266 ($0408 bytes) ["Options"] + SECTION: $ce5f-$ce66 ($0008 bytes) ["Options"] $ce5f = wOptions $ce60 = wSaveFileExists $ce60 = wSaveFileFlags @@ -24782,6 +24757,7 @@ WRAM0 bank #0: $ce64 = wDebugFlags2 $ce65 = wDebugFlags3 $ce66 = wDebugFlags4 + SECTION: $ce67-$d6a9 ($0843 bytes) ["Game Data"] $ce67 = wGameData $ce67 = wPlayerName $ce6d = wMomsName @@ -25407,8 +25383,6 @@ WRAM0 bank #0: $d264 = wPlayerState $d265 = wPlayerStarter $d266 = wRivalStarter - EMPTY: $d267-$d299 ($0033 bytes) - SECTION: $d29a-$d41e ($0185 bytes) ["Map Scene ID & Flags"] $d29a = wPlayerHouse2FSceneID $d29b = wPlayerHouse1FSceneID $d29c = wSilentHillSceneID @@ -25436,19 +25410,14 @@ WRAM0 bank #0: $d3a5 = wSilentHillsFlags $d3a6 = wOldCityPokecenter2FFlags $d41a = wEventFlags - EMPTY: $d41f-$d4a6 ($0088 bytes) - SECTION: $d4a7-$d4ad ($0007 bytes) ["D4A7"] $d4a7 = wPokedexMenuFlags $d4a8 = wUnusedLinkCommunicationByte $d4a9 = wGameModeFlags $d4ab = wJoypadFlags $d4ad = wMovementFlags_Old - EMPTY: $d4ae-$d4b1 ($0004 bytes) - SECTION: $d4b2-$d512 ($0061 bytes) ["wDigWarpNumber"] $d4b2 = wDigWarpNumber $d4b6 = wCurBox $d4b9 = wBoxNames - SECTION: $d513-$d650 ($013e bytes) ["Warp data"] $d513 = wWarpNumber $d514 = wCurrMapWarpCount $d515 = wCurrMapWarps @@ -25463,11 +25432,10 @@ WRAM0 bank #0: $d642 = wUnusedAddOutdoorSpritesReturnValue $d643 = wBGMapAnchor $d645 = wUsedSprites + $d646 = wUsedFollowerSprites $d647 = wUsedNPCSprites $d64f = wUsedStaticSprites $d651 = wUsedSpritesEnd - EMPTY: $d651-$d655 ($0005 bytes) - SECTION: $d656-$d903 ($02ae bytes) ["Map header"] $d656 = wMapGroup $d657 = wMapId $d658 = wOverworldMapAnchor @@ -25539,6 +25507,7 @@ WRAM0 bank #0: $d6a6 = wTilesetAnim $d6aa = wTilesetEnd $d6aa = wGameData2End + SECTION: $d6aa-$dfca ($0921 bytes) ["Party"] $d6aa = wPokemonData $d6aa = wPartyCount $d6ab = wPartySpecies @@ -25847,13 +25816,10 @@ WRAM0 bank #0: $d8fd = wBreedMon2End $d8fd = wBreedMonGenders $d8fe = wOTPlayerName - EMPTY: $d904-$d912 ($000f bytes) - SECTION: $d913-$d91a ($0008 bytes) ["D913"] $d913 = wOTPartyData $d913 = wOTPartyCount $d914 = wOTPartySpecies $d91a = wOTPartySpeciesEnd - SECTION: $d91b-$dfca ($06b0 bytes) ["Wild mon buffer"] $d91b = wWildMonData $d91b = wMornEncounterRate $d91b = wOTPartyMons @@ -26842,7 +26808,7 @@ WRAM0 bank #0: SECTION: $dfff ($0000 bytes) ["Stack Bottom"] $dfff = wStackBottom EMPTY: $dfff-$dfff ($0001 byte) - TOTAL EMPTY: $01c2 bytes + TOTAL EMPTY: $0035 bytes HRAM bank #0: SECTION: $ff80-$ff89 ($000a bytes) ["OAM DMA"] diff --git a/pokegold-spaceworld-debug.sym b/pokegold-spaceworld-debug.sym index 4db0fd61..2320a42d 100644 --- a/pokegold-spaceworld-debug.sym +++ b/pokegold-spaceworld-debug.sym @@ -789,10 +789,10 @@ 00:303a TextAsmEnd.stop 00:303b CallMapTextSubroutine 00:3051 CallMapTextSubroutine.Return -00:3055 Function3055 -00:3058 Function3055.Loop -00:3062 asm_3062 -00:307a Function307a +00:3055 CheckAllMapObjects +00:3058 CheckAllMapObjects.Loop +00:3062 TalkingToBGObject +00:307a ResetTalkingTarget 00:3085 PrintTextboxDebugNumbers 00:3097 PrintTextboxDebugNumbers.CheckSign 00:309e PrintTextboxDebugNumbers.PrintNum @@ -806,7 +806,7 @@ 00:314a TextboxIdle.next 00:314e PrepareTextbox 00:3171 TextboxCleanup -00:318f Function318f +00:318f ReloadObjectGFX 00:319b TurnNPCTalkingTo 00:31b9 TurnNPCTalkingTo.Jump 00:31c3 Unreferenced_CheckTrainerBattle @@ -917,7 +917,7 @@ 00:360b RestoreScreenAndReloadTiles 00:361e ClearBGPalettes 00:3621 WaitBGMap -00:362b SetPalettes +00:362b SetDefaultBGPAndOBP 00:3634 ClearPalettes 00:363c GetMemSGBLayout 00:363e GetSGBLayout @@ -1260,8 +1260,8 @@ 01:4965 FacePlayerObject.lined_up_horizontal 01:496d FacePlayerObject.done 01:4973 FacePlayerObject.FlipNegativeToPositive -01:4979 Stubbed_UpdateYOffset -01:4994 Stubbed_UpdateYOffset.y_offsets +01:4979 Stubbed_SwayObject +01:4994 Stubbed_SwayObject.y_offsets 01:499c UpdateJumpPosition 01:49d0 UpdateJumpPosition.got_direction 01:49dc UpdateJumpPosition.y_offsets @@ -1282,8 +1282,8 @@ 01:4af6 StepFunction_TeleportTo.InitFinalSpin 01:4b00 StepFunction_TeleportTo.DoFinalSpin 01:4b0c StepFunction_TeleportTo.FinishStep -01:4b22 Unreferenced_Function4b22 -01:4b25 Stub_Function4b25 +01:4b22 Unreferenced_StrengthBoulderDust_Old +01:4b25 Stub_SpawnStrengthBoulderDust_Old 01:4b26 SpawnShadow 01:4b42 SpawnShadow.ShadowObject 01:4b48 SpawnStrengthBoulderDust @@ -1474,8 +1474,8 @@ 01:57de GivePokemon 01:57eb AddRandomPokemonToBox 01:57ed AddRandomPokemonToBox.loop -01:5818 RandomUnder246 -01:5818 RandomUnder246.loop +01:5818 RandomSpecies_RaiEnSuiOrUnder +01:5818 RandomSpecies_RaiEnSuiOrUnder.loop 01:5823 FillTMs 01:582a FillTMs.loop 01:582f DebugGiveKeyItems @@ -1855,9 +1855,8 @@ 02:4242 GetSpriteVTile.VTileOffsets 02:424c CheckObjectEnteringVisibleRange 02:4259 CheckObjectEnteringVisibleRange.dw -02:4261 EmptyFunction8261 -02:4262 Unreferenced_CheckObjectEnteringVisibleRange_Alternate -02:426e Unreferenced_CheckObjectEnteringVisibleRange_Alternate.dw +02:4261 CheckObjectEnteringVisibleRange_Alternate +02:426e CheckObjectEnteringVisibleRange_Alternate.dw 02:4276 CheckVisibleRange_UpAlt 02:427d CheckVisibleRange_DownAlt 02:4284 CheckVisibleRange_LeftAlt @@ -2508,7 +2507,6 @@ 03:52a8 FailDig 03:52b4 Text_CantUseDigHere 03:52c2 DigScript -03:52da EmptyFunctiond2da 03:52db TeleportFunction 03:52df TeleportFunction.next 03:52ee TeleportFunction.finish @@ -2543,7 +2541,7 @@ 03:54e3 Unused_IsKeyItem_Old.cant_toss 03:54e6 _HandlePlayerStep 03:54f8 _HandlePlayerStep.start -03:54fa _HandlePlayerStep.unreferenced_d4fa +03:54fa _HandlePlayerStep.unreferenced_checkobjects 03:5505 _HandlePlayerStep._start 03:5514 _HandlePlayerStep.update_overworld_map 03:5519 _HandlePlayerStep.update_player_coords @@ -2852,16 +2850,13 @@ 03:6fc9 ReviveEffect.skip_to_revive 03:6fd9 ReviveEffect.revive_half_hp 03:6fdc ReviveEffect.finish_revive -03:6fed Unreferenced_EmptyFunctionefed 03:6fee FullRestoreEffect 03:701a FullRestoreEffect.NotAtFullHealth 03:7049 FullRestoreEffect.not_in_battle -03:705a Unreferenced_EmptyFunctionf05a 03:705b RestoreHPEffect 03:7086 RestoreHPEffect.get_heal_amount 03:708c RestoreHPEffect.continue_heal 03:709e RestoreHPEffect.not_in_battle -03:70af Unreferenced_EmptyFunctionf0af 03:70b0 HealHP_SFX_GFX 03:70cf UseItem_SelectMon 03:70d8 ItemActionTextWaitButton @@ -3359,9 +3354,9 @@ 04:6753 PokemonAskSwapItemText 04:6784 GetPartyItemOffset 04:678c ReceiveItemFromPokemon -04:6798 UnusedHandleItemJumptable -04:67a9 UnusedItemJumptable -04:67b7 EmptyFunction127b7 +04:6798 UnusedHandleRecieveItemJumptable +04:67a9 UnusedRecieveItemJumptable +04:67b7 PartyGiveItem 04:67b8 ChangeBackpackPocket 04:67c0 PartyBallPocket 04:67cb PartyBallPocket.exit @@ -3437,7 +3432,7 @@ 04:6e0f TrainerCardMainInputs.exit 04:6e16 TrainerCardMainInputs.left 04:6e26 TrainerCardMainInputs.right -04:6e37 EmptyFunction12e37 +04:6e37 EmptyTrainerCardFunction 04:6e38 TrainerCardScroll 04:6e49 TrainerCardClearTileMap 04:6e5c TrainerCardSetWindowY @@ -3504,9 +3499,9 @@ 05:410f LoadUsedSpritesGFX.skip 05:4127 LoadUsedSpritesGFX.no_still_sprite_1 05:4132 LoadUsedSpritesGFX.no_still_sprite_2 -05:4133 Function14133 +05:4133 Unreferenced_LoadOverworldSprite_NPCSlot 05:4144 LoadOverworldSprite_PlayerSlot -05:414a LoadOverworldSprite_FollowerSlot +05:414a Unreferenced_LoadOverworldSprite_FollowerSlot 05:4150 LoadOverworldSprite 05:4161 LoadOverworldSprite.dont_copy 05:417d GetOverworldSpriteData @@ -8352,9 +8347,9 @@ 23:42d9 UngroupHealingMachineSprites.ungroup 23:42dc UpdateTimeOfDayPal 23:42e3 _TimeOfDayPals -23:42fe _LABEL_8C2FE_ -23:4313 _LABEL_8C313_ -23:4325 Function8c325 +23:42fe Unreferenced_ResetTimeOfDayPal +23:4313 Unreferenced_SetTimeOfDayPal +23:4325 ChangeTimeOfDayPal 23:4335 _UpdateTimePals 23:433e OverworldFadeIn 23:4349 OverworldFadeOut @@ -8606,7 +8601,7 @@ 23:53ab AnimSeq_GSTitleFlameNote.zero 23:53c2 AnimSeq_GSTitleFlameNote.one 23:53ec AnimSeq_MinigamePikachu -23:540b Data8d40b +23:540b AnimSeq_MinigamePikachu.pikachu_framesets 23:540f AnimSeq_MinigamePikachuTail 23:5418 AnimSeq_MinigameNote 23:541c AnimSeq_MinigameNote.anon_dw @@ -8944,12 +8939,12 @@ 24:47a8 ReelAction_StopReelIgnoreJoypad 24:47b2 ReelAction_StopReelIgnoreJoypad.EndReel 24:47bc ReelAction_StopReelIgnoreJoypad.clear_reel_oam -24:47c8 Function907c8 -24:47f6 Function907c8.asm907f6 -24:4805 Function90805 -24:4814 Function90805.asm90814 -24:481b Function90805.loop -24:4822 Function90822 +24:47c8 Slots_PayoutAnim +24:47f6 Slots_PayoutAnim.seven +24:4805 Slots_PlaceReelTiles +24:4814 Slots_PlaceReelTiles.place +24:481b Slots_PlaceReelTiles.loop +24:4822 Slots_CheckReelTiles 24:486b ReelAction_StopReel1 24:487f ReelAction_StopReel1.NoBias 24:4883 ReelAction_StopReel1.CheckForBias @@ -13133,16 +13128,16 @@ 3a:4070 UpdateChannel.noteover 3a:4076 UpdateChannel.continue_sound_update 3a:407a DisablePitchWheel -3a:4081 Unreferenced_Functione8081 -3a:408c Unreferenced_Functione8081.fail -3a:408e Unreferenced_Functione8081.disable_music -3a:4093 Unreferenced_Functione8081.disable_sfx -3a:409e Unreferenced_Functione8081.clear_loop -3a:40a2 Unreferenced_Functione8081.done +3a:4081 Unreferenced_MuteAudio +3a:408c Unreferenced_MuteAudio.fail +3a:408e Unreferenced_MuteAudio.disable_music +3a:4093 Unreferenced_MuteAudio.disable_sfx +3a:409e Unreferenced_MuteAudio.clear_loop +3a:40a2 Unreferenced_MuteAudio.done 3a:40a4 GetChannelRegisters 3a:40b2 GetChannelRegisters.registers -3a:40b6 Functione80b6 -3a:40f3 Functione80b6.end +3a:40b6 ContinueSoundUpdate +3a:40f3 ContinueSoundUpdate.end 3a:40fa UpdateChannels 3a:410b UpdateChannels.jumptable 3a:411b UpdateChannels.Channel1 @@ -13178,7 +13173,7 @@ 3a:42ce IsChannelSFXOn.off 3a:42d0 IsAnySFXOn 3a:42ee IsAnySFXOn.on -3a:42f0 Functione82f0 +3a:42f0 SetupPlayDanger 3a:4307 PlayDanger 3a:431e PlayDanger.halfway 3a:4323 PlayDanger.begin @@ -13229,7 +13224,7 @@ 3a:45b9 LoadNote.flag_0e 3a:45c2 LoadNote.flag_0d 3a:45cb LoadNote.flag_0b -3a:45d8 Functione85d8 +3a:45d8 CheckChannelFlags2 3a:4605 HandleDuty 3a:461b ApplyPitchSlide 3a:465e ApplyPitchSlide.decreasing @@ -14154,23 +14149,29 @@ 3f:4657 FieldDebug_SpriteViewer.set_following 3f:4663 FieldDebug_SpriteViewer.FollowPromptString 3f:4672 FieldDebug_SpriteViewer.SetStartingPoint -3f:467d LoadUnderDevelopmentString -3f:4681 LoadUnderDevelopmentString.String -3f:4689 Functionfc689 -3f:469c Functionfc69c -3f:46bb Functionfc6bb -3f:46be Functionfc6be -3f:46de Datafc6de -3f:46fe Datafc6fe -3f:470e Datafc70e -3f:471e Datafc71e -3f:472e Datafc72e -3f:473e Datafc73e -3f:474e Datafc74e -3f:475e Datafc75e -3f:476e Datafc76e -3f:477e Datafc77e -3f:478e Datafc78e +3f:467d FieldDebug_SpriteViewer.LoadUnderDevelopmentString +3f:4681 FieldDebug_SpriteViewer.String +3f:4689 SetupSpriteViewerSpriteWalkingTilemap +3f:469c SetupSpriteViewerSpriteWalkingTilemap.loop +3f:46bb SetupSpriteViewerSpriteTilemap +3f:46be SetupSpriteViewerSpriteTilemap.loop +3f:46de SpriteViewerSpriteTilemap +3f:46fe SpriteViewerSpriteTilemap.FacingStepDown0 +3f:46fe SpriteViewerSpriteTilemap.FacingStepDown2 +3f:470e SpriteViewerSpriteTilemap.FacingStepDown1 +3f:471e SpriteViewerSpriteTilemap.FacingStepDown3 +3f:472e SpriteViewerSpriteTilemap.FacingStepUp0 +3f:472e SpriteViewerSpriteTilemap.FacingStepUp2 +3f:473e SpriteViewerSpriteTilemap.FacingStepUp1 +3f:474e SpriteViewerSpriteTilemap.FacingStepUp3 +3f:475e SpriteViewerSpriteTilemap.FacingStepLeft0 +3f:475e SpriteViewerSpriteTilemap.FacingStepLeft2 +3f:476e SpriteViewerSpriteTilemap.FacingStepRight0 +3f:476e SpriteViewerSpriteTilemap.FacingStepRight2 +3f:477e SpriteViewerSpriteTilemap.FacingStepLeft1 +3f:477e SpriteViewerSpriteTilemap.FacingStepLeft3 +3f:478e SpriteViewerSpriteTilemap.FacingStepRight1 +3f:478e SpriteViewerSpriteTilemap.FacingStepRight3 3f:479e FieldDebug_NamePlayer 3f:47cb FieldDebug_Toolgear 3f:47da FieldDebug_Toolgear.Jumptable @@ -18450,6 +18451,61 @@ 02:ba62 sBox5Mon30Nickname 02:ba68 sBox5End 02:ba68 sBox5MonNicknamesEnd +02:ba68 sPartyMailBackup +02:ba68 sPartyMon1MailBackup +02:ba68 sPartyMon1MailBackupMessage +02:ba88 sPartyMon1MailBackupMessageEnd +02:ba89 sPartyMon1MailBackupAuthor +02:ba8f sPartyMon1MailBackupAuthorNationality +02:ba91 sPartyMon1MailBackupAuthorID +02:ba93 sPartyMon1MailBackupSpecies +02:ba94 sPartyMon1MailBackupType +02:ba95 sPartyMon1MailBackupEnd +02:ba95 sPartyMon2MailBackup +02:ba95 sPartyMon2MailBackupMessage +02:bab5 sPartyMon2MailBackupMessageEnd +02:bab6 sPartyMon2MailBackupAuthor +02:babc sPartyMon2MailBackupAuthorNationality +02:babe sPartyMon2MailBackupAuthorID +02:bac0 sPartyMon2MailBackupSpecies +02:bac1 sPartyMon2MailBackupType +02:bac2 sPartyMon2MailBackupEnd +02:bac2 sPartyMon3MailBackup +02:bac2 sPartyMon3MailBackupMessage +02:bae2 sPartyMon3MailBackupMessageEnd +02:bae3 sPartyMon3MailBackupAuthor +02:bae9 sPartyMon3MailBackupAuthorNationality +02:baeb sPartyMon3MailBackupAuthorID +02:baed sPartyMon3MailBackupSpecies +02:baee sPartyMon3MailBackupType +02:baef sPartyMon3MailBackupEnd +02:baef sPartyMon4MailBackup +02:baef sPartyMon4MailBackupMessage +02:bb0f sPartyMon4MailBackupMessageEnd +02:bb10 sPartyMon4MailBackupAuthor +02:bb16 sPartyMon4MailBackupAuthorNationality +02:bb18 sPartyMon4MailBackupAuthorID +02:bb1a sPartyMon4MailBackupSpecies +02:bb1b sPartyMon4MailBackupType +02:bb1c sPartyMon4MailBackupEnd +02:bb1c sPartyMon5MailBackup +02:bb1c sPartyMon5MailBackupMessage +02:bb3c sPartyMon5MailBackupMessageEnd +02:bb3d sPartyMon5MailBackupAuthor +02:bb43 sPartyMon5MailBackupAuthorNationality +02:bb45 sPartyMon5MailBackupAuthorID +02:bb47 sPartyMon5MailBackupSpecies +02:bb48 sPartyMon5MailBackupType +02:bb49 sPartyMon5MailBackupEnd +02:bb49 sPartyMon6MailBackup +02:bb49 sPartyMon6MailBackupMessage +02:bb69 sPartyMon6MailBackupMessageEnd +02:bb6a sPartyMon6MailBackupAuthor +02:bb70 sPartyMon6MailBackupAuthorNationality +02:bb72 sPartyMon6MailBackupAuthorID +02:bb74 sPartyMon6MailBackupSpecies +02:bb75 sPartyMon6MailBackupType +02:bb76 sPartyMon6MailBackupEnd 03:a000 sBox6 03:a000 sBox6Count 03:a001 sBox6Species @@ -22294,62 +22350,7 @@ 03:bb72 sPartyMon6MailAuthorID 03:bb74 sPartyMon6MailSpecies 03:bb75 sPartyMon6MailType -03:bb76 sPartyMailBackup -03:bb76 sPartyMon1MailBackup -03:bb76 sPartyMon1MailBackupMessage 03:bb76 sPartyMon6MailEnd -03:bb96 sPartyMon1MailBackupMessageEnd -03:bb97 sPartyMon1MailBackupAuthor -03:bb9d sPartyMon1MailBackupAuthorNationality -03:bb9f sPartyMon1MailBackupAuthorID -03:bba1 sPartyMon1MailBackupSpecies -03:bba2 sPartyMon1MailBackupType -03:bba3 sPartyMon1MailBackupEnd -03:bba3 sPartyMon2MailBackup -03:bba3 sPartyMon2MailBackupMessage -03:bbc3 sPartyMon2MailBackupMessageEnd -03:bbc4 sPartyMon2MailBackupAuthor -03:bbca sPartyMon2MailBackupAuthorNationality -03:bbcc sPartyMon2MailBackupAuthorID -03:bbce sPartyMon2MailBackupSpecies -03:bbcf sPartyMon2MailBackupType -03:bbd0 sPartyMon2MailBackupEnd -03:bbd0 sPartyMon3MailBackup -03:bbd0 sPartyMon3MailBackupMessage -03:bbf0 sPartyMon3MailBackupMessageEnd -03:bbf1 sPartyMon3MailBackupAuthor -03:bbf7 sPartyMon3MailBackupAuthorNationality -03:bbf9 sPartyMon3MailBackupAuthorID -03:bbfb sPartyMon3MailBackupSpecies -03:bbfc sPartyMon3MailBackupType -03:bbfd sPartyMon3MailBackupEnd -03:bbfd sPartyMon4MailBackup -03:bbfd sPartyMon4MailBackupMessage -03:bc1d sPartyMon4MailBackupMessageEnd -03:bc1e sPartyMon4MailBackupAuthor -03:bc24 sPartyMon4MailBackupAuthorNationality -03:bc26 sPartyMon4MailBackupAuthorID -03:bc28 sPartyMon4MailBackupSpecies -03:bc29 sPartyMon4MailBackupType -03:bc2a sPartyMon4MailBackupEnd -03:bc2a sPartyMon5MailBackup -03:bc2a sPartyMon5MailBackupMessage -03:bc4a sPartyMon5MailBackupMessageEnd -03:bc4b sPartyMon5MailBackupAuthor -03:bc51 sPartyMon5MailBackupAuthorNationality -03:bc53 sPartyMon5MailBackupAuthorID -03:bc55 sPartyMon5MailBackupSpecies -03:bc56 sPartyMon5MailBackupType -03:bc57 sPartyMon5MailBackupEnd -03:bc57 sPartyMon6MailBackup -03:bc57 sPartyMon6MailBackupMessage -03:bc77 sPartyMon6MailBackupMessageEnd -03:bc78 sPartyMon6MailBackupAuthor -03:bc7e sPartyMon6MailBackupAuthorNationality -03:bc80 sPartyMon6MailBackupAuthorID -03:bc82 sPartyMon6MailBackupSpecies -03:bc83 sPartyMon6MailBackupType -03:bc84 sPartyMon6MailBackupEnd 03:bffd sChecksum 00:c000 wChannel1 00:c000 wChannel1MusicID @@ -24082,6 +24083,9 @@ 00:cc3d wSpriteViewerSavedMenuPointerY 00:cc3e wSpriteViewerJumptableIndex 00:cc3f wMovementBuffer +00:cc3f wMovementXBuffer +00:cc40 wMovementYBuffer +00:cc41 wMovementSpriteViewerDirection 00:cc45 wFacingDirectionList_Old 00:cc4c wEmotionBubbleSpriteIndex_Old 00:cc4c wSavedPlayerScreenY_Old @@ -25036,6 +25040,7 @@ 00:d642 wUnusedAddOutdoorSpritesReturnValue 00:d643 wBGMapAnchor 00:d645 wUsedSprites +00:d646 wUsedFollowerSprites 00:d647 wUsedNPCSprites 00:d64f wUsedStaticSprites 00:d651 wUsedSpritesEnd diff --git a/pokegold-spaceworld.map b/pokegold-spaceworld.map index 9bedc32a..ee43a708 100644 --- a/pokegold-spaceworld.map +++ b/pokegold-spaceworld.map @@ -2,7 +2,7 @@ SUMMARY: ROM0: 16236 bytes used / 148 free ROMX: 1032192 bytes used / 0 free in 63 banks SRAM: 20395 bytes used / 12373 free in 4 banks - WRAM0: 7742 bytes used / 450 free + WRAM0: 8139 bytes used / 53 free HRAM: 117 bytes used / 10 free ROM0 bank #0: @@ -826,10 +826,10 @@ ROM0 bank #0: $2ffe = TextAsmEnd.stop $2fff = CallMapTextSubroutine $3015 = CallMapTextSubroutine.Return - $3019 = Function3055 - $301c = Function3055.Loop - $3026 = asm_3062 - $303e = Function307a + $3019 = CheckAllMapObjects + $301c = CheckAllMapObjects.Loop + $3026 = TalkingToBGObject + $303e = ResetTalkingTarget $3049 = PrintTextboxDebugNumbers $305b = PrintTextboxDebugNumbers.CheckSign $3062 = PrintTextboxDebugNumbers.PrintNum @@ -843,7 +843,7 @@ ROM0 bank #0: $310e = TextboxIdle.next $3112 = PrepareTextbox $3135 = TextboxCleanup - $3153 = Function318f + $3153 = ReloadObjectGFX $315f = TurnNPCTalkingTo $317d = TurnNPCTalkingTo.Jump $3187 = Unreferenced_CheckTrainerBattle @@ -954,7 +954,7 @@ ROM0 bank #0: $35cf = RestoreScreenAndReloadTiles $35e2 = ClearBGPalettes $35e5 = WaitBGMap - $35ef = SetPalettes + $35ef = SetDefaultBGPAndOBP $35f8 = ClearPalettes $3600 = GetMemSGBLayout $3602 = GetSGBLayout @@ -1274,8 +1274,8 @@ ROMX bank #1: $4965 = FacePlayerObject.closer_horizontal $496d = FacePlayerObject.done $4973 = FacePlayerObject.FlipNegativeToPositive - $4979 = Stubbed_UpdateYOffset - $4994 = Stubbed_UpdateYOffset.y_offsets + $4979 = Stubbed_SwayObject + $4994 = Stubbed_SwayObject.y_offsets $499c = UpdateJumpPosition $49d0 = UpdateJumpPosition.got_direction $49dc = UpdateJumpPosition.y_offsets @@ -1296,8 +1296,8 @@ ROMX bank #1: $4af6 = StepFunction_TeleportTo.InitFinalSpin $4b00 = StepFunction_TeleportTo.DoFinalSpin $4b0c = StepFunction_TeleportTo.FinishStep - $4b22 = Unreferenced_Function4b22 - $4b25 = Stub_Function4b25 + $4b22 = Unreferenced_StrengthBoulderDust_Old + $4b25 = Stub_SpawnStrengthBoulderDust_Old $4b26 = SpawnShadow $4b42 = SpawnShadow.ShadowObject $4b48 = SpawnStrengthBoulderDust @@ -1488,8 +1488,8 @@ ROMX bank #1: $57de = GivePokemon $57eb = AddRandomPokemonToBox $57ed = AddRandomPokemonToBox.loop - $5818 = RandomUnder246 - $5818 = RandomUnder246.loop + $5818 = RandomSpecies_RaiEnSuiOrUnder + $5818 = RandomSpecies_RaiEnSuiOrUnder.loop $5823 = FillTMs $582a = FillTMs.loop $582f = DebugGiveKeyItems @@ -1874,9 +1874,8 @@ ROMX bank #2: $4242 = GetSpriteVTile.VTileOffsets $424c = CheckObjectEnteringVisibleRange $4259 = CheckObjectEnteringVisibleRange.dw - $4261 = EmptyFunction8261 - $4262 = Unreferenced_CheckObjectEnteringVisibleRange_Alternate - $426e = Unreferenced_CheckObjectEnteringVisibleRange_Alternate.dw + $4261 = CheckObjectEnteringVisibleRange_Alternate + $426e = CheckObjectEnteringVisibleRange_Alternate.dw $4276 = CheckVisibleRange_UpAlt $427d = CheckVisibleRange_DownAlt $4284 = CheckVisibleRange_LeftAlt @@ -2530,7 +2529,6 @@ ROMX bank #3: $5290 = FailDig $529c = Text_CantUseDigHere $52aa = DigScript - $52c2 = EmptyFunctiond2da $52c3 = TeleportFunction $52c7 = TeleportFunction.next $52d6 = TeleportFunction.finish @@ -2565,7 +2563,7 @@ ROMX bank #3: $54cb = Unused_IsKeyItem_Old.cant_toss $54ce = _HandlePlayerStep $54e0 = _HandlePlayerStep.start - $54e2 = _HandlePlayerStep.unreferenced_d4fa + $54e2 = _HandlePlayerStep.unreferenced_checkobjects $54ed = _HandlePlayerStep._start $54fc = _HandlePlayerStep.update_overworld_map $5501 = _HandlePlayerStep.update_player_coords @@ -2874,16 +2872,13 @@ ROMX bank #3: $6fb1 = ReviveEffect.skip_to_revive $6fc1 = ReviveEffect.revive_half_hp $6fc4 = ReviveEffect.finish_revive - $6fd5 = Unreferenced_EmptyFunctionefed $6fd6 = FullRestoreEffect $7002 = FullRestoreEffect.NotAtFullHealth $7031 = FullRestoreEffect.not_in_battle - $7042 = Unreferenced_EmptyFunctionf05a $7043 = RestoreHPEffect $706e = RestoreHPEffect.get_heal_amount $7074 = RestoreHPEffect.continue_heal $7086 = RestoreHPEffect.not_in_battle - $7097 = Unreferenced_EmptyFunctionf0af $7098 = HealHP_SFX_GFX $70b7 = UseItem_SelectMon $70c0 = ItemActionTextWaitButton @@ -3383,9 +3378,9 @@ ROMX bank #4: $6753 = PokemonAskSwapItemText $6784 = GetPartyItemOffset $678c = ReceiveItemFromPokemon - $6798 = UnusedHandleItemJumptable - $67a9 = UnusedItemJumptable - $67b7 = EmptyFunction127b7 + $6798 = UnusedHandleRecieveItemJumptable + $67a9 = UnusedRecieveItemJumptable + $67b7 = PartyGiveItem $67b8 = ChangeBackpackPocket $67c0 = PartyBallPocket $67cb = PartyBallPocket.exit @@ -3461,7 +3456,7 @@ ROMX bank #4: $6e0f = TrainerCardMainInputs.exit $6e16 = TrainerCardMainInputs.left $6e26 = TrainerCardMainInputs.right - $6e37 = EmptyFunction12e37 + $6e37 = EmptyTrainerCardFunction $6e38 = TrainerCardScroll $6e49 = TrainerCardClearTileMap $6e5c = TrainerCardSetWindowY @@ -3532,9 +3527,9 @@ ROMX bank #5: $410f = LoadUsedSpritesGFX.skip $4127 = LoadUsedSpritesGFX.no_still_sprite_1 $4132 = LoadUsedSpritesGFX.no_still_sprite_2 - $4133 = Function14133 + $4133 = Unreferenced_LoadOverworldSprite_NPCSlot $4144 = LoadOverworldSprite_PlayerSlot - $414a = LoadOverworldSprite_FollowerSlot + $414a = Unreferenced_LoadOverworldSprite_FollowerSlot $4150 = LoadOverworldSprite $4161 = LoadOverworldSprite.dont_copy $417d = GetOverworldSpriteData @@ -8530,9 +8525,9 @@ ROMX bank #35: $42d9 = UngroupHealingMachineSprites.ungroup $42dc = UpdateTimeOfDayPal $42e3 = _TimeOfDayPals - $42fe = _LABEL_8C2FE_ - $4313 = _LABEL_8C313_ - $4325 = Function8c325 + $42fe = Unreferenced_ResetTimeOfDayPal + $4313 = Unreferenced_SetTimeOfDayPal + $4325 = ChangeTimeOfDayPal $4335 = _UpdateTimePals $433e = OverworldFadeIn $4349 = OverworldFadeOut @@ -8784,7 +8779,7 @@ ROMX bank #35: $53ab = AnimSeq_GSTitleFlameNote.zero $53c2 = AnimSeq_GSTitleFlameNote.one $53ec = AnimSeq_MinigamePikachu - $540b = Data8d40b + $540b = AnimSeq_MinigamePikachu.pikachu_framesets $540f = AnimSeq_MinigamePikachuTail $5418 = AnimSeq_MinigameNote $541c = AnimSeq_MinigameNote.anon_dw @@ -9129,12 +9124,12 @@ ROMX bank #36: $47a8 = ReelAction_StopReelIgnoreJoypad $47b2 = ReelAction_StopReelIgnoreJoypad.EndReel $47bc = ReelAction_StopReelIgnoreJoypad.clear_reel_oam - $47c8 = Function907c8 - $47f6 = Function907c8.asm907f6 - $4805 = Function90805 - $4814 = Function90805.asm90814 - $481b = Function90805.loop - $4822 = Function90822 + $47c8 = Slots_PayoutAnim + $47f6 = Slots_PayoutAnim.seven + $4805 = Slots_PlaceReelTiles + $4814 = Slots_PlaceReelTiles.place + $481b = Slots_PlaceReelTiles.loop + $4822 = Slots_CheckReelTiles $486b = ReelAction_StopReel1 $487f = ReelAction_StopReel1.NoBias $4883 = ReelAction_StopReel1.CheckForBias @@ -13422,16 +13417,16 @@ ROMX bank #58: $4070 = UpdateChannel.noteover $4076 = UpdateChannel.continue_sound_update $407a = DisablePitchWheel - $4081 = Unreferenced_Functione8081 - $408c = Unreferenced_Functione8081.fail - $408e = Unreferenced_Functione8081.disable_music - $4093 = Unreferenced_Functione8081.disable_sfx - $409e = Unreferenced_Functione8081.clear_loop - $40a2 = Unreferenced_Functione8081.done + $4081 = Unreferenced_MuteAudio + $408c = Unreferenced_MuteAudio.fail + $408e = Unreferenced_MuteAudio.disable_music + $4093 = Unreferenced_MuteAudio.disable_sfx + $409e = Unreferenced_MuteAudio.clear_loop + $40a2 = Unreferenced_MuteAudio.done $40a4 = GetChannelRegisters $40b2 = GetChannelRegisters.registers - $40b6 = Functione80b6 - $40f3 = Functione80b6.end + $40b6 = ContinueSoundUpdate + $40f3 = ContinueSoundUpdate.end $40fa = UpdateChannels $410b = UpdateChannels.jumptable $411b = UpdateChannels.Channel1 @@ -13467,7 +13462,7 @@ ROMX bank #58: $42ce = IsChannelSFXOn.off $42d0 = IsAnySFXOn $42ee = IsAnySFXOn.on - $42f0 = Functione82f0 + $42f0 = SetupPlayDanger $4307 = PlayDanger $431e = PlayDanger.halfway $4323 = PlayDanger.begin @@ -13518,7 +13513,7 @@ ROMX bank #58: $45b9 = LoadNote.flag_0e $45c2 = LoadNote.flag_0d $45cb = LoadNote.flag_0b - $45d8 = Functione85d8 + $45d8 = CheckChannelFlags2 $4605 = HandleDuty $461b = ApplyPitchSlide $465e = ApplyPitchSlide.decreasing @@ -14469,23 +14464,29 @@ ROMX bank #63: $4657 = FieldDebug_SpriteViewer.set_following $4663 = FieldDebug_SpriteViewer.FollowPromptString $4672 = FieldDebug_SpriteViewer.SetStartingPoint - $467d = LoadUnderDevelopmentString - $4681 = LoadUnderDevelopmentString.String - $4689 = Functionfc689 - $469c = Functionfc69c - $46bb = Functionfc6bb - $46be = Functionfc6be - $46de = Datafc6de - $46fe = Datafc6fe - $470e = Datafc70e - $471e = Datafc71e - $472e = Datafc72e - $473e = Datafc73e - $474e = Datafc74e - $475e = Datafc75e - $476e = Datafc76e - $477e = Datafc77e - $478e = Datafc78e + $467d = FieldDebug_SpriteViewer.LoadUnderDevelopmentString + $4681 = FieldDebug_SpriteViewer.String + $4689 = SetupSpriteViewerSpriteWalkingTilemap + $469c = SetupSpriteViewerSpriteWalkingTilemap.loop + $46bb = SetupSpriteViewerSpriteTilemap + $46be = SetupSpriteViewerSpriteTilemap.loop + $46de = SpriteViewerSpriteTilemap + $46fe = SpriteViewerSpriteTilemap.FacingStepDown0 + $46fe = SpriteViewerSpriteTilemap.FacingStepDown2 + $470e = SpriteViewerSpriteTilemap.FacingStepDown1 + $471e = SpriteViewerSpriteTilemap.FacingStepDown3 + $472e = SpriteViewerSpriteTilemap.FacingStepUp0 + $472e = SpriteViewerSpriteTilemap.FacingStepUp2 + $473e = SpriteViewerSpriteTilemap.FacingStepUp1 + $474e = SpriteViewerSpriteTilemap.FacingStepUp3 + $475e = SpriteViewerSpriteTilemap.FacingStepLeft0 + $475e = SpriteViewerSpriteTilemap.FacingStepLeft2 + $476e = SpriteViewerSpriteTilemap.FacingStepRight0 + $476e = SpriteViewerSpriteTilemap.FacingStepRight2 + $477e = SpriteViewerSpriteTilemap.FacingStepLeft1 + $477e = SpriteViewerSpriteTilemap.FacingStepLeft3 + $478e = SpriteViewerSpriteTilemap.FacingStepRight1 + $478e = SpriteViewerSpriteTilemap.FacingStepRight3 $479e = FieldDebug_NamePlayer $47cb = FieldDebug_Toolgear $47da = FieldDebug_Toolgear.Jumptable @@ -14977,7 +14978,7 @@ SRAM bank #0: $a188 = sSpriteBuffer1 $a310 = sSpriteBuffer2 EMPTY: $a498-$a5ff ($0168 bytes) - SECTION: $a600-$ae4a ($084b bytes) ["Unknown, bank 0"] + SECTION: $a600-$ae4a ($084b bytes) ["Save Game Data"] $a600 = sOptions $a608 = sGameData $adda = sGameData2 @@ -14996,7 +14997,7 @@ SRAM bank #1: TOTAL EMPTY: $1c27 bytes SRAM bank #2: - SECTION: $a000-$ba67 ($1a68 bytes) ["Boxes 1-5"] + SECTION: $a000-$bb75 ($1b76 bytes) ["Boxes 1-5"] $a000 = sBox1Count $a000 = sBox1 $a001 = sBox1Species @@ -18785,13 +18786,68 @@ SRAM bank #2: $ba56 = sBox5Mon28Nickname $ba5c = sBox5Mon29Nickname $ba62 = sBox5Mon30Nickname + $ba68 = sPartyMon1MailBackupMessage + $ba68 = sPartyMon1MailBackup + $ba68 = sPartyMailBackup $ba68 = sBox5End $ba68 = sBox5MonNicknamesEnd - EMPTY: $ba68-$bfff ($0598 bytes) - TOTAL EMPTY: $0598 bytes + $ba88 = sPartyMon1MailBackupMessageEnd + $ba89 = sPartyMon1MailBackupAuthor + $ba8f = sPartyMon1MailBackupAuthorNationality + $ba91 = sPartyMon1MailBackupAuthorID + $ba93 = sPartyMon1MailBackupSpecies + $ba94 = sPartyMon1MailBackupType + $ba95 = sPartyMon2MailBackupMessage + $ba95 = sPartyMon2MailBackup + $ba95 = sPartyMon1MailBackupEnd + $bab5 = sPartyMon2MailBackupMessageEnd + $bab6 = sPartyMon2MailBackupAuthor + $babc = sPartyMon2MailBackupAuthorNationality + $babe = sPartyMon2MailBackupAuthorID + $bac0 = sPartyMon2MailBackupSpecies + $bac1 = sPartyMon2MailBackupType + $bac2 = sPartyMon3MailBackupMessage + $bac2 = sPartyMon3MailBackup + $bac2 = sPartyMon2MailBackupEnd + $bae2 = sPartyMon3MailBackupMessageEnd + $bae3 = sPartyMon3MailBackupAuthor + $bae9 = sPartyMon3MailBackupAuthorNationality + $baeb = sPartyMon3MailBackupAuthorID + $baed = sPartyMon3MailBackupSpecies + $baee = sPartyMon3MailBackupType + $baef = sPartyMon4MailBackupMessage + $baef = sPartyMon4MailBackup + $baef = sPartyMon3MailBackupEnd + $bb0f = sPartyMon4MailBackupMessageEnd + $bb10 = sPartyMon4MailBackupAuthor + $bb16 = sPartyMon4MailBackupAuthorNationality + $bb18 = sPartyMon4MailBackupAuthorID + $bb1a = sPartyMon4MailBackupSpecies + $bb1b = sPartyMon4MailBackupType + $bb1c = sPartyMon5MailBackupMessage + $bb1c = sPartyMon5MailBackup + $bb1c = sPartyMon4MailBackupEnd + $bb3c = sPartyMon5MailBackupMessageEnd + $bb3d = sPartyMon5MailBackupAuthor + $bb43 = sPartyMon5MailBackupAuthorNationality + $bb45 = sPartyMon5MailBackupAuthorID + $bb47 = sPartyMon5MailBackupSpecies + $bb48 = sPartyMon5MailBackupType + $bb49 = sPartyMon6MailBackupMessage + $bb49 = sPartyMon6MailBackup + $bb49 = sPartyMon5MailBackupEnd + $bb69 = sPartyMon6MailBackupMessageEnd + $bb6a = sPartyMon6MailBackupAuthor + $bb70 = sPartyMon6MailBackupAuthorNationality + $bb72 = sPartyMon6MailBackupAuthorID + $bb74 = sPartyMon6MailBackupSpecies + $bb75 = sPartyMon6MailBackupType + $bb76 = sPartyMon6MailBackupEnd + EMPTY: $bb76-$bfff ($048a bytes) + TOTAL EMPTY: $048a bytes SRAM bank #3: - SECTION: $a000-$bc83 ($1c84 bytes) ["Boxes 6-10"] + SECTION: $a000-$bb75 ($1b76 bytes) ["Boxes 6-10"] $a000 = sBox6Count $a000 = sBox6 $a001 = sBox6Species @@ -22636,69 +22692,14 @@ SRAM bank #3: $bb72 = sPartyMon6MailAuthorID $bb74 = sPartyMon6MailSpecies $bb75 = sPartyMon6MailType - $bb76 = sPartyMon1MailBackupMessage - $bb76 = sPartyMon1MailBackup - $bb76 = sPartyMailBackup $bb76 = sPartyMon6MailEnd - $bb96 = sPartyMon1MailBackupMessageEnd - $bb97 = sPartyMon1MailBackupAuthor - $bb9d = sPartyMon1MailBackupAuthorNationality - $bb9f = sPartyMon1MailBackupAuthorID - $bba1 = sPartyMon1MailBackupSpecies - $bba2 = sPartyMon1MailBackupType - $bba3 = sPartyMon2MailBackupMessage - $bba3 = sPartyMon2MailBackup - $bba3 = sPartyMon1MailBackupEnd - $bbc3 = sPartyMon2MailBackupMessageEnd - $bbc4 = sPartyMon2MailBackupAuthor - $bbca = sPartyMon2MailBackupAuthorNationality - $bbcc = sPartyMon2MailBackupAuthorID - $bbce = sPartyMon2MailBackupSpecies - $bbcf = sPartyMon2MailBackupType - $bbd0 = sPartyMon3MailBackupMessage - $bbd0 = sPartyMon3MailBackup - $bbd0 = sPartyMon2MailBackupEnd - $bbf0 = sPartyMon3MailBackupMessageEnd - $bbf1 = sPartyMon3MailBackupAuthor - $bbf7 = sPartyMon3MailBackupAuthorNationality - $bbf9 = sPartyMon3MailBackupAuthorID - $bbfb = sPartyMon3MailBackupSpecies - $bbfc = sPartyMon3MailBackupType - $bbfd = sPartyMon4MailBackupMessage - $bbfd = sPartyMon4MailBackup - $bbfd = sPartyMon3MailBackupEnd - $bc1d = sPartyMon4MailBackupMessageEnd - $bc1e = sPartyMon4MailBackupAuthor - $bc24 = sPartyMon4MailBackupAuthorNationality - $bc26 = sPartyMon4MailBackupAuthorID - $bc28 = sPartyMon4MailBackupSpecies - $bc29 = sPartyMon4MailBackupType - $bc2a = sPartyMon5MailBackupMessage - $bc2a = sPartyMon5MailBackup - $bc2a = sPartyMon4MailBackupEnd - $bc4a = sPartyMon5MailBackupMessageEnd - $bc4b = sPartyMon5MailBackupAuthor - $bc51 = sPartyMon5MailBackupAuthorNationality - $bc53 = sPartyMon5MailBackupAuthorID - $bc55 = sPartyMon5MailBackupSpecies - $bc56 = sPartyMon5MailBackupType - $bc57 = sPartyMon6MailBackupMessage - $bc57 = sPartyMon6MailBackup - $bc57 = sPartyMon5MailBackupEnd - $bc77 = sPartyMon6MailBackupMessageEnd - $bc78 = sPartyMon6MailBackupAuthor - $bc7e = sPartyMon6MailBackupAuthorNationality - $bc80 = sPartyMon6MailBackupAuthorID - $bc82 = sPartyMon6MailBackupSpecies - $bc83 = sPartyMon6MailBackupType - $bc84 = sPartyMon6MailBackupEnd - EMPTY: $bc84-$bffc ($0379 bytes) + EMPTY: $bb76-$bffc ($0487 bytes) SECTION: $bffd-$bfff ($0003 bytes) ["Checksum"] $bffd = sChecksum - TOTAL EMPTY: $0379 bytes + TOTAL EMPTY: $0487 bytes WRAM0 bank #0: - SECTION: $c000-$c1bb ($01bc bytes) ["Music engine RAM"] + SECTION: $c000-$c1ff ($0200 bytes) ["Music engine RAM"] $c000 = wMusic $c000 = wChannels $c000 = wChannel1 @@ -23042,7 +23043,6 @@ WRAM0 bank #0: $c1ba = wCryTracks $c1bb = wSFXDuration $c1bc = wMusicInitEnd - EMPTY: $c1bc-$c1ff ($0044 bytes) SECTION: $c200-$c5e7 ($03e8 bytes) ["OAM Buffer"] $c200 = wShadowOAM $c200 = wShadowOAMSprite00 @@ -24275,8 +24275,8 @@ WRAM0 bank #0: $cae3 = wWeatherCount $cb14 = wLinkDataEnd $cb14 = wOverworldMapBlocksEnd - SECTION: $cb14-$cb3b ($0028 bytes) ["CB14"] $cb14 = wBattleEnd + SECTION: $cb14-$ce5e ($034b bytes) ["Video"] $cb14 = wRedrawRowOrColumnSrcTiles $cb14 = wRedrawFlashlightDst0 $cb16 = wRedrawFlashlightSrc0 @@ -24285,9 +24285,7 @@ WRAM0 bank #0: $cb1c = wRedrawFlashlightSrc1 $cb1e = wRedrawFlashlightBlackDst1 $cb20 = wRedrawFlashlightWidthHeight - SECTION: $cb3c-$cb4b ($0010 bytes) ["CB3C"] $cb3c = wTileAnimBuffer - SECTION: $cb4c-$cb5c ($0011 bytes) ["CB4C"] $cb4c = wOtherPlayerLinkMode $cb4c = wLinkReceivedSyncBuffer $cb4d = wOtherPlayerLinkAction @@ -24300,8 +24298,6 @@ WRAM0 bank #0: $cb5b = wSelectedItem $cb5b = wCurSpecies $cb5c = wNamedObjectTypeBuffer - EMPTY: $cb5d-$cb5d ($0001 byte) - SECTION: $cb5e-$cb6f ($0012 bytes) ["CB5E"] $cb5e = wJumptableIndex $cb5f = wSlotsDelay $cb5f = wMemoryGameCardChoice @@ -24330,7 +24326,6 @@ WRAM0 bank #0: $cb6d = wPlayerStepVectorY $cb6e = wPlayerStepFlags $cb6f = wPlayerStepDirection - SECTION: $cb70-$cb7d ($000e bytes) ["CB70"] $cb70 = wQueuedMinorObjectGFX $cb71 = wVBCopyFarSize $cb72 = wVBCopyFarSrc @@ -24341,16 +24336,12 @@ WRAM0 bank #0: $cb79 = wMovementDataBank $cb7a = wMovementDataAddr $cb7c = wIndexedMovement2Pointer - EMPTY: $cb7e-$cb8f ($0012 bytes) - SECTION: $cb90-$cbb1 ($0022 bytes) ["Collision buffer"] $cb90 = wTileDown $cb91 = wTileUp $cb92 = wTileLeft $cb93 = wTileRight $cb94 = wScreenSave - SECTION: $cbb2-$cbf1 ($0040 bytes) ["CBB2"] $cbb2 = wToolgearBuffer - SECTION: $cbf2-$cbf9 ($0008 bytes) ["CBF2"] $cbf2 = wWindowData $cbf2 = wWindowStackPointer $cbf4 = wMenuJoypad @@ -24361,8 +24352,6 @@ WRAM0 bank #0: $cbf7 = wActiveBackpackPocket $cbf8 = wScrollingMenuCursorPosition $cbf9 = wWindowStackSize - EMPTY: $cbfa-$cc01 ($0008 bytes) - SECTION: $cc02-$cc2e ($002d bytes) ["CC02"] $cc02 = wMenuDataHeader $cc02 = wMenuFlags $cc03 = wMenuBorderTopCoord @@ -24407,8 +24396,6 @@ WRAM0 bank #0: $cc2b = wMenuCursorX $cc2c = wCursorOffCharacter $cc2d = wCursorCurrentTile - EMPTY: $cc2f-$cc31 ($0003 bytes) - SECTION: $cc32-$cc75 ($0044 bytes) ["CC32"] $cc32 = wVBlankJoyFrameCounter $cc33 = wVBlankOccurred $cc34 = wLastSpawnMapGroup @@ -24447,12 +24434,13 @@ WRAM0 bank #0: $cc3d = wPlayerSpinInPlaceAnimSoundID_Old $cc3e = wSpriteViewerJumptableIndex $cc3f = wMovementBuffer + $cc3f = wMovementXBuffer + $cc40 = wMovementYBuffer + $cc41 = wMovementSpriteViewerDirection $cc45 = wFacingDirectionList_Old $cc4c = wSavedPlayerScreenY_Old $cc4c = wEmotionBubbleSpriteIndex_Old $cc4d = wSavedPlayerFacingDirection_Old - EMPTY: $cc76-$cc99 ($0024 bytes) - SECTION: $cc9a-$ccc5 ($002c bytes) ["CC9A"] $cc9a = wSkatingDirection $cc9b = wCompanionCollisionFrameCounter $cc9c = wObjectMasks @@ -24476,38 +24464,28 @@ WRAM0 bank #0: $ccc3 = wPlaceBallsY $ccc4 = wLowHealthAlarmBuffer $ccc5 = wTileAnimationTimer - EMPTY: $ccc6-$ccc6 ($0001 byte) - SECTION: $ccc7-$ccc7 ($0001 byte) ["CCC7"] $ccc7 = wDisableVBlankOAMUpdate - EMPTY: $ccc8-$ccc9 ($0002 bytes) - SECTION: $ccca-$cccf ($0006 bytes) ["CCCA"] $ccca = wBGP $cccb = wOBP0 $cccc = wOBP1 $cccd = wNumHits $ccce = wDisableVBlankWYUpdate $cccf = wSGB - SECTION: $ccd0-$cd10 ($0041 bytes) ["CCD0"] $ccd0 = wSGBPalBuffer $ccd1 = wPlayerHPPal $ccd2 = wEnemyHPPal $ccd3 = wHPPals $ccd9 = wCurHPPal $cce1 = wSGBPals - SECTION: $cd11-$cd2f ($001f bytes) ["CD11"] $cd11 = wMonOrItemNameBuffer $cd1d = wTMHMMoveNameBackup $cd26 = wStringBuffer1 - EMPTY: $cd30-$cd30 ($0001 byte) - SECTION: $cd31-$cd3a ($000a bytes) ["CD31"] $cd31 = wStartDay $cd31 = wHPBarTempHP $cd31 = wStringBuffer2 $cd32 = wStartHour $cd33 = wStartMinute $cd33 = wGainBoostedExp - EMPTY: $cd3b-$cd3b ($0001 byte) - SECTION: $cd3c-$cd60 ($0025 bytes) ["CD3C"] $cd3c = wPartyMenuCursor $cd3c = wBillsPCCursor $cd3d = wRegularItemsCursor @@ -24540,8 +24518,6 @@ WRAM0 bank #0: $cd5d = wBattleResult $cd5f = wChosenStarter $cd60 = wCurMartCount - EMPTY: $cd61-$cd6f ($000f bytes) - SECTION: $cd70-$ce3e ($00cf bytes) ["CD70"] $cd70 = wListPointer $cd72 = wNamesPointer $cd74 = wItemAttributesPointer @@ -24732,8 +24708,7 @@ WRAM0 bank #0: $ce3c = wBuffer $ce3d = wTimeOfDay $ce3f = wNewGameWRAMEnd - EMPTY: $ce3f-$ce5e ($0020 bytes) - SECTION: $ce5f-$d266 ($0408 bytes) ["Options"] + SECTION: $ce5f-$ce66 ($0008 bytes) ["Options"] $ce5f = wOptions $ce60 = wSaveFileExists $ce60 = wSaveFileFlags @@ -24743,6 +24718,7 @@ WRAM0 bank #0: $ce64 = wDebugFlags2 $ce65 = wDebugFlags3 $ce66 = wDebugFlags4 + SECTION: $ce67-$d6a9 ($0843 bytes) ["Game Data"] $ce67 = wGameData $ce67 = wPlayerName $ce6d = wMomsName @@ -25368,8 +25344,6 @@ WRAM0 bank #0: $d264 = wPlayerState $d265 = wPlayerStarter $d266 = wRivalStarter - EMPTY: $d267-$d299 ($0033 bytes) - SECTION: $d29a-$d41e ($0185 bytes) ["Map Scene ID & Flags"] $d29a = wPlayerHouse2FSceneID $d29b = wPlayerHouse1FSceneID $d29c = wSilentHillSceneID @@ -25397,19 +25371,14 @@ WRAM0 bank #0: $d3a5 = wSilentHillsFlags $d3a6 = wOldCityPokecenter2FFlags $d41a = wEventFlags - EMPTY: $d41f-$d4a6 ($0088 bytes) - SECTION: $d4a7-$d4ad ($0007 bytes) ["D4A7"] $d4a7 = wPokedexMenuFlags $d4a8 = wUnusedLinkCommunicationByte $d4a9 = wGameModeFlags $d4ab = wJoypadFlags $d4ad = wMovementFlags_Old - EMPTY: $d4ae-$d4b1 ($0004 bytes) - SECTION: $d4b2-$d512 ($0061 bytes) ["wDigWarpNumber"] $d4b2 = wDigWarpNumber $d4b6 = wCurBox $d4b9 = wBoxNames - SECTION: $d513-$d650 ($013e bytes) ["Warp data"] $d513 = wWarpNumber $d514 = wCurrMapWarpCount $d515 = wCurrMapWarps @@ -25424,11 +25393,10 @@ WRAM0 bank #0: $d642 = wUnusedAddOutdoorSpritesReturnValue $d643 = wBGMapAnchor $d645 = wUsedSprites + $d646 = wUsedFollowerSprites $d647 = wUsedNPCSprites $d64f = wUsedStaticSprites $d651 = wUsedSpritesEnd - EMPTY: $d651-$d655 ($0005 bytes) - SECTION: $d656-$d903 ($02ae bytes) ["Map header"] $d656 = wMapGroup $d657 = wMapId $d658 = wOverworldMapAnchor @@ -25500,6 +25468,7 @@ WRAM0 bank #0: $d6a6 = wTilesetAnim $d6aa = wTilesetEnd $d6aa = wGameData2End + SECTION: $d6aa-$dfca ($0921 bytes) ["Party"] $d6aa = wPokemonData $d6aa = wPartyCount $d6ab = wPartySpecies @@ -25808,13 +25777,10 @@ WRAM0 bank #0: $d8fd = wBreedMon2End $d8fd = wBreedMonGenders $d8fe = wOTPlayerName - EMPTY: $d904-$d912 ($000f bytes) - SECTION: $d913-$d91a ($0008 bytes) ["D913"] $d913 = wOTPartyData $d913 = wOTPartyCount $d914 = wOTPartySpecies $d91a = wOTPartySpeciesEnd - SECTION: $d91b-$dfca ($06b0 bytes) ["Wild mon buffer"] $d91b = wWildMonData $d91b = wMornEncounterRate $d91b = wOTPartyMons @@ -26803,7 +26769,7 @@ WRAM0 bank #0: SECTION: $dfff ($0000 bytes) ["Stack Bottom"] $dfff = wStackBottom EMPTY: $dfff-$dfff ($0001 byte) - TOTAL EMPTY: $01c2 bytes + TOTAL EMPTY: $0035 bytes HRAM bank #0: SECTION: $ff80-$ff89 ($000a bytes) ["OAM DMA"] diff --git a/pokegold-spaceworld.sym b/pokegold-spaceworld.sym index e4693463..d78c512f 100644 --- a/pokegold-spaceworld.sym +++ b/pokegold-spaceworld.sym @@ -788,10 +788,10 @@ 00:2ffe TextAsmEnd.stop 00:2fff CallMapTextSubroutine 00:3015 CallMapTextSubroutine.Return -00:3019 Function3055 -00:301c Function3055.Loop -00:3026 asm_3062 -00:303e Function307a +00:3019 CheckAllMapObjects +00:301c CheckAllMapObjects.Loop +00:3026 TalkingToBGObject +00:303e ResetTalkingTarget 00:3049 PrintTextboxDebugNumbers 00:305b PrintTextboxDebugNumbers.CheckSign 00:3062 PrintTextboxDebugNumbers.PrintNum @@ -805,7 +805,7 @@ 00:310e TextboxIdle.next 00:3112 PrepareTextbox 00:3135 TextboxCleanup -00:3153 Function318f +00:3153 ReloadObjectGFX 00:315f TurnNPCTalkingTo 00:317d TurnNPCTalkingTo.Jump 00:3187 Unreferenced_CheckTrainerBattle @@ -916,7 +916,7 @@ 00:35cf RestoreScreenAndReloadTiles 00:35e2 ClearBGPalettes 00:35e5 WaitBGMap -00:35ef SetPalettes +00:35ef SetDefaultBGPAndOBP 00:35f8 ClearPalettes 00:3600 GetMemSGBLayout 00:3602 GetSGBLayout @@ -1231,8 +1231,8 @@ 01:4965 FacePlayerObject.lined_up_horizontal 01:496d FacePlayerObject.done 01:4973 FacePlayerObject.FlipNegativeToPositive -01:4979 Stubbed_UpdateYOffset -01:4994 Stubbed_UpdateYOffset.y_offsets +01:4979 Stubbed_SwayObject +01:4994 Stubbed_SwayObject.y_offsets 01:499c UpdateJumpPosition 01:49d0 UpdateJumpPosition.got_direction 01:49dc UpdateJumpPosition.y_offsets @@ -1253,8 +1253,8 @@ 01:4af6 StepFunction_TeleportTo.InitFinalSpin 01:4b00 StepFunction_TeleportTo.DoFinalSpin 01:4b0c StepFunction_TeleportTo.FinishStep -01:4b22 Unreferenced_Function4b22 -01:4b25 Stub_Function4b25 +01:4b22 Unreferenced_StrengthBoulderDust_Old +01:4b25 Stub_SpawnStrengthBoulderDust_Old 01:4b26 SpawnShadow 01:4b42 SpawnShadow.ShadowObject 01:4b48 SpawnStrengthBoulderDust @@ -1445,8 +1445,8 @@ 01:57de GivePokemon 01:57eb AddRandomPokemonToBox 01:57ed AddRandomPokemonToBox.loop -01:5818 RandomUnder246 -01:5818 RandomUnder246.loop +01:5818 RandomSpecies_RaiEnSuiOrUnder +01:5818 RandomSpecies_RaiEnSuiOrUnder.loop 01:5823 FillTMs 01:582a FillTMs.loop 01:582f DebugGiveKeyItems @@ -1826,9 +1826,8 @@ 02:4242 GetSpriteVTile.VTileOffsets 02:424c CheckObjectEnteringVisibleRange 02:4259 CheckObjectEnteringVisibleRange.dw -02:4261 EmptyFunction8261 -02:4262 Unreferenced_CheckObjectEnteringVisibleRange_Alternate -02:426e Unreferenced_CheckObjectEnteringVisibleRange_Alternate.dw +02:4261 CheckObjectEnteringVisibleRange_Alternate +02:426e CheckObjectEnteringVisibleRange_Alternate.dw 02:4276 CheckVisibleRange_UpAlt 02:427d CheckVisibleRange_DownAlt 02:4284 CheckVisibleRange_LeftAlt @@ -2477,7 +2476,6 @@ 03:5290 FailDig 03:529c Text_CantUseDigHere 03:52aa DigScript -03:52c2 EmptyFunctiond2da 03:52c3 TeleportFunction 03:52c7 TeleportFunction.next 03:52d6 TeleportFunction.finish @@ -2512,7 +2510,7 @@ 03:54cb Unused_IsKeyItem_Old.cant_toss 03:54ce _HandlePlayerStep 03:54e0 _HandlePlayerStep.start -03:54e2 _HandlePlayerStep.unreferenced_d4fa +03:54e2 _HandlePlayerStep.unreferenced_checkobjects 03:54ed _HandlePlayerStep._start 03:54fc _HandlePlayerStep.update_overworld_map 03:5501 _HandlePlayerStep.update_player_coords @@ -2821,16 +2819,13 @@ 03:6fb1 ReviveEffect.skip_to_revive 03:6fc1 ReviveEffect.revive_half_hp 03:6fc4 ReviveEffect.finish_revive -03:6fd5 Unreferenced_EmptyFunctionefed 03:6fd6 FullRestoreEffect 03:7002 FullRestoreEffect.NotAtFullHealth 03:7031 FullRestoreEffect.not_in_battle -03:7042 Unreferenced_EmptyFunctionf05a 03:7043 RestoreHPEffect 03:706e RestoreHPEffect.get_heal_amount 03:7074 RestoreHPEffect.continue_heal 03:7086 RestoreHPEffect.not_in_battle -03:7097 Unreferenced_EmptyFunctionf0af 03:7098 HealHP_SFX_GFX 03:70b7 UseItem_SelectMon 03:70c0 ItemActionTextWaitButton @@ -3322,9 +3317,9 @@ 04:6753 PokemonAskSwapItemText 04:6784 GetPartyItemOffset 04:678c ReceiveItemFromPokemon -04:6798 UnusedHandleItemJumptable -04:67a9 UnusedItemJumptable -04:67b7 EmptyFunction127b7 +04:6798 UnusedHandleRecieveItemJumptable +04:67a9 UnusedRecieveItemJumptable +04:67b7 PartyGiveItem 04:67b8 ChangeBackpackPocket 04:67c0 PartyBallPocket 04:67cb PartyBallPocket.exit @@ -3400,7 +3395,7 @@ 04:6e0f TrainerCardMainInputs.exit 04:6e16 TrainerCardMainInputs.left 04:6e26 TrainerCardMainInputs.right -04:6e37 EmptyFunction12e37 +04:6e37 EmptyTrainerCardFunction 04:6e38 TrainerCardScroll 04:6e49 TrainerCardClearTileMap 04:6e5c TrainerCardSetWindowY @@ -3466,9 +3461,9 @@ 05:410f LoadUsedSpritesGFX.skip 05:4127 LoadUsedSpritesGFX.no_still_sprite_1 05:4132 LoadUsedSpritesGFX.no_still_sprite_2 -05:4133 Function14133 +05:4133 Unreferenced_LoadOverworldSprite_NPCSlot 05:4144 LoadOverworldSprite_PlayerSlot -05:414a LoadOverworldSprite_FollowerSlot +05:414a Unreferenced_LoadOverworldSprite_FollowerSlot 05:4150 LoadOverworldSprite 05:4161 LoadOverworldSprite.dont_copy 05:417d GetOverworldSpriteData @@ -8313,9 +8308,9 @@ 23:42d9 UngroupHealingMachineSprites.ungroup 23:42dc UpdateTimeOfDayPal 23:42e3 _TimeOfDayPals -23:42fe _LABEL_8C2FE_ -23:4313 _LABEL_8C313_ -23:4325 Function8c325 +23:42fe Unreferenced_ResetTimeOfDayPal +23:4313 Unreferenced_SetTimeOfDayPal +23:4325 ChangeTimeOfDayPal 23:4335 _UpdateTimePals 23:433e OverworldFadeIn 23:4349 OverworldFadeOut @@ -8567,7 +8562,7 @@ 23:53ab AnimSeq_GSTitleFlameNote.zero 23:53c2 AnimSeq_GSTitleFlameNote.one 23:53ec AnimSeq_MinigamePikachu -23:540b Data8d40b +23:540b AnimSeq_MinigamePikachu.pikachu_framesets 23:540f AnimSeq_MinigamePikachuTail 23:5418 AnimSeq_MinigameNote 23:541c AnimSeq_MinigameNote.anon_dw @@ -8905,12 +8900,12 @@ 24:47a8 ReelAction_StopReelIgnoreJoypad 24:47b2 ReelAction_StopReelIgnoreJoypad.EndReel 24:47bc ReelAction_StopReelIgnoreJoypad.clear_reel_oam -24:47c8 Function907c8 -24:47f6 Function907c8.asm907f6 -24:4805 Function90805 -24:4814 Function90805.asm90814 -24:481b Function90805.loop -24:4822 Function90822 +24:47c8 Slots_PayoutAnim +24:47f6 Slots_PayoutAnim.seven +24:4805 Slots_PlaceReelTiles +24:4814 Slots_PlaceReelTiles.place +24:481b Slots_PlaceReelTiles.loop +24:4822 Slots_CheckReelTiles 24:486b ReelAction_StopReel1 24:487f ReelAction_StopReel1.NoBias 24:4883 ReelAction_StopReel1.CheckForBias @@ -13094,16 +13089,16 @@ 3a:4070 UpdateChannel.noteover 3a:4076 UpdateChannel.continue_sound_update 3a:407a DisablePitchWheel -3a:4081 Unreferenced_Functione8081 -3a:408c Unreferenced_Functione8081.fail -3a:408e Unreferenced_Functione8081.disable_music -3a:4093 Unreferenced_Functione8081.disable_sfx -3a:409e Unreferenced_Functione8081.clear_loop -3a:40a2 Unreferenced_Functione8081.done +3a:4081 Unreferenced_MuteAudio +3a:408c Unreferenced_MuteAudio.fail +3a:408e Unreferenced_MuteAudio.disable_music +3a:4093 Unreferenced_MuteAudio.disable_sfx +3a:409e Unreferenced_MuteAudio.clear_loop +3a:40a2 Unreferenced_MuteAudio.done 3a:40a4 GetChannelRegisters 3a:40b2 GetChannelRegisters.registers -3a:40b6 Functione80b6 -3a:40f3 Functione80b6.end +3a:40b6 ContinueSoundUpdate +3a:40f3 ContinueSoundUpdate.end 3a:40fa UpdateChannels 3a:410b UpdateChannels.jumptable 3a:411b UpdateChannels.Channel1 @@ -13139,7 +13134,7 @@ 3a:42ce IsChannelSFXOn.off 3a:42d0 IsAnySFXOn 3a:42ee IsAnySFXOn.on -3a:42f0 Functione82f0 +3a:42f0 SetupPlayDanger 3a:4307 PlayDanger 3a:431e PlayDanger.halfway 3a:4323 PlayDanger.begin @@ -13190,7 +13185,7 @@ 3a:45b9 LoadNote.flag_0e 3a:45c2 LoadNote.flag_0d 3a:45cb LoadNote.flag_0b -3a:45d8 Functione85d8 +3a:45d8 CheckChannelFlags2 3a:4605 HandleDuty 3a:461b ApplyPitchSlide 3a:465e ApplyPitchSlide.decreasing @@ -14115,23 +14110,29 @@ 3f:4657 FieldDebug_SpriteViewer.set_following 3f:4663 FieldDebug_SpriteViewer.FollowPromptString 3f:4672 FieldDebug_SpriteViewer.SetStartingPoint -3f:467d LoadUnderDevelopmentString -3f:4681 LoadUnderDevelopmentString.String -3f:4689 Functionfc689 -3f:469c Functionfc69c -3f:46bb Functionfc6bb -3f:46be Functionfc6be -3f:46de Datafc6de -3f:46fe Datafc6fe -3f:470e Datafc70e -3f:471e Datafc71e -3f:472e Datafc72e -3f:473e Datafc73e -3f:474e Datafc74e -3f:475e Datafc75e -3f:476e Datafc76e -3f:477e Datafc77e -3f:478e Datafc78e +3f:467d FieldDebug_SpriteViewer.LoadUnderDevelopmentString +3f:4681 FieldDebug_SpriteViewer.String +3f:4689 SetupSpriteViewerSpriteWalkingTilemap +3f:469c SetupSpriteViewerSpriteWalkingTilemap.loop +3f:46bb SetupSpriteViewerSpriteTilemap +3f:46be SetupSpriteViewerSpriteTilemap.loop +3f:46de SpriteViewerSpriteTilemap +3f:46fe SpriteViewerSpriteTilemap.FacingStepDown0 +3f:46fe SpriteViewerSpriteTilemap.FacingStepDown2 +3f:470e SpriteViewerSpriteTilemap.FacingStepDown1 +3f:471e SpriteViewerSpriteTilemap.FacingStepDown3 +3f:472e SpriteViewerSpriteTilemap.FacingStepUp0 +3f:472e SpriteViewerSpriteTilemap.FacingStepUp2 +3f:473e SpriteViewerSpriteTilemap.FacingStepUp1 +3f:474e SpriteViewerSpriteTilemap.FacingStepUp3 +3f:475e SpriteViewerSpriteTilemap.FacingStepLeft0 +3f:475e SpriteViewerSpriteTilemap.FacingStepLeft2 +3f:476e SpriteViewerSpriteTilemap.FacingStepRight0 +3f:476e SpriteViewerSpriteTilemap.FacingStepRight2 +3f:477e SpriteViewerSpriteTilemap.FacingStepLeft1 +3f:477e SpriteViewerSpriteTilemap.FacingStepLeft3 +3f:478e SpriteViewerSpriteTilemap.FacingStepRight1 +3f:478e SpriteViewerSpriteTilemap.FacingStepRight3 3f:479e FieldDebug_NamePlayer 3f:47cb FieldDebug_Toolgear 3f:47da FieldDebug_Toolgear.Jumptable @@ -18411,6 +18412,61 @@ 02:ba62 sBox5Mon30Nickname 02:ba68 sBox5End 02:ba68 sBox5MonNicknamesEnd +02:ba68 sPartyMailBackup +02:ba68 sPartyMon1MailBackup +02:ba68 sPartyMon1MailBackupMessage +02:ba88 sPartyMon1MailBackupMessageEnd +02:ba89 sPartyMon1MailBackupAuthor +02:ba8f sPartyMon1MailBackupAuthorNationality +02:ba91 sPartyMon1MailBackupAuthorID +02:ba93 sPartyMon1MailBackupSpecies +02:ba94 sPartyMon1MailBackupType +02:ba95 sPartyMon1MailBackupEnd +02:ba95 sPartyMon2MailBackup +02:ba95 sPartyMon2MailBackupMessage +02:bab5 sPartyMon2MailBackupMessageEnd +02:bab6 sPartyMon2MailBackupAuthor +02:babc sPartyMon2MailBackupAuthorNationality +02:babe sPartyMon2MailBackupAuthorID +02:bac0 sPartyMon2MailBackupSpecies +02:bac1 sPartyMon2MailBackupType +02:bac2 sPartyMon2MailBackupEnd +02:bac2 sPartyMon3MailBackup +02:bac2 sPartyMon3MailBackupMessage +02:bae2 sPartyMon3MailBackupMessageEnd +02:bae3 sPartyMon3MailBackupAuthor +02:bae9 sPartyMon3MailBackupAuthorNationality +02:baeb sPartyMon3MailBackupAuthorID +02:baed sPartyMon3MailBackupSpecies +02:baee sPartyMon3MailBackupType +02:baef sPartyMon3MailBackupEnd +02:baef sPartyMon4MailBackup +02:baef sPartyMon4MailBackupMessage +02:bb0f sPartyMon4MailBackupMessageEnd +02:bb10 sPartyMon4MailBackupAuthor +02:bb16 sPartyMon4MailBackupAuthorNationality +02:bb18 sPartyMon4MailBackupAuthorID +02:bb1a sPartyMon4MailBackupSpecies +02:bb1b sPartyMon4MailBackupType +02:bb1c sPartyMon4MailBackupEnd +02:bb1c sPartyMon5MailBackup +02:bb1c sPartyMon5MailBackupMessage +02:bb3c sPartyMon5MailBackupMessageEnd +02:bb3d sPartyMon5MailBackupAuthor +02:bb43 sPartyMon5MailBackupAuthorNationality +02:bb45 sPartyMon5MailBackupAuthorID +02:bb47 sPartyMon5MailBackupSpecies +02:bb48 sPartyMon5MailBackupType +02:bb49 sPartyMon5MailBackupEnd +02:bb49 sPartyMon6MailBackup +02:bb49 sPartyMon6MailBackupMessage +02:bb69 sPartyMon6MailBackupMessageEnd +02:bb6a sPartyMon6MailBackupAuthor +02:bb70 sPartyMon6MailBackupAuthorNationality +02:bb72 sPartyMon6MailBackupAuthorID +02:bb74 sPartyMon6MailBackupSpecies +02:bb75 sPartyMon6MailBackupType +02:bb76 sPartyMon6MailBackupEnd 03:a000 sBox6 03:a000 sBox6Count 03:a001 sBox6Species @@ -22255,62 +22311,7 @@ 03:bb72 sPartyMon6MailAuthorID 03:bb74 sPartyMon6MailSpecies 03:bb75 sPartyMon6MailType -03:bb76 sPartyMailBackup -03:bb76 sPartyMon1MailBackup -03:bb76 sPartyMon1MailBackupMessage 03:bb76 sPartyMon6MailEnd -03:bb96 sPartyMon1MailBackupMessageEnd -03:bb97 sPartyMon1MailBackupAuthor -03:bb9d sPartyMon1MailBackupAuthorNationality -03:bb9f sPartyMon1MailBackupAuthorID -03:bba1 sPartyMon1MailBackupSpecies -03:bba2 sPartyMon1MailBackupType -03:bba3 sPartyMon1MailBackupEnd -03:bba3 sPartyMon2MailBackup -03:bba3 sPartyMon2MailBackupMessage -03:bbc3 sPartyMon2MailBackupMessageEnd -03:bbc4 sPartyMon2MailBackupAuthor -03:bbca sPartyMon2MailBackupAuthorNationality -03:bbcc sPartyMon2MailBackupAuthorID -03:bbce sPartyMon2MailBackupSpecies -03:bbcf sPartyMon2MailBackupType -03:bbd0 sPartyMon2MailBackupEnd -03:bbd0 sPartyMon3MailBackup -03:bbd0 sPartyMon3MailBackupMessage -03:bbf0 sPartyMon3MailBackupMessageEnd -03:bbf1 sPartyMon3MailBackupAuthor -03:bbf7 sPartyMon3MailBackupAuthorNationality -03:bbf9 sPartyMon3MailBackupAuthorID -03:bbfb sPartyMon3MailBackupSpecies -03:bbfc sPartyMon3MailBackupType -03:bbfd sPartyMon3MailBackupEnd -03:bbfd sPartyMon4MailBackup -03:bbfd sPartyMon4MailBackupMessage -03:bc1d sPartyMon4MailBackupMessageEnd -03:bc1e sPartyMon4MailBackupAuthor -03:bc24 sPartyMon4MailBackupAuthorNationality -03:bc26 sPartyMon4MailBackupAuthorID -03:bc28 sPartyMon4MailBackupSpecies -03:bc29 sPartyMon4MailBackupType -03:bc2a sPartyMon4MailBackupEnd -03:bc2a sPartyMon5MailBackup -03:bc2a sPartyMon5MailBackupMessage -03:bc4a sPartyMon5MailBackupMessageEnd -03:bc4b sPartyMon5MailBackupAuthor -03:bc51 sPartyMon5MailBackupAuthorNationality -03:bc53 sPartyMon5MailBackupAuthorID -03:bc55 sPartyMon5MailBackupSpecies -03:bc56 sPartyMon5MailBackupType -03:bc57 sPartyMon5MailBackupEnd -03:bc57 sPartyMon6MailBackup -03:bc57 sPartyMon6MailBackupMessage -03:bc77 sPartyMon6MailBackupMessageEnd -03:bc78 sPartyMon6MailBackupAuthor -03:bc7e sPartyMon6MailBackupAuthorNationality -03:bc80 sPartyMon6MailBackupAuthorID -03:bc82 sPartyMon6MailBackupSpecies -03:bc83 sPartyMon6MailBackupType -03:bc84 sPartyMon6MailBackupEnd 03:bffd sChecksum 00:c000 wChannel1 00:c000 wChannel1MusicID @@ -24043,6 +24044,9 @@ 00:cc3d wSpriteViewerSavedMenuPointerY 00:cc3e wSpriteViewerJumptableIndex 00:cc3f wMovementBuffer +00:cc3f wMovementXBuffer +00:cc40 wMovementYBuffer +00:cc41 wMovementSpriteViewerDirection 00:cc45 wFacingDirectionList_Old 00:cc4c wEmotionBubbleSpriteIndex_Old 00:cc4c wSavedPlayerScreenY_Old @@ -24997,6 +25001,7 @@ 00:d642 wUnusedAddOutdoorSpritesReturnValue 00:d643 wBGMapAnchor 00:d645 wUsedSprites +00:d646 wUsedFollowerSprites 00:d647 wUsedNPCSprites 00:d64f wUsedStaticSprites 00:d651 wUsedSpritesEnd diff --git a/pokesilver-spaceworld-correctheader.sym b/pokesilver-spaceworld-correctheader.sym index 40aad1f8..7521ed26 100644 --- a/pokesilver-spaceworld-correctheader.sym +++ b/pokesilver-spaceworld-correctheader.sym @@ -788,10 +788,10 @@ 00:2ffe TextAsmEnd.stop 00:2fff CallMapTextSubroutine 00:3015 CallMapTextSubroutine.Return -00:3019 Function3055 -00:301c Function3055.Loop -00:3026 asm_3062 -00:303e Function307a +00:3019 CheckAllMapObjects +00:301c CheckAllMapObjects.Loop +00:3026 TalkingToBGObject +00:303e ResetTalkingTarget 00:3049 PrintTextboxDebugNumbers 00:305b PrintTextboxDebugNumbers.CheckSign 00:3062 PrintTextboxDebugNumbers.PrintNum @@ -805,7 +805,7 @@ 00:310e TextboxIdle.next 00:3112 PrepareTextbox 00:3135 TextboxCleanup -00:3153 Function318f +00:3153 ReloadObjectGFX 00:315f TurnNPCTalkingTo 00:317d TurnNPCTalkingTo.Jump 00:3187 Unreferenced_CheckTrainerBattle @@ -916,7 +916,7 @@ 00:35cf RestoreScreenAndReloadTiles 00:35e2 ClearBGPalettes 00:35e5 WaitBGMap -00:35ef SetPalettes +00:35ef SetDefaultBGPAndOBP 00:35f8 ClearPalettes 00:3600 GetMemSGBLayout 00:3602 GetSGBLayout @@ -1231,8 +1231,8 @@ 01:4965 FacePlayerObject.lined_up_horizontal 01:496d FacePlayerObject.done 01:4973 FacePlayerObject.FlipNegativeToPositive -01:4979 Stubbed_UpdateYOffset -01:4994 Stubbed_UpdateYOffset.y_offsets +01:4979 Stubbed_SwayObject +01:4994 Stubbed_SwayObject.y_offsets 01:499c UpdateJumpPosition 01:49d0 UpdateJumpPosition.got_direction 01:49dc UpdateJumpPosition.y_offsets @@ -1253,8 +1253,8 @@ 01:4af6 StepFunction_TeleportTo.InitFinalSpin 01:4b00 StepFunction_TeleportTo.DoFinalSpin 01:4b0c StepFunction_TeleportTo.FinishStep -01:4b22 Unreferenced_Function4b22 -01:4b25 Stub_Function4b25 +01:4b22 Unreferenced_StrengthBoulderDust_Old +01:4b25 Stub_SpawnStrengthBoulderDust_Old 01:4b26 SpawnShadow 01:4b42 SpawnShadow.ShadowObject 01:4b48 SpawnStrengthBoulderDust @@ -1445,8 +1445,8 @@ 01:57de GivePokemon 01:57eb AddRandomPokemonToBox 01:57ed AddRandomPokemonToBox.loop -01:5818 RandomUnder246 -01:5818 RandomUnder246.loop +01:5818 RandomSpecies_RaiEnSuiOrUnder +01:5818 RandomSpecies_RaiEnSuiOrUnder.loop 01:5823 FillTMs 01:582a FillTMs.loop 01:582f DebugGiveKeyItems @@ -1826,9 +1826,8 @@ 02:4242 GetSpriteVTile.VTileOffsets 02:424c CheckObjectEnteringVisibleRange 02:4259 CheckObjectEnteringVisibleRange.dw -02:4261 EmptyFunction8261 -02:4262 Unreferenced_CheckObjectEnteringVisibleRange_Alternate -02:426e Unreferenced_CheckObjectEnteringVisibleRange_Alternate.dw +02:4261 CheckObjectEnteringVisibleRange_Alternate +02:426e CheckObjectEnteringVisibleRange_Alternate.dw 02:4276 CheckVisibleRange_UpAlt 02:427d CheckVisibleRange_DownAlt 02:4284 CheckVisibleRange_LeftAlt @@ -2477,7 +2476,6 @@ 03:5290 FailDig 03:529c Text_CantUseDigHere 03:52aa DigScript -03:52c2 EmptyFunctiond2da 03:52c3 TeleportFunction 03:52c7 TeleportFunction.next 03:52d6 TeleportFunction.finish @@ -2512,7 +2510,7 @@ 03:54cb Unused_IsKeyItem_Old.cant_toss 03:54ce _HandlePlayerStep 03:54e0 _HandlePlayerStep.start -03:54e2 _HandlePlayerStep.unreferenced_d4fa +03:54e2 _HandlePlayerStep.unreferenced_checkobjects 03:54ed _HandlePlayerStep._start 03:54fc _HandlePlayerStep.update_overworld_map 03:5501 _HandlePlayerStep.update_player_coords @@ -2821,16 +2819,13 @@ 03:6fb1 ReviveEffect.skip_to_revive 03:6fc1 ReviveEffect.revive_half_hp 03:6fc4 ReviveEffect.finish_revive -03:6fd5 Unreferenced_EmptyFunctionefed 03:6fd6 FullRestoreEffect 03:7002 FullRestoreEffect.NotAtFullHealth 03:7031 FullRestoreEffect.not_in_battle -03:7042 Unreferenced_EmptyFunctionf05a 03:7043 RestoreHPEffect 03:706e RestoreHPEffect.get_heal_amount 03:7074 RestoreHPEffect.continue_heal 03:7086 RestoreHPEffect.not_in_battle -03:7097 Unreferenced_EmptyFunctionf0af 03:7098 HealHP_SFX_GFX 03:70b7 UseItem_SelectMon 03:70c0 ItemActionTextWaitButton @@ -3322,9 +3317,9 @@ 04:6753 PokemonAskSwapItemText 04:6784 GetPartyItemOffset 04:678c ReceiveItemFromPokemon -04:6798 UnusedHandleItemJumptable -04:67a9 UnusedItemJumptable -04:67b7 EmptyFunction127b7 +04:6798 UnusedHandleRecieveItemJumptable +04:67a9 UnusedRecieveItemJumptable +04:67b7 PartyGiveItem 04:67b8 ChangeBackpackPocket 04:67c0 PartyBallPocket 04:67cb PartyBallPocket.exit @@ -3400,7 +3395,7 @@ 04:6e0f TrainerCardMainInputs.exit 04:6e16 TrainerCardMainInputs.left 04:6e26 TrainerCardMainInputs.right -04:6e37 EmptyFunction12e37 +04:6e37 EmptyTrainerCardFunction 04:6e38 TrainerCardScroll 04:6e49 TrainerCardClearTileMap 04:6e5c TrainerCardSetWindowY @@ -3466,9 +3461,9 @@ 05:410f LoadUsedSpritesGFX.skip 05:4127 LoadUsedSpritesGFX.no_still_sprite_1 05:4132 LoadUsedSpritesGFX.no_still_sprite_2 -05:4133 Function14133 +05:4133 Unreferenced_LoadOverworldSprite_NPCSlot 05:4144 LoadOverworldSprite_PlayerSlot -05:414a LoadOverworldSprite_FollowerSlot +05:414a Unreferenced_LoadOverworldSprite_FollowerSlot 05:4150 LoadOverworldSprite 05:4161 LoadOverworldSprite.dont_copy 05:417d GetOverworldSpriteData @@ -8309,9 +8304,9 @@ 23:42d9 UngroupHealingMachineSprites.ungroup 23:42dc UpdateTimeOfDayPal 23:42e3 _TimeOfDayPals -23:42fe _LABEL_8C2FE_ -23:4313 _LABEL_8C313_ -23:4325 Function8c325 +23:42fe Unreferenced_ResetTimeOfDayPal +23:4313 Unreferenced_SetTimeOfDayPal +23:4325 ChangeTimeOfDayPal 23:4335 _UpdateTimePals 23:433e OverworldFadeIn 23:4349 OverworldFadeOut @@ -8563,7 +8558,7 @@ 23:53ab AnimSeq_GSTitleFlameNote.zero 23:53c2 AnimSeq_GSTitleFlameNote.one 23:53ec AnimSeq_MinigamePikachu -23:540b Data8d40b +23:540b AnimSeq_MinigamePikachu.pikachu_framesets 23:540f AnimSeq_MinigamePikachuTail 23:5418 AnimSeq_MinigameNote 23:541c AnimSeq_MinigameNote.anon_dw @@ -8901,12 +8896,12 @@ 24:47a8 ReelAction_StopReelIgnoreJoypad 24:47b2 ReelAction_StopReelIgnoreJoypad.EndReel 24:47bc ReelAction_StopReelIgnoreJoypad.clear_reel_oam -24:47c8 Function907c8 -24:47f6 Function907c8.asm907f6 -24:4805 Function90805 -24:4814 Function90805.asm90814 -24:481b Function90805.loop -24:4822 Function90822 +24:47c8 Slots_PayoutAnim +24:47f6 Slots_PayoutAnim.seven +24:4805 Slots_PlaceReelTiles +24:4814 Slots_PlaceReelTiles.place +24:481b Slots_PlaceReelTiles.loop +24:4822 Slots_CheckReelTiles 24:486b ReelAction_StopReel1 24:487f ReelAction_StopReel1.NoBias 24:4883 ReelAction_StopReel1.CheckForBias @@ -13033,16 +13028,16 @@ 3a:4070 UpdateChannel.noteover 3a:4076 UpdateChannel.continue_sound_update 3a:407a DisablePitchWheel -3a:4081 Unreferenced_Functione8081 -3a:408c Unreferenced_Functione8081.fail -3a:408e Unreferenced_Functione8081.disable_music -3a:4093 Unreferenced_Functione8081.disable_sfx -3a:409e Unreferenced_Functione8081.clear_loop -3a:40a2 Unreferenced_Functione8081.done +3a:4081 Unreferenced_MuteAudio +3a:408c Unreferenced_MuteAudio.fail +3a:408e Unreferenced_MuteAudio.disable_music +3a:4093 Unreferenced_MuteAudio.disable_sfx +3a:409e Unreferenced_MuteAudio.clear_loop +3a:40a2 Unreferenced_MuteAudio.done 3a:40a4 GetChannelRegisters 3a:40b2 GetChannelRegisters.registers -3a:40b6 Functione80b6 -3a:40f3 Functione80b6.end +3a:40b6 ContinueSoundUpdate +3a:40f3 ContinueSoundUpdate.end 3a:40fa UpdateChannels 3a:410b UpdateChannels.jumptable 3a:411b UpdateChannels.Channel1 @@ -13078,7 +13073,7 @@ 3a:42ce IsChannelSFXOn.off 3a:42d0 IsAnySFXOn 3a:42ee IsAnySFXOn.on -3a:42f0 Functione82f0 +3a:42f0 SetupPlayDanger 3a:4307 PlayDanger 3a:431e PlayDanger.halfway 3a:4323 PlayDanger.begin @@ -13129,7 +13124,7 @@ 3a:45b9 LoadNote.flag_0e 3a:45c2 LoadNote.flag_0d 3a:45cb LoadNote.flag_0b -3a:45d8 Functione85d8 +3a:45d8 CheckChannelFlags2 3a:4605 HandleDuty 3a:461b ApplyPitchSlide 3a:465e ApplyPitchSlide.decreasing @@ -14054,23 +14049,29 @@ 3f:4657 FieldDebug_SpriteViewer.set_following 3f:4663 FieldDebug_SpriteViewer.FollowPromptString 3f:4672 FieldDebug_SpriteViewer.SetStartingPoint -3f:467d LoadUnderDevelopmentString -3f:4681 LoadUnderDevelopmentString.String -3f:4689 Functionfc689 -3f:469c Functionfc69c -3f:46bb Functionfc6bb -3f:46be Functionfc6be -3f:46de Datafc6de -3f:46fe Datafc6fe -3f:470e Datafc70e -3f:471e Datafc71e -3f:472e Datafc72e -3f:473e Datafc73e -3f:474e Datafc74e -3f:475e Datafc75e -3f:476e Datafc76e -3f:477e Datafc77e -3f:478e Datafc78e +3f:467d FieldDebug_SpriteViewer.LoadUnderDevelopmentString +3f:4681 FieldDebug_SpriteViewer.String +3f:4689 SetupSpriteViewerSpriteWalkingTilemap +3f:469c SetupSpriteViewerSpriteWalkingTilemap.loop +3f:46bb SetupSpriteViewerSpriteTilemap +3f:46be SetupSpriteViewerSpriteTilemap.loop +3f:46de SpriteViewerSpriteTilemap +3f:46fe SpriteViewerSpriteTilemap.FacingStepDown0 +3f:46fe SpriteViewerSpriteTilemap.FacingStepDown2 +3f:470e SpriteViewerSpriteTilemap.FacingStepDown1 +3f:471e SpriteViewerSpriteTilemap.FacingStepDown3 +3f:472e SpriteViewerSpriteTilemap.FacingStepUp0 +3f:472e SpriteViewerSpriteTilemap.FacingStepUp2 +3f:473e SpriteViewerSpriteTilemap.FacingStepUp1 +3f:474e SpriteViewerSpriteTilemap.FacingStepUp3 +3f:475e SpriteViewerSpriteTilemap.FacingStepLeft0 +3f:475e SpriteViewerSpriteTilemap.FacingStepLeft2 +3f:476e SpriteViewerSpriteTilemap.FacingStepRight0 +3f:476e SpriteViewerSpriteTilemap.FacingStepRight2 +3f:477e SpriteViewerSpriteTilemap.FacingStepLeft1 +3f:477e SpriteViewerSpriteTilemap.FacingStepLeft3 +3f:478e SpriteViewerSpriteTilemap.FacingStepRight1 +3f:478e SpriteViewerSpriteTilemap.FacingStepRight3 3f:479e FieldDebug_NamePlayer 3f:47cb FieldDebug_Toolgear 3f:47da FieldDebug_Toolgear.Jumptable @@ -18350,6 +18351,61 @@ 02:ba62 sBox5Mon30Nickname 02:ba68 sBox5End 02:ba68 sBox5MonNicknamesEnd +02:ba68 sPartyMailBackup +02:ba68 sPartyMon1MailBackup +02:ba68 sPartyMon1MailBackupMessage +02:ba88 sPartyMon1MailBackupMessageEnd +02:ba89 sPartyMon1MailBackupAuthor +02:ba8f sPartyMon1MailBackupAuthorNationality +02:ba91 sPartyMon1MailBackupAuthorID +02:ba93 sPartyMon1MailBackupSpecies +02:ba94 sPartyMon1MailBackupType +02:ba95 sPartyMon1MailBackupEnd +02:ba95 sPartyMon2MailBackup +02:ba95 sPartyMon2MailBackupMessage +02:bab5 sPartyMon2MailBackupMessageEnd +02:bab6 sPartyMon2MailBackupAuthor +02:babc sPartyMon2MailBackupAuthorNationality +02:babe sPartyMon2MailBackupAuthorID +02:bac0 sPartyMon2MailBackupSpecies +02:bac1 sPartyMon2MailBackupType +02:bac2 sPartyMon2MailBackupEnd +02:bac2 sPartyMon3MailBackup +02:bac2 sPartyMon3MailBackupMessage +02:bae2 sPartyMon3MailBackupMessageEnd +02:bae3 sPartyMon3MailBackupAuthor +02:bae9 sPartyMon3MailBackupAuthorNationality +02:baeb sPartyMon3MailBackupAuthorID +02:baed sPartyMon3MailBackupSpecies +02:baee sPartyMon3MailBackupType +02:baef sPartyMon3MailBackupEnd +02:baef sPartyMon4MailBackup +02:baef sPartyMon4MailBackupMessage +02:bb0f sPartyMon4MailBackupMessageEnd +02:bb10 sPartyMon4MailBackupAuthor +02:bb16 sPartyMon4MailBackupAuthorNationality +02:bb18 sPartyMon4MailBackupAuthorID +02:bb1a sPartyMon4MailBackupSpecies +02:bb1b sPartyMon4MailBackupType +02:bb1c sPartyMon4MailBackupEnd +02:bb1c sPartyMon5MailBackup +02:bb1c sPartyMon5MailBackupMessage +02:bb3c sPartyMon5MailBackupMessageEnd +02:bb3d sPartyMon5MailBackupAuthor +02:bb43 sPartyMon5MailBackupAuthorNationality +02:bb45 sPartyMon5MailBackupAuthorID +02:bb47 sPartyMon5MailBackupSpecies +02:bb48 sPartyMon5MailBackupType +02:bb49 sPartyMon5MailBackupEnd +02:bb49 sPartyMon6MailBackup +02:bb49 sPartyMon6MailBackupMessage +02:bb69 sPartyMon6MailBackupMessageEnd +02:bb6a sPartyMon6MailBackupAuthor +02:bb70 sPartyMon6MailBackupAuthorNationality +02:bb72 sPartyMon6MailBackupAuthorID +02:bb74 sPartyMon6MailBackupSpecies +02:bb75 sPartyMon6MailBackupType +02:bb76 sPartyMon6MailBackupEnd 03:a000 sBox6 03:a000 sBox6Count 03:a001 sBox6Species @@ -22194,62 +22250,7 @@ 03:bb72 sPartyMon6MailAuthorID 03:bb74 sPartyMon6MailSpecies 03:bb75 sPartyMon6MailType -03:bb76 sPartyMailBackup -03:bb76 sPartyMon1MailBackup -03:bb76 sPartyMon1MailBackupMessage 03:bb76 sPartyMon6MailEnd -03:bb96 sPartyMon1MailBackupMessageEnd -03:bb97 sPartyMon1MailBackupAuthor -03:bb9d sPartyMon1MailBackupAuthorNationality -03:bb9f sPartyMon1MailBackupAuthorID -03:bba1 sPartyMon1MailBackupSpecies -03:bba2 sPartyMon1MailBackupType -03:bba3 sPartyMon1MailBackupEnd -03:bba3 sPartyMon2MailBackup -03:bba3 sPartyMon2MailBackupMessage -03:bbc3 sPartyMon2MailBackupMessageEnd -03:bbc4 sPartyMon2MailBackupAuthor -03:bbca sPartyMon2MailBackupAuthorNationality -03:bbcc sPartyMon2MailBackupAuthorID -03:bbce sPartyMon2MailBackupSpecies -03:bbcf sPartyMon2MailBackupType -03:bbd0 sPartyMon2MailBackupEnd -03:bbd0 sPartyMon3MailBackup -03:bbd0 sPartyMon3MailBackupMessage -03:bbf0 sPartyMon3MailBackupMessageEnd -03:bbf1 sPartyMon3MailBackupAuthor -03:bbf7 sPartyMon3MailBackupAuthorNationality -03:bbf9 sPartyMon3MailBackupAuthorID -03:bbfb sPartyMon3MailBackupSpecies -03:bbfc sPartyMon3MailBackupType -03:bbfd sPartyMon3MailBackupEnd -03:bbfd sPartyMon4MailBackup -03:bbfd sPartyMon4MailBackupMessage -03:bc1d sPartyMon4MailBackupMessageEnd -03:bc1e sPartyMon4MailBackupAuthor -03:bc24 sPartyMon4MailBackupAuthorNationality -03:bc26 sPartyMon4MailBackupAuthorID -03:bc28 sPartyMon4MailBackupSpecies -03:bc29 sPartyMon4MailBackupType -03:bc2a sPartyMon4MailBackupEnd -03:bc2a sPartyMon5MailBackup -03:bc2a sPartyMon5MailBackupMessage -03:bc4a sPartyMon5MailBackupMessageEnd -03:bc4b sPartyMon5MailBackupAuthor -03:bc51 sPartyMon5MailBackupAuthorNationality -03:bc53 sPartyMon5MailBackupAuthorID -03:bc55 sPartyMon5MailBackupSpecies -03:bc56 sPartyMon5MailBackupType -03:bc57 sPartyMon5MailBackupEnd -03:bc57 sPartyMon6MailBackup -03:bc57 sPartyMon6MailBackupMessage -03:bc77 sPartyMon6MailBackupMessageEnd -03:bc78 sPartyMon6MailBackupAuthor -03:bc7e sPartyMon6MailBackupAuthorNationality -03:bc80 sPartyMon6MailBackupAuthorID -03:bc82 sPartyMon6MailBackupSpecies -03:bc83 sPartyMon6MailBackupType -03:bc84 sPartyMon6MailBackupEnd 03:bffd sChecksum 00:c000 wChannel1 00:c000 wChannel1MusicID @@ -23982,6 +23983,9 @@ 00:cc3d wSpriteViewerSavedMenuPointerY 00:cc3e wSpriteViewerJumptableIndex 00:cc3f wMovementBuffer +00:cc3f wMovementXBuffer +00:cc40 wMovementYBuffer +00:cc41 wMovementSpriteViewerDirection 00:cc45 wFacingDirectionList_Old 00:cc4c wEmotionBubbleSpriteIndex_Old 00:cc4c wSavedPlayerScreenY_Old @@ -24936,6 +24940,7 @@ 00:d642 wUnusedAddOutdoorSpritesReturnValue 00:d643 wBGMapAnchor 00:d645 wUsedSprites +00:d646 wUsedFollowerSprites 00:d647 wUsedNPCSprites 00:d64f wUsedStaticSprites 00:d651 wUsedSpritesEnd diff --git a/pokesilver-spaceworld-debug-correctheader.sym b/pokesilver-spaceworld-debug-correctheader.sym index 0bb3477e..493384d9 100644 --- a/pokesilver-spaceworld-debug-correctheader.sym +++ b/pokesilver-spaceworld-debug-correctheader.sym @@ -789,10 +789,10 @@ 00:303a TextAsmEnd.stop 00:303b CallMapTextSubroutine 00:3051 CallMapTextSubroutine.Return -00:3055 Function3055 -00:3058 Function3055.Loop -00:3062 asm_3062 -00:307a Function307a +00:3055 CheckAllMapObjects +00:3058 CheckAllMapObjects.Loop +00:3062 TalkingToBGObject +00:307a ResetTalkingTarget 00:3085 PrintTextboxDebugNumbers 00:3097 PrintTextboxDebugNumbers.CheckSign 00:309e PrintTextboxDebugNumbers.PrintNum @@ -806,7 +806,7 @@ 00:314a TextboxIdle.next 00:314e PrepareTextbox 00:3171 TextboxCleanup -00:318f Function318f +00:318f ReloadObjectGFX 00:319b TurnNPCTalkingTo 00:31b9 TurnNPCTalkingTo.Jump 00:31c3 Unreferenced_CheckTrainerBattle @@ -917,7 +917,7 @@ 00:360b RestoreScreenAndReloadTiles 00:361e ClearBGPalettes 00:3621 WaitBGMap -00:362b SetPalettes +00:362b SetDefaultBGPAndOBP 00:3634 ClearPalettes 00:363c GetMemSGBLayout 00:363e GetSGBLayout @@ -1260,8 +1260,8 @@ 01:4965 FacePlayerObject.lined_up_horizontal 01:496d FacePlayerObject.done 01:4973 FacePlayerObject.FlipNegativeToPositive -01:4979 Stubbed_UpdateYOffset -01:4994 Stubbed_UpdateYOffset.y_offsets +01:4979 Stubbed_SwayObject +01:4994 Stubbed_SwayObject.y_offsets 01:499c UpdateJumpPosition 01:49d0 UpdateJumpPosition.got_direction 01:49dc UpdateJumpPosition.y_offsets @@ -1282,8 +1282,8 @@ 01:4af6 StepFunction_TeleportTo.InitFinalSpin 01:4b00 StepFunction_TeleportTo.DoFinalSpin 01:4b0c StepFunction_TeleportTo.FinishStep -01:4b22 Unreferenced_Function4b22 -01:4b25 Stub_Function4b25 +01:4b22 Unreferenced_StrengthBoulderDust_Old +01:4b25 Stub_SpawnStrengthBoulderDust_Old 01:4b26 SpawnShadow 01:4b42 SpawnShadow.ShadowObject 01:4b48 SpawnStrengthBoulderDust @@ -1474,8 +1474,8 @@ 01:57de GivePokemon 01:57eb AddRandomPokemonToBox 01:57ed AddRandomPokemonToBox.loop -01:5818 RandomUnder246 -01:5818 RandomUnder246.loop +01:5818 RandomSpecies_RaiEnSuiOrUnder +01:5818 RandomSpecies_RaiEnSuiOrUnder.loop 01:5823 FillTMs 01:582a FillTMs.loop 01:582f DebugGiveKeyItems @@ -1855,9 +1855,8 @@ 02:4242 GetSpriteVTile.VTileOffsets 02:424c CheckObjectEnteringVisibleRange 02:4259 CheckObjectEnteringVisibleRange.dw -02:4261 EmptyFunction8261 -02:4262 Unreferenced_CheckObjectEnteringVisibleRange_Alternate -02:426e Unreferenced_CheckObjectEnteringVisibleRange_Alternate.dw +02:4261 CheckObjectEnteringVisibleRange_Alternate +02:426e CheckObjectEnteringVisibleRange_Alternate.dw 02:4276 CheckVisibleRange_UpAlt 02:427d CheckVisibleRange_DownAlt 02:4284 CheckVisibleRange_LeftAlt @@ -2508,7 +2507,6 @@ 03:52a8 FailDig 03:52b4 Text_CantUseDigHere 03:52c2 DigScript -03:52da EmptyFunctiond2da 03:52db TeleportFunction 03:52df TeleportFunction.next 03:52ee TeleportFunction.finish @@ -2543,7 +2541,7 @@ 03:54e3 Unused_IsKeyItem_Old.cant_toss 03:54e6 _HandlePlayerStep 03:54f8 _HandlePlayerStep.start -03:54fa _HandlePlayerStep.unreferenced_d4fa +03:54fa _HandlePlayerStep.unreferenced_checkobjects 03:5505 _HandlePlayerStep._start 03:5514 _HandlePlayerStep.update_overworld_map 03:5519 _HandlePlayerStep.update_player_coords @@ -2852,16 +2850,13 @@ 03:6fc9 ReviveEffect.skip_to_revive 03:6fd9 ReviveEffect.revive_half_hp 03:6fdc ReviveEffect.finish_revive -03:6fed Unreferenced_EmptyFunctionefed 03:6fee FullRestoreEffect 03:701a FullRestoreEffect.NotAtFullHealth 03:7049 FullRestoreEffect.not_in_battle -03:705a Unreferenced_EmptyFunctionf05a 03:705b RestoreHPEffect 03:7086 RestoreHPEffect.get_heal_amount 03:708c RestoreHPEffect.continue_heal 03:709e RestoreHPEffect.not_in_battle -03:70af Unreferenced_EmptyFunctionf0af 03:70b0 HealHP_SFX_GFX 03:70cf UseItem_SelectMon 03:70d8 ItemActionTextWaitButton @@ -3359,9 +3354,9 @@ 04:6753 PokemonAskSwapItemText 04:6784 GetPartyItemOffset 04:678c ReceiveItemFromPokemon -04:6798 UnusedHandleItemJumptable -04:67a9 UnusedItemJumptable -04:67b7 EmptyFunction127b7 +04:6798 UnusedHandleRecieveItemJumptable +04:67a9 UnusedRecieveItemJumptable +04:67b7 PartyGiveItem 04:67b8 ChangeBackpackPocket 04:67c0 PartyBallPocket 04:67cb PartyBallPocket.exit @@ -3437,7 +3432,7 @@ 04:6e0f TrainerCardMainInputs.exit 04:6e16 TrainerCardMainInputs.left 04:6e26 TrainerCardMainInputs.right -04:6e37 EmptyFunction12e37 +04:6e37 EmptyTrainerCardFunction 04:6e38 TrainerCardScroll 04:6e49 TrainerCardClearTileMap 04:6e5c TrainerCardSetWindowY @@ -3504,9 +3499,9 @@ 05:410f LoadUsedSpritesGFX.skip 05:4127 LoadUsedSpritesGFX.no_still_sprite_1 05:4132 LoadUsedSpritesGFX.no_still_sprite_2 -05:4133 Function14133 +05:4133 Unreferenced_LoadOverworldSprite_NPCSlot 05:4144 LoadOverworldSprite_PlayerSlot -05:414a LoadOverworldSprite_FollowerSlot +05:414a Unreferenced_LoadOverworldSprite_FollowerSlot 05:4150 LoadOverworldSprite 05:4161 LoadOverworldSprite.dont_copy 05:417d GetOverworldSpriteData @@ -8353,9 +8348,9 @@ 23:42d9 UngroupHealingMachineSprites.ungroup 23:42dc UpdateTimeOfDayPal 23:42e3 _TimeOfDayPals -23:42fe _LABEL_8C2FE_ -23:4313 _LABEL_8C313_ -23:4325 Function8c325 +23:42fe Unreferenced_ResetTimeOfDayPal +23:4313 Unreferenced_SetTimeOfDayPal +23:4325 ChangeTimeOfDayPal 23:4335 _UpdateTimePals 23:433e OverworldFadeIn 23:4349 OverworldFadeOut @@ -8607,7 +8602,7 @@ 23:53ab AnimSeq_GSTitleFlameNote.zero 23:53c2 AnimSeq_GSTitleFlameNote.one 23:53ec AnimSeq_MinigamePikachu -23:540b Data8d40b +23:540b AnimSeq_MinigamePikachu.pikachu_framesets 23:540f AnimSeq_MinigamePikachuTail 23:5418 AnimSeq_MinigameNote 23:541c AnimSeq_MinigameNote.anon_dw @@ -8945,12 +8940,12 @@ 24:47a8 ReelAction_StopReelIgnoreJoypad 24:47b2 ReelAction_StopReelIgnoreJoypad.EndReel 24:47bc ReelAction_StopReelIgnoreJoypad.clear_reel_oam -24:47c8 Function907c8 -24:47f6 Function907c8.asm907f6 -24:4805 Function90805 -24:4814 Function90805.asm90814 -24:481b Function90805.loop -24:4822 Function90822 +24:47c8 Slots_PayoutAnim +24:47f6 Slots_PayoutAnim.seven +24:4805 Slots_PlaceReelTiles +24:4814 Slots_PlaceReelTiles.place +24:481b Slots_PlaceReelTiles.loop +24:4822 Slots_CheckReelTiles 24:486b ReelAction_StopReel1 24:487f ReelAction_StopReel1.NoBias 24:4883 ReelAction_StopReel1.CheckForBias @@ -13125,16 +13120,16 @@ 3a:4070 UpdateChannel.noteover 3a:4076 UpdateChannel.continue_sound_update 3a:407a DisablePitchWheel -3a:4081 Unreferenced_Functione8081 -3a:408c Unreferenced_Functione8081.fail -3a:408e Unreferenced_Functione8081.disable_music -3a:4093 Unreferenced_Functione8081.disable_sfx -3a:409e Unreferenced_Functione8081.clear_loop -3a:40a2 Unreferenced_Functione8081.done +3a:4081 Unreferenced_MuteAudio +3a:408c Unreferenced_MuteAudio.fail +3a:408e Unreferenced_MuteAudio.disable_music +3a:4093 Unreferenced_MuteAudio.disable_sfx +3a:409e Unreferenced_MuteAudio.clear_loop +3a:40a2 Unreferenced_MuteAudio.done 3a:40a4 GetChannelRegisters 3a:40b2 GetChannelRegisters.registers -3a:40b6 Functione80b6 -3a:40f3 Functione80b6.end +3a:40b6 ContinueSoundUpdate +3a:40f3 ContinueSoundUpdate.end 3a:40fa UpdateChannels 3a:410b UpdateChannels.jumptable 3a:411b UpdateChannels.Channel1 @@ -13170,7 +13165,7 @@ 3a:42ce IsChannelSFXOn.off 3a:42d0 IsAnySFXOn 3a:42ee IsAnySFXOn.on -3a:42f0 Functione82f0 +3a:42f0 SetupPlayDanger 3a:4307 PlayDanger 3a:431e PlayDanger.halfway 3a:4323 PlayDanger.begin @@ -13221,7 +13216,7 @@ 3a:45b9 LoadNote.flag_0e 3a:45c2 LoadNote.flag_0d 3a:45cb LoadNote.flag_0b -3a:45d8 Functione85d8 +3a:45d8 CheckChannelFlags2 3a:4605 HandleDuty 3a:461b ApplyPitchSlide 3a:465e ApplyPitchSlide.decreasing @@ -14146,23 +14141,29 @@ 3f:4657 FieldDebug_SpriteViewer.set_following 3f:4663 FieldDebug_SpriteViewer.FollowPromptString 3f:4672 FieldDebug_SpriteViewer.SetStartingPoint -3f:467d LoadUnderDevelopmentString -3f:4681 LoadUnderDevelopmentString.String -3f:4689 Functionfc689 -3f:469c Functionfc69c -3f:46bb Functionfc6bb -3f:46be Functionfc6be -3f:46de Datafc6de -3f:46fe Datafc6fe -3f:470e Datafc70e -3f:471e Datafc71e -3f:472e Datafc72e -3f:473e Datafc73e -3f:474e Datafc74e -3f:475e Datafc75e -3f:476e Datafc76e -3f:477e Datafc77e -3f:478e Datafc78e +3f:467d FieldDebug_SpriteViewer.LoadUnderDevelopmentString +3f:4681 FieldDebug_SpriteViewer.String +3f:4689 SetupSpriteViewerSpriteWalkingTilemap +3f:469c SetupSpriteViewerSpriteWalkingTilemap.loop +3f:46bb SetupSpriteViewerSpriteTilemap +3f:46be SetupSpriteViewerSpriteTilemap.loop +3f:46de SpriteViewerSpriteTilemap +3f:46fe SpriteViewerSpriteTilemap.FacingStepDown0 +3f:46fe SpriteViewerSpriteTilemap.FacingStepDown2 +3f:470e SpriteViewerSpriteTilemap.FacingStepDown1 +3f:471e SpriteViewerSpriteTilemap.FacingStepDown3 +3f:472e SpriteViewerSpriteTilemap.FacingStepUp0 +3f:472e SpriteViewerSpriteTilemap.FacingStepUp2 +3f:473e SpriteViewerSpriteTilemap.FacingStepUp1 +3f:474e SpriteViewerSpriteTilemap.FacingStepUp3 +3f:475e SpriteViewerSpriteTilemap.FacingStepLeft0 +3f:475e SpriteViewerSpriteTilemap.FacingStepLeft2 +3f:476e SpriteViewerSpriteTilemap.FacingStepRight0 +3f:476e SpriteViewerSpriteTilemap.FacingStepRight2 +3f:477e SpriteViewerSpriteTilemap.FacingStepLeft1 +3f:477e SpriteViewerSpriteTilemap.FacingStepLeft3 +3f:478e SpriteViewerSpriteTilemap.FacingStepRight1 +3f:478e SpriteViewerSpriteTilemap.FacingStepRight3 3f:479e FieldDebug_NamePlayer 3f:47cb FieldDebug_Toolgear 3f:47da FieldDebug_Toolgear.Jumptable @@ -18442,6 +18443,61 @@ 02:ba62 sBox5Mon30Nickname 02:ba68 sBox5End 02:ba68 sBox5MonNicknamesEnd +02:ba68 sPartyMailBackup +02:ba68 sPartyMon1MailBackup +02:ba68 sPartyMon1MailBackupMessage +02:ba88 sPartyMon1MailBackupMessageEnd +02:ba89 sPartyMon1MailBackupAuthor +02:ba8f sPartyMon1MailBackupAuthorNationality +02:ba91 sPartyMon1MailBackupAuthorID +02:ba93 sPartyMon1MailBackupSpecies +02:ba94 sPartyMon1MailBackupType +02:ba95 sPartyMon1MailBackupEnd +02:ba95 sPartyMon2MailBackup +02:ba95 sPartyMon2MailBackupMessage +02:bab5 sPartyMon2MailBackupMessageEnd +02:bab6 sPartyMon2MailBackupAuthor +02:babc sPartyMon2MailBackupAuthorNationality +02:babe sPartyMon2MailBackupAuthorID +02:bac0 sPartyMon2MailBackupSpecies +02:bac1 sPartyMon2MailBackupType +02:bac2 sPartyMon2MailBackupEnd +02:bac2 sPartyMon3MailBackup +02:bac2 sPartyMon3MailBackupMessage +02:bae2 sPartyMon3MailBackupMessageEnd +02:bae3 sPartyMon3MailBackupAuthor +02:bae9 sPartyMon3MailBackupAuthorNationality +02:baeb sPartyMon3MailBackupAuthorID +02:baed sPartyMon3MailBackupSpecies +02:baee sPartyMon3MailBackupType +02:baef sPartyMon3MailBackupEnd +02:baef sPartyMon4MailBackup +02:baef sPartyMon4MailBackupMessage +02:bb0f sPartyMon4MailBackupMessageEnd +02:bb10 sPartyMon4MailBackupAuthor +02:bb16 sPartyMon4MailBackupAuthorNationality +02:bb18 sPartyMon4MailBackupAuthorID +02:bb1a sPartyMon4MailBackupSpecies +02:bb1b sPartyMon4MailBackupType +02:bb1c sPartyMon4MailBackupEnd +02:bb1c sPartyMon5MailBackup +02:bb1c sPartyMon5MailBackupMessage +02:bb3c sPartyMon5MailBackupMessageEnd +02:bb3d sPartyMon5MailBackupAuthor +02:bb43 sPartyMon5MailBackupAuthorNationality +02:bb45 sPartyMon5MailBackupAuthorID +02:bb47 sPartyMon5MailBackupSpecies +02:bb48 sPartyMon5MailBackupType +02:bb49 sPartyMon5MailBackupEnd +02:bb49 sPartyMon6MailBackup +02:bb49 sPartyMon6MailBackupMessage +02:bb69 sPartyMon6MailBackupMessageEnd +02:bb6a sPartyMon6MailBackupAuthor +02:bb70 sPartyMon6MailBackupAuthorNationality +02:bb72 sPartyMon6MailBackupAuthorID +02:bb74 sPartyMon6MailBackupSpecies +02:bb75 sPartyMon6MailBackupType +02:bb76 sPartyMon6MailBackupEnd 03:a000 sBox6 03:a000 sBox6Count 03:a001 sBox6Species @@ -22286,62 +22342,7 @@ 03:bb72 sPartyMon6MailAuthorID 03:bb74 sPartyMon6MailSpecies 03:bb75 sPartyMon6MailType -03:bb76 sPartyMailBackup -03:bb76 sPartyMon1MailBackup -03:bb76 sPartyMon1MailBackupMessage 03:bb76 sPartyMon6MailEnd -03:bb96 sPartyMon1MailBackupMessageEnd -03:bb97 sPartyMon1MailBackupAuthor -03:bb9d sPartyMon1MailBackupAuthorNationality -03:bb9f sPartyMon1MailBackupAuthorID -03:bba1 sPartyMon1MailBackupSpecies -03:bba2 sPartyMon1MailBackupType -03:bba3 sPartyMon1MailBackupEnd -03:bba3 sPartyMon2MailBackup -03:bba3 sPartyMon2MailBackupMessage -03:bbc3 sPartyMon2MailBackupMessageEnd -03:bbc4 sPartyMon2MailBackupAuthor -03:bbca sPartyMon2MailBackupAuthorNationality -03:bbcc sPartyMon2MailBackupAuthorID -03:bbce sPartyMon2MailBackupSpecies -03:bbcf sPartyMon2MailBackupType -03:bbd0 sPartyMon2MailBackupEnd -03:bbd0 sPartyMon3MailBackup -03:bbd0 sPartyMon3MailBackupMessage -03:bbf0 sPartyMon3MailBackupMessageEnd -03:bbf1 sPartyMon3MailBackupAuthor -03:bbf7 sPartyMon3MailBackupAuthorNationality -03:bbf9 sPartyMon3MailBackupAuthorID -03:bbfb sPartyMon3MailBackupSpecies -03:bbfc sPartyMon3MailBackupType -03:bbfd sPartyMon3MailBackupEnd -03:bbfd sPartyMon4MailBackup -03:bbfd sPartyMon4MailBackupMessage -03:bc1d sPartyMon4MailBackupMessageEnd -03:bc1e sPartyMon4MailBackupAuthor -03:bc24 sPartyMon4MailBackupAuthorNationality -03:bc26 sPartyMon4MailBackupAuthorID -03:bc28 sPartyMon4MailBackupSpecies -03:bc29 sPartyMon4MailBackupType -03:bc2a sPartyMon4MailBackupEnd -03:bc2a sPartyMon5MailBackup -03:bc2a sPartyMon5MailBackupMessage -03:bc4a sPartyMon5MailBackupMessageEnd -03:bc4b sPartyMon5MailBackupAuthor -03:bc51 sPartyMon5MailBackupAuthorNationality -03:bc53 sPartyMon5MailBackupAuthorID -03:bc55 sPartyMon5MailBackupSpecies -03:bc56 sPartyMon5MailBackupType -03:bc57 sPartyMon5MailBackupEnd -03:bc57 sPartyMon6MailBackup -03:bc57 sPartyMon6MailBackupMessage -03:bc77 sPartyMon6MailBackupMessageEnd -03:bc78 sPartyMon6MailBackupAuthor -03:bc7e sPartyMon6MailBackupAuthorNationality -03:bc80 sPartyMon6MailBackupAuthorID -03:bc82 sPartyMon6MailBackupSpecies -03:bc83 sPartyMon6MailBackupType -03:bc84 sPartyMon6MailBackupEnd 03:bffd sChecksum 00:c000 wChannel1 00:c000 wChannel1MusicID @@ -24074,6 +24075,9 @@ 00:cc3d wSpriteViewerSavedMenuPointerY 00:cc3e wSpriteViewerJumptableIndex 00:cc3f wMovementBuffer +00:cc3f wMovementXBuffer +00:cc40 wMovementYBuffer +00:cc41 wMovementSpriteViewerDirection 00:cc45 wFacingDirectionList_Old 00:cc4c wEmotionBubbleSpriteIndex_Old 00:cc4c wSavedPlayerScreenY_Old @@ -25028,6 +25032,7 @@ 00:d642 wUnusedAddOutdoorSpritesReturnValue 00:d643 wBGMapAnchor 00:d645 wUsedSprites +00:d646 wUsedFollowerSprites 00:d647 wUsedNPCSprites 00:d64f wUsedStaticSprites 00:d651 wUsedSpritesEnd diff --git a/pokesilver-spaceworld-debug.map b/pokesilver-spaceworld-debug.map index 937b5c7d..3ad6f7fb 100644 --- a/pokesilver-spaceworld-debug.map +++ b/pokesilver-spaceworld-debug.map @@ -2,7 +2,7 @@ SUMMARY: ROM0: 16234 bytes used / 150 free ROMX: 1032192 bytes used / 0 free in 63 banks SRAM: 20395 bytes used / 12373 free in 4 banks - WRAM0: 7742 bytes used / 450 free + WRAM0: 8139 bytes used / 53 free HRAM: 117 bytes used / 10 free ROM0 bank #0: @@ -827,10 +827,10 @@ ROM0 bank #0: $303a = TextAsmEnd.stop $303b = CallMapTextSubroutine $3051 = CallMapTextSubroutine.Return - $3055 = Function3055 - $3058 = Function3055.Loop - $3062 = asm_3062 - $307a = Function307a + $3055 = CheckAllMapObjects + $3058 = CheckAllMapObjects.Loop + $3062 = TalkingToBGObject + $307a = ResetTalkingTarget $3085 = PrintTextboxDebugNumbers $3097 = PrintTextboxDebugNumbers.CheckSign $309e = PrintTextboxDebugNumbers.PrintNum @@ -844,7 +844,7 @@ ROM0 bank #0: $314a = TextboxIdle.next $314e = PrepareTextbox $3171 = TextboxCleanup - $318f = Function318f + $318f = ReloadObjectGFX $319b = TurnNPCTalkingTo $31b9 = TurnNPCTalkingTo.Jump $31c3 = Unreferenced_CheckTrainerBattle @@ -955,7 +955,7 @@ ROM0 bank #0: $360b = RestoreScreenAndReloadTiles $361e = ClearBGPalettes $3621 = WaitBGMap - $362b = SetPalettes + $362b = SetDefaultBGPAndOBP $3634 = ClearPalettes $363c = GetMemSGBLayout $363e = GetSGBLayout @@ -1303,8 +1303,8 @@ ROMX bank #1: $4965 = FacePlayerObject.closer_horizontal $496d = FacePlayerObject.done $4973 = FacePlayerObject.FlipNegativeToPositive - $4979 = Stubbed_UpdateYOffset - $4994 = Stubbed_UpdateYOffset.y_offsets + $4979 = Stubbed_SwayObject + $4994 = Stubbed_SwayObject.y_offsets $499c = UpdateJumpPosition $49d0 = UpdateJumpPosition.got_direction $49dc = UpdateJumpPosition.y_offsets @@ -1325,8 +1325,8 @@ ROMX bank #1: $4af6 = StepFunction_TeleportTo.InitFinalSpin $4b00 = StepFunction_TeleportTo.DoFinalSpin $4b0c = StepFunction_TeleportTo.FinishStep - $4b22 = Unreferenced_Function4b22 - $4b25 = Stub_Function4b25 + $4b22 = Unreferenced_StrengthBoulderDust_Old + $4b25 = Stub_SpawnStrengthBoulderDust_Old $4b26 = SpawnShadow $4b42 = SpawnShadow.ShadowObject $4b48 = SpawnStrengthBoulderDust @@ -1517,8 +1517,8 @@ ROMX bank #1: $57de = GivePokemon $57eb = AddRandomPokemonToBox $57ed = AddRandomPokemonToBox.loop - $5818 = RandomUnder246 - $5818 = RandomUnder246.loop + $5818 = RandomSpecies_RaiEnSuiOrUnder + $5818 = RandomSpecies_RaiEnSuiOrUnder.loop $5823 = FillTMs $582a = FillTMs.loop $582f = DebugGiveKeyItems @@ -1903,9 +1903,8 @@ ROMX bank #2: $4242 = GetSpriteVTile.VTileOffsets $424c = CheckObjectEnteringVisibleRange $4259 = CheckObjectEnteringVisibleRange.dw - $4261 = EmptyFunction8261 - $4262 = Unreferenced_CheckObjectEnteringVisibleRange_Alternate - $426e = Unreferenced_CheckObjectEnteringVisibleRange_Alternate.dw + $4261 = CheckObjectEnteringVisibleRange_Alternate + $426e = CheckObjectEnteringVisibleRange_Alternate.dw $4276 = CheckVisibleRange_UpAlt $427d = CheckVisibleRange_DownAlt $4284 = CheckVisibleRange_LeftAlt @@ -2561,7 +2560,6 @@ ROMX bank #3: $52a8 = FailDig $52b4 = Text_CantUseDigHere $52c2 = DigScript - $52da = EmptyFunctiond2da $52db = TeleportFunction $52df = TeleportFunction.next $52ee = TeleportFunction.finish @@ -2596,7 +2594,7 @@ ROMX bank #3: $54e3 = Unused_IsKeyItem_Old.cant_toss $54e6 = _HandlePlayerStep $54f8 = _HandlePlayerStep.start - $54fa = _HandlePlayerStep.unreferenced_d4fa + $54fa = _HandlePlayerStep.unreferenced_checkobjects $5505 = _HandlePlayerStep._start $5514 = _HandlePlayerStep.update_overworld_map $5519 = _HandlePlayerStep.update_player_coords @@ -2905,16 +2903,13 @@ ROMX bank #3: $6fc9 = ReviveEffect.skip_to_revive $6fd9 = ReviveEffect.revive_half_hp $6fdc = ReviveEffect.finish_revive - $6fed = Unreferenced_EmptyFunctionefed $6fee = FullRestoreEffect $701a = FullRestoreEffect.NotAtFullHealth $7049 = FullRestoreEffect.not_in_battle - $705a = Unreferenced_EmptyFunctionf05a $705b = RestoreHPEffect $7086 = RestoreHPEffect.get_heal_amount $708c = RestoreHPEffect.continue_heal $709e = RestoreHPEffect.not_in_battle - $70af = Unreferenced_EmptyFunctionf0af $70b0 = HealHP_SFX_GFX $70cf = UseItem_SelectMon $70d8 = ItemActionTextWaitButton @@ -3420,9 +3415,9 @@ ROMX bank #4: $6753 = PokemonAskSwapItemText $6784 = GetPartyItemOffset $678c = ReceiveItemFromPokemon - $6798 = UnusedHandleItemJumptable - $67a9 = UnusedItemJumptable - $67b7 = EmptyFunction127b7 + $6798 = UnusedHandleRecieveItemJumptable + $67a9 = UnusedRecieveItemJumptable + $67b7 = PartyGiveItem $67b8 = ChangeBackpackPocket $67c0 = PartyBallPocket $67cb = PartyBallPocket.exit @@ -3498,7 +3493,7 @@ ROMX bank #4: $6e0f = TrainerCardMainInputs.exit $6e16 = TrainerCardMainInputs.left $6e26 = TrainerCardMainInputs.right - $6e37 = EmptyFunction12e37 + $6e37 = EmptyTrainerCardFunction $6e38 = TrainerCardScroll $6e49 = TrainerCardClearTileMap $6e5c = TrainerCardSetWindowY @@ -3570,9 +3565,9 @@ ROMX bank #5: $410f = LoadUsedSpritesGFX.skip $4127 = LoadUsedSpritesGFX.no_still_sprite_1 $4132 = LoadUsedSpritesGFX.no_still_sprite_2 - $4133 = Function14133 + $4133 = Unreferenced_LoadOverworldSprite_NPCSlot $4144 = LoadOverworldSprite_PlayerSlot - $414a = LoadOverworldSprite_FollowerSlot + $414a = Unreferenced_LoadOverworldSprite_FollowerSlot $4150 = LoadOverworldSprite $4161 = LoadOverworldSprite.dont_copy $417d = GetOverworldSpriteData @@ -8570,9 +8565,9 @@ ROMX bank #35: $42d9 = UngroupHealingMachineSprites.ungroup $42dc = UpdateTimeOfDayPal $42e3 = _TimeOfDayPals - $42fe = _LABEL_8C2FE_ - $4313 = _LABEL_8C313_ - $4325 = Function8c325 + $42fe = Unreferenced_ResetTimeOfDayPal + $4313 = Unreferenced_SetTimeOfDayPal + $4325 = ChangeTimeOfDayPal $4335 = _UpdateTimePals $433e = OverworldFadeIn $4349 = OverworldFadeOut @@ -8824,7 +8819,7 @@ ROMX bank #35: $53ab = AnimSeq_GSTitleFlameNote.zero $53c2 = AnimSeq_GSTitleFlameNote.one $53ec = AnimSeq_MinigamePikachu - $540b = Data8d40b + $540b = AnimSeq_MinigamePikachu.pikachu_framesets $540f = AnimSeq_MinigamePikachuTail $5418 = AnimSeq_MinigameNote $541c = AnimSeq_MinigameNote.anon_dw @@ -9169,12 +9164,12 @@ ROMX bank #36: $47a8 = ReelAction_StopReelIgnoreJoypad $47b2 = ReelAction_StopReelIgnoreJoypad.EndReel $47bc = ReelAction_StopReelIgnoreJoypad.clear_reel_oam - $47c8 = Function907c8 - $47f6 = Function907c8.asm907f6 - $4805 = Function90805 - $4814 = Function90805.asm90814 - $481b = Function90805.loop - $4822 = Function90822 + $47c8 = Slots_PayoutAnim + $47f6 = Slots_PayoutAnim.seven + $4805 = Slots_PlaceReelTiles + $4814 = Slots_PlaceReelTiles.place + $481b = Slots_PlaceReelTiles.loop + $4822 = Slots_CheckReelTiles $486b = ReelAction_StopReel1 $487f = ReelAction_StopReel1.NoBias $4883 = ReelAction_StopReel1.CheckForBias @@ -13453,16 +13448,16 @@ ROMX bank #58: $4070 = UpdateChannel.noteover $4076 = UpdateChannel.continue_sound_update $407a = DisablePitchWheel - $4081 = Unreferenced_Functione8081 - $408c = Unreferenced_Functione8081.fail - $408e = Unreferenced_Functione8081.disable_music - $4093 = Unreferenced_Functione8081.disable_sfx - $409e = Unreferenced_Functione8081.clear_loop - $40a2 = Unreferenced_Functione8081.done + $4081 = Unreferenced_MuteAudio + $408c = Unreferenced_MuteAudio.fail + $408e = Unreferenced_MuteAudio.disable_music + $4093 = Unreferenced_MuteAudio.disable_sfx + $409e = Unreferenced_MuteAudio.clear_loop + $40a2 = Unreferenced_MuteAudio.done $40a4 = GetChannelRegisters $40b2 = GetChannelRegisters.registers - $40b6 = Functione80b6 - $40f3 = Functione80b6.end + $40b6 = ContinueSoundUpdate + $40f3 = ContinueSoundUpdate.end $40fa = UpdateChannels $410b = UpdateChannels.jumptable $411b = UpdateChannels.Channel1 @@ -13498,7 +13493,7 @@ ROMX bank #58: $42ce = IsChannelSFXOn.off $42d0 = IsAnySFXOn $42ee = IsAnySFXOn.on - $42f0 = Functione82f0 + $42f0 = SetupPlayDanger $4307 = PlayDanger $431e = PlayDanger.halfway $4323 = PlayDanger.begin @@ -13549,7 +13544,7 @@ ROMX bank #58: $45b9 = LoadNote.flag_0e $45c2 = LoadNote.flag_0d $45cb = LoadNote.flag_0b - $45d8 = Functione85d8 + $45d8 = CheckChannelFlags2 $4605 = HandleDuty $461b = ApplyPitchSlide $465e = ApplyPitchSlide.decreasing @@ -14500,23 +14495,29 @@ ROMX bank #63: $4657 = FieldDebug_SpriteViewer.set_following $4663 = FieldDebug_SpriteViewer.FollowPromptString $4672 = FieldDebug_SpriteViewer.SetStartingPoint - $467d = LoadUnderDevelopmentString - $4681 = LoadUnderDevelopmentString.String - $4689 = Functionfc689 - $469c = Functionfc69c - $46bb = Functionfc6bb - $46be = Functionfc6be - $46de = Datafc6de - $46fe = Datafc6fe - $470e = Datafc70e - $471e = Datafc71e - $472e = Datafc72e - $473e = Datafc73e - $474e = Datafc74e - $475e = Datafc75e - $476e = Datafc76e - $477e = Datafc77e - $478e = Datafc78e + $467d = FieldDebug_SpriteViewer.LoadUnderDevelopmentString + $4681 = FieldDebug_SpriteViewer.String + $4689 = SetupSpriteViewerSpriteWalkingTilemap + $469c = SetupSpriteViewerSpriteWalkingTilemap.loop + $46bb = SetupSpriteViewerSpriteTilemap + $46be = SetupSpriteViewerSpriteTilemap.loop + $46de = SpriteViewerSpriteTilemap + $46fe = SpriteViewerSpriteTilemap.FacingStepDown0 + $46fe = SpriteViewerSpriteTilemap.FacingStepDown2 + $470e = SpriteViewerSpriteTilemap.FacingStepDown1 + $471e = SpriteViewerSpriteTilemap.FacingStepDown3 + $472e = SpriteViewerSpriteTilemap.FacingStepUp0 + $472e = SpriteViewerSpriteTilemap.FacingStepUp2 + $473e = SpriteViewerSpriteTilemap.FacingStepUp1 + $474e = SpriteViewerSpriteTilemap.FacingStepUp3 + $475e = SpriteViewerSpriteTilemap.FacingStepLeft0 + $475e = SpriteViewerSpriteTilemap.FacingStepLeft2 + $476e = SpriteViewerSpriteTilemap.FacingStepRight0 + $476e = SpriteViewerSpriteTilemap.FacingStepRight2 + $477e = SpriteViewerSpriteTilemap.FacingStepLeft1 + $477e = SpriteViewerSpriteTilemap.FacingStepLeft3 + $478e = SpriteViewerSpriteTilemap.FacingStepRight1 + $478e = SpriteViewerSpriteTilemap.FacingStepRight3 $479e = FieldDebug_NamePlayer $47cb = FieldDebug_Toolgear $47da = FieldDebug_Toolgear.Jumptable @@ -15008,7 +15009,7 @@ SRAM bank #0: $a188 = sSpriteBuffer1 $a310 = sSpriteBuffer2 EMPTY: $a498-$a5ff ($0168 bytes) - SECTION: $a600-$ae4a ($084b bytes) ["Unknown, bank 0"] + SECTION: $a600-$ae4a ($084b bytes) ["Save Game Data"] $a600 = sOptions $a608 = sGameData $adda = sGameData2 @@ -15027,7 +15028,7 @@ SRAM bank #1: TOTAL EMPTY: $1c27 bytes SRAM bank #2: - SECTION: $a000-$ba67 ($1a68 bytes) ["Boxes 1-5"] + SECTION: $a000-$bb75 ($1b76 bytes) ["Boxes 1-5"] $a000 = sBox1Count $a000 = sBox1 $a001 = sBox1Species @@ -18816,13 +18817,68 @@ SRAM bank #2: $ba56 = sBox5Mon28Nickname $ba5c = sBox5Mon29Nickname $ba62 = sBox5Mon30Nickname + $ba68 = sPartyMon1MailBackupMessage + $ba68 = sPartyMon1MailBackup + $ba68 = sPartyMailBackup $ba68 = sBox5End $ba68 = sBox5MonNicknamesEnd - EMPTY: $ba68-$bfff ($0598 bytes) - TOTAL EMPTY: $0598 bytes + $ba88 = sPartyMon1MailBackupMessageEnd + $ba89 = sPartyMon1MailBackupAuthor + $ba8f = sPartyMon1MailBackupAuthorNationality + $ba91 = sPartyMon1MailBackupAuthorID + $ba93 = sPartyMon1MailBackupSpecies + $ba94 = sPartyMon1MailBackupType + $ba95 = sPartyMon2MailBackupMessage + $ba95 = sPartyMon2MailBackup + $ba95 = sPartyMon1MailBackupEnd + $bab5 = sPartyMon2MailBackupMessageEnd + $bab6 = sPartyMon2MailBackupAuthor + $babc = sPartyMon2MailBackupAuthorNationality + $babe = sPartyMon2MailBackupAuthorID + $bac0 = sPartyMon2MailBackupSpecies + $bac1 = sPartyMon2MailBackupType + $bac2 = sPartyMon3MailBackupMessage + $bac2 = sPartyMon3MailBackup + $bac2 = sPartyMon2MailBackupEnd + $bae2 = sPartyMon3MailBackupMessageEnd + $bae3 = sPartyMon3MailBackupAuthor + $bae9 = sPartyMon3MailBackupAuthorNationality + $baeb = sPartyMon3MailBackupAuthorID + $baed = sPartyMon3MailBackupSpecies + $baee = sPartyMon3MailBackupType + $baef = sPartyMon4MailBackupMessage + $baef = sPartyMon4MailBackup + $baef = sPartyMon3MailBackupEnd + $bb0f = sPartyMon4MailBackupMessageEnd + $bb10 = sPartyMon4MailBackupAuthor + $bb16 = sPartyMon4MailBackupAuthorNationality + $bb18 = sPartyMon4MailBackupAuthorID + $bb1a = sPartyMon4MailBackupSpecies + $bb1b = sPartyMon4MailBackupType + $bb1c = sPartyMon5MailBackupMessage + $bb1c = sPartyMon5MailBackup + $bb1c = sPartyMon4MailBackupEnd + $bb3c = sPartyMon5MailBackupMessageEnd + $bb3d = sPartyMon5MailBackupAuthor + $bb43 = sPartyMon5MailBackupAuthorNationality + $bb45 = sPartyMon5MailBackupAuthorID + $bb47 = sPartyMon5MailBackupSpecies + $bb48 = sPartyMon5MailBackupType + $bb49 = sPartyMon6MailBackupMessage + $bb49 = sPartyMon6MailBackup + $bb49 = sPartyMon5MailBackupEnd + $bb69 = sPartyMon6MailBackupMessageEnd + $bb6a = sPartyMon6MailBackupAuthor + $bb70 = sPartyMon6MailBackupAuthorNationality + $bb72 = sPartyMon6MailBackupAuthorID + $bb74 = sPartyMon6MailBackupSpecies + $bb75 = sPartyMon6MailBackupType + $bb76 = sPartyMon6MailBackupEnd + EMPTY: $bb76-$bfff ($048a bytes) + TOTAL EMPTY: $048a bytes SRAM bank #3: - SECTION: $a000-$bc83 ($1c84 bytes) ["Boxes 6-10"] + SECTION: $a000-$bb75 ($1b76 bytes) ["Boxes 6-10"] $a000 = sBox6Count $a000 = sBox6 $a001 = sBox6Species @@ -22667,69 +22723,14 @@ SRAM bank #3: $bb72 = sPartyMon6MailAuthorID $bb74 = sPartyMon6MailSpecies $bb75 = sPartyMon6MailType - $bb76 = sPartyMon1MailBackupMessage - $bb76 = sPartyMon1MailBackup - $bb76 = sPartyMailBackup $bb76 = sPartyMon6MailEnd - $bb96 = sPartyMon1MailBackupMessageEnd - $bb97 = sPartyMon1MailBackupAuthor - $bb9d = sPartyMon1MailBackupAuthorNationality - $bb9f = sPartyMon1MailBackupAuthorID - $bba1 = sPartyMon1MailBackupSpecies - $bba2 = sPartyMon1MailBackupType - $bba3 = sPartyMon2MailBackupMessage - $bba3 = sPartyMon2MailBackup - $bba3 = sPartyMon1MailBackupEnd - $bbc3 = sPartyMon2MailBackupMessageEnd - $bbc4 = sPartyMon2MailBackupAuthor - $bbca = sPartyMon2MailBackupAuthorNationality - $bbcc = sPartyMon2MailBackupAuthorID - $bbce = sPartyMon2MailBackupSpecies - $bbcf = sPartyMon2MailBackupType - $bbd0 = sPartyMon3MailBackupMessage - $bbd0 = sPartyMon3MailBackup - $bbd0 = sPartyMon2MailBackupEnd - $bbf0 = sPartyMon3MailBackupMessageEnd - $bbf1 = sPartyMon3MailBackupAuthor - $bbf7 = sPartyMon3MailBackupAuthorNationality - $bbf9 = sPartyMon3MailBackupAuthorID - $bbfb = sPartyMon3MailBackupSpecies - $bbfc = sPartyMon3MailBackupType - $bbfd = sPartyMon4MailBackupMessage - $bbfd = sPartyMon4MailBackup - $bbfd = sPartyMon3MailBackupEnd - $bc1d = sPartyMon4MailBackupMessageEnd - $bc1e = sPartyMon4MailBackupAuthor - $bc24 = sPartyMon4MailBackupAuthorNationality - $bc26 = sPartyMon4MailBackupAuthorID - $bc28 = sPartyMon4MailBackupSpecies - $bc29 = sPartyMon4MailBackupType - $bc2a = sPartyMon5MailBackupMessage - $bc2a = sPartyMon5MailBackup - $bc2a = sPartyMon4MailBackupEnd - $bc4a = sPartyMon5MailBackupMessageEnd - $bc4b = sPartyMon5MailBackupAuthor - $bc51 = sPartyMon5MailBackupAuthorNationality - $bc53 = sPartyMon5MailBackupAuthorID - $bc55 = sPartyMon5MailBackupSpecies - $bc56 = sPartyMon5MailBackupType - $bc57 = sPartyMon6MailBackupMessage - $bc57 = sPartyMon6MailBackup - $bc57 = sPartyMon5MailBackupEnd - $bc77 = sPartyMon6MailBackupMessageEnd - $bc78 = sPartyMon6MailBackupAuthor - $bc7e = sPartyMon6MailBackupAuthorNationality - $bc80 = sPartyMon6MailBackupAuthorID - $bc82 = sPartyMon6MailBackupSpecies - $bc83 = sPartyMon6MailBackupType - $bc84 = sPartyMon6MailBackupEnd - EMPTY: $bc84-$bffc ($0379 bytes) + EMPTY: $bb76-$bffc ($0487 bytes) SECTION: $bffd-$bfff ($0003 bytes) ["Checksum"] $bffd = sChecksum - TOTAL EMPTY: $0379 bytes + TOTAL EMPTY: $0487 bytes WRAM0 bank #0: - SECTION: $c000-$c1bb ($01bc bytes) ["Music engine RAM"] + SECTION: $c000-$c1ff ($0200 bytes) ["Music engine RAM"] $c000 = wMusic $c000 = wChannels $c000 = wChannel1 @@ -23073,7 +23074,6 @@ WRAM0 bank #0: $c1ba = wCryTracks $c1bb = wSFXDuration $c1bc = wMusicInitEnd - EMPTY: $c1bc-$c1ff ($0044 bytes) SECTION: $c200-$c5e7 ($03e8 bytes) ["OAM Buffer"] $c200 = wShadowOAM $c200 = wShadowOAMSprite00 @@ -24306,8 +24306,8 @@ WRAM0 bank #0: $cae3 = wWeatherCount $cb14 = wLinkDataEnd $cb14 = wOverworldMapBlocksEnd - SECTION: $cb14-$cb3b ($0028 bytes) ["CB14"] $cb14 = wBattleEnd + SECTION: $cb14-$ce5e ($034b bytes) ["Video"] $cb14 = wRedrawRowOrColumnSrcTiles $cb14 = wRedrawFlashlightDst0 $cb16 = wRedrawFlashlightSrc0 @@ -24316,9 +24316,7 @@ WRAM0 bank #0: $cb1c = wRedrawFlashlightSrc1 $cb1e = wRedrawFlashlightBlackDst1 $cb20 = wRedrawFlashlightWidthHeight - SECTION: $cb3c-$cb4b ($0010 bytes) ["CB3C"] $cb3c = wTileAnimBuffer - SECTION: $cb4c-$cb5c ($0011 bytes) ["CB4C"] $cb4c = wOtherPlayerLinkMode $cb4c = wLinkReceivedSyncBuffer $cb4d = wOtherPlayerLinkAction @@ -24331,8 +24329,6 @@ WRAM0 bank #0: $cb5b = wSelectedItem $cb5b = wCurSpecies $cb5c = wNamedObjectTypeBuffer - EMPTY: $cb5d-$cb5d ($0001 byte) - SECTION: $cb5e-$cb6f ($0012 bytes) ["CB5E"] $cb5e = wJumptableIndex $cb5f = wSlotsDelay $cb5f = wMemoryGameCardChoice @@ -24361,7 +24357,6 @@ WRAM0 bank #0: $cb6d = wPlayerStepVectorY $cb6e = wPlayerStepFlags $cb6f = wPlayerStepDirection - SECTION: $cb70-$cb7d ($000e bytes) ["CB70"] $cb70 = wQueuedMinorObjectGFX $cb71 = wVBCopyFarSize $cb72 = wVBCopyFarSrc @@ -24372,16 +24367,12 @@ WRAM0 bank #0: $cb79 = wMovementDataBank $cb7a = wMovementDataAddr $cb7c = wIndexedMovement2Pointer - EMPTY: $cb7e-$cb8f ($0012 bytes) - SECTION: $cb90-$cbb1 ($0022 bytes) ["Collision buffer"] $cb90 = wTileDown $cb91 = wTileUp $cb92 = wTileLeft $cb93 = wTileRight $cb94 = wScreenSave - SECTION: $cbb2-$cbf1 ($0040 bytes) ["CBB2"] $cbb2 = wToolgearBuffer - SECTION: $cbf2-$cbf9 ($0008 bytes) ["CBF2"] $cbf2 = wWindowData $cbf2 = wWindowStackPointer $cbf4 = wMenuJoypad @@ -24392,8 +24383,6 @@ WRAM0 bank #0: $cbf7 = wActiveBackpackPocket $cbf8 = wScrollingMenuCursorPosition $cbf9 = wWindowStackSize - EMPTY: $cbfa-$cc01 ($0008 bytes) - SECTION: $cc02-$cc2e ($002d bytes) ["CC02"] $cc02 = wMenuDataHeader $cc02 = wMenuFlags $cc03 = wMenuBorderTopCoord @@ -24438,8 +24427,6 @@ WRAM0 bank #0: $cc2b = wMenuCursorX $cc2c = wCursorOffCharacter $cc2d = wCursorCurrentTile - EMPTY: $cc2f-$cc31 ($0003 bytes) - SECTION: $cc32-$cc75 ($0044 bytes) ["CC32"] $cc32 = wVBlankJoyFrameCounter $cc33 = wVBlankOccurred $cc34 = wLastSpawnMapGroup @@ -24478,12 +24465,13 @@ WRAM0 bank #0: $cc3d = wPlayerSpinInPlaceAnimSoundID_Old $cc3e = wSpriteViewerJumptableIndex $cc3f = wMovementBuffer + $cc3f = wMovementXBuffer + $cc40 = wMovementYBuffer + $cc41 = wMovementSpriteViewerDirection $cc45 = wFacingDirectionList_Old $cc4c = wSavedPlayerScreenY_Old $cc4c = wEmotionBubbleSpriteIndex_Old $cc4d = wSavedPlayerFacingDirection_Old - EMPTY: $cc76-$cc99 ($0024 bytes) - SECTION: $cc9a-$ccc5 ($002c bytes) ["CC9A"] $cc9a = wSkatingDirection $cc9b = wCompanionCollisionFrameCounter $cc9c = wObjectMasks @@ -24507,38 +24495,28 @@ WRAM0 bank #0: $ccc3 = wPlaceBallsY $ccc4 = wLowHealthAlarmBuffer $ccc5 = wTileAnimationTimer - EMPTY: $ccc6-$ccc6 ($0001 byte) - SECTION: $ccc7-$ccc7 ($0001 byte) ["CCC7"] $ccc7 = wDisableVBlankOAMUpdate - EMPTY: $ccc8-$ccc9 ($0002 bytes) - SECTION: $ccca-$cccf ($0006 bytes) ["CCCA"] $ccca = wBGP $cccb = wOBP0 $cccc = wOBP1 $cccd = wNumHits $ccce = wDisableVBlankWYUpdate $cccf = wSGB - SECTION: $ccd0-$cd10 ($0041 bytes) ["CCD0"] $ccd0 = wSGBPalBuffer $ccd1 = wPlayerHPPal $ccd2 = wEnemyHPPal $ccd3 = wHPPals $ccd9 = wCurHPPal $cce1 = wSGBPals - SECTION: $cd11-$cd2f ($001f bytes) ["CD11"] $cd11 = wMonOrItemNameBuffer $cd1d = wTMHMMoveNameBackup $cd26 = wStringBuffer1 - EMPTY: $cd30-$cd30 ($0001 byte) - SECTION: $cd31-$cd3a ($000a bytes) ["CD31"] $cd31 = wStartDay $cd31 = wHPBarTempHP $cd31 = wStringBuffer2 $cd32 = wStartHour $cd33 = wStartMinute $cd33 = wGainBoostedExp - EMPTY: $cd3b-$cd3b ($0001 byte) - SECTION: $cd3c-$cd60 ($0025 bytes) ["CD3C"] $cd3c = wPartyMenuCursor $cd3c = wBillsPCCursor $cd3d = wRegularItemsCursor @@ -24571,8 +24549,6 @@ WRAM0 bank #0: $cd5d = wBattleResult $cd5f = wChosenStarter $cd60 = wCurMartCount - EMPTY: $cd61-$cd6f ($000f bytes) - SECTION: $cd70-$ce3e ($00cf bytes) ["CD70"] $cd70 = wListPointer $cd72 = wNamesPointer $cd74 = wItemAttributesPointer @@ -24763,8 +24739,7 @@ WRAM0 bank #0: $ce3c = wBuffer $ce3d = wTimeOfDay $ce3f = wNewGameWRAMEnd - EMPTY: $ce3f-$ce5e ($0020 bytes) - SECTION: $ce5f-$d266 ($0408 bytes) ["Options"] + SECTION: $ce5f-$ce66 ($0008 bytes) ["Options"] $ce5f = wOptions $ce60 = wSaveFileExists $ce60 = wSaveFileFlags @@ -24774,6 +24749,7 @@ WRAM0 bank #0: $ce64 = wDebugFlags2 $ce65 = wDebugFlags3 $ce66 = wDebugFlags4 + SECTION: $ce67-$d6a9 ($0843 bytes) ["Game Data"] $ce67 = wGameData $ce67 = wPlayerName $ce6d = wMomsName @@ -25399,8 +25375,6 @@ WRAM0 bank #0: $d264 = wPlayerState $d265 = wPlayerStarter $d266 = wRivalStarter - EMPTY: $d267-$d299 ($0033 bytes) - SECTION: $d29a-$d41e ($0185 bytes) ["Map Scene ID & Flags"] $d29a = wPlayerHouse2FSceneID $d29b = wPlayerHouse1FSceneID $d29c = wSilentHillSceneID @@ -25428,19 +25402,14 @@ WRAM0 bank #0: $d3a5 = wSilentHillsFlags $d3a6 = wOldCityPokecenter2FFlags $d41a = wEventFlags - EMPTY: $d41f-$d4a6 ($0088 bytes) - SECTION: $d4a7-$d4ad ($0007 bytes) ["D4A7"] $d4a7 = wPokedexMenuFlags $d4a8 = wUnusedLinkCommunicationByte $d4a9 = wGameModeFlags $d4ab = wJoypadFlags $d4ad = wMovementFlags_Old - EMPTY: $d4ae-$d4b1 ($0004 bytes) - SECTION: $d4b2-$d512 ($0061 bytes) ["wDigWarpNumber"] $d4b2 = wDigWarpNumber $d4b6 = wCurBox $d4b9 = wBoxNames - SECTION: $d513-$d650 ($013e bytes) ["Warp data"] $d513 = wWarpNumber $d514 = wCurrMapWarpCount $d515 = wCurrMapWarps @@ -25455,11 +25424,10 @@ WRAM0 bank #0: $d642 = wUnusedAddOutdoorSpritesReturnValue $d643 = wBGMapAnchor $d645 = wUsedSprites + $d646 = wUsedFollowerSprites $d647 = wUsedNPCSprites $d64f = wUsedStaticSprites $d651 = wUsedSpritesEnd - EMPTY: $d651-$d655 ($0005 bytes) - SECTION: $d656-$d903 ($02ae bytes) ["Map header"] $d656 = wMapGroup $d657 = wMapId $d658 = wOverworldMapAnchor @@ -25531,6 +25499,7 @@ WRAM0 bank #0: $d6a6 = wTilesetAnim $d6aa = wTilesetEnd $d6aa = wGameData2End + SECTION: $d6aa-$dfca ($0921 bytes) ["Party"] $d6aa = wPokemonData $d6aa = wPartyCount $d6ab = wPartySpecies @@ -25839,13 +25808,10 @@ WRAM0 bank #0: $d8fd = wBreedMon2End $d8fd = wBreedMonGenders $d8fe = wOTPlayerName - EMPTY: $d904-$d912 ($000f bytes) - SECTION: $d913-$d91a ($0008 bytes) ["D913"] $d913 = wOTPartyData $d913 = wOTPartyCount $d914 = wOTPartySpecies $d91a = wOTPartySpeciesEnd - SECTION: $d91b-$dfca ($06b0 bytes) ["Wild mon buffer"] $d91b = wWildMonData $d91b = wMornEncounterRate $d91b = wOTPartyMons @@ -26834,7 +26800,7 @@ WRAM0 bank #0: SECTION: $dfff ($0000 bytes) ["Stack Bottom"] $dfff = wStackBottom EMPTY: $dfff-$dfff ($0001 byte) - TOTAL EMPTY: $01c2 bytes + TOTAL EMPTY: $0035 bytes HRAM bank #0: SECTION: $ff80-$ff89 ($000a bytes) ["OAM DMA"] diff --git a/pokesilver-spaceworld-debug.sym b/pokesilver-spaceworld-debug.sym index 0bb3477e..493384d9 100644 --- a/pokesilver-spaceworld-debug.sym +++ b/pokesilver-spaceworld-debug.sym @@ -789,10 +789,10 @@ 00:303a TextAsmEnd.stop 00:303b CallMapTextSubroutine 00:3051 CallMapTextSubroutine.Return -00:3055 Function3055 -00:3058 Function3055.Loop -00:3062 asm_3062 -00:307a Function307a +00:3055 CheckAllMapObjects +00:3058 CheckAllMapObjects.Loop +00:3062 TalkingToBGObject +00:307a ResetTalkingTarget 00:3085 PrintTextboxDebugNumbers 00:3097 PrintTextboxDebugNumbers.CheckSign 00:309e PrintTextboxDebugNumbers.PrintNum @@ -806,7 +806,7 @@ 00:314a TextboxIdle.next 00:314e PrepareTextbox 00:3171 TextboxCleanup -00:318f Function318f +00:318f ReloadObjectGFX 00:319b TurnNPCTalkingTo 00:31b9 TurnNPCTalkingTo.Jump 00:31c3 Unreferenced_CheckTrainerBattle @@ -917,7 +917,7 @@ 00:360b RestoreScreenAndReloadTiles 00:361e ClearBGPalettes 00:3621 WaitBGMap -00:362b SetPalettes +00:362b SetDefaultBGPAndOBP 00:3634 ClearPalettes 00:363c GetMemSGBLayout 00:363e GetSGBLayout @@ -1260,8 +1260,8 @@ 01:4965 FacePlayerObject.lined_up_horizontal 01:496d FacePlayerObject.done 01:4973 FacePlayerObject.FlipNegativeToPositive -01:4979 Stubbed_UpdateYOffset -01:4994 Stubbed_UpdateYOffset.y_offsets +01:4979 Stubbed_SwayObject +01:4994 Stubbed_SwayObject.y_offsets 01:499c UpdateJumpPosition 01:49d0 UpdateJumpPosition.got_direction 01:49dc UpdateJumpPosition.y_offsets @@ -1282,8 +1282,8 @@ 01:4af6 StepFunction_TeleportTo.InitFinalSpin 01:4b00 StepFunction_TeleportTo.DoFinalSpin 01:4b0c StepFunction_TeleportTo.FinishStep -01:4b22 Unreferenced_Function4b22 -01:4b25 Stub_Function4b25 +01:4b22 Unreferenced_StrengthBoulderDust_Old +01:4b25 Stub_SpawnStrengthBoulderDust_Old 01:4b26 SpawnShadow 01:4b42 SpawnShadow.ShadowObject 01:4b48 SpawnStrengthBoulderDust @@ -1474,8 +1474,8 @@ 01:57de GivePokemon 01:57eb AddRandomPokemonToBox 01:57ed AddRandomPokemonToBox.loop -01:5818 RandomUnder246 -01:5818 RandomUnder246.loop +01:5818 RandomSpecies_RaiEnSuiOrUnder +01:5818 RandomSpecies_RaiEnSuiOrUnder.loop 01:5823 FillTMs 01:582a FillTMs.loop 01:582f DebugGiveKeyItems @@ -1855,9 +1855,8 @@ 02:4242 GetSpriteVTile.VTileOffsets 02:424c CheckObjectEnteringVisibleRange 02:4259 CheckObjectEnteringVisibleRange.dw -02:4261 EmptyFunction8261 -02:4262 Unreferenced_CheckObjectEnteringVisibleRange_Alternate -02:426e Unreferenced_CheckObjectEnteringVisibleRange_Alternate.dw +02:4261 CheckObjectEnteringVisibleRange_Alternate +02:426e CheckObjectEnteringVisibleRange_Alternate.dw 02:4276 CheckVisibleRange_UpAlt 02:427d CheckVisibleRange_DownAlt 02:4284 CheckVisibleRange_LeftAlt @@ -2508,7 +2507,6 @@ 03:52a8 FailDig 03:52b4 Text_CantUseDigHere 03:52c2 DigScript -03:52da EmptyFunctiond2da 03:52db TeleportFunction 03:52df TeleportFunction.next 03:52ee TeleportFunction.finish @@ -2543,7 +2541,7 @@ 03:54e3 Unused_IsKeyItem_Old.cant_toss 03:54e6 _HandlePlayerStep 03:54f8 _HandlePlayerStep.start -03:54fa _HandlePlayerStep.unreferenced_d4fa +03:54fa _HandlePlayerStep.unreferenced_checkobjects 03:5505 _HandlePlayerStep._start 03:5514 _HandlePlayerStep.update_overworld_map 03:5519 _HandlePlayerStep.update_player_coords @@ -2852,16 +2850,13 @@ 03:6fc9 ReviveEffect.skip_to_revive 03:6fd9 ReviveEffect.revive_half_hp 03:6fdc ReviveEffect.finish_revive -03:6fed Unreferenced_EmptyFunctionefed 03:6fee FullRestoreEffect 03:701a FullRestoreEffect.NotAtFullHealth 03:7049 FullRestoreEffect.not_in_battle -03:705a Unreferenced_EmptyFunctionf05a 03:705b RestoreHPEffect 03:7086 RestoreHPEffect.get_heal_amount 03:708c RestoreHPEffect.continue_heal 03:709e RestoreHPEffect.not_in_battle -03:70af Unreferenced_EmptyFunctionf0af 03:70b0 HealHP_SFX_GFX 03:70cf UseItem_SelectMon 03:70d8 ItemActionTextWaitButton @@ -3359,9 +3354,9 @@ 04:6753 PokemonAskSwapItemText 04:6784 GetPartyItemOffset 04:678c ReceiveItemFromPokemon -04:6798 UnusedHandleItemJumptable -04:67a9 UnusedItemJumptable -04:67b7 EmptyFunction127b7 +04:6798 UnusedHandleRecieveItemJumptable +04:67a9 UnusedRecieveItemJumptable +04:67b7 PartyGiveItem 04:67b8 ChangeBackpackPocket 04:67c0 PartyBallPocket 04:67cb PartyBallPocket.exit @@ -3437,7 +3432,7 @@ 04:6e0f TrainerCardMainInputs.exit 04:6e16 TrainerCardMainInputs.left 04:6e26 TrainerCardMainInputs.right -04:6e37 EmptyFunction12e37 +04:6e37 EmptyTrainerCardFunction 04:6e38 TrainerCardScroll 04:6e49 TrainerCardClearTileMap 04:6e5c TrainerCardSetWindowY @@ -3504,9 +3499,9 @@ 05:410f LoadUsedSpritesGFX.skip 05:4127 LoadUsedSpritesGFX.no_still_sprite_1 05:4132 LoadUsedSpritesGFX.no_still_sprite_2 -05:4133 Function14133 +05:4133 Unreferenced_LoadOverworldSprite_NPCSlot 05:4144 LoadOverworldSprite_PlayerSlot -05:414a LoadOverworldSprite_FollowerSlot +05:414a Unreferenced_LoadOverworldSprite_FollowerSlot 05:4150 LoadOverworldSprite 05:4161 LoadOverworldSprite.dont_copy 05:417d GetOverworldSpriteData @@ -8353,9 +8348,9 @@ 23:42d9 UngroupHealingMachineSprites.ungroup 23:42dc UpdateTimeOfDayPal 23:42e3 _TimeOfDayPals -23:42fe _LABEL_8C2FE_ -23:4313 _LABEL_8C313_ -23:4325 Function8c325 +23:42fe Unreferenced_ResetTimeOfDayPal +23:4313 Unreferenced_SetTimeOfDayPal +23:4325 ChangeTimeOfDayPal 23:4335 _UpdateTimePals 23:433e OverworldFadeIn 23:4349 OverworldFadeOut @@ -8607,7 +8602,7 @@ 23:53ab AnimSeq_GSTitleFlameNote.zero 23:53c2 AnimSeq_GSTitleFlameNote.one 23:53ec AnimSeq_MinigamePikachu -23:540b Data8d40b +23:540b AnimSeq_MinigamePikachu.pikachu_framesets 23:540f AnimSeq_MinigamePikachuTail 23:5418 AnimSeq_MinigameNote 23:541c AnimSeq_MinigameNote.anon_dw @@ -8945,12 +8940,12 @@ 24:47a8 ReelAction_StopReelIgnoreJoypad 24:47b2 ReelAction_StopReelIgnoreJoypad.EndReel 24:47bc ReelAction_StopReelIgnoreJoypad.clear_reel_oam -24:47c8 Function907c8 -24:47f6 Function907c8.asm907f6 -24:4805 Function90805 -24:4814 Function90805.asm90814 -24:481b Function90805.loop -24:4822 Function90822 +24:47c8 Slots_PayoutAnim +24:47f6 Slots_PayoutAnim.seven +24:4805 Slots_PlaceReelTiles +24:4814 Slots_PlaceReelTiles.place +24:481b Slots_PlaceReelTiles.loop +24:4822 Slots_CheckReelTiles 24:486b ReelAction_StopReel1 24:487f ReelAction_StopReel1.NoBias 24:4883 ReelAction_StopReel1.CheckForBias @@ -13125,16 +13120,16 @@ 3a:4070 UpdateChannel.noteover 3a:4076 UpdateChannel.continue_sound_update 3a:407a DisablePitchWheel -3a:4081 Unreferenced_Functione8081 -3a:408c Unreferenced_Functione8081.fail -3a:408e Unreferenced_Functione8081.disable_music -3a:4093 Unreferenced_Functione8081.disable_sfx -3a:409e Unreferenced_Functione8081.clear_loop -3a:40a2 Unreferenced_Functione8081.done +3a:4081 Unreferenced_MuteAudio +3a:408c Unreferenced_MuteAudio.fail +3a:408e Unreferenced_MuteAudio.disable_music +3a:4093 Unreferenced_MuteAudio.disable_sfx +3a:409e Unreferenced_MuteAudio.clear_loop +3a:40a2 Unreferenced_MuteAudio.done 3a:40a4 GetChannelRegisters 3a:40b2 GetChannelRegisters.registers -3a:40b6 Functione80b6 -3a:40f3 Functione80b6.end +3a:40b6 ContinueSoundUpdate +3a:40f3 ContinueSoundUpdate.end 3a:40fa UpdateChannels 3a:410b UpdateChannels.jumptable 3a:411b UpdateChannels.Channel1 @@ -13170,7 +13165,7 @@ 3a:42ce IsChannelSFXOn.off 3a:42d0 IsAnySFXOn 3a:42ee IsAnySFXOn.on -3a:42f0 Functione82f0 +3a:42f0 SetupPlayDanger 3a:4307 PlayDanger 3a:431e PlayDanger.halfway 3a:4323 PlayDanger.begin @@ -13221,7 +13216,7 @@ 3a:45b9 LoadNote.flag_0e 3a:45c2 LoadNote.flag_0d 3a:45cb LoadNote.flag_0b -3a:45d8 Functione85d8 +3a:45d8 CheckChannelFlags2 3a:4605 HandleDuty 3a:461b ApplyPitchSlide 3a:465e ApplyPitchSlide.decreasing @@ -14146,23 +14141,29 @@ 3f:4657 FieldDebug_SpriteViewer.set_following 3f:4663 FieldDebug_SpriteViewer.FollowPromptString 3f:4672 FieldDebug_SpriteViewer.SetStartingPoint -3f:467d LoadUnderDevelopmentString -3f:4681 LoadUnderDevelopmentString.String -3f:4689 Functionfc689 -3f:469c Functionfc69c -3f:46bb Functionfc6bb -3f:46be Functionfc6be -3f:46de Datafc6de -3f:46fe Datafc6fe -3f:470e Datafc70e -3f:471e Datafc71e -3f:472e Datafc72e -3f:473e Datafc73e -3f:474e Datafc74e -3f:475e Datafc75e -3f:476e Datafc76e -3f:477e Datafc77e -3f:478e Datafc78e +3f:467d FieldDebug_SpriteViewer.LoadUnderDevelopmentString +3f:4681 FieldDebug_SpriteViewer.String +3f:4689 SetupSpriteViewerSpriteWalkingTilemap +3f:469c SetupSpriteViewerSpriteWalkingTilemap.loop +3f:46bb SetupSpriteViewerSpriteTilemap +3f:46be SetupSpriteViewerSpriteTilemap.loop +3f:46de SpriteViewerSpriteTilemap +3f:46fe SpriteViewerSpriteTilemap.FacingStepDown0 +3f:46fe SpriteViewerSpriteTilemap.FacingStepDown2 +3f:470e SpriteViewerSpriteTilemap.FacingStepDown1 +3f:471e SpriteViewerSpriteTilemap.FacingStepDown3 +3f:472e SpriteViewerSpriteTilemap.FacingStepUp0 +3f:472e SpriteViewerSpriteTilemap.FacingStepUp2 +3f:473e SpriteViewerSpriteTilemap.FacingStepUp1 +3f:474e SpriteViewerSpriteTilemap.FacingStepUp3 +3f:475e SpriteViewerSpriteTilemap.FacingStepLeft0 +3f:475e SpriteViewerSpriteTilemap.FacingStepLeft2 +3f:476e SpriteViewerSpriteTilemap.FacingStepRight0 +3f:476e SpriteViewerSpriteTilemap.FacingStepRight2 +3f:477e SpriteViewerSpriteTilemap.FacingStepLeft1 +3f:477e SpriteViewerSpriteTilemap.FacingStepLeft3 +3f:478e SpriteViewerSpriteTilemap.FacingStepRight1 +3f:478e SpriteViewerSpriteTilemap.FacingStepRight3 3f:479e FieldDebug_NamePlayer 3f:47cb FieldDebug_Toolgear 3f:47da FieldDebug_Toolgear.Jumptable @@ -18442,6 +18443,61 @@ 02:ba62 sBox5Mon30Nickname 02:ba68 sBox5End 02:ba68 sBox5MonNicknamesEnd +02:ba68 sPartyMailBackup +02:ba68 sPartyMon1MailBackup +02:ba68 sPartyMon1MailBackupMessage +02:ba88 sPartyMon1MailBackupMessageEnd +02:ba89 sPartyMon1MailBackupAuthor +02:ba8f sPartyMon1MailBackupAuthorNationality +02:ba91 sPartyMon1MailBackupAuthorID +02:ba93 sPartyMon1MailBackupSpecies +02:ba94 sPartyMon1MailBackupType +02:ba95 sPartyMon1MailBackupEnd +02:ba95 sPartyMon2MailBackup +02:ba95 sPartyMon2MailBackupMessage +02:bab5 sPartyMon2MailBackupMessageEnd +02:bab6 sPartyMon2MailBackupAuthor +02:babc sPartyMon2MailBackupAuthorNationality +02:babe sPartyMon2MailBackupAuthorID +02:bac0 sPartyMon2MailBackupSpecies +02:bac1 sPartyMon2MailBackupType +02:bac2 sPartyMon2MailBackupEnd +02:bac2 sPartyMon3MailBackup +02:bac2 sPartyMon3MailBackupMessage +02:bae2 sPartyMon3MailBackupMessageEnd +02:bae3 sPartyMon3MailBackupAuthor +02:bae9 sPartyMon3MailBackupAuthorNationality +02:baeb sPartyMon3MailBackupAuthorID +02:baed sPartyMon3MailBackupSpecies +02:baee sPartyMon3MailBackupType +02:baef sPartyMon3MailBackupEnd +02:baef sPartyMon4MailBackup +02:baef sPartyMon4MailBackupMessage +02:bb0f sPartyMon4MailBackupMessageEnd +02:bb10 sPartyMon4MailBackupAuthor +02:bb16 sPartyMon4MailBackupAuthorNationality +02:bb18 sPartyMon4MailBackupAuthorID +02:bb1a sPartyMon4MailBackupSpecies +02:bb1b sPartyMon4MailBackupType +02:bb1c sPartyMon4MailBackupEnd +02:bb1c sPartyMon5MailBackup +02:bb1c sPartyMon5MailBackupMessage +02:bb3c sPartyMon5MailBackupMessageEnd +02:bb3d sPartyMon5MailBackupAuthor +02:bb43 sPartyMon5MailBackupAuthorNationality +02:bb45 sPartyMon5MailBackupAuthorID +02:bb47 sPartyMon5MailBackupSpecies +02:bb48 sPartyMon5MailBackupType +02:bb49 sPartyMon5MailBackupEnd +02:bb49 sPartyMon6MailBackup +02:bb49 sPartyMon6MailBackupMessage +02:bb69 sPartyMon6MailBackupMessageEnd +02:bb6a sPartyMon6MailBackupAuthor +02:bb70 sPartyMon6MailBackupAuthorNationality +02:bb72 sPartyMon6MailBackupAuthorID +02:bb74 sPartyMon6MailBackupSpecies +02:bb75 sPartyMon6MailBackupType +02:bb76 sPartyMon6MailBackupEnd 03:a000 sBox6 03:a000 sBox6Count 03:a001 sBox6Species @@ -22286,62 +22342,7 @@ 03:bb72 sPartyMon6MailAuthorID 03:bb74 sPartyMon6MailSpecies 03:bb75 sPartyMon6MailType -03:bb76 sPartyMailBackup -03:bb76 sPartyMon1MailBackup -03:bb76 sPartyMon1MailBackupMessage 03:bb76 sPartyMon6MailEnd -03:bb96 sPartyMon1MailBackupMessageEnd -03:bb97 sPartyMon1MailBackupAuthor -03:bb9d sPartyMon1MailBackupAuthorNationality -03:bb9f sPartyMon1MailBackupAuthorID -03:bba1 sPartyMon1MailBackupSpecies -03:bba2 sPartyMon1MailBackupType -03:bba3 sPartyMon1MailBackupEnd -03:bba3 sPartyMon2MailBackup -03:bba3 sPartyMon2MailBackupMessage -03:bbc3 sPartyMon2MailBackupMessageEnd -03:bbc4 sPartyMon2MailBackupAuthor -03:bbca sPartyMon2MailBackupAuthorNationality -03:bbcc sPartyMon2MailBackupAuthorID -03:bbce sPartyMon2MailBackupSpecies -03:bbcf sPartyMon2MailBackupType -03:bbd0 sPartyMon2MailBackupEnd -03:bbd0 sPartyMon3MailBackup -03:bbd0 sPartyMon3MailBackupMessage -03:bbf0 sPartyMon3MailBackupMessageEnd -03:bbf1 sPartyMon3MailBackupAuthor -03:bbf7 sPartyMon3MailBackupAuthorNationality -03:bbf9 sPartyMon3MailBackupAuthorID -03:bbfb sPartyMon3MailBackupSpecies -03:bbfc sPartyMon3MailBackupType -03:bbfd sPartyMon3MailBackupEnd -03:bbfd sPartyMon4MailBackup -03:bbfd sPartyMon4MailBackupMessage -03:bc1d sPartyMon4MailBackupMessageEnd -03:bc1e sPartyMon4MailBackupAuthor -03:bc24 sPartyMon4MailBackupAuthorNationality -03:bc26 sPartyMon4MailBackupAuthorID -03:bc28 sPartyMon4MailBackupSpecies -03:bc29 sPartyMon4MailBackupType -03:bc2a sPartyMon4MailBackupEnd -03:bc2a sPartyMon5MailBackup -03:bc2a sPartyMon5MailBackupMessage -03:bc4a sPartyMon5MailBackupMessageEnd -03:bc4b sPartyMon5MailBackupAuthor -03:bc51 sPartyMon5MailBackupAuthorNationality -03:bc53 sPartyMon5MailBackupAuthorID -03:bc55 sPartyMon5MailBackupSpecies -03:bc56 sPartyMon5MailBackupType -03:bc57 sPartyMon5MailBackupEnd -03:bc57 sPartyMon6MailBackup -03:bc57 sPartyMon6MailBackupMessage -03:bc77 sPartyMon6MailBackupMessageEnd -03:bc78 sPartyMon6MailBackupAuthor -03:bc7e sPartyMon6MailBackupAuthorNationality -03:bc80 sPartyMon6MailBackupAuthorID -03:bc82 sPartyMon6MailBackupSpecies -03:bc83 sPartyMon6MailBackupType -03:bc84 sPartyMon6MailBackupEnd 03:bffd sChecksum 00:c000 wChannel1 00:c000 wChannel1MusicID @@ -24074,6 +24075,9 @@ 00:cc3d wSpriteViewerSavedMenuPointerY 00:cc3e wSpriteViewerJumptableIndex 00:cc3f wMovementBuffer +00:cc3f wMovementXBuffer +00:cc40 wMovementYBuffer +00:cc41 wMovementSpriteViewerDirection 00:cc45 wFacingDirectionList_Old 00:cc4c wEmotionBubbleSpriteIndex_Old 00:cc4c wSavedPlayerScreenY_Old @@ -25028,6 +25032,7 @@ 00:d642 wUnusedAddOutdoorSpritesReturnValue 00:d643 wBGMapAnchor 00:d645 wUsedSprites +00:d646 wUsedFollowerSprites 00:d647 wUsedNPCSprites 00:d64f wUsedStaticSprites 00:d651 wUsedSpritesEnd diff --git a/pokesilver-spaceworld.map b/pokesilver-spaceworld.map index bd004dec..f61074b9 100644 --- a/pokesilver-spaceworld.map +++ b/pokesilver-spaceworld.map @@ -2,7 +2,7 @@ SUMMARY: ROM0: 16236 bytes used / 148 free ROMX: 1032192 bytes used / 0 free in 63 banks SRAM: 20395 bytes used / 12373 free in 4 banks - WRAM0: 7742 bytes used / 450 free + WRAM0: 8139 bytes used / 53 free HRAM: 117 bytes used / 10 free ROM0 bank #0: @@ -826,10 +826,10 @@ ROM0 bank #0: $2ffe = TextAsmEnd.stop $2fff = CallMapTextSubroutine $3015 = CallMapTextSubroutine.Return - $3019 = Function3055 - $301c = Function3055.Loop - $3026 = asm_3062 - $303e = Function307a + $3019 = CheckAllMapObjects + $301c = CheckAllMapObjects.Loop + $3026 = TalkingToBGObject + $303e = ResetTalkingTarget $3049 = PrintTextboxDebugNumbers $305b = PrintTextboxDebugNumbers.CheckSign $3062 = PrintTextboxDebugNumbers.PrintNum @@ -843,7 +843,7 @@ ROM0 bank #0: $310e = TextboxIdle.next $3112 = PrepareTextbox $3135 = TextboxCleanup - $3153 = Function318f + $3153 = ReloadObjectGFX $315f = TurnNPCTalkingTo $317d = TurnNPCTalkingTo.Jump $3187 = Unreferenced_CheckTrainerBattle @@ -954,7 +954,7 @@ ROM0 bank #0: $35cf = RestoreScreenAndReloadTiles $35e2 = ClearBGPalettes $35e5 = WaitBGMap - $35ef = SetPalettes + $35ef = SetDefaultBGPAndOBP $35f8 = ClearPalettes $3600 = GetMemSGBLayout $3602 = GetSGBLayout @@ -1274,8 +1274,8 @@ ROMX bank #1: $4965 = FacePlayerObject.closer_horizontal $496d = FacePlayerObject.done $4973 = FacePlayerObject.FlipNegativeToPositive - $4979 = Stubbed_UpdateYOffset - $4994 = Stubbed_UpdateYOffset.y_offsets + $4979 = Stubbed_SwayObject + $4994 = Stubbed_SwayObject.y_offsets $499c = UpdateJumpPosition $49d0 = UpdateJumpPosition.got_direction $49dc = UpdateJumpPosition.y_offsets @@ -1296,8 +1296,8 @@ ROMX bank #1: $4af6 = StepFunction_TeleportTo.InitFinalSpin $4b00 = StepFunction_TeleportTo.DoFinalSpin $4b0c = StepFunction_TeleportTo.FinishStep - $4b22 = Unreferenced_Function4b22 - $4b25 = Stub_Function4b25 + $4b22 = Unreferenced_StrengthBoulderDust_Old + $4b25 = Stub_SpawnStrengthBoulderDust_Old $4b26 = SpawnShadow $4b42 = SpawnShadow.ShadowObject $4b48 = SpawnStrengthBoulderDust @@ -1488,8 +1488,8 @@ ROMX bank #1: $57de = GivePokemon $57eb = AddRandomPokemonToBox $57ed = AddRandomPokemonToBox.loop - $5818 = RandomUnder246 - $5818 = RandomUnder246.loop + $5818 = RandomSpecies_RaiEnSuiOrUnder + $5818 = RandomSpecies_RaiEnSuiOrUnder.loop $5823 = FillTMs $582a = FillTMs.loop $582f = DebugGiveKeyItems @@ -1874,9 +1874,8 @@ ROMX bank #2: $4242 = GetSpriteVTile.VTileOffsets $424c = CheckObjectEnteringVisibleRange $4259 = CheckObjectEnteringVisibleRange.dw - $4261 = EmptyFunction8261 - $4262 = Unreferenced_CheckObjectEnteringVisibleRange_Alternate - $426e = Unreferenced_CheckObjectEnteringVisibleRange_Alternate.dw + $4261 = CheckObjectEnteringVisibleRange_Alternate + $426e = CheckObjectEnteringVisibleRange_Alternate.dw $4276 = CheckVisibleRange_UpAlt $427d = CheckVisibleRange_DownAlt $4284 = CheckVisibleRange_LeftAlt @@ -2530,7 +2529,6 @@ ROMX bank #3: $5290 = FailDig $529c = Text_CantUseDigHere $52aa = DigScript - $52c2 = EmptyFunctiond2da $52c3 = TeleportFunction $52c7 = TeleportFunction.next $52d6 = TeleportFunction.finish @@ -2565,7 +2563,7 @@ ROMX bank #3: $54cb = Unused_IsKeyItem_Old.cant_toss $54ce = _HandlePlayerStep $54e0 = _HandlePlayerStep.start - $54e2 = _HandlePlayerStep.unreferenced_d4fa + $54e2 = _HandlePlayerStep.unreferenced_checkobjects $54ed = _HandlePlayerStep._start $54fc = _HandlePlayerStep.update_overworld_map $5501 = _HandlePlayerStep.update_player_coords @@ -2874,16 +2872,13 @@ ROMX bank #3: $6fb1 = ReviveEffect.skip_to_revive $6fc1 = ReviveEffect.revive_half_hp $6fc4 = ReviveEffect.finish_revive - $6fd5 = Unreferenced_EmptyFunctionefed $6fd6 = FullRestoreEffect $7002 = FullRestoreEffect.NotAtFullHealth $7031 = FullRestoreEffect.not_in_battle - $7042 = Unreferenced_EmptyFunctionf05a $7043 = RestoreHPEffect $706e = RestoreHPEffect.get_heal_amount $7074 = RestoreHPEffect.continue_heal $7086 = RestoreHPEffect.not_in_battle - $7097 = Unreferenced_EmptyFunctionf0af $7098 = HealHP_SFX_GFX $70b7 = UseItem_SelectMon $70c0 = ItemActionTextWaitButton @@ -3383,9 +3378,9 @@ ROMX bank #4: $6753 = PokemonAskSwapItemText $6784 = GetPartyItemOffset $678c = ReceiveItemFromPokemon - $6798 = UnusedHandleItemJumptable - $67a9 = UnusedItemJumptable - $67b7 = EmptyFunction127b7 + $6798 = UnusedHandleRecieveItemJumptable + $67a9 = UnusedRecieveItemJumptable + $67b7 = PartyGiveItem $67b8 = ChangeBackpackPocket $67c0 = PartyBallPocket $67cb = PartyBallPocket.exit @@ -3461,7 +3456,7 @@ ROMX bank #4: $6e0f = TrainerCardMainInputs.exit $6e16 = TrainerCardMainInputs.left $6e26 = TrainerCardMainInputs.right - $6e37 = EmptyFunction12e37 + $6e37 = EmptyTrainerCardFunction $6e38 = TrainerCardScroll $6e49 = TrainerCardClearTileMap $6e5c = TrainerCardSetWindowY @@ -3532,9 +3527,9 @@ ROMX bank #5: $410f = LoadUsedSpritesGFX.skip $4127 = LoadUsedSpritesGFX.no_still_sprite_1 $4132 = LoadUsedSpritesGFX.no_still_sprite_2 - $4133 = Function14133 + $4133 = Unreferenced_LoadOverworldSprite_NPCSlot $4144 = LoadOverworldSprite_PlayerSlot - $414a = LoadOverworldSprite_FollowerSlot + $414a = Unreferenced_LoadOverworldSprite_FollowerSlot $4150 = LoadOverworldSprite $4161 = LoadOverworldSprite.dont_copy $417d = GetOverworldSpriteData @@ -8526,9 +8521,9 @@ ROMX bank #35: $42d9 = UngroupHealingMachineSprites.ungroup $42dc = UpdateTimeOfDayPal $42e3 = _TimeOfDayPals - $42fe = _LABEL_8C2FE_ - $4313 = _LABEL_8C313_ - $4325 = Function8c325 + $42fe = Unreferenced_ResetTimeOfDayPal + $4313 = Unreferenced_SetTimeOfDayPal + $4325 = ChangeTimeOfDayPal $4335 = _UpdateTimePals $433e = OverworldFadeIn $4349 = OverworldFadeOut @@ -8780,7 +8775,7 @@ ROMX bank #35: $53ab = AnimSeq_GSTitleFlameNote.zero $53c2 = AnimSeq_GSTitleFlameNote.one $53ec = AnimSeq_MinigamePikachu - $540b = Data8d40b + $540b = AnimSeq_MinigamePikachu.pikachu_framesets $540f = AnimSeq_MinigamePikachuTail $5418 = AnimSeq_MinigameNote $541c = AnimSeq_MinigameNote.anon_dw @@ -9125,12 +9120,12 @@ ROMX bank #36: $47a8 = ReelAction_StopReelIgnoreJoypad $47b2 = ReelAction_StopReelIgnoreJoypad.EndReel $47bc = ReelAction_StopReelIgnoreJoypad.clear_reel_oam - $47c8 = Function907c8 - $47f6 = Function907c8.asm907f6 - $4805 = Function90805 - $4814 = Function90805.asm90814 - $481b = Function90805.loop - $4822 = Function90822 + $47c8 = Slots_PayoutAnim + $47f6 = Slots_PayoutAnim.seven + $4805 = Slots_PlaceReelTiles + $4814 = Slots_PlaceReelTiles.place + $481b = Slots_PlaceReelTiles.loop + $4822 = Slots_CheckReelTiles $486b = ReelAction_StopReel1 $487f = ReelAction_StopReel1.NoBias $4883 = ReelAction_StopReel1.CheckForBias @@ -13361,16 +13356,16 @@ ROMX bank #58: $4070 = UpdateChannel.noteover $4076 = UpdateChannel.continue_sound_update $407a = DisablePitchWheel - $4081 = Unreferenced_Functione8081 - $408c = Unreferenced_Functione8081.fail - $408e = Unreferenced_Functione8081.disable_music - $4093 = Unreferenced_Functione8081.disable_sfx - $409e = Unreferenced_Functione8081.clear_loop - $40a2 = Unreferenced_Functione8081.done + $4081 = Unreferenced_MuteAudio + $408c = Unreferenced_MuteAudio.fail + $408e = Unreferenced_MuteAudio.disable_music + $4093 = Unreferenced_MuteAudio.disable_sfx + $409e = Unreferenced_MuteAudio.clear_loop + $40a2 = Unreferenced_MuteAudio.done $40a4 = GetChannelRegisters $40b2 = GetChannelRegisters.registers - $40b6 = Functione80b6 - $40f3 = Functione80b6.end + $40b6 = ContinueSoundUpdate + $40f3 = ContinueSoundUpdate.end $40fa = UpdateChannels $410b = UpdateChannels.jumptable $411b = UpdateChannels.Channel1 @@ -13406,7 +13401,7 @@ ROMX bank #58: $42ce = IsChannelSFXOn.off $42d0 = IsAnySFXOn $42ee = IsAnySFXOn.on - $42f0 = Functione82f0 + $42f0 = SetupPlayDanger $4307 = PlayDanger $431e = PlayDanger.halfway $4323 = PlayDanger.begin @@ -13457,7 +13452,7 @@ ROMX bank #58: $45b9 = LoadNote.flag_0e $45c2 = LoadNote.flag_0d $45cb = LoadNote.flag_0b - $45d8 = Functione85d8 + $45d8 = CheckChannelFlags2 $4605 = HandleDuty $461b = ApplyPitchSlide $465e = ApplyPitchSlide.decreasing @@ -14408,23 +14403,29 @@ ROMX bank #63: $4657 = FieldDebug_SpriteViewer.set_following $4663 = FieldDebug_SpriteViewer.FollowPromptString $4672 = FieldDebug_SpriteViewer.SetStartingPoint - $467d = LoadUnderDevelopmentString - $4681 = LoadUnderDevelopmentString.String - $4689 = Functionfc689 - $469c = Functionfc69c - $46bb = Functionfc6bb - $46be = Functionfc6be - $46de = Datafc6de - $46fe = Datafc6fe - $470e = Datafc70e - $471e = Datafc71e - $472e = Datafc72e - $473e = Datafc73e - $474e = Datafc74e - $475e = Datafc75e - $476e = Datafc76e - $477e = Datafc77e - $478e = Datafc78e + $467d = FieldDebug_SpriteViewer.LoadUnderDevelopmentString + $4681 = FieldDebug_SpriteViewer.String + $4689 = SetupSpriteViewerSpriteWalkingTilemap + $469c = SetupSpriteViewerSpriteWalkingTilemap.loop + $46bb = SetupSpriteViewerSpriteTilemap + $46be = SetupSpriteViewerSpriteTilemap.loop + $46de = SpriteViewerSpriteTilemap + $46fe = SpriteViewerSpriteTilemap.FacingStepDown0 + $46fe = SpriteViewerSpriteTilemap.FacingStepDown2 + $470e = SpriteViewerSpriteTilemap.FacingStepDown1 + $471e = SpriteViewerSpriteTilemap.FacingStepDown3 + $472e = SpriteViewerSpriteTilemap.FacingStepUp0 + $472e = SpriteViewerSpriteTilemap.FacingStepUp2 + $473e = SpriteViewerSpriteTilemap.FacingStepUp1 + $474e = SpriteViewerSpriteTilemap.FacingStepUp3 + $475e = SpriteViewerSpriteTilemap.FacingStepLeft0 + $475e = SpriteViewerSpriteTilemap.FacingStepLeft2 + $476e = SpriteViewerSpriteTilemap.FacingStepRight0 + $476e = SpriteViewerSpriteTilemap.FacingStepRight2 + $477e = SpriteViewerSpriteTilemap.FacingStepLeft1 + $477e = SpriteViewerSpriteTilemap.FacingStepLeft3 + $478e = SpriteViewerSpriteTilemap.FacingStepRight1 + $478e = SpriteViewerSpriteTilemap.FacingStepRight3 $479e = FieldDebug_NamePlayer $47cb = FieldDebug_Toolgear $47da = FieldDebug_Toolgear.Jumptable @@ -14916,7 +14917,7 @@ SRAM bank #0: $a188 = sSpriteBuffer1 $a310 = sSpriteBuffer2 EMPTY: $a498-$a5ff ($0168 bytes) - SECTION: $a600-$ae4a ($084b bytes) ["Unknown, bank 0"] + SECTION: $a600-$ae4a ($084b bytes) ["Save Game Data"] $a600 = sOptions $a608 = sGameData $adda = sGameData2 @@ -14935,7 +14936,7 @@ SRAM bank #1: TOTAL EMPTY: $1c27 bytes SRAM bank #2: - SECTION: $a000-$ba67 ($1a68 bytes) ["Boxes 1-5"] + SECTION: $a000-$bb75 ($1b76 bytes) ["Boxes 1-5"] $a000 = sBox1Count $a000 = sBox1 $a001 = sBox1Species @@ -18724,13 +18725,68 @@ SRAM bank #2: $ba56 = sBox5Mon28Nickname $ba5c = sBox5Mon29Nickname $ba62 = sBox5Mon30Nickname + $ba68 = sPartyMon1MailBackupMessage + $ba68 = sPartyMon1MailBackup + $ba68 = sPartyMailBackup $ba68 = sBox5End $ba68 = sBox5MonNicknamesEnd - EMPTY: $ba68-$bfff ($0598 bytes) - TOTAL EMPTY: $0598 bytes + $ba88 = sPartyMon1MailBackupMessageEnd + $ba89 = sPartyMon1MailBackupAuthor + $ba8f = sPartyMon1MailBackupAuthorNationality + $ba91 = sPartyMon1MailBackupAuthorID + $ba93 = sPartyMon1MailBackupSpecies + $ba94 = sPartyMon1MailBackupType + $ba95 = sPartyMon2MailBackupMessage + $ba95 = sPartyMon2MailBackup + $ba95 = sPartyMon1MailBackupEnd + $bab5 = sPartyMon2MailBackupMessageEnd + $bab6 = sPartyMon2MailBackupAuthor + $babc = sPartyMon2MailBackupAuthorNationality + $babe = sPartyMon2MailBackupAuthorID + $bac0 = sPartyMon2MailBackupSpecies + $bac1 = sPartyMon2MailBackupType + $bac2 = sPartyMon3MailBackupMessage + $bac2 = sPartyMon3MailBackup + $bac2 = sPartyMon2MailBackupEnd + $bae2 = sPartyMon3MailBackupMessageEnd + $bae3 = sPartyMon3MailBackupAuthor + $bae9 = sPartyMon3MailBackupAuthorNationality + $baeb = sPartyMon3MailBackupAuthorID + $baed = sPartyMon3MailBackupSpecies + $baee = sPartyMon3MailBackupType + $baef = sPartyMon4MailBackupMessage + $baef = sPartyMon4MailBackup + $baef = sPartyMon3MailBackupEnd + $bb0f = sPartyMon4MailBackupMessageEnd + $bb10 = sPartyMon4MailBackupAuthor + $bb16 = sPartyMon4MailBackupAuthorNationality + $bb18 = sPartyMon4MailBackupAuthorID + $bb1a = sPartyMon4MailBackupSpecies + $bb1b = sPartyMon4MailBackupType + $bb1c = sPartyMon5MailBackupMessage + $bb1c = sPartyMon5MailBackup + $bb1c = sPartyMon4MailBackupEnd + $bb3c = sPartyMon5MailBackupMessageEnd + $bb3d = sPartyMon5MailBackupAuthor + $bb43 = sPartyMon5MailBackupAuthorNationality + $bb45 = sPartyMon5MailBackupAuthorID + $bb47 = sPartyMon5MailBackupSpecies + $bb48 = sPartyMon5MailBackupType + $bb49 = sPartyMon6MailBackupMessage + $bb49 = sPartyMon6MailBackup + $bb49 = sPartyMon5MailBackupEnd + $bb69 = sPartyMon6MailBackupMessageEnd + $bb6a = sPartyMon6MailBackupAuthor + $bb70 = sPartyMon6MailBackupAuthorNationality + $bb72 = sPartyMon6MailBackupAuthorID + $bb74 = sPartyMon6MailBackupSpecies + $bb75 = sPartyMon6MailBackupType + $bb76 = sPartyMon6MailBackupEnd + EMPTY: $bb76-$bfff ($048a bytes) + TOTAL EMPTY: $048a bytes SRAM bank #3: - SECTION: $a000-$bc83 ($1c84 bytes) ["Boxes 6-10"] + SECTION: $a000-$bb75 ($1b76 bytes) ["Boxes 6-10"] $a000 = sBox6Count $a000 = sBox6 $a001 = sBox6Species @@ -22575,69 +22631,14 @@ SRAM bank #3: $bb72 = sPartyMon6MailAuthorID $bb74 = sPartyMon6MailSpecies $bb75 = sPartyMon6MailType - $bb76 = sPartyMon1MailBackupMessage - $bb76 = sPartyMon1MailBackup - $bb76 = sPartyMailBackup $bb76 = sPartyMon6MailEnd - $bb96 = sPartyMon1MailBackupMessageEnd - $bb97 = sPartyMon1MailBackupAuthor - $bb9d = sPartyMon1MailBackupAuthorNationality - $bb9f = sPartyMon1MailBackupAuthorID - $bba1 = sPartyMon1MailBackupSpecies - $bba2 = sPartyMon1MailBackupType - $bba3 = sPartyMon2MailBackupMessage - $bba3 = sPartyMon2MailBackup - $bba3 = sPartyMon1MailBackupEnd - $bbc3 = sPartyMon2MailBackupMessageEnd - $bbc4 = sPartyMon2MailBackupAuthor - $bbca = sPartyMon2MailBackupAuthorNationality - $bbcc = sPartyMon2MailBackupAuthorID - $bbce = sPartyMon2MailBackupSpecies - $bbcf = sPartyMon2MailBackupType - $bbd0 = sPartyMon3MailBackupMessage - $bbd0 = sPartyMon3MailBackup - $bbd0 = sPartyMon2MailBackupEnd - $bbf0 = sPartyMon3MailBackupMessageEnd - $bbf1 = sPartyMon3MailBackupAuthor - $bbf7 = sPartyMon3MailBackupAuthorNationality - $bbf9 = sPartyMon3MailBackupAuthorID - $bbfb = sPartyMon3MailBackupSpecies - $bbfc = sPartyMon3MailBackupType - $bbfd = sPartyMon4MailBackupMessage - $bbfd = sPartyMon4MailBackup - $bbfd = sPartyMon3MailBackupEnd - $bc1d = sPartyMon4MailBackupMessageEnd - $bc1e = sPartyMon4MailBackupAuthor - $bc24 = sPartyMon4MailBackupAuthorNationality - $bc26 = sPartyMon4MailBackupAuthorID - $bc28 = sPartyMon4MailBackupSpecies - $bc29 = sPartyMon4MailBackupType - $bc2a = sPartyMon5MailBackupMessage - $bc2a = sPartyMon5MailBackup - $bc2a = sPartyMon4MailBackupEnd - $bc4a = sPartyMon5MailBackupMessageEnd - $bc4b = sPartyMon5MailBackupAuthor - $bc51 = sPartyMon5MailBackupAuthorNationality - $bc53 = sPartyMon5MailBackupAuthorID - $bc55 = sPartyMon5MailBackupSpecies - $bc56 = sPartyMon5MailBackupType - $bc57 = sPartyMon6MailBackupMessage - $bc57 = sPartyMon6MailBackup - $bc57 = sPartyMon5MailBackupEnd - $bc77 = sPartyMon6MailBackupMessageEnd - $bc78 = sPartyMon6MailBackupAuthor - $bc7e = sPartyMon6MailBackupAuthorNationality - $bc80 = sPartyMon6MailBackupAuthorID - $bc82 = sPartyMon6MailBackupSpecies - $bc83 = sPartyMon6MailBackupType - $bc84 = sPartyMon6MailBackupEnd - EMPTY: $bc84-$bffc ($0379 bytes) + EMPTY: $bb76-$bffc ($0487 bytes) SECTION: $bffd-$bfff ($0003 bytes) ["Checksum"] $bffd = sChecksum - TOTAL EMPTY: $0379 bytes + TOTAL EMPTY: $0487 bytes WRAM0 bank #0: - SECTION: $c000-$c1bb ($01bc bytes) ["Music engine RAM"] + SECTION: $c000-$c1ff ($0200 bytes) ["Music engine RAM"] $c000 = wMusic $c000 = wChannels $c000 = wChannel1 @@ -22981,7 +22982,6 @@ WRAM0 bank #0: $c1ba = wCryTracks $c1bb = wSFXDuration $c1bc = wMusicInitEnd - EMPTY: $c1bc-$c1ff ($0044 bytes) SECTION: $c200-$c5e7 ($03e8 bytes) ["OAM Buffer"] $c200 = wShadowOAM $c200 = wShadowOAMSprite00 @@ -24214,8 +24214,8 @@ WRAM0 bank #0: $cae3 = wWeatherCount $cb14 = wLinkDataEnd $cb14 = wOverworldMapBlocksEnd - SECTION: $cb14-$cb3b ($0028 bytes) ["CB14"] $cb14 = wBattleEnd + SECTION: $cb14-$ce5e ($034b bytes) ["Video"] $cb14 = wRedrawRowOrColumnSrcTiles $cb14 = wRedrawFlashlightDst0 $cb16 = wRedrawFlashlightSrc0 @@ -24224,9 +24224,7 @@ WRAM0 bank #0: $cb1c = wRedrawFlashlightSrc1 $cb1e = wRedrawFlashlightBlackDst1 $cb20 = wRedrawFlashlightWidthHeight - SECTION: $cb3c-$cb4b ($0010 bytes) ["CB3C"] $cb3c = wTileAnimBuffer - SECTION: $cb4c-$cb5c ($0011 bytes) ["CB4C"] $cb4c = wOtherPlayerLinkMode $cb4c = wLinkReceivedSyncBuffer $cb4d = wOtherPlayerLinkAction @@ -24239,8 +24237,6 @@ WRAM0 bank #0: $cb5b = wSelectedItem $cb5b = wCurSpecies $cb5c = wNamedObjectTypeBuffer - EMPTY: $cb5d-$cb5d ($0001 byte) - SECTION: $cb5e-$cb6f ($0012 bytes) ["CB5E"] $cb5e = wJumptableIndex $cb5f = wSlotsDelay $cb5f = wMemoryGameCardChoice @@ -24269,7 +24265,6 @@ WRAM0 bank #0: $cb6d = wPlayerStepVectorY $cb6e = wPlayerStepFlags $cb6f = wPlayerStepDirection - SECTION: $cb70-$cb7d ($000e bytes) ["CB70"] $cb70 = wQueuedMinorObjectGFX $cb71 = wVBCopyFarSize $cb72 = wVBCopyFarSrc @@ -24280,16 +24275,12 @@ WRAM0 bank #0: $cb79 = wMovementDataBank $cb7a = wMovementDataAddr $cb7c = wIndexedMovement2Pointer - EMPTY: $cb7e-$cb8f ($0012 bytes) - SECTION: $cb90-$cbb1 ($0022 bytes) ["Collision buffer"] $cb90 = wTileDown $cb91 = wTileUp $cb92 = wTileLeft $cb93 = wTileRight $cb94 = wScreenSave - SECTION: $cbb2-$cbf1 ($0040 bytes) ["CBB2"] $cbb2 = wToolgearBuffer - SECTION: $cbf2-$cbf9 ($0008 bytes) ["CBF2"] $cbf2 = wWindowData $cbf2 = wWindowStackPointer $cbf4 = wMenuJoypad @@ -24300,8 +24291,6 @@ WRAM0 bank #0: $cbf7 = wActiveBackpackPocket $cbf8 = wScrollingMenuCursorPosition $cbf9 = wWindowStackSize - EMPTY: $cbfa-$cc01 ($0008 bytes) - SECTION: $cc02-$cc2e ($002d bytes) ["CC02"] $cc02 = wMenuDataHeader $cc02 = wMenuFlags $cc03 = wMenuBorderTopCoord @@ -24346,8 +24335,6 @@ WRAM0 bank #0: $cc2b = wMenuCursorX $cc2c = wCursorOffCharacter $cc2d = wCursorCurrentTile - EMPTY: $cc2f-$cc31 ($0003 bytes) - SECTION: $cc32-$cc75 ($0044 bytes) ["CC32"] $cc32 = wVBlankJoyFrameCounter $cc33 = wVBlankOccurred $cc34 = wLastSpawnMapGroup @@ -24386,12 +24373,13 @@ WRAM0 bank #0: $cc3d = wPlayerSpinInPlaceAnimSoundID_Old $cc3e = wSpriteViewerJumptableIndex $cc3f = wMovementBuffer + $cc3f = wMovementXBuffer + $cc40 = wMovementYBuffer + $cc41 = wMovementSpriteViewerDirection $cc45 = wFacingDirectionList_Old $cc4c = wSavedPlayerScreenY_Old $cc4c = wEmotionBubbleSpriteIndex_Old $cc4d = wSavedPlayerFacingDirection_Old - EMPTY: $cc76-$cc99 ($0024 bytes) - SECTION: $cc9a-$ccc5 ($002c bytes) ["CC9A"] $cc9a = wSkatingDirection $cc9b = wCompanionCollisionFrameCounter $cc9c = wObjectMasks @@ -24415,38 +24403,28 @@ WRAM0 bank #0: $ccc3 = wPlaceBallsY $ccc4 = wLowHealthAlarmBuffer $ccc5 = wTileAnimationTimer - EMPTY: $ccc6-$ccc6 ($0001 byte) - SECTION: $ccc7-$ccc7 ($0001 byte) ["CCC7"] $ccc7 = wDisableVBlankOAMUpdate - EMPTY: $ccc8-$ccc9 ($0002 bytes) - SECTION: $ccca-$cccf ($0006 bytes) ["CCCA"] $ccca = wBGP $cccb = wOBP0 $cccc = wOBP1 $cccd = wNumHits $ccce = wDisableVBlankWYUpdate $cccf = wSGB - SECTION: $ccd0-$cd10 ($0041 bytes) ["CCD0"] $ccd0 = wSGBPalBuffer $ccd1 = wPlayerHPPal $ccd2 = wEnemyHPPal $ccd3 = wHPPals $ccd9 = wCurHPPal $cce1 = wSGBPals - SECTION: $cd11-$cd2f ($001f bytes) ["CD11"] $cd11 = wMonOrItemNameBuffer $cd1d = wTMHMMoveNameBackup $cd26 = wStringBuffer1 - EMPTY: $cd30-$cd30 ($0001 byte) - SECTION: $cd31-$cd3a ($000a bytes) ["CD31"] $cd31 = wStartDay $cd31 = wHPBarTempHP $cd31 = wStringBuffer2 $cd32 = wStartHour $cd33 = wStartMinute $cd33 = wGainBoostedExp - EMPTY: $cd3b-$cd3b ($0001 byte) - SECTION: $cd3c-$cd60 ($0025 bytes) ["CD3C"] $cd3c = wPartyMenuCursor $cd3c = wBillsPCCursor $cd3d = wRegularItemsCursor @@ -24479,8 +24457,6 @@ WRAM0 bank #0: $cd5d = wBattleResult $cd5f = wChosenStarter $cd60 = wCurMartCount - EMPTY: $cd61-$cd6f ($000f bytes) - SECTION: $cd70-$ce3e ($00cf bytes) ["CD70"] $cd70 = wListPointer $cd72 = wNamesPointer $cd74 = wItemAttributesPointer @@ -24671,8 +24647,7 @@ WRAM0 bank #0: $ce3c = wBuffer $ce3d = wTimeOfDay $ce3f = wNewGameWRAMEnd - EMPTY: $ce3f-$ce5e ($0020 bytes) - SECTION: $ce5f-$d266 ($0408 bytes) ["Options"] + SECTION: $ce5f-$ce66 ($0008 bytes) ["Options"] $ce5f = wOptions $ce60 = wSaveFileExists $ce60 = wSaveFileFlags @@ -24682,6 +24657,7 @@ WRAM0 bank #0: $ce64 = wDebugFlags2 $ce65 = wDebugFlags3 $ce66 = wDebugFlags4 + SECTION: $ce67-$d6a9 ($0843 bytes) ["Game Data"] $ce67 = wGameData $ce67 = wPlayerName $ce6d = wMomsName @@ -25307,8 +25283,6 @@ WRAM0 bank #0: $d264 = wPlayerState $d265 = wPlayerStarter $d266 = wRivalStarter - EMPTY: $d267-$d299 ($0033 bytes) - SECTION: $d29a-$d41e ($0185 bytes) ["Map Scene ID & Flags"] $d29a = wPlayerHouse2FSceneID $d29b = wPlayerHouse1FSceneID $d29c = wSilentHillSceneID @@ -25336,19 +25310,14 @@ WRAM0 bank #0: $d3a5 = wSilentHillsFlags $d3a6 = wOldCityPokecenter2FFlags $d41a = wEventFlags - EMPTY: $d41f-$d4a6 ($0088 bytes) - SECTION: $d4a7-$d4ad ($0007 bytes) ["D4A7"] $d4a7 = wPokedexMenuFlags $d4a8 = wUnusedLinkCommunicationByte $d4a9 = wGameModeFlags $d4ab = wJoypadFlags $d4ad = wMovementFlags_Old - EMPTY: $d4ae-$d4b1 ($0004 bytes) - SECTION: $d4b2-$d512 ($0061 bytes) ["wDigWarpNumber"] $d4b2 = wDigWarpNumber $d4b6 = wCurBox $d4b9 = wBoxNames - SECTION: $d513-$d650 ($013e bytes) ["Warp data"] $d513 = wWarpNumber $d514 = wCurrMapWarpCount $d515 = wCurrMapWarps @@ -25363,11 +25332,10 @@ WRAM0 bank #0: $d642 = wUnusedAddOutdoorSpritesReturnValue $d643 = wBGMapAnchor $d645 = wUsedSprites + $d646 = wUsedFollowerSprites $d647 = wUsedNPCSprites $d64f = wUsedStaticSprites $d651 = wUsedSpritesEnd - EMPTY: $d651-$d655 ($0005 bytes) - SECTION: $d656-$d903 ($02ae bytes) ["Map header"] $d656 = wMapGroup $d657 = wMapId $d658 = wOverworldMapAnchor @@ -25439,6 +25407,7 @@ WRAM0 bank #0: $d6a6 = wTilesetAnim $d6aa = wTilesetEnd $d6aa = wGameData2End + SECTION: $d6aa-$dfca ($0921 bytes) ["Party"] $d6aa = wPokemonData $d6aa = wPartyCount $d6ab = wPartySpecies @@ -25747,13 +25716,10 @@ WRAM0 bank #0: $d8fd = wBreedMon2End $d8fd = wBreedMonGenders $d8fe = wOTPlayerName - EMPTY: $d904-$d912 ($000f bytes) - SECTION: $d913-$d91a ($0008 bytes) ["D913"] $d913 = wOTPartyData $d913 = wOTPartyCount $d914 = wOTPartySpecies $d91a = wOTPartySpeciesEnd - SECTION: $d91b-$dfca ($06b0 bytes) ["Wild mon buffer"] $d91b = wWildMonData $d91b = wMornEncounterRate $d91b = wOTPartyMons @@ -26742,7 +26708,7 @@ WRAM0 bank #0: SECTION: $dfff ($0000 bytes) ["Stack Bottom"] $dfff = wStackBottom EMPTY: $dfff-$dfff ($0001 byte) - TOTAL EMPTY: $01c2 bytes + TOTAL EMPTY: $0035 bytes HRAM bank #0: SECTION: $ff80-$ff89 ($000a bytes) ["OAM DMA"] diff --git a/pokesilver-spaceworld.sym b/pokesilver-spaceworld.sym index 40aad1f8..7521ed26 100644 --- a/pokesilver-spaceworld.sym +++ b/pokesilver-spaceworld.sym @@ -788,10 +788,10 @@ 00:2ffe TextAsmEnd.stop 00:2fff CallMapTextSubroutine 00:3015 CallMapTextSubroutine.Return -00:3019 Function3055 -00:301c Function3055.Loop -00:3026 asm_3062 -00:303e Function307a +00:3019 CheckAllMapObjects +00:301c CheckAllMapObjects.Loop +00:3026 TalkingToBGObject +00:303e ResetTalkingTarget 00:3049 PrintTextboxDebugNumbers 00:305b PrintTextboxDebugNumbers.CheckSign 00:3062 PrintTextboxDebugNumbers.PrintNum @@ -805,7 +805,7 @@ 00:310e TextboxIdle.next 00:3112 PrepareTextbox 00:3135 TextboxCleanup -00:3153 Function318f +00:3153 ReloadObjectGFX 00:315f TurnNPCTalkingTo 00:317d TurnNPCTalkingTo.Jump 00:3187 Unreferenced_CheckTrainerBattle @@ -916,7 +916,7 @@ 00:35cf RestoreScreenAndReloadTiles 00:35e2 ClearBGPalettes 00:35e5 WaitBGMap -00:35ef SetPalettes +00:35ef SetDefaultBGPAndOBP 00:35f8 ClearPalettes 00:3600 GetMemSGBLayout 00:3602 GetSGBLayout @@ -1231,8 +1231,8 @@ 01:4965 FacePlayerObject.lined_up_horizontal 01:496d FacePlayerObject.done 01:4973 FacePlayerObject.FlipNegativeToPositive -01:4979 Stubbed_UpdateYOffset -01:4994 Stubbed_UpdateYOffset.y_offsets +01:4979 Stubbed_SwayObject +01:4994 Stubbed_SwayObject.y_offsets 01:499c UpdateJumpPosition 01:49d0 UpdateJumpPosition.got_direction 01:49dc UpdateJumpPosition.y_offsets @@ -1253,8 +1253,8 @@ 01:4af6 StepFunction_TeleportTo.InitFinalSpin 01:4b00 StepFunction_TeleportTo.DoFinalSpin 01:4b0c StepFunction_TeleportTo.FinishStep -01:4b22 Unreferenced_Function4b22 -01:4b25 Stub_Function4b25 +01:4b22 Unreferenced_StrengthBoulderDust_Old +01:4b25 Stub_SpawnStrengthBoulderDust_Old 01:4b26 SpawnShadow 01:4b42 SpawnShadow.ShadowObject 01:4b48 SpawnStrengthBoulderDust @@ -1445,8 +1445,8 @@ 01:57de GivePokemon 01:57eb AddRandomPokemonToBox 01:57ed AddRandomPokemonToBox.loop -01:5818 RandomUnder246 -01:5818 RandomUnder246.loop +01:5818 RandomSpecies_RaiEnSuiOrUnder +01:5818 RandomSpecies_RaiEnSuiOrUnder.loop 01:5823 FillTMs 01:582a FillTMs.loop 01:582f DebugGiveKeyItems @@ -1826,9 +1826,8 @@ 02:4242 GetSpriteVTile.VTileOffsets 02:424c CheckObjectEnteringVisibleRange 02:4259 CheckObjectEnteringVisibleRange.dw -02:4261 EmptyFunction8261 -02:4262 Unreferenced_CheckObjectEnteringVisibleRange_Alternate -02:426e Unreferenced_CheckObjectEnteringVisibleRange_Alternate.dw +02:4261 CheckObjectEnteringVisibleRange_Alternate +02:426e CheckObjectEnteringVisibleRange_Alternate.dw 02:4276 CheckVisibleRange_UpAlt 02:427d CheckVisibleRange_DownAlt 02:4284 CheckVisibleRange_LeftAlt @@ -2477,7 +2476,6 @@ 03:5290 FailDig 03:529c Text_CantUseDigHere 03:52aa DigScript -03:52c2 EmptyFunctiond2da 03:52c3 TeleportFunction 03:52c7 TeleportFunction.next 03:52d6 TeleportFunction.finish @@ -2512,7 +2510,7 @@ 03:54cb Unused_IsKeyItem_Old.cant_toss 03:54ce _HandlePlayerStep 03:54e0 _HandlePlayerStep.start -03:54e2 _HandlePlayerStep.unreferenced_d4fa +03:54e2 _HandlePlayerStep.unreferenced_checkobjects 03:54ed _HandlePlayerStep._start 03:54fc _HandlePlayerStep.update_overworld_map 03:5501 _HandlePlayerStep.update_player_coords @@ -2821,16 +2819,13 @@ 03:6fb1 ReviveEffect.skip_to_revive 03:6fc1 ReviveEffect.revive_half_hp 03:6fc4 ReviveEffect.finish_revive -03:6fd5 Unreferenced_EmptyFunctionefed 03:6fd6 FullRestoreEffect 03:7002 FullRestoreEffect.NotAtFullHealth 03:7031 FullRestoreEffect.not_in_battle -03:7042 Unreferenced_EmptyFunctionf05a 03:7043 RestoreHPEffect 03:706e RestoreHPEffect.get_heal_amount 03:7074 RestoreHPEffect.continue_heal 03:7086 RestoreHPEffect.not_in_battle -03:7097 Unreferenced_EmptyFunctionf0af 03:7098 HealHP_SFX_GFX 03:70b7 UseItem_SelectMon 03:70c0 ItemActionTextWaitButton @@ -3322,9 +3317,9 @@ 04:6753 PokemonAskSwapItemText 04:6784 GetPartyItemOffset 04:678c ReceiveItemFromPokemon -04:6798 UnusedHandleItemJumptable -04:67a9 UnusedItemJumptable -04:67b7 EmptyFunction127b7 +04:6798 UnusedHandleRecieveItemJumptable +04:67a9 UnusedRecieveItemJumptable +04:67b7 PartyGiveItem 04:67b8 ChangeBackpackPocket 04:67c0 PartyBallPocket 04:67cb PartyBallPocket.exit @@ -3400,7 +3395,7 @@ 04:6e0f TrainerCardMainInputs.exit 04:6e16 TrainerCardMainInputs.left 04:6e26 TrainerCardMainInputs.right -04:6e37 EmptyFunction12e37 +04:6e37 EmptyTrainerCardFunction 04:6e38 TrainerCardScroll 04:6e49 TrainerCardClearTileMap 04:6e5c TrainerCardSetWindowY @@ -3466,9 +3461,9 @@ 05:410f LoadUsedSpritesGFX.skip 05:4127 LoadUsedSpritesGFX.no_still_sprite_1 05:4132 LoadUsedSpritesGFX.no_still_sprite_2 -05:4133 Function14133 +05:4133 Unreferenced_LoadOverworldSprite_NPCSlot 05:4144 LoadOverworldSprite_PlayerSlot -05:414a LoadOverworldSprite_FollowerSlot +05:414a Unreferenced_LoadOverworldSprite_FollowerSlot 05:4150 LoadOverworldSprite 05:4161 LoadOverworldSprite.dont_copy 05:417d GetOverworldSpriteData @@ -8309,9 +8304,9 @@ 23:42d9 UngroupHealingMachineSprites.ungroup 23:42dc UpdateTimeOfDayPal 23:42e3 _TimeOfDayPals -23:42fe _LABEL_8C2FE_ -23:4313 _LABEL_8C313_ -23:4325 Function8c325 +23:42fe Unreferenced_ResetTimeOfDayPal +23:4313 Unreferenced_SetTimeOfDayPal +23:4325 ChangeTimeOfDayPal 23:4335 _UpdateTimePals 23:433e OverworldFadeIn 23:4349 OverworldFadeOut @@ -8563,7 +8558,7 @@ 23:53ab AnimSeq_GSTitleFlameNote.zero 23:53c2 AnimSeq_GSTitleFlameNote.one 23:53ec AnimSeq_MinigamePikachu -23:540b Data8d40b +23:540b AnimSeq_MinigamePikachu.pikachu_framesets 23:540f AnimSeq_MinigamePikachuTail 23:5418 AnimSeq_MinigameNote 23:541c AnimSeq_MinigameNote.anon_dw @@ -8901,12 +8896,12 @@ 24:47a8 ReelAction_StopReelIgnoreJoypad 24:47b2 ReelAction_StopReelIgnoreJoypad.EndReel 24:47bc ReelAction_StopReelIgnoreJoypad.clear_reel_oam -24:47c8 Function907c8 -24:47f6 Function907c8.asm907f6 -24:4805 Function90805 -24:4814 Function90805.asm90814 -24:481b Function90805.loop -24:4822 Function90822 +24:47c8 Slots_PayoutAnim +24:47f6 Slots_PayoutAnim.seven +24:4805 Slots_PlaceReelTiles +24:4814 Slots_PlaceReelTiles.place +24:481b Slots_PlaceReelTiles.loop +24:4822 Slots_CheckReelTiles 24:486b ReelAction_StopReel1 24:487f ReelAction_StopReel1.NoBias 24:4883 ReelAction_StopReel1.CheckForBias @@ -13033,16 +13028,16 @@ 3a:4070 UpdateChannel.noteover 3a:4076 UpdateChannel.continue_sound_update 3a:407a DisablePitchWheel -3a:4081 Unreferenced_Functione8081 -3a:408c Unreferenced_Functione8081.fail -3a:408e Unreferenced_Functione8081.disable_music -3a:4093 Unreferenced_Functione8081.disable_sfx -3a:409e Unreferenced_Functione8081.clear_loop -3a:40a2 Unreferenced_Functione8081.done +3a:4081 Unreferenced_MuteAudio +3a:408c Unreferenced_MuteAudio.fail +3a:408e Unreferenced_MuteAudio.disable_music +3a:4093 Unreferenced_MuteAudio.disable_sfx +3a:409e Unreferenced_MuteAudio.clear_loop +3a:40a2 Unreferenced_MuteAudio.done 3a:40a4 GetChannelRegisters 3a:40b2 GetChannelRegisters.registers -3a:40b6 Functione80b6 -3a:40f3 Functione80b6.end +3a:40b6 ContinueSoundUpdate +3a:40f3 ContinueSoundUpdate.end 3a:40fa UpdateChannels 3a:410b UpdateChannels.jumptable 3a:411b UpdateChannels.Channel1 @@ -13078,7 +13073,7 @@ 3a:42ce IsChannelSFXOn.off 3a:42d0 IsAnySFXOn 3a:42ee IsAnySFXOn.on -3a:42f0 Functione82f0 +3a:42f0 SetupPlayDanger 3a:4307 PlayDanger 3a:431e PlayDanger.halfway 3a:4323 PlayDanger.begin @@ -13129,7 +13124,7 @@ 3a:45b9 LoadNote.flag_0e 3a:45c2 LoadNote.flag_0d 3a:45cb LoadNote.flag_0b -3a:45d8 Functione85d8 +3a:45d8 CheckChannelFlags2 3a:4605 HandleDuty 3a:461b ApplyPitchSlide 3a:465e ApplyPitchSlide.decreasing @@ -14054,23 +14049,29 @@ 3f:4657 FieldDebug_SpriteViewer.set_following 3f:4663 FieldDebug_SpriteViewer.FollowPromptString 3f:4672 FieldDebug_SpriteViewer.SetStartingPoint -3f:467d LoadUnderDevelopmentString -3f:4681 LoadUnderDevelopmentString.String -3f:4689 Functionfc689 -3f:469c Functionfc69c -3f:46bb Functionfc6bb -3f:46be Functionfc6be -3f:46de Datafc6de -3f:46fe Datafc6fe -3f:470e Datafc70e -3f:471e Datafc71e -3f:472e Datafc72e -3f:473e Datafc73e -3f:474e Datafc74e -3f:475e Datafc75e -3f:476e Datafc76e -3f:477e Datafc77e -3f:478e Datafc78e +3f:467d FieldDebug_SpriteViewer.LoadUnderDevelopmentString +3f:4681 FieldDebug_SpriteViewer.String +3f:4689 SetupSpriteViewerSpriteWalkingTilemap +3f:469c SetupSpriteViewerSpriteWalkingTilemap.loop +3f:46bb SetupSpriteViewerSpriteTilemap +3f:46be SetupSpriteViewerSpriteTilemap.loop +3f:46de SpriteViewerSpriteTilemap +3f:46fe SpriteViewerSpriteTilemap.FacingStepDown0 +3f:46fe SpriteViewerSpriteTilemap.FacingStepDown2 +3f:470e SpriteViewerSpriteTilemap.FacingStepDown1 +3f:471e SpriteViewerSpriteTilemap.FacingStepDown3 +3f:472e SpriteViewerSpriteTilemap.FacingStepUp0 +3f:472e SpriteViewerSpriteTilemap.FacingStepUp2 +3f:473e SpriteViewerSpriteTilemap.FacingStepUp1 +3f:474e SpriteViewerSpriteTilemap.FacingStepUp3 +3f:475e SpriteViewerSpriteTilemap.FacingStepLeft0 +3f:475e SpriteViewerSpriteTilemap.FacingStepLeft2 +3f:476e SpriteViewerSpriteTilemap.FacingStepRight0 +3f:476e SpriteViewerSpriteTilemap.FacingStepRight2 +3f:477e SpriteViewerSpriteTilemap.FacingStepLeft1 +3f:477e SpriteViewerSpriteTilemap.FacingStepLeft3 +3f:478e SpriteViewerSpriteTilemap.FacingStepRight1 +3f:478e SpriteViewerSpriteTilemap.FacingStepRight3 3f:479e FieldDebug_NamePlayer 3f:47cb FieldDebug_Toolgear 3f:47da FieldDebug_Toolgear.Jumptable @@ -18350,6 +18351,61 @@ 02:ba62 sBox5Mon30Nickname 02:ba68 sBox5End 02:ba68 sBox5MonNicknamesEnd +02:ba68 sPartyMailBackup +02:ba68 sPartyMon1MailBackup +02:ba68 sPartyMon1MailBackupMessage +02:ba88 sPartyMon1MailBackupMessageEnd +02:ba89 sPartyMon1MailBackupAuthor +02:ba8f sPartyMon1MailBackupAuthorNationality +02:ba91 sPartyMon1MailBackupAuthorID +02:ba93 sPartyMon1MailBackupSpecies +02:ba94 sPartyMon1MailBackupType +02:ba95 sPartyMon1MailBackupEnd +02:ba95 sPartyMon2MailBackup +02:ba95 sPartyMon2MailBackupMessage +02:bab5 sPartyMon2MailBackupMessageEnd +02:bab6 sPartyMon2MailBackupAuthor +02:babc sPartyMon2MailBackupAuthorNationality +02:babe sPartyMon2MailBackupAuthorID +02:bac0 sPartyMon2MailBackupSpecies +02:bac1 sPartyMon2MailBackupType +02:bac2 sPartyMon2MailBackupEnd +02:bac2 sPartyMon3MailBackup +02:bac2 sPartyMon3MailBackupMessage +02:bae2 sPartyMon3MailBackupMessageEnd +02:bae3 sPartyMon3MailBackupAuthor +02:bae9 sPartyMon3MailBackupAuthorNationality +02:baeb sPartyMon3MailBackupAuthorID +02:baed sPartyMon3MailBackupSpecies +02:baee sPartyMon3MailBackupType +02:baef sPartyMon3MailBackupEnd +02:baef sPartyMon4MailBackup +02:baef sPartyMon4MailBackupMessage +02:bb0f sPartyMon4MailBackupMessageEnd +02:bb10 sPartyMon4MailBackupAuthor +02:bb16 sPartyMon4MailBackupAuthorNationality +02:bb18 sPartyMon4MailBackupAuthorID +02:bb1a sPartyMon4MailBackupSpecies +02:bb1b sPartyMon4MailBackupType +02:bb1c sPartyMon4MailBackupEnd +02:bb1c sPartyMon5MailBackup +02:bb1c sPartyMon5MailBackupMessage +02:bb3c sPartyMon5MailBackupMessageEnd +02:bb3d sPartyMon5MailBackupAuthor +02:bb43 sPartyMon5MailBackupAuthorNationality +02:bb45 sPartyMon5MailBackupAuthorID +02:bb47 sPartyMon5MailBackupSpecies +02:bb48 sPartyMon5MailBackupType +02:bb49 sPartyMon5MailBackupEnd +02:bb49 sPartyMon6MailBackup +02:bb49 sPartyMon6MailBackupMessage +02:bb69 sPartyMon6MailBackupMessageEnd +02:bb6a sPartyMon6MailBackupAuthor +02:bb70 sPartyMon6MailBackupAuthorNationality +02:bb72 sPartyMon6MailBackupAuthorID +02:bb74 sPartyMon6MailBackupSpecies +02:bb75 sPartyMon6MailBackupType +02:bb76 sPartyMon6MailBackupEnd 03:a000 sBox6 03:a000 sBox6Count 03:a001 sBox6Species @@ -22194,62 +22250,7 @@ 03:bb72 sPartyMon6MailAuthorID 03:bb74 sPartyMon6MailSpecies 03:bb75 sPartyMon6MailType -03:bb76 sPartyMailBackup -03:bb76 sPartyMon1MailBackup -03:bb76 sPartyMon1MailBackupMessage 03:bb76 sPartyMon6MailEnd -03:bb96 sPartyMon1MailBackupMessageEnd -03:bb97 sPartyMon1MailBackupAuthor -03:bb9d sPartyMon1MailBackupAuthorNationality -03:bb9f sPartyMon1MailBackupAuthorID -03:bba1 sPartyMon1MailBackupSpecies -03:bba2 sPartyMon1MailBackupType -03:bba3 sPartyMon1MailBackupEnd -03:bba3 sPartyMon2MailBackup -03:bba3 sPartyMon2MailBackupMessage -03:bbc3 sPartyMon2MailBackupMessageEnd -03:bbc4 sPartyMon2MailBackupAuthor -03:bbca sPartyMon2MailBackupAuthorNationality -03:bbcc sPartyMon2MailBackupAuthorID -03:bbce sPartyMon2MailBackupSpecies -03:bbcf sPartyMon2MailBackupType -03:bbd0 sPartyMon2MailBackupEnd -03:bbd0 sPartyMon3MailBackup -03:bbd0 sPartyMon3MailBackupMessage -03:bbf0 sPartyMon3MailBackupMessageEnd -03:bbf1 sPartyMon3MailBackupAuthor -03:bbf7 sPartyMon3MailBackupAuthorNationality -03:bbf9 sPartyMon3MailBackupAuthorID -03:bbfb sPartyMon3MailBackupSpecies -03:bbfc sPartyMon3MailBackupType -03:bbfd sPartyMon3MailBackupEnd -03:bbfd sPartyMon4MailBackup -03:bbfd sPartyMon4MailBackupMessage -03:bc1d sPartyMon4MailBackupMessageEnd -03:bc1e sPartyMon4MailBackupAuthor -03:bc24 sPartyMon4MailBackupAuthorNationality -03:bc26 sPartyMon4MailBackupAuthorID -03:bc28 sPartyMon4MailBackupSpecies -03:bc29 sPartyMon4MailBackupType -03:bc2a sPartyMon4MailBackupEnd -03:bc2a sPartyMon5MailBackup -03:bc2a sPartyMon5MailBackupMessage -03:bc4a sPartyMon5MailBackupMessageEnd -03:bc4b sPartyMon5MailBackupAuthor -03:bc51 sPartyMon5MailBackupAuthorNationality -03:bc53 sPartyMon5MailBackupAuthorID -03:bc55 sPartyMon5MailBackupSpecies -03:bc56 sPartyMon5MailBackupType -03:bc57 sPartyMon5MailBackupEnd -03:bc57 sPartyMon6MailBackup -03:bc57 sPartyMon6MailBackupMessage -03:bc77 sPartyMon6MailBackupMessageEnd -03:bc78 sPartyMon6MailBackupAuthor -03:bc7e sPartyMon6MailBackupAuthorNationality -03:bc80 sPartyMon6MailBackupAuthorID -03:bc82 sPartyMon6MailBackupSpecies -03:bc83 sPartyMon6MailBackupType -03:bc84 sPartyMon6MailBackupEnd 03:bffd sChecksum 00:c000 wChannel1 00:c000 wChannel1MusicID @@ -23982,6 +23983,9 @@ 00:cc3d wSpriteViewerSavedMenuPointerY 00:cc3e wSpriteViewerJumptableIndex 00:cc3f wMovementBuffer +00:cc3f wMovementXBuffer +00:cc40 wMovementYBuffer +00:cc41 wMovementSpriteViewerDirection 00:cc45 wFacingDirectionList_Old 00:cc4c wEmotionBubbleSpriteIndex_Old 00:cc4c wSavedPlayerScreenY_Old @@ -24936,6 +24940,7 @@ 00:d642 wUnusedAddOutdoorSpritesReturnValue 00:d643 wBGMapAnchor 00:d645 wUsedSprites +00:d646 wUsedFollowerSprites 00:d647 wUsedNPCSprites 00:d64f wUsedStaticSprites 00:d651 wUsedSpritesEnd