From 5c30983be76b4b6ea427fac5464ca2143b0f842c Mon Sep 17 00:00:00 2001 From: Nick Downing Date: Wed, 29 Jun 2022 20:24:51 +1000 Subject: [PATCH] Perform a fresh comparison and improve the matching slightly --- galaxian/alien_typhoon.txt | 33 ++++++++++++++++++++++----------- galaxian/galaxian.txt | 12 ++++++++---- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/galaxian/alien_typhoon.txt b/galaxian/alien_typhoon.txt index 84f1353..005735c 100644 --- a/galaxian/alien_typhoon.txt +++ b/galaxian/alien_typhoon.txt @@ -37,8 +37,8 @@ items # saves value of ships before increment 0x0018,0x0001,score_temp,byte # this part may have shifted -0x001f,0x0001,gal_bvar_001f,byte -0x0020,0x0001,draw_x_save,byte +0x001f,0x0001,draw_x_save,byte +0x0020,0x0001,gal_bvar_001f,byte # this part has shifted by 1 byte # high score in 4-digit BCD 0x0024,0x0002,high_score,byte @@ -79,6 +79,7 @@ items 0x006e,0x0001,gal_bvar_006d,byte 0x006f,0x0001,gal_bvar_006e,byte 0x0070,0x0001,gal_bvar_006f,byte +# some extra gal_bvar_006d goes at 0x0073? # some extra draw_erase_x0 goes at 0x0074? # some extra draw_erase_y0 goes at 0x0075? # gets set to value of bvar_48a0 when win awarded @@ -89,13 +90,16 @@ items 0x007d,0x0001,gal_bvar_0073,byte 0x007e,0x0001,gal_bvar_0074,byte 0x007f,0x0001,gal_bvar_0075,byte +0x0080,0x0001,gal_bvar_0076,byte 0x0082,0x0001,gal_bvar_0078,byte 0x0083,0x0001,gal_bvar_0079,byte 0x0084,0x0001,gal_bvar_007a,byte +0x0085,0x0001,gal_bvar_007b,byte 0x0086,0x0001,gal_bvar_007c,byte 0x0087,0x0001,gal_bvar_007d,byte 0x0088,0x0001,gal_bvar_007e,byte 0x0089,0x0001,gal_bvar_007f,byte +0x008a,0x0001,gal_bvar_0080,byte 0x008b,0x0001,gal_bvar_0081,byte 0x0090,0x0001,gal_bvar_0085,byte 0x0095,0x0001,gal_bvar_008e,byte @@ -126,12 +130,14 @@ items 0x0941,0x0001,gal_barr_8f11,byte 0x0981,0x0028,star_shape_left,byte 0x09c1,0x0028,star_shape_right,byte +0x0a01,0x0001,gal_barr_00b1,byte 0x0a11,0x0008,shell_x_velocity,byte 0x0a31,0x0008,shell_x,byte 0x0a41,0x0008,shell_y,byte 0x0a51,0x0008,shell_x_fraction,byte # sizes have not been examined yet 0x0a71,0x0001,gal_barr_8ce1,byte +0x0ac1,0x0001,gal_barr_00a9,byte 0x0ac9,0x0001,missile_x,byte 0x0ad1,0x0001,missile_y,byte # sizes have not been examined yet @@ -145,7 +151,7 @@ items # sizes have not been examined yet 0x0ef1,0x0001,gal_barr_90e9,byte 0x0f50,0x0001,gal_barr_9168,byte -0x0f80,0x0001,gal_barr_8fe8,byte +0x0f80,0x0002,gal_barr_8fe8,byte 0x0fb1,0x0001,gal_barr_91e9,byte 0x0fe1,0x0001,gal_barr_9229,byte 0x1071,0x0001,gal_barr_9129,byte @@ -419,7 +425,7 @@ items 0x466e,0x0001,gal_barr_4c68,byte 0x4676,0x0001,gal_barr_4c70,byte 0x467e,0x0001,gal_barr_4c78,byte -# 46c6 == 49c0? +0x46c6,0x002f,gal_barr_49c0,byte 0x4707,0x0001,gal_barr_4a01,byte 0x4747,0x0001,gal_barr_4a41,byte 0x4787,0x0001,gal_barr_4a81,byte @@ -430,10 +436,15 @@ items 0x4907,0x0012,alien_shapes,byte # sizes have not been examined yet 0x4a47,0x0001,gal_barr_4d81,byte -0x4c46,0x0001,gal_bvar_4e80,byte -0x5046,0x0001,gal_bvar_5280,byte +# have these been split? +0x4b46,0x0001,gal_bvar_4e800,byte +0x4c46,0x0001,gal_bvar_4e801,byte +0x4f46,0x0001,gal_bvar_52800,byte +0x5046,0x0001,gal_bvar_52801,byte # something strange with 5281 -0x5446,0x0001,gal_bvar_5680,byte +0x5346,0x0001,gal_bvar_56800,byte +0x5446,0x0001,gal_bvar_56801,byte +# to here 0x5746,0x1800,shape_data,byte 0x6f46,0x1b85,misc_shape_data,byte # until sub_8acb @@ -516,7 +527,7 @@ items 0x90e6,0x0001,gal_loc_980b,code 0x90f0,0x0001,gal_rts_9815,code 0x90f1,0x0001,gal_sub_9816,code -0x90fb,0x0001,gal_loc_9820,code +0x90fb,0x0001,gal_loc_9820,code_ign # garbage word 0x90fc,0x0002,gal_ptr_9821,word # sizes have not been examined yet 0x9109,0x0001,gal_barr_982e,byte @@ -541,9 +552,9 @@ items 0x9390,0x0001,gal_sub_9a5d,code 0x939e,0x0001,gal_loc_9a6a,code # these get barr_9168[current alien] added to them and stored where indicated -0x9421,0x0002,ptr_9ef1_base,word -0x9423,0x0002,ptr_9efe_base,word -0x9425,0x0002,ptr_9f18_base,word +0x9421,0x0002,ptr_9ef1_base,word,byte +0x9423,0x0002,ptr_9efe_base,word,byte +0x9425,0x0002,ptr_9f18_base,word,byte 0x9427,0x0001,gal_sub_9add,code 0x946e,0x0001,gal_sub_9b2d,code 0x9475,0x0001,gal_loc_9b34,code diff --git a/galaxian/galaxian.txt b/galaxian/galaxian.txt index 980a1a1..2e34af0 100644 --- a/galaxian/galaxian.txt +++ b/galaxian/galaxian.txt @@ -81,13 +81,16 @@ items 0x0073,0x0001,gal_bvar_0073,byte 0x0074,0x0001,gal_bvar_0074,byte 0x0075,0x0001,gal_bvar_0075,byte +0x0076,0x0001,gal_bvar_0076,byte 0x0078,0x0001,gal_bvar_0078,byte 0x0079,0x0001,gal_bvar_0079,byte 0x007a,0x0001,gal_bvar_007a,byte +0x007b,0x0001,gal_bvar_007b,byte 0x007c,0x0001,gal_bvar_007c,byte 0x007d,0x0001,gal_bvar_007d,byte 0x007e,0x0001,gal_bvar_007e,byte 0x007f,0x0001,gal_bvar_007f,byte +0x0080,0x0001,gal_bvar_0080,byte 0x0081,0x0001,gal_bvar_0081,byte 0x0085,0x0001,gal_bvar_0085,byte 0x008e,0x0001,gal_bvar_008e,byte @@ -358,6 +361,7 @@ items # sizes have not been examined yet 0x490f,0x0001,gal_barr_490f,byte 0x492f,0x0001,gal_barr_492f,byte +0x49c0,0x0013,gal_barr_49c0,byte 0x4a01,0x0001,gal_barr_4a01,byte 0x4a41,0x0001,gal_barr_4a41,byte 0x4a81,0x0001,gal_barr_4a81,byte @@ -491,7 +495,7 @@ items 0x980b,0x0001,gal_loc_980b,code 0x9815,0x0001,gal_rts_9815,code 0x9816,0x0001,gal_sub_9816,code -0x9820,0x0001,gal_loc_9820,code +0x9820,0x0001,gal_loc_9820,code_ign # garbage word 0x9821,0x0002,gal_ptr_9821,word # sizes have not been exained yet 0x982e,0x0001,gal_barr_982e,byte @@ -515,9 +519,9 @@ items 0x9a5d,0x0001,gal_sub_9a5d,code 0x9a6a,0x0001,gal_loc_9a6a,code # these get barr_9168[current alien] added to them and stored where indicated -0x9ad7,0x0002,ptr_9ef1_base,word -0x9ad9,0x0002,ptr_9efe_base,word -0x9adb,0x0002,ptr_9f18_base,word +0x9ad7,0x0002,ptr_9ef1_base,word,byte +0x9ad9,0x0002,ptr_9efe_base,word,byte +0x9adb,0x0002,ptr_9f18_base,word,byte 0x9add,0x0001,gal_sub_9add,code 0x9b2d,0x0001,gal_sub_9b2d,code 0x9b34,0x0001,gal_loc_9b34,code -- 2.34.1