ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-28 22:33:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Label Kyogre/Groudon anims

Browse Source
This commit is contained in:
GriffinR 2021-04-06 03:46:19 -04:00
parent 00c3044c96
commit 802d2b2f0f
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/maps/SootopolisCity/scripts.inc
View File

@ -258,8 +258,8 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: @ 81E5946
waitmovement 0 waitmovement 0
waitse waitse
playmoncry SPECIES_GROUDON, 2 playmoncry SPECIES_GROUDON, 2
applymovement LOCALID_KYOGRE, SootopolisCity_Movement_GroudonAttack applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreDefend
applymovement LOCALID_GROUDON, SootopolisCity_Movement_KyogreDefend applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonAttack
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 1 @ vertical pan setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 1 @ horizontal pan setvar VAR_0x8005, 1 @ horizontal pan
@ -358,8 +358,8 @@ SootopolisCity_EventScript_LegendariesSceneFromDive:: @ 81E5A82
waitmovement 0 waitmovement 0
waitse waitse
playmoncry SPECIES_GROUDON, 2 playmoncry SPECIES_GROUDON, 2
applymovement LOCALID_KYOGRE, SootopolisCity_Movement_GroudonAttack applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreDefend
applymovement LOCALID_GROUDON, SootopolisCity_Movement_KyogreDefend applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonAttack
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 1 @ vertical pan setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 1 @ horizontal pan setvar VAR_0x8005, 1 @ horizontal pan
@ -431,7 +431,7 @@ SootopolisCity_Movement_KyogreAttack: @ 81E5BB8
clear_affine_anim clear_affine_anim
step_end step_end
SootopolisCity_Movement_GroudonAttack: @ 81E5BC2 SootopolisCity_Movement_KyogreDefend: @ 81E5BC2
delay_16 delay_16
delay_16 delay_16
delay_16 delay_16
@ -464,7 +464,7 @@ SootopolisCity_Movement_KyogreIdle: @ 81E5BD6
walk_in_place_slow_left walk_in_place_slow_left
step_end step_end
SootopolisCity_Movement_KyogreDefend: @ 81E5BDD SootopolisCity_Movement_GroudonAttack: @ 81E5BDD
walk_in_place_slow_right walk_in_place_slow_right
walk_in_place_slow_right walk_in_place_slow_right
walk_in_place_slow_right walk_in_place_slow_right

24
src/data/object_events/object_event_anims.h
View File

@ -733,7 +733,7 @@ static const union AnimCmd sAnim_HookedPokemonEast[] =
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
static const union AffineAnimCmd sAffineAnim_8508FD8[] = static const union AffineAnimCmd sAffineAnim_KyogreGroudon_GoSouthStart[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1),
AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1),
@ -743,7 +743,7 @@ static const union AffineAnimCmd sAffineAnim_8508FD8[] =
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
static const union AffineAnimCmd sAffineAnim_8509008[] = static const union AffineAnimCmd sAffineAnim_KyogreGroudon_GoSouth[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1),
AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1),
@ -754,26 +754,26 @@ static const union AffineAnimCmd sAffineAnim_8509008[] =
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
static const union AffineAnimCmd sAffineAnim_8509040[] = static const union AffineAnimCmd sAffineAnim_KyogreGroudon_AttackEast[] =
{ {
AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0), AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd sAffineAnim_8509050[] = static const union AffineAnimCmd sAffineAnim_KyogreGroudon_AttackWest[] =
{ {
AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0), AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd sAffineAnim_8509060[] = static const union AffineAnimCmd sAffineAnim_KyogreGroudon_DipEast[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1),
AFFINEANIMCMD_LOOP(8), AFFINEANIMCMD_LOOP(8),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd sAffineAnim_8509078[] = static const union AffineAnimCmd sAffineAnim_KyogreGroudon_DipWest[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1),
AFFINEANIMCMD_LOOP(8), AFFINEANIMCMD_LOOP(8),
@ -1135,12 +1135,12 @@ static const union AnimCmd *const sAnimTable_Fishing[] = {
}; };
static const union AffineAnimCmd *const sAffineAnimTable_KyogreGroudon[] = { static const union AffineAnimCmd *const sAffineAnimTable_KyogreGroudon[] = {
sAffineAnim_8508FD8, sAffineAnim_KyogreGroudon_GoSouthStart, // Used by Kyogre/Groudon when awakened
sAffineAnim_8509008, sAffineAnim_KyogreGroudon_GoSouth, // Used by Kyogre/Groudon when awakened
sAffineAnim_8509050, sAffineAnim_KyogreGroudon_AttackWest, // Used by Kyogre during Sootopolis fight
sAffineAnim_8509040, sAffineAnim_KyogreGroudon_AttackEast, // Unused
sAffineAnim_8509078, sAffineAnim_KyogreGroudon_DipWest, // Unused
sAffineAnim_8509060, sAffineAnim_KyogreGroudon_DipEast, // Unused
}; };
const struct UnkStruct_085094AC gUnknown_085094AC[] = { const struct UnkStruct_085094AC gUnknown_085094AC[] = {