ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 03:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Requested changes

Browse Source
This commit is contained in:
BuffelSaft 2021-11-23 11:04:39 +13:00
parent 50d0cd52e8
commit ff60882b29
5 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/constants/battle_move_effects.h
View File

@ -393,6 +393,6 @@
#define EFFECT_BEAK_BLAST 387 #define EFFECT_BEAK_BLAST 387
#define EFFECT_COURT_CHANGE 388 #define EFFECT_COURT_CHANGE 388
#define NUM_BATTLE_MOVE_EFFECTS 390 #define NUM_BATTLE_MOVE_EFFECTS 389
#endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H

5
include/constants/battle_script_commands.h
View File

@ -208,9 +208,8 @@
#define VARIOUS_SET_OCTOLOCK 135 #define VARIOUS_SET_OCTOLOCK 135
#define VARIOUS_CUT_1_3_HP_RAISE_STATS 136 #define VARIOUS_CUT_1_3_HP_RAISE_STATS 136
#define VARIOUS_TRY_END_NEUTRALIZING_GAS 137 #define VARIOUS_TRY_END_NEUTRALIZING_GAS 137
#define VARIOUS_TRY_SET_CORROSIVE_GAS 138 #define VARIOUS_SET_BEAK_BLAST 138
#define VARIOUS_SET_BEAK_BLAST 139 #define VARIOUS_SWAP_SIDE_STATUSES 139
#define VARIOUS_SWAP_SIDE_STATUSES 140
// Cmd_manipulatedamage // Cmd_manipulatedamage
#define DMG_CHANGE_SIGN 0 #define DMG_CHANGE_SIGN 0

8
include/constants/battle_string_ids.h
View File

@ -611,12 +611,10 @@
#define STRINGID_NEUTRALIZINGGASOVER 608 #define STRINGID_NEUTRALIZINGGASOVER 608
#define STRINGID_PKMNINSNAPTRAP 609 #define STRINGID_PKMNINSNAPTRAP 609
#define STRINGID_METEORBEAMCHARGING 610 #define STRINGID_METEORBEAMCHARGING 610
#define STRINGID_ITEMMELTED 611 #define STRINGID_HEATUPBEAK 611
#define STRINGID_HEATUPBEAK 612 #define STRINGID_COURTCHANGE 612
#define STRINGID_COURTCHANGE 613
#define STRINGID_PREPARESHELLTRAP 614
#define BATTLESTRINGS_COUNT 615 #define BATTLESTRINGS_COUNT 613
// The below IDs are all indexes into battle message tables, // The below IDs are all indexes into battle message tables,
// used to determine which of a set of messages to print. // used to determine which of a set of messages to print.

4
src/battle_message.c
View File

