Identify most of the timers

diff --git a/disasm/Makefile b/disasm/Makefile
index 4c5abcd..3fef979 100644 (file)
--- a/disasm/Makefile
+++ b/disasm/Makefile
@@ -113,4 +113,9 @@ shape_data_pixel.inc \
 shape_pixel.json \
 shape_index.inc \
 shape_data.inc \
-shape.json
+shape.json \
+object_index.inc \
+object_data.inc \
+object.json \
+draw_misc_table.inc \
+draw_misc.json

diff --git a/disasm/object_defs.inc b/disasm/object_defs.inc
index a4c28ff..e57cd82 100644 (file)
--- 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_TIMER = 0x13
+OBJECT_13_TIMER_MISSION_COMPLETE = 0x13
 OBJECT_14_FRAGMENT = 0x14
 OBJECT_15_FRAGMENT = 0x15
 OBJECT_16_FRAGMENT = 0x16
@@ -39,9 +39,9 @@ OBJECT_28_EXHAUST = 0x28
 OBJECT_29_TIMER = 0x29
 OBJECT_2A_EXPLOSION = 0x2a
 OBJECT_2C_DRAW_MISSION_BOMB_THE_HEADQUARTERS = 0x2c
-OBJECT_2D_TIMER = 0x2d
-OBJECT_2E_TIMER = 0x2e
-OBJECT_2F_TIMER = 0x2f
+OBJECT_2D_TIMER_TANK_CONTROLLER = 0x2d
+OBJECT_2E_TIMER_TANK_CONTROLLER_FINE = 0x2e
+OBJECT_2F_TIMER_TANK_CONTROLLER_STOP = 0x2f
 OBJECT_30_MISSILE_EXHAUST = 0x30
 OBJECT_31_MISSILE_EXHAUST = 0x31
 OBJECT_32_MISSILE_EXHAUST = 0x32
@@ -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_TIMER = 0x4e
-OBJECT_4F_TIMER = 0x4f
+OBJECT_4E_SHIP_EXHAUST_PIXEL = 0x4e
+OBJECT_4F_SHIP_EXHAUST_PIXEL = 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_TIMER = 0x63
+OBJECT_63_STAR_GENERATOR = 0x63
 OBJECT_64_PIXEL_SHIP = 0x64
 OBJECT_65_EXHAUST_OR_DRAW_MISSION_COMPLETE = 0x65
 OBJECT_66_SHIP = 0x66
@@ -117,8 +117,8 @@ 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_TIMER = 0x7d
-OBJECT_7E_TIMER = 0x7e
+OBJECT_7D_TIMER_TITLE_DISPLAY = 0x7d
+OBJECT_7E_TIMER_HEADQUARTERS_RADAR_ICBM_GENERATOR = 0x7e
 OBJECT_7F_DRAW_STAR_BLAZER_BY_TONY_SUZUKI = 0x7f
 
 ; shapes

diff --git a/disasm/star_blazer.txt b/disasm/star_blazer.txt
index 61994a4..8e3f2b3 100644 (file)
--- 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,timer
+0x13,timer_mission_complete
 0x14,fragment
 0x15,fragment
 0x16,fragment
@@ -758,9 +758,12 @@ objects
 0x29,timer
 0x2a,explosion
 0x2c,draw_mission_bomb_the_headquarters
-0x2d,timer
-0x2e,timer
-0x2f,timer
+# seems to control initialization of the tank and coarse velocity
+0x2d,timer_tank_controller
+# seems to control fine velocity of the tank to improve chase effect
+0x2e,timer_tank_controller_fine
+# stops both tank controllers
+0x2f,timer_tank_controller_stop
 0x30,missile_exhaust
 0x31,missile_exhaust
 0x32,missile_exhaust
@@ -789,8 +792,8 @@ objects
 0x4b,haystack_house
 0x4c,silo_house
 0x4d,headquarters_radar_icbm
-0x4e,timer
-0x4f,timer
+0x4e,ship_exhaust_pixel
+0x4f,ship_exhaust_pixel
 0x50,bullet
 0x51,bullet
 0x52,bullet
@@ -810,7 +813,7 @@ objects
 0x60,draw_game_over
 0x61,ship
 0x62,ship
-0x63,timer
+0x63,star_generator
 0x64,pixel_ship
 0x65,exhaust_or_draw_mission_complete
 0x66,ship
@@ -836,8 +839,8 @@ objects
 0x7a,draw_mission_bomb_the_icbm
 0x7b,draw_mission_attack_the_tank
 0x7c,draw_scoring_thanks_a_lot_comma_raly
-0x7d,timer
-0x7e,timer
+0x7d,timer_title_display
+0x7e,timer_headquarters_radar_icbm_generator
 0x7f,draw_star_blazer_by_tony_suzuki
 
 draw_misc_entries