Skip to content

Commit

Permalink
Everything adapted to the latest z88dk!
Browse files Browse the repository at this point in the history
  • Loading branch information
mojontwins committed Jun 29, 2021
1 parent 229ff12 commit 61910e6
Show file tree
Hide file tree
Showing 103 changed files with 3,262 additions and 1,062 deletions.
5 changes: 2 additions & 3 deletions examples/dogmole/dev/setenv.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@echo off
set Z88DK_PATH=c:\z88dk10
set PATH=%Z88DK_PATH%\bin;%PATH%
set Z88DK_PATH=c:\z88dk
set PATH=%Z88DK_PATH%\bin.x86;%PATH%
set Z80_OZFILES=%Z88DK_PATH%\Lib\
set ZCCCFG=%Z88DK_PATH%\Lib\Config\
zcc
5 changes: 2 additions & 3 deletions examples/dogmole_ci/dev/setenv.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@echo off
set Z88DK_PATH=c:\z88dk10
set PATH=%Z88DK_PATH%\bin;%PATH%
set Z88DK_PATH=c:\z88dk
set PATH=%Z88DK_PATH%\bin.x86;%PATH%
set Z80_OZFILES=%Z88DK_PATH%\Lib\
set ZCCCFG=%Z88DK_PATH%\Lib\Config\
zcc
5 changes: 2 additions & 3 deletions examples/goddess/dev/setenv.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@echo off
set Z88DK_PATH=c:\z88dk10
set PATH=%Z88DK_PATH%\bin;%PATH%
set Z88DK_PATH=c:\z88dk
set PATH=%Z88DK_PATH%\bin.x86;%PATH%
set Z80_OZFILES=%Z88DK_PATH%\Lib\
set ZCCCFG=%Z88DK_PATH%\Lib\Config\
zcc
85 changes: 0 additions & 85 deletions examples/goddess/dev/wyzplayer.h

This file was deleted.

5 changes: 2 additions & 3 deletions examples/goku_mal/dev/setenv.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@echo off
set Z88DK_PATH=c:\z88dk10
set PATH=%Z88DK_PATH%\bin;%PATH%
set Z88DK_PATH=c:\z88dk
set PATH=%Z88DK_PATH%\bin.x86;%PATH%
set Z80_OZFILES=%Z88DK_PATH%\Lib\
set ZCCCFG=%Z88DK_PATH%\Lib\Config\
zcc
85 changes: 0 additions & 85 deletions examples/goku_mal/dev/wyzplayer.h

This file was deleted.

5 changes: 2 additions & 3 deletions examples/helmet/dev/setenv.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@echo off
set Z88DK_PATH=c:\z88dk10
set PATH=%Z88DK_PATH%\bin;%PATH%
set Z88DK_PATH=c:\z88dk
set PATH=%Z88DK_PATH%\bin.x86;%PATH%
set Z80_OZFILES=%Z88DK_PATH%\Lib\
set ZCCCFG=%Z88DK_PATH%\Lib\Config\
zcc
85 changes: 0 additions & 85 deletions examples/helmet/dev/wyzplayer.h

This file was deleted.

Binary file not shown.
2 changes: 1 addition & 1 deletion trash/6baddies/dev/assets/levels.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ extern unsigned char font [0];
._font BINARY "font.bin"
#endasm

extern LEVELHEADER level_data [0];
extern LEVELHEADER level_data;
#asm
._level_data defs 16
#endasm
Expand Down
5 changes: 3 additions & 2 deletions trash/6baddies/dev/compile.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

if [%1]==[help] goto :help

set game=lala_beta
set game=6baddies

if [%1]==[justcompile] goto :compile
if [%1]==[clean] goto :clean
Expand Down Expand Up @@ -66,7 +66,8 @@ rem cd ..\dev

:compile
echo Compilando guego
zcc +zx -vn mk1.c -o %game%.bin -lsplib2_mk2.lib -zorg=24000 > nul
zcc +zx -vn mk1.c -O3 -crt0=crt.asm -o %game%.bin -lsplib2_mk2.lib -zorg=24000 > nul
rem zcc +zx -vn mk1.c -o %game%.bin -lsplib2_mk2.lib -zorg=24000 > nul
..\utils\printsize.exe %game%.bin
..\utils\printsize.exe scripts.bin

Expand Down
17 changes: 17 additions & 0 deletions trash/6baddies/dev/crt.asm
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
MODULE zx82_crt0
INCLUDE "zcc_opt.def"
XREF _main ; main() is always external to crt0 code

IF !STACKPTR
defc STACKPTR = $FFFF
ENDIF
IF !CRT_ORG_CODE
defc CRT_ORG_CODE = 32768
ENDIF

org CRT_ORG_CODE

start:
ld sp,STACKPTR
jp _main
7 changes: 4 additions & 3 deletions trash/6baddies/dev/definitions.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
.fsClipStruct defb 0, 24, 0, 32
#endasm

void *joyfunc = sp_JoyKeyboard; // Puntero a la función de manejo seleccionada.
//void *joyfunc = sp_JoyKeyboard; // Puntero a la función de manejo seleccionada.
unsigned int (*joyfunc)(struct sp_UDK *) = sp_JoyKeyboard;

const void *joyfuncs [] = {
sp_JoyKeyboard, sp_JoyKempston, sp_JoySinclair1
Expand Down Expand Up @@ -56,7 +57,7 @@ unsigned char enoffs;
// Aux

char asm_number;
unsigned int asm_int;
unsigned int asm_int @ 23302;
unsigned int asm_int_2;
unsigned int seed;
unsigned char half_life;
Expand Down Expand Up @@ -118,7 +119,7 @@ unsigned char p_tx, p_ty;
#endif
signed int ptgmx, ptgmy;

const unsigned char *spacer = " ";
unsigned char *spacer = " ";

unsigned char enit;

Expand Down
8 changes: 4 additions & 4 deletions trash/6baddies/dev/engine/c_levels.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ void prepare_level (void) {
#endif
{
n_pant = level_data.scr_ini;
gpx = level_data->ini_x << 4; p_x = gpx << 6;
gpy = level_data->ini_y << 4; p_y = gpy << 6;
gpx = level_data.ini_x << 4; p_x = gpx << 6;
gpy = level_data.ini_y << 4; p_y = gpy << 6;
}

#ifdef ACTIVATE_SCRIPTING
Expand All @@ -27,8 +27,8 @@ void prepare_level (void) {
unpack ((unsigned int) levels [level].c_sprites, (unsigned int) (sprites + 16));
#endif

level_data->map_w = levels [level].map_w;
level_data->map_h = levels [level].map_h;
level_data.map_w = levels [level].map_w;
level_data.map_h = levels [level].map_h;

#ifdef ACTIVATE_SCRIPTING
if (script_result != 3)
Expand Down
Loading

0 comments on commit 61910e6

Please sign in to comment.