dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve references

Browse Source
This commit is contained in:
Evan
2019-12-03 19:50:42 -07:00
parent 2453b88b9d
commit a9548849d7
8 changed files with 59 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/pokeball.s
+6 -6
View File
@@ -154,7 +154,7 @@ _0804AA68:
lsls r0, r5, 1 lsls r0, r5, 1
adds r0, r5 adds r0, r5
lsls r0, 3 lsls r0, 3
ldr r1, _0804AABC @ =gUnknown_82606F4 ldr r1, _0804AABC @ =gBallSpriteTemplates
adds r0, r1 adds r0, r1
movs r1, 0x20 movs r1, 0x20
movs r2, 0x50 movs r2, 0x50
@@ -191,7 +191,7 @@ _0804AA68:
b _0804AACE b _0804AACE
.align 2, 0 .align 2, 0
_0804AAB8: .4byte gSaveBlock2Ptr _0804AAB8: .4byte gSaveBlock2Ptr
_0804AABC: .4byte gUnknown_82606F4 _0804AABC: .4byte gBallSpriteTemplates
_0804AAC0: .4byte gSprites _0804AAC0: .4byte gSprites
_0804AAC4: .4byte gBattleTypeFlags _0804AAC4: .4byte gBattleTypeFlags
_0804AAC8: _0804AAC8:
@@ -2032,7 +2032,7 @@ CreatePokeballSpriteToReleaseMon: @ 804B908
bl LoadCompressedSpriteSheetUsingHeap bl LoadCompressedSpriteSheetUsingHeap
ldr r0, _0804B9D8 @ =gUnknown_82605CC ldr r0, _0804B9D8 @ =gUnknown_82605CC
bl LoadCompressedSpritePaletteUsingHeap bl LoadCompressedSpritePaletteUsingHeap
ldr r0, _0804B9DC @ =gUnknown_82606F4 ldr r0, _0804B9DC @ =gBallSpriteTemplates
mov r1, r9 mov r1, r9
mov r2, r10 mov r2, r10
adds r3, r4, 0 adds r3, r4, 0
@@ -2098,7 +2098,7 @@ CreatePokeballSpriteToReleaseMon: @ 804B908
.align 2, 0 .align 2, 0
_0804B9D4: .4byte gUnknown_826056C _0804B9D4: .4byte gUnknown_826056C
_0804B9D8: .4byte gUnknown_82605CC _0804B9D8: .4byte gUnknown_82605CC
_0804B9DC: .4byte gUnknown_82606F4 _0804B9DC: .4byte gBallSpriteTemplates
_0804B9E0: .4byte gSprites _0804B9E0: .4byte gSprites
_0804B9E4: .4byte sub_804B9E8 _0804B9E4: .4byte sub_804B9E8
thumb_func_end CreatePokeballSpriteToReleaseMon thumb_func_end CreatePokeballSpriteToReleaseMon
@@ -2365,7 +2365,7 @@ CreateTradePokeballSprite: @ 804BB98
bl LoadCompressedSpriteSheetUsingHeap bl LoadCompressedSpriteSheetUsingHeap
ldr r0, _0804BC40 @ =gUnknown_82605CC ldr r0, _0804BC40 @ =gUnknown_82605CC
bl LoadCompressedSpritePaletteUsingHeap bl LoadCompressedSpritePaletteUsingHeap
ldr r0, _0804BC44 @ =gUnknown_82606F4 ldr r0, _0804BC44 @ =gBallSpriteTemplates
adds r1, r6, 0 adds r1, r6, 0
mov r2, r8 mov r2, r8
adds r3, r4, 0 adds r3, r4, 0
@@ -2411,7 +2411,7 @@ CreateTradePokeballSprite: @ 804BB98
.align 2, 0 .align 2, 0
_0804BC3C: .4byte gUnknown_826056C _0804BC3C: .4byte gUnknown_826056C
_0804BC40: .4byte gUnknown_82605CC _0804BC40: .4byte gUnknown_82605CC
_0804BC44: .4byte gUnknown_82606F4 _0804BC44: .4byte gBallSpriteTemplates
_0804BC48: .4byte gSprites _0804BC48: .4byte gSprites
_0804BC4C: .4byte sub_804BC50 _0804BC4C: .4byte sub_804BC50
thumb_func_end CreateTradePokeballSprite thumb_func_end CreateTradePokeballSprite
asm/pokemon_summary_screen.s
+2 -2
View File
@@ -10638,7 +10638,7 @@ _08139CDA:
lsls r0, r4, 1 lsls r0, r4, 1
adds r0, r4 adds r0, r4
lsls r0, 3 lsls r0, 3
ldr r1, _08139D40 @ =gUnknown_82606F4 ldr r1, _08139D40 @ =gBallSpriteTemplates
adds r0, r1 adds r0, r1
movs r1, 0x6A movs r1, 0x6A
movs r2, 0x58 movs r2, 0x58
@@ -10677,7 +10677,7 @@ _08139CDA:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08139D40: .4byte gUnknown_82606F4 _08139D40: .4byte gBallSpriteTemplates
_08139D44: .4byte gUnknown_203B140 _08139D44: .4byte gUnknown_203B140
_08139D48: .4byte 0x0000300c _08139D48: .4byte 0x0000300c
_08139D4C: .4byte gSprites _08139D4C: .4byte gSprites
data/battle_anim_effects_misc.s
+1 -1
View File
@@ -106,7 +106,7 @@ gUnknown_83E59D0:: @ 83E59D0
spr_template 10029, 10029, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E59CC, NULL, gDummySpriteAffineAnimTable, sub_80AB024 spr_template 10029, 10029, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E59CC, NULL, gDummySpriteAffineAnimTable, sub_80AB024
gUnknown_83E59E8:: @ 83E59E8 gUnknown_83E59E8:: @ 83E59E8
spr_template 10165, 10165, gOamData_AffineDouble_ObjNormal_16x32, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, sub_80AB024 spr_template 10165, 10165, gOamData_AffineDouble_ObjNormal_16x32, gDummySpriteAnimTable, NULL, gGrowingRingAffineAnimTable, sub_80AB024
gUnknown_83E5A00:: @ 83E5A00 gUnknown_83E5A00:: @ 83E5A00
obj_rot_scal_anim_frame 3, 3, 10, 50 obj_rot_scal_anim_frame 3, 3, 10, 50
data/battle_anim_scripts.s
+45 -45
View File
@@ -3337,7 +3337,7 @@ Move_FALSE_SWIPE:: @ 81CB33F
Move_SWAGGER:: @ 81CB3C6 Move_SWAGGER:: @ 81CB3C6
loadspritegfx 10086 loadspritegfx 10086
loadspritegfx 10087 loadspritegfx 10087
createvisualtask sub_80A84B4, 2, createvisualtask AnimTask_GrowAndShrink, 2,
playsewithpan SE_W207, 192 playsewithpan SE_W207, 192
waitforvisualfinish waitforvisualfinish
createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2, createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2,
@@ -3403,7 +3403,7 @@ Move_RAPID_SPIN:: @ 81CB4E1
loadspritegfx 10229 loadspritegfx 10229
monbg 0 monbg 0
createsprite gRapidSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 32, -32, 40, -2 createsprite gRapidSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 32, -32, 40, -2
createvisualtask sub_80DEF9C, 2, 0, 2, 0 createvisualtask AnimTask_RapinSpinMonElevation, 2, 0, 2, 0
loopsewithpan SE_W013B, 192, 8, 4 loopsewithpan SE_W013B, 192, 8, 4
waitforvisualfinish waitforvisualfinish
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2
@@ -3411,7 +3411,7 @@ Move_RAPID_SPIN:: @ 81CB4E1
playsewithpan SE_W003, 63 playsewithpan SE_W003, 63
waitforvisualfinish waitforvisualfinish
delay 8 delay 8
createvisualtask sub_80DEF9C, 2, 0, 2, 1 createvisualtask AnimTask_RapinSpinMonElevation, 2, 0, 2, 1
loopsewithpan SE_W013B, 192, 8, 4 loopsewithpan SE_W013B, 192, 8, 4
waitforvisualfinish waitforvisualfinish
clearmonbg 0 clearmonbg 0
@@ -3438,7 +3438,7 @@ Move_MOONLIGHT:: @ 81CB54E
delay 30 delay 30
createsprite gMoonlightSparkleSpriteTemplate, ANIM_ATTACKER, 40, 10, 0 createsprite gMoonlightSparkleSpriteTemplate, ANIM_ATTACKER, 40, 10, 0
delay 20 delay 20
createvisualtask sub_80A5FC0, 2, createvisualtask AnimTask_FadeScreenBlue, 2,
waitforvisualfinish waitforvisualfinish
call gUnknown_81D56C9 call gUnknown_81D56C9
waitforvisualfinish waitforvisualfinish
@@ -3455,7 +3455,7 @@ gUnknown_81CB5F5:: @ 81CB5F5
waitbgfadeout waitbgfadeout
createvisualtask sub_80BB82C, 5, -2304, 0, 1, -1 createvisualtask sub_80BB82C, 5, -2304, 0, 1, -1
waitbgfadein waitbgfadein
createvisualtask sub_80A917C, 2, createvisualtask AnimTask_StretchAttacker, 2,
loopsewithpan SE_W013B, 192, 8, 3 loopsewithpan SE_W013B, 192, 8, 3
waitforvisualfinish waitforvisualfinish
delay 1 delay 1
@@ -3463,7 +3463,7 @@ gUnknown_81CB5F5:: @ 81CB5F5
monbg 1 monbg 1
setalpha 12, 8 setalpha 12, 8
delay 18 delay 18
createvisualtask sub_80A9210, 2, createvisualtask AnimTask_ExtremeSpeedImpact, 2,
delay 2 delay 2
playsewithpan SE_W004, 63 playsewithpan SE_W004, 63
createsprite gUnknown_83E7C68, ANIM_TARGET, 2, 1, 0, -12, 3 createsprite gUnknown_83E7C68, ANIM_TARGET, 2, 1, 0, -12, 3
@@ -3474,9 +3474,9 @@ gUnknown_81CB5F5:: @ 81CB5F5
playsewithpan SE_W233B, 63 playsewithpan SE_W233B, 63
createsprite gUnknown_83E7C68, ANIM_TARGET, 2, 1, 0, 0, 3 createsprite gUnknown_83E7C68, ANIM_TARGET, 2, 1, 0, 0, 3
waitforvisualfinish waitforvisualfinish
createvisualtask sub_80A94AC, 2, createvisualtask AnimTask_SpeedDust, 2,
delay 10 delay 10
createvisualtask sub_80A939C, 2, createvisualtask AnimTask_ExtremeSpeedMonReappear, 2,
loopsewithpan SE_W104, 192, 8, 4 loopsewithpan SE_W104, 192, 8, 4
waitforvisualfinish waitforvisualfinish
restorebg restorebg
@@ -3498,19 +3498,19 @@ Move_UPROAR:: @ 81CB69C
loadspritegfx 10225 loadspritegfx 10225
loadspritegfx 10203 loadspritegfx 10203
monbg 3 monbg 3
createvisualtask sub_80AA7C8, 2, 0 createvisualtask AnimTask_UproarDistortion, 2, 0
createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8
playsewithpan SE_W253, 192 playsewithpan SE_W253, 192
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 29, -12, 0 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 29, -12, 0
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -12, -29, 1 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -12, -29, 1
delay 16 delay 16
createvisualtask sub_80AA7C8, 2, 0 createvisualtask AnimTask_UproarDistortion, 2, 0
createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8
playsewithpan SE_W253, 192 playsewithpan SE_W253, 192
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 12, -29, 1 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 12, -29, 1
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -29, -12, 0 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -29, -12, 0
delay 16 delay 16
createvisualtask sub_80AA7C8, 2, 0 createvisualtask AnimTask_UproarDistortion, 2, 0
createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8
playsewithpan SE_W253, 192 playsewithpan SE_W253, 192
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, -24, 1 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, -24, 1
@@ -3557,7 +3557,7 @@ Move_HAIL:: @ 81CB816
Move_TORMENT:: @ 81CB84E Move_TORMENT:: @ 81CB84E
loadspritegfx 10087 loadspritegfx 10087
loadspritegfx 10209 loadspritegfx 10209
createvisualtask sub_80DF1DC, 2, createvisualtask AnimTask_TormentAttacker, 2,
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_BlendMonInAndOut, 2, 1, 31, 10, 1, 1 createvisualtask AnimTask_BlendMonInAndOut, 2, 1, 31, 10, 1, 1
createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28
@@ -3976,7 +3976,7 @@ Move_LUSTER_PURGE:: @ 81CC0FB
loadspritegfx 10135 loadspritegfx 10135
fadetobg 3 fadetobg 3
waitbgfadeout waitbgfadeout
createvisualtask sub_80DE7B4, 5, createvisualtask AnimTask_FadeScreenToWhite, 5,
waitbgfadein waitbgfadein
monbg 0 monbg 0
setalpha 12, 8 setalpha 12, 8
@@ -4452,7 +4452,7 @@ Move_HOWL:: @ 81CCCDC
Move_BULK_UP:: @ 81CCCFE Move_BULK_UP:: @ 81CCCFE
loadspritegfx 10086 loadspritegfx 10086
createvisualtask sub_80A84B4, 2, createvisualtask AnimTask_GrowAndShrink, 2,
playsewithpan SE_W207, 192 playsewithpan SE_W207, 192
waitforvisualfinish waitforvisualfinish
createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2, createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2,
@@ -5479,7 +5479,7 @@ gUnknown_81CE3FC:: @ 81CE3FC
Move_WITHDRAW:: @ 81CE432 Move_WITHDRAW:: @ 81CE432
playsewithpan SE_W029, 192 playsewithpan SE_W029, 192
createvisualtask sub_80A70A0, 5, createvisualtask AnimTask_Withdraw, 5,
waitforvisualfinish waitforvisualfinish
end end
@@ -5573,7 +5573,7 @@ gUnknown_81CE54B:: @ 81CE54B
gUnknown_81CE61E:: @ 81CE61E gUnknown_81CE61E:: @ 81CE61E
call gUnknown_81D5A07 call gUnknown_81D5A07
panse_1B SE_W076, 192, 63, 2, 0 panse_1B SE_W076, 192, 63, 2, 0
createvisualtask sub_80A2500, 5, createvisualtask AnimTask_CreateSmallSolarbeamOrbs, 5,
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0
delay 4 delay 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1 createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1
@@ -6875,7 +6875,7 @@ Move_SPORE:: @ 81D03EF
loadspritegfx 10158 loadspritegfx 10158
monbg 3 monbg 3
setalpha 12, 8 setalpha 12, 8
createvisualtask sub_80A28C4, 2, createvisualtask AnimTask_SporeDoubleBattle, 2,
loopsewithpan SE_W077, 63, 16, 11 loopsewithpan SE_W077, 63, 16, 11
call gUnknown_81D041A call gUnknown_81D041A
call gUnknown_81D041A call gUnknown_81D041A
@@ -7666,7 +7666,7 @@ Move_DISABLE:: @ 81D169F
playsewithpan SE_W197, 192 playsewithpan SE_W197, 192
createsprite gSpriteTemplate_83BF480, ANIM_ATTACKER, 13, 24, -16 createsprite gSpriteTemplate_83BF480, ANIM_ATTACKER, 13, 24, -16
waitforvisualfinish waitforvisualfinish
createvisualtask sub_80A7FB0, 5, createvisualtask AnimTask_GrowAndGreyscale, 5,
loopsewithpan SE_W020, 63, 15, 4 loopsewithpan SE_W020, 63, 15, 4
waitforvisualfinish waitforvisualfinish
delay 1 delay 1
@@ -7871,7 +7871,7 @@ gUnknown_81D1B2F:: @ 81D1B2F
Move_FAKE_OUT:: @ 81D1B65 Move_FAKE_OUT:: @ 81D1B65
playsewithpan SE_W260, 0 playsewithpan SE_W260, 0
createvisualtask sub_80A98B0, 5, createvisualtask AnimTask_FakeOut, 5,
waitforvisualfinish waitforvisualfinish
playsewithpan SE_W166, 63 playsewithpan SE_W166, 63
createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 5, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 5, 1
@@ -7977,7 +7977,7 @@ Move_INGRAIN:: @ 81D1D17
Move_PRESENT:: @ 81D1DC8 Move_PRESENT:: @ 81D1DC8
loadspritegfx 10224 loadspritegfx 10224
createvisualtask sub_80DEAF0, 2, createvisualtask AnimTask_IsHealingMove, 2,
createsprite gPresentSpriteTemplate, ANIM_TARGET, 2, 0, -5, 10, 2, -1 createsprite gPresentSpriteTemplate, ANIM_TARGET, 2, 0, -5, 10, 2, -1
playsewithpan SE_W039, 192 playsewithpan SE_W039, 192
delay 14 delay 14
@@ -8223,7 +8223,7 @@ Move_WILL_O_WISP:: @ 81D2340
Move_ENCORE:: @ 81D23FE Move_ENCORE:: @ 81D23FE
loadspritegfx 10227 loadspritegfx 10227
loadspritegfx 10247 loadspritegfx 10247
createvisualtask sub_80DEDD8, 2, createvisualtask AnimTask_CreateSpotlight, 2,
createvisualtask sub_80BAB38, 2, 248, 3, 0, 10, 0 createvisualtask sub_80BAB38, 2, 248, 3, 0, 10, 0
waitforvisualfinish waitforvisualfinish
createsprite gSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8 createsprite gSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8
@@ -8237,7 +8237,7 @@ Move_ENCORE:: @ 81D23FE
waitforvisualfinish waitforvisualfinish
createvisualtask sub_80BAB38, 2, 248, 3, 10, 0, 1 createvisualtask sub_80BAB38, 2, 248, 3, 10, 0, 1
waitforvisualfinish waitforvisualfinish
createvisualtask sub_80DEE78, 2, createvisualtask AnimTask_RemoveSpotlight, 2,
end end
Move_TRICK:: @ 81D24A5 Move_TRICK:: @ 81D24A5
@@ -8288,7 +8288,7 @@ Move_STOCKPILE:: @ 81D256B
loadspritegfx 10235 loadspritegfx 10235
playsewithpan SE_W025, 192 playsewithpan SE_W025, 192
createvisualtask sub_80B9BDC, 2, 2, 8, 1, 0, 12, 32767 createvisualtask sub_80B9BDC, 2, 2, 8, 1, 0, 12, 32767
createvisualtask sub_80DF848, 5, createvisualtask AnimTask_StockpileDeformMon, 5,
call gUnknown_81D25A9 call gUnknown_81D25A9
call gUnknown_81D25A9 call gUnknown_81D25A9
waitforvisualfinish waitforvisualfinish
@@ -8318,7 +8318,7 @@ Move_SPIT_UP:: @ 81D2622
loadspritegfx 10237 loadspritegfx 10237
loadspritegfx 10135 loadspritegfx 10135
playsewithpan SE_W036, 192 playsewithpan SE_W036, 192
createvisualtask sub_80DF8A0, 5, createvisualtask AnimTask_SpitUpDeformMon, 5,
createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 8, 2 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 8, 2
delay 45 delay 45
playsewithpan SE_W255, 192 playsewithpan SE_W255, 192
@@ -8368,7 +8368,7 @@ Move_SWALLOW:: @ 81D2765
loadspritegfx 10236 loadspritegfx 10236
loadspritegfx 10031 loadspritegfx 10031
playsewithpan SE_W036, 192 playsewithpan SE_W036, 192
createvisualtask sub_80DF964, 5, createvisualtask AnimTask_SwallowDeformMon, 5,
createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 8, 2 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 8, 2
delay 38 delay 38
playsewithpan SE_W255, 192 playsewithpan SE_W255, 192
@@ -8408,7 +8408,7 @@ Move_TRANSFORM:: @ 81D2811
monbg 0 monbg 0
playsewithpan SE_W100, 192 playsewithpan SE_W100, 192
waitplaysewithpan SE_W107, 192, 48 waitplaysewithpan SE_W107, 192, 48
createvisualtask sub_80DF9BC, 2, 0 createvisualtask AnimTask_TransformMon, 2, 0
waitforvisualfinish waitforvisualfinish
clearmonbg 0 clearmonbg 0
end end
@@ -8416,7 +8416,7 @@ Move_TRANSFORM:: @ 81D2811
Move_MORNING_SUN:: @ 81D2829 Move_MORNING_SUN:: @ 81D2829
loadspritegfx 10241 loadspritegfx 10241
loadspritegfx 10031 loadspritegfx 10031
createvisualtask sub_80DFC50, 5, createvisualtask AnimTask_MorningSunLightBeam, 5,
delay 8 delay 8
createvisualtask sub_80BA7F8, 10, 1921, 8, 0, 12, 32767 createvisualtask sub_80BA7F8, 10, 1921, 8, 0, 12, 32767
delay 14 delay 14
@@ -8540,7 +8540,7 @@ Move_FLATTER:: @ 81D2AE9
loadspritegfx 10227 loadspritegfx 10227
loadspritegfx 10240 loadspritegfx 10240
createvisualtask sub_80DD410, 5, 216, 63 createvisualtask sub_80DD410, 5, 216, 63
createvisualtask sub_80DEDD8, 2, createvisualtask AnimTask_CreateSpotlight, 2,
createvisualtask sub_80BAB38, 2, 248, 3, 0, 10, 0 createvisualtask sub_80BAB38, 2, 248, 3, 0, 10, 0
waitforvisualfinish waitforvisualfinish
createsprite gFlatterSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8, 80 createsprite gFlatterSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8, 80
@@ -8574,7 +8574,7 @@ Move_FLATTER:: @ 81D2AE9
waitforvisualfinish waitforvisualfinish
createvisualtask sub_80BAB38, 2, 248, 3, 10, 0, 1 createvisualtask sub_80BAB38, 2, 248, 3, 10, 0, 1
waitforvisualfinish waitforvisualfinish
createvisualtask sub_80DEE78, 2, createvisualtask AnimTask_RemoveSpotlight, 2,
end end
gUnknown_81D2BD2:: @ 81D2BD2 gUnknown_81D2BD2:: @ 81D2BD2
@@ -9692,7 +9692,7 @@ Move_PSYCHO_BOOST:: @ 81D499B
monbg 2 monbg 2
fadetobg 3 fadetobg 3
waitbgfadeout waitbgfadeout
createvisualtask sub_80DE7B4, 5, createvisualtask AnimTask_FadeScreenToWhite, 5,
waitbgfadein waitbgfadein
delay 6 delay 6
createvisualtask sub_80B9BDC, 2, 1, 2, 8, 0, 10, 0 createvisualtask sub_80B9BDC, 2, 1, 2, 8, 0, 10, 0
@@ -10368,7 +10368,7 @@ gUnknown_81D595F:: @ 81D595F
gUnknown_81D59BB:: @ 81D59BB gUnknown_81D59BB:: @ 81D59BB
fadetobg 3 fadetobg 3
waitbgfadeout waitbgfadeout
createvisualtask sub_80DE6F0, 5, createvisualtask AnimTask_SetPsychicBackground, 5,
waitbgfadein waitbgfadein
return return
@@ -10513,7 +10513,7 @@ Status_Nightmare:: @ 81D5B63
end end
General_CastformChange:: @ 81D5B88 General_CastformChange:: @ 81D5B88
createvisualtask c3_80DFBE4, 2, createvisualtask AnimTask_IsMonInvisible, 2,
jumpargeq 7, 1, gUnknown_81D5BB4 jumpargeq 7, 1, gUnknown_81D5BB4
goto gUnknown_81D5B9C goto gUnknown_81D5B9C
@@ -10521,17 +10521,17 @@ gUnknown_81D5B9C:: @ 81D5B9C
monbg 0 monbg 0
playsewithpan SE_W100, 192 playsewithpan SE_W100, 192
waitplaysewithpan SE_W107, 192, 48 waitplaysewithpan SE_W107, 192, 48
createvisualtask sub_80DF9BC, 2, 1 createvisualtask AnimTask_TransformMon, 2, 1
waitforvisualfinish waitforvisualfinish
clearmonbg 0 clearmonbg 0
end end
gUnknown_81D5BB4:: @ 81D5BB4 gUnknown_81D5BB4:: @ 81D5BB4
createvisualtask sub_80DFC24, 2, 1 createvisualtask AnimTask_CastformGfxChange, 2, 1
end end
General_StatsChange:: @ 81D5BBE General_StatsChange:: @ 81D5BBE
createvisualtask sub_8078694, 5, createvisualtask AnimTask_StatsChange, 5,
waitforvisualfinish waitforvisualfinish
end end
@@ -10554,15 +10554,15 @@ General_SubstituteAppear:: @ 81D5C04
General_PokeblockThrow:: @ 81D5C0C General_PokeblockThrow:: @ 81D5C0C
createvisualtask sub_80F1C8C, 2, 0 createvisualtask sub_80F1C8C, 2, 0
createvisualtask sub_80F1AE0, 2, createvisualtask AnimTask_LoadPokeblockGfx, 2,
delay 0 delay 0
waitplaysewithpan SE_W026, 192, 22 waitplaysewithpan SE_W026, 192, 22
createsprite gUnknown_840C1EC, ANIM_TARGET, 3, -18, 12, 0, 32 createsprite gPokeblockSpriteTemplate, ANIM_TARGET, 3, -18, 12, 0, 32
delay 50 delay 50
loopsewithpan SE_W039, 63, 19, 2 loopsewithpan SE_W039, 63, 19, 2
createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, 1 createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, 1
waitforvisualfinish waitforvisualfinish
createvisualtask sub_80F1B14, 2, createvisualtask AnimTask_FreePokeblockGfx, 2,
end end
General_ItemKnockoff:: @ 81D5C54 General_ItemKnockoff:: @ 81D5C54
@@ -10571,7 +10571,7 @@ General_ItemKnockoff:: @ 81D5C54
end end
General_TurnTrap:: @ 81D5C5F General_TurnTrap:: @ 81D5C5F
createvisualtask sub_80F1D14, 5, createvisualtask AnimTask_GetTrappedMoveAnimId, 5,
jumpargeq 0, 1, gUnknown_81D5CD3 jumpargeq 0, 1, gUnknown_81D5CD3
jumpargeq 0, 2, gUnknown_81D5CF8 jumpargeq 0, 2, gUnknown_81D5CF8
jumpargeq 0, 3, gUnknown_81D5D4C jumpargeq 0, 3, gUnknown_81D5D4C
@@ -10744,7 +10744,7 @@ General_Hail:: @ 81D5FE2
goto Move_HAIL goto Move_HAIL
General_LeechSeedDrain:: @ 81D5FE7 General_LeechSeedDrain:: @ 81D5FE7
createvisualtask sub_80F1D7C, 5, createvisualtask AnimTask_GetBattlersFromArg, 5,
delay 0 delay 0
goto Move_ABSORB goto Move_ABSORB
@@ -10763,7 +10763,7 @@ General_MonHit:: @ 81D5FF5
General_ItemSteal:: @ 81D6026 General_ItemSteal:: @ 81D6026
loadspritegfx 10224 loadspritegfx 10224
createvisualtask sub_80BC0FC, 2, createvisualtask sub_80BC0FC, 2,
createvisualtask sub_80F1700, 2, createvisualtask AnimTask_TargetToEffectBattler, 2,
delay 1 delay 1
createsprite gItemStealSpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 10, 2, -1 createsprite gItemStealSpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 10, 2, -1
end end
@@ -10939,7 +10939,7 @@ gUnknown_81D637B:: @ 81D637B
monbg 0 monbg 0
playsewithpan SE_W100, 192 playsewithpan SE_W100, 192
waitplaysewithpan SE_W107, 192, 48 waitplaysewithpan SE_W107, 192, 48
createvisualtask sub_80DF9BC, 2, 255 createvisualtask AnimTask_TransformMon, 2, 255
waitsound waitsound
waitforvisualfinish waitforvisualfinish
clearmonbg 0 clearmonbg 0
@@ -11000,7 +11000,7 @@ gUnknown_81D644E:: @ 81D644E
end end
gUnknown_81D6476:: @ 81D6476 gUnknown_81D6476:: @ 81D6476
createvisualtask sub_80F16CC, 2, createvisualtask AnimTask_IsAttackerBehindSubstitute, 2,
jumpargeq 7, 1, gUnknown_81D6487 jumpargeq 7, 1, gUnknown_81D6487
gUnknown_81D6485:: @ 81D6485 gUnknown_81D6485:: @ 81D6485
@@ -11013,7 +11013,7 @@ gUnknown_81D6487:: @ 81D6487
goto gUnknown_81D6485 goto gUnknown_81D6485
gUnknown_81D6496:: @ 81D6496 gUnknown_81D6496:: @ 81D6496
createvisualtask sub_80F16CC, 2, createvisualtask AnimTask_IsAttackerBehindSubstitute, 2,
jumpargeq 7, 1, gUnknown_81D64A7 jumpargeq 7, 1, gUnknown_81D64A7
gUnknown_81D64A5:: @ 81D64A5 gUnknown_81D64A5:: @ 81D64A5
@@ -11051,7 +11051,7 @@ Special_BallThrow:: @ 81D64F9
delay 0 delay 0
playsewithpan SE_NAGERU, 0 playsewithpan SE_NAGERU, 0
createvisualtask sub_80EF5AC, 2, createvisualtask sub_80EF5AC, 2,
createvisualtask sub_80EF4E0, 2, createvisualtask AnimTask_IsBallBlockedByTrainer, 2,
jumpargeq 7, 65535, gUnknown_81D652D jumpargeq 7, 65535, gUnknown_81D652D
jumpargeq 7, 65534, gUnknown_81D6555 jumpargeq 7, 65534, gUnknown_81D6555
data/graphics.s
+1 -1
View File
@@ -1344,7 +1344,7 @@ gBattleAnimSpritePal_Impact:: @ 8D1A5F0
.incbin "graphics/battle_anims/sprites/135.gbapal.lz" .incbin "graphics/battle_anims/sprites/135.gbapal.lz"
.align 2 .align 2
gFile_graphics_battle_anims_sprites_particles_sheet:: @ 8D1A608 gBattleAnimSpriteGfx_Particles:: @ 8D1A608
.incbin "graphics/battle_anims/sprites/particles.4bpp.lz" .incbin "graphics/battle_anims/sprites/particles.4bpp.lz"
.align 2 .align 2
data/pokeball.s
+1 -1
View File
@@ -101,7 +101,7 @@ gSpriteAffineAnimTable_82606E0::
.4byte gSpriteAffineAnims_82606C0 .4byte gSpriteAffineAnims_82606C0
.4byte gSpriteAffineAnims_82606D0 .4byte gSpriteAffineAnims_82606D0
gUnknown_82606F4:: @ 82606F4 gBallSpriteTemplates:: @ 82606F4
spr_template 55000, 55000, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow spr_template 55000, 55000, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
spr_template 55001, 55001, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow spr_template 55001, 55001, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
spr_template 55002, 55002, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow spr_template 55002, 55002, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
src/battle_anim_effects_2.c
+2 -2
View File
@@ -292,12 +292,12 @@ const union AffineAnimCmd gWaterPulseRingAffineAnimCmds[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd *const gGrowingRingAffineAnimTable[] = const union AffineAnimCmd *const gGrowingRingAffineAnimTable[] = //gUnknown_83E3C98
{ {
gGrowingRingAffineAnimCmds, gGrowingRingAffineAnimCmds,
}; };
const union AffineAnimCmd *const gWaterPulseRingAffineAnimTable[] = const union AffineAnimCmd *const gWaterPulseRingAffineAnimTable[] = //83E3C9C
{ {
gWaterPulseRingAffineAnimCmds, gWaterPulseRingAffineAnimCmds,
}; };
src/battle_anim_special.c
+1 -2
View File
@@ -104,8 +104,7 @@ static void PremierBallOpenParticleAnimation(u8);
static void sub_80F1B3C(struct Sprite *); static void sub_80F1B3C(struct Sprite *);
// Data // Data
extern const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT]; //for now extern const struct SpriteTemplate gBallSpriteTemplates[]; //for now
extern const u32 gBattleAnimSpriteGfx_Particles[];
struct BallCaptureSuccessStarData struct BallCaptureSuccessStarData
{ {