commit e210b40e0b762e9af1e013d6dd3024fddf99de8c parent fd5c8a9ca4d9df24611cb3377b63a6b6fcf1abed Author: CrashOveride95 <40003130+CrashOveride95@users.noreply.github.com> Date: Sat, 21 Nov 2020 11:43:18 -0500 Merge pull request #2 from Erick194/main Merge from master Diffstat:
118 files changed, 124 insertions(+), 80 deletions(-)
diff --git a/.gitignore b/.gitignore @@ -0,0 +1,9 @@ +# Code +/doom64/*.o +# Assets +/doom64/Data/doom64.wmd +/doom64/Data/doom64.wsd +/doom64/Data/doom64.wdd +/doom64/Data/doom64.wad + +!doom64/WESSLIB.obj +\ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md @@ -1,6 +1,5 @@ -= DOOM64-RE contributors (sorted alphabetically) -= +## DOOM64-RE contributors (sorted alphabetically) * **[Darragh Coy (intacowetrust)](https://github.com/BodbDearg)** @@ -16,8 +15,8 @@ * Doom64-EX source code (DOOM 64 was based on PSX DOOM, thus can serve as a reference point for it): https://github.com/svkaiser/Doom64EX -= DOOM64-RE hardware testers (sorted alphabetically) -= +## DOOM64-RE hardware testers (sorted alphabetically) + * ** [CrashOveride] (https://github.com/CrashOveride95)** * ** [Immorpher] (Doom 64 Discord: https://discord.gg/Ktxz8nz)** * ** [sector666] (Kex Engine Discord: https://discord.gg/4gVTcD5)** diff --git a/Doom 64/spec b/Doom 64/spec @@ -1,74 +0,0 @@ -#include "i_main.h" - -/* - * ROM spec file - */ -beginseg - name "code" - flags BOOT OBJECT - entry I_Start - stack bootStack + STACKSIZE - include "codesegment.o" - include "$(ROOT)/usr/lib/PR/rspboot.o" - //include "$(ROOT)/usr/lib/PR/gspF3DLX.NoN.fifo.o" - include "$(ROOT)/usr/lib/PR/gspF3DEX.NoN.fifo.o" - include "$(ROOT)/usr/lib/PR/gspL3DEX.fifo.o" - include "$(ROOT)/usr/lib/PR/aspMain.o" -endseg - -beginseg - name "mem_heap" - flags OBJECT - after "code" - include "mem_heap.o" -endseg - -beginseg - name "audio_heap" - flags OBJECT - after "mem_heap" - include "audio_heap.o" -endseg - -beginseg - name "cfb" - flags OBJECT - after "audio_heap" - include "cfb.o" -endseg - -beginseg - name "doom64_wad" - flags RAW - include "C:\Doom 64\Data\doom64.wad" -endseg - -beginseg - name "doom64_wmd" - flags RAW - include "C:\Doom 64\Data\doom64.wmd" -endseg - -beginseg - name "doom64_wsd" - flags RAW - include "C:\Doom 64\Data\doom64.wsd" -endseg - -beginseg - name "doom64_wdd" - flags RAW - include "C:\Doom 64\Data\doom64.wdd" -endseg - -beginwave - name "doom64" - include "code" - include "mem_heap" - include "audio_heap" - include "cfb" - include "doom64_wad" - include "doom64_wmd" - include "doom64_wsd" - include "doom64_wdd" -endwave diff --git a/README.md b/README.md @@ -9,7 +9,7 @@ You can also go to this link if it is of your own interest https://n64.dev/ To compile it is required to use Windows xp, you can also use virtual machine for such purposes -Once the N64SDK is installed, copy the "Doom 64" folder to the root "C:" of your hard drive. +Once the N64SDK is installed, copy the "doom64" folder to the root "C:" of your hard drive. For now it is compatible with the USA version of Doom 64. Of course, before compiling you need the data of the original Doom64 (DOOM64.WAD | DOOM64.WMD | DOOM64.WSD | DOOM64.WDD). @@ -19,7 +19,7 @@ If you can't get the rom in "z64" format there is a file in the Tools folder tha Finally you run the MAKE_ROM.bat file to compile and obtain a file called doom64.n64 ## Notes -The project is created with CodeBlocks, although it does not serve to compile, but to have the code in order and verification. +The project was created with CodeBlocks, although it does not serve to compile, but to have the code in order and verification. You can also use the WESSLIB.obj from the original Mortal Kombat Trilogy n64 and not use the code rebuilt by me. For this go to the file "wessarc.h" and remove the slashes from the text "//#define NOUSEWESSCODE" it should look like this "#define NOUSEWESSCODE". diff --git a/Doom 64/DOOM64.cbp b/doom64/DOOM64.cbp diff --git a/Doom 64/Data/tmp.txt b/doom64/Data/tmp.txt diff --git a/doom64/MAKE_ROM.bat b/doom64/MAKE_ROM.bat @@ -0,0 +1,35 @@ +@echo off + +::Set Main Root: + +set ROOT=c:\ultra + +::Setup GCC: +set gccdir=%ROOT%\gcc +path %gccdir%\mipse\bin;%path% +set gccsw=-mips3 -mgp32 -mfp32 -funsigned-char -D_LANGUAGE_C -D_ULTRA64 -D__EXTENSIONS__ +set n64align=on +set GCC_CELF=ON + +::Setup LIB: +path %root%\usr\sbin;%path% + +rem set Microsoft Visual C Ver 4.2 install directory +rem set MSVC=d:\msvc + +rem set Borland C Ver 5.0 install directory +rem set BCC=d:\bc5 + +::Set mypath: +cd %mypath% + +@echo on + +make + +@echo off +::remove_all: + del *.o +@echo on + +pause diff --git a/Doom 64/Makefile b/doom64/Makefile diff --git a/Doom 64/Tools/Doom64Extractor.zip b/doom64/Tools/Doom64Extractor.zip Binary files differ. diff --git a/Doom 64/Tools/Tool64_v1.11.zip b/doom64/Tools/Tool64_v1.11.zip Binary files differ. diff --git a/Doom 64/WESSLIB.obj b/doom64/WESSLIB.obj Binary files differ. diff --git a/Doom 64/__elfcom.c b/doom64/__elfcom.c diff --git a/Doom 64/am_main.c b/doom64/am_main.c diff --git a/Doom 64/asci.c b/doom64/asci.c diff --git a/Doom 64/asm.h b/doom64/asm.h diff --git a/Doom 64/audio.c b/doom64/audio.c diff --git a/Doom 64/audio.h b/doom64/audio.h diff --git a/Doom 64/audio_heap.c b/doom64/audio_heap.c diff --git a/Doom 64/c_convert.c b/doom64/c_convert.c diff --git a/Doom 64/cfb.c b/doom64/cfb.c diff --git a/Doom 64/d_main.c b/doom64/d_main.c diff --git a/Doom 64/d_screens.c b/doom64/d_screens.c diff --git a/Doom 64/decodes.c b/doom64/decodes.c diff --git a/Doom 64/doomdata.h b/doom64/doomdata.h diff --git a/Doom 64/doomdef.h b/doom64/doomdef.h diff --git a/Doom 64/doominfo.c b/doom64/doominfo.c diff --git a/Doom 64/doominfo.h b/doom64/doominfo.h diff --git a/Doom 64/doomlib.c b/doom64/doomlib.c diff --git a/Doom 64/f_main.c b/doom64/f_main.c diff --git a/Doom 64/funqueue.c b/doom64/funqueue.c diff --git a/Doom 64/funqueue.h b/doom64/funqueue.h diff --git a/Doom 64/g_game.c b/doom64/g_game.c diff --git a/Doom 64/graph.c b/doom64/graph.c diff --git a/Doom 64/graph.h b/doom64/graph.h diff --git a/Doom 64/i_main.c b/doom64/i_main.c diff --git a/Doom 64/i_main.h b/doom64/i_main.h diff --git a/Doom 64/in_main.c b/doom64/in_main.c diff --git a/Doom 64/m_bbox.c b/doom64/m_bbox.c diff --git a/Doom 64/m_fixed.c b/doom64/m_fixed.c diff --git a/Doom 64/m_fixed_s.s b/doom64/m_fixed_s.s diff --git a/Doom 64/m_main.c b/doom64/m_main.c diff --git a/Doom 64/m_password.c b/doom64/m_password.c diff --git a/Doom 64/mem_heap.c b/doom64/mem_heap.c diff --git a/Doom 64/n64cmd.c b/doom64/n64cmd.c diff --git a/Doom 64/n64cmd.h b/doom64/n64cmd.h diff --git a/Doom 64/p_base.c b/doom64/p_base.c diff --git a/Doom 64/p_ceilng.c b/doom64/p_ceilng.c diff --git a/Doom 64/p_change.c b/doom64/p_change.c diff --git a/Doom 64/p_doors.c b/doom64/p_doors.c diff --git a/Doom 64/p_enemy.c b/doom64/p_enemy.c diff --git a/Doom 64/p_floor.c b/doom64/p_floor.c diff --git a/Doom 64/p_inter.c b/doom64/p_inter.c diff --git a/Doom 64/p_lights.c b/doom64/p_lights.c diff --git a/Doom 64/p_local.h b/doom64/p_local.h diff --git a/Doom 64/p_macros.c b/doom64/p_macros.c diff --git a/Doom 64/p_map.c b/doom64/p_map.c diff --git a/Doom 64/p_maputl.c b/doom64/p_maputl.c diff --git a/Doom 64/p_misc.c b/doom64/p_misc.c diff --git a/Doom 64/p_mobj.c b/doom64/p_mobj.c diff --git a/Doom 64/p_move.c b/doom64/p_move.c diff --git a/Doom 64/p_plats.c b/doom64/p_plats.c diff --git a/Doom 64/p_pspr.c b/doom64/p_pspr.c diff --git a/Doom 64/p_setup.c b/doom64/p_setup.c diff --git a/Doom 64/p_shoot.c b/doom64/p_shoot.c diff --git a/Doom 64/p_sight.c b/doom64/p_sight.c diff --git a/Doom 64/p_slide.c b/doom64/p_slide.c diff --git a/Doom 64/p_spec.c b/doom64/p_spec.c diff --git a/Doom 64/p_spec.h b/doom64/p_spec.h diff --git a/Doom 64/p_switch.c b/doom64/p_switch.c diff --git a/Doom 64/p_telept.c b/doom64/p_telept.c diff --git a/Doom 64/p_tick.c b/doom64/p_tick.c diff --git a/Doom 64/p_user.c b/doom64/p_user.c diff --git a/Doom 64/r_data.c b/doom64/r_data.c diff --git a/Doom 64/r_local.h b/doom64/r_local.h diff --git a/Doom 64/r_main.c b/doom64/r_main.c diff --git a/Doom 64/r_phase1.c b/doom64/r_phase1.c diff --git a/Doom 64/r_phase2.c b/doom64/r_phase2.c diff --git a/Doom 64/r_phase3.c b/doom64/r_phase3.c diff --git a/Doom 64/regdef.h b/doom64/regdef.h diff --git a/Doom 64/s_sound.c b/doom64/s_sound.c diff --git a/Doom 64/seqload.c b/doom64/seqload.c diff --git a/Doom 64/seqload.h b/doom64/seqload.h diff --git a/Doom 64/seqloadl.c b/doom64/seqloadl.c diff --git a/Doom 64/seqloadr.c b/doom64/seqloadr.c diff --git a/Doom 64/soundhw.h b/doom64/soundhw.h diff --git a/Doom 64/sounds.h b/doom64/sounds.h diff --git a/doom64/spec b/doom64/spec @@ -0,0 +1,74 @@ +#include "i_main.h" + +/* + * ROM spec file + */ +beginseg + name "code" + flags BOOT OBJECT + entry I_Start + stack bootStack + STACKSIZE + include "codesegment.o" + include "$(ROOT)/usr/lib/PR/rspboot.o" + //include "$(ROOT)/usr/lib/PR/gspF3DLX.NoN.fifo.o" + include "$(ROOT)/usr/lib/PR/gspF3DEX.NoN.fifo.o" + include "$(ROOT)/usr/lib/PR/gspL3DEX.fifo.o" + include "$(ROOT)/usr/lib/PR/aspMain.o" +endseg + +beginseg + name "mem_heap" + flags OBJECT + after "code" + include "mem_heap.o" +endseg + +beginseg + name "audio_heap" + flags OBJECT + after "mem_heap" + include "audio_heap.o" +endseg + +beginseg + name "cfb" + flags OBJECT + after "audio_heap" + include "cfb.o" +endseg + +beginseg + name "doom64_wad" + flags RAW + include "Data/doom64.wad" +endseg + +beginseg + name "doom64_wmd" + flags RAW + include "Data/doom64.wmd" +endseg + +beginseg + name "doom64_wsd" + flags RAW + include "Data/doom64.wsd" +endseg + +beginseg + name "doom64_wdd" + flags RAW + include "Data/doom64.wdd" +endseg + +beginwave + name "doom64" + include "code" + include "mem_heap" + include "audio_heap" + include "cfb" + include "doom64_wad" + include "doom64_wmd" + include "doom64_wsd" + include "doom64_wdd" +endwave diff --git a/Doom 64/sprinfo.c b/doom64/sprinfo.c diff --git a/Doom 64/st_main.c b/doom64/st_main.c diff --git a/Doom 64/st_main.h b/doom64/st_main.h diff --git a/Doom 64/stdarg.h b/doom64/stdarg.h diff --git a/Doom 64/tables.c b/doom64/tables.c diff --git a/Doom 64/vsprintf.c b/doom64/vsprintf.c diff --git a/Doom 64/w_wad.c b/doom64/w_wad.c diff --git a/Doom 64/wessapi.c b/doom64/wessapi.c diff --git a/Doom 64/wessapi.h b/doom64/wessapi.h diff --git a/Doom 64/wessapic.c b/doom64/wessapic.c diff --git a/Doom 64/wessapim.c b/doom64/wessapim.c diff --git a/Doom 64/wessapip.c b/doom64/wessapip.c diff --git a/Doom 64/wessapit.c b/doom64/wessapit.c diff --git a/Doom 64/wessarc.c b/doom64/wessarc.c diff --git a/Doom 64/wessarc.h b/doom64/wessarc.h diff --git a/Doom 64/wessedit.c b/doom64/wessedit.c diff --git a/Doom 64/wessedit.h b/doom64/wessedit.h diff --git a/Doom 64/wessfade.c b/doom64/wessfade.c diff --git a/Doom 64/wessfade.h b/doom64/wessfade.h diff --git a/Doom 64/wesshand.c b/doom64/wesshand.c diff --git a/Doom 64/wesshand.h b/doom64/wesshand.h diff --git a/Doom 64/wessint_s.h b/doom64/wessint_s.h diff --git a/Doom 64/wessint_s.s b/doom64/wessint_s.s diff --git a/Doom 64/wessseq.c b/doom64/wessseq.c diff --git a/Doom 64/wessseq.h b/doom64/wessseq.h diff --git a/Doom 64/wessshell.c b/doom64/wessshell.c diff --git a/Doom 64/wessshell.h b/doom64/wessshell.h diff --git a/Doom 64/wesstrak.c b/doom64/wesstrak.c diff --git a/Doom 64/wesstrak.h b/doom64/wesstrak.h diff --git a/Doom 64/wesstwek.c b/doom64/wesstwek.c diff --git a/Doom 64/z_zone.c b/doom64/z_zone.c