From 823166c4cd3eeb65118b6cd7134032288ad9f031 Mon Sep 17 00:00:00 2001 From: cassidoxa Date: Thu, 24 Nov 2022 22:24:38 -0500 Subject: [PATCH] Re-organize vanillalabels.asm --- vanillalabels.asm | 415 +++++++++++++--------------------------------- 1 file changed, 112 insertions(+), 303 deletions(-) diff --git a/vanillalabels.asm b/vanillalabels.asm index ff03684..c967bf6 100644 --- a/vanillalabels.asm +++ b/vanillalabels.asm @@ -1,307 +1,116 @@ -org $008781 -UseImplicitRegIndexedLocalJumpTable: +;================================================================================ +; Vanilla Labels +;================================================================================ +; Labels for routines in the vanilla portion of the ROM. More or less in sequential +; order. Most of these names came from the MoN US disassembly. But we should +; refer to the JP 1.0 disassembly as that's what the randomizer is based on. +; All routines can be assumed to return long unless otherwise noted. +;================================================================================ -org $00879c -UseImplicitRegIndexedLongJumpTable: - -org $008333 -Vram_EraseTilemaps_triforce: - -org $008913 -Sound_LoadLightWorldSongBank: -org $00891D - .do_load - -org $00893D -EnableForceBlank: +UseImplicitRegIndexedLocalJumpTable = $008781 +UseImplicitRegIndexedLongJumpTable = $00879C +Vram_EraseTilemaps_triforce = 008333 +Sound_LoadLightWorldSongBank = $008913 +Sound_LoadLightWorldSongBank_do_load = $00891D +EnableForceBlank = $00893D DungeonMask = $0098C0 +DecompSwordGfx = $00D308 +DecompShieldGfx = $00D348 +Tagalong_LoadGfx = $00D463 +GetAnimatedSpriteTile = $00D51B +GetAnimatedSpriteTile_variable = $00D52D +Attract_DecompressStoryGfx = $00D84E +LoadSelectScreenGfx = $00E529 +PrepDungeonExit = $00F945 +Mirror_InitHdmaSettings = $00FDEE +Dungeon_LoadRoom = $01873A +Module_PreDungeon = $02821E +Module_PreDungeon_setAmbientSfx = $028296 +Dungeon_SaveRoomData = $02A0A8 +Dungeon_SaveRoomData_justKeys = $02A0BE +Dungeon_SaveRoomQuadrantData = $02B861 +LoadGearPalettes_bunny = $02FD8A +LoadGearPalettes_variable = $02FD95 +Filter_Majorly_Whiten_Color = $02FEAB +Sprite_SpawnFallingItem = $05A51D +Sprite_DrawMultiple = $05DF6C +Sprite_DrawMultiple_quantity_preset = $05DF70 +Sprite_DrawMultiple_player_deferred = $05DF75 +Sprite_ShowSolicitedMessageIfPlayerFacing = $05E1A7 +Sprite_ShowMessageFromPlayerContact = $05E1F0 +Sprite_ShowMessageUnconditional = $05E219 +Sprite_ZeldaLong = $05EC96 +Sprite_EB_HeartPiece_handle_flags = $05F0C0 +Player_ApplyRumbleToSprites = $0680FA +Utility_CheckIfHitBoxesOverlapLong = $0683E6 +Chicken_SpawnAvengerChicken = $06A7DB ; returns short +Sprite_DrawShadowLong = $06DC5C +DashKey_Draw = $06DD40 +Sprite_PrepAndDrawSingleLargeLong = $06DBF8 +Sprite_PrepAndDrawSingleSmallLong = $06DC00 +Sprite_ApplySpeedTowardsPlayerLong = $06EA18 +Sprite_DirectionToFacePlayerLong = $06EAA6 +Sprite_CheckDamageToPlayerSameLayerLong = $06F12F +OAM_AllocateDeferToPlayerLong = $06F86A +Player_HaltDashAttackLong = $0791B3 +Link_ReceiveItem = $07999D +Sprite_CheckIfPlayerPreoccupied = $07F4AA +Ancilla_ReceiveItem = $08C3AE +Ancilla_BreakTowerSeal_draw_single_crystal = $08CE93 +Ancilla_BreakTowerSeal_stop_spawning_sparkles = $08CEC3 +BreakTowerSeal_ExecuteSparkles = $08CF59 +Ancilla_SetOam_XY_Long = $08F710 +AddReceivedItem = $0985E2 +AddPendantOrCrystal = $098BAD +AddWeathervaneExplosion = $098CFD +AddDashTremor = $0993DF +AddAncillaLong = $099D04 +Ancilla_CheckIfAlreadyExistsLong = $099D1A +Sprite_SetSpawnedCoords = $09AE64 +GiveRupeeGift = $09AD58 +OverworldMap_InitGfx = $0ABA4F +OverworldMap_DarkWorldTilemap = $0ABA99 +OverworldMap_LoadSprGfx = $0ABAB9 +NameFile_MakeScreenVisible = $0CD7D1 +InitializeSaveFile = $0CDB3E +InitializeSaveFile_build_checksum = $0CDBC0 +GetRandomInt = $0DBA71 +OAM_AllocateFromRegionA = $0DBA80 +OAM_AllocateFromRegionB = $0DBA84 +OAM_AllocateFromRegionC = $0DBA88 +OAM_AllocateFromRegionD = $0DBA8C +OAM_AllocateFromRegionE = $0DBA90 +OAM_AllocateFromRegionF = $0DBA94 +Sound_SetSfxPanWithPlayerCoords = $0DBB67 +Sound_SetSfx1PanLong = $0DBB6E +Sound_SetSfx2PanLong = $0DBB7C +Sound_SetSfx3PanLong = $0DBB8A +HUD_RefreshIconLong = $0DDB7F +Equipment_UpdateEquippedItemLong = $0DDD32 +BottleMenu_movingOn = $0DE01E +RestoreNormalMenu = $0DE346 +Equipment_SearchForEquippedItemLong = $0DE395 +DrawProgressIcons = $0DE9C8 ; this returns short +DrawEquipment = $0DED29 ; this returns short +HUD_RebuildLong = $0DFA78 +HUD_RebuildIndoor_Palace = $0DFA88 +HUD_RebuildLong2 = $0DFA88 +Messaging_Text = $0EEE10 +Overworld_TileAttr = $0FFD94 +Overworld_DrawPersistentMap16 = $1BC97C +Palette_Sword = $1BED03 +Palette_Shield = $1BED29 +Palette_ArmorAndGloves = $1BEDF9 +Palette_Hud = $1BEE52 +Palette_SelectScreen = $1BEF96 +ShopKeeper_RapidTerminateReceiveItem = $1CFAAA +Sprite_NullifyHookshotDrag = $1CF500 +Ancilla_CheckForAvailableSlot = $1CF537 +Filter_MajorWhitenMain = $1DE9B6 +Sprite_SpawnDynamically = $1DF65D +Sprite_SpawnDynamically_arbitrary = $1DF65F +DiggingGameGuy_AttemptPrizeSpawn = $1DFD4B +Sprite_GetEmptyBottleIndex = $1EDE28 +Sprite_PlayerCantPassThrough = $1EF4E7 -org $00D308 -DecompSwordGfx: - -org $00D348 -DecompShieldGfx: - -org $00D463 -Tagalong_LoadGfx: - -org $00D51B -GetAnimatedSpriteTile: - -org $00D52D -GetAnimatedSpriteTile_variable: - -org $00D84E -Attract_DecompressStoryGfx: - -org $00E529 -LoadSelectScreenGfx: - -org $00F945 -PrepDungeonExit: - -org $00FDEE -Mirror_InitHdmaSettings: - -org $01873A -Dungeon_LoadRoom: - -org $02821E -Module_PreDungeon: -org $028296 - .setAmbientSfx - -org $02A0A8 -Dungeon_SaveRoomData: - -org $02A0BE -Dungeon_SaveRoomData_justKeys: - -org $02B861 -Dungeon_SaveRoomQuadrantData: - -org $02FD8A ; 17D8A - Bank0E.asm: 3732 Note: Different bank -LoadGearPalettes_bunny: - -org $02FD95 ; 17D95 - Bank0E.asm: 3742 Note: Different bank -LoadGearPalettes_variable: - -org $02FEAB -Filter_Majorly_Whiten_Color: - -org $05A51D -Sprite_SpawnFallingItem: - -org $05DF6C ; 02DF6C - Bank05.asm : 2445 -Sprite_DrawMultiple: - -org $05DF70 ; 02DF70 - Bank05.asm : 2454 -Sprite_DrawMultiple_quantity_preset: - -org $05DF75 ; 02DF75 - Bank05.asm : 2461 -Sprite_DrawMultiple_player_deferred: - -org $05E1A7 ; 02E1A7 - Bank05.asm : 2592 -Sprite_ShowSolicitedMessageIfPlayerFacing: - -org $05E1F0 -Sprite_ShowMessageFromPlayerContact: - -org $05E219 -Sprite_ShowMessageUnconditional: - -org $05EC96 -Sprite_ZeldaLong: - -org $05F0C0 -Sprite_EB_HeartPiece_handle_flags: - -org $0680FA -Player_ApplyRumbleToSprites: - -org $0683E6 -Utility_CheckIfHitBoxesOverlapLong: - -org $06A7DB -Chicken_SpawnAvengerChicken: ; returns short - -org $06DC5C -Sprite_DrawShadowLong: - -org $06DD40 -DashKey_Draw: - -org $06DBF8 -Sprite_PrepAndDrawSingleLargeLong: - -org $06DC00 -Sprite_PrepAndDrawSingleSmallLong: - -org $06EA18 -Sprite_ApplySpeedTowardsPlayerLong: - -org $06EAA6 -Sprite_DirectionToFacePlayerLong: - -org $06F12F -Sprite_CheckDamageToPlayerSameLayerLong: - -org $06F86A -OAM_AllocateDeferToPlayerLong: - -org $0791B3 -Player_HaltDashAttackLong: - -org $07999D -Link_ReceiveItem: - -org $07E68F -Unknown_Method_0: ; In US version disassembly simply called "$3E6A6 IN ROM" - -org $07F4AA -Sprite_CheckIfPlayerPreoccupied: - -org $08C3AE -Ancilla_ReceiveItem: - -org $08CE93 -Ancilla_BreakTowerSeal_draw_single_crystal: - -org $08CEC3 -Ancilla_BreakTowerSeal_stop_spawning_sparkles: - -org $08CF59 -BreakTowerSeal_ExecuteSparkles: - -org $08F710 -Ancilla_SetOam_XY_Long: - -org $0985E2 ; (break on $0985E4) -AddReceivedItem: - -org $098BAD -AddPendantOrCrystal: - -org $098CFD -AddWeathervaneExplosion: - -org $0993DF -AddDashTremor: - -org $099D04 -AddAncillaLong: - -org $099D1A -Ancilla_CheckIfAlreadyExistsLong: - -org $09AE64 -Sprite_SetSpawnedCoords: - -org $09AD58 -GiveRupeeGift: - -org $0ABA4F -OverworldMap_InitGfx: - -org $0ABA99 -OverworldMap_DarkWorldTilemap: - -org $0ABAB9 -OverworldMap_LoadSprGfx: - -org $0CD7D1 -NameFile_MakeScreenVisible: -org $0CDB3E -InitializeSaveFile: -org $0CDBC0 -InitializeSaveFile_build_checksum: - -org $0DBA71 -GetRandomInt: - -org $0DBA80 -OAM_AllocateFromRegionA: -org $0DBA84 -OAM_AllocateFromRegionB: -org $0DBA88 -OAM_AllocateFromRegionC: -org $0DBA8C -OAM_AllocateFromRegionD: -org $0DBA90 -OAM_AllocateFromRegionE: -org $0DBA94 -OAM_AllocateFromRegionF: - -org $0DBB67 -Sound_SetSfxPanWithPlayerCoords: - -org $0DBB6E -Sound_SetSfx1PanLong: - -org $0DBB7C -Sound_SetSfx2PanLong: - -org $0DBB8A -Sound_SetSfx3PanLong: - -org $0DDB7F -HUD_RefreshIconLong: - -org $0DDD32 -Equipment_UpdateEquippedItemLong: - -org $0DE01E ; 6E10E - equipment.asm : 787 -BottleMenu_movingOn: - -org $0DE346 -RestoreNormalMenu: - -org $0DE395 -Equipment_SearchForEquippedItemLong: - -org $0DE9C8 -DrawProgressIcons: ; this returns short - -org $0DED29 -DrawEquipment: ; this returns short - -org $0DFA78 -HUD_RebuildLong: - -org $0DFA88 -HUD_RebuildIndoor_Palace: - -org $0DFA88 -HUD_RebuildLong2: - -org $0EEE10 -Messaging_Text: - -org $0FFD94 -Overworld_TileAttr: - -org $1BC97C -Overworld_DrawPersistentMap16: - -org $1BED03 -Palette_Sword: - -org $1BED29 -Palette_Shield: - -org $1BEDF9 -Palette_ArmorAndGloves: - -org $1BEE52 -Palette_Hud: - -org $1BEF96 -Palette_SelectScreen: - -org $1CFAAA -ShopKeeper_RapidTerminateReceiveItem: - -org $1CF500 -Sprite_NullifyHookshotDrag: - -org $1CF537 -Ancilla_CheckForAvailableSlot: - -org $1DE9B6 -Filter_MajorWhitenMain: - -org $1DF65D -Sprite_SpawnDynamically: - -org $1DF65F -Sprite_SpawnDynamically_arbitrary: - -org $1DFD4B -DiggingGameGuy_AttemptPrizeSpawn: - -org $1EDE28 -Sprite_GetEmptyBottleIndex: ; this is totally in sprite_bees.asm - -org $1EF4E7 -Sprite_PlayerCantPassThrough: