mirror of
https://github.com/lscharen/iigs-game-engine.git
synced 2024-06-08 03:29:32 +00:00
Reorg some more files and tweak paths
This commit is contained in:
parent
2e11ba74ee
commit
dcf93892a7
|
@ -8,8 +8,8 @@
|
||||||
use EDS.GSOS.MACS.s
|
use EDS.GSOS.MACS.s
|
||||||
use Tool222.Macs.s
|
use Tool222.Macs.s
|
||||||
use Util.Macs.s
|
use Util.Macs.s
|
||||||
use ./GTE.s
|
use ../../src/GTE.s
|
||||||
use ./Defs.s
|
use ../../src/Defs.s
|
||||||
|
|
||||||
mx %00
|
mx %00
|
||||||
|
|
||||||
|
@ -452,6 +452,10 @@ qtRec adrl $0000
|
||||||
PUT font.s
|
PUT font.s
|
||||||
PUT Overlay.s
|
PUT Overlay.s
|
||||||
|
|
||||||
PUT App.TileMapBG0.s
|
PUT gen/App.TileMapBG0.s
|
||||||
PUT App.TileMapBG1.s
|
PUT gen/App.TileMapBG1.s
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,35 +1,36 @@
|
||||||
; IIgs Game Engine
|
; IIgs Game Engine
|
||||||
|
|
||||||
TYP $B3 ; S16 file
|
TYP $B3 ; S16 file
|
||||||
DSK GTETestApp
|
DSK GTETestApp
|
||||||
XPL
|
XPL
|
||||||
|
|
||||||
; Segment #1 -- Main execution block
|
; Segment #1 -- Main execution block
|
||||||
|
|
||||||
ASM App.Main.s
|
ASM App.Main.s
|
||||||
DS 0 ; Number of bytes of 0's to add at the end of the Segment
|
DS 0 ; Number of bytes of 0's to add at the end of the Segment
|
||||||
KND #$1100 ; Type and Attributes ($11=Static+Bank Relative,$00=Code)
|
KND #$1100 ; Type and Attributes ($11=Static+Bank Relative,$00=Code)
|
||||||
ALI None ; Boundary Alignment (None)
|
ALI None ; Boundary Alignment (None)
|
||||||
SNA Main
|
SNA Main
|
||||||
|
|
||||||
; Segment #2 -- Core GTE Code
|
; Segment #2 -- Core GTE Code
|
||||||
|
|
||||||
ASM Core.s
|
ASM ..\..\src\Core.s
|
||||||
SNA Core
|
SNA Core
|
||||||
|
|
||||||
; Segment #3 -- 64KB Tile Memory
|
; Segment #3 -- 64KB Tile Memory
|
||||||
|
|
||||||
ASM App.TileSet.s
|
ASM gen\App.TileSet.s
|
||||||
DS 0
|
DS 0
|
||||||
KND #$1001 ; Type and Attributes ($11=Static+Bank Relative,$01=Data)
|
KND #$1001 ; Type and Attributes ($11=Static+Bank Relative,$01=Data)
|
||||||
; ALI BANK
|
; ALI BANK
|
||||||
SNA Tiles
|
SNA Tiles
|
||||||
|
|
||||||
; Segment #4 -- Rotation table data
|
; Segment #4 -- Rotation table data
|
||||||
|
|
||||||
ASM RotData.s
|
ASM ..\..\src\RotData.s
|
||||||
DS 0
|
DS 0
|
||||||
KND #$1001 ; Type and Attributes ($11=Static+Bank Relative,$01=Data)
|
KND #$1001 ; Type and Attributes ($11=Static+Bank Relative,$01=Data)
|
||||||
ALI BANK
|
ALI BANK
|
||||||
SNA RotData
|
SNA RotData
|
||||||
|
|
||||||
|
|
||||||
|
|
1
demos/shell/_FileInformation.txt
Normal file
1
demos/shell/_FileInformation.txt
Normal file
|
@ -0,0 +1 @@
|
||||||
|
GTETestApp=Type(B3),AuxType(0000),VersionCreate(70),MinVersion(BE),Access(E3),FolderInfo1(000000000000000000000000000000000000),FolderInfo2(000000000000000000000000000000000000)
|
|
@ -5,7 +5,7 @@ REM
|
||||||
REM Pass the path of the Cadius tool as the first argument (%1)
|
REM Pass the path of the Cadius tool as the first argument (%1)
|
||||||
|
|
||||||
set CADIUS="%1"
|
set CADIUS="%1"
|
||||||
set IMAGE="emu\\Target.2mg"
|
set IMAGE="..\\..\\emu\\Target.2mg"
|
||||||
set FOLDER="/GTEDEV/Build"
|
set FOLDER="/GTEDEV/Build"
|
||||||
|
|
||||||
REM Cadius does not overwrite files, so clear the root folder first
|
REM Cadius does not overwrite files, so clear the root folder first
|
||||||
|
|
|
@ -7,22 +7,24 @@
|
||||||
"merlin32": "C:\\Programs\\IIgsXDev\\bin\\Merlin32-1.1.10.exe",
|
"merlin32": "C:\\Programs\\IIgsXDev\\bin\\Merlin32-1.1.10.exe",
|
||||||
"cadius": "C:\\Programs\\IIgsXDev\\bin\\Cadius.exe",
|
"cadius": "C:\\Programs\\IIgsXDev\\bin\\Cadius.exe",
|
||||||
"gsport": "C:\\Programs\\gsport\\gsport_0.31\\GSPort.exe",
|
"gsport": "C:\\Programs\\gsport\\gsport_0.31\\GSPort.exe",
|
||||||
"macros": "C:\\Programs\\BrutalDeluxe\\Merlin32\\Library",
|
"macros": "../../macros",
|
||||||
"crossrunner": "C:\\Programs\\Crossrunner\\Crossrunner.exe"
|
"crossrunner": "C:\\Programs\\Crossrunner\\Crossrunner.exe",
|
||||||
|
"png2iigs": "../../tools/png2iigs.js",
|
||||||
|
"tiled2iigs": "../../tools/tiled2iigs.js"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "npm run build && build-image.bat %npm_package_config_cadius% && %npm_package_config_gsport%",
|
"test": "npm run build && build-image.bat %npm_package_config_cadius% && %npm_package_config_gsport%",
|
||||||
"debug": "%npm_package_config_crossrunner% src\\GTETestApp -Source src\\GTETestApp_S02_MAINSEG_Output.txt -Debug -CompatibilityLayer",
|
"debug": "%npm_package_config_crossrunner% GTETestApp -Source GTETestApp_S02_MAINSEG_Output.txt -Debug -CompatibilityLayer",
|
||||||
"build": "%npm_package_config_merlin32% -V .\\macros src\\App.s",
|
"build": "%npm_package_config_merlin32% -V %npm_package_config_macros% App.s",
|
||||||
"build:watch": "watch \"npm run build\" src",
|
"build:watch": "watch \"npm run build\" src",
|
||||||
"build:assets-smw": "node ./tools/png2iigs.js ./assets/donut-plains-2-8-color.png ./emu/bg1a.bin --start-index 6 && node ./tools/png2iigs.js ./assets/donut-plains-2-8-color-shift.png ./emu/bg1b.bin --start-index 6 && node ./tools/png2iigs.js ./assets/donut-plains-1-6-color.png ./emu/fg1.bin",
|
"build:assets-smw": "node %npm_package_config_png2iigs% ./assets/donut-plains-2-8-color.png ./emu/bg1a.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/donut-plains-2-8-color-shift.png ./emu/bg1b.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/donut-plains-1-6-color.png ./emu/fg1.bin",
|
||||||
"build:assets-fatdog": "node ./tools/png2iigs.js ./assets/armada-7-color.png ./emu/bg1a.bin --start-index 8 && node ./tools/png2iigs.js ./assets/armada-7-color-shift.png ./emu/bg1b.bin --start-index 8 && node ./tools/png2iigs.js ./assets/armada-7-color-shuffle.png ./emu/fg1.bin --start-index 1",
|
"build:assets-fatdog": "node %npm_package_config_png2iigs% ./assets/armada-7-color.png ./emu/bg1a.bin --start-index 8 && node %npm_package_config_png2iigs% ./assets/armada-7-color-shift.png ./emu/bg1b.bin --start-index 8 && node %npm_package_config_png2iigs% ./assets/armada-7-color-shuffle.png ./emu/fg1.bin --start-index 1",
|
||||||
"build:assets-plant": "node ./tools/png2iigs.js ./assets/plant.png ./emu/bg1a.bin --start-index 6 && node ./tools/png2iigs.js ./assets/woz-shifted.png ./emu/bg1b.bin --start-index 6 && node ./tools/png2iigs.js ./assets/donut-plains-1-6-color.png ./emu/fg1.bin",
|
"build:assets-plant": "node %npm_package_config_png2iigs% ./assets/plant.png ./emu/bg1a.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/woz-shifted.png ./emu/bg1b.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/donut-plains-1-6-color.png ./emu/fg1.bin",
|
||||||
"build:assets-woz": "node ./tools/png2iigs.js ./assets/woz.png ./emu/bg1a.bin --start-index 6 && node ./tools/png2iigs.js ./assets/woz-shifted.png ./emu/bg1b.bin --start-index 6 && node ./tools/png2iigs.js ./assets/donut-plains-1-6-color.png ./emu/fg1.bin",
|
"build:assets-woz": "node %npm_package_config_png2iigs% ./assets/woz.png ./emu/bg1a.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/woz-shifted.png ./emu/bg1b.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/donut-plains-1-6-color.png ./emu/fg1.bin",
|
||||||
"build:assets-woz-fatbits": "node ./tools/png2iigs.js ./assets/woz-pixelated.png ./emu/bg1a.bin --start-index 6 && node ./tools/png2iigs.js ./assets/woz-shifted.png ./emu/bg1b.bin --start-index 6 && node ./tools/png2iigs.js ./assets/donut-plains-1-6-color.png ./emu/fg1.bin",
|
"build:assets-woz-fatbits": "node %npm_package_config_png2iigs% ./assets/woz-pixelated.png ./emu/bg1a.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/woz-shifted.png ./emu/bg1b.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/donut-plains-1-6-color.png ./emu/fg1.bin",
|
||||||
"build:assets-color-cycle": "node ./tools/png2iigs.js ./assets/rotopattern.png ./emu/bg1a.bin --start-index 6 && node ./tools/png2iigs.js ./assets/woz-shifted.png ./emu/bg1b.bin --start-index 6 && node ./tools/png2iigs.js ./assets/donut-plains-1-6-color.png ./emu/fg1.bin",
|
"build:assets-color-cycle": "node %npm_package_config_png2iigs% ./assets/rotopattern.png ./emu/bg1a.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/woz-shifted.png ./emu/bg1b.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/donut-plains-1-6-color.png ./emu/fg1.bin",
|
||||||
"build:map": "node ./tools/tiled2iigs.js ./assets/tiled/world_1-1.json --output-dir ./src",
|
"build:map": "node %npm_package_config_tiled2iigs% ./assets/tiled/world_1-1.json --output-dir ./gen",
|
||||||
"build:tiles": "node ./tools/png2iigs.js ./assets/tilesets/smb-16.png --as-tile-data > src/App.TileSet.s"
|
"build:tiles": "node %npm_package_config_png2iigs% ./assets/tilesets/smb-16.png --as-tile-data > ./gen/App.TileSet.s"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
|
|
@ -363,7 +363,7 @@ ReadControl ENT
|
||||||
pla
|
pla
|
||||||
rtl
|
rtl
|
||||||
|
|
||||||
put App.Init.s
|
put Memory.s
|
||||||
put Graphics.s
|
put Graphics.s
|
||||||
put Render.s
|
put Render.s
|
||||||
put Timer.s
|
put Timer.s
|
||||||
|
@ -378,3 +378,4 @@ ReadControl ENT
|
||||||
put blitter/BG0.s
|
put blitter/BG0.s
|
||||||
put blitter/BG1.s
|
put blitter/BG1.s
|
||||||
put TileMap.s
|
put TileMap.s
|
||||||
|
|
||||||
|
|
|
@ -143,3 +143,4 @@ AllocOneBank2 PushLong #0
|
||||||
_Deref
|
_Deref
|
||||||
rts
|
rts
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user