From c6bc9014c10858b8cfd482289c9691b11ef6ad39 Mon Sep 17 00:00:00 2001 From: Miquel Sabaté Solà Date: Mon, 1 Apr 2024 17:48:55 +0200 Subject: Move assets into a global directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miquel Sabaté Solà --- assets/basic.chr | Bin 0 -> 8192 bytes assets/diskun.chr | Bin 0 -> 8192 bytes assets/space.chr | Bin 0 -> 8192 bytes basics/assets/background.nam | Bin 1024 -> 0 bytes basics/assets/basic.chr | Bin 8192 -> 0 bytes basics/chr-ram.s | 2 +- basics/sprite.s | 2 +- scroll/assets/nexxt-session.nss | 186 ---------------------------------------- scroll/assets/scroll.chr | Bin 8192 -> 0 bytes space/assets/background.nam | Bin 1024 -> 0 bytes space/assets/space.chr | Bin 8192 -> 0 bytes space/src/space.s | 2 +- 12 files changed, 3 insertions(+), 189 deletions(-) create mode 100644 assets/basic.chr create mode 100644 assets/diskun.chr create mode 100644 assets/space.chr delete mode 100644 basics/assets/background.nam delete mode 100644 basics/assets/basic.chr delete mode 100644 scroll/assets/nexxt-session.nss delete mode 100644 scroll/assets/scroll.chr delete mode 100644 space/assets/background.nam delete mode 100644 space/assets/space.chr diff --git a/assets/basic.chr b/assets/basic.chr new file mode 100644 index 0000000..ee1f47a Binary files /dev/null and b/assets/basic.chr differ diff --git a/assets/diskun.chr b/assets/diskun.chr new file mode 100644 index 0000000..3ed0dc4 Binary files /dev/null and b/assets/diskun.chr differ diff --git a/assets/space.chr b/assets/space.chr new file mode 100644 index 0000000..d430508 Binary files /dev/null and b/assets/space.chr differ diff --git a/basics/assets/background.nam b/basics/assets/background.nam deleted file mode 100644 index ea228ff..0000000 Binary files a/basics/assets/background.nam and /dev/null differ diff --git a/basics/assets/basic.chr b/basics/assets/basic.chr deleted file mode 100644 index ee1f47a..0000000 Binary files a/basics/assets/basic.chr and /dev/null differ diff --git a/basics/chr-ram.s b/basics/chr-ram.s index c2fdfe9..9c29ac1 100644 --- a/basics/chr-ram.s +++ b/basics/chr-ram.s @@ -29,7 +29,7 @@ .segment "BANK0" -chr: .incbin "assets/basic.chr" +chr: .incbin "../assets/basic.chr" .segment "BANK1" .segment "BANK2" diff --git a/basics/sprite.s b/basics/sprite.s index 944c429..4e9c573 100644 --- a/basics/sprite.s +++ b/basics/sprite.s @@ -599,4 +599,4 @@ irq: ;; of the scope of this file and my expertise, to be honest. ;;; .segment "CHARS" - .incbin "assets/basic.chr" + .incbin "../assets/basic.chr" diff --git a/scroll/assets/nexxt-session.nss b/scroll/assets/nexxt-session.nss deleted file mode 100644 index 003ee87..0000000 --- a/scroll/assets/nexxt-session.nss +++ /dev/null @@ -1,186 +0,0 @@ -NSTssTXT - -BtnTiles=1 -BtnChecker=0 -BtnSelTiles=0 -BtnChrBank1=1 -BtnChrBank2=0 -BtnGridAll=0 -BtnGridTile=0 -BtnGridAtr=1 -BtnGridBlock=0 -BtnGridScr=0 -BtnPal=1 -BtnTypeIn=0 -BtnFrameAll=1 -BtnFrameSelected=0 -BtnFrameNone=0 -BtnSpriteSnap=0 -BtnSprite8x16=0 -BtnForce8x16=1 -MenuBestOffsets=0 -MenuLossy=0 -MenuThreshold=0 -MenuNoColorData=0 -MenuMetaSprAutoInc=0 -MenuMetaSprSkipZero=0 -MenuMetaSprMerge=0 -MenuSaveIncName=1 -MenuSaveIncAttr=1 -MenuSaveRLE=0 -VarTileViewTagBuf=0 -VarBgPalCur=2 -VarPalActive=0 -VarTileActive=18 -VarBankActive=0 -VarPPUMask=0 -VarPPUMaskSet0=0 -VarPPUMaskSet1=0 -VarPPUMaskSet2=0 -VarPPUMaskSet3=0 -VarPalBank=0 -VarMetaSpriteActive=0 -VarSpriteActive=0 -VarSpriteGridX=64 -VarSpriteGridY=64 -VarNameW=32 -VarNameH=30 -VarNameViewX=0 -VarNameViewY=-1 -VarNameSelectionL=-1 -VarNameSelectionR=0 -VarNameSelectionT=-1 -VarNameSelectionB=0 -VarNameCopyW=-1 -VarNameCopyH=-1 -VarCHRSelectionL=2 -VarCHRSelectionR=3 -VarCHRSelectionT=1 -VarCHRSelectionB=2 -VarCHRCopyW=1 -VarCHRCopyH=1 -VarCHRCopyRect=1 -VarCHRSelectRect=1 -VarCHRBanks=4 -VarCHRBanksUndo=4 -VarCheckpoint_CHRBanks=4 -VarCheckpoint_CHRBanksUndo=4 - - -VarCHRSelected=00[12]0100[ed] - - -Palette=11280f301101213111061626110919290f1121310f1222320f1323330f1424340f1525350f1626360f1727370f1828380f1929390f1a2a3a0f1b2b3b0f1c2c3c - - -PalUndo=11280f301101213111061626110919290f1121310f1222320f1323330f1424340f1525350f1626360f1727370f1828380f1929390f1a2a3a0f1b2b3b0f1c2c3c - - -CHRMain=00[12]1f3f312e2d6e003f60404e51d29100[2]f8fc8c74b47600fc0602728a4b8900[e0]797f3f1f3f7e7c008680c0604081837c8efefcf8fcfe7e00710103060201817e00[ee0]102022bae6e1c0[2]ff[3]67599ebf[2]c1c3c684fc[2]0e02bfbebd7b[2]07f3fdf111[2]1f10[3]ff0fef[6]e01f10[2]f010[3]ffe0ef[6]0f7fbfdfeff0[4]804020100f[4]f0[4]ff[4]0f[4]1f3f7fff[5]0f[4]0103070fff[4]0f[4]f7fbfdfeff[8]00[f70] - - -CHRCopy=8efefcf8fcfe7e00710103060201817e1f10[2]f010[3]ffe0ef[6]0f7fbfdfeff0[4]804020100f[4]f0[4]ff[4]0f[4]1f3f7fff[5]0f[4]0103070fff[4]0f[4]f7fbfdfeff[8]00[fa0] - - -CHRUndo=00[12]1f3f312e2d6e003f60404e51d29100[2]f8fc8c74b47600fc0602728a4b8900[e0]797f3f1f3f7e7c008680c0604081837c00[ef0]102022bae6e1c0[2]ff[3]67599ebf[2]c1c3c684fc[2]0e02bfbebd7b[2]07f3fdf111[2]1f10[3]ff0fef[6]e01f10[2]f010[3]ffe0ef[6]0f7fbfdfeff0[4]804020100f[4]f0[4]ff[4]0f[4]1f3f7fff[5]0f[4]0103070fff[4]0f[4]f7fbfdfeff[8]00[f70] - - -NameTable=00[3c0] - - -NameCopy=00[3c0] - - -NameUndo=00[3c0] - - -AttrTable=00[40] - - -AttrCopy=00[40] - - -AttrUndo=00[40] - - -MetaSprites=ff[10000] - - -32_TileCollisionProperties=00000000[200] - - -32_TileCollisionPropertiesUndo=00000000[200] - - -PropertyConditions=1[2]0[2]1[2]0[2]1[2]0[2]1[2]0[2]1[2]0[2]1[2]0[2]1[2]0[2]1[2]0[2] - - -PropertyConditionsUndo=1[2]0[2]1[2]0[2]1[2]0[2]1[2]0[2]1[2]0[2]1[2]0[2]1[2]0[2]1[2]0[2] - - -TilePropConditionType=00[7]02 - - -TilePropConditionTypeUndo=00[7]02 - - -Checkpoint_Palette=00[40] - - -Checkpoint_PalUndo=00[40] - - -Checkpoint_CHRMain=00[2000] - - -Checkpoint_CHRUndo=00[2000] - - -Checkpoint_NameTable=00[3c0] - - -Checkpoint_NameUndo=00[3c0] - - -Checkpoint_AttrTable=00[40] - - -Checkpoint_AttrUndo=00[40] - - -Checkpoint_MetaSprites=ff[10000] - - -Checkpoint_32_TileCollisionProperties=00000000[200] - - -Checkpoint_32_TileCollisionPropertiesUndo=00000000[200] - - -Checkpoint_PropertyConditions=[20] - - -Checkpoint_PropertyConditionsUndo=[20] - - -Checkpoint_TilePropConditionType=00[7]02 - - -Checkpoint_TilePropConditionTypeUndo=00[7]02 -propertyCHRlabel0=solid -propertyCHRlabel1=dangerous -propertyCHRlabel2=unlabeled2 -propertyCHRlabel3=unlabeled3 -propertyCHRlabel4=unlabeled4 -propertyCHRlabel5=unlabeled5 -propertyCHRlabel6=escape bit -propertyCHRlabel7=global condition -MetaSpriteBankName=session - -FilterCHR=0 -FilterName=1 -FileNameCHR=Z:\home\mssola\src\github.com\mssola\NES\scroll\assets\scroll -FileNameName= -FileNamePal= -FileNameMetaSpriteBank= -FileNameTileProps= diff --git a/scroll/assets/scroll.chr b/scroll/assets/scroll.chr deleted file mode 100644 index 3ed0dc4..0000000 Binary files a/scroll/assets/scroll.chr and /dev/null differ diff --git a/space/assets/background.nam b/space/assets/background.nam deleted file mode 100644 index ea228ff..0000000 Binary files a/space/assets/background.nam and /dev/null differ diff --git a/space/assets/space.chr b/space/assets/space.chr deleted file mode 100644 index d430508..0000000 Binary files a/space/assets/space.chr and /dev/null differ diff --git a/space/src/space.s b/space/src/space.s index c6d431f..675aaa2 100644 --- a/space/src/space.s +++ b/space/src/space.s @@ -26,7 +26,7 @@ .addr nmi, reset, irq .segment "CHARS" - .incbin "../assets/space.chr" + .incbin "../../assets/space.chr" .segment "STARTUP" -- cgit v1.2.3