From 4d67e6fe1ff97f964e700b27dc2b1f8911002a12 Mon Sep 17 00:00:00 2001 From: octorock <79596758+octorock@users.noreply.github.com> Date: Mon, 31 Jul 2023 21:31:30 +0200 Subject: Create new entity structs for Objects --- data/animations/object/thunderbold.s | 20 -------------------- data/animations/object/thunderbolt.s | 20 ++++++++++++++++++++ data/gfx/sprite_ptrs.s | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 data/animations/object/thunderbold.s create mode 100644 data/animations/object/thunderbolt.s (limited to 'data') diff --git a/data/animations/object/thunderbold.s b/data/animations/object/thunderbold.s deleted file mode 100644 index e221b379..00000000 --- a/data/animations/object/thunderbold.s +++ /dev/null @@ -1,20 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gSpriteAnimations_Thunderbold_0:: @ 0812296C - .include "animations/gSpriteAnimations_Thunderbold_0.s" - -gSpriteAnimations_Thunderbold_1:: @ 0812297C - .include "animations/gSpriteAnimations_Thunderbold_1.s" - -gSpriteAnimations_Thunderbold_2:: @ 08122988 - .include "animations/gSpriteAnimations_Thunderbold_2.s" - -gSpriteAnimations_Thunderbold:: @ 081229A4 - .4byte gSpriteAnimations_Thunderbold_0 - .4byte gSpriteAnimations_Thunderbold_1 - .4byte gSpriteAnimations_Thunderbold_2 - .4byte 00000000 diff --git a/data/animations/object/thunderbolt.s b/data/animations/object/thunderbolt.s new file mode 100644 index 00000000..3b84b360 --- /dev/null +++ b/data/animations/object/thunderbolt.s @@ -0,0 +1,20 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gSpriteAnimations_Thunderbolt_0:: @ 0812296C + .include "animations/gSpriteAnimations_Thunderbolt_0.s" + +gSpriteAnimations_Thunderbolt_1:: @ 0812297C + .include "animations/gSpriteAnimations_Thunderbolt_1.s" + +gSpriteAnimations_Thunderbolt_2:: @ 08122988 + .include "animations/gSpriteAnimations_Thunderbolt_2.s" + +gSpriteAnimations_Thunderbolt:: @ 081229A4 + .4byte gSpriteAnimations_Thunderbolt_0 + .4byte gSpriteAnimations_Thunderbolt_1 + .4byte gSpriteAnimations_Thunderbolt_2 + .4byte 00000000 diff --git a/data/gfx/sprite_ptrs.s b/data/gfx/sprite_ptrs.s index d2ebeb6f..364bf75e 100644 --- a/data/gfx/sprite_ptrs.s +++ b/data/gfx/sprite_ptrs.s @@ -825,7 +825,7 @@ gSpritePtrs:: @ 080029B4 .4byte 00000000 .4byte 00000000 - .4byte gSpriteAnimations_Thunderbold + .4byte gSpriteAnimations_Thunderbolt .4byte 00000000 .4byte 00000000 .4byte 00000000 -- cgit v1.2.3