From: Nick Downing Date: Sun, 26 Jun 2022 02:07:08 +0000 (+1000) Subject: Name timer objects in bulk (will later rename them for their timeout action), also... X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=1ca986e258c5eb06bdf15a8e56540d38f7454328;p=star_disasm.git Name timer objects in bulk (will later rename them for their timeout action), also identify the star, missile exhaust, and tree/cactus/bird generator objects --- diff --git a/disasm/object_defs.inc b/disasm/object_defs.inc index 5d5bbb7..a4c28ff 100644 --- a/disasm/object_defs.inc +++ b/disasm/object_defs.inc @@ -14,7 +14,7 @@ OBJECT_0F_DRAW_BONUS = 0x0f OBJECT_10_DRAW_FUEL_BOMB = 0x10 OBJECT_11_DRAW_SHIP_LEFT = 0x11 OBJECT_12_DRAW_HIGH_SCORE_COPYRIGHT = 0x12 -OBJECT_13_PIXEL = 0x13 +OBJECT_13_TIMER = 0x13 OBJECT_14_FRAGMENT = 0x14 OBJECT_15_FRAGMENT = 0x15 OBJECT_16_FRAGMENT = 0x16 @@ -27,33 +27,33 @@ OBJECT_1C_FRAGMENT = 0x1c OBJECT_1D_FRAGMENT = 0x1d OBJECT_1E_FRAGMENT = 0x1e OBJECT_1F_FRAGMENT = 0x1f -OBJECT_20_PIXEL = 0x20 -OBJECT_21_PIXEL = 0x21 -OBJECT_22_PIXEL = 0x22 -OBJECT_23_PIXEL = 0x23 -OBJECT_24_PIXEL = 0x24 -OBJECT_25_PIXEL = 0x25 -OBJECT_26_PIXEL = 0x26 -OBJECT_27_PIXEL = 0x27 +OBJECT_20_STAR = 0x20 +OBJECT_21_STAR = 0x21 +OBJECT_22_STAR = 0x22 +OBJECT_23_STAR = 0x23 +OBJECT_24_STAR = 0x24 +OBJECT_25_STAR = 0x25 +OBJECT_26_STAR = 0x26 +OBJECT_27_STAR = 0x27 OBJECT_28_EXHAUST = 0x28 -OBJECT_29_PIXEL = 0x29 +OBJECT_29_TIMER = 0x29 OBJECT_2A_EXPLOSION = 0x2a OBJECT_2C_DRAW_MISSION_BOMB_THE_HEADQUARTERS = 0x2c -OBJECT_2D_PIXEL = 0x2d -OBJECT_2E_PIXEL = 0x2e -OBJECT_2F_PIXEL = 0x2f -OBJECT_30_PIXEL = 0x30 -OBJECT_31_PIXEL = 0x31 -OBJECT_32_PIXEL = 0x32 -OBJECT_33_PIXEL = 0x33 -OBJECT_34_PIXEL = 0x34 -OBJECT_35_PIXEL = 0x35 -OBJECT_36_PIXEL = 0x36 -OBJECT_37_PIXEL = 0x37 -OBJECT_38_PIXEL = 0x38 -OBJECT_39_PIXEL = 0x39 -OBJECT_3A_PIXEL = 0x3a -OBJECT_3B_PIXEL = 0x3b +OBJECT_2D_TIMER = 0x2d +OBJECT_2E_TIMER = 0x2e +OBJECT_2F_TIMER = 0x2f +OBJECT_30_MISSILE_EXHAUST = 0x30 +OBJECT_31_MISSILE_EXHAUST = 0x31 +OBJECT_32_MISSILE_EXHAUST = 0x32 +OBJECT_33_MISSILE_EXHAUST = 0x33 +OBJECT_34_MISSILE_EXHAUST = 0x34 +OBJECT_35_MISSILE_EXHAUST = 0x35 +OBJECT_36_MISSILE_EXHAUST = 0x36 +OBJECT_37_MISSILE_EXHAUST = 0x37 +OBJECT_38_MISSILE_EXHAUST = 0x38 +OBJECT_39_MISSILE_EXHAUST = 0x39 +OBJECT_3A_MISSILE_EXHAUST = 0x3a +OBJECT_3B_MISSILE_EXHAUST = 0x3b OBJECT_3C_DRAW_BONUS = 0x3c OBJECT_3D_DRAW_BONUS_HIGH_SCORE = 0x3d OBJECT_40_BIRD = 0x40 @@ -70,8 +70,8 @@ OBJECT_4A_SILO_HAYSTACK = 0x4a OBJECT_4B_HAYSTACK_HOUSE = 0x4b OBJECT_4C_SILO_HOUSE = 0x4c OBJECT_4D_HEADQUARTERS_RADAR_ICBM = 0x4d -OBJECT_4E_PIXEL = 0x4e -OBJECT_4F_PIXEL = 0x4f +OBJECT_4E_TIMER = 0x4e +OBJECT_4F_TIMER = 0x4f OBJECT_50_BULLET = 0x50 OBJECT_51_BULLET = 0x51 OBJECT_52_BULLET = 0x52 @@ -91,7 +91,7 @@ OBJECT_5F_BOMB_EXPLOSION = 0x5f OBJECT_60_DRAW_GAME_OVER = 0x60 OBJECT_61_SHIP = 0x61 OBJECT_62_SHIP = 0x62 -OBJECT_63_PIXEL = 0x63 +OBJECT_63_TIMER = 0x63 OBJECT_64_PIXEL_SHIP = 0x64 OBJECT_65_EXHAUST_OR_DRAW_MISSION_COMPLETE = 0x65 OBJECT_66_SHIP = 0x66 @@ -110,15 +110,15 @@ OBJECT_72_FUEL_EXPLOSION = 0x72 OBJECT_73_BULLET = 0x73 OBJECT_74_BULLET = 0x74 OBJECT_75_BULLET = 0x75 -OBJECT_76_PIXEL = 0x76 +OBJECT_76_TREE_CACTUS_BIRD_GENERATOR = 0x76 OBJECT_77_TANK = 0x77 OBJECT_78_DRAW_MISSION_BOMB_THE_RADAR = 0x78 OBJECT_79_DRAW_MISSION_ATTACK_THE_TANK = 0x79 OBJECT_7A_DRAW_MISSION_BOMB_THE_ICBM = 0x7a OBJECT_7B_DRAW_MISSION_ATTACK_THE_TANK = 0x7b OBJECT_7C_DRAW_SCORING_THANKS_A_LOT_COMMA_RALY = 0x7c -OBJECT_7D_PIXEL = 0x7d -OBJECT_7E_PIXEL = 0x7e +OBJECT_7D_TIMER = 0x7d +OBJECT_7E_TIMER = 0x7e OBJECT_7F_DRAW_STAR_BLAZER_BY_TONY_SUZUKI = 0x7f ; shapes diff --git a/disasm/star_blazer.txt b/disasm/star_blazer.txt index 04c726c..61994a4 100644 --- a/disasm/star_blazer.txt +++ b/disasm/star_blazer.txt @@ -733,7 +733,7 @@ objects 0x10,draw_fuel_bomb 0x11,draw_ship_left 0x12,draw_high_score_copyright -0x13,pixel +0x13,timer 0x14,fragment 0x15,fragment 0x16,fragment @@ -746,33 +746,33 @@ objects 0x1d,fragment 0x1e,fragment 0x1f,fragment -0x20,pixel -0x21,pixel -0x22,pixel -0x23,pixel -0x24,pixel -0x25,pixel -0x26,pixel -0x27,pixel +0x20,star +0x21,star +0x22,star +0x23,star +0x24,star +0x25,star +0x26,star +0x27,star 0x28,exhaust -0x29,pixel +0x29,timer 0x2a,explosion 0x2c,draw_mission_bomb_the_headquarters -0x2d,pixel -0x2e,pixel -0x2f,pixel -0x30,pixel -0x31,pixel -0x32,pixel -0x33,pixel -0x34,pixel -0x35,pixel -0x36,pixel -0x37,pixel -0x38,pixel -0x39,pixel -0x3a,pixel -0x3b,pixel +0x2d,timer +0x2e,timer +0x2f,timer +0x30,missile_exhaust +0x31,missile_exhaust +0x32,missile_exhaust +0x33,missile_exhaust +0x34,missile_exhaust +0x35,missile_exhaust +0x36,missile_exhaust +0x37,missile_exhaust +0x38,missile_exhaust +0x39,missile_exhaust +0x3a,missile_exhaust +0x3b,missile_exhaust 0x3c,draw_bonus 0x3d,draw_bonus_high_score 0x40,bird @@ -789,8 +789,8 @@ objects 0x4b,haystack_house 0x4c,silo_house 0x4d,headquarters_radar_icbm -0x4e,pixel -0x4f,pixel +0x4e,timer +0x4f,timer 0x50,bullet 0x51,bullet 0x52,bullet @@ -810,7 +810,7 @@ objects 0x60,draw_game_over 0x61,ship 0x62,ship -0x63,pixel +0x63,timer 0x64,pixel_ship 0x65,exhaust_or_draw_mission_complete 0x66,ship @@ -829,15 +829,15 @@ objects 0x73,bullet 0x74,bullet 0x75,bullet -0x76,pixel +0x76,tree_cactus_bird_generator 0x77,tank 0x78,draw_mission_bomb_the_radar 0x79,draw_mission_attack_the_tank 0x7a,draw_mission_bomb_the_icbm 0x7b,draw_mission_attack_the_tank 0x7c,draw_scoring_thanks_a_lot_comma_raly -0x7d,pixel -0x7e,pixel +0x7d,timer +0x7e,timer 0x7f,draw_star_blazer_by_tony_suzuki draw_misc_entries