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

small fixes, check GetCatchingBattler's semi-invulnerability

Browse Source
This commit is contained in:
ghoulslash 2021-10-15 14:57:26 -04:00
parent b94f710c80
commit c077091dbf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/constants/battle_config.h
View File

@ -178,7 +178,7 @@
#define B_POWDER_GRASS GEN_7 // In Gen6+, Grass-type Pokémon are immune to powder and spore moves. #define B_POWDER_GRASS GEN_7 // In Gen6+, Grass-type Pokémon are immune to powder and spore moves.
#define B_STEEL_RESISTANCES GEN_7 // In Gen6+, Steel-type Pokémon are no longer resistant to Dark-type and Ghost-type moves. #define B_STEEL_RESISTANCES GEN_7 // In Gen6+, Steel-type Pokémon are no longer resistant to Dark-type and Ghost-type moves.
#define B_THUNDERSTORM_TERRAIN TRUE // If TRUE, overworld Thunderstorm generates Rain and Electric Terrain as in Gen 8. #define B_THUNDERSTORM_TERRAIN TRUE // If TRUE, overworld Thunderstorm generates Rain and Electric Terrain as in Gen 8.
#define B_SEMI_INVULNERABLE_CATCH GEN_4 // In Gen5+, you cannot throw a ball against a Pokemon that is in a semi-invulnerable state (dig/fly/etc) #define B_SEMI_INVULNERABLE_CATCH GEN_7 // In Gen4+, you cannot throw a ball against a Pokemon that is in a semi-invulnerable state (dig/fly/etc)
// Animation Settings // Animation Settings
#define B_NEW_SWORD_PARTICLE FALSE // If set to TRUE, it updates Swords Dance's particle. #define B_NEW_SWORD_PARTICLE FALSE // If set to TRUE, it updates Swords Dance's particle.

6
src/item_use.c
View File

@ -947,8 +947,8 @@ u32 CanThrowBall(void)
{ {
return 2; // No room for mon return 2; // No room for mon
} }
#if B_SEMI_INVULNERABLE_CATCH >= GEN_5 #if B_SEMI_INVULNERABLE_CATCH >= GEN_4
else if (gStatuses3[B_POSITION_OPPONENT_LEFT] & STATUS3_SEMI_INVULNERABLE) else if (gStatuses3[GetCatchingBattler()] & STATUS3_SEMI_INVULNERABLE)
{ {
return 3; // in semi-invulnerable state return 3; // in semi-invulnerable state
} }
@ -983,7 +983,7 @@ void ItemUseInBattle_PokeBall(u8 taskId)
else else
DisplayItemMessageInBattlePyramid(taskId, gText_BoxFull, Task_CloseBattlePyramidBagMessage); DisplayItemMessageInBattlePyramid(taskId, gText_BoxFull, Task_CloseBattlePyramidBagMessage);
break; break;
#if B_SEMI_INVULNERABLE_CATCH >= GEN_5 #if B_SEMI_INVULNERABLE_CATCH >= GEN_4
case 3: // Semi-Invulnerable case 3: // Semi-Invulnerable
if (!InBattlePyramid()) if (!InBattlePyramid())
DisplayItemMessage(taskId, 1, sText_CantThrowPokeBall_SemiInvulnerable, CloseItemMessage); DisplayItemMessage(taskId, 1, sText_CantThrowPokeBall_SemiInvulnerable, CloseItemMessage);