Reinstate my graphics for haystack, house, tree and cactus, improve explosions

diff --git a/disasm/Makefile b/disasm/Makefile
index 05356b4..20f0616 100644 (file)
--- a/disasm/Makefile
+++ b/disasm/Makefile
@@ -63,16 +63,16 @@ star_blazer.asm.patch
        cp $@ $@0
        patch $@ <$@.patch
 
-dhgr_pixel_shape_index.inc: pixel.txt shape.txt dhgr_shape.txt shape0c.png
-       cat pixel.txt shape.txt dhgr_shape.txt \
+dhgr_pixel_shape_index.inc: pixel.txt dhgr_shape.txt shape0c.png
+       cat pixel.txt dhgr_shape.txt \
 |./shape_compile.py --dhgr --index shape0c.png >$@
 
-dhgr_pixel_shape_data_aux.inc: pixel.txt shape.txt dhgr_shape.txt shape0c.png
-       cat pixel.txt shape.txt dhgr_shape.txt \
+dhgr_pixel_shape_data_aux.inc: pixel.txt dhgr_shape.txt shape0c.png
+       cat pixel.txt dhgr_shape.txt \
 |./shape_compile.py --dhgr --aux --data shape0c.png >$@
 
-dhgr_pixel_shape_data_main.inc: pixel.txt shape.txt dhgr_shape.txt shape0c.png
-       cat pixel.txt shape.txt dhgr_shape.txt \
+dhgr_pixel_shape_data_main.inc: pixel.txt dhgr_shape.txt shape0c.png
+       cat pixel.txt dhgr_shape.txt \
 |./shape_compile.py --dhgr --main --data shape0c.png >$@
 
 pixel_shape_index.inc: pixel.txt shape.txt shape0a.png

