ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 11:43:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add Ability Descriptions: credits to BluRose :3

Browse Source
This commit is contained in:
DizzyEggg 2018-09-16 10:18:35 +02:00
parent 0800a44f7a
commit c3a5001945
3 changed files with 694 additions and 399 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_debug.c
View File

@ -814,7 +814,7 @@ static void PrintOnBattlerWindow(u8 windowId, u8 battlerId)
StringCopy(&text[4], gBattleMons[battlerId].nickname); StringCopy(&text[4], gBattleMons[battlerId].nickname);
FillWindowPixelBuffer(windowId, 0x11); FillWindowPixelBuffer(windowId, 0x11);
PrintTextOnWindow(windowId, 1, text, 0, 0, 0, NULL); AddTextPrinterParameterized(windowId, 1, text, 0, 0, 0, NULL);
CopyWindowToVram(windowId, 3); CopyWindowToVram(windowId, 3);
} }
@ -1025,7 +1025,7 @@ static void PrintDigitChars(struct BattleDebugMenu *data)
text[i] = EOS; text[i] = EOS;
PrintTextOnWindow(data->modifyWindowId, 1, text, 3, 0, 0, NULL); AddTextPrinterParameterized(data->modifyWindowId, 1, text, 3, 0, 0, NULL);
} }
static const u32 GetBitfieldToAndValue(u32 currBit, u32 bitsCount) static const u32 GetBitfieldToAndValue(u32 currBit, u32 bitsCount)

2
src/battle_main.c
View File

@ -4615,7 +4615,7 @@ static void sub_803CDF8(void)
void SwapTurnOrder(u8 id1, u8 id2) void SwapTurnOrder(u8 id1, u8 id2)
{ {
u32 temp; u32 temp;
SWAP(gActionsByTurnOrder[id1], gActionsByTurnOrder[id2], temp); SWAP(gActionsByTurnOrder[id1], gActionsByTurnOrder[id2], temp);
SWAP(gBattlerByTurnOrder[id1], gBattlerByTurnOrder[id2], temp); SWAP(gBattlerByTurnOrder[id1], gBattlerByTurnOrder[id2], temp);
} }

1087
src/data/text/abilities.h
View File

File diff suppressed because it is too large Load Diff