aboutsummaryrefslogtreecommitdiff
path: root/.nasm
diff options
context:
space:
mode:
Diffstat (limited to '.nasm')
-rw-r--r--.nasm/memory.txt7
-rw-r--r--.nasm/segments.txt6
2 files changed, 4 insertions, 9 deletions
diff --git a/.nasm/memory.txt b/.nasm/memory.txt
index dcdef5e..129737f 100644
--- a/.nasm/memory.txt
+++ b/.nasm/memory.txt
@@ -17,8 +17,7 @@ $10: zp_displayed
$11: zp_timer
$20: zp_flags
$21: zp_prev
-$22: zp_buttons1
-$23: zp_buttons2
+$22: zp_buttons
$24: zp_level
$25: zp_level_kind
$26: zp_multiplayer
@@ -66,8 +65,8 @@ $2006: m_address
$2007: m_data
$4010: m_dmc
$4014: m_dma
-$4016: m_joypad1
+$4016: m_joypad
$4017: m_frame_counter
--- Summary (in bytes) ---
-- Internal RAM: 391/2048 (19.09%)
+- Internal RAM: 390/2048 (19.04%)
diff --git a/.nasm/segments.txt b/.nasm/segments.txt
index e5b18a5..0b837c2 100644
--- a/.nasm/segments.txt
+++ b/.nasm/segments.txt
@@ -1,8 +1,4 @@
- HEADER: 16/16 (100%)
-<<<<<<< HEAD
-- ROM0: 6609/32762 (20.17%)
-=======
-- ROM0: 6658/32762 (20.32%)
->>>>>>> 823e1f6ed102 (State game over only when all players are dead)
+- ROM0: 6671/32762 (20.36%)
- ROMV: 6/6 (100%)
- ROM2: 8192/8192 (100%)