Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

moves & sprites and whatever else #335

Open
wants to merge 12 commits into
base: move-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion armips/data/heighttable.s
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,7 @@ heightentry SPECIES_SNOM, 0, 0, 0, 0
heightentry SPECIES_FROSMOTH, 0, 0, 0, 0
heightentry SPECIES_STONJOURNER, 0, 0, 0, 0
heightentry SPECIES_EISCUE, 0, 0, 0, 0
heightentry SPECIES_INDEEDEE, "null", 0, "null", 0
heightentry SPECIES_INDEEDEE, 0, 0, 0, 0
heightentry SPECIES_MORPEKO, 0, 0, 0, 0
heightentry SPECIES_CUFANT, 0, 0, 0, 0
heightentry SPECIES_COPPERAJAH, 0, 0, 0, 0
Expand Down
362 changes: 181 additions & 181 deletions armips/data/mondata.s

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions armips/data/moves.s
Original file line number Diff line number Diff line change
Expand Up @@ -8730,7 +8730,7 @@ movedata MOVE_TAIL_SLAP, "Tail Slap"
movedescription MOVE_TAIL_SLAP, "The use attacks by\nhitting the target\nwith its hard tail.\nIt hits two to five\ntimes in a row."

movedata MOVE_HURRICANE, "Hurricane"
battleeffect MOVE_EFFECT_HIT
battleeffect MOVE_EFFECT_HURRICANE
pss SPLIT_SPECIAL
basepower 110
type TYPE_FLYING
Expand All @@ -8743,7 +8743,7 @@ movedata MOVE_HURRICANE, "Hurricane"
appeal 0x00
contesttype CONTEST_COOL
terminatedata
movedescription MOVE_HURRICANE, "The foe is caught\nin a fierce wind.\nIt may also confuse\nthe foe."
movedescription MOVE_HURRICANE, "The user attacks by\nwrapping its opponent\nin a fierce wind.\nThis may also confuse\nthe target."

movedata MOVE_HEAD_CHARGE, "Head Charge"
battleeffect MOVE_EFFECT_RECOIL_THIRD
Expand Down Expand Up @@ -9544,7 +9544,7 @@ movedata MOVE_STEAM_ERUPTION, "Steam Eruption"
appeal 0x00
contesttype CONTEST_COOL
terminatedata
movedescription MOVE_STEAM_ERUPTION, "---"
movedescription MOVE_STEAM_ERUPTION, "The user immerses the\ntarget in superheated\nsteam.\nThis may also leave\nthe target with a burn."

movedata MOVE_HYPERSPACE_HOLE, "Hyperspace Hole"
battleeffect MOVE_EFFECT_REMOVE_PROTECT
Expand All @@ -9556,7 +9556,7 @@ movedata MOVE_HYPERSPACE_HOLE, "Hyperspace Hole"
effectchance 0
target MOVE_TARGET_SELECTED
priority 0
flags FLAG_PROTECT | FLAG_MIRROR_MOVE | FLAG_KINGS_ROCK
flags FLAG_MIRROR_MOVE | FLAG_KINGS_ROCK
appeal 0x00
contesttype CONTEST_COOL
terminatedata
Expand Down Expand Up @@ -9784,7 +9784,7 @@ movedata MOVE_HOLD_HANDS, "Hold Hands"
appeal 0x00
contesttype CONTEST_COOL
terminatedata
movedescription MOVE_HOLD_HANDS, "---"
movedescription MOVE_HOLD_HANDS, "The user and an ally\nhold hands.\nThis makes them very\nhappy."

movedata MOVE_BABY_DOLL_EYES, "Baby-Doll Eyes"
battleeffect MOVE_EFFECT_ATK_DOWN
Expand Down Expand Up @@ -9848,7 +9848,7 @@ movedata MOVE_INFESTATION, "Infestation"
appeal 0x00
contesttype CONTEST_COOL
terminatedata
movedescription MOVE_INFESTATION, "---"
movedescription MOVE_INFESTATION, "The target is infested\nand attacked for four\nto five turns.\nThe target can't flee\nduring this time."

