Prefix AnimatedObject labels with w.

2 files changed, 25 insertions, 26 deletions

diff --git a/macros.asm b/macros.asm
index b854b25f..28aad1e5 100644
--- a/macros.asm
+++ b/macros.asm
@@ -850,17 +850,17 @@ enum_set: macro
 __enum__ = \1
 endm
 
-ANIM_OBJ_INDEX           EQUS "AnimatedObject0Index - AnimatedObject0"
-ANIM_OBJ_FRAME_SET       EQUS "AnimatedObject0FramesetID - AnimatedObject0"
-ANIM_OBJ_CALLBACK        EQUS "AnimatedObject0AnimSeqID - AnimatedObject0"
-ANIM_OBJ_TILE            EQUS "AnimatedObject0TileID - AnimatedObject0"
-ANIM_OBJ_X_COORD         EQUS "AnimatedObject0XCoord - AnimatedObject0"
-ANIM_OBJ_Y_COORD         EQUS "AnimatedObject0YCoord - AnimatedObject0"
-ANIM_OBJ_X_OFFSET        EQUS "AnimatedObject0XOffset - AnimatedObject0"
-ANIM_OBJ_Y_OFFSET        EQUS "AnimatedObject0YOffset - AnimatedObject0"
-ANIM_OBJ_DURATION        EQUS "AnimatedObject0Duration - AnimatedObject0"
-ANIM_OBJ_DURATION_OFFSET EQUS "AnimatedObject0DurationOffset - AnimatedObject0"
-ANIM_OBJ_FRAME_IDX       EQUS "AnimatedObject0FrameIndex - AnimatedObject0"
+ANIM_OBJ_INDEX           EQUS "wAnimatedObject0Index - wAnimatedObject0"
+ANIM_OBJ_FRAME_SET       EQUS "wAnimatedObject0FramesetID - wAnimatedObject0"
+ANIM_OBJ_CALLBACK        EQUS "wAnimatedObject0AnimSeqID - wAnimatedObject0"
+ANIM_OBJ_TILE            EQUS "wAnimatedObject0TileID - wAnimatedObject0"
+ANIM_OBJ_X_COORD         EQUS "wAnimatedObject0XCoord - wAnimatedObject0"
+ANIM_OBJ_Y_COORD         EQUS "wAnimatedObject0YCoord - wAnimatedObject0"
+ANIM_OBJ_X_OFFSET        EQUS "wAnimatedObject0XOffset - wAnimatedObject0"
+ANIM_OBJ_Y_OFFSET        EQUS "wAnimatedObject0YOffset - wAnimatedObject0"
+ANIM_OBJ_DURATION        EQUS "wAnimatedObject0Duration - wAnimatedObject0"
+ANIM_OBJ_DURATION_OFFSET EQUS "wAnimatedObject0DurationOffset - wAnimatedObject0"
+ANIM_OBJ_FRAME_IDX       EQUS "wAnimatedObject0FrameIndex - wAnimatedObject0"
 ANIM_OBJ_FIELD_B EQU $b
 ANIM_OBJ_FIELD_C EQU $c
 ANIM_OBJ_FIELD_D EQU $d
diff --git a/wram.asm b/wram.asm
index 344b28f4..543072ab 100755
--- a/wram.asm
+++ b/wram.asm
@@ -344,7 +344,6 @@ wAnimatedObjectStartTileOffsets::
 	ds 10 * 2
 wAnimatedObjectDataStructs:: ; c51c
 animated_object: macro
-\1::
 \1Index::          db ; 0
 \1FramesetID::     db ; 1
 \1AnimSeqID::      db ; 2
@@ -360,29 +359,29 @@ animated_object: macro
 \1End::
 	endm
 
-	animated_object AnimatedObject0
-	animated_object AnimatedObject1
-	animated_object AnimatedObject2
-	animated_object AnimatedObject3
-	animated_object AnimatedObject4
-	animated_object AnimatedObject5
-	animated_object AnimatedObject6
-	animated_object AnimatedObject7
-	animated_object AnimatedObject8
-	animated_object AnimatedObject9
+wAnimatedObject0:: animated_object wAnimatedObject0
+wAnimatedObject1:: animated_object wAnimatedObject1
+wAnimatedObject2:: animated_object wAnimatedObject2
+wAnimatedObject3:: animated_object wAnimatedObject3
+wAnimatedObject4:: animated_object wAnimatedObject4
+wAnimatedObject5:: animated_object wAnimatedObject5
+wAnimatedObject6:: animated_object wAnimatedObject6
+wAnimatedObject7:: animated_object wAnimatedObject7
+wAnimatedObject8:: animated_object wAnimatedObject8
+wAnimatedObject9:: animated_object wAnimatedObject9
 
 wNumLoadedAnimatedObjects:: ; c5bc
 	ds 1
 wCurrentAnimatedObjectOAMBufferOffset:: ; c5bd
 	ds 3
 wAnimatedObjectSpawnStateDataPointer:: ; c5c0
-	dw
+	ds 2
 wAnimatedObjectFramesDataPointer:: ; c5c2
-	dw
+	ds 2
 wAnimatedObjectJumptablePointer:: ; c5c4
-	dw
+	ds 2
 wAnimatedObjectOAMDataPointer:: ; c5c6
-	dw
+	ds 2
 wCurAnimatedObjectOAMAttributes:: ; c5c8
 	ds 1
 wCurrentAnimatedObjectVTileOffset:: ; c5c9