diff options
28 files changed, 451 insertions, 141 deletions
diff --git a/charmap.asm b/charmap.asm index 6ce6e485..ba8ca006 100644 --- a/charmap.asm +++ b/charmap.asm @@ -221,6 +221,7 @@ charmap "x", $B7 charmap "y", $B8 charmap "z", $B9 charmap "é", $BC +charmap "ô", $C9 charmap "n'", $D9 charmap "'", $E0 charmap "-", $E3 diff --git a/data/credits_order.asm b/data/credits_order.asm index 5a71a26a..ea15e140 100755 --- a/data/credits_order.asm +++ b/data/credits_order.asm @@ -27,13 +27,12 @@ CreditsOrder: ; 74243 (1d:4243) db CRED_PRODUCERS, CRED_ISHIHARA, $FE db CRED_US_STAFF, $FD db CRED_US_COORD, CRED_TILDEN, $FD - db CRED_US_COORD, CRED_KAWAKAMI, CRED_HI_NAKAMURA, $FC - db CRED_US_COORD, CRED_GIESE, CRED_OSBORNE, $FC - db CRED_TRANS, CRED_OGASAWARA, $FD - db CRED_PROGRAMMERS, CRED_MURAKAWA, CRED_FUKUI, $FD - db CRED_SPECIAL, CRED_IWATA, $FD - db CRED_SPECIAL, CRED_HARADA, $FC - db CRED_TEST, CRED_PAAD, CRED_CLUB, $FD - db CRED_PRODUCER, CRED_IZUSHI, $FD - db CRED_EXECUTIVE, CRED_YAMAUCHI, $FF + db CRED_US_COORD, CRED_KAWAKAMI, CRED_HI_NAKAMURA, CRED_GIESE, $FC + db CRED_US_COORD, CRED_OSBORNE, CRED_TRANS, CRED_OGASAWARA, $FC + db CRED_IWATA, CRED_IZUSHI, CRED_HARADA, $FD + db CRED_PROGRAMMERS, CRED_PAAD, $40, $FD + db CRED_SPECIAL, CRED_CLUB, CRED_MURAKAWA, $FC + db $41, $42, $43, $44, $FD + db $2A, $3D, $FD + db $2B, $0C, $FF db $FB, $FF, $FA diff --git a/data/prizes.asm b/data/prizes.asm index 3d4102b6..66bf3301 100755 --- a/data/prizes.asm +++ b/data/prizes.asm @@ -9,7 +9,7 @@ PrizeDifferentMenuPtrs: ; 52843 (14:6843) dw PrizeMenuTMsCost NoThanksText: ; 5284f (14:684f) - db "NO THANKS@" + db "NON MERCI@" PrizeMenuMon1Entries: ; 52859 (14:6859) db ABRA diff --git a/data/trades.asm b/data/trades.asm index e7f71233..5ffb4e3e 100755 --- a/data/trades.asm +++ b/data/trades.asm @@ -1,12 +1,12 @@ TradeMons: ; 71b7b (1c:5b7b) ; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total - db NIDORINO, NIDORINA, 0,"TERRY@@@@@@" + db NIDORINO, NIDORINA, 0,"BIBICHE@@@@" db ABRA, MR_MIME, 0,"MARCEL@@@@@" db BUTTERFREE,BEEDRILL, 2,"CHIKUCHIKU@" - db PONYTA, SEEL, 0,"SAILOR@@@@@" - db SPEAROW, FARFETCHD,2,"DUX@@@@@@@@" - db SLOWBRO, LICKITUNG,0,"MARC@@@@@@@" - db POLIWHIRL, JYNX, 1,"LOLA@@@@@@@" - db RAICHU, ELECTRODE,1,"DORIS@@@@@@" - db VENONAT, TANGELA, 2,"CRINKLES@@@" - db NIDORAN_M, NIDORAN_F,2,"SPOT@@@@@@@" + db PONYTA, SEEL, 0,"BIBI@@@@@@@" + db SPEAROW, FARFETCHD,2,"JULIO@@@@@@" + db SLOWBRO, LICKITUNG,0,"GLAVIOTEUR@" + db POLIWHIRL, JYNX, 1,"NINI@@@@@@@" + db RAICHU, ELECTRODE,1,"KOURJUS@@@@" + db VENONAT, TANGELA, 2,"BIGOUDI@@@@" + db NIDORAN_M, NIDORAN_F,2,"FABI@@@@@@@" diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index e00fc57d..4fe7f4cb 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -258,8 +258,8 @@ Credits: ; 7418e (1d:418e) TheEndTextString: ; 74229 (1d:4229) ; "T H E E N D" - db $60," ",$62," ",$64," ",$64," ",$66," ",$68,"@" - db $61," ",$63," ",$65," ",$65," ",$67," ",$69,"@" + db $60," ",$62,$64," ",$66,"@" + db $61," ",$63,$65," ",$67,"@" INCLUDE "data/credits_order.asm" diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index 4225c5a1..256932cd 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -92,7 +92,7 @@ AnimateHallOfFame: ; 701a0 (1c:41a0) ret HallOfFameText: ; 7026b (1c:426b) - db "HALL OF FAME@" + db "CELEBRITE@" HoFShowMonOrPlayer: ; 70278 (1c:4278) call ClearScreen @@ -178,7 +178,7 @@ HoFDisplayMonInfo: ; 702f0 (1c:42f0) jp PlayCry HoFMonInfoText: ; 70329 (1c:4329) - db "LEVEL/" + db "NIVEAU/" next "TYPE1/" next "TYPE2/@" @@ -239,6 +239,7 @@ HoFDisplayPlayerStats: ; 70377 (1c:4377) ld de, wPlayerMoney ld c, $a3 call PrintBCDNumber + ld [hl], $F0 ld hl, DexSeenOwnedText call HoFPrintTextAndDelay ld hl, DexRatingText @@ -251,10 +252,10 @@ HoFPrintTextAndDelay: ; 703e2 (1c:43e2) jp DelayFrames HoFPlayTimeText: ; 703ea (1c:43ea) - db "PLAY TIME@" + db "DUREE JEU@" HoFMoneyText: ; 703f4 (1c:43f4) - db "MONEY@" + db "ARGENT@" DexSeenOwnedText: ; 703fa (1c:43fa) TX_FAR _DexSeenOwnedText diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index ffcc33c3..42fbc85d 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -151,10 +151,10 @@ LinkCableHelpText2: ; 5dca3 (17:5ca3) db "@" HowToLinkText: ; 5dca8 (17:5ca8) - db "HOW TO LINK" - next "COLOSSEUM" - next "TRADE CENTER" - next "STOP READING@" + db "CABLE LINK" + next "COLISEE" + next "CENTRE TROC" + next "NE PLUS LIRE@" LinkCableInfoTexts: ; 5dcd8 (17:5cd8) dw LinkCableInfoText1 @@ -268,14 +268,14 @@ ViridianSchoolBlackboardText2: ; 5dda7 (17:5da7) db "@" StatusAilmentText1: ; 5ddac (17:5dac) - db " SLP" + db " SOM" next " PSN" next " PAR@" StatusAilmentText2: ; 5ddbb (17:5dbb) - db " BRN" - next " FRZ" - next " QUIT@@" + db " BRU" + next " GEL" + next " RET@" ViridianBlackboardStatusPointers: ; 5ddcc (17:5ddc) dw ViridianBlackboardSleepText diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm index 630c6c23..e18f7d55 100755 --- a/engine/menu/diploma.asm +++ b/engine/menu/diploma.asm @@ -94,20 +94,19 @@ DiplomaTextPointersAndCoords: ; 56784 (15:6784) dwCoord 9, 16 DiplomaText: - db $70,"Diploma",$70,"@" + db $70,"Diplôme",$70,"@" DiplomaPlayer: - db "Player@" + db "Joueur@" DiplomaEmptyText: db "@" DiplomaCongrats: - db "Congrats! This" - next "diploma certifies" - next "that you have" - next "completed your" - next "#DEX.@" + db "Fabuleux! Ce" + next "diplôme certifie" + next "la perfection de" + next "votre PokéDex@" DiplomaGameFreak: db "GAME FREAK@" diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm index 434a1943..3bc64701 100755 --- a/engine/menu/prize_menu.asm +++ b/engine/menu/prize_menu.asm @@ -166,7 +166,7 @@ PrintPrizePrice: ; 5287a (14:687a) ret .CoinText - db "COIN@" + db "JETONS@" .SixSpacesText db " @" diff --git a/engine/oak_speech2.asm.orig b/engine/oak_speech2.asm.orig new file mode 100755 index 00000000..986a6535 --- /dev/null +++ b/engine/oak_speech2.asm.orig @@ -0,0 +1,296 @@ +ChoosePlayerName: ; 695d (1:695d) + call OakSpeechSlidePicRight + ld de, DefaultNamesPlayer + call DisplayIntroNameTextBox + ld a, [wCurrentMenuItem] + and a + jr z, .customName + ld hl, DefaultNamesPlayerList + call GetDefaultName + ld de, wPlayerName + call OakSpeechSlidePicLeft + jr .done +.customName + ld hl, wPlayerName + xor a ; NAME_PLAYER_SCREEN + ld [wNamingScreenType], a + call DisplayNamingScreen + ld a, [wcf4b] + cp "@" + jr z, .customName + call ClearScreen + call Delay3 + ld de, RedPicFront + ld b, BANK(RedPicFront) + call IntroDisplayPicCenteredOrUpperRight +.done + ld hl, YourNameIsText + jp PrintText + +YourNameIsText: ; 699f (1:699f) + TX_FAR _YourNameIsText + db "@" + +ChooseRivalName: ; 69a4 (1:69a4) + call OakSpeechSlidePicRight + ld de, DefaultNamesRival + call DisplayIntroNameTextBox + ld a, [wCurrentMenuItem] + and a + jr z, .customName + ld hl, DefaultNamesRivalList + call GetDefaultName + ld de, wRivalName + call OakSpeechSlidePicLeft + jr .done +.customName + ld hl, wRivalName + ld a, NAME_RIVAL_SCREEN + ld [wNamingScreenType], a + call DisplayNamingScreen + ld a, [wcf4b] + cp "@" + jr z, .customName + call ClearScreen + call Delay3 + ld de, Rival1Pic + ld b, $13 + call IntroDisplayPicCenteredOrUpperRight +.done + ld hl, HisNameIsText + jp PrintText + +HisNameIsText: ; 69e7 (1:69e7) + TX_FAR _HisNameIsText + db "@" + +OakSpeechSlidePicLeft: ; 69ec (1:69ec) + push de + coord hl, 0, 0 + lb bc, 12, 11 + call ClearScreenArea ; clear the name list text box + ld c, 10 + call DelayFrames + pop de + ld hl, wcd6d + ld bc, NAME_LENGTH + call CopyData + call Delay3 + coord hl, 12, 4 + lb de, 6, 6 * SCREEN_WIDTH + 5 + ld a, $ff + jr OakSpeechSlidePicCommon + +OakSpeechSlidePicRight: ; 6a12 (1:6a12) + coord hl, 5, 4 + lb de, 6, 6 * SCREEN_WIDTH + 5 + xor a + +OakSpeechSlidePicCommon: ; 6a19 (1:6a19) + push hl + push de + push bc + ld [hSlideDirection], a + ld a, d + ld [hSlideAmount], a + ld a, e + ld [hSlidingRegionSize], a + ld c, a + ld a, [hSlideDirection] + and a + jr nz, .next +; If sliding right, point hl to the end of the pic's tiles. + ld d, 0 + add hl, de +.next + ld d, h + ld e, l +.loop + xor a + ld [H_AUTOBGTRANSFERENABLED], a + ld a, [hSlideDirection] + and a + jr nz, .slideLeft +; sliding right + ld a, [hli] + ld [hld], a + dec hl + jr .next2 +.slideLeft + ld a, [hld] + ld [hli], a + inc hl +.next2 + dec c + jr nz, .loop + ld a, [hSlideDirection] + and a + jr z, .next3 +; If sliding left, we need to zero the last tile in the pic (there is no need +; to take a corresponding action when sliding right because hl initially points +; to a 0 tile in that case). + xor a + dec hl + ld [hl], a +.next3 + ld a, 1 + ld [H_AUTOBGTRANSFERENABLED], a + call Delay3 + ld a, [hSlidingRegionSize] + ld c, a + ld h, d + ld l, e + ld a, [hSlideDirection] + and a + jr nz, .slideLeft2 + inc hl + jr .next4 +.slideLeft2 + dec hl +.next4 + ld d, h + ld e, l + ld a, [hSlideAmount] + dec a + ld [hSlideAmount], a + jr nz, .loop + pop bc + pop de + pop hl + ret + +DisplayIntroNameTextBox: ; 6a6c (1:6a6c) + push de + coord hl, 0, 0 + ld b, $a + ld c, $9 + call TextBoxBorder + coord hl, 3, 0 + ld de, .namestring + call PlaceString + pop de + coord hl, 2, 2 + call PlaceString + call UpdateSprites + xor a + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a + inc a + ld [wTopMenuItemX], a + ld [wMenuWatchedKeys], a ; A_BUTTON + inc a + ld [wTopMenuItemY], a + inc a + ld [wMaxMenuItem], a + jp HandleMenuInput + +.namestring ; 6b40 (1:6b40) + db "─NOM@" + +IF DEF(_RED) +DefaultNamesPlayer: ; 6aa8 (1:6aa8) + db "NOM:" + next "RED" + next "SACHA" + next "PAUL" + db "@" + +DefaultNamesRival: ; 6abe (1:6abe) + db "NOM:" + next "BLUE" + next "REGIS" + next "JEAN" + db "@" +ENDC + +IF DEF(_BLUE) +DefaultNamesPlayer: ; 6aa8 (1:6aa8) + db "NOM:" + next "BLUE" + next "REGIS" + next "JEAN" + db "@" + +DefaultNamesRival: ; 6abe (1:6abe) + db "NOM:" + next "RED" + next "SACHA" + next "PAUL" + db "@" +ENDC + +GetDefaultName: ; 6ad6 (1:6ad6) +; a = name index +; hl = name list + ld b, a + ld c, 0 +.loop + ld d, h + ld e, l +.innerLoop + ld a, [hli] + cp "@" + jr nz, .innerLoop + ld a, b + cp c + jr z, .foundName + inc c + jr .loop +.foundName + ld h, d + ld l, e + ld de, wcd6d + ld bc, $14 + jp CopyData + +IF DEF(_RED) +DefaultNamesPlayerList: ; 6af2 (1:6af2) +<<<<<<< HEAD + db "NOM:@" + db "RED@" + db "SACHA@" + db "PAUL@" +DefaultNamesRivalList: ; 6b08 (1:6b08) + db "NOM:@" + db "BLUE@" + db "REGIS@" + db "JEAN@" +ENDC +IF DEF(_BLUE) +DefaultNamesPlayerList: ; 6af2 (1:6af2) + db "NOM:@" + db "BLUE@" + db "REGIS@" + db "JEAN@" +DefaultNamesRivalList: ; 6b08 (1:6b08) + db "NOM:@" + db "RED@" + db "SACHA@" + db "PAUL@" +======= + db "NEW NAME@" + db "RED@" + db "ASH@" + db "JACK@" +DefaultNamesRivalList: ; 6b08 (1:6b08) + db "NEW NAME@" + db "BLUE@" + db "GARY@" + db "JOHN@" +ENDC +IF DEF(_BLUE) +DefaultNamesPlayerList: ; 6af2 (1:6af2) + db "NEW NAME@" + db "BLUE@" + db "GARY@" + db "JOHN@" +DefaultNamesRivalList: ; 6b08 (1:6b08) + db "NEW NAME@" + db "RED@" + db "ASH@" + db "JACK@" +>>>>>>> b8dfee511453d322051f21bddc74c79307f23007 +ENDC + +TextTerminator_6b20: ; 6b20 (1:6b20) + db "@" diff --git a/engine/save.asm b/engine/save.asm index e47be58a..fad87c1f 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -171,7 +171,7 @@ SaveSAV: ; 7370a (1c:770a) jp DelayFrames NowSavingString: - db "Now saving...@" + db "Sauvegarde...@" SaveSAVConfirm: ; 73768 (1c:7768) call PrintText @@ -494,21 +494,21 @@ ChooseABoxText: ; 739d4 (1c:79d4) db "@" BoxNames: ; 739d9 (1c:79d9) - db "BOX 1" - next "BOX 2" - next "BOX 3" - next "BOX 4" - next "BOX 5" - next "BOX 6" - next "BOX 7" - next "BOX 8" - next "BOX 9" - next "BOX10" - next "BOX11" - next "BOX12@" + db "BOITE 1" + next "BOITE 2" + next "BOITE 3" + next "BOITE 4" + next "BOITE 5" + next "BOITE 6" + next "BOITE 7" + next "BOITE 8" + next "BOITE 9" + next "BOITE10" + next "BOITE11" + next "BOITE12@" BoxNoText: ; 73a21 (1c:7a21) - db "BOX No.@" + db "BOITE@" EmptyAllSRAMBoxes: ; 73a29 (1c:7a29) ; marks all boxes in SRAM as empty (initialisation for the first time the diff --git a/engine/town_map.asm b/engine/town_map.asm index 727197de..9fb5665f 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -120,8 +120,7 @@ LoadTownMap_Nest: ; 70f60 (1c:4f60) call GetMonName coord hl, 1, 0 call PlaceString - ld h, b - ld l, c + ld hl, $C381 ld de, MonsNestText call PlaceString call WaitForTextScrollButtonPress @@ -132,7 +131,7 @@ LoadTownMap_Nest: ; 70f60 (1c:4f60) ret MonsNestText: ; 70f89 (1c:4f89) - db "'s NEST@" + db "NID DE @" LoadTownMap_Fly: ; 70f90 (1c:4f90) call ClearSprites @@ -415,7 +414,7 @@ DisplayWildLocations: ; 711ef (1c:51ef) jp CopyData AreaUnknownText: ; 7124a (1c:524a) - db " AREA UNKNOWN@" + db " ZONE INCONNUE@" TownMapCoordsToOAMCoords: ; 71258 (1c:5258) ; in: lower nybble of a = x, upper nybble of a = y diff --git a/extras b/extras -Subproject 698b0fc7e63d3dadf07247015e230bce145cc50 +Subproject f88b44cd063eabb5d58c48342dd19aa0d808f2c diff --git a/gfx/red/redgreenversion.png b/gfx/red/redgreenversion.png Binary files differdeleted file mode 100644 index e41b4295..00000000 --- a/gfx/red/redgreenversion.png +++ /dev/null diff --git a/gfx/red/redversion.png b/gfx/red/redversion.png Binary files differnew file mode 100644 index 00000000..ea39a7a3 --- /dev/null +++ b/gfx/red/redversion.png diff --git a/gfx/red/sgbborder.map b/gfx/red/sgbborder.map Binary files differindex 4077ed8e..f9d81d81 100644 --- a/gfx/red/sgbborder.map +++ b/gfx/red/sgbborder.map diff --git a/gfx/red/sgbborder.png b/gfx/red/sgbborder.png Binary files differindex 7549bb47..5826cba9 100644 --- a/gfx/red/sgbborder.png +++ b/gfx/red/sgbborder.png diff --git a/gfx/text_box.png b/gfx/text_box.png Binary files differindex 946c9826..3673e74c 100644 --- a/gfx/text_box.png +++ b/gfx/text_box.png @@ -6478,7 +6478,7 @@ INCLUDE "engine/battle/decrement_pp.asm" Version_GFX: IF DEF(_RED) - INCBIN "gfx/red/redgreenversion.1bpp" ; 10 tiles + INCBIN "gfx/red/redversion.1bpp" ; 10 tiles ENDC IF DEF(_BLUE) INCBIN "gfx/blue/blueversion.1bpp" ; 8 tiles diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 9a6dcd6d..b580a1e7 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -505,13 +505,13 @@ CeladonGameCornerScript_48f1e: ; 48f1e (12:4f1e) ret GameCornerMoneyText: ; 48f7a (12:4f7a) - db "MONEY@" + db "ARG.@" GameCornerCoinText: ; 48f80 (12:4f80) - db "COIN@" + db "JETONS@" GameCornerBlankText1: ; 48f85 (12:4f85) - db " @" + db " ¥@" GameCornerBlankText2: ; 48f8d (12:4f8d) db " @" diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm index a9c017d0..f625cfad 100755 --- a/scripts/celadongym.asm +++ b/scripts/celadongym.asm @@ -17,7 +17,7 @@ CeladonGymScript_48927: ; 48927 (12:4927) jp LoadGymLeaderAndCityName Gym4CityName: ; 48930 (12:4930) - db "CELADON CITY@" + db "CELADOPOLE@" Gym4LeaderName: ; 4893d (12:493d) db "ERIKA@" diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm index 4b1514b8..809e0f99 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -17,10 +17,10 @@ CeruleanGymScript_5c6d0: ; 5c6d0 (17:46d0) jp LoadGymLeaderAndCityName Gym2CityName: ; 5c6d9 (17:46d9) - db "CERULEAN CITY@" + db "AZURIA@" Gym2LeaderName: ; 5c6e7 (17:46e7) - db "MISTY@" + db "ONDINE@" CeruleanGymScript_5c6ed: ; 5c6ed (17:46ed) xor a diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index 52e28cb8..256f818f 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -17,10 +17,10 @@ PewterGymScript_5c3a4: ; 5c3a4 (17:43a4) jp LoadGymLeaderAndCityName Gym1CityName: ; 5c3ad (17:43ad) - db "PEWTER CITY@" + db "ARGENTA@" Gym1LeaderName: ; 5c3b9 (17:43b9) - db "BROCK@" + db "PIERRE@" PewterGymScript_5c3bf: ; 5c3bf (17:43bf) xor a diff --git a/scripts/route23.asm b/scripts/route23.asm index ca72c9fe..9344ddb4 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -92,25 +92,25 @@ BadgeTextPointers: ; 51276 (14:5276) dw EarthBadgeText EarthBadgeText: ; 51284 (14:5284) - db "EARTHBADGE@" + db "BADGE TERRE@" VolcanoBadgeText: ; 5128f (14:528f) - db "VOLCANOBADGE@" + db "BADGE VOLCAN@" MarshBadgeText: ; 5129c (14:529c) - db "MARSHBADGE@" + db "BADGE MARAIS@" SoulBadgeText: ; 512a7 (14:52a7) - db "SOULBADGE@" + db "BADGE AME@" RainbowBadgeText: ; 512b1 (14:52b1) - db "RAINBOWBADGE@" + db "BADGE PRISME@" ThunderBadgeText: ; 512be (14:52be) - db "THUNDERBADGE@" + db "BADGE FOUDRE@" CascadeBadgeText: ; 512cb (14:52cb) - db "CASCADEBADGE@" + db "BADGECASCADE@" Route23Script_512d8: ; 512d8 (14:52d8) ld a, $1 diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index aae06103..ec9fbdcc 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -17,10 +17,10 @@ SaffronGymScript: ; 5d00d (17:500d) jp LoadGymLeaderAndCityName Gym6CityName: ; 5d033 (17:5033) - db "SAFFRON CITY@" + db "SAFRANIA@" Gym6LeaderName: ; 5d040 (17:5040) - db "SABRINA@" + db "MORGANE@" SaffronGymText_5d048: ; 5d048 (17:5048) xor a diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index cd2b5b3c..9fedb98b 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -22,10 +22,10 @@ VermilionGymScript_5ca4c: ; 5ca4c (17:4a4c) jp LoadGymLeaderAndCityName Gym3CityName: ; 5ca55 (17:4a55) - db "VERMILION CITY@" + db "CARMIN SUR MER@" Gym3LeaderName: ; 5ca64 (17:4a64) - db "LT.SURGE@" + db "MAJOR BOB@" VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d) CheckEvent EVENT_2ND_LOCK_OPENED diff --git a/text/credits_text.asm b/text/credits_text.asm index 2c638b9e..99f58ad4 100755 --- a/text/credits_text.asm +++ b/text/credits_text.asm @@ -47,26 +47,31 @@ CreditsTextPointers: ; 742c3 (1d:42c3) dw CredSaOota dw CredYoshikawa dw CredToOota - dw CredUSStaff - dw CredUSCoord - dw CredTilden + dw CredEUStaff + dw CredEUCoord + dw CredMoyse + dw CredPfitzner + dw CredKraft dw CredKawakami - dw CredHiNakamura - dw CredGiese - dw CredOsborne + dw CredEdasawa + dw CredUesugi + dw CredYoshimura dw CredTrans - dw CredOgasawara - dw CredIwata + dw CredBardakoff + dw CredFleury + dw CredNakamichi dw CredIzushi dw CredHarada dw CredMurakawa dw CredFukui - dw CredClub - dw CredPAAD + dw CredNoEProdTest + dw CredZehAndHugo + dw CredNoAProdTest + dw CredHudsonAndBuechele CredVersion: ; 74343 (1d:4343) ; this 1 byte difference makes all bank addresses offset by 1 in the blue version IF DEF(_RED) - db -8, "RED VERSION STAFF@" + db -6, "VERSION ROUGE@" ENDC IF DEF(_BLUE) db -8, "BLUE VERSION STAFF@" @@ -165,26 +170,32 @@ CredYoshikawa: ; 7461f (1d:461f) db -6, "RENA YOSHIKAWA@" CredToOota: ; 7462f (1d:462f) db -6, "TOMOMICHI OOTA@" -CredUSStaff: ; 7463f (1d:463f) - db -7, "US VERSION STAFF@" -CredUSCoord: ; 74651 (1d:4651) - db -7, "US COORDINATION@" -CredTilden: ; 74662 (1d:4662) - db -5, "GAIL TILDEN@" +CredEUStaff: ; 7463f (1d:463f) + db -6, "EQUIPE EUROPE@" +CredEUCoord: ; 74651 (1d:4651) + db -9, "COORDINATION EUROPE@" +CredMoyse: ; 74662 (1d:4662) + db -7, "CLAUDE M. MOYSE@" +CredPfitzner: ; (1d:) + db -7, "MARKUS PFITZNER@" +CredKraft: ; (1d:) + db -6, "JOHN D. KRAFT@" CredKawakami: ; 7466f (1d:466f) db -6, "NAOKO KAWAKAMI@" -CredHiNakamura: ; 7467f (1d:467f) - db -6, "HIRO NAKAMURA@" -CredGiese: ; 7468e (1d:468e) - db -6, "WILLIAM GIESE@" -CredOsborne: ; 7469d (1d:469d) - db -5, "SARA OSBORNE@" +CredEdasawa: ; 7467f (1d:467f) + db -6, "YUSUKE EDASAWA@" +CredUesugi: ; 7468e (1d:468e) + db -5, "HIRO UESUGI@" +CredYoshimura: ; 7469d (1d:469d) + db -7, "KAMON YOSHIMURA@" CredTrans: ; 746ab (1d:46ab) - db -7, "TEXT TRANSLATION@" -CredOgasawara: ; 746bd (1d:46bd) - db -6, "NOB OGASAWARA@" -CredIwata: ; 746cc (1d:46cc) - db -5, "SATORU IWATA@" + db -7, "TEXTES FRANCAIS@" +CredBardakoff: ; 746bd (1d:46bd) + db -7, "JULIEN BARDAKOFF@" +CredFleury: ; 746cc (1d:46cc) + db -9, "JEAN-BAPTISTE FLEURY@" +CredNakamichi: ; (1d:) + db -7, "KIMIKO NAKAMICHI@" CredIzushi: ; 746da (1d:46da) db -7, "TAKEHIRO IZUSHI@" CredHarada: ; 746eb (1d:46eb) @@ -193,7 +204,11 @@ CredMurakawa: ; 746fc (1d:46fc) db -7, "TERUKI MURAKAWA@" CredFukui: ; 7470d (1d:470d) db -5, "KOHTA FUKUI@" -CredClub: ; 7471a (1d:471a) - db -9, "NCL SUPER MARIO CLUB@" -CredPAAD: ; 74730 (1d:4730) - db -5, "PAAD TESTING@" +CredNoEProdTest: ; 7471a (1d:471a) + db -9, "NOE PRODUCT TESTING@" +CredZehAndHugo: ; 74730 (1d:4730) + db -8, "KAI ZEH & MP.HUGO@" +CredNoAProdTest: ; (1d:) + db -9, "NOA PRODUCT TESTING@" +CredHudsonAndBuechele: ; (1d:) + db -9, "K.HUDSON&T.BUECHELE@" diff --git a/text/map_names.asm b/text/map_names.asm index dd8592be..18c78509 100755 --- a/text/map_names.asm +++ b/text/map_names.asm @@ -1,26 +1,26 @@ MapNames: ; 71473 (1c:5473) PalletTownName: ; 71473 (1c:5473) - db "PALLET TOWN@" + db "BOURG PALETTE@" ViridianCityName: ; 7147f (1c:547f) - db "VIRIDIAN CITY@" + db "JADIELLE@" PewterCityName: ; 7148d (1c:548d) - db "PEWTER CITY@" + db "ARGENTA@" CeruleanCityName: ; 71499 (1c:5499) - db "CERULEAN CITY@" + db "AZURIA@" LavenderTownName: ; 714a7 (1c:54a7) - db "LAVENDER TOWN@" + db "LAVANVILLE@" VermilionCityName: ; 714b5 (1c:54b5) - db "VERMILION CITY@" + db "CARMIN SUR MER@" CeladonCityName: ; 714c4 (1c:54c4) - db "CELADON CITY@" + db "CELADOPOLE@" FuchsiaCityName: ; 714d1 (1c:54d1) - db "FUCHSIA CITY@" + db "PARMANIE@" CinnabarIslandName: ; 714de (1c:54de) - db "CINNABAR ISLAND@" + db "CRAMOIS'ILE@" IndigoPlateauName: ; 714ee (1c:54ee) - db "INDIGO PLATEAU@" + db "PLATEAU INDIGO@" SaffronCityName: ; 714fd (1c:54fd) - db "SAFFRON CITY@" + db "SAFRANIA@" Route1Name: ; 7150a (1c:550a) db "ROUTE 1@" Route2Name: ; 71512 (1c:5512) @@ -58,11 +58,11 @@ Route17Name: ; 71591 (1c:5591) Route18Name: ; 7159a (1c:559a) db "ROUTE 18@" Route19Name: ; 715a3 (1c:55a3) - db "SEA ROUTE 19@" + db "CHENAL 19@" Route20Name: ; 715b0 (1c:55b0) - db "SEA ROUTE 20@" + db "CHENAL 20@" Route21Name: ; 715bd (1c:55bd) - db "SEA ROUTE 21@" + db "CHENAL 21@" Route22Name: ; 715ca (1c:55ca) db "ROUTE 22@" Route23Name: ; 715d3 (1c:55d3) @@ -72,36 +72,36 @@ Route24Name: ; 715dc (1c:55dc) Route25Name: ; 715e5 (1c:55e5) db "ROUTE 25@" ViridianForestName: ; 715ee (1c:55ee) - db "VIRIDIAN FOREST@" + db "FORET DE JADE@" MountMoonName: ; 715fe (1c:55fe) - db "MT.MOON@" + db "MONT SELENITE@" RockTunnelName: ; 71606 (1c:5606) - db "ROCK TUNNEL@" + db "GROTTE@" SeaCottageName: ; 71612 (1c:5612) - db "SEA COTTAGE@" + db "VILLA@" SSAnneName: ; 7161e (1c:561e) - db "S.S.ANNE@" + db "L'OCEANE@" PokemonLeagueName: ; 71627 (1c:5627) - db "#MON LEAGUE@" + db "LIGUE #MON@" UndergroundPathName: ; 71633 (1c:5633) - db "UNDERGROUND PATH@" + db "SOUTERRAIN@" PokemonTowerName: ; 71644 (1c:5644) - db "#MON TOWER@" + db "TOUR #MON@" SeafoamIslandsName: ; 7164f (1c:564f) - db "SEAFOAM ISLANDS@" + db "ILES ECUME@" VictoryRoadName: ; 7165f (1c:565f) - db "VICTORY ROAD@" + db "ROUTE VICTOIRE@" DiglettsCaveName: ; 7166c (1c:566c) - db "DIGLETT's CAVE@" + db "CAVE TAUPIQUEUR@" RocketHQName: ; 7167a (1c:567a) - db "ROCKET HQ@" + db "REPAIRE ROCKET@" SilphCoName: ; 71684 (1c:5684) - db "SILPH CO.@" + db "SYLPHE SARL@" PokemonMansionName: ; 7168e (1c:568e) - db $4a," MANSION@" + db "MANOIR ",$4a,"@" SafariZoneName: ; 71698 (1c:5698) - db "SAFARI ZONE@" + db "PARC SAFARI@" CeruleanCaveName: ; 716a4 (1c:56a4) - db "CERULEAN CAVE@" + db "GROTTE INCONNUE@" PowerPlantName: ; 716b2 (1c:56b2) - db "POWER PLANT@" + db "CENTRALE@" |
