diff options
| author | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
|---|---|---|
| committer | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
| commit | 99e4de062ae43aa978ad4f1a8cd70bc739c64c9d (patch) | |
| tree | 1164d31577e6ebddc1cb313d40bb69ce0d426170 /data/smokescreen.s | |
| parent | 339c2914affc3c62ac9a5725aa1a0c7ccc3161ca (diff) | |
| parent | 6af8c04d8fa6aaeaeb6c8b919e7770a65b9a883d (diff) | |
Merge branch 'master' into event_object_movement
Diffstat (limited to 'data/smokescreen.s')
| -rw-r--r-- | data/smokescreen.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/smokescreen.s b/data/smokescreen.s index 49b13847b..e30e23b0d 100644 --- a/data/smokescreen.s +++ b/data/smokescreen.s @@ -4,10 +4,10 @@ .align 2 gSmokescreenImpactSpriteSheet:: @ 825098C - obj_tiles gFile_graphics_battle_anims_sprites_smokescreen_impact_sheet, 0x0180, 55019 + obj_tiles gSmokescreenImpactTiles, 0x0180, 55019 gSmokescreenImpactSpritePalette:: @ 8250994 - obj_pal gFile_graphics_battle_anims_sprites_smokescreen_impact_palette, 55019 + obj_pal gSmokescreenImpactPalette, 55019 gOamData_835099C:: .4byte 0x40000000, 0x00000400 |