From 84cf9e9bff3769531fb974a4e5ce91fc82e64743 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Tue, 26 Dec 2023 12:26:16 +0000 Subject: [PATCH 1/7] Oak's Lab improvements - Fixed some collision on the back wall - Made the exit tiles more obvious --- data/tilesets/collision_tile_ids.asm | 2 +- gfx/blocksets/fossillab.bst | Bin 928 -> 944 bytes gfx/tilesets/fossillab.png | Bin 2280 -> 1734 bytes maps/OaksLab.blk | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm index 2c2c0669..c0433d36 100644 --- a/data/tilesets/collision_tile_ids.asm +++ b/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 diff --git a/gfx/blocksets/fossillab.bst b/gfx/blocksets/fossillab.bst index ba89bc108453d94300edde9140526cf2595530d1..6b5d55b39b21f9ebf97f899a6004f1da839bada0 100644 GIT binary patch delta 36 dcmZ3$zJYy$0f!P4Y_!N=7I23Ge;_ai0sy6h2OV1ZP1_K>z@;j|==^1poj5 z24YJ`L;(K){{a7>y{D4^00tpRL_t(|oZXviZrm^og!haAa(~49$t7DjDBH%Y?6b1qJ`Dhs0(3HYcu+~785rHbjRdtDz)THPebr{C z0?a7y76pj&%zwGpJ-i=(D+{OK5~C)noQeHc&q3R<1XNIDb;$ZuRSU1fy%X zTMkB+0QB811=tF}4h6^xL!j1S90%4%M{*|5IAXS_F@KLhGZTE}>!S)#IUpXoQvsY@ zBLM7_M*%Qn@%${fIMxvWI%9_Of3H)W^^={?0L)|pXEZB-1HetL3&5=Oue8Pay0N-B zAOzu~j#&WQ?l}t=QGg793HpW`e+7L;UOjIK?Xg$R?d-t^#1hG5}P6ycVBQ zfNbsxmS+NB#J&N5S>YVO1IHkYPGHqK01Re=oPR5xI|bmQ3pgKl05Dr_qvSlBDF7xj zA$3xv04w%z0A`$r^*b_$%AzbBFmmiVAj`haKBS{S*zaiIJN4e)-o6aa@mhAB>!gN( zZ&L&HcL6X1K?eZk^h}m#1DF96_bY(dK0ZFajDxHG?$p8lgpIuho&w;W3Xla;?GgA| zoPVDHKn2WYeRl2u5UTL~OJK(kfYHoR&X00J0npi%0^s~&Zc+GrCjgka6#$vEyLt)$ z=wt1-fLBle&e{wB4)!wx(6uQ5(6K6*Cjgj%U{nE|3OUfbZD!2@u*0SRaKS_;yn+H$ z<2$tp?7l^G0ElZ{TLwTmQYpYHo%c|HYJWeo62KK7MB5Ai4BQL=>e>$gN)HMUI_;6g#mKQMrVl`1wh&5Gu+&~9`SpSp)@IHY7#63V~ zzmQ$a0O0e^ocW&Xs|`SB7ux|KQ-SKuqx(iOs{q-?P;C@B^E<&0rQ(81SmzUN9HWg| zZt)(sSD%Z&=22yM7l3LB;PolacYo}nR}>)Y6Mdn87=2^tDgb9R2bF!Cz4mc?wsa4` z&gpD$I-5ZLLKXK%9GPXSv#PjF9^PkFK|reDD?i3Hl_W~GJ3D;k`^^7;=fiU4vLmw@ z0J3k|yREaFsH_ZlRslObzhyf)NG#d9bUMJD3>^i8703m@Dz3k5d@=9q$bb6`x9>>C zxcq4zFJKz{|miUK$QD&>0_1;C)HH-Ksha0*aOunT~?hsvOWj{#G* zLjfv#dIeB{uYUbfdw^L5=$kGvL|(w*s70 z0UY1#CKZEHEs3k9o^^Kxr~;ZfIL3&_dr9U=1#kfD8sEbK!2T-$REDeIcO9(28d;vQ zdf2y9fK>ph4KfGW{Yv<<0IVoL1;9v_X8<^OI)FII9W45^^Owr*2X zl`I=)*Lwu31Hh^RWG}%~AI_>a4*_7c>;T}TjVi~i0;uazM%&@>H^PL~2^_tu!~g&Q M07*qoM6N<$f;M6Rz5oCK delta 2268 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 Date: Tue, 26 Dec 2023 14:59:02 +0000 Subject: [PATCH 2/7] Changing a default player name for Green I know that some people are gonna ask if 'Seren' is a misspelling of 'Serena', so I'm changing it so we won't get questions like that. It's now Elaine, which is the name of the LGPE protag so...kinda works Also changed an inconsistency in Erika's 6 badges party where her Cactormus was a higher level than it should've been --- data/player_names.asm | 2 +- data/player_names_list.asm | 2 +- data/trainers/scaled_parties.asm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/player_names.asm b/data/player_names.asm index 3c65c57b..6aec50fb 100644 --- a/data/player_names.asm +++ b/data/player_names.asm @@ -9,7 +9,7 @@ DefaultNamesGirl: db "NEW NAME" next "GREEN" next "LEAF" - next "SEREN" + next "ELAINE" db "@" DefaultNamesRival: diff --git a/data/player_names_list.asm b/data/player_names_list.asm index a0ac7579..f5c06f6a 100644 --- a/data/player_names_list.asm +++ b/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@" diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm index f32e42ee..11a527db 100644 --- a/data/trainers/scaled_parties.asm +++ b/data/trainers/scaled_parties.asm @@ -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) From 602013ca5193c9ff5d6d879e8119e3dbc86cb536 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Tue, 26 Dec 2023 17:14:39 +0000 Subject: [PATCH 3/7] Pre-Champion Boss trainer movesets! (finally! again!) Now. Please. I beg of you. Do not change any more level up movesets unless necessary. I will not be going back to check these again. Doing this is pain. --- data/trainers/scaled_parties.asm | 4 +- data/trainers/special_moves.asm | 118 +++++++++++++++++-------------- 2 files changed, 68 insertions(+), 54 deletions(-) diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm index 11a527db..38237f16 100644 --- a/data/trainers/scaled_parties.asm +++ b/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 diff --git a/data/trainers/special_moves.asm b/data/trainers/special_moves.asm index 1d3aa0f8..e163785e 100644 --- a/data/trainers/special_moves.asm +++ b/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, THUNDER_WAVE + db 3, 3, SING 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, 3, ROCK_SLIDE + db 1, 1, SELFDESTRUCT + 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, 2, ROCK_SLIDE + db 1, 1, SELFDESTRUCT 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, 3, VINE_WHIP + db 3, 2, EARTHQUAKE + 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, 2, UPPERCUT + db 2, 3, PIN_MISSILE + 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, UPPERCUT + db 2, 2, PIN_MISSILE + 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, GROWTH + db 6, 3, LEECH_SEED 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, 2, BODY_SLAM - db 6, 3, FLAMETHROWER + db 6, 3, SEISMIC_TOSS + db 6, 4, FLY 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, 4, GROWL + db 4, 2, EMBER 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, 2, LEECH_SEED + db 6, 3, 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 From bdf89fd6d237a4f2473a27d1cccd1fbc2dcfbacf Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Wed, 27 Dec 2023 11:20:39 +0000 Subject: [PATCH 4/7] Safari Zone tweaks Added some Cubones since it's featured in the Safari Zone in Yellow and Pokemon Origins. Changed the second Chansey's level to 7 for consistency. Also fixed an error on the Safari Zone Area 1 sign that said Centre Area, which was fixed in FRLG. Thanks to Lyra made a website for pointing this out! --- data/wild/maps/SafariZoneNorth.asm | 2 +- data/wild/maps/SafariZoneWest.asm | 4 ++-- text/SafariZoneEast.asm | 2 +- text/SafariZoneNorth.asm | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/data/wild/maps/SafariZoneNorth.asm b/data/wild/maps/SafariZoneNorth.asm index 740442dc..9543a202 100644 --- a/data/wild/maps/SafariZoneNorth.asm +++ b/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 diff --git a/data/wild/maps/SafariZoneWest.asm b/data/wild/maps/SafariZoneWest.asm index dbd65d3f..eb62a6e0 100644 --- a/data/wild/maps/SafariZoneWest.asm +++ b/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 diff --git a/text/SafariZoneEast.asm b/text/SafariZoneEast.asm index eebe5de7..a0f081fb 100644 --- a/text/SafariZoneEast.asm +++ b/text/SafariZoneEast.asm @@ -11,6 +11,6 @@ _SafariZoneEastText6:: done _SafariZoneEastText7:: - text "CENTER AREA" + text "AREA 1" line "NORTH: AREA 2" done diff --git a/text/SafariZoneNorth.asm b/text/SafariZoneNorth.asm index 1e148f0b..2f05334e 100644 --- a/text/SafariZoneNorth.asm +++ b/text/SafariZoneNorth.asm @@ -11,6 +11,7 @@ _SafariZoneNorthText4:: _SafariZoneNorthText5:: text "AREA 2" + line "SOUTH: AREA 3" done _SafariZoneNorthText6:: From 5859ea25ead756d62aed18a6196983995e7aa449 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Wed, 27 Dec 2023 22:18:23 +0000 Subject: [PATCH 5/7] Giovanni's Room theme okay look I did this months ago and now I'm finally pushing it This gives Giovanni's Room its own theme, which is a slower-tempo version of the Rocket HQ theme that's missing channel 1. --- audio.asm | 1 + constants/music_constants.asm | 1 + crysaudio/music/RBY/giovannisroom.asm | 368 ++++++++++++++++++++++++++ crysaudio/music_pointers_red.asm | 1 + data/maps/songs.asm | 2 +- 5 files changed, 372 insertions(+), 1 deletion(-) create mode 100644 crysaudio/music/RBY/giovannisroom.asm diff --git a/audio.asm b/audio.asm index f7ef5677..b1defe61 100644 --- a/audio.asm +++ b/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 diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 2356a040..cf463bad 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -64,6 +64,7 @@ const MUSIC_KINCHOU01 const MUSIC_MEWTWO01 const MUSIC_LEGENDARYBATTLE + const MUSIC_GIOVANNIS_ROOM const NUM_SONGS diff --git a/crysaudio/music/RBY/giovannisroom.asm b/crysaudio/music/RBY/giovannisroom.asm new file mode 100644 index 00000000..ef88d392 --- /dev/null +++ b/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 diff --git a/crysaudio/music_pointers_red.asm b/crysaudio/music_pointers_red.asm index e5bf36e1..e48fa6b7 100644 --- a/crysaudio/music_pointers_red.asm +++ b/crysaudio/music_pointers_red.asm @@ -58,3 +58,4 @@ Music: dba Music_Kinchou01 dba Music_Mewtwo01 dba Music_LegendaryBattle + dba Music_GiovannisRoom diff --git a/data/maps/songs.asm b/data/maps/songs.asm index 47fec6da..f510fc8b 100644 --- a/data/maps/songs.asm +++ b/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 From e401f05495c12159371c4826344bb22aa3bba12b Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Wed, 27 Dec 2023 23:00:09 +0000 Subject: [PATCH 6/7] Update evos_moves.asm how long has Vap's moveset been broken holy shit --- data/pokemon/evos_moves.asm | 1 + 1 file changed, 1 insertion(+) diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 647091af..0ee3d981 100644 --- a/data/pokemon/evos_moves.asm +++ b/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 From dbc9fe29293ab73ef12517878be34b093639e6b1 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Wed, 27 Dec 2023 23:31:30 +0000 Subject: [PATCH 7/7] Postgame boss movesets: Batch 1 Includes Professor Oak's 5 teams, Chief's team, as well as the postgame teams for Yujirou, Koichi, Brock, Misty, Lt. Surge, Erika, Koga, Sabrina and Blaine. --- data/trainers/rival_parties.asm | 4 +- data/trainers/scaled_parties.asm | 4 +- data/trainers/special_moves.asm | 314 +++++++++++++++++++++++++++++++ 3 files changed, 318 insertions(+), 4 deletions(-) diff --git a/data/trainers/rival_parties.asm b/data/trainers/rival_parties.asm index 60de4e4a..67521f0f 100644 --- a/data/trainers/rival_parties.asm +++ b/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, CHARIZARD, 65, VENUSAUR, 65, TOTARTLE, 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, 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. diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm index 38237f16..0d91512c 100644 --- a/data/trainers/scaled_parties.asm +++ b/data/trainers/scaled_parties.asm @@ -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, 62, EXEGGUTOR, 62, SLOWKING, 61, RAPIDASH_G, 62, HYPNO, 61, ESPEON, 65, ALAKAZAM, 0 ; 8 (postgame) + db $FF, 47, ESPEON, 46, MR_MIME, 46, SLOWKING, 48, JYNX, 48, HYPNO, 50, ALAKAZAM, 0 ; 7 (unused) + 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) diff --git a/data/trainers/special_moves.asm b/data/trainers/special_moves.asm index e163785e..68bebd9f 100644 --- a/data/trainers/special_moves.asm +++ b/data/trainers/special_moves.asm @@ -1048,5 +1048,319 @@ SpecialTrainerMoves: db 6, 3, THUNDER_WAVE 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