diff --git a/ReC98.inc b/ReC98.inc index b27af35c..ce1c320e 100644 --- a/ReC98.inc +++ b/ReC98.inc @@ -27,7 +27,6 @@ include libs/master.lib/macros.inc include libs/kaja/kaja.inc include pc98.inc include th01/hardware/egc.inc -include th02/playfld.inc include th02/formats/pi_slots.inc include th03/formats/cdg.inc @@ -69,15 +68,6 @@ palette_t struc palette_t ends ; --------------------- -TILE_W = 16 -TILE_H = 16 -TILE_VRAM_W = (TILE_W / 8) -TILES_Y = 1 + (PLAYFIELD_H / TILE_H) + 1 -TILES_X = (PLAYFIELD_W / TILE_W) - -TILE_FLAG_H = (TILE_H / 2) -TILE_FLAGS_Y = TILES_Y * (TILE_H / TILE_FLAG_H) - ; Rank definitions RANK_EASY = 0 RANK_NORMAL = 1 diff --git a/th01/player_is_hit[bss].asm b/th01/main/player_is_hit[bss].asm similarity index 100% rename from th01/player_is_hit[bss].asm rename to th01/main/player_is_hit[bss].asm diff --git a/th01_reiiden.asm b/th01_reiiden.asm index 87604023..d1bd2e42 100644 --- a/th01_reiiden.asm +++ b/th01_reiiden.asm @@ -60999,7 +60999,7 @@ byte_34A4B db 0 byte_34A4C db 0 byte_34A4D db 0 byte_34A4E db 0 -include th01/player_is_hit[bss].asm +include th01/main/player_is_hit[bss].asm byte_34A50 db 0 byte_34A51 db 0 byte_34A52 db 0 diff --git a/th02/boss_funcs[bss].asm b/th02/main/boss/funcs[bss].asm similarity index 100% rename from th02/boss_funcs[bss].asm rename to th02/main/boss/funcs[bss].asm diff --git a/th02/bullet/bullet.hpp b/th02/main/bullet/bullet.hpp similarity index 100% rename from th02/bullet/bullet.hpp rename to th02/main/bullet/bullet.hpp diff --git a/th02/bullet/pellet_r.cpp b/th02/main/bullet/pellet_r.cpp similarity index 100% rename from th02/bullet/pellet_r.cpp rename to th02/main/bullet/pellet_r.cpp diff --git a/th02/demo.h b/th02/main/demo.h similarity index 100% rename from th02/demo.h rename to th02/main/demo.h diff --git a/th02/demo[bss].asm b/th02/main/demo[bss].asm similarity index 100% rename from th02/demo[bss].asm rename to th02/main/demo[bss].asm diff --git a/th02/demo[data].asm b/th02/main/demo[data].asm similarity index 100% rename from th02/demo[data].asm rename to th02/main/demo[data].asm diff --git a/th02/hud/hud.inc b/th02/main/hud/hud.inc similarity index 100% rename from th02/hud/hud.inc rename to th02/main/hud/hud.inc diff --git a/th02/hud/score_put.asm b/th02/main/hud/score_put.asm similarity index 100% rename from th02/hud/score_put.asm rename to th02/main/hud/score_put.asm diff --git a/th02/hud/score_put[data].asm b/th02/main/hud/score_put[data].asm similarity index 100% rename from th02/hud/score_put[data].asm rename to th02/main/hud/score_put[data].asm diff --git a/th02/player/player.h b/th02/main/player/player.h similarity index 100% rename from th02/player/player.h rename to th02/main/player/player.h diff --git a/th02/player/player.inc b/th02/main/player/player.inc similarity index 100% rename from th02/player/player.inc rename to th02/main/player/player.inc diff --git a/th02/playchar_speed[bss].asm b/th02/main/player/speed[bss].asm similarity index 100% rename from th02/playchar_speed[bss].asm rename to th02/main/player/speed[bss].asm diff --git a/th02/playfld.h b/th02/main/playfld.h similarity index 100% rename from th02/playfld.h rename to th02/main/playfld.h diff --git a/th02/playfld.inc b/th02/main/playfld.inc similarity index 68% rename from th02/playfld.inc rename to th02/main/playfld.inc index f1dc4457..fd39b9ba 100644 --- a/th02/playfld.inc +++ b/th02/main/playfld.inc @@ -15,3 +15,12 @@ PLAYFIELD_VRAM_RIGHT = PLAYFIELD_RIGHT / 8 PLAYFIELD_TRAM_X = PLAYFIELD_X / 8 PLAYFIELD_TRAM_W = PLAYFIELD_W / 8 PLAYFIELD_TRAM_RIGHT = PLAYFIELD_RIGHT / 8 + +TILE_W = 16 +TILE_H = 16 +TILE_VRAM_W = (TILE_W / 8) +TILES_Y = 1 + (PLAYFIELD_H / TILE_H) + 1 +TILES_X = (PLAYFIELD_W / TILE_W) + +TILE_FLAG_H = (TILE_H / 2) +TILE_FLAGS_Y = TILES_Y * (TILE_H / TILE_FLAG_H) diff --git a/th02/power_overflow[data].asm b/th02/main/power_overflow[data].asm similarity index 100% rename from th02/power_overflow[data].asm rename to th02/main/power_overflow[data].asm diff --git a/th02/spark_render.asm b/th02/main/spark_render.asm similarity index 100% rename from th02/spark_render.asm rename to th02/main/spark_render.asm diff --git a/th02/tiles[bss].asm b/th02/main/tiles[bss].asm similarity index 100% rename from th02/tiles[bss].asm rename to th02/main/tiles[bss].asm diff --git a/th02/main_03.cpp b/th02/main_03.cpp index 20c9f0eb..83810c9a 100644 --- a/th02/main_03.cpp +++ b/th02/main_03.cpp @@ -10,5 +10,5 @@ extern "C" { #define RANDRING_INSTANCE 2 #include "th02/math/randring.cpp" -#include "th02/bullet/pellet_r.cpp" +#include "th02/main/bullet/pellet_r.cpp" } diff --git a/th02/th02.inc b/th02/th02.inc index 86e67d0b..96b5f818 100644 --- a/th02/th02.inc +++ b/th02/th02.inc @@ -5,7 +5,6 @@ include th02/mem.inc include th02/hardware/input.inc include th02/math/randring.inc include th02/gaiji/boldfont.inc -include th02/hud/hud.inc include th02/score.inc kajacall macro func, param := <0> diff --git a/th02_main.asm b/th02_main.asm index b4b4d7c4..c9a38e69 100644 --- a/th02_main.asm +++ b/th02_main.asm @@ -20,6 +20,8 @@ include ReC98.inc include th02/th02.inc +include th02/main/playfld.inc +include th02/main/hud/hud.inc include th02/sprites/main_pat.inc extern SCOPY@:proc @@ -726,7 +728,7 @@ sub_4090 endp ; --------------------------------------------------------------------------- nop -include th02/spark_render.asm +include th02/main/spark_render.asm ; =============== S U B R O U T I N E ======================================= @@ -6650,7 +6652,7 @@ loc_DC31: sub_DAF0 endp include th02/gaiji/loadfree.asm -include th02/hud/score_put.asm +include th02/main/hud/score_put.asm ; =============== S U B R O U T I N E ======================================= @@ -33719,7 +33721,7 @@ off_1DB7A dd aVdvVVBbvVVVV off_1DB7E dd aB@b@vVvbavtvVV ; "@@‚Ν‚’A‚β‚ί‚ά‚·B@" dword_1DB82 dd 0 -include th02/demo[data].asm +include th02/main/demo[data].asm aTH02_02 db '@ ”Ž—ν@`Eastern Wind ',0 aTH02_03 db '@ She',27h,'s in a temper!! ',0 aTH02_04 db '@ End of Daylight@ ',0 @@ -33898,7 +33900,7 @@ word_1E51E dw 0 db 47h ; G db 57h ; W db 0 -include th02/power_overflow[data].asm +include th02/main/power_overflow[data].asm word_1E586 dw 0 word_1E588 dw 0BCB0h word_1E58A dw 0D4C8h @@ -33940,7 +33942,7 @@ bombs db 3 db 5 word_1E5B6 dw 0 dword_1E5B8 dd 9C40h -include th02/hud/score_put[data].asm +include th02/main/hud/score_put[data].asm word_1E5D8 dw 4140h word_1E5DA dw 4342h word_1E5DC dw 44h @@ -34780,7 +34782,7 @@ byte_1F46E db ? db ? farfp_1F470 dd ? farfp_1F474 dd ? -include th02/boss_funcs[bss].asm +include th02/main/boss/funcs[bss].asm farfp_1F48C dd ? farfp_1F490 dd ? farfp_1F494 dd ? @@ -34788,7 +34790,7 @@ farfp_1F498 dd ? _boss_bg_render_func dd ? farfp_1F4A0 dd ? farfp_1F4A4 dd ? -include th02/demo[bss].asm +include th02/main/demo[bss].asm byte_1F4AC db ? unk_1F4AD db ? ; db 47 dup(?) @@ -34866,14 +34868,14 @@ word_205F4 dw ? point_205F6 Point db 8 dup(?) playchar_shot_func dw ? -include th01/player_is_hit[bss].asm +include th01/main/player_is_hit[bss].asm public _PLAYER_INVINCIBILITY_TIME _player_invincibility_time db ? byte_20606 db ? byte_20607 db ? byte_20608 db ? byte_20609 db ? -include th02/playchar_speed[bss].asm +include th02/main/player/speed[bss].asm byte_2060E db ? byte_2060F db ? byte_20610 db ? @@ -34988,7 +34990,7 @@ word_22862 dw ? word_22864 dw ? db 24 dup(?) byte_2287E db ? -include th02/tiles[bss].asm +include th02/main/tiles[bss].asm db 625 dup(?) byte_22D48 db ? db ? diff --git a/th03/chars/chars.hpp b/th03/chars.hpp similarity index 100% rename from th03/chars/chars.hpp rename to th03/chars.hpp diff --git a/th03/chars/chars.inc b/th03/chars.inc similarity index 100% rename from th03/chars/chars.inc rename to th03/chars.inc diff --git a/th03/5_powers_of_10[data].asm b/th03/main/5_powers_of_10[data].asm similarity index 100% rename from th03/5_powers_of_10[data].asm rename to th03/main/5_powers_of_10[data].asm diff --git a/th03/chars/speeds.hpp b/th03/main/chars/speeds.hpp similarity index 100% rename from th03/chars/speeds.hpp rename to th03/main/chars/speeds.hpp diff --git a/th03/chars/speeds[data].asm b/th03/main/chars/speeds[data].asm similarity index 100% rename from th03/chars/speeds[data].asm rename to th03/main/chars/speeds[data].asm diff --git a/th03/demo.h b/th03/main/demo.h similarity index 100% rename from th03/demo.h rename to th03/main/demo.h diff --git a/th03/demo[bss].asm b/th03/main/demo[bss].asm similarity index 100% rename from th03/demo[bss].asm rename to th03/main/demo[bss].asm diff --git a/th03/frame_mod[bss].asm b/th03/main/frame_mod[bss].asm similarity index 100% rename from th03/frame_mod[bss].asm rename to th03/main/frame_mod[bss].asm diff --git a/th03/frames.h b/th03/main/frames.h similarity index 100% rename from th03/frames.h rename to th03/main/frames.h diff --git a/th03/player/chargeshot[bss].asm b/th03/main/player/chargeshot[bss].asm similarity index 100% rename from th03/player/chargeshot[bss].asm rename to th03/main/player/chargeshot[bss].asm diff --git a/th03/player/combo.h b/th03/main/player/combo.h similarity index 100% rename from th03/player/combo.h rename to th03/main/player/combo.h diff --git a/th03/player/combo[bss].asm b/th03/main/player/combo[bss].asm similarity index 100% rename from th03/player/combo[bss].asm rename to th03/main/player/combo[bss].asm diff --git a/th03/player/combo[data].asm b/th03/main/player/combo[data].asm similarity index 100% rename from th03/player/combo[data].asm rename to th03/main/player/combo[data].asm diff --git a/th03/player/gauge_avail_add.asm b/th03/main/player/gauge_avail_add.asm similarity index 100% rename from th03/player/gauge_avail_add.asm rename to th03/main/player/gauge_avail_add.asm diff --git a/th03/player/hitcombo.asm b/th03/main/player/hitcombo.asm similarity index 100% rename from th03/player/hitcombo.asm rename to th03/main/player/hitcombo.asm diff --git a/th03/player/hitcombo[bss].asm b/th03/main/player/hitcombo[bss].asm similarity index 100% rename from th03/player/hitcombo[bss].asm rename to th03/main/player/hitcombo[bss].asm diff --git a/th03/player/hitcombo[data].asm b/th03/main/player/hitcombo[data].asm similarity index 100% rename from th03/player/hitcombo[data].asm rename to th03/main/player/hitcombo[data].asm diff --git a/th03/player/player.hpp b/th03/main/player/player.hpp similarity index 100% rename from th03/player/player.hpp rename to th03/main/player/player.hpp diff --git a/th03/player/players[bss].asm b/th03/main/player/players[bss].asm similarity index 100% rename from th03/player/players[bss].asm rename to th03/main/player/players[bss].asm diff --git a/th03/player/score[bss].asm b/th03/main/player/score[bss].asm similarity index 100% rename from th03/player/score[bss].asm rename to th03/main/player/score[bss].asm diff --git a/th03/player/score_add.asm b/th03/main/player/score_add.asm similarity index 100% rename from th03/player/score_add.asm rename to th03/main/player/score_add.asm diff --git a/th03/shots.hpp b/th03/main/player/shots.hpp similarity index 100% rename from th03/shots.hpp rename to th03/main/player/shots.hpp diff --git a/th03/shots[bss].asm b/th03/main/player/shots[bss].asm similarity index 100% rename from th03/shots[bss].asm rename to th03/main/player/shots[bss].asm diff --git a/th03/player/win[bss].asm b/th03/main/player/win[bss].asm similarity index 100% rename from th03/player/win[bss].asm rename to th03/main/player/win[bss].asm diff --git a/th03/playfield_fg_x.asm b/th03/main/playfield_fg_x.asm similarity index 100% rename from th03/playfield_fg_x.asm rename to th03/main/playfield_fg_x.asm diff --git a/th03/playfield_fg_x[bss].asm b/th03/main/playfield_fg_x[bss].asm similarity index 100% rename from th03/playfield_fg_x[bss].asm rename to th03/main/playfield_fg_x[bss].asm diff --git a/th03/playfld.hpp b/th03/main/playfld.hpp similarity index 100% rename from th03/playfld.hpp rename to th03/main/playfld.hpp diff --git a/th03/playfld.inc b/th03/main/playfld.inc similarity index 100% rename from th03/playfld.inc rename to th03/main/playfld.inc diff --git a/th03/main_01.cpp b/th03/main_01.cpp index 7833628a..24973e32 100644 --- a/th03/main_01.cpp +++ b/th03/main_01.cpp @@ -8,8 +8,8 @@ extern "C" #include "platform.h" #include "pc98.h" #include "th03/sprite16.hpp" -#include "th03/playfld.hpp" -#include "th03/shots.hpp" +#include "th03/main/playfld.hpp" +#include "th03/main/player/shots.hpp" void pascal near shots_update(void) { diff --git a/th03/res_yume.cpp b/th03/res_yume.cpp index b580aa0a..f0d0e4d9 100644 --- a/th03/res_yume.cpp +++ b/th03/res_yume.cpp @@ -8,8 +8,8 @@ #include "th01/ranks.h" #include "th02/snd/snd.h" #include "th03/common.h" -#include "th03/player/score.h" -#include "th03/chars/chars.hpp" +#include "th03/score.h" +#include "th03/chars.hpp" #include "th03/resident.hpp" #include "th03/formats/cfg.h" diff --git a/th03/player/score.h b/th03/score.h similarity index 100% rename from th03/player/score.h rename to th03/score.h diff --git a/th03/th03.inc b/th03/th03.inc index fd2619f8..5fc89ef9 100644 --- a/th03/th03.inc +++ b/th03/th03.inc @@ -7,7 +7,7 @@ include th03/mem.inc include th03/gaiji/gaiji.inc include th03/math/randring.inc include th03/hardware/input.inc -include th03/chars/chars.inc +include th03/chars.inc include th03/formats/cfg.inc include th02/score.inc diff --git a/th03_main.asm b/th03_main.asm index f90632ee..527334f5 100644 --- a/th03_main.asm +++ b/th03_main.asm @@ -20,7 +20,7 @@ include ReC98.inc include th03/th03.inc -include th03/playfld.inc +include th03/main/playfld.inc include th03/sprite16.inc include libs/sprite16/sprite16.inc @@ -1391,7 +1391,7 @@ loc_A2C6: retn 2 sub_A289 endp -include th03/playfield_fg_x.asm +include th03/main/playfield_fg_x.asm ; =============== S U B R O U T I N E ======================================= @@ -6673,7 +6673,7 @@ loc_D5AA: retf sub_D5A2 endp -include th03/player/score_add.asm +include th03/main/player/score_add.asm ; =============== S U B R O U T I N E ======================================= @@ -21813,7 +21813,7 @@ loc_15E45: retf _combo_update_and_render endp -include th03/player/gauge_avail_add.asm +include th03/main/player/gauge_avail_add.asm ; =============== S U B R O U T I N E ======================================= @@ -22129,7 +22129,7 @@ loc_16129: retf sub_1609E endp -include th03/player/hitcombo.asm +include th03/main/player/hitcombo.asm ; =============== S U B R O U T I N E ======================================= @@ -35397,7 +35397,7 @@ main_11_TEXT ends db 3 db 0BCh db 2 -include th03/chars/speeds[data].asm +include th03/main/chars/speeds[data].asm aCOul db '–²Žž‹σ2.dat',0 aGameft_bft db 'GAMEFT.bft',0 aOp db 'op',0 @@ -35774,7 +35774,7 @@ gpYOUR_LIFE_IS_IN_PERIL_BE_CAREFUL db 8Dh, 8Eh, 8Fh, 92h, 93h, 94h, 95h db 96h, 97h, 98h, 99h, 9Ah, 9Bh, 9Ch, 0 asc_1DD5A db ' ',0 db 0 -include th03/player/combo[data].asm +include th03/main/player/combo[data].asm db 0 db 86h db 20h @@ -35814,9 +35814,9 @@ word_1DDAC dw 2AB6h db 32h ; 2 db 1Eh db 32h ; 2 -include th03/player/hitcombo[data].asm +include th03/main/player/hitcombo[data].asm include th03/sprites/score.asm -include th03/5_powers_of_10[data].asm +include th03/main/5_powers_of_10[data].asm db 6Ch ; l db 0 db 60h @@ -36402,7 +36402,7 @@ byte_1E14C db 0 .data? include th03/hardware/input_modes[bss].asm -include th03/demo[bss].asm +include th03/main/demo[bss].asm word_1E6E8 dw ? fp_1E6EA dw ? include libs/master.lib/clip[bss].asm @@ -36536,7 +36536,7 @@ _pid_current db ? evendata db 1024 dup(?) word_2028A dw ? -include th03/player/chargeshot[bss].asm +include th03/main/player/chargeshot[bss].asm p1_2029C dd ? p2_202A0 dd ? p1_202A4 dd ? @@ -36605,7 +36605,7 @@ word_20E86 dw ? byte_20E88 db ? byte_20E89 db ? db 20 dup(?) -include th03/player/combo[bss].asm +include th03/main/player/combo[bss].asm db 120 dup(?) byte_20F1E db ? db ? @@ -36639,11 +36639,11 @@ byte_22037 db ? byte_2203A db ? byte_2203B db ? word_2203C dw ? -include th03/player/hitcombo[bss].asm +include th03/main/player/hitcombo[bss].asm db 100 dup(?) hitcombo_slot_220C2 db ? byte_220C3 db ? -include th03/player/score[bss].asm +include th03/main/player/score[bss].asm byte_220DC db ? db 3 dup(?) byte_220E0 db ? @@ -36678,12 +36678,12 @@ byte_23AF8 db ? byte_23AF9 db ? byte_23AFA db ? db ? -include th03/playfield_fg_x[bss].asm +include th03/main/playfield_fg_x[bss].asm byte_23B00 db ? include th03/hardware/palette_changed[bss].asm -include th03/frame_mod[bss].asm -include th03/player/players[bss].asm -include th03/shots[bss].asm +include th03/main/frame_mod[bss].asm +include th03/main/player/players[bss].asm +include th03/main/player/shots[bss].asm byte_23DC6 db ? byte_23DC7 db ? byte_23DC8 db ? @@ -36700,7 +36700,7 @@ score_23DEA dw ? word_23DEC dw ? word_23DEE dw ? score_23DF0 dd ? -include th03/player/win[bss].asm +include th03/main/player/win[bss].asm byte_23DF9 db ? db 64 dup(?) word_23E3A dw ? diff --git a/th04/player/chars.h b/th04/chars.h similarity index 100% rename from th04/player/chars.h rename to th04/chars.h diff --git a/th04/player/chars.inc b/th04/chars.inc similarity index 100% rename from th04/player/chars.inc rename to th04/chars.inc diff --git a/th04/boss/backdrop.asm b/th04/main/boss/backdrop.asm similarity index 100% rename from th04/boss/backdrop.asm rename to th04/main/boss/backdrop.asm diff --git a/th04/boss/backdrop[bss].asm b/th04/main/boss/backdrop[bss].asm similarity index 100% rename from th04/boss/backdrop[bss].asm rename to th04/main/boss/backdrop[bss].asm diff --git a/th04/boss/explode_big.asm b/th04/main/boss/explode_big.asm similarity index 100% rename from th04/boss/explode_big.asm rename to th04/main/boss/explode_big.asm diff --git a/th04/boss/explode_small.asm b/th04/main/boss/explode_small.asm similarity index 100% rename from th04/boss/explode_small.asm rename to th04/main/boss/explode_small.asm diff --git a/th04/boss/explosions[bss].asm b/th04/main/boss/explosions[bss].asm similarity index 100% rename from th04/boss/explosions[bss].asm rename to th04/main/boss/explosions[bss].asm diff --git a/th04/boss/explosions_big.asm b/th04/main/boss/explosions_big.asm similarity index 100% rename from th04/boss/explosions_big.asm rename to th04/main/boss/explosions_big.asm diff --git a/th04/boss/explosions_big[data].asm b/th04/main/boss/explosions_big[data].asm similarity index 100% rename from th04/boss/explosions_big[data].asm rename to th04/main/boss/explosions_big[data].asm diff --git a/th04/boss/explosions_reset.asm b/th04/main/boss/explosions_reset.asm similarity index 100% rename from th04/boss/explosions_reset.asm rename to th04/main/boss/explosions_reset.asm diff --git a/th04/boss/explosions_small.asm b/th04/main/boss/explosions_small.asm similarity index 100% rename from th04/boss/explosions_small.asm rename to th04/main/boss/explosions_small.asm diff --git a/th04/boss/funcs[bss].asm b/th04/main/boss/funcs[bss].asm similarity index 100% rename from th04/boss/funcs[bss].asm rename to th04/main/boss/funcs[bss].asm diff --git a/th04/boss/hitbox[bss].asm b/th04/main/boss/hitbox[bss].asm similarity index 100% rename from th04/boss/hitbox[bss].asm rename to th04/main/boss/hitbox[bss].asm diff --git a/th04/boss/phase_timed_out[data].asm b/th04/main/boss/phase_timed_out[data].asm similarity index 100% rename from th04/boss/phase_timed_out[data].asm rename to th04/main/boss/phase_timed_out[data].asm diff --git a/th04/boss/reset.cpp b/th04/main/boss/reset.cpp similarity index 100% rename from th04/boss/reset.cpp rename to th04/main/boss/reset.cpp diff --git a/th04/boss/vars[bss].asm b/th04/main/boss/vars[bss].asm similarity index 100% rename from th04/boss/vars[bss].asm rename to th04/main/boss/vars[bss].asm diff --git a/th04/bullet/bullet.hpp b/th04/main/bullet/bullet.hpp similarity index 98% rename from th04/bullet/bullet.hpp rename to th04/main/bullet/bullet.hpp index eb7546a5..d8385d73 100644 --- a/th04/bullet/bullet.hpp +++ b/th04/main/bullet/bullet.hpp @@ -3,9 +3,9 @@ /// Game-specific pattern and spawn types /// ------------------------------------- #if GAME == 5 -# include "th05/bullet/pattypes.h" +# include "th05/main/bullet/pattypes.h" #else -# include "th04/bullet/pattypes.h" +# include "th04/main/bullet/pattypes.h" #endif /// ------------------------------------- diff --git a/th04/bullet/bullets[bss].asm b/th04/main/bullet/bullets[bss].asm similarity index 100% rename from th04/bullet/bullets[bss].asm rename to th04/main/bullet/bullets[bss].asm diff --git a/th04/bullet_clear[bss].asm b/th04/main/bullet/clear[bss].asm similarity index 100% rename from th04/bullet_clear[bss].asm rename to th04/main/bullet/clear[bss].asm diff --git a/th04/bullet/patnum_for_angle.asm b/th04/main/bullet/patnum_for_angle.asm similarity index 100% rename from th04/bullet/patnum_for_angle.asm rename to th04/main/bullet/patnum_for_angle.asm diff --git a/th04/bullet/pattypes.h b/th04/main/bullet/pattypes.h similarity index 100% rename from th04/bullet/pattypes.h rename to th04/main/bullet/pattypes.h diff --git a/th04/bullet/pattypes.inc b/th04/main/bullet/pattypes.inc similarity index 100% rename from th04/bullet/pattypes.inc rename to th04/main/bullet/pattypes.inc diff --git a/th04/bullet/pellet_r.asm b/th04/main/bullet/pellet_r.asm similarity index 100% rename from th04/bullet/pellet_r.asm rename to th04/main/bullet/pellet_r.asm diff --git a/th04/bullet/pellet_r[bss].asm b/th04/main/bullet/pellet_r[bss].asm similarity index 100% rename from th04/bullet/pellet_r[bss].asm rename to th04/main/bullet/pellet_r[bss].asm diff --git a/th04/bullet/template[bss].asm b/th04/main/bullet/template[bss].asm similarity index 100% rename from th04/bullet/template[bss].asm rename to th04/main/bullet/template[bss].asm diff --git a/th04/circles.asm b/th04/main/circles.asm similarity index 100% rename from th04/circles.asm rename to th04/main/circles.asm diff --git a/th04/circles[bss].asm b/th04/main/circles[bss].asm similarity index 100% rename from th04/circles[bss].asm rename to th04/main/circles[bss].asm diff --git a/th04/circles_color[bss].asm b/th04/main/circles_color[bss].asm similarity index 100% rename from th04/circles_color[bss].asm rename to th04/main/circles_color[bss].asm diff --git a/th04/demo.h b/th04/main/demo.h similarity index 100% rename from th04/demo.h rename to th04/main/demo.h diff --git a/th04/drawpoint[bss].asm b/th04/main/drawpoint[bss].asm similarity index 100% rename from th04/drawpoint[bss].asm rename to th04/main/drawpoint[bss].asm diff --git a/th04/dream_score[data].asm b/th04/main/dream_score[data].asm similarity index 100% rename from th04/dream_score[data].asm rename to th04/main/dream_score[data].asm diff --git a/th04/ems.h b/th04/main/ems.h similarity index 100% rename from th04/ems.h rename to th04/main/ems.h diff --git a/th04/ems[bss].asm b/th04/main/ems[bss].asm similarity index 100% rename from th04/ems[bss].asm rename to th04/main/ems[bss].asm diff --git a/th04/frames.h b/th04/main/frames.h similarity index 100% rename from th04/frames.h rename to th04/main/frames.h diff --git a/th04/frames[bss].asm b/th04/main/frames[bss].asm similarity index 100% rename from th04/frames[bss].asm rename to th04/main/frames[bss].asm diff --git a/th04/frames[data].asm b/th04/main/frames[data].asm similarity index 100% rename from th04/frames[data].asm rename to th04/main/frames[data].asm diff --git a/th04/homing_target[bss].asm b/th04/main/homing_target[bss].asm similarity index 100% rename from th04/homing_target[bss].asm rename to th04/main/homing_target[bss].asm diff --git a/th04/hud/bar_colors[data].asm b/th04/main/hud/bar_colors[data].asm similarity index 100% rename from th04/hud/bar_colors[data].asm rename to th04/main/hud/bar_colors[data].asm diff --git a/th04/hud/bar_put.asm b/th04/main/hud/bar_put.asm similarity index 100% rename from th04/hud/bar_put.asm rename to th04/main/hud/bar_put.asm diff --git a/th04/hud/bar_put[data].asm b/th04/main/hud/bar_put[data].asm similarity index 100% rename from th04/hud/bar_put[data].asm rename to th04/main/hud/bar_put[data].asm diff --git a/th04/hud/gaiji_row[data].asm b/th04/main/hud/gaiji_row[data].asm similarity index 100% rename from th04/hud/gaiji_row[data].asm rename to th04/main/hud/gaiji_row[data].asm diff --git a/th04/hud/popup.asm b/th04/main/hud/popup.asm similarity index 100% rename from th04/hud/popup.asm rename to th04/main/hud/popup.asm diff --git a/th04/hud/popup.inc b/th04/main/hud/popup.inc similarity index 100% rename from th04/hud/popup.inc rename to th04/main/hud/popup.inc diff --git a/th04/hud/popup[bss].asm b/th04/main/hud/popup[bss].asm similarity index 100% rename from th04/hud/popup[bss].asm rename to th04/main/hud/popup[bss].asm diff --git a/th04/hud/popup[data].asm b/th04/main/hud/popup[data].asm similarity index 100% rename from th04/hud/popup[data].asm rename to th04/main/hud/popup[data].asm diff --git a/th04/item/collect[data].asm b/th04/main/item/collect[data].asm similarity index 100% rename from th04/item/collect[data].asm rename to th04/main/item/collect[data].asm diff --git a/th04/item/enemy_drops[data].asm b/th04/main/item/enemy_drops[data].asm similarity index 100% rename from th04/item/enemy_drops[data].asm rename to th04/main/item/enemy_drops[data].asm diff --git a/th04/item/invalidate.asm b/th04/main/item/invalidate.asm similarity index 100% rename from th04/item/invalidate.asm rename to th04/main/item/invalidate.asm diff --git a/th04/item/items.hpp b/th04/main/item/items.hpp similarity index 100% rename from th04/item/items.hpp rename to th04/main/item/items.hpp diff --git a/th04/item/items[bss].asm b/th04/main/item/items[bss].asm similarity index 100% rename from th04/item/items[bss].asm rename to th04/main/item/items[bss].asm diff --git a/th04/item/miss_add.asm b/th04/main/item/miss_add.asm similarity index 100% rename from th04/item/miss_add.asm rename to th04/main/item/miss_add.asm diff --git a/th04/item/miss_add[data].asm b/th04/main/item/miss_add[data].asm similarity index 100% rename from th04/item/miss_add[data].asm rename to th04/main/item/miss_add[data].asm diff --git a/th04/item/render.asm b/th04/main/item/render.asm similarity index 100% rename from th04/item/render.asm rename to th04/main/item/render.asm diff --git a/th04/item/splash_dot_render.asm b/th04/main/item/splash_dot_render.asm similarity index 100% rename from th04/item/splash_dot_render.asm rename to th04/main/item/splash_dot_render.asm diff --git a/th04/item/splashes.hpp b/th04/main/item/splashes.hpp similarity index 100% rename from th04/item/splashes.hpp rename to th04/main/item/splashes.hpp diff --git a/th04/item/splashes[bss].asm b/th04/main/item/splashes[bss].asm similarity index 100% rename from th04/item/splashes[bss].asm rename to th04/main/item/splashes[bss].asm diff --git a/th04/item/splashes_render.asm b/th04/main/item/splashes_render.asm similarity index 100% rename from th04/item/splashes_render.asm rename to th04/main/item/splashes_render.asm diff --git a/th04/item/splashes_update.asm b/th04/main/item/splashes_update.asm similarity index 100% rename from th04/item/splashes_update.asm rename to th04/main/item/splashes_update.asm diff --git a/th04/item/type_patnum[data].asm b/th04/main/item/type_patnum[data].asm similarity index 100% rename from th04/item/type_patnum[data].asm rename to th04/main/item/type_patnum[data].asm diff --git a/th04/midboss/funcs[bss].asm b/th04/main/midboss/funcs[bss].asm similarity index 100% rename from th04/midboss/funcs[bss].asm rename to th04/main/midboss/funcs[bss].asm diff --git a/th04/midboss/vars[bss].asm b/th04/main/midboss/vars[bss].asm similarity index 100% rename from th04/midboss/vars[bss].asm rename to th04/main/midboss/vars[bss].asm diff --git a/th04/pause.asm b/th04/main/pause.asm similarity index 100% rename from th04/pause.asm rename to th04/main/pause.asm diff --git a/th04/pause.h b/th04/main/pause.h similarity index 100% rename from th04/pause.h rename to th04/main/pause.h diff --git a/th04/pause[data].asm b/th04/main/pause[data].asm similarity index 100% rename from th04/pause[data].asm rename to th04/main/pause[data].asm diff --git a/th04/phase.h b/th04/main/phase.h similarity index 100% rename from th04/phase.h rename to th04/main/phase.h diff --git a/th04/phase.inc b/th04/main/phase.inc similarity index 100% rename from th04/phase.inc rename to th04/main/phase.inc diff --git a/th04/player/invalidate.asm b/th04/main/player/invalidate.asm similarity index 100% rename from th04/player/invalidate.asm rename to th04/main/player/invalidate.asm diff --git a/th04/player/move.asm b/th04/main/player/move.asm similarity index 100% rename from th04/player/move.asm rename to th04/main/player/move.asm diff --git a/th04/player/option[bss].asm b/th04/main/player/option[bss].asm similarity index 100% rename from th04/player/option[bss].asm rename to th04/main/player/option[bss].asm diff --git a/th04/player/player.h b/th04/main/player/player.h similarity index 92% rename from th04/player/player.h rename to th04/main/player/player.h index 14bb4e54..2d7377ff 100644 --- a/th04/player/player.h +++ b/th04/main/player/player.h @@ -1,4 +1,4 @@ -#include "th02/player/player.h" +#include "th02/main/player/player.h" #define PLAYER_MOVE_MARGIN_LEFT 8 #define PLAYER_MOVE_MARGIN_TOP 8 #define PLAYER_MOVE_MARGIN_RIGHT 8 diff --git a/th04/player/player.inc b/th04/main/player/player.inc similarity index 97% rename from th04/player/player.inc rename to th04/main/player/player.inc index a9e3a4cf..a1aab0b7 100644 --- a/th04/player/player.inc +++ b/th04/main/player/player.inc @@ -1,4 +1,4 @@ -include th02/player/player.inc +include th02/main/player/player.inc PLAYER_MOVE_MARGIN_LEFT = 8 PLAYER_MOVE_MARGIN_TOP = 8 PLAYER_MOVE_MARGIN_RIGHT = 8 diff --git a/th04/player/pos[bss].asm b/th04/main/player/pos[bss].asm similarity index 100% rename from th04/player/pos[bss].asm rename to th04/main/player/pos[bss].asm diff --git a/th04/player/pos_update_and_clamp.asm b/th04/main/player/pos_update_and_clamp.asm similarity index 100% rename from th04/player/pos_update_and_clamp.asm rename to th04/main/player/pos_update_and_clamp.asm diff --git a/th04/player/render.asm b/th04/main/player/render.asm similarity index 100% rename from th04/player/render.asm rename to th04/main/player/render.asm diff --git a/th04/player/shot.hpp b/th04/main/player/shot.hpp similarity index 100% rename from th04/player/shot.hpp rename to th04/main/player/shot.hpp diff --git a/th04/player/shot_levels[data].asm b/th04/main/player/shot_levels[data].asm similarity index 100% rename from th04/player/shot_levels[data].asm rename to th04/main/player/shot_levels[data].asm diff --git a/th04/player/shot_velocity.asm b/th04/main/player/shot_velocity.asm similarity index 100% rename from th04/player/shot_velocity.asm rename to th04/main/player/shot_velocity.asm diff --git a/th04/player/shot_velocity[data].asm b/th04/main/player/shot_velocity[data].asm similarity index 100% rename from th04/player/shot_velocity[data].asm rename to th04/main/player/shot_velocity[data].asm diff --git a/th04/player/shots[bss].asm b/th04/main/player/shots[bss].asm similarity index 100% rename from th04/player/shots[bss].asm rename to th04/main/player/shots[bss].asm diff --git a/th04/player/shots_add.asm b/th04/main/player/shots_add.asm similarity index 100% rename from th04/player/shots_add.asm rename to th04/main/player/shots_add.asm diff --git a/th04/player/shots_add[bss].asm b/th04/main/player/shots_add[bss].asm similarity index 100% rename from th04/player/shots_add[bss].asm rename to th04/main/player/shots_add[bss].asm diff --git a/th04/playperf.asm b/th04/main/playperf.asm similarity index 100% rename from th04/playperf.asm rename to th04/main/playperf.asm diff --git a/th04/playperf[bss].asm b/th04/main/playperf[bss].asm similarity index 100% rename from th04/playperf[bss].asm rename to th04/main/playperf[bss].asm diff --git a/th04/score[bss].asm b/th04/main/score[bss].asm similarity index 100% rename from th04/score[bss].asm rename to th04/main/score[bss].asm diff --git a/th04/scroll[bss].asm b/th04/main/scroll[bss].asm similarity index 100% rename from th04/scroll[bss].asm rename to th04/main/scroll[bss].asm diff --git a/th04/scroll_y_1.asm b/th04/main/scroll_y_1.asm similarity index 100% rename from th04/scroll_y_1.asm rename to th04/main/scroll_y_1.asm diff --git a/th04/scroll_y_3.asm b/th04/main/scroll_y_3.asm similarity index 100% rename from th04/scroll_y_3.asm rename to th04/main/scroll_y_3.asm diff --git a/th04/select_for_rank.asm b/th04/main/select_for_rank.asm similarity index 100% rename from th04/select_for_rank.asm rename to th04/main/select_for_rank.asm diff --git a/th04/spark_render.asm b/th04/main/spark_render.asm similarity index 100% rename from th04/spark_render.asm rename to th04/main/spark_render.asm diff --git a/th04/sparks.asm b/th04/main/sparks.asm similarity index 100% rename from th04/sparks.asm rename to th04/main/sparks.asm diff --git a/th04/sparks[bss].asm b/th04/main/sparks[bss].asm similarity index 100% rename from th04/sparks[bss].asm rename to th04/main/sparks[bss].asm diff --git a/th04/sparks_add.asm b/th04/main/sparks_add.asm similarity index 100% rename from th04/sparks_add.asm rename to th04/main/sparks_add.asm diff --git a/th04/sparks_add[bss].asm b/th04/main/sparks_add[bss].asm similarity index 100% rename from th04/sparks_add[bss].asm rename to th04/main/sparks_add[bss].asm diff --git a/th04/stage_funcs[bss].asm b/th04/main/stage/funcs[bss].asm similarity index 100% rename from th04/stage_funcs[bss].asm rename to th04/main/stage/funcs[bss].asm diff --git a/th04/tiles[bss].asm b/th04/main/tiles[bss].asm similarity index 100% rename from th04/tiles[bss].asm rename to th04/main/tiles[bss].asm diff --git a/th04/tiles_invalidate.asm b/th04/main/tiles_invalidate.asm similarity index 100% rename from th04/tiles_invalidate.asm rename to th04/main/tiles_invalidate.asm diff --git a/th04/tiles_invalidate[bss].asm b/th04/main/tiles_invalidate[bss].asm similarity index 100% rename from th04/tiles_invalidate[bss].asm rename to th04/main/tiles_invalidate[bss].asm diff --git a/th04/tiles_invalidate_all.asm b/th04/main/tiles_invalidate_all.asm similarity index 100% rename from th04/tiles_invalidate_all.asm rename to th04/main/tiles_invalidate_all.asm diff --git a/th04/tiles_redraw.asm b/th04/main/tiles_redraw.asm similarity index 100% rename from th04/tiles_redraw.asm rename to th04/main/tiles_redraw.asm diff --git a/th04/tiles_render_all.asm b/th04/main/tiles_render_all.asm similarity index 100% rename from th04/tiles_render_all.asm rename to th04/main/tiles_render_all.asm diff --git a/th04/op_01.cpp b/th04/op_01.cpp index a6547644..e1d923fd 100644 --- a/th04/op_01.cpp +++ b/th04/op_01.cpp @@ -6,7 +6,7 @@ extern "C" { #include "platform.h" -#include "th04/player/chars.h" +#include "th04/chars.h" bool selectable_with[PLAYCHAR_COUNT][SHOTTYPE_COUNT]; diff --git a/th04/scoreupd.asm b/th04/scoreupd.asm index 9aa1c6c8..e6eb654e 100644 --- a/th04/scoreupd.asm +++ b/th04/scoreupd.asm @@ -2,8 +2,8 @@ locals include libs/master.lib/master.inc -include th02/hud/hud.inc -include th04/hud/popup.inc +include th02/main/hud/hud.inc +include th04/main/hud/popup.inc include th02/score.inc include th02/gaiji/boldfont.inc diff --git a/th04/shared.hpp b/th04/shared.hpp index 3d05eef7..d28373dd 100644 --- a/th04/shared.hpp +++ b/th04/shared.hpp @@ -28,7 +28,7 @@ int pascal far select_for_rank( /// Player /// ------ -#include "th04/player/player.h" +#include "th04/main/player/player.h" #include "th04/score.h" /// ------ diff --git a/th04/shared.inc b/th04/shared.inc index b99a966a..63404c5f 100644 --- a/th04/shared.inc +++ b/th04/shared.inc @@ -13,7 +13,7 @@ include th04/formats/map.inc include th04/formats/scoredat.inc ; -------- -include th04/player/player.inc +include th04/main/player/player.inc ; Bombs ; ----- @@ -32,10 +32,11 @@ STAGE_START_INVINCIBILITY_FRAMES = 64 BOSS_DEFEAT_INVINCIBILITY_FRAMES = 255 ; ------ -include th02/hud/hud.inc +include th02/main/playfld.inc +include th02/main/hud/hud.inc include th04/hardware/grcg.inc include th04/hardware/input.inc include th04/math/randring.inc include th04/math/motion.inc -include th04/hud/popup.inc +include th04/main/hud/popup.inc include th04/end/end.inc diff --git a/th04/th04.inc b/th04/th04.inc index 01596d27..d48489a4 100644 --- a/th04/th04.inc +++ b/th04/th04.inc @@ -1,5 +1,5 @@ GAME = 4 -include th04/player/chars.inc +include th04/chars.inc include th04/mem.inc include th04/shared.inc include th04/gaiji/gaiji.inc diff --git a/th04_main.asm b/th04_main.asm index 67f9641e..e1b001ae 100644 --- a/th04_main.asm +++ b/th04_main.asm @@ -23,8 +23,8 @@ BINARY = 'M' include ReC98.inc include th04/th04.inc include th04/sprites/main_pat.inc -include th04/phase.inc -include th04/bullet/pattypes.inc +include th04/main/phase.inc +include th04/main/bullet/pattypes.inc extern SCOPY@:proc extern _execl:proc @@ -987,7 +987,7 @@ loc_B2C7: retn sub_B29E endp -include th04/pause.asm +include th04/main/pause.asm ; =============== S U B R O U T I N E ======================================= @@ -1571,7 +1571,7 @@ loc_B9D4: retn map_free endp -include th04/tiles_invalidate.asm +include th04/main/tiles_invalidate.asm ; =============== S U B R O U T I N E ======================================= @@ -1712,8 +1712,8 @@ loc_BB8F: retn sub_BAEE endp -include th04/tiles_redraw.asm -include th04/scroll_y_1.asm +include th04/main/tiles_redraw.asm +include th04/main/scroll_y_1.asm MOTION_UPDATE_DEF 1 include th03/math/randring_fill.asm RANDRING_NEXT_DEF 1 @@ -2387,7 +2387,7 @@ sub_C09A endp ; --------------------------------------------------------------------------- nop -include th04/item/invalidate.asm +include th04/main/item/invalidate.asm ; =============== S U B R O U T I N E ======================================= @@ -2400,11 +2400,11 @@ playfield_fillm_0_0_384_192 proc near playfield_fillm_0_0_384_192 endp include th04/hardware/grcg_modecol.asm -include th04/item/splashes_render.asm +include th04/main/item/splashes_render.asm db 0 -include th04/spark_render.asm -include th04/sparks.asm -include th04/item/splash_dot_render.asm +include th04/main/spark_render.asm +include th04/main/sparks.asm +include th04/main/item/splash_dot_render.asm ; =============== S U B R O U T I N E ======================================= @@ -2423,11 +2423,11 @@ sub_C34E proc near retn 4 sub_C34E endp -include th04/playperf.asm -include th04/select_for_rank.asm +include th04/main/playperf.asm +include th04/main/select_for_rank.asm include th04/formats/scoredat_code_asm.asm include th04/formats/z_super_roll_put_tiny.asm -include th04/circles.asm +include th04/main/circles.asm db 0 ; =============== S U B R O U T I N E ======================================= @@ -2710,9 +2710,9 @@ midbossx_render endp ; --------------------------------------------------------------------------- db 0 -include th04/bullet/pellet_r.asm +include th04/main/bullet/pellet_r.asm include th04/main/bullets_gather_inv.asm -include th04/tiles_invalidate_all.asm +include th04/main/tiles_invalidate_all.asm ; =============== S U B R O U T I N E ======================================= @@ -2788,7 +2788,7 @@ sub_CBA4 endp ; --------------------------------------------------------------------------- db 0 -include th04/tiles_render_all.asm +include th04/main/tiles_render_all.asm ; =============== S U B R O U T I N E ======================================= @@ -4261,8 +4261,8 @@ loc_D888: retn sub_D7EE endp -include th04/boss/explosions_small.asm -include th04/boss/explosions_big.asm +include th04/main/boss/explosions_small.asm +include th04/main/boss/explosions_big.asm ; --------------------------------------------------------------------------- @@ -7319,7 +7319,7 @@ loc_F172: retf 2 sub_F0DD endp -include th04/hud/bar_put.asm +include th04/main/hud/bar_put.asm ; =============== S U B R O U T I N E ======================================= @@ -10143,9 +10143,9 @@ loc_107D6: retn sub_10713 endp -include th04/player/invalidate.asm -include th04/player/move.asm -include th04/player/pos_update_and_clamp.asm +include th04/main/player/invalidate.asm +include th04/main/player/move.asm +include th04/main/player/pos_update_and_clamp.asm ; =============== S U B R O U T I N E ======================================= @@ -10394,7 +10394,7 @@ loc_10BFA: retn sub_10ABF endp -include th04/player/render.asm +include th04/main/player/render.asm ; =============== S U B R O U T I N E ======================================= @@ -11063,7 +11063,7 @@ loc_112D2: retn sub_11195 endp -include th04/hud/popup.asm +include th04/main/hud/popup.asm include th04/formats/bb_txt_load.asm ; =============== S U B R O U T I N E ======================================= @@ -11885,8 +11885,8 @@ loc_11D92: retn yuuka6_fg_render endp -include th04/player/shots_add.asm -include th04/player/shot_velocity.asm +include th04/main/player/shots_add.asm +include th04/main/player/shot_velocity.asm ; =============== S U B R O U T I N E ======================================= @@ -12285,7 +12285,7 @@ loc_12152: retn sub_12124 endp -include th04/boss/backdrop.asm +include th04/main/boss/backdrop.asm ; =============== S U B R O U T I N E ======================================= @@ -13848,7 +13848,7 @@ loc_12DBE: retn bullets_render endp -include th04/item/render.asm +include th04/main/item/render.asm ; =============== S U B R O U T I N E ======================================= @@ -14452,7 +14452,7 @@ gather_update endp include th04/main/gather_render.asm db 0 -include th04/scroll_y_3.asm +include th04/main/scroll_y_3.asm MOTION_UPDATE_DEF 2 RANDRING_NEXT_DEF 2 db 0 @@ -14510,10 +14510,10 @@ sub_13DAA endp nop include th04/math/vector2_near.asm nop -include th04/sparks_add.asm +include th04/main/sparks_add.asm GRCG_SETCOLOR_DIRECT_NOINT_DEF 2 GRCG_SETMODE_RMW_DEF 2 -include th04/item/splashes_update.asm +include th04/main/item/splashes_update.asm ; =============== S U B R O U T I N E ======================================= @@ -17651,9 +17651,9 @@ off_15B4D dw offset loc_159A4 dw offset loc_15A81 dw offset loc_15AD2 -include th04/boss/explosions_reset.asm -include th04/boss/explode_small.asm -include th04/boss/explode_big.asm +include th04/main/boss/explosions_reset.asm +include th04/main/boss/explode_small.asm +include th04/main/boss/explode_big.asm ; =============== S U B R O U T I N E ======================================= @@ -31601,7 +31601,7 @@ loc_1D216: retn sub_1D1CD endp -include th04/bullet/patnum_for_angle.asm +include th04/main/bullet/patnum_for_angle.asm ; =============== S U B R O U T I N E ======================================= @@ -32585,7 +32585,7 @@ loc_1DAC8: retn 6 items_add endp -include th04/item/miss_add.asm +include th04/main/item/miss_add.asm ; =============== S U B R O U T I N E ======================================= @@ -37276,7 +37276,7 @@ aSt05_mpn db 'st05.mpn',0 aSt06_bft db 'st06.bft',0 aBss6_cd2 db 'BSS6.CD2',0 aSt06_mpn db 'st06.mpn',0 -include th04/pause[data].asm +include th04/main/pause[data].asm aDemo0_rec db 'DEMO0.REC',0 aOp_0 db 'op',0 aGensoems db 'GENSOEMS',0 @@ -37512,7 +37512,7 @@ NUMERALS db 0, 0, 38h, 0, 44h, 0, 82h, 0, 82h, 0, 82h, 0, 44h, 0 db 0FFh db 0 include th02/sprites/sparks.asm -include th04/player/shot_velocity[data].asm +include th04/main/player/shot_velocity[data].asm db 18h db 68h ; h db 98h @@ -37531,7 +37531,7 @@ byte_22B9C db 0 db 0 byte_22B9E db 1 db 0 -include th04/frames[data].asm +include th04/main/frames[data].asm off_22BAA dd a_dm00_txt ; "_DM00.TXT" off_22BAE dd a_dm04b_txt @@ -37548,7 +37548,7 @@ aBss8_cd2 db 'bss8.cd2',0 aBb0_cdg db 'bb0.cdg',0 aBb1_cdg db 'bb1.cdg',0 db 0 -include th04/boss/explosions_big[data].asm +include th04/main/boss/explosions_big[data].asm byte_22C1A db 0 db 0 include th04/strings/gameover[data].asm @@ -37866,7 +37866,7 @@ unk_22D9E db 0DCh db 1 include th04/score[data].asm include th04/strings/hud[data].asm -include th04/hud/bar_colors[data].asm +include th04/main/hud/bar_colors[data].asm word_22E07 dw 202h word_22E09 dw 202h word_22E0B dw 202h @@ -37875,7 +37875,7 @@ byte_22E0F db 0 word_22E10 dw 6141h word_22E12 dw 0C1A1h byte_22E14 db 0E1h -include th04/hud/bar_put[data].asm +include th04/main/hud/bar_put[data].asm aB@b@bB@b@ db '@@~@@',0 aB@b@bB@b@_0 db '@@~@@',0 include th04/formats/bb_playchar[data].asm @@ -37933,7 +37933,7 @@ public _popup_frame _popup_frame db 0 db 0 include th04/formats/bb_txt[data].asm -include th04/hud/popup[data].asm +include th04/main/hud/popup[data].asm byte_22EF6 db 0 db 0 public _PLAYFIELD_BLANK_ROW @@ -37992,9 +37992,9 @@ aVivavvvvilcvb@ db ' aPnpcuyszlB@bCa db '­—γY‘z‹Θ@` Capriccio ',0 include th04/formats/bb_txt_load[data].asm word_231F2 dw 10h -include th03/5_powers_of_10[data].asm +include th03/main/5_powers_of_10[data].asm include th04/scoreupd[data].asm -include th04/hud/gaiji_row[data].asm +include th04/main/hud/gaiji_row[data].asm word_23210 dw 0 byte_23212 db 0 db 0 @@ -38008,7 +38008,7 @@ byte_23212 db 0 db 90h db 0F0h db 10h -include th04/player/shot_levels[data].asm +include th04/main/player/shot_levels[data].asm include th04/formats/cfg_lres[data].asm db 0 word_2323A dw 0AF30h @@ -38066,17 +38066,17 @@ aPLAYER_REM_30000 db ' aBONUS_POINT_2 db '‚o‚n‚h‚m‚s@‚a‚‚Ž‚•‚“@@@@@@~',0 aBONUS_TOTAL_2 db '@@@‚s‚n‚s‚`‚k',0 db 0 -include th04/item/enemy_drops[data].asm +include th04/main/item/enemy_drops[data].asm byte_23660 db 0 byte_23661 db 0 -include th04/item/type_patnum[data].asm -include th02/power_overflow[data].asm -include th04/dream_score[data].asm +include th04/main/item/type_patnum[data].asm +include th02/main/power_overflow[data].asm +include th04/main/dream_score[data].asm _power_overflow_level dw 0 -include th04/item/collect[data].asm +include th04/main/item/collect[data].asm byte_236E0 db 0 db 0 -include th04/item/miss_add[data].asm +include th04/main/item/miss_add[data].asm db 0 db 0 db 3 @@ -38092,7 +38092,7 @@ include th04/item/miss_add[data].asm db 1 db 1 db 1 -include th04/boss/phase_timed_out[data].asm +include th04/main/boss/phase_timed_out[data].asm aSt00_bmt db 'st00.bmt',0 aSt00bk_cdg db 'st00bk.cdg',0 aSt00_bb db 'st00.bb',0 @@ -38124,7 +38124,7 @@ amp_237F8 db 0 ; TODO: Missing clip[bss].asm (16 bytes) somewhere in there... dw ? fp_23D90 dw ? -include th02/demo[bss].asm +include th02/main/demo[bss].asm db 16 dup(?) include libs/master.lib/fil[bss].asm include libs/master.lib/grcg_circle[bss].asm @@ -38160,9 +38160,9 @@ byte_2520E db ? byte_2520F db ? db 802 dup(?) word_25532 dw ? -include th04/sparks_add[bss].asm -include th04/item/splashes[bss].asm -include th04/circles_color[bss].asm +include th04/main/sparks_add[bss].asm +include th04/main/item/splashes[bss].asm +include th04/main/circles_color[bss].asm byte_25594 db ? db ? word_25596 dw ? @@ -38170,7 +38170,7 @@ byte_25598 db ? byte_25599 db ? byte_2559A db ? db 5 dup(?) -include th04/tiles_invalidate[bss].asm +include th04/main/tiles_invalidate[bss].asm _boss_bg_render dw ? fp_255AA dw ? fp_255AC dw ? @@ -38181,7 +38181,7 @@ byte_255B2 db ? byte_255B3 db ? byte_255B4 db ? db ? -include th04/scroll[bss].asm +include th04/main/scroll[bss].asm word_255BE dw ? word_255C0 dw ? word_255C2 dw ? @@ -38196,7 +38196,7 @@ word_255D0 dw ? word_255D2 dw ? word_255D4 dw ? word_255D6 dw ? -include th04/boss/explosions[bss].asm +include th04/main/boss/explosions[bss].asm word_25608 dw ? byte_2560A db ? db ? @@ -38225,7 +38225,7 @@ byte_25666 db ? byte_25667 db ? byte_25668 db ? db ? -include th04/stage_funcs[bss].asm +include th04/main/stage/funcs[bss].asm byte_2566E db ? byte_2566F db ? byte_25670 db ? @@ -38240,10 +38240,10 @@ word_25678 dw ? word_25680 dw ? db 6 dup(?) _rank db ? -include th04/score[bss].asm +include th04/main/score[bss].asm byte_256A2 db ? db ? -include th04/player/shots_add[bss].asm +include th04/main/player/shots_add[bss].asm byte_256A8 db ? byte_256A9 db ? fp_256AA dw ? @@ -38263,12 +38263,12 @@ word_257E4 dw ? word_2597E dw ? byte_25980 db ? db ? -include th04/homing_target[bss].asm +include th04/main/homing_target[bss].asm public _stage_vm _stage_vm dd ? word_2598A dw ? word_2598C dw ? -include th04/player/pos[bss].asm +include th04/main/player/pos[bss].asm word_2599A dw ? word_2599C dw ? word_2599E dw ? @@ -38279,13 +38279,13 @@ byte_259A3 db ? _power db ? _shot_level db ? _shot_time db ? -include th01/player_is_hit[bss].asm +include th01/main/player_is_hit[bss].asm db ? ; byte_259A9 db ? public _MISS_TIME, _stage_point_items_collected, _dream_items_collected _miss_time db ? _stage_point_items_collected db ? -include th04/player/option[bss].asm +include th04/main/player/option[bss].asm _dream_items_collected db ? db 2 dup(?) public _MISS_EXPLOSION_ANGLE @@ -38298,7 +38298,7 @@ bgm_title_len dw ? stage_title_id db ? db ? word_259C6 dw ? -include th04/hud/popup[bss].asm +include th04/main/hud/popup[bss].asm byte_259E6 db ? db ? fp_259E8 dw ? @@ -38307,7 +38307,7 @@ byte_259EE db ? byte_259EF db ? byte_259F0 db ? byte_259F1 db ? -include th04/midboss/funcs[bss].asm +include th04/main/midboss/funcs[bss].asm byte_25A02 db ? byte_25A03 db ? byte_25A04 db ? @@ -38335,40 +38335,40 @@ byte_25A38 db ? word_25A3A dw ? include th02/hardware/pages[bss].asm map_seg dw ? -include th04/tiles[bss].asm -include th04/frames[bss].asm +include th04/main/tiles[bss].asm +include th04/main/frames[bss].asm word_266D0 dw ? byte_266D2 db ? include th03/hardware/palette_changed[bss].asm stage_id db ? -include th04/playperf[bss].asm +include th04/main/playperf[bss].asm public _playchar _playchar db ? db ? -include th04/drawpoint[bss].asm -include th04/ems[bss].asm +include th04/main/drawpoint[bss].asm +include th04/main/ems[bss].asm _turbo_mode db ? db ? -include th04/bullet/template[bss].asm -include th04/midboss/vars[bss].asm -include th04/boss/vars[bss].asm -include th04/sparks[bss].asm -include th04/bullet/bullets[bss].asm +include th04/main/bullet/template[bss].asm +include th04/main/midboss/vars[bss].asm +include th04/main/boss/vars[bss].asm +include th04/main/sparks[bss].asm +include th04/main/bullet/bullets[bss].asm db 924 dup(?) byte_2A16E db ? db 1123 dup(?) include th04/main/gather[bss].asm -include th04/circles[bss].asm +include th04/main/circles[bss].asm db 6400 dup(?) -include th04/item/items[bss].asm +include th04/main/item/items[bss].asm db 858 dup(?) -include th04/player/shots[bss].asm +include th04/main/player/shots[bss].asm db 96 dup(?) public _resident _resident dd ? byte_2CDCA db ? db ? -include th04/boss/backdrop[bss].asm +include th04/main/boss/backdrop[bss].asm word_2CDCE dw ? byte_2CDD0 db ? byte_2CDD1 db ? @@ -38383,7 +38383,7 @@ word_2CFF4 dw ? byte_2CFF6 db ? byte_2CFF7 db ? byte_2CFF8 db ? -include th04/bullet_clear[bss].asm +include th04/main/bullet/clear[bss].asm db ? public _stage_graze _stage_graze dw ? @@ -38391,7 +38391,7 @@ score_2CFFE dw ? fp_2D000 dw ? fp_2D002 dw ? fp_2D004 dw ? -include th04/bullet/pellet_r[bss].asm +include th04/main/bullet/pellet_r[bss].asm angle_2D008 db ? evendata byte_2D00A db ? @@ -38400,7 +38400,7 @@ public _dream_score _dream_score dw ? byte_2D00E db ? db ? -include th04/boss/funcs[bss].asm +include th04/main/boss/funcs[bss].asm byte_2D01E db ? byte_2D01F db ? byte_2D020 db ? @@ -38415,7 +38415,7 @@ byte_2D02B db ? byte_2D02C db ? byte_2D02D db ? include th04/formats/bb_stage[bss].asm -include th04/boss/hitbox[bss].asm +include th04/main/boss/hitbox[bss].asm word_2D034 dw ? word_2D036 dw ? word_2D038 dw ? diff --git a/th05/player/chars.h b/th05/chars.h similarity index 100% rename from th05/player/chars.h rename to th05/chars.h diff --git a/th05/player/chars.inc b/th05/chars.inc similarity index 100% rename from th05/player/chars.inc rename to th05/chars.inc diff --git a/th05/hud_bar.asm b/th05/hud_bar.asm index a6187b6d..e862e843 100644 --- a/th05/hud_bar.asm +++ b/th05/hud_bar.asm @@ -2,7 +2,7 @@ locals include libs/master.lib/master.inc -include th02/hud/hud.inc +include th02/main/hud/hud.inc include th04/gaiji/gaiji.inc extrn _hud_gaiji_row:byte:HUD_TRAM_W diff --git a/th05/i_shot.hpp b/th05/i_shot.hpp index 8cdd6b47..2c0b4691 100644 --- a/th05/i_shot.hpp +++ b/th05/i_shot.hpp @@ -8,6 +8,6 @@ #include "th03/math/subpixel.hpp" #include "th03/math/randring.h" #include "th04/math/motion.hpp" -#include "th04/player/player.h" +#include "th04/main/player/player.h" #include "th05/sprites/main_pat.h" -#include "th05/player/shot.hpp" +#include "th05/main/player/shot.hpp" diff --git a/th05/boss/2_explode_big.asm b/th05/main/boss/2_explode_big.asm similarity index 100% rename from th05/boss/2_explode_big.asm rename to th05/main/boss/2_explode_big.asm diff --git a/th05/boss/2_explode_small.asm b/th05/main/boss/2_explode_small.asm similarity index 100% rename from th05/boss/2_explode_small.asm rename to th05/main/boss/2_explode_small.asm diff --git a/th05/boss/b3puppet.hpp b/th05/main/boss/b3puppet.hpp similarity index 100% rename from th05/boss/b3puppet.hpp rename to th05/main/boss/b3puppet.hpp diff --git a/th05/boss/b5_intervals[bss].asm b/th05/main/boss/b5_intervals[bss].asm similarity index 100% rename from th05/boss/b5_intervals[bss].asm rename to th05/main/boss/b5_intervals[bss].asm diff --git a/th05/boss/explode_big.asm b/th05/main/boss/explode_big.asm similarity index 100% rename from th05/boss/explode_big.asm rename to th05/main/boss/explode_big.asm diff --git a/th05/boss/sprites[bss].asm b/th05/main/boss/sprites[bss].asm similarity index 100% rename from th05/boss/sprites[bss].asm rename to th05/main/boss/sprites[bss].asm diff --git a/th05/boss/vars2[bss].asm b/th05/main/boss/vars2[bss].asm similarity index 100% rename from th05/boss/vars2[bss].asm rename to th05/main/boss/vars2[bss].asm diff --git a/th05/bullet/b4ball.hpp b/th05/main/bullet/b4ball.hpp similarity index 100% rename from th05/bullet/b4ball.hpp rename to th05/main/bullet/b4ball.hpp diff --git a/th05/bullet/b4balls_add.asm b/th05/main/bullet/b4balls_add.asm similarity index 100% rename from th05/bullet/b4balls_add.asm rename to th05/main/bullet/b4balls_add.asm diff --git a/th05/bullet/b4balls_render.asm b/th05/main/bullet/b4balls_render.asm similarity index 100% rename from th05/bullet/b4balls_render.asm rename to th05/main/bullet/b4balls_render.asm diff --git a/th05/bullet/b6ball.hpp b/th05/main/bullet/b6ball.hpp similarity index 100% rename from th05/bullet/b6ball.hpp rename to th05/main/bullet/b6ball.hpp diff --git a/th05/bullet/b6balls_add_update.asm b/th05/main/bullet/b6balls_add_update.asm similarity index 100% rename from th05/bullet/b6balls_add_update.asm rename to th05/main/bullet/b6balls_add_update.asm diff --git a/th05/bullet/b6balls_render.asm b/th05/main/bullet/b6balls_render.asm similarity index 100% rename from th05/bullet/b6balls_render.asm rename to th05/main/bullet/b6balls_render.asm diff --git a/th05/bullet/curve.hpp b/th05/main/bullet/curve.hpp similarity index 100% rename from th05/bullet/curve.hpp rename to th05/main/bullet/curve.hpp diff --git a/th05/bullet/curve[bss].asm b/th05/main/bullet/curve[bss].asm similarity index 100% rename from th05/bullet/curve[bss].asm rename to th05/main/bullet/curve[bss].asm diff --git a/th05/bullet/curvebullets_add.asm b/th05/main/bullet/curvebullets_add.asm similarity index 100% rename from th05/bullet/curvebullets_add.asm rename to th05/main/bullet/curvebullets_add.asm diff --git a/th05/bullet/knife.hpp b/th05/main/bullet/knife.hpp similarity index 100% rename from th05/bullet/knife.hpp rename to th05/main/bullet/knife.hpp diff --git a/th05/bullet/knives_add_update.asm b/th05/main/bullet/knives_add_update.asm similarity index 100% rename from th05/bullet/knives_add_update.asm rename to th05/main/bullet/knives_add_update.asm diff --git a/th05/bullet/knives_render.asm b/th05/main/bullet/knives_render.asm similarity index 100% rename from th05/bullet/knives_render.asm rename to th05/main/bullet/knives_render.asm diff --git a/th05/bullet/patnum_for_angle.asm b/th05/main/bullet/patnum_for_angle.asm similarity index 100% rename from th05/bullet/patnum_for_angle.asm rename to th05/main/bullet/patnum_for_angle.asm diff --git a/th05/bullet/pattypes.h b/th05/main/bullet/pattypes.h similarity index 100% rename from th05/bullet/pattypes.h rename to th05/main/bullet/pattypes.h diff --git a/th05/bullet/pattypes.inc b/th05/main/bullet/pattypes.inc similarity index 100% rename from th05/bullet/pattypes.inc rename to th05/main/bullet/pattypes.inc diff --git a/th05/bullet/update_patnum.asm b/th05/main/bullet/update_patnum.asm similarity index 100% rename from th05/bullet/update_patnum.asm rename to th05/main/bullet/update_patnum.asm diff --git a/th05/custom.h b/th05/main/custom.h similarity index 100% rename from th05/custom.h rename to th05/main/custom.h diff --git a/th05/custom[bss].asm b/th05/main/custom[bss].asm similarity index 100% rename from th05/custom[bss].asm rename to th05/main/custom[bss].asm diff --git a/th05/hud/number_put.asm b/th05/main/hud/number_put.asm similarity index 100% rename from th05/hud/number_put.asm rename to th05/main/hud/number_put.asm diff --git a/th05/item/enemy_drops[data].asm b/th05/main/item/enemy_drops[data].asm similarity index 100% rename from th05/item/enemy_drops[data].asm rename to th05/main/item/enemy_drops[data].asm diff --git a/th05/laser_render_hittest.asm b/th05/main/laser_render_hittest.asm similarity index 100% rename from th05/laser_render_hittest.asm rename to th05/main/laser_render_hittest.asm diff --git a/th05/lasers[bss].asm b/th05/main/lasers[bss].asm similarity index 100% rename from th05/lasers[bss].asm rename to th05/main/lasers[bss].asm diff --git a/th05/lasers_control.asm b/th05/main/lasers_control.asm similarity index 100% rename from th05/lasers_control.asm rename to th05/main/lasers_control.asm diff --git a/th05/lasers_render[bss].asm b/th05/main/lasers_render[bss].asm similarity index 100% rename from th05/lasers_render[bss].asm rename to th05/main/lasers_render[bss].asm diff --git a/th05/lasers_update_render.asm b/th05/main/lasers_update_render.asm similarity index 100% rename from th05/lasers_update_render.asm rename to th05/main/lasers_update_render.asm diff --git a/th05/player/hitshot_from.asm b/th05/main/player/hitshot_from.asm similarity index 100% rename from th05/player/hitshot_from.asm rename to th05/main/player/hitshot_from.asm diff --git a/th05/player/hitshot_from[bss].asm b/th05/main/player/hitshot_from[bss].asm similarity index 100% rename from th05/player/hitshot_from[bss].asm rename to th05/main/player/hitshot_from[bss].asm diff --git a/th05/player/hitshots[bss].asm b/th05/main/player/hitshots[bss].asm similarity index 100% rename from th05/player/hitshots[bss].asm rename to th05/main/player/hitshots[bss].asm diff --git a/th05/player/shot.hpp b/th05/main/player/shot.hpp similarity index 98% rename from th05/player/shot.hpp rename to th05/main/player/shot.hpp index 12b47a94..fbdcf3a3 100644 --- a/th05/player/shot.hpp +++ b/th05/main/player/shot.hpp @@ -1,4 +1,4 @@ -#include "th04/player/shot.hpp" +#include "th04/main/player/shot.hpp" // Shot types #define ST_NORMAL 0 diff --git a/th05/player/shot_types.inc b/th05/main/player/shot_types.inc similarity index 100% rename from th05/player/shot_types.inc rename to th05/main/player/shot_types.inc diff --git a/th05/player/shots_add.asm b/th05/main/player/shots_add.asm similarity index 100% rename from th05/player/shots_add.asm rename to th05/main/player/shots_add.asm diff --git a/th05/playchar_speed[bss].asm b/th05/main/player/speed[bss].asm similarity index 100% rename from th05/playchar_speed[bss].asm rename to th05/main/player/speed[bss].asm diff --git a/th05/playperf_adjust_speed.asm b/th05/main/playperf_adjust_speed.asm similarity index 100% rename from th05/playperf_adjust_speed.asm rename to th05/main/playperf_adjust_speed.asm diff --git a/th05/select_for_playchar.asm b/th05/main/select_for_playchar.asm similarity index 100% rename from th05/select_for_playchar.asm rename to th05/main/select_for_playchar.asm diff --git a/th05/stage/s2part.asm b/th05/main/stage/s2part.asm similarity index 100% rename from th05/stage/s2part.asm rename to th05/main/stage/s2part.asm diff --git a/th05/stage/s2part.hpp b/th05/main/stage/s2part.hpp similarity index 100% rename from th05/stage/s2part.hpp rename to th05/main/stage/s2part.hpp diff --git a/th05/stage/setup.cpp b/th05/main/stage/setup.cpp similarity index 100% rename from th05/stage/setup.cpp rename to th05/main/stage/setup.cpp diff --git a/th05/main012.cpp b/th05/main012.cpp index a3052062..2154df06 100644 --- a/th05/main012.cpp +++ b/th05/main012.cpp @@ -18,9 +18,9 @@ void pascal near playfield_fillm_64_56_256_256(void); void pascal near playfield_fillm_0_0_384_192__1(void); void pascal near playfield_fillm_0_104_384_192(void); -#include "th04/boss/reset.cpp" +#include "th04/main/boss/reset.cpp" #include "th04/formats/bb_stage.c" -#include "th05/stage/setup.cpp" +#include "th05/main/stage/setup.cpp" // Adds the entire score delta at once to the current score. void pascal score_delta_commit(void) diff --git a/th05/op_01.cpp b/th05/op_01.cpp index ceaa27d1..1188dd7b 100644 --- a/th05/op_01.cpp +++ b/th05/op_01.cpp @@ -8,7 +8,7 @@ extern "C" { #include "platform.h" #include "th01/ranks.h" #include "th04/formats/scoredat.h" -#include "th05/player/chars.h" +#include "th05/chars.h" scoredat_section_t hi; scoredat_section_t hi2; diff --git a/th05/player.asm b/th05/player.asm index 0aa352a6..54cff8c9 100644 --- a/th05/player.asm +++ b/th05/player.asm @@ -2,10 +2,10 @@ locals include libs/master.lib/master.inc -include th02/playfld.inc +include th02/main/playfld.inc include th04/math/motion.inc include th04/hardware/input.inc -include th04/player/player.inc +include th04/main/player/player.inc VECTOR2_AT procdesc pascal far \ ret:ptr Point, origin_x:word, origin_y:word, length:word, angle:byte diff --git a/th05/th05.inc b/th05/th05.inc index 75ad34c2..b762dafb 100644 --- a/th05/th05.inc +++ b/th05/th05.inc @@ -1,11 +1,9 @@ GAME = 5 +include th05/chars.inc include th05/mem.inc include th04/shared.inc include th05/gaiji/gaiji.inc -include th05/player/chars.inc -include th05/player/shot_types.inc - resident_t struc id db 10 dup(?) zunsoft_shown db ? diff --git a/th05_main.asm b/th05_main.asm index 939be780..13b0bf1d 100644 --- a/th05_main.asm +++ b/th05_main.asm @@ -23,8 +23,9 @@ BINARY = 'M' include ReC98.inc include th05/th05.inc include th05/sprites/main_pat.inc -include th04/phase.inc -include th05/bullet/pattypes.inc +include th04/main/phase.inc +include th05/main/bullet/pattypes.inc +include th05/main/player/shot_types.inc extern _execl:proc extern _strlen:proc @@ -1132,7 +1133,7 @@ loc_B630: retn sub_B609 endp -include th04/pause.asm +include th04/main/pause.asm ; =============== S U B R O U T I N E ======================================= @@ -1675,7 +1676,7 @@ loc_BBCF: retn sub_BB9A endp -include th04/tiles_render_all.asm +include th04/main/tiles_render_all.asm ; =============== S U B R O U T I N E ======================================= @@ -1861,7 +1862,7 @@ loc_BDE8: sub_BD20 endp include th05/formats/std.asm -include th04/tiles_invalidate_all.asm +include th04/main/tiles_invalidate_all.asm ; =============== S U B R O U T I N E ======================================= @@ -1940,8 +1941,8 @@ sub_BF32 endp ; =============== S U B R O U T I N E ======================================= -include th04/tiles_redraw.asm -include th04/scroll_y_1.asm +include th04/main/tiles_redraw.asm +include th04/main/scroll_y_1.asm MOTION_UPDATE_DEF 1 include th03/math/randring_fill.asm RANDRING_NEXT_DEF 1 @@ -1964,10 +1965,10 @@ nullsub_1 proc far nullsub_1 endp nop -include th04/bullet/pellet_r.asm -include th04/spark_render.asm -include th04/sparks.asm -include th04/item/splash_dot_render.asm +include th04/main/bullet/pellet_r.asm +include th04/main/spark_render.asm +include th04/main/sparks.asm +include th04/main/item/splash_dot_render.asm ; =============== S U B R O U T I N E ======================================= @@ -3677,7 +3678,7 @@ loc_D060: retn sub_D032 endp -include th04/boss/backdrop.asm +include th04/main/boss/backdrop.asm ; =============== S U B R O U T I N E ======================================= @@ -5750,7 +5751,7 @@ playfield_fillm_0_0_384_192__2 proc near playfield_fillm_0_0_384_192__2 endp include th04/formats/z_super_roll_put_tiny.asm -include th04/tiles_invalidate.asm +include th04/main/tiles_invalidate.asm include th05/formats/super_roll_put_16x16_m.asm ; =============== S U B R O U T I N E ======================================= @@ -5832,8 +5833,8 @@ end_extra proc far retf end_extra endp -include th05/player/shots_add.asm -include th04/player/shot_velocity.asm +include th05/main/player/shots_add.asm +include th04/main/player/shot_velocity.asm ; =============== S U B R O U T I N E ======================================= @@ -5931,7 +5932,7 @@ sub_E58C endp nop include th04/main/bullets_gather_inv.asm -include th04/item/invalidate.asm +include th04/main/item/invalidate.asm include th04/hardware/grcg_modecol.asm ; =============== S U B R O U T I N E ======================================= @@ -5953,9 +5954,9 @@ sub_E708 endp ; --------------------------------------------------------------------------- nop -include th04/playperf.asm -include th05/select_for_playchar.asm -include th04/select_for_rank.asm +include th04/main/playperf.asm +include th05/main/select_for_playchar.asm +include th04/main/select_for_rank.asm include th04/formats/scoredat_code_asm.asm ; =============== S U B R O U T I N E ======================================= @@ -6220,7 +6221,7 @@ sub_E950 proc near retn sub_E950 endp -include th05/laser_render_hittest.asm +include th05/main/laser_render_hittest.asm ; =============== S U B R O U T I N E ======================================= @@ -6392,7 +6393,7 @@ loc_EC7A: retn sub_EBB7 endp -include th04/circles.asm +include th04/main/circles.asm ; =============== S U B R O U T I N E ======================================= @@ -7270,8 +7271,8 @@ loc_F518: retn sub_F4DD endp -include th04/boss/explosions_small.asm -include th04/boss/explosions_big.asm +include th04/main/boss/explosions_small.asm +include th04/main/boss/explosions_big.asm ; =============== S U B R O U T I N E ======================================= @@ -7361,7 +7362,7 @@ loc_F71C: retf 4 GameCore endp -include th04/item/render.asm +include th04/main/item/render.asm ; =============== S U B R O U T I N E ======================================= @@ -7852,7 +7853,7 @@ loc_FBF7: retn sub_FAA3 endp -include th05/lasers_update_render.asm +include th05/main/lasers_update_render.asm ; =============== S U B R O U T I N E ======================================= @@ -7961,7 +7962,7 @@ loc_10024: retn curvebullets_render endp -include th04/item/splashes_render.asm +include th04/main/item/splashes_render.asm ; =============== S U B R O U T I N E ======================================= @@ -9641,7 +9642,7 @@ loc_10EAE: retn midboss4_render endp -include th05/bullet/b4balls_render.asm +include th05/main/bullet/b4balls_render.asm ; =============== S U B R O U T I N E ======================================= @@ -9710,7 +9711,7 @@ loc_10F86: retn sub_10F12 endp -include th05/bullet/knives_render.asm +include th05/main/bullet/knives_render.asm ; =============== S U B R O U T I N E ======================================= @@ -9790,7 +9791,7 @@ loc_11069: retn yumeko_fg_render endp -include th05/bullet/b6balls_render.asm +include th05/main/bullet/b6balls_render.asm ; =============== S U B R O U T I N E ======================================= @@ -9874,7 +9875,7 @@ loc_1117A: retn shinki_fg_render endp -include th05/stage/s2part.asm +include th05/main/stage/s2part.asm ; =============== S U B R O U T I N E ======================================= @@ -11320,8 +11321,8 @@ loc_11DE4: retn sub_11CBB endp -include th04/hud/popup.asm -include th04/player/pos_update_and_clamp.asm +include th04/main/hud/popup.asm +include th04/main/player/pos_update_and_clamp.asm ; =============== S U B R O U T I N E ======================================= @@ -11560,7 +11561,7 @@ loc_12260: retn sub_1214A endp -include th04/player/render.asm +include th04/main/player/render.asm ; =============== S U B R O U T I N E ======================================= @@ -11921,7 +11922,7 @@ loc_125F6: retn sub_125A3 endp -include th05/player/hitshot_from.asm +include th05/main/player/hitshot_from.asm ; =============== S U B R O U T I N E ======================================= @@ -12303,7 +12304,7 @@ main_03_TEXT segment byte public 'CODE' use16 ;org 8 assume es:nothing, ss:nothing, ds:_DATA, fs:nothing, gs:nothing -include th04/scroll_y_3.asm +include th04/main/scroll_y_3.asm MOTION_UPDATE_DEF 2 ; =============== S U B R O U T I N E ======================================= @@ -13133,8 +13134,8 @@ sub_158CC endp include th04/math/vector2_near.asm nop -include th04/sparks_add.asm -include th05/bullet/patnum_for_angle.asm +include th04/main/sparks_add.asm +include th05/main/bullet/patnum_for_angle.asm GRCG_SETCOLOR_DIRECT_NOINT_DEF 2 GRCG_SETMODE_RMW_DEF 2 @@ -13164,7 +13165,7 @@ arg_4 = word ptr 8 sub_15A24 endp nop -include th05/playperf_adjust_speed.asm +include th05/main/playperf_adjust_speed.asm ; =============== S U B R O U T I N E ======================================= @@ -14316,11 +14317,11 @@ loc_162B9: retf sub_1607D endp -include th04/boss/explosions_reset.asm -include th04/boss/explode_small.asm -include th05/boss/2_explode_small.asm -include th05/boss/explode_big.asm -include th05/boss/2_explode_big.asm +include th04/main/boss/explosions_reset.asm +include th04/main/boss/explode_small.asm +include th05/main/boss/2_explode_small.asm +include th05/main/boss/explode_big.asm +include th05/main/boss/2_explode_big.asm ; =============== S U B R O U T I N E ======================================= @@ -15274,7 +15275,7 @@ loc_16E23: retn 6 items_add endp -include th04/item/miss_add.asm +include th04/main/item/miss_add.asm ; =============== S U B R O U T I N E ======================================= @@ -16009,8 +16010,8 @@ loc_174C5: retn sub_17486 endp -include th05/lasers_control.asm -include th05/bullet/curvebullets_add.asm +include th05/main/lasers_control.asm +include th05/main/bullet/curvebullets_add.asm ; =============== S U B R O U T I N E ======================================= @@ -16220,8 +16221,8 @@ loc_178A5: retn curvebullets_update endp -include th04/item/splashes_update.asm -include th05/bullet/update_patnum.asm +include th04/main/item/splashes_update.asm +include th05/main/bullet/update_patnum.asm ; =============== S U B R O U T I N E ======================================= @@ -22734,7 +22735,7 @@ off_1B3BA dw offset loc_1B2F7 dw offset loc_1B327 dw offset loc_1B32C -include th05/bullet/b4balls_add.asm +include th05/main/bullet/b4balls_add.asm ; =============== S U B R O U T I N E ======================================= @@ -24909,7 +24910,7 @@ off_1C816 dw offset loc_1C54D dw offset loc_1C75B dw offset loc_1C784 -include th05/bullet/knives_add_update.asm +include th05/main/bullet/knives_add_update.asm ; =============== S U B R O U T I N E ======================================= @@ -26023,7 +26024,7 @@ off_1D524 dw offset loc_1D29C dw offset loc_1D4BC dw offset loc_1D4DD -include th05/bullet/b6balls_add_update.asm +include th05/main/bullet/b6balls_add_update.asm ; =============== S U B R O U T I N E ======================================= @@ -29901,7 +29902,7 @@ sub_1F9BA endp ; --------------------------------------------------------------------------- nop -include th05/hud/number_put.asm +include th05/main/hud/number_put.asm ; =============== S U B R O U T I N E ======================================= @@ -30374,7 +30375,7 @@ aSt04_bft_0 db 'st04.bft',0 aBss6_cd2 db 'BSS6.CD2',0 aSt06_bft db 'st06.bft',0 aSt06_mpn db 'st06.mpn',0 -include th04/pause[data].asm +include th04/main/pause[data].asm aDemo0_rec db 'DEMO0.REC',0 aOp_1 db 'op',0 aKaikiems db 'KAIKIEMS',0 @@ -30621,16 +30622,16 @@ include th05/formats/bb_curvebullet[data].asm aMaine db 'maine',0 ; char aMaine_0[] aMaine_0 db 'maine',0 -include th04/player/shot_levels[data].asm +include th04/main/player/shot_levels[data].asm include th05/formats/bb_txt_load[data].asm -include th04/player/shot_velocity[data].asm +include th04/main/player/shot_velocity[data].asm aGENSOU_SCR db 'GENSOU.SCR',0 gCONTINUE db 0ACh, 0B8h, 0B7h, 0BDh, 0B2h, 0B7h, 0BEh, 0AEh, 0 byte_221C0 db 0 db 0 _enemies_gone dw 0 _enemies_killed dw 0 -include th04/frames[data].asm +include th04/main/frames[data].asm off_221D0 dd a_dm00_tx2 ; "_DM00.TX2" include th04/formats/dialog[data].asm @@ -30653,7 +30654,7 @@ aSt06_16_bft db 'st06_16.bft',0 aBomb3_bft_0 db 'bomb3.bft',0 aBomb0_bft_0 db 'bomb0.bft',0 db 0 -include th04/boss/explosions_big[data].asm +include th04/main/boss/explosions_big[data].asm byte_22274 db 0 byte_22275 db 0 off_22276 dw offset aBOSS_FINAL_TIMEOUT @@ -30706,18 +30707,18 @@ word_22586 dw 180h word_22588 dw 800h db 0 db 0 -include th05/item/enemy_drops[data].asm +include th05/main/item/enemy_drops[data].asm byte_225CC db 0 db 0 -include th04/item/type_patnum[data].asm -include th02/power_overflow[data].asm -include th04/dream_score[data].asm +include th04/main/item/type_patnum[data].asm +include th02/main/power_overflow[data].asm +include th04/main/dream_score[data].asm public _power_overflow_level _power_overflow_level dw 0 -include th04/item/collect[data].asm +include th04/main/item/collect[data].asm byte_2264E db 0 db 0 -include th04/item/miss_add[data].asm +include th04/main/item/miss_add[data].asm word_2268C dw 0 byte_2268E db 0 db 0 @@ -30740,7 +30741,7 @@ word_22723 dw 6161h word_22725 dw 8121h word_22727 dw 0C1A1h byte_22729 db 0E1h -include th04/hud/bar_colors[data].asm +include th04/main/hud/bar_colors[data].asm word_22734 dw 202h word_22736 dw 202h word_22738 dw 202h @@ -30881,7 +30882,7 @@ public _popup_frame _popup_frame db 0 db 0 include th04/formats/bb_txt[data].asm -include th04/hud/popup[data].asm +include th04/main/hud/popup[data].asm byte_228EC db 0 db 0 public _PLAYFIELD_BLANK_ROW @@ -30936,9 +30937,9 @@ _SHOT_FUNCS label word dw shot_yuuka_l9 byte_2297E db 0 db 0 -include th02/hud/score_put[data].asm -include th03/5_powers_of_10[data].asm -include th04/hud/gaiji_row[data].asm +include th02/main/hud/score_put[data].asm +include th03/main/5_powers_of_10[data].asm +include th04/main/hud/gaiji_row[data].asm db 0 db 0 db 3 @@ -30988,7 +30989,7 @@ byte_23F04 db ? db ? word_23F06 dw ? include th04/formats/std[bss].asm -include th04/tiles_invalidate[bss].asm +include th04/main/tiles_invalidate[bss].asm _boss_bg_render dw ? fp_23F58 dw ? fp_23F5A dw ? @@ -31015,7 +31016,7 @@ point_24490 Point point_24494 Point byte_24498 db ? db ? -include th04/boss/backdrop[bss].asm +include th04/main/boss/backdrop[bss].asm word_2449C dw ? db 124 dup(?) byte_2451A db ? @@ -31025,8 +31026,8 @@ byte_245A8 db ? include th05/formats/bb_curvebullet[bss].asm include th05/formats/bb_load[bss].asm _invalidate_left_x_tile dw ? -include th04/sparks_add[bss].asm -include th04/drawpoint[bss].asm +include th04/main/sparks_add[bss].asm +include th04/main/drawpoint[bss].asm include th04/formats/scoredat[bss].asm byte_25342 db ? db ? @@ -31043,83 +31044,83 @@ _lives db ? _bombs db ? include th02/hardware/pages[bss].asm map_seg dw ? -include th04/tiles[bss].asm -include th04/frames[bss].asm +include th04/main/tiles[bss].asm +include th04/main/frames[bss].asm word_25FE6 dw ? byte_25FE8 db ? include th03/hardware/palette_changed[bss].asm stage_id db ? _rank db ? -include th04/playperf[bss].asm +include th04/main/playperf[bss].asm public _playchar _playchar db ? -include th04/ems[bss].asm +include th04/main/ems[bss].asm _turbo_mode db ? db ? -include th02/demo[bss].asm +include th02/main/demo[bss].asm byte_25FF8 db ? db ? -include th04/bullet/template[bss].asm -include th05/lasers[bss].asm -include th04/midboss/vars[bss].asm -include th04/boss/vars[bss].asm -include th05/boss/vars2[bss].asm -include th04/sparks[bss].asm -include th04/bullet/bullets[bss].asm +include th04/main/bullet/template[bss].asm +include th05/main/lasers[bss].asm +include th04/main/midboss/vars[bss].asm +include th04/main/boss/vars[bss].asm +include th05/main/boss/vars2[bss].asm +include th04/main/sparks[bss].asm +include th04/main/bullet/bullets[bss].asm db 2048 dup(?) include th04/main/gather[bss].asm -include th04/circles[bss].asm +include th04/main/circles[bss].asm db 4480 dup(?) -include th04/item/items[bss].asm -include th05/custom[bss].asm -include th04/player/shots[bss].asm +include th04/main/item/items[bss].asm +include th05/main/custom[bss].asm +include th04/main/player/shots[bss].asm db 72 dup(?) -include th05/player/hitshots[bss].asm -include th04/homing_target[bss].asm +include th05/main/player/hitshots[bss].asm +include th04/main/homing_target[bss].asm public _stage_vm _stage_vm dd ? word_2C92A dw ? -include th04/circles_color[bss].asm +include th04/main/circles_color[bss].asm fp_2C92E dw ? dword_2C930 dd ? word_2C934 dw ? word_2C936 dw ? word_2C938 dw ? db 2 dup(?) -include th04/boss/explosions[bss].asm +include th04/main/boss/explosions[bss].asm byte_2C96C db ? db ? -include th05/boss/sprites[bss].asm +include th05/main/boss/sprites[bss].asm byte_2C974 db ? db ? byte_2C976 db ? byte_2C977 db ? -include th04/bullet_clear[bss].asm +include th04/main/bullet/clear[bss].asm public _stage_graze _stage_graze dw ? score_2C97C dw ? -include th04/bullet/pellet_r[bss].asm +include th04/main/bullet/pellet_r[bss].asm db 6 dup(?) word_2C986 dw ? word_2C988 dw ? byte_2C98A db ? db ? -include th04/midboss/funcs[bss].asm +include th04/main/midboss/funcs[bss].asm byte_2C99C db ? db ? -include th05/lasers_render[bss].asm -include th05/bullet/curve[bss].asm -include th04/item/splashes[bss].asm +include th05/main/lasers_render[bss].asm +include th05/main/bullet/curve[bss].asm +include th04/main/item/splashes[bss].asm public _pellet_bottom_col _pellet_bottom_col dw ? db 360 dup(?) word_2CDF8 dw ? -include th04/scroll[bss].asm +include th04/main/scroll[bss].asm word_2CE02 dw ? word_2CE04 dw ? word_2CE06 dw ? db 2 dup(?) -include th04/score[bss].asm +include th04/main/score[bss].asm db 2 dup(?) fp_2CE24 dw ? word_2CE26 dw ? @@ -31143,7 +31144,7 @@ fp_2CE48 dw ? fp_2CE4A dw ? byte_2CE4C db ? db ? -include th04/stage_funcs[bss].asm +include th04/main/stage/funcs[bss].asm point_2CE52 Point byte_2CE56 db ? db 13 dup(?) @@ -31154,23 +31155,23 @@ word_2CE6A dw ? word_2CE6C dw ? word_2CE6E dw ? -include th04/hud/popup[bss].asm +include th04/main/hud/popup[bss].asm public _stage_title, _stage_bgm_title, _boss_bgm_title _stage_title dd ? _stage_bgm_title dd ? _boss_bgm_title dd ? word_2CE9E dw ? -include th04/player/pos[bss].asm -include th05/playchar_speed[bss].asm -include th04/player/option[bss].asm +include th04/main/player/pos[bss].asm +include th05/main/player/speed[bss].asm +include th04/main/player/option[bss].asm public _player_invincibility_time, _power, _shot_level, _shot_time _player_invincibility_time db ? byte_2CEBD db ? _power db ? _shot_level db ? _shot_time db ? -include th01/player_is_hit[bss].asm +include th01/main/player_is_hit[bss].asm public _MISS_TIME, _dream, _MISS_EXPLOSION_RADIUS _miss_time db ? _dream db ? @@ -31187,13 +31188,13 @@ word_2CED6 dw ? word_2CED8 dw ? db 384 dup(?) word_2D05A dw ? -include th05/player/hitshot_from[bss].asm +include th05/main/player/hitshot_from[bss].asm word_2D05E dw ? byte_2D060 db ? db ? -include th04/player/shots_add[bss].asm -include th04/boss/funcs[bss].asm -include th05/boss/b5_intervals[bss].asm +include th04/main/player/shots_add[bss].asm +include th04/main/boss/funcs[bss].asm +include th05/main/boss/b5_intervals[bss].asm db 5 dup(?) byte_2D07D db ? byte_2D07E db ? @@ -31205,6 +31206,6 @@ byte_2D083 db ? byte_2D084 db ? byte_2D085 db ? include th04/formats/bb_stage[bss].asm -include th04/boss/hitbox[bss].asm +include th04/main/boss/hitbox[bss].asm end