diff --git a/README.md b/README.md index e323e508..ddf30b31 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,7 @@ QoL Enhancements - The protagonist is referred to in a gender neutral manner. - PC added to Celadon Hotel where the invisible event usually is. Why not? - Artificial Save Delay has been removed. +- Ultra Balls now have a Ball Modifier of 4, instead of 8. This makes them better for general-purpose than Great Balls. Safari Balls have the same effect applied. - Event moves can now be taught via TM/HM; - TM16 (Pay Day) can be taught to Fearow and Rapidash ('98 Shogakukan) - TM23 (Dragon Rage) can be taught to Magikarp (July '98 Shogakukan) @@ -99,6 +100,7 @@ QoL Enhancements Bug Fixes ==== Many non-multiplayer, non-battle related bugs have been fixed. The aforementioned have been preserved for the RBY battle experience. Bugs that are fixed are ones that objectively hurt the gameplay experience. Much of this can be attributed to [the tutorials](https://github.com/pret/pokered/wiki/Bugs-and-Glitches) made by the good people at pret. +- Fixed various translation errors (eg. Route 14 Birdkeeper's "birds of prey" line, Koji and Atsuko in Fuschia.) - Blaine is no longer addicted to Super Potions. - CoolTrainerF no longer switches a lot. - Transformed Pokemon aren't presumed to be Dittos! (very important given Animon) diff --git a/data/pokemon/dex_text.asm b/data/pokemon/dex_text.asm index 9e6ce0bd..f36c304a 100644 --- a/data/pokemon/dex_text.asm +++ b/data/pokemon/dex_text.asm @@ -219,7 +219,7 @@ _GyaradosDexEntry:: ; new entry dex _ShellderDexEntry:: ; new entry - text "Its shell is as" + text "Its shell is" next "harder than" next "diamonds. It" @@ -1256,8 +1256,8 @@ _BulbasaurDexEntry:: ; new entry next "about whether" page "BULBASAUR is a" - next "plant or" - next "a mammal" + next "plant or a" + next "mammal" dex _VenusaurDexEntry:: ; new entry diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm index a9a079fd..71882236 100644 --- a/data/pokemon/new_dex_text.asm +++ b/data/pokemon/new_dex_text.asm @@ -124,8 +124,8 @@ _BittybatDexEntry:: next "these #MON may" page "swarm a victim" - next "at once to" - next "prey on it" + next "at once to prey" + next "on it" dex _RibbitoDexEntry:: diff --git a/data/text/text_2.asm b/data/text/text_2.asm index 72fd4a44..e83be88f 100644 --- a/data/text/text_2.asm +++ b/data/text/text_2.asm @@ -819,8 +819,7 @@ _PokemonBooksText:: done _DiglettSculptureText:: - text "It's a sculpture" - line "of DIGLETT." + text "It's a butsudan!" ; restored JP elemement done _ElevatorText:: diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 79a21ccb..95544538 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -61,7 +61,7 @@ YoungsterData: db 11, RATTATA, EKANS, 0 db 14, SPEAROW, 0 ; Mt. Moon 1F - db 10, RATTATA, RATTATA, ZUBAT, 0 + db 10, RATTATA, SPEAROW, BITTYBAT, 0 ; Route 24 db 14, RATTATA, EKANS, ZUBAT, 0 ; Route 25 @@ -94,12 +94,12 @@ BugCatcherData: db 14, CATERPIE, WEEDLE, 0 ; Route 6 db 16, WEEDLE, CATERPIE, WEEDLE, 0 - db 20, BUTTERFREE, 0 + db 20, BUTTERFREE, 0 ; this is that one boss fight-like one ; Unused - this will be used in the Silph Gauntlet db 62, SCIZOR, BEEDRILL, PARASECT, VENOMOTH, PURAKKUSU, KLEAVOR, 0 ; Route 9 - db 19, BEEDRILL, BEEDRILL, 0 - db 20, CATERPIE, WEEDLE, VENONAT, 0 + db 19, BUTTERFREE, BEEDRILL, 0 + db 20, WEEDLE, VENONAT, BEEDRILL, 0 ; holy shit why did they have an L20 Caterpie you psycho, weedle is barely acceptable... LassData: ; Route 3 @@ -320,7 +320,7 @@ EngineerData: db 36, GOLEM, 0 ; Route 11 db 21, MAGNEMITE, 0 - db 18, MAGNEMITE, MAGNEMITE, MAGNETON, 0 + db 18, MAGNEMITE, MAGNEMITE, MAGNETITE, 0 UnusedJugglerData: ; db $FF, 7, KONYA, 7, EEVEE, 10, LICKITUNG, 0 @@ -507,10 +507,10 @@ Green1Data: db $FF, 9, PIDGEY, 8, SQUIRTLE, 0 db $FF, 9, PIDGEY, 8, BULBASAUR, 0 db $FF, 9, PIDGEY, 8, CHARMANDER, 0 -; Cerulean City - db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, SQUIRTLE, 0 - db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, BULBASAUR, 0 - db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, CHARMANDER, 0 +; Cerulean City - starter is now evolved + db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, WARTORTLE, 0 + db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, IVYSAUR, 0 + db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, CHARMELEON, 0 ProfOakData: ; Unused @@ -559,9 +559,9 @@ GiovanniData: RocketData: ; Mt. Moon B2F - db 13, RATTATA, ZUBAT, 0 - db 11, SANDSHREW, RATTATA, ZUBAT, 0 - db 12, ZUBAT, EKANS, 0 + db 13, RATTATA, BITTYBAT, 0 + db 11, SANDSHREW, RATTATA, BITTYBAT, 0 + db 12, BITTYBAT, EKANS, 0 db 16, RATICATE, 0 ; Cerulean City db 17, MACHOP, DROWZEE, 0 diff --git a/data/wild/maps/DiglettsCave.asm b/data/wild/maps/DiglettsCave.asm index 73fa647f..deec8e76 100644 --- a/data/wild/maps/DiglettsCave.asm +++ b/data/wild/maps/DiglettsCave.asm @@ -1,5 +1,5 @@ DiglettsCaveWildMons: - def_grass_wildmons 20 ; encounter rate + def_grass_wildmons 15 ; encounter rate, lowered a tad to match other routes - PvK db 18, DIGLETT db 19, DIGLETT db 17, ONIX @@ -12,5 +12,15 @@ DiglettsCaveWildMons: db 31, DUGTRIO end_grass_wildmons - def_water_wildmons 0 ; encounter rate + def_water_wildmons 5 ; encounter rate + db 18, WIGLETT + db 19, WIGLETT + db 17, WIGLETT + db 20, WIGLETT + db 16, WIGLETT + db 15, WIGLETT + db 21, WIGLETT + db 22, WIGLETT + db 29, WUGTRIO + db 31, WUGTRIO end_water_wildmons diff --git a/data/wild/super_rod.asm b/data/wild/super_rod.asm index 1f3f9402..4fcc0b71 100644 --- a/data/wild/super_rod.asm +++ b/data/wild/super_rod.asm @@ -39,6 +39,7 @@ SuperRodData: dbw CELADON_UNIVERSITY_OUTSIDE, .Group11 dbw FARAWAY_ISLAND_INSIDE, .Group7 dbw MT_MOON_CRATER, .Group10 + dbw DIGLETTS_CAVE, .Group12 db -1 ; end ; fishing groups @@ -134,3 +135,10 @@ SuperRodData: db 20, MAGIKARP db 20, GYARADOS db 20, GRIMER + +.Group12: + db 4 + db 16, WIGLETT + db 18, WIGLETT + db 19, WIGLETT + db 28, WUGTRIO \ No newline at end of file diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm index 98bc55c7..2de2160f 100644 --- a/engine/debug/debug_party.asm +++ b/engine/debug/debug_party.asm @@ -21,7 +21,7 @@ SetIshiharaTeam: jr .loop IshiharaTeam: - db KINGDRA, 90 + db SCREAM_TAIL, 90 IF DEF(_DEBUG) db MAGNEZONE, 50 ELSE @@ -29,7 +29,7 @@ ELSE ENDC db MAGMORTAR, 56 db ELECTIVIRE, 56 - db PORYGON2, 57 + db ANNIHILAPE, 57 IF DEF(_DEBUG) db KADABRA, 16 ENDC @@ -86,13 +86,15 @@ IF DEF(_DEBUG) ld a, 15 ld [hl], a - ; Kadabra gets Flash. + ; Kadabra gets Flash and Teleport ld hl, wPartyMon6Moves + 2 ld a, FLASH ld [hl], a ld hl, wPartyMon6PP + 2 ld a, 15 ld [hl], a + ld a, TELEPORT + ld [hl], a ; Get some debug items. ld hl, wNumBagItems @@ -142,10 +144,10 @@ DebugItemsList: db BICYCLE, 1 db FULL_RESTORE, 99 db MAX_REPEL, 99 - db ESCAPE_ROPE, 99 db RARE_CANDY, 99 db MASTER_BALL, 99 - db DUBIOUS_DISC, 99 + db ULTRA_BALL, 99 + db GREAT_BALL, 99 db SECRET_KEY, 1 db CARD_KEY, 1 db S_S_TICKET, 1 diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 1981f8ab..4697662f 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -275,6 +275,10 @@ ItemUseBall: ld a, [wcf91] cp GREAT_BALL ld a, 12 + cp ULTRA_BALL ; lower threshold for ultras and safaris fix + ld a, 4 + cp SAFARI_BALL + ld a, 4 ; fix ends here jr nz, .skip1 ld a, 8 diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index 14fe41ae..017d21fe 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -127,7 +127,7 @@ MainMenu: InitOptions: ld a, TEXT_DELAY_FAST ld [wLetterPrintingDelayFlags], a - ld a, TEXT_DELAY_FAST + ld a, TEXT_DELAY_FAST ; makes fasttext come up without the need to change settings ld [wOptions], a ret @@ -392,7 +392,7 @@ PrintSaveScreenText: call PrintPlayTime ld a, $1 ldh [hAutoBGTransferEnabled], a - ld c, 15 ; quicker player stat display + ld c, 30 jp DelayFrames PrintNumBadges: @@ -713,4 +713,4 @@ CheckForPlayerNameInSRAM: ld [MBC1SRamEnable], a ld [MBC1SRamBankingMode], a scf - ret + ret \ No newline at end of file diff --git a/text/CeladonMart3F.asm b/text/CeladonMart3F.asm index c24763e4..624ba6a3 100644 --- a/text/CeladonMart3F.asm +++ b/text/CeladonMart3F.asm @@ -42,18 +42,19 @@ _CeladonMart3Text3:: para "My buddy's going" line "to trade me his" cont "KANGASKHAN for my" - cont "GRAVELER!" + cont "HAUNTER!" ; restored JP and remake element done _CeladonMart3Text4:: - text "Come on GRAVELER!" + text "Come on HAUNTER!" ; JP and remake restoration - para "I love GRAVELER!" - line "I collect them!" + para "I'm the HAUNTER" + line "MANIAC!" + cont "I collect them!" para "Huh?" - para "GRAVELER turned" + para "HAUNTER turned" line "into a different" cont "#MON!" done @@ -94,6 +95,8 @@ _CeladonMart3Text14:: done _CeladonMart3Text15:: - text "Red and Blue!" - line "Both are #MON!" + text "Red and Green!" ; restores element from JP Blue, but modifies it to comprise all versions - PvK + line "Blue and Yellow!" + + para "All are #MON!" done diff --git a/text/CeladonMartRoof.asm b/text/CeladonMartRoof.asm index cbedb3b7..26136a7d 100644 --- a/text/CeladonMartRoof.asm +++ b/text/CeladonMartRoof.asm @@ -59,8 +59,8 @@ _CeladonMartRoofText_4850f:: text " contains" line "ROCK SLIDE!" - para "It can spook the" - line "target sometimes!@" + ;para "It can spook the" removing misleading info ~ PvK + ;line "target sometimes!@" text_end _CeladonMartRoofText_48515:: diff --git a/text/FuchsiaCity.asm b/text/FuchsiaCity.asm index a90d0021..20cb901b 100644 --- a/text/FuchsiaCity.asm +++ b/text/FuchsiaCity.asm @@ -16,8 +16,8 @@ _FuchsiaCityText2:: done _FuchsiaCityText3:: - text "ERIK: Where's" - line "SARA? I said I'd" + text "KOJI: Where's" ; JP sequence restoration + line "ATSUKO? I said I'd" cont "meet her here." done diff --git a/text/Route14.asm b/text/Route14.asm index 18e85ed4..04dd9358 100644 --- a/text/Route14.asm +++ b/text/Route14.asm @@ -69,8 +69,8 @@ _Route14AfterBattleText4:: _Route14BattleText5:: text "Have you heard of" - line "the legendary" - cont "#MON?" + line "the winged" + cont "mirages?" done _Route14EndBattleText5:: @@ -79,9 +79,17 @@ _Route14EndBattleText5:: prompt _Route14AfterBattleText5:: - text "The 3 legendary" - line "#MON are all" - cont "birds of prey." + text "The winged" ; jp / remake restoration + line "mirages are the" + + para "legendary bird" + line "#MON." + + para "There are 3 of" + line "them: ZAPDOS," + cont "ARTICUNO, and" + cont "MOLTRES." + done _Route14BattleText6:: diff --git a/text/SafariZoneCenterRestHouse.asm b/text/SafariZoneCenterRestHouse.asm index b6c87818..b43e8681 100644 --- a/text/SafariZoneCenterRestHouse.asm +++ b/text/SafariZoneCenterRestHouse.asm @@ -1,7 +1,9 @@ _SafariZoneRestHouse1Text1:: - text "SARA: Where did" - line "my boy friend," - cont "ERIK, go?" + text "ATSUKO: Where did" ; JP elements restored, cut "boyfriend" line which was a translation change. + line "KOJI go?" + + para "He said to meet" + line "him here..." done _SafariZoneRestHouse1Text2::