A couple of bug fixes

More still need to be done but I'm separating the commits so I don't get overwhelmed lol

- Fixes a bug with the Up-Grade NPC in Saffron. He now properly shows up only after defeating Giovanni.

- Fixes a bug where Silph could be entered before receiving the Poke Flute.

- Silph Gauntlet 5F has a complete remodel, more closely matching the original map found in the leaks.

- One of the Fuchsia Gym Trainers no longer uses a repeat Arbok.

- Wiglett and Wugtrio could learn Rock Slide via TM, which has now been fixed.

- Jacky uses a Porygon in place of Machop, as it ties into his polygonal, Virtua Fighter-inspired sprite.

- Chief uses a Gengar instead of Porygon2 to represent the Silph Scope.

- Omega's and Giovanni 2's levels have been toned down slightly.

- Lance now uses Crocky over Aerodactyl.

- Yujirou's non-initial teams have had their levels reduced to be the same level as the previously-fought Gym Leader, rather than the upcoming one.

- Updated README with additional credits.
This commit is contained in:
Martha Schilling 2023-07-21 19:35:23 +01:00
parent 8cd8f1ded0
commit c5eff723b1
16 changed files with 67 additions and 77 deletions

View file

@ -35,10 +35,9 @@ SaffronCity_Object:
object_event 23, 23, SPRITE_SILPH_WORKER, STAY, NONE, 9 ; person
object_event 17, 30, SPRITE_ERIKA, WALK, LEFT_RIGHT, 10 ; person
object_event 30, 12, SPRITE_GENTLEMAN, STAY, DOWN, 11 ; person
;object_event 31, 12, SPRITE_BIRD, STAY, DOWN, 12 ; person - removed due to sprite limit
object_event 18, 8, SPRITE_ROCKER, STAY, UP, 13 ; person
object_event 18, 22, SPRITE_ROCKET, STAY, DOWN, 14 ; person
object_event 19, 22, SPRITE_ROCKET, STAY, DOWN, 15 ; person
object_event 5, 30, SPRITE_SILPH_WORKER, STAY, DOWN, 26 ; Up-Grade NPC, hidden until Giovanni is beaten
object_event 18, 8, SPRITE_ROCKER, STAY, UP, 12 ; person
object_event 18, 22, SPRITE_ROCKET, STAY, DOWN, 13 ; person
object_event 19, 22, SPRITE_ROCKET, STAY, DOWN, 14 ; person
object_event 5, 30, SPRITE_SILPH_WORKER, STAY, DOWN, 15 ; Up-Grade NPC
def_warps_to SAFFRON_CITY

View file

@ -16,7 +16,7 @@ SilphCo11F_Object:
object_event 2, 8, SPRITE_JAMES, STAY, UP, 4
object_event 3, 16, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 41
object_event 3, 8, SPRITE_JESSIE, STAY, UP, 6
object_event 6, 11, SPRITE_MONSTER, STAY, UP, 11, OMEGA, 45 | OW_POKEMON
object_event 15, 15, SPRITE_MONSTER, STAY, UP, 12, OMEGA, 75 | OW_POKEMON
object_event 6, 11, SPRITE_MONSTER, STAY, UP, 11, OMEGA, 40 | OW_POKEMON
object_event 15, 15, SPRITE_MONSTER, STAY, UP, 12, OMEGA, 65 | OW_POKEMON
def_warps_to SILPH_CO_11F

View file

@ -2,18 +2,18 @@ SilphGauntlet5F_Object:
db $0 ; border block
def_warp_events
warp_event 2, 15, SILPH_GAUNTLET_4F, 2
warp_event 2, 3, SILPH_GAUNTLET_6F, 1
warp_event 8, 9, SILPH_GAUNTLET_4F, 2
warp_event 8, 3, SILPH_GAUNTLET_6F, 1
def_bg_events
def_object_events
object_event 1, 10, SPRITE_ROCKER, STAY, RIGHT, 1, OPP_JUGGLER, 6
object_event 6, 6, SPRITE_BIKER, STAY, DOWN, 2, OPP_BIKER, 16
object_event 6, 15, SPRITE_GAMBLER, STAY, RIGHT, 3, OPP_CUE_BALL, 10
object_event 14, 10, SPRITE_SWIMMER, STAY, RIGHT, 4, OPP_SWIMMER, 16
object_event 14, 2, SPRITE_ROCKER, STAY, DOWN, 5, OPP_TAMER, 6
object_event 4, 2, SPRITE_COOLTRAINER_M, STAY, DOWN, 6, OPP_COOLTRAINER_M, 4
object_event 9, 5, SPRITE_COOLTRAINER_F, STAY, UP, 7, OPP_COOLTRAINER_F, 4
object_event 11, 6, SPRITE_ROCKER, STAY, LEFT, 1, OPP_JUGGLER, 6
object_event 4, 12, SPRITE_BIKER, STAY, LEFT, 2, OPP_BIKER, 16
object_event 16, 14, SPRITE_GAMBLER, STAY, RIGHT, 3, OPP_CUE_BALL, 10
object_event 9, 14, SPRITE_SWIMMER, STAY, DOWN, 4, OPP_SWIMMER, 16
object_event 3, 14, SPRITE_ROCKER, STAY, DOWN, 5, OPP_TAMER, 6
object_event 3, 5, SPRITE_COOLTRAINER_M, STAY, LEFT, 6, OPP_COOLTRAINER_M, 4
object_event 1, 9, SPRITE_COOLTRAINER_F, STAY, RIGHT, 7, OPP_COOLTRAINER_F, 4
def_warps_to SILPH_GAUNTLET_5F

View file

@ -2,8 +2,8 @@ ViridianPreGym_Object:
db $0 ; border block
def_warp_events
warp_event 5, 13, LAST_MAP, 7
warp_event 4, 13, LAST_MAP, 7
warp_event 5, 13, LAST_MAP, 7
def_bg_events
bg_event 2, 7, 5 ; League poster