diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-26 13:53:34 -0800 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-11-26 15:46:14 -0800 |
| commit | 410fbfe7fe0e3ab1f367ab83fbea4a8145bf82fc (patch) | |
| tree | 2540a33cdf2561ca7b4cc45fdd37ef5ff88ce3ab | |
| parent | 1829f7e7195575e872eb378722a56b344e2a1cd7 (diff) | |
Fix German build
| -rw-r--r-- | src/data/text/move_descriptions_de.h | 8 | ||||
| -rw-r--r-- | src/pokemon/pokemon_summary_screen.c | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/data/text/move_descriptions_de.h b/src/data/text/move_descriptions_de.h index 37f1ea410..854336295 100644 --- a/src/data/text/move_descriptions_de.h +++ b/src/data/text/move_descriptions_de.h @@ -95,7 +95,9 @@ static const u8 MoveDescription_DoubleKick[] = _( "wird zweimal getroffen."); static const u8 MoveDescription_MegaKick[] = _( - "Ein extrem heftiger Tritt.$"static const u8 MoveDescription_JumpKick[] = (); + "Ein extrem heftiger Tritt."); + +static const u8 MoveDescription_JumpKick[] = _( "Sprung-Tritt. Selbstschä-\n" "digung bei Misserfolg."); @@ -1411,7 +1413,7 @@ static const u8 MoveDescription_PsychoBoost[] = _( "Angriff mit voller Kraft.\n" "SPEZ. ANGR. sinkt deutlich."); -const u8 * const MoveDescriptions[] = { +const u8 * const gMoveDescriptions[] = { MoveDescription_Pound, MoveDescription_KarateChop, MoveDescription_DoubleSlap, @@ -1766,4 +1768,4 @@ const u8 * const MoveDescriptions[] = { MoveDescription_WaterPulse, MoveDescription_DoomDesire, MoveDescription_PsychoBoost, -]; +}; diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c index c7bdab069..f141f1c19 100644 --- a/src/pokemon/pokemon_summary_screen.c +++ b/src/pokemon/pokemon_summary_screen.c @@ -523,7 +523,9 @@ static const struct SpriteTemplate sSpriteTemplate_83C1304 = { static const u16 sSummaryScreenMonMarkingsPalette[] = INCBIN_U16("graphics/summary_screen/mon_markings.gbapal"); #if ENGLISH -static const u16 sSummaryScreenTextTiles[] = INCBIN_U16("graphics/summary_screen/text.4bpp"); +static const u16 gSummaryScreenTextTiles[] = INCBIN_U16("graphics/summary_screen/text.4bpp"); +#elif GERMAN +extern const u16 gSummaryScreenTextTiles[]; #endif static const u16 sSummaryScreenButtonTiles[] = INCBIN_U16("graphics/summary_screen/buttons.4bpp"); @@ -732,7 +734,7 @@ bool8 sub_809DA84(void) gMain.state++; break; case 9: - src = sSummaryScreenTextTiles; + src = gSummaryScreenTextTiles; dest = (void *)VRAM + 0xD000; DmaCopy16(3, src, dest, 320); |