Merge branch 'master' into mistress

audio.asm

@@ -380,6 +380,7 @@ INCLUDE "crysaudio/music/RBY/victory4.asm"
 INCLUDE "crysaudio/music/RBY/kinchou01.asm"
 INCLUDE "crysaudio/music/RBY/mewtwo01.asm"
 INCLUDE "crysaudio/music/RBY/legendarybattle.asm"
+INCLUDE "crysaudio/music/RBY/giovannisroom.asm"
 
 SECTION "TCG Songs 1", ROMX
 

constants/music_constants.asm

@@ -64,6 +64,7 @@
 	const MUSIC_KINCHOU01
 	const MUSIC_MEWTWO01
 	const MUSIC_LEGENDARYBATTLE
+	const MUSIC_GIOVANNIS_ROOM
 
 	const NUM_SONGS
 

crysaudio/music/RBY/giovannisroom.asm

@@ -0,0 +1,368 @@
+Music_GiovannisRoom:
+	channel_count 2
+	channel 2, Music_GiovannisRoom_Ch2
+	channel 3, Music_GiovannisRoom_Ch3
+
+Music_GiovannisRoom_Ch2:
+	vibrato 11, 1, 5
+	duty_cycle 3
+	note_type 12, 0, -7
+	stereo_panning TRUE, FALSE
+	note_type 12, 4, -5
+	octave 5
+	rest 4
+	stereo_panning TRUE, TRUE
+Music_GiovannisRoom_branch_7dfeb:
+	note_type 12, 12, 2
+Music_GiovannisRoom_branch_7dfed:
+	sound_call Music_GiovannisRoom_branch_7e097
+	sound_loop 3, Music_GiovannisRoom_branch_7dfed
+	octave 2
+	note E_, 1
+	note E_, 1
+	note B_, 1
+	octave 3
+	note C_, 1
+	rest 2
+	note C_, 1
+	octave 2
+	note B_, 1
+	note E_, 1
+	note E_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note F#, 1
+	note G_, 1
+	note D#, 1
+Music_GiovannisRoom_branch_7e006:
+	sound_call Music_GiovannisRoom_branch_7e097
+	sound_loop 4, Music_GiovannisRoom_branch_7e006
+	rest 2
+	sound_call Music_GiovannisRoom_branch_7e0ab
+	octave 3
+	note C_, 4
+	sound_call Music_GiovannisRoom_branch_7e0ab
+	octave 3
+	note C#, 4
+	sound_call Music_GiovannisRoom_branch_7e0ab
+	octave 3
+	note D#, 4
+	note_type 12, 13, 3
+	octave 4
+	note E_, 4
+	note D#, 4
+	note C_, 4
+	octave 3
+	note B_, 4
+	note_type 12, 13, 2
+	sound_call Music_GiovannisRoom_branch_7e0b5
+	octave 3
+	note F#, 4
+	sound_call Music_GiovannisRoom_branch_7e0b5
+	octave 3
+	note G_, 4
+	sound_call Music_GiovannisRoom_branch_7e0b5
+	octave 3
+	note A#, 4
+	note_type 12, 13, 3
+	octave 4
+	note E_, 4
+	note D#, 4
+	note C_, 4
+	octave 3
+	note B_, 4
+	octave 4
+	note C_, 4
+	octave 3
+	note B_, 4
+	note G_, 4
+	note F#, 2
+	note_type 12, 13, 6
+	note E_, 8
+	note F_, 8
+	note F#, 8
+	note G_, 8
+	note_type 12, 13, 2
+	sound_call Music_GiovannisRoom_branch_7e0ba
+	rest 10
+	note E_, 1
+	rest 1
+	sound_call Music_GiovannisRoom_branch_7e0ba
+	rest 12
+	sound_call Music_GiovannisRoom_branch_7e0ba
+	rest 12
+	sound_call Music_GiovannisRoom_branch_7e0ba
+	rest 14
+	note_type 12, 13, 3
+	sound_call Music_GiovannisRoom_branch_7e0cd
+	note D#, 4
+	sound_call Music_GiovannisRoom_branch_7e0cd
+	note D#, 2
+	rest 2
+	note_type 12, 13, 2
+	sound_call Music_GiovannisRoom_branch_7e0c0
+	rest 2
+	octave 3
+	note F#, 4
+	octave 2
+	note E_, 1
+	note E_, 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note C_, 1
+	rest 1
+	note C#, 1
+	rest 1
+	note D_, 1
+	note C#, 1
+	rest 2
+	octave 3
+	note G_, 4
+	sound_call Music_GiovannisRoom_branch_7e0c0
+	octave 3
+	note A#, 4
+	note_type 12, 13, 6
+	note B_, 8
+	octave 4
+	note D#, 8
+	note_type 12, 13, 2
+	sound_call Music_GiovannisRoom_branch_7e097
+	sound_call Music_GiovannisRoom_branch_7e097
+	sound_loop 0, Music_GiovannisRoom_branch_7dfeb
+
+Music_GiovannisRoom_branch_7e097:
+	octave 2
+	note E_, 1
+	note E_, 1
+	note B_, 1
+	octave 3
+	note C_, 1
+	rest 2
+	note C_, 1
+	octave 2
+	note B_, 1
+	note E_, 1
+	note E_, 1
+	note B_, 1
+	octave 3
+	note C_, 1
+	rest 2
+	note C_, 1
+	octave 2
+	note B_, 1
+	sound_ret
+
+Music_GiovannisRoom_branch_7e0ab:
+	octave 2
+	note E_, 1
+	note E_, 1
+	rest 2
+	octave 1
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 3
+	sound_ret
+
+Music_GiovannisRoom_branch_7e0b5:
+	octave 2
+	note E_, 1
+	note E_, 1
+	rest 10
+	sound_ret
+
+Music_GiovannisRoom_branch_7e0ba:
+	octave 1
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note D#, 1
+	sound_ret
+
+Music_GiovannisRoom_branch_7e0c0:
+	octave 2
+	note E_, 1
+	note E_, 1
+	octave 4
+	note E_, 1
+	rest 1
+	note D#, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note C#, 1
+	note C_, 1
+	sound_ret
+
+Music_GiovannisRoom_branch_7e0cd:
+	octave 3
+	note E_, 6
+	note G_, 6
+	note E_, 4
+	note A_, 6
+	octave 4
+	note C_, 6
+	octave 3
+	note B_, 4
+	note G_, 6
+	note A#, 6
+	note F#, 4
+	note E_, 6
+	note F#, 6
+	sound_ret
+
+Music_GiovannisRoom_Ch3:
+	note_type 12, 1, 1
+	vibrato 8, 2, 6
+	rest 2
+	octave 4
+	note D_, 1
+	note D#, 1
+Music_GiovannisRoom_branch_7e0e5:
+	sound_call Music_GiovannisRoom_branch_7e140
+	sound_call Music_GiovannisRoom_branch_7e140
+	octave 5
+	note E_, 2
+	rest 4
+	octave 3
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 1
+	octave 4
+	note F#, 4
+	sound_call Music_GiovannisRoom_branch_7e154
+	octave 4
+	note G_, 4
+	sound_call Music_GiovannisRoom_branch_7e154
+	octave 4
+	note A_, 4
+	note B_, 4
+	note A#, 4
+	note G_, 4
+	note F#, 4
+	rest 6
+	sound_call Music_GiovannisRoom_branch_7e177
+	note B_, 4
+	note A#, 4
+	note G_, 4
+	note F#, 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note D#, 4
+	sound_call Music_GiovannisRoom_branch_7e15e
+	rest 12
+	sound_call Music_GiovannisRoom_branch_7e15e
+	rest 12
+	sound_call Music_GiovannisRoom_branch_7e15e
+	rest 10
+	note E_, 1
+	rest 1
+	sound_call Music_GiovannisRoom_branch_7e15e
+	rest 12
+	sound_call Music_GiovannisRoom_branch_7e15e
+	rest 12
+	sound_call Music_GiovannisRoom_branch_7e15e
+	rest 10
+	note D_, 1
+	note D#, 1
+	sound_call Music_GiovannisRoom_branch_7e164
+	sound_call Music_GiovannisRoom_branch_7e164
+	note E_, 2
+	rest 4
+	sound_call Music_GiovannisRoom_branch_7e177
+	note B_, 8
+	note F#, 6
+	note D_, 1
+	note D#, 1
+	rest 16
+	rest 16
+	sound_loop 0, Music_GiovannisRoom_branch_7e0e5
+
+Music_GiovannisRoom_branch_7e140:
+	octave 5
+	note E_, 4
+	note B_, 4
+	note A#, 4
+	octave 6
+	note D_, 4
+	note C#, 4
+	octave 5
+	note G#, 4
+	note G_, 4
+	note B_, 4
+	note A#, 4
+	note E_, 4
+	note D#, 4
+	note A_, 4
+	note G#, 4
+	note E_, 4
+	note F#, 4
+	note D#, 4
+	sound_ret
+
+Music_GiovannisRoom_branch_7e154:
+	octave 6
+	note E_, 1
+	note E_, 1
+	rest 4
+	octave 3
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 1
+	sound_ret
+
+Music_GiovannisRoom_branch_7e15e:
+	octave 3
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note D#, 1
+	sound_ret
+
+Music_GiovannisRoom_branch_7e164:
+	note E_, 4
+	note B_, 4
+	note A#, 4
+	octave 4
+	note D_, 4
+	note C#, 4
+	octave 3
+	note G#, 4
+	note G_, 4
+	note B_, 4
+	note A#, 4
+	note E_, 4
+	note D#, 4
+	note A_, 4
+	note G#, 4
+	note E_, 4
+	note F#, 4
+	note D#, 4
+	sound_ret
+
+Music_GiovannisRoom_branch_7e177:
+	octave 4
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 1
+	note F#, 4
+	rest 6
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 1
+	note G_, 4
+	rest 6
+	note E_, 1
+	rest 3
+	note E_, 1
+	note E_, 1
+	note A#, 4
+	sound_ret

