diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
| commit | 5a2d676e71b720e752ca8a624a5795b3b1d7eb6c (patch) | |
| tree | 6ef755064008dfae8ce2942dc2762670cdabe815 /data/smokescreen.s | |
| parent | 5007d279fea5326b41b877703c74fcaa56223364 (diff) | |
| parent | 22931846d680de2bc585093678db3f5721aab891 (diff) | |
Merge remote-tracking branch 'upstream' into tustin2121-patch-5
Diffstat (limited to 'data/smokescreen.s')
| -rw-r--r-- | data/smokescreen.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/smokescreen.s b/data/smokescreen.s index aeb8e685b..3cd16ee13 100644 --- a/data/smokescreen.s +++ b/data/smokescreen.s @@ -13,11 +13,11 @@ gUnknown_0831C604:: @ 831C604 .byte 0x00, 0x00, 0x00, 0x00 .align 2 -gUnknown_0831C620:: @ 831C620 +gSmokescreenImpactSpriteSheet:: @ 831C620 obj_tiles gSmokescreenImpactTiles, 0x0180, 0xd6eb .align 2 -gUnknown_0831C628:: @ 831C628 +gSmokescreenlImpactSpritePalette:: @ 831C628 obj_pal gSmokescreenImpactPalette, 0xd6eb .align 2 @@ -48,8 +48,8 @@ gUnknown_0831C678:: @ 831C678 .4byte gUnknown_0831C668 .align 2 -gUnknown_0831C688:: @ 831C688 - spr_template 0xd6eb, 0xd6eb, gUnknown_0831C630, gUnknown_0831C678, NULL, gDummySpriteAffineAnimTable, sub_80753B4 +gSmokescreenImpactSpriteTemplate:: @ 831C688 + spr_template 0xd6eb, 0xd6eb, gUnknown_0831C630, gUnknown_0831C678, NULL, gDummySpriteAffineAnimTable, SpriteCB_DestroySprite .align 2 gSpriteSheet_EnemyShadow:: @ 831C6A0 |