diff --git a/RandomizerCore/Asm/BuffCarock.s b/RandomizerCore/Asm/BuffCarock.s
index e4c7e4af..94b76526 100644
--- a/RandomizerCore/Asm/BuffCarock.s
+++ b/RandomizerCore/Asm/BuffCarock.s
@@ -2,17 +2,7 @@
 
 .segment "PRG4"
 
-ProjectileYPosition = $30
-ProjectileXVelocity = $77
-ProjectileType      = $87
-EnemyType           = $a1
-LinkXPosition       = $4d
-EnemyXPositionLo    = $4e
-EnemyXPositionHi    = $3c
-RNG                 = $051b
 ProjectileEnemyData = $07c0
-
-EnemyYVelocity = $057e
 ; SinWaveVelocityIncrement = $ba1c
 
 ; Hook into carrock's update code to add the new position calculation
@@ -29,29 +19,29 @@ ChooseNewCarrockXPosition:
     lda RNG,x
     ; By shifting links opposite side bit twice, we can force Carrock to be closer to the wall
     asl
-    sta EnemyXPositionLo,x
+    sta Enemy0XPositionLo,x
 
     ; Since Link's position can be from roughly $00fb - 01ef
     ; We can offset this by flipping the high bit, and then checking if its greater than
     ; $80 - $10 (which would be like starting the range from F0 - 70)
-    lda LinkXPosition
+    lda LinkXPositionLo
     eor #$80
     cmp #$70
 
     ; At this point, the carry contains the bit for the opposite side of the screen for link
     ; So shift it back into bosses position
-    ror EnemyXPositionLo,x
+    ror Enemy0XPositionLo,x
 
     ; Vanilla checks to see if carrock is too close to the right edge, and prevents going
     ; offscreen by dividing the position by two if it would
     lda #$e0
-    cmp EnemyXPositionLo,x
+    cmp Enemy0XPositionLo,x
     bcs @SetXHighPos
         sbc #$10 - 1
-        sta EnemyXPositionLo,x
+        sta Enemy0XPositionLo,x
 @SetXHighPos:
     lda #1
-    sta EnemyXPositionHi,x
+    sta Enemy0XPositionHi,x
     rts
 
 ; Inside a funciton that updates motion for (maybe?) all projectiles
@@ -72,10 +62,10 @@ MoveSinWaveWifiShot:
         lda ProjectileEnemyData,x
         and #$01
         tay
-        lda EnemyYVelocity,x
+        lda Enemy0YVelocity,x
         clc
         adc SinWaveVelocityIncrement,y
-        sta EnemyYVelocity,x
+        sta Enemy0YVelocity,x
         cmp SinWaveMaxVelocityExtant,y
         bne @NotAtMaxVelocity
             inc ProjectileEnemyData,x
@@ -88,8 +78,8 @@ MoveSinWaveWifiShot:
         bcc @PositiveVelocity
             ora #$f0
 @PositiveVelocity:
-        adc ProjectileYPosition,x
-        sta ProjectileYPosition,x
+        adc Projectile0YPosition,x
+        sta Projectile0YPosition,x
     ldy #$12
 @NotAWifiShot:
     ; Perform the original patched call
@@ -102,12 +92,12 @@ MoveSinWaveWifiShot:
 .reloc
 RandomizeWifiShotType:
     ldx $10
-    lda EnemyType,x
+    lda Enemy0Type,x
     cmp #$22 ; check if its spawned by carock and skip it. carock code id is 0x22
     beq @CarockShot
         ; Do the original code since its not our new buffed carock
         lda #$c0
-        sta ProjectileYPosition,y
+        sta Projectile0YPosition,y
         rts
 @CarockShot:
     ; Fetch a random number and 50/50 chance its a straight shot
@@ -120,7 +110,7 @@ RandomizeWifiShotType:
     @HiPositionShot:
         sta ProjectileEnemyData,y
         lda #0
-        sta EnemyYVelocity,y
+        sta Enemy0YVelocity,y
         lda ProjectileEnemyData,y
         ora #$b0
         ; Firing a sin wave shot, so set the flag for sin wave and then follow through setting up the position
@@ -136,12 +126,12 @@ RandomizeWifiShotType:
         clc
         adc #$10
 @WriteShotYCoord:
-    sta ProjectileYPosition,y
+    sta Projectile0YPosition,y
     ; roll a random number to see if we shoot a fast beam
     lda RNG+1
     and #1
     beq @Exit
-        lda ProjectileXVelocity,y
+        lda Projectile0XVelocity,y
         bmi @NegativeVelocity
            clc
            adc #$10
@@ -150,7 +140,7 @@ RandomizeWifiShotType:
         sec
         sbc #$10
 @DoneVelocityUpdate:
-        sta ProjectileXVelocity,y
+        sta Projectile0XVelocity,y
 @Exit:
     rts
 
diff --git a/RandomizerCore/Asm/DashSpell.s b/RandomizerCore/Asm/DashSpell.s
index 75c4109e..0d648797 100644
--- a/RandomizerCore/Asm/DashSpell.s
+++ b/RandomizerCore/Asm/DashSpell.s
@@ -13,7 +13,7 @@
 .reloc
 ReplaceFireWithDashSpell:
   pha
-  lda $076f ; Current magic state
+  lda FireSpellActive ; Current magic state
   and #$10  ; fire is on
   bne @HasFire
     pla
diff --git a/RandomizerCore/Asm/ExpandedPauseMenu.s b/RandomizerCore/Asm/ExpandedPauseMenu.s
index 97b4282e..cd008b9b 100644
--- a/RandomizerCore/Asm/ExpandedPauseMenu.s
+++ b/RandomizerCore/Asm/ExpandedPauseMenu.s
@@ -9,7 +9,7 @@
 
 .reloc
 CheckIfLevelingUp:
-    lda $074c ; When 74c is 0 we are doing the normal pause screen
+    lda CurrentDialogType ; When 74c is 0 we are doing the normal pause screen
     lsr       ; so set the carry if 74c is 1
     lda $0525 ; Then reload the row draw count
     bcc @skip