crysaudio/music_pointers_red.asm

@@ -58,3 +58,4 @@ Music:
 	dba Music_Kinchou01
 	dba Music_Mewtwo01
 	dba Music_LegendaryBattle
+	dba Music_GiovannisRoom

data/maps/songs.asm

@@ -248,7 +248,7 @@ MapSongBanks::
 	db MUSIC_DUNGEON1, 0 ; BRUNOS_ROOM
 	db MUSIC_POKEMON_TOWER, 0 ; AGATHAS_ROOM
 	db MUSIC_DUNGEON3, 0 ; ROCK_TUNNEL_B1F
-	db MUSIC_DUNGEON1, 0 ; GIOVANNIS_ROOM
+	db MUSIC_GIOVANNIS_ROOM, 0 ; GIOVANNIS_ROOM
 	db MUSIC_GYM, 0 ; BATTLE_TENT
 	db MUSIC_VICTORY4, 0 ; MT_MOON_SQUARE
 	db MUSIC_VICTORY4, 0 ; MT_MOON_SQUARE_HOUSE

data/player_names.asm

@@ -9,7 +9,7 @@ DefaultNamesGirl:
 	db   "NEW NAME"
 	next "GREEN"
 	next "LEAF"
-	next "SEREN"
+	next "ELAINE"
 	db   "@"
 
 DefaultNamesRival:

data/player_names_list.asm

@@ -8,7 +8,7 @@ DefaultNamesGirlList:
 	db "NEW NAME@"
 	db "GREEN@"
 	db "LEAF@"
-	db "SEREN@"
+	db "ELAINE@"
 
 DefaultNamesRivalList:
 	db "NEW NAME@"

data/pokemon/evos_moves.asm

@@ -1614,6 +1614,7 @@ VaporeonEvosMoves:
 	db 44, MIST
 	db 47, ACID_ARMOR
 	db 52, HYDRO_PUMP
+	db 0
 
 MachopEvosMoves:
 ; Evolutions

data/tilesets/collision_tile_ids.asm

@@ -59,7 +59,7 @@ Lab_Coll::
 	coll_tiles $0c, $26, $16, $1e, $34, $37
 
 FossilLab_Coll:: ; Originally just the Lab collision, but now that Oak uses it, it's using separate collision. Added plenty just to be sure.
-	coll_tiles $0c, $26, $16, $1e, $34, $37, $17, $4C, $47, $58, $57, $59, $27, $4D
+	coll_tiles $0c, $26, $16, $1e, $34, $37, $17, $4C, $47, $58, $57, $59, $27, $4D, $4F
 
 Club_Coll::
 	coll_tiles $0f, $1a, $1f, $26, $28, $29, $2c, $2d, $2e, $2f, $41

data/trainers/rival_parties.asm

@@ -60,8 +60,8 @@ ProfOakData:
 	db $FF, 61, TAUROS, 62, GYARADOS, 63, ARCANINE, 63, EXEGGUTOR, 64, NIDOKING, 65, TOTARTLE, 0
 	db $FF, 61, TAUROS, 62, EXEGGUTOR, 63, GYARADOS, 63, ARCANINE, 64, NIDOKING, 65, VENUSAUR, 0
 	db $FF, 61, TAUROS, 62, ARCANINE, 63, EXEGGUTOR, 63, GYARADOS, 64, NIDOKING, 65, CHARIZARD, 0
