diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-16 08:36:51 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-16 19:00:07 -0500 |
| commit | 236cbf96c8f94b8b2d23be8c72ee0e188e82842d (patch) | |
| tree | c2042f78efdc37a5b64c9cd797cc0c66a0c80255 /data/smokescreen.s | |
| parent | 50501396b21bf132cf71d0f5d353bf51d277ba27 (diff) | |
| parent | c0d180a8702b9b20afe07b09316286f6406e5811 (diff) | |
Merge origin/master into pikalaxalt/link
Diffstat (limited to 'data/smokescreen.s')
| -rw-r--r-- | data/smokescreen.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/smokescreen.s b/data/smokescreen.s index 6f2478842..d92c972df 100644 --- a/data/smokescreen.s +++ b/data/smokescreen.s @@ -52,7 +52,7 @@ gUnknown_0831C688:: @ 831C688 spr_template 0xd6eb, 0xd6eb, gUnknown_0831C630, gUnknown_0831C678, NULL, gDummySpriteAffineAnimTable, sub_80753B4 .align 2 -gUnknown_0831C6A0:: @ 831C6A0 +gSpriteSheet_EnemyShadow:: @ 831C6A0 obj_tiles gUnknown_08D8FBC0, 0x0080, 0xd759 .align 2 @@ -60,5 +60,5 @@ gUnknown_0831C6A8:: @ 831C6A8 .byte 0x00, 0x40, 0x00, 0x40, 0x00, 0x0c, 0x00, 0x00 .align 2 -gUnknown_0831C6B0:: @ 831C6B0 - spr_template 0xd759, 0xd6ff, gUnknown_0831C6A8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_805EE48 +gSpriteTemplate_EnemyShadow:: @ 831C6B0 + spr_template 0xd759, 0xd6ff, gUnknown_0831C6A8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCB_SetInvisible |