A few bug fixes

- Fixed a bug where attempting to Fly on Celeste Hill caused a huge memory corruption effect. Oops.

- Fixed text issues on Route 1 and Museum 2F

- Tidied up trainer parties a little more
This commit is contained in:
Martha Schilling 2023-07-12 14:16:41 +01:00
parent 85e1701879
commit 0852d5f725
15 changed files with 106 additions and 86 deletions

View file

@ -1,5 +1,5 @@
BrunswickGrotto_Object:
db $0 ; border block
db $3 ; border block
def_warp_events
warp_event 24, 23, BRUNSWICK_TRAIL, 2

View file

@ -4,7 +4,7 @@ CelesteHillCave_Object:
def_warp_events
warp_event 18, 35, CELESTE_HILL_OUTSIDE, 3
warp_event 19, 35, CELESTE_HILL_OUTSIDE, 3
warp_event 19, 25, CELESTE_HILL_CAVE, 4
warp_event 19, 23, CELESTE_HILL_CAVE, 4
warp_event 2, 16, CELESTE_HILL_CAVE, 3
warp_event 37, 13, CELESTE_HILL_OUTSIDE, 4
warp_event 5, 3, CELESTE_HILL_OUTSIDE, 5

View file

@ -5,8 +5,8 @@ Museum2F_Object:
warp_event 7, 7, MUSEUM_1F, 5
def_bg_events
bg_event 11, 2, 6 ; Museum2FText6
bg_event 2, 5, 7 ; Museum2FText7
bg_event 11, 2, 7 ; Museum2FText6
bg_event 2, 5, 8 ; Museum2FText7
def_object_events
object_event 1, 7, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person
@ -14,6 +14,6 @@ Museum2F_Object:
object_event 7, 5, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person
object_event 11, 5, SPRITE_BRUNETTE_GIRL, STAY, NONE, 4 ; person
object_event 12, 5, SPRITE_HIKER, STAY, DOWN, 5 ; person
object_event 12, 3, SPRITE_SCIENTIST, STAY, UP, 8 ; person
object_event 12, 3, SPRITE_SCIENTIST, STAY, UP, 6 ; person
def_warps_to MUSEUM_2F

View file

@ -4,12 +4,12 @@ Route1_Object:
def_warp_events
def_bg_events
bg_event 9, 27, 3 ; Route1Text3
bg_event 9, 27, 4 ; Route1Text3
def_object_events
object_event 5, 24, SPRITE_YOUNGSTER, WALK, UP_DOWN, 1 ; person
object_event 15, 13, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 2 ; person
object_event 10, 25, SPRITE_OAK, STAY, RIGHT, 4 ; oak
object_event 10, 25, SPRITE_OAK, STAY, RIGHT, 3 ; oak
def_warps_to ROUTE_1