-	db $FF, 61, TAUROS, 62, MAGNEZONE, 62, NIDOKING, 65, TOTARTLE, 65, CHARIZARD, 65, VENUSAUR, 0
+	db $FF, 61, TAUROS, 62, MAGNEZONE, 62, NIDOKING, 65, VENUSAUR, 65, CHARIZARD, 65, TOTARTLE, 0
-	db $FF, 61, TAUROS, 62, MAGNEZONE, 62, NIDOKING, 65, CHARIZARD, 65, VENUSAUR, 65, TOTARTLE, 0
+	db $FF, 61, TAUROS, 62, MAGNEZONE, 62, NIDOKING, 65, VENUSAUR, 65, CHARIZARD, 65, TOTARTLE, 0
 ; with Oak's teams, he uses his original unused team with Nidoking added on.
 ; his teams weren't changed in Yellow, so what I've decided to do is give him all 3 starters that weren't chosen.
 ; he should also use a Magnezone here, since his other team mirrors Blue's in many ways, and Magnezone avoids type overlap.

data/trainers/scaled_parties.asm

@@ -4,7 +4,7 @@
 BrockData:
 	db $FF, 11, GEODUDE, 12, DECILLA, 14, ONIX, 0                                              ; 0 badges
 	db $FF, 19, GEODUDE, 18, KABUTO, 19, DECILLA, 21, ONIX, 0                                  ; 1
-	db $FF, 22, GRAVELER, 21, OMANYTE, 21, KABUTO, 23, DECILLA, 24, ONIX, 0                    ; 2
+	db $FF, 22, GRAVELER, 21, OMANYTE, 21, KABUTO, 23, DECILLA, 25, ONIX, 0                    ; 2
 	db $FF, 29, GRAVELER, 28, OMANYTE, 28, KABUTO, 29, DECILLA, 31, ONIX, 0                    ; 3
 	db $FF, 38, GOLEM, 37, OMANYTE, 37, KABUTO, 38, DECILLA, 40, STEELIX, 0,                   ; 4
 	db $FF, 41, GOLEM, 40, OMASTAR, 40, KABUTOPS, 41, GAWARHED, 43, STEELIX, 0                 ; 5
@@ -27,7 +27,7 @@ LtSurgeData:
 	db $FF, 11, VOLTORB, 12, PIKACHU, 14, GAOTORA, 0                                                ; 0 badges
 	db $FF, 19, VOLTORB, 18, PIKACHU, 19, GAOTORA, 21, ELECTABUZZ, 0                                ; 1
 	db $FF, 22, VOLTORB, 21, GAOTORA, 21, MAGNETITE, 23, ELECTABUZZ, 25, RAICHU, 0                  ; 2
-	db $FF, 29, ELECTRODE, 28, GAOTORA, 28, MAGNETITE, 29, ELECTABUZZ, 31, RAICHU, 0                ; 3
+	db $FF, 29, VOLTORB, 28, GAOTORA, 28, MAGNETITE, 29, ELECTABUZZ, 31, RAICHU, 0                ; 3
 	db $FF, 38, ELECTRODE, 37, GOROTORA, 37, MAGNETON, 38, ELECTABUZZ, 40, GOROCHU, 0               ; 4
 	db $FF, 41, ELECTRODE, 40, GOROTORA, 40, MAGNETON, 41, ELECTABUZZ, 43, GOROCHU, 0               ; 5
 	db $FF, 45, ELECTRODE, 44, GOROTORA, 44, MAGNEZONE, 45, ELECTIVIRE, 47, GOROCHU, 0              ; 6
@@ -41,7 +41,7 @@ ErikaData:
 	db $FF, 29, WEEPINBELL, 28, PARASECT, 28, CACTORMUS, 29, TANGELA, 31, BELLOSSOM, 0                  ; 3
 	db $FF, 38, VICTREEBEL, 37, PARASECT, 37, CACTORMUS, 38, TANGELA, 40, BELLOSSOM, 0                  ; 4
 	db $FF, 41, VICTREEBEL, 40, PARASECT, 40, CACTORMUS, 41, BELLOSSOM, 43, TANGROWTH, 0                ; 5
-	db $FF, 45, VICTREEBEL, 44, PARASECT, 45, CACTORMUS, 45, BELLOSSOM, 47, TANGROWTH, 0                ; 6
+	db $FF, 45, VICTREEBEL, 44, PARASECT, 44, CACTORMUS, 45, BELLOSSOM, 47, TANGROWTH, 0                ; 6
 	db $FF, 47, VICTREEBEL, 46, PARASECT, 46, CACTORMUS, 48, BELLOSSOM, 48, LEAFEON, 50, TANGROWTH, 0   ; 7 (unused)
 	db $FF, 62, BELLOSSOM, 62, TOEDSCRUEL, 61, ELECTRODE_H, 61, LEAFEON, 62, VENUSAUR, 65, TANGROWTH, 0 ; 8 (postgame)
 
@@ -64,8 +64,8 @@ SabrinaData:
 	db $FF, 38, ESPEON, 37, MR_MIME, 37, SLOWKING, 38, HYPNO, 40, ALAKAZAM, 0                    ; 4
 	db $FF, 41, ESPEON, 40, MR_MIME, 40, SLOWKING, 41, HYPNO, 43, ALAKAZAM, 0                    ; 5
 	db $FF, 45, ESPEON, 44, MR_MIME, 44, SLOWKING, 45, HYPNO, 47, ALAKAZAM, 0                    ; 6
-	db $FF, 47, ESPEON, 46, MR_MIME, 46, SLOWKING, 48, EXEGGUTOR, 48, HYPNO, 50, ALAKAZAM, 0     ; 7 (unused)
+	db $FF, 47, ESPEON, 46, MR_MIME, 46, SLOWKING, 48, JYNX, 48, HYPNO, 50, ALAKAZAM, 0          ; 7 (unused)
-	db $FF, 62, EXEGGUTOR, 62, SLOWKING, 61, RAPIDASH_G, 62, HYPNO, 61, ESPEON, 65, ALAKAZAM, 0  ; 8 (postgame)
+	db $FF, 62, JYNX, 62, SLOWKING, 61, RAPIDASH_G, 62, HYPNO, 61, ESPEON, 65, ALAKAZAM, 0       ; 8 (postgame)
 
 BlaineData:
 	db $FF, 11, VULPIX, 12, GROWLITHE, 14, PONYTA, 0                                                 ; 0 badges (unused)

