diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/berry_blender.s | 9 | ||||
| -rw-r--r-- | data/cable_club.s | 12 | ||||
| -rw-r--r-- | data/choose_party.s | 56 | ||||
| -rw-r--r-- | data/contest.s | 53 | ||||
| -rw-r--r-- | data/credits.s | 13 | ||||
| -rw-r--r-- | data/easy_chat.s | 60 | ||||
| -rw-r--r-- | data/graphics.s | 129 | ||||
| -rw-r--r-- | data/matsuda_debug_menu.s | 4 | ||||
| -rw-r--r-- | data/mauville_old_man.s | 10 | ||||
| -rw-r--r-- | data/mori_debug_menu.s | 4 | ||||
| -rw-r--r-- | data/pokedex_cry_screen.s | 2 | ||||
| -rw-r--r-- | data/pokemon_summary_screen.s | 2 | ||||
| -rw-r--r-- | data/roulette.s | 2 | ||||
| -rw-r--r-- | data/specials.inc | 3 | ||||
| -rw-r--r-- | data/tilesets/graphics.inc | 4 | ||||
| -rw-r--r-- | data/use_pokeblock.s | 2 |
16 files changed, 306 insertions, 59 deletions
diff --git a/data/berry_blender.s b/data/berry_blender.s index d346ab9cd..ff0f06473 100644 --- a/data/berry_blender.s +++ b/data/berry_blender.s @@ -56,12 +56,21 @@ gUnknown_08216284:: @ 8216284 .string "3P$", 4 .string "4P$", 4 +.ifdef ENGLISH UnknownText_Mister: .string "MISTER$" UnknownText_Laddie: .string "LADDIE$" UnknownText_Lassie: .string "LASSIE$" +.else +UnknownText_Mister: + .string "OPI$" +UnknownText_Laddie: + .string "KUMPEL$" +UnknownText_Lassie: + .string "TUSSI$" +.endif .align 2 gUnknown_082162B8:: @ 82162B8 diff --git a/data/cable_club.s b/data/cable_club.s index 66608a206..f0ced6292 100644 --- a/data/cable_club.s +++ b/data/cable_club.s @@ -3,6 +3,7 @@ .section .rodata +.ifdef ENGLISH TrainerCardColorName_Bronze: .string "BRONZE$", 7 TrainerCardColorName_Copper: @@ -11,6 +12,17 @@ TrainerCardColorName_Silver: .string "SILVER$", 7 TrainerCardColorName_Gold: .string "GOLD$", 7 +.else +TrainerCardColorName_Bronze: + .string "BRONZE$", 7 +TrainerCardColorName_Copper: + .string "KUPFER$", 7 +TrainerCardColorName_Silver: + .string "SILBER$", 7 +TrainerCardColorName_Gold: + .string "GOLD$", 7 +.endif + .align 2 gTrainerCardColorNames:: @ 839B21C diff --git a/data/choose_party.s b/data/choose_party.s deleted file mode 100644 index 348f9e385..000000000 --- a/data/choose_party.s +++ /dev/null @@ -1,56 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_084017B0:: @ 84017B0 - .4byte OtherText_Summary, sub_812265C - .4byte OtherText_Enter2, sub_8122694 - .4byte OtherText_NoEntry, sub_8122770 - .4byte gUnknownText_Exit, sub_8122838 - -gUnknown_084017D0:: @ 84017D0 - .byte 1, 0, 3 - -gUnknown_084017D3: @ 84017D3 - .byte 2, 0, 3 - -gUnknown_084017D6: @ 84017D6 - .byte 0, 3 - - .align 2 -gUnknown_084017D8:: @ 84017D8 - .byte 3, 9 - .space 2 - .4byte gUnknown_084017D0 - - .byte 3, 9 - .space 2 - .4byte gUnknown_084017D3 - - .byte 2, 9 - .space 2 - .4byte gUnknown_084017D6 - - .align 2 -gUnknown_084017F0:: @ 84017F0 - .4byte OtherText_Store, sub_8122F70 - .4byte OtherText_Summary, sub_81230BC - .4byte gUnknownText_Exit, sub_81230F4 - -gUnknown_08401808:: @ 8401808 - .byte 0, 1, 2 - -gUnknown_0840180B:: @ 840180B - .byte 1, 2 - - .align 2 -gUnknown_08401810:: @ 8401810 - .byte 3, 9 - .space 2 - .4byte gUnknown_08401808 - - .byte 2, 9 - .space 2 - .4byte gUnknown_0840180B 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 diff --git a/data/credits.s b/data/credits.s index 68931ef75..fe82968c0 100644 --- a/data/credits.s +++ b/data/credits.s @@ -38,6 +38,19 @@ gUnknown_0840B878:: @ 840B878 .byte 1,0x88,0x89 .byte 1,0x86,0x87 +.ifdef GERMAN + .byte 1, 0, 0 + .byte 1,0xFF,0xFF + .byte 1,0x80,0x8A + .byte 1,0xFF,0xFF + .byte 1,0xFF,0xFF + .byte 0, 1, 0 + .byte 0xFF, 1,0xFF + .byte 0xFF, 1,0xFF + .byte 0xFF, 1,0xFF + .byte 0x80, 1,0x80 +.endif + .include "data/text/credits.inc" gUnknown_0840CA00:: @ 840CA00 diff --git a/data/easy_chat.s b/data/easy_chat.s index 0938277da..436835d19 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -12,6 +12,7 @@ gMysteryEventPhrase:: @ 83DB678 .align 1 gBerryMasterWifePhrases:: @ 83DB680 +.ifdef ENGLISH ec_word GREAT ec_word BATTLE @@ -26,6 +27,22 @@ gBerryMasterWifePhrases:: @ 83DB680 ec_word SUPER ec_word HUSTLE +.else + ec_word GREAT + ec_word FIGHT + + ec_word CONTEST + ec_word CHALLENGE + + ec_pokemon1 LATIAS + ec_word OVERWHELMING + + ec_pokemon1 LATIOS + ec_word COOL + + ec_word SUPER + .2byte 0xFFFF +.endif gUnknown_083DB694:: @ 83DB694 .4byte 0x02001000 @@ -96,17 +113,31 @@ gUnknown_083DB7C0:: @ 83DB7C0 .align 2 gUnknown_083DB7DC:: @ 83DB7DC +.ifdef ENGLISH .4byte 0x0200ac80 .4byte 0x0200acc9 .4byte 0x0200ad12 .4byte 0x0200ad5b +.else + .4byte 0x0200AFAC + .4byte 0x0200AFF5 + .4byte 0x0200B03E + .4byte 0x0200B087 +.endif .align 1 gUnknown_083DB7EC:: @ 83DB7EC +.ifdef ENGLISH ec_word I_AM ec_word A ec_word POKEMON ec_word GREAT +.else + ec_word I_AM + ec_word BIG + ec_word IN + ec_word POKEMON +.endif .align 1 gUnknown_083DB7F4:: @ 83DB7F4 @@ -182,7 +213,11 @@ gSpriteAnim_83DBC1C:: @ 83DBC1C .align 2 gSpriteAnim_83DBC24:: @ 83DBC24 +.ifdef ENGLISH obj_image_anim_frame 8, 5 +.else + obj_image_anim_frame 0, 5 +.endif obj_image_anim_end .align 2 @@ -222,7 +257,11 @@ gSpriteAnim_83DBC5C:: @ 83DBC5C .align 2 gSpriteAnim_83DBC64:: @ 83DBC64 +.ifdef ENGLISH obj_image_anim_frame 40, 5 +.else + obj_image_anim_frame 16, 5 +.endif obj_image_anim_end .align 2 @@ -413,12 +452,33 @@ gUnknown_083DBE40:: @ 83DBE40 gUnknown_083DBEA8:: @ 83DBEA8 .string "{CLEAR_TO 88}$" +.ifdef GERMAN +unk_83E7EB0: + .string "{UNKNOWN_14 8} A B C D E F {UNKNOWN_14 0}" +unk_83E7EC5: + .string "mehr$" +unk_83E7ECA:: + .string "{UNKNOWN_14 8} G H I J K L $" +unk_83E7EE1: + .string "{UNKNOWN_14 8} M N O P Q R S $" +unk_83E7EF8: + .string "{UNKNOWN_14 8} T U V W X Y Z $" +.endif + .align 2 gUnknown_083DBEAC:: @ 83DBEAC +.ifdef ENGLISH .string "{UNKNOWN_14 8} A B C D E F {UNKNOWN_14 0}others$", 0x20 .string "{UNKNOWN_14 8} G H I J K L $", 0x20 .string "{UNKNOWN_14 8} M N O P Q R S $", 0x20 .string "{UNKNOWN_14 8} T U V W X Y Z $", 0x20 +.else + .4byte unk_83E7EB0 + .4byte unk_83E7ECA + .4byte unk_83E7EE1 + .4byte unk_83E7EF8 + .4byte unk_83E7EC5 +.endif @ 83DBF2C .include "data/text/easy_chat/group_words.inc" diff --git a/data/graphics.s b/data/graphics.s index 5111c4b99..d24039de6 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -4560,19 +4560,27 @@ gDecoration10000_Gfx:: @ 8EA2A44 .align 2 gFont3LatinGlyphs:: @ 8EA2C44 +.ifdef ENGLISH .if REVISION >= 1 .incbin "graphics/fonts/font3_lat_rev1.4bpp" .else .incbin "graphics/fonts/font3_lat.4bpp" .endif +.else + .incbin "graphics/fonts/font3_lat.4bpp" +.endif .align 2 gFont4LatinGlyphs:: @ 8EA6BC4 +.ifdef ENGLISH .if REVISION >= 1 .incbin "graphics/fonts/font4_lat_rev1.4bpp" .else .incbin "graphics/fonts/font4_lat.4bpp" .endif +.else + .incbin "graphics/fonts/font4_lat.4bpp.bin" +.endif .align 2 gFont3JapaneseGlyphs:: @ 8EA8744 @@ -4581,3 +4589,124 @@ gFont3JapaneseGlyphs:: @ 8EA8744 .align 2 gFont4JapaneseGlyphs:: @ 8EAC6C4 .incbin "graphics/fonts/font4_jpn.4bpp" + +.ifdef GERMAN + .align 2 +gSummaryScreenTextTiles:: + .incbin "graphics/summary_screen/text.4bpp" + + .align 2 +gUnknown_0839FA7C:: + .incbin "graphics/pokedex/noball.4bpp.lz" + + .align 2 +gIntroTiles:: + .incbin "graphics/intro/intro.4bpp.lz" + + .align 2 +ConditionUpDownTiles:: + .incbin "graphics/misc/condition_up_down.4bpp" + + .align 2 +ConditionUpDownPalette:: + .incbin "graphics/misc/condition_up_down.gbapal" + + .align 2 +RouletteSpritePalette_01:: + .incbin "graphics/roulette/shadow.gbapal" + + .align 2 +RouletteSpritePalette_02:: + .incbin "graphics/roulette/ball.gbapal" + + .align 2 +RouletteSpritePalette_03:: + .incbin "graphics/roulette/ball_counter.gbapal" + + .align 2 +RouletteSpritePalette_04:: + .incbin "graphics/roulette/cursor.gbapal" + + .align 2 +RouletteSpritePalette_05:: + .incbin "graphics/roulette/credit.gbapal" + + .align 2 +RouletteSpritePalette_06:: + .incbin "graphics/roulette/shroomish.gbapal" + + .align 2 +RouletteSpritePalette_07:: + .incbin "graphics/roulette/tailow.gbapal" + + .align 2 +RouletteSpritePalette_08:: + .incbin "graphics/roulette/poke_icons.gbapal" + + .align 2 +RouletteSpritePalette_09:: + .incbin "graphics/roulette/wynaut.gbapal" + + .align 2 +RouletteSpritePalette_10:: + .incbin "graphics/roulette/azurill.gbapal" + + .align 2 +RouletteSpritePalette_11:: + .incbin "graphics/roulette/skitty.gbapal" + + .align 2 +RouletteSpritePalette_12:: + .incbin "graphics/roulette/makuhita.gbapal" + + .align 2 +RouletteSpritePalette_13:: + .incbin "graphics/roulette/83F907C.gbapal" + + .align 2 +RouletteSpritePalette_14:: + .incbin "graphics/roulette/83F909C.gbapal" + + .align 2 +RouletteSpritePalette_15:: + .incbin "graphics/roulette/83F90BC.gbapal" + + .align 2 +RouletteSpritePalette_16:: + .incbin "graphics/roulette/83F90DC.gbapal" + + .align 2 +gTilesetPalettes_Shop:: + .incbin "data/tilesets/secondary/shop/palettes/00.gbapal" + .incbin "data/tilesets/secondary/shop/palettes/01.gbapal" + .incbin "data/tilesets/secondary/shop/palettes/02.gbapal" + .incbin "data/tilesets/secondary/shop/palettes/03.gbapal" + .incbin "data/tilesets/secondary/shop/palettes/04.gbapal" + .incbin "data/tilesets/secondary/shop/palettes/05.gbapal" + .incbin "data/tilesets/secondary/shop/palettes/06.gbapal" + .incbin "data/tilesets/secondary/shop/palettes/07.gbapal" + .incbin "data/tilesets/secondary/shop/palettes/08.gbapal" + .incbin "data/tilesets/secondary/shop/palettes/09.gbapal" + .incbin "data/tilesets/secondary/shop/palettes/10.gbapal" + .incbin "data/tilesets/secondary/shop/palettes/11.gbapal" + .incbin "data/tilesets/secondary/shop/palettes/12.gbapal" + .incbin "data/tilesets/secondary/shop/palettes/13.gbapal" + .incbin "data/tilesets/secondary/shop/palettes/14.gbapal" + .incbin "data/tilesets/secondary/shop/palettes/15.gbapal" + + .align 2 +gTilesetTiles_Shop:: + .incbin "data/tilesets/secondary/shop/tiles.4bpp.lz" + + .align 2 +gUnknown_083FAF1C:: + .incbin "graphics/pokedex/cry_meter.gbapal" + + .align 2 +gUnknown_083FAF3C:: + .incbin "graphics/pokedex/cry_meter.4bpp.lz" + + .align 2 +gUnknown_083FAE7C:: + .incbin "graphics/pokedex/cry_meter_map.bin" +.endif diff --git a/data/matsuda_debug_menu.s b/data/matsuda_debug_menu.s index d1ce9fc3d..c4f7adcb7 100644 --- a/data/matsuda_debug_menu.s +++ b/data/matsuda_debug_menu.s @@ -130,7 +130,11 @@ gMatsudaDebugMenu_GoBackText:: @ 83C9337 .string "もどる$" @ Go Back gMatsudaDebugMenu_BattlePointsText:: @ 83C933B +.ifdef ENGLISH .string "{COLOR MAGENTA}BP.$" +.else + .string "{COLOR MAGENTA}BP,$" +.endif MatsudaDebugMenuText_Cool: .string "かっこよさ$" @ coolness diff --git a/data/mauville_old_man.s b/data/mauville_old_man.s index dad75ebd0..5c4bd47b9 100644 --- a/data/mauville_old_man.s +++ b/data/mauville_old_man.s @@ -5,12 +5,22 @@ .align 1 gUnknown_083E537C:: @ 83E537C +.ifdef ENGLISH ec_word SISTER ec_word EATS ec_word SWEETS ec_word VORACIOUS ec_word AND ec_word DROOLING +.else + ec_word SISTER + ec_word MUST_BE + ec_word SWEETS + ec_word VORACIOUS + ec_word DROOLING + ec_word THICK +.endif + .align 2 gUnknown_083E5388:: @ 83E5388 diff --git a/data/mori_debug_menu.s b/data/mori_debug_menu.s index f9b249587..2545b2b15 100644 --- a/data/mori_debug_menu.s +++ b/data/mori_debug_menu.s @@ -53,7 +53,11 @@ Text_39B2AF: @ 839B2AF .string "Long name$" Text_39B2B9: @ 839B2B9 +.ifdef ENGLISH .string "ポロックけす$" @ "{POKEBLOCK} CASE$" +.else + .string "Delete {POKEBLOCK}$" +.endif .align 2 gMoriDebugMenuActions:: @ 839B2C0 diff --git a/data/pokedex_cry_screen.s b/data/pokedex_cry_screen.s index 1eb3086e9..d5faa24de 100644 --- a/data/pokedex_cry_screen.s +++ b/data/pokedex_cry_screen.s @@ -11,6 +11,7 @@ CryMeterNeedlePalette: @ 83FA65C CryMeterNeedleTiles: @ 83FA67C .incbin "graphics/pokedex/cry_meter_needle.4bpp" +.ifdef ENGLISH .align 1 gUnknown_083FAE7C:: @ 83FAE7C .incbin "graphics/pokedex/cry_meter_map.bin" @@ -22,6 +23,7 @@ gUnknown_083FAF1C:: @ 83FAF1C .align 2 gUnknown_083FAF3C:: @ 83FAF3C .incbin "graphics/pokedex/cry_meter.4bpp.lz" +.endif .align 1 gUnknown_083FB274:: @ 83FB274 diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s index f66a28e56..5d577ca84 100644 --- a/data/pokemon_summary_screen.s +++ b/data/pokemon_summary_screen.s @@ -335,9 +335,11 @@ gSpriteTemplate_83C1304:: @ 83C1304 gSummaryScreenMonMarkingsPalette:: @ 83C131C .incbin "graphics/summary_screen/mon_markings.gbapal" +.ifdef ENGLISH .align 2 gSummaryScreenTextTiles:: @ 83C133C .incbin "graphics/summary_screen/text.4bpp" +.endif .align 2 gSummaryScreenButtonTiles:: @ 83C147C diff --git a/data/roulette.s b/data/roulette.s index 27dd712b5..47aa45215 100644 --- a/data/roulette.s +++ b/data/roulette.s @@ -133,6 +133,7 @@ gUnknown_083F8EE8:: @ 83F8EE8 gUnknown_083F8EF4:: @ 83F8EF4 .byte 0, 3, 4, 6, 12 +.ifdef ENGLISH .align 2 RouletteSpritePalette_01: .incbin "graphics/roulette/shadow.gbapal" @@ -196,6 +197,7 @@ RouletteSpritePalette_15: .align 2 RouletteSpritePalette_16: .incbin "graphics/roulette/83F90DC.gbapal" +.endif .align 2 gUnknown_083F90FC:: @ 83F90FC diff --git a/data/specials.inc b/data/specials.inc index dd12775f5..e0022bea1 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -342,3 +342,6 @@ gSpecials:: .4byte GetNameOfEnigmaBerryInPlayerParty .4byte ScriptRandom .4byte sub_80835D8 +.ifdef GERMAN + .4byte nullsub_814B200 +.endif diff --git a/data/tilesets/graphics.inc b/data/tilesets/graphics.inc index eb9d02c5e..a395d0985 100644 --- a/data/tilesets/graphics.inc +++ b/data/tilesets/graphics.inc @@ -348,13 +348,12 @@ gTilesetPalettes_Building:: @ 8225FA4 .incbin "data/tilesets/primary/building/palettes/14.gbapal" .incbin "data/tilesets/primary/building/palettes/15.gbapal" +.ifndef GERMAN .align 2 - gTilesetTiles_Shop:: @ 82261A4 .incbin "data/tilesets/secondary/shop/tiles.4bpp.lz" .align 2 - gTilesetPalettes_Shop:: @ 8227788 .incbin "data/tilesets/secondary/shop/palettes/00.gbapal" .incbin "data/tilesets/secondary/shop/palettes/01.gbapal" @@ -372,6 +371,7 @@ gTilesetPalettes_Shop:: @ 8227788 .incbin "data/tilesets/secondary/shop/palettes/13.gbapal" .incbin "data/tilesets/secondary/shop/palettes/14.gbapal" .incbin "data/tilesets/secondary/shop/palettes/15.gbapal" +.endif .align 2 diff --git a/data/use_pokeblock.s b/data/use_pokeblock.s index b82c6756c..2eabe9ce3 100644 --- a/data/use_pokeblock.s +++ b/data/use_pokeblock.s @@ -3,6 +3,7 @@ .section .rodata +.ifndef GERMAN .align 2 ConditionUpDownPalette: .incbin "graphics/misc/condition_up_down.gbapal" @@ -10,6 +11,7 @@ ConditionUpDownPalette: .align 2 ConditionUpDownTiles: .incbin "graphics/misc/condition_up_down.4bpp" +.endif gUnknown_08406118:: @ 8406118 .4byte 22 @ MON_DATA_COOL |