restructured project on top of ISSOtm's gb-boilerplate

Author: NotImplementedLife

Makefile

@@ -109,11 +109,6 @@ endif
 # "Source" assets can thus be safely stored there without `make clean` removing them
 VPATH := $(SRCDIR)
 
-# Define how to compress files using the PackBits16 codec
-# Compressor script requires Python 3
-$(RESDIR)/%.pb16: $(SRCDIR)/tools/pb16.py $(RESDIR)/%
-	@$(MKDIR_P) $(@D)
-	$^ $@
 
 # Catch non-existent files
 # KEEP THIS LAST!!

README.md

@@ -3,7 +3,7 @@
 _Why Can't I Find An Intuitive Usage For The Tiles?_
 
 This repo is part of [HomebrewOwl.GB](https://github.com/NotImplementedLife/HomebrewOwl.GB "HomebrewOwl") projects collection.
-Download the latest version [here](https://github.com/NotImplementedLife/rubik/releases/download/1.2/rubik_1_2.gb)
+Download the latest version [here](https://github.com/NotImplementedLife/rubik/releases/download/1.3/rubik_1_3.gb).
 
 Uh, well... So, I made a Rubik's cube simulator on Gameboy. _`Cause why not?_ Whoo ```>^•^<```
 

project.mk

@@ -34,7 +34,7 @@ MBC := 0x00
 SRAMSIZE := 0x00
 
 # ROM name
-ROMNAME := rubik-1.$(VERSION)
+ROMNAME := rubik_1_$(VERSION)
 ROMEXT  := gb
 
 

src/HomebrewOwl.GB

@@ -0,0 +1,40 @@
+;--------------------------------------------------------------
+;--------------------------------------------------------------
+SECTION "Brush", ROM0 
+;--------------------------------------------------------------
+
+
+;-Func---------------------------------------------------------	
+refreshBshSlots_Cube0::
+;-----------------------------------------refreshBshSlots_Cube0
+	ld de, CubeState
+	ld bc, 27
+	ld hl, BshSlots
+	call loadMemory	
+	ret
+;-----------------------------------------refreshBshSlots_Cube0
+
+	
+
+
+;--------------------------------------------------------------
+;--------------------------------------------------------------
+SECTION "Brush Patterns", ROM0
+;--------------------------------------------------------------
+
+Brush0::
+DB $02, $00, $27, $00, $72, $00, $20, $00, $04, $00, $4e, $00, $e4, $00, $40, $00 ; brightest
+Brush1::
+DB $00, $00, $77, $00, $77, $00, $77, $00, $00, $00, $77, $00, $77, $00, $77, $00
+Brush2::
+DB $ff, $00, $ff, $00, $ff, $00, $ff, $00, $ff, $00, $ff, $00, $ff, $00, $ff, $00
+Brush3::
+DB $ee, $11, $dd, $22, $bb, $44, $77, $88, $ee, $11, $dd, $22, $bb, $44, $77, $88
+Brush4::
+DB $5a, $a5, $c3, $3c, $24, $db, $99, $66, $99, $66, $24, $db, $c3, $3c, $5a, $a5
+Brush5::
+DB $00, $ff, $00, $ff, $00, $ff, $00, $ff, $00, $ff, $00, $ff, $00, $ff, $00, $ff ; darkest
+
+BrushSlots::
+DB $00, $01, $02, $03, $04, $05, $00, $01, $02, $03, $04, $05, $00, $01, $02, $03, $04, $05, $00, $01, $02, $03, $04, $05, $00, $01, $02
+

src/brush.asm

@@ -0,0 +1,70 @@
+SECTION "CUBE_VARS", WRAM0, ALIGN[8]
+CubeState::
+	DS 54
+	
+CubeStateBackup::
+	DS 54
+
+SECTION "CUBE", ROM0
+
+CubeState0::
+	REPT(9)
+		DB 0
+	ENDR
+	REPT(9)
+		DB 1
+	ENDR
+	REPT(9)
+		DB 2
+	ENDR
+	REPT(9)
+		DB 3
+	ENDR
+	REPT(9)
+		DB 4
+	ENDR
+	REPT(9)
+		DB 5
+	ENDR
+	
+loadCubeState0::
+	ld hl, CubeState
+	ld de, CubeState0
+	ld bc, 54
+	call loadMemory
+	ret
+
+;-Func---------------------------------------------------------	
+copyCube0STAT::
+;-------------------------------------------------copyCube0STAT
+	ld de, Cube0Tiles
+	ld bc, Cube0TilesEnd
+	ld hl, $8000
+	call loadMemorySTAT
+	
+	ld de, Cube0Tilemap
+	ld bc, Cube0TilemapEnd
+	ld hl, $9800
+	call loadMemorySTAT	
+	ret
+;-------------------------------------------------copyCube0STAT
+	
+
+	
+;-Func---------------------------------------------------------	
+copyCube1STAT::
+;-------------------------------------------------copyCube1STAT
+	ld de, Cube1Tiles
+	ld bc, Cube1TilesEnd
+	ld hl, $8D00
+	call loadMemorySTAT	
+		
+		
+	ld de, Cube1Tilemap
+	ld bc, Cube1TilemapEnd
+	ld hl, $9C00
+	call loadMemorySTAT
+	ret
+;-------------------------------------------------copyCube1STAT
+	
+

src/cube.asm

@@ -1,5 +1,7 @@
+INCLUDE "src/include/macros.inc"
+
 SECTION "Header", ROM0[$100]
-	di
+	nop
 	jp EntryPoint
 	
 	DS $150 - @, 0
@@ -8,4 +10,7 @@ SECTION "Entry point", ROM0
 
 EntryPoint:
 	call HbOwlSplashScreen
-	jr @
+	call CopyDMARoutine
+	ei
+	vBlankInit
+	jp TitleScreen

src/cube_data.asm

@@ -0,0 +1,33 @@
+INCLUDE "src/include/hardware.inc"
+
+; swap([bc], [de]) [10 cyc]
+swapBytes: MACRO
+	ld a, [bc]
+    ld l, a
+    ld a, [de]
+    ld [bc], a
+    ld a, l
+    ld [de], a
+ENDM
+
+; \1 = shadow sprites address
+initOAM: MACRO
+	ld a, HIGH( \1 )
+	call hOAMDMA
+ENDM
+
+vBlankInit: MACRO
+	xor a
+	ldh [hVBlankFlag], a	
+	ld a, 1
+    ld [rIE], a
+ENDM
+
+wait_vram: MACRO
+.waitVRAM\@
+	ldh a, [rSTAT]
+	and STATF_BUSY
+	jr nz, .waitVRAM\@
+ENDM
+
+	

src/header.asm

@@ -0,0 +1,140 @@
+INCLUDE "src/include/macros.inc"
+
+SECTION "Main", ROM0
+
+;-Entry--------------------------------------------------------	
+Start::	
+;---------------------------------------------------------Start			
+	
+	call waitForVBlank	
+	ld a, %10010001 	
+    ld [rLCDC], a		
+	ld [rOBP0], a
+	ld a, $00
+	ld [rOBP1], a
+	
+	call copyCube0STAT
+	call copyCube1STAT
+	
+	;call loadCubeState0	
+	;call refreshBshSlots_Cube0
+	call PaintTiles0
+	
+	call waitForVBlank	
+	ld a, %11100100
+	ld [rBGP], a	
+	
+	initOAM SpritesData	
+	
+	ld a, [rLCDC]
+	or LCDCF_OBJON
+	ldh [rLCDC], a
+		
+	call hideRotations	
+	
+.loop	
+	call waitForVBlank		
+	call updateJoypadState
+	call ProcessInput
+    jr .loop    
+;---------------------------------------------------------Start
+
+;-Entry--------------------------------------------------------	
+Pause:
+;---------------------------------------------------------Pause
+	call PauseMenuInit
+	ld hl, SpritesData
+	ld de, PauseMenuData
+	ld bc, 160
+	call loadMemory
+	call waitForVBlank
+	initOAM SpritesData
+.loop
+	call waitForVBlank
+	call updateJoypadState
+	ld a, [wJoypadPressed]
+	and a, PADF_DOWN
+	call nz, PauseMenuDown
+	ld a, [wJoypadPressed]
+	and a, PADF_UP	
+	call nz, PauseMenuUp
+	
+	ld a, [wJoypadPressed]
+	and a, PADF_B
+	jr nz, .justLeavePauseMenu
+	
+	ld a, [wJoypadPressed]
+	and a, PADF_A
+	jr z, .loop
+		
+	ld hl, SpritesData
+	ld de, ArrowsData
+	ld bc, 160
+	call loadMemory
+	call waitForVBlank
+	initOAM SpritesData
+	call hideRotations
+	
+	ld a, [pmCrtSelected]
+	cp 2
+	jp z, TitleScreen
+	cp 1
+	jp nz, Start.loop
+		
+	; Restore backup
+	ld hl, CubeState
+	ld de, CubeStateBackup
+	ld bc, 54
+	call loadMemory
+	
+	call refreshBshSlots_Cube0
+	call PaintTiles0	
+	
+	jp Start.loop
+		
+.justLeavePauseMenu
+	;restore sprites	
+	ld hl, SpritesData
+	ld de, ArrowsData
+	ld bc, 160
+	call loadMemory
+	call waitForVBlank
+	initOAM SpritesData
+	call hideRotations		
+	
+	jp Start.loop
+	
+		
+;---------------------------------------------------------Pause
+
+;-Func--------------------------------------------------------	
+ProcessInput:
+;-------------------------------------------------ProcessInput		
+	ld   a, [wJoypadPressed]
+	and a, PADF_SELECT
+	
+	call nz, nextRotDir
+	
+	ld   a, [wJoypadPressed]
+	and a, PADF_B
+	call nz, disableRot
+
+	ld   a, [wJoypadPressed]
+	and a, PADF_LEFT		
+	call nz, handleLeftPressed
+	
+	ld   a, [wJoypadPressed]
+	and a, PADF_RIGHT	
+	call nz, handleRightPressed
+	
+	ld a, [wJoypadPressed]
+	and a, PADF_START			
+	
+	jr nz, .launchPause			
+	ret
+.launchPause
+	pop bc   ; immitate ret without exiting function
+	xor a
+	ld [rotActive], a ; disable hard rotations
+	jp Pause ; leave function, but jump execute pause menu logic
+;-------------------------------------------------ProcessInput