From 0fb1a9f01e6e0daca123d461f055a4217e75fdb7 Mon Sep 17 00:00:00 2001 From: nmlgc Date: Tue, 22 Mar 2022 11:44:22 +0100 Subject: [PATCH] [Maintenance] [th05] Split segment #3 before Shinki Part of P0188, funded by [Anonymous] and nrook. --- Makefile.mak | 2 +- th05/{main035.cpp => boss_x.cpp} | 7 ------- th05_main.asm | 9 +++++++-- 3 files changed, 8 insertions(+), 10 deletions(-) rename th05/{main035.cpp => boss_x.cpp} (70%) diff --git a/Makefile.mak b/Makefile.mak index 1421f6af..7a67aac7 100644 --- a/Makefile.mak +++ b/Makefile.mak @@ -149,7 +149,7 @@ bin\th05\op.exe: th05\op010.cpp bin\th05\op.obj th05\op011.cpp th05\m_char.cpp b $** | -bin\th05\main.exe: bin\th05\main.obj bin\th04\slowdown.obj th05\ems.cpp bin\th05\cfg_lres.obj th05\main010.cpp th05\f_dialog.cpp th05\dialog.cpp th05\playfld.cpp th05\main011.cpp th05\p_common.cpp th05\p_reimu.cpp th05\p_marisa.cpp th05\p_mima.cpp th05\p_yuuka.cpp bin\th05\player.obj bin\th05\hud_bar.obj bin\th05\scoreupd.obj th05\hud_ovrl.cpp bin\th04\player_p.obj th05\main014.cpp th05\player_a.cpp bin\th05\bullet_1.obj th05\bullet_c.cpp bin\th03\vector2.obj bin\th03\hfliplut.obj bin\th04\snd_pmdr.obj bin\th04\snd_mmdr.obj bin\th04\snd_mode.obj bin\th05\bullet.obj th05\bullet_t.cpp bin\th04\cdg_p_na.obj bin\th04\snd_se_r.obj bin\th04\snd_se.obj bin\th05\cdg_put.obj bin\th04\exit.obj bin\th05\vector.obj bin\th05\snd_load.obj bin\th05\snd_kaja.obj bin\th05\initmain.obj bin\th05\input_s.obj bin\th05\inp_h_w.obj bin\th05\frmdelay.obj bin\th04\cdg_load.obj bin\th04\scrolly3.obj bin\th04\motion_3.obj th05\gather.cpp th05\main032.cpp th05\mb_dft.cpp th05\laser_sc.cpp th05\curveb_u.cpp bin\th04\it_spl_u.obj th05\bullet_u.cpp th05\main034.cpp th05\main035.cpp th05\boss.cpp +bin\th05\main.exe: bin\th05\main.obj bin\th04\slowdown.obj th05\ems.cpp bin\th05\cfg_lres.obj th05\main010.cpp th05\f_dialog.cpp th05\dialog.cpp th05\playfld.cpp th05\main011.cpp th05\p_common.cpp th05\p_reimu.cpp th05\p_marisa.cpp th05\p_mima.cpp th05\p_yuuka.cpp bin\th05\player.obj bin\th05\hud_bar.obj bin\th05\scoreupd.obj th05\hud_ovrl.cpp bin\th04\player_p.obj th05\main014.cpp th05\player_a.cpp bin\th05\bullet_1.obj th05\bullet_c.cpp bin\th03\vector2.obj bin\th03\hfliplut.obj bin\th04\snd_pmdr.obj bin\th04\snd_mmdr.obj bin\th04\snd_mode.obj bin\th05\bullet.obj th05\bullet_t.cpp bin\th04\cdg_p_na.obj bin\th04\snd_se_r.obj bin\th04\snd_se.obj bin\th05\cdg_put.obj bin\th04\exit.obj bin\th05\vector.obj bin\th05\snd_load.obj bin\th05\snd_kaja.obj bin\th05\initmain.obj bin\th05\input_s.obj bin\th05\inp_h_w.obj bin\th05\frmdelay.obj bin\th04\cdg_load.obj bin\th04\scrolly3.obj bin\th04\motion_3.obj th05\gather.cpp th05\main032.cpp th05\mb_dft.cpp th05\laser_sc.cpp th05\curveb_u.cpp bin\th04\it_spl_u.obj th05\bullet_u.cpp th05\main034.cpp th05\boss_x.cpp th05\boss.cpp $(CC) $(CFLAGS) $(LARGE_LFLAGS) -3 -Z -DGAME=5 -DBINARY='M' -nbin\th05\ -eMAIN.EXE @&&| $** | diff --git a/th05/main035.cpp b/th05/boss_x.cpp similarity index 70% rename from th05/main035.cpp rename to th05/boss_x.cpp index 280cf0b2..2c89579d 100644 --- a/th05/main035.cpp +++ b/th05/boss_x.cpp @@ -1,10 +1,3 @@ -/* ReC98 - * ----- - * 5th part of code segment #3 of TH05's MAIN.EXE - */ - -#pragma option -zCmain_035_TEXT - #include "platform.h" #include "pc98.h" #include "th01/math/subpixel.hpp" diff --git a/th05_main.asm b/th05_main.asm index cd5b55f9..c1c21bd9 100644 --- a/th05_main.asm +++ b/th05_main.asm @@ -39,7 +39,7 @@ include th05/main/enemy/enemy.inc main_01 group SLOWDOWN_TEXT, m_TEXT, EMS_TEXT, ma_TEXT, CFG_LRES_TEXT, mai_TEXT, main_TEXT, main__TEXT, PLAYFLD_TEXT, main_0_TEXT, HUD_OVRL_TEXT, DIALOG_TEXT, PLAYER_P_TEXT, main_01_TEXT g_SHARED group SHARED, SHARED_ -main_03 group SCROLLY3_TEXT, MOTION_3_TEXT, main_031_TEXT, BULLET_A_TEXT, main_032_TEXT, main_033_TEXT, MB_DFT_TEXT, LASER_SC_TEXT, CURVEB_U_TEXT, IT_SPL_U_TEXT, BULLET_U_TEXT, main_034_TEXT, main_035_TEXT, main_036_TEXT, BOSS_TEXT +main_03 group SCROLLY3_TEXT, MOTION_3_TEXT, main_031_TEXT, BULLET_A_TEXT, main_032_TEXT, main_033_TEXT, MB_DFT_TEXT, LASER_SC_TEXT, CURVEB_U_TEXT, IT_SPL_U_TEXT, BULLET_U_TEXT, main_034_TEXT, main_035_TEXT, BOSS_6, BOSS_X_TEXT, main_036_TEXT, BOSS_TEXT ; =========================================================================== @@ -19669,7 +19669,12 @@ off_1D524 dw offset loc_1D29C dw offset loc_1D49A dw offset loc_1D4BC dw offset loc_1D4DD +main_035_TEXT ends +BOSS_6 segment byte public 'CODE' use16 +BOSS_6 ends + +BOSS_X_TEXT segment byte public 'CODE' use16 include th05/main/bullet/b6balls_add_update.asm ; =============== S U B R O U T I N E ======================================= @@ -21528,7 +21533,7 @@ midbossx_update endp @FIREWAVES_ADD$QIUC procdesc pascal near \ amp:word, is_right:byte @firewaves_update$qv procdesc pascal near -main_035_TEXT ends +BOSS_X_TEXT ends main_036_TEXT segment byte public 'CODE' use16