movedata MOVE_POWER_UP_PUNCH, "Power-Up Punch"
battleeffect MOVE_EFFECT_RAISE_ATTACK_HIT
Expand Down Expand Up @@ -9944,7 +9944,7 @@ movedata MOVE_LIGHT_OF_RUIN, "Light of Ruin"
appeal 0x00
contesttype CONTEST_COOL
terminatedata
movedescription MOVE_LIGHT_OF_RUIN, "---"
movedescription MOVE_LIGHT_OF_RUIN, "Drawing power from the\nEternal Flower, the user\nfires a powerful beam of\nlight. This also damages\nthe user terribly."

movedata MOVE_ORIGIN_PULSE, "Origin Pulse"
battleeffect MOVE_EFFECT_HIT
Expand All @@ -9960,7 +9960,7 @@ movedata MOVE_ORIGIN_PULSE, "Origin Pulse"
appeal 0x00
contesttype CONTEST_COOL
terminatedata
movedescription MOVE_ORIGIN_PULSE, "---"
movedescription MOVE_ORIGIN_PULSE, "The user attacks\nopposing Pokémon with\ncountless beams of\nlight that glow a deep\nand brilliant blue."

movedatalongname MOVE_PRECIPICE_BLADES, "PrecipiceBlades", "Precipice Blades"
battleeffect MOVE_EFFECT_HIT
Expand Down Expand Up @@ -9995,7 +9995,7 @@ movedata MOVE_DRAGON_ASCENT, "Dragon Ascent"
movedescription MOVE_DRAGON_ASCENT, "---"

movedata MOVE_HYPERSPACE_FURY, "Hyperspace Fury"
battleeffect MOVE_EFFECT_HIT
battleeffect MOVE_EFFECT_USER_DEF_DOWN_HIT_REMOVE_PROTECT
pss SPLIT_PHYSICAL
basepower 100
type TYPE_DARK
Expand All @@ -10004,7 +10004,7 @@ movedata MOVE_HYPERSPACE_FURY, "Hyperspace Fury"
effectchance 100
target MOVE_TARGET_SELECTED
priority 0
flags FLAG_PROTECT | FLAG_MIRROR_MOVE | FLAG_KINGS_ROCK
flags FLAG_MIRROR_MOVE | FLAG_KINGS_ROCK
appeal 0x00
contesttype CONTEST_COOL
terminatedata
Expand Down Expand Up @@ -11115,7 +11115,7 @@ movedata MOVE_BEAK_BLAST, "Beak Blast"
movedescription MOVE_BEAK_BLAST, "---"

movedata MOVE_CLANGING_SCALES, "Clanging Scales"
battleeffect MOVE_EFFECT_HIT
battleeffect MOVE_EFFECT_USER_DEF_DOWN_HIT
pss SPLIT_SPECIAL
basepower 110
type TYPE_DRAGON
Expand Down Expand Up @@ -11448,7 +11448,7 @@ movedata MOVE_PRISMATIC_LASER, "Prismatic Laser"
appeal 0x00
contesttype CONTEST_COOL
terminatedata
movedescription MOVE_PRISMATIC_LASER, "---"
movedescription MOVE_PRISMATIC_LASER, "The user shoots\npowerful lasers using\rthe power of a prism.\nThe user can't move on\rthe next turn."

movedata MOVE_SPECTRAL_THIEF, "Spectral Thief"
battleeffect MOVE_EFFECT_HIT
Expand Down Expand Up @@ -12459,7 +12459,7 @@ movedata MOVE_MAX_STEELSPIKE, "Max Steelspike"
movedescription MOVE_MAX_STEELSPIKE, "---"

movedata MOVE_CLANGOROUS_SOUL, "Clangorous Soul"
battleeffect MOVE_EFFECT_HIT
battleeffect MOVE_EFFECT_RAISE_ALL_STATS_LOSE_THIRD_MAX_HP
pss SPLIT_STATUS
basepower 0
type TYPE_DRAGON
Expand All @@ -12472,7 +12472,7 @@ movedata MOVE_CLANGOROUS_SOUL, "Clangorous Soul"
appeal 0x00
contesttype CONTEST_COOL
terminatedata
movedescription MOVE_CLANGOROUS_SOUL, "---"
movedescription MOVE_CLANGOROUS_SOUL, "The user boosts all\nits stats by using\nsome of its own HP."

