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

View file

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

View file

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

View file

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

View file

@ -375,17 +375,6 @@ ENDM
connection north, Route10North, ROUTE_10_NORTH, 0 connection north, Route10North, ROUTE_10_NORTH, 0
connection south, LavenderTown, LAVENDER_TOWN, 0 connection south, LavenderTown, LAVENDER_TOWN, 0
map_attributes SilentHills, SILENT_HILLS, $05, EAST | WEST ; Add Prince connections later
connection west, Route49, ROUTE_49, 0
connection east, Route66, ROUTE_66, 0
map_attributes Route49, ROUTE_49, $05, EAST | WEST
connection east, SilentHills, SILENT_HILLS, $00, 0
connection west, Route49_2, ROUTE_49_2, $05, 0
map_attributes Route49_2, ROUTE_49_2, $05, 0, EAST
connection east, Route49, ROUTE_49, $05, 0
map_attributes Route23, ROUTE_23, $0f, 0 map_attributes Route23, ROUTE_23, $0f, 0
map_attributes SproutTower1F, SPROUT_TOWER_1F, $00, 0 map_attributes SproutTower1F, SPROUT_TOWER_1F, $00, 0
map_attributes SproutTower2F, SPROUT_TOWER_2F, $00, 0 map_attributes SproutTower2F, SPROUT_TOWER_2F, $00, 0
@ -815,10 +804,21 @@ ENDM
map_attributes WinnersPathOutside, WINNERS_PATH_OUTSIDE, $05, NORTH map_attributes WinnersPathOutside, WINNERS_PATH_OUTSIDE, $05, NORTH
connection north, Route66, ROUTE_66, 0 connection north, Route66, ROUTE_66, 0
map_attributes SilentHills, SILENT_HILLS, $05, EAST | WEST ; Add Prince connections later
connection west, Route49, ROUTE_49, 0
connection east, Route66, ROUTE_66, 0
map_attributes Route49, ROUTE_49, $05, EAST | WEST
connection east, SilentHills, SILENT_HILLS, $00, 0
connection west, Route49_2, ROUTE_49_2, $05, 0
map_attributes Route49_2, ROUTE_49_2, $05, 0, EAST
connection east, Route49, ROUTE_49, $05, 0
map_attributes Route66, ROUTE_66, $05, WEST | SOUTH map_attributes Route66, ROUTE_66, $05, WEST | SOUTH
connection south, WinnersPathOutside, WINNERS_PATH_OUTSIDE, 0 connection south, WinnersPathOutside, WINNERS_PATH_OUTSIDE, 0
connection west, SilentHills, SILENT_HILLS, 0 connection west, SilentHills, SILENT_HILLS, 0
map_attributes QuietCave, QUIET_CAVE, $76, 0 map_attributes QuietCave, QUIET_CAVE, $76, 0
map_attributes BlueLab, BLUE_LAB, $00, 0 map_attributes BlueLab, BLUE_LAB, $00, 0
map_attributes SilentHillsPokecenter1F, SILENT_HILLS_POKECENTER_1F, $00, 0 map_attributes SilentHillsPokecenter1F, SILENT_HILLS_POKECENTER_1F, $00, 0
@ -826,7 +826,11 @@ ENDM
map_attributes CalsHouse1F, CALS_HOUSE_1F, $00, 0 map_attributes CalsHouse1F, CALS_HOUSE_1F, $00, 0
map_attributes CalsHouse2F, CALS_HOUSE_2F, $00, 0 map_attributes CalsHouse2F, CALS_HOUSE_2F, $00, 0
map_attributes OldCity, OLD_CITY, $00, 0 ; will have a west exit. map_attributes OldCity, OLD_CITY, $00, WEST
connection west, Route50, ROUTE_50, 4
map_attributes Route50, ROUTE_50, $00, EAST
connection east, OldCity, OLD_CITY, -4
map_attributes Route49OldCityGate1F, ROUTE_49_OLD_CITY_GATE_1F, $00, 0 map_attributes Route49OldCityGate1F, ROUTE_49_OLD_CITY_GATE_1F, $00, 0
map_attributes Route49OldCityGate2F, ROUTE_49_OLD_CITY_GATE_2F, $00, 0 map_attributes Route49OldCityGate2F, ROUTE_49_OLD_CITY_GATE_2F, $00, 0

