Merge pull request #619 from octorock/objects

This commit is contained in:
notyourav
2023-08-06 17:33:21 -07:00
committed by GitHub
178 changed files with 3740 additions and 3499 deletions
-20
View File
@@ -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
+20
View File
@@ -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
+1 -1
View File
@@ -825,7 +825,7 @@ gSpritePtrs:: @ 080029B4
.4byte 00000000
.4byte 00000000
.4byte gSpriteAnimations_Thunderbold
.4byte gSpriteAnimations_Thunderbolt
.4byte 00000000
.4byte 00000000
.4byte 00000000