This adds Route 50 to the game, as well as Jacky, albeit without the gate or house that you can warp to within.

I decided that the game house will be where Shinjuku Jacky hangs out this time! He'll battle the player and give them uhhh idfk you figure it out

Also I don't know what to call West City. It's a rather sea-blueish colour, sort of like duck egg blue. Sort of a Pacific Teal, right? I need another gay person to give colour ideas.
This commit is contained in:
Llinos Evans 2024-07-27 11:34:14 +01:00
parent b7099d8ee8
commit 7114109368
32 changed files with 286 additions and 42 deletions

View file

@ -777,8 +777,8 @@
const EVENT_BEAT_BEAUTY_JESSICA
const EVENT_BEAT_BEAUTY_RACHAEL
const EVENT_BEAT_BEAUTY_ANGELICA
const EVENT_BEAT_BEAUTY_KENDRA
const EVENT_BEAT_BEAUTY_VERONICA
; const EVENT_BEAT_BEAUTY_KENDRA
; const EVENT_BEAT_BEAUTY_VERONICA
const EVENT_BEAT_BEAUTY_JULIA
const EVENT_BEAT_BEAUTY_THERESA
const EVENT_BEAT_BEAUTY_VALERIE
@ -891,7 +891,7 @@
const EVENT_BEAT_LASS_DANA
const EVENT_BEAT_LASS_ELLEN
const EVENT_BEAT_LASS_CONNIE2
const EVENT_BEAT_LASS_CONNIE3
const EVENT_BEAT_LASS_LOWRI
const EVENT_BEAT_LASS_DANA2
const EVENT_BEAT_LASS_DANA3
const EVENT_BEAT_LASS_IKUE
@ -1061,6 +1061,8 @@
const EVENT_BEAT_YOUNGSTER_JIMMY
const EVENT_BEAT_YOUNGSTER_OWEN
const EVENT_BEAT_YOUNGSTER_JASON
const EVENT_BEAT_YOUNGSTER_LUC
const EVENT_BEAT_YOUNGSTER_HUW
; Teacher
const EVENT_BEAT_TEACHER_COLETTE
const EVENT_BEAT_TEACHER_HILLARY
@ -1119,7 +1121,8 @@
const EVENT_BEAT_ARCHER2
const EVENT_BEAT_ARCHER3
const EVENT_BEAT_PROFBLUE
; Unused: next 77 events
const EVENT_BEAT_JACKY
; Unused: next 76 events
const_next 1600
; Sprite visibility flags

View file

@ -133,6 +133,7 @@ DEF NIHON_LANDMARK EQU const_value
const LANDMARK_QUIET_CAVE
const LANDMARK_OLD_CITY
const LANDMARK_POKEMON_PAGODA
const LANDMARK_ROUTE_50
const LANDMARK_BLUE_FOREST
const LANDMARK_ROUTE_66
const LANDMARK_WHITE_CITY

View file

@ -654,6 +654,7 @@ ENDM
map_const POKEMON_PAGODA_3F, 5, 5 ; 10
map_const POKEMON_PAGODA_4F, 5, 5 ; 10
map_const POKEMON_PAGODA_5F, 3, 3 ; 10
map_const ROUTE_50, 15, 9 ; 10
endgroup
newgroup BLUE_FOREST ; 37

View file

@ -126,6 +126,8 @@ DEF KRIS EQU __trainer_class__
const JASON
const JOEY4
const JOEY5
const LUC
const HUW
trainerclass SCHOOLBOY ; 17
const JACK1
@ -192,7 +194,7 @@ DEF KRIS EQU __trainer_class__
const DANA1
const ELLEN
const CONNIE2 ; unused
const CONNIE3 ; unused
const LOWRI ; previously CONNIE3
const DANA2
const DANA3
const DANA4
@ -259,8 +261,8 @@ DEF KRIS EQU __trainer_class__
const JESSICA ; unused
const RACHAEL ; unused
const ANGELICA ; unused
const KENDRA ; unused
const VERONICA ; unused
; const KENDRA ; unused
; const VERONICA ; unused
const JULIA
const THERESA
const VALERIE
@ -809,6 +811,9 @@ DEF KRIS EQU __trainer_class__
trainerclass ELDER
const LI
const KONG
trainerclass JACK
const JACKY
DEF TOPAZ EQU __trainer_class__
DEF NUM_TRAINER_CLASSES EQU __trainer_class__ - 1