data/trainers/special_moves.asm

@@ -21,7 +21,7 @@ SpecialTrainerMoves:
 	
 	db YUJIROU, 4	; Yujirou 3 badges
 	db 2, 1, DIG
-	db 3, 4, THUNDER_WAVE
+	db 3, 4, SING
 	db 4, 2, PECK
 	db 4, 3, CUT
 	db 5, 3, WRAP
@@ -33,8 +33,7 @@ SpecialTrainerMoves:
 	db 1, 3, SCREECH
 	db 1, 4, BODY_SLAM
 	db 2, 4, DIG
-	db 3, 1, SING
+	db 3, 3, SING
-	db 3, 3, THUNDER_WAVE
 	db 4, 2, PECK
 	db 4, 3, CUT
 	db 5, 2, SWORDS_DANCE
@@ -136,7 +135,7 @@ SpecialTrainerMoves:
 	db 0
 	
 	db BROCK, 5		; Brock 4 badges
-	db 1, 3, MEGA_PUNCH
+	db 1, 3, ROCK_SLIDE
 	db 2, 1, SURF
 	db 2, 4, HORN_ATTACK
 	db 3, 2, BUBBLEBEAM
@@ -148,11 +147,12 @@ SpecialTrainerMoves:
 	db 0
 	
 	db BROCK, 6		; Brock 5 badges
-	db 1, 1, MEGA_PUNCH
+	db 1, 1, SELFDESTRUCT
-	db 1, 3, ROCK_SLIDE
+	db 1, 2, ROCK_SLIDE
 	db 2, 3, SURF
 	db 2, 4, ICE_BEAM
 	db 3, 1, SURF
+	db 3, 2, ROCK_THROW
 	db 3, 3, SWORDS_DANCE
 	db 4, 1, SUBSTITUTE
 	db 4, 4, DOUBLE_EDGE
@@ -162,11 +162,11 @@ SpecialTrainerMoves:
 	db 0
 	
 	db BROCK, 7		; Brock 6 badges
-	db 1, 1, MEGA_PUNCH
+	db 1, 1, SELFDESTRUCT
-	db 1, 2, ROCK_SLIDE
 	db 2, 2, SURF
 	db 2, 3, ICE_BEAM
 	db 3, 1, SURF
+	db 3, 2, ROCK_THROW
 	db 3, 3, SWORDS_DANCE
 	db 4, 1, ROCK_SLIDE
 	db 4, 3, DOUBLE_EDGE
@@ -192,7 +192,12 @@ SpecialTrainerMoves:
 	db 2, 2, THUNDER_WAVE
 	db 0
 
+	db RIVAL1, 14		; Cerulean City Rival w/Eevee
+	db 1, 1, PECK
+	db 0
+
 	db RIVAL1, 15		; Cerulean City Rival w/Pikachu
+	db 1, 1, PECK
 	db 4, 1, THUNDERSHOCK
 	db 0
 	
@@ -227,13 +232,19 @@ SpecialTrainerMoves:
 
 	db RIVAL2, 2		; SS Anne Rival w/Ivysaur
 	db 3, 1, THUNDER_WAVE
+	db 4, 1, TACKLE
 	db 0
 
 	db RIVAL2, 3		; SS Anne Rival w/Charmeleon
 	db 3, 1, THUNDER_WAVE
 	db 0
 	
+	db RIVAL2, 4		; SS Anne Rival w/Eevee
+	db 1, 1, PECK
+	db 0
+
 	db RIVAL2, 5		; SS Anne Rival w/Pikachu
+	db 1, 1, PECK
 	db 4, 2, THUNDERSHOCK
 	db 0
 	
@@ -248,7 +259,7 @@ SpecialTrainerMoves:
 	db 2, 1, THUNDERSHOCK
 	db 3, 4, THUNDER_WAVE
 	db 4, 3, THUNDERBOLT
-	db 5, 4, THUNDER_WAVE
+	db 4, 4, THUNDER_WAVE
 	db 0
 
 	db LT_SURGE, 3		; Surge 2 badges
@@ -316,6 +327,7 @@ SpecialTrainerMoves:
 	
 	db RIVAL2, 6		; Pokemon Tower Rival w/Wartortle
 	db 1, 4, MIMIC
+	db 2, 1, BITE
 	db 3, 3, LEECH_SEED
 	db 3, 4, CONFUSION
 	db 4, 1, THUNDER_WAVE
@@ -325,8 +337,9 @@ SpecialTrainerMoves:
 	db 1, 4, MIMIC
 	db 2, 3, BUBBLEBEAM
 	db 2, 4, BIDE
+	db 3, 1, BITE
 	db 4, 1, THUNDER_WAVE
-	db 5, 1, CUT
+	db 5, 3, CUT
 	db 0
 
 	db RIVAL2, 8		; Pokemon Tower Rival w/Charmeleon
@@ -336,7 +349,7 @@ SpecialTrainerMoves:
 	db 3, 3, BUBBLEBEAM
 	db 3, 4, BIDE
 	db 4, 1, THUNDER_WAVE
-	db 5, 4, CUT
+	db 5, 3, CUT
 	db 0
 	
 	db RIVAL2, 9		; Pokemon Tower Rival w/Eevee
@@ -386,7 +399,7 @@ SpecialTrainerMoves:
 	db ERIKA, 3		; Erika 2 badges
 	db 1, 2, GROWTH
 	db 1, 4, VINE_WHIP
-	db 1, 1, CUT
+	db 2, 1, CUT
 	db 4, 2, CUT
 	db 5, 3, MEGA_DRAIN
 	db 0
@@ -430,8 +443,8 @@ SpecialTrainerMoves:
 	db ERIKA, 7		; Erika 6 badges
 	db 1, 3, ACID
 	db 2, 2, MEGA_DRAIN
-	db 3, 1, EARTHQUAKE
+	db 3, 2, EARTHQUAKE
-	db 3, 3, VINE_WHIP
+	db 3, 4, VINE_WHIP
 	db 4, 2, MEGA_DRAIN
 	db 4, 4, ACID
 	db 5, 1, BIND
@@ -455,7 +468,7 @@ SpecialTrainerMoves:
 	db KOGA, 3		; Koga 2 badges
 	db 2, 4, WATER_GUN
 	db 3, 2, POUND
-	db 4, 1, TOXIC
+	db 4, 2, TOXIC
 	db 5, 2, TOXIC
 	db 5, 3, SCREECH
 	db 0
