1 files changed, 48 insertions, 19 deletions
diff --git a/src/addrs.c b/src/addrs.c
index 8c4ad1b..5154109 100644
--- a/src/addrs.c
+++ b/src/addrs.c
@@ -1,27 +1,56 @@
 #include "addrs.h"
 
-u8 *dlist = u8p(DLIST_ADDR);
-u16 *dlist_top_lms = u16p(0xa404);
-u16 *dlist_bottom_lms = u16p(0xa41e);
-u8 *status_box = u8p(0xa425); /* 80 bytes */
-u8 *edit_box = u8p(0xa475); /* 160 bytes */
+u8 *dlist_top = u8p(DLIST_TOP_ADDR);
+u8 *dlist_bot = u8p(DLIST_BOT_ADDR);
 
-u8 *screen_addrs[7] = {
-	u8p(0xa538),
-	u8p(0xa8d0),
-	u8p(0xac68),
+u16 *dlist_top_lms = u16p(0xbfa4);
+u16 *dlist_bot_lms = u16p(0xbfd4);
+u16 *dlist_status_lms = u16p(0xbfed);
+
+u8 *edit_box = u8p(0x0600); /* up to 256 bytes (page 6) */
+u8 *rx_buf = u8p(0xa000); /* 512 bytes */
+u8 *tx_buf = u8p(0xa200); /* 512 bytes */
+
+/* 1000 bytes (25 40-char lines) apiece. */
+u8 *screen_top_addrs[7] = {
+	u8p(0x8400),
+	u8p(0x87e8),
+	u8p(0x8bd0),
+	u8p(0x9000),
+	u8p(0x93e8),
+	u8p(0x97d0),
+	u8p(0x9bb8)
+};
+
+/* 1000 bytes (25 40-char lines) apiece. */
+u8 *screen_bot_addrs[7] = {
+	u8p(0xa400),
+	u8p(0xa7e8),
+	u8p(0xabd0),
 	u8p(0xb000),
-	u8p(0xb398),
-	u8p(0xb730),
-	u8p(0xbac8)
+	u8p(0xb3e8),
+	u8p(0xb7d0),
+	u8p(0xbbb8)
 };
 
-u8 *screen_botlines[7] = {
-	u8p(0xa8a8),
-	u8p(0xac40),
-	u8p(0xafd8),
+/* 40 bytes (1 line), third from the bottom of each _bot_addr */
+u8 *screen_lastlines[7] = {
+	u8p(0xa770),
+	u8p(0xab58),
+	u8p(0xaf40),
 	u8p(0xb370),
-	u8p(0xb708),
-	u8p(0xbaa0),
-	u8p(0xbe38)
+	u8p(0xb758),
+	u8p(0xbb40),
+	u8p(0xbf28)
+};
+
+/* 80 bytes (2 lines), bottom 2 of each _bot_addr */
+u8 *status_boxes[7] = {
+	u8p(0xa798),
+	u8p(0xab80),
+	u8p(0xaf68),
+	u8p(0xb398),
+	u8p(0xb780),
+	u8p(0xbb68),
+	u8p(0xbf50)
 };