Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix healing after magic room ends

Browse Source
This commit is contained in:
AlexOn1ine 2025-02-12 20:16:02 +01:00
parent f8b45028db
commit ff47ca0f7a
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/battle_scripts_1.s
View File

@ -5909,7 +5909,11 @@ BattleScript_WonderRoomEnds::
BattleScript_MagicRoomEnds:: BattleScript_MagicRoomEnds::
printstring STRINGID_MAGICROOMENDS printstring STRINGID_MAGICROOMENDS
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
setbyte gBattlerAttacker, 0
BattleScript_MagicRoomHealingItemsLoop:
tryhealingitem tryhealingitem
addbyte gBattlerAttacker, 1 @ TODO: Pretty sure it should be based on speed
jumpifbytenotequal gBattlerAttacker, gBattlersCount, BattleScript_MagicRoomHealingItemsLoop
end2 end2
BattleScript_TerrainEnds_Ret:: BattleScript_TerrainEnds_Ret::

37
test/battle/move_effect/magic_room.c Normal file
View File

@ -0,0 +1,37 @@
#include "global.h"
#include "test/battle.h"
ASSUMPTIONS
{
ASSUME(GetMoveEffect(MOVE_MAGIC_ROOM) == EFFECT_MAGIC_ROOM);
}
DOUBLE_BATTLE_TEST("Magic Room prevents item hold effects")
{
GIVEN {
ASSUME(gItemsInfo[ITEM_BERRY_JUICE].holdEffect == HOLD_EFFECT_RESTORE_HP);
ASSUME(GetMoveEffect(MOVE_DRAGON_RAGE) == EFFECT_FIXED_DAMAGE_ARG);
ASSUME(GetMoveFixedDamage(MOVE_DRAGON_RAGE) == 40);
PLAYER(SPECIES_WOBBUFFET) { MaxHP(100); HP(60); Item(ITEM_BERRY_JUICE); }
PLAYER(SPECIES_WOBBUFFET) { MaxHP(100); HP(60); Item(ITEM_BERRY_JUICE); }
OPPONENT(SPECIES_WOBBUFFET) { MaxHP(100); HP(60); Item(ITEM_BERRY_JUICE); }
OPPONENT(SPECIES_WOBBUFFET) { MaxHP(100); HP(60); Item(ITEM_BERRY_JUICE); }
} WHEN {
TURN { MOVE(playerLeft, MOVE_MAGIC_ROOM); }
TURN {
MOVE(playerLeft, MOVE_DRAGON_RAGE, target: opponentLeft);
MOVE(opponentLeft, MOVE_DRAGON_RAGE, target: playerLeft);
MOVE(playerRight, MOVE_DRAGON_RAGE, target: opponentRight);
MOVE(opponentRight, MOVE_DRAGON_RAGE, target: playerRight);
}
TURN { MOVE(playerLeft, MOVE_MAGIC_ROOM); }
} SCENE {
ANIMATION(ANIM_TYPE_MOVE, MOVE_MAGIC_ROOM, playerLeft);
ANIMATION(ANIM_TYPE_MOVE, MOVE_MAGIC_ROOM, playerLeft);
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, playerLeft);
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, opponentLeft);
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, playerRight);
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, opponentRight);
}
}