Folders

furrtek · Oct 24, 2016 · 995ffca · 995ffca
1 parent 1effaae
commit 995ffca
Show file tree

Hide file tree

Showing 48 changed files with 532 additions and 47 deletions.
diff --git a/gfx.asm → common/gfx.asm b/gfx.asm → common/gfx.asm
diff --git a/gfxutil.asm → common/gfxutil.asm b/gfxutil.asm → common/gfxutil.asm
@@ -398,4 +398,4 @@ RAMtoOAM:
   jr     nz,-
   ret
 
-   .INCLUDE "loadtile.asm"
+   .INCLUDE "common\loadtile.asm"
diff --git a/loadtile.asm → common/loadtile.asm b/loadtile.asm → common/loadtile.asm
diff --git a/ram.asm → common/ram.asm b/ram.asm → common/ram.asm
diff --git a/system.asm → common/system.asm b/system.asm → common/system.asm
diff --git a/eeprom.asm → hwio/eeprom.asm b/eeprom.asm → hwio/eeprom.asm
diff --git a/getee.asm → hwio/getee.asm b/getee.asm → hwio/getee.asm
diff --git a/pots.asm → hwio/pots.asm b/pots.asm → hwio/pots.asm
diff --git a/serial.asm → hwio/serial.asm b/serial.asm → hwio/serial.asm
diff --git a/spi.asm → hwio/spi.asm b/spi.asm → hwio/spi.asm
diff --git a/input_config.asm → input/input_config.asm b/input_config.asm → input/input_config.asm
diff --git a/input_live.asm → input/input_live.asm b/input_live.asm → input/input_live.asm
diff --git a/input_loadsave.asm → input/input_loadsave.asm b/input_loadsave.asm → input/input_loadsave.asm
diff --git a/input_piano.asm → input/input_piano.asm b/input_piano.asm → input/input_piano.asm
diff --git a/input_seq.asm → input/input_seq.asm b/input_seq.asm → input/input_seq.asm
diff --git a/input_table.asm → input/input_table.asm b/input_table.asm → input/input_table.asm
diff --git a/input_xy.asm → input/input_xy.asm b/input_xy.asm → input/input_xy.asm
diff --git a/main.gb b/main.gb
diff --git a/main.s b/main.s
@@ -123,7 +123,7 @@
 
 .BANK 0 SLOT 0
 
-  .INCLUDE "ram.asm"
+  .INCLUDE "common/ram.asm"
 
 .ORG $0000                      ;A=(HL+A) LUT
   add    l
@@ -451,68 +451,68 @@ defaultseq:
   .db $0C,0,0,0
   .db $0C,0,0,0
   .db $0C,0,0,0
-  
+
 cutofflut:
-  .INCBIN "cutofflut.bin"
+  .INCBIN "tables\cutofflut.bin"
 
   .INCLUDE "inittiles.asm"
-  .INCLUDE "serial.asm"
-  .INCLUDE "system.asm"
-  .INCLUDE "gfxutil.asm"
+  .INCLUDE "hwio\serial.asm"
+  .INCLUDE "common\system.asm"
+  .INCLUDE "common\gfxutil.asm"
   .INCLUDE "playback.asm"
   .INCLUDE "play.asm"
   .INCLUDE "draw.asm"
-  .INCLUDE "bpm.asm"
-  .INCLUDE "pots.asm"
+  .INCLUDE "tables\bpm.asm"
+  .INCLUDE "hwio\pots.asm"
   .INCLUDE "screen.asm"
