diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/HoF_room_pc.asm | 4 | ||||
| -rwxr-xr-x | engine/hall_of_fame.asm | 9 | ||||
| -rwxr-xr-x | engine/hidden_object_functions17.asm | 16 | ||||
| -rwxr-xr-x | engine/menu/diploma.asm | 13 | ||||
| -rwxr-xr-x | engine/menu/prize_menu.asm | 2 | ||||
| -rwxr-xr-x | engine/oak_speech2.asm.orig | 296 | ||||
| -rwxr-xr-x | engine/save.asm | 28 | ||||
| -rwxr-xr-x | engine/town_map.asm | 7 |
8 files changed, 335 insertions, 40 deletions
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 |