summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/battle_anim_effects_misc.s269
-rw-r--r--data/battle_anim_scripts.s140
-rw-r--r--data/data_8471F00.s24
-rw-r--r--data/field_weather.s2
-rw-r--r--data/graphics.s2
5 files changed, 78 insertions, 359 deletions
diff --git a/data/battle_anim_effects_misc.s b/data/battle_anim_effects_misc.s
index 69424e5c6..e9e96f2c8 100644
--- a/data/battle_anim_effects_misc.s
+++ b/data/battle_anim_effects_misc.s
@@ -499,7 +499,10 @@ gUnknown_83E5A38::
.incbin "baserom.gba", 0x3E5A38, 0x18
gUnknown_83E5A50::
- .incbin "baserom.gba", 0x3E5A50, 0x30
+ .incbin "baserom.gba", 0x3E5A50, 0x28
+
+gUnknown_83E5A78::
+ .incbin "baserom.gba", 0x3E5A78, 0x8
gUnknown_83E5A80::
.incbin "baserom.gba", 0x3E5A80, 0x18
@@ -522,265 +525,5 @@ gUnknown_83E5B70::
gUnknown_83E5B88:: @ 83E5B88
.incbin "baserom.gba", 0x3E5B88, 0x18
-gUnknown_83E5BA0::
- .incbin "baserom.gba", 0x3E5BA0, 0x40
-
-gUnknown_83E5BE0::
- .incbin "baserom.gba", 0x3E5BE0, 0x18
-
-gUnknown_83E5BF8::
- .incbin "baserom.gba", 0x3E5BF8, 0x78
-
-gUnknown_83E5C70::
- .incbin "baserom.gba", 0x3E5C70, 0x18
-
-gUnknown_83E5C88::
- .incbin "baserom.gba", 0x3E5C88, 0x18
-
-gUnknown_83E5CA0::
- .incbin "baserom.gba", 0x3E5CA0, 0x78
-
-gUnknown_83E5D18::
- .incbin "baserom.gba", 0x3E5D18, 0x30
-
-@ ================
-gUnknown_83E5D48:: @ 83E5D48
- .incbin "baserom.gba", 0x3E5D48, 0x4
-
-gUnknown_83E5D4C::
- .incbin "baserom.gba", 0x3E5D4C, 0x18
-
-gUnknown_83E5D64::
- .incbin "baserom.gba", 0x3E5D64, 0x18
-
-gUnknown_83E5D7C::
- .incbin "baserom.gba", 0x3E5D7C, 0x18
-
-gUnknown_83E5D94::
- .incbin "baserom.gba", 0x3E5D94, 0x50
-
-gUnknown_83E5DE4::
- .incbin "baserom.gba", 0x3E5DE4, 0x18
-
-gUnknown_83E5DFC::
- .incbin "baserom.gba", 0x3E5DFC, 0x18
-
-gUnknown_83E5E14::
- .incbin "baserom.gba", 0x3E5E14, 0x18
-
-gUnknown_83E5E2C:: @ 83E5E2C
- .incbin "baserom.gba", 0x3E5E2C, 0x18
-
-gUnknown_83E5E44:: @ 83E5E44
- .incbin "baserom.gba", 0x3E5E44, 0x2
-
-gUnknown_83E5E46:: @ 83E5E46
- .incbin "baserom.gba", 0x3E5E46, 0x1A
-
-gUnknown_83E5E60::
- .incbin "baserom.gba", 0x3E5E60, 0x54
-
-gUnknown_83E5EB4::
- .incbin "baserom.gba", 0x3E5EB4, 0x30
-
-gUnknown_83E5EE4::
- .incbin "baserom.gba", 0x3E5EE4, 0x18
-
-gUnknown_83E5EFC:: @ 83E5EFC
- .incbin "baserom.gba", 0x3E5EFC, 0x10
-
-gUnknown_83E5F0C:: @ 83E5F0C
- .incbin "baserom.gba", 0x3E5F0C, 0x2C
-
-gUnknown_83E5F38:: @ 83E5F38
- .incbin "baserom.gba", 0x3E5F38, 0x8C
-
-gUnknown_83E5FC4::
- .incbin "baserom.gba", 0x3E5FC4, 0x18
-
-gUnknown_83E5FDC::
- .incbin "baserom.gba", 0x3E5FDC, 0x2C
-
-gUnknown_83E6008::
- .incbin "baserom.gba", 0x3E6008, 0x50
-
-gUnknown_83E6058::
- .incbin "baserom.gba", 0x3E6058, 0x18
-
-gUnknown_83E6070::
- .incbin "baserom.gba", 0x3E6070, 0x18
-
-gUnknown_83E6088::
- .incbin "baserom.gba", 0x3E6088, 0x18
-
-gUnknown_83E60A0:: @ 83E60A0
- .incbin "baserom.gba", 0x3E60A0, 0x18
-
-gUnknown_83E60B8:: @ 83E60B8
- .incbin "baserom.gba", 0x3E60B8, 0x18
-
-gUnknown_83E60D0:: @ 83E60D0
- .incbin "baserom.gba", 0x3E60D0, 0x50
-
-gUnknown_83E6120:: @ 83E6120
- .incbin "baserom.gba", 0x3E6120, 0xB4
-
-gUnknown_83E61D4::
- .incbin "baserom.gba", 0x3E61D4, 0x30
-
-gUnknown_83E6204::
- .incbin "baserom.gba", 0x3E6204, 0x18
-
-gUnknown_83E621C::
- .incbin "baserom.gba", 0x3E621C, 0x5C
-
-gUnknown_83E6278:: @ 83E6278
- .incbin "baserom.gba", 0x3E6278, 0x18
-
-gUnknown_83E6290::
- .incbin "baserom.gba", 0x3E6290, 0x18
-
-gUnknown_83E62A8:: @ 83E62A8
- .incbin "baserom.gba", 0x3E62A8, 0xA0
-
-gUnknown_83E6348::
- .incbin "baserom.gba", 0x3E6348, 0x18
-
-gUnknown_83E6360::
- .incbin "baserom.gba", 0x3E6360, 0x2C
-
-gUnknown_83E638C::
- .incbin "baserom.gba", 0x3E638C, 0x18
-
-gUnknown_83E63A4::
- .incbin "baserom.gba", 0x3E63A4, 0x3C
-
-gUnknown_83E63E0:: @ 83E63E0
- .incbin "baserom.gba", 0x3E63E0, 0x18
-
-gUnknown_83E63F8::
- .incbin "baserom.gba", 0x3E63F8, 0x18
-
-gUnknown_83E6410::
- .incbin "baserom.gba", 0x3E6410, 0x18
-
-gUnknown_83E6428::
- .incbin "baserom.gba", 0x3E6428, 0x18
-
-gUnknown_83E6440::
- .incbin "baserom.gba", 0x3E6440, 0x3C
-
-gUnknown_83E647C::
- .incbin "baserom.gba", 0x3E647C, 0x28
-
-gUnknown_83E64A4::
- .incbin "baserom.gba", 0x3E64A4, 0x18
-
-gUnknown_83E64BC::
- .incbin "baserom.gba", 0x3E64BC, 0x18
-
-gUnknown_83E64D4:: @ 83E64D4
- .incbin "baserom.gba", 0x3E64D4, 0x14
-
-gUnknown_83E64E8::
- .incbin "baserom.gba", 0x3E64E8, 0x18
-
-gUnknown_83E6500:: @ 83E6500
- .incbin "baserom.gba", 0x3E6500, 0x14
-
-gUnknown_83E6514::
- .incbin "baserom.gba", 0x3E6514, 0x18
-
-gUnknown_83E652C:: @ 83E652C
- .incbin "baserom.gba", 0x3E652C, 0x78
-
-gUnknown_83E65A4:: @ 83E65A4
- .incbin "baserom.gba", 0x3E65A4, 0x18
-
-gUnknown_83E65BC::
- .incbin "baserom.gba", 0x3E65BC, 0xA0
-
-gUnknown_83E665C::
- .incbin "baserom.gba", 0x3E665C, 0x18
-
-gUnknown_83E6674::
- .incbin "baserom.gba", 0x3E6674, 0x6C
-
-gUnknown_83E66E0::
- .incbin "baserom.gba", 0x3E66E0, 0x18
-
-gUnknown_83E66F8::
- .incbin "baserom.gba", 0x3E66F8, 0x18
-
-gUnknown_83E6710::
- .incbin "baserom.gba", 0x3E6710, 0x18
-
-gUnknown_83E6728::
- .incbin "baserom.gba", 0x3E6728, 0x18
-
-gUnknown_83E6740::
- .incbin "baserom.gba", 0x3E6740, 0x18
-
-gUnknown_83E6758::
- .incbin "baserom.gba", 0x3E6758, 0x34
-
-gUnknown_83E678C::
- .incbin "baserom.gba", 0x3E678C, 0x34
-
-gUnknown_83E67C0::
- .incbin "baserom.gba", 0x3E67C0, 0x18
-
-gUnknown_83E67D8::
- .incbin "baserom.gba", 0x3E67D8, 0x18
-
-gUnknown_83E67F0::
- .incbin "baserom.gba", 0x3E67F0, 0x18
-
-gUnknown_83E6808::
- .incbin "baserom.gba", 0x3E6808, 0x18
-
-gUnknown_83E6820::
- .incbin "baserom.gba", 0x3E6820, 0x44
-
-gUnknown_83E6864::
- .incbin "baserom.gba", 0x3E6864, 0x18
-
-gUnknown_83E687C::
- .incbin "baserom.gba", 0x3E687C, 0x18
-
-gUnknown_83E6894::
- .incbin "baserom.gba", 0x3E6894, 0x18
-
-gUnknown_83E68AC::
- .incbin "baserom.gba", 0x3E68AC, 0x54
-
-gUnknown_83E6900::
- .incbin "baserom.gba", 0x3E6900, 0x48
-
-gUnknown_83E6948::
- .incbin "baserom.gba", 0x3E6948, 0x34
-
-gUnknown_83E697C::
- .incbin "baserom.gba", 0x3E697C, 0x30
-
-gUnknown_83E69AC::
- .incbin "baserom.gba", 0x3E69AC, 0x74
-
-gUnknown_83E6A20::
- .incbin "baserom.gba", 0x3E6A20, 0x18
-
-gUnknown_83E6A38::
- .incbin "baserom.gba", 0x3E6A38, 0x18
-
-gUnknown_83E6A50::
- .incbin "baserom.gba", 0x3E6A50, 0x34
-
-gUnknown_83E6A84::
- .incbin "baserom.gba", 0x3E6A84, 0x34
-
-gUnknown_83E6AB8::
- .incbin "baserom.gba", 0x3E6AB8, 0x18
-
-gUnknown_83E6AD0::
- .incbin "baserom.gba", 0x3E6AD0, 0x18
-
+gUnknown_83E5BA0:: @ 83E5BA0
+ .incbin "baserom.gba", 0x3E5BA0, 0x18
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index 8f5348fd2..cf4cf25cb 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -924,11 +924,11 @@ Move_LEECH_SEED:: @ 81C7C23
Move_EMBER:: @ 81C7C79
loadspritegfx 10029
loopsewithpan SE_W052, 192, 5, 2
- createsprite gUnknown_83E5D4C, ANIM_TARGET, 2, 20, 0, -16, 24, 20, 1
+ createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, -16, 24, 20, 1
delay 4
- createsprite gUnknown_83E5D4C, ANIM_TARGET, 2, 20, 0, 0, 24, 20, 1
+ createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 24, 20, 1
delay 4
- createsprite gUnknown_83E5D4C, ANIM_TARGET, 2, 20, 0, 16, 24, 20, 1
+ createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, 16, 24, 20, 1
delay 16
playsewithpan SE_W172, 63
call gUnknown_81C7CD5
@@ -937,7 +937,7 @@ Move_EMBER:: @ 81C7C79
end
gUnknown_81C7CD5:: @ 81C7CD5
- createsprite gUnknown_83E5D64, ANIM_TARGET, 2, -24, 24, 24, 24, 20, 1, 1
+ createsprite gEmberFlareSpriteTemplate, ANIM_TARGET, 2, -24, 24, 24, 24, 20, 1, 1
delay 4
return
@@ -949,7 +949,7 @@ Move_MEGA_PUNCH:: @ 81C7CED
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 16, 0
setalpha 12, 8
playsewithpan SE_W025, 63
- createsprite gUnknown_83E67C0, ANIM_ATTACKER, 3, 0, 0, 0, 50
+ createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 50
createvisualtask sub_80BA7F8, 10, 4, 2, 0, 7, 32767
delay 50
call gUnknown_81C7D89
@@ -997,7 +997,7 @@ Move_MEGA_KICK:: @ 81C7DC7
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 16, 0
setalpha 12, 8
playsewithpan SE_W025, 63
- createsprite gUnknown_83E67C0, ANIM_ATTACKER, 3, 0, 0, 1, 50
+ createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 50
createvisualtask sub_80BA7F8, 10, 4, 2, 0, 7, 32767
delay 50
playsewithpan SE_W025B, 63
@@ -1031,12 +1031,12 @@ gUnknown_81C7E77:: @ 81C7E77
gUnknown_81C7E91:: @ 81C7E91
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, -8, 1, 2
- createsprite gUnknown_83E6710, ANIM_ATTACKER, 3, -8, 0, 8, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, -8, 0, 8, 1, 0
goto gUnknown_81C7E77
gUnknown_81C7EB6:: @ 81C7EB6
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 8, -8, 1, 2
- createsprite gUnknown_83E6710, ANIM_ATTACKER, 3, 8, 0, 8, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 8, 0, 8, 1, 0
goto gUnknown_81C7E77
Move_SONIC_BOOM:: @ 81C7EDB
@@ -1172,24 +1172,24 @@ gUnknown_81C81E3:: @ 81C81E3
gUnknown_81C81E8:: @ 81C81E8
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -20, -20, 1, 2
- createsprite gUnknown_83E6710, ANIM_TARGET, 3, -20, -12, 8, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, -20, -12, 8, 1, 0
createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1
playsewithpan SE_W233B, 63
delay 8
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 8, 0, 1, 2
- createsprite gUnknown_83E6710, ANIM_TARGET, 3, 8, 8, 8, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 8, 8, 8, 1, 0
createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1
playsewithpan SE_W233B, 63
goto gUnknown_81C81E3
gUnknown_81C8259:: @ 81C8259
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 12, -20, 1, 2
- createsprite gUnknown_83E6710, ANIM_TARGET, 3, 12, -12, 8, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 12, -12, 8, 1, 0
createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1
playsewithpan SE_W233B, 63
delay 8
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -12, 0, 1, 2
- createsprite gUnknown_83E6710, ANIM_TARGET, 3, -12, 8, 8, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, -12, 8, 8, 1, 0
createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1
playsewithpan SE_W233B, 63
goto gUnknown_81C81E3
@@ -1283,7 +1283,7 @@ Move_REVERSAL:: @ 81C8445
delay 8
playsewithpan SE_W233B, 63
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 32767, 8, 0, 0
- createsprite gUnknown_83E6710, ANIM_TARGET, 4, 0, 0, 10, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 10, 1, 0
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1
createvisualtask sub_8099BD4, 5, 0, 1, 8, 1, 0
end
@@ -1383,7 +1383,7 @@ Move_DIZZY_PUNCH:: @ 81C86FC
monbg 1
setalpha 12, 8
call gUnknown_81C8817
- createsprite gUnknown_83E6710, ANIM_TARGET, 5, 16, 8, 20, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_TARGET, 5, 16, 8, 20, 1, 0
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 16, 0, 1, 1
playsewithpan SE_W004, 63
createsprite gUnknown_83E67F0, ANIM_TARGET, 3, 16, 8, 160, -32
@@ -1394,7 +1394,7 @@ Move_DIZZY_PUNCH:: @ 81C86FC
createsprite gUnknown_83E67F0, ANIM_TARGET, 3, 16, 8, -384, -31
delay 10
call gUnknown_81C8817
- createsprite gUnknown_83E6710, ANIM_TARGET, 5, -16, -8, 20, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_TARGET, 5, -16, -8, 20, 1, 0
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -16, -16, 1, 1
playsewithpan SE_W233B, 63
createsprite gUnknown_83E67F0, ANIM_TARGET, 3, -16, -8, 160, -32
@@ -3196,7 +3196,7 @@ gUnknown_81CB11E:: @ 81CB11E
playsewithpan SE_W026, 192
delay 6
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1
- createsprite gUnknown_83E6710, ANIM_TARGET, 4, 0, 0, 8, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0
playsewithpan SE_W004, 63
createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1
waitforvisualfinish
@@ -3523,7 +3523,7 @@ Move_HEAT_WAVE:: @ 81CB766
loadspritegfx 10261
createvisualtask AnimTask_BlendParticle, 5, 10261, 0, 6, 6, 31
createvisualtask AnimTask_LoadSandstormBackground, 5, 1
- createvisualtask sub_80ADAA4, 6, 6, 31
+ createvisualtask AnimTask_BlendBackground, 6, 6, 31
panse_1B SE_W257, 192, 63, 2, 0
delay 4
createvisualtask sub_80AD800, 5,
@@ -3548,7 +3548,7 @@ Move_HAIL:: @ 81CB816
loadspritegfx 10141
createvisualtask sub_80BA7F8, 10, 1, 3, 0, 6, 0
waitforvisualfinish
- createvisualtask sub_80B038C, 5,
+ createvisualtask AnimTask_Hail1, 5,
loopsewithpan SE_W258, 0, 8, 10
waitforvisualfinish
createvisualtask sub_80BA7F8, 10, 1, 3, 6, 0, 0
@@ -3776,20 +3776,20 @@ gUnknown_81CBC47:: @ 81CBC47
delay 4
delay 1
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -18, -18, 1, 1
- createsprite gUnknown_83E6710, ANIM_ATTACKER, 2, -18, -18, 10, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, -18, -18, 10, 1, 0
playsewithpan SE_W233, 63
delay 20
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8
delay 5
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, 18, 1, 1
- createsprite gUnknown_83E6710, ANIM_ATTACKER, 2, 18, 18, 10, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 18, 18, 10, 1, 0
playsewithpan SE_W233, 63
delay 20
createvisualtask AnimTask_WindUpLunge, 2, 0, -24, 0, 24, 10, 24, 3
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 6, 0
delay 37
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1
- createsprite gUnknown_83E6710, ANIM_ATTACKER, 2, 0, 0, 10, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 10, 1, 0
playsewithpan SE_W233B, 63
waitforvisualfinish
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 6, 0, 0
@@ -3805,20 +3805,20 @@ gUnknown_81CBD16:: @ 81CBD16
createsprite gUnknown_83E6808, ANIM_ATTACKER, 3, 1, 0, 0, 90, 10
delay 1
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -18, -18, 1, 1
- createsprite gUnknown_83E6710, ANIM_ATTACKER, 2, -18, -18, 10, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, -18, -18, 10, 1, 0
playsewithpan SE_W233, 63
delay 20
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8
delay 5
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, 18, 1, 1
- createsprite gUnknown_83E6710, ANIM_ATTACKER, 2, 18, 18, 10, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 18, 18, 10, 1, 0
playsewithpan SE_W233, 63
delay 20
createvisualtask AnimTask_WindUpLunge, 2, 0, -24, 0, 24, 10, 24, 3
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 6, 0
delay 37
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1
- createsprite gUnknown_83E6710, ANIM_ATTACKER, 2, 0, 0, 10, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 10, 1, 0
playsewithpan SE_W233B, 63
waitforvisualfinish
createsprite gUnknown_83E6820, ANIM_ATTACKER, 2, 1, 0, -8, -12
@@ -4026,7 +4026,7 @@ Move_MIST_BALL:: @ 81CC212
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 1, 1, 32279, 16, 32767, 16
delay 0
playsewithpan SE_W114, 0
- createvisualtask sub_80AFD80, 5,
+ createvisualtask AnimTask_LoadMistTiles, 5,
createvisualtask sub_80BA7F8, 10, 4, 3, 0, 16, 32767
delay 8
createvisualtask AnimTask_ShakeMon, 2, 1, 4, 0, 70, 0
@@ -4154,7 +4154,7 @@ Move_NEEDLE_ARM:: @ 81CC513
waitforvisualfinish
createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 18, 1
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1
- createsprite gUnknown_83E6710, ANIM_TARGET, 4, 0, 0, 8, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0
playsewithpan SE_W233B, 63
createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 1, 0, -24, 10
createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 1, 17, -17, 10
@@ -4379,7 +4379,7 @@ Move_SHADOW_PUNCH:: @ 81CCB76
playsewithpan SE_W026, 192
delay 6
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1
- createsprite gUnknown_83E6710, ANIM_TARGET, 4, 0, 0, 8, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0
playsewithpan SE_W004, 63
createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1
waitforvisualfinish
@@ -4749,7 +4749,7 @@ Move_ICE_PUNCH:: @ 81CD2E0
createsprite gUnknown_83E6348, ANIM_ATTACKER, 2, 160
createsprite gUnknown_83E6348, ANIM_ATTACKER, 2, 224
delay 17
- createsprite gUnknown_83E6710, ANIM_ATTACKER, 4, 0, -10, 8, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 4, 0, -10, 8, 1, 0
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, -10, 1, 1
playsewithpan SE_W004, 63
delay 2
@@ -4914,7 +4914,7 @@ Move_THUNDER_PUNCH:: @ 81CD6CA
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, 0
waitforvisualfinish
playsewithpan SE_W004, 63
- createsprite gUnknown_83E6710, ANIM_TARGET, 4, 0, 0, 8, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1
delay 1
createvisualtask sub_80BA0E8, 2, 257, 257, 257
@@ -6661,19 +6661,19 @@ gUnknown_81CFEEB:: @ 81CFEEB
end
gUnknown_81CFEF0:: @ 81CFEF0
- createsprite gUnknown_83E6710, ANIM_TARGET, 4, -16, -8, 20, 1, 1
+ createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, -16, -8, 20, 1, 1
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -16, -16, 1, 2
createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1
goto gUnknown_81CFEEB
gUnknown_81CFF26:: @ 81CFF26
- createsprite gUnknown_83E6710, ANIM_TARGET, 4, 8, 8, 20, 1, 1
+ createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 8, 8, 20, 1, 1
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 8, 0, 1, 2
createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1
goto gUnknown_81CFEEB
gUnknown_81CFF5C:: @ 81CFF5C
- createsprite gUnknown_83E6710, ANIM_TARGET, 4, 0, 0, 20, 1, 1
+ createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 20, 1, 1
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, -8, 1, 1
createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1
goto gUnknown_81CFEEB
@@ -6687,7 +6687,7 @@ Move_DYNAMIC_PUNCH:: @ 81CFF92
monbg 3
setalpha 12, 8
playsewithpan SE_W233B, 63
- createsprite gUnknown_83E6710, ANIM_TARGET, 3, 0, 0, 20, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 20, 1, 0
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 0
createvisualtask AnimTask_ShakeMon, 5, 1, 5, 0, 7, 1
delay 1
@@ -6726,17 +6726,17 @@ Move_COUNTER:: @ 81D005A
playsewithpan SE_W233B, 63
delay 1
createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 25, 1
- createsprite gUnknown_83E6710, ANIM_ATTACKER, 3, -15, 18, 8, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, -15, 18, 8, 1, 0
delay 3
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, -4, 1, 0
playsewithpan SE_W233B, 63
delay 1
- createsprite gUnknown_83E6710, ANIM_ATTACKER, 3, 0, -4, 8, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 0, -4, 8, 1, 0
delay 3
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 15, 9, 1, 0
playsewithpan SE_W233B, 63
delay 1
- createsprite gUnknown_83E6710, ANIM_ATTACKER, 3, 15, 9, 8, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 15, 9, 8, 1, 0
delay 5
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5
waitforvisualfinish
@@ -6775,7 +6775,7 @@ Move_ROCK_SMASH:: @ 81D01A4
setalpha 12, 8
delay 1
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1
- createsprite gUnknown_83E6710, ANIM_ATTACKER, 2, 0, 0, 8, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 8, 1, 0
playsewithpan SE_W233B, 63
createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 5, 1
waitforvisualfinish
@@ -7050,7 +7050,7 @@ gUnknown_81D086C:: @ 81D086C
Move_HAZE:: @ 81D0882
waitforvisualfinish
playsewithpan SE_W114, 0
- createvisualtask sub_80AFAE4, 5,
+ createvisualtask AnimTask_Haze1, 5,
delay 30
createvisualtask sub_80BA7F8, 10, 1920, 2, 0, 16, 0
delay 90
@@ -7070,7 +7070,7 @@ Move_FIRE_PUNCH:: @ 81D08B5
createsprite gUnknown_83E5BE0, ANIM_TARGET, 1, 196
playsewithpan SE_W172, 63
waitforvisualfinish
- createsprite gUnknown_83E6710, ANIM_TARGET, 3, 0, 0, 8, 1, 0
+ createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 8, 1, 0
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 1
createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 15, 1
call gUnknown_81D0950
@@ -9935,7 +9935,7 @@ Move_MAGICAL_LEAF:: @ 81D4E6D
Move_ICE_BALL:: @ 81D4F8E
loadspritegfx 10043
loadspritegfx 10141
- createvisualtask sub_80B0870, 5, 0
+ createvisualtask AnimTask_GetRolloutCounter, 5, 0
jumpargeq 0, 4, gUnknown_81D5005
gUnknown_81D4FA5:: @ 81D4FA5
@@ -9943,7 +9943,7 @@ gUnknown_81D4FA5:: @ 81D4FA5
createsprite gUnknown_83E665C, ANIM_TARGET, 2, 15, 0, -12, -16, 30, -40
delay 28
playsewithpan SE_W280, 63
- createvisualtask sub_80B0870, 5, 0
+ createvisualtask AnimTask_GetRolloutCounter, 5, 0
jumpargeq 0, 0, gUnknown_81D5016
jumpargeq 0, 1, gUnknown_81D5045
jumpargeq 0, 2, gUnknown_81D507E
@@ -9951,7 +9951,7 @@ gUnknown_81D4FA5:: @ 81D4FA5
jumpargeq 0, 4, gUnknown_81D5109
gUnknown_81D4FF3:: @ 81D4FF3
- createvisualtask sub_80B0870, 5, 0
+ createvisualtask AnimTask_GetRolloutCounter, 5, 0
jumpargeq 0, 4, gUnknown_81D500C
gUnknown_81D5004:: @ 81D5004
@@ -10272,88 +10272,88 @@ gUnknown_81D5712:: @ 81D5712
return
gUnknown_81D575B:: @ 81D575B
- createsprite gUnknown_83E6AB8, ANIM_TARGET, 2, 10, 10, 0
+ createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 10, 10, 0
playsewithpan SE_W092, 63
delay 6
- createsprite gUnknown_83E6AB8, ANIM_TARGET, 2, 20, -20, 0
+ createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, -20, 0
playsewithpan SE_W092, 63
delay 6
- createsprite gUnknown_83E6AB8, ANIM_TARGET, 2, -20, 15, 0
+ createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, -20, 15, 0
playsewithpan SE_W092, 63
delay 6
- createsprite gUnknown_83E6AB8, ANIM_TARGET, 2, 0, 0, 0
+ createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0
playsewithpan SE_W092, 63
delay 6
- createsprite gUnknown_83E6AB8, ANIM_TARGET, 2, -20, -20, 0
+ createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, -20, -20, 0
playsewithpan SE_W092, 63
delay 6
- createsprite gUnknown_83E6AB8, ANIM_TARGET, 2, 16, -8, 0
+ createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 16, -8, 0
playsewithpan SE_W092, 63
return
gUnknown_81D57CC:: @ 81D57CC
- createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, 10, 10, 0
+ createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 0
playsewithpan SE_W145C, 63
delay 6
- createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, 20, -20, 0
+ createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 20, -20, 0
playsewithpan SE_W145C, 63
delay 6
- createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, -20, 15, 0
+ createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 0
playsewithpan SE_W145C, 63
delay 6
- createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, 0, 0, 0
+ createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0
playsewithpan SE_W145C, 63
delay 6
- createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, -20, -20, 0
+ createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, -20, 0
playsewithpan SE_W145C, 63
delay 6
- createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, 16, -8, 0
+ createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 16, -8, 0
playsewithpan SE_W145C, 63
return
gUnknown_81D583D:: @ 81D583D
- createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, 10, 10, 1
+ createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 1
playsewithpan SE_W145C, 63
delay 6
- createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, -28, -10, 1
+ createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -28, -10, 1
playsewithpan SE_W145C, 63
delay 6
- createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, 20, -20, 1
+ createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 20, -20, 1
playsewithpan SE_W145C, 63
delay 6
- createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, -20, 15, 1
+ createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 1
playsewithpan SE_W145C, 63
delay 6
- createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, 0, 0, 1
+ createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1
playsewithpan SE_W145C, 63
delay 6
- createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, 27, 8, 1
+ createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 27, 8, 1
playsewithpan SE_W145C, 63
delay 6
- createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, -20, -20, 1
+ createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, -20, 1
playsewithpan SE_W145C, 63
delay 6
- createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, 16, -8, 1
+ createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 16, -8, 1
playsewithpan SE_W145C, 63
return
gUnknown_81D58D4:: @ 81D58D4
playsewithpan SE_W085B, 63
- createsprite gUnknown_83E6088, ANIM_TARGET, 2, 5, 0, 5, 0
+ createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 5, 0, 5, 0
delay 2
- createsprite gUnknown_83E6088, ANIM_TARGET, 2, -5, 10, 5, 1
+ createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -5, 10, 5, 1
delay 2
- createsprite gUnknown_83E6088, ANIM_TARGET, 2, 15, 20, 5, 2
+ createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 15, 20, 5, 2
delay 2
- createsprite gUnknown_83E6088, ANIM_TARGET, 2, -15, -10, 5, 0
+ createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -15, -10, 5, 0
delay 2
- createsprite gUnknown_83E6088, ANIM_TARGET, 2, 25, 0, 5, 1
+ createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 25, 0, 5, 1
delay 2
- createsprite gUnknown_83E6088, ANIM_TARGET, 2, -8, 8, 5, 2
+ createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -8, 8, 5, 2
delay 2
- createsprite gUnknown_83E6088, ANIM_TARGET, 2, 2, -8, 5, 0
+ createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 2, -8, 5, 0
delay 2
- createsprite gUnknown_83E6088, ANIM_TARGET, 2, -20, 15, 5, 1
+ createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -20, 15, 5, 1
return
gUnknown_81D595F:: @ 81D595F
diff --git a/data/data_8471F00.s b/data/data_8471F00.s
index 82d507ea1..62a23c646 100644
--- a/data/data_8471F00.s
+++ b/data/data_8471F00.s
@@ -191,30 +191,6 @@ gUnknown_8478EC4:: @ 8478EC4
gUnknown_8478F14:: @ 8478F14
.incbin "baserom.gba", 0x478F14, 0x8
-gUnknown_8478F1C:: @ 8478F1C
- .incbin "baserom.gba", 0x478F1C, 0x144
-
-gUnknown_8479060:: @ 8479060
- .incbin "baserom.gba", 0x479060, 0x78
-
-gUnknown_84790D8:: @ 84790D8
- .incbin "baserom.gba", 0x4790D8, 0xC0
-
-gUnknown_8479198:: @ 8479198
- .incbin "baserom.gba", 0x479198, 0x10
-
-gUnknown_84791A8:: @ 84791A8
- .incbin "baserom.gba", 0x4791A8, 0x10
-
-gUnknown_84791B8:: @ 84791B8
- .incbin "baserom.gba", 0x4791B8, 0x14
-
-gUnknown_84791CC:: @ 84791CC
- .incbin "baserom.gba", 0x4791CC, 0x1C
-
-gUnknown_84791E8:: @ 84791E8
- .incbin "baserom.gba", 0x4791E8, 0x18
-
.section .rodata.8479668
.align 2
diff --git a/data/field_weather.s b/data/field_weather.s
index 517480d9a..03b3e8faa 100644
--- a/data/field_weather.s
+++ b/data/field_weather.s
@@ -25,7 +25,7 @@ gUnknown_83C2D00:: @ 83C2D00
gUnknown_83C2D20:: @ 83C2D20
.incbin "baserom.gba", 0x3C2D20, 0x820
-gUnknown_83C3540:: @ 83C3540
+gWeatherFog1Tiles:: @ 83C3540
.incbin "baserom.gba", 0x3C3540, 0x3080
gUnknown_83C65C0:: @ 83C65C0
diff --git a/data/graphics.s b/data/graphics.s
index 7ead75c74..5eacc0cb2 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -13760,7 +13760,7 @@ gFile_graphics_battle_anims_sprites_277_sheet:: @ 8E7EE00
.incbin "graphics/battle_anims/sprites/277.4bpp.lz"
.align 2
-gFile_graphics_battle_anims_backgrounds_fog_tilemap:: @ 8E7F1F4
+gBattleAnimFogTilemap:: @ 8E7F1F4
.incbin "graphics/battle_anims/backgrounds/fog.bin.lz"
.align 2
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-20 06:00:40 +0000