diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-27 12:50:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-27 12:50:52 -0500 |
| commit | 65690ca7dc880f08a4c63d490797f4b16ce5195e (patch) | |
| tree | 9d21d33ddadf5d86b75190e75a4d7eca12af8397 /data | |
| parent | 2e934469b82a41cb7871c04898547e1a5d58c621 (diff) | |
| parent | e38f52e4359cf895453604b79f1e4466167d2f16 (diff) | |
Merge pull request #247 from PikalaxALT/smokescreen
Port smokescreen.c from emerald
Diffstat (limited to 'data')
| -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 19dceec00..49b13847b 100644 --- a/data/smokescreen.s +++ b/data/smokescreen.s @@ -3,10 +3,10 @@ .section .rodata .align 2 -gUnknown_825098C:: @ 825098C +gSmokescreenImpactSpriteSheet:: @ 825098C obj_tiles gFile_graphics_battle_anims_sprites_smokescreen_impact_sheet, 0x0180, 55019 -gUnknown_8250994:: @ 8250994 +gSmokescreenImpactSpritePalette:: @ 8250994 obj_pal gFile_graphics_battle_anims_sprites_smokescreen_impact_palette, 55019 gOamData_835099C:: @@ -42,8 +42,8 @@ gSpriteAnimTable_82509E4:: .4byte gAnimCmd_82509C4 .4byte gAnimCmd_82509D4 -gUnknown_82509F4:: @ 82509F4 - spr_template 55019, 55019, gOamData_835099C, gSpriteAnimTable_82509E4, NULL, gDummySpriteAffineAnimTable, sub_804A904 +gSmokescreenImpactSpriteTemplate:: @ 82509F4 + spr_template 55019, 55019, gOamData_835099C, gSpriteAnimTable_82509E4, NULL, gDummySpriteAffineAnimTable, SpriteCB_DestroySprite gSpriteSheet_EnemyShadow:: @ 8250A0C obj_tiles gFile_graphics_battle_interface_enemy_mon_shadow_sheet, 0x0080, 55129 |