diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-28 17:37:17 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-28 17:37:17 -0400 |
| commit | 26a48d7e926d3c7841a28b2af8cbbd170923469e (patch) | |
| tree | fa83e9a7105769c66e3a66b3c6871984293db329 /data/contest.s | |
| parent | 39efcb2a6d169fba0ff33f1bd25e2947b74881a0 (diff) | |
| parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) | |
Merge branch 'master' into use_pokeblock
Diffstat (limited to 'data/contest.s')
| -rw-r--r-- | data/contest.s | 53 |
1 files changed, 52 insertions, 1 deletions
diff --git a/data/contest.s b/data/contest.s index 4e53035d2..0e06e9290 100644 --- a/data/contest.s +++ b/data/contest.s @@ -176,15 +176,26 @@ gUnknown_083CA4D4:: @ 83CA4D4 .include "data/text/contest_strings.inc" gUnknownText_MissedTurn:: @ 83CC355 +.ifdef ENGLISH .string "Missed turn$" +.else + .string "Verpasste Chance$" +.endif gUnknownText_LinkStandbyAndWinner:: @ 83CC361 +.ifdef ENGLISH .string "Link standby...$" .string "{COLOR WHITE2}$" .string "The winner is {STR_VAR_1}’s {STR_VAR_2}!\nCongratulations!$" +.else + .string "Verbindung...$" + .string "{COLOR WHITE2}$" + .string "Der Sieger ist {STR_VAR_2} von\n" + .string "{STR_VAR_1}! Herzlichen Glückwunsch!$" +.endif + .align 1 @ unknown, unreferenced data - .byte 0x00 .byte 0x9C .byte 0x77 @@ -350,54 +361,94 @@ gUnknown_083CC5D0:: @ 83CC5D0 .4byte 0xFFFF .2byte SPECIES_TAILLOW .byte CONTEST_SMART +.ifdef ENGLISH .string "TAILTA$", 11 .string "WYATT$", 10 +.else + .string "SCHWALBI$", 11 + .string "ROSEL$", 10 +.endif .4byte 0 .4byte 0xFFFF .2byte SPECIES_BRELOOM .byte CONTEST_BEAUTY +.ifdef ENGLISH .string "BRELO$", 11 .string "LIANA$", 10 +.else + .string "TUFUNG$", 11 + .string "WITOLD$", 10 +.endif .4byte 0 .4byte 0xFFFF .2byte SPECIES_PELIPPER .byte CONTEST_COOL +.ifdef ENGLISH .string "PELEP$", 11 .string "TIERA$", 10 +.else + .string "LIPPER$", 11 + .string "RUFUS$", 10 +.endif .4byte 0 .4byte 0xFFFF .2byte SPECIES_PELIPPER .byte CONTEST_COOL +.ifdef ENGLISH .string "PELEP$", 11 .string "TIERA$", 10 +.else + .string "LIPPER$", 11 + .string "ELLEN$", 10 +.endif .4byte 0 .4byte 0xFFFF .2byte SPECIES_PELIPPER .byte CONTEST_COOL +.ifdef ENGLISH .string "PELEP$", 11 .string "TIERA$", 10 +.else + .string "LIPPER$", 11 + .string "AVIA$", 10 +.endif .4byte 0 .4byte 0xFFFF .2byte SPECIES_DELCATTY .byte CONTEST_SMART +.ifdef ENGLISH .string "KITSY$", 11 .string "OMAR$", 10 +.else + .string "CONEC$", 11 + .string "HAUBERT$", 10 +.endif .4byte 0 .4byte 0xFFFF .2byte SPECIES_GULPIN .byte CONTEST_CUTE +.ifdef ENGLISH .string "GULPS$", 11 .string "MACIE$", 10 +.else + .string "SCHLUCKI$", 11 + .string "HEILWIG$", 10 +.endif .4byte 0 .4byte 0xFFFF .2byte SPECIES_LOUDRED .byte CONTEST_TOUGH +.ifdef ENGLISH .string "LOUDED$", 11 .string "BRYANT$", 10 +.else + .string "KEELO$", 11 + .string "ISEGRIM$", 10 +.endif |