From cafb0908a05fb3fc963e40e3d7be2c5b801f1364 Mon Sep 17 00:00:00 2001
From: cassidoxa <cassidymoen@gmx.com>
Date: Sun, 23 Oct 2022 22:02:36 -0400
Subject: [PATCH 01/11] Introduce bound to QS loop to prevent infinite loop on
 last bomb loss Move !INFINITE_BOMB define to ram.asm, replace with labels

---
 darkworldspawn.asm |  5 ++---
 events.asm         |  2 +-
 newhud.asm         |  3 +--
 quickswap.asm      | 14 ++++++++++++++
 ram.asm            |  2 ++
 retro.asm          | 45 ++++++++++++++++++---------------------------
 6 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/darkworldspawn.asm b/darkworldspawn.asm
index 3ec0293..f83a094 100644
--- a/darkworldspawn.asm
+++ b/darkworldspawn.asm
@@ -131,19 +131,18 @@ RefreshRainAmmo:
 RTL
 ;--------------------------------------------------------------------------------
 !INFINITE_ARROWS = "$7F50C8"
-!INFINITE_BOMBS = "$7F50C9"
 !INFINITE_MAGIC = "$7F50CA"
 SetEscapeAssist:
 	LDA ProgressIndicator : CMP.b #$01 : BNE .no_train ; check if we're in rain state
 	.rain
 		LDA.l EscapeAssist
 		BIT.b #$04 : BEQ + : STA !INFINITE_MAGIC : +
-		BIT.b #$02 : BEQ + : STA !INFINITE_BOMBS : +
+		BIT.b #$02 : BEQ + : STA InfiniteBombs : +
 		BIT.b #$01 : BEQ + : STA !INFINITE_ARROWS : +
 		BRA ++
 	.no_train ; choo choo
 		LDA.l EscapeAssist : BIT.b #$04 : BEQ + : LDA.b #$00 : STA !INFINITE_MAGIC : +
-		LDA.l EscapeAssist : BIT.b #$02 : BEQ + : LDA.b #$00 : STA !INFINITE_BOMBS : +
+		LDA.l EscapeAssist : BIT.b #$02 : BEQ + : LDA.b #$00 : STA InfiniteBombs : +
 		LDA.l EscapeAssist : BIT.b #$01 : BEQ + : LDA.b #$00 : STA !INFINITE_ARROWS : +
 	++
 RTL
diff --git a/events.asm b/events.asm
index e2988ff..7d9f6a6 100644
--- a/events.asm
+++ b/events.asm
@@ -60,7 +60,7 @@ OnUncleItemGet:
 
 	LDA.l EscapeAssist
 	BIT.b #$04 : BEQ + : STA !INFINITE_MAGIC : +
-	BIT.b #$02 : BEQ + : STA !INFINITE_BOMBS : +
+	BIT.b #$02 : BEQ + : STA InfiniteBombs : +
 	BIT.b #$01 : BEQ + : STA !INFINITE_ARROWS : +
 
 	PLA
diff --git a/newhud.asm b/newhud.asm
index 6b78fa8..db4d144 100644
--- a/newhud.asm
+++ b/newhud.asm
@@ -3,10 +3,9 @@ SEP #$30
 ;================================================================================
 ; Draw bomb count
 !BOMBCOUNT_DRAW_ADDRESS = "$7EC75A"
-!INFINITE_BOMBS = "$7F50C9"
 ;================================================================================
 
-	LDA !INFINITE_BOMBS : BNE .infinite_bombs
+	LDA.l InfiniteBombs : BNE .infinite_bombs
 	.finite_bombs
 		LDA.l BombsEquipment ; bombs
 		JSR HudHexToDec2Digit ;requires 8 bit registers!
diff --git a/quickswap.asm b/quickswap.asm
index 1331614..a69f7ce 100644
--- a/quickswap.asm
+++ b/quickswap.asm
@@ -11,6 +11,7 @@ QuickSwap:
 	LDA.l QuickSwapFlag : BEQ .done
 	LDA.w $0202 : BEQ .done ; Skip everything if we don't have any items
 
+        LDY.b #$14
 	PHX
 	XBA ; restore the stashed value
 	CMP.b #$30 : BNE +
@@ -58,8 +59,10 @@ RCode:
 	-
 		+ CPX.b #$14 : BNE + : LDX.b #$00 ;will wrap around to 1
 		+ INX
+                DEY : BEQ +
 	.nextItem
 	JSL.l IsItemAvailable : BEQ -
+        +
 RTS
 
 LCode:
@@ -73,6 +76,17 @@ LCode:
 	-
 		+ CPX.b #$01 : BNE + : LDX.b #$15 ; will wrap around to $14
 		+ DEX
+                DEY : BEQ +
 	.nextItem
 	JSL.l IsItemAvailable : BEQ -
+        +
 RTS
+
+IsItemAvailable:
+        LDA.l InfiniteBombs : BEQ .finite
+        .infinite
+                CPX.b #$04 : BNE .finite
+                LDA.b #$01 : RTL
+        .finite
+                LDA.l EquipmentWRAM-1, X
+RTL
diff --git a/ram.asm b/ram.asm
index 3510b8f..efaa68b 100644
--- a/ram.asm
+++ b/ram.asm
@@ -6,6 +6,7 @@
 ;--------------------------------------------------------------------------------
 ; Placeholder and for compass item max count allocations, still WIP
 ;--------------------------------------------------------------------------------
+InfiniteBombs = $7F50C9
 CompassTotalsWRAM = $7F5410
 
 ;================================================================================
@@ -15,4 +16,5 @@ macro assertRAM(label, address)
   assert <label> = <address>, "<label> labeled at incorrect address."
 endmacro
 
+%assertRAM(InfiniteBombs, $7F50C9)
 %assertRAM(CompassTotalsWRAM, $7F5410)
diff --git a/retro.asm b/retro.asm
index aa9d772..847549b 100644
--- a/retro.asm
+++ b/retro.asm
@@ -1,47 +1,38 @@
-!INFINITE_BOMBS = "$7F50C9"
-IsItemAvailable:
-	LDA !INFINITE_BOMBS : BEQ .finite
-	.infinite
-		CPX.b #$04 : BNE .finite
-		LDA.b #$01 : RTL
-	.finite
-                LDA EquipmentWRAM-1, X
-RTL
 LoadBombCount:
-	LDA !INFINITE_BOMBS : BNE .infinite
+	LDA.l InfiniteBombs : BNE .infinite
 	.finite
-		LDA BombsEquipment
+		LDA.l BombsEquipment
 	.infinite
 RTL
 LoadBombCount16:
-	LDA !INFINITE_BOMBS : AND.w #$00FF : BNE .infinite
+	LDA.l InfiniteBombs : AND.w #$00FF : BNE .infinite
 	.finite
-		LDA BombsEquipment
+		LDA.l BombsEquipment
 	.infinite
 RTL
 StoreBombCount:
-	PHA : LDA !INFINITE_BOMBS : BEQ .finite
+	PHA : LDA.l InfiniteBombs : BEQ .finite
 	.infinite
 		PLA : LDA.b #$01 : RTL
 	.finite
-		PLA : STA BombsEquipment
+		PLA : STA.l BombsEquipment
 RTL
 SearchForEquippedItem:
-	LDA !INFINITE_BOMBS : BEQ +
+	LDA.l InfiniteBombs : BEQ +
 		LDA.b #$01 : LDX.b #$00 : RTL
 	+
-	LDA BowEquipment ; thing we wrote over
+	LDA.l BowEquipment ; thing we wrote over
 RTL
 
 !INFINITE_ARROWS = "$7F50C8"
 DecrementArrows:
-	LDA !INFINITE_ARROWS : BNE .infinite
+	LDA.l !INFINITE_ARROWS : BNE .infinite
 	LDA.l ArrowMode : BNE .rupees : BRA .normal
 	.infinite
 		LDA.b #$01 : RTL
 	.normal
-		LDA CurrentArrows : BEQ .done
-		DEC : STA CurrentArrows : INC
+		LDA.l CurrentArrows : BEQ .done
+		DEC : STA.l CurrentArrows : INC
 		BRA .done
 	.rupees
 		REP #$20
@@ -57,11 +48,11 @@ DecrementArrows:
 		.shoot_arrow
 		PHX
 		REP #$20
-		LDA CurrentRupees : BEQ +
-			PHA : LDA BowEquipment : DEC : AND #$0002 : TAX : PLA
+		LDA.l CurrentRupees : BEQ +
+			PHA : LDA.l BowEquipment : DEC : AND.w #$0002 : TAX : PLA
 			!SUB.l ArrowModeWoodArrowCost, X ; CMP.w #$0000
 			BMI .not_enough_money
-				STA CurrentRupees : LDA.w #$0001 : BRA +
+				STA.l CurrentRupees : LDA.w #$0001 : BRA +
 			.not_enough_money
 				LDA.w #$0000
 		+
@@ -72,17 +63,17 @@ DecrementArrows:
 RTL
 
 ArrowGame:
-	LDA $0B99 : BEQ +
+	LDA.w $0B99 : BEQ +
 		DEC $0B99 ; reduce minigame arrow count
 		LDA.l ArrowMode : BNE .rupees
 		.normal
-			LDA CurrentArrows : INC #2 : STA CurrentArrows ; increment arrow count (by 2 for some reason)
+			LDA.l CurrentArrows : INC #2 : STA.l CurrentArrows ; increment arrow count (by 2 for some reason)
 			RTL
 		.rupees
 			PHX
 			REP #$20 ; set 16-bit accumulator
-				LDA BowEquipment : DEC : AND #$0002 : TAX
-				LDA CurrentRupees : !ADD.l ArrowModeWoodArrowCost, X : STA CurrentRupees
+				LDA.l BowEquipment : DEC : AND #$0002 : TAX
+				LDA.l CurrentRupees : !ADD.l ArrowModeWoodArrowCost, X : STA.l CurrentRupees
 			SEP #$20 ; set 8-bit accumulator
 			PLX
 	+

From 43f753b517543042c5668861ede11ced31928e7a Mon Sep 17 00:00:00 2001
From: cassidoxa <cassidymoen@gmx.com>
Date: Sat, 5 Nov 2022 00:50:25 -0400
Subject: [PATCH 02/11] ram.asm initial commit. Replaced all address defines
 with labels Value defines styled without quotes, # moved to load/store/cmp
 site Added registers.asm (copied from spannerisms JP disassembly) Added a
 bunch of length annotations Deleted old or trivial commented out code
 Deleted: ganonfixes.asm, map.asm, seedtag.asm Replaced obsolete credits.asm
 with creditsnew.asm Moved scratch space at $7F5020-3F to mirrored WRAM
 (7E1E70-8F) Moved clock RAM to mirrored WRAM (7E1E90-9F) dialog.asm:
 FreeDungeonItemNotice preserves callee-preserved scratch RAM Toast buffer
 moved to mirrored WRAM (7E1E0E-0F) servicerequest.asm: long store to $012E
 converted to word length store

---
 LTTP_RND_GeneralBugfixes.asm |  385 +-------
 accessibility.asm            |  275 +++---
 bookofmudora.asm             |   55 +-
 boots.asm                    |   57 +-
 bugfixes.asm                 |   45 +-
 catfish.asm                  |   42 +-
 clock.asm                    |   54 +-
 compasses.asm                |   28 +-
 compression.asm              |   20 +-
 controllerjank.asm           |   59 +-
 crypto.asm                   |  155 ++-
 cuccostorm.asm               |   66 +-
 darkworldspawn.asm           |   96 +-
 decryption.asm               |   59 +-
 dialog.asm                   |  270 ++----
 dungeonmap.asm               |   29 +-
 elder.asm                    |   14 +-
 entrances.asm                |   30 +-
 events.asm                   |   69 +-
 failure.asm                  |  142 +--
 fastcredits.asm              |    6 +-
 fileselect.asm               |  369 ++++---
 flipperkill.asm              |   51 +-
 framehook.asm                |   43 +-
 ganonfixes.asm               |   16 -
 goalitem.asm                 |   19 +-
 hardmode.asm                 |   40 +-
 hashalphabet.asm             |  134 ++-
 hashalphabethooks.asm        |  106 +-
 heartpieces.asm              |   89 +-
 hooks.asm                    |  169 +---
 hudtext.asm                  |   34 +-
 icepalacegraphics.asm        |   34 +-
 init.asm                     |    8 +-
 inventory.asm                |  564 +++++------
 inverted.asm                 |   84 +-
 invertedmaps.asm             | 1774 +++++++++++++++++-----------------
 itemdowngrade.asm            |   24 +-
 lampmantlecone.asm           |   18 +-
 map.asm                      |   16 -
 medallions.asm               |    2 -
 msu.asm                      |  526 +++++-----
 music.asm                    |    2 +-
 musicvolumes.asm             | 1148 +++++++++++-----------
 newhud.asm                   |  145 ++-
 newitems.asm                 |  427 ++++----
 password.asm                 |  297 +++---
 potions.asm                  |   50 +-
 ram.asm                      |  420 +++++++-
 registers.asm                | 1500 ++++++++++++++++++++++++++++
 retro.asm                    |    5 +-
 rngfixes.asm                 |   54 +-
 roomloading.asm              |   27 +-
 save.asm                     |  128 +--
 seedtag.asm                  |   34 -
 servicerequest.asm           |  141 ++-
 shopkeeper.asm               |  751 +++++++-------
 spriteswap.asm               |   36 +-
 sram.asm                     |   10 +-
 stats.asm                    |  198 ++--
 stats/credits.asm            | 1311 +++++++++++++------------
 stats/creditsnew.asm         |  752 --------------
 stats/main.asm               |  330 +++----
 stats/statConfig.asm         |   48 +-
 swordswap.asm                |  125 +--
 tables.asm                   |   99 +-
 tablets.asm                  |   56 +-
 textrenderer.asm             |  102 +-
 timer.asm                    |  182 ++--
 toast.asm                    |   12 +-
 utilities.asm                |  241 +++--
 vanillalabels.asm            |  304 ++++++
 72 files changed, 7706 insertions(+), 7305 deletions(-)
 delete mode 100644 ganonfixes.asm
 delete mode 100644 map.asm
 create mode 100644 registers.asm
 delete mode 100644 seedtag.asm
 mode change 100755 => 100644 stats/credits.asm
 delete mode 100644 stats/creditsnew.asm
 create mode 100644 vanillalabels.asm

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index ee2bb39..6724bb6 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -36,41 +36,11 @@ dw !ROM_VERSION_LOW
 dw !ROM_VERSION_HIGH
 
 ;================================================================================
-
 !ADD = "CLC : ADC"
 !SUB = "SEC : SBC"
 !BLT = "BCC"
 !BGE = "BCS"
 
-!MS_GOT = "$7F5031"
-
-!REDRAW = "$7F5000"
-!GANON_WARP_CHAIN = "$7F5032";
-
-!TILE_UPLOAD_BUFFER = "$7EA180";
-
-!FORCE_HEART_SPAWN = "$7F5033";
-!SKIP_HEART_SAVE = "$7F5034";
-
-; MSU-1
-!REG_MSU_FALLBACK_TABLE = $7F50A0   ; 8 bytes
-!REG_MSU_DELAYED_COMMAND = $7F50A9
-!REG_MSU_PACK_COUNT = $7F50AA
-!REG_MSU_PACK_CURRENT = $7F50AB
-!REG_MSU_PACK_REQUEST = $7F50AC
-!REG_MSU_LOADED_TRACK = $7F50AD     ; 2 bytes
-!REG_SPC_LOADING = $7F50AF
-!MSU_LOADED_TRACK = $7F5400
-!MSU_RESUME_TRACK = $7F5401
-!MSU_RESUME_TIME = $7F5402          ; 4 bytes
-!MSU_RESUME_CONTROL = $7F5406
-!REG_MUSIC_CONTROL = $012B
-;!REG_MUSIC_CONTROL = $012C
-!REG_MUSIC_CONTROL_REQUEST = $012C
-
-!ONEMIND_ID = $7F5072
-!ONEMIND_TIMER = $7F5073
-
 function hexto555(h) = ((((h&$FF)/8)<<10)|(((h>>8&$FF)/8)<<5)|(((h>>16&$FF)/8)<<0))
 
 ; Feature flags, run asar with -DFEATURE_X=1 to enable
@@ -85,6 +55,8 @@ incsrc hashalphabethooks.asm
 incsrc sharedplayerpalettefix.asm
 incsrc ram.asm
 incsrc sram.asm
+incsrc registers.asm
+incsrc vanillalabels.asm
 
 ;org $208000 ; bank #$20
 org $A08000 ; bank #$A0
@@ -108,7 +80,6 @@ incsrc fairyfixes.asm
 incsrc rngfixes.asm
 incsrc medallions.asm
 incsrc inventory.asm
-incsrc ganonfixes.asm
 incsrc zelda.asm
 incsrc maidencrystals.asm
 incsrc zoraking.asm
@@ -120,7 +91,6 @@ incsrc mantle.asm
 incsrc swordswap.asm
 incsrc stats.asm
 incsrc scratchpad.asm
-incsrc map.asm
 incsrc dialog.asm
 incsrc entrances.asm
 incsrc clock.asm
@@ -212,9 +182,6 @@ incsrc tables.asm
 org $348000
 incsrc spc.asm
 
-; uncomment for inverted adjustments
-;incsrc sandbox.asm
-
 org $318000 ; bank #$31
 GFX_Mire_Bombos:
 incbin 99ff1_bombos.gfx
@@ -336,8 +303,9 @@ warnpc $B08000
 ;$3F reserved for internal debugging
 ;================================================================================
 ;RAM
+;See ram.asm for label assignments
 ;$7E021B[0x1]: Used by race game instead of $0ABF to avoid witch item conflict
-;$7EC900[0x1F00]: BIGRAM buffer
+;$7EC900[0x1F00]: BigRAM buffer
 ;$7EF000[0x500]: SRAM mirror First 0x500 bytes of SRAM
 ;   See sram.asm for labels and assignments
 ;$7F5000[0x800]: Rando's main free ram region
@@ -347,7 +315,7 @@ warnpc $B08000
 ;$7F7667[0x6719] - free ram
 ;================================================================================
 ;SRAM Map
-;See sram.asm for rando-specific assignments
+;See sram.asm for label assignments and documentation
 ;$70:0000 (5K) Game state
 ;  0000-04FF Vanilla Slot 1 (mirrored at $7EF000)
 ;  0500-14FF Ext Slot 1 (mirrored at $7F6000)
@@ -355,44 +323,6 @@ warnpc $B08000
 ;$70:3000 (0x16) Password
 ;$70:6000 (8K) Scratch buffers
 ;================================================================================
-;org $0080DC ; <- 0xDC - Bank00.asm:179 - Kill Music
-;db #$A9, #$00, #$EA
-;LDA.b #$00 : NOP
-;================================================================================
-;org $0AC53E ; <- 5453E - Bank0A.asm:1103 - (LDA $0AC51F, X) - i have no idea what this is for anymore
-;LDA.b #$7F
-;NOP #2
-;================================================================================
-;org $05DF8B ; <- 2DF8B - Bank05.asm : 2483
-;AND.w #$0100 ; allow Sprite_DrawMultiple to access lower half of sprite tiles
-;================================================================================
-;org $0DF8F1 ; this is required for the X-indicator in the HUD except not anymore obviously
-;
-;;red pendant
-;db $2B, $31, $2C, $31, $3D, $31, $2E, $31
-;db $2B, $25, $2C, $25, $2D, $25, $2E, $25
-;
-;;blue pendant
-;db $2B, $31, $2C, $31, $3D, $31, $2E, $31
-;db $2B, $2D, $2C, $2D, $2D, $2D, $2E, $2D
-;
-;;green pendant
-;db $2B, $31, $2C, $31, $3D, $31, $2E, $31
-;db $2B, $3D, $2C, $3D, $2D, $3D, $2E, $3D
-;================================================================================
-;org $00CFF2 ; 0x4FF2 - Mire H
-;db GFX_Mire_Bombos>>16
-;org $00D0D1 ; 0x50D1 - Mire M
-;db GFX_Mire_Bombos>>8
-;org $00D1B0 ; 0x51B0 - Mire L
-;db GFX_Mire_Bombos
-
-;org $00D020 ; 0x5020 - Trock H
-;db GFX_TRock_Bombos>>16
-;org $00D0FF ; 0x50FF - Trock M
-;db GFX_TRock_Bombos>>8
-;org $00D1DE ; 0x51DE - Trock L
-;db GFX_TRock_Bombos
 
 org $00D09C ; 0x509C - HUD Items H
 db GFX_HUD_Items>>16
@@ -416,308 +346,3 @@ db GFX_HUD_Main>>8
 org $00D25B ; 0x525B - HUD Main L
 db GFX_HUD_Main
 ;================================================================================
-org $008781
-UseImplicitRegIndexedLocalJumpTable:
-
-org $00879c
-UseImplicitRegIndexedLongJumpTable:
-
-org $008333
-Vram_EraseTilemaps_triforce:
-
-org $008913
-Sound_LoadLightWorldSongBank:
-org $00891D
-    .do_load
-
-org $00893D
-EnableForceBlank:
-
-DungeonMask = $0098C0
-
-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 $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:
-;================================================================================
diff --git a/accessibility.asm b/accessibility.asm
index 6e88345..7f1484f 100644
--- a/accessibility.asm
+++ b/accessibility.asm
@@ -1,15 +1,6 @@
 ;================================================================================
 ; Accessibility Fixes
 ;================================================================================
-FlipGreenPendant:
-	LDA $0C : CMP #$38 : BNE + ; check if we have green pendant
-		ORA #$40 : STA $0C ; flip it
-	+
-	
-    LDA $0D : STA $0802, X ; stuff we wrote over "Set CHR, palette, and priority of the sprite"
-    LDA $0C : STA $0803, X
-RTL
-;================================================================================
 ConditionalLightning:
         CMP.b #$05 : BEQ ++
         CMP.b #$2C : BEQ ++
@@ -19,109 +10,109 @@ ConditionalLightning:
                 RTL
         ++
                 LDA.b #$72
-        STA $9A
+        STA.b $9A
 RTL
 ;================================================================================
 ConditionalWhitenBg:
         LDX.b #$00
         LDA.l DisableFlashing : REP #$20 : BNE +
-            LDA $00,X
+            LDA.b $00,X
             JSR WhitenLoopReal
             RTL
         +
-            LDA $00
+            LDA.b Scrap00
             JSR WhitenLoopDummy
             RTL
 ;================================================================================
 WhitenLoopReal:
         -
-            LDA $7EC340, X : JSL Filter_Majorly_Whiten_Color : STA $7EC540, X
-            LDA $7EC350, X : JSL Filter_Majorly_Whiten_Color : STA $7EC550, X
-            LDA $7EC360, X : JSL Filter_Majorly_Whiten_Color : STA $7EC560, X
-            LDA $7EC370, X : JSL Filter_Majorly_Whiten_Color : STA $7EC570, X
-            LDA $7EC380, X : JSL Filter_Majorly_Whiten_Color : STA $7EC580, X
-            LDA $7EC390, X : JSL Filter_Majorly_Whiten_Color : STA $7EC590, X
-            LDA $7EC3A0, X : JSL Filter_Majorly_Whiten_Color : STA $7EC5A0, X
-            LDA $7EC3B0, X : JSL Filter_Majorly_Whiten_Color : STA $7EC5B0, X
-            LDA $7EC3C0, X : JSL Filter_Majorly_Whiten_Color : STA $7EC5C0, X
-            LDA $7EC3D0, X : JSL Filter_Majorly_Whiten_Color : STA $7EC5D0, X
-            LDA $7EC3E0, X : JSL Filter_Majorly_Whiten_Color : STA $7EC5E0, X
+            LDA.l $7EC340, X : JSL Filter_Majorly_Whiten_Color : STA.l $7EC540, X
+            LDA.l $7EC350, X : JSL Filter_Majorly_Whiten_Color : STA.l $7EC550, X
+            LDA.l $7EC360, X : JSL Filter_Majorly_Whiten_Color : STA.l $7EC560, X
+            LDA.l $7EC370, X : JSL Filter_Majorly_Whiten_Color : STA.l $7EC570, X
+            LDA.l $7EC380, X : JSL Filter_Majorly_Whiten_Color : STA.l $7EC580, X
+            LDA.l $7EC390, X : JSL Filter_Majorly_Whiten_Color : STA.l $7EC590, X
+            LDA.l $7EC3A0, X : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5A0, X
+            LDA.l $7EC3B0, X : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5B0, X
+            LDA.l $7EC3C0, X : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5C0, X
+            LDA.l $7EC3D0, X : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5D0, X
+            LDA.l $7EC3E0, X : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5E0, X
             INX #2 : CPX.b #$10 : BEQ +
                 JMP -
         +
-            LDA $7EC3F0 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F0
-            LDA $7EC3F2 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F2
-            LDA $7EC3F4 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F4
-            LDA $10 : CMP.w #$07 : BNE +
-            LDA $048E
-            CMP.w #$3C : BEQ ++
-            CMP.w #$9D : BEQ ++
-            CMP.w #$9C : BEQ ++
-            CMP.w #$A5 : BEQ ++
+            LDA.l $7EC3F0 : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5F0
+            LDA.l $7EC3F2 : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5F2
+            LDA.l $7EC3F4 : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5F4
+            LDA.b $10 : CMP.w #$0007 : BNE +
+            LDA.w $048E
+            CMP.w #$003C : BEQ ++
+            CMP.w #$009D : BEQ ++
+            CMP.w #$009C : BEQ ++
+            CMP.w #$00A5 : BEQ ++
             +
-                LDA $7EC3F6 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F6
-                LDA $7EC3F8 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F8
+                LDA.l $7EC3F6 : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5F6
+                LDA.l $7EC3F8 : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5F8
                 BRA +++
             ++
-                LDA $7EC3F6 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F6
-                LDA $7EC3F8 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F8
+                LDA.l $7EC3F6 : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5F6
+                LDA.l $7EC3F8 : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5F8
                 BRA +++
             +++
-            LDA $7EC3FA : JSL Filter_Majorly_Whiten_Color : STA $7EC5FA
-            LDA $7EC3FC : JSL Filter_Majorly_Whiten_Color : STA $7EC5FC
-            LDA $7EC3FE : JSL Filter_Majorly_Whiten_Color : STA $7EC5FE
+            LDA.l $7EC3FA : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5FA
+            LDA.l $7EC3FC : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5FC
+            LDA.l $7EC3FE : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5FE
             REP #$10
-            LDA $7EC540 : TAY
-            LDA $7EC300 : BNE +
+            LDA.l $7EC540 : TAY
+            LDA.l $7EC300 : BNE +
                 TAY
         +
-            TYA : STA $7EC500
+            TYA : STA.l $7EC500
             SEP #$30
 RTS
 ;================================================================================
 WhitenLoopDummy:
         -
-            LDA $7EC340, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC540, X
-            LDA $7EC350, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC550, X
-            LDA $7EC360, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC560, X
-            LDA $7EC370, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC570, X
-            LDA $7EC380, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC580, X
-            LDA $7EC390, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC590, X
-            LDA $7EC3A0, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC5A0, X
-            LDA $7EC3B0, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC5B0, X
-            LDA $7EC3C0, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC5C0, X
-            LDA $7EC3D0, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC5D0, X
-            LDA $7EC3E0, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC5E0, X
+            LDA.l $7EC340, X : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC540, X
+            LDA.l $7EC350, X : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC550, X
+            LDA.l $7EC360, X : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC560, X
+            LDA.l $7EC370, X : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC570, X
+            LDA.l $7EC380, X : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC580, X
+            LDA.l $7EC390, X : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC590, X
+            LDA.l $7EC3A0, X : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5A0, X
+            LDA.l $7EC3B0, X : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5B0, X
+            LDA.l $7EC3C0, X : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5C0, X
+            LDA.l $7EC3D0, X : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5D0, X
+            LDA.l $7EC3E0, X : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5E0, X
             INX #2 : CPX.b #$10 : BEQ +
                 JMP -
         +
-            LDA $7EC3F0 : JSL Filter_Majorly_Whiten_Color : LDA $7EC5F0
-            LDA $7EC3F2 : JSL Filter_Majorly_Whiten_Color : LDA $7EC5F2
-            LDA $7EC3F4 : JSL Filter_Majorly_Whiten_Color : LDA $7EC5F4
-            LDA $10 : CMP.w #$07 : BNE + ; only light invisifloor if we're in dungeon submodule
-            LDA $048E
-            CMP.w #$3C : BEQ ++ ; hookshot cave
-            CMP.w #$9D : BEQ ++ ; gt right
-            CMP.w #$9C : BEQ ++ ; gt big room
-            CMP.w #$A5 : BEQ ++ ; wizzrobes 1
+            LDA.l $7EC3F0 : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5F0
+            LDA.l $7EC3F2 : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5F2
+            LDA.l $7EC3F4 : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5F4
+            LDA.b $10 : CMP.w #$0007 : BNE + ; only light invisifloor if we're in dungeon submodule
+            LDA.w $048E
+            CMP.w #$003C : BEQ ++ ; hookshot cave
+            CMP.w #$009D : BEQ ++ ; gt right
+            CMP.w #$009C : BEQ ++ ; gt big room
+            CMP.w #$00A5 : BEQ ++ ; wizzrobes 1
             +
-                LDA $7EC3F6 : JSL Filter_Majorly_Whiten_Color : LDA $7EC5F6
-                LDA $7EC3F8 : JSL Filter_Majorly_Whiten_Color : LDA $7EC5F8
+                LDA.l $7EC3F6 : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5F6
+                LDA.l $7EC3F8 : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5F8
                 BRA +++
             ++
-                LDA $7EC3F6 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F6
-                LDA $7EC3F8 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F8
+                LDA.l $7EC3F6 : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5F6
+                LDA.l $7EC3F8 : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5F8
                 BRA +++
             +++
-            LDA $7EC3FA : JSL Filter_Majorly_Whiten_Color : LDA $7EC5FA
-            LDA $7EC3FC : JSL Filter_Majorly_Whiten_Color : LDA $7EC5FC
-            LDA $7EC3FE : JSL Filter_Majorly_Whiten_Color : LDA $7EC5FE
+            LDA.l $7EC3FA : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5FA
+            LDA.l $7EC3FC : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5FC
+            LDA.l $7EC3FE : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5FE
             REP #$10
-            LDA $7EC540 : TAY
-            LDA $7EC300 : BNE +
+            LDA.l $7EC540 : TAY
+            LDA.l $7EC300 : BNE +
                 TAY
         +
-            TYA : STA $7EC500
+            TYA : STA.l $7EC500
             SEP #$30
 RTS
 ;================================================================================
@@ -129,36 +120,36 @@ RestoreBgEther:
         LDX.b #$00
         LDA.l DisableFlashing : REP #$20 : BNE +
         -
-            LDA $00,X
-            LDA $7EC340, X : STA $7EC540, X
-            LDA $7EC350, X : STA $7EC550, X
-            LDA $7EC360, X : STA $7EC560, X
-            LDA $7EC370, X : STA $7EC570, X
-            LDA $7EC380, X : STA $7EC580, X
-            LDA $7EC390, X : STA $7EC590, X
-            LDA $7EC3A0, X : STA $7EC5A0, X
-            LDA $7EC3B0, X : STA $7EC5B0, X
-            LDA $7EC3C0, X : STA $7EC5C0, X
-            LDA $7EC3D0, X : STA $7EC5D0, X
-            LDA $7EC3E0, X : STA $7EC5E0, X
-            LDA $7EC3F0, X : STA $7EC5F0, X
+            LDA.b $00,X
+            LDA.l $7EC340, X : STA.l $7EC540, X
+            LDA.l $7EC350, X : STA.l $7EC550, X
+            LDA.l $7EC360, X : STA.l $7EC560, X
+            LDA.l $7EC370, X : STA.l $7EC570, X
+            LDA.l $7EC380, X : STA.l $7EC580, X
+            LDA.l $7EC390, X : STA.l $7EC590, X
+            LDA.l $7EC3A0, X : STA.l $7EC5A0, X
+            LDA.l $7EC3B0, X : STA.l $7EC5B0, X
+            LDA.l $7EC3C0, X : STA.l $7EC5C0, X
+            LDA.l $7EC3D0, X : STA.l $7EC5D0, X
+            LDA.l $7EC3E0, X : STA.l $7EC5E0, X
+            LDA.l $7EC3F0, X : STA.l $7EC5F0, X
             INX #2 : CPX.b #$10 : BNE -
             BRA ++
         +
         -
-            LDA $00
-            LDA $7EC340, X : LDA $7EC540, X
-            LDA $7EC350, X : LDA $7EC550, X
-            LDA $7EC360, X : LDA $7EC560, X
-            LDA $7EC370, X : LDA $7EC570, X
-            LDA $7EC380, X : LDA $7EC580, X
-            LDA $7EC390, X : LDA $7EC590, X
-            LDA $7EC3A0, X : LDA $7EC5A0, X
-            LDA $7EC3B0, X : LDA $7EC5B0, X
-            LDA $7EC3C0, X : LDA $7EC5C0, X
-            LDA $7EC3D0, X : LDA $7EC5D0, X
-            LDA $7EC3E0, X : LDA $7EC5E0, X
-            LDA $7EC3F0, X : LDA $7EC5F0, X
+            LDA.b Scrap00
+            LDA.l $7EC340, X : LDA.l $7EC540, X
+            LDA.l $7EC350, X : LDA.l $7EC550, X
+            LDA.l $7EC360, X : LDA.l $7EC560, X
+            LDA.l $7EC370, X : LDA.l $7EC570, X
+            LDA.l $7EC380, X : LDA.l $7EC580, X
+            LDA.l $7EC390, X : LDA.l $7EC590, X
+            LDA.l $7EC3A0, X : LDA.l $7EC5A0, X
+            LDA.l $7EC3B0, X : LDA.l $7EC5B0, X
+            LDA.l $7EC3C0, X : LDA.l $7EC5C0, X
+            LDA.l $7EC3D0, X : LDA.l $7EC5D0, X
+            LDA.l $7EC3E0, X : LDA.l $7EC5E0, X
+            LDA.l $7EC3F0, X : LDA.l $7EC5F0, X
             INX #2 : CPX.b #$10 : BNE -
             BRA ++
         ++
@@ -168,105 +159,105 @@ DDMConditionalLightning:
         LDA.l DisableFlashing 
         REP #$20
         BNE +
-            LDA.w $0000
+            LDA.w Scrap
             LDX.b #$02
             JML $07FA7F ; Bank0E.asm : 4738 vanilla loop equivalent to below beginning at LDY #$00
         +
-            LDA.b $00 : LDX.b #$02 : LDY #$00
+            LDA.b Scrap00 : LDX.b #$02 : LDY.b #$00
         -
-            LDA $F4EB, Y : LDA $7EC560, X
-            LDA $F4F9, Y : LDA $7EC570, X
-            LDA $F507, Y : LDA $7EC590, X
-            LDA $F515, Y : LDA $7EC5E0, X
-            LDA $F523, Y : LDA $7EC5F0, X
+            LDA.w $F4EB, Y : LDA.l $7EC560, X
+            LDA.w $F4F9, Y : LDA.l $7EC570, X
+            LDA.w $F507, Y : LDA.l $7EC590, X
+            LDA.w $F515, Y : LDA.l $7EC5E0, X
+            LDA.w $F523, Y : LDA.l $7EC5F0, X
             INY #2
             INX #2 : CPX.b #$10 : BNE -
             JML $07FAAC ; Bank0E.asm : 4754 both branches converge here
 ;================================================================================
 ConditionalGTFlash:
         LDA.l DisableFlashing : REP #$20 : BNE +
-            LDA $0000
+            LDA.w Scrap
         -
-            LDA $F9C1, Y : STA $7EC5D0, X
+            LDA.w $F9C1, Y : STA.l $7EC5D0, X
             INY #2
             INX #2 : CPX.b #$10 : BNE -
             RTL
         +
-            LDA $00
+            LDA.b Scrap00
         -
-            LDA $F9C1, Y : LDA $7EC5D0, X
+            LDA.w $F9C1, Y : LDA.l $7EC5D0, X
             INY #2
             INX #2 : CPX.b #$10 : BNE -
             RTL
 ;================================================================================
 ConditionalRedFlash:
         LDA.l DisableFlashing : REP #$20 : BNE +
-            LDA $00,X
-            LDA.w #$1D59 : STA $7EC5DA
-            LDA.w #$25FF : STA $7EC5DC
+            LDA.b Scrap,X
+            LDA.w #$1D59 : STA.l $7EC5DA
+            LDA.w #$25FF : STA.l $7EC5DC
             LDA.w #$001A
             RTL
         +
-            LDA $00
-            LDA.w #$1D59 : LDA $7EC5DA
-            LDA.w #$25FF : LDA $7EC5DC
+            LDA.b Scrap00
+            LDA.w #$1D59 : LDA.l $7EC5DA
+            LDA.w #$25FF : LDA.l $7EC5DC
             LDA.w #$0000
             RTL
 ;================================================================================
 ConditionalPedAncilla:
         LDA.l DisableFlashing : REP #$20 : BNE +
-            LDA $00,X
-            LDA $00 : STA $04
-            LDA $02 : STA $06
+            LDA.b Scrap,X
+            LDA.b Scrap00 : STA.b Scrap04
+            LDA.b Scrap02 : STA.b Scrap06
             RTL
         +
-            LDA $00
-            LDA $00 : LDA $04
-            LDA $02 : LDA $06
+            LDA.b Scrap
+            LDA.b Scrap00 : LDA.b Scrap04
+            LDA.b Scrap02 : LDA.b Scrap06
             RTL
 ;================================================================================
 LoadElectroPalette:
         REP #$20
-        LDA.w #$0202 : STA $0C
-        LDA.w #$0404 : STA $0E
-        LDA.w #$001B : STA $02
+        LDA.w #$0202 : STA.b Scrap0C
+        LDA.w #$0404 : STA.b Scrap0E
+        LDA.w #$001B : STA.b Scrap02
         SEP #$10
-        LDX $0C : LDA $1BEBB4, X : AND.w #$00FF : ADC #$D630
+        LDX.b Scrap0C : LDA.l $1BEBB4, X : AND.w #$00FF : ADC.w #$D630
         REP #$10 : LDX.w #$01B2 : LDY.w #$0002
         JSR ConditionalLoadGearPalette
         SEP #$10
-        LDX $0D
-        LDA $1BEBC1, X : AND.w #$00FF : ADC #$D648
+        LDX.b Scrap0D
+        LDA.l $1BEBC1, X : AND.w #$00FF : ADC.w #$D648
         REP #$10 : LDX.w #$01B8 : LDY.w #$0003
         JSR ConditionalLoadGearPalette
         SEP #$10
-        LDX $0E
-        LDA $1BEC06, X : AND.w #$00FF : ASL A : ADC #$D308
+        LDX.b Scrap0E
+        LDA.l $1BEC06, X : AND.w #$00FF : ASL A : ADC.w #$D308
         REP #$10 : LDX.w #$01E2 : LDY.w #$000E
         JSR ConditionalLoadGearPalette
         SEP #$30
-        INC $15
+        INC.b $15
 RTL
 ;================================================================================
 ConditionalLoadGearPalette:
-        STA $00
+        STA.b Scrap00
         SEP #$20
         LDA.l DisableFlashing : REP #$20 : BNE +
-                LDA $00,X
+                LDA.b Scrap,X
         -
-                LDA [$00]
-                STA $7EC500, X
-                INC $00 : INC $00
+                LDA.b [Scrap00]
+                STA.l $7EC500, X
+                INC.b Scrap00 : INC.b Scrap00
                 INX #2
                 DEY
                 BPL -
         RTS
         +
-                LDA $00
+                LDA.b Scrap
         -
-                LDA [$00]
-                LDA $7EC500, X
-                INC $00 : INC $00
+                LDA.b [Scrap00]
+                LDA.l $7EC500, X
+                INC.b Scrap00 : INC.b Scrap00
                 INX #2
                 DEY
                 BPL -
@@ -281,13 +272,13 @@ RestoreElectroPalette:
         LDX.w #$01E2 : LDY.w #$000E
         JSR FillPaletteBufferFromAux
         SEP #$30
-        INC $15
+        INC.b $15
 RTL
 ;================================================================================
 FillPaletteBufferFromAux:
         -
-            LDA $7EC300, X
-            STA $7EC500, X
+            LDA.l $7EC300, X
+            STA.l $7EC500, X
             INX #2
             DEY
             BPL -
diff --git a/bookofmudora.asm b/bookofmudora.asm
index 6149763..f98df58 100644
--- a/bookofmudora.asm
+++ b/bookofmudora.asm
@@ -2,21 +2,21 @@
 ; Randomize Book of Mudora
 ;--------------------------------------------------------------------------------
 LoadLibraryItemGFX:
-	%GetPossiblyEncryptedItem(LibraryItem, SpriteItemValues)
-	STA $0E80, X ; Store item type
-	JSL.l PrepDynamicTile
+        %GetPossiblyEncryptedItem(LibraryItem, SpriteItemValues)
+        STA.w $0E80, X ; Store item type
+        JSL.l PrepDynamicTile
 RTL
 ;--------------------------------------------------------------------------------
 DrawLibraryItemGFX:
-	PHA
-    LDA $0E80, X ; Retrieve stored item type
-	JSL.l DrawDynamicTile
-	PLA
+        PHA
+        LDA $0E80, X ; Retrieve stored item type
+        JSL.l DrawDynamicTile
+        PLA
 RTL
 ;--------------------------------------------------------------------------------
 SetLibraryItem:
-	LDY $0E80, X ; Retrieve stored item type
-	JSL.l ItemSet_Library ; contains thing we wrote over
+        LDY.w $0E80, X ; Retrieve stored item type
+        JSL.l ItemSet_Library ; contains thing we wrote over
 RTL
 ;--------------------------------------------------------------------------------
 
@@ -24,37 +24,34 @@ RTL
 ;================================================================================
 ; Randomize Bonk Keys
 ;--------------------------------------------------------------------------------
-!REDRAW = "$7F5000"
-;--------------------------------------------------------------------------------
 LoadBonkItemGFX:
-	LDA.b #$08 : STA $0F50, X ; thing we wrote over
+	LDA.b #$08 : STA.w $0F50, X ; thing we wrote over
 LoadBonkItemGFX_inner:
-	LDA.b #$00 : STA !REDRAW
+	LDA.b #$00 : STA.l RedrawFlag
 	JSR LoadBonkItem
 	JSL.l PrepDynamicTile
 RTL
 ;--------------------------------------------------------------------------------
 DrawBonkItemGFX: 
-	PHA
-	LDA !REDRAW : BEQ .skipInit ; skip init if already ready
-	JSL.l LoadBonkItemGFX_inner
-	BRA .done ; don't draw on the init frame
-	
+        PHA
+        LDA.l RedrawFlag : BEQ .skipInit ; skip init if already ready
+        JSL.l LoadBonkItemGFX_inner
+        BRA .done ; don't draw on the init frame
+        
 	.skipInit
-	
-    JSR LoadBonkItem
-	JSL.l DrawDynamicTileNoShadow
-	
-	.done
-	PLA
+        JSR LoadBonkItem
+        JSL.l DrawDynamicTileNoShadow
+
+        .done
+        PLA
 RTL
 ;--------------------------------------------------------------------------------
 GiveBonkItem:
 	JSR LoadBonkItem
-	CMP #$24 : BNE .notKey
+	CMP.b #$24 : BNE .notKey
 	.key
 		PHY : LDY.b #$24 : JSL.l AddInventory : PLY ; do inventory processing for a small key
-		LDA CurrentSmallKeys : INC A : STA CurrentSmallKeys
+		LDA.l CurrentSmallKeys : INC A : STA.l CurrentSmallKeys
 		LDA.b #$2F : JSL.l Sound_SetSfx3PanLong
 		JSL CountBonkItem
 RTL
@@ -64,11 +61,11 @@ RTL
 RTL
 ;--------------------------------------------------------------------------------
 LoadBonkItem:
-	LDA $A0 ; check room ID - only bonk keys in 2 rooms so we're just checking the lower byte
-	CMP #115 : BNE + ; Desert Bonk Key
+	LDA.b $A0 ; check room ID - only bonk keys in 2 rooms so we're just checking the lower byte
+	CMP.b #115 : BNE + ; Desert Bonk Key
     	LDA.l BonkKey_Desert
 		BRA ++
-	+ : CMP #140 : BNE + ; GTower Bonk Key
+	+ : CMP.b #140 : BNE + ; GTower Bonk Key
     	LDA.l BonkKey_GTower
 		BRA ++
 	+
diff --git a/boots.asm b/boots.asm
index 219c445..6171334 100644
--- a/boots.asm
+++ b/boots.asm
@@ -1,28 +1,27 @@
 ;================================================================================
 ; Boots State Modifier
 ;--------------------------------------------------------------------------------
-!BOOTS_MODIFIER = "$7F50CE"
 ModifyBoots:
     PHA
-        LDA !BOOTS_MODIFIER : CMP.b #$01 : BNE +
-            PLA : AND AbilityFlags : ORA.b #$04 : RTL ; yes boots
+        LDA.l BootsModifier : CMP.b #$01 : BNE +
+            PLA : AND.l AbilityFlags : ORA.b #$04 : RTL ; yes boots
         + : CMP.b #$02 : BNE +
-            PLA : AND AbilityFlags : AND.b #$FB : RTL ; no boots
-        + : LDA FakeBoots : CMP.b #$01 : BNE +
-            LDA $5B : BEQ ++ : LDA $59 : BNE + ; hover check
-                ++ : PLA : AND AbilityFlags : ORA.b #$04 : RTL ; yes boots, not hovering
+            PLA : AND.l AbilityFlags : AND.b #$FB : RTL ; no boots
+        + : LDA.l FakeBoots : CMP.b #$01 : BNE +
+            LDA.b $5B : BEQ ++ : LDA.b $59 : BNE + ; hover check
+                ++ : PLA : AND.l AbilityFlags : ORA.b #$04 : RTL ; yes boots, not hovering
         +
     PLA
-    AND AbilityFlags ; regular boots
+    AND.l AbilityFlags ; regular boots
 RTL
 ;--------------------------------------------------------------------------------
 AddBonkTremors:
     PHA
-        LDA $46 : BNE + ; Check for incapacitated Link
+        LDA.b $46 : BNE + ; Check for incapacitated Link
             JSL.l IncrementBonkCounter
         +
-        LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
-        LDA BootsEquipment : BNE + ; Check for Boots
+        LDA.l BootsModifier : CMP.b #$01 : BEQ +
+        LDA.l BootsEquipment : BNE + ; Check for Boots
             PLA : RTL
         +
     PLA
@@ -32,46 +31,46 @@ RTL
 BonkBreakableWall:
     PHX : PHP
         SEP #$30 ; set 8-bit accumulator and index registers
-        LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
-        LDA BootsEquipment : BNE + ; Check for Boots
+        LDA.l BootsModifier : CMP.b #$01 : BEQ +
+        LDA.l BootsEquipment : BNE + ; Check for Boots
             PLP : PLX : LDA.w #$0000 : RTL
         +
     PLP : PLX
-    LDA $0372 : AND.w #$00FF ; things we wrote over
+    LDA.w $0372 : AND.w #$00FF ; things we wrote over
 RTL
 ;--------------------------------------------------------------------------------
 BonkRockPile:
-    LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
-    LDA BootsEquipment : BNE + ; Check for Boots
+    LDA.l BootsModifier : CMP.b #$01 : BEQ +
+    LDA.l BootsEquipment : BNE + ; Check for Boots
         LDA.b #$00 : RTL
     +
-    LDA $02EF : AND.b #$70 ; things we wrote over
+    LDA.w $02EF : AND.b #$70 ; things we wrote over
 RTL
 ;--------------------------------------------------------------------------------
 GravestoneHook:
-    LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
-    LDA BootsEquipment : BEQ .done ; Check for Boots
+    LDA.l BootsModifier : CMP.b #$01 : BEQ +
+    LDA.l BootsEquipment : BEQ .done ; Check for Boots
     +
-    LDA $0372 : BEQ .done ; things we wrote over
+    LDA.w $0372 : BEQ .done ; things we wrote over
         JML.l moveGravestone
     .done
     JML.l GravestoneHook_continue
 ;--------------------------------------------------------------------------------
 JumpDownLedge:
-    LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
-    LDA BootsEquipment : BNE + ; Check for Boots
+    LDA.l BootsModifier : CMP.b #$01 : BEQ +
+    LDA.l BootsEquipment : BNE + ; Check for Boots
         ; Disarm Waterwalk
-        LDA $5B : CMP.b #$01 : BNE +
-            STZ $5B
+        LDA.b $5B : CMP.b #$01 : BNE +
+            STZ.b $5B
     +
-    LDA $1B : BNE .done : LDA.b #$02 : STA $EE ; things we wrote over
+    LDA.b $1B : BNE .done : LDA.b #$02 : STA.b $EE ; things we wrote over
     .done
 RTL
 ;--------------------------------------------------------------------------------
 BonkRecoil:
-    LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
-    LDA BootsEquipment : BNE + ; Check for Boots
-        LDA.b #$16 : STA $29 : RTL
+    LDA.l BootsModifier : CMP.b #$01 : BEQ +
+    LDA.l BootsEquipment : BNE + ; Check for Boots
+        LDA.b #$16 : STA.b $29 : RTL
     +
-    LDA.b #$24 : STA $29 ; things we wrote over
+    LDA.b #$24 : STA.b $29 ; things we wrote over
 RTL
diff --git a/bugfixes.asm b/bugfixes.asm
index 85ff9d6..0226f39 100644
--- a/bugfixes.asm
+++ b/bugfixes.asm
@@ -2,8 +2,8 @@
 
 ;--------------------------------------------------------------------------------
 AssignKiki:
-    LDA.b #$00 : STA FollowerDropped ; defuse bomb
-    LDA.b #$0A : STA FollowerIndicator ; assign kiki as follower
+    LDA.b #$00 : STA.l FollowerDropped ; defuse bomb
+    LDA.b #$0A : STA.l FollowerIndicator ; assign kiki as follower
 RTL
 ;--------------------------------------------------------------------------------
 
@@ -11,10 +11,9 @@ RTL
 ; Name: AllowSQ
 ; Returns: Accumulator = 0 if S&Q is disallowed, 1 if allowed
 ;--------------------------------------------------------------------------------
-!ITEM_BUSY = "$7F5091"
 AllowSQ:
-	LDA ProgressIndicator : BEQ .done ; thing we overwrote - check if link is in his bed
-	LDA !ITEM_BUSY : EOR #$01
+	LDA.l ProgressIndicator : BEQ .done ; thing we overwrote - check if link is in his bed
+	LDA.l BusyItem : EOR.b #$01
 	.done
 RTL
 ;--------------------------------------------------------------------------------
@@ -23,8 +22,8 @@ RTL
 ;0 = Reset Music
 ;1 = Don't Reset Music
 MSMusicReset:
-	LDA $8A : CMP.b #$80 : BNE +
-		LDA $23
+	LDA.b $8A : CMP.b #$80 : BNE +
+		LDA.b $23
 	+
 RTL
 ;--------------------------------------------------------------------------------
@@ -32,11 +31,11 @@ RTL
 ;--------------------------------------------------------------------------------
 ;0 = Become (Perma)bunny
 DecideIfBunny:
-	LDA MoonPearlEquipment : BNE .done
-	LDA CurrentWorld : AND.b #$40
+	LDA.l MoonPearlEquipment : BNE .done
+	LDA.l CurrentWorld : AND.b #$40
 	PHA : LDA.l InvertedMode : BNE .inverted
 	.normal
-		PLA : EOR #$40
+		PLA : EOR.b #$40
 		BRA .done
 	.inverted
 		PLA
@@ -136,21 +135,21 @@ SQEGFix:
 ;--------------------------------------------------------------------------------
 ; Fix crystal not spawning when using somaria vs boss
 TryToSpawnCrystalUntilSuccess:
-	STX $02D8 ; what we overwrote
+	STX.w $02D8 ; what we overwrote
 	JSL AddAncillaLong : BCS .failed ; a clear carry flag indicates success
 .spawned
-	STZ $AE ; the "trying to spawn crystal" flag
-	STZ $AF ; the "trying to spawn pendant" flag
+	STZ.b $AE ; the "trying to spawn crystal" flag
+	STZ.b $AF ; the "trying to spawn pendant" flag
 .failed
 RTL
 
 ;--------------------------------------------------------------------------------
 ; Fix crystal not spawning when using somaria vs boss
 WallmasterCameraFix:
-	STZ $A7    ; disable vertical camera scrolling for current room
+	STZ.b $A7    ; disable vertical camera scrolling for current room
 	REP #$20
-	STZ $0618  ; something about scrolling, setting these to 0 tricks the game 
-	STZ $061A  ; into thinking we're at the edge of the room so it doesn't scroll.
+	STZ.w $0618  ; something about scrolling, setting these to 0 tricks the game 
+	STZ.w $061A  ; into thinking we're at the edge of the room so it doesn't scroll.
 	SEP #$20
 	JML Sound_SetSfx3PanLong ; what we wrote over, also this will RTL
 
@@ -158,8 +157,8 @@ WallmasterCameraFix:
 ; Fix losing glove colors
 LoadActualGearPalettesWithGloves:
 REP #$20
-LDA SwordEquipment : STA $0C
-LDA ArmorEquipment : AND.w #$00FF
+LDA.l SwordEquipment : STA.b Scrap0C
+LDA.l ArmorEquipment : AND.w #$00FF
 JSL LoadGearPalettes_variable
 JSL SpriteSwap_Palette_ArmorAndGloves_part_two
 RTL
@@ -167,24 +166,24 @@ RTL
 ;--------------------------------------------------------------------------------
 ; Fix Bunny Palette Map Bug
 LoadGearPalette_safe_for_bunny:
-LDA $10 
+LDA.b $10 
 CMP.w #$030E : BEQ .new ; opening dungeon map
 CMP.w #$070E : BEQ .new ; opening overworld map
 .original
 -
-	LDA [$00]
+	LDA.b [Scrap00]
 	STA $7EC300, X
 	STA $7EC500, X
-	INC $00 : INC $00
+	INC.b Scrap00 : INC.b Scrap00
 	INX #2
 	DEY
 	BPL -
 RTL
 .new
 -
-	LDA [$00]
+	LDA.b [Scrap00]
 	STA $7EC500, X
-	INC $00 : INC $00
+	INC.b Scrap00 : INC.b Scrap00
 	INX #2
 	DEY
 	BPL -
diff --git a/catfish.asm b/catfish.asm
index 4754600..9cb8a72 100644
--- a/catfish.asm
+++ b/catfish.asm
@@ -1,34 +1,26 @@
 ;================================================================================
 ; Randomize Catfish
 ;--------------------------------------------------------------------------------
-!HEART_REDRAW = "$7F5000"
 LoadCatfishItemGFX:
-    LDA.l $1DE185 ; location randomizer writes catfish item to
-	JML PrepDynamicTile
+        LDA.l $1DE185 ; location randomizer writes catfish item to
+        JML PrepDynamicTile
 ;--------------------------------------------------------------------------------
 DrawThrownItem:
-	LDA $8A : CMP.b #$81 : BNE .catfish
-	
-	.zora
-	LDA.b #$01 : STA !HEART_REDRAW
-    LDA.l $1DE1C3 ; location randomizer writes zora item to
-	BRA .draw
-	
-	.catfish
-    LDA.l $1DE185 ; location randomizer writes catfish item to
-	
-	.draw
-	JML DrawDynamicTile
+        LDA.b $8A : CMP.b #$81 : BNE .catfish
+                .zora
+                LDA.b #$01 : STA.l RedrawFlag
+                LDA.l $1DE1C3 ; location randomizer writes zora item to
+                BRA .draw
+                .catfish
+                LDA.l $1DE185 ; location randomizer writes catfish item to
+                .draw
+                JML DrawDynamicTile
 ;--------------------------------------------------------------------------------
 MarkThrownItem:
 	JSL Link_ReceiveItem ; thing we wrote over
-	
-	LDA $8A : CMP.b #$81 : BNE .catfish
-	
-	.zora
-    JML ItemSet_ZoraKing
-
-	.catfish
-    JML ItemSet_Catfish
-
-;--------------------------------------------------------------------------------
\ No newline at end of file
+	LDA.b $8A : CMP.b #$81 : BNE .catfish
+	        .zora
+                JML ItemSet_ZoraKing
+	        .catfish
+                JML ItemSet_Catfish
+;--------------------------------------------------------------------------------
diff --git a/clock.asm b/clock.asm
index 4e853d1..1f95a86 100644
--- a/clock.asm
+++ b/clock.asm
@@ -148,23 +148,23 @@ Clock_QuickStamp:
 		SEC ; indicate success
 		
 		.ready
-		%Clock_ReadBCD() : STA $00 ; seconds
-		%Clock_ReadBCD() : STA $01 ; minutes
-		%Clock_ReadBCD() : STA $02 ; hours
-		%Clock_ReadBCD() : STA $03 ; days
+		%Clock_ReadBCD() : STA.b Scrap00 ; seconds
+		%Clock_ReadBCD() : STA.b Scrap01 ; minutes
+		%Clock_ReadBCD() : STA.b Scrap02 ; hours
+		%Clock_ReadBCD() : STA.b Scrap03 ; days
 		
 		REP $20 ; set 16-bit accumulator
-		LDA $01 : AND #$00FF : %A_x60() ; convert minutes to seconds
-		STZ $01 : !ADD $00 : STA $00 ; store running total seconds to $00
+		LDA.b Scrap01 : AND.w #$00FF : %A_x60() ; convert minutes to seconds
+		STZ.b Scrap01 : !ADD Scrap00 : STA.b Scrap00 ; store running total seconds to $00
 
-		LDA $03 : AND #$00FF : %A_x24() ; convert days to hours
-		STZ $03 : !ADD $02 ; get total hours
+		LDA.b Scrap03 : AND.w #$00FF : %A_x24() ; convert days to hours
+		STZ.b Scrap03 : !ADD Scrap02 ; get total hours
 		%A_x60() ; get total minutes
 		
 		LDY #$60
 		JSL.l Multiply_A16Y8
-		STY $02 : STZ $03
-		!ADD $00 : BCC + : INC $02 : +
+		STY.b Scrap02 : STZ.b Scrap03
+		!ADD Scrap00 : BCC + : INC.b Scrap02 : +
 		
 	.done
 	PLP : PLX : PLA
@@ -183,18 +183,18 @@ RTL
 ;--------------------------------------------------------------------------------
 Multiply_A16Y8:
 	SEP #$20 ; set 8-bit accumulator
-	STY $4202
-	STA $4203
+	STY.w WRMPYA
+	STA.w WRMPYB
 	NOP #4
-	LDA $4216
-	LDY $4217
+	LDA.w RDMPYL
+	LDY.w RDMPYH
 	XBA
-	STA $4203
+	STA.w WRMPYB
 	NOP #2
 	TYA
 	CLC
-	ADC $4216
-	LDY $4217
+	ADC.w RDMPYL
+	LDY.w RDMPYH
 	BCC .carry_bit
 	INY
 .carry_bit:
@@ -230,19 +230,19 @@ Clock_GetTime:
 		SEC ; indicate success
 		
 		.ready
-		%Clock_ReadBCD() : STA $00 ; seconds
-		%Clock_ReadBCD() : STA $01 ; minutes
-		%Clock_ReadBCD() : STA $02 ; hours
-		%Clock_ReadBCD() : STA $03 ; days
-		LDA $002800 : STA $04 ; months
-		%Clock_ReadBCD() : STA $05 ; years
-		LDA $002800 : STA $06 ; century
+		%Clock_ReadBCD() : STA.b Scrap00 ; seconds
+		%Clock_ReadBCD() : STA.b Scrap01 ; minutes
+		%Clock_ReadBCD() : STA.b Scrap02 ; hours
+		%Clock_ReadBCD() : STA.b Scrap03 ; days
+		LDA $002800 : STA.b Scrap04 ; months
+		%Clock_ReadBCD() : STA.b Scrap05 ; years
+		LDA $002800 : STA.b Scrap06 ; century
 		
 		REP $20 ; set 16-bit accumulator
-		STA $06 : AND #$00FF : %A_x10() : %A_x10() : !ADD #1000 ; multiply century digit by 100 and add 1000
-		STZ $06 : !ADD $05 : STA $05 ; add lower 2 digits of the year and store
+		STA.b Scrap06 : AND #$00FF : %A_x10() : %A_x10() : !ADD #1000 ; multiply century digit by 100 and add 1000
+		STZ.b Scrap06 : !ADD Scrap05 : STA.b Scrap05 ; add lower 2 digits of the year and store
 		
 	.done
 	PLP : PLY : PLX : PLA
 RTL
-;--------------------------------------------------------------------------------
\ No newline at end of file
+;--------------------------------------------------------------------------------
diff --git a/compasses.asm b/compasses.asm
index 99622e2..7e5f1b7 100644
--- a/compasses.asm
+++ b/compasses.asm
@@ -1,9 +1,5 @@
-;--------------------------------------------------------------------------------
-; $7F5010 - Scratch Space
-;--------------------------------------------------------------------------------
-
 DrawDungeonCompassCounts:
-	LDX $1B : BNE + : RTL : + ; Skip if outdoors
+	LDX.b $1B : BNE + : RTL : + ; Skip if outdoors
 
 	; extra hard safeties for getting dungeon ID to prevent crashes
 	PHA
@@ -13,7 +9,7 @@ DrawDungeonCompassCounts:
 	CPX.b #$1B : BCS .done ; Skip if not in a valid dungeon ID
 
 	BIT.w #$0002 : BNE ++ ; if CompassMode==2, we don't check for the compass
-		LDA CompassField : AND.l DungeonItemMasks, X ; Load compass values to A, mask with dungeon item masks
+		LDA.l CompassField : AND.l DungeonItemMasks, X ; Load compass values to A, mask with dungeon item masks
 		BEQ .done ; skip if we don't have compass
 	++
 	
@@ -21,23 +17,23 @@ DrawDungeonCompassCounts:
         BNE +
                 INC
         +
-        LDA.l CompassTotalsWRAM, X : AND #$00FF
+        LDA.l CompassTotalsWRAM, X : AND.w #$00FF
         SEP #$20
 	JSR HudHexToDec2Digit
 	REP #$20
         PHX
-		LDX.b $06 : TXA : ORA #$2400 : STA $7EC79A
-		LDX.b $07 : TXA : ORA #$2400 : STA $7EC79C
+		LDX.b Scrap06 : TXA : ORA.w #$2400 : STA.l $7EC79A
+		LDX.b Scrap07 : TXA : ORA.w #$2400 : STA.l $7EC79C
 	PLX
 
-        LDA DungeonLocationsChecked, X : AND #$00FF
+        LDA.l DungeonLocationsChecked, X : AND.w #$00FF
 	SEP #$20
 	JSR HudHexToDec2Digit
 	REP #$20
-	LDX.b $06 : TXA : ORA #$2400 : STA $7EC794 ; Draw the item count
-	LDX.b $07 : TXA : ORA #$2400 : STA $7EC796
+	LDX.b Scrap06 : TXA : ORA.w #$2400 : STA.l $7EC794 ; Draw the item count
+	LDX.b Scrap07 : TXA : ORA.w #$2400 : STA.l $7EC796
 	
-	LDA.w #$2830 : STA $7EC798 ; draw the slash
+	LDA.w #$2830 : STA.l $7EC798 ; draw the slash
 
 	.done
 RTL
@@ -47,10 +43,10 @@ DungeonItemMasks: ; these are dungeon correlations to $7EF364 - $7EF369 so it kn
     dw $0080, $0040, $0020, $0010, $0008, $0004
 ;--------------------------------------------------------------------------------
 InitCompassTotalsRAM:
-        LDX #$00
+        LDX.b #$00
         -
-                LDA CompassTotalsROM, X : STA CompassTotalsWRAM, X
+                LDA.l CompassTotalsROM, X : STA.l CompassTotalsWRAM, X
                 INX
-                CPX #$0F : !BLT -
+                CPX.b #$0F : !BLT -
 RTL
 
diff --git a/compression.asm b/compression.asm
index 454e96a..d5f44ba 100644
--- a/compression.asm
+++ b/compression.asm
@@ -1,29 +1,29 @@
 ;--------------------------------------------------------------------------------
 ParadoxCaveGfxFix:
     ; Always upload line unless you're moving into paradox cave (0x0FF) from above (0x0EF)
-    LDA $1B : BEQ .uploadLine
-    LDX $A0 : CPX #$00FF : BNE .uploadLine
-    LDX $A2 : CPX #$00EF : BNE .uploadLine
+    LDA.b $1B : BEQ .uploadLine
+    LDX.b $A0 : CPX.w #$00FF : BNE .uploadLine
+    LDX.b $A2 : CPX.w #$00EF : BNE .uploadLine
 
     ;Ignore uploading four specific lines of tiles to VRAM
-    LDX $0118
+    LDX.w $0118
     ; Line 1
-    CPX #$1800 : BEQ .skipMostOfLine
+    CPX.w #$1800 : BEQ .skipMostOfLine
     ; Line 2
-    CPX #$1A00 : BEQ .skipMostOfLine
+    CPX.w #$1A00 : BEQ .skipMostOfLine
     ; Line 3
-    CPX #$1C00 : BEQ .uploadLine
+    CPX.w #$1C00 : BEQ .uploadLine
     ; Line 4
-    CPX #$1E00 : BEQ .uploadLine
+    CPX.w #$1E00 : BEQ .uploadLine
 
 .uploadLine
-    LDA.b #$01 : STA $420B
+    LDA.b #$01 : STA.w MDMAEN
 
 .skipLine
     RTL
 
 .skipMostOfLine
     ; Set line length to 192 bytes (the first 6 8x8 tiles in the line)
-    LDX.w #$00C0 : STX $4305
+    LDX.w #$00C0 : STX.w DAS0L
     BRA .uploadLine
 ;--------------------------------------------------------------------------------
diff --git a/controllerjank.asm b/controllerjank.asm
index b3ecf79..526b3fe 100644
--- a/controllerjank.asm
+++ b/controllerjank.asm
@@ -4,29 +4,28 @@
 ;--------------------------------------------------------------------------------
 ; Filtered Joypad 1 Register: [AXLR | ????]
 ; Filtered Joypad 1 Register: [BYST | udlr] [AXLR | ????]
-!INVERT_DPAD = "$7F50CB"
 
 InvertDPad:
 	LDA.l OneMindPlayerCount : BEQ .crowd_control
 
-	LDA.l !ONEMIND_ID
+	LDA.l OneMindId
 	AND.b #$03
 	TAX
 	LDA.l .onemind_controller_offset, X
 	TAX
 
-	LDA.w $4218,X : STA.w $00
-	LDA.w $4219,X : STA.w $01
+	LDA.w JOY1L,X : STA.w Scrap00
+	LDA.w JOY1H,X : STA.w Scrap01
 
-	LDA #$80 : STA $4201 ; reset this so latch can read it, otherwise RNG breaks
+	LDA.b #$80 : STA.w WRIO ; reset this so latch can read it, otherwise RNG breaks
 
 	JML.l InvertDPadReturn
 
 .crowd_control
-	LDA !INVERT_DPAD : BNE +
+	LDA.l DPadInverter : BNE +
 
-	LDA $4218 : STA $00
-	LDA $4219 : STA $01
+	LDA.w JOY1L : STA.b Scrap00
+	LDA.w JOY1H : STA.b Scrap01
 	JML.l InvertDPadReturn
 
 +	DEC : BEQ .dpadOnly
@@ -34,47 +33,47 @@ InvertDPad:
 	DEC : BEQ .invertBoth
 	.swapSides
 	REP #$20 ; set 16-bit accumulator
-	LDA $4218
+	LDA.w JOY1L
 		BIT.w #$0840 : BEQ + : EOR.w #$0840 : + ; swap X/up
 		BIT.w #$0180 : BEQ + : EOR.w #$0180 : + ; swap A/right
 		BIT.w #$4200 : BEQ + : EOR.w #$4200 : + ; swap Y/left
 		BIT.w #$8400 : BEQ + : EOR.w #$8400 : + ; swap B/down
-	STA $00
+	STA.b Scrap00
 	SEP #$20 ; set 8-bit accumulator
 JML.l InvertDPadReturn
 	.invertBoth
 	REP #$20 ; set 16-bit accumulator
-	LDA $4218
+	LDA.w JOY1L
 		BIT.w #$8040 : BEQ + : EOR.w #$8040 : + ; swap X/B
 		BIT.w #$4080 : BEQ + : EOR.w #$4080 : + ; swap Y/A
 		BIT.w #$0C00 : BEQ + : EOR.w #$0C00 : + ; swap up/down
 		BIT.w #$0300 : BEQ + : EOR.w #$0300 : + ; swap left/right
-	STA $00
+	STA.b Scrap00
 	SEP #$20 ; set 8-bit accumulator
 JML.l InvertDPadReturn
 	.buttonsOnly
 	REP #$20 ; set 16-bit accumulator
-	LDA $4218
+	LDA.w JOY1L
 		BIT.w #$8040 : BEQ + : EOR.w #$8040 : + ; swap X/B
 		BIT.w #$4080 : BEQ + : EOR.w #$4080 : + ; swap Y/A
-	STA $00
+	STA.b Scrap00
 	SEP #$20 ; set 8-bit accumulator
 JML.l InvertDPadReturn
 	.dpadOnly
-	LDA $4218 : STA $00
-	LDA $4219 
+	LDA.w JOY1L : STA.b Scrap00
+	LDA.w JOY1H 
 		BIT.b #$0C : BEQ + : EOR.b #$0C : + ; swap up/down
 		BIT.b #$03 : BEQ + : EOR.b #$03 : + ; swap left/right
-	STA $01
+	STA.b Scrap01
 JML.l InvertDPadReturn
 
 .onemind_controller_offset
-	db 0 ; player 0 - $4218 - joy1d1
-	db 0 ; player 1 - $4218 - joy1d1
-	db 2 ; player 2 - $421A - joy2d1
-	db 6 ; player 3 - $421E - joy2d2
-	db 2 ; player 4 - $421A - joy2d1
-	db 6 ; player 5 - $421E - joy2d2
+	db 0 ; player 0 - JOY1L - joy1d1
+	db 0 ; player 1 - JOY1L - joy1d1
+	db 2 ; player 2 - JOY2L - joy2d1
+	db 6 ; player 3 - JOY4L - joy2d2
+	db 2 ; player 4 - JOY2L - joy2d1
+	db 6 ; player 5 - JOY4L - joy2d2
 
 
 
@@ -86,12 +85,12 @@ HandleOneMindController:
 
 	REP #$20
 
-	LDA.l !ONEMIND_TIMER
+	LDA.l OneMindTimerRAM
 	DEC
 	BPL .no_switch
 
 	SEP #$20
-	LDA.l !ONEMIND_ID
+	LDA.l OneMindId
 	INC
 	CMP.l OneMindPlayerCount
 	BCC .no_wrap
@@ -99,21 +98,21 @@ HandleOneMindController:
 	LDA.b #$01 ; reset to player 1
 
 .no_wrap
-	STA.l !ONEMIND_ID
+	STA.l OneMindId
 
 	REP #$20
-	LDA.l OneMindTimer
+	LDA.l OneMindTimerInit
 
 .no_switch
-	STA.l !ONEMIND_TIMER
+	STA.l OneMindTimerRAM
 
 	SEP #$20
-	LDA.l !ONEMIND_ID
+	LDA.l OneMindId
 
 	CMP.b #$04 ; is it player 4 or 5?
 	BCC .no_multitap_switch
 
-	STZ.w $4201
+	STZ.w WRIO
 
 .no_multitap_switch
 
diff --git a/crypto.asm b/crypto.asm
index 120344f..d1c65bb 100644
--- a/crypto.asm
+++ b/crypto.asm
@@ -1,21 +1,6 @@
-; $7F50D0 - $7F50FF - Block Cypher Parameters
-; $7F5100 - $7F51FF - Block Cypher Buffer
-!v = "$7F5100"
-!n = "$04"
-!MXResult = "$08" ; an alternate name for the lower 32 bits of dpScratch
-!dpScratch = "$08"
-!keyBase = "$7F50D0"
-
-
-!y = "$7F50E0"
-!z = "$7F50E4"
-!sum = "$7F50E8"
-
-!p = "$7F50EC"
-!rounds = "$06"
-!e = "$7F50F0"
-
-!upperScratch = "$7F50F2"
+; Scrap04 used for n
+; Scrap06 used for rounds
+; Scrap08 use for dpScratch/MXResult (lower 32 of dpScratch)
 
 CryptoDelta:
 dd #$9e3779b9
@@ -53,146 +38,140 @@ CryptoMX:
 	PHX
 
 	; upperScratch = (z>>5 ^ y <<2)
-	LDA.w !z : STA.b !dpScratch
-	LDA.w !z+2 : STA.b !dpScratch+2
-	%LSR32Single(!dpScratch)
-	%LSR32Single(!dpScratch)
-	%LSR32Single(!dpScratch)
-	%LSR32Single(!dpScratch)
-	%LSR32Single(!dpScratch)
-	;%LSR32(!dpScratch,#$05)
+	LDA.w z : STA.b Scrap08
+	LDA.w z+2 : STA.b Scrap08+2
+	%LSR32Single(Scrap08)
+	%LSR32Single(Scrap08)
+	%LSR32Single(Scrap08)
+	%LSR32Single(Scrap08)
+	%LSR32Single(Scrap08)
+	;%LSR32(Scrap08,#$05)
 
-	LDA.w !y : STA.b !dpScratch+4
-	LDA.w !y+2 : STA.b !dpScratch+6
-	%ASL32Single(!dpScratch+4)
-	%ASL32Single(!dpScratch+4)
-	;%ASL32(!dpScratch+4,#$02)
+	LDA.w y : STA.b Scrap08+4
+	LDA.w y+2 : STA.b Scrap08+6
+	%ASL32Single(Scrap08+4)
+	%ASL32Single(Scrap08+4)
+	;%ASL32(Scrap08+4,#$02)
 
-	LDA.b !dpScratch : EOR.b !dpScratch+4 : STA.w !upperScratch
-	LDA.b !dpScratch+2 : EOR.b !dpScratch+6 : STA.w !upperScratch+2
+	LDA.b Scrap08 : EOR.b Scrap08+4 : STA.w CryptoScratch
+	LDA.b Scrap08+2 : EOR.b Scrap08+6 : STA.w CryptoScratch+2
 
 	;================================
 	; upperscratch2 = (y>>3^z<<4)
 
-	LDA.w !z : STA.b !dpScratch
-	LDA.w !z+2 : STA.b !dpScratch+2
-	%ASL32Single(!dpScratch)
-	%ASL32Single(!dpScratch)
-	%ASL32Single(!dpScratch)
-	%ASL32Single(!dpScratch)
-	;%ASL32(!dpScratch,#$04)
+	LDA.w z : STA.b Scrap08
+	LDA.w z+2 : STA.b Scrap08+2
+	%ASL32Single(Scrap08)
+	%ASL32Single(Scrap08)
+	%ASL32Single(Scrap08)
+	%ASL32Single(Scrap08)
+	;%ASL32(Scrap08,#$04)
 
-	LDA.w !y : STA.b !dpScratch+4
-	LDA.w !y+2 : STA.b !dpScratch+6
-	%LSR32Single(!dpScratch+4)
-	%LSR32Single(!dpScratch+4)
-	%LSR32Single(!dpScratch+4)
-	;%LSR32(!dpScratch+4,#$03)
+	LDA.w y : STA.b Scrap08+4
+	LDA.w y+2 : STA.b Scrap08+6
+	%LSR32Single(Scrap08+4)
+	%LSR32Single(Scrap08+4)
+	%LSR32Single(Scrap08+4)
+	;%LSR32(Scrap08+4,#$03)
 
-	LDA.b !dpScratch : EOR.b !dpScratch+4 : STA.w !upperScratch+4
-	LDA.b !dpScratch+2 : EOR.b !dpScratch+6 : STA.w !upperScratch+6
+	LDA.b Scrap08 : EOR.b Scrap08+4 : STA.w CryptoScratch+4
+	LDA.b Scrap08+2 : EOR.b Scrap08+6 : STA.w CryptoScratch+6
 
 	;================================
 	; upperscratch = upperscratch + upperscratch2 ( == (z>>5^y<<2) + (y>>3^z<<4) )
 
-	LDA.w !upperScratch : !ADD.w !upperScratch+4 : STA.w !upperScratch
-	LDA.w !upperScratch+2 : ADC.w !upperScratch+6 : STA.w !upperScratch+2
+	LDA.w CryptoScratch : !ADD.w CryptoScratch+4 : STA.w CryptoScratch
+	LDA.w CryptoScratch+2 : ADC.w CryptoScratch+6 : STA.w CryptoScratch+2
 
 	;================================
 	; dpscratch = sum^y
 
-	LDA.w !sum : EOR.w !y : STA.b !dpScratch
-	LDA.w !sum+2 : EOR.w !y+2 : STA.b !dpScratch+2
+	LDA.w Sum : EOR.w y : STA.b Scrap08
+	LDA.w Sum+2 : EOR.w y+2 : STA.b Scrap08+2
 
 	;================================
 	; dpscratch2 =  (k[p&3^e]^z)
 
-	LDA.w !p : AND.w #$0003 : EOR.w !e : ASL #2 : TAX ; put (p&3)^e into X
-	LDA.w !keyBase, X : EOR.w !z : STA.b !dpScratch+4
-	LDA.w !keyBase+2, X : EOR.w !z+2 : STA.b !dpScratch+6
+	LDA.w p : AND.w #$0003 : EOR.w e : ASL #2 : TAX ; put (p&3)^e into X
+	LDA.w KeyBase, X : EOR.w z : STA.b Scrap08+4
+	LDA.w KeyBase+2, X : EOR.w z+2 : STA.b Scrap08+6
 
 	;================================
 	; upperscratch2 =  dpscratch + dpscratch2 (== (sum^y) + (k[p&3^e]^z))
-	LDA.b !dpScratch : !ADD.b !dpScratch+4 : STA.w !upperScratch+4
-	LDA.b !dpScratch+2 : ADC.b !dpScratch+6 : STA.w !upperScratch+6
+	LDA.b Scrap08 : !ADD.b Scrap08+4 : STA.w CryptoScratch+4
+	LDA.b Scrap08+2 : ADC.b Scrap08+6 : STA.w CryptoScratch+6
 
 	;================================
 	; MXResult = uppserscratch ^ upperscratch2
 
-	LDA.w !upperScratch : EOR.w !upperScratch+4 : STA.b !MXResult
-	LDA.w !upperScratch+2 : EOR.w !upperScratch+6 : STA.b !MXResult+2
+	LDA.w CryptoScratch : EOR.w CryptoScratch+4 : STA.b Scrap08
+	LDA.w CryptoScratch+2 : EOR.w CryptoScratch+6 : STA.b Scrap08+2
 	PLX
 RTS
 
-;!DIVIDEND_LOW = $4204
-;!DIVIDEND_HIGH = $4205
-;!DIVISOR = $4206
-;!QUOTIENT_LOW = $4214
-;!QUOTIENT_HIGH = $4215
-
 XXTEA_Decode:
 	PHP : PHB
 		SEP #$30 ; set 8-bit accumulator and index
 
 		LDA.b #$7F : PHA : PLB
 
-		STZ.b !n+1 ; set upper byte of n to be zero, so it can safely be accessed in 16-bit mode
+		STZ.b Scrap04+1 ; set upper byte of n to be zero, so it can safely be accessed in 16-bit mode
 
 		; search for lookup table index to avoid division and multiplication
 		LDX.b #0
 		-
 			LDA.l .n_lookup, X
-			CMP.b !n : !BLT +
+			CMP.b Scrap04 : !BLT +
 			INX
 			BRA -
 		+
 		; rounds = 6 + 52/n;
-		LDA.l .round_counts, X : STA.b !rounds : STZ.b !rounds+1
+		LDA.l .round_counts, X : STA.b Scrap06 : STZ.b Scrap06+1
 
 		REP #$20 ; set 16-bit accumulator
 
 		; sum = rounds*DELTA;
 		TXA : ASL #2 : TAX
-		LDA.l .initial_sums, X : STA.w !sum
-		LDA.l .initial_sums+2, X : STA.w !sum+2
+		LDA.l .initial_sums, X : STA.w Sum
+		LDA.l .initial_sums+2, X : STA.w Sum+2
 
 		; y = v[0];
-		LDA.w !v : STA.w !y
-		LDA.w !v+2 : STA.w !y+2
+		LDA.w v : STA.w y
+		LDA.w v+2 : STA.w y+2
 		---
-			LDA.w !sum : LSR #2 : AND.w #$0003 : STA.w !e ; e = (sum >> 2) & 3;
+			LDA.w Sum : LSR #2 : AND.w #$0003 : STA.w e ; e = (sum >> 2) & 3;
 
-			LDA.b !n : DEC : STA.w !p
+			LDA.b Scrap04 : DEC : STA.w p
 			-- BEQ + ; for (p=n-1; p>0; p--) {
 				; z = v[p-1];
 				ASL #2 : TAX
-				LDA.w !v-4, X : STA.w !z
-				LDA.w !v-4+2, X : STA.w !z+2
+				LDA.w v-4, X : STA.w z
+				LDA.w v-4+2, X : STA.w z+2
 
 				; y = v[p] -= MX;
 				JSR CryptoMX
-				LDA.w !p : ASL #2 : TAX
-				LDA.w !v, X : !SUB.b !MXResult : STA.w !v, X : STA.w !y
-				LDA.w !v+2, X : SBC.b !MXResult+2 : STA.w !v+2, X : STA.w !y+2
+				LDA.w p : ASL #2 : TAX
+				LDA.w v, X : !SUB.b Scrap08 : STA.w v, X : STA.w y
+				LDA.w v+2, X : SBC.b Scrap08+2 : STA.w v+2, X : STA.w y+2
 
-			LDA.w !p : DEC : STA.w !p : BRA -- ; }
+			LDA.w p : DEC : STA.w p : BRA -- ; }
 			+
 
 			; z = v[n-1];
-			LDA.b !n : DEC : ASL #2 : TAX
-			LDA.w !v, X : STA.w !z
-			LDA.w !v+2, X : STA.w !z+2
+			LDA.b Scrap04 : DEC : ASL #2 : TAX
+			LDA.w v, X : STA.w z
+			LDA.w v+2, X : STA.w z+2
 
 			; y = v[0] -= MX;
 			JSR CryptoMX
-			LDA.w !v : !SUB.b !MXResult : STA.w !v : STA.w !y
-			LDA.w !v+2 : SBC.b !MXResult+2 : STA.w !v+2 : STA.w !y+2
+			LDA.w v : !SUB.b Scrap08 : STA.w v : STA.w y
+			LDA.w v+2 : SBC.b Scrap08+2 : STA.w v+2 : STA.w y+2
 
 			; sum -= DELTA;
-			LDA.w !sum : !SUB.l CryptoDelta : STA.w !sum
-			LDA.w !sum+2 : SBC.l CryptoDelta+2 : STA.w !sum+2
+			LDA.w Sum : !SUB.l CryptoDelta : STA.w Sum
+			LDA.w Sum+2 : SBC.l CryptoDelta+2 : STA.w Sum+2
 
-		DEC !rounds : BEQ + : JMP --- : + ; } while (--rounds);
+		DEC.b Scrap06 : BEQ + : JMP --- : + ; } while (--rounds);
 	PLB : PLP
 RTL
 
diff --git a/cuccostorm.asm b/cuccostorm.asm
index 2d40f39..8b89eac 100644
--- a/cuccostorm.asm
+++ b/cuccostorm.asm
@@ -1,49 +1,35 @@
 ;================================================================================
-!CUCCO_STORM = "$7F50C5"
-!IS_INDOORS = "$7E001B"
-!ENEMY_STATE_TABLE = "$7E0DD0"
-!ENEMY_TYPE_TABLE = "$7E0E20"
-!ENEMY_AUX1_TABLE = "$7E0DA0"
-!ENEMY_AUX2_TABLE = "$7E0DB0"
-!ENEMY_DIRECTION_TABLE = "$7E0EB0"
-!CUCCO = "#$0B"
-!INERT = "#$00"
-!INIT = "#$08"
-!ALIVE = "#$09"
-!CUCCO_ENRAGED = "#$23"
-!LINK_POS_Y_LOW = "$20"
-!LINK_POS_Y_HIGH = "$21"
-!LINK_POS_X_LOW = "$22"
-!LINK_POS_X_HIGH = "$23"
-!ENEMY_POS_Y_LOW = "$7E0D00"
-!ENEMY_POS_X_LOW = "$7E0D10"
-!ENEMY_POS_Y_HIGH = "$7E0D20"
-!ENEMY_POS_X_HIGH = "$7E0D30"
+!CUCCO = $0B
+!INERT = $00
+!INIT = $08
+!ALIVE = $09
+!CUCCO_ENRAGED = $23
+
 CuccoStorm:
-	
+
 	SEP #$30 ; set 8-bit accumulator index registers
-	LDA.l !CUCCO_STORM : BEQ + ; only if storm is on
+	LDA.l CuccoStormer : BEQ + ; only if storm is on
 	LDA.b $10 : CMP.b #$09 : BNE + ; only if outdoors
 	LDA.l LoopFrames : AND.b #$7F : BNE + ; check every 128 frames
-	
+
 	-
 		;==== Find a Cucco
-		
+
 		LDY.b #$FF : PHY ; push "cucco not found"
-	
+
 		LDX.b #$00 : -- : CPX.b #$10 : !BGE .ldone
-			LDA.w !ENEMY_STATE_TABLE, X : CMP.b !ALIVE : BEQ +++
+			LDA.w SpriteAITable, X : CMP.b #!ALIVE : BEQ +++
 				; enemy not found
-				CMP.b !INERT : BNE ++
+				CMP.b #!INERT : BNE ++
 					; log inert enemy slot
 					PLA : PHX
 					BRA ++
 			+++
 			; found an enemy
-			LDA.l !ENEMY_TYPE_TABLE, X : CMP.b !CUCCO : BNE ++
+			LDA.l SpriteTypeTable, X : CMP.b #!CUCCO : BNE ++
 				; it's a cucco
 				TXY ; record where we found the living cucco in case we don't find any angry ones
-				LDA.w !ENEMY_AUX1_TABLE, X : CMP.b !CUCCO_ENRAGED : !BLT ++
+				LDA.w SpriteAuxTable, X : CMP.b #!CUCCO_ENRAGED : !BLT ++
 					PLA : BRA + ; we found an angry cucco, done
 		++ : INX : BRA -- : .ldone
 		
@@ -53,22 +39,22 @@ CuccoStorm:
 			; we didn't find a cucco, so try to create one
 			PLY
 			CPY.b #$FF : BEQ + ; fail if no slots found
-			LDA.b !CUCCO : STA.w !ENEMY_TYPE_TABLE, Y
-			LDA.b !INIT : STA.w !ENEMY_STATE_TABLE, Y
-			LDA.b !LINK_POS_Y_LOW : STA.w !ENEMY_POS_Y_LOW, Y
-			LDA.b !LINK_POS_Y_HIGH : STA.w !ENEMY_POS_Y_HIGH, Y
-			LDA.b !LINK_POS_X_LOW : STA.w !ENEMY_POS_X_LOW, Y
-			LDA.b !LINK_POS_X_HIGH : STA.w !ENEMY_POS_X_HIGH, Y
+			LDA.b #!CUCCO : STA.w SpriteTypeTable, Y
+			LDA.b #!INIT : STA.w SpriteAITable, Y
+			LDA.b LinkPosY : STA.w SpritePosYLow, Y
+			LDA.b LinkPosY+1 : STA.w SpritePosYHigh, Y
+			LDA.b LinkPosX : STA.w SpritePosXLow, Y
+			LDA.b LinkPosX+1 : STA.w SpritePosXHigh, Y
 			BRA +++
 		++
 			PLA
 		+++
-		
+
 		;==== Enrage a Cucco
-		
-		LDA.b !CUCCO_ENRAGED : STA.w !ENEMY_AUX1_TABLE, Y ; enrage the cucco
-		LDA.b #$00 : STA.w !ENEMY_AUX2_TABLE, Y : STA.w !ENEMY_DIRECTION_TABLE, Y
-		
+
+		LDA.b #!CUCCO_ENRAGED : STA.w SpriteAuxTable, Y ; enrage the cucco
+		LDA.b #$00 : STA.w SpriteAuxTable+$10, Y : STA.w SpriteDirectionTable, Y
+
 		;====
 	+
 RTL
diff --git a/darkworldspawn.asm b/darkworldspawn.asm
index f83a094..579444e 100644
--- a/darkworldspawn.asm
+++ b/darkworldspawn.asm
@@ -7,55 +7,55 @@ DarkWorldSaveFix:
 	JML.l StatSaveCounter
 ;--------------------------------------------------------------------------------
 DoWorldFix:
-	LDA InvertedMode : BEQ +
+	LDA.l InvertedMode : BEQ +
 		JMP DoWorldFix_Inverted
 	+
 	LDA.l Bugfix_MirrorlessSQToLW : BEQ .skip_mirror_check
-                LDA.l FollowerIndicator : CMP #$04 : BEQ .setLightWorld ; check if old man is following
-		LDA MirrorEquipment : BEQ .noMirror ; check if we have the mirror
+                LDA.l FollowerIndicator : CMP.b #$04 : BEQ .setLightWorld ; check if old man is following
+		LDA.l MirrorEquipment : BEQ .noMirror ; check if we have the mirror
 	.skip_mirror_check ; alt entrance point
-	LDA ProgressIndicator : CMP.b #$03 : BCS .done ; check if agahnim 1 is alive
+	LDA.l ProgressIndicator : CMP.b #$03 : BCS .done ; check if agahnim 1 is alive
         .setLightWorld
-	LDA #$00
+	LDA.b #$00
 	.noMirror
-	STA CurrentWorld ; set flag to light world
-	LDA FollowerIndicator : CMP #$07 : BNE .done : INC : STA FollowerIndicator ; convert frog to dwarf
+	STA.l CurrentWorld ; set flag to light world
+	LDA.l FollowerIndicator : CMP.b #$07 : BNE .done : INC : STA.l FollowerIndicator ; convert frog to dwarf
 	.done
 RTL
 ;--------------------------------------------------------------------------------
 SetDeathWorldChecked:
-	LDA InvertedMode : BEQ +
+	LDA.l InvertedMode : BEQ +
 		JMP SetDeathWorldChecked_Inverted
 	+
-	LDA $1B : BEQ .outdoors
-		LDA $040C : CMP #$FF : BNE .dungeon
-		LDA $A0 : ORA $A1 : BNE ++
-			LDA GanonPyramidRespawn : BNE .pyramid ; if flag is set, force respawn at pyramid on death to ganon
+	LDA.b $1B : BEQ .outdoors
+		LDA.w $040C : CMP #$FF : BNE .dungeon
+		LDA.b $A0 : ORA.b $A1 : BNE ++
+			LDA.l GanonPyramidRespawn : BNE .pyramid ; if flag is set, force respawn at pyramid on death to ganon
 	    ++
 	.outdoors
 JMP DoWorldFix
 
 	.dungeon
-	LDA Bugfix_PreAgaDWDungeonDeathToFakeDW : BNE .done ; if the bugfix is enabled, we do nothing on death in dungeon
+	LDA.l Bugfix_PreAgaDWDungeonDeathToFakeDW : BNE .done ; if the bugfix is enabled, we do nothing on death in dungeon
 JMP DoWorldFix_skip_mirror_check
 
 	.pyramid
-	LDA #$40 : STA CurrentWorld ; set flag to dark world
-	LDA FollowerIndicator : CMP #$08 : BNE .done : DEC : STA FollowerIndicator : + ; convert dwarf to frog
+	LDA.b #$40 : STA.l CurrentWorld ; set flag to dark world
+	LDA.l FollowerIndicator : CMP.b #$08 : BNE .done : DEC : STA.l FollowerIndicator : + ; convert dwarf to frog
 	.done
 RTL
 ;================================================================================
 DoWorldFix_Inverted:
 	LDA.l Bugfix_MirrorlessSQToLW : BEQ .skip_mirror_check
-                LDA.l FollowerIndicator : CMP #$04 : BEQ .setDarkWorld ; check if old man is following
-		LDA MirrorEquipment : BEQ .setDarkWorld ; check if we have the mirror
+                LDA.l FollowerIndicator : CMP.b #$04 : BEQ .setDarkWorld ; check if old man is following
+		LDA.l MirrorEquipment : BEQ .setDarkWorld ; check if we have the mirror
 	.skip_mirror_check ; alt entrance point
-	LDA ProgressIndicator : CMP.b #$03 : BCS .done ; check if agahnim 1 is alive
+	LDA.l ProgressIndicator : CMP.b #$03 : BCS .done ; check if agahnim 1 is alive
         .setDarkWorld
-	LDA #$40 : STA CurrentWorld ; set flag to dark world
-	LDA FollowerIndicator
-	CMP #$07 : BEQ .clear ; clear frog
-	CMP #$08 : BEQ .clear ; clear dwarf - consider flute implications
+	LDA.b #$40 : STA CurrentWorld ; set flag to dark world
+	LDA.l FollowerIndicator
+	CMP.b #$07 : BEQ .clear ; clear frog
+	CMP.b #$08 : BEQ .clear ; clear dwarf - consider flute implications
 	BRA .done
 	.clear
 	LDA.b #$00 : STA FollowerIndicator ; clear follower
@@ -63,21 +63,21 @@ DoWorldFix_Inverted:
 RTL
 ;--------------------------------------------------------------------------------
 SetDeathWorldChecked_Inverted:
-	LDA $1B : BEQ .outdoors
-		LDA $040C : CMP #$FF : BNE .dungeon
-		LDA $A0 : ORA $A1 : BNE ++
-			LDA GanonPyramidRespawn : BNE .castle ; if flag is set, force respawn at pyramid on death to ganon
+	LDA.b $1B : BEQ .outdoors
+		LDA.w $040C : CMP #$FF : BNE .dungeon
+		LDA.b $A0 : ORA $A1 : BNE ++
+			LDA.l GanonPyramidRespawn : BNE .castle ; if flag is set, force respawn at pyramid on death to ganon
 		++
 	.outdoors
 JMP DoWorldFix
 
 	.dungeon
-	LDA Bugfix_PreAgaDWDungeonDeathToFakeDW : BNE .done ; if the bugfix is enabled, we do nothing on death in dungeon
+	LDA.l Bugfix_PreAgaDWDungeonDeathToFakeDW : BNE .done ; if the bugfix is enabled, we do nothing on death in dungeon
 JMP DoWorldFix_Inverted_skip_mirror_check
 
 	.castle
-	LDA #$00 : STA CurrentWorld ; set flag to dark world
-	LDA FollowerIndicator : CMP #$07 : BNE + : LDA.b #$08 : STA FollowerIndicator : + ; convert frog to dwarf
+	LDA.b #$00 : STA.l CurrentWorld ; set flag to dark world
+	LDA.l FollowerIndicator : CMP.b #$07 : BNE + : LDA.b #$08 : STA FollowerIndicator : + ; convert frog to dwarf
 	.done
 RTL
 ;================================================================================
@@ -85,20 +85,20 @@ RTL
 
 ;--------------------------------------------------------------------------------
 FakeWorldFix:
-	LDA FixFakeWorld : BEQ +
-		LDA $8A : AND.b #$40 : STA CurrentWorld
+	LDA.l FixFakeWorld : BEQ +
+		LDA.b $8A : AND.b #$40 : STA.l CurrentWorld
 	+
 RTL
 ;--------------------------------------------------------------------------------
 MasterSwordFollowerClear:
-	LDA FollowerIndicator
-	CMP #$0E : BNE .exit ; clear master sword follower
-	LDA.b #$00 : STA FollowerIndicator ; clear follower
+	LDA.l FollowerIndicator
+	CMP.b #$0E : BNE .exit ; clear master sword follower
+	LDA.b #$00 : STA.l FollowerIndicator ; clear follower
 .exit
 	RTL
 ;--------------------------------------------------------------------------------
 FixAgahnimFollowers:
-	LDA.b #$00 : STA FollowerIndicator ; clear follower
+	LDA.b #$00 : STA.l FollowerIndicator ; clear follower
 	JML PrepDungeonExit ; thing we wrote over
 
 ;--------------------------------------------------------------------------------
@@ -108,10 +108,10 @@ macro SetMinimum(base,filler,compare)
 	?done:
 endmacro
 RefreshRainAmmo:
-	LDA ProgressIndicator : CMP.b #$01 : BEQ .rain ; check if we're in rain state
+	LDA.l ProgressIndicator : CMP.b #$01 : BEQ .rain ; check if we're in rain state
 	RTL
 	.rain
-		LDA StartingEntrance
+		LDA.l StartingEntrance
 		+ CMP.b #$03 : BNE + ; Uncle
 			%SetMinimum(CurrentMagic,MagicFiller,RainDeathRefillMagic_Uncle)
 			%SetMinimum(BombsEquipment,BombsFiller,RainDeathRefillBombs_Uncle)
@@ -130,27 +130,25 @@ RefreshRainAmmo:
 	.done
 RTL
 ;--------------------------------------------------------------------------------
-!INFINITE_ARROWS = "$7F50C8"
-!INFINITE_MAGIC = "$7F50CA"
 SetEscapeAssist:
-	LDA ProgressIndicator : CMP.b #$01 : BNE .no_train ; check if we're in rain state
+	LDA.l ProgressIndicator : CMP.b #$01 : BNE .no_train ; check if we're in rain state
 	.rain
 		LDA.l EscapeAssist
-		BIT.b #$04 : BEQ + : STA !INFINITE_MAGIC : +
-		BIT.b #$02 : BEQ + : STA InfiniteBombs : +
-		BIT.b #$01 : BEQ + : STA !INFINITE_ARROWS : +
+		BIT.b #$04 : BEQ + : STA.l InfiniteArrows : +
+		BIT.b #$02 : BEQ + : STA.l InfiniteBombs : +
+		BIT.b #$01 : BEQ + : STA.l InfiniteArrows : +
 		BRA ++
 	.no_train ; choo choo
-		LDA.l EscapeAssist : BIT.b #$04 : BEQ + : LDA.b #$00 : STA !INFINITE_MAGIC : +
-		LDA.l EscapeAssist : BIT.b #$02 : BEQ + : LDA.b #$00 : STA InfiniteBombs : +
-		LDA.l EscapeAssist : BIT.b #$01 : BEQ + : LDA.b #$00 : STA !INFINITE_ARROWS : +
+		LDA.l EscapeAssist : BIT.b #$04 : BEQ + : LDA.b #$00 : STA.l InfiniteMagic : +
+		LDA.l EscapeAssist : BIT.b #$02 : BEQ + : LDA.b #$00 : STA.l InfiniteBombs : +
+		LDA.l EscapeAssist : BIT.b #$01 : BEQ + : LDA.b #$00 : STA.l InfiniteArrows : +
 	++
 RTL
 ;--------------------------------------------------------------------------------
 SetSilverBowMode:
-	LDA SilverArrowsUseRestriction : BEQ + ; fix bow type for restricted arrow mode
-		LDA BowEquipment : CMP.b #$3 : BCC +
-		SBC.b #$02 : STA BowEquipment
+	LDA.l SilverArrowsUseRestriction : BEQ + ; fix bow type for restricted arrow mode
+		LDA.l BowEquipment : CMP.b #$3 : BCC +
+		SBC.b #$02 : STA.l BowEquipment
 	+
 RTL
 ;================================================================================
diff --git a/decryption.asm b/decryption.asm
index 71d1a92..2c590f5 100644
--- a/decryption.asm
+++ b/decryption.asm
@@ -1,13 +1,10 @@
 
-!CryptoBuffer = "$7F5100"
-;!keyBase = "$7F50D0"
-
 ;--------------------------------------------------------------------------------
 LoadStaticDecryptionKey:
 	PHB : PHA : PHX : PHY : PHP
 	REP #$30 ; set 16-bit accumulator & index registers
 	LDX.w #StaticDecryptionKey  ; Source
-	LDY.w #!keyBase             ; Target
+	LDY.w #KeyBase             ; Target
 	LDA.w #$000F                ; Length
 	MVN $307F
 
@@ -23,65 +20,63 @@ RetrieveValueFromEncryptedTable:
 ;Returns result in A
 	PHX : PHY
 		PHA
-			LDY $04 : PHY : LDY $06 : PHY : LDY $08 : PHY
-			LDY $0A : PHY : LDY $0C : PHY : LDY $0E : PHY
+			LDY.b Scrap04 : PHY : LDY.b Scrap06 : PHY : LDY.b Scrap08 : PHY
+			LDY.b Scrap0A : PHY : LDY.b Scrap0C : PHY : LDY.b Scrap0E : PHY
 
 				AND.w #$FFF8 : TAY
-				LDA [$00], Y : STA.l !CryptoBuffer : INY #2
-				LDA [$00], Y : STA.l !CryptoBuffer+2 : INY #2
-				LDA [$00], Y : STA.l !CryptoBuffer+4 : INY #2
-				LDA [$00], Y : STA.l !CryptoBuffer+6
+				LDA.b [$00], Y : STA.l CryptoBuffer : INY #2
+				LDA.b [$00], Y : STA.l CryptoBuffer+2 : INY #2
+				LDA.b [$00], Y : STA.l CryptoBuffer+4 : INY #2
+				LDA.b [$00], Y : STA.l CryptoBuffer+6
 
-				LDA.w #$0002 : STA $04 ;set block size
+				LDA.w #$0002 : STA.b Scrap04 ;set block size
 
 				JSL.l XXTEA_Decode
 
-			PLA : STA $0E : PLA : STA $0C : PLA : STA $0A
-			PLA : STA $08 : PLA : STA $06 : PLA : STA $04
+			PLA : STA.b Scrap0E : PLA : STA.b Scrap0C : PLA : STA.b Scrap0A
+			PLA : STA.b Scrap08 : PLA : STA.b Scrap06 : PLA : STA.b Scrap04
 		PLA : AND.w #$0007 : TAX
-		LDA.l !CryptoBuffer, X
+		LDA.l CryptoBuffer, X
 		PHA
 			LDA.w #$0000
-			STA.l !CryptoBuffer
-			STA.l !CryptoBuffer+2
-			STA.l !CryptoBuffer+4
-			STA.l !CryptoBuffer+6
+			STA.l CryptoBuffer
+			STA.l CryptoBuffer+2
+			STA.l CryptoBuffer+4
+			STA.l CryptoBuffer+6
 		PLA
 	PLY : PLX
 RTL
 ;--------------------------------------------------------------------------------
-
-!ChestData = "$01E96C"
-!ChestData_Payload = "$1EABC" ; !ChestData+$0150
-
+ChestData = $01E96C
+ChestDataPayload = $01EABC ; ChestData+$0150
 ;--------------------------------------------------------------------------------
 GetChestData:
 	LDA.l IsEncrypted : BNE .encrypted
-		INC $0E : LDX.w #$FFFD ; what we wrote over
+		INC.b Scrap0E : LDX.w #$FFFD ; what we wrote over
 JML.l Dungeon_OpenKeyedObject_nextChest
 
 .encrypted
-		INC $0E : LDX.w #$FFFE
+		INC.b Scrap0E : LDX.w #$FFFE
 
 	.nextChest
 
 	INX #2 : CPX.w #$0150 : BEQ .couldntFindChest
-	LDA !ChestData, X : AND.w #$7FFF : CMP $A0 : BNE .nextChest
+	LDA.l ChestData, X : AND.w #$7FFF : CMP.b $A0 : BNE .nextChest
 
-	DEC $0E : BNE .nextChest
+	DEC.b Scrap0E : BNE .nextChest
 
-	LDA $00 : PHA : LDA $02 : PHA
+	LDA.b Scrap00 : PHA : LDA.b Scrap02 : PHA
 
-		LDA.w #!ChestData_Payload : STA $00
-		LDA.w #!ChestData_Payload>>16 : STA $02
+		LDA.w #ChestDataPayload : STA.b Scrap00
+		LDA.w #ChestDataPayload>>16 : STA.b Scrap02
 
 		TXA : LSR
 		JSL RetrieveValueFromEncryptedTable
-		STA $0C
+		STA.b Scrap0C
 
-	PLA : STA $02 : PLA : STA $00
+	PLA : STA.b Scrap02 : PLA : STA.b Scrap00
 
-	LDA !ChestData, X : ASL A : BCC .smallChest
+	LDA.l ChestData, X : ASL A : BCC .smallChest
 
 JML.l Dungeon_OpenKeyedObject_bigChest ;(bank01.asm line #13783)
 
diff --git a/dialog.asm b/dialog.asm
index 67954aa..fa3dec5 100644
--- a/dialog.asm
+++ b/dialog.asm
@@ -2,200 +2,139 @@
 ; Dialog Pointer Override
 ;--------------------------------------------------------------------------------
 DialogOverride:
-	LDA $7F5035 : BEQ .skip
-	LDA $7F5700, X ; use alternate buffer
+	LDA.l AltTextFlag : BEQ .skip
+	LDA.l DialogBuffer, X ; use alternate buffer
 RTL
 	.skip
-    LDA $7F1200, X
+    LDA.l $7F1200, X
 RTL
-;--------------------------------------------------------------------------------
-; $7F5035 - Alternate Text Pointer Flag ; 0=Disable
-; $7F5036 - Padding Byte (Must be Zero)
-; $7F5700 - $7F57FF - Dialog Buffer
-;--------------------------------------------------------------------------------
+
 ResetDialogPointer:
-	STZ $1CF0 : STZ $1CF1 ; reset decompression buffer
-	LDA.b #$00 : STA $7F5035 ; zero out the alternate flag
-	LDA.b #$1C : STA $1CE9 ; thing we wrote over
+	STZ.w $1CF0 : STZ.w $1CF1 ; reset decompression buffer
+	LDA.b #$00 : STA.l AltTextFlag ; zero out the alternate flag
+	LDA.b #$1C : STA.w $1CE9 ; thing we wrote over
 RTL
-;--------------------------------------------------------------------------------
-;macro LoadDialog(index,table)
-;	PHA : PHX : PHY
-;	PHB : PHK : PLB
-;	LDA $00 : PHA
-;	LDA $01 : PHA
-;	LDA $02 : PHA
-;		LDA.b #$01 : STA $7F5035 ; set flag
-;
-;		LDA <index> : ASL : !ADD.l <index> : TAX ; get quote offset *3, move to X
-;		LDA <table>, X : STA $00 ; write pointer to direct page
-;		LDA <table>+1, X : STA $01
-;		LDA <table>+2, X : STA $02
-;
-;		LDX.b #$00 : LDY.b #$00
-;		-
-;			LDA [$00], Y ; load the next character from the pointer
-;			STA $7F5700, X ; write to the buffer
-;			INX : INY
-;		CMP.b #$7F : BNE -
-;	PLA : STA $02
-;	PLA : STA $01
-;	PLA : STA $00
-;	PLB
-;	PLY : PLX : PLA
-;endmacro
-;--------------------------------------------------------------------------------
-;macro LoadDialogAddress(address)
-;	PHA : PHX : PHY
-;	PHP
-;	PHB : PHK : PLB
-;		SEP #$30 ; set 8-bit accumulator and index registers
-;		LDA $00 : PHA
-;		LDA $01 : PHA
-;		LDA $02 : PHA
-;			LDA.b #$01 : STA $7F5035 ; set flag
-;
-;			LDA.b #<address> : STA $00 ; write pointer to direct page
-;			LDA.b #<address>>>8 : STA $01
-;			LDA.b #<address>>>16 : STA $02
-;
-;			LDX.b #$00 : LDY.b #$00
-;			-
-;				LDA [$00], Y ; load the next character from the pointer
-;				STA $7F5700, X ; write to the buffer
-;				INX : INY
-;			CMP.b #$7F : BNE -
-;		PLA : STA $02
-;		PLA : STA $01
-;		PLA : STA $00
-;	PLB
-;	PLP
-;	PLY : PLX : PLA
-;endmacro
-;--------------------------------------------------------------------------------
-!OFFSET_POINTER = "$7F5094"
-!OFFSET_RETURN = "$7F5096"
-!DIALOG_BUFFER = "$7F5700"
+
 macro LoadDialogAddress(address)
 	PHA : PHX : PHY
 	PHP
 	PHB : PHK : PLB
 		SEP #$20 ; set 8-bit accumulator
 		REP #$10 ; set 16-bit index registers
-		PEI ($00)
-		LDA $02 : PHA
-			STZ $1CF0 : STZ $1CF1 ; reset decompression buffer
-			LDA.b #$01 : STA $7F5035 ; set flag
+		PEI.b ($00)
+		LDA.b Scrap02 : PHA
+			STZ.w $1CF0 : STZ.w $1CF1 ; reset decompression buffer
+			LDA.b #$01 : STA.l AltTextFlag ; set flag
 			%CopyDialog(<address>)
-		PLA : STA $02
+		PLA : STA.b Scrap02
 		REP #$20
-		PLA : STA $00
+		PLA : STA.b Scrap00
 	PLB
 	PLP
 	PLY : PLX : PLA
 endmacro
 ;--------------------------------------------------------------------------------
 macro CopyDialog(address)
-	LDA.b #<address> : STA $00 ; write pointer to direct page
-	LDA.b #<address>>>8 : STA $01
-	LDA.b #<address>>>16 : STA $02
+	LDA.b #<address> : STA.b Scrap00 ; write pointer to direct page
+	LDA.b #<address>>>8 : STA.b Scrap01
+	LDA.b #<address>>>16 : STA.b Scrap02
 	%CopyDialogIndirect()
 endmacro
 ;--------------------------------------------------------------------------------
 macro CopyDialogIndirect()
-	REP #$20 : LDA !OFFSET_POINTER : TAX : LDY.w #$0000 : SEP #$20 ; copy 2-byte offset pointer to X and set Y to 0
+	REP #$20 : LDA.l DialogOffsetPointer : TAX : LDY.w #$0000 : SEP #$20 ; copy 2-byte offset pointer to X and set Y to 0
 	?loop:
-		LDA [$00], Y ; load the next character from the pointer
-		STA !DIALOG_BUFFER, X ; write to the buffer
+		LDA.b [$00], Y ; load the next character from the pointer
+		STA.l DialogBuffer, X ; write to the buffer
 		INX : INY
 	CMP.b #$7F : BNE ?loop
 	REP #$20 ; set 16-bit accumulator
-	TXA : INC : STA !OFFSET_RETURN ; copy out X into
-	LDA.w #$0000 : STA !OFFSET_POINTER
+	TXA : INC : STA.l DialogReturnPointer ; copy out X into
+	LDA.w #$0000 : STA.l DialogOffsetPointer
 	SEP #$20 ; set 8-bit accumulator
 endmacro
 ;--------------------------------------------------------------------------------
 LoadDialogAddressIndirect:
-	STZ $1CF0 : STZ $1CF1 ; reset decompression buffer
-	LDA.b #$01 : STA $7F5035 ; set flag
+	STZ.w $1CF0 : STZ.w $1CF1 ; reset decompression buffer
+	LDA.b #$01 : STA.l AltTextFlag ; set flag
 	%CopyDialogIndirect()
-	;%LoadDialogAddress(UncleText)
 RTL
 ;--------------------------------------------------------------------------------
-!ITEM_TEMPORARY = "$7F5040"
 FreeDungeonItemNotice:
-	STA !ITEM_TEMPORARY
+        STA.w ScratchBufferV
 
-	PHA : PHX : PHY
-	PHP
-	PHB : PHK : PLB
-		SEP #$20 ; set 8-bit accumulator
-		REP #$10 ; set 16-bit index registers
-		PEI ($00)
-		LDA $02 : PHA
+        PHA : PHX : PHY
+        PHP
+        PHB : PHK : PLB
+        SEP #$20 ; set 8-bit accumulator
+        REP #$10 ; set 16-bit index registers
+        PEI.b (Scrap00)
+        LDA.b Scrap02 : PHA
+        LDA.w ScratchBufferNV : PHA
+        LDA.w ScratchBufferNV+1 : PHA
 	;--------------------------------
 
 	LDA.l FreeItemText : BNE + : JMP .skip : +
 
-	LDA #$00 : STA $7F5010 ; initialize scratch
+	LDA.b #$00 : STA.w ScratchBufferNV ; initialize scratch
 	LDA.l FreeItemText : AND.b #$01 : BEQ + ; show message for general small key
-	LDA !ITEM_TEMPORARY : CMP.b #$24 : BNE + ; general small key
+	LDA.w ScratchBufferV : CMP.b #$24 : BNE + ; general small key
 		%CopyDialog(Notice_SmallKeyOf)
-		LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER
+		LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
 		%CopyDialog(Notice_Self)
 		JMP .done
 	+ : LDA.l FreeItemText : AND.b #$02 : BEQ + ; show message for general compass
-	LDA !ITEM_TEMPORARY : CMP.b #$25 : BNE + ; general compass
+	LDA.w ScratchBufferV : CMP.b #$25 : BNE + ; general compass
 		%CopyDialog(Notice_CompassOf)
-		LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER
+		LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
 		%CopyDialog(Notice_Self)
 		JMP .done
 	+ : LDA.l FreeItemText : AND.b #$04 : BEQ + ; show message for general map
-	LDA !ITEM_TEMPORARY : CMP.b #$33 : BNE + ; general map
+	LDA.w ScratchBufferV : CMP.b #$33 : BNE + ; general map
 		%CopyDialog(Notice_MapOf)
-		LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER
+		LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
 		%CopyDialog(Notice_Self)
 		JMP .done
 	+ : LDA.l FreeItemText : AND.b #$08 : BEQ + ; show message for general big key
-	LDA !ITEM_TEMPORARY : CMP.b #$32 : BNE + ; general big key
+	LDA.w ScratchBufferV : CMP.b #$32 : BNE + ; general big key
 		%CopyDialog(Notice_BigKeyOf)
-		LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER
+		LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
 		%CopyDialog(Notice_Self)
 		JMP .done
 	+
 	LDA.l FreeItemText : AND.b #$04 : BEQ + ; show message for dungeon map
-	LDA !ITEM_TEMPORARY : AND.b #$F0 ; looking at high bits only
+	LDA.w ScratchBufferV : AND.b #$F0 ; looking at high bits only
 	CMP.b #$70 : BNE + ; map of...
 		%CopyDialog(Notice_MapOf)
 		JMP .dungeon
 	+ : LDA.l FreeItemText : AND.b #$02 : BEQ + ; show message for dungeon compass
-	LDA !ITEM_TEMPORARY : AND.b #$F0 : CMP.b #$80 : BNE + ; compass of...
+	LDA.w ScratchBufferV : AND.b #$F0 : CMP.b #$80 : BNE + ; compass of...
 		%CopyDialog(Notice_CompassOf)
 		JMP .dungeon
 	+ : LDA.l FreeItemText : AND.b #$08 : BEQ + ; show message for dungeon big key
-	LDA !ITEM_TEMPORARY : AND.b #$F0 : CMP.b #$90 : BNE + ; big key of...
+	LDA.w ScratchBufferV : AND.b #$F0 : CMP.b #$90 : BNE + ; big key of...
 		%CopyDialog(Notice_BigKeyOf)
 		BRA .dungeon
 	+ : LDA.l FreeItemText : AND.b #$01 : BEQ + ; show message for dungeon small key
-	LDA !ITEM_TEMPORARY : AND.b #$F0 : CMP.b #$A0 : BNE + ; small key of...
-		LDA !ITEM_TEMPORARY : CMP.b #$AF : BNE ++ : JMP .skip : ++
+	LDA.w ScratchBufferV : AND.b #$F0 : CMP.b #$A0 : BNE + ; small key of...
+		LDA.w ScratchBufferV : CMP.b #$AF : BNE ++ : JMP .skip : ++
 		%CopyDialog(Notice_SmallKeyOf)
-		PLA : AND.b #$0F : STA $7F5020 : LDA.b #$0F : !SUB $7F5020 : PHA
-		LDA #$01 : STA $7F5010 ; set up a flip for small keys
+		PLA : AND.b #$0F : STA.w ScratchBufferV : LDA.b #$0F : !SUB.w ScratchBufferV : PHA
+		LDA.b #$01 : STA.w ScratchBufferNV ; set up a flip for small keys
 		BRA .dungeon
 	+
 	JMP .skip ; it's not something we are going to give a notice for
 
 	.dungeon
-	LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER
-	LDA !ITEM_TEMPORARY
+	LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
+	LDA.w ScratchBufferV
 	AND.b #$0F ; looking at low bits only
-	STA $7F5011
-	LDA $7F5010 : BEQ +
-		LDA $7F5010
-		LDA #$0F : !SUB $7F5011 : STA $7F5011 ; flip the values for small keys
+	STA.w ScratchBufferNV+1
+	LDA.w ScratchBufferNV : BEQ +
+		LDA.w ScratchBufferNV
+		LDA.b #$0F : !SUB.w ScratchBufferNV+1 : STA.w ScratchBufferNV+1 ; flip the values for small keys
 	+
-	LDA $7F5011
+	LDA.w ScratchBufferNV+1
 	CMP.b #$00 : BNE + ; ...light world
 		%CopyDialog(Notice_LightWorld) : JMP .done
 	+ : CMP.b #$01 : BNE + ; ...dark world
@@ -231,19 +170,20 @@ FreeDungeonItemNotice:
 	+
 	.done
 
-	STZ $1CF0 : STZ $1CF1 ; reset decompression buffer
-	LDA.b #$01 : STA $7F5035 ; set alternate dialog flag
-	STA $7F509F
+	STZ.w $1CF0 : STZ.w $1CF1 ; reset decompression buffer
+	LDA.b #$01 : STA.l AltTextFlag ; set alternate dialog flag
+	STA.l $7F509F
 
 	;--------------------------------
 	.skip
-		PLA : STA $02
-		REP #$20
-		PLA : STA $00
-	PLB
-	PLP
-	PLY : PLX : PLA
-	;JSL.l Main_ShowTextMessage_Alt ; .skip can be here so long as this line remains commented out
+        PLA : STA.w ScratchBufferNV+1
+        PLA : STA.w ScratchBufferNV
+        PLA : STA.b Scrap02
+        REP #$20
+        PLA : STA.b Scrap00
+        PLB
+        PLP
+        PLY : PLX : PLA
 RTL
 
 ;--------------------------------------------------------------------------------
@@ -254,7 +194,7 @@ RTL
 ;--------------------------------------------------------------------------------
 DialogItemReceive:
 	BCS .nomessage ; if doubling the item value overflowed it must be a rando item
-	CPY #$98 : BCC ++ ;if the item is $4C or greater it must be a rando item
+	CPY.b #$98 : BCC ++ ;if the item is $4C or greater it must be a rando item
 .nomessage
 	LDA.w #$FFFF
 
@@ -267,11 +207,11 @@ RTL
 ;--------------------------------------------------------------------------------
 DialogFairyThrow:
 	LDA.l Restrict_Ponds : BEQ .normal
-	LDA BottleContentsOne
-        ORA BottleContentsTwo : ORA BottleContentsThree : ORA BottleContentsFour : BNE .normal
+	LDA.l BottleContentsOne
+        ORA.l BottleContentsTwo : ORA.l BottleContentsThree : ORA.l BottleContentsFour : BNE .normal
 	
 	.noInventory
-	LDA $0D80, X : !ADD #$08 : STA $0D80, X
+	LDA.w $0D80, X : !ADD #$08 : STA.w $0D80, X
 	LDA.b #$51
 	LDY.b #$01
 RTL
@@ -286,7 +226,7 @@ DialogGanon1:
 	LDA.w #$018C
 	BCC +
 	LDA.w #$016D
-+	STA $1CF0
++	STA.w $1CF0
 	SEP #$20
 	JSL.l Sprite_ShowMessageMinimal_Alt
 RTL
@@ -322,22 +262,22 @@ DialogGanon2:
     +
         LDA.w #$016E
     ++
-	STA $1CF0
+	STA.w $1CF0
 	SEP #$20
     JSL.l Sprite_ShowMessageMinimal_Alt
 RTL
 ;--------------------------------------------------------------------------------
 DialogEtherTablet:
 	PHA
-	LDA $0202 : CMP.b #$0F : BEQ + ; Show normal text if book is not equipped
+	LDA.w $0202 : CMP.b #$0F : BEQ + ; Show normal text if book is not equipped
 	-
 	PLA : JML Sprite_ShowMessageUnconditional ; Wacky Hylian Text
 	+
 	BIT $F4 : BVC - ; Show normal text if Y is not pressed
 	LDA.l AllowHammerTablets : BEQ ++
-		LDA HammerEquipment : BEQ .yesText : BRA .noText
+		LDA.l HammerEquipment : BEQ .yesText : BRA .noText
 	++
-		LDA SwordEquipment : CMP.b #$FF : BEQ .yesText : CMP.b #$02 : BCS .noText
+		LDA.l SwordEquipment : CMP.b #$FF : BEQ .yesText : CMP.b #$02 : BCS .noText
 	;++
 	.yesText
 	PLA
@@ -351,15 +291,15 @@ RTL
 ;--------------------------------------------------------------------------------
 DialogBombosTablet:
 	PHA
-	LDA $0202 : CMP.b #$0F : BEQ + ; Show normal text if book is not equipped
+	LDA.w $0202 : CMP.b #$0F : BEQ + ; Show normal text if book is not equipped
 	-
 	PLA : JML Sprite_ShowMessageUnconditional ; Wacky Hylian Text
 	+
 	BIT $F4 : BVC - ; Show normal text if Y is not pressed
 	LDA.l AllowHammerTablets : BEQ ++
-		LDA HammerEquipment : BEQ .yesText : BRA .noText
+		LDA.l HammerEquipment : BEQ .yesText : BRA .noText
 	++
-		LDA SwordEquipment : CMP.b #$FF : BEQ .yesText : CMP.b #$02 : !BGE .noText
+		LDA.l SwordEquipment : CMP.b #$FF : BEQ .yesText : CMP.b #$02 : !BGE .noText
 	;++
 	.yesText
 	PLA 
@@ -406,47 +346,47 @@ AgahnimAsksAboutPed:
 ;--------------------------------------------------------------------------------
 Main_ShowTextMessage_Alt:
 	; Are we in text mode? If so then end the routine.
-	LDA $10 : CMP.b #$0E : BEQ .already_in_text_mode
+	LDA.b $10 : CMP.b #$0E : BEQ .already_in_text_mode
 Sprite_ShowMessageMinimal_Alt:
-	STZ $11
+	STZ.b $11
 
 	PHX : PHY
-	PEI ($00)
-	LDA.b $02 : PHA
+	PEI.b (Scrap00)
+	LDA.b Scrap02 : PHA
 
-	LDA.b #$1C : STA.b $02
+	LDA.b #$1C : STA.b Scrap02
 	REP #$30
 		LDA.w $1CF0 : ASL : TAX
 		LDA.l $7F71C0, X
-		STA.b $00
+		STA.b Scrap00
 	SEP #$30
 
 	LDY.b #$00
-	      LDA [$00], Y : CMP.b #$FE : BNE +
-	INY : LDA [$00], Y : CMP.b #$6E : BNE +
-	INY : LDA [$00], Y :            : BNE +
-	INY : LDA [$00], Y : CMP.b #$FE : BNE +
-	INY : LDA [$00], Y : CMP.b #$6B : BNE +
-	INY : LDA [$00], Y : CMP.b #$04 : BNE +
-		STZ $1CE8
+	      LDA.b [Scrap00], Y : CMP.b #$FE : BNE +
+	INY : LDA.b [Scrap00], Y : CMP.b #$6E : BNE +
+	INY : LDA.b [Scrap00], Y :            : BNE +
+	INY : LDA.b [Scrap00], Y : CMP.b #$FE : BNE +
+	INY : LDA.b [Scrap00], Y : CMP.b #$6B : BNE +
+	INY : LDA.b [Scrap00], Y : CMP.b #$04 : BNE +
+		STZ.w $1CE8
 		JMP .end
 	+
 
-	STZ $0223   ; Otherwise set it so we are in text mode.
-	STZ $1CD8   ; Initialize the step in the submodule
+	STZ.w $0223   ; Otherwise set it so we are in text mode.
+	STZ.w $1CD8   ; Initialize the step in the submodule
 
 	; Go to text display mode (as opposed to maps, etc)
-	LDA.b #$02 : STA $11
+	LDA.b #$02 : STA.b $11
 
 	; Store the current module in the temporary location.
-	LDA $10 : STA $010C
+	LDA.b $10 : STA.w $010C
 
 	; Switch the main module ($10) to text mode.
-	LDA.b #$0E : STA $10
+	LDA.b #$0E : STA.b $10
 	.end
-	PLA : STA.b $02
-	PLA : STA.b $01
-	PLA : STA.b $00
+	PLA : STA.b Scrap02
+	PLA : STA.b Scrap01
+	PLA : STA.b Scrap00
 	PLY : PLX
 
 Main_ShowTextMessage_Alt_already_in_text_mode:
@@ -458,15 +398,15 @@ CalculateSignIndex:
   ; And we do this in a way that will likely give the right value even 
   ; with major glitches.
 
-  LDA $8A : ASL A : TAY ;what we wrote over
+  LDA.b $8A : ASL A : TAY ;what we wrote over
 
-  LDA $0712 : BEQ .done ; If a small map, we can skip these calculations.
+  LDA.w $0712 : BEQ .done ; If a small map, we can skip these calculations.
 
-  LDA $21 : AND.w #$0002 : ASL #2 : EOR $8A : AND.w #$0008 : BEQ +
+  LDA.b $21 : AND.w #$0002 : ASL #2 : EOR $8A : AND.w #$0008 : BEQ +
   	TYA : !ADD.w #$0010 : TAY  ;add 16 if we are in lower half of big screen.
   + 
 
-  LDA $23 : AND.w #$0002 : LSR : EOR $8A : AND.w #$0001 : BEQ +
+  LDA.b $23 : AND.w #$0002 : LSR : EOR.b $8A : AND.w #$0001 : BEQ +
   TYA : INC #2 : TAY  ;add 16 if we are in lower half of big screen.
   +
   ; ensure even if things go horribly wrong, we don't read the sign out of bounds and crash:
diff --git a/dungeonmap.asm b/dungeonmap.asm
index 39b4624..76bc86c 100644
--- a/dungeonmap.asm
+++ b/dungeonmap.asm
@@ -12,13 +12,6 @@ DoDungeonMapBossIcon:
 	LDX.w $040C
 	BMI .cave
 
-;	LDA.l DungeonMapIcons
-;	AND.b #$01
-;	BNE ++
-;
-;	INC ; so it's not equal to $01
-;	BRA .cave
-
 	; get dungeon boss room
 ++	REP #$30
 	LDA.l $8AE817,X
@@ -57,7 +50,7 @@ DoDungeonMapBossIcon:
 
 .match
 	LDA.b #$80
-	STA.w $2121
+	STA.w CGADD
 
 	REP #$30
 
@@ -74,14 +67,14 @@ DoDungeonMapBossIcon:
 	ASL ; x128 for graphics
 	ASL
 	ADC.w #BossMapIconGFX
-	STA.w $4312
+	STA.w A1T1L
 
 	PHY
 	LDY.w #32
 
 	SEP #$20
 --	LDA.l .boss_palettes,X
-	STA.w $2122
+	STA.w CGDATA
 	INX
 	DEY
 	BNE --
@@ -94,24 +87,24 @@ DoDungeonMapBossIcon:
 	SEP #$10
 
 	LDA.w #$1801
-	STA.w $4310
+	STA.w DMAP1
 
 	LDX.b #BossMapIconGFX>>16
-	STX.w $4314
+	STX.w A1B1
 
 	LDA.w #$A060>>1
-	STA.w $2116
+	STA.w VMADDL
 	LDA.w #$0040
-	STA.w $4315
+	STA.w DAS1L
 
 	LDX.b #$02
-	STX.w $420B
+	STX.w MDMAEN
 
-	STA.w $4315
+	STA.w DAS1L
 	LDA.w #$A260>>1
-	STA.w $2116
+	STA.w VMADDL
 
-	STX.w $420B
+	STX.w MDMAEN
 
 	; done
 	SEP #$30
diff --git a/elder.asm b/elder.asm
index 5c4a6a6..88b8653 100644
--- a/elder.asm
+++ b/elder.asm
@@ -1,11 +1,11 @@
 NewElderCode:
 {
-LDA $8A : CMP #$1B : BEQ .newCodeContinue
+LDA.b $8A : CMP.b #$1B : BEQ .newCodeContinue
 ;Restore Jump we can keep the RTL so JML
 JML $05F0CD
 .newCodeContinue
 PHB : PHK : PLB
-LDA.b #$07 : STA $0F50, X ;Palette 
+LDA.b #$07 : STA.w $0F50, X ;Palette 
 JSR Elder_Draw
 JSL Sprite_PlayerCantPassThrough
 JSR Elder_Code
@@ -17,12 +17,12 @@ RTL
     Elder_Draw:
     {
 
-        LDA.b #$02 : STA $06 : STZ $07 ;Number of Tiles
+        LDA.b #$02 : STA.b Scrap06 : STZ.b Scrap07 ;Number of Tiles
         
-        LDA $0DC0, X : ASL #04
+        LDA.w $0DC0, X : ASL #04
         
-        ADC.b #.animation_states : STA $08
-        LDA.b #.animation_states>>8 : ADC.b #$00 : STA $09
+        ADC.b #.animation_states : STA.b Scrap08
+        LDA.b #.animation_states>>8 : ADC.b #$00 : STA.b Scrap09
         
         JSL Sprite_DrawMultiple_player_deferred
         JSL Sprite_DrawShadowLong
@@ -46,7 +46,7 @@ RTL
         LDA.l TurnInGoalItems : AND.w #$00FF : BNE +
             .despawn
             SEP #$20
-            STZ $0DD0, X ; despawn self
+            STZ.w $0DD0, X ; despawn self
             RTS
         +
         SEP #$20
diff --git a/entrances.asm b/entrances.asm
index e3e6bb0..b7ec86e 100644
--- a/entrances.asm
+++ b/entrances.asm
@@ -77,7 +77,7 @@ JML.l Overworld_Entrance_BRANCH_RHO
 AllowStartFromSingleEntranceCave:
 ; 16 Bit A, 16 bit XY
 ; do not need to preserve A or X or Y
-	LDA StartingEntrance : AND.w #$00FF ; What we wrote over
+	LDA.l StartingEntrance : AND.w #$00FF ; What we wrote over
 	PHA
 		TAX
 		LDA.l StartingAreaExitOffset, X
@@ -88,29 +88,29 @@ AllowStartFromSingleEntranceCave:
 		+
 
 		DEC
-		STA $00
-		ASL #2 : !ADD $00 : ASL #2 ; mult by 20
+		STA.b Scrap00
+		ASL #2 : !ADD Scrap00 : ASL #2 ; mult by 20
 		TAX
 
-		LDA #$0016 : STA $7EC142 ; Cache the main screen designation
-		LDA.l StartingAreaExitTable+$05, X : STA $7EC144 ; Cache BG1 V scroll
-		LDA.l StartingAreaExitTable+$07, X : STA $7EC146 ; Cache BG1 H scroll
+		LDA.w #$0016 : STA $7EC142 ; Cache the main screen designation
+		LDA.l StartingAreaExitTable+$05, X : STA.l $7EC144 ; Cache BG1 V scroll
+		LDA.l StartingAreaExitTable+$07, X : STA.l $7EC146 ; Cache BG1 H scroll
 		LDA.l StartingAreaExitTable+$09, X : !ADD.w #$0010 : STA $7EC148 ; Cache Link's Y coordinate
-		LDA.l StartingAreaExitTable+$0B, X : STA $7EC14A ; Cache Link's X coordinate
-		LDA.l StartingAreaExitTable+$0D, X : STA $7EC150 ; Cache Camera Y coord lower bound.
-		LDA.l StartingAreaExitTable+$0F, X : STA $7EC152 ; Cache Camera X coord lower bound.
-		LDA.l StartingAreaExitTable+$03, X : STA $7EC14E ; Cache Link VRAM Location
+		LDA.l StartingAreaExitTable+$0B, X : STA.l $7EC14A ; Cache Link's X coordinate
+		LDA.l StartingAreaExitTable+$0D, X : STA.l $7EC150 ; Cache Camera Y coord lower bound.
+		LDA.l StartingAreaExitTable+$0F, X : STA.l $7EC152 ; Cache Camera X coord lower bound.
+		LDA.l StartingAreaExitTable+$03, X : STA.l $7EC14E ; Cache Link VRAM Location
 
 		; Handle the 2 "unknown" bytes, which control what area of the backgound
 		; relative to the camera? gets loaded with new tile data as the player moves around
 		; (because some overworld areas like Kak are too big for a single VRAM tilemap)
 
 		LDA.l StartingAreaExitTable+$11, X : AND.w #$00FF
-		BIT.w #$0080 : BEQ + : ORA #$FF00 : + ; Sign extend
+		BIT.w #$0080 : BEQ + : ORA.w #$FF00 : + ; Sign extend
 		STA.l $7EC16A
 
 		LDA.l StartingAreaExitTable+$12, X  : AND.w #$00FF
-		BIT.w #$0080 : BEQ + : ORA #$FF00 : + ; Sign extend
+		BIT.w #$0080 : BEQ + : ORA.w #$FF00 : + ; Sign extend
 		STA.l $7EC16E
 
 		LDA.w #$0000 : !SUB.l $7EC16A : STA $7EC16C
@@ -167,7 +167,7 @@ RTL
 CheckHole:
 	LDX.w #$0024
 	.nextHoleClassic
-		LDA.b $00   : CMP.l $1BB800, X
+		LDA.b Scrap00   : CMP.l $1BB800, X
 		BNE .wrongMap16Classic
 		LDA.w $040A : CMP.l $1BB826, X
 		BEQ .matchedHoleClassic
@@ -176,7 +176,7 @@ CheckHole:
 
 	LDX.w #$001E
 	.nextHoleExtra
-		LDA.b $00   : CMP.l ExtraHole_Map16, X
+		LDA.b Scrap00   : CMP.l ExtraHole_Map16, X
 		BNE .wrongMap16Extra
 		LDA.w $040A : CMP.l ExtraHole_Area, X
 		BEQ .matchedHoleExtra
@@ -193,7 +193,7 @@ CheckHole:
 JML Overworld_Hole_End
 ;--------------------------------------------------------------------------------
 PreventEnterOnBonk:
-	STA $00 ; part of what we wrote over
+	STA.b Scrap00 ; part of what we wrote over
 	LDA.l InvertedMode : AND.w #$00FF : BEQ .done
 	LDA.l $5D : AND.w #$00FF : CMP.w #$0014 : BNE .done ;in mirror mode?
 	LDA.b $8A : AND.w #$0040 : CMP $7B : BEQ .done ; Are we bonking, or doing the superbunny glitch?
diff --git a/events.asm b/events.asm
index 7d9f6a6..4738663 100644
--- a/events.asm
+++ b/events.asm
@@ -1,13 +1,6 @@
-;--------------------------------------------------------------------------------
-; OnLoadOW
-;--------------------------------------------------------------------------------
-;OnLoadMap:
-;	LDA OverworldEventDataWRAM+$5B ; thing we wrote over
-;RTL
-;--------------------------------------------------------------------------------
 OnPrepFileSelect:
-	LDA $11 : CMP.b #$03 : BNE +
-		LDA.b #$06 : STA $14 ; thing we wrote over
+	LDA.b $11 : CMP.b #$03 : BNE +
+		LDA.b #$06 : STA.b $14 ; thing we wrote over
 		RTL
 	+
 	JSL.l LoadAlphabetTilemap
@@ -22,7 +15,7 @@ OnDrawHud:
 JML.l ReturnFromOnDrawHud
 ;--------------------------------------------------------------------------------
 OnDungeonEntrance:
-	STA $7EC172 ; thing we wrote over
+	STA.l $7EC172 ; thing we wrote over
         JSL MaybeFlagCompassTotalEntrance
 RTL
 ;--------------------------------------------------------------------------------
@@ -40,7 +33,7 @@ OnDungeonExit:
 		JSL.l SQEGFix
 	PLP : PLA
 
-	STA $040C : STZ $04AC ; thing we wrote over
+	STA.w $040C : STZ.w $04AC ; thing we wrote over
 
 	PHA : PHP
 		JSL.l HUD_RebuildLong
@@ -51,17 +44,17 @@ RTL
 ;--------------------------------------------------------------------------------
 OnQuit:
 	JSL.l SQEGFix
-	LDA.b #$00 : STA $7F5035 ; bandaid patch bug with mirroring away from text
-	LDA.b #$10 : STA $1C ; thing we wrote over
+	LDA.b #$00 : STA.l $7F5035 ; bandaid patch bug with mirroring away from text
+	LDA.b #$10 : STA.b $1C ; thing we wrote over
 RTL
 ;--------------------------------------------------------------------------------
 OnUncleItemGet:
 	PHA
 
 	LDA.l EscapeAssist
-	BIT.b #$04 : BEQ + : STA !INFINITE_MAGIC : +
-	BIT.b #$02 : BEQ + : STA InfiniteBombs : +
-	BIT.b #$01 : BEQ + : STA !INFINITE_ARROWS : +
+	BIT.b #$04 : BEQ + : STA.l InfiniteMagic : +
+	BIT.b #$02 : BEQ + : STA.l InfiniteBombs : +
+	BIT.b #$01 : BEQ + : STA.l InfiniteArrows : +
 
 	PLA
 	JSL.l Link_ReceiveItem
@@ -112,20 +105,19 @@ OnFileCreation:
 
         ; Set validity value and do some cleanup. Jump to checksum.
         LDA.w #$55AA : STA.l $7003E1
-        STZ $00
-        STZ $01
-        LDX.b $00
+        STZ.b Scrap00
+        STZ.b Scrap01
+        LDX.b Scrap00
         LDY.w #$0000
         TYA
 
 JML.l InitializeSaveFile_build_checksum
 ;--------------------------------------------------------------------------------
-!RNG_ITEM_LOCK_IN = "$7F5090"
 OnFileLoad:
 	REP #$10 ; set 16 bit index registers
 	JSL.l EnableForceBlank ; what we wrote over
 
-	LDA.b #$07 : STA $210C ; Restore screen 3 to normal tile area
+	LDA.b #$07 : STA.w BG34NBA ; Restore screen 3 to normal tile area
 
 	LDA.l FileMarker : BNE +
 		JSL.l OnNewFile
@@ -136,8 +128,8 @@ OnFileLoad:
 		JSL.l DoWorldFix
 	+
 	JSL.l MasterSwordFollowerClear
-	LDA.b #$FF : STA !RNG_ITEM_LOCK_IN ; reset rng item lock-in
-	LDA.b #$00 : STA $7F5001 ; mark fake flipper softlock as impossible
+	LDA.b #$FF : STA.l RNGLockIn ; reset rng item lock-in
+	LDA.b #$00 : STA.l $7F5001 ; mark fake flipper softlock as impossible
 	LDA.l GenericKeys : BEQ +
 		LDA.l CurrentGenericKeys : STA.l CurrentSmallKeys ; copy generic keys to key counter
 	+
@@ -152,7 +144,6 @@ OnFileLoad:
 	SEP #$10 ; restore 8 bit index registers
 RTL
 ;--------------------------------------------------------------------------------
-!RNG_ITEM_LOCK_IN = "$7F5090"
 OnNewFile:
 	PHX : PHP
 		; reset some values on new file that are otherwise only reset on hard reset
@@ -163,15 +154,13 @@ OnNewFile:
 		STZ $0CFB ; enemies killed (pull trees)
 		STZ $0CFC ; times taken damage (pull trees)
 		STZ $0FC7 : STZ $0FC8 : STZ $0FC9 : STZ $0FCA : STZ $0FCB : STZ $0FCC : STZ $0FCD ; prize packs
-		LDA #$00 : STA $7EC011 ; mosaic
+		LDA #$00 : STA.l $7EC011 ; mosaic
 		JSL InitRNGPointerTable ; boss RNG
 	PLP : PLX
 RTL
 ;--------------------------------------------------------------------------------
 OnInitFileSelect:
-	; LDA.b #$10 : STA $BC ; init sprite pointer - does nothing unless spriteswap.asm is included
-	; JSL.l SpriteSwap_SetSprite
-	LDA.b #$51 : STA $0AA2 ;<-- Line missing from JP1.0, needed to ensure "extra" copy of naming screen graphics are loaded.
+	LDA.b #$51 : STA.w $0AA2 ;<-- Line missing from JP1.0, needed to ensure "extra" copy of naming screen graphics are loaded.
 	JSL.l EnableForceBlank
 RTL
 ;--------------------------------------------------------------------------------
@@ -193,7 +182,7 @@ OnLinkDamagedFromPit:
 
 	LDA.l AllowAccidentalMajorGlitch
 	BEQ ++
---	LDA.b #$14 : STA $11 ; thing we wrote over
+--	LDA.b #$14 : STA.b $11 ; thing we wrote over
 
 	RTL
 
@@ -206,32 +195,30 @@ OnLinkDamagedFromPitOutdoors:
 	JML.l OHKOTimer ; make sure this is last
 
 ;--------------------------------------------------------------------------------
-!RNG_ITEM_LOCK_IN = "$7F5090"
 OnOWTransition:
 	JSL.l FloodGateReset
 	JSL.l FlipperFlag
 	JSL.l StatTransitionCounter
 	PHP
 	SEP #$20 ; set 8-bit accumulator
-	LDA.b #$FF : STA !RNG_ITEM_LOCK_IN ; clear lock-in
+	LDA.b #$FF : STA.l RNGLockIn ; clear lock-in
 	PLP
 RTL
 ;--------------------------------------------------------------------------------
-!DARK_DUCK_TEMP = "$7F509C"
 OnLoadDuckMap:
-	LDA !DARK_DUCK_TEMP
+	LDA.l ScratchBufferV
 	BNE +
-		INC : STA !DARK_DUCK_TEMP
+		INC : STA.l ScratchBufferV
 		JSL OverworldMap_InitGfx : DEC $0200
 
 		RTL
 	+
-	LDA.b #$00 : STA !DARK_DUCK_TEMP
+	LDA.b #$00 : STA.l ScratchBufferV
 	JML OverworldMap_DarkWorldTilemap
 
 ;--------------------------------------------------------------------------------
 PreItemGet:
-	LDA.b #$01 : STA !ITEM_BUSY ; mark item as busy
+	LDA.b #$01 : STA.l BusyItem ; mark item as busy
 RTL
 ;--------------------------------------------------------------------------------
 PostItemGet:
@@ -239,12 +226,12 @@ PostItemGet:
 RTL
 ;--------------------------------------------------------------------------------
 PostItemAnimation:
-	LDA.b #$00 : STA !ITEM_BUSY ; mark item as finished
+	LDA.b #$00 : STA.l BusyItem ; mark item as finished
 
-	LDA $7F509F : BEQ +
-		STZ $1CF0 : STZ $1CF1 ; reset decompression buffer
+	LDA.l $7F509F : BEQ +
+		STZ.w $1CF0 : STZ.w $1CF1 ; reset decompression buffer
 		JSL.l Main_ShowTextMessage_Alt
-		LDA.b #$00 : STA $7F509F
+		LDA.b #$00 : STA.l $7F509F
 	+
 
 	LDA.w $02E9 : CMP.b #$01 : BNE +
@@ -252,6 +239,6 @@ PostItemAnimation:
 			JSL.l IncrementChestTurnCounter
 	+
 
-    STZ $02E9 : LDA $0C5E, X ; thing we wrote over to get here
+    STZ.w $02E9 : LDA.w $0C5E, X ; thing we wrote over to get here
 RTL
 ;--------------------------------------------------------------------------------
diff --git a/failure.asm b/failure.asm
index 863c557..8e31978 100644
--- a/failure.asm
+++ b/failure.asm
@@ -3,7 +3,7 @@ pushtable
 table "bsodencode.txt"
 
 ; Uncomment this to force a crash to test message
-;pushpc : org $008132 : db 0 : pullpc
+; pushpc : org $008132 : db 0 : pullpc
 
 ;===================================================================================================
 
@@ -11,29 +11,29 @@ DontUseZSNES:
 	SEP #$35 ; sets carry and I flag too
 
 	LDA.b #$00
-	STA.l $4200 ; disable NMI and IRQ
-	STA.l $420C ; disable HDMA
+	STA.l NMITIMEN ; disable NMI and IRQ
+	STA.l HDMAEN ; disable HDMA
 
 	ROR ; A = 0x80 from carry
-	STA.l $2100
-	STA.l $2115
+	STA.l INIDISP
+	STA.l VMAIN
 
 	; Empty VRAM
-	LDA.b #AllZeros>>16 : STA.l $4304
+	LDA.b #AllZeros>>16 : STA.l A1B0
 
 	REP #$20
 
 	LDA.w #AllZeros
-	STA.l $4302
+	STA.l A1T0L
 
 	LDA.w #$1809
-	STA.l $4300
+	STA.l DMAP0
 
 	LDA.w #$0000
-	STA.l $4305
+	STA.l DAS0L
 
 	LDA.w #$0001
-	STA.l $420B
+	STA.l MDMAEN
 
 	JSR ConfigurePPUForFailureReport
 	JSR ConfigureBSODVWF
@@ -43,7 +43,7 @@ DontUseZSNES:
 	JSR DrawVWFMessage
 
 	LDA.w #$0F0F
-	STA.w $2100
+	STA.w INIDISP
 
 --	BRA --
 
@@ -77,29 +77,29 @@ Crashed:
 	SEP #$35 ; sets carry and I flag too
 
 	LDA.b #$00
-	STA.l $4200 ; disable NMI and IRQ
-	STA.l $420C ; disable HDMA
+	STA.l NMITIMEN ; disable NMI and IRQ
+	STA.l HDMAEN ; disable HDMA
 
 	ROR ; A = 0x80 from carry
-	STA.l $2100
-	STA.l $2115
+	STA.l INIDISP
+	STA.l VMAIN
 
 	; Empty VRAM
-	LDA.b #AllZeros>>16 : STA.l $4304
+	LDA.b #AllZeros>>16 : STA.l A1B0
 
 	REP #$38
 
 	LDA.w #AllZeros
-	STA.l $4302
+	STA.l A1T0L
 
 	LDA.w #$1809
-	STA.l $4300
+	STA.l DMAP0
 
 	LDA.w #$0000
-	STA.l $4305
+	STA.l DAS0L
 
 	LDA.w #$0001
-	STA.l $420B
+	STA.l MDMAEN
 
 ;===================================================================================================
 
@@ -113,32 +113,32 @@ Crashed:
 
 	; stack pointer
 	LDA.w #$0C38>>1
-	STA.b $2116
+	STA.b VMADDL
 
 	TSC
 	XBA
 	AND.w #$00FF
 	ORA.w #$0100
-	STA.b $2118
+	STA.b VMDATAL
 
 	TSC
 	AND.w #$00FF
 	ORA.w #$0100
-	STA.l $2118
+	STA.l VMDATAL
 
 	; game module
 	LDA.w #$0C78>>1
-	STA.b $2116
+	STA.b VMADDL
 
 	LDA.l $10
 	AND.w #$00FF
 	ORA.w #$0100
-	STA.b $2118
+	STA.b VMDATAL
 
 	LDA.l $11
 	AND.w #$00FF
 	ORA.w #$0100
-	STA.b $2118
+	STA.b VMDATAL
 
 ;---------------------------------------------------------------------------------------------------
 
@@ -176,7 +176,7 @@ Crashed:
 
 .next_row
 	STA.l $7F0004
-	STA.b $2116
+	STA.b VMADDL
 
 	LDY.w #20
 
@@ -194,7 +194,7 @@ Crashed:
 	AND.w #$01FF
 
 .in_stack
-	STA.b $2118
+	STA.b VMDATAL
 
 	DEX
 	TXA
@@ -235,7 +235,7 @@ Crashed:
 	JSR DrawVWFMessage
 
 	LDA.w #$0F0F
-	STA.w $2100
+	STA.w INIDISP
 
 --	BRA --
 
@@ -260,11 +260,11 @@ BSODMessage:
 ;===================================================================================================
 
 DrawVWFMessage:
-	STA.b $06
+	STA.b Scrap06
 
 .next
-	LDA.b ($06)
-	INC.b $06
+	LDA.b (Scrap06)
+	INC.b Scrap06
 	AND.w #$00FF
 	CMP.w #$0080
 	BEQ .done_row
@@ -284,26 +284,26 @@ DrawVWFMessage:
 	ASL
 	TAX
 	LDA.w .row_offset,X
-	STA.w $2116
+	STA.w VMADDL
 
 	INC.b VWFR
 
 	LDA.w #$1800
-	STA.w $4300
+	STA.w DMAP0
 	
 	LDA.w #20*16
-	STA.w $4305
+	STA.w DAS0L
 
 	LDA.w #$1000
-	STA.w $4302
+	STA.w A1T0L
 
 	SEP #$20
 
-	STZ.w $2115
-	STZ.w $4304
+	STZ.w VMAIN
+	STZ.w A1B0
 
 	LDA.b #$01
-	STA.w $420B
+	STA.w MDMAEN
 
 	REP #$20
 
@@ -347,7 +347,7 @@ DrawFailureVWFChar:
 	ASL
 	ASL
 	ADC.w #BSODFontGFX
-	STA.b $08
+	STA.b Scrap08
 
 	LDA.b VWFP
 	AND.w #$FFF8
@@ -402,23 +402,23 @@ LoadBSODHexFont:
 	REP #$20
 
 	LDA.w #BSODHex
-	STA.w $4302
+	STA.w A1T0L
 
 	LDA.w #$1801
-	STA.w $4300
+	STA.w DMAP0
 
 	LDA.w #$1000
-	STA.w $4305
+	STA.w DAS0L
 
 	LDA.w #$2800
-	STA.w $2116
+	STA.w VMADDL
 
 	SEP #$20
 	LDA.b #BSODHex>>16
-	STA.w $4304
+	STA.w A1B0
 
 	LDA.b #$01
-	STA.w $420B
+	STA.w MDMAEN
 
 	REP #$30
 
@@ -437,21 +437,21 @@ ConfigureBSODVWF:
 	LDX.b #$FF
 	LDY.b #$7F
 
-	STZ.b $2121
-	STZ.b $2122 : STZ.b $2122
+	STZ.b CGADD
+	STZ.b CGDATA : STZ.b CGDATA
 
-	STX.b $2122 : STY.b $2122
+	STX.b CGDATA : STY.b CGDATA
 
 	LDA.b #$05
-	STA.b $2121
+	STA.b CGADD
 
-	LDA.b #$11 : STA.b $2122 : STY.b $2122
+	LDA.b #$11 : STA.b CGDATA : STY.b CGDATA
 
-	LDA.b #$21 : STA.b $2121
-	STX.b $2122 : STY.b $2122
+	LDA.b #$21 : STA.b CGADD
+	STX.b CGDATA : STY.b CGDATA
 
-	LDA.b #$25 : STA.b $2121
-	LDA.b #$11 : STA.b $2122 : STY.b $2122
+	LDA.b #$25 : STA.b CGADD
+	LDA.b #$11 : STA.b CGDATA : STY.b CGDATA
 
 	REP #$30
 
@@ -473,14 +473,14 @@ ConfigureBSODVWF:
 
 .start
 	STA.w $20
-	STA.b $2116
+	STA.b VMADDL
 
 	PLA
 
 	LDY.w #30
 
 .next_char
-	STA.b $2118
+	STA.b VMDATAL
 	INC
 	DEY
 	BNE .next_char
@@ -516,29 +516,29 @@ ConfigurePPUForFailureReport:
 	PHK
 	PLB
 
-	STZ.w $2105 ; BG mode 0
-	STZ.w $2106 ; no mosaic
-	STZ.w $2107 ; BG1 tilemap to $0000
-	STZ.w $212D
+	STZ.w BGMODE ; BG mode 0
+	STZ.w MOSAIC ; no mosaic
+	STZ.w BG1SC ; BG1 tilemap to $0000
+	STZ.w TS
 
-	STZ.w $210D : STZ.w $210D
-	STZ.w $210E : STZ.w $210E
-	STZ.w $210F : STZ.w $210F
-	STZ.w $2110 : STZ.w $2110
+	STZ.w BG1HOFS : STZ.w BG1HOFS
+	STZ.w BG1VOFS : STZ.w BG1VOFS
+	STZ.w BG2HOFS : STZ.w BG2HOFS
+	STZ.w BG2VOFS : STZ.w BG2VOFS
 
 
-	STZ.w $2123
-	STZ.w $2131
-	STZ.w $2133
+	STZ.w W12SEL
+	STZ.w CGADSUB
+	STZ.w SETINI
 
 	LDA.b #$04
-	STA.w $2108 ; BG1 tilemap to $0800
+	STA.w BG2SC ; BG1 tilemap to $0800
 
 	LDA.b #$21
-	STA.w $210B
+	STA.w BG12NBA
 
 	LDA.b #$03
-	STA.w $212C
+	STA.w TM
 
 	RTS
 
diff --git a/fastcredits.asm b/fastcredits.asm
index 82702f3..70be896 100644
--- a/fastcredits.asm
+++ b/fastcredits.asm
@@ -51,11 +51,11 @@ FastCreditsCutsceneScroll:
 	LDA.w $00E2,Y
 	CMP.l $0EC308,X ; compare to target
 
-	ROL.b $00 ; put carry in here
+	ROL.b Scrap00 ; put carry in here
 	LDA.l $0EC348,X ; get movement
 	BPL ++ ; if positive, leave saved carry alone
-	INC.b $00 ; otherwise, flip it
-++	ROR.b $00 ; recover carry
+	INC.b Scrap00 ; otherwise, flip it
+++	ROR.b Scrap00 ; recover carry
 
 	BCC ++ ; scroll if carry not set
 	LDA.w #$0000
diff --git a/fileselect.asm b/fileselect.asm
index 4494ffc..6c66c9a 100644
--- a/fileselect.asm
+++ b/fileselect.asm
@@ -1,18 +1,17 @@
-!ValidKeyLoaded = "$7F509E"
 
 ;FS prefix means file_select, since these defines and macros are specific to this screen
 
-!FS_COLOR_BROWN = "$0000" ;(only used for: Shovel, hammer, powder)
-!FS_COLOR_RED = "$0400"
-!FS_COLOR_YELLOW = "$0800"
-!FS_COLOR_BLUE = "$0C00"
-!FS_COLOR_GRAY = "$1000" ;(Used to gray out items)
-!FS_COLOR_BOOTS = "$1400"
-!FS_COLOR_GREEN = "$1800"
-!FS_COLOR_BW = "$1C00"
+!FS_COLOR_BROWN = $0000 ;(only used for: Shovel, hammer, powder)
+!FS_COLOR_RED = $0400
+!FS_COLOR_YELLOW = $0800
+!FS_COLOR_BLUE = $0C00
+!FS_COLOR_GRAY = $1000 ;(Used to gray out items)
+!FS_COLOR_BOOTS = $1400
+!FS_COLOR_GREEN = $1800
+!FS_COLOR_BW = $1C00
 
-!FS_HFLIP = "$4000"
-!FS_VFLIP = "$8000"
+!FS_HFLIP = $4000
+!FS_VFLIP = $8000
 
 macro fs_draw8x8(screenrow,screencol)
 	;Note due to XKAS's screwy math this formula is misleading.
@@ -109,19 +108,19 @@ JMP DrawItem
 
 
 DrawPlayerFile:
-	LDA $1A : AND.w #$0001 : BNE .normal
+	LDA.b $1A : AND.w #$0001 : BNE .normal
 		JSR DrawPlayerFileShared
 		INC $0710 ; Suppress animated tile updates for this frame
 
 		; re-enable  Stripe Image format upload on this frame
 		; Value loaded must match what gets set by AltBufferTable
-		LDA.w #$0161 : STA $1002
+		LDA.w #$0161 : STA.w $1002
 		BRA .done
 	.normal
 	STZ $0710 ; ensure core animated tile updates are not suppressed
-	LDA #$FFFF : STA.w $1002 ; Suppress Stripe Image format upload on this frame
+	LDA.w #$FFFF : STA.w $1002 ; Suppress Stripe Image format upload on this frame
 .done
-	LDA.w #$0004 : STA $02 ; thing we wrote over
+	LDA.w #$0004 : STA.b Scrap02 ; thing we wrote over
 RTL
 
 
@@ -132,29 +131,29 @@ DrawPlayerFileShared:
 	LDA.b #FileSelectItems>>16 : PHA : PLB
 	REP #$20 ; restore 16 bit accumulator
 
-	LDA ExtendedFileNameSRAM+$08 : ORA.w #!FS_COLOR_BW
+	LDA.l ExtendedFileNameSRAM+$08 : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(6,5)
-	LDA ExtendedFileNameSRAM+$0A : ORA.w #!FS_COLOR_BW
+	LDA.l ExtendedFileNameSRAM+$0A : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(6,6)
-	LDA ExtendedFileNameSRAM+$0C : ORA.w #!FS_COLOR_BW
+	LDA.l ExtendedFileNameSRAM+$0C : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(6,7)
-	LDA ExtendedFileNameSRAM+$0E : ORA.w #!FS_COLOR_BW
+	LDA.l ExtendedFileNameSRAM+$0E : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(6,8)
 
-	LDA ExtendedFileNameSRAM+$10 : ORA.w #!FS_COLOR_BW
+	LDA.l ExtendedFileNameSRAM+$10 : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(9,5)
-	LDA ExtendedFileNameSRAM+$12 : ORA.w #!FS_COLOR_BW
+	LDA.l ExtendedFileNameSRAM+$12 : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(9,6)
-	LDA ExtendedFileNameSRAM+$14 : ORA.w #!FS_COLOR_BW
+	LDA.l ExtendedFileNameSRAM+$14 : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(9,7)
-	LDA ExtendedFileNameSRAM+$16 : ORA.w #!FS_COLOR_BW
+	LDA.l ExtendedFileNameSRAM+$16 : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(9,8)
 
 	JSR FileSelectDrawHudBar
 
 	; Bow
 	LDA.l BowTrackingSRAM : AND.w #$0040 : BEQ +
-		LDA EquipmentSRAM+$00 : AND.w #$00FF : BEQ ++
+		LDA.l EquipmentSRAM+$00 : AND.w #$00FF : BEQ ++
 			%fs_drawItem(3,12,FileSelectItems_silver_bow)
 			BRA .bow_end
 		++
@@ -327,10 +326,10 @@ DrawPlayerFileShared:
 		%fs_drawItem(9,26,FileSelectItems_heart_piece_3_of_4)
 	++
 
-	LDA EquipmentSRAM+$0108 : AND.w #$00FF
+	LDA.l EquipmentSRAM+$0108 : AND.w #$00FF
 	JSL.l HexToDec
-	LDA $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(11,26)
-	LDA $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(11,27)
+	LDA.l $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(11,26)
+	LDA.l $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(11,27)
 
 	; Boots
 	%fs_drawItemBasic(EquipmentSRAM+$15,3,28,FileSelectItems_boots)
@@ -353,21 +352,21 @@ DrawPlayerFileShared:
 	%fs_drawItemBasic(EquipmentSRAM+$17,9,28,FileSelectItems_pearl)
 
 	; Pendants
-	LDA EquipmentSRAM+$34 : AND.w #$0004 : BEQ +
+	LDA.l EquipmentSRAM+$34 : AND.w #$0004 : BEQ +
 		%fs_drawItem(12,12,FileSelectItems_green_pendant)
 		BRA ++
 	+
 		%fs_drawItem(12,12,FileSelectItems_no_pendant)
 	++
 
-	LDA EquipmentSRAM+$34 : AND.w #$0002 : BEQ +
+	LDA.l EquipmentSRAM+$34 : AND.w #$0002 : BEQ +
 		%fs_drawItem(12,14,FileSelectItems_blue_pendant)
 		BRA ++
 	+
 		%fs_drawItem(12,14,FileSelectItems_no_pendant)
 	++
 
-	LDA EquipmentSRAM+$34 : AND.w #$0001 : BEQ +
+	LDA.l EquipmentSRAM+$34 : AND.w #$0001 : BEQ +
 		%fs_drawItem(12,16,FileSelectItems_red_pendant)
 		BRA ++
 	+
@@ -375,49 +374,49 @@ DrawPlayerFileShared:
 	++
 
 	; Crystals
-	LDA EquipmentSRAM+$3A : AND.w #$0002 : BEQ +
+	LDA.l EquipmentSRAM+$3A : AND.w #$0002 : BEQ +
 		LDA.w #$0297|!FS_COLOR_BLUE
 		BRA ++
 	+
 		LDA.w #$0287|!FS_COLOR_GRAY
 	++ : %fs_draw16x8(13,18)
 
-	LDA EquipmentSRAM+$3A : AND.w #$0010 : BEQ +
+	LDA.l EquipmentSRAM+$3A : AND.w #$0010 : BEQ +
 		LDA.w #$0297|!FS_COLOR_BLUE
 		BRA ++
 	+
 		LDA.w #$0287|!FS_COLOR_GRAY
 	++ : %fs_draw16x8(12,19)
 
-	LDA EquipmentSRAM+$3A : AND.w #$0040 : BEQ +
+	LDA.l EquipmentSRAM+$3A : AND.w #$0040 : BEQ +
 		LDA.w #$0297|!FS_COLOR_BLUE
 		BRA ++
 	+
 		LDA.w #$0287|!FS_COLOR_GRAY
 	++ : %fs_draw16x8(13,20)
 
-	LDA EquipmentSRAM+$3A : AND.w #$0020 : BEQ +
+	LDA.l EquipmentSRAM+$3A : AND.w #$0020 : BEQ +
 		LDA.w #$0297|!FS_COLOR_BLUE
 		BRA ++
 	+
 		LDA.w #$0287|!FS_COLOR_GRAY
 	++ : %fs_draw16x8(12,21)
 
-	LDA EquipmentSRAM+$3A : AND.w #$0004 : BEQ +
+	LDA.l EquipmentSRAM+$3A : AND.w #$0004 : BEQ +
 		LDA.w #$0297|!FS_COLOR_RED
 		BRA ++
 	+
 		LDA.w #$0287|!FS_COLOR_GRAY
 	++ : %fs_draw16x8(13,22)
 
-	LDA EquipmentSRAM+$3A : AND.w #$0001 : BEQ +
+	LDA.l EquipmentSRAM+$3A : AND.w #$0001 : BEQ +
 		LDA.w #$0297|!FS_COLOR_RED
 		BRA ++
 	+
 		LDA.w #$0287|!FS_COLOR_GRAY
 	++ : %fs_draw16x8(12,23)
 
-	LDA EquipmentSRAM+$3A : AND.w #$0008 : BEQ +
+	LDA.l EquipmentSRAM+$3A : AND.w #$0008 : BEQ +
 		LDA.w #$0297|!FS_COLOR_BLUE
 		BRA ++
 	+
@@ -558,104 +557,103 @@ FileSelectItems:
 
 ;--------------------------------------------------------------------------------
 FileSelectDrawHudBar:
-	LDA #$029B|!FS_COLOR_GREEN : %fs_draw16x8(0,10)
-	LDA EquipmentSRAM+$22
+	LDA.w #$029B|!FS_COLOR_GREEN : %fs_draw16x8(0,10)
+	LDA.l DisplayRupeesSRAM
 	JSL.l HexToDec
-	LDA $7F5004 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,9)
-	LDA $7F5005 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,10)
-	LDA $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,11)
-	LDA $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,12)
+	LDA.l $7F5004 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,9)
+	LDA.l $7F5005 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,10)
+	LDA.l $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,11)
+	LDA.l $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,12)
 
-	LDA #$028B|!FS_COLOR_BLUE : %fs_draw16x8(0,14)
-	LDA EquipmentSRAM+$03 : AND.w #$00FF
+	LDA.w #$028B|!FS_COLOR_BLUE : %fs_draw16x8(0,14)
+	LDA.l BombsEquipmentSRAM : AND.w #$00FF
 	JSL.l HexToDec
-	LDA $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,14)
-	LDA $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,15)
+	LDA.l $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,14)
+	LDA.l $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,15)
 
 	LDA.l BowTrackingSRAM : AND.w #$0040 : BEQ +
-		LDA #$0299|!FS_COLOR_RED : %fs_draw16x8(0,17)
+		LDA.w #$0299|!FS_COLOR_RED : %fs_draw16x8(0,17)
 		BRA ++
 	+
-	LDA #$0289|!FS_COLOR_BROWN : %fs_draw16x8(0,17)
+	LDA.w #$0289|!FS_COLOR_BROWN : %fs_draw16x8(0,17)
 	++
-	LDA EquipmentSRAM+$37 : AND.w #$00FF
+	LDA.l CurrentArrowsSRAM : AND.w #$00FF
 	JSL.l HexToDec
-	LDA $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,17)
-	LDA $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,18)
+	LDA.l $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,17)
+	LDA.l $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,18)
 RTS
 ;--------------------------------------------------------------------------------
 AltBufferTable:
-    LDA.b #$02 : STA $210c ; Have Screen 3 use same tile area as screens 1
+    LDA.b #$02 : STA.w BG34NBA ; Have Screen 3 use same tile area as screens 1
 .noScreen3Change
     REP #$20
     LDX.w #$0400 ; 14 rows with 64 bytes (30 tiles * 2 + 4 byte header)
     ;fill with the blank character
     LDA.w #$0188
     -
-        STA $1000, X
+        STA.w $1000, X
         DEX : DEX : BNE -
 
     ; set vram offsets
-    LDA.w #$0161 : STA $1002 ;file 1 top row
-    LDA.w #$2161 : STA $1042 ;file 1 bottom row
+    LDA.w #$0161 : STA.w $1002 ;file 1 top row
+    LDA.w #$2161 : STA.w $1042 ;file 1 bottom row
+  
+    LDA.w #$4161 : STA.w $1082 ;gap row top
+    LDA.w #$6161 : STA.w $10C2 ;gap row bottom
+  
+    LDA.w #$8161 : STA.w $1102 ;file 2 top row
+    LDA.w #$A161 : STA.w $1142 ;file 2 bottom row
+  
+    LDA.w #$C161 : STA.w $1182 ;gap row top
+    LDA.w #$E161 : STA.w $11c2 ;gap row bottom
+  
+    LDA.w #$0162 : STA.w $1202 ;file 3 top row
+    LDA.w #$2162 : STA.w $1242 ;file 3 bottom row
+  
+    LDA.w #$4162 : STA.w $1282 ;extra gap row top
+    LDA.w #$6162 : STA.w $12c2 ;extra gap row bottom
 
-    LDA.w #$4161 : STA $1082 ;gap row top
-    LDA.w #$6161 : STA $10C2 ;gap row bottom
-
-    LDA.w #$8161 : STA $1102 ;file 2 top row
-    LDA.w #$A161 : STA $1142 ;file 2 bottom row
-
-    LDA.w #$C161 : STA $1182 ;gap row top
-    LDA.w #$E161 : STA $11c2 ;gap row bottom
-
-    LDA.w #$0162 : STA $1202 ;file 3 top row
-    LDA.w #$2162 : STA $1242 ;file 3 bottom row
-
-    LDA.w #$4162 : STA $1282 ;extra gap row top
-    LDA.w #$6162 : STA $12c2 ;extra gap row bottom
-
-	LDA.w #$8162 : STA $1302 ;extra gap row top
-    LDA.w #$A162 : STA $1342 ;extra gap row bottom
-
-	LDA.w #$C162 : STA $1382 ;extra gap row top
-    LDA.w #$E162 : STA $13C2 ;extra gap row bottom
+    LDA.w #$8162 : STA.w $1302 ;extra gap row top
+    LDA.w #$A162 : STA.w $1342 ;extra gap row bottom
+  
+    LDA.w #$C162 : STA.w $1382 ;extra gap row top
+    LDA.w #$E162 : STA.w $13C2 ;extra gap row bottom
 
     ; set lengths
     LDA.w #$3B00
-    STA $1004 ;file 1 top row
-    STA $1044 ;file 1 bottom row
-    STA $1084 ;gap row top
-    STA $10C4 ;gap row bottom
-    STA $1104 ;file 2 top row
-    STA $1144 ;file 2 bottom row
-    STA $1184 ;gap row top
-    STA $11C4 ;gap row bottom
-    STA $1204 ;file 3 top row
-    STA $1244 ;file 3 bottom row
-    STA $1284 ;extra gap row top
-    STA $12C4 ;extra gap row bottom
-	STA $1304 ;extra gap row top
-    STA $1344 ;extra gap row bottom
-	STA $1384 ;extra gap row top
-    STA $13C4 ;extra gap row bottom
+    STA.w $1004 ;file 1 top row
+    STA.w $1044 ;file 1 bottom row
+    STA.w $1084 ;gap row top
+    STA.w $10C4 ;gap row bottom
+    STA.w $1104 ;file 2 top row
+    STA.w $1144 ;file 2 bottom row
+    STA.w $1184 ;gap row top
+    STA.w $11C4 ;gap row bottom
+    STA.w $1204 ;file 3 top row
+    STA.w $1244 ;file 3 bottom row
+    STA.w $1284 ;extra gap row top
+    STA.w $12C4 ;extra gap row bottom
+    STA.w $1304 ;extra gap row top
+    STA.w $1344 ;extra gap row bottom
+    STA.w $1384 ;extra gap row top
+    STA.w $13C4 ;extra gap row bottom
 
     ; Set last packet marker
-    LDA.w #$00FF : STA $1402
+    LDA.w #$00FF : STA.w $1402
 
     ; Draw Unlock option if applicable
-	LDA $10 : AND.w #$00FF : CMP.w #$0001 : BNE +
-	LDA.l IsEncrypted : AND.w #$00FF : CMP.w #$0002 : BNE +
-	PHP : SEP #$30 : PHX : PHY : JSL ValidatePassword : PLY : PLX : PLP
-	AND.w #$00FF : BNE +
-		LDA.w #!FSTILE_U_TOP : %fs_draw8x16(14,5)
-		LDA.w #!FSTILE_N_TOP : %fs_draw8x16(14,6)
-		LDA.w #!FSTILE_L_TOP : %fs_draw8x16(14,7)
-		LDA.w #!FSTILE_O_TOP : %fs_draw8x16(14,8)
-		LDA.w #!FSTILE_C_TOP : %fs_draw8x16(14,9)
-		LDA.w #!FSTILE_K_TOP : %fs_draw8x16(14,10)
-	+
-
-	SEP #$20
+    LDA.b $10 : AND.w #$00FF : CMP.w #$0001 : BNE +
+    LDA.l IsEncrypted : AND.w #$00FF : CMP.w #$0002 : BNE +
+    PHP : SEP #$30 : PHX : PHY : JSL ValidatePassword : PLY : PLX : PLP
+    AND.w #$00FF : BNE +
+	    LDA.w #!FSTILE_U_TOP : %fs_draw8x16(14,5)
+	    LDA.w #!FSTILE_N_TOP : %fs_draw8x16(14,6)
+	    LDA.w #!FSTILE_L_TOP : %fs_draw8x16(14,7)
+	    LDA.w #!FSTILE_O_TOP : %fs_draw8x16(14,8)
+	    LDA.w #!FSTILE_C_TOP : %fs_draw8x16(14,9)
+	    LDA.w #!FSTILE_K_TOP : %fs_draw8x16(14,10)
+    +
+    SEP #$20
 
 RTL
 ;--------------------------------------------------------------------------------
@@ -663,29 +661,29 @@ AltBufferTable_credits:
 	JSL AltBufferTable_noScreen3Change
 
 	REP #$20
-    LDA.w #$6168 : STA $1002 ;file 1 top row
-    LDA.w #$8168 : STA $1042 ;file 1 bottom row
+    LDA.w #$6168 : STA.w $1002 ;file 1 top row
+    LDA.w #$8168 : STA.w $1042 ;file 1 bottom row
+  
+    LDA.w #$A168 : STA.w $1082 ;gap row top
+    LDA.w #$C168 : STA.w $10C2 ;gap row bottom
+  
+    LDA.w #$E168 : STA.w $1102 ;file 2 top row
+    LDA.w #$0169 : STA.w $1142 ;file 2 bottom row
+  
+    LDA.w #$2169 : STA.w $1182 ;gap row top
+    LDA.w #$4169 : STA.w $11c2 ;gap row bottom
+  
+    LDA.w #$6169 : STA.w $1202 ;file 3 top row
+    LDA.w #$8169 : STA.w $1242 ;file 3 bottom row
+  
+    LDA.w #$A169 : STA.w $1282 ;extra gap row top
+    LDA.w #$C169 : STA.w $12c2 ;extra gap row bottom
 
-    LDA.w #$A168 : STA $1082 ;gap row top
-    LDA.w #$C168 : STA $10C2 ;gap row bottom
-
-    LDA.w #$E168 : STA $1102 ;file 2 top row
-    LDA.w #$0169 : STA $1142 ;file 2 bottom row
-
-    LDA.w #$2169 : STA $1182 ;gap row top
-    LDA.w #$4169 : STA $11c2 ;gap row bottom
-
-    LDA.w #$6169 : STA $1202 ;file 3 top row
-    LDA.w #$8169 : STA $1242 ;file 3 bottom row
-
-    LDA.w #$A169 : STA $1282 ;extra gap row top
-    LDA.w #$C169 : STA $12c2 ;extra gap row bottom
-
-	LDA.w #$E169 : STA $1302 ;extra gap row top
-    LDA.w #$016A : STA $1342 ;extra gap row bottom
-
-	LDA.w #$216A : STA $1382 ;extra gap row top
-    LDA.w #$416A : STA $13C2 ;extra gap row bottom
+    LDA.w #$E169 : STA.w $1302 ;extra gap row top
+    LDA.w #$016A : STA.w $1342 ;extra gap row bottom
+  
+    LDA.w #$216A : STA.w $1382 ;extra gap row top
+    LDA.w #$416A : STA.w $13C2 ;extra gap row bottom
 
     SEP #$20
 RTL
@@ -718,47 +716,47 @@ RTL
 ;--------------------------------------------------------------------------------
 LoadFullItemTiles:
 	PHA : PHX
-		LDA $4300 : PHA ; preserve DMA parameters
-		LDA $4301 : PHA ; preserve DMA parameters
-		LDA $4302 : PHA ; preserve DMA parameters
-		LDA $4303 : PHA ; preserve DMA parameters
-		LDA $4304 : PHA ; preserve DMA parameters
-		LDA $4305 : PHA ; preserve DMA parameters
-		LDA $4306 : PHA ; preserve DMA parameters
+		LDA.w DMAP0 : PHA ; preserve DMA parameters
+		LDA.w BBAD0 : PHA ; preserve DMA parameters
+		LDA.w A1T0L : PHA ; preserve DMA parameters
+		LDA.w A1T0H : PHA ; preserve DMA parameters
+		LDA.w A1B0 : PHA ; preserve DMA parameters
+		LDA.w DAS0L : PHA ; preserve DMA parameters
+		LDA.w DAS0H : PHA ; preserve DMA parameters
 		;--------------------------------------------------------------------------------
-		LDA.b #$80 : STA $2115 ; write read increment on $2119
-		LDA.b #$01 : STA $4300 ; set DMA transfer direction A -> B, bus A auto increment, double-byte mode
-		LDA.b #$18 : STA $4301 ; set bus B destination to VRAM register
+		LDA.b #$80 : STA.w VMAIN ; write read increment on $2119
+		LDA.b #$01 : STA.w DMAP0 ; set DMA transfer direction A -> B, bus A auto increment, double-byte mode
+		LDA.b #$18 : STA.w BBAD0 ; set bus B destination to VRAM register
 
-		LDA.b #$00 : STA $2116 ; write VRAM destination address
-		LDA.b #$30 : STA $2117 ; write VRAM destination address
+		LDA.b #$00 : STA.w VMADDL ; write VRAM destination address
+		LDA.b #$30 : STA.w VMADDH ; write VRAM destination address
 
-		LDA.b #$31 : STA $4304 ; set bus A source bank
-		LDA.b #FileSelectNewGraphics : STA $4302 ; set bus A source address to ROM
-		LDA.b #FileSelectNewGraphics>>8 : STA $4303 ; set bus A source address to ROM
+		LDA.b #$31 : STA.w A1B0 ; set bus A source bank
+		LDA.b #FileSelectNewGraphics : STA.w A1T0L ; set bus A source address to ROM
+		LDA.b #FileSelectNewGraphics>>8 : STA.w A1T0H ; set bus A source address to ROM
 
-		LDA $2100 : PHA : LDA.b #$80 : STA $2100 ; save screen state & turn screen off
+		LDA.w INIDISP : PHA : LDA.b #$80 : STA.w INIDISP ; save screen state & turn screen off
 
-		STZ $4305 : LDA.b #$10 : STA $4306 ; set transfer size to 0x1000
-		LDA #$01 : STA $420B ; begin DMA transfer
+		STZ.w DAS0L : LDA.b #$10 : STA.w DAS0H ; set transfer size to 0x1000
+		LDA.b #$01 : STA.w MDMAEN ; begin DMA transfer
 
-		PLA : STA $2100 ; put screen back however it was before
+		PLA : STA.w INIDISP ; put screen back however it was before
 		;--------------------------------------------------------------------------------
-		PLA : STA $4306 ; restore DMA parameters
-		PLA : STA $4305 ; restore DMA parameters
-		PLA : STA $4304 ; restore DMA parameters
-		PLA : STA $4303 ; restore DMA parameters
-		PLA : STA $4302 ; restore DMA parameters
-		PLA : STA $4301 ; restore DMA parameters
-		PLA : STA $4300 ; restore DMA parameters
+		PLA : STA.w DAS0H ; restore DMA parameters
+		PLA : STA.w DAS0L ; restore DMA parameters
+		PLA : STA.w A1B0 ; restore DMA parameters
+		PLA : STA.w A1T0H ; restore DMA parameters
+		PLA : STA.w A1T0L ; restore DMA parameters
+		PLA : STA.w BBAD0 ; restore DMA parameters
+		PLA : STA.w DMAP0 ; restore DMA parameters
 	PLX : PLA
 RTL
 ;--------------------------------------------------------------------------------
 
 SetFileSelectPalette:
-	LDA $10 : CMP.b #$04 : BNE +
+	LDA.b $10 : CMP.b #$04 : BNE +
 		; load the vanilla file select screen BG3 palette for naming screen
-		LDA.b #$01 : STA $0AB2
+		LDA.b #$01 : STA.w $0AB2
 		JSL.l Palette_Hud
 		BRA .done
 	+
@@ -787,16 +785,16 @@ DrawPlayerFile_credits:
 	; see $6563C for drawing first file name and hearts
 	REP #$20 ; set 16 bit accumulator
 
-	LDA EquipmentSRAM+$99 : ORA.w #!FS_COLOR_BW
+	LDA.l EquipmentSRAM+$99 : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(3,5)
-	LDA EquipmentSRAM+$9B : ORA.w #!FS_COLOR_BW
+	LDA.l EquipmentSRAM+$9B : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(3,6)
-	LDA EquipmentSRAM+$9D : ORA.w #!FS_COLOR_BW
+	LDA.l EquipmentSRAM+$9D : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(3,7)
-	LDA EquipmentSRAM+$9F : ORA.w #!FS_COLOR_BW
+	LDA.l EquipmentSRAM+$9F : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(3,8)
-
-	LDA EquipmentSRAM+$2C : AND.w #$00FF : LSR #3 : STA $02
+ 
+	LDA.l EquipmentSRAM+$2C : AND.w #$00FF : LSR #3 : STA.b Scrap02
 	%fs_LDY_screenpos(0,20)
 	LDA.w #$028F|!FS_COLOR_RED
 	LDX.w #$000A
@@ -810,44 +808,45 @@ DrawPlayerFile_credits:
 		TYA : !ADD.w #$40-$14 : TAY
 		PLA
 	+
-	DEC $02 : BNE .nextHeart
+	DEC.b Scrap02 : BNE .nextHeart
 
 	JSR DrawPlayerFileShared
 RTL
 ;--------------------------------------------------------------------------------
 FSCursorUp:
-	LDA $C8 : BNE +
-		LDA #$04 ; up from file becomes delete
+	LDA.b $C8 : BNE +
+		LDA.b #$04 ; up from file becomes delete
 		BRA .done
-	+ : CMP #$03 : BNE +
-		LDA #$00 ; up from unlock is the file
+	+ : CMP.b #$03 : BNE +
+		LDA.b #$00 ; up from unlock is the file
 		BRA .done
 	+
 	LDA.l IsEncrypted : CMP.b #$02 : BNE +
-	LDA.l !ValidKeyLoaded : BNE +
-		LDA #$03 ; up from delete is unlock for password protected seeds
+	LDA.l ValidKeyLoaded : BNE +
+		LDA.b #$03 ; up from delete is unlock for password protected seeds
 		BRA .done
 	+
-	LDA #$00 ;otherwise up from delete is file
+	LDA.b #$00 ;otherwise up from delete is file
 	.done
-	STA $C8
+	STA.b $C8
 RTL
+
 FSCursorDown:
-	LDA $C8 : BNE +
+	LDA.b $C8 : BNE +
 		LDA.l IsEncrypted : CMP.b #$02 : BNE ++
-		LDA.l !ValidKeyLoaded : BNE ++
-			LDA #$03 ; down from file is unlock for password protected seeds
+		LDA.l ValidKeyLoaded : BNE ++
+			LDA.b #$03 ; down from file is unlock for password protected seeds
 			BRA .done
 		++
-		LDA #$04  ;otherwise down from file is delete
+		LDA.b #$04  ;otherwise down from file is delete
 		BRA .done
-	+ : CMP #$03 : BNE +
-		LDA #$04 ; down from unlock is delete
+	+ : CMP.b #$03 : BNE +
+		LDA.b #$04 ; down from unlock is delete
 		BRA .done
 	+
-	LDA #$00 ; down from delete is file
+	LDA.b #$00 ; down from delete is file
 	.done
-	STA $C8
+	STA.b $C8
 RTL
 ;--------------------------------------------------------------------------------
 FSSelectFile:
@@ -856,14 +855,14 @@ FSSelectFile:
 		PHX : PHY
 			JSL ValidatePassword : BEQ .must_unlock
 		PLY : PLX
-		LDA.b #$2C : STA $012E ;file screen selection sound
+		LDA.b #$2C : STA.w $012E ;file screen selection sound
 	.normal
-	LDA.b #$F1 : STA $012C
+	LDA.b #$F1 : STA.w $012C
 JML FSSelectFile_continue
 	.must_unlock
 	PLY : PLX
-	LDA #$03 : STA $C8 ;set cursor to unlock
-	LDA.b #$3C : STA $012E ; play error sound
+	LDA.b #$03 : STA.b $C8 ;set cursor to unlock
+	LDA.b #$3C : STA.w $012E ; play error sound
 JML FSSelectFile_return
 ;--------------------------------------------------------------------------------
 MaybeForceFileName:
@@ -873,8 +872,8 @@ MaybeForceFileName:
                 -
                 INX : INX
                 LDA.l StaticFileName, X : STA.l ExtendedFileNameSRAM, X
-                CPX #$16 : BEQ .done
-                CPX #$08 : BCS -
+                CPX.b #$16 : BEQ .done
+                CPX.b #$08 : BCS -
                 STA.l FileNameVanillaSRAM, X
                 BRA -
         .done
diff --git a/flipperkill.asm b/flipperkill.asm
index b7a9c53..758f172 100644
--- a/flipperkill.asm
+++ b/flipperkill.asm
@@ -3,69 +3,56 @@
 ;--------------------------------------------------------------------------------
 FlipperKill:
 	PHP
-	LDA $5D : CMP #$04 : BNE .done ; skip if we're not swimming
-	LDA FlippersEquipment : BNE .done ; skip if we have the flippers
-	LDA $7F5001 : BEQ .done ; skip if we're not marked in danger for softlock
-	LDA $8A : CMP $7F5098 : BEQ .done ; skip if we're on the same screen we entered the water on
-	;JSL.l KillFairies ; take away fairies
-	LDA IgnoreFaeries : ORA.b #$04 : STA IgnoreFaeries
+	LDA.b $5D : CMP.b #$04 : BNE .done ; skip if we're not swimming
+	LDA.l FlippersEquipment : BNE .done ; skip if we have the flippers
+	LDA.l $7F5001 : BEQ .done ; skip if we're not marked in danger for softlock
+	LDA.b $8A : CMP.l $7F5098 : BEQ .done ; skip if we're on the same screen we entered the water on
+	LDA.l IgnoreFaeries : ORA.b #$04 : STA.l IgnoreFaeries
 	LDA.b #$00 : STA CurrentHealth ; kill link
 	LDA.b #$00 : STA $7F5001 ; mark fake flipper softlock as impossible
 	.done
 	PLP
-	LDA CurrentHealth ; thing we wrote over
+	LDA.l CurrentHealth ; thing we wrote over
 RTL
 ;--------------------------------------------------------------------------------
 IgnoreFairyCheck:
     LDX.b #$00 ; thing we wrote over
-    LDA IgnoreFaeries : BIT.b #$04 : BEQ .normal
+    LDA.l IgnoreFaeries : BIT.b #$04 : BEQ .normal
 	
-    AND.b #$FB : STA IgnoreFaeries ; clear ignore fairy flag
+    AND.b #$FB : STA.l IgnoreFaeries ; clear ignore fairy flag
 	LDA.b #$F0 ; set check to invalid entry
 RTL
 	.normal
     LDA.b #$06 ; set check to fairy
 RTL
 ;--------------------------------------------------------------------------------
-;KillFairies:
-;	LDA BottleContentsOne : CMP #$06 : BNE +
-;		LDA #$02 : STA BottleContentsOne
-;	+ LDA BottleContentsTwo : CMP #$06 : BNE +
-;		LDA #$02 : STA BottleContentsTwo
-;	+ LDA BottleContentsThree : CMP #$06 : BNE +
-;		LDA #$02 : STA BottleContentsThree
-;	+ LDA BottleContentsFour : CMP #$06 : BNE +
-;		LDA #$02 : STA BottleContentsFour
-;	+
-;RTL
-;--------------------------------------------------------------------------------
 FlipperReset:
 	JSL $0998E8 ; AddTransitionSplash
-	LDA #$00 : STA $7F5001 ; mark fake flipper softlock as impossible
+	LDA.b #$00 : STA.l $7F5001 ; mark fake flipper softlock as impossible
 	.done 
 RTL
 ;--------------------------------------------------------------------------------
 FlipperFlag:
-	LDA $5D : CMP #$04 : BNE .done ; skip if we're not swimming
-	LDA FlippersEquipment : BNE .safe ; skip if we have the flippers
-	LDA #$01 : STA $7F5001 ; mark fake flipper softlock as possible
+	LDA.b $5D : CMP.b #$04 : BNE .done ; skip if we're not swimming
+	LDA.l FlippersEquipment : BNE .safe ; skip if we have the flippers
+	LDA.b #$01 : STA.l $7F5001 ; mark fake flipper softlock as possible
 	BRA .done
 	.safe
-	LDA #$00 : STA $7F5001 ; mark fake flipper softlock as impossible
+	LDA.b #$00 : STA.l $7F5001 ; mark fake flipper softlock as impossible
 	.done 
 RTL
 ;--------------------------------------------------------------------------------
 RegisterWaterEntryScreen:
 	PHA
-		LDA $8A : STA $7F5098 ; store ow index
+		LDA.b $8A : STA.l $7F5098 ; store ow index
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
 MysteryWaterFunction: ; *$3AE54 ALTERNATE ENTRY POINT
     LDA.b #$20 : STA $02E2
-    STZ $037B
-    STZ $55
-    STZ $0360
+    STZ.w $037B
+    STZ.b $55
+    STZ.w $0360
 RTL
 ;--------------------------------------------------------------------------------
 
@@ -88,11 +75,11 @@ protectff:
 	ASL
 	ASL
 	ASL
-	STA.b $06
+	STA.b Scrap06
 
 	LDA.b $22
 	AND.w #$1E00
-	ORA.b $06
+	ORA.b Scrap06
 
 	XBA
 	LSR
diff --git a/framehook.asm b/framehook.asm
index 0da5dba..2f98e74 100644
--- a/framehook.asm
+++ b/framehook.asm
@@ -8,14 +8,14 @@ FrameHookAction:
 	
 		SEP #$20
 		
-		LDA StatsLocked : BNE ++
+		LDA.l StatsLocked : BNE ++
 			REP #$20 ; set 16-bit accumulator
-				LDA LoopFrames : INC : STA LoopFrames : BNE +
-					LDA LoopFrames+2 : INC : STA LoopFrames+2
+				LDA.l LoopFrames : INC : STA.l LoopFrames : BNE +
+					LDA.l LoopFrames+2 : INC : STA.l LoopFrames+2
 				+
-				LDA $10 : CMP.w #$010E : BNE + ; move this to nmi hook?
-				LDA MenuFrames : INC : STA MenuFrames : BNE +
-					LDA MenuFrames+2 : INC : STA MenuFrames+2
+				LDA.l $10 : CMP.w #$010E : BNE + ; move this to nmi hook?
+				LDA.l MenuFrames : INC : STA.l MenuFrames : BNE +
+					LDA.l MenuFrames+2 : INC : STA.l MenuFrames+2
 				+
 		++
 	REP #$30 : PLA : PLP
@@ -24,36 +24,35 @@ RTL
 NMIHookAction:
 	PHA : PHX : PHY : PHD ; thing we wrote over, push stuff
 	
-	LDA StatsLocked : AND.w #$00FF : BNE ++
-		LDA NMIFrames : INC : STA NMIFrames : BNE +
-			LDA NMIFrames+2 : INC : STA NMIFrames+2
+	LDA.l StatsLocked : AND.w #$00FF : BNE ++
+		LDA.l NMIFrames : INC : STA.l NMIFrames : BNE +
+			LDA.l NMIFrames+2 : INC : STA.l NMIFrames+2
 		+
 	++
 	
 JML.l NMIHookReturn
 ;--------------------------------------------------------------------------------
-!NMI_AUX = "$7F5044"
 PostNMIHookAction:
-	LDA !NMI_AUX : BEQ +
-		LDA $00 : PHA ; preserve DP ram
-		LDA $01 : PHA
-		LDA $02 : PHA
+	LDA.l NMIAux : BEQ +
+		LDA.b Scrap00 : PHA ; preserve DP ram
+		LDA.b Scrap01 : PHA
+		LDA.b Scrap02 : PHA
 		
-		LDA !NMI_AUX+2 : STA $02 ; set up jump pointer
-		LDA !NMI_AUX+1 : STA $01
-		LDA !NMI_AUX+0 : STA $00
+		LDA.l NMIAux+2 : STA.b Scrap02 ; set up jump pointer
+		LDA.l NMIAux+1 : STA.b Scrap01 
+		LDA.l NMIAux+0 : STA.b Scrap00 
 		
 		PHK : PER .return-1 ; push stack for RTL return
 		JMP [$0000]
 		
 		.return
-		LDA.b #$00 : STA !NMI_AUX ; zero bank byte of NMI hook pointer
+		LDA.b #$00 : STA.l NMIAux ; zero bank byte of NMI hook pointer
 		
-		PLA : STA $02
-		PLA : STA $01
-		PLA : STA $00
+		PLA : STA.b Scrap02
+		PLA : STA.b Scrap01
+		PLA : STA.b Scrap00
 	+
 	
-	LDA $13 : STA $2100 ; thing we wrote over, turn screen back on
+	LDA.b $13 : STA.w INIDISP ; thing we wrote over, turn screen back on
 JML.l PostNMIHookReturn
 ;--------------------------------------------------------------------------------
diff --git a/ganonfixes.asm b/ganonfixes.asm
deleted file mode 100644
index 976cbad..0000000
--- a/ganonfixes.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-;================================================================================
-; Ganon Fixes
-;================================================================================
-
-;--------------------------------------------------------------------------------
-; GanonWarpRNG
-; out:	Accumulator - #$00 or #01 randomly, with no repeated #$01s
-;--------------------------------------------------------------------------------
-;GanonWarpRNG:
-;	JSL GetRandomInt : AND.b #$01 : BEQ .zero
-;	LDA !GANON_WARP_CHAIN : EOR #$01 : STA !GANON_WARP_CHAIN
-;RTL
-;	.zero
-;	STA !GANON_WARP_CHAIN
-;RTL
-;--------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/goalitem.asm b/goalitem.asm
index 9d112f8..2194c57 100644
--- a/goalitem.asm
+++ b/goalitem.asm
@@ -1,21 +1,14 @@
-;--------------------------------------------------------------------------------
-; $7F5010 - Scratch Space (Callee Preserved)
-;--------------------------------------------------------------------------------
-!GOAL_DRAW_ADDRESS = "$7EC72A"
-;--------------------------------------------------------------------------------
-; DrawGoalIndicator moved to newhud.asm
-;--------------------------------------------------------------------------------
 GoalItemGanonCheck:
-	LDA $0E20, X : CMP.b #$D6 : BNE .success ; skip if not ganon
+	LDA.w $0E20, X : CMP.b #$D6 : BNE .success ; skip if not ganon
 		JSL.l CheckGanonVulnerability
 		BCS .success
 
 		.fail
-		LDA $0D80, X : CMP.b #17 : !BLT .success ; decmial 17 because Acmlm's chart is decimal
+		LDA.w $0D80, X : CMP.b #17 : !BLT .success ; decmial 17 because Acmlm's chart is decimal
 		LDA.b #$00
 RTL
 		.success
-		LDA $44 : CMP.b #$80 ; thing we wrote over
+		LDA.b $44 : CMP.b #$80 ; thing we wrote over
 RTL
 ;--------------------------------------------------------------------------------
 ;Carry clear = ganon invincible
@@ -182,7 +175,7 @@ CheckForCrystalBossesDefeated:
 	REP #$30
 
 	; count of number of bosses killed
-	STZ.b $00
+	STZ.b Scrap00
 
 	LDY.w #10
 
@@ -202,7 +195,7 @@ CheckForCrystalBossesDefeated:
 	AND.w #$0800
 	BEQ ++
 
-	INC.b $00
+	INC.b Scrap00
 
 ++	DEY
 	BPL .next_check
@@ -210,7 +203,7 @@ CheckForCrystalBossesDefeated:
 	SEP #$30
 	PLY : PLX : PLB
 
-	LDA.b $00 : CMP.l NumberOfCrystalsRequiredForGanon
+	LDA.b Scrap00 : CMP.l NumberOfCrystalsRequiredForGanon
 
 
 	RTS
diff --git a/hardmode.asm b/hardmode.asm
index 65c934a..e4d00b5 100644
--- a/hardmode.asm
+++ b/hardmode.asm
@@ -3,22 +3,22 @@
 ;================================================================================
 CalculateSpikeFloorDamage:
 		REP #$20 ; set 16-bit accumulator
-		LDA $A0 ; these are all decimal because i got them that way
+		LDA.b $A0 ; these are all decimal because i got them that way
 		CMP.w #279
 		SEP #$20 ; set 8-bit accumulator
 		BNE +
 			LDA.l ByrnaCaveSpikeDamage
-			STA $0373
+			STA.w $0373
 			RTL
 		+
-	LDA $D055, Y
-	STA $0373
+	LDA.w $D055, Y
+	STA.w $0373
 RTL
 ;--------------------------------------------------------------------------------
 CalculateByrnaUsage:
-	LDA $1B : BEQ ++
+	LDA.b $1B : BEQ ++
 	REP #$20 ; set 16-bit accumulator
-	LDA $A0 ; these are all decimal because i got them that way
+	LDA.b $A0 ; these are all decimal because i got them that way
 	CMP.w #95 : BEQ + ; Ice Palace Spike Room
 	CMP.w #172 : BEQ + ; Blind Boss Room
 	CMP.w #179 : BEQ + ; Room in Misery Mire
@@ -29,16 +29,16 @@ CalculateByrnaUsage:
 	+
 		SEP #$20 ; set 8-bit accumulator
 		PHX : TYX
-		LDA.l HardModeExclusionCaneOfByrnaUsage, X : STA $00
+		LDA.l HardModeExclusionCaneOfByrnaUsage, X : STA.b Scrap00
 		PLX
 	++
-	LDA CurrentMagic ; thing we wrote over
+	LDA.l CurrentMagic ; thing we wrote over
 	JML IncrementMagicUseCounterByrna
 ;--------------------------------------------------------------------------------
 CalculateCapeUsage:
-	LDA $1B : BEQ ++
+	LDA.b $1B : BEQ ++
 	REP #$20 ; set 16-bit accumulator
-	LDA $A0 ; these are all decimal because i got them that way
+	LDA.b $A0 ; these are all decimal because i got them that way
 	CMP.w #95 : BEQ + ; Ice Palace Spike Room
 	CMP.w #179 : BEQ + ; Room in Misery Mire
 	CMP.w #213 : BEQ + ; Laser Bridge
@@ -48,15 +48,15 @@ CalculateCapeUsage:
 	+
 		SEP #$20 ; set 8-bit accumulator
 		PHX : TYX
-		LDA.l HardModeExclusionCapeUsage, X : STA $4C ; set cape decrement timer
+		LDA.l HardModeExclusionCapeUsage, X : STA.b $4C ; set cape decrement timer
 		PLX
 	++
 	JML IncrementMagicUseCounterOne
 ;--------------------------------------------------------------------------------
 ActivateInvulnerabilityOrDont:
-	LDA $1B : BEQ .nowhere_special
+	LDA.b $1B : BEQ .nowhere_special
 	REP #$20 ; set 16-bit accumulator
-	LDA $A0 ; these are all decimal because i got them that way
+	LDA.b $A0 ; these are all decimal because i got them that way
 	CMP.w #95 : BEQ .somewhere_cool ; Ice Palace Spike Room
 	CMP.w #179 : BEQ .somewhere_cool ; Room in Misery Mire
 	CMP.w #213 : BEQ .somewhere_cool ; Laser Bridge
@@ -66,9 +66,9 @@ ActivateInvulnerabilityOrDont:
 	BRA .nowhere_special
 	.somewhere_cool
 		SEP #$20 ; set 8-bit accumulator
-		LDA.b #$01 : STA $037B : RTL
+		LDA.b #$01 : STA.w $037B : RTL
 	.nowhere_special
-		LDA.l ByrnaInvulnerability : STA $037B
+		LDA.l ByrnaInvulnerability : STA.w $037B
 RTL
 ;--------------------------------------------------------------------------------
 GetItemDamageValue:
@@ -95,17 +95,17 @@ RTL
 ;Argument : A = id we want to find return 00 if none found, 01 if found
 SearchAncilla:
 {
-	STA $05
+	STA.b Scrap05
 	PHX 
 	LDX #$00
 	.loop
-	LDA $0C4A, X 
+	LDA.w $0C4A, X 
 	INX : CPX #$0A : BEQ .notFound
-	CMP $05 : BNE .loop
-		LDA #$01
+	CMP Scrap05 : BNE .loop
+		LDA.b #$01
 		BRA .return
 	.notFound
-		LDA #$00
+		LDA.b #$00
 	.return
 	PLX 
 	RTS
diff --git a/hashalphabet.asm b/hashalphabet.asm
index 3bf5f05..5e4c4e4 100644
--- a/hashalphabet.asm
+++ b/hashalphabet.asm
@@ -1,41 +1,39 @@
 ;--------------------------------------------------------------------------------
-;Hash Alphabet
-!ALPHA_BOW = "#$0000"
-!ALPHA_BOOM = "#$0001"
-!ALPHA_HOOK = "#$0002"
-!ALPHA_BOMB = "#$0003"
-!ALPHA_SHROOM = "#$0004"
-!ALPHA_POWDER = "#$0005"
-!ALPHA_ROD = "#$0006"
-!ALPHA_PENDANT = "#$0007"
-!ALPHA_BOMBOS = "#$0008"
-!ALPHA_ETHER = "#$0009"
-!ALPHA_QUAKE = "#$000A"
-!ALPHA_LAMP = "#$000B"
-!ALPHA_HAMMER = "#$000C"
-!ALPHA_SHOVEL = "#$000D"
-!ALPHA_FLUTE = "#$000E"
-!ALPHA_NET = "#$000F"
-!ALPHA_BOOK = "#$0010"
-!ALPHA_BOTTLE = "#$0011"
-!ALPHA_POTION = "#$0012"
-!ALPHA_CANE = "#$0013"
-!ALPHA_CAPE = "#$0014"
-!ALPHA_MIRROR = "#$0015"
-!ALPHA_BOOTS = "#$0016"
-!ALPHA_GLOVES = "#$0017"
-!ALPHA_FLIPPERS = "#$0018"
-!ALPHA_PEARL = "#$0019"
-!ALPHA_SHIELD = "#$001A"
-!ALPHA_TUNIC = "#$001B"
-!ALPHA_HEART = "#$001C"
-!ALPHA_MAP = "#$001D"
-!ALPHA_COMPASS = "#$001E"
-!ALPHA_KEY = "#$001F"
+; Hash Alphabet
+; ALPHA_BOW = $0000
+; ALPHA_BOOM = $0001
+; ALPHA_HOOK = $0002
+; ALPHA_BOMB = $0003
+; ALPHA_SHROOM = $0004
+; ALPHA_POWDER = $0005
+; ALPHA_ROD = $0006
+; ALPHA_PENDANT = $0007
+; ALPHA_BOMBOS = $0008
+; ALPHA_ETHER = $0009
+; ALPHA_QUAKE = $000A
+; ALPHA_LAMP = $000B
+; ALPHA_HAMMER = $000C
+; ALPHA_SHOVEL = $000D
+; ALPHA_FLUTE = $000E
+; ALPHA_NET = $000F
+; ALPHA_BOOK = $0010
+; ALPHA_BOTTLE = $0011
+; ALPHA_POTION = $0012
+; ALPHA_CANE = $0013
+; ALPHA_CAPE = $0014
+; ALPHA_MIRROR = $0015
+; ALPHA_BOOTS = $0016
+; ALPHA_GLOVES = $0017
+; ALPHA_FLIPPERS = $0018
+; ALPHA_PEARL = $0019
+; ALPHA_SHIELD = $001A
+; ALPHA_TUNIC = $001B
+; ALPHA_HEART = $001C
+; ALPHA_MAP = $001D
+; ALPHA_COMPASS = $001E
+; ALPHA_KEY = $001F
 ;--------------------------------------------------------------------------------
 
-;--------------------------------------------------------------------------------
-!BIGRAM = "$7EC900";
 ;--------------------------------------------------------------------------------
 LoadAlphabetTilemap:
 	PHB : PHA : PHX : PHY : PHP
@@ -45,9 +43,9 @@ LoadAlphabetTilemap:
 
 		LDX.b #$00 : -
 			LDA.w FileSelect_PlayerSelectText_Top, X
-			STA !BIGRAM, X
+			STA.l BigRAM, X
 			INX #2
-		CPX #128 : !BLT -
+		CPX.b #128 : !BLT -
 
 		LDY.b #00
 		LDX.b #$00 : -
@@ -55,12 +53,12 @@ LoadAlphabetTilemap:
 			AND.w #$001F ; mask to alphabet of 32
 
 			ASL #3 : PHY : TAY
-			LDA.w HashAlphabetTiles,Y : STA !BIGRAM+24, X
-			LDA.w HashAlphabetTiles+2,Y : STA !BIGRAM+24+2, X
-			LDA.w HashAlphabetTiles+4,Y : STA !BIGRAM+24+64, X
-			LDA.w HashAlphabetTiles+6,Y : STA !BIGRAM+24+64+2, X
+			LDA.w HashAlphabetTiles,Y : STA.l BigRAM+24, X
+			LDA.w HashAlphabetTiles+2,Y : STA.l BigRAM+24+2, X
+			LDA.w HashAlphabetTiles+4,Y : STA.l BigRAM+24+64, X
+			LDA.w HashAlphabetTiles+6,Y : STA.l BigRAM+24+64+2, X
 			PLY : INX #6 : INY
-		CPX #25 : !BLT -
+		CPX.b #25 : !BLT -
 
 		SEP #$20 ;  8-bit accumulator
 
@@ -72,38 +70,38 @@ RTL
 ;--------------------------------------------------------------------------------
 DMAAlphabetTilemap:
 	PHA : PHX
-		LDA $4300 : PHA ; preserve DMA parameters
-		LDA $4301 : PHA ; preserve DMA parameters
-		LDA $4302 : PHA ; preserve DMA parameters
-		LDA $4303 : PHA ; preserve DMA parameters
-		LDA $4304 : PHA ; preserve DMA parameters
-		LDA $4305 : PHA ; preserve DMA parameters
-		LDA $4306 : PHA ; preserve DMA parameters
+		LDA.w DMAP0 : PHA ; preserve DMA parameters
+		LDA.w BBAD0 : PHA ; preserve DMA parameters
+		LDA.w A1T0L : PHA ; preserve DMA parameters
+		LDA.w A1T0H : PHA ; preserve DMA parameters
+		LDA.w A1B0 : PHA ; preserve DMA parameters
+		LDA.w DAS0L : PHA ; preserve DMA parameters
+		LDA.w DAS0H : PHA ; preserve DMA parameters
 		;--------------------------------------------------------------------------------
-		LDA.b #$01 : STA $4300 ; set DMA transfer direction A -> B, bus A auto increment, double-byte mode
-		LDA.b #$80 : STA $2115 ; write read increment on $2119
-		LDA.b #$18 : STA $4301 ; set bus B destination to VRAM register
+		LDA.b #$01 : STA.w DMAP0 ; set DMA transfer direction A -> B, bus A auto increment, double-byte mode
+		LDA.b #$80 : STA.w VMAIN ; write read increment on $2119
+		LDA.b #$18 : STA.w BBAD0 ; set bus B destination to VRAM register
 
-		LDA.b #$60 : STA $2116 ; write VRAM destination address
-		STA $2117 ; write VRAM destination address
+		LDA.b #$60 : STA.w VMADDL ; write VRAM destination address
+		STA.w VMADDH ; write VRAM destination address
 
-		LDA.b #!BIGRAM : STA $4302 ; set bus A source address to WRAM
-		LDA.b #!BIGRAM>>8 : STA $4303 ; set bus A source address to WRAM
-		LDA.b #!BIGRAM>>16 : STA $4304 ; set bus A source bank
+		LDA.b #BigRAM : STA.w A1T0L ; set bus A source address to WRAM
+		LDA.b #BigRAM>>8 : STA.w A1T0H ; set bus A source address to WRAM
+		LDA.b #BigRAM>>16 : STA.w A1B0 ; set bus A source bank
 
-		LDA.b #$80 : STA $4305 : STZ $4306 ; set transfer size to 0x40
+		LDA.b #$80 : STA.w DAS0L : STZ.w DAS0H ; set transfer size to 0x40
 
-		LDA $2100 : PHA : LDA.b #$80 : STA $2100 ; save screen state & turn screen off
-			LDA #$01 : STA $420B ; begin DMA transfer
-		PLA : STA $2100 ; put screen back however it was before
+		LDA.w INIDISP : PHA : LDA.b #$80 : STA.w INIDISP ; save screen state & turn screen off
+			LDA.b #$01 : STA.w MDMAEN ; begin DMA transfer
+		PLA : STA.w INIDISP ; put screen back however it was before
 		;--------------------------------------------------------------------------------
-		PLA : STA $4306 ; restore DMA parameters
-		PLA : STA $4305 ; restore DMA parameters
-		PLA : STA $4304 ; restore DMA parameters
-		PLA : STA $4303 ; restore DMA parameters
-		PLA : STA $4302 ; restore DMA parameters
-		PLA : STA $4301 ; restore DMA parameters
-		PLA : STA $4300 ; restore DMA parameters
+		PLA : STA.w DAS0H ; restore DMA parameters
+		PLA : STA.w DAS0L ; restore DMA parameters
+		PLA : STA.w A1B0 ; restore DMA parameters
+		PLA : STA.w A1T0H ; restore DMA parameters
+		PLA : STA.w A1T0L ; restore DMA parameters
+		PLA : STA.w BBAD0 ; restore DMA parameters
+		PLA : STA.w DMAP0 ; restore DMA parameters
 	PLX : PLA
 RTS
 ;--------------------------------------------------------------------------------
diff --git a/hashalphabethooks.asm b/hashalphabethooks.asm
index 3bc9879..f2e094a 100644
--- a/hashalphabethooks.asm
+++ b/hashalphabethooks.asm
@@ -1,106 +1,80 @@
 ;--------------------------------------------------------------------------------
-!FSTILE_SPACE = "$0188"
+!FSTILE_SPACE = $0188
 
-!FSTILE_BRACKET_OPEN_TOP = "$1D8A"
-!FSTILE_BRACKET_OPEN_BOTTOM = "$1D9A"
+!FSTILE_BRACKET_OPEN_TOP = $1D8A
+!FSTILE_BRACKET_OPEN_BOTTOM = $1D9A
 
-!FSTILE_BRACKET_CLOSE_TOP = "$1D8B"
-!FSTILE_BRACKET_CLOSE_BOTTOM = "$1D9B"
+!FSTILE_BRACKET_CLOSE_TOP = $1D8B
+!FSTILE_BRACKET_CLOSE_BOTTOM = $1D9B
 
-!FSTILE_A_TOP = "$1D4A"
-!FSTILE_A_BOTTOM = "$1D5A"
+!FSTILE_A_TOP = $1D4A
+!FSTILE_A_BOTTOM = $1D5A
 
-!FSTILE_C_TOP = "$1D4C"
-!FSTILE_C_BOTTOM = "$1D5C"
+!FSTILE_C_TOP = $1D4C
+!FSTILE_C_BOTTOM = $1D5C
 
-!FSTILE_D_TOP = "$1D4D"
-!FSTILE_D_BOTTOM = "$1D5D"
+!FSTILE_D_TOP = $1D4D
+!FSTILE_D_BOTTOM = $1D5D
 
-!FSTILE_E_TOP = "$1D4E"
-!FSTILE_E_BOTTOM = "$1D5E"
+!FSTILE_E_TOP = $1D4E
+!FSTILE_E_BOTTOM = $1D5E
 
-!FSTILE_F_TOP = "$1D4F"
-!FSTILE_F_BOTTOM = "$1D5F"
+!FSTILE_F_TOP = $1D4F
+!FSTILE_F_BOTTOM = $1D5F
 
-!FSTILE_H_TOP = "$1D61"
-!FSTILE_H_BOTTOM = "$1D71"
+!FSTILE_H_TOP = $1D61
+!FSTILE_H_BOTTOM = $1D71
 
-!FSTILE_I_TOP = "$1D62"
-!FSTILE_I_BOTTOM = "$1D72"
+!FSTILE_I_TOP = $1D62
+!FSTILE_I_BOTTOM = $1D72
 
-!FSTILE_K_TOP = "$1D64"
-!FSTILE_K_BOTTOM = "$1D74"
+!FSTILE_K_TOP = $1D64
+!FSTILE_K_BOTTOM = $1D74
 
-!FSTILE_L_TOP = "$1D65"
-!FSTILE_L_BOTTOM = "$1D75"
+!FSTILE_L_TOP = $1D65
+!FSTILE_L_BOTTOM = $1D75
 
-!FSTILE_N_TOP = "$1D67"
-!FSTILE_N_BOTTOM = "$1D77"
+!FSTILE_N_TOP = $1D67
+!FSTILE_N_BOTTOM = $1D77
 
-!FSTILE_O_TOP = "$1D68"
-!FSTILE_O_BOTTOM = "$1D78"
+!FSTILE_O_TOP = $1D68
+!FSTILE_O_BOTTOM = $1D78
 
-!FSTILE_P_TOP = "$1D69"
-!FSTILE_P_BOTTOM = "$1D79"
+!FSTILE_P_TOP = $1D69
+!FSTILE_P_BOTTOM = $1D79
 
-!FSTILE_S_TOP = "$1D6C"
-!FSTILE_S_BOTTOM = "$1D7C"
+!FSTILE_S_TOP = $1D6C
+!FSTILE_S_BOTTOM = $1D7C
 
-!FSTILE_T_TOP = "$1D6D"
-!FSTILE_T_BOTTOM = "$1D7D"
+!FSTILE_T_TOP = $1D6D
+!FSTILE_T_BOTTOM = $1D7D
 
-!FSTILE_U_TOP = "$1D6E"
-!FSTILE_U_BOTTOM = "$1D7E"
+!FSTILE_U_TOP = $1D6E
+!FSTILE_U_BOTTOM = $1D7E
 
-!FSTILE_Y_TOP = "$1D82"
-!FSTILE_Y_BOTTOM = "$1D92"
+!FSTILE_Y_TOP = $1D82
+!FSTILE_Y_BOTTOM = $1D92
 ;--------------------------------------------------------------------------------
 org $0CDE60 ; <- 65E60
 FileSelect_CopyFile_Top:
 db $62, $A5, $00, $15
 dw !FSTILE_SPACE,!FSTILE_SPACE,!FSTILE_SPACE,!FSTILE_SPACE,!FSTILE_SPACE,!FSTILE_SPACE,!FSTILE_SPACE,!FSTILE_SPACE,!FSTILE_SPACE,!FSTILE_SPACE,!FSTILE_SPACE
-;dw !FSTILE_C_TOP, !FSTILE_SPACE, !FSTILE_O_TOP, !FSTILE_SPACE, !FSTILE_P_TOP, !FSTILE_SPACE, !FSTILE_Y_TOP, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE
-;dw $1CAC, !FSTILE_SPACE, $1D23, !FSTILE_SPACE, $1D89, !FSTILE_SPACE, $1D04, !FSTILE_SPACE, $1D89, !FSTILE_SPACE, $1D07
 ;--------------------------------------------------------------------------------
 org $0CDE7A ; <- 65E7A
 FileSelect_CopyFile_Bottom:
 db $62, $C5, $00, $15
 dw !FSTILE_SPACE,!FSTILE_SPACE,!FSTILE_SPACE,!FSTILE_SPACE,!FSTILE_SPACE,!FSTILE_SPACE,!FSTILE_SPACE,!FSTILE_SPACE,!FSTILE_SPACE,!FSTILE_SPACE,!FSTILE_SPACE
-;dw !FSTILE_C_BOTTOM, !FSTILE_SPACE, !FSTILE_O_BOTTOM, !FSTILE_SPACE, !FSTILE_P_BOTTOM, !FSTILE_SPACE, !FSTILE_Y_BOTTOM, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE
-;dw $1CBC, !FSTILE_SPACE, $1D33, !FSTILE_SPACE, $1D99, !FSTILE_SPACE, $1D14, !FSTILE_SPACE, $1D99, !FSTILE_SPACE, $1D17
 ;--------------------------------------------------------------------------------
 org $0CDE94 ; <- 65E94
 FileSelect_KillFile_Top:
 db $63, $25, $00, $19
 dw !FSTILE_D_TOP,  !FSTILE_E_TOP, !FSTILE_L_TOP, !FSTILE_E_TOP, !FSTILE_T_TOP, !FSTILE_E_TOP, !FSTILE_SPACE, !FSTILE_F_TOP, !FSTILE_I_TOP, !FSTILE_L_TOP, !FSTILE_E_TOP, !FSTILE_SPACE, !FSTILE_SPACE
-;dw !FSTILE_D_TOP, !FSTILE_SPACE, !FSTILE_E_TOP, !FSTILE_SPACE, !FSTILE_L_TOP, !FSTILE_SPACE, !FSTILE_E_TOP, !FSTILE_SPACE, !FSTILE_T_TOP, !FSTILE_SPACE, !FSTILE_E_TOP, !FSTILE_SPACE, !FSTILE_SPACE
-;dw !FSTILE_K_TOP, !FSTILE_SPACE, !FSTILE_I_TOP, !FSTILE_SPACE, !FSTILE_L_TOP, !FSTILE_SPACE, !FSTILE_L_TOP, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE
-;dw !FSTILE_K_TOP, !FSTILE_SPACE, !FSTILE_I_TOP, !FSTILE_SPACE, !FSTILE_L_TOP, !FSTILE_SPACE, !FSTILE_L_TOP, !FSTILE_SPACE, $1D04, !FSTILE_SPACE, $1D89, !FSTILE_SPACE, $1D07
-;--------------------------------------------------------------------------------
+
 org $0CDEB2 ; <- 65EB2
 FileSelect_KillFile_Bottom:
 db $63, $45, $00, $19
 dw !FSTILE_D_BOTTOM, !FSTILE_E_BOTTOM, !FSTILE_L_BOTTOM, !FSTILE_E_BOTTOM, !FSTILE_T_BOTTOM, !FSTILE_E_BOTTOM, !FSTILE_SPACE, !FSTILE_F_BOTTOM, !FSTILE_I_BOTTOM, !FSTILE_L_BOTTOM, !FSTILE_E_BOTTOM, !FSTILE_SPACE, !FSTILE_SPACE
-;dw !FSTILE_D_BOTTOM, !FSTILE_SPACE, !FSTILE_E_BOTTOM, !FSTILE_SPACE, !FSTILE_L_BOTTOM, !FSTILE_SPACE, !FSTILE_E_BOTTOM, !FSTILE_SPACE, !FSTILE_T_BOTTOM, !FSTILE_SPACE, !FSTILE_E_BOTTOM, !FSTILE_SPACE, !FSTILE_SPACE
-;dw !FSTILE_K_BOTTOM, !FSTILE_SPACE, !FSTILE_I_BOTTOM, !FSTILE_SPACE, !FSTILE_L_BOTTOM, !FSTILE_SPACE, !FSTILE_L_BOTTOM, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE
-;dw !FSTILE_K_BOTTOM, !FSTILE_SPACE, !FSTILE_I_BOTTOM, !FSTILE_SPACE, !FSTILE_L_BOTTOM, !FSTILE_SPACE, !FSTILE_L_BOTTOM, !FSTILE_SPACE, $1D14, !FSTILE_SPACE, $1D99, !FSTILE_SPACE, $1D17
-;--------------------------------------------------------------------------------
-;org $0CDDE8 ; <- 65DE8
-;FileSelect_PlayerSelectText_Top:
-;db $60, $62, $00, $37
-;db $8A, $1D, $88, $01, $69, $1D, $88, $01, $65, $1D, $88, $01, $4A, $1D, $88, $01
-;db $82, $1D, $88, $01, $4E, $1D, $88, $01, $6B, $1D, $88, $01, $88, $01, $6C, $1D
-;db $88, $01, $4E, $1D, $88, $01, $65, $1D, $88, $01, $4E, $1D, $88, $01, $4C, $1D
-;db $88, $01, $6D, $1D, $88, $01, $8B, $1D
-;--------------------------------------------------------------------------------
-;org $0CDE24 ; <- 65E24
-;FileSelect_PlayerSelectText_Bottom:
-;db $60, $82, $00, $37
-;db $9A, $1D, $88, $01, $79, $1D, $88, $01, $75, $1D, $88, $01, $5A, $1D, $88, $01
-;db $92, $1D, $88, $01, $5E, $1D, $88, $01, $7B, $1D, $88, $01, $88, $01, $7C, $1D
-;db $88, $01, $5E, $1D, $88, $01, $75, $1D, $88, $01, $5E, $1D, $88, $01, $5C, $1D
-;db $88, $01, $7D, $1D, $88, $01, $9B, $1D
-;--------------------------------------------------------------------------------
+
 ;CopyFile_Header:
 org $0CE228 ; <- 66228
 dw !FSTILE_BRACKET_OPEN_TOP, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_C_TOP, !FSTILE_O_TOP, !FSTILE_P_TOP, !FSTILE_Y_TOP, !FSTILE_SPACE, !FSTILE_F_TOP, !FSTILE_I_TOP, !FSTILE_L_TOP, !FSTILE_E_TOP, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_BRACKET_CLOSE_TOP
@@ -140,10 +114,8 @@ dw !FSTILE_BRACKET_OPEN_BOTTOM, !FSTILE_SPACE, !FSTILE_D_BOTTOM, !FSTILE_E_BOTTO
 ;KillFile_Which:
 org $0CE04E ; <- 6604E
 dw !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE
-;dw $0D4D, $0D4E, $0D65, $0D4E, $0D6D, $0D4E, !FSTILE_SPACE, $0D80, $0D61, $0D62, $0D4C, $0D61, !FSTILE_SPACE, $0D4F, $0D62, $0D65, $0D4E, $0D86, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE
 org $0CE084 ; <- 66084
 dw !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE
-;dw $0D5D, $0D5E, $0D75, $0D5E, $0D7D, $0D5E, !FSTILE_SPACE, $0D90, $0D71, $0D72, $0D5C, $0D71, !FSTILE_SPACE, $0D5F, $0D72, $0D75, $0D5E, $0D96, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE, !FSTILE_SPACE
 
 ;KillFile_Execute:
 org $0CD328 ; <- 65328
diff --git a/heartpieces.asm b/heartpieces.asm
index 08aaea2..d9cba25 100644
--- a/heartpieces.asm
+++ b/heartpieces.asm
@@ -12,10 +12,10 @@ HeartPieceGet:
 
 	.skipLoad
 
-	STZ $02E9 ; 0 = Receiving item from an NPC or message
+	STZ.w $02E9 ; 0 = Receiving item from an NPC or message
 
 	CPY.b #$26 : BNE .notHeart ; don't add a 1/4 heart if it's not a heart piece
-	LDA HeartPieceQuarter : INC A : AND.b #$03 : STA HeartPieceQuarter : BNE .unfinished_heart ; add up heart quarters
+	LDA.l HeartPieceQuarter : INC A : AND.b #$03 : STA.l HeartPieceQuarter : BNE .unfinished_heart ; add up heart quarters
 	BRA .giveItem
 
 	.notHeart
@@ -46,27 +46,24 @@ HeartContainerGet:
 
 	BRA HeartPieceGet_skipLoad
 ;--------------------------------------------------------------------------------
-!REDRAW = "$7F5000"
 DrawHeartPieceGFX:
 	PHP
 	JSL.l Sprite_IsOnscreen : BCC .offscreen
 	
 	PHA : PHY
-	LDA !REDRAW : BEQ .skipInit ; skip init if already ready
+	LDA.l RedrawFlag : BEQ .skipInit ; skip init if already ready
 	JSL.l HeartPieceSpritePrep
 	JMP .done ; don't draw on the init frame
 	
 	.skipInit
-	LDA $0E80, X ; Retrieve stored item type
+	LDA.w $0E80, X ; Retrieve stored item type
 
 	.skipLoad
 	
 	PHA
 		JSL.l IsNarrowSprite : BCC +
-		LDA $0E60, X : ORA.b #$20 : STA $0E60, X
+		LDA.w $0E60, X : ORA.b #$20 : STA.w $0E60, X
 	+
-	;LDA $0E60, X : ORA.b #$10 : STA $0E60, X
-	
     PLA
 	
 	JSL.l DrawDynamicTile
@@ -78,18 +75,17 @@ DrawHeartPieceGFX:
 	PLP
 RTL
 ;--------------------------------------------------------------------------------
-!REDRAW = "$7F5000"
 DrawHeartContainerGFX:
 	PHP
 	JSL.l Sprite_IsOnscreen : BCC DrawHeartPieceGFX_offscreen
 	
 	PHA : PHY
-	LDA !REDRAW : BEQ .skipInit ; skip init if already ready
+	LDA.l RedrawFlag : BEQ .skipInit ; skip init if already ready
 	JSL.l HeartContainerSpritePrep
 	BRA DrawHeartPieceGFX_done ; don't draw on the init frame
 	
 	.skipInit
-	LDA $0E80, X ; Retrieve stored item type
+	LDA.w $0E80, X ; Retrieve stored item type
 
 	BRA DrawHeartPieceGFX_skipLoad
 ;--------------------------------------------------------------------------------
@@ -107,7 +103,7 @@ HeartContainerSound:
 RTL
 ;--------------------------------------------------------------------------------
 NormalItemSkipSound:
-	LDA $0C5E, X ; thing we wrote over
+	LDA.w $0C5E, X ; thing we wrote over
 
 	CPY.b #$20 : BEQ + ; Skip for Crystal
 	CPY.b #$37 : BEQ + ; Skip for Pendants
@@ -115,7 +111,7 @@ NormalItemSkipSound:
 	CPY.b #$39 : BEQ +
 	
 	PHA
-    JSL.l CheckIfBossRoom
+        JSL.l CheckIfBossRoom
 	PLA
 RTL
 	+
@@ -123,58 +119,56 @@ RTL
 RTL
 ;--------------------------------------------------------------------------------
 HeartUpgradeSpawnDecision: ; this should return #$00 to make the hp spawn
-	LDA !FORCE_HEART_SPAWN : BEQ .normal_behavior
+	LDA.l ForceHeartSpawn : BEQ .normal_behavior
 	
-	DEC : STA !FORCE_HEART_SPAWN
-	LDA #$00
+	DEC : STA.l ForceHeartSpawn
+	LDA.b #$00
 RTL
 	
 	.normal_behavior
-	LDA OverworldEventDataWRAM, X
+	LDA.l OverworldEventDataWRAM, X
 RTL
 ;--------------------------------------------------------------------------------
 SaveHeartCollectedStatus:
-	LDA !SKIP_HEART_SAVE : BEQ .normal_behavior
+	LDA.l SkipHeartSave : BEQ .normal_behavior
 	
-	DEC : STA !SKIP_HEART_SAVE
+	DEC : STA.l SkipHeartSave
 RTL
 	
 	.normal_behavior
-	LDA OverworldEventDataWRAM, X : ORA.b #$40 : STA OverworldEventDataWRAM, X
+	LDA.l OverworldEventDataWRAM, X : ORA.b #$40 : STA.l OverworldEventDataWRAM, X
 RTL
 ;--------------------------------------------------------------------------------
-!REDRAW = "$7F5000"
 HeartPieceSpritePrep:
 	PHA
 	
-	LDA ServerRequestMode : BEQ + :  : +
+	LDA.l ServerRequestMode : BEQ + :  : +
 	
-	LDA #$01 : STA !REDRAW
-	LDA $5D : CMP #$14 : BEQ .skip ; skip if we're mid-mirror
+	LDA.b #$01 : STA.l RedrawFlag
+	LDA.b $5D : CMP.b #$14 : BEQ .skip ; skip if we're mid-mirror
 
-	LDA #$00 : STA !REDRAW
+	LDA.b #$00 : STA.l RedrawFlag
 	JSL.l LoadHeartPieceRoomValue ; load item type
-	STA $0E80, X ; Store item type
+	STA.w $0E80, X ; Store item type
 	JSL.l PrepDynamicTile
 	
 	.skip
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
-!REDRAW = "$7F5000"
 HeartContainerSpritePrep:
 	PHA
 	
-	LDA #$00 : STA !REDRAW
+	LDA.b #$00 : STA.l RedrawFlag
 	JSL.l LoadHeartContainerRoomValue ; load item type
-	STA $0E80, X ; Store item type
+	STA.w $0E80, X ; Store item type
 	JSL.l PrepDynamicTile
 	
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
 LoadHeartPieceRoomValue:
-	LDA $1B : BEQ .outdoors ; check if we're indoors or outdoors
+	LDA.b $1B : BEQ .outdoors ; check if we're indoors or outdoors
 	.indoors
 	JSL.l LoadIndoorValue
 	JMP .done
@@ -183,38 +177,37 @@ LoadHeartPieceRoomValue:
 	.done
 RTL
 ;--------------------------------------------------------------------------------
-!REDRAW = "$7F5000"
 HPItemReset:
 	JSL $09AD58 ; GiveRupeeGift - thing we wrote over
-	PHA : LDA #$01 : STA !REDRAW : PLA
+	PHA : LDA.b #$01 : STA.l RedrawFlag : PLA
 RTL
 ;--------------------------------------------------------------------------------
 MaybeMarkDigSpotCollected:
 	PHA : PHP
-		LDA $1B : BNE +
+		LDA.b $1B : BNE +
 		REP #$20 ; set 16-bit accumulator
-		LDA $8A
+		LDA.b $8A
 		CMP.w #$2A : BNE +
-			LDA HasGroveItem : ORA.w #$0001 : STA HasGroveItem
+			LDA.l HasGroveItem : ORA.w #$0001 : STA.l HasGroveItem
 		+
 	PLP : PLA
 RTL
 ;--------------------------------------------------------------------------------
 macro GetPossiblyEncryptedItem(ItemLabel,TableLabel)
-	LDA IsEncrypted : BNE ?encrypted
+	LDA.l IsEncrypted : BNE ?encrypted
 		LDA.l <ItemLabel>
 		BRA ?done
 	?encrypted:
 	PHX : PHP
 		REP #$30 ; set 16-bit accumulator & index registers
-		LDA $00 : PHA : LDA $02 : PHA
+		LDA.b Scrap00 : PHA : LDA.b Scrap02 : PHA
 
-		LDA.w #<TableLabel> : STA $00
-		LDA.w #<TableLabel>>>16 : STA $02
+		LDA.w #<TableLabel> : STA.b Scrap00
+		LDA.w #<TableLabel>>>16 : STA.b Scrap02
 		LDA.w #<ItemLabel>-<TableLabel>
 		JSL RetrieveValueFromEncryptedTable
 
-		PLX : STX $02 : PLX : STX $01
+		PLX : STX.b Scrap02 : PLX : STX.b Scrap01
 	PLP : PLX
 	?done:
 endmacro
@@ -222,7 +215,7 @@ endmacro
 LoadIndoorValue:
 	PHP
 	REP #$20 ; set 16-bit accumulator
-	LDA $A0 ; these are all decimal because i got them that way
+	LDA.b $A0 ; these are all decimal because i got them that way
 	CMP.w #225 : BNE +
 		%GetPossiblyEncryptedItem(HeartPiece_Forest_Thieves, HeartPieceIndoorValues)
 		JMP .done
@@ -233,7 +226,7 @@ LoadIndoorValue:
 		%GetPossiblyEncryptedItem(HeartPiece_Spectacle_Cave, HeartPieceIndoorValues)
 		JMP .done
 	+ CMP.w #283 : BNE +
-		LDA $22 : XBA : AND.w #$0001 ; figure out where link is
+		LDA.b $22 : XBA : AND.w #$0001 ; figure out where link is
 		BNE ++
 			%GetPossiblyEncryptedItem(HeartPiece_Circle_Bushes, HeartPieceIndoorValues)
 			JMP .done
@@ -247,7 +240,7 @@ LoadIndoorValue:
 		%GetPossiblyEncryptedItem(HeartPiece_Smith_Pegs, HeartPieceIndoorValues)
 		JMP .done
 	+ CMP.w #135 : BNE +
-		LDA StandingKey_Hera
+		LDA.l StandingKey_Hera
 		JMP .done
 	+
 	LDA.w #$0017 ; default to a normal hp
@@ -267,9 +260,9 @@ RTL
 LoadOutdoorValue:
 	PHP
 	REP #$20 ; set 16-bit accumulator
-	LDA $8A
+	LDA.b $8A
 	CMP.w #$03 : BNE +
-		LDA $22 : CMP.w #1890 : !BLT ++
+		LDA.b $22 : CMP.w #1890 : !BLT ++
 			%GetPossiblyEncryptedItem(HeartPiece_Spectacle, HeartPieceOutdoorValues)
 			JMP .done
 		++
@@ -285,7 +278,7 @@ LoadOutdoorValue:
 		%GetPossiblyEncryptedItem(HauntedGroveItem, HeartPieceOutdoorValues)
 		JMP .done
 	+ CMP.w #$30 : BNE +
-		LDA $22 : CMP.w #512 : !BGE ++
+		LDA.b $22 : CMP.w #512 : !BGE ++
 			%GetPossiblyEncryptedItem(HeartPiece_Desert, HeartPieceOutdoorValues)
 			JMP .done
 		++
@@ -335,7 +328,7 @@ LoadHeartContainerRoomValue:
 LoadBossValue:
 	PHP
 	REP #$20 ; set 16-bit accumulator
-	LDA $A0 ; these are all decimal because i got them that way
+	LDA.b $A0 ; these are all decimal because i got them that way
 	CMP.w #200 : BNE +
 		%GetPossiblyEncryptedItem(HeartContainer_ArmosKnights, HeartContainerBossValues)
 		JMP .done
@@ -378,7 +371,7 @@ CheckIfBossRoom:
 ; Carry set if we're in a boss room, unset otherwise.
 ;--------------------------------------------------------------------------------
 	REP #$20 ; set 16-bit accumulator
-	LDA $A0 ; these are all decimal because i got them that way
+	LDA.b $A0 ; these are all decimal because i got them that way
 	CMP.w #200 : BEQ .done
 	CMP.w #51 : BEQ .done
 	CMP.w #7 : BEQ .done
diff --git a/hooks.asm b/hooks.asm
index ede0106..8ea3609 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -70,8 +70,6 @@ JSL.l OnDungeonEntrance
 ;================================================================================
 ; D-Pad Invert
 ;--------------------------------------------------------------------------------
-;org $0083D9 ; <- 3D9 - Bank00.asm : 611 (LDA $4219 : STA $01)
-;JSL.l InvertDPad : NOP
 org $0083D1 ; <- 3D1 - Bank00.asm (STZ.w JOYPAD - useless instruction here)
 JML.l InvertDPad : SKIP 9
 InvertDPadReturn:
@@ -361,11 +359,10 @@ JSL.l NewBatInit
 org $06EDB5 ;<- 36DBE - Bank06.asm : 4882 (LDA $7F6000, X : STA $02)
 JSL.l LookupDamageLevel
 ;--------------------------------------------------------------------------------
-!StalfosBombDamage = "$7F509D"
-org $1eab5e ;<- F2B5E - sprite_stalfos_knight.asm : 135  (LDA.b #$00 : STA $7F6918)
-STA.l !StalfosBombDamage
-org $1eaad6 ;<- F2AB6 - sprite_stalfos_knight.asm : 32  (LDA.b #$02 : STA $7F6918)
-STA.l !StalfosBombDamage
+org $1EAB5E ;<- F2B5E - sprite_stalfos_knight.asm : 135  (LDA.b #$00 : STA $7F6918)
+STA.l StalfosBombDamage
+org $1EAAD6 ;<- F2AB6 - sprite_stalfos_knight.asm : 32  (LDA.b #$02 : STA $7F6918)
+STA.l StalfosBombDamage
 ;--------------------------------------------------------------------------------
 
 ;================================================================================
@@ -810,10 +807,6 @@ dw $0000, $0002, $0004, $0032, $0004, $0006, $0030
 ;================================================================================
 ; Accessibility
 ;--------------------------------------------------------------------------------
-;org $0AC574 ; <- 54574 - Bank0A.asm : 1797 (LDA $0D : STA $0802, X)
-;JSL FlipGreenPendant
-;NOP #6
-;--------------------------------------------------------------------------------
 org $02A3F4 ; <- 123F4 - Bank02.asm : 6222 (LDA.b #$72 : BRA .setBrightness)
 BRA + : NOP #2 : +
 org $02A3FD ; <- 123FD - Bank02.asm : 6233 (LDA.b #$32 : STA $9a)
@@ -874,21 +867,11 @@ db $B1, $C6, $F9, $C9, $C6, $F9 ; data insert - 2 chests, fat fairy room
 org $01E97E ; <- E97E ($280016, $250016)
 dl $080116, $070116; <- E97E
 ;--------------------------------------------------------------------------------
-;org $06C9BC ; <- 349BC - sprite_ponds.asm : 1066
-;org $06C9C0 ; <- 349C0 - sprite_ponds.asm : 1068
-;org $06C926 ; <- 34926 - sprite_ponds.asm : 945
-;JML.l GetFairySword
-;NOP #12
 org $06C936 ; <- 34936 - sprite_ponds.asm : 952
 PyramidFairy_BRANCH_IOTA:
 org $06C948 ; <- 34948 - sprite_ponds.asm : 961
 PyramidFairy_BRANCH_GAMMA:
 ;--------------------------------------------------------------------------------
-;org $0EF7BD ; <- 777BD - sprite_ponds.asm : 1890 (LDA $7EF340, X : BMI .invalidValue : BNE VWF_ChangeItemTiles)
-;JSL.l ReadInventoryPond
-;org $0EF7E4 ; <- 777E4 - sprite_ponds.asm : 1922 (LDA $7EF340, X : BMI .invalidValue : BNE VWF_ChangeItemTiles)
-;JSL.l ReadInventoryPond
-;--------------------------------------------------------------------------------
 org $1EE16E ; <- F616E - sprite_bomb_shop_entity.asm : 73
 NOP #8 ; fix bomb shop dialog for dwarfless big bomb
 org $068A14 ; <- 30A14 - sprite_prep.asm : 716
@@ -957,9 +940,6 @@ db $03 ; fade out speed. Should be power of 2 minus 1
 ;================================================================================
 ; New Items
 ;--------------------------------------------------------------------------------
-;org $07B57B ; <- 3B57B - Bank07.asm : 8523 (BMI .cantOpen)
-;NOP #2
-;--------------------------------------------------------------------------------
 org $07B574 ; <- 3B574 - Bank07.asm : 8519 (LDA.b #$01 : STA $02E9)
 JSL.l ChestPrep
 NOP #3
@@ -1037,15 +1017,9 @@ LDA.w BottleListExpanded, X
 org $09895C ; 4895C - ancilla_init.asm:1344 (LDA PotionList, X)
 LDA.w PotionListExpanded, X
 ;--------------------------------------------------------------------------------
-;org $098A36 ; <- 48A36 - ancilla_init.asm:1432 (LDA AddReceiveItem.item_graphics_indices, Y : STA $72)
-;LDA AddReceivedItemExpanded_item_graphics_indices, Y
-;--------------------------------------------------------------------------------
 org $06D1EB ; 351EB - sprite_absorbable.asm:364 (STA $7EF375) ; bugbug commented out until i figure out why it doesn't work
 JSL HandleBombAbsorbtion
 ;--------------------------------------------------------------------------------
-;org $09873F ; <- 04873F - ancilla_init.asm : 960 (ADC [$00] : STA [$00] )
-;JSL.l AddToStock
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Kholdstare Shell Fix
@@ -1061,14 +1035,6 @@ LDA.w #$00B0
 ;================================================================================
 ; Potion Refill Fixes
 ;--------------------------------------------------------------------------------
-;org $0DF1B3 ; <- 6F1B3 - headsup_display.asm:492 - (SEP #$30)
-;JSL.l RefillMagic
-;RTL
-;--------------------------------------------------------------------------------
-;org $0DF128 ; <- 6F128 - headsup_display.asm:407 - (LDA $7EF36D : CMP $7EF36C : BCC .refillAllHealth)
-;JSL.l RefillHealth
-;RTL
-;--------------------------------------------------------------------------------
 org $00F8FB ; <- 78FB - Bank00.asm:8507 - (JSL HUD.RefillHealth : BCC BRANCH_ALPHA)
 JSL.l RefillHealth
 ;--------------------------------------------------------------------------------
@@ -1119,36 +1085,9 @@ db 80 ; BRA
 org $05DA81 ; <- 2DA81 - sprite_uncle_and_priest.asm : 65 (BCC .dontHaveMasterSword)
 db 80 ; BRA
 ;--------------------------------------------------------------------------------
-;org $05DE1D ; <- 2DE1D - sprite_uncle_and_priest.asm : 725 (LDA.b #$A0 : STA $7EF372)
-;JSL.l RefillHealthPlusMagic8bit
-;NOP #2
-;--------------------------------------------------------------------------------
 org $05DEF8 ; <- 2DEF8 - sprite_uncle_and_priest.asm : 917 (LDA.b #$05)
 LDA.b #$00
 ;--------------------------------------------------------------------------------
-;org $1EEAB6 ; <- F6AB6 - sprite_old_mountain_man.asm : 338 (LDA.b #$A0 : STA $7EF372)
-;JSL.l RefillHealthPlusMagic8bit
-;NOP #2
-;--------------------------------------------------------------------------------
-;org $01E5B2 ; <- E5B8 - lower pot link's house
-;db $14 ; fairy
-;org $01E5B5 ; <- E5B8 - lower pot link's house
-;db $14 ; fairy
-;org $01E5B8 ; <- E5B8 - lower pot link's house
-;db $0D ; big magic
-;--------------------------------------------------------------------------------
-
-;================================================================================
-; Ganon's Tower Basement Door Fix
-;--------------------------------------------------------------------------------
-;org $1FF3F4 ; <- 0FF3F4
-;db $00
-;--------------------------------------------------------------------------------
-; Misery Mire Basement Door Fix
-;--------------------------------------------------------------------------------
-;org $1FB8E4 ; <- 0FB8E4
-;db $00
-;--------------------------------------------------------------------------------
 ;0xFE465 -> 0x1E
 org $1FE465
 db #$1E
@@ -1208,7 +1147,6 @@ org $0DDF38 ; <- 6DF38 - equipment.asm : 480
 JSL.l ProcessMenuButtons
 BCC _equipment_497
 JMP.w _equipment_544
-;NOP #7
 ResetEquipment:
 JSR.w RestoreNormalMenu ; (short)
 RTL
@@ -1217,16 +1155,10 @@ NOP #3
 warnpc $0DDF49
 org $0DDF49 ; <- 6DF49 - equipment.asm : 497
 _equipment_497: ; LDA $F4 : AND.b #$08 : BEQ .notPressingUp - NO BUTTON CAPTURE
-;org $0DDF7E ; <- 6DF7E - equipment.asm : 539
 org $0DDF88 ; <- 6DF88 - equipment.asm : 544
-;org $0DE10E ; <- 6E10E - equipment.asm : 806
 _equipment_544:
 ;--------------------------------------------------------------------------------
 org $0DEB98 ; <- 6EB98 - equipment.asm : 1803
-;LDA.w #$3C60 : STA $FFBE, Y
-;ORA.w #$4000 : STA $FFC4, Y
-;ORA.w #$8000 : STA $0084, Y
-;EOR.w #$4000 : STA $007E, Y
 LDA.w #$3C60 : STA $FFBE, Y
 ORA.w #$8000 : STA $007E, Y
 ORA.w #$4000 : STA $0084, Y
@@ -1248,9 +1180,6 @@ dw #$2C4F ; (Orig: #$6C78)
 org $0DF8A1+6+16 ; red mail tile, lower right
 dw #$242F ; (Orig: #$6478)
 ;--------------------------------------------------------------------------------
-;org $0DDE9B ; <- 6DE9B equipment.asm:296 - LDA $0202 : CMP.b #$10 : BNE .notOnBottleMenu (CMP instruction)
-;CMP.b #$FF
-;--------------------------------------------------------------------------------
 org $0DDE9F ; <- 6DE9F equipment.asm:300 - LDA.b #$0A : STA $0200
 LDA.b #$04
 ;--------------------------------------------------------------------------------
@@ -1312,16 +1241,11 @@ NOP #5
 org $07A379 ; <- 3A379 - Bank07.asm : 5687
 JSL.l SpawnHauntedGroveItem
 ;--------------------------------------------------------------------------------
-org $07A303 ; 3A303 - Bank07.asm : 5622
-;JSL.l FixShovelLock
-;--------------------------------------------------------------------------------
 org $07A3A2 ; 3A3A2 - Bank07.asm : 5720 - JSL DiggingGameGuy_AttemptPrizeSpawn
 JSL.l SpawnShovelItem
 BRA _Bank07_5726
 org $07A3AB ; 3A3AB - Bank07.asm : 5726 - LDA.b #$12 : JSR Player_DoSfx2
 _Bank07_5726:
-;org $07A381 ; 3A381 - Bank07.asm : 5693 - ORA $035B
-;ORA $035B
 ;--------------------------------------------------------------------------------
 org $079A0E ; 39A0E - Bank07.asm : 4117 - JSL HUD.RefreshIconLong
 JSL.l Link_ReceiveItem_HUDRefresh
@@ -1358,10 +1282,6 @@ JSL.l ItemCheck_BombosTablet
 org $05F285 ; <- 2F285
 JSL.l ItemCheck_EtherTablet
 ;--------------------------------------------------------------------------------
-;org $098BCC ; <- 48BCC - ancilla_init.asm : 1679 (LDA AddReceiveItem.item_graphics_indices, Y : STA $72)
-;;JSL.l SetTabletItem
-;JSL SpawnTabletItem : PLX : PLB : RTL
-;--------------------------------------------------------------------------------
 org $07859F ; <- 3859F - Bank07.asm : 965 (JSL AddPendantOrCrystal)
 JSL SpawnTabletItem
 org $07862A ; <- 3862A - Bank07.asm : 1064 (JSL AddPendantOrCrystal)
@@ -1441,9 +1361,6 @@ JSL RNG_Ganon_Extra_Warp
 org $1D9488 ; <- E9488 - sprite_ganon.asm
 JSL RNG_Ganon
 ;--------------------------------------------------------------------------------
-;org $01EDB2 ; <- EDB2 - Bank01.asm : 14038
-;INC $04C4
-;--------------------------------------------------------------------------------
 org $05A3F4 ; <- 2A3F4 - sprite_lanmola.asm : 112 (JSL GetRandomInt : AND.b #$07 : TAY)
 JSL.l RNG_Lanmolas1
 org $05A401 ; <- 2A401 - sprite_lanmola.asm : 116 (JSL GetRandomInt : AND.b #$07 : TAY)
@@ -1528,22 +1445,11 @@ ReturnFromOnDrawHud:
 SEP #$30
 LDX.b #$FF ; vanilla hud code ends with #$FF in X, and it's required for unknown reasons.
 
-
-;org $0DFD0A ; <- 6FD0A - headsup_display.asm : 900
-;STA $7EC766 ; nudge key digit right
-
-;org $0DFD13 ; <- 6FD13 - headsup_display.asm : 905
-;STA $7EC726 ; key icon blank
-
 org $0DFC37 ; <- 6FC37 - headsup_display.asm : 828 (LDA.w #$28F7)
 JSL.l DrawMagicHeader
 BRA + : NOP #15 : +
 ;--------------------------------------------------------------------------------
 org $0DFB29 ; <- headsup_display.asm : 688 (LDA.b #$86 : STA $7EC71E)
-;LDA.b #$86 : STA $7EC720 ; nudge silver arrow right - remember to update this in newit
-;LDA.b #$24 : STA $7EC721
-;LDA.b #$87 : STA $7EC722
-;LDA.b #$24 : STA $7EC723
 JSL.l DrawHUDArrows : BRA +
 	NOP #18
 +
@@ -1653,16 +1559,16 @@ JSL.l EndingMusicWait
 
 ; Process music commands in NMI from new location after muting is processed
 org $0080DD
-dw !REG_MUSIC_CONTROL
+dw MusicControl
 
 org $008101
-dw !REG_MUSIC_CONTROL
+dw MusicControl
 
 org $09F512
-dw !REG_MUSIC_CONTROL
+dw MusicControl
 
 org $0CF05F
-dw !REG_MUSIC_CONTROL
+dw MusicControl
 ;--------------------------------------------------------------------------------
 
 ;================================================================================
@@ -1704,9 +1610,6 @@ JSL.l FixAga2Bunny : NOP
 org $05DF65 ; <- 2DF65 - sprite_uncle_and_priest.asm:994 - (LDA.b #$01 : STA $7EF3C5)
 NOP #6
 ;--------------------------------------------------------------------------------
-;org $0280DD ; <- 100DD - Bank02.asm:298 - (LDA $7EF3C5 : CMP.b #$02 : BCC .indoors)
-;JSL.l ForceLinksHouse
-;--------------------------------------------------------------------------------
 org $05EDDF ; <- 2EDDF - sprite_zelda.asm:398 - (LDA.b #$02 : STA $7EF3C5)
 JSL.l EndRainState : NOP #2
 ;--------------------------------------------------------------------------------
@@ -1745,10 +1648,6 @@ JSL.l HUDRebuildIndoorHole
 ;================================================================================
 ; Pendant / Crystal Fixes
 ;--------------------------------------------------------------------------------
-;org $0DE9C8 ; <- 6E9C8 - original check for agahnim 1 being defeated
-;;LDA $7EF3CA : CMP.b #$40 ; check for dark world instead
-;JSL.l CheckPendantHUD
-;NOP #2
 ;================================================================================
 org $098BB0 ; <- 048BB0 - ancilla_init.asm:1663 - (STX $02D8 : JSR AddAncilla)
 JSL.l TryToSpawnCrystalUntilSuccess
@@ -1772,15 +1671,6 @@ JSL.l ShowDungeonItems : NOP #5
 org $0DEF3B ; <- 6EF3B - equipment.asm:2290 - (LDA $040C : AND.w #$00FF : CMP.w #$00FF : BEQ .notInPalace)
 JSL.l ShowDungeonItems : NOP #5
 ;================================================================================
-org $0DEA5F ; <- 6EA5F - equipment.asm:1679 - (SEP #$30)
-;NOP #5
-;JMP .skipCrystalInit
-;org $0DEAA4 ; <- 6EAA4 - equipment.asm:1706 - (LDA $7EF37A : AND.w #$0001)
-;.skipCrystalInit
-;================================================================================
-org $0DE9D8 ; <- 6E9D8 - equipment.asm:1635 - (LDA $E860, X : STA $12EA, X)
-org $0DEA15 ; <- 6EA15 - equipment.asm:1647 - (LDA.w #$13B2 : STA $00)
-;================================================================================
 org $00F97E ; <- 797E - Bank00.asm:8586 - (LDA $7EF3CA : EOR.b #$40 : STA $7EF3CA)
 JSL.l FlipLWDWFlag : NOP #6
 ;================================================================================
@@ -1796,11 +1686,6 @@ LDA CrystalPendantFlags_2, X
 ;Kill enemy to clear level
 org $01C715 ; <- C715 - Bank01.asm:10358 - (LDA $7EF3CA : BNE .inDarkWorld)
 LDA CrystalPendantFlags_2, X
-;JSL.l GetPendantCrystalWorld
-;================================================================================
-;org $0AC5C3 ; <- 545C3 - Bank0A.asm:1859 - (LDA $7EF374 : AND $0AC5A6, X : BEQ .fail)
-;NOP #10
-;CLC
 ;================================================================================
 org $0AC5BB ; < 545BB - Bank0A.asm:1856 - (LDA $7EF3C7 : CMP.b #$03 : BNE .fail)
 JSL.l OverworldMap_CheckObject : RTS
@@ -1878,8 +1763,6 @@ JSL.l GetMapMode
 ;================================================================================
 org $0AC012 ; <- 54012 - Bank0A.asm:1039 (LDA $7EF2DB : AND.b #$20 : BNE BRANCH_DELTA)
 NOP #8
-;org $0AC012 ; <- 54012 - Bank0A.asm:1039 - (LDA $7EF2DB)
-;JSL.l OnLoadMap
 ;================================================================================
 org $028B8F ; <- 10B8F - Bank02.asm:2236 (LDA $7EF374 : LSR A : BCS BRANCH_BETA)
 JSL CheckHeraBossDefeated : BNE + : NOP
@@ -1987,9 +1870,7 @@ org $1ECD39
 SkipCrystalPalette:
 ;--------------------------------------------------------------------------------
 org $08C3FD ; <- 443FD - ancilla_receive_item.asm : 89
-!MS_GOT = "$7F5031"
-LDA #$40 : STA !MS_GOT
-;;NOP #6 ; don't set master sword follower
+LDA.b #$40 : STA.l MSReceived
 ;--------------------------------------------------------------------------------
 org $08C5E5 ; <- 445ED - ancilla_receive_item.asm:395 (LDA .item_messages, Y : CMP.w #$FFFF : BEQ .handleGraphics)
 JSL.l DialogItemReceive : NOP #2
@@ -2065,9 +1946,6 @@ JSL.l OnPlayerDead
 JSL.l IncrementDeathCounter
 NOP #6
 ;--------------------------------------------------------------------------------
-;org $02D61A ; <- 1561A
-;LDA.b #$01 : STA $1B ; fix something i wrote over i shouldn't have
-;--------------------------------------------------------------------------------
 org $1ED379 ; <- F5379 - sprite_agahnim.asm:75 - JSL PrepDungeonExit
 JSL FixAgahnimFollowers
 ;================================================================================
@@ -2141,8 +2019,6 @@ FluteBoy_Abort:
 RTS
 FluteBoy_Continue:
 
-;org $1E9968 ; <- F1968 - sprite_flute_boy_ostrich.asm : 14 (dw FluteBoyOstrich_Chillin)
-;dw #$9991 ; FluteBoyOstrich_RunAway
 ;--------------------------------------------------------------------------------
 org $06B0C9 ; <- 330C9
 JSL.l ItemSet_TreeKid
@@ -2174,9 +2050,6 @@ LDA.b #$FF
 org $1DDF81 ; <- EDF81 - sprite_great_catfish.asm : 61
 JSL.l DrawThrownItem
 ;--------------------------------------------------------------------------------
-;org $1DE1B0 ; <- EE1B0 - sprite_great_catfish.asm : 461
-;NOP #2
-;--------------------------------------------------------------------------------
 org $05EE53 ; <- 2EE53 - mushroom.asm : 22
 JSL.l ItemCheck_Mushroom
 NOP #2
@@ -2193,22 +2066,10 @@ CMP.b #$20
 org $1DDF71 ; <- EDF71 - sprite_great_catfish.asm : 47
 JSL.l MarkThrownItem
 ;--------------------------------------------------------------------------------
-;org $05F65D ; <- 2F65D - DONE IN INVENTORY
-;JSL.l ItemSet_Powder
-;NOP #2
-;--------------------------------------------------------------------------------
-;JSL.l ItemCheck_RupeeNPC
-;--------------------------------------------------------------------------------
-;JSL.l ItemSet_RupeeNPC
-;--------------------------------------------------------------------------------
-;org $08D01B ; PC 0x4501B - ancilla_flute.asm - 55
-;JSL.l ItemSet_Flute
-;--------------------------------------------------------------------------------
 org $05FAFF ; <- 2FAFF - sprite_mad_batter.asm:57 (LDA $7EF37B : CMP.b #$01 : BCS .magic_already_doubled)
 JSL.l ItemCheck_MagicBat : BEQ + : RTS : NOP : +
 ;================================================================================
 
-
 ;================================================================================
 ; Boss Hearts
 ;--------------------------------------------------------------------------------
@@ -2265,8 +2126,8 @@ NOP #6
 ; Fake Flippers Softlock Fix + General Damage Hooks
 ;--------------------------------------------------------------------------------
 org $078091 ; <- 38091 - Bank07.asm:138 (LDA $037B : BNE .linkNotDamaged)
-LDA $0373 : STA $00 : STZ $0373 ; store and zero damage
-LDA $037B : BNE LinkDamaged_linkNotDamaged ; skip if immune
+LDA.w $0373 : STA.b Scrap00 : STZ.w $0373 ; store and zero damage
+LDA.w $037B : BNE LinkDamaged_linkNotDamaged ; skip if immune
 ;--------------------------------------------------------------------------------
 org $0780C6 ; <- 380C6 - Bank07.asm:174 (LDA $7EF36D)
 JSL.l OnLinkDamaged
@@ -2542,7 +2403,7 @@ Overworld_Entrance_BRANCH_RHO: ; branch here to continue into door
 ;================================================================================
 ; Paradox Cave Shopkeeper Fixes
 ;--------------------------------------------------------------------------------
-org $008C19 ; Bank00.asm@1633 (LDA.b #$01 : STA $420B)
+org $008C19 ; Bank00.asm@1633 (LDA.b #$01 : STA MDMAEN)
 JSL ParadoxCaveGfxFix
 NOP
 ;================================================================================
@@ -2552,10 +2413,10 @@ NOP
 ;--------------------------------------------------------------------------------
 ; Change race game to use $021B instead of $0ABF for detecting cheating
 org $0DCB9D ; STZ.w $0ABF
-STZ $021B
+STZ.w $021B
 
 org $0DCBFE ; LDA.w $0ABF
-LDA $021B
+LDA.w $021B
 
 org $02BFE0 ; LDA.b #$01 : STA.w $0ABF
 JSL SetOverworldTransitionFlags
@@ -2571,7 +2432,7 @@ org $0DA9C8 ; <- 06A9C8 - player_oam.asm: 1663 (AND.w #$00FF : CMP.w #$00F8 : BC
 ; CMP into $02 into constant time code, so that player sprite head-bobbing can
 ; be removed by sprites while remaining race legal (cycle-for-cycle identical
 ; to the link sprite).
-LDA $02 ; always zero! (this replaces the BCC)
+LDA.b Scrap02 ; always zero! (this replaces the BCC)
 ADC.w #0000 ; put the carry bit into the accumulator instead of a hardcoded 1.
 ;-------------------------------------------------------------------------------
 org $02FD6F ; <- 017d6f - bank0E.asm: 3694 (LoadActualGearPalettes:) Note: Overflow of bank02 moved to 0e in US Rom
diff --git a/hudtext.asm b/hudtext.asm
index ebebe9d..880cb4b 100644
--- a/hudtext.asm
+++ b/hudtext.asm
@@ -9,17 +9,17 @@ PHP
 ; $7EC026 = When we find an empty item get set on 1
 ; $7EC027 = character data
 
-    LDX #$80 : STX $2100
+    LDX.b #$80 : STX.w INIDISP
     REP #$20
-    LDA #$6000+$0340 : STA $2116
+    LDA.w #$6000+$0340 : STA.w VMADDL
 
-    LDA.w #$C027 : STA $4342
-    LDX.b #$7E : STX $4344
-    LDA #$0040 : STA $4345
-    LDA #$1801 : STA $4340
-    LDX #$10 : STX $420B
+    LDA.w #$C027 : STA.w A1T4L
+    LDX.b #$7E : STX.w A1B4
+    LDA.w #$0040 : STA.w DAS4L
+    LDA.w #$1801 : STA.w DMAP4
+    LDX.b #$10 : STX.w MDMAEN
 
-    LDX #$0F : STX $2100
+    LDX.b #$0F : STX.w INIDISP
     PLP
 RTL
 }
@@ -28,17 +28,17 @@ RTL
 ClearBG:
 {
 PHP
-    LDX #$80 : STX $2100
+    LDX.b #$80 : STX.w INIDISP
     REP #$20
-    LDA #$6000+$0340 : STA $2116
-    LDA.w #clearTable : STA $4342
-    LDX.b #clearTable>>16 : STX $4344
+    LDA.w #$6000+$0340 : STA.w VMADDL
+    LDA.w #clearTable : STA.w A1T4L
+    LDX.b #clearTable>>16 : STX.w A1B4
 
-    LDA #$0040 : STA $4345
-    LDA #$1801 : STA $4340
-    LDX #$10 : STX $420B
+    LDA.w #$0040 : STA.w DAS4L
+    LDA.w #$1801 : STA.w DMAP4
+    LDX.b #$10 : STX.w MDMAEN
 
-    LDX #$0F : STX $2100
+    LDX.b #$0F : STX.w INIDISP
     PLP
 RTL
-}
\ No newline at end of file
+}
diff --git a/icepalacegraphics.asm b/icepalacegraphics.asm
index 22d5903..af932ec 100644
--- a/icepalacegraphics.asm
+++ b/icepalacegraphics.asm
@@ -3,7 +3,7 @@ ShouldOverrideFileLoad:
     CPY #$0A ; 0A = Ice/Mire floor file
     BNE .no
 
-    LDA $040C ; Dungeon number
+    LDA.w $040C ; Dungeon number
     CMP #$12 ; Ice Palace
     BEQ .yes
     .no
@@ -13,9 +13,9 @@ ShouldOverrideFileLoad:
 
 BgGraphicsLoading:
     ; Instructions overwritten
-    STZ $00
-    STX $01
-    STA $02
+    STZ.b Scrap00
+    STX.b Scrap01
+    STA.b Scrap02
 
     JSR ShouldOverrideFileLoad
     BCS .useSpecialIcePalaceFile
@@ -25,24 +25,22 @@ BgGraphicsLoading:
     ; We're loading the floor tiles in Ice Palace. Instead of the normal file,
     ; load another one that replaces the bridge tiles with the Bombos medallion
 
-    ;LDA $FFFFFF
-
     LDA.b #IcePalaceFloorGfx>>16
-    STA $02
+    STA.b Scrap02
     REP #$20
     LDA.w #IcePalaceFloorGfx
-    STA $00
+    STA.b Scrap00
     LDX.b #64*2 ; Tiles to load * 2
 -
     ; Unrolled loop to upload half a tile
-    LDA [$00] : STA $2118 : INC $00 : INC $00
-    LDA [$00] : STA $2118 : INC $00 : INC $00
-    LDA [$00] : STA $2118 : INC $00 : INC $00
-    LDA [$00] : STA $2118 : INC $00 : INC $00
-    LDA [$00] : STA $2118 : INC $00 : INC $00
-    LDA [$00] : STA $2118 : INC $00 : INC $00
-    LDA [$00] : STA $2118 : INC $00 : INC $00
-    LDA [$00] : STA $2118 : INC $00 : INC $00
+    LDA.b [$00] : STA.w VMDATAL : INC.b Scrap00 : INC.b Scrap00
+    LDA.b [$00] : STA.w VMDATAL : INC.b Scrap00 : INC.b Scrap00
+    LDA.b [$00] : STA.w VMDATAL : INC.b Scrap00 : INC.b Scrap00
+    LDA.b [$00] : STA.w VMDATAL : INC.b Scrap00 : INC.b Scrap00
+    LDA.b [$00] : STA.w VMDATAL : INC.b Scrap00 : INC.b Scrap00
+    LDA.b [$00] : STA.w VMDATAL : INC.b Scrap00 : INC.b Scrap00
+    LDA.b [$00] : STA.w VMDATAL : INC.b Scrap00 : INC.b Scrap00
+    LDA.b [$00] : STA.w VMDATAL : INC.b Scrap00 : INC.b Scrap00
     DEX
     BNE -
 
@@ -51,7 +49,7 @@ BgGraphicsLoading:
 
 ReloadingFloors:
     SEP #$30 ; 8 AXY
-    LDA $7EC2F8 ; Floor file that has been decompressed
+    LDA.l $7EC2F8 ; Floor file that has been decompressed
     TAY
     JSR ShouldOverrideFileLoad
     REP #$30 ; 16 AXY
@@ -76,6 +74,6 @@ ReloadingFloors:
     ; Pretend that we ran the original routine
     LDX.w #$0800
     LDA.w #$6600
-    STA $03
+    STA.b Scrap03
 
     JML ReloadingFloorsCancel
diff --git a/init.asm b/init.asm
index 36bb4b5..33aff1d 100644
--- a/init.asm
+++ b/init.asm
@@ -47,15 +47,15 @@ Init_Primary:
 	.done
 
 	REP #$20
-	LDA.l OneMindTimer : STA.l !ONEMIND_TIMER
+	LDA.l OneMindTimerInit : STA.l OneMindTimerRAM
 	SEP #$20
 
-	LDA.b #$01 : STA $420D ; enable fastrom access on upper banks
-	STA.l !ONEMIND_ID
+	LDA.b #$01 : STA.w MEMSEL ; enable fastrom access on upper banks
+	STA.l OneMindId
 	
 	LDA.b #$10 : STA $BC ; set default player sprite bank
 	
-	LDA.b #$81 : STA $4200 ; thing we wrote over, turn on NMI & gamepad
+	LDA.b #$81 : STA.w NMITIMEN ; thing we wrote over, turn on NMI & gamepad
 RTL
 ;--------------------------------------------------------------------------------
 ; Init_PostRAMClear
diff --git a/inventory.asm b/inventory.asm
index 2c0a3ad..4c02de3 100644
--- a/inventory.asm
+++ b/inventory.asm
@@ -28,16 +28,14 @@
 ; out:	Carry - 0 = No Button, 1 = Yes Button
 ;--------------------------------------------------------------------------------
 ProcessMenuButtons:
-	;LDA #$FD : STA InventoryTracking ; DEBUG MODE
-	;LDA $F6 : BIT #$20 : BNE .l_pressed ; check for P1 L-button
-	LDA $F4 : BIT #$40 : BNE .y_pressed ; check for P1 Y-button
+	LDA.b $F4 : BIT.b #$40 : BNE .y_pressed ; check for P1 Y-button
 			  BIT #$20 : BNE .sel_pressed ; check for P1 Select button
-	LDA $F0 : BIT #$20 : BNE .sel_held
+	LDA.b $F0 : BIT.b #$20 : BNE .sel_held
 	.sel_unheld
-		LDA HudFlag : AND #$20 : BEQ +
-		LDA HudFlag : AND #$DF : STA HudFlag ; select is released, unset hud flag
-		LDA $1B : BEQ + ; skip if outdoors
-			LDA.b #$20 : STA $012F ; menu select sound
+		LDA.l HudFlag : AND.b #$20 : BEQ +
+		LDA.l HudFlag : AND.b #$DF : STA.l HudFlag ; select is released, unset hud flag
+		LDA.b $1B : BEQ + ; skip if outdoors
+			LDA.b #$20 : STA.w $012F ; menu select sound
 		+
 		JSL.l ResetEquipment
 	+
@@ -45,72 +43,71 @@ ProcessMenuButtons:
 	CLC ; no buttons
 RTL
 	.sel_pressed
-	LDA HudFlag : ORA #$20 : STA HudFlag ; set hud flag
-	LDA.b #$20 : STA $012F ; menu select sound
+	LDA.l HudFlag : ORA.b #$20 : STA.l HudFlag ; set hud flag
+	LDA.b #$20 : STA.w $012F ; menu select sound
 	JSL.l ResetEquipment
 RTL
 	.y_pressed ; Note: used as entry point by quickswap code. Must preserve X. 
-	LDA.b #$10 : STA $0207
-	LDA $0202 ; check selected item
-	CMP #$02 : BNE + ; boomerang
-		LDA InventoryTracking : AND #$C0 : CMP #$C0 : BNE .errorJump ; make sure we have both boomerangs
-		LDA BoomerangEquipment : EOR #$03 : STA BoomerangEquipment ; swap blue & red boomerang
-		LDA.b #$20 : STA $012F ; menu select sound
+	LDA.b #$10 : STA.w $0207
+	LDA.w $0202 ; check selected item
+	CMP.b #$02 : BNE + ; boomerang
+		LDA.l InventoryTracking : AND.b #$C0 : CMP.b #$C0 : BNE .errorJump ; make sure we have both boomerangs
+		LDA.l BoomerangEquipment : EOR.b #$03 : STA.l BoomerangEquipment ; swap blue & red boomerang
+		LDA.b #$20 : STA.w $012F ; menu select sound
 		JMP .captured
 	+ CMP #$01 : BNE + ; bow
-		LDA BowTracking : AND #$C0 : CMP #$C0 : BNE .errorJump ; make sure we have both bows
+		LDA.l BowTracking : AND.b #$C0 : CMP.b #$C0 : BNE .errorJump ; make sure we have both bows
 		PHX : LDX.b #$00 ; scan ancilla table for arrows
 			-- : CPX.b #$0A : !BGE ++
-				LDA $0C4A, X : CMP.b #$09 : BNE +++
+				LDA.w $0C4A, X : CMP.b #$09 : BNE +++
 					PLX : BRA .errorJump2 ; found an arrow, don't allow the swap
 				+++
 			INX : BRA -- : ++
 		PLX
 		LDA.l SilverArrowsUseRestriction : BEQ ++
-		LDA $A0 : ORA $A1 : BEQ ++ ; not in ganon's room in restricted mode
-				LDA BowEquipment : CMP.b #$03 : !BLT .errorJump : !SUB #$02 : STA BowEquipment
+		LDA.b $A0 : ORA.b $A1 : BEQ ++ ; not in ganon's room in restricted mode
+				LDA.l BowEquipment : CMP.b #$03 : !BLT .errorJump : !SUB #$02 : STA.l BowEquipment
 				BRA .errorJump2
 		++
-		LDA BowEquipment : !SUB #$01 : EOR #$02 : !ADD #$01 : STA BowEquipment ; swap bows
-		LDA.b #$20 : STA $012F ; menu select sound
+		LDA.l BowEquipment : !SUB #$01 : EOR.b #$02 : !ADD #$01 : STA.l BowEquipment ; swap bows
+		LDA.b #$20 : STA.w $012F ; menu select sound
 		JMP .captured
 	+ BRA +
 		.errorJump
 		BRA .errorJump2
 	+ CMP #$05 : BNE + ; powder
-		LDA InventoryTracking : AND #$30 : CMP #$30 : BNE .errorJump ; make sure we have mushroom & magic powder
-		LDA PowderEquipment : EOR #$03 : STA PowderEquipment ; swap mushroom & magic powder
-		LDA.b #$20 : STA $012F ; menu select sound
+		LDA.l InventoryTracking : AND.b #$30 : CMP.b #$30 : BNE .errorJump ; make sure we have mushroom & magic powder
+		LDA.l PowderEquipment : EOR.b #$03 : STA.l PowderEquipment ; swap mushroom & magic powder
+		LDA.b #$20 : STA.w $012F ; menu select sound
 		JMP .captured
 	+ BRA +
 		.errorJump2
 		BRA .error
 	+ CMP #$0D : BNE + ; flute
-		LDA $037A :	CMP #$01 : BEQ .midShovel ; inside a shovel animation, force the shovel & make error sound
-		LDA InventoryTracking : BIT #$04 : BEQ .error ; make sure we have shovel
-					  AND #$03 : BEQ .error ; make sure we have one of the flutes
-		LDA FluteEquipment : CMP #01 : BNE .toShovel ; not shovel
+		LDA.w $037A :	CMP.b #$01 : BEQ .midShovel ; inside a shovel animation, force the shovel & make error sound
+		LDA.l InventoryTracking : BIT.b #$04 : BEQ .error ; make sure we have shovel
+					  AND.b #$03 : BEQ .error ; make sure we have one of the flutes
+		LDA.l FluteEquipment : CMP.b #01 : BNE .toShovel ; not shovel
 
-		LDA InventoryTracking : AND #$01 : BEQ .toFakeFlute ; check for real flute
-		LDA #$03 ; set real flute
+		LDA.l InventoryTracking : AND.b #$01 : BEQ .toFakeFlute ; check for real flute
+		LDA.b #$03 ; set real flute
 		BRA .fluteSuccess
 		.toFakeFlute
-		LDA #$02 ; set fake flute
+		LDA.b #$02 ; set fake flute
 		BRA .fluteSuccess
 		.toShovel
-		LDA #$01 ; set shovel
+		LDA.b #$01 ; set shovel
 		.fluteSuccess
-		STA FluteEquipment ; store set item
-		LDA.b #$20 : STA $012F ; menu select sound
+		STA.l FluteEquipment ; store set item
+		LDA.b #$20 : STA.w $012F ; menu select sound
 		BRA .captured
 	+
-	CMP #$10 : BNE .error : JSL.l ProcessBottleMenu : BRA .captured : +
+	CMP.b #$10 : BNE .error : JSL.l ProcessBottleMenu : BRA .captured : +
 	CLC
 RTL
 	.midShovel
-	; LDA #$01 : STA FluteEquipment ; set shovel
 	.error
-	LDA.b #$3C : STA $012E ; error sound
+	LDA.b #$3C : STA.w $012E ; error sound
 	.captured
 	SEC
 RTL
@@ -120,23 +117,20 @@ RTL
 ;ProcessBottleMenu:
 ;--------------------------------------------------------------------------------
 ProcessBottleMenu:
-;	LDA $F6 : AND #$30 : CMP.b #$30 : BEQ .double_shoulder_pressed
-;	LDA $F4 : AND #$40 : BEQ .y_not_pressed ; skip if Y is not down
-;	.double_shoulder_pressed
-	LDA BottleIndex ; check bottle state
+	LDA.l BottleIndex ; check bottle state
 	BEQ .no_bottles ; skip if we have no bottles
 	PHX
-		INC : CMP #$05 : !BLT + : LDA #$01 : + ;increment and wrap 1-4
-		TAX : LDA BottleContents-1, X ; check bottle
-		BNE + : LDX #$01 : + ; wrap if we reached the last bottle
-		TXA : STA BottleIndex ; set bottle index
-		LDA.b #$20 : STA $012F ; menu select sound
+		INC : CMP.b #$05 : !BLT + : LDA.b #$01 : + ;increment and wrap 1-4
+		TAX : LDA.l BottleContents-1, X ; check bottle
+		BNE + : LDX.b #$01 : + ; wrap if we reached the last bottle
+		TXA : STA.l BottleIndex ; set bottle index
+		LDA.b #$20 : STA.w $012F ; menu select sound
 	PLX
 	.no_bottles
-	LDA #$00 ; pretend like the controller state was 0 from the overridden load
+	LDA.b #$00 ; pretend like the controller state was 0 from the overridden load
 RTL
 ;	.y_not_pressed
-;	LDA $F4 : AND.b #$0C ; thing we wrote over - load controller state
+;	LDA.b $F4 : AND.b #$0C ; thing we wrote over - load controller state
 ;RTL
 ;--------------------------------------------------------------------------------
 
@@ -144,10 +138,10 @@ RTL
 ;OpenBottleMenu:
 ;--------------------------------------------------------------------------------
 OpenBottleMenu:
-	LDA $F6 : AND #$40 : BEQ .x_not_pressed ; skip if X is not down
-		LDA.b #$10 : STA $0207 ; set 16 frame cool off
-	    LDA.b #$20 : STA $012F ; make menu sound
-		LDA.b #$07 : STA $0200 ; thing we wrote over - opens bottle menu
+	LDA.b $F6 : AND.b #$40 : BEQ .x_not_pressed ; skip if X is not down
+		LDA.b #$10 : STA.w $0207 ; set 16 frame cool off
+	    LDA.b #$20 : STA.w $012F ; make menu sound
+		LDA.b #$07 : STA.w $0200 ; thing we wrote over - opens bottle menu
 	.x_not_pressed
 RTL
 ;--------------------------------------------------------------------------------
@@ -156,18 +150,18 @@ RTL
 ;CloseBottleMenu:
 ;--------------------------------------------------------------------------------
 CloseBottleMenu:
-	LDA $F6 : AND #$40 : BEQ .x_not_pressed ; skip if X is not down
+	LDA.b $F6 : AND.b #$40 : BEQ .x_not_pressed ; skip if X is not down
 
-	LDA.b #$10 : STA $0207 ; set 16 frame cool off
-    LDA.b #$20 : STA $012F ; make menu sound
+	LDA.b #$10 : STA.w $0207 ; set 16 frame cool off
+    LDA.b #$20 : STA.w $012F ; make menu sound
 
-	INC $0200 ; return to normal menu
-    STZ $0205
+	INC.w $0200 ; return to normal menu
+    STZ.w $0205
 
-	LDA #$00
+	LDA.b #$00
 RTL
 	.x_not_pressed
-	LDA $F4 : AND.b #$0C ; thing we wrote over (probably)
+	LDA.b $F4 : AND.b #$0C ; thing we wrote over (probably)
 RTL
 ;--------------------------------------------------------------------------------
 
@@ -175,73 +169,69 @@ RTL
 ; AddInventory:
 ;--------------------------------------------------------------------------------
 macro TopHalf(address)
-	LDA <address> : !ADD #$10 : STA <address>
+	LDA.l <address> : !ADD #$10 : STA.l <address>
 endmacro
 
 macro BottomHalf(address)
 	PHA : PHX
-		LDA <address> : INC : AND #$0F : TAX
-		LDA <address> : AND #$F0 : STA <address>
-		TXA : ORA <address> : STA <address>
+		LDA.l <address> : INC : AND.b #$0F : TAX
+		LDA.l <address> : AND.b #$F0 : STA.l <address>
+		TXA : ORA.l <address> : STA.l <address>
 	PLX : PLA
 endmacro
 ;--------------------------------------------------------------------------------
-;FullInventoryExternal:
-;	LDA StatsLocked : BEQ + : RTL : +
-;	PHA : PHX : PHP : JMP AddInventory_fullItemCounts
-;--------------------------------------------------------------------------------
 FullInventoryExternal:
-	LDA StatsLocked : BEQ + : RTL : +
+	LDA.l StatsLocked : BEQ + : RTL : +
 	PHA : PHX : PHP : JMP AddInventory_incrementCounts
 ;--------------------------------------------------------------------------------
 AddInventory:
 	PHA : PHX : PHP
 	CPY.b #$0C : BNE + ; Blue Boomerang
-		LDA InventoryTracking : ORA #$80 : STA InventoryTracking
+		LDA.l InventoryTracking : ORA.b #$80 : STA.l InventoryTracking
 		JMP .incrementCounts
 	+ CPY.b #$2A : BNE + ; Red Boomerang
-		LDA InventoryTracking : ORA #$40 : STA InventoryTracking
+		LDA.l InventoryTracking : ORA.b #$40 : STA.l InventoryTracking
 		JMP .incrementCounts
 	+ CPY.b #$29 : BNE + ; Mushroom
-		LDA InventoryTracking : ORA #$28 : STA InventoryTracking
+		LDA.l InventoryTracking : ORA.b #$28 : STA.l InventoryTracking
 		JMP .incrementCounts
 	+ CPY.b #$0D : BNE + ; Magic Powder
-		LDA InventoryTracking : ORA #$10 : STA InventoryTracking
+		LDA.l InventoryTracking : ORA.b #$10 : STA.l InventoryTracking
 		JMP .incrementCounts
 	+ CPY.b #$13 : BNE + ; Shovel
-		LDA InventoryTracking : ORA #$04 : STA InventoryTracking
+		LDA.l InventoryTracking : ORA.b #$04 : STA.l InventoryTracking
 		JMP .incrementCounts
 	+ CPY.b #$14 : BNE + ; Flute (Inactive)
-		LDA InventoryTracking : ORA #$02 : STA InventoryTracking
+		LDA.l InventoryTracking : ORA.b #$02 : STA.l InventoryTracking
 		JMP .incrementCounts
 	+ CPY.b #$4A : BNE + ; Flute (Active)
-		LDA InventoryTracking : ORA #$01 : STA InventoryTracking
+		LDA.l InventoryTracking : ORA.b #$01 : STA.l InventoryTracking
 		JMP .incrementCounts
 	+ CPY.b #$0B : BNE + ; Bow
-		LDA ArrowMode : BNE +++
-			LDA BowTracking : ORA #$80 : STA BowTracking
+		LDA.l ArrowMode : BNE +++
+			LDA.l BowTracking : ORA.b #$80 : STA.l BowTracking
 		+++
 		JMP .incrementCounts
 	+ CPY.b #$3A : BNE + ; Bow & Arrows
-		LDA BowTracking : ORA #$80 : STA BowTracking
+		LDA.l BowTracking : ORA.b #$80 : STA.l BowTracking
 		JMP .incrementCounts
 	+ CPY.b #$3B : BNE + ; Bow & Silver Arrows
-		LDA BowTracking : ORA #$40 : STA BowTracking
-		LDA ArrowMode : BNE +++
-			LDA BowTracking : ORA #$80 : STA BowTracking ; activate wood arrows when not in rupee bow
+		LDA.l BowTracking : ORA.b #$40 : STA.l BowTracking
+		LDA.l ArrowMode : BNE +++
+			LDA.l BowTracking : ORA.b #$80 : STA.l BowTracking ; activate wood arrows when not in rupee bow
 		+++
 		JMP .incrementCounts
 	+ CPY.b #$43 : BNE + ; Single arrow
-		LDA ArrowMode : BEQ +++
-			LDA BowTracking : ORA #$80 : STA BowTracking ; activate wood arrows in quick-swap
+		LDA.l ArrowMode : BEQ +++
+			LDA.l BowTracking : ORA.b #$80 : STA.l BowTracking ; activate wood arrows in quick-swap
 		+++
 		JMP .incrementCounts
 	+ CPY.b #$58 : BNE + ; Upgrade-Only Silver Arrows
-		LDA BowTracking : ORA #$40 : STA BowTracking
+		LDA.l BowTracking : ORA.b #$40 : STA.l BowTracking
 	+
 
 	.incrementCounts
-	LDA StatsLocked : BEQ + : JMP .done : +
+	LDA.l StatsLocked : BEQ + : JMP .done : +
 
 	; don't count any of this stuff
 	CPY.b #$20 : BNE + : JMP .itemCounts : + ; Crystal
@@ -263,10 +253,10 @@ AddInventory:
 	+
 	CPY.b #$3B : BNE + : JMP .dungeonCounts : + ; Silver Arrow Bow - Skip Shop/Fairy Check for Silver Arrow Bow
 
-	LDA $1B : BEQ ++ ; skip shop check if outdoors
-	LDA $02E9 : CMP.b #$01 : BEQ ++ ; skip shop check for chests
+	LDA.b $1B : BEQ ++ ; skip shop check if outdoors
+	LDA.w $02E9 : CMP.b #$01 : BEQ ++ ; skip shop check for chests
 		PHP : REP #$20 ; set 16-bit accumulator
-			LDA $048E
+			LDA.w $048E
 			CMP.w #274 : BNE + : JMP .shop : + ; dark world death mountain shop, ornamental shield shop
 			CMP.w #271 : BNE + : JMP .shop : + ; villiage of outcasts shop, lumberjack shop, lake hylia shop, dark world magic shop
 			CMP.w #272 : BNE + : JMP .shop : + ; red shield shop
@@ -284,10 +274,10 @@ AddInventory:
 	++
 
 	.dungeonCounts
-	LDA $1B : BNE + : JMP .fullItemCounts : +
+	LDA.b $1B : BNE + : JMP .fullItemCounts : +
 	SEP #$20 ; Set 8-bit Accumulator
 
-	LDA $040C ; get dungeon id
+	LDA.w $040C ; get dungeon id
         CMP.b #$FF : BEQ .fullItemCounts
 
         CMP.l BallNChainDungeon : BNE +
@@ -295,63 +285,63 @@ AddInventory:
                         JMP .done
 	+
         CMP.b #$04 : BCS +
-                LDA SewersLocations : INC : STA SewersLocations
-                LDA HCLocations : INC : STA HCLocations
+                LDA.l SewersLocations : INC : STA.l SewersLocations
+                LDA.l HCLocations : INC : STA.l HCLocations
                 BRA .fullItemCounts
-        + LSR : TAX : LDA DungeonLocationsChecked, X : INC : STA DungeonLocationsChecked, X
+        + LSR : TAX : LDA.l DungeonLocationsChecked, X : INC : STA.l DungeonLocationsChecked, X
 	++ CPX.b #$0D : BNE +
-		LDA BigKeyField : AND #$04 : BNE ++
+		LDA.l BigKeyField : AND.b #$04 : BNE ++
 			JSR .incrementGTowerPreBigKey
 		++
 	+
 	; == END INDOOR-ONLY SECTION
 	.fullItemCounts
 
-	LDA BootsEquipment : BNE + ; Check for Boots
-		LDA PreBootsLocations : INC : STA PreBootsLocations ; Increment Pre Boots Counter
+	LDA.l BootsEquipment : BNE + ; Check for Boots
+		LDA.l PreBootsLocations : INC : STA.l PreBootsLocations ; Increment Pre Boots Counter
 	+
 
-	LDA MirrorEquipment : BNE + ; Check for Mirror
-		LDA PreMirrorLocations : INC : STA PreMirrorLocations ; Increment Pre Mirror Counter
+	LDA.l MirrorEquipment : BNE + ; Check for Mirror
+		LDA.l PreMirrorLocations : INC : STA.l PreMirrorLocations ; Increment Pre Mirror Counter
 	+
 
-	LDA FluteEquipment : BNE + ; Check for Flute
-		LDA PreFluteLocations : INC : STA PreFluteLocations ; Increment Pre Mirror Counter
+	LDA.l FluteEquipment : BNE + ; Check for Flute
+		LDA.l PreFluteLocations : INC : STA.l PreFluteLocations ; Increment Pre Mirror Counter
 	+
 
         REP #$20
-	LDA TotalItemCounter : INC : STA TotalItemCounter ; Increment Item Total
+	LDA.l TotalItemCounter : INC : STA.l TotalItemCounter ; Increment Item Total
         SEP #$20
 
 	.itemCounts
 
 	CPY.b #$00 : BNE + ; Fighter's Sword & Fighter's Shield
-                LDX #$01
+                LDX.b #$01
 		JSR .incrementSword
 		JSR .incrementShield
 		JMP .done
 	+ CPY.b #$01 : BNE + ; Master Sword
-                LDX #$02
+                LDX.b #$02
 		JSR .incrementSword
 		JMP .done
 	+ CPY.b #$02 : BNE + ; Tempered Sword
-                LDX #$03
+                LDX.b #$03
 		JSR .incrementSword
 		JMP .done
 	+ CPY.b #$03 : BNE + ; Golden Sword
-                LDX #$04
+                LDX.b #$04
 		JSR .incrementSword
 		JMP .done
 	+ CPY.b #$04 : BNE + ; Fighter's Shield
-                LDX #$01
+                LDX.b #$01
 		JSR .incrementShield
 		JMP .done
 	+ CPY.b #$05 : BNE + ; Red Shield
-                LDX #$02
+                LDX.b #$02
 		JSR .incrementShield
 		JMP .done
 	+ CPY.b #$06 : BNE + ; Mirror Shield
-                LDX #$03
+                LDX.b #$03
 		JSR .incrementShield
 		JMP .done
 	+ CPY.b #$07 : !BLT + ; Items $07 - $0D
@@ -392,10 +382,10 @@ AddInventory:
 		JSR .incrementY
 		JMP .done
 	+ CPY.b #$22 : BNE + ; Blue Mail
-                LDX #$01
+                LDX.b #$01
                 JSR .incrementMail
 	+ CPY.b #$23 : BNE + ; Red Mail
-                LDX #$02
+                LDX.b #$02
                 JSR .incrementMail
 	+ CPY.b #$24 : BNE + ; Small Key
 		JSR .incrementKey
@@ -491,15 +481,15 @@ AddInventory:
 		JSR .incrementBow
 		JMP .done
 	+ CPY.b #$5E : BNE + ; Progressive Sword
-                LDA SwordEquipment : INC : TAX
+                LDA.l SwordEquipment : INC : TAX
 		JSR .incrementSword
 		JMP .done
 	+ CPY.b #$5F : BNE + ; Progressive Shield
-                LDA ShieldEquipment : INC : TAX
+                LDA.l ShieldEquipment : INC : TAX
 		JSR .incrementShield
 		JMP .done
 	+ CPY.b #$60 : BNE + ; Progressive Armor
-                LDA ArmorEquipment : INC : TAX
+                LDA.l ArmorEquipment : INC : TAX
 		JSR .incrementMail
 		JMP .done
 	+ CPY.b #$61 : BNE + ; Progressive Lifting Glove
@@ -535,96 +525,96 @@ RTL
 
 .stampSword
 	REP #$20 ; set 16-bit accumulator
-	LDA SwordTime : BNE +
-	LDA SwordTime+2 : BNE +
-		LDA NMIFrames : STA SwordTime
-		LDA NMIFrames+2 : STA SwordTime+2
+	LDA.l SwordTime : BNE +
+	LDA.l SwordTime+2 : BNE +
+		LDA.l NMIFrames : STA.l SwordTime
+		LDA.l NMIFrames+2 : STA.l SwordTime+2
 	+
 	SEP #$20 ; set 8-bit accumulator
 RTS
 
 .stampBoots
 	REP #$20 ; set 16-bit accumulator
-	LDA BootsTime : BNE +
-	LDA BootsTime+2 : BNE +
-		LDA NMIFrames : STA BootsTime
-		LDA NMIFrames+2 : STA BootsTime+2
+	LDA.l BootsTime : BNE +
+	LDA.l BootsTime+2 : BNE +
+		LDA.l NMIFrames : STA.l BootsTime
+		LDA.l NMIFrames+2 : STA.l BootsTime+2
 	+
 	SEP #$20 ; set 8-bit accumulator
 RTS
 
 .stampFlute
 	REP #$20 ; set 16-bit accumulator
-	LDA FluteTime : BNE +
-	LDA FluteTime+2 : BNE +
-		LDA NMIFrames : STA FluteTime
-		LDA NMIFrames+2 : STA FluteTime+2
+	LDA.l FluteTime : BNE +
+	LDA.l FluteTime+2 : BNE +
+		LDA.l NMIFrames : STA.l FluteTime
+		LDA.l NMIFrames+2 : STA.l FluteTime+2
 	+
 	SEP #$20 ; set 8-bit accumulator
 RTS
 
 .stampMirror
 	REP #$20 ; set 16-bit accumulator
-	LDA MirrorTime : BNE +
-	LDA MirrorTime+2 : BNE +
-		LDA NMIFrames : STA MirrorTime
-		LDA NMIFrames+2 : STA MirrorTime+2
+	LDA.l MirrorTime : BNE +
+	LDA.l MirrorTime+2 : BNE +
+		LDA.l NMIFrames : STA.l MirrorTime
+		LDA.l NMIFrames+2 : STA.l MirrorTime+2
 	+
 	SEP #$20 ; set 8-bit accumulator
 RTS
 
 .incrementSword
 	JSR .stampSword
-        LDA HighestSword
-        INC : STA $04 : CPX $04 : !BLT + ; don't increment unless we're getting a better sword
-                TXA : STA HighestSword
+        LDA.l HighestSword
+        INC : STA.b Scrap04 : CPX.b Scrap04 : !BLT + ; don't increment unless we're getting a better sword
+                TXA : STA.l HighestSword
         +
 RTS
 
 .incrementShield
-        LDA HighestShield
-        INC : STA $04 : CPX $04 : !BLT + ; don't increment unless we're getting a better shield
-                TXA : STA HighestShield
+        LDA.l HighestShield
+        INC : STA.b Scrap04 : CPX.b Scrap04 : !BLT + ; don't increment unless we're getting a better shield
+                TXA : STA.l HighestShield
         +
 RTS
 
 .incrementBow
-        LDA BowEquipment : BNE .dontCount ; Don't increment Y item count for extra bows
+        LDA.l BowEquipment : BNE .dontCount ; Don't increment Y item count for extra bows
 .incrementY
-	LDA YAItemCounter : !ADD #$08 : STA YAItemCounter
+	LDA.l YAItemCounter : !ADD #$08 : STA.l YAItemCounter
 .dontCount
 RTS
 
 .incrementA
-	LDA YAItemCounter : INC : AND #$07 : TAX
-	LDA YAItemCounter : AND #$F8 : STA YAItemCounter
-	TXA : ORA YAItemCounter : STA YAItemCounter
+	LDA.l YAItemCounter : INC : AND.b #$07 : TAX
+	LDA.l YAItemCounter : AND.b #$F8 : STA.l YAItemCounter
+	TXA : ORA.l YAItemCounter : STA.l YAItemCounter
 RTS
 
 .incrementPendant
-	LDA PendantCounter : INC : STA PendantCounter
+	LDA.l PendantCounter : INC : STA.l PendantCounter
 RTS
 
 .incrementCapacity
-	LDA CapacityUpgrades : INC : STA CapacityUpgrades
+	LDA.l CapacityUpgrades : INC : STA.l CapacityUpgrades
 RTS
 
 .incrementHeartPiece
-	LDA HeartPieceCounter : INC : STA HeartPieceCounter
+	LDA.l HeartPieceCounter : INC : STA.l HeartPieceCounter
 RTS
 
 .incrementHeartContainer
-	LDA HeartContainerCounter : INC : STA HeartContainerCounter
+	LDA.l HeartContainerCounter : INC : STA.l HeartContainerCounter
 RTS
 
 .incrementCrystal
-	LDA CrystalCounter : INC : STA CrystalCounter
+	LDA.l CrystalCounter : INC : STA.l CrystalCounter
 RTS
 
 .incrementMail
-        LDA HighestMail
-        INC : STA $04 : CPX $04 : !BLT +   ; don't increment unless we're getting a better mail
-                TXA : STA HighestMail
+        LDA.l HighestMail
+        INC : STA.b Scrap04 : CPX.b Scrap04 : !BLT +   ; don't increment unless we're getting a better mail
+                TXA : STA.l HighestMail
         +
 RTS
 
@@ -633,7 +623,7 @@ RTS
 RTL
 
 .incrementKey
-        LDA SmallKeyCounter : INC : STA SmallKeyCounter
+        LDA.l SmallKeyCounter : INC : STA.l SmallKeyCounter
 RTS
 
 .incrementCompass
@@ -645,12 +635,12 @@ RTS
 RTS
 
 .incrementGTowerPreBigKey
-        LDA PreGTBKLocations : INC : STA PreGTBKLocations
+        LDA.l PreGTBKLocations : INC : STA.l PreGTBKLocations
 RTS
 
 .maybeIncrementBombs
-	LDA InventoryTracking+1 : AND #$02 : BNE +
-		LDA InventoryTracking+1 : ORA #$02 : STA InventoryTracking+1
+	LDA.l InventoryTracking+1 : AND.b #$02 : BNE +
+		LDA.l InventoryTracking+1 : ORA.b #$02 : STA.l InventoryTracking+1
 		JSR .incrementY
 	+
 RTS
@@ -664,18 +654,18 @@ RTS
 RTL
 
 .incrementBossSword
-	LDA SwordEquipment
+	LDA.l SwordEquipment
 	BNE + : -
-                LDA SwordlessBossKills : INC : STA SwordlessBossKills
+                LDA.l SwordlessBossKills : INC : STA.l SwordlessBossKills
                 RTS
-	+ CMP #$FF : BEQ -
-	+ CMP #$01 : BNE +
+	+ CMP.b #$FF : BEQ -
+	+ CMP.b #$01 : BNE +
 		%TopHalf(SwordBossKills) : RTS
-	+ CMP #$02 : BNE +
+	+ CMP.b #$02 : BNE +
 		%BottomHalf(SwordBossKills) : RTS
-	+ CMP #$03 : BNE +
+	+ CMP.b #$03 : BNE +
 		%TopHalf(SwordBossKills+1) : RTS
-	+ CMP #$04 : BNE +
+	+ CMP.b #$04 : BNE +
 		%BottomHalf(SwordBossKills+1)
 	+
 RTS
@@ -684,7 +674,7 @@ RTS
 	LDX $040C : BMI +
 		REP #$20  ; 16 bit
 		LDA.l DungeonMask, X
-		ORA DungeonsCompleted : STA DungeonsCompleted
+		ORA.l DungeonsCompleted : STA.l DungeonsCompleted
 		SEP #$20  ; 8 bit
 	+
 RTS
@@ -694,11 +684,11 @@ RTS
 ; Link_ReceiveItem_HUDRefresh:
 ;--------------------------------------------------------------------------------
 Link_ReceiveItem_HUDRefresh:
-	LDA BombsEquipment : BNE + ; skip if we have bombs
-	LDA BombCapacity : BEQ + ; skip if we can't have bombs
-	LDA BombsFiller : BEQ + ; skip if we are filling no bombs
-		DEC : STA BombsFiller ; decrease bomb fill count
-		LDA.b #$01 : STA BombsEquipment ; increase actual bomb count
+	LDA.l BombsEquipment : BNE + ; skip if we have bombs
+	LDA.l BombCapacity : BEQ + ; skip if we can't have bombs
+	LDA.l BombsFiller : BEQ + ; skip if we are filling no bombs
+		DEC : STA.l BombsFiller ; decrease bomb fill count
+		LDA.b #$01 : STA.l BombsEquipment ; increase actual bomb count
 	+
 
 	JSL.l HUD_RefreshIconLong ; thing we wrote over
@@ -710,11 +700,11 @@ RTL
 ; HandleBombAbsorbtion:
 ;--------------------------------------------------------------------------------
 HandleBombAbsorbtion:
-	STA BombsFiller ; thing we wrote over
-	LDA $0303 : BNE + ; skip if we already have some item selected
-	LDA BombCapacity : BEQ + ; skip if we can't have bombs
-		LDA.b #$04 : STA $0202 ; set selected item to bombs
-		LDA.b #$01 : STA $0303 ; set selected item to bombs
+	STA.l BombsFiller ; thing we wrote over
+	LDA.w $0303 : BNE + ; skip if we already have some item selected
+	LDA.l BombCapacity : BEQ + ; skip if we can't have bombs
+		LDA.b #$04 : STA.w $0202 ; set selected item to bombs
+		LDA.b #$01 : STA.w $0303 ; set selected item to bombs
 		JSL.l HUD_RebuildLong
 	+
 RTL
@@ -723,17 +713,16 @@ RTL
 ;--------------------------------------------------------------------------------
 ; AddYMarker:
 ;--------------------------------------------------------------------------------
-;!JAR_STATUS = "$7F5030";
 AddYMarker:
-	LDA $0202 : AND.w #$FF ; load item value
+	LDA.w $0202 : AND.w #$FF ; load item value
 	CMP.w #$02 : BNE + ; boomerang
-		LDA InventoryTracking : AND.w #$C0 : CMP.w #$C0 : BEQ .drawYBubble : BRA .drawNormal
+		LDA.l InventoryTracking : AND.w #$C0 : CMP.w #$C0 : BEQ .drawYBubble : BRA .drawNormal
 	+ CMP.w #$01 : BNE + ; bow
-		LDA BowTracking : AND.w #$C0 : CMP.w #$C0 : BEQ .drawYBubble : BRA .drawNormal
+		LDA.l BowTracking : AND.w #$C0 : CMP.w #$C0 : BEQ .drawYBubble : BRA .drawNormal
 	+ CMP.w #$05 : BNE + ; powder
-		LDA InventoryTracking : AND.w #$30 : CMP.w #$30 : BEQ .drawYBubble : BRA .drawNormal
+		LDA.l InventoryTracking : AND.w #$30 : CMP.w #$30 : BEQ .drawYBubble : BRA .drawNormal
 	+ CMP.w #$0D : BNE + ; flute
-		LDA InventoryTracking : BIT.w #$04 : BEQ .drawNormal ; make sure we have shovel
+		LDA.l InventoryTracking : BIT.w #$04 : BEQ .drawNormal ; make sure we have shovel
 					  AND.w #$03 : BNE .drawYBubble ; make sure we have one of the flutes
 					  BRA .drawNormal
 	+ CMP.w #$10 : BEQ .drawJarMarker
@@ -743,8 +732,7 @@ AddYMarker:
 	BRA .drawTile
 
 	.drawJarMarker
-	;SEP #$20 : LDA !JAR_STATUS : INC : AND.b #$01 : STA !JAR_STATUS : REP #$20 : BEQ .drawXBubble
-	LDA $0207 : AND.w #$0020 : BNE .drawXBubble
+	LDA.w $0207 : AND.w #$0020 : BNE .drawXBubble
 
 	.drawYBubble
 	LDA.w #$3D4F
@@ -755,7 +743,7 @@ AddYMarker:
 	LDA.w #$2D3E
 
 	.drawTile
-	STA $FFC4, Y
+	STA.w $FFC4, Y
 RTL
 ;--------------------------------------------------------------------------------
 
@@ -764,22 +752,22 @@ RTL
 ; this is horrible, make it better
 ;--------------------------------------------------------------------------------
 MakeCircleBlue:
-    LDA $FFC0, Y : AND.w #$EFFF : STA $FFC0, Y
-    LDA $FFC2, Y : AND.w #$EFFF : STA $FFC2, Y
+    LDA.w $FFC0, Y : AND.w #$EFFF : STA.w $FFC0, Y
+    LDA.w $FFC2, Y : AND.w #$EFFF : STA.w $FFC2, Y
+ 
+    LDA.w $FFFE, Y : AND.w #$EFFF : STA.w $FFFE, Y
+    LDA.w $0004, Y : AND.w #$EFFF : STA.w $0004, Y
+    
+    LDA.w $003E, Y : AND.w #$EFFF : STA.w $003E, Y
+    LDA.w $0044, Y : AND.w #$EFFF : STA.w $0044, Y
+    
+    LDA.w $0080, Y : AND.w #$EFFF : STA.w $0080, Y
+    LDA.w $0082, Y : AND.w #$EFFF : STA.w $0082, Y
 
-    LDA $FFFE, Y : AND.w #$EFFF : STA $FFFE, Y
-    LDA $0004, Y : AND.w #$EFFF : STA $0004, Y
-
-    LDA $003E, Y : AND.w #$EFFF : STA $003E, Y
-    LDA $0044, Y : AND.w #$EFFF : STA $0044, Y
-
-    LDA $0080, Y : AND.w #$EFFF : STA $0080, Y
-    LDA $0082, Y : AND.w #$EFFF : STA $0082, Y
-
-    LDA $FFBE, Y : AND.w #$EFFF : STA $FFBE, Y
-    LDA $FFC4, Y : AND.w #$EFFF : STA $FFC4, Y
-    LDA $0084, Y : AND.w #$EFFF : STA $0084, Y
-    LDA $007E, Y : AND.w #$EFFF : STA $007E, Y
+    LDA.w $FFBE, Y : AND.w #$EFFF : STA.w $FFBE, Y
+    LDA.w $FFC4, Y : AND.w #$EFFF : STA.w $FFC4, Y
+    LDA.w $0084, Y : AND.w #$EFFF : STA.w $0084, Y
+    LDA.w $007E, Y : AND.w #$EFFF : STA.w $007E, Y
 RTS
 ;--------------------------------------------------------------------------------
 
@@ -787,8 +775,8 @@ RTS
 ; UpgradeFlute:
 ;--------------------------------------------------------------------------------
 UpgradeFlute:
-	LDA InventoryTracking : AND #$FC : ORA #$01 : STA InventoryTracking ; switch to the working flute
-	LDA.b #$03 : STA FluteEquipment ; upgrade primary inventory
+	LDA.l InventoryTracking : AND.b #$FC : ORA.b #$01 : STA.l InventoryTracking ; switch to the working flute
+	LDA.b #$03 : STA.l FluteEquipment ; upgrade primary inventory
 RTL
 ;--------------------------------------------------------------------------------
 
@@ -797,7 +785,7 @@ RTL
 ;--------------------------------------------------------------------------------
 CheckKeys:
 	LDA.l GenericKeys : BEQ + : RTL : +
-	LDA $040C : CMP.b #$FF
+	LDA.w $040C : CMP.b #$FF
 RTL
 ;--------------------------------------------------------------------------------
 
@@ -805,8 +793,8 @@ RTL
 ; DrawKeyIcon:
 ;--------------------------------------------------------------------------------
 DrawKeyIcon:
-	LDA $04 : AND.w #$00FF : CMP.w #$0090 : BNE + : LDA.w #$007F : + : ORA.w #$2400 : STA $7EC764
-	LDA $05 : AND.w #$00FF : ORA.w #$2400 : STA $7EC766
+	LDA.b Scrap04 : AND.w #$00FF : CMP.w #$0090 : BNE + : LDA.w #$007F : + : ORA.w #$2400 : STA.l $7EC764
+	LDA.b Scrap05 : AND.w #$00FF : ORA.w #$2400 : STA.l $7EC766
 RTL
 ;--------------------------------------------------------------------------------
 
@@ -815,10 +803,10 @@ RTL
 ;--------------------------------------------------------------------------------
 LoadKeys:
 	LDA.l GenericKeys : BEQ +
-		LDA CurrentGenericKeys
+		LDA.l CurrentGenericKeys
 		RTL
 	+
-	LDA DungeonKeys, X
+	LDA.l DungeonKeys, X
 RTL
 ;--------------------------------------------------------------------------------
 
@@ -828,10 +816,10 @@ RTL
 SaveKeys:
 	PHA
 	LDA.l GenericKeys : BEQ +
-		PLA : STA CurrentGenericKeys
+		PLA : STA.l CurrentGenericKeys
 		RTL
 	+
-	PLA : STA DungeonKeys, X
+	PLA : STA.l DungeonKeys, X
 RTL
 ;--------------------------------------------------------------------------------
 
@@ -845,53 +833,19 @@ ClearOWKeys:
 	JSL.l FakeWorldFix
 	JSR.w FixBunnyOnExitToLightWorld
 	LDA.l GenericKeys : BEQ +
-		PLA : LDA CurrentGenericKeys : STA CurrentSmallKeys
+		PLA : LDA.l CurrentGenericKeys : STA.l CurrentSmallKeys
 		RTL
 	+
-	PLA : STA CurrentSmallKeys
+	PLA : STA.l CurrentSmallKeys
 RTL
 ;--------------------------------------------------------------------------------
 
-;--------------------------------------------------------------------------------
-; GetWitchLootOAMTableIndex
-; in:	A - Loot ID
-; out:	A - Loot OAM Table Index
-; check if this is even still referenced anywhere
-;--------------------------------------------------------------------------------
-;GetWitchLootOAMTableIndex:
-;	PHX
-;	PHB : PHK : PLB
-;	;--------
-;	TAX : LDA .gfxSlots, X ; look up item gfx
-;	PLB : PLX
-;RTL
-;
-;;DATA - Loot Identifier to Sprite ID
-;{
-;	.gfxSlots
-;    db $FF, $FF, $FF, $FF, $05, $06, $FF, $0C
-;    db $0B, $0D, $0A, $07, $13, $0E, $FF, $FF
-;
-;    db $FF, $FF, $FF, $FF, $FF, $09, $FF, $FF
-;    db $08, $FF, $FF, $10, $11, $12, $FF, $FF
-;
-;    db $FF, $FF, $03, $04, $FF, $FF, $02, $FF
-;    db $FF, $FF, $14, $15, $17, $16, $15, $17
-;
-;    db $16, $0F, $FF, $FF, $FF, $FF, $FF, $FF
-;    db $FF, $FF, $FF, $FF, $FF, $FF, $02, $02
-;
-;    db $FF, $FF, $FF, $FF, $01, $FF, $FF, $FF
-;    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-;}
-;--------------------------------------------------------------------------------
-
 ;--------------------------------------------------------------------------------
 ; PrepItemScreenBigKey:
 ;--------------------------------------------------------------------------------
 PrepItemScreenBigKey:
-    STZ $02
-    STZ $03
+    STZ.b Scrap02
+    STZ.b Scrap03
 	REP #$30 ; thing we wrote over - set 16-bit accumulator
 RTL
 ;--------------------------------------------------------------------------------
@@ -902,7 +856,7 @@ RTL
 LoadPowder:
 	JSL.l Sprite_SpawnDynamically ; thing we wrote over
 	%GetPossiblyEncryptedItem(WitchItem, SpriteItemValues)
-	STA $0DA0, Y ; Store item type
+	STA.w $0DA0, Y ; Store item type
 	JSL.l PrepDynamicTile
 RTL
 ;--------------------------------------------------------------------------------
@@ -911,10 +865,10 @@ RTL
 ; InitializeBottles:
 ;--------------------------------------------------------------------------------
 InitializeBottles:
-	STA BottleContents, X ; thing we wrote over
+	STA.l BottleContents, X ; thing we wrote over
 	PHA
-		LDA BottleIndex : BNE +
-			TXA : INC : STA BottleIndex ; write bottle index to menu properly
+		LDA.l BottleIndex : BNE +
+			TXA : INC : STA.l BottleIndex ; write bottle index to menu properly
 		+
 	PLA
 RTL
@@ -923,17 +877,15 @@ RTL
 ;--------------------------------------------------------------------------------
 ; DrawPowder:
 ;--------------------------------------------------------------------------------
-!REDRAW = "$7F5000"
-;--------------------------------------------------------------------------------
 DrawPowder:
-	LDA $02DA : BNE .defer ; defer if link is buying a potion
-	LDA.l !REDRAW : BEQ +
-		LDA $0DA0, X ; Retrieve stored item type
+	LDA.w $02DA : BNE .defer ; defer if link is buying a potion
+	LDA.l RedrawFlag : BEQ +
+		LDA.w $0DA0, X ; Retrieve stored item type
 		JSL.l PrepDynamicTile
-		LDA #$00 : STA.l !REDRAW ; reset redraw flag
+		LDA.b #$00 : STA.l RedrawFlag ; reset redraw flag
 		BRA .defer
 	+
-	LDA $0DA0, X ; Retrieve stored item type
+	LDA.w $0DA0, X ; Retrieve stored item type
 	JSL.l DrawDynamicTile
 	.defer
 RTL
@@ -943,19 +895,17 @@ RTL
 ; LoadMushroom:
 ;--------------------------------------------------------------------------------
 LoadMushroom:
-	LDA.b #$00 : STA $0DC0, X ; thing we wrote over
+	LDA.b #$00 : STA.w $0DC0, X ; thing we wrote over
 	.justGFX
-	;LDA MushroomItem
-	;JSL.l PrepDynamicTile
 
 	PHA
 
-	LDA #$01 : STA !REDRAW
-	LDA $5D : CMP #$14 : BEQ .skip ; skip if we're mid-mirror
+	LDA.b #$01 : STA.l RedrawFlag
+	LDA.b $5D : CMP.b #$14 : BEQ .skip ; skip if we're mid-mirror
 
-	LDA #$00 : STA !REDRAW
+	LDA.b #$00 : STA.l RedrawFlag
 	%GetPossiblyEncryptedItem(MushroomItem, SpriteItemValues)
-	STA $0E80, X ; Store item type
+	STA.w $0E80, X ; Store item type
 	JSL.l PrepDynamicTile
 
 	.skip
@@ -966,16 +916,14 @@ RTL
 ;--------------------------------------------------------------------------------
 ; DrawMushroom:
 ;--------------------------------------------------------------------------------
-!REDRAW = "$7F5000"
-;--------------------------------------------------------------------------------
 DrawMushroom:
 	PHA : PHY
-		LDA !REDRAW : BEQ .skipInit ; skip init if already ready
+		LDA.l RedrawFlag : BEQ .skipInit ; skip init if already ready
 		JSL.l LoadMushroom_justGFX
 		BRA .done ; don't draw on the init frame
 
 		.skipInit
-		LDA $0E80, X ; Retrieve stored item type
+		LDA.w $0E80, X ; Retrieve stored item type
 		JSL.l DrawDynamicTile
 
 		.done
@@ -1003,12 +951,12 @@ RTL
 ; RemoveMushroom:
 ;--------------------------------------------------------------------------------
 RemoveMushroom:
-	LDA InventoryTracking : AND #$DF : STA InventoryTracking ; remove the mushroom
-	AND #$10 : BEQ .empty ; check if we have powder
-	LDA.b #$02 : STA PowderEquipment ; give powder if we have it
+	LDA.l InventoryTracking : AND.b #$DF : STA.l InventoryTracking ; remove the mushroom
+	AND.b #$10 : BEQ .empty ; check if we have powder
+	LDA.b #$02 : STA.l PowderEquipment ; give powder if we have it
 RTL
 	.empty
-	LDA.b #$00 : STA PowderEquipment ; clear the inventory slot if we don't have powder
+	LDA.b #$00 : STA.l PowderEquipment ; clear the inventory slot if we don't have powder
 RTL
 ;--------------------------------------------------------------------------------
 
@@ -1016,37 +964,26 @@ RTL
 ; DrawMagicHeader:
 ;--------------------------------------------------------------------------------
 DrawMagicHeader:
-	LDA MagicConsumption : AND.w #$00FF : CMP.w #$0002 : BEQ .quarterMagic
+	LDA.l MagicConsumption : AND.w #$00FF : CMP.w #$0002 : BEQ .quarterMagic
 	.halfMagic
-    LDA.w #$28F7 : STA $7EC704
-    LDA.w #$2851 : STA $7EC706
-    LDA.w #$28FA : STA $7EC708
+    LDA.w #$28F7 : STA.l $7EC704
+    LDA.w #$2851 : STA.l $7EC706
+    LDA.w #$28FA : STA.l $7EC708
+RTL   
+	.quarterMagic   
+    LDA.w #$28F7 : STA.l $7EC704
+    LDA.w #$2800 : STA.l $7EC706
+    LDA.w #$2801 : STA.l $7EC708
 RTL
-	.quarterMagic
-    LDA.w #$28F7 : STA $7EC704
-    LDA.w #$2800 : STA $7EC706
-    LDA.w #$2801 : STA $7EC708
-RTL
-;--------------------------------------------------------------------------------
-
-;--------------------------------------------------------------------------------
-; FixShovelLock:
-;--------------------------------------------------------------------------------
-;FixShovelLock:
-;	LDA $037A :	CMP #$01 : BEQ + ; skip if link is shoveling
-;		LDA FluteEquipment ; load shovel/flute item ID
-;	+
-;	CMP #$00
-;RTL
 ;--------------------------------------------------------------------------------
 
 ;--------------------------------------------------------------------------------
 ; SpawnShovelGamePrizeSFX:
 ;--------------------------------------------------------------------------------
 SpawnShovelGamePrizeSFX:
-	STA $7FFE00 ; thing we wrote over
+	STA.l $7FFE00 ; thing we wrote over
 	PHA
-		LDA.b #$1B : STA $012F ; play puzzle sound
+		LDA.b #$1B : STA.w $012F ; play puzzle sound
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
@@ -1056,38 +993,37 @@ RTL
 ;--------------------------------------------------------------------------------
 SpawnChestGamePrizeSFX:
 	CPX.b #$07 : BNE .normal
-	LDA $A0 : CMP.b #$06 : BNE .normal
+	LDA.b $A0 : CMP.b #$06 : BNE .normal
 	.prize
-	LDA.b #$1B : STA $012F : RTL ; play puzzle sound
+	LDA.b #$1B : STA.w $012F : RTL ; play puzzle sound
 	.normal
-	LDA.b #$0E : STA $012F ; play chest sound
+	LDA.b #$0E : STA.w $012F ; play chest sound
 RTL
 ;--------------------------------------------------------------------------------
 
 ;--------------------------------------------------------------------------------
 ; SpawnShovelItem:
 ;--------------------------------------------------------------------------------
-!REDRAW = "$7F5000"
 SpawnShovelItem:
-	LDA.b #$01 : STA !REDRAW
+	LDA.b #$01 : STA.l RedrawFlag
 
-    LDA $03FC : BEQ +
+    LDA.w $03FC : BEQ +
     	JSL DiggingGameGuy_AttemptPrizeSpawn
 		JMP .skip
 	+
 
-	LDA $035B : AND.b #$01 : BNE + : JMP .skip : + ; corner dig fix
+	LDA.w $035B : AND.b #$01 : BNE + : JMP .skip : + ; corner dig fix
 
 	PHY : PHP
 	PHB : PHK : PLB
 		SEP #$30 ; set 8-bit accumulator and index registers
 
-		LDA $1B : BEQ + : JMP .no_drop : + ; skip if indoors
+		LDA.b $1B : BEQ + : JMP .no_drop : + ; skip if indoors
 
-		LDA $8A : CMP #$2A : BEQ .no_drop ; don't drop in the haunted grove
-		          CMP #$68 : BEQ .no_drop ; don't drop in the digging game area
+                LDA.b $8A : CMP.b #$2A : BEQ .no_drop ; don't drop in the haunted grove
+                            CMP.b #$68 : BEQ .no_drop ; don't drop in the digging game area
 
-		JSL GetRandomInt : BIT #$03 : BNE .no_drop ; drop with 1/4 chance
+		JSL GetRandomInt : BIT.b #$03 : BNE .no_drop ; drop with 1/4 chance
 
 		LSR #2 : TAX ; clobber lower 2 bis - we have 64 slots now
 
@@ -1095,27 +1031,27 @@ SpawnShovelItem:
 
 		;most of this part below is copied from the digging game
 
-		STA $7FFE00
+		STA.l $7FFE00
 		JSL Sprite_SpawnDynamically
 
 		LDX.b #$00
-		LDA $2F : CMP.b #$04 : BEQ + : INX : +
+		LDA.b $2F : CMP.b #$04 : BEQ + : INX : +
 
-		LDA.l .x_speeds, X : STA $0D50, Y
+		LDA.l .x_speeds, X : STA.w $0D50, Y
 
-		LDA.b #$00 : STA $0D40, Y
-		LDA.b #$18 : STA $0F80, Y
-		LDA.b #$FF : STA $0B58, Y
-		LDA.b #$30 : STA $0F10, Y
+		LDA.b #$00 : STA.w $0D40, Y
+		LDA.b #$18 : STA.w $0F80, Y
+		LDA.b #$FF : STA.w $0B58, Y
+		LDA.b #$30 : STA.w $0F10, Y
 
-		LDA $22 : !ADD.l .x_offsets, X
-		                        AND.b #$F0 : STA $0D10, Y
-		LDA $23 : ADC.b #$00               : STA $0D30, Y
+		LDA.b $22 : !ADD.l .x_offsets, X
+		                        AND.b #$F0 : STA.w $0D10, Y
+		LDA.b $23 : ADC.b #$00               : STA.w $0D30, Y
 
-		LDA $20 : !ADD.b #$16 : AND.b #$F0 : STA $0D00, Y
-		LDA $21 : ADC.b #$00               : STA $0D20, Y
+		LDA.b $20 : !ADD.b #$16 : AND.b #$F0 : STA.w $0D00, Y
+		LDA.b $21 : ADC.b #$00               : STA.w $0D20, Y
 
-		LDA.b #$00 : STA $0F20, Y
+		LDA.b #$00 : STA.w $0F20, Y
 		TYX
 
 		LDA.b #$30 : JSL Sound_SetSfx3PanLong
diff --git a/inverted.asm b/inverted.asm
index 1aeb772..1b1cdd2 100644
--- a/inverted.asm
+++ b/inverted.asm
@@ -35,7 +35,7 @@ Overworld_CreatePyramidHoleModified:
 	JSL C9DE_LONG
 	JSL C9DE_LONG
 
-	LDA.w #$FFFF : STA $1012, Y
+	LDA.w #$FFFF : STA.w $1012, Y
 
 	JMP .ending
 .originalBehaviour
@@ -64,33 +64,33 @@ Overworld_CreatePyramidHoleModified:
 	JSL C9DE_LONG
 	JSL C9DE_LONG
 
-	LDA.w #$FFFF : STA $1012, Y
+	LDA.w #$FFFF : STA.w $1012, Y
 
 .ending
-	LDA.w #$3515 : STA $012D
+	LDA.w #$3515 : STA.w $012D
 
 	SEP #$30
 
-	LDA OverworldEventDataWRAM+$5B : ORA.b #$20 : STA OverworldEventDataWRAM+$5B
+	LDA.l OverworldEventDataWRAM+$5B : ORA.b #$20 : STA.l OverworldEventDataWRAM+$5B
 
-	LDA.b #$03 : STA $012F
+	LDA.b #$03 : STA.w $012F
 
-	LDA.b #$01 : STA $14
+	LDA.b #$01 : STA.b $14
 
 RTL
 ;------------------------------------------------------------------------------
 Draw_PyramidOverlay:
 	LDA.l InvertedMode : AND.w #$00FF : BNE .done
 .normal
-	LDA.w #$0E39 : STA $23BC
-	INC A        : STA $23BE
-	INC A        : STA $23C0
-	INC A        : STA $243C
-	INC A        : STA $243E
-	INC A        : STA $2440
-	INC A        : STA $24BC
-	INC A        : STA $24BE
-	INC A        : STA $24C0
+	LDA.w #$0E39 : STA.w $23BC
+	INC A        : STA.w $23BE
+	INC A        : STA.w $23C0
+	INC A        : STA.w $243C
+	INC A        : STA.w $243E
+	INC A        : STA.w $2440
+	INC A        : STA.w $24BC
+	INC A        : STA.w $24BE
+	INC A        : STA.w $24C0
 .done
 RTL
 ;------------------------------------------------------------------------------
@@ -130,43 +130,43 @@ db $02, $02, $02, $00, $08, $02, $02, $00, $00, $00, $00, $01, $00, $00, $20, $0
 db $02, $02, $02, $02, $02, $02, $02, $00, $00, $01, $01, $01, $02, $00, $08, $00
 
 Electric_Barrier:
-	LDA InvertedMode : BEQ .done
-		LDA OverworldEventDataWRAM, X : ORA #$40 : STA OverworldEventDataWRAM, X ;set barrier dead
+	LDA.l InvertedMode : BEQ .done
+		LDA.l OverworldEventDataWRAM, X : ORA.b #$40 : STA.l OverworldEventDataWRAM, X ;set barrier dead
 	.done
-	LDA OverworldEventDataWRAM, X ; what we wrote over
+	LDA.l OverworldEventDataWRAM, X ; what we wrote over
 RTL
 
 
 GanonTowerAnimation:
-	LDA InvertedMode : BEQ .done
-		LDA.b #$1B : STA $012F
-        STZ $04C6
-        STZ $B0
-        STZ $0710
-        STZ $02E4
+	LDA.l InvertedMode : BEQ .done
+		LDA.b #$1B : STA.w $012F
+        STZ.w $04C6
+        STZ.b $B0
+        STZ.w $0710
+        STZ.w $02E4
         
-        STZ $0FC1
+        STZ.w $0FC1
         
-        STZ $011A
-        STZ $011B
-        STZ $011C
-        STZ $011D
-		LDA.b #$02 : STA $012C
-        LDA.b #$09 : STA $012D
+        STZ.w $011A
+        STZ.w $011B
+        STZ.w $011C
+        STZ.w $011D
+		LDA.b #$02 : STA.w $012C
+        LDA.b #$09 : STA.w $012D
 		RTL
 	.done
-	    LDA.b #$05 : STA $04C6 ;what we wrote over
-        STZ $B0 ; (continued)
-	STZ $C8 ; (continued)
+	    LDA.b #$05 : STA.w $04C6 ;what we wrote over
+        STZ.b $B0 ; (continued)
+	STZ.b $C8 ; (continued)
 RTL
 
 GanonTowerInvertedCheck:
 {
-	LDA InvertedMode : BEQ .done
-		LDA #$01 ; Load a random value so it doesn't BEQ
+	LDA.l InvertedMode : BEQ .done
+		LDA.b #$01 ; Load a random value so it doesn't BEQ
 	RTL
 	.done
-	LDA $8A : CMP.b #$43 ;what we wrote over
+	LDA.b $8A : CMP.b #$43 ;what we wrote over
 	RTL
 }
 
@@ -174,14 +174,14 @@ GanonTowerInvertedCheck:
 ;Hard coded rock removed in LW for Inverted mode
 HardcodedRocks:
 
-    LDA InvertedMode : AND.w #$00FF : BEQ .normalrocks
+    LDA.l InvertedMode : AND.w #$00FF : BEQ .normalrocks
         BRA .noRock2
     .normalrocks
         LDA.w #$020F : LDX $8A : CPX.w #$0033 : BNE .noRock
-        STA $7E22A8
+        STA.l $7E22A8
     .noRock
         CPX.w #$002F : BNE .noRock2
-        STA $7E2BB2
+        STA.l $7E2BB2
     .noRock2
 RTL
 
@@ -202,7 +202,7 @@ MirrorBonk:
 	; otherwise fall through to .normal
 		PHX : PHP
 		PHB : PHK : PLB
-		LDA $8A : AND.b #$40 : BEQ .endLoop ;World we're in? branch if we are in LW we don't want bonks
+		LDA.b $8A : AND.b #$40 : BEQ .endLoop ;World we're in? branch if we are in LW we don't want bonks
 		REP #$30
 		LDX #$0000
 		.loop
@@ -231,7 +231,7 @@ MirrorBonk:
 	PLB : PLP : PLX
 .normal
     ;Not forcing a bonk, so the vanilla bonk detection run.
-	LDA $0C : ORA $0E
+	LDA.b Scrap0C : ORA.b Scrap0E
 JML.l MirrorBonk_NormalReturn
 .forceBonk
 JML.l MirrorBonk_BranchGamma
diff --git a/invertedmaps.asm b/invertedmaps.asm
index 7ff1fdb..b49c922 100644
--- a/invertedmaps.asm
+++ b/invertedmaps.asm
@@ -1,32 +1,32 @@
 Overworld_LoadNewTiles:
 {
     ; add sign to EDM for OWG people to read
-    LDA $040A : AND #$00FF : CMP #$0005 : BNE +
-        LDA #$0101 : STA $7E2E18 ; #$0101 is the sign tile16 id, $7E2D98 is the position of the tile16 on map
+    LDA.w $040A : AND.w #$00FF : CMP.w #$0005 : BNE +
+        LDA.w #$0101 : STA.l $7E2E18 ; #$0101 is the sign tile16 id, $7E2D98 is the position of the tile16 on map
     +
 
     ; GT sign
-    LDA InvertedMode : AND #$00FF : BNE +
-    LDA $040A : AND #$00FF : CMP #$0043 : BNE +
-        LDA #$0101 : STA $7E2550
+    LDA.l InvertedMode : AND.w #$00FF : BNE +
+    LDA.w $040A : AND.w #$00FF : CMP.w #$0043 : BNE +
+        LDA.w #$0101 : STA.l $7E2550
     +
 
     ; Pyramid sign
-    LDA InvertedMode : AND #$00FF : BNE +
-    LDA $040A : AND #$00FF : CMP #$005B : BNE +
-        LDA #$0101 : STA $7E27B6 ;Moved sign near statue
-        LDA #$05C2 : STA $7E27B4 ;added a pyramid peg on the left of the sign
+    LDA.l InvertedMode : AND.w #$00FF : BNE +
+    LDA.w $040A : AND.w #$00FF : CMP.w #$005B : BNE +
+        LDA.w #$0101 : STA.w $7E27B6 ; Moved sign near statue
+        LDA.w #$05C2 : STA.w $7E27B4 ; added a pyramid peg on the left of the sign
     +
 
     SEP #$30
-    LDA InvertedMode : BEQ .notInverted
+    LDA.l InvertedMode : BEQ .notInverted
     PHB
 
     ; Set the data bank to $7E.
     LDA.b #$7E : PHA : PLB
     REP #$30
     ; Use it as an index into a jump table.
-    LDA $8A : CMP #$0080 : !BGE .noData
+    LDA.b $8A : CMP.w #$0080 : !BGE .noData
     ASL A : TAX
 
     JSR (Overworld_NewTilesTable, X)
@@ -34,7 +34,7 @@ Overworld_LoadNewTiles:
     PLB
     .notInverted
     REP #$30
-    LDX #$001E : LDA #$0DBE
+    LDX.w #$001E : LDA.w #$0DBE
 
     RTL
 }
@@ -82,1039 +82,1039 @@ RTS
 
 map003:
 {
-LDA #$021A : STA $29B6
-LDA #$01F3 : STA $29B8
-LDA #$00A0 : STA $29BA
-LDA #$0104 : STA $29BC
-LDA #$00C6 : STA $2A34
-STA $2A38
-STA $2A3A
-LDA #$0034 : STA $2BE0
+LDA.w #$021A : STA.w $29B6
+LDA.w #$01F3 : STA.w $29B8
+LDA.w #$00A0 : STA.w $29BA
+LDA.w #$0104 : STA.w $29BC
+LDA.w #$00C6 : STA.w $2A34
+STA.w $2A38
+STA.w $2A3A
+LDA.w #$0034 : STA.w $2BE0
 RTS
 }
 
 map005:
 {
-LDA #$0111 : STA $206E
-STA $20EC
-LDA #$0113 : STA $2070
-STA $2072
-LDA #$0112 : STA $2074
-STA $20EE
-STA $216C
-LDA #$0116 : STA $20F0
-STA $216E
-LDA #$0117 : STA $20F2
-LDA #$0118 : STA $20F4
-LDA #$011C : STA $2170
-LDA #$011D : STA $2172
-LDA #$011E : STA $2174
-LDA #$0130 : STA $21E2
-STA $21F0
-STA $22E2
-STA $22F0
-LDA #$0123 : STA $21EC
-LDA #$0124 : STA $21EE
-LDA #$0034 : STA $21F2
-LDA #$0126 : STA $21F4
-LDA #$0135 : STA $2262
-STA $2270
-STA $2362
-STA $2370
-LDA #$0136 : STA $2264
-STA $2266
-STA $226C
-STA $226E
-LDA #$0137 : STA $2268
-STA $226A
-LDA #$013C : STA $22E4
-STA $22E6
-STA $22EC
-STA $22EE
-LDA #$013D : STA $22E8
-STA $22EA
-LDA #$0144 : STA $2364
-LDA #$0145 : STA $2366
-LDA #$0146 : STA $2368
-LDA #$0147 : STA $236A
-LDA #$01B3 : STA $236C
-LDA #$01B4 : STA $236E
-LDA #$0139 : STA $2970
-STA $2C6C
-LDA #$014B : STA $2972
-STA $2C6E
-LDA #$016B : STA $29F0
-STA $2CEC
-LDA #$0182 : STA $29F2
-STA $2CEE
+LDA.w #$0111 : STA.w $206E
+STA.w $20EC
+LDA.w #$0113 : STA.w $2070
+STA.w $2072
+LDA.w #$0112 : STA.w $2074
+STA.w $20EE
+STA.w $216C
+LDA.w #$0116 : STA.w $20F0
+STA.w $216E
+LDA.w #$0117 : STA.w $20F2
+LDA.w #$0118 : STA.w $20F4
+LDA.w #$011C : STA.w $2170
+LDA.w #$011D : STA.w $2172
+LDA.w #$011E : STA.w $2174
+LDA.w #$0130 : STA.w $21E2
+STA.w $21F0
+STA.w $22E2
+STA.w $22F0
+LDA.w #$0123 : STA.w $21EC
+LDA.w #$0124 : STA.w $21EE
+LDA.w #$0034 : STA.w $21F2
+LDA.w #$0126 : STA.w $21F4
+LDA.w #$0135 : STA.w $2262
+STA.w $2270
+STA.w $2362
+STA.w $2370
+LDA.w #$0136 : STA.w $2264
+STA.w $2266
+STA.w $226C
+STA.w $226E
+LDA.w #$0137 : STA.w $2268
+STA.w $226A
+LDA.w #$013C : STA.w $22E4
+STA.w $22E6
+STA.w $22EC
+STA.w $22EE
+LDA.w #$013D : STA.w $22E8
+STA.w $22EA
+LDA.w #$0144 : STA.w $2364
+LDA.w #$0145 : STA.w $2366
+LDA.w #$0146 : STA.w $2368
+LDA.w #$0147 : STA.w $236A
+LDA.w #$01B3 : STA.w $236C
+LDA.w #$01B4 : STA.w $236E
+LDA.w #$0139 : STA.w $2970
+STA.w $2C6C
+LDA.w #$014B : STA.w $2972
+STA.w $2C6E
+LDA.w #$016B : STA.w $29F0
+STA.w $2CEC
+LDA.w #$0182 : STA.w $29F2
+STA.w $2CEE
 
 .map014
-LDA #$0034 : STA $3D4A
+LDA.w #$0034 : STA.w $3D4A
 
 RTS
 }
 
 map007:
 {
-LDA #$021B : STA $259E
-STA $25A2
-STA $25A4
-STA $261C
-STA $2626
-STA $269A
-STA $26A8
-STA $271A
-STA $2728
-STA $279A
-STA $27A8
-STA $281E
-STA $2820
-STA $2822
-STA $2824
-STA $2828
-STA $289C
-STA $28A6
-STA $291E
-STA $2924
-LDA #$0134 : STA $269E
-STA $26A4
-LDA #$0034 : STA $2826
+LDA.w #$021B : STA.w $259E
+STA.w $25A2
+STA.w $25A4
+STA.w $261C
+STA.w $2626
+STA.w $269A
+STA.w $26A8
+STA.w $271A
+STA.w $2728
+STA.w $279A
+STA.w $27A8
+STA.w $281E
+STA.w $2820
+STA.w $2822
+STA.w $2824
+STA.w $2828
+STA.w $289C
+STA.w $28A6
+STA.w $291E
+STA.w $2924
+LDA.w #$0134 : STA.w $269E
+STA.w $26A4
+LDA.w #$0034 : STA.w $2826
 RTS
 }
 
 map016:
 {
-LDA #$0034 : STA $2B2E
+LDA.w #$0034 : STA.w $2B2E
 RTS
 }
 
 map020:
 {
-LDA #$02F1 : STA $2422
-LDA #$02F2 : STA $2424
-LDA #$0184 : STA $24A2
-STA $2522
-LDA #$0185 : STA $24A4
-STA $2524
+LDA.w #$02F1 : STA.w $2422
+LDA.w #$02F2 : STA.w $2424
+LDA.w #$0184 : STA.w $24A2
+STA.w $2522
+LDA.w #$0185 : STA.w $24A4
+STA.w $2524
 RTS
 }
 
 map027: ;Castle map
 {
 
-LDA #$0485 : STA $2424
-STA $2426
-LDA #$0454 : STA $24A4
-STA $24A6
-LDA #$0476 : STA $2522
-LDA #$0460 : STA $2524
-STA $2526
-LDA #$04D7 : STA $2528
-LDA #$04DD : STA $2624
-LDA #$04DE : STA $2626
-LDA #$04E0 : STA $26A4
-LDA #$04E1 : STA $26A6
-LDA #$04E4 : STA $2724
-LDA #$04E5 : STA $2726
-LDA #$0034 : STA $27A4
-STA $27A6
+LDA.w #$0485 : STA.w $2424
+STA.w $2426
+LDA.w #$0454 : STA.w $24A4
+STA.w $24A6
+LDA.w #$0476 : STA.w $2522
+LDA.w #$0460 : STA.w $2524
+STA.w $2526
+LDA.w #$04D7 : STA.w $2528
+LDA.w #$04DD : STA.w $2624
+LDA.w #$04DE : STA.w $2626
+LDA.w #$04E0 : STA.w $26A4
+LDA.w #$04E1 : STA.w $26A6
+LDA.w #$04E4 : STA.w $2724
+LDA.w #$04E5 : STA.w $2726
+LDA.w #$0034 : STA.w $27A4
+STA.w $27A6
 
 ;Eye removed
-LDA #$046D : STA $243E
-STA $24BC
-STA $24BE
-STA $253E
-STA $2440
-STA $24C0
-STA $24C2
-STA $2540
+LDA.w #$046D : STA.w $243E
+STA.w $24BC
+STA.w $24BE
+STA.w $253E
+STA.w $2440
+STA.w $24C0
+STA.w $24C2
+STA.w $2540
 
 ;new trees
-LDA #$0035 : STA $2C28
-STA $2FAE
-LDA #$0034 : STA $2C2C
-STA $2C2E
-STA $2CB6
-STA $2D36
-STA $2DB6
-STA $2EB6
-STA $2F30
-STA $2F36
-STA $2FAA
-STA $2FB0
-STA $2FB4
-STA $2FB6
-LDA #$00E2 : STA $2C36
-STA $2FA8
-LDA #$00AE : STA $2CAC
-LDA #$00AF : STA $2CAE
-LDA #$007E : STA $2CB0
-LDA #$007F : STA $2CB2
-LDA #$04BA : STA $2CB4
-STA $2DB4
-STA $2EB4
-LDA #$00B0 : STA $2D2C
-LDA #$0014 : STA $2D2E
-LDA #$0015 : STA $2D30
-LDA #$00A8 : STA $2D32
-LDA #$04BB : STA $2D34
-STA $2E34
-STA $2F34
-LDA #$0089 : STA $2DAC
-LDA #$001C : STA $2DAE
-LDA #$001D : STA $2DB0
-LDA #$0076 : STA $2DB2
-LDA #$00F1 : STA $2E2C
-LDA #$004E : STA $2E2E
-LDA #$004F : STA $2E30
-LDA #$00D9 : STA $2E32
-LDA #$009A : STA $2EAC
-LDA #$009B : STA $2EAE
-LDA #$009C : STA $2EB0
-LDA #$0095 : STA $2EB2
+LDA.w #$0035 : STA.w $2C28
+STA.w $2FAE
+LDA.w #$0034 : STA.w $2C2C
+STA.w $2C2E
+STA.w $2CB6
+STA.w $2D36
+STA.w $2DB6
+STA.w $2EB6
+STA.w $2F30
+STA.w $2F36
+STA.w $2FAA
+STA.w $2FB0
+STA.w $2FB4
+STA.w $2FB6
+LDA.w #$00E2 : STA.w $2C36
+STA.w $2FA8
+LDA.w #$00AE : STA.w $2CAC
+LDA.w #$00AF : STA.w $2CAE
+LDA.w #$007E : STA.w $2CB0
+LDA.w #$007F : STA.w $2CB2
+LDA.w #$04BA : STA.w $2CB4
+STA.w $2DB4
+STA.w $2EB4
+LDA.w #$00B0 : STA.w $2D2C
+LDA.w #$0014 : STA.w $2D2E
+LDA.w #$0015 : STA.w $2D30
+LDA.w #$00A8 : STA.w $2D32
+LDA.w #$04BB : STA.w $2D34
+STA.w $2E34
+STA.w $2F34
+LDA.w #$0089 : STA.w $2DAC
+LDA.w #$001C : STA.w $2DAE
+LDA.w #$001D : STA.w $2DB0
+LDA.w #$0076 : STA.w $2DB2
+LDA.w #$00F1 : STA.w $2E2C
+LDA.w #$004E : STA.w $2E2E
+LDA.w #$004F : STA.w $2E30
+LDA.w #$00D9 : STA.w $2E32
+LDA.w #$009A : STA.w $2EAC
+LDA.w #$009B : STA.w $2EAE
+LDA.w #$009C : STA.w $2EB0
+LDA.w #$0095 : STA.w $2EB2
 
-LDA #$0034
-STA $3028
-STA $302C
-LDA #$0035 : STA $302A
-STA $3032
-LDA #$00DA : STA $302E
-LDA #$00E2 : STA $3030
+LDA.w #$0034
+STA.w $3028
+STA.w $302C
+LDA.w #$0035 : STA.w $302A
+STA.w $3032
+LDA.w #$00DA : STA.w $302E
+LDA.w #$00E2 : STA.w $3030
 
 
 
-LDA #$0485 : STA $2424
-STA $2426
-LDA #$0454 : STA $24A4
-STA $24A6
-LDA #$0476 : STA $2522
-LDA #$0460 : STA $2524
-STA $2526
-LDA #$04D7 : STA $2528
-LDA #$04DD : STA $2624
-LDA #$04DE : STA $2626
-LDA #$04E0 : STA $26A4
-LDA #$04E1 : STA $26A6
-LDA #$04E4 : STA $2724
-LDA #$04E5 : STA $2726
-LDA #$0034 : STA $27A4
-STA $27A6
+LDA.w #$0485 : STA.w $2424
+STA.w $2426
+LDA.w #$0454 : STA.w $24A4
+STA.w $24A6
+LDA.w #$0476 : STA.w $2522
+LDA.w #$0460 : STA.w $2524
+STA.w $2526
+LDA.w #$04D7 : STA.w $2528
+LDA.w #$04DD : STA.w $2624
+LDA.w #$04DE : STA.w $2626
+LDA.w #$04E0 : STA.w $26A4
+LDA.w #$04E1 : STA.w $26A6
+LDA.w #$04E4 : STA.w $2724
+LDA.w #$04E5 : STA.w $2726
+LDA.w #$0034 : STA.w $27A4
+STA.w $27A6
 
-LDA #$0486 : STA $26B0
-LDA #$0487 : STA $26B2
-LDA #$0454 : STA $272C
-STA $272E
-LDA #$048E : STA $2730
-LDA #$048F : STA $2732
-LDA #$04CA : STA $27AC
-LDA #$045E : STA $27AE
-LDA #$0494 : STA $27B0
-LDA #$0495 : STA $27B2
-LDA #$049E : STA $27B4
-LDA #$0499 : STA $282C
-LDA #$0451 : STA $2830
-LDA #$0034 : STA $28AC
-STA $28AE
-STA $28B0
-LDA #$0454 : STA $274E
-STA $2750
-LDA #$0608 : STA $2752
-LDA #$0459 : STA $27CE
-STA $27D0
-LDA #$045E : STA $27D2
-LDA #$0451 : STA $284E
-STA $2850
-STA $2852
-STA $282E
-LDA #$0034 : STA $28CE
-STA $28D0
-STA $28D2
+LDA.w #$0486 : STA.w $26B0
+LDA.w #$0487 : STA.w $26B2
+LDA.w #$0454 : STA.w $272C
+STA.w $272E
+LDA.w #$048E : STA.w $2730
+LDA.w #$048F : STA.w $2732
+LDA.w #$04CA : STA.w $27AC
+LDA.w #$045E : STA.w $27AE
+LDA.w #$0494 : STA.w $27B0
+LDA.w #$0495 : STA.w $27B2
+LDA.w #$049E : STA.w $27B4
+LDA.w #$0499 : STA.w $282C
+LDA.w #$0451 : STA.w $2830
+LDA.w #$0034 : STA.w $28AC
+STA.w $28AE
+STA.w $28B0
+LDA.w #$0454 : STA.w $274E
+STA.w $2750
+LDA.w #$0608 : STA.w $2752
+LDA.w #$0459 : STA.w $27CE
+STA.w $27D0
+LDA.w #$045E : STA.w $27D2
+LDA.w #$0451 : STA.w $284E
+STA.w $2850
+STA.w $2852
+STA.w $282E
+LDA.w #$0034 : STA.w $28CE
+STA.w $28D0
+STA.w $28D2
 
 
 ; CHECK IF AGAHNIM 2 IS DEAD AND WE HAVE ALREADY LANDED
-LDA $7EF2DB : AND #$0020 : BEQ .agahnim2Alive
-LDA #$046D : STA $243E
-LDA #$0E3A : STA $24BC
-LDA #$0E3B : STA $24BE
-LDA #$0E3E : STA $253C
-LDA #$0E3F : STA $253E
-LDA #$0490 : STA $25BE
-LDA #$0E39 : STA $2440
-LDA #$0E3C : STA $24C0
-LDA #$0E3D : STA $24C2
-LDA #$0E40 : STA $2540
-LDA #$0E41 : STA $2542
-LDA #$0491 : STA $25C0
+LDA.w $7EF2DB : AND #$0020 : BEQ .agahnim2Alive
+LDA.w #$046D : STA.w $243E
+LDA.w #$0E3A : STA.w $24BC
+LDA.w #$0E3B : STA.w $24BE
+LDA.w #$0E3E : STA.w $253C
+LDA.w #$0E3F : STA.w $253E
+LDA.w #$0490 : STA.w $25BE
+LDA.w #$0E39 : STA.w $2440
+LDA.w #$0E3C : STA.w $24C0
+LDA.w #$0E3D : STA.w $24C2
+LDA.w #$0E40 : STA.w $2540
+LDA.w #$0E41 : STA.w $2542
+LDA.w #$0491 : STA.w $25C0
 .agahnim2Alive
 
 ; add sign for Tower Entry
-LDA #$0101 : STA $7E222C
-LDA #$0101 : STA $7E2252
+LDA.w #$0101 : STA.w $7E222C
+LDA.w #$0101 : STA.w $7E2252
 
 RTS
 }
 
 map041:
 {
-LDA #$0034 : STA $2288
-STA $2308
-STA $2388
-STA $2408
-STA $2488
-STA $248A
-LDA #$0036 : STA $2386
+LDA.w #$0034 : STA.w $2288
+STA.w $2308
+STA.w $2388
+STA.w $2408
+STA.w $2488
+STA.w $248A
+LDA.w #$0036 : STA.w $2386
 RTS
 }
 
 map049:
 {
-LDA #$017E : STA $2050
-STA $20CE
-LDA #$00D1 : STA $2052
-STA $2054
-STA $2056
-STA $2058
-STA $205A
-STA $205C
-STA $205E
-STA $21E6
-STA $21E8
-STA $21EA
-STA $21EC
-STA $21EE
-STA $21F0
-LDA #$00D2 : STA $2060
-STA $20E2
-STA $2164
-LDA #$0183 : STA $20D0
-STA $214E
-LDA #$00C9 : STA $20D2
-STA $20D4
-STA $20D6
-STA $20D8
-STA $20DA
-STA $20DC
-STA $20DE
-STA $2152
-STA $2154
-STA $2156
-STA $2158
-STA $215A
-STA $215C
-STA $215E
-STA $2266
-STA $2268
-STA $226A
-STA $226C
-STA $226E
-STA $2270
-STA $22CC
-LDA #$00D0 : STA $20E0
-STA $2162
-STA $21E4
-LDA #$0153 : STA $2150
-STA $21CE
-STA $21D0
-STA $2250
-STA $22CE
-LDA #$00C8 : STA $2160
-STA $21E2
-STA $2264
-STA $28DA
-STA $295C
-LDA #$00DC : STA $21D2
-STA $21D4
-STA $21D6
-STA $21D8
-STA $21DA
-STA $21DC
-STA $21DE
-STA $224C
-LDA #$00CA : STA $21E0
-STA $2262
-STA $285A
-STA $28DC
-LDA #$0178 : STA $224E
-LDA #$00E3 : STA $2252
-STA $2254
-LDA #$0186 : STA $22D0
-STA $234E
-LDA #$0034 : STA $22D2
-STA $22D4
-STA $22D6
-STA $2350
-STA $2352
-STA $2354
-STA $2356
-STA $23D0
-STA $23D2
-STA $23D4
-STA $23D6
-STA $2452
-STA $2454
-STA $2456
-STA $2458
-STA $24D4
-STA $24D6
-STA $2554
-STA $2556
-STA $25D4
-STA $25D6
-STA $2656
-LDA #$00D3 : STA $22E2
-LDA #$0302 : STA $22E4
-LDA #$00CC : STA $22E6
-STA $22E8
-STA $22EA
-STA $22EC
-STA $22EE
-STA $22F0
-STA $234C
-LDA #$00CE : STA $2362
-STA $23E2
-STA $25D8
-STA $2658
-STA $26D8
-STA $2758
-LDA #$00C5 : STA $2364
-STA $23E4
-STA $25DC
-STA $265C
-STA $26DC
-STA $275C
-LDA #$06AB : STA $2366
-STA $23E6
-STA $2466
-STA $24E4
-STA $24E6
-STA $2760
-LDA #$00AA : STA $2368
-LDA #$0384 : STA $236A
-STA $236E
-STA $23EC
-STA $246A
-STA $24E8
-STA $24EA
-STA $24EC
-STA $24EE
-LDA #$00AB : STA $236C
-LDA #$0759 : STA $23C8
-STA $244A
-STA $24CC
-STA $254E
-STA $26D0
-STA $2752
-STA $27D4
-LDA #$0757 : STA $23CA
-STA $244C
-STA $24CE
-STA $2550
-STA $26D2
-STA $2754
-LDA #$01FF : STA $23CC
-STA $244E
-STA $24D0
-STA $2652
-STA $26D4
-STA $2756
-LDA #$017C : STA $23CE
-STA $2450
-STA $24D2
-STA $2654
-STA $26D6
-LDA #$015C : STA $23E0
-LDA #$0100 : STA $245A
-STA $24D8
-LDA #$01C2 : STA $245C
-LDA #$0218 : STA $245E
-LDA #$0162 : STA $2460
-LDA #$0106 : STA $2462
-STA $24E0
-STA $255C
-LDA #$0107 : STA $2464
-STA $24E2
-LDA #$0104 : STA $24DA
-STA $2558
-LDA #$01D4 : STA $24DC
-LDA #$0219 : STA $24DE
-LDA #$0179 : STA $2552
-STA $25D2
-LDA #$0105 : STA $255A
-LDA #$0166 : STA $255E
-LDA #$0766 : STA $2560
-LDA #$06B4 : STA $2562
-STA $2564
-STA $2566
-STA $2568
-STA $256A
-STA $256C
-STA $256E
-STA $2570
-LDA #$06E5 : STA $25D0
-STA $2650
-LDA #$00C4 : STA $25DA
-STA $265A
-STA $26DA
-STA $275A
-LDA #$0171 : STA $25DE
-LDA #$0165 : STA $25E4
-STA $25E6
-STA $25E8
-STA $25EA
-STA $25EC
-STA $25EE
-STA $25F0
-LDA #$06E4 : STA $27D2
-STA $2852
-STA $2854
-STA $2856
-STA $28D4
-STA $28D6
-STA $2956
-STA $2958
-STA $29D8
-STA $29DA
-LDA #$06E1 : STA $27D6
-LDA #$02FD : STA $27D8
-STA $2858
-LDA #$00CF : STA $27DA
-LDA #$06E7 : STA $28D8
-STA $295A
-STA $29DC
+LDA.w #$017E : STA.w $2050
+STA.w $20CE
+LDA.w #$00D1 : STA.w $2052
+STA.w $2054
+STA.w $2056
+STA.w $2058
+STA.w $205A
+STA.w $205C
+STA.w $205E
+STA.w $21E6
+STA.w $21E8
+STA.w $21EA
+STA.w $21EC
+STA.w $21EE
+STA.w $21F0
+LDA.w #$00D2 : STA.w $2060
+STA.w $20E2
+STA.w $2164
+LDA.w #$0183 : STA.w $20D0
+STA.w $214E
+LDA.w #$00C9 : STA.w $20D2
+STA.w $20D4
+STA.w $20D6
+STA.w $20D8
+STA.w $20DA
+STA.w $20DC
+STA.w $20DE
+STA.w $2152
+STA.w $2154
+STA.w $2156
+STA.w $2158
+STA.w $215A
+STA.w $215C
+STA.w $215E
+STA.w $2266
+STA.w $2268
+STA.w $226A
+STA.w $226C
+STA.w $226E
+STA.w $2270
+STA.w $22CC
+LDA.w #$00D0 : STA.w $20E0
+STA.w $2162
+STA.w $21E4
+LDA.w #$0153 : STA.w $2150
+STA.w $21CE
+STA.w $21D0
+STA.w $2250
+STA.w $22CE
+LDA.w #$00C8 : STA.w $2160
+STA.w $21E2
+STA.w $2264
+STA.w $28DA
+STA.w $295C
+LDA.w #$00DC : STA.w $21D2
+STA.w $21D4
+STA.w $21D6
+STA.w $21D8
+STA.w $21DA
+STA.w $21DC
+STA.w $21DE
+STA.w $224C
+LDA.w #$00CA : STA.w $21E0
+STA.w $2262
+STA.w $285A
+STA.w $28DC
+LDA.w #$0178 : STA.w $224E
+LDA.w #$00E3 : STA.w $2252
+STA.w $2254
+LDA.w #$0186 : STA.w $22D0
+STA.w $234E
+LDA.w #$0034 : STA.w $22D2
+STA.w $22D4
+STA.w $22D6
+STA.w $2350
+STA.w $2352
+STA.w $2354
+STA.w $2356
+STA.w $23D0
+STA.w $23D2
+STA.w $23D4
+STA.w $23D6
+STA.w $2452
+STA.w $2454
+STA.w $2456
+STA.w $2458
+STA.w $24D4
+STA.w $24D6
+STA.w $2554
+STA.w $2556
+STA.w $25D4
+STA.w $25D6
+STA.w $2656
+LDA.w #$00D3 : STA.w $22E2
+LDA.w #$0302 : STA.w $22E4
+LDA.w #$00CC : STA.w $22E6
+STA.w $22E8
+STA.w $22EA
+STA.w $22EC
+STA.w $22EE
+STA.w $22F0
+STA.w $234C
+LDA.w #$00CE : STA.w $2362
+STA.w $23E2
+STA.w $25D8
+STA.w $2658
+STA.w $26D8
+STA.w $2758
+LDA.w #$00C5 : STA.w $2364
+STA.w $23E4
+STA.w $25DC
+STA.w $265C
+STA.w $26DC
+STA.w $275C
+LDA.w #$06AB : STA.w $2366
+STA.w $23E6
+STA.w $2466
+STA.w $24E4
+STA.w $24E6
+STA.w $2760
+LDA.w #$00AA : STA.w $2368
+LDA.w #$0384 : STA.w $236A
+STA.w $236E
+STA.w $23EC
+STA.w $246A
+STA.w $24E8
+STA.w $24EA
+STA.w $24EC
+STA.w $24EE
+LDA.w #$00AB : STA.w $236C
+LDA.w #$0759 : STA.w $23C8
+STA.w $244A
+STA.w $24CC
+STA.w $254E
+STA.w $26D0
+STA.w $2752
+STA.w $27D4
+LDA.w #$0757 : STA.w $23CA
+STA.w $244C
+STA.w $24CE
+STA.w $2550
+STA.w $26D2
+STA.w $2754
+LDA.w #$01FF : STA.w $23CC
+STA.w $244E
+STA.w $24D0
+STA.w $2652
+STA.w $26D4
+STA.w $2756
+LDA.w #$017C : STA.w $23CE
+STA.w $2450
+STA.w $24D2
+STA.w $2654
+STA.w $26D6
+LDA.w #$015C : STA.w $23E0
+LDA.w #$0100 : STA.w $245A
+STA.w $24D8
+LDA.w #$01C2 : STA.w $245C
+LDA.w #$0218 : STA.w $245E
+LDA.w #$0162 : STA.w $2460
+LDA.w #$0106 : STA.w $2462
+STA.w $24E0
+STA.w $255C
+LDA.w #$0107 : STA.w $2464
+STA.w $24E2
+LDA.w #$0104 : STA.w $24DA
+STA.w $2558
+LDA.w #$01D4 : STA.w $24DC
+LDA.w #$0219 : STA.w $24DE
+LDA.w #$0179 : STA.w $2552
+STA.w $25D2
+LDA.w #$0105 : STA.w $255A
+LDA.w #$0166 : STA.w $255E
+LDA.w #$0766 : STA.w $2560
+LDA.w #$06B4 : STA.w $2562
+STA.w $2564
+STA.w $2566
+STA.w $2568
+STA.w $256A
+STA.w $256C
+STA.w $256E
+STA.w $2570
+LDA.w #$06E5 : STA.w $25D0
+STA.w $2650
+LDA.w #$00C4 : STA.w $25DA
+STA.w $265A
+STA.w $26DA
+STA.w $275A
+LDA.w #$0171 : STA.w $25DE
+LDA.w #$0165 : STA.w $25E4
+STA.w $25E6
+STA.w $25E8
+STA.w $25EA
+STA.w $25EC
+STA.w $25EE
+STA.w $25F0
+LDA.w #$06E4 : STA.w $27D2
+STA.w $2852
+STA.w $2854
+STA.w $2856
+STA.w $28D4
+STA.w $28D6
+STA.w $2956
+STA.w $2958
+STA.w $29D8
+STA.w $29DA
+LDA.w #$06E1 : STA.w $27D6
+LDA.w #$02FD : STA.w $27D8
+STA.w $2858
+LDA.w #$00CF : STA.w $27DA
+LDA.w #$06E7 : STA.w $28D8
+STA.w $295A
+STA.w $29DC
 
 
-LDA #$0769 : STA $38F8
-LDA #$06E1 : STA $38FA
-STA $38FC
-STA $38FE
-LDA #$06E3 : STA $3978
-LDA #$02E5 : STA $397A
-STA $397E
-LDA #$02EC : STA $397C
-LDA #$02F0 : STA $39F8
-LDA #$02F3 : STA $39FA
-STA $39FC
-STA $39FE
+LDA.w #$0769 : STA.w $38F8
+LDA.w #$06E1 : STA.w $38FA
+STA.w $38FC
+STA.w $38FE
+LDA.w #$06E3 : STA.w $3978
+LDA.w #$02E5 : STA.w $397A
+STA.w $397E
+LDA.w #$02EC : STA.w $397C
+LDA.w #$02F0 : STA.w $39F8
+LDA.w #$02F3 : STA.w $39FA
+STA.w $39FC
+STA.w $39FE
 
 
 .map056
-LDA #$0034 : STA $3D94
+LDA.w #$0034 : STA.w $3D94
 
 RTS
 }
 
 map060:
 {
-LDA #$02E5 : STA $27AE
-STA $282C
-STA $282E
-STA $2832
-STA $28AC
-STA $28AE
-STA $2928
-STA $292C
-STA $29A8
-STA $29B0
-STA $2A28
-STA $2A30
-STA $2AAC
-STA $2AB2
-LDA #$078A : STA $28AA
-STA $28B0
-STA $2AAA
-STA $2B2A
-STA $2B30
-STA $2BAE
-LDA #$02EB : STA $28B4
-STA $2930
-STA $29AE
-STA $2A2C
-STA $2A32
-STA $2AAE
-LDA #$02EC : STA $2934
-STA $2B28
-STA $2B2C
-STA $2B2E
-STA $2B32
+LDA.w #$02E5 : STA.w $27AE
+STA.w $282C
+STA.w $282E
+STA.w $2832
+STA.w $28AC
+STA.w $28AE
+STA.w $2928
+STA.w $292C
+STA.w $29A8
+STA.w $29B0
+STA.w $2A28
+STA.w $2A30
+STA.w $2AAC
+STA.w $2AB2
+LDA.w #$078A : STA.w $28AA
+STA.w $28B0
+STA.w $2AAA
+STA.w $2B2A
+STA.w $2B30
+STA.w $2BAE
+LDA.w #$02EB : STA.w $28B4
+STA.w $2930
+STA.w $29AE
+STA.w $2A2C
+STA.w $2A32
+STA.w $2AAE
+LDA.w #$02EC : STA.w $2934
+STA.w $2B28
+STA.w $2B2C
+STA.w $2B2E
+STA.w $2B32
 RTS
 }
 
 map050:
 {
-LDA #$01D5 : STA $2486
-LDA #$0165 : STA $2506
-LDA #$0166 : STA $2508
-STA $258A
-LDA #$00C6 : STA $2586
-STA $2608
-STA $2688
-STA $2708
-STA $2788
-STA $2806
-STA $2808
-LDA #$0171 : STA $2588
-LDA #$021C : STA $260A
-STA $268A
-STA $270A
-STA $278A
-LDA #$0034 : STA $270E
-STA $278E
-STA $2790
-STA $280E
-STA $2810
-STA $2812
-STA $2814
-STA $2816
-STA $2818
-STA $281A
-STA $281C
-STA $288E
-STA $2892
-STA $2894
-STA $2896
-STA $2898
-STA $289A
-STA $289C
-STA $289E
-STA $290E
-STA $2910
-STA $2912
-STA $2918
-STA $291A
-STA $291C
-STA $291E
-STA $2920
-STA $298C
-STA $298E
-STA $2990
-STA $2992
-STA $2998
-STA $299A
-STA $299E
-STA $29A0
-STA $2A06
-STA $2A08
-STA $2A0A
-STA $2A0C
-STA $2A10
-STA $2A12
-STA $2A14
-STA $2A16
-STA $2A18
-STA $2A1C
-STA $2A1E
-STA $2A84
-STA $2A86
-STA $2A88
-STA $2A8C
-STA $2A8E
-STA $2A90
-STA $2A92
-STA $2A94
-STA $2A96
-STA $2A98
-STA $2A9A
-STA $2A9C
-STA $2B06
-STA $2B0A
-STA $2B0E
-STA $2B12
-STA $2B1A
-STA $2B84
-STA $2B86
-STA $2B88
-STA $2B8A
-STA $2B8E
-STA $2B92
-STA $2B94
-STA $2B98
-STA $2B9A
-STA $2C04
-STA $2C08
-STA $2C0A
-STA $2C0E
-STA $2C12
-STA $2C14
-STA $2C18
-STA $2C86
-STA $2C88
-STA $2C8A
-STA $2C90
-STA $2C92
-STA $2C94
-STA $2C98
-STA $2D0A
-STA $2D0C
-STA $2D10
-STA $2D14
-STA $2D16
-STA $2D8A
-STA $2D8C
-STA $2D8E
-STA $2D94
-LDA #$016A : STA $278C
-STA $280C
-STA $2A82
-STA $2B02
-STA $2B82
-STA $2C02
-STA $2C82
-LDA #$01FA : STA $288C
-LDA #$00DA : STA $2890
-STA $299C
-STA $2B14
-STA $2B16
-STA $2B18
-STA $2B96
-STA $2C16
-STA $2C96
-STA $2D08
-STA $2D92
-LDA #$0186 : STA $290C
-STA $298A
-STA $2A04
-LDA #$0036 : STA $2914
-STA $2916
-STA $2994
-STA $2996
-STA $2D12
-LDA #$00E4 : STA $2986
-LDA #$00E5 : STA $2988
-LDA #$0100 : STA $29A2
-LDA #$0071 : STA $2A0E
-STA $2A1A
-STA $2C8C
-LDA #$015C : STA $2A20
-STA $2A9E
-STA $2B1C
-STA $2C9A
-STA $2D18
-STA $2D96
-LDA #$0104 : STA $2A22
-LDA #$01D4 : STA $2A24
-LDA #$0035 : STA $2A8A
-STA $2B08
-STA $2C06
-STA $2D0E
-STA $2D90
-LDA #$0162 : STA $2AA0
-STA $2B1E
-STA $2B9C
-STA $2D1A
-STA $2D98
-LDA #$00E2 : STA $2B04
-STA $2B0C
-STA $2B10
-STA $2B8C
-STA $2B90
-STA $2C0C
-STA $2C10
-STA $2C8E
-LDA #$00F8 : STA $2C1A
-LDA #$00CE : STA $2C1C
-STA $2C9C
-LDA #$0160 : STA $2C84
-STA $2D06
-STA $2D88
-LDA #$0167 : STA $2D04
-STA $2D86
-LDA #$0172 : STA $2E08
-LDA #$015E : STA $2E0A
-STA $2E0C
-STA $2E0E
-STA $2E10
-STA $2E12
-STA $2E14
-LDA #$0174 : STA $2E16
+LDA.w #$01D5 : STA.w $2486
+LDA.w #$0165 : STA.w $2506
+LDA.w #$0166 : STA.w $2508
+STA.w $258A
+LDA.w #$00C6 : STA.w $2586
+STA.w $2608
+STA.w $2688
+STA.w $2708
+STA.w $2788
+STA.w $2806
+STA.w $2808
+LDA.w #$0171 : STA.w $2588
+LDA.w #$021C : STA.w $260A
+STA.w $268A
+STA.w $270A
+STA.w $278A
+LDA.w #$0034 : STA.w $270E
+STA.w $278E
+STA.w $2790
+STA.w $280E
+STA.w $2810
+STA.w $2812
+STA.w $2814
+STA.w $2816
+STA.w $2818
+STA.w $281A
+STA.w $281C
+STA.w $288E
+STA.w $2892
+STA.w $2894
+STA.w $2896
+STA.w $2898
+STA.w $289A
+STA.w $289C
+STA.w $289E
+STA.w $290E
+STA.w $2910
+STA.w $2912
+STA.w $2918
+STA.w $291A
+STA.w $291C
+STA.w $291E
+STA.w $2920
+STA.w $298C
+STA.w $298E
+STA.w $2990
+STA.w $2992
+STA.w $2998
+STA.w $299A
+STA.w $299E
+STA.w $29A0
+STA.w $2A06
+STA.w $2A08
+STA.w $2A0A
+STA.w $2A0C
+STA.w $2A10
+STA.w $2A12
+STA.w $2A14
+STA.w $2A16
+STA.w $2A18
+STA.w $2A1C
+STA.w $2A1E
+STA.w $2A84
+STA.w $2A86
+STA.w $2A88
+STA.w $2A8C
+STA.w $2A8E
+STA.w $2A90
+STA.w $2A92
+STA.w $2A94
+STA.w $2A96
+STA.w $2A98
+STA.w $2A9A
+STA.w $2A9C
+STA.w $2B06
+STA.w $2B0A
+STA.w $2B0E
+STA.w $2B12
+STA.w $2B1A
+STA.w $2B84
+STA.w $2B86
+STA.w $2B88
+STA.w $2B8A
+STA.w $2B8E
+STA.w $2B92
+STA.w $2B94
+STA.w $2B98
+STA.w $2B9A
+STA.w $2C04
+STA.w $2C08
+STA.w $2C0A
+STA.w $2C0E
+STA.w $2C12
+STA.w $2C14
+STA.w $2C18
+STA.w $2C86
+STA.w $2C88
+STA.w $2C8A
+STA.w $2C90
+STA.w $2C92
+STA.w $2C94
+STA.w $2C98
+STA.w $2D0A
+STA.w $2D0C
+STA.w $2D10
+STA.w $2D14
+STA.w $2D16
+STA.w $2D8A
+STA.w $2D8C
+STA.w $2D8E
+STA.w $2D94
+LDA.w #$016A : STA.w $278C
+STA.w $280C
+STA.w $2A82
+STA.w $2B02
+STA.w $2B82
+STA.w $2C02
+STA.w $2C82
+LDA.w #$01FA : STA.w $288C
+LDA.w #$00DA : STA.w $2890
+STA.w $299C
+STA.w $2B14
+STA.w $2B16
+STA.w $2B18
+STA.w $2B96
+STA.w $2C16
+STA.w $2C96
+STA.w $2D08
+STA.w $2D92
+LDA.w #$0186 : STA.w $290C
+STA.w $298A
+STA.w $2A04
+LDA.w #$0036 : STA.w $2914
+STA.w $2916
+STA.w $2994
+STA.w $2996
+STA.w $2D12
+LDA.w #$00E4 : STA.w $2986
+LDA.w #$00E5 : STA.w $2988
+LDA.w #$0100 : STA.w $29A2
+LDA.w #$0071 : STA.w $2A0E
+STA.w $2A1A
+STA.w $2C8C
+LDA.w #$015C : STA.w $2A20
+STA.w $2A9E
+STA.w $2B1C
+STA.w $2C9A
+STA.w $2D18
+STA.w $2D96
+LDA.w #$0104 : STA.w $2A22
+LDA.w #$01D4 : STA.w $2A24
+LDA.w #$0035 : STA.w $2A8A
+STA.w $2B08
+STA.w $2C06
+STA.w $2D0E
+STA.w $2D90
+LDA.w #$0162 : STA.w $2AA0
+STA.w $2B1E
+STA.w $2B9C
+STA.w $2D1A
+STA.w $2D98
+LDA.w #$00E2 : STA.w $2B04
+STA.w $2B0C
+STA.w $2B10
+STA.w $2B8C
+STA.w $2B90
+STA.w $2C0C
+STA.w $2C10
+STA.w $2C8E
+LDA.w #$00F8 : STA.w $2C1A
+LDA.w #$00CE : STA.w $2C1C
+STA.w $2C9C
+LDA.w #$0160 : STA.w $2C84
+STA.w $2D06
+STA.w $2D88
+LDA.w #$0167 : STA.w $2D04
+STA.w $2D86
+LDA.w #$0172 : STA.w $2E08
+LDA.w #$015E : STA.w $2E0A
+STA.w $2E0C
+STA.w $2E0E
+STA.w $2E10
+STA.w $2E12
+STA.w $2E14
+LDA.w #$0174 : STA.w $2E16
 
 RTS
 }
 
 map051:
 {
-LDA #$0034 : STA $22A8
+LDA.w #$0034 : STA.w $22A8
 RTS
 }
 
 map053:
 {
-LDA #$02F1 : STA $2BB0
-LDA #$02F2 : STA $2BB2
-LDA #$0184 : STA $2C30
-LDA #$0185 : STA $2C32
-LDA #$0392 : STA $2CB0
-LDA #$0393 : STA $2CB2
-LDA #$0394 : STA $2D30
-LDA #$0395 : STA $2D32
-LDA #$0034 : STA $2F56
+LDA.w #$02F1 : STA.w $2BB0
+LDA.w #$02F2 : STA.w $2BB2
+LDA.w #$0184 : STA.w $2C30
+LDA.w #$0185 : STA.w $2C32
+LDA.w #$0392 : STA.w $2CB0
+LDA.w #$0393 : STA.w $2CB2
+LDA.w #$0394 : STA.w $2D30
+LDA.w #$0395 : STA.w $2D32
+LDA.w #$0034 : STA.w $2F56
 
 RTS
 }
 
 map058:
 {
-LDA #$0774 : STA $2800
-LDA #$06E1 : STA $2802
-LDA #$0757 : STA $2804
-STA $2886
-LDA #$0779 : STA $2880
-LDA #$02EC : STA $2882
-LDA #$0759 : STA $2884
-STA $2906
-LDA #$02E5 : STA $2900
-STA $2902
-STA $2904
-LDA #$076A : STA $2908
-LDA #$02F3 : STA $2980
-STA $2982
-LDA #$02F1 : STA $2984
-LDA #$02F2 : STA $2986
-LDA #$038A : STA $2988
-LDA #$0184 : STA $2A04
-STA $2A84
-STA $2B04
-STA $2B84
-LDA #$0185 : STA $2A06
-STA $2A86
-STA $2B06
-STA $2B86
+LDA.w #$0774 : STA.w $2800
+LDA.w #$06E1 : STA.w $2802
+LDA.w #$0757 : STA.w $2804
+STA.w $2886
+LDA.w #$0779 : STA.w $2880
+LDA.w #$02EC : STA.w $2882
+LDA.w #$0759 : STA.w $2884
+STA.w $2906
+LDA.w #$02E5 : STA.w $2900
+STA.w $2902
+STA.w $2904
+LDA.w #$076A : STA.w $2908
+LDA.w #$02F3 : STA.w $2980
+STA.w $2982
+LDA.w #$02F1 : STA.w $2984
+LDA.w #$02F2 : STA.w $2986
+LDA.w #$038A : STA.w $2988
+LDA.w #$0184 : STA.w $2A04
+STA.w $2A84
+STA.w $2B04
+STA.w $2B84
+LDA.w #$0185 : STA.w $2A06
+STA.w $2A86
+STA.w $2B06
+STA.w $2B86
 
 RTS
 }
 
 map068:
 {
-LDA #$0E96 : STA $235E
-STA $23DE
-STA $245E
-STA $24DE
-STA $255E
-LDA #$0E97 : STA $2360
-STA $23E0
-STA $2460
-STA $24E0
-STA $2560
-LDA #$0E94 : STA $25DE
-LDA #$0E95 : STA $25E0
-LDA #$0180 : STA $275E
-LDA #$0181 : STA $2760
-LDA #$0184 : STA $27DE
-STA $285E
-LDA #$0185 : STA $27E0
-STA $2860
-LDA #$0212 : STA $2BE0
+LDA.w #$0E96 : STA.w $235E
+STA.w $23DE
+STA.w $245E
+STA.w $24DE
+STA.w $255E
+LDA.w #$0E97 : STA.w $2360
+STA.w $23E0
+STA.w $2460
+STA.w $24E0
+STA.w $2560
+LDA.w #$0E94 : STA.w $25DE
+LDA.w #$0E95 : STA.w $25E0
+LDA.w #$0180 : STA.w $275E
+LDA.w #$0181 : STA.w $2760
+LDA.w #$0184 : STA.w $27DE
+STA.w $285E
+LDA.w #$0185 : STA.w $27E0
+STA.w $2860
+LDA.w #$0212 : STA.w $2BE0
 
 RTS
 }
 
 map071:
 {
-LDA #$0398 : STA $25A0
-LDA #$0522 : STA $25A2
-LDA #$0125 : STA $2620
-LDA #$0126 : STA $2622
-LDA #$0239 : STA $269E
-STA $26A4
+LDA.w #$0398 : STA.w $25A0
+LDA.w #$0522 : STA.w $25A2
+LDA.w #$0125 : STA.w $2620
+LDA.w #$0126 : STA.w $2622
+LDA.w #$0239 : STA.w $269E
+STA.w $26A4
 
 RTS
 }
 
 map078:
 {
-LDA #$0239 : STA $3D4A
+LDA.w #$0239 : STA.w $3D4A
 RTS
 }
 
 map080:
 {
-LDA #$020F : STA $2B2E
+LDA.w #$020F : STA.w $2B2E
 RTS
 }
 
 map084:
 {
-LDA #$02F3 : STA $2422
-STA $2424
-LDA #$00C9 : STA $24A2
-STA $24A4
-LDA #$00E3 : STA $2522
-STA $2524
+LDA.w #$02F3 : STA.w $2422
+STA.w $2424
+LDA.w #$00C9 : STA.w $24A2
+STA.w $24A4
+LDA.w #$00E3 : STA.w $2522
+STA.w $2524
 RTS
 }
 
 map091: ;Pyramid
 {
-LDA #$0323 : STA $39B6
-LDA #$0324 : STA $39B8
-STA $39BA
-STA $39BC
-STA $39BE
-LDA #$02FE : STA $3A34
-LDA #$02FF : STA $3A36
-LDA #$0326 : STA $3A38
-STA $3A3A
-STA $3A3C
-STA $3A3E
-LDA #$039D : STA $3AB2
-LDA #$0303 : STA $3AB4
-LDA #$0232 : STA $3AB6
-STA $3B34
-LDA #$0233 : STA $3AB8
-STA $3ABA
-STA $3ABC
-STA $3ABE
-LDA #$03A2 : STA $3B32
-LDA #$0235 : STA $3B36
-STA $3BB4
-LDA #$046A : STA $3B38
-LDA #$0333 : STA $3B3A
-STA $3B3C
-STA $3B3E
-LDA #$0034 : STA $3BB6
-STA $3BBA
-STA $3BBC
-STA $3C3A
-STA $3C3C
-STA $3C3E
+LDA.w #$0323 : STA.w $39B6
+LDA.w #$0324 : STA.w $39B8
+STA.w $39BA
+STA.w $39BC
+STA.w $39BE
+LDA.w #$02FE : STA.w $3A34
+LDA.w #$02FF : STA.w $3A36
+LDA.w #$0326 : STA.w $3A38
+STA.w $3A3A
+STA.w $3A3C
+STA.w $3A3E
+LDA.w #$039D : STA.w $3AB2
+LDA.w #$0303 : STA.w $3AB4
+LDA.w #$0232 : STA.w $3AB6
+STA.w $3B34
+LDA.w #$0233 : STA.w $3AB8
+STA.w $3ABA
+STA.w $3ABC
+STA.w $3ABE
+LDA.w #$03A2 : STA.w $3B32
+LDA.w #$0235 : STA.w $3B36
+STA.w $3BB4
+LDA.w #$046A : STA.w $3B38
+LDA.w #$0333 : STA.w $3B3A
+STA.w $3B3C
+STA.w $3B3E
+LDA.w #$0034 : STA.w $3BB6
+STA.w $3BBA
+STA.w $3BBC
+STA.w $3C3A
+STA.w $3C3C
+STA.w $3C3E
 
 ;Added Pegs on pyramid map
 ;{
-STA $321C
-STA $329C
-STA $32A0
+STA.w $321C
+STA.w $329C
+STA.w $32A0
 
-LDA #$0071 : STA $321E
-LDA #$00DA : STA $3220
-STA $329A
-LDA #$00E1 : STA $329E
-LDA #$0382 : STA $3318
-LDA #$037C : STA $3322
+LDA.w #$0071 : STA.w $321E
+LDA.w #$00DA : STA.w $3220
+STA.w $329A
+LDA.w #$00E1 : STA.w $329E
+LDA.w #$0382 : STA.w $3318
+LDA.w #$037C : STA.w $3322
 
-LDA #$021B : STA $3218
-STA $3222
-STA $3298
-STA $32A2
-STA $331A
-STA $331C
-STA $331E
-STA $3320
-LDA #$00E2 : STA $321A
+LDA.w #$021B : STA.w $3218
+STA.w $3222
+STA.w $3298
+STA.w $32A2
+STA.w $331A
+STA.w $331C
+STA.w $331E
+STA.w $3320
+LDA.w #$00E2 : STA.w $321A
 ;}
 
-LDA #$00F2 : STA $3BB8
-LDA #$0108 : STA $3C38
+LDA.w #$00F2 : STA.w $3BB8
+LDA.w #$0108 : STA.w $3C38
 
 
 ;Warp Tile agah defeated
-LDA #$0034 : STA $3BBE ;Tile when no warp
-LDA ProgressIndicator : AND #$00FF : CMP #$0003 : BNE .agahnimAlive
-LDA #$0212 : STA $3BBE ;warp
+LDA.w #$0034 : STA.w $3BBE ;Tile when no warp
+LDA.l ProgressIndicator : AND #$00FF : CMP.w #$0003 : BNE .agahnimAlive
+LDA.w #$0212 : STA.w $3BBE ;warp
 .agahnimAlive
 
 
-LDA #$0324 : STA $39C0
-STA $39C2
-STA $39C4
-LDA #$0325 : STA $39C6
-LDA #$02D5 : STA $39C8
-STA $39D2
-LDA #$02CC : STA $39CC
-STA $39D4
-LDA #$0326 : STA $3A40
-STA $3A42
-STA $3A44
-LDA #$0327 : STA $3A46
-LDA #$02F7 : STA $3A48
-LDA #$02E3 : STA $3A4C
-STA $3A4E
-LDA #$0233 : STA $3AC0
-STA $3AC2
-STA $3AC4
-LDA #$0234 : STA $3AC6
-STA $3B48
-LDA #$02F6 : STA $3AC8
-LDA #$0396 : STA $3ACA
-LDA #$0333 : STA $3B40
-STA $3B42
-LDA #$03AA : STA $3B44
-LDA #$03A3 : STA $3B46
-STA $3BC8
-LDA #$0397 : STA $3B4A
-LDA #$0034 : STA $3BC0
-STA $3BC2
-STA $3BC6
-STA $3C40
-STA $3C42
-LDA #$029C : STA $3BC4
-LDA #$010A : STA $3C44
-LDA #$010B : STA $3C46
-STA $3C48
-STA $3C4A
-STA $3C4C
-STA $3C4E
-STA $3C50
-STA $3C52
-STA $3C54
-STA $3C56
-STA $3C58
-STA $3C5A
-STA $3C5C
-STA $3C5E
-STA $3C60
-STA $3C62
-STA $3C64
-STA $3C66
+LDA.w #$0324 : STA.w $39C0
+STA.w $39C2
+STA.w $39C4
+LDA.w #$0325 : STA.w $39C6
+LDA.w #$02D5 : STA.w $39C8
+STA.w $39D2
+LDA.w #$02CC : STA.w $39CC
+STA.w $39D4
+LDA.w #$0326 : STA.w $3A40
+STA.w $3A42
+STA.w $3A44
+LDA.w #$0327 : STA.w $3A46
+LDA.w #$02F7 : STA.w $3A48
+LDA.w #$02E3 : STA.w $3A4C
+STA.w $3A4E
+LDA.w #$0233 : STA.w $3AC0
+STA.w $3AC2
+STA.w $3AC4
+LDA.w #$0234 : STA.w $3AC6
+STA.w $3B48
+LDA.w #$02F6 : STA.w $3AC8
+LDA.w #$0396 : STA.w $3ACA
+LDA.w #$0333 : STA.w $3B40
+STA.w $3B42
+LDA.w #$03AA : STA.w $3B44
+LDA.w #$03A3 : STA.w $3B46
+STA.w $3BC8
+LDA.w #$0397 : STA.w $3B4A
+LDA.w #$0034 : STA.w $3BC0
+STA.w $3BC2
+STA.w $3BC6
+STA.w $3C40
+STA.w $3C42
+LDA.w #$029C : STA.w $3BC4
+LDA.w #$010A : STA.w $3C44
+LDA.w #$010B : STA.w $3C46
+STA.w $3C48
+STA.w $3C4A
+STA.w $3C4C
+STA.w $3C4E
+STA.w $3C50
+STA.w $3C52
+STA.w $3C54
+STA.w $3C56
+STA.w $3C58
+STA.w $3C5A
+STA.w $3C5C
+STA.w $3C5E
+STA.w $3C60
+STA.w $3C62
+STA.w $3C64
+STA.w $3C66
 
 RTS
 }
 
 map111:
 {
-LDA #$020F : STA $2BB2
+LDA.w #$020F : STA.w $2BB2
 RTS
 }
 
 map115:
 {
-LDA #$020F : STA $22A8
+LDA.w #$020F : STA.w $22A8
 RTS
 }
 
 map120:
 {
-LDA #$0239 : STA $3D94
+LDA.w #$0239 : STA.w $3D94
 RTS
 }
 
 map117:
 {
 ;118
-LDA #$0239 : STA $2F50
-LDA #$0BA3 : STA $2F52
-STA $2FCE
-STA $2FD0
+LDA.w #$0239 : STA.w $2F50
+LDA.w #$0BA3 : STA.w $2F52
+STA.w $2FCE
+STA.w $2FD0
 
 ;126
 
-LDA #$0BA3 : STA $3054
-STA $3056
-STA $3058
-STA $305A
-STA $3254
-STA $3256
-STA $3258
-STA $325A
-LDA #$0BAC : STA $30D4
-LDA #$0BAD : STA $30D6
-STA $3156
-STA $31D6
-LDA #$0BA9 : STA $30D8
-STA $3158
-STA $31D8
-LDA #$0BAA : STA $30DA
-LDA #$0BC5 : STA $3154
-LDA #$0BC8 : STA $315A
-LDA #$0BCA : STA $31D4
-LDA #$0BCD : STA $31DA
+LDA.w #$0BA3 : STA.w $3054
+STA.w $3056
+STA.w $3058
+STA.w $305A
+STA.w $3254
+STA.w $3256
+STA.w $3258
+STA.w $325A
+LDA.w #$0BAC : STA.w $30D4
+LDA.w #$0BAD : STA.w $30D6
+STA.w $3156
+STA.w $31D6
+LDA.w #$0BA9 : STA.w $30D8
+STA.w $3158
+STA.w $31D8
+LDA.w #$0BAA : STA.w $30DA
+LDA.w #$0BC5 : STA.w $3154
+LDA.w #$0BC8 : STA.w $315A
+LDA.w #$0BCA : STA.w $31D4
+LDA.w #$0BCD : STA.w $31DA
 RTS
 }
diff --git a/itemdowngrade.asm b/itemdowngrade.asm
index a1f19f6..53efeec 100644
--- a/itemdowngrade.asm
+++ b/itemdowngrade.asm
@@ -32,7 +32,7 @@ ItemDowngradeFixMain:
 	CPY.b #$00 : BEQ .isUncleSwordShield ; Fighter's Sword & Shield
 
         .done
-	STA [$00] ; thing we wrote over part 2
+	STA.b [Scrap00] ; thing we wrote over part 2
 	.dontWrite
 RTS
 	.isPowerGloves
@@ -41,8 +41,8 @@ RTS
 	.isBlueBoomerang
 	.isBow
 	.isBowAndArrows
-	CMP [$00] : !BGE .done ; finished if we're upgrading
-	LDA [$00] ; reload old value
+	CMP.b [$00] : !BGE .done ; finished if we're upgrading
+	LDA.b [$00] ; reload old value
 RTS
 	.isSilverArrowBow
 	.isRedBoomerang
@@ -51,31 +51,31 @@ RTS
 	.isShovel
 	.isMushroom
 	PHA
-	LDA [$00] : BNE + ; don't upgrade if we already have the toggle for it
+	LDA.b [Scrap00] : BNE + ; don't upgrade if we already have the toggle for it
 			PLA
-			STA [$00]
+			STA.b [Scrap00]
 		RTS
 	+
 	PLA
 RTS
 	.isSword
 	PHA
-                LDA HighestSword : STA $04
+                LDA.l HighestSword : STA.b Scrap04
 		TYA ; load sword item
 		CMP.b #$49 : BNE + : LDA.b #$00 : + ; convert extra fighter's sword to normal one
 		CMP.b #$50 : BNE + : LDA.b #$01 : + ; convert extra master sword to normal one
-		INC : CMP $04 : !BGE + ; skip if highest is lower (this is an upgrade)
-			LDA $04 : DEC ; convert to item id
-			TAY : PLA : LDA $04 ; put sword id into the thing to write
+		INC : CMP.b Scrap04 : !BGE + ; skip if highest is lower (this is an upgrade)
+			LDA.b Scrap04 : DEC ; convert to item id
+			TAY : PLA : LDA.b Scrap04 ; put sword id into the thing to write
 			JMP .done
 		+
 	PLA
 JMP .done
         .isUncleSwordShield
 	PHA
-                LDA HighestSword : STA [$00] ; already set to 1 if we had no sword, always keep highest
-                INC $00
-                LDA HighestShield : STA [$00]
+                LDA.l HighestSword : STA.b [Scrap00] ; already set to 1 if we had no sword, always keep highest
+                INC.b Scrap00
+                LDA.l HighestShield : STA.b [Scrap00]
 	PLA
 RTS
 ;================================================================================
diff --git a/lampmantlecone.asm b/lampmantlecone.asm
index 1262087..7c447b8 100644
--- a/lampmantlecone.asm
+++ b/lampmantlecone.asm
@@ -4,22 +4,21 @@
 ; Output: 0 for darkness, 1 for lamp cone
 ;--------------------------------------------------------------------------------
 LampCheck:
-	LDA $7F50C4 : CMP.b #$01 : BNE + : RTL : +
+	LDA.l LightConeModifier : CMP.b #$01 : BNE + : RTL : +
 				  CMP.b #$FF : BNE + : INC : RTL : +
 	
-	LDA LampEquipment : BNE .done ; skip if we already have lantern
+	LDA.l LampEquipment : BNE .done ; skip if we already have lantern
 	
-	LDA CurrentWorld : BNE +
+	LDA.l CurrentWorld : BNE +
 		.lightWorld
-		LDA $040C : BNE ++ ; check if we're in sewers
-			LDA LampConeSewers : BRA .done
+		LDA.w $040C : BNE ++ ; check if we're in sewers
+			LDA.l LampConeSewers : BRA .done
 		++
-			LDA LampConeLightWorld : BRA .done
+			LDA.l LampConeLightWorld : BRA .done
 	+
 		.darkWorld
 		LDA LampConeDarkWorld
 	.done
-	;BNE + : STZ $1D : + ; remember to turn cone off after a torch
 RTL
 ;================================================================================
 ;--------------------------------------------------------------------------------
@@ -30,13 +29,12 @@ CheckForZelda:
 		LDA.b #$01 ; pretend we have zelda anyway
 		RTL
 	+
-	LDA FollowerIndicator
+	LDA.l FollowerIndicator
 RTL
 ;================================================================================
 ;--------------------------------------------------------------------------------
 SetOverlayIfLamp:
 	JSL.l LampCheck
-	STA $1D ; write it directly to the overlay, this isn't a terrible idea at all
+	STA.b $1D ; write it directly to the overlay, this isn't a terrible idea at all
 RTL
 ;================================================================================
-;LDA CurrentWorld : EOR #$40 : LSR #6 : AND #$01 ; return the same result as having the lantern in the light world
diff --git a/map.asm b/map.asm
deleted file mode 100644
index c682a0c..0000000
--- a/map.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; ==============================================================================
-;PrepMapZoom:
-;	LDA.b #$80 : STA $211A ; thing we wrote over
-;	
-;	LDA.b #$00 : STA !MAP_ZOOM
-;RTL
-; ==============================================================================
-;ForceMapZoom:
-;	LDA !MAP_ZOOM : BNE .isPreset
-;	LDA.b #$01
-;	LDA.b #$01 : STA !MAP_ZOOM
-;RTL
-;	.isPreset
-;	LDA $F6 : AND.b #$70
-;RTL
-; ==============================================================================
\ No newline at end of file
diff --git a/medallions.asm b/medallions.asm
index c70a57c..ef8da48 100644
--- a/medallions.asm
+++ b/medallions.asm
@@ -52,10 +52,8 @@ MedallionTrigger_Bombos:
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
-!EPILEPSY_TIMER = "$7F5041"
 MedallionTrigger_Ether:
 	PHA
-	LDA.b #$00 : STA !EPILEPSY_TIMER
 	LDA.l MireRequiredMedallion : CMP.b #$01 : BNE +
 		JSL.l TryOpenMire
 	+ LDA.l TRockRequiredMedallion : CMP.b #$01 : BNE +
diff --git a/msu.asm b/msu.asm
index c4d1318..6f0040f 100644
--- a/msu.asm
+++ b/msu.asm
@@ -81,72 +81,34 @@
 ;
 ;=======================================
 
-!REG_MSU_STATUS = $2000
+!VAL_MSU_ID_01 = $2D53 ; 'S-'
+!VAL_MSU_ID_23 = $534D ; 'MS'
+!VAL_MSU_ID_45 = $3155 ; 'U1'
 
-!REG_MSU_ID_0 = $2002
-!REG_MSU_ID_1 = $2003
-!REG_MSU_ID_2 = $2004
-!REG_MSU_ID_3 = $2005
-!REG_MSU_ID_4 = $2006
-!REG_MSU_ID_5 = $2007
+!FLAG_MSU_PLAY = $01
+!FLAG_MSU_REPEAT = $02
+!FLAG_MSU_RESUME = $04
+!FLAG_MSU_STATUS_TRACK_MISSING = $08
+!FLAG_MSU_STATUS_AUDIO_PLAYING = $10
+!FLAG_MSU_STATUS_AUDIO_REPEATING = $20
+!FLAG_MSU_STATUS_AUDIO_BUSY = $40
+!FLAG_MSU_STATUS_DATA_BUSY = $80
 
-!REG_MSU_ID_01 = $2002
-!REG_MSU_ID_23 = $2004
-!REG_MSU_ID_45 = $2006
+!FLAG_RESUME_CANCEL = $01
+!FLAG_RESUME_FADEIN = $02
 
+!VAL_COMMAND_STOP_PLAYBACK = $F0
+!VAL_COMMAND_FADE_OUT = $F1
+!VAL_COMMAND_FADE_HALF = $F2
+!VAL_COMMAND_FULL_VOLUME = $F3
+!VAL_COMMAND_MUTE_SPC = $FA
+!VAL_COMMAND_UNMUTE_SPC = $FB
+!VAL_COMMAND_LOAD_NEW_BANK = $FF
 
-!VAL_MSU_ID_0 = #$53    ;   'S'
-!VAL_MSU_ID_1 = #$2D    ;   '-'
-!VAL_MSU_ID_2 = #$4D    ;   'M'
-!VAL_MSU_ID_3 = #$53    ;   'S'
-!VAL_MSU_ID_4 = #$55    ;   'U'
-!VAL_MSU_ID_5 = #$31    ;   '1'
-
-!VAL_MSU_ID_01 = #$2D53 ;   'S-'
-!VAL_MSU_ID_23 = #$534D ;   'MS'
-!VAL_MSU_ID_45 = #$3155 ;   'U1'
-
-
-!REG_MSU_TRACK = $2004
-!REG_MSU_TRACK_LO = $2004
-!REG_MSU_TRACK_HI = $2005
-!REG_MSU_VOLUME = $2006
-!REG_MSU_CONTROL = $2007
-
-
-!FLAG_MSU_PLAY = #$01
-!FLAG_MSU_REPEAT = #$02
-!FLAG_MSU_RESUME = #$04
-!FLAG_MSU_STATUS_TRACK_MISSING = #$08
-!FLAG_MSU_STATUS_AUDIO_PLAYING = #$10
-!FLAG_MSU_STATUS_AUDIO_REPEATING = #$20
-!FLAG_MSU_STATUS_AUDIO_BUSY = #$40
-!FLAG_MSU_STATUS_DATA_BUSY = #$80
-
-!FLAG_RESUME_CANCEL = #$01
-!FLAG_RESUME_FADEIN = #$02
-
-!REG_CURRENT_MSU_TRACK = $010B
-!REG_CURRENT_VOLUME = $0127
-!REG_TARGET_VOLUME = $0129
-!REG_CURRENT_TRACK = $0130
-!REG_CURRENT_COMMAND = $0133
-
-!REG_SPC_CONTROL = $2140
-!REG_NMI_FLAGS = $4210
-
-!VAL_COMMAND_STOP_PLAYBACK = #$F0
-!VAL_COMMAND_FADE_OUT = #$F1
-!VAL_COMMAND_FADE_HALF = #$F2
-!VAL_COMMAND_FULL_VOLUME = #$F3
-!VAL_COMMAND_MUTE_SPC = #$FA
-!VAL_COMMAND_UNMUTE_SPC = #$FB
-!VAL_COMMAND_LOAD_NEW_BANK = #$FF
-
-!VAL_VOLUME_INCREMENT = #$10
-!VAL_VOLUME_DECREMENT = #$02
-!VAL_VOLUME_HALF = #$80
-!VAL_VOLUME_FULL = #$FF
+!VAL_VOLUME_INCREMENT = $10
+!VAL_VOLUME_DECREMENT = $02
+!VAL_VOLUME_HALF = $80
+!VAL_VOLUME_FULL = $FF
 
 ;================================================================================
 ; Check if A has an overworld track
@@ -172,7 +134,7 @@ SEC : RTS
 ;--------------------------------------------------------------------------------
 IsResumableTrack:
     PHA
-    LDA MSUResumeType : BEQ +
+    LDA.l MSUResumeType : BEQ +
         PLA
         JSR IsOverworldTrack
         RTS
@@ -187,54 +149,54 @@ RTS
 ;--------------------------------------------------------------------------------
 CheckMusicLoadRequest:
     PHP : PHB : PHD : REP #$30 : PHA : PHX : PHY
-    LDA #$0000 : TCD : SEP #$20 : PHA : PLB
-        LDA !REG_MUSIC_CONTROL_REQUEST : BEQ .skip+3 : BMI .skip+3
-        CMP !REG_CURRENT_COMMAND : BNE .continue
+    LDA.w #$0000 : TCD : SEP #$20 : PHA : PLB
+        LDA.w MusicControlRequest : BEQ .skip+3 : BMI .skip+3
+        CMP.w CurrentControlRequest : BNE .continue
         CMP.b #22 : BNE .skip   ; Check GT when mirroring from upstairs
-        LDA !REG_CURRENT_MSU_TRACK : CMP.b #59 : BNE .skip
-        LDA.b #$00 : STA !REG_CURRENT_COMMAND
+        LDA.w CurrentMSUTrack : CMP.b #59 : BNE .skip
+        LDA.b #$00 : STA.w CurrentControlRequest
         BRA .continue
 .skip
-        LDA !REG_MUSIC_CONTROL_REQUEST
-        STA !REG_MUSIC_CONTROL : STZ !REG_MUSIC_CONTROL_REQUEST
+        LDA.w MusicControlRequest
+        STA.w MusicControl : STZ.w MusicControlRequest
     REP #$30 : PLY : PLX : PLA : PLD : PLB : PLP
     RTL
         
 .continue
-        LDA TournamentSeed : BNE +++
-        LDA !REG_MSU_PACK_REQUEST
-        CMP !REG_MSU_PACK_CURRENT : BEQ +++
-        CMP !REG_MSU_PACK_COUNT : !BLT ++
-        CMP #$FE : !BLT +
-                    STA !REG_MSU_PACK_CURRENT
+        LDA.l TournamentSeed : BNE +++
+        LDA.l MSUPackRequest
+        CMP.l MSUPackCurrent : BEQ +++
+        CMP.l MSUPackCount : !BLT ++
+        CMP.b #$FE : !BLT +
+                    STA.l MSUPackCurrent
                     SEP #$10
-                        LDA #$00
-                        LDX #$07
+                        LDA.b #$00
+                        LDX.b #$07
                         -
-                            STA !REG_MSU_FALLBACK_TABLE,X
+                            STA.l MSUFallbackTable,X
                         DEX : BPL -
                     REP #$10
                     BRA +++
-                + : LDA !REG_MSU_PACK_CURRENT : STA !REG_MSU_PACK_REQUEST
-            ++ : STA !REG_MSU_PACK_CURRENT
+                + : LDA.l MSUPackCurrent : STA.l MSUPackRequest
+            ++ : STA.l MSUPackCurrent
             JSL MSUInit_check_fallback
         +++
 
-        LDA !REG_MUSIC_CONTROL_REQUEST : CMP #$08 : BEQ ++  ; Mirror SFX is not affected by NoBGM or pack $FE
-            LDA NoBGM : BNE +
-            LDA !REG_MSU_PACK_CURRENT : CMP #$FE : BNE ++
+        LDA.w MusicControlRequest : CMP.b #$08 : BEQ ++  ; Mirror SFX is not affected by NoBGM or pack $FE
+            LDA.l NoBGM : BNE +
+            LDA.l MSUPackCurrent : CMP.b #$FE : BNE ++
                 + : JMP .mute
         ++
 
-        LDX !REG_MSU_ID_01 : CPX !VAL_MSU_ID_01 : BEQ +
+        LDX.w MSUID : CPX.w #!VAL_MSU_ID_01 : BEQ +
             - : JMP .unmute
         +
-        LDX !REG_MSU_ID_23 : CPX !VAL_MSU_ID_23 : BNE -
-        LDX !REG_MSU_ID_45 : CPX !VAL_MSU_ID_45 : BNE -
+        LDX.w MSUID+2 : CPX.w #!VAL_MSU_ID_23 : BNE -
+        LDX.w MSUID+4 : CPX.w #!VAL_MSU_ID_45 : BNE -
 
         SEP #$10
             ;  Load alternate or dungeon-specific tracks
-            LDA !REG_MUSIC_CONTROL_REQUEST
+            LDA.w MusicControlRequest
 
             CMP.b #02 : BEQ .lightworld
             CMP.b #09 : BEQ .darkworld
@@ -246,39 +208,39 @@ CheckMusicLoadRequest:
             CMP.b #21 : BNE .check_fallback
 
 ;.boss
-            LDA $040C : LSR : !ADD.b #45
+            LDA.w $040C : LSR : !ADD.b #45
             BRA .check_fallback-3
 .lightworld
             PHA
-                LDA OverworldEventDataWRAM+$80 : AND.b #$40 : BEQ +
+                LDA.l OverworldEventDataWRAM+$80 : AND.b #$40 : BEQ +
                     PLA
                     LDA.b #60 : BRA .check_fallback-3
                 +
             -- : PLA : BRA .check_fallback-3
 .darkworld
             PHA
-                LDA CrystalsField : CMP.b #$7F : BNE --
+                LDA.l CrystalsField : CMP.b #$7F : BNE --
             - : PLA
             LDA.b #61 : BRA .check_fallback-3 
 .darkwoods
             PHA
-                LDA CrystalsField : CMP.b #$7F : BEQ -
-                LDA CurrentWorld : BEQ --
-                LDA $8A : CMP #$40 : BNE --
+                LDA.l CrystalsField : CMP.b #$7F : BEQ -
+                LDA.l CurrentWorld : BEQ --
+                LDA.b $8A : CMP #$40 : BNE --
             PLA
             LDA.b #15 : BRA .check_fallback-3
 .castle
-            LDA $040C
+            LDA.w $040C
             CMP.b #$08 : BNE .check_fallback  ; Hyrule Castle 2
 .dungeon
-            LDA $040C : LSR : !ADD.b #33 : STA !REG_MUSIC_CONTROL_REQUEST
+            LDA.w $040C : LSR : !ADD.b #33 : STA.w MusicControlRequest
 
 .check_fallback
-            LDX !REG_MUSIC_CONTROL_REQUEST
-            LDA MusicShuffleTable-1,X : DEC : PHA
+            LDX.w MusicControlRequest
+            LDA.l MusicShuffleTable-1,X : DEC : PHA
                 AND.b #$07 : TAY
                 PLA : LSR #3 : TAX
-            LDA !REG_MSU_FALLBACK_TABLE,X : BEQ .secondary_fallback : CMP.b #$FF : BEQ .mute
+            LDA.l MSUFallbackTable,X : BEQ .secondary_fallback : CMP.b #$FF : BEQ .mute
             
             - : CPY #$00 : BEQ +
                 LSR : DEY : BRA -
@@ -287,49 +249,49 @@ CheckMusicLoadRequest:
             AND.b #$01 : BEQ .secondary_fallback
 
 .mute
-            LDA.b !VAL_COMMAND_MUTE_SPC
+            LDA.b #!VAL_COMMAND_MUTE_SPC
             BRA .load
 
 .secondary_fallback
-            LDX !REG_MUSIC_CONTROL_REQUEST : LDA MSUExtendedFallbackList-1,X
+            LDX.w MusicControlRequest : LDA.l MSUExtendedFallbackList-1,X
             PHX
-                TAX : LDA MusicShuffleTable-1,X
+                TAX : LDA.l MusicShuffleTable-1,X
             PLX
-            CMP !REG_MUSIC_CONTROL_REQUEST : BEQ .unmute
+            CMP.w MusicControlRequest : BEQ .unmute
             CPX #35 : !BLT +
                 CPX #47 : !BLT .dungeon_fallback
             +
 
-            STA !REG_MUSIC_CONTROL_REQUEST
+            STA.w MusicControlRequest
             BRA .check_fallback
 
 .dungeon_fallback
                 PHB : REP #$10
                     LDX $040C
                     LDA.b #Music_Eastern>>16 : PHA : PLB    ; Set bank to music pointers
-                    LDY $00 : PHY
+                    LDY.b Scrap00 : PHY
                         REP #$20
-                            LDA MSUDungeonFallbackList,X : STA $00
+                            LDA.l MSUDungeonFallbackList,X : STA.b Scrap00
                         SEP #$20
-                        LDA ($00)
-                PLY : STY $00 : SEP #$10 : PLB
-                TAX : LDA MusicShuffleTable-1,X
-                STA !REG_MUSIC_CONTROL_REQUEST
+                        LDA.b (Scrap00)
+                PLY : STY.b Scrap00 : SEP #$10 : PLB
+                TAX : LDA.l MusicShuffleTable-1,X
+                STA.w MusicControlRequest
                 JMP .check_fallback
 
 .unmute
-            LDA.b !VAL_COMMAND_UNMUTE_SPC
+            LDA.b #!VAL_COMMAND_UNMUTE_SPC
 
 .load
         REP #$10
-        STZ $4200
-        - : STA !REG_SPC_CONTROL : CMP !REG_SPC_CONTROL : BNE - ; Wait until mute/unmute command is ACK'ed
-        - : STZ !REG_SPC_CONTROL : LDA !REG_SPC_CONTROL : BNE - ; Wait until mute/unmute command is completed
-        LDA.b #$81 : STA $4200
+        STZ.w NMITIMEN
+        - : STA.w APUIO0 : CMP.w APUIO0 : BNE - ; Wait until mute/unmute command is ACK'ed
+        - : STZ.w APUIO0 : LDA.w APUIO0 : BNE - ; Wait until mute/unmute command is completed
+        LDA.b #$81 : STA.w NMITIMEN
 
-        LDA !REG_MUSIC_CONTROL_REQUEST : CMP.b #08 : BEQ .done+3    ; No SFX during warp track
+        LDA.w MusicControlRequest : CMP.b #08 : BEQ .done+3    ; No SFX during warp track
 
-        LDA $10
+        LDA.b $10
             CMP.b #$07 : BEQ .sfx_indoors
             CMP.b #$0E : BEQ .sfx_indoors
             CMP.b #$09 : BNE .done
@@ -338,30 +300,30 @@ CheckMusicLoadRequest:
         SEP #$10
             LDX.b #$09
 
-            LDA $8A             ; Dark Death Mountain
+            LDA.b $8A             ; Dark Death Mountain
             CMP.b #$43 : BEQ + : CMP.b #$45 : BEQ + : CMP.b #$47 : BEQ +
                 LDX.b #$05
             +
 
             CMP.b #$70 : BNE +    ; Misery Mire
-                LDA OverworldEventDataWRAM+$70 : AND.b #$20 : BEQ .rain
+                LDA.l OverworldEventDataWRAM+$70 : AND.b #$20 : BEQ .rain
             +
 
-            LDA ProgressIndicator : CMP.b #$02 : BCS +
+            LDA.l ProgressIndicator : CMP.b #$02 : BCS +
 .rain
                 LDX.b #$01
             +
-            STX $012D
+            STX.w $012D
         REP #$10
 
 .done
-        LDA !REG_MUSIC_CONTROL_REQUEST : STA !REG_MUSIC_CONTROL : STZ !REG_MUSIC_CONTROL_REQUEST
+        LDA.w MusicControlRequest : STA.w MusicControl : STZ.w MusicControlRequest
         REP #$30 : PLY : PLX : PLA : PLD : PLB : PLP
     RTL
 
 .sfx_indoors
-        LDA !REG_MUSIC_CONTROL_REQUEST : STA !REG_MUSIC_CONTROL : STZ !REG_MUSIC_CONTROL_REQUEST
-    SEP #$20 : LDA.b #$05 : STA $012D
+        LDA.w MusicControlRequest : STA.w MusicControl : STZ.w MusicControlRequest
+    SEP #$20 : LDA.b #$05 : STA.w $012D
     REP #$30 : PLY : PLX : PLA : PLD : PLB : PLP
     JML Module_PreDungeon_setAmbientSfx
 ;--------------------------------------------------------------------------------
@@ -371,28 +333,28 @@ CheckMusicLoadRequest:
 ;--------------------------------------------------------------------------------
 SpiralStairsPreCheck:
     REP #$20    ; thing we wrote over
-    LDA $A0
+    LDA.b $A0
     CMP.w #$000C : BNE +
-        LDA !REG_CURRENT_MSU_TRACK : AND.w #$00FF : CMP.w #59 : BNE .done
+        LDA.w CurrentMSUTrack : AND.w #$00FF : CMP.w #59 : BNE .done
         BRA .fade
     +
 
     CMP.w #$006B : BNE .done+2
 
-    LDA TournamentSeed : CMP.w #$0001 : BEQ +
-        LDA !REG_MSU_ID_01 : CMP !VAL_MSU_ID_01 : BNE .done
-        LDA !REG_MSU_ID_23 : CMP !VAL_MSU_ID_23 : BNE .done
-        LDA !REG_MSU_ID_45 : CMP !VAL_MSU_ID_45 : BNE .done
+    LDA.l TournamentSeed : CMP.w #$0001 : BEQ +
+        LDA.w MSUID : CMP.w #!VAL_MSU_ID_01 : BNE .done
+        LDA.w MSUID+2 : CMP.w #!VAL_MSU_ID_23 : BNE .done
+        LDA.w MSUID+4 : CMP.w #!VAL_MSU_ID_45 : BNE .done
     +
 
-    LDA BigKeyField : AND.w #$0004 : BEQ .done                  ; Check that we have the GT big key
-    LDA !REG_MSU_FALLBACK_TABLE+7 : AND.w #$0004 : BEQ .done    ; Check that we have the extended track
+    LDA.l BigKeyField : AND.w #$0004 : BEQ .done                  ; Check that we have the GT big key
+    LDA.l MSUFallbackTable+7 : AND.w #$0004 : BEQ .done    ; Check that we have the extended track
 
 .fade
-    LDX.b #$F1 : STX !REG_MUSIC_CONTROL_REQUEST
+    LDX.b #$F1 : STX.w MusicControlRequest
 
 .done
-    LDA $A0     ; thing we wrote over
+    LDA.b $A0     ; thing we wrote over
     RTL
 ;--------------------------------------------------------------------------------
 
@@ -400,24 +362,24 @@ SpiralStairsPreCheck:
 ; Change music on stair transition (ToH/GT)
 ;--------------------------------------------------------------------------------
 SpiralStairsPostCheck:
-    LDA $A0
+    LDA.b $A0
     CMP.w #$000C : BNE +
         ; Ganon's tower entrance
-        LDX $0130 : CPX.b #$F1 : BNE .done  ; Check that we were fading out
+        LDX.w $0130 : CPX.b #$F1 : BNE .done  ; Check that we were fading out
 
-        LDX #22 : STX !REG_MUSIC_CONTROL_REQUEST
+        LDX.b #22 : STX.w MusicControlRequest
         BRA .done
     +
 
     CMP.w #$006B : BNE .done
 
     ; Ganon's tower upstairs (with big key)
-    LDX $0130 : CPX.b #$F1 : BNE .done  ; Check that we were fading out
+    LDX.w $0130 : CPX.b #$F1 : BNE .done  ; Check that we were fading out
 
-    LDX #59 : STX !REG_MUSIC_CONTROL_REQUEST
+    LDX.b #59 : STX.w MusicControlRequest
 
 .done
-    LDX.b #$1C : LDA $A0    ; thing we wrote over
+    LDX.b #$1C : LDA.b $A0    ; thing we wrote over
     RTL
 ;--------------------------------------------------------------------------------
 
@@ -426,8 +388,8 @@ SpiralStairsPostCheck:
 ;--------------------------------------------------------------------------------
 StoreMusicOnDeath:
     STA.l $7EC227   ; thing we wrote over
-    LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_AUDIO_PLAYING : BEQ .done
-    LDA !REG_CURRENT_MSU_TRACK : STA.l $7EC227
+    LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_AUDIO_PLAYING : BEQ .done
+    LDA.w CurrentMSUTrack : STA.l $7EC227
 .done
     RTL
 ;--------------------------------------------------------------------------------
@@ -438,19 +400,19 @@ StoreMusicOnDeath:
 MSUInit:
     PHP
 
-    LDA #$00
-    STA !MSU_LOADED_TRACK
-    STA !MSU_RESUME_TRACK
-    STA !MSU_RESUME_TIME : STA !MSU_RESUME_TIME+1 : STA !MSU_RESUME_TIME+2 : STA !MSU_RESUME_TIME+3
-    STA !MSU_RESUME_CONTROL
+    LDA.b #$00
+    STA.l MSULoadedTrack
+    STA.l MSUResumeTrack
+    STA.l MSUResumeTime : STA.l MSUResumeTime+1 : STA.l MSUResumeTime+2 : STA.l MSUResumeTime+3
+    STA.l MSUResumeControl
 
-    LDA NoBGM : BNE .done
+    LDA.l NoBGM : BNE .done
 
     REP #$20
 
-        LDA !REG_MSU_ID_01 : CMP !VAL_MSU_ID_01 : BNE .done
-        LDA !REG_MSU_ID_23 : CMP !VAL_MSU_ID_23 : BNE .done
-        LDA !REG_MSU_ID_45 : CMP !VAL_MSU_ID_45 : BNE .done
+        LDA.w MSUID : CMP.w #!VAL_MSU_ID_01 : BNE .done
+        LDA.w MSUID+2 : CMP.w #!VAL_MSU_ID_23 : BNE .done
+        LDA.w MSUID+4 : CMP.w #!VAL_MSU_ID_45 : BNE .done
 
 ; Count the number of available MSU-1 packs
         LDA.w #$0000
@@ -461,37 +423,37 @@ MSUInit:
 .check_pack
     TYA
     REP #$20
-        STA !REG_MSU_TRACK
+        STA.w MSUTRACK
         !ADD.w #100
         INX
     SEP #$20
     TAY
 .wait_pack
-    LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_AUDIO_BUSY : BNE .wait_pack
-    LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_TRACK_MISSING : BEQ .check_pack
-    TXA : STA !REG_MSU_PACK_COUNT
+    LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_AUDIO_BUSY : BNE .wait_pack
+    LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_TRACK_MISSING : BEQ .check_pack
+    TXA : STA.l MSUPackCount
     BRA +
 
 ; Check the current MSU-1 pack for tracks that require SPC fallback
 .check_fallback
         PHP : SEP #$10
-        LDA NoBGM : BNE .done
+        LDA.l NoBGM : BNE .done
     + : LDA.b #64
     LDX.b #7
     LDY.b #7
 
 .check_track
-    STA !REG_MSU_TRACK_LO
-    STZ !REG_MSU_TRACK_HI
+    STA.w MSUTRACK
+    STZ.w MSUTRACK+1
     PHA
     CLC
 
 .wait_track
-    LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_AUDIO_BUSY : BNE .wait_track
-    LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_TRACK_MISSING : BNE +
+    LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_AUDIO_BUSY : BNE .wait_track
+    LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_TRACK_MISSING : BNE +
         SEC
     +
-    LDA !REG_MSU_FALLBACK_TABLE,X : ROL : STA !REG_MSU_FALLBACK_TABLE,X
+    LDA.l MSUFallbackTable,X : ROL : STA.l MSUFallbackTable,X
 
     DEY : BPL .next_track
         DEX : BPL +
@@ -512,32 +474,32 @@ MSUInit:
 ;--------------------------------------------------------------------------------
 MSUStopPlaying:
 PHA : XBA : PHA
-    LDA !MSU_LOADED_TRACK
+    LDA.l MSULoadedTrack
     JSR IsResumableTrack : BCC +
         ; dont save if we already saved recently
         REP #$20
-        LDA !MSU_RESUME_TRACK : AND #$00FF : BEQ ++
-            LDA NMIFrames : !SUB !MSU_RESUME_TIME : PHA
-            LDA NMIFrames+2 : SBC !MSU_RESUME_TIME+2 : BNE +++
-                PLA : CMP MSUResumeTimer : !BLT .too_early
+        LDA.l MSUResumeTrack : AND #$00FF : BEQ ++
+            LDA.l NMIFrames : !SUB MSUResumeTime : PHA
+            LDA.l NMIFrames+2 : SBC MSUResumeTime+2 : BNE +++
+                PLA : CMP.l MSUResumeTimer : !BLT .too_early
                 BRA ++
             +++
             PLA
         ++
         ; saving
-        LDA NMIFrames : STA !MSU_RESUME_TIME
-        LDA NMIFrames+2 : STA !MSU_RESUME_TIME+2
+        LDA.l NMIFrames : STA.l MSUResumeTime
+        LDA.l NMIFrames+2 : STA.l MSUResumeTime+2
         SEP #$20
 
-        LDA !MSU_LOADED_TRACK : STA !MSU_RESUME_TRACK
-        LDA #$00 : STA !MSU_LOADED_TRACK ; dont take this path if we're calling again
-        LDA !FLAG_MSU_RESUME : STA !REG_MSU_CONTROL ; save this track's position
+        LDA.l MSULoadedTrack : STA.l MSUResumeTrack
+        LDA.b #$00 : STA.l MSULoadedTrack ; dont take this path if we're calling again
+        LDA.b #!FLAG_MSU_RESUME : STA.w MSUCTL ; save this track's position
         PLA : XBA : PLA
         RTS
         .too_early
         SEP #$20
     +
-    LDA #$00 : STA !REG_MSU_CONTROL
+    LDA.b #$00 : STA.w MSUCTL
 PLA : XBA : PLA
 RTS
 ;--------------------------------------------------------------------------------
@@ -547,124 +509,124 @@ RTS
 ;--------------------------------------------------------------------------------
 MSUMain:
     SEP #$20    ; set 8-BIT accumulator
-    LDA $4210   ; thing we wrote over
+    LDA.w RDNMI   ; thing we wrote over
     REP #$20    ; set 16-BIT accumulator
-    LDA !REG_MSU_ID_01 : CMP !VAL_MSU_ID_01 : BEQ .continue
+    LDA.w MSUID : CMP.w #!VAL_MSU_ID_01 : BEQ .continue
 .nomsu
     SEP #$30
     -
     JML SPCContinue
 .continue
-    LDA !REG_MSU_ID_23 : CMP !VAL_MSU_ID_23 : BNE .nomsu
-    LDA !REG_MSU_ID_45 : CMP !VAL_MSU_ID_45 : BNE .nomsu
+    LDA.w MSUID+2 : CMP.w #!VAL_MSU_ID_23 : BNE .nomsu
+    LDA.w MSUID+4 : CMP.w #!VAL_MSU_ID_45 : BNE .nomsu
     SEP #$30
-    LDX !REG_MUSIC_CONTROL : BEQ +
+    LDX.w MusicControl : BEQ +
         JMP .command_ff
     +
-    LDA !REG_MSU_DELAYED_COMMAND : BEQ .do_fade
+    LDA.l MSUDelayedCommand : BEQ .do_fade
 
 .check_busy
-    LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_AUDIO_BUSY : BNE -
+    LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_AUDIO_BUSY : BNE -
 .ready
-    LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_TRACK_MISSING : BNE -
+    LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_TRACK_MISSING : BNE -
 .start
-    LDA !MSU_RESUME_CONTROL : BIT !FLAG_RESUME_CANCEL : BEQ +
-        EOR !FLAG_RESUME_CANCEL : STA !MSU_RESUME_CONTROL
-        REP #$20 : LDA !REG_MSU_LOADED_TRACK : STA !REG_MSU_TRACK : SEP #$20
+    LDA.l MSUResumeControl : BIT.b #!FLAG_RESUME_CANCEL : BEQ +
+        EOR.b #!FLAG_RESUME_CANCEL : STA.l MSUResumeControl
+        REP #$20 : LDA.l MSULoadedTrack : STA.w MSUTRACK : SEP #$20
         BRA -
     +
-    LDA !VAL_VOLUME_FULL
-    STA !REG_TARGET_VOLUME
+    LDA.b #!VAL_VOLUME_FULL
+    STA.w TargetVolume
     
-    LDA !MSU_RESUME_CONTROL : BIT !FLAG_RESUME_FADEIN : BEQ +
-        EOR !FLAG_RESUME_FADEIN : STA !MSU_RESUME_CONTROL
-        LDA #$00
+    LDA.l MSUResumeControl : BIT.b #!FLAG_RESUME_FADEIN : BEQ +
+        EOR.b #!FLAG_RESUME_FADEIN : STA.l MSUResumeControl
+        LDA.b #$00
         BRA ++
     +
-    LDA !VAL_VOLUME_FULL
+    LDA.b #!VAL_VOLUME_FULL
     ++
-    STA !REG_CURRENT_VOLUME
-    STA !REG_MSU_VOLUME
+    STA.w CurrentVolume
+    STA.w MSUVOL
     
-    LDA !REG_CURRENT_MSU_TRACK : DEC : PHA
+    LDA.w CurrentMSUTrack : DEC : PHA
         AND.b #$07 : TAY
         PLA : LSR #3 : TAX
-    LDA !REG_MSU_FALLBACK_TABLE,X : BEQ +++ : CMP.b #$FF : BEQ ++
+    LDA.l MSUFallbackTable,X : BEQ +++ : CMP.b #$FF : BEQ ++
 
     - : CPY #$00 : BEQ +
         LSR : DEY : BRA -
     +
 
     AND.b #$01 : BEQ +++
-        ++ : LDA !REG_MSU_DELAYED_COMMAND
-    +++ : STA !REG_MSU_CONTROL
+        ++ : LDA.l MSUDelayedCommand
+    +++ : STA.w MSUCTL
     LDA.b #$00
-    STA !REG_MSU_DELAYED_COMMAND
+    STA.l MSUDelayedCommand
     JML SPCContinue
 
 .do_fade:
-    LDA !REG_CURRENT_VOLUME : CMP !REG_TARGET_VOLUME : BNE +
+    LDA.w CurrentVolume : CMP.w TargetVolume : BNE +
         JML SPCContinue
     + : BCC .increment
 .decrement
-    SBC !VAL_VOLUME_DECREMENT : BCC .mute
-    CMP !REG_TARGET_VOLUME : !BGE .set
-    LDA !REG_TARGET_VOLUME : BRA .set
+    SBC.b #!VAL_VOLUME_DECREMENT : BCC .mute
+    CMP.w TargetVolume : !BGE .set
+    LDA.w TargetVolume : BRA .set
 .mute
-    STZ !REG_CURRENT_VOLUME
+    STZ.w CurrentVolume
     JSR MSUStopPlaying
     BRA .set
 .increment
-    ADC !VAL_VOLUME_INCREMENT : BCS .max
-    CMP !REG_TARGET_VOLUME : !BLT .set
-    LDA !REG_TARGET_VOLUME : BRA .set
+    ADC.b #!VAL_VOLUME_INCREMENT : BCS .max
+    CMP.w TargetVolume : !BLT .set
+    LDA.w TargetVolume : BRA .set
 .max
-    LDA !VAL_VOLUME_FULL
+    LDA.b #!VAL_VOLUME_FULL
 .set
-    STA !REG_CURRENT_VOLUME
-    STA !REG_MSU_VOLUME
+    STA.w CurrentVolume
+    STA.w MSUVOL
     JML SPCContinue
 
 .command_ff:
-    CPX !VAL_COMMAND_LOAD_NEW_BANK : BNE .command_f3
+    CPX.b #!VAL_COMMAND_LOAD_NEW_BANK : BNE .command_f3
     JML SPCContinue
 
 .command_f3:
-    CPX !VAL_COMMAND_FULL_VOLUME : BNE .command_f2
-    LDA !VAL_VOLUME_FULL
-    STA !REG_TARGET_VOLUME
+    CPX.b #!VAL_COMMAND_FULL_VOLUME : BNE .command_f2
+    LDA.b #!VAL_VOLUME_FULL
+    STA.w TargetVolume
     JML SPCContinue
 
 .command_f2:
-    CPX !VAL_COMMAND_FADE_HALF : BNE .command_f1
-    LDA !VAL_VOLUME_HALF
-    STA !REG_TARGET_VOLUME
+    CPX.b #!VAL_COMMAND_FADE_HALF : BNE .command_f1
+    LDA.b #!VAL_VOLUME_HALF
+    STA.w TargetVolume
     JML SPCContinue
 
 .command_f1:
-    CPX !VAL_COMMAND_FADE_OUT : BNE .command_f0
-    STZ !REG_TARGET_VOLUME
-    STZ !REG_CURRENT_MSU_TRACK
+    CPX.b #!VAL_COMMAND_FADE_OUT : BNE .command_f0
+    STZ.w TargetVolume
+    STZ.w CurrentMSUTrack
     JML SPCContinue
 
 .command_f0:
-    CPX !VAL_COMMAND_STOP_PLAYBACK : !BLT .load_track
-    CPX !VAL_COMMAND_MUTE_SPC : BEQ +       ; Don't allow executing the mute/umute
-    CPX !VAL_COMMAND_UNMUTE_SPC : BNE ++    ; commands during NMI like this
-        + : LDA.b #$00 : STA !REG_MUSIC_CONTROL
+    CPX.b #!VAL_COMMAND_STOP_PLAYBACK : !BLT .load_track
+    CPX.b #!VAL_COMMAND_MUTE_SPC : BEQ +       ; Don't allow executing the mute/umute
+    CPX.b #!VAL_COMMAND_UNMUTE_SPC : BNE ++    ; commands during NMI like this
+        + : LDA.b #$00 : STA.w MusicControl
     ++ : JML SPCContinue
 
 .load_track:
-    CPX !REG_CURRENT_MSU_TRACK : BNE +
-    - : CPX #27 : BEQ +
+    CPX.w CurrentMSUTrack : BNE +
+    - : CPX.b #27 : BEQ +
         TXA
         JMP .done+1
     +
-    CPX !REG_CURRENT_COMMAND : BEQ -
+    CPX.w CurrentControlRequest : BEQ -
     LDA.b #$00 : XBA
-    LDA !REG_MSU_PACK_CURRENT : BEQ +
-    - : CMP !REG_MSU_PACK_COUNT : !BLT +
-        !SUB !REG_MSU_PACK_COUNT : BRA -
+    LDA.l MSUPackCurrent : BEQ +
+    - : CMP.l MSUPackCount : !BLT +
+        !SUB.l MSUPackCount : BRA -
     +
 
     JSR MSUStopPlaying
@@ -676,42 +638,42 @@ MSUMain:
         !ADD.w #100
         DEX : BNE -
     +
-        STA !REG_MSU_TRACK
-        STA !REG_MSU_LOADED_TRACK
+        STA.w MSUTRACK
+        STA.l MSULoadedTrack
     SEP #$20
 
     PLX
-    TXA : CMP !MSU_RESUME_TRACK : BNE + ; dont resume if too late
+    TXA : CMP.l MSUResumeTrack : BNE + ; dont resume if too late
         REP #$20
-            LDA NMIFrames : !SUB !MSU_RESUME_TIME : PHA
-            LDA NMIFrames+2 : SBC !MSU_RESUME_TIME+2 : BNE ++
-                PLA : CMP MSUResumeTimer : !BGE +++
+            LDA.l NMIFrames : !SUB MSUResumeTime : PHA
+            LDA.l NMIFrames+2 : SBC MSUResumeTime+2 : BNE ++
+                PLA : CMP.l MSUResumeTimer : !BGE +++
                 SEP #$20
-                LDA !FLAG_RESUME_FADEIN : BRA .done_resume
+                LDA.b #!FLAG_RESUME_FADEIN : BRA .done_resume
             ++
             PLA
         +++
         SEP #$20
-        LDA !FLAG_RESUME_CANCEL
+        LDA.b #!FLAG_RESUME_CANCEL
         .done_resume:
-        STA !MSU_RESUME_CONTROL
-        LDA #$00 : STA !MSU_RESUME_TRACK
+        STA.l MSUResumeControl
+        LDA.b #$00 : STA.l MSUResumeTrack
     +
     CPX #07 : BNE + ; Kakariko Village
-        LDA $10 : CMP #$07 : BNE +
+        LDA.b $10 : CMP #$07 : BNE +
         ; we're in link's house -> ignore
-        LDA #$00
+        LDA.b #$00
         BRA ++
     +
     TXA
     ++
-    STA !MSU_LOADED_TRACK
-    STX !REG_CURRENT_MSU_TRACK
-    LDA !REG_MSU_PACK_CURRENT : CMP #$FE : !BLT +
-        LDA #$00 : BRA ++
-        + : LDA MSUTrackList-1,X
-    ++ : STA !REG_MSU_DELAYED_COMMAND
-    LDA MSUExtendedFallbackList-1,X 
+    STA.l MSULoadedTrack
+    STX.w CurrentMSUTrack
+    LDA.l MSUPackCurrent : CMP #$FE : !BLT +
+        LDA.b #$00 : BRA ++
+        + : LDA.l MSUTrackList-1,X
+    ++ : STA.l MSUDelayedCommand
+    LDA.l MSUExtendedFallbackList-1,X 
     CMP.b #17 : BEQ +
     CMP.b #22 : BEQ +
     CMP.b #35 : !BLT .done
@@ -720,18 +682,18 @@ MSUMain:
     + : PHB : REP #$10
         LDX $040C
         LDA.b #Music_Eastern>>16 : PHA : PLB    ; Set bank to music pointers
-        LDY $00 : PHY
+        LDY.b Scrap00 : PHY
             REP #$20
-                LDA MSUDungeonFallbackList,X : STA $00
+                LDA.l MSUDungeonFallbackList,X : STA.b Scrap00
             SEP #$20
-            LDA ($00)
-    PLY : STY $00 : SEP #$10 : PLB
+            LDA.b (Scrap00)
+    PLY : STY.b Scrap00 : SEP #$10 : PLB
 
 .done
-    - : TAX : CMP MSUExtendedFallbackList-1,X : BEQ +
-        LDA MSUExtendedFallbackList-1,X : BRA -
+    - : TAX : CMP.l MSUExtendedFallbackList-1,X : BEQ +
+        LDA.l MSUExtendedFallbackList-1,X : BRA -
     +
-    STA !REG_MUSIC_CONTROL
+    STA.w MusicControl
     JML SPCContinue
 
 ;--------------------------------------------------------------------------------
@@ -740,12 +702,12 @@ MSUMain:
 ; Wait for the fanfare music to start, or else it can get skipped entirely
 ;--------------------------------------------------------------------------------
 FanfarePreload:
-    STA.l !REG_MUSIC_CONTROL_REQUEST  ; thing we wrote over
+    STA.w MusicControlRequest  ; thing we wrote over
     PHA
         JSL CheckMusicLoadRequest
         WAI
     PLA
-    - : CMP.l !REG_SPC_CONTROL : BNE -
+    - : CMP.w APUIO0 : BNE -
     JML AddReceivedItem_doneWithSoundEffects
 ;--------------------------------------------------------------------------------
 
@@ -753,22 +715,22 @@ FanfarePreload:
 ; Wait for pendant fanfare to finish
 ;--------------------------------------------------------------------------------
 PendantFanfareWait:
-    LDA TournamentSeed : BNE .spc
-    LDA FastFanfare : BNE .done
+    LDA.l TournamentSeed : BNE .spc
+    LDA.l FastFanfare : BNE .done
     REP #$20
-    LDA !REG_MSU_ID_01 : CMP !VAL_MSU_ID_01 : BNE .spc
-    LDA !REG_MSU_ID_23 : CMP !VAL_MSU_ID_23 : BNE .spc
-    LDA !REG_MSU_ID_45 : CMP !VAL_MSU_ID_45 : BNE .spc
+    LDA.w MSUID : CMP.w #!VAL_MSU_ID_01 : BNE .spc
+    LDA.w MSUID+2 : CMP.w #!VAL_MSU_ID_23 : BNE .spc
+    LDA.w MSUID+4 : CMP.w #!VAL_MSU_ID_45 : BNE .spc
     SEP #$20
-    LDA !REG_MSU_PACK_CURRENT : CMP #$FE : !BGE .spc
-    LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_TRACK_MISSING : BNE .spc
-    LDA !REG_MSU_DELAYED_COMMAND : BNE .continue
-    LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_AUDIO_PLAYING : BEQ .done
+    LDA.l MSUPackCurrent : CMP #$FE : !BGE .spc
+    LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_TRACK_MISSING : BNE .spc
+    LDA.l MSUDelayedCommand : BNE .continue
+    LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_AUDIO_PLAYING : BEQ .done
 .continue
     jml PendantFanfareContinue
 .spc
     SEP #$20
-    LDA.l !REG_SPC_CONTROL : BNE .continue
+    LDA.l APUIO0 : BNE .continue
 .done
     jml PendantFanfareDone
 ;--------------------------------------------------------------------------------
@@ -777,32 +739,32 @@ PendantFanfareWait:
 ; Wait for crystal fanfare to finish
 ;--------------------------------------------------------------------------------
 CrystalFanfareWait:
-    LDA TournamentSeed : BNE .spc
-    LDA FastFanfare : BNE .done
+    LDA.l TournamentSeed : BNE .spc
+    LDA.l FastFanfare : BNE .done
     REP #$20
-    LDA !REG_MSU_ID_01 : CMP !VAL_MSU_ID_01 : BNE .spc
-    LDA !REG_MSU_ID_23 : CMP !VAL_MSU_ID_23 : BNE .spc
-    LDA !REG_MSU_ID_45 : CMP !VAL_MSU_ID_45 : BNE .spc
+    LDA.w MSUID : CMP.w #!VAL_MSU_ID_01 : BNE .spc
+    LDA.w MSUID+2 : CMP.w #!VAL_MSU_ID_23 : BNE .spc
+    LDA.w MSUID+4 : CMP.w #!VAL_MSU_ID_45 : BNE .spc
     SEP #$20
-    LDA !REG_MSU_PACK_CURRENT : CMP #$FE : !BGE .spc
-    LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_TRACK_MISSING : BNE .spc
-    LDA !REG_MSU_DELAYED_COMMAND : BNE .continue
-    LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_AUDIO_PLAYING : BEQ .done
+    LDA.l MSUPackCurrent : CMP.b #$FE : !BGE .spc
+    LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_TRACK_MISSING : BNE .spc
+    LDA.l MSUDelayedCommand : BNE .continue
+    LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_AUDIO_PLAYING : BEQ .done
 .continue    
     jml CrystalFanfareContinue
 .spc
     SEP #$20
-    LDA.l !REG_SPC_CONTROL : BNE .continue
+    LDA.l APUIO0 : BNE .continue
 .done
-    jml CrystalFanfareDone
+    JML CrystalFanfareDone
 ;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Delay input scanning on startup/S&Q to avoid hard-lock from button mashing
 ;--------------------------------------------------------------------------------
 StartupWait:
-    LDA $11 : CMP.b #$04 : BCC .done    ; thing we wrote over
-    LDA !REG_SPC_CONTROL : BEQ .done-1
+    LDA.b $11 : CMP.b #$04 : BCC .done    ; thing we wrote over
+    LDA.w APUIO0 : BEQ .done-1
     CMP.b #$01 : BEQ .done
     CLC
 .done
@@ -814,13 +776,13 @@ StartupWait:
 ;--------------------------------------------------------------------------------
 EndingMusicWait:
     REP #$20
-    LDA !REG_MSU_ID_01 : CMP !VAL_MSU_ID_01 : BNE .done
-    LDA !REG_MSU_ID_23 : CMP !VAL_MSU_ID_23 : BNE .done
-    LDA !REG_MSU_ID_45 : CMP !VAL_MSU_ID_45 : BNE .done
+    LDA.w MSUID : CMP.w #!VAL_MSU_ID_01 : BNE .done
+    LDA.w MSUID+2 : CMP.w #!VAL_MSU_ID_23 : BNE .done
+    LDA.w MSUID+4 : CMP.w #!VAL_MSU_ID_45 : BNE .done
     SEP #$20
 .wait
     LDA.b $50 : BNE .done
-    LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_AUDIO_PLAYING : BNE .wait
+    LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_AUDIO_PLAYING : BNE .wait
 .done
     SEP #$20
     LDA.b #$22
diff --git a/music.asm b/music.asm
index 746711c..b8ae54d 100644
--- a/music.asm
+++ b/music.asm
@@ -91,7 +91,7 @@ PreOverworld_LoadProperties_ChooseMusic:
 Overworld_FinishMirrorWarp:
     REP #$20
 
-    LDA.w #$2641 : STA $4370
+    LDA.w #$2641 : STA.w DMAP7
 
     LDX.b #$3E
 
diff --git a/musicvolumes.asm b/musicvolumes.asm
index c046558..ee8f3c2 100644
--- a/musicvolumes.asm
+++ b/musicvolumes.asm
@@ -4,1206 +4,1206 @@
 
 ;== Music volume (set everything to 0 for a no-music seed) ==
 
-!VOLUME_00 = $00
-!VOLUME_14 = $14
-!VOLUME_3C = $3C
-!VOLUME_50 = $50
-!VOLUME_5A = $5A
-!VOLUME_64 = $64
-!VOLUME_78 = $78
-!VOLUME_82 = $82
-!VOLUME_8C = $8C
-!VOLUME_A0 = $A0
-!VOLUME_AA = $AA
-!VOLUME_B4 = $B4
-!VOLUME_C8 = $C8
-!VOLUME_D2 = $D2
-!VOLUME_DC = $DC
-!VOLUME_E6 = $E6
-!VOLUME_F0 = $F0
-!VOLUME_FA = $FA
-!VOLUME_FF = $FF
+VOLUME_00 = $00
+VOLUME_14 = $14
+VOLUME_3C = $3C
+VOLUME_50 = $50
+VOLUME_5A = $5A
+VOLUME_64 = $64
+VOLUME_78 = $78
+VOLUME_82 = $82
+VOLUME_8C = $8C
+VOLUME_A0 = $A0
+VOLUME_AA = $AA
+VOLUME_B4 = $B4
+VOLUME_C8 = $C8
+VOLUME_D2 = $D2
+VOLUME_DC = $DC
+VOLUME_E6 = $E6
+VOLUME_F0 = $F0
+VOLUME_FA = $FA
+VOLUME_FF = $FF
 
 ;== File select ==
 org $1A9D28 ; <- D1D28 .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1A9D41 ; <- D1D41 .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1A9D5C ; <- D1D5C .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1A9D77 ; <- D1D77 .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1A9D92 ; <- D1D92 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1A9DBD ; <- D1DBD .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1A9DEB ; <- D1DEB .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 ;org $1A9EEE ; <- D1EEE . (silent track)
-;db !VOLUME_8C ; $8C
+;db #VOLUME_8C ; $8C
 
 ;== Title Theme (Triforce jingle) ==
 org $1A9F5D ; <- D1F5D .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1A9F9F ; <- D1F9F .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1A9FBD ; <- D1FBD .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1A9FDC ; <- D1FDC .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1A9FEA ; <- D1FEA .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 
 ;== Light World ==
 org $1AA047 ; <- D2047 .
-db !VOLUME_FA ; $FA
+db #VOLUME_FA ; $FA
 org $1AA085 ; <- D2085 .
-db !VOLUME_FF ; $FF
+db #VOLUME_FF ; $FF
 org $1AA0CA ; <- D20CA .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AA10A ; <- D210A .
-db !VOLUME_E6 ; $E6
+db #VOLUME_E6 ; $E6
 org $1AA13F ; <- D213F .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1AA174 ; <- D2174 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1AA1BB ; <- D21BB .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AA1C5 ; <- D21C5 .
-db !VOLUME_FF ; $FF
+db #VOLUME_FF ; $FF
 org $1AA1CD ; <- D21CD .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AA279 ; <- D2279 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AA29E ; <- D229E .
-db !VOLUME_DC ; $DC	
+db #VOLUME_DC ; $DC	
 org $1AA2C9 ; <- D22C9 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AA2DC ; <- D22DC .
-db !VOLUME_E6 ; $E6
+db #VOLUME_E6 ; $E6
 org $1AA349 ; <- D2349 .
-db !VOLUME_78 ; $78
+db #VOLUME_78 ; $78
 org $1AA426 ; <- D2426 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1AA447 ; <- D2447 .
-db !VOLUME_E6 ; $E6
+db #VOLUME_E6 ; $E6
 org $1AA49C ; <- D249C .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AA4C2 ; <- D24C2 .
-db !VOLUME_FA ; $FA
+db #VOLUME_FA ; $FA
 org $1AA4CD ; <- D24CD .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AA4EC ; <- D24EC .
-db !VOLUME_FA ; $FA
+db #VOLUME_FA ; $FA
 org $1AA5A4 ; <- D25A4 .
-db !VOLUME_FA ; $FA
+db #VOLUME_FA ; $FA
 org $1AA754 ; <- D2754 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 
 ;== Escape ==
 org $1AA84C ; <- D284C .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AA866 ; <- D2866 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AA887 ; <- D2887 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AA8A0 ; <- D28A0 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AA8BA ; <- D28BA .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AA8DB ; <- D28DB .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AA8F4 ; <- D28F4 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AA93E ; <- D293E .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AAB88 ; <- D2B88 .
-db !VOLUME_D2 ; $D2
+db #VOLUME_D2 ; $D2
 
 ;== Bunny ==
 org $1AABF3 ; <- D2BF3 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AAC09 ; <- D2C09 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AAC1F ; <- D2C1F .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AAC53 ; <- D2C53 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AAC69 ; <- D2C69 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 ;org $1AACA1 ; <- D2CA1 . (silent track)
-;db !VOLUME_C8 ; $C8
+;db #VOLUME_C8 ; $C8
 org $1AACAF ; <- D2CAF .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AACC5 ; <- D2CC5 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AACEB ; <- D2CEB .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AAD05 ; <- D2D05 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AAD73 ; <- D2D73 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AAD91 ; <- D2D91 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AADAF ; <- D2DAF .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 
 ;== Lost Woods ==
 org $1AAE3D ; <- D2E3D .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AAE66 ; <- D2E66 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AAE70 ; <- D2E70 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AAEAB ; <- D2EAB .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AAEE6 ; <- D2EE6 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AAF00 ; <- D2F00 .
-db !VOLUME_82 ; $82
+db #VOLUME_82 ; $82
 org $1AAF36 ; <- D2F36 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AAF46 ; <- D2F46 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AAF6F ; <- D2F6F .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 ;org $1AAFCF ; <- D2FCF . (unused track)
-;db !VOLUME_C8 ; $C8
+;db #VOLUME_C8 ; $C8
 ;org $1AAFDF ; <- D2FDF . (unused track)
-;db !VOLUME_C8 ; $C8
+;db #VOLUME_C8 ; $C8
 ;org $1AB02B ; <- D302B . (unused track)
-;db !VOLUME_C8 ; $C8
+;db #VOLUME_C8 ; $C8
 org $1AB086 ; <- D3086 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AB099 ; <- D3099 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AB0A5 ; <- D30A5 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AB0CD ; <- D30CD .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AB0F6 ; <- D30F6 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AB11D ; <- D311D .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1AB154 ; <- D3154 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AB184 ; <- D3184 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AB1D1 ; <- D31D1 .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 
 ;== Episode III - A Link to the Past randomizer ==
 org $1AB33A ; <- D333A .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AB3D9 ; <- D33D9 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AB49F ; <- D349F .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AB54A ; <- D354A .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AB5E5 ; <- D35E5 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AB624 ; <- D3624 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AB63C ; <- D363C .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AB64A ; <- D364A .
-db !VOLUME_D2 ; $D2
+db #VOLUME_D2 ; $D2
 org $1AB672 ; <- D3672 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AB691 ; <- D3691 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AB69F ; <- D369F .
-db !VOLUME_D2 ; $D2
+db #VOLUME_D2 ; $D2
 org $1AB6B4 ; <- D36B4 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AB6C6 ; <- D36C6 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AB724 ; <- D3724 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 ;org $1AB73B ; <- D373B . (muted track)
-;db !VOLUME_00 ; $00
+;db #VOLUME_00 ; $00
 org $1AB747 ; <- D3747 .
-db !VOLUME_D2 ; $D2
+db #VOLUME_D2 ; $D2
 ;org $1AB75B ; <- D375B . (muted track)
-;db !VOLUME_00 ; $00
+;db #VOLUME_00 ; $00
 org $1AB767 ; <- D3767 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 
 ;== Kakariko ==
 org $1AB8CB ; <- D38CB .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AB8ED ; <- D38ED .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1ABB1D ; <- D3B1D .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ABB2F ; <- D3B2F .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ABB55 ; <- D3B55 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ABB70 ; <- D3B70 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ABB81 ; <- D3B81 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ABB97 ; <- D3B97 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1ABBAC ; <- D3BAC .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1ABBBF ; <- D3BBF .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ABBE8 ; <- D3BE8 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1ABC0D ; <- D3C0D .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1ABC39 ; <- D3C39 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1ABC68 ; <- D3C68 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1ABC91 ; <- D3C91 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1ABC9F ; <- D3C9F .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1ABCBC ; <- D3CBC .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1ABCD3 ; <- D3CD3 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1ABCE8 ; <- D3CE8 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 
 ;== Mirror Sounds ==
 org $1ABD34 ; <- D3D34 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ABD55 ; <- D3D55 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ABD6E ; <- D3D6E .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ABDAA ; <- D3DAA .
-db !VOLUME_FA ; $FA
+db #VOLUME_FA ; $FA
 org $1ABDC6 ; <- D3DC6 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ABE04 ; <- D3E04 . (this track sounds awesome on its own)
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ABE38 ; <- D3E38 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 
 ;== Dark World ==
 org $1ABF0C ; <- D3F0C .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1ABF45 ; <- D3F45 .
-db !VOLUME_78 ; $78
+db #VOLUME_78 ; $78
 org $1ABF65 ; <- D3F65 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ABF82 ; <- D3F82 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1ABFA6 ; <- D3FA6 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC01E ; <- D401E .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AC04F ; <- D404F .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC05F ; <- D405F .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AC087 ; <- D4087 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC139 ; <- D4139 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AC148 ; <- D4148 .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1AC17A ; <- D417A .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC198 ; <- D4198 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AC1A0 ; <- D41A0 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC1D5 ; <- D41D5 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AC1F6 ; <- D41F6 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AC22B ; <- D422B .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AC25C ; <- D425C .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC270 ; <- D4270 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AC290 ; <- D4290 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AC2B1 ; <- D42B1 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AC2EB ; <- D42EB .
-db !VOLUME_78 ; $78
+db #VOLUME_78 ; $78
 org $1AC306 ; <- D4306 (Volume fade) .
-db !VOLUME_5A ; $5A
+db #VOLUME_5A ; $5A
 org $1AC319 ; <- D4319 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC334 ; <- D4334 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AC33C ; <- D433C .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC371 ; <- D4371 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AC3A6 ; <- D43A6 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AC3DB ; <- D43DB .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AC3EF ; <- D43EF .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC40C ; <- D440C .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC41E ; <- D441E .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AC43E ; <- D443E .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AC452 ; <- D4452 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC494 ; <- D4494 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC4B5 ; <- D44B5 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC512 ; <- D4512 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC56F ; <- D456F .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AC597 ; <- D4597 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AC5D1 ; <- D45D1 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC5EF ; <- D45EF .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC682 ; <- D4682 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC6C3 ; <- D46C3 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 
 ;== Getting Master Sword ==
 org $1AC731 ; <- D4731 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1AC753 ; <- D4753 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1AC774 ; <- D4774 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1AC795 ; <- D4795 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1AC7B6 ; <- D47B6 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1AC7D3 ; <- D47D3 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 
 ;== Hostile Kakariko Guards ==
 org $1AC83C ; <- D483C .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC848 ; <- D4848 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC855 ; <- D4855 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC862 ; <- D4862 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC86F ; <- D486F .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC87C ; <- D487C .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AC8B9 ; <- D48B9 .
-db !VOLUME_78 ; $78
+db #VOLUME_78 ; $78
 org $1AC8FF ; <- D48FF .
-db !VOLUME_78 ; $78
+db #VOLUME_78 ; $78
 
 ;== Title theme (after triforce jingle) ==
 org $1ACA1C ; <- D4A1C .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ACA3B ; <- D4A3B .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ACA60 ; <- D4A60 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ACAA5 ; <- D4AA5 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1ACAE4 ; <- D4AE4 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1ACB27 ; <- D4B27 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ACB3C ; <- D4B3C .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1ACB96 ; <- D4B96 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1ACBAB ; <- D4BAB .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1ACC03 ; <- D4C03 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1ACC53 ; <- D4C53 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1ACC7A ; <- D4C7A .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ACC7F ; <- D4C7F .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1ACCA5 ; <- D4CA5 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 
 ;== Skull Woods ==
 org $1ACD12 ; <- D4D12 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ACD43 ; <- D4D43 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1ACD81 ; <- D4D81 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ACD9C ; <- D4D9C .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1ACDCC ; <- D4DCC .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1ACE90 ; <- D4E90 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ACEBA ; <- D4EBA .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1ACED6 ; <- D4ED6 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ACEE2 ; <- D4EE2 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ACF0B ; <- D4F0B .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1ACFE5 ; <- D4FE5 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AD005 ; <- D5005 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AD012 ; <- D5012 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AD02E ; <- D502E .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AD03C ; <- D503C .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AD081 ; <- D5081 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 
 ;== Minigame ==
 org $1AD1A8 ; <- D51A8 .
-db !VOLUME_FA ; $FA
+db #VOLUME_FA ; $FA
 org $1AD1B1 ; <- D51B1 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AD1C7 ; <- D51C7 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AD1CF ; <- D51CF .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AD1E6 ; <- D51E6 .
-db !VOLUME_FA ; $FA
+db #VOLUME_FA ; $FA
 org $1AD1EF ; <- D51EF .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AD20C ; <- D520C .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AD214 ; <- D5214 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AD231 ; <- D5231 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AD24E ; <- D524E .
-db !VOLUME_FA ; $FA
+db #VOLUME_FA ; $FA
 org $1AD257 ; <- D5257 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AD26D ; <- D526D .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AD275 ; <- D5275 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AD29E ; <- D529E .
-db !VOLUME_FA ; $FA
+db #VOLUME_FA ; $FA
 org $1AD2AF ; <- D52AF .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AD2BD ; <- D52BD .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AD2CD ; <- D52CD .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AD2DB ; <- D52DB .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 
 ;== Triforce Chamber ==
 org $1AD424 ; <- D5424 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AD43F ; <- D543F .
-db !VOLUME_78 ; $78
+db #VOLUME_78 ; $78
 org $1AD477 ; <- D5477 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1AD49C ; <- D549C .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AD4BC ; <- D54BC .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AD4D5 ; <- D54D5 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AD4F0 ; <- D54F0 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AD509 ; <- D5509 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AD543 ; <- D5543 .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 
 ;== Credits fuck it i'm not testing this, they look right though. ===
 org $1AD7D8 ; <- D57D8 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AD801 ; <- D5801 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AD817 ; <- D5817 .
-db !VOLUME_78 ; $78
+db #VOLUME_78 ; $78
 org $1AD8A4 ; <- D58A4
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AD954 ; <- D5954
-db !VOLUME_3C ; $3C
+db #VOLUME_3C ; $3C
 org $1AD957 ; <- D5957 (Volume fade)
-db !VOLUME_78 ; $78
+db #VOLUME_78 ; $78
 org $1AD9B9 ; <- D59B9
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1ADA2F ; <- D5A2F (maybe a silent track?)
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1ADA3D ; <- D5A3D
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1ADA4D ; <- D5A4D
-db !VOLUME_E6 ; $E6
+db #VOLUME_E6 ; $E6
 org $1ADA68 ; <- D5A68
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ADA7F ; <- D5A7F
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ADACB ; <- D5ACB
-db !VOLUME_78 ; $78
+db #VOLUME_78 ; $78
 org $1ADAE8 ; <- D5AE8
-db !VOLUME_78 ; $78
+db #VOLUME_78 ; $78
 org $1ADAEB ; <- D5AEB (Volume fade)
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1ADB47 ; <- D5B47
-db !VOLUME_50 ; $50
+db #VOLUME_50 ; $50
 org $1ADB4A ; <- D5B4A (Volume fade)
-db !VOLUME_78 ; $78
+db #VOLUME_78 ; $78
 org $1ADB5E ; <- D5B5E
-db !VOLUME_50 ; $50
+db #VOLUME_50 ; $50
 org $1ADB6F ; <- D5B6F (Volume fade)
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1ADC12 ; <- D5C12
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ADD71 ; <- D5D71
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ADDDC ; <- D5DDC
-db !VOLUME_E6 ; $E6
+db #VOLUME_E6 ; $E6
 org $1ADE10 ; <- D5E10
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ADE5E ; <- D5E5E
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1ADE9A ; <- D5E9A
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ADF28 ; <- D5F28
-db !VOLUME_FF ; $FF
+db #VOLUME_FF ; $FF
 org $1ADF8B ; <- D5F8B
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ADFA4 ; <- D5FA4
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1ADFE9 ; <- D5FE9
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AE045 ; <- D6045 .
-db !VOLUME_FA ; $FA
+db #VOLUME_FA ; $FA
 
 ;== Pre-credits ==
 org $1AE51A ; <- D651A .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AE53B ; <- D653B (Volume Fade) .
-db !VOLUME_3C ; $3C
+db #VOLUME_3C ; $3C
 org $1AE542 ; <- D6542 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AE566 ; <- D6566 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1AE58F ; <- D658F .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AE5B3 ; <- D65B3 .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1AE5D2 ; <- D65D2 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AE5ED ; <- D65ED .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AE61D ; <- D661D .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AE64F ; <- D664F .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AE698 ; <- D6698 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AE6D7 ; <- D66D7 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AE6FF ; <- D66FF .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AE72C ; <- D672C .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1AE74A ; <- D674A .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AE760 ; <- D6760 .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1AE776 ; <- D6776 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AE7C0 ; <- D67C0 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1AE827 ; <- D6827 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AE878 ; <- D6878 .
-db !VOLUME_64 ; $64
+db #VOLUME_64 ; $64
 org $1AE883 ; <- D6883 .
-db !VOLUME_64 ; $64
+db #VOLUME_64 ; $64
 org $1AE8BD ; <- D68BD .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 
 ;== Holding the Triforce (part 1, more below) ==
 org $1AE8E5 ; <- D68E5 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 
 ;== More pre-credits stuff ==
 org $1AE956 ; <- D6956 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AE973 ; <- D6973 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AE985 ; <- D6985 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AE9A8 ; <- D69A8 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AE9B8 ; <- D69B8 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1AE9D6 ; <- D69D6 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AE9F5 ; <- D69F5 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AEA05 ; <- D6A05 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AEA51 ; <- D6A51 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AEA86 ; <- D6A86 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AEAB1 ; <- D6AB1 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1AEAE9 ; <- D6AE9 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AEB6B ; <- D6B6B .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1AEB96 ; <- D6B96 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AEC05 ; <- D6C05 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1AEC3E ; <- D6C3E .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AEC5C ; <- D6C5C .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AEC6F ; <- D6C6F .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AEC8E ; <- D6C8E .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AECB4 ; <- D6CB4 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AED4A ; <- D6D4A .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AED7D ; <- D6D7D .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1AEDB3 ; <- D6DB3 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1AEDCF ; <- D6DCF .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AEDF6 ; <- D6DF6 .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1AEE0D ; <- D6E0D .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1AEE20 ; <- D6E20 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AEE48 ; <- D6E48 .
-db !VOLUME_64 ; $64
+db #VOLUME_64 ; $64
 org $1AEE76 ; <- D6E76 .
-db !VOLUME_64 ; $64
+db #VOLUME_64 ; $64
 org $1AEE9C ; <- D6E9C .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AEECB ; <- D6ECB .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AEEFB ; <- D6EFB .
-db !VOLUME_64 ; $64
+db #VOLUME_64 ; $64
 org $1AEF2D ; <- D6F2D .
-db !VOLUME_64 ; $64
+db #VOLUME_64 ; $64
 org $1AEF80 ; <- D6F80 (i think this is unused, but i don't feel like confirming this one)
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AF17E ; <- D717E .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 
 ;== Holding the Triforce (part 2) ==
 org $1AF190 ; <- D7190 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AF1AB ; <- D71AB .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1AF1B9 ; <- D71B9 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1AF1D4 ; <- D71D4 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AF1E6 ; <- D71E6 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AF203 ; <- D7203 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1AF21E ; <- D721E .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 
 ;== More Credits ==
 org $1AF3A1 ; <- D73A1 .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 
 ;== Hyrule Castle ==
 org $1B811D ; <- D811D .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 ;org $1B8139 ; <- D8139 . (silent track)
-;db !VOLUME_C8 ; $C8
+;db #VOLUME_C8 ; $C8
 ;org $1B814C ; <- D814C . (silent track)
-;db !VOLUME_8C ; $8C
+;db #VOLUME_8C ; $8C
 org $1B816B ; <- D816B .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B818A ; <- D818A .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B819E ; <- D819E .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B81BE ; <- D81BE .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B81DE ; <- D81DE .
-db !VOLUME_FA ; $FA
+db #VOLUME_FA ; $FA
 org $1B821E ; <- D821E .
-db !VOLUME_FA ; $FA
+db #VOLUME_FA ; $FA
 org $1B825D ; <- D825D .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1B827D ; <- D827D .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1B829C ; <- D829C .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B82BE ; <- D82BE .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1B82E1 ; <- D82E1 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B8306 ; <- D8306 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B830E ; <- D830E .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B8340 ; <- D8340 .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1B835E ; <- D835E .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B8394 ; <- D8394 .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1B83AB ; <- D83AB .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B83CA ; <- D83CA .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B83F0 ; <- D83F0 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B83F8 ; <- D83F8 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B842C ; <- D842C .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1B844B ; <- D844B .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B8479 ; <- D8479 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B849E ; <- D849E .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B84CB ; <- D84CB .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B84EB ; <- D84EB .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B84F3 ; <- D84F3 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B854A ; <- D854A .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B8573 ; <- D8573 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B859D ; <- D859D .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B85B4 ; <- D85B4 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B85CE ; <- D85CE .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B862A ; <- D862A .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B8681 ; <- D8681 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B8724 ; <- D8724 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1B8732 ; <- D8732 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1B8796 ; <- D8796 .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1B87E3 ; <- D87E3 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B87FF ; <- D87FF .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B887B ; <- D887B .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B88C6 ; <- D88C6 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B88E3 ; <- D88E3 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 ;org $1B8903 ; <- D8903 . (silent track)
-;db !VOLUME_8C ; $8C
+;db #VOLUME_8C ; $8C
 org $1B892A ; <- D892A .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1B8944 ; <- D8944 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B897B ; <- D897B .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 
 ;== Pendant Dungeon ==
 org $1B8C97 ; <- D8C97 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B8CA4 ; <- D8CA4 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B8CB3 ; <- D8CB3 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B8CC2 ; <- D8CC2 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B8CD1 ; <- D8CD1 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B8D01 ; <- D8D01 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B8E2D ; <- D8E2D .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1B8F0D ; <- D8F0D .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 ;org $1B90F8 ; <- D90F8 (muted track)
-;db !VOLUME_00 ; $00
+;db #VOLUME_00 ; $00
 
 ;== Caves ==
 org $1B917B ; <- D917B .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B918C ; <- D918C .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B919A ; <- D919A .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B91B5 ; <- D91B5 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B91D0 ; <- D91D0 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B91DD ; <- D91DD . (splashy sound)
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B91E8 ; <- D91E8 .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1B9220 ; <- D9220 . (splashy sound)
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B922B ; <- D922B .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1B9273 ; <- D9273 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9284 ; <- D9284 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9292 ; <- D9292 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B92AD ; <- D92AD .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B92C8 ; <- D92C8 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B92D5 ; <- D92D5 . (splashy sound)
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B92E0 ; <- D92E0 .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1B9311 ; <- D9311 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9322 ; <- D9322 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9330 ; <- D9330 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B934B ; <- D934B .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9366 ; <- D9366 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9373 ; <- D9373 . (splashy sound)
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B937E ; <- D937E .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1B93B6 ; <- D93B6 . (splashy sound)
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B93C1 ; <- D93C1 .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 
 ;== Crystal/Pendant get ==
 org $1B945E ; <- D945E .
-db !VOLUME_F0 ; $F0
+db #VOLUME_F0 ; $F0
 org $1B94AA ; <- D94AA .
-db !VOLUME_FA ; $FA
+db #VOLUME_FA ; $FA
 org $1B94E0 ; <- D94E0 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1B9544 ; <- D9544 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1B95A8 ; <- D95A8 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1B960C ; <- D960C .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1B9652 ; <- D9652 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1B967D ; <- D967D .
-db !VOLUME_F0 ; $F0
+db #VOLUME_F0 ; $F0
 org $1B9698 ; <- D9698 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1B96C2 ; <- D96C2 .
-db !VOLUME_F0 ; $F0
+db #VOLUME_F0 ; $F0
 
 ;== Sanctuary ==
 org $1B97A6 ; <- D97A6 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B97C2 ; <- D97C2 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B97DC ; <- D97DC .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B97FB ; <- D97FB .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9811 ; <- D9811 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9828 ; <- D9828 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 
 ;== Boss ==
 ;org $1B98FF ; <- D98FF . (silent track)
-;db !VOLUME_C8 ; $C8
+;db #VOLUME_C8 ; $C8
 org $1B996F ; <- D996F .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9982 ; <- D9982 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1B99A8 ; <- D99A8 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B99D5 ; <- D99D5 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9A02 ; <- D9A02 .
-db !VOLUME_AA ; $AA
+db #VOLUME_AA ; $AA
 org $1B9A30 ; <- D9A30 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9A4E ; <- D9A4E .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9A6B ; <- D9A6B .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9A88 ; <- D9A88 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9A9E ; <- D9A9E .
-db !VOLUME_FA ; $FA
+db #VOLUME_FA ; $FA
 ;org $1B9AE4 ; <- D9AE4 . (unused track) these three tracks go together
-;db !VOLUME_FA ; $FA
+;db #VOLUME_FA ; $FA
 ;org $1B9AF7 ; <- D9AF7 . (unused track)
-;db !VOLUME_C8 ; $C8
+;db #VOLUME_C8 ; $C8
 ;org $1B9B1D ; <- D9B1D . (unused track)
-;db !VOLUME_C8 ; $C8
+;db #VOLUME_C8 ; $C8
 org $1B9B43 ; <- D9B43 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9B56 ; <- D9B56 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1B9B7C ; <- D9B7C .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9BA9 ; <- D9BA9 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9BD6 ; <- D9BD6 .
-db !VOLUME_AA ; $AA
+db #VOLUME_AA ; $AA
 
 ;== Crystal Dungeon ==
 org $1B9C84 ; <- D9C84 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9C8D ; <- D9C8D .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9C95 ; <- D9C95 .
-db !VOLUME_F0 ; $F0
+db #VOLUME_F0 ; $F0
 org $1B9CAC ; <- D9CAC .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9CBC ; <- D9CBC .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1B9CE8 ; <- D9CE8 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9CF3 ; <- D9CF3 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9CFD ; <- D9CFD .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9D46 ; <- D9D46 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1B9DC0 ; <- D9DC0 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1B9E49 ; <- D9E49 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1B9EE6 ; <- D9EE6 .
-db !VOLUME_F0 ; $F0
+db #VOLUME_F0 ; $F0
 
 ;== Fortuneteller ==
 org $1BA211 ; <- DA211 .
-db !VOLUME_64 ; $64
+db #VOLUME_64 ; $64
 org $1BA233 ; <- DA233 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1BA251 ; <- DA251 .
-db !VOLUME_E6 ; $E6
+db #VOLUME_E6 ; $E6
 org $1BA26C ; <- DA26C .
-db !VOLUME_E6 ; $E6
+db #VOLUME_E6 ; $E6
 org $1BA289 ; <- DA289 .
-db !VOLUME_FA ; $FA
+db #VOLUME_FA ; $FA
 
 ;== Zelda's Lullaby ==
 org $1BA35B ; <- DA35B .
-db !VOLUME_64 ; $64
+db #VOLUME_64 ; $64
 org $1BA35E ; <- DA35E (Volume fade) .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BA37B ; <- DA37B .
-db !VOLUME_64 ; $64
+db #VOLUME_64 ; $64
 org $1BA37E ; <- DA37E (Volume fade) .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BA38E ; <- DA38E .
-db !VOLUME_64 ; $64
+db #VOLUME_64 ; $64
 org $1BA391 ; <- DA391 (Volume fade) .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BA39F ; <- DA39F .
-db !VOLUME_64 ; $64
+db #VOLUME_64 ; $64
 org $1BA3A2 ; <- DA3A2 (Volume fade) .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1BA3D5 ; <- DA3D5 .
-db !VOLUME_82 ; $82
+db #VOLUME_82 ; $82
 org $1BA478 ; <- DA478 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BA49E ; <- DA49E .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1BA4C3 ; <- DA4C3 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BA4D7 ; <- DA4D7 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BA4F6 ; <- DA4F6 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BA515 ; <- DA515 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 
 ;== Maidens ==
 org $1BA5C3 ; <- DA5C3 .
-db !VOLUME_64 ; $64
+db #VOLUME_64 ; $64
 org $1BA5C6 ; <- DA5C6 (Volume fade) .
-db !VOLUME_F0 ; $F0
+db #VOLUME_F0 ; $F0
 org $1BA5DE ; <- DA5DE .
-db !VOLUME_78 ; $78
+db #VOLUME_78 ; $78
 org $1BA608 ; <- DA608 .
-db !VOLUME_78 ; $78
+db #VOLUME_78 ; $78
 org $1BA635 ; <- DA635 .
-db !VOLUME_78 ; $78
+db #VOLUME_78 ; $78
 org $1BA662 ; <- DA662 .
-db !VOLUME_78 ; $78
+db #VOLUME_78 ; $78
 org $1BA691 ; <- DA691 .
-db !VOLUME_64 ; $64
+db #VOLUME_64 ; $64
 org $1BA694 ; <- DA694 (Volume fade) .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1BA6A8 ; <- DA6A8 .
-db !VOLUME_64 ; $64
+db #VOLUME_64 ; $64
 org $1BA6AB ; <- DA6AB (Volume fade) .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1BA6DF ; <- DA6DF .
-db !VOLUME_64 ; $64
+db #VOLUME_64 ; $64
 org $1BA6E2 ; <- DA6E2 (Volume fade) .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BA710 ; <- DA710 .
-db !VOLUME_14 ; $14
+db #VOLUME_14 ; $14
 org $1BA71F ; <- DA71F (Volume fade) .
-db !VOLUME_78 ; $78
+db #VOLUME_78 ; $78
 org $1BA72B ; <- DA72B .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1BA736 ; <- DA736 (Volume fade) .
-db !VOLUME_3C ; $3C
+db #VOLUME_3C ; $3C
 org $1BA745 ; <- DA745 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1BA752 ; <- DA752 (Volume fade) .
-db !VOLUME_3C ; $3C
+db #VOLUME_3C ; $3C
 org $1BA765 ; <- DA765 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1BA772 ; <- DA772 (Volume fade) .
-db !VOLUME_3C ; $3C
+db #VOLUME_3C ; $3C
 org $1BA785 ; <- DA785 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1BA792 ; <- DA792 (Volume fade) .
-db !VOLUME_3C ; $3C
+db #VOLUME_3C ; $3C
 org $1BA7A4 ; <- DA7A4 .
-db !VOLUME_14 ; $14
+db #VOLUME_14 ; $14
 org $1BA7AF ; <- DA7AF (Volume fade) .
-db !VOLUME_78 ; $78
+db #VOLUME_78 ; $78
 org $1BA7BB ; <- DA7BB .
-db !VOLUME_14 ; $14
+db #VOLUME_14 ; $14
 org $1BA7C6 ; <- DA7C6 (Volume fade) .
-db !VOLUME_78 ; $78
+db #VOLUME_78 ; $78
 org $1BA7D2 ; <- DA7D2 .
-db !VOLUME_14 ; $14
+db #VOLUME_14 ; $14
 org $1BA7DD ; <- DA7DD (Volume fade) .
-db !VOLUME_78 ; $78
+db #VOLUME_78 ; $78
 
 ;== Fairy Fountain ==
 org $1BA958 ; <- DA958 .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1BA971 ; <- DA971 .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1BA98C ; <- DA98C .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1BA9A7 ; <- DA9A7 .
-db !VOLUME_8C ; $8C
+db #VOLUME_8C ; $8C
 org $1BA9C2 ; <- DA9C2 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BA9ED ; <- DA9ED .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BAA1B ; <- DAA1B .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BAA57 ; <- DAA57 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BAA68 ; <- DAA68 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1BAA77 ; <- DAA77 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1BAA88 ; <- DAA88 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1BAA99 ; <- DAA99 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 
 ;== Pre-Ganon Fight ==
 org $1BABAF ; <- DABAF .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BABC9 ; <- DABC9 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BABE2 ; <- DABE2 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BABF6 ; <- DABF6 .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1BAC0D ; <- DAC0D .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1BAC28 ; <- DAC28 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BAC46 ; <- DAC46 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BAC63 ; <- DAC63 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 
 ;== Agah 2 defeated ==
 ;org $1BACB8 ; <- DACB8 . (silent track)
-;db !VOLUME_C8 ; $C8
+;db #VOLUME_C8 ; $C8
 org $1BACEC ; <- DACEC .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BAD08 ; <- DAD08 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BAD25 ; <- DAD25 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BAD42 ; <- DAD42 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BAD5F ; <- DAD5F .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 
 ;== Ganon ==
 org $1BAE17 ; <- DAE17 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BAE34 ; <- DAE34 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BAE51 ; <- DAE51 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BAE88 ; <- DAE88 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1BAEBE ; <- DAEBE .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 org $1BAEC8 ; <- DAEC8 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1BAEE6 ; <- DAEE6 .
-db !VOLUME_DC ; $DC
+db #VOLUME_DC ; $DC
 org $1BAF04 ; <- DAF04 .
-db !VOLUME_B4 ; $B4
+db #VOLUME_B4 ; $B4
 org $1BAF2E ; <- DAF2E .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BAF55 ; <- DAF55 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BAF6B ; <- DAF6B .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BAF81 ; <- DAF81 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BAFAC ; <- DAFAC .
-db !VOLUME_A0 ; $A0
+db #VOLUME_A0 ; $A0
 
 ;== Falling into the Ganon fight ==
 org $1BB14F ; <- DB14F .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BB16B ; <- DB16B .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BB180 ; <- DB180 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BB195 ; <- DB195 .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BB1AA ; <- DB1AA .
-db !VOLUME_C8 ; $C8
+db #VOLUME_C8 ; $C8
 org $1BB1BF ; <- DB1BF .
-db !VOLUME_DC ; $DC
\ No newline at end of file
+db #VOLUME_DC ; $DC
diff --git a/newhud.asm b/newhud.asm
index db4d144..dfc3ca4 100644
--- a/newhud.asm
+++ b/newhud.asm
@@ -1,8 +1,7 @@
 NewDrawHud:
-SEP #$30
+        SEP #$30
 ;================================================================================
 ; Draw bomb count
-!BOMBCOUNT_DRAW_ADDRESS = "$7EC75A"
 ;================================================================================
 
 	LDA.l InfiniteBombs : BNE .infinite_bombs
@@ -10,54 +9,50 @@ SEP #$30
 		LDA.l BombsEquipment ; bombs
 		JSR HudHexToDec2Digit ;requires 8 bit registers!
 		REP #$20
-		LDX.b $06 : TXA : ORA.w #$2400 : STA !BOMBCOUNT_DRAW_ADDRESS ; Draw bombs 10 digit
-		LDX.b $07 : TXA : ORA.w #$2400 : STA !BOMBCOUNT_DRAW_ADDRESS+2 ; Draw bombs 1 digit
+		LDX.b Scrap06 : TXA : ORA.w #$2400 : STA.l HUDBombCount ; Draw bombs 10 digit
+		LDX.b Scrap07 : TXA : ORA.w #$2400 : STA.l HUDBombCount+2 ; Draw bombs 1 digit
 		BRA +
 
 	.infinite_bombs
 		REP #$20
-		LDA.w #$2431 : STA !BOMBCOUNT_DRAW_ADDRESS ; infinity (left half)
-		INC A        : STA !BOMBCOUNT_DRAW_ADDRESS+2 ; infinity (right half)
+		LDA.w #$2431 : STA.l HUDBombCount ; infinity (left half)
+		INC A        : STA.l HUDBombCount+2 ; infinity (right half)
 	+
 
 ;================================================================================
 ; Draw rupee counter
-!RUPEE_DRAW_ADDRESS = "$7EC750"
 ;================================================================================
 	
 	LDA.l DisplayRupees ; Drawing bombs (above) always ends with 16-bit A, so, no need to REP here
 	JSR HudHexToDec4Digit
-	LDX.b $04 : TXA : ORA.w #$2400 : STA !RUPEE_DRAW_ADDRESS	; 1000s
-	LDX.b $05 : TXA : ORA.w #$2400 : STA !RUPEE_DRAW_ADDRESS+2	;  100s
-	LDX.b $06 : TXA : ORA.w #$2400 : STA !RUPEE_DRAW_ADDRESS+4	;   10s
-	LDX.b $07 : TXA : ORA.w #$2400 : STA !RUPEE_DRAW_ADDRESS+6	;    1s
+	LDX.b Scrap04 : TXA : ORA.w #$2400 : STA.l HUDRupees   ; 1000s
+	LDX.b Scrap05 : TXA : ORA.w #$2400 : STA.l HUDRupees+2 ;  100s
+	LDX.b Scrap06 : TXA : ORA.w #$2400 : STA.l HUDRupees+4 ;   10s
+	LDX.b Scrap07 : TXA : ORA.w #$2400 : STA.l HUDRupees+6 ;    1s
 	
 ;================================================================================
 ; Draw arrow count
-!ARROWCOUNT_DRAW_ADDRESS = "$7EC760"
-!INFINITE_ARROWS = "$7F50C8"
 ;================================================================================
 
 	SEP #$20
 	LDA.l ArrowMode : BNE +
-		LDA !INFINITE_ARROWS : BNE .infinite_arrows
+		LDA.l InfiniteArrows : BNE .infinite_arrows
 		.finite_arrows
 			LDA.l CurrentArrows ; arrows
 			JSR HudHexToDec2Digit
 			REP #$20
-			LDX.b $06 : TXA : ORA.w #$2400 : STA !ARROWCOUNT_DRAW_ADDRESS ; Draw arrows 10 digit
-			LDX.b $07 : TXA : ORA.w #$2400 : STA !ARROWCOUNT_DRAW_ADDRESS+2 ; Draw arrows  1 digit
+			LDX.b Scrap06 : TXA : ORA.w #$2400 : STA.l HUDArrowCount ; Draw arrows 10 digit
+			LDX.b Scrap07 : TXA : ORA.w #$2400 : STA.l HUDArrowCount+2 ; Draw arrows  1 digit
 			BRA +
 		
 		.infinite_arrows
 			REP #$20
-			LDA.w #$2431 : STA !ARROWCOUNT_DRAW_ADDRESS ; infinity (left half)
-			INC A        : STA !ARROWCOUNT_DRAW_ADDRESS+2 ; infinity (right half)
+			LDA.w #$2431 : STA.l HUDArrowCount ; infinity (left half)
+			INC A        : STA.l HUDArrowCount+2 ; infinity (right half)
 	+
 	
 ;================================================================================
 ; Draw Goal Item Indicator
-!GOAL_DRAW_ADDRESS = "$7EC72A"
 ;================================================================================
 
 	REP #$20
@@ -66,25 +61,25 @@ SEP #$30
         LDA.l GoalCounter
         JSR HudHexToDec4Digit
 
-	LDA.l GoalItemIcon : STA.l !GOAL_DRAW_ADDRESS ; draw star icon
+	LDA.l GoalItemIcon : STA.l HUDGoalIndicator ; draw star icon
 	
-	LDX.b $05 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+2 ; draw 100's digit
-	LDX.b $06 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+4 ; draw 10's digit
-	LDX.b $07 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+6 ; draw 1's digit
+	LDX.b Scrap05 : TXA : ORA.w #$2400 : STA.l HUDGoalIndicator+2 ; draw 100's digit
+	LDX.b Scrap06 : TXA : ORA.w #$2400 : STA.l HUDGoalIndicator+4 ; draw 10's digit
+	LDX.b Scrap07 : TXA : ORA.w #$2400 : STA.l HUDGoalIndicator+6 ; draw 1's digit
 	
 	LDA.l GoalItemRequirement : CMP.w #$FFFF : BEQ .skip
 		LDA.l GoalItemRequirement
 		JSR HudHexToDec4Digit
-		LDA.w #$2830 : STA !GOAL_DRAW_ADDRESS+8 ; draw slash
-		LDX.b $05 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+10 ; draw 100's digit
-		LDX.b $06 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+12 ; draw 10's digit
-		LDX.b $07 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+14 ; draw 1's digit
+		LDA.w #$2830 : STA.l HUDGoalIndicator+8 ; draw slash
+		LDX.b Scrap05 : TXA : ORA.w #$2400 : STA.l HUDGoalIndicator+10 ; draw 100's digit
+		LDX.b Scrap06 : TXA : ORA.w #$2400 : STA.l HUDGoalIndicator+12 ; draw 10's digit
+		LDX.b Scrap07 : TXA : ORA.w #$2400 : STA.l HUDGoalIndicator+14 ; draw 1's digit
 		BRA .done
 	.skip
 		LDA.w #$207F ; transparent tile
-		STA !GOAL_DRAW_ADDRESS+8
-		STA !GOAL_DRAW_ADDRESS+10
-		STA !GOAL_DRAW_ADDRESS+12
+		STA.l HUDGoalIndicator+8
+		STA.l HUDGoalIndicator+10
+		STA.l HUDGoalIndicator+12
 	.done
 	
 ;================================================================================
@@ -96,8 +91,6 @@ SEP #$30
 
 ;================================================================================
 ; Draw key count
-!KEY_DIGITS_ADDRESS = "$7EC764"
-!KEY_ICON_ADDRESS = "$7EC726"
 ;================================================================================
 	SEP #$20
 	LDA.l CurrentSmallKeys : CMP.b #$FF : BEQ .not_in_dungeon
@@ -105,21 +98,21 @@ SEP #$30
 		JSR HudHexToDec2Digit : REP #$20
 		
 		; if 10s digit is 0, draw transparent tile instead of 0
-		LDX.b $06 : TXA : CPX.b #$90 : BNE +
+		LDX.b Scrap06 : TXA : CPX.b #$90 : BNE +
 			LDA.w #$007F 
 		+
-		ORA.w #$2400 : STA !KEY_DIGITS_ADDRESS
+		ORA.w #$2400 : STA.l HUDKeyDigits
 		
 		; 1s digit
-		LDX.b $07 : TXA : ORA.w #$2400 : STA !KEY_DIGITS_ADDRESS+2
+		LDX.b Scrap07 : TXA : ORA.w #$2400 : STA.l HUDKeyDigits+2
 		BRA .done_keys
 		
 	.not_in_dungeon
 	REP #$20
 	
 	;in the overworld, draw transparent tiles instead of key count
-	LDA.w #$247F : STA !KEY_DIGITS_ADDRESS : STA !KEY_DIGITS_ADDRESS+2
-	STA !KEY_ICON_ADDRESS
+	LDA.w #$247F : STA.l HUDKeyDigits : STA.l HUDKeyDigits+2
+	STA.l HUDKeyIcon
 	
 	.done_keys
 
@@ -129,7 +122,6 @@ SEP #$30
 ;--------------------------------------------------------------------------------
 ; Draw pendant/crystal icon
 ;--------------------------------------------------------------------------------
-!PRIZE_ICON = $7EC742
 !P_ICON = $296C
 !C_ICON = $295F
 
@@ -141,7 +133,7 @@ SEP #$30
 	CPX #$04 : !BLT .noprize
 	CPX #$08 : BEQ .noprize
 
-	LDA $10 : CMP #$12 : BEQ .noprize
+	LDA.b $10 : CMP #$12 : BEQ .noprize
 
 	LDA.l MapMode
 	REP #$20
@@ -168,54 +160,53 @@ SEP #$30
 	LDA.w #$207F
 
 .doneprize
-	STA.l !PRIZE_ICON
+	STA.l HUDPrizeIcon
 
 ;--------------------------------------------------------------------------------
 ; Draw Magic Meter
-!INFINITE_MAGIC = "$7F50CA"
-!DrawMagicMeter_mp_tilemap = "$0DFE0F" 
+DrawMagicMeter_mp_tilemap = $0DFE0F
 ;--------------------------------------------------------------------------------
-	LDA CurrentMagic : AND #$00FF ; crap we wrote over when placing the hook for OnDrawHud
+	LDA.l CurrentMagic : AND.w #$00FF ; crap we wrote over when placing the hook for OnDrawHud
 	!ADD #$0007
-	AND #$FFF8
+	AND.w #$FFF8
 	TAX						 ; end of crap
 	
-	LDA !INFINITE_MAGIC : AND.w #$00FF : BNE + : JMP .green : +
-	SEP #$20 : LDA.b #$80 : STA CurrentMagic : REP #$30 ; set magic to max
+	LDA.l InfiniteMagic : AND.w #$00FF : BNE + : JMP .green : +
+	SEP #$20 : LDA.b #$80 : STA.l CurrentMagic : REP #$30 ; set magic to max
 	LDX.w #$0080 ; load full magic meter graphics
-	LDA $1A : AND.w #$000C : LSR #2
+	LDA.b $1A : AND.w #$000C : LSR #2
 	BEQ .red
 	CMP.w #0001 : BEQ .yellow
 	CMP.w #0002 : BNE + : JMP .green : +
 	.blue
-	    LDA !DrawMagicMeter_mp_tilemap+0, X : AND.w #$EFFF : STA $7EC746
-	    LDA !DrawMagicMeter_mp_tilemap+2, X : AND.w #$EFFF : STA $7EC786
-	    LDA !DrawMagicMeter_mp_tilemap+4, X : AND.w #$EFFF : STA $7EC7C6
-	    LDA !DrawMagicMeter_mp_tilemap+6, X : AND.w #$EFFF : STA $7EC806
-		RTL
+	    LDA.l DrawMagicMeter_mp_tilemap+0, X : AND.w #$EFFF : STA.l $7EC746
+	    LDA.l DrawMagicMeter_mp_tilemap+2, X : AND.w #$EFFF : STA.l $7EC786
+	    LDA.l DrawMagicMeter_mp_tilemap+4, X : AND.w #$EFFF : STA.l $7EC7C6
+	    LDA.l DrawMagicMeter_mp_tilemap+6, X : AND.w #$EFFF : STA.l $7EC806
+            RTL
 	.red
-	    LDA !DrawMagicMeter_mp_tilemap+0, X : AND.w #$E7FF : STA $7EC746
-	    LDA !DrawMagicMeter_mp_tilemap+2, X : AND.w #$E7FF : STA $7EC786
-	    LDA !DrawMagicMeter_mp_tilemap+4, X : AND.w #$E7FF : STA $7EC7C6
-	    LDA !DrawMagicMeter_mp_tilemap+6, X : AND.w #$E7FF : STA $7EC806
-		RTL
+	    LDA.l DrawMagicMeter_mp_tilemap+0, X : AND.w #$E7FF : STA.l $7EC746
+	    LDA.l DrawMagicMeter_mp_tilemap+2, X : AND.w #$E7FF : STA.l $7EC786
+	    LDA.l DrawMagicMeter_mp_tilemap+4, X : AND.w #$E7FF : STA.l $7EC7C6
+	    LDA.l DrawMagicMeter_mp_tilemap+6, X : AND.w #$E7FF : STA.l $7EC806
+            RTL
 	.yellow
-	    LDA !DrawMagicMeter_mp_tilemap+0, X : AND.w #$EBFF : STA $7EC746
-	    LDA !DrawMagicMeter_mp_tilemap+2, X : AND.w #$EBFF : STA $7EC786
-	    LDA !DrawMagicMeter_mp_tilemap+4, X : AND.w #$EBFF : STA $7EC7C6
-	    LDA !DrawMagicMeter_mp_tilemap+6, X : AND.w #$EBFF : STA $7EC806
-		RTL
+	    LDA.l DrawMagicMeter_mp_tilemap+0, X : AND.w #$EBFF : STA.l $7EC746
+	    LDA.l DrawMagicMeter_mp_tilemap+2, X : AND.w #$EBFF : STA.l $7EC786
+	    LDA.l DrawMagicMeter_mp_tilemap+4, X : AND.w #$EBFF : STA.l $7EC7C6
+	    LDA.l DrawMagicMeter_mp_tilemap+6, X : AND.w #$EBFF : STA.l $7EC806
+            RTL
 	.orange
-	    LDA !DrawMagicMeter_mp_tilemap+0, X : AND.w #$E3FF : STA $7EC746
-	    LDA !DrawMagicMeter_mp_tilemap+2, X : AND.w #$E3FF : STA $7EC786
-	    LDA !DrawMagicMeter_mp_tilemap+4, X : AND.w #$E3FF : STA $7EC7C6
-	    LDA !DrawMagicMeter_mp_tilemap+6, X : AND.w #$E3FF : STA $7EC806
-		RTL
+	    LDA.l DrawMagicMeter_mp_tilemap+0, X : AND.w #$E3FF : STA.l $7EC746
+	    LDA.l DrawMagicMeter_mp_tilemap+2, X : AND.w #$E3FF : STA.l $7EC786
+	    LDA.l DrawMagicMeter_mp_tilemap+4, X : AND.w #$E3FF : STA.l $7EC7C6
+	    LDA.l DrawMagicMeter_mp_tilemap+6, X : AND.w #$E3FF : STA.l $7EC806
+            RTL
 	.green
-	    LDA !DrawMagicMeter_mp_tilemap+0, X : STA $7EC746
-	    LDA !DrawMagicMeter_mp_tilemap+2, X : STA $7EC786
-	    LDA !DrawMagicMeter_mp_tilemap+4, X : STA $7EC7C6
-	    LDA !DrawMagicMeter_mp_tilemap+6, X : STA $7EC806
+	    LDA.l DrawMagicMeter_mp_tilemap+0, X : STA.l $7EC746
+	    LDA.l DrawMagicMeter_mp_tilemap+2, X : STA.l $7EC786
+	    LDA.l DrawMagicMeter_mp_tilemap+4, X : STA.l $7EC7C6
+	    LDA.l DrawMagicMeter_mp_tilemap+6, X : STA.l $7EC806
 RTL
 
 ;================================================================================
@@ -230,25 +221,25 @@ HudHexToDec4Digit:
 		INY
 		SBC.w #1000 : BRA -
 	+
-	STY $04 : LDY #$90 ; Store 1000s digit & reset Y
+	STY.b Scrap04 : LDY.b #$90 ; Store 1000s digit & reset Y
 	-
 		CMP.w #100 : !BLT +
 		INY
 		SBC.w #100 : BRA -
 	+
-	STY $05 : LDY #$90 ; Store 100s digit & reset Y
+	STY.b Scrap05 : LDY.b #$90 ; Store 100s digit & reset Y
 	-
 		CMP.w #10 : !BLT +
 		INY
 		SBC.w #10 : BRA -
 	+ 
-	STY $06 : LDY #$90 ; Store 10s digit & reset Y
+	STY.b Scrap06 : LDY.b #$90 ; Store 10s digit & reset Y
 	CMP.w #1 : !BLT +
 	-
 		INY
 		DEC : BNE -
 	+
-	STY $07 ; Store 1s digit
+	STY.b Scrap07 ; Store 1s digit
 RTS
 
 ;================================================================================
@@ -290,11 +281,11 @@ HudHexToDec2Digit:
 		INY
 		SBC.b #10 : BRA -
 	+ 
-	STY $06 : LDY #$90 ; Store 10s digit and reset Y
+	STY.b Scrap06 : LDY.b #$90 ; Store 10s digit and reset Y
 	CMP.b #1 : !BLT +
 	-
 		INY
 		DEC : BNE -
 	+
-	STY $07	; Store 1s digit
+	STY.b Scrap07 ; Store 1s digit
 RTS
diff --git a/newitems.asm b/newitems.asm
index 2891759..06c0306 100755
--- a/newitems.asm
+++ b/newitems.asm
@@ -48,25 +48,6 @@
 ; 0xF1 - freestanding heart 2 / boss heart / npc
 ; 0xF3 - tablet/pedestal
 ;--------------------------------------------------------------------------------
-;GetAnimatedSpriteGfxFile:
-;    LDY.b #$32
-;    CMP.b #$39 : BCS +      ; If tile index >= 0x39, use sprite file 0x32 (Blank file)
-;
-;    LDY.b #$5D
-;
-;    CMP.b #$23 : BEQ +      ; If tile index is 0x23 (Pendant)...
-;    CMP.b #$37 : BCS +      ; ...or tile index >= 0x37, use sprite file 0x5D (Pendant, Boots, 20 Rupees)
-;
-;    LDY.b #$5C
-;
-;    CMP.b #$0C : BEQ +      ; If tile index is 0x0C (Flute)...
-;    CMP.b #$24 : BCS +      ; ...or tile index >= 24, use sprite file 0x5C (Rupees, Crystal, Heart Piece ... ...)
-;
-;    ; Otherwise, use sprite file 0x5B (Medallions, Mirror, Flippers, Lantern, Compass...)
-;    LDY.b #$5B
-;+
-;JML GetAnimatedSpriteGfxFile_return
-;--------------------------------------------------------------------------------
 GetAnimatedSpriteGfxFile:
     CMP.b #$0C : BNE +
 		LDY.b #$5C : JML GetAnimatedSpriteGfxFile_return
@@ -119,7 +100,7 @@ dw $0A50 ; Power Star
 
 GetAnimatedSpriteBufferPointer:
 	;PHB : PHK : PLB
-	LDA.b $00 : ADC.l GetAnimatedSpriteBufferPointer_table, X
+	LDA.b Scrap00 : ADC.l GetAnimatedSpriteBufferPointer_table, X
 	;PLB
 RTL
 ;--------------------------------------------------------------------------------
@@ -146,30 +127,29 @@ endmacro
 ;carry set if caught
 ;incsrc eventdata.asm
 ProcessEventItems:
-	;STA $FFFFFF
-	LDA $00 : PHA
-	LDA $01 : PHA
-	LDA $02 : PHA
+	LDA.b Scrap00 : PHA
+	LDA.b Scrap01 : PHA
+	LDA.b Scrap02 : PHA
 	PHY : PHP
 	PHB : LDA.b #$AF : PHA : PLB
-		LDA $02D8
+		LDA.w ItemReceiptID
 		CMP.b #$E0 : BNE +
 			REP #$30 ; set 16-bit accumulator & index registers
-			LDA RNGItem : ASL : TAX
-			LDA.l EventDataOffsets, X : !ADD #EventDataTable : STA $00
+			LDA.l RNGItem : ASL : TAX
+			LDA.l EventDataOffsets, X : !ADD #EventDataTable : STA.b Scrap00
 
 			SEP #$20 ; set 8-bit accumulator
-			LDA.b #$AF : STA $02
+			LDA.b #$AF : STA.b Scrap02
 
 			JSL.l LoadDialogAddressIndirect
-			LDA RNGItem : INC : STA RNGItem
+			LDA.l RNGItem : INC : STA.l RNGItem
 
 			SEP #$10 ; set 8-bit index registers
                         REP #$20 ; set 16-bit accumulator
-			LDA GoalItemRequirement : BEQ ++
-			LDA GoalCounter : INC : STA GoalCounter
-			CMP GoalItemRequirement : !BLT ++
-			LDA TurnInGoalItems : AND.w #$00FF : BNE ++
+			LDA.l GoalItemRequirement : BEQ ++
+			LDA.l GoalCounter : INC : STA.l GoalCounter
+			CMP.l GoalItemRequirement : !BLT ++
+			LDA.l TurnInGoalItems : AND.w #$00FF : BNE ++
 				JSL.l ActivateGoal
 			++
                         SEP #$20 ; set 8-bit accumulator
@@ -179,71 +159,71 @@ ProcessEventItems:
 	.done
 	PLB
 	PLP : PLY
-	PLA : STA $02
-	PLA : STA $01
-	PLA : STA $00
+	PLA : STA.b Scrap02
+	PLA : STA.b Scrap01
+	PLA : STA.b Scrap00
 RTS
 ;--------------------------------------------------------------------------------
 AddReceivedItemExpandedGetItem:
 	PHX
 
-	LDA $02D8 ; check inventory
+	LDA.w ItemReceiptID ; check inventory
 	JSL.l FreeDungeonItemNotice
 	CMP.b #$0B : BNE + ; Bow
-		LDA BowTracking : AND.b #$40 : BEQ ++
+		LDA.l BowTracking : AND.b #$40 : BEQ ++
 		LDA.l SilverArrowsUseRestriction : BNE ++
-			LDA.b #03 : STA BowEquipment ; set bow to silver
+			LDA.b #03 : STA.l BowEquipment ; set bow to silver
 		++
 		JMP .done
 	+ CMP.b #$3B : BNE + ; Silver Bow
 		LDA.l SilverArrowsUseRestriction : BNE .noequip
 		LDA.l SilverArrowsAutoEquip : AND.b #$01 : BEQ .noequip
-		LDA ArrowsFiller : BNE ++ ; check arrows
+		LDA.l ArrowsFiller : BNE ++ ; check arrows
 			LDA.b #$03 : BRA +++ ; bow without arrow
 		++
 			LDA.b #$04 ; bow with arrow
 		+++
-		STA BowEquipment
+		STA.l BowEquipment
 		.noequip
-		LDA BowTracking : ORA #$40 : STA BowTracking ; mark silver bow on y-toggle
+		LDA.l BowTracking : ORA.b #$40 : STA.l BowTracking ; mark silver bow on y-toggle
 		JMP .done
 	+ CMP.b #$4C : BNE + ; 50 bombs
-		LDA.b #50 : STA BombCapacity ; upgrade bombs
-		LDA.b #50 : STA BombsFiller ; fill bombs
+		LDA.b #50 : STA.l BombCapacity ; upgrade bombs
+		LDA.b #50 : STA.l BombsFiller ; fill bombs
 		JMP .done
 	+ CMP.b #$4D : BNE + ; 70 arrows
-		LDA.b #70 : STA ArrowCapacity ; upgrade arrows
-		LDA.b #70 : STA ArrowsFiller ; fill arrows
+		LDA.b #70 : STA.l ArrowCapacity ; upgrade arrows
+		LDA.b #70 : STA.l ArrowsFiller ; fill arrows
 		JMP .done
 	+ CMP.b #$4E : BNE + ; 1/2 magic
-		LDA MagicConsumption : CMP #$02 : !BGE ++
-			INC : STA MagicConsumption ; upgrade magic
+		LDA.l MagicConsumption : CMP.b #$02 : !BGE ++
+			INC : STA.l MagicConsumption ; upgrade magic
 		++
-		LDA.b #$80 : STA MagicFiller ; fill magic
+		LDA.b #$80 : STA.l MagicFiller ; fill magic
 		JMP .done
 	+ CMP.b #$4F : BNE + ; 1/4 magic
-		LDA.b #$02 : STA MagicConsumption ; upgrade magic
-		LDA.b #$80 : STA MagicFiller ; fill magic
+		LDA.b #$02 : STA.l MagicConsumption ; upgrade magic
+		LDA.b #$80 : STA.l MagicFiller ; fill magic
 		JMP .done
 	+ CMP.b #$50 : BNE + ; Master Sword (Safe)
-		LDA SwordEquipment : CMP.b #$02 : !BGE + ; skip if we have a better sword
-		LDA.b #$02 : STA SwordEquipment ; set master sword
+		LDA.l SwordEquipment : CMP.b #$02 : !BGE + ; skip if we have a better sword
+		LDA.b #$02 : STA.l SwordEquipment ; set master sword
 		JMP .done
 	+ CMP.b #$51 : BNE + ; +5 Bombs
-		LDA BombCapacity : !ADD.b #$05 : STA BombCapacity ; upgrade bombs +5
-		LDA.l Upgrade5BombsRefill : STA BombsFiller ; fill bombs
+		LDA.l BombCapacity : !ADD.b #$05 : STA.l BombCapacity ; upgrade bombs +5
+		LDA.l Upgrade5BombsRefill : STA.l BombsFiller ; fill bombs
 		JMP .done
 	+ CMP.b #$52 : BNE + ; +10 Bombs
-		LDA BombCapacity : !ADD.b #$0A : STA BombCapacity ; upgrade bombs +10
-		LDA.l Upgrade10BombsRefill : STA BombsFiller ; fill bombs
+		LDA.l BombCapacity : !ADD.b #$0A : STA.l BombCapacity ; upgrade bombs +10
+		LDA.l Upgrade10BombsRefill : STA.l BombsFiller ; fill bombs
 		JMP .done
 	+ CMP.b #$53 : BNE + ; +5 Arrows
-		LDA ArrowCapacity : !ADD.b #$05 : STA ArrowCapacity ; upgrade arrows +5
-		LDA.l Upgrade5ArrowsRefill : STA ArrowsFiller ; fill arrows
+		LDA.l ArrowCapacity : !ADD.b #$05 : STA.l ArrowCapacity ; upgrade arrows +5
+		LDA.l Upgrade5ArrowsRefill : STA.l ArrowsFiller ; fill arrows
 		JMP .done
 	+ CMP.b #$54 : BNE + ; +10 Arrows
-		LDA ArrowCapacity : !ADD.b #$0A : STA ArrowCapacity ; upgrade arrows +10
-		LDA.l Upgrade10ArrowsRefill : STA ArrowsFiller ; fill arrows
+		LDA.l ArrowCapacity : !ADD.b #$0A : STA.l ArrowCapacity ; upgrade arrows +10
+		LDA.l Upgrade10ArrowsRefill : STA.l ArrowsFiller ; fill arrows
 		JMP .done
 	+ CMP.b #$55 : BNE + ; Programmable Object 1
 		%ProgrammableItemLogic(1)
@@ -257,34 +237,34 @@ AddReceivedItemExpandedGetItem:
 	+ CMP.b #$58 : BNE + ; Upgrade-Only Sivler Arrows
 		LDA.l SilverArrowsUseRestriction : BNE +++
 		LDA.l SilverArrowsAutoEquip : AND.b #$01 : BEQ +++
-			LDA BowEquipment : BEQ ++ : CMP.b #$03 : !BGE ++
-				!ADD.b #$02 : STA BowEquipment ; switch to silver bow
+			LDA.l BowEquipment : BEQ ++ : CMP.b #$03 : !BGE ++
+				!ADD.b #$02 : STA.l BowEquipment ; switch to silver bow
 			++
 		+++
 		LDA.l ArrowMode : BEQ ++
-			LDA.b #$01 : STA ArrowsFiller
+			LDA.b #$01 : STA.l ArrowsFiller
 		++
 	+ CMP.b #$59 : BNE + ; 1 Rupoor
-		REP #$20 : LDA CurrentRupees : !SUB RupoorDeduction : STA CurrentRupees : SEP #$20 ; Take 1 rupee
+		REP #$20 : LDA.l CurrentRupees : !SUB RupoorDeduction : STA.l CurrentRupees : SEP #$20 ; Take 1 rupee
 		JMP .done
 	+ CMP.b #$5A : BNE + ; Null Item
 		JMP .done
 	+ CMP.b #$5B : BNE + ; Red Clock
 		REP #$20 ; set 16-bit accumulator
-		LDA ChallengeTimer : !ADD.l RedClockAmount : STA ChallengeTimer
-		LDA ChallengeTimer+2 : ADC.l RedClockAmount+2 : STA ChallengeTimer+2
+		LDA.l ChallengeTimer : !ADD.l RedClockAmount : STA.l ChallengeTimer
+		LDA.l ChallengeTimer+2 : ADC.l RedClockAmount+2 : STA.l ChallengeTimer+2
 		SEP #$20 ; set 8-bit accumulator
 		JMP .done
 	+ CMP.b #$5C : BNE + ; Blue Clock
 		REP #$20 ; set 16-bit accumulator
-		LDA ChallengeTimer : !ADD.l BlueClockAmount : STA ChallengeTimer
-		LDA ChallengeTimer+2 : ADC.l BlueClockAmount+2 : STA ChallengeTimer+2
+		LDA.l ChallengeTimer : !ADD.l BlueClockAmount : STA.l ChallengeTimer
+		LDA.l ChallengeTimer+2 : ADC.l BlueClockAmount+2 : STA.l ChallengeTimer+2
 		SEP #$20 ; set 8-bit accumulator
 		JMP .done
 	+ CMP.b #$5D : BNE + ; Green Clock
 		REP #$20 ; set 16-bit accumulator
-		LDA ChallengeTimer : !ADD.l GreenClockAmount : STA ChallengeTimer
-		LDA ChallengeTimer+2 : ADC.l GreenClockAmount+2 : STA ChallengeTimer+2
+		LDA.l ChallengeTimer : !ADD.l GreenClockAmount : STA.l ChallengeTimer
+		LDA.l ChallengeTimer+2 : ADC.l GreenClockAmount+2 : STA.l ChallengeTimer+2
 		SEP #$20 ; set 8-bit accumulator
 		JMP .done
 	+ CMP.b #$5E : BNE + ; Progressive Sword
@@ -332,73 +312,67 @@ AddReceivedItemExpandedGetItem:
 	;	JSL.l ItemGetServiceRequest
 	;	JMP .done
 	+ CMP.b #$70 : !BLT + : CMP.b #$80 : !BGE + ; Free Map
-		AND #$0F : CMP #$08 : !BGE ++
+		AND.b #$0F : CMP.b #$08 : !BGE ++
 			%ValueShift()
-			ORA MapField : STA MapField ; Map 1
+			ORA.l MapField : STA.l MapField ; Map 1
 			JMP .done
 		++
 			!SUB #$08
 			%ValueShift()
 			BIT.b #$C0 : BEQ +++ : LDA.b #$C0 : +++ ; Make Hyrule Castle / Sewers Count for Both
-			ORA MapField+1 : STA MapField+1 ; Map 2
+			ORA.l MapField+1 : STA.l MapField+1 ; Map 2
 		JMP .done
 	+ CMP.b #$80 : !BLT + : CMP.b #$90 : !BGE + ; Free Compass
-		AND #$0F : CMP #$08 : !BGE ++
+		AND.b #$0F : CMP.b #$08 : !BGE ++
 			%ValueShift()
-			ORA CompassField : STA CompassField ; Compass 1
+			ORA.l CompassField : STA.l CompassField ; Compass 1
 			JMP .done
 		++
 			!SUB #$08
 			%ValueShift()
 			BIT.b #$C0 : BEQ +++ : LDA.b #$C0 : +++ ; Make Hyrule Castle / Sewers Count for Both
-			ORA CompassField+1 : STA CompassField+1 ; Compass 2
+			ORA.l CompassField+1 : STA.l CompassField+1 ; Compass 2
 		JMP .done
 	+ CMP.b #$90 : !BLT + : CMP.b #$A0 : !BGE + ; Free Big Key
-		AND #$0F : CMP #$08 : !BGE ++
+		AND.b #$0F : CMP.b #$08 : !BGE ++
 			%ValueShift()
-			ORA BigKeyField : STA BigKeyField ; Big Key 1
+			ORA.l BigKeyField : STA.l BigKeyField ; Big Key 1
 			JMP .done
 		++
 			!SUB #$08
 			%ValueShift()
 			BIT.b #$C0 : BEQ +++ : LDA.b #$C0 : +++ ; Make Hyrule Castle / Sewers Count for Both
-			ORA BigKeyField+1 : STA BigKeyField+1 ; Big Key 2
+			ORA.l BigKeyField+1 : STA.l BigKeyField+1 ; Big Key 2
 		JMP .done
 	+ CMP.b #$A0 : !BLT + : CMP.b #$B0 : !BGE + ; Free Small Key
-		AND #$0F : TAX
-		LDA DungeonKeys, X : INC : STA DungeonKeys, X ; Increment Key Count
+		AND.b #$0F : TAX
+		LDA.l DungeonKeys, X : INC : STA.l DungeonKeys, X ; Increment Key Count
 
 		CPX.b #$00 : BNE ++
-			STA HyruleCastleKeys ; copy HC to sewers
+			STA.l HyruleCastleKeys ; copy HC to sewers
 		++ : CPX.b #$01 : BNE ++
-			STA SewerKeys ; copy sewers to HC
+			STA.l SewerKeys ; copy sewers to HC
 		++
 
 		LDA.l GenericKeys : BEQ +
 		.generic
-			LDA CurrentSmallKeys : INC : STA CurrentSmallKeys
+			LDA.l CurrentSmallKeys : INC : STA.l CurrentSmallKeys
 			JMP .done
 		.normal
-			TXA : ASL : CMP $040C : BNE ++
-				LDA CurrentSmallKeys : INC : STA CurrentSmallKeys
+			TXA : ASL : CMP.w $040C : BNE ++
+				LDA.l CurrentSmallKeys : INC : STA.l CurrentSmallKeys
 			++
 			JMP .done
 	+
 	.done
 	PLX
-	LDA $02E9 : CMP.b #$01 ; thing we wrote over
+	LDA.w $02E9 : CMP.b #$01 ; thing we wrote over
 RTL
 ; #$70 - Maps
 ; #$80 - Compasses
 ; #$90 - Big Keys
 ; #$A0 - Small Keys
 ;--------------------------------------------------------------------------------
-!SCRATCH_AREA = "$7F5020"
-!SINGLE_INDEX_TEMP = "$7F5020"
-!SINGLE_INDEX_OFFSET_TEMP = "$7F5021"
-!SINGLE_INDEX_BITMASK_TEMP = "$7F5022"
-!LOCK_IN = "$7F5090"
-!ITEM_BUSY = "$7F5091"
 ;2B:Bottle Already Filled w/ Red Potion
 ;2C:Bottle Already Filled w/ Green Potion
 ;2D:Bottle Already Filled w/ Blue Potion
@@ -410,97 +384,97 @@ AddReceivedItemExpanded:
 	PHA : PHX
 		JSL.l PreItemGet
 
-		LDA $02D8 ; Item Value
+		LDA.w ItemReceiptID ; Item Value
 		JSR AttemptItemSubstitution
-		STA $02D8
+		STA.w ItemReceiptID
 
 		JSR IncrementItemCounters
 
 		CMP.b #$16 : BNE ++ ; Bottle
 			JSR.w CountBottles : CMP.l BottleLimit : !BLT +++
-				LDA.l BottleLimitReplacement : STA $02D8
+				LDA.l BottleLimitReplacement : STA.w ItemReceiptID
 			+++ : JMP .done
 		++ : CMP.b #$2B : BNE ++ ; Red Potion w/bottle
 			JSR.w CountBottles : CMP.l BottleLimit : !BLT +++
-				LDA.l BottleLimitReplacement : STA $02D8
+				LDA.l BottleLimitReplacement : STA.w ItemReceiptID
 			+++ : JMP .done
 		++ : CMP.b #$2C : BNE ++ ; Green Potion w/bottle
 			JSR.w CountBottles : CMP.l BottleLimit : !BLT +++
-				LDA.l BottleLimitReplacement : STA $02D8
+				LDA.l BottleLimitReplacement : STA.w ItemReceiptID
 			+++ : JMP .done
 		++ : CMP.b #$2D : BNE ++ ; Blue Potion w/bottle
 			JSR.w CountBottles : CMP.l BottleLimit : !BLT +++
-				LDA.l BottleLimitReplacement : STA $02D8
+				LDA.l BottleLimitReplacement : STA.w ItemReceiptID
 			+++ : JMP .done
 		++ : CMP.b #$3C : BNE ++ ; Bee w/bottle
 			JSR.w CountBottles : CMP.l BottleLimit : !BLT +++
-				LDA.l BottleLimitReplacement : STA $02D8
+				LDA.l BottleLimitReplacement : STA.w ItemReceiptID
 			+++ : JMP .done
 		++ : CMP.b #$3D : BNE ++ ; Fairy w/bottle
 			JSR.w CountBottles : CMP.l BottleLimit : !BLT +++
-				LDA.l BottleLimitReplacement : STA $02D8
+				LDA.l BottleLimitReplacement : STA.w ItemReceiptID
 			+++ : JMP .done
 		++ : CMP.b #$48 : BNE ++ ; Gold Bee w/bottle
 			JSR.w CountBottles : CMP.l BottleLimit : !BLT +++
-				LDA.l BottleLimitReplacement : STA $02D8
+				LDA.l BottleLimitReplacement : STA.w ItemReceiptID
 			+++ : JMP .done
 		++ : CMP.b #$4E : BNE ++ ; Progressive Magic
-			LDA MagicConsumption : BEQ +++
-				LDA.b #$4F : STA $02D8
+			LDA.l MagicConsumption : BEQ +++
+				LDA.b #$4F : STA.w ItemReceiptID
 			+++ : JMP .done
 		++ : CMP.b #$5E : BNE ++ ; Progressive Sword
-			LDA HighestSword : CMP.l ProgressiveSwordLimit : !BLT +
-				LDA.l ProgressiveSwordReplacement : STA $02D8 : JMP .done
+			LDA.l HighestSword : CMP.l ProgressiveSwordLimit : !BLT +
+				LDA.l ProgressiveSwordReplacement : STA.w ItemReceiptID : JMP .done
 			+ : CMP.b #$00 : BNE + ; No Sword
-				LDA.b #$49 : STA $02D8 : JMP .done
+				LDA.b #$49 : STA.w ItemReceiptID : JMP .done
 			+ : CMP.b #$01 : BNE + ; Fighter Sword
-				LDA.b #$50 : STA $02D8 : JMP .done
+				LDA.b #$50 : STA.w ItemReceiptID : JMP .done
 			+ : CMP.b #$02 : BNE + ; Master Sword
-				LDA.b #$02 : STA $02D8 : JMP .done
+				LDA.b #$02 : STA.w ItemReceiptID : JMP .done
 			+ ; Everything Else
-				LDA.b #$03 : STA $02D8 : JMP .done
+				LDA.b #$03 : STA.w ItemReceiptID : JMP .done
 		++ : CMP.b #$5F : BNE ++ ; Progressive Shield
-			LDA HighestShield : CMP.l ProgressiveShieldLimit : !BLT +
-				LDA.l ProgressiveShieldReplacement : STA $02D8 : JMP .done
+			LDA.l HighestShield : CMP.l ProgressiveShieldLimit : !BLT +
+				LDA.l ProgressiveShieldReplacement : STA.w ItemReceiptID : JMP .done
 			+ : CMP.b #$00 : BNE + ; No Shield
-				LDA.b #$04 : STA $02D8 : JMP .done
+				LDA.b #$04 : STA.w ItemReceiptID : JMP .done
 			+ : CMP.b #$01 : BNE + ; Fighter Shield
-				LDA.b #$05 : STA $02D8 : JMP .done
+				LDA.b #$05 : STA.w ItemReceiptID : JMP .done
 			+ ; Everything Else
-				LDA.b #$06 : STA $02D8 : JMP .done
+				LDA.b #$06 : STA.w ItemReceiptID : JMP .done
 		++ : CMP.b #$60 : BNE ++ ; Progressive Armor
-			LDA HighestMail : CMP.l ProgressiveArmorLimit : !BLT +
-				LDA.l ProgressiveArmorReplacement : STA $02D8 : JMP .done
+			LDA.l HighestMail : CMP.l ProgressiveArmorLimit : !BLT +
+				LDA.l ProgressiveArmorReplacement : STA.w ItemReceiptID : JMP .done
 			+ : CMP.b #$00 : BNE + ; No Armor
-				LDA.b #$22 : STA $02D8 : JMP .done
+				LDA.b #$22 : STA.w ItemReceiptID : JMP .done
 			+ ; Everything Else
-				LDA.b #$23 : STA $02D8 : JMP .done
+				LDA.b #$23 : STA.w ItemReceiptID : JMP .done
 		++ : CMP.b #$61 : BNE ++ ; Progressive Lifting Glove
-			LDA GloveEquipment : BNE + ; No Lift
-				LDA.b #$1B : STA $02D8 : BRA .done
+			LDA.l GloveEquipment : BNE + ; No Lift
+				LDA.b #$1B : STA.w ItemReceiptID : BRA .done
 			+ ; Everything Else
-				LDA.b #$1C : STA $02D8 : BRA .done
+				LDA.b #$1C : STA.w ItemReceiptID : BRA .done
 		++ : CMP.b #$64 : BNE ++ : -- ; Progressive Bow
-			LDA BowEquipment : INC : LSR : CMP.l ProgressiveBowLimit : !BLT +
-				LDA.l ProgressiveBowReplacement : STA $02D8 : JMP .done
+			LDA.l BowEquipment : INC : LSR : CMP.l ProgressiveBowLimit : !BLT +
+				LDA.l ProgressiveBowReplacement : STA.w ItemReceiptID : JMP .done
 			+ : CMP.b #$00 : BNE + ; No Bow
-				LDA.b #$3A : STA $02D8 : BRA .done
+				LDA.b #$3A : STA.w ItemReceiptID : BRA .done
 			+ ; Any Bow
-				LDA.b #$3B : STA $02D8 : BRA .done
+				LDA.b #$3B : STA.w ItemReceiptID : BRA .done
 		++ : CMP.b #$65 : BNE ++ ; Progressive Bow 2
-			LDA.l BowTracking : ORA #$20 : STA.l BowTracking
+			LDA.l BowTracking : ORA.b #$20 : STA.l BowTracking
 			BRA --
 		; ++ : CMP.b #$FE : BNE ++ ; Server Request (Null Chest)
 		;	JSL ChestItemServiceRequest
 		;	BRA .done
 		++ : CMP.b #$62 : BNE ++ ; RNG Item (Single)
-			JSL.l GetRNGItemSingle : STA $02D8
+			JSL.l GetRNGItemSingle : STA.w ItemReceiptID
 			XBA : JSR.w MarkRNGItemSingle
-			LDA #$FF : STA !LOCK_IN ; clear lock-in
+			LDA.b #$FF : STA.l RNGLockIn ; clear lock-in
 			BRA .done
 		++ : CMP.b #$63 : BNE ++ ; RNG Item (Multi)
-			JSL.l GetRNGItemMulti : STA $02D8
-			LDA #$FF : STA !LOCK_IN ; clear lock-in
+			JSL.l GetRNGItemMulti : STA.w ItemReceiptID
+			LDA.b #$FF : STA.l RNGLockIn ; clear lock-in
 			BRA .done
 		++
 		.done
@@ -892,37 +866,24 @@ Link_ReceiveItemAlternatesExpanded:
 ;--------------------------------------------------------------------------------
 .loadAlternate
 	PHB : PHK : PLB
-		;TYA : JSR IncrementItemCounters
-		;LDA Link_ReceiveItemAlternatesExpanded, Y : STA $03
-		TYA : JSR AttemptItemSubstitution : STA $03
-		CPY $03 : BNE + : LDA.b #$FF : STA $03 : +
+		TYA : JSR AttemptItemSubstitution : STA.b Scrap03
+		CPY.b Scrap03 : BNE + : LDA.b #$FF : STA.b Scrap03 : +
 	PLB
 RTL
 ;--------------------------------------------------------------------------------
-;DrawHUDSilverArrows:
-;	LDA BowEquipment : AND.w #$00FF : BNE +
-;		LDA BowTracking : AND.w #$0040 : BEQ +
-;	        LDA.w #$2810 : STA $11C8
-;	        LDA.w #$2811 : STA $11CA
-;	        LDA.w #$2820 : STA $1208
-;	        LDA.w #$2821 : STA $120A
-;	+
-;	LDA.w #$11CE : STA $00 ; thing we wrote over
-;RTL
-;--------------------------------------------------------------------------------
 ;Return BowEquipment but also draw silver arrows if you have the upgrade even if you don't have the bow
 CheckHUDSilverArrows:
 	LDA.l ArrowMode : BEQ .normal
 	.rupee_arrows
 		JSL.l DrawHUDArrows
-		LDA BowEquipment
+		LDA.l BowEquipment
 		RTL
 	.normal
-	LDA BowEquipment : BNE +
-		LDA BowTracking : AND.b #$40 : BEQ ++
+	LDA.l BowEquipment : BNE +
+		LDA.l BowTracking : AND.b #$40 : BEQ ++
 			JSL.l DrawHUDArrows
 		++
-		LDA BowEquipment
+		LDA.l BowEquipment
 	+
 RTL
 ;--------------------------------------------------------------------------------
@@ -930,73 +891,68 @@ DrawHUDArrows:
 LDA.l ArrowMode : BEQ .normal
 	.rupee_arrows
 
-	LDA CurrentArrows : BEQ .none ; assuming silvers will increment this. if we go with something else, reorder these checks
-	LDA BowEquipment : BNE +
-	LDA BowTracking : AND.b #$40 : BNE .silver
+	LDA.l CurrentArrows : BEQ .none ; assuming silvers will increment this. if we go with something else, reorder these checks
+	LDA.l BowEquipment : BNE +
+	LDA.l BowTracking : AND.b #$40 : BNE .silver
 	BRA .wooden
 	+ CMP.b #03 : !BGE .silver
 
 	.wooden
-	LDA.b #$A7 : STA $7EC720 ; draw wooden arrow marker
-	LDA.b #$20 : STA $7EC721
-	LDA.b #$A9 : STA $7EC722
-	LDA.b #$20 : STA $7EC723
+	LDA.b #$A7 : STA.l $7EC720 ; draw wooden arrow marker
+	LDA.b #$20 : STA.l $7EC721
+	LDA.b #$A9 : STA.l $7EC722
+	LDA.b #$20 : STA.l $7EC723
 RTL
 	.normal ; in normal arrow mode this function is only ever called for silvers
 	.silver
-	LDA.b #$86 : STA $7EC720 ; draw silver arrow marker
-	LDA.b #$24 : STA $7EC721
-	LDA.b #$87 : STA $7EC722
-	LDA.b #$24 : STA $7EC723
+	LDA.b #$86 : STA.l $7EC720 ; draw silver arrow marker
+	LDA.b #$24 : STA.l $7EC721
+	LDA.b #$87 : STA.l $7EC722
+	LDA.b #$24 : STA.l $7EC723
 RTL
 	.none
-	LDA.b #$7F : STA $7EC720 ; draw no arrow marker
-	LDA.b #$24 : STA $7EC721
-	LDA.b #$7F : STA $7EC722
-	LDA.b #$24 : STA $7EC723
+	LDA.b #$7F : STA.l $7EC720 ; draw no arrow marker
+	LDA.b #$24 : STA.l $7EC721
+	LDA.b #$7F : STA.l $7EC722
+	LDA.b #$24 : STA.l $7EC723
 RTL
 ;--------------------------------------------------------------------------------
-!SCRATCH_AREA = "$7F5020"
-!SINGLE_INDEX_TEMP = "$7F5020"
-!SINGLE_INDEX_OFFSET_TEMP = "$7F5021"
-!SINGLE_INDEX_BITMASK_TEMP = "$7F5022"
-!LOCK_IN = "$7F5090"
 GetRNGItemSingle:
 	PHY
-		LDA !LOCK_IN : CMP.b #$FF : BEQ + : TAX : XBA : LDA.l RNGSingleItemTable, X : RTL : +
+		LDA.l RNGLockIn : CMP.b #$FF : BEQ + : TAX : XBA : LDA.l RNGSingleItemTable, X : RTL : +
 		LDX.b #$00
 		.single_reroll
 			JSL.l GetRandomInt : AND.b #$7F ; select random value
-			INX : CPX #$7F : !BLT + : LDA.b #$00 : BRA +++ : + ; default to 0 if too many attempts
+			INX : CPX.b #$7F : !BLT + : LDA.b #$00 : BRA +++ : + ; default to 0 if too many attempts
 			CMP.l RNGSingleTableSize : !BGE .single_reroll
 		+++
 
-		STA !SINGLE_INDEX_TEMP ; put our index value here
-		LDX #$00
+		STA.w ScratchBufferV ; put our index value here
+		LDX.b #$00
 		TAY
 		.recheck
 			TYA
 			JSR.w CheckSingleItem : BEQ .single_unused ; already used
-				LDA !SINGLE_INDEX_TEMP : INC ; increment index
+				LDA.w ScratchBufferV : INC ; increment index
 				CMP.l RNGSingleTableSize : !BLT +++ : LDA.b #$00 : +++ ; rollover index if needed
-				STA !SINGLE_INDEX_TEMP ; store index
+				STA.w ScratchBufferV ; store index
 				INX : TAY : TXA : CMP.l RNGSingleTableSize : !BLT .recheck
 				LDA.b #$5A ; everything is gone, default to null item - MAKE THIS AN OPTION FOR THIS AND THE OTHER ONE
 				BRA .single_done
 		.single_unused
-			LDA !SINGLE_INDEX_TEMP
+			LDA.w ScratchBufferV
 		.single_done
 			TAX : LDA.l RNGSingleItemTable, X
-			XBA : LDA.l !SINGLE_INDEX_TEMP : STA !LOCK_IN : XBA
+			XBA : LDA.w ScratchBufferV : STA.l RNGLockIn : XBA
 	PLY
 RTL
 ;--------------------------------------------------------------------------------
 CheckSingleItem:
 	LSR #3 : TAX
-	LDA.l RNGItem, X : STA !SINGLE_INDEX_BITMASK_TEMP ; load value to temporary
+	LDA.l RNGItem, X : STA.w ScratchBufferV+2 ; load value to temporary
 	PHX
-		LDA !SINGLE_INDEX_TEMP : AND #$07 : TAX ; load 0-7 part into X
-		LDA !SINGLE_INDEX_BITMASK_TEMP
+		LDA.w ScratchBufferV : AND.b #$07 : TAX ; load 0-7 part into X
+		LDA.w ScratchBufferV+2
 		---
 		CPX.b #$00 : BEQ +++
 			LSR
@@ -1008,12 +964,10 @@ CheckSingleItem:
 RTS
 ;--------------------------------------------------------------------------------
 MarkRNGItemSingle:
-	;STA !SINGLE_INDEX_TEMP
-
-	LSR #3 : STA !SINGLE_INDEX_OFFSET_TEMP : TAX
+	LSR #3 : STA.w ScratchBufferV+1 : TAX
 	LDA.l RNGItem, X
-	STA.l !SINGLE_INDEX_BITMASK_TEMP
-	LDA.l !SINGLE_INDEX_TEMP : AND #$07 : TAX ; load 0-7 part into X
+	STA.w ScratchBufferV+2
+	LDA.w ScratchBufferV : AND.b #$07 : TAX ; load 0-7 part into X
 	LDA.b #01
 	---
 	CPX.b #$00 : BEQ +++
@@ -1023,21 +977,21 @@ MarkRNGItemSingle:
 	+++
 
 	PHA
-		LDA.l !SINGLE_INDEX_OFFSET_TEMP : TAX
+		LDA.w ScratchBufferV+1 : TAX
 	PLA
-	ORA.l !SINGLE_INDEX_BITMASK_TEMP
+	ORA.w ScratchBufferV+2
 	STA.l RNGItem, X
 RTS
 ;--------------------------------------------------------------------------------
 GetRNGItemMulti:
-	LDA !LOCK_IN : CMP #$FF : BEQ + : TAX : XBA : LDA.l RNGMultiItemTable, X : RTL : +
+	LDA.l RNGLockIn : CMP.b #$FF : BEQ + : TAX : XBA : LDA.l RNGMultiItemTable, X : RTL : +
 	LDX.b #$00
 	- ; reroll
 		JSL.l GetRandomInt : AND.b #$7F ; select random value
-		INX : CPX #$7F : !BLT + : LDA.b 00 : BRA .done : + ; default to 0 if too many attempts
+		INX : CPX.b #$7F : !BLT + : LDA.b 00 : BRA .done : + ; default to 0 if too many attempts
 		CMP.l RNGMultiTableSize : !BGE -
 	.done
-	STA !LOCK_IN
+	STA.l RNGLockIn
 	TAX : XBA : LDA.l RNGMultiItemTable, X
 RTL
 ;--------------------------------------------------------------------------------
@@ -1047,11 +1001,11 @@ IncrementItemCounters:
 		-
 			LDA.l ItemSubstitutionRules, X
 			CMP.b #$FF : BEQ .exit
-			CMP 1,s : BNE .noMatch
+			CMP.b 1,s : BNE .noMatch
 				.match
 					PHX
 						TXA : LSR #2 : TAX
-						LDA ItemLimitCounts, X : INC : STA ItemLimitCounts, X
+						LDA.l ItemLimitCounts, X : INC : STA.l ItemLimitCounts, X
 					PLX
 					BEQ .exit
 				.noMatch
@@ -1062,53 +1016,52 @@ IncrementItemCounters:
 RTS
 ;--------------------------------------------------------------------------------
 AttemptItemSubstitution:
-	PHX : PHA
-	LDX.b #$00
-	-
-		LDA.l ItemSubstitutionRules, X
-		CMP.b #$FF : BEQ .exit
-		CMP 1,s : BNE .noMatch
-			.match
-				PHX
-					TXA : LSR #2 : TAX
-					LDA ItemLimitCounts, X
-				PLX
-				CMP.l ItemSubstitutionRules+1, X : !BLT +
-					LDA.l ItemSubstitutionRules+2, X : STA 1,s
-				+
-				BEQ .exit
-			.noMatch
-				INX #4
-	BRA -
-.exit
-	PLA : PLX
+        PHX : PHA
+        LDX.b #$00
+        -
+                LDA.l ItemSubstitutionRules, X
+                CMP.b #$FF : BEQ .exit
+                CMP.b 1,s : BNE .noMatch
+                        .match
+                        PHX
+                        TXA : LSR #2 : TAX
+                        LDA.l ItemLimitCounts, X
+                        PLX
+                        CMP.l ItemSubstitutionRules+1, X : !BLT +
+                                LDA.l ItemSubstitutionRules+2, X : STA.b 1,s
+                        +: BEQ .exit
+                        .noMatch
+                                INX #4
+                                BRA -
+        .exit
+        PLA : PLX
 RTS
 ;--------------------------------------------------------------------------------
 CountBottles:
-    PHX
+        PHX
         LDX.b #$00
-        LDA BottleContentsOne : BEQ ++ : INX
-        ++ : LDA BottleContentsTwo : BEQ ++ : INX
-        ++ : LDA BottleContentsThree : BEQ ++ : INX
-        ++ : LDA BottleContentsFour : BEQ ++ : INX
+        LDA.l BottleContentsOne : BEQ ++ : INX
+        ++ : LDA.l BottleContentsTwo : BEQ ++ : INX
+        ++ : LDA.l BottleContentsThree : BEQ ++ : INX
+        ++ : LDA.l BottleContentsFour : BEQ ++ : INX
         ++
         TXA
     PLX
 RTS
 ;--------------------------------------------------------------------------------
 ActivateGoal:
-    STZ $11
-    STZ $B0
+        STZ.b $11
+        STZ.b $B0
 JML.l StatsFinalPrep
 ;--------------------------------------------------------------------------------
 ChestPrep:
-	LDA.b #$01 : STA $02E9
+	LDA.b #$01 : STA.w $02E9
         JSL.l IncrementChestCounter
 	LDA.l ServerRequestMode : BEQ +
 		JSL.l ChestItemServiceRequest
 		RTL
 	+
-    LDY $0C ; get item value
+    LDY.b $0C ; get item value
 	SEC
 RTL
 ;--------------------------------------------------------------------------------
@@ -1116,44 +1069,44 @@ RTL
 ; counts on
 MaybeFlagCompassTotalPickup:
         LDA.l CompassMode : AND.b #$0F : BEQ .done
-        LDA $040C : CMP #$FF : BEQ .done
-        LSR : STA $04 : LDA #$0F : !SUB $04 ; Compute flag "index"
-        CPY #$25 : BEQ .setFlag             ; Set flag if it's a compass for this dungeon
-                STA $04
-                TYA : AND #$0F : CMP $04 : BNE .done ; Check if compass is for this dungeon
+        LDA.w $040C : CMP.b #$FF : BEQ .done
+        LSR : STA.b Scrap04 : LDA.b #$0F : !SUB Scrap04    ; Compute flag "index"
+        CPY.b #$25 : BEQ .setFlag                          ; Set flag if it's a compass for this dungeon
+                STA.b Scrap04
+                TYA : AND.b #$0F : CMP.b Scrap04 : BNE .done ; Check if compass is for this dungeon
                         .setFlag
-                        CMP #$08 : !BGE ++
+                        CMP.b #$08 : !BGE ++
                                 %ValueShift()
-                                ORA CompassCountDisplay : STA CompassCountDisplay
+                                ORA.l CompassCountDisplay : STA.l CompassCountDisplay
                                 BRA .done
                         ++
                                 !SUB #$08
                                 %ValueShift()
                                 BIT.b #$C0 : BEQ + : LDA.b #$C0 : + ; Make Hyrule Castle / Sewers Count for Both
-                                ORA CompassCountDisplay+1 : STA CompassCountDisplay+1
+                                ORA.l CompassCountDisplay+1 : STA.l CompassCountDisplay+1
         .done
 RTL
 ;--------------------------------------------------------------------------------
 ; Set the compass count display flag if we're entering a dungeon and alerady have
 ; that compass
 MaybeFlagCompassTotalEntrance:
-        LDX $040C : CPX #$FF : BEQ .done ; Skip if we're not entering dungeon
+        LDX.w $040C : CPX.b #$FF : BEQ .done         ; Skip if we're not entering dungeon
         LDA.l CompassMode : AND.w #$000F : BEQ .done ; Skip if we're not showing compass counts
         CMP.w #$0002 : BEQ .countShown
-                LDA CompassField : AND.l DungeonItemMasks, X : BEQ .done ; skip if we don't have compass
+                LDA.l CompassField : AND.l DungeonItemMasks, X : BEQ .done ; skip if we don't have compass
                 .countShown
                 SEP #$20
-                TXA : LSR : STA.b $04 : LDA.b #$0F : !SUB $04 ; Compute flag "index"
-                CMP #$08 : !BGE ++
+                TXA : LSR : STA.b Scrap04 : LDA.b #$0F : !SUB Scrap04 ; Compute flag index
+                CMP.b #$08 : !BGE ++
                         %ValueShift()
-                        ORA CompassCountDisplay : STA CompassCountDisplay
+                        ORA.l CompassCountDisplay : STA.l CompassCountDisplay
                         REP #$20
                         BRA .done
                 ++
                         !SUB #$08
                         %ValueShift()
                         BIT.b #$C0 : BEQ + : LDA.b #$C0 : + ; Make Hyrule Castle / Sewers Count for Both
-                        ORA CompassCountDisplay+1 : STA CompassCountDisplay+1
+                        ORA.l CompassCountDisplay+1 : STA.l CompassCountDisplay+1
                         REP #$20
         .done
 RTL
diff --git a/password.asm b/password.asm
index 4e71af0..10123b1 100644
--- a/password.asm
+++ b/password.asm
@@ -1,8 +1,8 @@
-!PASSWORD_CODE_POSITION = "$C8"
-!PASSWORD_SELECTION_POSITION = "$C9"
+PASSWORD_CODE_POSITION = $C8
+PASSWORD_SELECTION_POSITION = $C9
 
 Module_Password:
-	LDA $11
+	LDA.b $11
 
 	JSL.l UseImplicitRegIndexedLongJumpTable
 
@@ -13,35 +13,34 @@ Module_Password:
 	dl Password_Return ; 4
 
 Password_BeginInit:
-	LDA.b #$80 : STA $0710 ;skip animated sprite updates in NMI
+	LDA.b #$80 : STA.w $0710 ;skip animated sprite updates in NMI
 
 	JSL EnableForceBlank
 	JSL Vram_EraseTilemaps_triforce
-	;JSL Palette_SelectScreen
 
 	JSL LoadCustomHudPalette ; replace the 2bpp palettes, and trigger upload
-	LDA.b #$07 : STA $14 ; have NMI load up the initial tilemap from Password_Tilemap
+	LDA.b #$07 : STA.b $14 ; have NMI load up the initial tilemap from Password_Tilemap
 
-	INC $11
+	INC.b $11
 RTL
 
 Password_EndInit:
-	JSR LoadPasswordStripeTemplate
+        JSR LoadPasswordStripeTemplate
 
-	;reset the variables used by this screen
-	STZ !PASSWORD_CODE_POSITION
-	STZ !PASSWORD_SELECTION_POSITION
+        ;reset the variables used by this screen
+        STZ.b PASSWORD_CODE_POSITION
+        STZ.b PASSWORD_SELECTION_POSITION
 
-	JSL ValidatePassword : BNE +
-		; zero out password if not valid
-		LDX.b #$0F
-		LDA.b #$00
-		-
-			STA.l PasswordSRAM, X
-		DEX : BPL -
+        JSL ValidatePassword : BNE +
+                ; zero out password if not valid
+                LDX.b #$0F
+                LDA.b #$00
+                -
+                STA.l PasswordSRAM, X
+                DEX : BPL -
 	+
 
-	LDA.b #$0F : STA $13
+	LDA.b #$0F : STA.b $13
 	INC $11
 RTL
 
@@ -52,70 +51,70 @@ Password_Main:
     JSR PasswordEraseOldCursors
 
 	; handle joypad input
-	LDA $F6 : AND.b #$10 : BEQ + ; R Button
+	LDA.b $F6 : AND.b #$10 : BEQ + ; R Button
 		JSR PasswordMoveCursorRight
 	+
-	LDA $F6 : AND.b #$20 : BEQ + ; L Button
+	LDA.b $F6 : AND.b #$20 : BEQ + ; L Button
 		JSR PasswordMoveCursorLeft
 	+
-	LDA $F4 : AND.b #$01 : BEQ + ; right
-		LDA !PASSWORD_SELECTION_POSITION : INC A : CMP.b #$24 : !BLT ++
+	LDA.b $F4 : AND.b #$01 : BEQ + ; right
+		LDA.b PASSWORD_SELECTION_POSITION : INC A : CMP.b #$24 : !BLT ++
 			!SUB.b #$24
 		++
-		STA !PASSWORD_SELECTION_POSITION
-		LDA.b #$20 : STA $012F
+		STA.b PASSWORD_SELECTION_POSITION
+		LDA.b #$20 : STA.w $012F
 	+
-	LDA $F4 : AND.b #$02 : BEQ + ; left
-		LDA !PASSWORD_SELECTION_POSITION : DEC A : BPL ++
+	LDA.b $F4 : AND.b #$02 : BEQ + ; left
+		LDA.b PASSWORD_SELECTION_POSITION : DEC A : BPL ++
 			!ADD.b #$24
 		++
-		STA !PASSWORD_SELECTION_POSITION
-		LDA.b #$20 : STA $012F
+		STA.b PASSWORD_SELECTION_POSITION
+		LDA.b #$20 : STA.w $012F
 	+
-	LDA $F4 : AND.b #$04 : BEQ + ; down
-		LDA !PASSWORD_SELECTION_POSITION : !ADD.b #$09 : CMP.b #$24 : !BLT ++
+	LDA.b $F4 : AND.b #$04 : BEQ + ; down
+		LDA.b PASSWORD_SELECTION_POSITION : !ADD.b #$09 : CMP.b #$24 : !BLT ++
 			!SUB.b #$24
 		++
-		STA !PASSWORD_SELECTION_POSITION
-		LDA.b #$20 : STA $012F
+		STA.b PASSWORD_SELECTION_POSITION
+		LDA.b #$20 : STA.w $012F
 	+
-	LDA $F4 : AND.b #$08 : BEQ + ; up
-		LDA !PASSWORD_SELECTION_POSITION : !SUB.b #$09 :  BPL ++
+	LDA.b $F4 : AND.b #$08 : BEQ + ; up
+		LDA.b PASSWORD_SELECTION_POSITION : !SUB.b #$09 :  BPL ++
 			!ADD.b #$24
 		++
-		STA !PASSWORD_SELECTION_POSITION
-		LDA.b #$20 : STA $012F
+		STA.b PASSWORD_SELECTION_POSITION
+		LDA.b #$20 : STA.w $012F
 	+
-	LDA $F4 : ORA $F6 : AND.b #$C0 : BEQ + ; face button
-		LDX !PASSWORD_SELECTION_POSITION
+	LDA.b $F4 : ORA.b $F6 : AND.b #$C0 : BEQ + ; face button
+		LDX.b PASSWORD_SELECTION_POSITION
 		LDA.l .selectionValues, X : BPL ++
-			CMP #$F0 :  BNE +++
+			CMP.b #$F0 :  BNE +++
 				INC $11
 				BRA .endOfButtonChecks
-			+++ : CMP #$F1 :  BNE +++
+			+++ : CMP.b #$F1 :  BNE +++
 				JSR PasswordMoveCursorLeft
 				BRA +
-			+++ : CMP #$F2 :  BNE +++
+			+++ : CMP.b #$F2 :  BNE +++
 				JSR PasswordMoveCursorRight
 				BRA +
-			+++ : CMP #$F3 :  BNE +++
+			+++ : CMP.b #$F3 :  BNE +++
 				INC $11 : INC $11 ; skip to return submodule
-				LDA.b #$2C : STA $012E ;file screen selection sound
+				LDA.b #$2C : STA.w $012E ;file screen selection sound
 				BRA .endOfButtonChecks
 			+++
 			BRA +
 		++
-		LDX !PASSWORD_CODE_POSITION
-		STA PasswordSRAM,X
-		TXA : INC A : AND.b #$0F : STA !PASSWORD_CODE_POSITION
+		LDX.b PASSWORD_CODE_POSITION
+		STA.l PasswordSRAM,X
+		TXA : INC A : AND.b #$0F : STA.b PASSWORD_CODE_POSITION
 		BNE ++
-			STZ $012E
+			STZ.w $012E
 			INC $11
 			BRA .endOfButtonChecks
 		++
-		LDA.b #$2B : STA $012E
+		LDA.b #$2B : STA.w $012E
 	+
-	LDA $F4 : AND.b #$10 : BEQ + ; start
+	LDA.b $F4 : AND.b #$10 : BEQ + ; start
 		INC $11
 	+
 	.endOfButtonChecks
@@ -123,7 +122,7 @@ Password_Main:
 	JSR UpdatePasswordTiles
 
 	JSR PasswordSetNewCursors
-	LDA.b #$01 : STA $14
+	LDA.b #$01 : STA.b $14
 	PLB
 RTL
 .selectionValues
@@ -134,17 +133,17 @@ db $19, $1A, $1B, $1C, $1D, $1E, $1F, $20, $F3
 
 Password_Check:
 	JSL.l ValidatePassword : BNE .correct
-	LDA.b #$3C : STA $012E ; error
+	LDA.b #$3C : STA.w $012E ; error
 	DEC $11
 RTL
 	.correct
-	LDA.b #$1B : STA $012F ; solved puzzle sound
+	LDA.b #$1B : STA.w $012F ; solved puzzle sound
 	INC $11
 RTL
 
 Password_Return:
-	LDA.b #$01 : STA $10 ; select screen
-	LDA.b #$01 : STA $11 ; Skip the first submodule
+	LDA.b #$01 : STA.w $10 ; select screen
+	LDA.b #$01 : STA.w $11 ; Skip the first submodule
 	STZ $B0
 	STZ $0B9D ; Reset file screen cursor pre-selection
 	STZ $C8
@@ -162,7 +161,7 @@ ValidatePassword:
 	PHX : PHY
 
 	;check for incomplete password
-	LDX #$0F
+	LDX.b #$0F
 	-
 		LDA.l PasswordSRAM, X : BNE +
 		 	JMP .incorrect
@@ -174,45 +173,45 @@ ValidatePassword:
 	; Clear out any existing encryption key
 	LDX.b #$0E
 	LDA.w #$0000
-	- :	STA.l !keyBase, X : DEX #2 : BPL -
+	- :	STA.l KeyBase, X : DEX #2 : BPL -
 
 	JSR PasswordToKey
 
 
-	LDA.l StaticDecryptionKey+$0A : STA.l !keyBase+$0A
-	LDA.l StaticDecryptionKey+$0C : STA.l !keyBase+$0C
-	LDA.l StaticDecryptionKey+$0E : STA.l !keyBase+$0E
+	LDA.l StaticDecryptionKey+$0A : STA.l KeyBase+$0A
+	LDA.l StaticDecryptionKey+$0C : STA.l KeyBase+$0C
+	LDA.l StaticDecryptionKey+$0E : STA.l KeyBase+$0E
 
-	LDA.l KnownEncryptedValue   : STA.l !CryptoBuffer
-	LDA.l KnownEncryptedValue+2 : STA.l !CryptoBuffer+2
-	LDA.l KnownEncryptedValue+4 : STA.l !CryptoBuffer+4
-	LDA.l KnownEncryptedValue+6 : STA.l !CryptoBuffer+6
+	LDA.l KnownEncryptedValue   : STA.l CryptoBuffer
+	LDA.l KnownEncryptedValue+2 : STA.l CryptoBuffer+2
+	LDA.l KnownEncryptedValue+4 : STA.l CryptoBuffer+4
+	LDA.l KnownEncryptedValue+6 : STA.l CryptoBuffer+6
 
-	LDA.w #$0002 : STA $04 ;set block size
+	LDA.w #$0002 : STA.b $04 ;set block size
 
 	JSL.l XXTEA_Decode
 
 	SEP #$20 ; 8 bit accumulator
 
-	LDA !CryptoBuffer+0 : CMP #$31 : BNE .incorrect
-	LDA !CryptoBuffer+1 : CMP #$41 : BNE .incorrect
-	LDA !CryptoBuffer+2 : CMP #$59 : BNE .incorrect
-	LDA !CryptoBuffer+3 : CMP #$26 : BNE .incorrect
-	LDA !CryptoBuffer+4 : CMP #$53 : BNE .incorrect
-	LDA !CryptoBuffer+5 : CMP #$58 : BNE .incorrect
-	LDA !CryptoBuffer+6 : CMP #$97 : BNE .incorrect
-	LDA !CryptoBuffer+7 : CMP #$93 : BNE .incorrect
+	LDA.l CryptoBuffer+0 : CMP.b #$31 : BNE .incorrect
+	LDA.l CryptoBuffer+1 : CMP.b #$41 : BNE .incorrect
+	LDA.l CryptoBuffer+2 : CMP.b #$59 : BNE .incorrect
+	LDA.l CryptoBuffer+3 : CMP.b #$26 : BNE .incorrect
+	LDA.l CryptoBuffer+4 : CMP.b #$53 : BNE .incorrect
+	LDA.l CryptoBuffer+5 : CMP.b #$58 : BNE .incorrect
+	LDA.l CryptoBuffer+6 : CMP.b #$97 : BNE .incorrect
+	LDA.l CryptoBuffer+7 : CMP.b #$93 : BNE .incorrect
 
 	;trial decrypt the known plaintext, and verify if result is correct
 
 	.correct
 	PLY : PLX
 
-	LDA #$01 : STA.l !ValidKeyLoaded
+	LDA.b #$01 : STA.l ValidKeyLoaded
 RTL
 	.incorrect
 	PLY : PLX
-	LDA #$00
+	LDA.b #$00
 RTL
 
 ;--------------------------------------------------------------------------------
@@ -223,75 +222,69 @@ PasswordToKey:
 	; $00 input offset
 	; $02 output offset
 	; $04 shift amount
-	LDA.w #$0000 : STA $00 : STA $02
-	LDA.w #$000B : STA $04
+	LDA.w #$0000 : STA.b $00 : STA.b $02
+	LDA.w #$000B : STA.b $04
 	-
-		LDX $00
-		LDA PasswordSRAM, X : DEC : AND #$001F
-		LDY $04
+		LDX.b $00
+		LDA.l PasswordSRAM, X : DEC : AND.w #$001F
+		LDY.b $04
 		-- : BEQ + : ASL : DEY : BRA -- : + ; Shift left by Y
 		XBA
-		LDX $02
-		ORA !keyBase, X
-		STA !keyBase, X
+		LDX.b $02
+		ORA.l KeyBase, X
+		STA.l KeyBase, X
 
-		LDA $04 : !SUB.w #$0005 : BPL +
+		LDA.b $04 : !SUB.w #$0005 : BPL +
 			!ADD.w #$0008
 			INC $02
-		+ : STA $04
+		+ : STA.b $04
 
-	LDA $00 : INC : STA $00 : CMP.w #$0010 : !BLT -
+	LDA.b $00 : INC : STA.b $00 : CMP.w #$0010 : !BLT -
 RTS
 
 LoadPasswordStripeTemplate:
-	LDA $4300 : PHA : LDA $4301 : PHA :	LDA $4302 : PHA ; preserve DMA parameters
-	LDA $4303 : PHA : LDA $4304 : PHA :	LDA $4305 : PHA ; preserve DMA parameters
-	LDA $4306 : PHA ; preserve DMA parameters
+	LDA.w DMAP0 : PHA : LDA.w BBAD0 : PHA :	LDA.w A1T0L : PHA ; preserve DMA parameters
+	LDA.w A1T0H : PHA : LDA.w A1B0 : PHA :	LDA.w DAS0L : PHA ; preserve DMA parameters
+	LDA.w DAS0H : PHA ; preserve DMA parameters  
+  
+	LDA.b #$00 : STA.w DMAP0 ; set DMA transfer direction A -> B, bus A auto increment, single-byte mode
+	LDA.b #$80 : STA.w BBAD0 ; set bus B destination to WRAM register
 
-	LDA.b #$00 : STA $4300 ; set DMA transfer direction A -> B, bus A auto increment, single-byte mode
-	LDA.b #$80 : STA $4301 ; set bus B destination to WRAM register
+	LDA.b #$02 : STA.w WMADDL ; set WRAM register source address
+	LDA.b #$10 : STA.w WMADDH
+	LDA.b #$7E : STA.w WMADDB
 
-	LDA.b #$02 : STA $2181 ; set WRAM register source address
-	LDA.b #$10 : STA $2182
-	LDA.b #$7E : STA $2183
-
-	LDA.b #Password_StripeImageTemplate : STA $4302 ; set bus A source address
-	LDA.b #Password_StripeImageTemplate>>8 : STA $4303 ; set bus A source address
-	LDA.b #Password_StripeImageTemplate>>16 : STA $4304 ; set bus A source bank
+	LDA.b #Password_StripeImageTemplate : STA.w A1T0L ; set bus A source address
+	LDA.b #Password_StripeImageTemplate>>8 : STA.w A1T0H ; set bus A source address
+	LDA.b #Password_StripeImageTemplate>>16 : STA.w A1B0 ; set bus A source bank
 
 	LDA.b #Password_StripeImageTemplate_end-Password_StripeImageTemplate
-	STA $4305 ;
+	STA.w DAS0L ;
 	LDA.b #Password_StripeImageTemplate_end-Password_StripeImageTemplate>>8
-	STA $4306 ; set transfer size
+	STA.w DAS0H ; set transfer size
 
-	LDA #$01 : STA $420B ; begin DMA transfer
+	LDA.b #$01 : STA.w MDMAEN ; begin DMA transfer
 
-	PLA : STA $4306 : PLA : STA $4305 :	PLA : STA $4304 ; restore DMA parameters
-	PLA : STA $4303 : PLA : STA $4302 :	PLA : STA $4301 ; restore DMA parameters
-	PLA : STA $4300 ; restore DMA parameters
+	PLA : STA.w DAS0H : PLA : STA.w DAS0L :	PLA : STA.w A1B0 ; restore DMA parameters
+	PLA : STA.w A1T0H : PLA : STA.w A1T0L :	PLA : STA.w BBAD0 ; restore DMA parameters
+	PLA : STA.w DMAP0 ; restore DMA parameters
 RTS
 
-!PASSWORD_INPUT_START_X = $03
-!PASSWORD_INPUT_START_Y = $0D
-
-!PASSWORD_DISPLAY_START_X = $04
-!PASSWORD_DISPLAY_START_Y = $04
-
 PasswordEraseOldCursors:
 
 	REP #$20 ; set 16-bit accumulator
 
 	;Code Cursor
-	LDA !PASSWORD_CODE_POSITION : AND.w #$00FF : ASL : TAX
+	LDA.b PASSWORD_CODE_POSITION : AND.w #$00FF : ASL : TAX
 	LDA.l .code_offsets, X
-	!ADD.w #$20*!PASSWORD_DISPLAY_START_Y+!PASSWORD_DISPLAY_START_X+$6000
+	!ADD.w #$20*Scrap04+Scrap04+$6000
 	XBA ; because big endian is needed
 	STA.l $1002+Password_StripeImageTemplate_CodeCursorErase-Password_StripeImageTemplate
 
 	;selection cursor
-	LDA !PASSWORD_SELECTION_POSITION : AND.w #$00FF : ASL : TAX
+	LDA.b PASSWORD_SELECTION_POSITION : AND.w #$00FF : ASL : TAX
 	LDA.l .selection_offsets, X
-	!ADD.w #$20*!PASSWORD_INPUT_START_Y+!PASSWORD_INPUT_START_X+$6000
+	!ADD.w #$20*Scrap0D+Scrap03+$6000
 	XBA ; because big endian is needed
 	STA.l $1002+Password_StripeImageTemplate_SelectionCursorErase-Password_StripeImageTemplate
 	XBA : !ADD.w #$0020 : XBA
@@ -315,16 +308,16 @@ RTS
 PasswordSetNewCursors:
 	REP #$20 ; set 16-bit accumulator
 	;Code Cursor
-	LDA !PASSWORD_CODE_POSITION : AND.w #$00FF : ASL : TAX
+	LDA.b PASSWORD_CODE_POSITION : AND.w #$00FF : ASL : TAX
 	LDA.l PasswordEraseOldCursors_code_offsets, X
-	!ADD.w #$20*!PASSWORD_DISPLAY_START_Y+!PASSWORD_DISPLAY_START_X+$6000
+	!ADD.w #$20*Scrap04+Scrap04+$6000
 	XBA ; because big endian is needed
 	STA.l $1002+Password_StripeImageTemplate_CodeCursorDraw-Password_StripeImageTemplate
 
 	;Selection cursor
-	LDA !PASSWORD_SELECTION_POSITION : AND.w #$00FF : ASL : TAX
+	LDA.b PASSWORD_SELECTION_POSITION : AND.w #$00FF : ASL : TAX
 	LDA.l PasswordEraseOldCursors_selection_offsets, X
-	!ADD.w #$20*!PASSWORD_INPUT_START_Y+!PASSWORD_INPUT_START_X+$6000
+	!ADD.w #$20*Scrap0D+Scrap03+$6000
 	XBA ; because big endian is needed
 	STA.l $1002+Password_StripeImageTemplate_SelectionCursorDraw-Password_StripeImageTemplate
 	XBA : !ADD.w #$0020 : XBA
@@ -342,16 +335,16 @@ UpdatePasswordTiles:
 	LDX.w #$000F
 	-
 		LDA.l PasswordSRAM, X : AND.w #$00FF : TXY
-		ASL #3 : STA $00
-		TYA : ASL #4 : STA $03
-		LDX $00 : LDA.l HashAlphabetTilesWithBlank, X
-		LDX $03 : STA $1006, X
-		LDX $00 : LDA.l HashAlphabetTilesWithBlank+$02, X
-		LDX $03 : STA $1008, X
-		LDX $00 : LDA.l HashAlphabetTilesWithBlank+$04, X
-		LDX $03 : STA $100E, X
-		LDX $00 : LDA.l HashAlphabetTilesWithBlank+$06, X
-		LDX $03 : STA $1010, X
+		ASL #3 : STA.b $00
+		TYA : ASL #4 : STA.b $03
+		LDX.b $00 : LDA.l HashAlphabetTilesWithBlank, X
+		LDX.b $03 : STA.w $1006, X
+		LDX.b $00 : LDA.l HashAlphabetTilesWithBlank+$02, X
+		LDX.b $03 : STA.w $1008, X
+		LDX.b $00 : LDA.l HashAlphabetTilesWithBlank+$04, X
+		LDX.b $03 : STA.w $100E, X
+		LDX.b $00 : LDA.l HashAlphabetTilesWithBlank+$06, X
+		LDX.b $03 : STA.w $1010, X
 
 		TYX : DEX : BMI + : BRA -
 	+
@@ -360,13 +353,13 @@ RTS
 
 PasswordMoveCursorRight:
 	; return new code position
-	LDA.b #$2B : STA $012E
-	LDA !PASSWORD_CODE_POSITION : INC A : AND.b #$0F : STA !PASSWORD_CODE_POSITION
+	LDA.b #$2B : STA.w $012E
+	LDA.b PASSWORD_CODE_POSITION : INC A : AND.b #$0F : STA.b PASSWORD_CODE_POSITION
 RTS
 PasswordMoveCursorLeft:
 	; return new code position
-	LDA.b #$2B : STA $012E
-	LDA !PASSWORD_CODE_POSITION : DEC A : AND.b #$0F : STA !PASSWORD_CODE_POSITION
+	LDA.b #$2B : STA.w $012E
+	LDA.b PASSWORD_CODE_POSITION : DEC A : AND.b #$0F : STA.b PASSWORD_CODE_POSITION
 RTS
 
 macro dw_big_endian(value)
@@ -380,7 +373,7 @@ endmacro
 
 Password_Tilemap:
 ;Add any graphics for background 0 here
-%Layer3_VRAM_Address(!PASSWORD_INPUT_START_X,!PASSWORD_INPUT_START_Y+0)
+%Layer3_VRAM_Address(Scrap03,Scrap0D+0)
 %dw_big_endian(51) ;(9*4)+(8*2)-1
 dw #$0201|!FS_COLOR_YELLOW, #$0202|!FS_COLOR_YELLOW ;BOW
 dw #$0200
@@ -400,7 +393,7 @@ dw #$0285|!FS_COLOR_GREEN, #$0286|!FS_COLOR_GREEN ;PENDANT
 dw #$0200
 dw #$02AB|!FS_COLOR_BW, #$02AB|!FS_COLOR_BW ;placeholder upper half action button
 
-%Layer3_VRAM_Address(!PASSWORD_INPUT_START_X,!PASSWORD_INPUT_START_Y+1)
+%Layer3_VRAM_Address(Scrap03,Scrap0D+1)
 %dw_big_endian(51) ;(9*4)+(8*2)-1
 dw #$0211|!FS_COLOR_YELLOW, #$0212|!FS_COLOR_YELLOW ;BOW
 dw #$0200
@@ -420,7 +413,7 @@ dw #$0295|!FS_COLOR_GREEN, #$0296|!FS_COLOR_GREEN ;PENDANT
 dw #$0200
 dw #$02AB|!FS_COLOR_BW, #$02AB|!FS_COLOR_BW ;placeholder lower half action button
 
-%Layer3_VRAM_Address(!PASSWORD_INPUT_START_X,!PASSWORD_INPUT_START_Y+3)
+%Layer3_VRAM_Address(Scrap03,Scrap0D+3)
 %dw_big_endian(51) ;(9*4)+(8*2)-1
 dw #$0207|!FS_COLOR_YELLOW, #$0217|!FS_COLOR_YELLOW|!FS_HFLIP|!FS_VFLIP ;BOMBOS
 dw #$0200
@@ -440,7 +433,7 @@ dw #$0228|!FS_COLOR_YELLOW, #$0229|!FS_COLOR_YELLOW ;NET
 dw #$0200
 dw #$018A|!FS_COLOR_BW, #$0200 ; Left
 
-%Layer3_VRAM_Address(!PASSWORD_INPUT_START_X,!PASSWORD_INPUT_START_Y+4)
+%Layer3_VRAM_Address(Scrap03,Scrap0D+4)
 %dw_big_endian(51) ;(9*4)+(8*2)-1
 dw #$0217|!FS_COLOR_YELLOW, #$0207|!FS_COLOR_YELLOW|!FS_HFLIP|!FS_VFLIP ;BOMBOS
 dw #$0200
@@ -460,7 +453,7 @@ dw #$0238|!FS_COLOR_YELLOW, #$0239|!FS_COLOR_YELLOW ;NET
 dw #$0200
 dw #$019A|!FS_COLOR_BW, #$0200 ; Left
 
-%Layer3_VRAM_Address(!PASSWORD_INPUT_START_X,!PASSWORD_INPUT_START_Y+6)
+%Layer3_VRAM_Address(Scrap03,Scrap0D+6)
 %dw_big_endian(51) ;(9*4)+(8*2)-1
 dw #$022A|!FS_COLOR_GREEN, #$022B|!FS_COLOR_GREEN ;BOOK
 dw #$0200
@@ -480,7 +473,7 @@ dw #$024E|!FS_COLOR_BROWN, #$024F|!FS_COLOR_BROWN
 dw #$0200
 dw #$0200, #$018B|!FS_COLOR_BW ; Right
 
-%Layer3_VRAM_Address(!PASSWORD_INPUT_START_X,!PASSWORD_INPUT_START_Y+7)
+%Layer3_VRAM_Address(Scrap03,Scrap0D+7)
 %dw_big_endian(51) ;(9*4)+(8*2)-1
 dw #$023A|!FS_COLOR_GREEN, #$023B|!FS_COLOR_GREEN ;BOOK
 dw #$0200
@@ -500,7 +493,7 @@ dw #$025E|!FS_COLOR_BROWN, #$025F|!FS_COLOR_BROWN ;GLOVES
 dw #$0200
 dw #$0200, #$019B|!FS_COLOR_BW ; Right
 
-%Layer3_VRAM_Address(!PASSWORD_INPUT_START_X,!PASSWORD_INPUT_START_Y+9)
+%Layer3_VRAM_Address(Scrap03,Scrap0D+9)
 %dw_big_endian(51) ;(9*4)+(8*2)-1
 dw #$020E|!FS_COLOR_BLUE, #$020F|!FS_COLOR_BLUE ;FLIPPERS
 dw #$0200
@@ -520,7 +513,7 @@ dw #$022F|!FS_COLOR_YELLOW|!FS_HFLIP, #$022F|!FS_COLOR_YELLOW ;KEY
 dw #$0200
 dw #$0267|!FS_COLOR_BW|!FS_HFLIP, #$0267|!FS_COLOR_BW ;cancel
 
-%Layer3_VRAM_Address(!PASSWORD_INPUT_START_X,!PASSWORD_INPUT_START_Y+10)
+%Layer3_VRAM_Address(Scrap03,Scrap0D+10)
 %dw_big_endian(51) ;(9*4)+(8*2)-1
 dw #$021F|!FS_COLOR_BLUE|!FS_HFLIP, #$021F|!FS_COLOR_BLUE ;FLIPPERS
 dw #$0200
@@ -543,10 +536,10 @@ dw #$0267|!FS_COLOR_BW|!FS_HFLIP|!FS_VFLIP, #$0267|!FS_VFLIP|!FS_COLOR_BW ;cance
 dw $FFFF
 
 macro PasswordDisplaySlot(x,y)
-	%Layer3_VRAM_Address(!PASSWORD_DISPLAY_START_X+<x>,!PASSWORD_DISPLAY_START_Y+<y>)
+	%Layer3_VRAM_Address(Scrap04+<x>,Scrap04+<y>)
 	%dw_big_endian(3)
 	dw #$0186|!FS_COLOR_BW, #$0186|!FS_COLOR_BW
-	%Layer3_VRAM_Address(!PASSWORD_DISPLAY_START_X+<x>,!PASSWORD_DISPLAY_START_Y+1+<y>)
+	%Layer3_VRAM_Address(Scrap04+<x>,Scrap04+1+<y>)
 	%dw_big_endian(3)
 	dw #$0196|!FS_COLOR_BW, #$0196|!FS_COLOR_BW
 endmacro
@@ -569,37 +562,37 @@ Password_StripeImageTemplate:
 	%PasswordDisplaySlot(18,3)
 	%PasswordDisplaySlot(21,3)
 .CodeCursorErase ; a code cursor erase (position get be updated)
-	%Layer3_VRAM_Address(!PASSWORD_DISPLAY_START_X,!PASSWORD_DISPLAY_START_Y+2)
+	%Layer3_VRAM_Address(Scrap04,Scrap04+2)
 	%dw_big_endian(3)
 	dw #$0200, #$0200
 .CodeCursorDraw ; Then comes a code cursor draw (will override the erase if same position)
-	%Layer3_VRAM_Address(!PASSWORD_DISPLAY_START_X,!PASSWORD_DISPLAY_START_Y+2)
+	%Layer3_VRAM_Address(Scrap04,Scrap04+2)
 	%dw_big_endian(3)
 	dw #$0267|!FS_COLOR_BW|!FS_HFLIP|!FS_VFLIP, #$0267|!FS_VFLIP|!FS_COLOR_BW
 .SelectionCursorErase ; a selection cursor erase (position get be updated)
-	%Layer3_VRAM_Address(!PASSWORD_INPUT_START_X-1,!PASSWORD_INPUT_START_Y-1)
+	%Layer3_VRAM_Address(Scrap03-1,Scrap0D-1)
 	%dw_big_endian(7)
 	dw #$0200, #$0200, #$0200, #$0200
-	%Layer3_VRAM_Address(!PASSWORD_INPUT_START_X-1,!PASSWORD_INPUT_START_Y)
+	%Layer3_VRAM_Address(Scrap03-1,Scrap0D)
 	%dw_big_endian(3|!FS_VERT_STRIPE)
 	dw #$0200, #$0200
-	%Layer3_VRAM_Address(!PASSWORD_INPUT_START_X+2,!PASSWORD_INPUT_START_Y)
+	%Layer3_VRAM_Address(Scrap03+2,Scrap0D)
 	%dw_big_endian(3|!FS_VERT_STRIPE)
 	dw #$0200, #$0200
-	%Layer3_VRAM_Address(!PASSWORD_INPUT_START_X-1,!PASSWORD_INPUT_START_Y+2)
+	%Layer3_VRAM_Address(Scrap03-1,Scrap0D+2)
 	%dw_big_endian(7)
 	dw #$0200, #$0200, #$0200, #$0200
 .SelectionCursorDraw ; Then comes a selection cursor draw (will override the erase if same position)
-	%Layer3_VRAM_Address(!PASSWORD_INPUT_START_X-1,!PASSWORD_INPUT_START_Y-1)
+	%Layer3_VRAM_Address(Scrap03-1,Scrap0D-1)
 	%dw_big_endian(7)
 	dw #$02BB|!FS_COLOR_GREEN, #$02BC|!FS_COLOR_GREEN, #$02BC|!FS_COLOR_GREEN|!FS_HFLIP, #$02BB|!FS_COLOR_GREEN|!FS_HFLIP
-	%Layer3_VRAM_Address(!PASSWORD_INPUT_START_X-1,!PASSWORD_INPUT_START_Y)
+	%Layer3_VRAM_Address(Scrap03-1,Scrap0D)
 	%dw_big_endian(3|!FS_VERT_STRIPE)
 	dw #$02BD|!FS_COLOR_GREEN, #$02BD|!FS_COLOR_GREEN|!FS_VFLIP
-	%Layer3_VRAM_Address(!PASSWORD_INPUT_START_X+2,!PASSWORD_INPUT_START_Y)
+	%Layer3_VRAM_Address(Scrap03+2,Scrap0D)
 	%dw_big_endian(3|!FS_VERT_STRIPE)
 	dw #$02BD|!FS_COLOR_GREEN|!FS_HFLIP, #$02BD|!FS_COLOR_GREEN|!FS_HFLIP|!FS_VFLIP
-	%Layer3_VRAM_Address(!PASSWORD_INPUT_START_X-1,!PASSWORD_INPUT_START_Y+2)
+	%Layer3_VRAM_Address(Scrap03-1,Scrap0D+2)
 	%dw_big_endian(7)
 	dw #$02BB|!FS_COLOR_GREEN|!FS_VFLIP, #$02BC|!FS_COLOR_GREEN|!FS_VFLIP, #$02BC|!FS_COLOR_GREEN|!FS_HFLIP|!FS_VFLIP, #$02BB|!FS_COLOR_GREEN|!FS_HFLIP|!FS_VFLIP
 dw $FFFF
diff --git a/potions.asm b/potions.asm
index 1eddb15..57f3f26 100644
--- a/potions.asm
+++ b/potions.asm
@@ -2,32 +2,31 @@
 ; $7F5092 - Potion Animation Busy Flags (Health)
 ; $7F5093 - Potion Animation Busy Flags (Magic)
 ;--------------------------------------------------------------------------------
-!BUSY_HEALTH = $7F5092
 RefillHealth:
 	REP #$20 ; set 16-bit accumulator
-	LDA $A0 ; these are all decimal because i got them that way
+	LDA.b $A0 ; these are all decimal because i got them that way
 	CMP.w #279 : BNE + ; Spike Cave bottles work normally
 		SEP #$20 ; set 8-bit accumulator
-		LDA #$A0
+		LDA.b #$A0
 		BRA .done
 	+
 	SEP #$20 ; set 8-bit accumulator
 	LDA.l PotionHealthRefill : CMP.b #$A0 : !BGE .done
-		LDA !BUSY_HEALTH : BNE ++
+		LDA.l BusyHealth : BNE ++
 			LDA.l PotionHealthRefill ; load refill amount
 			!ADD CurrentHealth ; add to current health
-			CMP MaximumHealth : !BLT +++ : LDA MaximumHealth : +++
-			STA !BUSY_HEALTH
+			CMP.l MaximumHealth : !BLT +++ : LDA.l MaximumHealth : +++
+			STA.l BusyHealth
 		++
 
-		LDA CurrentHealth : CMP.l !BUSY_HEALTH : !BLT ++
-			LDA.b #$00 : STA HeartsFiller
-			LDA $020A : BNE .notDone
-			LDA.b #$00 : STA !BUSY_HEALTH
+		LDA.l CurrentHealth : CMP.l BusyHealth : !BLT ++
+			LDA.b #$00 : STA.l HeartsFiller
+			LDA.w $020A : BNE .notDone
+			LDA.b #$00 : STA.l BusyHealth
 			SEC
 			RTL
 		++
-			LDA.b #$08 : STA HeartsFiller ; refill some health
+			LDA.b #$08 : STA.l HeartsFiller ; refill some health
 			.notDone
 			CLC
 			RTL
@@ -35,54 +34,53 @@ RefillHealth:
 
     ; Check goal health versus actual health.
     ; if(actual < goal) then branch.
-    LDA CurrentHealth : CMP MaximumHealth : BCC .refillAllHealth
-    LDA MaximumHealth : STA CurrentHealth
-    LDA.b #$00 : STA HeartsFiller
+    LDA.l CurrentHealth : CMP.l MaximumHealth : BCC .refillAllHealth
+    LDA.l MaximumHealth : STA.l CurrentHealth
+    LDA.b #$00 : STA.l HeartsFiller
     ; ??? not sure what purpose this branch serves.
-    LDA $020A : BNE .beta
+    LDA.w $020A : BNE .beta
         SEC
     RTL
 .refillAllHealth
     ; Fill up ze health.
-    LDA.b #$A0 : STA HeartsFiller
+    LDA.b #$A0 : STA.l HeartsFiller
 .beta
     CLC
 RTL
 ;--------------------------------------------------------------------------------
-!BUSY_MAGIC = $7F5093
 RefillMagic:
 	REP #$20 ; set 16-bit accumulator
-	LDA $A0 ; these are all decimal because i got them that way
+	LDA.b $A0 ; these are all decimal because i got them that way
 	CMP.w #279 : BNE + ; Spike Cave bottles work normally
 		SEP #$20 ; set 8-bit accumulator
-		LDA #$80
+		LDA.b #$80
 		BRA .done
 	+
 	SEP #$20 ; set 8-bit accumulator
 	LDA.l PotionMagicRefill : CMP.b #$80 : !BGE .done
-		LDA !BUSY_MAGIC : BNE ++
+		LDA.l BusyMagic : BNE ++
 			LDA.l PotionMagicRefill ; load refill amount
 			!ADD CurrentMagic ; add to current magic
 			CMP.b #$80 : !BLT +++ : LDA.b #$80 : +++
-			STA !BUSY_MAGIC
+			STA.l BusyMagic
 		++
 
-		LDA CurrentMagic : CMP.l !BUSY_MAGIC : !BLT ++
-			LDA.b #$00 : STA !BUSY_MAGIC
+		LDA.l CurrentMagic : CMP.l BusyMagic : !BLT ++
+			LDA.b #$00 : STA.l BusyMagic
 			SEC
 			RTL
 		++
-			LDA.b #$01 : STA MagicFiller ; refill some magic
+			LDA.b #$01 : STA.l MagicFiller ; refill some magic
 			CLC
 			RTL
 	.done
 
     SEP #$30
     ; Check if Link's magic meter is full
-    LDA CurrentMagic : CMP.b #$80
+    LDA.l CurrentMagic : CMP.b #$80
     BCS .itsFull
     ; Tell the magic meter to fill up until it's full.
-    LDA.b #$80 : STA MagicFiller
+    LDA.b #$80 : STA.l MagicFiller
     SEP #$30
     RTL
 .itsFull
diff --git a/ram.asm b/ram.asm
index efaa68b..a6a3269 100644
--- a/ram.asm
+++ b/ram.asm
@@ -1,14 +1,211 @@
 ;================================================================================
 ; RAM Labels & Assertions
 ;--------------------------------------------------------------------------------
-; Labels for values in WRAM and assertions that ensure they're correct and
-; at the expected addresses. All values larger than one byte are little endian.
+; This module is primarily concerned with labeling WRAM addresses used by the
+; randomizer and documenting their usage.
+;
+; See the JP 1.0 disassembly for reference as well
+; (https://github.com/spannerisms/jpdasm/ - 31/10/2022)
 ;--------------------------------------------------------------------------------
-; Placeholder and for compass item max count allocations, still WIP
+pushpc
+org 0
+
+;================================================================================
+; Direct Page
 ;--------------------------------------------------------------------------------
+base $7E0000
+Scrap:
+Scrap00: skip 1  ; Used as short-term scratch space. If you need some short-term
+Scrap01: skip 1  ; RAM, you can often use these. Double check that the next use
+Scrap02: skip 1  ; of the addresses you want to use is a write.
+Scrap03: skip 1  ;
+Scrap04: skip 1  ;
+Scrap05: skip 1  ;
+Scrap06: skip 1  ;
+Scrap07: skip 1  ;
+Scrap08: skip 1  ;
+Scrap09: skip 1  ;
+Scrap0A: skip 1  ;
+Scrap0B: skip 1  ;
+Scrap0C: skip 1  ;
+Scrap0D: skip 1  ;
+Scrap0E: skip 1  ;
+Scrap0F: skip 1  ;
+
+
+LinkPosY = $7E0020 ; 2 bytes
+LinkPosX = $7E0022 ; 2 bytes
+
+
+;================================================================================
+; Bank 7E
+;--------------------------------------------------------------------------------
+;================================================================================
+; Mirrored WRAM
+;--------------------------------------------------------------------------------
+; Pages 0x00–0x1F of Bank7E are mirrored to every program bank ALTTP uses.
+;--------------------------------------------------------------------------------
+
+CurrentMSUTrack = $7E010B
+CurrentVolume = $7E0127
+TargetVolume = $7E0129
+CurrentControlRequest = $7E0133 ; Last thing written to MusicControlRequest
+MusicControl = $7E012B
+MusicControlRequest = $7E012C
+
+ItemReceiptID = $7E02D8
+
+SpritePosYLow = $7E0D00 ; all $10 bytes
+SpritePosXLow = $7E0D10
+SpritePosYHigh = $7E0D20
+SpritePosXHigh = $7E0D30
+
+SpriteAuxTable = $7E0DA0 ; 0x1F bytes
+SpriteAITable = $7E0DD0
+
+SpriteTypeTable = $7E0E20
+
+SpriteDirectionTable = $7E0EB0
+
+ToastBuffer = $7E1E0E ; 2 bytes DoToast
+
+ScratchBufferNV = $7E1E70 ; Callee preserved, not ok to clobber
+ScratchBufferV = $7E1E80 ; Caller preserved, okay to clobber
+
+;1E90
+ClockHours = $7E1E90 ; Clock Hours
+ClockMinutes = $7E1E94 ; Clock Minutes
+ClockSeconds = $7E1E98 ; Clock Seconds
+ClockBuffer = $7E1E9C ; Clock Temporary
+;1EA0
+;1EB0
+;1EC0
+;1ED0
+;1EE0
+;1EF0
+
+;================================================================================
+; UNMIRRORED WRAM
+; Addresses from here on can only be accessed with long addressing
+; or absolute addressing with the appropriate data bank set
+;--------------------------------------------------------------------------------
+
+TileUploadBuffer = $7EA180 ; 0x300 bytes
+SpriteOAM = $7EC025        ;
+
+; $7EC700 - Tile map buffer for HUD
+
+HUDKeyIcon = $7EC726
+HUDGoalIndicator = $7EC72A
+HUDPrizeIcon = $7EC742
+HUDRupees = $7EC750
+HUDBombCount = $7EC75A
+HUDArrowCount = $7EC760
+HUDKeyDigits = $7EC764
+
+BigRAM = $7EC900           ; Big buffer of free ram (0x1F00)
+
+;================================================================================
+; Bank 7F
+;--------------------------------------------------------------------------------
+RedrawFlag = $7F5000
+
+SpriteSkipEOR = $7F5008
+
+MSReceived = $7F5031
+; GanonWarpChain = $7F5032
+ForceHeartSpawn = $7F5033
+SkipHeartSave = $7F5034
+AltTextFlag = $7F5035 ; two bytes, next must be zero. 0=disable
+BossKills = $7F5037
+LagTime = $7F5038
+RupeesCollected = $7F503C ; 2 bytes
+NonChestCounter = $7F503E
+
+TileUploadOffsetOverride = $7F5042
+
+NMIAux = $7F5044
+
+ShopId = $7F5050
+ShopType = $7F5051
+ShopInventory = $7F5052 ; 0x0C
+ShopState = $7F505F
+ShopCapacity = $7F5060
+ShopScratch = $7F5061
+ShopSRAMIndex = $7F5062
+ShopMerchant = $7F5063
+; ShopDMATimer = $7F5064 unused
+ShopPriceColumn = $7F5066 ; two bytes
+
+OneMindId = $7F5072
+OneMindTimerRAM = $7F5073
+
+ClockStatus = $7F507E ; 2 bytes 
+                      ; ---- --dn
+                      ; d - dnf
+                      ; n - negative
+
+RNGLockIn = $7F5090 ; RNG Item
+BusyItem = $7F5091
+BusyHealth = $7F5092
+BusyMagic = $7F5093
+DialogOffsetPointer = $7F5094 ; 2 bytes
+DialogReturnPointer = $7F5096 ; 2 bytes
+
+StalfosBombDamage = $7F509D
+ValidKeyLoaded = $7F509E
+
+SwordModifier = $7F50C0
+ShieldModifier = $7F50C1 ; not implemented
+ArmorModifier = $7F50C2
+MagicModifier = $7F50C3
+LightConeModifier = $7F50C4
+CuccoStormer = $7F50C5 ; non-zero write causes storm, needs to be zeroed
+OldManDash = $7F50C6
+IceModifier = $7F50C7
+InfiniteArrows = $7F50C8
 InfiniteBombs = $7F50C9
+InfiniteMagic = $7F50CA
+DPadInverter = $7F50CB ; fill in values
+OHKOFlag = $7F50CC
+SpriteSwapper = $7F50CD
+BootsModifier = $7F50CE
+
+; $7F50D0 - $7F50FF - Block Cypher Parameters
+; $7F5100 - $7F51FF - Block Cypher Buffer
+
+; Crypto buffer ($7F50D0 - $7F51FF)
+KeyBase = $7F50D0
+y = $7F50E0
+z = $7F50E4
+Sum = $7F50E8
+p = $7F50EC
+e = $7F50F0
+CryptoScratch = $7F50F2
+CryptoBuffer = $7F5100
+v = $7F5100
+
+RNGPointers = $7F5200 ; $FF bytes 
+
+RxBuffer = $7F5300 ; $00-$5F buffer $60-7E reserved
+RxStatus = $7F537F ; 1 byte
+TxBuffer = $7F5380 ; $80 - $EF buffer $F0 - $FE reserved
+TxStatus = $7F53FF ; $F0 - $FE
+
+MSUFallbackTable = $7F5460 ; 8 bytes
+MSUDelayedCommand = $7F5469
+MSUPackCount = $7F546A
+MSUPackCurrent = $7F546B
+MSUPackRequest = $7F546C
+MSULoadedTrack = $7F546D ; 2 bytes
+MSUResumeTrack = $7F546F 
+MSUResumeTime = $7F5470 ; 4 bytes
+MSUResumeControl = $7F5474 
+
 CompassTotalsWRAM = $7F5410
 
+DialogBuffer = $7F5700 ; $FF bytes
+
 ;================================================================================
 ; RAM Assertions
 ;--------------------------------------------------------------------------------
@@ -16,5 +213,222 @@ macro assertRAM(label, address)
   assert <label> = <address>, "<label> labeled at incorrect address."
 endmacro
 
+%assertRAM(Scrap00, $7E0000)
+%assertRAM(Scrap01, $7E0001)
+%assertRAM(Scrap02, $7E0002)
+%assertRAM(Scrap03, $7E0003)
+%assertRAM(Scrap04, $7E0004)
+%assertRAM(Scrap05, $7E0005)
+%assertRAM(Scrap06, $7E0006)
+%assertRAM(Scrap07, $7E0007)
+%assertRAM(Scrap08, $7E0008)
+%assertRAM(Scrap09, $7E0009)
+%assertRAM(Scrap0A, $7E000A)
+%assertRAM(Scrap0B, $7E000B)
+%assertRAM(Scrap0C, $7E000C)
+%assertRAM(Scrap0D, $7E000D)
+%assertRAM(Scrap0E, $7E000E)
+%assertRAM(Scrap0F, $7E000F)
+
+
+%assertRAM(LinkPosY, $7E0020)
+%assertRAM(LinkPosX, $7E0022)
+%assertRAM(CurrentMSUTrack, $7E010B)
+%assertRAM(CurrentVolume, $7E0127)
+%assertRAM(TargetVolume, $7E0129)
+%assertRAM(CurrentControlRequest, $7E0133)
+%assertRAM(MusicControl, $7E012B)
+%assertRAM(MusicControlRequest, $7E012C)
+%assertRAM(ItemReceiptID, $7E02D8)
+%assertRAM(SpritePosYLow, $7E0D00)
+%assertRAM(SpritePosXLow, $7E0D10)
+%assertRAM(SpritePosYHigh, $7E0D20)
+%assertRAM(SpritePosXHigh, $7E0D30)
+%assertRAM(SpriteAuxTable, $7E0DA0)
+%assertRAM(SpriteAITable, $7E0DD0)
+%assertRAM(SpriteTypeTable, $7E0E20)
+%assertRAM(SpriteDirectionTable, $7E0EB0)
+%assertRAM(ToastBuffer, $7E1E0E)
+%assertRAM(ScratchBufferNV, $7E1E70)
+%assertRAM(ScratchBufferV, $7E1E80)
+%assertRAM(ClockHours, $7E1E90)
+%assertRAM(ClockMinutes, $7E1E94)
+%assertRAM(ClockSeconds, $7E1E98)
+%assertRAM(ClockBuffer, $7E1E9C)
+%assertRAM(TileUploadBuffer, $7EA180)
+%assertRAM(SpriteOAM, $7EC025)
+%assertRAM(HUDKeyIcon, $7EC726)
+%assertRAM(HUDGoalIndicator, $7EC72A)
+%assertRAM(HUDPrizeIcon, $7EC742)
+%assertRAM(HUDRupees, $7EC750)
+%assertRAM(HUDBombCount, $7EC75A)
+%assertRAM(HUDArrowCount, $7EC760)
+%assertRAM(HUDKeyDigits, $7EC764)
+%assertRAM(BigRAM, $7EC900)
+%assertRAM(RedrawFlag, $7F5000)
+%assertRAM(SpriteSkipEOR, $7F5008)
+%assertRAM(MSReceived, $7F5031)
+%assertRAM(ForceHeartSpawn, $7F5033)
+%assertRAM(SkipHeartSave, $7F5034)
+%assertRAM(AltTextFlag, $7F5035)
+%assertRAM(BossKills, $7F5037)
+%assertRAM(LagTime, $7F5038)
+%assertRAM(RupeesCollected, $7F503C)
+%assertRAM(NonChestCounter, $7F503E)
+%assertRAM(TileUploadOffsetOverride, $7F5042)
+%assertRAM(NMIAux, $7F5044)
+%assertRAM(ShopId, $7F5050)
+%assertRAM(ShopType, $7F5051)
+%assertRAM(ShopInventory, $7F5052)
+%assertRAM(ShopState, $7F505F)
+%assertRAM(ShopCapacity, $7F5060)
+%assertRAM(ShopScratch, $7F5061)
+%assertRAM(ShopSRAMIndex, $7F5062)
+%assertRAM(ShopMerchant, $7F5063)
+%assertRAM(ShopPriceColumn, $7F5066)
+%assertRAM(OneMindId, $7F5072)
+%assertRAM(OneMindTimerRAM, $7F5073)
+%assertRAM(ClockStatus, $7F507E)
+%assertRAM(RNGLockIn, $7F5090)
+%assertRAM(BusyItem, $7F5091)
+%assertRAM(BusyHealth, $7F5092)
+%assertRAM(BusyMagic, $7F5093)
+%assertRAM(DialogOffsetPointer, $7F5094)
+%assertRAM(DialogReturnPointer, $7F5096)
+%assertRAM(StalfosBombDamage, $7F509D)
+%assertRAM(ValidKeyLoaded, $7F509E)
+%assertRAM(SwordModifier, $7F50C0)
+%assertRAM(ShieldModifier, $7F50C1)
+%assertRAM(ArmorModifier, $7F50C2)
+%assertRAM(MagicModifier, $7F50C3)
+%assertRAM(LightConeModifier, $7F50C4)
+%assertRAM(CuccoStormer, $7F50C5)
+%assertRAM(OldManDash, $7F50C6)
+%assertRAM(IceModifier, $7F50C7)
+%assertRAM(InfiniteArrows, $7F50C8)
 %assertRAM(InfiniteBombs, $7F50C9)
+%assertRAM(InfiniteMagic, $7F50CA)
+%assertRAM(DPadInverter, $7F50CB)
+%assertRAM(OHKOFlag, $7F50CC)
+%assertRAM(SpriteSwapper, $7F50CD)
+%assertRAM(BootsModifier, $7F50CE)
+%assertRAM(KeyBase, $7F50D0)
+%assertRAM(y, $7F50E0)
+%assertRAM(z, $7F50E4)
+%assertRAM(Sum, $7F50E8)
+%assertRAM(p, $7F50EC)
+%assertRAM(e, $7F50F0)
+%assertRAM(CryptoScratch, $7F50F2)
+%assertRAM(CryptoBuffer, $7F5100)
+%assertRAM(v, $7F5100)
+%assertRAM(RNGPointers, $7F5200)
+%assertRAM(RxBuffer, $7F5300)
+%assertRAM(RxStatus, $7F537F)
+%assertRAM(TxBuffer, $7F5380)
+%assertRAM(TxStatus, $7F53FF)
+%assertRAM(MSUFallbackTable, $7F5460)
+%assertRAM(MSUDelayedCommand, $7F5469)
+%assertRAM(MSUPackCount, $7F546A)
+%assertRAM(MSUPackCurrent, $7F546B)
+%assertRAM(MSUPackRequest, $7F546C)
+%assertRAM(MSULoadedTrack, $7F546D)
+%assertRAM(MSUResumeTrack, $7F546F)
+%assertRAM(MSUResumeTime, $7F5470)
+%assertRAM(MSUResumeControl, $7F5474)
 %assertRAM(CompassTotalsWRAM, $7F5410)
+%assertRAM(DialogBuffer, $7F5700)
+
+
+pullpc
+;================================================================================
+; Bank 7F
+;--------------------------------------------------------------------------------
+
+; $7F5000 - Redraw Flag
+; $7F5001 - Flipper Softlock Possible
+; $7F5002 - L/R Rotate
+; $7F5003 - HexToDec 1st Digit
+; $7F5004 - HexToDec 2nd Digit
+; $7F5005 - HexToDec 3rd Digit
+; $7F5006 - HexToDec 4th Digit
+; $7F5007 - HexToDec 5th Digit
+; $7F5008 - Skip Sprite_DrawMultiple EOR
+; $7F5009 - Always Zero
+; $7F5010 - Unused
+; $7F5020 - Unused
+; $7F5030 - Unused
+; $7F5031 - HUD Master Sword Flag
+; $7F5032 - Unused
+; $7F5033 - Force Heart Spawn Counter
+; $7F5034 - Skip Heart Collection Save Counter
+; $7F5035 - Alternate Text Pointer Flag ; 0=Disable
+; $7F5036 - Padding Byte (Must be Zero)
+; $7F5037 - Stats Boss Kills
+; $7F5038 - Stats Lag Time
+; $7F5039 - Stats Lag Time
+; $7F503A - Stats Lag Time
+; $7F503B - Stats Lag Time
+; $7F503C - Stats Rupee Total
+; $7F503D - Stats Rupee Total
+; $7F503E - Stats Item Total
+; $7F503F - Unused
+; $7F5040 - Free Item Dialog Temporary
+; $7F5041 - Unused
+; $7F5042 - Tile Upload Offset Override (Low)
+; $7F5043 - Tile Upload Offset Override (High)
+; $7F5044 - $7F5046 - NMI Auxiliary Function
+; $7F5047 - $7F504F - Unused
+; $7F5050 - $7F506F - Shop Block
+; $7F5070 - Reserved for OneMind
+; $7F5071 - Reserved for OneMind
+; $7F5072 - OneMind player ID
+; $7F5073 - $7F5074 - OneMind timer
+; $7F5075 - $7F507D - Unused
+; $7F507E - Clock Status
+; $7F507F - Always Zero
+; $7F5080 - $7F508F - unused
+; $7F5090 - RNG Item Lock-In
+; $7F5091 - Item Animation Busy Flag
+; $7F5092 - Potion Animation Busy Flags (Health)
+; $7F5093 - Potion Animation Busy Flags (Magic)
+; $7F5094 - Dialog Offset Pointer (Low)
+; $7F5095 - Dialog Offset Pointer (High)
+; $7F5096 - Dialog Offset Pointer Return (Low)
+; $7F5097 - Dialog Offset Pointer Return (High)
+; $7F5098 - Water Entry Index
+; $7F5099 - Last Entered Overworld Door ID
+; $7F509A - (Reserved)
+; $7F509B - Unused
+; $7F509C - Unused
+; $7F509E - Valid Key Loaded
+; $7F509F - Text Box Defer Flag
+; $7F50A0 - $7F50AF - Unused
+
+; $7F50B0 - $7F50BF - Downstream Reserved (Enemizer)
+
+; $7F50C1 - Shield Modifier (Not Implemented)
+; $7F50C2 - Armor Modifier
+; $7F50C3 - Magic Modifier
+; $7F50C4 - Light Cone Modifier
+; $7F50C5 - Cucco Storm
+; $7F50C6 - Old Man Dash Modifier
+; $7F50C7 - Ice Physics Modifier
+; $7F50C8 - Infinite Arrows Modifier
+; $7F50C9 - Infinite Bombs Modifier
+; $7F50CA - Infinite Magic Modifier
+; $7F50CB - Invert D-Pad (Fill in values)
+; $7F50CC - OHKO Flag
+; $7F50CD - Sprite Swapper
+; $7F50CE - Boots Modifier (0=Off, 1=Always, 2=Never)
+
+; $7F50D0 - $7F50FF - Block Cypher Parameters
+; $7F5100 - $7F51FF - Block Cypher Buffer
+; $7F5200 - $7F52FF - RNG Pointer Block
+; $7F5300 - $7F53FF - Multiworld Block
+; $7F5400 - $7F540F - Unused
+; $7F5410 - $7F545F - Dungeon Tracking Block
+; $7F5460 - $7F549F - MSU Block
+; $7F54A0 - $7F56FF - Unused
+
+; $7F5700 - $7F57FF - Dialog Buffer
+
diff --git a/registers.asm b/registers.asm
new file mode 100644
index 0000000..0da5204
--- /dev/null
+++ b/registers.asm
@@ -0,0 +1,1500 @@
+;===================================================================================================
+; SNES Registers
+;===================================================================================================
+; Note: This is almost entirely a copy from the JP 1.0 disassembly.
+;       See: https://github.com/spannerisms/jpdasm/ - 02/11/2022
+;--------------------------------------------------------------------------------
+
+
+;===================================================================================================
+; KEY
+;===================================================================================================
+; w - writeable
+; r - readable
+; 1 - single write
+; 2 - double write
+;     for double write registers, the first write (low byte) is listed first
+; f - accessible during fblank
+; v - accessible during vblank
+; h - accessible during hblank
+; a - accessible anytime
+; . - unused bit (open bus)
+
+;================================================================================
+; MSU-1 Registers
+;--------------------------------------------------------------------------------
+; MSU registers are located from $2000 to $2007. Comments indicate a register's
+; length if it is greater than one and whether a label should be used for reading
+; or writing.
+;--------------------------------------------------------------------------------
+base $2000
+MSUSTATUS:       ; Reading
+MSUSEEK: skip 1  ; Writing (4 bytes)
+MSUDATA: skip 1  ; Reading
+MSUID: skip 2    ; Reading (6 bytes)
+MSUTRACK: skip 2 ; Writing (2 bytes)
+MSUVOL: skip 1   ; Writing
+MSUCTL:          ; Writing
+
+;===================================================================================================
+;===================================================================================================
+; PPU REGISTERS
+;===================================================================================================
+;===================================================================================================
+
+; SCREEN SETTINGS
+; $2100 w1 fvha
+; f... bbbb
+; f - force blank (0: disabled | 1: enabled)
+; b - screen brightness 0–F
+INIDISP = $002100
+
+; OAM CHARACTER ADDRESSES AND OBJECT SIZE
+; $2101 w1 fv
+; sssnnbbb
+; s - object sizes
+;     sss    small    large
+;     000     8x8     16x16
+;     001     8x8     32x32
+;     010     8x8     64x64
+;     011    16x16    32x32
+;     100    16x16    64x64
+;     101    32x32    64x64
+;     110    16x32    32x64
+;     111    16x32    32x32
+;
+; n - space between object namespaces, $1000 word steps
+; b - obj tile address - $2000 word steps
+OBSEL = $002101
+
+; OAM ADDRESS ACCESS
+; $2102 w1 fv
+; $2103 w1 fv
+;  OAMADDH  OAMADDL
+; p......a aaaaaaaa
+; a - OAM address
+; p - object priority cycle (0: OBJ0 highest priority | 1: priority cycles)
+OAMADDR = $002102
+OAMADDL = $002102
+OAMADDH = $002103
+
+; OAM DATA WRITE
+; $2104 w1 fv
+; xxxxxxxx
+; x - OAM data
+OAMDATA = $002104
+
+; BACKGROUND MODE AND CHARACTER SIZE
+; $2105 w1 fvh
+; dcba pmmm
+; a - tile size for BG1 (0: 8x8 | 1: 16x16)
+; b - tile size for BG2 (0: 8x8 | 1: 16x16)
+; c - tile size for BG3 (0: 8x8 | 1: 16x16)
+; d - tile size for BG4 (0: 8x8 | 1: 16x16)
+; p - BG3 priority in mode 1 (0: normal | 1: highest)
+; m - BG mode (0–7)
+;           BG1    BG2    BG3    BG4   Features
+;     00 - 2bpp   2bpp   2bpp   2bpp   None
+;     01 - 4bpp   4bpp   2bpp   ----   None
+;     02 - 4bpp   4bpp   offs   ----   Offset per tile
+;     03 - 8bpp   4bpp   ----   ----   None
+;     04 - 8bpp   2bpp   offs   ----   Offset per tile
+;     05 - 4bpp   2bpp   ----   ----   Hires
+;     06 - 4bpp   ----   offs   ----   Hires / Offset per tile
+;     07 - 8bpp   EXT    ----   ----   Affine transformation
+BGMODE = $002105
+
+; MOSAIC SIZE AND DESIGNATION
+; $2106 w1 fvh
+; ssss dcba
+; a - mosaic to BG1 (0: disabled | 1: enabled)
+; b - mosaic to BG2 (0: disabled | 1: enabled)
+; c - mosaic to BG3 (0: disabled | 1: enabled)
+; d - mosaic to BG4 (0: disabled | 1: enabled)
+; s - pixelation size
+MOSAIC = $002106
+
+; BACKGROUND TILEMAP ADDRESS AND TILEMAP SIZE
+; $2107 w1 fv
+; $2108 w1 fv
+; $2109 w1 fv
+; $210A w1 fv
+; aaaa aavh
+; a - tilemap address in $400 word steps
+; v - tilemap height (0: 32 tiles | 1: 64 tiles)
+; h - tilemap width (0: 32 tiles | 1: 64 tiles)
+BG1SC = $002107
+BG2SC = $002108
+BG3SC = $002109
+BG4SC = $00210A
+
+; BACKGROUND CHARACTER ADDRESS
+; $210B w1 fv
+; $210C w1 fv
+;  BG12NBA  BG34NBA
+; bbbbaaaa ddddcccc
+; a - base address for BG1 tiles in $1000 word steps
+; b - base address for BG2 tiles in $1000 word steps
+; c - base address for BG3 tiles in $1000 word steps
+; d - base address for BG4 tiles in $1000 word steps
+;     Just look at the nibbles
+;     0   0000    $0000
+;     1   0001    $2000
+;     2   0010    $4000
+;     etc...
+BG12NBA = $00210B
+BG34NBA = $00210C
+
+; BACKGROUND HORIZONTAL AND VERTICAL SCROLL
+; $210D w2 fvh
+; $210E w2 fvh
+; $210F w2 fvh
+; $2110 w2 fvh
+; $2111 w2 fvh
+; $2112 w2 fvh
+; $2113 w2 fvh
+; $2114 w2 fvh
+;
+; modes 0–6: oooooooo ......oo
+; o - bg offset
+;
+; mode 7:   mmmmmmmm ...mmmmm
+; m - mode 7 bg offset
+BG1HOFS = $00210D
+BG1VOFS = $00210E
+BG2HOFS = $00210F
+BG2VOFS = $002110
+BG3HOFS = $002111
+BG3VOFS = $002112
+BG4HOFS = $002113
+BG4VOFS = $002114
+M7HOFS = $00210D
+M7VOFS = $00210E
+
+; VRAM ADDRESS INCREMENT AND REMAPPING
+; $2115 w1 fv
+; a... mmii
+; a - increment $2116[2] after (0: $2118 | 1 : $2119)
+; m - remap addressing
+;     00 = aaaaaaaabbbccccc => aaaaaaaabbbccccc (no remapping)
+;     01 = aaaaaaaabbbccccc => aaaaaaaacccccbbb
+;     10 = aaaaaaabbbcccccc => aaaaaaaccccccbbb
+;     11 = aaaaaabbbccccccc => aaaaaacccccccbbb
+;
+; i - address increment
+;     00 - increment by 1
+;     01 - increment by 32
+;     10 - increment by 128
+;     11 - increment by 128
+VMAIN = $002115
+
+; VRAM ADDRESS ACCESS
+; $2116 w1 fv
+; $2117 w1 fv
+;  VMADDL   VMADDH
+; aaaaaaaa aaaaaaaa
+; a - VRAM address
+VMADDR = $002116
+VMADDL = $002116
+VMADDH = $002117
+
+; VRAM WRITE DATA
+; $2118 w1 fv
+; $2119 w1 fv
+;  VMDATAL  VMDATAH
+; xxxxxxxx xxxxxxxx
+; x - VRAM data
+VMDATA = $002118
+VMDATAL = $002118
+VMDATAH = $002119
+
+; MODE 7 SETTINGS
+; $211A w1 fv
+; we.. ..vh
+; w - tilemap wrapping (0: wrap | 1: no wrap)
+; e - empty space filler w/ no wrap (0: transparent | 1: tile 0)
+; v - mirror tilemap vertically
+; h - mirror tilemap horizontally
+M7SEL = $00211A
+
+; MODE 7 TRANSFORMATION PARAMETERS
+; $211B w2 fvh
+; $211C w2 fvh
+; $211D w2 fvh
+; $211E w2 fvh
+; aaaaaaaa aaaaaaaa
+; a - mode 7 parameter value
+M7A = $00211B
+M7B = $00211C
+M7C = $00211D
+M7D = $00211E
+
+; #PPUMATH
+; SIGNED MULTIPLICATION ARGUMENTS
+; $211B w2 fvha
+; $211C w1 fvha
+; Can also be used for signed multiplication in mode 0–6
+; apparently 0 delay with these
+;
+; PPUMULT16: llllllll hhhhhhhh
+; l - low byte of 16-bit multiplicand
+; h - high byte of 16-bit multiplicand
+;
+; PPUMULT8:  mmmmmmmm
+; m - 8-bit multiplicand
+PPUMULT16 = $00211B
+PPUMULT8 = $00211C
+
+; MODE 7 CENTER OF TRANSFORMATION COORDINATES
+; $211F w2 fvh
+; $2120 w2 fvh
+; oooooooo ...ooooo
+; o - mode 7 axis center
+M7X = $00211F
+M7Y = $002120
+
+; CGRAM ADDRESS ACCESS
+; $2121 w1 fvh
+; aaaaaaaa
+; a - CGRAM address indexing words
+CGADD = $002121
+
+; CGRAM WRITE DATA
+; $2122 w2 fvh
+; gggrrrrr .bbbbbgg
+; r - red component of color
+; g - green component of color
+; b - blue component of color
+CGDATA = $002122
+
+; WINDOW MASK SETTINGS
+; $2123 w1 fvh
+; $2124 w1 fvh
+; $2125 w1 fvh
+;  W12SEL   W34SEL   SOBJSEL
+; dmckbjai dmckbjai dmckbjai
+; i - invert window 1 on BG1/BG3/OBJ (0: normal logic | 1: invert logic)
+; a - enable window 1 on BG1/BG3/OBJ (0: disabled | 1: enabled)
+;
+; j - invert window 2 on BG1/BG3/OBJ (0: normal logic | 1: invert logic)
+; b - enable window 2 on BG1/BG3/OBJ (0: disabled | 1: enabled)
+;
+; k - invert window 1 on BG2/BG4/COL (0: normal logic | 1: invert logic)
+; c - enable window 1 on BG2/BG4/COL (0: disabled | 1: enabled)
+;
+; m - invert window 2 on BG2/BG4/COL (0: normal logic | 1: invert logic)
+; d - enable window 2 on BG2/BG4/COL (0: disabled | 1: enabled)
+W12SEL = $002123
+W34SEL = $002124
+WOBJSEL = $002125
+
+; WINDOW POSITION DESIGNATION
+; $2126 w1 fvh
+; $2127 w1 fvh
+; $2128 w1 fvh
+; $2129 w1 fvh
+;
+;   WH0      WH1
+; llllllll rrrrrrrr
+; l - window 1 left edge
+; r - window 1 right edge
+;
+;   WH2      WH3
+; wwwwwwww eeeeeeee
+; w - window 2 left edge
+; e - window 2 right edge
+WH0 = $002126
+WH1 = $002127
+WH2 = $002128
+WH3 = $002129
+WINDOW1L = $002126
+WINDOW1R = $002127
+WINDOW2L = $002128
+WINDOW2R = $002129
+
+; WINDOW MASK LOGIC
+; $212A w1 fvh
+; $212B w1 fvh
+;  WBGLOG   WOBJLOG
+; ddccbbaa ....ccoo
+; a - window mask logic for BG1
+; b - window mask logic for BG2
+; c - window mask logic for BG3
+; d - window mask logic for BG4
+; o - window mask logic for OBJ
+; c - window mask logic for COL
+;
+; all window masks share the same logic
+;     00 - W1 OR W2
+;     01 - W1 AND W2
+;     10 - W1 XOR W2
+;     11 - W1 XNOR W2
+WBGLOG = $00212A
+WOBJLOG = $00212B
+
+; MAIN AND SUB SCREEN DESIGNATION
+; $212C w1 fvh
+; $212D w1 fvh
+; ...odcba
+; a - BG1 (0: disabled | 1: enabled on main/subscreen)
+; b - BG2 (0: disabled | 1: enabled on main/subscreen)
+; c - BG3 (0: disabled | 1: enabled on main/subscreen)
+; d - BG4 (0: disabled | 1: enabled on main/subscreen)
+; o - OBJ (0: disabled | 1: enabled on main/subscreen)
+TM = $00212C
+TS = $00212D
+MAINDES = $00212C
+SUBDES = $00212D
+
+; MAIN AND SUB SCREEN WINDOW MASK DESIGNATION
+; $212E w1 fvh
+; $212F w1 fvh
+; ...odcba
+; a - window mask for BG1 (0: disabled | 1: enabled)
+; b - window mask for BG2 (0: disabled | 1: enabled)
+; c - window mask for BG3 (0: disabled | 1: enabled)
+; d - window mask for BG4 (0: disabled | 1: enabled)
+; o - window mask for OBJ (0: disabled | 1: enabled)
+TMW = $00212E
+TSW = $00212F
+
+; COLOR MATH SETTINGS
+; $2130 w1 fvh
+; bbmm ..sd
+; b - clip to black (same logic as m)
+; m - prevent color math
+;     00 - never
+;     01 - outside COL window
+;     10 - inside COL window
+;     11 - always
+;
+; s - color source (0: fixed color | 1: subscreen)
+; d - direct color mode (0: enabled | 1: disabled)
+CGWSEL = $002130
+
+; COLOR MATH DESIGNATION AND OPERATION
+; $2131 w1 fvh
+; shzo dcba
+; s - color operation (0: addition | 1: subtraction)
+; h - half color math (0: nothing | 1: final result divided by 2)
+; z - color math on CGRAM0 (0: disabled | 1: enabled)
+; a - color math on BG1 (0: disabled | 1: enabled)
+; b - color math on BG2 (0: disabled | 1: enabled)
+; c - color math on BG3 (0: disabled | 1: enabled)
+; d - color math on BG4 (0: disabled | 1: enabled)
+; o - color math on OBJ (0: disabled | 1: enabled)
+CGADSUB = $002131
+
+; COLOR MATH FIXED COLOR DATA
+; $2132 w1 fvh
+; bgrccccc
+; r - red component of fixed color (0: unchanged | 1: change w/ write)
+; g - green component of fixed color (0: unchanged | 1: change w/ write)
+; b - blue component of fixed color (0: unchanged | 1: change w/ write)
+; c - fixed color component value
+COLDATA = $002132
+
+; SCREEN INTERLACE AND SYNC SETTINGS
+; $2133 w1 fvh
+; se.. pvoi
+; s - external sync (0: normal | 1: super impose)
+; e - mode 7 EXTBG (0: disabled | 1: enabled)
+; p - pseudo h512 (0: disabled | 1: enabled - shifts subscreen half dot left)
+; v - enable overscan (0: 224 scanlines | 1: 239 scanlines)
+; o - object interlace (0: disabled | 1: enabled)
+; i - screen interlace (0: disabled | 1: enabled - interlace to source)
+SETINI = $002133
+
+; MULTIPLICATION RESULT
+; $2134 r1 fvh
+; $2135 r1 fvh
+; $2136 r1 fvh
+;   MPYL     MPYM     MPYH
+; llllllll mmmmmmmm hhhhhhhh
+; l - low byte of product
+; m - middle byte of product
+; h - high byte of product
+; see #PPUMATH
+MPYL = $002134
+MPYM = $002135
+MPYH = $002136
+PPUPRODUCTL = $002134
+PPUPRODUCTM = $002135
+PPUPRODUCTH = $002136
+
+; SOFTWARE LATCH FOR h/V COUNTER
+; $2137 r1 fvha
+; ........
+; Contains no data; just a latch to update OPHCT and OPVCT
+SLHV = $002137
+
+; OAM READ DATA
+; $2138 r1 fv
+; xxxxxxxx
+; x - OAM data read
+OAMDATAREAD = $002138
+
+; VRAM READ DATA
+; $2139 r1 fv
+; $213A r1 fv
+; VMDATALR VMDATAHR
+; llllllll hhhhhhhh
+; l - low byte of VRAM data read
+; h - high byte of VRAM data read
+VMDATALREAD = $002139
+VMDATAHREAD = $00213A
+
+; CHRAM READ DATA
+; $213B r2 fv
+; gggrrrrr .bbbbbgg
+; r - red component of color
+; g - green component of color
+; b - blue component of color
+CGDATAREAD = $00213B
+
+; HORIZONTAL COUNTER FROM LAST LATCH
+; $213C r2 fvha
+; hhhhhhhh .......h
+; h - horizontal dot position
+; 0 to 339
+OPHCT = $00213C
+
+; VERTICAL COUNTER FROM LAST LATCH
+; $213D r2 fvha
+; vvvvvvvv .......v
+; v - vertical scanline position
+; 0 to 261
+OPVCT = $00213D
+
+; PPU STATUS AND PPU1 VERSION NUMBER
+; $213E r1 fvha
+; trm. vvvv
+; t - OBJ time overflow (0: fine | 1: too many pixels on scanline - 8*34=292)
+; r - OBJ range overflow (0: fine | 1: too many objects on scanline - 32)
+; m - mode (0: master | 1: slave)
+; v - PPU1 5C77 version
+STAT77 = $00213E
+
+; PPU STATUS AND PPU2 VERSION NUMBER
+; $213F r1 fvha
+; il.p vvvv
+; i - current interlace field (0: odd | 1: even)
+; l - external latch (0: no data | 1: new data)
+; p - region (0: NTSC 60hz | 1: PAL 50hz)
+; v - PPU2 5C78 version
+STAT78 = $00213F
+
+; AUDIO PROCESSING UNIT COMMUNICATION PORTS
+; $2140 rw1 fvha
+; $2141 rw1 fvha
+; $2142 rw1 fvha
+; $2143 rw1 fvha
+; aaaaaaaa
+; a - APU data
+APUIO = $002140
+APUIO0 = $002140
+APUIO1 = $002141
+APUIO2 = $002142
+APUIO3 = $002143
+
+; APUIO is mirrored up to $217F
+
+; WRAM DATA READ/WRITE
+; $2180 rw1 fvha
+; xxxxxxxx
+; x - WRAM data
+WMDATA = $002180
+
+; WRAM ADDRESS ACCESS
+; $2181 rw1 fvha
+; $2182 rw1 fvha
+; $2183 rw1 fvha
+;  WMADDL   WMADDH   WMADDB
+; llllllll hhhhhhhh .......b
+; l - low byte of WRAM address
+; h - high byte of WRAM address
+; b - bank of WRAM address (0: bank7E | 1: bank7F)
+WMADDR = $002181
+WMADDL = $002181
+WMADDH = $002182
+WMADDB = $002183
+
+;===================================================================================================
+;===================================================================================================
+; CPU REGISTERS
+;===================================================================================================
+;===================================================================================================
+
+; JOYPAD STROBE AND COMMUNICATION PORT
+; $4016 rw1 fvha
+; write: .......s
+; s - strobe joypads
+;
+; read:  ......ca
+; a - port 1 data 1
+; c - port 1 data 2
+JOYPAD = $004016
+JOYPADA = $004016
+
+; $4017 r1 fvha
+; ......db
+; d - port 2 data 1
+; b - port 2 data 2
+JOYPADB = $004017
+
+;---------------------------------------------------------------------------------------------------
+
+; INTERRUPT AND AUTO JOYPAD READ ENABLE
+; $4200 w1 fvha
+; n.vh ...j
+; n - NMI enable (0: disabled | 1: enabled)
+; vh - IRQ trigger time
+;      00 - No IRQ
+;      0h - IRQ triggers when HTIME is hit
+;      v0 - IRQ triggers when VTIME is hit
+;      vh - IRQ triggers when both HTIME and VTIME are hit
+; j - auto joypad read (0: disabled | 1: enabled)
+NMITIMEN = $004200
+
+; PROGRAMMABLE I/O PORT (WRITE)
+; $4201 w1 fvha
+; ab.. ....
+; a - controller port 2 pin 6 (0: no ppu latching | 1: ppu can be latched)
+; b - controller port 1 pin 6
+WRIO = $004201
+JOYPADIO = $004201
+
+; MULTIPLIER AND MULTIPLICAND
+; $4202 w1 fvha
+; $4203 w1 fvha
+;  WRMPYA   WRMPYB
+; aaaaaaaa bbbbbbbb
+; a - unsigned 8-bit multiplicand A
+; b - unsigned 8-bit multiplicand B
+; need to wait 8 cycles before reading
+; cycles taken to read the initial opcode count
+WRMPYA = $004202
+WRMPYB = $004203
+CPUMULTA = $004202
+CPUMULTB = $004203
+
+; DIVISOR AND DIVIDEND
+; $4204 w1 fvha
+; $4205 w1 fvha
+; $4206 w1 fvha
+;          WRDIVL   WRDIVH
+; WRDIV:  llllllll hhhhhhhh
+; l - low byte of unsigned 16-bit dividend
+; h - high byte of unsigned 16-bit dividend
+; WRDIVB: dddddddd
+; d - unsigned 8-bit divisor
+; need to wait 16 cycles before reading
+; cycles taken to read initial opcode count
+; fewer cycles needed if quotient is known to be small?
+WRDIVL = $004204
+WRDIVH = $004205
+WRDIVB = $004206
+CPUDIVIDEND = $004204
+CPUDIVIDENDL = $004204
+CPUDIVIDENDH = $004205
+CPUDIVISOR = $004206
+
+; H-COUNT TIMER SETTINGS
+; $4207 w1 fvha
+; $4208 w1 fvha
+; hhhhhhhh .......h
+; h - IRQ horizontal trigger
+HTIME = $004207
+HTIMEL = $004207
+HTIMEH = $004208
+
+; V-COUNT TIMER SETTINGS
+; $4209 w1 fvha
+; $420A w1 fvha
+; vvvvvvvv .......v
+; v - IRQ vertical trigger
+VTIME = $004209
+VTIMEL = $004209
+VTIMEH = $00420A
+
+; DIRECT MEMORY ACCESS CHANNEL DESIGNATION
+; $420B w1 fvha
+; hgfedcba
+; a - DMA channel 0 (0: disabled | 1: enabled)
+; b - DMA channel 1 (0: disabled | 1: enabled)
+; c - DMA channel 2 (0: disabled | 1: enabled)
+; d - DMA channel 3 (0: disabled | 1: enabled)
+; e - DMA channel 4 (0: disabled | 1: enabled)
+; f - DMA channel 5 (0: disabled | 1: enabled)
+; g - DMA channel 6 (0: disabled | 1: enabled)
+; h - DMA channel 7 (0: disabled | 1: enabled)
+MDMAEN = $00420B
+DMAENABLE = $00420B
+
+; H-BLANK DIRECT MEMORY ACCESS CHANNEL DESIGNATION
+; $420C w1 fvha
+; hgfedcba
+; a - HDMA channel 0 (0: disabled | 1: enabled)
+; b - HDMA channel 1 (0: disabled | 1: enabled)
+; c - HDMA channel 2 (0: disabled | 1: enabled)
+; d - HDMA channel 3 (0: disabled | 1: enabled)
+; e - HDMA channel 4 (0: disabled | 1: enabled)
+; f - HDMA channel 5 (0: disabled | 1: enabled)
+; g - HDMA channel 6 (0: disabled | 1: enabled)
+; h - HDMA channel 7 (0: disabled | 1: enabled)
+HDMAEN = $00420C
+HDMAENABLE = $00420C
+
+; ACCESS CYCLE DESIGNATION
+; $420D w1 fvha
+; .......f
+; f - fast rom (0: disabled | 1: enabled)
+; Works with SA1, but pauses the SA1.
+MEMSEL = $00420D
+
+; V-BLANK NMI FLAG AND SNES CPU VERSION NUMBER
+; $4210 r1 fvha
+; n... vvvv
+; n - vblank NMI trigger (0: not in vblank | 1: in vblank)
+;     reading $4210 will clear this flag
+;     read this during NMI for safety
+;     messing with NMI enable may cause unwanted triggers
+; v - Ricoh5A22 version
+RDNMI = $004210
+
+; H/V TIMER IRQ FLAG
+; $4211 r1 fvha
+; i... ....
+; i - IRQ trigger (0: no request | 1: IRQ requested)
+;     reading $4211 will clear this flag
+;     read this during IRQ or else
+;     IRQ will trigger immediately when the current one ends
+TIMEUP = $004211
+
+; H/V BLANK FLAG AND AUTO JOYPAD READ STATUS
+; $4212 r1 fvha
+; vh.. ...j
+; v - vertical blanking period (0: not vblank | 1: vblank)
+; h - horizontal blanking period (0: not hblank | 1: hblank)
+;     blanking flags are toggled even during fblank
+;     and irrespective of interrupts
+;
+; j - auto joypad read flag (0: fine | 1: busy with ajpr)
+HVBJOY = $004212
+
+; PROGRAMMABLE I/O PORT (READ)
+; $4213 r1 fvha
+; ab......
+; a - pin 6 of controller port 2
+; b - pin 6 of controller port 1
+RDIO = $004213
+
+; QUOTIENT OF DIVISION
+; $4214 r1 fvha
+; $4215 r1 fvha
+;  RDDIVL   RDDIVH
+; llllllll hhhhhhhh
+; l - low byte of quotient
+; h - high byte of quotient
+RDDIV = $004214
+RDDIVL = $004214
+RDDIVH = $004215
+CPUQUOTIENT = $004214
+CPUQUOTIENTL = $004214
+CPUQUOTIENTH = $004215
+
+; PRODUCT OF MULTIPLICATION AND REMAINDER OF DIVISION
+; $4216 r1 fvha
+; $4217 r1 fvha
+;  RDMPYL   RDMPYH
+; llllllll hhhhhhhh
+; l - low byte of result
+; h - high byte of result
+;
+; for multiplication, this contains the product
+; for division, this contains the remainder
+RDMPY = $004216
+RDMPYL = $004216
+RDMPYH = $004217
+CPUPRODUCT = $004216
+CPUPRODUCTL = $004216
+CPUPRODUCTH = $004217
+CPUREMAINDER = $004216
+CPUREMAINDERL = $004216
+CPUREMAINDERH = $004217
+
+; CONTROLLER DATA
+; $4218 r1 fvha
+; $4219 r1 fvha
+; $421A r1 fvha
+; $421B r1 fvha
+; $421C r1 fvha
+; $421D r1 fvha
+; $421E r1 fvha
+; $421F r1 fvha
+;
+;              JOY1L    JOY1H
+; JOY1DATA1: AXLRvvvv BYsSudlr
+;
+;              JOY2L    JOY2H
+; JOY2DATA1: AXLRvvvv BYsSudlr
+;
+;              JOY3L    JOY3H
+; JOY1DATA2: AXLRvvvv BYsSudlr
+;
+;              JOY4L    JOY4H
+; JOY2DATA2: AXLRvvvv BYsSudlr
+;
+; A - A face button (0: relaxed | 1: pressed)
+; B - B face button (0: relaxed | 1: pressed)
+; X - X face button (0: relaxed | 1: pressed)
+; Y - Y face button (0: relaxed | 1: pressed)
+; u - UP dpad button (0: relaxed | 1: pressed)
+; d - DOWN dpad button (0: relaxed | 1: pressed)
+; l - LEFT pad button (0: relaxed | 1: pressed)
+; r - RIGHT dpad button (0: relaxed | 1: pressed)
+; S - START button (0: relaxed | 1: pressed)
+; s - SELECT button (0: relaxed | 1: pressed)
+; L - LEFT SHOULDER button (0: relaxed | 1: pressed)
+; R - RIGHT SHOULDER button (0: relaxed | 1: pressed)
+;
+; v - controller signature
+;     only v bits are put in data
+;     further data can be read for further controller information
+;
+;     vvvv zzzzzzzz
+;     0000 00000000 - No controller connected
+;     0000 11111111 - Standard joypad
+;     0001 ........ - SNES mouse
+;     0011 ........ - SFC modem
+;     0100 ........ - NTT data controller (has cool numpad)
+;     1101 ........ - Voice-Kun
+;     1110 xxxxxxxx - Third-party device
+;     1111 ........ - Super Scope
+JOY1L = $004218
+JOY1H = $004219
+JOY2L = $00421A
+JOY2H = $00421B
+JOY3L = $00421C
+JOY3H = $00421D
+JOY4L = $00421E
+JOY4H = $00421F
+;--------------------------------
+JOY1DATA1L = $004218
+JOY1DATA1H = $004219
+JOY2DATA1L = $00421A
+JOY2DATA1H = $00421B
+JOY1DATA2L = $00421C
+JOY1DATA2H = $00421D
+JOY2DATA2L = $00421E
+JOY2DATA2H = $00421F
+
+;===================================================================================================
+;===================================================================================================
+; DMA REGISTERS
+;===================================================================================================
+;===================================================================================================
+
+; DMA TRANSFER PARAMETERS
+; $4300 rw1 fvha
+; $4310 rw1 fvha
+; $4320 rw1 fvha
+; $4330 rw1 fvha
+; $4340 rw1 fvha
+; $4350 rw1 fvha
+; $4360 rw1 fvha
+; $4370 rw1 fvha
+;
+; dh.i fmmm
+; d - transfer direction (0: A bus to B bus | 1: B bus to A bus)
+; h - HDMA addressing (0: direct table | 1: indirect table)
+; i - address direction (0: increment address | 1: decrement address)
+; f - fixed transfer
+; m - transfer mode
+;     000 - 1 register, write once              r+0
+;     001 - 2 register, write once              r+0, r+1
+;     010 - 1 register, write twice             r+0, r+0
+;     011 - 2 registers, write twice            r+0, r+0, r+1, r+1
+;     100 - 4 registers, write once             r+0, r+1, r+2, r+3
+;     101 - 2 registers, write twice, alt       r+0, r+1, r+0, r+1
+;     110 - 1 register, write twice             r+0, r+0
+;     111 - 2 registers, write twice            r+0, r+0, r+1, r+1
+;
+;     for write twice modes, the address is still incremented
+;     assuming a non-fixed transfer
+;     for fixed transfers, the same address is always used
+;     even for write twice modes
+DMAPX = $004300
+DMAP0 = $004300
+DMAP1 = $004310
+DMAP2 = $004320
+DMAP3 = $004330
+DMAP4 = $004340
+DMAP5 = $004350
+DMAP6 = $004360
+DMAP7 = $004370
+;--------------------------------
+DMAXMODE = $004300
+DMA0MODE = $004300
+DMA1MODE = $004310
+DMA2MODE = $004320
+DMA3MODE = $004330
+DMA4MODE = $004340
+DMA5MODE = $004350
+DMA6MODE = $004360
+DMA7MODE = $004370
+;--------------------------------
+HDMAXMODE = $004300
+HDMA0MODE = $004300
+HDMA1MODE = $004310
+HDMA2MODE = $004320
+HDMA3MODE = $004330
+HDMA4MODE = $004340
+HDMA5MODE = $004350
+HDMA6MODE = $004360
+HDMA7MODE = $004370
+
+; DMA B-BUS ADDRESS ACCESS
+; $4301 rw1 fvha
+; $4311 rw1 fvha
+; $4321 rw1 fvha
+; $4331 rw1 fvha
+; $4341 rw1 fvha
+; $4351 rw1 fvha
+; $4361 rw1 fvha
+; $4371 rw1 fvha
+;
+; aaaaaaaa
+; a - low byte of PPU port $21aa for B bus address
+BBADX = $004301
+BBAD0 = $004301
+BBAD1 = $004311
+BBAD2 = $004321
+BBAD3 = $004331
+BBAD4 = $004341
+BBAD5 = $004351
+BBAD6 = $004361
+BBAD7 = $004371
+;--------------------------------
+DMAXPORT = $004301
+DMA0PORT = $004301
+DMA1PORT = $004311
+DMA2PORT = $004321
+DMA3PORT = $004331
+DMA4PORT = $004341
+DMA5PORT = $004351
+DMA6PORT = $004361
+DMA7PORT = $004371
+
+; DMA A-BUS TABLE ADDRESS
+; $4302 rw1 fvha
+; $4303 rw1 fvha
+; $4304 rw1 fvha
+; $4312 rw1 fvha
+; $4313 rw1 fvha
+; $4314 rw1 fvha
+; $4322 rw1 fvha
+; $4323 rw1 fvha
+; $4324 rw1 fvha
+; $4332 rw1 fvha
+; $4333 rw1 fvha
+; $4334 rw1 fvha
+; $4342 rw1 fvha
+; $4343 rw1 fvha
+; $4344 rw1 fvha
+; $4352 rw1 fvha
+; $4353 rw1 fvha
+; $4354 rw1 fvha
+; $4362 rw1 fvha
+; $4363 rw1 fvha
+; $4364 rw1 fvha
+; $4372 rw1 fvha
+; $4373 rw1 fvha
+; $4374 rw1 fvha
+;
+;   A1TxL    A1TxH    A1Bx
+; llllllll hhhhhhhh bbbbbbbb
+; l - low byte of A bus address
+; h - high byte of A bus address
+; b - bank of A bus address
+;--------------------------------
+A1TX = $004302
+A1TXL = $004302
+A1T0L = $004302
+A1T1L = $004312
+A1T2L = $004322
+A1T3L = $004332
+A1T4L = $004342
+A1T5L = $004352
+A1T6L = $004362
+A1T7L = $004372
+;--------------------------------
+A1TXH = $004303
+A1T0H = $004303
+A1T1H = $004313
+A1T2H = $004323
+A1T3H = $004333
+A1T4H = $004343
+A1T5H = $004353
+A1T6H = $004363
+A1T7H = $004373
+;--------------------------------
+A1BX = $004304
+A1B0 = $004304
+A1B1 = $004314
+A1B2 = $004324
+A1B3 = $004334
+A1B4 = $004344
+A1B5 = $004354
+A1B6 = $004364
+A1B7 = $004374
+;--------------------------------
+DMAXADDR = $004302
+DMA0ADDR = $004302
+DMA1ADDR = $004312
+DMA2ADDR = $004322
+DMA3ADDR = $004332
+DMA4ADDR = $004342
+DMA5ADDR = $004352
+DMA6ADDR = $004362
+DMA7ADDR = $004372
+;--------------------------------
+DMAXADDRL = $004302
+DMA0ADDRL = $004302
+DMA1ADDRL = $004312
+DMA2ADDRL = $004322
+DMA3ADDRL = $004332
+DMA4ADDRL = $004342
+DMA5ADDRL = $004352
+DMA6ADDRL = $004362
+DMA7ADDRL = $004372
+;--------------------------------
+DMAXADDRH = $004303
+DMA0ADDRH = $004303
+DMA1ADDRH = $004313
+DMA2ADDRH = $004323
+DMA3ADDRH = $004333
+DMA4ADDRH = $004343
+DMA5ADDRH = $004353
+DMA6ADDRH = $004363
+DMA7ADDRH = $004373
+;--------------------------------
+DMAXADDRB = $004304
+DMA0ADDRB = $004304
+DMA1ADDRB = $004314
+DMA2ADDRB = $004324
+DMA3ADDRB = $004334
+DMA4ADDRB = $004344
+DMA5ADDRB = $004354
+DMA6ADDRB = $004364
+DMA7ADDRB = $004374
+;--------------------------------
+HDMAXADDR = $004302
+HDMA0ADDR = $004302
+HDMA1ADDR = $004312
+HDMA2ADDR = $004322
+HDMA3ADDR = $004332
+HDMA4ADDR = $004342
+HDMA5ADDR = $004352
+HDMA6ADDR = $004362
+HDMA7ADDR = $004372
+;--------------------------------
+HDMAXADDRL = $004302
+HDMA0ADDRL = $004302
+HDMA1ADDRL = $004312
+HDMA2ADDRL = $004322
+HDMA3ADDRL = $004332
+HDMA4ADDRL = $004342
+HDMA5ADDRL = $004352
+HDMA6ADDRL = $004362
+HDMA7ADDRL = $004372
+;--------------------------------
+HDMAXADDRH = $004303
+HDMA0ADDRH = $004303
+HDMA1ADDRH = $004313
+HDMA2ADDRH = $004323
+HDMA3ADDRH = $004333
+HDMA4ADDRH = $004343
+HDMA5ADDRH = $004353
+HDMA6ADDRH = $004363
+HDMA7ADDRH = $004373
+;--------------------------------
+HDMAXADDRB = $004304
+HDMA0ADDRB = $004304
+HDMA1ADDRB = $004314
+HDMA2ADDRB = $004324
+HDMA3ADDRB = $004334
+HDMA4ADDRB = $004344
+HDMA5ADDRB = $004354
+HDMA6ADDRB = $004364
+HDMA7ADDRB = $004374
+
+; DMA SIZE, HDMA WORKING TABLE ADDRESS, AND HDMA INDIRECT TABLE BANK
+; $4305 rw1 fvha
+; $4306 rw1 fvha
+; $4307 rw1 fvha
+; $4315 rw1 fvha
+; $4316 rw1 fvha
+; $4317 rw1 fvha
+; $4325 rw1 fvha
+; $4326 rw1 fvha
+; $4327 rw1 fvha
+; $4335 rw1 fvha
+; $4336 rw1 fvha
+; $4337 rw1 fvha
+; $4345 rw1 fvha
+; $4346 rw1 fvha
+; $4347 rw1 fvha
+; $4355 rw1 fvha
+; $4356 rw1 fvha
+; $4357 rw1 fvha
+; $4365 rw1 fvha
+; $4366 rw1 fvha
+; $4367 rw1 fvha
+; $4375 rw1 fvha
+; $4376 rw1 fvha
+; $4377 rw1 fvha
+;
+;        DASxL    DASxH
+; DMA: llllllll hhhhhhhh
+; l - low byte of transfer size
+; h - high byte of transfer size
+;
+;     $0000 will actually transfer $10000 bytes
+;
+;         DASxL    DASxH    DASBx
+; HDMA: llllllll hhhhhhhh bbbbbbbb
+; l - low byte of table
+; h - high byte of table
+; b - high byte of table
+;
+; Not used during direct HDMA
+;--------------------------------
+DASX = $004305
+DAS0 = $004305
+DAS1 = $004315
+DAS2 = $004325
+DAS3 = $004335
+DAS4 = $004345
+DAS5 = $004355
+DAS6 = $004365
+DAS7 = $004375
+;--------------------------------
+DASXL = $004305
+DAS0L = $004305
+DAS1L = $004315
+DAS2L = $004325
+DAS3L = $004335
+DAS4L = $004345
+DAS5L = $004355
+DAS6L = $004365
+DAS7L = $004375
+;--------------------------------
+DASXH = $004306
+DAS0H = $004306
+DAS1H = $004316
+DAS2H = $004326
+DAS3H = $004336
+DAS4H = $004346
+DAS5H = $004356
+DAS6H = $004366
+DAS7H = $004376
+;--------------------------------
+DASXB = $004307
+DAS0B = $004307
+DAS1B = $004317
+DAS2B = $004327
+DAS3B = $004337
+DAS4B = $004347
+DAS5B = $004357
+DAS6B = $004367
+DAS7B = $004377
+;--------------------------------
+DMAXSIZE = $004305
+DMA0SIZE = $004305
+DMA1SIZE = $004315
+DMA2SIZE = $004325
+DMA3SIZE = $004335
+DMA4SIZE = $004345
+DMA5SIZE = $004355
+DMA6SIZE = $004365
+DMA7SIZE = $004375
+;--------------------------------
+DMAXSIZEL = $004305
+DMA0SIZEL = $004305
+DMA1SIZEL = $004315
+DMA2SIZEL = $004325
+DMA3SIZEL = $004335
+DMA4SIZEL = $004345
+DMA5SIZEL = $004355
+DMA6SIZEL = $004365
+DMA7SIZEL = $004375
+;--------------------------------
+DMAXSIZEH = $004306
+DMA0SIZEH = $004306
+DMA1SIZEH = $004316
+DMA2SIZEH = $004326
+DMA3SIZEH = $004336
+DMA4SIZEH = $004346
+DMA5SIZEH = $004356
+DMA6SIZEH = $004366
+DMA7SIZEH = $004376
+;--------------------------------
+HDMAXINDIRECT = $004305
+HDMA0INDIRECT = $004305
+HDMA1INDIRECT = $004315
+HDMA2INDIRECT = $004325
+HDMA3INDIRECT = $004335
+HDMA4INDIRECT = $004345
+HDMA5INDIRECT = $004355
+HDMA6INDIRECT = $004365
+HDMA7INDIRECT = $004375
+;--------------------------------
+HDMAXINDIRECTL = $004305
+HDMA0INDIRECTL = $004305
+HDMA1INDIRECTL = $004315
+HDMA2INDIRECTL = $004325
+HDMA3INDIRECTL = $004335
+HDMA4INDIRECTL = $004345
+HDMA5INDIRECTL = $004355
+HDMA6INDIRECTL = $004365
+HDMA7INDIRECTL = $004375
+;--------------------------------
+HDMAXINDIRECTH = $004306
+HDMA0INDIRECTH = $004306
+HDMA1INDIRECTH = $004316
+HDMA2INDIRECTH = $004326
+HDMA3INDIRECTH = $004336
+HDMA4INDIRECTH = $004346
+HDMA5INDIRECTH = $004356
+HDMA6INDIRECTH = $004366
+HDMA7INDIRECTH = $004376
+;--------------------------------
+HDMAXINDIRECTB = $004307
+HDMA0INDIRECTB = $004307
+HDMA1INDIRECTB = $004317
+HDMA2INDIRECTB = $004327
+HDMA3INDIRECTB = $004337
+HDMA4INDIRECTB = $004347
+HDMA5INDIRECTB = $004357
+HDMA6INDIRECTB = $004367
+HDMA7INDIRECTB = $004377
+
+; HDMA TABLE ADDRESS
+; $4308 rw1 fvha
+; $4309 rw1 fvha
+; $4318 rw1 fvha
+; $4319 rw1 fvha
+; $4328 rw1 fvha
+; $4329 rw1 fvha
+; $4338 rw1 fvha
+; $4339 rw1 fvha
+; $4348 rw1 fvha
+; $4349 rw1 fvha
+; $4358 rw1 fvha
+; $4359 rw1 fvha
+; $4368 rw1 fvha
+; $4369 rw1 fvha
+; $4378 rw1 fvha
+; $4379 rw1 fvha
+;   A2AxL    A2AxH
+; llllllll hhhhhhhh
+; l - low byte of table address
+; h - high byte of table address
+;
+; Updated automatically by HDMA
+; so probably avoid writing here
+;--------------------------------
+A2AX = $004308
+A2AXL = $004308
+A2A0L = $004308
+A2A1L = $004318
+A2A2L = $004328
+A2A3L = $004338
+A2A4L = $004348
+A2A5L = $004358
+A2A6L = $004368
+A2A7L = $004378
+;--------------------------------
+A2AXH = $004309
+A2A0H = $004309
+A2A1H = $004319
+A2A2H = $004329
+A2A3H = $004339
+A2A4H = $004349
+A2A5H = $004359
+A2A6H = $004369
+A2A7H = $004379
+;--------------------------------
+HDMAXTABLEADDR = $004308
+HDMA0TABLEADDR = $004308
+HDMA1TABLEADDR = $004318
+HDMA2TABLEADDR = $004328
+HDMA3TABLEADDR = $004338
+HDMA4TABLEADDR = $004348
+HDMA5TABLEADDR = $004358
+HDMA6TABLEADDR = $004368
+HDMA7TABLEADDR = $004378
+;--------------------------------
+HDMAXTABLEADDRL = $004308
+HDMA0TABLEADDRL = $004308
+HDMA1TABLEADDRL = $004318
+HDMA2TABLEADDRL = $004328
+HDMA3TABLEADDRL = $004338
+HDMA4TABLEADDRL = $004348
+HDMA5TABLEADDRL = $004358
+HDMA6TABLEADDRL = $004368
+HDMA7TABLEADDRL = $004378
+;--------------------------------
+HDMAXTABLEADDRH = $004309
+HDMA0TABLEADDRH = $004309
+HDMA1TABLEADDRH = $004319
+HDMA2TABLEADDRH = $004329
+HDMA3TABLEADDRH = $004339
+HDMA4TABLEADDRH = $004349
+HDMA5TABLEADDRH = $004359
+HDMA6TABLEADDRH = $004369
+HDMA7TABLEADDRH = $004379
+
+; HDMA LINE TRANSFER WORKSPACE
+; $430A rw1 fvha
+; $431A rw1 fvha
+; $432A rw1 fvha
+; $433A rw1 fvha
+; $434A rw1 fvha
+; $435A rw1 fvha
+; $436A rw1 fvha
+; $437A rw1 fvha
+; csss ssss
+; c - continue flag (0: 1 line for s scanlines | 1: s lines, 1 per scanline)
+; s - scanline count
+;
+; Updated automatically by HDMA
+; so probably avoid writing here
+;--------------------------------
+NTLRX = $00430A
+NTLR0 = $00430A
+NTLR1 = $00431A
+NTLR2 = $00432A
+NTLR3 = $00433A
+NTLR4 = $00434A
+NTLR5 = $00435A
+NTLR6 = $00436A
+NTLR7 = $00437A
+;--------------------------------
+HDMAXLINECOUNT = $00430A
+HDMA0LINECOUNT = $00430A
+HDMA1LINECOUNT = $00431A
+HDMA2LINECOUNT = $00432A
+HDMA3LINECOUNT = $00433A
+HDMA4LINECOUNT = $00434A
+HDMA5LINECOUNT = $00435A
+HDMA6LINECOUNT = $00436A
+HDMA7LINECOUNT = $00437A
+
+;===================================================================================================
+macro assertREG(label, address)
+  assert <label> = <address>, "<label> labeled at incorrect address."
+endmacro
+
+%assertREG(MSUSTATUS, $2000)
+%assertREG(MSUSEEK, $2000)
+%assertREG(MSUDATA, $2001)
+%assertREG(MSUID, $2002)
+%assertREG(MSUTRACK, $2004)
+%assertREG(MSUVOL, $2006)
+%assertREG(MSUCTL, $2007)
+
+%assertREG(INIDISP, $2100)
+%assertREG(OBSEL, $2101)
+%assertREG(OAMADDL, $2102)
+%assertREG(OAMADDH, $2103)
+%assertREG(OAMDATA, $2104)
+%assertREG(BGMODE, $2105)
+%assertREG(MOSAIC, $2106)
+%assertREG(BG1SC, $2107)
+%assertREG(BG2SC, $2108)
+%assertREG(BG3SC, $2109)
+%assertREG(BG4SC, $210A)
+%assertREG(BG12NBA, $210B)
+%assertREG(BG34NBA, $210C)
+%assertREG(BG1HOFS, $210D)
+%assertREG(BG1VOFS, $210E)
+%assertREG(BG2HOFS, $210F)
+%assertREG(BG2VOFS, $2110)
+%assertREG(BG3HOFS, $2111)
+%assertREG(BG3VOFS, $2112)
+%assertREG(BG4HOFS, $2113)
+%assertREG(BG4VOFS, $2114)
+%assertREG(VMAIN, $2115)
+%assertREG(VMADDL, $2116)
+%assertREG(VMADDH, $2117)
+%assertREG(VMDATAL, $2118)
+%assertREG(VMDATAH, $2119)
+%assertREG(M7SEL, $211A)
+%assertREG(M7A, $211B)
+%assertREG(M7B, $211C)
+%assertREG(M7C, $211D)
+%assertREG(M7D, $211E)
+%assertREG(M7X, $211F)
+%assertREG(M7Y, $2120)
+%assertREG(CGADD, $2121)
+%assertREG(CGDATA, $2122)
+%assertREG(W12SEL, $2123)
+%assertREG(W34SEL, $2124)
+%assertREG(WOBJSEL, $2125)
+%assertREG(WH0, $2126)
+%assertREG(WH1, $2127)
+%assertREG(WH2, $2128)
+%assertREG(WH3, $2129)
+%assertREG(WBGLOG, $212A)
+%assertREG(WOBJLOG, $212B)
+%assertREG(TM, $212C)
+%assertREG(TS, $212D)
+%assertREG(TMW, $212E)
+%assertREG(TSW, $212F)
+%assertREG(CGWSEL, $2130)
+%assertREG(CGADSUB, $2131)
+%assertREG(COLDATA, $2132)
+%assertREG(SETINI, $2133)
+%assertREG(MPYL, $2134)
+%assertREG(MPYM, $2135)
+%assertREG(MPYH, $2136)
+%assertREG(SLHV, $2137)
+%assertREG(OAMDATAREAD, $2138)
+%assertREG(VMDATALREAD, $2139)
+%assertREG(VMDATAHREAD, $213A)
+%assertREG(CGDATAREAD, $213B)
+%assertREG(OPHCT, $213C)
+%assertREG(OPVCT, $213D)
+%assertREG(STAT77, $213E)
+%assertREG(STAT78, $213F)
+%assertREG(APUIO0, $2140)
+%assertREG(APUIO1, $2141)
+%assertREG(APUIO2, $2142)
+%assertREG(APUIO3, $2143)
+
+%assertREG(WMADDR, $2181)
+%assertREG(WMADDL, $2181)
+%assertREG(WMADDH, $2182)
+%assertREG(WMADDB, $2183)
+
+%assertREG(NMITIMEN, $4200)
+%assertREG(WRIO, $4201)
+%assertREG(WRMPYA, $4202)
+%assertREG(WRMPYB, $4203)
+%assertREG(WRDIVL, $4204)
+%assertREG(WRDIVH, $4205)
+%assertREG(WRDIVB, $4206)
+%assertREG(HTIMEL, $4207)
+%assertREG(HTIMEH, $4208)
+%assertREG(VTIMEL, $4209)
+%assertREG(VTIMEH, $420A)
+%assertREG(MDMAEN, $420B)
+%assertREG(HDMAEN, $420C)
+%assertREG(MEMSEL, $420D)
+%assertREG(RDNMI, $4210)
+%assertREG(TIMEUP, $4211)
+%assertREG(HVBJOY, $4212)
+%assertREG(RDIO, $4213)
+%assertREG(RDDIVL, $4214)
+%assertREG(RDDIVH, $4215)
+%assertREG(RDMPYL, $4216)
+%assertREG(RDMPYH, $4217)
+%assertREG(JOY1L, $4218)
+%assertREG(JOY1H, $4219)
+%assertREG(JOY2L, $421A)
+%assertREG(JOY2H, $421B)
+%assertREG(JOY3L, $421C)
+%assertREG(JOY3H, $421D)
+%assertREG(JOY4L, $421E)
+%assertREG(JOY4H, $421F)
+
+%assertREG(DMAP0, $4300)
+%assertREG(BBAD0, $4301)
+%assertREG(A1T0L, $4302)
+%assertREG(A1T0H, $4303)
+%assertREG(A1B0, $4304)
+%assertREG(DAS0L, $4305)
+%assertREG(DAS0H, $4306)
+%assertREG(DAS0B, $4307)
+%assertREG(A2A0L, $4308)
+%assertREG(A2A0H, $4309)
+%assertREG(NTLR0, $430A)
+%assertREG(DMAP1, $4310)
+%assertREG(BBAD1, $4311)
+%assertREG(A1T1L, $4312)
+%assertREG(A1T1H, $4313)
+%assertREG(A1B1, $4314)
+%assertREG(DAS1L, $4315)
+%assertREG(DAS1H, $4316)
+%assertREG(DAS1B, $4317)
+%assertREG(A2A1L, $4318)
+%assertREG(A2A1H, $4319)
+%assertREG(NTLR1, $431A)
+%assertREG(DMAP2, $4320)
+%assertREG(BBAD2, $4321)
+%assertREG(A1T2L, $4322)
+%assertREG(A1T2H, $4323)
+%assertREG(A1B2, $4324)
+%assertREG(DAS2L, $4325)
+%assertREG(DAS2H, $4326)
+%assertREG(DAS2B, $4327)
+%assertREG(A2A2L, $4328)
+%assertREG(A2A2H, $4329)
+%assertREG(NTLR2, $432A)
+%assertREG(DMAP3, $4330)
+%assertREG(BBAD3, $4331)
+%assertREG(A1T3L, $4332)
+%assertREG(A1T3H, $4333)
+%assertREG(A1B3, $4334)
+%assertREG(DAS3L, $4335)
+%assertREG(DAS3H, $4336)
+%assertREG(DAS3B, $4337)
+%assertREG(A2A3L, $4338)
+%assertREG(A2A3H, $4339)
+%assertREG(NTLR3, $433A)
+%assertREG(DMAP4, $4340)
+%assertREG(BBAD4, $4341)
+%assertREG(A1T4L, $4342)
+%assertREG(A1T4H, $4343)
+%assertREG(A1B4, $4344)
+%assertREG(DAS4L, $4345)
+%assertREG(DAS4H, $4346)
+%assertREG(DAS4B, $4347)
+%assertREG(A2A4L, $4348)
+%assertREG(A2A4H, $4349)
+%assertREG(NTLR4, $434A)
+%assertREG(DMAP5, $4350)
+%assertREG(BBAD5, $4351)
+%assertREG(A1T5L, $4352)
+%assertREG(A1T5H, $4353)
+%assertREG(A1B5, $4354)
+%assertREG(DAS5L, $4355)
+%assertREG(DAS5H, $4356)
+%assertREG(DAS5B, $4357)
+%assertREG(A2A5L, $4358)
+%assertREG(A2A5H, $4359)
+%assertREG(NTLR5, $435A)
+%assertREG(DMAP6, $4360)
+%assertREG(BBAD6, $4361)
+%assertREG(A1T6L, $4362)
+%assertREG(A1T6H, $4363)
+%assertREG(A1B6, $4364)
+%assertREG(DAS6L, $4365)
+%assertREG(DAS6H, $4366)
+%assertREG(DAS6B, $4367)
+%assertREG(A2A6L, $4368)
+%assertREG(A2A6H, $4369)
+%assertREG(NTLR6, $436A)
+%assertREG(DMAP7, $4370)
+%assertREG(BBAD7, $4371)
+%assertREG(A1T7L, $4372)
+%assertREG(A1T7H, $4373)
+%assertREG(A1B7, $4374)
+%assertREG(DAS7L, $4375)
+%assertREG(DAS7H, $4376)
+%assertREG(DAS7B, $4377)
+%assertREG(A2A7L, $4378)
+%assertREG(A2A7H, $4379)
+%assertREG(NTLR7, $437A)
diff --git a/retro.asm b/retro.asm
index 847549b..062aafc 100644
--- a/retro.asm
+++ b/retro.asm
@@ -24,9 +24,8 @@ SearchForEquippedItem:
 	LDA.l BowEquipment ; thing we wrote over
 RTL
 
-!INFINITE_ARROWS = "$7F50C8"
 DecrementArrows:
-	LDA.l !INFINITE_ARROWS : BNE .infinite
+	LDA.l InfiniteArrows : BNE .infinite
 	LDA.l ArrowMode : BNE .rupees : BRA .normal
 	.infinite
 		LDA.b #$01 : RTL
@@ -36,7 +35,7 @@ DecrementArrows:
 		BRA .done
 	.rupees
 		REP #$20
-		LDA.b $A0 : CMP #$0111 : SEP #$20 : BNE .not_archery_game
+		LDA.b $A0 : CMP.w #$0111 : SEP #$20 : BNE .not_archery_game
 			LDA.b $1B : BEQ .not_archery_game ; in overworld
 			LDA.w $0B9A : BEQ .shoot_arrow ; arrow game active
 			LDA.b #$00 : BRA .done
diff --git a/rngfixes.asm b/rngfixes.asm
index adb3d1c..335884e 100644
--- a/rngfixes.asm
+++ b/rngfixes.asm
@@ -2,42 +2,41 @@
 ; RNG Fixes
 ;--------------------------------------------------------------------------------
 RigDigRNG:
-	LDA $7FFE01 : CMP.l DiggingGameRNG : !BGE .forceHeart
+	LDA.l $7FFE01 : CMP.l DiggingGameRNG : !BGE .forceHeart
 	.normalItem
 	JML GetRandomInt
 	.forceHeart
-	LDA $7FFE00 : BNE .normalItem
-	LDA #$04
+	LDA.l $7FFE00 : BNE .normalItem
+	LDA.b #$04
 RTL
 ;--------------------------------------------------------------------------------
 RigChestRNG:
 	JSL.l DecrementChestCounter
-	LDA $04C4 : CMP.l ChestGameRNG : BEQ .forceHeart
+	LDA.w $04C4 : CMP.l ChestGameRNG : BEQ .forceHeart
 	.normalItem
 	JSL GetRandomInt
 	AND.b #$07 ; restrict values to 0-7
-	CMP #$07 : BEQ .notHeart
+	CMP.b #$07 : BEQ .notHeart
 	JSL.l DecrementItemCounter
 RTL
 	.forceHeart
-	LDA #$33 : STA $C8 ; assure the correct state if player talked to shopkeeper
-	LDA $0403 : AND.b #$40 : BNE .notHeart
-	LDA #$07 ; give prize item
+	LDA.b #$33 : STA.b $C8 ; assure the correct state if player talked to shopkeeper
+	LDA.w $0403 : AND.b #$40 : BNE .notHeart
+	LDA.b #$07 ; give prize item
 RTL
 	.notHeart
 	JSL.l DecrementItemCounter
-	;LDA #$00 ; bullshit rupee farming in chest game
 	
 	JSL GetRandomInt ; spam RNG until we stop getting the prize item
 	AND.b #$07 ; restrict values to 0-7
-	CMP #$07 : BNE + ; player got prize item AGAIN
+	CMP.b #$07 : BNE + ; player got prize item AGAIN
 		LDA.b #$00 ; give them money instead
 	+
 RTL
 ;--------------------------------------------------------------------------------
 FixChestCounterForChestGame:
 	JSL.l DecrementItemCounter
-	JSL $0DBA71
+	JSL.l $0DBA71
 RTL
 ;--------------------------------------------------------------------------------
 RNG_Lanmolas1:
@@ -45,12 +44,12 @@ RNG_Lanmolas1:
 RNG_Moldorm1:
 	LDA.b #$01 : BRA _rng_done
 RNG_Agahnim1:
-	LDA.b $A0 : CMP #$20 : BNE RNG_Agahnim2 ; Agah 1 and 2 use the same code, check which agah we're fighting and branch
+	LDA.b $A0 : CMP.b #$20 : BNE RNG_Agahnim2 ; Agah 1 and 2 use the same code, check which agah we're fighting and branch
 	LDA.b #$02
 	JSL.l GetStaticRNG : PHA
 	LDA.l GanonAgahRNG : BEQ + ; check if blue balls are disabled
 		PLA
-		ORA #$01 ; guarantee no blue ball
+		ORA.b #$01 ; guarantee no blue ball
 		RTL
 	+
 	PLA
@@ -77,7 +76,7 @@ RNG_Agahnim2:
 	JSL.l GetStaticRNG : PHA
 	LDA.l GanonAgahRNG : BEQ + ; check if blue balls are disabled
 		PLA
-		ORA #$01 ; guarantee no blue ball
+		ORA.b #$01 ; guarantee no blue ball
 		RTL
 	+
 	PLA
@@ -89,32 +88,31 @@ RNG_Ganon:
 RNG_Ganon_Extra_Warp:
 	LDA.b #$0E
 	JSL.l GetStaticRNG : PHA
-	LDA GanonAgahRNG : BEQ + ; check if warps are disabled
+	LDA.l GanonAgahRNG : BEQ + ; check if warps are disabled
 		PLA
-		AND #$FE ; set least significant bit to 0 to prevent teleport
+		AND.b #$FE ; set least significant bit to 0 to prevent teleport
 		RTL
 	+
 	PLA
 	RTL
 RNG_Enemy_Drops:
-        LDA.l ProgressIndicator : CMP #$01 : BEQ + ; drops are static after uncle pickup & before rescuing zelda
-            JML GetRandomInt
+        LDA.l ProgressIndicator : CMP.b #$01 : BEQ + ; drops are static after uncle pickup & before rescuing zelda
+                JML GetRandomInt
         +
-            LDA.b #$0F
-	_rng_done:
-	JSL.l GetStaticRNG
+                LDA.b #$0F
+        _rng_done:
+        JSL.l GetStaticRNG
 RTL
 ;--------------------------------------------------------------------------------
 ; In: A = RNG Index
 ; Out: A = RNG Result
 ;--------------------------------------------------------------------------------
-!RNG_POINTERS = "$7F5200"
 GetStaticRNG:
 	PHX : PHP
 	REP #$30 ; set 16-bit accumulator and index registers
 	AND.w #$000F
-	ASL : TAX : LDA !RNG_POINTERS, X : INC : AND.w #$03FF : STA !RNG_POINTERS, X : TAX ; increment pointer and move value to X
-	LDA Static_RNG, X ; load RNG value
+	ASL : TAX : LDA.l RNGPointers, X : INC : AND.w #$03FF : STA.l RNGPointers, X : TAX ; increment pointer and move value to X
+	LDA.l Static_RNG, X ; load RNG value
 	PLP : PLX
 RTL
 ;--------------------------------------------------------------------------------
@@ -123,10 +121,10 @@ InitRNGPointerTable:
 	REP #$30 ; set 16-bit accumulator & index registers
 	LDX.w #$0000
 	-
-		LDA.l .rngDefaults, X : STA !RNG_POINTERS, X : INX #2
-		LDA.l .rngDefaults, X : STA !RNG_POINTERS, X : INX #2
-		LDA.l .rngDefaults, X : STA !RNG_POINTERS, X : INX #2
-		LDA.l .rngDefaults, X : STA !RNG_POINTERS, X : INX #2
+		LDA.l .rngDefaults, X : STA.l RNGPointers, X : INX #2
+		LDA.l .rngDefaults, X : STA.l RNGPointers, X : INX #2
+		LDA.l .rngDefaults, X : STA.l RNGPointers, X : INX #2
+		LDA.l .rngDefaults, X : STA.l RNGPointers, X : INX #2
 	CPX.w #$001F : !BLT -
 	PLP : PLX
 RTL
diff --git a/roomloading.asm b/roomloading.asm
index 2e07057..90cf931 100644
--- a/roomloading.asm
+++ b/roomloading.asm
@@ -19,9 +19,6 @@ LoadRoomHook:
 NoCallback:
     RTL
 
-!RL_TILE = 2
-!RL_LINE = 128
-
 macro setTilePointer(roomX, roomY, quadX, quadY)
     ; Left-to-right math. Should be equivalent to 0x7e2000+(roomX*2)+(roomY*128)+(quadX*64)+(quadY*4096)
     LDX.w #<quadY>*32+<roomY>*2+<quadX>*32+<roomX>*2
@@ -36,15 +33,15 @@ macro writeTileAt(roomX, roomY, quadX, quadY)
     STA.l <quadY>*32+<roomY>*2+<quadX>*32+<roomX>*2+$7E2000
 endmacro
 
-!BOMBOS_BORDER = #$08D0
-!BOMBOS_ICON_1 = #$0CCA
-!BOMBOS_ICON_2 = #$0CCB
-!BOMBOS_ICON_3 = #$0CDA
-!BOMBOS_ICON_4 = #$0CDB
+!BOMBOS_BORDER = $08D0
+!BOMBOS_ICON_1 = $0CCA
+!BOMBOS_ICON_2 = $0CCB
+!BOMBOS_ICON_3 = $0CDA
+!BOMBOS_ICON_4 = $0CDB
 macro DrawBombosPlatform(roomX, roomY, quadX, quadY)
     REP #$30 ; 16 AXY
     %setTilePointer(<roomX>, <roomY>, <quadX>, <quadY>)
-    LDA.w !BOMBOS_BORDER
+    LDA.w #!BOMBOS_BORDER
     %writeTile()
     %writeTile()
     %writeTile()
@@ -52,15 +49,15 @@ macro DrawBombosPlatform(roomX, roomY, quadX, quadY)
 
     %setTilePointer(<roomX>, <roomY>+1, <quadX>, <quadY>)
     %writeTile()
-    LDA.w !BOMBOS_ICON_1 : %writeTile()
-    LDA.w !BOMBOS_ICON_2 : %writeTile()
-    LDA.w !BOMBOS_BORDER : %writeTile()
+    LDA.w #!BOMBOS_ICON_1 : %writeTile()
+    LDA.w #!BOMBOS_ICON_2 : %writeTile()
+    LDA.w #!BOMBOS_BORDER : %writeTile()
 
     %setTilePointer(<roomX>, <roomY>+2, <quadX>, <quadY>)
     %writeTile()
-    LDA.w !BOMBOS_ICON_3 : %writeTile()
-    LDA.w !BOMBOS_ICON_4 : %writeTile()
-    LDA.w !BOMBOS_BORDER : %writeTile()
+    LDA.w #!BOMBOS_ICON_3 : %writeTile()
+    LDA.w #!BOMBOS_ICON_4 : %writeTile()
+    LDA.w #!BOMBOS_BORDER : %writeTile()
 
     %setTilePointer(<roomX>, <roomY>+3, <quadX>, <quadY>)
     %writeTile()
diff --git a/save.asm b/save.asm
index 5dd1285..2b01731 100644
--- a/save.asm
+++ b/save.asm
@@ -8,9 +8,9 @@ WriteSaveChecksumAndBackup:
                 CLC : ADC.l ExtendedFileNameWRAM, X
                 INX #2
         CPX.w #$0FFE : BNE -
-        STA.b $00
+        STA.b Scrap00
         LDA.w #$5A5A
-        SEC : SBC.b $00
+        SEC : SBC.b Scrap00
         STA.l InverseChecksumSRAM
 
         PHB
@@ -32,9 +32,9 @@ ValidateSRAM:
                 CLC : ADC.l ExtendedFileNameSRAM, X
                 INX #2
         CPX.w #$0FFE : BNE -
-        STA.b $00
+        STA.b Scrap00
         LDA.w #$5A5A
-        SEC : SBC.b $00
+        SEC : SBC.b Scrap00
         CMP.l InverseChecksumSRAM : BEQ .goodchecksum
                 LDX.w #$0000 : TXA : - ; Do the same for the backup save
                         CLC : ADC.l SaveBackupSRAM, X
@@ -44,9 +44,9 @@ ValidateSRAM:
                         CLC : ADC.l SaveBackupSRAM+$500, X
                         INX #2
                 CPX.w #$0FFE : BNE -
-                STA.b $00
+                STA.b Scrap00
                 LDA.w #$5A5A
-                SEC : SBC.b $00
+                SEC : SBC.b Scrap00
                 CMP.l SaveBackupSRAM+$4FE : BEQ +
                         TDC : STA.l FileValiditySRAM ; Delete save by way of zeroing validity marker
                         BRA .goodchecksum : +
@@ -132,86 +132,86 @@ RTL
 CopyExtendedSaveFileToWRAM:
         PHA
         SEP #$30
-                LDA.w $4300 : PHA ; preserve DMA parameters
-                LDA.w $4301 : PHA ; preserve DMA parameters
-                LDA.w $4302 : PHA ; preserve DMA parameters
-                LDA.w $4303 : PHA ; preserve DMA parameters
-                LDA.w $4304 : PHA ; preserve DMA parameters
-                LDA.w $4305 : PHA ; preserve DMA parameters
-                LDA.w $4306 : PHA ; preserve DMA parameters
+                LDA.w DMAP0 : PHA ; preserve DMA parameters
+                LDA.w BBAD0 : PHA ; preserve DMA parameters
+                LDA.w A1T0L : PHA ; preserve DMA parameters
+                LDA.w A1T0H : PHA ; preserve DMA parameters
+                LDA.w A1B0 : PHA ; preserve DMA parameters
+                LDA.w DAS0L : PHA ; preserve DMA parameters
+                LDA.w DAS0H : PHA ; preserve DMA parameters
                 ;--------------------------------------------------------------------------------
-                STZ.w $4200 ; Disable NMI, V/H, joypad
-                STZ.w $420C ; Disable HDMA
-                LDA.b #$00 : STA.w $4300 ; set DMA transfer direction A -> B, bus A auto increment, single-byte mode
+                STZ.w NMITIMEN ; Disable NMI, V/H, joypad
+                STZ.w HDMAEN ; Disable HDMA
+                LDA.b #$00 : STA.w DMAP0 ; set DMA transfer direction A -> B, bus A auto increment, single-byte mode
 
-                LDA.b #$80 : STA.w $4301 ; set bus B source to WRAM register
+                LDA.b #$80 : STA.w BBAD0 ; set bus B source to WRAM register
 
-                LDA.b #$00 : STA.w $2181 ; set WRAM register source address
-                LDA.b #$60 : STA.w $2182
-                LDA.b #$7F : STA.w $2183
+                LDA.b #$00 : STA.w WMADDL ; set WRAM register source address
+                LDA.b #$60 : STA.w WMADDH
+                LDA.b #$7F : STA.w WMADDB
 
-                STZ.w $4302 ; set bus A destination address to SRAM
-                LDA.b #$05 : STA.w $4303
-                LDA.b #$70 : STA.w $4304
+                STZ.w A1T0L ; set bus A destination address to SRAM
+                LDA.b #$05 : STA.w A1T0H
+                LDA.b #$70 : STA.w A1B0
 
-                LDA.b #$00 : STA.w $4305 ; set transfer size to 0x1000
-                LDA.b #$10 : STA.w $4306 ; STZ $4307
+                LDA.b #$00 : STA.w DAS0L ; set transfer size to 0x1000
+                LDA.b #$10 : STA.w DAS0H ; STZ DAS0B
 
-                LDA.b #$01 : STA.w $420B ; begin DMA transfer
-                LDA.b #$81 : STA.w $4200 ; Re-enable NMI and joypad
+                LDA.b #$01 : STA.w MDMAEN  ; begin DMA transfer
+                LDA.b #$81 : STA.w NMITIMEN ; Re-enable NMI and joypad
                 ;--------------------------------------------------------------------------------
-                PLA : STA.w $4306 ; restore DMA parameters
-                PLA : STA.w $4305 ; restore DMA parameters
-                PLA : STA.w $4304 ; restore DMA parameters
-                PLA : STA.w $4303 ; restore DMA parameters
-                PLA : STA.w $4302 ; restore DMA parameters
-                PLA : STA.w $4301 ; restore DMA parameters
-                PLA : STA.w $4300 ; restore DMA parameters
+                PLA : STA.w DAS0H ; restore DMA parameters
+                PLA : STA.w DAS0L ; restore DMA parameters
+                PLA : STA.w A1B0 ; restore DMA parameters
+                PLA : STA.w A1T0H ; restore DMA parameters
+                PLA : STA.w A1T0L ; restore DMA parameters
+                PLA : STA.w BBAD0 ; restore DMA parameters
+                PLA : STA.w DMAP0 ; restore DMA parameters
         REP #$30
         PLA
-        STA $7EC00D ; what we wrote over
+        STA.l $7EC00D ; what we wrote over
 RTL
 ;--------------------------------------------------------------------------------
 CopyExtendedWRAMSaveFileToSRAM:
         PHA
         PHB
         SEP #$30
-        LDA #$00 : PHA : PLB
-                LDA.w $4300 : PHA ; preserve DMA parameters
-                LDA.w $4301 : PHA ; preserve DMA parameters
-                LDA.w $4302 : PHA ; preserve DMA parameters
-                LDA.w $4303 : PHA ; preserve DMA parameters
-                LDA.w $4304 : PHA ; preserve DMA parameters
-                LDA.w $4305 : PHA ; preserve DMA parameters
-                LDA.w $4306 : PHA ; preserve DMA parameters
+        LDA.b #$00 : PHA : PLB
+                LDA.w DMAP0 : PHA ; preserve DMA parameters
+                LDA.w BBAD0 : PHA ; preserve DMA parameters
+                LDA.w A1T0L : PHA ; preserve DMA parameters
+                LDA.w A1T0H : PHA ; preserve DMA parameters
+                LDA.w A1B0 : PHA ; preserve DMA parameters
+                LDA.w DAS0L : PHA ; preserve DMA parameters
+                LDA.w DAS0H : PHA ; preserve DMA parameters
                 ;--------------------------------------------------------------------------------
-                STZ.w $4200 ; Disable NMI, V/H, joypad
-                STZ.w $420C ; Disable HDMA
-                LDA.b #$80 : STA.w $4300 ; set DMA transfer direction B -> A, bus A auto increment, single-byte mode
+                STZ.w NMITIMEN ; Disable NMI, V/H, joypad
+                STZ.w HDMAEN ; Disable HDMA
+                LDA.b #$80 : STA.w DMAP0 ; set DMA transfer direction B -> A, bus A auto increment, single-byte mode
 
-                STA.w $4301 ; set bus B source to WRAM register
+                STA.w BBAD0 ; set bus B source to WRAM register
 
-                LDA.b #$00 : STA.w $2181 ; set WRAM register source address
-                LDA.b #$60 : STA.w $2182
-                LDA.b #$7F : STA.w $2183
+                LDA.b #$00 : STA.w WMADDL ; set WRAM register source address
+                LDA.b #$60 : STA.w WMADDH
+                LDA.b #$7F : STA.w WMADDB
 
-                STZ.w $4302 ; set bus A destination address to SRAM
-                LDA.b #$05 : STA.w $4303
-                LDA.b #$70 : STA.w $4304
+                STZ.w A1T0L ; set bus A destination address to SRAM
+                LDA.b #$05 : STA.w A1T0H
+                LDA.b #$70 : STA.w A1B0
 
-                LDA.b #$10 : STA.w $4305 ; set transfer size to 0xB00
-                LDA.b #$0B : STA.w $4306 ; STZ $4307
+                LDA.b #$10 : STA.w DAS0L ; set transfer size to 0xB00
+                LDA.b #$0B : STA.w DAS0H ; STZ DAS0B
 
-                LDA.b #$01 : STA.w $420B ; begin DMA transfer
-                LDA.b #$81 : STA.w $4200 ; Re-enable NMI and joypad
+                LDA.b #$01 : STA.w MDMAEN ; begin DMA transfer
+                LDA.b #$81 : STA.w NMITIMEN; Re-enable NMI and joypad
                 ;--------------------------------------------------------------------------------
-                PLA : STA.w $4306 ; restore DMA parameters
-                PLA : STA.w $4305 ; restore DMA parameters
-                PLA : STA.w $4304 ; restore DMA parameters
-                PLA : STA.w $4303 ; restore DMA parameters
-                PLA : STA.w $4302 ; restore DMA parameters
-                PLA : STA.w $4301 ; restore DMA parameters
-                PLA : STA.w $4300 ; restore DMA parameters
+                PLA : STA.w DAS0H ; restore DMA parameters
+                PLA : STA.w DAS0L ; restore DMA parameters
+                PLA : STA.w A1B0 ; restore DMA parameters
+                PLA : STA.w A1T0H ; restore DMA parameters
+                PLA : STA.w A1T0L ; restore DMA parameters
+                PLA : STA.w BBAD0 ; restore DMA parameters
+                PLA : STA.w DMAP0 ; restore DMA parameters
         REP #$30
         PLB
         PLA
diff --git a/seedtag.asm b/seedtag.asm
deleted file mode 100644
index 7da5b80..0000000
--- a/seedtag.asm
+++ /dev/null
@@ -1,34 +0,0 @@
-;--------------------------------------------------------------------------------
-; GenerateSeedTags
-;--------------------------------------------------------------------------------
-;GenerateSeedTags:
-;	PHA : PHX : PHY : PHP
-;	REP #$20 ; set 16-bit accumulator
-;		LDA $00 : PHA
-;		LDA $02 : PHA
-;		LDA $04 : PHA
-;		LDA $06 : PHA
-;		JSL.l NameHash ; get the titlecard hashes
-;		
-;		LDA $00 : AND.w #$1F1F : STA $00 ; keep it under 0x20 or we'll run out of items
-;		LDA $02 : AND.w #$1F1F : STA $02
-;		LDA $04 : AND.w #$1F1F : STA $04
-;		LDA $06 : AND.w #$1F1F : STA $06
-;		
-;		REP #$30 ; set 8-bit accumulator & index registers
-;		
-;		LDY #$08
-;		-
-;			
-;			
-;		DEY : BNE -
-;		
-;
-;		REP #20 ; set 16-bit accumulator
-;		PLA : STA $06
-;		PLA : STA $04
-;		PLA : STA $02
-;		PLA : STA $00
-;	PLP : PLY : PLX : PLA
-;RTL
-;--------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/servicerequest.asm b/servicerequest.asm
index a5318c9..b2e3380 100644
--- a/servicerequest.asm
+++ b/servicerequest.asm
@@ -6,13 +6,13 @@
 ;	$60 - $7E - Reserved
 ;		  $7F - RX Status
 ;	$80 - $EF - TX Buffer
-;	$E0 - $FE - Reserved
+;	$F0 - $FE - Reserved
 ;		  $FF - TX Status
 ;--------------------------------------------------------------------------------
 ; Status Codes
-; #$00 - Idle
-; #$01 - Ready to Read
-; #$FF - Busy
+; $00 - Idle
+; $01 - Ready to Read
+; $FF - Busy
 ;--------------------------------------------------------------------------------
 ; Service Indexes
 ; 0x00 - 0x04 - chests
@@ -21,80 +21,73 @@
 ; 0xF2 - tablet/pedestal
 ;--------------------------------------------------------------------------------
 ; Block Commands
-!SCM_WAIT = "#$00"
+!SCM_WAIT = $00
 
-!SCM_SEEN = "#$01"
-!SCM_SHOW = "#$02"
-!SCM_GET = "#$03"
-!SCM_GIVE = "#$04"
-!SCM_PROMPT = "#$05"
+!SCM_SEEN = $01
+!SCM_SHOW = $02
+!SCM_GET = $03
+!SCM_GIVE = $04
+!SCM_PROMPT = $05
 
-!SCM_AREACHG = "#$10"
-!SCM_DUNGEON = "#$11"
-!SCM_DEATH = "#$12"
-!SCM_SAVEQUIT = "#$13"
-!SCM_FCREATE = "#$14"
-!SCM_FLOAD = "#$15"
-!SCM_FCDELETE = "#$16"
-!SCM_SPAWN = "#$17"
-!SCM_PAUSE = "#$18"
+!SCM_AREACHG = $10
+!SCM_DUNGEON = $11
+!SCM_DEATH = $12
+!SCM_SAVEQUIT = $13
+!SCM_FCREATE = $14
+!SCM_FLOAD = $15
+!SCM_FCDELETE = $16
+!SCM_SPAWN = $17
+!SCM_PAUSE = $18
 
-!SCM_STALL = "#$70"
-!SCM_RESUME = "#$71"
+!SCM_STALL = $70
+!SCM_RESUME = $71
 
-!SCM_VERSION = "#$80"
-; ;--------------------------------------------------------------------------------
-!RX_BUFFER = "$7F5300"
-!RX_STATUS = "$7F537F"
-;ServiceSequenceRx = $7EF4A0
-!TX_BUFFER = "$7F5380"
-!TX_STATUS = "$7F53FF"
-;ServiceSequenceTx = $7EF4A0
+!SCM_VERSION = $80
 ;--------------------------------------------------------------------------------
 macro ServiceRequestVersion()
-	LDA !TX_STATUS : BEQ + : CLC : RTL : + ; return fail if we don't have the lock
-		LDA.b #$01 : STA !TX_BUFFER+8 ; version
-		LDA.b #$00 : STA !TX_BUFFER+9
-					STA !TX_BUFFER+10
-					STA !TX_BUFFER+11
-		LDA.b !SCM_VERSION : STA !TX_BUFFER
-	LDA #$01 : STA !TX_STATUS ; mark ready for reading
+	LDA.l TxStatus : BEQ + : CLC : RTL : + ; return fail if we don't have the lock
+		LDA.b #$01 : STA.l TxBuffer+8 ; version
+		LDA.b #$00 : STA.l TxBuffer+9
+					STA.l TxBuffer+10
+					STA.l TxBuffer+11
+		LDA.b #!SCM_VERSION : STA.l TxBuffer
+	LDA.b #$01 : STA.l TxStatus ; mark ready for reading
 	SEC ; mark request as successful
 RTL
 endmacro
 ;--------------------------------------------------------------------------------
 macro ServiceRequestChest(type)
-	LDA !TX_STATUS : BEQ + : CLC : RTL : + ; return fail if we don't have the lock
-		LDA $1B : STA !TX_BUFFER+8 ; indoor/outdoor
+	LDA.l TxStatus : BEQ + : CLC : RTL : + ; return fail if we don't have the lock
+		LDA.b $1B : STA.l TxBuffer+8 ; indoor/outdoor
 		BEQ +
-			LDA $A0 : STA !TX_BUFFER+9 ; roomid low
-			LDA $A1 : STA !TX_BUFFER+10 ; roomid high
+			LDA.b $A0 : STA.l TxBuffer+9 ; roomid low
+			LDA.b $A1 : STA.l TxBuffer+10 ; roomid high
 			BRA ++
 		+
-			LDA $040A : STA !TX_BUFFER+9 ; area id
-			LDA.b #$00 : STA !TX_BUFFER+10 ; protocol defines this as a ushort
+			LDA.w $040A : STA.l TxBuffer+9 ; area id
+			LDA.b #$00 : STA.l TxBuffer+10 ; protocol defines this as a ushort
 		++
-		LDA $76 : !SUB #$58 : STA !TX_BUFFER+11 ; object index (type 2 only)
-		LDA <type> : STA !TX_BUFFER ; item get
-	LDA #$01 : STA !TX_STATUS ; mark ready for reading
+		LDA.b $76 : !SUB #$58 : STA.l TxBuffer+11 ; object index (type 2 only)
+		LDA.b #<type> : STA.l TxBuffer ; item get
+	LDA.b #$01 : STA.l TxStatus ; mark ready for reading
 	SEC ; mark request as successful
 RTL
 endmacro
 ;--------------------------------------------------------------------------------
 macro ServiceRequest(type,index)
-	LDA !TX_STATUS : BEQ + : CLC : RTL : + ; return fail if we don't have the lock
-		LDA $1B : STA !TX_BUFFER+8 ; indoor/outdoor
+	LDA.l TxStatus : BEQ + : CLC : RTL : + ; return fail if we don't have the lock
+		LDA.b $1B : STA.l TxBuffer+8 ; indoor/outdoor
 		BEQ +
-			LDA $A0 : STA !TX_BUFFER+9 ; roomid low
-			LDA $A1 : STA !TX_BUFFER+10 ; roomid high
+			LDA.b $A0 : STA.l TxBuffer+9 ; roomid low
+			LDA.b $A1 : STA.l TxBuffer+10 ; roomid high
 			BRA ++
 		+
-			LDA $040A : STA !TX_BUFFER+9 ; area id
-			LDA.b #$00 : STA !TX_BUFFER+10 ; protocol defines this as a ushort
+			LDA.w $040A : STA.l TxBuffer+9 ; area id
+			LDA.b #$00 : STA.l TxBuffer+10 ; protocol defines this as a ushort
 		++
-		LDA <index> : STA !TX_BUFFER+11 ; object index (type 2 only)
-		LDA <type> : STA !TX_BUFFER ; item get
-	LDA #$01 : STA !TX_STATUS ; mark ready for reading
+		LDA.b #<index> : STA.l TxBuffer+11 ; object index (type 2 only)
+		LDA.b #<type> : STA.l TxBuffer ; item get
+	LDA.b #$01 : STA.l TxStatus ; mark ready for reading
 	SEC ; mark request as successful
 RTL
 endmacro
@@ -102,55 +95,55 @@ endmacro
 PollService:
 	PHP
 	SEP #$20 ; set 8-bit accumulator
-	LDA !RX_STATUS : DEC : BEQ + : PLP : CLC : RTL : + ; return fail if there's nothing to read
-		LDA #$FF : STA !RX_STATUS ; stop calls from recursing in
-		LDA !RX_BUFFER : CMP.b !SCM_GIVE : BNE + ; give item
-			PHY : LDA.l !RX_BUFFER+8 : TAY
-			LDA.l !RX_BUFFER+9 : BNE ++
+	LDA.l RxStatus : DEC : BEQ + : PLP : CLC : RTL : + ; return fail if there's nothing to read
+		LDA.b #$FF : STA.l RxStatus ; stop calls from recursing in
+		LDA.l RxBuffer : CMP.b #!SCM_GIVE : BNE + ; give item
+			PHY : LDA.l RxBuffer+8 : TAY
+			LDA.l RxBuffer+9 : BNE ++
 				JSL.l Link_ReceiveItem ; do something else
 				PLY : BRA .done
 			++
 				JSL.l Link_ReceiveItem
 				PLY : BRA .done
-		+ : CMP.b !SCM_SHOW : BNE + ; show item
+		+ : CMP.b #!SCM_SHOW : BNE + ; show item
 			; you could check here if you're on the right screen, etc
-			LDA.l !RX_BUFFER+12 : JSL.l PrepDynamicTile ; we could properly process the whole message but we're not going to
+			LDA.l RxBuffer+12 : JSL.l PrepDynamicTile ; we could properly process the whole message but we're not going to
 			BRA .done
-		+ : CMP.b !SCM_PROMPT : BNE + ; item prompt
-			LDA.l !RX_BUFFER+8 : TAX
-			LDA.l !RX_BUFFER+9 : STA $7E012E, X ; set sound effect, could possibly make this STA not-long
+		+ : CMP.b #!SCM_PROMPT : BNE + ; item prompt
+			LDA.l RxBuffer+8 : TAX
+			LDA.l RxBuffer+9 : STA.w $012E, X ; set sound effect
 			REP #$30 ; set 16-bit accumulator and index registers
-				LDA !RX_BUFFER+10 : TAX
-				LDA !RX_BUFFER+12
+				LDA.l RxBuffer+10 : TAX
+				LDA.l RxBuffer+12
 				JSL.l DoToast
 			SEP #$30 ; set 8-bit accumulator and index registers
-		+ : CMP.b !SCM_VERSION : BNE + ; version
+		+ : CMP.b #!SCM_VERSION : BNE + ; version
 			%ServiceRequestVersion()
 		+
 	.done
-	LDA #$00 : STA !RX_STATUS ; release lock
+	LDA.l #$00 : STA.l RxStatus ; release lock
 	PLP
 	SEC ; mark request as successful
 RTL
 ;--------------------------------------------------------------------------------
 ItemVisualServiceRequest_F0:
-%ServiceRequest(!SCM_SEEN, #$F0)
+%ServiceRequest(!SCM_SEEN, $F0)
 ;--------------------------------------------------------------------------------
 ItemVisualServiceRequest_F1:
-%ServiceRequest(!SCM_SEEN, #$F1)
+%ServiceRequest(!SCM_SEEN, $F1)
 ;--------------------------------------------------------------------------------
 ItemVisualServiceRequest_F2:
-%ServiceRequest(!SCM_SEEN, #$F2)
+%ServiceRequest(!SCM_SEEN, $F2)
 ;--------------------------------------------------------------------------------
 ChestItemServiceRequest:
 %ServiceRequestChest(!SCM_GET)
 ;--------------------------------------------------------------------------------
 ItemGetServiceRequest_F0:
-%ServiceRequest(!SCM_GET, #$F0)
+%ServiceRequest(!SCM_GET, $F0)
 ;--------------------------------------------------------------------------------
 ItemGetServiceRequest_F1:
-%ServiceRequest(!SCM_GET, #$F1)
+%ServiceRequest(!SCM_GET, $F1)
 ;--------------------------------------------------------------------------------
 ItemGetServiceRequest_F2:
-%ServiceRequest(!SCM_GET, #$F2)
+%ServiceRequest(!SCM_GET, $F2)
 ;--------------------------------------------------------------------------------
diff --git a/shopkeeper.asm b/shopkeeper.asm
index 722ccf4..2e9de97 100644
--- a/shopkeeper.asm
+++ b/shopkeeper.asm
@@ -2,25 +2,23 @@
 ; 291 - Moldorm Cave
 ; 286 - Northeast Dark Swamp Cave
 ;--------------------------------------------------------------------------------
-!BIGRAM = "$7EC900";
-;--------------------------------------------------------------------------------
-!SPRITE_OAM = "$7EC025"
+!FREE_TILE_BUFFER = $1180
 ; A = Tile ID
 macro UploadOAM(dest)
 	PHA : PHP
 
 	PHA
 		REP #$20 ; set 16-bit accumulator
-		LDA.w #$0000 : STA.l !SPRITE_OAM
-		               STA.l !SPRITE_OAM+2
-		LDA.w #$0200 : STA.l !SPRITE_OAM+6
+		LDA.w #$0000 : STA.l SpriteOAM
+		               STA.l SpriteOAM+2
+		LDA.w #$0200 : STA.l SpriteOAM+6
 		SEP #$20 ; set 8-bit accumulator
-		LDA.b <dest> : STA.l !SPRITE_OAM+4
+		LDA.b <dest> : STA.l SpriteOAM+4
 
-	LDA $01,s
+	LDA.b $01,s
 
 		JSL.l GetSpritePalette
-		STA !SPRITE_OAM+5 : STA !SPRITE_OAM+13
+		STA.l SpriteOAM+5 : STA.l SpriteOAM+13
 	PLA
 	JSL.l IsNarrowSprite : BCS .narrow
 
@@ -28,10 +26,10 @@ macro UploadOAM(dest)
 
 	.narrow
 	REP #$20 ; set 16-bit accumulator
-	LDA.w #$0000 : STA.l !SPRITE_OAM+7
-	               STA.l !SPRITE_OAM+14
-	LDA.w #$0800 : STA.l !SPRITE_OAM+9
-	LDA.w #$3400 : STA.l !SPRITE_OAM+11
+	LDA.w #$0000 : STA.l SpriteOAM+7
+	               STA.l SpriteOAM+14
+	LDA.w #$0800 : STA.l SpriteOAM+9
+	LDA.w #$3400 : STA.l SpriteOAM+11
 
 	.done
 	PLP : PLA
@@ -42,35 +40,33 @@ endmacro
 ; $0E-$0F : Base Coordinate
 ;--------------------------------------------------------------------------------
 macro DrawDigit(value,offset)
-	STZ $0A ; clear digit buffer
-	LDA $0C ; load value
+	STZ.b Scrap0A ; clear digit buffer
+	LDA.b Scrap0C ; load value
 	--
 	CMP.w <value> : !BLT ++
 		!SUB.w <value>
-		INC $0A
+		INC.b Scrap0A
 		BRA --
 	++
-	STA $0C ; save value
+	STA.b Scrap0C ; save value
 	CPY.b #$FF : BNE +
 		LDY.b <offset>
-		LDA $0E : !ADD.w .digit_offsets, Y : STA $0E
+		LDA.b Scrap0E : !ADD.w .digit_offsets, Y : STA.b Scrap0E
 	+
-	LDA $0E : STA !BIGRAM, X : INX : INX
-	LDA.w #56 : STA !BIGRAM, X : INX : INX
-	LDY $0A : TYA : ASL : TAY : LDA.w .digit_properties, Y : STA !BIGRAM, X : INX : INX
-	LDA.w #$0000 : STA !BIGRAM, X : INX : INX
+	LDA.b Scrap0E : STA.l BigRAM, X : INX : INX
+	LDA.w #56 : STA.l BigRAM, X : INX : INX
+	LDY.b Scrap0A : TYA : ASL : TAY : LDA.w .digit_properties, Y : STA.l BigRAM, X : INX : INX
+	LDA.w #$0000 : STA.l BigRAM, X : INX : INX
 	
-	LDA $0E : !ADD.w #$0008 : STA $0E ; move offset 8px right
+	LDA.b Scrap0E : !ADD.w #$0008 : STA.b Scrap0E ; move offset 8px right
 endmacro
 ;--------------------------------------------------------------------------------
-!COLUMN_LOW = "$7F5022"
-!COLUMN_HIGH = "$7F5023"
 DrawPrice:
 	PHX : PHY : PHP
 		LDY.b #$FF
-		LDX #$00 ; clear bigram pointer
+		LDX.b #$00 ; clear bigram pointer
 
-		LDA $0C : CMP.w #1000 : !BLT + : JMP .len4 : +
+		LDA.b Scrap0C : CMP.w #1000 : !BLT + : JMP .len4 : +
 				  CMP.w #100 : !BLT + : JMP .len3 : +
 				  CMP.w #10 : !BLT + : JMP .len2 : +
 				  CMP.w #1 : !BLT + : JMP .len1 : +
@@ -88,11 +84,11 @@ DrawPrice:
 				%DrawDigit(#1,#0)
 				
 		SEP #$20 ; set 8-bit accumulator
-		TXA : LSR #3 : STA $06 ; request 1-4 OAM slots
+		TXA : LSR #3 : STA.b Scrap06 ; request 1-4 OAM slots
 		ASL #2
 			PHA
-				LDA $22 : CMP !COLUMN_LOW : !BLT .off
-						  CMP !COLUMN_HIGH : !BGE .off
+				LDA.b $22 : CMP.l ShopPriceColumn : !BLT .off
+                                        CMP.l ShopPriceColumn+1 : !BGE .off
 				.on
 				PLA : JSL.l OAM_AllocateFromRegionB : BRA + ; request 4-16 bytes
 				.off
@@ -102,20 +98,6 @@ DrawPrice:
 	PLP : PLY : PLX
 RTS
 ;--------------------------------------------------------------------------------
-!TILE_UPLOAD_OFFSET_OVERRIDE = "$7F5042"
-!FREE_TILE_BUFFER = "#$1180"
-!SHOP_ID = "$7F5050"
-!SHOP_TYPE = "$7F5051"
-!SHOP_INVENTORY = "$7F5052" ; $7F505E
-!SHOP_STATE = "$7F505F"
-!SHOP_CAPACITY = "$7F5060"
-!SCRATCH_TEMP_X = "$7F5061"
-!SHOP_SRAM_INDEX = "$7F5062"
-!SHOP_MERCHANT = "$7F5063"
-!SHOP_DMA_TIMER = "$7F5064"
-;--------------------------------------------------------------------------------
-!NMI_AUX = "$7F5044"
-;--------------------------------------------------------------------------------
 .digit_properties
 dw $0230, $0231, $0202, $0203, $0212, $0213, $0222, $0223, $0232, $0233
 ;--------------------------------------------------------------------------------
@@ -126,29 +108,27 @@ SpritePrep_ShopKeeper:
 	PHX : PHY : PHP
 	
 	REP #$30 ; set 16-bit accumulator & index registers
-	;LDA $A0
 	LDX.w #$0000
 	-
-		LDA ShopTable+1, X : CMP $A0 : BNE +
-		;LDA ShopTable+3, X : CMP $010E : BNE +
-		LDA ShopTable+5, X : AND.w #$0040 : BNE ++
-			LDA $7F5099 : AND #$00FF : CMP ShopTable+3, X : BNE +
+		LDA.l ShopTable+1, X : CMP.b $A0 : BNE +
+		LDA.l ShopTable+5, X : AND.w #$0040 : BNE ++
+			LDA.l $7F5099 : AND #$00FF : CMP.l ShopTable+3, X : BNE +
 		++
 			SEP #$20 ; set 8-bit accumulator
-			LDA ShopTable, X : STA !SHOP_ID
-			LDA ShopTable+5, X : STA !SHOP_TYPE
-			AND.b #$03 : ASL #2 : STA !SHOP_CAPACITY
-			LDA ShopTable+6, X : STA !SHOP_MERCHANT
-			LDA ShopTable+7, X : STA !SHOP_SRAM_INDEX
+			LDA.l ShopTable, X : STA.l ShopId
+			LDA.l ShopTable+5, X : STA.l ShopType
+			AND.b #$03 : ASL #2 : STA.l ShopCapacity
+			LDA.l ShopTable+6, X : STA.l ShopMerchant
+			LDA.l ShopTable+7, X : STA.l ShopSRAMIndex
 			BRA .success
 		+
-		LDA ShopTable, X : AND.w #$00FF : CMP.w #$00FF : BEQ .fail
+		LDA.l ShopTable, X : AND.w #$00FF : CMP.w #$00FF : BEQ .fail
 		INX #8
 	BRA -
 	
 	.fail
 	SEP #$20 ; set 8-bit accumulator
-	LDA.b #$FF : STA !SHOP_TYPE ; $FF = error condition
+	LDA.b #$FF : STA.l ShopType ; $FF = error condition
 	JMP .done
 	
 	.success
@@ -157,34 +137,34 @@ SpritePrep_ShopKeeper:
 	LDX.w #$0000
 	LDY.w #$0000
 	-
-		TYA : CMP !SHOP_CAPACITY : !BLT ++ : JMP .stop : ++
+		TYA : CMP.l ShopCapacity : !BLT ++ : JMP .stop : ++
 		LDA.l ShopContentsTable+1, X : CMP.b #$FF : BNE ++ : JMP .stop : ++
 		
-		LDA.l ShopContentsTable, X : CMP !SHOP_ID : BEQ ++ : JMP .next : ++
-			LDA.l ShopContentsTable+1, X : PHX : TYX : STA.l !SHOP_INVENTORY, X : PLX
-			LDA.l ShopContentsTable+2, X : PHX : TYX : STA.l !SHOP_INVENTORY+1, X : PLX
-			LDA.l ShopContentsTable+3, X : PHX : TYX : STA.l !SHOP_INVENTORY+2, X : PLX
+		LDA.l ShopContentsTable, X : CMP.l ShopId : BEQ ++ : JMP .next : ++
+			LDA.l ShopContentsTable+1, X : PHX : TYX : STA.l ShopInventory, X : PLX
+			LDA.l ShopContentsTable+2, X : PHX : TYX : STA.l ShopInventory+1, X : PLX
+			LDA.l ShopContentsTable+3, X : PHX : TYX : STA.l ShopInventory+2, X : PLX
 			
 			PHY
 				PHX
-					LDA.b #$00 : XBA : TYA : LSR #2 : !ADD !SHOP_SRAM_INDEX : TAX
-					LDA PurchaseCounts, X : TYX : STA.l !SHOP_INVENTORY+3, X : TAY
+					LDA.b #$00 : XBA : TYA : LSR #2 : !ADD ShopSRAMIndex : TAX
+					LDA.l PurchaseCounts, X : TYX : STA.l ShopInventory+3, X : TAY
 				PLX
 				
 				LDA.l ShopContentsTable+4, X : BEQ ++
 				TYA : CMP.l ShopContentsTable+4, X : !BLT ++
 					PLY
-					LDA.l ShopContentsTable+5, X : PHX : TYX : STA.l !SHOP_INVENTORY, X : PLX
-					LDA.l ShopContentsTable+6, X : PHX : TYX : STA.l !SHOP_INVENTORY+1, X : PLX
-					LDA.l ShopContentsTable+7, X : PHX : TYX : STA.l !SHOP_INVENTORY+2, X : PLX
+					LDA.l ShopContentsTable+5, X : PHX : TYX : STA.l ShopInventory, X : PLX
+					LDA.l ShopContentsTable+6, X : PHX : TYX : STA.l ShopInventory+1, X : PLX
+					LDA.l ShopContentsTable+7, X : PHX : TYX : STA.l ShopInventory+2, X : PLX
 					BRA +++
 				++
 			PLY : +++
 			
 			PHX : PHY
-				PHX : TYX : LDA.l !SHOP_INVENTORY, X : PLX : TAY
+				PHX : TYX : LDA.l ShopInventory, X : PLX : TAY
 				REP #$20 ; set 16-bit accumulator
-				LDA 1,s : TAX : LDA.l .tile_offsets, X : TAX
+				LDA.b 1,s : TAX : LDA.l .tile_offsets, X : TAX
 				JSR LoadTile
 			PLY : PLX
 			INY #4
@@ -194,50 +174,39 @@ SpritePrep_ShopKeeper:
 	JMP -
 	.stop
 	
-	;LDA $A0 : CMP.b #$FF : BNE .normal
-	;.dumb
-	;	LDA $2137
-	;	LDA $213F
-	;	LDA $213D
-	;	CMP.b #60
-	;	!BLT .dumb
-	;.normal
-	;LDA #$80 : STA $2100
-	;JSR Shopkeeper_UploadVRAMTiles
-	;LDA #$0F : STA $2100
-	LDA.b #Shopkeeper_UploadVRAMTilesLong>>16 : STA !NMI_AUX+2
-	LDA.b #Shopkeeper_UploadVRAMTilesLong>>8 : STA !NMI_AUX+1
-	LDA.b #Shopkeeper_UploadVRAMTilesLong>>0 : STA !NMI_AUX
+	LDA.b #Shopkeeper_UploadVRAMTilesLong>>16 : STA.l NMIAux+2
+	LDA.b #Shopkeeper_UploadVRAMTilesLong>>8 : STA.l NMIAux+1
+	LDA.b #Shopkeeper_UploadVRAMTilesLong>>0 : STA.l NMIAux
 
 	.done
-	LDA.l !SHOP_TYPE : BIT.b #$20 : BEQ .notTakeAll ; Take-all
+	LDA.l ShopType : BIT.b #$20 : BEQ .notTakeAll ; Take-all
 	.takeAll
 
-		LDA.b #$00 : XBA : LDA !SHOP_SRAM_INDEX : TAX
+		LDA.b #$00 : XBA : LDA.l ShopSRAMIndex : TAX
 		LDA.l PurchaseCounts, X
 		BRA ++
 	.notTakeAll
 		LDA.b #$00
 	++
-	STA !SHOP_STATE
+	STA.l ShopState
 
     ; If the item is $FF, make it not show (as if already taken)
-	LDA !SHOP_INVENTORY : CMP.b #$FF : BNE +
-		LDA !SHOP_STATE : ORA.l Shopkeeper_ItemMasks : STA !SHOP_STATE
+	LDA.l ShopInventory : CMP.b #$FF : BNE +
+		LDA.l ShopState : ORA.l Shopkeeper_ItemMasks : STA.l ShopState
 	+
-	LDA !SHOP_INVENTORY+4 : CMP.b #$FF : BNE +
-		LDA !SHOP_STATE : ORA.l Shopkeeper_ItemMasks+1 : STA !SHOP_STATE
+	LDA.l ShopInventory+4 : CMP.b #$FF : BNE +
+		LDA.l ShopState : ORA.l Shopkeeper_ItemMasks+1 : STA.l ShopState
 	+
-	LDA !SHOP_INVENTORY+8 : CMP.b #$FF : BNE +
-		LDA !SHOP_STATE : ORA.l Shopkeeper_ItemMasks+2 : STA !SHOP_STATE
+	LDA.l ShopInventory+8 : CMP.b #$FF : BNE +
+		LDA.l ShopState : ORA.l Shopkeeper_ItemMasks+2 : STA.l ShopState
 	+
 
 	PLP : PLY : PLX
 	
-	LDA.l !SHOP_TYPE : CMP.b #$FF : BNE +
+	LDA.l ShopType : CMP.b #$FF : BNE +
 		PLA : PLA : PLA
-        INC $0BA0, X
-        LDA $0E40, X
+        INC.w $0BA0, X
+        LDA.w $0E40, X
 		JML.l ShopkeeperFinishInit
 	+
 RTL
@@ -246,16 +215,10 @@ dw $0000, $0000
 dw $0080, $0000
 dw $0100, $0000
 ;--------------------------------------------------------------------------------
-;QueueItemDMA:
-;	LDA.b #Shopkeeper_UploadVRAMTilesLong>>0 : STA !NMI_AUX
-;	LDA.b #Shopkeeper_UploadVRAMTilesLong>>8 : STA !NMI_AUX+1
-;	LDA.b #Shopkeeper_UploadVRAMTilesLong>>16 : STA !NMI_AUX+2
-;RTS
-;--------------------------------------------------------------------------------
 ; X - Tile Buffer Offset
 ; Y - Item ID
 LoadTile:
-	TXA : !ADD.w !FREE_TILE_BUFFER : STA !TILE_UPLOAD_OFFSET_OVERRIDE ; load offset from X
+	TXA : !ADD.w #!FREE_TILE_BUFFER : STA.l TileUploadOffsetOverride ; load offset from X
 	SEP #$30 ; set 8-bit accumulator & index registers
 	TYA ; load item ID from Y
 	JSL.l GetSpriteID ; convert loot id to sprite id
@@ -263,104 +226,104 @@ LoadTile:
 	REP #$10 ; set 16-bit index registers
 RTS
 ;--------------------------------------------------------------------------------
-;!SHOP_INVENTORY, X
+;ShopInventory, X
 ;[id][$lo][$hi][purchase_counter]
 ;--------------------------------------------------------------------------------
 Shopkeeper_UploadVRAMTilesLong:
 	JSR.w Shopkeeper_UploadVRAMTiles
 RTL
 Shopkeeper_UploadVRAMTiles:
-		LDA $4300 : PHA ; preserve DMA parameters
-		LDA $4301 : PHA ; preserve DMA parameters
-		LDA $4302 : PHA ; preserve DMA parameters
-		LDA $4303 : PHA ; preserve DMA parameters
-		LDA $4304 : PHA ; preserve DMA parameters
-		LDA $4305 : PHA ; preserve DMA parameters
-		LDA $4306 : PHA ; preserve DMA parameters
+		LDA.w DMAP0 : PHA ; preserve DMA parameters
+		LDA.w BBAD0 : PHA ; preserve DMA parameters
+		LDA.w A1T0L : PHA ; preserve DMA parameters
+		LDA.w A1T0H : PHA ; preserve DMA parameters
+		LDA.w A1B0 : PHA ; preserve DMA parameters
+		LDA.w DAS0L : PHA ; preserve DMA parameters
+		LDA.w DAS0H : PHA ; preserve DMA parameters
 		;--------------------------------------------------------------------------------
-		LDA #$01 : STA $4300 ; set DMA transfer direction A -> B, bus A auto increment, double-byte mode
-		LDA #$18 : STA $4301 ; set bus B destination to VRAM register
-		LDA #$80 : STA $2115 ; set VRAM to increment by 2 on high register write
-		
-		LDA #$80 : STA $4302 ; set bus A source address to tile buffer
-		LDA #$A1 : STA $4303
-		LDA #$7E : STA $4304
+		LDA.b #$01 : STA.w DMAP0 ; set DMA transfer direction A -> B, bus A auto increment, double-byte mode
+		LDA.b #$18 : STA.w BBAD0 ; set bus B destination to VRAM register
+		LDA.b #$80 : STA.w VMAIN ; set VRAM to increment by 2 on high register write
 
-		LDA !SHOP_TYPE : AND.b #$10 : BNE .special
+		LDA.b #$80 : STA.w A1T0L ; set bus A source address to tile buffer
+		LDA.b #$A1 : STA.w A1T0H
+		LDA.b #$7E : STA.w A1B0
+
+		LDA.l ShopType : AND.b #$10 : BNE .special
 		JMP .normal
 
 	.special
 
-		LDA #$40 : STA $4305 : STZ $4306 ; set transfer size to 0x40
-		LDA #$40 : STA $2116 ; set VRAM register destination address
-		LDA #$5A : STA $2117
-		LDA #$01 : STA $420B ; begin DMA transfer
+		LDA.b #$40 : STA.w DAS0L : STZ.b DAS0H ; set transfer size to 0x40
+		LDA.b #$40 : STA.w VMADDL ; set VRAM register destination address
+		LDA.b #$5A : STA.w VMADDH
+		LDA.b #$01 : STA.w MDMAEN ; begin DMA transfer
+ 
+		LDA.b #$40 : STA.w DAS0L : STZ.b DAS0H ; set transfer size to 0x40
+		LDA.b #$40 : STA.w VMADDL ; set VRAM register destination address
+		LDA.b #$5B : STA.w VMADDH
+		LDA.b #$01 : STA.w MDMAEN ; begin DMA transfer
 
-		LDA #$40 : STA $4305 : STZ $4306 ; set transfer size to 0x40
-		LDA #$40 : STA $2116 ; set VRAM register destination address
-		LDA #$5B : STA $2117
-		LDA #$01 : STA $420B ; begin DMA transfer
+		LDA.b #$40 : STA.w DAS0L : STZ.b DAS0H ; set transfer size to 0x40
+		LDA.b #$60 : STA.w VMADDL ; set VRAM register destination address
+		LDA.b #$5A : STA.w VMADDH
+		LDA.b #$01 : STA.w MDMAEN ; begin DMA transfer
 
-		LDA #$40 : STA $4305 : STZ $4306 ; set transfer size to 0x40
-		LDA #$60 : STA $2116 ; set VRAM register destination address
-		LDA #$5A : STA $2117
-		LDA #$01 : STA $420B ; begin DMA transfer
+		LDA.b #$40 : STA.w DAS0L : STZ.b DAS0H ; set transfer size to 0x40
+		LDA.b #$60 : STA.w VMADDL ; set VRAM register destination address
+		LDA.b #$5B : STA.w VMADDH
+		LDA.b #$01 : STA.w MDMAEN ; begin DMA transfer
 
-		LDA #$40 : STA $4305 : STZ $4306 ; set transfer size to 0x40
-		LDA #$60 : STA $2116 ; set VRAM register destination address
-		LDA #$5B : STA $2117
-		LDA #$01 : STA $420B ; begin DMA transfer
+		LDA.b #$40 : STA.w DAS0L : STZ.b DAS0H ; set transfer size to 0x40
+		LDA.b #$80 : STA.w VMADDL ; set VRAM register destination address
+		LDA.b #$5A : STA.w VMADDH
+		LDA.b #$01 : STA.w MDMAEN ; begin DMA transfer
 
-		LDA #$40 : STA $4305 : STZ $4306 ; set transfer size to 0x40
-		LDA #$80 : STA $2116 ; set VRAM register destination address
-		LDA #$5A : STA $2117
-		LDA #$01 : STA $420B ; begin DMA transfer
-
-		LDA #$40 : STA $4305 : STZ $4306 ; set transfer size to 0x40
-		LDA #$80 : STA $2116 ; set VRAM register destination address
-		LDA #$5B : STA $2117
-		LDA #$01 : STA $420B ; begin DMA transfer
+		LDA.b #$40 : STA.w DAS0L : STZ.b DAS0H ; set transfer size to 0x40
+		LDA.b #$80 : STA.w VMADDL ; set VRAM register destination address
+		LDA.b #$5B : STA.w VMADDH
+		LDA.b #$01 : STA.w MDMAEN ; begin DMA transfer
 		JMP .end
 
-	.normal
-		LDA #$40 : STA $4305 : STZ $4306 ; set transfer size to 0x40
-		LDA #$60 : STA $2116 ; set VRAM register destination address
-		LDA #$5C : STA $2117
-		LDA #$01 : STA $420B ; begin DMA transfer
-		
-		LDA #$40 : STA $4305 : STZ $4306 ; set transfer size to 0x40
-		LDA #$60 : STA $2116 ; set VRAM register destination address
-		LDA #$5D : STA $2117
-		LDA #$01 : STA $420B ; begin DMA transfer
-		
-		LDA #$40 : STA $4305 : STZ $4306 ; set transfer size to 0x40
-		LDA #$80 : STA $2116 ; set VRAM register destination address
-		LDA #$5C : STA $2117
-		LDA #$01 : STA $420B ; begin DMA transfer
-		
-		LDA #$40 : STA $4305 : STZ $4306 ; set transfer size to 0x40
-		LDA #$80 : STA $2116 ; set VRAM register destination address
-		LDA #$5D : STA $2117
-		LDA #$01 : STA $420B ; begin DMA transfer
-		
-		LDA #$40 : STA $4305 : STZ $4306 ; set transfer size to 0x40
-		LDA #$A0 : STA $2116 ; set VRAM register destination address
-		LDA #$5C : STA $2117
-		LDA #$01 : STA $420B ; begin DMA transfer
-		
-		LDA #$40 : STA $4305 : STZ $4306 ; set transfer size to 0x40
-		LDA #$A0 : STA $2116 ; set VRAM register destination address
-		LDA #$5D : STA $2117
-		LDA #$01 : STA $420B ; begin DMA transfer
+	.normal 
+		LDA.b #$40 : STA.w DAS0L : STZ.b DAS0H ; set transfer size to 0x40
+		LDA.b #$60 : STA.w VMADDL ; set VRAM register destination address
+		LDA.b #$5C : STA.w VMADDH
+		LDA.b #$01 : STA.w MDMAEN ; begin DMA transfer
+
+		LDA.b #$40 : STA.w DAS0L : STZ.b DAS0H ; set transfer size to 0x40
+		LDA.b #$60 : STA.w VMADDL ; set VRAM register destination address
+		LDA.b #$5D : STA.w VMADDH
+		LDA.b #$01 : STA.w MDMAEN ; begin DMA transfer
+
+		LDA.b #$40 : STA.w DAS0L : STZ.b DAS0H ; set transfer size to 0x40
+		LDA.b #$80 : STA.w VMADDL ; set VRAM register destination address
+		LDA.b #$5C : STA.w VMADDH
+		LDA.b #$01 : STA.w MDMAEN ; begin DMA transfer
+
+		LDA.b #$40 : STA.w DAS0L : STZ.b DAS0H ; set transfer size to 0x40
+		LDA.b #$80 : STA.w VMADDL ; set VRAM register destination address
+		LDA.b #$5D : STA.w VMADDH
+		LDA.b #$01 : STA.w MDMAEN ; begin DMA transfer
+
+		LDA.b #$40 : STA.w DAS0L : STZ.b DAS0H ; set transfer size to 0x40
+		LDA.b #$A0 : STA.w VMADDL ; set VRAM register destination address
+		LDA.b #$5C : STA.w VMADDH
+		LDA.b #$01 : STA.w MDMAEN ; begin DMA transfer
+
+		LDA.b #$40 : STA.w DAS0L : STZ.b DAS0H ; set transfer size to 0x40
+		LDA.b #$A0 : STA.w VMADDL ; set VRAM register destination address
+		LDA.b #$5D : STA.w VMADDH
+		LDA.b #$01 : STA.w MDMAEN ; begin DMA transfer
 		;--------------------------------------------------------------------------------
 	.end
-		PLA : STA $4306 ; restore DMA parameters
-		PLA : STA $4305 ; restore DMA parameters
-		PLA : STA $4304 ; restore DMA parameters
-		PLA : STA $4303 ; restore DMA parameters
-		PLA : STA $4302 ; restore DMA parameters
-		PLA : STA $4301 ; restore DMA parameters
-		PLA : STA $4300 ; restore DMA parameters
+		PLA : STA.w DAS0H ; restore DMA parameters
+		PLA : STA.w DAS0L ; restore DMA parameters
+		PLA : STA.w A1B0 ; restore DMA parameters
+		PLA : STA.w A1T0H ; restore DMA parameters
+		PLA : STA.w A1T0L ; restore DMA parameters
+		PLA : STA.w BBAD0 ; restore DMA parameters
+		PLA : STA.w DMAP0 ; restore DMA parameters
 RTS
 ;--------------------------------------------------------------------------------
 Shopkepeer_CallOriginal:
@@ -368,42 +331,33 @@ Shopkepeer_CallOriginal:
 	LDA.b #ShopkeeperJumpTable>>16 : PHA
 	LDA.b #ShopkeeperJumpTable>>8 : PHA
 	LDA.b #ShopkeeperJumpTable : PHA
-    LDA $0E80, X
+    LDA.w $0E80, X
     JML.l UseImplicitRegIndexedLocalJumpTable
 ;--------------------------------------------------------------------------------
-;!SHOP_TYPE = "$7F5051"
-;!SHOP_CAPACITY = "$7F5020"
-;!SCRATCH_TEMP_X = "$7F5021"
 Sprite_ShopKeeper:
-	
-	LDA.l !SHOP_TYPE : CMP.b #$FF : BNE + : JMP.w Shopkepeer_CallOriginal : +
-	
+
+	LDA.l ShopType : CMP.b #$FF : BNE + : JMP.w Shopkepeer_CallOriginal : +
+
 	PHB : PHK : PLB
 		JSL.l Sprite_PlayerCantPassThrough
-		
+
 		; Draw Shopkeeper
 		JSR.w Shopkeeper_DrawMerchant
-		
-		LDA.l !SHOP_TYPE : BIT.b #$80 : BEQ .normal ; Take-any
-			BIT.b #$20 : BNE + ; Not A Take-All
+
+		LDA.l ShopType : BIT.b #$80 : BEQ .normal ; Take-any
+			BIT.b #$20 : BNE .normal ; Not A Take-All
 			PHX
-				LDA !SHOP_SRAM_INDEX : TAX
-				LDA PurchaseCounts, X : BEQ ++ : PLX : BRA .done : ++
+				LDA.l ShopSRAMIndex : TAX
+				LDA.l PurchaseCounts, X : BEQ ++ : PLX : BRA .done : ++
 			PLX
-			BRA .normal
-		+ ; Take-All
-			;PHX
-			;	LDA !SHOP_SRAM_INDEX : TAX
-			;	LDA.w PurchaseCounts, X : STA.l !SHOP_STATE
-			;PLX
 		.normal
-		
+
 		; Draw Items
 		JSR.w Shopkeeper_DrawItems
-		
+
 		; Set Up Hitboxes
 		JSR.w Shopkeeper_SetupHitboxes
-		
+
 		; $22
 		; 0x48 - Left
 		; 0x60 - Midpoint 1
@@ -416,31 +370,31 @@ RTL
 ;--------------------------------------------------------------------------------
 macro DrawMerchant(head,body,speed)
 	PHX : LDX.b #$00
-	LDA $1A : AND <speed> : BEQ +
+	LDA.b $1A : AND.b <speed> : BEQ +
 		-
-			LDA.w .oam_shopkeeper_f1, X : STA !BIGRAM, X : INX
+			LDA.w .oam_shopkeeper_f1, X : STA.l BigRAM, X : INX
 		CPX.b #$10 : !BLT -
 	+
 		-
-			LDA.w .oam_shopkeeper_f2, X : STA !BIGRAM, X : INX
+			LDA.w .oam_shopkeeper_f2, X : STA.l BigRAM, X : INX
 		CPX.b #$10 : !BLT -
 	++
 	PLX
-	
-	LDA !SHOP_MERCHANT : LSR #4 : AND.b #$0E : ORA !BIGRAM+5 : STA !BIGRAM+5
-	LDA !SHOP_MERCHANT : LSR #4 : AND.b #$0E : ORA !BIGRAM+13 : STA !BIGRAM+13
-	
+
+	LDA.l ShopMerchant : LSR #4 : AND.b #$0E : ORA.l BigRAM+5 : STA.l BigRAM+5
+	LDA.l ShopMerchant : LSR #4 : AND.b #$0E : ORA.l BigRAM+13 : STA.l BigRAM+13
+
 	PHB
-		LDA.b #$02 : STA $06 ; request 2 OAM slots
-		LDA #$08 : JSL.l OAM_AllocateFromRegionA ; request 8 bytes
-		STZ $07
-	
-		LDA.b #!BIGRAM : STA $08
-		LDA.b #!BIGRAM>>8 : STA $09
+		LDA.b #$02 : STA.b Scrap06 ; request 2 OAM slots
+		LDA.b #$08 : JSL.l OAM_AllocateFromRegionA ; request 8 bytes
+		STZ.b Scrap07
+
+		LDA.b #BigRAM : STA.b Scrap08
+		LDA.b #BigRAM>>8 : STA.b Scrap09
 		LDA.b #$7E : PHA : PLB ; set data bank to $7E
 		JSL.l Sprite_DrawMultiple_quantity_preset
-		LDA $90 : !ADD.b #$04*2 : STA $90 ; increment oam pointer
-		LDA $92 : INC #2 : STA $92
+		LDA.b $90 : !ADD.b #$04*2 : STA.b $90 ; increment oam pointer
+		LDA.b $92 : INC #2 : STA.b $92
 	PLB
 RTS
 .oam_shopkeeper_f1
@@ -452,7 +406,7 @@ dw 0, 0 : db <body>, $40, $00, $02
 endmacro
 ;--------------------------------------------------------------------------------
 Shopkeeper_DrawMerchant:
-	LDA.l !SHOP_MERCHANT : AND.b #$07
+	LDA.l ShopMerchant : AND.b #$07
 	BEQ Shopkeeper_DrawMerchant_Type0
 	CMP.b #$01 : BNE + : JMP Shopkeeper_DrawMerchant_Type1 : +
 	CMP.b #$02 : BNE + : JMP Shopkeeper_DrawMerchant_Type2 : +
@@ -463,20 +417,20 @@ Shopkeeper_DrawMerchant_Type0:
 %DrawMerchant(#$00, #$10, #$10)
 ;--------------------------------------------------------------------------------
 Shopkeeper_DrawMerchant_Type1:
-	LDA.b #$01 : STA $06 ; request 1 OAM slot
-	LDA #$04 : JSL.l OAM_AllocateFromRegionA ; request 4 bytes
-	STZ $07
-	LDA $1A : AND #$08 : BEQ +
-		LDA.b #.oam_shopkeeper_f1 : STA $08
-		LDA.b #.oam_shopkeeper_f1>>8 : STA $09
+	LDA.b #$01 : STA.b Scrap06 ; request 1 OAM slot
+	LDA.b #$04 : JSL.l OAM_AllocateFromRegionA ; request 4 bytes
+	STZ.b Scrap07
+	LDA.b $1A : AND #$08 : BEQ +
+		LDA.b #.oam_shopkeeper_f1 : STA.b Scrap08
+		LDA.b #.oam_shopkeeper_f1>>8 : STA.b Scrap09
 		BRA ++
 	+
-		LDA.b #.oam_shopkeeper_f2 : STA $08
-		LDA.b #.oam_shopkeeper_f2>>8 : STA $09
+		LDA.b #.oam_shopkeeper_f2 : STA.b Scrap08
+		LDA.b #.oam_shopkeeper_f2>>8 : STA.b Scrap09
 	++
 	JSL.l Sprite_DrawMultiple_quantity_preset
-	LDA $90 : !ADD.b #$04 : STA $90 ; increment oam pointer
-	LDA $92 : INC : STA $92
+	LDA.b $90 : !ADD.b #$04 : STA.b $90 ; increment oam pointer
+	LDA.b $92 : INC : STA.b $92
 RTS
 .oam_shopkeeper_f1
 dw 0, 0 : db $46, $0A, $00, $02
@@ -495,11 +449,11 @@ Shopkeeper_SetupHitboxes:
 	-
 		PHY
 			TYA : LSR #2 : TAY
-			LDA.l !SHOP_STATE : AND.w Shopkeeper_ItemMasks, Y : BEQ +
+			LDA.l ShopState : AND.w Shopkeeper_ItemMasks, Y : BEQ +
 				PLY : BRA .no_interaction
 			+
 		PLY
-		LDA $00EE : CMP $0F20, X : BNE .no_interaction  
+		LDA.w $00EE : CMP.w $0F20, X : BNE .no_interaction  
 
 		JSR.w Setup_LinksHitbox
 		JSR.w Setup_ShopItemCollisionHitbox
@@ -510,23 +464,22 @@ Shopkeeper_SetupHitboxes:
 
 		JSR.w Setup_ShopItemInteractionHitbox
 		JSL.l Utility_CheckIfHitBoxesOverlapLong : BCC .no_interaction
-		    LDA $F6 : AND.b #$80 : BEQ .no_interaction ; check for A-press
-			LDA $10 : CMP.b #$0C : !BGE .no_interaction ; don't interact in other modes besides game action
+		    LDA.b $F6 : AND.b #$80 : BEQ .no_interaction ; check for A-press
+			LDA.b $10 : CMP.b #$0C : !BGE .no_interaction ; don't interact in other modes besides game action
 			JSR.w Shopkeeper_BuyItem
 		.no_interaction
 		INY #4
-	TYA : CMP !SHOP_CAPACITY : !BLT -
+	TYA : CMP.l ShopCapacity : !BLT -
 	;CPY.b #$0C : !BLT -
 	
 	PLP : PLY : PLX
 RTS
-;--------------------
-;!SHOP_STATE
+
 Shopkeeper_BuyItem:
 	PHX : PHY
 		TYX
-		
-		LDA.l !SHOP_INVENTORY, X
+
+		LDA.l ShopInventory, X
 		CMP.b #$0E : BEQ .refill ; Bee Refill
 		CMP.b #$2E : BEQ .refill ; Red Potion Refill
 		CMP.b #$2F : BEQ .refill ; Green Potion Refill
@@ -536,46 +489,45 @@ Shopkeeper_BuyItem:
 			JSL.l Sprite_GetEmptyBottleIndex : BMI .full_bottles
 		+
 
-		LDA !SHOP_TYPE : AND.b #$80 : BNE .buy ; don't charge if this is a take-any
-		REP #$20 : LDA CurrentRupees : CMP.l !SHOP_INVENTORY+1, X : SEP #$20 : !BGE .buy
-		
+		LDA.l ShopType : AND.b #$80 : BNE .buy ; don't charge if this is a take-any
+		REP #$20 : LDA.l CurrentRupees : CMP.l ShopInventory+1, X : SEP #$20 : !BGE .buy
+
 		.cant_afford
 	        LDA.b #$7A
 	        LDY.b #$01
 	        JSL.l Sprite_ShowMessageUnconditional
-			LDA.b #$3C : STA $012E ; error sound
+			LDA.b #$3C : STA.w $012E ; error sound
 			JMP .done
 		.full_bottles
 	        LDA.b #$6B
 	        LDY.b #$01
 	        JSL.l Sprite_ShowMessageUnconditional
-			LDA.b #$3C : STA $012E ; error sound
+			LDA.b #$3C : STA.w $012E ; error sound
 			JMP .done
 		.buy
-			LDA !SHOP_TYPE : AND.b #$80 : BNE ++ ; don't charge if this is a take-any
-				REP #$20 : LDA CurrentRupees : !SUB !SHOP_INVENTORY+1, X : STA CurrentRupees : SEP #$20 ; Take price away
+			LDA.l ShopType : AND.b #$80 : BNE ++ ; don't charge if this is a take-any
+				REP #$20 : LDA.l CurrentRupees : !SUB ShopInventory+1, X : STA.l CurrentRupees : SEP #$20 ; Take price away
 			++
-			LDA.l !SHOP_INVENTORY, X : TAY : JSL.l Link_ReceiveItem
-			LDA.l !SHOP_INVENTORY+3, X : INC : STA.l !SHOP_INVENTORY+3, X
-			
+			LDA.l ShopInventory, X : TAY : JSL.l Link_ReceiveItem
+			LDA.l ShopInventory+3, X : INC : STA.l ShopInventory+3, X
+
 			TXA : LSR #2 : TAX
-			LDA !SHOP_TYPE : BIT.b #$80 : BNE +
-				LDA.l !SHOP_STATE : ORA.w Shopkeeper_ItemMasks, X : STA.l !SHOP_STATE
+			LDA.l ShopType : BIT.b #$80 : BNE +
+				LDA.l ShopState : ORA.w Shopkeeper_ItemMasks, X : STA.l ShopState
 				PHX
-					TXA : !ADD !SHOP_SRAM_INDEX : TAX
-					LDA PurchaseCounts, X : INC : BEQ +++ : STA PurchaseCounts, X : +++
+					TXA : !ADD ShopSRAMIndex : TAX
+					LDA.l PurchaseCounts, X : INC : BEQ +++ : STA.l PurchaseCounts, X : +++
 				PLX
 				BRA ++
 			+ ; Take-any
-			;STA $FFFFFF
 				BIT.b #$20 : BNE .takeAll
 				.takeAny
-					LDA.l !SHOP_STATE : ORA.b #$07 : STA.l !SHOP_STATE
-					PHX : LDA.l !SHOP_SRAM_INDEX : TAX : LDA.b #$01 : STA.l PurchaseCounts, X : PLX
+					LDA.l ShopState : ORA.b #$07 : STA.l ShopState
+					PHX : LDA.l ShopSRAMIndex : TAX : LDA.b #$01 : STA.l PurchaseCounts, X : PLX
 					BRA ++
 				.takeAll
-					LDA.l !SHOP_STATE : ORA.w Shopkeeper_ItemMasks, X : STA.l !SHOP_STATE
-					PHX : LDA.l !SHOP_SRAM_INDEX : TAX : LDA.l !SHOP_STATE : STA.l PurchaseCounts, X : PLX
+					LDA.l ShopState : ORA.w Shopkeeper_ItemMasks, X : STA.l ShopState
+					PHX : LDA.l ShopSRAMIndex : TAX : LDA.l ShopState : STA.l PurchaseCounts, X : PLX
 			++
 	.done
 	PLY : PLX
@@ -583,91 +535,88 @@ RTS
 Shopkeeper_ItemMasks:
 db #$01, #$02, #$04
 ;--------------------
-;!SHOP_ID = "$7F5050"
-;!SHOP_SRAM_INDEX = "$7F5062"
-;--------------------
 Setup_ShopItemCollisionHitbox:
 ;The complications with XBA are to handle the fact that nintendo likes to store
 ;high and low bytes of 16 bit postion values seperately :-(
 
-	REP #$20 ; set 16-bit accumulator
-	LDA $00 : PHA
-	SEP #$20 ; set 8-bit accumulator
+        REP #$20 ; set 16-bit accumulator
+        LDA.b Scrap00 : PHA
+        SEP #$20 ; set 8-bit accumulator
 
-    ; load shopkeeper X (16 bit)
-    LDA $0D30, X : XBA : LDA $0D10, X
-	
-	REP #$20 ; set 16-bit accumulator
-	PHA : PHY
-		LDA !SHOP_TYPE : AND.w #$0003 : DEC : ASL : TAY
-		LDA.w Shopkeeper_DrawNextItem_item_offsets_idx, Y : STA $00 ; get table from the table table
-	PLY : PLA
+        ; load shopkeeper X (16 bit)
+        LDA.w $0D30, X : XBA : LDA.w $0D10, X
+
+        REP #$20 ; set 16-bit accumulator
+        PHA : PHY
+        LDA.l ShopType : AND.w #$0003 : DEC : ASL : TAY
+        LDA.w Shopkeeper_DrawNextItem_item_offsets_idx, Y : STA.b Scrap00 ; get table from the table table
+        PLY : PLA
     
-    !ADD ($00), Y
-    !ADD.w #$0002 ; a small negative margin
-    ; TODO: add 4 for a narrow item
-    SEP #$20 ; set 8-bit accumulator
+        !ADD ($00), Y
+        !ADD.w #$0002 ; a small negative margin
+        ; TODO: add 4 for a narrow item
+        SEP #$20 ; set 8-bit accumulator
 
-    ; store hitbox X 
-    STA $04 : XBA : STA $0A 
+        ; store hitbox X 
+        STA.b Scrap04 : XBA : STA.b Scrap0A 
 
-    ;load shopkeeper Y (16 bit)
-    LDA $0D20, X : XBA : LDA $0D00, X 
+        ;load shopkeeper Y (16 bit)
+        LDA.w $0D20, X : XBA : LDA.w $0D00, X 
 
-    REP #$20 ; set 16-bit accumulator
-    PHY : INY #2
-		!ADD ($00), Y
-	PLY
-	PHA : LDA !SHOP_TYPE : AND.w #$0080 : BEQ + ; lower by 4 for Take-any
-		PLA : !ADD.w #$0004
-		BRA ++
-	+ : PLA : ++
-    SEP #$20 ; set 8-bit accumulator
+        REP #$20 ; set 16-bit accumulator
+        PHY : INY #2
+        !ADD ($00), Y
+        PLY
+        PHA : LDA.l ShopType : AND.w #$0080 : BEQ + ; lower by 4 for Take-any
+                PLA : !ADD.w #$0004
+                BRA ++
+        + : PLA : ++
+        SEP #$20 ; set 8-bit accumulator
 
-    ; store hitbox Y Low: $05, High $0B
-    STA $05 : XBA : STA $0B 
+        ; store hitbox Y Low: $05, High $0B
+        STA.b Scrap05 : XBA : STA.b Scrap0B 
 
-    LDA.b #12 : STA $06 ; Hitbox width, always 12 for existing (wide) shop items
-    ; TODO: for narrow sprite store make width 4 (i.e. 8 pixels smaller)
+        LDA.b #12 : STA.b Scrap06 ; Hitbox width, always 12 for existing (wide) shop items
+        ; TODO: for narrow sprite store make width 4 (i.e. 8 pixels smaller)
 
-    LDA.b #14 : STA $07 ; Hitbox height, always 14
-	
-	REP #$20 ; set 16-bit accumulator
-	PLA : STA $00
-	SEP #$20 ; set 8-bit acc
+        LDA.b #14 : STA.b Scrap07 ; Hitbox height, always 14
+
+        REP #$20 ; set 16-bit accumulator
+        PLA : STA.b Scrap00
+        SEP #$20 ; set 8-bit acc
 RTS
 ;--------------------------------------------------------------------------------
 ; Adjusts the already set up collision hitbox to be a suitable interaction hitbox
 Setup_ShopItemInteractionHitbox:
-	PHP
-	SEP #$20 ; set 8-bit accumulator
-	
-    ; collision hitbox has left margin of -2, we want margin of 8 so we subtract 10
-    LDA $04 : !SUB.b #$0A : STA $04
-    LDA $0A : SBC.b #$00 : STA $0A ; Apply borrow
+        PHP
+        SEP #$20 ; set 8-bit accumulator
 
-    ; collision hitbox has 0 top margin, we want a margin of 8 so we subtract 8
-    LDA $05 : !SUB.b #$08 : STA $05
-    LDA $0B : SBC.b #$00 : STA $0B ; Apply borrow    
+        ; collision hitbox has left margin of -2, we want margin of 8 so we subtract 10
+        LDA.b Scrap04 : !SUB.b #$0A : STA.b Scrap04
+        LDA.b Scrap0A : SBC.b #$00 : STA.b Scrap0A ; Apply borrow
 
-    ; We want a width of 32 for wide or 24 for narrow, so we add 20
-    LDA $06 : !ADD.b #20 : STA $06 ; Hitbox width
+        ; collision hitbox has 0 top margin, we want a margin of 8 so we subtract 8
+        LDA.b Scrap05 : !SUB.b #$08 : STA.b Scrap05
+        LDA.b Scrap0B : SBC.b #$00 : STA.b Scrap0B ; Apply borrow  
 
-    LDA.b #40 : STA $07 ; Hitbox height, always 40
-	PLP
+        ; We want a width of 32 for wide or 24 for narrow, so we add 20
+        LDA.b Scrap06 : !ADD.b #20 : STA.b Scrap06 ; Hitbox width
+
+        LDA.b #40 : STA.b Scrap07 ; Hitbox height, always 40
+        PLP
 RTS
 ;--------------------------------------------------------------------------------
 ; Following is a copy of procedure $3770A (Bank06.asm Line 6273) 
 ; because there is no long version available
 Setup_LinksHitbox:
-	LDA.b #$08 : STA $02
-                     STA $03
-        
-        LDA $22 : !ADD.b #$04 : STA $00
-        LDA $23 : ADC.b #$00 : STA $08
-        
-        LDA $20 : ADC.b #$08 : STA $01
-        LDA $21 : ADC.b #$00 : STA $09     
+	LDA.b #$08 : STA.b Scrap02
+                     STA.b Scrap03
+
+        LDA.b $22 : !ADD.b #$04 : STA.b Scrap00
+        LDA.b $23 : ADC.b #$00 : STA.b Scrap08
+
+        LDA.b $20 : ADC.b #$08 : STA.b Scrap01
+        LDA.b $21 : ADC.b #$00 : STA.b Scrap09
 RTS
 ;--------------------------------------------------------------------------------
 ; The following is a copy of procedure Sprite_HaltSpecialPlayerMovement (Bank1E.asm line 255)
@@ -680,17 +629,14 @@ Sprite_HaltSpecialPlayerMovementCopied:
         PLX
 RTS
 ;--------------------------------------------------------------------------------
-;!SHOP_TYPE = "$7F5051"
-;!SHOP_INVENTORY = "$7F5052"
-!SPRITE_OAM = "$7EC025"
 Shopkeeper_DrawItems:
 	PHB : PHK : PLB
 	PHX : PHY
-	TXA : STA !SCRATCH_TEMP_X;
-	
+	TXA : STA.l ShopScratch;
+
 	LDX.b #$00
 	LDY.b #$00
-	LDA !SHOP_TYPE : AND.b #$03
+	LDA.l ShopType : AND.b #$03
 	CMP.b #$03 : BNE +
 		JSR.w Shopkeeper_DrawNextItem : BRA ++
 	+ CMP.b #$02 : BNE + : ++
@@ -701,28 +647,27 @@ Shopkeeper_DrawItems:
 	PLY : PLX
 	PLB
 RTS
-
 ;--------------------------------------------------------------------------------
 Shopkeeper_DrawNextItem:
-	LDA.l !SHOP_STATE : AND.w Shopkeeper_ItemMasks, Y : BEQ + : JMP .next : +
-	
+	LDA.l ShopState : AND.w Shopkeeper_ItemMasks, Y : BEQ + : JMP .next : +
+
 	PHY
-	
-	LDA !SHOP_TYPE : AND.b #$03 : DEC : ASL : TAY
+
+	LDA.l ShopType : AND.b #$03 : DEC : ASL : TAY
 	REP #$20 ; set 16-bit accumulator
-	LDA.w .item_offsets_idx, Y : STA $00 ; get table from the table table
-	LDA 1,s : ASL #2 : TAY ; set Y to the item index
-	LDA ($00), Y : STA.l !SPRITE_OAM ; load X-coordinate
+	LDA.w .item_offsets_idx, Y : STA.b Scrap00 ; get table from the table table
+	LDA.b 1,s : ASL #2 : TAY ; set Y to the item index
+	LDA.b ($00), Y : STA.l SpriteOAM ; load X-coordinate
 	INY #2
-	LDA !SHOP_TYPE : AND.w #$0080 : BNE +
-		LDA ($00), Y : STA.l !SPRITE_OAM+2 : BRA ++ ; load Y-coordinate
+	LDA.l ShopType : AND.w #$0080 : BNE +
+		LDA.b ($00), Y : STA.l SpriteOAM+2 : BRA ++ ; load Y-coordinate
 	+
-		LDA ($00), Y : !ADD.w #$0004 : STA.l !SPRITE_OAM+2 ; load Y-coordinate
+		LDA.b ($00), Y : !ADD.w #$0004 : STA.l SpriteOAM+2 ; load Y-coordinate
 	++
 	SEP #$20 ; set 8-bit accumulator
 	PLY
-	
-	LDA.l !SHOP_INVENTORY, X ; get item id
+
+	LDA.l ShopInventory, X ; get item id
 	CMP.b #$2E : BNE + : BRA .potion
 	+ CMP.b #$2F : BNE + : BRA .potion
 	+ CMP.b #$30 : BEQ .potion
@@ -733,37 +678,37 @@ Shopkeeper_DrawNextItem:
 	+
 	XBA
 
-	LDA !SHOP_TYPE : AND.b #$10 : BEQ +
+	LDA.l ShopType : AND.b #$10 : BEQ +
 		XBA : !SUB #$22 : XBA ; alt vram
 	+
 	XBA
 
-	STA.l !SPRITE_OAM+4
+	STA.l SpriteOAM+4
 
-	LDA.l !SHOP_INVENTORY, X ; get item palette
-	JSL.l GetSpritePalette : STA.l !SPRITE_OAM+5
+	LDA.l ShopInventory, X ; get item palette
+	JSL.l GetSpritePalette : STA.l SpriteOAM+5
 
-	LDA.b #$00 : STA.l !SPRITE_OAM+6
+	LDA.b #$00 : STA.l SpriteOAM+6
 
-	LDA.l !SHOP_INVENTORY, X ; get item palette
+	LDA.l ShopInventory, X ; get item palette
 	JSL.l IsNarrowSprite : BCS .narrow
 	.full
 		LDA.b #$02
-		STA.l !SPRITE_OAM+7
+		STA.l SpriteOAM+7
 		LDA.b #$01
 		BRA ++
 	.narrow
 		LDA.b #$00
-		STA.l !SPRITE_OAM+7
+		STA.l SpriteOAM+7
 		JSR.w PrepNarrowLower
 		LDA.b #$02
 	++
-	PHX : PHA : LDA !SCRATCH_TEMP_X : TAX : PLA : JSR.w RequestItemOAM : PLX
-	
-	LDA !SHOP_TYPE : AND.b #$80 : BNE +
+	PHX : PHA : LDA.l ShopScratch : TAX : PLA : JSR.w RequestItemOAM : PLX
+
+	LDA.l ShopType : AND.b #$80 : BNE +
 		JSR.w Shopkeeper_DrawNextPrice
 	+
-	
+
 	.next
 	INY
 	INX #4
@@ -785,43 +730,41 @@ dw 56, 40
 .tile_indices
 db $C6, $C8, $CA
 ;--------------------------------------------------------------------------------
-!COLUMN_LOW = "$7F5022"
-!COLUMN_HIGH = "$7F5023"
 Shopkeeper_DrawNextPrice:
-	PHB : PHK : PLB
-	PHX : PHY : PHP
-	
-	REP #$20 ; set 16-bit accumulator
-	PHY
-		LDA !SHOP_TYPE : AND.w #$0003 : DEC : ASL : TAY
-		LDA.w Shopkeeper_DrawNextItem_item_offsets_idx, Y : STA $00 ; get table from the table table
-		LDA.w .price_columns_idx, Y : STA $02 ; get table from the table table
-	PLY : PHY
-		TYA : ASL #2 : TAY
-		LDA ($00), Y : STA $0E ; set coordinate
-		TYA : LSR : TAY
-		LDA ($02), Y : STA !COLUMN_LOW
-		INY : LDA ($02), Y : STA !COLUMN_HIGH
-	PLY
-	LDA.l !SHOP_INVENTORY+1, X : STA $0C ; set value
-	
-	BEQ .free
-		JSR.w DrawPrice
-		SEP #$20 : STA $06 : STZ $07 ; set 8-bit accumulator & store result
-		PHA
-			LDA.b #!BIGRAM : STA $08
-			LDA.b #!BIGRAM>>8 : STA $09
-			LDA.b #$7E : PHA : PLB ; set data bank to $7E
+        PHB : PHK : PLB
+        PHX : PHY : PHP
 
-			PHX : PHA : LDA !SCRATCH_TEMP_X : TAX : PLA : JSL.l Sprite_DrawMultiple_quantity_preset : PLX
-		
-			LDA 1,s
-			ASL #2 : !ADD $90 : STA $90 ; increment oam pointer
-		PLA
-		!ADD $92 : STA $92
-	.free
-	PLP : PLY : PLX
-	PLB
+        REP #$20 ; set 16-bit accumulator
+        PHY
+        LDA.l ShopType : AND.w #$0003 : DEC : ASL : TAY
+        LDA.w Shopkeeper_DrawNextItem_item_offsets_idx, Y : STA.b Scrap00 ; get table from the table table
+        LDA.w .price_columns_idx, Y : STA.b Scrap02 ; get table from the table table
+        PLY : PHY
+        TYA : ASL #2 : TAY
+        LDA.b ($00), Y : STA.b Scrap0E ; set coordinate
+        TYA : LSR : TAY
+        LDA.b ($02), Y : STA.l ShopPriceColumn
+        INY : LDA.b ($02), Y : STA.l ShopPriceColumn+1
+        PLY
+        LDA.l ShopInventory+1, X : STA.b Scrap0C ; set value
+
+        BEQ .free
+                JSR.w DrawPrice
+                SEP #$20 : STA.b Scrap06 : STZ.b Scrap07 ; set 8-bit accumulator & store result
+                PHA
+                LDA.b #BigRAM : STA.b Scrap08
+                LDA.b #BigRAM>>8 : STA.b Scrap09
+                LDA.b #$7E : PHA : PLB ; set data bank to $7E
+
+		PHX : PHA : LDA.l ShopScratch : TAX : PLA : JSL.l Sprite_DrawMultiple_quantity_preset : PLX
+
+		LDA.b 1,s
+		ASL #2 : !ADD $90 : STA.b $90 ; increment oam pointer
+                PLA
+                !ADD $92 : STA.b $92
+        .free
+        PLP : PLY : PLX
+        PLB
 RTS
 .price_columns_idx
 dw #.price_columns_1
@@ -835,24 +778,24 @@ db #$00, #$80, #$80, $FF
 db #$00, #$60, #$60, #$90, #$90, $FF
 ;--------------------------------------------------------------------------------
 RequestItemOAM:
-	PHX : PHY : PHA
-		STA $06 ; request A OAM slots
-		LDA $20 : CMP.b #$62 : !BGE .below
-			.above
-			LDA 1,s : ASL #2 : JSL.l OAM_AllocateFromRegionA ; request 4A bytes
-			BRA +
-			.below
-			LDA 1,s : ASL #2 : JSL.l OAM_AllocateFromRegionB ; request 4A bytes
-		+
-		LDA 1,s  : STA $06 ; request 3 OAM slots
-		STZ $07
-		LDA.b #!SPRITE_OAM : STA $08
-		LDA.b #!SPRITE_OAM>>8 : STA $09
-		LDA #$7E : PHB : PHA : PLB
-			JSL Sprite_DrawMultiple_quantity_preset
-		PLB
-		LDA 1,s : ASL #2 : !ADD $90 : STA $90 ; increment oam pointer
-		LDA $92 : !ADD 1,s : STA $92
+        PHX : PHY : PHA
+                STA.b Scrap06 ; request A OAM slots
+                LDA.b $20 : CMP.b #$62 : !BGE .below
+                        .above
+                        LDA.b 1,s : ASL #2 : JSL.l OAM_AllocateFromRegionA ; request 4A bytes
+                        BRA +
+                        .below
+                        LDA.b 1,s : ASL #2 : JSL.l OAM_AllocateFromRegionB ; request 4A bytes
+                +
+                LDA.b 1,s  : STA.b Scrap06 ; request 3 OAM slots
+                STZ.b Scrap07
+                LDA.b #SpriteOAM : STA.b Scrap08
+                LDA.b #SpriteOAM>>8 : STA.b Scrap09
+                LDA.b #$7E : PHB : PHA : PLB
+                JSL Sprite_DrawMultiple_quantity_preset
+                PLB
+                LDA.b 1,s : ASL #2 : !ADD $90 : STA.b $90 ; increment oam pointer
+                LDA.b $92 : !ADD 1,s : STA.b $92
 	PLA : PLY : PLX
 RTS
 ;--------------------------------------------------------------------------------
@@ -860,10 +803,10 @@ PrepNarrowLower:
 	PHX
 	LDX.b #$00
 		REP #$20 ; set 16-bit accumulator
-		LDA !SPRITE_OAM, X : !ADD.w #$0004 : STA !SPRITE_OAM, X : STA !SPRITE_OAM+8, X
-		LDA !SPRITE_OAM+2, X : !ADD.w #$0008 : STA !SPRITE_OAM+10, X
-		LDA !SPRITE_OAM+4, X : !ADD.w #$0010 : STA !SPRITE_OAM+12, X
-		LDA !SPRITE_OAM+6, X : STA !SPRITE_OAM+14, X
+		LDA.l SpriteOAM, X : !ADD.w #$0004 : STA.l SpriteOAM, X : STA.l SpriteOAM+8, X
+		LDA.l SpriteOAM+2, X : !ADD.w #$0008 : STA.l SpriteOAM+10, X
+		LDA.l SpriteOAM+4, X : !ADD.w #$0010 : STA.l SpriteOAM+12, X
+		LDA.l SpriteOAM+6, X : STA.l SpriteOAM+14, X
 		SEP #$20 ; set 8-bit accumulator
 	PLX
 RTS
diff --git a/spriteswap.asm b/spriteswap.asm
index 5075eac..b37fe03 100644
--- a/spriteswap.asm
+++ b/spriteswap.asm
@@ -1,5 +1,5 @@
 org $008A01 ; 0xA01 - Bank00.asm (LDA.b #$10 : STA $4304 : STA $4314 : STA $4324)
-LDA $BC
+LDA.b $BC
 
 org $1BEDF9
 JSL SpriteSwap_Palette_ArmorAndGloves ;4bytes
@@ -10,17 +10,15 @@ org $1BEE1B
 JSL SpriteSwap_Palette_ArmorAndGloves_part_two
 RTL
 
-!SPRITE_SWAP = "$7F50CD"
-;!STABLE_SCRATCH = "$7EC178"
-!BANK_BASE = "#$29"
+!BANK_BASE = $29
 
 org $BF8000
 SwapSpriteIfNecessary:
 	PHP
 		SEP #$20 ; set 8-bit accumulator
-		LDA !SPRITE_SWAP : BEQ + : !ADD !BANK_BASE : CMP $BC : BEQ +
-			STA $BC
-		    STZ $0710 ; Set Normal Sprite NMI
+		LDA.l SpriteSwapper : BEQ + : !ADD #!BANK_BASE : CMP.b $BC : BEQ +
+			STA.b $BC
+		    STZ.w $0710 ; Set Normal Sprite NMI
 			JSL.l SpriteSwap_Palette_ArmorAndGloves_part_two
 		+
 	PLP
@@ -29,17 +27,17 @@ RTL
 SpriteSwap_Palette_ArmorAndGloves:
 {
     ;DEDF9
-    LDA !SPRITE_SWAP : BNE .continue
-        LDA.b #$10 : STA $BC ; Load Original Sprite Location
+    LDA.l SpriteSwapper : BNE .continue
+        LDA.b #$10 : STA.b $BC ; Load Original Sprite Location
         REP #$21
-        LDA ArmorEquipment
+        LDA.l ArmorEquipment
         JSL $1BEDFF ; Read Original Palette Code
     RTL
     .part_two
     SEP #$30
-    LDA !SPRITE_SWAP : BNE .continue
+    LDA.l SpriteSwapper : BNE .continue
         REP #$30
-        LDA GloveEquipment 
+        LDA.l GloveEquipment 
         JSL $1BEE21 ; Read Original Palette Code
     RTL
 
@@ -47,15 +45,13 @@ SpriteSwap_Palette_ArmorAndGloves:
 
     PHX : PHY : PHA
     ; Load armor palette
-        PHB : PHK : PLB
+    PHB : PHK : PLB
     REP #$20 ; set 16-bit accumulator
     
     ; Check what Link's armor value is.
-    LDA ArmorEquipment : AND.w #$00FF : TAX
+    LDA.l ArmorEquipment : AND.w #$00FF : TAX
     
-    ; (DEC06, X)
-    
-    LDA $1BEC06, X : AND.w #$00FF : ASL A : ADC.w #$F000 : STA $00
+    LDA.l $1BEC06, X : AND.w #$00FF : ASL A : ADC.w #$F000 : STA.b Scrap00
     ;replace D308 by 7000 and search
     REP #$10 ; set 16-bit index registers
     
@@ -64,13 +60,13 @@ SpriteSwap_Palette_ArmorAndGloves:
     
     TXY : TAX
     
-    LDA.b $BC : AND #$00FF : STA $02
+    LDA.b $BC : AND.w #$00FF : STA.b Scrap02
 
 .loop
 
-    LDA [$00] : STA $7EC300, X : STA $7EC500, X
+    LDA.b [Scrap00] : STA.l $7EC300, X : STA.l $7EC500, X
     
-    INC $00 : INC $00
+    INC.b Scrap00 : INC.b Scrap00
     
     INX #2
     
diff --git a/sram.asm b/sram.asm
index 9ca097e..7061005 100644
--- a/sram.asm
+++ b/sram.asm
@@ -395,8 +395,11 @@ RoomDataSRAM:                   ;
 skip $280                       ;
 OverworldEventDataSRAM:         ;
 skip $C0                        ;
-EquipmentSRAM: skip 76          ;
-InventoryTrackingSRAM: skip 2   ;
+EquipmentSRAM: skip 3           ; skip 76
+BombsEquipmentSRAM: skip 31     ; 343
+DisplayRupeesSRAM: skip 21      ; 362
+CurrentArrowsSRAM: skip 21      ; 377
+InventoryTrackingSRAM: skip 2   ; 38C
 BowTrackingSRAM: skip 2         ;
 skip 53                         ;
 ProgressIndicatorSRAM: skip 1   ;
@@ -659,6 +662,9 @@ endmacro
 %assertSRAM(RoomDataSRAM, $700000)
 %assertSRAM(OverworldEventDataSRAM, $700280)
 %assertSRAM(EquipmentSRAM, $700340)
+%assertSRAM(BombsEquipmentSRAM, $700343)
+%assertSRAM(DisplayRupeesSRAM, $700362)
+%assertSRAM(CurrentArrowsSRAM, $700377)
 %assertSRAM(InventoryTrackingSRAM, $70038C)
 %assertSRAM(BowTrackingSRAM, $70038E)
 %assertSRAM(ProgressIndicatorSRAM, $7003C5)
diff --git a/stats.asm b/stats.asm
index ad362b1..2697751 100644
--- a/stats.asm
+++ b/stats.asm
@@ -6,44 +6,44 @@
 ; See sram.asm for adresses and documentation of stat values
 ;--------------------------------------------------------------------------------
 IncrementBonkCounter:
-	LDA StatsLocked : BNE +
-		LDA BonkCounter : INC
+	LDA.l StatsLocked : BNE +
+		LDA.l BonkCounter : INC
 		CMP.b #100 : BEQ + ; decimal 100
-			STA BonkCounter
+			STA.l BonkCounter
 	+
 RTL
 ;--------------------------------------------------------------------------------
 StatSaveCounter:
 	PHA
-		LDA StatsLocked : BNE +
-		LDA $10 : CMP.b #$17 : BNE + ; not a proper s&q, link probably died
-		LDA SaveQuitCounter : INC
+		LDA.l StatsLocked : BNE +
+		LDA.b $10 : CMP.b #$17 : BNE + ; not a proper s&q, link probably died
+		LDA.l SaveQuitCounter : INC
 		CMP.b #100 : BEQ + ; decimal 100
-			STA SaveQuitCounter
+			STA.l SaveQuitCounter
 		+
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
 DecrementSaveCounter:
 	PHA
-		LDA StatsLocked : BNE +
-			LDA SaveQuitCounter : DEC : STA SaveQuitCounter
+		LDA.l StatsLocked : BNE +
+			LDA.l SaveQuitCounter : DEC : STA.l SaveQuitCounter
 		+
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
 DungeonHoleWarpTransition:
-	LDA $01C31F, X
+	LDA.l $01C31F, X
 	BRA StatTransitionCounter
 DungeonHoleEntranceTransition:
 	JSL EnableForceBlank
 	
 	LDA.l SilverArrowsAutoEquip : AND.b #$02 : BEQ +
 	LDA $010E : CMP.b #$7B : BNE + ; skip unless falling to ganon's room
-	LDA BowTracking : AND.b #$40 : BEQ + ; skip if we don't have silvers
-	LDA BowEquipment : BEQ + ; skip if we have no bow
+	LDA.l BowTracking : AND.b #$40 : BEQ + ; skip if we don't have silvers
+	LDA.l BowEquipment : BEQ + ; skip if we have no bow
 	CMP.b #$03 : !BGE + ; skip if the bow is already silver
-		!ADD #$02 : STA BowEquipment ; increase bow to silver
+		!ADD #$02 : STA.l BowEquipment ; increase bow to silver
 	+
 	
 	BRA StatTransitionCounter
@@ -51,33 +51,33 @@ DungeonStairsTransition:
 	JSL Dungeon_SaveRoomQuadrantData
 	BRA StatTransitionCounter
 DungeonExitTransition:
-	LDA $7F50C7 : BEQ + ; ice physics
+	LDA.l IceModifier : BEQ + ; ice physics
 		JSL Player_HaltDashAttackLong
-		LDA.b #$00 : STA $0301 ; stop item dashing
+		LDA.b #$00 : STA.w $0301 ; stop item dashing
 	+
-	LDA.b #$0F : STA $10 ; stop running through the transition
+	LDA.b #$0F : STA.b $10 ; stop running through the transition
 StatTransitionCounter:
 	PHA : PHP
-		LDA StatsLocked : BNE +
+		LDA.l StatsLocked : BNE +
 		REP #$20 ; set 16-bit accumulator
-		LDA ScreenTransitions : INC
+		LDA.l ScreenTransitions : INC
 		CMP.w #999 : BEQ + ; decimal 999
-			STA ScreenTransitions
+			STA.l ScreenTransitions
 		+
 	PLP : PLA
 RTL
 ;--------------------------------------------------------------------------------
 IncrementFlute:
-	LDA StatsLocked : BNE +
-		LDA FluteCounter : INC : STA FluteCounter
+	LDA.l StatsLocked : BNE +
+		LDA.l FluteCounter : INC : STA.l FluteCounter
 	+
 	JSL.l StatTransitionCounter ; also increment transition counter
 RTL
 ;--------------------------------------------------------------------------------
 IncrementSmallKeys:
-	STA CurrentSmallKeys ; thing we wrote over, write small key count
+	STA.l CurrentSmallKeys ; thing we wrote over, write small key count
 	PHX
-		LDA StatsLocked : BNE +
+		LDA.l StatsLocked : BNE +
 			JSL AddInventory_incrementKeyLong
 		+
 		JSL.l UpdateKeys
@@ -87,15 +87,15 @@ IncrementSmallKeys:
 RTL
 ;--------------------------------------------------------------------------------
 IncrementSmallKeysNoPrimary:
-	STA CurrentSmallKeys ; thing we wrote over, write small key count
+	STA.l CurrentSmallKeys ; thing we wrote over, write small key count
 	PHX
-		LDA StatsLocked : BNE +
+		LDA.l StatsLocked : BNE +
 			JSL AddInventory_incrementKeyLong
 		+
 		JSL.l UpdateKeys
-		LDA $1B : BEQ + ; skip room check if outdoors
+		LDA.b $1B : BEQ + ; skip room check if outdoors
 			PHP : REP #$20 ; set 16-bit accumulator
-				LDA $048E : CMP.w #$0087 : BNE ++ ; hera basement
+				LDA.w $048E : CMP.w #$0087 : BNE ++ ; hera basement
 					PLP : PHY : LDY.b #$24 : JSL.l FullInventoryExternal
 					JSR CountChestKey : PLY : BRA +
 				++
@@ -106,7 +106,7 @@ IncrementSmallKeysNoPrimary:
 RTL
 ;--------------------------------------------------------------------------------
 DecrementSmallKeys:
-	STA CurrentSmallKeys ; thing we wrote over, write small key count
+	STA.l CurrentSmallKeys ; thing we wrote over, write small key count
 	JSL.l UpdateKeys
 RTL
 ;--------------------------------------------------------------------------------
@@ -116,31 +116,31 @@ RTL
 ;--------------------------------------------------------------------------------
 CountChestKey: ; called by neighbor functions
 	PHA : PHX
-		CPY #$24 : BEQ +  ; small key for this dungeon - use $040C
-			CPY #$A0 : !BLT .end ; Ignore most items
-			CPY #$AE : !BGE .end ; Ignore reserved key and generic key
+		CPY.b #$24 : BEQ +  ; small key for this dungeon - use $040C
+			CPY.b #$A0 : !BLT .end ; Ignore most items
+			CPY.b #$AE : !BGE .end ; Ignore reserved key and generic key
 			TYA : AND.B #$0F : BNE ++ ; If this is an HC key, instead count it as a sewers key
 				INC
 			++ TAX : BRA .count  ; use Key id instead of $040C (Keysanity)
-		+ LDA $040C : LSR
+		+ LDA.w $040C : LSR
 		BNE +
 			INC ; combines HC and Sewer counts
 		+ TAX
 		.count
-		LDA DungeonCollectedKeys, X : INC : STA DungeonCollectedKeys, X
+		LDA.l DungeonCollectedKeys, X : INC : STA.l DungeonCollectedKeys, X
    .end
 	PLX : PLA
 RTS
 ;--------------------------------------------------------------------------------
 CountBonkItem: ; called from GetBonkItem in bookofmudora.asm
-	LDA $A0 ; check room ID - only bonk keys in 2 rooms so we're just checking the lower byte
-	CMP #115 : BNE + ; Desert Bonk Key
-		LDA.L BonkKey_Desert : BRA ++
-	+ : CMP #140 : BNE + ; GTower Bonk Key
-		LDA.L BonkKey_GTower : BRA ++
-	+ LDA.B #$24 ; default to small key
+	LDA.b $A0 ; check room ID - only bonk keys in 2 rooms so we're just checking the lower byte
+	CMP.b #115 : BNE + ; Desert Bonk Key
+		LDA.l BonkKey_Desert : BRA ++
+	+ : CMP.b #140 : BNE + ; GTower Bonk Key
+		LDA.l BonkKey_GTower : BRA ++
+	+ LDA.b #$24 ; default to small key
 	++
-	CMP #$24 : BNE +
+	CMP.b #$24 : BNE +
 		PHY
 			TAY : JSR CountChestKey
 		PLY
@@ -149,7 +149,7 @@ RTL
 ;--------------------------------------------------------------------------------
 IncrementAgahnim2Sword:
 	PHA
-		LDA StatsLocked : BNE +
+		LDA.l StatsLocked : BNE +
 			JSL AddInventory_incrementBossSwordLong
 		+
 	PLA
@@ -157,52 +157,52 @@ RTL
 ;--------------------------------------------------------------------------------
 IncrementDeathCounter:
 	PHA
-		LDA StatsLocked : BNE +
-		LDA CurrentHealth : BNE + ; link is still alive, skip
-			LDA DeathCounter : INC : STA DeathCounter
+		LDA.l StatsLocked : BNE +
+		LDA.l CurrentHealth : BNE + ; link is still alive, skip
+			LDA.l DeathCounter : INC : STA.l DeathCounter
 		+
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
 IncrementFairyRevivalCounter:
-	STA BottleContents, X ; thing we wrote over
+	STA.l BottleContents, X ; thing we wrote over
 	PHA
-		LDA StatsLocked : BNE +
-			LDA FaerieRevivalCounter : INC : STA FaerieRevivalCounter
+		LDA.l StatsLocked : BNE +
+			LDA.l FaerieRevivalCounter : INC : STA.l FaerieRevivalCounter
 		+
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
 IncrementChestTurnCounter:
 	PHA
-		LDA StatsLocked : BNE +
-			LDA ChestTurnCounter : INC : STA ChestTurnCounter
+		LDA.l StatsLocked : BNE +
+			LDA.l ChestTurnCounter : INC : STA.l ChestTurnCounter
 		+
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
 IncrementChestCounter:
-	LDA.b #$01 : STA $02E9 ; thing we wrote over
+	LDA.b #$01 : STA.w $02E9 ; thing we wrote over
 	PHA
-		LDA StatsLocked : BNE +
-			LDA ChestsOpened : INC : STA ChestsOpened
+		LDA.l StatsLocked : BNE +
+			LDA.l ChestsOpened : INC : STA.l ChestsOpened
 		+
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
 DecrementChestCounter:
 	PHA
-		LDA StatsLocked : BNE +
-			LDA ChestsOpened : DEC : STA ChestsOpened
+		LDA.l StatsLocked : BNE +
+			LDA.l ChestsOpened : DEC : STA.l ChestsOpened
 		+
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
 DecrementItemCounter:
 	PHA
-		LDA StatsLocked : BNE +
+		LDA.l StatsLocked : BNE +
                         REP #$20
-			LDA TotalItemCounter : DEC : STA TotalItemCounter
+			LDA.l TotalItemCounter : DEC : STA.l TotalItemCounter
                         SEP #$20
 		+
 	PLA
@@ -211,7 +211,7 @@ RTL
 IncrementBigChestCounter:
 	JSL.l Dungeon_SaveRoomQuadrantData ; thing we wrote over
 	PHA
-		LDA StatsLocked : BNE +
+		LDA.l StatsLocked : BNE +
 			%BottomHalf(BigKeysBigChests)
 		+
 	PLA
@@ -220,7 +220,7 @@ RTL
 IncrementDamageTakenCounter_Eight:
 	STA.l CurrentHealth
 	PHA : PHP
-	LDA StatsLocked : BNE +
+	LDA.l StatsLocked : BNE +
 	REP #$21
 	LDA.l DamageCounter
 	ADC.w #$0008
@@ -233,7 +233,7 @@ IncrementDamageTakenCounter_Eight:
 
 IncrementDamageTakenCounter_Arb:
 	PHP
-	LDA StatsLocked : BNE +
+	LDA.l StatsLocked : BNE +
 	REP #$21
 	LDA.b $00
 	AND.w #$00FF
@@ -251,7 +251,7 @@ IncrementMagicUseCounter:
 
 IncrementMagicUseCounterByrna:
 	PHA : PHP
-	LDA StatsLocked : BNE +
+	LDA.l StatsLocked : BNE +
 	REP #$21
 	LDA.b $00
 	AND.w #$00FF
@@ -264,7 +264,7 @@ IncrementMagicUseCounterByrna:
 	RTL
 
 IncrementMagicUseCounterOne:
-	LDA StatsLocked : BNE +
+	LDA.l StatsLocked : BNE +
 	REP #$20
 	LDA.l MagicCounter
 	INC
@@ -276,21 +276,21 @@ IncrementMagicUseCounterOne:
 
 ;--------------------------------------------------------------------------------
 IncrementOWMirror:
-	PHA
-		LDA #$08 : STA $021B ; fail race game
-		LDA StatsLocked : BNE +
-		LDA CurrentWorld : BEQ + ; only do this for DW->LW
-			LDA OverworldMirrors : INC : STA OverworldMirrors
-		+
-	PLA
+        PHA
+                LDA.b #$08 : STA.w $021B ; fail race game
+                LDA.l StatsLocked : BNE +
+                LDA.l CurrentWorld : BEQ + ; only do this for DW->LW
+                        LDA.l OverworldMirrors : INC : STA.l OverworldMirrors
+                +
+        PLA
 JMP StatTransitionCounter
 ;--------------------------------------------------------------------------------
 IncrementUWMirror:
 	PHA
-		LDA.b #$00 : STA $7F5035 ; bandaid patch bug with mirroring away from text
-		LDA StatsLocked : BNE +
+		LDA.b #$00 : STA.l $7F5035 ; bandaid patch bug with mirroring away from text
+		LDA.l StatsLocked : BNE +
 		LDA $040C : CMP #$FF : BEQ + ; skip if we're in a cave or house
-			LDA UnderworldMirrors : INC : STA UnderworldMirrors
+			LDA.l UnderworldMirrors : INC : STA.l UnderworldMirrors
 			JSL.l StatTransitionCounter
 		+
 	PLA
@@ -299,14 +299,14 @@ RTL
 ;--------------------------------------------------------------------------------
 IncrementSpentRupees:
     DEC A : BPL .subtractRupees
-    LDA.w #$0000 : STA CurrentRupees
+    LDA.w #$0000 : STA.l CurrentRupees
 RTL
 	.subtractRupees
 	PHA : PHP
-	LDA StatsLocked : AND.w #$00FF : BNE +
-		LDA RupeesSpent : INC
+	LDA.l StatsLocked : AND.w #$00FF : BNE +
+		LDA.l RupeesSpent : INC
 		CMP.w #9999 : BEQ + ; decimal 9999
-			STA RupeesSpent
+			STA.l RupeesSpent
 	+
 	PLP : PLA
 RTL
@@ -314,53 +314,45 @@ RTL
 IndoorTileTransitionCounter:
 JMP StatTransitionCounter
 ;--------------------------------------------------------------------------------
-!REDRAW = "$7F5000"
 IndoorSubtileTransitionCounter:
-	LDA.b #$01 : STA !REDRAW ; set redraw flag for items
-    STZ $0646 ; stuff we wrote over
-    STZ $0642
+        LDA.b #$01 : STA.l RedrawFlag ; set redraw flag for items
+        STZ.w $0646 ; stuff we wrote over
+        STZ.w $0642
 JMP StatTransitionCounter
 ;--------------------------------------------------------------------------------
-!BOSS_KILLS = "$7F5037"
-!NONCHEST_COUNTER = "$7F503E"
-
-!LAG_TIME = "$7F5038"
-
-!RUPEES_COLLECTED = "$7F503C"
-
 StatsFinalPrep:
 	PHA : PHX : PHP
 		SEP #$30 ; set 8-bit accumulator and index registers
 		
-		LDA StatsLocked : BNE .ramPostOnly
-		INC : STA StatsLocked
+		LDA.l StatsLocked : BNE .ramPostOnly
+		INC : STA.l StatsLocked
 	
 		JSL.l AddInventory_incrementBossSwordLong
 	
-		LDA HighestMail : INC : STA HighestMail ; add green mail to mail count
+		LDA.l HighestMail : INC : STA.l HighestMail ; add green mail to mail count
 		
-		LDA ScreenTransitions : DEC : STA ScreenTransitions ; remove extra transition from exiting gtower via duck
+		LDA.l ScreenTransitions : DEC : STA.l ScreenTransitions ; remove extra transition from exiting gtower via duck
 		
 		.ramPostOnly
-		LDA SwordBossKills : LSR #4 : !ADD SwordBossKills : STA !BOSS_KILLS
-		LDA SwordBossKills+1 : LSR #4 : !ADD SwordBossKills+1 : !ADD !BOSS_KILLS : AND #$0F : STA !BOSS_KILLS
+		LDA.l SwordBossKills : LSR #4 : !ADD SwordBossKills : STA.l BossKills
+		LDA.l SwordBossKills+1 : LSR #4 : !ADD SwordBossKills+1 : !ADD BossKills : AND.b #$0F : STA.l BossKills
 	
-		LDA NMIFrames : !SUB LoopFrames : STA !LAG_TIME
-		LDA NMIFrames+1 : SBC LoopFrames+1 : STA !LAG_TIME+1
-		LDA NMIFrames+2 : SBC LoopFrames+2 : STA !LAG_TIME+2
-		LDA NMIFrames+3 : SBC LoopFrames+3 : STA !LAG_TIME+3
-	
-		LDA RupeesSpent : !ADD DisplayRupees : STA !RUPEES_COLLECTED
-		LDA RupeesSpent+1 : ADC DisplayRupees+1 : STA !RUPEES_COLLECTED+1
+		LDA.l NMIFrames : !SUB LoopFrames : STA.l LagTime
+		LDA.l NMIFrames+1 : SBC LoopFrames+1 : STA.l LagTime+1
+		LDA.l NMIFrames+2 : SBC LoopFrames+2 : STA.l LagTime+2
+		LDA.l NMIFrames+3 : SBC LoopFrames+3 : STA.l LagTime+3
+
+		LDA.l RupeesSpent : !ADD DisplayRupees : STA.l RupeesCollected
+		LDA.l RupeesSpent+1 : ADC DisplayRupees+1 : STA.l RupeesCollected+1
 
                 REP #$20
-		LDA TotalItemCounter : !SUB ChestsOpened : STA !NONCHEST_COUNTER
+		LDA.l TotalItemCounter : !SUB ChestsOpened : STA.l NonChestCounter
 
 		.done
 	PLP : PLX : PLA
-	LDA.b #$19 : STA $10 ; thing we wrote over, load triforce room
-        STZ $11
-        STZ $B0
+	LDA.b #$19 : STA.b $10 ; thing we wrote over, load triforce room
+        STZ.b $11
+        STZ.b $B0
 RTL
 ;--------------------------------------------------------------------------------
 ; Notes:
diff --git a/stats/credits.asm b/stats/credits.asm
old mode 100755
new mode 100644
index fe58b28..3731f25
--- a/stats/credits.asm
+++ b/stats/credits.asm
@@ -1,606 +1,713 @@
-; SIZE: 3212
+;===================================================================================================
+; LEAVE THIS HERE FOR PHP WRITES
+;===================================================================================================
+table "creditscharmapbighi.txt"
+YourSpriteCreditsHi:
+db 2
+db 55
+db "                            " ; $238002
 
-CreditsLine000:
-    ;ORIGINAL GAME STAFF
-    db $00, $01, $9F
-CreditsLine001:
-    ;ORIGINAL GAME STAFF
-    db $06, $25, $28, $2B, $22, $20, $22, $27, $1A, $25, $9F, $20, $1A, $26, $1E, $9F, $2C, $2D, $1A, $1F, $1F
-CreditsLine002:
-    ;EXECUTIVE PRODUCER
-    db $07, $23, $3C, $4F, $3C, $3A, $4C, $4B, $40, $4D, $3C, $9F, $47, $49, $46, $3B, $4C, $3A, $3C, $49
-CreditsLine003:
-    ;HIROSHI YAMAUCHI
-    db $08, $1F, $64, $65, $6E, $6B, $6F, $64, $65, $9F, $75, $5D, $69, $5D, $71, $5F, $64, $65
-CreditsLine004:
-    ;HIROSHI YAMAUCHI
-    db $08, $1F, $8A, $8B, $94, $91, $95, $8A, $8B, $9F, $9B, $83, $8F, $83, $97, $85, $8A, $8B
-CreditsLine005:
-    ;PRODUCER
-    db $0C, $0F, $29, $2B, $28, $1D, $2E, $1C, $1E, $2B
-CreditsLine006:
-    ;SHIGERU MIYAMOTO
-    db $08, $1F, $6F, $64, $65, $63, $61, $6E, $71, $9F, $69, $65, $75, $5D, $69, $6B, $70, $6B
-CreditsLine007:
-    ;SHIGERU MIYAMOTO
-    db $08, $1F, $95, $8A, $8B, $89, $87, $94, $97, $9F, $8F, $8B, $9B, $83, $8F, $91, $96, $91
-CreditsLine008:
-    ;DIRECTOR
-    db $0C, $0F, $03, $08, $11, $04, $02, $13, $0E, $11
-CreditsLine009:
-    ;TAKASHI TEZUKA
-    db $09, $1B, $70, $5D, $67, $5D, $6F, $64, $65, $9F, $70, $61, $76, $71, $67, $5D
-CreditsLine010:
-    ;TAKASHI TEZUKA
-    db $09, $1B, $96, $83, $8D, $83, $95, $8A, $8B, $9F, $96, $87, $9C, $97, $8D, $83
-CreditsLine011:
-    ;SCRIPT WRITER
-    db $09, $19, $4A, $3A, $49, $40, $47, $4B, $9F, $4E, $49, $40, $4B, $3C, $49
-CreditsLine012:
-    ;KENSUKE TANABE
-    db $09, $1B, $67, $61, $6A, $6F, $71, $67, $61, $9F, $70, $5D, $6A, $5D, $5E, $61
-CreditsLine013:
-    ;KENSUKE TANABE
-    db $09, $1B, $8D, $87, $90, $95, $97, $8D, $87, $9F, $96, $83, $90, $83, $84, $87
-CreditsLine014:
-    ;ASSISTANT DIRECTORS
-    db $06, $25, $1A, $2C, $2C, $22, $2C, $2D, $1A, $27, $2D, $9F, $1D, $22, $2B, $1E, $1C, $2D, $28, $2B, $2C
-CreditsLine015:
-    ;YASUHISA YAMAMURA
-    db $07, $21, $75, $5D, $6F, $71, $64, $65, $6F, $5D, $9F, $75, $5D, $69, $5D, $69, $71, $6E, $5D
-CreditsLine016:
-    ;YASUHISA YAMAMURA
-    db $07, $21, $9B, $83, $95, $97, $8A, $8B, $95, $83, $9F, $9B, $83, $8F, $83, $8F, $97, $94, $83
-CreditsLine017:
-    ;YOICHI YAMADA
-    db $09, $19, $75, $6B, $65, $5F, $64, $65, $9F, $75, $5D, $69, $5D, $60, $5D
-CreditsLine018:
-    ;YOICHI YAMADA
-    db $09, $19, $9B, $91, $8B, $85, $8A, $8B, $9F, $9B, $83, $8F, $83, $86, $83
-CreditsLine019:
-    ;SCREEN GRAPHICS DESIGNERS
-    db $03, $31, $4A, $3A, $49, $3C, $3C, $45, $9F, $3E, $49, $38, $47, $3F, $40, $3A, $4A, $9F, $3B, $3C, $4A, $40, $3E, $45, $3C, $49, $4A
-CreditsLine020:
-    ;OBJECT DESIGNERS
-    db $08, $1F, $28, $1B, $23, $1E, $1C, $2D, $9F, $1D, $1E, $2C, $22, $20, $27, $1E, $2B, $2C
-CreditsLine021:
-    ;SOICHIRO TOMITA
-    db $08, $1D, $6F, $6B, $65, $5F, $64, $65, $6E, $6B, $9F, $70, $6B, $69, $65, $70, $5D
-CreditsLine022:
-    ;SOICHIRO TOMITA
-    db $08, $1D, $95, $91, $8B, $85, $8A, $8B, $94, $91, $9F, $96, $91, $8F, $8B, $96, $83
-CreditsLine023:
-    ;TAKAYA IMAMURA
-    db $09, $1B, $70, $5D, $67, $5D, $75, $5D, $9F, $65, $69, $5D, $69, $71, $6E, $5D
-CreditsLine024:
-    ;TAKAYA IMAMURA
-    db $09, $1B, $96, $83, $8D, $83, $9B, $83, $9F, $8B, $8F, $83, $8F, $97, $94, $83
-CreditsLine025:
-    ;BACK GROUND DESIGNERS
-    db $05, $29, $1B, $1A, $1C, $24, $9F, $20, $2B, $28, $2E, $27, $1D, $9F, $1D, $1E, $2C, $22, $20, $27, $1E, $2B, $2C
-CreditsLine026:
-    ;MASANAO ARIMOTO
-    db $08, $1D, $69, $5D, $6F, $5D, $6A, $5D, $6B, $9F, $5D, $6E, $65, $69, $6B, $70, $6B
-CreditsLine027:
-    ;MASANAO ARIMOTO
-    db $08, $1D, $8F, $83, $95, $83, $90, $83, $91, $9F, $83, $94, $8B, $8F, $91, $96, $91
-CreditsLine028:
-    ;TSUYOSHI WATANABE
-    db $07, $21, $70, $6F, $71, $75, $6B, $6F, $64, $65, $9F, $73, $5D, $70, $5D, $6A, $5D, $5E, $61
-CreditsLine029:
-    ;TSUYOSHI WATANABE
-    db $07, $21, $96, $95, $97, $9B, $91, $95, $8A, $8B, $9F, $99, $83, $96, $83, $90, $83, $84, $87
-CreditsLine030:
-    ;PROGRAM DIRECTOR
-    db $08, $1F, $0F, $11, $0E, $06, $11, $00, $0C, $9F, $03, $08, $11, $04, $02, $13, $0E, $11
-CreditsLine031:
-    ;TOSHIHIKO NAKAGO
-    db $08, $1F, $70, $6B, $6F, $64, $65, $64, $65, $67, $6B, $9F, $6A, $5D, $67, $5D, $63, $6B
-CreditsLine032:
-    ;TOSHIHIKO NAKAGO
-    db $08, $1F, $96, $91, $95, $8A, $8B, $8A, $8B, $8D, $91, $9F, $90, $83, $8D, $83, $89, $91
-CreditsLine033:
-    ;MAIN PROGRAMMER
-    db $08, $1D, $44, $38, $40, $45, $9F, $47, $49, $46, $3E, $49, $38, $44, $44, $3C, $49
-CreditsLine034:
-    ;YASUNARI SOEJIMA
-    db $08, $1F, $75, $5D, $6F, $71, $6A, $5D, $6E, $65, $9F, $6F, $6B, $61, $66, $65, $69, $5D
-CreditsLine035:
-    ;YASUNARI SOEJIMA
-    db $08, $1F, $9B, $83, $95, $97, $90, $83, $94, $8B, $9F, $95, $91, $87, $8C, $8B, $8F, $83
-CreditsLine036:
-    ;OBJECT PROGRAMMER
-    db $07, $21, $46, $39, $41, $3C, $3A, $4B, $9F, $47, $49, $46, $3E, $49, $38, $44, $44, $3C, $49
-CreditsLine037:
-    ;KAZUAKI MORITA
-    db $09, $1B, $67, $5D, $76, $71, $5D, $67, $65, $9F, $69, $6B, $6E, $65, $70, $5D
-CreditsLine038:
-    ;KAZUAKI MORITA
-    db $09, $1B, $8D, $83, $9C, $97, $83, $8D, $8B, $9F, $8F, $91, $94, $8B, $96, $83
-CreditsLine039:
-    ;PROGRAMMERS
-    db $0A, $15, $29, $2B, $28, $20, $2B, $1A, $26, $26, $1E, $2B, $2C
-CreditsLine040:
-    ;TATSUO NISHIYAMA
-    db $08, $1F, $70, $5D, $70, $6F, $71, $6B, $9F, $6A, $65, $6F, $64, $65, $75, $5D, $69, $5D
-CreditsLine041:
-    ;TATSUO NISHIYAMA
-    db $08, $1F, $96, $83, $96, $95, $97, $91, $9F, $90, $8B, $95, $8A, $8B, $9B, $83, $8F, $83
-CreditsLine042:
-    ;YUICHI YAMAMOTO
-    db $08, $1D, $75, $71, $65, $5F, $64, $65, $9F, $75, $5D, $69, $5D, $69, $6B, $70, $6B
-CreditsLine043:
-    ;YUICHI YAMAMOTO
-    db $08, $1D, $9B, $97, $8B, $85, $8A, $8B, $9F, $9B, $83, $8F, $83, $8F, $91, $96, $91
-CreditsLine044:
-    ;YOSHIHIRO NOMOTO
-    db $08, $1F, $75, $6B, $6F, $64, $65, $64, $65, $6E, $6B, $9F, $6A, $6B, $69, $6B, $70, $6B
-CreditsLine045:
-    ;YOSHIHIRO NOMOTO
-    db $08, $1F, $9B, $91, $95, $8A, $8B, $8A, $8B, $94, $91, $9F, $90, $91, $8F, $91, $96, $91
-CreditsLine046:
-    ;EIJI NOTO
-    db $0B, $11, $61, $65, $66, $65, $9F, $6A, $6B, $70, $6B
-CreditsLine047:
-    ;EIJI NOTO
-    db $0B, $11, $87, $8B, $8C, $8B, $9F, $90, $91, $96, $91
-CreditsLine048:
-    ;SATORU TAKAHATA
-    db $08, $1D, $6F, $5D, $70, $6B, $6E, $71, $9F, $70, $5D, $67, $5D, $64, $5D, $70, $5D
-CreditsLine049:
-    ;SATORU TAKAHATA
-    db $08, $1D, $95, $83, $96, $91, $94, $97, $9F, $96, $83, $8D, $83, $8A, $83, $96, $83
-CreditsLine050:
-    ;TOSHIO IWAWAKI
-    db $09, $1B, $70, $6B, $6F, $64, $65, $6B, $9F, $65, $73, $5D, $73, $5D, $67, $65
-CreditsLine051:
-    ;TOSHIO IWAWAKI
-    db $09, $1B, $96, $91, $95, $8A, $8B, $91, $9F, $8B, $99, $83, $99, $83, $8D, $8B
-CreditsLine052:
-    ;SHIGEHIRO KASAMATSU
-    db $06, $25, $6F, $64, $65, $63, $61, $64, $65, $6E, $6B, $9F, $67, $5D, $6F, $5D, $69, $5D, $70, $6F, $71
-CreditsLine053:
-    ;SHIGEHIRO KASAMATSU
-    db $06, $25, $95, $8A, $8B, $89, $87, $8A, $8B, $94, $91, $9F, $8D, $83, $95, $83, $8F, $83, $96, $95, $97
-CreditsLine054:
-    ;YASUNARI NISHIDA
-    db $08, $1F, $75, $5D, $6F, $71, $6A, $5D, $6E, $65, $9F, $6A, $65, $6F, $64, $65, $60, $5D
-CreditsLine055:
-    ;YASUNARI NISHIDA
-    db $08, $1F, $9B, $83, $95, $97, $90, $83, $94, $8B, $9F, $90, $8B, $95, $8A, $8B, $86, $83
-CreditsLine056:
-    ;SOUND COMPOSER
-    db $09, $1B, $12, $0E, $14, $0D, $03, $9F, $02, $0E, $0C, $0F, $0E, $12, $04, $11
-CreditsLine057:
-    ;KOJI KONDO
-    db $0B, $13, $67, $6B, $66, $65, $9F, $67, $6B, $6A, $60, $6B
-CreditsLine058:
-    ;KOJI KONDO
-    db $0B, $13, $8D, $91, $8C, $8B, $9F, $8D, $91, $90, $86, $91
-CreditsLine059:
-    ;COORDINATORS
-    db $0A, $17, $3A, $46, $46, $49, $3B, $40, $45, $38, $4B, $46, $49, $4A
-CreditsLine060:
-    ;KEIZO KATO
-    db $0B, $13, $67, $61, $65, $76, $6B, $9F, $67, $5D, $70, $6B
-CreditsLine061:
-    ;KEIZO KATO
-    db $0B, $13, $8D, $87, $8B, $9C, $91, $9F, $8D, $83, $96, $91
-CreditsLine062:
-    ;TAKAO SHIMIZU
-    db $09, $19, $70, $5D, $67, $5D, $6B, $9F, $6F, $64, $65, $69, $65, $76, $71
-CreditsLine063:
-    ;TAKAO SHIMIZU
-    db $09, $19, $96, $83, $8D, $83, $91, $9F, $95, $8A, $8B, $8F, $8B, $9C, $97
-CreditsLine064:
-    ;PRINTED ART WORK
-    db $08, $1F, $29, $2B, $22, $27, $2D, $1E, $1D, $9F, $1A, $2B, $2D, $9F, $30, $28, $2B, $24
-CreditsLine065:
-    ;YOICHI KOTABE
-    db $09, $19, $75, $6B, $65, $5F, $64, $65, $9F, $67, $6B, $70, $5D, $5E, $61
-CreditsLine066:
-    ;YOICHI KOTABE
-    db $09, $19, $9B, $91, $8B, $85, $8A, $8B, $9F, $8D, $91, $96, $83, $84, $87
-CreditsLine067:
-    ;HIDEKI FUJII
-    db $0A, $17, $64, $65, $60, $61, $67, $65, $9F, $62, $71, $66, $65, $65
-CreditsLine068:
-    ;HIDEKI FUJII
-    db $0A, $17, $8A, $8B, $86, $87, $8D, $8B, $9F, $88, $97, $8C, $8B, $8B
-CreditsLine069:
-    ;YOSHIAKI KOIZUMI
-    db $08, $1F, $75, $6B, $6F, $64, $65, $5D, $67, $65, $9F, $67, $6B, $65, $76, $71, $69, $65
-CreditsLine070:
-    ;YOSHIAKI KOIZUMI
-    db $08, $1F, $9B, $91, $95, $8A, $8B, $83, $8D, $8B, $9F, $8D, $91, $8B, $9C, $97, $8F, $8B
-CreditsLine071:
-    ;YASUHIRO SAKAI
-    db $09, $1B, $75, $5D, $6F, $71, $64, $65, $6E, $6B, $9F, $6F, $5D, $67, $5D, $65
-CreditsLine072:
-    ;YASUHIRO SAKAI
-    db $09, $1B, $9B, $83, $95, $97, $8A, $8B, $94, $91, $9F, $95, $83, $8D, $83, $8B
-CreditsLine073:
-    ;TOMOAKI KUROUME
-    db $08, $1D, $70, $6B, $69, $6B, $5D, $67, $65, $9F, $67, $71, $6E, $6B, $71, $69, $61
-CreditsLine074:
-    ;TOMOAKI KUROUME
-    db $08, $1D, $96, $91, $8F, $91, $83, $8D, $8B, $9F, $8D, $97, $94, $91, $97, $8F, $87
-CreditsLine075:
-    ;SPECIAL THANKS TO
-    db $07, $21, $12, $0F, $04, $02, $08, $00, $0B, $9F, $13, $07, $00, $0D, $0A, $12, $9F, $13, $0E
-CreditsLine076:
-    ;NOBUO OKAJIMA
-    db $09, $19, $6A, $6B, $5E, $71, $6B, $9F, $6B, $67, $5D, $66, $65, $69, $5D
-CreditsLine077:
-    ;NOBUO OKAJIMA
-    db $09, $19, $90, $91, $84, $97, $91, $9F, $91, $8D, $83, $8C, $8B, $8F, $83
-CreditsLine078:
-    ;YASUNORI TAKETANI
-    db $07, $21, $75, $5D, $6F, $71, $6A, $6B, $6E, $65, $9F, $70, $5D, $67, $61, $70, $5D, $6A, $65
-CreditsLine079:
-    ;YASUNORI TAKETANI
-    db $07, $21, $9B, $83, $95, $97, $90, $91, $94, $8B, $9F, $96, $83, $8D, $87, $96, $83, $90, $8B
-CreditsLine080:
-    ;KIYOSHI KODA
-    db $0A, $17, $67, $65, $75, $6B, $6F, $64, $65, $9F, $67, $6B, $60, $5D
-CreditsLine081:
-    ;KIYOSHI KODA
-    db $0A, $17, $8D, $8B, $9B, $91, $95, $8A, $8B, $9F, $8D, $91, $86, $83
-CreditsLine082:
-    ;TAKAMITSU KUZUHARA
-    db $07, $23, $70, $5D, $67, $5D, $69, $65, $70, $6F, $71, $9F, $67, $71, $76, $71, $64, $5D, $6E, $5D
-CreditsLine083:
-    ;TAKAMITSU KUZUHARA
-    db $07, $23, $96, $83, $8D, $83, $8F, $8B, $96, $95, $97, $9F, $8D, $97, $9C, $97, $8A, $83, $94, $83
-CreditsLine084:
-    ;HIRONOBU KAKUI
-    db $09, $1B, $64, $65, $6E, $6B, $6A, $6B, $5E, $71, $9F, $67, $5D, $67, $71, $65
-CreditsLine085:
-    ;HIRONOBU KAKUI
-    db $09, $1B, $8A, $8B, $94, $91, $90, $91, $84, $97, $9F, $8D, $83, $8D, $97, $8B
-CreditsLine086:
-    ;SHIGEKI YAMASHIRO
-    db $07, $21, $6F, $64, $65, $63, $61, $67, $65, $9F, $75, $5D, $69, $5D, $6F, $64, $65, $6E, $6B
-CreditsLine087:
-    ;SHIGEKI YAMASHIRO
-    db $07, $21, $95, $8A, $8B, $89, $87, $8D, $8B, $9F, $9B, $83, $8F, $83, $95, $8A, $8B, $94, $91
-CreditsLine088:
-    ;RANDOMIZER CONTRIBUTORS
-    db $04, $2D, $11, $00, $0D, $03, $0E, $0C, $08, $19, $04, $11, $9F, $02, $0E, $0D, $13, $11, $08, $01, $14, $13, $0E, $11, $12
-CreditsLine089:
-    ;ITEM RANDOMIZER
-    db $08, $1D, $22, $2D, $1E, $26, $9F, $2B, $1A, $27, $1D, $28, $26, $22, $33, $1E, $2B
-CreditsLine090:
-    ;KATDEVSGAMES         VEETORP
-    db $02, $37, $67, $5D, $70, $60, $61, $72, $6F, $63, $5D, $69, $61, $6F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $72, $61, $61, $70, $6B, $6E, $6C
-CreditsLine091:
-    ;KATDEVSGAMES         VEETORP
-    db $02, $37, $8D, $83, $96, $86, $87, $98, $95, $89, $83, $8F, $87, $95, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $98, $87, $87, $96, $91, $94, $92
-CreditsLine092:
-    ;CHRISTOSOWEN       DESSYREQT
-    db $02, $37, $5F, $64, $6E, $65, $6F, $70, $6B, $6F, $6B, $73, $61, $6A, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $60, $61, $6F, $6F, $75, $6E, $61, $6D, $70
-CreditsLine093:
-    ;CHRISTOSOWEN       DESSYREQT
-    db $02, $37, $85, $8A, $94, $8B, $95, $96, $91, $95, $91, $99, $87, $90, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $86, $87, $95, $95, $9B, $94, $87, $93, $96
-CreditsLine094:
-    ;SMALLHACKER
-    db $0A, $15, $6F, $69, $5D, $68, $68, $64, $5D, $5F, $67, $61, $6E
-CreditsLine095:
-    ;SMALLHACKER
-    db $0A, $15, $95, $8F, $83, $8E, $8E, $8A, $83, $85, $8D, $87, $94
-CreditsLine096:
-    ;ENTRANCE RANDOMIZER
-    db $06, $25, $3C, $45, $4B, $49, $38, $45, $3A, $3C, $9F, $49, $38, $45, $3B, $46, $44, $40, $51, $3C, $49
-CreditsLine097:
-    ;AMAZINGAMPHAROS   LLCOOLDAVE
-    db $02, $37, $5D, $69, $5D, $76, $65, $6A, $63, $5D, $69, $6C, $64, $5D, $6E, $6B, $6F, $9F, $9F, $9F, $68, $68, $5F, $6B, $6B, $68, $60, $5D, $72, $61
-CreditsLine098:
-    ;AMAZINGAMPHAROS   LLCOOLDAVE
-    db $02, $37, $83, $8F, $83, $9C, $8B, $90, $89, $83, $8F, $92, $8A, $83, $94, $91, $95, $9F, $9F, $9F, $8E, $8E, $85, $91, $91, $8E, $86, $83, $98, $87
-CreditsLine099:
-    ;KEVINCATHCART
-    db $09, $19, $67, $61, $72, $65, $6A, $5F, $5D, $70, $64, $5F, $5D, $6E, $70
-CreditsLine100:
-    ;KEVINCATHCART
-    db $09, $19, $8D, $87, $98, $8B, $90, $85, $83, $96, $8A, $85, $83, $94, $96
-CreditsLine101:
-    ;ENEMY RANDOMIZER
-    db $08, $1F, $1E, $27, $1E, $26, $32, $9F, $2B, $1A, $27, $1D, $28, $26, $22, $33, $1E, $2B
-CreditsLine102:
-    ;ZARBY89              SOSUKE3
-    db $02, $37, $76, $5D, $6E, $5E, $75, $5B, $5C, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $6F, $6B, $6F, $71, $67, $61, $56
-CreditsLine103:
-    ;ZARBY89              SOSUKE3
-    db $02, $37, $9C, $83, $94, $84, $9B, $81, $82, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $95, $91, $95, $97, $8D, $87, $7C
-CreditsLine104:
-    ;ENDEROFGAMES
-    db $0A, $17, $61, $6A, $60, $61, $6E, $6B, $62, $63, $5D, $69, $61, $6F
-CreditsLine105:
-    ;ENDEROFGAMES
-    db $0A, $17, $87, $90, $86, $87, $94, $91, $88, $89, $83, $8F, $87, $95
-CreditsLine106:
-    ;SPRITE DEVELOPMENT
-    db $07, $23, $4A, $47, $49, $40, $4B, $3C, $9F, $3B, $3C, $4D, $3C, $43, $46, $47, $44, $3C, $45, $4B
-CreditsLine107:
-    ;MIKETRETHEWEY         IBAZLY
-    db $02, $37, $69, $65, $67, $61, $70, $6E, $61, $70, $64, $61, $73, $61, $75, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $65, $5E, $5D, $76, $68, $75
-CreditsLine108:
-    ;MIKETRETHEWEY         IBAZLY
-    db $02, $37, $8F, $8B, $8D, $87, $96, $94, $87, $96, $8A, $87, $99, $87, $9B, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $8B, $84, $83, $9C, $8E, $9B
-CreditsLine109:
-    ;FISH_WAFFLE64   FATMANSPANDA
-    db $02, $37, $62, $65, $6F, $64, $A6, $73, $5D, $62, $62, $68, $61, $59, $57, $9F, $9F, $9F, $62, $5D, $70, $69, $5D, $6A, $6F, $6C, $5D, $6A, $60, $5D
-CreditsLine110:
-    ;FISH_WAFFLE64   FATMANSPANDA
-    db $02, $37, $88, $8B, $95, $8A, $C6, $99, $83, $88, $88, $8E, $87, $7F, $7D, $9F, $9F, $9F, $88, $83, $96, $8F, $83, $90, $95, $92, $83, $90, $86, $83
-CreditsLine111:
-    ;KRELBEL              TWROXAS
-    db $02, $37, $67, $6E, $61, $68, $5E, $61, $68, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $70, $73, $6E, $6B, $74, $5D, $6F
-CreditsLine112:
-    ;KRELBEL              TWROXAS
-    db $02, $37, $8D, $94, $87, $8E, $84, $87, $8E, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $96, $99, $94, $91, $9A, $83, $95
-CreditsLine113:
-    ;GLAN
-    db $0E, $07, $63, $68, $5D, $6A
-CreditsLine114:
-    ;GLAN
-    db $0E, $07, $89, $8E, $83, $90
-CreditsLine115:
-    ;SPECIAL THANKS
-    db $09, $1B, $12, $0F, $04, $02, $08, $00, $0B, $9F, $13, $07, $00, $0D, $0A, $12
-CreditsLine116:
-    ;SUPERSKUJ          EVILASH25
-    db $02, $37, $6F, $71, $6C, $61, $6E, $6F, $67, $71, $66, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $61, $72, $65, $68, $5D, $6F, $64, $55, $58
-CreditsLine117:
-    ;SUPERSKUJ          EVILASH25
-    db $02, $37, $95, $97, $92, $87, $94, $95, $8D, $97, $8C, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $87, $98, $8B, $8E, $83, $95, $8A, $7B, $7E
-CreditsLine118:
-    ;MYRAMONG             JOSHRTA
-    db $02, $37, $69, $75, $6E, $5D, $69, $6B, $6A, $63, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $66, $6B, $6F, $64, $6E, $70, $5D
-CreditsLine119:
-    ;MYRAMONG             JOSHRTA
-    db $02, $37, $8F, $9B, $94, $83, $8F, $91, $90, $89, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $8C, $91, $95, $8A, $94, $96, $83
-CreditsLine120:
-    ;WALKINGEYE     MATHONNAPKINS
-    db $02, $37, $73, $5D, $68, $67, $65, $6A, $63, $61, $75, $61, $9F, $9F, $9F, $9F, $9F, $69, $5D, $70, $64, $6B, $6A, $6A, $5D, $6C, $67, $65, $6A, $6F
-CreditsLine121:
-    ;WALKINGEYE     MATHONNAPKINS
-    db $02, $37, $99, $83, $8E, $8D, $8B, $90, $89, $87, $9B, $87, $9F, $9F, $9F, $9F, $9F, $8F, $83, $96, $8A, $91, $90, $90, $83, $92, $8D, $8B, $90, $95
-CreditsLine122:
-    ;SAKURATSUBASA
-    db $09, $19, $6F, $5D, $67, $71, $6E, $5D, $70, $6F, $71, $5E, $5D, $6F, $5D
-CreditsLine123:
-    ;SAKURATSUBASA
-    db $09, $19, $95, $83, $8D, $97, $94, $83, $96, $95, $97, $84, $83, $95, $83
-CreditsLine124:
-    ;AND...
-    db $0D, $0B, $5D, $6A, $60, $A0, $A0, $A0
-CreditsLine125:
-    ;AND...
-    db $0D, $0B, $83, $90, $86, $C0, $C0, $C0
-CreditsLine126:
-    ;THE ALTTP RANDOMIZER COMMUNITY
-    db $01, $3B, $70, $64, $61, $9F, $5D, $68, $70, $70, $6C, $9F, $6E, $5D, $6A, $60, $6B, $69, $65, $76, $61, $6E, $9F, $5F, $6B, $69, $69, $71, $6A, $65, $70, $75
-CreditsLine127:
-    ;THE ALTTP RANDOMIZER COMMUNITY
-    db $01, $3B, $96, $8A, $87, $9F, $83, $8E, $96, $96, $92, $9F, $94, $83, $90, $86, $91, $8F, $8B, $9C, $87, $94, $9F, $85, $91, $8F, $8F, $97, $90, $8B, $96, $9B
-CreditsLine128:
-    ;COMMUNITY DISCORD
-    db $07, $21, $3A, $46, $44, $44, $4C, $45, $40, $4B, $50, $9F, $3B, $40, $4A, $3A, $46, $49, $3B
-CreditsLine129:
-    ;HTTPS://DISCORD.GG/TCC6Y42
-    db $03, $33, $64, $70, $70, $6C, $6F, $A3, $A2, $A2, $60, $65, $6F, $5F, $6B, $6E, $60, $A0, $63, $63, $A2, $70, $5F, $5F, $59, $75, $57, $55
-CreditsLine130:
-    ;HTTPS://DISCORD.GG/TCC6Y42
-    db $03, $33, $8A, $96, $96, $92, $95, $C3, $C2, $C2, $86, $8B, $95, $85, $91, $94, $86, $C0, $89, $89, $C2, $96, $85, $85, $7F, $9B, $7D, $7B
-CreditsLine131:
-    ;THE IMPORTANT STUFF
-    db $06, $25, $2D, $21, $1E, $9F, $22, $26, $29, $28, $2B, $2D, $1A, $27, $2D, $9F, $2C, $2D, $2E, $1F, $1F
-CreditsLine132:
-    ;TIME FOUND
-    db $0B, $13, $4B, $40, $44, $3C, $9F, $3D, $46, $4C, $45, $3B
-CreditsLine133:
-    ;FIRST SWORD      $$$$$$$$$$$
-    db $02, $15, $62, $65, $6E, $6F, $70, $9F, $6F, $73, $6B, $6E, $60
-CreditsLine134:
-    ;FIRST SWORD      $$$$$$$$$$$
-    db $02, $15, $88, $8B, $94, $95, $96, $9F, $95, $99, $91, $94, $86
-CreditsLine135:
-    ;PEGASUS BOOTS    $$$$$$$$$$$
-    db $02, $19, $6C, $61, $63, $5D, $6F, $71, $6F, $9F, $5E, $6B, $6B, $70, $6F
-CreditsLine136:
-    ;PEGASUS BOOTS    $$$$$$$$$$$
-    db $02, $19, $92, $87, $89, $83, $95, $97, $95, $9F, $84, $91, $91, $96, $95
-CreditsLine137:
-    ;FLUTE            $$$$$$$$$$$
-    db $02, $09, $62, $68, $71, $70, $61
-CreditsLine138:
-    ;FLUTE            $$$$$$$$$$$
-    db $02, $09, $88, $8E, $97, $96, $87
-CreditsLine139:
-    ;MIRROR           $$$$$$$$$$$
-    db $02, $0B, $69, $65, $6E, $6E, $6B, $6E
-CreditsLine140:
-    ;MIRROR           $$$$$$$$$$$
-    db $02, $0B, $8F, $8B, $94, $94, $91, $94
-CreditsLine141:
-    ;BOSS KILLS
-    db $0B, $13, $1B, $28, $2C, $2C, $9F, $24, $22, $25, $25, $2C
-CreditsLine142:
-    ;SWORDLESS            $$$$/13
-    db $02, $37, $6F, $73, $6B, $6E, $60, $68, $61, $6F, $6F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $A2, $54, $56
-CreditsLine143:
-    ;SWORDLESS            $$$$/13
-    db $02, $37, $95, $99, $91, $94, $86, $8E, $87, $95, $95, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $C2, $7A, $7C
-CreditsLine144:
-    ;FIGHTER'S SWORD      $$$$/13
-    db $02, $37, $62, $65, $63, $64, $70, $61, $6E, $77, $6F, $9F, $6F, $73, $6B, $6E, $60, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $A2, $54, $56
-CreditsLine145:
-    ;FIGHTER'S SWORD      $$$$/13
-    db $02, $37, $88, $8B, $89, $8A, $96, $87, $94, $9D, $95, $9F, $95, $99, $91, $94, $86, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $C2, $7A, $7C
-CreditsLine146:
-    ;MASTER SWORD         $$$$/13
-    db $02, $37, $69, $5D, $6F, $70, $61, $6E, $9F, $6F, $73, $6B, $6E, $60, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $A2, $54, $56
-CreditsLine147:
-    ;MASTER SWORD         $$$$/13
-    db $02, $37, $8F, $83, $95, $96, $87, $94, $9F, $95, $99, $91, $94, $86, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $C2, $7A, $7C
-CreditsLine148:
-    ;TEMPERED SWORD       $$$$/13
-    db $02, $37, $70, $61, $69, $6C, $61, $6E, $61, $60, $9F, $6F, $73, $6B, $6E, $60, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $A2, $54, $56
-CreditsLine149:
-    ;TEMPERED SWORD       $$$$/13
-    db $02, $37, $96, $87, $8F, $92, $87, $94, $87, $86, $9F, $95, $99, $91, $94, $86, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $C2, $7A, $7C
-CreditsLine150:
-    ;GOLD SWORD           $$$$/13
-    db $02, $37, $63, $6B, $68, $60, $9F, $6F, $73, $6B, $6E, $60, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $A2, $54, $56
-CreditsLine151:
-    ;GOLD SWORD           $$$$/13
-    db $02, $37, $89, $91, $8E, $86, $9F, $95, $99, $91, $94, $86, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $C2, $7A, $7C
-CreditsLine152:
-    ;GAME STATS
-    db $0B, $13, $06, $00, $0C, $04, $9F, $12, $13, $00, $13, $12
-CreditsLine153:
-    ;GT BIG KEY           $$$$/22
-    db $02, $37, $63, $70, $9F, $5E, $65, $63, $9F, $67, $61, $75, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $A2, $55, $55
-CreditsLine154:
-    ;GT BIG KEY           $$$$/22
-    db $02, $37, $89, $96, $9F, $84, $8B, $89, $9F, $8D, $87, $9B, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $C2, $7B, $7B
-CreditsLine155:
-    ;BONKS                   $$$$
-    db $02, $09, $5E, $6B, $6A, $67, $6F
-CreditsLine156:
-    ;BONKS                   $$$$
-    db $02, $09, $84, $91, $90, $8D, $95
-CreditsLine157:
-    ;SAVE AND QUITS          $$$$
-    db $02, $1B, $6F, $5D, $72, $61, $9F, $5D, $6A, $60, $9F, $6D, $71, $65, $70, $6F
-CreditsLine158:
-    ;SAVE AND QUITS          $$$$
-    db $02, $1B, $95, $83, $98, $87, $9F, $83, $90, $86, $9F, $93, $97, $8B, $96, $95
-CreditsLine159:
-    ;DEATHS                  $$$$
-    db $02, $0B, $60, $61, $5D, $70, $64, $6F
-CreditsLine160:
-    ;DEATHS                  $$$$
-    db $02, $0B, $86, $87, $83, $96, $8A, $95
-CreditsLine161:
-    ;FAERIE REVIVALS         $$$$
-    db $02, $1D, $62, $5D, $61, $6E, $65, $61, $9F, $6E, $61, $72, $65, $72, $5D, $68, $6F
-CreditsLine162:
-    ;FAERIE REVIVALS         $$$$
-    db $02, $1D, $88, $83, $87, $94, $8B, $87, $9F, $94, $87, $98, $8B, $98, $83, $8E, $95
-CreditsLine163:
-    ;TOTAL MENU TIME  $$$$$$$$$$$
-    db $02, $1D, $70, $6B, $70, $5D, $68, $9F, $69, $61, $6A, $71, $9F, $70, $65, $69, $61
-CreditsLine164:
-    ;TOTAL MENU TIME  $$$$$$$$$$$
-    db $02, $1D, $96, $91, $96, $83, $8E, $9F, $8F, $87, $90, $97, $9F, $96, $8B, $8F, $87
-CreditsLine165:
-    ;TOTAL LAG TIME   $$$$$$$$$$$
-    db $02, $1B, $70, $6B, $70, $5D, $68, $9F, $68, $5D, $63, $9F, $70, $65, $69, $61
-CreditsLine166:
-    ;TOTAL LAG TIME   $$$$$$$$$$$
-    db $02, $1B, $96, $91, $96, $83, $8E, $9F, $8E, $83, $89, $9F, $96, $8B, $8F, $87
-CreditsLine167:
-    ;COLLECTION RATE     $$$$/216
-    db $02, $37, $5F, $6B, $68, $68, $61, $5F, $70, $65, $6B, $6A, $9F, $6E, $5D, $70, $61, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $A2, $55, $54, $59
-CreditsLine168:
-    ;COLLECTION RATE     $$$$/216
-    db $02, $37, $85, $91, $8E, $8E, $87, $85, $96, $8B, $91, $90, $9F, $94, $83, $96, $87, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $C2, $7B, $7A, $7F
-CreditsLine169:
-    ;TOTAL TIME       $$$$$$$$$$$
-    db $02, $13, $70, $6B, $70, $5D, $68, $9F, $70, $65, $69, $61
-CreditsLine170:
-    ;TOTAL TIME       $$$$$$$$$$$
-    db $02, $13, $96, $91, $96, $83, $8E, $9F, $96, $8B, $8F, $87
-CreditsLine171:
-    ;(Blank line)
-    db $FF
+table "creditscharmapbiglo.txt"
+YourSpriteCreditsLo:
+db 2
+db 55
+db "                            " ; $238020
+
+;===================================================================================================
 
 CreditsLineTable:
-    dw CreditsLine000, CreditsLine001, CreditsLine171, CreditsLine171, CreditsLine000, CreditsLine002, CreditsLine171, CreditsLine171
-    dw CreditsLine003, CreditsLine004, CreditsLine171, CreditsLine171, CreditsLine000, CreditsLine005, CreditsLine171, CreditsLine171
-    dw CreditsLine006, CreditsLine007, CreditsLine171, CreditsLine171, CreditsLine008, CreditsLine171, CreditsLine171, CreditsLine009
-    dw CreditsLine010, CreditsLine171, CreditsLine171, CreditsLine011, CreditsLine171, CreditsLine171, CreditsLine012, CreditsLine013
-    dw CreditsLine171, CreditsLine171, CreditsLine000, CreditsLine014, CreditsLine171, CreditsLine171, CreditsLine015, CreditsLine016
-    dw CreditsLine171, CreditsLine017, CreditsLine018, CreditsLine171, CreditsLine171, CreditsLine019, CreditsLine171, CreditsLine171
-    dw CreditsLine000, CreditsLine000, CreditsLine020, CreditsLine171, CreditsLine171, CreditsLine021, CreditsLine022, CreditsLine171
-    dw CreditsLine023, CreditsLine024, CreditsLine171, CreditsLine171, CreditsLine000, CreditsLine025, CreditsLine171, CreditsLine171
-    dw CreditsLine026, CreditsLine027, CreditsLine171, CreditsLine028, CreditsLine029, CreditsLine171, CreditsLine171, CreditsLine030
-    dw CreditsLine171, CreditsLine171, CreditsLine031, CreditsLine032, CreditsLine171, CreditsLine171, CreditsLine033, CreditsLine171
-    dw CreditsLine171, CreditsLine034, CreditsLine035, CreditsLine171, CreditsLine171, CreditsLine036, CreditsLine171, CreditsLine171
-    dw CreditsLine037, CreditsLine038, CreditsLine171, CreditsLine171, CreditsLine000, CreditsLine039, CreditsLine171, CreditsLine171
-    dw CreditsLine040, CreditsLine041, CreditsLine171, CreditsLine042, CreditsLine043, CreditsLine171, CreditsLine044, CreditsLine045
-    dw CreditsLine171, CreditsLine046, CreditsLine047, CreditsLine171, CreditsLine048, CreditsLine049, CreditsLine171, CreditsLine050
-    dw CreditsLine051, CreditsLine171, CreditsLine052, CreditsLine053, CreditsLine171, CreditsLine054, CreditsLine055, CreditsLine171
-    dw CreditsLine171, CreditsLine056, CreditsLine171, CreditsLine171, CreditsLine057, CreditsLine058, CreditsLine171, CreditsLine171
-    dw CreditsLine059, CreditsLine171, CreditsLine171, CreditsLine060, CreditsLine061, CreditsLine171, CreditsLine062, CreditsLine063
-    dw CreditsLine171, CreditsLine171, CreditsLine000, CreditsLine064, CreditsLine171, CreditsLine171, CreditsLine065, CreditsLine066
-    dw CreditsLine171, CreditsLine067, CreditsLine068, CreditsLine171, CreditsLine069, CreditsLine070, CreditsLine171, CreditsLine071
-    dw CreditsLine072, CreditsLine171, CreditsLine073, CreditsLine074, CreditsLine171, CreditsLine171, CreditsLine075, CreditsLine171
-    dw CreditsLine171, CreditsLine076, CreditsLine077, CreditsLine171, CreditsLine078, CreditsLine079, CreditsLine171, CreditsLine080
-    dw CreditsLine081, CreditsLine171, CreditsLine082, CreditsLine083, CreditsLine171, CreditsLine084, CreditsLine085, CreditsLine171
-    dw CreditsLine086, CreditsLine087, CreditsLine171, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000
-    dw CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000
-    dw CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine088
-    dw CreditsLine171, CreditsLine171, CreditsLine000, CreditsLine000, CreditsLine089, CreditsLine171, CreditsLine171, CreditsLine090
-    dw CreditsLine091, CreditsLine171, CreditsLine092, CreditsLine093, CreditsLine171, CreditsLine094, CreditsLine095, CreditsLine171
-    dw CreditsLine171, CreditsLine096, CreditsLine171, CreditsLine171, CreditsLine097, CreditsLine098, CreditsLine171, CreditsLine099
-    dw CreditsLine100, CreditsLine171, CreditsLine171, CreditsLine000, CreditsLine101, CreditsLine171, CreditsLine171, CreditsLine102
-    dw CreditsLine103, CreditsLine171, CreditsLine104, CreditsLine105, CreditsLine171, CreditsLine171, CreditsLine106, CreditsLine171
-    dw CreditsLine171, CreditsLine107, CreditsLine108, CreditsLine171, CreditsLine109, CreditsLine110, CreditsLine171, CreditsLine111
-    dw CreditsLine112, CreditsLine171, CreditsLine113, CreditsLine114, CreditsLine171, CreditsLine171, CreditsLine115, CreditsLine171
-    dw CreditsLine171, CreditsLine116, CreditsLine117, CreditsLine171, CreditsLine118, CreditsLine119, CreditsLine171, CreditsLine120
-    dw CreditsLine121, CreditsLine171, CreditsLine122, CreditsLine123, CreditsLine171, CreditsLine124, CreditsLine125, CreditsLine171
-    dw CreditsLine126, CreditsLine127, CreditsLine171, CreditsLine171, CreditsLine128, CreditsLine171, CreditsLine171, CreditsLine129
-    dw CreditsLine130, CreditsLine171, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000
-    dw CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000
-    dw CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine131
-    dw CreditsLine171, CreditsLine171, CreditsLine000, CreditsLine132, CreditsLine171, CreditsLine171, CreditsLine133, CreditsLine134
-    dw CreditsLine171, CreditsLine135, CreditsLine136, CreditsLine171, CreditsLine137, CreditsLine138, CreditsLine171, CreditsLine139
-    dw CreditsLine140, CreditsLine171, CreditsLine171, CreditsLine000, CreditsLine141, CreditsLine171, CreditsLine171, CreditsLine142
-    dw CreditsLine143, CreditsLine171, CreditsLine144, CreditsLine145, CreditsLine171, CreditsLine146, CreditsLine147, CreditsLine171
-    dw CreditsLine148, CreditsLine149, CreditsLine171, CreditsLine150, CreditsLine151, CreditsLine171, CreditsLine171, CreditsLine152
-    dw CreditsLine171, CreditsLine171, CreditsLine153, CreditsLine154, CreditsLine171, CreditsLine155, CreditsLine156, CreditsLine171
-    dw CreditsLine157, CreditsLine158, CreditsLine171, CreditsLine159, CreditsLine160, CreditsLine171, CreditsLine161, CreditsLine162
-    dw CreditsLine171, CreditsLine163, CreditsLine164, CreditsLine171, CreditsLine165, CreditsLine166, CreditsLine171, CreditsLine171
-    dw CreditsLine171, CreditsLine171, CreditsLine171, CreditsLine171, CreditsLine171, CreditsLine171, CreditsLine171, CreditsLine000
-    dw CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine167, CreditsLine168, CreditsLine171, CreditsLine169
-    dw CreditsLine170, CreditsLine171, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000, CreditsLine000
+	fillword CreditsLineBlank : fill 800
 
-!FIRST_SWORD_X = 19
-!FIRST_SWORD_Y = 310
-!PEGASUS_BOOTS_X = 19
-!PEGASUS_BOOTS_Y = 313
-!FLUTE_X = 19
-!FLUTE_Y = 316
-!MIRROR_X = 19
-!MIRROR_Y = 319
-!SWORDLESS_X = 23
-!SWORDLESS_Y = 327
-!FIGHTERS_SWORD_X = 23
-!FIGHTERS_SWORD_Y = 330
-!MASTER_SWORD_X = 23
-!MASTER_SWORD_Y = 333
-!TEMPERED_SWORD_X = 23
-!TEMPERED_SWORD_Y = 336
-!GOLD_SWORD_X = 23
-!GOLD_SWORD_Y = 339
-!GT_BIG_KEY_X = 23
-!GT_BIG_KEY_Y = 346
-!BONKS_X = 26
-!BONKS_Y = 349
-!SAVE_AND_QUITS_X = 26
-!SAVE_AND_QUITS_Y = 352
-!DEATHS_X = 26
-!DEATHS_Y = 355
-!FAERIE_REVIVALS_X = 26
-!FAERIE_REVIVALS_Y = 358
-!TOTAL_MENU_TIME_X = 19
-!TOTAL_MENU_TIME_Y = 361
-!TOTAL_LAG_TIME_X = 19
-!TOTAL_LAG_TIME_Y = 364
-!COLLECTION_RATE_X = 22
-!COLLECTION_RATE_Y = 380
-!TOTAL_TIME_X = 19
-!TOTAL_TIME_Y = 383
+;===================================================================================================
+
+!CLINE = -1
+
+;---------------------------------------------------------------------------------------------------
+
+macro smallcredits(text, color)
+	!CLINE #= !CLINE+1
+	table "creditscharmapsmall_<color>.txt"
+
+	?line:
+		db (32-(?end-?text))/2
+		db 2*(?end-?text)-1
+	?text:
+		db "<text>"
+	?end:
+
+	pushpc
+	org CreditsLineTable+!CLINE+!CLINE : dw ?line
+	pullpc
+
+endmacro
+
+;---------------------------------------------------------------------------------------------------
+macro bigcredits(text)
+	!CLINE #= !CLINE+1
+	table "creditscharmapbighi.txt"
+
+	?line_top:
+		db (32-(?end-?text))/2
+		db 2*(?end-?text)-1
+	?text:
+		db "<text>"
+	?end:
+
+	pushpc
+	org CreditsLineTable+!CLINE+!CLINE : dw ?line_top
+	pullpc
+
+
+	table "creditscharmapbiglo.txt"
+	?line_bottom:
+		db (32-(?end-?text))/2
+		db 2*(?end-?text)-1
+		db "<text>"
+
+
+	!CLINE #= !CLINE+1
+	pushpc
+	org CreditsLineTable+!CLINE+!CLINE : dw ?line_bottom
+	pullpc
+
+endmacro
+
+;---------------------------------------------------------------------------------------------------
+
+macro bigcreditsleft(text)
+	!CLINE #= !CLINE+1
+	table "creditscharmapbighi.txt"
+
+	?line_top:
+		db 2
+		db 2*(?end-?text)-1
+	?text:
+		db "<text>"
+	?end:
+
+	pushpc
+	org CreditsLineTable+!CLINE+!CLINE : dw ?line_top
+	pullpc
+
+
+	table "creditscharmapbiglo.txt"
+	?line_bottom:
+		db 2
+		db 2*(?end-?text)-1
+		db "<text>"
+
+
+	!CLINE #= !CLINE+1
+	pushpc
+	org CreditsLineTable+!CLINE+!CLINE : dw ?line_bottom
+	pullpc
+
+endmacro
+
+;---------------------------------------------------------------------------------------------------
+
+macro emptyline()
+	!CLINE #= !CLINE+1
+	pushpc
+	org CreditsLineTable+!CLINE+!CLINE : dw CreditsEmptyLine
+	pullpc
+endmacro
+
+macro blankline()
+	!CLINE #= !CLINE+1
+	pushpc
+	org CreditsLineTable+!CLINE+!CLINE : dw CreditsLineBlank
+	pullpc
+endmacro
+
+macro addarbline(l)
+	!CLINE #= !CLINE+1
+	pushpc
+	org CreditsLineTable+!CLINE+!CLINE : dw <l>
+	pullpc
+endmacro
+
+;===================================================================================================
+
+CreditsEmptyLine:
+	db $00, $01, $9F
+
+CreditsLineBlank:
+	db $FF
+
+;---------------------------------------------------------------------------------------------------
+
+%emptyline()
+%smallcredits("ORIGINAL GAME STAFF", "yellow")
+
+%blankline()
+%blankline()
+
+%smallcredits("EXECUTIVE PRODUCER", "green")
+
+%blankline()
+
+%bigcredits("HIROSHI YAMAUCHI")
+
+%blankline()
+%blankline()
+
+%smallcredits("PRODUCER", "yellow")
+
+%blankline()
+
+%bigcredits("SHIGERU MIYAMOTO")
+
+%blankline()
+%blankline()
+
+%smallcredits("DIRECTOR", "red")
+
+%blankline()
+
+%bigcredits("TAKASHI TEZUKA")
+
+%blankline()
+%blankline()
+
+%smallcredits("SCRIPT WRITER", "green")
+
+%blankline()
+
+%bigcredits("KENSUKE TANABE")
+
+%blankline()
+%blankline()
+
+%smallcredits("ASSISTANT DIRECTORS", "yellow")
+
+%blankline()
+
+%bigcredits("YASUHISA YAMAMURA")
+
+%blankline()
+
+%bigcredits("YOICHI YAMADA")
+
+%blankline()
+%blankline()
+
+%smallcredits("SCREEN GRAPHICS DESIGNERS", "green")
+
+%emptyline()
+%emptyline()
+
+%smallcredits("OBJECT DESIGNERS", "yellow")
+
+%blankline()
+
+%bigcredits("SOICHIRO TOMITA")
+
+%blankline()
+
+%bigcredits("TAKAYA IMAMURA")
+
+%blankline()
+%blankline()
+
+%smallcredits("BACK GROUND DESIGNERS", "yellow")
+
+%blankline()
+
+%bigcredits("MASANAO ARIMOTO")
+
+%blankline()
+
+%bigcredits("TSUYOSHI WATANABE")
+
+%blankline()
+%blankline()
+
+%smallcredits("PROGRAM DIRECTOR", "red")
+
+%blankline()
+
+%bigcredits("TOSHIHIKO NAKAGO")
+
+%blankline()
+%blankline()
+
+%smallcredits("MAIN PROGRAMMER", "yellow")
+
+%blankline()
+
+%bigcredits("YASUNARI SOEJIMA")
+
+%blankline()
+%blankline()
+
+%smallcredits("OBJECT PROGRAMMER", "green")
+
+%blankline()
+
+%bigcredits("KAZUAKI MORITA")
+
+%blankline()
+%blankline()
+
+%smallcredits("PROGRAMMERS", "yellow")
+
+%blankline()
+
+%bigcredits("TATSUO NISHIYAMA")
+
+%blankline()
+
+%bigcredits("YUICHI YAMAMOTO")
+
+%blankline()
+
+%bigcredits("YOSHIHIRO NOMOTO")
+
+%blankline()
+
+%bigcredits("EIJI NOTO")
+
+%blankline()
+
+%bigcredits("SATORU TAKAHATA")
+
+%blankline()
+
+%bigcredits("TOSHIO IWAWAKI")
+
+%blankline()
+
+%bigcredits("SHIGEHIRO KASAMATSU")
+
+%blankline()
+
+%bigcredits("YASUNARI NISHIDA")
+
+%blankline()
+%blankline()
+
+%smallcredits("SOUND COMPOSER", "red")
+
+%blankline()
+
+%bigcredits("KOJI KONDO")
+
+%blankline()
+%blankline()
+
+%smallcredits("COORDINATORS", "green")
+
+%blankline()
+
+%bigcredits("KEIZO KATO")
+
+%blankline()
+
+%bigcredits("TAKAO SHIMIZU")
+
+%blankline()
+%blankline()
+
+%smallcredits("PRINTED ART WORK", "yellow")
+
+%blankline()
+
+%bigcredits("YOICHI KOTABE")
+
+%blankline()
+
+%bigcredits("HIDEKI FUJII")
+
+%blankline()
+
+%bigcredits("YOSHIAKI KOIZUMI")
+
+%blankline()
+
+%bigcredits("YASUHIRO SAKAI")
+
+%blankline()
+
+%bigcredits("TOMOAKI KUROUME")
+
+%blankline()
+%blankline()
+
+%smallcredits("SPECIAL THANKS TO", "red")
+
+%blankline()
+
+%bigcredits("NOBUO OKAJIMA")
+
+%blankline()
+
+%bigcredits("YASUNORI TAKETANI")
+
+%blankline()
+
+%bigcredits("KIYOSHI KODA")
+
+%blankline()
+
+%bigcredits("TAKAMITSU KUZUHARA")
+
+%blankline()
+
+%bigcredits("HIRONOBU KAKUI")
+
+%blankline()
+
+%bigcredits("SHIGEKI YAMASHIRO")
+
+%blankline()
+
+%emptyline()
+%emptyline()
+%emptyline()
+%emptyline()
+
+;---------------------------------------------------------------------------------------------------
+
+%smallcredits("RANDOMIZER CONTRIBUTORS", "red")
+
+%blankline()
+%blankline()
+
+%smallcredits("ITEM RANDOMIZER", "yellow")
+
+%blankline()
+
+%bigcredits("KATDEVSGAMES         VEETORP")
+
+%blankline()
+
+%bigcredits("CHRISTOSOWEN       DESSYREQT")
+
+%blankline()
+
+%bigcredits("SMALLHACKER           SYNACK")
+
+%blankline()
+%blankline()
+
+%smallcredits("ENTRANCE RANDOMIZER", "green")
+
+%blankline()
+
+%bigcredits("AMAZINGAMPHAROS   LLCOOLDAVE")
+
+%blankline()
+
+%bigcredits("KEVINCATHCART    CASSIDYMOEN")
+
+%blankline()
+%blankline()
+
+%smallcredits("ENEMY RANDOMIZER", "yellow")
+
+%blankline()
+
+%bigcredits("ZARBY89              SOSUKE3")
+
+%blankline()
+
+%bigcredits("ENDEROFGAMES")
+
+%blankline()
+%blankline()
+
+%smallcredits("DOOR RANDOMIZER", "green")
+
+%blankline()
+
+%bigcredits("AERINON            COMPILING")
+
+%blankline()
+%blankline()
+
+%smallcredits("FESTIVE RANDOMIZER", "yellow")
+
+%blankline()
+
+%bigcredits("KAN                    TOTAL")
+
+%blankline()
+
+%bigcredits("CATOBAT            DINSAPHIR")
+
+%blankline()
+%blankline()
+
+%smallcredits("SPRITE DEVELOPMENT", "green")
+
+%blankline()
+
+%bigcredits("MIKETRETHEWEY         IBAZLY")
+
+%blankline()
+%bigcredits("FISH_WAFFLE64        KRELBEL")
+
+%blankline()
+
+%bigcredits("ACHY                 ARTHEAU")
+
+%blankline()
+
+%bigcredits("GLAN                 TWROXAS")
+
+%blankline()
+
+%bigcredits("PLAGUEDONE         TARTHORON")
+
+%blankline()
+%blankline()
+
+%smallcredits("YOUR SPRITE BY", "yellow")
+
+%addarbline(YourSpriteCreditsHi)
+%addarbline(YourSpriteCreditsLo)
+
+%blankline()
+%blankline()
+
+%smallcredits("MSU SUPPORT", "green")
+
+%blankline()
+
+%bigcredits("QWERTYMODO")
+
+%blankline()
+%blankline()
+
+%smallcredits("PALETTE SHUFFLER", "yellow")
+
+%blankline()
+
+%bigcredits("NELSON AKA SWR")
+
+%blankline()
+%blankline()
+
+%smallcredits("WEBSITE LOGO", "green")
+
+%blankline()
+
+%bigcredits("PLEASURE")
+
+%blankline()
+%blankline()
+
+%smallcredits("SPECIAL THANKS", "red")
+
+%blankline()
+
+%bigcredits("SUPERSKUJ          EVILASH25")
+
+%blankline()
+
+%bigcredits("MYRAMONG             JOSHRTA")
+
+%blankline()
+
+%bigcredits("WALKINGEYE     MATHONNAPKINS")
+
+%blankline()
+
+%bigcredits("MICHAELK              FOUTON")
+
+%blankline()
+
+%bigcredits("BONTA                EMOSARU")
+
+%blankline()
+
+%bigcredits("PINKUS              YUZUHARA")
+
+%blankline()
+
+%bigcredits("SAKURATSUBASA")
+
+%blankline()
+
+%bigcredits("AND...")
+
+%blankline()
+
+%bigcredits("THE ALTTP RANDOMIZER COMMUNITY")
+
+%blankline()
+%blankline()
+
+%smallcredits("COMMUNITY DISCORD", "green")
+
+%blankline()
+
+%bigcredits("HTTPS://ALTTPR.COM/DISCORD")
+
+%blankline()
+
+%emptyline()
+%emptyline()
+%emptyline()
+%emptyline()
+%emptyline()
+%emptyline()
+%emptyline()
+%emptyline()
+%emptyline()
+%emptyline()
+%emptyline()
+%emptyline()
+%emptyline()
+%emptyline()
+%emptyline()
+%emptyline()
+%emptyline()
+%emptyline()
+%emptyline()
+
+;===================================================================================================
+
+print "Credits line number: !CLINE | Expected: 302"
+
+if !CLINE > 302
+	error "Too many credits lines. !CLINE > 302"
+
+elseif !CLINE < 302
+	warn "Too few credits lines. !CLINE < 302; Adding additional empties for alignment."
+
+endif
+
+
+; Set line always to line up with stats
+!CLINE #= 302
+
+;===================================================================================================
+
+%smallcredits("THE IMPORTANT STUFF", "yellow")
+
+%blankline()
+%blankline()
+
+%emptyline()
+%smallcredits("TIME FOUND", "green")
+
+%blankline()
+%blankline()
+
+%bigcreditsleft("FIRST SWORD")
+
+%blankline()
+
+%bigcreditsleft("PEGASUS BOOTS")
+
+%blankline()
+
+%bigcreditsleft("FLUTE")
+
+%blankline()
+
+%bigcreditsleft("MIRROR")
+
+%blankline()
+%blankline()
+
+%emptyline()
+%smallcredits("BOSS KILLS", "yellow")
+
+%blankline()
+%blankline()
+
+%bigcreditsleft("SWORDLESS                /13")
+
+%blankline()
+
+%bigcreditsleft("FIGHTER'S SWORD          /13")
+
+%blankline()
+
+%bigcreditsleft("MASTER SWORD             /13")
+
+%blankline()
+
+%bigcreditsleft("TEMPERED SWORD           /13")
+
+%blankline()
+
+%bigcreditsleft("GOLD SWORD               /13")
+
+%blankline()
+%blankline()
+
+%smallcredits("GAME STATS", "red")
+
+%blankline()
+%blankline()
+
+%bigcreditsleft("DAMAGE TAKEN")
+
+%blankline()
+
+%bigcreditsleft("MAGIC USED")
+
+%blankline()
+
+%bigcreditsleft("BONKS")
+
+%blankline()
+
+%bigcreditsleft("SAVE AND QUITS")
+
+%blankline()
+
+%bigcreditsleft("DEATHS")
+
+%blankline()
+
+%bigcreditsleft("FAERIE REVIVALS")
+
+%blankline()
+
+%bigcreditsleft("TOTAL MENU TIME")
+
+%blankline()
+
+%bigcreditsleft("TOTAL LAG TIME")
+
+%blankline()
+%blankline()
+
+
+%blankline()
+%blankline()
+
+
+%blankline()
+%blankline()
+
+
+%blankline()
+%blankline()
+
+
+%blankline()
+
+%emptyline()
+%emptyline()
+%bigcreditsleft("COLLECTION RATE         /216")
+
+%blankline()
+
+%bigcreditsleft("TOTAL TIME")
+
+%blankline()
+
+%emptyline()
+%emptyline()
+%emptyline()
+%emptyline()
+%emptyline()
+%emptyline()
+
+;---------------------------------------------------------------------------------------------------
diff --git a/stats/creditsnew.asm b/stats/creditsnew.asm
deleted file mode 100644
index d57270b..0000000
--- a/stats/creditsnew.asm
+++ /dev/null
@@ -1,752 +0,0 @@
-;===================================================================================================
-; LEAVE THIS HERE FOR PHP WRITES
-;===================================================================================================
-table "creditscharmapbighi.txt"
-YourSpriteCreditsHi:
-db 2
-db 55
-db "                            " ; $238002
-
-table "creditscharmapbiglo.txt"
-YourSpriteCreditsLo:
-db 2
-db 55
-db "                            " ; $238020
-
-;===================================================================================================
-
-CreditsLineTable:
-	fillword CreditsLineBlank : fill 800
-
-;===================================================================================================
-
-!CLINE = -1
-
-;---------------------------------------------------------------------------------------------------
-
-macro smallcredits(text, color)
-	!CLINE #= !CLINE+1
-	table "creditscharmapsmall_<color>.txt"
-
-	?line:
-		db (32-(?end-?text))/2
-		db 2*(?end-?text)-1
-	?text:
-		db "<text>"
-	?end:
-
-	pushpc
-	org CreditsLineTable+!CLINE+!CLINE : dw ?line
-	pullpc
-
-endmacro
-
-;---------------------------------------------------------------------------------------------------
-macro bigcredits(text)
-	!CLINE #= !CLINE+1
-	table "creditscharmapbighi.txt"
-
-	?line_top:
-		db (32-(?end-?text))/2
-		db 2*(?end-?text)-1
-	?text:
-		db "<text>"
-	?end:
-
-	pushpc
-	org CreditsLineTable+!CLINE+!CLINE : dw ?line_top
-	pullpc
-
-
-	table "creditscharmapbiglo.txt"
-	?line_bottom:
-		db (32-(?end-?text))/2
-		db 2*(?end-?text)-1
-		db "<text>"
-
-
-	!CLINE #= !CLINE+1
-	pushpc
-	org CreditsLineTable+!CLINE+!CLINE : dw ?line_bottom
-	pullpc
-
-endmacro
-
-;---------------------------------------------------------------------------------------------------
-
-macro bigcreditsleft(text)
-	!CLINE #= !CLINE+1
-	table "creditscharmapbighi.txt"
-
-	?line_top:
-		db 2
-		db 2*(?end-?text)-1
-	?text:
-		db "<text>"
-	?end:
-
-	pushpc
-	org CreditsLineTable+!CLINE+!CLINE : dw ?line_top
-	pullpc
-
-
-	table "creditscharmapbiglo.txt"
-	?line_bottom:
-		db 2
-		db 2*(?end-?text)-1
-		db "<text>"
-
-
-	!CLINE #= !CLINE+1
-	pushpc
-	org CreditsLineTable+!CLINE+!CLINE : dw ?line_bottom
-	pullpc
-
-endmacro
-
-;---------------------------------------------------------------------------------------------------
-
-macro emptyline()
-	!CLINE #= !CLINE+1
-	pushpc
-	org CreditsLineTable+!CLINE+!CLINE : dw CreditsEmptyLine
-	pullpc
-endmacro
-
-macro blankline()
-	!CLINE #= !CLINE+1
-	pushpc
-	org CreditsLineTable+!CLINE+!CLINE : dw CreditsLineBlank
-	pullpc
-endmacro
-
-macro addarbline(l)
-	!CLINE #= !CLINE+1
-	pushpc
-	org CreditsLineTable+!CLINE+!CLINE : dw <l>
-	pullpc
-endmacro
-
-;===================================================================================================
-
-CreditsEmptyLine:
-	db $00, $01, $9F
-
-CreditsLineBlank:
-	db $FF
-
-;---------------------------------------------------------------------------------------------------
-
-%emptyline()
-%smallcredits("ORIGINAL GAME STAFF", "yellow")
-
-%blankline()
-%blankline()
-
-%smallcredits("EXECUTIVE PRODUCER", "green")
-
-%blankline()
-
-%bigcredits("HIROSHI YAMAUCHI")
-
-%blankline()
-%blankline()
-
-%smallcredits("PRODUCER", "yellow")
-
-%blankline()
-
-%bigcredits("SHIGERU MIYAMOTO")
-
-%blankline()
-%blankline()
-
-%smallcredits("DIRECTOR", "red")
-
-%blankline()
-
-%bigcredits("TAKASHI TEZUKA")
-
-%blankline()
-%blankline()
-
-%smallcredits("SCRIPT WRITER", "green")
-
-%blankline()
-
-%bigcredits("KENSUKE TANABE")
-
-%blankline()
-%blankline()
-
-%smallcredits("ASSISTANT DIRECTORS", "yellow")
-
-%blankline()
-
-%bigcredits("YASUHISA YAMAMURA")
-
-%blankline()
-
-%bigcredits("YOICHI YAMADA")
-
-%blankline()
-%blankline()
-
-%smallcredits("SCREEN GRAPHICS DESIGNERS", "green")
-
-%emptyline()
-%emptyline()
-
-%smallcredits("OBJECT DESIGNERS", "yellow")
-
-%blankline()
-
-%bigcredits("SOICHIRO TOMITA")
-
-%blankline()
-
-%bigcredits("TAKAYA IMAMURA")
-
-%blankline()
-%blankline()
-
-%smallcredits("BACK GROUND DESIGNERS", "yellow")
-
-%blankline()
-
-%bigcredits("MASANAO ARIMOTO")
-
-%blankline()
-
-%bigcredits("TSUYOSHI WATANABE")
-
-%blankline()
-%blankline()
-
-%smallcredits("PROGRAM DIRECTOR", "red")
-
-%blankline()
-
-%bigcredits("TOSHIHIKO NAKAGO")
-
-%blankline()
-%blankline()
-
-%smallcredits("MAIN PROGRAMMER", "yellow")
-
-%blankline()
-
-%bigcredits("YASUNARI SOEJIMA")
-
-%blankline()
-%blankline()
-
-%smallcredits("OBJECT PROGRAMMER", "green")
-
-%blankline()
-
-%bigcredits("KAZUAKI MORITA")
-
-%blankline()
-%blankline()
-
-%smallcredits("PROGRAMMERS", "yellow")
-
-%blankline()
-
-%bigcredits("TATSUO NISHIYAMA")
-
-%blankline()
-
-%bigcredits("YUICHI YAMAMOTO")
-
-%blankline()
-
-%bigcredits("YOSHIHIRO NOMOTO")
-
-%blankline()
-
-%bigcredits("EIJI NOTO")
-
-%blankline()
-
-%bigcredits("SATORU TAKAHATA")
-
-%blankline()
-
-%bigcredits("TOSHIO IWAWAKI")
-
-%blankline()
-
-%bigcredits("SHIGEHIRO KASAMATSU")
-
-%blankline()
-
-%bigcredits("YASUNARI NISHIDA")
-
-%blankline()
-%blankline()
-
-%smallcredits("SOUND COMPOSER", "red")
-
-%blankline()
-
-%bigcredits("KOJI KONDO")
-
-%blankline()
-%blankline()
-
-%smallcredits("COORDINATORS", "green")
-
-%blankline()
-
-%bigcredits("KEIZO KATO")
-
-%blankline()
-
-%bigcredits("TAKAO SHIMIZU")
-
-%blankline()
-%blankline()
-
-%smallcredits("PRINTED ART WORK", "yellow")
-
-%blankline()
-
-%bigcredits("YOICHI KOTABE")
-
-%blankline()
-
-%bigcredits("HIDEKI FUJII")
-
-%blankline()
-
-%bigcredits("YOSHIAKI KOIZUMI")
-
-%blankline()
-
-%bigcredits("YASUHIRO SAKAI")
-
-%blankline()
-
-%bigcredits("TOMOAKI KUROUME")
-
-%blankline()
-%blankline()
-
-%smallcredits("SPECIAL THANKS TO", "red")
-
-%blankline()
-
-%bigcredits("NOBUO OKAJIMA")
-
-%blankline()
-
-%bigcredits("YASUNORI TAKETANI")
-
-%blankline()
-
-%bigcredits("KIYOSHI KODA")
-
-%blankline()
-
-%bigcredits("TAKAMITSU KUZUHARA")
-
-%blankline()
-
-%bigcredits("HIRONOBU KAKUI")
-
-%blankline()
-
-%bigcredits("SHIGEKI YAMASHIRO")
-
-%blankline()
-
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-
-;---------------------------------------------------------------------------------------------------
-
-%smallcredits("RANDOMIZER CONTRIBUTORS", "red")
-
-%blankline()
-%blankline()
-
-%smallcredits("ITEM RANDOMIZER", "yellow")
-
-%blankline()
-
-%bigcredits("KATDEVSGAMES         VEETORP")
-
-%blankline()
-
-%bigcredits("CHRISTOSOWEN       DESSYREQT")
-
-%blankline()
-
-%bigcredits("SMALLHACKER           SYNACK")
-
-%blankline()
-%blankline()
-
-%smallcredits("ENTRANCE RANDOMIZER", "green")
-
-%blankline()
-
-%bigcredits("AMAZINGAMPHAROS   LLCOOLDAVE")
-
-%blankline()
-
-%bigcredits("KEVINCATHCART    CASSIDYMOEN")
-
-%blankline()
-%blankline()
-
-%smallcredits("ENEMY RANDOMIZER", "yellow")
-
-%blankline()
-
-%bigcredits("ZARBY89              SOSUKE3")
-
-%blankline()
-
-%bigcredits("ENDEROFGAMES")
-
-%blankline()
-%blankline()
-
-%smallcredits("DOOR RANDOMIZER", "green")
-
-%blankline()
-
-%bigcredits("AERINON            COMPILING")
-
-%blankline()
-%blankline()
-
-%smallcredits("FESTIVE RANDOMIZER", "yellow")
-
-%blankline()
-
-%bigcredits("KAN                    TOTAL")
-
-%blankline()
-
-%bigcredits("CATOBAT            DINSAPHIR")
-
-%blankline()
-%blankline()
-
-%smallcredits("SPRITE DEVELOPMENT", "green")
-
-%blankline()
-
-%bigcredits("MIKETRETHEWEY         IBAZLY")
-
-%blankline()
-%bigcredits("FISH_WAFFLE64        KRELBEL")
-
-%blankline()
-
-%bigcredits("ACHY                 ARTHEAU")
-
-%blankline()
-
-%bigcredits("GLAN                 TWROXAS")
-
-%blankline()
-
-%bigcredits("PLAGUEDONE         TARTHORON")
-
-%blankline()
-%blankline()
-
-%smallcredits("YOUR SPRITE BY", "yellow")
-
-%addarbline(YourSpriteCreditsHi)
-%addarbline(YourSpriteCreditsLo)
-
-%blankline()
-%blankline()
-
-%smallcredits("MSU SUPPORT", "green")
-
-%blankline()
-
-%bigcredits("QWERTYMODO")
-
-%blankline()
-%blankline()
-
-%smallcredits("PALETTE SHUFFLER", "yellow")
-
-%blankline()
-
-%bigcredits("NELSON AKA SWR")
-
-%blankline()
-%blankline()
-
-%smallcredits("WEBSITE LOGO", "green")
-
-%blankline()
-
-%bigcredits("PLEASURE")
-
-%blankline()
-%blankline()
-
-%smallcredits("SPECIAL THANKS", "red")
-
-%blankline()
-
-%bigcredits("SUPERSKUJ          EVILASH25")
-
-%blankline()
-
-%bigcredits("MYRAMONG             JOSHRTA")
-
-%blankline()
-
-%bigcredits("WALKINGEYE     MATHONNAPKINS")
-
-%blankline()
-
-%bigcredits("MICHAELK              FOUTON")
-
-%blankline()
-
-%bigcredits("BONTA                EMOSARU")
-
-%blankline()
-
-%bigcredits("PINKUS              YUZUHARA")
-
-%blankline()
-
-%bigcredits("SAKURATSUBASA")
-
-%blankline()
-
-%bigcredits("AND...")
-
-%blankline()
-
-%bigcredits("THE ALTTP RANDOMIZER COMMUNITY")
-
-%blankline()
-%blankline()
-
-%smallcredits("COMMUNITY DISCORD", "green")
-
-%blankline()
-
-%bigcredits("HTTPS://ALTTPR.COM/DISCORD")
-
-%blankline()
-
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-
-;===================================================================================================
-
-print "Credits line number: !CLINE | Expected: 302"
-
-if !CLINE > 302
-	error "Too many credits lines. !CLINE > 302"
-
-elseif !CLINE < 302
-	warn "Too few credits lines. !CLINE < 302; Adding additional empties for alignment."
-
-endif
-
-
-; Set line always to line up with stats
-!CLINE #= 302
-
-;===================================================================================================
-
-%smallcredits("THE IMPORTANT STUFF", "yellow")
-
-%blankline()
-%blankline()
-
-%emptyline()
-%smallcredits("TIME FOUND", "green")
-
-%blankline()
-%blankline()
-
-%bigcreditsleft("FIRST SWORD")
-
-%blankline()
-
-%bigcreditsleft("PEGASUS BOOTS")
-
-%blankline()
-
-%bigcreditsleft("FLUTE")
-
-%blankline()
-
-%bigcreditsleft("MIRROR")
-
-%blankline()
-%blankline()
-
-%emptyline()
-%smallcredits("BOSS KILLS", "yellow")
-
-%blankline()
-%blankline()
-
-%bigcreditsleft("SWORDLESS                /13")
-
-%blankline()
-
-%bigcreditsleft("FIGHTER'S SWORD          /13")
-
-%blankline()
-
-%bigcreditsleft("MASTER SWORD             /13")
-
-%blankline()
-
-%bigcreditsleft("TEMPERED SWORD           /13")
-
-%blankline()
-
-%bigcreditsleft("GOLD SWORD               /13")
-
-%blankline()
-%blankline()
-
-%smallcredits("GAME STATS", "red")
-
-%blankline()
-%blankline()
-
-%bigcreditsleft("DAMAGE TAKEN")
-
-%blankline()
-
-%bigcreditsleft("MAGIC USED")
-
-%blankline()
-
-%bigcreditsleft("BONKS")
-
-%blankline()
-
-%bigcreditsleft("SAVE AND QUITS")
-
-%blankline()
-
-%bigcreditsleft("DEATHS")
-
-%blankline()
-
-%bigcreditsleft("FAERIE REVIVALS")
-
-%blankline()
-
-%bigcreditsleft("TOTAL MENU TIME")
-
-%blankline()
-
-%bigcreditsleft("TOTAL LAG TIME")
-
-%blankline()
-%blankline()
-
-
-%blankline()
-%blankline()
-
-
-%blankline()
-%blankline()
-
-
-%blankline()
-%blankline()
-
-
-%blankline()
-
-%emptyline()
-%emptyline()
-%bigcreditsleft("COLLECTION RATE         /216")
-
-%blankline()
-
-%bigcreditsleft("TOTAL TIME")
-
-%blankline()
-
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-
-;---------------------------------------------------------------------------------------------------
-
-!FIRST_SWORD_X = 19
-!FIRST_SWORD_Y = 310
-!PEGASUS_BOOTS_X = 19
-!PEGASUS_BOOTS_Y = 313
-!FLUTE_X = 19
-!FLUTE_Y = 316
-!MIRROR_X = 19
-!MIRROR_Y = 319
-!SWORDLESS_X = 23
-!SWORDLESS_Y = 327
-!FIGHTERS_SWORD_X = 23
-!FIGHTERS_SWORD_Y = 330
-!MASTER_SWORD_X = 23
-!MASTER_SWORD_Y = 333
-!TEMPERED_SWORD_X = 23
-!TEMPERED_SWORD_Y = 336
-!GOLD_SWORD_X = 23
-!GOLD_SWORD_Y = 339
-!DAMAGETAKEN_X = 26
-!DAMAGETAKEN_Y = 346
-!MAGICUSED_X = 26
-!MAGICUSED_Y = 349
-!BONKS_X = 26
-!BONKS_Y = 352
-!SAVE_AND_QUITS_X = 26
-!SAVE_AND_QUITS_Y = 355
-!DEATHS_X = 26
-!DEATHS_Y = 358
-!FAERIE_REVIVALS_X = 26
-!FAERIE_REVIVALS_Y = 361
-!TOTAL_MENU_TIME_X = 19
-!TOTAL_MENU_TIME_Y = 364
-!TOTAL_LAG_TIME_X = 19
-!TOTAL_LAG_TIME_Y = 367
-!COLLECTION_RATE_X = 22
-!COLLECTION_RATE_Y = 380
-!TOTAL_TIME_X = 19
-!TOTAL_TIME_Y = 383
diff --git a/stats/main.asm b/stats/main.asm
index fe33a33..5d7da64 100755
--- a/stats/main.asm
+++ b/stats/main.asm
@@ -6,7 +6,7 @@ lorom
 !BGE = "BCS"
 
 org $238000
-incsrc stats/creditsnew.asm
+incsrc stats/credits.asm
 
 FontGfx:
 if !FEATURE_NEW_TEXT
@@ -17,28 +17,27 @@ endif
 FontGfxEnd:
 
 ; Custom addresses. Most are arbitrary. Feel free to make sure they're okay or moving them elsewhere within ZP
-!CreditsPtr = $7C   ; 3 bytes
-!Temp = $B3         ; 2 bytes
-!StatsBottom = $B5  ; 2 bytes
-!StatsPtr = $B7     ; 3 bytes
-!ValueLow = $BA     ; 2 bytes
-!ValueHigh = $BC    ; 2 bytes
-!Hours = $72        ; 2 bytes
-!Minutes = $74      ; 2 bytes
-!Seconds = $76      ; 2 bytes
-!RemoveZero = $78   ; 2 bytes
-
+CreditsPtr = $7C   ; 3 bytes
+Temp = $B3         ; 2 bytes
+StatsBottom = $B5  ; 2 bytes
+StatsPtr = $B7     ; 3 bytes
+ValueLow = $BA     ; 2 bytes
+ValueHigh = $BC    ; 2 bytes
+Hours = $72        ; 2 bytes
+Minutes = $74      ; 2 bytes
+Seconds = $76      ; 2 bytes
+RemoveZero = $78   ; 2 bytes
 
 ; Original addresses
-!LineNumber = $CA   ; 2 bytes
+LineNumber = $CA   ; 2 bytes
 
 PreparePointer:
 	LDA.w #$2300
-	STA.b !CreditsPtr+1
+	STA.b CreditsPtr+1
 	LDA.w #CreditsLineTable
-	STA.b !CreditsPtr
-	LDA [!CreditsPtr],Y
-	STA.b !CreditsPtr
+	STA.b CreditsPtr
+	LDA.b [CreditsPtr],Y
+	STA.b CreditsPtr
 	LDY.w #$0000
 RTL
 
@@ -84,30 +83,21 @@ BitMasks:
     dw $3FFF
     dw $7FFF
 
-macro AddStat(address, type, shiftRight, bits, digits, xPos, lineNumber)
-    db <xPos><<2|<type><<9|<lineNumber>>>8
-    db <lineNumber>
-    db <bits><<4|<shiftRight>
-    db <digits><<5
-    db $00
-    dl <address>
-endmacro
-
 macro StripeStart(xPos, length)
-    LDA $C8
+    LDA.b $C8
     CLC
     ADC.w #<xPos>
     XBA
-    STA $1002,x
+    STA.w $1002,x
     
     LDA.w #<length>*2-1
     XBA
-    LDA #$0500
-    STA $1004,x
+    LDA.w #$0500
+    STA.w $1004,x
 endmacro
 
 macro StripeTile()
-    STA $1006,x
+    STA.w $1006,x
     INX
     INX
 endmacro
@@ -123,27 +113,27 @@ HexToDecStats:
 	PHA
 	PHA
 		LDA.w #$0000
-		STA $7F5003 : STA $7F5005 : STA $7F5006 ; clear digit storage
+		STA.l $7F5003 : STA.l $7F5005 : STA.l $7F5006 ; clear digit storage
 	PLA
 	-
 	CMP.w #10000 : !BLT +
-	PHA : SEP #$20 : LDA $7F5003 : INC : STA $7F5003 : REP #$20 : PLA
+	PHA : SEP #$20 : LDA.l $7F5003 : INC : STA.l $7F5003 : REP #$20 : PLA
 	!SUB.w #10000 : BRA -
 	+ -
 	CMP.w #1000 : !BLT +
-	PHA : SEP #$20 : LDA $7F5004 : INC : STA $7F5004 : REP #$20 : PLA
+	PHA : SEP #$20 : LDA.l $7F5004 : INC : STA.l $7F5004 : REP #$20 : PLA
 	!SUB.w #1000 : BRA -
 	+ -
 	CMP.w #100 : !BLT +
-	PHA : SEP #$20 : LDA $7F5005 : INC : STA $7F5005 : REP #$20 : PLA
+	PHA : SEP #$20 : LDA.l $7F5005 : INC : STA.l $7F5005 : REP #$20 : PLA
 	!SUB.w #100 : BRA -
 	+ -
 	CMP.w #10 : !BLT +
-	PHA : SEP #$20 : LDA $7F5006 : INC : STA $7F5006 : REP #$20 : PLA
+	PHA : SEP #$20 : LDA.l $7F5006 : INC : STA.l $7F5006 : REP #$20 : PLA
 	!SUB.w #10 : BRA -
 	+ -
 	CMP.w #1 : !BLT +
-	PHA : SEP #$20 : LDA $7F5007 : INC : STA $7F5007 : REP #$20 : PLA
+	PHA : SEP #$20 : LDA.l $7F5007 : INC : STA.l $7F5007 : REP #$20 : PLA
 	!SUB.w #1 : BRA -
 	+ 
 	PLA
@@ -151,13 +141,13 @@ RTL
 
 LastHexDigit: 
     TYA
-    AND #$000F
+    AND.w #$000F
     PHA
     TYA
     LSR #4
     TAY
     CLC
-    LDA !StatsBottom
+    LDA.b StatsBottom
     BNE +
     ; Upper half
     PLA
@@ -172,18 +162,18 @@ FindLine:
     LDY.w #$0000
 
 -   LDA.w CreditsStats,y
-    STZ !StatsBottom
+    STZ.b StatsBottom
     CMP #$FFFF
     BEQ .noLine
     
     XBA
-    AND #$01FF
-    CMP !LineNumber
+    AND.w #$01FF
+    CMP.b LineNumber
     BEQ .lineFound
     
     INC
-    INC !StatsBottom
-    CMP !LineNumber
+    INC.b StatsBottom
+    CMP.b LineNumber
     BEQ .lineFound
     
     INY #8
@@ -203,26 +193,26 @@ FindLine:
 !MAX_FRAME_COUNT = 59*60+59*60+59*60+99
 
 macro CountUnits(framesPerUnit, unitCounter)
-    STZ <unitCounter>
+    STZ.b <unitCounter>
 ?loop:
-    LDA !ValueLow
+    LDA.b ValueLow
     SEC
     SBC.w #<framesPerUnit>
-    STA !Temp
-    LDA !ValueHigh
+    STA.b Temp
+    LDA.b ValueHigh
     SBC.w #<framesPerUnit>>>16
     BCC ?end
-    STA !ValueHigh
-    LDA !Temp
-    STA !ValueLow
-    INC <unitCounter>
+    STA.b ValueHigh
+    LDA.b Temp
+    STA.b ValueLow
+    INC.b <unitCounter>
     BRA ?loop
 ?end:
 endmacro
 
 !ColonOffset = $83
 !PeriodOffset = $80
-!BlankTile = #$883D
+BlankTile = $883D
 
 RenderCreditsStatCounter:
     PHB
@@ -248,44 +238,44 @@ RenderCreditsStatCounter:
     ; == Write Stripe header (VRAM address, i.e. tile coordinates) ==
     LDA.w CreditsStats,y  ;   LLLL LLLL XXXX XTTL
     LSR #3
-    AND #$001F          ; X XXXX
+    AND.w #$001F          ; X XXXX
     CLC
-    ADC $C8
+    ADC.w $C8
     XBA
-    STA $1002,x
+    STA.w $1002,x
     
     ; == Write Stripe header (Length of data) ==
     LDA.w #4*2-1    ; 4 tiles = 8 bytes
     XBA
-    STA $1004,x
+    STA.w $1004,x
     PHX
     
     ; == Load tile base (upper or lower half of white two-line zero) ==
-    LDA !StatsBottom
+    LDA.b StatsBottom
     BNE +
-    LDA #$3D40
+    LDA.w #$3D40
     BRA ++
-+   LDA #$3D50
-++  STA !Temp
++   LDA.w #$3D50
+++  STA.b Temp
 
     ; == Load the actual stat word ==
     LDA.w CreditsStats+5,y
-    STA.b !StatsPtr
+    STA.b StatsPtr
     LDA.w CreditsStats+6,y
-    STA.b !StatsPtr+1
-    LDA.b [!StatsPtr]
-    STA !ValueLow
+    STA.b StatsPtr+1
+    LDA.b [StatsPtr]
+    STA.b ValueLow
     
     ; == Shift value ==
     LDA.w CreditsStats+2,y;   CCC- ---- BBBB SSSS
     AND.w #$000F        ;   SSSS
     BEQ +
     TAX
-    LDA !ValueLow
+    LDA.b ValueLow
 -   LSR
     DEX
     BNE -
-    STA !ValueLow
+    STA.b ValueLow
 +   
     ; == Mask value ==
     LDA.w CreditsStats+2,y;   CCC- ---- BBBB SSSS
@@ -295,8 +285,8 @@ RenderCreditsStatCounter:
 	AND.w #$001E
     TAX
     LDA.l BitMasks,x
-    AND !ValueLow
-    STA !ValueLow
+    AND.b ValueLow
+    STA.b ValueLow
     
     ; == Cap value ==
     LDA.w CreditsStats+3,y;   ---- ---- CCC- ----
@@ -305,60 +295,58 @@ RenderCreditsStatCounter:
     BEQ +
     ASL : TAX
     LDA.l ValueCaps,x
-    CMP !ValueLow
+    CMP.b ValueLow
     !BGE +
-    STA !ValueLow
+    STA.b ValueLow
 +   
     ; == Display value ==
-    LDA !ValueLow
+    LDA.b ValueLow
     JSL HexToDecStats
     PLX
-    STZ !RemoveZero
+    STZ.b RemoveZero
     
-    LDA $7F5004
-    AND #$00FF
-    CMP !RemoveZero
+    LDA.l $7F5004
+    AND.w #$00FF
+    CMP.b RemoveZero
     BNE +
-    LDA !BlankTile
+    LDA.w #BlankTile
     BRA ++
-+   DEC !RemoveZero
++   DEC.b RemoveZero
     CLC
-    ADC !Temp
+    ADC.b Temp
 ++  %StripeTile()
     
-    LDA $7F5005
+    LDA.l $7F5005
     AND #$00FF
-    CMP !RemoveZero
+    CMP.b RemoveZero
     BNE +
-    LDA !BlankTile
+    LDA.w #BlankTile
     BRA ++
-+   DEC !RemoveZero
++   DEC.b RemoveZero
     CLC
-    ADC !Temp
+    ADC.b Temp
 ++  %StripeTile()
     
-    LDA $7F5006
-    AND #$00FF
-    CMP !RemoveZero
+    LDA.l $7F5006
+    AND.w #$00FF
+    CMP.b RemoveZero
     BNE +
-    LDA !BlankTile
+    LDA.w #BlankTile
     BRA ++
-+   DEC !RemoveZero
++   DEC.b RemoveZero
     CLC
-    ADC !Temp
+    ADC.b Temp
 ++  %StripeTile()
     
-    LDA $7F5007
-    AND #$00FF
+    LDA.l $7F5007
+    AND.w #$00FF
     CLC
-    ADC !Temp
+    ADC.b Temp
     %StripeTile()
     
     %StripeEnd()
 .endStats
 
-    ;JSR RenderLineNumber
-
     PLB
     RTL
     
@@ -368,131 +356,131 @@ RenderCreditsStatCounter:
     ; == Write Stripe header (VRAM address, i.e. tile coordinates) ==
     LDA.w CreditsStats,y  ;   LLLL LLLL XXXX XTTL
     LSR #3
-    AND #$001F          ; X XXXX
+    AND.w #$001F          ; X XXXX
     CLC
-    ADC $C8
+    ADC.b $C8
     XBA
-    STA $1002,x
+    STA.w $1002,x
     
     ; == Write Stripe header (Length of data) ==
     LDA.w #11*2-1    ; 11 tiles = 22 bytes
     XBA
-    STA $1004,x
+    STA.w $1004,x
     PHX
     
     ; == Load the actual stat words ==
     LDA.w CreditsStats+5,y
-    STA.b !StatsPtr
+    STA.b StatsPtr
     LDA.w CreditsStats+6,y
-    STA.b !StatsPtr+1
-    LDA.b [!StatsPtr]
-    STA !ValueLow
-    INC !StatsPtr
-    INC !StatsPtr
-    LDA.b [!StatsPtr]
-    STA !ValueHigh
+    STA.b StatsPtr+1
+    LDA.b [StatsPtr]
+    STA.b ValueLow
+    INC.b StatsPtr
+    INC.b StatsPtr
+    LDA.b [StatsPtr]
+    STA.b ValueHigh
     
     CMP.w #!MAX_FRAME_COUNT>>16+1
     !BGE ++
     
     ; == Convert total frames into hours, minutes, seconds and frames ==
-    %CountUnits(!FRAMES_PER_HOUR, !Hours)
-    %CountUnits(!FRAMES_PER_MINUTE, !Minutes)
-    %CountUnits(!FRAMES_PER_SECOND, !Seconds)
+    %CountUnits(!FRAMES_PER_HOUR, Hours)
+    %CountUnits(!FRAMES_PER_MINUTE, Minutes)
+    %CountUnits(!FRAMES_PER_SECOND, Seconds)
     
     ; == Cap at 99:59:59.59 ==
-    LDA !Hours
+    LDA.b Hours
     CMP.w #100
     !BLT +
 ++  LDA.w #99
-    STA !Hours
+    STA.b Hours
     LDA.w #59
-    STA !Minutes
-    STA !Seconds
-    STA !ValueLow
+    STA.b Minutes
+    STA.b Seconds
+    STA.b ValueLow
 +
     
     ; == Load tile base (upper or lower half of white two-line zero) ==
-    LDA !StatsBottom
+    LDA.b StatsBottom
     BNE +
-    LDA #$3D40
+    LDA.w #$3D40
     BRA ++
-+   LDA #$3D50
-++  STA !Temp
++   LDA.w #$3D50
+++  STA.b Temp
     
     PLX
     
     ; == Display value ==
-    LDA !Hours
+    LDA.b Hours
     JSL HexToDecStats
     
-    LDA $7F5006
-    AND #$00FF
+    LDA.l $7F5006
+    AND.w #$00FF
     CLC
-    ADC !Temp
+    ADC.b Temp
     %StripeTile()
     
-    LDA $7F5007
-    AND #$00FF
+    LDA.l $7F5007
+    AND.w #$00FF
     CLC
-    ADC !Temp
+    ADC.b Temp
     %StripeTile()
     
     LDA.w #!ColonOffset
     CLC
-    ADC !Temp
+    ADC.b Temp
     %StripeTile()
     
-    LDA !Minutes
+    LDA.b Minutes
     JSL HexToDecStats
-    LDA $7F5006
-    AND #$00FF
+    LDA.l $7F5006
+    AND.w #$00FF
     CLC
-    ADC !Temp
+    ADC.b Temp
     %StripeTile()
     
-    LDA $7F5007
-    AND #$00FF
+    LDA.l $7F5007
+    AND.w #$00FF
     CLC
-    ADC !Temp
+    ADC.b Temp
     %StripeTile()
     
     LDA.w #!ColonOffset
     CLC
-    ADC !Temp
+    ADC.b Temp
     %StripeTile()
     
-    LDA !Seconds
+    LDA.b Seconds
     JSL HexToDecStats
-    LDA $7F5006
-    AND #$00FF
+    LDA.l $7F5006
+    AND.w #$00FF
     CLC
-    ADC !Temp
+    ADC.b Temp
     %StripeTile()
     
-    LDA $7F5007
-    AND #$00FF
+    LDA.l $7F5007
+    AND.w #$00FF
     CLC
-    ADC !Temp
+    ADC.b Temp
     %StripeTile()
     
     LDA.w #!PeriodOffset
     CLC
-    ADC !Temp
+    ADC.b Temp
     %StripeTile()
     
-    LDA !ValueLow
+    LDA.b ValueLow
     JSL HexToDecStats
-    LDA $7F5006
-    AND #$00FF
+    LDA.l $7F5006
+    AND.w #$00FF
     CLC
-    ADC !Temp
+    ADC.b Temp
     %StripeTile()
     
-    LDA $7F5007
-    AND #$00FF
+    LDA.l $7F5007
+    AND.w #$00FF
     CLC
-    ADC !Temp
+    ADC.b Temp
     %StripeTile()
     
     %StripeEnd()
@@ -502,13 +490,13 @@ RenderCreditsStatCounter:
 RenderLineNumber:
     %StripeStart(0, 3)
     
-    STZ !StatsBottom
-    LDA $CA
+    STZ.b StatsBottom
+    LDA.b $CA
     TAY
-    AND #$0001
+    AND.w #$0001
     BEQ +
     DEY
-    INC !StatsBottom
+    INC.b StatsBottom
 +   
     JSR LastHexDigit
     PHA
@@ -530,21 +518,21 @@ LoadModifiedFont:
     ; copies font graphics to VRAM (for BG3)
     
     ; set name base table to vram $4000 (word)
-    LDA.b #$02 : STA $2101
+    LDA.b #$02 : STA.w OBSEL
     
     ; increment on writes to $2119
-    LDA.b #$80 : STA $2115
+    LDA.b #$80 : STA.w VMAIN
     
     ; set bank of the source address (see below)
-    LDA.b #FontGfx>>16 : STA $02
+    LDA.b #FontGfx>>16 : STA.b Scrap02
     
     REP #$30
     
     ; vram target address is $7000 (word)
-    LDA.w #$7000 : STA $2116
+    LDA.w #$7000 : STA.w VMADDL
     
     ; $00[3] = $0E8000 (offset for the font data)
-    LDA.w #FontGfx : STA $00
+    LDA.w #FontGfx : STA.b Scrap00
     
     ; going to write 0x1000 bytes (0x800 words)
     LDX.w #FontGfxEnd-FontGfx/2-1
@@ -552,10 +540,10 @@ LoadModifiedFont:
 .nextWord
 
     ; read a word from the font data
-    LDA [$00] : STA $2118
+    LDA.b [$00] : STA.w VMDATAL
     
     ; increment source address by 2
-    INC $00 : INC $00
+    INC.b Scrap00 : INC.b Scrap00
     
     DEX : BPL .nextWord
     
@@ -569,18 +557,18 @@ LoadFullItemTilesCredits:
 	; copies font graphics to VRAM (for BG3)
 
 	; increment on writes to $2119
-	LDA.b #$80 : STA $2115
+	LDA.b #$80 : STA.w VMAIN
 
 	; set bank of the source address (see below)
-	LDA.b #FileSelectNewGraphics>>16 : STA $02
+	LDA.b #FileSelectNewGraphics>>16 : STA.b Scrap02
 
 	REP #$30
 
 	; vram target address is $8000 (word) (Wraps to start of VRAM on normal SNES, but using the correct address so it works on extended VRAM machines)
-	LDA.w #$8000 : STA $2116
+	LDA.w #$8000 : STA.w VMADDL
 
 	; $00[3] = $0E8000 (offset for the font data)
-	LDA.w #FileSelectNewGraphics : STA $00
+	LDA.w #FileSelectNewGraphics : STA.b Scrap00
 
 	; going to write 0x1000 bytes (0x800 words)
 	LDX.w #$800-1
@@ -588,10 +576,10 @@ LoadFullItemTilesCredits:
 	.nextWord
 
 	; read a word from the font data
-	LDA [$00] : STA $2118
+	LDA.b [$00] : STA.w VMDATAL
 
 	; increment source address by 2
-	INC $00 : INC $00
+	INC.b Scrap00 : INC.b Scrap00
 
 	DEX : BPL .nextWord
 
@@ -629,7 +617,7 @@ DrawEndingItems:
 	JSL DrawPlayerFile_credits
 	JSL SetItemLayoutPriority
 	SEP #$30
-	LDA.b #$01 : STA $14
+	LDA.b #$01 : STA.b $14
 RTS
 
 FontTable:
@@ -650,13 +638,13 @@ org $0EE651
 
 org $0EE828
 	JSL PreparePointer
-	LDA [!CreditsPtr],Y
+	LDA.b [CreditsPtr],Y
 	NOP
 org $0EE83F
-	LDA [!CreditsPtr],Y
+	LDA.b [CreditsPtr],Y
 	NOP
 org $0EE853
-	LDA [!CreditsPtr],Y
+	LDA.b [CreditsPtr],Y
 	NOP
     AND.w #$00ff
     ASL A
diff --git a/stats/statConfig.asm b/stats/statConfig.asm
index d3b8c29..101e9aa 100755
--- a/stats/statConfig.asm
+++ b/stats/statConfig.asm
@@ -1,4 +1,50 @@
-;(address, type, shiftRight, bits, digits, xPos, lineNumber)
+!FIRST_SWORD_X = 19
+!FIRST_SWORD_Y = 310
+!PEGASUS_BOOTS_X = 19
+!PEGASUS_BOOTS_Y = 313
+!FLUTE_X = 19
+!FLUTE_Y = 316
+!MIRROR_X = 19
+!MIRROR_Y = 319
+!SWORDLESS_X = 23
+!SWORDLESS_Y = 327
+!FIGHTERS_SWORD_X = 23
+!FIGHTERS_SWORD_Y = 330
+!MASTER_SWORD_X = 23
+!MASTER_SWORD_Y = 333
+!TEMPERED_SWORD_X = 23
+!TEMPERED_SWORD_Y = 336
+!GOLD_SWORD_X = 23
+!GOLD_SWORD_Y = 339
+!DAMAGETAKEN_X = 26
+!DAMAGETAKEN_Y = 346
+!MAGICUSED_X = 26
+!MAGICUSED_Y = 349
+!BONKS_X = 26
+!BONKS_Y = 352
+!SAVE_AND_QUITS_X = 26
+!SAVE_AND_QUITS_Y = 355
+!DEATHS_X = 26
+!DEATHS_Y = 358
+!FAERIE_REVIVALS_X = 26
+!FAERIE_REVIVALS_Y = 361
+!TOTAL_MENU_TIME_X = 19
+!TOTAL_MENU_TIME_Y = 364
+!TOTAL_LAG_TIME_X = 19
+!TOTAL_LAG_TIME_Y = 367
+!COLLECTION_RATE_X = 22
+!COLLECTION_RATE_Y = 380
+!TOTAL_TIME_X = 19
+!TOTAL_TIME_Y = 383
+
+macro AddStat(address, type, shiftRight, bits, digits, xPos, lineNumber)
+    db <xPos><<2|<type><<9|<lineNumber>>>8
+    db <lineNumber>
+    db <bits><<4|<shiftRight>
+    db <digits><<5
+    db $00
+    dl <address>
+endmacro
 
 %AddStat(SwordTime, 1, 0, 32, 4, !FIRST_SWORD_X, !FIRST_SWORD_Y)
 %AddStat(BootsTime, 1, 0, 32, 4, !PEGASUS_BOOTS_X, !PEGASUS_BOOTS_Y)
diff --git a/swordswap.asm b/swordswap.asm
index f28e6d9..f773b55 100644
--- a/swordswap.asm
+++ b/swordswap.asm
@@ -3,35 +3,8 @@
 ;================================================================================
 ;$03348E: smith sword check (to see if uprade-able)
 ;================================================================================
-;GetFairySword:
-;	CMP.b #$49 : BNE + : LDA.b #$00 : + ; convert single fighter sword to low id one
-;	CMP.b #$50 : BNE + : LDA.b #$01 : + ; convert safe master sword to normal one
-;	CMP #$04 : !BLT + : JML.l PyramidFairy_BRANCH_IOTA : + ; for any sword, incl newer
-;	JSL ItemCheck_FairySword : BEQ + : JML.l PyramidFairy_BRANCH_IOTA : + ; skip if we already flagged getting this
-;	JSL ItemSet_FairySword ; mark as got
-;	LDA FairySword : STA $0DC0, X ; whichever sword
-;	LDA.b #$05 : STA $0EB0, X ; something we overwrote, documentation unclear on purpose
-;
-;JML.l PyramidFairy_BRANCH_GAMMA
-;================================================================================
-;GetSmithSword:
-;	JSL ItemCheck_SmithSword : BEQ + : JML.l Smithy_AlreadyGotSword : + ; check if we're not already done
-;	;JSL ItemSet_SmithSword - too early
-;JML.l Smithy_DoesntHaveSword
-;================================================================================
-;LoadSwordForDamage:
-;	LDA SwordEquipment : CMP #$04 : BNE .done ; skip if not gold sword
-;	LDA $1B : BEQ + ; skip if outdoors
-;	LDA $A0 : CMP #41 : BNE + ; decimal 41 ; skip if not in the mothula room
-;		LDA #$03 ; pretend we're using tempered
-;		BRA .done
-;	+
-;	LDA #$04 ; nvm gold sword is fine
-;	.done
-;RTL
-;================================================================================
 LoadSwordForDamage:
-	LDA $0E20, X : CMP.b #$88 : BNE .notMoth
+	LDA.w $0E20, X : CMP.b #$88 : BNE .notMoth
 		JSR.w LoadModifiedSwordLevel ; load normal sword value
 		CMP.b #$04 : !BLT + : DEC : + ; if it's gold sword, change it to tempered
 		RTL
@@ -39,10 +12,9 @@ LoadSwordForDamage:
 	JSR.w LoadModifiedSwordLevel ; load normal sword value
 RTL
 ;================================================================================
-;!StalfosBombDamage = "$7F509D"
 LookupDamageLevel:
 	CPX.w #$0918 : BNE +
-		LDA.l !StalfosBombDamage
+		LDA.l StalfosBombDamage
 		RTL
 	+
 	PHP
@@ -59,82 +31,77 @@ RTL
 	AND.b #$0F
 RTL
 ;================================================================================
-; $7F50C0 - Sword Modifier
 LoadModifiedSwordLevel: ; returns short
-	LDA $7F50C0 : BEQ +
+	LDA.l SwordModifier : BEQ +
 		!ADD SwordEquipment ; add normal sword value to modifier
 			BNE ++ : LDA.b #$01 : RTS : ++
 			CMP.b #$05 : !BLT ++ : LDA.b #$04 : RTS : ++
 		RTS
 	+
-	LDA SwordEquipment ; load normal sword value
+	LDA.l SwordEquipment ; load normal sword value
 RTS
 ;================================================================================
 ; ArmorEquipment - Armor Inventory
-; $7F50C2 - Armor Modifier
-; $7F5020 - Scratch Space (Caller Preserved)
 LoadModifiedArmorLevel:
 	PHA
-		LDA ArmorEquipment : !ADD $7F50C2
+		LDA.l ArmorEquipment : !ADD ArmorModifier
 		CMP.b #$FF : BNE + : LDA.b #$00 : +
 		CMP.b #$03 : !BLT + : LDA.b #$02 : +
-		STA $7F5020
+		STA.l ScratchBufferV
 	PLA
-	!ADD $7F5020
+	!ADD ScratchBufferV
 RTL
 ;================================================================================
 ; MagicConsumption - Magic Inventory
-; $7F50C3 - Magic Modifier
 LoadModifiedMagicLevel:
-	LDA $7F50C3 : BEQ +
+	LDA.l MagicModifier : BEQ +
 		!ADD MagicConsumption ; add normal magic value to modifier
 			CMP.b #$FF : BNE ++ : LDA.b #$00 : RTL : ++
 			CMP.b #$03 : !BLT ++ : LDA.b #$02 : ++
 		RTL
 	+
-	LDA MagicConsumption ; load normal magic value
+	LDA.l MagicConsumption ; load normal magic value
 RTL
 ;================================================================================
 ; $7E0348 - Ice Value
-; $7F50C7 - Ice Modifier
 LoadModifiedIceFloorValue_a11:
-	LDA $A0 : CMP #$91 : BEQ + : CMP #$92 : BEQ + : CMP #$93 : BEQ + ; mire basement currently broken - not sure why
-	LDA $5D : CMP #$01 : BEQ + : CMP #$17 : BEQ + : CMP #$1C : BEQ +
-	LDA $5E : CMP #$02 : BEQ +
-	LDA $5B : BNE +
-		LDA.w $0348 : ORA $7F50C7 : AND.b #$11 : RTL
-	+ : LDA.w $0348 : AND.b #$11
-RTL
-LoadModifiedIceFloorValue_a01:
-	LDA $A0 : CMP #$91 : BEQ + : CMP #$92 : BEQ + : CMP #$93 : BEQ + ; mire basement currently broken - not sure why
-	LDA $5D : CMP #$01 : BEQ + : CMP #$17 : BEQ + : CMP #$1C : BEQ +
-	LDA $5E : CMP #$02 : BEQ +
-	LDA $5B : BNE +
-		LDA.w $0348 : ORA $7F50C7 : AND.b #$01 : RTL
+	LDA.b $A0 : CMP.b #$91 : BEQ + : CMP.b #$92 : BEQ + : CMP.b #$93 : BEQ + ; mire basement currently broken - not sure why
+	LDA.b $5D : CMP.b #$01 : BEQ + : CMP.b #$17 : BEQ + : CMP.b #$1C : BEQ +
+	LDA.b $5E : CMP.b #$02 : BEQ +  
+	LDA.b $5B : BNE +  
+		LDA.w $0348 : ORA.l IceModifier : AND.b #$11 : RTL  
+	+ : LDA.w $0348 : AND.b #$11  
+RTL  
+LoadModifiedIceFloorValue_a01:  
+	LDA.b $A0 : CMP.b #$91 : BEQ + : CMP.b #$92 : BEQ + : CMP.b #$93 : BEQ + ; mire basement currently broken - not sure why
+	LDA.b $5D : CMP.b #$01 : BEQ + : CMP.b #$17 : BEQ + : CMP.b #$1C : BEQ +
+	LDA.b $5E : CMP.b #$02 : BEQ +
+	LDA.b $5B : BNE +
+		LDA.w $0348 : ORA.l IceModifier : AND.b #$01 : RTL
 	+ : LDA.w $0348 : AND.b #$01
 RTL
 ;================================================================================
 CheckTabletSword:
 	LDA.l AllowHammerTablets : BEQ +
-	LDA HammerEquipment : BEQ + ; check for hammer
+	LDA.l HammerEquipment : BEQ + ; check for hammer
 		LDA.b #$02 : RTL
 	+
-	LDA SwordEquipment ; get actual sword value
+	LDA.l SwordEquipment ; get actual sword value
 RTL
 ;================================================================================
 GetSwordLevelForEvilBarrier:
 	LDA.l AllowHammerEvilBarrierWithFighterSword : BEQ +
-	LDA #$FF : RTL
+	LDA.b #$FF : RTL
 	+
-	LDA SwordEquipment
+	LDA.l SwordEquipment
 RTL
 ;================================================================================
 CheckGanonHammerDamage:
 	LDA.l HammerableGanon : BEQ +
-	LDA $0E20, X : CMP.b #$D8 ; original behavior except ganon
+	LDA.w $0E20, X : CMP.b #$D8 ; original behavior except ganon
 RTL
 	+
-	LDA $0E20, X : CMP.b #$D6 ; original behavior
+	LDA.w $0E20, X : CMP.b #$D6 ; original behavior
 RTL
 ;================================================================================
 GetSmithSword:
@@ -143,7 +110,7 @@ GetSmithSword:
 		JML.l Smithy_DoesntHaveSword ; Classic Smithy
 	+
 
-	REP #$20 : LDA CurrentRupees : CMP #$000A : SEP #$20 : !BGE .buy
+	REP #$20 : LDA.l CurrentRupees : CMP.w #$000A : SEP #$20 : !BGE .buy
 	.cant_afford
 		REP #$10
 		LDA.b #$7A
@@ -155,10 +122,10 @@ GetSmithSword:
 
 	.buy
 		LDA.l SmithItem : TAY
-		STZ $02E9 ; Item from NPC
+		STZ.w $02E9 ; Item from NPC
 		PHX : JSL Link_ReceiveItem : PLX
 
-		REP #$20 : LDA CurrentRupees : !SUB.w #$000A : STA CurrentRupees : SEP #$20 ; Take 10 rupees
+		REP #$20 : LDA.l CurrentRupees : !SUB.w #$000A : STA.l CurrentRupees : SEP #$20 ; Take 10 rupees
 		JSL ItemSet_SmithSword
 	
 	.done
@@ -170,35 +137,35 @@ CheckMedallionSword:
 		LDA.b #$02 ; Pretend we have master sword
 		RTL
 	.check_sword
-		LDA SwordEquipment
+		LDA.l SwordEquipment
 		RTL
 	.check_pad
 		PHB : PHX : PHY
-		LDA $1B : BEQ .outdoors
+		LDA.b $1B : BEQ .outdoors
 		.indoors
 			REP #$20 ; set 16-bit accumulator
-			LDA $A0 ; load room ID
+			LDA.b $A0 ; load room ID
 			CMP.w #$000E : BNE + ; freezor1
-				LDA $22 : AND.w #$01FF ; check x-coord
+				LDA.b $22 : AND.w #$01FF ; check x-coord
 					CMP.w #368-8 : !BLT .normal
 					CMP.w #368+32-8 : !BGE .normal
-				LDA $20 : AND.w #$01FF ; check y-coord
+				LDA.b $20 : AND.w #$01FF ; check y-coord
 					CMP.w #400-22 : !BLT .normal
 					CMP.w #400+32-22 : !BGE .normal
 				JMP .permit
 			+ : CMP.w #$007E : BNE + ; freezor2
-				LDA $22 : AND.w #$01FF ; check x-coord
+				LDA.b $22 : AND.w #$01FF ; check x-coord
 					CMP.w #112-8 : !BLT .normal
 					CMP.w #112+32-8 : !BGE .normal
-				LDA $20 : AND.w #$01FF ; check y-coord
+				LDA.b $20 : AND.w #$01FF ; check y-coord
 					CMP.w #400-22 : !BLT .normal
 					CMP.w #400+32-22 : !BGE .normal
 				JMP .permit
 			+ : CMP.w #$00DE : BNE + ; kholdstare
-				LDA $22 : AND.w #$01FF ; check x-coord
+				LDA.b $22 : AND.w #$01FF ; check x-coord
 					CMP.w #368-8 : !BLT .normal
 					CMP.w #368+32-8 : !BGE .normal
-				LDA $20 : AND.w #$01FF ; check y-coord
+				LDA.b $20 : AND.w #$01FF ; check y-coord
 					CMP.w #144-22 : !BLT .normal
 					CMP.w #144+32-22 : !BGE .normal
 				BRA .permit
@@ -206,21 +173,21 @@ CheckMedallionSword:
 			SEP #$20 ; set 8-bit accumulator
 			BRA .done
 		.outdoors
-			LDA $8A : CMP.b #$70 : BNE +
-				LDA.l MireRequiredMedallion : TAX : LDA.l .medallion_type, X : CMP $0303 : BNE .done
-				LDA OverworldEventDataWRAM+$70 : AND.b #$20 : BNE .done
+			LDA.b $8A : CMP.b #$70 : BNE +
+				LDA.l MireRequiredMedallion : TAX : LDA.l .medallion_type, X : CMP.w $0303 : BNE .done
+				LDA.l OverworldEventDataWRAM+$70 : AND.b #$20 : BNE .done
 				LDA.b #$08 : PHA : PLB ; set data bank to $08
 				LDY.b #$02 : JSL.l Ancilla_CheckIfEntranceTriggered : BCS .permit ; misery mire
 				BRA .done
 			+ : CMP.b #$47 : BNE +
-				LDA.l TRockRequiredMedallion : TAX : LDA.l .medallion_type, X : CMP $0303 : BNE .done
-				LDA OverworldEventDataWRAM+$47 : AND.b #$20 : BNE .done
+				LDA.l TRockRequiredMedallion : TAX : LDA.l .medallion_type, X : CMP.w $0303 : BNE .done
+				LDA.l OverworldEventDataWRAM+$47 : AND.b #$20 : BNE .done
 				LDA.b #$08 : PHA : PLB ; set data bank to $08
 				LDY.b #$03 : JSL.l Ancilla_CheckIfEntranceTriggered : BCS .permit ; turtle rock
 			+
 	.done
 		PLY : PLX : PLB
-		LDA SwordEquipment
+		LDA.l SwordEquipment
 		RTL
 	.permit
 		SEP #$20 ; set 8-bit accumulator
diff --git a/tables.asm b/tables.asm
index 02f66fd..eb75b77 100644
--- a/tables.asm
+++ b/tables.asm
@@ -396,7 +396,7 @@ org $30809A ; PC 0x18009A
 OneMindPlayerCount:
 db 0
 org $30809B ;  PC 0x18009B - 0x18009C
-OneMindTimer:
+OneMindTimerInit:
 dw 0
 ;--------------------------------------------------------------------------------
 ; 0x18009D - Dungeon map icons
@@ -1453,103 +1453,8 @@ dw #9999 ; Rupee Limit
 ; $2F8000 - $2F83FF - RNG Block
 ;================================================================================
 ; $7EC025 - $7EC034 - Item OAM Table
-;================================================================================
-; $7F5000 - Redraw Flag
-; $7F5001 - Flipper Softlock Possible
-; $7F5002 - L/R Rotate
-; $7F5003 - HexToDec 1st Digit
-; $7F5004 - HexToDec 2nd Digit
-; $7F5005 - HexToDec 3rd Digit
-; $7F5006 - HexToDec 4th Digit
-; $7F5007 - HexToDec 5th Digit
-; $7F5008 - Skip Sprite_DrawMultiple EOR
-; $7F5009 - Always Zero
-; $7F5010 - Scratch Space (Callee Preserved)
-; $7F5020 - Scratch Space (Caller Preserved)
-; $7F5030 - Jar Cursor Status
-; $7F5031 - HUD Master Sword Flag
-; $7F5032 - Ganon Warp Chain Flag
-; $7F5033 - Force Heart Spawn Counter
-; $7F5034 - Skip Heart Collection Save Counter
-; $7F5035 - Alternate Text Pointer Flag ; 0=Disable
-; $7F5036 - Padding Byte (Must be Zero)
-; $7F5037 - Stats Boss Kills
-; $7F5038 - Stats Lag Time
-; $7F5039 - Stats Lag Time
-; $7F503A - Stats Lag Time
-; $7F503B - Stats Lag Time
-; $7F503C - Stats Rupee Total
-; $7F503D - Stats Rupee Total
-; $7F503E - Stats Item Total
-; $7F503F - Unused
-; $7F5040 - Free Item Dialog Temporary
-; $7F5041 - Epilepsy Safety Timer
-; $7F5042 - Tile Upload Offset Override (Low)
-; $7F5043 - Tile Upload Offset Override (High)
-; $7F5044 - $7F5046 - NMI Auxiliary Function
-; $7F5047 - $7F504F - Unused
-; $7F5050 - $7F506F - Shop Block
-; $7F5070 - Reserved for OneMind
-; $7F5071 - Reserved for OneMind
-; $7F5072 - OneMind player ID
-; $7F5073 - $7F5074 - OneMind timer
-; $7F5075 - $7F507D - Unused
-; $7F507E - Clock Status
-; $7F507F - Always Zero
-; $7F5080 - $7F5083 - Clock Hours
-; $7F5084 - $7F5087 - Clock Minutes
-; $7F5088 - $7F508B - Clock Seconds
-; $7F508C - $7F508F - Clock Temporary
-; $7F5090 - RNG Item Lock-In
-; $7F5091 - Item Animation Busy Flag
-; $7F5092 - Potion Animation Busy Flags (Health)
-; $7F5093 - Potion Animation Busy Flags (Magic)
-; $7F5094 - Dialog Offset Pointer (Low)
-; $7F5095 - Dialog Offset Pointer (High)
-; $7F5096 - Dialog Offset Pointer Return (Low)
-; $7F5097 - Dialog Offset Pointer Return (High)
-; $7F5098 - Water Entry Index
-; $7F5099 - Last Entered Overworld Door ID
-; $7F509A - (Reserved)
-; $7F509B - Unused
-; $7F509C - Inverted Mode Duck Map Temporary
-; $7F509D - Stalfos Bomb Damage Value
-; $7F509E - Valid Key Loaded
-; $7F509F - Text Box Defer Flag
-; $7F50A0 - $7F50AF - MSU Block
+;================================================================================;
 
-; $7F50B0 - $7F50BF - Downstream Reserved (Enemizer)
-
-; $7F50C0 - Sword Modifier
-; $7F50C1 - Shield Modifier (Not Implemented)
-; $7F50C2 - Armor Modifier
-; $7F50C3 - Magic Modifier
-; $7F50C4 - Light Cone Modifier
-; $7F50C5 - Cucco Storm
-; $7F50C6 - Old Man Dash Modifier
-; $7F50C7 - Ice Physics Modifier
-; $7F50C8 - Infinite Arrows Modifier
-; $7F50C9 - Infinite Bombs Modifier
-; $7F50CA - Infinite Magic Modifier
-; $7F50CB - Invert D-Pad (Fill in values)
-; $7F50CC - Temporary OHKO
-; $7F50CD - Sprite Swapper
-; $7F50CE - Boots Modifier (0=Off, 1=Always, 2=Never)
-
-; $7F50D0 - $7F50FF - Block Cypher Parameters
-; $7F5100 - $7F51FF - Block Cypher Buffer
-; $7F5200 - $7F52FF - RNG Pointer Block
-; $7F5300 - $7F53FF - Multiworld Block
-; $7F5400 - $7F540F - MSU Block
-; $7F5410 - $7F545F - Dungeon Tracking Block
-; $7F5460 - $7F56FF - Unused
-
-; $7F5700 - $7F57FF - Dialog Buffer
-;
-;================================================================================
-!BIGRAM = "$7EC900";
-; $7EC900 - Big RAM Buffer ($1F00)
-;================================================================================
 org $30A100 ; PC 0x182100 - 0x182304
 EntranceDoorFrameTable:
 ; data for multi-entrance caves
diff --git a/tablets.asm b/tablets.asm
index 0f299ef..2107a0c 100644
--- a/tablets.asm
+++ b/tablets.asm
@@ -2,25 +2,25 @@
 ; Randomize Tablets
 ;--------------------------------------------------------------------------------
 ItemSet_EtherTablet:
-	PHA : LDA NpcFlags+1 : ORA.b #$01 : STA NpcFlags+1 : PLA
+	PHA : LDA.l NpcFlags+1 : ORA.b #$01 : STA.l NpcFlags+1 : PLA
 RTL
 ;--------------------------------------------------------------------------------
 ItemSet_BombosTablet:
-	PHA : LDA NpcFlags+1 : ORA.b #$02 : STA NpcFlags+1 : PLA
+	PHA : LDA.l NpcFlags+1 : ORA.b #$02 : STA.l NpcFlags+1 : PLA
 RTL
 ;--------------------------------------------------------------------------------
 ItemCheck_EtherTablet:
-	LDA NpcFlags+1 : AND.b #$01
+	LDA.l NpcFlags+1 : AND.b #$01
 RTL
 ;--------------------------------------------------------------------------------
 ItemCheck_BombosTablet:
-	LDA NpcFlags+1 : AND.b #$02
+	LDA.l NpcFlags+1 : AND.b #$02
 RTL
 ;--------------------------------------------------------------------------------
 SetTabletItem:
 	JSL.l GetSpriteID
 	PHA
-		LDA $8A : CMP.b #$03 : BEQ .ether ; if we're on the map where ether is, we're the ether tablet
+		LDA.b $8A : CMP.b #$03 : BEQ .ether ; if we're on the map where ether is, we're the ether tablet
 		.bombos
 		JSL.l ItemSet_BombosTablet : BRA .done
 		.ether
@@ -36,23 +36,23 @@ SpawnTabletItem:
 	PHA
 	JSL.l PrepDynamicTile
 	
-	LDA.b #$01 : STA !FORCE_HEART_SPAWN : STA !SKIP_HEART_SAVE
+	LDA.b #$01 : STA.l ForceHeartSpawn : STA.l SkipHeartSave
 	JSL.l SetTabletItem
 	
 	LDA.b #$EB
-	STA $7FFE00
+	STA.l $7FFE00
 	JSL Sprite_SpawnDynamically
 
-	PLA : STA $0E80, Y ; Store item type
-	LDA $22 : STA $0D10, Y
-	LDA $23 : STA $0D30, Y
+	PLA : STA.w $0E80, Y ; Store item type
+	LDA.b $22 : STA.w $0D10, Y
+	LDA.b $23 : STA.w $0D30, Y
+  
+	LDA.b $20 : STA.w $0D00, Y
+	LDA.b $21 : STA.w $0D20, Y
 
-	LDA $20 : STA $0D00, Y
-	LDA $21 : STA $0D20, Y
-
-	LDA.b #$00 : STA $0F20, Y
+	LDA.b #$00 : STA.w $0F20, Y
 	
-	LDA.b #$7F : STA $0F70, Y ; spawn WAY up high
+	LDA.b #$7F : STA.w $0F70, Y ; spawn WAY up high
 RTL
 ;--------------------------------------------------------------------------------
 MaybeUnlockTabletAnimation:
@@ -60,13 +60,13 @@ MaybeUnlockTabletAnimation:
 		JSL.l IsMedallion : BCC +
 			STZ $0112 ; disable falling-medallion mode
 			STZ $03EF ; release link from item-up pose
-			LDA.b #$00 : STA $5D ; set link to ground state
+			LDA.b #$00 : STA.b $5D ; set link to ground state
 			
 			REP #$20 ; set 16-bit accumulator
-				LDA $8A : CMP.w #$0030 : BNE ++ ; Desert
+				LDA.b $8A : CMP.w #$0030 : BNE ++ ; Desert
 					SEP #$20 ; set 8-bit accumulator
-					LDA.b #$02 : STA $2F ; face link forward
-					LDA.b #$3C : STA $46 ; lock link for 60f
+					LDA.b #$02 : STA.b $2F ; face link forward
+					LDA.b #$3C : STA.b $46 ; lock link for 60f
 				++
 			SEP #$20 ; set 8-bit accumulator
 		+
@@ -75,15 +75,15 @@ RTL
 ;--------------------------------------------------------------------------------
 IsMedallion:
 	REP #$20 ; set 16-bit accumulator
-	LDA $8A
+	LDA.b $8A
 	CMP.w #$03 : BNE + ; Death Mountain
-		LDA $22 : CMP.w #1890 : !BGE ++
+		LDA.b $22 : CMP.w #1890 : !BGE ++
 			SEC
 			JMP .done
 		++
 		BRA .false
 	+ CMP.w #$30 : BNE + ; Desert
-		LDA $22 : CMP.w #512 : !BLT ++
+		LDA.b $22 : CMP.w #512 : !BLT ++
 			SEC
 			JMP .done
 		++
@@ -95,7 +95,7 @@ IsMedallion:
 RTL
 ;--------------------------------------------------------------------------------
 LoadNarrowObject:
-	LDA.l AddReceivedItemExpanded_wide_item_flag, X : STA ($92), Y ; AddReceiveItem.wide_item_flag?
+	LDA.l AddReceivedItemExpanded_wide_item_flag, X : STA.b ($92), Y ; AddReceiveItem.wide_item_flag?
 RTL
 ;--------------------------------------------------------------------------------
 DrawNarrowDroppedObject:
@@ -106,28 +106,28 @@ DrawNarrowDroppedObject:
     REP #$20
     
     ; Shift Y coordinate 8 pixels down
-    LDA $08 : STA $00
+    LDA.b Scrap08 : STA.b Scrap00
     
     SEP #$20
     
     JSL.l Ancilla_SetOam_XY_Long
     
     ; always use the same character graphic (0x34)
-    LDA.b #$34 : STA ($90), Y : INY
+    LDA.b #$34 : STA.b ($90), Y : INY
     
     LDA.l AddReceivedItemExpanded_properties, X : BPL .valid_lower_properties
     
-    LDA $74
+    LDA.b $74
 
 .valid_lower_properties
 
-    ASL A : ORA.b #$30 : STA ($90), Y 
+    ASL A : ORA.b #$30 : STA.b ($90), Y 
     
     INY : PHY
     
     TYA : !SUB.b #$04 : LSR #2 : TAY
     
-    LDA.b #$00 : STA ($92), Y
+    LDA.b #$00 : STA.b ($92), Y
     
     PLY
 .large_sprite
diff --git a/textrenderer.asm b/textrenderer.asm
index cbe880b..54de38d 100644
--- a/textrenderer.asm
+++ b/textrenderer.asm
@@ -1,103 +1,101 @@
-!INVERTED_TEMP = $35
-
 RenderCharSetColorExtended_init:
-    stz !INVERTED_TEMP
+    stz.b Scrap0C
     jsl $00d84e
     rtl
 
 RenderCharSetColorExtended_close:
-    stz !INVERTED_TEMP
+    stz.b Scrap0C
     lda $010c
     sta $10
     rtl
 
 RenderCharSetColorExtended:
     pha
-    and #$10
-    cmp #$10
+    and.b #$10
+    cmp.b #$10
     beq .inverted
-    lda #$00
+    lda.b #$00
     bra .end
 .inverted
-    lda #$01
+    lda.b #$01
 .end
-    sta !INVERTED_TEMP
+    sta.b Scrap0C
     pla
-    and #$07 : asl : asl
+    and.b #$07 : asl : asl
     rtl
 
 RenderCharToMapExtended:
     phx : tya : asl #2 : tax
     lda.l FontProperties, x
-    and #$0001
+    and.w #$0001
     bne .uncompressed
 .compressed
     plx
-    lda #$0000
-    sta $00
+    lda.w #$0000
+    sta.b Scrap00
     lda #$007f
-    sta $02
-    lda #$0000
-    clc : adc #$0020
-    sta $03
-    lda #$007f
-    sta $05
+    sta.b Scrap02
+    lda.w #$0000
+    clc : adc.w #$0020
+    sta.b Scrap03
+    lda.w #$007f
+    sta.b Scrap05
     jml RenderCharToMapExtended_return
 
 .uncompressed    
     lda.l FontProperties+$2, x
     plx
-    clc : adc #(NewFont&$ffff)
-    sta $00
-    clc : adc #$0100
+    clc : adc.w #(NewFont&$ffff)
+    sta.b Scrap00
+    clc : adc.w #$0100
     pha
-    lda #(NewFont>>16)
-    sta $02
-    pla : sta $03
-    lda #(NewFont>>16)
-    sta $05
+    lda.w #(NewFont>>16)
+    sta.b Scrap02
+    pla : sta.b Scrap03
+    lda.w #(NewFont>>16)
+    sta.b Scrap05
     jml RenderCharToMapExtended_return
 
 RenderCharLookupWidthDraw:
     rep #$30
-    phx : lda $09 : and #$fffe : tax
+    phx : lda.b Scrap09 : and.w #$fffe : tax
     lda.l FontProperties, x
     bmi .thin
 .wide
     plx : sep #$30
-    lda $09 : and #$03 : tay
-    lda $fd7c, y : tay
+    lda.b Scrap09 : and.b #$03 : tay
+    lda.w $fd7c, y : tay
     jml RenderCharLookupWidthDraw_return
 .thin
-    xba : and #$004f : bne .vwf
+    xba : and.w #$004f : bne .vwf
     plx : sep #$30
-    lda $09 : and #$03 : phx : tax
+    lda.b Scrap09 : and.b #$03 : phx : tax
     lda.l RenderCharThinTable, x : tay : plx
     jml RenderCharLookupWidthDraw_return
 .vwf
-    and #$000f : tay
+    and.w #$000f : tay
     plx : sep #$30
-    lda $09 : and #$03 : phx : tax
-    cpx #$00 : bne +
+    lda.b Scrap09 : and.b #$03 : phx : tax
+    cpx.b #$00 : bne +
     tya : bra ++
 +   lda.l RenderCharThinTable, x
 ++  tay : plx : jml RenderCharLookupWidthDraw_return
 
 
 RenderCharLookupWidth:
-    phx : lda $09 : and #$fffe : tax
+    phx : lda.b Scrap09 : and.w #$fffe : tax
     lda.l FontProperties, x
     bmi .thin
 .wide
-    plx : lda $fd7c, x : clc
+    plx : lda.w $fd7c, x : clc
     rtl
 .thin
-    xba : and #$004f : bne .vwf
+    xba : and.w #$004f : bne .vwf
     plx : lda.l RenderCharThinTable, x : clc
     rtl
 .vwf
-    and #$000f     
-    plx : cpx #$0000 : beq + : lda.l RenderCharThinTable, x
+    and.w #$000f     
+    plx : cpx.w #$0000 : beq + : lda.l RenderCharThinTable, x
 +   clc : rtl
 
 RenderCharThinTable:
@@ -107,11 +105,11 @@ RenderCharExtended:
     pha
     asl : asl : tax
     lda.l FontProperties, x
-    and #$00ff
+    and.w #$00ff
     bne .renderUncompressed
 
 .renderOriginal
-    pla : asl : tax : asl : adc $0e
+    pla : asl : tax : asl : adc.b Scrap0E
     jml RenderCharExtended_returnOriginal
 
 .renderUncompressed
@@ -119,31 +117,31 @@ RenderCharExtended:
     lda.l FontProperties+$2, x
     tay
 
-    lda !INVERTED_TEMP
+    lda.b Scrap0C
     bne .inverted
 
-    ldx #$00000
+    ldx.w #$0000
 -
     lda.w NewFont, y
     sta.l $7EBFC0, x
     lda.w NewFont+$100, y
     sta.l $7EBFC0+$16, x
-    inx #2
-    iny #2
-    cpx #$0010
+    inx #02
+    iny #02
+    cpx.w #$0010
     bne -
     bra .end
 
 .inverted
-    ldx #$00000
+    ldx.w #$0000
 -
     lda.w NewFontInverted, y
     sta.l $7EBFC0, x
     lda.w NewFontInverted+$100, y
     sta.l $7EBFC0+$16, x
-    inx #2
-    iny #2
-    cpx #$0010
+    inx #02
+    iny #02
+    cpx.w #$0010
     bne -
 
 .end    
@@ -430,4 +428,4 @@ FontProperties:
     dw $0000, $0000     ; FC
     dw $0000, $0000     ; FD
     dw $0000, $0000     ; FE
-    dw $8001, $0EF0     ; FF ; <sp>
\ No newline at end of file
+    dw $8001, $0EF0     ; FF ; <sp>
diff --git a/timer.asm b/timer.asm
index 1623831..cbc2bf4 100644
--- a/timer.asm
+++ b/timer.asm
@@ -1,43 +1,31 @@
 ;================================================================================
 ; Challenge Timer
 ;================================================================================
-!Temp = "$7F5020"
-!TemporaryOHKO = "$7F50CC"
 ;--------------------------------------------------------------------------------
-!CLOCK_HOURS = "$7F5080" ; $7F5080 - $7F5083 - Clock Hours
-!CLOCK_MINUTES = "$7F5084" ; $7F5084 - $7F5087 - Clock Minutes
-!CLOCK_SECONDS = "$7F5088" ; $7F5088 - $7F508B - Clock Seconds
-!CLOCK_TEMPORARY = "$7F508C" ; $7F508C - $7F508F - Clock Temporary
-;--------------------------------------------------------------------------------
-!FRAMES_PER_SECOND = #60
-!FRAMES_PER_MINUTE = #60*60
-!FRAMES_PER_HOUR = #60*60*60
-;--------------------------------------------------------------------------------
-!Status = "$7F507E"
-; ---- --dn
-; d - dnf
-; n - negative
+!FRAMES_PER_SECOND = 60
+!FRAMES_PER_MINUTE = 60*60
+!FRAMES_PER_HOUR = 60*60*60
 ;--------------------------------------------------------------------------------
 macro DecIncr(value)
-	LDA.l <value> : INC
+	LDA.w <value> : INC
 		CMP.w #$000A : !BLT ?noIncr
-			LDA.l <value>+2 : INC : STA.l <value>+2
+			LDA.w <value>+2 : INC : STA.w <value>+2
 			LDA.w #$0000
 		?noIncr:
-	STA.l <value>
+	STA.w <value>
 endmacro
 ;--------------------------------------------------------------------------------
 macro Sub32(minuend,subtrahend,result)
 	LDA.l <minuend>
 	!SUB.l <subtrahend>		; perform subtraction on the LSBs
-	STA.l <result>
+	STA.w <result>
 	LDA.l <minuend>+2		; do the same for the MSBs, with carry
 	SBC.l <subtrahend>+2	; set according to the previous result
-	STA.l <result>+2
+	STA.w <result>+2
 endmacro
 ;--------------------------------------------------------------------------------
 macro Blt32(value1,value2)
-	LDA.l <value1>+2
+	LDA.w <value1>+2
 	CMP.l <value2>+2
 	!BLT ?done
 	BNE ?done
@@ -48,33 +36,33 @@ endmacro
 ;--------------------------------------------------------------------------------
 CalculateTimer:
 	LDA.w #$0000
-	STA.l !CLOCK_HOURS ; clear digit storage
-	STA.l !CLOCK_HOURS+2
-	STA.l !CLOCK_MINUTES
-	STA.l !CLOCK_MINUTES+2
-	STA.l !CLOCK_SECONDS
-	STA.l !CLOCK_SECONDS+2
+	STA.w ClockHours ; clear digit storage
+	STA.w ClockHours+2
+	STA.w ClockMinutes
+	STA.w ClockMinutes+2
+	STA.w ClockSeconds
+	STA.w ClockSeconds+2
 
 	LDA.l TimerStyle : AND.w #$00FF : CMP.w #$0002 : BNE + ; Stopwatch Mode
-		%Sub32(NMIFrames,ChallengeTimer,!CLOCK_TEMPORARY)
+		%Sub32(NMIFrames,ChallengeTimer,ClockBuffer)
 		BRA ++
 	+ CMP.w #$0001 : BNE ++ ; Countdown Mode
-		%Sub32(ChallengeTimer,NMIFrames,!CLOCK_TEMPORARY)
+		%Sub32(ChallengeTimer,NMIFrames,ClockBuffer)
 	++
 
-	%Blt32(!CLOCK_TEMPORARY,.halfCycle) : !BLT +
+	%Blt32(ClockBuffer,.halfCycle) : !BLT +
 		LDA.l TimeoutBehavior : AND.w #$00FF : BNE ++ ; DNF
-			LDA.w #$0002 : STA.l !Status ; Set DNF Mode
+			LDA.w #$0002 : STA.l ClockStatus ; Set DNF Mode
 			LDA.l NMIFrames : STA.l ChallengeTimer
 			LDA.l NMIFrames+2 : STA.l ChallengeTimer+2
 			RTS
 		++ CMP.w #$0001 : BNE ++ ; Negative Time
-			LDA.l !CLOCK_TEMPORARY : EOR.w #$FFFF : !ADD.w #$0001 : STA.l !CLOCK_TEMPORARY
-			LDA.l !CLOCK_TEMPORARY+2 : EOR.w #$FFFF : ADC.w #$0000 : STA.l !CLOCK_TEMPORARY+2
-			LDA.w #$0001 : STA.l !Status ; Set Negative Mode
+			LDA.w ClockBuffer : EOR.w #$FFFF : !ADD.w #$0001 : STA.w ClockBuffer
+			LDA.w ClockBuffer+2 : EOR.w #$FFFF : ADC.w #$0000 : STA.w ClockBuffer+2
+			LDA.w #$0001 : STA.l ClockStatus ; Set Negative Mode
 			BRA .prepDigits
 		++ CMP.w #$0002 : BNE ++ ; OHKO
-			LDA.w #$0002 : STA.l !Status ; Set DNF Mode
+			LDA.w #$0002 : STA.l ClockStatus ; Set DNF Mode
 			LDA.l NMIFrames : STA.l ChallengeTimer
 			LDA.l NMIFrames+2 : STA.l ChallengeTimer+2
 			RTS
@@ -86,30 +74,30 @@ CalculateTimer:
 	+
 
 	LDA.l TimerRestart : AND.w #$00FF : BEQ +
-		LDA.w #$0000 : STA.l !Status ; Set Positive Mode
+		LDA.w #$0000 : STA.l ClockStatus ; Set Positive Mode
 	+
 	.prepDigits
 
 	-
-		%Blt32(!CLOCK_TEMPORARY,.hour) : !BLT +
-		%DecIncr(!CLOCK_HOURS)
-		%Sub32(!CLOCK_TEMPORARY,.hour,!CLOCK_TEMPORARY) : BRA -
+		%Blt32(ClockBuffer,.hour) : !BLT +
+		%DecIncr(ClockHours)
+		%Sub32(ClockBuffer,.hour,ClockBuffer) : BRA -
 	+ -
-		%Blt32(!CLOCK_TEMPORARY,.minute) : !BLT +
-		%DecIncr(!CLOCK_MINUTES)
-		%Sub32(!CLOCK_TEMPORARY,.minute,!CLOCK_TEMPORARY) : BRA -
+		%Blt32(ClockBuffer,.minute) : !BLT +
+		%DecIncr(ClockMinutes)
+		%Sub32(ClockBuffer,.minute,ClockBuffer) : BRA -
 	+ -
-		%Blt32(!CLOCK_TEMPORARY,.second) : !BLT +
-		%DecIncr(!CLOCK_SECONDS)
-		%Sub32(!CLOCK_TEMPORARY,.second,!CLOCK_TEMPORARY) : BRA -
+		%Blt32(ClockBuffer,.second) : !BLT +
+		%DecIncr(ClockSeconds)
+		%Sub32(ClockBuffer,.second,ClockBuffer) : BRA -
 	+
 
-	LDA !CLOCK_HOURS : !ADD.w #$2490 : STA !CLOCK_HOURS ; convert decimal values to tiles
-	LDA !CLOCK_HOURS+2 : !ADD.w #$2490 : STA !CLOCK_HOURS+2
-	LDA !CLOCK_MINUTES : !ADD.w #$2490 : STA !CLOCK_MINUTES
-	LDA !CLOCK_MINUTES+2 : !ADD.w #$2490 : STA !CLOCK_MINUTES+2
-	LDA !CLOCK_SECONDS : !ADD.w #$2490 : STA !CLOCK_SECONDS
-	LDA !CLOCK_SECONDS+2 : !ADD.w #$2490 : STA !CLOCK_SECONDS+2
+	LDA.w ClockHours : !ADD.w #$2490 : STA.w ClockHours ; convert decimal values to tiles
+	LDA.w ClockHours+2 : !ADD.w #$2490 : STA.w ClockHours+2
+	LDA.w ClockMinutes : !ADD.w #$2490 : STA.w ClockMinutes
+	LDA.w ClockMinutes+2 : !ADD.w #$2490 : STA.w ClockMinutes+2
+	LDA.w ClockSeconds : !ADD.w #$2490 : STA.w ClockSeconds
+	LDA.w ClockSeconds+2 : !ADD.w #$2490 : STA.w ClockSeconds+2
 RTS
 ;--------------------------------------------------------------------------------
 .hour
@@ -121,67 +109,65 @@ dw #$003C, #$0000
 .halfCycle
 dw #$FFFF, #$7FFF
 ;--------------------------------------------------------------------------------
-!TEMPORARY_OHKO = "$7F50CC"
 DrawChallengeTimer:
-	LDA !TEMPORARY_OHKO : AND.w #$00FF : BEQ +
-    	LDA.w #$2807 : STA $7EC790
-		LDA.w #$280A : STA $7EC792
-		LDA.w #$280B : STA $7EC794
-		LDA.w #$280C : STA $7EC796
-		RTL
-	+
-    	LDA.w #$247F : STA $7EC790
-					   STA $7EC792
-					   STA $7EC794
-					   STA $7EC796
-	++
-	
-	LDA.l TimerStyle : BNE + : RTL : + ; Hud Timer
-    	LDA.w #$2807 : STA $7EC792
-    	
-    	LDA.l !Status : AND.w #$0002 : BEQ + ; DNF / OKHO
-    	
+	LDA.l OHKOFlag : AND.w #$00FF : BEQ +
+                LDA.w #$2807 : STA.l $7EC790
+                LDA.w #$280A : STA.l $7EC792
+                LDA.w #$280B : STA.l $7EC794
+                LDA.w #$280C : STA.l $7EC796
+                RTL
+        +
+        LDA.w #$247F : STA.l $7EC790
+        STA.l $7EC792
+        STA.l $7EC794
+        STA.l $7EC796
+        ++
+
+        LDA.l TimerStyle : BNE + : RTL : + ; Hud Timer
+        LDA.w #$2807 : STA.l $7EC792    	
+        LDA.l ClockStatus : AND.w #$0002 : BEQ + ; DNF / OKHO
+
 			LDA.l TimeoutBehavior : AND.w #$00FF : BNE ++ ; DNF
-				LDA.w #$2808 : STA $7EC794
-				LDA.w #$2809 : STA $7EC796
-				LDA.w #$247F : STA $7EC798
-				STA $7EC79A
+				LDA.w #$2808 : STA.l $7EC794
+				LDA.w #$2809 : STA.l $7EC796
+				LDA.w #$247F : STA.l $7EC798
+				STA.l $7EC79A
 				BRA +++
 			++ ; OHKO
-				LDA.w #$280A : STA $7EC794
-				LDA.w #$280B : STA $7EC796
-				LDA.w #$280C : STA $7EC798
-				LDA.w #$247F : STA $7EC79A
+				LDA.w #$280A : STA.l $7EC794
+				LDA.w #$280B : STA.l $7EC796
+				LDA.w #$280C : STA.l $7EC798
+				LDA.w #$247F : STA.l $7EC79A
 			+++
-			STA $7EC79C
-			STA $7EC79E
-			STA $7EC7A0
-			STA $7EC7A2
-			STA $7EC7A4
+			STA.l $7EC79C
+			STA.l $7EC79E
+			STA.l $7EC7A0
+			STA.l $7EC7A2
+			STA.l $7EC7A4
 			LDA.l TimerRestart : BNE +++ : RTL : +++
 			BRA ++
 		+ ; Show Timer
-	    	LDA.l !Status : AND.w #$0001 : !ADD.w #$2804 : STA $7EC794
-			LDA !CLOCK_HOURS+2 : STA $7EC796
-			LDA !CLOCK_HOURS : STA $7EC798
-	    	LDA.w #$2806 : STA $7EC79A
-			LDA !CLOCK_MINUTES+2 : STA $7EC79C
-			LDA !CLOCK_MINUTES : STA $7EC79E
-	    	LDA.w #$2806 : STA $7EC7A0
-			LDA !CLOCK_SECONDS+2 : STA $7EC7A2
-			LDA !CLOCK_SECONDS : STA $7EC7A4
+	    	LDA.l ClockStatus : AND.w #$0001 : !ADD.w #$2804 : STA.l $7EC794
+			LDA.w ClockHours+2 : STA.l $7EC796
+			LDA.w ClockHours : STA.l $7EC798
+	    	LDA.w #$2806 : STA.l $7EC79A
+			LDA.w ClockMinutes+2 : STA.l $7EC79C
+			LDA.w ClockMinutes : STA.l $7EC79E
+	    	LDA.w #$2806 : STA.l $7EC7A0
+			LDA.w ClockSeconds+2 : STA.l $7EC7A2
+			LDA.w ClockSeconds : STA.l $7EC7A4
 		++
-		LDA $1A : AND.w #$001F : BNE + : JSR CalculateTimer : +
+		LDA.b $1A : AND.w #$001F : BNE + : JSR CalculateTimer : +
 
 RTL
 ;--------------------------------------------------------------------------------
 OHKOTimer:
-	LDA !TemporaryOHKO : BNE .kill
-	LDA.l TimeoutBehavior : CMP #$02 : BNE +
-	LDA !Status : AND.b #$02 : BEQ +
+	LDA.l OHKOFlag : BNE .kill
+	LDA.l TimeoutBehavior : CMP.b #$02 : BNE +
+	LDA.l ClockStatus : AND.b #$02 : BEQ +
 		.kill
-		LDA.b #$00 : STA CurrentHealth ; kill link
+		LDA.b #$00 : STA.l CurrentHealth ; kill link
 	+
-	LDA CurrentHealth
+	LDA.l CurrentHealth
 RTL
 ;--------------------------------------------------------------------------------
diff --git a/toast.asm b/toast.asm
index d9d8137..3a43c8d 100644
--- a/toast.asm
+++ b/toast.asm
@@ -1,14 +1,12 @@
-!TOAST_BUFFER = "$7F5400" ; for now
-!TOAST_BUFFER_LOW = "$5400" ; for now
 ;--------------------------------------------------------------------------------
 ; DoToast:
 ; in:	A(w) - VRAM Destination
 ; in:	X(w) - Length in Tiles
 ;--------------------------------------------------------------------------------
 DoToast:
-	PHY : PHP
-		LDY.w !TOAST_BUFFER_LOW
-		JSL.l WriteVRAMBlock
-	PLP : PLY
+        PHY : PHP
+                LDY.w ToastBuffer
+                JSL.l WriteVRAMBlock
+        PLP : PLY
 RTL
-;--------------------------------------------------------------------------------
\ No newline at end of file
+;--------------------------------------------------------------------------------
diff --git a/utilities.asm b/utilities.asm
index 1611e82..775cb3e 100644
--- a/utilities.asm
+++ b/utilities.asm
@@ -52,13 +52,13 @@ RTL
 	++ CMP.b #$FB : BNE ++ ; RNG Item (Multi)
 		JSL.l GetRNGItemMulti : JMP GetSpriteID
 	++ CMP.b #$FD : BNE ++ ; Progressive Armor
-		LDA ArmorEquipment : CMP.l ProgressiveArmorLimit : !BLT + ; Progressive Armor Limit
+		LDA.l ArmorEquipment : CMP.l ProgressiveArmorLimit : !BLT + ; Progressive Armor Limit
 			LDA.l ProgressiveArmorReplacement
 			JMP GetSpriteID
 		+
 		LDA.b #$04 : RTL
 	++ CMP.b #$FE : BNE ++ ; Progressive Sword
-		LDA HighestSword
+		LDA.l HighestSword
 		CMP.l ProgressiveSwordLimit : !BLT + ; Progressive Sword Limit
 			LDA.l ProgressiveSwordReplacement
 			JMP GetSpriteID
@@ -72,7 +72,7 @@ RTL
 			LDA.b #$46 : RTL
 		+
 	++ : CMP.b #$FF : BNE ++ ; Progressive Shield
-		LDA HighestShield
+		LDA.l HighestShield
 		CMP.l ProgressiveShieldLimit : !BLT + ; Progressive Shield Limit
 			LDA.l ProgressiveShieldReplacement
 			JMP GetSpriteID
@@ -83,7 +83,7 @@ RTL
 		+ ; Everything Else
 			LDA.b #$2E : RTL
 	++ : CMP.b #$F8 : BNE ++ ; Progressive Bow
-		LDA BowEquipment : INC : LSR
+		LDA.l BowEquipment : INC : LSR
 		CMP.l ProgressiveBowLimit : !BLT +
 			LDA.l ProgressiveBowReplacement
 			JMP GetSpriteID
@@ -181,7 +181,7 @@ GetSpritePalette:
 RTL
 	.specialHandling
 	CMP.b #$FD : BNE ++ ; Progressive Sword
-		LDA HighestSword
+		LDA.l HighestSword
 		CMP.l ProgressiveSwordLimit : !BLT + ; Progressive Sword Limit
 			LDA.l ProgressiveSwordReplacement
 			JMP GetSpritePalette
@@ -194,7 +194,7 @@ RTL
 		+ ; Everything Else
 			LDA.b #$08 : RTL
 	++ : CMP.b #$FE : BNE ++ ; Progressive Shield
-		LDA HighestShield
+		LDA.l HighestShield
 		CMP.l ProgressiveShieldLimit : !BLT + ; Progressive Shield Limit
 			LDA.l ProgressiveShieldReplacement
 			JMP GetSpritePalette
@@ -205,7 +205,7 @@ RTL
 		+ ; Everything Else
 			LDA.b #$08 : RTL
 	++ : CMP.b #$FF : BNE ++ ; Progressive Armor
-		LDA HighestMail
+		LDA.l HighestMail
                 CMP.l ProgressiveArmorLimit : !BLT + ; Progressive Armor Limit
 			LDA.l ProgressiveArmorReplacement
 			JMP GetSpritePalette
@@ -214,12 +214,12 @@ RTL
 		+ ; Everything Else
 			LDA.b #$02 : RTL
 	++ : CMP.b #$FC : BNE ++ ; Progressive Gloves
-		LDA GloveEquipment : BNE + ; No Gloves
+		LDA.l GloveEquipment : BNE + ; No Gloves
 			LDA.b #$02 : RTL
 		+ ; Everything Else
 			LDA.b #$08 : RTL
 	++ : CMP.b #$F8 : BNE ++ ; Progressive Bow
-		LDA BowEquipment : INC : LSR
+		LDA.l BowEquipment : INC : LSR
 		CMP.l ProgressiveBowLimit : !BLT +
 			LDA.l ProgressiveBowReplacement
 			JMP GetSpritePalette
@@ -306,19 +306,19 @@ IsNarrowSprite:
 			+ : JMP .continue
 		.notBottle
 	CMP.b #$5E : BNE ++ ; Progressive Sword
-		LDA HighestSword : CMP.l ProgressiveSwordLimit : !BLT + ; Progressive Sword Limit
+		LDA.l HighestSword : CMP.l ProgressiveSwordLimit : !BLT + ; Progressive Sword Limit
 			LDA.l ProgressiveSwordReplacement
 			JSL.l IsNarrowSprite
 			JMP .done
 		+ : JMP .continue
 	++ CMP.b #$5F : BNE ++ ; Progressive Shield
-		LDA HighestShield : BNE + : JMP .done ; No Shield
+		LDA.l HighestShield : BNE + : JMP .done ; No Shield
 		+ : CMP.l ProgressiveShieldLimit : !BLT .continue
 			LDA.l ProgressiveShieldReplacement
 			JSL.l IsNarrowSprite
 			JMP .done
 	++ CMP.b #$60 : BNE ++ ; Progressive Armor
-		LDA HighestMail : CMP.l ProgressiveArmorLimit : !BLT .continue
+		LDA.l HighestMail : CMP.l ProgressiveArmorLimit : !BLT .continue
 			LDA.l ProgressiveArmorReplacement
 			JSL.l IsNarrowSprite
 			JMP .done
@@ -329,7 +329,7 @@ IsNarrowSprite:
 		JSL.l GetRNGItemMulti
 	++ CMP.b #$64 : BEQ +               ; Progressive Bow
            CMP.b #$65 : BNE .continue       ; Progressive Bow (alt)
-                + : LDA BowEquipment : INC : LSR
+                + : LDA.l BowEquipment : INC : LSR
                 CMP.l ProgressiveBowLimit : !BLT +
 			LDA.l ProgressiveBowReplacement
 			JSL.l IsNarrowSprite
@@ -384,23 +384,21 @@ RTL
 ; LoadDynamicTileOAMTable
 ; in:	A - Loot ID
 ;-------------------------------------------------------------------------------- 20/847B
-!SPRITE_OAM = "$7EC025"
-;--------------------------------------------------------------------------------
 LoadDynamicTileOAMTable:
 	PHA : PHP
 
 	PHA
 		REP #$20 ; set 16-bit accumulator
-		LDA.w #$0000 : STA.l !SPRITE_OAM
-		               STA.l !SPRITE_OAM+2
-		LDA.w #$0200 : STA.l !SPRITE_OAM+6
+		LDA.w #$0000 : STA.l SpriteOAM
+		               STA.l SpriteOAM+2
+		LDA.w #$0200 : STA.l SpriteOAM+6
 		SEP #$20 ; set 8-bit accumulator
-		LDA.b #$24 : STA.l !SPRITE_OAM+4
+		LDA.b #$24 : STA.l SpriteOAM+4
 
-	LDA $01,s
+	LDA.b $01,s
 
 		JSL.l GetSpritePalette
-		STA !SPRITE_OAM+5 : STA !SPRITE_OAM+13
+		STA.l SpriteOAM+5 : STA.l SpriteOAM+13
 	PLA
 	JSL.l IsNarrowSprite : BCS .narrow
 
@@ -408,10 +406,10 @@ LoadDynamicTileOAMTable:
 
 	.narrow
 	REP #$20 ; set 16-bit accumulator
-	LDA.w #$0000 : STA.l !SPRITE_OAM+7
-	               STA.l !SPRITE_OAM+14
-	LDA.w #$0800 : STA.l !SPRITE_OAM+9
-	LDA.w #$3400 : STA.l !SPRITE_OAM+11
+	LDA.w #$0000 : STA.l SpriteOAM+7
+	               STA.l SpriteOAM+14
+	LDA.w #$0800 : STA.l SpriteOAM+9
+	LDA.w #$3400 : STA.l SpriteOAM+11
 
 	.done
 	PLP : PLA
@@ -425,35 +423,32 @@ RTS
 ;--------------------------------------------------------------------------------
 ; This wastes two OAM slots if you don't want a shadow - fix later - I wrote "fix later" over a year ago and it's still not fixed (Aug 6, 2017) - lol (May 25th, 2019)
 ;-------------------------------------------------------------------------------- 2084B8
-!SPRITE_OAM = "$7EC025"
-!SKIP_EOR = "$7F5008"
-;--------------------------------------------------------------------------------
 DrawDynamicTile:
 	JSL.l IsNarrowSprite : BCS .narrow
 
 	.full
-	LDA.b #$01 : STA $06
-	LDA #$0C : JSL.l OAM_AllocateFromRegionC
-	LDA #$02 : PHA
+	LDA.b #$01 : STA.b Scrap06
+	LDA.b #$0C : JSL.l OAM_AllocateFromRegionC
+	LDA.b #$02 : PHA
 	BRA .draw
 
 	.narrow
-	LDA.b #$02 : STA $06
-	LDA #$10 : JSL.l OAM_AllocateFromRegionC
-	LDA #$03 : PHA
+	LDA.b #$02 : STA.b Scrap06
+	LDA.b #$10 : JSL.l OAM_AllocateFromRegionC
+	LDA.b #$03 : PHA
 
 	.draw
-	LDA.b #!SPRITE_OAM>>0 : STA $08
-	LDA.b #!SPRITE_OAM>>8 : STA $09
-	STZ $07
-	LDA #$7E : PHB : PHA : PLB
-		LDA.b #$01 : STA.l !SKIP_EOR
+	LDA.b #SpriteOAM>>0 : STA.b Scrap08
+	LDA.b #SpriteOAM>>8 : STA.b Scrap09
+	STZ.b Scrap07
+	LDA.b #$7E : PHB : PHA : PLB
+		LDA.b #$01 : STA.l SpriteSkipEOR
 		JSL Sprite_DrawMultiple_quantity_preset
-		LDA.b #$00 : STA.l !SKIP_EOR
+		LDA.b #$00 : STA.l SpriteSkipEOR
 	PLB
 
-	LDA $90 : !ADD.b #$08 : STA $90 ; leave the pointer in the right spot to draw the shadow, if desired
-	LDA $92 : INC #2 : STA $92
+	LDA.b $90 : !ADD.b #$08 : STA.b $90 ; leave the pointer in the right spot to draw the shadow, if desired
+	LDA.b $92 : INC #2 : STA.b $92
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
@@ -461,37 +456,36 @@ DrawDynamicTileNoShadow:
 	JSL.l IsNarrowSprite : BCS .narrow
 
 	.full
-	LDA.b #$01 : STA $06
-	LDA #$04 : JSL.l OAM_AllocateFromRegionC
+	LDA.b #$01 : STA.b Scrap06
+	LDA.b #$04 : JSL.l OAM_AllocateFromRegionC
 	BRA .draw
 
 	.narrow
-	LDA.b #$02 : STA $06
-	LDA #$08 : JSL.l OAM_AllocateFromRegionC
+	LDA.b #$02 : STA.b Scrap06
+	LDA.b #$08 : JSL.l OAM_AllocateFromRegionC
 
 	.draw
-	LDA.b #!SPRITE_OAM>>0 : STA $08
-	LDA.b #!SPRITE_OAM>>8 : STA $09
-	STZ $07
-	LDA #$7E : PHB : PHA : PLB
-		LDA.b #$01 : STA.l !SKIP_EOR
+	LDA.b #SpriteOAM>>0 : STA.b Scrap06
+	LDA.b #SpriteOAM>>8 : STA.b Scrap06
+	STZ.b Scrap07
+	LDA.b #$7E : PHB : PHA : PLB
+		LDA.b #$01 : STA.l SpriteSkipEOR
 		JSL Sprite_DrawMultiple_quantity_preset
-		LDA Bob : BNE + : LDA.b #$00 : STA.l !SKIP_EOR : + ; Bob fix is conditional
+		LDA.l Bob : BNE + : LDA.b #$00 : STA.l SpriteSkipEOR : + ; Bob fix is conditional
 	PLB
 
-	LDA $90 : !ADD.b #$08 : STA $90
-	LDA $92 : INC #2 : STA $92
+	LDA.b $90 : !ADD.b #$08 : STA.b $90
+	LDA.b $92 : INC #2 : STA.b $92
 RTL
 ;--------------------------------------------------------------------------------
 
 ;--------------------------------------------------------------------------------
-!TILE_UPLOAD_OFFSET_OVERRIDE = "$7F5042"
 LoadModifiedTileBufferAddress:
 	PHA
-	LDA !TILE_UPLOAD_OFFSET_OVERRIDE : BEQ +
+	LDA.l TileUploadOffsetOverride : BEQ +
 		TAX
     	LDY.w #$0002
-		LDA.w #$0000 : STA !TILE_UPLOAD_OFFSET_OVERRIDE
+		LDA.w #$0000 : STA.l TileUploadOffsetOverride
 		BRA .done
 	+
     LDX.w #$2D40
@@ -510,23 +504,23 @@ Sprite_IsOnscreen:
     JSR _Sprite_IsOnscreen_DoWork
 	BCS +
 		REP #$20
-		LDA $E2 : PHA : !SUB.w #$0F : STA $E2
-		LDA $E8 : PHA : !SUB.w #$0F : STA $E8
+		LDA.b $E2 : PHA : !SUB.w #$0F : STA.b $E2
+		LDA.b $E8 : PHA : !SUB.w #$0F : STA.b $E8
 		SEP #$20
 			JSR _Sprite_IsOnscreen_DoWork
 		REP #$20
-		PLA : STA $E8
-		PLA : STA $E2
+		PLA : STA.b $E8
+		PLA : STA.b $E2
 		SEP #$20
 	+
 RTL
 
 _Sprite_IsOnscreen_DoWork:
-    LDA $0D10, X : CMP $E2
-    LDA $0D30, X : SBC $E3 : BNE .offscreen
+    LDA.w $0D10, X : CMP.b $E2
+    LDA.w $0D30, X : SBC.b $E3 : BNE .offscreen
 
-    LDA $0D00, X : CMP $E8
-    LDA $0D20, X : SBC $E9 : BNE .offscreen
+    LDA.w $0D00, X : CMP.b $E8
+    LDA.w $0D20, X : SBC.b $E9 : BNE .offscreen
 	SEC
 RTS
 	.offscreen
@@ -543,80 +537,63 @@ RTS
 ;--------------------------------------------------------------------------------
 ; Copied from bank $06
 ;--------------------------------------------------------------------------------
-!spr_y_lo = $00
-!spr_y_hi = $01
-
-!spr_x_lo = $02
-!spr_x_hi = $03
-
-!spr_y_screen_rel = $06
-!spr_x_screen_rel = $07
-;--------------------------------------------------------------------------------
 Sprite_GetScreenRelativeCoords:
-	STY $0B
+	STY.b Scrap0B
 
-	STA $08
+	STA.b Scrap08
 
-	LDA $0D00, X : STA $00
-	!SUB $E8     : STA $06
-	LDA $0D20, X : STA $01
+	LDA.w $0D00, X : STA.b Scrap00
+	!SUB $E8       : STA.b Scrap06
+	LDA.w $0D20, X : STA.b Scrap01
 
-	LDA $0D10, X : STA $02
-	!SUB $E2     : STA $07
-	LDA $0D30, X : STA $03
+	LDA.w $0D10, X : STA.b Scrap02 
+	!SUB $E2       : STA.b Scrap07
+	LDA.w $0D30, X : STA.b Scrap03
 RTL
 ;--------------------------------------------------------------------------------
 
 ;--------------------------------------------------------------------------------
 ; SkipDrawEOR - Shims in Bank05.asm : 2499
 ;--------------------------------------------------------------------------------
-!SKIP_EOR = "$7F5008"
-;--------------------------------------------------------------------------------
 SkipDrawEOR:
-	LDA.l !SKIP_EOR : BEQ .normal
-	LDA.w #$0000 : STA.l !SKIP_EOR
-	LDA $04 : AND.w #$F0FF : STA $04
+	LDA.l SpriteSkipEOR : BEQ .normal
+	LDA.w #$0000 : STA.l SpriteSkipEOR
+	LDA.w Scrap04 : AND.w #$F0FF : STA.w Scrap04
 	.normal
-	LDA ($08), Y : EOR $04 ; thing we wrote over
+	LDA.b ($08), Y : EOR.w Scrap04 ; thing we wrote over
 RTL
 ;--------------------------------------------------------------------------------
 
 ;--------------------------------------------------------------------------------
 ; HexToDec
 ; in:	A(w) - Word to Convert
-; out:	$7F5003 - $7F5007 (high - low)
+; out:	$7F5004 - $7F5007 (high - low)
 ;--------------------------------------------------------------------------------
 HexToDec:
 	PHA
 	PHA
 		LDA.w #$9090
-		STA $04 : STA $06 ; temporarily store our decimal values here for speed
+		STA.b Scrap04 : STA.b Scrap06 ; temporarily store our decimal values here for speed
 	PLA
-; as far as i can tell we never convert a value larger than 9999, no point in wasting time on this?
-;	-
-;		CMP.w #10000 : !BLT +
-;		INC $03
-;		!SUB.w #10000 : BRA -
-;	+
 	-
 		CMP.w #1000 : !BLT +
-		INC $04
+		INC.b Scrap04
 		!SUB.w #1000 : BRA -
 	+ -
 		CMP.w #100 : !BLT +
-		INC $05
+		INC.b Scrap05
 		!SUB.w #100 : BRA -
 	+ -
 		CMP.w #10 : !BLT +
-		INC $06
+		INC.b Scrap06
 		!SUB.w #10 : BRA -
 	+ -
 		CMP.w #1 : !BLT +
-		INC $07
+		INC.b Scrap07
 		!SUB.w #1 : BRA -
 	+
-	LDA.b $04 : STA $7F5004 ; move to digit storage
-	LDA.b $06 : STA $7F5006
+	LDA.b Scrap04 : STA.l $7F5004 ; move to digit storage
+	LDA.b Scrap06 : STA.l $7F5006
 	PLA
 RTL
 
@@ -655,27 +632,27 @@ db #00, #01, #01, #02, #01, #02, #02, #03, #01, #02, #02, #03, #02, #03, #03, #0
 ;	PHA
 ;	PHA
 ;		LDA.w #$9090
-;		STA $7F5003 : STA $7F5005 : STA $7F5006 ; clear digit storage
+;		STA.l $7F5003 : STA.l $7F5005 : STA.l $7F5006 ; clear digit storage
 ;	PLA
 ;	-
 ;		CMP.w #10000 : !BLT +
-;		PHA : SEP #$20 : LDA $7F5003 : INC : STA $7F5003 : REP #$20 : PLA
+;		PHA : SEP #$20 : LDA.l $7F5003 : INC : STA.l $7F5003 : REP #$20 : PLA
 ;		!SUB.w #10000 : BRA -
 ;	+ -
 ;		CMP.w #1000 : !BLT +
-;		PHA : SEP #$20 : LDA $7F5004 : INC : STA $7F5004 : REP #$20 : PLA
+;		PHA : SEP #$20 : LDA.l $7F5004 : INC : STA.l $7F5004 : REP #$20 : PLA
 ;		!SUB.w #1000 : BRA -
 ;	+ -
 ;		CMP.w #100 : !BLT +
-;		PHA : SEP #$20 : LDA $7F5005 : INC : STA $7F5005 : REP #$20 : PLA
+;		PHA : SEP #$20 : LDA.l $7F5005 : INC : STA.l $7F5005 : REP #$20 : PLA
 ;		!SUB.w #100 : BRA -
 ;	+ -
 ;		CMP.w #10 : !BLT +
-;		PHA : SEP #$20 : LDA $7F5006 : INC : STA $7F5006 : REP #$20 : PLA
+;		PHA : SEP #$20 : LDA.l $7F5006 : INC : STA.l $7F5006 : REP #$20 : PLA
 ;		!SUB.w #10 : BRA -
 ;	+ -
 ;		CMP.w #1 : !BLT +
-;		PHA : SEP #$20 : LDA $7F5007 : INC : STA $7F5007 : REP #$20 : PLA
+;		PHA : SEP #$20 : LDA.l $7F5007 : INC : STA.l $7F5007 : REP #$20 : PLA
 ;		!SUB.w #1 : BRA -
 ;	+
 ;	PLA
@@ -691,13 +668,13 @@ db #00, #01, #01, #02, #01, #02, #02, #03, #01, #02, #02, #03, #02, #03, #03, #0
 WriteVRAMStripe:
 	PHX
 		LDX $1000 ; get pointer
-		AND.w #$7F : STA $1002, X : INX #2 ; set destination
-	PLA : ASL : AND.w #$7FFF : ORA.w #$7000 : STA $1002, X : INX #2 ; set length and enable RLE
-	TYA : STA $1002, X : INX #2 ; set tile
+		AND.w #$7F : STA.w $1002, X : INX #2 ; set destination
+	PLA : ASL : AND.w #$7FFF : ORA.w #$7000 : STA.w $1002, X : INX #2 ; set length and enable RLE
+	TYA : STA.w $1002, X : INX #2 ; set tile
 	SEP #$20 ; set 8-bit accumulator
-		LDA.b #$FF : STA $1002, X
-		STX $1000
-		LDA.b #01 : STA $14
+		LDA.b #$FF : STA.w $1002, X
+		STX.w $1000
+		LDA.b #01 : STA.b $14
 	REP #$20 ; set 16-bit accumulator
 RTL
 ;--------------------------------------------------------------------------------
@@ -709,27 +686,27 @@ RTL
 ; in:	Y(w) - Address of Data to Copy
 ;--------------------------------------------------------------------------------
 WriteVRAMBlock:
-	PHX
-		LDX $1000 ; get pointer
-		AND.w #$7F : STA $1002, X : INX #2 ; set destination
-	PLA : ASL : AND.w #$3FFF : STA $1002, X : INX #2 ; set length
+        PHX
+                LDX.w $1000 ; get pointer
+        AND.w #$7F : STA.w $1002, X : INX #2 ; set destination
+        PLA : ASL : AND.w #$3FFF : STA.w $1002, X : INX #2 ; set length
 
-	PHX
-		TYX ; set X to source
-		PHA
-			TXA : !ADD #$1002 : TAY ; set Y to dest
-		PLA
-		;A is already the value we need for mvn
-		MVN $7F7E ; currently we transfer from our buffers in 7F to the vram buffer in 7E
+        PHX
+                TYX ; set X to source
+                PHA
+                        TXA : !ADD #$1002 : TAY ; set Y to dest
+                PLA
+                ;A is already the value we need for mvn
+                MVN $7F7E ; currently we transfer from our buffers in 7F to the vram buffer in 7E
 
-		!ADD 1, s ; add the length in A to the stack pointer on the top of the stack
-	PLX : TAX ; pull and promptly ignore, copying the value we just got over it
+                !ADD 1, s ; add the length in A to the stack pointer on the top of the stack
+        PLX : TAX ; pull and promptly ignore, copying the value we just got over it
 
-	SEP #$20 ; set 8-bit accumulator
-		LDA.b #$FF : STA $1002, X
-		STX $1000
-		LDA.b #01 : STA $14
-	REP #$20 ; set 16-bit accumulator
+        SEP #$20 ; set 8-bit accumulator
+                LDA.b #$FF : STA.w $1002, X
+                STX.w $1000
+                LDA.b #01 : STA.w $14
+        REP #$20 ; set 16-bit accumulator
 RTL
 ;--------------------------------------------------------------------------------
 ;Byte 1   byte 2  Byte 3   byte 4
diff --git a/vanillalabels.asm b/vanillalabels.asm
new file mode 100644
index 0000000..8d0129e
--- /dev/null
+++ b/vanillalabels.asm
@@ -0,0 +1,304 @@
+org $008781
+UseImplicitRegIndexedLocalJumpTable:
+
+org $00879c
+UseImplicitRegIndexedLongJumpTable:
+
+org $008333
+Vram_EraseTilemaps_triforce:
+
+org $008913
+Sound_LoadLightWorldSongBank:
+org $00891D
+    .do_load
+
+org $00893D
+EnableForceBlank:
+
+DungeonMask = $0098C0
+
+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 $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:

From 788cceaab9467b338328c06e2c5be20e4603d433 Mon Sep 17 00:00:00 2001
From: cassidoxa <cassidymoen@gmx.com>
Date: Wed, 16 Nov 2022 21:38:28 -0500
Subject: [PATCH 03/11] Continue labeling and documentation in ram.asm, main
 rando block Deleted several unused modules and some commented code
 Reorganized some routines to clean up modules Moved some memory into mirrored
 WRAM Refactored NMI hook aux routine Removed old fake flipper fix

---
 LTTP_RND_GeneralBugfixes.asm |   9 +-
 bookofmudora.asm             |   4 +-
 bugfixes.asm                 |  47 ++--
 clock.asm                    | 248 -------------------
 compression.asm              |   2 +-
 contrib.asm                  | 182 --------------
 controllerjank.asm           |   2 +-
 crypto.asm                   |  80 ------
 darkroomitems.asm            |  16 +-
 darkworldspawn.asm           |  14 +-
 decryption.asm               |   2 +-
 dialog.asm                   | 108 ++++++++-
 doorframefixes.asm           |  18 +-
 dungeondrops.asm             |   6 +-
 endingsequence.asm           |   4 +-
 enemy_adjustments.asm        |  26 +-
 entrances.asm                |  77 +++---
 events.asm                   |  35 ++-
 fairyfixes.asm               |  57 +++--
 fileselect.asm               |  20 +-
 firebarlayer.asm             |   8 -
 flipperkill.asm              |  58 +----
 floodgatesoftlock.asm        |  18 +-
 flute.asm                    |  54 ++---
 framehook.asm                |  19 +-
 glitched.asm                 |  30 +--
 goalitem.asm                 |   4 +-
 halfmagicbat.asm             |   6 +-
 hardmode.asm                 |  10 +-
 heartbeep.asm                |   8 +-
 heartpieces.asm              |  75 ++----
 hooks.asm                    | 459 ++++++++++-------------------------
 init.asm                     |  36 +--
 inventory.asm                |   4 +-
 invertedstatic.asm           |   6 +-
 lampmantlecone.asm           |   2 +-
 maidencrystals.asm           |  21 +-
 mantle.asm                   |  10 +-
 medallions.asm               |  24 +-
 msu.asm                      | 100 ++++----
 music.asm                    | 124 ++++------
 npcitems.asm                 |  83 +++----
 pendantcrystalhud.asm        | 129 +++++-----
 playername.asm               |  12 +-
 potions.asm                  |   4 +-
 quickswap.asm                |  22 +-
 ram.asm                      | 302 +++++++++++------------
 retro.asm                    |   2 +-
 rngfixes.asm                 |   2 +-
 roomloading.asm              |  12 +-
 rupeelimit.asm               |  20 --
 sandbox.asm                  | 363 ---------------------------
 scratchpad.asm               |   0
 servicerequest.asm           |   8 +-
 shopkeeper.asm               |  10 +-
 sram.asm                     |  19 +-
 stats.asm                    |   6 +-
 stats/statConfig.asm         |   2 +-
 swordswap.asm                |   8 +-
 tables.asm                   |   4 +-
 tablets.asm                  |   5 +-
 textrenderer.asm             |   6 +-
 treekid.asm                  |   2 +-
 utilities.asm                |  20 +-
 vanillalabels.asm            |   3 +
 zoraking.asm                 |   4 +-
 zsnes.asm                    |   8 +-
 67 files changed, 962 insertions(+), 2127 deletions(-)
 delete mode 100644 clock.asm
 delete mode 100644 contrib.asm
 delete mode 100644 firebarlayer.asm
 delete mode 100644 rupeelimit.asm
 delete mode 100644 sandbox.asm
 delete mode 100644 scratchpad.asm

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 6724bb6..32cb0b9 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -90,10 +90,8 @@ incsrc halfmagicbat.asm
 incsrc mantle.asm
 incsrc swordswap.asm
 incsrc stats.asm
-incsrc scratchpad.asm
 incsrc dialog.asm
 incsrc entrances.asm
-incsrc clock.asm
 incsrc accessibility.asm
 incsrc heartbeep.asm
 incsrc capacityupgrades.asm
@@ -102,7 +100,6 @@ incsrc doorframefixes.asm
 incsrc music.asm
 incsrc roomloading.asm
 incsrc icepalacegraphics.asm
-incsrc firebarlayer.asm
 warnpc $A18000
 
 org $1C8000 ; text tables for translation
@@ -169,9 +166,7 @@ if !FEATURE_NEW_TEXT
 endif
 warnpc $A58000
 
-;org $228000 ; contrib area
-org $A28000 ; contrib area
-incsrc contrib.asm
+org $A28000
 
 org $A38000
 incsrc stats/main.asm
@@ -287,7 +282,7 @@ warnpc $B08000
 ;Bank Map
 ;$20 Code Bank
 ;$21 Reserved (Frame Hook & Init)
-;$22 Contrib Code
+;$22 Unused
 ;$23 Stats & Credits
 ;$24 Code Bank
 ;$29 External hooks (rest of bank not used)
diff --git a/bookofmudora.asm b/bookofmudora.asm
index f98df58..0c5954c 100644
--- a/bookofmudora.asm
+++ b/bookofmudora.asm
@@ -9,7 +9,7 @@ RTL
 ;--------------------------------------------------------------------------------
 DrawLibraryItemGFX:
         PHA
-        LDA $0E80, X ; Retrieve stored item type
+        LDA.w $0E80, X ; Retrieve stored item type
         JSL.l DrawDynamicTile
         PLA
 RTL
@@ -61,7 +61,7 @@ RTL
 RTL
 ;--------------------------------------------------------------------------------
 LoadBonkItem:
-	LDA.b $A0 ; check room ID - only bonk keys in 2 rooms so we're just checking the lower byte
+	LDA.b RoomIndex ; check room ID - only bonk keys in 2 rooms so we're just checking the lower byte
 	CMP.b #115 : BNE + ; Desert Bonk Key
     	LDA.l BonkKey_Desert
 		BRA ++
diff --git a/bugfixes.asm b/bugfixes.asm
index 0226f39..7a6e912 100644
--- a/bugfixes.asm
+++ b/bugfixes.asm
@@ -46,9 +46,9 @@ RTL
 DecideIfBunnyByScreenIndex:
 	; If indoors we don't have a screen index. Return non-bunny to make mirror-based
 	; superbunny work
-	LDA $1B : BNE .done
-	LDA MoonPearlEquipment : BNE .done
-	LDA $8A : AND.b #$40 : PHA
+	LDA.b $1B : BNE .done
+	LDA.l MoonPearlEquipment : BNE .done
+	LDA.b $8A : AND.b #$40 : PHA
 	LDA.l InvertedMode : BNE .inverted
 	.normal
 		PLA : EOR #$40
@@ -57,21 +57,12 @@ DecideIfBunnyByScreenIndex:
 		PLA
 	.done
 RTL
-;--------------------------------------------------------------------------------
-
-;--------------------------------------------------------------------------------
-;ReadInventoryPond:
-;	CPX.b #$1B : BNE + : LDA.b #$01 : RTL : +
-;	LDA EquipmentWRAM, X
-;RTL
-;--------------------------------------------------------------------------------
-
 ;--------------------------------------------------------------------------------
 FixBunnyOnExitToLightWorld:
     LDA.w $02E0 : BEQ +
         JSL.l DecideIfBunny : BEQ +
-        STZ $5D ; set player mode to Normal
-        STZ $02E0 : STZ $56 ; return player graphics to normal
+        STZ.b $5D ; set player mode to Normal
+        STZ.w $02E0 : STZ.b $56 ; return player graphics to normal
     +
 RTS
 ;--------------------------------------------------------------------------------
@@ -82,10 +73,10 @@ RTS
 FixAga2Bunny:
     LDA.l FixFakeWorld :  BEQ + ; Only use this fix is fakeworld fix is in use
         LDA.l InvertedMode : BEQ +++
-            LDA.b #$00 : STA CurrentWorld ; Switch to light world
+            LDA.b #$00 : STA.l CurrentWorld ; Switch to light world
             BRA ++
         +++
-        LDA.b #$40 : STA CurrentWorld ; Switch to dark world
+        LDA.b #$40 : STA.l CurrentWorld ; Switch to dark world
     ++
 	JSL DecideIfBunny : BNE +
 		JSR MakeBunny
@@ -100,8 +91,8 @@ RTL
 ;--------------------------------------------------------------------------------
 MakeBunny:
     PHX : PHY
-	LDA.b #$17 : STA $5D ; set player mode to permabunny
-	LDA.b #$01 : STA $02E0 : STA $56 ; make player look like bunny
+	LDA.b #$17 : STA.b $5D ; set player mode to permabunny
+	LDA.b #$01 : STA.w $02E0 : STA.b $56 ; make player look like bunny
 	JSL LoadGearPalettes_bunny
     PLY : PLX
 RTS
@@ -172,8 +163,8 @@ CMP.w #$070E : BEQ .new ; opening overworld map
 .original
 -
 	LDA.b [Scrap00]
-	STA $7EC300, X
-	STA $7EC500, X
+	STA.l $7EC300, X
+	STA.l $7EC500, X
 	INC.b Scrap00 : INC.b Scrap00
 	INX #2
 	DEY
@@ -182,7 +173,7 @@ RTL
 .new
 -
 	LDA.b [Scrap00]
-	STA $7EC500, X
+	STA.l $7EC500, X
 	INC.b Scrap00 : INC.b Scrap00
 	INX #2
 	DEY
@@ -192,10 +183,10 @@ RTL
 ;--------------------------------------------------------------------------------
 ; Fix pedestal pull overlay
 PedestalPullOverlayFix:
-LDA.b #$09 : STA $039F, X	; the thing we wrote over
-LDA $1B : BNE +
-	LDA $8A : CMP.b #$80 : BNE +
-		LDA $8C : CMP.b #$97
+LDA.b #$09 : STA.w $039F, X	; the thing we wrote over
+LDA.b $1B : BNE +
+	LDA.b $8A : CMP.b #$80 : BNE +
+		LDA.b $8C : CMP.b #$97
 +
 RTL
 
@@ -221,7 +212,7 @@ pushpc
 pullpc
 ;--------------------------------------------------------------------------------
 SetOverworldTransitionFlags:
-	LDA #$01
-	STA $0ABF ; used by witch
-	STA $021B ; used by race game
+	LDA.b #$01
+	STA.w $0ABF ; used by witch
+	STA.w $021B ; used by race game
 	RTL
diff --git a/clock.asm b/clock.asm
deleted file mode 100644
index 1f95a86..0000000
--- a/clock.asm
+++ /dev/null
@@ -1,248 +0,0 @@
-;--------------------------------------------------------------------------------
-; http://problemkaputt.de/fullsnes.htm
-; 2800h-2801h  S-RTC Real Time Clock I/O Ports
-; cartridge type change from #$02 to #$55 to enable S-RTC
-; SNES Cart S-RTC (Realtime Clock) (1 game)
-;
-; PCB "SHVC-LJ3R-01" with 24pin "Sharp S-RTC" chip. Used only by one japanese game:
-;   Dai Kaiju Monogatari 2 (1996) Birthday/Hudson Soft (JP)
-; 
-; S-RTC I/O Ports
-;   002800h S-RTC Read  (R)
-;   002801h S-RTC Write (W)
-; Both registers are 4bits wide. When writing: Upper 4bit should be zero. When reading: Upper 4bit should be masked-off (they do possibly contain garbage, eg. open-bus).
-; 
-; S-RTC Communication
-; The sequence for setting, and then reading the time is:
-;   Send <0Eh,04h,0Dh,0Eh,00h,Timestamp(12 digits),0Dh> to [002801h]
-;   If ([002800h] AND 0F)=0Fh then read <Timestamp(13 digits)>
-;   If ([002800h] AND 0F)=0Fh then read <Timestamp(13 digits)>
-;   If ([002800h] AND 0F)=0Fh then read <Timestamp(13 digits)>
-;   If ([002800h] AND 0F)=0Fh then read <Timestamp(13 digits)>
-;   etc.
-; The exact meaning of the bytes is unknown. 0Eh/0Dh seems to invoke/terminate commands, 04h might be some configuration stuff (like setting 24-hour mode). 00h is apparently the set-time command. There might be further commands (such like setting interrupts, alarm, 12-hour mode, reading battery low & error flags, etc.). When reading, 0Fh seems to indicate sth like "time available".
-; The 12/13-digit "SSMMHHDDMYYY(D)" Timestamps are having the following format:
-;   Seconds.lo  (BCD, 0..9)
-;   Seconds.hi  (BCD, 0..5)
-;   Minutes.lo  (BCD, 0..9)
-;   Minutes.hi  (BCD, 0..5)
-;   Hours.lo    (BCD, 0..9)
-;   Hours.hi    (BCD, 0..2)
-;   Day.lo      (BCD, 0..9)
-;   Day.hi      (BCD, 0..3)
-;   Month       (HEX, 01h..0Ch)
-;   Year.lo     (BCD, 0..9)
-;   Year.hi     (BCD, 0..9)
-;   Century     (HEX, 09h..0Ah for 19xx..20xx)
-; When READING the time, there is one final extra digit (the existing software doesn't transmit that extra digit on WRITING, though maybe it's possible to do writing, too):
-;   Day of Week? (0..6) (unknown if RTC assigns sth like 0=Sunday or 0=Monday)
-;--------------------------------------------------------------------------------
-
-;--------------------------------------------------------------------------------
-macro A_x10()
-	ASL #1 : PHA
-	ASL #2 : !ADD 1,s
-	STA 1,s : PLA
-endmacro
-;--------------------------------------------------------------------------------
-macro A_x24()
-	ASL #3 : PHA
-	ASL #1 : !ADD 1,s
-	STA 1,s : PLA
-endmacro
-;--------------------------------------------------------------------------------
-macro A_x60()
-	ASL #2 : PHA
-	ASL #4 : !SUB 1,s
-	STA 1,s : PLA
-endmacro
-;--------------------------------------------------------------------------------
-macro Clock_ReadBCD()
-	LDA $002800 : PHA
-	LDA $002800 : %A_x10() : !ADD 1,s
-	STA 1,s : PLA
-endmacro
-;--------------------------------------------------------------------------------
-
-Clock_Test:
-	JSL.l Clock_Init
-	JML.l Clock_IsSupported
-
-;--------------------------------------------------------------------------------
-; Clock_Init
-;--------------------------------------------------------------------------------
-Clock_Init:
-	LDA.b #$0E : STA $002801
-	LDA.b #$04 : STA $002801
-	LDA.b #$0D : STA $002801
-	LDA.b #$0E : STA $002801
-	LDA.b #$00 : STA $002801
-	
-	LDA.b #$00 : STA $002801
-	LDA.b #$00 : STA $002801
-	LDA.b #$00 : STA $002801
-	LDA.b #$00 : STA $002801
-	LDA.b #$00 : STA $002801
-	LDA.b #$00 : STA $002801
-	LDA.b #$01 : STA $002801
-	LDA.b #$00 : STA $002801
-	LDA.b #$01 : STA $002801
-	LDA.b #$00 : STA $002801
-	LDA.b #$00 : STA $002801
-	LDA.b #$0A : STA $002801
-	
-	LDA.b #$0D : STA $002801
-RTL
-;--------------------------------------------------------------------------------
-
-;--------------------------------------------------------------------------------
-; Clock_IsSupported
-;--------------------------------------------------------------------------------
-; Input: None (8-bit accumulator)
-;--------------------------------------------------------------------------------
-; Output:
-; Carry - unset if unsupported, set if supported
-; Zero - Undefined
-;--------------------------------------------------------------------------------
-; Side Effects:
-; S-RTC is ready for reading upon exit if supported
-;--------------------------------------------------------------------------------
-Clock_IsSupported:
-	PHA : PHX
-		LDX #$00;
-		-
-			LDA $002800 : AND.b #$0F : CMP #$0F : BEQ .done ; check for clock chip ready signal
-			CPX.b #$0E : BCC ++ : CLC : BRA .done ; if we've read 14 bytes with no success, unset carry and exit
-		++	INX
-		BRA -
-	.done
-	PLX : PLA
-RTL
-;--------------------------------------------------------------------------------
-
-;--------------------------------------------------------------------------------
-; Clock_QuickStamp
-;--------------------------------------------------------------------------------
-; Input: None
-;--------------------------------------------------------------------------------
-; Output:
-; $00.b - 24-bit timestamp (low)
-; $01.b - 24-bit timestamp (mid)
-; $02.b - 24-bit timestamp (high)
-; $03.b - zero
-; Carry - Unset if error, Set if success
-; Zero - Undefined
-;--------------------------------------------------------------------------------
-; Side Effects:
-; Requires Mode-7 Matrix Registers
-;--------------------------------------------------------------------------------
-Clock_QuickStamp:
-	PHA : PHX : PHP
-		SEP #$30 ; set 8-bit accumulator and index registers
-		LDX #$00;
-		-
-			LDA $002800 : AND.b #$0F : CMP #$0F : BEQ .ready ; check for clock chip ready signal
-			CPX.b #$0E : !BLT ++ : CLC : JMP .done : ++ ; if we've read 14 bytes with no success, unset carry and exit
-			INX
-		BRA -
-		SEC ; indicate success
-		
-		.ready
-		%Clock_ReadBCD() : STA.b Scrap00 ; seconds
-		%Clock_ReadBCD() : STA.b Scrap01 ; minutes
-		%Clock_ReadBCD() : STA.b Scrap02 ; hours
-		%Clock_ReadBCD() : STA.b Scrap03 ; days
-		
-		REP $20 ; set 16-bit accumulator
-		LDA.b Scrap01 : AND.w #$00FF : %A_x60() ; convert minutes to seconds
-		STZ.b Scrap01 : !ADD Scrap00 : STA.b Scrap00 ; store running total seconds to $00
-
-		LDA.b Scrap03 : AND.w #$00FF : %A_x24() ; convert days to hours
-		STZ.b Scrap03 : !ADD Scrap02 ; get total hours
-		%A_x60() ; get total minutes
-		
-		LDY #$60
-		JSL.l Multiply_A16Y8
-		STY.b Scrap02 : STZ.b Scrap03
-		!ADD Scrap00 : BCC + : INC.b Scrap02 : +
-		
-	.done
-	PLP : PLX : PLA
-RTL
-;--------------------------------------------------------------------------------
-
-;--------------------------------------------------------------------------------
-; Multiply_A16Y8:
-;--------------------------------------------------------------------------------
-; Expects:
-; Accumulator - 16-bit
-; Index Registers - 8-bit
-;--------------------------------------------------------------------------------
-; Notes:
-; Found a (wrong) version of this on wikibooks. This is cleaned up and fixed.
-;--------------------------------------------------------------------------------
-Multiply_A16Y8:
-	SEP #$20 ; set 8-bit accumulator
-	STY.w WRMPYA
-	STA.w WRMPYB
-	NOP #4
-	LDA.w RDMPYL
-	LDY.w RDMPYH
-	XBA
-	STA.w WRMPYB
-	NOP #2
-	TYA
-	CLC
-	ADC.w RDMPYL
-	LDY.w RDMPYH
-	BCC .carry_bit
-	INY
-.carry_bit:
-	XBA
-	REP #$20 ; set 16-bit accumulator
-RTL
-;--------------------------------------------------------------------------------
-
-;--------------------------------------------------------------------------------
-; Clock_GetTime
-;--------------------------------------------------------------------------------
-; Input: None
-;--------------------------------------------------------------------------------
-; Output:
-; $00.b - Seconds
-; $01.b - Minutes
-; $02.b - Hours
-; $03.b - Days
-; $04.b - Months
-; $05.w - Years
-; Carry - Unset if error, Set if success
-; Zero - Undefined
-;--------------------------------------------------------------------------------
-Clock_GetTime:
-	PHA : PHX : PHY : PHP
-		SEP #$30 ; set 8-bit accumulator and index registers
-		LDX #$00;
-		-
-			LDA $002800 : AND.b #$0F : CMP #$0F : BEQ .ready ; check for clock chip ready signal
-			CPX.b #$0E : !BLT ++ : CLC : JMP .done : ++ ; if we've read 14 bytes with no success, unset carry and exit
-			INX
-		BRA -
-		SEC ; indicate success
-		
-		.ready
-		%Clock_ReadBCD() : STA.b Scrap00 ; seconds
-		%Clock_ReadBCD() : STA.b Scrap01 ; minutes
-		%Clock_ReadBCD() : STA.b Scrap02 ; hours
-		%Clock_ReadBCD() : STA.b Scrap03 ; days
-		LDA $002800 : STA.b Scrap04 ; months
-		%Clock_ReadBCD() : STA.b Scrap05 ; years
-		LDA $002800 : STA.b Scrap06 ; century
-		
-		REP $20 ; set 16-bit accumulator
-		STA.b Scrap06 : AND #$00FF : %A_x10() : %A_x10() : !ADD #1000 ; multiply century digit by 100 and add 1000
-		STZ.b Scrap06 : !ADD Scrap05 : STA.b Scrap05 ; add lower 2 digits of the year and store
-		
-	.done
-	PLP : PLY : PLX : PLA
-RTL
-;--------------------------------------------------------------------------------
diff --git a/compression.asm b/compression.asm
index d5f44ba..32831d4 100644
--- a/compression.asm
+++ b/compression.asm
@@ -2,7 +2,7 @@
 ParadoxCaveGfxFix:
     ; Always upload line unless you're moving into paradox cave (0x0FF) from above (0x0EF)
     LDA.b $1B : BEQ .uploadLine
-    LDX.b $A0 : CPX.w #$00FF : BNE .uploadLine
+    LDX.b RoomIndex : CPX.w #$00FF : BNE .uploadLine
     LDX.b $A2 : CPX.w #$00EF : BNE .uploadLine
 
     ;Ignore uploading four specific lines of tiles to VRAM
diff --git a/contrib.asm b/contrib.asm
deleted file mode 100644
index 52adbcd..0000000
--- a/contrib.asm
+++ /dev/null
@@ -1,182 +0,0 @@
-;================================================================
-; Contributor: Myramong
-;================================================================
-;Sprite_ShowMessageFromPlayerContact_Edit:
-;{
-;	STZ $1CE8
-;	JSL.l Sprite_CheckDamageToPlayerSameLayerLong : BCC .dont_show
-;
-;	LDA $4D : CMP.b #$02 : BEQ .dont_show
-;
-;	JSL.l Sprite_DirectionToFacePlayerLong : TYA : EOR.b #$03
-;	SEC
-;RTL
-;.dont_show
-;	LDA $0DE0, X
-;	CLC
-;RTL
-;}
-;================================================================
-;Sprite_ShowSolicitedMessageIfPlayerFacing_Edit:
-;{
-;	JSL.l Sprite_CheckDamageToPlayerSameLayerLong : BCC .alpha
-;	JSL.l Sprite_CheckIfPlayerPreoccupied : BCS .alpha
-;	LDA $F6 : BPL .alpha
-;	LDA $0F10, X : BNE .alpha
-;
-;	LDA $4D : CMP.b #$02 : BEQ .alpha
-;
-;	STZ $1CE8 ; set text choice to 1st option (usually yes/confirm/etc)
-;	JSL.l Sprite_DirectionToFacePlayerLong : PHX : TYX
-;
-;	; Make sure that the sprite is facing towards the player, otherwise
-;	; talking can't happen. (What sprites actually use this???)
-;	LDA $05E1A3, X : PLX : CMP $2F : BNE .not_facing_each_other
-;	PHY
-;	LDA.b #$40 : STA $0F10, X
-;	PLA : EOR.b #$03
-;	SEC
-;RTL
-;.not_facing_each_other
-;.alpha
-;	LDA $0DE0, X
-;	CLC
-;RTL
-;}
-;================================================================
-;OldMountainMan_TransitionFromTagalong_Edit:
-;{
-;	PHA
-;
-;        LDA.b #$AD : JSL Sprite_SpawnDynamically
-;
-;        PLA : PHX : TAX
-;
-;        LDA $1A64, X : AND.b #$03 : STA $0EB0, Y
-;                                    STA $0DE0, Y
-;
-;        LDA $1A00, X : CLC : ADC.b #$02 : STA $0D00, Y
-;        LDA $1A14, X : ADC.b #$00 : STA $0D20, Y
-;
-;        LDA $1A28, X : CLC : ADC.b #$02 : STA $0D10, Y
-;        LDA $1A3C, X : ADC.b #$00 : STA $0D30, Y
-;
-;        LDA $EE : STA $0F20, Y
-;
-;        LDA.b #$01 : STA $0BA0, Y
-;                     STA $0E80, Y
-;
-;        LDA.b #$01 : STA $02E4 ; OldMountainMan_FreezePlayer
-;					 STA $037B ; ^
-;
-;        PLX
-;
-;        LDA.b #$00 : STA FollowerIndicator
-;
-;        STZ $5E
-;
-;        JML $09A6B6 ; <- 4A6B6 tagalong.asm:1194 (SEP #$30 : RTS)
-;}
-;================================================================
-Sprite_ShowSolicitedMessageIfPlayerFacing_Alt:
-{
-	STA $1CF0
-	STY $1CF1
-
-	JSL Sprite_CheckDamageToPlayerSameLayerLong : BCC .alpha
-	JSL Sprite_CheckIfPlayerPreoccupied : BCS .alpha
-
-	LDA $F6 : BPL .alpha
-	LDA $0F10, X : BNE .alpha
-	LDA $4D : CMP.b #$02 : BEQ .alpha
-
-	JSL Sprite_DirectionToFacePlayerLong : PHX : TYX
-
-	; Make sure that the sprite is facing towards the player, otherwise
-	; talking can't happen. (What sprites actually use this???)
-	LDA $05E1A3, X : PLX : CMP $2F : BNE .not_facing_each_other
-
-	PHY
-
-	LDA $1CF0
-	LDY $1CF1
-
-	; Check what room we're in so we know which npc we're talking to
-	LDA.b $A0 :	CMP #$05 : BEQ .SahasrahlaDialogs
-				CMP #$1C : BEQ .BombShopGuyDialog
-						   BRA .SayNothing
-
-	.SahasrahlaDialogs
-		REP #$20 : LDA.l MapReveal_Sahasrahla : ORA MapOverlay : STA MapOverlay : SEP #$20
-		JSL DialogSahasrahla : BRA .SayNothing
-
-	.BombShopGuyDialog
-		REP #$20 : LDA.l MapReveal_BombShop : ORA MapOverlay : STA MapOverlay : SEP #$20
-		JSL DialogBombShopGuy
-
-	.SayNothing
-
-	LDA.b #$40 : STA $0F10, X
-
-	PLA : EOR.b #$03
-
-	SEC
-
-	RTL
-
-.not_facing_each_other
-.alpha
-
-	LDA $0DE0, X
-
-	CLC
-
-	RTL
-}
-;================================================================
-Sprite_ShowSolicitedMessageIfPlayerFacing_PreserveMessage:
-{
-	PHY
-	PHA
-
-	JSL Sprite_CheckDamageToPlayerSameLayerLong : BCC .alpha
-	JSL Sprite_CheckIfPlayerPreoccupied : BCS .alpha
-
-	LDA $F6 : BPL .alpha
-	LDA $0F10, X : BNE .alpha
-	LDA $4D : CMP.b #$02 : BEQ .alpha
-
-	JSL Sprite_DirectionToFacePlayerLong : PHX : TYX
-
-	; Make sure that the sprite is facing towards the player, otherwise
-	; talking can't happen. (What sprites actually use this???)
-	LDA $05E1A3, X : PLX : CMP $2F : BNE .not_facing_each_other
-
-	PLA : XBA : PLA
-
-	PHY
-
-	TAY : XBA
-	
-	JSL Sprite_ShowMessageUnconditional
-
-	LDA.b #$40 : STA $0F10, X
-
-	PLA : EOR.b #$03
-
-	SEC
-
-	RTL
-
-.not_facing_each_other
-.alpha
-	PLY
-	PLA
-
-	LDA $0DE0, X
-
-	CLC
-
-	RTL
-}
-;================================================================
diff --git a/controllerjank.asm b/controllerjank.asm
index 526b3fe..3aefc84 100644
--- a/controllerjank.asm
+++ b/controllerjank.asm
@@ -22,7 +22,7 @@ InvertDPad:
 	JML.l InvertDPadReturn
 
 .crowd_control
-	LDA.l DPadInverter : BNE +
+	LDA.l ControllerInverter : BNE +
 
 	LDA.w JOY1L : STA.b Scrap00
 	LDA.w JOY1H : STA.b Scrap01
diff --git a/crypto.asm b/crypto.asm
index d1c65bb..4f0d5f0 100644
--- a/crypto.asm
+++ b/crypto.asm
@@ -20,20 +20,6 @@ macro ASL32Single(value)
 	; ROL handles the carry from the lower byte for us
 endmacro
 
-;macro LSR32(value,k)
-;	LDX.b <k>
-;	?loop:
-;	%LSR32Single(<value>,<k>)
-;	DEX : CPX.b #$00 : BNE ?loop
-;endmacro
-
-;macro ASL32(value,k)
-;	LDX.b <k>
-;	?loop:
-;	%LSR32Single(<value>,<k>)
-;	DEX : CPX.b #$00 : BNE ?loop
-;endmacro
-
 CryptoMX:
 	PHX
 
@@ -222,69 +208,3 @@ db 32 ; n is 2
 ;dd (23*$9e3779b9)&$ffffffff ; n is 3
 dd (32*$9e3779b9)&$ffffffff	; n is 2
 
-;void btea(uint32_t *v, int n, uint32_t const key[4]) {
-;  uint32_t y, z, sum;
-;  unsigned p, rounds, e;
-
-;  } else if (n < -1) {  /* Decoding Part */
-;    n = -n;
-;    rounds = 6 + 52/n;
-;    sum = rounds*DELTA;
-;    y = v[0];
-;    do {
-;      e = (sum >> 2) & 3;
-;      for (p=n-1; p>0; p--) {
-;        z = v[p-1];
-;        y = v[p] -= MX;
-;      }
-;      z = v[n-1];
-;      y = v[0] -= MX;
-;      sum -= DELTA;
-;    } while (--rounds);
-;  }
-
-;BTEA will encode or decode n words as a single block where n > 1
-;
-;v is the n word data vector
-;k is the 4 word key
-;n is negative for decoding
-;if n is zero result is 1 and no coding or decoding takes place, otherwise the result is zero
-;assumes 32 bit 'long' and same endian coding and decoding
-;#include <stdint.h>
-;#define DELTA 0x9e3779b9
-;#define MX ((((z>>5)^(y<<2)) + ((y>>3)^(z<<4))) ^ ((sum^y) + (key[(p&3)^e] ^ z)))
-;
-;void btea(uint32_t *v, int n, uint32_t const key[4]) {
-;  uint32_t y, z, sum;
-;  unsigned p, rounds, e;
-;  if (n > 1) {          /* Coding Part */
-;    rounds = 6 + 52/n;
-;    sum = 0;
-;    z = v[n-1];
-;    do {
-;      sum += DELTA;
-;      e = (sum >> 2) & 3;
-;      for (p=0; p<n-1; p++) {
-;        y = v[p+1];
-;        z = v[p] += MX;
-;      }
-;      y = v[0];
-;      z = v[n-1] += MX;
-;    } while (--rounds);
-;  } else if (n < -1) {  /* Decoding Part */
-;    n = -n;
-;    rounds = 6 + 52/n;
-;    sum = rounds*DELTA;
-;    y = v[0];
-;    do {
-;      e = (sum >> 2) & 3;
-;      for (p=n-1; p>0; p--) {
-;        z = v[p-1];
-;        y = v[p] -= MX;
-;      }
-;      z = v[n-1];
-;      y = v[0] -= MX;
-;      sum -= DELTA;
-;    } while (--rounds);
-;  }
-;}
diff --git a/darkroomitems.asm b/darkroomitems.asm
index a2d1474..0d7b9b7 100644
--- a/darkroomitems.asm
+++ b/darkroomitems.asm
@@ -1,6 +1,6 @@
 CheckReceivedItemPropertiesBeforeLoad:
-    LDA $A0 : BEQ .normalCode
-    LDA $7EC005 : BNE .lightOff
+    LDA.b RoomIndex : BEQ .normalCode
+    LDA.l $7EC005 : BNE .lightOff
     .normalCode
     LDA.l AddReceivedItemExpanded_properties, X ;Restore Rando Code
     RTL
@@ -10,18 +10,18 @@ CheckReceivedItemPropertiesBeforeLoad:
     LDA.l AddReceivedItemExpanded_properties, X ; get palette
 
     REP #$30
-    AND #$0007 ; mask out palette
+    AND.w #$0007 ; mask out palette
     ASL #5 ; multiply by 32
-    ADC #$C610 ; offset to latter half
+    ADC.w #$C610 ; offset to latter half
 
     TAX ; give to destination
-    LDY #$C610 ; target palette SP0 colors 8-F
+    LDY.w #$C610 ; target palette SP0 colors 8-F
 
-    LDA #$000F ; 16 bytes
+    LDA.w #$000F ; 16 bytes
     MVN $7E, $7E ; move palette
 
     SEP #$30
     PLB : PLY : PLX
-    INC $15
-    LDA #$00
+    INC.b $15
+    LDA.b #$00
     RTL
diff --git a/darkworldspawn.asm b/darkworldspawn.asm
index 579444e..be2bfc1 100644
--- a/darkworldspawn.asm
+++ b/darkworldspawn.asm
@@ -28,8 +28,8 @@ SetDeathWorldChecked:
 		JMP SetDeathWorldChecked_Inverted
 	+
 	LDA.b $1B : BEQ .outdoors
-		LDA.w $040C : CMP #$FF : BNE .dungeon
-		LDA.b $A0 : ORA.b $A1 : BNE ++
+		LDA.w $040C : CMP.b #$FF : BNE .dungeon
+		LDA.b RoomIndex : ORA.b RoomIndex+1 : BNE ++
 			LDA.l GanonPyramidRespawn : BNE .pyramid ; if flag is set, force respawn at pyramid on death to ganon
 	    ++
 	.outdoors
@@ -52,20 +52,20 @@ DoWorldFix_Inverted:
 	.skip_mirror_check ; alt entrance point
 	LDA.l ProgressIndicator : CMP.b #$03 : BCS .done ; check if agahnim 1 is alive
         .setDarkWorld
-	LDA.b #$40 : STA CurrentWorld ; set flag to dark world
+	LDA.b #$40 : STA.l CurrentWorld ; set flag to dark world
 	LDA.l FollowerIndicator
 	CMP.b #$07 : BEQ .clear ; clear frog
 	CMP.b #$08 : BEQ .clear ; clear dwarf - consider flute implications
 	BRA .done
 	.clear
-	LDA.b #$00 : STA FollowerIndicator ; clear follower
+	LDA.b #$00 : STA.l FollowerIndicator ; clear follower
 	.done
 RTL
 ;--------------------------------------------------------------------------------
 SetDeathWorldChecked_Inverted:
 	LDA.b $1B : BEQ .outdoors
-		LDA.w $040C : CMP #$FF : BNE .dungeon
-		LDA.b $A0 : ORA $A1 : BNE ++
+		LDA.w $040C : CMP.b #$FF : BNE .dungeon
+		LDA.b RoomIndex : ORA.b RoomIndex+1 : BNE ++
 			LDA.l GanonPyramidRespawn : BNE .castle ; if flag is set, force respawn at pyramid on death to ganon
 		++
 	.outdoors
@@ -77,7 +77,7 @@ JMP DoWorldFix_Inverted_skip_mirror_check
 
 	.castle
 	LDA.b #$00 : STA.l CurrentWorld ; set flag to dark world
-	LDA.l FollowerIndicator : CMP.b #$07 : BNE + : LDA.b #$08 : STA FollowerIndicator : + ; convert frog to dwarf
+	LDA.l FollowerIndicator : CMP.b #$07 : BNE + : LDA.b #$08 : STA.l FollowerIndicator : + ; convert frog to dwarf
 	.done
 RTL
 ;================================================================================
diff --git a/decryption.asm b/decryption.asm
index 2c590f5..3500c21 100644
--- a/decryption.asm
+++ b/decryption.asm
@@ -61,7 +61,7 @@ JML.l Dungeon_OpenKeyedObject_nextChest
 	.nextChest
 
 	INX #2 : CPX.w #$0150 : BEQ .couldntFindChest
-	LDA.l ChestData, X : AND.w #$7FFF : CMP.b $A0 : BNE .nextChest
+	LDA.l ChestData, X : AND.w #$7FFF : CMP.b RoomIndex : BNE .nextChest
 
 	DEC.b Scrap0E : BNE .nextChest
 
diff --git a/dialog.asm b/dialog.asm
index fa3dec5..3b910c8 100644
--- a/dialog.asm
+++ b/dialog.asm
@@ -172,7 +172,7 @@ FreeDungeonItemNotice:
 
 	STZ.w $1CF0 : STZ.w $1CF1 ; reset decompression buffer
 	LDA.b #$01 : STA.l AltTextFlag ; set alternate dialog flag
-	STA.l $7F509F
+	STA.l TextBoxDefer
 
 	;--------------------------------
 	.skip
@@ -415,6 +415,112 @@ CalculateSignIndex:
 .done
 RTL
 
+;================================================================
+; Contributor: Myramong
+;================================================================
+Sprite_ShowSolicitedMessageIfPlayerFacing_Alt:
+{
+	STA.w $1CF0
+	STY.w $1CF1
+
+	JSL Sprite_CheckDamageToPlayerSameLayerLong : BCC .alpha
+	JSL Sprite_CheckIfPlayerPreoccupied : BCS .alpha
+
+	LDA.b $F6 : BPL .alpha
+	LDA.w $0F10, X : BNE .alpha
+	LDA.b $4D : CMP.b #$02 : BEQ .alpha
+
+	JSL Sprite_DirectionToFacePlayerLong : PHX : TYX
+
+	; Make sure that the sprite is facing towards the player, otherwise
+	; talking can't happen. (What sprites actually use this???)
+	LDA.l $05E1A3, X : PLX : CMP.b $2F : BNE .not_facing_each_other
+
+	PHY
+
+	LDA.w $1CF0
+	LDY.w $1CF1
+
+	; Check what room we're in so we know which npc we're talking to
+        LDA.b RoomIndex
+        CMP.b #$05 : BEQ .SahasrahlaDialogs
+        CMP.b #$1C : BEQ .BombShopGuyDialog
+        BRA .SayNothing
+
+	.SahasrahlaDialogs
+		REP #$20 : LDA.l MapReveal_Sahasrahla : ORA.l MapOverlay : STA.l MapOverlay : SEP #$20
+		JSL DialogSahasrahla : BRA .SayNothing
+
+	.BombShopGuyDialog
+		REP #$20 : LDA.l MapReveal_BombShop : ORA.l MapOverlay : STA.l MapOverlay : SEP #$20
+		JSL DialogBombShopGuy
+
+	.SayNothing
+
+	LDA.b #$40 : STA.w $0F10, X
+
+	PLA : EOR.b #$03
+
+	SEC
+
+	RTL
+
+.not_facing_each_other
+.alpha
+
+	LDA.w $0DE0, X
+
+	CLC
+
+	RTL
+}
+;================================================================
+Sprite_ShowSolicitedMessageIfPlayerFacing_PreserveMessage:
+{
+	PHY
+	PHA
+
+	JSL Sprite_CheckDamageToPlayerSameLayerLong : BCC .alpha
+	JSL Sprite_CheckIfPlayerPreoccupied : BCS .alpha
+
+	LDA.b $F6 : BPL .alpha
+	LDA.w $0F10, X : BNE .alpha
+	LDA.b $4D : CMP.b #$02 : BEQ .alpha
+
+	JSL Sprite_DirectionToFacePlayerLong : PHX : TYX
+
+	; Make sure that the sprite is facing towards the player, otherwise
+	; talking can't happen. (What sprites actually use this???)
+	LDA.l $05E1A3, X : PLX : CMP.b $2F : BNE .not_facing_each_other
+
+	PLA : XBA : PLA
+
+	PHY
+
+	TAY : XBA
+	
+	JSL Sprite_ShowMessageUnconditional
+
+	LDA.b #$40 : STA.w $0F10, X
+
+	PLA : EOR.b #$03
+
+	SEC
+
+	RTL
+
+.not_facing_each_other
+.alpha
+	PLY
+	PLA
+
+	LDA.w $0DE0, X
+
+	CLC
+
+	RTL
+}
+
 ;--------------------------------------------------------------------------------
 ; A0 - A9 - 0 - 9
 ; AA - C3 - A - Z
diff --git a/doorframefixes.asm b/doorframefixes.asm
index 921dee5..270917f 100644
--- a/doorframefixes.asm
+++ b/doorframefixes.asm
@@ -7,8 +7,8 @@
 ;--------------------------------------------------------------------------------
 StoreLastOverworldDoorID:
 	TXA : INC
-	STA $7F5099
-	LDA $1BBB73, X : STA $010E
+	STA.l PreviousOverworldDoor
+	LDA.l $1BBB73, X : STA.w $010E
 RTL
 ;--------------------------------------------------------------------------------
 
@@ -16,14 +16,14 @@ RTL
 ; CacheDoorFrameData
 ;--------------------------------------------------------------------------------
 CacheDoorFrameData:
-	LDA $7F5099 : BEQ .originalBehaviour
+	LDA.l PreviousOverworldDoor : BEQ .originalBehaviour
 	DEC : ASL : TAX
-	LDA EntranceDoorFrameTable, X : STA $0696
-	LDA EntranceAltDoorFrameTable, X : STA $0698
+	LDA.l EntranceDoorFrameTable, X : STA.w $0696
+	LDA.l EntranceAltDoorFrameTable, X : STA.w $0698
 	BRA .done
 	.originalBehaviour
-		LDA $D724, X : STA $0696
-		STZ $0698
+		LDA.w $D724, X : STA.w $0696
+		STZ.w $0698
 	.done
 RTL
 ;--------------------------------------------------------------------------------
@@ -32,8 +32,8 @@ RTL
 ; WalkDownIntoTavern
 ;--------------------------------------------------------------------------------
 WalkDownIntoTavern:
-	LDA $7F5099
+	LDA.l PreviousOverworldDoor
 	; tavern door has index 0x42 (saved off value is incremented by one)
-	CMP #$43
+	CMP.b #$43
 RTL
 ;--------------------------------------------------------------------------------
diff --git a/dungeondrops.asm b/dungeondrops.asm
index c33e1cc..ad4d4a8 100644
--- a/dungeondrops.asm
+++ b/dungeondrops.asm
@@ -2,8 +2,8 @@
 ; Dungeon & Boss Drop Fixes
 ;--------------------------------------------------------------------------------
 DropSafeDungeon:
-	LDA $040C : CMP #$08 : BEQ +
-		LDA $01C6FC, X : JML Sprite_SpawnFallingItem
+	LDA.w $040C : CMP.b #$08 : BEQ +
+		LDA.l $01C6FC, X : JML Sprite_SpawnFallingItem
 	+
 RTL
-;--------------------------------------------------------------------------------
\ No newline at end of file
+;--------------------------------------------------------------------------------
diff --git a/endingsequence.asm b/endingsequence.asm
index 1603305..83f506b 100644
--- a/endingsequence.asm
+++ b/endingsequence.asm
@@ -7,7 +7,7 @@ EndingSequenceTableOverride:
 	TYX
 	LDA.l EndingSequenceText, X
 	PLX
-	STA $1008, X
+	STA.w $1008, X
 	PLY
 RTL
 ;--------------------------------------------------------------------------------
@@ -15,7 +15,7 @@ EndingSequenceTableLookupOverride:
 	PHY
 	PHX
 	TYX
-	LDA.l EndingSequenceText, X : AND #$00FF
+	LDA.l EndingSequenceText, X : AND.w #$00FF
 	PLX
 	PLY
 RTL
diff --git a/enemy_adjustments.asm b/enemy_adjustments.asm
index ec0411f..8b96720 100644
--- a/enemy_adjustments.asm
+++ b/enemy_adjustments.asm
@@ -3,21 +3,25 @@
 ; make sure bats always load LW stats
 ;--------------------------------------------------------------------------------
 NewBatInit:
-	CPY #$00 : BEQ .light_world
+	CPY.b #$00 : BEQ .light_world
 	;check if map id == 240 or 241
-	LDA $A0 : CMP #$F0 : BEQ .light_world ;oldman cave1
-	CMP #$F1 : BEQ .light_world ;oldman cave2
-	CMP #$B0 : BEQ .light_world ;agahnim statue keese
-	CMP #$D0 : BEQ .light_world ;agahnim darkmaze
+	LDA.b RoomIndex : CMP.b #$F0 : BEQ .light_world ;oldman cave1
+	CMP.b #$F1 : BEQ .light_world ;oldman cave2
+	CMP.b #$B0 : BEQ .light_world ;agahnim statue keese
+	CMP.b #$D0 : BEQ .light_world ;agahnim darkmaze
 
 	
-	LDA.b #$85 : STA $0CD2, X
-	LDA.b #$04 : STA $0E50, X
+	LDA.b #$85 : STA.w $0CD2, X
+	LDA.b #$04 : STA.w $0E50, X
 RTL
-
 	.light_world
-		LDA.b #$80 : STA $0CD2, X
-		LDA.b #$01 : STA $0E50, X
+		LDA.b #$80 : STA.w $0CD2, X
+		LDA.b #$01 : STA.w $0E50, X
 RTL
 ;--------------------------------------------------------------------------------
-
+NewFireBarDamage:
+        LDA.w $00EE : CMP.w $0F20, X : BNE .NotSameLayer
+                JSL Sprite_AttemptDamageToPlayerPlusRecoilLong
+                RTL
+.NotSameLayer
+RTL
diff --git a/entrances.asm b/entrances.asm
index b7ec86e..5e1d9e9 100644
--- a/entrances.asm
+++ b/entrances.asm
@@ -8,7 +8,7 @@ LockAgahnimDoors:
 		;#$0 = Never Locked
 		LDA.w #$0000 : RTL
 	+ : CMP.w #$0001 : BNE +
-		LDA ProgressIndicator : AND.w #$000F : CMP.w #$0002 : !BGE .unlock ; if we rescued zelda, skip
+		LDA.l ProgressIndicator : AND.w #$000F : CMP.w #$0002 : !BGE .unlock ; if we rescued zelda, skip
 			JSR.w LockAgahnimDoorsCore : RTL
 	+ : CMP.w #$0002 : BNE +
 		JSR.w LockAgahnimDoorsCore : BEQ .unlock
@@ -18,20 +18,20 @@ LockAgahnimDoors:
 		REP #$30
 		PLY : PLX
 		!BGE .crystalOrUnlock
-		LDA #$0001 : RTL
+		LDA.w #$0001 : RTL
 		.crystalOrUnlock
-		LDA InvertedMode : AND.w #$00FF : BEQ .unlock
+		LDA.l InvertedMode : AND.w #$00FF : BEQ .unlock
 
-		LDA OverworldEventDataWRAM+$43 : AND.w #$0020 : BNE .unlock ; Check if GT overlay is already on or not
-		LDA $0308 : AND.w #$0080 : BEQ ++ ;If we are holding an item
+		LDA.l OverworldEventDataWRAM+$43 : AND.w #$0020 : BNE .unlock ; Check if GT overlay is already on or not
+		LDA.w $0308 : AND.w #$0080 : BEQ ++ ;If we are holding an item
 
 	.locked
-			LDA #$0001 : RTL ;Keep the door locked
+			LDA.w #$0001 : RTL ;Keep the door locked
 		++
 		SEP #$30
 		JSL $099B6F ;Add tower break seal
 		REP #$30
-		LDA #$0001 ;Prevent door from opening that frame otherwise it glitchy
+		LDA.w #$0001 ;Prevent door from opening that frame otherwise it glitchy
 		RTL
 
 	+
@@ -44,7 +44,7 @@ RTL
 FlagAgahnimDoor:
 	LDA.l InvertedMode : BEQ .vanilla
 
-	LDA OverworldEventDataWRAM+$43 : ORA #$20 : STA OverworldEventDataWRAM+$43 ; activate GT overlay
+	LDA.l OverworldEventDataWRAM+$43 : ORA.b #$20 : STA.l OverworldEventDataWRAM+$43 ; activate GT overlay
 
 .vanilla
 	LDA.b #$28 : STA.b $72
@@ -53,9 +53,9 @@ FlagAgahnimDoor:
 
 ;--------------------------------------------------------------------------------
 LockAgahnimDoorsCore:
-	LDA $22 : CMP.w #1992 : !BLT + ; door too far left, skip
+	LDA.b $22 : CMP.w #1992 : !BLT + ; door too far left, skip
 			  CMP.w #2088 : !BGE + ; door too rat right, skip
-	LDA $20 : CMP.w #1720 : !BGE + ; door too low, skip
+	LDA.b $20 : CMP.w #1720 : !BGE + ; door too low, skip
 		LDA.w #$0001
 RTS
 	+
@@ -86,16 +86,15 @@ AllowStartFromSingleEntranceCave:
 		BNE +
 			JMP .done
 		+
-
 		DEC
 		STA.b Scrap00
 		ASL #2 : !ADD Scrap00 : ASL #2 ; mult by 20
 		TAX
 
-		LDA.w #$0016 : STA $7EC142 ; Cache the main screen designation
+		LDA.w #$0016 : STA.l $7EC142 ; Cache the main screen designation
 		LDA.l StartingAreaExitTable+$05, X : STA.l $7EC144 ; Cache BG1 V scroll
 		LDA.l StartingAreaExitTable+$07, X : STA.l $7EC146 ; Cache BG1 H scroll
-		LDA.l StartingAreaExitTable+$09, X : !ADD.w #$0010 : STA $7EC148 ; Cache Link's Y coordinate
+		LDA.l StartingAreaExitTable+$09, X : !ADD.w #$0010 : STA.l $7EC148 ; Cache Link's Y coordinate
 		LDA.l StartingAreaExitTable+$0B, X : STA.l $7EC14A ; Cache Link's X coordinate
 		LDA.l StartingAreaExitTable+$0D, X : STA.l $7EC150 ; Cache Camera Y coord lower bound.
 		LDA.l StartingAreaExitTable+$0F, X : STA.l $7EC152 ; Cache Camera X coord lower bound.
@@ -113,19 +112,19 @@ AllowStartFromSingleEntranceCave:
 		BIT.w #$0080 : BEQ + : ORA.w #$FF00 : + ; Sign extend
 		STA.l $7EC16E
 
-		LDA.w #$0000 : !SUB.l $7EC16A : STA $7EC16C
-		LDA.w #$0000 : !SUB.l $7EC16E : STA $7EC170
+		LDA.w #$0000 : !SUB.l $7EC16A : STA.l $7EC16C
+		LDA.w #$0000 : !SUB.l $7EC16E : STA.l $7EC170
 
 		LDA.l StartingAreaExitTable+$02, X : AND.w #$00FF
-		STA $7EC14C ; Cache the overworld area number
-		STA $7EC140 ; Cache the aux overworld area number
+		STA.l $7EC14C ; Cache the overworld area number
+		STA.l $7EC140 ; Cache the aux overworld area number
 
-		STZ $0698 ;zero out door overlays in case starting overworld door is not set
-		STZ $0699 ;zero out door overlays in case starting overworld door is not set
+		STZ.w $0698 ;zero out door overlays in case starting overworld door is not set
+		STZ.w $0699 ;zero out door overlays in case starting overworld door is not set
 
 		SEP #$20 ; set 8-bit accumulator
-		LDA $7EF3C8 : TAX
-		LDA.l StartingAreaOverworldDoor, X : STA.l $7F5099 ;Load overworld door
+		LDA.l $7EF3C8 : TAX
+		LDA.l StartingAreaOverworldDoor, X : STA.l PreviousOverworldDoor ;Load overworld door
 		REP #$20 ; reset 16-bit accumulator
                 JSL.l CacheDoorFrameData
 
@@ -135,7 +134,7 @@ RTL
 ;--------------------------------------------------------------------------------
 AllowStartFromExit:
 
-	LDX $1CE8
+	LDX.w $1CE8
 	LDA.l ShouldStartatExit, X : BNE .doStart
 
 	LDA.l StartingEntrance ; what we wrote over
@@ -146,21 +145,21 @@ JML.l AllowStartFromExitReturn
 	LDA.l $028481, X ;Module_LocationMenu_starting_points
 	ASL : TAX
 
-	LDA.l $02D8D2, X : STA $A0
-	LDA.l $02D8D3, X : STA $A1
+	LDA.l $02D8D2, X : STA.b RoomIndex
+	LDA.l $02D8D3, X : STA.b RoomIndex+1
 
 	; Go to pre-overworld mode
-	LDA.b #$08 : STA $10
+	LDA.b #$08 : STA.b $10
 
-	STZ $11
-	STZ $B0
+	STZ.b $11
+	STZ.b $B0
 
-	STZ $010A
+	STZ.w $010A
 
-	STZ $04AA
+	STZ.w $04AA
 	JSL Equipment_SearchForEquippedItemLong
 	JSL HUD_RebuildLong2
-	JSL $0DDD32 ; Equipment_UpdateEquippedItemLong
+	JSL Equipment_UpdateEquippedItemLong
 RTL
 
 ;--------------------------------------------------------------------------------
@@ -196,7 +195,7 @@ PreventEnterOnBonk:
 	STA.b Scrap00 ; part of what we wrote over
 	LDA.l InvertedMode : AND.w #$00FF : BEQ .done
 	LDA.l $5D : AND.w #$00FF : CMP.w #$0014 : BNE .done ;in mirror mode?
-	LDA.b $8A : AND.w #$0040 : CMP $7B : BEQ .done ; Are we bonking, or doing the superbunny glitch?
+	LDA.b $8A : AND.w #$0040 : CMP.b $7B : BEQ .done ; Are we bonking, or doing the superbunny glitch?
 
 		; If in inverted, are in mirror mode, and are bonking then do not enter
 		JML.l PreventEnterOnBonk_BRANCH_IX
@@ -206,8 +205,8 @@ PreventEnterOnBonk:
 JML.l PreventEnterOnBonk_return
 ;--------------------------------------------------------------------------------
 TurtleRockEntranceFix:
-	LDA TurtleRockAutoOpenFix : BEQ .done
-	LDA $8A : CMP.b #$47 : BNE .done
+	LDA.l TurtleRockAutoOpenFix : BEQ .done
+	LDA.b $8A : CMP.b #$47 : BNE .done
 		;If exiting to turtle rock ensure the entrance is open
 		LDA.l OverworldEventDataWRAM+$47 : ORA.b #$20 : STA.l OverworldEventDataWRAM+$47
 .done
@@ -216,14 +215,14 @@ RTL
 AnimatedEntranceFix: ;when an entrance animation tries to start
 	PHA
 	LDA.l InvertedMode : BEQ + ;If we are in inverted mode
-	LDA $8A : AND.b #$40 : BNE + ;and in the light world
+	LDA.b $8A : AND.b #$40 : BNE + ;and in the light world
 		PLA
-		STZ $04C6 ; skip it.
-		LDA #$00
+		STZ.w $04C6 ; skip it.
+		LDA.b #$00
 		RTL
 	+
 	PLA
-	STA $02E4 ;what we wrote over
-	STA $0FC1 ;what we wrote over
-	STA $0710 ;what we wrote over
+	STA.w $02E4 ;what we wrote over
+	STA.w $0FC1 ;what we wrote over
+	STA.w $0710 ;what we wrote over
 RTL
diff --git a/events.asm b/events.asm
index 4738663..363524a 100644
--- a/events.asm
+++ b/events.asm
@@ -148,13 +148,13 @@ OnNewFile:
 	PHX : PHP
 		; reset some values on new file that are otherwise only reset on hard reset
 		SEP #$20 ; set 8-bit accumulator
-		STZ $03C4 ; ancilla slot index
-		STZ $047A ; EG
-		STZ $0B08 : STZ $0B09 ; arc variable
-		STZ $0CFB ; enemies killed (pull trees)
-		STZ $0CFC ; times taken damage (pull trees)
-		STZ $0FC7 : STZ $0FC8 : STZ $0FC9 : STZ $0FCA : STZ $0FCB : STZ $0FCC : STZ $0FCD ; prize packs
-		LDA #$00 : STA.l $7EC011 ; mosaic
+		STZ.w $03C4 ; ancilla slot index
+		STZ.w $047A ; EG
+		STZ.w $0B08 : STZ $0B09 ; arc variable
+		STZ.w $0CFB ; enemies killed (pull trees)
+		STZ.w $0CFC ; times taken damage (pull trees)
+		STZ.w $0FC7 : STZ.w $0FC8 : STZ.w $0FC9 : STZ.w $0FCA : STZ.w $0FCB : STZ.w $0FCC : STZ.w $0FCD ; prize packs
+		LDA.b #$00 : STA.l $7EC011 ; mosaic
 		JSL InitRNGPointerTable ; boss RNG
 	PLP : PLX
 RTL
@@ -166,16 +166,12 @@ RTL
 ;--------------------------------------------------------------------------------
 OnLinkDamaged:
 	JSL.l IncrementDamageTakenCounter_Arb
-	;JSL.l FlipperKill
 	JML.l OHKOTimer
 
 ;--------------------------------------------------------------------------------
-OnEnterWater:
-	JSL.l RegisterWaterEntryScreen
-
-	JSL.l MysteryWaterFunction
-	LDX.b #$04
-RTL
+;OnEnterWater:
+;       JSL.l UnequipCapeQuiet ; what we wrote over
+;RTL
 ;--------------------------------------------------------------------------------
 OnLinkDamagedFromPit:
 	JSL.l OHKOTimer
@@ -197,7 +193,6 @@ OnLinkDamagedFromPitOutdoors:
 ;--------------------------------------------------------------------------------
 OnOWTransition:
 	JSL.l FloodGateReset
-	JSL.l FlipperFlag
 	JSL.l StatTransitionCounter
 	PHP
 	SEP #$20 ; set 8-bit accumulator
@@ -206,14 +201,14 @@ OnOWTransition:
 RTL
 ;--------------------------------------------------------------------------------
 OnLoadDuckMap:
-	LDA.l ScratchBufferV
+	LDA.l DuckMapFlag
 	BNE +
-		INC : STA.l ScratchBufferV
+		INC : STA.l DuckMapFlag
 		JSL OverworldMap_InitGfx : DEC $0200
 
 		RTL
 	+
-	LDA.b #$00 : STA.l ScratchBufferV
+	LDA.b #$00 : STA.l DuckMapFlag
 	JML OverworldMap_DarkWorldTilemap
 
 ;--------------------------------------------------------------------------------
@@ -228,10 +223,10 @@ RTL
 PostItemAnimation:
 	LDA.b #$00 : STA.l BusyItem ; mark item as finished
 
-	LDA.l $7F509F : BEQ +
+	LDA.l TextBoxDefer : BEQ +
 		STZ.w $1CF0 : STZ.w $1CF1 ; reset decompression buffer
 		JSL.l Main_ShowTextMessage_Alt
-		LDA.b #$00 : STA.l $7F509F
+		LDA.b #$00 : STA.l TextBoxDefer
 	+
 
 	LDA.w $02E9 : CMP.b #$01 : BNE +
diff --git a/fairyfixes.asm b/fairyfixes.asm
index 2305cd7..3d8e9e9 100644
--- a/fairyfixes.asm
+++ b/fairyfixes.asm
@@ -2,20 +2,20 @@
 ; Fairy Changes & Fixes
 ;--------------------------------------------------------------------------------
 RefillHealthPlusMagic:
-    LDA BigFairyHealth : STA HeartsFiller
+    LDA.l BigFairyHealth : STA.l HeartsFiller
 RTL
 ;--------------------------------------------------------------------------------
 RefillHealthPlusMagic8bit:
-    LDA BigFairyHealth : STA HeartsFiller
-    LDA BigFairyMagic : STA MagicFiller
+    LDA.l BigFairyHealth : STA.l HeartsFiller
+    LDA.l BigFairyMagic : STA.l MagicFiller
 RTL
 ;--------------------------------------------------------------------------------
 CheckFullHealth:
-    LDA BigFairyHealth : BEQ +
-        LDA CurrentHealth : CMP MaximumHealth : BNE .player_hp_not_full_yet
+    LDA.l BigFairyHealth : BEQ +
+        LDA.l CurrentHealth : CMP.l MaximumHealth : BNE .player_hp_not_full_yet
     +
-    LDA BigFairyMagic : BEQ +
-        LDA CurrentMagic : CMP.b #$80 : BNE .player_mp_not_full_yet
+    LDA.l BigFairyMagic : BEQ +
+        LDA.l CurrentMagic : CMP.b #$80 : BNE .player_mp_not_full_yet
     +
     LDA.b #$00
 RTL
@@ -30,57 +30,56 @@ FairyPond_Init:
 		JML.l Sprite_ShowMessageFromPlayerContact
 	+
 	PHY : JSL.l Sprite_CheckDamageToPlayerSameLayerLong : BCC +
-		LDA BottleContentsOne : CMP.b #$02 : BNE ++ : LDA.b #$1C : PHA : BRA .emptyBottle : ++
-		LDA BottleContentsTwo : CMP.b #$02 : BNE ++ : LDA.b #$1D : PHA : BRA .emptyBottle : ++
-		LDA BottleContentsThree : CMP.b #$02 : BNE ++ : LDA.b #$1E : PHA : BRA .emptyBottle : ++
-		LDA BottleContentsFour : CMP.b #$02 : BNE ++ : LDA.b #$1F : PHA : BRA .emptyBottle : ++
+		LDA.l BottleContentsOne : CMP.b #$02 : BNE ++ : LDA.b #$1C : PHA : BRA .emptyBottle : ++
+		LDA.l BottleContentsTwo : CMP.b #$02 : BNE ++ : LDA.b #$1D : PHA : BRA .emptyBottle : ++
+		LDA.l BottleContentsThree : CMP.b #$02 : BNE ++ : LDA.b #$1E : PHA : BRA .emptyBottle : ++
+		LDA.l BottleContentsFour : CMP.b #$02 : BNE ++ : LDA.b #$1F : PHA : BRA .emptyBottle : ++
 			.noInventory
-			LDA.b #$0A : STA $0D80, X
+			LDA.b #$0A : STA.w $0D80, X
 			LDA.b #$51
 			LDY.b #$01
 			JSL.l Sprite_ShowMessageFromPlayerContact
 			JMP .cleanup
 		
 			.emptyBottle
-			LDA.b #$02 : STA $0D80, X
-			;JSL Player_ResetState ; If we continue to have issues, add this in too. (After determining the address for it)
+			LDA.b #$02 : STA.w $0D80, X
 			STZ $2F
-			LDA.b #$01 : STA $02E4
-			PLA : STA $1CE8
+			LDA.b #$01 : STA.w $02E4
+			PLA : STA.w $1CE8
 		.cleanup
-		STZ $0EB0, X ; Clear the sprite's item-given variable
+		STZ.w $0EB0, X ; Clear the sprite's item-given variable
 		CLC ; skip rest of original function
 	+ :	PLY
 RTL
 ;--------------------------------------------------------------------------------
 HappinessPond_Check:
-	LDA $A0 : CMP.b #$15 ;what we wrote over
+	LDA.b RoomIndex : CMP.b #$15 ;what we wrote over
 	BNE .done
 	PHP
 
 	LDA.b #$72
 	JSL Sprite_SpawnDynamically
 
-	LDA $0FD8 : STA $0D10, Y
-	LDA $0FD9 : STA $0D30, Y
+	LDA.w $0FD8 : STA.w $0D10, Y
+	LDA.w $0FD9 : STA.w $0D30, Y
 
-	LDA $0FDA : !SUB.b #$40 : STA $0D00, Y
-	LDA $0FDB : SBC.b #$00 : STA $0D20, Y
+	LDA.w $0FDA : !SUB.b #$40 : STA.w $0D00, Y
+	LDA.w $0FDB : SBC.b #$00 : STA.w $0D20, Y
 
-	LDA.b #$01 : STA $0DA0, Y
+	LDA.b #$01 : STA.w $0DA0, Y
 
 	LDA.b #$BB
 	JSL Sprite_SpawnDynamically
 
-	LDA.b #$08 : STA $0DD0, Y ; ensure we run prep for the shopkeeper
+	LDA.b #$08 : STA.w $0DD0, Y ; ensure we run prep for the shopkeeper
 
-	LDA $0FD8 : STA $0D10, Y
-	LDA $0FD9 : STA $0D30, Y
+	LDA.w $0FD8 : STA.w $0D10, Y
+	LDA.w $0FD9 : STA.w $0D30, Y
 
-	LDA $0FDA : !SUB.b #$20 : STA $0D00, Y
-	LDA $0FDB : SBC.b #$00 : STA $0D20, Y
+	LDA.w $0FDA : !SUB.b #$20 : STA.w $0D00, Y
+	LDA.w $0FDB : SBC.b #$00 : STA.w $0D20, Y
 
-	STZ $0DD0, X ; self terminate
+	STZ.w $0DD0, X ; self terminate
 
 	PLP
 	.done
diff --git a/fileselect.asm b/fileselect.asm
index 6c66c9a..0387cc7 100644
--- a/fileselect.asm
+++ b/fileselect.asm
@@ -328,8 +328,8 @@ DrawPlayerFileShared:
 
 	LDA.l EquipmentSRAM+$0108 : AND.w #$00FF
 	JSL.l HexToDec
-	LDA.l $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(11,26)
-	LDA.l $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(11,27)
+	LDA.l HexToDecDigit4 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(11,26)
+	LDA.l HexToDecDigit5 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(11,27)
 
 	; Boots
 	%fs_drawItemBasic(EquipmentSRAM+$15,3,28,FileSelectItems_boots)
@@ -560,16 +560,16 @@ FileSelectDrawHudBar:
 	LDA.w #$029B|!FS_COLOR_GREEN : %fs_draw16x8(0,10)
 	LDA.l DisplayRupeesSRAM
 	JSL.l HexToDec
-	LDA.l $7F5004 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,9)
-	LDA.l $7F5005 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,10)
-	LDA.l $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,11)
-	LDA.l $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,12)
+	LDA.l HexToDecDigit2 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,9)
+	LDA.l HexToDecDigit3 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,10)
+	LDA.l HexToDecDigit4 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,11)
+	LDA.l HexToDecDigit5 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,12)
 
 	LDA.w #$028B|!FS_COLOR_BLUE : %fs_draw16x8(0,14)
 	LDA.l BombsEquipmentSRAM : AND.w #$00FF
 	JSL.l HexToDec
-	LDA.l $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,14)
-	LDA.l $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,15)
+	LDA.l HexToDecDigit4 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,14)
+	LDA.l HexToDecDigit5 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,15)
 
 	LDA.l BowTrackingSRAM : AND.w #$0040 : BEQ +
 		LDA.w #$0299|!FS_COLOR_RED : %fs_draw16x8(0,17)
@@ -579,8 +579,8 @@ FileSelectDrawHudBar:
 	++
 	LDA.l CurrentArrowsSRAM : AND.w #$00FF
 	JSL.l HexToDec
-	LDA.l $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,17)
-	LDA.l $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,18)
+	LDA.l HexToDecDigit4 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,17)
+	LDA.l HexToDecDigit5 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,18)
 RTS
 ;--------------------------------------------------------------------------------
 AltBufferTable:
diff --git a/firebarlayer.asm b/firebarlayer.asm
deleted file mode 100644
index f7118b2..0000000
--- a/firebarlayer.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-NewFireBarDamage:
-{
-    LDA $00EE : CMP $0F20, X : BNE .NotSameLayer
-        JSL Sprite_AttemptDamageToPlayerPlusRecoilLong
-        RTL
-    .NotSameLayer
-    RTL
-}
\ No newline at end of file
diff --git a/flipperkill.asm b/flipperkill.asm
index 758f172..3072056 100644
--- a/flipperkill.asm
+++ b/flipperkill.asm
@@ -1,65 +1,13 @@
 ;================================================================================
 ; Fake Flippers Softlock Fix
 ;--------------------------------------------------------------------------------
-FlipperKill:
-	PHP
-	LDA.b $5D : CMP.b #$04 : BNE .done ; skip if we're not swimming
-	LDA.l FlippersEquipment : BNE .done ; skip if we have the flippers
-	LDA.l $7F5001 : BEQ .done ; skip if we're not marked in danger for softlock
-	LDA.b $8A : CMP.l $7F5098 : BEQ .done ; skip if we're on the same screen we entered the water on
-	LDA.l IgnoreFaeries : ORA.b #$04 : STA.l IgnoreFaeries
-	LDA.b #$00 : STA CurrentHealth ; kill link
-	LDA.b #$00 : STA $7F5001 ; mark fake flipper softlock as impossible
-	.done
-	PLP
-	LDA.l CurrentHealth ; thing we wrote over
-RTL
-;--------------------------------------------------------------------------------
-IgnoreFairyCheck:
-    LDX.b #$00 ; thing we wrote over
-    LDA.l IgnoreFaeries : BIT.b #$04 : BEQ .normal
-	
-    AND.b #$FB : STA.l IgnoreFaeries ; clear ignore fairy flag
-	LDA.b #$F0 ; set check to invalid entry
-RTL
-	.normal
-    LDA.b #$06 ; set check to fairy
-RTL
-;--------------------------------------------------------------------------------
-FlipperReset:
-	JSL $0998E8 ; AddTransitionSplash
-	LDA.b #$00 : STA.l $7F5001 ; mark fake flipper softlock as impossible
-	.done 
-RTL
-;--------------------------------------------------------------------------------
-FlipperFlag:
-	LDA.b $5D : CMP.b #$04 : BNE .done ; skip if we're not swimming
-	LDA.l FlippersEquipment : BNE .safe ; skip if we have the flippers
-	LDA.b #$01 : STA.l $7F5001 ; mark fake flipper softlock as possible
-	BRA .done
-	.safe
-	LDA.b #$00 : STA.l $7F5001 ; mark fake flipper softlock as impossible
-	.done 
-RTL
-;--------------------------------------------------------------------------------
-RegisterWaterEntryScreen:
-	PHA
-		LDA.b $8A : STA.l $7F5098 ; store ow index
-	PLA
-RTL
-;--------------------------------------------------------------------------------
-MysteryWaterFunction: ; *$3AE54 ALTERNATE ENTRY POINT
-    LDA.b #$20 : STA $02E2
+
+UnequipCapeQuiet: 
+    LDA.b #$20 : STA.w $02E2
     STZ.w $037B
     STZ.b $55
     STZ.w $0360
 RTL
-;--------------------------------------------------------------------------------
-
-
-;===================================================================================================
-; More elegant solution
-;===================================================================================================
 
 protectff:
 	LDA.l AllowAccidentalMajorGlitch
diff --git a/floodgatesoftlock.asm b/floodgatesoftlock.asm
index e593344..daefa04 100644
--- a/floodgatesoftlock.asm
+++ b/floodgatesoftlock.asm
@@ -5,21 +5,21 @@ FloodGateAndMasterSwordFollowerReset:
 	JSL.l MasterSwordFollowerClear
 FloodGateReset:
 	LDA.l PersistentFloodgate : BNE +
-		LDA OverworldEventDataWRAM+$3B : AND.b #$DF : STA OverworldEventDataWRAM+$3B ; reset water outside floodgate
-		LDA OverworldEventDataWRAM+$7B : AND.b #$DF : STA OverworldEventDataWRAM+$7B ; reset water outside swamp palace
-		LDA RoomDataWRAM[$010B].low : AND.b #$7F : STA RoomDataWRAM[$010B].low ; clear water inside floodgate
-		LDA RoomDataWRAM[$28].high : AND.b #$FE : STA RoomDataWRAM[$28].high ; clear water front room (room 40)
+		LDA.l OverworldEventDataWRAM+$3B : AND.b #$DF : STA.l OverworldEventDataWRAM+$3B ; reset water outside floodgate
+		LDA.l OverworldEventDataWRAM+$7B : AND.b #$DF : STA.l OverworldEventDataWRAM+$7B ; reset water outside swamp palace
+		LDA.l RoomDataWRAM[$010B].low : AND.b #$7F : STA.l RoomDataWRAM[$010B].low ; clear water inside floodgate
+		LDA.l RoomDataWRAM[$28].high : AND.b #$FE : STA.l RoomDataWRAM[$28].high ; clear water front room (room 40)
 	+
 FloodGateResetInner:
 	LDA.l Bugfix_SwampWaterLevel : BEQ +++
-		LDA RoomDataWRAM[$37].low : AND.b #$04 : BEQ + ; Check if key in room 55 has been collected. 
-		LDA FlippersEquipment : AND.b #$01 : BNE ++ ; Check for flippers. This can otherwise softlock doors if flooded without flippers and no way to reset.
+		LDA.l RoomDataWRAM[$37].low : AND.b #$04 : BEQ + ; Check if key in room 55 has been collected. 
+		LDA.l FlippersEquipment : AND.b #$01 : BNE ++ ; Check for flippers. This can otherwise softlock doors if flooded without flippers and no way to reset.
 	+
-		LDA RoomDataWRAM[$37].low : AND.b #$7F : STA RoomDataWRAM[$37].low ; clear water room 55 - outer room you shouldn't be able to softlock except in major glitches
+		LDA.l RoomDataWRAM[$37].low : AND.b #$7F : STA.l RoomDataWRAM[$37].low ; clear water room 55 - outer room you shouldn't be able to softlock except in major glitches
 	++
-		LDA RoomDataWRAM[$35].high : AND.b #$04 : BNE +++ ; Check if key in room 53 has been collected.
+		LDA.l RoomDataWRAM[$35].high : AND.b #$04 : BNE +++ ; Check if key in room 53 has been collected.
 		; no need to check for flippers on the inner room, as you can't get to the west door no matter what, without flippers.
-		LDA RoomDataWRAM[$35].low : AND.b #$7F : STA RoomDataWRAM[$35].low ; clear water room 53 - inner room with the easy key flood softlock
+		LDA.l RoomDataWRAM[$35].low : AND.b #$7F : STA.l RoomDataWRAM[$35].low ; clear water room 53 - inner room with the easy key flood softlock
 	+++
 RTL
 ;================================================================================
diff --git a/flute.asm b/flute.asm
index fe88520..6684953 100644
--- a/flute.asm
+++ b/flute.asm
@@ -2,38 +2,38 @@
 ; Randomize Flute Dig Item
 ;--------------------------------------------------------------------------------
 SpawnHauntedGroveItem:
-	LDA $8A : CMP.b #$2A : BEQ + : RTL : + ; Skip if not the haunted grove
-	LDA $1B : BEQ + : RTL : + ; Skip if indoors
+	LDA.b $8A : CMP.b #$2A : BEQ + : RTL : + ; Skip if not the haunted grove
+	LDA.b $1B : BEQ + : RTL : + ; Skip if indoors
 
 	%GetPossiblyEncryptedItem(HauntedGroveItem, HeartPieceOutdoorValues)
 	JSL.l PrepDynamicTile
 	
 	LDA.b #$EB
-	STA $7FFE00
+	STA.l $7FFE00
 	JSL Sprite_SpawnDynamically
 
 	LDX.b #$00
-	LDA $2F : CMP.b #$04 : BEQ + : INX : +
+	LDA.b $2F : CMP.b #$04 : BEQ + : INX : +
 
-	LDA.l .x_speeds, X : STA $0D50, Y
+	LDA.l .x_speeds, X : STA.w $0D50, Y
 
-	LDA.b #$00 : STA $0D40, Y
-	LDA.b #$18 : STA $0F80, Y
-	LDA.b #$FF : STA $0B58, Y
-	LDA.b #$30 : STA $0F10, Y
+	LDA.b #$00 : STA.w $0D40, Y
+	LDA.b #$18 : STA.w $0F80, Y
+	LDA.b #$FF : STA.w $0B58, Y
+	LDA.b #$30 : STA.w $0F10, Y
 
-	LDA $22 : !ADD.l .x_offsets, X
-        AND.b #$F0 : STA $0D10, Y
-	LDA $23 : ADC.b #$00 : STA $0D30, Y
+	LDA.b $22 : !ADD.l .x_offsets, X
+        AND.b #$F0 : STA.w $0D10, Y
+	LDA.b $23 : ADC.b #$00 : STA.w $0D30, Y
 
-	LDA $20 : !ADD.b #$16 : AND.b #$F0 : STA $0D00, Y
-	LDA $21 : ADC.b #$00 : STA $0D20, Y
+	LDA.b $20 : !ADD.b #$16 : AND.b #$F0 : STA.w $0D00, Y
+	LDA.b $21 : ADC.b #$00 : STA.w $0D20, Y
 
-	LDA.b #$00 : STA $0F20, Y
+	LDA.b #$00 : STA.w $0F20, Y
 	TYX
 
-	LDX $8A ; haunted grove (208D0A)
-	LDA OverworldEventDataWRAM, X : AND.b #$40 : BNE +
+	LDX.b $8A ; haunted grove (208D0A)
+	LDA.l OverworldEventDataWRAM, X : AND.b #$40 : BNE +
 		LDA.b #$1B : JSL Sound_SetSfx3PanLong
 	+
 RTL
@@ -52,30 +52,30 @@ RTL
 }
 ;--------------------------------------------------------------------------------
 FluteBoy:
-	LDA $10 : CMP.b #$1A : BEQ +
-		LDA.b #$01 : STA $0FDD
+	LDA.b $10 : CMP.b #$1A : BEQ +
+		LDA.b #$01 : STA.w $0FDD
 		JML.l FluteBoy_Abort
 	+
-	LDA $0D80, X : CMP.b #$03 ; thing we wrote over
+	LDA.w $0D80, X : CMP.b #$03 ; thing we wrote over
 JML.l FluteBoy_Continue
 ;--------------------------------------------------------------------------------
 FreeDuckCheck:
 	LDA.l InvertedMode : BEQ .done
-	LDA FluteEquipment : CMP.b #$03 : BEQ .done ; flute is already active
+	LDA.l FluteEquipment : CMP.b #$03 : BEQ .done ; flute is already active
 	
     ; check the area, is it #$18 = 30?
-    LDA $8A : CMP.b #$18 : BNE .done
+    LDA.b $8A : CMP.b #$18 : BNE .done
 
 	REP #$20
 	
     ; Y coordinate boundaries for setting it off.
-    LDA $20
+    LDA.b $20
     
     CMP.w #$0760 : BCC .done
     CMP.w #$07E0 : BCS .done
     
     ; do if( (Ycoord >= 0x0760) && (Ycoord < 0x07e0
-    LDA $22
+    LDA.b $22
     
     CMP.w #$01CF : BCC .done
     CMP.w #$0230 : BCS .done
@@ -84,7 +84,7 @@ FreeDuckCheck:
     SEP #$20
     
     ; Apparently a special Overworld mode for doing this?
-    LDA.b #$2D : STA $11
+    LDA.b #$2D : STA.b $11
     
     ; Trigger the sequence to start the weathervane explosion.
     LDY.b #$00
@@ -94,12 +94,12 @@ FreeDuckCheck:
 	BRA .skipSong
 	.done
     SEP #$20
-	LDA.b #$80 : STA $03F0 ; thing we wrote over, load flute timer
+	LDA.b #$80 : STA.w $03F0 ; thing we wrote over, load flute timer
 	LDA.b #$13
 RTL
 	.skipSong
 	SEP #$20
-	LDA.b #$80 : STA $03F0 ; thing we wrote over, load flute timer
+	LDA.b #$80 : STA.w $03F0 ; thing we wrote over, load flute timer
 	LDA.b #$00
 RTL
 ;--------------------------------------------------------------------------------
diff --git a/framehook.asm b/framehook.asm
index 2f98e74..24434e6 100644
--- a/framehook.asm
+++ b/framehook.asm
@@ -33,24 +33,13 @@ NMIHookAction:
 JML.l NMIHookReturn
 ;--------------------------------------------------------------------------------
 PostNMIHookAction:
-	LDA.l NMIAux : BEQ +
-		LDA.b Scrap00 : PHA ; preserve DP ram
-		LDA.b Scrap01 : PHA
-		LDA.b Scrap02 : PHA
+	LDA.w NMIAux : BEQ +
 		
-		LDA.l NMIAux+2 : STA.b Scrap02 ; set up jump pointer
-		LDA.l NMIAux+1 : STA.b Scrap01 
-		LDA.l NMIAux+0 : STA.b Scrap00 
-		
-		PHK : PER .return-1 ; push stack for RTL return
-		JMP [$0000]
+		PHK : PEA .return-1 ; push stack for RTL return
+		JMP.w [NMIAux]
 		
 		.return
-		LDA.b #$00 : STA.l NMIAux ; zero bank byte of NMI hook pointer
-		
-		PLA : STA.b Scrap02
-		PLA : STA.b Scrap01
-		PLA : STA.b Scrap00
+		STZ.w NMIAux ; zero bank byte of NMI hook pointer
 	+
 	
 	LDA.b $13 : STA.w INIDISP ; thing we wrote over, turn screen back on
diff --git a/glitched.asm b/glitched.asm
index 76901b2..ce40b7e 100644
--- a/glitched.asm
+++ b/glitched.asm
@@ -2,7 +2,7 @@
 ; Glitched Mode Fixes
 ;================================================================================
 GetAgahnimPalette:
-	LDA $A0 ; get room id
+	LDA.b RoomIndex ; get room id
 	CMP.b #13 : BNE + ; Agahnim 2 room
 		LDA.b #$07 ; Use Agahnim 2
 		RTL
@@ -11,25 +11,25 @@ GetAgahnimPalette:
 		RTL
 ;--------------------------------------------------------------------------------
 GetAgahnimDeath:
-	STA $0BA0, X ; thing we wrote over
-	LDA $A0 ; get room id
+	STA.w $0BA0, X ; thing we wrote over
+	LDA.b RoomIndex ; get room id
 	CMP.b #13 : BNE + ; Agahnim 2 room
 		LDA.l Bugfix_SetWorldOnAgahnimDeath : BEQ ++
 			LDA.l InvertedMode : BEQ +++
-				LDA.b #$00 : STA CurrentWorld ; Switch to light world
+				LDA.b #$00 : STA.l CurrentWorld ; Switch to light world
 				BRA ++
 			+++
-			LDA.b #$40 : STA CurrentWorld ; Switch to dark world
+			LDA.b #$40 : STA.l CurrentWorld ; Switch to dark world
 		++
 		LDA.b #$01 ; Use Agahnim 2
 		RTL
 	+ ; Elsewhere
 		LDA.l Bugfix_SetWorldOnAgahnimDeath : BEQ ++
 			LDA.l InvertedMode : BEQ +++
-				LDA.b #$40 : STA CurrentWorld ; Switch to dark world
+				LDA.b #$40 : STA.l CurrentWorld ; Switch to dark world
 				BRA ++
 			+++
-			LDA.b #$00 : STA CurrentWorld ; Switch to light world
+			LDA.b #$00 : STA.l CurrentWorld ; Switch to light world
 			; (This will later get flipped to DW when Agahnim 1
 			; warps us to the pyramid)
 		++
@@ -37,7 +37,7 @@ GetAgahnimDeath:
 		RTL
 ;--------------------------------------------------------------------------------
 GetAgahnimType:
-	LDA $A0 ; get room id
+	LDA.b RoomIndex ; get room id
 	CMP.b #13 : BNE + ; Agahnim 2 room
 		LDA.b #$0006 ; Use Agahnim 2
 		BRA .done
@@ -48,7 +48,7 @@ RTL
 ;--------------------------------------------------------------------------------
 GetAgahnimSlot:
 	PHX ; thing we wrote over
-	LDA $A0 ; get room id
+	LDA.b RoomIndex ; get room id
 	CMP.b #13 : BNE + ; Agahnim 2 room
 		LDA.b #$01 ; Use Agahnim 2
 		JML.l GetAgahnimSlotReturn
@@ -57,8 +57,8 @@ GetAgahnimSlot:
 		JML.l GetAgahnimSlotReturn
 ;--------------------------------------------------------------------------------
 GetAgahnimLightning:
-	INC $0E30, X ; thing we wrote over
-	LDA $A0 ; get room id
+	INC.w $0E30, X ; thing we wrote over
+	LDA.b RoomIndex ; get room id
 	CMP.b #13 : BNE + ; Agahnim 2 room
 		LDA.b #$01 ; Use Agahnim 2
 		RTL
@@ -69,11 +69,11 @@ GetAgahnimLightning:
 ;0 = Allow
 ;1 = Forbid
 AllowJoypadInput:
-	LDA PermitSQFromBosses : BEQ .fullCheck
-	LDA $0403 : AND.b #$80 : BEQ .fullCheck
-		LDA $0112 : ORA $02E4 ; we have heart container, do short check
+	LDA.l PermitSQFromBosses : BEQ .fullCheck
+	LDA.w $0403 : AND.b #$80 : BEQ .fullCheck
+		LDA.w $0112 : ORA.w $02E4 ; we have heart container, do short check
 RTL
 	.fullCheck
-	LDA $0112 : ORA $02E4 : ORA $0FFC
+	LDA.w $0112 : ORA.w $02E4 : ORA.w $0FFC
 RTL
 ;--------------------------------------------------------------------------------
diff --git a/goalitem.asm b/goalitem.asm
index 2194c57..1de1e88 100644
--- a/goalitem.asm
+++ b/goalitem.asm
@@ -118,12 +118,12 @@ GetRequiredCrystalsInX:
 RTL
 ;--------------------------------------------------------------------------------
 CheckEnoughCrystalsForGanon:
-	LDA CrystalCounter
+	LDA.l CrystalCounter
 	CMP.l NumberOfCrystalsRequiredForGanon
 RTL
 ;--------------------------------------------------------------------------------
 CheckEnoughCrystalsForTower:
-	LDA CrystalCounter
+	LDA.l CrystalCounter
 	CMP.l NumberOfCrystalsRequiredForTower
 RTL
 
diff --git a/halfmagicbat.asm b/halfmagicbat.asm
index 19772fc..1de2b42 100644
--- a/halfmagicbat.asm
+++ b/halfmagicbat.asm
@@ -6,10 +6,10 @@ GetMagicBatItem:
 	%GetPossiblyEncryptedItem(MagicBatItem, SpriteItemValues)
 	CMP.b #$FF : BEQ .normalLogic
 	TAY
-	STZ $02E9 ; 0 = Receiving item from an NPC or message
+	STZ.b $02E9 ; 0 = Receiving item from an NPC or message
 	JML.l Link_ReceiveItem
 .normalLogic
-	LDA HalfMagic
-	STA MagicConsumption
+	LDA.l HalfMagic
+	STA.l MagicConsumption
 RTL
 ;--------------------------------------------------------------------------------
diff --git a/hardmode.asm b/hardmode.asm
index e4d00b5..49b35e3 100644
--- a/hardmode.asm
+++ b/hardmode.asm
@@ -3,7 +3,7 @@
 ;================================================================================
 CalculateSpikeFloorDamage:
 		REP #$20 ; set 16-bit accumulator
-		LDA.b $A0 ; these are all decimal because i got them that way
+		LDA.b RoomIndex ; these are all decimal because i got them that way
 		CMP.w #279
 		SEP #$20 ; set 8-bit accumulator
 		BNE +
@@ -18,7 +18,7 @@ RTL
 CalculateByrnaUsage:
 	LDA.b $1B : BEQ ++
 	REP #$20 ; set 16-bit accumulator
-	LDA.b $A0 ; these are all decimal because i got them that way
+	LDA.b RoomIndex ; these are all decimal because i got them that way
 	CMP.w #95 : BEQ + ; Ice Palace Spike Room
 	CMP.w #172 : BEQ + ; Blind Boss Room
 	CMP.w #179 : BEQ + ; Room in Misery Mire
@@ -38,7 +38,7 @@ CalculateByrnaUsage:
 CalculateCapeUsage:
 	LDA.b $1B : BEQ ++
 	REP #$20 ; set 16-bit accumulator
-	LDA.b $A0 ; these are all decimal because i got them that way
+	LDA.b RoomIndex ; these are all decimal because i got them that way
 	CMP.w #95 : BEQ + ; Ice Palace Spike Room
 	CMP.w #179 : BEQ + ; Room in Misery Mire
 	CMP.w #213 : BEQ + ; Laser Bridge
@@ -56,7 +56,7 @@ CalculateCapeUsage:
 ActivateInvulnerabilityOrDont:
 	LDA.b $1B : BEQ .nowhere_special
 	REP #$20 ; set 16-bit accumulator
-	LDA.b $A0 ; these are all decimal because i got them that way
+	LDA.b RoomIndex ; these are all decimal because i got them that way
 	CMP.w #95 : BEQ .somewhere_cool ; Ice Palace Spike Room
 	CMP.w #179 : BEQ .somewhere_cool ; Room in Misery Mire
 	CMP.w #213 : BEQ .somewhere_cool ; Laser Bridge
@@ -81,7 +81,7 @@ GetItemDamageValue:
 	CPX.b #$3d : BEQ .hookshot
 
 	.normal
-	lda $0db8f1,x ;what we wrote over
+	LDA.l $0db8f1,x ;what we wrote over
 RTL
 	.boomerang
 		LDA.l StunItemAction : AND #$01 : BNE .normal
diff --git a/heartbeep.asm b/heartbeep.asm
index e8f9bd1..95429e1 100644
--- a/heartbeep.asm
+++ b/heartbeep.asm
@@ -3,10 +3,10 @@
 ;================================================================================
 BeepLogic:
 	LDA.l HeartBeep : BEQ +
-	    STA $04CA
-	    LDA.b #$2B : STA $012E
+	    STA.w $04CA
+	    LDA.b #$2B : STA.w $012E
 RTL
 	+
-    LDA.b #$FF : STA $04CA
+    LDA.b #$FF : STA.w $04CA
 RTL
-;================================================================================
\ No newline at end of file
+;================================================================================
diff --git a/heartpieces.asm b/heartpieces.asm
index d9cba25..7d8b881 100644
--- a/heartpieces.asm
+++ b/heartpieces.asm
@@ -2,37 +2,35 @@
 ; Randomize Heart Pieces
 ;--------------------------------------------------------------------------------
 HeartPieceGet:
-	PHX : PHY
-	LDY $0E80, X ; load item value into Y register
-	BNE +
-		; if for any reason the item value is 0 reload it, just in case
-		JSL.l LoadHeartPieceRoomValue : TAY
-	+
-	JSL.l MaybeMarkDigSpotCollected
+        PHX : PHY
+        LDY.w $0E80, X ; load item value into Y register
+        BNE +
+                ; if for any reason the item value is 0 reload it, just in case
+                JSL.l LoadHeartPieceRoomValue : TAY
+        +
+        JSL.l MaybeMarkDigSpotCollected
 
-	.skipLoad
+        .skipLoad
 
-	STZ.w $02E9 ; 0 = Receiving item from an NPC or message
+        STZ.w $02E9 ; 0 = Receiving item from an NPC or message
 
-	CPY.b #$26 : BNE .notHeart ; don't add a 1/4 heart if it's not a heart piece
-	LDA.l HeartPieceQuarter : INC A : AND.b #$03 : STA.l HeartPieceQuarter : BNE .unfinished_heart ; add up heart quarters
-	BRA .giveItem
+        CPY.b #$26 : BNE .notHeart ; don't add a 1/4 heart if it's not a heart piece
+        LDA.l HeartPieceQuarter : INC A : AND.b #$03 : STA.l HeartPieceQuarter : BNE .unfinished_heart ; add up heart quarters
+        BRA .giveItem
 
-	.notHeart
+        .notHeart
+        .giveItem
+        JSL.l $0791B3 ; Player_HaltDashAttackLong
+        JSL.l Link_ReceiveItem
+        CLC ; return false
+        JMP .done ; finished
 
-	.giveItem
-	JSL.l $0791B3 ; Player_HaltDashAttackLong
-	JSL.l Link_ReceiveItem
-	CLC ; return false
-	JMP .done ; finished
+        .unfinished_heart
+        SEC ; return true
+        .done
+        JSL MaybeUnlockTabletAnimation
 
-	.unfinished_heart
-	SEC ; return true
-	.done
-	
-    JSL MaybeUnlockTabletAnimation
-	
-	PLY : PLX
+        PLY : PLX
 RTL
 ;--------------------------------------------------------------------------------
 HeartContainerGet:
@@ -118,27 +116,6 @@ RTL
 	CLC
 RTL
 ;--------------------------------------------------------------------------------
-HeartUpgradeSpawnDecision: ; this should return #$00 to make the hp spawn
-	LDA.l ForceHeartSpawn : BEQ .normal_behavior
-	
-	DEC : STA.l ForceHeartSpawn
-	LDA.b #$00
-RTL
-	
-	.normal_behavior
-	LDA.l OverworldEventDataWRAM, X
-RTL
-;--------------------------------------------------------------------------------
-SaveHeartCollectedStatus:
-	LDA.l SkipHeartSave : BEQ .normal_behavior
-	
-	DEC : STA.l SkipHeartSave
-RTL
-	
-	.normal_behavior
-	LDA.l OverworldEventDataWRAM, X : ORA.b #$40 : STA.l OverworldEventDataWRAM, X
-RTL
-;--------------------------------------------------------------------------------
 HeartPieceSpritePrep:
 	PHA
 	
@@ -215,7 +192,7 @@ endmacro
 LoadIndoorValue:
 	PHP
 	REP #$20 ; set 16-bit accumulator
-	LDA.b $A0 ; these are all decimal because i got them that way
+	LDA.b RoomIndex ; these are all decimal because i got them that way
 	CMP.w #225 : BNE +
 		%GetPossiblyEncryptedItem(HeartPiece_Forest_Thieves, HeartPieceIndoorValues)
 		JMP .done
@@ -328,7 +305,7 @@ LoadHeartContainerRoomValue:
 LoadBossValue:
 	PHP
 	REP #$20 ; set 16-bit accumulator
-	LDA.b $A0 ; these are all decimal because i got them that way
+	LDA.b RoomIndex ; these are all decimal because i got them that way
 	CMP.w #200 : BNE +
 		%GetPossiblyEncryptedItem(HeartContainer_ArmosKnights, HeartContainerBossValues)
 		JMP .done
@@ -371,7 +348,7 @@ CheckIfBossRoom:
 ; Carry set if we're in a boss room, unset otherwise.
 ;--------------------------------------------------------------------------------
 	REP #$20 ; set 16-bit accumulator
-	LDA.b $A0 ; these are all decimal because i got them that way
+	LDA.b RoomIndex ; these are all decimal because i got them that way
 	CMP.w #200 : BEQ .done
 	CMP.w #51 : BEQ .done
 	CMP.w #7 : BEQ .done
diff --git a/hooks.asm b/hooks.asm
index 8ea3609..2e0adb9 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -56,9 +56,12 @@ org $00FFB7
 SoftwareInterrupt:
 JML Crashed
 
-org $00FFE4 : dw SoftwareInterrupt
-org $00FFE6 : dw SoftwareInterrupt
-org $00FFF4 : dw SoftwareInterrupt
+org $00FFE4
+dw SoftwareInterrupt
+org $00FFE6
+dw SoftwareInterrupt
+org $00FFF4
+dw SoftwareInterrupt
 
 ;================================================================================
 ; Dungeon Entrance Hook (works, but not needed at the moment)
@@ -197,8 +200,6 @@ org $00833A ; <- 0033A - Bank00.asm : 481 (LDA.w #$007F)
 LDA.w #$0180 ; change which character is used as the blank character for the select screen
 ;--------------------------------------------------------------------------------
 org $0CD50C ; <- 6550C  (Not in disassembly, would be in bank0c.asm if it were) Position table for Name and Hearts
-;dw $0012, $0112, $0212 ; vanilla-ish positions of file names
-;dw $0026, $0126, $0226 ; vanilla-ish positions of hearts names
 dw $00CC, $014A, $01CA ; repositioned, only the first value matters
 dw $002A, $0192, $0112
 org $0CD53B ; <- 6553B : Bank0c.asm : 2919 (ADD.w #$0010 : STA $102C, Y) [... : STA $1034, Y]
@@ -289,9 +290,7 @@ SKIP 7 : NOP #3
 ; remove Clearing mirrored copy on file erase, instead clearing the extended save file too
 org $0CD4E3 ; <- Bank0C.asm : 2282 (STA $700400, X : STA $700F00, X : STA $701000, X : STA $701100, X)
 JSL.l ClearExtendedSaveFile
-BRA +
-	NOP #18
-+
+BRA + : NOP #18 : +
 ;--------------------------------------------------------------------------------
 
 ;================================================================================
@@ -305,7 +304,7 @@ JSL CopyExtendedWRAMSaveFileToSRAM
 ;--------------------------------------------------------------------------------
 org $00899C ; <- bank_00.asm : #_00899C (CLC)
 JSL WriteSaveChecksumAndBackup
-LDA.w #$01F3 : TCS : SEP #$30 : PLB : RTL ; Get the stack and data bank correct
+PLA : SEP #$30 : PLB : RTL
 padbyte $FF : pad $0089C2 ; Fill adjacent free rom forward. See bank_00.asm: #_0089C2
 ;--------------------------------------------------------------------------------
 org $0CD7AB ; <- Bank0C.asm : 3342 (STA $700400, X)
@@ -335,8 +334,7 @@ org $0CCE85 ; <- Bank0C.asm : 1953 (LDA $C8 : ASL A : INC #2 : STA $701FFE)
 NOP #4
 ;--------------------------------------------------------------------------------
 org $0CDB4C ; <- Bank0C.asm : 3655 (LDA $C8 : ASL A : INC #2 : STA $701FFE : TAX)
-JML OnFileCreation
-NOP
+JML OnFileCreation : NOP
 ;--------------------------------------------------------------------------------
 org $09F5EA ; <- module_death.asm : 510 (LDA $701FFE : TAX : DEX #2)
 LDA.w #$0002 : NOP
@@ -351,7 +349,6 @@ LDA.w #$0002 : NOP
 org $068891 ; Sprite_Prep.asm : 378 //LDA .damage_class, Y : STA $0CD2, X
 nop #$08
 JSL.l NewBatInit
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Damage table Relocation from WRAM
@@ -420,30 +417,25 @@ JML.l AllowStartFromExit
 AllowStartFromExitReturn:
 ;--------------------------------------------------------------------------------
 org $1bc2a7 ; <- DC2A7 - Bank1B.asm : 1143 (Overworld_CreatePyramidHole:)
-JSL.l Overworld_CreatePyramidHoleModified
-RTL
+JSL.l Overworld_CreatePyramidHoleModified : RTL
 C9DE_LONG:
-JSR $C9DE ; surprisingly same address as US
-RTL
+JSR $C9DE : RTL ; surprisingly same address as US
 ;--------------------------------------------------------------------------------
 org $07ff5f ; <- 3ff5f - Bank0E.asm : 5252 (LDA.w #$0E3F : STA $23BC)
-JSL.l Draw_PyramidOverlay
-RTS
+JSL.l Draw_PyramidOverlay : RTS
 ;--------------------------------------------------------------------------------
 ;Remove Electric Barrier Hook
 org $06891E ; <- sprite_prep.asm : 537 (LDA $7EF280, X : PLX : AND.b #$40 : BEQ .not_dead)
 JSL Electric_Barrier
 ;--------------------------------------------------------------------------------
 org $08CDAC ; <- ancilla_break_tower_seal.asm : 117 (LDA.b #$05 : STA $04C6)
-JSL GanonTowerAnimation
-NOP #05
+JSL GanonTowerAnimation : NOP #05
 ;--------------------------------------------------------------------------------
 org $1AF5C1 ; <- sprite_waterfall.asm : 40 (LDA $8A : CMP.b #$43)
 JSL GanonTowerInvertedCheck
 ;--------------------------------------------------------------------------------
 org $02EC8D ; <- bank02.asm : 11981 (LDA.w #$020F : LDX $8A : CPX.w #$0033 : BNE .noRock)
-JSL HardcodedRocks
-NOP #19 ;23 bytes removed with the JSL
+JSL HardcodedRocks : NOP #19 ;23 bytes removed with the JSL
 ;--------------------------------------------------------------------------------
 org $04E7AE ; <- bank0E.asm : 4230 (LDA $7EF287 : AND.w #$0020)
 JSL.l TurtleRockPegSolved
@@ -463,9 +455,9 @@ PegProbability:
 db $00  ; Probability out of 255.  0 = Vanilla behavior
 TurtleRockTrollPegs:
 SEP #$20
-    LDX.w $04C8 : CPX.w #$FFFF : BEQ .vanilla
-    JSL.l GetRandomInt
-    LDA.l PegProbability : BEQ .vanilla : CMP.l $7E0FA1
+LDX.w $04C8 : CPX.w #$FFFF : BEQ .vanilla
+JSL.l GetRandomInt
+LDA.l PegProbability : BEQ .vanilla : CMP.l $7E0FA1
 REP #$20 : !BGE .succeed
 .fail
 JMP.w TurtleRockPegFail
@@ -475,8 +467,7 @@ JMP.w TurtleRockPegSuccess
 REP #$20 : JMP.w TurtleRockPegCheck
 ;--------------------------------------------------------------------------------
 org $1BBD05 ; <- bank1B.asm : 261 (TYA : STA $00) ; hook starts at the STA
-JML.l PreventEnterOnBonk
-NOP
+JML.l PreventEnterOnBonk : NOP
 PreventEnterOnBonk_return:
 org $1BBD77 ; <- bank1B.asm : 308 (SEP #$30)
 PreventEnterOnBonk_BRANCH_IX:
@@ -486,13 +477,11 @@ PreventEnterOnBonk_BRANCH_IX:
 ; Crystals Mode
 ;--------------------------------------------------------------------------------
 org $099B7B ; <- ancilla_init.asm : 4136 (LDA $7EF37A : AND.b #$7F : CMP.b #$7F)
-JSL.l CheckEnoughCrystalsForTower
-NOP #4
+JSL.l CheckEnoughCrystalsForTower : NOP #4
 db #$90 ; BCC
 ;--------------------------------------------------------------------------------
 org $08CE0C ; <- 44E0C - ancilla_break_tower_seal.asm : 168 (BEQ #$03 : JSR BreakTowerSeal_ExecuteSparkles : LDX.b #$06)
-JML.l GetRequiredCrystalsForTower
-NOP #3
+JML.l GetRequiredCrystalsForTower : NOP #3
 GetRequiredCrystalsForTower_continue:
 ;--------------------------------------------------------------------------------
 org $08CF19 ; <- 44F19 - ancilla_break_tower_seal.asm : 336 (TXA : AND.b #$07 : TAX)
@@ -507,12 +496,10 @@ db #$6B
 ;--------------------------------------------------------------------------------
 org $0CCDB5 ; <- 64DB5 - Bank0C.asm : 1776 (LDA.b #$06 : STA $14)
 JSL.l OnPrepFileSelect
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Light speed
 ;--------------------------------------------------------------------------------
-
 ; Message
 org $1ED4FF
 JSL AgahnimAsksAboutPed
@@ -526,20 +513,11 @@ JSL CheckAgaForPed : NOP
 org $00F970
 JSL KillGanon
 
-
-
-;--------------------------------------------------------------------------------
-
 ;================================================================================
 ; Zelda Sprite Fixes
 ;--------------------------------------------------------------------------------
 org $05EBCF ; <- 2EBCF - sprite_zelda.asm : 23 (LDA $7EF359 : CMP.b #$02 : BCS .hasMasterSword)
 JSL.l SpawnZelda : NOP #2
-;NOP #8
-;--------------------------------------------------------------------------------
-;org $06C06F ; <- 3406F - Bank06.asm : 1794 (JSL Sprite_ZeldaLong)
-;JSL.l SpawnZelda
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Alternate Goal
@@ -563,13 +541,7 @@ org $07A95B ; <- 3A95B - Bank07.asm : 6565 (JSL Dungeon_SaveRoomDataWRAM)
 JSL.l IncrementUWMirror
 ;--------------------------------------------------------------------------------
 org $0288D1 ; <- 108D1 - Bank02.asm : 1690 (STZ $0646)
-JSL.l IndoorSubtileTransitionCounter
-NOP #2
-;--------------------------------------------------------------------------------
-;org $05FC7E ; <- 2FC7E - sprite_dash_item.asm : 118 (LDA $7EF36F : INC A : STA $7EF36F)
-;JSL.l IncrementSmallKeys
-;--------------------------------------------------------------------------------
-;org $06D18D ; <- 3518D - sprite_absorbable.asm : 274 (LDA $7EF36F : INC A : STA $7EF36F)
+JSL.l IndoorSubtileTransitionCounter : NOP #2
 org $06D192 ; <- 35192 - sprite_absorbable.asm : 274 (STA $7EF36F)
 JSL.l IncrementSmallKeysNoPrimary
 ;--------------------------------------------------------------------------------
@@ -607,10 +579,6 @@ JSL.l IncrementBigChestCounter
 ;================================================================================
 ; Dialog Override
 ;--------------------------------------------------------------------------------
-;org $0EEE8D ; 0x76E8D <- vwf.asm : 152 (LDA $7F71C0, X : STA $04)
-;JSL.l DialogOverride
-;NOP #7
-;--------------------------------------------------------------------------------
 org $0EF1FF ; 0x771FF <- vwf.asm : 1212 (LDA $7F1200, X : AND.w #$007F : SUB.w #$0066 : BPL .commandByte)
 JSL.l DialogOverride
 org $0EF2DC ; every other LDA $7F1200, X in vwf.asm
@@ -641,20 +609,16 @@ org $0EFB11
 JSL.l DialogOverride
 ;--------------------------------------------------------------------------------
 org $0EFBC6 ; <- 77BC6 - vwf.asm : 2717 (LDA.b #$1C : STA $1CE9)
-JSL.l ResetDialogPointer
-RTS
+JSL.l ResetDialogPointer : RTS
 ;--------------------------------------------------------------------------------
 org $0EED0B ; <- PC 0x76D0B - Bank0E.asm : 3276 (LDA $E924, Y : STA $1008, X)
-JSL.l EndingSequenceTableOverride
-NOP #2
+JSL.l EndingSequenceTableOverride : NOP #2
 ;--------------------------------------------------------------------------------
 org $0EED15 ; <- PC 0x76D15 - Bank0E.asm : 3282 (LDA $E924, Y : STA $1008, X)
-JSL.l EndingSequenceTableOverride
-NOP #2
+JSL.l EndingSequenceTableOverride : NOP #2
 ;--------------------------------------------------------------------------------
 org $0EED2A ; <- PC 0x76D2A - Bank0E.asm : 3295 (LDA $E924, Y : AND.w #$00FF)
-JSL.l EndingSequenceTableLookupOverride
-NOP #2
+JSL.l EndingSequenceTableLookupOverride : NOP #2
 ;--------------------------------------------------------------------------------
 
 ;================================================================================
@@ -675,7 +639,6 @@ NOP #3
 ;--------------------------------------------------------------------------------
 org $0CCC89 ; <- 0x64C89 Bank0C.asm : 1598 (JSL EnableForceBlank)
 JSL.l OnInitFileSelect
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Hyrule Castle Rain Sequence Guards (allowing Gloves in Link's house)
@@ -692,15 +655,12 @@ db $06, $1F, $40, $12, $01, $3F, $14, $01, $3F, $13, $1F, $42, $1A, $1F, $4B, $1
 ;--------------------------------------------------------------------------------
 org $05DFB1 ; <- 2DFB1 - Bank05.asm : 2499
 JSL.l SkipDrawEOR
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Kiki Big Bomb Fix
 ;--------------------------------------------------------------------------------
 org $1EE4AF ; <- f64af sprite_kiki.asm : 285 (LDA.b #$0A : STA $7EF3CC)
-JSL.l AssignKiki
-NOP #2
-;--------------------------------------------------------------------------------
+JSL.l AssignKiki : NOP #2
 
 ;================================================================================
 ; Wallmaster camera fix
@@ -737,11 +697,7 @@ org $029E2E ; <- 11E2E - module_ganon_emerges.asm : 59 (JSL Dungeon_SaveRoomData
 JSL.l OnAga2Defeated
 ;--------------------------------------------------------------------------------
 org $0DDBDE ; <- 6DBDE - headsup_display.asm : 105 (DEC A : BPL .subtractRupees)
-JSL.l IncrementSpentRupees
-NOP #6
-;org $0DDBF7 ; <- 6DBF7 - headsup_display.asm : 121 (STA $7EF362)
-;RefillLogic_subtractRupees:
-;--------------------------------------------------------------------------------
+JSL.l IncrementSpentRupees : NOP #6
 
 ;================================================================================
 ; Remove Item Menu Text
@@ -751,24 +707,22 @@ JMP DrawItem_finished
 org $0DECE6 ; <- 6ECE6 - equipment.asm : 1934 (SEP #$30)
 DrawItem_finished:
 org $0DEB48 ; <- 6EB48 - equipment.asm : 1784 (LDA $0000)
-LDA $0000, Y : STA $11F2
-LDA $0002, Y : STA $11F4
-LDA $0040, Y : STA $1232
-LDA $0042, Y : STA $1234
+LDA.w $0000, Y : STA.w $11F2
+LDA.w $0002, Y : STA.w $11F4
+LDA.w $0040, Y : STA.w $1232
+LDA.w $0042, Y : STA.w $1234
 ;---------------------------
 org $0DE24B ; <- 6E24B - equipment.asm : 951 (LDA $0000)
-LDA $0000, Y : STA $11F2
-LDA $0002, Y : STA $11F4
-LDA $0040, Y : STA $1232
-LDA $0042, Y : STA $1234
+LDA.w $0000, Y : STA.w $11F2
+LDA.w $0002, Y : STA.w $11F4
+LDA.w $0040, Y : STA.w $1232
+LDA.w $0042, Y : STA.w $1234
 ;--------------------------------------------------------------------------------
 org $0DE2DC ; <- 6E2DC - equipment.asm : 989 (LDA $F449, X : STA $122C, Y)
 JMP UpdateBottleMenu_return
 org $0DE2F1 ; <- 6E2F1 - equipment.asm : 1000 (SEP #$30)
 UpdateBottleMenu_return:
 ;--------------------------------------------------------------------------------
-;org $0DDDC3 ; <- 6DDC3 - equipment.asm : 131 (JSR DrawAbilityText)
-;NOP #3
 org $0DE6F4 ; <- 6E6F4 - equipment.asm : 1474 (BCC .lacksAbility)
 db #$80 ; BRA
 org $0DE81A ; <- 6E81A - equipment.asm : 1597 (STA $00)
@@ -781,28 +735,12 @@ org $0DE7E5 ; <- 6E7E5 - equipment.asm : 1560 (LDA.w #$16D8 : STA $00)
 JSL.l DrawFlippersInMenuLocation : NOP
 org $0DECEB ; <- 6ECEB - equipment.asm : 1946 (LDA.w #$16E0 : STA $00)
 JSL.l DrawMoonPearlInMenuLocation : NOP
-;--------------------------------------------------------------------------------
-;org $0DE9D8 ; <- 6E9D8 - equipment.asm : 1635 (LDA $E860, X : STA $12EA, X)
-;BRA DrawProgressIcons_initPendantDiagram_notext
-;org $0DEA0E ; <- 6EA0E - equipment.asm : 1645 (INX #2)
-;DrawProgressIcons_initPendantDiagram_notext:
-;--------------------------------------------------------------------------------
-
-;================================================================================
-; Map Always Zoomed
-;--------------------------------------------------------------------------------
-;org $0ABA49 ; <- 53A49 - Bank0A.asm : 447 (LDA.b #$80 : STA $211A)
-;JSL.l PrepMapZoom : RTL
-;org $0ABB32 ; <- 53B32 - Bank0A.asm : 626 (LDA $F6 : AND.b #$70)
-;JSL.l ForceMapZoom
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Zelda S&Q Mirror Fix
 ;--------------------------------------------------------------------------------
 org $02D9A4 ; <- 159A4 - Bank02.asm : 11077 (dw $0000, $0002, $0002, $0032, $0004, $0006, $0030)
 dw $0000, $0002, $0004, $0032, $0004, $0006, $0030
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Accessibility
@@ -847,7 +785,6 @@ JSL.l LoadElectroPalette
 ;--------------------------------------------------------------------------------
 org $07997C ; <- 03997C - Bank07.asm : 4015 (JSL LoadActualGearPalettes) 
 JSL.l RestoreElectroPalette
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Ice Floor Toggle
@@ -857,7 +794,6 @@ JSL.l LoadModifiedIceFloorValue_a11 : NOP
 ;--------------------------------------------------------------------------------
 org $07D26E ; <- 3D26E - Bank07.asm : 12786 (LDA $0348 : AND.b #$01 : BNE BRANCH_RESH)
 JSL.l LoadModifiedIceFloorValue_a01 : NOP
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Sword Upgrade Randomization
@@ -878,8 +814,7 @@ org $068A14 ; <- 30A14 - sprite_prep.asm : 716
 NOP #8 ; fix bomb shop spawn for dwarfless big bomb
 ;--------------------------------------------------------------------------------
 org $06B489 ; <- 33489 - sprite_smithy_bros.asm : 473 (LDA $7EF359 : CMP.b #$03 : BCS .tempered_sword_or_better)
-JML.l GetSmithSword
-NOP #4
+JML.l GetSmithSword : NOP #4
 Smithy_DoesntHaveSword:
 org $06B49D ; <- 3349D - sprite_smithy_bros.asm : 485 (.tempered_sword_or_better)
 Smithy_AlreadyGotSword:
@@ -892,10 +827,6 @@ NOP #5 ; remove spooky telepathy sound
 ;--------------------------------------------------------------------------------
 org $08C431 ; <- 44431 - ancilla_receive_item.asm : 125 (LDA $0C5E, X : CMP.b #$01 : BNE .notMasterSword2)
 JSL.l MSMusicReset : NOP
-;LDA $8A : CMP.b #$80 : NOP
-; $22 = $0000 - $00FF - MS Pedestal
-; $22 = $0100 - $00FF - Hobo
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Temporary Nerfs and Buffs
@@ -923,7 +854,6 @@ JSL.l LoadModifiedMagicLevel : !ADD.w LinkItem_MagicCostBaseIndices, X
 ;--------------------------------------------------------------------------------
 org $07B0D5 ; <- 3B0D5 - Bank07.asm : 7783 (LDA LinkItem_MagicCostBaseIndices, X : CLC : ADC $7EF37B : TAX)
 JSL.l LoadModifiedMagicLevel : !ADD.w LinkItem_MagicCostBaseIndices, X
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Faster Great Fairies
@@ -935,14 +865,12 @@ org $06C896 ; <- sprite_ponds.asm : 844 ( LDA $1A : AND.b #$07 : BNE BRANCH_ALPH
 db $03 ; fade in speed. Should be power of 2 minus 1
 org $06C985 ; <- sprite_ponds.asm : 1025 ( LDA $1A : AND.b #$07 : BNE BRANCH_ALPHA )
 db $03 ; fade out speed. Should be power of 2 minus 1
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; New Items
 ;--------------------------------------------------------------------------------
 org $07B574 ; <- 3B574 - Bank07.asm : 8519 (LDA.b #$01 : STA $02E9)
-JSL.l ChestPrep
-NOP #3
+JSL.l ChestPrep : NOP #3
 db $90 ; !BCC .cantOpen
 ;--------------------------------------------------------------------------------
 org $00D531 ; 5531 - Bank00.asm:3451 (LDY.b #$5D)
@@ -952,8 +880,7 @@ org $00D547 ; 5547 - Bank00.asm:3467 (JSR Decomp_spr_high)
 GetAnimatedSpriteGfxFile_return:
 
 org $00D557 ; 5557 - Bank00.asm:3486 (LDA $00 : ADC $D469, X)
-JSL.l GetAnimatedSpriteBufferPointer
-NOP
+JSL.l GetAnimatedSpriteBufferPointer : NOP
 
 org $0799F7 ; 399F7 - Bank07.asm:4107 (JSL AddReceivedItem)
 JSL.l AddReceivedItemExpanded
@@ -1004,12 +931,10 @@ org $08C70F ; 4470F - ancilla_receive_item.asm : 582 - (LDA.b #$00 : STA ($92),
 JSL.l LoadNarrowObject
 
 org $0985ED ; 485ED - ancilla_init.asm:693 (LDA $02E9 : CMP.b #$01)
-JSL.l AddReceivedItemExpandedGetItem
-NOP
+JSL.l AddReceivedItemExpandedGetItem : NOP
 
 org $07B57D ; 3B57D - Bank07.asm:8527 (LDA Link_ReceiveItemAlternates, Y : STA $03)
-JSL.l Link_ReceiveItemAlternatesExpanded_loadAlternate
-NOP
+JSL.l Link_ReceiveItemAlternatesExpanded_loadAlternate : NOP
 ;--------------------------------------------------------------------------------
 org $09892E ; 4892E - ancilla_init.asm:1307 (LDA BottleList, X)
 LDA.w BottleListExpanded, X
@@ -1019,7 +944,6 @@ LDA.w PotionListExpanded, X
 ;--------------------------------------------------------------------------------
 org $06D1EB ; 351EB - sprite_absorbable.asm:364 (STA $7EF375) ; bugbug commented out until i figure out why it doesn't work
 JSL HandleBombAbsorbtion
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Kholdstare Shell Fix
@@ -1028,9 +952,7 @@ org $00EC88 ; <- 6C88 - Bank00.asm:6671 - (LDA $7EC380, X : STA $7EC580, X)
 LDA $7EC3A0, X : STA $7EC5A0, X
 ;--------------------------------------------------------------------------------
 org $00ECEB ; <- 6CEB - Bank00.asm:6730 - (LDX.w #$0080)
-LDX.w #$00A0
-LDA.w #$00B0
-;--------------------------------------------------------------------------------
+LDX.w #$00A0 : LDA.w #$00B0
 
 ;================================================================================
 ; Potion Refill Fixes
@@ -1046,14 +968,12 @@ JSL.l RefillHealth
 ;--------------------------------------------------------------------------------
 org $00F922 ; <- 7922 - Bank00.asm:8543 - (JSL HUD.RefillMagicPower : BCC .beta)
 JSL.l RefillMagic
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Early Bottle Fix
 ;--------------------------------------------------------------------------------
 org $09894C ; <- 4894C - ancilla_init.asm:1327
 JSL.l InitializeBottles
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Agahnim Doors Fix
@@ -1069,8 +989,7 @@ Overworld_Entrance_BRANCH_EPSILON: ; go here to lock doors
 ;--------------------------------------------------------------------------------
 ; -- HOOK THIS LATER TO FUCK WITH BOSS DROPS --
 org $01C73E ; <- C73E - Bank01.asm : 10377 (LDA $01C6FC, X : JSL Sprite_SpawnFallingItem)
-JSL.l DropSafeDungeon
-NOP #4
+JSL.l DropSafeDungeon : NOP #4
 ;--------------------------------------------------------------------------------
 
 ;================================================================================
@@ -1097,17 +1016,13 @@ db #$1E
 ; Bomb & Arrow Capacity Updates
 ;--------------------------------------------------------------------------------
 org $0DDC27 ; <- 6DC27 - headsup_display.asm:151 (LDA $7EF370 : TAY)
-JSL.l IncrementBombs
-NOP #15
+JSL.l IncrementBombs : NOP #15
 ;--------------------------------------------------------------------------------
 org $0DDC49 ; <- 6DC49 - headsup_display.asm:169 (LDA $7EF371 : TAY)
-JSL.l IncrementArrows
-NOP #15
+JSL.l IncrementArrows : NOP #15
 ;--------------------------------------------------------------------------------
 org $1EE199 ; <- F6199 - sprite_bomb_shop_entity.asm:102 (LDA $7EF370 : PHX : TAX)
-JSL.l CompareBombsToMax
-NOP #11
-;--------------------------------------------------------------------------------
+JSL.l CompareBombsToMax : NOP #11
 
 ;================================================================================
 ; Bonk Items
@@ -1122,7 +1037,6 @@ JSL.l LoadBonkItemGFX
 ;--------------------------------------------------------------------------------
 org $05FC04 ; <- 2FC04 - sprite_dash_item.asm : 38 - (JSL DashKey_Draw)
 JSL.l DrawBonkItemGFX
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Library Item
@@ -1138,7 +1052,6 @@ JSL.l DrawLibraryItemGFX
 ;--------------------------------------------------------------------------------
 org $068D0E ; <- 30D0E - sprite_prep.asm : 1401 - (LDA $7EF34E : BEQ .book_of_mudora)
 JSL.l ItemCheck_Library
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Inventory Updates
@@ -1162,8 +1075,7 @@ org $0DEB98 ; <- 6EB98 - equipment.asm : 1803
 LDA.w #$3C60 : STA $FFBE, Y
 ORA.w #$8000 : STA $007E, Y
 ORA.w #$4000 : STA $0084, Y
-JSL.l AddYMarker
-NOP #2
+JSL.l AddYMarker : NOP #2
 ;--------------------------------------------------------------------------------
 org $0DF789+6 ; <- 6F789+6 (not in disassembly) - red bottle hud tile, lower right
 dw #$2413 ; (Orig: #$24E3)
@@ -1193,8 +1105,7 @@ org $0DDE3D ; <- 6DE3D equipment.asm:217 - BNE .equippedItemIsntBottle
 db $80 ; BRA
 ;--------------------------------------------------------------------------------
 org $0DDF9A ; <- 6DF9A - equipment.asm : 554
-JSL.l OpenBottleMenu
-NOP
+JSL.l OpenBottleMenu : NOP
 ;--------------------------------------------------------------------------------
 org $0DE12D ; <- 6E12D - equipment.asm : 828
 JSL.l CloseBottleMenu
@@ -1203,32 +1114,26 @@ org $0DDF1E ; <- 6DF1E - equipment.asm : 462 - LDA $F4 : AND.b #$10 : BEQ .dontL
 JSL.l CheckCloseItemMenu
 ;--------------------------------------------------------------------------------
 org $0DEE70 ; <- 6EE70 - equipment.asm : 2137
-JSL.l PrepItemScreenBigKey
-NOP
+JSL.l PrepItemScreenBigKey : NOP
 ;--------------------------------------------------------------------------------
 org $08D395 ; <- 45395 - ancilla_bird_travel_intro.asm : 253
-JSL.l UpgradeFlute
-NOP #2
+JSL.l UpgradeFlute : NOP #2
 ;--------------------------------------------------------------------------------
 org $05E4D7 ; <- 2E4D7 - sprite_witch.asm : 213
-JSL.l RemoveMushroom
-NOP #2
+JSL.l RemoveMushroom : NOP #2
 ;--------------------------------------------------------------------------------
 org $05F55F ; <- 2F55F - sprite_potion_shop.asm : 59
 JSL.l LoadPowder
 ;--------------------------------------------------------------------------------
 org $05F681 ; <- 2F681 - sprite_potion_shop.asm : 234
-JSL.l DrawPowder
-RTS
+JSL.l DrawPowder : RTS
 NOP #8
 ;--------------------------------------------------------------------------------
 org $05F65D ; <- 2F65D - sprite_potion_shop.asm : 198
-JSL.l CollectPowder
-NOP #5
+JSL.l CollectPowder : NOP #5
 ;--------------------------------------------------------------------------------
 org $05EE5F ; <- 2EE5F - sprite_mushroom.asm : 30
-JSL.l LoadMushroom
-NOP
+JSL.l LoadMushroom : NOP
 ;--------------------------------------------------------------------------------
 org $05EE78 ; <- 2EE78 - sprite_mushroom.asm : 58
 JSL.l DrawMushroom
@@ -1249,7 +1154,6 @@ _Bank07_5726:
 ;--------------------------------------------------------------------------------
 org $079A0E ; 39A0E - Bank07.asm : 4117 - JSL HUD.RefreshIconLong
 JSL.l Link_ReceiveItem_HUDRefresh
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Swordless Mode
@@ -1271,7 +1175,6 @@ JSL.l CheckTabletSword
 ;--------------------------------------------------------------------------------
 org $1DF086 ; <- EF086 - sprite_evil_barrier.asm:303 (LDA $7EF359 : CMP.b #$02 : BCS .anozap_from_player_attack)
 JSL.l GetSwordLevelForEvilBarrier
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Medallion Tablets
@@ -1286,14 +1189,12 @@ org $07859F ; <- 3859F - Bank07.asm : 965 (JSL AddPendantOrCrystal)
 JSL SpawnTabletItem
 org $07862A ; <- 3862A - Bank07.asm : 1064 (JSL AddPendantOrCrystal)
 JSL SpawnTabletItem
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Medallion Entrances
 ;--------------------------------------------------------------------------------
 org $08B504 ; <- 43504 - ancilla_bombos_spell.asm : 671
-JSL.l MedallionTrigger_Bombos
-NOP
+JSL.l MedallionTrigger_Bombos : NOP
 ;--------------------------------------------------------------------------------
 org $08ACC8 ; <- 42CC8 - ancilla_ether_spell.asm : 350
 JSL.l MedallionTrigger_Ether
@@ -1311,7 +1212,6 @@ RTL
 warnpc $08B708
 org $08B708 ; <- 43708 - ancilla_quake_spell.asm : 83
 _ancilla_quake_spell_83:
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Animated Entrances
@@ -1322,18 +1222,15 @@ BNE +
 	RTL
 	NOP #2
 +
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Big & Great Fairies
 ;--------------------------------------------------------------------------------
 org $1DC475 ; <- EC475 - sprite_big_fairie.asm : 70 (LDA.w #$00A0 : ADD $7EF372 : STA $7EF372)
-JSL.l RefillHealthPlusMagic
-NOP #8
+JSL.l RefillHealthPlusMagic : NOP #8
 
 org $1DC489 ; <- EC489 - sprite_big_fairie.asm : 88 (LDA $7EF36D : CMP $7EF36C : BNE .player_hp_not_full_yet)
-NOP #4
-JSL.l CheckFullHealth
+NOP #4 : JSL.l CheckFullHealth
 ;--------------------------------------------------------------------------------
 
 ;================================================================================
@@ -1439,8 +1336,7 @@ JSL.l RNG_Enemy_Drops
 ; HUD Changes
 ;--------------------------------------------------------------------------------
 org $0DFC4C ; <- 6FC4C - headsup_display.asm : 836 (LDA $7EF36E : AND.w #$00FF : ADD.w #$0007 : AND.w #$FFF8 : TAX)
-JML.l OnDrawHud
-NOP #197
+JML.l OnDrawHud : NOP #197
 ReturnFromOnDrawHud:
 SEP #$30
 LDX.b #$FF ; vanilla hud code ends with #$FF in X, and it's required for unknown reasons.
@@ -1466,44 +1362,33 @@ LDX.w #HUD_TileMap
 org $0DFA9C ; <- 6FA9C - headsup_display.asm : 629 (MVN $0D, $7E ; $Transfer 0x014A bytes from $6FE77 -> $7EC700)
 MVN $217E
 ;--------------------------------------------------------------------------------
-;org $0DE48E ; <- 6E48E - equipment.asm : 1233 (LDA.w #$11CE : STA $00) - HOOK HERE TO DRAW ON THE ITEM SCREEN
-;JSL.l DrawHUDDungeonItems
-;NOP
-;--------------------------------------------------------------------------------
 org $0DFB1F ; 6FB1F - headsup_display.asm : 681 (LDA $7EF340 : BEQ .hastNoBow)
 JSL.l CheckHUDSilverArrows
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; 300 Rupee NPC
 ;--------------------------------------------------------------------------------
 org $1EF060 ; <- F7060 - sprite_shopkeeper.asm:242 (INC $0D80, X)
-JSL.l Set300RupeeNPCItem
-NOP
-;--------------------------------------------------------------------------------
+JSL.l Set300RupeeNPCItem : NOP
 
 ;================================================================================
 ; Glitched Mode Fixes
 ;--------------------------------------------------------------------------------
 org $0691AC ; <- 311AC - sprite_prep.asm:2453 (LDY $0FFF)
-JSL.l GetAgahnimPalette
-NOP #2
+JSL.l GetAgahnimPalette : NOP #2
 ;--------------------------------------------------------------------------------
 org $06F0DD ; <- 370DD - Bank06.asm:5399 (STA $0BA0, X)
-JSL.l GetAgahnimDeath
-NOP #2
+JSL.l GetAgahnimDeath : NOP #2
 ;--------------------------------------------------------------------------------
 org $1ED4E6 ; <- F54E6 - sprite_agahnim.asm:314 (LDY $0FFF)
-JSL.l GetAgahnimType
-NOP #2
+JSL.l GetAgahnimType : NOP #2
 ;--------------------------------------------------------------------------------
 org $1ED577 ; <- F5577 - sprite_agahnim.asm:418 (PHX)
 JML.l GetAgahnimSlot
 GetAgahnimSlotReturn:
 ;--------------------------------------------------------------------------------
 org $1ED678 ; <- F5678 - sprite_agahnim.asm:587 (INC $0E30, X)
-NOP #2
-JSL.l GetAgahnimLightning
+NOP #2 : JSL.l GetAgahnimLightning
 ;--------------------------------------------------------------------------------
 org $0287E0 ; <- 107E0 - Bnak02.asm:1507 (LDA $0112 : ORA $02E4 : ORA $0FFC : BEQ .allowJoypadInput)
 JSL.l AllowJoypadInput : NOP #5
@@ -1513,7 +1398,6 @@ JSL.l AllowJoypadInput : NOP #5
 ;--------------------------------------------------------------------------------
 org $05FBD3 ; <- 2FBD3 - sprite_mad_batter.asm:209 - (STA $7EF37B)
 JSL.l GetMagicBatItem
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; MSU Music
@@ -1551,9 +1435,6 @@ JML FanfarePreload : NOP
 org $09F2A7 ; <- 8F27C27E - module_death.asm:56 (STA $7EC227)
 JSL.l StoreMusicOnDeath
 
-org $0CC100 ; <- A511 C904 - Bank0C.asm:07 (LDA $11 : CMP.b #$04)
-;JSL.l StartupWait
-
 org $0EE6EC ; <- E220 A922 - Bank0E.asm:2892 (SEP #$20 : LDA.b #$22 : STA $012C)
 JSL.l EndingMusicWait
 
@@ -1569,7 +1450,6 @@ dw MusicControl
 
 org $0CF05F
 dw MusicControl
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Replacement Shopkeeper
@@ -1581,28 +1461,24 @@ ShopkeeperFinishInit:
 org $1EEEE3 ; <- F6EE3 - sprite_shopkeeper.asm:7 - (LDA $0E80, X)
 JSL.l Sprite_ShopKeeper : RTS : NOP
 ShopkeeperJumpTable:
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Tile Target Loader
 ;--------------------------------------------------------------------------------
 org $00D55E ; <- 555E - Bank00.asm:3491 (LDX.w #$2D40)
 JSL.l LoadModifiedTileBufferAddress : NOP #2
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Permabunny Fix
 ;--------------------------------------------------------------------------------
 org $078F32 ; <- 38F32 - Bank07.asm:2420 - (LDA $7EF357)
 JSL.l DecideIfBunny ; for bunny beams
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Other bunny Fixes
 ;--------------------------------------------------------------------------------
 org $029E7C; <- 11E7C - module_ganon_emerges.asm:127 - (LDA.b #$09 : STA $012C)
 JSL.l FixAga2Bunny : NOP
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Open Mode Fixes
@@ -1615,7 +1491,6 @@ JSL.l EndRainState : NOP #2
 ;--------------------------------------------------------------------------------
 org $05DF49 ; <- 2DF49 - sprite_uncle_and_priest.asm:984 - (JSL Link_ReceiveItem)
 JSL.l OnUncleItemGet
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Generic Keys
@@ -1643,21 +1518,18 @@ JSL.l HUDRebuildIndoor : NOP #4
 ;--------------------------------------------------------------------------------
 org $029A35 ; <- 11A35 : Bank02.asm:4789 - (JSL HUD.RebuildIndoor.palace)
 JSL.l HUDRebuildIndoorHole
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Pendant / Crystal Fixes
 ;--------------------------------------------------------------------------------
 ;================================================================================
 org $098BB0 ; <- 048BB0 - ancilla_init.asm:1663 - (STX $02D8 : JSR AddAncilla)
-JSL.l TryToSpawnCrystalUntilSuccess
-NOP
+JSL.l TryToSpawnCrystalUntilSuccess : NOP
 org $01C74B ; <- 00C74B - bank01.asm:10368 - (STZ $AE, X)
 NOP #2 ; this STZ is what makes the crystal never spawn if it fails to spawn on the first try
 ;================================================================================
 org $0DE9C8 ; <- 6E9C8 - equipment.asm:1623 - (LDA $7EF3C5 : CMP.b #$03 : BCC .beforeAgahnim)
 JSL.l DrawPendantCrystalDiagram : RTS
-;NOP #11
 ;================================================================================
 org $0DEDCC ; <- 6EDCC - equipment.asm:2043 - (LDA $040C : AND.w #$00FF : CMP.w #$00FF : BNE .inSpecificDungeon)
 JSL.l ShowDungeonItems : NOP #5
@@ -1676,8 +1548,7 @@ JSL.l FlipLWDWFlag : NOP #6
 ;================================================================================
 org $02B15C ; <- 1315C - Bank02.asm:7672 - (LDA $7EF3CA : EOR.b #$40 : STA $7EF3CA)
 JSL.l IncrementOWMirror
-JSL.l FlipLWDWFlag
-NOP #2
+JSL.l FlipLWDWFlag : NOP #2
 ;================================================================================
 ;Clear level to open doors
 org $01C50D ; 0xC50D - Bank01.asm:10032 - (LDA $7EF3CA : BNE .inDarkWorld)
@@ -1766,12 +1637,12 @@ NOP #8
 ;================================================================================
 org $028B8F ; <- 10B8F - Bank02.asm:2236 (LDA $7EF374 : LSR A : BCS BRANCH_BETA)
 JSL CheckHeraBossDefeated : BNE + : NOP
-LDX.b #$F1 : STX $012C
+LDX.b #$F1 : STX.w $012C
 +
 ;================================================================================
 org $029090 ; <- 11090 - Bank02.asm:3099 (LDA $7EF374 : LSR A : BCS BRANCH_GAMMA)
 JSL CheckHeraBossDefeated : BNE + : NOP
-STX $012C ; DON'T MOVE THIS FORWARD OR MADNESS AWAITS
+STX.w $012C ; DON'T MOVE THIS FORWARD OR MADNESS AWAITS
 +
 ;================================================================================
 org $029798 ; <- 11798 - Bank02.asm:4287 (CMP $02895C, X : BNE BRANCH_ALPHA)
@@ -1781,9 +1652,6 @@ NOP #6 ; remove crystal room cutscene check that causes softlocks
 ;================================================================================
 ; Text Changes
 ;--------------------------------------------------------------------------------
-;org $06C7D3 ; <- 347D3 - sprite_ponds.asm:720 (LDA.b #$8A)
-;JSL.l DialogFairyThrow
-;--------------------------------------------------------------------------------
 org $06C7BB ; <- 347BB - sprite_ponds.asm:702 (JSL Sprite_ShowMessageFromPlayerContact : BCC BRANCH_ALPHA)
 JSL.l FairyPond_Init
 ;--------------------------------------------------------------------------------
@@ -1841,10 +1709,6 @@ org $05FA8E
 Sprite_ShowMessageMinimal:
 JML.l Sprite_ShowMessageMinimal_Alt
 ;--------------------------------------------------------------------------------
-;org $1CFD69
-;Main_ShowTextMessage:
-;JML.l Main_ShowTextMessage_Alt
-;--------------------------------------------------------------------------------
 org $07b0cc ; <- 3b0d0 - Bank 07.asm : 7767 (JSL Main_ShowTextMessage)
 JSL.l Main_ShowTextMessage_Alt
 ;--------------------------------------------------------------------------------
@@ -1870,7 +1734,7 @@ org $1ECD39
 SkipCrystalPalette:
 ;--------------------------------------------------------------------------------
 org $08C3FD ; <- 443FD - ancilla_receive_item.asm : 89
-LDA.b #$40 : STA.l MSReceived
+BRA + : NOP #4 : +
 ;--------------------------------------------------------------------------------
 org $08C5E5 ; <- 445ED - ancilla_receive_item.asm:395 (LDA .item_messages, Y : CMP.w #$FFFF : BEQ .handleGraphics)
 JSL.l DialogItemReceive : NOP #2
@@ -1888,12 +1752,10 @@ JSL.l DialogResetSelectionIndex
 ;-- Agahnim 1 Defeated
 org $068475 ; <- 30475 Bank06.asm : 762 - (JSL Sprite_ShowMessageMinimal)
 JSL.l AddInventory_incrementBossSwordLong
-;NOP #4
 ;----------------------------------------------------------
 ;-- We'll take your sword
 org $06B4F3 ; <- 334F3 sprite_smithy_bros.asm : 556 (JSL Sprite_ShowMessageUnconditional)
 JSL ItemSet_SmithSword
-;NOP #4
 ;----------------------------------------------------------
 
 ;===================================
@@ -1914,24 +1776,10 @@ dw $1BD8, $16FC, $0001, $0122, $00F0 ; Blind (maiden) "don't take me outside!"
 dw $1520, $167C, $0001, $0122, $00F0 ; Blind (maiden) "don't take me outside!"
 dw $05AC, $04FC, $0001, $0027, $00F0 ; Zelda in the water room
 ;----------------------------------------------------------
-;----------------------------------------------------------
-;-- Speed up Walls (Desert, Mire, and Palace of Darkness)
-; org $01CA66 ; <- CA66 Bank01.asm : 10864 - (LDA.w #$2200 : ADD $041C : STA $041C)
-; LDA.w #$4400 ; #$2200 is the normal speed, $#FF00 is max.
-;----------------------------------------------------------
 ;-- New Sign table offet calculation
 org $07b4fe ; <- 3b4fe - bank07.asm : 8454 (LDA $8A : ASL A : TAY)
 JSL CalculateSignIndex
 
-;================================================================================
-; Ganon Fixes
-;--------------------------------------------------------------------------------
-;org $1D91E3 ; <- E91E3 - sprite_ganon.asm : 778
-;JSL.l GanonWarpRNG
-;NOP #2
-;LDA #$00 : NOP #4
-;--------------------------------------------------------------------------------
-
 ;================================================================================
 ; Dark World Spawn Location Fix & Follower Fixes
 ;--------------------------------------------------------------------------------
@@ -1943,8 +1791,7 @@ JSL.l OnFileLoad
 ;--------------------------------------------------------------------------------
 org $09F520 ; <- 4F520 - module_death.asm : 401 (LDA $7EF3C5 : CMP.b #$03 : BCS BRANCH_THETA)
 JSL.l OnPlayerDead
-JSL.l IncrementDeathCounter
-NOP #6
+JSL.l IncrementDeathCounter : NOP #6
 ;--------------------------------------------------------------------------------
 org $1ED379 ; <- F5379 - sprite_agahnim.asm:75 - JSL PrepDungeonExit
 JSL FixAgahnimFollowers
@@ -1960,12 +1807,10 @@ org $08C45F ; <- 4445F - ancilla_recieve_item.asm:157 (STZ $02E9)
 JSL.l PostItemAnimation : NOP #2
 ;--------------------------------------------------------------------------------
 org $1EE90A ; <- F690A
-JSL.l ItemCheck_OldMan
-NOP #2
+JSL.l ItemCheck_OldMan : NOP #2
 ;--------------------------------------------------------------------------------
 org $0280F2 ; <- 100F2
-JSL.l ItemCheck_OldMan
-NOP #2
+JSL.l ItemCheck_OldMan : NOP #2
 ;--------------------------------------------------------------------------------
 org $1EE9FE ; <- F69FE
 JSL.l ItemSet_OldMan
@@ -1977,8 +1822,7 @@ org $059ACA ; <- 29ACA
 JSL $1DE1AA ; Sprite_SpawnFlippersItem
 ;--------------------------------------------------------------------------------
 org $1DE1E4 ; <- EE1E4 - sprite_great_catfish.asm : 489
-JSL.l LoadZoraKingItemGFX
-NOP #2
+JSL.l LoadZoraKingItemGFX : NOP #2
 ;--------------------------------------------------------------------------------
 org $068D86 ; <- 30D86
 JSL.l ItemCheck_SickKid
@@ -1990,25 +1834,20 @@ org $068BAC ; <- 30BAC - SpritePrep_FluteBoy : 1068
 JSL.l ItemCheck_TreeKid2
 
 org $06908D ; <- 3108D - SpritePrep_FluteBoy : 2175
-JSL.l ItemCheck_TreeKid
-CMP.b #$08
-BEQ $0A
+JSL.l ItemCheck_TreeKid : CMP.b #$08 : BEQ $0A
 
 org $069095 ; <- 31095 - SpritePrep_FluteBoy : 2177
-JSL.l ItemCheck_TreeKid
-CMP.b #$08
+JSL.l ItemCheck_TreeKid : CMP.b #$08
 
 org $0690BD ; <- 310BD - SpritePrep_FluteBoy : 2202
 JSL.l ItemCheck_TreeKid2
 
 org $06AF9B ; <- 32F9B - FluteBoy_Chillin : 73 : LDA $7EF34C : CMP.b #$02 : BCS .player_has_flute
-;NOP #8
 LDA HasGroveItem : AND.b #$01
 db #$D0 ; BNE
 
 org $06B062 ; <- 33062 - FluteAardvark_InitialStateFromFluteState : 225 : LDA $7EF34C : AND.b #$03 : !BGE #$05
-JSL.l ItemCheck_TreeKid2
-NOP #$02 ; remove pointless AND
+JSL.l ItemCheck_TreeKid2 : NOP #$02 ; remove pointless AND
 
 org $06B048 ; <- 33048
 JSL.l ItemCheck_TreeKid3
@@ -2035,8 +1874,7 @@ org $1DE11C ; <- EE11C
 JSL.l ItemCheck_Catfish
 ;--------------------------------------------------------------------------------
 org $1DE1A1 ; <- EE1A1 - sprite_great_catfish.asm : 445
-JSL.l LoadCatfishItemGFX
-NOP #2
+JSL.l LoadCatfishItemGFX : NOP #2
 ;--------------------------------------------------------------------------------
 org $1DDF49 ; <- EDF49 - sprite_great_catfish.asm : 19
 JML.l JumpToSplashItemTarget : NOP
@@ -2051,16 +1889,13 @@ org $1DDF81 ; <- EDF81 - sprite_great_catfish.asm : 61
 JSL.l DrawThrownItem
 ;--------------------------------------------------------------------------------
 org $05EE53 ; <- 2EE53 - mushroom.asm : 22
-JSL.l ItemCheck_Mushroom
-NOP #2
+JSL.l ItemCheck_Mushroom : NOP #2
 ;--------------------------------------------------------------------------------
 org $05EE8C ; <- 2EE8C - mushroom.asm : 69
-JSL.l ItemSet_Mushroom
-NOP
+JSL.l ItemSet_Mushroom : NOP
 ;--------------------------------------------------------------------------------
 org $05F53E ; <- 2F53E - sprite_potion_shop.asm : 40
-JSL.l ItemCheck_Powder
-CMP.b #$20
+JSL.l ItemCheck_Powder : CMP.b #$20
 ;--------------------------------------------------------------------------------
 ; the quake medallion AND FLIPPERS
 org $1DDF71 ; <- EDF71 - sprite_great_catfish.asm : 47
@@ -2080,21 +1915,16 @@ org $05EF79 ; <- 2EF79 - sprite_heart_upgrades.asm:128 (JSL Sprite_PrepAndDrawSi
 JSL.l DrawHeartContainerGFX
 ;--------------------------------------------------------------------------------
 org $05EFCE ; <- 2EFCE - sprite_heart_upgrades.asm:176 (JSL Link_ReceiveItem)
-;org $05EFEE ; <- 2EFEE - sprite_heart_upgrades.asm:202 (JSL Link_ReceiveItem)
 JSL.l HeartContainerGet
 ;--------------------------------------------------------------------------------
 ;--------------------------------------------------------------------------------
 org $0799B1 ; 399B1 - Bank07.asm:4063 (CPY.b #$3E : BNE .notHeartContainer)
-JSL.l HeartContainerSound
-BCC Link_ReceiveItem_notHeartContainer
-; JSR Player_DoSfx3
+JSL.l HeartContainerSound : BCC Link_ReceiveItem_notHeartContainer
 org $0799BA ; 399BA - Bank07.asm:4070 (LDA.b #$60 : STA $02D9)
 Link_ReceiveItem_notHeartContainer:
 ;--------------------------------------------------------------------------------
 org $09887F ; <- 4887F - ancilla_init.asm : 1163 (LDA $0C5E, X : CMP.b #$3E : BEQ .doneWithSoundEffects)
-JSL NormalItemSkipSound
-NOP
-BCS AddReceivedItem_doneWithSoundEffects
+JSL NormalItemSkipSound : NOP : BCS AddReceivedItem_doneWithSoundEffects
 org $0988AE ; <- 488AE - ancilla_init.asm : 1193 (LDA.b #$0A : STA $02)
 AddReceivedItem_doneWithSoundEffects:
 ;================================================================================
@@ -2105,21 +1935,15 @@ JSL.l DrawHeartPieceGFX
 ;--------------------------------------------------------------------------------
 org $05F08A ; <- 2F08A - sprite_heart_upgrades.asm : 324 - (LDA $7EF36B : INC A : AND.b #$03 : STA $7EF36B : BNE .got_4_piecese) item determination
 JSL.l HeartPieceGet
-BCS $18 ; reinsert the near branch that appears midway through what we overrode
-NOP #22
+JSL.l IsMedallion
+BCS + : BRA Sprite_EB_HeartPiece_handle_flags : + ; Don't change OW flags if we're
+STZ.w $0DD0,X : RTS                               ; getting a tablet item
 ;--------------------------------------------------------------------------------
 org $06C0B0 ; <- 340B0 - sprite prep
 JSL.l HeartPieceSpritePrep
 ;--------------------------------------------------------------------------------
 org $08C45B ; <- 4445B - ancilla_receive_item.asm : 152
 JSL.l HPItemReset
-;--------------------------------------------------------------------------------
-org $05EF1E ; <- 2EF1E - sprite_heart_upgrades.asm : 48 (LDA $7EF280, X : AND.b #$40 : BEQ .dont_self_terminate)
-JSL.l HeartUpgradeSpawnDecision
-;--------------------------------------------------------------------------------
-org $05EFFA ; <- 2EFFA - sprite_heart_upgrades.asm : 216 (LDA $7EF280, X : ORA.b #$40 : STA $7EF280, X)
-JSL.l SaveHeartCollectedStatus
-NOP #6
 ;================================================================================
 
 ;================================================================================
@@ -2141,26 +1965,17 @@ JSL.l OnLinkDamagedFromPit
 org $01FFE7 ; <- FFE7 - Bank01.asm:16375 (LDA $7EF36D)
 JSL.l OnLinkDamagedFromPitOutdoors
 ;--------------------------------------------------------------------------------
-org $078F27 ; <- 38F27
-JSL.l FlipperReset
-;--------------------------------------------------------------------------------
 org $02B468
-	dw FakeFlipperProtection
+dw FakeFlipperProtection
 
 org $02FFC7
 FakeFlipperProtection:
 	JSR.w $029485
 	JSL protectff
 	RTS
-
 ;--------------------------------------------------------------------------------
-;org $09F40B ; <- 4F40B - module_death.asm:222 (LDX.b #$00)
-;JSL.l IgnoreFairyCheck
-;--------------------------------------------------------------------------------
-org $078F51 ; <- 38F51 - Bank07.asm:2444 (JSR $AE54 ; $3AE54 IN ROM)
-JSL.l OnEnterWater : NOP
-;--------------------------------------------------------------------------------
-
+;org $078F51 ; <- 38F51 - Bank07.asm:2444 (JSR $AE54 ; $3AE54 IN ROM)
+;JSL.l OnEnterWater : NOP
 ;================================================================================
 ; Floodgate Softlock Fix
 ;--------------------------------------------------------------------------------
@@ -2171,20 +1986,17 @@ STZ $1000 : STZ $1001
 NOP #26
 ;--------------------------------------------------------------------------------
 org $02AA87 ; <- 12A87
-JSL.l OnOWTransition
-NOP #36
+JSL.l OnOWTransition : NOP #36
 
 ;================================================================================
 ;Inverted mode tile map update (executed right after the original tile load)
 ;--------------------------------------------------------------------------------
 org $02ED51 ; <- 16D51
-JSL.l Overworld_LoadNewTiles
-NOP #$02
+JSL.l Overworld_LoadNewTiles : NOP #$02
 ;--------------------------------------------------------------------------------
 ;Same as above
 org $02EC2E ;<- 016C2E
-JSL.l Overworld_LoadNewTiles
-NOP #$02
+JSL.l Overworld_LoadNewTiles : NOP #$02
 ;================================================================================
 org $07A3E2 ;<- 3A3E2 Bank07.asm:5764 (LDA.b #$80 : STA $03F0)
 JSL.l FreeDuckCheck : BEQ +
@@ -2205,7 +2017,6 @@ MirrorBonk_BranchGamma:
 org $1DFDA8 ; <- EFDA9 - sprite_digging_game_guy.asm:309 (STA $7FFE00)
 JSL.l SpawnShovelGamePrizeSFX
 ;--------------------------------------------------------------------------------
-;org $01EEB6 ; <- EEB6 - Bank01.asm:14138 (ORA.b #$40 : STA $0403)
 org $01EECD ; <- EECD - Bank01.asm:14160 (LDA.b #$0E : STA $012F)
 JSL.l SpawnChestGamePrizeSFX : NOP
 ;================================================================================
@@ -2214,8 +2025,7 @@ JSL.l SpawnChestGamePrizeSFX : NOP
 ; Heart Beep Timer
 ;--------------------------------------------------------------------------------
 org $0DDC9B ; <- 6DC9B
-JSL.l BeepLogic
-NOP #6
+JSL.l BeepLogic : NOP #6
 ;================================================================================
 
 ;================================================================================
@@ -2256,16 +2066,13 @@ JSL.l SetOverlayIfLamp
 ; identify the tavern entrance to determine whether link should walk up or down.
 ;--------------------------------------------------------------------------------
 org $1BBD5F ; <- Bank1b.asm:296 (LDA $1BBB73, X : STA $010E)
-JSL.l StoreLastOverworldDoorID
-NOP #3
+JSL.l StoreLastOverworldDoorID : NOP #3
 ;--------------------------------------------------------------------------------
 org $02D754 ; <- Bank02.asm:10847 (LDA $D724, X : STA $0696 : STZ $0698)
-JSL.l CacheDoorFrameData
-NOP #5
+JSL.l CacheDoorFrameData : NOP #5
 ;--------------------------------------------------------------------------------
 org $0298AD ; <- Bank02.asm:4495 (LDA $010E : CMP.b #$43)
-JSL.l WalkDownIntoTavern
-NOP #1
+JSL.l WalkDownIntoTavern : NOP #1
 ;================================================================================
 
 ;================================================================================
@@ -2280,8 +2087,6 @@ Overworld_Hole_matchedHole:
 org $1BB8BD ; <- DB8BD - Bank1B.asm:85 (PLB)
 Overworld_Hole_End:
 
-;--------------------------------------------------------------------------------
-
 ;================================================================================
 ; Replace pyramid hole check for killing aga2
 ;
@@ -2306,57 +2111,53 @@ org $02A9B0 ; (BCS $A9B7)
 NOP #2
 org $02C1C8 ; (BCS $C1CC)
 NOP #2
-;
 org $02ADA0 ; (LDA.b #$F1 : STA $012C)
 JSL Overworld_MosaicDarkWorldChecks : NOP
 ;--------------------------------------------------------------------------------
 org $05CC58 ; <- Bank05.asm:1307 (LDA $040A : CMP.b #$18)
-JSL PsychoSolder_MusicCheck
-NOP #1
+JSL PsychoSolder_MusicCheck : NOP #1
 ;--------------------------------------------------------------------------------
 org $02B13A ; <- Bank02.asm:7647
 dl Overworld_FinishMirrorWarp
 ;--------------------------------------------------------------------------------
 org $0AB949 ; <- Bank0A.asm:270 (Different from US ROM)
-JSL BirdTravel_LoadTargetAreaMusic
-NOP #16
+JSL BirdTravel_LoadTargetAreaMusic : NOP #16
 ;================================================================================
 
 ;================================================================================
 ; Hooks for roomloading.asm
 ;--------------------------------------------------------------------------------
 org $02895D ; <- Bank02.asm:1812 (JSL Dungeon_LoadRoom)
-    JSL LoadRoomHook
+JSL LoadRoomHook
 ;--------------------------------------------------------------------------------
 org $028BE7 ; <- Bank02.asm:2299 (JSL Dungeon_LoadRoom)
-    JSL LoadRoomHook_noStats
+JSL LoadRoomHook_noStats
 ;--------------------------------------------------------------------------------
 org $029309 ; <- Bank02.asm:3533 (JSL Dungeon_LoadRoom)
-    JSL LoadRoomHook_noStats
+JSL LoadRoomHook_noStats
 ;--------------------------------------------------------------------------------
 org $02C2F3 ; <- Bank02.asm:10391 (JSL Dungeon_LoadRoom)
-    JSL LoadRoomHook_noStats
+JSL LoadRoomHook_noStats
 ;================================================================================
 
 ;================================================================================
 ; Hooks into the "Reloading all graphics" routine
 ;--------------------------------------------------------------------------------
 org $00E64D ; <- Bank00.asm:5656 (STZ $00 : STX $01 : STA $02)
-    JML BgGraphicsLoading
-    BgGraphicsLoadingCancel:
-    RTS : NOP
-    BgGraphicsLoadingResume:
+JML BgGraphicsLoading
+BgGraphicsLoadingCancel:
+RTS : NOP
+BgGraphicsLoadingResume:
 ;================================================================================
 
 ;================================================================================
 ; Hook when updating the floor tileset in dungeons (such as between floors)
 ;--------------------------------------------------------------------------------
 org $00DF62 ; <- Bank00.asm:4672 (LDX.w #$0000 : LDY.w #$0040)
-    JML ReloadingFloors
-    NOP : NOP
-    ReloadingFloorsResume:
+JML ReloadingFloors : NOP #2
+ReloadingFloorsResume:
 org $00DF6E ; <- A few instructions later, right after JSR Do3To.high16Bit
-    ReloadingFloorsCancel:
+ReloadingFloorsCancel:
 ;================================================================================
 
 ;================================================================================
@@ -2404,8 +2205,7 @@ Overworld_Entrance_BRANCH_RHO: ; branch here to continue into door
 ; Paradox Cave Shopkeeper Fixes
 ;--------------------------------------------------------------------------------
 org $008C19 ; Bank00.asm@1633 (LDA.b #$01 : STA MDMAEN)
-JSL ParadoxCaveGfxFix
-NOP
+JSL ParadoxCaveGfxFix : NOP
 ;================================================================================
 
 ;================================================================================
@@ -2419,8 +2219,7 @@ org $0DCBFE ; LDA.w $0ABF
 LDA.w $021B
 
 org $02BFE0 ; LDA.b #$01 : STA.w $0ABF
-JSL SetOverworldTransitionFlags
-NOP
+JSL SetOverworldTransitionFlags : NOP
 ; For mirroring, the new flag is set in IncrementOWMirror in stats.asm
 ;================================================================================
 
@@ -2436,14 +2235,12 @@ LDA.b Scrap02 ; always zero! (this replaces the BCC)
 ADC.w #0000 ; put the carry bit into the accumulator instead of a hardcoded 1.
 ;-------------------------------------------------------------------------------
 org $02FD6F ; <- 017d6f - bank0E.asm: 3694 (LoadActualGearPalettes:) Note: Overflow of bank02 moved to 0e in US Rom
-JSL LoadActualGearPalettesWithGloves
-RTL
+JSL LoadActualGearPalettesWithGloves : RTL
 ;--------------------------------------------------------------------------------
 ; Bunny Palette/Overworld Map Bugfix
 ;--------------------------------------------------------------------------------
 org $02FDF0 ; <- 017df0 - bank0E (LDA [$00] : STA $7EC300, X : STA $7EC500, X)
-JSL LoadGearPalette_safe_for_bunny
-RTS
+JSL LoadGearPalette_safe_for_bunny : RTS
 ;================================================================================
 
 ;================================================================================
@@ -2470,7 +2267,7 @@ JSL NewElderCode
 ; Add him to Castle Map post-rain, and post aga1
 ;--------------------------------------------------------------------------------
 org $09D0AC
-db #$18, #$0F, #$43, #$FF;remove heart from tree adjancent map [LW1]
+db #$18, #$0F, #$43, #$FF ;remove heart from tree adjancent map [LW1]
 db #$12, #$19, #$16 ;add sahasrala in castle Y, X, Sprite ID
 org $09C937
 db #$B0, #$D0 ;change [LW1] map 01C pointers
@@ -2493,7 +2290,7 @@ db #$3F
 ;--------------------------------------------------------------------------------
 ; Updated evil barrier animation table
 ;--------------------------------------------------------------------------------
-org $1DF0E1;Evil Barrier new draw code
+org $1DF0E1 ;Evil Barrier new draw code
 
 dw   0,  0 : db $CC, $00, $00, $02
 dw -29,  3 : db $EA, $00, $00, $00
@@ -2563,8 +2360,8 @@ BunnyRead:
 org $07FFF4
 CheckIfReading:
 	JSR.w $07D36C ; check action
-	LDA #$80 : TRB $3B
-	CPX #$04
+	LDA.b #$80 : TRB.b $3B
+	CPX.b #$04
 	RTS
 
 ;================================================================================
@@ -2589,7 +2386,6 @@ JSL NewFireBarDamage
 org $0DDB60
 db $00, $00
 
-
 ;================================================================================
 ; Fast credits
 
@@ -2597,8 +2393,7 @@ org $02A096
 JSL DumbFlagForMSU
 
 org $0EC3AF
-JSL FastCreditsScrollOW
-JMP.w $0EC3C7
+JSL FastCreditsScrollOW : JMP.w $0EC3C7
 
 org $0EC41F
 JSL FastCreditsCutsceneUnderworldY
@@ -2606,7 +2401,6 @@ JSL FastCreditsCutsceneUnderworldY
 org $0EC42C
 JSL FastCreditsCutsceneUnderworldX
 
-
 org $0EC488
 JSL FastCreditsCutsceneTimer
 
@@ -2625,22 +2419,25 @@ org $0AEEDF : db $02 ; big icon
 org $0AEAFF : db $48 ; X position
 
 org $0AEED4 ; disable flashing
-	BRA ++ : NOP #6 : ++
+BRA ++ : NOP #6 : ++
 
 org $0AEEF2
-	SBC.b #$03 : STA.w $0801,X
-	LDA.b #$03 : STA.w $0802,X
-	LDA.b #$31 : STA.w $0803,X
+SBC.b #$03 : STA.w $0801,X
+LDA.b #$03 : STA.w $0802,X
+LDA.b #$31 : STA.w $0803,X
 
 org $008BE5 ; hijack stripes for boss GFX transfer
-	JSL DoDungeonMapBossIcon
+JSL DoDungeonMapBossIcon
 
 ;================================================================================
-
-org $01C4B8 : JSL FixJingleGlitch
-org $01C536 : JSL FixJingleGlitch
-org $01C592 : JSL FixJingleGlitch
-org $01C65F : JSL FixJingleGlitch
+org $01C4B8
+JSL FixJingleGlitch
+org $01C536
+JSL FixJingleGlitch
+org $01C592
+JSL FixJingleGlitch
+org $01C65F
+JSL FixJingleGlitch
 
 ;================================================================================
 ; Text Renderer
diff --git a/init.asm b/init.asm
index 33aff1d..3d7f30c 100644
--- a/init.asm
+++ b/init.asm
@@ -5,45 +5,45 @@
 ; called and it only gets called once ever during RESET.
 ;--------------------------------------------------------------------------------
 Init_Primary:
-	LDA #$00
+	LDA.b #$00
 	
-	LDX #$00 ; initalize our ram
+	LDX.b #$00 ; initalize our ram
 	-
-		STA $7EC025, X
-		STA $7F5000, X
+		STA.l $7EC025, X
+		STA.l $7F5000, X
 		INX
-		CPX #$10 : !BLT -
+		CPX.b #$10 : !BLT -
 
-	LDX #$10 ; initalize more ram
+	LDX.b #$10 ; initalize more ram
 	-
-		STA $7F5000, X
+		STA.l $7F5000, X
 		INX
-		CPX #$FF : !BLT -
+		CPX.b #$FF : !BLT -
 	
 	LDX #$00
 	-
-		LDA RomNameSRAM, X : CMP $00FFC0, X : BNE .clear
+		LDA.l RomNameSRAM, X : CMP.w $FFC0, X : BNE .clear
 		INX
-		CPX #$15 : !BLT -
+		CPX.b #$15 : !BLT -
 	BRA .done
 	.clear
 		REP #$30 ; set 16-bit accumulator & index registers
 		LDA.w #$0000
 		-
-			STA $700000, X
+			STA.l $700000, X
 			INX
-			CPX #$2000 : !BLT -
+			CPX.w #$2000 : !BLT -
 		SEP #$30 ; set 8-bit accumulator & index registers
-		LDX #$00
+		LDX.b #$00
 		-
-			LDA $00FFC0, X : STA RomNameSRAM, X
+			LDA.w $FFC0, X : STA.l RomNameSRAM, X
 			INX
 			CPX #$15 : !BLT -
-                LDX #$00
+                LDX.b #$00
                 -
-                        LDA RomVersion, X : STA RomVersionSRAM, X
+                        LDA.w RomVersion, X : STA.l RomVersionSRAM, X
                         INX
-                        CPX #$04 : !BLT -
+                        CPX.b #$04 : !BLT -
 	.done
 
 	REP #$20
@@ -53,7 +53,7 @@ Init_Primary:
 	LDA.b #$01 : STA.w MEMSEL ; enable fastrom access on upper banks
 	STA.l OneMindId
 	
-	LDA.b #$10 : STA $BC ; set default player sprite bank
+	LDA.b #$10 : STA.b $BC ; set default player sprite bank
 	
 	LDA.b #$81 : STA.w NMITIMEN ; thing we wrote over, turn on NMI & gamepad
 RTL
diff --git a/inventory.asm b/inventory.asm
index 4c02de3..0b17d4e 100644
--- a/inventory.asm
+++ b/inventory.asm
@@ -65,7 +65,7 @@ RTL
 			INX : BRA -- : ++
 		PLX
 		LDA.l SilverArrowsUseRestriction : BEQ ++
-		LDA.b $A0 : ORA.b $A1 : BEQ ++ ; not in ganon's room in restricted mode
+		LDA.b RoomIndex : ORA.b RoomIndex+1 : BEQ ++ ; not in ganon's room in restricted mode
 				LDA.l BowEquipment : CMP.b #$03 : !BLT .errorJump : !SUB #$02 : STA.l BowEquipment
 				BRA .errorJump2
 		++
@@ -993,7 +993,7 @@ RTL
 ;--------------------------------------------------------------------------------
 SpawnChestGamePrizeSFX:
 	CPX.b #$07 : BNE .normal
-	LDA.b $A0 : CMP.b #$06 : BNE .normal
+	LDA.b RoomIndex : CMP.b #$06 : BNE .normal
 	.prize
 	LDA.b #$1B : STA.w $012F : RTL ; play puzzle sound
 	.normal
diff --git a/invertedstatic.asm b/invertedstatic.asm
index 01c4f52..88b125c 100644
--- a/invertedstatic.asm
+++ b/invertedstatic.asm
@@ -1,9 +1,9 @@
 ;Statically mapped at $A1A000 Referenced by the front end. Do not move without coordination.
 InvertedTileAttributeLookup:
 	SEP #$20
-	LDA $8A	: CMP.b #$47 : BEQ .turtleRock
-	LDA Overworld_TileAttr, X
+	LDA.b $8A : CMP.b #$47 : BEQ .turtleRock
+	LDA.l Overworld_TileAttr, X
 	JML.l Overworld_GetTileAttrAtLocation_continue
 .turtleRock
-	LDA Inverted_TR_TileAttributes, X
+	LDA.l Inverted_TR_TileAttributes, X
 	JML.l Overworld_GetTileAttrAtLocation_continue
diff --git a/lampmantlecone.asm b/lampmantlecone.asm
index 7c447b8..3eb5ee1 100644
--- a/lampmantlecone.asm
+++ b/lampmantlecone.asm
@@ -17,7 +17,7 @@ LampCheck:
 			LDA.l LampConeLightWorld : BRA .done
 	+
 		.darkWorld
-		LDA LampConeDarkWorld
+		LDA.l LampConeDarkWorld
 	.done
 RTL
 ;================================================================================
diff --git a/maidencrystals.asm b/maidencrystals.asm
index b02ae1b..20ce70a 100644
--- a/maidencrystals.asm
+++ b/maidencrystals.asm
@@ -6,20 +6,13 @@
 ; MaidenCrystalScript
 ;--------------------------------------------------------------------------------
 MaidenCrystalScript:
-	LDA.b #$00 : STA $7F5091
-    STZ $02D8
-    STZ $02DA
-    STZ $2E
-    LDA #$02 : STA $2F
-	
-    ; Load the dungeon index. Is it the Dark Palace?
-    ;LDA $040C : !SUB.b #$0A : TAY : CPY.b #$02 : BNE +
-    ;	LDA MapIcons : CMP.b #$07 : BCS ++ : LDA.b #$07 : STA MapIcons : ++
-	;+
-    
-    LDA CrystalsField : AND.b #$7F : CMP.b #$7F : BNE + ; check if we have all crystals
-    	LDA.b #$08 : STA MapIcons ; Update the map icon to just be Ganon's Tower
+        LDA.b #$00 : STA.l BusyItem
+        STZ.w $02D8
+        STZ.w $02DA
+        STZ.b $2E
+        LDA.b #$02 : STA.w $2F
+        LDA.l CrystalsField : AND.b #$7F : CMP.b #$7F : BNE + ; check if we have all crystals
+                LDA.b #$08 : STA.l MapIcons ; Update the map icon to just be Ganon's Tower
 	+
-	
 JML.l $1ECF35 ; <- F4F35 - sprite_crystal_maiden.asm : 426
 ;--------------------------------------------------------------------------------
diff --git a/mantle.asm b/mantle.asm
index 5b60c1b..0e34340 100644
--- a/mantle.asm
+++ b/mantle.asm
@@ -2,11 +2,11 @@
 ; Mantle Object Changes
 ;--------------------------------------------------------------------------------
 Mantle_CorrectPosition:
-	LDA ProgressFlags : AND.b #$04 : BEQ +
-		LDA.b #$0A : STA $0D10, X ; just spawn it off to the side where we know it should be
-		LDA.b #$03 : STA $0D30, X
-		LDA.b #$90 : STA $0ED0, X
+	LDA.l ProgressFlags : AND.b #$04 : BEQ +
+		LDA.b #$0A : STA.w $0D10, X ; just spawn it off to the side where we know it should be
+		LDA.b #$03 : STA.w $0D30, X
+		LDA.b #$90 : STA.w $0ED0, X
 	+
-	LDA $0D00, X : !ADD.b #$03 ; thing we did originally
+	LDA.w $0D00, X : !ADD.b #$03 ; thing we did originally
 RTL
 ;--------------------------------------------------------------------------------
diff --git a/medallions.asm b/medallions.asm
index ef8da48..9c3bbd5 100644
--- a/medallions.asm
+++ b/medallions.asm
@@ -3,45 +3,45 @@
 ;--------------------------------------------------------------------------------
 TryOpenMire:
     ; Checks if we're in the Swamp of Evil.
-    LDA $8A : CMP.b #$70 : BNE .untriggered
+    LDA.b $8A : CMP.b #$70 : BNE .untriggered
     
     ; Checks whether the Misery Mire dungeon is already revealed.
-    LDA OverworldEventDataWRAM+$70 : AND.b #$20 : BNE .untriggered
+    LDA.l OverworldEventDataWRAM+$70 : AND.b #$20 : BNE .untriggered
     
     ; You have to be in the trigger window.
     LDY.b #$02 : JSL.l Ancilla_CheckIfEntranceTriggered : BCC .untriggered
     
     ; Do the 3rd animation for opening entrances
-    LDA.b #$03 : STA $04C6
+    LDA.b #$03 : STA.w $04C6
     
-    STZ $B0 ; reset the sub-submodule index
-    STZ $C8 ; reset this other index.
+    STZ.b $B0 ; reset the sub-submodule index
+    STZ.b $C8 ; reset this other index.
 	
 	.untriggered
 RTL
 ;--------------------------------------------------------------------------------
 TryOpenTRock:
     ; Checks if we're at Turtle Rock.
-    LDA $8A : CMP.b #$47 : BNE .untriggered
+    LDA.b $8A : CMP.b #$47 : BNE .untriggered
     
     ; Checks whether the Turtle Rock dungeon is already revealed.
-    LDA OverworldEventDataWRAM+$47 : AND.b #$20 : BNE .untriggered
+    LDA.l OverworldEventDataWRAM+$47 : AND.b #$20 : BNE .untriggered
     
     ; You have to be in the trigger window.
     LDY.b #$03 : JSL.l Ancilla_CheckIfEntranceTriggered : BCC .untriggered
     
 	; Do the 4rd animation for opening entrances
-    LDA.b #$04 : STA $04C6
+    LDA.b #$04 : STA.w $04C6
     
-    STZ $B0 ; reset the sub-submodule index
-    STZ $C8 ; reset this other index.
+    STZ.b $B0 ; reset the sub-submodule index
+    STZ.b $C8 ; reset this other index.
 	
 	.untriggered
 RTL
 ;--------------------------------------------------------------------------------
 MedallionTrigger_Bombos:
-    STZ $50 ; stuff we wrote over
-    STZ $0FC1
+    STZ.b $50 ; stuff we wrote over
+    STZ.w $0FC1
 	
 	PHA
 	LDA.l MireRequiredMedallion : BNE +
diff --git a/msu.asm b/msu.asm
index 6f0040f..d42f647 100644
--- a/msu.asm
+++ b/msu.asm
@@ -164,27 +164,27 @@ CheckMusicLoadRequest:
         
 .continue
         LDA.l TournamentSeed : BNE +++
-        LDA.l MSUPackRequest
-        CMP.l MSUPackCurrent : BEQ +++
-        CMP.l MSUPackCount : !BLT ++
+        LDA.w MSUPackRequest
+        CMP.w MSUPackCurrent : BEQ +++
+        CMP.w MSUPackCount : !BLT ++
         CMP.b #$FE : !BLT +
-                    STA.l MSUPackCurrent
+                    STA.w MSUPackCurrent
                     SEP #$10
                         LDA.b #$00
                         LDX.b #$07
                         -
-                            STA.l MSUFallbackTable,X
+                            STA.w MSUFallbackTable,X
                         DEX : BPL -
                     REP #$10
                     BRA +++
-                + : LDA.l MSUPackCurrent : STA.l MSUPackRequest
-            ++ : STA.l MSUPackCurrent
+                + : LDA.w MSUPackCurrent : STA.w MSUPackRequest
+            ++ : STA.w MSUPackCurrent
             JSL MSUInit_check_fallback
         +++
 
         LDA.w MusicControlRequest : CMP.b #$08 : BEQ ++  ; Mirror SFX is not affected by NoBGM or pack $FE
             LDA.l NoBGM : BNE +
-            LDA.l MSUPackCurrent : CMP.b #$FE : BNE ++
+            LDA.w MSUPackCurrent : CMP.b #$FE : BNE ++
                 + : JMP .mute
         ++
 
@@ -240,7 +240,7 @@ CheckMusicLoadRequest:
             LDA.l MusicShuffleTable-1,X : DEC : PHA
                 AND.b #$07 : TAY
                 PLA : LSR #3 : TAX
-            LDA.l MSUFallbackTable,X : BEQ .secondary_fallback : CMP.b #$FF : BEQ .mute
+            LDA.w MSUFallbackTable,X : BEQ .secondary_fallback : CMP.b #$FF : BEQ .mute
             
             - : CPY #$00 : BEQ +
                 LSR : DEY : BRA -
@@ -333,7 +333,7 @@ CheckMusicLoadRequest:
 ;--------------------------------------------------------------------------------
 SpiralStairsPreCheck:
     REP #$20    ; thing we wrote over
-    LDA.b $A0
+    LDA.b RoomIndex
     CMP.w #$000C : BNE +
         LDA.w CurrentMSUTrack : AND.w #$00FF : CMP.w #59 : BNE .done
         BRA .fade
@@ -347,14 +347,14 @@ SpiralStairsPreCheck:
         LDA.w MSUID+4 : CMP.w #!VAL_MSU_ID_45 : BNE .done
     +
 
-    LDA.l BigKeyField : AND.w #$0004 : BEQ .done                  ; Check that we have the GT big key
-    LDA.l MSUFallbackTable+7 : AND.w #$0004 : BEQ .done    ; Check that we have the extended track
+    LDA.l BigKeyField : AND.w #$0004 : BEQ .done           ; Check that we have the GT big key
+    LDA.w MSUFallbackTable+7 : AND.w #$0004 : BEQ .done    ; Check that we have the extended track
 
 .fade
     LDX.b #$F1 : STX.w MusicControlRequest
 
 .done
-    LDA.b $A0     ; thing we wrote over
+    LDA.b RoomIndex    ; thing we wrote over
     RTL
 ;--------------------------------------------------------------------------------
 
@@ -362,7 +362,7 @@ SpiralStairsPreCheck:
 ; Change music on stair transition (ToH/GT)
 ;--------------------------------------------------------------------------------
 SpiralStairsPostCheck:
-    LDA.b $A0
+    LDA.b RoomIndex
     CMP.w #$000C : BNE +
         ; Ganon's tower entrance
         LDX.w $0130 : CPX.b #$F1 : BNE .done  ; Check that we were fading out
@@ -379,7 +379,7 @@ SpiralStairsPostCheck:
     LDX.b #59 : STX.w MusicControlRequest
 
 .done
-    LDX.b #$1C : LDA.b $A0    ; thing we wrote over
+    LDX.b #$1C : LDA.b RoomIndex   ; thing we wrote over
     RTL
 ;--------------------------------------------------------------------------------
 
@@ -401,10 +401,10 @@ MSUInit:
     PHP
 
     LDA.b #$00
-    STA.l MSULoadedTrack
-    STA.l MSUResumeTrack
-    STA.l MSUResumeTime : STA.l MSUResumeTime+1 : STA.l MSUResumeTime+2 : STA.l MSUResumeTime+3
-    STA.l MSUResumeControl
+    STA.w MSULoadedTrack
+    STA.w MSUResumeTrack
+    STA.w MSUResumeTime : STA.w MSUResumeTime+1 : STA.w MSUResumeTime+2 : STA.w MSUResumeTime+3
+    STA.w MSUResumeControl
 
     LDA.l NoBGM : BNE .done
 
@@ -431,7 +431,7 @@ MSUInit:
 .wait_pack
     LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_AUDIO_BUSY : BNE .wait_pack
     LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_TRACK_MISSING : BEQ .check_pack
-    TXA : STA.l MSUPackCount
+    TXA : STA.w MSUPackCount
     BRA +
 
 ; Check the current MSU-1 pack for tracks that require SPC fallback
@@ -453,7 +453,7 @@ MSUInit:
     LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_TRACK_MISSING : BNE +
         SEC
     +
-    LDA.l MSUFallbackTable,X : ROL : STA.l MSUFallbackTable,X
+    LDA.w MSUFallbackTable,X : ROL : STA.w MSUFallbackTable,X
 
     DEY : BPL .next_track
         DEX : BPL +
@@ -474,11 +474,11 @@ MSUInit:
 ;--------------------------------------------------------------------------------
 MSUStopPlaying:
 PHA : XBA : PHA
-    LDA.l MSULoadedTrack
+    LDA.w MSULoadedTrack
     JSR IsResumableTrack : BCC +
         ; dont save if we already saved recently
         REP #$20
-        LDA.l MSUResumeTrack : AND #$00FF : BEQ ++
+        LDA.w MSUResumeTrack : AND #$00FF : BEQ ++
             LDA.l NMIFrames : !SUB MSUResumeTime : PHA
             LDA.l NMIFrames+2 : SBC MSUResumeTime+2 : BNE +++
                 PLA : CMP.l MSUResumeTimer : !BLT .too_early
@@ -487,12 +487,12 @@ PHA : XBA : PHA
             PLA
         ++
         ; saving
-        LDA.l NMIFrames : STA.l MSUResumeTime
-        LDA.l NMIFrames+2 : STA.l MSUResumeTime+2
+        LDA.l NMIFrames : STA.w MSUResumeTime
+        LDA.l NMIFrames+2 : STA.w MSUResumeTime+2
         SEP #$20
 
-        LDA.l MSULoadedTrack : STA.l MSUResumeTrack
-        LDA.b #$00 : STA.l MSULoadedTrack ; dont take this path if we're calling again
+        LDA.w MSULoadedTrack : STA.w MSUResumeTrack
+        LDA.b #$00 : STA.w MSULoadedTrack ; dont take this path if we're calling again
         LDA.b #!FLAG_MSU_RESUME : STA.w MSUCTL ; save this track's position
         PLA : XBA : PLA
         RTS
@@ -523,23 +523,23 @@ MSUMain:
     LDX.w MusicControl : BEQ +
         JMP .command_ff
     +
-    LDA.l MSUDelayedCommand : BEQ .do_fade
+    LDA.w MSUDelayedCommand : BEQ .do_fade
 
 .check_busy
     LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_AUDIO_BUSY : BNE -
 .ready
     LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_TRACK_MISSING : BNE -
 .start
-    LDA.l MSUResumeControl : BIT.b #!FLAG_RESUME_CANCEL : BEQ +
-        EOR.b #!FLAG_RESUME_CANCEL : STA.l MSUResumeControl
-        REP #$20 : LDA.l MSULoadedTrack : STA.w MSUTRACK : SEP #$20
+    LDA.w MSUResumeControl : BIT.b #!FLAG_RESUME_CANCEL : BEQ +
+        EOR.b #!FLAG_RESUME_CANCEL : STA.w MSUResumeControl
+        REP #$20 : LDA.w MSULoadedTrack : STA.w MSUTRACK : SEP #$20
         BRA -
     +
     LDA.b #!VAL_VOLUME_FULL
     STA.w TargetVolume
     
-    LDA.l MSUResumeControl : BIT.b #!FLAG_RESUME_FADEIN : BEQ +
-        EOR.b #!FLAG_RESUME_FADEIN : STA.l MSUResumeControl
+    LDA.w MSUResumeControl : BIT.b #!FLAG_RESUME_FADEIN : BEQ +
+        EOR.b #!FLAG_RESUME_FADEIN : STA.w MSUResumeControl
         LDA.b #$00
         BRA ++
     +
@@ -551,17 +551,17 @@ MSUMain:
     LDA.w CurrentMSUTrack : DEC : PHA
         AND.b #$07 : TAY
         PLA : LSR #3 : TAX
-    LDA.l MSUFallbackTable,X : BEQ +++ : CMP.b #$FF : BEQ ++
+    LDA.w MSUFallbackTable,X : BEQ +++ : CMP.b #$FF : BEQ ++
 
     - : CPY #$00 : BEQ +
         LSR : DEY : BRA -
     +
 
     AND.b #$01 : BEQ +++
-        ++ : LDA.l MSUDelayedCommand
+        ++ : LDA.w MSUDelayedCommand
     +++ : STA.w MSUCTL
     LDA.b #$00
-    STA.l MSUDelayedCommand
+    STA.w MSUDelayedCommand
     JML SPCContinue
 
 .do_fade:
@@ -624,9 +624,9 @@ MSUMain:
     +
     CPX.w CurrentControlRequest : BEQ -
     LDA.b #$00 : XBA
-    LDA.l MSUPackCurrent : BEQ +
-    - : CMP.l MSUPackCount : !BLT +
-        !SUB.l MSUPackCount : BRA -
+    LDA.w MSUPackCurrent : BEQ +
+    - : CMP.w MSUPackCount : !BLT +
+        !SUB.w MSUPackCount : BRA -
     +
 
     JSR MSUStopPlaying
@@ -639,11 +639,11 @@ MSUMain:
         DEX : BNE -
     +
         STA.w MSUTRACK
-        STA.l MSULoadedTrack
+        STA.w MSULoadedTrack
     SEP #$20
 
     PLX
-    TXA : CMP.l MSUResumeTrack : BNE + ; dont resume if too late
+    TXA : CMP.w MSUResumeTrack : BNE + ; dont resume if too late
         REP #$20
             LDA.l NMIFrames : !SUB MSUResumeTime : PHA
             LDA.l NMIFrames+2 : SBC MSUResumeTime+2 : BNE ++
@@ -656,8 +656,8 @@ MSUMain:
         SEP #$20
         LDA.b #!FLAG_RESUME_CANCEL
         .done_resume:
-        STA.l MSUResumeControl
-        LDA.b #$00 : STA.l MSUResumeTrack
+        STA.w MSUResumeControl
+        LDA.b #$00 : STA.w MSUResumeTrack
     +
     CPX #07 : BNE + ; Kakariko Village
         LDA.b $10 : CMP #$07 : BNE +
@@ -667,12 +667,12 @@ MSUMain:
     +
     TXA
     ++
-    STA.l MSULoadedTrack
+    STA.w MSULoadedTrack
     STX.w CurrentMSUTrack
-    LDA.l MSUPackCurrent : CMP #$FE : !BLT +
+    LDA.w MSUPackCurrent : CMP #$FE : !BLT +
         LDA.b #$00 : BRA ++
         + : LDA.l MSUTrackList-1,X
-    ++ : STA.l MSUDelayedCommand
+    ++ : STA.w MSUDelayedCommand
     LDA.l MSUExtendedFallbackList-1,X 
     CMP.b #17 : BEQ +
     CMP.b #22 : BEQ +
@@ -722,9 +722,9 @@ PendantFanfareWait:
     LDA.w MSUID+2 : CMP.w #!VAL_MSU_ID_23 : BNE .spc
     LDA.w MSUID+4 : CMP.w #!VAL_MSU_ID_45 : BNE .spc
     SEP #$20
-    LDA.l MSUPackCurrent : CMP #$FE : !BGE .spc
+    LDA.w MSUPackCurrent : CMP #$FE : !BGE .spc
     LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_TRACK_MISSING : BNE .spc
-    LDA.l MSUDelayedCommand : BNE .continue
+    LDA.w MSUDelayedCommand : BNE .continue
     LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_AUDIO_PLAYING : BEQ .done
 .continue
     jml PendantFanfareContinue
@@ -746,9 +746,9 @@ CrystalFanfareWait:
     LDA.w MSUID+2 : CMP.w #!VAL_MSU_ID_23 : BNE .spc
     LDA.w MSUID+4 : CMP.w #!VAL_MSU_ID_45 : BNE .spc
     SEP #$20
-    LDA.l MSUPackCurrent : CMP.b #$FE : !BGE .spc
+    LDA.w MSUPackCurrent : CMP.b #$FE : !BGE .spc
     LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_TRACK_MISSING : BNE .spc
-    LDA.l MSUDelayedCommand : BNE .continue
+    LDA.w MSUDelayedCommand : BNE .continue
     LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_AUDIO_PLAYING : BEQ .done
 .continue    
     jml CrystalFanfareContinue
diff --git a/music.asm b/music.asm
index b8ae54d..e13df10 100644
--- a/music.asm
+++ b/music.asm
@@ -9,7 +9,7 @@ PreOverworld_LoadProperties_ChooseMusic:
 
     LDX.b #$02 ; Default light world theme
 
-    LDA $8A : ORA #$40 ; check both light and dark world DM at the same time
+    LDA.b $8A : ORA.b #$40 ; check both light and dark world DM at the same time
     CMP.b #$43 : BEQ .endOfLightWorldChecks
     CMP.b #$45 : BEQ .endOfLightWorldChecks
     CMP.b #$47 : BEQ .endOfLightWorldChecks
@@ -17,47 +17,42 @@ PreOverworld_LoadProperties_ChooseMusic:
     LDY.b #$5A ; Main overworld animated tileset
 
     ; Skip village and lost woods checks if entering dark world or a special area
-    LDA $8A : CMP.b #$40 : !BGE .notVillageOrWoods
+    LDA.b $8A : CMP.b #$40 : !BGE .notVillageOrWoods
 
     LDX.b #$07 ; Default village theme
 
-    ; Check what phase we're in
-    ;LDA ProgressIndicator : CMP.b #$03 : !BLT +
-    ;    LDX.b #$02 ; Default light world theme (phase >=3)
-    ;+
-
     ; Check if we're entering the village
-    LDA $8A : CMP.b #$18 : BEQ .endOfLightWorldChecks
+    LDA.b $8A : CMP.b #$18 : BEQ .endOfLightWorldChecks
     ; For NA release would we also branch on indexes #$22 #$28 #$29
 
     LDX.b #$05 ; Lost woods theme
 
     ; check if we've pulled from the master sword pedestal
-    LDA OverworldEventDataWRAM+$80 : AND.b #$40 : BEQ +
+    LDA.b OverworldEventDataWRAM+$80 : AND.b #$40 : BEQ +
         LDX.b #$02 ; Default light world theme
     +
 
     ; check if we are entering lost woods
-    LDA $8A : BEQ .endOfLightWorldChecks
+    LDA.b $8A : BEQ .endOfLightWorldChecks
 
     .notVillageOrWoods
     ; Use the normal overworld (light world) music
     LDX.b #$02
 
     ; Check phase        ; In phase >= 2
-    LDA ProgressIndicator : CMP.b #$02 : !BGE +
+    LDA.l ProgressIndicator : CMP.b #$02 : !BGE +
         ; If phase < 2, play the legend music
         LDX.b #$03
     +
 
     .endOfLightWorldChecks
     ; if we are in the light world go ahead and set chosen selection
-    LDA CurrentWorld : BEQ .checkInverted+4
+    LDA.l CurrentWorld : BEQ .checkInverted+4
 
     LDX.b #$0F ; dark woods theme
 
     ; This music is used in dark woods
-    LDA $8A
+    LDA.b $8A
     CMP.b #$40 : BEQ +
         LDX.b #$0D  ; dark death mountain theme
 
@@ -68,16 +63,16 @@ PreOverworld_LoadProperties_ChooseMusic:
 
     ; if not inverted and light world, or inverted and dark world, skip moon pearl check
     .checkInverted
-    LDA CurrentWorld : CLC : ROL #$03 : CMP InvertedMode : BEQ .lastCheck
+    LDA.l CurrentWorld : CLC : ROL #$03 : CMP.l InvertedMode : BEQ .lastCheck
 
     ; Does Link have a moon pearl?
-    LDA MoonPearlEquipment : BNE +
+    LDA.l MoonPearlEquipment : BNE +
         LDX.b #$04 ; bunny theme
     +
 
     .lastCheck
-    LDA $0132 : CMP.b #$F2 : BNE +
-    CPX $0130 : BNE +
+    LDA.w $0132 : CMP.b #$F2 : BNE +
+    CPX.w $0130 : BNE +
         ; If the last played command ($0132) was half volume (#$F2)
         ; and the actual song playing ($0130) is same as the one for this area (X)
         ; then play the full volume command (#F3) instead of restarting the song
@@ -99,37 +94,37 @@ Overworld_FinishMirrorWarp:
 
 .clear_hdma_table
 
-    STA $1B00, X : STA $1B40, X
-    STA $1B80, X : STA $1BC0, X
-    STA $1C00, X : STA $1C40, X
-    STA $1C80, X
+    STA.w $1B00, X : STA.w $1B40, X
+    STA.w $1B80, X : STA.w $1BC0, X
+    STA.w $1C00, X : STA.w $1C40, X
+    STA.w $1C80, X
 
     DEX #2 : BPL .clear_hdma_table
 
-    LDA.w #$0000 : STA $7EC007 : STA $7EC009
+    LDA.w #$0000 : STA.l $7EC007 : STA.l $7EC009
 
     SEP #$20
 
     JSL $00D7C8               ; $57C8 IN ROM
 
-    LDA.b #$80 : STA $9B
+    LDA.b #$80 : STA.b $9B
 
     LDX.b #$04  ; bunny theme
 
     ; if not inverted and light world, or inverted and dark world, skip moon pearl check
-    LDA CurrentWorld : CLC : ROL #$03 : CMP InvertedMode : BEQ +
-        LDA MoonPearlEquipment : BEQ .endOfLightWorldChecks
+    LDA.l CurrentWorld : CLC : ROL #$03 : CMP.l InvertedMode : BEQ +
+        LDA.l MoonPearlEquipment : BEQ .endOfLightWorldChecks
     +
 
     LDX.b #$09  ; default dark world theme
 
-    LDA $8A : CMP.b #$40 : !BGE .endOfLightWorldChecks
+    LDA.b $8A : CMP.b #$40 : !BGE .endOfLightWorldChecks
 
     LDX.b #$02  ; hyrule field theme
 
     ; Check if we're entering the lost woods
     CMP.b #$00 : BNE +
-        LDA OverworldEventDataWRAM+$80 : AND.b #$40 : BNE .endOfLightWorldChecks
+        LDA.l OverworldEventDataWRAM+$80 : AND.b #$40 : BNE .endOfLightWorldChecks
         LDX.b #$05 ; lost woods theme
         BRA .endOfLightWorldChecks
     +
@@ -138,14 +133,13 @@ Overworld_FinishMirrorWarp:
     CMP.b #$18 : BNE .endOfLightWorldChecks
 
     ; Check what phase we're in
-    ; LDA ProgressIndicator : CMP.b #$03 : !BGE .endOfLightWorldChecks
         LDX.b #$07 ; Default village theme (phase <3)
 
 .endOfLightWorldChecks
-    STX $012C
+    STX.w $012C
 
-    LDA $8A : CMP.b #$40 : BNE +
-        LDX #$0F    ; dark woods theme
+    LDA.b $8A : CMP.b #$40 : BNE +
+        LDX.b #$0F    ; dark woods theme
         BRA .bunny
     +
 
@@ -154,24 +148,24 @@ Overworld_FinishMirrorWarp:
     CMP.b #$47 : BNE .notDarkMountain
 
 .darkMountain
-    LDA.b #$09 : STA $012D    ; set storm ambient SFX
+    LDA.b #$09 : STA.w $012D    ; set storm ambient SFX
     LDX.b #$0D  ; dark mountain theme
 
 .bunny
-    LDA MoonPearlEquipment : ORA InvertedMode : BNE +
-        LDX #$04    ; bunny theme
+    LDA.l MoonPearlEquipment : ORA.l InvertedMode : BNE +
+        LDX.b #$04    ; bunny theme
     +
 
-    STX $012C
+    STX.w $012C
 
 .notDarkMountain
 
-    LDA $11 : STA $010C
+    LDA.b $11 : STA.w $010C
 
-    STZ $11
-    STZ $B0
-    STZ $0200
-    STZ $0710
+    STZ.b $11
+    STZ.b $B0
+    STZ.w $0200
+    STZ.w $0710
 
     RTL
 ;--------------------------------------------------------------------------------
@@ -179,73 +173,59 @@ Overworld_FinishMirrorWarp:
 ;--------------------------------------------------------------------------------
 BirdTravel_LoadTargetAreaMusic:
     ; Skip village and lost woods checks if entering dark world or a special area
-    LDA $8A : CMP.b #$43 : BEQ .endOfLightWorldChecks
+    LDA.b $8A : CMP.b #$43 : BEQ .endOfLightWorldChecks
     CMP.b #$40 : !BGE .notVillageOrWoods
 
     LDX.b #$07 ; Default village theme
 
-    ; Check what phase we're in
-    ;LDA ProgressIndicator : CMP.b #$03 : !BLT +
-    ;    LDX.b #$02 ; Default light world theme (phase >=3)
-    ;+
-
     ; Check if we're entering the village
-    LDA $8A : CMP.b #$18 : BEQ .endOfLightWorldChecks
+    LDA.b $8A : CMP.b #$18 : BEQ .endOfLightWorldChecks
     ; For NA release would we also branch on indexes #$22 #$28 #$29
 
-    ;LDX.b #$05 ; Lost woods theme
-
-    ; check if we've pulled from the master sword pedestal
-    ;LDA OverworldEventDataWRAM+$80 : AND.b #$40 : BEQ +
-    ;    LDX.b #$02 ; Default light world theme
-    ;+
-
     ; check if we are entering lost woods
-    LDA $8A : BEQ .endOfLightWorldChecks
+    LDA.b $8A : BEQ .endOfLightWorldChecks
 
     .notVillageOrWoods
     ; Use the normal overworld (light world) music
     LDX.b #$02
 
     ; Check phase        ; In phase >= 2
-    LDA ProgressIndicator : CMP.b #$02 : !BGE +
+    LDA.l ProgressIndicator : CMP.b #$02 : !BGE +
         ; If phase < 2, play the legend music
         LDX.b #$03
     +
 
     .endOfLightWorldChecks
     ; if we are in the light world go ahead and set chosen selection
-    LDA CurrentWorld : BEQ .checkInverted+4
+    LDA.l CurrentWorld : BEQ .checkInverted+4
 
     LDX.b #$09 ; dark overworld theme
 
-    LDA $8A
+    LDA.b $8A
     ; Misery Mire rain SFX
     CMP.b #$70 : BNE ++
-        LDA OverworldEventDataWRAM+$70 : AND.b #$20 : BNE ++
-            LDA.b #$01 : CMP $0131 : BEQ +
-                STA $012D
+        LDA.l OverworldEventDataWRAM+$70 : AND.b #$20 : BNE ++
+            LDA.b #$01 : CMP.w $0131 : BEQ +
+                STA.w $012D
             + : BRA .checkInverted
     ++
 
     ; This music is used in dark death mountain
     CMP.b #$43 : BEQ .darkMountain
-    ; CMP.b #$45 : BEQ .darkMountain
-    ; CMP.b #$47 : BEQ .darkMountain
-        LDA.b #$05 : STA $012D
+        LDA.b #$05 : STA.w $012D
         BRA .checkInverted
 
 .darkMountain
-    LDA CrystalsField : CMP.b #$7F : BEQ +
+    LDA.l CrystalsField : CMP.b #$7F : BEQ +
         LDX.b #$0D  ; dark death mountain theme
-    + : LDA.b #$09 : STA $012D
+    + : LDA.b #$09 : STA.w $012D
 
     ; if not inverted and light world, or inverted and dark world, skip moon pearl check
     .checkInverted
-    LDA CurrentWorld : CLC : ROL #$03 : CMP InvertedMode : BEQ .lastCheck
+    LDA.l CurrentWorld : CLC : ROL #$03 : CMP.l InvertedMode : BEQ .lastCheck
 
     ; Does Link have a moon pearl?
-    LDA MoonPearlEquipment : BNE +
+    LDA.l MoonPearlEquipment : BNE +
         LDX.b #$04 ; bunny theme
     +
 
@@ -257,8 +237,8 @@ BirdTravel_LoadTargetAreaMusic:
 ;0 = Is Kakariko Overworld
 ;1 = Not Kakariko Overworld
 PsychoSolder_MusicCheck:
-    LDA $040A : CMP.b #$18 : BNE .done ; thing we overwrote - check if overworld location is Kakariko
-        LDA $1B  ; Also check that we are outdoors
+    LDA.w $040A : CMP.b #$18 : BNE .done ; thing we overwrote - check if overworld location is Kakariko
+        LDA.b $1B  ; Also check that we are outdoors
     .done
 RTL
 ;--------------------------------------------------------------------------------
@@ -275,10 +255,10 @@ Overworld_MosaicDarkWorldChecks:
     CMP.b #$51 : bne .doFade
 
 .checkCrystals
-    LDA CrystalsField : CMP.b #$7F : BEQ .done
+    LDA.l CrystalsField : CMP.b #$7F : BEQ .done
 
 .doFade
-    LDA.b #$F1 : STA $012C  ; thing we wrote over, fade out music
+    LDA.b #$F1 : STA.w $012C  ; thing we wrote over, fade out music
 
 .done
     RTL
diff --git a/npcitems.asm b/npcitems.asm
index 8aa788a..6cc435b 100644
--- a/npcitems.asm
+++ b/npcitems.asm
@@ -23,148 +23,127 @@
 ;--------------------------------------------------------------------------------
 
 ItemCheck_FairySword:
-	LDA NpcFlags+1 : AND.b #$08
+	LDA.l NpcFlags+1 : AND.b #$08
 RTL
 
 ItemCheck_SmithSword:
-	LDA NpcFlags+1 : AND.b #$04
+	LDA.l NpcFlags+1 : AND.b #$04
 RTL
 
 ItemCheck_MagicBat:
-	LDA NpcFlags+1 : AND.b #$80
+	LDA.l NpcFlags+1 : AND.b #$80
 RTL
 
 ItemCheck_OldMan:
-	LDA NpcFlags : AND.b #$01 : CMP #$01
+	LDA.l NpcFlags : AND.b #$01 : CMP #$01
 RTL
 
 ItemCheck_ZoraKing:
-	LDA NpcFlags : AND.b #$02
+	LDA.l NpcFlags : AND.b #$02
 RTL
 
 ItemCheck_SickKid:
-	LDA NpcFlags : AND.b #$04
+	LDA.l NpcFlags : AND.b #$04
 RTL
 
 ItemCheck_TreeKid:
-	LDA NpcFlags : AND.b #$08 ; FluteBoy_Chillin - 73: LDA FluteEquipment
+	LDA.l NpcFlags : AND.b #$08 ; FluteBoy_Chillin - 73: LDA FluteEquipment
 RTL
 
 ItemCheck_TreeKid2:
-	LDA NpcFlags : AND.b #$08 : LSR #$02 ; FluteAardvark_InitialStateFromFluteState - 225: LDA FluteEquipment : AND.b #$03
+	LDA.l NpcFlags : AND.b #$08 : LSR #$02 ; FluteAardvark_InitialStateFromFluteState - 225: LDA FluteEquipment : AND.b #$03
 RTL
 
 ItemCheck_TreeKid3:
 	JSL $0DD030 ; FluteAardvark_Draw - thing we wrote over
-	LDA NpcFlags : AND.b #$08
+	LDA.l NpcFlags : AND.b #$08
 	BEQ .normal
 	BRA .done
 	LDA.b #$05
 	.normal
-	LDA $0D80, X
+	LDA.w $0D80, X
 	.done
 RTL
 
 ItemCheck_Sahasrala:
-	LDA NpcFlags : AND.b #$10
+	LDA.l NpcFlags : AND.b #$10
 RTL
 
 ItemCheck_Library:
-	LDA NpcFlags : AND.b #$80
+	LDA.l NpcFlags : AND.b #$80
 RTL
 
 ItemCheck_Mushroom:
-	LDA NpcFlags+1 : ROL #4 ; does the same thing as below
-;	LDA NpcFlags+1 : AND.b #$10 : BEQ .clear
-;	SEC
-;RTL
-;	.clear
-;	CLC
+	LDA.l NpcFlags+1 : ROL #4 ; does the same thing as below
 RTL
 
 ItemCheck_Powder:
-	LDA NpcFlags+1 : AND.b #$20
+	LDA.l NpcFlags+1 : AND.b #$20
 RTL
 
 ItemCheck_Catfish:
-	;LDA CatfishGoodItem : BEQ .junk
-	;PHX
-	;	LDA CatfishGoodItem+1 : TAX
-	;	LDA BowEquipment-1, X
-	;PLX
-	;--
-	;CMP CatfishGoodItem : !BLT .oursNewer
-	;.theirsNewer
-	;LDA #$20 : RTL ; don't give item
-	;.oursNewers
-	;LDA #$00 : RTL ; give item
-	;.junk
-	LDA NpcFlags : AND.b #$20
+	LDA.l NpcFlags : AND.b #$20
 RTL
 ;--------------------------------------------------------------------------------
 ItemSet_FairySword:
-	PHA : LDA NpcFlags+1 : ORA.b #$08 : STA NpcFlags+1 : PLA
+	PHA : LDA.l NpcFlags+1 : ORA.b #$08 : STA.l NpcFlags+1 : PLA
 RTL
 
 ItemSet_SmithSword:
-	PHA : LDA NpcFlags+1 : ORA.b #$04 : STA NpcFlags+1 : PLA
+	PHA : LDA.l NpcFlags+1 : ORA.b #$04 : STA.l NpcFlags+1 : PLA
 RTL
 
 ItemSet_MagicBat:
-	PHA : LDA NpcFlags+1 : ORA.b #$80 : STA NpcFlags+1 : PLA
+	PHA : LDA.l NpcFlags+1 : ORA.b #$80 : STA.l NpcFlags+1 : PLA
 RTL
 
 ItemSet_OldMan:
 	JSL.l Link_ReceiveItem ; thing we wrote over
-	PHA : LDA NpcFlags : ORA.b #$01 : STA NpcFlags : PLA
+	PHA : LDA.l NpcFlags : ORA.b #$01 : STA.l NpcFlags : PLA
 RTL
 
 ItemSet_ZoraKing:
-	;JSL $1DE1AA ; Sprite_SpawnFlippersItem ; thing we wrote over
-	PHA : LDA NpcFlags : ORA.b #$02 : STA NpcFlags : PLA
+	PHA : LDA.l NpcFlags : ORA.b #$02 : STA.l NpcFlags : PLA
 RTL
 
 ItemSet_SickKid:
 	JSL.l Link_ReceiveItem ; thing we wrote over
-	PHA : LDA NpcFlags : ORA.b #$04 : STA NpcFlags : PLA
+	PHA : LDA.l NpcFlags : ORA.b #$04 : STA.l NpcFlags : PLA
 RTL
 
 ItemSet_TreeKid:
 	JSL.l Link_ReceiveItem ; thing we wrote over
-	PHA : LDA NpcFlags : ORA.b #$08 : STA NpcFlags : PLA
+	PHA : LDA.l NpcFlags : ORA.b #$08 : STA.l NpcFlags : PLA
 RTL
 
 ItemSet_Sahasrala:
 	JSL.l Link_ReceiveItem ; thing we wrote over
-	PHA : LDA NpcFlags : ORA.b #$10 : STA NpcFlags : PLA
+	PHA : LDA.l NpcFlags : ORA.b #$10 : STA.l NpcFlags : PLA
 RTL
 
 ItemSet_Catfish:
-	;JSL $00D52D ; GetAnimatedSpriteTile.variable ; thing we wrote over
-	;JSL.l LoadCatfishItemGFX
-	PHA : LDA NpcFlags : ORA.b #$20 : STA NpcFlags : PLA
+	PHA : LDA.l NpcFlags : ORA.b #$20 : STA.l NpcFlags : PLA
 RTL
 
 ItemSet_Library:
 	JSL.l Link_ReceiveItem ; thing we wrote over
-	PHA : LDA NpcFlags : ORA.b #$80 : STA NpcFlags : PLA
+	PHA : LDA.l NpcFlags : ORA.b #$80 : STA.l NpcFlags : PLA
 RTL
 
 ItemSet_Mushroom:
 	PHA
-		LDA NpcFlags+1 : ORA.b #$10 : STA NpcFlags+1
-		LDY $0E80, X ; Retrieve stored item type
+		LDA.l NpcFlags+1 : ORA.b #$10 : STA.l NpcFlags+1
+		LDY.w $0E80, X ; Retrieve stored item type
 		BNE +
 			; if for any reason the item value is 0 reload it, just in case
 			%GetPossiblyEncryptedItem(MushroomItem, SpriteItemValues) : TAY
 		+
 	PLA
-	;LDY.b #$29
-	STZ $02E9 ; thing we wrote over - the mushroom is an npc for item purposes apparently
+	STZ.w $02E9 ; thing we wrote over - the mushroom is an npc for item purposes apparently
 RTL
 
 ItemSet_Powder:
-	PHA : LDA NpcFlags+1 : ORA.b #$20 : STA NpcFlags+1 : PLA
+	PHA : LDA.l NpcFlags+1 : ORA.b #$20 : STA.l NpcFlags+1 : PLA
 RTL
 ;================================================================================
 
@@ -172,11 +151,11 @@ RTL
 ; Randomize 300 Rupee NPC
 ;--------------------------------------------------------------------------------
 Set300RupeeNPCItem:
-	INC $0D80, X ; thing we wrote over
+	INC.w $0D80, X ; thing we wrote over
 
 	PHA : PHP
 	REP #$20 ; set 16-bit accumulator
-	LDA $A0 ; these are all decimal because i got them that way
+	LDA.b RoomIndex ; these are all decimal because i got them that way
 	CMP.w #291 : BNE +
 		%GetPossiblyEncryptedItem(RupeeNPC_MoldormCave, SpriteItemValues)
 		TAY ; load moldorm cave value into Y
diff --git a/pendantcrystalhud.asm b/pendantcrystalhud.asm
index b9809a5..f7cfbed 100644
--- a/pendantcrystalhud.asm
+++ b/pendantcrystalhud.asm
@@ -1,20 +1,17 @@
 ;================================================================================
 ; Pendant / Crystal HUD Fix
 ;--------------------------------------------------------------------------------
-;CheckPendantHUD:
-;	LDA HudFlag : CMP.b #$40 ; check for hud flag instead
-;RTL
 ;================================================================================
 FlipLWDWFlag:
 	PHP
 	SEP #$20 ; set 8-bit accumulator
-	LDA CurrentWorld : EOR.b #$40 : STA CurrentWorld
+	LDA.l CurrentWorld : EOR.b #$40 : STA.l CurrentWorld
 	BEQ +
 		LDA.b #07 : BRA ++ ; dark world - crystals
 	+ 
 		LDA.b #03 ; light world - pendants
 	++
-	STA MapIcons
+	STA.l MapIcons
 	PLP
 RTL
 ;================================================================================
@@ -23,7 +20,7 @@ HUDRebuildIndoorHole:
 	LDA.l GenericKeys : BEQ .normal
 	.generic
 	PLA
-	LDA CurrentGenericKeys ; generic key count
+	LDA.l CurrentGenericKeys ; generic key count
 	JSL.l HUD_RebuildIndoor_Palace
 RTL
 	.normal
@@ -34,18 +31,18 @@ RTL
 HUDRebuildIndoor:
 	LDA.l GenericKeys : BEQ .normal
 	.generic
-	LDA.b #$00 : STA $7EC017
-	LDA CurrentGenericKeys ; generic key count
+	LDA.b #$00 : STA.l $7EC017
+	LDA.l CurrentGenericKeys ; generic key count
 RTL
 	.normal
-    LDA.b #$00 : STA $7EC017
+    LDA.b #$00 : STA.l $7EC017
     LDA.b #$FF ; don't show keys
 RTL
 ;================================================================================
 GetCrystalNumber:
 	PHX
 		TXA : ASL : TAX
-		LDA CurrentWorld : EOR.b #$40 : BNE +
+		LDA.l CurrentWorld : EOR.b #$40 : BNE +
 			INX
 		+
 		LDA.l CrystalNumberTable-16, X
@@ -55,13 +52,13 @@ RTL
 OverworldMap_CheckObject:
 	PHX
 		;CPX.b #$01 : BNE + : JMP ++ : + : JMP .fail
-		LDA CurrentWorld : AND.b #$40 : BNE +
+		LDA.l CurrentWorld : AND.b #$40 : BNE +
 			;LW Map
 			LDA.l MapMode : BEQ +++
-			LDA MapField : ORA MapOverlay : AND.b #$01 : BNE +++
+			LDA.l MapField : ORA.l MapOverlay : AND.b #$01 : BNE +++
 				PHX
 					LDA.l .lw_map_offsets, X : TAX ; put map offset into X
-					LDA MapField, X : ORA MapOverlay, X
+					LDA.l MapField, X : ORA.l MapOverlay, X
 				PLX
 				AND.l .lw_map_masks, X : BNE +++
 				JMP .fail
@@ -72,7 +69,7 @@ OverworldMap_CheckObject:
 		+
 			;DW Map
 			LDA.l MapMode : BEQ +++			
-			LDA MapField : ORA MapOverlay : AND.b #$02 : BNE +++
+			LDA.l MapField : ORA.l MapOverlay : AND.b #$02 : BNE +++
 				PHX
 					LDA.l .dw_map_offsets, X : TAX ; put map offset into X
 					LDA.l MapField, X : ORA MapOverlay, X
@@ -90,11 +87,11 @@ RTL
 		AND.b #$40 : BNE .checkCrystal
 		
 		.checkPendant
-		LDA PendantsField : AND.l CrystalPendantFlags, X : BNE .fail
+		LDA.l PendantsField : AND.l CrystalPendantFlags, X : BNE .fail
 		CLC : BRA .done
 	
 		.checkCrystal
-		LDA CrystalsField : AND.l CrystalPendantFlags, X : BNE .fail
+		LDA.l CrystalsField : AND.l CrystalPendantFlags, X : BNE .fail
 		CLC : BRA .done
 	
 		.fail
@@ -119,33 +116,24 @@ db $02, $80, $08, $10, $01, $40, $04
 SetLWDWMap:
 	PHP
 	SEP #$20 ; set 8-bit accumulator
-	LDA CurrentWorld : EOR.b #$40
+	LDA.l CurrentWorld : EOR.b #$40
 	BNE +
 		LDA.b #07 : BRA ++ ; dark world - crystals
 	+ 
 		LDA.b #03 ; light world - pendants
 	++
-	STA MapIcons
+	STA.l MapIcons
 	PLP
 RTL
 ;================================================================================
 GetMapMode:
-	LDA CurrentWorld : AND.b #$40 : BEQ +
+	LDA.l CurrentWorld : AND.b #$40 : BEQ +
 		LDA.b #07 ; dark world - crystals
 RTL
 	+ 
 		LDA.b #03 ; light world - pendants
 RTL
 ;================================================================================
-;GetPendantCrystalWorld:
-;	PHB : PHK : PLB
-;	PHX
-;		LDA $040C : LSR : TAX
-;		LDA .dungeon_worlds, X
-;	PLX : PLB
-;	CMP.b #$00
-;RTL
-;================================================================================
 BringMenuDownEnhanced:
 	REP #$20 ; set 16-bit accumulator
 		LDA.l TournamentSeed : AND.w #$00FF
@@ -160,7 +148,7 @@ BringMenuDownEnhanced:
 		!ADD $EA : CMP.w #$FF18 : !BGE .noOvershoot
 			LDA.w #$FF18 ; if we went past the limit, go to the limit
 		.noOvershoot
-		STA $EA : CMP.w #$FF18
+		STA.b $EA : CMP.w #$FF18
 	SEP #$20 ; set 8-bit accumulator
 	BNE .notDoneScrolling
 		INC $0200
@@ -178,38 +166,37 @@ RaiseHudMenu:
 	!ADD $EA : BMI .noOvershoot
 		LDA.w #$0000 ; if we went past the limit, go to the limit
 	.noOvershoot
-	STA $EA
+	STA.b $EA
 RTL
 ;================================================================================
 CheckCloseItemMenu:
 	LDA.l MenuCollapse : BNE + 
-		LDA $F4 : AND.b #$10 : RTL
+		LDA.b $F4 : AND.b #$10 : RTL
 	+
-	LDA $F0 : AND.b #$10 : EOR.b #$10
+	LDA.b $F0 : AND.b #$10 : EOR.b #$10
 RTL
 ;================================================================================
 ShowDungeonItems:
-	LDA $040C : AND.w #$00FF : CMP.w #$00FF : BNE + : RTL : + ; return normal result if outdoors or in a cave
-	;LDA $F0 : AND.w #$0020 ; check for select
-	LDA HudFlag : AND.w #$0020 ; check hud flag
+	LDA.w $040C : AND.w #$00FF : CMP.w #$00FF : BNE + : RTL : + ; return normal result if outdoors or in a cave
+	LDA.l HudFlag : AND.w #$0020 ; check hud flag
 	BEQ + : LDA.w #$0000 : RTL : + ; if set, send the zero onwards
-	LDA $040C : AND.w #$00FF : CMP.w #$00FF ; original logic
+	LDA.w $040C : AND.w #$00FF : CMP.w #$00FF ; original logic
 RTL
 ;--------------------------------------------------------------------------------
 UpdateKeys:
 	PHX : PHP
 	SEP #$30 ; set 8-bit accumulator & index registers
-		LDA $040C : CMP.b $1F : !BLT .skip
+		LDA.w $040C : CMP.b $1F : !BLT .skip
 		
 		LSR : TAX ; get dungeon index and store to X
 	
-		LDA CurrentSmallKeys ; load current key count
-		STA DungeonKeys, X ; save to main counts
+		LDA.l CurrentSmallKeys ; load current key count
+		STA.l DungeonKeys, X ; save to main counts
 		
 		CPX.b #$00 : BNE +
-			STA HyruleCastleKeys ; copy HC to sewers
+			STA.l HyruleCastleKeys ; copy HC to sewers
 		+ : CPX.b #$01 : BNE +
-			STA SewerKeys ; copy sewers to HC
+			STA.l SewerKeys ; copy sewers to HC
 		+
 		.skip
 	JSL.l PostItemGet
@@ -232,34 +219,34 @@ RTL
 ;--------------------------------------------------------------------------------
 DrawBootsInMenuLocation:
 	LDA.l HUDDungeonItems : BNE +
-		LDA.w #$1608 : STA $00
+		LDA.w #$1608 : STA.b $00
 		RTL
 	+
-	LDA.w #$1588 : STA $00
+	LDA.w #$1588 : STA.b $00
 RTL
 ;--------------------------------------------------------------------------------
 DrawGlovesInMenuLocation:
 	LDA.l HUDDungeonItems : BNE +
-		LDA.w #$1610 : STA $00
+		LDA.w #$1610 : STA.b $00
 		RTL
 	+
-	LDA.w #$1590 : STA $00
+	LDA.w #$1590 : STA.b $00
 RTL
 ;--------------------------------------------------------------------------------
 DrawFlippersInMenuLocation:
 	LDA.l HUDDungeonItems : BNE +
-		LDA.w #$1618 : STA $00
+		LDA.w #$1618 : STA.b $00
 		RTL
 	+
-	LDA.w #$1598 : STA $00
+	LDA.w #$1598 : STA.b $00
 RTL
 ;--------------------------------------------------------------------------------
 DrawMoonPearlInMenuLocation:
 	LDA.l HUDDungeonItems : BNE +
-		LDA.w #$1620 : STA $00
+		LDA.w #$1620 : STA.b $00
 		RTL
 	+
-	LDA.w #$15A0 : STA $00
+	LDA.w #$15A0 : STA.b $00
 RTL
 ;--------------------------------------------------------------------------------
 DrawHUDDungeonItems:
@@ -371,10 +358,10 @@ DrawHUDDungeonItems:
 +
 ;-------------------------------------------------------------------------------
 
-	LDA HUDDungeonItems : AND.w #$0001 : BEQ .skip_small_keys
+	LDA.l HUDDungeonItems : AND.w #$0001 : BEQ .skip_small_keys
 
 .draw_small_keys
-		LDA.w #$2810 : STA $1684 ; small keys icon
+		LDA.w #$2810 : STA.w $1684 ; small keys icon
 
 		LDY.w #0
 
@@ -399,10 +386,10 @@ DrawHUDDungeonItems:
 .skip_small_keys
 
 	; Big Keys
-	LDA HUDDungeonItems : AND.w #$0002 : BEQ .skip_big_keys
+	LDA.l HUDDungeonItems : AND.w #$0002 : BEQ .skip_big_keys
 
 
-		LDA.w #$2811 : STA $16C4 ; big key icon
+		LDA.w #$2811 : STA.w $16C4 ; big key icon
 
 		; use X so we can BIT
 		LDX.w #0
@@ -429,10 +416,8 @@ DrawHUDDungeonItems:
 
 .skip_big_keys
 
-	LDA HUDDungeonItems : AND.w #$0010 : BEQ .skip_boss_kills
-
-		LDA.w #$280F : STA $1704 ; skull icon
-
+	LDA.l HUDDungeonItems : AND.w #$0010 : BEQ .skip_boss_kills
+		LDA.w #$280F : STA.w $1704 ; skull icon
 		LDY.w #0
 
 .next_boss_kill
@@ -460,8 +445,8 @@ DrawHUDDungeonItems:
  .maps_and_compasses
 
 	; Maps
-	LDA HUDDungeonItems : AND.w #$0004 : BEQ .skip_maps
-		LDA.w #$2821 : STA $1684 ; map icon
+	LDA.l HUDDungeonItems : AND.w #$0004 : BEQ .skip_maps
+		LDA.w #$2821 : STA.w $1684 ; map icon
 
 		; use X so we can BIT
 		LDX.w #0
@@ -489,8 +474,8 @@ DrawHUDDungeonItems:
 .skip_maps
 
 	; Compasses
-	LDA HUDDungeonItems : AND.w #$0008 : BEQ .skip_compasses
-		LDA.w #$2C20 : STA $16C4 ; compass icon
+	LDA.l HUDDungeonItems : AND.w #$0008 : BEQ .skip_compasses
+		LDA.w #$2C20 : STA.w $16C4 ; compass icon
 
 		; use X so we can BIT
 		LDX.w #0
@@ -528,19 +513,19 @@ DrawPendantCrystalDiagram:
 		REP #$30 ; Set 16-bit accumulator & index registers
 		LDX.w #$0000 ; Paint entire box black & draw empty pendants and crystals
 		-
-		LDA.l .row0, X : STA $12EA, X
-		LDA.l .row1, X : STA $132A, X
-		LDA.l .row2, X : STA $136A, X
-		LDA.l .row3, X : STA $13AA, X
-		LDA.l .row4, X : STA $13EA, X
-		LDA.l .row5, X : STA $142A, X
-		LDA.l .row6, X : STA $146A, X
-		LDA.l .row7, X : STA $14AA, X
-		LDA.l .row8, X : STA $14EA, X
+		LDA.l .row0, X : STA.w $12EA, X
+		LDA.l .row1, X : STA.w $132A, X
+		LDA.l .row2, X : STA.w $136A, X
+		LDA.l .row3, X : STA.w $13AA, X
+		LDA.l .row4, X : STA.w $13EA, X
+		LDA.l .row5, X : STA.w $142A, X
+		LDA.l .row6, X : STA.w $146A, X
+		LDA.l .row7, X : STA.w $14AA, X
+		LDA.l .row8, X : STA.w $14EA, X
 		INX #2 : CPX.w #$0014 : BCC -
 		
 		; pendants
-		LDA PendantsField
+		LDA.l PendantsField
 
 		  LSR : BCC + ; pendant of wisdom (red)
 			LDX.w #$252B
@@ -567,7 +552,7 @@ DrawPendantCrystalDiagram:
 
 
 		; crystals
-		LDA CrystalsField
+		LDA.l CrystalsField
 		LDX.w #$2D44
 		LDY.w #$2D45
 
diff --git a/playername.asm b/playername.asm
index 2a820b6..b9f80bc 100644
--- a/playername.asm
+++ b/playername.asm
@@ -19,16 +19,16 @@ WriteBlanksToPlayerName:
 RTL
 
 WriteCharacterToPlayerName:
-	STA ExtendedFileNameSRAM, X
+	STA.l ExtendedFileNameSRAM, X
         CPX.w #$0008 : !BGE +
-	    STA $7003D9, X ;what we wrote over
+	    STA.l $7003D9, X ;what we wrote over
         +
 RTL
 
 ReadCharacterFromPlayerName: ;Only for use on Name Screen
-	LDA ExtendedFileNameSRAM, X
+	LDA.l ExtendedFileNameSRAM, X
         CPX.w #$0008 : !BGE +
-            LDA $7003D9, X ;what we wrote over
+            LDA.l $7003D9, X ;what we wrote over
         +
 RTL
 
@@ -40,13 +40,13 @@ PLB
 RTL
 
 WrapCharacterPosition:
-	LDA $0B12 : BPL +
+	LDA.w $0B12 : BPL +
 		LDA.b #$0B
 	+
 	CMP.b #$0C : !BLT +
 		LDA.b #$00
 	+
-	STA $0B12
+	STA.w $0B12
 RTL
 
 CharacterPositions:
diff --git a/potions.asm b/potions.asm
index 57f3f26..7068c0f 100644
--- a/potions.asm
+++ b/potions.asm
@@ -4,7 +4,7 @@
 ;--------------------------------------------------------------------------------
 RefillHealth:
 	REP #$20 ; set 16-bit accumulator
-	LDA.b $A0 ; these are all decimal because i got them that way
+	LDA.b RoomIndex ; these are all decimal because i got them that way
 	CMP.w #279 : BNE + ; Spike Cave bottles work normally
 		SEP #$20 ; set 8-bit accumulator
 		LDA.b #$A0
@@ -50,7 +50,7 @@ RTL
 ;--------------------------------------------------------------------------------
 RefillMagic:
 	REP #$20 ; set 16-bit accumulator
-	LDA.b $A0 ; these are all decimal because i got them that way
+	LDA.b RoomIndex ; these are all decimal because i got them that way
 	CMP.w #279 : BNE + ; Spike Cave bottles work normally
 		SEP #$20 ; set 8-bit accumulator
 		LDA.b #$80
diff --git a/quickswap.asm b/quickswap.asm
index a69f7ce..3563a72 100644
--- a/quickswap.asm
+++ b/quickswap.asm
@@ -4,7 +4,7 @@ QuickSwap:
 	; We perform all other checks only if we are pushing L or R in order to have minimal
 	; perf impact, since this runs every frame
 
-	LDA.b $F6 : AND #$30 : BEQ .done
+	LDA.b $F6 : AND.b #$30 : BEQ .done
 
 	XBA ; stash away the value for after the checks.
 
@@ -18,9 +18,9 @@ QuickSwap:
 		; If prossing both L and R this frame, then go directly to the special swap code
 		LDX.w $0202 : BRA .special_swap
 	+
-	BIT #$10 : BEQ + ; Only pressed R
+	BIT.b #$10 : BEQ + ; Only pressed R
 		JSR.w RCode
-		LDA.b $F2 : BIT #$20 : BNE .special_swap ; Still holding L from a previous frame
+		LDA.b $F2 : BIT.b #$20 : BNE .special_swap ; Still holding L from a previous frame
 		BRA .store
 	+
 	; Only pressed L
@@ -29,18 +29,18 @@ QuickSwap:
 	BRA .store
 
 	.special_swap
-	LDA InventoryTracking+1 : ORA #$01 : STA InventoryTracking+1
+	LDA.l InventoryTracking+1 : ORA.b #$01 : STA.l InventoryTracking+1
 	CPX.b #$02 : BEQ + ; boomerang
 	CPX.b #$01 : BEQ + ; bow
 	CPX.b #$05 : BEQ + ; powder
 	CPX.b #$0D : BEQ + ; flute
 	CPX.b #$10 : BEQ + ; bottle
 	BRA .store
-	+ STX $0202 : JSL ProcessMenuButtons_y_pressed
+	+ STX.w $0202 : JSL ProcessMenuButtons_y_pressed
 
 	.store
 	LDA.b #$20 : STA.w $012F
-	STX $0202
+	STX.w $0202
 
 	JSL HUD_RefreshIconLong
 	PLX
@@ -50,11 +50,11 @@ QuickSwap:
 RTL
 RCode:
 	LDX.w $0202
-	LDA.b $F2 : BIT #$20 : BNE ++ ; Still holding L from a previous frame
-		LDA InventoryTracking+1 : AND #$FE : STA InventoryTracking+1
+	LDA.b $F2 : BIT.b #$20 : BNE ++ ; Still holding L from a previous frame
+		LDA.l InventoryTracking+1 : AND.b #$FE : STA.l InventoryTracking+1
 		BRA +
 	++
-	LDA InventoryTracking+1 : BIT #$01 : BEQ +
+	LDA.l InventoryTracking+1 : BIT.b #$01 : BEQ +
 	RTS
 	-
 		+ CPX.b #$14 : BNE + : LDX.b #$00 ;will wrap around to 1
@@ -68,10 +68,10 @@ RTS
 LCode:
 	LDX.w $0202
 	LDA.b $F2 : BIT #$10 : BNE ++ ; Still holding R from a previous frame
-		LDA InventoryTracking+1 : AND #$FE : STA InventoryTracking+1
+		LDA.l InventoryTracking+1 : AND.b #$FE : STA.l InventoryTracking+1
 		BRA +
 	++
-	LDA InventoryTracking+1 : BIT #$01 : BEQ +
+	LDA.l InventoryTracking+1 : BIT.b #$01 : BEQ +
 	RTS
 	-
 		+ CPX.b #$01 : BNE + : LDX.b #$15 ; will wrap around to $14
diff --git a/ram.asm b/ram.asm
index a6a3269..98d131a 100644
--- a/ram.asm
+++ b/ram.asm
@@ -4,7 +4,7 @@
 ; This module is primarily concerned with labeling WRAM addresses used by the
 ; randomizer and documenting their usage.
 ;
-; See the JP 1.0 disassembly for reference as well
+; See the JP 1.0 disassembly for reference
 ; (https://github.com/spannerisms/jpdasm/ - 31/10/2022)
 ;--------------------------------------------------------------------------------
 pushpc
@@ -36,6 +36,7 @@ Scrap0F: skip 1  ;
 LinkPosY = $7E0020 ; 2 bytes
 LinkPosX = $7E0022 ; 2 bytes
 
+RoomIndex = $7E00A0 ; 2 bytes, UW room index
 
 ;================================================================================
 ; Bank 7E
@@ -55,6 +56,8 @@ MusicControlRequest = $7E012C
 
 ItemReceiptID = $7E02D8
 
+NMIAux = $7E0632
+
 SpritePosYLow = $7E0D00 ; all $10 bytes
 SpritePosXLow = $7E0D10
 SpritePosYHigh = $7E0D20
@@ -69,8 +72,15 @@ SpriteDirectionTable = $7E0EB0
 
 ToastBuffer = $7E1E0E ; 2 bytes DoToast
 
-ScratchBufferNV = $7E1E70 ; Callee preserved, not ok to clobber
-ScratchBufferV = $7E1E80 ; Caller preserved, okay to clobber
+MSUResumeTime = $7E1E6B ; 4 bytes
+MSUResumeControl = $7E1E6F
+MSUFallbackTable = $7E1E70 ; 8 bytes
+MSUDelayedCommand = $7E1E79
+MSUPackCount = $7E1E7A
+MSUPackCurrent = $7E1E7B
+MSUPackRequest = $7E1E7C
+MSULoadedTrack = $7E1E7D ; 2 bytes
+MSUResumeTrack = $7E1E7F 
 
 ;1E90
 ClockHours = $7E1E90 ; Clock Hours
@@ -78,7 +88,9 @@ ClockMinutes = $7E1E94 ; Clock Minutes
 ClockSeconds = $7E1E98 ; Clock Seconds
 ClockBuffer = $7E1E9C ; Clock Temporary
 ;1EA0
+ScratchBufferNV = $7E1EA0 ; Callee preserved
 ;1EB0
+ScratchBufferV = $7E1EB0 ; Caller preserved
 ;1EC0
 ;1ED0
 ;1EE0
@@ -108,103 +120,111 @@ BigRAM = $7EC900           ; Big buffer of free ram (0x1F00)
 ;================================================================================
 ; Bank 7F
 ;--------------------------------------------------------------------------------
-RedrawFlag = $7F5000
-
-SpriteSkipEOR = $7F5008
-
-MSReceived = $7F5031
-; GanonWarpChain = $7F5032
-ForceHeartSpawn = $7F5033
-SkipHeartSave = $7F5034
-AltTextFlag = $7F5035 ; two bytes, next must be zero. 0=disable
-BossKills = $7F5037
-LagTime = $7F5038
-RupeesCollected = $7F503C ; 2 bytes
-NonChestCounter = $7F503E
-
-TileUploadOffsetOverride = $7F5042
-
-NMIAux = $7F5044
-
-ShopId = $7F5050
-ShopType = $7F5051
-ShopInventory = $7F5052 ; 0x0C
-ShopState = $7F505F
-ShopCapacity = $7F5060
-ShopScratch = $7F5061
-ShopSRAMIndex = $7F5062
-ShopMerchant = $7F5063
-; ShopDMATimer = $7F5064 unused
-ShopPriceColumn = $7F5066 ; two bytes
-
-OneMindId = $7F5072
-OneMindTimerRAM = $7F5073
-
-ClockStatus = $7F507E ; 2 bytes 
-                      ; ---- --dn
-                      ; d - dnf
-                      ; n - negative
-
-RNGLockIn = $7F5090 ; RNG Item
-BusyItem = $7F5091
-BusyHealth = $7F5092
-BusyMagic = $7F5093
-DialogOffsetPointer = $7F5094 ; 2 bytes
-DialogReturnPointer = $7F5096 ; 2 bytes
-
-StalfosBombDamage = $7F509D
-ValidKeyLoaded = $7F509E
-
-SwordModifier = $7F50C0
-ShieldModifier = $7F50C1 ; not implemented
-ArmorModifier = $7F50C2
-MagicModifier = $7F50C3
-LightConeModifier = $7F50C4
-CuccoStormer = $7F50C5 ; non-zero write causes storm, needs to be zeroed
-OldManDash = $7F50C6
-IceModifier = $7F50C7
-InfiniteArrows = $7F50C8
-InfiniteBombs = $7F50C9
-InfiniteMagic = $7F50CA
-DPadInverter = $7F50CB ; fill in values
-OHKOFlag = $7F50CC
-SpriteSwapper = $7F50CD
-BootsModifier = $7F50CE
-
-; $7F50D0 - $7F50FF - Block Cypher Parameters
-; $7F5100 - $7F51FF - Block Cypher Buffer
-
-; Crypto buffer ($7F50D0 - $7F51FF)
-KeyBase = $7F50D0
-y = $7F50E0
-z = $7F50E4
-Sum = $7F50E8
-p = $7F50EC
-e = $7F50F0
-CryptoScratch = $7F50F2
-CryptoBuffer = $7F5100
-v = $7F5100
-
-RNGPointers = $7F5200 ; $FF bytes 
-
-RxBuffer = $7F5300 ; $00-$5F buffer $60-7E reserved
-RxStatus = $7F537F ; 1 byte
-TxBuffer = $7F5380 ; $80 - $EF buffer $F0 - $FE reserved
-TxStatus = $7F53FF ; $F0 - $FE
-
-MSUFallbackTable = $7F5460 ; 8 bytes
-MSUDelayedCommand = $7F5469
-MSUPackCount = $7F546A
-MSUPackCurrent = $7F546B
-MSUPackRequest = $7F546C
-MSULoadedTrack = $7F546D ; 2 bytes
-MSUResumeTrack = $7F546F 
-MSUResumeTime = $7F5470 ; 4 bytes
-MSUResumeControl = $7F5474 
-
-CompassTotalsWRAM = $7F5410
-
-DialogBuffer = $7F5700 ; $FF bytes
+base $7F5000
+RedrawFlag: skip 1                 ;
+skip 2                             ;
+HexToDecDigit1: skip 1             ; Space for storing the result of hex to decimal conversion.
+HexToDecDigit2: skip 1             ; Digits are stored from high to low.
+HexToDecDigit3: skip 1             ;
+HexToDecDigit4: skip 1             ;
+HexToDecDigit5: skip 1             ;
+SpriteSkipEOR: skip 2              ; Used in utilities.asm to determine when to skip drawing sprites. Zero-padded
+skip $2B                           ; Unused
+AltTextFlag: skip 2                ; dialog.asm: Determines whether to load from vanilla decompression buffer
+                                   ; or from a secondary buffer (used for things like free dungeon item text)
+BossKills: skip 1                  ;
+LagTime: skip 4                    ; Computed during stats preparation for display
+RupeesCollected: skip 2            ; Computed during stats preparation for display
+NonChestCounter: skip 2            ; Computed during stats preparation for display
+skip 2                             ; Unused
+TileUploadOffsetOverride: skip 2   ; Offset override for loading sprite gfx
+skip 3                             ;
+skip 9                             ;
+                                   ; Shop Block $7F5050 - $7F506F
+ShopId: skip 1                     ; Shop ID. Used for indexing and loading inventory for custom shops
+ShopType: skip 1                   ; Shop type. $FF = vanilla shop
+                                   ; t - - - - - - -
+                                   ; t = Take-any
+ShopInventory: skip $0D            ; For three possible shop items, row major:
+                                   ; [Item ID][Price low][Price High][Purchase Count]
+ShopState: skip 1                  ; - - - - - l c r | Bitfield that determines whether to draw an item
+ShopCapacity: skip 1               ; Four lower bits of shop_config in ShopTable, number of items 1-3
+ShopScratch: skip 1                ; Scratch byte used in shop drawing routines
+ShopSRAMIndex: skip 1              ; SRAM index for purchase counts
+ShopMerchant: skip 1               ; Loaded from ShopTable and used to jump to one of four drawing routines
+skip 2                             ; Unused
+ShopPriceColumn: skip 3            ; Stores coordinates for drawing prices in shops
+skip 7                             ;
+skip 2                             ; Reserved for OneMind
+OneMindId: skip 1                  ; Current OneMind player
+OneMindTimerRAM: skip 2            ; Frame counter for OneMind
+skip 9                             ; Unused
+ClockStatus: skip 2                ; 2 bytes second always zero padding
+                                   ; ---- --dn
+                                   ; d - DNF mode
+                                   ; n - Negative
+skip $10                           ; Unused
+RNGLockIn: skip 1                  ; Used for RNG item (currently unused by rando)
+BusyItem: skip 1                   ; Flags for indicating when these things are "busy"
+BusyHealth: skip 1                 ; e.g. doing some animation
+BusyMagic: skip 1                  ; 
+DialogOffsetPointer: skip 2        ; Offset and return pointer into new dialog buffer used
+DialogReturnPointer: skip 2        ; for e.g. free dungeon item text.
+skip 1                             ; Unused
+PreviousOverworldDoor: skip 1      ; Previous overworld door is cached or initialized here
+skip 1                             ; Reserved
+skip 1                             ; Unused
+DuckMapFlag: skip 1                ; Temporary flag used and reset by flute map drawing routine
+StalfosBombDamage: skip 1          ; Relocated from damage table
+ValidKeyLoaded: skip 1             ;
+TextBoxDefer: skip 1               ; Flag used to defer post-item text boxes
+skip $10                           ; Unused
+skip $10                           ; Reserved for enemizer
+                                   ; Most of these modifiers are intended to be written to by
+                                   ; a 3rd party (e.g. Crowd Control.) Writer is responsible
+                                   ; for zeroing.
+SwordModifier: skip 1              ; Adds level to current sword. Doesn't change graphics.
+ShieldModifier: skip 1             ; Not implemented
+ArmorModifier: skip 1              ; Adds level to current mail. Doesn't change graphics.
+MagicModifier: skip 1              ; Adds level to magic consumption (1/2, 1/4.)
+LightConeModifier: skip 1          ; Gives lamp cone when set to 1
+CuccoStormer: skip 1               ; Non-zero write causes storm.
+OldManDash: skip 1                 ; Unused
+IceModifier: skip 1                ; - - - g - - - i | Flipping either sets ice physics
+InfiniteArrows: skip 1             ; Setting these to $01 will give infinite ammo. Set by
+InfiniteBombs: skip 1              ; EscapeAssist.
+InfiniteMagic: skip 1              ;
+ControllerInverter: skip 1         ; $01 = D-pad | $02 = Buttons | $03 = Buttons and D-Pad
+                                   ; >=$04 = Swap buttons and D-pad
+OHKOFlag: skip 1                   ; Any non-zero write sets OHKO mode
+SpriteSwapper: skip 1              ; Loads new link sprite and glove/armor palette. No gfx or
+                                   ; code currently in base ROM for this.
+BootsModifier: skip 1              ; $01 = Give dash ability
+skip 1                             ; Unused
+                                   ; Crypto Block ($7F50D0 - $7F51FF)
+KeyBase: skip $10                  ;
+y: skip 4                          ;
+z: skip 4                          ;
+Sum: skip 4                        ;
+p: skip 4                          ;
+e: skip 2                          ;
+CryptoScratch: skip $0E            ;
+CryptoBuffer:                      ;
+v: skip $100                       ;
+RNGPointers: skip $100             ; Pointers for static RNG
+                                   ; Network I/O block. See servicerequest.asm. Rx and Tx channels
+                                   ; also allocated 8 persistent bytes each in sram.asm.
+RxBuffer: skip $7F                 ;
+RxStatus: skip 1                   ;
+TxBuffer: skip $7F                 ;
+TxStatus: skip 1                   ;
+skip $10                           ; Unused
+CompassTotalsWRAM: skip $10        ; skip $10
+skip $40                           ; Reserved for general dungeon tracking data. May have over
+                                   ; allocated here. Feel free to reassign.
+skip $40                           ; Unused
+skip $260                          ; Unused
+DialogBuffer: skip $100            ; Dialog Buffer
 
 ;================================================================================
 ; RAM Assertions
@@ -233,6 +253,7 @@ endmacro
 
 %assertRAM(LinkPosY, $7E0020)
 %assertRAM(LinkPosX, $7E0022)
+%assertRAM(RoomIndex, $7E00A0)
 %assertRAM(CurrentMSUTrack, $7E010B)
 %assertRAM(CurrentVolume, $7E0127)
 %assertRAM(TargetVolume, $7E0129)
@@ -240,6 +261,7 @@ endmacro
 %assertRAM(MusicControl, $7E012B)
 %assertRAM(MusicControlRequest, $7E012C)
 %assertRAM(ItemReceiptID, $7E02D8)
+%assertRAM(NMIAux, $7E0632)
 %assertRAM(SpritePosYLow, $7E0D00)
 %assertRAM(SpritePosXLow, $7E0D10)
 %assertRAM(SpritePosYHigh, $7E0D20)
@@ -249,12 +271,24 @@ endmacro
 %assertRAM(SpriteTypeTable, $7E0E20)
 %assertRAM(SpriteDirectionTable, $7E0EB0)
 %assertRAM(ToastBuffer, $7E1E0E)
-%assertRAM(ScratchBufferNV, $7E1E70)
-%assertRAM(ScratchBufferV, $7E1E80)
+
+%assertRAM(MSUResumeTime, $7E1E6B)
+%assertRAM(MSUResumeControl, $7E1E6F)
+%assertRAM(MSUFallbackTable, $7E1E70)
+%assertRAM(MSUDelayedCommand, $7E1E79)
+%assertRAM(MSUPackCount, $7E1E7A)
+%assertRAM(MSUPackCurrent, $7E1E7B)
+%assertRAM(MSUPackRequest, $7E1E7C)
+%assertRAM(MSULoadedTrack, $7E1E7D)
+%assertRAM(MSUResumeTrack, $7E1E7F)
+
+
 %assertRAM(ClockHours, $7E1E90)
 %assertRAM(ClockMinutes, $7E1E94)
 %assertRAM(ClockSeconds, $7E1E98)
 %assertRAM(ClockBuffer, $7E1E9C)
+%assertRAM(ScratchBufferNV, $7E1EA0)
+%assertRAM(ScratchBufferV, $7E1EB0)
 %assertRAM(TileUploadBuffer, $7EA180)
 %assertRAM(SpriteOAM, $7EC025)
 %assertRAM(HUDKeyIcon, $7EC726)
@@ -266,17 +300,21 @@ endmacro
 %assertRAM(HUDKeyDigits, $7EC764)
 %assertRAM(BigRAM, $7EC900)
 %assertRAM(RedrawFlag, $7F5000)
+%assertRAM(HexToDecDigit1, $7F5003)
+%assertRAM(HexToDecDigit2, $7F5004)
+%assertRAM(HexToDecDigit3, $7F5005)
+%assertRAM(HexToDecDigit4, $7F5006)
+%assertRAM(HexToDecDigit5, $7F5007)
 %assertRAM(SpriteSkipEOR, $7F5008)
-%assertRAM(MSReceived, $7F5031)
-%assertRAM(ForceHeartSpawn, $7F5033)
-%assertRAM(SkipHeartSave, $7F5034)
+
+
+
 %assertRAM(AltTextFlag, $7F5035)
 %assertRAM(BossKills, $7F5037)
 %assertRAM(LagTime, $7F5038)
 %assertRAM(RupeesCollected, $7F503C)
 %assertRAM(NonChestCounter, $7F503E)
 %assertRAM(TileUploadOffsetOverride, $7F5042)
-%assertRAM(NMIAux, $7F5044)
 %assertRAM(ShopId, $7F5050)
 %assertRAM(ShopType, $7F5051)
 %assertRAM(ShopInventory, $7F5052)
@@ -295,8 +333,11 @@ endmacro
 %assertRAM(BusyMagic, $7F5093)
 %assertRAM(DialogOffsetPointer, $7F5094)
 %assertRAM(DialogReturnPointer, $7F5096)
+%assertRAM(PreviousOverworldDoor, $7F5099)
+%assertRAM(DuckMapFlag, $7F509C)
 %assertRAM(StalfosBombDamage, $7F509D)
 %assertRAM(ValidKeyLoaded, $7F509E)
+%assertRAM(TextBoxDefer, $7F509F)
 %assertRAM(SwordModifier, $7F50C0)
 %assertRAM(ShieldModifier, $7F50C1)
 %assertRAM(ArmorModifier, $7F50C2)
@@ -308,7 +349,7 @@ endmacro
 %assertRAM(InfiniteArrows, $7F50C8)
 %assertRAM(InfiniteBombs, $7F50C9)
 %assertRAM(InfiniteMagic, $7F50CA)
-%assertRAM(DPadInverter, $7F50CB)
+%assertRAM(ControllerInverter, $7F50CB)
 %assertRAM(OHKOFlag, $7F50CC)
 %assertRAM(SpriteSwapper, $7F50CD)
 %assertRAM(BootsModifier, $7F50CE)
@@ -326,15 +367,6 @@ endmacro
 %assertRAM(RxStatus, $7F537F)
 %assertRAM(TxBuffer, $7F5380)
 %assertRAM(TxStatus, $7F53FF)
-%assertRAM(MSUFallbackTable, $7F5460)
-%assertRAM(MSUDelayedCommand, $7F5469)
-%assertRAM(MSUPackCount, $7F546A)
-%assertRAM(MSUPackCurrent, $7F546B)
-%assertRAM(MSUPackRequest, $7F546C)
-%assertRAM(MSULoadedTrack, $7F546D)
-%assertRAM(MSUResumeTrack, $7F546F)
-%assertRAM(MSUResumeTime, $7F5470)
-%assertRAM(MSUResumeControl, $7F5474)
 %assertRAM(CompassTotalsWRAM, $7F5410)
 %assertRAM(DialogBuffer, $7F5700)
 
@@ -344,36 +376,7 @@ pullpc
 ; Bank 7F
 ;--------------------------------------------------------------------------------
 
-; $7F5000 - Redraw Flag
-; $7F5001 - Flipper Softlock Possible
-; $7F5002 - L/R Rotate
-; $7F5003 - HexToDec 1st Digit
-; $7F5004 - HexToDec 2nd Digit
-; $7F5005 - HexToDec 3rd Digit
-; $7F5006 - HexToDec 4th Digit
-; $7F5007 - HexToDec 5th Digit
-; $7F5008 - Skip Sprite_DrawMultiple EOR
-; $7F5009 - Always Zero
-; $7F5010 - Unused
-; $7F5020 - Unused
-; $7F5030 - Unused
-; $7F5031 - HUD Master Sword Flag
-; $7F5032 - Unused
-; $7F5033 - Force Heart Spawn Counter
-; $7F5034 - Skip Heart Collection Save Counter
-; $7F5035 - Alternate Text Pointer Flag ; 0=Disable
-; $7F5036 - Padding Byte (Must be Zero)
-; $7F5037 - Stats Boss Kills
-; $7F5038 - Stats Lag Time
-; $7F5039 - Stats Lag Time
-; $7F503A - Stats Lag Time
-; $7F503B - Stats Lag Time
-; $7F503C - Stats Rupee Total
-; $7F503D - Stats Rupee Total
-; $7F503E - Stats Item Total
-; $7F503F - Unused
-; $7F5040 - Free Item Dialog Temporary
-; $7F5041 - Unused
+;OLDSTUFF
 ; $7F5042 - Tile Upload Offset Override (Low)
 ; $7F5043 - Tile Upload Offset Override (High)
 ; $7F5044 - $7F5046 - NMI Auxiliary Function
@@ -395,11 +398,11 @@ pullpc
 ; $7F5095 - Dialog Offset Pointer (High)
 ; $7F5096 - Dialog Offset Pointer Return (Low)
 ; $7F5097 - Dialog Offset Pointer Return (High)
-; $7F5098 - Water Entry Index
+; $7F5098 - Unused
 ; $7F5099 - Last Entered Overworld Door ID
 ; $7F509A - (Reserved)
 ; $7F509B - Unused
-; $7F509C - Unused
+; $7F509C - Duck Map Flag
 ; $7F509E - Valid Key Loaded
 ; $7F509F - Text Box Defer Flag
 ; $7F50A0 - $7F50AF - Unused
@@ -427,8 +430,7 @@ pullpc
 ; $7F5300 - $7F53FF - Multiworld Block
 ; $7F5400 - $7F540F - Unused
 ; $7F5410 - $7F545F - Dungeon Tracking Block
-; $7F5460 - $7F549F - MSU Block
-; $7F54A0 - $7F56FF - Unused
+; $7F5460 - $7F56FF - Unused
 
 ; $7F5700 - $7F57FF - Dialog Buffer
 
diff --git a/retro.asm b/retro.asm
index 062aafc..c68fab2 100644
--- a/retro.asm
+++ b/retro.asm
@@ -35,7 +35,7 @@ DecrementArrows:
 		BRA .done
 	.rupees
 		REP #$20
-		LDA.b $A0 : CMP.w #$0111 : SEP #$20 : BNE .not_archery_game
+		LDA.b RoomIndex : CMP.w #$0111 : SEP #$20 : BNE .not_archery_game
 			LDA.b $1B : BEQ .not_archery_game ; in overworld
 			LDA.w $0B9A : BEQ .shoot_arrow ; arrow game active
 			LDA.b #$00 : BRA .done
diff --git a/rngfixes.asm b/rngfixes.asm
index 335884e..6ad59f6 100644
--- a/rngfixes.asm
+++ b/rngfixes.asm
@@ -44,7 +44,7 @@ RNG_Lanmolas1:
 RNG_Moldorm1:
 	LDA.b #$01 : BRA _rng_done
 RNG_Agahnim1:
-	LDA.b $A0 : CMP.b #$20 : BNE RNG_Agahnim2 ; Agah 1 and 2 use the same code, check which agah we're fighting and branch
+	LDA.b RoomIndex : CMP.b #$20 : BNE RNG_Agahnim2 ; Agah 1 and 2 use the same code, check which agah we're fighting and branch
 	LDA.b #$02
 	JSL.l GetStaticRNG : PHA
 	LDA.l GanonAgahRNG : BEQ + ; check if blue balls are disabled
diff --git a/roomloading.asm b/roomloading.asm
index 90cf931..db4b709 100644
--- a/roomloading.asm
+++ b/roomloading.asm
@@ -4,7 +4,7 @@ LoadRoomHook:
     .noStats
     JSL Dungeon_LoadRoom
     REP #$10 ; 16 bit XY
-        LDX $A0 ; Room ID
+        LDX.b RoomIndex ; Room ID
         LDA.l RoomCallbackTable, X
     SEP #$10 ; 8 bit XY
     JSL UseImplicitRegIndexedLongJumpTable
@@ -68,20 +68,20 @@ macro DrawBombosPlatform(roomX, roomY, quadX, quadY)
 endMacro
 
 IcePalaceBombosSE:
-    LDA AllowSwordlessMedallionUse : CMP #$01 : BEQ + : RTL : +
+    LDA.l AllowSwordlessMedallionUse : CMP.b #$01 : BEQ + : RTL : +
     %DrawBombosPlatform(14, 18, 1, 1)
     RTL
 IcePalaceBombosSW:
-    LDA AllowSwordlessMedallionUse : CMP #$01 : BEQ + : RTL : +
+    LDA.l AllowSwordlessMedallionUse : CMP.b #$01 : BEQ + : RTL : +
     %DrawBombosPlatform(14, 18, 0, 1)
     RTL
 IcePalaceBombosNE:
-    LDA AllowSwordlessMedallionUse : CMP #$01 : BEQ + : RTL : +
+    LDA.l AllowSwordlessMedallionUse : CMP.b #$01 : BEQ + : RTL : +
     %DrawBombosPlatform(14, 18, 1, 0)
     RTL
 
 CastleEastEntrance:
-    LDA ProgressIndicator : CMP.b #$02 : !BLT + : RTL : + ; only apply in rain states (0 or 1) 
+    LDA.l ProgressIndicator : CMP.b #$02 : !BLT + : RTL : + ; only apply in rain states (0 or 1) 
     LDA.l BlockCastleDoorsInRain : BNE + : RTL : +
 
     REP #$20 ; 16 A
@@ -112,7 +112,7 @@ CastleEastEntrance:
     RTL
 
 CastleWestEntrance:
-    LDA ProgressIndicator : CMP.b #$02 : !BLT + : RTL : + ; only apply in rain states (0 or 1) 
+    LDA.l ProgressIndicator : CMP.b #$02 : !BLT + : RTL : + ; only apply in rain states (0 or 1) 
     LDA.l BlockCastleDoorsInRain : BNE + : RTL : +
 
     REP #$20 ; 16 A
diff --git a/rupeelimit.asm b/rupeelimit.asm
deleted file mode 100644
index aa31845..0000000
--- a/rupeelimit.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-;================================================================================
-; Four Digit Rupees
-;--------------------------------------------------------------------------------
-Draw4DigitRupees:
-	LDA $1B : AND.w #$00FF : BEQ .outdoors ; skip if outdoors
-	.indoors
-		LDA $A0 : BNE .normal ; skip except for ganon's room
-			LDA TotalItemCounter
-			BRA .print
-	.outdoors
-    .normal
-		LDA DisplayRupees
-	.print
-	    JSL.l HexToDec
-		LDA $7F5004 : AND.w #$00FF : ORA.w #$2400 : STA $7EC750
-	    LDA $7F5005 : AND.w #$00FF : ORA.w #$2400 : STA $7EC752
-	    LDA $7F5006 : AND.w #$00FF : ORA.w #$2400 : STA $7EC754
-	    LDA $7F5007 : AND.w #$00FF : ORA.w #$2400 : STA $7EC756
-RTL
-;================================================================================
diff --git a/sandbox.asm b/sandbox.asm
deleted file mode 100644
index 29b3c37..0000000
--- a/sandbox.asm
+++ /dev/null
@@ -1,363 +0,0 @@
-;Spawn location table cryptic documentation
-;$A0      |$15B6E - $15B7B (2) Starting room
-;$0601    |$15B7C - $15BB3 (8) scroll ranges
-;$E2      |$15BB4 - $15BC1 (2) Location X? Scroll Data
-;$E8      |$15BC2 - $15BCF (2) Location Y? Scroll Data
-;$20      |$15BD0 - $15BDD (2) link x?
-;$22      |$15BDE - $15BEB (2) link y?
-;$0618    |$15BEC - $15BF9 (2) camera y?
-;$061c    |$15BFA - $15C07 (2) camera x?
-;$0AA1    |$15C08 - $15C0E (1) Starting Location Blockset Type
-;$A4      |$15C0F - $15C15 (1) Starting Location Floor Type
-;$040C    |$15C16 - $15C1C (1) Dungeon Designation
-;$EE,$0476|$15C1D - $15C23 (1) ladder and background
-;$A6,$A7  |$15C24 - $15C2A (1) scroll properties
-;$A9,$AA  |$15C2B - $15C31 (1) Scroll Quandrant
-;$0696    |$15C32 - $15C3F (2) overworld exit location
-;$010E    |$15C40 - $15C4D (2) starting location entrance value
-;$0132    |$15C4E - $15C54 (1) music
-
-;-----------------------------------------------
-; Sanc Spawn point at dark sanc
-;-----------------------------------------------
-
-org $02D8D4 : dw $112
-org $02D8E8 : db $22, $22, $22, $23, $04, $04, $04, $05
-org $02D91A : dw $0400
-org $02D928 : dw $222e
-org $02D936 : dw $229a
-org $02D944 : dw $0480
-org $02D952 : dw $00a5
-org $02D960 : dw $007F
-org $02D96D : db $14
-org $02D974 : db $00
-org $02D97B : db $FF
-org $02D982 : db $00
-org $02D989 : db $02
-org $02D990 : db $00
-org $02D998 : dw $0000
-org $02D9A6 : dw $005A
-org $02D9B3 : db $12
-
-; Handle exit from this cave
-org $308250 ;StartingAreaExitTable
-dw $0112 : db $53 : dw $001e, $0400, $06e2, $0446, $0758, $046d, $075f : db $00, $00, $00
-org $308240 ;StartingAreaExitOffset
-db $00, $01, $00, $00, $00, $00, $00
-
-
-;-----------------------------------------------
-; Old man spawn point at End of Cave
-;-----------------------------------------------
-org $02D8DE : dw $00F1
-org $02D910 : db $1F, $1E, $1F, $1F, $03, $02, $03, $03
-org $02D924 : dw $0300
-org $02D932 : dw $1F10
-org $02D940 : dw $1FC0
-org $02D94E : dw $0378
-org $02D95C : dw $0187
-org $02D96A : dw $017F
-org $02D972 : db $06
-org $02D979 : db $00
-org $02D980 : db $FF
-org $02D987 : db $00
-org $02D98E : db $22
-org $02D995 : db $12
-org $02D9A2 : dw $0000
-org $02D9B0 : dw $0007
-org $02D9B8 : db $12
-
-
-;--------------------------------------------------------------
-; Make Houlihan exit at Pyramid
-;--------------------------------------------------------------
-org $02DB68 : dw $0003
-org $02DBC9 : db $5b
-org $02DC55 : dw $0b0e
-org $02DCF3 : dw $075a
-org $02DD91 : dw $0674
-org $02DE2F : dw $07a8
-org $02DECD : dw $06e8
-org $02DF6B : dw $07c7
-org $02E009 : dw $06f3
-org $02E06A : db $06
-org $02E0B9 : db $fa
-org $02E145 : dw $0000
-org $02E1E3 : dw $0000
-
-;--------------------------------------------------------------
-; Make Houlihan exit at C-Shaped House
-;--------------------------------------------------------------
-;org $02DB68 : dw $0003
-;org $02DBC9 : db $58
-;org $02DC55 : dw $09d8
-;org $02DCF3 : dw $0744
-;org $02DD91 : dw $02ce
-;org $02DE2F : dw $0797
-;org $02DECD : dw $0348
-;org $02DF6B : dw $07b3
-;org $02E009 : dw $0353
-;org $02E06A : db $0a
-;org $02E0B9 : db $f6
-;org $02E145 : dw $0DE8
-;org $02E1E3 : dw $0000
-
-;--------------------------------------------------------------
-; Inverted Exit Shuffles
-;--------------------------------------------------------------
-
-; swap bomb shop and links house
-org $02DB8C+$00 : db $6C
-org $1BBB73+$00 : db $53
-org $1BBB73+$52 : db $01
-
-; swap AT and GT
-org $1BBB73+$23 : db $37
-org $1BBB73+$36 : db $24
-org $02DAEE+$38+$38 : dw $00e0
-org $02DAEE+$25+$25 : dw $000c
-
-; Bumper Cave (Bottom) => Old Man Cave (West)
-org $1BBB73+$15 : db $06
-org $02DAEE+$17+$17 : dw $00f0
-
-; Old Man Cave (West) => Bumper Cave (Bottom)
-org $1BBB73+$05 : db $16
-org $02DAEE+$07+$07 : dw $00fb
-
-; Death Mountain Return Cave (West) => Bumper Cave (Top)
-org $1BBB73+$2d : db $17
-org $02DAEE+$2f+$2f : dw $00eb
-
-; Old Man Cave (East) => Death Mountain Return Cave (West)
-org $1BBB73+$06 : db $2e
-org $02DAEE+$08+$08 : dw $00e6
-
-; Bumper Cave (Top) => Dark Death Mountain Fairy
-org $1BBB73+$16 : db $5e
-
-; Dark Death Mountain Healer Fairy => Old Man Cave (East)
-org $1BBB73+$6F : db $07
-org $02DAEE+$18+$18 : dw $00f1
-org $02DB8C+$18 : db $43
-org $02DBDB+$18+$18 : dw $1400
-org $02DC79+$18+$18 : dw $0294
-org $02DD17+$18+$18 : dw $0600
-org $02DDB5+$18+$18 : dw $02e8
-org $02DE53+$18+$18 : dw $0678
-org $02DEF1+$18+$18 : dw $0303
-org $02DF8F+$18+$18 : dw $0685
-org $02E02D+$18 : db $0a
-org $02E07C+$18 : db $f6
-org $02E0CB+$18+$18 : dw $0000
-org $02E169+$18+$18 : dw $0000
-
-;--------------------------------------------------------------
-; Other inverted
-;--------------------------------------------------------------
-org $30804A : db $01 ; main toggle
-org $0283E0 : db $F0 ; residual portal
-org $02B34D : db $F0 ; residual portal
-org $06DB78 : db $8B ; residual portal
-
-org $05AF79 : db $F0 ; vortex
-org $0DB3C5 : db $C6 ; vortex
-org $07A3F4 : db $F0 ; duck
-org $07A3F4 : db $F0 ; duck
-org $02E849 : dw $0043, $0056, $0058, $006C, $006F, $0070, $007B, $007F, $001B ; Dark World Flute Spots
-org $02E8D5 : dw $07C8 ; nudge flute spot 3 out of gargoyle statue
-org $02E8F7 : dw $01F8 ; nudge flute spot 3 out of gargoyle statue
-org $07A943 : db $F0 ; Dark to light world mirror
-org $07A96D : db $D0 ; residual portal?
-
-org $08D40C : db $D0 ; morph poof
-org $308174 : db $01 ; ER's Fix fake worlds fix. Currently needed for inverted
-
-org $0280A6 : db $D0 ; Spawn logic
-
-org $1FED31 : db $0E ; pre-open open TR bomb door
-org $1FED41 : db $0E ; pre-open open TR bomb door
-
-org $0ABFBB : db $90 ; Show portal on dark world map
-
-org $308089 : db $01 ; Open TR Entrance if exiting from it
-
-org $06B2AA : JSL Sprite_ShowMessageFromPlayerContact
-; front end will actually do `org $06B2AB : dl $05E1F0`
-
-; Write to StartingAreaOverworldDoor table to indicate the overworld door being used for
-; the single entrance spawn point
-org $308247 ; PC 0x180247
-db $00, $5A, $00, $00, $00, $00, $00
-
-org $1AF696 : db #$F0 ;Bat X position (sprite_retreat_bat.asm:130)
-org $1AF6B2 : db #$33 ;Bat Delay (sprite_retreat_bat.asm:136)
-
-;New Hole Mask Position
-org $1AF730
-db $6A, $9E, $0C, $00
-db $7A, $9E, $0C, $00
-db $8A, $9E, $0C, $00
-db $6A, $AE, $0C, $00
-db $7A, $AE, $0C, $00
-db $8A, $AE, $0C, $00
-db $67, $97, $0C, $00
-db $8D, $97, $0C, $00
-
-;Cryptic documentation of flute/whirlpool table format (all value 16 bit)
-;eae5 - Overworld area that the exit leads to
-;eb07 $0084 - VRAM locations to place Link at.
-;eb29 $e6/0122/0124 - Y Scroll Data
-;eb4b $e0/011e/0120 - X Scroll Data
-;eb6d $20 - Link's Y Coordinate
-;eb8f $22 - Link's X Coordinate
-;ebb1 $0618 - Camera Y Coordinate
-;ebd3 $061c - Camera X Coordinate
-;ebf5 $0624- Ukn1 in HM
-;ec17 $0628- Ukn2 in HM
-
-;adjust flute spot 9 position
-org $02E87B : dw $00ae
-org $02E89D : dw $0610
-org $02E8BF : dw $077e
-org $02E8E1 : dw $0672
-org $02E903 : dw $07f8
-org $02E925 : dw $067d
-org $02E947 : dw $0803
-org $02E969 : dw $0000
-org $02E98B : dw $FFF2
-
-; aga tower exit/ pyramid spawn (now hyrule castle ledge spawn)
-org $02DAEE+$06+$06 : dw $0020
-org $02DB8C+$06 : db $1B
-org $02DBDB+$06+$06 : dw $00ae
-org $02DC79+$06+$06 : dw $0610
-org $02DD17+$06+$06 : dw $077e
-org $02DDB5+$06+$06 : dw $0672
-org $02DE53+$06+$06 : dw $07f8
-org $02DEF1+$06+$06 : dw $067d
-org $02DF8F+$06+$06 : dw $0803
-org $02E02D+$06 : db $00
-org $02E07C+$06 : db $f2
-org $02E0CB+$06+$06 : dw $0000
-org $02E169+$06+$06 : dw $0000
-
-
-org $308350 : db $00, $00, $01 ; Death mountain cave should start on overworld
-
-;(0x????,0x1B,0x0130,0x060a,0x0716,0x0672,0x07f8,0x0681,0x0803,0x0c,0x02,xx,xx)
-; Exit table cryptic documentation:
-;??|$15D8A-$15E27 - (0x4F entries, 2 bytes each) - Rooms that exit to overworld Areas ("Room" in HM)
-;??|$15E28-$15E76 - (0x4F entries, 1 byte each)  - Overworld area that the exit leads to. ("Map" in HM)
-;84|$15E77-$15F14 - (0x4F entries, 2 bytes each) - VRAM locations to place Link at. Gets fed to $7E0084 (???? in HM)
-;e6|$15F15-$15FB2 - (0x4F entries, 2 bytes each) - Y Scroll Data
-;e0|$15FB3-$16050 - (0x4F entries, 2 bytes each) - X Scroll Data
-;$20|$16051-$160EE - (0x4F entries, 2 bytes each) - Link's Y Coordinate
-;$22|$160EF-$1618C - (0x4F entries, 2 bytes each) - Link's X Coordinate
-;0618|$1618D-$1622A - (0x4F entries, 2 bytes each) - Camera Y Coordinate
-;061c|$1622B-$162C8 - (0x4F entries, 2 bytes each) - Camera X Coordinate
-;0624|$162C9-$16317 - (0x4F entries, 1 byte each)  - Ukn1 in HM
-;0628|$16318-$16366 - (0x4F entries, 1 byte each)  - Ukn2 in HM
-
-; redefine some map16 tiles
-org $0FF1C8
-dw #$190F, #$190F, #$190F, #$194C
-dw #$190F, #$194B, #$190F, #$195C
-dw #$594B, #$194C, #$19EE, #$19EE
-dw #$194B, #$19EE, #$19EE, #$19EE
-dw #$594B, #$190F, #$595C, #$190F
-dw #$190F, #$195B, #$190F, #$190F
-dw #$19EE, #$19EE, #$195C, #$19EE
-dw #$19EE, #$19EE, #$19EE, #$595C
-dw #$595B, #$190F, #$190F, #$190F
-
-; Redefine more map16 tiles
-org $0FA480
-dw #$190F, #$196B, #$9D04, #$9D04
-dw #$196B, #$190F, #$9D04, #$9D04
-
-; update pyramid hole entrances
-org $1bb810 : dw $00BE, $00C0, $013E
-org $1bb836 : dw $001B, $001B, $001B
-; add an extra pyramid hole entrance
-; ExtraHole_Map16:
-org $308300 : dw $0140
-; ExtraHole_Area:
-org $308320 : dw $001B
-; ExtraHole_Entrance:
-org $308340 : db $7B
-
-;prioritize retreat Bat and use 3rd sprite section
-org $1af504 : dw $148B
-org $1af50c : dw $149B
-org $1af514 : dw $14A4
-org $1af51c : dw $1489
-org $1af524 : dw $14AC
-org $1af52c : dw $54AC
-org $1af534 : dw $148C
-org $1af53c : dw $548C
-org $1af544 : dw $1484
-org $1af54c : dw $5484
-org $1af554 : dw $14A2
-org $1af55c : dw $54A2
-org $1af564 : dw $14A0
-org $1af56c : dw $54A0
-org $1af574 : dw $148E
-org $1af57c : dw $548E
-org $1af584 : dw $14AE
-org $1af58c : dw $54AE
-
-;Make retreat bat gfx available in Hyrule castle.
-org $00DB9D : db $1A ;sprite set 1, section 3
-org $00DC09 : db $1A ;sprite set 27, section 3
-
-;use new castle hole graphics (The values are the SNES address of the graphics: 31e000)
-org $00D009 : db $31
-org $00D0e8 : db $E0
-org $00D1c7 : db $00
-
-;add color for shading for castle hole
-org $1BE8DA : dw $39AD
-
-; TR tail jump
-org $00886e : db $5C, $00, $A0, $A1
-
-;Remove Hyrule Castle Gate warp
-org $09D436 : db $F3 ;replace whirlpool with (harmless) SpritePositionTarget Overlord
-
-;Add warps under rocks, etc.
-org $1BC67A : db #$2E, #$0B, #$82 ; Replace a rupee under bush to add a warp on map 80 (top of kak)
-org $1BC81E : db #$94, #$1D, #$82 ; Replace a heart under bush to add a warp on map 120 (mire)
-org $1BC655 : db #$4A, #$1D, #$82 ; Replace a bomb :( under bush to add a warp on map 78 (DM)
-org $1BC80D : db #$B2, #$0B, #$82 ; map 111
-org $1BC3DF : db #$D8, #$D1 ; new pointer for map 115 no items to replace
-org $1BD1D8 : db #$A8, #$02, #$82, #$FF, #$FF ;new data for map115
-org $1BC85A : db #$50, #$0F, #$82
-
-org $1BC387 : db #$DD, #$D1 ;New pointer for map 71 no items to replace
-org $1BD1DD : db #$A4, #$06, #$82, #$9E, #$06, #$82, #$FF, #$FF ;new data for map 71
-
-
-;;move pyramid exit overworld door
-org $1BB96F+$35+$35 : dw $001b
-org $1BBA71+$35+$35 : dw $06a4
-org $1BBB73+$35 : db $36
-
-org $02DAEE+$37+$37 : dw $0010
-org $02DB8C+$37 : db $1B
-org $02DBDB+$37+$37 : dw $0418
-org $02DC79+$37+$37 : dw $0679
-org $02DD17+$37+$37 : dw $06b4
-org $02DDB5+$37+$37 : dw $06c6
-org $02DE53+$37+$37 : dw $0728
-org $02DEF1+$37+$37 : dw $06e6
-org $02DF8F+$37+$37 : dw $0733
-org $02E02D+$37 : db $07
-org $02E07C+$37 : db $f9
-org $02E0CB+$37+$37 : dw $0000
-org $02E169+$37+$37 : dw $0000
-
-
-;org $02E849 ; Fly 1 to Sanctuary
-;db #$13, #$00, #$16, #$00, #$18, #$00, #$2C, #$00, #$2F, #$00, #$30, #$00, #$3B, #$00, #$3F, #$00, #$5B, #$00, #$35, #$00, #$0F, #$00, #$15, #$00, #$33, #$00, #$12, #$00, #$3F, #$00, #$55, #$00, #$7F, #$00, #$1A, #$00, #$88, #$08, #$30, #$0B, #$88, #$05, #$98, #$07, #$80, #$18, #$9E, #$06, #$10, #$08, #$2E, #$00, #$42, #$12, #$80, #$06, #$12, #$01, #$9E, #$05, #$8E, #$04, #$80, #$02, #$12, #$01, #$80, #$02, #$00, #$04, #$16, #$05, #$59, #$07, #$B9, #$0A, #$FA, #$0A, #$1E, #$0F, #$DF, #$0E, #$05, #$0F, #$00, #$06, #$46, #$0E, #$C6, #$02, #$2A, #$04, #$BA, #$0C, #$9A, #$04, #$56, #$0E, #$2A, #$04, #$56, #$0E, #$D6, #$06, #$4E, #$0C, #$7E, #$01, #$40, #$08, #$B2, #$0E, #$00, #$00, #$F2, #$06, #$75, #$0E, #$78, #$07, #$0A, #$0C, #$06, #$0E, #$8A, #$0A, #$EA, #$06, #$62, #$04, #$00, #$0E, #$8A, #$0A, #$00, #$0E, #$68, #$04, #$78, #$05, #$B7, #$07, #$17, #$0B, #$58, #$0B, #$A8, #$0F, #$3D, #$0F, #$67, #$0F, #$5C, #$06, #$A8, #$0E, #$28, #$03, #$88, #$04, #$18, #$0D, #$F8, #$04, #$B8, #$0E, #$88, #$04, #$B8, #$0E, #$56, #$07, #$C8, #$0C, #$00, #$02, #$B8, #$08, #$30, #$0F, #$78, #$00, #$78, #$07, #$F3, #$0E, #$F0, #$07, #$90, #$0C, #$80, #$0E, #$10, #$0B, #$70, #$07, #$E8, #$04, #$68, #$0E, #$10, #$0B, #$68, #$0E, #$70, #$04, #$83, #$05, #$C6, #$07, #$26, #$0B, #$67, #$0B, #$8D, #$0F, #$4C, #$0F, #$72, #$0F, #$6D, #$06, #$B3, #$0E, #$33, #$03, #$97, #$04, #$27, #$0D, #$07, #$05, #$C3, #$0E, #$97, #$04, #$C3, #$0E, #$56, #$07, #$D3, #$0C, #$0B, #$02, #$BF, #$08, #$37, #$0F, #$8D, #$00, #$7F, #$07, #$FA, #$0E, #$F7, #$07, #$97, #$0C, #$8B, #$0E, #$17, #$0B, #$77, #$07, #$EF, #$04, #$85, #$0E, #$17, #$0B, #$85, #$0E, #$F6, #$FF, #$FA, #$FF, #$07, #$00, #$F7, #$FF, #$F6, #$FF, #$00, #$00, #$F1, #$FF, #$FB, #$FF, #$00, #$00, #$FA, #$FF, #$0A, #$00, #$F6, #$FF, #$F6, #$FF, #$F6, #$FF, #$FA, #$FF, #$F6, #$FF, #$FA, #$FF, #$F2, #$FF, #$F2, #$FF, #$02, #$00, #$00, #$00, #$0E, #$00, #$00, #$00, #$FE, #$FF, #$0B, #$00, #$F8, #$FF, #$06, #$00, #$FA, #$FF, #$FA, #$FF, #$06, #$00, #$0E, #$00, #$00, #$00, #$FA, #$FF, #$00, #$00
-;
diff --git a/scratchpad.asm b/scratchpad.asm
deleted file mode 100644
index e69de29..0000000
diff --git a/servicerequest.asm b/servicerequest.asm
index b2e3380..991a5af 100644
--- a/servicerequest.asm
+++ b/servicerequest.asm
@@ -60,8 +60,8 @@ macro ServiceRequestChest(type)
 	LDA.l TxStatus : BEQ + : CLC : RTL : + ; return fail if we don't have the lock
 		LDA.b $1B : STA.l TxBuffer+8 ; indoor/outdoor
 		BEQ +
-			LDA.b $A0 : STA.l TxBuffer+9 ; roomid low
-			LDA.b $A1 : STA.l TxBuffer+10 ; roomid high
+			LDA.b RoomIndex : STA.l TxBuffer+9 ; roomid low
+			LDA.b RoomIndex+1 : STA.l TxBuffer+10 ; roomid high
 			BRA ++
 		+
 			LDA.w $040A : STA.l TxBuffer+9 ; area id
@@ -78,8 +78,8 @@ macro ServiceRequest(type,index)
 	LDA.l TxStatus : BEQ + : CLC : RTL : + ; return fail if we don't have the lock
 		LDA.b $1B : STA.l TxBuffer+8 ; indoor/outdoor
 		BEQ +
-			LDA.b $A0 : STA.l TxBuffer+9 ; roomid low
-			LDA.b $A1 : STA.l TxBuffer+10 ; roomid high
+			LDA.b RoomIndex : STA.l TxBuffer+9 ; roomid low
+			LDA.b RoomIndex+1 : STA.l TxBuffer+10 ; roomid high
 			BRA ++
 		+
 			LDA.w $040A : STA.l TxBuffer+9 ; area id
diff --git a/shopkeeper.asm b/shopkeeper.asm
index 2e9de97..bb365db 100644
--- a/shopkeeper.asm
+++ b/shopkeeper.asm
@@ -110,9 +110,9 @@ SpritePrep_ShopKeeper:
 	REP #$30 ; set 16-bit accumulator & index registers
 	LDX.w #$0000
 	-
-		LDA.l ShopTable+1, X : CMP.b $A0 : BNE +
+		LDA.l ShopTable+1, X : CMP.b RoomIndex : BNE +
 		LDA.l ShopTable+5, X : AND.w #$0040 : BNE ++
-			LDA.l $7F5099 : AND #$00FF : CMP.l ShopTable+3, X : BNE +
+			LDA.l PreviousOverworldDoor : AND #$00FF : CMP.l ShopTable+3, X : BNE +
 		++
 			SEP #$20 ; set 8-bit accumulator
 			LDA.l ShopTable, X : STA.l ShopId
@@ -174,9 +174,9 @@ SpritePrep_ShopKeeper:
 	JMP -
 	.stop
 	
-	LDA.b #Shopkeeper_UploadVRAMTilesLong>>16 : STA.l NMIAux+2
-	LDA.b #Shopkeeper_UploadVRAMTilesLong>>8 : STA.l NMIAux+1
-	LDA.b #Shopkeeper_UploadVRAMTilesLong>>0 : STA.l NMIAux
+	LDA.b #Shopkeeper_UploadVRAMTilesLong>>16 : STA.w NMIAux+2
+	LDA.b #Shopkeeper_UploadVRAMTilesLong>>8 : STA.w NMIAux+1
+	LDA.b #Shopkeeper_UploadVRAMTilesLong>>0 : STA.w NMIAux
 
 	.done
 	LDA.l ShopType : BIT.b #$20 : BEQ .notTakeAll ; Take-all
diff --git a/sram.asm b/sram.asm
index 7061005..74fed05 100644
--- a/sram.asm
+++ b/sram.asm
@@ -312,10 +312,9 @@ CrystalCounter: skip 1          ; Total Number of crystals collected (integer)
 DungeonsCompleted: skip 2       ; Bitfield indicating whether a dungeon's prize has been collected.
                                 ; This has the same shape as the dungeon item bitfields.
 skip 44                         ; Unused
-ServiceSequenceRx:              ; Service sequence receive
-ServiceSequenceTx:              ; Service sequence transmit
-ServiceSequence: skip 8         ; Service request block. See servicerequest.asm
-skip 8                          ; Unused
+ServiceSequence:                ; See servicerequest.asm
+ServiceSequenceRx: skip 8       ; Service sequence receive
+ServiceSequenceTx: skip 8       ; Service sequence transmit
 DungeonAbsorbedKeys:            ; \  Absorbed key counters (integers)
 SewerAbsorbedKeys: skip 1       ;  | Sewer Passage
 HCAbsorbedKeys: skip 1          ;  | Hyrule Castle
@@ -395,11 +394,11 @@ RoomDataSRAM:                   ;
 skip $280                       ;
 OverworldEventDataSRAM:         ;
 skip $C0                        ;
-EquipmentSRAM: skip 3           ; skip 76
-BombsEquipmentSRAM: skip 31     ; 343
-DisplayRupeesSRAM: skip 21      ; 362
-CurrentArrowsSRAM: skip 21      ; 377
-InventoryTrackingSRAM: skip 2   ; 38C
+EquipmentSRAM: skip 3           ;
+BombsEquipmentSRAM: skip 31     ;
+DisplayRupeesSRAM: skip 21      ;
+CurrentArrowsSRAM: skip 21      ;
+InventoryTrackingSRAM: skip 2   ;
 BowTrackingSRAM: skip 2         ;
 skip 53                         ;
 ProgressIndicatorSRAM: skip 1   ;
@@ -600,7 +599,7 @@ endmacro
 ;--------------------------------------------------------------------------------
 %assertSRAM(ServiceSequence, $7EF4A0)
 %assertSRAM(ServiceSequenceRx, $7EF4A0)
-%assertSRAM(ServiceSequenceTx, $7EF4A0)
+%assertSRAM(ServiceSequenceTx, $7EF4A8)
 ;--------------------------------------------------------------------------------
 %assertSRAM(DungeonAbsorbedKeys, $7EF4B0)
 %assertSRAM(SewerAbsorbedKeys, $7EF4B0)
diff --git a/stats.asm b/stats.asm
index 2697751..36b97dc 100644
--- a/stats.asm
+++ b/stats.asm
@@ -39,7 +39,7 @@ DungeonHoleEntranceTransition:
 	JSL EnableForceBlank
 	
 	LDA.l SilverArrowsAutoEquip : AND.b #$02 : BEQ +
-	LDA $010E : CMP.b #$7B : BNE + ; skip unless falling to ganon's room
+	LDA.w $010E : CMP.b #$7B : BNE + ; skip unless falling to ganon's room
 	LDA.l BowTracking : AND.b #$40 : BEQ + ; skip if we don't have silvers
 	LDA.l BowEquipment : BEQ + ; skip if we have no bow
 	CMP.b #$03 : !BGE + ; skip if the bow is already silver
@@ -133,7 +133,7 @@ CountChestKey: ; called by neighbor functions
 RTS
 ;--------------------------------------------------------------------------------
 CountBonkItem: ; called from GetBonkItem in bookofmudora.asm
-	LDA.b $A0 ; check room ID - only bonk keys in 2 rooms so we're just checking the lower byte
+	LDA.b RoomIndex ; check room ID - only bonk keys in 2 rooms so we're just checking the lower byte
 	CMP.b #115 : BNE + ; Desert Bonk Key
 		LDA.l BonkKey_Desert : BRA ++
 	+ : CMP.b #140 : BNE + ; GTower Bonk Key
@@ -289,7 +289,7 @@ IncrementUWMirror:
 	PHA
 		LDA.b #$00 : STA.l $7F5035 ; bandaid patch bug with mirroring away from text
 		LDA.l StatsLocked : BNE +
-		LDA $040C : CMP #$FF : BEQ + ; skip if we're in a cave or house
+		LDA.w $040C : CMP.b #$FF : BEQ + ; skip if we're in a cave or house
 			LDA.l UnderworldMirrors : INC : STA.l UnderworldMirrors
 			JSL.l StatTransitionCounter
 		+
diff --git a/stats/statConfig.asm b/stats/statConfig.asm
index 101e9aa..f100159 100755
--- a/stats/statConfig.asm
+++ b/stats/statConfig.asm
@@ -62,6 +62,6 @@ endmacro
 %AddStat(DeathCounter, 0, 0, 08, 2, !DEATHS_X, !DEATHS_Y)
 %AddStat(FaerieRevivalCounter, 0, 0, 08, 3, !FAERIE_REVIVALS_X, !FAERIE_REVIVALS_Y)
 %AddStat(MenuFrames, 1, 8, 32, 4, !TOTAL_MENU_TIME_X, !TOTAL_MENU_TIME_Y)
-%AddStat($7F5038, 1, 0, 32, 4, !TOTAL_LAG_TIME_X, !TOTAL_LAG_TIME_Y)
+%AddStat(LagTime, 1, 0, 32, 4, !TOTAL_LAG_TIME_X, !TOTAL_LAG_TIME_Y)
 %AddStat(TotalItemCounter, 0, 0, 16, 3, !COLLECTION_RATE_X, !COLLECTION_RATE_Y)
 %AddStat(NMIFrames, 1, 0, 32, 4, !TOTAL_TIME_X, !TOTAL_TIME_Y)
diff --git a/swordswap.asm b/swordswap.asm
index f773b55..1dfc790 100644
--- a/swordswap.asm
+++ b/swordswap.asm
@@ -65,7 +65,7 @@ RTL
 ;================================================================================
 ; $7E0348 - Ice Value
 LoadModifiedIceFloorValue_a11:
-	LDA.b $A0 : CMP.b #$91 : BEQ + : CMP.b #$92 : BEQ + : CMP.b #$93 : BEQ + ; mire basement currently broken - not sure why
+	LDA.b RoomIndex : CMP.b #$91 : BEQ + : CMP.b #$92 : BEQ + : CMP.b #$93 : BEQ + ; mire basement currently broken - not sure why
 	LDA.b $5D : CMP.b #$01 : BEQ + : CMP.b #$17 : BEQ + : CMP.b #$1C : BEQ +
 	LDA.b $5E : CMP.b #$02 : BEQ +  
 	LDA.b $5B : BNE +  
@@ -73,7 +73,7 @@ LoadModifiedIceFloorValue_a11:
 	+ : LDA.w $0348 : AND.b #$11  
 RTL  
 LoadModifiedIceFloorValue_a01:  
-	LDA.b $A0 : CMP.b #$91 : BEQ + : CMP.b #$92 : BEQ + : CMP.b #$93 : BEQ + ; mire basement currently broken - not sure why
+	LDA.b RoomIndex : CMP.b #$91 : BEQ + : CMP.b #$92 : BEQ + : CMP.b #$93 : BEQ + ; mire basement currently broken - not sure why
 	LDA.b $5D : CMP.b #$01 : BEQ + : CMP.b #$17 : BEQ + : CMP.b #$1C : BEQ +
 	LDA.b $5E : CMP.b #$02 : BEQ +
 	LDA.b $5B : BNE +
@@ -116,7 +116,7 @@ GetSmithSword:
 		LDA.b #$7A
 		LDY.b #$01
 		JSL.l Sprite_ShowMessageUnconditional
-		LDA.b #$3C : STA $012E ; error sound
+		LDA.b #$3C : STA.w $012E ; error sound
 		SEP #$10
 		BRA .done
 
@@ -144,7 +144,7 @@ CheckMedallionSword:
 		LDA.b $1B : BEQ .outdoors
 		.indoors
 			REP #$20 ; set 16-bit accumulator
-			LDA.b $A0 ; load room ID
+			LDA.b RoomIndex ; load room ID
 			CMP.w #$000E : BNE + ; freezor1
 				LDA.b $22 : AND.w #$01FF ; check x-coord
 					CMP.w #368-8 : !BLT .normal
diff --git a/tables.asm b/tables.asm
index eb75b77..aa2a38a 100644
--- a/tables.asm
+++ b/tables.asm
@@ -95,8 +95,6 @@ org $06B55C ; PC 0x3355C ; sprite_smithy_bros.asm : 634
 SmithSword:
 db #$02 ; #$02 = Tempered Sword (default)
 
-;org $05EBD4 ; PC 0x2EBD4 - sprite_zelda.asm:23 - (LDA $7EF359 : CMP.b #$02 : BCS .hasMasterSword) - Zelda Spawnpoint Sword Check
-;db #$05 ; #$02 = Tempered Sword (default) - #$05 = All Swords
 ;--------------------------------------------------------------------------------
 ; 0x18002B- 0x180030 (Unused)
 ;--------------------------------------------------------------------------------
@@ -1435,7 +1433,7 @@ db $04
 ;JSL Sprite_ShowMessageFromPlayerContact ; Inverted uses Sprite_ShowMessageFromPlayerContact
 ;;---------------------------------------------------------------------------------
 org $00886e ; <- Bank00.asm : 1050 (LDA Overworld_TileAttr, X)
-LDA Overworld_TileAttr, X ; use "JML InvertedTileAttributeLookup" for inverted
+LDA.l Overworld_TileAttr, X ; use "JML InvertedTileAttributeLookup" for inverted
 Overworld_GetTileAttrAtLocation_continue:
 ;================================================================================
 org $0DDBEC ; <- 6DBEC
diff --git a/tablets.asm b/tablets.asm
index 2107a0c..cd45bb0 100644
--- a/tablets.asm
+++ b/tablets.asm
@@ -30,13 +30,10 @@ SetTabletItem:
 RTL
 ;--------------------------------------------------------------------------------
 SpawnTabletItem:
-;	JSL.l HeartPieceGet
-;RTL
 	JSL.l LoadOutdoorValue
 	PHA
 	JSL.l PrepDynamicTile
 	
-	LDA.b #$01 : STA.l ForceHeartSpawn : STA.l SkipHeartSave
 	JSL.l SetTabletItem
 	
 	LDA.b #$EB
@@ -61,7 +58,7 @@ MaybeUnlockTabletAnimation:
 			STZ $0112 ; disable falling-medallion mode
 			STZ $03EF ; release link from item-up pose
 			LDA.b #$00 : STA.b $5D ; set link to ground state
-			
+
 			REP #$20 ; set 16-bit accumulator
 				LDA.b $8A : CMP.w #$0030 : BNE ++ ; Desert
 					SEP #$20 ; set 8-bit accumulator
diff --git a/textrenderer.asm b/textrenderer.asm
index 54de38d..3b8d07b 100644
--- a/textrenderer.asm
+++ b/textrenderer.asm
@@ -5,8 +5,8 @@ RenderCharSetColorExtended_init:
 
 RenderCharSetColorExtended_close:
     stz.b Scrap0C
-    lda $010c
-    sta $10
+    lda.w $010c
+    sta.b $10
     rtl
 
 RenderCharSetColorExtended:
@@ -33,7 +33,7 @@ RenderCharToMapExtended:
     plx
     lda.w #$0000
     sta.b Scrap00
-    lda #$007f
+    lda.w #$007f
     sta.b Scrap02
     lda.w #$0000
     clc : adc.w #$0020
diff --git a/treekid.asm b/treekid.asm
index 4b9f8bc..1197bfb 100644
--- a/treekid.asm
+++ b/treekid.asm
@@ -2,7 +2,7 @@
 ; Tree Kid Fix
 ;--------------------------------------------------------------------------------
 org $06B12B ; <- 3312B - tree status set - 418 - LDA NpcFlagsVanilla : ORA.b #$08 : STA NpcFlagsVanilla
-LDA NpcFlagsVanilla : AND.b #$F7 : STA NpcFlagsVanilla ; unset arboration instead of setting it
+LDA.l NpcFlagsVanilla : AND.b #$F7 : STA.l NpcFlagsVanilla ; unset arboration instead of setting it
 ;--------------------------------------------------------------------------------
 org $06B072 ; <- 33072 - FluteAardvark_InitialStateFromFluteState - 418 : dw FluteAardvark_AlreadyArborated
 db #$8B
diff --git a/utilities.asm b/utilities.asm
index 775cb3e..36f2201 100644
--- a/utilities.asm
+++ b/utilities.asm
@@ -567,7 +567,7 @@ RTL
 ;--------------------------------------------------------------------------------
 ; HexToDec
 ; in:	A(w) - Word to Convert
-; out:	$7F5004 - $7F5007 (high - low)
+; out:	HexToDecDigit1 - HexToDecDigit5 (high - low)
 ;--------------------------------------------------------------------------------
 HexToDec:
 	PHA
@@ -592,8 +592,8 @@ HexToDec:
 		INC.b Scrap07
 		!SUB.w #1 : BRA -
 	+
-	LDA.b Scrap04 : STA.l $7F5004 ; move to digit storage
-	LDA.b Scrap06 : STA.l $7F5006
+	LDA.b Scrap04 : STA.l HexToDecDigit2 ; move to digit storage
+	LDA.b Scrap06 : STA.l HexToDecDigit4
 	PLA
 RTL
 
@@ -626,33 +626,33 @@ db #00, #01, #01, #02, #01, #02, #02, #03, #01, #02, #02, #03, #02, #03, #03, #0
 ;--------------------------------------------------------------------------------
 ; HexToDec
 ; in:	A(w) - Word to Convert
-; out:	$7F5003 - $7F5007 (high - low)
+; out:	HexToDecDigit1 - HexToDecDigit5 (high - low)
 ;--------------------------------------------------------------------------------
 ;HexToDec:
 ;	PHA
 ;	PHA
 ;		LDA.w #$9090
-;		STA.l $7F5003 : STA.l $7F5005 : STA.l $7F5006 ; clear digit storage
+;		STA.l HexToDecDigit1 : STA.l HexToDecDigit3 : STA.l HexToDecDigit4 ; clear digit storage
 ;	PLA
 ;	-
 ;		CMP.w #10000 : !BLT +
-;		PHA : SEP #$20 : LDA.l $7F5003 : INC : STA.l $7F5003 : REP #$20 : PLA
+;		PHA : SEP #$20 : LDA.l HexToDecDigit1 : INC : STA.l HexToDecDigit1 : REP #$20 : PLA
 ;		!SUB.w #10000 : BRA -
 ;	+ -
 ;		CMP.w #1000 : !BLT +
-;		PHA : SEP #$20 : LDA.l $7F5004 : INC : STA.l $7F5004 : REP #$20 : PLA
+;		PHA : SEP #$20 : LDA.l HexToDecDigit2 : INC : STA.l HexToDecDigit2 : REP #$20 : PLA
 ;		!SUB.w #1000 : BRA -
 ;	+ -
 ;		CMP.w #100 : !BLT +
-;		PHA : SEP #$20 : LDA.l $7F5005 : INC : STA.l $7F5005 : REP #$20 : PLA
+;		PHA : SEP #$20 : LDA.l HexToDecDigit3 : INC : STA.l HexToDecDigit3 : REP #$20 : PLA
 ;		!SUB.w #100 : BRA -
 ;	+ -
 ;		CMP.w #10 : !BLT +
-;		PHA : SEP #$20 : LDA.l $7F5006 : INC : STA.l $7F5006 : REP #$20 : PLA
+;		PHA : SEP #$20 : LDA.l HexToDecDigit4 : INC : STA.l HexToDecDigit4 : REP #$20 : PLA
 ;		!SUB.w #10 : BRA -
 ;	+ -
 ;		CMP.w #1 : !BLT +
-;		PHA : SEP #$20 : LDA.l $7F5007 : INC : STA.l $7F5007 : REP #$20 : PLA
+;		PHA : SEP #$20 : LDA.l HexToDecDigit5 : INC : STA.l HexToDecDigit5 : REP #$20 : PLA
 ;		!SUB.w #1 : BRA -
 ;	+
 ;	PLA
diff --git a/vanillalabels.asm b/vanillalabels.asm
index 8d0129e..ff03684 100644
--- a/vanillalabels.asm
+++ b/vanillalabels.asm
@@ -94,6 +94,9 @@ Sprite_ShowMessageUnconditional:
 org $05EC96
 Sprite_ZeldaLong:
 
+org $05F0C0
+Sprite_EB_HeartPiece_handle_flags:
+
 org $0680FA
 Player_ApplyRumbleToSprites:
 
diff --git a/zoraking.asm b/zoraking.asm
index 9ac1a1c..a2b309b 100644
--- a/zoraking.asm
+++ b/zoraking.asm
@@ -6,7 +6,7 @@ LoadZoraKingItemGFX:
 	JML.l PrepDynamicTile
 ;--------------------------------------------------------------------------------
 JumpToSplashItemTarget:
-	LDA $0D90, X
+	LDA.w $0D90, X
 	CMP.b #$FF : BNE + : JML.l SplashItem_SpawnSplash : +
 	CMP.b #$00 : JML.l SplashItem_SpawnOther
-;--------------------------------------------------------------------------------
\ No newline at end of file
+;--------------------------------------------------------------------------------
diff --git a/zsnes.asm b/zsnes.asm
index 734defb..a6441bb 100644
--- a/zsnes.asm
+++ b/zsnes.asm
@@ -1,14 +1,14 @@
 ;--------------------------------------------------------------------------------
 CheckZSNES:
     SEP #$28
-    LDA #$FF
+    LDA.b #$FF
     CLC
-    ADC #$FF
-    CMP #$64
+    ADC.b #$FF
+    CMP.b #$64
     CLD
     BEQ .zsnes
     REP #$20
-    LDA #$01FF : TCS ; thing we wrote over - initialize stack
+    LDA.w #$01FF : TCS ; thing we wrote over - initialize stack
 JML.l ReturnCheckZSNES
 .zsnes
 	JML DontUseZSNES

From 09d15f3294a78fff916538a06f54f8b52d98e475 Mon Sep 17 00:00:00 2001
From: cassidoxa <cassidymoen@gmx.com>
Date: Tue, 22 Nov 2022 00:36:39 -0500
Subject: [PATCH 04/11] Another WRAM label pass Deleted compression.asm

---
 LTTP_RND_GeneralBugfixes.asm |    1 -
 accessibility.asm            |    4 +-
 bookofmudora.asm             |    6 +-
 boots.asm                    |   14 +-
 bugfixes.asm                 |   61 +-
 catfish.asm                  |    4 +-
 compasses.asm                |    4 +-
 compression.asm              |   29 -
 cuccostorm.asm               |    2 +-
 darkworldspawn.asm           |   10 +-
 dialog.asm                   |   65 +-
 dungeondrops.asm             |    2 +-
 dungeonmap.asm               |    2 +-
 elder.asm                    |   10 +-
 entrances.asm                |   26 +-
 events.asm                   |   44 +-
 failure.asm                  |    4 +-
 fairyfixes.asm               |   30 +-
 fastcredits.asm              |   22 +-
 fileselect.asm               |   44 +-
 flipperkill.asm              |   12 +-
 flute.asm                    |   18 +-
 framehook.asm                |    2 +-
 glitched.asm                 |    6 +-
 goalitem.asm                 |   10 +-
 halfmagicbat.asm             |    2 +-
 hardmode.asm                 |    6 +-
 heartbeep.asm                |    6 +-
 heartpieces.asm              |   24 +-
 hooks.asm                    |    4 +-
 icepalacegraphics.asm        |    2 +-
 init.asm                     |    2 +-
 inventory.asm                |  138 ++--
 inverted.asm                 |   53 +-
 invertedmaps.asm             |    8 +-
 invertedstatic.asm           |    2 +-
 lampmantlecone.asm           |    2 +-
 maidencrystals.asm           |    2 +-
 medallions.asm               |   18 +-
 msu.asm                      |   24 +-
 music.asm                    |   50 +-
 musicvolumes.asm             | 1148 +++++++++++++++++-----------------
 newhud.asm                   |    8 +-
 newitems.asm                 |   16 +-
 npcitems.asm                 |    8 +-
 password.asm                 |   93 ++-
 pendantcrystalhud.asm        |   20 +-
 quickswap.asm                |   26 +-
 ram.asm                      |  453 +++++++++-----
 registers.asm                |    2 +-
 retro.asm                    |    2 +-
 rngfixes.asm                 |    8 +-
 save.asm                     |   16 +-
 servicerequest.asm           |   10 +-
 shopkeeper.asm               |   20 +-
 spriteswap.asm               |   12 +-
 sram.asm                     |    4 +-
 stats.asm                    |   22 +-
 swordswap.asm                |   42 +-
 tablets.asm                  |   36 +-
 textrenderer.asm             |    4 +-
 timer.asm                    |    2 +-
 utilities.asm                |   28 +-
 63 files changed, 1438 insertions(+), 1317 deletions(-)
 delete mode 100644 compression.asm

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 32cb0b9..00d628e 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -137,7 +137,6 @@ incsrc goalitem.asm
 incsrc quickswap.asm
 incsrc endingsequence.asm
 incsrc cuccostorm.asm
-incsrc compression.asm
 incsrc retro.asm
 incsrc controllerjank.asm
 incsrc boots.asm
diff --git a/accessibility.asm b/accessibility.asm
index 7f1484f..85df32e 100644
--- a/accessibility.asm
+++ b/accessibility.asm
@@ -43,7 +43,7 @@ WhitenLoopReal:
             LDA.l $7EC3F0 : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5F0
             LDA.l $7EC3F2 : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5F2
             LDA.l $7EC3F4 : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5F4
-            LDA.b $10 : CMP.w #$0007 : BNE +
+            LDA.b GameMode : CMP.w #$0007 : BNE +
             LDA.w $048E
             CMP.w #$003C : BEQ ++
             CMP.w #$009D : BEQ ++
@@ -89,7 +89,7 @@ WhitenLoopDummy:
             LDA.l $7EC3F0 : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5F0
             LDA.l $7EC3F2 : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5F2
             LDA.l $7EC3F4 : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5F4
-            LDA.b $10 : CMP.w #$0007 : BNE + ; only light invisifloor if we're in dungeon submodule
+            LDA.b GameMode : CMP.w #$0007 : BNE + ; only light invisifloor if we're in dungeon submodule
             LDA.w $048E
             CMP.w #$003C : BEQ ++ ; hookshot cave
             CMP.w #$009D : BEQ ++ ; gt right
diff --git a/bookofmudora.asm b/bookofmudora.asm
index 0c5954c..7cd0796 100644
--- a/bookofmudora.asm
+++ b/bookofmudora.asm
@@ -3,19 +3,19 @@
 ;--------------------------------------------------------------------------------
 LoadLibraryItemGFX:
         %GetPossiblyEncryptedItem(LibraryItem, SpriteItemValues)
-        STA.w $0E80, X ; Store item type
+        STA.w SpriteItemType, X ; Store item type
         JSL.l PrepDynamicTile
 RTL
 ;--------------------------------------------------------------------------------
 DrawLibraryItemGFX:
         PHA
-        LDA.w $0E80, X ; Retrieve stored item type
+        LDA.w SpriteItemType, X ; Retrieve stored item type
         JSL.l DrawDynamicTile
         PLA
 RTL
 ;--------------------------------------------------------------------------------
 SetLibraryItem:
-        LDY.w $0E80, X ; Retrieve stored item type
+        LDY.w SpriteItemType, X ; Retrieve stored item type
         JSL.l ItemSet_Library ; contains thing we wrote over
 RTL
 ;--------------------------------------------------------------------------------
diff --git a/boots.asm b/boots.asm
index 6171334..3943a43 100644
--- a/boots.asm
+++ b/boots.asm
@@ -8,7 +8,7 @@ ModifyBoots:
         + : CMP.b #$02 : BNE +
             PLA : AND.l AbilityFlags : AND.b #$FB : RTL ; no boots
         + : LDA.l FakeBoots : CMP.b #$01 : BNE +
-            LDA.b $5B : BEQ ++ : LDA.b $59 : BNE + ; hover check
+            LDA.b LinkSlipping : BEQ ++ : LDA.b $59 : BNE + ; hover check
                 ++ : PLA : AND.l AbilityFlags : ORA.b #$04 : RTL ; yes boots, not hovering
         +
     PLA
@@ -44,7 +44,7 @@ BonkRockPile:
     LDA.l BootsEquipment : BNE + ; Check for Boots
         LDA.b #$00 : RTL
     +
-    LDA.w $02EF : AND.b #$70 ; things we wrote over
+    LDA.w TileActBE : AND.b #$70 ; things we wrote over
 RTL
 ;--------------------------------------------------------------------------------
 GravestoneHook:
@@ -60,17 +60,17 @@ JumpDownLedge:
     LDA.l BootsModifier : CMP.b #$01 : BEQ +
     LDA.l BootsEquipment : BNE + ; Check for Boots
         ; Disarm Waterwalk
-        LDA.b $5B : CMP.b #$01 : BNE +
-            STZ.b $5B
+        LDA.b LinkSlipping : CMP.b #$01 : BNE +
+            STZ.b LinkSlipping
     +
-    LDA.b $1B : BNE .done : LDA.b #$02 : STA.b $EE ; things we wrote over
+    LDA.b IndoorsFlag : BNE .done : LDA.b #$02 : STA.b LinkLayer ; things we wrote over
     .done
 RTL
 ;--------------------------------------------------------------------------------
 BonkRecoil:
     LDA.l BootsModifier : CMP.b #$01 : BEQ +
     LDA.l BootsEquipment : BNE + ; Check for Boots
-        LDA.b #$16 : STA.b $29 : RTL
+        LDA.b #$16 : STA.b LinkRecoilZ : RTL
     +
-    LDA.b #$24 : STA.b $29 ; things we wrote over
+    LDA.b #$24 : STA.b LinkRecoilZ ; things we wrote over
 RTL
diff --git a/bugfixes.asm b/bugfixes.asm
index 7a6e912..26f18cc 100644
--- a/bugfixes.asm
+++ b/bugfixes.asm
@@ -22,7 +22,7 @@ RTL
 ;0 = Reset Music
 ;1 = Don't Reset Music
 MSMusicReset:
-	LDA.b $8A : CMP.b #$80 : BNE +
+	LDA.b OverworldIndex : CMP.b #$80 : BNE +
 		LDA.b $23
 	+
 RTL
@@ -46,9 +46,9 @@ RTL
 DecideIfBunnyByScreenIndex:
 	; If indoors we don't have a screen index. Return non-bunny to make mirror-based
 	; superbunny work
-	LDA.b $1B : BNE .done
+	LDA.b IndoorsFlag : BNE .done
 	LDA.l MoonPearlEquipment : BNE .done
-	LDA.b $8A : AND.b #$40 : PHA
+	LDA.b OverworldIndex : AND.b #$40 : PHA
 	LDA.l InvertedMode : BNE .inverted
 	.normal
 		PLA : EOR #$40
@@ -59,10 +59,10 @@ DecideIfBunnyByScreenIndex:
 RTL
 ;--------------------------------------------------------------------------------
 FixBunnyOnExitToLightWorld:
-    LDA.w $02E0 : BEQ +
+    LDA.w BunnyFlag : BEQ +
         JSL.l DecideIfBunny : BEQ +
-        STZ.b $5D ; set player mode to Normal
-        STZ.w $02E0 : STZ.b $56 ; return player graphics to normal
+        STZ.b LinkState ; set player mode to Normal
+        STZ.w BunnyFlag : STZ.b BunnyFlagDP ; return player graphics to normal
     +
 RTS
 ;--------------------------------------------------------------------------------
@@ -80,10 +80,10 @@ FixAga2Bunny:
     ++
 	JSL DecideIfBunny : BNE +
 		JSR MakeBunny
-		LDA.b #$04 : STA.w $012C ; play bunny music
+		LDA.b #$04 : STA.w MusicControlRequest ; play bunny music
 		BRA .done
 	+
-	LDA.b #$09 : STA.w $012C ; what we wrote over
+	LDA.b #$09 : STA.w MusicControlRequest ; what we wrote over
 	.done
 RTL
 ;--------------------------------------------------------------------------------
@@ -91,8 +91,8 @@ RTL
 ;--------------------------------------------------------------------------------
 MakeBunny:
     PHX : PHY
-	LDA.b #$17 : STA.b $5D ; set player mode to permabunny
-	LDA.b #$01 : STA.w $02E0 : STA.b $56 ; make player look like bunny
+	LDA.b #$17 : STA.b LinkState ; set player mode to permabunny
+	LDA.b #$01 : STA.w BunnyFlag : STA.b BunnyFlagDP ; make player look like bunny
 	JSL LoadGearPalettes_bunny
     PLY : PLX
 RTS
@@ -157,7 +157,7 @@ RTL
 ;--------------------------------------------------------------------------------
 ; Fix Bunny Palette Map Bug
 LoadGearPalette_safe_for_bunny:
-LDA.b $10 
+LDA.b GameMode 
 CMP.w #$030E : BEQ .new ; opening dungeon map
 CMP.w #$070E : BEQ .new ; opening overworld map
 .original
@@ -184,15 +184,15 @@ RTL
 ; Fix pedestal pull overlay
 PedestalPullOverlayFix:
 LDA.b #$09 : STA.w $039F, X	; the thing we wrote over
-LDA.b $1B : BNE +
-	LDA.b $8A : CMP.b #$80 : BNE +
-		LDA.b $8C : CMP.b #$97
+LDA.b IndoorsFlag : BNE +
+	LDA.b OverworldIndex : CMP.b #$80 : BNE +
+		LDA.b OverlayID : CMP.b #$97
 +
 RTL
 
 ;--------------------------------------------------------------------------------
 FixJingleGlitch:
-	LDA.b $11
+	LDA.b GameSubMode
 	BEQ .set_doors
 
 	LDA.l AllowAccidentalMajorGlitch
@@ -200,7 +200,7 @@ FixJingleGlitch:
 
 .set_doors
 	LDA.b #$05
-	STA.b $11
+	STA.b GameSubMode
 
 .exit
 	RTL
@@ -216,3 +216,32 @@ SetOverworldTransitionFlags:
 	STA.w $0ABF ; used by witch
 	STA.w $021B ; used by race game
 	RTL
+;--------------------------------------------------------------------------------
+ParadoxCaveGfxFix:
+    ; Always upload line unless you're moving into paradox cave (0x0FF) from above (0x0EF)
+    LDA.b IndoorsFlag  : BEQ .uploadLine
+    LDX.b RoomIndex    : CPX.w #$00FF : BNE .uploadLine
+    LDX.b PreviousRoom : CPX.w #$00EF : BNE .uploadLine
+
+    ;Ignore uploading four specific lines of tiles to VRAM
+    LDX.w $0118
+    ; Line 1
+    CPX.w #$1800 : BEQ .skipMostOfLine
+    ; Line 2
+    CPX.w #$1A00 : BEQ .skipMostOfLine
+    ; Line 3
+    CPX.w #$1C00 : BEQ .uploadLine
+    ; Line 4
+    CPX.w #$1E00 : BEQ .uploadLine
+
+.uploadLine
+    LDA.b #$01 : STA.w MDMAEN
+
+.skipLine
+    RTL
+
+.skipMostOfLine
+    ; Set line length to 192 bytes (the first 6 8x8 tiles in the line)
+    LDX.w #$00C0 : STX.w DAS0L
+    BRA .uploadLine
+;--------------------------------------------------------------------------------
diff --git a/catfish.asm b/catfish.asm
index 9cb8a72..bedaded 100644
--- a/catfish.asm
+++ b/catfish.asm
@@ -6,7 +6,7 @@ LoadCatfishItemGFX:
         JML PrepDynamicTile
 ;--------------------------------------------------------------------------------
 DrawThrownItem:
-        LDA.b $8A : CMP.b #$81 : BNE .catfish
+        LDA.b OverworldIndex : CMP.b #$81 : BNE .catfish
                 .zora
                 LDA.b #$01 : STA.l RedrawFlag
                 LDA.l $1DE1C3 ; location randomizer writes zora item to
@@ -18,7 +18,7 @@ DrawThrownItem:
 ;--------------------------------------------------------------------------------
 MarkThrownItem:
 	JSL Link_ReceiveItem ; thing we wrote over
-	LDA.b $8A : CMP.b #$81 : BNE .catfish
+	LDA.b OverworldIndex : CMP.b #$81 : BNE .catfish
 	        .zora
                 JML ItemSet_ZoraKing
 	        .catfish
diff --git a/compasses.asm b/compasses.asm
index 7e5f1b7..56502b0 100644
--- a/compasses.asm
+++ b/compasses.asm
@@ -1,9 +1,9 @@
 DrawDungeonCompassCounts:
-	LDX.b $1B : BNE + : RTL : + ; Skip if outdoors
+	LDX.b IndoorsFlag : BNE + : RTL : + ; Skip if outdoors
 
 	; extra hard safeties for getting dungeon ID to prevent crashes
 	PHA
-	LDA.w $040C : AND.w #$00FE : TAX ; force dungeon ID to be multiple of 2
+	LDA.w DungeonID : AND.w #$00FE : TAX ; force dungeon ID to be multiple of 2
 	PLA
 
 	CPX.b #$1B : BCS .done ; Skip if not in a valid dungeon ID
diff --git a/compression.asm b/compression.asm
deleted file mode 100644
index 32831d4..0000000
--- a/compression.asm
+++ /dev/null
@@ -1,29 +0,0 @@
-;--------------------------------------------------------------------------------
-ParadoxCaveGfxFix:
-    ; Always upload line unless you're moving into paradox cave (0x0FF) from above (0x0EF)
-    LDA.b $1B : BEQ .uploadLine
-    LDX.b RoomIndex : CPX.w #$00FF : BNE .uploadLine
-    LDX.b $A2 : CPX.w #$00EF : BNE .uploadLine
-
-    ;Ignore uploading four specific lines of tiles to VRAM
-    LDX.w $0118
-    ; Line 1
-    CPX.w #$1800 : BEQ .skipMostOfLine
-    ; Line 2
-    CPX.w #$1A00 : BEQ .skipMostOfLine
-    ; Line 3
-    CPX.w #$1C00 : BEQ .uploadLine
-    ; Line 4
-    CPX.w #$1E00 : BEQ .uploadLine
-
-.uploadLine
-    LDA.b #$01 : STA.w MDMAEN
-
-.skipLine
-    RTL
-
-.skipMostOfLine
-    ; Set line length to 192 bytes (the first 6 8x8 tiles in the line)
-    LDX.w #$00C0 : STX.w DAS0L
-    BRA .uploadLine
-;--------------------------------------------------------------------------------
diff --git a/cuccostorm.asm b/cuccostorm.asm
index 8b89eac..d01f282 100644
--- a/cuccostorm.asm
+++ b/cuccostorm.asm
@@ -9,7 +9,7 @@ CuccoStorm:
 
 	SEP #$30 ; set 8-bit accumulator index registers
 	LDA.l CuccoStormer : BEQ + ; only if storm is on
-	LDA.b $10 : CMP.b #$09 : BNE + ; only if outdoors
+	LDA.b GameMode : CMP.b #$09 : BNE + ; only if outdoors
 	LDA.l LoopFrames : AND.b #$7F : BNE + ; check every 128 frames
 
 	-
diff --git a/darkworldspawn.asm b/darkworldspawn.asm
index be2bfc1..98339a8 100644
--- a/darkworldspawn.asm
+++ b/darkworldspawn.asm
@@ -27,8 +27,8 @@ SetDeathWorldChecked:
 	LDA.l InvertedMode : BEQ +
 		JMP SetDeathWorldChecked_Inverted
 	+
-	LDA.b $1B : BEQ .outdoors
-		LDA.w $040C : CMP.b #$FF : BNE .dungeon
+	LDA.b IndoorsFlag : BEQ .outdoors
+		LDA.w DungeonID : CMP.b #$FF : BNE .dungeon
 		LDA.b RoomIndex : ORA.b RoomIndex+1 : BNE ++
 			LDA.l GanonPyramidRespawn : BNE .pyramid ; if flag is set, force respawn at pyramid on death to ganon
 	    ++
@@ -63,8 +63,8 @@ DoWorldFix_Inverted:
 RTL
 ;--------------------------------------------------------------------------------
 SetDeathWorldChecked_Inverted:
-	LDA.b $1B : BEQ .outdoors
-		LDA.w $040C : CMP.b #$FF : BNE .dungeon
+	LDA.b IndoorsFlag : BEQ .outdoors
+		LDA.w DungeonID : CMP.b #$FF : BNE .dungeon
 		LDA.b RoomIndex : ORA.b RoomIndex+1 : BNE ++
 			LDA.l GanonPyramidRespawn : BNE .castle ; if flag is set, force respawn at pyramid on death to ganon
 		++
@@ -86,7 +86,7 @@ RTL
 ;--------------------------------------------------------------------------------
 FakeWorldFix:
 	LDA.l FixFakeWorld : BEQ +
-		LDA.b $8A : AND.b #$40 : STA.l CurrentWorld
+		LDA.b OverworldIndex : AND.b #$40 : STA.l CurrentWorld
 	+
 RTL
 ;--------------------------------------------------------------------------------
diff --git a/dialog.asm b/dialog.asm
index 3b910c8..f07f9f1 100644
--- a/dialog.asm
+++ b/dialog.asm
@@ -6,11 +6,11 @@ DialogOverride:
 	LDA.l DialogBuffer, X ; use alternate buffer
 RTL
 	.skip
-    LDA.l $7F1200, X
+    LDA.l DecompressionBuffer+$1200, X
 RTL
 
 ResetDialogPointer:
-	STZ.w $1CF0 : STZ.w $1CF1 ; reset decompression buffer
+	STZ.w TextID : STZ.w TextID+1 ; reset decompression buffer
 	LDA.b #$00 : STA.l AltTextFlag ; zero out the alternate flag
 	LDA.b #$1C : STA.w $1CE9 ; thing we wrote over
 RTL
@@ -23,7 +23,7 @@ macro LoadDialogAddress(address)
 		REP #$10 ; set 16-bit index registers
 		PEI.b ($00)
 		LDA.b Scrap02 : PHA
-			STZ.w $1CF0 : STZ.w $1CF1 ; reset decompression buffer
+			STZ.w TextID : STZ.w TextID+1 ; reset decompression buffer
 			LDA.b #$01 : STA.l AltTextFlag ; set flag
 			%CopyDialog(<address>)
 		PLA : STA.b Scrap02
@@ -55,7 +55,7 @@ macro CopyDialogIndirect()
 endmacro
 ;--------------------------------------------------------------------------------
 LoadDialogAddressIndirect:
-	STZ.w $1CF0 : STZ.w $1CF1 ; reset decompression buffer
+	STZ.w TextID : STZ.w TextID+1 ; reset decompression buffer
 	LDA.b #$01 : STA.l AltTextFlag ; set flag
 	%CopyDialogIndirect()
 RTL
@@ -119,7 +119,6 @@ FreeDungeonItemNotice:
 	LDA.w ScratchBufferV : AND.b #$F0 : CMP.b #$A0 : BNE + ; small key of...
 		LDA.w ScratchBufferV : CMP.b #$AF : BNE ++ : JMP .skip : ++
 		%CopyDialog(Notice_SmallKeyOf)
-		PLA : AND.b #$0F : STA.w ScratchBufferV : LDA.b #$0F : !SUB.w ScratchBufferV : PHA
 		LDA.b #$01 : STA.w ScratchBufferNV ; set up a flip for small keys
 		BRA .dungeon
 	+
@@ -170,7 +169,7 @@ FreeDungeonItemNotice:
 	+
 	.done
 
-	STZ.w $1CF0 : STZ.w $1CF1 ; reset decompression buffer
+	STZ.w TextID : STZ.w TextID+1 ; reset decompression buffer
 	LDA.b #$01 : STA.l AltTextFlag ; set alternate dialog flag
 	STA.l TextBoxDefer
 
@@ -211,7 +210,7 @@ DialogFairyThrow:
         ORA.l BottleContentsTwo : ORA.l BottleContentsThree : ORA.l BottleContentsFour : BNE .normal
 	
 	.noInventory
-	LDA.w $0D80, X : !ADD #$08 : STA.w $0D80, X
+	LDA.w SpriteUnknown, X : !ADD #$08 : STA.w SpriteUnknown, X
 	LDA.b #$51
 	LDY.b #$01
 RTL
@@ -226,7 +225,7 @@ DialogGanon1:
 	LDA.w #$018C
 	BCC +
 	LDA.w #$016D
-+	STA.w $1CF0
++	STA.w TextID
 	SEP #$20
 	JSL.l Sprite_ShowMessageMinimal_Alt
 RTL
@@ -262,18 +261,18 @@ DialogGanon2:
     +
         LDA.w #$016E
     ++
-	STA.w $1CF0
+	STA.w TextID
 	SEP #$20
     JSL.l Sprite_ShowMessageMinimal_Alt
 RTL
 ;--------------------------------------------------------------------------------
 DialogEtherTablet:
 	PHA
-	LDA.w $0202 : CMP.b #$0F : BEQ + ; Show normal text if book is not equipped
+	LDA.w ItemCursor : CMP.b #$0F : BEQ + ; Show normal text if book is not equipped
 	-
 	PLA : JML Sprite_ShowMessageUnconditional ; Wacky Hylian Text
 	+
-	BIT $F4 : BVC - ; Show normal text if Y is not pressed
+	BIT.b Joy1A_New : BVC - ; Show normal text if Y is not pressed
 	LDA.l AllowHammerTablets : BEQ ++
 		LDA.l HammerEquipment : BEQ .yesText : BRA .noText
 	++
@@ -291,11 +290,11 @@ RTL
 ;--------------------------------------------------------------------------------
 DialogBombosTablet:
 	PHA
-	LDA.w $0202 : CMP.b #$0F : BEQ + ; Show normal text if book is not equipped
+	LDA.w ItemCursor : CMP.b #$0F : BEQ + ; Show normal text if book is not equipped
 	-
 	PLA : JML Sprite_ShowMessageUnconditional ; Wacky Hylian Text
 	+
-	BIT $F4 : BVC - ; Show normal text if Y is not pressed
+	BIT.b Joy1A_New : BVC - ; Show normal text if Y is not pressed
 	LDA.l AllowHammerTablets : BEQ ++
 		LDA.l HammerEquipment : BEQ .yesText : BRA .noText
 	++
@@ -339,16 +338,16 @@ AgahnimAsksAboutPed:
 	BNE .vanilla
 
 	LDA.b #$8C ; message 018C for no ped
-	STA.w $1CF0
+	STA.w TextID
 
 .vanilla
 	JML $05FA8E ; Sprite_ShowMessageMinimal
 ;--------------------------------------------------------------------------------
 Main_ShowTextMessage_Alt:
 	; Are we in text mode? If so then end the routine.
-	LDA.b $10 : CMP.b #$0E : BEQ .already_in_text_mode
+	LDA.b GameMode : CMP.b #$0E : BEQ .already_in_text_mode
 Sprite_ShowMessageMinimal_Alt:
-	STZ.b $11
+	STZ.b GameSubMode
 
 	PHX : PHY
 	PEI.b (Scrap00)
@@ -356,7 +355,7 @@ Sprite_ShowMessageMinimal_Alt:
 
 	LDA.b #$1C : STA.b Scrap02
 	REP #$30
-		LDA.w $1CF0 : ASL : TAX
+		LDA.w TextID : ASL : TAX
 		LDA.l $7F71C0, X
 		STA.b Scrap00
 	SEP #$30
@@ -376,13 +375,13 @@ Sprite_ShowMessageMinimal_Alt:
 	STZ.w $1CD8   ; Initialize the step in the submodule
 
 	; Go to text display mode (as opposed to maps, etc)
-	LDA.b #$02 : STA.b $11
+	LDA.b #$02 : STA.b GameSubMode
 
 	; Store the current module in the temporary location.
-	LDA.b $10 : STA.w $010C
+	LDA.b GameMode : STA.w GameModeCache
 
 	; Switch the main module ($10) to text mode.
-	LDA.b #$0E : STA.b $10
+	LDA.b #$0E : STA.b GameMode
 	.end
 	PLA : STA.b Scrap02
 	PLA : STA.b Scrap01
@@ -398,15 +397,15 @@ CalculateSignIndex:
   ; And we do this in a way that will likely give the right value even 
   ; with major glitches.
 
-  LDA.b $8A : ASL A : TAY ;what we wrote over
+  LDA.b OverworldIndex : ASL A : TAY ;what we wrote over
 
   LDA.w $0712 : BEQ .done ; If a small map, we can skip these calculations.
 
-  LDA.b $21 : AND.w #$0002 : ASL #2 : EOR $8A : AND.w #$0008 : BEQ +
+  LDA.b $21 : AND.w #$0002 : ASL #2 : EOR.b OverworldIndex : AND.w #$0008 : BEQ +
   	TYA : !ADD.w #$0010 : TAY  ;add 16 if we are in lower half of big screen.
   + 
 
-  LDA.b $23 : AND.w #$0002 : LSR : EOR.b $8A : AND.w #$0001 : BEQ +
+  LDA.b $23 : AND.w #$0002 : LSR : EOR.b OverworldIndex : AND.w #$0001 : BEQ +
   TYA : INC #2 : TAY  ;add 16 if we are in lower half of big screen.
   +
   ; ensure even if things go horribly wrong, we don't read the sign out of bounds and crash:
@@ -420,26 +419,26 @@ RTL
 ;================================================================
 Sprite_ShowSolicitedMessageIfPlayerFacing_Alt:
 {
-	STA.w $1CF0
-	STY.w $1CF1
+	STA.w TextID
+	STY.w TextID+1
 
 	JSL Sprite_CheckDamageToPlayerSameLayerLong : BCC .alpha
 	JSL Sprite_CheckIfPlayerPreoccupied : BCS .alpha
 
-	LDA.b $F6 : BPL .alpha
+	LDA.b Joy1B_New : BPL .alpha
 	LDA.w $0F10, X : BNE .alpha
-	LDA.b $4D : CMP.b #$02 : BEQ .alpha
+	LDA.b LinkJumping : CMP.b #$02 : BEQ .alpha
 
 	JSL Sprite_DirectionToFacePlayerLong : PHX : TYX
 
 	; Make sure that the sprite is facing towards the player, otherwise
 	; talking can't happen. (What sprites actually use this???)
-	LDA.l $05E1A3, X : PLX : CMP.b $2F : BNE .not_facing_each_other
+	LDA.l $05E1A3, X : PLX : CMP.b LinkDirection : BNE .not_facing_each_other
 
 	PHY
 
-	LDA.w $1CF0
-	LDY.w $1CF1
+	LDA.w TextID
+	LDY.w TextID+1
 
 	; Check what room we're in so we know which npc we're talking to
         LDA.b RoomIndex
@@ -483,15 +482,15 @@ Sprite_ShowSolicitedMessageIfPlayerFacing_PreserveMessage:
 	JSL Sprite_CheckDamageToPlayerSameLayerLong : BCC .alpha
 	JSL Sprite_CheckIfPlayerPreoccupied : BCS .alpha
 
-	LDA.b $F6 : BPL .alpha
+	LDA.b Joy1B_New : BPL .alpha
 	LDA.w $0F10, X : BNE .alpha
-	LDA.b $4D : CMP.b #$02 : BEQ .alpha
+	LDA.b LinkJumping : CMP.b #$02 : BEQ .alpha
 
 	JSL Sprite_DirectionToFacePlayerLong : PHX : TYX
 
 	; Make sure that the sprite is facing towards the player, otherwise
 	; talking can't happen. (What sprites actually use this???)
-	LDA.l $05E1A3, X : PLX : CMP.b $2F : BNE .not_facing_each_other
+	LDA.l $05E1A3, X : PLX : CMP.b LinkDirection : BNE .not_facing_each_other
 
 	PLA : XBA : PLA
 
diff --git a/dungeondrops.asm b/dungeondrops.asm
index ad4d4a8..aaeb8f7 100644
--- a/dungeondrops.asm
+++ b/dungeondrops.asm
@@ -2,7 +2,7 @@
 ; Dungeon & Boss Drop Fixes
 ;--------------------------------------------------------------------------------
 DropSafeDungeon:
-	LDA.w $040C : CMP.b #$08 : BEQ +
+	LDA.w DungeonID : CMP.b #$08 : BEQ +
 		LDA.l $01C6FC, X : JML Sprite_SpawnFallingItem
 	+
 RTL
diff --git a/dungeonmap.asm b/dungeonmap.asm
index 76bc86c..43c7d73 100644
--- a/dungeonmap.asm
+++ b/dungeonmap.asm
@@ -9,7 +9,7 @@ DoDungeonMapBossIcon:
 
 .dungeonmap
 
-	LDX.w $040C
+	LDX.w DungeonID
 	BMI .cave
 
 	; get dungeon boss room
diff --git a/elder.asm b/elder.asm
index 88b8653..3f5993e 100644
--- a/elder.asm
+++ b/elder.asm
@@ -1,6 +1,6 @@
 NewElderCode:
 {
-LDA.b $8A : CMP.b #$1B : BEQ .newCodeContinue
+LDA.b OverworldIndex : CMP.b #$1B : BEQ .newCodeContinue
 ;Restore Jump we can keep the RTL so JML
 JML $05F0CD
 .newCodeContinue
@@ -19,7 +19,7 @@ RTL
 
         LDA.b #$02 : STA.b Scrap06 : STZ.b Scrap07 ;Number of Tiles
         
-        LDA.w $0DC0, X : ASL #04
+        LDA.w SpriteGFXControl, X : ASL #04
         
         ADC.b #.animation_states : STA.b Scrap08
         LDA.b #.animation_states>>8 : ADC.b #$00 : STA.b Scrap09
@@ -46,11 +46,11 @@ RTL
         LDA.l TurnInGoalItems : AND.w #$00FF : BNE +
             .despawn
             SEP #$20
-            STZ.w $0DD0, X ; despawn self
+            STZ.w SpriteAITable, X ; despawn self
             RTS
         +
         SEP #$20
-        LDA.b $11
+        LDA.b GameSubMode
         BNE .done
         LDA.b #$96
         LDY.b #$01
@@ -66,6 +66,6 @@ RTL
         
         .done
         SEP #$20
-        LDA.b $1A : LSR #5 : AND.b #$01 : STA.w $0DC0, X
+        LDA.b FrameCounter : LSR #5 : AND.b #$01 : STA.w SpriteGFXControl, X
         RTS
     }
diff --git a/entrances.asm b/entrances.asm
index 5e1d9e9..32bc8c6 100644
--- a/entrances.asm
+++ b/entrances.asm
@@ -149,10 +149,10 @@ JML.l AllowStartFromExitReturn
 	LDA.l $02D8D3, X : STA.b RoomIndex+1
 
 	; Go to pre-overworld mode
-	LDA.b #$08 : STA.b $10
+	LDA.b #$08 : STA.b GameMode
 
-	STZ.b $11
-	STZ.b $B0
+	STZ.b GameSubMode
+	STZ.b SubSubModule
 
 	STZ.w $010A
 
@@ -168,7 +168,7 @@ CheckHole:
 	.nextHoleClassic
 		LDA.b Scrap00   : CMP.l $1BB800, X
 		BNE .wrongMap16Classic
-		LDA.w $040A : CMP.l $1BB826, X
+		LDA.b OverworldIndex : CMP.l $1BB826, X
 		BEQ .matchedHoleClassic
 	.wrongMap16Classic
 		DEX #2 : BPL .nextHoleClassic
@@ -177,7 +177,7 @@ CheckHole:
 	.nextHoleExtra
 		LDA.b Scrap00   : CMP.l ExtraHole_Map16, X
 		BNE .wrongMap16Extra
-		LDA.w $040A : CMP.l ExtraHole_Area, X
+		LDA.b OverworldIndex : CMP.l ExtraHole_Area, X
 		BEQ .matchedHoleExtra
 	.wrongMap16Extra
 		DEX #2 : BPL .nextHoleExtra
@@ -194,8 +194,8 @@ JML Overworld_Hole_End
 PreventEnterOnBonk:
 	STA.b Scrap00 ; part of what we wrote over
 	LDA.l InvertedMode : AND.w #$00FF : BEQ .done
-	LDA.l $5D : AND.w #$00FF : CMP.w #$0014 : BNE .done ;in mirror mode?
-	LDA.b $8A : AND.w #$0040 : CMP.b $7B : BEQ .done ; Are we bonking, or doing the superbunny glitch?
+	LDA.b LinkState : AND.w #$00FF : CMP.w #$0014 : BNE .done ;in mirror mode?
+	LDA.b OverworldIndex : AND.w #$0040 : CMP.b $7B : BEQ .done ; Are we bonking, or doing the superbunny glitch?
 
 		; If in inverted, are in mirror mode, and are bonking then do not enter
 		JML.l PreventEnterOnBonk_BRANCH_IX
@@ -206,7 +206,7 @@ JML.l PreventEnterOnBonk_return
 ;--------------------------------------------------------------------------------
 TurtleRockEntranceFix:
 	LDA.l TurtleRockAutoOpenFix : BEQ .done
-	LDA.b $8A : CMP.b #$47 : BNE .done
+	LDA.b OverworldIndex : CMP.b #$47 : BNE .done
 		;If exiting to turtle rock ensure the entrance is open
 		LDA.l OverworldEventDataWRAM+$47 : ORA.b #$20 : STA.l OverworldEventDataWRAM+$47
 .done
@@ -215,14 +215,14 @@ RTL
 AnimatedEntranceFix: ;when an entrance animation tries to start
 	PHA
 	LDA.l InvertedMode : BEQ + ;If we are in inverted mode
-	LDA.b $8A : AND.b #$40 : BNE + ;and in the light world
+	LDA.b OverworldIndex : AND.b #$40 : BNE + ;and in the light world
 		PLA
-		STZ.w $04C6 ; skip it.
+		STZ.w OWEntranceCutscene ; skip it.
 		LDA.b #$00
 		RTL
 	+
 	PLA
-	STA.w $02E4 ;what we wrote over
-	STA.w $0FC1 ;what we wrote over
-	STA.w $0710 ;what we wrote over
+	STA.w CutsceneFlag ;what we wrote over
+	STA.w FreezeSprites ;what we wrote over
+	STA.w SkipOAM ;what we wrote over
 RTL
diff --git a/events.asm b/events.asm
index 363524a..1ac3159 100644
--- a/events.asm
+++ b/events.asm
@@ -1,5 +1,5 @@
 OnPrepFileSelect:
-	LDA.b $11 : CMP.b #$03 : BNE +
+	LDA.b GameSubMode : CMP.b #$03 : BNE +
 		LDA.b #$06 : STA.b $14 ; thing we wrote over
 		RTL
 	+
@@ -33,7 +33,7 @@ OnDungeonExit:
 		JSL.l SQEGFix
 	PLP : PLA
 
-	STA.w $040C : STZ.w $04AC ; thing we wrote over
+	STA.w DungeonID : STZ.w $04AC ; thing we wrote over
 
 	PHA : PHP
 		JSL.l HUD_RebuildLong
@@ -84,15 +84,15 @@ OnFileCreation:
         ; Copy initial SRAM state from ROM to cart SRAM
         ; If the inital SRAM table is move these addresses must be changed
         PHB
-        LDA.w #$03D7                ; \
-        LDX.w #$B000                ;  | Copies from beginning of inital sram table up to file name
-        LDY.w #$0000                ;  | (exclusively)
-        MVN SRAMBank, SRAMTableBank ; /
-                                    ; Skip file name and validity value
-        LDA.w #$010C                ; \
-        LDX.w #$B3E3                ;  | Rando-Specific Assignments & Game Stats block
-        LDY.w #$03E3                ;  |
-        MVN SRAMBank, SRAMTableBank ; /
+        LDA.w #$03D7                  ; \
+        LDX.w #$B000                  ;  | Copies from beginning of inital sram table up to file name
+        LDY.w #$0000                  ;  | (exclusively)
+        MVN !SRAMBank, !SRAMTableBank ; /
+                                      ; Skip file name and validity value
+        LDA.w #$010C                  ; \
+        LDX.w #$B3E3                  ;  | Rando-Specific Assignments & Game Stats block
+        LDY.w #$03E3                  ;  |
+        MVN !SRAMBank, !SRAMTableBank ; /
         PLB
 
         ; resolve instant post-aga if standard
@@ -104,7 +104,7 @@ OnFileCreation:
         REP #$20
 
         ; Set validity value and do some cleanup. Jump to checksum.
-        LDA.w #$55AA : STA.l $7003E1
+        LDA.w #$55AA : STA.l FileValiditySRAM
         STZ.b Scrap00
         STZ.b Scrap01
         LDX.b Scrap00
@@ -167,7 +167,6 @@ RTL
 OnLinkDamaged:
 	JSL.l IncrementDamageTakenCounter_Arb
 	JML.l OHKOTimer
-
 ;--------------------------------------------------------------------------------
 ;OnEnterWater:
 ;       JSL.l UnequipCapeQuiet ; what we wrote over
@@ -178,18 +177,17 @@ OnLinkDamagedFromPit:
 
 	LDA.l AllowAccidentalMajorGlitch
 	BEQ ++
---	LDA.b #$14 : STA.b $11 ; thing we wrote over
+--	LDA.b #$14 : STA.b GameSubMode ; thing we wrote over
 
 	RTL
 
-++	LDA.b $10 : CMP.b #$12 : BNE --
+++	LDA.b GameMode : CMP.b #$12 : BNE --
 
-	STZ.b $11
+	STZ.b GameSubMode
 	RTL
 ;--------------------------------------------------------------------------------
 OnLinkDamagedFromPitOutdoors:
 	JML.l OHKOTimer ; make sure this is last
-
 ;--------------------------------------------------------------------------------
 OnOWTransition:
 	JSL.l FloodGateReset
@@ -204,13 +202,11 @@ OnLoadDuckMap:
 	LDA.l DuckMapFlag
 	BNE +
 		INC : STA.l DuckMapFlag
-		JSL OverworldMap_InitGfx : DEC $0200
-
+		JSL OverworldMap_InitGfx : DEC.w SubModuleInterface
 		RTL
 	+
 	LDA.b #$00 : STA.l DuckMapFlag
 	JML OverworldMap_DarkWorldTilemap
-
 ;--------------------------------------------------------------------------------
 PreItemGet:
 	LDA.b #$01 : STA.l BusyItem ; mark item as busy
@@ -224,16 +220,16 @@ PostItemAnimation:
 	LDA.b #$00 : STA.l BusyItem ; mark item as finished
 
 	LDA.l TextBoxDefer : BEQ +
-		STZ.w $1CF0 : STZ.w $1CF1 ; reset decompression buffer
+		STZ.w TextID : STZ.w TextID+1 ; reset decompression buffer
 		JSL.l Main_ShowTextMessage_Alt
 		LDA.b #$00 : STA.l TextBoxDefer
 	+
 
-	LDA.w $02E9 : CMP.b #$01 : BNE +
-		LDA.b $2F : BEQ +
+	LDA.w ItemReceiptMethod : CMP.b #$01 : BNE +
+		LDA.b LinkDirection : BEQ +
 			JSL.l IncrementChestTurnCounter
 	+
 
-    STZ.w $02E9 : LDA.w $0C5E, X ; thing we wrote over to get here
+    STZ.w ItemReceiptMethod : LDA.w $0C5E, X ; thing we wrote over to get here
 RTL
 ;--------------------------------------------------------------------------------
diff --git a/failure.asm b/failure.asm
index 8e31978..64f6f52 100644
--- a/failure.asm
+++ b/failure.asm
@@ -130,12 +130,12 @@ Crashed:
 	LDA.w #$0C78>>1
 	STA.b VMADDL
 
-	LDA.l $10
+	LDA.l GameMode
 	AND.w #$00FF
 	ORA.w #$0100
 	STA.b VMDATAL
 
-	LDA.l $11
+	LDA.l GameSubMode
 	AND.w #$00FF
 	ORA.w #$0100
 	STA.b VMDATAL
diff --git a/fairyfixes.asm b/fairyfixes.asm
index 3d8e9e9..2043796 100644
--- a/fairyfixes.asm
+++ b/fairyfixes.asm
@@ -35,16 +35,16 @@ FairyPond_Init:
 		LDA.l BottleContentsThree : CMP.b #$02 : BNE ++ : LDA.b #$1E : PHA : BRA .emptyBottle : ++
 		LDA.l BottleContentsFour : CMP.b #$02 : BNE ++ : LDA.b #$1F : PHA : BRA .emptyBottle : ++
 			.noInventory
-			LDA.b #$0A : STA.w $0D80, X
+			LDA.b #$0A : STA.w SpriteUnknown, X
 			LDA.b #$51
 			LDY.b #$01
 			JSL.l Sprite_ShowMessageFromPlayerContact
 			JMP .cleanup
 		
 			.emptyBottle
-			LDA.b #$02 : STA.w $0D80, X
-			STZ $2F
-			LDA.b #$01 : STA.w $02E4
+			LDA.b #$02 : STA.w SpriteUnknown, X
+			STZ.b LinkDirection
+			LDA.b #$01 : STA.w CutsceneFlag
 			PLA : STA.w $1CE8
 		.cleanup
 		STZ.w $0EB0, X ; Clear the sprite's item-given variable
@@ -60,26 +60,26 @@ HappinessPond_Check:
 	LDA.b #$72
 	JSL Sprite_SpawnDynamically
 
-	LDA.w $0FD8 : STA.w $0D10, Y
-	LDA.w $0FD9 : STA.w $0D30, Y
+	LDA.w SpriteCoordCacheX : STA.w SpritePosXLow, Y
+	LDA.w SpriteCoordCacheX+1 : STA.w SpritePosXHigh, Y
 
-	LDA.w $0FDA : !SUB.b #$40 : STA.w $0D00, Y
-	LDA.w $0FDB : SBC.b #$00 : STA.w $0D20, Y
+	LDA.w SpriteCoordCacheY : !SUB.b #$40 : STA.w SpritePosYLow, Y
+	LDA.w SpriteCoordCacheY+1 : SBC.b #$00 : STA.w SpritePosYHigh, Y
 
-	LDA.b #$01 : STA.w $0DA0, Y
+	LDA.b #$01 : STA.w SpriteAuxTable, Y
 
 	LDA.b #$BB
 	JSL Sprite_SpawnDynamically
 
-	LDA.b #$08 : STA.w $0DD0, Y ; ensure we run prep for the shopkeeper
+	LDA.b #$08 : STA.w SpriteAITable, Y ; ensure we run prep for the shopkeeper
 
-	LDA.w $0FD8 : STA.w $0D10, Y
-	LDA.w $0FD9 : STA.w $0D30, Y
+	LDA.w SpriteCoordCacheX : STA.w SpritePosXLow, Y
+	LDA.w SpriteCoordCacheX+1 : STA.w SpritePosXHigh, Y
 
-	LDA.w $0FDA : !SUB.b #$20 : STA.w $0D00, Y
-	LDA.w $0FDB : SBC.b #$00 : STA.w $0D20, Y
+	LDA.w SpriteCoordCacheY : !SUB.b #$20 : STA.w SpritePosYLow, Y
+	LDA.w SpriteCoordCacheY+1 : SBC.b #$00 : STA.w SpritePosYHigh, Y
 
-	STZ.w $0DD0, X ; self terminate
+	STZ.w SpriteAITable, X ; self terminate
 
 	PLP
 	.done
diff --git a/fastcredits.asm b/fastcredits.asm
index 70be896..4d39a83 100644
--- a/fastcredits.asm
+++ b/fastcredits.asm
@@ -1,21 +1,21 @@
 ;===================================================================================================
 
 FastCreditsCutsceneTimer:
-	BIT.b $F2-1 : BVC .slow
+	BIT.b Joy1B_All-1 : BVC .slow
 
 	LDA.w #$0001 : STA.b $50
 
-	LDA.b $C8
+	LDA.b ScrapBufferBD+$0B
 	CLC
 	ADC.w #$0004
 	AND.w #$FFFE
-	STA.b $C8
+	STA.b ScrapBufferBD+$0B
 	SEP #$20
 	RTL
 	
 
 .slow
-	INC.b $C8
+	INC.b ScrapBufferBD+$0B
 
 	SEP #$20
 	RTL
@@ -60,7 +60,7 @@ FastCreditsCutsceneScroll:
 	BCC ++ ; scroll if carry not set
 	LDA.w #$0000
 
-++	BIT.b $F2-1 : BVC .slow ; check for X held
+++	BIT.b Joy1B_All-1 : BVC .slow ; check for X held
 
 	AND.w #$FFFF ; get sign of A
 	BPL .positive
@@ -90,8 +90,8 @@ FastCreditsCutsceneScroll:
 FastCreditsCutsceneUnderworldX:
 	JSR FastCreditsCutsceneScrollX
 	CLC
-	ADC.b $E2
-	STA.b $E2
+	ADC.b BG2H
+	STA.b BG2H
 
 	RTL
 
@@ -99,15 +99,15 @@ FastCreditsCutsceneUnderworldX:
 FastCreditsCutsceneUnderworldY:
 	JSR FastCreditsCutsceneScrollY
 	CLC
-	ADC.b $E8
-	STA.b $E8
+	ADC.b BG2V
+	STA.b BG2V
 
 	RTL
 
 
 FastTextScroll:
-	LDA.b $1A
-	BIT.b $F2-1 : BVC .slow
+	LDA.b FrameCounter
+	BIT.b Joy1B_All-1 : BVC .slow
 
 	AND.w #$0000
 	RTL
diff --git a/fileselect.asm b/fileselect.asm
index 0387cc7..0eca417 100644
--- a/fileselect.asm
+++ b/fileselect.asm
@@ -82,42 +82,42 @@ JMP DrawItemGray
 
 DrawBottle:
 	AND.w #$00FF : BNE +
-		LDX #FileSelectItems_empty_bottle
+		LDX.w #FileSelectItems_empty_bottle
 		JMP DrawItemGray
 	+ : DEC #2 : BNE +
-		LDX #FileSelectItems_empty_bottle
+		LDX.w #FileSelectItems_empty_bottle
 		JMP DrawItem
 	+ : DEC : BNE +
-		LDX #FileSelectItems_red_potion
+		LDX.w #FileSelectItems_red_potion
 		JMP DrawItem
 	+ : DEC : BNE +
-		LDX #FileSelectItems_green_potion
+		LDX.w #FileSelectItems_green_potion
 		JMP DrawItem
 	+ : DEC : BNE +
-		LDX #FileSelectItems_blue_potion
+		LDX.w #FileSelectItems_blue_potion
 		JMP DrawItem
 	+ : DEC : BNE +
-		LDX #FileSelectItems_fairy_bottle
+		LDX.w #FileSelectItems_fairy_bottle
 		JMP DrawItem
 	+ : DEC : BNE +
-		LDX #FileSelectItems_bee_bottle
+		LDX.w #FileSelectItems_bee_bottle
 		JMP DrawItem
 	+
-	LDX #FileSelectItems_good_bee_bottle
+	LDX.w #FileSelectItems_good_bee_bottle
 JMP DrawItem
 
 
 DrawPlayerFile:
-	LDA.b $1A : AND.w #$0001 : BNE .normal
+	LDA.b FrameCounter : AND.w #$0001 : BNE .normal
 		JSR DrawPlayerFileShared
-		INC $0710 ; Suppress animated tile updates for this frame
+		INC.w SkipOAM ; Suppress animated tile updates for this frame
 
 		; re-enable  Stripe Image format upload on this frame
 		; Value loaded must match what gets set by AltBufferTable
 		LDA.w #$0161 : STA.w $1002
 		BRA .done
 	.normal
-	STZ $0710 ; ensure core animated tile updates are not suppressed
+	STZ.w SkipOAM ; ensure core animated tile updates are not suppressed
 	LDA.w #$FFFF : STA.w $1002 ; Suppress Stripe Image format upload on this frame
 .done
 	LDA.w #$0004 : STA.b Scrap02 ; thing we wrote over
@@ -642,7 +642,7 @@ AltBufferTable:
     LDA.w #$00FF : STA.w $1402
 
     ; Draw Unlock option if applicable
-    LDA.b $10 : AND.w #$00FF : CMP.w #$0001 : BNE +
+    LDA.b GameMode : AND.w #$00FF : CMP.w #$0001 : BNE +
     LDA.l IsEncrypted : AND.w #$00FF : CMP.w #$0002 : BNE +
     PHP : SEP #$30 : PHX : PHY : JSL ValidatePassword : PLY : PLX : PLP
     AND.w #$00FF : BNE +
@@ -754,7 +754,7 @@ RTL
 ;--------------------------------------------------------------------------------
 
 SetFileSelectPalette:
-	LDA.b $10 : CMP.b #$04 : BNE +
+	LDA.b GameMode : CMP.b #$04 : BNE +
 		; load the vanilla file select screen BG3 palette for naming screen
 		LDA.b #$01 : STA.w $0AB2
 		JSL.l Palette_Hud
@@ -814,7 +814,7 @@ DrawPlayerFile_credits:
 RTL
 ;--------------------------------------------------------------------------------
 FSCursorUp:
-	LDA.b $C8 : BNE +
+	LDA.b FileSelectPosition : BNE +
 		LDA.b #$04 ; up from file becomes delete
 		BRA .done
 	+ : CMP.b #$03 : BNE +
@@ -828,11 +828,11 @@ FSCursorUp:
 	+
 	LDA.b #$00 ;otherwise up from delete is file
 	.done
-	STA.b $C8
+	STA.b FileSelectPosition
 RTL
 
 FSCursorDown:
-	LDA.b $C8 : BNE +
+	LDA.b FileSelectPosition : BNE +
 		LDA.l IsEncrypted : CMP.b #$02 : BNE ++
 		LDA.l ValidKeyLoaded : BNE ++
 			LDA.b #$03 ; down from file is unlock for password protected seeds
@@ -846,23 +846,23 @@ FSCursorDown:
 	+
 	LDA.b #$00 ; down from delete is file
 	.done
-	STA.b $C8
+	STA.b FileSelectPosition
 RTL
 ;--------------------------------------------------------------------------------
 FSSelectFile:
 	LDA.l IsEncrypted : CMP.b #$02 : BNE .normal
-		STZ $012E ; temporarily cancel file screen selection sound
+		STZ.w SFX2 ; temporarily cancel file screen selection sound
 		PHX : PHY
 			JSL ValidatePassword : BEQ .must_unlock
 		PLY : PLX
-		LDA.b #$2C : STA.w $012E ;file screen selection sound
+		LDA.b #$2C : STA.w SFX2 ;file screen selection sound
 	.normal
-	LDA.b #$F1 : STA.w $012C
+	LDA.b #$F1 : STA.w MusicControlRequest
 JML FSSelectFile_continue
 	.must_unlock
 	PLY : PLX
-	LDA.b #$03 : STA.b $C8 ;set cursor to unlock
-	LDA.b #$3C : STA.w $012E ; play error sound
+	LDA.b #$03 : STA.b FileSelectPosition ;set cursor to unlock
+	LDA.b #$3C : STA.w SFX2 ; play error sound
 JML FSSelectFile_return
 ;--------------------------------------------------------------------------------
 MaybeForceFileName:
diff --git a/flipperkill.asm b/flipperkill.asm
index 3072056..1d0debf 100644
--- a/flipperkill.asm
+++ b/flipperkill.asm
@@ -38,7 +38,7 @@ protectff:
 	; Remove dark world bit
 	; in game table that converts coordinates to actual screen ID
 	; special case for other areas
-	LDA.b $8A
+	LDA.b OverworldIndex
 	BMI .special_overworld
 
 	AND.b #$3F
@@ -47,17 +47,17 @@ protectff:
 
 .protect
 	LDA.b #$15
-	STA.b $5D
+	STA.b LinkState
 
 	STZ.b $2E
 	STZ.b $67
 
 	LDA.b #$02
-	STA.b $2F
+	STA.b LinkDirection
 
-	STZ.w $0112
-	STZ.w $02E4
-	STZ.w $0FFC
+	STZ.w MedallionFlag
+	STZ.w CutsceneFlag
+	STZ.w NoMenu
 
 ++	RTL
 
diff --git a/flute.asm b/flute.asm
index 6684953..faf10e3 100644
--- a/flute.asm
+++ b/flute.asm
@@ -2,18 +2,18 @@
 ; Randomize Flute Dig Item
 ;--------------------------------------------------------------------------------
 SpawnHauntedGroveItem:
-	LDA.b $8A : CMP.b #$2A : BEQ + : RTL : + ; Skip if not the haunted grove
-	LDA.b $1B : BEQ + : RTL : + ; Skip if indoors
+	LDA.b OverworldIndex : CMP.b #$2A : BEQ + : RTL : + ; Skip if not the haunted grove
+	LDA.b IndoorsFlag : BEQ + : RTL : + ; Skip if indoors
 
 	%GetPossiblyEncryptedItem(HauntedGroveItem, HeartPieceOutdoorValues)
 	JSL.l PrepDynamicTile
 	
 	LDA.b #$EB
-	STA.l $7FFE00
+	STA.l MiniGameTime
 	JSL Sprite_SpawnDynamically
 
 	LDX.b #$00
-	LDA.b $2F : CMP.b #$04 : BEQ + : INX : +
+	LDA.b LinkDirection : CMP.b #$04 : BEQ + : INX : +
 
 	LDA.l .x_speeds, X : STA.w $0D50, Y
 
@@ -32,7 +32,7 @@ SpawnHauntedGroveItem:
 	LDA.b #$00 : STA.w $0F20, Y
 	TYX
 
-	LDX.b $8A ; haunted grove (208D0A)
+	LDX.b OverworldIndex ; haunted grove (208D0A)
 	LDA.l OverworldEventDataWRAM, X : AND.b #$40 : BNE +
 		LDA.b #$1B : JSL Sound_SetSfx3PanLong
 	+
@@ -52,11 +52,11 @@ RTL
 }
 ;--------------------------------------------------------------------------------
 FluteBoy:
-	LDA.b $10 : CMP.b #$1A : BEQ +
+	LDA.b GameMode : CMP.b #$1A : BEQ +
 		LDA.b #$01 : STA.w $0FDD
 		JML.l FluteBoy_Abort
 	+
-	LDA.w $0D80, X : CMP.b #$03 ; thing we wrote over
+	LDA.w SpriteUnknown, X : CMP.b #$03 ; thing we wrote over
 JML.l FluteBoy_Continue
 ;--------------------------------------------------------------------------------
 FreeDuckCheck:
@@ -64,7 +64,7 @@ FreeDuckCheck:
 	LDA.l FluteEquipment : CMP.b #$03 : BEQ .done ; flute is already active
 	
     ; check the area, is it #$18 = 30?
-    LDA.b $8A : CMP.b #$18 : BNE .done
+    LDA.b OverworldIndex : CMP.b #$18 : BNE .done
 
 	REP #$20
 	
@@ -84,7 +84,7 @@ FreeDuckCheck:
     SEP #$20
     
     ; Apparently a special Overworld mode for doing this?
-    LDA.b #$2D : STA.b $11
+    LDA.b #$2D : STA.b GameSubMode
     
     ; Trigger the sequence to start the weathervane explosion.
     LDY.b #$00
diff --git a/framehook.asm b/framehook.asm
index 24434e6..129cd35 100644
--- a/framehook.asm
+++ b/framehook.asm
@@ -13,7 +13,7 @@ FrameHookAction:
 				LDA.l LoopFrames : INC : STA.l LoopFrames : BNE +
 					LDA.l LoopFrames+2 : INC : STA.l LoopFrames+2
 				+
-				LDA.l $10 : CMP.w #$010E : BNE + ; move this to nmi hook?
+				LDA.l GameMode : CMP.w #$010E : BNE + ; move this to nmi hook?
 				LDA.l MenuFrames : INC : STA.l MenuFrames : BNE +
 					LDA.l MenuFrames+2 : INC : STA.l MenuFrames+2
 				+
diff --git a/glitched.asm b/glitched.asm
index ce40b7e..cfbe597 100644
--- a/glitched.asm
+++ b/glitched.asm
@@ -70,10 +70,10 @@ GetAgahnimLightning:
 ;1 = Forbid
 AllowJoypadInput:
 	LDA.l PermitSQFromBosses : BEQ .fullCheck
-	LDA.w $0403 : AND.b #$80 : BEQ .fullCheck
-		LDA.w $0112 : ORA.w $02E4 ; we have heart container, do short check
+	LDA.w ItemsTaken : AND.b #$80 : BEQ .fullCheck
+		LDA.w MedallionFlag : ORA.w CutsceneFlag ; we have heart container, do short check
 RTL
 	.fullCheck
-	LDA.w $0112 : ORA.w $02E4 : ORA.w $0FFC
+	LDA.w MedallionFlag : ORA.w CutsceneFlag : ORA.w NoMenu
 RTL
 ;--------------------------------------------------------------------------------
diff --git a/goalitem.asm b/goalitem.asm
index 1de1e88..2fca733 100644
--- a/goalitem.asm
+++ b/goalitem.asm
@@ -1,14 +1,14 @@
 GoalItemGanonCheck:
-	LDA.w $0E20, X : CMP.b #$D6 : BNE .success ; skip if not ganon
+	LDA.w SpriteTypeTable, X : CMP.b #$D6 : BNE .success ; skip if not ganon
 		JSL.l CheckGanonVulnerability
 		BCS .success
 
 		.fail
-		LDA.w $0D80, X : CMP.b #17 : !BLT .success ; decmial 17 because Acmlm's chart is decimal
+		LDA.w SpriteUnknown, X : CMP.b #17 : !BLT .success ; decmial 17 because Acmlm's chart is decimal
 		LDA.b #$00
 RTL
 		.success
-		LDA.b $44 : CMP.b #$80 ; thing we wrote over
+		LDA.b OAMOffsetY : CMP.b #$80 ; thing we wrote over
 RTL
 ;--------------------------------------------------------------------------------
 ;Carry clear = ganon invincible
@@ -143,8 +143,8 @@ CheckAgaForPed:
 	RTL
 
 .force_blue_ball
-	LDA.b #$01 : STA.w $0DA0, Y
-	LDA.b #$20 : STA.w $0DF0, Y
+	LDA.b #$01 : STA.w SpriteAuxTable, Y
+	LDA.b #$20 : STA.w SpriteTimer, Y
 	CLC ; skip the RNG check
 	RTL
 
diff --git a/halfmagicbat.asm b/halfmagicbat.asm
index 1de2b42..fca8950 100644
--- a/halfmagicbat.asm
+++ b/halfmagicbat.asm
@@ -6,7 +6,7 @@ GetMagicBatItem:
 	%GetPossiblyEncryptedItem(MagicBatItem, SpriteItemValues)
 	CMP.b #$FF : BEQ .normalLogic
 	TAY
-	STZ.b $02E9 ; 0 = Receiving item from an NPC or message
+	STZ.b ItemReceiptMethod ; 0 = Receiving item from an NPC or message
 	JML.l Link_ReceiveItem
 .normalLogic
 	LDA.l HalfMagic
diff --git a/hardmode.asm b/hardmode.asm
index 49b35e3..fe04a02 100644
--- a/hardmode.asm
+++ b/hardmode.asm
@@ -16,7 +16,7 @@ CalculateSpikeFloorDamage:
 RTL
 ;--------------------------------------------------------------------------------
 CalculateByrnaUsage:
-	LDA.b $1B : BEQ ++
+	LDA.b IndoorsFlag : BEQ ++
 	REP #$20 ; set 16-bit accumulator
 	LDA.b RoomIndex ; these are all decimal because i got them that way
 	CMP.w #95 : BEQ + ; Ice Palace Spike Room
@@ -36,7 +36,7 @@ CalculateByrnaUsage:
 	JML IncrementMagicUseCounterByrna
 ;--------------------------------------------------------------------------------
 CalculateCapeUsage:
-	LDA.b $1B : BEQ ++
+	LDA.b IndoorsFlag : BEQ ++
 	REP #$20 ; set 16-bit accumulator
 	LDA.b RoomIndex ; these are all decimal because i got them that way
 	CMP.w #95 : BEQ + ; Ice Palace Spike Room
@@ -54,7 +54,7 @@ CalculateCapeUsage:
 	JML IncrementMagicUseCounterOne
 ;--------------------------------------------------------------------------------
 ActivateInvulnerabilityOrDont:
-	LDA.b $1B : BEQ .nowhere_special
+	LDA.b IndoorsFlag : BEQ .nowhere_special
 	REP #$20 ; set 16-bit accumulator
 	LDA.b RoomIndex ; these are all decimal because i got them that way
 	CMP.w #95 : BEQ .somewhere_cool ; Ice Palace Spike Room
diff --git a/heartbeep.asm b/heartbeep.asm
index 95429e1..64a8925 100644
--- a/heartbeep.asm
+++ b/heartbeep.asm
@@ -3,10 +3,10 @@
 ;================================================================================
 BeepLogic:
 	LDA.l HeartBeep : BEQ +
-	    STA.w $04CA
-	    LDA.b #$2B : STA.w $012E
+	    STA.w HeartBeepTimer
+	    LDA.b #$2B : STA.w SFX2
 RTL
 	+
-    LDA.b #$FF : STA.w $04CA
+    LDA.b #$FF : STA.w HeartBeepTimer
 RTL
 ;================================================================================
diff --git a/heartpieces.asm b/heartpieces.asm
index 7d8b881..6bcbc72 100644
--- a/heartpieces.asm
+++ b/heartpieces.asm
@@ -3,7 +3,7 @@
 ;--------------------------------------------------------------------------------
 HeartPieceGet:
         PHX : PHY
-        LDY.w $0E80, X ; load item value into Y register
+        LDY.w SpriteItemType, X ; load item value into Y register
         BNE +
                 ; if for any reason the item value is 0 reload it, just in case
                 JSL.l LoadHeartPieceRoomValue : TAY
@@ -12,7 +12,7 @@ HeartPieceGet:
 
         .skipLoad
 
-        STZ.w $02E9 ; 0 = Receiving item from an NPC or message
+        STZ.w ItemReceiptMethod ; 0 = Receiving item from an NPC or message
 
         CPY.b #$26 : BNE .notHeart ; don't add a 1/4 heart if it's not a heart piece
         LDA.l HeartPieceQuarter : INC A : AND.b #$03 : STA.l HeartPieceQuarter : BNE .unfinished_heart ; add up heart quarters
@@ -36,7 +36,7 @@ RTL
 HeartContainerGet:
 	PHX : PHY
 	JSL.l AddInventory_incrementBossSwordLong
-	LDY $0E80, X ; load item value into Y register
+	LDY.w SpriteItemType, X ; load item value into Y register
 	BNE +
 		; if for any reason the item value is 0 reload it, just in case
 		JSL.l LoadHeartContainerRoomValue : TAY
@@ -54,7 +54,7 @@ DrawHeartPieceGFX:
 	JMP .done ; don't draw on the init frame
 	
 	.skipInit
-	LDA.w $0E80, X ; Retrieve stored item type
+	LDA.w SpriteItemType, X ; Retrieve stored item type
 
 	.skipLoad
 	
@@ -83,7 +83,7 @@ DrawHeartContainerGFX:
 	BRA DrawHeartPieceGFX_done ; don't draw on the init frame
 	
 	.skipInit
-	LDA.w $0E80, X ; Retrieve stored item type
+	LDA.w SpriteItemType, X ; Retrieve stored item type
 
 	BRA DrawHeartPieceGFX_skipLoad
 ;--------------------------------------------------------------------------------
@@ -122,11 +122,11 @@ HeartPieceSpritePrep:
 	LDA.l ServerRequestMode : BEQ + :  : +
 	
 	LDA.b #$01 : STA.l RedrawFlag
-	LDA.b $5D : CMP.b #$14 : BEQ .skip ; skip if we're mid-mirror
+	LDA.b LinkState : CMP.b #$14 : BEQ .skip ; skip if we're mid-mirror
 
 	LDA.b #$00 : STA.l RedrawFlag
 	JSL.l LoadHeartPieceRoomValue ; load item type
-	STA.w $0E80, X ; Store item type
+	STA.w SpriteItemType, X ; Store item type
 	JSL.l PrepDynamicTile
 	
 	.skip
@@ -138,14 +138,14 @@ HeartContainerSpritePrep:
 	
 	LDA.b #$00 : STA.l RedrawFlag
 	JSL.l LoadHeartContainerRoomValue ; load item type
-	STA.w $0E80, X ; Store item type
+	STA.w SpriteItemType, X ; Store item type
 	JSL.l PrepDynamicTile
 	
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
 LoadHeartPieceRoomValue:
-	LDA.b $1B : BEQ .outdoors ; check if we're indoors or outdoors
+	LDA.b IndoorsFlag : BEQ .outdoors ; check if we're indoors or outdoors
 	.indoors
 	JSL.l LoadIndoorValue
 	JMP .done
@@ -161,9 +161,9 @@ RTL
 ;--------------------------------------------------------------------------------
 MaybeMarkDigSpotCollected:
 	PHA : PHP
-		LDA.b $1B : BNE +
+		LDA.b IndoorsFlag : BNE +
 		REP #$20 ; set 16-bit accumulator
-		LDA.b $8A
+		LDA.b OverworldIndex
 		CMP.w #$2A : BNE +
 			LDA.l HasGroveItem : ORA.w #$0001 : STA.l HasGroveItem
 		+
@@ -237,7 +237,7 @@ RTL
 LoadOutdoorValue:
 	PHP
 	REP #$20 ; set 16-bit accumulator
-	LDA.b $8A
+	LDA.b OverworldIndex
 	CMP.w #$03 : BNE +
 		LDA.b $22 : CMP.w #1890 : !BLT ++
 			%GetPossiblyEncryptedItem(HeartPiece_Spectacle, HeartPieceOutdoorValues)
diff --git a/hooks.asm b/hooks.asm
index 2e0adb9..e68f1be 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -1637,12 +1637,12 @@ NOP #8
 ;================================================================================
 org $028B8F ; <- 10B8F - Bank02.asm:2236 (LDA $7EF374 : LSR A : BCS BRANCH_BETA)
 JSL CheckHeraBossDefeated : BNE + : NOP
-LDX.b #$F1 : STX.w $012C
+LDX.b #$F1 : STX.w MusicControlRequest
 +
 ;================================================================================
 org $029090 ; <- 11090 - Bank02.asm:3099 (LDA $7EF374 : LSR A : BCS BRANCH_GAMMA)
 JSL CheckHeraBossDefeated : BNE + : NOP
-STX.w $012C ; DON'T MOVE THIS FORWARD OR MADNESS AWAITS
+STX.w MusicControlRequest ; DON'T MOVE THIS FORWARD OR MADNESS AWAITS
 +
 ;================================================================================
 org $029798 ; <- 11798 - Bank02.asm:4287 (CMP $02895C, X : BNE BRANCH_ALPHA)
diff --git a/icepalacegraphics.asm b/icepalacegraphics.asm
index af932ec..987c803 100644
--- a/icepalacegraphics.asm
+++ b/icepalacegraphics.asm
@@ -3,7 +3,7 @@ ShouldOverrideFileLoad:
     CPY #$0A ; 0A = Ice/Mire floor file
     BNE .no
 
-    LDA.w $040C ; Dungeon number
+    LDA.w DungeonID ; Dungeon number
     CMP #$12 ; Ice Palace
     BEQ .yes
     .no
diff --git a/init.asm b/init.asm
index 3d7f30c..5968bec 100644
--- a/init.asm
+++ b/init.asm
@@ -53,7 +53,7 @@ Init_Primary:
 	LDA.b #$01 : STA.w MEMSEL ; enable fastrom access on upper banks
 	STA.l OneMindId
 	
-	LDA.b #$10 : STA.b $BC ; set default player sprite bank
+	LDA.b #$10 : STA.b PlayerSpriteBank ; set default player sprite bank
 	
 	LDA.b #$81 : STA.w NMITIMEN ; thing we wrote over, turn on NMI & gamepad
 RTL
diff --git a/inventory.asm b/inventory.asm
index 0b17d4e..b7935f6 100644
--- a/inventory.asm
+++ b/inventory.asm
@@ -28,14 +28,14 @@
 ; out:	Carry - 0 = No Button, 1 = Yes Button
 ;--------------------------------------------------------------------------------
 ProcessMenuButtons:
-	LDA.b $F4 : BIT.b #$40 : BNE .y_pressed ; check for P1 Y-button
+	LDA.b Joy1A_New : BIT.b #$40 : BNE .y_pressed ; check for P1 Y-button
 			  BIT #$20 : BNE .sel_pressed ; check for P1 Select button
-	LDA.b $F0 : BIT.b #$20 : BNE .sel_held
+	LDA.b Joy1A_All : BIT.b #$20 : BNE .sel_held
 	.sel_unheld
 		LDA.l HudFlag : AND.b #$20 : BEQ +
 		LDA.l HudFlag : AND.b #$DF : STA.l HudFlag ; select is released, unset hud flag
-		LDA.b $1B : BEQ + ; skip if outdoors
-			LDA.b #$20 : STA.w $012F ; menu select sound
+		LDA.b IndoorsFlag : BEQ + ; skip if outdoors
+			LDA.b #$20 : STA.w SFX3 ; menu select sound
 		+
 		JSL.l ResetEquipment
 	+
@@ -44,16 +44,16 @@ ProcessMenuButtons:
 RTL
 	.sel_pressed
 	LDA.l HudFlag : ORA.b #$20 : STA.l HudFlag ; set hud flag
-	LDA.b #$20 : STA.w $012F ; menu select sound
+	LDA.b #$20 : STA.w SFX3 ; menu select sound
 	JSL.l ResetEquipment
 RTL
 	.y_pressed ; Note: used as entry point by quickswap code. Must preserve X. 
-	LDA.b #$10 : STA.w $0207
-	LDA.w $0202 ; check selected item
+	LDA.b #$10 : STA.w MenuBlink
+	LDA.w ItemCursor ; check selected item
 	CMP.b #$02 : BNE + ; boomerang
 		LDA.l InventoryTracking : AND.b #$C0 : CMP.b #$C0 : BNE .errorJump ; make sure we have both boomerangs
 		LDA.l BoomerangEquipment : EOR.b #$03 : STA.l BoomerangEquipment ; swap blue & red boomerang
-		LDA.b #$20 : STA.w $012F ; menu select sound
+		LDA.b #$20 : STA.w SFX3 ; menu select sound
 		JMP .captured
 	+ CMP #$01 : BNE + ; bow
 		LDA.l BowTracking : AND.b #$C0 : CMP.b #$C0 : BNE .errorJump ; make sure we have both bows
@@ -70,7 +70,7 @@ RTL
 				BRA .errorJump2
 		++
 		LDA.l BowEquipment : !SUB #$01 : EOR.b #$02 : !ADD #$01 : STA.l BowEquipment ; swap bows
-		LDA.b #$20 : STA.w $012F ; menu select sound
+		LDA.b #$20 : STA.w SFX3 ; menu select sound
 		JMP .captured
 	+ BRA +
 		.errorJump
@@ -78,7 +78,7 @@ RTL
 	+ CMP #$05 : BNE + ; powder
 		LDA.l InventoryTracking : AND.b #$30 : CMP.b #$30 : BNE .errorJump ; make sure we have mushroom & magic powder
 		LDA.l PowderEquipment : EOR.b #$03 : STA.l PowderEquipment ; swap mushroom & magic powder
-		LDA.b #$20 : STA.w $012F ; menu select sound
+		LDA.b #$20 : STA.w SFX3 ; menu select sound
 		JMP .captured
 	+ BRA +
 		.errorJump2
@@ -99,7 +99,7 @@ RTL
 		LDA.b #$01 ; set shovel
 		.fluteSuccess
 		STA.l FluteEquipment ; store set item
-		LDA.b #$20 : STA.w $012F ; menu select sound
+		LDA.b #$20 : STA.w SFX3 ; menu select sound
 		BRA .captured
 	+
 	CMP.b #$10 : BNE .error : JSL.l ProcessBottleMenu : BRA .captured : +
@@ -107,7 +107,7 @@ RTL
 RTL
 	.midShovel
 	.error
-	LDA.b #$3C : STA.w $012E ; error sound
+	LDA.b #$3C : STA.w SFX2 ; error sound
 	.captured
 	SEC
 RTL
@@ -124,13 +124,13 @@ ProcessBottleMenu:
 		TAX : LDA.l BottleContents-1, X ; check bottle
 		BNE + : LDX.b #$01 : + ; wrap if we reached the last bottle
 		TXA : STA.l BottleIndex ; set bottle index
-		LDA.b #$20 : STA.w $012F ; menu select sound
+		LDA.b #$20 : STA.w SFX3 ; menu select sound
 	PLX
 	.no_bottles
 	LDA.b #$00 ; pretend like the controller state was 0 from the overridden load
 RTL
 ;	.y_not_pressed
-;	LDA.b $F4 : AND.b #$0C ; thing we wrote over - load controller state
+;	LDA.b Joy1A_New : AND.b #$0C ; thing we wrote over - load controller state
 ;RTL
 ;--------------------------------------------------------------------------------
 
@@ -138,33 +138,27 @@ RTL
 ;OpenBottleMenu:
 ;--------------------------------------------------------------------------------
 OpenBottleMenu:
-	LDA.b $F6 : AND.b #$40 : BEQ .x_not_pressed ; skip if X is not down
-		LDA.b #$10 : STA.w $0207 ; set 16 frame cool off
-	    LDA.b #$20 : STA.w $012F ; make menu sound
-		LDA.b #$07 : STA.w $0200 ; thing we wrote over - opens bottle menu
+	LDA.b Joy1B_New : AND.b #$40 : BEQ .x_not_pressed ; skip if X is not down
+		LDA.b #$10 : STA.w MenuBlink ; set 16 frame cool off
+	    LDA.b #$20 : STA.w SFX3 ; make menu sound
+		LDA.b #$07 : STA.w SubModuleInterface ; thing we wrote over - opens bottle menu
 	.x_not_pressed
 RTL
-;--------------------------------------------------------------------------------
-
 ;--------------------------------------------------------------------------------
 ;CloseBottleMenu:
 ;--------------------------------------------------------------------------------
 CloseBottleMenu:
-	LDA.b $F6 : AND.b #$40 : BEQ .x_not_pressed ; skip if X is not down
+        LDA.b Joy1B_New : AND.b #$40 : BEQ .x_not_pressed ; skip if X is not down
+        LDA.b #$10 : STA.w MenuBlink ; set 16 frame cool off
+        LDA.b #$20 : STA.w SFX3 ; make menu sound
 
-	LDA.b #$10 : STA.w $0207 ; set 16 frame cool off
-    LDA.b #$20 : STA.w $012F ; make menu sound
-
-	INC.w $0200 ; return to normal menu
-    STZ.w $0205
-
-	LDA.b #$00
+        INC.w SubModuleInterface ; return to normal menu
+        STZ.w BottleMenuCounter
+        LDA.b #$00
 RTL
-	.x_not_pressed
-	LDA.b $F4 : AND.b #$0C ; thing we wrote over (probably)
+        .x_not_pressed
+        LDA.b Joy1A_New : AND.b #$0C ; thing we wrote over (probably)
 RTL
-;--------------------------------------------------------------------------------
-
 ;--------------------------------------------------------------------------------
 ; AddInventory:
 ;--------------------------------------------------------------------------------
@@ -253,8 +247,8 @@ AddInventory:
 	+
 	CPY.b #$3B : BNE + : JMP .dungeonCounts : + ; Silver Arrow Bow - Skip Shop/Fairy Check for Silver Arrow Bow
 
-	LDA.b $1B : BEQ ++ ; skip shop check if outdoors
-	LDA.w $02E9 : CMP.b #$01 : BEQ ++ ; skip shop check for chests
+	LDA.b IndoorsFlag : BEQ ++ ; skip shop check if outdoors
+	LDA.w ItemReceiptMethod : CMP.b #$01 : BEQ ++ ; skip shop check for chests
 		PHP : REP #$20 ; set 16-bit accumulator
 			LDA.w $048E
 			CMP.w #274 : BNE + : JMP .shop : + ; dark world death mountain shop, ornamental shield shop
@@ -274,10 +268,10 @@ AddInventory:
 	++
 
 	.dungeonCounts
-	LDA.b $1B : BNE + : JMP .fullItemCounts : +
+	LDA.b IndoorsFlag : BNE + : JMP .fullItemCounts : +
 	SEP #$20 ; Set 8-bit Accumulator
 
-	LDA.w $040C ; get dungeon id
+	LDA.w DungeonID ; get dungeon id
         CMP.b #$FF : BEQ .fullItemCounts
 
         CMP.l BallNChainDungeon : BNE +
@@ -370,7 +364,7 @@ AddInventory:
 	+ CPY.b #$1D : BNE + ; Book of Mudora - LEAVE THIS ABOVE THE 1B-1F CONDITION - kkat
 		JSR .incrementY
 		JMP .done
-	+ CPY.b #$1B : !BLT + ; Items $1B - $1F
+	+ CPY.b #$1B : !BLT + ; Items IndoorsFlag - $1F
 	  CPY.b #$20 : !BGE +
 		JSR .incrementA
 		JMP .done
@@ -442,7 +436,7 @@ AddInventory:
 		JSR .incrementY
 		JMP .done
 	+ CPY.b #$49 : BNE + ; Fighter's Sword
-                LDX #$01
+                LDX.b #$01
 		JSR .incrementSword
 		JMP .done
 	+ CPY.b #$4A : BNE + ; Flute (Active)
@@ -462,15 +456,15 @@ AddInventory:
 		JSR .incrementCapacity
 		JMP .done
 	+ CPY.b #$50 : BNE + ; Master Sword (Safe)
-                LDX #$02
+                LDX.b #$02
 		JSR .incrementSword
 		JMP .done
 	+ CPY.b #$51 : BNE + ; 5 Bomb Capacity Upgrade
-                LDX #$02
+                LDX.b #$02
 		JSR .maybeIncrementBombs
 		JMP .done
 	+ CPY.b #$52 : BNE + ; 10 Bomb Capacity Upgrade
-                LDX #$02
+                LDX.b #$02
 		JSR .maybeIncrementBombs
 		JMP .done
 	+ CPY.b #$51 : !BLT + ; Items $51 - $54 - Capacity Upgrades
@@ -671,7 +665,7 @@ RTL
 RTS
 
 .setDungeonCompletion
-	LDX $040C : BMI +
+	LDX.w DungeonID : BMI +
 		REP #$20  ; 16 bit
 		LDA.l DungeonMask, X
 		ORA.l DungeonsCompleted : STA.l DungeonsCompleted
@@ -701,10 +695,10 @@ RTL
 ;--------------------------------------------------------------------------------
 HandleBombAbsorbtion:
 	STA.l BombsFiller ; thing we wrote over
-	LDA.w $0303 : BNE + ; skip if we already have some item selected
+	LDA.w CurrentYItem : BNE + ; skip if we already have some item selected
 	LDA.l BombCapacity : BEQ + ; skip if we can't have bombs
-		LDA.b #$04 : STA.w $0202 ; set selected item to bombs
-		LDA.b #$01 : STA.w $0303 ; set selected item to bombs
+		LDA.b #$04 : STA.w ItemCursor ; set selected item to bombs
+		LDA.b #$01 : STA.w CurrentYItem ; set selected item to bombs
 		JSL.l HUD_RebuildLong
 	+
 RTL
@@ -714,7 +708,7 @@ RTL
 ; AddYMarker:
 ;--------------------------------------------------------------------------------
 AddYMarker:
-	LDA.w $0202 : AND.w #$FF ; load item value
+	LDA.w ItemCursor : AND.w #$FF ; load item value
 	CMP.w #$02 : BNE + ; boomerang
 		LDA.l InventoryTracking : AND.w #$C0 : CMP.w #$C0 : BEQ .drawYBubble : BRA .drawNormal
 	+ CMP.w #$01 : BNE + ; bow
@@ -732,7 +726,7 @@ AddYMarker:
 	BRA .drawTile
 
 	.drawJarMarker
-	LDA.w $0207 : AND.w #$0020 : BNE .drawXBubble
+	LDA.w MenuBlink : AND.w #$0020 : BNE .drawXBubble
 
 	.drawYBubble
 	LDA.w #$3D4F
@@ -785,7 +779,7 @@ RTL
 ;--------------------------------------------------------------------------------
 CheckKeys:
 	LDA.l GenericKeys : BEQ + : RTL : +
-	LDA.w $040C : CMP.b #$FF
+	LDA.w DungeonID : CMP.b #$FF
 RTL
 ;--------------------------------------------------------------------------------
 
@@ -856,7 +850,7 @@ RTL
 LoadPowder:
 	JSL.l Sprite_SpawnDynamically ; thing we wrote over
 	%GetPossiblyEncryptedItem(WitchItem, SpriteItemValues)
-	STA.w $0DA0, Y ; Store item type
+	STA.w SpriteAuxTable, Y ; Store item type
 	JSL.l PrepDynamicTile
 RTL
 ;--------------------------------------------------------------------------------
@@ -880,12 +874,12 @@ RTL
 DrawPowder:
 	LDA.w $02DA : BNE .defer ; defer if link is buying a potion
 	LDA.l RedrawFlag : BEQ +
-		LDA.w $0DA0, X ; Retrieve stored item type
+		LDA.w SpriteAuxTable, X ; Retrieve stored item type
 		JSL.l PrepDynamicTile
 		LDA.b #$00 : STA.l RedrawFlag ; reset redraw flag
 		BRA .defer
 	+
-	LDA.w $0DA0, X ; Retrieve stored item type
+	LDA.w SpriteAuxTable, X ; Retrieve stored item type
 	JSL.l DrawDynamicTile
 	.defer
 RTL
@@ -895,17 +889,17 @@ RTL
 ; LoadMushroom:
 ;--------------------------------------------------------------------------------
 LoadMushroom:
-	LDA.b #$00 : STA.w $0DC0, X ; thing we wrote over
+	LDA.b #$00 : STA.w SpriteGFXControl, X ; thing we wrote over
 	.justGFX
 
 	PHA
 
 	LDA.b #$01 : STA.l RedrawFlag
-	LDA.b $5D : CMP.b #$14 : BEQ .skip ; skip if we're mid-mirror
+	LDA.b LinkState : CMP.b #$14 : BEQ .skip ; skip if we're mid-mirror
 
 	LDA.b #$00 : STA.l RedrawFlag
 	%GetPossiblyEncryptedItem(MushroomItem, SpriteItemValues)
-	STA.w $0E80, X ; Store item type
+	STA.w SpriteItemType, X ; Store item type
 	JSL.l PrepDynamicTile
 
 	.skip
@@ -923,7 +917,7 @@ DrawMushroom:
 		BRA .done ; don't draw on the init frame
 
 		.skipInit
-		LDA.w $0E80, X ; Retrieve stored item type
+		LDA.w SpriteItemType, X ; Retrieve stored item type
 		JSL.l DrawDynamicTile
 
 		.done
@@ -935,12 +929,12 @@ RTL
 ; CollectPowder:
 ;--------------------------------------------------------------------------------
 CollectPowder:
-	LDY $0DA0, X ; Retrieve stored item type
+	LDY.w SpriteAuxTable, X ; Retrieve stored item type
 	BNE +
 		; if for any reason the item value is 0 reload it, just in case
 		%GetPossiblyEncryptedItem(WitchItem, SpriteItemValues) : TAY
 	+
-    STZ $02E9 ; item from NPC
+    STZ.w ItemReceiptMethod ; item from NPC
     JSL.l Link_ReceiveItem
 	;JSL.l FullInventoryExternal
 	JSL.l ItemSet_Powder
@@ -981,9 +975,9 @@ RTL
 ; SpawnShovelGamePrizeSFX:
 ;--------------------------------------------------------------------------------
 SpawnShovelGamePrizeSFX:
-	STA.l $7FFE00 ; thing we wrote over
+	STA.l MiniGameTime ; thing we wrote over
 	PHA
-		LDA.b #$1B : STA.w $012F ; play puzzle sound
+		LDA.b #$1B : STA.w SFX3 ; play puzzle sound
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
@@ -995,9 +989,9 @@ SpawnChestGamePrizeSFX:
 	CPX.b #$07 : BNE .normal
 	LDA.b RoomIndex : CMP.b #$06 : BNE .normal
 	.prize
-	LDA.b #$1B : STA.w $012F : RTL ; play puzzle sound
+	LDA.b #$1B : STA.w SFX3 : RTL ; play puzzle sound
 	.normal
-	LDA.b #$0E : STA.w $012F ; play chest sound
+	LDA.b #$0E : STA.w SFX3 ; play chest sound
 RTL
 ;--------------------------------------------------------------------------------
 
@@ -1012,15 +1006,15 @@ SpawnShovelItem:
 		JMP .skip
 	+
 
-	LDA.w $035B : AND.b #$01 : BNE + : JMP .skip : + ; corner dig fix
+	LDA.w TileActDig : AND.b #$01 : BNE + : JMP .skip : + ; corner dig fix
 
 	PHY : PHP
 	PHB : PHK : PLB
 		SEP #$30 ; set 8-bit accumulator and index registers
 
-		LDA.b $1B : BEQ + : JMP .no_drop : + ; skip if indoors
+		LDA.b IndoorsFlag : BEQ + : JMP .no_drop : + ; skip if indoors
 
-                LDA.b $8A : CMP.b #$2A : BEQ .no_drop ; don't drop in the haunted grove
+                LDA.b OverworldIndex : CMP.b #$2A : BEQ .no_drop ; don't drop in the haunted grove
                             CMP.b #$68 : BEQ .no_drop ; don't drop in the digging game area
 
 		JSL GetRandomInt : BIT.b #$03 : BNE .no_drop ; drop with 1/4 chance
@@ -1031,25 +1025,25 @@ SpawnShovelItem:
 
 		;most of this part below is copied from the digging game
 
-		STA.l $7FFE00
+		STA.l MiniGameTime
 		JSL Sprite_SpawnDynamically
 
 		LDX.b #$00
-		LDA.b $2F : CMP.b #$04 : BEQ + : INX : +
+		LDA.b LinkDirection : CMP.b #$04 : BEQ + : INX : +
 
-		LDA.l .x_speeds, X : STA.w $0D50, Y
+		LDA.l .x_speeds, X : STA.w SpriteVelocityX, Y
 
-		LDA.b #$00 : STA.w $0D40, Y
+		LDA.b #$00 : STA.w SpriteVelocityY, Y
 		LDA.b #$18 : STA.w $0F80, Y
 		LDA.b #$FF : STA.w $0B58, Y
 		LDA.b #$30 : STA.w $0F10, Y
 
 		LDA.b $22 : !ADD.l .x_offsets, X
-		                        AND.b #$F0 : STA.w $0D10, Y
-		LDA.b $23 : ADC.b #$00               : STA.w $0D30, Y
+		                        AND.b #$F0 : STA.w SpritePosXLow, Y
+		LDA.b $23 : ADC.b #$00               : STA.w SpritePosXHigh, Y
 
-		LDA.b $20 : !ADD.b #$16 : AND.b #$F0 : STA.w $0D00, Y
-		LDA.b $21 : ADC.b #$00               : STA.w $0D20, Y
+		LDA.b $20 : !ADD.b #$16 : AND.b #$F0 : STA.w SpritePosYLow, Y
+		LDA.b $21 : ADC.b #$00               : STA.w SpritePosYHigh, Y
 
 		LDA.b #$00 : STA.w $0F20, Y
 		TYX
diff --git a/inverted.asm b/inverted.asm
index 1b1cdd2..4880a1b 100644
--- a/inverted.asm
+++ b/inverted.asm
@@ -67,13 +67,13 @@ Overworld_CreatePyramidHoleModified:
 	LDA.w #$FFFF : STA.w $1012, Y
 
 .ending
-	LDA.w #$3515 : STA.w $012D
+	LDA.w #$3515 : STA.w SFX1
 
 	SEP #$30
 
 	LDA.l OverworldEventDataWRAM+$5B : ORA.b #$20 : STA.l OverworldEventDataWRAM+$5B
 
-	LDA.b #$03 : STA.w $012F
+	LDA.b #$03 : STA.w SFX3
 
 	LDA.b #$01 : STA.b $14
 
@@ -138,26 +138,27 @@ RTL
 
 
 GanonTowerAnimation:
-	LDA.l InvertedMode : BEQ .done
-		LDA.b #$1B : STA.w $012F
-        STZ.w $04C6
-        STZ.b $B0
-        STZ.w $0710
-        STZ.w $02E4
-        
-        STZ.w $0FC1
-        
-        STZ.w $011A
-        STZ.w $011B
-        STZ.w $011C
-        STZ.w $011D
-		LDA.b #$02 : STA.w $012C
-        LDA.b #$09 : STA.w $012D
-		RTL
-	.done
-	    LDA.b #$05 : STA.w $04C6 ;what we wrote over
-        STZ.b $B0 ; (continued)
-	STZ.b $C8 ; (continued)
+        LDA.l InvertedMode : BEQ .done
+                LDA.b #$1B : STA.w SFX3
+        STZ.w OWEntranceCutscene
+        STZ.b SubSubModule
+        STZ.w SkipOAM
+        STZ.w CutsceneFlag
+
+        STZ.w FreezeSprites
+
+        STZ.w BG1ShakeV
+        STZ.w BG1ShakeV+1
+        STZ.w BG1ShakeH
+        STZ.w BG1ShakeH+1
+        LDA.b #$02 : STA.w MusicControlRequest
+        LDA.b #$09 : STA.w SFX1
+        RTL
+
+        .done
+        LDA.b #$05 : STA.w OWEntranceCutscene ; what we wrote over
+        STZ.b SubSubModule ; (continued)
+        STZ.b ScrapBufferBD+$0B ; (continued)
 RTL
 
 GanonTowerInvertedCheck:
@@ -166,7 +167,7 @@ GanonTowerInvertedCheck:
 		LDA.b #$01 ; Load a random value so it doesn't BEQ
 	RTL
 	.done
-	LDA.b $8A : CMP.b #$43 ;what we wrote over
+	LDA.b OverworldIndex : CMP.b #$43 ;what we wrote over
 	RTL
 }
 
@@ -177,7 +178,7 @@ HardcodedRocks:
     LDA.l InvertedMode : AND.w #$00FF : BEQ .normalrocks
         BRA .noRock2
     .normalrocks
-        LDA.w #$020F : LDX $8A : CPX.w #$0033 : BNE .noRock
+        LDA.w #$020F : LDX.b OverworldIndex : CPX.w #$0033 : BNE .noRock
         STA.l $7E22A8
     .noRock
         CPX.w #$002F : BNE .noRock2
@@ -202,9 +203,9 @@ MirrorBonk:
 	; otherwise fall through to .normal
 		PHX : PHP
 		PHB : PHK : PLB
-		LDA.b $8A : AND.b #$40 : BEQ .endLoop ;World we're in? branch if we are in LW we don't want bonks
+		LDA.b OverworldIndex : AND.b #$40 : BEQ .endLoop ;World we're in? branch if we are in LW we don't want bonks
 		REP #$30
-		LDX #$0000
+		LDX.w #$0000
 		.loop
 			LDA.l .bonkRectanglesTable, X ;Load X1
 			CMP $22 : !BGE ++
diff --git a/invertedmaps.asm b/invertedmaps.asm
index b49c922..040ff03 100644
--- a/invertedmaps.asm
+++ b/invertedmaps.asm
@@ -1,19 +1,19 @@
 Overworld_LoadNewTiles:
 {
     ; add sign to EDM for OWG people to read
-    LDA.w $040A : AND.w #$00FF : CMP.w #$0005 : BNE +
+    LDA.b OverworldIndex : AND.w #$00FF : CMP.w #$0005 : BNE +
         LDA.w #$0101 : STA.l $7E2E18 ; #$0101 is the sign tile16 id, $7E2D98 is the position of the tile16 on map
     +
 
     ; GT sign
     LDA.l InvertedMode : AND.w #$00FF : BNE +
-    LDA.w $040A : AND.w #$00FF : CMP.w #$0043 : BNE +
+    LDA.b OverworldIndex : AND.w #$00FF : CMP.w #$0043 : BNE +
         LDA.w #$0101 : STA.l $7E2550
     +
 
     ; Pyramid sign
     LDA.l InvertedMode : AND.w #$00FF : BNE +
-    LDA.w $040A : AND.w #$00FF : CMP.w #$005B : BNE +
+    LDA.b OverworldIndex : AND.w #$00FF : CMP.w #$005B : BNE +
         LDA.w #$0101 : STA.w $7E27B6 ; Moved sign near statue
         LDA.w #$05C2 : STA.w $7E27B4 ; added a pyramid peg on the left of the sign
     +
@@ -26,7 +26,7 @@ Overworld_LoadNewTiles:
     LDA.b #$7E : PHA : PLB
     REP #$30
     ; Use it as an index into a jump table.
-    LDA.b $8A : CMP.w #$0080 : !BGE .noData
+    LDA.b OverworldIndex : CMP.w #$0080 : !BGE .noData
     ASL A : TAX
 
     JSR (Overworld_NewTilesTable, X)
diff --git a/invertedstatic.asm b/invertedstatic.asm
index 88b125c..60efb83 100644
--- a/invertedstatic.asm
+++ b/invertedstatic.asm
@@ -1,7 +1,7 @@
 ;Statically mapped at $A1A000 Referenced by the front end. Do not move without coordination.
 InvertedTileAttributeLookup:
 	SEP #$20
-	LDA.b $8A : CMP.b #$47 : BEQ .turtleRock
+	LDA.b OverworldIndex : CMP.b #$47 : BEQ .turtleRock
 	LDA.l Overworld_TileAttr, X
 	JML.l Overworld_GetTileAttrAtLocation_continue
 .turtleRock
diff --git a/lampmantlecone.asm b/lampmantlecone.asm
index 3eb5ee1..8c4243a 100644
--- a/lampmantlecone.asm
+++ b/lampmantlecone.asm
@@ -11,7 +11,7 @@ LampCheck:
 	
 	LDA.l CurrentWorld : BNE +
 		.lightWorld
-		LDA.w $040C : BNE ++ ; check if we're in sewers
+		LDA.w DungeonID : BNE ++ ; check if we're in sewers
 			LDA.l LampConeSewers : BRA .done
 		++
 			LDA.l LampConeLightWorld : BRA .done
diff --git a/maidencrystals.asm b/maidencrystals.asm
index 20ce70a..7dcd6df 100644
--- a/maidencrystals.asm
+++ b/maidencrystals.asm
@@ -10,7 +10,7 @@ MaidenCrystalScript:
         STZ.w $02D8
         STZ.w $02DA
         STZ.b $2E
-        LDA.b #$02 : STA.w $2F
+        LDA.b #$02 : STA.w LinkDirection
         LDA.l CrystalsField : AND.b #$7F : CMP.b #$7F : BNE + ; check if we have all crystals
                 LDA.b #$08 : STA.l MapIcons ; Update the map icon to just be Ganon's Tower
 	+
diff --git a/medallions.asm b/medallions.asm
index 9c3bbd5..fcfe259 100644
--- a/medallions.asm
+++ b/medallions.asm
@@ -3,7 +3,7 @@
 ;--------------------------------------------------------------------------------
 TryOpenMire:
     ; Checks if we're in the Swamp of Evil.
-    LDA.b $8A : CMP.b #$70 : BNE .untriggered
+    LDA.b OverworldIndex : CMP.b #$70 : BNE .untriggered
     
     ; Checks whether the Misery Mire dungeon is already revealed.
     LDA.l OverworldEventDataWRAM+$70 : AND.b #$20 : BNE .untriggered
@@ -12,17 +12,17 @@ TryOpenMire:
     LDY.b #$02 : JSL.l Ancilla_CheckIfEntranceTriggered : BCC .untriggered
     
     ; Do the 3rd animation for opening entrances
-    LDA.b #$03 : STA.w $04C6
+    LDA.b #$03 : STA.w OWEntranceCutscene
     
-    STZ.b $B0 ; reset the sub-submodule index
-    STZ.b $C8 ; reset this other index.
+    STZ.b SubSubModule ; reset the sub-submodule index
+    STZ.b ScrapBufferBD+$0B ; reset this other index.
 	
 	.untriggered
 RTL
 ;--------------------------------------------------------------------------------
 TryOpenTRock:
     ; Checks if we're at Turtle Rock.
-    LDA.b $8A : CMP.b #$47 : BNE .untriggered
+    LDA.b OverworldIndex : CMP.b #$47 : BNE .untriggered
     
     ; Checks whether the Turtle Rock dungeon is already revealed.
     LDA.l OverworldEventDataWRAM+$47 : AND.b #$20 : BNE .untriggered
@@ -31,17 +31,17 @@ TryOpenTRock:
     LDY.b #$03 : JSL.l Ancilla_CheckIfEntranceTriggered : BCC .untriggered
     
 	; Do the 4rd animation for opening entrances
-    LDA.b #$04 : STA.w $04C6
+    LDA.b #$04 : STA.w OWEntranceCutscene
     
-    STZ.b $B0 ; reset the sub-submodule index
-    STZ.b $C8 ; reset this other index.
+    STZ.b SubSubModule ; reset the sub-submodule index
+    STZ.b ScrapBufferBD+$0B ; reset this other index.
 	
 	.untriggered
 RTL
 ;--------------------------------------------------------------------------------
 MedallionTrigger_Bombos:
     STZ.b $50 ; stuff we wrote over
-    STZ.w $0FC1
+    STZ.w FreezeSprites
 	
 	PHA
 	LDA.l MireRequiredMedallion : BNE +
diff --git a/msu.asm b/msu.asm
index d42f647..0b46d28 100644
--- a/msu.asm
+++ b/msu.asm
@@ -208,7 +208,7 @@ CheckMusicLoadRequest:
             CMP.b #21 : BNE .check_fallback
 
 ;.boss
-            LDA.w $040C : LSR : !ADD.b #45
+            LDA.w DungeonID : LSR : !ADD.b #45
             BRA .check_fallback-3
 .lightworld
             PHA
@@ -226,14 +226,14 @@ CheckMusicLoadRequest:
             PHA
                 LDA.l CrystalsField : CMP.b #$7F : BEQ -
                 LDA.l CurrentWorld : BEQ --
-                LDA.b $8A : CMP #$40 : BNE --
+                LDA.b OverworldIndex : CMP #$40 : BNE --
             PLA
             LDA.b #15 : BRA .check_fallback-3
 .castle
-            LDA.w $040C
+            LDA.w DungeonID
             CMP.b #$08 : BNE .check_fallback  ; Hyrule Castle 2
 .dungeon
-            LDA.w $040C : LSR : !ADD.b #33 : STA.w MusicControlRequest
+            LDA.w DungeonID : LSR : !ADD.b #33 : STA.w MusicControlRequest
 
 .check_fallback
             LDX.w MusicControlRequest
@@ -267,7 +267,7 @@ CheckMusicLoadRequest:
 
 .dungeon_fallback
                 PHB : REP #$10
-                    LDX $040C
+                    LDX.w DungeonID
                     LDA.b #Music_Eastern>>16 : PHA : PLB    ; Set bank to music pointers
                     LDY.b Scrap00 : PHY
                         REP #$20
@@ -291,7 +291,7 @@ CheckMusicLoadRequest:
 
         LDA.w MusicControlRequest : CMP.b #08 : BEQ .done+3    ; No SFX during warp track
 
-        LDA.b $10
+        LDA.b GameMode
             CMP.b #$07 : BEQ .sfx_indoors
             CMP.b #$0E : BEQ .sfx_indoors
             CMP.b #$09 : BNE .done
@@ -300,7 +300,7 @@ CheckMusicLoadRequest:
         SEP #$10
             LDX.b #$09
 
-            LDA.b $8A             ; Dark Death Mountain
+            LDA.b OverworldIndex             ; Dark Death Mountain
             CMP.b #$43 : BEQ + : CMP.b #$45 : BEQ + : CMP.b #$47 : BEQ +
                 LDX.b #$05
             +
@@ -313,7 +313,7 @@ CheckMusicLoadRequest:
 .rain
                 LDX.b #$01
             +
-            STX.w $012D
+            STX.w SFX1
         REP #$10
 
 .done
@@ -323,7 +323,7 @@ CheckMusicLoadRequest:
 
 .sfx_indoors
         LDA.w MusicControlRequest : STA.w MusicControl : STZ.w MusicControlRequest
-    SEP #$20 : LDA.b #$05 : STA.w $012D
+    SEP #$20 : LDA.b #$05 : STA.w SFX1
     REP #$30 : PLY : PLX : PLA : PLD : PLB : PLP
     JML Module_PreDungeon_setAmbientSfx
 ;--------------------------------------------------------------------------------
@@ -660,7 +660,7 @@ MSUMain:
         LDA.b #$00 : STA.w MSUResumeTrack
     +
     CPX #07 : BNE + ; Kakariko Village
-        LDA.b $10 : CMP #$07 : BNE +
+        LDA.b GameMode : CMP #$07 : BNE +
         ; we're in link's house -> ignore
         LDA.b #$00
         BRA ++
@@ -680,7 +680,7 @@ MSUMain:
     CMP.b #47 : !BGE .done
 
     + : PHB : REP #$10
-        LDX $040C
+        LDX.w DungeonID
         LDA.b #Music_Eastern>>16 : PHA : PLB    ; Set bank to music pointers
         LDY.b Scrap00 : PHY
             REP #$20
@@ -763,7 +763,7 @@ CrystalFanfareWait:
 ; Delay input scanning on startup/S&Q to avoid hard-lock from button mashing
 ;--------------------------------------------------------------------------------
 StartupWait:
-    LDA.b $11 : CMP.b #$04 : BCC .done    ; thing we wrote over
+    LDA.b GameSubMode : CMP.b #$04 : BCC .done    ; thing we wrote over
     LDA.w APUIO0 : BEQ .done-1
     CMP.b #$01 : BEQ .done
     CLC
diff --git a/music.asm b/music.asm
index e13df10..b536dd7 100644
--- a/music.asm
+++ b/music.asm
@@ -9,7 +9,7 @@ PreOverworld_LoadProperties_ChooseMusic:
 
     LDX.b #$02 ; Default light world theme
 
-    LDA.b $8A : ORA.b #$40 ; check both light and dark world DM at the same time
+    LDA.b OverworldIndex : ORA.b #$40 ; check both light and dark world DM at the same time
     CMP.b #$43 : BEQ .endOfLightWorldChecks
     CMP.b #$45 : BEQ .endOfLightWorldChecks
     CMP.b #$47 : BEQ .endOfLightWorldChecks
@@ -17,12 +17,12 @@ PreOverworld_LoadProperties_ChooseMusic:
     LDY.b #$5A ; Main overworld animated tileset
 
     ; Skip village and lost woods checks if entering dark world or a special area
-    LDA.b $8A : CMP.b #$40 : !BGE .notVillageOrWoods
+    LDA.b OverworldIndex : CMP.b #$40 : !BGE .notVillageOrWoods
 
     LDX.b #$07 ; Default village theme
 
     ; Check if we're entering the village
-    LDA.b $8A : CMP.b #$18 : BEQ .endOfLightWorldChecks
+    LDA.b OverworldIndex : CMP.b #$18 : BEQ .endOfLightWorldChecks
     ; For NA release would we also branch on indexes #$22 #$28 #$29
 
     LDX.b #$05 ; Lost woods theme
@@ -33,7 +33,7 @@ PreOverworld_LoadProperties_ChooseMusic:
     +
 
     ; check if we are entering lost woods
-    LDA.b $8A : BEQ .endOfLightWorldChecks
+    LDA.b OverworldIndex : BEQ .endOfLightWorldChecks
 
     .notVillageOrWoods
     ; Use the normal overworld (light world) music
@@ -52,7 +52,7 @@ PreOverworld_LoadProperties_ChooseMusic:
     LDX.b #$0F ; dark woods theme
 
     ; This music is used in dark woods
-    LDA.b $8A
+    LDA.b OverworldIndex
     CMP.b #$40 : BEQ +
         LDX.b #$0D  ; dark death mountain theme
 
@@ -118,7 +118,7 @@ Overworld_FinishMirrorWarp:
 
     LDX.b #$09  ; default dark world theme
 
-    LDA.b $8A : CMP.b #$40 : !BGE .endOfLightWorldChecks
+    LDA.b OverworldIndex : CMP.b #$40 : !BGE .endOfLightWorldChecks
 
     LDX.b #$02  ; hyrule field theme
 
@@ -136,9 +136,9 @@ Overworld_FinishMirrorWarp:
         LDX.b #$07 ; Default village theme (phase <3)
 
 .endOfLightWorldChecks
-    STX.w $012C
+    STX.w MusicControlRequest
 
-    LDA.b $8A : CMP.b #$40 : BNE +
+    LDA.b OverworldIndex : CMP.b #$40 : BNE +
         LDX.b #$0F    ; dark woods theme
         BRA .bunny
     +
@@ -148,7 +148,7 @@ Overworld_FinishMirrorWarp:
     CMP.b #$47 : BNE .notDarkMountain
 
 .darkMountain
-    LDA.b #$09 : STA.w $012D    ; set storm ambient SFX
+    LDA.b #$09 : STA.w SFX1    ; set storm ambient SFX
     LDX.b #$0D  ; dark mountain theme
 
 .bunny
@@ -156,16 +156,16 @@ Overworld_FinishMirrorWarp:
         LDX.b #$04    ; bunny theme
     +
 
-    STX.w $012C
+    STX.w MusicControlRequest
 
 .notDarkMountain
 
-    LDA.b $11 : STA.w $010C
+    LDA.b GameSubMode : STA.w GameSubModeCache ; GameModeCache
 
-    STZ.b $11
-    STZ.b $B0
-    STZ.w $0200
-    STZ.w $0710
+    STZ.b GameSubMode
+    STZ.b SubSubModule
+    STZ.w SubModuleInterface
+    STZ.w SkipOAM
 
     RTL
 ;--------------------------------------------------------------------------------
@@ -173,17 +173,17 @@ Overworld_FinishMirrorWarp:
 ;--------------------------------------------------------------------------------
 BirdTravel_LoadTargetAreaMusic:
     ; Skip village and lost woods checks if entering dark world or a special area
-    LDA.b $8A : CMP.b #$43 : BEQ .endOfLightWorldChecks
+    LDA.b OverworldIndex : CMP.b #$43 : BEQ .endOfLightWorldChecks
     CMP.b #$40 : !BGE .notVillageOrWoods
 
     LDX.b #$07 ; Default village theme
 
     ; Check if we're entering the village
-    LDA.b $8A : CMP.b #$18 : BEQ .endOfLightWorldChecks
+    LDA.b OverworldIndex : CMP.b #$18 : BEQ .endOfLightWorldChecks
     ; For NA release would we also branch on indexes #$22 #$28 #$29
 
     ; check if we are entering lost woods
-    LDA.b $8A : BEQ .endOfLightWorldChecks
+    LDA.b OverworldIndex : BEQ .endOfLightWorldChecks
 
     .notVillageOrWoods
     ; Use the normal overworld (light world) music
@@ -201,24 +201,24 @@ BirdTravel_LoadTargetAreaMusic:
 
     LDX.b #$09 ; dark overworld theme
 
-    LDA.b $8A
+    LDA.b OverworldIndex
     ; Misery Mire rain SFX
     CMP.b #$70 : BNE ++
         LDA.l OverworldEventDataWRAM+$70 : AND.b #$20 : BNE ++
             LDA.b #$01 : CMP.w $0131 : BEQ +
-                STA.w $012D
+                STA.w SFX1
             + : BRA .checkInverted
     ++
 
     ; This music is used in dark death mountain
     CMP.b #$43 : BEQ .darkMountain
-        LDA.b #$05 : STA.w $012D
+        LDA.b #$05 : STA.w SFX1
         BRA .checkInverted
 
 .darkMountain
     LDA.l CrystalsField : CMP.b #$7F : BEQ +
         LDX.b #$0D  ; dark death mountain theme
-    + : LDA.b #$09 : STA.w $012D
+    + : LDA.b #$09 : STA.w SFX1
 
     ; if not inverted and light world, or inverted and dark world, skip moon pearl check
     .checkInverted
@@ -237,8 +237,8 @@ BirdTravel_LoadTargetAreaMusic:
 ;0 = Is Kakariko Overworld
 ;1 = Not Kakariko Overworld
 PsychoSolder_MusicCheck:
-    LDA.w $040A : CMP.b #$18 : BNE .done ; thing we overwrote - check if overworld location is Kakariko
-        LDA.b $1B  ; Also check that we are outdoors
+    LDA.b OverworldIndex : CMP.b #$18 : BNE .done ; thing we overwrote - check if overworld location is Kakariko
+        LDA.b IndoorsFlag  ; Also check that we are outdoors
     .done
 RTL
 ;--------------------------------------------------------------------------------
@@ -258,7 +258,7 @@ Overworld_MosaicDarkWorldChecks:
     LDA.l CrystalsField : CMP.b #$7F : BEQ .done
 
 .doFade
-    LDA.b #$F1 : STA.w $012C  ; thing we wrote over, fade out music
+    LDA.b #$F1 : STA.w MusicControlRequest  ; thing we wrote over, fade out music
 
 .done
     RTL
diff --git a/musicvolumes.asm b/musicvolumes.asm
index ee8f3c2..7cb61de 100644
--- a/musicvolumes.asm
+++ b/musicvolumes.asm
@@ -4,1206 +4,1206 @@
 
 ;== Music volume (set everything to 0 for a no-music seed) ==
 
-VOLUME_00 = $00
-VOLUME_14 = $14
-VOLUME_3C = $3C
-VOLUME_50 = $50
-VOLUME_5A = $5A
-VOLUME_64 = $64
-VOLUME_78 = $78
-VOLUME_82 = $82
-VOLUME_8C = $8C
-VOLUME_A0 = $A0
-VOLUME_AA = $AA
-VOLUME_B4 = $B4
-VOLUME_C8 = $C8
-VOLUME_D2 = $D2
-VOLUME_DC = $DC
-VOLUME_E6 = $E6
-VOLUME_F0 = $F0
-VOLUME_FA = $FA
-VOLUME_FF = $FF
+!VOLUME_00 = $00
+!VOLUME_14 = $14
+!VOLUME_3C = $3C
+!VOLUME_50 = $50
+!VOLUME_5A = $5A
+!VOLUME_64 = $64
+!VOLUME_78 = $78
+!VOLUME_82 = $82
+!VOLUME_8C = $8C
+!VOLUME_A0 = $A0
+!VOLUME_AA = $AA
+!VOLUME_B4 = $B4
+!VOLUME_C8 = $C8
+!VOLUME_D2 = $D2
+!VOLUME_DC = $DC
+!VOLUME_E6 = $E6
+!VOLUME_F0 = $F0
+!VOLUME_FA = $FA
+!VOLUME_FF = $FF
 
 ;== File select ==
 org $1A9D28 ; <- D1D28 .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1A9D41 ; <- D1D41 .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1A9D5C ; <- D1D5C .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1A9D77 ; <- D1D77 .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1A9D92 ; <- D1D92 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1A9DBD ; <- D1DBD .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1A9DEB ; <- D1DEB .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 ;org $1A9EEE ; <- D1EEE . (silent track)
-;db #VOLUME_8C ; $8C
+;db #!VOLUME_8C ; $8C
 
 ;== Title Theme (Triforce jingle) ==
 org $1A9F5D ; <- D1F5D .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1A9F9F ; <- D1F9F .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1A9FBD ; <- D1FBD .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1A9FDC ; <- D1FDC .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1A9FEA ; <- D1FEA .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 
 ;== Light World ==
 org $1AA047 ; <- D2047 .
-db #VOLUME_FA ; $FA
+db #!VOLUME_FA ; $FA
 org $1AA085 ; <- D2085 .
-db #VOLUME_FF ; $FF
+db #!VOLUME_FF ; $FF
 org $1AA0CA ; <- D20CA .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AA10A ; <- D210A .
-db #VOLUME_E6 ; $E6
+db #!VOLUME_E6 ; $E6
 org $1AA13F ; <- D213F .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1AA174 ; <- D2174 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1AA1BB ; <- D21BB .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AA1C5 ; <- D21C5 .
-db #VOLUME_FF ; $FF
+db #!VOLUME_FF ; $FF
 org $1AA1CD ; <- D21CD .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AA279 ; <- D2279 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AA29E ; <- D229E .
-db #VOLUME_DC ; $DC	
+db #!VOLUME_DC ; $DC	
 org $1AA2C9 ; <- D22C9 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AA2DC ; <- D22DC .
-db #VOLUME_E6 ; $E6
+db #!VOLUME_E6 ; $E6
 org $1AA349 ; <- D2349 .
-db #VOLUME_78 ; $78
+db #!VOLUME_78 ; $78
 org $1AA426 ; <- D2426 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1AA447 ; <- D2447 .
-db #VOLUME_E6 ; $E6
+db #!VOLUME_E6 ; $E6
 org $1AA49C ; <- D249C .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AA4C2 ; <- D24C2 .
-db #VOLUME_FA ; $FA
+db #!VOLUME_FA ; $FA
 org $1AA4CD ; <- D24CD .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AA4EC ; <- D24EC .
-db #VOLUME_FA ; $FA
+db #!VOLUME_FA ; $FA
 org $1AA5A4 ; <- D25A4 .
-db #VOLUME_FA ; $FA
+db #!VOLUME_FA ; $FA
 org $1AA754 ; <- D2754 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 
 ;== Escape ==
 org $1AA84C ; <- D284C .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AA866 ; <- D2866 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AA887 ; <- D2887 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AA8A0 ; <- D28A0 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AA8BA ; <- D28BA .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AA8DB ; <- D28DB .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AA8F4 ; <- D28F4 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AA93E ; <- D293E .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AAB88 ; <- D2B88 .
-db #VOLUME_D2 ; $D2
+db #!VOLUME_D2 ; $D2
 
 ;== Bunny ==
 org $1AABF3 ; <- D2BF3 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AAC09 ; <- D2C09 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AAC1F ; <- D2C1F .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AAC53 ; <- D2C53 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AAC69 ; <- D2C69 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 ;org $1AACA1 ; <- D2CA1 . (silent track)
-;db #VOLUME_C8 ; $C8
+;db #!VOLUME_C8 ; $C8
 org $1AACAF ; <- D2CAF .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AACC5 ; <- D2CC5 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AACEB ; <- D2CEB .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AAD05 ; <- D2D05 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AAD73 ; <- D2D73 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AAD91 ; <- D2D91 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AADAF ; <- D2DAF .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 
 ;== Lost Woods ==
 org $1AAE3D ; <- D2E3D .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AAE66 ; <- D2E66 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AAE70 ; <- D2E70 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AAEAB ; <- D2EAB .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AAEE6 ; <- D2EE6 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AAF00 ; <- D2F00 .
-db #VOLUME_82 ; $82
+db #!VOLUME_82 ; $82
 org $1AAF36 ; <- D2F36 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AAF46 ; <- D2F46 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AAF6F ; <- D2F6F .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 ;org $1AAFCF ; <- D2FCF . (unused track)
-;db #VOLUME_C8 ; $C8
+;db #!VOLUME_C8 ; $C8
 ;org $1AAFDF ; <- D2FDF . (unused track)
-;db #VOLUME_C8 ; $C8
+;db #!VOLUME_C8 ; $C8
 ;org $1AB02B ; <- D302B . (unused track)
-;db #VOLUME_C8 ; $C8
+;db #!VOLUME_C8 ; $C8
 org $1AB086 ; <- D3086 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AB099 ; <- D3099 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AB0A5 ; <- D30A5 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AB0CD ; <- D30CD .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AB0F6 ; <- D30F6 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AB11D ; <- D311D .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1AB154 ; <- D3154 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AB184 ; <- D3184 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AB1D1 ; <- D31D1 .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 
 ;== Episode III - A Link to the Past randomizer ==
 org $1AB33A ; <- D333A .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AB3D9 ; <- D33D9 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AB49F ; <- D349F .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AB54A ; <- D354A .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AB5E5 ; <- D35E5 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AB624 ; <- D3624 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AB63C ; <- D363C .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AB64A ; <- D364A .
-db #VOLUME_D2 ; $D2
+db #!VOLUME_D2 ; $D2
 org $1AB672 ; <- D3672 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AB691 ; <- D3691 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AB69F ; <- D369F .
-db #VOLUME_D2 ; $D2
+db #!VOLUME_D2 ; $D2
 org $1AB6B4 ; <- D36B4 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AB6C6 ; <- D36C6 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AB724 ; <- D3724 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 ;org $1AB73B ; <- D373B . (muted track)
-;db #VOLUME_00 ; $00
+;db #!VOLUME_00 ; $00
 org $1AB747 ; <- D3747 .
-db #VOLUME_D2 ; $D2
+db #!VOLUME_D2 ; $D2
 ;org $1AB75B ; <- D375B . (muted track)
-;db #VOLUME_00 ; $00
+;db #!VOLUME_00 ; $00
 org $1AB767 ; <- D3767 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 
 ;== Kakariko ==
 org $1AB8CB ; <- D38CB .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AB8ED ; <- D38ED .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1ABB1D ; <- D3B1D .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ABB2F ; <- D3B2F .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ABB55 ; <- D3B55 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ABB70 ; <- D3B70 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ABB81 ; <- D3B81 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ABB97 ; <- D3B97 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1ABBAC ; <- D3BAC .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1ABBBF ; <- D3BBF .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ABBE8 ; <- D3BE8 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1ABC0D ; <- D3C0D .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1ABC39 ; <- D3C39 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1ABC68 ; <- D3C68 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1ABC91 ; <- D3C91 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1ABC9F ; <- D3C9F .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1ABCBC ; <- D3CBC .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1ABCD3 ; <- D3CD3 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1ABCE8 ; <- D3CE8 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 
 ;== Mirror Sounds ==
 org $1ABD34 ; <- D3D34 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ABD55 ; <- D3D55 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ABD6E ; <- D3D6E .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ABDAA ; <- D3DAA .
-db #VOLUME_FA ; $FA
+db #!VOLUME_FA ; $FA
 org $1ABDC6 ; <- D3DC6 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ABE04 ; <- D3E04 . (this track sounds awesome on its own)
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ABE38 ; <- D3E38 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 
 ;== Dark World ==
 org $1ABF0C ; <- D3F0C .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1ABF45 ; <- D3F45 .
-db #VOLUME_78 ; $78
+db #!VOLUME_78 ; $78
 org $1ABF65 ; <- D3F65 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ABF82 ; <- D3F82 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1ABFA6 ; <- D3FA6 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC01E ; <- D401E .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AC04F ; <- D404F .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC05F ; <- D405F .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AC087 ; <- D4087 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC139 ; <- D4139 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AC148 ; <- D4148 .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1AC17A ; <- D417A .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC198 ; <- D4198 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AC1A0 ; <- D41A0 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC1D5 ; <- D41D5 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AC1F6 ; <- D41F6 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AC22B ; <- D422B .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AC25C ; <- D425C .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC270 ; <- D4270 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AC290 ; <- D4290 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AC2B1 ; <- D42B1 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AC2EB ; <- D42EB .
-db #VOLUME_78 ; $78
+db #!VOLUME_78 ; $78
 org $1AC306 ; <- D4306 (Volume fade) .
-db #VOLUME_5A ; $5A
+db #!VOLUME_5A ; $5A
 org $1AC319 ; <- D4319 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC334 ; <- D4334 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AC33C ; <- D433C .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC371 ; <- D4371 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AC3A6 ; <- D43A6 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AC3DB ; <- D43DB .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AC3EF ; <- D43EF .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC40C ; <- D440C .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC41E ; <- D441E .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AC43E ; <- D443E .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AC452 ; <- D4452 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC494 ; <- D4494 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC4B5 ; <- D44B5 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC512 ; <- D4512 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC56F ; <- D456F .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AC597 ; <- D4597 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AC5D1 ; <- D45D1 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC5EF ; <- D45EF .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC682 ; <- D4682 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC6C3 ; <- D46C3 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 
 ;== Getting Master Sword ==
 org $1AC731 ; <- D4731 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1AC753 ; <- D4753 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1AC774 ; <- D4774 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1AC795 ; <- D4795 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1AC7B6 ; <- D47B6 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1AC7D3 ; <- D47D3 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 
 ;== Hostile Kakariko Guards ==
 org $1AC83C ; <- D483C .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC848 ; <- D4848 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC855 ; <- D4855 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC862 ; <- D4862 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC86F ; <- D486F .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC87C ; <- D487C .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AC8B9 ; <- D48B9 .
-db #VOLUME_78 ; $78
+db #!VOLUME_78 ; $78
 org $1AC8FF ; <- D48FF .
-db #VOLUME_78 ; $78
+db #!VOLUME_78 ; $78
 
 ;== Title theme (after triforce jingle) ==
 org $1ACA1C ; <- D4A1C .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ACA3B ; <- D4A3B .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ACA60 ; <- D4A60 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ACAA5 ; <- D4AA5 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1ACAE4 ; <- D4AE4 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1ACB27 ; <- D4B27 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ACB3C ; <- D4B3C .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1ACB96 ; <- D4B96 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1ACBAB ; <- D4BAB .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1ACC03 ; <- D4C03 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1ACC53 ; <- D4C53 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1ACC7A ; <- D4C7A .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ACC7F ; <- D4C7F .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1ACCA5 ; <- D4CA5 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 
 ;== Skull Woods ==
 org $1ACD12 ; <- D4D12 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ACD43 ; <- D4D43 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1ACD81 ; <- D4D81 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ACD9C ; <- D4D9C .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1ACDCC ; <- D4DCC .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1ACE90 ; <- D4E90 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ACEBA ; <- D4EBA .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1ACED6 ; <- D4ED6 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ACEE2 ; <- D4EE2 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ACF0B ; <- D4F0B .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1ACFE5 ; <- D4FE5 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AD005 ; <- D5005 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AD012 ; <- D5012 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AD02E ; <- D502E .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AD03C ; <- D503C .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AD081 ; <- D5081 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 
 ;== Minigame ==
 org $1AD1A8 ; <- D51A8 .
-db #VOLUME_FA ; $FA
+db #!VOLUME_FA ; $FA
 org $1AD1B1 ; <- D51B1 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AD1C7 ; <- D51C7 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AD1CF ; <- D51CF .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AD1E6 ; <- D51E6 .
-db #VOLUME_FA ; $FA
+db #!VOLUME_FA ; $FA
 org $1AD1EF ; <- D51EF .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AD20C ; <- D520C .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AD214 ; <- D5214 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AD231 ; <- D5231 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AD24E ; <- D524E .
-db #VOLUME_FA ; $FA
+db #!VOLUME_FA ; $FA
 org $1AD257 ; <- D5257 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AD26D ; <- D526D .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AD275 ; <- D5275 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AD29E ; <- D529E .
-db #VOLUME_FA ; $FA
+db #!VOLUME_FA ; $FA
 org $1AD2AF ; <- D52AF .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AD2BD ; <- D52BD .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AD2CD ; <- D52CD .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AD2DB ; <- D52DB .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 
 ;== Triforce Chamber ==
 org $1AD424 ; <- D5424 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AD43F ; <- D543F .
-db #VOLUME_78 ; $78
+db #!VOLUME_78 ; $78
 org $1AD477 ; <- D5477 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1AD49C ; <- D549C .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AD4BC ; <- D54BC .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AD4D5 ; <- D54D5 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AD4F0 ; <- D54F0 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AD509 ; <- D5509 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AD543 ; <- D5543 .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 
 ;== Credits fuck it i'm not testing this, they look right though. ===
 org $1AD7D8 ; <- D57D8 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AD801 ; <- D5801 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AD817 ; <- D5817 .
-db #VOLUME_78 ; $78
+db #!VOLUME_78 ; $78
 org $1AD8A4 ; <- D58A4
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AD954 ; <- D5954
-db #VOLUME_3C ; $3C
+db #!VOLUME_3C ; $3C
 org $1AD957 ; <- D5957 (Volume fade)
-db #VOLUME_78 ; $78
+db #!VOLUME_78 ; $78
 org $1AD9B9 ; <- D59B9
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1ADA2F ; <- D5A2F (maybe a silent track?)
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1ADA3D ; <- D5A3D
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1ADA4D ; <- D5A4D
-db #VOLUME_E6 ; $E6
+db #!VOLUME_E6 ; $E6
 org $1ADA68 ; <- D5A68
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ADA7F ; <- D5A7F
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ADACB ; <- D5ACB
-db #VOLUME_78 ; $78
+db #!VOLUME_78 ; $78
 org $1ADAE8 ; <- D5AE8
-db #VOLUME_78 ; $78
+db #!VOLUME_78 ; $78
 org $1ADAEB ; <- D5AEB (Volume fade)
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1ADB47 ; <- D5B47
-db #VOLUME_50 ; $50
+db #!VOLUME_50 ; $50
 org $1ADB4A ; <- D5B4A (Volume fade)
-db #VOLUME_78 ; $78
+db #!VOLUME_78 ; $78
 org $1ADB5E ; <- D5B5E
-db #VOLUME_50 ; $50
+db #!VOLUME_50 ; $50
 org $1ADB6F ; <- D5B6F (Volume fade)
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1ADC12 ; <- D5C12
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ADD71 ; <- D5D71
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ADDDC ; <- D5DDC
-db #VOLUME_E6 ; $E6
+db #!VOLUME_E6 ; $E6
 org $1ADE10 ; <- D5E10
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ADE5E ; <- D5E5E
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1ADE9A ; <- D5E9A
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ADF28 ; <- D5F28
-db #VOLUME_FF ; $FF
+db #!VOLUME_FF ; $FF
 org $1ADF8B ; <- D5F8B
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ADFA4 ; <- D5FA4
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1ADFE9 ; <- D5FE9
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AE045 ; <- D6045 .
-db #VOLUME_FA ; $FA
+db #!VOLUME_FA ; $FA
 
 ;== Pre-credits ==
 org $1AE51A ; <- D651A .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AE53B ; <- D653B (Volume Fade) .
-db #VOLUME_3C ; $3C
+db #!VOLUME_3C ; $3C
 org $1AE542 ; <- D6542 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AE566 ; <- D6566 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1AE58F ; <- D658F .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AE5B3 ; <- D65B3 .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1AE5D2 ; <- D65D2 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AE5ED ; <- D65ED .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AE61D ; <- D661D .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AE64F ; <- D664F .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AE698 ; <- D6698 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AE6D7 ; <- D66D7 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AE6FF ; <- D66FF .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AE72C ; <- D672C .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1AE74A ; <- D674A .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AE760 ; <- D6760 .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1AE776 ; <- D6776 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AE7C0 ; <- D67C0 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1AE827 ; <- D6827 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AE878 ; <- D6878 .
-db #VOLUME_64 ; $64
+db #!VOLUME_64 ; $64
 org $1AE883 ; <- D6883 .
-db #VOLUME_64 ; $64
+db #!VOLUME_64 ; $64
 org $1AE8BD ; <- D68BD .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 
 ;== Holding the Triforce (part 1, more below) ==
 org $1AE8E5 ; <- D68E5 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 
 ;== More pre-credits stuff ==
 org $1AE956 ; <- D6956 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AE973 ; <- D6973 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AE985 ; <- D6985 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AE9A8 ; <- D69A8 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AE9B8 ; <- D69B8 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1AE9D6 ; <- D69D6 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AE9F5 ; <- D69F5 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AEA05 ; <- D6A05 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AEA51 ; <- D6A51 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AEA86 ; <- D6A86 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AEAB1 ; <- D6AB1 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1AEAE9 ; <- D6AE9 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AEB6B ; <- D6B6B .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1AEB96 ; <- D6B96 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AEC05 ; <- D6C05 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1AEC3E ; <- D6C3E .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AEC5C ; <- D6C5C .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AEC6F ; <- D6C6F .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AEC8E ; <- D6C8E .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AECB4 ; <- D6CB4 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AED4A ; <- D6D4A .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AED7D ; <- D6D7D .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1AEDB3 ; <- D6DB3 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1AEDCF ; <- D6DCF .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AEDF6 ; <- D6DF6 .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1AEE0D ; <- D6E0D .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1AEE20 ; <- D6E20 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AEE48 ; <- D6E48 .
-db #VOLUME_64 ; $64
+db #!VOLUME_64 ; $64
 org $1AEE76 ; <- D6E76 .
-db #VOLUME_64 ; $64
+db #!VOLUME_64 ; $64
 org $1AEE9C ; <- D6E9C .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AEECB ; <- D6ECB .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AEEFB ; <- D6EFB .
-db #VOLUME_64 ; $64
+db #!VOLUME_64 ; $64
 org $1AEF2D ; <- D6F2D .
-db #VOLUME_64 ; $64
+db #!VOLUME_64 ; $64
 org $1AEF80 ; <- D6F80 (i think this is unused, but i don't feel like confirming this one)
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AF17E ; <- D717E .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 
 ;== Holding the Triforce (part 2) ==
 org $1AF190 ; <- D7190 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AF1AB ; <- D71AB .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1AF1B9 ; <- D71B9 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1AF1D4 ; <- D71D4 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AF1E6 ; <- D71E6 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AF203 ; <- D7203 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1AF21E ; <- D721E .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 
 ;== More Credits ==
 org $1AF3A1 ; <- D73A1 .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 
 ;== Hyrule Castle ==
 org $1B811D ; <- D811D .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 ;org $1B8139 ; <- D8139 . (silent track)
-;db #VOLUME_C8 ; $C8
+;db #!VOLUME_C8 ; $C8
 ;org $1B814C ; <- D814C . (silent track)
-;db #VOLUME_8C ; $8C
+;db #!VOLUME_8C ; $8C
 org $1B816B ; <- D816B .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B818A ; <- D818A .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B819E ; <- D819E .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B81BE ; <- D81BE .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B81DE ; <- D81DE .
-db #VOLUME_FA ; $FA
+db #!VOLUME_FA ; $FA
 org $1B821E ; <- D821E .
-db #VOLUME_FA ; $FA
+db #!VOLUME_FA ; $FA
 org $1B825D ; <- D825D .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1B827D ; <- D827D .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1B829C ; <- D829C .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B82BE ; <- D82BE .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1B82E1 ; <- D82E1 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B8306 ; <- D8306 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B830E ; <- D830E .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B8340 ; <- D8340 .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1B835E ; <- D835E .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B8394 ; <- D8394 .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1B83AB ; <- D83AB .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B83CA ; <- D83CA .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B83F0 ; <- D83F0 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B83F8 ; <- D83F8 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B842C ; <- D842C .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1B844B ; <- D844B .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B8479 ; <- D8479 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B849E ; <- D849E .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B84CB ; <- D84CB .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B84EB ; <- D84EB .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B84F3 ; <- D84F3 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B854A ; <- D854A .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B8573 ; <- D8573 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B859D ; <- D859D .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B85B4 ; <- D85B4 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B85CE ; <- D85CE .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B862A ; <- D862A .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B8681 ; <- D8681 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B8724 ; <- D8724 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1B8732 ; <- D8732 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1B8796 ; <- D8796 .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1B87E3 ; <- D87E3 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B87FF ; <- D87FF .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B887B ; <- D887B .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B88C6 ; <- D88C6 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B88E3 ; <- D88E3 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 ;org $1B8903 ; <- D8903 . (silent track)
-;db #VOLUME_8C ; $8C
+;db #!VOLUME_8C ; $8C
 org $1B892A ; <- D892A .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1B8944 ; <- D8944 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B897B ; <- D897B .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 
 ;== Pendant Dungeon ==
 org $1B8C97 ; <- D8C97 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B8CA4 ; <- D8CA4 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B8CB3 ; <- D8CB3 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B8CC2 ; <- D8CC2 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B8CD1 ; <- D8CD1 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B8D01 ; <- D8D01 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B8E2D ; <- D8E2D .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1B8F0D ; <- D8F0D .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 ;org $1B90F8 ; <- D90F8 (muted track)
-;db #VOLUME_00 ; $00
+;db #!VOLUME_00 ; $00
 
 ;== Caves ==
 org $1B917B ; <- D917B .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B918C ; <- D918C .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B919A ; <- D919A .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B91B5 ; <- D91B5 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B91D0 ; <- D91D0 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B91DD ; <- D91DD . (splashy sound)
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B91E8 ; <- D91E8 .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1B9220 ; <- D9220 . (splashy sound)
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B922B ; <- D922B .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1B9273 ; <- D9273 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9284 ; <- D9284 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9292 ; <- D9292 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B92AD ; <- D92AD .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B92C8 ; <- D92C8 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B92D5 ; <- D92D5 . (splashy sound)
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B92E0 ; <- D92E0 .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1B9311 ; <- D9311 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9322 ; <- D9322 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9330 ; <- D9330 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B934B ; <- D934B .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9366 ; <- D9366 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9373 ; <- D9373 . (splashy sound)
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B937E ; <- D937E .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1B93B6 ; <- D93B6 . (splashy sound)
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B93C1 ; <- D93C1 .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 
 ;== Crystal/Pendant get ==
 org $1B945E ; <- D945E .
-db #VOLUME_F0 ; $F0
+db #!VOLUME_F0 ; $F0
 org $1B94AA ; <- D94AA .
-db #VOLUME_FA ; $FA
+db #!VOLUME_FA ; $FA
 org $1B94E0 ; <- D94E0 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1B9544 ; <- D9544 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1B95A8 ; <- D95A8 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1B960C ; <- D960C .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1B9652 ; <- D9652 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1B967D ; <- D967D .
-db #VOLUME_F0 ; $F0
+db #!VOLUME_F0 ; $F0
 org $1B9698 ; <- D9698 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1B96C2 ; <- D96C2 .
-db #VOLUME_F0 ; $F0
+db #!VOLUME_F0 ; $F0
 
 ;== Sanctuary ==
 org $1B97A6 ; <- D97A6 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B97C2 ; <- D97C2 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B97DC ; <- D97DC .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B97FB ; <- D97FB .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9811 ; <- D9811 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9828 ; <- D9828 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 
 ;== Boss ==
 ;org $1B98FF ; <- D98FF . (silent track)
-;db #VOLUME_C8 ; $C8
+;db #!VOLUME_C8 ; $C8
 org $1B996F ; <- D996F .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9982 ; <- D9982 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1B99A8 ; <- D99A8 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B99D5 ; <- D99D5 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9A02 ; <- D9A02 .
-db #VOLUME_AA ; $AA
+db #!VOLUME_AA ; $AA
 org $1B9A30 ; <- D9A30 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9A4E ; <- D9A4E .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9A6B ; <- D9A6B .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9A88 ; <- D9A88 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9A9E ; <- D9A9E .
-db #VOLUME_FA ; $FA
+db #!VOLUME_FA ; $FA
 ;org $1B9AE4 ; <- D9AE4 . (unused track) these three tracks go together
-;db #VOLUME_FA ; $FA
+;db #!VOLUME_FA ; $FA
 ;org $1B9AF7 ; <- D9AF7 . (unused track)
-;db #VOLUME_C8 ; $C8
+;db #!VOLUME_C8 ; $C8
 ;org $1B9B1D ; <- D9B1D . (unused track)
-;db #VOLUME_C8 ; $C8
+;db #!VOLUME_C8 ; $C8
 org $1B9B43 ; <- D9B43 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9B56 ; <- D9B56 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1B9B7C ; <- D9B7C .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9BA9 ; <- D9BA9 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9BD6 ; <- D9BD6 .
-db #VOLUME_AA ; $AA
+db #!VOLUME_AA ; $AA
 
 ;== Crystal Dungeon ==
 org $1B9C84 ; <- D9C84 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9C8D ; <- D9C8D .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9C95 ; <- D9C95 .
-db #VOLUME_F0 ; $F0
+db #!VOLUME_F0 ; $F0
 org $1B9CAC ; <- D9CAC .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9CBC ; <- D9CBC .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1B9CE8 ; <- D9CE8 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9CF3 ; <- D9CF3 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9CFD ; <- D9CFD .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9D46 ; <- D9D46 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1B9DC0 ; <- D9DC0 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1B9E49 ; <- D9E49 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1B9EE6 ; <- D9EE6 .
-db #VOLUME_F0 ; $F0
+db #!VOLUME_F0 ; $F0
 
 ;== Fortuneteller ==
 org $1BA211 ; <- DA211 .
-db #VOLUME_64 ; $64
+db #!VOLUME_64 ; $64
 org $1BA233 ; <- DA233 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1BA251 ; <- DA251 .
-db #VOLUME_E6 ; $E6
+db #!VOLUME_E6 ; $E6
 org $1BA26C ; <- DA26C .
-db #VOLUME_E6 ; $E6
+db #!VOLUME_E6 ; $E6
 org $1BA289 ; <- DA289 .
-db #VOLUME_FA ; $FA
+db #!VOLUME_FA ; $FA
 
 ;== Zelda's Lullaby ==
 org $1BA35B ; <- DA35B .
-db #VOLUME_64 ; $64
+db #!VOLUME_64 ; $64
 org $1BA35E ; <- DA35E (Volume fade) .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BA37B ; <- DA37B .
-db #VOLUME_64 ; $64
+db #!VOLUME_64 ; $64
 org $1BA37E ; <- DA37E (Volume fade) .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BA38E ; <- DA38E .
-db #VOLUME_64 ; $64
+db #!VOLUME_64 ; $64
 org $1BA391 ; <- DA391 (Volume fade) .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BA39F ; <- DA39F .
-db #VOLUME_64 ; $64
+db #!VOLUME_64 ; $64
 org $1BA3A2 ; <- DA3A2 (Volume fade) .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1BA3D5 ; <- DA3D5 .
-db #VOLUME_82 ; $82
+db #!VOLUME_82 ; $82
 org $1BA478 ; <- DA478 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BA49E ; <- DA49E .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1BA4C3 ; <- DA4C3 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BA4D7 ; <- DA4D7 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BA4F6 ; <- DA4F6 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BA515 ; <- DA515 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 
 ;== Maidens ==
 org $1BA5C3 ; <- DA5C3 .
-db #VOLUME_64 ; $64
+db #!VOLUME_64 ; $64
 org $1BA5C6 ; <- DA5C6 (Volume fade) .
-db #VOLUME_F0 ; $F0
+db #!VOLUME_F0 ; $F0
 org $1BA5DE ; <- DA5DE .
-db #VOLUME_78 ; $78
+db #!VOLUME_78 ; $78
 org $1BA608 ; <- DA608 .
-db #VOLUME_78 ; $78
+db #!VOLUME_78 ; $78
 org $1BA635 ; <- DA635 .
-db #VOLUME_78 ; $78
+db #!VOLUME_78 ; $78
 org $1BA662 ; <- DA662 .
-db #VOLUME_78 ; $78
+db #!VOLUME_78 ; $78
 org $1BA691 ; <- DA691 .
-db #VOLUME_64 ; $64
+db #!VOLUME_64 ; $64
 org $1BA694 ; <- DA694 (Volume fade) .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1BA6A8 ; <- DA6A8 .
-db #VOLUME_64 ; $64
+db #!VOLUME_64 ; $64
 org $1BA6AB ; <- DA6AB (Volume fade) .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1BA6DF ; <- DA6DF .
-db #VOLUME_64 ; $64
+db #!VOLUME_64 ; $64
 org $1BA6E2 ; <- DA6E2 (Volume fade) .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BA710 ; <- DA710 .
-db #VOLUME_14 ; $14
+db #!VOLUME_14 ; $14
 org $1BA71F ; <- DA71F (Volume fade) .
-db #VOLUME_78 ; $78
+db #!VOLUME_78 ; $78
 org $1BA72B ; <- DA72B .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1BA736 ; <- DA736 (Volume fade) .
-db #VOLUME_3C ; $3C
+db #!VOLUME_3C ; $3C
 org $1BA745 ; <- DA745 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1BA752 ; <- DA752 (Volume fade) .
-db #VOLUME_3C ; $3C
+db #!VOLUME_3C ; $3C
 org $1BA765 ; <- DA765 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1BA772 ; <- DA772 (Volume fade) .
-db #VOLUME_3C ; $3C
+db #!VOLUME_3C ; $3C
 org $1BA785 ; <- DA785 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1BA792 ; <- DA792 (Volume fade) .
-db #VOLUME_3C ; $3C
+db #!VOLUME_3C ; $3C
 org $1BA7A4 ; <- DA7A4 .
-db #VOLUME_14 ; $14
+db #!VOLUME_14 ; $14
 org $1BA7AF ; <- DA7AF (Volume fade) .
-db #VOLUME_78 ; $78
+db #!VOLUME_78 ; $78
 org $1BA7BB ; <- DA7BB .
-db #VOLUME_14 ; $14
+db #!VOLUME_14 ; $14
 org $1BA7C6 ; <- DA7C6 (Volume fade) .
-db #VOLUME_78 ; $78
+db #!VOLUME_78 ; $78
 org $1BA7D2 ; <- DA7D2 .
-db #VOLUME_14 ; $14
+db #!VOLUME_14 ; $14
 org $1BA7DD ; <- DA7DD (Volume fade) .
-db #VOLUME_78 ; $78
+db #!VOLUME_78 ; $78
 
 ;== Fairy Fountain ==
 org $1BA958 ; <- DA958 .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1BA971 ; <- DA971 .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1BA98C ; <- DA98C .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1BA9A7 ; <- DA9A7 .
-db #VOLUME_8C ; $8C
+db #!VOLUME_8C ; $8C
 org $1BA9C2 ; <- DA9C2 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BA9ED ; <- DA9ED .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BAA1B ; <- DAA1B .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BAA57 ; <- DAA57 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BAA68 ; <- DAA68 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1BAA77 ; <- DAA77 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1BAA88 ; <- DAA88 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1BAA99 ; <- DAA99 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 
 ;== Pre-Ganon Fight ==
 org $1BABAF ; <- DABAF .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BABC9 ; <- DABC9 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BABE2 ; <- DABE2 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BABF6 ; <- DABF6 .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1BAC0D ; <- DAC0D .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1BAC28 ; <- DAC28 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BAC46 ; <- DAC46 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BAC63 ; <- DAC63 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 
 ;== Agah 2 defeated ==
 ;org $1BACB8 ; <- DACB8 . (silent track)
-;db #VOLUME_C8 ; $C8
+;db #!VOLUME_C8 ; $C8
 org $1BACEC ; <- DACEC .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BAD08 ; <- DAD08 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BAD25 ; <- DAD25 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BAD42 ; <- DAD42 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BAD5F ; <- DAD5F .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 
 ;== Ganon ==
 org $1BAE17 ; <- DAE17 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BAE34 ; <- DAE34 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BAE51 ; <- DAE51 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BAE88 ; <- DAE88 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1BAEBE ; <- DAEBE .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 org $1BAEC8 ; <- DAEC8 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1BAEE6 ; <- DAEE6 .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
 org $1BAF04 ; <- DAF04 .
-db #VOLUME_B4 ; $B4
+db #!VOLUME_B4 ; $B4
 org $1BAF2E ; <- DAF2E .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BAF55 ; <- DAF55 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BAF6B ; <- DAF6B .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BAF81 ; <- DAF81 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BAFAC ; <- DAFAC .
-db #VOLUME_A0 ; $A0
+db #!VOLUME_A0 ; $A0
 
 ;== Falling into the Ganon fight ==
 org $1BB14F ; <- DB14F .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BB16B ; <- DB16B .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BB180 ; <- DB180 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BB195 ; <- DB195 .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BB1AA ; <- DB1AA .
-db #VOLUME_C8 ; $C8
+db #!VOLUME_C8 ; $C8
 org $1BB1BF ; <- DB1BF .
-db #VOLUME_DC ; $DC
+db #!VOLUME_DC ; $DC
diff --git a/newhud.asm b/newhud.asm
index dfc3ca4..6fd9b9c 100644
--- a/newhud.asm
+++ b/newhud.asm
@@ -126,14 +126,14 @@ NewDrawHud:
 !C_ICON = $295F
 
 	SEP #$20
-	LDA.b $1B : BEQ .noprize
+	LDA.b IndoorsFlag : BEQ .noprize
 
-	LDX.w $040C
+	LDX.w DungeonID
 	CPX #$1A : !BGE .noprize
 	CPX #$04 : !BLT .noprize
 	CPX #$08 : BEQ .noprize
 
-	LDA.b $10 : CMP #$12 : BEQ .noprize
+	LDA.b GameMode : CMP #$12 : BEQ .noprize
 
 	LDA.l MapMode
 	REP #$20
@@ -174,7 +174,7 @@ DrawMagicMeter_mp_tilemap = $0DFE0F
 	LDA.l InfiniteMagic : AND.w #$00FF : BNE + : JMP .green : +
 	SEP #$20 : LDA.b #$80 : STA.l CurrentMagic : REP #$30 ; set magic to max
 	LDX.w #$0080 ; load full magic meter graphics
-	LDA.b $1A : AND.w #$000C : LSR #2
+	LDA.b FrameCounter : AND.w #$000C : LSR #2
 	BEQ .red
 	CMP.w #0001 : BEQ .yellow
 	CMP.w #0002 : BNE + : JMP .green : +
diff --git a/newitems.asm b/newitems.asm
index 06c0306..2545f9e 100755
--- a/newitems.asm
+++ b/newitems.asm
@@ -359,14 +359,14 @@ AddReceivedItemExpandedGetItem:
 			LDA.l CurrentSmallKeys : INC : STA.l CurrentSmallKeys
 			JMP .done
 		.normal
-			TXA : ASL : CMP.w $040C : BNE ++
+			TXA : ASL : CMP.w DungeonID : BNE ++
 				LDA.l CurrentSmallKeys : INC : STA.l CurrentSmallKeys
 			++
 			JMP .done
 	+
 	.done
 	PLX
-	LDA.w $02E9 : CMP.b #$01 ; thing we wrote over
+	LDA.w ItemReceiptMethod : CMP.b #$01 ; thing we wrote over
 RTL
 ; #$70 - Maps
 ; #$80 - Compasses
@@ -1050,18 +1050,18 @@ CountBottles:
 RTS
 ;--------------------------------------------------------------------------------
 ActivateGoal:
-        STZ.b $11
-        STZ.b $B0
+        STZ.b GameSubMode
+        STZ.b SubSubModule
 JML.l StatsFinalPrep
 ;--------------------------------------------------------------------------------
 ChestPrep:
-	LDA.b #$01 : STA.w $02E9
+	LDA.b #$01 : STA.w ItemReceiptMethod
         JSL.l IncrementChestCounter
 	LDA.l ServerRequestMode : BEQ +
 		JSL.l ChestItemServiceRequest
 		RTL
 	+
-    LDY.b $0C ; get item value
+    LDY.b Scrap0C ; get item value
 	SEC
 RTL
 ;--------------------------------------------------------------------------------
@@ -1069,7 +1069,7 @@ RTL
 ; counts on
 MaybeFlagCompassTotalPickup:
         LDA.l CompassMode : AND.b #$0F : BEQ .done
-        LDA.w $040C : CMP.b #$FF : BEQ .done
+        LDA.w DungeonID : CMP.b #$FF : BEQ .done
         LSR : STA.b Scrap04 : LDA.b #$0F : !SUB Scrap04    ; Compute flag "index"
         CPY.b #$25 : BEQ .setFlag                          ; Set flag if it's a compass for this dungeon
                 STA.b Scrap04
@@ -1090,7 +1090,7 @@ RTL
 ; Set the compass count display flag if we're entering a dungeon and alerady have
 ; that compass
 MaybeFlagCompassTotalEntrance:
-        LDX.w $040C : CPX.b #$FF : BEQ .done         ; Skip if we're not entering dungeon
+        LDX.w DungeonID : CPX.b #$FF : BEQ .done         ; Skip if we're not entering dungeon
         LDA.l CompassMode : AND.w #$000F : BEQ .done ; Skip if we're not showing compass counts
         CMP.w #$0002 : BEQ .countShown
                 LDA.l CompassField : AND.l DungeonItemMasks, X : BEQ .done ; skip if we don't have compass
diff --git a/npcitems.asm b/npcitems.asm
index 6cc435b..df48a9d 100644
--- a/npcitems.asm
+++ b/npcitems.asm
@@ -61,7 +61,7 @@ ItemCheck_TreeKid3:
 	BRA .done
 	LDA.b #$05
 	.normal
-	LDA.w $0D80, X
+	LDA.w SpriteUnknown, X
 	.done
 RTL
 
@@ -133,13 +133,13 @@ RTL
 ItemSet_Mushroom:
 	PHA
 		LDA.l NpcFlags+1 : ORA.b #$10 : STA.l NpcFlags+1
-		LDY.w $0E80, X ; Retrieve stored item type
+		LDY.w SpriteItemType, X ; Retrieve stored item type
 		BNE +
 			; if for any reason the item value is 0 reload it, just in case
 			%GetPossiblyEncryptedItem(MushroomItem, SpriteItemValues) : TAY
 		+
 	PLA
-	STZ.w $02E9 ; thing we wrote over - the mushroom is an npc for item purposes apparently
+	STZ.w ItemReceiptMethod ; thing we wrote over - the mushroom is an npc for item purposes apparently
 RTL
 
 ItemSet_Powder:
@@ -151,7 +151,7 @@ RTL
 ; Randomize 300 Rupee NPC
 ;--------------------------------------------------------------------------------
 Set300RupeeNPCItem:
-	INC.w $0D80, X ; thing we wrote over
+	INC.w SpriteUnknown, X ; thing we wrote over
 
 	PHA : PHP
 	REP #$20 ; set 16-bit accumulator
diff --git a/password.asm b/password.asm
index 10123b1..a1b52be 100644
--- a/password.asm
+++ b/password.asm
@@ -1,8 +1,5 @@
-PASSWORD_CODE_POSITION = $C8
-PASSWORD_SELECTION_POSITION = $C9
-
 Module_Password:
-	LDA.b $11
+	LDA.b GameSubMode
 
 	JSL.l UseImplicitRegIndexedLongJumpTable
 
@@ -21,15 +18,15 @@ Password_BeginInit:
 	JSL LoadCustomHudPalette ; replace the 2bpp palettes, and trigger upload
 	LDA.b #$07 : STA.b $14 ; have NMI load up the initial tilemap from Password_Tilemap
 
-	INC.b $11
+	INC.b GameSubMode
 RTL
 
 Password_EndInit:
         JSR LoadPasswordStripeTemplate
 
         ;reset the variables used by this screen
-        STZ.b PASSWORD_CODE_POSITION
-        STZ.b PASSWORD_SELECTION_POSITION
+        STZ.b PasswordCodePosition
+        STZ.b PasswordSelectPosition
 
         JSL ValidatePassword : BNE +
                 ; zero out password if not valid
@@ -41,7 +38,7 @@ Password_EndInit:
 	+
 
 	LDA.b #$0F : STA.b $13
-	INC $11
+	INC.b GameSubMode
 RTL
 
 Password_Main:
@@ -58,38 +55,38 @@ Password_Main:
 		JSR PasswordMoveCursorLeft
 	+
 	LDA.b $F4 : AND.b #$01 : BEQ + ; right
-		LDA.b PASSWORD_SELECTION_POSITION : INC A : CMP.b #$24 : !BLT ++
+		LDA.b PasswordSelectPosition : INC A : CMP.b #$24 : !BLT ++
 			!SUB.b #$24
 		++
-		STA.b PASSWORD_SELECTION_POSITION
-		LDA.b #$20 : STA.w $012F
+		STA.b PasswordSelectPosition
+		LDA.b #$20 : STA.w SFX3
 	+
 	LDA.b $F4 : AND.b #$02 : BEQ + ; left
-		LDA.b PASSWORD_SELECTION_POSITION : DEC A : BPL ++
+		LDA.b PasswordSelectPosition : DEC A : BPL ++
 			!ADD.b #$24
 		++
-		STA.b PASSWORD_SELECTION_POSITION
-		LDA.b #$20 : STA.w $012F
+		STA.b PasswordSelectPosition
+		LDA.b #$20 : STA.w SFX3
 	+
 	LDA.b $F4 : AND.b #$04 : BEQ + ; down
-		LDA.b PASSWORD_SELECTION_POSITION : !ADD.b #$09 : CMP.b #$24 : !BLT ++
+		LDA.b PasswordSelectPosition : !ADD.b #$09 : CMP.b #$24 : !BLT ++
 			!SUB.b #$24
 		++
-		STA.b PASSWORD_SELECTION_POSITION
-		LDA.b #$20 : STA.w $012F
+		STA.b PasswordSelectPosition
+		LDA.b #$20 : STA.w SFX3
 	+
 	LDA.b $F4 : AND.b #$08 : BEQ + ; up
-		LDA.b PASSWORD_SELECTION_POSITION : !SUB.b #$09 :  BPL ++
+		LDA.b PasswordSelectPosition : !SUB.b #$09 :  BPL ++
 			!ADD.b #$24
 		++
-		STA.b PASSWORD_SELECTION_POSITION
-		LDA.b #$20 : STA.w $012F
+		STA.b PasswordSelectPosition
+		LDA.b #$20 : STA.w SFX3
 	+
 	LDA.b $F4 : ORA.b $F6 : AND.b #$C0 : BEQ + ; face button
-		LDX.b PASSWORD_SELECTION_POSITION
+		LDX.b PasswordSelectPosition
 		LDA.l .selectionValues, X : BPL ++
 			CMP.b #$F0 :  BNE +++
-				INC $11
+				INC.b GameSubMode
 				BRA .endOfButtonChecks
 			+++ : CMP.b #$F1 :  BNE +++
 				JSR PasswordMoveCursorLeft
@@ -98,24 +95,24 @@ Password_Main:
 				JSR PasswordMoveCursorRight
 				BRA +
 			+++ : CMP.b #$F3 :  BNE +++
-				INC $11 : INC $11 ; skip to return submodule
-				LDA.b #$2C : STA.w $012E ;file screen selection sound
+				INC.b GameSubMode : INC.b GameSubMode ; skip to return submodule
+				LDA.b #$2C : STA.w SFX2 ;file screen selection sound
 				BRA .endOfButtonChecks
 			+++
 			BRA +
 		++
-		LDX.b PASSWORD_CODE_POSITION
+		LDX.b PasswordCodePosition
 		STA.l PasswordSRAM,X
-		TXA : INC A : AND.b #$0F : STA.b PASSWORD_CODE_POSITION
+		TXA : INC A : AND.b #$0F : STA.b PasswordCodePosition
 		BNE ++
-			STZ.w $012E
-			INC $11
+			STZ.w SFX2
+			INC.b GameSubMode
 			BRA .endOfButtonChecks
 		++
-		LDA.b #$2B : STA.w $012E
+		LDA.b #$2B : STA.w SFX2
 	+
 	LDA.b $F4 : AND.b #$10 : BEQ + ; start
-		INC $11
+		INC.b GameSubMode
 	+
 	.endOfButtonChecks
 
@@ -133,21 +130,21 @@ db $19, $1A, $1B, $1C, $1D, $1E, $1F, $20, $F3
 
 Password_Check:
 	JSL.l ValidatePassword : BNE .correct
-	LDA.b #$3C : STA.w $012E ; error
-	DEC $11
+	LDA.b #$3C : STA.w SFX2 ; error
+	DEC.b GameSubMode
 RTL
 	.correct
-	LDA.b #$1B : STA.w $012F ; solved puzzle sound
-	INC $11
+	LDA.b #$1B : STA.w SFX3 ; solved puzzle sound
+	INC.b GameSubMode
 RTL
 
 Password_Return:
-	LDA.b #$01 : STA.w $10 ; select screen
-	LDA.b #$01 : STA.w $11 ; Skip the first submodule
-	STZ $B0
-	STZ $0B9D ; Reset file screen cursor pre-selection
-	STZ $C8
-	STZ $C9
+	LDA.b #$01 : STA.b GameMode ; select screen
+	LDA.b #$01 : STA.b GameSubMode ; Skip the first submodule
+	STZ.b SubSubModule
+	STZ.w SaveFileIndex
+	STZ.b PasswordCodePosition
+	STZ.b PasswordCodePosition+1
 RTL
 
 ;--------------------------------------------------------------------------------
@@ -275,14 +272,14 @@ PasswordEraseOldCursors:
 	REP #$20 ; set 16-bit accumulator
 
 	;Code Cursor
-	LDA.b PASSWORD_CODE_POSITION : AND.w #$00FF : ASL : TAX
+	LDA.b PasswordCodePosition : AND.w #$00FF : ASL : TAX
 	LDA.l .code_offsets, X
 	!ADD.w #$20*Scrap04+Scrap04+$6000
 	XBA ; because big endian is needed
 	STA.l $1002+Password_StripeImageTemplate_CodeCursorErase-Password_StripeImageTemplate
 
 	;selection cursor
-	LDA.b PASSWORD_SELECTION_POSITION : AND.w #$00FF : ASL : TAX
+	LDA.b PasswordSelectPosition : AND.w #$00FF : ASL : TAX
 	LDA.l .selection_offsets, X
 	!ADD.w #$20*Scrap0D+Scrap03+$6000
 	XBA ; because big endian is needed
@@ -308,14 +305,14 @@ RTS
 PasswordSetNewCursors:
 	REP #$20 ; set 16-bit accumulator
 	;Code Cursor
-	LDA.b PASSWORD_CODE_POSITION : AND.w #$00FF : ASL : TAX
+	LDA.b PasswordCodePosition : AND.w #$00FF : ASL : TAX
 	LDA.l PasswordEraseOldCursors_code_offsets, X
 	!ADD.w #$20*Scrap04+Scrap04+$6000
 	XBA ; because big endian is needed
 	STA.l $1002+Password_StripeImageTemplate_CodeCursorDraw-Password_StripeImageTemplate
 
 	;Selection cursor
-	LDA.b PASSWORD_SELECTION_POSITION : AND.w #$00FF : ASL : TAX
+	LDA.b PasswordSelectPosition : AND.w #$00FF : ASL : TAX
 	LDA.l PasswordEraseOldCursors_selection_offsets, X
 	!ADD.w #$20*Scrap0D+Scrap03+$6000
 	XBA ; because big endian is needed
@@ -353,13 +350,13 @@ RTS
 
 PasswordMoveCursorRight:
 	; return new code position
-	LDA.b #$2B : STA.w $012E
-	LDA.b PASSWORD_CODE_POSITION : INC A : AND.b #$0F : STA.b PASSWORD_CODE_POSITION
+	LDA.b #$2B : STA.w SFX2
+	LDA.b PasswordCodePosition : INC A : AND.b #$0F : STA.b PasswordCodePosition
 RTS
 PasswordMoveCursorLeft:
 	; return new code position
-	LDA.b #$2B : STA.w $012E
-	LDA.b PASSWORD_CODE_POSITION : DEC A : AND.b #$0F : STA.b PASSWORD_CODE_POSITION
+	LDA.b #$2B : STA.w SFX2
+	LDA.b PasswordCodePosition : DEC A : AND.b #$0F : STA.b PasswordCodePosition
 RTS
 
 macro dw_big_endian(value)
diff --git a/pendantcrystalhud.asm b/pendantcrystalhud.asm
index f7cfbed..0f86c2d 100644
--- a/pendantcrystalhud.asm
+++ b/pendantcrystalhud.asm
@@ -145,13 +145,13 @@ BringMenuDownEnhanced:
 
 		EOR.w #$FFFF : !ADD.w #$0001 ; negate menu speed
 
-		!ADD $EA : CMP.w #$FF18 : !BGE .noOvershoot
+		!ADD BG3VOFSQL : CMP.w #$FF18 : !BGE .noOvershoot
 			LDA.w #$FF18 ; if we went past the limit, go to the limit
 		.noOvershoot
-		STA.b $EA : CMP.w #$FF18
+		STA.b BG3VOFSQL : CMP.w #$FF18
 	SEP #$20 ; set 8-bit accumulator
 	BNE .notDoneScrolling
-		INC $0200
+		INC.w SubModuleInterface
 	.notDoneScrolling
 RTL
 ;================================================================================
@@ -163,30 +163,30 @@ RaiseHudMenu:
 		LDA.l MenuSpeed : AND.w #$00FF
 	++
 
-	!ADD $EA : BMI .noOvershoot
+	!ADD BG3VOFSQL : BMI .noOvershoot
 		LDA.w #$0000 ; if we went past the limit, go to the limit
 	.noOvershoot
-	STA.b $EA
+	STA.b BG3VOFSQL
 RTL
 ;================================================================================
 CheckCloseItemMenu:
 	LDA.l MenuCollapse : BNE + 
-		LDA.b $F4 : AND.b #$10 : RTL
+		LDA.b Joy1A_New : AND.b #$10 : RTL
 	+
-	LDA.b $F0 : AND.b #$10 : EOR.b #$10
+	LDA.b Joy1A_All : AND.b #$10 : EOR.b #$10
 RTL
 ;================================================================================
 ShowDungeonItems:
-	LDA.w $040C : AND.w #$00FF : CMP.w #$00FF : BNE + : RTL : + ; return normal result if outdoors or in a cave
+	LDA.w DungeonID : AND.w #$00FF : CMP.w #$00FF : BNE + : RTL : + ; return normal result if outdoors or in a cave
 	LDA.l HudFlag : AND.w #$0020 ; check hud flag
 	BEQ + : LDA.w #$0000 : RTL : + ; if set, send the zero onwards
-	LDA.w $040C : AND.w #$00FF : CMP.w #$00FF ; original logic
+	LDA.w DungeonID : AND.w #$00FF : CMP.w #$00FF ; original logic
 RTL
 ;--------------------------------------------------------------------------------
 UpdateKeys:
 	PHX : PHP
 	SEP #$30 ; set 8-bit accumulator & index registers
-		LDA.w $040C : CMP.b $1F : !BLT .skip
+		LDA.w DungeonID : CMP.b $1F : !BLT .skip
 		
 		LSR : TAX ; get dungeon index and store to X
 	
diff --git a/quickswap.asm b/quickswap.asm
index 3563a72..d9c1fa5 100644
--- a/quickswap.asm
+++ b/quickswap.asm
@@ -4,28 +4,28 @@ QuickSwap:
 	; We perform all other checks only if we are pushing L or R in order to have minimal
 	; perf impact, since this runs every frame
 
-	LDA.b $F6 : AND.b #$30 : BEQ .done
+	LDA.b Joy1B_New : AND.b #$30 : BEQ .done
 
 	XBA ; stash away the value for after the checks.
 
 	LDA.l QuickSwapFlag : BEQ .done
-	LDA.w $0202 : BEQ .done ; Skip everything if we don't have any items
+	LDA.w ItemCursor : BEQ .done ; Skip everything if we don't have any items
 
         LDY.b #$14
 	PHX
 	XBA ; restore the stashed value
 	CMP.b #$30 : BNE +
 		; If prossing both L and R this frame, then go directly to the special swap code
-		LDX.w $0202 : BRA .special_swap
+		LDX.w ItemCursor : BRA .special_swap
 	+
 	BIT.b #$10 : BEQ + ; Only pressed R
 		JSR.w RCode
-		LDA.b $F2 : BIT.b #$20 : BNE .special_swap ; Still holding L from a previous frame
+		LDA.b Joy1B_All : BIT.b #$20 : BNE .special_swap ; Still holding L from a previous frame
 		BRA .store
 	+
 	; Only pressed L
 	JSR.w LCode
-	LDA.b $F2 : BIT #$10 : BNE .special_swap ; Still holding R from a previous frame
+	LDA.b Joy1B_All : BIT #$10 : BNE .special_swap ; Still holding R from a previous frame
 	BRA .store
 
 	.special_swap
@@ -36,21 +36,21 @@ QuickSwap:
 	CPX.b #$0D : BEQ + ; flute
 	CPX.b #$10 : BEQ + ; bottle
 	BRA .store
-	+ STX.w $0202 : JSL ProcessMenuButtons_y_pressed
+	+ STX.w ItemCursor : JSL ProcessMenuButtons_y_pressed
 
 	.store
-	LDA.b #$20 : STA.w $012F
-	STX.w $0202
+	LDA.b #$20 : STA.w SFX3
+	STX.w ItemCursor
 
 	JSL HUD_RefreshIconLong
 	PLX
 
 	.done
-	LDA.b $F6 : AND.b #$40 ;what we wrote over
+	LDA.b Joy1B_New : AND.b #$40 ;what we wrote over
 RTL
 RCode:
-	LDX.w $0202
-	LDA.b $F2 : BIT.b #$20 : BNE ++ ; Still holding L from a previous frame
+	LDX.w ItemCursor
+	LDA.b Joy1B_All : BIT.b #$20 : BNE ++ ; Still holding L from a previous frame
 		LDA.l InventoryTracking+1 : AND.b #$FE : STA.l InventoryTracking+1
 		BRA +
 	++
@@ -66,8 +66,8 @@ RCode:
 RTS
 
 LCode:
-	LDX.w $0202
-	LDA.b $F2 : BIT #$10 : BNE ++ ; Still holding R from a previous frame
+	LDX.w ItemCursor
+	LDA.b Joy1B_All : BIT #$10 : BNE ++ ; Still holding R from a previous frame
 		LDA.l InventoryTracking+1 : AND.b #$FE : STA.l InventoryTracking+1
 		BRA +
 	++
diff --git a/ram.asm b/ram.asm
index 98d131a..23a65b7 100644
--- a/ram.asm
+++ b/ram.asm
@@ -2,99 +2,226 @@
 ; RAM Labels & Assertions
 ;--------------------------------------------------------------------------------
 ; This module is primarily concerned with labeling WRAM addresses used by the
-; randomizer and documenting their usage.
+; randomizer and documenting their usage. We use a combination of base $[address]
+; and WRAMLabel = $[address] here, favoring the former when we have larger blocks
+; of contiguous ram labeled. In some cases the label name can be descriptive enough
+; without documentation, you may want to consult more in-depth reference materials,
+; or I just don't understand what they are.
 ;
-; See the JP 1.0 disassembly for reference
-; (https://github.com/spannerisms/jpdasm/ - 31/10/2022)
+; See the JP 1.0 disassembly for reference, specifically symbols_wram.asm
+; (https://github.com/spannerisms/jpdasm/ - 19/11/2022)
 ;--------------------------------------------------------------------------------
 pushpc
 org 0
 
+;================================================================================
+; Bank 7E
+;--------------------------------------------------------------------------------
 ;================================================================================
 ; Direct Page
 ;--------------------------------------------------------------------------------
 base $7E0000
 Scrap:
-Scrap00: skip 1  ; Used as short-term scratch space. If you need some short-term
-Scrap01: skip 1  ; RAM, you can often use these. Double check that the next use
-Scrap02: skip 1  ; of the addresses you want to use is a write.
-Scrap03: skip 1  ;
-Scrap04: skip 1  ;
-Scrap05: skip 1  ;
-Scrap06: skip 1  ;
-Scrap07: skip 1  ;
-Scrap08: skip 1  ;
-Scrap09: skip 1  ;
-Scrap0A: skip 1  ;
-Scrap0B: skip 1  ;
-Scrap0C: skip 1  ;
-Scrap0D: skip 1  ;
-Scrap0E: skip 1  ;
-Scrap0F: skip 1  ;
+Scrap00: skip 1                   ; Used as short-term scratch space. If you need some short-term
+Scrap01: skip 1                   ; RAM, you can often use these. Double check that the next use
+Scrap02: skip 1                   ; of the addresses you want to use is a write.
+Scrap03: skip 1                   ;
+Scrap04: skip 1                   ;
+Scrap05: skip 1                   ;
+Scrap06: skip 1                   ;
+Scrap07: skip 1                   ;
+Scrap08: skip 1                   ;
+Scrap09: skip 1                   ;
+Scrap0A: skip 1                   ;
+Scrap0B: skip 1                   ;
+Scrap0C: skip 1                   ;
+Scrap0D: skip 1                   ;
+Scrap0E: skip 1                   ;
+Scrap0F: skip 1                   ;
+                                  ;
+GameMode = $7E0010                ; Game mode & submode. Refer to disassembly.
+GameSubMode = $7E0011             ;
+                                  ;
+FrameCounter = $7E001A            ; Increments every frame that the game isn't lagging
+IndoorsFlag = $7E001B             ; $00 = Outdoors | $01 = Indoors
+                                  ;
+LinkPosY = $7E0020                ; Link's absolute x/y coordinates. Both are word length.
+LinkPosX = $7E0022                ;
+LinkPosZ = $7E0024                ; $FFFF when on ground
+                                  ;
+LinkRecoilY = $7E0027             ;
+LinkRecoilX = $7E0028             ;
+LinkRecoilZ = $7E0029             ;
+                                  ;
+LinkDirection = $7E002F           ; $00 = Up | $02 = Down | $04 = Left | $06 = Right
+                                  ;
+OAMOffsetY = $7E0044              ;
+OAMOffsetX = $7E0045              ;
+                                  ;
+LinkJumping = $7E004D             ; $00 = None | $01 = Bonk/damage/water | $02 = Ledge
+                                  ;
+BunnyFlagDP = $7E0056             ; $00 = Link | $01 = Bunny
+                                  ;
+LinkSlipping = $7E005B            ; $00 = None | $01 = Near pit
+                                  ; $02 = Falling | $03 = Falling "more"
+FallTimer = $7E005C               ; Timer for falling animation
+LinkState = $7E005D               ; Main Link state handler
+LinkSpeed = $7E005E               ; Main Link speed handler
+                                  ;
+OverworldIndex = $7E008A          ; Overworld screen index. Word length. Dark world is OR $40 of
+                                  ; light world screen in same position. Zeroed on UW entry.
+OverlayID = $7E008C               ; Overworld overlay ID. One Byte.
+                                  ;
+RoomIndex = $7E00A0               ; Underworld room index. Word length. High byte: $00 = EG1 | $01 = EG2
+                                  ; Not zeroed on exit to overworld.
+PreviousRoom = $7E00A2            ; Stores previous value of RoomIndex
+                                  ;
+SubSubModule = $7E00B0            ; Often used as a submodule, such as for transitions
+                                  ;
+ObjPtr = $7E00B7                  ; Pointer for drawing room objects. Three bytes.
+ObjPtrOffset = $7E00BA            ; Used as an offset for ObjPointer. Word Length.
+PlayerSpriteBank = $7E00BC        ;
+ScrapBufferBD = $7E00BD           ; Another scrap buffer. $23 bytes.
+FileSelectPosition = $7E00C8      ;
+PasswordCodePosition = $7E00C8    ;
+PasswordSelectPosition = $7E00C9  ;
+                                  ;
+BG1H = $7E00E0                    ; Background scroll registers
+BG2H = $7E00E2                    ; For BG1 and BG2, these registers are used for calculations later for different writes to PPU.
+BG3HOFSQL = $7E00E4               ; For BG3, the values are written directly to the PPU during NMI
+BG1V = $7E00E6                    ; Since BG1 and BG2 are not written directly to PPU they are given different names from BG3.
+BG2V = $7E00E8                    ;
+BG3VOFSQL = $7E00EA               ;
+                                  ;
+LinkLayer = $7E00EE               ; Layer that Link is on. $00 = BG2 (upper) | $02 = BG1 (lower)
+                                  ;
+Joy1A_All = $7E00F0               ; Joypad input
+Joy2A_All = $7E00F1               ; All = Current & previous frame
+Joy1B_All = $7E00F2               ; New = Current frame
+Joy2B_All = $7E00F3               ; Old = Previous frame
+Joy1A_New = $7E00F4               ;
+Joy2A_New = $7E00F5               ;
+Joy1B_New = $7E00F6               ;
+Joy2B_New = $7E00F7               ;
+Joy1A_Old = $7E00F8               ;
+Joy2A_Old = $7E00F9               ;
+Joy1B_Old = $7E00FA               ;
+Joy2B_Old = $7E00FB               ;
 
-
-LinkPosY = $7E0020 ; 2 bytes
-LinkPosX = $7E0022 ; 2 bytes
-
-RoomIndex = $7E00A0 ; 2 bytes, UW room index
-
-;================================================================================
-; Bank 7E
-;--------------------------------------------------------------------------------
 ;================================================================================
 ; Mirrored WRAM
 ;--------------------------------------------------------------------------------
 ; Pages 0x00–0x1F of Bank7E are mirrored to every program bank ALTTP uses.
 ;--------------------------------------------------------------------------------
 
-CurrentMSUTrack = $7E010B
-CurrentVolume = $7E0127
-TargetVolume = $7E0129
-CurrentControlRequest = $7E0133 ; Last thing written to MusicControlRequest
-MusicControl = $7E012B
-MusicControlRequest = $7E012C
+CurrentMSUTrack = $7E010B         ;
+GameModeCache = $7E010C           ;
+GameSubModeCache = $7E010D        ;
+                                  ;
+MedallionFlag = $7E0112           ; Medallion cutscene flag. $01 = Cutscene active.
+                                  ;
+BG1ShakeV = $7E011A               ; Applied to BG Scroll. Word Length.
+BG1ShakeH = $7E011C               ;
+                                  ;
+CurrentVolume = $7E0127           ;
+TargetVolume = $7E0129            ;
+CurrentControlRequest = $7E0133   ; Last thing written to MusicControlRequest
+MusicControl = $7E012B            ;
+MusicControlRequest = $7E012C     ;
+SFX1 = $7E012D                    ;
+SFX2 = $7E012E                    ;
+SFX3 = $7E012F                    ;
+                                  ;
+SubModuleInterface = $7E0200      ; Word length. High byte expected to be $00.
+ItemCursor = $7E0202              ; Current location of the item menu cursor.
+                                  ;
+BottleMenuCounter = $7E0205       ; Step counter for opening bottle menu
+MenuFrameCounter = $7E0206        ; Incremented every menu frame. Never read.
+MenuBlink = $7E0207               ; Incremented every frame and masked with $10 to blink cursor
+                                  ;
+ItemReceiptID = $7E02D8           ;
+                                  ;
+BunnyFlag = $7E02E0               ; $00 = Link | $01 = Bunny
+                                  ;
+CutsceneFlag = $7E02E4            ; Flags various cutscenes. All non-zero behave the same.
+                                  ;
+ItemReceiptMethod = $7E02E9       ;
+                                  ;
+TileActBE = $7E02EF               ; Bitfield used by breakables and entrances. b b b b d d d d
+                                  ; b = Breakables | d = Entrances
+CurrentYItem = $7E0303            ;
+                                  ;
+                                  ;
+TileActDig = $7E035B              ; Bitfield used by diggable ground. Word length. High byte unused.
+                                  ;
+ForceSwordUp = $7E03EF            ; $01 = Force sword up pose.
+                                  ;
+ItemsTaken = $7E0403              ; Items taken in a room: b k u t s e h c
+                                  ; b = boss kill/item         | k = key/heart piece (prevents crystals)
+                                  ; u = 2nd key/heart piece    | t = chest 4/rupees/swamp drain/bomb floor/mire wall
+                                  ; s = chest 3/pod or dp wall | e, h, c = chest 2, 1, 0
+DungeonID = $7E040C               ; High byte mostly unused but sometimes read. Word length.
+                                  ;
+OWEntranceCutscene = $7E04C6      ;
+                                  ;
+HeartBeepTimer = $7E04CA          ;
+                                  ;
+NMIAux = $7E0632                  ; Stores long address of NMI jump. Currently only used by shops.
+                                  ;
+SkipOAM = $7E0710                 ; Set to skip OAM updates. High byte written $FF with exploding walls
+                                  ;
+BowDryFire = $7E0B9A              ; If set, arrows are deleted immediately
+                                  ;
+SaveFileIndex = $7E0B9D           ;
+                                  ;
+SpritePosYLow = $7E0D00           ; Sprite slot data. Each label has $10 bytes.
+SpritePosXLow = $7E0D10           ;
+SpritePosYHigh = $7E0D20          ;
+SpritePosXHigh = $7E0D30          ;
+SpriteVelocityY = $7E0D40         ;
+SpriteVelocityX = $7E0D50         ;
+                                  ;
+SpriteUnknown = $7E0D80           ; Don't know what this is
+                                  ;
+SpriteAuxTable = $7E0DA0          ; $20 bytes.
+SpriteGFXControl = $7E0DC0        ;
+SpriteAITable = $7E0DD0           ; AI state of sprites. $10 bytes.
+                                  ;
+SpriteTimer = $7E0DF0             ;
+                                  ;
+SpriteTypeTable = $7E0E20         ; Which sprite occupies this slot. $10 bytes.
+                                  ;
+SpriteItemType = $7E0E80          ; Sprite Item Type. $10 bytes.
+                                  ;
+SpriteDirectionTable = $7E0EB0    ; Sprite direction. $10 bytes.
+                                  ;
+FreezeSprites = $7E0FC1           ; "Seems to freeze sprites"
+                                  ;
+SpriteCoordCacheX = $7E0FD8       ;
+SpriteCoordCacheY = $7E0FDA       ;
+                                  ;
+NoMenu = $7E0FFC                  ; When set prevents menu, mirror, medallions
+                                  ;
+TextID = $7E1CF0                  ; Message ID and page. Word length.
+                                  ;
+ToastBuffer = $7E1E0E             ; Multiworld buffer. Word length.
+                                  ;
+MSUResumeTime = $7E1E6B           ; Mirrored MSU block
+MSUResumeControl = $7E1E6F        ;
+MSUFallbackTable = $7E1E70        ;
+MSUDelayedCommand = $7E1E79       ;
+MSUPackCount = $7E1E7A            ;
+MSUPackCurrent = $7E1E7B          ;
+MSUPackRequest = $7E1E7C          ;
+MSULoadedTrack = $7E1E7D          ;
+MSUResumeTrack = $7E1E7F          ;
 
-ItemReceiptID = $7E02D8
-
-NMIAux = $7E0632
-
-SpritePosYLow = $7E0D00 ; all $10 bytes
-SpritePosXLow = $7E0D10
-SpritePosYHigh = $7E0D20
-SpritePosXHigh = $7E0D30
-
-SpriteAuxTable = $7E0DA0 ; 0x1F bytes
-SpriteAITable = $7E0DD0
-
-SpriteTypeTable = $7E0E20
-
-SpriteDirectionTable = $7E0EB0
-
-ToastBuffer = $7E1E0E ; 2 bytes DoToast
-
-MSUResumeTime = $7E1E6B ; 4 bytes
-MSUResumeControl = $7E1E6F
-MSUFallbackTable = $7E1E70 ; 8 bytes
-MSUDelayedCommand = $7E1E79
-MSUPackCount = $7E1E7A
-MSUPackCurrent = $7E1E7B
-MSUPackRequest = $7E1E7C
-MSULoadedTrack = $7E1E7D ; 2 bytes
-MSUResumeTrack = $7E1E7F 
-
-;1E90
-ClockHours = $7E1E90 ; Clock Hours
-ClockMinutes = $7E1E94 ; Clock Minutes
-ClockSeconds = $7E1E98 ; Clock Seconds
-ClockBuffer = $7E1E9C ; Clock Temporary
-;1EA0
-ScratchBufferNV = $7E1EA0 ; Callee preserved
-;1EB0
-ScratchBufferV = $7E1EB0 ; Caller preserved
-;1EC0
-;1ED0
-;1EE0
-;1EF0
+ClockHours = $7E1E90              ; Clock Hours
+ClockMinutes = $7E1E94            ; Clock Minutes
+ClockSeconds = $7E1E98            ; Clock Seconds
+ClockBuffer = $7E1E9C             ; Clock Temporary
+ScratchBufferNV = $7E1EA0         ; Non-volatile scratch buffer. Must preserve values through return.
+ScratchBufferV = $7E1EB0          ; Volatile scratch buffer. Can clobber at will.
 
 ;================================================================================
 ; UNMIRRORED WRAM
@@ -102,24 +229,24 @@ ScratchBufferV = $7E1EB0 ; Caller preserved
 ; or absolute addressing with the appropriate data bank set
 ;--------------------------------------------------------------------------------
 
-TileUploadBuffer = $7EA180 ; 0x300 bytes
-SpriteOAM = $7EC025        ;
+TileUploadBuffer = $7EA180        ; 0x300 bytes
+SpriteOAM = $7EC025               ;
+                                  ; $7EC700 - Tile map buffer for HUD
+HUDKeyIcon = $7EC726              ;
+HUDGoalIndicator = $7EC72A        ;
+HUDPrizeIcon = $7EC742            ;
+HUDRupees = $7EC750               ;
+HUDBombCount = $7EC75A            ;
+HUDArrowCount = $7EC760           ;
+HUDKeyDigits = $7EC764            ;
 
-; $7EC700 - Tile map buffer for HUD
-
-HUDKeyIcon = $7EC726
-HUDGoalIndicator = $7EC72A
-HUDPrizeIcon = $7EC742
-HUDRupees = $7EC750
-HUDBombCount = $7EC75A
-HUDArrowCount = $7EC760
-HUDKeyDigits = $7EC764
-
-BigRAM = $7EC900           ; Big buffer of free ram (0x1F00)
+BigRAM = $7EC900                  ; Big buffer of free ram (0x1F00)
 
 ;================================================================================
 ; Bank 7F
 ;--------------------------------------------------------------------------------
+DecompressionBuffer = $7F0000      ; Decompression Buffer. $2000 bytes.
+
 base $7F5000
 RedrawFlag: skip 1                 ;
 skip 2                             ;
@@ -226,6 +353,9 @@ skip $40                           ; Unused
 skip $260                          ; Unused
 DialogBuffer: skip $100            ; Dialog Buffer
 
+MiniGameTime = $7FFE00             ; Time spent in mini game. 32-bits.
+MiniGameTimeFinal = $7FFE04        ; Final mini game time. 32 bits.
+
 ;================================================================================
 ; RAM Assertions
 ;--------------------------------------------------------------------------------
@@ -249,29 +379,98 @@ endmacro
 %assertRAM(Scrap0D, $7E000D)
 %assertRAM(Scrap0E, $7E000E)
 %assertRAM(Scrap0F, $7E000F)
-
-
+%assertRAM(GameMode, $7E0010)
+%assertRAM(GameSubMode, $7E0011)
+%assertRAM(FrameCounter, $7E001A)
+%assertRAM(IndoorsFlag, $7E001B)
 %assertRAM(LinkPosY, $7E0020)
 %assertRAM(LinkPosX, $7E0022)
+%assertRAM(LinkPosZ, $7E0024)
+%assertRAM(LinkRecoilY, $7E0027)
+%assertRAM(LinkRecoilX, $7E0028)
+%assertRAM(LinkRecoilZ, $7E0029)
+%assertRAM(LinkDirection, $7E002F)
+%assertRAM(OAMOffsetY, $7E0044)
+%assertRAM(OAMOffsetX, $7E0045)
+%assertRAM(LinkJumping, $7E004D)
+%assertRAM(BunnyFlagDP, $7E0056)
+%assertRAM(LinkSlipping, $7E005B)
+%assertRAM(FallTimer, $7E005C)
+%assertRAM(LinkState, $7E005D)
+%assertRAM(LinkSpeed, $7E005E)
+%assertRAM(OverworldIndex, $7E008A)
+%assertRAM(OverlayID, $7E008C)
 %assertRAM(RoomIndex, $7E00A0)
+%assertRAM(PreviousRoom, $7E00A2)
+%assertRAM(SubSubModule, $7E00B0)
+%assertRAM(ObjPtr, $7E00B7)
+%assertRAM(ObjPtrOffset, $7E00BA)
+%assertRAM(ScrapBufferBD, $7E00BD)
+%assertRAM(PlayerSpriteBank, $7E00BC)
+%assertRAM(FileSelectPosition, $7E00C8)
+%assertRAM(PasswordCodePosition, $7E00C8)
+%assertRAM(PasswordSelectPosition, $7E00C9)
+%assertRAM(BG1H, $7E00E0)
+%assertRAM(BG2H, $7E00E2)
+%assertRAM(BG3HOFSQL, $7E00E4)
+%assertRAM(BG1V, $7E00E6)
+%assertRAM(BG2V, $7E00E8)
+%assertRAM(BG3VOFSQL, $7E00EA)
+%assertRAM(LinkLayer, $7E00EE)
 %assertRAM(CurrentMSUTrack, $7E010B)
+%assertRAM(GameModeCache, $7E010C)
+%assertRAM(GameSubModeCache, $7E010D)
+%assertRAM(MedallionFlag, $7E0112)
+%assertRAM(BG1ShakeV, $7E011A)
+%assertRAM(BG1ShakeH, $7E011C)
 %assertRAM(CurrentVolume, $7E0127)
 %assertRAM(TargetVolume, $7E0129)
 %assertRAM(CurrentControlRequest, $7E0133)
 %assertRAM(MusicControl, $7E012B)
 %assertRAM(MusicControlRequest, $7E012C)
+%assertRAM(SFX1, $7E012D)
+%assertRAM(SFX2, $7E012E)
+%assertRAM(SFX3, $7E012F)
+%assertRAM(SubModuleInterface, $7E0200)
+%assertRAM(ItemCursor, $7E0202)
+%assertRAM(BottleMenuCounter, $7E0205)
+%assertRAM(MenuBlink, $7E0207)
 %assertRAM(ItemReceiptID, $7E02D8)
+%assertRAM(BunnyFlag, $7E02E0)
+%assertRAM(CutsceneFlag, $7E02E4)
+%assertRAM(ItemReceiptMethod, $7E02E9)
+%assertRAM(TileActBE, $7E02EF)
+%assertRAM(CurrentYItem, $7E0303)
+%assertRAM(TileActDig, $7E035B)
+%assertRAM(ForceSwordUp, $7E03EF)
+%assertRAM(ItemsTaken, $7E0403)
+%assertRAM(DungeonID, $7E040C)
+%assertRAM(OWEntranceCutscene, $7E04C6)
+%assertRAM(HeartBeepTimer, $7E04CA)
 %assertRAM(NMIAux, $7E0632)
+%assertRAM(SkipOAM, $7E0710)
+%assertRAM(BowDryFire, $7E0B9A)
+%assertRAM(SaveFileIndex, $7E0B9D)
 %assertRAM(SpritePosYLow, $7E0D00)
 %assertRAM(SpritePosXLow, $7E0D10)
 %assertRAM(SpritePosYHigh, $7E0D20)
 %assertRAM(SpritePosXHigh, $7E0D30)
+%assertRAM(SpriteVelocityY, $7E0D40)
+%assertRAM(SpriteVelocityX, $7E0D50)
+%assertRAM(SpriteUnknown, $7E0D80)
 %assertRAM(SpriteAuxTable, $7E0DA0)
+%assertRAM(SpriteGFXControl, $7E0DC0)
 %assertRAM(SpriteAITable, $7E0DD0)
+%assertRAM(SpriteTimer, $7E0DF0)
 %assertRAM(SpriteTypeTable, $7E0E20)
+%assertRAM(SpriteItemType, $7E0E80)
 %assertRAM(SpriteDirectionTable, $7E0EB0)
+%assertRAM(FreezeSprites, $7E0FC1)
+%assertRAM(SpriteCoordCacheX, $7E0FD8)
+%assertRAM(SpriteCoordCacheY, $7E0FDA)
+%assertRAM(NoMenu, $7E0FFC)
+%assertRAM(TextID, $7E1CF0)
 %assertRAM(ToastBuffer, $7E1E0E)
-
 %assertRAM(MSUResumeTime, $7E1E6B)
 %assertRAM(MSUResumeControl, $7E1E6F)
 %assertRAM(MSUFallbackTable, $7E1E70)
@@ -281,8 +480,6 @@ endmacro
 %assertRAM(MSUPackRequest, $7E1E7C)
 %assertRAM(MSULoadedTrack, $7E1E7D)
 %assertRAM(MSUResumeTrack, $7E1E7F)
-
-
 %assertRAM(ClockHours, $7E1E90)
 %assertRAM(ClockMinutes, $7E1E94)
 %assertRAM(ClockSeconds, $7E1E98)
@@ -299,6 +496,8 @@ endmacro
 %assertRAM(HUDArrowCount, $7EC760)
 %assertRAM(HUDKeyDigits, $7EC764)
 %assertRAM(BigRAM, $7EC900)
+
+%assertRAM(DecompressionBuffer, $7F0000)
 %assertRAM(RedrawFlag, $7F5000)
 %assertRAM(HexToDecDigit1, $7F5003)
 %assertRAM(HexToDecDigit2, $7F5004)
@@ -306,9 +505,6 @@ endmacro
 %assertRAM(HexToDecDigit4, $7F5006)
 %assertRAM(HexToDecDigit5, $7F5007)
 %assertRAM(SpriteSkipEOR, $7F5008)
-
-
-
 %assertRAM(AltTextFlag, $7F5035)
 %assertRAM(BossKills, $7F5037)
 %assertRAM(LagTime, $7F5038)
@@ -369,68 +565,7 @@ endmacro
 %assertRAM(TxStatus, $7F53FF)
 %assertRAM(CompassTotalsWRAM, $7F5410)
 %assertRAM(DialogBuffer, $7F5700)
-
+%assertRAM(MiniGameTime, $7FFE00)
+%assertRAM(MiniGameTimeFinal, $7FFE04)
 
 pullpc
-;================================================================================
-; Bank 7F
-;--------------------------------------------------------------------------------
-
-;OLDSTUFF
-; $7F5042 - Tile Upload Offset Override (Low)
-; $7F5043 - Tile Upload Offset Override (High)
-; $7F5044 - $7F5046 - NMI Auxiliary Function
-; $7F5047 - $7F504F - Unused
-; $7F5050 - $7F506F - Shop Block
-; $7F5070 - Reserved for OneMind
-; $7F5071 - Reserved for OneMind
-; $7F5072 - OneMind player ID
-; $7F5073 - $7F5074 - OneMind timer
-; $7F5075 - $7F507D - Unused
-; $7F507E - Clock Status
-; $7F507F - Always Zero
-; $7F5080 - $7F508F - unused
-; $7F5090 - RNG Item Lock-In
-; $7F5091 - Item Animation Busy Flag
-; $7F5092 - Potion Animation Busy Flags (Health)
-; $7F5093 - Potion Animation Busy Flags (Magic)
-; $7F5094 - Dialog Offset Pointer (Low)
-; $7F5095 - Dialog Offset Pointer (High)
-; $7F5096 - Dialog Offset Pointer Return (Low)
-; $7F5097 - Dialog Offset Pointer Return (High)
-; $7F5098 - Unused
-; $7F5099 - Last Entered Overworld Door ID
-; $7F509A - (Reserved)
-; $7F509B - Unused
-; $7F509C - Duck Map Flag
-; $7F509E - Valid Key Loaded
-; $7F509F - Text Box Defer Flag
-; $7F50A0 - $7F50AF - Unused
-
-; $7F50B0 - $7F50BF - Downstream Reserved (Enemizer)
-
-; $7F50C1 - Shield Modifier (Not Implemented)
-; $7F50C2 - Armor Modifier
-; $7F50C3 - Magic Modifier
-; $7F50C4 - Light Cone Modifier
-; $7F50C5 - Cucco Storm
-; $7F50C6 - Old Man Dash Modifier
-; $7F50C7 - Ice Physics Modifier
-; $7F50C8 - Infinite Arrows Modifier
-; $7F50C9 - Infinite Bombs Modifier
-; $7F50CA - Infinite Magic Modifier
-; $7F50CB - Invert D-Pad (Fill in values)
-; $7F50CC - OHKO Flag
-; $7F50CD - Sprite Swapper
-; $7F50CE - Boots Modifier (0=Off, 1=Always, 2=Never)
-
-; $7F50D0 - $7F50FF - Block Cypher Parameters
-; $7F5100 - $7F51FF - Block Cypher Buffer
-; $7F5200 - $7F52FF - RNG Pointer Block
-; $7F5300 - $7F53FF - Multiworld Block
-; $7F5400 - $7F540F - Unused
-; $7F5410 - $7F545F - Dungeon Tracking Block
-; $7F5460 - $7F56FF - Unused
-
-; $7F5700 - $7F57FF - Dialog Buffer
-
diff --git a/registers.asm b/registers.asm
index 0da5204..9c877d0 100644
--- a/registers.asm
+++ b/registers.asm
@@ -2,7 +2,7 @@
 ; SNES Registers
 ;===================================================================================================
 ; Note: This is almost entirely a copy from the JP 1.0 disassembly.
-;       See: https://github.com/spannerisms/jpdasm/ - 02/11/2022
+;       See: https://github.com/spannerisms/jpdasm/ - 19/11/2022
 ;--------------------------------------------------------------------------------
 
 
diff --git a/retro.asm b/retro.asm
index c68fab2..d3ac078 100644
--- a/retro.asm
+++ b/retro.asm
@@ -36,7 +36,7 @@ DecrementArrows:
 	.rupees
 		REP #$20
 		LDA.b RoomIndex : CMP.w #$0111 : SEP #$20 : BNE .not_archery_game
-			LDA.b $1B : BEQ .not_archery_game ; in overworld
+			LDA.b IndoorsFlag : BEQ .not_archery_game ; in overworld
 			LDA.w $0B9A : BEQ .shoot_arrow ; arrow game active
 			LDA.b #$00 : BRA .done
 		
diff --git a/rngfixes.asm b/rngfixes.asm
index 6ad59f6..f8c33db 100644
--- a/rngfixes.asm
+++ b/rngfixes.asm
@@ -2,11 +2,11 @@
 ; RNG Fixes
 ;--------------------------------------------------------------------------------
 RigDigRNG:
-	LDA.l $7FFE01 : CMP.l DiggingGameRNG : !BGE .forceHeart
+	LDA.l MiniGameTime+1 : CMP.l DiggingGameRNG : !BGE .forceHeart
 	.normalItem
 	JML GetRandomInt
 	.forceHeart
-	LDA.l $7FFE00 : BNE .normalItem
+	LDA.l MiniGameTime : BNE .normalItem
 	LDA.b #$04
 RTL
 ;--------------------------------------------------------------------------------
@@ -20,8 +20,8 @@ RigChestRNG:
 	JSL.l DecrementItemCounter
 RTL
 	.forceHeart
-	LDA.b #$33 : STA.b $C8 ; assure the correct state if player talked to shopkeeper
-	LDA.w $0403 : AND.b #$40 : BNE .notHeart
+	LDA.b #$33 : STA.b ScrapBufferBD+$0B ; assure the correct state if player talked to shopkeeper
+	LDA.w ItemsTaken : AND.b #$40 : BNE .notHeart
 	LDA.b #$07 ; give prize item
 RTL
 	.notHeart
diff --git a/save.asm b/save.asm
index 2b01731..5f7204d 100644
--- a/save.asm
+++ b/save.asm
@@ -14,10 +14,10 @@ WriteSaveChecksumAndBackup:
         STA.l InverseChecksumSRAM
 
         PHB
-        LDA.w #$14FF                ; \
-        LDX.w #CartridgeSRAM&$FFFF  ;  | Copies $1500 bytes from beginning of cart SRAM to 
-        LDY.w #SaveBackupSRAM&$FFFF ;  | $704000
-        MVN SRAMBank, SRAMBank      ; /
+        LDA.w #$14FF                  ; \
+        LDX.w #CartridgeSRAM&$FFFF    ;  | Copies $1500 bytes from beginning of cart SRAM to 
+        LDY.w #SaveBackupSRAM&$FFFF   ;  | $704000
+        MVN !SRAMBank, !SRAMBank      ; /
         PLB
 
 RTL
@@ -51,10 +51,10 @@ ValidateSRAM:
                         TDC : STA.l FileValiditySRAM ; Delete save by way of zeroing validity marker
                         BRA .goodchecksum : +
                 PHB
-                LDA.w #$14FF                ; \
-                LDX.w #SaveBackupSRAM&$FFFF ;  | Copies $1500 bytes from backup on cart SRAM to 
-                LDY.w #CartridgeSRAM&$FFFF  ;  | main save location at $700000
-                MVN SRAMBank, SRAMBank      ; /
+                LDA.w #$14FF                  ; \
+                LDX.w #SaveBackupSRAM&$FFFF   ;  | Copies $1500 bytes from backup on cart SRAM to 
+                LDY.w #CartridgeSRAM&$FFFF    ;  | main save location at $700000
+                MVN !SRAMBank, !SRAMBank      ; /
                 PLB
 
         .goodchecksum
diff --git a/servicerequest.asm b/servicerequest.asm
index 991a5af..9bf6bf0 100644
--- a/servicerequest.asm
+++ b/servicerequest.asm
@@ -58,13 +58,13 @@ endmacro
 ;--------------------------------------------------------------------------------
 macro ServiceRequestChest(type)
 	LDA.l TxStatus : BEQ + : CLC : RTL : + ; return fail if we don't have the lock
-		LDA.b $1B : STA.l TxBuffer+8 ; indoor/outdoor
+		LDA.b IndoorsFlag : STA.l TxBuffer+8 ; indoor/outdoor
 		BEQ +
 			LDA.b RoomIndex : STA.l TxBuffer+9 ; roomid low
 			LDA.b RoomIndex+1 : STA.l TxBuffer+10 ; roomid high
 			BRA ++
 		+
-			LDA.w $040A : STA.l TxBuffer+9 ; area id
+			LDA.b OverworldIndex : STA.l TxBuffer+9 ; area id
 			LDA.b #$00 : STA.l TxBuffer+10 ; protocol defines this as a ushort
 		++
 		LDA.b $76 : !SUB #$58 : STA.l TxBuffer+11 ; object index (type 2 only)
@@ -76,13 +76,13 @@ endmacro
 ;--------------------------------------------------------------------------------
 macro ServiceRequest(type,index)
 	LDA.l TxStatus : BEQ + : CLC : RTL : + ; return fail if we don't have the lock
-		LDA.b $1B : STA.l TxBuffer+8 ; indoor/outdoor
+		LDA.b IndoorsFlag : STA.l TxBuffer+8 ; indoor/outdoor
 		BEQ +
 			LDA.b RoomIndex : STA.l TxBuffer+9 ; roomid low
 			LDA.b RoomIndex+1 : STA.l TxBuffer+10 ; roomid high
 			BRA ++
 		+
-			LDA.w $040A : STA.l TxBuffer+9 ; area id
+			LDA.b OverworldIndex : STA.l TxBuffer+9 ; area id
 			LDA.b #$00 : STA.l TxBuffer+10 ; protocol defines this as a ushort
 		++
 		LDA.b #<index> : STA.l TxBuffer+11 ; object index (type 2 only)
@@ -111,7 +111,7 @@ PollService:
 			BRA .done
 		+ : CMP.b #!SCM_PROMPT : BNE + ; item prompt
 			LDA.l RxBuffer+8 : TAX
-			LDA.l RxBuffer+9 : STA.w $012E, X ; set sound effect
+			LDA.l RxBuffer+9 : STA.w SFX2, X ; set sound effect
 			REP #$30 ; set 16-bit accumulator and index registers
 				LDA.l RxBuffer+10 : TAX
 				LDA.l RxBuffer+12
diff --git a/shopkeeper.asm b/shopkeeper.asm
index bb365db..6731ab6 100644
--- a/shopkeeper.asm
+++ b/shopkeeper.asm
@@ -331,7 +331,7 @@ Shopkepeer_CallOriginal:
 	LDA.b #ShopkeeperJumpTable>>16 : PHA
 	LDA.b #ShopkeeperJumpTable>>8 : PHA
 	LDA.b #ShopkeeperJumpTable : PHA
-    LDA.w $0E80, X
+    LDA.w SpriteItemType, X
     JML.l UseImplicitRegIndexedLocalJumpTable
 ;--------------------------------------------------------------------------------
 Sprite_ShopKeeper:
@@ -370,7 +370,7 @@ RTL
 ;--------------------------------------------------------------------------------
 macro DrawMerchant(head,body,speed)
 	PHX : LDX.b #$00
-	LDA.b $1A : AND.b <speed> : BEQ +
+	LDA.b FrameCounter : AND.b <speed> : BEQ +
 		-
 			LDA.w .oam_shopkeeper_f1, X : STA.l BigRAM, X : INX
 		CPX.b #$10 : !BLT -
@@ -420,7 +420,7 @@ Shopkeeper_DrawMerchant_Type1:
 	LDA.b #$01 : STA.b Scrap06 ; request 1 OAM slot
 	LDA.b #$04 : JSL.l OAM_AllocateFromRegionA ; request 4 bytes
 	STZ.b Scrap07
-	LDA.b $1A : AND #$08 : BEQ +
+	LDA.b FrameCounter : AND #$08 : BEQ +
 		LDA.b #.oam_shopkeeper_f1 : STA.b Scrap08
 		LDA.b #.oam_shopkeeper_f1>>8 : STA.b Scrap09
 		BRA ++
@@ -464,8 +464,8 @@ Shopkeeper_SetupHitboxes:
 
 		JSR.w Setup_ShopItemInteractionHitbox
 		JSL.l Utility_CheckIfHitBoxesOverlapLong : BCC .no_interaction
-		    LDA.b $F6 : AND.b #$80 : BEQ .no_interaction ; check for A-press
-			LDA.b $10 : CMP.b #$0C : !BGE .no_interaction ; don't interact in other modes besides game action
+		    LDA.b Joy1B_New : AND.b #$80 : BEQ .no_interaction ; check for A-press
+			LDA.b GameMode : CMP.b #$0C : !BGE .no_interaction ; don't interact in other modes besides game action
 			JSR.w Shopkeeper_BuyItem
 		.no_interaction
 		INY #4
@@ -496,13 +496,13 @@ Shopkeeper_BuyItem:
 	        LDA.b #$7A
 	        LDY.b #$01
 	        JSL.l Sprite_ShowMessageUnconditional
-			LDA.b #$3C : STA.w $012E ; error sound
+			LDA.b #$3C : STA.w SFX2 ; error sound
 			JMP .done
 		.full_bottles
 	        LDA.b #$6B
 	        LDY.b #$01
 	        JSL.l Sprite_ShowMessageUnconditional
-			LDA.b #$3C : STA.w $012E ; error sound
+			LDA.b #$3C : STA.w SFX2 ; error sound
 			JMP .done
 		.buy
 			LDA.l ShopType : AND.b #$80 : BNE ++ ; don't charge if this is a take-any
@@ -544,7 +544,7 @@ Setup_ShopItemCollisionHitbox:
         SEP #$20 ; set 8-bit accumulator
 
         ; load shopkeeper X (16 bit)
-        LDA.w $0D30, X : XBA : LDA.w $0D10, X
+        LDA.w SpritePosXHigh, X : XBA : LDA.w SpritePosXLow, X
 
         REP #$20 ; set 16-bit accumulator
         PHA : PHY
@@ -561,7 +561,7 @@ Setup_ShopItemCollisionHitbox:
         STA.b Scrap04 : XBA : STA.b Scrap0A 
 
         ;load shopkeeper Y (16 bit)
-        LDA.w $0D20, X : XBA : LDA.w $0D00, X 
+        LDA.w SpritePosYHigh, X : XBA : LDA.w SpritePosYLow, X 
 
         REP #$20 ; set 16-bit accumulator
         PHY : INY #2
@@ -624,7 +624,7 @@ RTS
 Sprite_HaltSpecialPlayerMovementCopied:
         PHX      
         JSL Sprite_NullifyHookshotDrag
-        STZ $5E ; Set Link's speed to zero...
+        STZ.b LinkSpeed ; Set Link's speed to zero...
         JSL Player_HaltDashAttackLong
         PLX
 RTS
diff --git a/spriteswap.asm b/spriteswap.asm
index b37fe03..c5e34f8 100644
--- a/spriteswap.asm
+++ b/spriteswap.asm
@@ -1,5 +1,5 @@
 org $008A01 ; 0xA01 - Bank00.asm (LDA.b #$10 : STA $4304 : STA $4314 : STA $4324)
-LDA.b $BC
+LDA.b PlayerSpriteBank
 
 org $1BEDF9
 JSL SpriteSwap_Palette_ArmorAndGloves ;4bytes
@@ -16,9 +16,9 @@ org $BF8000
 SwapSpriteIfNecessary:
 	PHP
 		SEP #$20 ; set 8-bit accumulator
-		LDA.l SpriteSwapper : BEQ + : !ADD #!BANK_BASE : CMP.b $BC : BEQ +
-			STA.b $BC
-		    STZ.w $0710 ; Set Normal Sprite NMI
+		LDA.l SpriteSwapper : BEQ + : !ADD #!BANK_BASE : CMP.b PlayerSpriteBank : BEQ +
+			STA.b PlayerSpriteBank
+		    STZ.w SkipOAM ; Set Normal Sprite NMI
 			JSL.l SpriteSwap_Palette_ArmorAndGloves_part_two
 		+
 	PLP
@@ -28,7 +28,7 @@ SpriteSwap_Palette_ArmorAndGloves:
 {
     ;DEDF9
     LDA.l SpriteSwapper : BNE .continue
-        LDA.b #$10 : STA.b $BC ; Load Original Sprite Location
+        LDA.b #$10 : STA.b PlayerSpriteBank ; Load Original Sprite Location
         REP #$21
         LDA.l ArmorEquipment
         JSL $1BEDFF ; Read Original Palette Code
@@ -60,7 +60,7 @@ SpriteSwap_Palette_ArmorAndGloves:
     
     TXY : TAX
     
-    LDA.b $BC : AND.w #$00FF : STA.b Scrap02
+    LDA.b PlayerSpriteBank : AND.w #$00FF : STA.b Scrap02
 
 .loop
 
diff --git a/sram.asm b/sram.asm
index 74fed05..971d805 100644
--- a/sram.asm
+++ b/sram.asm
@@ -425,8 +425,8 @@ base off
 ; If these move (most likely by placing initsramtable.asm somewhere else) these
 ; bank definitions need to be changed as well.
 ;================================================================================
-SRAMBank = $70
-SRAMTableBank = $30|$80
+!SRAMBank = $70
+!SRAMTableBank = $30|$80
 
 ;================================================================================
 ; Assertions
diff --git a/stats.asm b/stats.asm
index 36b97dc..b4405cf 100644
--- a/stats.asm
+++ b/stats.asm
@@ -16,7 +16,7 @@ RTL
 StatSaveCounter:
 	PHA
 		LDA.l StatsLocked : BNE +
-		LDA.b $10 : CMP.b #$17 : BNE + ; not a proper s&q, link probably died
+		LDA.b GameMode : CMP.b #$17 : BNE + ; not a proper s&q, link probably died
 		LDA.l SaveQuitCounter : INC
 		CMP.b #100 : BEQ + ; decimal 100
 			STA.l SaveQuitCounter
@@ -55,7 +55,7 @@ DungeonExitTransition:
 		JSL Player_HaltDashAttackLong
 		LDA.b #$00 : STA.w $0301 ; stop item dashing
 	+
-	LDA.b #$0F : STA.b $10 ; stop running through the transition
+	LDA.b #$0F : STA.b GameMode ; stop running through the transition
 StatTransitionCounter:
 	PHA : PHP
 		LDA.l StatsLocked : BNE +
@@ -93,7 +93,7 @@ IncrementSmallKeysNoPrimary:
 			JSL AddInventory_incrementKeyLong
 		+
 		JSL.l UpdateKeys
-		LDA.b $1B : BEQ + ; skip room check if outdoors
+		LDA.b IndoorsFlag : BEQ + ; skip room check if outdoors
 			PHP : REP #$20 ; set 16-bit accumulator
 				LDA.w $048E : CMP.w #$0087 : BNE ++ ; hera basement
 					PLP : PHY : LDY.b #$24 : JSL.l FullInventoryExternal
@@ -116,13 +116,13 @@ RTL
 ;--------------------------------------------------------------------------------
 CountChestKey: ; called by neighbor functions
 	PHA : PHX
-		CPY.b #$24 : BEQ +  ; small key for this dungeon - use $040C
+		CPY.b #$24 : BEQ +  ; small key for this dungeon - use DungeonID
 			CPY.b #$A0 : !BLT .end ; Ignore most items
 			CPY.b #$AE : !BGE .end ; Ignore reserved key and generic key
 			TYA : AND.B #$0F : BNE ++ ; If this is an HC key, instead count it as a sewers key
 				INC
-			++ TAX : BRA .count  ; use Key id instead of $040C (Keysanity)
-		+ LDA.w $040C : LSR
+			++ TAX : BRA .count  ; use Key id instead of DungeonID (Keysanity)
+		+ LDA.w DungeonID : LSR
 		BNE +
 			INC ; combines HC and Sewer counts
 		+ TAX
@@ -182,7 +182,7 @@ IncrementChestTurnCounter:
 RTL
 ;--------------------------------------------------------------------------------
 IncrementChestCounter:
-	LDA.b #$01 : STA.w $02E9 ; thing we wrote over
+	LDA.b #$01 : STA.w ItemReceiptMethod ; thing we wrote over
 	PHA
 		LDA.l StatsLocked : BNE +
 			LDA.l ChestsOpened : INC : STA.l ChestsOpened
@@ -289,7 +289,7 @@ IncrementUWMirror:
 	PHA
 		LDA.b #$00 : STA.l $7F5035 ; bandaid patch bug with mirroring away from text
 		LDA.l StatsLocked : BNE +
-		LDA.w $040C : CMP.b #$FF : BEQ + ; skip if we're in a cave or house
+		LDA.w DungeonID : CMP.b #$FF : BEQ + ; skip if we're in a cave or house
 			LDA.l UnderworldMirrors : INC : STA.l UnderworldMirrors
 			JSL.l StatTransitionCounter
 		+
@@ -350,9 +350,9 @@ StatsFinalPrep:
 
 		.done
 	PLP : PLX : PLA
-	LDA.b #$19 : STA.b $10 ; thing we wrote over, load triforce room
-        STZ.b $11
-        STZ.b $B0
+	LDA.b #$19 : STA.b GameMode ; thing we wrote over, load triforce room
+        STZ.b GameSubMode
+        STZ.b SubSubModule
 RTL
 ;--------------------------------------------------------------------------------
 ; Notes:
diff --git a/swordswap.asm b/swordswap.asm
index 1dfc790..bdc315c 100644
--- a/swordswap.asm
+++ b/swordswap.asm
@@ -4,7 +4,7 @@
 ;$03348E: smith sword check (to see if uprade-able)
 ;================================================================================
 LoadSwordForDamage:
-	LDA.w $0E20, X : CMP.b #$88 : BNE .notMoth
+	LDA.w SpriteTypeTable, X : CMP.b #$88 : BNE .notMoth
 		JSR.w LoadModifiedSwordLevel ; load normal sword value
 		CMP.b #$04 : !BLT + : DEC : + ; if it's gold sword, change it to tempered
 		RTL
@@ -66,17 +66,17 @@ RTL
 ; $7E0348 - Ice Value
 LoadModifiedIceFloorValue_a11:
 	LDA.b RoomIndex : CMP.b #$91 : BEQ + : CMP.b #$92 : BEQ + : CMP.b #$93 : BEQ + ; mire basement currently broken - not sure why
-	LDA.b $5D : CMP.b #$01 : BEQ + : CMP.b #$17 : BEQ + : CMP.b #$1C : BEQ +
-	LDA.b $5E : CMP.b #$02 : BEQ +  
-	LDA.b $5B : BNE +  
+	LDA.b LinkState : CMP.b #$01 : BEQ + : CMP.b #$17 : BEQ + : CMP.b #$1C : BEQ +
+	LDA.b LinkSpeed : CMP.b #$02 : BEQ +  
+	LDA.b LinkSlipping : BNE +  
 		LDA.w $0348 : ORA.l IceModifier : AND.b #$11 : RTL  
 	+ : LDA.w $0348 : AND.b #$11  
 RTL  
 LoadModifiedIceFloorValue_a01:  
 	LDA.b RoomIndex : CMP.b #$91 : BEQ + : CMP.b #$92 : BEQ + : CMP.b #$93 : BEQ + ; mire basement currently broken - not sure why
-	LDA.b $5D : CMP.b #$01 : BEQ + : CMP.b #$17 : BEQ + : CMP.b #$1C : BEQ +
-	LDA.b $5E : CMP.b #$02 : BEQ +
-	LDA.b $5B : BNE +
+	LDA.b LinkState : CMP.b #$01 : BEQ + : CMP.b #$17 : BEQ + : CMP.b #$1C : BEQ +
+	LDA.b LinkSpeed : CMP.b #$02 : BEQ +
+	LDA.b LinkSlipping : BNE +
 		LDA.w $0348 : ORA.l IceModifier : AND.b #$01 : RTL
 	+ : LDA.w $0348 : AND.b #$01
 RTL
@@ -98,10 +98,10 @@ RTL
 ;================================================================================
 CheckGanonHammerDamage:
 	LDA.l HammerableGanon : BEQ +
-	LDA.w $0E20, X : CMP.b #$D8 ; original behavior except ganon
+	LDA.w SpriteTypeTable, X : CMP.b #$D8 ; original behavior except ganon
 RTL
 	+
-	LDA.w $0E20, X : CMP.b #$D6 ; original behavior
+	LDA.w SpriteTypeTable, X : CMP.b #$D6 ; original behavior
 RTL
 ;================================================================================
 GetSmithSword:
@@ -122,7 +122,7 @@ GetSmithSword:
 
 	.buy
 		LDA.l SmithItem : TAY
-		STZ.w $02E9 ; Item from NPC
+		STZ.w ItemReceiptMethod ; Item from NPC
 		PHX : JSL Link_ReceiveItem : PLX
 
 		REP #$20 : LDA.l CurrentRupees : !SUB.w #$000A : STA.l CurrentRupees : SEP #$20 ; Take 10 rupees
@@ -133,7 +133,7 @@ GetSmithSword:
 ;================================================================================
 CheckMedallionSword:
 	LDA.l AllowSwordlessMedallionUse : BEQ .check_sword
-	CMP #$01 : BEQ .check_pad
+	CMP.b #$01 : BEQ .check_pad
 		LDA.b #$02 ; Pretend we have master sword
 		RTL
 	.check_sword
@@ -141,31 +141,31 @@ CheckMedallionSword:
 		RTL
 	.check_pad
 		PHB : PHX : PHY
-		LDA.b $1B : BEQ .outdoors
+		LDA.b IndoorsFlag : BEQ .outdoors
 		.indoors
 			REP #$20 ; set 16-bit accumulator
 			LDA.b RoomIndex ; load room ID
 			CMP.w #$000E : BNE + ; freezor1
-				LDA.b $22 : AND.w #$01FF ; check x-coord
+				LDA.b LinkPosX : AND.w #$01FF ; check x-coord
 					CMP.w #368-8 : !BLT .normal
 					CMP.w #368+32-8 : !BGE .normal
-				LDA.b $20 : AND.w #$01FF ; check y-coord
+				LDA.b LinkPosY : AND.w #$01FF ; check y-coord
 					CMP.w #400-22 : !BLT .normal
 					CMP.w #400+32-22 : !BGE .normal
 				JMP .permit
 			+ : CMP.w #$007E : BNE + ; freezor2
-				LDA.b $22 : AND.w #$01FF ; check x-coord
+				LDA.b LinkPosX : AND.w #$01FF ; check x-coord
 					CMP.w #112-8 : !BLT .normal
 					CMP.w #112+32-8 : !BGE .normal
-				LDA.b $20 : AND.w #$01FF ; check y-coord
+				LDA.b LinkPosY : AND.w #$01FF ; check y-coord
 					CMP.w #400-22 : !BLT .normal
 					CMP.w #400+32-22 : !BGE .normal
 				JMP .permit
 			+ : CMP.w #$00DE : BNE + ; kholdstare
-				LDA.b $22 : AND.w #$01FF ; check x-coord
+				LDA.b LinkPosX : AND.w #$01FF ; check x-coord
 					CMP.w #368-8 : !BLT .normal
 					CMP.w #368+32-8 : !BGE .normal
-				LDA.b $20 : AND.w #$01FF ; check y-coord
+				LDA.b LinkPosY : AND.w #$01FF ; check y-coord
 					CMP.w #144-22 : !BLT .normal
 					CMP.w #144+32-22 : !BGE .normal
 				BRA .permit
@@ -173,14 +173,14 @@ CheckMedallionSword:
 			SEP #$20 ; set 8-bit accumulator
 			BRA .done
 		.outdoors
-			LDA.b $8A : CMP.b #$70 : BNE +
-				LDA.l MireRequiredMedallion : TAX : LDA.l .medallion_type, X : CMP.w $0303 : BNE .done
+			LDA.b OverworldIndex : CMP.b #$70 : BNE +
+				LDA.l MireRequiredMedallion : TAX : LDA.l .medallion_type, X : CMP.w CurrentYItem : BNE .done
 				LDA.l OverworldEventDataWRAM+$70 : AND.b #$20 : BNE .done
 				LDA.b #$08 : PHA : PLB ; set data bank to $08
 				LDY.b #$02 : JSL.l Ancilla_CheckIfEntranceTriggered : BCS .permit ; misery mire
 				BRA .done
 			+ : CMP.b #$47 : BNE +
-				LDA.l TRockRequiredMedallion : TAX : LDA.l .medallion_type, X : CMP.w $0303 : BNE .done
+				LDA.l TRockRequiredMedallion : TAX : LDA.l .medallion_type, X : CMP.w CurrentYItem : BNE .done
 				LDA.l OverworldEventDataWRAM+$47 : AND.b #$20 : BNE .done
 				LDA.b #$08 : PHA : PLB ; set data bank to $08
 				LDY.b #$03 : JSL.l Ancilla_CheckIfEntranceTriggered : BCS .permit ; turtle rock
diff --git a/tablets.asm b/tablets.asm
index cd45bb0..2a088ee 100644
--- a/tablets.asm
+++ b/tablets.asm
@@ -20,7 +20,7 @@ RTL
 SetTabletItem:
 	JSL.l GetSpriteID
 	PHA
-		LDA.b $8A : CMP.b #$03 : BEQ .ether ; if we're on the map where ether is, we're the ether tablet
+		LDA.b OverworldIndex : CMP.b #$03 : BEQ .ether ; if we're on the map where ether is, we're the ether tablet
 		.bombos
 		JSL.l ItemSet_BombosTablet : BRA .done
 		.ether
@@ -33,36 +33,36 @@ SpawnTabletItem:
 	JSL.l LoadOutdoorValue
 	PHA
 	JSL.l PrepDynamicTile
-	
+
 	JSL.l SetTabletItem
-	
+
 	LDA.b #$EB
-	STA.l $7FFE00
+	STA.l MiniGameTime
 	JSL Sprite_SpawnDynamically
 
-	PLA : STA.w $0E80, Y ; Store item type
-	LDA.b $22 : STA.w $0D10, Y
-	LDA.b $23 : STA.w $0D30, Y
+	PLA : STA.w SpriteItemType, Y ; Store item type
+	LDA.b LinkPosX   : STA.w SpritePosXLow, Y
+	LDA.b LinkPosX+1 : STA.w SpritePosXHigh, Y
   
-	LDA.b $20 : STA.w $0D00, Y
-	LDA.b $21 : STA.w $0D20, Y
+	LDA.b LinkPosY   : STA.w SpritePosYLow, Y
+	LDA.b LinkPosY+1 : STA.w SpritePosYHigh, Y
 
 	LDA.b #$00 : STA.w $0F20, Y
-	
+
 	LDA.b #$7F : STA.w $0F70, Y ; spawn WAY up high
 RTL
 ;--------------------------------------------------------------------------------
 MaybeUnlockTabletAnimation:
 	PHA : PHP
 		JSL.l IsMedallion : BCC +
-			STZ $0112 ; disable falling-medallion mode
-			STZ $03EF ; release link from item-up pose
-			LDA.b #$00 : STA.b $5D ; set link to ground state
+			STZ.w MedallionFlag ; disable falling-medallion mode
+			STZ.w ForceSwordUp ; release link from item-up pose
+			LDA.b #$00 : STA.b LinkState ; set link to ground state
 
 			REP #$20 ; set 16-bit accumulator
-				LDA.b $8A : CMP.w #$0030 : BNE ++ ; Desert
+				LDA.b OverworldIndex : CMP.w #$0030 : BNE ++ ; Desert
 					SEP #$20 ; set 8-bit accumulator
-					LDA.b #$02 : STA.b $2F ; face link forward
+					LDA.b #$02 : STA.b LinkDirection ; face link forward
 					LDA.b #$3C : STA.b $46 ; lock link for 60f
 				++
 			SEP #$20 ; set 8-bit accumulator
@@ -72,15 +72,15 @@ RTL
 ;--------------------------------------------------------------------------------
 IsMedallion:
 	REP #$20 ; set 16-bit accumulator
-	LDA.b $8A
+	LDA.b OverworldIndex
 	CMP.w #$03 : BNE + ; Death Mountain
-		LDA.b $22 : CMP.w #1890 : !BGE ++
+		LDA.b LinkPosX : CMP.w #1890 : !BGE ++
 			SEC
 			JMP .done
 		++
 		BRA .false
 	+ CMP.w #$30 : BNE + ; Desert
-		LDA.b $22 : CMP.w #512 : !BLT ++
+		LDA.b LinkPosX : CMP.w #512 : !BLT ++
 			SEC
 			JMP .done
 		++
diff --git a/textrenderer.asm b/textrenderer.asm
index 3b8d07b..c053dd2 100644
--- a/textrenderer.asm
+++ b/textrenderer.asm
@@ -5,8 +5,8 @@ RenderCharSetColorExtended_init:
 
 RenderCharSetColorExtended_close:
     stz.b Scrap0C
-    lda.w $010c
-    sta.b $10
+    lda.w GameModeCache
+    sta.b GameMode
     rtl
 
 RenderCharSetColorExtended:
diff --git a/timer.asm b/timer.asm
index cbc2bf4..d2bc2ba 100644
--- a/timer.asm
+++ b/timer.asm
@@ -157,7 +157,7 @@ DrawChallengeTimer:
 			LDA.w ClockSeconds+2 : STA.l $7EC7A2
 			LDA.w ClockSeconds : STA.l $7EC7A4
 		++
-		LDA.b $1A : AND.w #$001F : BNE + : JSR CalculateTimer : +
+		LDA.b FrameCounter : AND.w #$001F : BNE + : JSR CalculateTimer : +
 
 RTL
 ;--------------------------------------------------------------------------------
diff --git a/utilities.asm b/utilities.asm
index 36f2201..eac5297 100644
--- a/utilities.asm
+++ b/utilities.asm
@@ -504,23 +504,23 @@ Sprite_IsOnscreen:
     JSR _Sprite_IsOnscreen_DoWork
 	BCS +
 		REP #$20
-		LDA.b $E2 : PHA : !SUB.w #$0F : STA.b $E2
-		LDA.b $E8 : PHA : !SUB.w #$0F : STA.b $E8
+		LDA.b BG2H : PHA : !SUB.w #$0F : STA.b BG2H
+		LDA.b BG2V : PHA : !SUB.w #$0F : STA.b BG2V
 		SEP #$20
 			JSR _Sprite_IsOnscreen_DoWork
 		REP #$20
-		PLA : STA.b $E8
-		PLA : STA.b $E2
+		PLA : STA.b BG2V
+		PLA : STA.b BG2H
 		SEP #$20
 	+
 RTL
 
 _Sprite_IsOnscreen_DoWork:
-    LDA.w $0D10, X : CMP.b $E2
-    LDA.w $0D30, X : SBC.b $E3 : BNE .offscreen
+    LDA.w SpritePosXLow, X : CMP.b BG2H
+    LDA.w SpritePosXHigh, X : SBC.b $E3 : BNE .offscreen
 
-    LDA.w $0D00, X : CMP.b $E8
-    LDA.w $0D20, X : SBC.b $E9 : BNE .offscreen
+    LDA.w SpritePosYLow, X : CMP.b BG2V
+    LDA.w SpritePosYHigh, X : SBC.b $E9 : BNE .offscreen
 	SEC
 RTS
 	.offscreen
@@ -542,13 +542,13 @@ Sprite_GetScreenRelativeCoords:
 
 	STA.b Scrap08
 
-	LDA.w $0D00, X : STA.b Scrap00
-	!SUB $E8       : STA.b Scrap06
-	LDA.w $0D20, X : STA.b Scrap01
+	LDA.w SpritePosYLow, X : STA.b Scrap00
+	!SUB.b BG2V       : STA.b Scrap06
+	LDA.w SpritePosYHigh, X : STA.b Scrap01
 
-	LDA.w $0D10, X : STA.b Scrap02 
-	!SUB $E2       : STA.b Scrap07
-	LDA.w $0D30, X : STA.b Scrap03
+	LDA.w SpritePosXLow, X : STA.b Scrap02 
+	!SUB.b BG2H       : STA.b Scrap07
+	LDA.w SpritePosXHigh, X : STA.b Scrap03
 RTL
 ;--------------------------------------------------------------------------------
 

From da8576546de33cfea0412c46d0b270fbead4bb5e Mon Sep 17 00:00:00 2001
From: cassidoxa <cassidymoen@gmx.com>
Date: Tue, 22 Nov 2022 01:02:16 -0500
Subject: [PATCH 05/11] Move binary data to new data directory

---
 LTTP_RND_GeneralBugfixes.asm                  |  40 +++++++++---------
 99ff1_bombos.gfx => data/99ff1_bombos.gfx     | Bin
 99ff1_quake.gfx => data/99ff1_quake.gfx       | Bin
 a6fc4_bombos.gfx => data/a6fc4_bombos.gfx     | Bin
 a6fc4_ether.gfx => data/a6fc4_ether.gfx       | Bin
 bossicons.4bpp => data/bossicons.4bpp         | Bin
 bsodencode.txt => data/bsodencode.txt         |   0
 bsodfont.1bpp => data/bsodfont.1bpp           | Bin
 bsodhex.2bpp => data/bsodhex.2bpp             | Bin
 c2807_v3.bin => data/c2807_v3.bin             | Bin
 c2807_v3.gfx => data/c2807_v3.gfx             | Bin
 c2807_v4.bin => data/c2807_v4.bin             | Bin
 c2807_v4.gfx => data/c2807_v4.gfx             | Bin
 c2e3e.bin => data/c2e3e.bin                   | Bin
 c2e3e.gfx => data/c2e3e.gfx                   | Bin
 credits.txt => data/credits.txt               |   0
 .../creditscharmapbighi.txt                   |   0
 .../creditscharmapbiglo.txt                   |   0
 .../creditscharmapsmall_green.txt             |   0
 .../creditscharmapsmall_red.txt               |   0
 .../creditscharmapsmall_yellow.txt            |   0
 damage_table.bin => data/damage_table.bin     | Bin
 eventitems.bin => data/eventitems.bin         | Bin
 eventitems.gfx => data/eventitems.gfx         | Bin
 fileselect.chr.gfx => data/fileselect.chr.gfx | Bin
 hudpalette.pal => data/hudpalette.pal         | Bin
 i18n_en.bin => data/i18n_en.bin               | Bin
 ice_bombos.bin => data/ice_bombos.bin         | Bin
 .../ice_palace_floor.bin                      | Bin
 map_icons.gfx => data/map_icons.gfx           | Bin
 newfont.bin => data/newfont.bin               | Bin
 .../newfont_inverted.bin                      | Bin
 newitems.bin => data/newitems.bin             | Bin
 newitems.gfx => data/newitems.gfx             | Bin
 newitems.pal => data/newitems.pal             | Bin
 newitems2.bin => data/newitems2.bin           | Bin
 newitems2.gfx => data/newitems2.gfx           | Bin
 output.txt => data/output.txt                 |   0
 sheet178.gfx => data/sheet178.gfx             | Bin
 sheet73.bin => data/sheet73.bin               | Bin
 sheet73.gfx => data/sheet73.gfx               | Bin
 .../text_unscramble1.bin                      | Bin
 .../text_unscramble2.bin                      | Bin
 zsnes_pal.bin => data/zsnes_pal.bin           | Bin
 zsnes_tilemap.bin => data/zsnes_tilemap.bin   | Bin
 zsnes_tiles.bin => data/zsnes_tiles.bin       | Bin
 failure.asm                                   |   6 +--
 stats/credits.asm                             |  14 +++---
 48 files changed, 30 insertions(+), 30 deletions(-)
 rename 99ff1_bombos.gfx => data/99ff1_bombos.gfx (100%)
 rename 99ff1_quake.gfx => data/99ff1_quake.gfx (100%)
 rename a6fc4_bombos.gfx => data/a6fc4_bombos.gfx (100%)
 rename a6fc4_ether.gfx => data/a6fc4_ether.gfx (100%)
 rename bossicons.4bpp => data/bossicons.4bpp (100%)
 rename bsodencode.txt => data/bsodencode.txt (100%)
 rename bsodfont.1bpp => data/bsodfont.1bpp (100%)
 rename bsodhex.2bpp => data/bsodhex.2bpp (100%)
 rename c2807_v3.bin => data/c2807_v3.bin (100%)
 rename c2807_v3.gfx => data/c2807_v3.gfx (100%)
 rename c2807_v4.bin => data/c2807_v4.bin (100%)
 rename c2807_v4.gfx => data/c2807_v4.gfx (100%)
 rename c2e3e.bin => data/c2e3e.bin (100%)
 rename c2e3e.gfx => data/c2e3e.gfx (100%)
 rename credits.txt => data/credits.txt (100%)
 rename creditscharmapbighi.txt => data/creditscharmapbighi.txt (100%)
 rename creditscharmapbiglo.txt => data/creditscharmapbiglo.txt (100%)
 rename creditscharmapsmall_green.txt => data/creditscharmapsmall_green.txt (100%)
 rename creditscharmapsmall_red.txt => data/creditscharmapsmall_red.txt (100%)
 rename creditscharmapsmall_yellow.txt => data/creditscharmapsmall_yellow.txt (100%)
 rename damage_table.bin => data/damage_table.bin (100%)
 rename eventitems.bin => data/eventitems.bin (100%)
 rename eventitems.gfx => data/eventitems.gfx (100%)
 rename fileselect.chr.gfx => data/fileselect.chr.gfx (100%)
 rename hudpalette.pal => data/hudpalette.pal (100%)
 rename i18n_en.bin => data/i18n_en.bin (100%)
 rename ice_bombos.bin => data/ice_bombos.bin (100%)
 rename ice_palace_floor.bin => data/ice_palace_floor.bin (100%)
 rename map_icons.gfx => data/map_icons.gfx (100%)
 rename newfont.bin => data/newfont.bin (100%)
 rename newfont_inverted.bin => data/newfont_inverted.bin (100%)
 rename newitems.bin => data/newitems.bin (100%)
 rename newitems.gfx => data/newitems.gfx (100%)
 rename newitems.pal => data/newitems.pal (100%)
 rename newitems2.bin => data/newitems2.bin (100%)
 rename newitems2.gfx => data/newitems2.gfx (100%)
 rename output.txt => data/output.txt (100%)
 rename sheet178.gfx => data/sheet178.gfx (100%)
 rename sheet73.bin => data/sheet73.bin (100%)
 rename sheet73.gfx => data/sheet73.gfx (100%)
 rename text_unscramble1.bin => data/text_unscramble1.bin (100%)
 rename text_unscramble2.bin => data/text_unscramble2.bin (100%)
 rename zsnes_pal.bin => data/zsnes_pal.bin (100%)
 rename zsnes_tilemap.bin => data/zsnes_tilemap.bin (100%)
 rename zsnes_tiles.bin => data/zsnes_tiles.bin (100%)

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 00d628e..8eb4d4a 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -103,7 +103,7 @@ incsrc icepalacegraphics.asm
 warnpc $A18000
 
 org $1C8000 ; text tables for translation
-incbin i18n_en.bin
+incbin "data/i18n_en.bin"
 warnpc $1CF356
 
 org $A18000 ; static mapping area
@@ -178,84 +178,84 @@ incsrc spc.asm
 
 org $318000 ; bank #$31
 GFX_Mire_Bombos:
-incbin 99ff1_bombos.gfx
+incbin "data/99ff1_bombos.gfx"
 warnpc $318800
 
 org $318800
 GFX_Mire_Quake:
-incbin 99ff1_quake.gfx
+incbin "data/99ff1_quake.gfx"
 warnpc $319000
 
 org $319000
 GFX_TRock_Bombos:
-incbin a6fc4_bombos.gfx
+incbin "data/a6fc4_bombos.gfx"
 warnpc $319800
 
 org $319800
 GFX_TRock_Ether:
-incbin a6fc4_ether.gfx
+incbin "data/a6fc4_ether.gfx"
 warnpc $31A000
 
 org $31A000
 GFX_HUD_Items:
-incbin c2807_v4.gfx
+incbin "data/c2807_v4.gfx"
 warnpc $31A800
 
 org $31A800
 GFX_New_Items:
-incbin newitems.gfx
+incbin "data/newitems.gfx"
 ;incbin eventitems.gfx ; *EVENT*
 warnpc $31B000
 
 org $31B000
 GFX_HUD_Main:
-incbin c2e3e.gfx
+incbin "data/c2e3e.gfx"
 warnpc $31B800
 
 org $31C000
 IcePalaceFloorGfx:
-incbin ice_palace_floor.bin
+incbin "data/ice_palace_floor.bin"
 warnpc $31C801
 
 org $31C800
 Damage_Table:
-incbin damage_table.bin
+incbin "data/damage_table.bin"
 warnpc $31D001
 
 org $31D000
 FileSelectNewGraphics:
-incbin fileselect.chr.gfx
+incbin "data/fileselect.chr.gfx"
 warnpc $31E001
 
 org $31E000
 InvertedCastleHole: ;address used by front end. DO NOT MOVE!
-incbin sheet73.gfx
+incbin "data/sheet73.gfx"
 warnpc $31E501
 
 org $338000
 GFX_HUD_Palette:
-incbin hudpalette.pal
+incbin "data/hudpalette.pal"
 warnpc $338041
 
 org $339000
-incbin sheet178.gfx
+incbin "data/sheet178.gfx"
 warnpc $339600
 
 org $339600
 BossMapIconGFX:
-incbin bossicons.4bpp
+incbin "data/bossicons.4bpp"
 
 if !FEATURE_NEW_TEXT
     org $339C00
     NewFont:
-    incbin newfont.bin
+    incbin "data/newfont.bin"
     NewFontInverted:
-    incbin newfont_inverted.bin
+    incbin "data/newfont_inverted.bin"
 
     org $0CD7DF
-    incbin text_unscramble1.bin
+    incbin "data/text_unscramble1.bin"
     org $0CE4D5
-    incbin text_unscramble2.bin
+    incbin "data/text_unscramble2.bin"
 endif
 
 org $328000
@@ -265,7 +265,7 @@ incsrc itemtext.asm
 incsrc externalhooks.asm
 ;================================================================================
 org $119100 ; PC 0x89100
-incbin map_icons.gfx
+incbin "data/map_icons.gfx"
 warnpc $119401
 ;================================================================================
 org $AF8000 ; PC 0x178000
diff --git a/99ff1_bombos.gfx b/data/99ff1_bombos.gfx
similarity index 100%
rename from 99ff1_bombos.gfx
rename to data/99ff1_bombos.gfx
diff --git a/99ff1_quake.gfx b/data/99ff1_quake.gfx
similarity index 100%
rename from 99ff1_quake.gfx
rename to data/99ff1_quake.gfx
diff --git a/a6fc4_bombos.gfx b/data/a6fc4_bombos.gfx
similarity index 100%
rename from a6fc4_bombos.gfx
rename to data/a6fc4_bombos.gfx
diff --git a/a6fc4_ether.gfx b/data/a6fc4_ether.gfx
similarity index 100%
rename from a6fc4_ether.gfx
rename to data/a6fc4_ether.gfx
diff --git a/bossicons.4bpp b/data/bossicons.4bpp
similarity index 100%
rename from bossicons.4bpp
rename to data/bossicons.4bpp
diff --git a/bsodencode.txt b/data/bsodencode.txt
similarity index 100%
rename from bsodencode.txt
rename to data/bsodencode.txt
diff --git a/bsodfont.1bpp b/data/bsodfont.1bpp
similarity index 100%
rename from bsodfont.1bpp
rename to data/bsodfont.1bpp
diff --git a/bsodhex.2bpp b/data/bsodhex.2bpp
similarity index 100%
rename from bsodhex.2bpp
rename to data/bsodhex.2bpp
diff --git a/c2807_v3.bin b/data/c2807_v3.bin
similarity index 100%
rename from c2807_v3.bin
rename to data/c2807_v3.bin
diff --git a/c2807_v3.gfx b/data/c2807_v3.gfx
similarity index 100%
rename from c2807_v3.gfx
rename to data/c2807_v3.gfx
diff --git a/c2807_v4.bin b/data/c2807_v4.bin
similarity index 100%
rename from c2807_v4.bin
rename to data/c2807_v4.bin
diff --git a/c2807_v4.gfx b/data/c2807_v4.gfx
similarity index 100%
rename from c2807_v4.gfx
rename to data/c2807_v4.gfx
diff --git a/c2e3e.bin b/data/c2e3e.bin
similarity index 100%
rename from c2e3e.bin
rename to data/c2e3e.bin
diff --git a/c2e3e.gfx b/data/c2e3e.gfx
similarity index 100%
rename from c2e3e.gfx
rename to data/c2e3e.gfx
diff --git a/credits.txt b/data/credits.txt
similarity index 100%
rename from credits.txt
rename to data/credits.txt
diff --git a/creditscharmapbighi.txt b/data/creditscharmapbighi.txt
similarity index 100%
rename from creditscharmapbighi.txt
rename to data/creditscharmapbighi.txt
diff --git a/creditscharmapbiglo.txt b/data/creditscharmapbiglo.txt
similarity index 100%
rename from creditscharmapbiglo.txt
rename to data/creditscharmapbiglo.txt
diff --git a/creditscharmapsmall_green.txt b/data/creditscharmapsmall_green.txt
similarity index 100%
rename from creditscharmapsmall_green.txt
rename to data/creditscharmapsmall_green.txt
diff --git a/creditscharmapsmall_red.txt b/data/creditscharmapsmall_red.txt
similarity index 100%
rename from creditscharmapsmall_red.txt
rename to data/creditscharmapsmall_red.txt
diff --git a/creditscharmapsmall_yellow.txt b/data/creditscharmapsmall_yellow.txt
similarity index 100%
rename from creditscharmapsmall_yellow.txt
rename to data/creditscharmapsmall_yellow.txt
diff --git a/damage_table.bin b/data/damage_table.bin
similarity index 100%
rename from damage_table.bin
rename to data/damage_table.bin
diff --git a/eventitems.bin b/data/eventitems.bin
similarity index 100%
rename from eventitems.bin
rename to data/eventitems.bin
diff --git a/eventitems.gfx b/data/eventitems.gfx
similarity index 100%
rename from eventitems.gfx
rename to data/eventitems.gfx
diff --git a/fileselect.chr.gfx b/data/fileselect.chr.gfx
similarity index 100%
rename from fileselect.chr.gfx
rename to data/fileselect.chr.gfx
diff --git a/hudpalette.pal b/data/hudpalette.pal
similarity index 100%
rename from hudpalette.pal
rename to data/hudpalette.pal
diff --git a/i18n_en.bin b/data/i18n_en.bin
similarity index 100%
rename from i18n_en.bin
rename to data/i18n_en.bin
diff --git a/ice_bombos.bin b/data/ice_bombos.bin
similarity index 100%
rename from ice_bombos.bin
rename to data/ice_bombos.bin
diff --git a/ice_palace_floor.bin b/data/ice_palace_floor.bin
similarity index 100%
rename from ice_palace_floor.bin
rename to data/ice_palace_floor.bin
diff --git a/map_icons.gfx b/data/map_icons.gfx
similarity index 100%
rename from map_icons.gfx
rename to data/map_icons.gfx
diff --git a/newfont.bin b/data/newfont.bin
similarity index 100%
rename from newfont.bin
rename to data/newfont.bin
diff --git a/newfont_inverted.bin b/data/newfont_inverted.bin
similarity index 100%
rename from newfont_inverted.bin
rename to data/newfont_inverted.bin
diff --git a/newitems.bin b/data/newitems.bin
similarity index 100%
rename from newitems.bin
rename to data/newitems.bin
diff --git a/newitems.gfx b/data/newitems.gfx
similarity index 100%
rename from newitems.gfx
rename to data/newitems.gfx
diff --git a/newitems.pal b/data/newitems.pal
similarity index 100%
rename from newitems.pal
rename to data/newitems.pal
diff --git a/newitems2.bin b/data/newitems2.bin
similarity index 100%
rename from newitems2.bin
rename to data/newitems2.bin
diff --git a/newitems2.gfx b/data/newitems2.gfx
similarity index 100%
rename from newitems2.gfx
rename to data/newitems2.gfx
diff --git a/output.txt b/data/output.txt
similarity index 100%
rename from output.txt
rename to data/output.txt
diff --git a/sheet178.gfx b/data/sheet178.gfx
similarity index 100%
rename from sheet178.gfx
rename to data/sheet178.gfx
diff --git a/sheet73.bin b/data/sheet73.bin
similarity index 100%
rename from sheet73.bin
rename to data/sheet73.bin
diff --git a/sheet73.gfx b/data/sheet73.gfx
similarity index 100%
rename from sheet73.gfx
rename to data/sheet73.gfx
diff --git a/text_unscramble1.bin b/data/text_unscramble1.bin
similarity index 100%
rename from text_unscramble1.bin
rename to data/text_unscramble1.bin
diff --git a/text_unscramble2.bin b/data/text_unscramble2.bin
similarity index 100%
rename from text_unscramble2.bin
rename to data/text_unscramble2.bin
diff --git a/zsnes_pal.bin b/data/zsnes_pal.bin
similarity index 100%
rename from zsnes_pal.bin
rename to data/zsnes_pal.bin
diff --git a/zsnes_tilemap.bin b/data/zsnes_tilemap.bin
similarity index 100%
rename from zsnes_tilemap.bin
rename to data/zsnes_tilemap.bin
diff --git a/zsnes_tiles.bin b/data/zsnes_tiles.bin
similarity index 100%
rename from zsnes_tiles.bin
rename to data/zsnes_tiles.bin
diff --git a/failure.asm b/failure.asm
index 64f6f52..1ae00ca 100644
--- a/failure.asm
+++ b/failure.asm
@@ -1,6 +1,6 @@
 pushtable
 
-table "bsodencode.txt"
+table "data/bsodencode.txt"
 
 ; Uncomment this to force a crash to test message
 ; pushpc : org $008132 : db 0 : pullpc
@@ -545,10 +545,10 @@ ConfigurePPUForFailureReport:
 ;===================================================================================================
 
 BSODHex:
-incbin "bsodhex.2bpp"
+incbin "data/bsodhex.2bpp"
 
 BSODFontGFX:
-incbin "bsodfont.1bpp"
+incbin "data/bsodfont.1bpp"
 
 BSODCharWidths:
 	; [space]
diff --git a/stats/credits.asm b/stats/credits.asm
index 3731f25..3bf95ef 100644
--- a/stats/credits.asm
+++ b/stats/credits.asm
@@ -1,13 +1,13 @@
 ;===================================================================================================
 ; LEAVE THIS HERE FOR PHP WRITES
 ;===================================================================================================
-table "creditscharmapbighi.txt"
+table "data/creditscharmapbighi.txt"
 YourSpriteCreditsHi:
 db 2
 db 55
 db "                            " ; $238002
 
-table "creditscharmapbiglo.txt"
+table "data/creditscharmapbiglo.txt"
 YourSpriteCreditsLo:
 db 2
 db 55
@@ -26,7 +26,7 @@ CreditsLineTable:
 
 macro smallcredits(text, color)
 	!CLINE #= !CLINE+1
-	table "creditscharmapsmall_<color>.txt"
+	table "data/creditscharmapsmall_<color>.txt"
 
 	?line:
 		db (32-(?end-?text))/2
@@ -44,7 +44,7 @@ endmacro
 ;---------------------------------------------------------------------------------------------------
 macro bigcredits(text)
 	!CLINE #= !CLINE+1
-	table "creditscharmapbighi.txt"
+	table "data/creditscharmapbighi.txt"
 
 	?line_top:
 		db (32-(?end-?text))/2
@@ -58,7 +58,7 @@ macro bigcredits(text)
 	pullpc
 
 
-	table "creditscharmapbiglo.txt"
+	table "data/creditscharmapbiglo.txt"
 	?line_bottom:
 		db (32-(?end-?text))/2
 		db 2*(?end-?text)-1
@@ -76,7 +76,7 @@ endmacro
 
 macro bigcreditsleft(text)
 	!CLINE #= !CLINE+1
-	table "creditscharmapbighi.txt"
+	table "data/creditscharmapbighi.txt"
 
 	?line_top:
 		db 2
@@ -90,7 +90,7 @@ macro bigcreditsleft(text)
 	pullpc
 
 
-	table "creditscharmapbiglo.txt"
+	table "data/creditscharmapbiglo.txt"
 	?line_bottom:
 		db 2
 		db 2*(?end-?text)-1

From 7426ce5945f059ef25022183e2b4bd714c141100 Mon Sep 17 00:00:00 2001
From: cassidoxa <cassidymoen@gmx.com>
Date: Thu, 24 Nov 2022 18:34:35 -0500
Subject: [PATCH 06/11] More RAM labels Fixed tablets checking for item
 collected, uses NpcFlags+1 Deleted mantle.asm, moved to lampmantlecone.asm

---
 LTTP_RND_GeneralBugfixes.asm |   4 +-
 accessibility.asm            | 190 ++++++++---------
 bookofmudora.asm             |   2 +-
 bugfixes.asm                 |  34 ++--
 compasses.asm                |  10 +-
 controllerjank.asm           |   5 +-
 darkroomitems.asm            |   4 +-
 dialog.asm                   |  30 +--
 doorframefixes.asm           |  10 +-
 dungeonmap.asm               |   2 +-
 elder.asm                    |   2 +-
 enemy_adjustments.asm        |  10 +-
 entrances.asm                |  53 +++--
 events.asm                   |  39 ++--
 failure.asm                  |   6 -
 fairyfixes.asm               |   8 +-
 fileselect.asm               | 132 ++++++------
 flipperkill.asm              |  17 +-
 flute.asm                    |  32 +--
 framehook.asm                |  64 +++---
 glitched.asm                 |   2 +-
 goalitem.asm                 |   4 +-
 hardmode.asm                 |  12 +-
 heartpieces.asm              |  10 +-
 hooks.asm                    |  32 +--
 icepalacegraphics.asm        |   2 +-
 initsramtable.asm            |   2 +-
 inventory.asm                |  42 ++--
 inverted.asm                 |  42 ++--
 lampmantlecone.asm           |  46 +++--
 maidencrystals.asm           |   6 +-
 mantle.asm                   |  12 --
 medallions.asm               |   2 +-
 msu.asm                      |  10 +-
 music.asm                    |  28 ++-
 newhud.asm                   |  67 ++----
 newitems.asm                 |  24 +--
 npcitems.asm                 |   4 +-
 password.asm                 |   6 +-
 pendantcrystalhud.asm        | 126 ++++++------
 playername.asm               |  10 +-
 ram.asm                      | 385 +++++++++++++++++++++++++++++++++--
 shopkeeper.asm               |  34 ++--
 spriteswap.asm               |   4 +-
 stats.asm                    |  18 +-
 stats/main.asm               |   4 +-
 swordswap.asm                |  10 +-
 tables.asm                   |   8 +-
 tablets.asm                  |  80 +++-----
 timer.asm                    |  62 +++---
 utilities.asm                |  76 +++----
 zoraking.asm                 |   2 +-
 52 files changed, 1048 insertions(+), 778 deletions(-)
 delete mode 100644 mantle.asm

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 8eb4d4a..c323bc2 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -87,7 +87,6 @@ incsrc catfish.asm
 incsrc flute.asm
 incsrc dungeondrops.asm
 incsrc halfmagicbat.asm
-incsrc mantle.asm
 incsrc swordswap.asm
 incsrc stats.asm
 incsrc dialog.asm
@@ -298,12 +297,11 @@ warnpc $B08000
 ;================================================================================
 ;RAM
 ;See ram.asm for label assignments
-;$7E021B[0x1]: Used by race game instead of $0ABF to avoid witch item conflict
 ;$7EC900[0x1F00]: BigRAM buffer
 ;$7EF000[0x500]: SRAM mirror First 0x500 bytes of SRAM
 ;   See sram.asm for labels and assignments
 ;$7F5000[0x800]: Rando's main free ram region
-;   See tables.asm for specific assignments
+;   See ram.asm for specific assignments
 ;$7F6000[0x1000]: SRAM buffer mapped to vanilla save slots 1 and 2
 ;   See sram.asm for labels and assignments
 ;$7F7667[0x6719] - free ram
diff --git a/accessibility.asm b/accessibility.asm
index 85df32e..d02de7e 100644
--- a/accessibility.asm
+++ b/accessibility.asm
@@ -6,17 +6,17 @@ ConditionalLightning:
         CMP.b #$2C : BEQ ++
         CMP.b #$5A : BEQ ++
             LDA.l DisableFlashing : BNE ++
-                LDA.b #$32 : STA.w $9A
+                LDA.b #$32 : STA.w CGADSUBQ
                 RTL
         ++
                 LDA.b #$72
-        STA.b $9A
+        STA.b CGADSUBQ
 RTL
 ;================================================================================
 ConditionalWhitenBg:
         LDX.b #$00
         LDA.l DisableFlashing : REP #$20 : BNE +
-            LDA.b $00,X
+            LDA.b Scrap00,X
             JSR WhitenLoopReal
             RTL
         +
@@ -26,93 +26,93 @@ ConditionalWhitenBg:
 ;================================================================================
 WhitenLoopReal:
         -
-            LDA.l $7EC340, X : JSL Filter_Majorly_Whiten_Color : STA.l $7EC540, X
-            LDA.l $7EC350, X : JSL Filter_Majorly_Whiten_Color : STA.l $7EC550, X
-            LDA.l $7EC360, X : JSL Filter_Majorly_Whiten_Color : STA.l $7EC560, X
-            LDA.l $7EC370, X : JSL Filter_Majorly_Whiten_Color : STA.l $7EC570, X
-            LDA.l $7EC380, X : JSL Filter_Majorly_Whiten_Color : STA.l $7EC580, X
-            LDA.l $7EC390, X : JSL Filter_Majorly_Whiten_Color : STA.l $7EC590, X
-            LDA.l $7EC3A0, X : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5A0, X
-            LDA.l $7EC3B0, X : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5B0, X
-            LDA.l $7EC3C0, X : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5C0, X
-            LDA.l $7EC3D0, X : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5D0, X
-            LDA.l $7EC3E0, X : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5E0, X
+            LDA.l PaletteBufferAux+$40, X : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$40, X
+            LDA.l PaletteBufferAux+$50, X : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$50, X
+            LDA.l PaletteBufferAux+$60, X : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$60, X
+            LDA.l PaletteBufferAux+$70, X : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$70, X
+            LDA.l PaletteBufferAux+$80, X : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$80, X
+            LDA.l PaletteBufferAux+$90, X : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$90, X
+            LDA.l PaletteBufferAux+$A0, X : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$A0, X
+            LDA.l PaletteBufferAux+$B0, X : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$B0, X
+            LDA.l PaletteBufferAux+$C0, X : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$C0, X
+            LDA.l PaletteBufferAux+$D0, X : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$D0, X
+            LDA.l PaletteBufferAux+$E0, X : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$E0, X
             INX #2 : CPX.b #$10 : BEQ +
                 JMP -
         +
-            LDA.l $7EC3F0 : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5F0
-            LDA.l $7EC3F2 : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5F2
-            LDA.l $7EC3F4 : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5F4
+            LDA.l PaletteBufferAux+$F0 : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$F0
+            LDA.l PaletteBufferAux+$F2 : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$F2
+            LDA.l PaletteBufferAux+$F4 : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$F4
             LDA.b GameMode : CMP.w #$0007 : BNE +
-            LDA.w $048E
+            LDA.b RoomIndex
             CMP.w #$003C : BEQ ++
             CMP.w #$009D : BEQ ++
             CMP.w #$009C : BEQ ++
             CMP.w #$00A5 : BEQ ++
             +
-                LDA.l $7EC3F6 : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5F6
-                LDA.l $7EC3F8 : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5F8
+                LDA.l PaletteBufferAux+$F6 : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$F6
+                LDA.l PaletteBufferAux+$F8 : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$F8
                 BRA +++
             ++
-                LDA.l $7EC3F6 : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5F6
-                LDA.l $7EC3F8 : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5F8
+                LDA.l PaletteBuffer+$F6 : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$F6
+                LDA.l PaletteBuffer+$F8 : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$F8
                 BRA +++
             +++
-            LDA.l $7EC3FA : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5FA
-            LDA.l $7EC3FC : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5FC
-            LDA.l $7EC3FE : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5FE
+            LDA.l PaletteBufferAux+$FA : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$FA
+            LDA.l PaletteBufferAux+$FC : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$FC
+            LDA.l PaletteBufferAux+$FE : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$FE
             REP #$10
-            LDA.l $7EC540 : TAY
-            LDA.l $7EC300 : BNE +
+            LDA.l PaletteBuffer+$40 : TAY
+            LDA.l PaletteBufferAux : BNE +
                 TAY
         +
-            TYA : STA.l $7EC500
+            TYA : STA.l PaletteBuffer
             SEP #$30
 RTS
 ;================================================================================
 WhitenLoopDummy:
         -
-            LDA.l $7EC340, X : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC540, X
-            LDA.l $7EC350, X : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC550, X
-            LDA.l $7EC360, X : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC560, X
-            LDA.l $7EC370, X : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC570, X
-            LDA.l $7EC380, X : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC580, X
-            LDA.l $7EC390, X : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC590, X
-            LDA.l $7EC3A0, X : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5A0, X
-            LDA.l $7EC3B0, X : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5B0, X
-            LDA.l $7EC3C0, X : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5C0, X
-            LDA.l $7EC3D0, X : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5D0, X
-            LDA.l $7EC3E0, X : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5E0, X
+            LDA.l PaletteBufferAux+$40, X : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$40, X
+            LDA.l PaletteBufferAux+$50, X : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$50, X
+            LDA.l PaletteBufferAux+$60, X : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$60, X
+            LDA.l PaletteBufferAux+$70, X : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$70, X
+            LDA.l PaletteBufferAux+$80, X : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$80, X
+            LDA.l PaletteBufferAux+$90, X : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$90, X
+            LDA.l PaletteBufferAux+$A0, X : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$A0, X
+            LDA.l PaletteBufferAux+$B0, X : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$B0, X
+            LDA.l PaletteBufferAux+$C0, X : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$C0, X
+            LDA.l PaletteBufferAux+$D0, X : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$D0, X
+            LDA.l PaletteBufferAux+$E0, X : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$E0, X
             INX #2 : CPX.b #$10 : BEQ +
                 JMP -
         +
-            LDA.l $7EC3F0 : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5F0
-            LDA.l $7EC3F2 : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5F2
-            LDA.l $7EC3F4 : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5F4
+            LDA.l PaletteBufferAux+$F0 : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$F0
+            LDA.l PaletteBufferAux+$F2 : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$F2
+            LDA.l PaletteBufferAux+$F4 : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$F4
             LDA.b GameMode : CMP.w #$0007 : BNE + ; only light invisifloor if we're in dungeon submodule
-            LDA.w $048E
+            LDA.b RoomIndex
             CMP.w #$003C : BEQ ++ ; hookshot cave
             CMP.w #$009D : BEQ ++ ; gt right
             CMP.w #$009C : BEQ ++ ; gt big room
             CMP.w #$00A5 : BEQ ++ ; wizzrobes 1
             +
-                LDA.l $7EC3F6 : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5F6
-                LDA.l $7EC3F8 : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5F8
+                LDA.l PaletteBufferAux+$F6 : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$F6
+                LDA.l PaletteBufferAux+$F8 : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$F8
                 BRA +++
             ++
-                LDA.l $7EC3F6 : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5F6
-                LDA.l $7EC3F8 : JSL Filter_Majorly_Whiten_Color : STA.l $7EC5F8
+                LDA.l PaletteBufferAux+$F6 : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$F6
+                LDA.l PaletteBufferAux+$F8 : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$F8
                 BRA +++
             +++
-            LDA.l $7EC3FA : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5FA
-            LDA.l $7EC3FC : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5FC
-            LDA.l $7EC3FE : JSL Filter_Majorly_Whiten_Color : LDA.l $7EC5FE
+            LDA.l PaletteBufferAux+$FA : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$FA
+            LDA.l PaletteBufferAux+$FC : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$FC
+            LDA.l PaletteBufferAux+$FE : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$FE
             REP #$10
-            LDA.l $7EC540 : TAY
-            LDA.l $7EC300 : BNE +
+            LDA.l PaletteBuffer+$40 : TAY
+            LDA.l PaletteBufferAux : BNE +
                 TAY
         +
-            TYA : STA.l $7EC500
+            TYA : STA.l PaletteBuffer
             SEP #$30
 RTS
 ;================================================================================
@@ -120,36 +120,36 @@ RestoreBgEther:
         LDX.b #$00
         LDA.l DisableFlashing : REP #$20 : BNE +
         -
-            LDA.b $00,X
-            LDA.l $7EC340, X : STA.l $7EC540, X
-            LDA.l $7EC350, X : STA.l $7EC550, X
-            LDA.l $7EC360, X : STA.l $7EC560, X
-            LDA.l $7EC370, X : STA.l $7EC570, X
-            LDA.l $7EC380, X : STA.l $7EC580, X
-            LDA.l $7EC390, X : STA.l $7EC590, X
-            LDA.l $7EC3A0, X : STA.l $7EC5A0, X
-            LDA.l $7EC3B0, X : STA.l $7EC5B0, X
-            LDA.l $7EC3C0, X : STA.l $7EC5C0, X
-            LDA.l $7EC3D0, X : STA.l $7EC5D0, X
-            LDA.l $7EC3E0, X : STA.l $7EC5E0, X
-            LDA.l $7EC3F0, X : STA.l $7EC5F0, X
+            LDA.b Scrap00,X
+            LDA.l PaletteBufferAux+$40, X : STA.l PaletteBuffer+$40, X
+            LDA.l PaletteBufferAux+$50, X : STA.l PaletteBuffer+$50, X
+            LDA.l PaletteBufferAux+$60, X : STA.l PaletteBuffer+$60, X
+            LDA.l PaletteBufferAux+$70, X : STA.l PaletteBuffer+$70, X
+            LDA.l PaletteBufferAux+$80, X : STA.l PaletteBuffer+$80, X
+            LDA.l PaletteBufferAux+$90, X : STA.l PaletteBuffer+$90, X
+            LDA.l PaletteBufferAux+$A0, X : STA.l PaletteBuffer+$A0, X
+            LDA.l PaletteBufferAux+$B0, X : STA.l PaletteBuffer+$B0, X
+            LDA.l PaletteBufferAux+$C0, X : STA.l PaletteBuffer+$C0, X
+            LDA.l PaletteBufferAux+$D0, X : STA.l PaletteBuffer+$D0, X
+            LDA.l PaletteBufferAux+$E0, X : STA.l PaletteBuffer+$E0, X
+            LDA.l PaletteBufferAux+$F0, X : STA.l PaletteBuffer+$F0, X
             INX #2 : CPX.b #$10 : BNE -
             BRA ++
         +
         -
             LDA.b Scrap00
-            LDA.l $7EC340, X : LDA.l $7EC540, X
-            LDA.l $7EC350, X : LDA.l $7EC550, X
-            LDA.l $7EC360, X : LDA.l $7EC560, X
-            LDA.l $7EC370, X : LDA.l $7EC570, X
-            LDA.l $7EC380, X : LDA.l $7EC580, X
-            LDA.l $7EC390, X : LDA.l $7EC590, X
-            LDA.l $7EC3A0, X : LDA.l $7EC5A0, X
-            LDA.l $7EC3B0, X : LDA.l $7EC5B0, X
-            LDA.l $7EC3C0, X : LDA.l $7EC5C0, X
-            LDA.l $7EC3D0, X : LDA.l $7EC5D0, X
-            LDA.l $7EC3E0, X : LDA.l $7EC5E0, X
-            LDA.l $7EC3F0, X : LDA.l $7EC5F0, X
+            LDA.l PaletteBufferAux+$40, X : LDA.l PaletteBuffer+$40, X
+            LDA.l PaletteBufferAux+$50, X : LDA.l PaletteBuffer+$50, X
+            LDA.l PaletteBufferAux+$60, X : LDA.l PaletteBuffer+$60, X
+            LDA.l PaletteBufferAux+$70, X : LDA.l PaletteBuffer+$70, X
+            LDA.l PaletteBufferAux+$80, X : LDA.l PaletteBuffer+$80, X
+            LDA.l PaletteBufferAux+$90, X : LDA.l PaletteBuffer+$90, X
+            LDA.l PaletteBufferAux+$A0, X : LDA.l PaletteBuffer+$A0, X
+            LDA.l PaletteBufferAux+$B0, X : LDA.l PaletteBuffer+$B0, X
+            LDA.l PaletteBufferAux+$C0, X : LDA.l PaletteBuffer+$C0, X
+            LDA.l PaletteBufferAux+$D0, X : LDA.l PaletteBuffer+$D0, X
+            LDA.l PaletteBufferAux+$E0, X : LDA.l PaletteBuffer+$E0, X
+            LDA.l PaletteBufferAux+$F0, X : LDA.l PaletteBuffer+$F0, X
             INX #2 : CPX.b #$10 : BNE -
             BRA ++
         ++
@@ -165,11 +165,11 @@ DDMConditionalLightning:
         +
             LDA.b Scrap00 : LDX.b #$02 : LDY.b #$00
         -
-            LDA.w $F4EB, Y : LDA.l $7EC560, X
-            LDA.w $F4F9, Y : LDA.l $7EC570, X
-            LDA.w $F507, Y : LDA.l $7EC590, X
-            LDA.w $F515, Y : LDA.l $7EC5E0, X
-            LDA.w $F523, Y : LDA.l $7EC5F0, X
+            LDA.w $F4EB, Y : LDA.l PaletteBuffer+$60, X
+            LDA.w $F4F9, Y : LDA.l PaletteBuffer+$70, X
+            LDA.w $F507, Y : LDA.l PaletteBuffer+$90, X
+            LDA.w $F515, Y : LDA.l PaletteBuffer+$E0, X
+            LDA.w $F523, Y : LDA.l PaletteBuffer+$F0, X
             INY #2
             INX #2 : CPX.b #$10 : BNE -
             JML $07FAAC ; Bank0E.asm : 4754 both branches converge here
@@ -178,14 +178,14 @@ ConditionalGTFlash:
         LDA.l DisableFlashing : REP #$20 : BNE +
             LDA.w Scrap
         -
-            LDA.w $F9C1, Y : STA.l $7EC5D0, X
+            LDA.w $F9C1, Y : STA.l PaletteBuffer+$D0, X
             INY #2
             INX #2 : CPX.b #$10 : BNE -
             RTL
         +
             LDA.b Scrap00
         -
-            LDA.w $F9C1, Y : LDA.l $7EC5D0, X
+            LDA.w $F9C1, Y : LDA.l PaletteBuffer+$D0, X
             INY #2
             INX #2 : CPX.b #$10 : BNE -
             RTL
@@ -193,14 +193,14 @@ ConditionalGTFlash:
 ConditionalRedFlash:
         LDA.l DisableFlashing : REP #$20 : BNE +
             LDA.b Scrap,X
-            LDA.w #$1D59 : STA.l $7EC5DA
-            LDA.w #$25FF : STA.l $7EC5DC
+            LDA.w #$1D59 : STA.l PaletteBuffer+$DA
+            LDA.w #$25FF : STA.l PaletteBuffer+$DC
             LDA.w #$001A
             RTL
         +
             LDA.b Scrap00
-            LDA.w #$1D59 : LDA.l $7EC5DA
-            LDA.w #$25FF : LDA.l $7EC5DC
+            LDA.w #$1D59 : LDA.l PaletteBuffer+$DA
+            LDA.w #$25FF : LDA.l PaletteBuffer+$DC
             LDA.w #$0000
             RTL
 ;================================================================================
@@ -236,7 +236,7 @@ LoadElectroPalette:
         REP #$10 : LDX.w #$01E2 : LDY.w #$000E
         JSR ConditionalLoadGearPalette
         SEP #$30
-        INC.b $15
+        INC.b NMICGRAM
 RTL
 ;================================================================================
 ConditionalLoadGearPalette:
@@ -246,7 +246,7 @@ ConditionalLoadGearPalette:
                 LDA.b Scrap,X
         -
                 LDA.b [Scrap00]
-                STA.l $7EC500, X
+                STA.l PaletteBuffer, X
                 INC.b Scrap00 : INC.b Scrap00
                 INX #2
                 DEY
@@ -256,7 +256,7 @@ ConditionalLoadGearPalette:
                 LDA.b Scrap
         -
                 LDA.b [Scrap00]
-                LDA.l $7EC500, X
+                LDA.l PaletteBuffer, X
                 INC.b Scrap00 : INC.b Scrap00
                 INX #2
                 DEY
@@ -272,13 +272,13 @@ RestoreElectroPalette:
         LDX.w #$01E2 : LDY.w #$000E
         JSR FillPaletteBufferFromAux
         SEP #$30
-        INC.b $15
+        INC.b NMICGRAM
 RTL
 ;================================================================================
 FillPaletteBufferFromAux:
         -
-            LDA.l $7EC300, X
-            STA.l $7EC500, X
+            LDA.l PaletteBufferAux, X
+            STA.l PaletteBuffer, X
             INX #2
             DEY
             BPL -
diff --git a/bookofmudora.asm b/bookofmudora.asm
index 7cd0796..399b98a 100644
--- a/bookofmudora.asm
+++ b/bookofmudora.asm
@@ -25,7 +25,7 @@ RTL
 ; Randomize Bonk Keys
 ;--------------------------------------------------------------------------------
 LoadBonkItemGFX:
-	LDA.b #$08 : STA.w $0F50, X ; thing we wrote over
+	LDA.b #$08 : STA.w SpriteOAMProp, X ; thing we wrote over
 LoadBonkItemGFX_inner:
 	LDA.b #$00 : STA.l RedrawFlag
 	JSR LoadBonkItem
diff --git a/bugfixes.asm b/bugfixes.asm
index 26f18cc..e8a6b88 100644
--- a/bugfixes.asm
+++ b/bugfixes.asm
@@ -23,7 +23,7 @@ RTL
 ;1 = Don't Reset Music
 MSMusicReset:
 	LDA.b OverworldIndex : CMP.b #$80 : BNE +
-		LDA.b $23
+		LDA.b LinkPosX+1
 	+
 RTL
 ;--------------------------------------------------------------------------------
@@ -120,27 +120,27 @@ RTS
 ; Fix for SQ jumping causing accidental Exploration Glitch
 SQEGFix:
 	LDA.l Bugfix_PodEG : BEQ ++
-	STZ.w $047A ; disarm exploration glitch
+	STZ.w LayerAdjustment ; disarm exploration glitch
 ++	RTL
 
 ;--------------------------------------------------------------------------------
 ; Fix crystal not spawning when using somaria vs boss
 TryToSpawnCrystalUntilSuccess:
-	STX.w $02D8 ; what we overwrote
+	STX.w ItemReceiptID ; what we overwrote
 	JSL AddAncillaLong : BCS .failed ; a clear carry flag indicates success
 .spawned
-	STZ.b $AE ; the "trying to spawn crystal" flag
-	STZ.b $AF ; the "trying to spawn pendant" flag
+	STZ.b RoomTag ; the "trying to spawn crystal" flag
+	STZ.b RoomTag+1 ; the "trying to spawn pendant" flag
 .failed
 RTL
 
 ;--------------------------------------------------------------------------------
 ; Fix crystal not spawning when using somaria vs boss
 WallmasterCameraFix:
-	STZ.b $A7    ; disable vertical camera scrolling for current room
+	STZ.b CameraBoundV    ; disable vertical camera scrolling for current room
 	REP #$20
-	STZ.w $0618  ; something about scrolling, setting these to 0 tricks the game 
-	STZ.w $061A  ; into thinking we're at the edge of the room so it doesn't scroll.
+	STZ.w CameraScrollN  ; something about scrolling, setting these to 0 tricks the game 
+	STZ.w CameraScrollS  ; into thinking we're at the edge of the room so it doesn't scroll.
 	SEP #$20
 	JML Sound_SetSfx3PanLong ; what we wrote over, also this will RTL
 
@@ -163,8 +163,8 @@ CMP.w #$070E : BEQ .new ; opening overworld map
 .original
 -
 	LDA.b [Scrap00]
-	STA.l $7EC300, X
-	STA.l $7EC500, X
+	STA.l PaletteBufferAux, X
+	STA.l PaletteBuffer, X
 	INC.b Scrap00 : INC.b Scrap00
 	INX #2
 	DEY
@@ -173,7 +173,7 @@ RTL
 .new
 -
 	LDA.b [Scrap00]
-	STA.l $7EC500, X
+	STA.l PaletteBuffer, X
 	INC.b Scrap00 : INC.b Scrap00
 	INX #2
 	DEY
@@ -183,10 +183,10 @@ RTL
 ;--------------------------------------------------------------------------------
 ; Fix pedestal pull overlay
 PedestalPullOverlayFix:
-LDA.b #$09 : STA.w $039F, X	; the thing we wrote over
+LDA.b #$09 : STA.w AncillaGeneral, X ; the thing we wrote over
 LDA.b IndoorsFlag : BNE +
-	LDA.b OverworldIndex : CMP.b #$80 : BNE +
-		LDA.b OverlayID : CMP.b #$97
+        LDA.b OverworldIndex : CMP.b #$80 : BNE +
+                LDA.b OverlayID : CMP.b #$97
 +
 RTL
 
@@ -213,8 +213,8 @@ pullpc
 ;--------------------------------------------------------------------------------
 SetOverworldTransitionFlags:
 	LDA.b #$01
-	STA.w $0ABF ; used by witch
-	STA.w $021B ; used by race game
+	STA.w OWTransitionFlag
+	STA.w RaceGameFlag
 	RTL
 ;--------------------------------------------------------------------------------
 ParadoxCaveGfxFix:
@@ -224,7 +224,7 @@ ParadoxCaveGfxFix:
     LDX.b PreviousRoom : CPX.w #$00EF : BNE .uploadLine
 
     ;Ignore uploading four specific lines of tiles to VRAM
-    LDX.w $0118
+    LDX.w VRAMUploadAddress
     ; Line 1
     CPX.w #$1800 : BEQ .skipMostOfLine
     ; Line 2
diff --git a/compasses.asm b/compasses.asm
index 56502b0..b9b418a 100644
--- a/compasses.asm
+++ b/compasses.asm
@@ -22,18 +22,18 @@ DrawDungeonCompassCounts:
 	JSR HudHexToDec2Digit
 	REP #$20
         PHX
-		LDX.b Scrap06 : TXA : ORA.w #$2400 : STA.l $7EC79A
-		LDX.b Scrap07 : TXA : ORA.w #$2400 : STA.l $7EC79C
+		LDX.b Scrap06 : TXA : ORA.w #$2400 : STA.l HUDTileMapBuffer+$9A
+		LDX.b Scrap07 : TXA : ORA.w #$2400 : STA.l HUDTileMapBuffer+$9C
 	PLX
 
         LDA.l DungeonLocationsChecked, X : AND.w #$00FF
 	SEP #$20
 	JSR HudHexToDec2Digit
 	REP #$20
-	LDX.b Scrap06 : TXA : ORA.w #$2400 : STA.l $7EC794 ; Draw the item count
-	LDX.b Scrap07 : TXA : ORA.w #$2400 : STA.l $7EC796
+	LDX.b Scrap06 : TXA : ORA.w #$2400 : STA.l HUDTileMapBuffer+$94 ; Draw the item count
+	LDX.b Scrap07 : TXA : ORA.w #$2400 : STA.l HUDTileMapBuffer+$96
 	
-	LDA.w #$2830 : STA.l $7EC798 ; draw the slash
+	LDA.w #$2830 : STA.l HUDTileMapBuffer+$98 ; draw the slash
 
 	.done
 RTL
diff --git a/controllerjank.asm b/controllerjank.asm
index 3aefc84..5ff3da7 100644
--- a/controllerjank.asm
+++ b/controllerjank.asm
@@ -117,10 +117,7 @@ HandleOneMindController:
 .no_multitap_switch
 
 .no_onemind
-	STZ.b $12
+	STZ.b NMIDoneFlag
 
 	JML $008034 ; reset frame loop
 
-
-
-
diff --git a/darkroomitems.asm b/darkroomitems.asm
index 0d7b9b7..41be787 100644
--- a/darkroomitems.asm
+++ b/darkroomitems.asm
@@ -1,6 +1,6 @@
 CheckReceivedItemPropertiesBeforeLoad:
     LDA.b RoomIndex : BEQ .normalCode
-    LDA.l $7EC005 : BNE .lightOff
+    LDA.l RoomFade : BNE .lightOff
     .normalCode
     LDA.l AddReceivedItemExpanded_properties, X ;Restore Rando Code
     RTL
@@ -22,6 +22,6 @@ CheckReceivedItemPropertiesBeforeLoad:
 
     SEP #$30
     PLB : PLY : PLX
-    INC.b $15
+    INC.b NMICGRAM
     LDA.b #$00
     RTL
diff --git a/dialog.asm b/dialog.asm
index f07f9f1..9055101 100644
--- a/dialog.asm
+++ b/dialog.asm
@@ -12,7 +12,7 @@ RTL
 ResetDialogPointer:
 	STZ.w TextID : STZ.w TextID+1 ; reset decompression buffer
 	LDA.b #$00 : STA.l AltTextFlag ; zero out the alternate flag
-	LDA.b #$1C : STA.w $1CE9 ; thing we wrote over
+	LDA.b #$1C : STA.w DelayTimer ; thing we wrote over
 RTL
 
 macro LoadDialogAddress(address)
@@ -188,7 +188,7 @@ RTL
 ;--------------------------------------------------------------------------------
 DialogResetSelectionIndex:
     JSL.l Attract_DecompressStoryGfx ; what we wrote over
-    STZ $1CE8
+    STZ.w MessageCursor
 RTL
 ;--------------------------------------------------------------------------------
 DialogItemReceive:
@@ -210,7 +210,7 @@ DialogFairyThrow:
         ORA.l BottleContentsTwo : ORA.l BottleContentsThree : ORA.l BottleContentsFour : BNE .normal
 	
 	.noInventory
-	LDA.w SpriteUnknown, X : !ADD #$08 : STA.w SpriteUnknown, X
+	LDA.w SpriteActivity, X : !ADD #$08 : STA.w SpriteActivity, X
 	LDA.b #$51
 	LDY.b #$01
 RTL
@@ -367,12 +367,12 @@ Sprite_ShowMessageMinimal_Alt:
 	INY : LDA.b [Scrap00], Y : CMP.b #$FE : BNE +
 	INY : LDA.b [Scrap00], Y : CMP.b #$6B : BNE +
 	INY : LDA.b [Scrap00], Y : CMP.b #$04 : BNE +
-		STZ.w $1CE8
+		STZ.w MessageCursor
 		JMP .end
 	+
 
-	STZ.w $0223   ; Otherwise set it so we are in text mode.
-	STZ.w $1CD8   ; Initialize the step in the submodule
+	STZ.w MessageJunk   ; Otherwise set it so we are in text mode.
+	STZ.w MessageSubModule
 
 	; Go to text display mode (as opposed to maps, etc)
 	LDA.b #$02 : STA.b GameSubMode
@@ -399,13 +399,13 @@ CalculateSignIndex:
 
   LDA.b OverworldIndex : ASL A : TAY ;what we wrote over
 
-  LDA.w $0712 : BEQ .done ; If a small map, we can skip these calculations.
+  LDA.w OWScreenSize : BEQ .done ; If a small map, we can skip these calculations.
 
-  LDA.b $21 : AND.w #$0002 : ASL #2 : EOR.b OverworldIndex : AND.w #$0008 : BEQ +
+  LDA.b LinkPosY+1 : AND.w #$0002 : ASL #2 : EOR.b OverworldIndex : AND.w #$0008 : BEQ +
   	TYA : !ADD.w #$0010 : TAY  ;add 16 if we are in lower half of big screen.
   + 
 
-  LDA.b $23 : AND.w #$0002 : LSR : EOR.b OverworldIndex : AND.w #$0001 : BEQ +
+  LDA.b LinkPosX+1 : AND.w #$0002 : LSR : EOR.b OverworldIndex : AND.w #$0001 : BEQ +
   TYA : INC #2 : TAY  ;add 16 if we are in lower half of big screen.
   +
   ; ensure even if things go horribly wrong, we don't read the sign out of bounds and crash:
@@ -426,7 +426,7 @@ Sprite_ShowSolicitedMessageIfPlayerFacing_Alt:
 	JSL Sprite_CheckIfPlayerPreoccupied : BCS .alpha
 
 	LDA.b Joy1B_New : BPL .alpha
-	LDA.w $0F10, X : BNE .alpha
+	LDA.w SpriteTimerE, X : BNE .alpha
 	LDA.b LinkJumping : CMP.b #$02 : BEQ .alpha
 
 	JSL Sprite_DirectionToFacePlayerLong : PHX : TYX
@@ -456,7 +456,7 @@ Sprite_ShowSolicitedMessageIfPlayerFacing_Alt:
 
 	.SayNothing
 
-	LDA.b #$40 : STA.w $0F10, X
+	LDA.b #$40 : STA.w SpriteTimerE, X
 
 	PLA : EOR.b #$03
 
@@ -467,7 +467,7 @@ Sprite_ShowSolicitedMessageIfPlayerFacing_Alt:
 .not_facing_each_other
 .alpha
 
-	LDA.w $0DE0, X
+	LDA.w SpriteMoveDirection, X
 
 	CLC
 
@@ -483,7 +483,7 @@ Sprite_ShowSolicitedMessageIfPlayerFacing_PreserveMessage:
 	JSL Sprite_CheckIfPlayerPreoccupied : BCS .alpha
 
 	LDA.b Joy1B_New : BPL .alpha
-	LDA.w $0F10, X : BNE .alpha
+	LDA.w SpriteTimerE, X : BNE .alpha
 	LDA.b LinkJumping : CMP.b #$02 : BEQ .alpha
 
 	JSL Sprite_DirectionToFacePlayerLong : PHX : TYX
@@ -500,7 +500,7 @@ Sprite_ShowSolicitedMessageIfPlayerFacing_PreserveMessage:
 	
 	JSL Sprite_ShowMessageUnconditional
 
-	LDA.b #$40 : STA.w $0F10, X
+	LDA.b #$40 : STA.w SpriteTimerE, X
 
 	PLA : EOR.b #$03
 
@@ -513,7 +513,7 @@ Sprite_ShowSolicitedMessageIfPlayerFacing_PreserveMessage:
 	PLY
 	PLA
 
-	LDA.w $0DE0, X
+	LDA.w SpriteMoveDirection, X
 
 	CLC
 
diff --git a/doorframefixes.asm b/doorframefixes.asm
index 270917f..4e73ab2 100644
--- a/doorframefixes.asm
+++ b/doorframefixes.asm
@@ -8,7 +8,7 @@
 StoreLastOverworldDoorID:
 	TXA : INC
 	STA.l PreviousOverworldDoor
-	LDA.l $1BBB73, X : STA.w $010E
+	LDA.l $1BBB73, X : STA.w EntranceIndex
 RTL
 ;--------------------------------------------------------------------------------
 
@@ -18,12 +18,12 @@ RTL
 CacheDoorFrameData:
 	LDA.l PreviousOverworldDoor : BEQ .originalBehaviour
 	DEC : ASL : TAX
-	LDA.l EntranceDoorFrameTable, X : STA.w $0696
-	LDA.l EntranceAltDoorFrameTable, X : STA.w $0698
+	LDA.l EntranceDoorFrameTable, X : STA.w TileMapEntranceDoors
+	LDA.l EntranceAltDoorFrameTable, X : STA.w TileMapTile32
 	BRA .done
 	.originalBehaviour
-		LDA.w $D724, X : STA.w $0696
-		STZ.w $0698
+		LDA.w $D724, X : STA.w TileMapEntranceDoors
+		STZ.w TileMapTile32
 	.done
 RTL
 ;--------------------------------------------------------------------------------
diff --git a/dungeonmap.asm b/dungeonmap.asm
index 43c7d73..275c76a 100644
--- a/dungeonmap.asm
+++ b/dungeonmap.asm
@@ -1,5 +1,5 @@
 DoDungeonMapBossIcon:
-	LDA.b $14
+	LDA.b NMISTRIPES
 	CMP.b #$09
 	BEQ .dungeonmap
 
diff --git a/elder.asm b/elder.asm
index 3f5993e..f66817d 100644
--- a/elder.asm
+++ b/elder.asm
@@ -5,7 +5,7 @@ LDA.b OverworldIndex : CMP.b #$1B : BEQ .newCodeContinue
 JML $05F0CD
 .newCodeContinue
 PHB : PHK : PLB
-LDA.b #$07 : STA.w $0F50, X ;Palette 
+LDA.b #$07 : STA.w SpriteOAMProp, X ; Palette 
 JSR Elder_Draw
 JSL Sprite_PlayerCantPassThrough
 JSR Elder_Code
diff --git a/enemy_adjustments.asm b/enemy_adjustments.asm
index 8b96720..ee33204 100644
--- a/enemy_adjustments.asm
+++ b/enemy_adjustments.asm
@@ -11,16 +11,16 @@ NewBatInit:
 	CMP.b #$D0 : BEQ .light_world ;agahnim darkmaze
 
 	
-	LDA.b #$85 : STA.w $0CD2, X
-	LDA.b #$04 : STA.w $0E50, X
+	LDA.b #$85 : STA.w SpriteBump, X
+	LDA.b #$04 : STA.w SpriteHitPoints, X
 RTL
 	.light_world
-		LDA.b #$80 : STA.w $0CD2, X
-		LDA.b #$01 : STA.w $0E50, X
+		LDA.b #$80 : STA.w SpriteBump, X
+		LDA.b #$01 : STA.w SpriteHitPoints, X
 RTL
 ;--------------------------------------------------------------------------------
 NewFireBarDamage:
-        LDA.w $00EE : CMP.w $0F20, X : BNE .NotSameLayer
+        LDA.w $00EE : CMP.w SpriteLayer, X : BNE .NotSameLayer
                 JSL Sprite_AttemptDamageToPlayerPlusRecoilLong
                 RTL
 .NotSameLayer
diff --git a/entrances.asm b/entrances.asm
index 32bc8c6..8bd634b 100644
--- a/entrances.asm
+++ b/entrances.asm
@@ -23,7 +23,7 @@ LockAgahnimDoors:
 		LDA.l InvertedMode : AND.w #$00FF : BEQ .unlock
 
 		LDA.l OverworldEventDataWRAM+$43 : AND.w #$0020 : BNE .unlock ; Check if GT overlay is already on or not
-		LDA.w $0308 : AND.w #$0080 : BEQ ++ ;If we are holding an item
+		LDA.w AButtonAct : AND.w #$0080 : BEQ ++ ;If we are holding an item
 
 	.locked
 			LDA.w #$0001 : RTL ;Keep the door locked
@@ -47,15 +47,15 @@ FlagAgahnimDoor:
 	LDA.l OverworldEventDataWRAM+$43 : ORA.b #$20 : STA.l OverworldEventDataWRAM+$43 ; activate GT overlay
 
 .vanilla
-	LDA.b #$28 : STA.b $72
+	LDA.b #$28 : STA.b ScrapBuffer72
 	RTL
 
 
 ;--------------------------------------------------------------------------------
 LockAgahnimDoorsCore:
-	LDA.b $22 : CMP.w #1992 : !BLT + ; door too far left, skip
+	LDA.b LinkPosX : CMP.w #1992 : !BLT + ; door too far left, skip
 			  CMP.w #2088 : !BGE + ; door too rat right, skip
-	LDA.b $20 : CMP.w #1720 : !BGE + ; door too low, skip
+	LDA.b LinkPosY : CMP.w #1720 : !BGE + ; door too low, skip
 		LDA.w #$0001
 RTS
 	+
@@ -91,14 +91,14 @@ AllowStartFromSingleEntranceCave:
 		ASL #2 : !ADD Scrap00 : ASL #2 ; mult by 20
 		TAX
 
-		LDA.w #$0016 : STA.l $7EC142 ; Cache the main screen designation
-		LDA.l StartingAreaExitTable+$05, X : STA.l $7EC144 ; Cache BG1 V scroll
-		LDA.l StartingAreaExitTable+$07, X : STA.l $7EC146 ; Cache BG1 H scroll
-		LDA.l StartingAreaExitTable+$09, X : !ADD.w #$0010 : STA.l $7EC148 ; Cache Link's Y coordinate
-		LDA.l StartingAreaExitTable+$0B, X : STA.l $7EC14A ; Cache Link's X coordinate
-		LDA.l StartingAreaExitTable+$0D, X : STA.l $7EC150 ; Cache Camera Y coord lower bound.
-		LDA.l StartingAreaExitTable+$0F, X : STA.l $7EC152 ; Cache Camera X coord lower bound.
-		LDA.l StartingAreaExitTable+$03, X : STA.l $7EC14E ; Cache Link VRAM Location
+		LDA.w #$0016 : STA.l EN_MAINDESQ ; Cache the main screen designation
+		LDA.l StartingAreaExitTable+$05, X : STA.l EN_BG2VERT ; Cache BG1 V scroll
+		LDA.l StartingAreaExitTable+$07, X : STA.l EN_BG2HORZ ; Cache BG1 H scroll
+		LDA.l StartingAreaExitTable+$09, X : !ADD.w #$0010 : STA.l EN_POSY ; Cache Link's Y coordinate
+		LDA.l StartingAreaExitTable+$0B, X : STA.l EN_POSX ; Cache Link's X coordinate
+		LDA.l StartingAreaExitTable+$0D, X : STA.l EN_SCROLLATN ; Cache Camera Y coord lower bound.
+		LDA.l StartingAreaExitTable+$0F, X : STA.l EN_SCROLLATW ; Cache Camera X coord lower bound.
+		LDA.l StartingAreaExitTable+$03, X : STA.l EN_OWTMAPI ; Cache Link VRAM Location
 
 		; Handle the 2 "unknown" bytes, which control what area of the backgound
 		; relative to the camera? gets loaded with new tile data as the player moves around
@@ -106,24 +106,24 @@ AllowStartFromSingleEntranceCave:
 
 		LDA.l StartingAreaExitTable+$11, X : AND.w #$00FF
 		BIT.w #$0080 : BEQ + : ORA.w #$FF00 : + ; Sign extend
-		STA.l $7EC16A
+		STA.l EN_SCRMODYA
 
 		LDA.l StartingAreaExitTable+$12, X  : AND.w #$00FF
 		BIT.w #$0080 : BEQ + : ORA.w #$FF00 : + ; Sign extend
-		STA.l $7EC16E
+		STA.l EN_SCRMODXA
 
-		LDA.w #$0000 : !SUB.l $7EC16A : STA.l $7EC16C
-		LDA.w #$0000 : !SUB.l $7EC16E : STA.l $7EC170
+		LDA.w #$0000 : !SUB.l EN_SCRMODYA : STA.l EN_SCRMODYB
+		LDA.w #$0000 : !SUB.l EN_SCRMODXA : STA.l EN_SCRMODXB
 
 		LDA.l StartingAreaExitTable+$02, X : AND.w #$00FF
-		STA.l $7EC14C ; Cache the overworld area number
-		STA.l $7EC140 ; Cache the aux overworld area number
+		STA.l EN_OWSCR ; Cache the overworld area number
+		STA.l EN_OWSCR2 ; Cache the aux overworld area number
 
-		STZ.w $0698 ;zero out door overlays in case starting overworld door is not set
-		STZ.w $0699 ;zero out door overlays in case starting overworld door is not set
+		STZ.w TileMapTile32 ;zero out door overlays in case starting overworld door is not set
+		STZ.w TileMapTile32+1 ;zero out door overlays in case starting overworld door is not set
 
 		SEP #$20 ; set 8-bit accumulator
-		LDA.l $7EF3C8 : TAX
+		LDA.l StartingEntrance : TAX
 		LDA.l StartingAreaOverworldDoor, X : STA.l PreviousOverworldDoor ;Load overworld door
 		REP #$20 ; reset 16-bit accumulator
                 JSL.l CacheDoorFrameData
@@ -134,7 +134,7 @@ RTL
 ;--------------------------------------------------------------------------------
 AllowStartFromExit:
 
-	LDX.w $1CE8
+	LDX.w MessageCursor
 	LDA.l ShouldStartatExit, X : BNE .doStart
 
 	LDA.l StartingEntrance ; what we wrote over
@@ -153,10 +153,9 @@ JML.l AllowStartFromExitReturn
 
 	STZ.b GameSubMode
 	STZ.b SubSubModule
+	STZ.w DeathReloadFlag
+	STZ.w RespawnFlag
 
-	STZ.w $010A
-
-	STZ.w $04AA
 	JSL Equipment_SearchForEquippedItemLong
 	JSL HUD_RebuildLong2
 	JSL Equipment_UpdateEquippedItemLong
@@ -188,14 +187,14 @@ CheckHole:
 	.matchedHoleExtra
 		SEP #$30
 		TXA : LSR A : TAX
-		LDA.l ExtraHole_Entrance, X : STA.w $010E : STZ.w $010F
+		LDA.l ExtraHole_Entrance, X : STA.w EntranceIndex : STZ.w EntranceIndex+1
 JML Overworld_Hole_End
 ;--------------------------------------------------------------------------------
 PreventEnterOnBonk:
 	STA.b Scrap00 ; part of what we wrote over
 	LDA.l InvertedMode : AND.w #$00FF : BEQ .done
 	LDA.b LinkState : AND.w #$00FF : CMP.w #$0014 : BNE .done ;in mirror mode?
-	LDA.b OverworldIndex : AND.w #$0040 : CMP.b $7B : BEQ .done ; Are we bonking, or doing the superbunny glitch?
+	LDA.b OverworldIndex : AND.w #$0040 : CMP.b WorldCache : BEQ .done ; Are we bonking, or doing the superbunny glitch?
 
 		; If in inverted, are in mirror mode, and are bonking then do not enter
 		JML.l PreventEnterOnBonk_BRANCH_IX
diff --git a/events.asm b/events.asm
index 1ac3159..0380d1c 100644
--- a/events.asm
+++ b/events.asm
@@ -1,6 +1,6 @@
 OnPrepFileSelect:
 	LDA.b GameSubMode : CMP.b #$03 : BNE +
-		LDA.b #$06 : STA.b $14 ; thing we wrote over
+		LDA.b #$06 : STA.b NMISTRIPES ; thing we wrote over
 		RTL
 	+
 	JSL.l LoadAlphabetTilemap
@@ -15,7 +15,7 @@ OnDrawHud:
 JML.l ReturnFromOnDrawHud
 ;--------------------------------------------------------------------------------
 OnDungeonEntrance:
-	STA.l $7EC172 ; thing we wrote over
+	STA.l PegColor ; thing we wrote over
         JSL MaybeFlagCompassTotalEntrance
 RTL
 ;--------------------------------------------------------------------------------
@@ -33,7 +33,7 @@ OnDungeonExit:
 		JSL.l SQEGFix
 	PLP : PLA
 
-	STA.w DungeonID : STZ.w $04AC ; thing we wrote over
+	STA.w DungeonID : STZ.w Map16ChangeIndex ; thing we wrote over
 
 	PHA : PHP
 		JSL.l HUD_RebuildLong
@@ -44,8 +44,8 @@ RTL
 ;--------------------------------------------------------------------------------
 OnQuit:
 	JSL.l SQEGFix
-	LDA.b #$00 : STA.l $7F5035 ; bandaid patch bug with mirroring away from text
-	LDA.b #$10 : STA.b $1C ; thing we wrote over
+	LDA.b #$00 : STA.l AltTextFlag ; bandaid patch bug with mirroring away from text
+	LDA.b #$10 : STA.b MAINDESQ ; thing we wrote over
 RTL
 ;--------------------------------------------------------------------------------
 OnUncleItemGet:
@@ -123,13 +123,12 @@ OnFileLoad:
 		JSL.l OnNewFile
 		LDA.b #$FF : STA.l FileMarker
 	+
-	LDA.w $010A : BNE + ; don't adjust the worlds for "continue" or "save-continue"
-	LDA.l $7EC011 : BNE + ; don't adjust worlds if mosiac is enabled (Read: mirroring in dungeon)
+	LDA.w DeathReloadFlag : BNE + ; don't adjust the worlds for "continue" or "save-continue"
+	LDA.l MosaicLevel : BNE + ; don't adjust worlds if mosiac is enabled (Read: mirroring in dungeon)
 		JSL.l DoWorldFix
 	+
 	JSL.l MasterSwordFollowerClear
 	LDA.b #$FF : STA.l RNGLockIn ; reset rng item lock-in
-	LDA.b #$00 : STA.l $7F5001 ; mark fake flipper softlock as impossible
 	LDA.l GenericKeys : BEQ +
 		LDA.l CurrentGenericKeys : STA.l CurrentSmallKeys ; copy generic keys to key counter
 	+
@@ -148,14 +147,20 @@ OnNewFile:
 	PHX : PHP
 		; reset some values on new file that are otherwise only reset on hard reset
 		SEP #$20 ; set 8-bit accumulator
-		STZ.w $03C4 ; ancilla slot index
-		STZ.w $047A ; EG
-		STZ.w $0B08 : STZ $0B09 ; arc variable
-		STZ.w $0CFB ; enemies killed (pull trees)
-		STZ.w $0CFC ; times taken damage (pull trees)
-		STZ.w $0FC7 : STZ.w $0FC8 : STZ.w $0FC9 : STZ.w $0FCA : STZ.w $0FCB : STZ.w $0FCC : STZ.w $0FCD ; prize packs
-		LDA.b #$00 : STA.l $7EC011 ; mosaic
-		JSL InitRNGPointerTable ; boss RNG
+		STZ.w AncillaSearch
+		STZ.w LayerAdjustment ; EG
+		STZ.w ArcVariable : STZ.w ArcVariable+1
+		STZ.w TreePullKills
+		STZ.w TreePullHits
+		STZ.w PrizePackIndexes
+                STZ.w PrizePackIndexes+1
+                STZ.w PrizePackIndexes+2
+                STZ.w PrizePackIndexes+3
+                STZ.w PrizePackIndexes+4
+                STZ.w PrizePackIndexes+5
+                STZ.w PrizePackIndexes+6
+		LDA.b #$00 : STA.l MosaicLevel
+		JSL InitRNGPointerTable
 	PLP : PLX
 RTL
 ;--------------------------------------------------------------------------------
@@ -230,6 +235,6 @@ PostItemAnimation:
 			JSL.l IncrementChestTurnCounter
 	+
 
-    STZ.w ItemReceiptMethod : LDA.w $0C5E, X ; thing we wrote over to get here
+    STZ.w ItemReceiptMethod : LDA.w AncillaGet, X ; thing we wrote over to get here
 RTL
 ;--------------------------------------------------------------------------------
diff --git a/failure.asm b/failure.asm
index 1ae00ca..d5e07b8 100644
--- a/failure.asm
+++ b/failure.asm
@@ -239,12 +239,6 @@ Crashed:
 
 --	BRA --
 
-;	LDA.w #$0000
-;	TCD
-;
-;	TSC
-
-
 BSODMessage:
 	db "A fatal error has occurred and resulted in an", $80
 	db "unrecoverable crash. ?", $80
diff --git a/fairyfixes.asm b/fairyfixes.asm
index 2043796..8057bdb 100644
--- a/fairyfixes.asm
+++ b/fairyfixes.asm
@@ -35,19 +35,19 @@ FairyPond_Init:
 		LDA.l BottleContentsThree : CMP.b #$02 : BNE ++ : LDA.b #$1E : PHA : BRA .emptyBottle : ++
 		LDA.l BottleContentsFour : CMP.b #$02 : BNE ++ : LDA.b #$1F : PHA : BRA .emptyBottle : ++
 			.noInventory
-			LDA.b #$0A : STA.w SpriteUnknown, X
+			LDA.b #$0A : STA.w SpriteActivity, X
 			LDA.b #$51
 			LDY.b #$01
 			JSL.l Sprite_ShowMessageFromPlayerContact
 			JMP .cleanup
 		
 			.emptyBottle
-			LDA.b #$02 : STA.w SpriteUnknown, X
+			LDA.b #$02 : STA.w SpriteActivity, X
 			STZ.b LinkDirection
 			LDA.b #$01 : STA.w CutsceneFlag
-			PLA : STA.w $1CE8
+			PLA : STA.w MessageCursor
 		.cleanup
-		STZ.w $0EB0, X ; Clear the sprite's item-given variable
+		STZ.w SpriteDirectionTable, X ; Clear the sprite's item-given variable
 		CLC ; skip rest of original function
 	+ :	PLY
 RTL
diff --git a/fileselect.asm b/fileselect.asm
index 0eca417..31bc974 100644
--- a/fileselect.asm
+++ b/fileselect.asm
@@ -114,11 +114,11 @@ DrawPlayerFile:
 
 		; re-enable  Stripe Image format upload on this frame
 		; Value loaded must match what gets set by AltBufferTable
-		LDA.w #$0161 : STA.w $1002
+		LDA.w #$0161 : STA.w GFXStripes+2
 		BRA .done
 	.normal
 	STZ.w SkipOAM ; ensure core animated tile updates are not suppressed
-	LDA.w #$FFFF : STA.w $1002 ; Suppress Stripe Image format upload on this frame
+	LDA.w #$FFFF : STA.w GFXStripes+2 ; Suppress Stripe Image format upload on this frame
 .done
 	LDA.w #$0004 : STA.b Scrap02 ; thing we wrote over
 RTL
@@ -591,55 +591,55 @@ AltBufferTable:
     ;fill with the blank character
     LDA.w #$0188
     -
-        STA.w $1000, X
+        STA.w GFXStripes, X
         DEX : DEX : BNE -
 
     ; set vram offsets
-    LDA.w #$0161 : STA.w $1002 ;file 1 top row
-    LDA.w #$2161 : STA.w $1042 ;file 1 bottom row
-  
-    LDA.w #$4161 : STA.w $1082 ;gap row top
-    LDA.w #$6161 : STA.w $10C2 ;gap row bottom
-  
-    LDA.w #$8161 : STA.w $1102 ;file 2 top row
-    LDA.w #$A161 : STA.w $1142 ;file 2 bottom row
-  
-    LDA.w #$C161 : STA.w $1182 ;gap row top
-    LDA.w #$E161 : STA.w $11c2 ;gap row bottom
-  
-    LDA.w #$0162 : STA.w $1202 ;file 3 top row
-    LDA.w #$2162 : STA.w $1242 ;file 3 bottom row
-  
-    LDA.w #$4162 : STA.w $1282 ;extra gap row top
-    LDA.w #$6162 : STA.w $12c2 ;extra gap row bottom
+    LDA.w #$0161 : STA.w GFXStripes+$02 ;file 1 top row
+    LDA.w #$2161 : STA.w GFXStripes+$42 ;file 1 bottom row
 
-    LDA.w #$8162 : STA.w $1302 ;extra gap row top
-    LDA.w #$A162 : STA.w $1342 ;extra gap row bottom
-  
-    LDA.w #$C162 : STA.w $1382 ;extra gap row top
-    LDA.w #$E162 : STA.w $13C2 ;extra gap row bottom
+    LDA.w #$4161 : STA.w GFXStripes+$82 ;gap row top
+    LDA.w #$6161 : STA.w GFXStripes+$C2 ;gap row bottom
+
+    LDA.w #$8161 : STA.w GFXStripes+$0102 ;file 2 top row
+    LDA.w #$A161 : STA.w GFXStripes+$0142 ;file 2 bottom row
+
+    LDA.w #$C161 : STA.w GFXStripes+$0182 ;gap row top
+    LDA.w #$E161 : STA.w GFXStripes+$01C2 ;gap row bottom
+
+    LDA.w #$0162 : STA.w GFXStripes+$0202 ;file 3 top row
+    LDA.w #$2162 : STA.w GFXStripes+$0242 ;file 3 bottom row
+
+    LDA.w #$4162 : STA.w GFXStripes+$0282 ;extra gap row top
+    LDA.w #$6162 : STA.w GFXStripes+$02C2 ;extra gap row bottom
+
+    LDA.w #$8162 : STA.w GFXStripes+$0302 ;extra gap row top
+    LDA.w #$A162 : STA.w GFXStripes+$0342 ;extra gap row bottom
+
+    LDA.w #$C162 : STA.w GFXStripes+$0382 ;extra gap row top
+    LDA.w #$E162 : STA.w GFXStripes+$03C2 ;extra gap row bottom
 
     ; set lengths
     LDA.w #$3B00
-    STA.w $1004 ;file 1 top row
-    STA.w $1044 ;file 1 bottom row
-    STA.w $1084 ;gap row top
-    STA.w $10C4 ;gap row bottom
-    STA.w $1104 ;file 2 top row
-    STA.w $1144 ;file 2 bottom row
-    STA.w $1184 ;gap row top
-    STA.w $11C4 ;gap row bottom
-    STA.w $1204 ;file 3 top row
-    STA.w $1244 ;file 3 bottom row
-    STA.w $1284 ;extra gap row top
-    STA.w $12C4 ;extra gap row bottom
-    STA.w $1304 ;extra gap row top
-    STA.w $1344 ;extra gap row bottom
-    STA.w $1384 ;extra gap row top
-    STA.w $13C4 ;extra gap row bottom
+    STA.w GFXStripes+$04 ;file 1 top row
+    STA.w GFXStripes+$44 ;file 1 bottom row
+    STA.w GFXStripes+$84 ;gap row top
+    STA.w GFXStripes+$C4 ;gap row bottom
+    STA.w GFXStripes+$0104 ;file 2 top row
+    STA.w GFXStripes+$0144 ;file 2 bottom row
+    STA.w GFXStripes+$0184 ;gap row top
+    STA.w GFXStripes+$01C4 ;gap row bottom
+    STA.w GFXStripes+$0204 ;file 3 top row
+    STA.w GFXStripes+$0244 ;file 3 bottom row
+    STA.w GFXStripes+$0284 ;extra gap row top
+    STA.w GFXStripes+$02C4 ;extra gap row bottom
+    STA.w GFXStripes+$0304 ;extra gap row top
+    STA.w GFXStripes+$0344 ;extra gap row bottom
+    STA.w GFXStripes+$0384 ;extra gap row top
+    STA.w GFXStripes+$03C4 ;extra gap row bottom
 
     ; Set last packet marker
-    LDA.w #$00FF : STA.w $1402
+    LDA.w #$00FF : STA.w GFXStripes+$0402
 
     ; Draw Unlock option if applicable
     LDA.b GameMode : AND.w #$00FF : CMP.w #$0001 : BNE +
@@ -661,29 +661,29 @@ AltBufferTable_credits:
 	JSL AltBufferTable_noScreen3Change
 
 	REP #$20
-    LDA.w #$6168 : STA.w $1002 ;file 1 top row
-    LDA.w #$8168 : STA.w $1042 ;file 1 bottom row
-  
-    LDA.w #$A168 : STA.w $1082 ;gap row top
-    LDA.w #$C168 : STA.w $10C2 ;gap row bottom
-  
-    LDA.w #$E168 : STA.w $1102 ;file 2 top row
-    LDA.w #$0169 : STA.w $1142 ;file 2 bottom row
-  
-    LDA.w #$2169 : STA.w $1182 ;gap row top
-    LDA.w #$4169 : STA.w $11c2 ;gap row bottom
-  
-    LDA.w #$6169 : STA.w $1202 ;file 3 top row
-    LDA.w #$8169 : STA.w $1242 ;file 3 bottom row
-  
-    LDA.w #$A169 : STA.w $1282 ;extra gap row top
-    LDA.w #$C169 : STA.w $12c2 ;extra gap row bottom
+    LDA.w #$6168 : STA.w GFXStripes+$02 ;file 1 top row
+    LDA.w #$8168 : STA.w GFXStripes+$42 ;file 1 bottom row
 
-    LDA.w #$E169 : STA.w $1302 ;extra gap row top
-    LDA.w #$016A : STA.w $1342 ;extra gap row bottom
-  
-    LDA.w #$216A : STA.w $1382 ;extra gap row top
-    LDA.w #$416A : STA.w $13C2 ;extra gap row bottom
+    LDA.w #$A168 : STA.w GFXStripes+$82 ;gap row top
+    LDA.w #$C168 : STA.w GFXStripes+$C2 ;gap row bottom
+
+    LDA.w #$E168 : STA.w GFXStripes+$0102 ;file 2 top row
+    LDA.w #$0169 : STA.w GFXStripes+$0142 ;file 2 bottom row
+
+    LDA.w #$2169 : STA.w GFXStripes+$0182 ;gap row top
+    LDA.w #$4169 : STA.w GFXStripes+$01c2 ;gap row bottom
+
+    LDA.w #$6169 : STA.w GFXStripes+$0202 ;file 3 top row
+    LDA.w #$8169 : STA.w GFXStripes+$0242 ;file 3 bottom row
+
+    LDA.w #$A169 : STA.w GFXStripes+$0282 ;extra gap row top
+    LDA.w #$C169 : STA.w GFXStripes+$02C2 ;extra gap row bottom
+
+    LDA.w #$E169 : STA.w GFXStripes+$0302 ;extra gap row top
+    LDA.w #$016A : STA.w GFXStripes+$0342 ;extra gap row bottom
+
+    LDA.w #$216A : STA.w GFXStripes+$0382 ;extra gap row top
+    LDA.w #$416A : STA.w GFXStripes+$03C2 ;extra gap row bottom
 
     SEP #$20
 RTL
@@ -772,12 +772,12 @@ LoadCustomHudPalette:
 		LDX.b #$40
 		-
 		LDA.l GFX_HUD_Palette, X
-			STA.l $7EC500, X
+			STA.l PaletteBuffer, X
 			DEX : DEX
 		BPL -
 		SEP #$20
 
-		INC $15 ; ensure CGRAM gets updated
+		INC.b NMICGRAM ; ensure CGRAM gets updated
 	PLX : PLA
 RTL
 ;--------------------------------------------------------------------------------
diff --git a/flipperkill.asm b/flipperkill.asm
index 1d0debf..e32b5a5 100644
--- a/flipperkill.asm
+++ b/flipperkill.asm
@@ -2,11 +2,12 @@
 ; Fake Flippers Softlock Fix
 ;--------------------------------------------------------------------------------
 
+; Written over and used by OnEnterWater hook.
 UnequipCapeQuiet: 
-    LDA.b #$20 : STA.w $02E2
-    STZ.w $037B
-    STZ.b $55
-    STZ.w $0360
+    LDA.b #$20 : STA.w PoofTimer
+    STZ.w NoDamage
+    STZ.b CapeOn
+    STZ.w LinkZap
 RTL
 
 protectff:
@@ -18,14 +19,14 @@ protectff:
 .yes_protect
 	REP #$30
 
-	LDA.b $20
+	LDA.b LinkPosY
 	AND.w #$1E00
 	ASL
 	ASL
 	ASL
 	STA.b Scrap06
 
-	LDA.b $22
+	LDA.b LinkPosX
 	AND.w #$1E00
 	ORA.b Scrap06
 
@@ -49,8 +50,8 @@ protectff:
 	LDA.b #$15
 	STA.b LinkState
 
-	STZ.b $2E
-	STZ.b $67
+	STZ.b LinkAnimationStep
+	STZ.b LinkWalkDirection
 
 	LDA.b #$02
 	STA.b LinkDirection
diff --git a/flute.asm b/flute.asm
index faf10e3..46b171e 100644
--- a/flute.asm
+++ b/flute.asm
@@ -15,21 +15,21 @@ SpawnHauntedGroveItem:
 	LDX.b #$00
 	LDA.b LinkDirection : CMP.b #$04 : BEQ + : INX : +
 
-	LDA.l .x_speeds, X : STA.w $0D50, Y
+	LDA.l .x_speeds, X : STA.w SpriteVelocityX, Y
 
-	LDA.b #$00 : STA.w $0D40, Y
-	LDA.b #$18 : STA.w $0F80, Y
-	LDA.b #$FF : STA.w $0B58, Y
-	LDA.b #$30 : STA.w $0F10, Y
+	LDA.b #$00 : STA.w SpriteVelocityY, Y
+	LDA.b #$18 : STA.w SpriteVelocityZ, Y
+	LDA.b #$FF : STA.w EnemyStunTimer, Y
+	LDA.b #$30 : STA.w SpriteTimerE, Y
 
-	LDA.b $22 : !ADD.l .x_offsets, X
-        AND.b #$F0 : STA.w $0D10, Y
-	LDA.b $23 : ADC.b #$00 : STA.w $0D30, Y
+	LDA.b LinkPosX : !ADD.l .x_offsets, X
+        AND.b #$F0 : STA.w SpritePosXLow, Y
+	LDA.b LinkPosX+1 : ADC.b #$00 : STA.w SpritePosXHigh, Y
 
-	LDA.b $20 : !ADD.b #$16 : AND.b #$F0 : STA.w $0D00, Y
-	LDA.b $21 : ADC.b #$00 : STA.w $0D20, Y
+	LDA.b LinkPosY : !ADD.b #$16 : AND.b #$F0 : STA.w SpritePosYLow, Y
+	LDA.b LinkPosY+1 : ADC.b #$00 : STA.w SpritePosYHigh, Y
 
-	LDA.b #$00 : STA.w $0F20, Y
+	LDA.b #$00 : STA.w SpriteLayer, Y
 	TYX
 
 	LDX.b OverworldIndex ; haunted grove (208D0A)
@@ -56,7 +56,7 @@ FluteBoy:
 		LDA.b #$01 : STA.w $0FDD
 		JML.l FluteBoy_Abort
 	+
-	LDA.w SpriteUnknown, X : CMP.b #$03 ; thing we wrote over
+	LDA.w SpriteActivity, X : CMP.b #$03 ; thing we wrote over
 JML.l FluteBoy_Continue
 ;--------------------------------------------------------------------------------
 FreeDuckCheck:
@@ -69,13 +69,13 @@ FreeDuckCheck:
 	REP #$20
 	
     ; Y coordinate boundaries for setting it off.
-    LDA.b $20
+    LDA.b LinkPosY
     
     CMP.w #$0760 : BCC .done
     CMP.w #$07E0 : BCS .done
     
     ; do if( (Ycoord >= 0x0760) && (Ycoord < 0x07e0
-    LDA.b $22
+    LDA.b LinkPosX
     
     CMP.w #$01CF : BCC .done
     CMP.w #$0230 : BCS .done
@@ -94,12 +94,12 @@ FreeDuckCheck:
 	BRA .skipSong
 	.done
     SEP #$20
-	LDA.b #$80 : STA.w $03F0 ; thing we wrote over, load flute timer
+	LDA.b #$80 : STA.w FluteTimer ; thing we wrote over
 	LDA.b #$13
 RTL
 	.skipSong
 	SEP #$20
-	LDA.b #$80 : STA.w $03F0 ; thing we wrote over, load flute timer
+	LDA.b #$80 : STA.w FluteTimer ; thing we wrote over
 	LDA.b #$00
 RTL
 ;--------------------------------------------------------------------------------
diff --git a/framehook.asm b/framehook.asm
index 129cd35..dc7751c 100644
--- a/framehook.asm
+++ b/framehook.asm
@@ -2,46 +2,40 @@
 ; Frame Hook
 ;--------------------------------------------------------------------------------
 FrameHookAction:
-	JSL $0080B5 ; Module_MainRouting
-	JSL CheckMusicLoadRequest
-	PHP : REP #$30 : PHA
-	
-		SEP #$20
-		
-		LDA.l StatsLocked : BNE ++
-			REP #$20 ; set 16-bit accumulator
-				LDA.l LoopFrames : INC : STA.l LoopFrames : BNE +
-					LDA.l LoopFrames+2 : INC : STA.l LoopFrames+2
-				+
-				LDA.l GameMode : CMP.w #$010E : BNE + ; move this to nmi hook?
-				LDA.l MenuFrames : INC : STA.l MenuFrames : BNE +
-					LDA.l MenuFrames+2 : INC : STA.l MenuFrames+2
-				+
-		++
-	REP #$30 : PLA : PLP
+        JSL $0080B5 ; Module_MainRouting
+        JSL CheckMusicLoadRequest
+        PHP : REP #$30 : PHA
+        SEP #$20	
+        LDA.l StatsLocked : BNE ++
+                REP #$20 ; set 16-bit accumulator
+                LDA.l LoopFrames : INC : STA.l LoopFrames : BNE +
+                        LDA.l LoopFrames+2 : INC : STA.l LoopFrames+2
+                                +
+                                LDA.l GameMode : CMP.w #$010E : BNE ++ ; move this to nmi hook?
+                                LDA.l MenuFrames : INC : STA.l MenuFrames : BNE ++
+                                        LDA.l MenuFrames+2 : INC : STA.l MenuFrames+2
+                ++
+        REP #$30 : PLA : PLP
+
 RTL
 ;--------------------------------------------------------------------------------
 NMIHookAction:
-	PHA : PHX : PHY : PHD ; thing we wrote over, push stuff
-	
-	LDA.l StatsLocked : AND.w #$00FF : BNE ++
-		LDA.l NMIFrames : INC : STA.l NMIFrames : BNE +
-			LDA.l NMIFrames+2 : INC : STA.l NMIFrames+2
-		+
-	++
-	
+        PHA : PHX : PHY : PHD ; thing we wrote over, push stuff
+        LDA.l StatsLocked : AND.w #$00FF : BNE +
+                LDA.l NMIFrames : INC : STA.l NMIFrames : BNE +
+                        LDA.l NMIFrames+2 : INC : STA.l NMIFrames+2
+                +
+
 JML.l NMIHookReturn
 ;--------------------------------------------------------------------------------
 PostNMIHookAction:
-	LDA.w NMIAux : BEQ +
-		
-		PHK : PEA .return-1 ; push stack for RTL return
-		JMP.w [NMIAux]
-		
-		.return
-		STZ.w NMIAux ; zero bank byte of NMI hook pointer
-	+
-	
-	LDA.b $13 : STA.w INIDISP ; thing we wrote over, turn screen back on
+        LDA.w NMIAux : BEQ +
+                PHK : PEA .return-1 ; push stack for RTL return
+                JMP.w [NMIAux]
+                .return
+                STZ.w NMIAux ; zero bank byte of NMI hook pointer
+        +
+        LDA.b INIDISPQ : STA.w INIDISP ; thing we wrote over, turn screen back on
+
 JML.l PostNMIHookReturn
 ;--------------------------------------------------------------------------------
diff --git a/glitched.asm b/glitched.asm
index cfbe597..82eaf42 100644
--- a/glitched.asm
+++ b/glitched.asm
@@ -57,7 +57,7 @@ GetAgahnimSlot:
 		JML.l GetAgahnimSlotReturn
 ;--------------------------------------------------------------------------------
 GetAgahnimLightning:
-	INC.w $0E30, X ; thing we wrote over
+	INC.w SpriteAux, X ; thing we wrote over
 	LDA.b RoomIndex ; get room id
 	CMP.b #13 : BNE + ; Agahnim 2 room
 		LDA.b #$01 ; Use Agahnim 2
diff --git a/goalitem.asm b/goalitem.asm
index 2fca733..50f62cd 100644
--- a/goalitem.asm
+++ b/goalitem.asm
@@ -4,7 +4,7 @@ GoalItemGanonCheck:
 		BCS .success
 
 		.fail
-		LDA.w SpriteUnknown, X : CMP.b #17 : !BLT .success ; decmial 17 because Acmlm's chart is decimal
+		LDA.w SpriteActivity, X : CMP.b #17 : !BLT .success ; decmial 17 because Acmlm's chart is decimal
 		LDA.b #$00
 RTL
 		.success
@@ -138,7 +138,7 @@ CheckAgaForPed:
 	BEQ .force_blue_ball
 
 .vanilla ; run vanilla check for phase
-	LDA.w $0E30, X
+	LDA.w SpriteAux, X
 	CMP.b #$02
 	RTL
 
diff --git a/hardmode.asm b/hardmode.asm
index fe04a02..e8177f9 100644
--- a/hardmode.asm
+++ b/hardmode.asm
@@ -8,11 +8,11 @@ CalculateSpikeFloorDamage:
 		SEP #$20 ; set 8-bit accumulator
 		BNE +
 			LDA.l ByrnaCaveSpikeDamage
-			STA.w $0373
+			STA.w DamageReceived
 			RTL
 		+
 	LDA.w $D055, Y
-	STA.w $0373
+	STA.w DamageReceived
 RTL
 ;--------------------------------------------------------------------------------
 CalculateByrnaUsage:
@@ -48,7 +48,7 @@ CalculateCapeUsage:
 	+
 		SEP #$20 ; set 8-bit accumulator
 		PHX : TYX
-		LDA.l HardModeExclusionCapeUsage, X : STA.b $4C ; set cape decrement timer
+		LDA.l HardModeExclusionCapeUsage, X : STA.b CapeTimer ; set cape decrement timer
 		PLX
 	++
 	JML IncrementMagicUseCounterOne
@@ -66,9 +66,9 @@ ActivateInvulnerabilityOrDont:
 	BRA .nowhere_special
 	.somewhere_cool
 		SEP #$20 ; set 8-bit accumulator
-		LDA.b #$01 : STA.w $037B : RTL
+		LDA.b #$01 : STA.w NoDamage : RTL
 	.nowhere_special
-		LDA.l ByrnaInvulnerability : STA.w $037B
+		LDA.l ByrnaInvulnerability : STA.w NoDamage
 RTL
 ;--------------------------------------------------------------------------------
 GetItemDamageValue:
@@ -99,7 +99,7 @@ SearchAncilla:
 	PHX 
 	LDX #$00
 	.loop
-	LDA.w $0C4A, X 
+	LDA.w AncillaID, X 
 	INX : CPX #$0A : BEQ .notFound
 	CMP Scrap05 : BNE .loop
 		LDA.b #$01
diff --git a/heartpieces.asm b/heartpieces.asm
index 6bcbc72..79924b2 100644
--- a/heartpieces.asm
+++ b/heartpieces.asm
@@ -60,7 +60,7 @@ DrawHeartPieceGFX:
 	
 	PHA
 		JSL.l IsNarrowSprite : BCC +
-		LDA.w $0E60, X : ORA.b #$20 : STA.w $0E60, X
+		LDA.w SpriteControl, X : ORA.b #$20 : STA.w SpriteControl, X
 	+
     PLA
 	
@@ -101,7 +101,7 @@ HeartContainerSound:
 RTL
 ;--------------------------------------------------------------------------------
 NormalItemSkipSound:
-	LDA.w $0C5E, X ; thing we wrote over
+	LDA.w AncillaGet, X ; thing we wrote over
 
 	CPY.b #$20 : BEQ + ; Skip for Crystal
 	CPY.b #$37 : BEQ + ; Skip for Pendants
@@ -203,7 +203,7 @@ LoadIndoorValue:
 		%GetPossiblyEncryptedItem(HeartPiece_Spectacle_Cave, HeartPieceIndoorValues)
 		JMP .done
 	+ CMP.w #283 : BNE +
-		LDA.b $22 : XBA : AND.w #$0001 ; figure out where link is
+		LDA.b LinkPosX : XBA : AND.w #$0001 ; figure out where link is
 		BNE ++
 			%GetPossiblyEncryptedItem(HeartPiece_Circle_Bushes, HeartPieceIndoorValues)
 			JMP .done
@@ -239,7 +239,7 @@ LoadOutdoorValue:
 	REP #$20 ; set 16-bit accumulator
 	LDA.b OverworldIndex
 	CMP.w #$03 : BNE +
-		LDA.b $22 : CMP.w #1890 : !BLT ++
+		LDA.b LinkPosX : CMP.w #1890 : !BLT ++
 			%GetPossiblyEncryptedItem(HeartPiece_Spectacle, HeartPieceOutdoorValues)
 			JMP .done
 		++
@@ -255,7 +255,7 @@ LoadOutdoorValue:
 		%GetPossiblyEncryptedItem(HauntedGroveItem, HeartPieceOutdoorValues)
 		JMP .done
 	+ CMP.w #$30 : BNE +
-		LDA.b $22 : CMP.w #512 : !BGE ++
+		LDA.b LinkPosX : CMP.w #512 : !BGE ++
 			%GetPossiblyEncryptedItem(HeartPiece_Desert, HeartPieceOutdoorValues)
 			JMP .done
 		++
diff --git a/hooks.asm b/hooks.asm
index e68f1be..14b3568 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -707,16 +707,16 @@ JMP DrawItem_finished
 org $0DECE6 ; <- 6ECE6 - equipment.asm : 1934 (SEP #$30)
 DrawItem_finished:
 org $0DEB48 ; <- 6EB48 - equipment.asm : 1784 (LDA $0000)
-LDA.w $0000, Y : STA.w $11F2
-LDA.w $0002, Y : STA.w $11F4
-LDA.w $0040, Y : STA.w $1232
-LDA.w $0042, Y : STA.w $1234
+LDA.w $0000, Y : STA.w GFXStripes+$01F2
+LDA.w $0002, Y : STA.w GFXStripes+$01F4
+LDA.w $0040, Y : STA.w GFXStripes+$0232
+LDA.w $0042, Y : STA.w GFXStripes+$0234
 ;---------------------------
 org $0DE24B ; <- 6E24B - equipment.asm : 951 (LDA $0000)
-LDA.w $0000, Y : STA.w $11F2
-LDA.w $0002, Y : STA.w $11F4
-LDA.w $0040, Y : STA.w $1232
-LDA.w $0042, Y : STA.w $1234
+LDA.w $0000, Y : STA.w GFXStripes+$01F2
+LDA.w $0002, Y : STA.w GFXStripes+$01F4
+LDA.w $0040, Y : STA.w GFXStripes+$0232
+LDA.w $0042, Y : STA.w GFXStripes+$0234
 ;--------------------------------------------------------------------------------
 org $0DE2DC ; <- 6E2DC - equipment.asm : 989 (LDA $F449, X : STA $122C, Y)
 JMP UpdateBottleMenu_return
@@ -1175,6 +1175,7 @@ JSL.l CheckTabletSword
 ;--------------------------------------------------------------------------------
 org $1DF086 ; <- EF086 - sprite_evil_barrier.asm:303 (LDA $7EF359 : CMP.b #$02 : BCS .anozap_from_player_attack)
 JSL.l GetSwordLevelForEvilBarrier
+;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Medallion Tablets
@@ -1189,6 +1190,9 @@ org $07859F ; <- 3859F - Bank07.asm : 965 (JSL AddPendantOrCrystal)
 JSL SpawnTabletItem
 org $07862A ; <- 3862A - Bank07.asm : 1064 (JSL AddPendantOrCrystal)
 JSL SpawnTabletItem
+;--------------------------------------------------------------------------------
+org $05EF1E ; LDA.l $7EF280,X : AND #$40
+JSL CheckTabletItem : NOP #2
 
 ;================================================================================
 ; Medallion Entrances
@@ -1937,7 +1941,7 @@ org $05F08A ; <- 2F08A - sprite_heart_upgrades.asm : 324 - (LDA $7EF36B : INC A
 JSL.l HeartPieceGet
 JSL.l IsMedallion
 BCS + : BRA Sprite_EB_HeartPiece_handle_flags : + ; Don't change OW flags if we're
-STZ.w $0DD0,X : RTS                               ; getting a tablet item
+STZ.w SpriteAITable, X : RTS                      ; getting a tablet item
 ;--------------------------------------------------------------------------------
 org $06C0B0 ; <- 340B0 - sprite prep
 JSL.l HeartPieceSpritePrep
@@ -1950,8 +1954,8 @@ JSL.l HPItemReset
 ; Fake Flippers Softlock Fix + General Damage Hooks
 ;--------------------------------------------------------------------------------
 org $078091 ; <- 38091 - Bank07.asm:138 (LDA $037B : BNE .linkNotDamaged)
-LDA.w $0373 : STA.b Scrap00 : STZ.w $0373 ; store and zero damage
-LDA.w $037B : BNE LinkDamaged_linkNotDamaged ; skip if immune
+LDA.w DamageReceived : STA.b Scrap00 : STZ.w DamageReceived ; store and zero damage
+LDA.w NoDamage : BNE LinkDamaged_linkNotDamaged ; skip if immune
 ;--------------------------------------------------------------------------------
 org $0780C6 ; <- 380C6 - Bank07.asm:174 (LDA $7EF36D)
 JSL.l OnLinkDamaged
@@ -1982,7 +1986,7 @@ FakeFlipperProtection:
 org $0AB8E5 ; <- 538E5
 JSL.l FloodGateAndMasterSwordFollowerReset
 JSL.l IncrementFlute
-STZ $1000 : STZ $1001
+STZ.w GFXStripes : STZ.w GFXStripes+1
 NOP #26
 ;--------------------------------------------------------------------------------
 org $02AA87 ; <- 12A87
@@ -2213,10 +2217,10 @@ JSL ParadoxCaveGfxFix : NOP
 ;--------------------------------------------------------------------------------
 ; Change race game to use $021B instead of $0ABF for detecting cheating
 org $0DCB9D ; STZ.w $0ABF
-STZ.w $021B
+STZ.w RaceGameFlag
 
 org $0DCBFE ; LDA.w $0ABF
-LDA.w $021B
+LDA.w RaceGameFlag
 
 org $02BFE0 ; LDA.b #$01 : STA.w $0ABF
 JSL SetOverworldTransitionFlags : NOP
diff --git a/icepalacegraphics.asm b/icepalacegraphics.asm
index 987c803..193e36d 100644
--- a/icepalacegraphics.asm
+++ b/icepalacegraphics.asm
@@ -49,7 +49,7 @@ BgGraphicsLoading:
 
 ReloadingFloors:
     SEP #$30 ; 8 AXY
-    LDA.l $7EC2F8 ; Floor file that has been decompressed
+    LDA.l LastBGSet ; Floor file that has been decompressed
     TAY
     JSR ShouldOverrideFileLoad
     REP #$30 ; 16 AXY
diff --git a/initsramtable.asm b/initsramtable.asm
index db09b08..68d27ec 100644
--- a/initsramtable.asm
+++ b/initsramtable.asm
@@ -20,7 +20,7 @@ InitRoomDataWRAM:
 org $30B060 ; PC 0x183060
 InitATAltarRoom: dw $0000 ; aga curtains
 org $30B092 ; PC 0x183092
-InitSWBackEntryRoom: dw $0000 ; skull woods curtains (?)
+InitSWBackEntryRoom: dw $0000 ; skull woods curtains
 
 org $30B20C
 dw $F000, $F000 ; Pre-open kak bomb hut & brewery
diff --git a/inventory.asm b/inventory.asm
index b7935f6..c8e2a45 100644
--- a/inventory.asm
+++ b/inventory.asm
@@ -59,7 +59,7 @@ RTL
 		LDA.l BowTracking : AND.b #$C0 : CMP.b #$C0 : BNE .errorJump ; make sure we have both bows
 		PHX : LDX.b #$00 ; scan ancilla table for arrows
 			-- : CPX.b #$0A : !BGE ++
-				LDA.w $0C4A, X : CMP.b #$09 : BNE +++
+				LDA.w AncillaID, X : CMP.b #$09 : BNE +++
 					PLX : BRA .errorJump2 ; found an arrow, don't allow the swap
 				+++
 			INX : BRA -- : ++
@@ -84,7 +84,7 @@ RTL
 		.errorJump2
 		BRA .error
 	+ CMP #$0D : BNE + ; flute
-		LDA.w $037A :	CMP.b #$01 : BEQ .midShovel ; inside a shovel animation, force the shovel & make error sound
+		LDA.w UseY2 : CMP.b #$01 : BEQ .midShovel ; inside a shovel animation, force the shovel & make error sound
 		LDA.l InventoryTracking : BIT.b #$04 : BEQ .error ; make sure we have shovel
 					  AND.b #$03 : BEQ .error ; make sure we have one of the flutes
 		LDA.l FluteEquipment : CMP.b #01 : BNE .toShovel ; not shovel
@@ -250,7 +250,7 @@ AddInventory:
 	LDA.b IndoorsFlag : BEQ ++ ; skip shop check if outdoors
 	LDA.w ItemReceiptMethod : CMP.b #$01 : BEQ ++ ; skip shop check for chests
 		PHP : REP #$20 ; set 16-bit accumulator
-			LDA.w $048E
+			LDA.b RoomIndex
 			CMP.w #274 : BNE + : JMP .shop : + ; dark world death mountain shop, ornamental shield shop
 			CMP.w #271 : BNE + : JMP .shop : + ; villiage of outcasts shop, lumberjack shop, lake hylia shop, dark world magic shop
 			CMP.w #272 : BNE + : JMP .shop : + ; red shield shop
@@ -787,8 +787,8 @@ RTL
 ; DrawKeyIcon:
 ;--------------------------------------------------------------------------------
 DrawKeyIcon:
-	LDA.b Scrap04 : AND.w #$00FF : CMP.w #$0090 : BNE + : LDA.w #$007F : + : ORA.w #$2400 : STA.l $7EC764
-	LDA.b Scrap05 : AND.w #$00FF : ORA.w #$2400 : STA.l $7EC766
+	LDA.b Scrap04 : AND.w #$00FF : CMP.w #$0090 : BNE + : LDA.w #$007F : + : ORA.w #$2400 : STA.l HUDKeyDigits
+	LDA.b Scrap05 : AND.w #$00FF : ORA.w #$2400 : STA.l HUDTileMapBuffer+$66
 RTL
 ;--------------------------------------------------------------------------------
 
@@ -872,7 +872,7 @@ RTL
 ; DrawPowder:
 ;--------------------------------------------------------------------------------
 DrawPowder:
-	LDA.w $02DA : BNE .defer ; defer if link is buying a potion
+	LDA.w ItemReceiptPose : BNE .defer ; defer if link is buying a potion
 	LDA.l RedrawFlag : BEQ +
 		LDA.w SpriteAuxTable, X ; Retrieve stored item type
 		JSL.l PrepDynamicTile
@@ -960,14 +960,14 @@ RTL
 DrawMagicHeader:
 	LDA.l MagicConsumption : AND.w #$00FF : CMP.w #$0002 : BEQ .quarterMagic
 	.halfMagic
-    LDA.w #$28F7 : STA.l $7EC704
-    LDA.w #$2851 : STA.l $7EC706
-    LDA.w #$28FA : STA.l $7EC708
+    LDA.w #$28F7 : STA.l HUDTileMapBuffer+$04
+    LDA.w #$2851 : STA.l HUDTileMapBuffer+$06
+    LDA.w #$28FA : STA.l HUDTileMapBuffer+$08
 RTL   
 	.quarterMagic   
-    LDA.w #$28F7 : STA.l $7EC704
-    LDA.w #$2800 : STA.l $7EC706
-    LDA.w #$2801 : STA.l $7EC708
+    LDA.w #$28F7 : STA.l HUDTileMapBuffer+$04
+    LDA.w #$2800 : STA.l HUDTileMapBuffer+$06
+    LDA.w #$2801 : STA.l HUDTileMapBuffer+$08
 RTL
 ;--------------------------------------------------------------------------------
 
@@ -1001,7 +1001,7 @@ RTL
 SpawnShovelItem:
 	LDA.b #$01 : STA.l RedrawFlag
 
-    LDA.w $03FC : BEQ +
+    LDA.w YButtonOverride : BEQ +
     	JSL DiggingGameGuy_AttemptPrizeSpawn
 		JMP .skip
 	+
@@ -1034,18 +1034,18 @@ SpawnShovelItem:
 		LDA.l .x_speeds, X : STA.w SpriteVelocityX, Y
 
 		LDA.b #$00 : STA.w SpriteVelocityY, Y
-		LDA.b #$18 : STA.w $0F80, Y
-		LDA.b #$FF : STA.w $0B58, Y
-		LDA.b #$30 : STA.w $0F10, Y
+		LDA.b #$18 : STA.w SpriteVelocityZ, Y
+		LDA.b #$FF : STA.w EnemyStunTimer, Y
+		LDA.b #$30 : STA.w SpriteTimerE, Y
 
-		LDA.b $22 : !ADD.l .x_offsets, X
+		LDA.b LinkPosX : !ADD.l .x_offsets, X
 		                        AND.b #$F0 : STA.w SpritePosXLow, Y
-		LDA.b $23 : ADC.b #$00               : STA.w SpritePosXHigh, Y
+		LDA.b LinkPosX+1 : ADC.b #$00               : STA.w SpritePosXHigh, Y
 
-		LDA.b $20 : !ADD.b #$16 : AND.b #$F0 : STA.w SpritePosYLow, Y
-		LDA.b $21 : ADC.b #$00               : STA.w SpritePosYHigh, Y
+		LDA.b LinkPosY : !ADD.b #$16 : AND.b #$F0 : STA.w SpritePosYLow, Y
+		LDA.b LinkPosY+1 : ADC.b #$00               : STA.w SpritePosYHigh, Y
 
-		LDA.b #$00 : STA.w $0F20, Y
+		LDA.b #$00 : STA.w SpriteLayer, Y
 		TYX
 
 		LDA.b #$30 : JSL Sound_SetSfx3PanLong
diff --git a/inverted.asm b/inverted.asm
index 4880a1b..fdc9970 100644
--- a/inverted.asm
+++ b/inverted.asm
@@ -35,7 +35,7 @@ Overworld_CreatePyramidHoleModified:
 	JSL C9DE_LONG
 	JSL C9DE_LONG
 
-	LDA.w #$FFFF : STA.w $1012, Y
+	LDA.w #$FFFF : STA.w GFXStripes+$12, Y
 
 	JMP .ending
 .originalBehaviour
@@ -64,7 +64,7 @@ Overworld_CreatePyramidHoleModified:
 	JSL C9DE_LONG
 	JSL C9DE_LONG
 
-	LDA.w #$FFFF : STA.w $1012, Y
+	LDA.w #$FFFF : STA.w GFXStripes+$12, Y
 
 .ending
 	LDA.w #$3515 : STA.w SFX1
@@ -75,7 +75,7 @@ Overworld_CreatePyramidHoleModified:
 
 	LDA.b #$03 : STA.w SFX3
 
-	LDA.b #$01 : STA.b $14
+	LDA.b #$01 : STA.b NMISTRIPES
 
 RTL
 ;------------------------------------------------------------------------------
@@ -195,12 +195,12 @@ TurtleRockPegSolved:
 RTL
 
 MirrorBonk:
-	; must preserve X/Y, and must preserve $00-$0F
-	LDA.l InvertedMode : BEQ .normal
+        ; must preserve X/Y, and must preserve $00-$0F
+        LDA.l InvertedMode : BEQ .normal
 
-    ; Goal: use $20 and $22 to decide to force a bonk
-	; if we want to bonk branch to .forceBonk
-	; otherwise fall through to .normal
+        ; Goal: use $20 and $22 to decide to force a bonk
+        ; if we want to bonk branch to .forceBonk
+        ; otherwise fall through to .normal
 		PHX : PHP
 		PHB : PHK : PLB
 		LDA.b OverworldIndex : AND.b #$40 : BEQ .endLoop ;World we're in? branch if we are in LW we don't want bonks
@@ -208,31 +208,31 @@ MirrorBonk:
 		LDX.w #$0000
 		.loop
 			LDA.l .bonkRectanglesTable, X ;Load X1
-			CMP $22 : !BGE ++
+			CMP LinkPosX : !BGE ++
 			;IF X > X1
 			LDA.l .bonkRectanglesTable+2, X ; Load X2
-			CMP $22 : !BLT ++ 
+			CMP LinkPosX : !BLT ++ 
 			;IF X < X2
 			LDA.l .bonkRectanglesTable+4, X ;Load Y1
-			CMP $20 : !BGE ++
+			CMP LinkPosY : !BGE ++
 			;IF Y > Y1
 			LDA.l .bonkRectanglesTable+6, X ; Load Y2
-			CMP $20 : !BLT ++ 
+			CMP LinkPosY : !BLT ++ 
 			;IF Y < Y2
 			;Bonk Here
 			PLB : PLP : PLX
 			BRA .forceBonk
-		++
-		TXA : !ADD #$0008 : CMP #.tableEnd-.bonkRectanglesTable : BEQ .endLoop
-		TAX
-		BRA .loop
-		.endbonkRectanglesTable
+                ++
+                TXA : !ADD #$0008 : CMP #.tableEnd-.bonkRectanglesTable : BEQ .endLoop
+                TAX
+                BRA .loop
+                .endbonkRectanglesTable
 
-	.endLoop
-	PLB : PLP : PLX
+        .endLoop
+        PLB : PLP : PLX
 .normal
-    ;Not forcing a bonk, so the vanilla bonk detection run.
-	LDA.b Scrap0C : ORA.b Scrap0E
+        ;Not forcing a bonk, so the vanilla bonk detection run.
+        LDA.b Scrap0C : ORA.b Scrap0E
 JML.l MirrorBonk_NormalReturn
 .forceBonk
 JML.l MirrorBonk_BranchGamma
diff --git a/lampmantlecone.asm b/lampmantlecone.asm
index 8c4243a..f897b97 100644
--- a/lampmantlecone.asm
+++ b/lampmantlecone.asm
@@ -5,36 +5,38 @@
 ;--------------------------------------------------------------------------------
 LampCheck:
 	LDA.l LightConeModifier : CMP.b #$01 : BNE + : RTL : +
-				  CMP.b #$FF : BNE + : INC : RTL : +
-	
-	LDA.l LampEquipment : BNE .done ; skip if we already have lantern
-	
-	LDA.l CurrentWorld : BNE +
-		.lightWorld
-		LDA.w DungeonID : BNE ++ ; check if we're in sewers
-			LDA.l LampConeSewers : BRA .done
-		++
-			LDA.l LampConeLightWorld : BRA .done
-	+
-		.darkWorld
-		LDA.l LampConeDarkWorld
-	.done
+                                  CMP.b #$FF : BNE + : INC : RTL : +
+        LDA.l LampEquipment : BNE .lamp ; skip if we already have lantern
+        LDA.w DungeonID : BNE + ; check if we're in sewers
+                LDA.l LampConeSewers : RTL
+        + : TDC
+        .lamp
 RTL
 ;================================================================================
 ;--------------------------------------------------------------------------------
 ; Output: 0 locked, 1 open
 ;--------------------------------------------------------------------------------
 CheckForZelda:
-	LDA.l ProgressIndicator : CMP.b #$02 : !BLT + ; Skip if rain is falling
-		LDA.b #$01 ; pretend we have zelda anyway
-		RTL
-	+
-	LDA.l FollowerIndicator
+        LDA.l ProgressIndicator : CMP.b #$02 : !BLT + ; Skip if rain is falling
+                LDA.b #$01 ; pretend we have zelda anyway
+                RTL
+        +
+        LDA.l FollowerIndicator
 RTL
 ;================================================================================
-;--------------------------------------------------------------------------------
 SetOverlayIfLamp:
-	JSL.l LampCheck
-	STA.b $1D ; write it directly to the overlay, this isn't a terrible idea at all
+        JSL.l LampCheck
+        STA.b SUBDESQ ; write it directly to the overlay, this isn't a terrible idea at all
 RTL
 ;================================================================================
+; Mantle Object Changes
+;--------------------------------------------------------------------------------
+Mantle_CorrectPosition:
+	LDA.l ProgressFlags : AND.b #$04 : BEQ +
+		LDA.b #$0A : STA.w SpritePosXLow, X ; just spawn it off to the side where we know it should be
+		LDA.b #$03 : STA.w SpritePosXHigh, X
+		LDA.b #$90 : STA.w SpriteSpawnStep, X
+	+
+	LDA.w SpritePosYLow, X : !ADD.b #$03 ; thing we did originally
+RTL
+;--------------------------------------------------------------------------------
diff --git a/maidencrystals.asm b/maidencrystals.asm
index 7dcd6df..1ee421d 100644
--- a/maidencrystals.asm
+++ b/maidencrystals.asm
@@ -7,9 +7,9 @@
 ;--------------------------------------------------------------------------------
 MaidenCrystalScript:
         LDA.b #$00 : STA.l BusyItem
-        STZ.w $02D8
-        STZ.w $02DA
-        STZ.b $2E
+        STZ.w ItemReceiptID
+        STZ.w ItemReceiptPose
+        STZ.b LinkAnimationStep
         LDA.b #$02 : STA.w LinkDirection
         LDA.l CrystalsField : AND.b #$7F : CMP.b #$7F : BNE + ; check if we have all crystals
                 LDA.b #$08 : STA.l MapIcons ; Update the map icon to just be Ganon's Tower
diff --git a/mantle.asm b/mantle.asm
deleted file mode 100644
index 0e34340..0000000
--- a/mantle.asm
+++ /dev/null
@@ -1,12 +0,0 @@
-;================================================================================
-; Mantle Object Changes
-;--------------------------------------------------------------------------------
-Mantle_CorrectPosition:
-	LDA.l ProgressFlags : AND.b #$04 : BEQ +
-		LDA.b #$0A : STA.w $0D10, X ; just spawn it off to the side where we know it should be
-		LDA.b #$03 : STA.w $0D30, X
-		LDA.b #$90 : STA.w $0ED0, X
-	+
-	LDA.w $0D00, X : !ADD.b #$03 ; thing we did originally
-RTL
-;--------------------------------------------------------------------------------
diff --git a/medallions.asm b/medallions.asm
index fcfe259..cd3ceb3 100644
--- a/medallions.asm
+++ b/medallions.asm
@@ -40,7 +40,7 @@ TryOpenTRock:
 RTL
 ;--------------------------------------------------------------------------------
 MedallionTrigger_Bombos:
-    STZ.b $50 ; stuff we wrote over
+    STZ.b Strafe ; stuff we wrote over
     STZ.w FreezeSprites
 	
 	PHA
diff --git a/msu.asm b/msu.asm
index 0b46d28..43a7617 100644
--- a/msu.asm
+++ b/msu.asm
@@ -365,7 +365,7 @@ SpiralStairsPostCheck:
     LDA.b RoomIndex
     CMP.w #$000C : BNE +
         ; Ganon's tower entrance
-        LDX.w $0130 : CPX.b #$F1 : BNE .done  ; Check that we were fading out
+        LDX.w LastAPUCommand : CPX.b #$F1 : BNE .done  ; Check that we were fading out
 
         LDX.b #22 : STX.w MusicControlRequest
         BRA .done
@@ -374,7 +374,7 @@ SpiralStairsPostCheck:
     CMP.w #$006B : BNE .done
 
     ; Ganon's tower upstairs (with big key)
-    LDX.w $0130 : CPX.b #$F1 : BNE .done  ; Check that we were fading out
+    LDX.w LastAPUCommand : CPX.b #$F1 : BNE .done  ; Check that we were fading out
 
     LDX.b #59 : STX.w MusicControlRequest
 
@@ -387,9 +387,9 @@ SpiralStairsPostCheck:
 ; Make sure expanded OST tracks load properly after death/fairy revival
 ;--------------------------------------------------------------------------------
 StoreMusicOnDeath:
-    STA.l $7EC227   ; thing we wrote over
+    STA.l GameOverSongCache   ; thing we wrote over
     LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_AUDIO_PLAYING : BEQ .done
-    LDA.w CurrentMSUTrack : STA.l $7EC227
+    LDA.w CurrentMSUTrack : STA.l GameOverSongCache
 .done
     RTL
 ;--------------------------------------------------------------------------------
@@ -781,7 +781,7 @@ EndingMusicWait:
     LDA.w MSUID+4 : CMP.w #!VAL_MSU_ID_45 : BNE .done
     SEP #$20
 .wait
-    LDA.b $50 : BNE .done
+    LDA.b Strafe : BNE .done
     LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_AUDIO_PLAYING : BNE .wait
 .done
     SEP #$20
diff --git a/music.asm b/music.asm
index b536dd7..9cfb061 100644
--- a/music.asm
+++ b/music.asm
@@ -71,10 +71,10 @@ PreOverworld_LoadProperties_ChooseMusic:
     +
 
     .lastCheck
-    LDA.w $0132 : CMP.b #$F2 : BNE +
-    CPX.w $0130 : BNE +
-        ; If the last played command ($0132) was half volume (#$F2)
-        ; and the actual song playing ($0130) is same as the one for this area (X)
+    LDA.w MusicControlQueue : CMP.b #$F2 : BNE +
+    CPX.w LastAPUCommand : BNE +
+        ; If the last played command (MusicControlQueue) was half volume (#$F2)
+        ; and the actual song playing (LastAPUCommand) is same as the one for this area (X)
         ; then play the full volume command (#F3) instead of restarting the song
         LDX.b #$F3
     +
@@ -94,21 +94,17 @@ Overworld_FinishMirrorWarp:
 
 .clear_hdma_table
 
-    STA.w $1B00, X : STA.w $1B40, X
-    STA.w $1B80, X : STA.w $1BC0, X
-    STA.w $1C00, X : STA.w $1C40, X
-    STA.w $1C80, X
+    STA.w IrisPtr+$0000, X : STA.w IrisPtr+$0040, X
+    STA.w IrisPtr+$0080, X : STA.w IrisPtr+$00C0, X
+    STA.w IrisPtr+$0100, X : STA.w IrisPtr+$0140, X
+    STA.w IrisPtr+$0180, X
 
     DEX #2 : BPL .clear_hdma_table
-
-    LDA.w #$0000 : STA.l $7EC007 : STA.l $7EC009
+    LDA.w #$0000 : STA.l FadeTimer : STA.l FadeDirection
 
     SEP #$20
-
-    JSL $00D7C8               ; $57C8 IN ROM
-
-    LDA.b #$80 : STA.b $9B
-
+    JSL $00D7C8
+    LDA.b #$80 : STA.b HDMAENQ
     LDX.b #$04  ; bunny theme
 
     ; if not inverted and light world, or inverted and dark world, skip moon pearl check
@@ -205,7 +201,7 @@ BirdTravel_LoadTargetAreaMusic:
     ; Misery Mire rain SFX
     CMP.b #$70 : BNE ++
         LDA.l OverworldEventDataWRAM+$70 : AND.b #$20 : BNE ++
-            LDA.b #$01 : CMP.w $0131 : BEQ +
+            LDA.b #$01 : CMP.w LastSFX1 : BEQ +
                 STA.w SFX1
             + : BRA .checkInverted
     ++
diff --git a/newhud.asm b/newhud.asm
index 6fd9b9c..c3553e9 100644
--- a/newhud.asm
+++ b/newhud.asm
@@ -179,34 +179,34 @@ DrawMagicMeter_mp_tilemap = $0DFE0F
 	CMP.w #0001 : BEQ .yellow
 	CMP.w #0002 : BNE + : JMP .green : +
 	.blue
-	    LDA.l DrawMagicMeter_mp_tilemap+0, X : AND.w #$EFFF : STA.l $7EC746
-	    LDA.l DrawMagicMeter_mp_tilemap+2, X : AND.w #$EFFF : STA.l $7EC786
-	    LDA.l DrawMagicMeter_mp_tilemap+4, X : AND.w #$EFFF : STA.l $7EC7C6
-	    LDA.l DrawMagicMeter_mp_tilemap+6, X : AND.w #$EFFF : STA.l $7EC806
+	    LDA.l DrawMagicMeter_mp_tilemap+0, X : AND.w #$EFFF : STA.l HUDTileMapBuffer+$46
+	    LDA.l DrawMagicMeter_mp_tilemap+2, X : AND.w #$EFFF : STA.l HUDTileMapBuffer+$86
+	    LDA.l DrawMagicMeter_mp_tilemap+4, X : AND.w #$EFFF : STA.l HUDTileMapBuffer+$C6
+	    LDA.l DrawMagicMeter_mp_tilemap+6, X : AND.w #$EFFF : STA.l HUDTileMapBuffer+$06
             RTL
 	.red
-	    LDA.l DrawMagicMeter_mp_tilemap+0, X : AND.w #$E7FF : STA.l $7EC746
-	    LDA.l DrawMagicMeter_mp_tilemap+2, X : AND.w #$E7FF : STA.l $7EC786
-	    LDA.l DrawMagicMeter_mp_tilemap+4, X : AND.w #$E7FF : STA.l $7EC7C6
-	    LDA.l DrawMagicMeter_mp_tilemap+6, X : AND.w #$E7FF : STA.l $7EC806
+	    LDA.l DrawMagicMeter_mp_tilemap+0, X : AND.w #$E7FF : STA.l HUDTileMapBuffer+$46
+	    LDA.l DrawMagicMeter_mp_tilemap+2, X : AND.w #$E7FF : STA.l HUDTileMapBuffer+$86
+	    LDA.l DrawMagicMeter_mp_tilemap+4, X : AND.w #$E7FF : STA.l HUDTileMapBuffer+$C6
+	    LDA.l DrawMagicMeter_mp_tilemap+6, X : AND.w #$E7FF : STA.l HUDTileMapBuffer+$06
             RTL
 	.yellow
-	    LDA.l DrawMagicMeter_mp_tilemap+0, X : AND.w #$EBFF : STA.l $7EC746
-	    LDA.l DrawMagicMeter_mp_tilemap+2, X : AND.w #$EBFF : STA.l $7EC786
-	    LDA.l DrawMagicMeter_mp_tilemap+4, X : AND.w #$EBFF : STA.l $7EC7C6
-	    LDA.l DrawMagicMeter_mp_tilemap+6, X : AND.w #$EBFF : STA.l $7EC806
+	    LDA.l DrawMagicMeter_mp_tilemap+0, X : AND.w #$EBFF : STA.l HUDTileMapBuffer+$46
+	    LDA.l DrawMagicMeter_mp_tilemap+2, X : AND.w #$EBFF : STA.l HUDTileMapBuffer+$86
+	    LDA.l DrawMagicMeter_mp_tilemap+4, X : AND.w #$EBFF : STA.l HUDTileMapBuffer+$C6
+	    LDA.l DrawMagicMeter_mp_tilemap+6, X : AND.w #$EBFF : STA.l HUDTileMapBuffer+$0106
             RTL
 	.orange
-	    LDA.l DrawMagicMeter_mp_tilemap+0, X : AND.w #$E3FF : STA.l $7EC746
-	    LDA.l DrawMagicMeter_mp_tilemap+2, X : AND.w #$E3FF : STA.l $7EC786
-	    LDA.l DrawMagicMeter_mp_tilemap+4, X : AND.w #$E3FF : STA.l $7EC7C6
-	    LDA.l DrawMagicMeter_mp_tilemap+6, X : AND.w #$E3FF : STA.l $7EC806
+	    LDA.l DrawMagicMeter_mp_tilemap+0, X : AND.w #$E3FF : STA.l HUDTileMapBuffer+$46
+	    LDA.l DrawMagicMeter_mp_tilemap+2, X : AND.w #$E3FF : STA.l HUDTileMapBuffer+$86
+	    LDA.l DrawMagicMeter_mp_tilemap+4, X : AND.w #$E3FF : STA.l HUDTileMapBuffer+$C6
+	    LDA.l DrawMagicMeter_mp_tilemap+6, X : AND.w #$E3FF : STA.l HUDTileMapBuffer+$0106
             RTL
 	.green
-	    LDA.l DrawMagicMeter_mp_tilemap+0, X : STA.l $7EC746
-	    LDA.l DrawMagicMeter_mp_tilemap+2, X : STA.l $7EC786
-	    LDA.l DrawMagicMeter_mp_tilemap+4, X : STA.l $7EC7C6
-	    LDA.l DrawMagicMeter_mp_tilemap+6, X : STA.l $7EC806
+	    LDA.l DrawMagicMeter_mp_tilemap+0, X : STA.l HUDTileMapBuffer+$46
+	    LDA.l DrawMagicMeter_mp_tilemap+2, X : STA.l HUDTileMapBuffer+$86
+	    LDA.l DrawMagicMeter_mp_tilemap+4, X : STA.l HUDTileMapBuffer+$C6
+	    LDA.l DrawMagicMeter_mp_tilemap+6, X : STA.l HUDTileMapBuffer+$0106
 RTL
 
 ;================================================================================
@@ -242,33 +242,6 @@ HudHexToDec4Digit:
 	STY.b Scrap07 ; Store 1s digit
 RTS
 
-;================================================================================
-; 8-bit registers
-; in:	A(b) - Byte to Convert
-; out:	$05 - $07 (high - low)
-;================================================================================
-;HudHexToDec3Digit: ; this may be overkill, could have used the 4 digit one...
-;	LDY.b #$90
-;	-
-;		CMP.b #100 : !BLT +
-;		INY
-;		SBC.b #100 : BRA -
-;	+
-;	STY $05 : LDY.b #$90 ; Store 100s digit and reset Y
-;	-
-;		CMP.b #10 : !BLT +
-;		INY
-;		SBC.b #10 : BRA -
-;	+
-;	STY $06 : LDY #$90 ; Store 10s digit and reset Y
-;	CMP.b #1 : !BLT +
-;	-
-;		INY
-;		DEC : BNE -
-;	+
-;	STY $07	; Store 1s digit
-;RTS
-
 ;================================================================================
 ; 8-bit registers
 ; in:	A(b) - Byte to Convert
diff --git a/newitems.asm b/newitems.asm
index 2545f9e..6d53808 100755
--- a/newitems.asm
+++ b/newitems.asm
@@ -898,23 +898,23 @@ LDA.l ArrowMode : BEQ .normal
 	+ CMP.b #03 : !BGE .silver
 
 	.wooden
-	LDA.b #$A7 : STA.l $7EC720 ; draw wooden arrow marker
-	LDA.b #$20 : STA.l $7EC721
-	LDA.b #$A9 : STA.l $7EC722
-	LDA.b #$20 : STA.l $7EC723
+	LDA.b #$A7 : STA.l HUDTileMapBuffer+$20 ; draw wooden arrow marker
+	LDA.b #$20 : STA.l HUDTileMapBuffer+$21
+	LDA.b #$A9 : STA.l HUDTileMapBuffer+$22
+	LDA.b #$20 : STA.l HUDTileMapBuffer+$23
 RTL
 	.normal ; in normal arrow mode this function is only ever called for silvers
 	.silver
-	LDA.b #$86 : STA.l $7EC720 ; draw silver arrow marker
-	LDA.b #$24 : STA.l $7EC721
-	LDA.b #$87 : STA.l $7EC722
-	LDA.b #$24 : STA.l $7EC723
+	LDA.b #$86 : STA.l HUDTileMapBuffer+$20 ; draw silver arrow marker
+	LDA.b #$24 : STA.l HUDTileMapBuffer+$21
+	LDA.b #$87 : STA.l HUDTileMapBuffer+$22
+	LDA.b #$24 : STA.l HUDTileMapBuffer+$23
 RTL
 	.none
-	LDA.b #$7F : STA.l $7EC720 ; draw no arrow marker
-	LDA.b #$24 : STA.l $7EC721
-	LDA.b #$7F : STA.l $7EC722
-	LDA.b #$24 : STA.l $7EC723
+	LDA.b #$7F : STA.l HUDTileMapBuffer+$20 ; draw no arrow marker
+	LDA.b #$24 : STA.l HUDTileMapBuffer+$21
+	LDA.b #$7F : STA.l HUDTileMapBuffer+$22
+	LDA.b #$24 : STA.l HUDTileMapBuffer+$23
 RTL
 ;--------------------------------------------------------------------------------
 GetRNGItemSingle:
diff --git a/npcitems.asm b/npcitems.asm
index df48a9d..8ed60fb 100644
--- a/npcitems.asm
+++ b/npcitems.asm
@@ -61,7 +61,7 @@ ItemCheck_TreeKid3:
 	BRA .done
 	LDA.b #$05
 	.normal
-	LDA.w SpriteUnknown, X
+	LDA.w SpriteActivity, X
 	.done
 RTL
 
@@ -151,7 +151,7 @@ RTL
 ; Randomize 300 Rupee NPC
 ;--------------------------------------------------------------------------------
 Set300RupeeNPCItem:
-	INC.w SpriteUnknown, X ; thing we wrote over
+	INC.w SpriteActivity, X ; thing we wrote over
 
 	PHA : PHP
 	REP #$20 ; set 16-bit accumulator
diff --git a/password.asm b/password.asm
index a1b52be..edf77c7 100644
--- a/password.asm
+++ b/password.asm
@@ -16,7 +16,7 @@ Password_BeginInit:
 	JSL Vram_EraseTilemaps_triforce
 
 	JSL LoadCustomHudPalette ; replace the 2bpp palettes, and trigger upload
-	LDA.b #$07 : STA.b $14 ; have NMI load up the initial tilemap from Password_Tilemap
+	LDA.b #$07 : STA.b NMISTRIPES ; have NMI load up the initial tilemap from Password_Tilemap
 
 	INC.b GameSubMode
 RTL
@@ -37,7 +37,7 @@ Password_EndInit:
                 DEX : BPL -
 	+
 
-	LDA.b #$0F : STA.b $13
+	LDA.b #$0F : STA.b INIDISPQ
 	INC.b GameSubMode
 RTL
 
@@ -119,7 +119,7 @@ Password_Main:
 	JSR UpdatePasswordTiles
 
 	JSR PasswordSetNewCursors
-	LDA.b #$01 : STA.b $14
+	LDA.b #$01 : STA.b NMISTRIPES
 	PLB
 RTL
 .selectionValues
diff --git a/pendantcrystalhud.asm b/pendantcrystalhud.asm
index 0f86c2d..6aabf1c 100644
--- a/pendantcrystalhud.asm
+++ b/pendantcrystalhud.asm
@@ -31,11 +31,11 @@ RTL
 HUDRebuildIndoor:
 	LDA.l GenericKeys : BEQ .normal
 	.generic
-	LDA.b #$00 : STA.l $7EC017
+	LDA.b #$00 : STA.l RoomDarkness
 	LDA.l CurrentGenericKeys ; generic key count
 RTL
 	.normal
-    LDA.b #$00 : STA.l $7EC017
+    LDA.b #$00 : STA.l RoomDarkness
     LDA.b #$FF ; don't show keys
 RTL
 ;================================================================================
@@ -186,7 +186,7 @@ RTL
 UpdateKeys:
 	PHX : PHP
 	SEP #$30 ; set 8-bit accumulator & index registers
-		LDA.w DungeonID : CMP.b $1F : !BLT .skip
+		LDA.w DungeonID : CMP.b TSWQ : !BLT .skip
 		
 		LSR : TAX ; get dungeon index and store to X
 	
@@ -219,39 +219,38 @@ RTL
 ;--------------------------------------------------------------------------------
 DrawBootsInMenuLocation:
 	LDA.l HUDDungeonItems : BNE +
-		LDA.w #$1608 : STA.b $00
+		LDA.w #$1608 : STA.b Scrap00
 		RTL
 	+
-	LDA.w #$1588 : STA.b $00
+	LDA.w #$1588 : STA.b Scrap00
 RTL
 ;--------------------------------------------------------------------------------
 DrawGlovesInMenuLocation:
 	LDA.l HUDDungeonItems : BNE +
-		LDA.w #$1610 : STA.b $00
+		LDA.w #$1610 : STA.b Scrap00
 		RTL
 	+
-	LDA.w #$1590 : STA.b $00
+	LDA.w #$1590 : STA.b Scrap00
 RTL
 ;--------------------------------------------------------------------------------
 DrawFlippersInMenuLocation:
 	LDA.l HUDDungeonItems : BNE +
-		LDA.w #$1618 : STA.b $00
+		LDA.w #$1618 : STA.b Scrap00
 		RTL
 	+
-	LDA.w #$1598 : STA.b $00
+	LDA.w #$1598 : STA.b Scrap00
 RTL
 ;--------------------------------------------------------------------------------
 DrawMoonPearlInMenuLocation:
 	LDA.l HUDDungeonItems : BNE +
-		LDA.w #$1620 : STA.b $00
+		LDA.w #$1620 : STA.b Scrap00
 		RTL
 	+
-	LDA.w #$15A0 : STA.b $00
+	LDA.w #$15A0 : STA.b Scrap00
 RTL
 ;--------------------------------------------------------------------------------
 DrawHUDDungeonItems:
 	LDA.l HUDDungeonItems : BNE .continue
-
 	RTL
 
 .dungeon_positions
@@ -328,12 +327,12 @@ DrawHUDDungeonItems:
 	; dungeon names
 	LDA.w #$2D50
 
-	LDY.w #0
+	LDY.w #00
 
 
 .next_dungeon_name
 	LDX.w .dungeon_positions,Y
-	STA.w $1646,X
+	STA.w GFXStripes+$0646,X
 
 	INC
 
@@ -344,9 +343,9 @@ DrawHUDDungeonItems:
 	LDX.w #$001E
 	LDA.w #$24F5
 
---	STA.w $1686,X
-	STA.w $16C6,X
-	STA.w $1706,X
+--	STA.w GFXStripes+$0686,X
+	STA.w GFXStripes+$06C6,X
+	STA.w GFXStripes+$0706,X
 
 	DEX : DEX : BPL --
 
@@ -361,7 +360,7 @@ DrawHUDDungeonItems:
 	LDA.l HUDDungeonItems : AND.w #$0001 : BEQ .skip_small_keys
 
 .draw_small_keys
-		LDA.w #$2810 : STA.w $1684 ; small keys icon
+		LDA.w #$2810 : STA.w GFXStripes+$0684 ; small keys icon
 
 		LDY.w #0
 
@@ -376,7 +375,7 @@ DrawHUDDungeonItems:
 
 		LDX.w .dungeon_positions,Y
 		ADC.w #$2816
-		STA.w $1686,X
+		STA.w GFXStripes+$0686,X
 
 		INY : INY
 		CPY.w #26 : BCC .next_small_key
@@ -389,7 +388,7 @@ DrawHUDDungeonItems:
 	LDA.l HUDDungeonItems : AND.w #$0002 : BEQ .skip_big_keys
 
 
-		LDA.w #$2811 : STA.w $16C4 ; big key icon
+		LDA.w #$2811 : STA.w GFXStripes+$06C4 ; big key icon
 
 		; use X so we can BIT
 		LDX.w #0
@@ -403,7 +402,7 @@ DrawHUDDungeonItems:
 
 		LDY.w .dungeon_positions,X
 		LDA.w #$2826
-		STA.w $16C6,Y
+		STA.w GFXStripes+$06C6,Y
 
 		; reload
 		LDA.l BigKeyField
@@ -417,7 +416,7 @@ DrawHUDDungeonItems:
 .skip_big_keys
 
 	LDA.l HUDDungeonItems : AND.w #$0010 : BEQ .skip_boss_kills
-		LDA.w #$280F : STA.w $1704 ; skull icon
+		LDA.w #$280F : STA.w GFXStripes+$0704 ; skull icon
 		LDY.w #0
 
 .next_boss_kill
@@ -428,7 +427,7 @@ DrawHUDDungeonItems:
 
 		LDA.w #$2826
 		LDX.w .dungeon_positions,Y
-		STA.w $1706,X
+		STA.w GFXStripes+$0706,X
 
 ..skip_boss_kill
 		INY : INY
@@ -446,7 +445,7 @@ DrawHUDDungeonItems:
 
 	; Maps
 	LDA.l HUDDungeonItems : AND.w #$0004 : BEQ .skip_maps
-		LDA.w #$2821 : STA.w $1684 ; map icon
+		LDA.w #$2821 : STA.w GFXStripes+$0684 ; map icon
 
 		; use X so we can BIT
 		LDX.w #0
@@ -460,7 +459,7 @@ DrawHUDDungeonItems:
 
 		LDY.w .dungeon_positions,X
 		LDA.w #$2826
-		STA.w $1686,Y
+		STA.w GFXStripes+$0686,Y
 
 		; reload
 		LDA.l MapField
@@ -475,7 +474,7 @@ DrawHUDDungeonItems:
 
 	; Compasses
 	LDA.l HUDDungeonItems : AND.w #$0008 : BEQ .skip_compasses
-		LDA.w #$2C20 : STA.w $16C4 ; compass icon
+		LDA.w #$2C20 : STA.w GFXStripes+$06C4 ; compass icon
 
 		; use X so we can BIT
 		LDX.w #0
@@ -489,7 +488,7 @@ DrawHUDDungeonItems:
 
 		LDY.w .dungeon_positions,X
 		LDA.w #$2826
-		STA.w $16C6,Y
+		STA.w GFXStripes+$06C6,Y
 
 		; reload
 		LDA.l CompassField
@@ -513,15 +512,15 @@ DrawPendantCrystalDiagram:
 		REP #$30 ; Set 16-bit accumulator & index registers
 		LDX.w #$0000 ; Paint entire box black & draw empty pendants and crystals
 		-
-		LDA.l .row0, X : STA.w $12EA, X
-		LDA.l .row1, X : STA.w $132A, X
-		LDA.l .row2, X : STA.w $136A, X
-		LDA.l .row3, X : STA.w $13AA, X
-		LDA.l .row4, X : STA.w $13EA, X
-		LDA.l .row5, X : STA.w $142A, X
-		LDA.l .row6, X : STA.w $146A, X
-		LDA.l .row7, X : STA.w $14AA, X
-		LDA.l .row8, X : STA.w $14EA, X
+		LDA.l .row0, X : STA.w GFXStripes+$02EA, X
+		LDA.l .row1, X : STA.w GFXStripes+$032A, X
+		LDA.l .row2, X : STA.w GFXStripes+$036A, X
+		LDA.l .row3, X : STA.w GFXStripes+$03AA, X
+		LDA.l .row4, X : STA.w GFXStripes+$03EA, X
+		LDA.l .row5, X : STA.w GFXStripes+$042A, X
+		LDA.l .row6, X : STA.w GFXStripes+$046A, X
+		LDA.l .row7, X : STA.w GFXStripes+$04AA, X
+		LDA.l .row8, X : STA.w GFXStripes+$04EA, X
 		INX #2 : CPX.w #$0014 : BCC -
 		
 		; pendants
@@ -529,59 +528,56 @@ DrawPendantCrystalDiagram:
 
 		  LSR : BCC + ; pendant of wisdom (red)
 			LDX.w #$252B
-			STX.w $13B6
-			INX : STX.w $13B8
-			INX : STX.w $13F6
-			INX : STX.w $13F8
+			STX.w GFXStripes+$03B6
+			INX : STX.w GFXStripes+$03B8
+			INX : STX.w GFXStripes+$03F6
+			INX : STX.w GFXStripes+$03F8
 
 		+ LSR : BCC + ; pendant of power (blue)
 			LDX.w #$2D2B
-			STX.w $13AE
-			INX : STX.w $13B0
-			INX : STX.w $13EE
-			INX : STX.w $13F0
+			STX.w GFXStripes+$03AE
+			INX : STX.w GFXStripes+$03B0
+			INX : STX.w GFXStripes+$03EE
+			INX : STX.w GFXStripes+$03F0
 
 		+ LSR : BCC + ; pendant of courage (green)
 			LDX.w #$3D2B
-			STX.w $1332
-			INX : STX.w $1334
-			INX : STX.w $1372
-			INX : STX.w $1374
+			STX.w GFXStripes+$0332
+			INX : STX.w GFXStripes+$0334
+			INX : STX.w GFXStripes+$0372
+			INX : STX.w GFXStripes+$0374
 		+
-
-
-
 		; crystals
 		LDA.l CrystalsField
 		LDX.w #$2D44
 		LDY.w #$2D45
 
 		  BIT.w #$0002 : BEQ + ; crystal 1
-			STX.w $14AC
-			STY.w $14AE
+			STX.w GFXStripes+$04AC
+			STY.w GFXStripes+$04AE
 		+ BIT.w #$0010 : BEQ + ; crystal 2
-			STX.w $146E
-			STY.w $1470
+			STX.w GFXStripes+$046E
+			STY.w GFXStripes+$0470
 		+ BIT.w #$0040 : BEQ + ; crystal 3
-			STX.w $14B0
-			STY.w $14B2
+			STX.w GFXStripes+$04B0
+			STY.w GFXStripes+$04B2
 		+ BIT.w #$0020 : BEQ + ; crystal 4
-			STX.w $1472
-			STY.w $1474
+			STX.w GFXStripes+$0472
+			STY.w GFXStripes+$0474
 		+ BIT.w #$0008 : BEQ + ; crystal 7
-			STX.w $14B8
-			STY.w $14BA
+			STX.w GFXStripes+$04B8
+			STY.w GFXStripes+$04BA
 		+ 
 
 		LDX.w #$2544
 		LDY.w #$2545
 
 		  BIT.w #$0004 : BEQ + ; crystal 5
-			STX.w $14B4
-			STY.w $14B6
+			STX.w GFXStripes+$04B4
+			STY.w GFXStripes+$04B6
 		+ BIT.w #$0001 : BEQ + ; crystal 6
-			STX.w $1476
-			STY.w $1478
+			STX.w GFXStripes+$0476
+			STY.w GFXStripes+$0478
 		+
 
 	PLB : PLP
diff --git a/playername.asm b/playername.asm
index b9f80bc..fe4c5be 100644
--- a/playername.asm
+++ b/playername.asm
@@ -15,20 +15,20 @@ WriteBlanksToPlayerName:
 	STA.l ExtendedFileNameSRAM+20
 	STA.l ExtendedFileNameSRAM+22
 
-        STA.l $7003D9, X ;What we wrote over (clear first byte of vanilla name slot)
+        STA.l FileNameVanillaSRAM, X ;What we wrote over (clear first byte of vanilla name slot)
 RTL
 
 WriteCharacterToPlayerName:
 	STA.l ExtendedFileNameSRAM, X
         CPX.w #$0008 : !BGE +
-	    STA.l $7003D9, X ;what we wrote over
+	    STA.l FileNameVanillaSRAM, X ;what we wrote over
         +
 RTL
 
 ReadCharacterFromPlayerName: ;Only for use on Name Screen
 	LDA.l ExtendedFileNameSRAM, X
         CPX.w #$0008 : !BGE +
-            LDA.l $7003D9, X ;what we wrote over
+            LDA.l FileNameVanillaSRAM, X ;what we wrote over
         +
 RTL
 
@@ -40,13 +40,13 @@ PLB
 RTL
 
 WrapCharacterPosition:
-	LDA.w $0B12 : BPL +
+	LDA.w PlayerNameCursor : BPL +
 		LDA.b #$0B
 	+
 	CMP.b #$0C : !BLT +
 		LDA.b #$00
 	+
-	STA.w $0B12
+	STA.w PlayerNameCursor
 RTL
 
 CharacterPositions:
diff --git a/ram.asm b/ram.asm
index 23a65b7..be87595 100644
--- a/ram.asm
+++ b/ram.asm
@@ -4,9 +4,9 @@
 ; This module is primarily concerned with labeling WRAM addresses used by the
 ; randomizer and documenting their usage. We use a combination of base $[address]
 ; and WRAMLabel = $[address] here, favoring the former when we have larger blocks
-; of contiguous ram labeled. In some cases the label name can be descriptive enough
-; without documentation, you may want to consult more in-depth reference materials,
-; or I just don't understand what they are.
+; of contiguous ram labeled. A line is skipped when the next address is non-cotiguous,
+; but comments will go in the empty space if multi-line. In some cases the label
+; name can be descriptive enough without documentation. Or I just didn't know what it was.
 ;
 ; See the JP 1.0 disassembly for reference, specifically symbols_wram.asm
 ; (https://github.com/spannerisms/jpdasm/ - 19/11/2022)
@@ -38,28 +38,42 @@ Scrap0C: skip 1                   ;
 Scrap0D: skip 1                   ;
 Scrap0E: skip 1                   ;
 Scrap0F: skip 1                   ;
-                                  ;
 GameMode = $7E0010                ; Game mode & submode. Refer to disassembly.
 GameSubMode = $7E0011             ;
-                                  ;
+NMIDoneFlag = $7E0012             ; $00 = Main loop done | $01 = Not done (lag)
+INIDISPQ = $7E0013                ; Queue for INIDISP updates. Written during NMI.
+NMISTRIPES = $7E0014              ; NMI update flags.
+NMICGRAM = $7E0015                ; When non-zero, will trigger a specific gfx update
+NMIHUD = $7E0016                  ; during NMI.
+NMIINCR = $7E0017                 ;
+NMIUP1100 = $7E0018               ;
+UPINCVH = $7E0019                 ; Incremental upload VRAM high byte
 FrameCounter = $7E001A            ; Increments every frame that the game isn't lagging
 IndoorsFlag = $7E001B             ; $00 = Outdoors | $01 = Indoors
-                                  ;
+MAINDESQ = $7E001C                ; PPU register queues written during NMI
+SUBDESQ = $7E001D                 ;
+TMWQ = $7E001E                    ;
+TSWQ = $7E001F                    ;
 LinkPosY = $7E0020                ; Link's absolute x/y coordinates. Both are word length.
 LinkPosX = $7E0022                ;
 LinkPosZ = $7E0024                ; $FFFF when on ground
-                                  ;
+LinkPushDirection = $7E0026       ; - - - - u d l r
 LinkRecoilY = $7E0027             ;
 LinkRecoilX = $7E0028             ;
 LinkRecoilZ = $7E0029             ;
-                                  ;
+LinkSubPixelVelocty = $7E002A     ; Word length
+LinkAnimationStep = $7E002E       ;
 LinkDirection = $7E002F           ; $00 = Up | $02 = Down | $04 = Left | $06 = Right
                                   ;
 OAMOffsetY = $7E0044              ;
 OAMOffsetX = $7E0045              ;
                                   ;
+CapeTimer = $7E004C               ; Countdown for cape sapping magic Countdown for cape sapping magic..
 LinkJumping = $7E004D             ; $00 = None | $01 = Bonk/damage/water | $02 = Ledge
                                   ;
+Strafe = $7E0050                  ; ???
+                                  ;
+CapeOn = $7E0055                  ; Link invisible and untouchable when set.
 BunnyFlagDP = $7E0056             ; $00 = Link | $01 = Bunny
                                   ;
 LinkSlipping = $7E005B            ; $00 = None | $01 = Near pit
@@ -68,14 +82,35 @@ FallTimer = $7E005C               ; Timer for falling animation
 LinkState = $7E005D               ; Main Link state handler
 LinkSpeed = $7E005E               ; Main Link speed handler
                                   ;
+LinkWalkDirection = $7E0067       ; - - - - u d l r
+                                  ;
+ScrapBuffer72 = $7E0072           ; Volatile scrap buffer. 5 bytes.
+                                  ;
+WorldCache = $7E007B              ; $00 = Light world | $40 bit set for dark world.
+                                  ;
 OverworldIndex = $7E008A          ; Overworld screen index. Word length. Dark world is OR $40 of
                                   ; light world screen in same position. Zeroed on UW entry.
 OverlayID = $7E008C               ; Overworld overlay ID. One Byte.
                                   ;
+OAMPtr = $7E0090                  ; Pointer used to indirectly address OAM buffer. 4 bytes.
+BGMODEQ = $7E0094                 ; Various PPU queues handled during NMI
+MOSAICQ = $7E0095                 ;
+W12SELQ = $7E0096                 ;
+W34SELQ = $7E0097                 ;
+WOBJSELQ = $7E0098                ;
+CGWSELQ = $7E0099                 ;
+CGADSUBQ = $7E009A                ;
+HDMAENQ = $7E009B                 ; HDMA enable flags
+                                  ;
 RoomIndex = $7E00A0               ; Underworld room index. Word length. High byte: $00 = EG1 | $01 = EG2
                                   ; Not zeroed on exit to overworld.
 PreviousRoom = $7E00A2            ; Stores previous value of RoomIndex
                                   ;
+CameraBoundH = $7E00A6            ; Which set of camera boundaries to use.
+CameraBoundV = $7E00A7            ;
+                                  ;
+RoomTag = $7E00AE                 ; Room effects; e.g. kill room, shutter switch, etc. Word length.
+                                  ;
 SubSubModule = $7E00B0            ; Often used as a submodule, such as for transitions
                                   ;
 ObjPtr = $7E00B7                  ; Pointer for drawing room objects. Three bytes.
@@ -114,23 +149,31 @@ Joy2B_Old = $7E00FB               ;
 ; Pages 0x00–0x1F of Bank7E are mirrored to every program bank ALTTP uses.
 ;--------------------------------------------------------------------------------
 
+DeathReloadFlag = $7E010A         ; Flag set on death for dungeon reload
 CurrentMSUTrack = $7E010B         ;
 GameModeCache = $7E010C           ;
 GameSubModeCache = $7E010D        ;
+EntranceIndex = $7E010E           ; Entrance ID into underworld. Word length.
                                   ;
 MedallionFlag = $7E0112           ; Medallion cutscene flag. $01 = Cutscene active.
                                   ;
+VRAMUploadAddress = $7E0118       ; Incremental VRAM upload address. Low byte always 0. Word length.
+                                  ;
 BG1ShakeV = $7E011A               ; Applied to BG Scroll. Word Length.
 BG1ShakeH = $7E011C               ;
                                   ;
 CurrentVolume = $7E0127           ;
 TargetVolume = $7E0129            ;
-CurrentControlRequest = $7E0133   ; Last thing written to MusicControlRequest
 MusicControl = $7E012B            ;
 MusicControlRequest = $7E012C     ;
 SFX1 = $7E012D                    ;
 SFX2 = $7E012E                    ;
 SFX3 = $7E012F                    ;
+LastAPUCommand = $7E0130          ; Last non-zero command given to SPC.
+LastSFX1 = $7E0131                ; Last non-zero SFX1
+MusicControlQueue = $7E0132       ; Used to queue up writes to MusicControlRequest
+CurrentControlRequest = $7E0133   ; Last thing written to MusicControlRequest
+LastAPU = $7E0134                 ; Stores last anything written to MusicControlRequest
                                   ;
 SubModuleInterface = $7E0200      ; Word length. High byte expected to be $00.
 ItemCursor = $7E0202              ; Current location of the item menu cursor.
@@ -139,22 +182,51 @@ BottleMenuCounter = $7E0205       ; Step counter for opening bottle menu
 MenuFrameCounter = $7E0206        ; Incremented every menu frame. Never read.
 MenuBlink = $7E0207               ; Incremented every frame and masked with $10 to blink cursor
                                   ;
+RaceGameFlag = $7E021B            ;
+                                  ;
+MessageJunk = $7E0223             ; Zeroed but never used (?)
+                                  ;
 ItemReceiptID = $7E02D8           ;
+ItemReceiptPose = $7E02DA         ; $00 = No pose | $01 = One hand up | $02 = Two hands up
                                   ;
 BunnyFlag = $7E02E0               ; $00 = Link | $01 = Bunny
-                                  ;
+Poofing = $7E02E1                 ; Flags cape and bunny poof.
+PoofTimer = $7E02E2               ; Countdown timer for poofing.
+SwordCooldown = $7E02E3           ; Cooldown for sword after dashing through an enemy.
 CutsceneFlag = $7E02E4            ; Flags various cutscenes. All non-zero behave the same.
                                   ;
 ItemReceiptMethod = $7E02E9       ;
                                   ;
 TileActBE = $7E02EF               ; Bitfield used by breakables and entrances. b b b b d d d d
                                   ; b = Breakables | d = Entrances
+UseY1 = $7E0301                   ; Bitfield for Y-item usage: b p - a x z h r
+                                  ; b = Boomerang                | p = Powder | a = Bow  | x = Hammer (tested, never set)
+                                  ; z = Rods (tested, never set) | h = Hammer | r = Rods
 CurrentYItem = $7E0303            ;
                                   ;
+AButtonAct = $7E0308              ; Bitfield for A-actions. $80 = Carry/toss | $02 Prayer | $01 = Tree pull
+CarryAct = $7E0309                ; Bitfield for carrying. $02 = Tossing | $01 = Lifting
+                                  ;
+TileActIce = $7E0348              ; Bitfield used by ice. Word length.
                                   ;
 TileActDig = $7E035B              ; Bitfield used by diggable ground. Word length. High byte unused.
                                   ;
+LinkZap = $7E0360                 ; When set, recoil zaps Link.
+                                  ;
+DamageReceived = $7E0373          ; Damage to deal to Link.
+                                  ;
+UseY2 = $7E037A                   ; - - b n c h - s
+                                  ; b = Book | n = Net | c = Canes | h = Hookshot | s = Shovel
+NoDamage = $7E037B                ; Prevents Link from receiving damage.
+                                  ;
+AncillaGeneral = $7E039F          ; General use buffer for front slot ancillae. $0F bytes.
+                                  ;
+AncillaSearch = $7E03C4           ; Used to search through ancilla when every front slot is occupied.
+                                  ;
 ForceSwordUp = $7E03EF            ; $01 = Force sword up pose.
+FluteTimer = $7E03F0              ; Countdown timer for being able to use the flute
+                                  ;
+YButtonOverride = $7E03FC         ; Y override for minigames. $00 = Selected item | $01 = Shovel | $02 = Bow
                                   ;
 ItemsTaken = $7E0403              ; Items taken in a room: b k u t s e h c
                                   ; b = boss kill/item         | k = key/heart piece (prevents crystals)
@@ -162,46 +234,124 @@ ItemsTaken = $7E0403              ; Items taken in a room: b k u t s e h c
                                   ; s = chest 3/pod or dp wall | e, h, c = chest 2, 1, 0
 DungeonID = $7E040C               ; High byte mostly unused but sometimes read. Word length.
                                   ;
+LayerAdjustment = $7E047A         ; Flags layer adjustments. Arms EG.
+                                  ;
+RoomIndexMirror = $7E048E         ; Mirrors RoomIndex
+                                  ;
+RespawnFlag = $7E04AA             ; If set, entrance loading is treated as a respawn. Word length.
+Map16ChangeIndex = $7E04AC        ; Word length.
+                                  ;
 OWEntranceCutscene = $7E04C6      ;
                                   ;
 HeartBeepTimer = $7E04CA          ;
                                   ;
+CameraScrollN = $7E0618           ; Camera scroll trigger areas for directions NSEW
+CameraScrollS = $7E061A           ; The higher boundary should always be +2 from the lower in
+CameraScrollW = $7E061C           ; underworld and -2 in overworld.
+CameraScrollE = $7E061E           ;
+                                  ;
 NMIAux = $7E0632                  ; Stores long address of NMI jump. Currently only used by shops.
                                   ;
+SpriteRoomTag = $7E0642           ; Set high by sprites triggering room tags.
+                                  ;
+SomariaSwitchFlag = $7E0646       ; Set by Somaria when on a switch.
+                                  ;
+TileMapEntranceDoors = $7E0696    ; Tilemap location of entrance doors. Word length.
+TileMapTile32 = $7E0698           ; Tilemap location of new tile32 objects, such as from graves/rocks. Word length.
+                                  ;
 SkipOAM = $7E0710                 ; Set to skip OAM updates. High byte written $FF with exploding walls
+OWScreenSize = $7E0712            ; Flags overworld screen size.
+                                  ;
+OWTransitionFlag = $7E0ABF        ; Used for certain transitions like smith, witch, etc.
+                                  ;
+ArcVariable = $7E0B08             ; Arc variable. Word length.
+OverlordXLow = $7E0B08            ; $08 bytes.
+OverlordXHigh = $7E0B10           ; $08 bytes.
+PlayerNameCursor = $7E0B12        ; Player name screen.
+OverlordYLow = $7E0B18            ; $08 bytes.
+OverlordYHigh = $7E0B20           ; $08 bytes.
+                                  ;
+EnemyStunTimer = $7E0B58          ; Auto-decrementing timer for stunned enemies. $10 bytes.
                                   ;
 BowDryFire = $7E0B9A              ; If set, arrows are deleted immediately
                                   ;
 SaveFileIndex = $7E0B9D           ;
                                   ;
-SpritePosYLow = $7E0D00           ; Sprite slot data. Each label has $10 bytes.
-SpritePosXLow = $7E0D10           ;
-SpritePosYHigh = $7E0D20          ;
+SpriteAncillaInteract = $7E0BA0   ; If nonzero, ancillae do not interact with the sprite. $10 bytes.
+                                  ;
+AncillaVelocityY = $7E0C22        ; $0A bytes.
+AncillaVelocityX = $7E0C2C        ; $0A bytes.
+                                  ;
+AncillaID = $7E0C4A               ; $0A bytes.
+                                  ;
+AncillaGet = $7E0C5E              ; Used by varius ancilla in various ways. $0F bytes.
+                                  ;
+SpriteBump = $7E0CD2              ; See symbols_wram.asm. $10 bytes.
+                                  ;
+TreePullKills = $7E0CFB           ; Kills for tree pulls.
+TreePullHits = $7E0CFC            ; Hits taken for tree pulls.
+                                  ;
+SpritePosYLow = $7E0D00           ; Sprite slot data. Each label has $10 bytes unless otherwise
+SpritePosXLow = $7E0D10           ; specified. Some of these I'm not sure what they are. May
+SpritePosYHigh = $7E0D20          ; have taken a guess or just made something up.
 SpritePosXHigh = $7E0D30          ;
 SpriteVelocityY = $7E0D40         ;
 SpriteVelocityX = $7E0D50         ;
-                                  ;
-SpriteUnknown = $7E0D80           ; Don't know what this is
+SpriteSubPixelY = $7E0D60         ;
+SpriteSubPixelX = $7E0D70         ;
+SpriteActivity = $7E0D80          ; Not sure what this is.
+SpriteMovement = $7E0D90          ; Not sure what this is.
                                   ;
 SpriteAuxTable = $7E0DA0          ; $20 bytes.
 SpriteGFXControl = $7E0DC0        ;
 SpriteAITable = $7E0DD0           ; AI state of sprites. $10 bytes.
+SpriteMoveDirection = $7E0DE0     ; $00 = Right | $01 = Left | $02 = Down | $03 = Up
                                   ;
 SpriteTimer = $7E0DF0             ;
                                   ;
 SpriteTypeTable = $7E0E20         ; Which sprite occupies this slot. $10 bytes.
-                                  ;
+SpriteAux = $7E0E30               ;
+SpriteOAMProperties = $7E0E40     ; h m w o o o o o | h = Harmless       | m = master sword? | w = walls?
+                                  ;                 | o = OAM allocation
+SpriteHitPoints = $7E0E50         ; Set from $0DB173
+SpriteControl = $7E0E60           ; n i o s p p p t | n = Death animation? | i = Immune to attack/collion?
+                                  ; o = Shadow      | p = OAM prop palette | t = OAM prop name table
 SpriteItemType = $7E0E80          ; Sprite Item Type. $10 bytes.
                                   ;
+SpriteSpawnStep = $7E0ED0         ; Related to enemies spawning other sprites (eg pikit, zirro)
+                                  ;
 SpriteDirectionTable = $7E0EB0    ; Sprite direction. $10 bytes.
                                   ;
+SpriteHalt = $7E0F00              ;
+SpriteTimerE = $7E0F10            ; ?
+                                  ;
+SpriteLayer = $7E0F20             ;
+                                  ;
+SpriteOAMProp = $7E0F50           ;
+                                  ;
+SpriteZCoord = $7E0F70            ;
+SpriteVelocityZ = $7E0F80         ;
+SpriteSubPixelZ = $7E0F90         ;
+                                  ;
 FreezeSprites = $7E0FC1           ; "Seems to freeze sprites"
                                   ;
+PrizePackIndexes = $7E0FC7        ; $07 bytes. One for each prize pack.
+                                  ;
 SpriteCoordCacheX = $7E0FD8       ;
 SpriteCoordCacheY = $7E0FDA       ;
                                   ;
 NoMenu = $7E0FFC                  ; When set prevents menu, mirror, medallions
                                   ;
+GFXStripes = $7E1000              ; Used by stripes for arbitrary VRAM transfers. $100 bytes.
+RoomStripes = $7E1100             ; Used for room drawing.
+                                  ;
+IrisPtr = $7E1B00                 ; Spotlight pointers for HDMA. $1C0 bytes (?).
+                                  ;
+MessageSubModule = $7E1CD8        ;
+                                  ;
+MessageCursor = $7E1CE8           ; Chosen option in message.
+DelayTimer = $7E1CE9              ;
+                                  ;
 TextID = $7E1CF0                  ; Message ID and page. Word length.
                                   ;
 ToastBuffer = $7E1E0E             ; Multiworld buffer. Word length.
@@ -230,8 +380,56 @@ ScratchBufferV = $7E1EB0          ; Volatile scratch buffer. Can clobber at will
 ;--------------------------------------------------------------------------------
 
 TileUploadBuffer = $7EA180        ; 0x300 bytes
+                                  ;
+RoomFade = $7EC005                ; Flags fade to black on room transitions. Word length.
+FadeTimer = $7EC007               ; Timer for transition fading and mosaics. Word length.
+FadeDirection = $7EC009           ; Word length
+FadeLevel = $7EC00B               ; Target fade level. Word length.
+                                  ;
+                                  ;
+MosaicLevel = $7EC011             ; Word length. High byte unused
+                                  ;
+RoomDarkness = $7EC017            ; Darkness level of a room. High byte unused. Word length.
+                                  ;
 SpriteOAM = $7EC025               ;
-                                  ; $7EC700 - Tile map buffer for HUD
+                                  ;
+EN_OWSCR2 = $7EC140               ; $7EC140-$7EC171 Used for caching with entrances.
+EN_MAINDESQ = $7EC142             ; Copied from the JP disassembly.
+EN_SUBDESQ = $7EC143              ;
+EN_BG2VERT = $7EC144              ;
+EN_BG2HORZ = $7EC146              ;
+EN_POSY = $7EC148                 ;
+EN_POSX = $7EC14A                 ;
+EN_OWSCR = $7EC14C                ;
+EN_OWTMAPI = $7EC14E              ;
+EN_SCROLLATN = $7EC150            ;
+EN_SCROLLATW = $7EC152            ;
+EN_SCROLLAN = $7EC154             ;
+EN_SCROLLBN = $7EC156             ;
+EN_SCROLLAS = $7EC158             ;
+EN_SCROLLBS = $7EC15A             ;
+EN_OWTARGN = $7EC15C              ;
+EN_OWTARGS = $7EC15E              ;
+EN_OWTARGW = $7EC160              ;
+EN_OWTARGE = $7EC162              ;
+EN_AA0 = $7EC164                  ;
+EN_BGSET1 = $7EC165               ;
+EN_BGSET2 = $7EC166               ;
+EN_SPRSET1 = $7EC167              ;
+                                  ; 2 bytes free RAM.
+EN_SCRMODYA = $7EC16A             ;
+EN_SCRMODYB = $7EC16C             ;
+EN_SCRMODXA = $7EC16E             ;
+EN_SCRMODXB = $7EC170             ;
+PegColor = $7EC172                ;
+                                  ;
+GameOverSongCache = $7EC227       ;
+                                  ;
+LastBGSet = $7EC2F8               ; Lists loaded sheets to check for decompression. 4 bytes.
+                                  ;
+PaletteBufferAux = $7EC300        ; Secondary and main palette buffer. See symbols_wram.asm
+PaletteBuffer = $7EC500           ; in the disassembly.
+HUDTileMapBuffer = $7EC700        ; HUD tile map buffer. $100 bytes (?)
 HUDKeyIcon = $7EC726              ;
 HUDGoalIndicator = $7EC72A        ;
 HUDPrizeIcon = $7EC742            ;
@@ -239,7 +437,7 @@ HUDRupees = $7EC750               ;
 HUDBombCount = $7EC75A            ;
 HUDArrowCount = $7EC760           ;
 HUDKeyDigits = $7EC764            ;
-
+                                  ;
 BigRAM = $7EC900                  ; Big buffer of free ram (0x1F00)
 
 ;================================================================================
@@ -249,7 +447,7 @@ DecompressionBuffer = $7F0000      ; Decompression Buffer. $2000 bytes.
 
 base $7F5000
 RedrawFlag: skip 1                 ;
-skip 2                             ;
+skip 2                             ; Unused
 HexToDecDigit1: skip 1             ; Space for storing the result of hex to decimal conversion.
 HexToDecDigit2: skip 1             ; Digits are stored from high to low.
 HexToDecDigit3: skip 1             ;
@@ -381,27 +579,59 @@ endmacro
 %assertRAM(Scrap0F, $7E000F)
 %assertRAM(GameMode, $7E0010)
 %assertRAM(GameSubMode, $7E0011)
+%assertRAM(NMIDoneFlag, $7E0012)
+%assertRAM(INIDISPQ, $7E0013)
+%assertRAM(NMISTRIPES, $7E0014)
+%assertRAM(NMICGRAM, $7E0015)
+%assertRAM(NMIHUD, $7E0016)
+%assertRAM(NMIINCR, $7E0017)
+%assertRAM(NMIUP1100, $7E0018)
+%assertRAM(UPINCVH, $7E0019)
 %assertRAM(FrameCounter, $7E001A)
 %assertRAM(IndoorsFlag, $7E001B)
+%assertRAM(MAINDESQ, $7E001C)
+%assertRAM(SUBDESQ, $7E001D)
+%assertRAM(TMWQ, $7E001E)
+%assertRAM(TSWQ, $7E001F)
 %assertRAM(LinkPosY, $7E0020)
 %assertRAM(LinkPosX, $7E0022)
 %assertRAM(LinkPosZ, $7E0024)
+%assertRAM(LinkPushDirection, $7E0026)
 %assertRAM(LinkRecoilY, $7E0027)
 %assertRAM(LinkRecoilX, $7E0028)
 %assertRAM(LinkRecoilZ, $7E0029)
 %assertRAM(LinkDirection, $7E002F)
+%assertRAM(LinkAnimationStep, $7E002E)
 %assertRAM(OAMOffsetY, $7E0044)
 %assertRAM(OAMOffsetX, $7E0045)
+%assertRAM(CapeTimer, $7E004C)
 %assertRAM(LinkJumping, $7E004D)
+%assertRAM(Strafe, $7E0050)
+%assertRAM(CapeOn, $7E0055)
 %assertRAM(BunnyFlagDP, $7E0056)
 %assertRAM(LinkSlipping, $7E005B)
 %assertRAM(FallTimer, $7E005C)
 %assertRAM(LinkState, $7E005D)
 %assertRAM(LinkSpeed, $7E005E)
+%assertRAM(LinkWalkDirection, $7E0067)
+%assertRAM(ScrapBuffer72, $7E0072)
+%assertRAM(WorldCache, $7E007B)
 %assertRAM(OverworldIndex, $7E008A)
 %assertRAM(OverlayID, $7E008C)
+%assertRAM(OAMPtr, $7E0090)
+%assertRAM(BGMODEQ, $7E0094)
+%assertRAM(MOSAICQ, $7E0095)
+%assertRAM(W12SELQ, $7E0096)
+%assertRAM(W34SELQ, $7E0097)
+%assertRAM(WOBJSELQ, $7E0098)
+%assertRAM(CGWSELQ, $7E0099)
+%assertRAM(CGADSUBQ, $7E009A)
+%assertRAM(HDMAENQ, $7E009B)
 %assertRAM(RoomIndex, $7E00A0)
 %assertRAM(PreviousRoom, $7E00A2)
+%assertRAM(CameraBoundH, $7E00A6)
+%assertRAM(CameraBoundV, $7E00A7)
+%assertRAM(RoomTag, $7E00AE)
 %assertRAM(SubSubModule, $7E00B0)
 %assertRAM(ObjPtr, $7E00B7)
 %assertRAM(ObjPtrOffset, $7E00BA)
@@ -417,10 +647,13 @@ endmacro
 %assertRAM(BG2V, $7E00E8)
 %assertRAM(BG3VOFSQL, $7E00EA)
 %assertRAM(LinkLayer, $7E00EE)
+%assertRAM(DeathReloadFlag, $7E010A)
 %assertRAM(CurrentMSUTrack, $7E010B)
 %assertRAM(GameModeCache, $7E010C)
 %assertRAM(GameSubModeCache, $7E010D)
+%assertRAM(EntranceIndex, $7E010E)
 %assertRAM(MedallionFlag, $7E0112)
+%assertRAM(VRAMUploadAddress, $7E0118)
 %assertRAM(BG1ShakeV, $7E011A)
 %assertRAM(BG1ShakeH, $7E011C)
 %assertRAM(CurrentVolume, $7E0127)
@@ -431,44 +664,144 @@ endmacro
 %assertRAM(SFX1, $7E012D)
 %assertRAM(SFX2, $7E012E)
 %assertRAM(SFX3, $7E012F)
+%assertRAM(LastAPUCommand, $7E0130)
+%assertRAM(LastSFX1, $7E0131)
+%assertRAM(MusicControlQueue, $7E0132)
+%assertRAM(CurrentControlRequest, $7E0133)
+%assertRAM(LastAPU, $7E0134)
 %assertRAM(SubModuleInterface, $7E0200)
 %assertRAM(ItemCursor, $7E0202)
 %assertRAM(BottleMenuCounter, $7E0205)
 %assertRAM(MenuBlink, $7E0207)
+%assertRAM(RaceGameFlag, $7E021B)
+%assertRAM(MessageJunk, $7E0223)
 %assertRAM(ItemReceiptID, $7E02D8)
+%assertRAM(ItemReceiptPose, $7E02DA)
 %assertRAM(BunnyFlag, $7E02E0)
+%assertRAM(Poofing, $7E02E1)
+%assertRAM(PoofTimer, $7E02E2)
+%assertRAM(SwordCooldown, $7E02E3)
 %assertRAM(CutsceneFlag, $7E02E4)
 %assertRAM(ItemReceiptMethod, $7E02E9)
 %assertRAM(TileActBE, $7E02EF)
+%assertRAM(UseY1, $7E0301)
 %assertRAM(CurrentYItem, $7E0303)
+%assertRAM(AButtonAct, $7E0308)
+%assertRAM(TileActIce, $7E0348)
 %assertRAM(TileActDig, $7E035B)
+%assertRAM(LinkZap, $7E0360)
+%assertRAM(DamageReceived, $7E0373)
+%assertRAM(UseY2, $7E037A)
+%assertRAM(NoDamage, $7E037B)
+%assertRAM(AncillaGeneral, $7E039F)
+%assertRAM(AncillaSearch, $7E03C4)
 %assertRAM(ForceSwordUp, $7E03EF)
+%assertRAM(FluteTimer, $7E03F0)
+%assertRAM(YButtonOverride, $7E03FC)
 %assertRAM(ItemsTaken, $7E0403)
 %assertRAM(DungeonID, $7E040C)
+%assertRAM(LayerAdjustment, $7E047A)
+%assertRAM(RoomIndexMirror, $7E048E)
+%assertRAM(RespawnFlag, $7E04AA)
+%assertRAM(Map16ChangeIndex, $7E04AC)
 %assertRAM(OWEntranceCutscene, $7E04C6)
 %assertRAM(HeartBeepTimer, $7E04CA)
+%assertRAM(CameraScrollN, $7E0618)
+%assertRAM(CameraScrollS, $7E061A)
+%assertRAM(CameraScrollW, $7E061C)
+%assertRAM(CameraScrollE, $7E061E)
 %assertRAM(NMIAux, $7E0632)
+%assertRAM(SpriteRoomTag, $7E0642)
+%assertRAM(SomariaSwitchFlag, $7E0646)
+%assertRAM(TileMapEntranceDoors, $7E0696)
+%assertRAM(TileMapTile32, $7E0698)
 %assertRAM(SkipOAM, $7E0710)
+%assertRAM(OWScreenSize, $7E0712)
+%assertRAM(OWTransitionFlag, $7E0ABF)
+%assertRAM(TreePullKills, $7E0CFB)
+%assertRAM(TreePullHits, $7E0CFC)
+%assertRAM(ArcVariable, $7E0B08)
+%assertRAM(OverlordXLow, $7E0B08)
+%assertRAM(OverlordXHigh, $7E0B10)
+%assertRAM(OverlordYLow, $7E0B18)
+%assertRAM(OverlordYHigh, $7E0B20)
+%assertRAM(EnemyStunTimer, $7E0B58)
 %assertRAM(BowDryFire, $7E0B9A)
 %assertRAM(SaveFileIndex, $7E0B9D)
+%assertRAM(SpriteAncillaInteract, $7E0BA0)
+%assertRAM(AncillaVelocityY, $7E0C22)
+%assertRAM(AncillaVelocityX, $7E0C2C)
+%assertRAM(AncillaID, $7E0C4A)
+%assertRAM(AncillaGet, $7E0C5E)
+%assertRAM(SpriteBump, $7E0CD2)
 %assertRAM(SpritePosYLow, $7E0D00)
 %assertRAM(SpritePosXLow, $7E0D10)
 %assertRAM(SpritePosYHigh, $7E0D20)
 %assertRAM(SpritePosXHigh, $7E0D30)
 %assertRAM(SpriteVelocityY, $7E0D40)
 %assertRAM(SpriteVelocityX, $7E0D50)
-%assertRAM(SpriteUnknown, $7E0D80)
+%assertRAM(SpriteSubPixelY, $7E0D60)
+%assertRAM(SpriteSubPixelX, $7E0D70)
+%assertRAM(SpriteActivity, $7E0D80)
+%assertRAM(SpriteMovement, $7E0D90)
 %assertRAM(SpriteAuxTable, $7E0DA0)
 %assertRAM(SpriteGFXControl, $7E0DC0)
 %assertRAM(SpriteAITable, $7E0DD0)
+%assertRAM(SpriteMoveDirection, $7E0DE0)
 %assertRAM(SpriteTimer, $7E0DF0)
 %assertRAM(SpriteTypeTable, $7E0E20)
+%assertRAM(SpriteAux, $7E0E30)
+%assertRAM(SpriteOAMProperties, $7E0E40)
+%assertRAM(SpriteHitPoints, $7E0E50)
+%assertRAM(SpriteControl, $7E0E60)
 %assertRAM(SpriteItemType, $7E0E80)
+%assertRAM(SpriteSpawnStep, $7E0ED0)
 %assertRAM(SpriteDirectionTable, $7E0EB0)
+%assertRAM(SpriteHalt, $7E0F00)
+%assertRAM(SpriteTimerE, $7E0F10)
+%assertRAM(SpriteLayer, $7E0F20)
+%assertRAM(SpriteOAMProp, $7E0F50)
+%assertRAM(EN_OWSCR2, $7EC140)
+%assertRAM(EN_MAINDESQ, $7EC142)
+%assertRAM(EN_SUBDESQ, $7EC143)
+%assertRAM(EN_BG2VERT, $7EC144)
+%assertRAM(EN_BG2HORZ, $7EC146)
+%assertRAM(EN_POSY, $7EC148)
+%assertRAM(EN_POSX, $7EC14A)
+%assertRAM(EN_OWSCR, $7EC14C)
+%assertRAM(EN_OWTMAPI, $7EC14E)
+%assertRAM(EN_SCROLLATN, $7EC150)
+%assertRAM(EN_SCROLLATW, $7EC152)
+%assertRAM(EN_SCROLLAN, $7EC154)
+%assertRAM(EN_SCROLLBN, $7EC156)
+%assertRAM(EN_SCROLLAS, $7EC158)
+%assertRAM(EN_SCROLLBS, $7EC15A)
+%assertRAM(EN_OWTARGN, $7EC15C)
+%assertRAM(EN_OWTARGS, $7EC15E)
+%assertRAM(EN_OWTARGW, $7EC160)
+%assertRAM(EN_OWTARGE, $7EC162)
+%assertRAM(EN_AA0, $7EC164)
+%assertRAM(EN_BGSET1, $7EC165)
+%assertRAM(EN_BGSET2, $7EC166)
+%assertRAM(EN_SPRSET1, $7EC167)
+%assertRAM(EN_SCRMODYA, $7EC16A)
+%assertRAM(EN_SCRMODYB, $7EC16C)
+%assertRAM(EN_SCRMODXA, $7EC16E)
+%assertRAM(EN_SCRMODXB, $7EC170)
+%assertRAM(SpriteZCoord, $7E0F70)
+%assertRAM(SpriteVelocityZ, $7E0F80)
+%assertRAM(SpriteSubPixelZ, $7E0F90)
 %assertRAM(FreezeSprites, $7E0FC1)
+%assertRAM(PrizePackIndexes, $7E0FC7)
 %assertRAM(SpriteCoordCacheX, $7E0FD8)
 %assertRAM(SpriteCoordCacheY, $7E0FDA)
 %assertRAM(NoMenu, $7E0FFC)
+%assertRAM(GFXStripes, $7E1000)
+%assertRAM(RoomStripes, $7E1100)
+%assertRAM(IrisPtr, $7E1B00)
+%assertRAM(MessageSubModule, $7E1CD8)
+%assertRAM(MessageCursor, $7E1CE8)
+%assertRAM(DelayTimer, $7E1CE9)
 %assertRAM(TextID, $7E1CF0)
 %assertRAM(ToastBuffer, $7E1E0E)
 %assertRAM(MSUResumeTime, $7E1E6B)
@@ -487,7 +820,19 @@ endmacro
 %assertRAM(ScratchBufferNV, $7E1EA0)
 %assertRAM(ScratchBufferV, $7E1EB0)
 %assertRAM(TileUploadBuffer, $7EA180)
+%assertRAM(RoomFade, $7EC005)
+%assertRAM(FadeTimer, $7EC007)
+%assertRAM(FadeDirection, $7EC009)
+%assertRAM(FadeLevel, $7EC00B)
+%assertRAM(MosaicLevel, $7EC011)
+%assertRAM(RoomDarkness, $7EC017)
 %assertRAM(SpriteOAM, $7EC025)
+%assertRAM(PegColor, $7EC172)
+%assertRAM(GameOverSongCache, $7EC227)
+%assertRAM(LastBGSet, $7EC2F8)
+%assertRAM(PaletteBufferAux, $7EC300)
+%assertRAM(PaletteBuffer, $7EC500)
+%assertRAM(HUDTileMapBuffer, $7EC700)
 %assertRAM(HUDKeyIcon, $7EC726)
 %assertRAM(HUDGoalIndicator, $7EC72A)
 %assertRAM(HUDPrizeIcon, $7EC742)
diff --git a/shopkeeper.asm b/shopkeeper.asm
index 6731ab6..931c9a5 100644
--- a/shopkeeper.asm
+++ b/shopkeeper.asm
@@ -87,7 +87,7 @@ DrawPrice:
 		TXA : LSR #3 : STA.b Scrap06 ; request 1-4 OAM slots
 		ASL #2
 			PHA
-				LDA.b $22 : CMP.l ShopPriceColumn : !BLT .off
+				LDA.b LinkPosX : CMP.l ShopPriceColumn : !BLT .off
                                         CMP.l ShopPriceColumn+1 : !BGE .off
 				.on
 				PLA : JSL.l OAM_AllocateFromRegionB : BRA + ; request 4-16 bytes
@@ -205,8 +205,8 @@ SpritePrep_ShopKeeper:
 	
 	LDA.l ShopType : CMP.b #$FF : BNE +
 		PLA : PLA : PLA
-        INC.w $0BA0, X
-        LDA.w $0E40, X
+        INC.w SpriteAncillaInteract, X
+        LDA.w SpriteOAMProperties, X
 		JML.l ShopkeeperFinishInit
 	+
 RTL
@@ -393,8 +393,8 @@ macro DrawMerchant(head,body,speed)
 		LDA.b #BigRAM>>8 : STA.b Scrap09
 		LDA.b #$7E : PHA : PLB ; set data bank to $7E
 		JSL.l Sprite_DrawMultiple_quantity_preset
-		LDA.b $90 : !ADD.b #$04*2 : STA.b $90 ; increment oam pointer
-		LDA.b $92 : INC #2 : STA.b $92
+		LDA.b OAMPtr : !ADD.b #$04*2 : STA.b OAMPtr ; increment oam pointer
+		LDA.b OAMPtr+2 : INC #2 : STA.b OAMPtr+2
 	PLB
 RTS
 .oam_shopkeeper_f1
@@ -429,8 +429,8 @@ Shopkeeper_DrawMerchant_Type1:
 		LDA.b #.oam_shopkeeper_f2>>8 : STA.b Scrap09
 	++
 	JSL.l Sprite_DrawMultiple_quantity_preset
-	LDA.b $90 : !ADD.b #$04 : STA.b $90 ; increment oam pointer
-	LDA.b $92 : INC : STA.b $92
+	LDA.b OAMPtr : !ADD.b #$04 : STA.b OAMPtr ; increment oam pointer
+	LDA.b OAMPtr+2 : INC : STA.b OAMPtr+2
 RTS
 .oam_shopkeeper_f1
 dw 0, 0 : db $46, $0A, $00, $02
@@ -453,7 +453,7 @@ Shopkeeper_SetupHitboxes:
 				PLY : BRA .no_interaction
 			+
 		PLY
-		LDA.w $00EE : CMP.w $0F20, X : BNE .no_interaction  
+		LDA.b LinkLayer : CMP.w SpriteLayer, X : BNE .no_interaction  
 
 		JSR.w Setup_LinksHitbox
 		JSR.w Setup_ShopItemCollisionHitbox
@@ -612,11 +612,11 @@ Setup_LinksHitbox:
 	LDA.b #$08 : STA.b Scrap02
                      STA.b Scrap03
 
-        LDA.b $22 : !ADD.b #$04 : STA.b Scrap00
-        LDA.b $23 : ADC.b #$00 : STA.b Scrap08
+        LDA.b LinkPosX : !ADD.b #$04 : STA.b Scrap00
+        LDA.b LinkPosX+1 : ADC.b #$00 : STA.b Scrap08
 
-        LDA.b $20 : ADC.b #$08 : STA.b Scrap01
-        LDA.b $21 : ADC.b #$00 : STA.b Scrap09
+        LDA.b LinkPosY : ADC.b #$08 : STA.b Scrap01
+        LDA.b LinkPosY+1 : ADC.b #$00 : STA.b Scrap09
 RTS
 ;--------------------------------------------------------------------------------
 ; The following is a copy of procedure Sprite_HaltSpecialPlayerMovement (Bank1E.asm line 255)
@@ -759,9 +759,9 @@ Shopkeeper_DrawNextPrice:
 		PHX : PHA : LDA.l ShopScratch : TAX : PLA : JSL.l Sprite_DrawMultiple_quantity_preset : PLX
 
 		LDA.b 1,s
-		ASL #2 : !ADD $90 : STA.b $90 ; increment oam pointer
+		ASL #2 : !ADD OAMPtr : STA.b OAMPtr ; increment oam pointer
                 PLA
-                !ADD $92 : STA.b $92
+                !ADD OAMPtr+2 : STA.b OAMPtr+2
         .free
         PLP : PLY : PLX
         PLB
@@ -780,7 +780,7 @@ db #$00, #$60, #$60, #$90, #$90, $FF
 RequestItemOAM:
         PHX : PHY : PHA
                 STA.b Scrap06 ; request A OAM slots
-                LDA.b $20 : CMP.b #$62 : !BGE .below
+                LDA.b LinkPosY : CMP.b #$62 : !BGE .below
                         .above
                         LDA.b 1,s : ASL #2 : JSL.l OAM_AllocateFromRegionA ; request 4A bytes
                         BRA +
@@ -794,8 +794,8 @@ RequestItemOAM:
                 LDA.b #$7E : PHB : PHA : PLB
                 JSL Sprite_DrawMultiple_quantity_preset
                 PLB
-                LDA.b 1,s : ASL #2 : !ADD $90 : STA.b $90 ; increment oam pointer
-                LDA.b $92 : !ADD 1,s : STA.b $92
+                LDA.b 1,s : ASL #2 : !ADD.b OAMPtr : STA.b OAMPtr ; increment oam pointer
+                LDA.b OAMPtr+2 : !ADD 1,s : STA.b OAMPtr+2
 	PLA : PLY : PLX
 RTS
 ;--------------------------------------------------------------------------------
diff --git a/spriteswap.asm b/spriteswap.asm
index c5e34f8..f122af4 100644
--- a/spriteswap.asm
+++ b/spriteswap.asm
@@ -64,7 +64,7 @@ SpriteSwap_Palette_ArmorAndGloves:
 
 .loop
 
-    LDA.b [Scrap00] : STA.l $7EC300, X : STA.l $7EC500, X
+    LDA.b [Scrap00] : STA.l PaletteBufferAux, X : STA.l PaletteBuffer, X
     
     INC.b Scrap00 : INC.b Scrap00
     
@@ -76,7 +76,7 @@ SpriteSwap_Palette_ArmorAndGloves:
     
     
     PLB
-    INC $15
+    INC.b NMICGRAM
     PLA : PLY : PLX
     RTL
 }
diff --git a/stats.asm b/stats.asm
index b4405cf..5f68128 100644
--- a/stats.asm
+++ b/stats.asm
@@ -39,7 +39,7 @@ DungeonHoleEntranceTransition:
 	JSL EnableForceBlank
 	
 	LDA.l SilverArrowsAutoEquip : AND.b #$02 : BEQ +
-	LDA.w $010E : CMP.b #$7B : BNE + ; skip unless falling to ganon's room
+	LDA.w EntranceIndex : CMP.b #$7B : BNE + ; skip unless falling to ganon's room
 	LDA.l BowTracking : AND.b #$40 : BEQ + ; skip if we don't have silvers
 	LDA.l BowEquipment : BEQ + ; skip if we have no bow
 	CMP.b #$03 : !BGE + ; skip if the bow is already silver
@@ -53,7 +53,7 @@ DungeonStairsTransition:
 DungeonExitTransition:
 	LDA.l IceModifier : BEQ + ; ice physics
 		JSL Player_HaltDashAttackLong
-		LDA.b #$00 : STA.w $0301 ; stop item dashing
+		LDA.b #$00 : STA.w UseY1 ; stop item dashing
 	+
 	LDA.b #$0F : STA.b GameMode ; stop running through the transition
 StatTransitionCounter:
@@ -95,7 +95,7 @@ IncrementSmallKeysNoPrimary:
 		JSL.l UpdateKeys
 		LDA.b IndoorsFlag : BEQ + ; skip room check if outdoors
 			PHP : REP #$20 ; set 16-bit accumulator
-				LDA.w $048E : CMP.w #$0087 : BNE ++ ; hera basement
+				LDA.b RoomIndex : CMP.w #$0087 : BNE ++ ; hera basement
 					PLP : PHY : LDY.b #$24 : JSL.l FullInventoryExternal
 					JSR CountChestKey : PLY : BRA +
 				++
@@ -235,7 +235,7 @@ IncrementDamageTakenCounter_Arb:
 	PHP
 	LDA.l StatsLocked : BNE +
 	REP #$21
-	LDA.b $00
+	LDA.b Scrap00
 	AND.w #$00FF
 	ADC.l DamageCounter
 	BCC ++
@@ -253,7 +253,7 @@ IncrementMagicUseCounterByrna:
 	PHA : PHP
 	LDA.l StatsLocked : BNE +
 	REP #$21
-	LDA.b $00
+	LDA.b Scrap00
 	AND.w #$00FF
 	ADC.l MagicCounter
 	BCC ++
@@ -277,7 +277,7 @@ IncrementMagicUseCounterOne:
 ;--------------------------------------------------------------------------------
 IncrementOWMirror:
         PHA
-                LDA.b #$08 : STA.w $021B ; fail race game
+                LDA.b #$08 : STA.w RaceGameFlag ; fail race game
                 LDA.l StatsLocked : BNE +
                 LDA.l CurrentWorld : BEQ + ; only do this for DW->LW
                         LDA.l OverworldMirrors : INC : STA.l OverworldMirrors
@@ -287,7 +287,7 @@ JMP StatTransitionCounter
 ;--------------------------------------------------------------------------------
 IncrementUWMirror:
 	PHA
-		LDA.b #$00 : STA.l $7F5035 ; bandaid patch bug with mirroring away from text
+		LDA.b #$00 : STA.l AltTextFlag ; bandaid patch bug with mirroring away from text
 		LDA.l StatsLocked : BNE +
 		LDA.w DungeonID : CMP.b #$FF : BEQ + ; skip if we're in a cave or house
 			LDA.l UnderworldMirrors : INC : STA.l UnderworldMirrors
@@ -316,8 +316,8 @@ JMP StatTransitionCounter
 ;--------------------------------------------------------------------------------
 IndoorSubtileTransitionCounter:
         LDA.b #$01 : STA.l RedrawFlag ; set redraw flag for items
-        STZ.w $0646 ; stuff we wrote over
-        STZ.w $0642
+        STZ.w SomariaSwitchFlag ; stuff we wrote over
+        STZ.w SpriteRoomTag
 JMP StatTransitionCounter
 ;--------------------------------------------------------------------------------
 StatsFinalPrep:
diff --git a/stats/main.asm b/stats/main.asm
index 5d7da64..9142def 100755
--- a/stats/main.asm
+++ b/stats/main.asm
@@ -610,14 +610,14 @@ EndingItems:
 	REP #$10
 	JSR DrawEndingItems
 	REP #$20
-	LDX.b #$0e
+	LDX.b #$0E
 RTL
 
 DrawEndingItems:
 	JSL DrawPlayerFile_credits
 	JSL SetItemLayoutPriority
 	SEP #$30
-	LDA.b #$01 : STA.b $14
+	LDA.b #$01 : STA.b NMISTRIPES
 RTS
 
 FontTable:
diff --git a/swordswap.asm b/swordswap.asm
index bdc315c..a977fad 100644
--- a/swordswap.asm
+++ b/swordswap.asm
@@ -69,16 +69,16 @@ LoadModifiedIceFloorValue_a11:
 	LDA.b LinkState : CMP.b #$01 : BEQ + : CMP.b #$17 : BEQ + : CMP.b #$1C : BEQ +
 	LDA.b LinkSpeed : CMP.b #$02 : BEQ +  
 	LDA.b LinkSlipping : BNE +  
-		LDA.w $0348 : ORA.l IceModifier : AND.b #$11 : RTL  
-	+ : LDA.w $0348 : AND.b #$11  
+		LDA.w TileActIce : ORA.l IceModifier : AND.b #$11 : RTL  
+	+ : LDA.w TileActIce : AND.b #$11  
 RTL  
 LoadModifiedIceFloorValue_a01:  
 	LDA.b RoomIndex : CMP.b #$91 : BEQ + : CMP.b #$92 : BEQ + : CMP.b #$93 : BEQ + ; mire basement currently broken - not sure why
 	LDA.b LinkState : CMP.b #$01 : BEQ + : CMP.b #$17 : BEQ + : CMP.b #$1C : BEQ +
 	LDA.b LinkSpeed : CMP.b #$02 : BEQ +
 	LDA.b LinkSlipping : BNE +
-		LDA.w $0348 : ORA.l IceModifier : AND.b #$01 : RTL
-	+ : LDA.w $0348 : AND.b #$01
+		LDA.w TileActIce : ORA.l IceModifier : AND.b #$01 : RTL
+	+ : LDA.w TileActIce : AND.b #$01
 RTL
 ;================================================================================
 CheckTabletSword:
@@ -116,7 +116,7 @@ GetSmithSword:
 		LDA.b #$7A
 		LDY.b #$01
 		JSL.l Sprite_ShowMessageUnconditional
-		LDA.b #$3C : STA.w $012E ; error sound
+		LDA.b #$3C : STA.w SFX2 ; error sound
 		SEP #$10
 		BRA .done
 
diff --git a/tables.asm b/tables.asm
index aa2a38a..8fbc02b 100644
--- a/tables.asm
+++ b/tables.asm
@@ -114,13 +114,11 @@ org $308036 ; PC 0x180036 - 0x180037
 RupoorDeduction:
 dw #$000A ; #$0A - Default (10 decimal)
 ;--------------------------------------------------------------------------------
-org $308038 ; PC 0x180038 -0x18003A
+org $308038 ; PC 0x180038
 LampConeSewers:
 db #$01 ; #$00 = Off - #$01 = On (default)
-LampConeLightWorld:
-db #$01 ; #$00 = Off (default) - #$01 = On
-LampConeDarkWorld:
-db #$00 ; #$00 = Off (default) - #$01 = On
+;--------------------------------------------------------------------------------
+; 0x180039 - 0x18003A (Unused)
 ;--------------------------------------------------------------------------------
 org $30803B ; PC 0x18003B - PC 0x18003C
 MapMode:
diff --git a/tablets.asm b/tablets.asm
index 2a088ee..818d3c8 100644
--- a/tablets.asm
+++ b/tablets.asm
@@ -3,11 +3,11 @@
 ;--------------------------------------------------------------------------------
 ItemSet_EtherTablet:
 	PHA : LDA.l NpcFlags+1 : ORA.b #$01 : STA.l NpcFlags+1 : PLA
-RTL
+RTS
 ;--------------------------------------------------------------------------------
 ItemSet_BombosTablet:
 	PHA : LDA.l NpcFlags+1 : ORA.b #$02 : STA.l NpcFlags+1 : PLA
-RTL
+RTS
 ;--------------------------------------------------------------------------------
 ItemCheck_EtherTablet:
 	LDA.l NpcFlags+1 : AND.b #$01
@@ -17,24 +17,23 @@ ItemCheck_BombosTablet:
 	LDA.l NpcFlags+1 : AND.b #$02
 RTL
 ;--------------------------------------------------------------------------------
-SetTabletItem:
-	JSL.l GetSpriteID
-	PHA
-		LDA.b OverworldIndex : CMP.b #$03 : BEQ .ether ; if we're on the map where ether is, we're the ether tablet
-		.bombos
-		JSL.l ItemSet_BombosTablet : BRA .done
-		.ether
-		JSL.l ItemSet_EtherTablet
-		.done
-	PLA
-RTL
+SetTabletItemFlag:     
+        PHA
+                LDA.b OverworldIndex : CMP.b #$03 : BEQ .ether ; if we're on the map where ether is, we're the ether tablet
+                .bombos
+                JSR ItemSet_BombosTablet : BRA .done
+                .ether
+                JSR ItemSet_EtherTablet
+                .done
+        PLA
+RTS
 ;--------------------------------------------------------------------------------
 SpawnTabletItem:
 	JSL.l LoadOutdoorValue
 	PHA
 	JSL.l PrepDynamicTile
 
-	JSL.l SetTabletItem
+	JSL.l GetSpriteID
 
 	LDA.b #$EB
 	STA.l MiniGameTime
@@ -47,14 +46,15 @@ SpawnTabletItem:
 	LDA.b LinkPosY   : STA.w SpritePosYLow, Y
 	LDA.b LinkPosY+1 : STA.w SpritePosYHigh, Y
 
-	LDA.b #$00 : STA.w $0F20, Y
+	LDA.b #$00 : STA.w SpriteLayer, Y
 
-	LDA.b #$7F : STA.w $0F70, Y ; spawn WAY up high
+	LDA.b #$7F : STA.w SpriteZCoord, Y ; spawn WAY up high
 RTL
 ;--------------------------------------------------------------------------------
 MaybeUnlockTabletAnimation:
 	PHA : PHP
 		JSL.l IsMedallion : BCC +
+                        JSR SetTabletItemFlag
 			STZ.w MedallionFlag ; disable falling-medallion mode
 			STZ.w ForceSwordUp ; release link from item-up pose
 			LDA.b #$00 : STA.b LinkState ; set link to ground state
@@ -95,38 +95,18 @@ LoadNarrowObject:
 	LDA.l AddReceivedItemExpanded_wide_item_flag, X : STA.b ($92), Y ; AddReceiveItem.wide_item_flag?
 RTL
 ;--------------------------------------------------------------------------------
-DrawNarrowDroppedObject:
-    ; If it's a 16x16 sprite, we'll only draw one, otherwise we'll end up drawing
-    ; two 8x8 sprites stack on top of each other
-    CMP.b #$02 : BEQ .large_sprite
-    
-    REP #$20
-    
-    ; Shift Y coordinate 8 pixels down
-    LDA.b Scrap08 : STA.b Scrap00
-    
-    SEP #$20
-    
-    JSL.l Ancilla_SetOam_XY_Long
-    
-    ; always use the same character graphic (0x34)
-    LDA.b #$34 : STA.b ($90), Y : INY
-    
-    LDA.l AddReceivedItemExpanded_properties, X : BPL .valid_lower_properties
-    
-    LDA.b $74
-
-.valid_lower_properties
-
-    ASL A : ORA.b #$30 : STA.b ($90), Y 
-    
-    INY : PHY
-    
-    TYA : !SUB.b #$04 : LSR #2 : TAY
-    
-    LDA.b #$00 : STA.b ($92), Y
-    
-    PLY
-.large_sprite
-RTL
+CheckTabletItem:
 ;--------------------------------------------------------------------------------
+; Zero flag set = Item not collected
+; Zero flag clear = Item  collected
+;--------------------------------------------------------------------------------
+        JSL.l IsMedallion : BCS .tablet
+                LDA.l OverworldEventDataWRAM, X : AND.b #$40 ; What we wrote over
+                RTL
+        .tablet
+        LDA.b OverworldIndex : CMP.b #$03 : BEQ .ether
+                LDA.l NpcFlags+1 : AND.b #$02 : BNE .done
+        .ether
+        LDA.l NpcFlags+1 : AND.b #$01
+        .done
+RTL
diff --git a/timer.asm b/timer.asm
index d2bc2ba..3139ca1 100644
--- a/timer.asm
+++ b/timer.asm
@@ -111,51 +111,51 @@ dw #$FFFF, #$7FFF
 ;--------------------------------------------------------------------------------
 DrawChallengeTimer:
 	LDA.l OHKOFlag : AND.w #$00FF : BEQ +
-                LDA.w #$2807 : STA.l $7EC790
-                LDA.w #$280A : STA.l $7EC792
-                LDA.w #$280B : STA.l $7EC794
-                LDA.w #$280C : STA.l $7EC796
+                LDA.w #$2807 : STA.l HUDTileMapBuffer+$90
+                LDA.w #$280A : STA.l HUDTileMapBuffer+$92
+                LDA.w #$280B : STA.l HUDTileMapBuffer+$94
+                LDA.w #$280C : STA.l HUDTileMapBuffer+$96
                 RTL
         +
-        LDA.w #$247F : STA.l $7EC790
-        STA.l $7EC792
-        STA.l $7EC794
-        STA.l $7EC796
+        LDA.w #$247F : STA.l HUDTileMapBuffer+$90
+        STA.l HUDTileMapBuffer+$92
+        STA.l HUDTileMapBuffer+$94
+        STA.l HUDTileMapBuffer+$96
         ++
 
         LDA.l TimerStyle : BNE + : RTL : + ; Hud Timer
-        LDA.w #$2807 : STA.l $7EC792    	
+        LDA.w #$2807 : STA.l HUDTileMapBuffer+$92    	
         LDA.l ClockStatus : AND.w #$0002 : BEQ + ; DNF / OKHO
 
 			LDA.l TimeoutBehavior : AND.w #$00FF : BNE ++ ; DNF
-				LDA.w #$2808 : STA.l $7EC794
-				LDA.w #$2809 : STA.l $7EC796
-				LDA.w #$247F : STA.l $7EC798
-				STA.l $7EC79A
+				LDA.w #$2808 : STA.l HUDTileMapBuffer+$94
+				LDA.w #$2809 : STA.l HUDTileMapBuffer+$96
+				LDA.w #$247F : STA.l HUDTileMapBuffer+$98
+				STA.l HUDTileMapBuffer+$9A
 				BRA +++
 			++ ; OHKO
-				LDA.w #$280A : STA.l $7EC794
-				LDA.w #$280B : STA.l $7EC796
-				LDA.w #$280C : STA.l $7EC798
-				LDA.w #$247F : STA.l $7EC79A
+				LDA.w #$280A : STA.l HUDTileMapBuffer+$94
+				LDA.w #$280B : STA.l HUDTileMapBuffer+$96
+				LDA.w #$280C : STA.l HUDTileMapBuffer+$98
+				LDA.w #$247F : STA.l HUDTileMapBuffer+$9A
 			+++
-			STA.l $7EC79C
-			STA.l $7EC79E
-			STA.l $7EC7A0
-			STA.l $7EC7A2
-			STA.l $7EC7A4
+			STA.l HUDTileMapBuffer+$9C
+			STA.l HUDTileMapBuffer+$9E
+			STA.l HUDTileMapBuffer+$A0
+			STA.l HUDTileMapBuffer+$A2
+			STA.l HUDTileMapBuffer+$A4
 			LDA.l TimerRestart : BNE +++ : RTL : +++
 			BRA ++
 		+ ; Show Timer
-	    	LDA.l ClockStatus : AND.w #$0001 : !ADD.w #$2804 : STA.l $7EC794
-			LDA.w ClockHours+2 : STA.l $7EC796
-			LDA.w ClockHours : STA.l $7EC798
-	    	LDA.w #$2806 : STA.l $7EC79A
-			LDA.w ClockMinutes+2 : STA.l $7EC79C
-			LDA.w ClockMinutes : STA.l $7EC79E
-	    	LDA.w #$2806 : STA.l $7EC7A0
-			LDA.w ClockSeconds+2 : STA.l $7EC7A2
-			LDA.w ClockSeconds : STA.l $7EC7A4
+	    	LDA.l ClockStatus : AND.w #$0001 : !ADD.w #$2804 : STA.l HUDTileMapBuffer+$94
+			LDA.w ClockHours+2 : STA.l HUDTileMapBuffer+$96
+			LDA.w ClockHours : STA.l HUDTileMapBuffer+$98
+	    	LDA.w #$2806 : STA.l HUDTileMapBuffer+$9A
+			LDA.w ClockMinutes+2 : STA.l HUDTileMapBuffer+$9C
+			LDA.w ClockMinutes : STA.l HUDTileMapBuffer+$9E
+	    	LDA.w #$2806 : STA.l HUDTileMapBuffer+$A0
+			LDA.w ClockSeconds+2 : STA.l HUDTileMapBuffer+$A2
+			LDA.w ClockSeconds : STA.l HUDTileMapBuffer+$A4
 		++
 		LDA.b FrameCounter : AND.w #$001F : BNE + : JSR CalculateTimer : +
 
diff --git a/utilities.asm b/utilities.asm
index eac5297..82f1076 100644
--- a/utilities.asm
+++ b/utilities.asm
@@ -447,8 +447,8 @@ DrawDynamicTile:
 		LDA.b #$00 : STA.l SpriteSkipEOR
 	PLB
 
-	LDA.b $90 : !ADD.b #$08 : STA.b $90 ; leave the pointer in the right spot to draw the shadow, if desired
-	LDA.b $92 : INC #2 : STA.b $92
+	LDA.b OAMPtr : !ADD.b #$08 : STA.b OAMPtr ; leave the pointer in the right spot to draw the shadow, if desired
+	LDA.b OAMPtr+2 : INC #2 : STA.b OAMPtr+2
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
@@ -465,8 +465,8 @@ DrawDynamicTileNoShadow:
 	LDA.b #$08 : JSL.l OAM_AllocateFromRegionC
 
 	.draw
-	LDA.b #SpriteOAM>>0 : STA.b Scrap06
-	LDA.b #SpriteOAM>>8 : STA.b Scrap06
+	LDA.b #SpriteOAM>>0 : STA.b Scrap08
+	LDA.b #SpriteOAM>>8 : STA.b Scrap09
 	STZ.b Scrap07
 	LDA.b #$7E : PHB : PHA : PLB
 		LDA.b #$01 : STA.l SpriteSkipEOR
@@ -474,8 +474,8 @@ DrawDynamicTileNoShadow:
 		LDA.l Bob : BNE + : LDA.b #$00 : STA.l SpriteSkipEOR : + ; Bob fix is conditional
 	PLB
 
-	LDA.b $90 : !ADD.b #$08 : STA.b $90
-	LDA.b $92 : INC #2 : STA.b $92
+	LDA.b OAMPtr : !ADD.b #$08 : STA.b OAMPtr
+	LDA.b OAMPtr+2 : INC #2 : STA.b OAMPtr+2
 RTL
 ;--------------------------------------------------------------------------------
 
@@ -501,30 +501,30 @@ RTL
 ; out:	Carry - 1 = On Screen, 0 = Off Screen
 ;--------------------------------------------------------------------------------
 Sprite_IsOnscreen:
-    JSR _Sprite_IsOnscreen_DoWork
-	BCS +
-		REP #$20
-		LDA.b BG2H : PHA : !SUB.w #$0F : STA.b BG2H
-		LDA.b BG2V : PHA : !SUB.w #$0F : STA.b BG2V
-		SEP #$20
-			JSR _Sprite_IsOnscreen_DoWork
-		REP #$20
-		PLA : STA.b BG2V
-		PLA : STA.b BG2H
-		SEP #$20
-	+
+        JSR _Sprite_IsOnscreen_DoWork
+        BCS +
+                REP #$20
+                LDA.b BG2H : PHA : !SUB.w #$0F : STA.b BG2H
+                LDA.b BG2V : PHA : !SUB.w #$0F : STA.b BG2V
+                SEP #$20
+                JSR _Sprite_IsOnscreen_DoWork
+                REP #$20
+                PLA : STA.b BG2V
+                PLA : STA.b BG2H
+                SEP #$20
+        +
 RTL
 
 _Sprite_IsOnscreen_DoWork:
-    LDA.w SpritePosXLow, X : CMP.b BG2H
-    LDA.w SpritePosXHigh, X : SBC.b $E3 : BNE .offscreen
+        LDA.w SpritePosXLow, X : CMP.b BG2H
+        LDA.w SpritePosXHigh, X : SBC.b BG2H+1 : BNE .offscreen
 
-    LDA.w SpritePosYLow, X : CMP.b BG2V
-    LDA.w SpritePosYHigh, X : SBC.b $E9 : BNE .offscreen
-	SEC
+        LDA.w SpritePosYLow, X : CMP.b BG2V
+        LDA.w SpritePosYHigh, X : SBC.b BG2V+1 : BNE .offscreen
+        SEC
 RTS
-	.offscreen
-	CLC
+        .offscreen
+        CLC
 RTS
 ;--------------------------------------------------------------------------------
 
@@ -667,14 +667,14 @@ db #00, #01, #01, #02, #01, #02, #02, #03, #01, #02, #02, #03, #02, #03, #03, #0
 ;--------------------------------------------------------------------------------
 WriteVRAMStripe:
 	PHX
-		LDX $1000 ; get pointer
-		AND.w #$7F : STA.w $1002, X : INX #2 ; set destination
-	PLA : ASL : AND.w #$7FFF : ORA.w #$7000 : STA.w $1002, X : INX #2 ; set length and enable RLE
-	TYA : STA.w $1002, X : INX #2 ; set tile
+		LDX.w GFXStripes ; get pointer
+		AND.w #$7F : STA.w GFXStripes+2, X : INX #2 ; set destination
+	PLA : ASL : AND.w #$7FFF : ORA.w #$7000 : STA.w GFXStripes+2, X : INX #2 ; set length and enable RLE
+	TYA : STA.w GFXStripes+2, X : INX #2 ; set tile
 	SEP #$20 ; set 8-bit accumulator
-		LDA.b #$FF : STA.w $1002, X
-		STX.w $1000
-		LDA.b #01 : STA.b $14
+		LDA.b #$FF : STA.w GFXStripes+2, X
+		STX.w GFXStripes
+		LDA.b #01 : STA.b NMISTRIPES
 	REP #$20 ; set 16-bit accumulator
 RTL
 ;--------------------------------------------------------------------------------
@@ -687,9 +687,9 @@ RTL
 ;--------------------------------------------------------------------------------
 WriteVRAMBlock:
         PHX
-                LDX.w $1000 ; get pointer
-        AND.w #$7F : STA.w $1002, X : INX #2 ; set destination
-        PLA : ASL : AND.w #$3FFF : STA.w $1002, X : INX #2 ; set length
+        LDX.w GFXStripes ; get pointer
+        AND.w #$7F : STA.w GFXStripes+2, X : INX #2 ; set destination
+        PLA : ASL : AND.w #$3FFF : STA.w GFXStripes+2, X : INX #2 ; set length
 
         PHX
                 TYX ; set X to source
@@ -703,9 +703,9 @@ WriteVRAMBlock:
         PLX : TAX ; pull and promptly ignore, copying the value we just got over it
 
         SEP #$20 ; set 8-bit accumulator
-                LDA.b #$FF : STA.w $1002, X
-                STX.w $1000
-                LDA.b #01 : STA.w $14
+                LDA.b #$FF : STA.w GFXStripes+$02, X
+                STX.w GFXStripes
+                LDA.b #01 : STA.w NMISTRIPES
         REP #$20 ; set 16-bit accumulator
 RTL
 ;--------------------------------------------------------------------------------
diff --git a/zoraking.asm b/zoraking.asm
index a2b309b..e3f44c3 100644
--- a/zoraking.asm
+++ b/zoraking.asm
@@ -6,7 +6,7 @@ LoadZoraKingItemGFX:
 	JML.l PrepDynamicTile
 ;--------------------------------------------------------------------------------
 JumpToSplashItemTarget:
-	LDA.w $0D90, X
+	LDA.w SpriteMovement, X
 	CMP.b #$FF : BNE + : JML.l SplashItem_SpawnSplash : +
 	CMP.b #$00 : JML.l SplashItem_SpawnOther
 ;--------------------------------------------------------------------------------

From d3cd3a86ca97785010ec1ba751a59a5ce1beb4b3 Mon Sep 17 00:00:00 2001
From: cassidoxa <cassidymoen@gmx.com>
Date: Thu, 24 Nov 2022 21:53:18 -0500
Subject: [PATCH 07/11] Move tree kid stuff into hooks.asm

---
 LTTP_RND_GeneralBugfixes.asm |  1 -
 hooks.asm                    | 10 ++++++++++
 treekid.asm                  |  9 ---------
 3 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 treekid.asm

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index c323bc2..37cf70d 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -49,7 +49,6 @@ function hexto555(h) = ((((h&$FF)/8)<<10)|(((h>>8&$FF)/8)<<5)|(((h>>16&$FF)/8)<<
 ;================================================================================
 
 incsrc hooks.asm
-incsrc treekid.asm
 incsrc spriteswap.asm
 incsrc hashalphabethooks.asm
 incsrc sharedplayerpalettefix.asm
diff --git a/hooks.asm b/hooks.asm
index 14b3568..ed4e7ce 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -1375,6 +1375,16 @@ JSL.l CheckHUDSilverArrows
 org $1EF060 ; <- F7060 - sprite_shopkeeper.asm:242 (INC $0D80, X)
 JSL.l Set300RupeeNPCItem : NOP
 
+;================================================================================
+; Tree Kid Fix
+;--------------------------------------------------------------------------------
+org $06B12B ; <- 3312B - tree status set - 418 - LDA NpcFlagsVanilla : ORA.b #$08 : STA NpcFlagsVanilla
+LDA.l NpcFlagsVanilla : AND.b #$F7 : STA.l NpcFlagsVanilla ; unset arboration instead of setting it
+;--------------------------------------------------------------------------------
+org $06B072 ; <- 33072 - FluteAardvark_InitialStateFromFluteState - 418 : dw FluteAardvark_AlreadyArborated
+db #$8B
+;================================================================================
+
 ;================================================================================
 ; Glitched Mode Fixes
 ;--------------------------------------------------------------------------------
diff --git a/treekid.asm b/treekid.asm
deleted file mode 100644
index 1197bfb..0000000
--- a/treekid.asm
+++ /dev/null
@@ -1,9 +0,0 @@
-;================================================================================
-; Tree Kid Fix
-;--------------------------------------------------------------------------------
-org $06B12B ; <- 3312B - tree status set - 418 - LDA NpcFlagsVanilla : ORA.b #$08 : STA NpcFlagsVanilla
-LDA.l NpcFlagsVanilla : AND.b #$F7 : STA.l NpcFlagsVanilla ; unset arboration instead of setting it
-;--------------------------------------------------------------------------------
-org $06B072 ; <- 33072 - FluteAardvark_InitialStateFromFluteState - 418 : dw FluteAardvark_AlreadyArborated
-db #$8B
-;================================================================================

From 9425b1c3b19483d77eb89dccbfb98767cdeb3067 Mon Sep 17 00:00:00 2001
From: cassidoxa <cassidymoen@gmx.com>
Date: Thu, 24 Nov 2022 22:02:55 -0500
Subject: [PATCH 08/11] Move zoraking.asm and catfish.asm into npcitems.asm

---
 LTTP_RND_GeneralBugfixes.asm |  2 --
 catfish.asm                  | 26 ------------------------
 npcitems.asm                 | 38 ++++++++++++++++++++++++++++++++++++
 zoraking.asm                 | 12 ------------
 4 files changed, 38 insertions(+), 40 deletions(-)
 delete mode 100644 catfish.asm
 delete mode 100644 zoraking.asm

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 37cf70d..9b94ef2 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -81,8 +81,6 @@ incsrc medallions.asm
 incsrc inventory.asm
 incsrc zelda.asm
 incsrc maidencrystals.asm
-incsrc zoraking.asm
-incsrc catfish.asm
 incsrc flute.asm
 incsrc dungeondrops.asm
 incsrc halfmagicbat.asm
diff --git a/catfish.asm b/catfish.asm
deleted file mode 100644
index bedaded..0000000
--- a/catfish.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-;================================================================================
-; Randomize Catfish
-;--------------------------------------------------------------------------------
-LoadCatfishItemGFX:
-        LDA.l $1DE185 ; location randomizer writes catfish item to
-        JML PrepDynamicTile
-;--------------------------------------------------------------------------------
-DrawThrownItem:
-        LDA.b OverworldIndex : CMP.b #$81 : BNE .catfish
-                .zora
-                LDA.b #$01 : STA.l RedrawFlag
-                LDA.l $1DE1C3 ; location randomizer writes zora item to
-                BRA .draw
-                .catfish
-                LDA.l $1DE185 ; location randomizer writes catfish item to
-                .draw
-                JML DrawDynamicTile
-;--------------------------------------------------------------------------------
-MarkThrownItem:
-	JSL Link_ReceiveItem ; thing we wrote over
-	LDA.b OverworldIndex : CMP.b #$81 : BNE .catfish
-	        .zora
-                JML ItemSet_ZoraKing
-	        .catfish
-                JML ItemSet_Catfish
-;--------------------------------------------------------------------------------
diff --git a/npcitems.asm b/npcitems.asm
index 8ed60fb..d4c58aa 100644
--- a/npcitems.asm
+++ b/npcitems.asm
@@ -169,4 +169,42 @@ Set300RupeeNPCItem:
 	.done
 	PLP : PLA
 RTL
+
 ;================================================================================
+; Randomize Zora King
+;--------------------------------------------------------------------------------
+LoadZoraKingItemGFX:
+    LDA.l $1DE1C3 ; location randomizer writes zora item to
+	JML.l PrepDynamicTile
+;--------------------------------------------------------------------------------
+JumpToSplashItemTarget:
+	LDA.w SpriteMovement, X
+	CMP.b #$FF : BNE + : JML.l SplashItem_SpawnSplash : +
+	CMP.b #$00 : JML.l SplashItem_SpawnOther
+
+;================================================================================
+; Randomize Catfish
+;--------------------------------------------------------------------------------
+LoadCatfishItemGFX:
+        LDA.l $1DE185 ; location randomizer writes catfish item to
+        JML PrepDynamicTile
+;--------------------------------------------------------------------------------
+DrawThrownItem:
+        LDA.b OverworldIndex : CMP.b #$81 : BNE .catfish
+                .zora
+                LDA.b #$01 : STA.l RedrawFlag
+                LDA.l $1DE1C3 ; location randomizer writes zora item to
+                BRA .draw
+                .catfish
+                LDA.l $1DE185 ; location randomizer writes catfish item to
+                .draw
+                JML DrawDynamicTile
+;--------------------------------------------------------------------------------
+MarkThrownItem:
+	JSL Link_ReceiveItem ; thing we wrote over
+	LDA.b OverworldIndex : CMP.b #$81 : BNE .catfish
+	        .zora
+                JML ItemSet_ZoraKing
+	        .catfish
+                JML ItemSet_Catfish
+;--------------------------------------------------------------------------------
diff --git a/zoraking.asm b/zoraking.asm
deleted file mode 100644
index e3f44c3..0000000
--- a/zoraking.asm
+++ /dev/null
@@ -1,12 +0,0 @@
-;================================================================================
-; Randomize Zora King
-;--------------------------------------------------------------------------------
-LoadZoraKingItemGFX:
-    LDA.l $1DE1C3 ; location randomizer writes zora item to
-	JML.l PrepDynamicTile
-;--------------------------------------------------------------------------------
-JumpToSplashItemTarget:
-	LDA.w SpriteMovement, X
-	CMP.b #$FF : BNE + : JML.l SplashItem_SpawnSplash : +
-	CMP.b #$00 : JML.l SplashItem_SpawnOther
-;--------------------------------------------------------------------------------

From 823166c4cd3eeb65118b6cd7134032288ad9f031 Mon Sep 17 00:00:00 2001
From: cassidoxa <cassidymoen@gmx.com>
Date: Thu, 24 Nov 2022 22:24:38 -0500
Subject: [PATCH 09/11] 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:

From 8d0315e4c1ae3123fcd1c808ab0dffb4f99cbc8a Mon Sep 17 00:00:00 2001
From: cassidoxa <cassidymoen@gmx.com>
Date: Thu, 24 Nov 2022 23:07:16 -0500
Subject: [PATCH 10/11] Reserve private, 3rd party WRAM block Reserve large
 decompression buffer

---
 ram.asm  |  6 +++++-
 sram.asm | 12 ++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ram.asm b/ram.asm
index be87595..64a6ec3 100644
--- a/ram.asm
+++ b/ram.asm
@@ -550,7 +550,11 @@ skip $40                           ; Reserved for general dungeon tracking data.
 skip $40                           ; Unused
 skip $260                          ; Unused
 DialogBuffer: skip $100            ; Dialog Buffer
-
+                                   ;
+PrivateBlockWRAM = $7F7700         ; Reserved for 3rd party use. $500 bytes.
+                                   ; See also: $200 bytes at PrivateBlockPersistent, copied to SRAM.
+BigDecompressionBuffer = $7F8000   ; Reserved for large gfx decompression buffer. $5000 bytes.
+                                   ;
 MiniGameTime = $7FFE00             ; Time spent in mini game. 32-bits.
 MiniGameTimeFinal = $7FFE04        ; Final mini game time. 32 bits.
 
diff --git a/sram.asm b/sram.asm
index 4e63479..0586481 100644
--- a/sram.asm
+++ b/sram.asm
@@ -380,12 +380,12 @@ InverseChecksumWRAM: skip 2     ; Vanilla Inverse Checksum. Don't write unless c
 ; This $1000 byte segment is saved beginning where the second save file was in SRAM
 ; beginning at $700500
 ;--------------------------------------------------------------------------------
-base $7F6000                    ; $1000 byte buffer we place beginning at second save file
-ExtendedFileNameWRAM: skip 24   ; File name, 12 word-length characters.
-RoomPotData: skip 592           ; Table for expanded pot shuffle. One word per room.
-SpritePotData: skip 592         ; Table for expanded pot shuffle. One word per room.
-PurchaseCounts: skip 96         ; Keeps track of shop purchases
-PrivateBlock: skip 513          ; Reserved for 3rd party developers
+base $7F6000                     ; $1000 byte buffer we place beginning at second save file
+ExtendedFileNameWRAM: skip 24    ; File name, 12 word-length characters.
+RoomPotData: skip 592            ; Table for expanded pot shuffle. One word per room.
+SpritePotData: skip 592          ; Table for expanded pot shuffle. One word per room.
+PurchaseCounts: skip 96          ; Keeps track of shop purchases
+PrivateBlockPersistent: skip 513 ; Reserved for 3rd party developers
 
 ;================================================================================
 ; Direct SRAM Assignments ($700000 - $7080000)

From 69fd6015e6b2f635251e2dca8f725f9de23c3505 Mon Sep 17 00:00:00 2001
From: cassidoxa <cassidymoen@gmx.com>
Date: Fri, 25 Nov 2022 01:08:07 -0500
Subject: [PATCH 11/11] Some more annotations

---
 dialog.asm            |  4 ++--
 fileselect.asm        |  2 +-
 hardmode.asm          |  8 ++++----
 hooks.asm             |  2 +-
 icepalacegraphics.asm |  2 +-
 init.asm              |  2 +-
 inventory.asm         |  6 +++---
 inverted.asm          | 10 +++++-----
 invertedmaps.asm      |  4 ++--
 msu.asm               | 18 +++++++++---------
 music.asm             |  2 +-
 newhud.asm            |  4 ++--
 npcitems.asm          |  2 +-
 pendantcrystalhud.asm |  2 +-
 retro.asm             |  2 +-
 shopkeeper.asm        |  2 +-
 sram.asm              |  4 ++--
 stats/main.asm        |  4 ++--
 18 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/dialog.asm b/dialog.asm
index 9055101..a8d35cf 100644
--- a/dialog.asm
+++ b/dialog.asm
@@ -311,7 +311,7 @@ DialogBombosTablet:
 RTL
 ;--------------------------------------------------------------------------------
 DialogSahasrahla:
-	LDA.l PendantsField : AND #$04 : BEQ + ;Check if player has green pendant
+	LDA.l PendantsField : AND.b #$04 : BEQ + ;Check if player has green pendant
 		LDA.b #$2F
         LDY.b #$00
 		JML Sprite_ShowMessageUnconditional
@@ -320,7 +320,7 @@ RTL
 ;--------------------------------------------------------------------------------
 DialogBombShopGuy:
 	LDY.b #$15
-	LDA.l CrystalsField : AND #$05 : CMP #$05 : BNE + ;Check if player has crystals 5 & 6
+	LDA.l CrystalsField : AND.b #$05 : CMP.b #$05 : BNE + ;Check if player has crystals 5 & 6
 		INY ; from 15 to 16
 	+
 	TYA
diff --git a/fileselect.asm b/fileselect.asm
index 31bc974..dc7361f 100644
--- a/fileselect.asm
+++ b/fileselect.asm
@@ -690,7 +690,7 @@ RTL
 ;--------------------------------------------------------------------------------
 macro LayoutPriority(address)
 LDX.w #$003C
-- : LDA.w <address>, X : ORA #$2000 : STA.w <address>, X
+- : LDA.w <address>, X : ORA.w #$2000 : STA.w <address>, X
 DEX : DEX : BNE -
 endmacro
 
diff --git a/hardmode.asm b/hardmode.asm
index e8177f9..97dde1b 100644
--- a/hardmode.asm
+++ b/hardmode.asm
@@ -84,10 +84,10 @@ GetItemDamageValue:
 	LDA.l $0db8f1,x ;what we wrote over
 RTL
 	.boomerang
-		LDA.l StunItemAction : AND #$01 : BNE .normal
+		LDA.l StunItemAction : AND.b #$01 : BNE .normal
 		BRA .noDamage
 	.hookshot
-		LDA.l StunItemAction : AND #$02 : BNE .normal
+		LDA.l StunItemAction : AND.b #$02 : BNE .normal
 	.noDamage
 	LDA.b #$00
 RTL
@@ -97,11 +97,11 @@ SearchAncilla:
 {
 	STA.b Scrap05
 	PHX 
-	LDX #$00
+	LDX.b #$00
 	.loop
 	LDA.w AncillaID, X 
 	INX : CPX #$0A : BEQ .notFound
-	CMP Scrap05 : BNE .loop
+	CMP.b Scrap05 : BNE .loop
 		LDA.b #$01
 		BRA .return
 	.notFound
diff --git a/hooks.asm b/hooks.asm
index ed4e7ce..36ea38a 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -271,7 +271,7 @@ db $09 : SKIP 1 : db $09 : SKIP 1 : db $09 : SKIP 1 : db $09 : SKIP 5 : db $05
 ; Remove code that tries to hide non-selected player files
 org $0CD435 ; <- 65435 - Bank0C.asm : 2772 (LDX.b #$64) [LDX.b #$50]
 LDX.b #$44
-LDA $D324, X
+LDA.w $D324, X
 org $0CD446 ; <- 65446 - Bank0C.asm : 2782 (LDX $C8 : CPX.b #$02 : BEQ BRANCH_11)
 db $80 ; BRA
 ;--------------------------------------------------------------------------------
diff --git a/icepalacegraphics.asm b/icepalacegraphics.asm
index 193e36d..284b36d 100644
--- a/icepalacegraphics.asm
+++ b/icepalacegraphics.asm
@@ -4,7 +4,7 @@ ShouldOverrideFileLoad:
     BNE .no
 
     LDA.w DungeonID ; Dungeon number
-    CMP #$12 ; Ice Palace
+    CMP.b #$12 ; Ice Palace
     BEQ .yes
     .no
     CLC : RTS
diff --git a/init.asm b/init.asm
index 5968bec..0f1d33a 100644
--- a/init.asm
+++ b/init.asm
@@ -20,7 +20,7 @@ Init_Primary:
 		INX
 		CPX.b #$FF : !BLT -
 	
-	LDX #$00
+	LDX.b #$00
 	-
 		LDA.l RomNameSRAM, X : CMP.w $FFC0, X : BNE .clear
 		INX
diff --git a/inventory.asm b/inventory.asm
index c8e2a45..f314bed 100644
--- a/inventory.asm
+++ b/inventory.asm
@@ -55,7 +55,7 @@ RTL
 		LDA.l BoomerangEquipment : EOR.b #$03 : STA.l BoomerangEquipment ; swap blue & red boomerang
 		LDA.b #$20 : STA.w SFX3 ; menu select sound
 		JMP .captured
-	+ CMP #$01 : BNE + ; bow
+	+ CMP.b #$01 : BNE + ; bow
 		LDA.l BowTracking : AND.b #$C0 : CMP.b #$C0 : BNE .errorJump ; make sure we have both bows
 		PHX : LDX.b #$00 ; scan ancilla table for arrows
 			-- : CPX.b #$0A : !BGE ++
@@ -75,7 +75,7 @@ RTL
 	+ BRA +
 		.errorJump
 		BRA .errorJump2
-	+ CMP #$05 : BNE + ; powder
+	+ CMP.b #$05 : BNE + ; powder
 		LDA.l InventoryTracking : AND.b #$30 : CMP.b #$30 : BNE .errorJump ; make sure we have mushroom & magic powder
 		LDA.l PowderEquipment : EOR.b #$03 : STA.l PowderEquipment ; swap mushroom & magic powder
 		LDA.b #$20 : STA.w SFX3 ; menu select sound
@@ -83,7 +83,7 @@ RTL
 	+ BRA +
 		.errorJump2
 		BRA .error
-	+ CMP #$0D : BNE + ; flute
+	+ CMP.b #$0D : BNE + ; flute
 		LDA.w UseY2 : CMP.b #$01 : BEQ .midShovel ; inside a shovel animation, force the shovel & make error sound
 		LDA.l InventoryTracking : BIT.b #$04 : BEQ .error ; make sure we have shovel
 					  AND.b #$03 : BEQ .error ; make sure we have one of the flutes
diff --git a/inverted.asm b/inverted.asm
index fdc9970..8114db1 100644
--- a/inverted.asm
+++ b/inverted.asm
@@ -208,22 +208,22 @@ MirrorBonk:
 		LDX.w #$0000
 		.loop
 			LDA.l .bonkRectanglesTable, X ;Load X1
-			CMP LinkPosX : !BGE ++
+			CMP.b LinkPosX : !BGE ++
 			;IF X > X1
 			LDA.l .bonkRectanglesTable+2, X ; Load X2
-			CMP LinkPosX : !BLT ++ 
+			CMP.b LinkPosX : !BLT ++ 
 			;IF X < X2
 			LDA.l .bonkRectanglesTable+4, X ;Load Y1
-			CMP LinkPosY : !BGE ++
+			CMP.b LinkPosY : !BGE ++
 			;IF Y > Y1
 			LDA.l .bonkRectanglesTable+6, X ; Load Y2
-			CMP LinkPosY : !BLT ++ 
+			CMP.b LinkPosY : !BLT ++ 
 			;IF Y < Y2
 			;Bonk Here
 			PLB : PLP : PLX
 			BRA .forceBonk
                 ++
-                TXA : !ADD #$0008 : CMP #.tableEnd-.bonkRectanglesTable : BEQ .endLoop
+                TXA : !ADD #$0008 : CMP.w #.tableEnd-.bonkRectanglesTable : BEQ .endLoop
                 TAX
                 BRA .loop
                 .endbonkRectanglesTable
diff --git a/invertedmaps.asm b/invertedmaps.asm
index 040ff03..37abb0e 100644
--- a/invertedmaps.asm
+++ b/invertedmaps.asm
@@ -332,7 +332,7 @@ STA.w $28D2
 
 
 ; CHECK IF AGAHNIM 2 IS DEAD AND WE HAVE ALREADY LANDED
-LDA.w $7EF2DB : AND #$0020 : BEQ .agahnim2Alive
+LDA.w OverworldEventDataWRAM+$2B : AND.w #$0020 : BEQ .agahnim2Alive
 LDA.w #$046D : STA.w $243E
 LDA.w #$0E3A : STA.w $24BC
 LDA.w #$0E3B : STA.w $24BE
@@ -1007,7 +1007,7 @@ LDA.w #$0108 : STA.w $3C38
 
 ;Warp Tile agah defeated
 LDA.w #$0034 : STA.w $3BBE ;Tile when no warp
-LDA.l ProgressIndicator : AND #$00FF : CMP.w #$0003 : BNE .agahnimAlive
+LDA.l ProgressIndicator : AND.w #$00FF : CMP.w #$0003 : BNE .agahnimAlive
 LDA.w #$0212 : STA.w $3BBE ;warp
 .agahnimAlive
 
diff --git a/msu.asm b/msu.asm
index 43a7617..2ca3da8 100644
--- a/msu.asm
+++ b/msu.asm
@@ -114,15 +114,15 @@
 ; Check if A has an overworld track
 ;--------------------------------------------------------------------------------
 IsOverworldTrack:
-    CMP #02 : BEQ .yes ;  2 - Hyrule Field
-    CMP #03 : BEQ .yes ;  3 - Time of Falling Rain
-    CMP #04 : BEQ .yes ;  4 - The Silly Pink Rabbit
-    CMP #05 : BEQ .yes ;  5 - Forest of Mystery
-    CMP #07 : BEQ .yes ;  7 - Kakariko Village
-    CMP #09 : BEQ .yes ;  9 - Dark Golden Land
-    CMP #15 : BEQ .yes ; 15 - Dark Woods
-    CMP #60 : BEQ .yes ; 60 - Light World OW (after ped pull)
-    CMP #61 : BEQ .yes ; 61 - Dark World OW (with all crystals)
+    CMP.b #02 : BEQ .yes ;  2 - Hyrule Field
+    CMP.b #03 : BEQ .yes ;  3 - Time of Falling Rain
+    CMP.b #04 : BEQ .yes ;  4 - The Silly Pink Rabbit
+    CMP.b #05 : BEQ .yes ;  5 - Forest of Mystery
+    CMP.b #07 : BEQ .yes ;  7 - Kakariko Village
+    CMP.b #09 : BEQ .yes ;  9 - Dark Golden Land
+    CMP.b #15 : BEQ .yes ; 15 - Dark Woods
+    CMP.b #60 : BEQ .yes ; 60 - Light World OW (after ped pull)
+    CMP.b #61 : BEQ .yes ; 61 - Dark World OW (with all crystals)
     .no
     CLC : RTS
 .yes
diff --git a/music.asm b/music.asm
index f621170..94992eb 100644
--- a/music.asm
+++ b/music.asm
@@ -263,6 +263,6 @@ Overworld_MosaicDarkWorldChecks:
 ;--------------------------------------------------------------------------------
 ; Check if the boss in ToH has been defeated (16-bit accumulator)
 CheckHeraBossDefeated:
-    LDA.l RoomDataWRAM[$07].l : AND #$FF00
+    LDA.l RoomDataWRAM[$07].l : AND.w #$FF00
     RTL
 ;--------------------------------------------------------------------------------
diff --git a/newhud.asm b/newhud.asm
index c3553e9..68a0b12 100644
--- a/newhud.asm
+++ b/newhud.asm
@@ -85,7 +85,7 @@ NewDrawHud:
 ;================================================================================
 ; Draw Dungeon Compass Counts
 ;================================================================================
-	LDA.l CompassMode : AND #$00FF : BEQ + ; skip if CompassMode is 0.
+	LDA.l CompassMode : AND.w #$00FF : BEQ + ; skip if CompassMode is 0.
 		JSL.l DrawDungeonCompassCounts ; compasses.asm
 	+
 
@@ -133,7 +133,7 @@ NewDrawHud:
 	CPX #$04 : !BLT .noprize
 	CPX #$08 : BEQ .noprize
 
-	LDA.b GameMode : CMP #$12 : BEQ .noprize
+	LDA.b GameMode : CMP.b #$12 : BEQ .noprize
 
 	LDA.l MapMode
 	REP #$20
diff --git a/npcitems.asm b/npcitems.asm
index d4c58aa..96c8d43 100644
--- a/npcitems.asm
+++ b/npcitems.asm
@@ -35,7 +35,7 @@ ItemCheck_MagicBat:
 RTL
 
 ItemCheck_OldMan:
-	LDA.l NpcFlags : AND.b #$01 : CMP #$01
+	LDA.l NpcFlags : AND.b #$01 : CMP.b #$01
 RTL
 
 ItemCheck_ZoraKing:
diff --git a/pendantcrystalhud.asm b/pendantcrystalhud.asm
index 6aabf1c..2a3b49e 100644
--- a/pendantcrystalhud.asm
+++ b/pendantcrystalhud.asm
@@ -72,7 +72,7 @@ OverworldMap_CheckObject:
 			LDA.l MapField : ORA.l MapOverlay : AND.b #$02 : BNE +++
 				PHX
 					LDA.l .dw_map_offsets, X : TAX ; put map offset into X
-					LDA.l MapField, X : ORA MapOverlay, X
+					LDA.l MapField, X : ORA.l MapOverlay, X
 				PLX
 				AND.l .dw_map_masks, X : BNE +++
 				JMP .fail
diff --git a/retro.asm b/retro.asm
index d3ac078..806f0b6 100644
--- a/retro.asm
+++ b/retro.asm
@@ -71,7 +71,7 @@ ArrowGame:
 		.rupees
 			PHX
 			REP #$20 ; set 16-bit accumulator
-				LDA.l BowEquipment : DEC : AND #$0002 : TAX
+				LDA.l BowEquipment : DEC : AND.w #$0002 : TAX
 				LDA.l CurrentRupees : !ADD.l ArrowModeWoodArrowCost, X : STA.l CurrentRupees
 			SEP #$20 ; set 8-bit accumulator
 			PLX
diff --git a/shopkeeper.asm b/shopkeeper.asm
index 931c9a5..a95cc15 100644
--- a/shopkeeper.asm
+++ b/shopkeeper.asm
@@ -112,7 +112,7 @@ SpritePrep_ShopKeeper:
 	-
 		LDA.l ShopTable+1, X : CMP.b RoomIndex : BNE +
 		LDA.l ShopTable+5, X : AND.w #$0040 : BNE ++
-			LDA.l PreviousOverworldDoor : AND #$00FF : CMP.l ShopTable+3, X : BNE +
+			LDA.l PreviousOverworldDoor : AND.w #$00FF : CMP.l ShopTable+3, X : BNE +
 		++
 			SEP #$20 ; set 8-bit accumulator
 			LDA.l ShopTable, X : STA.l ShopId
diff --git a/sram.asm b/sram.asm
index 0586481..ce6c039 100644
--- a/sram.asm
+++ b/sram.asm
@@ -29,7 +29,7 @@ SaveDataWRAM = $7EF000
 ; Example: We can use RoomDataWRAM[$37].high to read or write the pot key in the first
 ; floodable room in Swamp Palace (bit $04). To check if a boss has been killed we can
 ; take the room index for a boss room (e.g. $07 for Tower of Hera) and bitmask $FF00
-; like this: RoomDataWRAM[$07].l : AND #$FF00
+; like this: RoomDataWRAM[$07].l : AND.w #$FF00
 ;--------------------------------------------------------------------------------
 ; .high Byte:  d d d d b k u t
 ; .low Byte:   s e h c q q q q
@@ -658,7 +658,7 @@ endmacro
 %assertSRAM(RoomPotData, $7F6018)
 %assertSRAM(SpritePotData, $7F6268)
 %assertSRAM(PurchaseCounts, $7F64B8)
-%assertSRAM(PrivateBlock, $7F6518)
+%assertSRAM(PrivateBlockPersistent, $7F6518)
 
 ;================================================================================
 ; Direct SRAM Assertions
diff --git a/stats/main.asm b/stats/main.asm
index 9142def..ec4712e 100755
--- a/stats/main.asm
+++ b/stats/main.asm
@@ -229,7 +229,7 @@ RenderCreditsStatCounter:
     ; == Determine stat type ==
     LDA.w CreditsStats,y  ;   LLLL LLLL XXXX XTTL
     LSR
-    AND #$0003          ; TT
+    AND.w #$0003          ; TT
     CMP.w #$0000
     BEQ .normalStat
     JMP .timeStat
@@ -317,7 +317,7 @@ RenderCreditsStatCounter:
 ++  %StripeTile()
     
     LDA.l $7F5005
-    AND #$00FF
+    AND.w #$00FF
     CMP.b RemoveZero
     BNE +
     LDA.w #BlankTile