Rooba
/
ReC98
mirror of https://github.com/nmlgc/ReC98.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Maintenance] [th04/th05] MAINE.EXE: Duplicate resident pointer loading 

With the implementation moved to the header, it makes sense to
duplicate the function in the unfortunate place where the filename is
supposed to be.

Part of P0265, funded by [Anonymous] and iruleatgames.
This commit is contained in:
nmlgc 2024-01-18 14:11:13 +01:00
parent c57992caa9
commit 09c324fbed
6 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.mak
View File

@ -157,7 +157,7 @@ bin\th04\main.exe: bin\th04\main.obj bin\th04\slowdown.obj th04\demo.cpp th04\em
$**
|
bin\th04\maine.exe: bin\th04\maine.obj bin\th04\cfg_lres.obj th04\cutscene.cpp th04\staff.cpp bin\th01\vplanset.obj bin\th02\frmdely1.obj bin\th03\pi_put.obj bin\th04\cdg_put.obj bin\th04\exit.obj bin\th04\initmain.obj bin\th04\input_s.obj bin\th04\snd_se_r.obj bin\th04\snd_se.obj bin\th04\bgimage.obj bin\th04\bgimager.obj bin\th03\pi_load.obj bin\th03\pi_put_q.obj bin\th04\cdg_load.obj bin\th03\hfliplut.obj bin\th04\input_w.obj bin\th04\vector.obj bin\th04\snd_pmdr.obj bin\th04\snd_mmdr.obj bin\th04\snd_kaja.obj bin\th04\snd_mode.obj bin\th04\snd_dlym.obj bin\th04\cdg_p_pl.obj bin\th04\snd_load.obj
bin\th04\maine.exe: th04\maine_e.cpp bin\th04\maine.obj th04\cutscene.cpp th04\staff.cpp bin\th01\vplanset.obj bin\th02\frmdely1.obj bin\th03\pi_put.obj bin\th04\cdg_put.obj bin\th04\exit.obj bin\th04\initmain.obj bin\th04\input_s.obj bin\th04\snd_se_r.obj bin\th04\snd_se.obj bin\th04\bgimage.obj bin\th04\bgimager.obj bin\th03\pi_load.obj bin\th03\pi_put_q.obj bin\th04\cdg_load.obj bin\th03\hfliplut.obj bin\th04\input_w.obj bin\th04\vector.obj bin\th04\snd_pmdr.obj bin\th04\snd_mmdr.obj bin\th04\snd_kaja.obj bin\th04\snd_mode.obj bin\th04\snd_dlym.obj bin\th04\cdg_p_pl.obj bin\th04\snd_load.obj
$(CC) $(CFLAGS) $(LARGE_LFLAGS) -DGAME=4 -DBINARY='E' -3 -Z -nbin\th04\ -eMAINE.EXE @&&|
$**
|
@ -180,7 +180,7 @@ bin\th05\main.exe: bin\th05\main.obj bin\th04\slowdown.obj th05\demo.cpp th05\em
$**
|
bin\th05\maine.exe: bin\th05\maine.obj th05\cutscene.cpp bin\th04\cfg_lres.obj th05\regist.cpp th05\staff.cpp bin\th04\cdg_p_na.obj bin\th04\snd_se_r.obj bin\th04\snd_se.obj bin\th04\bgimage.obj bin\th04\exit.obj bin\th05\vector.obj bin\th05\bgimager.obj bin\th05\snd_load.obj bin\th05\snd_kaja.obj bin\th05\pi_cpp_1.obj bin\th05\pi_asm_1.obj bin\th05\pi_cpp_2.obj bin\th05\pi_asm_2.obj bin\th05\initmain.obj bin\th05\input_s.obj bin\th05\inp_h_w.obj bin\th05\snd_dlym.obj bin\th05\frmdelay.obj bin\th04\cdg_load.obj bin\th05\egcrect.obj bin\th03\hfliplut.obj bin\th04\snd_pmdr.obj bin\th04\snd_mmdr.obj bin\th04\snd_mode.obj
bin\th05\maine.exe: th05\maine_e.cpp bin\th05\maine.obj th05\cutscene.cpp th05\regist.cpp th05\staff.cpp bin\th04\cdg_p_na.obj bin\th04\snd_se_r.obj bin\th04\snd_se.obj bin\th04\bgimage.obj bin\th04\exit.obj bin\th05\vector.obj bin\th05\bgimager.obj bin\th05\snd_load.obj bin\th05\snd_kaja.obj bin\th05\pi_cpp_1.obj bin\th05\pi_asm_1.obj bin\th05\pi_cpp_2.obj bin\th05\pi_asm_2.obj bin\th05\initmain.obj bin\th05\input_s.obj bin\th05\inp_h_w.obj bin\th05\snd_dlym.obj bin\th05\frmdelay.obj bin\th04\cdg_load.obj bin\th05\egcrect.obj bin\th03\hfliplut.obj bin\th04\snd_pmdr.obj bin\th04\snd_mmdr.obj bin\th04\snd_mode.obj
$(CC) $(CFLAGS) $(LARGE_LFLAGS) -DGAME=5 -DBINARY='E' -3 -Z -nbin\th05\ -eMAINE.EXE @&&|
$**
|

