1 files changed, 30 insertions, 16 deletions
diff --git a/jumpmanjr.info b/jumpmanjr.info
index bff050f..6ad7960 100644
--- a/jumpmanjr.info
+++ b/jumpmanjr.info
@@ -620,7 +620,10 @@ label { name "check_falling_2"; addr $8900; comment "called via vector in page 6
 label { name "bullet_logic"; addr $8E69; comment "not sure what $0622, $0623 are for yet"; };
 label { name "rand_1_to_3"; addr $8E86; comment "A = rand() % 3 + 1; // bullets only come from left, right, or top (never bottom)"; };
 label { name "bullet_table_minus_one"; addr $8F42; comment "1-indexed"; };
-label { name "falling_flag"; addr $0621; comment "1 = falling, reset to 0 when jumpman hits the ground"; };
+label { name "start_falling_flag"; addr $0621; comment "reset to 0 every frame, set to 1 when starting to fall"; };
+label { name "check_ground"; addr $980E; comment "we're falling, have we hit the ground yet?"; };
+label { name "cf_done"; addr $9805; };
+label { name "falling_flag"; addr $0623; comment "0 = ok, 1 = falling, 2 = on ground."; };
 label { name "jiffy_timer_1"; addr $061A; comment "gets incremented every frame"; };
 label { name "jiffy_timer_2"; addr $061B; comment "gets incremented every frame"; };
 label { name "jiffy_timer_3_lo"; addr $0619; comment "gets incremented every frame"; };
@@ -869,7 +872,7 @@ label { name "update_status_window"; addr $8694; comment "bottom 2 GR.1 lines on
 label { name "update_status_window_jv"; addr $8012; comment "bottom 2 GR.1 lines on the game board"; };
 label { name "setup_gameboard_dlist"; addr $9B00; comment "for some reason there are 2 copies of the display list, at $0800 and $0881"; };
 label { name "setup_gameboard_dlist_jv"; addr $8015; comment "for some reason there are 2 copies of the display list, at $0800 and $0881"; };
-label { name "print_number"; addr $8600; comment "convert the 3-byte integer stored at num_in to screen codes, store into memory pointed to by num_out"; };
+label { name "print_number"; addr $8600; comment "convert the 3-byte integer stored at num_in to screen codes, store into memory pointed to by num_out. num_in is modified."; };
 label { name "print_number_jv"; addr $8009; comment "convert the 3-byte integer stored at num_in to screen codes, store into memory pointed to by num_out"; };
 label { name "num_tmp"; addr $0665; size 1; comment "temp used by print_number"; };
 label { name "num_in"; addr $D0; size 3; comment "print_number input. 3-byte number (LSB first as usual) to be printed"; };
@@ -922,6 +925,17 @@ label { name "sfx_woop"; addr $B564; };
 label { name "got_all_bombs"; addr $9766; };
 label { name "call_eol_sub"; addr $976C; };
 
+label { name "player_new_x"; addr $067C; comment "HPOSxx, 1-indexed, $067d thru $0681 are p5, p3..p0"; };
+label { name "player_x"; addr $068B; comment "HPOSxx, $068c thru $06c0"; };
+label { name "player_new_y"; addr $0686; comment "$0687 thru $069b"; };
+label { name "player_y"; addr $0695; comment "vertical positions, actually $0696 thru $069a"; };
+label { name "player_height"; addr $0677; comment "actually $0677 thru $067b"; };
+label { name "player_enabled"; addr $0668; comment "1 = draw this player, 0 = no. actually $0669 thru $066e"; };
+label { name "tmp_sprite"; addr $CD; size 2; comment "ZP pointer to player/missile data (e.g. jumpman's 10-byte animation frames)"; };
+label { name "tmp_sprite_height"; addr $CF; size 1; comment "length of data pointed to by tmp_sprite"; };
+label { name "copy_pm_data"; addr $8370; comment "write to P/M memory"; };
+label { name "adj_ptr"; addr $835F; comment "adjust pointer if Y wraps around"; };
+
 # end of main.info, everything below here is generated by mklevelinfo.pl
 label { name "work_level_desc"; addr $0780; size 2; comment "first 2 bytes are level number in screencodes"; };
 label { name "work_level_sub0"; addr $0782; size 2; comment "a subroutine"; };
@@ -948,7 +962,7 @@ label { name "work_level_init"; addr $07a2; size 2; comment "called at start of
 label { name "work_level_sub6"; addr $07a4; size 2; comment "always $9740 aka game_main_loop"; };
 label { name "work_level_sub_eol"; addr $07a6; size 2; comment "called at end of level (all bombs picked up). $06E6 for all but level08"; };
 label { name "work_level_offs_40"; addr $07a8; size 6; comment "all zeroes"; };
-label { name "work_level_colpf3"; addr $07ae; size 1; comment "color (not sure what gets drawn in this color yet)"; };
+label { name "work_level_colpf3"; addr $07ae; size 1; comment "color for missiles (aka 5th player)"; };
 label { name "work_level_colpf0"; addr $07af; size 1; comment "color for girders and up-ropes"; };
 label { name "work_level_colpf1"; addr $07b0; size 1; comment "color for ladders and down-ropes"; };
 label { name "work_level_colpf2"; addr $07b1; size 1; comment "color for bombs"; };
@@ -982,7 +996,7 @@ label { name "cur_level_init"; addr $07e2; size 2; comment "called at start of l
 label { name "cur_level_sub6"; addr $07e4; size 2; comment "always $9740 aka game_main_loop"; };
 label { name "cur_level_sub_eol"; addr $07e6; size 2; comment "called at end of level (all bombs picked up). $06E6 for all but level08"; };
 label { name "cur_level_offs_40"; addr $07e8; size 6; comment "all zeroes"; };
-label { name "cur_level_colpf3"; addr $07ee; size 1; comment "color (not sure what gets drawn in this color yet)"; };
+label { name "cur_level_colpf3"; addr $07ee; size 1; comment "color for missiles (aka 5th player)"; };
 label { name "cur_level_colpf0"; addr $07ef; size 1; comment "color for girders and up-ropes"; };
 label { name "cur_level_colpf1"; addr $07f0; size 1; comment "color for ladders and down-ropes"; };
 label { name "cur_level_colpf2"; addr $07f1; size 1; comment "color for bombs"; };
@@ -1016,7 +1030,7 @@ range { name "level01_init"; start $a022; end $a023; type addrtable; comment "ca
 range { name "level01_sub6"; start $a024; end $a025; type addrtable; comment "always $9740 aka game_main_loop"; };
 range { name "level01_sub_eol"; start $a026; end $a027; type addrtable; comment "called at end of level (all bombs picked up). $06E6 for all but level08"; };
 range { name "level01_offs_40"; start $a028; end $a02d; type bytetable; comment "all zeroes"; };
-range { name "level01_colpf3"; start $a02e; end $a02e; type bytetable; comment "color (not sure what gets drawn in this color yet)"; };
+range { name "level01_colpf3"; start $a02e; end $a02e; type bytetable; comment "color for missiles (aka 5th player)"; };
 range { name "level01_colpf0"; start $a02f; end $a02f; type bytetable; comment "color for girders and up-ropes"; };
 range { name "level01_colpf1"; start $a030; end $a030; type bytetable; comment "color for ladders and down-ropes"; };
 range { name "level01_colpf2"; start $a031; end $a031; type bytetable; comment "color for bombs"; };
@@ -1050,7 +1064,7 @@ range { name "level02_init"; start $a062; end $a063; type addrtable; comment "ca
 range { name "level02_sub6"; start $a064; end $a065; type addrtable; comment "always $9740 aka game_main_loop"; };
 range { name "level02_sub_eol"; start $a066; end $a067; type addrtable; comment "called at end of level (all bombs picked up). $06E6 for all but level08"; };
 range { name "level02_offs_40"; start $a068; end $a06d; type bytetable; comment "all zeroes"; };
-range { name "level02_colpf3"; start $a06e; end $a06e; type bytetable; comment "color (not sure what gets drawn in this color yet)"; };
+range { name "level02_colpf3"; start $a06e; end $a06e; type bytetable; comment "color for missiles (aka 5th player)"; };
 range { name "level02_colpf0"; start $a06f; end $a06f; type bytetable; comment "color for girders and up-ropes"; };
 range { name "level02_colpf1"; start $a070; end $a070; type bytetable; comment "color for ladders and down-ropes"; };
 range { name "level02_colpf2"; start $a071; end $a071; type bytetable; comment "color for bombs"; };
@@ -1084,7 +1098,7 @@ range { name "level03_init"; start $a0a2; end $a0a3; type addrtable; comment "ca
 range { name "level03_sub6"; start $a0a4; end $a0a5; type addrtable; comment "always $9740 aka game_main_loop"; };
 range { name "level03_sub_eol"; start $a0a6; end $a0a7; type addrtable; comment "called at end of level (all bombs picked up). $06E6 for all but level08"; };
 range { name "level03_offs_40"; start $a0a8; end $a0ad; type bytetable; comment "all zeroes"; };
-range { name "level03_colpf3"; start $a0ae; end $a0ae; type bytetable; comment "color (not sure what gets drawn in this color yet)"; };
+range { name "level03_colpf3"; start $a0ae; end $a0ae; type bytetable; comment "color for missiles (aka 5th player)"; };
 range { name "level03_colpf0"; start $a0af; end $a0af; type bytetable; comment "color for girders and up-ropes"; };
 range { name "level03_colpf1"; start $a0b0; end $a0b0; type bytetable; comment "color for ladders and down-ropes"; };
 range { name "level03_colpf2"; start $a0b1; end $a0b1; type bytetable; comment "color for bombs"; };
@@ -1118,7 +1132,7 @@ range { name "level04_init"; start $a0e2; end $a0e3; type addrtable; comment "ca
 range { name "level04_sub6"; start $a0e4; end $a0e5; type addrtable; comment "always $9740 aka game_main_loop"; };
 range { name "level04_sub_eol"; start $a0e6; end $a0e7; type addrtable; comment "called at end of level (all bombs picked up). $06E6 for all but level08"; };
 range { name "level04_offs_40"; start $a0e8; end $a0ed; type bytetable; comment "all zeroes"; };
-range { name "level04_colpf3"; start $a0ee; end $a0ee; type bytetable; comment "color (not sure what gets drawn in this color yet)"; };
+range { name "level04_colpf3"; start $a0ee; end $a0ee; type bytetable; comment "color for missiles (aka 5th player)"; };
 range { name "level04_colpf0"; start $a0ef; end $a0ef; type bytetable; comment "color for girders and up-ropes"; };
 range { name "level04_colpf1"; start $a0f0; end $a0f0; type bytetable; comment "color for ladders and down-ropes"; };
 range { name "level04_colpf2"; start $a0f1; end $a0f1; type bytetable; comment "color for bombs"; };
@@ -1152,7 +1166,7 @@ range { name "level05_init"; start $a122; end $a123; type addrtable; comment "ca
 range { name "level05_sub6"; start $a124; end $a125; type addrtable; comment "always $9740 aka game_main_loop"; };
 range { name "level05_sub_eol"; start $a126; end $a127; type addrtable; comment "called at end of level (all bombs picked up). $06E6 for all but level08"; };
 range { name "level05_offs_40"; start $a128; end $a12d; type bytetable; comment "all zeroes"; };
-range { name "level05_colpf3"; start $a12e; end $a12e; type bytetable; comment "color (not sure what gets drawn in this color yet)"; };
+range { name "level05_colpf3"; start $a12e; end $a12e; type bytetable; comment "color for missiles (aka 5th player)"; };
 range { name "level05_colpf0"; start $a12f; end $a12f; type bytetable; comment "color for girders and up-ropes"; };
 range { name "level05_colpf1"; start $a130; end $a130; type bytetable; comment "color for ladders and down-ropes"; };
 range { name "level05_colpf2"; start $a131; end $a131; type bytetable; comment "color for bombs"; };
@@ -1186,7 +1200,7 @@ range { name "level06_init"; start $a162; end $a163; type addrtable; comment "ca
 range { name "level06_sub6"; start $a164; end $a165; type addrtable; comment "always $9740 aka game_main_loop"; };
 range { name "level06_sub_eol"; start $a166; end $a167; type addrtable; comment "called at end of level (all bombs picked up). $06E6 for all but level08"; };
 range { name "level06_offs_40"; start $a168; end $a16d; type bytetable; comment "all zeroes"; };
-range { name "level06_colpf3"; start $a16e; end $a16e; type bytetable; comment "color (not sure what gets drawn in this color yet)"; };
+range { name "level06_colpf3"; start $a16e; end $a16e; type bytetable; comment "color for missiles (aka 5th player)"; };
 range { name "level06_colpf0"; start $a16f; end $a16f; type bytetable; comment "color for girders and up-ropes"; };
 range { name "level06_colpf1"; start $a170; end $a170; type bytetable; comment "color for ladders and down-ropes"; };
 range { name "level06_colpf2"; start $a171; end $a171; type bytetable; comment "color for bombs"; };
@@ -1220,7 +1234,7 @@ range { name "level07_init"; start $a1a2; end $a1a3; type addrtable; comment "ca
 range { name "level07_sub6"; start $a1a4; end $a1a5; type addrtable; comment "always $9740 aka game_main_loop"; };
 range { name "level07_sub_eol"; start $a1a6; end $a1a7; type addrtable; comment "called at end of level (all bombs picked up). $06E6 for all but level08"; };
 range { name "level07_offs_40"; start $a1a8; end $a1ad; type bytetable; comment "all zeroes"; };
-range { name "level07_colpf3"; start $a1ae; end $a1ae; type bytetable; comment "color (not sure what gets drawn in this color yet)"; };
+range { name "level07_colpf3"; start $a1ae; end $a1ae; type bytetable; comment "color for missiles (aka 5th player)"; };
 range { name "level07_colpf0"; start $a1af; end $a1af; type bytetable; comment "color for girders and up-ropes"; };
 range { name "level07_colpf1"; start $a1b0; end $a1b0; type bytetable; comment "color for ladders and down-ropes"; };
 range { name "level07_colpf2"; start $a1b1; end $a1b1; type bytetable; comment "color for bombs"; };
@@ -1254,7 +1268,7 @@ range { name "level08_init"; start $a1e2; end $a1e3; type addrtable; comment "ca
 range { name "level08_sub6"; start $a1e4; end $a1e5; type addrtable; comment "always $9740 aka game_main_loop"; };
 range { name "level08_sub_eol"; start $a1e6; end $a1e7; type addrtable; comment "called at end of level (all bombs picked up). $06E6 for all but level08"; };
 range { name "level08_offs_40"; start $a1e8; end $a1ed; type bytetable; comment "all zeroes"; };
-range { name "level08_colpf3"; start $a1ee; end $a1ee; type bytetable; comment "color (not sure what gets drawn in this color yet)"; };
+range { name "level08_colpf3"; start $a1ee; end $a1ee; type bytetable; comment "color for missiles (aka 5th player)"; };
 range { name "level08_colpf0"; start $a1ef; end $a1ef; type bytetable; comment "color for girders and up-ropes"; };
 range { name "level08_colpf1"; start $a1f0; end $a1f0; type bytetable; comment "color for ladders and down-ropes"; };
 range { name "level08_colpf2"; start $a1f1; end $a1f1; type bytetable; comment "color for bombs"; };
@@ -1288,7 +1302,7 @@ range { name "level09_init"; start $a222; end $a223; type addrtable; comment "ca
 range { name "level09_sub6"; start $a224; end $a225; type addrtable; comment "always $9740 aka game_main_loop"; };
 range { name "level09_sub_eol"; start $a226; end $a227; type addrtable; comment "called at end of level (all bombs picked up). $06E6 for all but level08"; };
 range { name "level09_offs_40"; start $a228; end $a22d; type bytetable; comment "all zeroes"; };
-range { name "level09_colpf3"; start $a22e; end $a22e; type bytetable; comment "color (not sure what gets drawn in this color yet)"; };
+range { name "level09_colpf3"; start $a22e; end $a22e; type bytetable; comment "color for missiles (aka 5th player)"; };
 range { name "level09_colpf0"; start $a22f; end $a22f; type bytetable; comment "color for girders and up-ropes"; };
 range { name "level09_colpf1"; start $a230; end $a230; type bytetable; comment "color for ladders and down-ropes"; };
 range { name "level09_colpf2"; start $a231; end $a231; type bytetable; comment "color for bombs"; };
@@ -1322,7 +1336,7 @@ range { name "level10_init"; start $a262; end $a263; type addrtable; comment "ca
 range { name "level10_sub6"; start $a264; end $a265; type addrtable; comment "always $9740 aka game_main_loop"; };
 range { name "level10_sub_eol"; start $a266; end $a267; type addrtable; comment "called at end of level (all bombs picked up). $06E6 for all but level08"; };
 range { name "level10_offs_40"; start $a268; end $a26d; type bytetable; comment "all zeroes"; };
-range { name "level10_colpf3"; start $a26e; end $a26e; type bytetable; comment "color (not sure what gets drawn in this color yet)"; };
+range { name "level10_colpf3"; start $a26e; end $a26e; type bytetable; comment "color for missiles (aka 5th player)"; };
 range { name "level10_colpf0"; start $a26f; end $a26f; type bytetable; comment "color for girders and up-ropes"; };
 range { name "level10_colpf1"; start $a270; end $a270; type bytetable; comment "color for ladders and down-ropes"; };
 range { name "level10_colpf2"; start $a271; end $a271; type bytetable; comment "color for bombs"; };
@@ -1356,7 +1370,7 @@ range { name "level11_init"; start $a2a2; end $a2a3; type addrtable; comment "ca
 range { name "level11_sub6"; start $a2a4; end $a2a5; type addrtable; comment "always $9740 aka game_main_loop"; };
 range { name "level11_sub_eol"; start $a2a6; end $a2a7; type addrtable; comment "called at end of level (all bombs picked up). $06E6 for all but level08"; };
 range { name "level11_offs_40"; start $a2a8; end $a2ad; type bytetable; comment "all zeroes"; };
-range { name "level11_colpf3"; start $a2ae; end $a2ae; type bytetable; comment "color (not sure what gets drawn in this color yet)"; };
+range { name "level11_colpf3"; start $a2ae; end $a2ae; type bytetable; comment "color for missiles (aka 5th player)"; };
 range { name "level11_colpf0"; start $a2af; end $a2af; type bytetable; comment "color for girders and up-ropes"; };
 range { name "level11_colpf1"; start $a2b0; end $a2b0; type bytetable; comment "color for ladders and down-ropes"; };
 range { name "level11_colpf2"; start $a2b1; end $a2b1; type bytetable; comment "color for bombs"; };
@@ -1390,7 +1404,7 @@ range { name "level12_init"; start $a2e2; end $a2e3; type addrtable; comment "ca
 range { name "level12_sub6"; start $a2e4; end $a2e5; type addrtable; comment "always $9740 aka game_main_loop"; };
 range { name "level12_sub_eol"; start $a2e6; end $a2e7; type addrtable; comment "called at end of level (all bombs picked up). $06E6 for all but level08"; };
 range { name "level12_offs_40"; start $a2e8; end $a2ed; type bytetable; comment "all zeroes"; };
-range { name "level12_colpf3"; start $a2ee; end $a2ee; type bytetable; comment "color (not sure what gets drawn in this color yet)"; };
+range { name "level12_colpf3"; start $a2ee; end $a2ee; type bytetable; comment "color for missiles (aka 5th player)"; };
 range { name "level12_colpf0"; start $a2ef; end $a2ef; type bytetable; comment "color for girders and up-ropes"; };
 range { name "level12_colpf1"; start $a2f0; end $a2f0; type bytetable; comment "color for ladders and down-ropes"; };
 range { name "level12_colpf2"; start $a2f1; end $a2f1; type bytetable; comment "color for bombs"; };