movedata MOVE_BODY_PRESS, "Body Press"
battleeffect MOVE_EFFECT_HIT
Expand Down Expand Up @@ -13003,7 +13003,7 @@ movedata MOVE_LASH_OUT, "Lash Out"
movedescription MOVE_LASH_OUT, "---"

movedata MOVE_POLTERGEIST, "Poltergeist"
battleeffect MOVE_EFFECT_HIT
battleeffect MOVE_EFFECT_POLTERGEIST
pss SPLIT_PHYSICAL
basepower 110
type TYPE_GHOST
Expand All @@ -13016,7 +13016,7 @@ movedata MOVE_POLTERGEIST, "Poltergeist"
appeal 0x00
contesttype CONTEST_COOL
terminatedata
movedescription MOVE_POLTERGEIST, "---"
movedescription MOVE_POLTERGEIST, "The user attacks by\ncontrolling the\ntarget's item. This\nmove fails if the foe\nisn't holding an item."

movedata MOVE_CORROSIVE_GAS, "Corrosive Gas"
battleeffect MOVE_EFFECT_HIT
Expand Down Expand Up @@ -13451,7 +13451,7 @@ movedata MOVE_MOUNTAIN_GALE, "Mountain Gale"
movedescription MOVE_MOUNTAIN_GALE, "---"

movedata MOVE_VICTORY_DANCE, "Victory Dance"
battleeffect MOVE_EFFECT_HIT
battleeffect MOVE_EFFECT_ATK_DEF_SPEED_UP
pss SPLIT_STATUS
basepower 0
type TYPE_FIGHTING
Expand All @@ -13464,7 +13464,7 @@ movedata MOVE_VICTORY_DANCE, "Victory Dance"
appeal 0x00
contesttype CONTEST_COOL
terminatedata
movedescription MOVE_VICTORY_DANCE, "---"
movedescription MOVE_VICTORY_DANCE, "The user performs an\nintense dance to usher\nin victory, boosting\nits Attack, Defense,\nand Speed stats."

movedata MOVE_HEADLONG_RUSH, "Headlong Rush"
battleeffect MOVE_EFFECT_USER_DEF_SP_DEF_DOWN_HIT
Expand Down
2 changes: 1 addition & 1 deletion armips/data/spriteoffsets.s
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@ dataentry SPECIES_COSMOEM, 2, 5, -1, 0, SHADOW_SIZE_MEDIUM
dataentry SPECIES_SOLGALEO, 2, 5, -3, 0, SHADOW_SIZE_LARGE
dataentry SPECIES_LUNALA, 2, 5, 7, 6, SHADOW_SIZE_LARGE
dataentry SPECIES_NIHILEGO, 2, 5, 1, 0, SHADOW_SIZE_MEDIUM
dataentry SPECIES_BUZZWOLE, 2, 5, -1, 0, SHADOW_SIZE_LARGE
dataentry SPECIES_BUZZWOLE, 2, 5, 0, 6, SHADOW_SIZE_LARGE
dataentry SPECIES_PHEROMOSA, 2, 5, 0, -2, SHADOW_SIZE_LARGE
dataentry SPECIES_XURKITREE, 2, 5, 1, -1, SHADOW_SIZE_LARGE
dataentry SPECIES_CELESTEELA, 2, 5, -1, 0, SHADOW_NO_SHADOW
Expand Down
5 changes: 5 additions & 0 deletions asm/include/battle_constants.inc
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,10 @@
.equ MOVE_SUBSCRIPT_PTR_QUASH, 0xA1
.equ MOVE_SUBSCRIPT_PTR_DRAIN_FULL, 0xA2
.equ MOVE_SUBSCRIPT_PTR_GIVE_TARGET_SIMPLE, 0xA3
.equ MOVE_SUBSCRIPT_PTR_USER_DEF_DOWN_1_STAGE, 0xA4
.equ MOVE_SUBSCRIPT_PTR_ATK_DEF_SPEED_UP, 0xA5
.equ MOVE_SUBSCRIPT_PTR_HYPERSPACE_FURY, 0xA6
.equ MOVE_SUBSCRIPT_PTR_CLANGOROUS_SOUL, 0xA7