@@ -467,7 +480,7 @@ SpecialTrainerMoves:
 	db 2, 4, ACID
 	db 3, 1, BODY_SLAM
 	db 3, 2, DISABLE
-	db 4, 4, TOXIC
+	db 4, 1, TOXIC
 	db 5, 1, WING_ATTACK
 	db 5, 2, TOXIC
 	db 5, 4, SCREECH
@@ -492,27 +505,27 @@ SpecialTrainerMoves:
 	db 1, 3, MEGA_DRAIN
 	db 2, 1, TOXIC
 	db 2, 2, SURF
-	db 2, 4, WRAP
+	db 2, 3, WRAP
 	db 3, 3, BODY_SLAM
 	db 3, 4, TOXIC
-	db 4, 1, TOXIC
+	db 4, 4, TOXIC
 	db 5, 1, TOXIC
 	db 5, 2, FLY
 	db 0
 	
-	db BLACKBELT, 2		; Koichi 1 badge
+	db KOICHI, 2		; Koichi 1 badge
 	db 2, 3, TACKLE
 	db 3, 4, TACKLE
 	db 4, 3, TACKLE
 	db 0
 
-	db BLACKBELT, 3		;  Koichi 2 badges
+	db KOICHI, 3		;  Koichi 2 badges
 	db 3, 3, TACKLE
 	db 4, 4, TACKLE
 	db 5, 3, TACKLE
 	db 0
 	
-	db BLACKBELT, 4		; Koichi 3 badges
+	db KOICHI, 4		; Koichi 3 badges
 	db 2, 3, LEER
 	db 2, 4, UPPERCUT
 	db 3, 3, MEGA_KICK
@@ -522,7 +535,7 @@ SpecialTrainerMoves:
 	db 5, 4, DIG
 	db 0
 	
-	db BLACKBELT, 5		; Koichi 4 badges
+	db KOICHI, 5		; Koichi 4 badges
 	db 1, 4, ROCK_SLIDE
 	db 2, 2, LEER
 	db 2, 3, DIG
@@ -532,7 +545,7 @@ SpecialTrainerMoves:
 	db 5, 2, DIG
 	db 0
 	
-	db BLACKBELT, 6		; Koichi 5 badges
+	db KOICHI, 6		; Koichi 5 badges
 	db 1, 4, ROCK_SLIDE
 	db 2, 1, LOW_KICK
 	db 2, 2, LEER
@@ -542,7 +555,7 @@ SpecialTrainerMoves:
 	db 5, 2, DIG
 	db 0
 	
-	db BLACKBELT, 7		; Koichi 6 badges
+	db KOICHI, 7		; Koichi 6 badges
 	db 1, 3, ROCK_SLIDE
 	db 1, 4, EARTHQUAKE
 	db 2, 1, LOW_KICK
@@ -554,15 +567,15 @@ SpecialTrainerMoves:
 	db 5, 2, DIG
 	db 0
 	
-	db BLACKBELT, 8		; Koichi 7 badges
+	db KOICHI, 8		; Koichi 7 badges
 	db 1, 1, ROCK_SLIDE
 	db 1, 2, LOW_KICK
 	db 1, 3, EARTHQUAKE
-	db 2, 1, PIN_MISSILE
+	db 2, 3, PIN_MISSILE
-	db 2, 2, UPPERCUT
+	db 2, 4, UPPERCUT
 	db 3, 1, LOW_KICK
 	db 3, 2, ROCK_SLIDE
-	db 3, 3, DIG
+	db 3, 4, DIG
 	db 4, 1, MIMIC
 	db 4, 2, MEGA_KICK
 	db 4, 3, MEDITATE
@@ -571,12 +584,12 @@ SpecialTrainerMoves:
 	db 6, 1, DIG
 	db 0
 	
-	db BLACKBELT, 9		; Koichi 8 badges
+	db KOICHI, 9		; Koichi 8 badges
 	db 1, 1, ROCK_SLIDE
 	db 1, 2, EARTHQUAKE
 	db 1, 3, SUBMISSION
-	db 2, 1, PIN_MISSILE
+	db 2, 2, PIN_MISSILE
-	db 2, 2, UPPERCUT
+	db 2, 3, MEGA_PUNCH
 	db 3, 1, LOW_KICK
 	db 3, 3, ROCK_SLIDE
 	db 3, 4, DIG
@@ -593,7 +606,6 @@ SpecialTrainerMoves:
 	db 4, 2, BARRAGE
 	db 4, 4, CONFUSION
 	db 5, 2, THUNDER_WAVE
-	db 6, 1, BODY_SLAM
 	db 6, 2, MEGA_DRAIN
 	db 6, 3, SURF
 	db 0
@@ -604,8 +616,7 @@ SpecialTrainerMoves:
 	db 3, 1, SURF
 	db 4, 1, DIG
 	db 5, 2, THUNDER_WAVE
-	db 6, 2, BODY_SLAM
+	db 6, 3, LEECH_SEED
-	db 6, 3, GROWTH
 	db 0
 
 	db RIVAL2, 13		; Silph Co. Rival w/Charizard
@@ -615,9 +626,8 @@ SpecialTrainerMoves:
 	db 3, 4, CONFUSION
 	db 4, 1, SURF
 	db 5, 2, THUNDER_WAVE
-	db 6, 1, FLY
+	db 6, 3, SEISMIC_TOSS
-	db 6, 2, BODY_SLAM
+	db 6, 4, FLY
-	db 6, 3, FLAMETHROWER
 	db 0
 	
 	db RIVAL2, 14		; Silph Co. Rival w/Umbreon
@@ -635,7 +645,7 @@ SpecialTrainerMoves:
 	db RIVAL2, 15		; Silph Co. Rival w/Raichu
 	db 1, 3, DIG
 	db 1, 4, SWORDS_DANCE
-	db 2, 1, BARRAGE
+	db 2, 2, BARRAGE
 	db 2, 4, CONFUSION
 	db 3, 1, CONFUSE_RAY
 	db 3, 4, FLAMETHROWER
@@ -666,14 +676,14 @@ SpecialTrainerMoves:
 	db 0
 	
 	db SABRINA, 2		; Sabrina 1 badge
-	db 1, 3, WATER_GUN
+	db 1, 4, WATER_GUN
 	db 3, 1, PSYWAVE
 	db 4, 3, PSYWAVE
 	db 4, 4, REFLECT
 	db 0
 
 	db SABRINA, 3		; Sabrina 2 badges
-	db 1, 4, WATER_GUN
+	db 1, 2, WATER_GUN
 	db 3, 3, LEECH_SEED
 	db 3, 4, CONFUSION
 	db 4, 1, PSYWAVE
