Adding data for Silph Gauntlet Trainers (2, 3, 5F)

Adds the trainers themselves, dialogue still needs to be written but PvK can help with that

Currently they either don't see you or challenge you multiple times...probably issues with where the event constants are located, will sort out once I figure out the problem
This commit is contained in:
Martha Schilling 2023-07-15 22:07:51 +01:00
parent ffd03c1b06
commit 91e06763dd
19 changed files with 936 additions and 71 deletions

View file

@ -84,20 +84,20 @@
const EVENT_BEAT_GAUNTLET_JR_TRAINER_F
const EVENT_BEAT_GAUNTLET_BIRD_KEEPER
; 2F Trainers
; const EVENT_BEAT_GAUNTLET_LASS
; const EVENT_BEAT_GAUNTLET_JUNIOR
; const EVENT_BEAT_GAUNTLET_HIKER
; const EVENT_BEAT_GAUNTLET_SUPER_NERD
; const EVENT_BEAT_GAUNTLET_POKEMANIAC
; const EVENT_BEAT_GAUNTLET_BLACK_BELT
const EVENT_BEAT_GAUNTLET_LASS
const EVENT_BEAT_GAUNTLET_JUNIOR
const EVENT_BEAT_GAUNTLET_HIKER
const EVENT_BEAT_GAUNTLET_SUPER_NERD
const EVENT_BEAT_GAUNTLET_POKEMANIAC
const EVENT_BEAT_GAUNTLET_BLACK_BELT
; 3F Trainers
; const EVENT_BEAT_GAUNTLET_SAILOR
; const EVENT_BEAT_GAUNTLET_FIREFIGHTER
; const EVENT_BEAT_GAUNTLET_GENTLEMAN
; const EVENT_BEAT_GAUNTLET_ENGINEER
; const EVENT_BEAT_GAUNTLET_ROCKER
; const EVENT_BEAT_GAUNTLET_FISHER
; const EVENT_BEAT_GAUNTLET_BEAUTY
const EVENT_BEAT_GAUNTLET_SAILOR
const EVENT_BEAT_GAUNTLET_FIREFIGHTER
const EVENT_BEAT_GAUNTLET_GENTLEMAN
const EVENT_BEAT_GAUNTLET_ENGINEER
const EVENT_BEAT_GAUNTLET_ROCKER
const EVENT_BEAT_GAUNTLET_FISHER
const EVENT_BEAT_GAUNTLET_BEAUTY
; 4F Trainers
const EVENT_BEAT_GAUNTLET_SCIENTIST
const EVENT_BEAT_GAUNTLET_GAMBLER
@ -106,24 +106,24 @@
const EVENT_BEAT_GAUNTLET_BURGLAR
const EVENT_BEAT_GAUNTLET_CHANNELER
; 5F Trainers
; const EVENT_BEAT_GAUNTLET_JUGGLER
; const EVENT_BEAT_GAUNTLET_BIKER
; const EVENT_BEAT_GAUNTLET_CUE_BALL
; const EVENT_BEAT_GAUNTLET_SWIMMER
; const EVENT_BEAT_GAUNTLET_TAMER
; const EVENT_BEAT_GAUNTLET_COOLTRAINER_F
; const EVENT_BEAT_GAUNTLET_COOLTRAINER_M
const EVENT_BEAT_GAUNTLET_JUGGLER
const EVENT_BEAT_GAUNTLET_BIKER
const EVENT_BEAT_GAUNTLET_CUE_BALL
const EVENT_BEAT_GAUNTLET_SWIMMER
const EVENT_BEAT_GAUNTLET_TAMER
const EVENT_BEAT_GAUNTLET_COOLTRAINER_F
const EVENT_BEAT_GAUNTLET_COOLTRAINER_M
; 6F Trainers
; const EVENT_BEAT_GAUNTLET_BROCK
; const EVENT_BEAT_GAUNTLET_MISTY
; const EVENT_BEAT_GAUNTLET_SURGE
; const EVENT_BEAT_GAUNTLET_ERIKA
; const EVENT_BEAT_GAUNTLET_KOGA
; const EVENT_BEAT_GAUNTLET_SABRINA
; const EVENT_BEAT_GAUNTLET_BLAINE
const EVENT_BEAT_GAUNTLET_BROCK
const EVENT_BEAT_GAUNTLET_MISTY
const EVENT_BEAT_GAUNTLET_SURGE
const EVENT_BEAT_GAUNTLET_ERIKA
const EVENT_BEAT_GAUNTLET_KOGA
const EVENT_BEAT_GAUNTLET_SABRINA
const EVENT_BEAT_GAUNTLET_BLAINE
; Lavender Town events
const_next $F0 - 2
const_next $100 - 2
const EVENT_POKEMON_TOWER_RIVAL_ON_LEFT
const EVENT_BEAT_POKEMON_TOWER_RIVAL
const_skip