diff --git a/disasm/dhgr_shape.txt b/disasm/dhgr_shape.txt
new file mode 100644 (file)
index 0000000..967134b
--- /dev/null
+++ b/disasm/dhgr_shape.txt
@@ -0,0 +1,131 @@
+0x20,bomb0,true
+0x21,bomb1,true
+0x22,bomb2,true
+0x23,bomb3,true
+0x50,missile_launcher0_empty,true
+0x51,missile_launcher1_empty,true
+0x52 0x56,missile_launcher2,true
+0x54,missile_launcher0,true
+0x55,missile_launcher1,true
+0x40,missile0,true
+0x44,missile4,true
+0x48,missile8,true
+0x4c,missile12,true
+0x41,missile1,true
+0x47,missile7,true
+0x49,missile9,true
+0x4f,missile15,true
+0x42,missile2,true
+0x46,missile6,true
+0x4a,missile10,true
+0x4e,missile14,true
+0x43,missile3,true
+0x45,missile5,true
+0x4b,missile11,true
+0x4d,missile13,true
+0x60,fragment0,true
+0x61,fragment1,true
+0x62,fragment2,true
+0x63,fragment3,true
+0x64,fragment4,true
+0x65,fragment5,true
+0x66,fragment6,true
+0x67,fragment7,true
+0x0c,bird0,true
+0x0d,bird1,true
+0x0e,bird2,true
+0x0f,bird3,false
+0x08,bullet3,true
+0x09,bullet5,true
+0x0a,bullet7,true
+0x0b,bullet9,true
+0x14,parachute0,true
+0x15,parachute1,true
+0x16,parachute_open,true
+0x88,explosion0,true
+0x89,explosion1,true
+0x8a,explosion2,true
+0x8b,explosion3,true
+0x10,ship,true
+0x11,ship_open,true
+0x12,exhaust0,true
+0x13,exhaust1,false
+0x17,fuel,true
+0x18,supply_plane,true
+0x28,balloon0,true
+0x29,balloon1,true
+0x2a,balloon2,true
+0x2e,enemy_plane0,true
+0x2f,enemy_plane1,true
+0x2c,helicopter,true
+0x1c,tank,true
+0x1e,missile_tank,true
+0x1f,missile_tank_empty,true
+0x36,pylon,true
+0x30,silo0,true
+0x31,silo1,true
+0x70,haystack,true
+0x71,house,true
+0x72,headquarters,true
+0x73,radar0,true
+0x74,radar1,true
+0x75,radar2,true
+0x76,icbm,true
+0x78,tree,true
+0x79,cactus,true
+0xaa,text_score,false
+0xab,text_colon,false
+0xac,text_high,false
+0xb0,text_mission,false
+0xb2,text_fuel,false
+0xb3,text_empty,false
+0xb4,text_bomb,false
+0xb6,text_ship_left,false
+0xb7,text_complete,false
+0xb8,text_the,false
+0xb9,text_radar,false
+0xba,text_icbm,false
+0xbc,text_attack,false
+0xbd,text_tank,false
+0xbe,text_headquarters,false
+0xbf,text_a,false
+0xa0,text_0,false
+0xa1,text_1,false
+0xa2,text_2,false
+0xa3,text_3,false
+0xa4,text_4,false
+0xa5,text_5,false
+0xa6,text_6,false
+0xa7,text_7,false
+0xa8,text_8,false
+0xa9,text_9,false
+0xff,blank,false
+0xf0,ground0,false,true
+0xf1,ground1,false,true
+0xf2,ground2,false,true
+0xf3,ground3,false,true
+0xc0,ships0,false
+0xc1,ships1,false
+0xc2,ships2,false
+0xc3,ships3,false
+0xd2,text_by,false
+0xd3,text_tony,false
+0xd4,text_suzuki,false
+0xd8,text_game,false
+0xd9,text_over,false
+0xda,text_bonus,false
+0xdc,text_great,false
+0xdd,text_performance,false
+0xe1,text_copyright,false
+0xe2,text_star_craft,false
+0xe3,text_inc,false
+0xe4,text_thanks,false
+0xe5,text_lot_comma,false
+0xe6,text_raly,false
+0xe7,text_minus_20,false
+0xe8,text_20_40_60_80,false
+0xe9,text_100_120_300_1500,false
+0xd0,text_star,false
+0xd1,text_blazer,false
+0xc8,text_star_no_hibit,false
+0xc9,text_blazer_no_hibit,false

diff --git a/disasm/shape_dhgr.png b/disasm/shape_dhgr.png
index 8f55b1d..f42745a 100644 (file)
Binary files a/disasm/shape_dhgr.png and b/disasm/shape_dhgr.png differ

diff --git a/disasm/star_blazer.asm.patch b/disasm/star_blazer.asm.patch
index eb2da3e..c28f6e5 100644 (file)
--- a/disasm/star_blazer.asm.patch
+++ b/disasm/star_blazer.asm.patch
@@ -1,5 +1,5 @@
---- star_blazer.asm0   2022-06-23 00:53:17.740048411 +1000
-+++ star_blazer.asm    2022-06-23 00:59:38.852052316 +1000
+--- star_blazer.asm0   2022-06-23 01:03:48.956054878 +1000
++++ star_blazer.asm    2022-06-23 01:32:47.040072683 +1000
 @@ -1,3 +1,8 @@
 +ALIGN = 0
 +DHGR = 1
@@ -1735,7 +1735,7 @@
 +      adc     #0x01                   ; 1f32 -> 1f33 -> 1f35 r c=0 d=0
 +      sta     object1080_velocity_x_hi + 0x50 ; 1f33 -> 1f35 -> 1f38 r
 +      rts                             ; 1f35 -> 1f38 -> 15df r s=f9
-+      .ds     0x9f80 - 0x4000 - (. - data0_start)
++      .ds     0xa000 - 0x4000 - (. - data0_start)
 +barr_1f80:
 +      .db     0x43                    ; 1f80 r
 +      .db     0x02                    ; 1f81 r