diff --git a/data/moves/moves.asm b/data/moves/moves.asm index 86462bbc..58271065 100644 --- a/data/moves/moves.asm +++ b/data/moves/moves.asm @@ -115,7 +115,7 @@ Moves: move MIMIC, MIMIC_EFFECT, 0, NORMAL, 100, 10 move SCREECH, DEFENSE_DOWN2_EFFECT, 0, NORMAL, 85, 40 move DOUBLE_TEAM, EVASION_UP1_EFFECT, 0, NORMAL, 100, 15 - move RECOVER, HEAL_EFFECT, 0, NORMAL, 100, 20 + move RECOVER, SPLASH_EFFECT, 0, NORMAL, 100, 20 ;temporary until we fix it move HARDEN, DEFENSE_UP1_EFFECT, 0, NORMAL, 100, 30 move MINIMIZE, EVASION_UP1_EFFECT, 0, NORMAL, 100, 20 move SMOKESCREEN, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 100, 20 @@ -145,7 +145,7 @@ Moves: move CONSTRICT, SPEED_DOWN_SIDE_EFFECT, 10, NORMAL, 100, 35 move AMNESIA, SPECIAL_UP2_EFFECT, 0, PSYCHIC_TYPE, 100, 20 move KINESIS, ACCURACY_DOWN1_EFFECT, 0, PSYCHIC_TYPE, 80, 15 - move SOFTBOILED, HEAL_EFFECT, 0, NORMAL, 100, 10 + move SOFTBOILED, SPLASH_EFFECT, 0, NORMAL, 100, 10 ;temporary until we fix it move HI_JUMP_KICK, JUMP_KICK_EFFECT, 85, FIGHTING, 90, 20 move GLARE, PARALYZE_EFFECT, 0, NORMAL, 75, 30 move DREAM_EATER, DREAM_EATER_EFFECT, 100, PSYCHIC_TYPE, 100, 15 @@ -166,7 +166,7 @@ Moves: move EXPLOSION, EXPLODE_EFFECT, 170, NORMAL, 100, 5 move FURY_SWIPES, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 80, 15 move BONEMERANG, ATTACK_TWICE_EFFECT, 50, GROUND, 90, 10 - move REST, HEAL_EFFECT, 0, PSYCHIC_TYPE, 100, 10 + move REST, SPLASH_EFFECT, 0, PSYCHIC_TYPE, 100, 10 ;temporary until we fix it move ROCK_SLIDE, NO_ADDITIONAL_EFFECT, 75, ROCK, 90, 10 move HYPER_FANG, FLINCH_SIDE_EFFECT1, 80, NORMAL, 90, 15 move SHARPEN, ATTACK_UP1_EFFECT, 0, NORMAL, 100, 30 diff --git a/data/pokemon/base_stats/articunog.asm b/data/pokemon/base_stats/articunog.asm new file mode 100644 index 00000000..55de48cd --- /dev/null +++ b/data/pokemon/base_stats/articunog.asm @@ -0,0 +1,24 @@ + db DEX_ARTICUNO_G ; pokedex id + + db 90, 85, 85, 95, 125 + ; hp atk def spd spc + + db PSYCHIC_TYPE, FLYING ; type + db 3 ; catch rate + db 215 ; base exp + + INCBIN "gfx/pokemon/front/articunog.pic", 0, 1 ; sprite dimensions + dw ArticunoGPicFront, ArticunoGPicBack + + db GUST, CONFUSION, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ + HYPER_BEAM, RAGE, PSYCHIC_M, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, SWIFT, SKY_ATTACK, \ + REST, PSYWAVE, SUBSTITUTE, FLY + ; end + + db BANK(ArticunoGPicFront) + assert BANK(ArticunoGPicFront) == BANK(ArticunoGPicBack) diff --git a/data/pokemon/base_stats/blottle.asm b/data/pokemon/base_stats/blottle.asm index 7e1e79ff..24f86b65 100644 --- a/data/pokemon/base_stats/blottle.asm +++ b/data/pokemon/base_stats/blottle.asm @@ -3,7 +3,7 @@ db 60, 35, 60, 50, 65 ; hp atk def spd spc - db WATER, WATER ; type + db WATER, FAIRY ; type db 190 ; catch rate db 97 ; base exp diff --git a/data/pokemon/base_stats/moltresg.asm b/data/pokemon/base_stats/moltresg.asm new file mode 100644 index 00000000..7e4fcb39 --- /dev/null +++ b/data/pokemon/base_stats/moltresg.asm @@ -0,0 +1,23 @@ + db DEX_MOLTRES_G ; pokedex id + + db 90, 85, 90, 90, 125 + ; hp atk def spd spc + + db DARK, FLYING ; type + db 3 ; catch rate + db 217 ; base exp + + INCBIN "gfx/pokemon/front/moltresg.pic", 0, 1 ; sprite dimensions + dw MoltresGPicFront, MoltresGPicBack + + db GUST, LEER, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + SKY_ATTACK, REST, SUBSTITUTE, FLY + ; end + + db BANK(MoltresGPicFront) + assert BANK(MoltresGPicFront) == BANK(MoltresGPicBack) diff --git a/data/pokemon/base_stats/zapdosg.asm b/data/pokemon/base_stats/zapdosg.asm new file mode 100644 index 00000000..3dec79a5 --- /dev/null +++ b/data/pokemon/base_stats/zapdosg.asm @@ -0,0 +1,24 @@ + db DEX_ZAPDOS_G ; pokedex id + + db 90, 125, 90, 100, 75 + ; hp atk def spd spc + + db FIGHTING, FLYING ; type + db 3 ; catch rate + db 216 ; base exp + + INCBIN "gfx/pokemon/front/zapdosg.pic", 0, 1 ; sprite dimensions + dw ZapdosGPicFront, ZapdosGPicBack + + db PECK, FOCUS_ENERGY, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm WHIRLWIND, MEGA_KICK, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ + HYPER_BEAM, COUNTER, RAGE, MIMIC, DOUBLE_TEAM, \ + BIDE, SWIFT, SKY_ATTACK, REST, SUBSTITUTE, \ + FLY + ; end + + db BANK(ZapdosGPicFront) + assert BANK(ZapdosGPicFront) == BANK(ZapdosGPicBack) diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 6b88818c..2943b97a 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -2822,4 +2822,45 @@ PorygonZEvosMoves: db 0 ; Learnset db 50, AMNESIA ; will replace with nasty plot - db 0 \ No newline at end of file + db 0 + +;ArticunoGEvosMoves: +; Evolutions +; db 0 +; Learnset +; db 40, REFLECT +; db 45, HYPNOSIS +; db 51, PSYBEAM +; db 55, AGILITY +; db 60, LIGHT_SCREEN +; db 65, RECOVER +; db 70, DREAM_EATER +; db 0 + +;ZapdosGEvosMoves: +; Evolutions +; db 0 +; Learnset +; db 40, DOUBLE_KICK +; db 45, LIGHT_SCREEN +; db 51, LOW_KICK +; db 55, AGILITY +; db 58, JUMP_KICK +; db 62, DRILL_PECK +; db 66, ROLLING_KICK +; db 70, HI_JUMP_KICK +; db 0 + +;MoltresGEvosMoves: +; Evolutions +; db 0 +; Learnset +; db 40, BITE ; Fake Tears +; db 45, WING_ATTACK +; db 51, BRUTAL_SWING +; db 55, AGILITY +; db 58, FEINT_ATTACK +; db 62, AMNESIA ; Nasty Plot +; db 66, NIGHT_SLASH ; False Surrender +; db 70, SKY_ATTACK +; db 0 diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 0ba67cad..0ab475cf 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -500,7 +500,7 @@ Green1Data: ProfOakData: ; Unused db $FF, 66, TAUROS, 67, GYARADOS, 68, ARCANINE, 68, EXEGGUTOR, 69, NIDOKING, 70, TOTARTLE, 0 - db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, GYARADOS, 68, ARCANINE, 60, NIDOKING, 70, VENUSAUR, 0 + db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, GYARADOS, 68, ARCANINE, 69, NIDOKING, 70, VENUSAUR, 0 db $FF, 66, TAUROS, 67, ARCANINE, 68, EXEGGUTOR, 68, GYARADOS, 69, NIDOKING, 70, CHARIZARD, 0 ChiefData: @@ -640,16 +640,18 @@ CooltrainerFData: BrunoData: db $FF, 54, PRIMEAPE, 55, STEELIX, 55, POLIWRATH, 56, HITMONTOP, 56, PURAKKUSU, 58, MACHAMP, 0 +; post-game rematch team (currently unused) + ; db $FF, 74, STEELIX, 75, POLIWRATH, 75, SIRFETCHD, 76, PURAKKUSU, 76, MACHAMP, 78, ZAPDOS_G, 0 BrockData: db $FF, 13, GEODUDE, 12, OMANYTE, 12, KABUTO, 12, DECILLA, 15, ONIX, 0 ; post-game rematch team (currently unused) - ; db $FF, 66, GOLEM, 67, OMASTAR, 67, KABUTOPS, 66, KLEAVOR, 67, NIDOREIGN, 70, GYAOON, 0 + ; db $FF, 66, GOLEM, 67, OMASTAR, 67, KABUTOPS, 66, NIDOREIGN, 67, KLEAVOR, 70, GYAOON, 0 MistyData: db $FF, 19, HORSEA, 18, CHEEP, 18, BLOTTLE, 19, BLASTYKE, 21, STARMIE, 0 ; post-game rematch team (currently unused) - ; db $FF, 66, STARMIE, 67, PENDRAKEN, 67, JABETTA, 66, JAGG, 67, BLASTOISE, 70, GYARADOS, 0 + ; db $FF, 66, STARMIE, 67, PENDRAKEN, 67, JABETTA, 66, TOTARTLE, 67, JAGG, 70, GYARADOS, 0 LtSurgeData: db $FF, 22, VOLTORB, 21, GAOTORA, 22, MAGNEMITE, 23, ELECTABUZZ, 24, GOROCHU, 0 @@ -659,22 +661,22 @@ LtSurgeData: ErikaData: db $FF, 28, WEEPINBELL, 28, GLOOM, 29, CACTUS, 28, PARASECT, 31, TANGROWTH, 0 ; post-game rematch team (currently unused) - ; db $FF, 66, CACTUS, 67, BELLOSSOM, 67, VICTREEBEL, 66, DEER, 67, LEAFEON, 70, TANGROWTH, 0 + ; db $FF, 66, CACTUS, 67, BELLOSSOM, 67, EXEGGUTOR, 66, VENUSAUR, 67, LEAFEON, 70, TANGROWTH, 0 KogaData: db $FF, 39, VENOMOTH, 38, NIDOREIGN, 39, MUK, 39, WEEZING, 41, CROBAT, 0 ; post-game rematch team (currently unused) - ; db $FF, 66, TENTACRUEL, 67, MUK, 67, WEEZING, 66, VENOMOTH, 67, TSUBOMITTO, 70, CROBAT, 0 + ; db $FF, 66, TENTACRUEL, 67, MUK, 67, WEEZING, 66, VENOMOTH, 67, VICTREEBEL, 70, CROBAT, 0 BlaineData: db $FF, 45, RAPIDASH, 44, NINETALES, 45, ARCANINE, 44, FLAREON, 47, MAGMORTAR, 0 ; post-game rematch team (currently unused) - ; db $FF, 66, NINETALES, 67, ARCANINE, 67, RAPIDASH, 66, FLAREON, 67, MAGMORTAR, 70, MOLTRES, 0 + ; db $FF, 66, NINETALES, 67, ARCANINE, 67, RAPIDASH, 66, CHARIZARD, 67, MAGMORTAR, 70, MOLTRES, 0 SabrinaData: - db $FF, 39, JYNX, 40, MR_MIME, 39, SLOWKING, 40, HYPNO, 43, ALAKAZAM, 0 + db $FF, 39, ESPEON, 40, MR_MIME, 39, SLOWKING, 40, HYPNO, 43, ALAKAZAM, 0 ; post-game rematch team (currently unused) - ; db $FF, 66, JYNX, 67, HYPNO, 67, MR_MIME, 66, SLOWKING, 67, EXEGGUTOR, 70, ALAKAZAM, 0 + ; db $FF, 66, ESPEON, 67, MR_MIME, 67, HYPNO, 66, SLOWKING, 67, ALAKAZAM, 70, ARTICUNO_G, 0 GentlemanData: ; SS Anne 1F Rooms @@ -701,17 +703,23 @@ Green2Data: db $FF, 37, PIDGEOT, 38, GYARADOS, 35, GROWLITHE, 35, ALAKAZAM, 40, VENUSAUR, 0 db $FF, 37, PIDGEOT, 38, EXEGGCUTE, 35, GYARADOS, 35, ALAKAZAM, 40, CHARIZARD, 0 ; Route 22 - db $FF, 47, PIDGEOT, 45, RHYHORN, 45, GROWLITHE, 47, EXEGGCUTE, 50, ALAKAZAM, 53, TOTARTLE, 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 + db $FF, 47, MADAAMU, 45, RHYDON, 45, GROWLITHE, 47, EXEGGCUTE, 50, ALAKAZAM, 53, TOTARTLE, 0 + db $FF, 47, MADAAMU, 45, RHYDON, 45, GYARADOS, 47, GROWLITHE, 50, ALAKAZAM, 53, VENUSAUR, 0 + db $FF, 47, MADAAMU, 45, RHYDON, 45, EXEGGCUTE, 47, GYARADOS, 50, ALAKAZAM, 53, CHARIZARD, 0 Green3Data: - db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, ARCANINE, 63, EXEGGUTOR, 65, TOTARTLE, 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 + db $FF, 61, MADAAMU, 59, ALAKAZAM, 61, RHYPERIOR, 61, ARCANINE, 63, EXEGGUTOR, 65, TOTARTLE, 0 + db $FF, 61, MADAAMU, 59, ALAKAZAM, 61, RHYPERIOR, 61, GYARADOS, 63, ARCANINE, 65, VENUSAUR, 0 + db $FF, 61, MADAAMU, 59, ALAKAZAM, 61, RHYPERIOR, 61, EXEGGUTOR, 63, GYARADOS, 65, CHARIZARD, 0 +; post-game rematch teams (currently unused) + ; db $FF, 81, SCIZOR, 79, ALAKAZAM, 81, GOROCHU, 81, ARCANINE, 83, SNORLAX, 85, TOTARTLE, 0 + ; db $FF, 81, SCIZOR, 79, ALAKAZAM, 81, RHYPERIOR, 81, GYARADOS, 83, MAGMORTAR, 85, VENUSAUR, 0 + ; db $FF, 81, SCIZOR, 79, GOROCHU, 81, RHYPERIOR, 81, EXEGGUTOR, 83, CRYITHAN, 85, CHARIZARD, 0 LoreleiData: - db $FF, 54, DEWGONG, 53, CLOYSTER, 54, SLOWBRO, 55, JYNX, 55, BUU, 56, LAPRAS, 0 + db $FF, 54, DEWGONG, 53, CLOYSTER, 54, GLACEON, 55, JYNX, 55, BUU, 56, LAPRAS, 0 +; post-game rematch team (currently unused) + ; db $FF, 74, BUU, 73, DEWGONG, 74, GLACEON, 75, CLOYSTER, 75, LAPRAS, 76, ARTICUNO, 0 ChannelerData: ; Unused @@ -723,7 +731,7 @@ ChannelerData: db 23, MIKON, GASTLY, 0 db 24, VULPIX, 0 ; Unused - this will be used in the Silph Gauntlet - db 65, MAROWAK, NINETALES, GUARDIA, BARUNDA, MUK, GENGAR, 0 + db 65, GUARDIA, NINETALES, BARUNDA, HYPNO, MUK, GENGAR, 0 ; Pokémon Tower 3F db 25, GASTLY, HAUNTER, 0 ; Pokémon Tower 4F, now unused @@ -754,6 +762,11 @@ ChannelerData: AgathaData: db $FF, 57, CROAKOZUNA, 56, CROBAT, 56, TSUBOMITTO, 58, UMBREON, 58, ARBOK, 60, GENGAR, 0 +; post-game rematch team (currently unused) + ; db $FF, 77, CROAKOZUNA, 76, TSUBOMITTO, 76, UMBREON, 78, CROBAT, 78, GENGAR, 80, MOLTRES_G, 0 LanceData: db $FF, 58, CROCKY, 57, KINGDRA, 57, AERODACTYL, 59, CRYITHAN, 59, CHARIZARD, 62, DRAGONITE, 0 +; post-game rematch team (currently unused) + ; db $FF, 78, CROCKY, 77, KINGDRA, 77, AERODACTYL, 79, CHARIZARD, 79, CRYITHAN, 82, DRAGONITE, 0 + diff --git a/gfx/pokemon/back/articunogb.png b/gfx/pokemon/back/articunogb.png new file mode 100644 index 00000000..1d475521 Binary files /dev/null and b/gfx/pokemon/back/articunogb.png differ diff --git a/gfx/pokemon/back/moltresgb.png b/gfx/pokemon/back/moltresgb.png new file mode 100644 index 00000000..a5b9c17d Binary files /dev/null and b/gfx/pokemon/back/moltresgb.png differ diff --git a/gfx/pokemon/back/zapdosgb.png b/gfx/pokemon/back/zapdosgb.png new file mode 100644 index 00000000..8a3b7589 Binary files /dev/null and b/gfx/pokemon/back/zapdosgb.png differ diff --git a/gfx/pokemon/front/articunog.png b/gfx/pokemon/front/articunog.png new file mode 100644 index 00000000..ed628377 Binary files /dev/null and b/gfx/pokemon/front/articunog.png differ diff --git a/gfx/pokemon/front/moltresg.png b/gfx/pokemon/front/moltresg.png new file mode 100644 index 00000000..6c453f96 Binary files /dev/null and b/gfx/pokemon/front/moltresg.png differ diff --git a/gfx/pokemon/front/zapdosg.png b/gfx/pokemon/front/zapdosg.png new file mode 100644 index 00000000..821e17b1 Binary files /dev/null and b/gfx/pokemon/front/zapdosg.png differ diff --git a/maps/SilphCo1F.blk b/maps/SilphCo1F.blk index fca3d471..b1683c58 100644 --- a/maps/SilphCo1F.blk +++ b/maps/SilphCo1F.blk @@ -1 +1 @@ -<===========}>~""# FD[[FD  [[[[[[9 FD[[FD  FDFD  FHIIIX,WIIIIIIIJ \ No newline at end of file +<===<=}=>===}>~""#HXWJ FDFD [[ FD [[[[[[[9FD [[ FDFD  FHIIIX,WIIIIIIIJ \ No newline at end of file diff --git a/maps/SilphGauntlet1F.blk b/maps/SilphGauntlet1F.blk new file mode 100644 index 00000000..47be4d20 Binary files /dev/null and b/maps/SilphGauntlet1F.blk differ diff --git a/maps/SilphGauntlet2F.blk b/maps/SilphGauntlet2F.blk new file mode 100644 index 00000000..49d2e29f --- /dev/null +++ b/maps/SilphGauntlet2F.blk @@ -0,0 +1 @@ +..............@AB...(-......|- \ No newline at end of file diff --git a/maps/SilphGauntlet3F.blk b/maps/SilphGauntlet3F.blk new file mode 100644 index 00000000..c7e2c4ee --- /dev/null +++ b/maps/SilphGauntlet3F.blk @@ -0,0 +1 @@ +           78 78 78 7<;9 ;9 ;9 ;9     \ No newline at end of file diff --git a/maps/SilphGauntlet4F.blk b/maps/SilphGauntlet4F.blk new file mode 100644 index 00000000..331b6f32 Binary files /dev/null and b/maps/SilphGauntlet4F.blk differ diff --git a/maps/SilphGauntlet5F.blk b/maps/SilphGauntlet5F.blk new file mode 100644 index 00000000..2ec734e8 Binary files /dev/null and b/maps/SilphGauntlet5F.blk differ diff --git a/maps/SilphGauntlet6F.blk b/maps/SilphGauntlet6F.blk new file mode 100644 index 00000000..b383d9cc --- /dev/null +++ b/maps/SilphGauntlet6F.blk @@ -0,0 +1 @@ +@AAB@aaB@aaBD!qpqpFDSRSRFHIIJHIIJHwEJ@aaB@aaB@*+BDqp/F\]DSRF\]PwEJHIIJHwEJ@*+B@aaB@*+B\qpqp]\SRSR]HIIJHIIJHIIJ \ No newline at end of file diff --git a/maps/SilphGauntlet7F.blk b/maps/SilphGauntlet7F.blk new file mode 100644 index 00000000..95c142f6 --- /dev/null +++ b/maps/SilphGauntlet7F.blk @@ -0,0 +1 @@ +35$8*$*$9*&&&&. \ No newline at end of file