@@ -682,6 +692,7 @@ SpecialTrainerMoves:
 	db 0
 	
 	db SABRINA, 4		; Sabrina 3 badges
+	db 1, 1, CONFUSION
 	db 1, 4, WATER_GUN
 	db 2, 3, PSYWAVE
 	db 2, 4, REFLECT
@@ -725,7 +736,7 @@ SpecialTrainerMoves:
 	
 	db BLAINE, 3		; Blaine 2 badges
 	db 2, 3, EMBER
-	db 3, 4, DIG
+	db 3, 2, DIG
 	db 4, 1, CUT
 	db 5, 2, LEER
 	db 5, 3, SMOG
@@ -735,9 +746,9 @@ SpecialTrainerMoves:
 	db BLAINE, 4		; Blaine 3 badges
 	db 1, 1, EMBER
 	db 2, 2, EMBER
+	db 3, 1, BITE
 	db 3, 2, DIG
-	db 4, 1, CUT
+	db 4, 2, EMBER
-	db 4, 4, GROWL
 	db 5, 2, LEER
 	db 5, 3, SMOG
 	db 5, 4, FIRE_PUNCH
@@ -794,8 +805,10 @@ SpecialTrainerMoves:
 	db 3, 3, SKULL_BASH
 	db 3, 4, BONEMERANG
 	db 4, 1, ROCK_SLIDE
+	db 4, 2, BODY_SLAM
 	db 4, 3, DOUBLE_KICK
 	db 5, 1, THUNDERBOLT
+	db 5, 2, THRASH
 	db 5, 3, DOUBLE_KICK
 	db 6, 1, FISSURE
 	db 6, 3, STOMP
@@ -828,9 +841,9 @@ SpecialTrainerMoves:
 	db 4, 1, FIRE_BLAST
 	db 4, 2, DIG
 	db 4, 3, AGILITY
+	db 4, 4, DOUBLE_EDGE
 	db 5, 1, THUNDER_WAVE
-	db 6, 1, BODY_SLAM
+	db 6, 3, LEECH_SEED
-	db 6, 2, LEECH_SEED
 	db 0
 
 	db RIVAL2, 18		; Route 22 Rival w/Charizard
@@ -844,7 +857,7 @@ SpecialTrainerMoves:
 	db 4, 3, SURF
 	db 5, 1, THUNDER_WAVE
 	db 6, 1, FLY
-	db 6, 2, BODY_SLAM
+	db 6, 3, FIRE_SPIN
 	db 0
 	
 	db RIVAL2, 19		; Route 22 Rival w/Umbreon
@@ -854,7 +867,7 @@ SpecialTrainerMoves:
 	db 2, 2, HYPNOSIS
 	db 2, 3, PSYCHIC_M
 	db 3, 1, THUNDERBOLT
-	db 3, 2, DOUBLE_TEAM
+	db 3, 4, DOUBLE_TEAM
 	db 4, 1, CONFUSE_RAY
 	db 4, 2, REFLECT
 	db 4, 4, FIRE_BLAST
@@ -902,7 +915,7 @@ SpecialTrainerMoves:
 	db BRUNO, 1
 	db 1, 3, MEDITATE
 	db 2, 1, EARTHQUAKE
-	db 2, 2, ROCK_SLIDE
+	db 2, 3, ROCK_SLIDE
 	db 2, 4, EXPLOSION
 	db 3, 1, THUNDERBOLT
 	db 4, 1, SUBMISSION
@@ -914,15 +927,14 @@ SpecialTrainerMoves:
 	db 0
 
 	db AGATHA, 1
-	db 1, 1, LOW_KICK
+	db 1, 1, MEGA_PUNCH
 	db 1, 2, ROCK_SLIDE
-	db 1, 3, MEGA_PUNCH
 	db 2, 1, MEGA_DRAIN
 	db 2, 3, CONFUSE_RAY
 	db 2, 4, FLY
 	db 3, 1, THUNDERBOLT
 	db 3, 2, EXPLOSION
-	db 4, 1, WRAP
+	db 4, 3, WRAP
 	db 4, 4, EARTHQUAKE
 	db 5, 1, REST
 	db 5, 3, TOXIC
@@ -962,8 +974,9 @@ SpecialTrainerMoves:
 	db 5, 1, PSYCHIC_M
 	db 5, 2, SLEEP_POWDER
 	db 5, 4, SOLARBEAM
-	db 6, 2, BLIZZARD
+	db 6, 1, BLIZZARD
 	db 6, 3, BODY_SLAM
+	db 6, 4, PETAL_DANCE
 	db 0
 
 	db RIVAL3, 2		; Champion Rival w/Venusaur
@@ -980,6 +993,7 @@ SpecialTrainerMoves:
 	db 5, 4, DOUBLE_EDGE
 	db 6, 1, SOLARBEAM
 	db 6, 3, BODY_SLAM
+	db 6, 4, SLEEP_POWDER
 	db 0
 
 	db RIVAL3, 3		; Champion Rival w/Charizard
@@ -1035,4 +1049,318 @@ SpecialTrainerMoves:
 	db 6, 4, SURF
 	db 0
 	
