diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-07-05 20:11:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-05 20:11:10 -0700 |
| commit | 9238533346fd97c67e48fee33a204d1e8e2dd0a7 (patch) | |
| tree | e9a140e919d72891ea825b64fc72a9cfa175ce88 /src/battle | |
| parent | 99c98097753008b1f824a676b36f34ac2857effe (diff) | |
| parent | f309f3272ae04be643ee3d1dd9f3fc3e5fc6c699 (diff) | |
Merge pull request #648 from yenatch/master
fix WarpEvent and label some of pokemon_summary_screen
Diffstat (limited to 'src/battle')
| -rw-r--r-- | src/battle/battle_records.c | 4 | ||||
| -rw-r--r-- | src/battle/calculate_base_damage.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/battle_records.c b/src/battle/battle_records.c index fed8d6575..d94d88032 100644 --- a/src/battle/battle_records.c +++ b/src/battle/battle_records.c @@ -290,7 +290,7 @@ void ShowLinkBattleRecords(void) { s32 i; Menu_DrawStdWindowFrame(1, 0, 28, 18); - sub_8072BD8(gOtherText_BattleResults, 0, 1, 240); + MenuPrint_Centered(gOtherText_BattleResults, 0, 1, 240); PrintLinkBattleWinsLossesDraws(gSaveBlock1.linkBattleRecords); #if ENGLISH @@ -368,7 +368,7 @@ void ShowBattleTowerRecords(void) { u16 i; Menu_DrawStdWindowFrame(3, 1, 27, 17); - sub_8072BD8(gOtherText_BattleTowerResults, 3, 2, 0xC8); + MenuPrint_Centered(gOtherText_BattleTowerResults, 3, 2, 0xC8); Menu_PrintText(gOtherText_Lv50, 5, 6); Menu_PrintText(gOtherText_Lv100, 5, 12); for (i = 5; i < 26; i++) diff --git a/src/battle/calculate_base_damage.c b/src/battle/calculate_base_damage.c index d983e47a4..0022cf9fe 100644 --- a/src/battle/calculate_base_damage.c +++ b/src/battle/calculate_base_damage.c @@ -23,13 +23,13 @@ extern u16 gBattleMovePower; extern u16 gTrainerBattleOpponent; // Masks for getting PP Up count, also PP Max values -const u8 gUnknown_08208238[] = {0x03, 0x0c, 0x30, 0xc0}; +const u8 gPPUpReadMasks[] = {0x03, 0x0c, 0x30, 0xc0}; // Masks for setting PP Up count -const u8 gUnknown_0820823C[] = {0xFC, 0xF3, 0xCF, 0x3F}; +const u8 gPPUpWriteMasks[] = {0xFC, 0xF3, 0xCF, 0x3F}; // Values added to PP Up count -const u8 gUnknown_08208240[] = {0x01, 0x04, 0x10, 0x40}; +const u8 gPPUpValues[] = {0x01, 0x04, 0x10, 0x40}; const u8 gStatStageRatios[][2] = { |