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

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
@@ -750,6 +753,31 @@ 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