diff --git a/RandomizerCore/Asm/FullItemShuffle.s b/RandomizerCore/Asm/FullItemShuffle.s
index 45b04c74..6186f6ee 100644
--- a/RandomizerCore/Asm/FullItemShuffle.s
+++ b/RandomizerCore/Asm/FullItemShuffle.s
@@ -320,14 +320,14 @@ HandlePBagDeath:
     ; since there a lot of NPCs walking around.
     bmi @Exit ; unconditional
 @FoundEmpty:
-    lda $20,x ; enemy y hi
-    sta $20,y
-    lda $2a,x ; enemy y lo
-    sta $2a,y
-    lda $3c,x ; enemy x hi
-    sta $3c,y
-    lda $4e,x ; enemy x lo
-    sta $4e,y
+    lda Enemy0Condition,x
+    sta Enemy0Condition,y
+    lda Enemy0YPositionLo,x
+    sta Enemy0YPositionLo,y
+    lda Enemy0XPositionHi,x
+    sta Enemy0XPositionHi,y
+    lda Enemy0XPositionLo,x
+    sta Enemy0XPositionLo,y
     ; don't reset DontKillEnemyFlag here since its needed in HandlePBagTimerClear
     tya
     tax
@@ -376,7 +376,7 @@ ExpandedGetItem:
     @NotDashSpell:
         ; flash screen as if you got the spell from a wizard 
         lda #$c0
-        sta $074b
+        sta LinkFlashingTimer
         ; Convert from expanded item ID to regular spell ID 
         tya
         sec
@@ -393,7 +393,7 @@ ExpandedGetItem:
             bpl @CheckAllSpells
         ; Update the cursor position to point to the new spell
         pla
-        sta $0749
+        sta MagicSelectorPosition
         .byte $24 ; OPCODE bit $zp (hides pla)
     @FoundLearnedSpell:
         pla
@@ -418,9 +418,9 @@ ExpandedGetItem:
     sta $ef
     jmp $e84b ; Red/blue jar handler
 @ItemStab:
-    lda $0796
+    lda HaveStabs
     ora @StabTable - ITEM_UPSTAB,y
-    sta $0796
+    sta HaveStabs
     bne @Exit ; unconditional
 @ItemBagu:
     lda $079a
diff --git a/RandomizerCore/Asm/MMC5.s b/RandomizerCore/Asm/MMC5.s
index d8fda65d..58046db7 100644
--- a/RandomizerCore/Asm/MMC5.s
+++ b/RandomizerCore/Asm/MMC5.s
@@ -149,7 +149,7 @@ HandleLagFrame:
     and #$10
     beq @HandleAudio
     ; Check that we are in the side view mode
-    lda $0736
+    lda GameMode
     cmp #$0b
     bne @HandleAudio
     ; Check if we even have a sprite zero on the screen (Spoiler: there is not, sprite zero was removed)
@@ -320,7 +320,7 @@ IncStatTimer:
         cmp #$0b
         bne @Exit
             ; in an encounter (includes caves)
-            lda $0748
+            lda LocationNumber
             cmp #$3e
             bne @Exit
                 ; In a random encounter
@@ -334,7 +334,7 @@ IncStatTimer:
         lda RegionNumber
         asl
         asl
-        adc PalaceNumber
+        adc PalaceRegionIndex
         tay
         ldx PalaceMappingTable,y
 @IncrementTimer:
@@ -548,7 +548,7 @@ SwapToPRG0:
     lda #$00
     beq SwapPRG
 SwapToSavedPRG:
-    lda $0769
+    lda CurrentPrgBank
 SwapPRG:
     asl
     ora #$80
@@ -677,7 +677,7 @@ UPDATE_REFS SwapToSavedPRG @ $E002
 LoadAreaBGMetatile:
 ; guarantee the code is in a000 or higher otherwise we would switch this bank out from under itself
 .assert * > $a000
-    lda $0769
+    lda CurrentPrgBank
     asl
     ora #$80
     sta NmiBankShadow8
diff --git a/RandomizerCore/Asm/Recoil.s b/RandomizerCore/Asm/Recoil.s
index 7c677a1b..25bb9202 100644
--- a/RandomizerCore/Asm/Recoil.s
+++ b/RandomizerCore/Asm/Recoil.s
@@ -2,11 +2,6 @@
 
 .segment "PRG7"
 
-LinkXVelocity = $70
-EnemyID = $a1
-LinkYVelocityLo = $03E6
-LinkYVelocityHi = $057D
-
 LinkHitRoutine = $E2EF
 
 ; Patch when a boss hits link for a strong hit to ignore the 2x multiplier
@@ -32,7 +27,7 @@ SetLinkXRecoil:
     lda #$ff
 @InvertRecoil:
   pha
-    lda EnemyID,x
+    lda Enemy0Type,x
     tay
   pla
   eor RecoilTableX,y
@@ -40,7 +35,7 @@ SetLinkXRecoil:
 
 .reloc
 SetLinkYRecoil:
-  lda EnemyID,x
+  lda Enemy0Type,x
   tay
   lda RecoilTableYLo,y
   sta LinkYVelocityLo
diff --git a/RandomizerCore/Asm/StatTracking.s b/RandomizerCore/Asm/StatTracking.s
index a9221c37..d174bc00 100644
--- a/RandomizerCore/Asm/StatTracking.s
+++ b/RandomizerCore/Asm/StatTracking.s
@@ -52,7 +52,7 @@ StatTrackSwordSwipe:
     ; Need to use X so we need to preserve it
     txa
     tay
-    lda $17 ; 0 if crouching 1 if not
+    lda LinkStanding ; 0 if crouching 1 if not
     eor #1  ; so invert the bit to get 1 if crouching 0 if not
     asl
     tax
@@ -122,29 +122,29 @@ SaveTimestampForPalace:
     lda RegionNumber
     asl
     asl