View file

@ -1273,3 +1273,6 @@ PokemonPagoda4F_Blocks:
PokemonPagoda5F_Blocks: PokemonPagoda5F_Blocks:
INCBIN "maps/PokemonPagoda5F.ablk" INCBIN "maps/PokemonPagoda5F.ablk"
Route50_Blocks:
INCBIN "maps/Route50.ablk"

View file

@ -137,6 +137,7 @@ Landmarks:
landmark 76, 108, QuietCaveName landmark 76, 108, QuietCaveName
landmark 76, 100, OldCityName landmark 76, 100, OldCityName
landmark 76, 100, PokemonPagodaName landmark 76, 100, PokemonPagodaName
landmark 60, 100, Route50Name
landmark 140, 60, BlueForestName landmark 140, 60, BlueForestName
landmark 108, 108, Route66Name landmark 108, 108, Route66Name
landmark 124, 108, WhiteCityName landmark 124, 108, WhiteCityName
@ -250,6 +251,7 @@ SilentHillsName: db "SILENT¯HILLS@"
UnknownName: db "?????@" UnknownName: db "?????@"
Route66Name: db "ROUTE 66@" Route66Name: db "ROUTE 66@"
Route49Name: db "ROUTE 49@" Route49Name: db "ROUTE 49@"
Route50Name: db "ROUTE 50@"
QuietCaveName: db "QUIET¯CAVE@" QuietCaveName: db "QUIET¯CAVE@"
OldCityName: db "SEPIA¯CITY@" OldCityName: db "SEPIA¯CITY@"
PokemonPagodaName: db "#MON¯PAGODA@" PokemonPagodaName: db "#MON¯PAGODA@"

View file

@ -714,6 +714,7 @@ MapGroup_OldCity:
map PokemonPagoda3F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE map PokemonPagoda3F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE
map PokemonPagoda4F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE map PokemonPagoda4F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE
map PokemonPagoda5F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE map PokemonPagoda5F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE
map Route50, TILESET_NIHON_OLD, ROUTE, LANDMARK_ROUTE_50, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_NONE
assert_table_length NUM_OLD_CITY_MAPS assert_table_length NUM_OLD_CITY_MAPS
MapGroup_BlueForest: MapGroup_BlueForest:

View file

@ -741,7 +741,7 @@ OldCityGroupSprites:
db SPRITE_TWIN db SPRITE_TWIN
db SPRITE_BUG_CATCHER db SPRITE_BUG_CATCHER
db SPRITE_YOUNGSTER db SPRITE_YOUNGSTER
db SPRITE_BEAUTY db SPRITE_SPACEWORLD_GIRL
db SPRITE_SUPER_NERD db SPRITE_SUPER_NERD
db SPRITE_GRANNY db SPRITE_GRANNY
db SPRITE_MONSTER db SPRITE_MONSTER

View file

@ -600,6 +600,7 @@ INCLUDE "maps/LavenderCryptSet1.asm"
INCLUDE "maps/LavenderCryptSet2.asm" INCLUDE "maps/LavenderCryptSet2.asm"
INCLUDE "maps/LavenderCryptSet3.asm" INCLUDE "maps/LavenderCryptSet3.asm"
INCLUDE "maps/LavenderCryptDokuroarsRoom.asm" INCLUDE "maps/LavenderCryptDokuroarsRoom.asm"
INCLUDE "maps/Route50.asm"
SECTION "Map Scripts 31", ROMX ; spillover SECTION "Map Scripts 31", ROMX ; spillover
INCLUDE "maps/TanobyRuins.asm" INCLUDE "maps/TanobyRuins.asm"

View file