Expand Down Expand Up @@ -1306,6 +1310,7 @@
.equ BATTLE_SUBSCRIPT_CANNOT_USE_MOVE, 0x17B
.equ BATTLE_SUBSCRIPT_POWER_HERB_METEOR_BEAM, 0x17C
.equ BATTLE_SUBSCRIPT_SP_ATK_UP_RAIN_SKIP, 0x17D
.equ BATTLE_SUBSCRIPT_ATK_DEF_SPEED_UP, 0x17E

.equ TERRAIN_PLAIN, 0x0
.equ TERRAIN_SAND, 0x1
Expand Down
6 changes: 6 additions & 0 deletions asm/include/move_effects.inc
Original file line number Diff line number Diff line change
Expand Up @@ -329,5 +329,11 @@
.equ MOVE_EFFECT_SET_ABILITY_TO_SIMPLE, 323
.equ MOVE_EFFECT_CHARGE_TURN_SP_ATK_UP, 324
.equ MOVE_EFFECT_CHARGE_TURN_SP_ATK_UP_RAIN_SKIPS, 325
.equ MOVE_EFFECT_HURRICANE, 326
.equ MOVE_EFFECT_USER_DEF_DOWN_HIT, 327
.equ MOVE_EFFECT_USER_DEF_DOWN_HIT_REMOVE_PROTECT, 328
.equ MOVE_EFFECT_ATK_DEF_SPEED_UP, 329
.equ MOVE_EFFECT_POLTERGEIST, 330
.equ MOVE_EFFECT_RAISE_ALL_STATS_LOSE_THIRD_MAX_HP, 331

.endif
10 changes: 10 additions & 0 deletions data/battle_scripts/effects/effect_script_0326_HURRICANE.s
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.include "asm/include/battle_commands.inc"

.data

_000:
UpdateVar OPCODE_SET, BSCRIPT_VAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_CONFUSE
UpdateVar OPCODE_FLAG_ON, BSCRIPT_VAR_BATTLE_STATUS, BATTLE_STATUS_HIT_FLY
CalcCrit
CalcDamage
End
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.include "asm/include/battle_commands.inc"

.data

_000:
UpdateVar OPCODE_SET, BSCRIPT_VAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_USER_DEF_DOWN_1_STAGE
CalcCrit
CalcDamage
End
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.include "asm/include/battle_commands.inc"

.data

_000:
UpdateVar OPCODE_SET, BSCRIPT_VAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_HYPERSPACE_FURY
CalcCrit
CalcDamage
End
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.include "asm/include/battle_commands.inc"

.data

_000:
UpdateVar OPCODE_SET, BSCRIPT_VAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_ATK_DEF_SPEED_UP
End
20 changes: 20 additions & 0 deletions data/battle_scripts/effects/effect_script_0330_POLTERGEIST.s
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
.include "asm/include/battle_commands.inc"

.data

_000:
CompareMonDataToValue OPCODE_EQU, BATTLER_CATEGORY_DEFENDER, BMON_DATA_HELD_ITEM, ITEM_NONE, _017
PrintAttackMessage
Wait
WaitButtonABTime 30
// {1} is about to be attacked by its {2}!
PrintMessage 1484, TAG_NICKNAME_ITEM, BATTLER_CATEGORY_DEFENDER, BATTLER_CATEGORY_DEFENDER
Wait
WaitButtonABTime 30
CalcCrit
CalcDamage
End

_017:
UpdateVar OPCODE_FLAG_ON, BSCRIPT_VAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED
End
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.include "asm/include/battle_commands.inc"

.data

_000:
UpdateVar OPCODE_SET, BSCRIPT_VAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_CLANGOROUS_SOUL
End
11 changes: 11 additions & 0 deletions data/battle_scripts/subscripts/subscript_0382_USER_DEF_DOWN_HIT.s
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.include "asm/include/battle_commands.inc"

.data