-    adc PalaceNumber
+    adc PalaceRegionIndex
     tay
     lda PalaceTable,y
     jmp AddTimestamp
 
 .reloc
 PalaceTable:
-    ; region 0 - east hyrule
+    ; region 0 - West Hyrule
     .byte RealPalaceAtLocation1 + TsPalace1
     .byte RealPalaceAtLocation2 + TsPalace1
     .byte RealPalaceAtLocation3 + TsPalace1
     .byte $ff ; unused 4th palace in region 0
-    ; region 1 - death mountain 
+    ; region 1 - Death Mountain 
     .byte $ff ; unused 1st palace in region 1
     .byte $ff ; unused 2nd palace in region 1
     .byte $ff ; unused 3th palace in region 1
     .byte $ff ; unused 4th palace in region 1
-    ; region 2 - west hyrule
+    ; region 2 - East Hyrule
     .byte RealPalaceAtLocation5 + TsPalace1
     .byte RealPalaceAtLocation6 + TsPalace1
     .byte RealPalaceAtLocationGP+ TsPalace1
     .byte $ff ; unused 4th palace in region 2
-    ; region 3 - maze island
+    ; region 3 - Maze Island
     .byte RealPalaceAtLocation4 + TsPalace1
 
 .segment "PRG7"
@@ -292,7 +292,7 @@ bank7_Display = $ef11
     jmp AddPressStartToSkip
 .reloc
 AddPressStartToSkip:
-    inc $0736
+    inc GameMode
     
     ; rendering is off so we can just draw whatever we want
     lda #$23
@@ -324,9 +324,9 @@ StopTimers:
 @AlreadyDoneOnce:
     ; setup and draw the old man over an over
     lda #$d0
-    sta $4e  ;monster x
+    sta Enemy0XPositionLo
     lda #$50
-    sta $2a  ;monster y
+    sta Enemy0YPositionLo
     lda #$cf
     sta $cd  ;monster position on screen (fixes triforce position on first frame)
     jsr bank7_Display ; its the credits who cares about a few cycles
@@ -412,7 +412,7 @@ LoadStatsFromCheckpoint:
 .reloc
 CheckToSkipToEnd:
     ; check if start is pressed
-    lda $f5
+    lda Controller1ButtonsPressed
     and #$10
     beq @skip
         ; don't let this skip code run once we've moved to the stats
@@ -767,7 +767,7 @@ UpdateSpritePosition:
     sta $cc
     ; link y offset
     lda #$20
-    sta $29
+    sta LinkYPos
     ; link metasprite
     lda #3
     sta $80
@@ -777,7 +777,7 @@ UpdateSpritePosition:
 .reloc
 WaitForStart:
     ; check if start is pressed
-    lda $f5
+    lda Controller1ButtonsPressed
     and #$10
     beq :>rts
         inc StatDisplayState
@@ -883,7 +883,7 @@ PALETTE_FADE_LEN = * - RandomOrderTable
 .reloc
 FadeOut:
     ; Every 16 frames step to the next palette
-    lda $12 ; global timer
+    lda FrameCounter
     and #$01
     beq :>rts
     ldx InternalState
@@ -923,7 +923,7 @@ SprPaletteTable = $80AE
 FadeIn:
     ldx InternalState
     ; Every 16 frames step to the next palette
-    lda $12 ; global timer
+    lda FrameCounter
     and #$01
     beq :>rts
     cpx #12
