Merge branch 'master' of https://github.com/ZetaNull/jep-hack

README.md

@@ -82,6 +82,11 @@ Additionally, there have been many wild encounter tweaks. View this document for
 	- Additionally, old lore relating to the area has now been restored, including something about the Unown!
 
 # Credits
+As the open source nature of this project implies, people are free to reuse what's here for their own ends, **so long as credit is given to this hack and those who worked on what you reuse.** Additionally, we strongly urge you to make any projects using JEP's content open source. JEP strongly supports the [free software movement](https://www.fsf.org/about/) and its four essential freedoms. If you have any questions on the topic of content reuse, contact @ plague_von_karma on Discord.
+
+If you use our implementations of anything at all, it is encouraged to submit Pull Requests for bug fixes if you find any issues! We very much appreciate them!
+
+## Development Credits
 - Plague von Karma (Director, Kanto Expansion Pak Founder, Programming, Maps)
 - Martha's Against Humanity (Kanto Expansion Pak ROM Hack Creator, Programmer)
 - Zeta_Null (Repository Owner, Spriter, Programming)
@@ -89,25 +94,36 @@ Additionally, there have been many wild encounter tweaks. View this document for
 - thornAvery (Programming)
 - pret et al (LOTS of [Tutorials](https://github.com/pret/pokecrystal/wiki) that we used to get this off the ground!)
 - Wiz (Nihon Pokemon names)
-- Nob Ogasawara (Many prototype Pokemon names)
-- Rezzo (GSC-specific advice)
-- Old Dance Jacket (GSC-specific advice)
-- Minamitoku (SW97 demo translation commentary [here](https://www.youtube.com/watch?v=Pe1vsKRl7_M&ab_channel=Minamitoku))
-- ZoomTen - Honey Pot & Honey Grandma features from Pokemon October, commits [here](https://github.com/pokeachromicdevs/pokeoctober/commit/d00cd6fafdbe5069d2cc452a154942f82f7fceb6), [here](https://github.com/pokeachromicdevs/pokeoctober/commit/1a6f3e4f0307656018f02d4981c973efa814a248), and [here](https://github.com/pokeachromicdevs/pokeoctober/commit/8114fead91828dd6d986fe120d6c5cd5e3c6cbf6). Safari Game restoration [here](https://github.com/pokeachromicdevs/pokeoctober/commit/2ff835730b2a61a757ad67f13e50480c965d2a0c}.
-- ausma (KEP Developer, legacy)
+- Rezzo (GSC-specific advice, Showdown Mod assistance)
+- Old Dance Jacket (GSC-specific advice, Showdown Mod assistance)
+- ausma (KEP Developer, Showdown Mod assistance, legacy)
 
-# Sprite Credits
+## Sprite Credits
+
+### JEP Developers
+JEP-affiliated spriters require sprites to be used with direct credit for non-commerical purposes. Credit the artist in any case of using them.
 - Zeta_Null: Topaz sprites, numerous tileset bits, Omegadge, Qatu, Phandarin, Stromen, Lickilord, 
 - Martha's Against Humanity: Shi-Shi, Fossil Aerodactyl, Fossil Kabutops
 - zuperZACH: Clodsire (front), Mismagius, Alolan Vulpix
-- nuuk: (WIP) Azurill, Electivire, Farigiraf, Glaceon, Honchkrow, Leafeon, Magmortar, Magnezone, Porygon-Z, Sylveon, Togekiss, Wyrdeer, Clodsire (back)
-- Scarlax, Pix, BloodlessNX, Kam, Poket, BimbelyGimbly - Animated sprites from [Pokemon October](https://github.com/pokeachromicdevs/pokeoctober): Bellignan, Caretorker (Adbarstork), Inoshika (Aggroswine), Bipulla, Sonegg (Clefling), Kolta (Coalta), Coinpur, Dodaerie, Bundra (Germifrost), Kiwooked (Kiwacki), Eucala (Koalyptus), Trebir, Burgela, Gorotora, Moibelle, Molambino, Dokuroar (Necrorex), Orfry, Blossomole (Petamole), Smujj
-- SoupPotato et al - Various sprites from [Pokemon Gold & Silver '97 Reforged](https://github.com/SoupPotato/gold97); Palssio (Cruize), Pressio (Aquallo) Donmarin (Aquarius), Grenmar (Bombsheal, with edits), Jungela (Gelania), Elebebi (Elebabe), Mimmeo (Metto), Kazappelin (Numbpuff), Disturban (Turban), Angore (Anchorage)
-- SCMidna: Munchlax
+- Shawesome: Alolan Geodude
 - EyeDonutz: Walking Wake
+- Plague von Karma: Overworld Arbok, Koffing, Voltorb, Gengar, Diglett, and Cat sprites, adapted from the slot machine's sprites (originally made for KEP).
+
+### Unaffiliated
+- nuuk: Azurill, Electivire, Farigiraf, Glaceon, Honchkrow, Leafeon, Magmortar, Magnezone, Porygon-Z, Sylveon, Togekiss, Wyrdeer, Clodsire (back)
+- Scarlax, Pix, BloodlessNX, Kam, Poket, BimbelyGimbly: Animated sprites from [Pokemon October](https://github.com/pokeachromicdevs/pokeoctober): Bellignan, Caretorker (Adbarstork), Inoshika (Aggroswine), Bipulla, Sonegg (Clefling), Kolta (Coalta), Coinpur, Dodaerie, Bundra (Germifrost), Kiwooked (Kiwacki), Eucala (Koalyptus), Trebir, Burgela, Gorotora, Moibelle, Molambino, Dokuroar (Necrorex), Orfry, Blossomole (Petamole), Smujj
+	- Gorotora is edited from RacieBeep's Yellow sprite in the Helix Chamber PokeThon ROM Hack. A full list of Helix Chamber sprites are available [here](https://cdn.discordapp.com/attachments/1014321591657709569/1015347305483878521/unknown.png). Helix Chamber spriters have a "must credit" policy.
+- SoupPotato et al: Various sprites from [Pokemon Gold & Silver '97 Reforged](https://github.com/SoupPotato/gold97); Palssio (Cruize), Pressio (Aquallo) Donmarin (Aquarius), Grenmar (Bombsheal, with edits), Jungela (Gelania), Elebebi (Elebabe), Mimmeo (Metto), Kazappelin (Numbpuff), Disturban (Turban), Angore (Anchorage)
+- SCMidna: Munchlax
 - SageDeoxys: (TBA)
 - Tom Wang: Gold/Chris running sprite
 - Seasick: Kris running sprite
+- Pigu-A, RevoSucks, walle303 - Contributors to Pokemon Anniversary Red's repository, where we reused the Green/FemC sprites.
+
+## Other Sources
+- Nob Ogasawara (Many prototype Pokemon names)
+- Minamitoku (SW97 demo translation commentary [here](https://www.youtube.com/watch?v=Pe1vsKRl7_M&ab_channel=Minamitoku))
+- ZoomTen - Honey Pot & Honey Grandma features from Pokemon October, commits [here](https://github.com/pokeachromicdevs/pokeoctober/commit/d00cd6fafdbe5069d2cc452a154942f82f7fceb6), [here](https://github.com/pokeachromicdevs/pokeoctober/commit/1a6f3e4f0307656018f02d4981c973efa814a248), and [here](https://github.com/pokeachromicdevs/pokeoctober/commit/8114fead91828dd6d986fe120d6c5cd5e3c6cbf6). Safari Game restoration [here](https://github.com/pokeachromicdevs/pokeoctober/commit/2ff835730b2a61a757ad67f13e50480c965d2a0c}.
 - Ferropexola/aforward9600: Time of day-based tileset palette code
 
 Original readme proceeding...

constants/event_flags.asm

@@ -578,6 +578,10 @@
 	const EVENT_BEAT_BIRD_KEEPER_JOSE3
 	const EVENT_BEAT_BIRD_KEEPER_VANCE2
 	const EVENT_BEAT_BIRD_KEEPER_VANCE3
+	const EVENT_BEAT_BIRD_KEEPER_MATT
+	const EVENT_BEAT_BIRD_KEEPER_SHAW
+	const EVENT_BEAT_BIRD_KEEPER_FREDERICK
+	const EVENT_BEAT_BIRD_KEEPER_NORIKAGE
 ; Boarder
 	const EVENT_BEAT_BOARDER_RONALD
 	const EVENT_BEAT_BOARDER_BRAD
@@ -616,7 +620,6 @@
 	const EVENT_BEAT_BURGLAR_DUNCAN
 	const EVENT_BEAT_BURGLAR_EDDIE
 	const EVENT_BEAT_BURGLAR_COREY
-	const_skip ; unused
 ; Biker
 	const EVENT_BEAT_BIKER_BENNY
 	const EVENT_BEAT_BIKER_KAZU
@@ -1088,7 +1091,16 @@
 	const EVENT_BEAT_PAINTER_DALI ; unused
 	const EVENT_BEAT_SOLDIER_PEPPINO ; unused
 	const EVENT_BEAT_SPORTSMAN_JACQUES ; unused
-; Unused: next 104 events
+; Nihon Bosses
+	const EVENT_BEAT_LEADER_WALKER
+	const EVENT_BEAT_LEADER_LORELEI
+	const EVENT_BEAT_LEADER_SOUTHGUY
+	const EVENT_BEAT_LEADER_IMPOSTEROAK
+	const EVENT_BEAT_LEADER_AGATHA
+	const EVENT_BEAT_LEADER_GIOVANNI
+	const EVENT_BEAT_LEADER_GREEN
+	const EVENT_BEAT_KURT
+; Unused: next 93 events
 
 	const_next 1600
 ; Sprite visibility flags

constants/sprite_constants.asm

@@ -109,10 +109,44 @@
 	const SPRITE_CHRIS_RUN ; 67
  	const SPRITE_KRIS_RUN ; 68
 	const SPRITE_TOPAZ_RUN ; 69 nice
+	
+	; Plague's overworld sprite beautification funhouse!
+	const SPRITE_TSUKUSHI ; Prototype Bugsy. May use for something else?
+	const SPRITE_MIKAN ; Prototype Jasmine, could use for something.
+	const SPRITE_MEDIUM
+	const SPRITE_AGATHA
+	const SPRITE_HELMETBIKER ; Helmeted Biker, Kamen Rider-esque. Could use for alternative biker class.
+	const SPRITE_WALKER ; Prototype Falkner, now Walker.
+	const SPRITE_SPACEWORLD_GIRL ; Seen a lot in the demo, can distribute across the world.
+	const SPRITE_BANCHOMAN ; Bancho student with a pompadour.
+	const SPRITE_ENOKI ; Prototype Morty, may use somewhere.
+	const SPRITE_IMPOSTER_OAK
+	const GOLD_SKATEBOARD
+	const SILVERS_SISTER
+	
+	; KEP imports proceeding...
+	const SPRITE_OWVOLTORB
+	const SPRITE_SMALL_BIRD
+	const SPRITE_OFFICER_JENNY
+	const SPRITE_OWKOFFING
+	const SPRITE_JESSIE
+	const SPRITE_JAMES
+	const SPRITE_OWGENGAR
+	const SPRITE_GREEN
+	const SPRITE_OWDIGLETT
+	const SPRITE_CAT
+	const SPRITE_PWARBOK
+	const SPRITE_BAOBA
+	const SPRITE_SILPH_PRESIDENT
+	const SPRITE_SAFARI_ZONE_WORKER
+	const SPRITE_LORELEI
+	const SPRITE_GIOVANNI
+	const SPRITE_CHANNELER
+	const SPRITE_BALDING_GUY
 DEF NUM_OVERWORLD_SPRITES EQU const_value - 1
 
 ; SpriteMons indexes (see data/sprites/sprite_mons.asm)
-	const_next $80
+	const_next $8A
 DEF SPRITE_POKEMON EQU const_value
 	const SPRITE_UNOWN ; 80
 	const SPRITE_GEODUDE ; 81

constants/trainer_constants.asm

@@ -174,6 +174,9 @@ DEF KRIS EQU __trainer_class__
 	const JOSE3
 	const VANCE2
 	const VANCE3
+	const MATT
+	const SHAW
+	const FREDERICK
 
 	trainerclass LASS ; 19
 	const CARRIE
@@ -751,5 +754,30 @@ DEF KRIS EQU __trainer_class__
 	trainerclass KABUFOSSIL ; 55
 	const FOSSIL2
 	
+	; Nihon Bosses
+	trainerclass WALKER ; 56
+	const WALKER1
+	
+	trainerclass LORELEI ; 57
+	const LORELEI1
+	
+	trainerclass XXX ; 58 South guy
+	const XXX1
+	
+	trainerclass IMPOSTEROAK ; 56
+	const OAK
+	
+	trainerclass AGATHA ; 56
+	const AGATHA1
+	
+	trainerclass LEADERGIOVANNI ; 56
+	const GIOVANNI3
+	
+	trainerclass GREEN ; 56
+	const GREEN1
+	
+	trainerclass KURT ; 56
+	const KURT1
+
 DEF TOPAZ EQU __trainer_class__
 DEF NUM_TRAINER_CLASSES EQU __trainer_class__ - 1

data/sprites/sprites.asm

@@ -114,4 +114,38 @@ OverworldSprites:
 	overworld_sprite ChrisRunSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
  	overworld_sprite KrisRunSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
 	overworld_sprite TopazRunSpriteGFX, 12, WALKING_SPRITE, PAL_OW_PURPLE
+	
+	; SW97 Imports
+	overworld_sprite TsukushiGFX, 4, STILL_SPRITE, PAL_OW_PURPLE
+	overworld_sprite MikanGFX, 12, WALKING_SPRITE, PAL_OW_GREEN
+	overworld_sprite MediumSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite AgathaGFX, 12, WALKING_SPRITE, PAL_OW_PURPLE
+	overworld_sprite HelmetBikerGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite WalkerGFX, 4, STILL_SPRITE, PAL_OW_BLUE
+	overworld_sprite SpaceworldGirlGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BanchomanGFX, 12, WALKING_SPRITE, PAL_OW_PURPLE
+	overworld_sprite EnokiGFX, 4, STILL_SPRITE, PAL_OW_PURPLE
+	overworld_sprite ImposterOakGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite GoldSkateboardGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite SilverSisterGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	
+	; KEP Imports
+	overworld_sprite VoltorbGFX, 4, STILL_SPRITE, PAL_OW_RED
+	overworld_sprite SmallBirdGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite OfficerJennyGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite KoffingGFX, 4, STILL_SPRITE, PAL_OW_PURPLE
+	overworld_sprite JessieGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite JamesGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite GengarGFX, 4, STILL_SPRITE, PAL_OW_PURPLE
+	overworld_sprite GreenGFX, 12, WALKING_SPRITE, PAL_OW_GREEN
+	overworld_sprite DiglettGFX, 4, STILL_SPRITE, PAL_OW_BROWN
+	overworld_sprite CatGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite ArbokGFX, 4, STILL_SPRITE, PAL_OW_PURPLE
+	overworld_sprite BaobaGFX, 4, STILL_SPRITE, PAL_OW_BROWN
+	overworld_sprite SilphChiefGFX, 4, STILL_SPRITE, PAL_OW_BROWN
+	overworld_sprite SafariZoneWorkerGFX, 4, STILL_SPRITE, PAL_OW_BROWN
+	overworld_sprite LoreleiGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite GiovanniGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite ChannelerGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite BaldingGuyGFX, 4, STILL_SPRITE, PAL_OW_BROWN
 	assert_table_length NUM_OVERWORLD_SPRITES

data/trainers/attributes.asm

@@ -476,4 +476,53 @@ TrainerClassAttributes:
 	dw AI_BASIC | AI_CAUTIOUS | AI_STATUS
 	dw CONTEXT_USE | SWITCH_RARELY
 
+; Nihon Bosses get AI_OPPORTUNIST and AI_TYPES to encourage actually killing the opponent. If they're still not hard enough, consider adding AI_CAUTIOUS to discourage status moves further. 
+; Walker
+	db FULL_RESTORE, FULL_HEAL ; items
+	db 25 ; base reward
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY | AI_OPPORTUNIST | AI_TYPES
+	dw CONTEXT_USE | SWITCH_SOMETIMES
+
+; Lorelei
+	db FULL_RESTORE, FULL_HEAL ; items
+	db 25 ; base reward
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY | AI_OPPORTUNIST | AI_TYPES
+	dw CONTEXT_USE | SWITCH_SOMETIMES
+
+; South Guy
+	db FULL_RESTORE, FULL_HEAL ; items
+	db 25 ; base reward
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY | AI_OPPORTUNIST | AI_TYPES
+	dw CONTEXT_USE | SWITCH_SOMETIMES
+
+; Impostor Oak
+	db HYPER_POTION, AWAKENING ; items - he's less competent, so he has worse items.
+	db 25 ; base reward
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY | AI_TYPES
+	dw CONTEXT_USE | SWITCH_RARELY ; same here.
+
+; Agatha
+	db FULL_RESTORE, FULL_HEAL ; items
+	db 25 ; base reward
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY | AI_OPPORTUNIST | AI_TYPES
+	dw CONTEXT_USE | SWITCH_SOMETIMES
+
+; Giovanni 3
+	db FULL_RESTORE, FULL_HEAL ; items
+	db 25 ; base reward
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY | AI_OPPORTUNIST | AI_TYPES
+	dw CONTEXT_USE | SWITCH_SOMETIMES
+
+; Green
+	db FULL_RESTORE, FULL_HEAL ; items
+	db 25 ; base reward
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY | AI_OPPORTUNIST | AI_TYPES
+	dw CONTEXT_USE | SWITCH_SOMETIMES
+
+; Kurt can be smart too.
+	db FULL_RESTORE, FULL_HEAL ; items
+	db 25 ; base reward
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY | AI_OPPORTUNIST | AI_TYPES
+	dw CONTEXT_USE | SWITCH_SOMETIMES
+
 	assert_table_length NUM_TRAINER_CLASSES

data/trainers/class_names.asm

@@ -80,4 +80,12 @@ TrainerClassNames::
 	li "SPORTSMAN"
 	li "???"
 	li "???"
+	li "LEADER"
+	li "LEADER"
+	li "LEADER"
+	li "LEADER?" ; Impostor Oak
+	li "LEADER"
+	li "LEADER"
+	li "LEADER"
+	li "BALLSMITH"
 	assert_list_length NUM_TRAINER_CLASSES

data/trainers/dvs.asm

@@ -81,4 +81,12 @@ TrainerClassDVs:
 	dn  9,  8,  8,  8 ; SPORTSMAN
 	dn 15, 15, 15, 15 ; FOSSIL1
 	dn 15, 15, 15, 15 ; FOSSIL2
+	dn 14, 13, 15, 15 ; WALKER (HP Water 70)
+	dn 14, 15, 15, 15 ; LORELEI (HP Electric 70)
+	dn 13, 12, 13, 13 ; South guy
+	dn 13, 12, 13, 13 ; IMPOSTEROAK
+	dn 12, 12, 15, 15 ; AGATHA (HP Fighting 70)
+	dn 13, 12, 13, 13 ; GIOVANNI3
+	dn 13, 12, 13, 13 ; GREEN
+	dn 13, 12, 13, 13 ; KURT
 	assert_table_length NUM_TRAINER_CLASSES

data/trainers/encounter_music.asm

@@ -83,4 +83,12 @@ TrainerEncounterMusic::
 	db MUSIC_HIKER_ENCOUNTER		; sportsman
 	db MUSIC_ROCKET_ENCOUNTER      ; fossil1
 	db MUSIC_ROCKET_ENCOUNTER      ; fossil2
+	db MUSIC_OFFICER_ENCOUNTER     ; WALKER
+	db MUSIC_BEAUTY_ENCOUNTER     ; LORELEI
+	db MUSIC_OFFICER_ENCOUNTER     ; South Guy
+	db MUSIC_POKEMANIAC_ENCOUNTER     ; IMPOSTOROAK
+	db MUSIC_SAGE_ENCOUNTER     ; AGATHA
+	db MUSIC_ROCKET_ENCOUNTER     ; GIOVANNI3
+	db MUSIC_OFFICER_ENCOUNTER     ; GREEN
+	db MUSIC_OFFICER_ENCOUNTER     ; KURT
 	assert_table_length NUM_TRAINER_CLASSES + 1

data/trainers/genders.asm

@@ -82,4 +82,12 @@ BTTrainerClassGenders:
 	db MALE ; SPORTSMAN
 	db MALE ; FOSSIL
 	db FEMALE ; FOSSIL
+	db MALE ; WALKER
+	db FEMALE ; LORELEI
+	db MALE ; SOUTH GUY
+	db MALE ; IMPOSTEROAK
+	db FEMALE ; AGATHA
+	db MALE ; GIOVANNI3
+	db FEMALE ; GREEN
+	db MALE ; KURT
 	assert_table_length NUM_TRAINER_CLASSES

data/trainers/palettes.asm

@@ -89,6 +89,14 @@ INCBIN "gfx/trainers/soldier.gbcpal", middle_colors
 INCBIN "gfx/trainers/sportsman.gbcpal", middle_colors
 INCBIN "gfx/trainers/oak.gbcpal", middle_colors ; duplicate for fossils
 INCBIN "gfx/trainers/oak.gbcpal", middle_colors ; duplicate for fossils
+INCBIN "gfx/trainers/walker.gbcpal", middle_colors
+INCBIN "gfx/trainers/lorelei.gbcpal", middle_colors
+INCBIN "gfx/trainers/southguy.gbcpal", middle_colors
+INCBIN "gfx/trainers/oak.gbcpal", middle_colors ; dupe for imposter oak
+INCBIN "gfx/trainers/agatha.gbcpal", middle_colors
+INCBIN "gfx/trainers/giovanni3.gbcpal", middle_colors
+INCBIN "gfx/trainers/green.gbcpal", middle_colors
+INCBIN "gfx/trainers/kurt.gbcpal", middle_colors
 
 EnbyPalette:
 INCLUDE "gfx/player/topaz.pal"

data/trainers/parties.asm

@@ -1305,6 +1305,55 @@ BirdKeeperGroup:
 	dw SWIFT, DETECT, STEEL_WING, FLY
 	db -1 ; end
 	
+	next_list_item ; BIRD_KEEPER (19)
+	db "MATT@", TRAINERTYPE_MOVES ; Reference to the Birdkeeper in Falkner's Stadium 2 Gym.
+	db 50
+	dw NOCTOWL
+	dw HYPNOSIS, DREAM_EATER, STEEL_WING, TAKE_DOWN
+	db 50
+	dw CACAWPHONY
+	dw MEGAPHONE, DRILL_PECK, DOUBLE_EDGE, SCREECH
+	db 50
+	dw XATU
+	dw HYPNOSIS, PSYCHIC_M, NIGHT_SHADE, DRILL_PECK
+	db -1 ; end
+	
+	next_list_item ; BIRD_KEEPER (19)
+	db "SHAW@", TRAINERTYPE_MOVES ; Reference to the Shaw Monument in Scotland, an 18th-century falconry observation tower that is fully intact!
+	db 50
+	dw TREBIR
+	dw PERISH_SONG, ENCORE, SING, WING_ATTACK
+	db 50
+	dw FEAROW
+	dw MIRROR_MOVE, DOUBLE_EDGE, STEEL_WING, DRILL_PECK
+	db 50
+	dw HONCHKROW
+	dw PURSUIT, DRILL_PECK, NIGHT_SHADE, QUICK_ATTACK
+	db -1 ; end
+	
+	next_list_item ; BIRD_KEEPER (19)
+	db "FREDERICK@", TRAINERTYPE_MOVES ; Reference to the Frederick II of Hohenstaufen, one of the earliest knowledgable Falconers in history
+	db 50
+	dw TREBIR
+	dw PERISH_SONG, ENCORE, SING, WING_ATTACK
+	db 50
+	dw FEAROW
+	dw MIRROR_MOVE, DOUBLE_EDGE, STEEL_WING, DRILL_PECK
+	db 50
+	dw HONCHKROW
+	dw PURSUIT, DRILL_PECK, NIGHT_SHADE, QUICK_ATTACK
+	db -1 ; end
+	
+	next_list_item ; BIRD_KEEPER (19)
+	db "NORIKAGE@", TRAINERTYPE_MOVES ; Asakura Norikage 朝倉 教景 (1476 - 1555), brought Goshawk breeding to Asakura Clan in the 16th Century.
+	db 50
+	dw DELIBIRD
+	dw PRESENT, ICY_WIND, QUICK_ATTACK, THIEF
+	db 50
+	dw PIDGEOT
+	dw WING_ATTACK, QUICK_ATTACK, MIRROR_MOVE, WHIRLWIND
+	db -1 ; end
+	
 	end_list_items
 
 JanineGroup:

data/trainers/parties_new_classes.asm

@@ -279,3 +279,242 @@ LassGroup:
 	db -1 ; end
 
 	end_list_items
+
+WalkerGroup:
+	next_list_item
+	db "WALKER@", TRAINERTYPE_ITEM_MOVES
+	db 60
+	dw TOGEKISS
+	db PINK_BOW
+	db EXTREMESPEED, MIRROR_MOVE, SAFEGUARD, HIDDEN_POWER ; HP Water
+	db 60
+	dw LUXWAN
+	db STICK
+	db FURY_CUTTER, SLASH, DRILL_PECK, THUNDERBOLT
+	db 60
+	dw CARETORKER
+	db LEFTOVERS
+	db SOFTBOILED, DRILL_PECK, HEAL_BELL, WHIRLWIND ; Drill Peck should be Dazzling Gleam!
+	db 60
+	dw DODRIO
+	db POLKADOT_BOW
+	db FLAIL, DRILL_PECK, AGILITY, ENDURE
+	db 60
+	dw AERODACTYL ; Progenitor of Birds in Tajiri lore!
+	db MIRACLEBERRY
+	db ROCK_HEAD, WING_ATTACK, EARTHQUAKE, FIRE_BLAST
+	db 60
+	dw SKARMORY
+	db NO_ITEM ; Fire-type damage reduction item here please!
+	db STEEL_WING, DRILL_PECK, PURSUIT, LEER
+	db -1 ; end
+	end_list_items
+	
+LoreleiGroup:
+	next_list_item
+	db "LORELEI@", TRAINERTYPE_ITEM_MOVES
+	db 60
+	dw CLOYSTER
+	db MINT_BERRY
+	db SPIKES, ICE_BEAM, SURF, EXPLOSION
+	db 60
+	dw SNEASEL ; WEAVILE
+	db PRZCUREBERRY
+	db BEAT_UP, SLASH, ICE_BEAM, SWAGGER
+	db 60
+	dw JYNX
+	db NO_ITEM
+	db LOVELY_KISS, PSYCHIC_M, PERISH_SONG, THIEF
+	db 60
+	dw LUXWAN ; BUNBERG
+	db MIRACLEBERRY
+	db SYNTHESIS, ICE_BEAM, RAZOR_LEAF, PRESENT ; funny,,,,,
+	db 60
+	dw NINETALES ; NINETALESA
+	db FAIRY_FEATHER
+	db ICE_BEAM, CONFUSE_RAY, HIDDEN_POWER, NO_MOVE ; DAZZLING_GLEAM please! also, HP Electric
+	db 60
+	dw LAPRAS
+	db NEVERMELTICE
+	db THUNDERBOLT, ICE_BEAM, SURF, CONFUSE_RAY
+	db -1 ; end
+	end_list_items
+	
+XXXGroup: ; South Man
+	next_list_item
+	db "???@", TRAINERTYPE_ITEM_MOVES
+	db 60
+	dw BALUMBA
+	db MIRACLEBERRY
+	db HYPNOSIS, GUST, EXPLOSION, NO_MOVE ; Dazzling Gleam pls!
+	db 60
+	dw SYLVEON
+	db PRZCUREBERRY
+	db QUICK_ATTACK, GROWTH, LIGHT_SCREEN, NO_MOVE ; Dazzling Gleam pls!
+	db 60
+	dw MIMEAR
+	db MAGNET
+	db LOVELY_KISS, THUNDERBOLT, PRESENT, NO_MOVE ; Dazzling Gleam pls!
+	db 60
+	dw WEEZING ; WEEZINGG
+	db NO_ITEM ; Ground-type reducing item
+	db SLUDGE_BOMB, FIRE_BLAST, EXPLOSION, NO_MOVE ; Dazzling Gleam pls!
+	db 60
+	dw PHANDARIN
+	db PSNCUREBERRY
+	db SHADOW_BALL, BODY_SLAM, PURSUIT, NO_MOVE ; Dazzling Gleam pls!
+	db 60
+	dw GRANBO
+	db FAIRY_FEATHER
+	db NO_MOVE, NO_MOVE, NO_MOVE, NO_MOVE ; Dazzling Gleam pls!
+	db -1 ; end
+	end_list_items
+	
+ImposterOakGroup:
+	next_list_item
+	db "PROF.OAK@", TRAINERTYPE_ITEM_MOVES
+	db 60
+	dw TAUROS
+	db POLKADOT_BOW
+	db BODY_SLAM, HYPER_BEAM, FIRE_BLAST, THUNDERBOLT
+	db 60
+	dw EXEGGUTOR
+	db MIRACLESEED
+	db SLEEP_POWDER, GIGA_DRAIN, PSYCHIC_M, STUN_SPORE
+	db 60
+	dw ARCANINE
+	db MINT_BERRY
+	db FIRE_BLAST, EXTREMESPEED, BODY_SLAM, REST
+	db 60
+	dw GYARADOS
+	db MYSTICWATER
+	db HYDRO_PUMP, THUNDERBOLT, DOUBLE_EDGE, ROAR
+	db 60
+	dw WEEZING
+	db NO_ITEM
+	db SLUDGE_BOMB, THUNDERBOLT, EXPLOSION, FIRE_BLAST
+	db 60
+	dw GENGAR
+	db NO_ITEM
+	db HYPNOSIS, DREAM_EATER, SHADOW_BALL, EXPLOSION ; An inept set designed to illustrate that Impostor Oak isn't actually very competent.
+	db -1 ; end
+	end_list_items
+	
+AgathaGroup:
+	next_list_item
+	db "AGATHA@", TRAINERTYPE_ITEM_MOVES
+	db 60
+	dw KITSEN
+	db NO_ITEM
+	db HYPNOSIS, THIEF, NIGHTMARE, DESTINY_BOND ; rude
+	db 60
+	dw PRIMEAPE ; ANNIHILAPE
+	db SCOPE_LENS ; hahahahaha
+	db CROSS_CHOP, ROCK_HEAD, SHADOW_BALL, FOCUS_ENERGY
+	db 60
+	dw MAROWAK ; MAROWAKA
+	db THICK_CLUB
+	db EARTHQUAKE, BONEMERANG, SHADOW_BALL, SWORDS_DANCE
+	db 60
+	dw MISMAGIUS
+	db PRZCUREBERRY
+	db THUNDERBOLT, PERISH_SONG, MEAN_LOOK, PROTECT ; also rude
+	db 60
+	dw GENGAR
+	db MAGNET ; psychic damage-reducing item?
+	db CONFUSE_RAY, THUNDERBOLT, GIGA_DRAIN, PSYCHIC_M
+	db 60
+	dw DOKUROAR
+	db HARD_STONE
+	db ROCK_SLASH, SHADOW_BALL, EARTHQUAKE, HIDDEN_POWER ; HP Fighting
+	db -1 ; end
+	end_list_items
+
+; Could fit Cactormus with Spikes into this, considering it's a notable Ground move.
+; Ship out Nidoqueen?
+LeaderGiovanniGroup: ; since he uses different sprites
+	next_list_item
+	db "GIOVANNI@", TRAINERTYPE_ITEM_MOVES
+	db 60
+	dw GLIGAR ; GLISCOR
+	db SHARP_BEAK
+	db EARTHQUAKE, WING_ATTACK, SWORDS_DANCE, SANDSTORM
+	db 60
+	dw DONPHAN ; TRAMPEL
+	db LEFTOVERS
+	db BELLY_DRUM, EARTHQUAKE, BODY_SLAM, ROCK_SLIDE
+	db 60
+	dw NIDOQUEEN
+	db MYSTICWATER
+	db SURF, FIRE_BLAST, EARTHQUAKE, BODY_SLAM
+	db 60
+	dw MAROWAK ; GUARDIA
+	db THICK_CLUB
+	db SWORDS_DANCE, EARTHQUAKE, BONEMERANG, BODY_SLAM
+	db 60
+	dw NIDOKING
+	db NEVERMELTICE
+	db THUNDERBOLT, ICE_BEAM, EARTHQUAKE, BODY_SLAM
+	db 60
+	dw RHYDON ; RHYPERIOR
+	db SOFT_SAND
+	db EARTHQUAKE, ROCK_SLIDE, BODY_SLAM, ROAR
+	db -1 ; end
+	end_list_items
+	
+GreenGroup:
+	next_list_item
+	db "GREEN@", TRAINERTYPE_ITEM_MOVES
+	db 60
+	dw HITMONCHAN
+	db MIRACLEBERRY
+	db MACH_PUNCH, MIND_READER, DYNAMICPUNCH, PURSUIT
+	db 60
+	dw JOLTEON
+	db MINT_BERRY
+	db THUNDERBOLT, REST, DOUBLE_KICK, THUNDER_WAVE
+	db 60
+	dw LAPRAS
+	db MYSTICWATER
+	db THUNDERBOLT, ICE_BEAM, SURF, CONFUSE_RAY
+	db 60
+	dw AERODACTYL
+	db BURNT_BERRY
+	db ROCK_HEAD, WING_ATTACK, FIRE_BLAST, EARTHQUAKE
+	db 60
+	dw GYARADOS
+	db NO_ITEM ; electric damage-reducing item
+	db THUNDERBOLT, HYDRO_PUMP, TWISTER, ICE_BEAM
+	db 60
+	dw VENUSAUR
+	db MIRACLESEED
+	db GIGA_DRAIN, SLUDGE_BOMB, SWORDS_DANCE, BODY_SLAM
+	db -1 ; end
+	end_list_items
+
+; To be used during the GS Ball event.
+; Uses a lot of his "favourites" from the Kurtball thing.
+KurtGroup:
+	next_list_item
+	db "KURT@", TRAINERTYPE_MOVES
+	db 50
+	dw PARASECT
+	db SPORE, GIGA_DRAIN, SLASH, ROCK_SLASH
+	db 50
+	dw SANDSLASH
+	db SWORDS_DANCE, EARTHQUAKE, ROCK_SLIDE, BODY_SLAM
+	db 50
+	dw BELLOSSOM
+	db SLEEP_POWDER, GROWTH, PETAL_DANCE, SYNTHESIS
+	db 50
+	dw MUK
+	db SLUDGE_BOMB, EXPLOSION, FIRE_BLAST, THUNDERBOLT
+	db 50
+	dw GRANBULL
+	db HEAL_BELL, TAKE_DOWN, CURSE, SHADOW_BALL
+	db 50
+	dw SLOWBRO
+	db SURF, PSYCHIC_M, ICE_BEAM, EARTHQUAKE
+	db -1 ; end
+	end_list_items
+

data/trainers/party_pointers.asm

@@ -82,4 +82,11 @@ TrainerGroups:
 	dba SportsmanGroup
 	dba AerofossilGroup
 	dba KabufossilGroup
+	dba WalkerGroup
+	dba LoreleiGroup
+	dba XXXGroup
+	dba AgathaGroup
+	dba Giovanni3Group
+	dba GreenGroup
+	dba KurtGroup
 	assert_table_length NUM_TRAINER_CLASSES

data/trainers/pic_pointers.asm

@@ -82,4 +82,12 @@ TrainerPicPointers::
 	dba SportsmanPic
 	dba AerodactylFossilPic
 	dba KabutopsFossilPic
+	dba WalkerPic
+	dba LoreleiPic
+	dba SouthGuyPic
+	dba ImposterOakPic
+	dba AgathaPic
+	dba Giovanni3Pic
+	dba GreenPic
+	dba KurtPic
 	assert_table_length NUM_TRAINER_CLASSES

data/trainers/sprites.asm

@@ -80,4 +80,12 @@ BTTrainerClassSprites:
 	db SPRITE_SAILOR	; Sportsman uhhh
 	db SPRITE_RED		; Fossil Placeholder
 	db SPRITE_RED		; Fossil Placeholder
+	db SPRITE_RED		; Walker Placeholder
+	db SPRITE_RED		; Lorelei Placeholder
+	db SPRITE_RED		; South Guy Placeholder
+	db SPRITE_RED		; Imposter Oak Placeholder
+	db SPRITE_RED		; Agatha Placeholder
+	db SPRITE_RED		; Giovanni3 Placeholder
+	db SPRITE_RED		; Green Placeholder
+	db SPRITE_RED		; Kurt Placeholder
 	assert_table_length NUM_TRAINER_CLASSES

gfx/pics.asm

@@ -1033,3 +1033,11 @@ OrfryFrontpic:	 INCBIN "gfx/pokemon/orfry/front.animated.2bpp.lz"
 OrfryBackpic:	 INCBIN "gfx/pokemon/orfry/back.2bpp.lz"
 TogekissFrontpic:	 INCBIN "gfx/pokemon/togekiss/front.animated.2bpp.lz"
 TogekissBackpic:	 INCBIN "gfx/pokemon/togekiss/back.2bpp.lz"
+WalkerPic: INCBIN "gfx/trainers/walker.2bpp.lz"
+LoreleiPic: INCBIN "gfx/trainers/lorelei.2bpp.lz"
+SouthGuyPic: INCBIN "gfx/trainers/southguy.2bpp.lz"
+ImposterOakPic: INCBIN "gfx/trainers/imposteroak.2bpp.lz"
+AgathaPic: INCBIN "gfx/trainers/agatha.2bpp.lz"
+Giovanni3Pic: INCBIN "gfx/trainers/giovanni3.2bpp.lz"
+GreenPic: INCBIN "gfx/trainers/green.2bpp.lz"
+KurtPic: INCBIN "gfx/trainers/kurt.2bpp.lz"

gfx/pokemon/geodudealola/anim.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/geodudealola/anim_idle.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/geodudealola/shiny.pal

@@ -0,0 +1,3 @@
+
+	RGB 255, 157, 61
+	RGB 165, 60, 24

gfx/sprites.asm

@@ -115,3 +115,37 @@ EnbyBikeSpriteGFX::            INCBIN "gfx/sprites/enby_bike.2bpp"
 ChrisRunSpriteGFX::            INCBIN "gfx/sprites/chris_run.2bpp"
 KrisRunSpriteGFX::             INCBIN "gfx/sprites/kris_run.2bpp"
 TopazRunSpriteGFX::             INCBIN "gfx/sprites/topaz_run.2bpp"
+
+; SW97 Imports
+TsukushiGFX::             INCBIN "gfx/sprites/tsukushi.2bpp"
+MikanGFX::             INCBIN "gfx/sprites/mikan.2bpp"
+MediumSpriteGFX::             INCBIN "gfx/sprites/medium.2bpp"
+AgathaGFX::             INCBIN "gfx/sprites/agatha.2bpp"
+HelmetBikerGFX::             INCBIN "gfx/sprites/helmet.2bpp"
+WalkerGFX::             INCBIN "gfx/sprites/hayato.2bpp"
+SpaceworldGirlGFX::             INCBIN "gfx/sprites/girl.2bpp"
+BanchomanGFX::             INCBIN "gfx/sprites/frowning_man.2bpp"
+EnokiGFX::             INCBIN "gfx/sprites/enoki.2bpp"
+ImposterOakGFX::             INCBIN "gfx/sprites/evil_okido.2bpp"
+GoldSkateboardGFX::             INCBIN "gfx/sprites/gold_skateboard.2bpp"
+SilverSisterGFX::             INCBIN "gfx/sprites/silvers_sister.2bpp"
+
+SECTION "Sprites 4", ROMX ; KEP Imports go in this bank.
+VoltorbGFX::             INCBIN "gfx/sprites/voltorb.2bpp"
+SmallBirdGFX::             INCBIN "gfx/sprites/smallbird.2bpp"
+OfficerJennyGFX::             INCBIN "gfx/sprites/officer_jenny.2bpp"
+KoffingGFX::             INCBIN "gfx/sprites/koffing.2bpp"
+JessieGFX::             INCBIN "gfx/sprites/jessie.2bpp"
+JamesGFX::             INCBIN "gfx/sprites/james.2bpp"
+GengarGFX::             INCBIN "gfx/sprites/gengar.2bpp"
+GreenGFX::             INCBIN "gfx/sprites/green.2bpp"
+DiglettGFX::             INCBIN "gfx/sprites/diglett.2bpp"
+CatGFX::             INCBIN "gfx/sprites/cat.2bpp"
+ArbokGFX::             INCBIN "gfx/sprites/arbok.2bpp"
+BaobaGFX::             INCBIN "gfx/sprites/warden.2bpp"
+SilphChiefGFX::             INCBIN "gfx/sprites/silph_president.2bpp"
+SafariZoneWorkerGFX::             INCBIN "gfx/sprites/safari_zone_worker.2bpp"
+LoreleiGFX::             INCBIN "gfx/sprites/lorelei.2bpp"
+GiovanniGFX::             INCBIN "gfx/sprites/giovanni.2bpp"
+ChannelerGFX::             INCBIN "gfx/sprites/channeler.2bpp"
+BaldingGuyGFX::             INCBIN "gfx/sprites/balding_guy.2bpp"

maps/EcruteakGym.asm

@@ -432,7 +432,7 @@ EcruteakGym_MapEvents:
 	object_event  5,  1, SPRITE_MORTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, EcruteakGymMortyScript, -1
 	object_event  2,  7, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSageJeffrey, -1
 	object_event  3, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSagePing, -1
-	object_event  7,  5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumMartha, -1
-	object_event  7,  9, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumGrace, -1
+	object_event  7,  5, SPRITE_MEDIUM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumMartha, -1
+	object_event  7,  9, SPRITE_MEDIUM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumGrace, -1
 	object_event  7, 15, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakGymGuideScript, -1
 	object_event  4, 14, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS