Merge branch 'master' into tilemap-docs

This commit is contained in:
octorock
2023-12-28 14:59:23 +01:00
495 changed files with 14619 additions and 16191 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