@ -64,3 +64,10 @@
tilecoll WALL, WALL, WALL, WALL ; 3f tilecoll WALL, WALL, WALL, WALL ; 3f
tilecoll WALL, WALL, FLOOR, WALL ; 40 tilecoll WALL, WALL, FLOOR, WALL ; 40
tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 41 tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 41
tilecoll FLOOR, WALL, FLOOR, WALL ; 42
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 43
tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 44
tilecoll WALL, DOOR, WALL, FLOOR ; 45
tilecoll WALL, WALL, FLOOR, FLOOR ; 46
tilecoll WALL, WALL, DOOR, WALL ; 47
tilecoll WALL, WALL, WALL, WALL ; 48

View file

@ -555,4 +555,10 @@ TrainerClassAttributes:
dw AI_BASIC | AI_SETUP | AI_TYPES | AI_CAUTIOUS | AI_STATUS | AI_RISKY dw AI_BASIC | AI_SETUP | AI_TYPES | AI_CAUTIOUS | AI_STATUS | AI_RISKY
dw CONTEXT_USE | SWITCH_SOMETIMES dw CONTEXT_USE | SWITCH_SOMETIMES
; Jack
db NO_ITEM, NO_ITEM ; items
db 10 ; base reward
dw AI_BASIC | AI_SETUP | AI_TYPES | AI_CAUTIOUS | AI_STATUS | AI_RISKY
dw CONTEXT_USE | SWITCH_SOMETIMES
assert_table_length NUM_TRAINER_CLASSES assert_table_length NUM_TRAINER_CLASSES

View file

@ -93,4 +93,5 @@ TrainerClassNames::
li "EXECUTIVE" li "EXECUTIVE"
li "PROFESSOR" li "PROFESSOR"
li "ELDER" li "ELDER"
li "SHINJUKU" ; JACK
assert_list_length NUM_TRAINER_CLASSES assert_list_length NUM_TRAINER_CLASSES

View file

@ -94,4 +94,5 @@ TrainerClassDVs:
dn 13, 12, 13, 13 ; ARCHER dn 13, 12, 13, 13 ; ARCHER
dn 13, 12, 13, 13 ; PROF.BLUE dn 13, 12, 13, 13 ; PROF.BLUE
dn 12, 15, 13, 13 ; ELDER (HP Ground) dn 12, 15, 13, 13 ; ELDER (HP Ground)
dn 12, 15, 13, 13 ; JACK (HP Ground)
assert_table_length NUM_TRAINER_CLASSES assert_table_length NUM_TRAINER_CLASSES

View file

@ -96,4 +96,5 @@ TrainerEncounterMusic::
db MUSIC_ROCKET_ENCOUNTER ; ARCHER db MUSIC_ROCKET_ENCOUNTER ; ARCHER
db MUSIC_OFFICER_ENCOUNTER ; PROF.BLUE db MUSIC_OFFICER_ENCOUNTER ; PROF.BLUE
db MUSIC_SAGE_ENCOUNTER ; ELDER db MUSIC_SAGE_ENCOUNTER ; ELDER
db MUSIC_HIKER_ENCOUNTER ; JACK
assert_table_length NUM_TRAINER_CLASSES + 1 assert_table_length NUM_TRAINER_CLASSES + 1

View file

@ -37,6 +37,7 @@ MaleTrainers:
db SPORTSMAN db SPORTSMAN
db AEROFOSSIL db AEROFOSSIL
db ELDER db ELDER
db JACK
.End .End
FemaleTrainers: FemaleTrainers:

View file

@ -95,4 +95,5 @@ BTTrainerClassGenders:
db FEMALE ; ARCHER db FEMALE ; ARCHER
db MALE ; PROF.BLUE db MALE ; PROF.BLUE
db MALE ; ELDER db MALE ; ELDER
db MALE ; JACK
assert_table_length NUM_TRAINER_CLASSES assert_table_length NUM_TRAINER_CLASSES

View file

