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

Merge pull request #2353 from LOuroboros/siTypes

Browse Source 
Fixed Z-Moves showing the wrong type in battle
This commit is contained in:
Eduardo Quezada D'Ottone 2022-09-24 10:36:38 -03:00 committed by GitHub
commit bb564d805f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/battle_z_move.c
View File

@ -54,6 +54,7 @@ static void ZMoveSelectionDisplayPower(u16 move, u16 zMove);
static void ShowZMoveTriggerSprite(void); static void ShowZMoveTriggerSprite(void);
static bool32 AreStatsMaxed(u8 battlerId, u8 n); static bool32 AreStatsMaxed(u8 battlerId, u8 n);
static u8 GetZMoveScore(u8 battlerAtk, u8 battlerDef, u16 baseMove, u16 zMove); static u8 GetZMoveScore(u8 battlerAtk, u8 battlerDef, u16 baseMove, u16 zMove);
static void ZMoveSelectionDisplayMoveType(u16 zMove);
// Const Data // Const Data
static const struct SignatureZMove sSignatureZMoves[] = static const struct SignatureZMove sSignatureZMoves[] =
@ -520,6 +521,7 @@ bool32 MoveSelectionDisplayZMove(u16 zmove)
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MOVE_NAME_1); BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MOVE_NAME_1);
ZMoveSelectionDisplayPpNumber(); ZMoveSelectionDisplayPpNumber();
ZMoveSelectionDisplayMoveType(zmove);
MoveSelectionCreateCursorAt(0, 0); MoveSelectionCreateCursorAt(0, 0);
return TRUE; return TRUE;
} }
@ -559,6 +561,23 @@ static void ZMoveSelectionDisplayPpNumber(void)
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_PP_REMAINING); BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_PP_REMAINING);
} }
static void ZMoveSelectionDisplayMoveType(u16 zMove)
{
u8 *txtPtr;
struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct *)(&gBattleResources->bufferA[gActiveBattler][4]);
u8 zMoveType;
GET_MOVE_TYPE(zMove, zMoveType);
txtPtr = StringCopy(gDisplayedStringBattle, gText_MoveInterfaceType);
*(txtPtr)++ = EXT_CTRL_CODE_BEGIN;
*(txtPtr)++ = EXT_CTRL_CODE_FONT;
*(txtPtr)++ = FONT_NORMAL;
StringCopy(txtPtr, gTypeNames[zMoveType]);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MOVE_TYPE);
}
const u8 *GetZMoveName(u16 move) const u8 *GetZMoveName(u16 move)
{ {
if (IsZMove(move)) if (IsZMove(move))