dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

thru atkc0

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-08-27 10:27:36 +08:00
parent a61be4c32d
commit ca130a8aeb
9 changed files with 1500 additions and 6492 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_script_commands.s
-6463
View File
File diff suppressed because it is too large Load Diff
include/battle.h
+1 -13
View File
@@ -147,19 +147,6 @@
#define TYPE_FORESIGHT 0xFE #define TYPE_FORESIGHT 0xFE
#define TYPE_ENDTABLE 0xFF #define TYPE_ENDTABLE 0xFF
#define BS_GET_TARGET 0
#define BS_GET_ATTACKER 1
#define BS_GET_EFFECT_BANK 2
#define BS_GET_gBank1 3
#define BS_GET_BANK_0 7
#define BS_ATTACKER_WITH_PARTNER 4 // for atk98_status_icon_update
#define BS_GET_ATTACKER_SIDE 8 // for atk1E_jumpifability
#define BS_GET_NOT_ATTACKER_SIDE 9 // for atk1E_jumpifability
#define BS_GET_SCRIPTING_BANK 10
#define BS_GET_OPPONENT1 12
#define BS_GET_PLAYER2 13
#define BS_GET_OPPONENT2 14
// for battle script commands // for battle script commands
#define CMP_EQUAL 0x0 #define CMP_EQUAL 0x0
#define CMP_NOT_EQUAL 0x1 #define CMP_NOT_EQUAL 0x1
@@ -942,5 +929,6 @@ extern u8 gLeveledUpInBattle;
extern u16 gLastResultingMoves[MAX_BATTLERS_COUNT]; extern u16 gLastResultingMoves[MAX_BATTLERS_COUNT];
extern u16 gLastPrintedMoves[MAX_BATTLERS_COUNT]; extern u16 gLastPrintedMoves[MAX_BATTLERS_COUNT];
extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT]; extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT];
extern u8 gChosenActionByBattler[MAX_BATTLERS_COUNT];
#endif // GUARD_BATTLE_H #endif // GUARD_BATTLE_H
include/battle_script_commands.h
-4
View File
@@ -14,10 +14,6 @@
#define CMP_COMMON_BITS 0x4 #define CMP_COMMON_BITS 0x4
#define CMP_NO_COMMON_BITS 0x5 #define CMP_NO_COMMON_BITS 0x5
#define BS_ATTACKER_WITH_PARTNER 4 // for atk98_status_icon_update
#define BS_GET_ATTACKER_SIDE 8 // for atk1E_jumpifability
#define BS_GET_NOT_ATTACKER_SIDE 9 // for atk1E_jumpifability
#define ATK48_STAT_NEGATIVE 0x1 #define ATK48_STAT_NEGATIVE 0x1
#define ATK48_STAT_BY_TWO 0x2 #define ATK48_STAT_BY_TWO 0x2
#define ATK48_BIT_x4 0x4 #define ATK48_BIT_x4 0x4
include/constants/battle.h
+1 -1
View File
@@ -174,7 +174,7 @@
#define HITMARKER_GRUDGE 0x01000000 #define HITMARKER_GRUDGE 0x01000000
#define HITMARKER_OBEYS 0x02000000 #define HITMARKER_OBEYS 0x02000000
#define HITMARKER_x4000000 0x04000000 #define HITMARKER_x4000000 0x04000000
#define HITMARKER_x8000000 0x08000000 #define HITMARKER_CHARGING 0x08000000
#define HITMARKER_FAINTED(battler) (gBitTable[battler] << 0x1C) #define HITMARKER_FAINTED(battler) (gBitTable[battler] << 0x1C)
#define HITMARKER_UNK(battler) (0x10000000 << battler) #define HITMARKER_UNK(battler) (0x10000000 << battler)
include/constants/battle_script_commands.h
+2 -2
View File
@@ -39,13 +39,13 @@
#define BS_EFFECT_BATTLER 2 #define BS_EFFECT_BATTLER 2
#define BS_FAINTED 3 #define BS_FAINTED 3
#define BS_BATTLER_0 7 #define BS_BATTLER_0 7
#define BS_ATTACKER_WITH_PARTNER 4 // for atk98_status_icon_update #define BS_ATTACKER_WITH_PARTNER 4 // for atk98_updatestatusicon
#define BS_ATTACKER_SIDE 8 // for atk1E_jumpifability #define BS_ATTACKER_SIDE 8 // for atk1E_jumpifability
#define BS_NOT_ATTACKER_SIDE 9 // for atk1E_jumpifability #define BS_NOT_ATTACKER_SIDE 9 // for atk1E_jumpifability
#define BS_SCRIPTING 10 #define BS_SCRIPTING 10
#define BS_PLAYER1 11 #define BS_PLAYER1 11
#define BS_OPPONENT1 12 #define BS_OPPONENT1 12
#define BS_PLAYER2 13 #define BS_PLAYER2 13 // for atk98_updatestatusicon
#define BS_OPPONENT2 14 #define BS_OPPONENT2 14
// atk 01, accuracy calc // atk 01, accuracy calc
include/party_menu.h
+2
View File
@@ -79,5 +79,7 @@ u8 pokemon_order_func(u8);
void sub_8127CAC(void); void sub_8127CAC(void);
void sub_8127DA8(u8 battlerId, u8 multiplayerFlag); void sub_8127DA8(u8 battlerId, u8 multiplayerFlag);
void OpenPartyMenuInBattle(u8 arg); void OpenPartyMenuInBattle(u8 arg);
void sub_8127EC4(u8 battlerId, u8 unk, u8 arrayIndex);
bool8 IsMultiBattle(void);
#endif // GUARD_PARTY_MENU_H #endif // GUARD_PARTY_MENU_H
src/battle_ai_script_commands.c
+2 -2
View File
@@ -1647,7 +1647,7 @@ static void BattleAICmd_if_last_move_did_damage(void)
if (gAIScriptPtr[2] == 0) if (gAIScriptPtr[2] == 0)
{ {
if (gDisableStructs[index].disabledMove == 0) if (gDisableStructs[index].disabledMove == MOVE_NONE)
{ {
gAIScriptPtr += 7; gAIScriptPtr += 7;
return; return;
@@ -1660,7 +1660,7 @@ static void BattleAICmd_if_last_move_did_damage(void)
gAIScriptPtr += 7; gAIScriptPtr += 7;
return; return;
} }
else if (gDisableStructs[index].encoredMove != 0) else if (gDisableStructs[index].encoredMove != MOVE_NONE)
{ {
gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3);
return; return;
src/battle_script_commands.c
+1487 -2
View File
File diff suppressed because it is too large Load Diff
src/battle_util.c
+5 -5
View File
@@ -926,12 +926,12 @@ u8 DoBattlerEndTurnEffects(void)
} }
if (i == MAX_MON_MOVES) // pokemon does not have the disabled move anymore if (i == MAX_MON_MOVES) // pokemon does not have the disabled move anymore
{ {
gDisableStructs[gActiveBattler].disabledMove = 0; gDisableStructs[gActiveBattler].disabledMove = MOVE_NONE;
gDisableStructs[gActiveBattler].disableTimer = 0; gDisableStructs[gActiveBattler].disableTimer = 0;
} }
else if (--gDisableStructs[gActiveBattler].disableTimer == 0) // disable ends else if (--gDisableStructs[gActiveBattler].disableTimer == 0) // disable ends
{ {
gDisableStructs[gActiveBattler].disabledMove = 0; gDisableStructs[gActiveBattler].disabledMove = MOVE_NONE;
BattleScriptExecute(BattleScript_DisabledNoMore); BattleScriptExecute(BattleScript_DisabledNoMore);
++effect; ++effect;
} }
@@ -943,13 +943,13 @@ u8 DoBattlerEndTurnEffects(void)
{ {
if (gBattleMons[gActiveBattler].moves[gDisableStructs[gActiveBattler].encoredMovePos] != gDisableStructs[gActiveBattler].encoredMove) // pokemon does not have the encored move anymore if (gBattleMons[gActiveBattler].moves[gDisableStructs[gActiveBattler].encoredMovePos] != gDisableStructs[gActiveBattler].encoredMove) // pokemon does not have the encored move anymore
{ {
gDisableStructs[gActiveBattler].encoredMove = 0; gDisableStructs[gActiveBattler].encoredMove = MOVE_NONE;
gDisableStructs[gActiveBattler].encoreTimer = 0; gDisableStructs[gActiveBattler].encoreTimer = 0;
} }
else if (--gDisableStructs[gActiveBattler].encoreTimer == 0 else if (--gDisableStructs[gActiveBattler].encoreTimer == 0
|| gBattleMons[gActiveBattler].pp[gDisableStructs[gActiveBattler].encoredMovePos] == 0) || gBattleMons[gActiveBattler].pp[gDisableStructs[gActiveBattler].encoredMovePos] == 0)
{ {
gDisableStructs[gActiveBattler].encoredMove = 0; gDisableStructs[gActiveBattler].encoredMove = MOVE_NONE;
gDisableStructs[gActiveBattler].encoreTimer = 0; gDisableStructs[gActiveBattler].encoreTimer = 0;
BattleScriptExecute(BattleScript_EncoredNoMore); BattleScriptExecute(BattleScript_EncoredNoMore);
++effect; ++effect;
@@ -1307,7 +1307,7 @@ u8 AtkCanceller_UnableToUseMove(void)
++gBattleStruct->atkCancellerTracker; ++gBattleStruct->atkCancellerTracker;
break; break;
case CANCELLER_DISABLED: // disabled move case CANCELLER_DISABLED: // disabled move
if (gDisableStructs[gBattlerAttacker].disabledMove == gCurrentMove && gDisableStructs[gBattlerAttacker].disabledMove != 0) if (gDisableStructs[gBattlerAttacker].disabledMove == gCurrentMove && gDisableStructs[gBattlerAttacker].disabledMove != MOVE_NONE)
{ {
gProtectStructs[gBattlerAttacker].usedDisabledMove = 1; gProtectStructs[gBattlerAttacker].usedDisabledMove = 1;
gBattleScripting.battler = gBattlerAttacker; gBattleScripting.battler = gBattlerAttacker;