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/engine/overworld/missable_objects.asm b/engine/overworld/missable_objects.asm index 8f88b138..d232780d 100644 --- a/engine/overworld/missable_objects.asm +++ b/engine/overworld/missable_objects.asm @@ -142,8 +142,21 @@ HideObject: ld c, a ld b, FLAG_SET call MissableObjectFlagAction ; set "removed" flag + call VerifyObjectState + jr z, HideObject jp UpdateSprites +;returns z flag set if shown and z flag cleared if hidden +VerifyObjectState: + ld hl, wMissableObjectFlags + ld a, [wMissableObjectIndex] + ld c, a + ld b, FLAG_TEST + call MissableObjectFlagAction + ld a, c + and a + ret + MissableObjectFlagAction: ; identical to FlagAction diff --git a/home/overworld.asm b/home/overworld.asm index 604c1d37..93c77f74 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -2087,7 +2087,12 @@ LoadMapHeader:: ld [wCurMapTileset], a ldh [hPreviousTileset], a bit 7, b - ret nz + + ;replace the conditional return with a nop in order to always load the map header data... + ;...even when selecting CONTINUE from the main menu +; ret nz + nop + ld hl, MapHeaderPointers ld a, [wCurMap] sla a 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/BrunswickTrail.asm b/scripts/BrunswickTrail.asm index 84deb796..34aa9e79 100644 --- a/scripts/BrunswickTrail.asm +++ b/scripts/BrunswickTrail.asm @@ -11,7 +11,8 @@ BrunswickTrail_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle - + dw HideCactus + BrunswickTrail_TextPointers: dw FakeTreeEvent dw BrunswickTrainer1 @@ -139,7 +140,13 @@ FakeTreeEvent: ld hl, CactusTrainerHeader call TalkToTrainer - jp TextScriptEnd ; I have tried a lot of things and it's not disappearing AAA + +;let's try a separate map script as a backup in case cactormous does not disappear like other static wild pokemon. + ld a, 3 + ld [wBrunswickTrailCurScript], a + ld [wCurMapScript], a + +; jp TextScriptEnd ; I have tried a lot of things and it's not disappearing AAA ;.NoCut ; ld hl, FakeTreeNoCut ; Why do you have to be this way? I scream, for I do not know. ; call PrintText @@ -154,6 +161,19 @@ CactusBattleText: call PlayCry call WaitForSoundToFinish jp TextScriptEnd + +HideCactus: +;this runs after the cactormous battle to make sure it gets hidden + ld a, HS_CACTUS + ld [wMissableObjectIndex], a + predef HideObject + call UpdateSprites + call Delay3 + xor a + ld [wBrunswickTrailCurScript], a + ld [wCurMapScript], a + ret + GZapFound: text_asm 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/SilphGauntlet2F.asm b/text/SilphGauntlet2F.asm index 5b04bf25..27ab1e51 100644 --- a/text/SilphGauntlet2F.asm +++ b/text/SilphGauntlet2F.asm @@ -75,8 +75,8 @@ _SilphGauntlet2FAfterBattleText4:: para "I could never have" line "expected to see" - cont "#MON like yours," - cont "though!" + cont "#MON like" + cont "yours, though!" done _SilphGauntlet2FBattleText5:: @@ -121,4 +121,4 @@ _SilphGauntlet2FAfterBattleText6:: line "and you will" cont "surely succeed." done - \ No newline at end of file + diff --git a/text/SilphGauntlet3F.asm b/text/SilphGauntlet3F.asm index 1eaad982..4b1ba360 100644 --- a/text/SilphGauntlet3F.asm +++ b/text/SilphGauntlet3F.asm @@ -95,7 +95,7 @@ _SilphGauntlet3FAfterBattleText5:: line "here stinks!" para "Where's all the" - cont "rock 'n' roll?!" + line "rock 'n' roll?!" done _SilphGauntlet3FBattleText6:: @@ -117,4 +117,4 @@ _SilphGauntlet3FAfterBattleText6:: cont "fishing gear?!" done - \ No newline at end of file + diff --git a/text/SilphGauntlet5F.asm b/text/SilphGauntlet5F.asm index 5b563fe1..42182045 100644 --- a/text/SilphGauntlet5F.asm +++ b/text/SilphGauntlet5F.asm @@ -87,7 +87,7 @@ _SilphGauntlet5FAfterBattleText5:: text "Huh? Yeah! We" line "used our whips!" - para "...hey, what's" + para "...Hey, what's" line "with that stare?" done @@ -134,4 +134,4 @@ _SilphGauntlet5FAfterBattleText7:: line "classic for a" cont "reason..." done - \ No newline at end of file + diff --git a/text/SilphGauntlet7F.asm b/text/SilphGauntlet7F.asm index 29f74095..c112a7e9 100644 --- a/text/SilphGauntlet7F.asm +++ b/text/SilphGauntlet7F.asm @@ -13,7 +13,7 @@ _ChiefMonologue:: prompt _ChiefMonologueMasterBallNotUsed:: - text "You're looking for" + text "You're looking" line "for the ultimate" cont "#MON, aren't" cont "you?" @@ -38,7 +38,7 @@ _ChiefMonologueMasterBallNotUsed:: done _ChiefMonologueMasterBallUsed:: - text "You're looking for" + text "You're looking" line "for the ultimate" cont "#MON, aren't" cont "you?" @@ -52,7 +52,7 @@ _ChiefMonologueMasterBallUsed:: cont "our company is" cont "going under!" - para "...what? You used" + para "...What? You used" line "the MASTER BALL?!" para "You stupid child!" @@ -93,8 +93,8 @@ _ChiefMonologueMasterBallNotCollected:: done _ChiefDefeatedText:: - text "No! I..." - line "I..." + text "No!" + line "I... I..." prompt _ChiefVictoryText:: @@ -144,7 +144,7 @@ _ChiefAltAfterBattleText:: line "be as powerful as" cont "I want, but what" cont "I do with that" - cont "power...is very" + cont "power... is very" cont "important." para "I still have much" 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