_000:
UpdateVar OPCODE_FLAG_ON, BSCRIPT_VAR_BATTLE_STATUS_2, BATTLE_STATUS2_STAT_STAGE_CHANGE_SHOWN
UpdateVar OPCODE_SET, BSCRIPT_VAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_DEFENSE_DOWN_1_STAGE
Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE
UpdateVar OPCODE_FLAG_OFF, BSCRIPT_VAR_BATTLE_STATUS_2, BATTLE_STATUS2_UPDATE_STAT_STAGES
UpdateVar OPCODE_FLAG_OFF, BSCRIPT_VAR_BATTLE_STATUS_2, BATTLE_STATUS2_STAT_STAGE_CHANGE_SHOWN
End
34 changes: 34 additions & 0 deletions data/battle_scripts/subscripts/subscript_0383_ATK_DEF_SPEED_UP.s
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
.include "asm/include/battle_commands.inc"

.data

_000:
CompareMonDataToValue OPCODE_NEQ, BATTLER_CATEGORY_SIDE_EFFECT_MON, BMON_DATA_STAT_CHANGE_ATK, 12, _017
CompareMonDataToValue OPCODE_NEQ, BATTLER_CATEGORY_SIDE_EFFECT_MON, BMON_DATA_STAT_CHANGE_DEF, 12, _017
CompareMonDataToValue OPCODE_EQU, BATTLER_CATEGORY_SIDE_EFFECT_MON, BMON_DATA_STAT_CHANGE_SPEED, 12, _058

_017:
Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION
UpdateVar OPCODE_FLAG_ON, BSCRIPT_VAR_BATTLE_STATUS, BATTLE_STATUS_MESSAGES_OFF
UpdateVar OPCODE_FLAG_ON, BSCRIPT_VAR_BATTLE_STATUS, BATTLE_STATUS_MOVE_ANIMATIONS_OFF|BATTLE_STATUS_NO_ATTACK_MESSAGE
UpdateVar OPCODE_FLAG_ON, BSCRIPT_VAR_BATTLE_STATUS_2, BATTLE_STATUS2_STAT_STAGE_CHANGE_SHOWN
UpdateVar OPCODE_SET, BSCRIPT_VAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_ATTACK_UP_1_STAGE
Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE
UpdateVar OPCODE_SET, BSCRIPT_VAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_DEFENSE_UP_1_STAGE
Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE
UpdateVar OPCODE_SET, BSCRIPT_VAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_SPEED_UP_1_STAGE
Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE
UpdateVar OPCODE_FLAG_OFF, BSCRIPT_VAR_BATTLE_STATUS_2, BATTLE_STATUS2_UPDATE_STAT_STAGES
UpdateVar OPCODE_FLAG_OFF, BSCRIPT_VAR_BATTLE_STATUS_2, BATTLE_STATUS2_STAT_STAGE_CHANGE_SHOWN
End

_058:
PrintAttackMessage
Wait
WaitButtonABTime 30
// {0}’s stats won’t go any higher!
PrintMessage 768, TAG_NICKNAME, BATTLER_CATEGORY_SIDE_EFFECT_MON
Wait
WaitButtonABTime 30
UpdateVar OPCODE_FLAG_ON, BSCRIPT_VAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK
End
19 changes: 19 additions & 0 deletions data/battle_scripts/subscripts/subscript_0384_HYPERSPACE_FURY.s
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.include "asm/include/battle_commands.inc"

.data

_000:
IfTurnFlag BATTLER_CATEGORY_DEFENDER, TURN_FLAG_PROTECTING, 0, _022
// It broke through {0}’s protection!
PrintMessage 1243, TAG_NICKNAME, BATTLER_CATEGORY_DEFENDER
Wait
WaitButtonABTime 30

