diff options
Diffstat (limited to 'data')
87 files changed, 697 insertions, 639 deletions
diff --git a/data/baseStats/farfetchd.asm b/data/baseStats/farfetchd.asm index 015e9ff8..a1084b17 100755 --- a/data/baseStats/farfetchd.asm +++ b/data/baseStats/farfetchd.asm @@ -1,5 +1,5 @@ FarfetchdBaseStats: ; 38cd6 (e:4cd6) -db DEX_FARFETCH_D ; pokedex id +db DEX_FARFETCHD ; pokedex id db 52 ; base hp db 65 ; base attack db 55 ; base defense diff --git a/data/evos_moves.asm b/data/evos_moves.asm index cdbec0d8..29a33479 100755 --- a/data/evos_moves.asm +++ b/data/evos_moves.asm @@ -202,6 +202,7 @@ Mon112_EvosMoves: ; 3b1d8 (e:71d8) db 55,LEER db 64,TAKE_DOWN db 0 + Mon115_EvosMoves: ; 3b1e6 (e:71e6) ;KANGASKHAN ;Evolutions @@ -213,6 +214,7 @@ Mon115_EvosMoves: ; 3b1e6 (e:71e6) db 41,LEER db 46,DIZZY_PUNCH db 0 + Mon032_EvosMoves: ; 3b1f2 (e:71f2) ;NIDORAN_M ;Evolutions @@ -226,6 +228,7 @@ Mon032_EvosMoves: ; 3b1f2 (e:71f2) db 36,HORN_DRILL db 43,DOUBLE_KICK db 0 + Mon035_EvosMoves: ; 3b203 (e:7203) ;CLEFAIRY ;Evolutions @@ -239,6 +242,7 @@ Mon035_EvosMoves: ; 3b203 (e:7203) db 39,DEFENSE_CURL db 48,LIGHT_SCREEN db 0 + Mon021_EvosMoves: ; 3b215 (e:7215) ;SPEAROW ;Evolutions @@ -251,6 +255,7 @@ Mon021_EvosMoves: ; 3b215 (e:7215) db 29,DRILL_PECK db 36,AGILITY db 0 + Mon100_EvosMoves: ; 3b224 (e:7224) ;VOLTORB ;Evolutions @@ -263,6 +268,7 @@ Mon100_EvosMoves: ; 3b224 (e:7224) db 36,SWIFT db 43,EXPLOSION db 0 + Mon034_EvosMoves: ; 3b233 (e:7233) ;NIDOKING ;Evolutions @@ -272,6 +278,7 @@ Mon034_EvosMoves: ; 3b233 (e:7233) db 14,POISON_STING db 23,THRASH db 0 + Mon080_EvosMoves: ; 3b23b (e:723b) ;SLOWBRO ;Evolutions @@ -285,6 +292,7 @@ Mon080_EvosMoves: ; 3b23b (e:723b) db 44,AMNESIA db 55,PSYCHIC_M db 0 + Mon002_EvosMoves: ; 3b24b (e:724b) ;IVYSAUR ;Evolutions @@ -299,6 +307,7 @@ Mon002_EvosMoves: ; 3b24b (e:724b) db 46,SLEEP_POWDER db 54,SOLARBEAM db 0 + Mon103_EvosMoves: ; 3b25e (e:725e) ;EXEGGUTOR ;Evolutions @@ -306,6 +315,7 @@ Mon103_EvosMoves: ; 3b25e (e:725e) ;Learnset db 28,STOMP db 0 + Mon108_EvosMoves: ; 3b262 (e:7262) ;LICKITUNG ;Evolutions @@ -317,10 +327,11 @@ Mon108_EvosMoves: ; 3b262 (e:7262) db 31,SLAM db 39,SCREECH db 0 + Mon102_EvosMoves: ; 3b26e (e:726e) ;EXEGGCUTE ;Evolutions - db EV_ITEM,LEAF_STONE ,1,EXEGGUTOR + db EV_ITEM,LEAF_STONE,1,EXEGGUTOR db 0 ;Learnset db 25,REFLECT @@ -330,6 +341,7 @@ Mon102_EvosMoves: ; 3b26e (e:726e) db 42,SOLARBEAM db 48,SLEEP_POWDER db 0 + Mon088_EvosMoves: ; 3b280 (e:7280) ;GRIMER ;Evolutions @@ -343,6 +355,7 @@ Mon088_EvosMoves: ; 3b280 (e:7280) db 48,SCREECH db 55,ACID_ARMOR db 0 + Mon094_EvosMoves: ; 3b291 (e:7291) ;GENGAR ;Evolutions @@ -351,6 +364,7 @@ Mon094_EvosMoves: ; 3b291 (e:7291) db 29,HYPNOSIS db 38,DREAM_EATER db 0 + Mon029_EvosMoves: ; 3b297 (e:7297) ;NIDORAN_F ;Evolutions @@ -364,6 +378,7 @@ Mon029_EvosMoves: ; 3b297 (e:7297) db 36,FURY_SWIPES db 43,DOUBLE_KICK db 0 + Mon031_EvosMoves: ; 3b2a8 (e:72a8) ;NIDOQUEEN ;Evolutions @@ -373,6 +388,7 @@ Mon031_EvosMoves: ; 3b2a8 (e:72a8) db 14,POISON_STING db 23,BODY_SLAM db 0 + Mon104_EvosMoves: ; 3b2b0 (e:72b0) ;CUBONE ;Evolutions @@ -385,6 +401,7 @@ Mon104_EvosMoves: ; 3b2b0 (e:72b0) db 43,BONEMERANG db 46,RAGE db 0 + Mon111_EvosMoves: ; 3b2bf (e:72bf) ;RHYHORN ;Evolutions @@ -398,6 +415,7 @@ Mon111_EvosMoves: ; 3b2bf (e:72bf) db 50,LEER db 55,TAKE_DOWN db 0 + Mon131_EvosMoves: ; 3b2d0 (e:72d0) ;LAPRAS ;Evolutions @@ -410,12 +428,14 @@ Mon131_EvosMoves: ; 3b2d0 (e:72d0) db 38,ICE_BEAM db 46,HYDRO_PUMP db 0 + Mon059_EvosMoves: ; 3b2de (e:72de) ;ARCANINE ;Evolutions db 0 ;Learnset db 0 + Mon151_EvosMoves: ; 3b2e0 (e:72e0) ;MEW ;Evolutions @@ -426,6 +446,7 @@ Mon151_EvosMoves: ; 3b2e0 (e:72e0) db 30,METRONOME db 40,PSYCHIC_M db 0 + Mon130_EvosMoves: ; 3b2ea (e:72ea) ;GYARADOS ;Evolutions @@ -437,10 +458,11 @@ Mon130_EvosMoves: ; 3b2ea (e:72ea) db 41,HYDRO_PUMP db 52,HYPER_BEAM db 0 + Mon090_EvosMoves: ; 3b2f6 (e:72f6) ;SHELLDER ;Evolutions - db EV_ITEM,WATER_STONE ,1,CLOYSTER + db EV_ITEM,WATER_STONE,1,CLOYSTER db 0 ;Learnset db 18,SUPERSONIC @@ -449,6 +471,7 @@ Mon090_EvosMoves: ; 3b2f6 (e:72f6) db 39,LEER db 50,ICE_BEAM db 0 + Mon072_EvosMoves: ; 3b306 (e:7306) ;TENTACOOL ;Evolutions @@ -464,6 +487,7 @@ Mon072_EvosMoves: ; 3b306 (e:7306) db 40,SCREECH db 48,HYDRO_PUMP db 0 + Mon092_EvosMoves: ; 3b31b (e:731b) ;GASTLY ;Evolutions @@ -473,6 +497,7 @@ Mon092_EvosMoves: ; 3b31b (e:731b) db 27,HYPNOSIS db 35,DREAM_EATER db 0 + Mon123_EvosMoves: ; 3b324 (e:7324) ;SCYTHER ;Evolutions @@ -485,10 +510,11 @@ Mon123_EvosMoves: ; 3b324 (e:7324) db 35,SWORDS_DANCE db 42,AGILITY db 0 + Mon120_EvosMoves: ; 3b332 (e:7332) ;STARYU ;Evolutions - db EV_ITEM,WATER_STONE ,1,STARMIE + db EV_ITEM,WATER_STONE,1,STARMIE db 0 ;Learnset db 17,WATER_GUN @@ -499,6 +525,7 @@ Mon120_EvosMoves: ; 3b332 (e:7332) db 42,LIGHT_SCREEN db 47,HYDRO_PUMP db 0 + Mon009_EvosMoves: ; 3b346 (e:7346) ;BLASTOISE ;Evolutions @@ -511,6 +538,7 @@ Mon009_EvosMoves: ; 3b346 (e:7346) db 42,SKULL_BASH db 52,HYDRO_PUMP db 0 + Mon127_EvosMoves: ; 3b354 (e:7354) ;PINSIR ;Evolutions @@ -523,6 +551,7 @@ Mon127_EvosMoves: ; 3b354 (e:7354) db 49,SLASH db 54,SWORDS_DANCE db 0 + Mon114_EvosMoves: ; 3b362 (e:7362) ;TANGELA ;Evolutions @@ -549,6 +578,7 @@ Mon153_EvosMoves: ; 3b372 (e:7372) db 0 ;Learnset db 0 + Mon058_EvosMoves: ; 3b374 (e:7374) ;GROWLITHE ;Evolutions @@ -561,6 +591,7 @@ Mon058_EvosMoves: ; 3b374 (e:7374) db 39,AGILITY db 50,FLAMETHROWER db 0 + Mon095_EvosMoves: ; 3b384 (e:7384) ;ONIX ;Evolutions @@ -572,6 +603,7 @@ Mon095_EvosMoves: ; 3b384 (e:7384) db 33,SLAM db 43,HARDEN db 0 + Mon022_EvosMoves: ; 3b390 (e:7390) ;FEAROW ;Evolutions @@ -583,6 +615,7 @@ Mon022_EvosMoves: ; 3b390 (e:7390) db 34,DRILL_PECK db 43,AGILITY db 0 + Mon016_EvosMoves: ; 3b39c (e:739c) ;PIDGEY ;Evolutions @@ -596,6 +629,7 @@ Mon016_EvosMoves: ; 3b39c (e:739c) db 36,AGILITY db 44,MIRROR_MOVE db 0 + Mon079_EvosMoves: ; 3b3ad (e:73ad) ;SLOWPOKE ;Evolutions @@ -609,6 +643,7 @@ Mon079_EvosMoves: ; 3b3ad (e:73ad) db 40,AMNESIA db 48,PSYCHIC_M db 0 + Mon064_EvosMoves: ; 3b3be (e:73be) ;KADABRA ;Evolutions @@ -622,6 +657,7 @@ Mon064_EvosMoves: ; 3b3be (e:73be) db 38,PSYCHIC_M db 42,REFLECT db 0 + Mon075_EvosMoves: ; 3b3cf (e:73cf) ;GRAVELER ;Evolutions @@ -635,6 +671,7 @@ Mon075_EvosMoves: ; 3b3cf (e:73cf) db 36,EARTHQUAKE db 43,EXPLOSION db 0 + Mon113_EvosMoves: ; 3b3e0 (e:73e0) ;CHANSEY ;Evolutions @@ -647,6 +684,7 @@ Mon113_EvosMoves: ; 3b3e0 (e:73e0) db 48,LIGHT_SCREEN db 54,DOUBLE_EDGE db 0 + Mon067_EvosMoves: ; 3b3ee (e:73ee) ;MACHOKE ;Evolutions @@ -659,6 +697,7 @@ Mon067_EvosMoves: ; 3b3ee (e:73ee) db 44,SEISMIC_TOSS db 52,SUBMISSION db 0 + Mon122_EvosMoves: ; 3b3fd (e:73fd) ;MR_MIME ;Evolutions @@ -670,6 +709,7 @@ Mon122_EvosMoves: ; 3b3fd (e:73fd) db 39,MEDITATE db 47,SUBSTITUTE db 0 + Mon106_EvosMoves: ; 3b409 (e:7409) ;HITMONLEE ;Evolutions @@ -681,6 +721,7 @@ Mon106_EvosMoves: ; 3b409 (e:7409) db 48,HI_JUMP_KICK db 53,MEGA_KICK db 0 + Mon107_EvosMoves: ; 3b415 (e:7415) ;HITMONCHAN ;Evolutions @@ -692,6 +733,7 @@ Mon107_EvosMoves: ; 3b415 (e:7415) db 48,MEGA_PUNCH db 53,COUNTER db 0 + Mon024_EvosMoves: ; 3b421 (e:7421) ;ARBOK ;Evolutions @@ -703,6 +745,7 @@ Mon024_EvosMoves: ; 3b421 (e:7421) db 36,SCREECH db 47,ACID db 0 + Mon047_EvosMoves: ; 3b42d (e:742d) ;PARASECT ;Evolutions @@ -714,6 +757,7 @@ Mon047_EvosMoves: ; 3b42d (e:742d) db 39,SLASH db 48,GROWTH db 0 + Mon054_EvosMoves: ; 3b439 (e:7439) ;PSYDUCK ;Evolutions @@ -726,6 +770,7 @@ Mon054_EvosMoves: ; 3b439 (e:7439) db 43,FURY_SWIPES db 52,HYDRO_PUMP db 0 + Mon096_EvosMoves: ; 3b448 (e:7448) ;DROWZEE ;Evolutions @@ -739,6 +784,7 @@ Mon096_EvosMoves: ; 3b448 (e:7448) db 32,PSYCHIC_M db 37,MEDITATE db 0 + Mon076_EvosMoves: ; 3b459 (e:7459) ;GOLEM ;Evolutions @@ -758,6 +804,7 @@ Mon154_EvosMoves: ; 3b467 (e:7467) db 0 ;Learnset db 0 + Mon126_EvosMoves: ; 3b469 (e:7469) ;MAGMAR ;Evolutions @@ -777,6 +824,7 @@ Mon155_EvosMoves: ; 3b477 (e:7477) db 0 ;Learnset db 0 + Mon125_EvosMoves: ; 3b479 (e:7479) ;ELECTABUZZ ;Evolutions @@ -788,6 +836,7 @@ Mon125_EvosMoves: ; 3b479 (e:7479) db 49,LIGHT_SCREEN db 54,THUNDER db 0 + Mon082_EvosMoves: ; 3b485 (e:7485) ;MAGNETON ;Evolutions @@ -800,6 +849,7 @@ Mon082_EvosMoves: ; 3b485 (e:7485) db 46,SWIFT db 54,SCREECH db 0 + Mon109_EvosMoves: ; 3b493 (e:7493) ;KOFFING ;Evolutions @@ -819,6 +869,7 @@ Mon156_EvosMoves: ; 3b4a2 (e:74a2) db 0 ;Learnset db 0 + Mon056_EvosMoves: ; 3b4a4 (e:74a4) ;MANKEY ;Evolutions @@ -831,6 +882,7 @@ Mon056_EvosMoves: ; 3b4a4 (e:74a4) db 33,SEISMIC_TOSS db 39,THRASH db 0 + Mon086_EvosMoves: ; 3b4b3 (e:74b3) ;SEEL ;Evolutions @@ -843,6 +895,7 @@ Mon086_EvosMoves: ; 3b4b3 (e:74b3) db 45,TAKE_DOWN db 50,ICE_BEAM db 0 + Mon050_EvosMoves: ; 3b4c2 (e:74c2) ;DIGLETT ;Evolutions @@ -855,6 +908,7 @@ Mon050_EvosMoves: ; 3b4c2 (e:74c2) db 31,SLASH db 40,EARTHQUAKE db 0 + Mon128_EvosMoves: ; 3b4d1 (e:74d1) ;TAUROS ;Evolutions @@ -887,8 +941,9 @@ Mon159_EvosMoves: ; 3b4e1 (e:74e1) db 0 ;Learnset db 0 + Mon083_EvosMoves: ; 3b4e3 (e:74e3) -;FARFETCH_D +;FARFETCHD ;Evolutions db 0 ;Learnset @@ -898,6 +953,7 @@ Mon083_EvosMoves: ; 3b4e3 (e:74e3) db 31,AGILITY db 39,SLASH db 0 + Mon048_EvosMoves: ; 3b4ef (e:74ef) ;VENONAT ;Evolutions @@ -911,6 +967,7 @@ Mon048_EvosMoves: ; 3b4ef (e:74ef) db 38,SLEEP_POWDER db 43,PSYCHIC_M db 0 + Mon149_EvosMoves: ; 3b500 (e:7500) ;DRAGONITE ;Evolutions @@ -943,6 +1000,7 @@ Mon162_EvosMoves: ; 3b510 (e:7510) db 0 ;Learnset db 0 + Mon084_EvosMoves: ; 3b512 (e:7512) ;DODUO ;Evolutions @@ -956,6 +1014,7 @@ Mon084_EvosMoves: ; 3b512 (e:7512) db 40,TRI_ATTACK db 44,AGILITY db 0 + Mon060_EvosMoves: ; 3b523 (e:7523) ;POLIWAG ;Evolutions @@ -969,6 +1028,7 @@ Mon060_EvosMoves: ; 3b523 (e:7523) db 38,AMNESIA db 45,HYDRO_PUMP db 0 + Mon124_EvosMoves: ; 3b534 (e:7534) ;JYNX ;Evolutions @@ -981,6 +1041,7 @@ Mon124_EvosMoves: ; 3b534 (e:7534) db 47,THRASH db 58,BLIZZARD db 0 + Mon146_EvosMoves: ; 3b542 (e:7542) ;MOLTRES ;Evolutions @@ -990,6 +1051,7 @@ Mon146_EvosMoves: ; 3b542 (e:7542) db 55,AGILITY db 60,SKY_ATTACK db 0 + Mon144_EvosMoves: ; 3b54a (e:754a) ;ARTICUNO ;Evolutions @@ -999,6 +1061,7 @@ Mon144_EvosMoves: ; 3b54a (e:754a) db 55,AGILITY db 60,MIST db 0 + Mon145_EvosMoves: ; 3b552 (e:7552) ;ZAPDOS ;Evolutions @@ -1008,12 +1071,14 @@ Mon145_EvosMoves: ; 3b552 (e:7552) db 55,AGILITY db 60,LIGHT_SCREEN db 0 + Mon132_EvosMoves: ; 3b55a (e:755a) ;DITTO ;Evolutions db 0 ;Learnset db 0 + Mon052_EvosMoves: ; 3b55c (e:755c) ;MEOWTH ;Evolutions @@ -1026,6 +1091,7 @@ Mon052_EvosMoves: ; 3b55c (e:755c) db 33,FURY_SWIPES db 44,SLASH db 0 + Mon098_EvosMoves: ; 3b56b (e:756b) ;KRABBY ;Evolutions @@ -1059,6 +1125,7 @@ Mon165_EvosMoves: ; 3b57e (e:757e) db 0 ;Learnset db 0 + Mon037_EvosMoves: ; 3b580 (e:7580) ;VULPIX ;Evolutions @@ -1071,16 +1138,18 @@ Mon037_EvosMoves: ; 3b580 (e:7580) db 35,FLAMETHROWER db 42,FIRE_SPIN db 0 + Mon038_EvosMoves: ; 3b590 (e:7590) ;NINETALES ;Evolutions db 0 ;Learnset db 0 + Mon025_EvosMoves: ; 3b592 (e:7592) ;PIKACHU ;Evolutions - db EV_ITEM,THUNDER_STONE ,1,RAICHU + db EV_ITEM,THUNDER_STONE,1,RAICHU db 0 ;Learnset db 9,THUNDER_WAVE @@ -1089,6 +1158,7 @@ Mon025_EvosMoves: ; 3b592 (e:7592) db 33,AGILITY db 43,THUNDER db 0 + Mon026_EvosMoves: ; 3b5a2 (e:75a2) ;RAICHU ;Evolutions @@ -1109,6 +1179,7 @@ Mon167_EvosMoves: ; 3b5a6 (e:75a6) db 0 ;Learnset db 0 + Mon147_EvosMoves: ; 3b5a8 (e:75a8) ;DRATINI ;Evolutions @@ -1121,6 +1192,7 @@ Mon147_EvosMoves: ; 3b5a8 (e:75a8) db 40,DRAGON_RAGE db 50,HYPER_BEAM db 0 + Mon148_EvosMoves: ; 3b5b7 (e:75b7) ;DRAGONAIR ;Evolutions @@ -1133,6 +1205,7 @@ Mon148_EvosMoves: ; 3b5b7 (e:75b7) db 45,DRAGON_RAGE db 55,HYPER_BEAM db 0 + Mon140_EvosMoves: ; 3b5c6 (e:75c6) ;KABUTO ;Evolutions @@ -1144,6 +1217,7 @@ Mon140_EvosMoves: ; 3b5c6 (e:75c6) db 44,LEER db 49,HYDRO_PUMP db 0 + Mon141_EvosMoves: ; 3b5d3 (e:75d3) ;KABUTOPS ;Evolutions @@ -1154,6 +1228,7 @@ Mon141_EvosMoves: ; 3b5d3 (e:75d3) db 46,LEER db 53,HYDRO_PUMP db 0 + Mon116_EvosMoves: ; 3b5dd (e:75dd) ;HORSEA ;Evolutions @@ -1166,6 +1241,7 @@ Mon116_EvosMoves: ; 3b5dd (e:75dd) db 37,AGILITY db 45,HYDRO_PUMP db 0 + Mon117_EvosMoves: ; 3b5ec (e:75ec) ;SEADRA ;Evolutions @@ -1191,6 +1267,7 @@ Mon169_EvosMoves: ; 3b5fa (e:75fa) db 0 ;Learnset db 0 + Mon027_EvosMoves: ; 3b5fc (e:75fc) ;SANDSHREW ;Evolutions @@ -1203,6 +1280,7 @@ Mon027_EvosMoves: ; 3b5fc (e:75fc) db 31,SWIFT db 38,FURY_SWIPES db 0 + Mon028_EvosMoves: ; 3b60b (e:760b) ;SANDSLASH ;Evolutions @@ -1214,6 +1292,7 @@ Mon028_EvosMoves: ; 3b60b (e:760b) db 36,SWIFT db 47,FURY_SWIPES db 0 + Mon138_EvosMoves: ; 3b617 (e:7617) ;OMANYTE ;Evolutions @@ -1225,6 +1304,7 @@ Mon138_EvosMoves: ; 3b617 (e:7617) db 46,SPIKE_CANNON db 53,HYDRO_PUMP db 0 + Mon139_EvosMoves: ; 3b624 (e:7624) ;OMASTAR ;Evolutions @@ -1235,6 +1315,7 @@ Mon139_EvosMoves: ; 3b624 (e:7624) db 44,SPIKE_CANNON db 49,HYDRO_PUMP db 0 + Mon039_EvosMoves: ; 3b62e (e:762e) ;JIGGLYPUFF ;Evolutions @@ -1249,25 +1330,29 @@ Mon039_EvosMoves: ; 3b62e (e:762e) db 34,BODY_SLAM db 39,DOUBLE_EDGE db 0 + Mon040_EvosMoves: ; 3b642 (e:7642) ;WIGGLYTUFF ;Evolutions db 0 ;Learnset db 0 + Mon133_EvosMoves: ; 3b644 (e:7644) ;EEVEE ;Evolutions db EV_ITEM,FIRE_STONE,1,FLAREON - db EV_ITEM,THUNDER_STONE ,1,JOLTEON - db EV_ITEM,WATER_STONE ,1,VAPOREON + db EV_ITEM,THUNDER_STONE,1,JOLTEON + db EV_ITEM,WATER_STONE,1,VAPOREON db 0 +Mon133_EvosEnd: ;Learnset db 27,QUICK_ATTACK db 31,TAIL_WHIP db 37,BITE db 45,TAKE_DOWN db 0 + Mon136_EvosMoves: ; 3b65a (e:765a) ;FLAREON ;Evolutions @@ -1282,6 +1367,7 @@ Mon136_EvosMoves: ; 3b65a (e:765a) db 48,RAGE db 54,FLAMETHROWER db 0 + Mon135_EvosMoves: ; 3b66c (e:766c) ;JOLTEON ;Evolutions @@ -1296,6 +1382,7 @@ Mon135_EvosMoves: ; 3b66c (e:766c) db 48,PIN_MISSILE db 54,THUNDER db 0 + Mon134_EvosMoves: ; 3b67e (e:767e) ;VAPOREON ;Evolutions @@ -1310,6 +1397,7 @@ Mon134_EvosMoves: ; 3b67e (e:767e) db 48,MIST db 54,HYDRO_PUMP db 0 + Mon066_EvosMoves: ; 3b690 (e:7690) ;MACHOP ;Evolutions @@ -1322,6 +1410,7 @@ Mon066_EvosMoves: ; 3b690 (e:7690) db 39,SEISMIC_TOSS db 46,SUBMISSION db 0 + Mon041_EvosMoves: ; 3b69f (e:769f) ;ZUBAT ;Evolutions @@ -1334,6 +1423,7 @@ Mon041_EvosMoves: ; 3b69f (e:769f) db 28,WING_ATTACK db 36,HAZE db 0 + Mon023_EvosMoves: ; 3b6ae (e:76ae) ;EKANS ;Evolutions @@ -1346,6 +1436,7 @@ Mon023_EvosMoves: ; 3b6ae (e:76ae) db 31,SCREECH db 38,ACID db 0 + Mon046_EvosMoves: ; 3b6bd (e:76bd) ;PARAS ;Evolutions @@ -1358,10 +1449,11 @@ Mon046_EvosMoves: ; 3b6bd (e:76bd) db 34,SLASH db 41,GROWTH db 0 + Mon061_EvosMoves: ; 3b6cc (e:76cc) ;POLIWHIRL ;Evolutions - db EV_ITEM,WATER_STONE ,1,POLIWRATH + db EV_ITEM,WATER_STONE,1,POLIWRATH db 0 ;Learnset db 16,HYPNOSIS @@ -1371,6 +1463,7 @@ Mon061_EvosMoves: ; 3b6cc (e:76cc) db 41,AMNESIA db 49,HYDRO_PUMP db 0 + Mon062_EvosMoves: ; 3b6de (e:76de) ;POLIWRATH ;Evolutions @@ -1379,6 +1472,7 @@ Mon062_EvosMoves: ; 3b6de (e:76de) db 16,HYPNOSIS db 19,WATER_GUN db 0 + Mon013_EvosMoves: ; 3b6e4 (e:76e4) ;WEEDLE ;Evolutions @@ -1386,6 +1480,7 @@ Mon013_EvosMoves: ; 3b6e4 (e:76e4) db 0 ;Learnset db 0 + Mon014_EvosMoves: ; 3b6e9 (e:76e9) ;KAKUNA ;Evolutions @@ -1393,6 +1488,7 @@ Mon014_EvosMoves: ; 3b6e9 (e:76e9) db 0 ;Learnset db 0 + Mon015_EvosMoves: ; 3b6ee (e:76ee) ;BEEDRILL ;Evolutions @@ -1412,6 +1508,7 @@ Mon170_EvosMoves: ; 3b6fc (e:76fc) db 0 ;Learnset db 0 + Mon085_EvosMoves: ; 3b6fe (e:76fe) ;DODRIO ;Evolutions @@ -1424,6 +1521,7 @@ Mon085_EvosMoves: ; 3b6fe (e:76fe) db 45,TRI_ATTACK db 51,AGILITY db 0 + Mon057_EvosMoves: ; 3b70c (e:770c) ;PRIMEAPE ;Evolutions @@ -1435,6 +1533,7 @@ Mon057_EvosMoves: ; 3b70c (e:770c) db 37,SEISMIC_TOSS db 46,THRASH db 0 + Mon051_EvosMoves: ; 3b718 (e:7718) ;DUGTRIO ;Evolutions @@ -1446,6 +1545,7 @@ Mon051_EvosMoves: ; 3b718 (e:7718) db 35,SLASH db 47,EARTHQUAKE db 0 + Mon049_EvosMoves: ; 3b724 (e:7724) ;VENOMOTH ;Evolutions @@ -1458,6 +1558,7 @@ Mon049_EvosMoves: ; 3b724 (e:7724) db 43,SLEEP_POWDER db 50,PSYCHIC_M db 0 + Mon087_EvosMoves: ; 3b732 (e:7732) ;DEWGONG ;Evolutions @@ -1483,6 +1584,7 @@ Mon172_EvosMoves: ; 3b740 (e:7740) db 0 ;Learnset db 0 + Mon010_EvosMoves: ; 3b742 (e:7742) ;CATERPIE ;Evolutions @@ -1490,6 +1592,7 @@ Mon010_EvosMoves: ; 3b742 (e:7742) db 0 ;Learnset db 0 + Mon011_EvosMoves: ; 3b747 (e:7747) ;METAPOD ;Evolutions @@ -1497,6 +1600,7 @@ Mon011_EvosMoves: ; 3b747 (e:7747) db 0 ;Learnset db 0 + Mon012_EvosMoves: ; 3b74c (e:774c) ;BUTTERFREE ;Evolutions @@ -1510,6 +1614,7 @@ Mon012_EvosMoves: ; 3b74c (e:774c) db 26,WHIRLWIND db 32,PSYBEAM db 0 + Mon068_EvosMoves: ; 3b75c (e:775c) ;MACHAMP ;Evolutions @@ -1528,6 +1633,7 @@ Mon173_EvosMoves: ; 3b768 (e:7768) db 0 ;Learnset db 0 + Mon055_EvosMoves: ; 3b76a (e:776a) ;GOLDUCK ;Evolutions @@ -1539,6 +1645,7 @@ Mon055_EvosMoves: ; 3b76a (e:776a) db 48,FURY_SWIPES db 59,HYDRO_PUMP db 0 + Mon097_EvosMoves: ; 3b776 (e:7776) ;HYPNO ;Evolutions @@ -1551,6 +1658,7 @@ Mon097_EvosMoves: ; 3b776 (e:7776) db 37,PSYCHIC_M db 43,MEDITATE db 0 + Mon042_EvosMoves: ; 3b784 (e:7784) ;GOLBAT ;Evolutions @@ -1562,6 +1670,7 @@ Mon042_EvosMoves: ; 3b784 (e:7784) db 32,WING_ATTACK db 43,HAZE db 0 + Mon150_EvosMoves: ; 3b790 (e:7790) ;MEWTWO ;Evolutions @@ -1573,6 +1682,7 @@ Mon150_EvosMoves: ; 3b790 (e:7790) db 75,MIST db 81,AMNESIA db 0 + Mon143_EvosMoves: ; 3b79c (e:779c) ;SNORLAX ;Evolutions @@ -1583,6 +1693,7 @@ Mon143_EvosMoves: ; 3b79c (e:779c) db 48,DOUBLE_EDGE db 56,HYPER_BEAM db 0 + Mon129_EvosMoves: ; 3b7a6 (e:77a6) ;MAGIKARP ;Evolutions @@ -1605,6 +1716,7 @@ Mon175_EvosMoves: ; 3b7af (e:77af) db 0 ;Learnset db 0 + Mon089_EvosMoves: ; 3b7b1 (e:77b1) ;MUK ;Evolutions @@ -1624,6 +1736,7 @@ Mon176_EvosMoves: ; 3b7bf (e:77bf) db 0 ;Learnset db 0 + Mon099_EvosMoves: ; 3b7c1 (e:77c1) ;KINGLER ;Evolutions @@ -1635,6 +1748,7 @@ Mon099_EvosMoves: ; 3b7c1 (e:77c1) db 42,CRABHAMMER db 49,HARDEN db 0 + Mon091_EvosMoves: ; 3b7cd (e:77cd) ;CLOYSTER ;Evolutions @@ -1649,6 +1763,7 @@ Mon177_EvosMoves: ; 3b7d1 (e:77d1) db 0 ;Learnset db 0 + Mon101_EvosMoves: ; 3b7d3 (e:77d3) ;ELECTRODE ;Evolutions @@ -1660,12 +1775,14 @@ Mon101_EvosMoves: ; 3b7d3 (e:77d3) db 40,SWIFT db 50,EXPLOSION db 0 + Mon036_EvosMoves: ; 3b7df (e:77df) ;CLEFABLE ;Evolutions db 0 ;Learnset db 0 + Mon110_EvosMoves: ; 3b7e1 (e:77e1) ;WEEZING ;Evolutions @@ -1677,6 +1794,7 @@ Mon110_EvosMoves: ; 3b7e1 (e:77e1) db 49,HAZE db 53,EXPLOSION db 0 + Mon053_EvosMoves: ; 3b7ed (e:77ed) ;PERSIAN ;Evolutions @@ -1688,6 +1806,7 @@ Mon053_EvosMoves: ; 3b7ed (e:77ed) db 37,FURY_SWIPES db 51,SLASH db 0 + Mon105_EvosMoves: ; 3b7f9 (e:77f9) ;MAROWAK ;Evolutions @@ -1706,6 +1825,7 @@ Mon178_EvosMoves: ; 3b805 (e:7805) db 0 ;Learnset db 0 + Mon093_EvosMoves: ; 3b807 (e:7807) ;HAUNTER ;Evolutions @@ -1715,6 +1835,7 @@ Mon093_EvosMoves: ; 3b807 (e:7807) db 29,HYPNOSIS db 38,DREAM_EATER db 0 + Mon063_EvosMoves: ; 3b810 (e:7810) ;ABRA ;Evolutions @@ -1722,6 +1843,7 @@ Mon063_EvosMoves: ; 3b810 (e:7810) db 0 ;Learnset db 0 + Mon065_EvosMoves: ; 3b815 (e:7815) ;ALAKAZAM ;Evolutions @@ -1734,6 +1856,7 @@ Mon065_EvosMoves: ; 3b815 (e:7815) db 38,PSYCHIC_M db 42,REFLECT db 0 + Mon017_EvosMoves: ; 3b823 (e:7823) ;PIDGEOTTO ;Evolutions @@ -1747,6 +1870,7 @@ Mon017_EvosMoves: ; 3b823 (e:7823) db 40,AGILITY db 49,MIRROR_MOVE db 0 + Mon018_EvosMoves: ; 3b834 (e:7834) ;PIDGEOT ;Evolutions @@ -1759,12 +1883,14 @@ Mon018_EvosMoves: ; 3b834 (e:7834) db 44,AGILITY db 54,MIRROR_MOVE db 0 + Mon121_EvosMoves: ; 3b842 (e:7842) ;STARMIE ;Evolutions db 0 ;Learnset db 0 + Mon001_EvosMoves: ; 3b844 (e:7844) ;BULBASAUR ;Evolutions @@ -1779,6 +1905,7 @@ Mon001_EvosMoves: ; 3b844 (e:7844) db 41,SLEEP_POWDER db 48,SOLARBEAM db 0 + Mon003_EvosMoves: ; 3b857 (e:7857) ;VENUSAUR ;Evolutions @@ -1792,6 +1919,7 @@ Mon003_EvosMoves: ; 3b857 (e:7857) db 55,SLEEP_POWDER db 65,SOLARBEAM db 0 + Mon073_EvosMoves: ; 3b867 (e:7867) ;TENTACRUEL ;Evolutions @@ -1813,6 +1941,7 @@ Mon179_EvosMoves: ; 3b879 (e:7879) db 0 ;Learnset db 0 + Mon118_EvosMoves: ; 3b87b (e:787b) ;GOLDEEN ;Evolutions @@ -1826,6 +1955,7 @@ Mon118_EvosMoves: ; 3b87b (e:787b) db 45,HORN_DRILL db 54,AGILITY db 0 + Mon119_EvosMoves: ; 3b88c (e:788c) ;SEAKING ;Evolutions @@ -1866,6 +1996,7 @@ Mon183_EvosMoves: ; 3b8a0 (e:78a0) db 0 ;Learnset db 0 + Mon077_EvosMoves: ; 3b8a2 (e:78a2) ;PONYTA ;Evolutions @@ -1879,6 +2010,7 @@ Mon077_EvosMoves: ; 3b8a2 (e:78a2) db 43,TAKE_DOWN db 48,AGILITY db 0 + Mon078_EvosMoves: ; 3b8b3 (e:78b3) ;RAPIDASH ;Evolutions @@ -1891,6 +2023,7 @@ Mon078_EvosMoves: ; 3b8b3 (e:78b3) db 47,TAKE_DOWN db 55,AGILITY db 0 + Mon019_EvosMoves: ; 3b8c1 (e:78c1) ;RATTATA ;Evolutions @@ -1902,6 +2035,7 @@ Mon019_EvosMoves: ; 3b8c1 (e:78c1) db 23,FOCUS_ENERGY db 34,SUPER_FANG db 0 + Mon020_EvosMoves: ; 3b8ce (e:78ce) ;RATICATE ;Evolutions @@ -1912,6 +2046,7 @@ Mon020_EvosMoves: ; 3b8ce (e:78ce) db 27,FOCUS_ENERGY db 41,SUPER_FANG db 0 + Mon033_EvosMoves: ; 3b8d8 (e:78d8) ;NIDORINO ;Evolutions @@ -1925,6 +2060,7 @@ Mon033_EvosMoves: ; 3b8d8 (e:78d8) db 41,HORN_DRILL db 50,DOUBLE_KICK db 0 + Mon030_EvosMoves: ; 3b8ea (e:78ea) ;NIDORINA ;Evolutions @@ -1938,6 +2074,7 @@ Mon030_EvosMoves: ; 3b8ea (e:78ea) db 41,FURY_SWIPES db 50,DOUBLE_KICK db 0 + Mon074_EvosMoves: ; 3b8fc (e:78fc) ;GEODUDE ;Evolutions @@ -1951,6 +2088,7 @@ Mon074_EvosMoves: ; 3b8fc (e:78fc) db 31,EARTHQUAKE db 36,EXPLOSION db 0 + Mon137_EvosMoves: ; 3b90d (e:790d) ;PORYGON ;Evolutions @@ -1961,6 +2099,7 @@ Mon137_EvosMoves: ; 3b90d (e:790d) db 35,AGILITY db 42,TRI_ATTACK db 0 + Mon142_EvosMoves: ; 3b917 (e:7917) ;AERODACTYL ;Evolutions @@ -1978,6 +2117,7 @@ Mon184_EvosMoves: ; 3b921 (e:7921) db 0 ;Learnset db 0 + Mon081_EvosMoves: ; 3b923 (e:7923) ;MAGNEMITE ;Evolutions @@ -2005,6 +2145,7 @@ Mon186_EvosMoves: ; 3b936 (e:7936) db 0 ;Learnset db 0 + Mon004_EvosMoves: ; 3b938 (e:7938) ;CHARMANDER ;Evolutions @@ -2018,6 +2159,7 @@ Mon004_EvosMoves: ; 3b938 (e:7938) db 38,FLAMETHROWER db 46,FIRE_SPIN db 0 + Mon007_EvosMoves: ; 3b949 (e:7949) ;SQUIRTLE ;Evolutions @@ -2031,6 +2173,7 @@ Mon007_EvosMoves: ; 3b949 (e:7949) db 35,SKULL_BASH db 42,HYDRO_PUMP db 0 + Mon005_EvosMoves: ; 3b95a (e:795a) ;CHARMELEON ;Evolutions @@ -2044,6 +2187,7 @@ Mon005_EvosMoves: ; 3b95a (e:795a) db 42,FLAMETHROWER db 56,FIRE_SPIN db 0 + Mon008_EvosMoves: ; 3b96b (e:796b) ;WARTORTLE ;Evolutions @@ -2057,6 +2201,7 @@ Mon008_EvosMoves: ; 3b96b (e:796b) db 39,SKULL_BASH db 47,HYDRO_PUMP db 0 + Mon006_EvosMoves: ; 3b97c (e:797c) ;CHARIZARD ;Evolutions @@ -2097,6 +2242,7 @@ Mon190_EvosMoves: ; 3b990 (e:7990) db 0 ;Learnset db 0 + Mon043_EvosMoves: ; 3b992 (e:7992) ;ODDISH ;Evolutions @@ -2110,10 +2256,11 @@ Mon043_EvosMoves: ; 3b992 (e:7992) db 33,PETAL_DANCE db 46,SOLARBEAM db 0 + Mon044_EvosMoves: ; 3b9a3 (e:79a3) ;GLOOM ;Evolutions - db EV_ITEM,LEAF_STONE ,1,VILEPLUME + db EV_ITEM,LEAF_STONE,1,VILEPLUME db 0 ;Learnset db 15,POISONPOWDER @@ -2123,6 +2270,7 @@ Mon044_EvosMoves: ; 3b9a3 (e:79a3) db 38,PETAL_DANCE db 52,SOLARBEAM db 0 + Mon045_EvosMoves: ; 3b9b5 (e:79b5) ;VILEPLUME ;Evolutions @@ -2132,6 +2280,7 @@ Mon045_EvosMoves: ; 3b9b5 (e:79b5) db 17,STUN_SPORE db 19,SLEEP_POWDER db 0 + Mon069_EvosMoves: ; 3b9bd (e:79bd) ;BELLSPROUT ;Evolutions @@ -2146,10 +2295,11 @@ Mon069_EvosMoves: ; 3b9bd (e:79bd) db 33,RAZOR_LEAF db 42,SLAM db 0 + Mon070_EvosMoves: ; 3b9d0 (e:79d0) ;WEEPINBELL ;Evolutions - db EV_ITEM,LEAF_STONE ,1,VICTREEBEL + db EV_ITEM,LEAF_STONE,1,VICTREEBEL db 0 ;Learnset db 13,WRAP @@ -2160,6 +2310,7 @@ Mon070_EvosMoves: ; 3b9d0 (e:79d0) db 38,RAZOR_LEAF db 49,SLAM db 0 + Mon071_EvosMoves: ; 3b9e4 (e:79e4) ;VICTREEBEL ;Evolutions diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm index 8170cf5a..d7851779 100755 --- a/data/hidden_objects.asm +++ b/data/hidden_objects.asm @@ -195,7 +195,7 @@ RedsHouse2FHiddenObjects: ; 46b5a (11:6b5a) db $01,$00,$04 dbw BANK(OpenRedsPC), OpenRedsPC db $05,$03,$d0 - dbw BANK(PrintRedsNESText), PrintRedsNESText + dbw BANK(PrintRedSNESText), PrintRedSNESText db $FF BluesHouseHiddenObjects: ; 46b67 (11:6b67) db $01,$00,$04 diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm index c8d89102..4fe57b20 100755 --- a/data/hide_show_data.asm +++ b/data/hide_show_data.asm @@ -263,7 +263,7 @@ MapHSPointers: ; c8f5 (3:48f5) ; a) Map_ID = $FF ; b) Map_ID ≠ currentMapID ; -; This Data is loaded into RAM at wd5ce-$D5F?. (W_MISSABLEOBJECTLIST) +; This Data is loaded into RAM at wd5ce-$D5F?. (wMissableObjectList) ; These constants come from the bytes for Predef functions: Hide equ $11 diff --git a/data/item_prices.asm b/data/item_prices.asm index f6882fd0..c36e1c69 100755 --- a/data/item_prices.asm +++ b/data/item_prices.asm @@ -53,7 +53,7 @@ ItemPrices: ; 4608 (1:4608) money 600 ; FULL_HEAL money 1500 ; REVIVE money 4000 ; MAX_REVIVE - money 700 ; GUARD_SPEC_ + money 700 ; GUARD_SPEC money 500 ; SUPER_REPEL money 700 ; MAX_REPEL money 650 ; DIRE_HIT @@ -61,7 +61,7 @@ ItemPrices: ; 4608 (1:4608) money 200 ; FRESH_WATER money 300 ; SODA_POP money 350 ; LEMONADE - money 0 ; S_S__TICKET + money 0 ; S_S_TICKET money 0 ; GOLD_TEETH money 500 ; X_ATTACK money 550 ; X_DEFEND @@ -73,7 +73,7 @@ ItemPrices: ; 4608 (1:4608) money 0 ; SILPH_SCOPE money 0 ; POKE_FLUTE money 0 ; LIFT_KEY - money 0 ; EXP__ALL + money 0 ; EXP_ALL money 0 ; OLD_ROD money 0 ; GOOD_ROD money 0 ; SUPER_ROD @@ -82,17 +82,17 @@ ItemPrices: ; 4608 (1:4608) money 0 ; MAX_ETHER money 0 ; ELIXER money 0 ; MAX_ELIXER - money 0 ; B2F - money 0 ; B1F - money 0 ; 1F - money 0 ; 2F - money 0 ; 3F - money 0 ; 4F - money 0 ; 5F - money 0 ; 6F - money 0 ; 7F - money 0 ; 8F - money 0 ; 9F - money 0 ; 10F - money 0 ; 11F - money 0 ; B4F + money 0 ; FLOOR_B2F + money 0 ; FLOOR_B1F + money 0 ; FLOOR_1F + money 0 ; FLOOR_2F + money 0 ; FLOOR_3F + money 0 ; FLOOR_4F + money 0 ; FLOOR_5F + money 0 ; FLOOR_6F + money 0 ; FLOOR_7F + money 0 ; FLOOR_8F + money 0 ; FLOOR_9F + money 0 ; FLOOR_10F + money 0 ; FLOOR_11F + money 0 ; FLOOR_B4F diff --git a/data/mapObjects/agatha.asm b/data/mapObjects/agatha.asm index f755df83..e33172ae 100755 --- a/data/mapObjects/agatha.asm +++ b/data/mapObjects/agatha.asm @@ -10,7 +10,7 @@ AgathaObject: ; 0x76534 (size=44) db $0 ; signs db $1 ; objects - object SPRITE_AGATHA, $5, $2, STAY, DOWN, $1, AGATHA + $C8, $1 + object SPRITE_AGATHA, $5, $2, STAY, DOWN, $1, OPP_AGATHA, $1 ; warp-to EVENT_DISP AGATHAS_ROOM_WIDTH, $b, $4 ; BRUNOS_ROOM diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/bruno.asm index 805f3302..8d55461f 100755 --- a/data/mapObjects/bruno.asm +++ b/data/mapObjects/bruno.asm @@ -10,7 +10,7 @@ BrunoObject: ; 0x763d7 (size=44) db $0 ; signs db $1 ; objects - object SPRITE_BRUNO, $5, $2, STAY, DOWN, $1, BRUNO + $C8, $1 + object SPRITE_BRUNO, $5, $2, STAY, DOWN, $1, OPP_BRUNO, $1 ; warp-to EVENT_DISP BRUNOS_ROOM_WIDTH, $b, $4 ; LORELEIS_ROOM diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/celadongamecorner.asm index c0af5920..1169e1da 100755 --- a/data/mapObjects/celadongamecorner.asm +++ b/data/mapObjects/celadongamecorner.asm @@ -20,7 +20,7 @@ CeladonGameCornerObject: ; 0x48fa0 (size=99) object SPRITE_GAMBLER, $b, $f, STAY, RIGHT, $8 ; person object SPRITE_MART_GUY, $e, $b, STAY, LEFT, $9 ; person object SPRITE_GENTLEMAN, $11, $d, STAY, RIGHT, $a ; person - object SPRITE_ROCKET, $9, $5, STAY, UP, $b, ROCKET + $C8, $7 + object SPRITE_ROCKET, $9, $5, STAY, UP, $b, OPP_ROCKET, $7 ; warp-to EVENT_DISP GAME_CORNER_WIDTH, $11, $f diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/celadongym.asm index 795f7efa..a38dd535 100755 --- a/data/mapObjects/celadongym.asm +++ b/data/mapObjects/celadongym.asm @@ -8,14 +8,14 @@ CeladonGymObject: ; 0x48b30 (size=84) db $0 ; signs db $8 ; objects - object SPRITE_ERIKA, $4, $3, STAY, DOWN, $1, ERIKA + $C8, $1 - object SPRITE_LASS, $2, $b, STAY, RIGHT, $2, LASS + $C8, $11 - object SPRITE_FOULARD_WOMAN, $7, $a, STAY, LEFT, $3, BEAUTY + $C8, $1 - object SPRITE_LASS, $9, $5, STAY, DOWN, $4, JR__TRAINER_F + $C8, $b - object SPRITE_FOULARD_WOMAN, $1, $5, STAY, DOWN, $5, BEAUTY + $C8, $2 - object SPRITE_LASS, $6, $3, STAY, DOWN, $6, LASS + $C8, $12 - object SPRITE_FOULARD_WOMAN, $3, $3, STAY, DOWN, $7, BEAUTY + $C8, $3 - object SPRITE_LASS, $5, $3, STAY, DOWN, $8, COOLTRAINER_F + $C8, $1 + object SPRITE_ERIKA, $4, $3, STAY, DOWN, $1, OPP_ERIKA, $1 + object SPRITE_LASS, $2, $b, STAY, RIGHT, $2, OPP_LASS, $11 + object SPRITE_FOULARD_WOMAN, $7, $a, STAY, LEFT, $3, OPP_BEAUTY, $1 + object SPRITE_LASS, $9, $5, STAY, DOWN, $4, OPP_JR_TRAINER_F, $b + object SPRITE_FOULARD_WOMAN, $1, $5, STAY, DOWN, $5, OPP_BEAUTY, $2 + object SPRITE_LASS, $6, $3, STAY, DOWN, $6, OPP_LASS, $12 + object SPRITE_FOULARD_WOMAN, $3, $3, STAY, DOWN, $7, OPP_BEAUTY, $3 + object SPRITE_LASS, $5, $3, STAY, DOWN, $8, OPP_COOLTRAINER_F, $1 ; warp-to EVENT_DISP CELADON_GYM_WIDTH, $11, $4 diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm index 0be79c17..8c429695 100755 --- a/data/mapObjects/ceruleancity.asm +++ b/data/mapObjects/ceruleancity.asm @@ -23,7 +23,7 @@ CeruleanCityObject: ; 0x18786 (size=170) db $b ; objects object SPRITE_BLUE, $14, $2, STAY, DOWN, $1 ; person - object SPRITE_ROCKET, $1e, $8, STAY, NONE, $2, ROCKET + $C8, $5 + object SPRITE_ROCKET, $1e, $8, STAY, NONE, $2, OPP_ROCKET, $5 object SPRITE_BLACK_HAIR_BOY_1, $1f, $14, STAY, DOWN, $3 ; person object SPRITE_BLACK_HAIR_BOY_2, $f, $12, WALK, $1, $4 ; person object SPRITE_BLACK_HAIR_BOY_2, $9, $15, WALK, $2, $5 ; person diff --git a/data/mapObjects/ceruleangym.asm b/data/mapObjects/ceruleangym.asm index 23d06d53..68d74547 100755 --- a/data/mapObjects/ceruleangym.asm +++ b/data/mapObjects/ceruleangym.asm @@ -8,9 +8,9 @@ CeruleanGymObject: ; 0x5c834 (size=50) db $0 ; signs db $4 ; objects - object SPRITE_BRUNETTE_GIRL, $4, $2, STAY, DOWN, $1, MISTY + $C8, $1 - object SPRITE_LASS, $2, $3, STAY, RIGHT, $2, JR__TRAINER_F + $C8, $1 - object SPRITE_SWIMMER, $8, $7, STAY, LEFT, $3, SWIMMER + $C8, $1 + object SPRITE_BRUNETTE_GIRL, $4, $2, STAY, DOWN, $1, OPP_MISTY, $1 + object SPRITE_LASS, $2, $3, STAY, RIGHT, $2, OPP_JR_TRAINER_F, $1 + object SPRITE_SWIMMER, $8, $7, STAY, LEFT, $3, OPP_SWIMMER, $1 object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $4 ; person ; warp-to diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/cinnabargym.asm index 21afcbdf..d9b69192 100755 --- a/data/mapObjects/cinnabargym.asm +++ b/data/mapObjects/cinnabargym.asm @@ -8,14 +8,14 @@ CinnabarGymObject: ; 0x75acc (size=90) db $0 ; signs db $9 ; objects - object SPRITE_FAT_BALD_GUY, $3, $3, STAY, DOWN, $1, BLAINE + $C8, $1 - object SPRITE_BLACK_HAIR_BOY_2, $11, $2, STAY, DOWN, $2, SUPER_NERD + $C8, $9 - object SPRITE_BLACK_HAIR_BOY_2, $11, $8, STAY, DOWN, $3, BURGLAR + $C8, $4 - object SPRITE_BLACK_HAIR_BOY_2, $b, $4, STAY, DOWN, $4, SUPER_NERD + $C8, $a - object SPRITE_BLACK_HAIR_BOY_2, $b, $8, STAY, DOWN, $5, BURGLAR + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_2, $b, $e, STAY, DOWN, $6, SUPER_NERD + $C8, $b - object SPRITE_BLACK_HAIR_BOY_2, $3, $e, STAY, DOWN, $7, BURGLAR + $C8, $6 - object SPRITE_BLACK_HAIR_BOY_2, $3, $8, STAY, DOWN, $8, SUPER_NERD + $C8, $c + object SPRITE_FAT_BALD_GUY, $3, $3, STAY, DOWN, $1, OPP_BLAINE, $1 + object SPRITE_BLACK_HAIR_BOY_2, $11, $2, STAY, DOWN, $2, OPP_SUPER_NERD, $9 + object SPRITE_BLACK_HAIR_BOY_2, $11, $8, STAY, DOWN, $3, OPP_BURGLAR, $4 + object SPRITE_BLACK_HAIR_BOY_2, $b, $4, STAY, DOWN, $4, OPP_SUPER_NERD, $a + object SPRITE_BLACK_HAIR_BOY_2, $b, $8, STAY, DOWN, $5, OPP_BURGLAR, $5 + object SPRITE_BLACK_HAIR_BOY_2, $b, $e, STAY, DOWN, $6, OPP_SUPER_NERD, $b + object SPRITE_BLACK_HAIR_BOY_2, $3, $e, STAY, DOWN, $7, OPP_BURGLAR, $6 + object SPRITE_BLACK_HAIR_BOY_2, $3, $8, STAY, DOWN, $8, OPP_SUPER_NERD, $c object SPRITE_GYM_HELPER, $10, $d, STAY, DOWN, $9 ; person ; warp-to diff --git a/data/mapObjects/fightingdojo.asm b/data/mapObjects/fightingdojo.asm index 042791e1..aa9c0bd7 100755 --- a/data/mapObjects/fightingdojo.asm +++ b/data/mapObjects/fightingdojo.asm @@ -8,11 +8,11 @@ FightingDojoObject: ; 0x5cf9b (size=72) db $0 ; signs db $7 ; objects - object SPRITE_HIKER, $5, $3, STAY, DOWN, $1, BLACKBELT + $C8, $1 - object SPRITE_HIKER, $3, $4, STAY, RIGHT, $2, BLACKBELT + $C8, $2 - object SPRITE_HIKER, $3, $6, STAY, RIGHT, $3, BLACKBELT + $C8, $3 - object SPRITE_HIKER, $5, $5, STAY, LEFT, $4, BLACKBELT + $C8, $4 - object SPRITE_HIKER, $5, $7, STAY, LEFT, $5, BLACKBELT + $C8, $5 + object SPRITE_HIKER, $5, $3, STAY, DOWN, $1, OPP_BLACKBELT, $1 + object SPRITE_HIKER, $3, $4, STAY, RIGHT, $2, OPP_BLACKBELT, $2 + object SPRITE_HIKER, $3, $6, STAY, RIGHT, $3, OPP_BLACKBELT, $3 + object SPRITE_HIKER, $5, $5, STAY, LEFT, $4, OPP_BLACKBELT, $4 + object SPRITE_HIKER, $5, $7, STAY, LEFT, $5, OPP_BLACKBELT, $5 object SPRITE_BALL, $4, $1, STAY, NONE, $6 ; person object SPRITE_BALL, $5, $1, STAY, NONE, $7 ; person diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/fuchsiagym.asm index 1d082f62..ded17031 100755 --- a/data/mapObjects/fuchsiagym.asm +++ b/data/mapObjects/fuchsiagym.asm @@ -8,13 +8,13 @@ FuchsiaGymObject: ; 0x75658 (size=82) db $0 ; signs db $8 ; objects - object SPRITE_BLACKBELT, $4, $a, STAY, DOWN, $1, KOGA + $C8, $1 - object SPRITE_ROCKER, $8, $d, STAY, DOWN, $2, JUGGLER + $C8, $7 - object SPRITE_ROCKER, $7, $8, STAY, RIGHT, $3, JUGGLER + $C8, $3 - object SPRITE_ROCKER, $1, $c, STAY, DOWN, $4, JUGGLER + $C8, $8 - object SPRITE_ROCKER, $3, $5, STAY, UP, $5, TAMER + $C8, $1 - object SPRITE_ROCKER, $8, $2, STAY, DOWN, $6, TAMER + $C8, $2 - object SPRITE_ROCKER, $2, $7, STAY, LEFT, $7, JUGGLER + $C8, $4 + object SPRITE_BLACKBELT, $4, $a, STAY, DOWN, $1, OPP_KOGA, $1 + object SPRITE_ROCKER, $8, $d, STAY, DOWN, $2, OPP_JUGGLER, $7 + object SPRITE_ROCKER, $7, $8, STAY, RIGHT, $3, OPP_JUGGLER, $3 + object SPRITE_ROCKER, $1, $c, STAY, DOWN, $4, OPP_JUGGLER, $8 + object SPRITE_ROCKER, $3, $5, STAY, UP, $5, OPP_TAMER, $1 + object SPRITE_ROCKER, $8, $2, STAY, DOWN, $6, OPP_TAMER, $2 + object SPRITE_ROCKER, $2, $7, STAY, LEFT, $7, OPP_JUGGLER, $4 object SPRITE_GYM_HELPER, $7, $f, STAY, DOWN, $8 ; person ; warp-to diff --git a/data/mapObjects/lance.asm b/data/mapObjects/lance.asm index 42a3e83b..cdfbc7a6 100755 --- a/data/mapObjects/lance.asm +++ b/data/mapObjects/lance.asm @@ -9,7 +9,7 @@ LanceObject: ; 0x5a3c5 (size=36) db $0 ; signs db $1 ; objects - object SPRITE_LANCE, $6, $1, STAY, DOWN, $1, LANCE + $C8, $1 + object SPRITE_LANCE, $6, $1, STAY, DOWN, $1, OPP_LANCE, $1 ; warp-to EVENT_DISP LANCES_ROOM_WIDTH, $10, $18 ; AGATHAS_ROOM diff --git a/data/mapObjects/lorelei.asm b/data/mapObjects/lorelei.asm index dc318326..4ce080f7 100755 --- a/data/mapObjects/lorelei.asm +++ b/data/mapObjects/lorelei.asm @@ -10,7 +10,7 @@ LoreleiObject: ; 0x76280 (size=44) db $0 ; signs db $1 ; objects - object SPRITE_LORELEI, $5, $2, STAY, DOWN, $1, LORELEI + $C8, $1 + object SPRITE_LORELEI, $5, $2, STAY, DOWN, $1, OPP_LORELEI, $1 ; warp-to EVENT_DISP LORELEIS_ROOM_WIDTH, $b, $4 ; INDIGO_PLATEAU_LOBBY diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm index 30b79433..0bb168bb 100755 --- a/data/mapObjects/mansion1.asm +++ b/data/mapObjects/mansion1.asm @@ -14,7 +14,7 @@ Mansion1Object: ; 0x443a4 (size=90) db $0 ; signs db $3 ; objects - object SPRITE_OAK_AIDE, $11, $11, STAY, LEFT, $1, SCIENTIST + $C8, $4 + object SPRITE_OAK_AIDE, $11, $11, STAY, LEFT, $1, OPP_SCIENTIST, $4 object SPRITE_BALL, $e, $3, STAY, NONE, $2, ESCAPE_ROPE object SPRITE_BALL, $12, $15, STAY, NONE, $3, CARBOS diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm index b9a7b551..2cb45879 100755 --- a/data/mapObjects/mansion2.asm +++ b/data/mapObjects/mansion2.asm @@ -10,7 +10,7 @@ Mansion2Object: ; 0x520d1 (size=63) db $0 ; signs db $4 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $3, $11, WALK, $2, $1, BURGLAR + $C8, $7 + object SPRITE_BLACK_HAIR_BOY_2, $3, $11, WALK, $2, $1, OPP_BURGLAR, $7 object SPRITE_BALL, $1c, $7, STAY, NONE, $2, CALCIUM object SPRITE_BOOK_MAP_DEX, $12, $2, STAY, NONE, $3 ; person object SPRITE_BOOK_MAP_DEX, $3, $16, STAY, NONE, $4 ; person diff --git a/data/mapObjects/mansion3.asm b/data/mapObjects/mansion3.asm index 52b46327..288b4753 100755 --- a/data/mapObjects/mansion3.asm +++ b/data/mapObjects/mansion3.asm @@ -9,8 +9,8 @@ Mansion3Object: ; 0x522e6 (size=64) db $0 ; signs db $5 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $5, $b, WALK, $2, $1, BURGLAR + $C8, $8 - object SPRITE_OAK_AIDE, $14, $b, STAY, LEFT, $2, SCIENTIST + $C8, $c + object SPRITE_BLACK_HAIR_BOY_2, $5, $b, WALK, $2, $1, OPP_BURGLAR, $8 + object SPRITE_OAK_AIDE, $14, $b, STAY, LEFT, $2, OPP_SCIENTIST, $c object SPRITE_BALL, $1, $10, STAY, NONE, $3, MAX_POTION object SPRITE_BALL, $19, $5, STAY, NONE, $4, IRON object SPRITE_BOOK_MAP_DEX, $6, $c, STAY, NONE, $5 ; person diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/mansion4.asm index 6d5cac47..eddbda8e 100755 --- a/data/mapObjects/mansion4.asm +++ b/data/mapObjects/mansion4.asm @@ -7,8 +7,8 @@ Mansion4Object: ; 0x52498 (size=69) db $0 ; signs db $8 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $10, $17, STAY, NONE, $1, BURGLAR + $C8, $9 - object SPRITE_OAK_AIDE, $1b, $b, STAY, DOWN, $2, SCIENTIST + $C8, $d + object SPRITE_BLACK_HAIR_BOY_2, $10, $17, STAY, NONE, $1, OPP_BURGLAR, $9 + object SPRITE_OAK_AIDE, $1b, $b, STAY, DOWN, $2, OPP_SCIENTIST, $d object SPRITE_BALL, $a, $2, STAY, NONE, $3, RARE_CANDY object SPRITE_BALL, $1, $16, STAY, NONE, $4, FULL_RESTORE object SPRITE_BALL, $13, $19, STAY, NONE, $5, TM_14 diff --git a/data/mapObjects/mtmoon1.asm b/data/mapObjects/mtmoon1.asm index 3c9bcc80..a59f2a20 100755 --- a/data/mapObjects/mtmoon1.asm +++ b/data/mapObjects/mtmoon1.asm @@ -12,13 +12,13 @@ MtMoon1Object: ; 0x49b06 (size=145) db $17, $f, $e ; MtMoon1Text14 db $d ; objects - object SPRITE_HIKER, $5, $6, STAY, DOWN, $1, HIKER + $C8, $1 - object SPRITE_BUG_CATCHER, $c, $10, STAY, RIGHT, $2, YOUNGSTER + $C8, $3 - object SPRITE_LASS, $1e, $4, STAY, DOWN, $3, LASS + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_2, $18, $1f, STAY, UP, $4, SUPER_NERD + $C8, $1 - object SPRITE_LASS, $10, $17, STAY, DOWN, $5, LASS + $C8, $6 - object SPRITE_BUG_CATCHER, $7, $16, STAY, DOWN, $6, BUG_CATCHER + $C8, $7 - object SPRITE_BUG_CATCHER, $1e, $1b, STAY, RIGHT, $7, BUG_CATCHER + $C8, $8 + object SPRITE_HIKER, $5, $6, STAY, DOWN, $1, OPP_HIKER, $1 + object SPRITE_BUG_CATCHER, $c, $10, STAY, RIGHT, $2, OPP_YOUNGSTER, $3 + object SPRITE_LASS, $1e, $4, STAY, DOWN, $3, OPP_LASS, $5 + object SPRITE_BLACK_HAIR_BOY_2, $18, $1f, STAY, UP, $4, OPP_SUPER_NERD, $1 + object SPRITE_LASS, $10, $17, STAY, DOWN, $5, OPP_LASS, $6 + object SPRITE_BUG_CATCHER, $7, $16, STAY, DOWN, $6, OPP_BUG_CATCHER, $7 + object SPRITE_BUG_CATCHER, $1e, $1b, STAY, RIGHT, $7, OPP_BUG_CATCHER, $8 object SPRITE_BALL, $2, $14, STAY, NONE, $8, POTION object SPRITE_BALL, $2, $2, STAY, NONE, $9, MOON_STONE object SPRITE_BALL, $23, $1f, STAY, NONE, $a, RARE_CANDY diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/mtmoon3.asm index 3bcfe40f..4f8f911c 100755 --- a/data/mapObjects/mtmoon3.asm +++ b/data/mapObjects/mtmoon3.asm @@ -10,11 +10,11 @@ MtMoon3Object: ; 0x49fdb (size=102) db $0 ; signs db $9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $c, $8, STAY, RIGHT, $1, SUPER_NERD + $C8, $2 - object SPRITE_ROCKET, $b, $10, STAY, DOWN, $2, ROCKET + $C8, $1 - object SPRITE_ROCKET, $f, $16, STAY, DOWN, $3, ROCKET + $C8, $2 - object SPRITE_ROCKET, $1d, $b, STAY, UP, $4, ROCKET + $C8, $3 - object SPRITE_ROCKET, $1d, $11, STAY, LEFT, $5, ROCKET + $C8, $4 + object SPRITE_BLACK_HAIR_BOY_2, $c, $8, STAY, RIGHT, $1, OPP_SUPER_NERD, $2 + object SPRITE_ROCKET, $b, $10, STAY, DOWN, $2, OPP_ROCKET, $1 + object SPRITE_ROCKET, $f, $16, STAY, DOWN, $3, OPP_ROCKET, $2 + object SPRITE_ROCKET, $1d, $b, STAY, UP, $4, OPP_ROCKET, $3 + object SPRITE_ROCKET, $1d, $11, STAY, LEFT, $5, OPP_ROCKET, $4 object SPRITE_OMANYTE, $c, $6, STAY, NONE, $6 ; person object SPRITE_OMANYTE, $d, $6, STAY, NONE, $7 ; person object SPRITE_BALL, $19, $15, STAY, NONE, $8, HP_UP diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm index 0cfe9328..53d6b85b 100755 --- a/data/mapObjects/oakslab.asm +++ b/data/mapObjects/oakslab.asm @@ -8,7 +8,7 @@ OaksLabObject: ; 0x1d40a (size=88) db $0 ; signs db $b ; objects - object SPRITE_BLUE, $4, $3, STAY, NONE, $1, SONY1 + $C8, $1 + object SPRITE_BLUE, $4, $3, STAY, NONE, $1, OPP_SONY1, $1 object SPRITE_BALL, $6, $3, STAY, NONE, $2 ; person object SPRITE_BALL, $7, $3, STAY, NONE, $3 ; person object SPRITE_BALL, $8, $3, STAY, NONE, $4 ; person diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/pewtergym.asm index 13909781..b0224a11 100755 --- a/data/mapObjects/pewtergym.asm +++ b/data/mapObjects/pewtergym.asm @@ -8,8 +8,8 @@ PewterGymObject: ; 0x5c52e (size=42) db $0 ; signs db $3 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $4, $1, STAY, DOWN, $1, BROCK + $C8, $1 - object SPRITE_BLACK_HAIR_BOY_1, $3, $6, STAY, RIGHT, $2, JR__TRAINER_M + $C8, $1 + object SPRITE_BLACK_HAIR_BOY_2, $4, $1, STAY, DOWN, $1, OPP_BROCK, $1 + object SPRITE_BLACK_HAIR_BOY_1, $3, $6, STAY, RIGHT, $2, OPP_JR_TRAINER_M, $1 object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $3 ; person ; warp-to diff --git a/data/mapObjects/pokemontower3.asm b/data/mapObjects/pokemontower3.asm index a3580e23..4591cbe3 100755 --- a/data/mapObjects/pokemontower3.asm +++ b/data/mapObjects/pokemontower3.asm @@ -8,9 +8,9 @@ PokemonTower3Object: ; 0x6075d (size=51) db $0 ; signs db $4 ; objects - object SPRITE_MEDIUM, $c, $3, STAY, LEFT, $1, CHANNELER + $C8, $5 - object SPRITE_MEDIUM, $9, $8, STAY, DOWN, $2, CHANNELER + $C8, $6 - object SPRITE_MEDIUM, $a, $d, STAY, DOWN, $3, CHANNELER + $C8, $8 + object SPRITE_MEDIUM, $c, $3, STAY, LEFT, $1, OPP_CHANNELER, $5 + object SPRITE_MEDIUM, $9, $8, STAY, DOWN, $2, OPP_CHANNELER, $6 + object SPRITE_MEDIUM, $a, $d, STAY, DOWN, $3, OPP_CHANNELER, $8 object SPRITE_BALL, $c, $1, STAY, NONE, $4, ESCAPE_ROPE ; warp-to diff --git a/data/mapObjects/pokemontower4.asm b/data/mapObjects/pokemontower4.asm index de95d1b0..722f6e08 100755 --- a/data/mapObjects/pokemontower4.asm +++ b/data/mapObjects/pokemontower4.asm @@ -8,9 +8,9 @@ PokemonTower4Object: ; 0x6088b (size=65) db $0 ; signs db $6 ; objects - object SPRITE_MEDIUM, $5, $a, STAY, RIGHT, $1, CHANNELER + $C8, $9 - object SPRITE_MEDIUM, $f, $7, STAY, DOWN, $2, CHANNELER + $C8, $a - object SPRITE_MEDIUM, $e, $c, STAY, LEFT, $3, CHANNELER + $C8, $c + object SPRITE_MEDIUM, $5, $a, STAY, RIGHT, $1, OPP_CHANNELER, $9 + object SPRITE_MEDIUM, $f, $7, STAY, DOWN, $2, OPP_CHANNELER, $a + object SPRITE_MEDIUM, $e, $c, STAY, LEFT, $3, OPP_CHANNELER, $c object SPRITE_BALL, $c, $a, STAY, NONE, $4, ELIXER object SPRITE_BALL, $9, $a, STAY, NONE, $5, AWAKENING object SPRITE_BALL, $c, $10, STAY, NONE, $6, HP_UP diff --git a/data/mapObjects/pokemontower5.asm b/data/mapObjects/pokemontower5.asm index bb3f1882..1d23abbf 100755 --- a/data/mapObjects/pokemontower5.asm +++ b/data/mapObjects/pokemontower5.asm @@ -9,10 +9,10 @@ PokemonTower5Object: ; 0x60a48 (size=65) db $6 ; objects object SPRITE_MEDIUM, $c, $8, STAY, NONE, $1 ; person - object SPRITE_MEDIUM, $11, $7, STAY, LEFT, $2, CHANNELER + $C8, $e - object SPRITE_MEDIUM, $e, $3, STAY, LEFT, $3, CHANNELER + $C8, $10 - object SPRITE_MEDIUM, $6, $a, STAY, RIGHT, $4, CHANNELER + $C8, $11 - object SPRITE_MEDIUM, $9, $10, STAY, RIGHT, $5, CHANNELER + $C8, $12 + object SPRITE_MEDIUM, $11, $7, STAY, LEFT, $2, OPP_CHANNELER, $e + object SPRITE_MEDIUM, $e, $3, STAY, LEFT, $3, OPP_CHANNELER, $10 + object SPRITE_MEDIUM, $6, $a, STAY, RIGHT, $4, OPP_CHANNELER, $11 + object SPRITE_MEDIUM, $9, $10, STAY, RIGHT, $5, OPP_CHANNELER, $12 object SPRITE_BALL, $6, $e, STAY, NONE, $6, NUGGET ; warp-to diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/pokemontower6.asm index 56dcc404..cd7453d8 100755 --- a/data/mapObjects/pokemontower6.asm +++ b/data/mapObjects/pokemontower6.asm @@ -8,9 +8,9 @@ PokemonTower6Object: ; 0x60c5b (size=58) db $0 ; signs db $5 ; objects - object SPRITE_MEDIUM, $c, $a, STAY, RIGHT, $1, CHANNELER + $C8, $13 - object SPRITE_MEDIUM, $9, $5, STAY, DOWN, $2, CHANNELER + $C8, $14 - object SPRITE_MEDIUM, $10, $5, STAY, LEFT, $3, CHANNELER + $C8, $15 + object SPRITE_MEDIUM, $c, $a, STAY, RIGHT, $1, OPP_CHANNELER, $13 + object SPRITE_MEDIUM, $9, $5, STAY, DOWN, $2, OPP_CHANNELER, $14 + object SPRITE_MEDIUM, $10, $5, STAY, LEFT, $3, OPP_CHANNELER, $15 object SPRITE_BALL, $6, $8, STAY, NONE, $4, RARE_CANDY object SPRITE_BALL, $e, $e, STAY, NONE, $5, X_ACCURACY diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index 270f3aa7..fd1fc884 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/pokemontower7.asm @@ -13,9 +13,9 @@ IF DEF(_YELLOW) object SPRITE_MR_FUJI, $a, 3, STAY, DOWN, 3 ELSE db $4 ; objects - object SPRITE_ROCKET, $9, $b, STAY, RIGHT, $1, ROCKET + $C8, $13 - object SPRITE_ROCKET, $c, $9, STAY, LEFT, $2, ROCKET + $C8, $14 - object SPRITE_ROCKET, $9, $7, STAY, RIGHT, $3, ROCKET + $C8, $15 + object SPRITE_ROCKET, $9, $b, STAY, RIGHT, $1, OPP_ROCKET, $13 + object SPRITE_ROCKET, $c, $9, STAY, LEFT, $2, OPP_ROCKET, $14 + object SPRITE_ROCKET, $9, $7, STAY, RIGHT, $3, OPP_ROCKET, $15 object SPRITE_MR_FUJI, $a, $3, STAY, DOWN, $4 ; person ENDC diff --git a/data/mapObjects/rockethideout1.asm b/data/mapObjects/rockethideout1.asm index a1a87350..55c0c101 100755 --- a/data/mapObjects/rockethideout1.asm +++ b/data/mapObjects/rockethideout1.asm @@ -11,11 +11,11 @@ RocketHideout1Object: ; 0x44ce7 (size=98) db $0 ; signs db $7 ; objects - object SPRITE_ROCKET, $1a, $8, STAY, LEFT, $1, ROCKET + $C8, $8 - object SPRITE_ROCKET, $c, $6, STAY, RIGHT, $2, ROCKET + $C8, $9 - object SPRITE_ROCKET, $12, $11, STAY, DOWN, $3, ROCKET + $C8, $a - object SPRITE_ROCKET, $f, $19, STAY, RIGHT, $4, ROCKET + $C8, $b - object SPRITE_ROCKET, $1c, $12, STAY, LEFT, $5, ROCKET + $C8, $c + object SPRITE_ROCKET, $1a, $8, STAY, LEFT, $1, OPP_ROCKET, $8 + object SPRITE_ROCKET, $c, $6, STAY, RIGHT, $2, OPP_ROCKET, $9 + object SPRITE_ROCKET, $12, $11, STAY, DOWN, $3, OPP_ROCKET, $a + object SPRITE_ROCKET, $f, $19, STAY, RIGHT, $4, OPP_ROCKET, $b + object SPRITE_ROCKET, $1c, $12, STAY, LEFT, $5, OPP_ROCKET, $c object SPRITE_BALL, $b, $e, STAY, NONE, $6, ESCAPE_ROPE object SPRITE_BALL, $9, $11, STAY, NONE, $7, HYPER_POTION diff --git a/data/mapObjects/rockethideout2.asm b/data/mapObjects/rockethideout2.asm index 40e19895..b14dc0e6 100755 --- a/data/mapObjects/rockethideout2.asm +++ b/data/mapObjects/rockethideout2.asm @@ -11,7 +11,7 @@ RocketHideout2Object: ; 0x450f7 (size=80) db $0 ; signs db $5 ; objects - object SPRITE_ROCKET, $14, $c, STAY, DOWN, $1, ROCKET + $C8, $d + object SPRITE_ROCKET, $14, $c, STAY, DOWN, $1, OPP_ROCKET, $d object SPRITE_BALL, $1, $b, STAY, NONE, $2, MOON_STONE object SPRITE_BALL, $10, $8, STAY, NONE, $3, NUGGET object SPRITE_BALL, $6, $c, STAY, NONE, $4, TM_07 diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/rockethideout3.asm index 3001be76..d7933ddf 100755 --- a/data/mapObjects/rockethideout3.asm +++ b/data/mapObjects/rockethideout3.asm @@ -8,8 +8,8 @@ RocketHideout3Object: ; 0x4534d (size=50) db $0 ; signs db $4 ; objects - object SPRITE_ROCKET, $a, $16, STAY, RIGHT, $1, ROCKET + $C8, $e - object SPRITE_ROCKET, $1a, $c, STAY, UP, $2, ROCKET + $C8, $f + object SPRITE_ROCKET, $a, $16, STAY, RIGHT, $1, OPP_ROCKET, $e + object SPRITE_ROCKET, $1a, $c, STAY, UP, $2, OPP_ROCKET, $f object SPRITE_BALL, $1a, $11, STAY, NONE, $3, TM_10 object SPRITE_BALL, $14, $e, STAY, NONE, $4, RARE_CANDY diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/rockethideout4.asm index e11133fd..5441f9cd 100755 --- a/data/mapObjects/rockethideout4.asm +++ b/data/mapObjects/rockethideout4.asm @@ -9,10 +9,10 @@ RocketHideout4Object: ; 0x455f1 (size=95) db $0 ; signs db $9 ; objects - object SPRITE_GIOVANNI, $19, $3, STAY, DOWN, $1, GIOVANNI + $C8, $1 - object SPRITE_ROCKET, $17, $c, STAY, DOWN, $2, ROCKET + $C8, $10 - object SPRITE_ROCKET, $1a, $c, STAY, DOWN, $3, ROCKET + $C8, $11 - object SPRITE_ROCKET, $b, $2, STAY, DOWN, $4, ROCKET + $C8, $12 + object SPRITE_GIOVANNI, $19, $3, STAY, DOWN, $1, OPP_GIOVANNI, $1 + object SPRITE_ROCKET, $17, $c, STAY, DOWN, $2, OPP_ROCKET, $10 + object SPRITE_ROCKET, $1a, $c, STAY, DOWN, $3, OPP_ROCKET, $11 + object SPRITE_ROCKET, $b, $2, STAY, DOWN, $4, OPP_ROCKET, $12 object SPRITE_BALL, $a, $c, STAY, NONE, $5, HP_UP object SPRITE_BALL, $9, $4, STAY, NONE, $6, TM_02 object SPRITE_BALL, $c, $14, STAY, NONE, $7, IRON diff --git a/data/mapObjects/rocktunnel1.asm b/data/mapObjects/rocktunnel1.asm index 348e9e50..70ffa438 100755 --- a/data/mapObjects/rocktunnel1.asm +++ b/data/mapObjects/rocktunnel1.asm @@ -15,13 +15,13 @@ RockTunnel1Object: ; 0x445f6 (size=127) db $1d, $b, $8 ; RockTunnel1Text8 db $7 ; objects - object SPRITE_HIKER, $7, $5, STAY, DOWN, $1, HIKER + $C8, $c - object SPRITE_HIKER, $5, $10, STAY, DOWN, $2, HIKER + $C8, $d - object SPRITE_HIKER, $11, $f, STAY, LEFT, $3, HIKER + $C8, $e - object SPRITE_BLACK_HAIR_BOY_2, $17, $8, STAY, LEFT, $4, POKEMANIAC + $C8, $7 - object SPRITE_LASS, $25, $15, STAY, LEFT, $5, JR__TRAINER_F + $C8, $11 - object SPRITE_LASS, $16, $18, STAY, DOWN, $6, JR__TRAINER_F + $C8, $12 - object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, JR__TRAINER_F + $C8, $13 + object SPRITE_HIKER, $7, $5, STAY, DOWN, $1, OPP_HIKER, $c + object SPRITE_HIKER, $5, $10, STAY, DOWN, $2, OPP_HIKER, $d + object SPRITE_HIKER, $11, $f, STAY, LEFT, $3, OPP_HIKER, $e + object SPRITE_BLACK_HAIR_BOY_2, $17, $8, STAY, LEFT, $4, OPP_POKEMANIAC, $7 + object SPRITE_LASS, $25, $15, STAY, LEFT, $5, OPP_JR_TRAINER_F, $11 + object SPRITE_LASS, $16, $18, STAY, DOWN, $6, OPP_JR_TRAINER_F, $12 + object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, OPP_JR_TRAINER_F, $13 ; warp-to EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $f diff --git a/data/mapObjects/rocktunnel2.asm b/data/mapObjects/rocktunnel2.asm index 7da2c3d1..e343fc0b 100755 --- a/data/mapObjects/rocktunnel2.asm +++ b/data/mapObjects/rocktunnel2.asm @@ -10,14 +10,14 @@ RockTunnel2Object: ; 0x4613d (size=100) db $0 ; signs db $8 ; objects - object SPRITE_LASS, $b, $d, STAY, DOWN, $1, JR__TRAINER_F + $C8, $9 - object SPRITE_HIKER, $6, $a, STAY, DOWN, $2, HIKER + $C8, $9 - object SPRITE_BLACK_HAIR_BOY_2, $3, $5, STAY, DOWN, $3, POKEMANIAC + $C8, $3 - object SPRITE_BLACK_HAIR_BOY_2, $14, $15, STAY, RIGHT, $4, POKEMANIAC + $C8, $4 - object SPRITE_HIKER, $1e, $a, STAY, DOWN, $5, HIKER + $C8, $a - object SPRITE_LASS, $e, $1c, STAY, RIGHT, $6, JR__TRAINER_F + $C8, $a - object SPRITE_HIKER, $21, $5, STAY, RIGHT, $7, HIKER + $C8, $b - object SPRITE_BLACK_HAIR_BOY_2, $1a, $1e, STAY, DOWN, $8, POKEMANIAC + $C8, $5 + object SPRITE_LASS, $b, $d, STAY, DOWN, $1, OPP_JR_TRAINER_F, $9 + object SPRITE_HIKER, $6, $a, STAY, DOWN, $2, OPP_HIKER, $9 + object SPRITE_BLACK_HAIR_BOY_2, $3, $5, STAY, DOWN, $3, OPP_POKEMANIAC, $3 + object SPRITE_BLACK_HAIR_BOY_2, $14, $15, STAY, RIGHT, $4, OPP_POKEMANIAC, $4 + object SPRITE_HIKER, $1e, $a, STAY, DOWN, $5, OPP_HIKER, $a + object SPRITE_LASS, $e, $1c, STAY, RIGHT, $6, OPP_JR_TRAINER_F, $a + object SPRITE_HIKER, $21, $5, STAY, RIGHT, $7, OPP_HIKER, $b + object SPRITE_BLACK_HAIR_BOY_2, $1a, $1e, STAY, DOWN, $8, OPP_POKEMANIAC, $5 ; warp-to EVENT_DISP ROCK_TUNNEL_2_WIDTH, $19, $21 ; ROCK_TUNNEL_1 diff --git a/data/mapObjects/route10.asm b/data/mapObjects/route10.asm index b9b0cd25..3623b79f 100755 --- a/data/mapObjects/route10.asm +++ b/data/mapObjects/route10.asm @@ -14,12 +14,12 @@ Route10Object: ; 0x582f6 (size=96) db $29, $5, $a ; Route10Text10 db $6 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $a, $2c, STAY, LEFT, $1, POKEMANIAC + $C8, $1 - object SPRITE_HIKER, $3, $39, STAY, UP, $2, HIKER + $C8, $7 - object SPRITE_BLACK_HAIR_BOY_2, $e, $40, STAY, LEFT, $3, POKEMANIAC + $C8, $2 - object SPRITE_LASS, $7, $19, STAY, LEFT, $4, JR__TRAINER_F + $C8, $7 - object SPRITE_HIKER, $3, $3d, STAY, DOWN, $5, HIKER + $C8, $8 - object SPRITE_LASS, $7, $36, STAY, DOWN, $6, JR__TRAINER_F + $C8, $8 + object SPRITE_BLACK_HAIR_BOY_2, $a, $2c, STAY, LEFT, $1, OPP_POKEMANIAC, $1 + object SPRITE_HIKER, $3, $39, STAY, UP, $2, OPP_HIKER, $7 + object SPRITE_BLACK_HAIR_BOY_2, $e, $40, STAY, LEFT, $3, OPP_POKEMANIAC, $2 + object SPRITE_LASS, $7, $19, STAY, LEFT, $4, OPP_JR_TRAINER_F, $7 + object SPRITE_HIKER, $3, $3d, STAY, DOWN, $5, OPP_HIKER, $8 + object SPRITE_LASS, $7, $36, STAY, DOWN, $6, OPP_JR_TRAINER_F, $8 ; warp-to EVENT_DISP ROUTE_10_WIDTH, $13, $b ; ROCK_TUNNEL_POKECENTER diff --git a/data/mapObjects/route11.asm b/data/mapObjects/route11.asm index ccbd1af2..4e196b20 100755 --- a/data/mapObjects/route11.asm +++ b/data/mapObjects/route11.asm @@ -12,16 +12,16 @@ Route11Object: ; 0x584e0 (size=127) db $5, $1, $b ; Route11Text11 db $a ; objects - object SPRITE_GAMBLER, $a, $e, STAY, DOWN, $1, GAMBLER + $C8, $1 - object SPRITE_GAMBLER, $1a, $9, STAY, DOWN, $2, GAMBLER + $C8, $2 - object SPRITE_BUG_CATCHER, $d, $5, STAY, LEFT, $3, YOUNGSTER + $C8, $9 - object SPRITE_BLACK_HAIR_BOY_2, $24, $b, STAY, DOWN, $4, ENGINEER + $C8, $2 - object SPRITE_BUG_CATCHER, $16, $4, STAY, UP, $5, YOUNGSTER + $C8, $a - object SPRITE_GAMBLER, $2d, $7, STAY, DOWN, $6, GAMBLER + $C8, $3 - object SPRITE_GAMBLER, $21, $3, STAY, UP, $7, GAMBLER + $C8, $4 - object SPRITE_BUG_CATCHER, $2b, $5, STAY, RIGHT, $8, YOUNGSTER + $C8, $b - object SPRITE_BLACK_HAIR_BOY_2, $2d, $10, STAY, LEFT, $9, ENGINEER + $C8, $3 - object SPRITE_BUG_CATCHER, $16, $c, STAY, UP, $a, YOUNGSTER + $C8, $c + object SPRITE_GAMBLER, $a, $e, STAY, DOWN, $1, OPP_GAMBLER, $1 + object SPRITE_GAMBLER, $1a, $9, STAY, DOWN, $2, OPP_GAMBLER, $2 + object SPRITE_BUG_CATCHER, $d, $5, STAY, LEFT, $3, OPP_YOUNGSTER, $9 + object SPRITE_BLACK_HAIR_BOY_2, $24, $b, STAY, DOWN, $4, OPP_ENGINEER, $2 + object SPRITE_BUG_CATCHER, $16, $4, STAY, UP, $5, OPP_YOUNGSTER, $a + object SPRITE_GAMBLER, $2d, $7, STAY, DOWN, $6, OPP_GAMBLER, $3 + object SPRITE_GAMBLER, $21, $3, STAY, UP, $7, OPP_GAMBLER, $4 + object SPRITE_BUG_CATCHER, $2b, $5, STAY, RIGHT, $8, OPP_YOUNGSTER, $b + object SPRITE_BLACK_HAIR_BOY_2, $2d, $10, STAY, LEFT, $9, OPP_ENGINEER, $3 + object SPRITE_BUG_CATCHER, $16, $c, STAY, UP, $a, OPP_YOUNGSTER, $c ; warp-to EVENT_DISP ROUTE_11_WIDTH, $8, $31 ; ROUTE_11_GATE_1F diff --git a/data/mapObjects/route12.asm b/data/mapObjects/route12.asm index 82c36313..8ed43ff4 100755 --- a/data/mapObjects/route12.asm +++ b/data/mapObjects/route12.asm @@ -13,13 +13,13 @@ Route12Object: ; 0x5869a (size=118) db $a ; objects object SPRITE_SNORLAX, $a, $3e, STAY, DOWN, $1 ; person - object SPRITE_FISHER2, $e, $1f, STAY, LEFT, $2, FISHER + $C8, $3 - object SPRITE_FISHER2, $5, $27, STAY, UP, $3, FISHER + $C8, $4 - object SPRITE_BLACK_HAIR_BOY_1, $b, $5c, STAY, LEFT, $4, JR__TRAINER_M + $C8, $9 - object SPRITE_BLACK_HAIR_BOY_2, $e, $4c, STAY, UP, $5, ROCKER + $C8, $2 - object SPRITE_FISHER2, $c, $28, STAY, LEFT, $6, FISHER + $C8, $5 - object SPRITE_FISHER2, $9, $34, STAY, RIGHT, $7, FISHER + $C8, $6 - object SPRITE_FISHER2, $6, $57, STAY, DOWN, $8, FISHER + $C8, $b + object SPRITE_FISHER2, $e, $1f, STAY, LEFT, $2, OPP_FISHER, $3 + object SPRITE_FISHER2, $5, $27, STAY, UP, $3, OPP_FISHER, $4 + object SPRITE_BLACK_HAIR_BOY_1, $b, $5c, STAY, LEFT, $4, OPP_JR_TRAINER_M, $9 + object SPRITE_BLACK_HAIR_BOY_2, $e, $4c, STAY, UP, $5, OPP_ROCKER, $2 + object SPRITE_FISHER2, $c, $28, STAY, LEFT, $6, OPP_FISHER, $5 + object SPRITE_FISHER2, $9, $34, STAY, RIGHT, $7, OPP_FISHER, $6 + object SPRITE_FISHER2, $6, $57, STAY, DOWN, $8, OPP_FISHER, $b object SPRITE_BALL, $e, $23, STAY, NONE, $9, TM_16 object SPRITE_BALL, $5, $59, STAY, NONE, $a, IRON diff --git a/data/mapObjects/route13.asm b/data/mapObjects/route13.asm index 3b2c6b87..e6fdf8e6 100755 --- a/data/mapObjects/route13.asm +++ b/data/mapObjects/route13.asm @@ -9,13 +9,13 @@ Route13Object: ; 0x5482e (size=93) db $b, $1f, $d ; Route13Text13 db $a ; objects - object SPRITE_BLACK_HAIR_BOY_1, $31, $a, STAY, RIGHT, $1, BIRD_KEEPER + $C8, $1 - object SPRITE_LASS, $30, $a, STAY, DOWN, $2, JR__TRAINER_F + $C8, $c - object SPRITE_LASS, $1b, $9, STAY, DOWN, $3, JR__TRAINER_F + $C8, $d - object SPRITE_LASS, $17, $a, STAY, LEFT, $4, JR__TRAINER_F + $C8, $e - object SPRITE_LASS, $32, $5, STAY, DOWN, $5, JR__TRAINER_F + $C8, $f - object SPRITE_BLACK_HAIR_BOY_1, $c, $4, STAY, RIGHT, $6, BIRD_KEEPER + $C8, $2 - object SPRITE_FOULARD_WOMAN, $21, $6, STAY, DOWN, $7, BEAUTY + $C8, $4 - object SPRITE_FOULARD_WOMAN, $20, $6, STAY, DOWN, $8, BEAUTY + $C8, $5 - object SPRITE_BIKER, $a, $7, STAY, UP, $9, BIKER + $C8, $1 - object SPRITE_BLACK_HAIR_BOY_1, $7, $d, STAY, UP, $a, BIRD_KEEPER + $C8, $3 + object SPRITE_BLACK_HAIR_BOY_1, $31, $a, STAY, RIGHT, $1, OPP_BIRD_KEEPER, $1 + object SPRITE_LASS, $30, $a, STAY, DOWN, $2, OPP_JR_TRAINER_F, $c + object SPRITE_LASS, $1b, $9, STAY, DOWN, $3, OPP_JR_TRAINER_F, $d + object SPRITE_LASS, $17, $a, STAY, LEFT, $4, OPP_JR_TRAINER_F, $e + object SPRITE_LASS, $32, $5, STAY, DOWN, $5, OPP_JR_TRAINER_F, $f + object SPRITE_BLACK_HAIR_BOY_1, $c, $4, STAY, RIGHT, $6, OPP_BIRD_KEEPER, $2 + object SPRITE_FOULARD_WOMAN, $21, $6, STAY, DOWN, $7, OPP_BEAUTY, $4 + object SPRITE_FOULARD_WOMAN, $20, $6, STAY, DOWN, $8, OPP_BEAUTY, $5 + object SPRITE_BIKER, $a, $7, STAY, UP, $9, OPP_BIKER, $1 + object SPRITE_BLACK_HAIR_BOY_1, $7, $d, STAY, UP, $a, OPP_BIRD_KEEPER, $3 diff --git a/data/mapObjects/route14.asm b/data/mapObjects/route14.asm index 6b8dcd40..ce6d52b0 100755 --- a/data/mapObjects/route14.asm +++ b/data/mapObjects/route14.asm @@ -7,13 +7,13 @@ Route14Object: ; 0x549bb (size=87) db $d, $11, $b ; Route14Text11 db $a ; objects - object SPRITE_BLACK_HAIR_BOY_1, $4, $4, STAY, DOWN, $1, BIRD_KEEPER + $C8, $e - object SPRITE_BLACK_HAIR_BOY_1, $f, $6, STAY, DOWN, $2, BIRD_KEEPER + $C8, $f - object SPRITE_BLACK_HAIR_BOY_1, $c, $b, STAY, DOWN, $3, BIRD_KEEPER + $C8, $10 - object SPRITE_BLACK_HAIR_BOY_1, $e, $f, STAY, UP, $4, BIRD_KEEPER + $C8, $11 - object SPRITE_BLACK_HAIR_BOY_1, $f, $1f, STAY, LEFT, $5, BIRD_KEEPER + $C8, $4 - object SPRITE_BLACK_HAIR_BOY_1, $6, $31, STAY, UP, $6, BIRD_KEEPER + $C8, $5 - object SPRITE_BIKER, $5, $27, STAY, DOWN, $7, BIKER + $C8, $d - object SPRITE_BIKER, $4, $1e, STAY, RIGHT, $8, BIKER + $C8, $e - object SPRITE_BIKER, $f, $1e, STAY, LEFT, $9, BIKER + $C8, $f - object SPRITE_BIKER, $4, $1f, STAY, RIGHT, $a, BIKER + $C8, $2 + object SPRITE_BLACK_HAIR_BOY_1, $4, $4, STAY, DOWN, $1, OPP_BIRD_KEEPER, $e + object SPRITE_BLACK_HAIR_BOY_1, $f, $6, STAY, DOWN, $2, OPP_BIRD_KEEPER, $f + object SPRITE_BLACK_HAIR_BOY_1, $c, $b, STAY, DOWN, $3, OPP_BIRD_KEEPER, $10 + object SPRITE_BLACK_HAIR_BOY_1, $e, $f, STAY, UP, $4, OPP_BIRD_KEEPER, $11 + object SPRITE_BLACK_HAIR_BOY_1, $f, $1f, STAY, LEFT, $5, OPP_BIRD_KEEPER, $4 + object SPRITE_BLACK_HAIR_BOY_1, $6, $31, STAY, UP, $6, OPP_BIRD_KEEPER, $5 + object SPRITE_BIKER, $5, $27, STAY, DOWN, $7, OPP_BIKER, $d + object SPRITE_BIKER, $4, $1e, STAY, RIGHT, $8, OPP_BIKER, $e + object SPRITE_BIKER, $f, $1e, STAY, LEFT, $9, OPP_BIKER, $f + object SPRITE_BIKER, $4, $1f, STAY, RIGHT, $a, OPP_BIKER, $2 diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm index 32ec8d8a..e0d19e5c 100755 --- a/data/mapObjects/route15.asm +++ b/data/mapObjects/route15.asm @@ -11,16 +11,16 @@ Route15Object: ; 0x5894e (size=126) db $9, $27, $c ; Route15Text12 db $b ; objects - object SPRITE_LASS, $29, $b, STAY, DOWN, $1, JR__TRAINER_F + $C8, $14 - object SPRITE_LASS, $35, $a, STAY, LEFT, $2, JR__TRAINER_F + $C8, $15 - object SPRITE_BLACK_HAIR_BOY_1, $1f, $d, STAY, UP, $3, BIRD_KEEPER + $C8, $6 - object SPRITE_BLACK_HAIR_BOY_1, $23, $d, STAY, UP, $4, BIRD_KEEPER + $C8, $7 - object SPRITE_FOULARD_WOMAN, $35, $b, STAY, DOWN, $5, BEAUTY + $C8, $9 - object SPRITE_FOULARD_WOMAN, $29, $a, STAY, RIGHT, $6, BEAUTY + $C8, $a - object SPRITE_BIKER, $30, $a, STAY, DOWN, $7, BIKER + $C8, $3 - object SPRITE_BIKER, $2e, $a, STAY, DOWN, $8, BIKER + $C8, $4 - object SPRITE_LASS, $25, $5, STAY, RIGHT, $9, JR__TRAINER_F + $C8, $16 - object SPRITE_LASS, $12, $d, STAY, UP, $a, JR__TRAINER_F + $C8, $17 + object SPRITE_LASS, $29, $b, STAY, DOWN, $1, OPP_JR_TRAINER_F, $14 + object SPRITE_LASS, $35, $a, STAY, LEFT, $2, OPP_JR_TRAINER_F, $15 + object SPRITE_BLACK_HAIR_BOY_1, $1f, $d, STAY, UP, $3, OPP_BIRD_KEEPER, $6 + object SPRITE_BLACK_HAIR_BOY_1, $23, $d, STAY, UP, $4, OPP_BIRD_KEEPER, $7 + object SPRITE_FOULARD_WOMAN, $35, $b, STAY, DOWN, $5, OPP_BEAUTY, $9 + object SPRITE_FOULARD_WOMAN, $29, $a, STAY, RIGHT, $6, OPP_BEAUTY, $a + object SPRITE_BIKER, $30, $a, STAY, DOWN, $7, OPP_BIKER, $3 + object SPRITE_BIKER, $2e, $a, STAY, DOWN, $8, OPP_BIKER, $4 + object SPRITE_LASS, $25, $5, STAY, RIGHT, $9, OPP_JR_TRAINER_F, $16 + object SPRITE_LASS, $12, $d, STAY, UP, $a, OPP_JR_TRAINER_F, $17 object SPRITE_BALL, $12, $5, STAY, NONE, $b, TM_20 ; warp-to diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm index 94adaf96..600dbbf1 100755 --- a/data/mapObjects/route16.asm +++ b/data/mapObjects/route16.asm @@ -17,12 +17,12 @@ Route16Object: ; 0x58afc (size=136) db $11, $5, $9 ; Route16Text9 db $7 ; objects - object SPRITE_BIKER, $11, $c, STAY, LEFT, $1, BIKER + $C8, $5 - object SPRITE_BIKER, $e, $d, STAY, RIGHT, $2, CUE_BALL + $C8, $1 - object SPRITE_BIKER, $b, $c, STAY, UP, $3, CUE_BALL + $C8, $2 - object SPRITE_BIKER, $9, $b, STAY, LEFT, $4, BIKER + $C8, $6 - object SPRITE_BIKER, $6, $a, STAY, RIGHT, $5, CUE_BALL + $C8, $3 - object SPRITE_BIKER, $3, $c, STAY, RIGHT, $6, BIKER + $C8, $7 + object SPRITE_BIKER, $11, $c, STAY, LEFT, $1, OPP_BIKER, $5 + object SPRITE_BIKER, $e, $d, STAY, RIGHT, $2, OPP_CUE_BALL, $1 + object SPRITE_BIKER, $b, $c, STAY, UP, $3, OPP_CUE_BALL, $2 + object SPRITE_BIKER, $9, $b, STAY, LEFT, $4, OPP_BIKER, $6 + object SPRITE_BIKER, $6, $a, STAY, RIGHT, $5, OPP_CUE_BALL, $3 + object SPRITE_BIKER, $3, $c, STAY, RIGHT, $6, OPP_BIKER, $7 object SPRITE_SNORLAX, $1a, $a, STAY, DOWN, $7 ; person ; warp-to diff --git a/data/mapObjects/route17.asm b/data/mapObjects/route17.asm index b0f22cde..c496373e 100755 --- a/data/mapObjects/route17.asm +++ b/data/mapObjects/route17.asm @@ -12,13 +12,13 @@ Route17Object: ; 0x54b42 (size=102) db $8d, $9, $10 ; Route17Text16 db $a ; objects - object SPRITE_BIKER, $c, $13, STAY, LEFT, $1, CUE_BALL + $C8, $4 - object SPRITE_BIKER, $b, $10, STAY, RIGHT, $2, CUE_BALL + $C8, $5 - object SPRITE_BIKER, $4, $12, STAY, UP, $3, BIKER + $C8, $8 - object SPRITE_BIKER, $7, $20, STAY, LEFT, $4, BIKER + $C8, $9 - object SPRITE_BIKER, $e, $22, STAY, RIGHT, $5, BIKER + $C8, $a - object SPRITE_BIKER, $11, $3a, STAY, LEFT, $6, CUE_BALL + $C8, $6 - object SPRITE_BIKER, $2, $44, STAY, RIGHT, $7, CUE_BALL + $C8, $7 - object SPRITE_BIKER, $e, $62, STAY, RIGHT, $8, CUE_BALL + $C8, $8 - object SPRITE_BIKER, $5, $62, STAY, LEFT, $9, BIKER + $C8, $b - object SPRITE_BIKER, $a, $76, STAY, DOWN, $a, BIKER + $C8, $c + object SPRITE_BIKER, $c, $13, STAY, LEFT, $1, OPP_CUE_BALL, $4 + object SPRITE_BIKER, $b, $10, STAY, RIGHT, $2, OPP_CUE_BALL, $5 + object SPRITE_BIKER, $4, $12, STAY, UP, $3, OPP_BIKER, $8 + object SPRITE_BIKER, $7, $20, STAY, LEFT, $4, OPP_BIKER, $9 + object SPRITE_BIKER, $e, $22, STAY, RIGHT, $5, OPP_BIKER, $a + object SPRITE_BIKER, $11, $3a, STAY, LEFT, $6, OPP_CUE_BALL, $6 + object SPRITE_BIKER, $2, $44, STAY, RIGHT, $7, OPP_CUE_BALL, $7 + object SPRITE_BIKER, $e, $62, STAY, RIGHT, $8, OPP_CUE_BALL, $8 + object SPRITE_BIKER, $5, $62, STAY, LEFT, $9, OPP_BIKER, $b + object SPRITE_BIKER, $a, $76, STAY, DOWN, $a, OPP_BIKER, $c diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm index 7fd24383..88547941 100755 --- a/data/mapObjects/route18.asm +++ b/data/mapObjects/route18.asm @@ -12,9 +12,9 @@ Route18Object: ; 0x58c5a (size=66) db $5, $21, $5 ; Route18Text5 db $3 ; objects - object SPRITE_BLACK_HAIR_BOY_1, $24, $b, STAY, RIGHT, $1, BIRD_KEEPER + $C8, $8 - object SPRITE_BLACK_HAIR_BOY_1, $28, $f, STAY, LEFT, $2, BIRD_KEEPER + $C8, $9 - object SPRITE_BLACK_HAIR_BOY_1, $2a, $d, STAY, LEFT, $3, BIRD_KEEPER + $C8, $a + object SPRITE_BLACK_HAIR_BOY_1, $24, $b, STAY, RIGHT, $1, OPP_BIRD_KEEPER, $8 + object SPRITE_BLACK_HAIR_BOY_1, $28, $f, STAY, LEFT, $2, OPP_BIRD_KEEPER, $9 + object SPRITE_BLACK_HAIR_BOY_1, $2a, $d, STAY, LEFT, $3, OPP_BIRD_KEEPER, $a ; warp-to EVENT_DISP ROUTE_18_WIDTH, $8, $21 ; ROUTE_18_GATE_1F diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index f86a114a..ee55a069 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -17,24 +17,24 @@ ENDC db $a ; objects IF DEF(_OPTION_BEACH_HOUSE) - object SPRITE_BLACK_HAIR_BOY_1, $9, $7, STAY, RIGHT, 1, SWIMMER + $C8, 2 - object SPRITE_BLACK_HAIR_BOY_1, $c, $9, STAY, LEFT, 2, SWIMMER + $C8, 3 + object SPRITE_BLACK_HAIR_BOY_1, $9, $7, STAY, RIGHT, 1, OPP_SWIMMER, 2 + object SPRITE_BLACK_HAIR_BOY_1, $c, $9, STAY, LEFT, 2, OPP_SWIMMER, 3 ELSE - object SPRITE_BLACK_HAIR_BOY_1, $8, $7, STAY, LEFT, 1, SWIMMER + $C8, 2 - object SPRITE_BLACK_HAIR_BOY_1, $d, $7, STAY, LEFT, 2, SWIMMER + $C8, 3 + object SPRITE_BLACK_HAIR_BOY_1, $8, $7, STAY, LEFT, 1, OPP_SWIMMER, 2 + object SPRITE_BLACK_HAIR_BOY_1, $d, $7, STAY, LEFT, 2, OPP_SWIMMER, 3 ENDC - object SPRITE_SWIMMER, $d, $19, STAY, LEFT, $3, SWIMMER + $C8, $4 - object SPRITE_SWIMMER, $4, $1b, STAY, RIGHT, $4, SWIMMER + $C8, $5 - object SPRITE_SWIMMER, $10, $1f, STAY, UP, $5, SWIMMER + $C8, $6 + object SPRITE_SWIMMER, $d, $19, STAY, LEFT, $3, OPP_SWIMMER, $4 + object SPRITE_SWIMMER, $4, $1b, STAY, RIGHT, $4, OPP_SWIMMER, $5 + object SPRITE_SWIMMER, $10, $1f, STAY, UP, $5, OPP_SWIMMER, $6 IF DEF(_OPTION_BEACH_HOUSE) - object SPRITE_SWIMMER, $9, $d, STAY, DOWN, $6, SWIMMER + $C8, $7 + object SPRITE_SWIMMER, $9, $d, STAY, DOWN, $6, OPP_SWIMMER, $7 ELSE - object SPRITE_SWIMMER, $9, $b, STAY, DOWN, $6, SWIMMER + $C8, $7 + object SPRITE_SWIMMER, $9, $b, STAY, DOWN, $6, OPP_SWIMMER, $7 ENDC - object SPRITE_SWIMMER, $8, $2b, STAY, LEFT, $7, BEAUTY + $C8, $c - object SPRITE_SWIMMER, $b, $2b, STAY, RIGHT, $8, BEAUTY + $C8, $d - object SPRITE_SWIMMER, $9, $2a, STAY, UP, $9, SWIMMER + $C8, $8 - object SPRITE_SWIMMER, $a, $2c, STAY, DOWN, $a, BEAUTY + $C8, $e + object SPRITE_SWIMMER, $8, $2b, STAY, LEFT, $7, OPP_BEAUTY, $c + object SPRITE_SWIMMER, $b, $2b, STAY, RIGHT, $8, OPP_BEAUTY, $d + object SPRITE_SWIMMER, $9, $2a, STAY, UP, $9, OPP_SWIMMER, $8 + object SPRITE_SWIMMER, $a, $2c, STAY, DOWN, $a, OPP_BEAUTY, $e ; warp-to IF DEF(_OPTION_BEACH_HOUSE) diff --git a/data/mapObjects/route20.asm b/data/mapObjects/route20.asm index 00aa4684..6939ffad 100755 --- a/data/mapObjects/route20.asm +++ b/data/mapObjects/route20.asm @@ -10,16 +10,16 @@ Route20Object: ; 0x50113 (size=106) db $b, $39, $c ; Route20Text12 db $a ; objects - object SPRITE_SWIMMER, $57, $8, STAY, UP, $1, SWIMMER + $C8, $9 - object SPRITE_SWIMMER, $44, $b, STAY, UP, $2, BEAUTY + $C8, $f - object SPRITE_SWIMMER, $2d, $a, STAY, DOWN, $3, BEAUTY + $C8, $6 - object SPRITE_SWIMMER, $37, $e, STAY, RIGHT, $4, JR__TRAINER_F + $C8, $18 - object SPRITE_SWIMMER, $26, $d, STAY, DOWN, $5, SWIMMER + $C8, $a - object SPRITE_SWIMMER, $57, $d, STAY, UP, $6, SWIMMER + $C8, $b - object SPRITE_BLACK_HAIR_BOY_1, $22, $9, STAY, UP, $7, BIRD_KEEPER + $C8, $b - object SPRITE_SWIMMER, $19, $7, STAY, UP, $8, BEAUTY + $C8, $7 - object SPRITE_SWIMMER, $18, $c, STAY, DOWN, $9, JR__TRAINER_F + $C8, $10 - object SPRITE_SWIMMER, $f, $8, STAY, UP, $a, BEAUTY + $C8, $8 + object SPRITE_SWIMMER, $57, $8, STAY, UP, $1, OPP_SWIMMER, $9 + object SPRITE_SWIMMER, $44, $b, STAY, UP, $2, OPP_BEAUTY, $f + object SPRITE_SWIMMER, $2d, $a, STAY, DOWN, $3, OPP_BEAUTY, $6 + object SPRITE_SWIMMER, $37, $e, STAY, RIGHT, $4, OPP_JR_TRAINER_F, $18 + object SPRITE_SWIMMER, $26, $d, STAY, DOWN, $5, OPP_SWIMMER, $a + object SPRITE_SWIMMER, $57, $d, STAY, UP, $6, OPP_SWIMMER, $b + object SPRITE_BLACK_HAIR_BOY_1, $22, $9, STAY, UP, $7, OPP_BIRD_KEEPER, $b + object SPRITE_SWIMMER, $19, $7, STAY, UP, $8, OPP_BEAUTY, $7 + object SPRITE_SWIMMER, $18, $c, STAY, DOWN, $9, OPP_JR_TRAINER_F, $10 + object SPRITE_SWIMMER, $f, $8, STAY, UP, $a, OPP_BEAUTY, $8 ; warp-to EVENT_DISP ROUTE_20_WIDTH, $5, $30 ; SEAFOAM_ISLANDS_1 diff --git a/data/mapObjects/route21.asm b/data/mapObjects/route21.asm index 68e4c630..e98c8425 100755 --- a/data/mapObjects/route21.asm +++ b/data/mapObjects/route21.asm @@ -6,12 +6,12 @@ Route21Object: ; 0x55021 (size=76) db $0 ; signs db $9 ; objects - object SPRITE_FISHER2, $4, $18, STAY, LEFT, $1, FISHER + $C8, $7 - object SPRITE_FISHER2, $6, $19, STAY, DOWN, $2, FISHER + $C8, $9 - object SPRITE_SWIMMER, $a, $1f, STAY, UP, $3, SWIMMER + $C8, $c - object SPRITE_SWIMMER, $c, $1e, STAY, RIGHT, $4, CUE_BALL + $C8, $9 - object SPRITE_SWIMMER, $10, $3f, STAY, DOWN, $5, SWIMMER + $C8, $d - object SPRITE_SWIMMER, $5, $47, STAY, RIGHT, $6, SWIMMER + $C8, $e - object SPRITE_SWIMMER, $f, $47, STAY, LEFT, $7, SWIMMER + $C8, $f - object SPRITE_FISHER2, $e, $38, STAY, LEFT, $8, FISHER + $C8, $8 - object SPRITE_FISHER2, $11, $39, STAY, RIGHT, $9, FISHER + $C8, $a + object SPRITE_FISHER2, $4, $18, STAY, LEFT, $1, OPP_FISHER, $7 + object SPRITE_FISHER2, $6, $19, STAY, DOWN, $2, OPP_FISHER, $9 + object SPRITE_SWIMMER, $a, $1f, STAY, UP, $3, OPP_SWIMMER, $c + object SPRITE_SWIMMER, $c, $1e, STAY, RIGHT, $4, OPP_CUE_BALL, $9 + object SPRITE_SWIMMER, $10, $3f, STAY, DOWN, $5, OPP_SWIMMER, $d + object SPRITE_SWIMMER, $5, $47, STAY, RIGHT, $6, OPP_SWIMMER, $e + object SPRITE_SWIMMER, $f, $47, STAY, LEFT, $7, OPP_SWIMMER, $f + object SPRITE_FISHER2, $e, $38, STAY, LEFT, $8, OPP_FISHER, $8 + object SPRITE_FISHER2, $11, $39, STAY, RIGHT, $9, OPP_FISHER, $a diff --git a/data/mapObjects/route24.asm b/data/mapObjects/route24.asm index 95ee726c..f8173c9d 100755 --- a/data/mapObjects/route24.asm +++ b/data/mapObjects/route24.asm @@ -6,11 +6,11 @@ Route24Object: ; 0x506a4 (size=67) db $0 ; signs db $8 ; objects - object SPRITE_BLACK_HAIR_BOY_1, $b, $f, STAY, LEFT, $1, ROCKET + $C8, $6 - object SPRITE_BLACK_HAIR_BOY_1, $5, $14, STAY, UP, $2, JR__TRAINER_M + $C8, $2 - object SPRITE_BLACK_HAIR_BOY_1, $b, $13, STAY, LEFT, $3, JR__TRAINER_M + $C8, $3 - object SPRITE_LASS, $a, $16, STAY, RIGHT, $4, LASS + $C8, $7 - object SPRITE_BUG_CATCHER, $b, $19, STAY, LEFT, $5, YOUNGSTER + $C8, $4 - object SPRITE_LASS, $a, $1c, STAY, RIGHT, $6, LASS + $C8, $8 - object SPRITE_BUG_CATCHER, $b, $1f, STAY, LEFT, $7, BUG_CATCHER + $C8, $9 + object SPRITE_BLACK_HAIR_BOY_1, $b, $f, STAY, LEFT, $1, OPP_ROCKET, $6 + object SPRITE_BLACK_HAIR_BOY_1, $5, $14, STAY, UP, $2, OPP_JR_TRAINER_M, $2 + object SPRITE_BLACK_HAIR_BOY_1, $b, $13, STAY, LEFT, $3, OPP_JR_TRAINER_M, $3 + object SPRITE_LASS, $a, $16, STAY, RIGHT, $4, OPP_LASS, $7 + object SPRITE_BUG_CATCHER, $b, $19, STAY, LEFT, $5, OPP_YOUNGSTER, $4 + object SPRITE_LASS, $a, $1c, STAY, RIGHT, $6, OPP_LASS, $8 + object SPRITE_BUG_CATCHER, $b, $1f, STAY, LEFT, $7, OPP_BUG_CATCHER, $9 object SPRITE_BALL, $a, $5, STAY, NONE, $8, TM_45 diff --git a/data/mapObjects/route25.asm b/data/mapObjects/route25.asm index aa9bfe74..5c6811f3 100755 --- a/data/mapObjects/route25.asm +++ b/data/mapObjects/route25.asm @@ -8,15 +8,15 @@ Route25Object: ; 0x507b2 (size=94) db $3, $2b, $b ; Route25Text11 db $a ; objects - object SPRITE_BUG_CATCHER, $e, $2, STAY, DOWN, $1, YOUNGSTER + $C8, $5 - object SPRITE_BUG_CATCHER, $12, $5, STAY, UP, $2, YOUNGSTER + $C8, $6 - object SPRITE_BLACK_HAIR_BOY_1, $18, $4, STAY, DOWN, $3, JR__TRAINER_M + $C8, $2 - object SPRITE_LASS, $12, $8, STAY, RIGHT, $4, LASS + $C8, $9 - object SPRITE_BUG_CATCHER, $20, $3, STAY, LEFT, $5, YOUNGSTER + $C8, $7 - object SPRITE_LASS, $25, $4, STAY, DOWN, $6, LASS + $C8, $a - object SPRITE_HIKER, $8, $4, STAY, RIGHT, $7, HIKER + $C8, $2 - object SPRITE_HIKER, $17, $9, STAY, UP, $8, HIKER + $C8, $3 - object SPRITE_HIKER, $d, $7, STAY, RIGHT, $9, HIKER + $C8, $4 + object SPRITE_BUG_CATCHER, $e, $2, STAY, DOWN, $1, OPP_YOUNGSTER, $5 + object SPRITE_BUG_CATCHER, $12, $5, STAY, UP, $2, OPP_YOUNGSTER, $6 + object SPRITE_BLACK_HAIR_BOY_1, $18, $4, STAY, DOWN, $3, OPP_JR_TRAINER_M, $2 + object SPRITE_LASS, $12, $8, STAY, RIGHT, $4, OPP_LASS, $9 + object SPRITE_BUG_CATCHER, $20, $3, STAY, LEFT, $5, OPP_YOUNGSTER, $7 + object SPRITE_LASS, $25, $4, STAY, DOWN, $6, OPP_LASS, $a + object SPRITE_HIKER, $8, $4, STAY, RIGHT, $7, OPP_HIKER, $2 + object SPRITE_HIKER, $17, $9, STAY, UP, $8, OPP_HIKER, $3 + object SPRITE_HIKER, $d, $7, STAY, RIGHT, $9, OPP_HIKER, $4 object SPRITE_BALL, $16, $2, STAY, NONE, $a, TM_19 ; warp-to diff --git a/data/mapObjects/route3.asm b/data/mapObjects/route3.asm index 29a6307b..a2df6925 100755 --- a/data/mapObjects/route3.asm +++ b/data/mapObjects/route3.asm @@ -8,11 +8,11 @@ Route3Object: ; 0x54208 (size=77) db $9 ; objects object SPRITE_BLACK_HAIR_BOY_2, $39, $b, STAY, NONE, $1 ; person - object SPRITE_BUG_CATCHER, $a, $6, STAY, RIGHT, $2, BUG_CATCHER + $C8, $4 - object SPRITE_BUG_CATCHER, $e, $4, STAY, DOWN, $3, YOUNGSTER + $C8, $1 - object SPRITE_LASS, $10, $9, STAY, LEFT, $4, LASS + $C8, $1 - object SPRITE_BUG_CATCHER, $13, $5, STAY, DOWN, $5, BUG_CATCHER + $C8, $5 - object SPRITE_LASS, $17, $4, STAY, LEFT, $6, LASS + $C8, $2 - object SPRITE_BUG_CATCHER, $16, $9, STAY, LEFT, $7, YOUNGSTER + $C8, $2 - object SPRITE_BUG_CATCHER, $18, $6, STAY, RIGHT, $8, BUG_CATCHER + $C8, $6 - object SPRITE_LASS, $21, $a, STAY, UP, $9, LASS + $C8, $3 + object SPRITE_BUG_CATCHER, $a, $6, STAY, RIGHT, $2, OPP_BUG_CATCHER, $4 + object SPRITE_BUG_CATCHER, $e, $4, STAY, DOWN, $3, OPP_YOUNGSTER, $1 + object SPRITE_LASS, $10, $9, STAY, LEFT, $4, OPP_LASS, $1 + object SPRITE_BUG_CATCHER, $13, $5, STAY, DOWN, $5, OPP_BUG_CATCHER, $5 + object SPRITE_LASS, $17, $4, STAY, LEFT, $6, OPP_LASS, $2 + object SPRITE_BUG_CATCHER, $16, $9, STAY, LEFT, $7, OPP_YOUNGSTER, $2 + object SPRITE_BUG_CATCHER, $18, $6, STAY, RIGHT, $8, OPP_BUG_CATCHER, $6 + object SPRITE_LASS, $21, $a, STAY, UP, $9, OPP_LASS, $3 diff --git a/data/mapObjects/route4.asm b/data/mapObjects/route4.asm index e91b0301..14e59684 100755 --- a/data/mapObjects/route4.asm +++ b/data/mapObjects/route4.asm @@ -13,7 +13,7 @@ Route4Object: ; 0x543b2 (size=58) db $3 ; objects object SPRITE_LASS, $9, $8, WALK, $0, $1 ; person - object SPRITE_LASS, $3f, $3, STAY, RIGHT, $2, LASS + $C8, $4 + object SPRITE_LASS, $3f, $3, STAY, RIGHT, $2, OPP_LASS, $4 object SPRITE_BALL, $39, $3, STAY, NONE, $3, TM_04 ; warp-to diff --git a/data/mapObjects/route6.asm b/data/mapObjects/route6.asm index f1702acc..19ac2a8a 100755 --- a/data/mapObjects/route6.asm +++ b/data/mapObjects/route6.asm @@ -11,12 +11,12 @@ Route6Object: ; 0x58022 (size=87) db $f, $13, $7 ; Route6Text7 db $6 ; objects - object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, JR__TRAINER_M + $C8, $4 - object SPRITE_LASS, $b, $15, STAY, LEFT, $2, JR__TRAINER_F + $C8, $2 - object SPRITE_BUG_CATCHER, $0, $f, STAY, RIGHT, $3, BUG_CATCHER + $C8, $a - object SPRITE_BLACK_HAIR_BOY_1, $b, $1f, STAY, LEFT, $4, JR__TRAINER_M + $C8, $5 - object SPRITE_LASS, $b, $1e, STAY, LEFT, $5, JR__TRAINER_F + $C8, $3 - object SPRITE_BUG_CATCHER, $13, $1a, STAY, LEFT, $6, BUG_CATCHER + $C8, $b + object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, OPP_JR_TRAINER_M, $4 + object SPRITE_LASS, $b, $15, STAY, LEFT, $2, OPP_JR_TRAINER_F, $2 + object SPRITE_BUG_CATCHER, $0, $f, STAY, RIGHT, $3, OPP_BUG_CATCHER, $a + object SPRITE_BLACK_HAIR_BOY_1, $b, $1f, STAY, LEFT, $4, OPP_JR_TRAINER_M, $5 + object SPRITE_LASS, $b, $1e, STAY, LEFT, $5, OPP_JR_TRAINER_F, $3 + object SPRITE_BUG_CATCHER, $13, $1a, STAY, LEFT, $6, OPP_BUG_CATCHER, $b ; warp-to EVENT_DISP ROUTE_6_WIDTH, $1, $9 ; ROUTE_6_GATE diff --git a/data/mapObjects/route8.asm b/data/mapObjects/route8.asm index 2687c596..5863129b 100755 --- a/data/mapObjects/route8.asm +++ b/data/mapObjects/route8.asm @@ -12,15 +12,15 @@ Route8Object: ; 0x5814f (size=119) db $3, $11, $a ; Route8Text10 db $9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $8, $5, STAY, RIGHT, $1, SUPER_NERD + $C8, $3 - object SPRITE_GAMBLER, $d, $9, STAY, UP, $2, GAMBLER + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_2, $2a, $6, STAY, UP, $3, SUPER_NERD + $C8, $4 - object SPRITE_LASS, $1a, $3, STAY, LEFT, $4, LASS + $C8, $d - object SPRITE_BLACK_HAIR_BOY_2, $1a, $4, STAY, RIGHT, $5, SUPER_NERD + $C8, $5 - object SPRITE_LASS, $1a, $5, STAY, LEFT, $6, LASS + $C8, $e - object SPRITE_LASS, $1a, $6, STAY, RIGHT, $7, LASS + $C8, $f - object SPRITE_GAMBLER, $2e, $d, STAY, DOWN, $8, GAMBLER + $C8, $7 - object SPRITE_LASS, $33, $c, STAY, LEFT, $9, LASS + $C8, $10 + object SPRITE_BLACK_HAIR_BOY_2, $8, $5, STAY, RIGHT, $1, OPP_SUPER_NERD, $3 + object SPRITE_GAMBLER, $d, $9, STAY, UP, $2, OPP_GAMBLER, $5 + object SPRITE_BLACK_HAIR_BOY_2, $2a, $6, STAY, UP, $3, OPP_SUPER_NERD, $4 + object SPRITE_LASS, $1a, $3, STAY, LEFT, $4, OPP_LASS, $d + object SPRITE_BLACK_HAIR_BOY_2, $1a, $4, STAY, RIGHT, $5, OPP_SUPER_NERD, $5 + object SPRITE_LASS, $1a, $5, STAY, LEFT, $6, OPP_LASS, $e + object SPRITE_LASS, $1a, $6, STAY, RIGHT, $7, OPP_LASS, $f + object SPRITE_GAMBLER, $2e, $d, STAY, DOWN, $8, OPP_GAMBLER, $7 + object SPRITE_LASS, $33, $c, STAY, LEFT, $9, OPP_LASS, $10 ; warp-to EVENT_DISP ROUTE_8_WIDTH, $9, $1 ; ROUTE_8_GATE diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm index 6871c73a..79d0d5ed 100755 --- a/data/mapObjects/route9.asm +++ b/data/mapObjects/route9.asm @@ -7,13 +7,13 @@ Route9Object: ; 0x546a8 (size=86) db $7, $19, $b ; Route9Text11 db $a ; objects - object SPRITE_LASS, $d, $a, STAY, LEFT, $1, JR__TRAINER_F + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, JR__TRAINER_M + $C8, $7 - object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, STAY, RIGHT, $3, JR__TRAINER_M + $C8, $8 - object SPRITE_LASS, $30, $8, STAY, RIGHT, $4, JR__TRAINER_F + $C8, $6 - object SPRITE_HIKER, $10, $f, STAY, LEFT, $5, HIKER + $C8, $b - object SPRITE_HIKER, $2b, $3, STAY, LEFT, $6, HIKER + $C8, $6 - object SPRITE_BUG_CATCHER, $16, $2, STAY, DOWN, $7, BUG_CATCHER + $C8, $d - object SPRITE_HIKER, $2d, $f, STAY, RIGHT, $8, HIKER + $C8, $5 - object SPRITE_BUG_CATCHER, $28, $8, STAY, RIGHT, $9, BUG_CATCHER + $C8, $e + object SPRITE_LASS, $d, $a, STAY, LEFT, $1, OPP_JR_TRAINER_F, $5 + object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, OPP_JR_TRAINER_M, $7 + object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, STAY, RIGHT, $3, OPP_JR_TRAINER_M, $8 + object SPRITE_LASS, $30, $8, STAY, RIGHT, $4, OPP_JR_TRAINER_F, $6 + object SPRITE_HIKER, $10, $f, STAY, LEFT, $5, OPP_HIKER, $b + object SPRITE_HIKER, $2b, $3, STAY, LEFT, $6, OPP_HIKER, $6 + object SPRITE_BUG_CATCHER, $16, $2, STAY, DOWN, $7, OPP_BUG_CATCHER, $d + object SPRITE_HIKER, $2d, $f, STAY, RIGHT, $8, OPP_HIKER, $5 + object SPRITE_BUG_CATCHER, $28, $8, STAY, RIGHT, $9, OPP_BUG_CATCHER, $e object SPRITE_BALL, $a, $f, STAY, NONE, $a, TM_30 diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/saffrongym.asm index 3e11e006..63676905 100755 --- a/data/mapObjects/saffrongym.asm +++ b/data/mapObjects/saffrongym.asm @@ -38,14 +38,14 @@ SaffronGymObject: ; 0x5d259 (size=330) db $0 ; signs db $9 ; objects - object SPRITE_GIRL, $9, $8, STAY, DOWN, $1, SABRINA + $C8, $1 - object SPRITE_MEDIUM, $a, $1, STAY, DOWN, $2, CHANNELER + $C8, $16 - object SPRITE_BUG_CATCHER, $11, $1, STAY, DOWN, $3, PSYCHIC_TR + $C8, $1 - object SPRITE_MEDIUM, $3, $7, STAY, DOWN, $4, CHANNELER + $C8, $17 - object SPRITE_BUG_CATCHER, $11, $7, STAY, DOWN, $5, PSYCHIC_TR + $C8, $2 - object SPRITE_MEDIUM, $3, $d, STAY, DOWN, $6, CHANNELER + $C8, $18 - object SPRITE_BUG_CATCHER, $11, $d, STAY, DOWN, $7, PSYCHIC_TR + $C8, $3 - object SPRITE_BUG_CATCHER, $3, $1, STAY, DOWN, $8, PSYCHIC_TR + $C8, $4 + object SPRITE_GIRL, $9, $8, STAY, DOWN, $1, OPP_SABRINA, $1 + object SPRITE_MEDIUM, $a, $1, STAY, DOWN, $2, OPP_CHANNELER, $16 + object SPRITE_BUG_CATCHER, $11, $1, STAY, DOWN, $3, OPP_PSYCHIC_TR, $1 + object SPRITE_MEDIUM, $3, $7, STAY, DOWN, $4, OPP_CHANNELER, $17 + object SPRITE_BUG_CATCHER, $11, $7, STAY, DOWN, $5, OPP_PSYCHIC_TR, $2 + object SPRITE_MEDIUM, $3, $d, STAY, DOWN, $6, OPP_CHANNELER, $18 + object SPRITE_BUG_CATCHER, $11, $d, STAY, DOWN, $7, OPP_PSYCHIC_TR, $3 + object SPRITE_BUG_CATCHER, $3, $1, STAY, DOWN, $8, OPP_PSYCHIC_TR, $4 object SPRITE_GYM_HELPER, $a, $f, STAY, DOWN, $9 ; person ; warp-to diff --git a/data/mapObjects/silphco10.asm b/data/mapObjects/silphco10.asm index e48a4284..cc608e64 100755 --- a/data/mapObjects/silphco10.asm +++ b/data/mapObjects/silphco10.asm @@ -12,8 +12,8 @@ SilphCo10Object: ; 0x5a1fb (size=95) db $0 ; signs db $6 ; objects - object SPRITE_ROCKET, $1, $9, STAY, RIGHT, $1, ROCKET + $C8, $27 - object SPRITE_OAK_AIDE, $a, $2, STAY, LEFT, $2, SCIENTIST + $C8, $b + object SPRITE_ROCKET, $1, $9, STAY, RIGHT, $1, OPP_ROCKET, $27 + object SPRITE_OAK_AIDE, $a, $2, STAY, LEFT, $2, OPP_SCIENTIST, $b object SPRITE_ERIKA, $9, $f, WALK, $0, $3 ; person object SPRITE_BALL, $2, $c, STAY, NONE, $4, TM_26 object SPRITE_BALL, $4, $e, STAY, NONE, $5, RARE_CANDY diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/silphco11.asm index e1a7a568..8cba618e 100755 --- a/data/mapObjects/silphco11.asm +++ b/data/mapObjects/silphco11.asm @@ -12,9 +12,9 @@ SilphCo11Object: ; 0x62380 (size=72) db $5 ; objects object SPRITE_MR_MASTERBALL, $7, $5, STAY, DOWN, $1 ; person object SPRITE_FOULARD_WOMAN, $a, $5, STAY, DOWN, $2 ; person - object SPRITE_GIOVANNI, $6, $9, STAY, DOWN, $3, GIOVANNI + $C8, $2 - object SPRITE_ROCKET, $3, $10, STAY, UP, $4, ROCKET + $C8, $29 - object SPRITE_ROCKET, $f, $9, STAY, UP, $5, ROCKET + $C8, $28 + object SPRITE_GIOVANNI, $6, $9, STAY, DOWN, $3, OPP_GIOVANNI, $2 + object SPRITE_ROCKET, $3, $10, STAY, UP, $4, OPP_ROCKET, $29 + object SPRITE_ROCKET, $f, $9, STAY, UP, $5, OPP_ROCKET, $28 ; warp-to EVENT_DISP SILPH_CO_11F_WIDTH, $0, $9 ; SILPH_CO_10F diff --git a/data/mapObjects/silphco2.asm b/data/mapObjects/silphco2.asm index cd4f8be5..44271d70 100755 --- a/data/mapObjects/silphco2.asm +++ b/data/mapObjects/silphco2.asm @@ -14,10 +14,10 @@ SilphCo2Object: ; 0x59e66 (size=98) db $5 ; objects object SPRITE_ERIKA, $a, $1, STAY, UP, $1 ; person - object SPRITE_OAK_AIDE, $5, $c, STAY, DOWN, $2, SCIENTIST + $C8, $2 - object SPRITE_OAK_AIDE, $18, $d, STAY, LEFT, $3, SCIENTIST + $C8, $3 - object SPRITE_ROCKET, $10, $b, STAY, UP, $4, ROCKET + $C8, $17 - object SPRITE_ROCKET, $18, $7, STAY, UP, $5, ROCKET + $C8, $18 + object SPRITE_OAK_AIDE, $5, $c, STAY, DOWN, $2, OPP_SCIENTIST, $2 + object SPRITE_OAK_AIDE, $18, $d, STAY, LEFT, $3, OPP_SCIENTIST, $3 + object SPRITE_ROCKET, $10, $b, STAY, UP, $4, OPP_ROCKET, $17 + object SPRITE_ROCKET, $18, $7, STAY, UP, $5, OPP_ROCKET, $18 ; warp-to EVENT_DISP SILPH_CO_2F_WIDTH, $0, $18 ; SILPH_CO_1F diff --git a/data/mapObjects/silphco3.asm b/data/mapObjects/silphco3.asm index a293593a..48bb8c1a 100755 --- a/data/mapObjects/silphco3.asm +++ b/data/mapObjects/silphco3.asm @@ -17,8 +17,8 @@ SilphCo3Object: ; 0x5a035 (size=113) db $4 ; objects object SPRITE_LAPRAS_GIVER, $18, $8, STAY, NONE, $1 ; person - object SPRITE_ROCKET, $14, $7, STAY, LEFT, $2, ROCKET + $C8, $19 - object SPRITE_OAK_AIDE, $7, $9, STAY, DOWN, $3, SCIENTIST + $C8, $4 + object SPRITE_ROCKET, $14, $7, STAY, LEFT, $2, OPP_ROCKET, $19 + object SPRITE_OAK_AIDE, $7, $9, STAY, DOWN, $3, OPP_SCIENTIST, $4 object SPRITE_BALL, $8, $5, STAY, NONE, $4, HYPER_POTION ; warp-to diff --git a/data/mapObjects/silphco4.asm b/data/mapObjects/silphco4.asm index f9974ccb..762ca7f8 100755 --- a/data/mapObjects/silphco4.asm +++ b/data/mapObjects/silphco4.asm @@ -14,9 +14,9 @@ SilphCo4Object: ; 0x19e35 (size=111) db $7 ; objects object SPRITE_LAPRAS_GIVER, $6, $2, STAY, NONE, $1 ; person - object SPRITE_ROCKET, $9, $e, STAY, RIGHT, $2, ROCKET + $C8, $1a - object SPRITE_OAK_AIDE, $e, $6, STAY, LEFT, $3, SCIENTIST + $C8, $5 - object SPRITE_ROCKET, $1a, $a, STAY, UP, $4, ROCKET + $C8, $1b + object SPRITE_ROCKET, $9, $e, STAY, RIGHT, $2, OPP_ROCKET, $1a + object SPRITE_OAK_AIDE, $e, $6, STAY, LEFT, $3, OPP_SCIENTIST, $5 + object SPRITE_ROCKET, $1a, $a, STAY, UP, $4, OPP_ROCKET, $1b object SPRITE_BALL, $3, $9, STAY, NONE, $5, FULL_HEAL object SPRITE_BALL, $4, $7, STAY, NONE, $6, MAX_REVIVE object SPRITE_BALL, $5, $8, STAY, NONE, $7, ESCAPE_ROPE diff --git a/data/mapObjects/silphco5.asm b/data/mapObjects/silphco5.asm index bb7bf68e..0c956cd3 100755 --- a/data/mapObjects/silphco5.asm +++ b/data/mapObjects/silphco5.asm @@ -14,10 +14,10 @@ SilphCo5Object: ; 0x1a08d (size=137) db $b ; objects object SPRITE_LAPRAS_GIVER, $d, $9, STAY, NONE, $1 ; person - object SPRITE_ROCKET, $8, $10, STAY, RIGHT, $2, ROCKET + $C8, $1c - object SPRITE_OAK_AIDE, $8, $3, STAY, RIGHT, $3, SCIENTIST + $C8, $6 - object SPRITE_ROCKER, $12, $a, STAY, UP, $4, JUGGLER + $C8, $1 - object SPRITE_ROCKET, $1c, $4, STAY, UP, $5, ROCKET + $C8, $1d + object SPRITE_ROCKET, $8, $10, STAY, RIGHT, $2, OPP_ROCKET, $1c + object SPRITE_OAK_AIDE, $8, $3, STAY, RIGHT, $3, OPP_SCIENTIST, $6 + object SPRITE_ROCKER, $12, $a, STAY, UP, $4, OPP_JUGGLER, $1 + object SPRITE_ROCKET, $1c, $4, STAY, UP, $5, OPP_ROCKET, $1d object SPRITE_BALL, $2, $d, STAY, NONE, $6, TM_09 object SPRITE_BALL, $4, $6, STAY, NONE, $7, PROTEIN object SPRITE_BALL, $15, $10, STAY, NONE, $8, CARD_KEY diff --git a/data/mapObjects/silphco6.asm b/data/mapObjects/silphco6.asm index c1cdebd0..66372f57 100755 --- a/data/mapObjects/silphco6.asm +++ b/data/mapObjects/silphco6.asm @@ -16,9 +16,9 @@ SilphCo6Object: ; 0x1a2fb (size=112) object SPRITE_ERIKA, $15, $6, STAY, DOWN, $3 ; person object SPRITE_ERIKA, $b, $a, STAY, RIGHT, $4 ; person object SPRITE_LAPRAS_GIVER, $12, $d, STAY, UP, $5 ; person - object SPRITE_ROCKET, $11, $3, STAY, RIGHT, $6, ROCKET + $C8, $1e - object SPRITE_OAK_AIDE, $7, $8, STAY, DOWN, $7, SCIENTIST + $C8, $7 - object SPRITE_ROCKET, $e, $f, STAY, LEFT, $8, ROCKET + $C8, $1f + object SPRITE_ROCKET, $11, $3, STAY, RIGHT, $6, OPP_ROCKET, $1e + object SPRITE_OAK_AIDE, $7, $8, STAY, DOWN, $7, OPP_SCIENTIST, $7 + object SPRITE_ROCKET, $e, $f, STAY, LEFT, $8, OPP_ROCKET, $1f object SPRITE_BALL, $3, $c, STAY, NONE, $9, HP_UP object SPRITE_BALL, $2, $f, STAY, NONE, $a, X_ACCURACY diff --git a/data/mapObjects/silphco7.asm b/data/mapObjects/silphco7.asm index 42a84faa..ef665ac0 100755 --- a/data/mapObjects/silphco7.asm +++ b/data/mapObjects/silphco7.asm @@ -16,10 +16,10 @@ SilphCo7Object: ; 0x51ed7 (size=128) object SPRITE_LAPRAS_GIVER, $d, $d, STAY, UP, $2 ; person object SPRITE_LAPRAS_GIVER, $7, $a, STAY, NONE, $3 ; person object SPRITE_ERIKA, $a, $8, STAY, NONE, $4 ; person - object SPRITE_ROCKET, $d, $1, STAY, DOWN, $5, ROCKET + $C8, $20 - object SPRITE_OAK_AIDE, $2, $d, STAY, DOWN, $6, SCIENTIST + $C8, $8 - object SPRITE_ROCKET, $14, $2, STAY, LEFT, $7, ROCKET + $C8, $21 - object SPRITE_ROCKET, $13, $e, STAY, RIGHT, $8, ROCKET + $C8, $22 + object SPRITE_ROCKET, $d, $1, STAY, DOWN, $5, OPP_ROCKET, $20 + object SPRITE_OAK_AIDE, $2, $d, STAY, DOWN, $6, OPP_SCIENTIST, $8 + object SPRITE_ROCKET, $14, $2, STAY, LEFT, $7, OPP_ROCKET, $21 + object SPRITE_ROCKET, $13, $e, STAY, RIGHT, $8, OPP_ROCKET, $22 object SPRITE_BLUE, $3, $7, STAY, UP, $9 ; person object SPRITE_BALL, $1, $9, STAY, NONE, $a, CALCIUM object SPRITE_BALL, $18, $b, STAY, NONE, $b, TM_03 diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/silphco8.asm index 6b7541ad..a4b97a91 100755 --- a/data/mapObjects/silphco8.asm +++ b/data/mapObjects/silphco8.asm @@ -14,9 +14,9 @@ SilphCo8Object: ; 0x56613 (size=90) db $4 ; objects object SPRITE_LAPRAS_GIVER, $4, $2, STAY, NONE, $1 ; person - object SPRITE_ROCKET, $13, $2, STAY, LEFT, $2, ROCKET + $C8, $23 - object SPRITE_OAK_AIDE, $a, $2, STAY, DOWN, $3, SCIENTIST + $C8, $9 - object SPRITE_ROCKET, $c, $f, STAY, RIGHT, $4, ROCKET + $C8, $24 + object SPRITE_ROCKET, $13, $2, STAY, LEFT, $2, OPP_ROCKET, $23 + object SPRITE_OAK_AIDE, $a, $2, STAY, DOWN, $3, OPP_SCIENTIST, $9 + object SPRITE_ROCKET, $c, $f, STAY, RIGHT, $4, OPP_ROCKET, $24 ; warp-to EVENT_DISP SILPH_CO_8F_WIDTH, $0, $10 ; SILPH_CO_9F diff --git a/data/mapObjects/silphco9.asm b/data/mapObjects/silphco9.asm index 5fb1db79..204f0d1d 100755 --- a/data/mapObjects/silphco9.asm +++ b/data/mapObjects/silphco9.asm @@ -12,9 +12,9 @@ SilphCo9Object: ; 0x5d93f (size=74) db $4 ; objects object SPRITE_NURSE, $3, $e, STAY, DOWN, $1 ; person - object SPRITE_ROCKET, $2, $4, STAY, UP, $2, ROCKET + $C8, $25 - object SPRITE_OAK_AIDE, $15, $d, STAY, DOWN, $3, SCIENTIST + $C8, $a - object SPRITE_ROCKET, $d, $10, STAY, UP, $4, ROCKET + $C8, $26 + object SPRITE_ROCKET, $2, $4, STAY, UP, $2, OPP_ROCKET, $25 + object SPRITE_OAK_AIDE, $15, $d, STAY, DOWN, $3, OPP_SCIENTIST, $a + object SPRITE_ROCKET, $d, $10, STAY, UP, $4, OPP_ROCKET, $26 ; warp-to EVENT_DISP SILPH_CO_9F_WIDTH, $0, $e ; SILPH_CO_10F diff --git a/data/mapObjects/ssanne10.asm b/data/mapObjects/ssanne10.asm index 8001c043..c57925f1 100755 --- a/data/mapObjects/ssanne10.asm +++ b/data/mapObjects/ssanne10.asm @@ -16,12 +16,12 @@ SSAnne10Object: ; 0x61e75 (size=165) db $0 ; signs db $b ; objects - object SPRITE_SAILOR, $0, $d, STAY, DOWN, $1, SAILOR + $C8, $3 - object SPRITE_SAILOR, $2, $b, STAY, DOWN, $2, SAILOR + $C8, $4 - object SPRITE_SAILOR, $c, $3, STAY, LEFT, $3, SAILOR + $C8, $5 - object SPRITE_SAILOR, $16, $2, STAY, DOWN, $4, SAILOR + $C8, $6 - object SPRITE_SAILOR, $0, $2, STAY, RIGHT, $5, SAILOR + $C8, $7 - object SPRITE_FISHER2, $0, $4, STAY, RIGHT, $6, FISHER + $C8, $2 + object SPRITE_SAILOR, $0, $d, STAY, DOWN, $1, OPP_SAILOR, $3 + object SPRITE_SAILOR, $2, $b, STAY, DOWN, $2, OPP_SAILOR, $4 + object SPRITE_SAILOR, $c, $3, STAY, LEFT, $3, OPP_SAILOR, $5 + object SPRITE_SAILOR, $16, $2, STAY, DOWN, $4, OPP_SAILOR, $6 + object SPRITE_SAILOR, $0, $2, STAY, RIGHT, $5, OPP_SAILOR, $7 + object SPRITE_FISHER2, $0, $4, STAY, RIGHT, $6, OPP_FISHER, $2 object SPRITE_BLACK_HAIR_BOY_2, $a, $d, STAY, RIGHT, $7 ; person object SPRITE_SLOWBRO, $b, $c, STAY, NONE, $8 ; person object SPRITE_BALL, $14, $2, STAY, NONE, $9, ETHER diff --git a/data/mapObjects/ssanne2.asm b/data/mapObjects/ssanne2.asm index 80e54683..9f3691cf 100755 --- a/data/mapObjects/ssanne2.asm +++ b/data/mapObjects/ssanne2.asm @@ -16,7 +16,7 @@ SSAnne2Object: ; 0x61514 (size=90) db $2 ; objects object SPRITE_WAITER, $3, $7, WALK, $1, $1 ; person - object SPRITE_BLUE, $24, $4, STAY, DOWN, $2, SONY1 + $C8, $1 + object SPRITE_BLUE, $24, $4, STAY, DOWN, $2, OPP_SONY1, $1 ; warp-to EVENT_DISP SS_ANNE_2_WIDTH, $b, $9 ; SS_ANNE_9 diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/ssanne5.asm index e8a48417..e18f1074 100755 --- a/data/mapObjects/ssanne5.asm +++ b/data/mapObjects/ssanne5.asm @@ -11,8 +11,8 @@ SSAnne5Object: ; 0x6172b (size=54) object SPRITE_BLACK_HAIR_BOY_2, $5, $2, STAY, UP, $1 ; person object SPRITE_SAILOR, $4, $9, STAY, NONE, $2 ; person object SPRITE_BLACK_HAIR_BOY_1, $7, $b, STAY, NONE, $3 ; person - object SPRITE_SAILOR, $4, $4, STAY, DOWN, $4, SAILOR + $C8, $1 - object SPRITE_SAILOR, $a, $8, STAY, UP, $5, SAILOR + $C8, $2 + object SPRITE_SAILOR, $4, $4, STAY, DOWN, $4, OPP_SAILOR, $1 + object SPRITE_SAILOR, $a, $8, STAY, UP, $5, OPP_SAILOR, $2 ; warp-to EVENT_DISP SS_ANNE_5_WIDTH, $6, $d ; SS_ANNE_3 diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/ssanne8.asm index e9c2aa71..992230d8 100755 --- a/data/mapObjects/ssanne8.asm +++ b/data/mapObjects/ssanne8.asm @@ -12,10 +12,10 @@ SSAnne8Object: ; 0x61a60 (size=127) db $0 ; signs db $b ; objects - object SPRITE_GENTLEMAN, $2, $3, STAY, LEFT, $1, GENTLEMAN + $C8, $1 - object SPRITE_GENTLEMAN, $b, $4, STAY, UP, $2, GENTLEMAN + $C8, $2 - object SPRITE_BUG_CATCHER, $b, $e, STAY, UP, $3, YOUNGSTER + $C8, $8 - object SPRITE_LASS, $d, $b, STAY, LEFT, $4, LASS + $C8, $b + object SPRITE_GENTLEMAN, $2, $3, STAY, LEFT, $1, OPP_GENTLEMAN, $1 + object SPRITE_GENTLEMAN, $b, $4, STAY, UP, $2, OPP_GENTLEMAN, $2 + object SPRITE_BUG_CATCHER, $b, $e, STAY, UP, $3, OPP_YOUNGSTER, $8 + object SPRITE_LASS, $d, $b, STAY, LEFT, $4, OPP_LASS, $b object SPRITE_GIRL, $16, $3, WALK, $1, $5 ; person object SPRITE_FAT_BALD_GUY, $0, $e, STAY, NONE, $6 ; person object SPRITE_LITTLE_GIRL, $2, $b, STAY, DOWN, $7 ; person diff --git a/data/mapObjects/ssanne9.asm b/data/mapObjects/ssanne9.asm index a9bccafa..7fddc058 100755 --- a/data/mapObjects/ssanne9.asm +++ b/data/mapObjects/ssanne9.asm @@ -18,10 +18,10 @@ SSAnne9Object: ; 0x61c8d (size=188) db $0 ; signs db $d ; objects - object SPRITE_GENTLEMAN, $a, $2, STAY, RIGHT, $1, GENTLEMAN + $C8, $3 - object SPRITE_FISHER2, $d, $4, STAY, LEFT, $2, FISHER + $C8, $1 - object SPRITE_GENTLEMAN, $0, $e, STAY, RIGHT, $3, GENTLEMAN + $C8, $5 - object SPRITE_LASS, $2, $b, STAY, DOWN, $4, LASS + $C8, $c + object SPRITE_GENTLEMAN, $a, $2, STAY, RIGHT, $1, OPP_GENTLEMAN, $3 + object SPRITE_FISHER2, $d, $4, STAY, LEFT, $2, OPP_FISHER, $1 + object SPRITE_GENTLEMAN, $0, $e, STAY, RIGHT, $3, OPP_GENTLEMAN, $5 + object SPRITE_LASS, $2, $b, STAY, DOWN, $4, OPP_LASS, $c object SPRITE_GENTLEMAN, $1, $2, STAY, DOWN, $5 ; person object SPRITE_BALL, $c, $1, STAY, NONE, $6, MAX_ETHER object SPRITE_GENTLEMAN, $15, $2, STAY, DOWN, $7 ; person diff --git a/data/mapObjects/vermiliongym.asm b/data/mapObjects/vermiliongym.asm index df3da382..892403a3 100755 --- a/data/mapObjects/vermiliongym.asm +++ b/data/mapObjects/vermiliongym.asm @@ -8,10 +8,10 @@ VermilionGymObject: ; 0x5cbfe (size=58) db $0 ; signs db $5 ; objects - object SPRITE_ROCKER, $5, $1, STAY, DOWN, $1, LT__SURGE + $C8, $1 - object SPRITE_GENTLEMAN, $9, $6, STAY, LEFT, $2, GENTLEMAN + $C8, $3 - object SPRITE_BLACK_HAIR_BOY_2, $3, $8, STAY, LEFT, $3, ROCKER + $C8, $1 - object SPRITE_SAILOR, $0, $a, STAY, RIGHT, $4, SAILOR + $C8, $8 + object SPRITE_ROCKER, $5, $1, STAY, DOWN, $1, OPP_LT_SURGE, $1 + object SPRITE_GENTLEMAN, $9, $6, STAY, LEFT, $2, OPP_GENTLEMAN, $3 + object SPRITE_BLACK_HAIR_BOY_2, $3, $8, STAY, LEFT, $3, OPP_ROCKER, $1 + object SPRITE_SAILOR, $0, $a, STAY, RIGHT, $4, OPP_SAILOR, $8 object SPRITE_GYM_HELPER, $4, $e, STAY, DOWN, $5 ; person ; warp-to diff --git a/data/mapObjects/victoryroad1.asm b/data/mapObjects/victoryroad1.asm index 75552f36..9e66e95b 100755 --- a/data/mapObjects/victoryroad1.asm +++ b/data/mapObjects/victoryroad1.asm @@ -9,8 +9,8 @@ VictoryRoad1Object: ; 0x5dab8 (size=76) db $0 ; signs db $7 ; objects - object SPRITE_LASS, $7, $5, STAY, RIGHT, $1, COOLTRAINER_F + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_1, $3, $2, STAY, DOWN, $2, COOLTRAINER_M + $C8, $5 + object SPRITE_LASS, $7, $5, STAY, RIGHT, $1, OPP_COOLTRAINER_F, $5 + object SPRITE_BLACK_HAIR_BOY_1, $3, $2, STAY, DOWN, $2, OPP_COOLTRAINER_M, $5 object SPRITE_BALL, $b, $0, STAY, NONE, $3, TM_43 object SPRITE_BALL, $9, $2, STAY, NONE, $4, RARE_CANDY object SPRITE_BOULDER, $5, $f, STAY, BOULDER_MOVEMENT_BYTE_2, $5 ; person diff --git a/data/mapObjects/victoryroad2.asm b/data/mapObjects/victoryroad2.asm index 3d6cd633..348cae03 100755 --- a/data/mapObjects/victoryroad2.asm +++ b/data/mapObjects/victoryroad2.asm @@ -13,16 +13,16 @@ VictoryRoad2Object: ; 0x51915 (size=154) db $0 ; signs db $d ; objects - object SPRITE_HIKER, $c, $9, STAY, LEFT, $1, BLACKBELT + $C8, $9 - object SPRITE_BLACK_HAIR_BOY_2, $15, $d, STAY, LEFT, $2, JUGGLER + $C8, $2 - object SPRITE_BLACK_HAIR_BOY_1, $13, $8, STAY, DOWN, $3, TAMER + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_2, $4, $2, STAY, DOWN, $4, POKEMANIAC + $C8, $6 - object SPRITE_BLACK_HAIR_BOY_2, $1a, $3, STAY, LEFT, $5, JUGGLER + $C8, $5 + object SPRITE_HIKER, $c, $9, STAY, LEFT, $1, OPP_BLACKBELT, $9 + object SPRITE_BLACK_HAIR_BOY_2, $15, $d, STAY, LEFT, $2, OPP_JUGGLER, $2 + object SPRITE_BLACK_HAIR_BOY_1, $13, $8, STAY, DOWN, $3, OPP_TAMER, $5 + object SPRITE_BLACK_HAIR_BOY_2, $4, $2, STAY, DOWN, $4, OPP_POKEMANIAC, $6 + object SPRITE_BLACK_HAIR_BOY_2, $1a, $3, STAY, LEFT, $5, OPP_JUGGLER, $5 object SPRITE_BIRD, $b, $5, STAY, UP, $6, MOLTRES, 50 object SPRITE_BALL, $1b, $5, STAY, NONE, $7, TM_17 object SPRITE_BALL, $12, $9, STAY, NONE, $8, FULL_HEAL object SPRITE_BALL, $9, $b, STAY, NONE, $9, TM_05 - object SPRITE_BALL, $b, $0, STAY, NONE, $a, GUARD_SPEC_ + object SPRITE_BALL, $b, $0, STAY, NONE, $a, GUARD_SPEC object SPRITE_BOULDER, $4, $e, STAY, BOULDER_MOVEMENT_BYTE_2, $b ; person object SPRITE_BOULDER, $5, $5, STAY, BOULDER_MOVEMENT_BYTE_2, $c ; person object SPRITE_BOULDER, $17, $10, STAY, BOULDER_MOVEMENT_BYTE_2, $d ; person diff --git a/data/mapObjects/victoryroad3.asm b/data/mapObjects/victoryroad3.asm index 843b388f..19a06c65 100755 --- a/data/mapObjects/victoryroad3.asm +++ b/data/mapObjects/victoryroad3.asm @@ -10,10 +10,10 @@ VictoryRoad3Object: ; 0x44acd (size=106) db $0 ; signs db $a ; objects - object SPRITE_BLACK_HAIR_BOY_1, $1c, $5, STAY, LEFT, $1, COOLTRAINER_M + $C8, $2 - object SPRITE_LASS, $7, $d, STAY, RIGHT, $2, COOLTRAINER_F + $C8, $2 - object SPRITE_BLACK_HAIR_BOY_1, $6, $e, STAY, LEFT, $3, COOLTRAINER_M + $C8, $3 - object SPRITE_LASS, $d, $3, STAY, RIGHT, $4, COOLTRAINER_F + $C8, $3 + object SPRITE_BLACK_HAIR_BOY_1, $1c, $5, STAY, LEFT, $1, OPP_COOLTRAINER_M, $2 + object SPRITE_LASS, $7, $d, STAY, RIGHT, $2, OPP_COOLTRAINER_F, $2 + object SPRITE_BLACK_HAIR_BOY_1, $6, $e, STAY, LEFT, $3, OPP_COOLTRAINER_M, $3 + object SPRITE_LASS, $d, $3, STAY, RIGHT, $4, OPP_COOLTRAINER_F, $3 object SPRITE_BALL, $1a, $5, STAY, NONE, $5, MAX_REVIVE object SPRITE_BALL, $7, $7, STAY, NONE, $6, TM_47 object SPRITE_BOULDER, $16, $3, STAY, BOULDER_MOVEMENT_BYTE_2, $7 ; person diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/viridianforest.asm index 1ae1d1e2..a1d52cfe 100755 --- a/data/mapObjects/viridianforest.asm +++ b/data/mapObjects/viridianforest.asm @@ -19,9 +19,9 @@ ViridianForestObject: ; 0x611da (size=127) db $8 ; objects object SPRITE_BUG_CATCHER, $10, $2b, STAY, NONE, $1 ; person - object SPRITE_BUG_CATCHER, $1e, $21, STAY, LEFT, $2, BUG_CATCHER + $C8, $1 - object SPRITE_BUG_CATCHER, $1e, $13, STAY, LEFT, $3, BUG_CATCHER + $C8, $2 - object SPRITE_BUG_CATCHER, $2, $12, STAY, LEFT, $4, BUG_CATCHER + $C8, $3 + object SPRITE_BUG_CATCHER, $1e, $21, STAY, LEFT, $2, OPP_BUG_CATCHER, $1 + object SPRITE_BUG_CATCHER, $1e, $13, STAY, LEFT, $3, OPP_BUG_CATCHER, $2 + object SPRITE_BUG_CATCHER, $2, $12, STAY, LEFT, $4, OPP_BUG_CATCHER, $3 object SPRITE_BALL, $19, $b, STAY, NONE, $5, ANTIDOTE object SPRITE_BALL, $c, $1d, STAY, NONE, $6, POTION object SPRITE_BALL, $1, $1f, STAY, NONE, $7, POKE_BALL diff --git a/data/mapObjects/viridiangym.asm b/data/mapObjects/viridiangym.asm index fb81788d..468b9022 100755 --- a/data/mapObjects/viridiangym.asm +++ b/data/mapObjects/viridiangym.asm @@ -8,15 +8,15 @@ ViridianGymObject: ; 0x74bde (size=105) db $0 ; signs db $b ; objects - object SPRITE_GIOVANNI, $2, $1, STAY, DOWN, $1, GIOVANNI + $C8, $3 - object SPRITE_BLACK_HAIR_BOY_1, $c, $7, STAY, DOWN, $2, COOLTRAINER_M + $C8, $9 - object SPRITE_HIKER, $b, $b, STAY, UP, $3, BLACKBELT + $C8, $6 - object SPRITE_ROCKER, $a, $7, STAY, DOWN, $4, TAMER + $C8, $3 - object SPRITE_HIKER, $3, $7, STAY, LEFT, $5, BLACKBELT + $C8, $7 - object SPRITE_BLACK_HAIR_BOY_1, $d, $5, STAY, RIGHT, $6, COOLTRAINER_M + $C8, $a - object SPRITE_HIKER, $a, $1, STAY, DOWN, $7, BLACKBELT + $C8, $8 - object SPRITE_ROCKER, $2, $10, STAY, RIGHT, $8, TAMER + $C8, $4 - object SPRITE_BLACK_HAIR_BOY_1, $6, $5, STAY, DOWN, $9, COOLTRAINER_M + $C8, $1 + object SPRITE_GIOVANNI, $2, $1, STAY, DOWN, $1, OPP_GIOVANNI, $3 + object SPRITE_BLACK_HAIR_BOY_1, $c, $7, STAY, DOWN, $2, OPP_COOLTRAINER_M, $9 + object SPRITE_HIKER, $b, $b, STAY, UP, $3, OPP_BLACKBELT, $6 + object SPRITE_ROCKER, $a, $7, STAY, DOWN, $4, OPP_TAMER, $3 + object SPRITE_HIKER, $3, $7, STAY, LEFT, $5, OPP_BLACKBELT, $7 + object SPRITE_BLACK_HAIR_BOY_1, $d, $5, STAY, RIGHT, $6, OPP_COOLTRAINER_M, $a + object SPRITE_HIKER, $a, $1, STAY, DOWN, $7, OPP_BLACKBELT, $8 + object SPRITE_ROCKER, $2, $10, STAY, RIGHT, $8, OPP_TAMER, $4 + object SPRITE_BLACK_HAIR_BOY_1, $6, $5, STAY, DOWN, $9, OPP_COOLTRAINER_M, $1 object SPRITE_GYM_HELPER, $10, $f, STAY, DOWN, $a ; person object SPRITE_BALL, $10, $9, STAY, NONE, $b, REVIVE diff --git a/data/mart_inventories.asm b/data/mart_inventories.asm index 4389a1a3..85f7459a 100755 --- a/data/mart_inventories.asm +++ b/data/mart_inventories.asm @@ -44,7 +44,7 @@ CeladonMart4Text1:: ; 248e (0:248e) ; Celadon Dept. Store 5F (1) CeladonMart5Text3:: ; 2496 (0:2496) - db $FE,7,X_ACCURACY,GUARD_SPEC_,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED + db $FE,7,X_ACCURACY,GUARD_SPEC,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED db X_SPECIAL,$FF ; Celadon Dept. Store 5F (2) diff --git a/data/mon_palettes.asm b/data/mon_palettes.asm index f6763d7d..8a8aecdb 100755 --- a/data/mon_palettes.asm +++ b/data/mon_palettes.asm @@ -82,7 +82,7 @@ MonsterPalettes: ; 725c8 (1c:65c8) db PAL_PINKMON ; SLOWBRO db PAL_GREYMON ; MAGNEMITE db PAL_GREYMON ; MAGNETON - db PAL_BROWNMON ; FARFETCH_D + db PAL_BROWNMON ; FARFETCHD db PAL_BROWNMON ; DODUO db PAL_BROWNMON ; DODRIO db PAL_BLUEMON ; SEEL diff --git a/data/moves.asm b/data/moves.asm index 22165b7d..44859681 100755 --- a/data/moves.asm +++ b/data/moves.asm @@ -11,6 +11,7 @@ move: macro endm move POUND, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35 +MoveEnd: move KARATE_CHOP, NO_ADDITIONAL_EFFECT, 50, NORMAL, 100, 25 move DOUBLESLAP, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 10 move COMET_PUNCH, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 85, 15 diff --git a/data/pokedex_order.asm b/data/pokedex_order.asm index 46a1717a..3bd6a15b 100755 --- a/data/pokedex_order.asm +++ b/data/pokedex_order.asm @@ -62,7 +62,7 @@ PokedexOrder: ; 41024 (10:5024) db 0 ; MISSINGNO. db 0 ; MISSINGNO. db 0 ; MISSINGNO. - db DEX_FARFETCH_D + db DEX_FARFETCHD db DEX_VENONAT db DEX_DRAGONITE db 0 ; MISSINGNO. diff --git a/data/sgb_packets.asm b/data/sgb_packets.asm index 3e5e3f0b..f810db8f 100755 --- a/data/sgb_packets.asm +++ b/data/sgb_packets.asm @@ -60,11 +60,11 @@ BlkPacket_WholeScreen: ; 7219e (1c:619e) BlkPacket_Battle: ; 721b5 (1c:61b5) ATTR_BLK 5 - ATTR_BLK_DATA %111, 2,2,0, 00,12, 19,17 - ATTR_BLK_DATA %011, 1,1,0, 01,00, 10,03 - ATTR_BLK_DATA %011, 0,0,0, 10,07, 19,10 - ATTR_BLK_DATA %011, 2,2,0, 00,04, 08,11 - ATTR_BLK_DATA %011, 3,3,0, 11,00, 19,06 + ATTR_BLK_DATA %111, 2,2,0, 00,12, 19,17 ; message box: pal 2 + ATTR_BLK_DATA %011, 1,1,0, 01,00, 10,03 ; enemy HP bar: pal 1 + ATTR_BLK_DATA %011, 0,0,0, 10,07, 19,10 ; player HP bar: pal 0 + ATTR_BLK_DATA %011, 2,2,0, 00,04, 08,11 ; player mon: pal 2 + ATTR_BLK_DATA %011, 3,3,0, 11,00, 19,06 ; enemy mon : pal 3 db $03,$00,$00,$13,$0b,$00 db $03,$00,$0c,$13,$11,$02 @@ -76,7 +76,7 @@ BlkPacket_Battle: ; 721b5 (1c:61b5) BlkPacket_StatusScreen: ; 721fa (1c:61fa) ATTR_BLK 1 - ATTR_BLK_DATA %111, 1,1,0, 01,00, 07,06 + ATTR_BLK_DATA %111, 1,1,0, 01,00, 07,06 ; mon: pal 1, HP bar: pal 0 ds 8 db $02,$00,$00,$11,$00,$03 @@ -86,7 +86,7 @@ BlkPacket_StatusScreen: ; 721fa (1c:61fa) BlkPacket_Pokedex: ; 72222 (1c:6222) ATTR_BLK 1 - ATTR_BLK_DATA %111, 1,1,0, 01,01, 08,08 + ATTR_BLK_DATA %111, 1,1,0, 01,01, 08,08 ; mon: pal 1, everything else: pal 0 ds 8 db $02,$00,$00,$11,$00,$01 @@ -97,11 +97,11 @@ BlkPacket_Pokedex: ; 72222 (1c:6222) BlkPacket_Slots: ; 7224f (1c:624f) ATTR_BLK 5 - ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,11 - ATTR_BLK_DATA %011, 2,2,0, 00,04, 19,09 - ATTR_BLK_DATA %010, 3,3,0, 00,06, 19,07 - ATTR_BLK_DATA %011, 0,0,0, 04,04, 15,09 - ATTR_BLK_DATA %011, 0,0,0, 00,12, 19,17 + ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,11 ; "3" rows and top of screen: pal 1 + ATTR_BLK_DATA %011, 2,2,0, 00,04, 19,09 ; "2" rows: pal 2 + ATTR_BLK_DATA %010, 3,3,0, 00,06, 19,07 ; "1" row: pal 3 + ATTR_BLK_DATA %011, 0,0,0, 04,04, 15,09 ; slot reels: pal 0 + ATTR_BLK_DATA %011, 0,0,0, 00,12, 19,17 ; message box: pal 0 db $03,$00,$00,$13,$0b,$01 db $03,$00,$04,$13,$09,$02 @@ -112,9 +112,9 @@ BlkPacket_Slots: ; 7224f (1c:624f) BlkPacket_Titlescreen: ; 7228e (1c:628e) ATTR_BLK 3 - ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,07 - ATTR_BLK_DATA %010, 1,1,0, 00,08, 19,09 - ATTR_BLK_DATA %011, 2,2,0, 00,10, 19,17 + ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,07 ; pokemon logo: pal 0 + ATTR_BLK_DATA %010, 1,1,0, 00,08, 19,09 ; version text: pal 1 + ATTR_BLK_DATA %011, 2,2,0, 00,10, 19,17 ; player, mon, copyright text: pal 2 ds 12 db $03,$00,$00,$13,$07,$00 @@ -124,9 +124,9 @@ BlkPacket_Titlescreen: ; 7228e (1c:628e) BlkPacket_NidorinoIntro: ; 722c1 (1c:62c1) ATTR_BLK 3 - ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,03 - ATTR_BLK_DATA %011, 0,0,0, 00,04, 19,13 - ATTR_BLK_DATA %011, 1,1,0, 00,14, 19,17 + ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,03 ; upper black bar: pal 1 + ATTR_BLK_DATA %011, 0,0,0, 00,04, 19,13 ; letterbox: pal 0 + ATTR_BLK_DATA %011, 1,1,0, 00,14, 19,17 ; lower black bar: pal 1 ds 12 db $03,$00,$00,$13,$03,$01 @@ -136,13 +136,13 @@ BlkPacket_NidorinoIntro: ; 722c1 (1c:62c1) BlkPacket_PartyMenu: ; 722f4 (1c:62f4) ATTR_BLK 7 - ATTR_BLK_DATA %110, 0,0,1, 01,00, 02,12 - ATTR_BLK_DATA %010, 0,0,0, 05,01, 11,01 - ATTR_BLK_DATA %010, 0,0,0, 05,03, 11,03 - ATTR_BLK_DATA %010, 0,0,0, 05,05, 11,05 - ATTR_BLK_DATA %010, 0,0,0, 05,07, 11,07 - ATTR_BLK_DATA %010, 0,0,0, 05,09, 11,09 - ATTR_BLK_DATA %010, 0,0,0, 05,11, 11,11 + ATTR_BLK_DATA %110, 0,0,1, 01,00, 02,12 ; mon sprites: pal 0, everything else: pal 1 + ATTR_BLK_DATA %010, 0,0,0, 05,01, 11,01 ; HP bar 0: pal set dynamically + ATTR_BLK_DATA %010, 0,0,0, 05,03, 11,03 ; HP bar 1: pal set dynamically + ATTR_BLK_DATA %010, 0,0,0, 05,05, 11,05 ; HP bar 2: pal set dynamically + ATTR_BLK_DATA %010, 0,0,0, 05,07, 11,07 ; HP bar 3: pal set dynamically + ATTR_BLK_DATA %010, 0,0,0, 05,09, 11,09 ; HP bar 4: pal set dynamically + ATTR_BLK_DATA %010, 0,0,0, 05,11, 11,11 ; HP bar 5: pal set dynamically ds 4 db $02,$00,$00,$11,$01,$03 @@ -158,16 +158,16 @@ BlkPacket_PartyMenu: ; 722f4 (1c:62f4) BlkPacket_TrainerCard: ; 72360 (1c:6360) ATTR_BLK 10 - ATTR_BLK_DATA %010, 0,0,0, 03,12, 04,13 - ATTR_BLK_DATA %010, 1,1,0, 07,12, 08,13 - ATTR_BLK_DATA %010, 3,3,0, 11,12, 12,13 - ATTR_BLK_DATA %010, 2,2,0, 16,11, 17,12 - ATTR_BLK_DATA %010, 1,1,0, 14,13, 15,14 - ATTR_BLK_DATA %010, 3,3,0, 16,13, 17,14 - ATTR_BLK_DATA %010, 2,2,0, 03,15, 04,16 - ATTR_BLK_DATA %010, 3,3,0, 07,15, 08,16 - ATTR_BLK_DATA %010, 2,2,0, 11,15, 12,16 - ATTR_BLK_DATA %010, 1,1,0, 15,15, 16,16 + ATTR_BLK_DATA %010, 0,0,0, 03,12, 04,13 ; Boulder Badge + ATTR_BLK_DATA %010, 1,1,0, 07,12, 08,13 ; Cascade Badge + ATTR_BLK_DATA %010, 3,3,0, 11,12, 12,13 ; Thunder Badge + ATTR_BLK_DATA %010, 2,2,0, 16,11, 17,12 ; Rainbow Badge + ATTR_BLK_DATA %010, 1,1,0, 14,13, 15,14 ; Rainbow Badge + ATTR_BLK_DATA %010, 3,3,0, 16,13, 17,14 ; Rainbow Badge + ATTR_BLK_DATA %010, 2,2,0, 03,15, 04,16 ; Soul Badge + ATTR_BLK_DATA %010, 3,3,0, 07,15, 08,16 ; Marsh Badge + ATTR_BLK_DATA %010, 2,2,0, 11,15, 12,16 ; Volcano Badge + ATTR_BLK_DATA %010, 1,1,0, 15,15, 16,16 ; Earth Badge ds 2 db $03,$03,$0c,$04,$0d,$00 @@ -184,9 +184,9 @@ BlkPacket_TrainerCard: ; 72360 (1c:6360) BlkPacket_GameFreakIntro: ; 723dd (1c:63dd) ATTR_BLK 3 - ATTR_BLK_DATA %111, 1,1,0, 05,11, 07,13 - ATTR_BLK_DATA %010, 2,2,0, 08,11, 09,13 - ATTR_BLK_DATA %011, 3,3,0, 12,11, 14,13 + ATTR_BLK_DATA %111, 1,1,0, 05,11, 07,13 ; falling stars (left): pal 1, GameFreak logo: pal 0 + ATTR_BLK_DATA %010, 2,2,0, 08,11, 09,13 ; falling stars (middle): pal 2 + ATTR_BLK_DATA %011, 3,3,0, 12,11, 14,13 ; falling stars (right): pal 3 ds 12 db $03,$00,$00,$13,$0a,$00 diff --git a/data/trades.asm b/data/trades.asm index b761fecf..274b0297 100755 --- a/data/trades.asm +++ b/data/trades.asm @@ -1,25 +1,25 @@ TradeMons: ; 71b7b (1c:5b7b) ; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total IF DEF(_YELLOW) - db LICKITUNG, DUGTRIO, 0,"GURIO@@@@@@" - db CLEFAIRY, MR_MIME, 0,"MILES@@@@@@" - db BUTTERFREE,BEEDRILL, 2,"STINGER@@@@" - db KANGASKHAN,MUK, 0,"STICKY@@@@@" - db MEW, MEW, 2,"BART@@@@@@@" - db TANGELA, PARASECT, 0,"SPIKE@@@@@@" - db PIDGEOT, PIDGEOT, 1,"MARTY@@@@@@" - db GOLDUCK, RHYDON, 1,"BUFFY@@@@@@" - db GROWLITHE, DEWGONG, 2,"CEZANNE@@@@" - db CUBONE, MACHOKE, 2,"RICKY@@@@@@" + db LICKITUNG, DUGTRIO, 0,"GURIO@@@@@@" + db CLEFAIRY, MR_MIME, 0,"MILES@@@@@@" + db BUTTERFREE,BEEDRILL, 2,"STINGER@@@@" + db KANGASKHAN,MUK, 0,"STICKY@@@@@" + db MEW, MEW, 2,"BART@@@@@@@" + db TANGELA, PARASECT, 0,"SPIKE@@@@@@" + db PIDGEOT, PIDGEOT, 1,"MARTY@@@@@@" + db GOLDUCK, RHYDON, 1,"BUFFY@@@@@@" + db GROWLITHE, DEWGONG, 2,"CEZANNE@@@@" + db CUBONE, MACHOKE, 2,"RICKY@@@@@@" ELSE - db NIDORINO, NIDORINA, 0,"TERRY@@@@@@" - db ABRA, MR_MIME, 0,"MARCEL@@@@@" - db BUTTERFREE,BEEDRILL, 2,"CHIKUCHIKU@" - db PONYTA, SEEL, 0,"SAILOR@@@@@" - db SPEAROW, FARFETCH_D,2,"DUX@@@@@@@@" - db SLOWBRO, LICKITUNG, 0,"MARC@@@@@@@" - db POLIWHIRL, JYNX, 1,"LOLA@@@@@@@" - db RAICHU, ELECTRODE, 1,"DORIS@@@@@@" - db VENONAT, TANGELA, 2,"CRINKLES@@@" - db NIDORAN_M, NIDORAN_F, 2,"SPOT@@@@@@@" + db NIDORINO, NIDORINA, 0,"TERRY@@@@@@" + db ABRA, MR_MIME, 0,"MARCEL@@@@@" + db BUTTERFREE,BEEDRILL, 2,"CHIKUCHIKU@" + db PONYTA, SEEL, 0,"SAILOR@@@@@" + db SPEAROW, FARFETCHD,2,"DUX@@@@@@@@" + db SLOWBRO, LICKITUNG,0,"MARC@@@@@@@" + db POLIWHIRL, JYNX, 1,"LOLA@@@@@@@" + db RAICHU, ELECTRODE,1,"DORIS@@@@@@" + db VENONAT, TANGELA, 2,"CRINKLES@@@" + db NIDORAN_M, NIDORAN_F,2,"SPOT@@@@@@@" ENDC diff --git a/data/trainer_moves.asm b/data/trainer_moves.asm index 432f0fed..518dab42 100755 --- a/data/trainer_moves.asm +++ b/data/trainer_moves.asm @@ -1,8 +1,8 @@ IF !DEF(YELLOW) LoneMoves: ; 39d22 (e:5d22) ; these are used for gym leaders. -; this is not automatic! you have to write the number you want to W_LONEATTACKNO -; first. e.g., erika's script writes 4 to W_LONEATTACKNO to get mega drain, +; this is not automatic! you have to write the number you want to wLoneAttackNo +; first. e.g., erika's script writes 4 to wLoneAttackNo to get mega drain, ; the fourth entry in the list. ; first byte: pokemon in the trainer's party that gets the move @@ -58,7 +58,7 @@ TeamMoves: db 2,4,BUBBLEBEAM db 0 - db LT__SURGE,$1 + db LT_SURGE,$1 db 1,1,THUNDERBOLT db 1,2,MEGA_PUNCH db 1,3,MEGA_KICK diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm index b121efc0..321e565c 100755 --- a/data/trainer_parties.asm +++ b/data/trainer_parties.asm @@ -1,14 +1,51 @@ TrainerDataPointers: ; 39d3b (e:5d3b) - dw YoungsterData,BugCatcherData,LassData,SailorData,JrTrainerMData - dw JrTrainerFData,PokemaniacData,SuperNerdData,HikerData,BikerData - dw BurglarData,EngineerData,Juggler1Data,FisherData,SwimmerData - dw CueBallData,GamblerData,BeautyData,PsychicData,RockerData - dw JugglerData,TamerData,BirdKeeperData,BlackbeltData,Green1Data - dw ProfOakData,ChiefData,ScientistData,GiovanniData,RocketData - dw CooltrainerMData,CooltrainerFData,BrunoData,BrockData,MistyData - dw LtSurgeData,ErikaData,KogaData,BlaineData,SabrinaData - dw GentlemanData,Green2Data,Green3Data,LoreleiData,ChannelerData - dw AgathaData,LanceData + dw YoungsterData + dw BugCatcherData + dw LassData + dw SailorData + dw JrTrainerMData + dw JrTrainerFData + dw PokemaniacData + dw SuperNerdData + dw HikerData + dw BikerData + dw BurglarData + dw EngineerData + dw Juggler1Data + dw FisherData + dw SwimmerData + dw CueBallData + dw GamblerData + dw BeautyData + dw PsychicData + dw RockerData + dw JugglerData + dw TamerData + dw BirdKeeperData + dw BlackbeltData + dw Green1Data + dw ProfOakData + dw ChiefData + dw ScientistData + dw GiovanniData + dw RocketData + dw CooltrainerMData + dw CooltrainerFData + dw BrunoData + dw BrockData + dw MistyData + dw LtSurgeData + dw ErikaData + dw KogaData + dw BlaineData + dw SabrinaData + dw GentlemanData + dw Green2Data + dw Green3Data + dw LoreleiData + dw ChannelerData + dw AgathaData + dw LanceData ; if first byte != FF, then ; first byte is level (of all pokemon on this team) @@ -19,7 +56,7 @@ TrainerDataPointers: ; 39d3b (e:5d3b) ; every next two bytes are a level and species ; null-terminated -YoungsterData: ; 39d99 (e:5d99) +YoungsterData: db 11,RATTATA,EKANS,0 db 14,SPEAROW,0 db 10,RATTATA,RATTATA,ZUBAT,0 @@ -33,19 +70,10 @@ YoungsterData: ; 39d99 (e:5d99) db 17,RATTATA,RATTATA,RATICATE,0 db 18,NIDORAN_M,NIDORINO,0 db 17,SPEAROW,RATTATA,RATTATA,SPEAROW,0 -if DEF(_YELLOW) - db 24,SANDSHREW,0 -endc -BugCatcherData: ; 39dce (e:5dce) -if DEF(_YELLOW) - db 7,CATERPIE,CATERPIE,0 - db 6,METAPOD,CATERPIE,METAPOD,0 - db 10,CATERPIE,0 -else +BugCatcherData: db 6,WEEDLE,CATERPIE,0 db 7,WEEDLE,KAKUNA,WEEDLE,0 db 9,WEEDLE,0 -endc db 10,CATERPIE,WEEDLE,CATERPIE,0 db 9,WEEDLE,KAKUNA,CATERPIE,METAPOD,0 db 11,CATERPIE,METAPOD,0 @@ -57,10 +85,7 @@ endc db 18,METAPOD,CATERPIE,VENONAT,0 db 19,BEEDRILL,BEEDRILL,0 db 20,CATERPIE,WEEDLE,VENONAT,0 -if DEF(_YELLOW) - db 8,CATERPIE,METAPOD,0 -endc -LassData: ; 39e0c (e:5e0c) +LassData: db 9,PIDGEY,PIDGEY,0 db 10,RATTATA,NIDORAN_M,0 db 14,JIGGLYPUFF,0 @@ -72,25 +97,14 @@ LassData: ; 39e0c (e:5e0c) db 15,NIDORAN_M,NIDORAN_F,0 db 13,ODDISH,PIDGEY,ODDISH,0 db 18,PIDGEY,NIDORAN_F,0 -if DEF(_YELLOW) - db 20,JIGGLYPUFF,0 -else db 18,RATTATA,PIKACHU,0 -endc db 23,NIDORAN_F,NIDORINA,0 db 24,MEOWTH,MEOWTH,MEOWTH,0 -if DEF(_YELLOW) - db 19,PIDGEY,RATTATA,NIDORAN_F,MEOWTH,NIDORAN_M,0 -else db 19,PIDGEY,RATTATA,NIDORAN_M,MEOWTH,PIKACHU,0 -endc db 22,CLEFAIRY,CLEFAIRY,0 db 23,BELLSPROUT,WEEPINBELL,0 db 23,ODDISH,GLOOM,0 -if DEF(_YELLOW) - db 6,NIDORAN_F,NIDORAN_M,0 -endc -SailorData: ; 39e58 (e:5e58) +SailorData: db 18,MACHOP,SHELLDER,0 db 17,MACHOP,TENTACOOL,0 db 21,SHELLDER,0 @@ -98,17 +112,9 @@ SailorData: ; 39e58 (e:5e58) db 18,TENTACOOL,STARYU,0 db 17,HORSEA,HORSEA,HORSEA,0 db 20,MACHOP,0 -if DEF(_YELLOW) - db 24,MAGNEMITE,0 -else db 21,PIKACHU,PIKACHU,0 -endc -JrTrainerMData: ; 39e78 (e:5e78) -if DEF(_YELLOW) - db 9,DIGLETT,SANDSHREW,0 -else +JrTrainerMData: db 11,DIGLETT,SANDSHREW,0 -endc db 14,RATTATA,EKANS,0 db 18,MANKEY,0 db 20,SQUIRTLE,0 @@ -117,34 +123,19 @@ endc db 21,GROWLITHE,CHARMANDER,0 db 19,RATTATA,DIGLETT,EKANS,SANDSHREW,0 db 29,NIDORAN_M,NIDORINO,0 -if DEF(_YELLOW) - db 16,WEEPINBELL,0 -endc -JrTrainerFData: ; 39e9d (e:5e9d) +JrTrainerFData: db 19,GOLDEEN,0 -if DEF(_YELLOW) - db 16,ODDISH,BELLSPROUT,0 -else db 16,RATTATA,PIKACHU,0 -endc db 16,PIDGEY,PIDGEY,PIDGEY,0 db 22,BULBASAUR,0 db 18,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0 db 23,MEOWTH,0 -if DEF(_YELLOW) - db 20,JIGGLYPUFF,CLEFAIRY,0 -else db 20,PIKACHU,CLEFAIRY,0 -endc db 21,PIDGEY,PIDGEOTTO,0 db 21,JIGGLYPUFF,PIDGEY,MEOWTH,0 db 22,ODDISH,BULBASAUR,0 db 24,BULBASAUR,IVYSAUR,0 -if DEF(_YELLOW) - db 24,PIDGEY,MEOWTH,RATTATA,PIDGEY,MEOWTH,0 -else db 24,PIDGEY,MEOWTH,RATTATA,PIKACHU,MEOWTH,0 -endc db 30,POLIWAG,POLIWAG,0 db 27,PIDGEY,MEOWTH,PIDGEY,PIDGEOTTO,0 db 28,GOLDEEN,POLIWAG,HORSEA,0 @@ -153,18 +144,11 @@ endc db 20,MEOWTH,ODDISH,PIDGEY,0 db 19,PIDGEY,RATTATA,RATTATA,BELLSPROUT,0 db 28,GLOOM,ODDISH,ODDISH,0 -if DEF(_YELLOW) - db 29,PIDGEY,PIDGEOTTO,0 -else db 29,PIKACHU,RAICHU,0 -endc db 33,CLEFAIRY,0 db 29,BELLSPROUT,ODDISH,TANGELA,0 db 30,TENTACOOL,HORSEA,SEEL,0 -if DEF(_YELLOW) - db 20,CUBONE,0 -endc -PokemaniacData: ; 39f09 (e:5f09) +PokemaniacData: db 30,RHYHORN,LICKITUNG,0 db 20,CUBONE,SLOWPOKE,0 db 20,SLOWPOKE,SLOWPOKE,SLOWPOKE,0 @@ -172,7 +156,7 @@ PokemaniacData: ; 39f09 (e:5f09) db 25,SLOWPOKE,0 db 40,CHARMELEON,LAPRAS,LICKITUNG,0 db 23,CUBONE,SLOWPOKE,0 -SuperNerdData: ; 39f26 (e:5f26) +SuperNerdData: db 11,MAGNEMITE,VOLTORB,0 db 12,GRIMER,VOLTORB,KOFFING,0 db 20,VOLTORB,KOFFING,VOLTORB,MAGNEMITE,0 @@ -185,7 +169,7 @@ SuperNerdData: ; 39f26 (e:5f26) db 34,PONYTA,CHARMANDER,VULPIX,GROWLITHE,0 db 41,RAPIDASH,0 db 37,GROWLITHE,VULPIX,0 -HikerData: ; 39f5e (e:5f5e) +HikerData: db 10,GEODUDE,GEODUDE,ONIX,0 db 15,MACHOP,GEODUDE,0 db 13,GEODUDE,GEODUDE,MACHOP,GEODUDE,0 @@ -200,7 +184,7 @@ HikerData: ; 39f5e (e:5f5e) db 19,GEODUDE,MACHOP,GEODUDE,GEODUDE,0 db 20,ONIX,ONIX,GEODUDE,0 db 21,GEODUDE,GRAVELER,0 -BikerData: ; 39f9c (e:5f9c) +BikerData: db 28,KOFFING,KOFFING,KOFFING,0 db 29,KOFFING,GRIMER,0 db 25,KOFFING,KOFFING,WEEZING,KOFFING,GRIMER,0 @@ -216,7 +200,7 @@ BikerData: ; 39f9c (e:5f9c) db 26,KOFFING,KOFFING,GRIMER,KOFFING,0 db 28,GRIMER,GRIMER,KOFFING,0 db 29,KOFFING,MUK,0 -BurglarData: ; 39fe4 (e:5fe4) +BurglarData: db 29,GROWLITHE,VULPIX,0 db 33,GROWLITHE,0 db 28,VULPIX,CHARMANDER,PONYTA,0 @@ -226,13 +210,13 @@ BurglarData: ; 39fe4 (e:5fe4) db 34,CHARMANDER,CHARMELEON,0 db 38,NINETALES,0 db 34,GROWLITHE,PONYTA,0 -EngineerData: ; 3a007 (e:6007) +EngineerData: db 21,VOLTORB,MAGNEMITE,0 db 21,MAGNEMITE,0 db 18,MAGNEMITE,MAGNEMITE,MAGNETON,0 -Juggler1Data: ; 3a013 (e:6013) +Juggler1Data: ; none -FisherData: ; 3a013 (e:6013) +FisherData: db 17,GOLDEEN,TENTACOOL,GOLDEEN,0 db 17,TENTACOOL,STARYU,SHELLDER,0 db 22,GOLDEEN,POLIWAG,GOLDEEN,0 @@ -244,7 +228,7 @@ FisherData: ; 3a013 (e:6013) db 27,MAGIKARP,MAGIKARP,MAGIKARP,MAGIKARP,MAGIKARP,MAGIKARP,0 db 33,SEAKING,GOLDEEN,0 db 24,MAGIKARP,MAGIKARP,0 -SwimmerData: ; 3a049 (e:6049) +SwimmerData: db 16,HORSEA,SHELLDER,0 db 30,TENTACOOL,SHELLDER,0 db 29,GOLDEEN,HORSEA,STARYU,0 @@ -260,7 +244,7 @@ SwimmerData: ; 3a049 (e:6049) db 37,STARMIE,0 db 33,STARYU,WARTORTLE,0 db 32,POLIWHIRL,TENTACOOL,SEADRA,0 -CueBallData: ; 3a08d (e:608d) +CueBallData: db 28,MACHOP,MANKEY,MACHOP,0 db 29,MANKEY,MACHOP,0 db 33,MACHOP,0 @@ -270,7 +254,7 @@ CueBallData: ; 3a08d (e:608d) db 26,MANKEY,MANKEY,MACHOKE,MACHOP,0 db 29,PRIMEAPE,MACHOKE,0 db 31,TENTACOOL,TENTACOOL,TENTACRUEL,0 -GamblerData: ; 3a0b3 (e:60b3) +GamblerData: db 18,POLIWAG,HORSEA,0 db 18,BELLSPROUT,ODDISH,0 db 18,VOLTORB,MAGNEMITE,0 @@ -278,15 +262,11 @@ GamblerData: ; 3a0b3 (e:60b3) db 22,POLIWAG,POLIWAG,POLIWHIRL,0 db 22,ONIX,GEODUDE,GRAVELER,0 db 24,GROWLITHE,VULPIX,0 -BeautyData: ; 3a0d1 (e:60d1) +BeautyData: db 21,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0 db 24,BELLSPROUT,BELLSPROUT,0 db 26,EXEGGCUTE,0 -if DEF(_YELLOW) - db 27,RATTATA,VULPIX,RATTATA,0 -else db 27,RATTATA,PIKACHU,RATTATA,0 -endc db 29,CLEFAIRY,MEOWTH,0 db 35,SEAKING,0 db 30,SHELLDER,SHELLDER,CLOYSTER,0 @@ -298,19 +278,15 @@ endc db 30,GOLDEEN,SEAKING,0 db 29,STARYU,STARYU,STARYU,0 db 30,SEADRA,HORSEA,SEADRA,0 -PsychicData: ; 3a115 (e:6115) +PsychicData: db 31,KADABRA,SLOWPOKE,MR_MIME,KADABRA,0 db 34,MR_MIME,KADABRA,0 db 33,SLOWPOKE,SLOWPOKE,SLOWBRO,0 db 38,SLOWBRO,0 -RockerData: ; 3a127 (e:6127) -if DEF(_YELLOW) - db 20,VOLTORB,VOLTORB,VOLTORB,0 -else +RockerData: db 20,VOLTORB,MAGNEMITE,VOLTORB,0 -endc db 29,VOLTORB,ELECTRODE,0 -JugglerData: ; 3a130 (e:6130) +JugglerData: db 29,KADABRA,MR_MIME,0 db 41,DROWZEE,HYPNO,KADABRA,KADABRA,0 db 31,DROWZEE,DROWZEE,KADABRA,DROWZEE,0 @@ -319,32 +295,32 @@ JugglerData: ; 3a130 (e:6130) db 33,HYPNO,0 db 38,HYPNO,0 db 34,DROWZEE,KADABRA,0 -TamerData: ; 3a151 (e:6151) +TamerData: db 34,SANDSLASH,ARBOK,0 db 33,ARBOK,SANDSLASH,ARBOK,0 db 43,RHYHORN,0 db 39,ARBOK,TAUROS,0 db 44,PERSIAN,GOLDUCK,0 db 42,RHYHORN,PRIMEAPE,ARBOK,TAUROS,0 -BirdKeeperData: ; 3a16b (e:616b) +BirdKeeperData: db 29,PIDGEY,PIDGEOTTO,0 db 25,SPEAROW,PIDGEY,PIDGEY,SPEAROW,SPEAROW,0 db 26,PIDGEY,PIDGEOTTO,SPEAROW,FEAROW,0 - db 33,FARFETCH_D,0 + db 33,FARFETCHD,0 db 29,SPEAROW,FEAROW,0 - db 26,PIDGEOTTO,FARFETCH_D,DODUO,PIDGEY,0 + db 26,PIDGEOTTO,FARFETCHD,DODUO,PIDGEY,0 db 28,DODRIO,DODUO,DODUO,0 db 29,SPEAROW,FEAROW,0 db 34,DODRIO,0 db 26,SPEAROW,SPEAROW,FEAROW,SPEAROW,0 db 30,FEAROW,FEAROW,PIDGEOTTO,0 db 39,PIDGEOTTO,PIDGEOTTO,PIDGEY,PIDGEOTTO,0 - db 42,FARFETCH_D,FEAROW,0 + db 42,FARFETCHD,FEAROW,0 db 28,PIDGEY,DODUO,PIDGEOTTO,0 db 26,PIDGEY,SPEAROW,PIDGEY,FEAROW,0 db 29,PIDGEOTTO,FEAROW,0 db 28,SPEAROW,DODUO,FEAROW,0 -BlackbeltData: ; 3a1be (e:61be) +BlackbeltData: db 37,HITMONLEE,HITMONCHAN,0 db 31,MANKEY,MANKEY,PRIMEAPE,0 db 32,MACHOP,MACHOKE,0 @@ -354,12 +330,7 @@ BlackbeltData: ; 3a1be (e:61be) db 43,MACHOKE,0 db 38,MACHOKE,MACHOP,MACHOKE,0 db 43,MACHOKE,MACHOP,MACHOKE,0 -Green1Data: ; 3a1e4 (e:61e4) -if DEF(_YELLOW) - db 5,EEVEE,0 - db $FF,9,SPEAROW,8,EEVEE,0 - db $FF,18,SPEAROW,15,SANDSHREW,15,RATTATA,17,EEVEE,0 -else +Green1Data: db 5,SQUIRTLE,0 db 5,BULBASAUR,0 db 5,CHARMANDER,0 @@ -369,14 +340,13 @@ else db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,SQUIRTLE,0 db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,BULBASAUR,0 db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,CHARMANDER,0 -endc -ProfOakData: ; 3a21d (e:621d) +ProfOakData: db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,BLASTOISE,70,GYARADOS,0 db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,VENUSAUR,70,GYARADOS,0 db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,CHARIZARD,70,GYARADOS,0 -ChiefData: ; 3a241 (e:6241) +ChiefData: ; none -ScientistData: ; 3a241 (e:6241) +ScientistData: db 34,KOFFING,VOLTORB,0 db 26,GRIMER,WEEZING,KOFFING,WEEZING,0 db 28,MAGNEMITE,VOLTORB,MAGNETON,0 @@ -390,17 +360,11 @@ ScientistData: ; 3a241 (e:6241) db 29,MAGNEMITE,KOFFING,0 db 33,MAGNEMITE,MAGNETON,VOLTORB,0 db 34,MAGNEMITE,ELECTRODE,0 -GiovanniData: ; 3a27e (e:627e) -if DEF(_YELLOW) - db $FF,25,ONIX,24,RHYHORN,29,PERSIAN,0 - db $FF,37,NIDORINO,35,PERSIAN,37,RHYHORN,41,NIDOQUEEN,0 - db $FF,50,DUGTRIO,53,PERSIAN,53,NIDOQUEEN,55,NIDOKING,55,RHYDON,0 -else +GiovanniData: db $FF,25,ONIX,24,RHYHORN,29,KANGASKHAN,0 db $FF,37,NIDORINO,35,KANGASKHAN,37,RHYHORN,41,NIDOQUEEN,0 db $FF,45,RHYHORN,42,DUGTRIO,44,NIDOQUEEN,45,NIDOKING,50,RHYDON,0 -endc -RocketData: ; 3a29c (e:629c) +RocketData: db 13,RATTATA,ZUBAT,0 db 11,SANDSHREW,RATTATA,ZUBAT,0 db 12,ZUBAT,EKANS,0 @@ -442,18 +406,7 @@ RocketData: ; 3a29c (e:629c) db 33,MACHOKE,0 db 25,RATTATA,RATTATA,ZUBAT,RATTATA,EKANS,0 db 32,CUBONE,DROWZEE,MAROWAK,0 -if DEF(_YELLOW) -JessieJamesData: - db 14,EKANS,MEOWTH,KOFFING,0 - db 25,KOFFING,MEOWTH,EKANS,0 - db 27,MEOWTH,ARBOK,WEEZING,0 - db 31,WEEZING,ARBOK,MEOWTH,0 - db 16,KOFFING,0 - db 27,KOFFING,0 - db 29,WEEZING,0 - db 33,WEEZING,0 -endc -CooltrainerMData: ; 3a35a (e:635a) +CooltrainerMData: db 39,NIDORINO,NIDOKING,0 db 43,EXEGGUTOR,CLOYSTER,ARCANINE,0 db 43,KINGLER,TENTACRUEL,BLASTOISE,0 @@ -464,7 +417,7 @@ CooltrainerMData: ; 3a35a (e:635a) db 44,KINGLER,CLOYSTER,0 db 39,SANDSLASH,DUGTRIO,0 db 43,RHYHORN,0 -CooltrainerFData: ; 3a385 (e:6385) +CooltrainerFData: db 24,WEEPINBELL,GLOOM,IVYSAUR,0 db 43,BELLSPROUT,WEEPINBELL,VICTREEBEL,0 db 43,PARASECT,DEWGONG,CHANSEY,0 @@ -473,69 +426,29 @@ CooltrainerFData: ; 3a385 (e:6385) db 45,IVYSAUR,VENUSAUR,0 db 45,NIDORINA,NIDOQUEEN,0 db 43,PERSIAN,NINETALES,RAICHU,0 -BrunoData: ; 3a3a9 (e:63a9) +BrunoData: db $FF,53,ONIX,55,HITMONCHAN,55,HITMONLEE,56,ONIX,58,MACHAMP,0 -BrockData: ; 3a3b5 (e:63b5) -if DEF(_YELLOW) - db $FF,10,GEODUDE,12,ONIX,0 -else +BrockData: db $FF,12,GEODUDE,14,ONIX,0 -endc -MistyData: ; 3a3bb (e:63bb) +MistyData: db $FF,18,STARYU,21,STARMIE,0 -LtSurgeData: ; 3a3c1 (e:63c1) -if DEF(_YELLOW) - db $FF,28,RAICHU,0 -else +LtSurgeData: db $FF,21,VOLTORB,18,PIKACHU,24,RAICHU,0 -endc -ErikaData: ; 3a3c9 (e:63c9) -if DEF(_YELLOW) - db $FF,30,TANGELA,32,WEEPINBELL,32,GLOOM,0 -else +ErikaData: db $FF,29,VICTREEBEL,24,TANGELA,29,VILEPLUME,0 -endc -KogaData: ; 3a3d1 (e:63d1) -if DEF(_YELLOW) - db $FF,44,VENONAT,46,VENONAT,48,VENONAT,50,VENOMOTH,0 -else +KogaData: db $FF,37,KOFFING,39,MUK,37,KOFFING,43,WEEZING,0 -endc -BlaineData: ; 3a3db (e:63db) -if DEF(_YELLOW) - db $FF,48,NINETALES,50,RAPIDASH,54,ARCANINE,0 -else +BlaineData: db $FF,42,GROWLITHE,40,PONYTA,42,RAPIDASH,47,ARCANINE,0 -endc -SabrinaData: ; 3a3e5 (e:63e5) -if DEF(_YELLOW) - db $FF,50,ABRA,50,KADABRA,50,ALAKAZAM,0 -else +SabrinaData: db $FF,38,KADABRA,37,MR_MIME,38,VENOMOTH,43,ALAKAZAM,0 -endc -GentlemanData: ; 3a3ef (e:63ef) +GentlemanData: db 18,GROWLITHE,GROWLITHE,0 db 19,NIDORAN_M,NIDORAN_F,0 -if DEF(_YELLOW) - db 22,VOLTORB,MAGNEMITE,0 -else db 23,PIKACHU,0 -endc db 48,PRIMEAPE,0 db 17,GROWLITHE,PONYTA,0 -Green2Data: ; 3a401 (e:6401) -if DEF(_YELLOW) - db $FF,19,SPEAROW,16,RATTATA,18,SANDSHREW,20,EEVEE,0 - db $FF,25,FEAROW,23,SHELLDER,22,VULPIX,20,SANDSHREW,25,EEVEE,0 - db $FF,25,FEAROW,23,MAGNEMITE,22,SHELLDER,20,SANDSHREW,25,EEVEE,0 - db $FF,25,FEAROW,23,VULPIX,22,MAGNEMITE,20,SANDSHREW,25,EEVEE,0 - db $FF,38,SANDSLASH,35,NINETALES,37,CLOYSTER,35,KADABRA,40,JOLTEON,0 - db $FF,38,SANDSLASH,35,CLOYSTER,37,MAGNETON,35,KADABRA,40,FLAREON,0 - db $FF,38,SANDSLASH,35,MAGNETON,37,NINETALES,35,KADABRA,40,VAPOREON,0 - db $FF,47,SANDSLASH,45,EXEGGCUTE,45,NINETALES,47,CLOYSTER,50,KADABRA,53,JOLTEON,0 - db $FF,47,SANDSLASH,45,EXEGGCUTE,45,CLOYSTER,47,MAGNETON,50,KADABRA,53,FLAREON,0 - db $FF,47,SANDSLASH,45,EXEGGCUTE,45,MAGNETON,47,NINETALES,50,KADABRA,53,VAPOREON,0 -else +Green2Data: db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,WARTORTLE,0 db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,IVYSAUR,0 db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,CHARMELEON,0 @@ -548,20 +461,13 @@ else db $FF,47,PIDGEOT,45,RHYHORN,45,GROWLITHE,47,EXEGGCUTE,50,ALAKAZAM,53,BLASTOISE,0 db $FF,47,PIDGEOT,45,RHYHORN,45,GYARADOS,47,GROWLITHE,50,ALAKAZAM,53,VENUSAUR,0 db $FF,47,PIDGEOT,45,RHYHORN,45,EXEGGCUTE,47,GYARADOS,50,ALAKAZAM,53,CHARIZARD,0 -endc -Green3Data: ; 3a491 (e:6491) -if DEF(_YELLOW) - db $FF,61,SANDSLASH,59,ALAKAZAM,61,EXEGGUTOR,61,CLOYSTER,63,NINETALES,65,JOLTEON,0 - db $FF,61,SANDSLASH,59,ALAKAZAM,61,EXEGGUTOR,61,MAGNETON,63,CLOYSTER,65,FLAREON,0 - db $FF,61,SANDSLASH,59,ALAKAZAM,61,EXEGGUTOR,61,NINETALES,63,MAGNETON,65,VAPOREON,0 -else +Green3Data: db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,ARCANINE,63,EXEGGUTOR,65,BLASTOISE,0 db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,GYARADOS,63,ARCANINE,65,VENUSAUR,0 db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,EXEGGUTOR,63,GYARADOS,65,CHARIZARD,0 -endc -LoreleiData: ; 3a4bb (e:64bb) +LoreleiData: db $FF,54,DEWGONG,53,CLOYSTER,54,SLOWBRO,56,JYNX,56,LAPRAS,0 -ChannelerData: ; 3a4c7 (e:64c7) +ChannelerData: db 22,GASTLY,0 db 24,GASTLY,0 db 23,GASTLY,GASTLY,0 @@ -586,7 +492,7 @@ ChannelerData: ; 3a4c7 (e:64c7) db 34,GASTLY,HAUNTER,0 db 38,HAUNTER,0 db 33,GASTLY,GASTLY,HAUNTER,0 -AgathaData: ; 3a516 (e:6516) +AgathaData: db $FF,56,GENGAR,56,GOLBAT,55,HAUNTER,58,ARBOK,60,GENGAR,0 -LanceData: ; 3a522 (e:6522) +LanceData: db $FF,58,GYARADOS,56,DRAGONAIR,56,DRAGONAIR,60,AERODACTYL,62,DRAGONITE,0 diff --git a/data/trainer_types.asm b/data/trainer_types.asm index 5ad1dbd0..bc94015c 100755 --- a/data/trainer_types.asm +++ b/data/trainer_types.asm @@ -1,17 +1,17 @@ FemaleTrainerList:: ; 3434 (0:3434) - db $c8+LASS - db $c8+JR__TRAINER_F - db $c8+BEAUTY - db $c8+COOLTRAINER_F + db OPP_LASS + db OPP_JR_TRAINER_F + db OPP_BEAUTY + db OPP_COOLTRAINER_F db $FF EvilTrainerList:: ; 3439 (0:3439) - db $c8+JUGGLER_X - db $c8+GAMBLER - db $c8+ROCKER - db $c8+JUGGLER - db $c8+CHIEF - db $c8+SCIENTIST - db $c8+GIOVANNI - db $c8+ROCKET + db OPP_JUGGLER_X + db OPP_GAMBLER + db OPP_ROCKER + db OPP_JUGGLER + db OPP_CHIEF + db OPP_SCIENTIST + db OPP_GIOVANNI + db OPP_ROCKET db $FF diff --git a/data/wildPokemon/route12.asm b/data/wildPokemon/route12.asm index 7f5e47fe..9bb26a6d 100755 --- a/data/wildPokemon/route12.asm +++ b/data/wildPokemon/route12.asm @@ -38,8 +38,8 @@ Route12Mons: db 27,BELLSPROUT db 29,GLOOM db 29,WEEPINBELL - db 26,FARFETCH_D - db 31,FARFETCH_D + db 26,FARFETCHD + db 31,FARFETCHD db $03 db 15,SLOWPOKE diff --git a/data/wildPokemon/route13.asm b/data/wildPokemon/route13.asm index 1b694f36..be8ce386 100755 --- a/data/wildPokemon/route13.asm +++ b/data/wildPokemon/route13.asm @@ -39,8 +39,8 @@ Route13Mons: db 27,BELLSPROUT db 29,GLOOM db 29,WEEPINBELL - db 26,FARFETCH_D - db 31,FARFETCH_D + db 26,FARFETCHD + db 31,FARFETCHD db $03 db 15,SLOWPOKE |