diff --git a/RandomizerCore/Asm/ram.inc b/RandomizerCore/Asm/ram.inc
new file mode 100644
index 00000000..0b0d108c
--- /dev/null
+++ b/RandomizerCore/Asm/ram.inc
@@ -0,0 +1,358 @@
+; Define low zero page addresses even if they're not well-defined
+; so they will have debug info precedence over other constants
+zp_00 = $00
+zp_01 = $01
+zp_02 = $02
+zp_03 = $03
+zp_04 = $04
+zp_05 = $05
+zp_06 = $06
+zp_07 = $07
+zp_08 = $08
+zp_09 = $09
+zp_0a = $0a
+zp_0b = $0b
+zp_0c = $0c
+zp_0d = $0d
+zp_0e = $0e
+zp_0f = $0f
+zp_10 = $10
+zp_11 = $11
+FrameCounter = $12
+FairyState = $13                         ; 0 = Not in Fairy state
+zp_14 = $14
+zp_15 = $15
+zp_16 = $16
+LinkStanding = $17                       ; 0 = Link in ducked shield position, 1 = Link standing
+DarkLinkStanding = $18                   ; 0 = Dark Link ducking, 1 = Dark Link standing
+LinkYPositionHi = $19                    ; [SS] 0 = Invisible, 1 = Normal, 2-FF = Fall in hole   - [FILE] Cursor position
+Enemy0YPositionHi = $1a                  ; [SS] 0 = Enemy0 off the top of the screen, 1 = Normal - [FILE] Save file presence bits
+Enemy1YPositionHi = $1b
+Enemy2YPositionHi = $1c
+Enemy3YPositionHi = $1d
+Enemy4YPositionHi = $1e                  ; [SS] 0 = Enemy4 off the top of the screen, 1 = Normal - [FILE] File selection cursor
+Enemy5YPositionHi = $1f
+Enemy0Condition = $20
+Enemy1Condition = $21
+Enemy2Condition = $22
+Enemy3Condition = $23
+Enemy4Condition = $24
+Enemy5Condition = $25
+OverworldStepCounter = $26
+zp_27 = $27
+zp_28 = $28
+LinkYPos = $29
+Enemy0YPositionLo = $2a
+Enemy1YPositionLo = $2b
+Enemy2YPositionLo = $2c
+Enemy3YPositionLo = $2d
+Enemy4YPositionLo = $2e
+Enemy5YPositionLo = $2f
+Projectile0YPosition = $30
+Projectile1YPosition = $31
+Projectile2YPosition = $32
+Projectile3YPosition = $33
+Projectile4YPosition = $34
+Projectile5YPosition = $35
+LinkProjectile0YPosition = $36
+LinkProjectile1YPosition = $37
+zp_38 = $38
+LinkProjectileYPositionRelated = $39
+zp_3a = $3a
+LinkXPositionHi = $3b
+Enemy0XPositionHi = $3c
+Enemy1XPositionHi = $3d
+Enemy2XPositionHi = $3e
+Enemy3XPositionHi = $3f
+Enemy4XPositionHi = $40
+Enemy5XPositionHi = $41
+Projectile0XPositionHi = $42
+Projectile1XPositionHi = $43
+Projectile2XPositionHi = $44
+Projectile3XPositionHi = $45
+Projectile4XPositionHi = $46
+Projectile5XPositionHi = $47
+LinkProjectile0XPositionHi = $48
+LinkProjectile1XPositionHi = $49
+zp_4a = $4a
+LinkProjectileXPositionHiRelated = $4b
+zp_4c = $4c
+LinkXPositionLo = $4d
+Enemy0XPositionLo = $4e
+Enemy1XPositionLo = $4f
+Enemy2XPositionLo = $50
+Enemy3XPositionLo = $51
+Enemy4XPositionLo = $52
+Enemy5XPositionLo = $53
+Projectile0XPositionLo = $54
+Projectile1XPositionLo = $55
+Projectile2XPositionLo = $56
+Projectile3XPositionLo = $57
+Projectile4XPositionLo = $58
+Projectile5XPositionLo = $59
+LinkProjectile0XPositionLo = $5a
+LinkProjectile1XPositionLo = $5b
+zp_5c = $5c
+LinkProjectileXPositionLoRelated = $5d
+zp_5e = $5e
+LinkFacingDirection = $5f
+Enemy0XFacing = $60
+Enemy1XFacing = $61
+Enemy2XFacing = $62
+Enemy3XFacing = $63
+Enemy4XFacing = $64
+Enemy5XFacing = $65
+Projectile0XFacing = $66
+Projectile1XFacing = $67
+Projectile2XFacing = $68
+Projectile3XFacing = $69
+Projectile4XFacing = $6a
+Projectile5XFacing = $6b
+zp_6c = $6c
+zp_6d = $6d
+zp_6e = $6e
+zp_6f = $6f
+LinkXVelocity = $70
+Enemy0XVelocity = $71
+Enemy1XVelocity = $72
+OverworldYPosition = $73                 ; [SS] Enemy2XVelocity - [OW] OverworldYPosition
+OverworldXPosition = $74                 ; [SS] Enemy3XVelocity - [OW] OverworldXPosition
+OverworldLinkYPosition = $75             ; [SS] Enemy4XVelocity - [OW] OverworldLinkYPosition
+OverworldLinkXPosition = $76             ; [SS] Enemy5XVelocity - [OW] OverworldLinkXPosition
+Projectile0XVelocity = $77
+Projectile1XVelocity = $78
+Projectile2XVelocity = $79
+Projectile3XVelocity = $7a
+Projectile4XVelocity = $7b
+Projectile5XVelocity = $7c
+LinkProjectile0XVelocity = $7d
+LinkProjectile1XVelocity = $7e
+zp_7f = $7f
+LinkAnimationFrame = $80
+Enemy0AnimationFrame = $81
+OverworldEnemy0Type = $82                ; [SS] Enemy1AnimationFrame - [OW] OverworldEnemy0Type, 1 = Weak, 2 = Strong, 3 = Fairy
+OverworldEnemy1Type = $83                ; [SS] Enemy2AnimationFrame - [OW] OverworldEnemy1Type
+OverworldEnemy2Type = $84                ; [SS] Enemy3AnimationFrame - [OW] OverworldEnemy2Type
+OverworldEnemy3Type = $85                ; [SS] Enemy4AnimationFrame - [OW] OverworldEnemy3Type
+OverworldEnemy4Type = $86                ; [SS] Enemy5AnimationFrame - [OW] OverworldEnemy4Type
+Projectile0Type = $87                    ; [SS] Projectile0Type - [OW] OverworldEnemy5Type
+Projectile1Type = $88                    ; [SS] Projectile1Type - [OW] OverworldEnemy6Type
+Projectile2Type = $89                    ; [SS] Projectile2Type - [OW] OverworldEnemy7Type
+Projectile3Type = $8a
+Projectile4Type = $8b
+Projectile5Type = $8c
+LinkProjectile0State = $8d
+LinkProjectile1State = $8e
+zp_8f = $8f
+SpriteShuffleOffsetLink = $90
+SpriteShuffleOffsetEnemy0 = $91
+SpriteShuffleOffsetEnemy1 = $92
+SpriteShuffleOffsetEnemy2 = $93
+SpriteShuffleOffsetEnemy3 = $94
+SpriteShuffleOffsetEnemy4 = $95
+SpriteShuffleOffsetEnemy5 = $96
+SpriteShuffleOffsetProjectile0 = $97
+SpriteShuffleOffsetProjectile1 = $98
+SpriteShuffleOffsetProjectile2 = $99
+SpriteShuffleOffsetProjectile3 = $9a
+SpriteShuffleOffsetProjectile4 = $9b
+SpriteShuffleOffsetProjectile5 = $9c
+SpriteShuffleOffsetLinkProjectile0 = $9d
+SpriteShuffleOffsetLinkProjectile1 = $9e
+DpadHorizontalState = $9f                ; 1 = Right, 2 = Left
+zp_a0 = $a0
+Enemy0Type = $a1                         ; Enemy (Elevator) slot
+Enemy1Type = $a2                         ; Enemy (Locked door) slot
+Enemy2Type = $a3
+Enemy3Type = $a4
+Enemy4Type = $a5
+Enemy5Type = $a6                         ; Enemy (Boss) slot
+LinkCollisionBits = $a7                  ; 0000ABLR (above, below, left, right)
+Enemy0State = $a8
+Enemy1State = $a9
+Enemy2State = $aa
+Enemy3State = $ab
+Enemy4State = $ac
+Enemy5State = $ad
+zp_ae = $ae
+Enemy0State2 = $af
+Enemy1State2 = $b0
+Enemy2State2 = $b1
+Enemy3State2 = $b2
+Enemy4State2 = $b3
+Enemy5State2 = $b4
+SideviewState = $b5                      ; 0 = Link enters room, 1 = Normal, 2 = Link dies in lava, 3 = Link slides left after killing Dark Link
+Enemy0Status = $b6                       ; 0 = No enemy, 1 = Alive, 2 = Exploding, 3 = Floating XP, 10 = Link takes drop exit
+Enemy1Status = $b7
+Enemy2Status = $b8
+Enemy3Status = $b9
+Enemy4Status = $ba
+Enemy5Status = $bb
+Enemy0Persistence = $bc                  ; Related to remembering that an enemy is defeated
+Enemy1Persistence = $bd
+Enemy2Persistence = $be
+Enemy3Persistence = $bf
+Enemy4Persistence = $c0
+Enemy5Persistence = $c1
+Enemy0HP = $c2
+Enemy1HP = $c3
+Enemy2HP = $c4
+Enemy3HP = $c5
+Enemy4HP = $c6
+Enemy5HP = $c7
+SideviewExitScreen = $c8                 ; 3 = Exit screen
+zp_c9 = $c9
+zp_ca = $ca
+zp_cb = $cb
+LinkXScreenPosition = $cc
+zp_cd = $cd
+zp_ce = $ce
+LinkProjectileXScreenPosition = $cf
+JumpSpellActive = $d0                    ; 1 = Jump active
+SideviewWidth = $d1                      ; With of current sidescroll screen (1-3 pages)
+zp_d2 = $d2
+zp_d3 = $d3
+zp_d4 = $d4
+zp_d5 = $d5
+zp_d6 = $d6
+zp_d7 = $d7
+zp_d8 = $d8
+zp_d9 = $d9
+zp_da = $da
+zp_db = $db
+zp_dc = $dc
+zp_dd = $dd
+zp_de = $de
+zp_df = $df                              ; Enemy type temporary storage
+
+; $e0-$ef are music and sound variables
+
+; Potentially free zero page memory bytes at $f1-$f4 and since they are used by FDS BIOS but not the NES
+Controller1ButtonsPressed = $f5
+Controller2ButtonsPressed = $f6
+Controller1ButtonsHeld = $f7
+Controller2ButtonsHeld = $f8
+; Potentially free zero page memory bytes at $f9-$fc
+ScrollPosShadow = $fd
+PpuCtrlShadow = $ff
+
+LinkXSubpixel = $03d6
+Enemy0XSubpixel = $03d7
+Enemy1XSubpixel = $03d8
+Enemy2XSubpixel = $03d9
+Enemy3XSubpixel = $03da
+Enemy4XSubpixel = $03db
+Enemy5XSubpixel = $03dc
+LinkYVelocityLo = $03e6
+
+LinkSwordAttackFrame = $0400
+Enemy0HitState = $040e
+LinkInAir = $0479                        ; 0 = On ground, 1 = Falling from walking off platform, 2 = Jumping
+LandingAnimationTimer = $0497
+HitboxXCoord = $047e
+HitboxYCoord = $0480
+
+LinkIFrameTimer = $500
+timer_501 = $0501                        ; $501 through $50d are timers that are decreased each frame until 0
+LinkEntrySlideTime = $0503
+SwordAttackTimer = $050a
+EncounterSpawnTimer = $0516
+RNG = $051b
+MapNumber = $0561
+TownNumber = $056b
+PalaceRegionIndex = $056c                ; Palace index in continent (0-2)
+LinkYVelocityHi = $057d
+Enemy0YVelocity = $057e
+LinkProjectile0Timer = $05ca
+LinkProjectile1Timer = $05cb             ; Always 0 since Fire projectiles don't expire
+SavedDoorExit1Page = $05d1               ; accessed as $5cc,X with X = 5
+SavedDoorExit1X = $05d8                  ; accessed as $5d3,X with X = 5
+SavedDoorExit2Page = $05d2               ; used for New Kasuto fireplace
+SavedDoorExit2X = $05d9
+SmallDropCount = $05df
+LargeDropCount = $05e0
+
+Lives = $0700
+EntryFacing = $0701                      ; Sideview entry facing direction. 0=Facing right (enter from the left), 1=Facing left (enter from the right)
+EnterFromElevatorAbove = $0704           ; >0 Link enters the room from the top
+EnterCentered = $0705                    ; >0 Link enters centered; like at North Palace, taking an elevator exit or entering a random encounter
+RegionNumber = $0706                     ; 0=West, 1=Death Mountain, 2=East, 3=Maze Island
+WorldNumber = $0707                      ; 0=Caves & enemy encounters, 1=West towns, 2=East towns, 3=Palace 1/2/5, 4=Palace 3/4/6, 5=Great Palace
+ScrollDirection = $071f                  ; Current scroll direction. 1=Scrolling right, 2=Scrolling left
+ColumnScrollDirection = $0720            ; Scroll direction that is updated only when scrolling crosses a column boundary
+ColumnScrollX = $0721                    ; Scroll position within the current tile column ($00-$1f)
+DialogBoxDrawing = $0726                 ; >0 when drawing dialog and during black screen transitions
+ScrollFrozen = $0728                     ; 1=Screen scrolling frozen (for boss fights)
+ScrollPage = $072a                       ; Which page the left-most pixel of the screen is on (0-3)
+ScrollX = $072c
+SideviewCommandY = $0730
+SideviewCommandOp = $0731
+ScrollLeftPage = $0732
+ScrollRightPage = $0733
+ScrollLeftColumn = $0734                 ; Which left background column to update during scrolling
+ScrollRightColumn = $0735                ; Which right background column to update during scrolling
+GameMode = $0736
+GameModeCurrent = $0737                  ; GameMode is compared to this and only triggered if it has changed
+
+Controller1ABPressed = $0741             ; Controller1ButtonsPressed & 0b11000000
+Controller1LeftRightHeld = $0742         ; Controller1ButtonsHeld & 0b00000011
+Controller1UpDownHeld = $0743            ; Controller1ButtonsHeld & 0b00001100
+Controller1ButtonsHeldCopy = $0744
+LocationNumber = $0748                   ; Location index sideview exits to or $3e for random encounters
+MagicSelectorPosition = $0749
+LinkFlashingTimer = $074b                ; Link changes palette and this value is counted down until it's 0. 0b10000000 bit determines if the background changes color.
+CurrentDialogType = $074c                ; 0=None, 1 = Level Up, 2 = Talking
+ExpToAddHi = $0755
+ExpToAddLo = $0756
+DoorDepth = $075b                        ; Used as an index for saving/loading your x position when you enter/leave (nested) doors
+EntryPage = $075c                        ; Page to enter a sideview on (0-3) or 4 for center
+EnterAreaFlag = $075f                    ; Set to 1 when entering a screen centered. Other values are sound and music related.
+CurrentPrgBank = $0769
+GameEvent = $076c                        ; 0=Restart with full lives, 1=Main game loop, 2=Link dying, 3=Wake up Zelda, 4=Roll credits, 06=Show lives left then restart the scene
+GameEventCurrent = $076d                 ; GameEvent is compared to this and only triggered if it has changed
+CurrentChrBank = $076e
+FireSpellActive = $076f                  ; 0x10 = Fire spell active
+ExpForNextLevelHi = $0770
+ExpForNextLevelLo = $0771
+CurrentGameSlot = $0772
+CurrentMagic = $0773
+CurrentLife = $0774
+CurrentExpHi = $0775
+CurrentExpLo = $0776
+AttackLevel = $0777
+MagicLevel = $0778
+LifeLevel = $0779
+HaveShield = $077b
+HaveJump = $077c
+HaveLife = $077d
+HaveFairy = $077e
+HaveFire = $077f
+HaveReflect = $0780
+HaveSpell = $0781
+HaveThunder = $0782
+MagicContainers = $0783
+HeartContainers = $0784
+HaveCandle = $0785
+HaveGlove = $0786
+HaveRaft = $0787
+HaveBoot = $0788
+HaveFlute = $0789
+HaveCross = $078a
+HaveHammer = $078b
+HaveMagicKey = $078c
+Keys = $0793                             ; Current number of Keys
+Crystals = $0794                         ; Number of Crystals left
+HaveStabs = $0796                        ; 0x04 = Have Downstab | 0x10 = Have Upstab
+HaveTrophy = $0798                       ; 0x10 = Have Trophy
+HaveMirror = $0799                       ; 1 = Have Mirror
+HaveBagusNoteAndMedicine = $079a         ; 0x08 = Bagu's Note | 0x40 = Medicine
+HaveWater = $079b                        ; 1 = Have Water
+HaveChild = $079c                        ; 0x20 = Have Child
+HaveBasementAccess = $079d               ; 0x08 = Have New Kasuto Basement access
+ContinuesUsed = $079f
+
+
+SavedDoorExit1ScrollPage = $69aa         ; accessed as $69a5,X with X = 5
+SavedDoorExit1ScrollX = $69b1            ; accessed as $69ac,X with X = 5
+SavedDoorExit2ScrollPage = $69ab         ; used for New Kasuto fireplace
+SavedDoorExit2ScrollX = $69b2
diff --git a/RandomizerCore/Asm/z2r.inc b/RandomizerCore/Asm/z2r.inc
index 21378fef..35a85034 100644
--- a/RandomizerCore/Asm/z2r.inc
+++ b/RandomizerCore/Asm/z2r.inc
@@ -47,6 +47,9 @@ OAMDMA = $4014
 JOY1 = $4016
 JOY2 = $4017
 
