more tag names

This commit is contained in:
garak 2018-10-21 19:30:27 -04:00
parent 7a9c7e5f06
commit f2363f5982
4 changed files with 145 additions and 141 deletions

View File

@ -16,15 +16,15 @@ gUnknown_08592114:: @ 8592114
.align 2
gSleepPowderParticleSpriteTemplate:: @ 8592118
spr_template 0x2753, 0x2753, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840
spr_template ANIM_TAG_SLEEP_POWDER, ANIM_TAG_SLEEP_POWDER, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840
.align 2
gStunSporeParticleSpriteTemplate:: @ 8592130
spr_template 0x2754, 0x2754, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840
spr_template ANIM_TAG_STUN_SPORE, ANIM_TAG_STUN_SPORE, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840
.align 2
gPoisonPowderParticleSpriteTemplate:: @ 8592148
spr_template 0x2751, 0x2751, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840
spr_template ANIM_TAG_POISON_POWDER, ANIM_TAG_POISON_POWDER, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840
.align 2
gUnknown_08592160:: @ 8592160
@ -204,11 +204,11 @@ gUnknown_08592388:: @ 8592388
.align 2
gUnknown_08592390:: @ 8592390
spr_template 0x274f, 0x274f, gUnknown_0852490C, gUnknown_08592388, NULL, gDummySpriteAffineAnimTable, sub_80FEFFC
spr_template ANIM_TAG_LEAF, ANIM_TAG_LEAF, gUnknown_0852490C, gUnknown_08592388, NULL, gDummySpriteAffineAnimTable, sub_80FEFFC
.align 2
gUnknown_085923A8:: @ 85923A8
spr_template 0x274f, 0x274f, gUnknown_0852490C, gUnknown_08592388, NULL, gDummySpriteAffineAnimTable, sub_80FF268
spr_template ANIM_TAG_LEAF, ANIM_TAG_LEAF, gUnknown_0852490C, gUnknown_08592388, NULL, gDummySpriteAffineAnimTable, sub_80FF268
.align 2
gUnknown_085923C0:: @ 85923C0
@ -441,7 +441,7 @@ gUnknown_0859275C:: @ 859275C
.align 2
gUnknown_08592778:: @ 8592778
spr_template 0x274f, 0x274f, gUnknown_0852490C, gUnknown_0859275C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template ANIM_TAG_LEAF, ANIM_TAG_LEAF, gUnknown_0852490C, gUnknown_0859275C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08592790:: @ 8592790
@ -522,7 +522,7 @@ gUnknown_085928C8:: @ 85928C8
.align 2
gUnknown_085928D0:: @ 85928D0
spr_template 0x2748, 0x2748, gUnknown_08524914, gUnknown_085928C8, NULL, gDummySpriteAffineAnimTable, sub_8100A50
spr_template ANIM_TAG_SLAM_HIT, ANIM_TAG_SLAM_HIT, gUnknown_08524914, gUnknown_085928C8, NULL, gDummySpriteAffineAnimTable, sub_8100A50
.align 2
gUnknown_085928E8:: @ 85928E8
@ -662,7 +662,7 @@ gUnknown_08592A9C:: @ 8592A9C
.align 2
gUnknown_08592AC4:: @ 8592AC4
spr_template 0x2758, 0x2758, gUnknown_0852490C, gUnknown_08592A9C, NULL, gDummySpriteAffineAnimTable, sub_8100E1C
spr_template ANIM_TAG_MUSIC_NOTES, ANIM_TAG_MUSIC_NOTES, gUnknown_0852490C, gUnknown_08592A9C, NULL, gDummySpriteAffineAnimTable, sub_8100E1C
.align 2
gUnknown_08592ADC:: @ 8592ADC
@ -685,7 +685,7 @@ gUnknown_08592B34:: @ 8592B34
.align 2
gUnknown_08592B3C:: @ 8592B3C
spr_template 0x2773, 0x2773, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08592B34, sub_81010CC
spr_template ANIM_TAG_MILK_BOTTLE, ANIM_TAG_MILK_BOTTLE, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08592B34, sub_81010CC
.align 2
gUnknown_08592B54:: @ 8592B54
@ -976,7 +976,7 @@ gUnknown_08593004:: @ 8593004
.align 2
gUnknown_08593008:: @ 8593008
spr_template 0x2758, 0x2758, gUnknown_085249CC, gUnknown_08592FCC, NULL, gUnknown_08593004, sub_8102CD4
spr_template ANIM_TAG_MUSIC_NOTES, ANIM_TAG_MUSIC_NOTES, gUnknown_085249CC, gUnknown_08592FCC, NULL, gUnknown_08593004, sub_8102CD4
.align 2
gUnknown_08593020:: @ 8593020
@ -986,7 +986,7 @@ gUnknown_08593020:: @ 8593020
.align 2
gUnknown_08593050:: @ 8593050
spr_template 0x2758, 0x2758, gUnknown_085249CC, gUnknown_08592FCC, NULL, gUnknown_08593004, sub_8102EB0
spr_template ANIM_TAG_MUSIC_NOTES, ANIM_TAG_MUSIC_NOTES, gUnknown_085249CC, gUnknown_08592FCC, NULL, gUnknown_08593004, sub_8102EB0
.align 2
gUnknown_08593068:: @ 8593068
@ -1003,7 +1003,7 @@ gUnknown_08593098:: @ 8593098
.align 2
gUnknown_0859309C:: @ 859309C
spr_template 0x2758, 0x2758, gUnknown_085249CC, gUnknown_08592FCC, NULL, gUnknown_08593098, sub_8103028
spr_template ANIM_TAG_MUSIC_NOTES, ANIM_TAG_MUSIC_NOTES, gUnknown_085249CC, gUnknown_08592FCC, NULL, gUnknown_08593098, sub_8103028
.align 2
gUnknown_085930B4:: @ 85930B4
@ -1054,11 +1054,11 @@ gUnknown_085931B4:: @ 85931B4
.align 2
gUnknown_085931BC:: @ 85931BC
spr_template 0x2750, 0x2750, gUnknown_085249D4, gDummySpriteAnimTable, NULL, gUnknown_085931B4, sub_8103208
spr_template ANIM_TAG_FINGER, ANIM_TAG_FINGER, gUnknown_085249D4, gDummySpriteAnimTable, NULL, gUnknown_085931B4, sub_8103208
.align 2
gUnknown_085931D4:: @ 85931D4
spr_template 0x2750, 0x2750, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085931B4, sub_8103284
spr_template ANIM_TAG_FINGER, ANIM_TAG_FINGER, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085931B4, sub_8103284
.align 2
gUnknown_085931EC:: @ 85931EC
@ -1091,7 +1091,7 @@ gUnknown_0859324C:: @ 859324C
.align 2
gUnknown_08593264:: @ 8593264
spr_template 0x2750, 0x2750, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8103448
spr_template ANIM_TAG_FINGER, ANIM_TAG_FINGER, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8103448
.align 2
gUnknown_0859327C:: @ 859327C
@ -1103,7 +1103,7 @@ gUnknown_08593284:: @ 8593284
.align 2
gUnknown_08593288:: @ 8593288
spr_template 0x2758, 0x2758, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8103498
spr_template ANIM_TAG_MUSIC_NOTES, ANIM_TAG_MUSIC_NOTES, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8103498
.align 2
gUnknown_085932A0:: @ 85932A0
@ -1146,7 +1146,7 @@ gUnknown_08593340:: @ 8593340
.align 2
gUnknown_08593344:: @ 8593344
spr_template 0x275b, 0x275b, gUnknown_08524934, gUnknown_08593340, NULL, gDummySpriteAffineAnimTable, sub_81037D8
spr_template ANIM_TAG_ALERT, ANIM_TAG_ALERT, gUnknown_08524934, gUnknown_08593340, NULL, gDummySpriteAffineAnimTable, sub_81037D8
.align 2
gUnknown_0859335C:: @ 859335C
@ -1231,11 +1231,11 @@ gUnknown_085934D4:: @ 85934D4
.align 2
gUnknown_085934D8:: @ 85934D8
spr_template 0x2774, 0x2774, gUnknown_0852496C, gUnknown_085934C0, NULL, gDummySpriteAffineAnimTable, sub_8104088
spr_template ANIM_TAG_COIN, ANIM_TAG_COIN, gUnknown_0852496C, gUnknown_085934C0, NULL, gDummySpriteAffineAnimTable, sub_8104088
.align 2
gUnknown_085934F0:: @ 85934F0
spr_template 0x2774, 0x2774, gUnknown_0852496C, gUnknown_085934C0, NULL, gUnknown_085934D4, sub_810413C
spr_template ANIM_TAG_COIN, ANIM_TAG_COIN, gUnknown_0852496C, gUnknown_085934C0, NULL, gUnknown_085934D4, sub_810413C
.align 2
gUnknown_08593508:: @ 8593508
@ -1320,7 +1320,7 @@ gUnknown_08593650:: @ 8593650
.align 2
gUnknown_08593658:: @ 8593658
spr_template 0x2766, 0x2766, gUnknown_0852490C, gUnknown_08593650, NULL, gDummySpriteAffineAnimTable, sub_8104B1C
spr_template ANIM_TAG_BREATH, ANIM_TAG_BREATH, gUnknown_0852490C, gUnknown_08593650, NULL, gDummySpriteAffineAnimTable, sub_8104B1C
.align 2
gUnknown_08593670:: @ 8593670
@ -1333,7 +1333,7 @@ gUnknown_08593688:: @ 8593688
.align 2
gUnknown_0859368C:: @ 859368C
spr_template 0x2767, 0x2767, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08593688, sub_8104BAC
spr_template ANIM_TAG_ANGER, ANIM_TAG_ANGER, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08593688, sub_8104BAC
.align 2
gUnknown_085936A4:: @ 85936A4
@ -2661,7 +2661,7 @@ gUnknown_08595F60:: @ 8595F60
.align 2
gUnknown_08595F78:: @ 8595F78
spr_template 0x2759, 0x2759, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810D37C
spr_template ANIM_TAG_DUCK, ANIM_TAG_DUCK, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810D37C
.align 2
gUnknown_08595F90:: @ 8595F90
@ -3052,7 +3052,7 @@ gUnknown_085965F0:: @ 85965F0
.align 2
gUnknown_085965F4:: @ 85965F4
spr_template 0x2757, 0x2757, gUnknown_08524914, gUnknown_085965F0, NULL, gDummySpriteAffineAnimTable, sub_810F58C
spr_template ANIM_TAG_SPARKLE_4, ANIM_TAG_SPARKLE_4, gUnknown_08524914, gUnknown_085965F0, NULL, gDummySpriteAffineAnimTable, sub_810F58C
.align 2
gUnknown_0859660C:: @ 859660C
@ -3064,7 +3064,7 @@ gUnknown_08596620:: @ 8596620
.align 2
gUnknown_08596624:: @ 8596624
spr_template 0x2756, 0x2756, gUnknown_0852490C, gUnknown_08596620, NULL, gDummySpriteAffineAnimTable, sub_810F58C
spr_template ANIM_TAG_SPARKLE_3, ANIM_TAG_SPARKLE_3, gUnknown_0852490C, gUnknown_08596620, NULL, gDummySpriteAffineAnimTable, sub_810F58C
.align 2
gUnknown_0859663C:: @ 859663C
@ -3091,7 +3091,7 @@ gUnknown_085966D4:: @ 85966D4
.align 2
gUnknown_085966DC:: @ 85966DC
spr_template 0x2771, 0x2771, gUnknown_08524954, gUnknown_085966D4, NULL, gDummySpriteAffineAnimTable, sub_810F634
spr_template ANIM_TAG_BENT_SPOON, ANIM_TAG_BENT_SPOON, gUnknown_08524954, gUnknown_085966D4, NULL, gDummySpriteAffineAnimTable, sub_810F634
.align 2
gUnknown_085966F4:: @ 85966F4
@ -3114,7 +3114,7 @@ gUnknown_08596740:: @ 8596740
.align 2
gUnknown_08596744:: @ 8596744
spr_template 0x276d, 0x276d, gUnknown_08524914, gUnknown_08596714, NULL, gDummySpriteAffineAnimTable, sub_810F6B0
spr_template ANIM_TAG_AMNESIA, ANIM_TAG_AMNESIA, gUnknown_08524914, gUnknown_08596714, NULL, gDummySpriteAffineAnimTable, sub_810F6B0
.align 2
gUnknown_0859675C:: @ 859675C
@ -3315,15 +3315,15 @@ gUnknown_08596AF8:: @ 8596AF8
.align 2
gUnknown_08596B04:: @ 8596B04
spr_template 0x274a, 0x274a, gUnknown_08524914, gUnknown_08596AF8, NULL, gDummySpriteAffineAnimTable, sub_81109F0
spr_template ANIM_TAG_ROCKS, ANIM_TAG_ROCKS, gUnknown_08524914, gUnknown_08596AF8, NULL, gDummySpriteAffineAnimTable, sub_81109F0
.align 2
gUnknown_08596B1C:: @ 8596B1C
spr_template 0x274a, 0x274a, gUnknown_08524914, gUnknown_08596AF8, NULL, gDummySpriteAffineAnimTable, sub_8110AB4
spr_template ANIM_TAG_ROCKS, ANIM_TAG_ROCKS, gUnknown_08524914, gUnknown_08596AF8, NULL, gDummySpriteAffineAnimTable, sub_8110AB4
.align 2
gUnknown_08596B34:: @ 8596B34
spr_template 0x275a, 0x275a, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110B38
spr_template ANIM_TAG_MUD_SAND, ANIM_TAG_MUD_SAND, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110B38
.align 2
gUnknown_08596B4C:: @ 8596B4C
@ -3399,19 +3399,19 @@ gUnknown_08596C08:: @ 8596C08
.align 2
gUnknown_08596C10:: @ 8596C10
spr_template 0x274a, 0x274a, gUnknown_08524914, gUnknown_08596BF8, NULL, gDummySpriteAffineAnimTable, sub_8110F30
spr_template ANIM_TAG_ROCKS, ANIM_TAG_ROCKS, gUnknown_08524914, gUnknown_08596BF8, NULL, gDummySpriteAffineAnimTable, sub_8110F30
.align 2
gUnknown_08596C28:: @ 8596C28
spr_template 0x275a, 0x275a, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_811131C
spr_template ANIM_TAG_MUD_SAND, ANIM_TAG_MUD_SAND, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_811131C
.align 2
gUnknown_08596C40:: @ 8596C40
spr_template 0x274a, 0x274a, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_811131C
spr_template ANIM_TAG_ROCKS, ANIM_TAG_ROCKS, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_811131C
.align 2
gUnknown_08596C58:: @ 8596C58
spr_template 0x274a, 0x274a, gUnknown_08524914, gUnknown_08596BF8, NULL, gDummySpriteAffineAnimTable, sub_8111388
spr_template ANIM_TAG_ROCKS, ANIM_TAG_ROCKS, gUnknown_08524914, gUnknown_08596BF8, NULL, gDummySpriteAffineAnimTable, sub_8111388
.align 2
gUnknown_08596C70:: @ 8596C70
@ -3428,19 +3428,19 @@ gUnknown_08596C90:: @ 8596C90
.align 2
gUnknown_08596C98:: @ 8596C98
spr_template 0x274a, 0x274a, gUnknown_08524974, gUnknown_08596BF8, NULL, gUnknown_08596C90, sub_8111418
spr_template ANIM_TAG_ROCKS, ANIM_TAG_ROCKS, gUnknown_08524974, gUnknown_08596BF8, NULL, gUnknown_08596C90, sub_8111418
.align 2
gUnknown_08596CB0:: @ 8596CB0
spr_template 0x274a, 0x274a, gUnknown_08524974, gUnknown_08596BF8, NULL, gUnknown_08596C90, sub_8111444
spr_template ANIM_TAG_ROCKS, ANIM_TAG_ROCKS, gUnknown_08524974, gUnknown_08596BF8, NULL, gUnknown_08596C90, sub_8111444
.align 2
gUnknown_08596CC8:: @ 8596CC8
spr_template 0x274a, 0x274a, gUnknown_08524914, gUnknown_08596C08, NULL, gUnknown_08596C90, sub_80FF268
spr_template ANIM_TAG_ROCKS, ANIM_TAG_ROCKS, gUnknown_08524914, gUnknown_08596C08, NULL, gUnknown_08596C90, sub_80FF268
.align 2
gUnknown_08596CE0:: @ 8596CE0
spr_template 0x274a, 0x274a, gUnknown_08524974, gUnknown_08596C00, NULL, gUnknown_08596C90, sub_80A8EE4
spr_template ANIM_TAG_ROCKS, ANIM_TAG_ROCKS, gUnknown_08524974, gUnknown_08596C00, NULL, gUnknown_08596C90, sub_80A8EE4
.align 2
gUnknown_08596CF8:: @ 8596CF8
@ -3735,7 +3735,7 @@ gUnknown_08597190:: @ 8597190
.align 2
gUnknown_085971A8:: @ 85971A8
spr_template 0x275a, 0x275a, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8114AF0
spr_template ANIM_TAG_MUD_SAND, ANIM_TAG_MUD_SAND, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8114AF0
.align 2
gUnknown_085971C0:: @ 85971C0
@ -3747,15 +3747,15 @@ gUnknown_085971C8:: @ 85971C8
.align 2
gUnknown_085971CC:: @ 85971CC
spr_template 0x275a, 0x275a, gUnknown_0852490C, gUnknown_085971C8, NULL, gDummySpriteAffineAnimTable, sub_8114AF0
spr_template ANIM_TAG_MUD_SAND, ANIM_TAG_MUD_SAND, gUnknown_0852490C, gUnknown_085971C8, NULL, gDummySpriteAffineAnimTable, sub_8114AF0
.align 2
gUnknown_085971E4:: @ 85971E4
spr_template 0x275a, 0x275a, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8114B80
spr_template ANIM_TAG_MUD_SAND, ANIM_TAG_MUD_SAND, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8114B80
.align 2
gUnknown_085971FC:: @ 85971FC
spr_template 0x275a, 0x275a, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81151A0
spr_template ANIM_TAG_MUD_SAND, ANIM_TAG_MUD_SAND, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81151A0
.align 2
gUnknown_08597214:: @ 8597214
@ -3776,7 +3776,7 @@ gUnknown_08597254:: @ 8597254
.align 2
gConfusionDuckSpriteTemplate:: @ 859725C
spr_template 0x2759, 0x2759, gUnknown_0852490C, gUnknown_08597254, NULL, gDummySpriteAffineAnimTable, sub_811572C
spr_template ANIM_TAG_DUCK, ANIM_TAG_DUCK, gUnknown_0852490C, gUnknown_08597254, NULL, gDummySpriteAffineAnimTable, sub_811572C
.align 2
gSimplePaletteBlendSpriteTemplate:: @ 8597274
@ -3797,7 +3797,7 @@ gUnknown_085972BC:: @ 85972BC
.align 2
gUnknown_085972C0:: @ 85972C0
spr_template 0x2757, 0x2757, gUnknown_08524914, gUnknown_085972BC, NULL, gDummySpriteAffineAnimTable, sub_81159B4
spr_template ANIM_TAG_SPARKLE_4, ANIM_TAG_SPARKLE_4, gUnknown_08524914, gUnknown_085972BC, NULL, gDummySpriteAffineAnimTable, sub_81159B4
.align 2
gBattleAnimSpriteTemplate_85972D8:: @ 85972D8

