diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6d749b5f..c3aec630 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@master
         with:
           path: rgbds
-          ref: v0.6.0
+          ref: v0.8.0
           repository: gbdev/rgbds
 
       - name: Install rgbds
diff --git a/Makefile b/Makefile
index af03e9f7..e3607cfe 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ RGBFIX  ?= $(RGBDS)rgbfix
 RGBGFX  ?= $(RGBDS)rgbgfx
 RGBLINK ?= $(RGBDS)rgblink
 
-RGBASMFLAGS := -h -E -i $(BUILD)/ -DGOLD
+RGBASMFLAGS := -E -i $(BUILD)/ -DGOLD
 
 SCAN_INCLUDES := tools/scan_includes
 MAKE_SHIM := tools/make_shim.py
diff --git a/data/debug/field_debug_entries.inc b/data/debug/field_debug_entries.inc
index bc32ef18..25f858b6 100644
--- a/data/debug/field_debug_entries.inc
+++ b/data/debug/field_debug_entries.inc
@@ -92,7 +92,7 @@ FieldDebug_Jumptable:
 	dw FieldDebug_VRAMViewer
 	dw FieldDebug_TrainerGear
 
-FIELDDEBUG_NUM_PAGES EQU 3
+DEF FIELDDEBUG_NUM_PAGES EQU 3
 
 FieldDebug_Pages:
 ; page 1
diff --git a/engine/games/picross_minigame.asm b/engine/games/picross_minigame.asm
index 1f8c6dd6..6494703b 100644
--- a/engine/games/picross_minigame.asm
+++ b/engine/games/picross_minigame.asm
@@ -27,7 +27,7 @@ DEF PICROSS_GFX_GROUNDTILE EQU $83
 
 DEF PICROSS_GFX_COLUMNS EQU $84
 DEF PICROSS_GFX_ROWS EQU $b4
-PICROSS_GFX_TABLESTART equ $f0
+DEF PICROSS_GFX_TABLESTART equ $f0
 
 ; The Picross game area is referred as the "table" here.
 ; The table consists of 256 cells, divided into 4x4 "grids" of 16 cells each.