14
th04/end/entry.cpp Normal file
View File

@ -0,0 +1,14 @@
#include "platform.h"
#include "master.hpp"
#include "th03/formats/cfg_impl.hpp"
resident_t far* resident;
// ZUN bloat: Should be its own translation unit.
resident_t __seg* near cfg_load_resident_ptr(void)
{
#undef CFG_FN
extern const char CFG_FN[];
cfg_t cfg;
return cfg_load_and_set_resident(cfg, CFG_FN);
}

1
th04/maine_e.cpp Normal file
View File

@ -0,0 +1 @@
#include "th04/end/entry.cpp"

9
th04_maine.asm
View File

@ -26,7 +26,7 @@ include th04/hardware/grppsafx.inc
extern _tolower:proc
extern __ctype:byte
group_01 group CFG_LRES_TEXT, CUTSCENE_TEXT, maine_01_TEXT
group_01 group MAINE_E_TEXT, CUTSCENE_TEXT, maine_01_TEXT
g_SHARED group SHARED, SHARED_
; ===========================================================================
@ -147,9 +147,9 @@ _TEXT ends
; ===========================================================================
CFG_LRES_TEXT segment byte public 'CODE' use16
MAINE_E_TEXT segment byte public 'CODE' use16
@cfg_load_resident_ptr$qv procdesc near
CFG_LRES_TEXT ends
MAINE_E_TEXT ends
; Segment type: Pure code
CUTSCENE_TEXT segment byte public 'CODE' use16
@ -3328,8 +3328,7 @@ aName db 'name',0
.data?
public _resident
_resident dd ?
extern _resident:dword
include libs/master.lib/clip[bss].asm
include libs/master.lib/fil[bss].asm
include libs/master.lib/js[bss].asm

1
th05/maine_e.cpp Normal file
View File

@ -0,0 +1 @@
#include "th04/end/entry.cpp"

9
th05_maine.asm
View File

@ -27,7 +27,7 @@ include th04/hardware/grppsafx.inc
extern _tolower:proc
extern __ctype:byte
group_01 group CFG_LRES_TEXT, CUTSCENE_TEXT, maine_01_TEXT, maine_01__TEXT
group_01 group MAINE_E_TEXT, CUTSCENE_TEXT, maine_01_TEXT, maine_01__TEXT
g_SHARED group SHARED, SHARED_
; ===========================================================================
@ -154,9 +154,9 @@ _TEXT ends
; ===========================================================================
CFG_LRES_TEXT segment byte public 'CODE' use16
MAINE_E_TEXT segment byte public 'CODE' use16
@cfg_load_resident_ptr$qv procdesc near
CFG_LRES_TEXT ends
MAINE_E_TEXT ends
; Segment type: Pure code
CUTSCENE_TEXT segment byte public 'CODE' use16
@ -6648,8 +6648,7 @@ aStf00_bft db 'stf00.bft',0
.data?
public _resident
_resident dd ?
extern _resident:dword
include libs/master.lib/clip[bss].asm
include libs/master.lib/fil[bss].asm
include libs/master.lib/js[bss].asm