Viridian Forest and other functions

2 files changed, 49 insertions, 49 deletions

diff --git a/constants/event_constants.asm b/constants/event_constants.asm
index 7fc3b509..49050dd3 100644
--- a/constants/event_constants.asm
+++ b/constants/event_constants.asm
@@ -1381,8 +1381,8 @@ const_value = 0
 	const EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0       ; 562, (D7F3, bit 2)
 	const EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1       ; 563, (D7F3, bit 3)
 	const EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2       ; 564, (D7F3, bit 4)
-	const EVENT_565                                  ; 565, (D7F3, bit 5)
-	const EVENT_566                                  ; 566, (D7F3, bit 6)
+	const EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_3       ; 565, (D7F3, bit 5)
+	const EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_4       ; 566, (D7F3, bit 6)
 	const EVENT_567                                  ; 567, (D7F3, bit 7)
 	const EVENT_568                                  ; 568, (D7F4, bit 0)
 	const EVENT_569                                  ; 569, (D7F4, bit 1)
diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
index fde4d42a..e11cc4aa 100755
--- a/constants/trainer_constants.asm
+++ b/constants/trainer_constants.asm
@@ -6,50 +6,50 @@ ENDM
 
 const_value = 1
 
-	trainer_const YOUNGSTER     ; $01
-	trainer_const BUG_CATCHER   ; $02
-	trainer_const LASS          ; $03
-	trainer_const SAILOR        ; $04
-	trainer_const JR_TRAINER_M ; $05
-	trainer_const JR_TRAINER_F ; $06
-	trainer_const POKEMANIAC    ; $07
-	trainer_const SUPER_NERD    ; $08
-	trainer_const HIKER         ; $09
-	trainer_const BIKER         ; $0A
-	trainer_const BURGLAR       ; $0B
-	trainer_const ENGINEER      ; $0C
-	trainer_const JUGGLER_X     ; $0D
-	trainer_const FISHER        ; $0E
-	trainer_const SWIMMER       ; $0F
-	trainer_const CUE_BALL      ; $10
-	trainer_const GAMBLER       ; $11
-	trainer_const BEAUTY        ; $12
-	trainer_const PSYCHIC_TR    ; $13
-	trainer_const ROCKER        ; $14
-	trainer_const JUGGLER       ; $15
-	trainer_const TAMER         ; $16
-	trainer_const BIRD_KEEPER   ; $17
-	trainer_const BLACKBELT     ; $18
-	trainer_const SONY1         ; $19
-	trainer_const PROF_OAK      ; $1A
-	trainer_const CHIEF         ; $1B
-	trainer_const SCIENTIST     ; $1C
-	trainer_const GIOVANNI      ; $1D
-	trainer_const ROCKET        ; $1E
-	trainer_const COOLTRAINER_M ; $1F
-	trainer_const COOLTRAINER_F ; $20
-	trainer_const BRUNO         ; $21
-	trainer_const BROCK         ; $22
-	trainer_const MISTY         ; $23
-	trainer_const LT_SURGE      ; $24
-	trainer_const ERIKA         ; $25
-	trainer_const KOGA          ; $26
-	trainer_const BLAINE        ; $27
-	trainer_const SABRINA       ; $28
-	trainer_const GENTLEMAN     ; $29
-	trainer_const SONY2         ; $2A
-	trainer_const SONY3         ; $2B
-	trainer_const LORELEI       ; $2C
-	trainer_const CHANNELER     ; $2D
-	trainer_const AGATHA        ; $2E
-	trainer_const LANCE         ; $2F
+	trainer_const YOUNGSTER     ; $01 | OPP = $C9
+	trainer_const BUG_CATCHER   ; $02 | OPP = $CA
+	trainer_const LASS          ; $03 | OPP = $CB
+	trainer_const SAILOR        ; $04 | OPP = $CC
+	trainer_const JR_TRAINER_M  ; $05 | OPP = $CD
+	trainer_const JR_TRAINER_F  ; $06 | OPP = $CE
+	trainer_const POKEMANIAC    ; $07 | OPP = $CF
+	trainer_const SUPER_NERD    ; $08 | OPP = $D0
+	trainer_const HIKER         ; $09 | OPP = $D1
+	trainer_const BIKER         ; $0A | OPP = $D2
+	trainer_const BURGLAR       ; $0B | OPP = $D3
+	trainer_const ENGINEER      ; $0C | OPP = $D4
+	trainer_const JUGGLER_X     ; $0D | OPP = $D5
+	trainer_const FISHER        ; $0E | OPP = $D6
+	trainer_const SWIMMER       ; $0F | OPP = $D7
+	trainer_const CUE_BALL      ; $10 | OPP = $D8
+	trainer_const GAMBLER       ; $11 | OPP = $D9
+	trainer_const BEAUTY        ; $12 | OPP = $DA
+	trainer_const PSYCHIC_TR    ; $13 | OPP = $DB
+	trainer_const ROCKER        ; $14 | OPP = $DC
+	trainer_const JUGGLER       ; $15 | OPP = $DD
+	trainer_const TAMER         ; $16 | OPP = $DE
+	trainer_const BIRD_KEEPER   ; $17 | OPP = $DF
+	trainer_const BLACKBELT     ; $18 | OPP = $E0
+	trainer_const SONY1         ; $19 | OPP = $E1
+	trainer_const PROF_OAK      ; $1A | OPP = $E2
+	trainer_const CHIEF         ; $1B | OPP = $E3
+	trainer_const SCIENTIST     ; $1C | OPP = $E4
+	trainer_const GIOVANNI      ; $1D | OPP = $E5
+	trainer_const ROCKET        ; $1E | OPP = $E6
+	trainer_const COOLTRAINER_M ; $1F | OPP = $E7
+	trainer_const COOLTRAINER_F ; $20 | OPP = $E8
+	trainer_const BRUNO         ; $21 | OPP = $E9
+	trainer_const BROCK         ; $22 | OPP = $EA
+	trainer_const MISTY         ; $23 | OPP = $EB
+	trainer_const LT_SURGE      ; $24 | OPP = $EC
+	trainer_const ERIKA         ; $25 | OPP = $ED
+	trainer_const KOGA          ; $26 | OPP = $EE
+	trainer_const BLAINE        ; $27 | OPP = $EF
+	trainer_const SABRINA       ; $28 | OPP = $F0
+	trainer_const GENTLEMAN     ; $29 | OPP = $F1
+	trainer_const SONY2         ; $2A | OPP = $F2
+	trainer_const SONY3         ; $2B | OPP = $F3
+	trainer_const LORELEI       ; $2C | OPP = $F4
+	trainer_const CHANNELER     ; $2D | OPP = $F5
+	trainer_const AGATHA        ; $2E | OPP = $F6
+	trainer_const LANCE         ; $2F | OPP = $F7