hram.o

Makefile

@@ -4,7 +4,7 @@
 .SUFFIXES: .asm .o .gbc .png .2bpp .1bpp .pal
 .SECONDEXPANSION:
 
-OBJS = src/main.o src/gfx.o src/text.o src/audio.o src/wram.o
+OBJS = src/main.o src/gfx.o src/text.o src/audio.o src/wram.o src/hram.o
 
 $(foreach obj, $(OBJS), \
 	$(eval $(obj:.o=)_dep = $(shell python extras/scan_includes.py $(obj:.o=.asm))) \

src/audio.asm

@@ -1,6 +1,5 @@
 INCLUDE "constants.asm"
 INCLUDE "macros.asm"
-INCLUDE "hram.asm"
 
 SECTION "bank3D",ROMX,BANK[$3D]
 INCLUDE "audio/music1.asm"

src/hram.asm

@@ -1,19 +1,46 @@
-hBankROM                    EQU $FF80
-hBankRAM                    EQU $FF81
-hBankVRAM                   EQU $FF82
+SECTION "HRAM", HRAM
 
-hDMAFunction                EQU $FF83
+hBankROM:: ; ff80
+	ds 1
 
-hDPadRepeat                 EQU $FF8D
-hButtonsReleased            EQU $FF8E
-hButtonsPressed2            EQU $FF8F
-hButtonsHeld                EQU $FF90
-hButtonsPressed             EQU $FF91
+hBankRAM:: ; ff81
+	ds 1
 
-hSCX                        EQU $FF92
-hSCY                        EQU $FF93
-hWX                         EQU $FF94
-hWY                         EQU $FF95
+hBankVRAM:: ; ff82
+	ds 1
+
+hDMAFunction:: ; ff83
+	ds 10
+
+hDPadRepeat:: ; ff8d
+	ds 1
+
+hButtonsReleased:: ; ff8e
+	ds 1
+
+hButtonsPressed2:: ; ff8f
+	ds 1
+
+hButtonsHeld:: ; ff90
+	ds 1
+
+hButtonsPressed:: ; ff91
+	ds 1
+
+hSCX:: ; ff92
+	ds 1
+
+hSCY:: ; ff93
+	ds 1
+
+hWX:: ; ff94
+	ds 1
+
+hWY:: ; ff95
+	ds 1
+
+	ds 1
 
 ; $c2 = player ; $c3 = opponent
-hWhoseTurn                  EQU $FF97
+hWhoseTurn:: ; ff97
+	ds 1

src/main.asm

@@ -1,6 +1,5 @@
 INCLUDE "constants.asm"
 INCLUDE "macros.asm"
-INCLUDE "hram.asm"
 
 INCLUDE "engine/home.asm"