From 0c650630e03ae031fed5f92e1a9b3478793dd4ba Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Fri, 12 Jan 2024 12:33:50 +0000 Subject: [PATCH] Post-release bugfixes: Batch 2 This commit fixes the following bugs: - Viewing the Town Map in Viridian Pre-Gym would show the player as being in Cerulean. - Psychic, Psywave, Night Shade and Dazzling Gleam wouldn't shake the full screen - Okay, NOW it's impossible to trap yourself in Cinnabar Volcano. - Getting the Vermilion Beauty gift would lock you out from getting the Silph Co Lapras gift later. - Text fixes --- README.md | 1 - data/events/trades.asm | 2 +- data/maps/town_map_entries.asm | 2 +- engine/battle/animations.asm | 6 ++--- maps/CinnabarVolcano.blk | 2 +- scripts/BattleTent.asm | 5 ++-- scripts/SilphCo7F.asm | 8 +++---- text/CeruleanBadgeHouse.asm | 43 +++++++++++++--------------------- text/CitrineCity.asm | 2 +- text/Daycare_2.asm | 2 +- text/ViridianPreGym.asm | 2 +- text/pokedex_ratings.asm | 10 ++++---- 12 files changed, 36 insertions(+), 49 deletions(-) diff --git a/README.md b/README.md index 50b8d0ac..128191ea 100644 --- a/README.md +++ b/README.md @@ -262,7 +262,6 @@ and more! Known Bugs ==== -- Occasionally, saving and reloading in a building will cause the border tile to completely change, in some cases letting you walk out of bounds. - Trying to Surf from the overworld on Cycling Road has an invisible textbox stopping you, but just pressing A again lets you regain control. - Jumping from a specific tile off a ledge in Cerulean City causes you to land on a fence. This is being kept in, because it's funny. diff --git a/data/events/trades.asm b/data/events/trades.asm index e13fb91e..1fc412b5 100644 --- a/data/events/trades.asm +++ b/data/events/trades.asm @@ -20,7 +20,7 @@ TradeMons: db SANDSLASH, SANDSLASH_A, TRADE_DIALOGSET_REGION, "SANDSLASH@@" ; Celadon db RAICHU, RAICHU_A, TRADE_DIALOGSET_REGION, "RAICHU@@@@@" ; Saffron db MAROWAK, MAROWAK_A, TRADE_DIALOGSET_REGION, "MAROWAK@@@@" ; Fuschia - db MUK, MUK_A, TRADE_DIALOGSET_REGION, "MUK-A@@@@@@" ; Cinnabar + db MUK, MUK_A, TRADE_DIALOGSET_REGION, "MUK@@@@@@@@" ; Cinnabar db EXEGGUTOR, EXEGGUTOR_A, TRADE_DIALOGSET_REGION, "EXEGGUTOR@@" ; Indigo db TAUROS, TAUROS_P, TRADE_DIALOGSET_TAUROSC, "TAUROS@@@@@" ; S.S. Anne begins here db TAUROS, TAUROS_PA, TRADE_DIALOGSET_TAUROSA, "TAUROS@@@@@" diff --git a/data/maps/town_map_entries.asm b/data/maps/town_map_entries.asm index a87065b5..1af608f0 100644 --- a/data/maps/town_map_entries.asm +++ b/data/maps/town_map_entries.asm @@ -67,7 +67,7 @@ InternalMapEntries: internal_map MT_MOON_B2F, 6, 2, MountMoonName internal_map CERULEAN_MART, 10, 2, CeruleanCityName internal_map MT_MOON_POKECENTER, 5, 2, Route4Name - internal_map VIRIDIAN_PRE_GYM, 10, 2, ViridianCityName + internal_map VIRIDIAN_PRE_GYM, 2, 8, ViridianCityName internal_map DAYCARE, 10, 4, Route5Name internal_map UNDERGROUND_PATH_ROUTE_6, 10, 8, Route6Name internal_map CELESTE_HILL, 7, 9, CelesteHillName diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 49022da5..ca0ab9fb 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -1861,8 +1861,8 @@ AnimationWavyScreen: ld c, $ff ld hl, WavyScreenLineOffsets .loop - ; ld a, [hl] ; this fixes the wavy screen, but causes a bank overflow - ; ldh [hSCX], a + ld a, [hl] ; this fixes the wavy screen, but causes a bank overflow + ldh [hSCX], a push hl .innerLoop call WavyScreen_SetSCX @@ -1879,7 +1879,7 @@ AnimationWavyScreen: dec c jr nz, .loop xor a - ; ldh [hSCX], a ; also fixing the wavy screen + ldh [hSCX], a ; also fixing the wavy screen ldh [hWY], a call SaveScreenTilesToBuffer2 call ClearScreen diff --git a/maps/CinnabarVolcano.blk b/maps/CinnabarVolcano.blk index c4df20a2..ee63a5f5 100644 --- a/maps/CinnabarVolcano.blk +++ b/maps/CinnabarVolcano.blk @@ -1 +1 @@ -..............}vvvvvvvvvvvv}Qvvvvvvvvv}vvvvvvvvvvvvvvv45vvvvvvvv+67,vvvv8-%88vvNvvvvv vvvvR}vvvv vvv}N}vvv>vv}}}}Q}}}}}}QN \ No newline at end of file +..............}vvvvvvvvvvvv}Qvvvvvvvvv}vvvvvv3vvvvvvvvv45vvvvvvvv+67,vvvv8-%88vvNvvvvv vvvvR}vvvv vvv}N}vvv>vv}}}}Q}}}}}}QN \ No newline at end of file diff --git a/scripts/BattleTent.asm b/scripts/BattleTent.asm index 42f60344..851fb1da 100644 --- a/scripts/BattleTent.asm +++ b/scripts/BattleTent.asm @@ -820,13 +820,12 @@ BattleTentLetsGo: done BattleTentWon: - text "Wow! You finally" - line "did it!" + text "Congratulations!" para "You beat" line "@" text_decimal wBTStreakCnt, 1, 3 - text " oppenont(s)!" + text " opponent(s)!" prompt BattleTentLost: diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm index 26c00375..3bfacd4f 100644 --- a/scripts/SilphCo7F.asm +++ b/scripts/SilphCo7F.asm @@ -309,8 +309,8 @@ SilphCo7TrainerHeader3: SilphCo7Text1: ; lapras guy text_asm - ld a, [wd72e] - bit 0, a ; got lapras? + ld a, [wd72c] + bit 2, a jr z, .givelapras CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI jr nz, .savedsilph @@ -329,8 +329,8 @@ SilphCo7Text1: call EnableAutoTextBoxDrawing ld hl, .HeresYourLaprasText call PrintText - ld hl, wd72e - set 0, [hl] + ld hl, wd72c + set 2, [hl] jr .done .savedsilph ld hl, .LaprasGuySavedText diff --git a/text/CeruleanBadgeHouse.asm b/text/CeruleanBadgeHouse.asm index 9d701443..3618a2e4 100644 --- a/text/CeruleanBadgeHouse.asm +++ b/text/CeruleanBadgeHouse.asm @@ -3,9 +3,6 @@ _CeruleanHouse2Text_74e77:: line "are owned only by" cont "skilled trainers." - para "I see you have" - line "at least one." - para "Those BADGEs have" line "amazing secrets!" prompt @@ -34,15 +31,9 @@ _CeruleanHouse2Text_74e96:: prompt _CeruleanHouse2Text_74e9b:: - text "#MON up to L30" - line "will obey you." - - para "Any higher, they" - line "become unruly!" - - para "It also lets you" - line "use CUT outside" - cont "of battle." + text "It lets you use" + line "CUT outside of" + cont "battle." prompt _CeruleanHouse2Text_74ea0:: @@ -56,15 +47,9 @@ _CeruleanHouse2Text_74ea0:: prompt _CeruleanHouse2Text_74ea5:: - text "#MON up to L50" - line "will obey you." - - para "Any higher, they" - line "become unruly!" - - para "It also lets you" - line "use STRENGTH out-" - cont "side of battle." + text "It lets you use" + line "STRENGTH outside" + cont "of battle." prompt _CeruleanHouse2Text_74eaa:: @@ -78,11 +63,14 @@ _CeruleanHouse2Text_74eaa:: prompt _CeruleanHouse2Text_74eaf:: - text "#MON up to L70" - line "will obey you." + text "Hmm... I can't" + line "remember." - para "Any higher, they" - line "become unruly!" + para "Should you beat" + line "SABRINA's tough" + cont "PSYCHIC #MON," + cont "she may tell" + cont "you." prompt _CeruleanHouse2Text_74eb4:: @@ -92,6 +80,7 @@ _CeruleanHouse2Text_74eb4:: prompt _CeruleanHouse2Text_74eb9:: - text "All #MON will" - line "obey you!" + text "You'll be able to" + line "challenge the" + cont "#MON LEAGUE!" prompt diff --git a/text/CitrineCity.asm b/text/CitrineCity.asm index fc9d55f4..00fb9cd4 100644 --- a/text/CitrineCity.asm +++ b/text/CitrineCity.asm @@ -38,7 +38,7 @@ _CitrineCityCavern:: _CitrineCityDirections:: text "NORTH WEST:" - line "BATTLE TOWER" + line "BATTLE TENT" para "NORTH EAST:" line "CELESTE HILL" diff --git a/text/Daycare_2.asm b/text/Daycare_2.asm index 7efb200e..96c85a45 100644 --- a/text/Daycare_2.asm +++ b/text/Daycare_2.asm @@ -4,7 +4,7 @@ _DayCareAllRightThenText:: text_end _DayCareComeAgainText:: - text "come again." + text "Come again." done _DayCareNoRoomForMonText:: diff --git a/text/ViridianPreGym.asm b/text/ViridianPreGym.asm index ddd9fa6c..1d37ed78 100644 --- a/text/ViridianPreGym.asm +++ b/text/ViridianPreGym.asm @@ -36,7 +36,7 @@ _BeforeReceivedBottleCapText:: para "I won't give up!" line "I'll train with" - cont "my POKEMON until" + cont "my #MON until" cont "we're the best" cont "there is!" diff --git a/text/pokedex_ratings.asm b/text/pokedex_ratings.asm index a8f81ba7..9155cfc2 100644 --- a/text/pokedex_ratings.asm +++ b/text/pokedex_ratings.asm @@ -42,7 +42,7 @@ _DexRatingText_Own50To64:: done _DexRatingText_Own65To79:: - text "Ho! This is geting" + text "This is getting" line "even better!" done @@ -53,8 +53,8 @@ _DexRatingText_Own80To99:: done _DexRatingText_Own100To114:: - text "You finally got at" - line "least 100 species!" + text "You've finally got" + line "over 100 species!" cont "Great job!" done @@ -90,8 +90,8 @@ _DexRatingText_Own180To199:: done _DexRatingText_Own200To214:: - text "You finally got at" - line "least 200 species!" + text "You finally passed" + line "200 species!" cont "I can't believe" cont "how good you are!" done