-  .INCLUDE "spi.asm"
-  .INCLUDE "eeprom.asm"
-  .INCLUDE "ss_piano.asm"
-  .INCLUDE "ss_config.asm"
-  .INCLUDE "ss_loadsave.asm"
-  .INCLUDE "ss_credits.asm"
-  .INCLUDE "ss_table.asm"
-  .INCLUDE "ss_live.asm"
-  .INCLUDE "ss_xy.asm"
-  .INCLUDE "ss_seq.asm"
-  .INCLUDE "vbl_credits.asm"
-  .INCLUDE "vbl_loadsave.asm"
-  .INCLUDE "vbl_piano.asm"
-  .INCLUDE "vbl_config.asm"
-  .INCLUDE "vbl_seq.asm"
-  .INCLUDE "vbl_xy.asm"
-  .INCLUDE "vbl_table.asm"
-  .INCLUDE "vbl_live.asm"
-  .INCLUDE "input_table.asm"
-  .INCLUDE "input_piano.asm"
-  .INCLUDE "input_config.asm"
-  .INCLUDE "input_loadsave.asm"
-  .INCLUDE "input_live.asm"
-  .INCLUDE "input_xy.asm"
-  .INCLUDE "input_seq.asm"
+  .INCLUDE "hwio\spi.asm"
+  .INCLUDE "hwio\eeprom.asm"
+  .INCLUDE "setup\ss_piano.asm"
+  .INCLUDE "setup\ss_config.asm"
+  .INCLUDE "setup\ss_loadsave.asm"
+  .INCLUDE "setup\ss_credits.asm"
+  .INCLUDE "setup\ss_table.asm"
+  .INCLUDE "setup\ss_live.asm"
+  .INCLUDE "setup\ss_xy.asm"
+  .INCLUDE "setup\ss_seq.asm"
+  .INCLUDE "vbl\vbl_credits.asm"
+  .INCLUDE "vbl\vbl_loadsave.asm"
+  .INCLUDE "vbl\vbl_piano.asm"
+  .INCLUDE "vbl\vbl_config.asm"
+  .INCLUDE "vbl\vbl_seq.asm"
+  .INCLUDE "vbl\vbl_xy.asm"
+  .INCLUDE "vbl\vbl_table.asm"
+  .INCLUDE "vbl\vbl_live.asm"
+  .INCLUDE "input\input_table.asm"
+  .INCLUDE "input\input_piano.asm"
+  .INCLUDE "input\input_config.asm"
+  .INCLUDE "input\input_loadsave.asm"
+  .INCLUDE "input\input_live.asm"
+  .INCLUDE "input\input_xy.asm"
+  .INCLUDE "input\input_seq.asm"
   .INCLUDE "keyboard.asm"
   .INCLUDE "confirm.asm"
   .INCLUDE "arp.asm"
-  .INCLUDE "paramlist.asm"
+  .INCLUDE "tables\paramlist.asm"
   .INCLUDE "params.asm"
   .INCLUDE "save.asm"
   .INCLUDE "load.asm"
   .INCLUDE "songsave.asm"
   .INCLUDE "songload.asm"
   .INCLUDE "gparams.asm"
-  .INCLUDE "getee.asm"
+  .INCLUDE "hwio\getee.asm"
   .INCLUDE "lfo.asm"
-  .INCLUDE "drums.asm"
-  .INCLUDE "cosine.asm"			;Used for LFO and credits copperbars
-  .INCLUDE "text.asm"
-  .INCLUDE "notelut.asm"
+  .INCLUDE "tables\drums.asm"
+  .INCLUDE "tables\cosine.asm"			;Used for LFO and credits copperbars
+  .INCLUDE "tables\text.asm"
+  .INCLUDE "tables\notelut.asm"
 
 map_keyb:
   .INCBIN "gfx\keyb.map"
 
-  .INCLUDE "softdist.asm"
-  .INCLUDE "harddist.asm"
+  .INCLUDE "tables\softdist.asm"
+  .INCLUDE "tables\harddist.asm"
 
 ;Bankswitched data:
-  .INCLUDE "wavetables.asm"
-  .INCLUDE "mmap.asm"
+  .INCLUDE "tables\wavetables.asm"
+  .INCLUDE "tables\mmap.asm"
-Original file line number
+Diff line change
@@ Expand Up / @@ -398,4 +398,4 @@ RAMtoOAM: @@
       jr     nz,-
       ret
-       .INCLUDE "loadtile.asm"
+       .INCLUDE "common\loadtile.asm"