+;;; Include RAM values before any constants
+.include "ram.inc"
+
 ;;; MMC5 register names and associated constants
 PrgBankModeReg = $5100
 PRG_BANK_MODE_8KB_BANKS = 3
@@ -104,14 +107,6 @@ ENABLE_SCANLINE_IRQ = $80
 MulLoReg = $5205
 MulHiReg = $5206
 
-;; Common locations used in the code
-PpuCtrlShadow = $ff
-ScrollPosShadow = $fd
-
-PalaceNumber = $056c
-RegionNumber = $0706
-WorldNumber = $0707
-
 NewSideviewInit = $8cec
 ClearNametables = $d266
 JumpEngine = $d385
diff --git a/RandomizerCore/Hyrule.cs b/RandomizerCore/Hyrule.cs
index 913f9058..f88198af 100644
--- a/RandomizerCore/Hyrule.cs
+++ b/RandomizerCore/Hyrule.cs
@@ -3092,6 +3092,8 @@ private byte[] PrgToCpuAddr(int addr)
     private static void AddCropGuideBoxesToFileSelect(Assembler a)
     {
         a.Module().Code("""
+.include "z2r.inc"
+
 .segment "PRG5"
 .org $b28d
     jsr CustomFileSelectUpdates
@@ -3100,7 +3102,7 @@ jsr CustomFileSelectUpdates
 CustomFileSelectUpdates:
     cpy #$01
     beq @Skip
-        sta $0726  ; perform the original hooked code before exiting
+        sta DialogBoxDrawing  ; perform the original hooked code before exiting
         rts
 @Skip:
     ldx #$20     ; copy 32 + 1 bytes of data from the rom (+1 for terminator)
@@ -3230,12 +3232,14 @@ private void FixHelmetheadBossRoom(Assembler asm)
         var a = asm.Module();
         a.Assign("HelmetRoom", helmetRoom);
         a.Code("""
+.include "z2r.inc"
+
 .segment "PRG4"
 
 .reloc
 HelmetHeadGoomaFix:
     lda #<HelmetRoom
-    eor $561
+    eor MapNumber
     rts
 
 .org $bac3
@@ -3260,10 +3264,6 @@ private static void RestartWithPalaceUpA(Assembler a) {
 
 update_next_level_exp = $a057
 
-;(0=caves, enemy encounters...; 1=west hyrule towns; 2=east hyrule towns; 3=palace 1,2,5 ; 4=palace 3,4,6 ; 5=great palace)
-world_number = $707
-room_code = $561
-
 .segment "PRG7"
 
 .org $cbaa
@@ -3271,26 +3271,26 @@ jsr PalacePatch
 
 .reloc
 PalacePatch:
-    sta world_number
+    sta WorldNumber
     ; if < 3 do the original patch
     cmp #$03
     bcc @Exit
     ; or if our temp flag is already set, do the original code
     lda temp_room_flag
     bne @Exit
-        lda room_code
+        lda MapNumber
         sta temp_room_code ; store the area code into a temp ram location
         inc temp_room_flag ; set a flag in another empty ram location
 @Exit:
-    lda world_number
+    lda WorldNumber
     rts
 
 .reloc
 ReloadExpForReset:
     lda temp_room_code
-    sta room_code
+    sta MapNumber
     jsr update_next_level_exp
-    lda world_number
+    lda WorldNumber
     rts
 
 .org $cad0
@@ -3310,7 +3310,7 @@ jsr SaveWorldStateAndClearFlag
 .reloc
 SaveWorldStateAndClearFlag:
     ; Precondition y = 0
-    sty world_number
+    sty WorldNumber
     sty temp_room_flag
     rts
 
@@ -3323,18 +3323,20 @@ sty temp_room_flag
     private static void FixSoftLock(Assembler a)
     {
         a.Module().Code("""
+.include "z2r.inc"
+
 .segment "PRG7"
 .org $e18a
     jsr FixSoftlock
 
 .reloc
 FixSoftlock:
-    inc $0726
-    lda $074c ; branch if dialog type is not "talking"
+    inc DialogBoxDrawing
+    lda CurrentDialogType ; branch if dialog type is not "talking"
     cmp #$02
     beq +
         ldx #$00  ; otherwise close the talking dialog
-        stx $074c
+        stx CurrentDialogType
 +   rts
 """, "fix_softlock.s");
     }
@@ -3422,16 +3424,19 @@ public static void FixContinentTransitions(Assembler asm)
 
 .import SwapPRG
 
-PRG_bank = $0769
-
 .segment "PRG7"
 
+; No need to set PreviousRegionNumber ($070a) anymore
+.org $cb8b
+    jmp $cb91
+FREE_UNTIL $cb91
+
 ; Patch switching the bank when loading the overworld
 .org $cd48
     bne +
     ldy RegionNumber
     lda ExpandedRegionBankTable,y
-+   sta PRG_bank
++   sta CurrentPrgBank
     jsr SwapPRG
     beq $cd5f ; unconditional jmp to skip the freespace
 FREE_UNTIL $cd5f
@@ -3491,7 +3496,7 @@ jsr GetItemPresenceLowByte
     sta $00
     lda #06
     sta $01
-    lda $0561
+    lda MapNumber
     lsr a  ; Sets the carry flag that determines which 4 bits of the item presence byte is used
     tay
     lda ($00),y
@@ -3516,11 +3521,7 @@ ldy RegionNumber
 ; This is currently true for vanilla and Z2R
 RAFT_TILE_INDEX = $29
 
-PLAYER_X = $74
-AREA_LOCATION_INDEX = $0748
-PLAYER_HAS_RAFT = $0787
-
-; AREA_LOCATION_INDEX will later be changed to the side-scrolling location
+; LocationNumber will later be changed to the side-scrolling location
 ; index. z2ft needs this, at this specific address.
 AREA_ENTRANCE_INDEX = $69ff
 
@@ -3529,14 +3530,14 @@ ldy RegionNumber
 ; bridge connector coordinates are at $8553
 
 .org $8599
-    stx AREA_LOCATION_INDEX  ; X stashed away like in the original code
+    stx LocationNumber  ; X stashed away like in the original code
     stx AREA_ENTRANCE_INDEX
     cpx #RAFT_TILE_INDEX
     bne NotRaftTileProceed
-    lda PLAYER_HAS_RAFT
+    lda HaveRaft
     beq EndTileComparisons  ; It's a raft tile and we don't have the raft
     ; Determine raft exit direction from our overworld position instead of the vanilla table
-    lda PLAYER_X
+    lda OverworldXPosition
     ldx #1       ; raft going right
     cmp #20
     bcs SetVariablesForRaftTravel
diff --git a/RandomizerCore/ROM.cs b/RandomizerCore/ROM.cs
index 8aedf0c9..dd5d346e 100644
--- a/RandomizerCore/ROM.cs
+++ b/RandomizerCore/ROM.cs
@@ -1022,7 +1022,7 @@ jsr CopySideviewIntoRAMAndLoadPointer
     
     ; Now we have the pointer to the sideview address, load that so we can read the data
     ; and also load the enemy pointer into $d6 as well
-    lda $0561
+    lda MapNumber
     asl
     tay
     lda ($00),y
@@ -1042,14 +1042,14 @@ bcc @skipswap
         lda RegionNumber
         asl
         asl
-        adc PalaceNumber
+        adc PalaceRegionIndex
         tay
         lda PalaceMappingTable,y
         cmp #$ff
         beq @skipswap
         ; Prevent bank swapping during the end game cutscene
-        lda $076c ; Game mode
-        cmp #3 ; 03=wake up zelda, 04=roll credits, 06=show the lives then restart the scene
+        lda GameEvent
+        cmp #3 ; 03=Wake up Zelda
         bcs @skipswap
             ; Loading a palace sideview so use the data from extended banks instead
             lda #$0e
@@ -1124,7 +1124,7 @@ jsr LoadMapData
 .reloc
 .import RaftWorldMappingTable
 LoadMapData:
-    ldx $0706
+    ldx RegionNumber
     lda RaftWorldMappingTable,x
     tax
     lda $8508,x
@@ -1170,12 +1170,12 @@ public void UpAController1(Assembler a)
 .segment "PRG0"
 .org $a19f
 CheckController1ForUpAUnknown:
-  lda $f7
+  lda Controller1ButtonsHeld
   cmp #$28
 
 .org $a1dd
 CheckController1ForUpAMagic:
-  lda $f7
+  lda Controller1ButtonsHeld
   cmp #$28
 """, "UpAController1.s");
         //Put(0x21B0, 0xF7);
@@ -1232,7 +1232,8 @@ public void RandomizeKnockback(Assembler asm, Random RNG)
     public void AllowForChangingDoorYPosition(Assembler a)
     {
         a.Module().Code("""
-ObjectYPositionData = $0730
+.include "z2r.inc"
+
 KeyDoorYPosition = $075e ; just a piece of unused ram afaict
 
 .segment "PRG4"
@@ -1243,7 +1244,7 @@ .word KeyDoorCustomPositionPRG4
 .segment "PRG4", "PRG7"
 .reloc
 KeyDoorCustomPositionPRG4:
-    lda ObjectYPositionData
+    lda SideviewCommandY
     and #$f0
     clc
     adc #$20
@@ -1257,7 +1258,7 @@ .word KeyDoorCustomPositionPRG5
 .segment "PRG5", "PRG7"
 .reloc
 KeyDoorCustomPositionPRG5:
-    lda ObjectYPositionData
+    lda SideviewCommandY
     and #$f0
     clc
     adc #$20
@@ -1283,7 +1284,7 @@ jsr LoadDoorYPosition
 
 .reloc
 LoadDoorYPosition:
-    lda $2a,x
+    lda Enemy0YPositionLo,x
     clc
     adc #$0c
     sta $30
@@ -1303,7 +1304,7 @@ jsr StoreElevatorParamDM
 .segment "PRG1", "PRG7"
 .reloc
 StoreElevatorParamDM:
-    lda $0731 ; load the current elevator command
+    lda SideviewCommandOp ; load the current elevator command
     and #$0f ; the last 4 bits are the param
     sta ElevatorYStart
     lda $010A ; re-do the command JSR overwrote
@@ -1316,7 +1317,7 @@ jsr StoreElevatorParam
 .segment "PRG4", "PRG7"
 .reloc
 StoreElevatorParam:
-    lda $0731 ; load the current elevator command
+    lda SideviewCommandOp ; load the current elevator command
     and #$0f ; the last 4 bits are the param
     sta ElevatorYStart
     lda $010A ; re-do the command JSR overwrote
@@ -1329,7 +1330,7 @@ jsr StoreElevatorParamGP
 .segment "PRG5", "PRG7"
 .reloc
 StoreElevatorParamGP:
-    lda $0731 ; load the current elevator command
+    lda SideviewCommandOp ; load the current elevator command
     and #$0f ; the last 4 bits are the param
     sta ElevatorYStart
     lda $010A ; re-do the command JSR overwrote
@@ -1395,13 +1396,15 @@ jsr CheckIfElevatorEntrance
     public void DontCountExpDuringTalking(Assembler a)
     {
         a.Module().Code("""
+.include "z2r.inc"
+
 .segment "PRG7"
 ; Patch the count up code and check to see if we are in a dialog
 .org $d433
     jsr CheckForDialog
 .reloc
 CheckForDialog:
-    lda $74c ; current dialog type
+    lda CurrentDialogType
     beq OriginalPatchedCode
         ; We are in a dialog or something, so don't tick down
         ; by skipping ahead to after the counting code
@@ -1669,7 +1672,7 @@ public void ChangeLavaKillPosition(Assembler asm)
 
 .org $E0A4
 HandleLavaTileCollision:
-    lda $29                          ; load Link's y pos
+    lda LinkYPos                     ; load Link's y pos
     and #$0f                         ; mask the last 4 bits, to get the Link's pixel position inside the tile
     cmp #$06                         ; check that we are deep into the lava tile
     bcc closest_rts                  ; Link's position is not low enough, return
@@ -1898,8 +1901,6 @@ public void FixMinibossGlitchyAppearance(Assembler asm)
 .import SwapCHR
 
 EnemyFacingDirection = $DC91
-CurrentPRGBank = $0769
-CurrentCHRBank = $076E
 
 .segment "PRG7"
 
@@ -1941,7 +1942,7 @@ sta SpChrBank4Reg
     adc #1
     sta SpChrBank5Reg
     ; due to an MMC5 issue, we need to write a bg bank as well.
-    lda CurrentCHRBank
+    lda CurrentChrBank
     asl
     asl
     ; clc ; carry is clear here
diff --git a/RandomizerCore/RandomizerCore.csproj b/RandomizerCore/RandomizerCore.csproj
index 682b6b2c..4e312082 100644
--- a/RandomizerCore/RandomizerCore.csproj
+++ b/RandomizerCore/RandomizerCore.csproj
@@ -27,6 +27,7 @@
     <None Remove="Asm\z2ft.s" />
     <None Remove="Asm\BuffCarock.s" />
     <None Remove="Asm\MMC5.s" />
+    <None Remove="Asm\ram.inc" />
     <None Remove="Asm\z2r.inc" />
     <None Remove="Asm\z2rndft.ips" />
     <None Update="Music\Faxanadu.json5">
@@ -68,6 +69,7 @@
     <EmbeddedResource Include="Asm\Graphics\item_sprites.chr" />
     <EmbeddedResource Include="Asm\Graphics\linkedFire.chr" />
     <EmbeddedResource Include="Asm\Graphics\randomizer_text.chr" />
+    <EmbeddedResource Include="Asm\ram.inc" />
     <EmbeddedResource Include="Asm\z2r.inc" />
     <EmbeddedResource Include="Asm\z2rndft.ips" />
   </ItemGroup>