@ -737,17 +737,13 @@ static const u8 sText_CantEscapeBecauseOfCurrentMove[] = _("{B_DEF_NAME_WITH_PRE
static const u8 sText_NeutralizingGasEnters[] = _("Neutralizing Gas filled the area!"); static const u8 sText_NeutralizingGasEnters[] = _("Neutralizing Gas filled the area!");
static const u8 sText_NeutralizingGasOver[] = _("The effects of Neutralizing\nGas wore off!"); static const u8 sText_NeutralizingGasOver[] = _("The effects of Neutralizing\nGas wore off!");
static const u8 sText_MeteorBeamCharging[] = _("{B_ATK_NAME_WITH_PREFIX} is overflowing\nwith space energy!"); static const u8 sText_MeteorBeamCharging[] = _("{B_ATK_NAME_WITH_PREFIX} is overflowing\nwith space energy!");
static const u8 sText_PkmnItemMelted[] = _("{B_ATK_NAME_WITH_PREFIX} corroded\n{B_DEF_NAME_WITH_PREFIX}'s {B_LAST_ITEM}!");
static const u8 sText_HeatingUpBeak[] = _("{B_ATK_NAME_WITH_PREFIX} started\nheating up its beak!"); static const u8 sText_HeatingUpBeak[] = _("{B_ATK_NAME_WITH_PREFIX} started\nheating up its beak!");
static const u8 sText_CourtChange[] = _("{B_ATK_NAME_WITH_PREFIX} swapped the battle\neffects affecting each side!"); static const u8 sText_CourtChange[] = _("{B_ATK_NAME_WITH_PREFIX} swapped the battle\neffects affecting each side!");
static const u8 sText_PrepareShellTrap[] = _("{B_ATK_NAME_WITH_PREFIX} set\n a shell trap!");
const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] = const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] =
{ {
[STRINGID_PREPARESHELLTRAP - 12] = sText_PrepareShellTrap,
[STRINGID_COURTCHANGE - 12] = sText_CourtChange, [STRINGID_COURTCHANGE - 12] = sText_CourtChange,
[STRINGID_HEATUPBEAK - 12] = sText_HeatingUpBeak, [STRINGID_HEATUPBEAK - 12] = sText_HeatingUpBeak,
[STRINGID_ITEMMELTED - 12] = sText_PkmnItemMelted,
[STRINGID_METEORBEAMCHARGING - 12] = sText_MeteorBeamCharging, [STRINGID_METEORBEAMCHARGING - 12] = sText_MeteorBeamCharging,
[STRINGID_PKMNINSNAPTRAP - 12] = sText_PkmnInSnapTrap, [STRINGID_PKMNINSNAPTRAP - 12] = sText_PkmnInSnapTrap,
[STRINGID_NEUTRALIZINGGASOVER - 12] = sText_NeutralizingGasOver, [STRINGID_NEUTRALIZINGGASOVER - 12] = sText_NeutralizingGasOver,

19
src/battle_script_commands.c
View File

@ -7525,15 +7525,15 @@ static bool32 IsRototillerAffected(u32 battlerId)
#define COURTCHANGE_SWAP(status, structField, temp) \ #define COURTCHANGE_SWAP(status, structField, temp) \
{ \ { \
temp = gSideStatuses[0]; \ temp = gSideStatuses[B_SIDE_PLAYER]; \
if (gSideStatuses[1] & status) \ if (gSideStatuses[B_SIDE_OPPONENT] & status) \
gSideStatuses[0] |= status; \ gSideStatuses[B_SIDE_PLAYER] |= status; \
else \ else \
gSideStatuses[0] &= ~(status); \ gSideStatuses[B_SIDE_PLAYER] &= ~(status); \
if (temp & status) \ if (temp & status) \
gSideStatuses[1] |= status; \ gSideStatuses[B_SIDE_OPPONENT] |= status; \
else \ else \
gSideStatuses[1] &= ~(status); \ gSideStatuses[B_SIDE_OPPONENT] &= ~(status); \
SWAP(sideTimer0->structField, sideTimer1->structField, temp);\ SWAP(sideTimer0->structField, sideTimer1->structField, temp);\
} \ } \
@ -7545,8 +7545,8 @@ static bool32 IsRototillerAffected(u32 battlerId)
static bool32 CourtChangeSwapSideStatuses(void) static bool32 CourtChangeSwapSideStatuses(void)
{ {
struct SideTimer *sideTimer0 = &gSideTimers[0]; struct SideTimer *sideTimer0 = &gSideTimers[B_SIDE_PLAYER];
struct SideTimer *sideTimer1 = &gSideTimers[1]; struct SideTimer *sideTimer1 = &gSideTimers[B_SIDE_OPPONENT];
u32 temp; u32 temp;
// TODO: add Pledge-related effects // TODO: add Pledge-related effects
@ -11290,7 +11290,8 @@ static bool8 IsTwoTurnsMove(u16 move)
|| gBattleMoves[move].effect == EFFECT_TWO_TURNS_ATTACK || gBattleMoves[move].effect == EFFECT_TWO_TURNS_ATTACK
|| gBattleMoves[move].effect == EFFECT_SOLARBEAM || gBattleMoves[move].effect == EFFECT_SOLARBEAM
|| gBattleMoves[move].effect == EFFECT_SEMI_INVULNERABLE || gBattleMoves[move].effect == EFFECT_SEMI_INVULNERABLE
|| gBattleMoves[move].effect == EFFECT_BIDE) || gBattleMoves[move].effect == EFFECT_BIDE
|| gBattleMoves[move].effect == EFFECT_METEOR_BEAM)
return TRUE; return TRUE;
else else
return FALSE; return FALSE;