summaryrefslogtreecommitdiff
path: root/data/smokescreen.s
diff options
context:
space:
mode:
authorscnorton <scnorton@biociphers.org>2018-01-18 12:53:31 -0500
committerscnorton <scnorton@biociphers.org>2018-01-18 12:53:31 -0500
commitc6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (patch)
tree47e2f5eaa84c3cc97b96bdf06170136abe446d81 /data/smokescreen.s
parent3c2b1731eeb7037a1b681444b1c126fc239a904e (diff)
parent24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff)
Merge branch 'master' into link
Diffstat (limited to 'data/smokescreen.s')
-rw-r--r--data/smokescreen.s6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/smokescreen.s b/data/smokescreen.s
index d92c972df..aeb8e685b 100644
--- a/data/smokescreen.s
+++ b/data/smokescreen.s
@@ -14,11 +14,11 @@ gUnknown_0831C604:: @ 831C604
.align 2
gUnknown_0831C620:: @ 831C620
- obj_tiles gUnknown_08C01644, 0x0180, 0xd6eb
+ obj_tiles gSmokescreenImpactTiles, 0x0180, 0xd6eb
.align 2
gUnknown_0831C628:: @ 831C628
- obj_pal gUnknown_08C01724, 0xd6eb
+ obj_pal gSmokescreenImpactPalette, 0xd6eb
.align 2
gUnknown_0831C630:: @ 831C630
@@ -53,7 +53,7 @@ gUnknown_0831C688:: @ 831C688
.align 2
gSpriteSheet_EnemyShadow:: @ 831C6A0
- obj_tiles gUnknown_08D8FBC0, 0x0080, 0xd759
+ obj_tiles gEnemyMonShadow_Gfx, 0x0080, 0xd759
.align 2
gUnknown_0831C6A8:: @ 831C6A8