+	db PROF_OAK, 1	; Totartle Team
+	db 1, 1, HYPER_BEAM
+	db 1, 3, EARTHQUAKE
+	db 1, 4, BLIZZARD
+	db 2, 1, BLIZZARD
+	db 2, 2, THUNDERBOLT
+	db 3, 1, FIRE_BLAST
+	db 3, 2, DIG
+	db 3, 3, AGILITY
+	db 3, 4, BODY_SLAM
+	db 4, 1, PSYCHIC_M
+	db 4, 2, SLEEP_POWDER
+	db 4, 3, EXPLOSION
+	db 4, 4, MEGA_DRAIN
+	db 5, 1, BLIZZARD
+	db 5, 3, THUNDERBOLT
+	db 5, 4, THRASH
+	db 6, 1, BLIZZARD
+	db 6, 3, BODY_SLAM
+	db 6, 4, SOLARBEAM
+	db 0
+	
+	db PROF_OAK, 2	; Venusaur Team
+	db 1, 1, HYPER_BEAM
+	db 1, 3, EARTHQUAKE
+	db 1, 4, BLIZZARD
+	db 2, 1, PSYCHIC_M
+	db 2, 2, SLEEP_POWDER
+	db 2, 3, EXPLOSION
+	db 2, 4, MEGA_DRAIN
+	db 3, 1, BLIZZARD
+	db 3, 2, THUNDERBOLT
+	db 4, 1, FIRE_BLAST
+	db 4, 2, DIG
+	db 4, 3, AGILITY
+	db 4, 4, BODY_SLAM
+	db 5, 1, BLIZZARD
+	db 5, 3, THUNDERBOLT
+	db 5, 4, THRASH
+	db 6, 1, SWORDS_DANCE
+	db 6, 2, RAZOR_LEAF
+	db 6, 3, HYPER_BEAM
+	db 6, 4, SLEEP_POWDER
+	db 0
+	
+	db PROF_OAK, 3	; Charizard Team
+	db 1, 1, HYPER_BEAM
+	db 1, 3, EARTHQUAKE
+	db 1, 4, BLIZZARD
+	db 2, 1, FIRE_BLAST
+	db 2, 2, DIG
+	db 2, 3, AGILITY
+	db 2, 4, BODY_SLAM
+	db 3, 1, PSYCHIC_M
+	db 3, 2, SLEEP_POWDER
+	db 3, 3, EXPLOSION
+	db 3, 4, MEGA_DRAIN
+	db 4, 1, BLIZZARD
+	db 4, 2, THUNDERBOLT
+	db 5, 1, BLIZZARD
+	db 5, 3, THUNDERBOLT
+	db 5, 4, THRASH
+	db 6, 1, SWORDS_DANCE
+	db 6, 3, FIRE_BLAST
+	db 6, 4, EARTHQUAKE
+	db 0
+	
+	db PROF_OAK, 4	; Pika/Vee Team 1
+	db 1, 1, HYPER_BEAM
+	db 1, 3, EARTHQUAKE
+	db 1, 4, BLIZZARD
+	db 2, 1, THUNDER_WAVE
+	db 2, 3, THUNDERBOLT
+	db 3, 1, BLIZZARD
+	db 3, 3, THUNDERBOLT
+	db 3, 4, THRASH
+	db 4, 1, SWORDS_DANCE
+	db 4, 2, RAZOR_LEAF
+	db 4, 3, HYPER_BEAM
+	db 4, 4, SLEEP_POWDER
+	db 5, 1, SWORDS_DANCE
+	db 5, 3, FIRE_BLAST
+	db 5, 4, EARTHQUAKE
+	db 6, 1, BLIZZARD
+	db 6, 3, BODY_SLAM
+	db 6, 4, SOLARBEAM
+	db 0
+	
+	db PROF_OAK, 5	; Pika/Vee Team 2
+	db 1, 1, HYPER_BEAM
+	db 1, 3, EARTHQUAKE
+	db 1, 4, BLIZZARD
+	db 2, 1, THUNDER_WAVE
+	db 2, 3, THUNDERBOLT
+	db 3, 1, BLIZZARD
+	db 3, 3, THUNDERBOLT
+	db 3, 4, THRASH
+	db 4, 1, SWORDS_DANCE
+	db 4, 2, RAZOR_LEAF
+	db 4, 3, HYPER_BEAM
+	db 4, 4, SLEEP_POWDER
+	db 5, 1, SWORDS_DANCE
+	db 5, 3, FIRE_BLAST
+	db 5, 4, EARTHQUAKE
+	db 6, 1, BLIZZARD
+	db 6, 3, BODY_SLAM
+	db 6, 4, SOLARBEAM
+	db 0
+	
+	db YUJIROU, 10	; Yujirou postgame
+	db 1, 1, BUBBLEBEAM
+	db 1, 2, THUNDERBOLT
+	db 1, 4, HYPNOSIS
+	db 2, 1, FIRE_BLAST
+	db 2, 3, HYPER_BEAM
+	db 2, 4, FISSURE
+	db 3, 1, REFLECT
+	db 3, 2, ICE_BEAM
+	db 3, 3, PSYCHIC_M
+	db 3, 4, SOFTBOILED
+	db 5, 2, LOVELY_KISS
+	db 5, 3, BLIZZARD
+	db 5, 4, AMNESIA
+	db 6, 1, WRAP
+	db 6, 2, SWORDS_DANCE
+	db 6, 3, HYPER_BEAM
+	db 6, 4, EARTHQUAKE
+	db 0
+	
+	db KOICHI, 10		; Koichi postgame
+	db 1, 1, ROCK_SLIDE
+	db 1, 2, EARTHQUAKE
+	db 1, 4, BODY_SLAM
+	db 2, 2, ROCK_SLIDE
+	db 2, 3, SEISMIC_TOSS
+	db 3, 1, EARTHQUAKE
+	db 3, 2, HYPER_BEAM
+	db 3, 3, BODY_SLAM
+	db 4, 1, COUNTER
+	db 4, 2, SEISMIC_TOSS
+	db 4, 4, BODY_SLAM
+	db 5, 2, AGILITY
+	db 5, 3, HI_JUMP_KICK
+	db 6, 3, HI_JUMP_KICK
+	db 6, 4, DIG
+	db 0
+	
+	db BROCK, 9		; Brock postgame
+	db 1, 3, EARTHQUAKE
+	db 1, 4, BODY_SLAM
+	db 2, 1, SURF
+	db 2, 2, SUBSTITUTE
+	db 2, 3, FIRE_BLAST
+	db 3, 3, FIRE_BLAST
+	db 3, 4, FIRE_SPIN
+	db 4, 1, BODY_SLAM
+	db 4, 2, REST
+	db 4, 3, SURF
+	db 4, 4, ICE_BEAM
+	db 5, 1, SURF
+	db 5, 2, SWORDS_DANCE
+	db 5, 3, HYPER_BEAM
+	db 5, 4, DIG
+	db 6, 1, ROCK_SLIDE
+	db 6, 3, BIND
+	db 6, 4, EARTHQUAKE
+	db 0
+
+	db MISTY, 9		; Misty postgame
+	db 1, 1, REST
+	db 1, 2, ICE_BEAM
+	db 2, 1, AMNESIA
+	db 2, 2, GLARE
+	db 2, 3, PSYCHIC_M
+	db 2, 4, SURF
+	db 3, 1, BODY_SLAM
+	db 3, 2, EARTHQUAKE
+	db 3, 3, SUBMISSION
+	db 4, 1, SURF
+	db 4, 2, GROWTH
+	db 4, 4, BLIZZARD
+	db 5, 1, COUNTER
+	db 5, 2, BLIZZARD
+	db 5, 3, MEGA_DRAIN
+	db 5, 4, SURF
+	db 6, 1, RECOVER
+	db 6, 2, SURF
+	db 6, 3, PSYCHIC_M
+	db 6, 4, THUNDERBOLT
+	db 0
+	
+	db LT_SURGE, 9	; Surge postgame
+	db 1, 1, THUNDER_WAVE
+	db 1, 2, EARTHQUAKE
+	db 1, 4, HYPER_BEAM
+	db 2, 1, THUNDER_WAVE
+	db 2, 3, THUNDERBOLT
+	db 3, 3, EARTHQUAKE
+	db 3, 4, THUNDER_WAVE
+	db 4, 1, THUNDERBOLT
+	db 4, 2, ROLLING_KICK
+	db 4, 3, ICE_PUNCH
+	db 4, 4, PSYCHIC_M
+	db 5, 3, THUNDERBOLT
+	db 5, 4, GROWTH
+	db 6, 1, THUNDERBOLT
+	db 6, 2, BODY_SLAM
+	db 6, 3, FLY
+	db 6, 4, SURF
+	db 0
+	
+	db ERIKA, 9		; Erika postgame
+	db 1, 1, REST
+	db 1, 2, RAZOR_LEAF
+	db 1, 3, ACID
+	db 2, 1, SWORDS_DANCE
+	db 2, 2, EARTHQUAKE
+	db 2, 3, WRAP
+	db 3, 1, MEGA_DRAIN
+	db 3, 2, THUNDERBOLT
+	db 3, 3, THUNDER_WAVE
+	db 4, 1, HYPER_BEAM
+	db 4, 3, BODY_SLAM
+	db 4, 4, SWORDS_DANCE
+	db 5, 1, SOLARBEAM
+	db 5, 3, BODY_SLAM
+	db 5, 4, SLEEP_POWDER
+	db 6, 2, MEGA_DRAIN
+	db 6, 3, ROCK_SLIDE
+	db 6, 4, AMNESIA
+	db 0
+	
+	db KOGA, 9		; Koga postgame
+	db 1, 2, MEGA_DRAIN
+	db 2, 1, RAZOR_LEAF
+	db 2, 2, ACID
+	db 2, 4, WRAP
+	db 3, 1, SURF
+	db 4, 1, THUNDERBOLT
+	db 4, 2, ICE_PUNCH
+	db 4, 3, SLUDGE
+	db 4, 4, EXPLOSION
+	db 5, 1, THUNDERBOLT
+	db 5, 2, FIRE_BLAST
+	db 5, 3, SLUDGE
+	db 6, 1, MEGA_DRAIN
+	db 6, 3, CONFUSE_RAY
+	db 6, 4, FLY
+	db 0
+	
+	db SABRINA, 9	; Sabrina postgame
+	db 1, 1, LOVELY_KISS
+	db 1, 2, BODY_SLAM
+	db 1, 3, PSYCHIC_M
+	db 2, 1, EARTHQUAKE
+	db 2, 2, SURF
+	db 3, 1, HYPNOSIS
+	db 3, 3, DOUBLE_KICK
+	db 4, 1, THUNDERPUNCH
+	db 4, 2, ICE_PUNCH
+	db 4, 4, AMNESIA
+	db 5, 1, HYPER_BEAM
+	db 5, 2, REFLECT
+	db 5, 3, GROWTH
+	db 6, 1, FIRE_PUNCH
+	db 6, 4, THUNDERPUNCH
+	db 0
+	
+	db BLAINE, 9	; Blaine postgame
+	db 1, 1, HYPNOSIS
+	db 1, 2, FIRE_SPIN
+	db 1, 3, DOUBLE_KICK
+	db 1, 4, FIRE_BLAST
+	db 2, 1, FIRE_BLAST
+	db 2, 2, DIG
+	db 2, 3, AGILITY
+	db 2, 4, BODY_SLAM
+	db 3, 1, BODY_SLAM
+	db 3, 2, EARTHQUAKE
+	db 3, 3, SUBMISSION
+	db 3, 4, FIRE_BLAST
+	db 4, 1, GROWTH
+	db 4, 2, HYPER_BEAM
+	db 4, 3, FIRE_BLAST
+	db 5, 1, FLY
+	db 5, 3, FIRE_BLAST
+	db 5, 4, EARTHQUAKE
+	db 6, 1, FIRE_BLAST
+	db 6, 2, THUNDERBOLT
+	db 6, 3, EARTHQUAKE
+	db 6, 4, CONFUSE_RAY
+	db 0
+	
+	db CHIEF, 1
+	db 1, 1, THUNDERBOLT
+	db 1, 2, THUNDER_WAVE
+	db 1, 3, HEADBUTT
+	db 2, 1, BLIZZARD
+	db 2, 2, THUNDERBOLT
+	db 2, 3, SING
+	db 2, 4, HYPER_BEAM
+	db 3, 1, IRON_HEAD
+	db 3, 3, HYPER_BEAM
+	db 4, 1, EXPLOSION
+	db 4, 2, THUNDERBOLT
+	db 4, 4, ICE_PUNCH
+	db 5, 1, THUNDERBOLT
+	db 5, 2, ICE_BEAM
+	db 5, 3, RECOVER
+	db 6, 1, THUNDERBOLT
+	db 6, 2, THUNDER_WAVE
+	db 6, 4, ICE_BEAM
+	db 0
+	
 	db -1 ; end

