kep-hack/data/maps/objects/SaffronCity.asm
Martha Schilling c5eff723b1 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.
2023-07-21 19:35:23 +01:00

44 lines
1.8 KiB
NASM

SaffronCity_Object:
db $f ; border block
def_warp_events
warp_event 7, 5, COPYCATS_HOUSE_1F, 1
warp_event 26, 3, FIGHTING_DOJO, 1
warp_event 34, 3, SAFFRON_GYM, 1
warp_event 13, 11, SAFFRON_PIDGEY_HOUSE, 1
warp_event 25, 11, SAFFRON_MART, 1
warp_event 18, 21, SILPH_CO_1F, 1
warp_event 9, 29, SAFFRON_POKECENTER, 1
warp_event 29, 29, MR_PSYCHICS_HOUSE, 1
def_bg_events
bg_event 17, 5, 16 ; SaffronCityText16
bg_event 27, 5, 17 ; SaffronCityText17
bg_event 35, 5, 18 ; SaffronCityText18
bg_event 26, 11, 19 ; MartSignText
bg_event 39, 19, 20 ; SaffronCityText20
bg_event 5, 21, 21 ; SaffronCityText21
bg_event 15, 21, 22 ; SaffronCityText22
bg_event 10, 29, 23 ; PokeCenterSignText
bg_event 27, 29, 24 ; SaffronCityText24
bg_event 1, 19, 25 ; SaffronCityText25
def_object_events
object_event 7, 6, SPRITE_ROCKET, STAY, NONE, 1 ; person
object_event 20, 8, SPRITE_ROCKET, WALK, LEFT_RIGHT, 2 ; person
object_event 34, 4, SPRITE_ROCKET, STAY, NONE, 3 ; person
object_event 13, 12, SPRITE_ROCKET, STAY, NONE, 4 ; person
object_event 11, 25, SPRITE_ROCKET, WALK, LEFT_RIGHT, 5 ; person
object_event 32, 13, SPRITE_ROCKET, WALK, LEFT_RIGHT, 6 ; person
object_event 18, 30, SPRITE_ROCKET, WALK, LEFT_RIGHT, 7 ; person
object_event 8, 14, SPRITE_SCIENTIST, WALK, ANY_DIR, 8 ; person
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 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