rework numbered addresses

Lua/addrs/M JP10.lua

@@ -1,4 +1,25 @@
 return {
+    lottery_numbers = {
+        AL(0x1370, 3),
+        AL(0x1373, 3),
+        AL(0x1376, 3),
+    },
+    spider_mask_order = {
+        AL(0x1379, 1),
+        AL(0x137A, 1),
+        AL(0x137B, 1),
+        AL(0x137C, 1),
+        AL(0x137D, 1),
+        AL(0x137E, 1),
+    },
+    bombers_code = {
+        AL(0x137F, 1),
+        AL(0x1380, 1),
+        AL(0x1381, 1),
+        AL(0x1382, 1),
+        AL(0x1383, 1),
+    },
+
     checksum            = AL(0x138E, 2),
     disable_pause       = nil,
     hookshot_ba         = nil,
@@ -9,12 +30,6 @@ return {
     bubble_timer        = AL(0x3F58, 2),
     rupee_accumulator   = AL(0x4078, 2),
     spring_water_timers = AL(0x41D8, 0xC0),
-    spring_water_time_1 = AL(0x41F8, 0x20),
-    spring_water_time_2 = AL(0x4218, 0x20),
-    spring_water_time_3 = AL(0x4238, 0x20),
-    spring_water_time_4 = AL(0x4258, 0x20),
-    spring_water_time_5 = AL(0x4278, 0x20),
-    spring_water_time_6 = AL(0x4298, 0x20),
     pictograph_picture  = AL(0x1390, 0x2BC0),
     title_screen_mod    = AL(0x3F5C, 4),
     entrance_mod        = AL(0x3F60, 4),

Lua/addrs/M JP11.lua

@@ -1,4 +1,25 @@
 return {
+    lottery_numbers = {
+        AL(0x1370, 3),
+        AL(0x1373, 3),
+        AL(0x1376, 3),
+    },
+    spider_mask_order = {
+        AL(0x1379, 1),
+        AL(0x137A, 1),
+        AL(0x137B, 1),
+        AL(0x137C, 1),
+        AL(0x137D, 1),
+        AL(0x137E, 1),
+    },
+    bombers_code = {
+        AL(0x137F, 1),
+        AL(0x1380, 1),
+        AL(0x1381, 1),
+        AL(0x1382, 1),
+        AL(0x1383, 1),
+    },
+
     checksum            = AL(0x138E, 2),
     disable_pause       = nil,
     hookshot_ba         = nil,
@@ -9,12 +30,6 @@ return {
     bubble_timer        = AL(0x3F58, 2),
     rupee_accumulator   = AL(0x4078, 2),
     spring_water_timers = AL(0x41D8, 0xC0),
-    spring_water_time_1 = AL(0x41F8, 0x20),
-    spring_water_time_2 = AL(0x4218, 0x20),
-    spring_water_time_3 = AL(0x4238, 0x20),
-    spring_water_time_4 = AL(0x4258, 0x20),
-    spring_water_time_5 = AL(0x4278, 0x20),
-    spring_water_time_6 = AL(0x4298, 0x20),
     pictograph_picture  = AL(0x1390, 0x2BC0),
     title_screen_mod    = AL(0x3F5C, 4),
     entrance_mod        = AL(0x3F60, 4),

Lua/addrs/M common.lua

@@ -98,24 +98,34 @@ return {
     map_visited         = AL(0xF5E, 2),
     map_visible         = AL(0xF62, 2),
     bombers_caught      = AL(0xFE6, 1),
-    bombers_order_1     = AL(0xFE7, 1),
+
-    bombers_order_2     = AL(0xFE8, 1),
+    bombers_order = {
-    bombers_order_3     = AL(0xFE9, 1),
+        AL(0xFE7, 1),
-    bombers_order_4     = AL(0xFEA, 1),
+        AL(0xFE8, 1),
-    bombers_order_5     = AL(0xFEB, 1),
+        AL(0xFE9, 1),
-    lottery_code_1      = AL(0xFEC, 3),
+        AL(0xFEA, 1),
-    lottery_code_2      = AL(0xFEF, 3),
+        AL(0xFEB, 1),
-    lottery_code_3      = AL(0xFF2, 3),
+    },
-    spider_mask_color_1 = AL(0xFF5, 1), -- 0: red; 1: blue; 2: green; 3: yellow
+    lottery_numbers = {
-    spider_mask_color_2 = AL(0xFF6, 1),
+        AL(0xFEC, 3),
-    spider_mask_color_3 = AL(0xFF7, 1),
+        AL(0xFEF, 3),
-    spider_mask_color_4 = AL(0xFF8, 1),
+        AL(0xFF2, 3),
-    spider_mask_color_5 = AL(0xFF9, 1),
+    },
-    bombers_code_1      = AL(0xFFB, 1),
+    spider_mask_order = {
-    bombers_code_2      = AL(0xFFC, 1),
+        AL(0xFF5, 1), -- 0: red; 1: blue; 2: green; 3: yellow
-    bombers_code_3      = AL(0xFFD, 1),
+        AL(0xFF6, 1),
-    bombers_code_4      = AL(0xFFE, 1),
+        AL(0xFF7, 1),
-    bombers_code_5      = AL(0xFFF, 1),
+        AL(0xFF8, 1),
+        AL(0xFF9, 1),
+        AL(0xFFA, 1),
+    },
+    bombers_code = {
+        AL(0xFFB, 1),
+        AL(0xFFC, 1),
+        AL(0xFFD, 1),
+        AL(0xFFE, 1),
+        AL(0xFFF, 1),
+    },
 
     -- note: these addresses are invalid for JP10, JP11.
     checksum            = AL(0x100A, 2),
@@ -128,12 +138,6 @@ return {
     bubble_timer        = AL(0x1016, 2),
     rupee_accumulator   = AL(0x1018, 2),
     spring_water_timers = AL(0x1020, 0xC0),
-    spring_water_time_1 = AL(0x1020, 0x20),
-    spring_water_time_2 = AL(0x1040, 0x20),
-    spring_water_time_3 = AL(0x1060, 0x20),
-    spring_water_time_4 = AL(0x1080, 0x20),
-    spring_water_time_5 = AL(0x10A0, 0x20),
-    spring_water_time_6 = AL(0x10C0, 0x20),
     pictograph_picture  = AL(0x10E0, 0x2BC0),
     title_screen_mod    = AL(0x3CA8, 4),
     entrance_mod        = AL(0x3CAC, 4),

Lua/oneshot.lua

@@ -54,19 +54,19 @@ else
     a.map_visited   (0xFFFF)
     a.banked_rupees (5000)
 
-    a.lottery_code_1(1*10000 + 2*0x100 + 3)
+    a.lottery_numbers[1](1*10000 + 2*0x100 + 3)
-    a.lottery_code_2(4*10000 + 5*0x100 + 6)
+    a.lottery_numbers[2](4*10000 + 5*0x100 + 6)
-    a.lottery_code_3(7*10000 + 8*0x100 + 9)
+    a.lottery_numbers[3](7*10000 + 8*0x100 + 9)
-    a.spider_mask_color_1(0)
+    a.spider_mask_order[1](0)
-    a.spider_mask_color_2(0)
+    a.spider_mask_order[2](0)
-    a.spider_mask_color_3(0)
+    a.spider_mask_order[3](0)
-    a.spider_mask_color_4(0)
+    a.spider_mask_order[4](0)
-    a.spider_mask_color_5(0)
+    a.spider_mask_order[5](0)
-    a.bombers_code_1(1)
+    a.bombers_code[1](1)
-    a.bombers_code_2(2)
+    a.bombers_code[2](2)
-    a.bombers_code_3(3)
+    a.bombers_code[3](3)
-    a.bombers_code_4(4)
+    a.bombers_code[4](4)
-    a.bombers_code_5(5)
+    a.bombers_code[5](5)
 
     a.items_wft(7)
     a.items_sht(7)