mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-09-16 18:30:50 +12:00
47f2683d85
This finishes Chief's event, with all the necessary components for the post-game Mewtwo fight sorted as well. I added an event the Master Ball sets for modular monologue text, for improved immersion. I have also fixed some bugs; - Fixed the oft-reported walking in trees bug in the Forest tileset. - Fixed the Oak's lab computer issue by just...removing the computer. I made the map symmetrical instead, feels a lot better to look at, at least for me. I think it was meant to have an event on it or something, but I couldn't find anything, felt like I was being gaslit. - Hopefully fixed the issue with the border blocks going weird after saving and resetting, by making the tileset directly point to the gym one, which Oak is meant to use. I am not sure how that glitch happened for ViWalls. - Fixed the Viridian Pre-Gym text scrolling issue. I still cannot replicate the crash bugs that some people have been experiencing and don't see anything that could be causing it. I also changed Trampel in Victory Road to Steelix, as mentioned by Gogocrafter.
45 lines
1.9 KiB
NASM
45 lines
1.9 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
|
|
warp_event 18, 22, SILPH_GAUNTLET_7F, 1 ; Not actually usable. Used as a target for the warp in the gauntlet.
|
|
|
|
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
|