Extract uncompressed entity placement data of each map (#43)

Co-authored-by: Oliver Bell <freshollie@gmail.com>

.gitignore

@@ -68,7 +68,8 @@ reports
 .vscode/*.log
 *.gbapal
 *.lz
+*.rl
 *.gba
-maps
+./maps
 *.4bpp
 *.8bpp

.vscode/settings.json

@@ -153,5 +153,6 @@
     "asm-code-lens.donated": true,
     "editor.formatOnSave": true,
     "editor.defaultFormatter": "xaver.clang-format",
-    "clang-format.executable": "clang-format-13"
+    "clang-format.executable": "clang-format-13",
+    "dbt.queryLimit": 500
 }

Makefile

@@ -175,7 +175,7 @@ clean: tidy clean-tools
 	@$(MAKE) clean -C multi_boot/subgame_loader
 
 	$(RM) $(SAMPLE_SUBDIR)/*.bin $(MID_SUBDIR)/*.s
-	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec $(RM) {} +
+	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec $(RM) {} +
 
 clean-tools:
 	@$(foreach tooldir,$(TOOLDIRS),$(MAKE) clean -C $(tooldir);)

asm/enemies.s

@@ -522,6 +522,9 @@ sub_8051200: @ 0x08051200
 	pop {r0}
 	bx r0
 
+@ --- Possibly the above is its own module.
+@     The functions are shared across all enemy code.
+
 	thumb_func_start initSprite_Enemy_Mon
 initSprite_Enemy_Mon: @ 0x08051214
 	push {r4, r5, r6, r7, lr}

asm/entities_0.s

@@ -8,21 +8,7 @@
 @;             pointed to from here is composed, look at the below thread.
 @;             Even though it is about SA3, all 3 games do share quite a bit.
 @;             https://twitter.com/JaceCear/status/1362912485951610881
-    .global gSpritePosData_Rings
-gSpritePosData_Rings: @ 080D4BFC
-    .incbin "baserom.gba", 0x000D4BFC, 0x88
-
-    .global gSpritePosData_Interactables
-gSpritePosData_Interactables: @ 080D4C84
-    .incbin "baserom.gba", 0x000D4C84, 0x88
-
-    .global gSpritePosData_Itemboxes
-gSpritePosData_Itemboxes: @ 080D4D0C
-    .incbin "baserom.gba", 0x000D4D0C, 0x88
-
-    .global gSpritePosData_Enemies
-gSpritePosData_Enemies: @ 080D4D94
-    .incbin "baserom.gba", 0x000D4D94, 0x88
+.include "data/maps/entity_tables.inc"
 
     .global gSpriteInits_Interactables @ 080D4E1C
 gSpriteInits_Interactables:
@@ -348,7 +334,7 @@ sub_8007E10: @ 0x08007E10
 	movs r3, #0
 	bl TaskCreate
 	adds r7, r0, #0
-	ldr r5, _08007E68 @ =gSpritePosData_Rings
+	ldr r5, _08007E68 @ =gSpritePosData_rings
 	ldr r4, _08007E6C @ =gCurrentLevel
 	movs r0, #0
 	ldrsb r0, [r4, r0]
@@ -371,7 +357,7 @@ sub_8007E10: @ 0x08007E10
 _08007E5C: .4byte gGameMode
 _08007E60: .4byte sub_8007F1C
 _08007E64: .4byte sub_8008874
-_08007E68: .4byte gSpritePosData_Rings
+_08007E68: .4byte gSpritePosData_rings
 _08007E6C: .4byte gCurrentLevel
 _08007E70:
 	ldr r0, _08007EF4 @ =sub_8007F1C
@@ -519,7 +505,7 @@ _08007F8E:
 	ldrb r0, [r4]
 	cmp r0, #0
 	beq _08007FBE
-	ldr r1, _080082A8 @ =gSpritePosData_Rings
+	ldr r1, _080082A8 @ =gSpritePosData_rings
 	ldr r0, _08008298 @ =gCurrentLevel
 	ldrb r0, [r0]
 	lsls r0, r0, #0x18
@@ -921,7 +907,7 @@ _08008298: .4byte gCurrentLevel
 _0800829C: .4byte gUnknown_030054B0
 _080082A0: .4byte gUnknown_03005430
 _080082A4: .4byte gUnknown_0300542C
-_080082A8: .4byte gSpritePosData_Rings
+_080082A8: .4byte gSpritePosData_rings
 _080082AC: .4byte gUnknown_030059E8
 _080082B0: .4byte gCourseTime
 _080082B4: .4byte gGameMode
@@ -1733,7 +1719,7 @@ _080088BC:
 	ldrb r0, [r0]
 	cmp r0, #5
 	beq _0800898C
-	ldr r5, _08008978 @ =gSpritePosData_Interactables
+	ldr r5, _08008978 @ =gSpritePosData_interactables
 	ldr r4, _0800897C @ =gCurrentLevel
 	movs r0, #0
 	ldrsb r0, [r4, r0]
@@ -1752,7 +1738,7 @@ _080088BC:
 	adds r1, r6, #0
 	bl RLUnCompWram
 	str r6, [r7]
-	ldr r5, _08008980 @ =gSpritePosData_Itemboxes
+	ldr r5, _08008980 @ =gSpritePosData_itemboxes
 	movs r0, #0
 	ldrsb r0, [r4, r0]
 	lsls r0, r0, #2
@@ -1770,7 +1756,7 @@ _080088BC:
 	adds r1, r6, #0
 	bl RLUnCompWram
 	str r6, [r7, #4]
-	ldr r5, _08008984 @ =gSpritePosData_Enemies
+	ldr r5, _08008984 @ =gSpritePosData_enemies
 	movs r0, #0
 	ldrsb r0, [r4, r0]
 	lsls r0, r0, #2
@@ -1804,10 +1790,10 @@ _080088BC:
 	.align 2, 0
 _08008970: .4byte sub_8008DCC
 _08008974: .4byte gGameMode
-_08008978: .4byte gSpritePosData_Interactables
+_08008978: .4byte gSpritePosData_interactables
 _0800897C: .4byte gCurrentLevel
-_08008980: .4byte gSpritePosData_Itemboxes
-_08008984: .4byte gSpritePosData_Enemies
+_08008980: .4byte gSpritePosData_itemboxes
+_08008984: .4byte gSpritePosData_enemies
 _08008988: .4byte gSpriteTileInits_PreStageEntry
 _0800898C:
 	ldr r6, _080089BC @ =EWRAM_START + 0x3F000

asm/sprite_4.s

@@ -5,15 +5,74 @@
 
     .global gUnknown_080984DC
 gUnknown_080984DC:
-    .incbin "baserom.gba", 0x000984DC, 0x1
+    .byte 0x08
 
     .global gUnknown_080984DD
 gUnknown_080984DD:
-    .incbin "baserom.gba", 0x000984DD, 0x17
+    .byte 0x08, 0x10, 0x10
+    .byte 0x20, 0x20, 0x40, 0x40
+    .byte 0x10, 0x08, 0x20, 0x08
+    .byte 0x20, 0x10, 0x40, 0x20
+    .byte 0x08, 0x10, 0x08, 0x20
+    .byte 0x10, 0x20, 0x20, 0x40
 
     .global gUnknown_080984F4
 gUnknown_080984F4:
-    .incbin "baserom.gba", 0x000984F4, 0x1687C
+    @ Zone 1
+    .2byte 0x0001
+    .2byte 0x0001
+    .2byte 0x2430
+    .2byte 0x0000
+    
+    @ Zone 2
+    .2byte 0x0004
+    .2byte 0x0024
+    .2byte 0x0300
+    .2byte 0x0080
+    
+    @ Zone 3
+    .2byte 0x0200
+    .2byte 0x0098
+    .2byte 0x2430
+    .2byte 0x0000
+    
+    @ Zone 4
+    .2byte 0x0004
+    .2byte 0x0024
+    .2byte 0x0300
+    .2byte 0x0080
+    
+    @ Zone 5
+    .2byte 0x0200
+    .2byte 0x0098
+    .2byte 0x2430
+    .2byte 0x0000
+    
+    @ Zone 6
+    .2byte 0x0004
+    .2byte 0x0024
+    .2byte 0x0300
+    .2byte 0x0080
+    
+    @ Zone 7
+    .2byte 0x0200
+    .2byte 0x0098
+    .2byte 0x2430
+    .2byte 0x0000
+    
+    @ Zone Extra
+    .2byte 0x0004
+    .2byte 0x0024
+    .2byte 0x0300
+    .2byte 0x0080
+    
+    @ Dummies?
+    .2byte 0x0200
+    .2byte 0x0098
+    
+    .global gUnknown_08098538
+gUnknown_08098538:
+    .include "data/maps/entities.inc"
 
 .text
 .syntax unified

chao_garden/Makefile

@@ -127,7 +127,7 @@ compare: $(ROM)
 
 clean: tidy
 	$(RM) $(SAMPLE_SUBDIR)/*.bin $(MID_SUBDIR)/*.s
-	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec $(RM) {} +
+	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec $(RM) {} +
 
 tidy:
 	$(RM) -f $(ROM) $(ELF) $(MAP)

data/maps/entities.inc

@@ -0,0 +1,480 @@
+
+.global zone1_act1_rings
+zone1_act1_rings:
+	.incbin "data/maps/zone1/act1/rings.bin.rl"
+.size zone1_act1_rings, .-zone1_act1_rings
+
+.global zone1_act1_enemies
+zone1_act1_enemies:
+	.incbin "data/maps/zone1/act1/enemies.bin.rl"
+.size zone1_act1_enemies, .-zone1_act1_enemies
+
+.global zone1_act1_itemboxes
+zone1_act1_itemboxes:
+	.incbin "data/maps/zone1/act1/itemboxes.bin.rl"
+.size zone1_act1_itemboxes, .-zone1_act1_itemboxes
+
+.global zone1_act1_interactables
+zone1_act1_interactables:
+	.incbin "data/maps/zone1/act1/interactables.bin.rl"
+.size zone1_act1_interactables, .-zone1_act1_interactables
+
+.global zone1_act2_rings
+zone1_act2_rings:
+	.incbin "data/maps/zone1/act2/rings.bin.rl"
+.size zone1_act2_rings, .-zone1_act2_rings
+
+.global zone1_act2_enemies
+zone1_act2_enemies:
+	.incbin "data/maps/zone1/act2/enemies.bin.rl"
+.size zone1_act2_enemies, .-zone1_act2_enemies
+
+.global zone1_act2_itemboxes
+zone1_act2_itemboxes:
+	.incbin "data/maps/zone1/act2/itemboxes.bin.rl"
+.size zone1_act2_itemboxes, .-zone1_act2_itemboxes
+
+.global zone1_act2_interactables
+zone1_act2_interactables:
+	.incbin "data/maps/zone1/act2/interactables.bin.rl"
+.size zone1_act2_interactables, .-zone1_act2_interactables
+
+.global zone1_boss_rings
+zone1_boss_rings:
+	.incbin "data/maps/zone1/boss/rings.bin.rl"
+.size zone1_boss_rings, .-zone1_boss_rings
+
+.global zone1_boss_enemies
+zone1_boss_enemies:
+	.incbin "data/maps/zone1/boss/enemies.bin.rl"
+.size zone1_boss_enemies, .-zone1_boss_enemies
+
+.global zone1_boss_itemboxes
+zone1_boss_itemboxes:
+	.incbin "data/maps/zone1/boss/itemboxes.bin.rl"
+.size zone1_boss_itemboxes, .-zone1_boss_itemboxes
+
+.global zone1_boss_interactables
+zone1_boss_interactables:
+	.incbin "data/maps/zone1/boss/interactables.bin.rl"
+.size zone1_boss_interactables, .-zone1_boss_interactables
+
+.global zone2_act1_rings
+zone2_act1_rings:
+	.incbin "data/maps/zone2/act1/rings.bin.rl"
+.size zone2_act1_rings, .-zone2_act1_rings
+
+.global zone2_act1_enemies
+zone2_act1_enemies:
+	.incbin "data/maps/zone2/act1/enemies.bin.rl"
+.size zone2_act1_enemies, .-zone2_act1_enemies
+
+.global zone2_act1_itemboxes
+zone2_act1_itemboxes:
+	.incbin "data/maps/zone2/act1/itemboxes.bin.rl"
+.size zone2_act1_itemboxes, .-zone2_act1_itemboxes
+
+.global zone2_act1_interactables
+zone2_act1_interactables:
+	.incbin "data/maps/zone2/act1/interactables.bin.rl"
+.size zone2_act1_interactables, .-zone2_act1_interactables
+
+.global zone2_act2_rings
+zone2_act2_rings:
+	.incbin "data/maps/zone2/act2/rings.bin.rl"
+.size zone2_act2_rings, .-zone2_act2_rings
+
+.global zone2_act2_enemies
+zone2_act2_enemies:
+	.incbin "data/maps/zone2/act2/enemies.bin.rl"
+.size zone2_act2_enemies, .-zone2_act2_enemies
+
+.global zone2_act2_itemboxes
+zone2_act2_itemboxes:
+	.incbin "data/maps/zone2/act2/itemboxes.bin.rl"
+.size zone2_act2_itemboxes, .-zone2_act2_itemboxes
+
+.global zone2_act2_interactables
+zone2_act2_interactables:
+	.incbin "data/maps/zone2/act2/interactables.bin.rl"
+.size zone2_act2_interactables, .-zone2_act2_interactables
+
+.global zone2_boss_rings
+zone2_boss_rings:
+	.incbin "data/maps/zone2/boss/rings.bin.rl"
+.size zone2_boss_rings, .-zone2_boss_rings
+
+.global zone2_boss_enemies
+zone2_boss_enemies:
+	.incbin "data/maps/zone2/boss/enemies.bin.rl"
+.size zone2_boss_enemies, .-zone2_boss_enemies
+
+.global zone2_boss_itemboxes
+zone2_boss_itemboxes:
+	.incbin "data/maps/zone2/boss/itemboxes.bin.rl"
+.size zone2_boss_itemboxes, .-zone2_boss_itemboxes
+
+.global zone2_boss_interactables
+zone2_boss_interactables:
+	.incbin "data/maps/zone2/boss/interactables.bin.rl"
+.size zone2_boss_interactables, .-zone2_boss_interactables
+
+.global zone3_act1_rings
+zone3_act1_rings:
+	.incbin "data/maps/zone3/act1/rings.bin.rl"
+.size zone3_act1_rings, .-zone3_act1_rings
+
+.global zone3_act1_enemies
+zone3_act1_enemies:
+	.incbin "data/maps/zone3/act1/enemies.bin.rl"
+.size zone3_act1_enemies, .-zone3_act1_enemies
+
+.global zone3_act1_itemboxes
+zone3_act1_itemboxes:
+	.incbin "data/maps/zone3/act1/itemboxes.bin.rl"
+.size zone3_act1_itemboxes, .-zone3_act1_itemboxes
+
+.global zone3_act1_interactables
+zone3_act1_interactables:
+	.incbin "data/maps/zone3/act1/interactables.bin.rl"
+.size zone3_act1_interactables, .-zone3_act1_interactables
+
+.global zone3_act2_rings
+zone3_act2_rings:
+	.incbin "data/maps/zone3/act2/rings.bin.rl"
+.size zone3_act2_rings, .-zone3_act2_rings
+
+.global zone3_act2_enemies
+zone3_act2_enemies:
+	.incbin "data/maps/zone3/act2/enemies.bin.rl"
+.size zone3_act2_enemies, .-zone3_act2_enemies
+
+.global zone3_act2_itemboxes
+zone3_act2_itemboxes:
+	.incbin "data/maps/zone3/act2/itemboxes.bin.rl"
+.size zone3_act2_itemboxes, .-zone3_act2_itemboxes
+
+.global zone3_act2_interactables
+zone3_act2_interactables:
+	.incbin "data/maps/zone3/act2/interactables.bin.rl"
+.size zone3_act2_interactables, .-zone3_act2_interactables
+
+.global zone3_boss_rings
+zone3_boss_rings:
+	.incbin "data/maps/zone3/boss/rings.bin.rl"
+.size zone3_boss_rings, .-zone3_boss_rings
+
+.global zone3_boss_enemies
+zone3_boss_enemies:
+	.incbin "data/maps/zone3/boss/enemies.bin.rl"
+.size zone3_boss_enemies, .-zone3_boss_enemies
+
+.global zone3_boss_itemboxes
+zone3_boss_itemboxes:
+	.incbin "data/maps/zone3/boss/itemboxes.bin.rl"
+.size zone3_boss_itemboxes, .-zone3_boss_itemboxes
+
+.global zone3_boss_interactables
+zone3_boss_interactables:
+	.incbin "data/maps/zone3/boss/interactables.bin.rl"
+.size zone3_boss_interactables, .-zone3_boss_interactables
+
+.global zone4_act1_rings
+zone4_act1_rings:
+	.incbin "data/maps/zone4/act1/rings.bin.rl"
+.size zone4_act1_rings, .-zone4_act1_rings
+
+.global zone4_act1_enemies
+zone4_act1_enemies:
+	.incbin "data/maps/zone4/act1/enemies.bin.rl"
+.size zone4_act1_enemies, .-zone4_act1_enemies
+
+.global zone4_act1_itemboxes
+zone4_act1_itemboxes:
+	.incbin "data/maps/zone4/act1/itemboxes.bin.rl"
+.size zone4_act1_itemboxes, .-zone4_act1_itemboxes
+
+.global zone4_act1_interactables
+zone4_act1_interactables:
+	.incbin "data/maps/zone4/act1/interactables.bin.rl"
+.size zone4_act1_interactables, .-zone4_act1_interactables
+
+.global zone4_act2_rings
+zone4_act2_rings:
+	.incbin "data/maps/zone4/act2/rings.bin.rl"
+.size zone4_act2_rings, .-zone4_act2_rings
+
+.global zone4_act2_enemies
+zone4_act2_enemies:
+	.incbin "data/maps/zone4/act2/enemies.bin.rl"
+.size zone4_act2_enemies, .-zone4_act2_enemies
+
+.global zone4_act2_itemboxes
+zone4_act2_itemboxes:
+	.incbin "data/maps/zone4/act2/itemboxes.bin.rl"
+.size zone4_act2_itemboxes, .-zone4_act2_itemboxes
+
+.global zone4_act2_interactables
+zone4_act2_interactables:
+	.incbin "data/maps/zone4/act2/interactables.bin.rl"
+.size zone4_act2_interactables, .-zone4_act2_interactables
+
+.global zone4_boss_rings
+zone4_boss_rings:
+	.incbin "data/maps/zone4/boss/rings.bin.rl"
+.size zone4_boss_rings, .-zone4_boss_rings
+
+.global zone4_boss_enemies
+zone4_boss_enemies:
+	.incbin "data/maps/zone4/boss/enemies.bin.rl"
+.size zone4_boss_enemies, .-zone4_boss_enemies
+
+.global zone4_boss_itemboxes
+zone4_boss_itemboxes:
+	.incbin "data/maps/zone4/boss/itemboxes.bin.rl"
+.size zone4_boss_itemboxes, .-zone4_boss_itemboxes
+
+.global zone4_boss_interactables
+zone4_boss_interactables:
+	.incbin "data/maps/zone4/boss/interactables.bin.rl"
+.size zone4_boss_interactables, .-zone4_boss_interactables
+
+.global zone5_act1_rings
+zone5_act1_rings:
+	.incbin "data/maps/zone5/act1/rings.bin.rl"
+.size zone5_act1_rings, .-zone5_act1_rings
+
+.global zone5_act1_enemies
+zone5_act1_enemies:
+	.incbin "data/maps/zone5/act1/enemies.bin.rl"
+.size zone5_act1_enemies, .-zone5_act1_enemies
+
+.global zone5_act1_itemboxes
+zone5_act1_itemboxes:
+	.incbin "data/maps/zone5/act1/itemboxes.bin.rl"
+.size zone5_act1_itemboxes, .-zone5_act1_itemboxes
+
+.global zone5_act1_interactables
+zone5_act1_interactables:
+	.incbin "data/maps/zone5/act1/interactables.bin.rl"
+.size zone5_act1_interactables, .-zone5_act1_interactables
+
+.global zone5_act2_rings
+zone5_act2_rings:
+	.incbin "data/maps/zone5/act2/rings.bin.rl"
+.size zone5_act2_rings, .-zone5_act2_rings
+
+.global zone5_act2_enemies
+zone5_act2_enemies:
+	.incbin "data/maps/zone5/act2/enemies.bin.rl"
+.size zone5_act2_enemies, .-zone5_act2_enemies
+
+.global zone5_act2_itemboxes
+zone5_act2_itemboxes:
+	.incbin "data/maps/zone5/act2/itemboxes.bin.rl"
+.size zone5_act2_itemboxes, .-zone5_act2_itemboxes
+
+.global zone5_act2_interactables
+zone5_act2_interactables:
+	.incbin "data/maps/zone5/act2/interactables.bin.rl"
+.size zone5_act2_interactables, .-zone5_act2_interactables
+
+.global zone5_boss_rings
+zone5_boss_rings:
+	.incbin "data/maps/zone5/boss/rings.bin.rl"
+.size zone5_boss_rings, .-zone5_boss_rings
+
+.global zone5_boss_enemies
+zone5_boss_enemies:
+	.incbin "data/maps/zone5/boss/enemies.bin.rl"
+.size zone5_boss_enemies, .-zone5_boss_enemies
+
+.global zone5_boss_itemboxes
+zone5_boss_itemboxes:
+	.incbin "data/maps/zone5/boss/itemboxes.bin.rl"
+.size zone5_boss_itemboxes, .-zone5_boss_itemboxes
+
+.global zone5_boss_interactables
+zone5_boss_interactables:
+	.incbin "data/maps/zone5/boss/interactables.bin.rl"
+.size zone5_boss_interactables, .-zone5_boss_interactables
+
+.global zone6_act1_rings
+zone6_act1_rings:
+	.incbin "data/maps/zone6/act1/rings.bin.rl"
+.size zone6_act1_rings, .-zone6_act1_rings
+
+.global zone6_act1_enemies
+zone6_act1_enemies:
+	.incbin "data/maps/zone6/act1/enemies.bin.rl"
+.size zone6_act1_enemies, .-zone6_act1_enemies
+
+.global zone6_act1_itemboxes
+zone6_act1_itemboxes:
+	.incbin "data/maps/zone6/act1/itemboxes.bin.rl"
+.size zone6_act1_itemboxes, .-zone6_act1_itemboxes
+
+.global zone6_act1_interactables
+zone6_act1_interactables:
+	.incbin "data/maps/zone6/act1/interactables.bin.rl"
+.size zone6_act1_interactables, .-zone6_act1_interactables
+
+.global zone6_act2_rings
+zone6_act2_rings:
+	.incbin "data/maps/zone6/act2/rings.bin.rl"
+.size zone6_act2_rings, .-zone6_act2_rings
+
+.global zone6_act2_enemies
+zone6_act2_enemies:
+	.incbin "data/maps/zone6/act2/enemies.bin.rl"
+.size zone6_act2_enemies, .-zone6_act2_enemies
+
+.global zone6_act2_itemboxes
+zone6_act2_itemboxes:
+	.incbin "data/maps/zone6/act2/itemboxes.bin.rl"
+.size zone6_act2_itemboxes, .-zone6_act2_itemboxes
+
+.global zone6_act2_interactables
+zone6_act2_interactables:
+	.incbin "data/maps/zone6/act2/interactables.bin.rl"
+.size zone6_act2_interactables, .-zone6_act2_interactables
+
+.global zone6_boss_rings
+zone6_boss_rings:
+	.incbin "data/maps/zone6/boss/rings.bin.rl"
+.size zone6_boss_rings, .-zone6_boss_rings
+
+.global zone6_boss_enemies
+zone6_boss_enemies:
+	.incbin "data/maps/zone6/boss/enemies.bin.rl"
+.size zone6_boss_enemies, .-zone6_boss_enemies
+
+.global zone6_boss_itemboxes
+zone6_boss_itemboxes:
+	.incbin "data/maps/zone6/boss/itemboxes.bin.rl"
+.size zone6_boss_itemboxes, .-zone6_boss_itemboxes
+
+.global zone6_boss_interactables
+zone6_boss_interactables:
+	.incbin "data/maps/zone6/boss/interactables.bin.rl"
+.size zone6_boss_interactables, .-zone6_boss_interactables
+
+.global zone7_act1_rings
+zone7_act1_rings:
+	.incbin "data/maps/zone7/act1/rings.bin.rl"
+.size zone7_act1_rings, .-zone7_act1_rings
+
+.global zone7_act1_enemies
+zone7_act1_enemies:
+	.incbin "data/maps/zone7/act1/enemies.bin.rl"
+.size zone7_act1_enemies, .-zone7_act1_enemies
+
+.global zone7_act1_itemboxes
+zone7_act1_itemboxes:
+	.incbin "data/maps/zone7/act1/itemboxes.bin.rl"
+.size zone7_act1_itemboxes, .-zone7_act1_itemboxes
+
+.global zone7_act1_interactables
+zone7_act1_interactables:
+	.incbin "data/maps/zone7/act1/interactables.bin.rl"
+.size zone7_act1_interactables, .-zone7_act1_interactables
+
+.global zone7_act2_rings
+zone7_act2_rings:
+	.incbin "data/maps/zone7/act2/rings.bin.rl"
+.size zone7_act2_rings, .-zone7_act2_rings
+
+.global zone7_act2_enemies
+zone7_act2_enemies:
+	.incbin "data/maps/zone7/act2/enemies.bin.rl"
+.size zone7_act2_enemies, .-zone7_act2_enemies
+
+.global zone7_act2_itemboxes
+zone7_act2_itemboxes:
+	.incbin "data/maps/zone7/act2/itemboxes.bin.rl"
+.size zone7_act2_itemboxes, .-zone7_act2_itemboxes
+
+.global zone7_act2_interactables
+zone7_act2_interactables:
+	.incbin "data/maps/zone7/act2/interactables.bin.rl"
+.size zone7_act2_interactables, .-zone7_act2_interactables
+
+.global zone7_boss_rings
+zone7_boss_rings:
+	.incbin "data/maps/zone7/boss/rings.bin.rl"
+.size zone7_boss_rings, .-zone7_boss_rings
+
+.global zone7_boss_enemies
+zone7_boss_enemies:
+	.incbin "data/maps/zone7/boss/enemies.bin.rl"
+.size zone7_boss_enemies, .-zone7_boss_enemies
+
+.global zone7_boss_itemboxes
+zone7_boss_itemboxes:
+	.incbin "data/maps/zone7/boss/itemboxes.bin.rl"
+.size zone7_boss_itemboxes, .-zone7_boss_itemboxes
+
+.global zone7_boss_interactables
+zone7_boss_interactables:
+	.incbin "data/maps/zone7/boss/interactables.bin.rl"
+.size zone7_boss_interactables, .-zone7_boss_interactables
+
+.global zone8_act1_rings
+zone8_act1_rings:
+	.incbin "data/maps/zone8/act1/rings.bin.rl"
+.size zone8_act1_rings, .-zone8_act1_rings
+
+.global zone8_act1_enemies
+zone8_act1_enemies:
+	.incbin "data/maps/zone8/act1/enemies.bin.rl"
+.size zone8_act1_enemies, .-zone8_act1_enemies
+
+.global zone8_act1_itemboxes
+zone8_act1_itemboxes:
+	.incbin "data/maps/zone8/act1/itemboxes.bin.rl"
+.size zone8_act1_itemboxes, .-zone8_act1_itemboxes
+
+.global zone8_act1_interactables
+zone8_act1_interactables:
+	.incbin "data/maps/zone8/act1/interactables.bin.rl"
+.size zone8_act1_interactables, .-zone8_act1_interactables
+
+.global zone8_act2_rings
+zone8_act2_rings:
+	.incbin "data/maps/zone8/act2/rings.bin.rl"
+.size zone8_act2_rings, .-zone8_act2_rings
+
+.global zone8_act2_enemies
+zone8_act2_enemies:
+	.incbin "data/maps/zone8/act2/enemies.bin.rl"
+.size zone8_act2_enemies, .-zone8_act2_enemies
+
+.global zone8_act2_itemboxes
+zone8_act2_itemboxes:
+	.incbin "data/maps/zone8/act2/itemboxes.bin.rl"
+.size zone8_act2_itemboxes, .-zone8_act2_itemboxes
+
+.global zone8_act2_interactables
+zone8_act2_interactables:
+	.incbin "data/maps/zone8/act2/interactables.bin.rl"
+.size zone8_act2_interactables, .-zone8_act2_interactables
+
+.global zone8_boss_rings
+zone8_boss_rings:
+	.incbin "data/maps/zone8/boss/rings.bin.rl"
+.size zone8_boss_rings, .-zone8_boss_rings
+
+.global zone8_boss_enemies
+zone8_boss_enemies:
+	.incbin "data/maps/zone8/boss/enemies.bin.rl"
+.size zone8_boss_enemies, .-zone8_boss_enemies
+
+.global zone8_boss_itemboxes
+zone8_boss_itemboxes:
+	.incbin "data/maps/zone8/boss/itemboxes.bin.rl"
+.size zone8_boss_itemboxes, .-zone8_boss_itemboxes
+
+.global zone8_boss_interactables
+zone8_boss_interactables:
+	.incbin "data/maps/zone8/boss/interactables.bin.rl"
+.size zone8_boss_interactables, .-zone8_boss_interactables

data/maps/entity_tables.inc

@@ -0,0 +1,148 @@
+
+.global gSpritePosData_rings
+gSpritePosData_rings:
+	.4byte zone1_act1_rings
+	.4byte zone1_act2_rings
+	.4byte zone1_boss_rings
+	.4byte zone1_act2_rings
+	.4byte zone2_act1_rings
+	.4byte zone2_act2_rings
+	.4byte zone2_boss_rings
+	.4byte zone2_act2_rings
+	.4byte zone3_act1_rings
+	.4byte zone3_act2_rings
+	.4byte zone3_boss_rings
+	.4byte zone3_act2_rings
+	.4byte zone4_act1_rings
+	.4byte zone4_act2_rings
+	.4byte zone4_boss_rings
+	.4byte zone4_act2_rings
+	.4byte zone5_act1_rings
+	.4byte zone5_act2_rings
+	.4byte zone5_boss_rings
+	.4byte zone5_act2_rings
+	.4byte zone6_act1_rings
+	.4byte zone6_act2_rings
+	.4byte zone6_boss_rings
+	.4byte zone6_act2_rings
+	.4byte zone7_act1_rings
+	.4byte zone7_act2_rings
+	.4byte zone7_boss_rings
+	.4byte zone7_act2_rings
+	.4byte zone8_act1_rings
+	.4byte zone8_act2_rings
+	.4byte zone8_boss_rings
+	.4byte 0
+	.4byte 0
+	.4byte 0
+
+.global gSpritePosData_interactables
+gSpritePosData_interactables:
+	.4byte zone1_act1_interactables
+	.4byte zone1_act2_interactables
+	.4byte zone1_boss_interactables
+	.4byte zone1_act2_interactables
+	.4byte zone2_act1_interactables
+	.4byte zone2_act2_interactables
+	.4byte zone2_boss_interactables
+	.4byte zone2_act2_interactables
+	.4byte zone3_act1_interactables
+	.4byte zone3_act2_interactables
+	.4byte zone3_boss_interactables
+	.4byte zone3_act2_interactables
+	.4byte zone4_act1_interactables
+	.4byte zone4_act2_interactables
+	.4byte zone4_boss_interactables
+	.4byte zone4_act2_interactables
+	.4byte zone5_act1_interactables
+	.4byte zone5_act2_interactables
+	.4byte zone5_boss_interactables
+	.4byte zone5_act2_interactables
+	.4byte zone6_act1_interactables
+	.4byte zone6_act2_interactables
+	.4byte zone6_boss_interactables
+	.4byte zone6_act2_interactables
+	.4byte zone7_act1_interactables
+	.4byte zone7_act2_interactables
+	.4byte zone7_boss_interactables
+	.4byte zone7_act2_interactables
+	.4byte zone8_act1_interactables
+	.4byte zone8_act2_interactables
+	.4byte zone8_boss_interactables
+	.4byte 0
+	.4byte 0
+	.4byte 0
+
+.global gSpritePosData_itemboxes
+gSpritePosData_itemboxes:
+	.4byte zone1_act1_itemboxes
+	.4byte zone1_act2_itemboxes
+	.4byte zone1_boss_itemboxes
+	.4byte zone1_act2_itemboxes
+	.4byte zone2_act1_itemboxes
+	.4byte zone2_act2_itemboxes
+	.4byte zone2_boss_itemboxes
+	.4byte zone2_act2_itemboxes
+	.4byte zone3_act1_itemboxes
+	.4byte zone3_act2_itemboxes
+	.4byte zone3_boss_itemboxes
+	.4byte zone3_act2_itemboxes
+	.4byte zone4_act1_itemboxes
+	.4byte zone4_act2_itemboxes
+	.4byte zone4_boss_itemboxes
+	.4byte zone4_act2_itemboxes
+	.4byte zone5_act1_itemboxes
+	.4byte zone5_act2_itemboxes
+	.4byte zone5_boss_itemboxes
+	.4byte zone5_act2_itemboxes
+	.4byte zone6_act1_itemboxes
+	.4byte zone6_act2_itemboxes
+	.4byte zone6_boss_itemboxes
+	.4byte zone6_act2_itemboxes
+	.4byte zone7_act1_itemboxes
+	.4byte zone7_act2_itemboxes
+	.4byte zone7_boss_itemboxes
+	.4byte zone7_act2_itemboxes
+	.4byte zone8_act1_itemboxes
+	.4byte zone8_act2_itemboxes
+	.4byte zone8_boss_itemboxes
+	.4byte 0
+	.4byte 0
+	.4byte 0
+
+.global gSpritePosData_enemies
+gSpritePosData_enemies:
+	.4byte zone1_act1_enemies
+	.4byte zone1_act2_enemies
+	.4byte zone1_boss_enemies
+	.4byte zone1_act2_enemies
+	.4byte zone2_act1_enemies
+	.4byte zone2_act2_enemies
+	.4byte zone2_boss_enemies
+	.4byte zone2_act2_enemies
+	.4byte zone3_act1_enemies
+	.4byte zone3_act2_enemies
+	.4byte zone3_boss_enemies
+	.4byte zone3_act2_enemies
+	.4byte zone4_act1_enemies
+	.4byte zone4_act2_enemies
+	.4byte zone4_boss_enemies
+	.4byte zone4_act2_enemies
+	.4byte zone5_act1_enemies
+	.4byte zone5_act2_enemies
+	.4byte zone5_boss_enemies
+	.4byte zone5_act2_enemies
+	.4byte zone6_act1_enemies
+	.4byte zone6_act2_enemies
+	.4byte zone6_boss_enemies
+	.4byte zone6_act2_enemies
+	.4byte zone7_act1_enemies
+	.4byte zone7_act2_enemies
+	.4byte zone7_boss_enemies
+	.4byte zone7_act2_enemies
+	.4byte zone8_act1_enemies
+	.4byte zone8_act2_enemies
+	.4byte zone8_boss_enemies
+	.4byte 0
+	.4byte 0
+	.4byte 0