@ -101,7 +101,8 @@ INCBIN "gfx/trainers/kurt.gbcpal", middle_colors
INCBIN "gfx/trainers/ariana.gbcpal", middle_colors INCBIN "gfx/trainers/ariana.gbcpal", middle_colors
INCBIN "gfx/trainers/archer.gbcpal", middle_colors INCBIN "gfx/trainers/archer.gbcpal", middle_colors
INCBIN "gfx/trainers/blue_professor.gbcpal", middle_colors INCBIN "gfx/trainers/blue_professor.gbcpal", middle_colors
INCBIN "gfx/trainers/elder.gbcpal", middle_colors ; elder INCBIN "gfx/trainers/elder.gbcpal", middle_colors
INCBIN "gfx/trainers/jack.gbcpal", middle_colors
EnbyPalette: EnbyPalette:
INCLUDE "gfx/player/topaz.pal" INCLUDE "gfx/player/topaz.pal"

View file

@ -936,6 +936,26 @@ YoungsterGroup:
dw HYPER_BEAM, QUICK_ATTACK, HYPER_FANG, PURSUIT dw HYPER_BEAM, QUICK_ATTACK, HYPER_FANG, PURSUIT
db -1 ; end db -1 ; end
next_list_item ; YOUNGSTER (14)
db "LUC@", TRAINERTYPE_MOVES
db 45
dw ARIADOS
dw SLUDGE_BOMB, PSYCHIC_M, PURSUIT, AGILITY
db 45
dw RATICATE
dw HYPER_FANG, QUICK_ATTACK, SUPER_FANG, SHADOW_BALL
db -1 ; end
next_list_item ; YOUNGSTER (14)
db "HUW@", TRAINERTYPE_MOVES
db 45
dw SANDSLASH
dw SWORDS_DANCE, EARTHQUAKE, ROCK_SLIDE, METAL_CLAW
db 45
dw QUAGSIRE
dw EARTHQUAKE, SURF, HEADBUTT, AMNESIA
db -1 ; end
end_list_items end_list_items
SECTION "Enemy Trainer Parties 2", ROMX SECTION "Enemy Trainer Parties 2", ROMX
@ -1903,17 +1923,17 @@ BeautyGroup:
dw SENTRET dw SENTRET
db -1 ; end db -1 ; end
next_list_item ; BEAUTY (12) ; next_list_item ; BEAUTY (12)
db "KENDRA@", TRAINERTYPE_NORMAL ; db "KENDRA@", TRAINERTYPE_NORMAL
db 15 ; db 15
dw SENTRET ; dw SENTRET
db -1 ; end ; db -1 ; end
next_list_item ; BEAUTY (13) ; next_list_item ; BEAUTY (13)
db "VERONICA@", TRAINERTYPE_NORMAL ; db "VERONICA@", TRAINERTYPE_NORMAL
db 15 ; db 15
dw SENTRET ; dw SENTRET
db -1 ; end ; db -1 ; end
next_list_item ; BEAUTY (14) next_list_item ; BEAUTY (14)
db "JULIA@", TRAINERTYPE_NORMAL db "JULIA@", TRAINERTYPE_NORMAL

View file

@ -216,10 +216,12 @@ LassGroup:
dw MARILL dw MARILL
db -1 ; end db -1 ; end
next_list_item ; LASS (13) next_list_item ; LASS (13) - originally Connie 3
db "CONNIE@", TRAINERTYPE_NORMAL db "LOWRI@", TRAINERTYPE_NORMAL
db 21 db 45
dw MARILL dw BELLEDAM
db 45
dw RAITORA
db -1 ; end db -1 ; end
next_list_item ; LASS (14) next_list_item ; LASS (14)
@ -701,6 +703,24 @@ ElderGroup:
db -1 ; end db -1 ; end
end_list_items end_list_items
JackGroup:
next_list_item
db "JACKY@", TRAINERTYPE_MOVES
db 50
dw AMANOBI ; Kage-Maru
dw METAL_CLAW, SPIKES, FIRE_SPIN, PETAL_DANCE
db 50
dw ANNIHILAPE
dw CROSS_CHOP, ROCK_HEAD, MEDITATE, HEADBUTT
db 50
dw PORYGON_Z
dw LOCK_ON, ZAP_CANNON, RECOVER, TRI_ATTACK
db 50
dw HITMONCHAN
dw MACH_PUNCH, COUNTER, DETECT, HI_JUMP_KICK
db -1 ; end
end_list_items
; No rematches here, just a lot of unused dupes. ; No rematches here, just a lot of unused dupes.
; Potential alt usage? rename a few? ; Potential alt usage? rename a few?
; See spreadsheet for combinations. ; See spreadsheet for combinations.

