Finish Chief, bug fixes

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.
This commit is contained in:
Llinos Evans 2023-07-27 14:39:24 +01:00
parent 5cf0a7930e
commit 47f2683d85
17 changed files with 162 additions and 46 deletions

View file

@ -1,2 +1,2 @@
map_header OaksLab, OAKS_LAB, DOJO, 0
map_header OaksLab, OAKS_LAB, GYM, 0
end_map_header

View file

@ -3,8 +3,8 @@ RedsHouse2F_Object:
def_warp_events
warp_event 7, 1, REDS_HOUSE_1F, 3
;warp_event 5, 1, SILPH_GAUNTLET_7F, 1 ; - Test Chief
warp_event 5, 1, SILPH_CO_11F, 2 ; - Test J&J, Omega, & Giovanni. To test the Omega refight, change to SHOW in hide/show data, and set warp ID to 1.
warp_event 5, 1, SILPH_GAUNTLET_7F, 1 ; - Test Chief
;warp_event 5, 1, SILPH_CO_11F, 2 ; - Test J&J, Omega, & Giovanni. To test the Omega refight, change to SHOW in hide/show data, and set warp ID to 1.
;warp_event 5, 1, ROCKET_HIDEOUT_B4F, 2 ; - Test Giovanni 1
;warp_event 5, 1, MT_MOON_SQUARE, 1 ; - Test Shop, NPCs, and Crater
;warp_event 5, 1, CELESTE_HILL, 1 ; - Test GMolt

View file

@ -10,6 +10,7 @@ SaffronCity_Object:
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

View file

@ -2,9 +2,12 @@ SilphGauntlet7F_Object:
db $d ; border block
def_warp_events
warp_event 5, 6, SAFFRON_CITY, 1
warp_event 5, 6, SAFFRON_CITY, 9
def_bg_events
bg_event 2, 2, 2 ; Chief's PC
bg_event 2, 0, 3 ; Chief's first painting
bg_event 8, 0, 4 ; Chief's second painting
def_object_events
object_event 5, 1, SPRITE_SILPH_PRESIDENT, STAY, DOWN, 1 ; person

View file

@ -24,7 +24,7 @@ Gym_Coll::
coll_tiles $11, $16, $19, $2b, $3c, $3d, $3f, $4a, $4c, $4d, $03
Forest_Coll::
coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $3a, $40, $51, $52, $5a, $5c, $5e, $5f, $00, $30
coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $3a, $40, $51, $52, $5a, $5c, $5e, $5f, $30
House_Coll::
coll_tiles $01, $12, $14, $28, $32, $37, $44, $54, $5c

View file

@ -1,7 +1,7 @@
VictoryRoad1FWildMons:
def_grass_wildmons 15 ; encounter rate
db 34, MACHOKE
db 36, RHYDON
db 36, STEELIX
db 32, GOLBAT
db 36, SANDSLASH
db 39, SANDSLASH

View file

@ -1,7 +1,7 @@
VictoryRoad2FWildMons:
def_grass_wildmons 10 ; encounter rate
db 32, MACHOKE
db 34, TRAMPEL
db 34, STEELIX
db 36, GOLBAT
db 36, SANDSLASH
db 39, SANDSLASH

View file

@ -1,7 +1,7 @@
VictoryRoad3FWildMons:
def_grass_wildmons 15 ; encounter rate
db 34, MACHOKE
db 36, TRAMPEL
db 36, STEELIX
db 32, GOLBAT
db 42, SANDSLASH
db 40, VENOMOTH