diff --git a/audio/engine.asm b/audio/engine.asm
index 0ef1e7a8..8fa96c77 100644
--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -2784,17 +2784,9 @@ StereoTracks:
 
 ChannelPointers:
 	table_width 2
-; music channels
-	dw wChannel1
-	dw wChannel2
-	dw wChannel3
-	dw wChannel4
-	assert_table_length NUM_MUSIC_CHANS
-; sfx channels
-	dw wChannel5
-	dw wChannel6
-	dw wChannel7
-	dw wChannel8
+for n, 1, NUM_CHANNELS + 1
+	dw wChannel{d:n}
+endr
 	assert_table_length NUM_CHANNELS
 
 ClearChannels::
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm
index 522b9e7d..ef4ded06 100644
--- a/engine/overworld/map_objects.asm
+++ b/engine/overworld/map_objects.asm
@@ -2959,16 +2959,10 @@ InitSprites:
 	ret
 
 .Addresses:
+	table_width 2
 	dw wPlayerStruct
-	dw wObject1Struct
-	dw wObject2Struct
-	dw wObject3Struct
-	dw wObject4Struct
-	dw wObject5Struct
-	dw wObject6Struct
-	dw wObject7Struct
-	dw wObject8Struct
-	dw wObject9Struct
-	dw wObject10Struct
-	dw wObject11Struct
-	dw wObject12Struct
+; wObjectStruct1 - wObjectStruct12
+for n, 1, NUM_OBJECT_STRUCTS
+	dw wObject{d:n}Struct
+endr
+	assert_table_length NUM_OBJECT_STRUCTS
diff --git a/ram/wram.asm b/ram/wram.asm
index c7485817..513b1317 100644
--- a/ram/wram.asm
+++ b/ram/wram.asm
@@ -2361,7 +2361,7 @@ wFollowMovementQueue:: ds 5
 UNION
 wObjectStructs::
 wPlayerStruct:: object_struct wPlayer ; player is object struct 0
-; wObjectStruct1 - wObjectStruct12
+; wObject1Struct - wObject12Struct
 for n, 1, NUM_OBJECT_STRUCTS
 wObject{d:n}Struct:: object_struct wObject{d:n}
 endr