ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 20:24:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

More review corrections

Browse Source
This commit is contained in:
LOuroboros 2022-08-25 11:52:21 -03:00
parent e792fae415
commit 1fc63c3431
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/battle_anim_scripts.s
View File

@ -24885,12 +24885,12 @@ PrimalReversionParticles:
delay 3 delay 3
return return
General_AffectionHangedOn:: @ Shameless copy of General_HangedOn General_AffectionHangedOn:: @ TODO: Make new animation, currenty a copy of General_HangedOn.
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 2, 7, 0, 9, RGB_RED createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, F_PAL_ATTACKER, 7, 0, 9, RGB_RED
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
createvisualtask AnimTask_SlideMonForFocusBand, 5, 30, 128, 0, 1, 2, 0, 1 createvisualtask AnimTask_SlideMonForFocusBand, 5, 30, 128, 0, 1, 2, 0, 1
waitforvisualfinish waitforvisualfinish
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 2, 4, 9, 0, RGB_RED createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, F_PAL_ATTACKER, 4, 9, 0, RGB_RED
waitforvisualfinish waitforvisualfinish
delay 6 delay 6
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 0, 0, 0, 15 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 0, 0, 0, 15

2
include/constants/battle.h
View File

@ -259,8 +259,8 @@
#define MOVE_RESULT_FOE_ENDURED (1 << 6) #define MOVE_RESULT_FOE_ENDURED (1 << 6)
#define MOVE_RESULT_FOE_HUNG_ON (1 << 7) #define MOVE_RESULT_FOE_HUNG_ON (1 << 7)
#define MOVE_RESULT_STURDIED (1 << 8) #define MOVE_RESULT_STURDIED (1 << 8)
#define MOVE_RESULT_NO_EFFECT (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED)
#define MOVE_RESULT_FOE_ENDURED_AFFECTION (1 << 9) #define MOVE_RESULT_FOE_ENDURED_AFFECTION (1 << 9)
#define MOVE_RESULT_NO_EFFECT (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED)
// Battle Weather flags // Battle Weather flags
#define B_WEATHER_RAIN_TEMPORARY (1 << 0) #define B_WEATHER_RAIN_TEMPORARY (1 << 0)

2
include/constants/battle_anim.h
View File

@ -536,7 +536,7 @@
#define B_ANIM_BEAK_BLAST_SETUP 33 #define B_ANIM_BEAK_BLAST_SETUP 33
#define B_ANIM_SHELL_TRAP_SETUP 34 #define B_ANIM_SHELL_TRAP_SETUP 34
#define B_ANIM_ZMOVE_ACTIVATE 35 // Using Z Moves #define B_ANIM_ZMOVE_ACTIVATE 35 // Using Z Moves
#define B_ANIM_AFFECTION_HANGED_ON 36 #define B_ANIM_AFFECTION_HANGED_ON 36 // TODO: Make new animation, currently a copy of B_ANIM_HANGED_ON.
// special animations table (gBattleAnims_Special) // special animations table (gBattleAnims_Special)
#define B_ANIM_LVL_UP 0 #define B_ANIM_LVL_UP 0

4
src/battle_util.c
View File

@ -2581,10 +2581,10 @@ u8 DoFieldEndTurnEffects(void)
gSideTimers[B_SIDE_OPPONENT].retaliateTimer--; gSideTimers[B_SIDE_OPPONENT].retaliateTimer--;
gBattleStruct->turnCountersTracker++; gBattleStruct->turnCountersTracker++;
break; break;
#if B_AFFECTION_MECHANICS == TRUE
case ENDTURN_STATUS_HEAL: case ENDTURN_STATUS_HEAL:
for (gBattlerAttacker = 0; gBattlerAttacker < gBattlersCount; gBattlerAttacker++) for (gBattlerAttacker = 0; gBattlerAttacker < gBattlersCount; gBattlerAttacker++)
{ {
#if B_AFFECTION_MECHANICS == TRUE
if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER
&& GetMonFriendshipScore(&gPlayerParty[gBattlerPartyIndexes[gBattlerAttacker]]) >= FRIENDSHIP_GE_150 && GetMonFriendshipScore(&gPlayerParty[gBattlerPartyIndexes[gBattlerAttacker]]) >= FRIENDSHIP_GE_150
&& (Random() % 100 < 20)) && (Random() % 100 < 20))
@ -2593,10 +2593,10 @@ u8 DoFieldEndTurnEffects(void)
BattleScriptExecute(BattleScript_AffectionBasedStatusHeal); BattleScriptExecute(BattleScript_AffectionBasedStatusHeal);
break; break;
} }
#endif
} }
gBattleStruct->turnCountersTracker++; gBattleStruct->turnCountersTracker++;
break; break;
#endif
case ENDTURN_FIELD_COUNT: case ENDTURN_FIELD_COUNT:
effect++; effect++;
break; break;