_022:
SetTurnFlag BATTLER_CATEGORY_DEFENDER, TURN_FLAG_PROTECTING, 0
UpdateVar OPCODE_FLAG_ON, BSCRIPT_VAR_BATTLE_STATUS_2, BATTLE_STATUS2_STAT_STAGE_CHANGE_SHOWN
UpdateVar OPCODE_SET, BSCRIPT_VAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_DEFENSE_DOWN_1_STAGE
Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE
UpdateVar OPCODE_FLAG_OFF, BSCRIPT_VAR_BATTLE_STATUS_2, BATTLE_STATUS2_UPDATE_STAT_STAGES
UpdateVar OPCODE_FLAG_OFF, BSCRIPT_VAR_BATTLE_STATUS_2, BATTLE_STATUS2_STAT_STAGE_CHANGE_SHOWN
End
28 changes: 28 additions & 0 deletions data/battle_scripts/subscripts/subscript_0385_CLANGOROUS_SOUL.s
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
.include "asm/include/battle_commands.inc"

.data

_000:
CompareMonDataToValue OPCODE_NEQ, BATTLER_CATEGORY_ATTACKER, BMON_DATA_STAT_CHANGE_ATK, 12, _029
CompareMonDataToValue OPCODE_NEQ, BATTLER_CATEGORY_ATTACKER, BMON_DATA_STAT_CHANGE_DEF, 12, _029
CompareMonDataToValue OPCODE_NEQ, BATTLER_CATEGORY_ATTACKER, BMON_DATA_STAT_CHANGE_SPEED, 12, _029
CompareMonDataToValue OPCODE_NEQ, BATTLER_CATEGORY_ATTACKER, BMON_DATA_STAT_CHANGE_SPATK, 12, _029
CompareMonDataToValue OPCODE_EQU, BATTLER_CATEGORY_ATTACKER, BMON_DATA_STAT_CHANGE_SPDEF, 12, _052

_029:
UpdateMonDataFromVar OPCODE_GET, BATTLER_CATEGORY_ATTACKER, BMON_DATA_MAXHP, BSCRIPT_VAR_HP_CALC
DivideVarByValue BSCRIPT_VAR_HP_CALC, 3
CompareMonDataToVar OPCODE_LTE, BATTLER_CATEGORY_ATTACKER, BMON_DATA_HP, BSCRIPT_VAR_HP_CALC, _052
Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION
UpdateVar OPCODE_MUL, BSCRIPT_VAR_HP_CALC, -1
UpdateVarFromVar OPCODE_SET, BSCRIPT_VAR_MSG_BATTLER_TEMP, BSCRIPT_VAR_BATTLER_ATTACKER
UpdateVar OPCODE_FLAG_ON, BSCRIPT_VAR_BATTLE_STATUS, BATTLE_STATUS_NO_BLINK
Call BATTLE_SUBSCRIPT_UPDATE_HP
Call BATTLE_SUBSCRIPT_BOOST_ALL_STATS
Wait
WaitButtonABTime 30
End

_052:
UpdateVar OPCODE_FLAG_ON, BSCRIPT_VAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED
End
Binary file modified data/graphics/sprites/buzzwole/male/back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/graphics/sprites/buzzwole/male/front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/graphics/sprites/indeedee/female/back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions data/graphics/sprites/indeedee/female/back.png.key
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
�d�
Binary file modified data/graphics/sprites/indeedee/female/front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions data/graphics/sprites/indeedee/female/front.png.key
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
�d�
1 change: 1 addition & 0 deletions data/graphics/sprites/iron_valiant/female/back.png.key
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
�r��
1 change: 1 addition & 0 deletions data/graphics/sprites/iron_valiant/female/front.png.key
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
�^h4
Binary file modified data/graphics/sprites/iron_valiant/male/back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/graphics/sprites/iron_valiant/male/front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions data/text/197.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1482,3 +1482,6 @@ The opposing {STRVAR_1 1, 0, 0} is\noverflowing with space power!
The wild {STRVAR_1 1, 0, 0} absorbed\nelectricity!
The opposing {STRVAR_1 1, 0, 0} absorbed\nelectricity!
Waggling a finger let it use\n{STRVAR_1 6, 1, 0}!
{STRVAR_1 1, 0, 0} is about to be\nattacked by its {STRVAR_1 6, 1, 0}!
The wild {STRVAR_1 1, 0, 0} is about to be\nattacked by its {STRVAR_1 6, 1, 0}!
The opposing {STRVAR_1 1, 0, 0} is about to be\nattacked by its {STRVAR_1 6, 1, 0}!
Loading