From ef8815309034ed58b4a2461732e6e0123d570b19 Mon Sep 17 00:00:00 2001
From: Kevin Cathcart <kevincathcart@gmail.com>
Date: Sun, 7 Jul 2019 17:57:37 -0400
Subject: [PATCH] Update RAM/SRAM maps and assignments

---
 LTTP_RND_GeneralBugfixes.asm | 36 ++++++++++++++++++++++++------------
 tables.asm                   |  5 ++++-
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 6258c4c..b89c153 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -34,11 +34,14 @@ db #$20, #$19, #$06, #$17 ; year/month/day
 !BLT = "BCC"
 !BGE = "BCS"
 
-!INVENTORY_SWAP = "$7EF38C"
-!INVENTORY_SWAP_2 = "$7EF38E"
+; Rando Specific SRAM assignments
+!SHOP_PURCHASE_COUNTS = "$7EF302" ;$7EF302 - $7EF33F (temporary home)
+!INVENTORY_SWAP = "$7EF38C" ; [w]
+!INVENTORY_SWAP_2 = "$7EF38E" ; [w]
+!ITEM_LIMIT_COUNTS = "$7EF390" ; $7EF390 - ????
 !NPC_FLAGS   = "$7EF410"
 !NPC_FLAGS_2 = "$7EF411"
-!MAP_OVERLAY = "$7EF414" ; [2]
+!MAP_OVERLAY = "$7EF414" ; [w]
 !PROGRESSIVE_SHIELD = "$7EF416" ; ss-- ----
 !HUD_FLAG = "$7EF416" ; --h- ----
 !FORCE_PYRAMID = "$7EF416" ; ---- p---
@@ -46,16 +49,18 @@ db #$20, #$19, #$06, #$17 ; year/month/day
 !SHAME_CHEST = "$7EF416" ; ---s ----
 !HAS_GROVE_ITEM = "$7EF416" ; ---- ---g general flags, don't waste these
 !HIGHEST_SWORD_LEVEL = "$7EF417" ; --- -sss
-!SRAM_SINK = "$7EF41E" ; <- change this
-!FRESH_FILE_MARKER = "$7EF4F0" ; zero if fresh file
 ;$7EF41A[w] - Programmable Item #1
 ;$7EF41C[w] - Programmable Item #2
 ;$7EF41E[w] - Programmable Item #3
+!SRAM_SINK = "$7EF41E" ; <- change this (conflicts with Programmable item 3)
 ;$7EF418 - Goal Item Counter
 ;$7EF419 - Service Sequence
-;$7EF420 - $7EF466 - Stat Tracking Bank 1
+;$7EF420 - $7EF466 - Stat Tracking Bank 1 (overlaps with RNG Item Flags)
 ;$7EF450 - $7EF45F - RNG Item (Single) Flags
 ;$7EF4A0 - $7EF4A7 - Service Request Block
+!FRESH_FILE_MARKER = "$7EF4F0" ; zero if fresh file
+;$700500 - $70050F - Extended File Name
+;$700510 - $70051F - Password (eventually should be moved into non-mirrored area)
 
 !MS_GOT = "$7F5031"
 !DARK_WORLD = "$7EF3CA"
@@ -68,11 +73,6 @@ db #$20, #$19, #$06, #$17 ; year/month/day
 !FORCE_HEART_SPAWN = "$7F5033";
 !SKIP_HEART_SAVE = "$7F5034";
 
-!INVENTORY_SWAP = "$7EF38C"
-!INVENTORY_SWAP_2 = "$7EF38E"
-
-!ITEM_LIMIT_COUNTS = "$7EF390"
-!SHOP_PURCHASE_COUNTS = "$7EF302"
 ;================================================================================
 
 incsrc hooks.asm
@@ -293,10 +293,22 @@ warnpc $B08000
 ;$3A reserved for downstream use
 ;$3B reserved for downstream use
 ;$3F reserved for internal debugging
-;$7F5700 - $7F57FF reserved for downstream use
+;================================================================================
+;RAM 
+;$7EC900[0x1F00]: BIGRAM buffer
+;$7EF000[0x500]: SRAM mirror First 0x500 bytes of SRAM
+;$7F5000[0x800]: Rando's main free ram region
+;   See tables.asm for specific assignments
+;$7F6000[0x500]: Free RAM (reclaimed from damage table) Not allocated yet
+;$7F6500[0xB00]: Reserved for SRAM mirror for last 0xB00 bytes of SRAM (extended sram)
+;$7F7667[0x6719] - free ram
 ;================================================================================
 ;SRAM Map
 ;$70:0000 ( 4K) Game state
+;  0000-04FF Vanilla Slot 1 (mirrored at 0x7EF000)
+;    See earlier in this file for rando specific assignments
+;  0500-0FFF Ext Slot 1 (not yet mirrored)
+;    See earlier in this file for rando specific assignments
 ;$70:1000 (20K) Log entries
 ;$70:6000 ( 8K) Scratch buffers
 ;================================================================================
diff --git a/tables.asm b/tables.asm
index 0e5e986..52bbe33 100644
--- a/tables.asm
+++ b/tables.asm
@@ -1447,7 +1447,9 @@ dw #9999 ; Rupee Limit
 ; $7F509C - Inverted Mode Duck Map Temporary
 ; $7F509D - Stalfos Bomb Damage Value
 ; $7F509E - Valid Key Loaded
+; $7F509F - Unused
 ; $7F50A0 - Event Parameter 1
+; $7F50A1 - $7F50AF - Unused
 
 ; $7F50B0 - $7F50BF - Downstream Reserved (Enemizer)
 
@@ -1472,9 +1474,10 @@ dw #9999 ; Rupee Limit
 ; $7F5200 - $7F52FF - RNG Pointer Block
 ; $7F5300 - $7F53FF - Multiworld Block
 
+; $7F5400 - $7F56FF - Unused
+
 ; $7F5700 - $7F57FF - Dialog Buffer
 ;
-; $7F6000 - $7F6FFF - Free RAM (Reclaimed from Damage Table)
 ;================================================================================
 !BIGRAM = "$7EC900";
 ; $7EC900 - Big RAM Buffer ($1F00)