View file

@ -95,4 +95,5 @@ TrainerGroups:
dba ArcherGroup dba ArcherGroup
dba ProfBlueGroup dba ProfBlueGroup
dba ElderGroup dba ElderGroup
dba JackGroup
assert_table_length NUM_TRAINER_CLASSES assert_table_length NUM_TRAINER_CLASSES

View file

@ -95,4 +95,5 @@ TrainerPicPointers::
dba ArcherPic dba ArcherPic
dba ProfBluePic dba ProfBluePic
dba ElderPic dba ElderPic
dba JackPic
assert_table_length NUM_TRAINER_CLASSES assert_table_length NUM_TRAINER_CLASSES

View file

@ -93,4 +93,5 @@ BTTrainerClassSprites:
db SPRITE_RED ; Archer db SPRITE_RED ; Archer
db SPRITE_RED ; Prof.Blue db SPRITE_RED ; Prof.Blue
db SPRITE_SAGE ; ELDER db SPRITE_SAGE ; ELDER
db SPRITE_ROCKER ; JACK
assert_table_length NUM_TRAINER_CLASSES assert_table_length NUM_TRAINER_CLASSES

View file

@ -172,4 +172,32 @@ NihonGrassWildMons:
dbw 35, SKARMORY dbw 35, SKARMORY
end_grass_wildmons end_grass_wildmons
def_grass_wildmons ROUTE_50
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
dbw 30, CATERPIE
dbw 31, METAPOD
dbw 30, CATERPIE
dbw 31, METAPOD
dbw 32, PIDGEY
dbw 32, CATERPIE
dbw 35, SUNFLORA
; day
dbw 30, CATERPIE
dbw 31, PIDGEY
dbw 30, RATTATA
dbw 31, RATTATA
dbw 32, RATTATA
dbw 32, CATERPIE
dbw 35, GIRAFARIG
; nite
dbw 30, RATTATA
dbw 31, HOOTHOOT
dbw 30, ODDISH
dbw 31, HOOTHOOT
dbw 32, ODDISH
dbw 32, ODDISH
dbw 35, SKARMORY
end_grass_wildmons
db -1 ; end db -1 ; end

View file

@ -1048,3 +1048,4 @@ TeacherMPic: INCBIN "gfx/trainers/teacherm.2bpp.lz"
PainterPic: INCBIN "gfx/trainers/painter.2bpp.lz" PainterPic: INCBIN "gfx/trainers/painter.2bpp.lz"
SoldierPic: INCBIN "gfx/trainers/soldier.2bpp.lz" SoldierPic: INCBIN "gfx/trainers/soldier.2bpp.lz"
SportsmanPic: INCBIN "gfx/trainers/sportsman.2bpp.lz" SportsmanPic: INCBIN "gfx/trainers/sportsman.2bpp.lz"
JackPic: INCBIN "gfx/trainers/jack.2bpp.lz"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 807 B

After

Width:  |  Height:  |  Size: 447 B

View file

@ -23,14 +23,14 @@ HoneyGrandmaSignScript:
HoneyGrandmaSignText: HoneyGrandmaSignText:
text "HONEY GRANDMA's" text "HONEY GRANDMA's"
line "house" line "HOUSE"
done done
OldCityEarlsHouseSignScript: OldCityEarlsHouseSignScript:
jumptext OldCityEarlsHouseSignText jumptext OldCityEarlsHouseSignText
OldCityEarlsHouseSignText: OldCityEarlsHouseSignText:
text "EARL'S house" text "EARL'S HOUSE"
done done
OldCityTrainerSchoolSignScript: OldCityTrainerSchoolSignScript:
@ -58,7 +58,7 @@ OldCitySouthSignScript:
jumptext OldCitySouthSignText jumptext OldCitySouthSignText
OldCitySouthSignText: OldCitySouthSignText:
text "SOUTH: ROUTE 50" text "SOUTH: ROUTE 49"
done done
; Gets its name from sepia often being used to show the romantic old days, while doubling as an orangey, autumny colour. ; Gets its name from sepia often being used to show the romantic old days, while doubling as an orangey, autumny colour.