data/wild/maps/SafariZoneNorth.asm

@@ -5,7 +5,7 @@ SafariZoneNorthWildMons:
 	db 23, EXEGGCUTE
 	db 25, TANGELA
 	db 30, VENOMOTH
-	db 27, EXEGGCUTE
+	db 27, CUBONE
 	db 28, DODRIO
 	db 27, TAUROS
 	db 26, TRAMPEL

data/wild/maps/SafariZoneWest.asm

@@ -5,11 +5,11 @@ SafariZoneWestWildMons:
 	db 23, EXEGGCUTE
 	db 24, EXEGGCUTE
 	db 33, VENOMOTH
-	db 26, EXEGGCUTE
+	db 26, CUBONE
 	db 25, MAROWAK
 	db 25, SCYTHER
 	db 26, TAUROS
-	db 25, CHANSEY
+	db  7, CHANSEY
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

maps/OaksLab.blk

@@ -1,2 +1,2 @@
 		#	(					
-	6												
+	6								:			

text/SafariZoneEast.asm

@@ -11,6 +11,6 @@ _SafariZoneEastText6::
 	done
 
 _SafariZoneEastText7::
-	text "CENTER AREA"
+	text "AREA 1"
 	line "NORTH: AREA 2"
 	done

text/SafariZoneNorth.asm

@@ -11,6 +11,7 @@ _SafariZoneNorthText4::
 
 _SafariZoneNorthText5::
 	text "AREA 2"
+	line "SOUTH: AREA 3"
 	done
 
 _SafariZoneNorthText6::