View File

@ -454,7 +454,7 @@ DoubleSlapRight:
goto DoubleSlapContinue
Move_POISON_POWDER:
loadspritegfx ANIM_TAG_065
loadspritegfx ANIM_TAG_POISON_POWDER
loadspritegfx ANIM_TAG_POISON_BUBBLE
loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6
createsprite gPoisonPowderParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1
@ -479,7 +479,7 @@ Move_POISON_POWDER:
end
Move_STUN_SPORE:
loadspritegfx ANIM_TAG_068
loadspritegfx ANIM_TAG_STUN_SPORE
loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6
createsprite gStunSporeParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1
createsprite gStunSporeParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1
@ -503,7 +503,7 @@ Move_STUN_SPORE:
end
Move_SLEEP_POWDER:
loadspritegfx ANIM_TAG_067
loadspritegfx ANIM_TAG_SLEEP_POWDER
loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6
createsprite gSleepPowderParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1
createsprite gSleepPowderParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1
@ -1486,7 +1486,7 @@ SelfDestruct1:
return
Move_SLAM:
loadspritegfx ANIM_TAG_056
loadspritegfx ANIM_TAG_SLAM_HIT
loadspritegfx ANIM_TAG_135
monbg ANIM_TARGET
setalpha 12, 8
@ -1676,7 +1676,7 @@ Move_PROTECT:
end
Move_DETECT:
loadspritegfx ANIM_TAG_071
loadspritegfx ANIM_TAG_SPARKLE_4
createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 9, RGB_BLACK
waitforvisualfinish
createvisualtask sub_8116620, 10, 2, 1, 0, 9, RGB_WHITE
@ -1879,7 +1879,7 @@ Move_GUILLOTINE:
end
Move_PAY_DAY:
loadspritegfx ANIM_TAG_100
loadspritegfx ANIM_TAG_COIN
loadspritegfx ANIM_TAG_135
monbg ANIM_TARGET
monbgprio_28 ANIM_TARGET
@ -2095,7 +2095,7 @@ Move_MEAN_LOOK:
end
Move_ROCK_THROW:
loadspritegfx ANIM_TAG_058
loadspritegfx ANIM_TAG_ROCKS
createsprite gBattleAnimSpriteTemplate_85972D8, 130, 6, 1, 15, 1
createsprite gUnknown_08596B04, 130, 0, 1, 0, 0
playsewithpan SE_W088, SOUND_PAN_TARGET
@ -2116,7 +2116,7 @@ Move_ROCK_THROW:
end
Move_ROCK_SLIDE:
loadspritegfx ANIM_TAG_058
loadspritegfx ANIM_TAG_ROCKS
monbg ANIM_DEF_PARTNER
createsprite gBattleAnimSpriteTemplate_85972D8, 2, 7, 1, 11, 1
createsprite gUnknown_08596B04, 130, -5, 1, -5, 1
@ -2547,7 +2547,7 @@ Move_THRASH:
end
Move_SING:
loadspritegfx ANIM_TAG_MUSIC_NOTES2
loadspritegfx ANIM_TAG_MUSIC_NOTES
monbg ANIM_DEF_PARTNER
createvisualtask sub_8102BE8, 2
waitforvisualfinish
@ -2606,7 +2606,7 @@ Move_EARTHQUAKE:
end
Move_FISSURE:
loadspritegfx ANIM_TAG_074
loadspritegfx ANIM_TAG_MUD_SAND
createvisualtask sub_81152DC, 3, 5, 10, 50
createvisualtask sub_81152DC, 3, 1, 10, 50
playsewithpan SE_W089, SOUND_PAN_TARGET
@ -2653,7 +2653,7 @@ Move_DIG:
DigEnd:
end
DigSetUp:
loadspritegfx ANIM_TAG_074
loadspritegfx ANIM_TAG_MUD_SAND
loadspritegfx ANIM_TAG_281
createsprite gUnknown_08597214, 1, 0, 0, 180
createsprite gUnknown_08597214, 1, 0, 1, 180
@ -2810,7 +2810,7 @@ Move_MINIMIZE:
end
Move_METRONOME:
loadspritegfx ANIM_TAG_064
loadspritegfx ANIM_TAG_FINGER
loadspritegfx ANIM_TAG_209
createsprite gUnknown_08593114, 11, 0, 100
playsewithpan SE_W118, SOUND_PAN_ATTACKER
@ -2855,7 +2855,7 @@ SkullBashAttack:
goto SkullBashEnd
Move_AMNESIA:
loadspritegfx ANIM_TAG_093
loadspritegfx ANIM_TAG_AMNESIA
call SetPsychicBackground
delay 8
createsprite gUnknown_08596744, 20
@ -2867,7 +2867,7 @@ Move_AMNESIA:
end
Move_KINESIS:
loadspritegfx ANIM_TAG_075
loadspritegfx ANIM_TAG_ALERT
loadspritegfx ANIM_TAG_BENT_SPOON
playsewithpan SE_W060, SOUND_PAN_ATTACKER
call SetPsychicBackground
@ -3233,8 +3233,8 @@ Move_CHARM:
Move_ROLLOUT:
loadspritegfx ANIM_TAG_135
loadspritegfx ANIM_TAG_074
loadspritegfx ANIM_TAG_058
loadspritegfx ANIM_TAG_MUD_SAND
loadspritegfx ANIM_TAG_ROCKS
monbg ANIM_DEF_PARTNER
monbgprio_28 ANIM_TARGET
setalpha 12, 8
@ -3276,7 +3276,7 @@ Move_FALSE_SWIPE:
end
Move_SWAGGER:
loadspritegfx ANIM_TAG_086
loadspritegfx ANIM_TAG_BREATH
loadspritegfx ANIM_TAG_ANGER
createvisualtask sub_8104AB4, 2
playsewithpan SE_W207, SOUND_PAN_ATTACKER
@ -3550,7 +3550,7 @@ Move_SMELLING_SALT:
end
Move_FOLLOW_ME:
loadspritegfx ANIM_TAG_064
loadspritegfx ANIM_TAG_FINGER
createsprite gUnknown_085931D4, 2, 0
playsewithpan SE_W039, SOUND_PAN_ATTACKER
delay 18
@ -3987,7 +3987,7 @@ Move_FEATHER_DANCE:
end
Move_TEETER_DANCE:
loadspritegfx ANIM_TAG_MUSIC_NOTES2
loadspritegfx ANIM_TAG_MUSIC_NOTES
loadspritegfx ANIM_TAG_DUCK
createvisualtask sub_8160164, 5
createsprite gUnknown_08593050, 2, 0, 16, -2
@ -4007,7 +4007,7 @@ Move_TEETER_DANCE:
end
Move_MUD_SPORT:
loadspritegfx ANIM_TAG_074
loadspritegfx ANIM_TAG_MUD_SAND
createvisualtask sub_8104938, 2, 0, 6
delay 24
createsprite gUnknown_085971E4, 130, 0, -4, -16
@ -4168,7 +4168,7 @@ Move_AROMATHERAPY:
Move_FAKE_TEARS:
loadspritegfx ANIM_TAG_155
loadspritegfx ANIM_TAG_209
loadspritegfx ANIM_TAG_MUSIC_NOTES2
loadspritegfx ANIM_TAG_MUSIC_NOTES
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_155, 0, 4, 4, RGB(12, 11, 31)
waitforvisualfinish
createvisualtask sub_815C478, 5, 0, 2, 1
@ -4226,7 +4226,7 @@ Move_ODOR_SLEUTH:
end
Move_GRASS_WHISTLE:
loadspritegfx ANIM_TAG_MUSIC_NOTES2
loadspritegfx ANIM_TAG_MUSIC_NOTES
createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB(18, 31, 12)
waitforvisualfinish
createvisualtask sub_8102BE8, 2
@ -4370,7 +4370,7 @@ Move_BLOCK:
end
Move_HOWL:
loadspritegfx ANIM_TAG_053
loadspritegfx ANIM_TAG_NOISE_LINE
createvisualtask sub_815D64C, 2, 0
delay 12
call RoarEffect
@ -4380,7 +4380,7 @@ Move_HOWL:
end
Move_BULK_UP:
loadspritegfx ANIM_TAG_086
loadspritegfx ANIM_TAG_BREATH
createvisualtask sub_8104AB4, 2
playsewithpan SE_W207, SOUND_PAN_ATTACKER
waitforvisualfinish
@ -4490,7 +4490,7 @@ Move_CALM_MIND:
end
Move_LEAF_BLADE:
loadspritegfx ANIM_TAG_063
loadspritegfx ANIM_TAG_LEAF
loadspritegfx ANIM_TAG_285
createvisualtask sub_80FFFC0, 5
delay 2
@ -4575,7 +4575,7 @@ Move_HARDEN:
end
Move_BELLY_DRUM:
loadspritegfx ANIM_TAG_MUSIC_NOTES2
loadspritegfx ANIM_TAG_MUSIC_NOTES
loadspritegfx ANIM_TAG_193
createvisualtask sub_8102BE8, 2
waitforvisualfinish
@ -4955,7 +4955,7 @@ Move_DRAGON_BREATH:
end
Move_ROAR:
loadspritegfx ANIM_TAG_053
loadspritegfx ANIM_TAG_NOISE_LINE
monbg ANIM_ATTACKER
monbgprio_28 ANIM_ATTACKER
setalpha 8, 8
@ -4983,7 +4983,7 @@ RoarEffect:
return
Move_GROWL:
loadspritegfx ANIM_TAG_053
loadspritegfx ANIM_TAG_NOISE_LINE
createvisualtask sub_8158E9C, 2, 0, 255
call RoarEffect
delay 10
@ -5016,7 +5016,7 @@ Snore1:
return
Move_LIGHT_SCREEN:
loadspritegfx ANIM_TAG_070
loadspritegfx ANIM_TAG_SPARKLE_3
loadspritegfx ANIM_TAG_166
setalpha 0, 16
waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15
@ -5043,7 +5043,7 @@ SpecialScreenEffect:
return
Move_MIRROR_COAT:
loadspritegfx ANIM_TAG_070
loadspritegfx ANIM_TAG_SPARKLE_3
loadspritegfx ANIM_TAG_168
setalpha 0, 16
createsprite gUnknown_08596590, 1, 40, 0, 10168
@ -5056,7 +5056,7 @@ Move_MIRROR_COAT:
end
Move_REFLECT:
loadspritegfx ANIM_TAG_071
loadspritegfx ANIM_TAG_SPARKLE_4
loadspritegfx ANIM_TAG_167
setalpha 0, 16
waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15
@ -5182,7 +5182,7 @@ Move_FAINT_ATTACK:
end
Move_SAND_ATTACK:
loadspritegfx ANIM_TAG_074
loadspritegfx ANIM_TAG_MUD_SAND
monbg ANIM_ATK_PARTNER
monbgprio_28 ANIM_ATTACKER
setalpha 12, 8
@ -5210,7 +5210,7 @@ SandAttack1:
return
Move_MUD_SLAP:
loadspritegfx ANIM_TAG_074
loadspritegfx ANIM_TAG_MUD_SAND
playsewithpan SE_W028, SOUND_PAN_ATTACKER
createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -10, 0, 0, 3
waitforvisualfinish
@ -6654,7 +6654,7 @@ Move_VITAL_THROW:
end
Move_ROCK_SMASH:
loadspritegfx ANIM_TAG_058
loadspritegfx ANIM_TAG_ROCKS
loadspritegfx ANIM_TAG_135
loadspritegfx ANIM_TAG_143
monbg ANIM_DEF_PARTNER
@ -6820,7 +6820,7 @@ Move_PETAL_DANCE:
end
Move_RAZOR_LEAF:
loadspritegfx ANIM_TAG_063
loadspritegfx ANIM_TAG_LEAF
loadspritegfx ANIM_TAG_160
loadspritegfx ANIM_TAG_135
monbg ANIM_DEF_PARTNER
@ -6861,7 +6861,7 @@ Move_RAZOR_LEAF:
Move_NATURE_POWER:
Move_ANCIENT_POWER:
loadspritegfx ANIM_TAG_058
loadspritegfx ANIM_TAG_ROCKS
loadspritegfx ANIM_TAG_135
monbg ANIM_DEF_PARTNER
setalpha 12, 8
@ -7539,7 +7539,7 @@ RazorWindUnleash:
goto RazorWindContinue
Move_DISABLE:
loadspritegfx ANIM_TAG_071
loadspritegfx ANIM_TAG_SPARKLE_4
monbg ANIM_TARGET
monbgprio_28 ANIM_TARGET
setalpha 8, 8
@ -7695,7 +7695,7 @@ Move_SOFT_BOILED:
Move_HEAL_BELL:
loadspritegfx ANIM_TAG_BELL
loadspritegfx ANIM_TAG_MUSIC_NOTES
loadspritegfx ANIM_TAG_MUSIC_NOTES_2
loadspritegfx ANIM_TAG_203
createvisualtask sub_8116620, 10, 10, 0, 0, 10, RGB_WHITE
waitforvisualfinish
@ -7723,7 +7723,7 @@ Move_HEAL_BELL:
createvisualtask sub_8105D60, 5
waitforvisualfinish
unloadspritegfx ANIM_TAG_BELL
unloadspritegfx ANIM_TAG_MUSIC_NOTES
unloadspritegfx ANIM_TAG_MUSIC_NOTES_2
unloadspritegfx ANIM_TAG_203
loadspritegfx ANIM_TAG_SPARKLE_2
playsewithpan SE_W234, SOUND_PAN_ATTACKER
@ -7919,7 +7919,7 @@ Move_BATON_PASS:
end
Move_PERISH_SONG:
loadspritegfx ANIM_TAG_MUSIC_NOTES
loadspritegfx ANIM_TAG_MUSIC_NOTES_2
createsprite gUnknown_08593C0C, 4, 0, 0, 0
createsprite gUnknown_08593C0C, 4, 1, 1, 16
createsprite gUnknown_08593C0C, 4, 2, 1, 32
@ -8513,7 +8513,7 @@ HyperVoiceEffect:
return
Move_SAND_TOMB:
loadspritegfx ANIM_TAG_074
loadspritegfx ANIM_TAG_MUD_SAND
createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(19, 17, 0)
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 43, 1
playsewithpan SE_W328, SOUND_PAN_TARGET
@ -9119,7 +9119,7 @@ Move_BLAST_BURN:
Move_ROCK_TOMB:
loadspritegfx ANIM_TAG_X_SIGN
loadspritegfx ANIM_TAG_058
loadspritegfx ANIM_TAG_ROCKS
createvisualtask sub_81162A4, 2, 2, 0, 10, 1
waitforvisualfinish
createsprite gUnknown_08596C58, 130, 20, 12, 64, 114, 0
@ -9257,7 +9257,7 @@ DiveAttack1:
return
Move_ROCK_BLAST:
loadspritegfx ANIM_TAG_058
loadspritegfx ANIM_TAG_ROCKS
loadspritegfx ANIM_TAG_135
createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6
delay 3
@ -9412,7 +9412,7 @@ Move_ASTONISH:
Move_SEISMIC_TOSS:
loadspritegfx ANIM_TAG_135
loadspritegfx ANIM_TAG_058
loadspritegfx ANIM_TAG_ROCKS
setarg 7, 0
monbg ANIM_DEF_PARTNER
setalpha 12, 8
@ -9643,9 +9643,9 @@ Move_SECRET_POWER:
goto Move_SLAM
Move_TWISTER:
loadspritegfx ANIM_TAG_063
loadspritegfx ANIM_TAG_LEAF
loadspritegfx ANIM_TAG_135
loadspritegfx ANIM_TAG_058
loadspritegfx ANIM_TAG_ROCKS
monbg ANIM_DEF_PARTNER
monbgprio_28 ANIM_TARGET
playsewithpan SE_W239, SOUND_PAN_TARGET
@ -9689,7 +9689,7 @@ Move_TWISTER:
end
Move_MAGICAL_LEAF:
loadspritegfx ANIM_TAG_063
loadspritegfx ANIM_TAG_LEAF
loadspritegfx ANIM_TAG_160
loadspritegfx ANIM_TAG_135
monbg ANIM_DEF_PARTNER
@ -9880,7 +9880,7 @@ WeatherBallWater:
waitforvisualfinish
end
WeatherBallSandstorm:
loadspritegfx ANIM_TAG_058
loadspritegfx ANIM_TAG_ROCKS
createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, 30, 0
playsewithpan SE_W088, SOUND_PAN_TARGET
delay 5
@ -10410,7 +10410,7 @@ Status_Clamp:
waitforvisualfinish
end
Status_SandTomb:
loadspritegfx ANIM_TAG_074
loadspritegfx ANIM_TAG_MUD_SAND
createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(19, 17, 0)
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1
playsewithpan SE_W328, SOUND_PAN_TARGET