BIN
maps/Route50.ablk Normal file

Binary file not shown.

132
maps/Route50.asm Normal file
View file

@ -0,0 +1,132 @@
object_const_def
Route50_MapScripts:
def_scene_scripts
def_callbacks
GameHouseSign:
jumptext GameHouseSignText
GameHouseSignText:
text "JACKY GEEK HOUSE"
done
Route50Sign:
jumptext Route50SignText
Route50SignText:
text "ROUTE 50"
para "EAST: SEPIA CITY"
line "WEST: fuck uh idk"
done
TrainerLassLowri:
trainer LASS, LOWRI, EVENT_BEAT_LASS_LOWRI, LassLowriSeenText, LassLowriBeatenText, 0, .AfterScript
.AfterScript:
endifjustbattled
opentext
writetext LassLowriAfterBattleText
waitbutton
closetext
end
LassLowriSeenText:
text "I'm not like"
line "other LASSes!" ; bwahahahaha
done
LassLowriBeatenText:
text "My cute fluffies!"
done
LassLowriAfterBattleText:
text "Isn't this place"
line "beautiful?"
para "I want to move"
line "here! Away from"
cont "the big city!" ; This implies she lives in West!
para "I wish HUW would"
line "understand!"
done
TrainerYoungsterLuc:
trainer YOUNGSTER, LUC, EVENT_BEAT_YOUNGSTER_LUC, YoungsterLucSeenText, YoungsterLucBeatenText, 0, .AfterScript
.AfterScript:
endifjustbattled
opentext
writetext YoungsterLucAfterBattleText
waitbutton
closetext
end
YoungsterLucSeenText:
text "Have you met"
line "JACKY?"
done
YoungsterLucBeatenText:
text "Urk!"
done
YoungsterLucAfterBattleText:
text "JACKY is a world-"
line "class gamer!"
para "You should stop"
line "by his place!"
done
TrainerYoungsterHuw:
trainer YOUNGSTER, HUW, EVENT_BEAT_YOUNGSTER_HUW, YoungsterHuwSeenText, YoungsterHuwBeatenText, 0, .AfterScript
.AfterScript:
endifjustbattled
opentext
writetext YoungsterHuwAfterBattleText
waitbutton
closetext
end
YoungsterHuwSeenText:
text "Passing through?"
para "Not without a"
line "battle, you're"
cont "not!"
done
YoungsterHuwBeatenText:
text "Awk!"
done
YoungsterHuwAfterBattleText:
text "I want to be as"
line "good at games"
cont "as JACKY."
para "But LOWRI keeps"
line "bothering me!"
done
Route50_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 6, 5, DEBUG_ROOM, 1 ; West Gate
warp_event 15, 4, DEBUG_ROOM, 1 ; Game House
def_coord_events
def_bg_events
bg_event 14, 5, BGEVENT_READ, GameHouseSign
bg_event 24, 10, BGEVENT_READ, Route50Sign
def_object_events
object_event 23, 7, SPRITE_SPACEWORLD_GIRL, SPRITEMOVEDATA_SPINRANDOM_SLOW, 2, 2, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerLassLowri, -1
object_event 16, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 2, 2, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerYoungsterLuc, -1
object_event 10, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 2, 2, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerYoungsterHuw, -1

View file

@ -110,7 +110,7 @@ SilentHillsSign1:
jumptext SilentHillsSign1Text jumptext SilentHillsSign1Text
SilentHillsSign1Text: SilentHillsSign1Text:
text "CAL's House" text "CAL's HOUSE"
done done
SilentHillsSign2: SilentHillsSign2:
@ -140,7 +140,7 @@ SilentHillsSign5:
jumptext SilentHillsSign5Text jumptext SilentHillsSign5Text
SilentHillsSign5Text: SilentHillsSign5Text:
text "<RIVAL>'s House" text "<RIVAL>'s HOUSE"
done done
SilentHillsPokecenterSign: SilentHillsPokecenterSign: