Vermilion Beauty Bug Fixes & more

- Vermilion Beauty no longer skips text to hand you your Pokemon
- Vermilion City text boxes are fixed
- Cancelling TMs and causing crashes when trying different ones is fixed (thanks to some old code by BlueZangoose, it was a vanilla bug!)
- Minor enhancement to the Candy Jar that seems to make Meltan more stable.
- Fixed a fallthrough error that caused Mewtwo's theme to play for every wild encounter (very cool, but also oops)
This commit is contained in:
Llinos Evans 2023-06-22 18:54:25 +01:00
parent c445892d7f
commit 9a24ec74d8
6 changed files with 29 additions and 23 deletions

View file

@ -14,13 +14,13 @@ VermilionCity_Object:
warp_event 11, 31, FARAWAY_ISLAND_OUTSIDE, 1
def_bg_events
bg_event 27, 3, 7 ; VermilionCityText7
bg_event 37, 13, 8 ; VermilionCityText8
bg_event 24, 13, 9 ; MartSignText
bg_event 12, 3, 10 ; PokeCenterSignText
bg_event 7, 13, 11 ; VermilionCityText11
bg_event 7, 19, 12 ; VermilionCityText12
bg_event 29, 15, 13 ; VermilionCityText13
bg_event 27, 3, 9 ; VermilionCityText7
bg_event 37, 13, 10 ; VermilionCityText8
bg_event 24, 13, 11 ; MartSignText
bg_event 12, 3, 12 ; PokeCenterSignText
bg_event 7, 13, 13 ; VermilionCityText11
bg_event 7, 19, 14 ; VermilionCityText12
bg_event 29, 15, 15 ; VermilionCityText13
def_object_events
object_event 19, 7, SPRITE_BEAUTY, WALK, LEFT_RIGHT, 1 ; person
@ -29,7 +29,7 @@ VermilionCity_Object:
object_event 30, 7, SPRITE_GAMBLER, STAY, NONE, 4 ; person
object_event 29, 9, SPRITE_MONSTER, WALK, UP_DOWN, 5 ; person
object_event 25, 27, SPRITE_SAILOR, WALK, LEFT_RIGHT, 6 ; person
object_event 31, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 14 ; person
object_event 12, 13, SPRITE_BEAUTY, STAY, DOWN, 15 ; person
object_event 31, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 7 ; person
object_event 12, 13, SPRITE_BEAUTY, STAY, DOWN, 8 ; person
def_warps_to VERMILION_CITY