View File

@ -59,56 +59,57 @@
#define ANIM_TAG_SPARKLE_2 (ANIM_SPRITES_START + 49) // ANIM_TAG_SPARKLE_2
#define ANIM_TAG_HUMANOID_FOOT (ANIM_SPRITES_START + 50) // ANIM_TAG_HUMANOID_FOOT
#define ANIM_TAG_051 (ANIM_SPRITES_START + 51) // ANIM_TAG_UNUSED_MONSTER_FOOT
#define ANIM_TAG_052 (ANIM_SPRITES_START + 52) // ANIM_TAG_UNUSED_HUMANOID_HAND
#define ANIM_TAG_053 (ANIM_SPRITES_START + 53) // ANIM_TAG_NOISE_LINE
#define ANIM_TAG_054 (ANIM_SPRITES_START + 54) // ANIM_TAG_UNUSED_YELLOW_UNK
#define ANIM_TAG_RED_FIST (ANIM_SPRITES_START + 55) // ANIM_TAG_UNUSED_RED_FIST
#define ANIM_TAG_056 (ANIM_SPRITES_START + 56) // ANIM_TAG_SLAM_HIT
#define ANIM_TAG_057 (ANIM_SPRITES_START + 57) // ANIM_TAG_UNUSED_RING
#define ANIM_TAG_058 (ANIM_SPRITES_START + 58) // ANIM_TAG_ROCKS
#define ANIM_TAG_059 (ANIM_SPRITES_START + 59) // ANIM_TAG_UNUSED_Z
#define ANIM_TAG_060 (ANIM_SPRITES_START + 60) // ANIM_TAG_UNUSED_YELLOW_UNK_2
#define ANIM_TAG_061 (ANIM_SPRITES_START + 61) // ANIM_TAG_UNUSED_AIR_SLASH
#define ANIM_TAG_062 (ANIM_SPRITES_START + 62) // ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS
#define ANIM_TAG_063 (ANIM_SPRITES_START + 63) // ANIM_TAG_LEAF
#define ANIM_TAG_064 (ANIM_SPRITES_START + 64) // ANIM_TAG_FINGER
#define ANIM_TAG_065 (ANIM_SPRITES_START + 65) // ANIM_TAG_POISON_POWDER
#define ANIM_TAG_066 (ANIM_SPRITES_START + 66) // ANIM_TAG_UNUSED_BROWN_TRIANGLE
#define ANIM_TAG_067 (ANIM_SPRITES_START + 67) // ANIM_TAG_SLEEP_POWDER
#define ANIM_TAG_068 (ANIM_SPRITES_START + 68) // ANIM_TAG_STUN_SPORE
#define ANIM_TAG_069 (ANIM_SPRITES_START + 69) // ANIM_TAG_UNUSED_POWDER
#define ANIM_TAG_070 (ANIM_SPRITES_START + 70) // ANIM_TAG_SPARKLE_3
#define ANIM_TAG_071 (ANIM_SPRITES_START + 71) // ANIM_TAG_SPARKLE_4
#define ANIM_TAG_MUSIC_NOTES2 (ANIM_SPRITES_START + 72) // ANIM_TAG_MUSIC_NOTES
#define ANIM_TAG_UNUSED_MONSTER_FOOT (ANIM_SPRITES_START + 51) // ANIM_TAG_UNUSED_MONSTER_FOOT
#define ANIM_TAG_UNUSED_HUMANOID_HAND (ANIM_SPRITES_START + 52) // ANIM_TAG_UNUSED_HUMANOID_HAND
#define ANIM_TAG_NOISE_LINE (ANIM_SPRITES_START + 53) // ANIM_TAG_NOISE_LINE
#define ANIM_TAG_UNUSED_YELLOW_UNK (ANIM_SPRITES_START + 54) // ANIM_TAG_UNUSED_YELLOW_UNK
#define ANIM_TAG_UNUSED_RED_FIST (ANIM_SPRITES_START + 55) // ANIM_TAG_UNUSED_RED_FIST
#define ANIM_TAG_SLAM_HIT (ANIM_SPRITES_START + 56) // ANIM_TAG_SLAM_HIT
#define ANIM_TAG_UNUSED_RING (ANIM_SPRITES_START + 57) // ANIM_TAG_UNUSED_RING
#define ANIM_TAG_ROCKS (ANIM_SPRITES_START + 58) // ANIM_TAG_ROCKS
#define ANIM_TAG_UNUSED_Z (ANIM_SPRITES_START + 59) // ANIM_TAG_UNUSED_Z
#define ANIM_TAG_UNUSED_YELLOW_UNK_2 (ANIM_SPRITES_START + 60) // ANIM_TAG_UNUSED_YELLOW_UNK_2
#define ANIM_TAG_UNUSED_AIR_SLASH (ANIM_SPRITES_START + 61) // ANIM_TAG_UNUSED_AIR_SLASH
#define ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS (ANIM_SPRITES_START + 62) // ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS
#define ANIM_TAG_LEAF (ANIM_SPRITES_START + 63) // ANIM_TAG_LEAF
#define ANIM_TAG_FINGER (ANIM_SPRITES_START + 64) // ANIM_TAG_FINGER
#define ANIM_TAG_POISON_POWDER (ANIM_SPRITES_START + 65) // ANIM_TAG_POISON_POWDER
#define ANIM_TAG_UNUSED_BROWN_TRIANGLE (ANIM_SPRITES_START + 66) // ANIM_TAG_UNUSED_BROWN_TRIANGLE
#define ANIM_TAG_SLEEP_POWDER (ANIM_SPRITES_START + 67) // ANIM_TAG_SLEEP_POWDER
#define ANIM_TAG_STUN_SPORE (ANIM_SPRITES_START + 68) // ANIM_TAG_STUN_SPORE
#define ANIM_TAG_UNUSED_POWDER (ANIM_SPRITES_START + 69) // ANIM_TAG_UNUSED_POWDER
#define ANIM_TAG_SPARKLE_3 (ANIM_SPRITES_START + 70) // ANIM_TAG_SPARKLE_3
#define ANIM_TAG_SPARKLE_4 (ANIM_SPRITES_START + 71) // ANIM_TAG_SPARKLE_4
#define ANIM_TAG_MUSIC_NOTES (ANIM_SPRITES_START + 72) // ANIM_TAG_MUSIC_NOTES
#define ANIM_TAG_DUCK (ANIM_SPRITES_START + 73)
#define ANIM_TAG_074 (ANIM_SPRITES_START + 74) // ANIM_TAG_MUD_SAND
#define ANIM_TAG_075 (ANIM_SPRITES_START + 75) // ANIM_TAG_ALERT
#define ANIM_TAG_076 (ANIM_SPRITES_START + 76) // ANIM_TAG_UNUSED_BLUE_FLAMES
#define ANIM_TAG_077 (ANIM_SPRITES_START + 77) // ANIM_TAG_UNUSED_BLUE_FLAMES_2
#define ANIM_TAG_078 (ANIM_SPRITES_START + 78) // ANIM_TAG_UNUSED_SHOCK
#define ANIM_TAG_079 (ANIM_SPRITES_START + 79) // ANIM_TAG_SHOCK
#define ANIM_TAG_080 (ANIM_SPRITES_START + 80) // ANIM_TAG_UNUSED_BELL
#define ANIM_TAG_081 (ANIM_SPRITES_START + 81) // ANIM_TAG_UNUSED_PINK_GLOVE
#define ANIM_TAG_082 (ANIM_SPRITES_START + 82) // ANIM_TAG_UNUSED_BLUE_LINES
#define ANIM_TAG_083 (ANIM_SPRITES_START + 83) // ANIM_TAG_UNUSED_IMPACT
#define ANIM_TAG_084 (ANIM_SPRITES_START + 84) // ANIM_TAG_UNUSED_IMPACT_2
#define ANIM_TAG_085 (ANIM_SPRITES_START + 85) // ANIM_TAG_UNUSED_RETICLE
#define ANIM_TAG_086 (ANIM_SPRITES_START + 86) // ANIM_TAG_BREATH
#define ANIM_TAG_MUD_SAND (ANIM_SPRITES_START + 74) // ANIM_TAG_MUD_SAND
#define ANIM_TAG_ALERT (ANIM_SPRITES_START + 75) // ANIM_TAG_ALERT
#define ANIM_TAG_UNUSED_BLUE_FLAMES (ANIM_SPRITES_START + 76) // ANIM_TAG_UNUSED_BLUE_FLAMES
#define ANIM_TAG_UNUSED_BLUE_FLAMES_2 (ANIM_SPRITES_START + 77) // ANIM_TAG_UNUSED_BLUE_FLAMES_2
#define ANIM_TAG_UNUSED_SHOCK (ANIM_SPRITES_START + 78) // ANIM_TAG_UNUSED_SHOCK
#define ANIM_TAG_SHOCK (ANIM_SPRITES_START + 79) // ANIM_TAG_SHOCK
#define ANIM_TAG_UNUSED_BELL (ANIM_SPRITES_START + 80) // ANIM_TAG_UNUSED_BELL
#define ANIM_TAG_UNUSED_PINK_GLOVE (ANIM_SPRITES_START + 81) // ANIM_TAG_UNUSED_PINK_GLOVE
#define ANIM_TAG_UNUSED_BLUE_LINES (ANIM_SPRITES_START + 82) // ANIM_TAG_UNUSED_BLUE_LINES
#define ANIM_TAG_UNUSED_IMPACT (ANIM_SPRITES_START + 83) // ANIM_TAG_UNUSED_IMPACT
#define ANIM_TAG_UNUSED_IMPACT_2 (ANIM_SPRITES_START + 84) // ANIM_TAG_UNUSED_IMPACT_2
#define ANIM_TAG_UNUSED_RETICLE (ANIM_SPRITES_START + 85) // ANIM_TAG_UNUSED_RETICLE
#define ANIM_TAG_BREATH (ANIM_SPRITES_START + 86) // ANIM_TAG_BREATH
#define ANIM_TAG_ANGER (ANIM_SPRITES_START + 87)
#define ANIM_TAG_088 (ANIM_SPRITES_START + 88) // ANIM_TAG_UNUSED_SNOWBALL
#define ANIM_TAG_089 (ANIM_SPRITES_START + 89) // ANIM_TAG_UNUSED_VINE
#define ANIM_TAG_090 (ANIM_SPRITES_START + 90) // ANIM_TAG_UNUSED_SWORD
#define ANIM_TAG_091 (ANIM_SPRITES_START + 91) // ANIM_TAG_UNUSED_CLAPPING
#define ANIM_TAG_092 (ANIM_SPRITES_START + 92) // ANIM_TAG_UNUSED_RED_TUBE
#define ANIM_TAG_093 (ANIM_SPRITES_START + 93) // ANIM_TAG_AMNESIA
#define ANIM_TAG_094 (ANIM_SPRITES_START + 94) // ANIM_TAG_UNUSED_STRING
#define ANIM_TAG_095 (ANIM_SPRITES_START + 95) // ANIM_TAG_UNUSED_PENCIL
#define ANIM_TAG_096 (ANIM_SPRITES_START + 96) // ANIM_TAG_UNUSED_PETAL
#define ANIM_TAG_UNUSED_SNOWBALL (ANIM_SPRITES_START + 88) // ANIM_TAG_UNUSED_SNOWBALL
#define ANIM_TAG_UNUSED_VINE (ANIM_SPRITES_START + 89) // ANIM_TAG_UNUSED_VINE
#define ANIM_TAG_UNUSED_SWORD (ANIM_SPRITES_START + 90) // ANIM_TAG_UNUSED_SWORD
#define ANIM_TAG_UNUSED_CLAPPING (ANIM_SPRITES_START + 91) // ANIM_TAG_UNUSED_CLAPPING
#define ANIM_TAG_UNUSED_RED_TUBE (ANIM_SPRITES_START + 92) // ANIM_TAG_UNUSED_RED_TUBE
#define ANIM_TAG_AMNESIA (ANIM_SPRITES_START + 93) // ANIM_TAG_AMNESIA
#define ANIM_TAG_UNUSED_STRING (ANIM_SPRITES_START + 94) // ANIM_TAG_UNUSED_STRING
#define ANIM_TAG_UNUSED_PENCIL (ANIM_SPRITES_START + 95) // ANIM_TAG_UNUSED_PENCIL
#define ANIM_TAG_UNUSED_PETAL (ANIM_SPRITES_START + 96) // ANIM_TAG_UNUSED_PETAL
#define ANIM_TAG_BENT_SPOON (ANIM_SPRITES_START + 97)
#define ANIM_TAG_098 (ANIM_SPRITES_START + 98) // ANIM_TAG_UNUSED_WEB
#define ANIM_TAG_UNUSED_WEB (ANIM_SPRITES_START + 98) // ANIM_TAG_UNUSED_WEB
#define ANIM_TAG_MILK_BOTTLE (ANIM_SPRITES_START + 99)
#define ANIM_TAG_100 (ANIM_SPRITES_START + 100) // ANIM_TAG_COIN
#define ANIM_TAG_COIN (ANIM_SPRITES_START + 100) // ANIM_TAG_COIN
#define ANIM_TAG_101 (ANIM_SPRITES_START + 101) // ANIM_TAG_UNUSED_CRACKED_EGG
#define ANIM_TAG_102 (ANIM_SPRITES_START + 102) // ANIM_TAG_UNUSED_HATCHED_EGG
#define ANIM_TAG_103 (ANIM_SPRITES_START + 103) // ANIM_TAG_UNUSED_FRESH_EGG
@ -159,6 +160,7 @@
#define ANIM_TAG_148 (ANIM_SPRITES_START + 148) // ANIM_TAG_WATER_IMPACT
#define ANIM_TAG_149 (ANIM_SPRITES_START + 149) // ANIM_TAG_WATER_ORB
#define ANIM_TAG_POISON_BUBBLE (ANIM_SPRITES_START + 150)
#define ANIM_TAG_TOXIC_BUBBLE (ANIM_SPRITES_START + 151)
#define ANIM_TAG_152 (ANIM_SPRITES_START + 152) // ANIM_TAG_SPIKES
#define ANIM_TAG_153 (ANIM_SPRITES_START + 153) // ANIM_TAG_HORN_HIT_2
@ -209,12 +211,13 @@
#define ANIM_TAG_EXPLOSION (ANIM_SPRITES_START + 198)
#define ANIM_TAG_NAIL (ANIM_SPRITES_START + 199)
#define ANIM_TAG_200 (ANIM_SPRITES_START + 200) // ANIM_TAG_GHOSTLY_SPIRIT
#define ANIM_TAG_201 (ANIM_SPRITES_START + 201) // ANIM_TAG_WARM_ROCK
#define ANIM_TAG_BREAKING_EGG (ANIM_SPRITES_START + 202)
#define ANIM_TAG_203 (ANIM_SPRITES_START + 203) // ANIM_TAG_THIN_RING
#define ANIM_TAG_204 (ANIM_SPRITES_START + 204) // ANIM_TAG_UNUSED_PUNCH_IMPACT
#define ANIM_TAG_BELL (ANIM_SPRITES_START + 205)
#define ANIM_TAG_MUSIC_NOTES (ANIM_SPRITES_START + 206) // ANIM_TAG_MUSIC_NOTES_2
#define ANIM_TAG_MUSIC_NOTES_2 (ANIM_SPRITES_START + 206) // ANIM_TAG_MUSIC_NOTES_2
#define ANIM_TAG_207 (ANIM_SPRITES_START + 207) // ANIM_TAG_SPEED_DUST
#define ANIM_TAG_208 (ANIM_SPRITES_START + 208) // ANIM_TAG_TORN_METAL
#define ANIM_TAG_209 (ANIM_SPRITES_START + 209) // ANIM_TAG_THOUGHT_BUBBLE
@ -259,6 +262,7 @@
#define ANIM_TAG_248 (ANIM_SPRITES_START + 248) // ANIM_TAG_SMALL_RED_EYE
#define ANIM_TAG_249 (ANIM_SPRITES_START + 249) // ANIM_TAG_HOLLOW_ORB
#define ANIM_TAG_X_SIGN (ANIM_SPRITES_START + 250)
#define ANIM_TAG_251 (ANIM_SPRITES_START + 251) // ANIM_TAG_BLUEGREEN_ORB
#define ANIM_TAG_252 (ANIM_SPRITES_START + 252) // ANIM_TAG_PAW_PRINT
#define ANIM_TAG_253 (ANIM_SPRITES_START + 253) // ANIM_TAG_PURPLE_FLAME

View File

@ -1542,8 +1542,8 @@ static void Task_IntroLoadPart1Graphics3(u8 taskId)
LZDecompressVram(gIntro3GroudonTilemap, (void *)(VRAM + 0xC000));
LZDecompressVram(gIntro3LegendBgGfx, (void *)(VRAM + 0x4000));
LZDecompressVram(gIntro3GroudonBgTilemap, (void *)(VRAM + 0xE000));
LoadCompressedObjectPicUsingHeap(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_058)]);
LoadCompressedObjectPaletteUsingHeap(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_058)]);
LoadCompressedObjectPicUsingHeap(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_ROCKS)]);
LoadCompressedObjectPaletteUsingHeap(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_ROCKS)]);
CpuCopy16(gIntro3BgPal, gPlttBufferUnfaded, sizeof(gIntro3BgPal));
gTasks[taskId].func = Task_IntroLoadPart1Graphics4;
}