atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix move category and category icon when PSS is off (#5786)

Browse source
This commit is contained in:
RavePossum 2024-12-08 05:07:19 -05:00 committed by GitHub
parent 6e6352569f
commit fd397e9e1c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/battle_controller_player.c
View file

@ -1759,7 +1759,6 @@ static void MoveSelectionDisplayMoveDescription(u32 battler)
u16 move = moveInfo->moves[gMoveSelectionCursor[battler]]; u16 move = moveInfo->moves[gMoveSelectionCursor[battler]];
u16 pwr = gMovesInfo[move].power; u16 pwr = gMovesInfo[move].power;
u16 acc = gMovesInfo[move].accuracy; u16 acc = gMovesInfo[move].accuracy;
u8 cat = gMovesInfo[move].category;
u8 pwr_num[3], acc_num[3]; u8 pwr_num[3], acc_num[3];
u8 cat_desc[7] = _("CAT: "); u8 cat_desc[7] = _("CAT: ");
@ -1796,7 +1795,7 @@ static void MoveSelectionDisplayMoveDescription(u32 battler)
if (gCategoryIconSpriteId == 0xFF) if (gCategoryIconSpriteId == 0xFF)
gCategoryIconSpriteId = CreateSprite(&gSpriteTemplate_CategoryIcons, 38, 64, 1); gCategoryIconSpriteId = CreateSprite(&gSpriteTemplate_CategoryIcons, 38, 64, 1);
StartSpriteAnim(&gSprites[gCategoryIconSpriteId], cat); StartSpriteAnim(&gSprites[gCategoryIconSpriteId], GetBattleMoveCategory(move));
CopyWindowToVram(B_WIN_MOVE_DESCRIPTION, COPYWIN_FULL); CopyWindowToVram(B_WIN_MOVE_DESCRIPTION, COPYWIN_FULL);
} }

2
src/battle_util.c
View file

@ -11212,7 +11212,7 @@ u8 GetBattleMoveCategory(u32 moveId)
if (IS_MOVE_STATUS(moveId)) if (IS_MOVE_STATUS(moveId))
return DAMAGE_CATEGORY_STATUS; return DAMAGE_CATEGORY_STATUS;
return gTypesInfo[GetMoveType(gCurrentMove)].damageCategory; return gTypesInfo[GetMoveType(moveId)].damageCategory;
} }
static bool32 TryRemoveScreens(u32 battler) static bool32 TryRemoveScreens(u32 battler)