Merge branch 'master' into renewables

This commit is contained in:
Thorn Avery 2023-11-09 07:56:27 +11:00
commit 2b68600401
38 changed files with 536 additions and 591 deletions

View file

@ -29,8 +29,6 @@ In general, the following Pokemon are not available;
- Mime Jr.
- Happiny
- Munchlax
- Bittybat (prototype Zubat pre-evolution from Red and Green)
- Magnetite (prototype middle stage between Magnemite and Magneton)
- Elebaby (prototype Elekid pre-evolution in May98 GSC sprite cache)
- Burgela (SW97 Baby Tangela)
- Paraspor (SW97 Baby Paras)
@ -53,7 +51,7 @@ Changes at a glance:
- Bite is still Normal-type.
- The Clefairy, Mime Jr, and Jigglypuff lines are not Steel or Fairy-type, respectively.
- This (and Bite) was done to ensure the original Kanto Pokemon were unaltered in any way.
- While Magnemite and Magneton are pure Electric, Magnezone is part-Steel.
- While Magnemite, Magnetite and Magneton are pure Electric, Magnezone is part-Steel.
- Scream Tail remains Fairy/Psychic.
- Fire remains neutral against Ice.
- Bug and Poison remain super effective against each other.
@ -163,7 +161,7 @@ QoL Enhancements
- A feminine character option is now available, featuring the sprite from Pokemon Anniversary Red, which is based on Green's manga appearance.
- To accomodate this, Celadon Gym's trainers use their more neutral text from Crystal.
- The protagonist is also referred to in a gender neutral manner. This changes like, 2-3 lines in the whole game.
- All 151 original Pokemon, plus an additional 97, can be obtained without the use of trading or glitches, including Mew!
- All 151 original Pokemon, plus an additional 99, can be obtained without the use of trading or glitches, including Mew!
- Various moves have had their animations altered to be less intensive for photosensitive individuals, including every animation that was dimmed on the 3DS (Most notably Blizzard and Thunderbolt). This was done with the aim of also improving the move's animations overall, so some look a little flashier.
- Full list includes Body Slam, Glare, Disable, Blizzard, BubbleBeam, Confusion, Dream Eater, Explosion, Guillotine, Hyper Beam, Mega Kick, Mega Punch, Psychic, Reflect, Rock Slide, Selfdestruct, Spore, and Thunderbolt.
- PureRGB's AI enhancements are ported over; said hack was made by Vortiene. In general, it isn't as stupid as it was before.
@ -206,7 +204,7 @@ QoL Enhancements
- 3x 7s now gives 900 coins (used to be 300)
- Game Corner prizes have been altered;
- Prices have been changed, so Porygon doesn't require 9999 coins.
- New prizes include: Cubone, Cactus, and Squeamata
- New prizes include: Cubone, Cactormus, and Squeamata
- The Moon Stone is available over TM23 (Dragon Rage). Dragon Rage is still available in Celadon University!
- Spinner tiles move faster.
- Fight Debug now allows moves other than Pound.
@ -309,6 +307,7 @@ New Pokemon:
- Weepinbell -> Bellignan | Use Poison Stone
Kanto Beta Pokemon:
- Bittybat -> Zubat | L14
- Blastyke -> Blastoise | L36
- Blottle -> Pendraken | L30
- Cheep -> Jabetta | L30
@ -319,6 +318,7 @@ Kanto Beta Pokemon:
- Pupal -> Carapthor | L10
- Kotora -> Gaotora -> Gorotora | L16, L36
- Kolta -> Ponyta | L20
- Magnemite -> Magnetite -> Magneton | L20, L30
- Nidorino OR Nidorina -> Nidoreign | Moon Stone
- Psyduck -> Weirduck -> Golduck | L22, L33
- Raichu -> Gorochu | Trade

View file

@ -4,7 +4,7 @@
; - MonPartyData (see data/pokemon/menu_icons.asm)
; - MonsterPalettes (see data/pokemon/palettes.asm)
const_def 1
const DEX_BULBASAUR ; 1 (001) - Pallet Town
const DEX_BULBASAUR ; 1 (001) - Starter Pokemon
const DEX_IVYSAUR ; 2 (002)
const DEX_VENUSAUR ; 3 (003)
const DEX_CHARMANDER ; 4 (004)
@ -26,13 +26,13 @@
const DEX_LEAFEON ; (020)
const DEX_GLACEON ; (021)
const DEX_SYLVEON ; (022)
const DEX_RATTATA ; 19 (023) - Route 1
const DEX_RATTATA ; 19 (023) - Route 1 to Pewter City
const DEX_RATICATE ; 20 (024)
const DEX_RATICATE_A ; (025)
const DEX_PIDGEY ; 16 (026)
const DEX_PIDGEOTTO ; 17 (027)
const DEX_PIDGEOT ; 18 (028)
const DEX_COINPUR ; (029) - Route 2 + Viridian Forest
const DEX_COINPUR ; (029)
const DEX_MEOWTH ; 52 (030)
const DEX_PERSIAN ; 53 (031)
const DEX_PERSIAN_A ; (032)
@ -58,199 +58,201 @@
const DEX_NIDORINO ; 33 (052)
const DEX_NIDOKING ; 34 (053)
const DEX_NIDOREIGN ; (054)
const DEX_ZUBAT ; 41 (055)
const DEX_GOLBAT ; 42 (056)
const DEX_CROBAT ; (057)
const DEX_GEODUDE ; 74 (058)
const DEX_GRAVELER ; 75 (059)
const DEX_GOLEM ; 76 (060)
const DEX_GOLEM_A ; (061)
const DEX_PARAS ; 46 (062)
const DEX_PARASECT ; 47 (063)
const DEX_CLEFAIRY ; 35 (064)
const DEX_CLEFABLE ; 36 (065)
const DEX_JIGGLYPUFF ; 39 (066)
const DEX_WIGGLYTUFF ; 40 (067)
const DEX_SANDSHREW ; 27 (068)
const DEX_SANDSLASH ; 28 (069)
const DEX_SANDSLASH_A ; (070)
const DEX_EKANS ; 23 (071) - Route 4
const DEX_ARBOK ; 24 (072)
const DEX_VULPIII ; (073)
const DEX_VULPIX ; 37 (074)
const DEX_NINETALES ; 38 (075)
const DEX_NINETALES_A ; (076)
const DEX_MANKEY ; 56 (077)
const DEX_PRIMEAPE ; 57 (078)
const DEX_ANNIHILAPE ; (079)
const DEX_ODDISH ; 43 (080) - Route 6 + Route 24 + Route 25 + Fishing Rod 1
const DEX_GLOOM ; 44 (081)
const DEX_VILEPLUME ; 45 (082)
const DEX_BELLOSSOM ; (083)
const DEX_BELLSPROUT ; 69 (084)
const DEX_WEEPINBELL ; 70 (085)
const DEX_VICTREEBEL ; 71 (086)
const DEX_BELLIGNAN ; (087)
const DEX_MAGIKARP ; 129 (088)
const DEX_GYARADOS ; 130 (089)
const DEX_ORFRY ; (090)
const DEX_GOLDEEN ; 118 (091)
const DEX_SEAKING ; 119 (092)
const DEX_VENONAT ; 48 (093)
const DEX_VENOMOTH ; 49 (094)
const DEX_PSYDUCK ; 54 (095)
const DEX_WEIRDUCK ; (096)
const DEX_GOLDUCK ; 55 (097)
const DEX_POLIWAG ; 60 (098)
const DEX_POLIWHIRL ; 61 (099)
const DEX_POLIWRATH ; 62 (100)
const DEX_POLITOED ; (101)
const DEX_ABRA ; 63 (102)
const DEX_KADABRA ; 64 (103)
const DEX_ALAKAZAM ; 65 (104)
const DEX_GROWLITHE ; 58 (105)
const DEX_ARCANINE ; 59 (106)
const DEX_ARCANINE_H ; (107)
const DEX_BITTYBAT ; 41 (055)
const DEX_ZUBAT ; 41 (056)
const DEX_GOLBAT ; 42 (057)
const DEX_CROBAT ; (058)
const DEX_GEODUDE ; 74 (059)
const DEX_GRAVELER ; 75 (060)
const DEX_GOLEM ; 76 (061)
const DEX_GOLEM_A ; (062)
const DEX_PARAS ; 46 (063)
const DEX_PARASECT ; 47 (064)
const DEX_CLEFAIRY ; 35 (065)
const DEX_CLEFABLE ; 36 (066)
const DEX_JIGGLYPUFF ; 39 (067)
const DEX_WIGGLYTUFF ; 40 (068)
const DEX_SANDSHREW ; 27 (069)
const DEX_SANDSLASH ; 28 (070)
const DEX_SANDSLASH_A ; (071)
const DEX_EKANS ; 23 (072) - Route 4 to Cerulean City
const DEX_ARBOK ; 24 (073)
const DEX_VULPIII ; (074)
const DEX_VULPIX ; 37 (075)
const DEX_NINETALES ; 38 (076)
const DEX_NINETALES_A ; (077)
const DEX_MANKEY ; 56 (078)
const DEX_PRIMEAPE ; 57 (079)
const DEX_ANNIHILAPE ; (080)
const DEX_ODDISH ; 43 (081) - Route 24 + Route 25 + Fishing Rod 1
const DEX_GLOOM ; 44 (082)
const DEX_VILEPLUME ; 45 (083)
const DEX_BELLOSSOM ; (084)
const DEX_BELLSPROUT ; 69 (085)
const DEX_WEEPINBELL ; 70 (086)
const DEX_VICTREEBEL ; 71 (087)
const DEX_BELLIGNAN ; (088)
const DEX_MAGIKARP ; 129 (089)
const DEX_GYARADOS ; 130 (090)
const DEX_ORFRY ; (091)
const DEX_GOLDEEN ; 118 (092)
const DEX_SEAKING ; 119 (093)
const DEX_VENONAT ; 48 (094)
const DEX_VENOMOTH ; 49 (095)
const DEX_PSYDUCK ; 54 (096)
const DEX_WEIRDUCK ; (097)
const DEX_GOLDUCK ; 55 (098)
const DEX_POLIWAG ; 60 (099)
const DEX_POLIWHIRL ; 61 (100)
const DEX_POLIWRATH ; 62 (101)
const DEX_POLITOED ; (102)
const DEX_ABRA ; 63 (103)
const DEX_KADABRA ; 64 (104)
const DEX_ALAKAZAM ; 65 (105)
const DEX_CHEEP ; (106)
const DEX_JABETTA ; (107)
const DEX_LICKITUNG ; 108 (108) (There's a reason we're keeping Lickitung's number.)
const DEX_LICKILICKY ; (109)
const DEX_FARFETCHD ; 83 (110)
const DEX_LUXWAN ; (111)
const DEX_SIRFETCHD ; (112)
const DEX_DROWZEE ; 96 (113) - Route 11 + Diglett's Cave
const DEX_HYPNO ; 97 (114)
const DEX_DIGLETT ; 50 (115)
const DEX_DUGTRIO ; 51 (116)
const DEX_DUGTRIO_A ; (117)
const DEX_WIGLETT ; (118)
const DEX_WUGTRIO ; (119)
const DEX_ONIX ; 95 (120)
const DEX_STEELIX ; (121)
const DEX_VOLTORB ; 100 (122) - Route 10 + Rock Tunnel + Fishing Rod 2
const DEX_ELECTRODE ; 101 (123)
const DEX_ELECTRODE_H ; (124)
const DEX_TENTACOOL ; 72 (125)
const DEX_TENTACRUEL ; 73 (126)
const DEX_TOEDSCOOL ; (127)
const DEX_TOEDSCRUEL ; (128)
const DEX_BLOTTLE ; (129)
const DEX_PENDRAKEN ; (130)
const DEX_MAGNEMITE ; 81 (131)
const DEX_MAGNETON ; 82 (132)
const DEX_MAGNEZONE ; (133)
const DEX_CHEEP ; (134)
const DEX_JABETTA ; (135)
const DEX_RIBBITO ; (136)
const DEX_CROAKOZUNA ; (137)
const DEX_MACHOP ; 66 (138)
const DEX_MACHOKE ; 67 (139)
const DEX_MACHAMP ; 68 (140)
const DEX_KRABBY ; 98 (141)
const DEX_KINGLER ; 99 (142)
const DEX_SLOWPOKE ; 79 (143)
const DEX_SLOWBRO ; 80 (144)
const DEX_SLOWBRO_G ; (145)
const DEX_SLOWKING ; (146)
const DEX_SLOWKING_G ; (147)
const DEX_GAVILLAIN ; (148)
const DEX_KOLTA ; (149) - Route 7 + Route 8
const DEX_PONYTA ; 77 (150)
const DEX_RAPIDASH ; 78 (151)
const DEX_RAPIDASH_G ; (152)
const DEX_BALUMBA ; (153)
const DEX_GASTLY ; 92 (154) - Lavender Tower
const DEX_HAUNTER ; 93 (155)
const DEX_GENGAR ; 94 (156)
const DEX_CUBONE ; 104 (157)
const DEX_MAROWAK ; 105 (158)
const DEX_MAROWAK_A ; (159)
const DEX_GUARDIA ; (160)
const DEX_DODUO ; 84 (161) - Route 16 - 19
const DEX_DODRIO ; 85 (162)
const DEX_GRIMER ; 88 (163)
const DEX_MUK ; 89 (164)
const DEX_MUK_A ; (165)
const DEX_KOFFING ; 109 (166)
const DEX_WEEZING ; 110 (167)
const DEX_WEEZING_G ; (168)
const DEX_TANGELA ; 114 (169)
const DEX_TANGROWTH ; (170)
const DEX_RAMOOSE ; (171)
const DEX_HITMONLEE ; 106 (172) - Saffron City
const DEX_HITMONCHAN ; 107 (173)
const DEX_HITMONTOP ; (174)
const DEX_SHELLDER ; 90 (175) - Surfing, Fishing Rod 3, Seafoam Islands
const DEX_CLOYSTER ; 91 (176)
const DEX_DISTURBAN ; (177)
const DEX_STARYU ; 120 (178)
const DEX_STARMIE ; 121 (179)
const DEX_GROWLITHE ; 58 (110) - Route 6 - Route 11
const DEX_ARCANINE ; 59 (111)
const DEX_ARCANINE_H ; (112)
const DEX_FARFETCHD ; 83 (113)
const DEX_LUXWAN ; (114)
const DEX_SIRFETCHD ; (115)
const DEX_DROWZEE ; 96 (116)
const DEX_HYPNO ; 97 (117)
const DEX_MAGNEMITE ; 81 (118)
const DEX_MAGNETITE ; (119)
const DEX_MAGNETON ; 82 (120)
const DEX_MAGNEZONE ; (121)
const DEX_DIGLETT ; 50 (122)
const DEX_DUGTRIO ; 51 (123)
const DEX_DUGTRIO_A ; (124)
const DEX_WIGLETT ; (125)
const DEX_WUGTRIO ; (126)
const DEX_ONIX ; 95 (127)
const DEX_STEELIX ; (128)
const DEX_VOLTORB ; 100 (129) - Route 10 - Rock Tunnel + Fishing Rod 2
const DEX_ELECTRODE ; 101 (130)
const DEX_ELECTRODE_H ; (131)
const DEX_TENTACOOL ; 72 (132)
const DEX_TENTACRUEL ; 73 (133)
const DEX_TOEDSCOOL ; (134)
const DEX_TOEDSCRUEL ; (135)
const DEX_BLOTTLE ; (136)
const DEX_PENDRAKEN ; (137)
const DEX_RIBBITO ; (138)
const DEX_CROAKOZUNA ; (139)
const DEX_MACHOP ; 66 (140)
const DEX_MACHOKE ; 67 (141)
const DEX_MACHAMP ; 68 (142)
const DEX_KRABBY ; 98 (143)
const DEX_KINGLER ; 99 (144)
const DEX_SLOWPOKE ; 79 (145)
const DEX_SLOWBRO ; 80 (146)
const DEX_SLOWBRO_G ; (147)
const DEX_SLOWKING ; (148)
const DEX_SLOWKING_G ; (149)
const DEX_GAVILLAIN ; (150)
const DEX_KOLTA ; (151) - Route 7 + Route 8
const DEX_PONYTA ; 77 (152)
const DEX_RAPIDASH ; 78 (153)
const DEX_RAPIDASH_G ; (154)
const DEX_GASTLY ; 92 (155) - Lavender Tower
const DEX_HAUNTER ; 93 (156)
const DEX_GENGAR ; 94 (157)
const DEX_CUBONE ; 104 (158)
const DEX_MAROWAK ; 105 (159)
const DEX_MAROWAK_A ; (160)
const DEX_GUARDIA ; (161)
const DEX_BALUMBA ; (162)
const DEX_DODUO ; 84 (163) - Route 16 - 19
const DEX_DODRIO ; 85 (164)
const DEX_GRIMER ; 88 (165)
const DEX_MUK ; 89 (166)
const DEX_MUK_A ; (167)
const DEX_KOFFING ; 109 (168)
const DEX_WEEZING ; 110 (169)
const DEX_WEEZING_G ; (170)
const DEX_TANGELA ; 114 (171)
const DEX_TANGROWTH ; (172)
const DEX_RAMOOSE ; (173)
const DEX_HITMONLEE ; 106 (174) - Saffron City
const DEX_HITMONCHAN ; 107 (175)
const DEX_HITMONTOP ; (176)
const DEX_HORSEA ; 116 (177) - Surfing, Fishing Rod 3, Seafoam Islands
const DEX_SEADRA ; 117 (178)
const DEX_KINGDRA ; (179)
const DEX_SEEL ; 86 (180)
const DEX_DEWGONG ; 87 (181)
const DEX_HORSEA ; 116 (182)
const DEX_SEADRA ; 117 (183)
const DEX_KINGDRA ; (184)
const DEX_BLASTYKE ; (185)
const DEX_BLASTOISE ; 9 (186)
const DEX_SHARPOON ; (187)
const DEX_EXEGGCUTE ; 102 (188) - Safari Zone
const DEX_EXEGGUTOR ; 103 (189)
const DEX_EXEGGUTOR_A ; (190)
const DEX_RHYHORN ; 111 (191)
const DEX_RHYDON ; 112 (192)
const DEX_RHYPERIOR ; (193)
const DEX_SCYTHER ; 123 (194)
const DEX_SCIZOR ; (195)
const DEX_KLEAVOR ; (196)
const DEX_PINSIR ; 127 (197)
const DEX_TRICULES ; (198)
const DEX_KANGASKHAN ; 115 (199)
const DEX_TRAMPEL ; (200)
const DEX_TAUROS ; 128 (201)
const DEX_TAUROS_P ; (202)
const DEX_TAUROS_PB ; (203)
const DEX_TAUROS_PA ; (204)
const DEX_CHANSEY ; 113 (205)
const DEX_BLISSEY ; (206)
const DEX_CACTORMUS ; (207) - Rare/Special Pokemon
const DEX_MR_MIME ; 122 (208)
const DEX_MR_RIME ; (209)
const DEX_JYNX ; 124 (210)
const DEX_BUU ; (211)
const DEX_ELECTABUZZ ; 125 (212)
const DEX_ELECTIVIRE ; (213)
const DEX_MAGMAR ; 126 (214)
const DEX_MAGMORTAR ; (215)
const DEX_LAPRAS ; 131 (216)
const DEX_DITTO ; 132 (217)
const DEX_MIMMEO ; (218)
const DEX_PORYGON ; 137 (219)
const DEX_PORYGON2 ; (220)
const DEX_PORYGONZ ; (221)
const DEX_OMANYTE ; 138 (222)
const DEX_OMASTAR ; 139 (223)
const DEX_KABUTO ; 140 (224)
const DEX_KABUTOPS ; 141 (225)
const DEX_AERODACTYL ; 142 (226)
const DEX_DECILLA ; (227)
const DEX_GAWARHED ; (228)
const DEX_OMEGADGE ; (229)
const DEX_SNORLAX ; 143 (230)
const DEX_SCREAM_TAIL ; (231) - Paradoxes, (Pseudo-)Legendary and Mythical Pokemon
const DEX_SANDY_SHOCKS ; (232)
const DEX_SQUEAMATA ; (233)
const DEX_MINISTARE ; (234)
const DEX_IGUANARCH ; (235)
const DEX_DRATINI ; 147 (236)
const DEX_DRAGONAIR ; 148 (237)
const DEX_DRAGONITE ; 149 (238)
const DEX_ARTICUNO ; 144 (239)
const DEX_ARTICUNO_G ; (240)
const DEX_ZAPDOS ; 145 (241)
const DEX_ZAPDOS_G ; (242)
const DEX_MOLTRES ; 146 (243)
const DEX_MOLTRES_G ; (244)
const DEX_MEWTWO ; 150 (245)
const DEX_MEW ; 151 (246)
const DEX_MELTAN ; (247)
const DEX_MELMETAL ; (248)
const DEX_SHELLDER ; 90 (182)
const DEX_CLOYSTER ; 91 (183)
const DEX_DISTURBAN ; (184)
const DEX_STARYU ; 120 (185)
const DEX_STARMIE ; 121 (186)
const DEX_BLASTYKE ; (187)
const DEX_BLASTOISE ; 9 (188)
const DEX_SHARPOON ; (189)
const DEX_EXEGGCUTE ; 102 (190) - Safari Zone
const DEX_EXEGGUTOR ; 103 (191)
const DEX_EXEGGUTOR_A ; (192)
const DEX_RHYHORN ; 111 (193)
const DEX_RHYDON ; 112 (194)
const DEX_RHYPERIOR ; (195)
const DEX_SCYTHER ; 123 (196)
const DEX_SCIZOR ; (197)
const DEX_KLEAVOR ; (198)
const DEX_PINSIR ; 127 (199)
const DEX_TRICULES ; (200)
const DEX_KANGASKHAN ; 115 (201)
const DEX_TRAMPEL ; (202)
const DEX_TAUROS ; 128 (203)
const DEX_TAUROS_P ; (204)
const DEX_TAUROS_PB ; (205)
const DEX_TAUROS_PA ; (206)
const DEX_CHANSEY ; 113 (207)
const DEX_BLISSEY ; (208)
const DEX_CACTORMUS ; (209) - Rare/Special Pokemon
const DEX_MR_MIME ; 122 (210)
const DEX_MR_RIME ; (211)
const DEX_JYNX ; 124 (212)
const DEX_BUU ; (213)
const DEX_ELECTABUZZ ; 125 (214)
const DEX_ELECTIVIRE ; (215)
const DEX_MAGMAR ; 126 (216)
const DEX_MAGMORTAR ; (217)
const DEX_LAPRAS ; 131 (218)
const DEX_DITTO ; 132 (219)
const DEX_MIMMEO ; (220)
const DEX_PORYGON ; 137 (221)
const DEX_PORYGON2 ; (222)
const DEX_PORYGONZ ; (223)
const DEX_OMANYTE ; 138 (224)
const DEX_OMASTAR ; 139 (225)
const DEX_KABUTO ; 140 (226)
const DEX_KABUTOPS ; 141 (227)
const DEX_AERODACTYL ; 142 (228)
const DEX_DECILLA ; (229)
const DEX_GAWARHED ; (230)
const DEX_OMEGADGE ; (231)
const DEX_SNORLAX ; 143 (232)
const DEX_SCREAM_TAIL ; (233) - Paradoxes, (Pseudo-)Legendary and Mythical Pokemon
const DEX_SANDY_SHOCKS ; (234)
const DEX_SQUEAMATA ; (235)
const DEX_MINISTARE ; (236)
const DEX_IGUANARCH ; (237)
const DEX_DRATINI ; 147 (238)
const DEX_DRAGONAIR ; 148 (239)
const DEX_DRAGONITE ; 149 (240)
const DEX_ARTICUNO ; 144 (241)
const DEX_ARTICUNO_G ; (242)
const DEX_ZAPDOS ; 145 (243)
const DEX_ZAPDOS_G ; (244)
const DEX_MOLTRES ; 146 (245)
const DEX_MOLTRES_G ; (246)
const DEX_MEWTWO ; 150 (247)
const DEX_MEW ; 151 (248)
const DEX_MELTAN ; (249)
const DEX_MELMETAL ; (250)
DEF NUM_POKEMON EQU const_value - 1

View file

@ -75,7 +75,7 @@
const DRAGONITE ; $42
const CACTORMUS ; $43 (new)
const SHARPOON ; $44 (new)
const WIGLETT ; $45 (new)
const BITTYBAT ; $45 (new)
const DODUO ; $46
const POLIWAG ; $47
const JYNX ; $48
@ -146,7 +146,7 @@
const DECILLA ; $89 (new)
const KINGLER ; $8A
const CLOYSTER ; $8B
const WUGTRIO ; $8C (new)
const MAGNETITE ; $8C (new)
const ELECTRODE ; $8D
const CLEFABLE ; $8E
const WEEZING ; $8F
@ -197,67 +197,69 @@
const BELLSPROUT ; $BC
const WEEPINBELL ; $BD
const VICTREEBEL ; $BE
const SCIZOR ; $BF (new pokemon start here)
const RHYPERIOR ; $C0
const ESPEON ; $C1
const UMBREON ; $C2
const LEAFEON ; $C3
const GLACEON ; $C4
const SYLVEON ; $C5
const LICKILICKY ; $C6
const TANGROWTH ; $C7
const KLEAVOR ; $C8
const BELLIGNAN ; $C9
const STEELIX ; $CA
const BLISSEY ; $CB
const HITMONTOP ; $CC
const CROBAT ; $CD
const MIMMEO ; $CE
const BELLOSSOM ; $CF
const PORYGON2 ; $D0
const KINGDRA ; $D1
const POLITOED ; $D2
const SLOWKING ; $D3
const ELECTIVIRE ; $D4
const MAGMORTAR ; $D5
const DISTURBAN ; $D6
const GENTLARVA ; $D7
const PUPAL ; $D8
const CARAPTHOR ; $D9
const MAGNEZONE ; $DA
const PORYGONZ ; $DB
const ANNIHILAPE ; $DC
const SCREAM_TAIL ; $DD
const SANDY_SHOCKS ; $DE
const TOEDSCOOL ; $DF
const TOEDSCRUEL ; $E0
const PERRSERKER ; $E1
const SIRFETCHD ; $E2
const MR_RIME ; $E3
const MELTAN ; $E4
const MELMETAL ; $E5
const ARCANINE_H ; $E6
const ELECTRODE_H ; $E7
const RATICATE_A ; $E8
const RAICHU_A ; $E9
const SANDSLASH_A ; $EA
const NINETALES_A ; $EB
const DUGTRIO_A ; $EC
const PERSIAN_A ; $ED
const GOLEM_A ; $EE
const RAPIDASH_G ; $EF
const SLOWBRO_G ; $F0
const SLOWKING_G ; $F1
const MUK_A ; $F2
const EXEGGUTOR_A ; $F3
const MAROWAK_A ; $F4
const WEEZING_G ; $F5
const TAUROS_P ; $F6
const TAUROS_PA ; $F7
const TAUROS_PB ; $F8
const FOSSIL_KABUTOPS ; $F9 (was B6)
const FOSSIL_AERODACTYL ; $FA (was B7)
const MON_GHOST ; $FB (was B8)
const WIGLETT ; $BF (new pokemon start here)
const WUGTRIO ; $C0
const SCIZOR ; $C1
const RHYPERIOR ; $C2
const ESPEON ; $C3
const UMBREON ; $C4
const LEAFEON ; $C5
const GLACEON ; $C6
const SYLVEON ; $C7
const LICKILICKY ; $C8
const TANGROWTH ; $C9
const KLEAVOR ; $CA
const BELLIGNAN ; $CB
const STEELIX ; $CC
const BLISSEY ; $CD
const HITMONTOP ; $CE
const CROBAT ; $CF
const MIMMEO ; $D0
const BELLOSSOM ; $D1
const PORYGON2 ; $D2
const KINGDRA ; $D3
const POLITOED ; $D4
const SLOWKING ; $D5
const ELECTIVIRE ; $D6
const MAGMORTAR ; $D7
const DISTURBAN ; $D8
const GENTLARVA ; $D9
const PUPAL ; $DA
const CARAPTHOR ; $DB
const MAGNEZONE ; $DC
const PORYGONZ ; $DD
const ANNIHILAPE ; $DE
const SCREAM_TAIL ; $DF
const SANDY_SHOCKS ; $E0
const TOEDSCOOL ; $E1
const TOEDSCRUEL ; $E2
const PERRSERKER ; $E3
const SIRFETCHD ; $E4
const MR_RIME ; $E5
const MELTAN ; $E6
const MELMETAL ; $E7
const ARCANINE_H ; $E8
const ELECTRODE_H ; $E9
const RATICATE_A ; $EA
const RAICHU_A ; $EB
const SANDSLASH_A ; $EC
const NINETALES_A ; $ED
const DUGTRIO_A ; $EE
const PERSIAN_A ; $EF
const GOLEM_A ; $F0
const RAPIDASH_G ; $F1
const SLOWBRO_G ; $F2
const SLOWKING_G ; $F3
const MUK_A ; $F4
const EXEGGUTOR_A ; $F5
const MAROWAK_A ; $F6
const WEEZING_G ; $F7
const TAUROS_P ; $F8
const TAUROS_PA ; $F9
const TAUROS_PB ; $FA
const FOSSIL_KABUTOPS ; $FB (was B6)
const FOSSIL_AERODACTYL ; $FC (was B7)
const MON_GHOST ; $FD (was B8)
DEF NUM_POKEMON_INDEXES EQU const_value - 1

View file

@ -59,6 +59,7 @@ PokemonCries::
mon_cry CRY_NIDORAN_M, 44, 320 ; NIDORINO
mon_cry CRY_RAICHU, 0, 256 ; NIDOKING
mon_cry CRY_NIDOQUEEN, 44, 256 ; NIDOREIGN
mon_cry CRY_SQUIRTLE, 180, 206 ; BITTYBAT
mon_cry CRY_SQUIRTLE, 224, 256 ; ZUBAT
mon_cry CRY_SQUIRTLE, 250, 256 ; GOLBAT
mon_cry CRY_SQUIRTLE, -16, 320 ; CROBAT
@ -109,16 +110,22 @@ PokemonCries::
mon_cry CRY_METAPOD, 192, 129 ; ABRA
mon_cry CRY_METAPOD, 168, 320 ; KADABRA
mon_cry CRY_METAPOD, 152, 383 ; ALAKAZAM
mon_cry CRY_RATTATA, 255, 192 ; CHEEP
mon_cry CRY_RATTATA, 50, 383 ; JABETTA
mon_cry CRY_SEEL, 0, 256 ; LICKITUNG
mon_cry CRY_NIDORAN_M, 0, 0 ; LICKILICKY (incomplete)
mon_cry CRY_GROWLITHE, 32, 192 ; GROWLITHE
mon_cry CRY_WEEDLE, 0, 256 ; ARCANINE
mon_cry CRY_WEEDLE, 0, 256 ; ARCANINE_H
mon_cry CRY_SEEL, 0, 256 ; LICKITUNG
mon_cry CRY_NIDORAN_M, 0, 0 ; LICKILICKY (incomplete)
mon_cry CRY_SPEAROW, 221, 129 ; FARFETCHD
mon_cry CRY_FEAROW, 25, 383 ; LUXWAN
mon_cry CRY_SPEAROW, -112, 192 ; SIRFETCHD
mon_cry CRY_DROWZEE, 136, 160 ; DROWZEE
mon_cry CRY_DROWZEE, 238, 192 ; HYPNO
mon_cry CRY_METAPOD, 128, 224 ; MAGNEMITE
mon_cry CRY_METAPOD, 177, 272 ; MAGNETITE
mon_cry CRY_METAPOD, 32, 320 ; MAGNETON
mon_cry CRY_NIDORAN_M, 0, 0 ; MAGNEZONE (incomplete)
mon_cry CRY_DIGLETT, 170, 129 ; DIGLETT
mon_cry CRY_DIGLETT, 42, 144 ; DUGTRIO
mon_cry CRY_DIGLETT, 42, 144 ; DUGTRIO_A
@ -135,11 +142,6 @@ PokemonCries::
mon_cry CRY_NIDORAN_M, 0, 0 ; TOEDSCRUEL (incomplete)
mon_cry CRY_BLASTOISE, 147, 128 ; BLOTTLE
mon_cry CRY_BLASTOISE, 60, 128 ; PENDRAKEN
mon_cry CRY_METAPOD, 128, 224 ; MAGNEMITE
mon_cry CRY_METAPOD, 32, 320 ; MAGNETON
mon_cry CRY_NIDORAN_M, 0, 0 ; MAGNEZONE (incomplete)
mon_cry CRY_RATTATA, 255, 192 ; CHEEP
mon_cry CRY_RATTATA, 50, 383 ; JABETTA
mon_cry CRY_GOLEM, 147, 224 ; RIBBITO
mon_cry CRY_GOLEM, 37, 383 ; CROAKOZUNA
mon_cry CRY_GROWLITHE, 238, 129 ; MACHOP
@ -157,7 +159,6 @@ PokemonCries::
mon_cry CRY_WEEPINBELL, 0, 256 ; PONYTA
mon_cry CRY_WEEPINBELL, 32, 320 ; RAPIDASH
mon_cry CRY_WEEPINBELL, 32, 320 ; RAPIDASH_G
mon_cry CRY_PIDGEY, 0, 256 ; BALUMBA
mon_cry CRY_METAPOD, 0, 256 ; GASTLY
mon_cry CRY_METAPOD, 48, 192 ; HAUNTER
mon_cry CRY_MUK, 0, 383 ; GENGAR
@ -165,6 +166,7 @@ PokemonCries::
mon_cry CRY_ODDISH, 79, 224 ; MAROWAK
mon_cry CRY_ODDISH, 79, 224 ; MAROWAK_A
mon_cry CRY_ODDISH, 0, 383 ; GUARDIA
mon_cry CRY_PIDGEY, 0, 256 ; BALUMBA
mon_cry CRY_DIGLETT, 187, 129 ; DODUO
mon_cry CRY_DIGLETT, 153, 160 ; DODRIO
mon_cry CRY_GRIMER, 0, 256 ; GRIMER
@ -179,16 +181,16 @@ PokemonCries::
mon_cry CRY_GOLEM, 128, 320 ; HITMONLEE
mon_cry CRY_SEEL, 238, 320 ; HITMONCHAN
mon_cry CRY_SLUGMA, 0, 256 ; HITMONTOP
mon_cry CRY_CLEFAIRY, 153, 144 ; HORSEA
mon_cry CRY_CLEFAIRY, 60, 129 ; SEADRA
mon_cry CRY_SLUGMA, 763, 256 ; KINGDRA
mon_cry CRY_SEEL, 136, 320 ; SEEL
mon_cry CRY_SEEL, 35, 383 ; DEWGONG
mon_cry CRY_FEAROW, 0, 256 ; SHELLDER
mon_cry CRY_FEAROW, 111, 352 ; CLOYSTER
mon_cry CRY_TOTODILE, 512, 320 ; DISTURBAN
mon_cry CRY_PARAS, 2, 160 ; STARYU
mon_cry CRY_PARAS, 0, 256 ; STARMIE
mon_cry CRY_SEEL, 136, 320 ; SEEL
mon_cry CRY_SEEL, 35, 383 ; DEWGONG
mon_cry CRY_CLEFAIRY, 153, 144 ; HORSEA
mon_cry CRY_CLEFAIRY, 60, 129 ; SEADRA
mon_cry CRY_SLUGMA, 763, 256 ; KINGDRA
mon_cry CRY_BLASTOISE, 247, 128 ; BLASTYKE
mon_cry CRY_BLASTOISE, 0, 256 ; BLASTOISE
mon_cry CRY_GOROCHU, 16, 272 ; SHARPOON

View file

@ -54,6 +54,7 @@ INCLUDE "data/pokemon/base_stats/nidoranm.asm"
INCLUDE "data/pokemon/base_stats/nidorino.asm"
INCLUDE "data/pokemon/base_stats/nidoking.asm"
INCLUDE "data/pokemon/base_stats/nidoreign.asm"
INCLUDE "data/pokemon/base_stats/bittybat.asm"
INCLUDE "data/pokemon/base_stats/zubat.asm"
INCLUDE "data/pokemon/base_stats/golbat.asm"
INCLUDE "data/pokemon/base_stats/crobat.asm"
@ -104,16 +105,22 @@ INCLUDE "data/pokemon/base_stats/politoed.asm"
INCLUDE "data/pokemon/base_stats/abra.asm"
INCLUDE "data/pokemon/base_stats/kadabra.asm"
INCLUDE "data/pokemon/base_stats/alakazam.asm"
INCLUDE "data/pokemon/base_stats/cheep.asm"
INCLUDE "data/pokemon/base_stats/jabetta.asm"
INCLUDE "data/pokemon/base_stats/lickitung.asm"
INCLUDE "data/pokemon/base_stats/lickilicky.asm"
INCLUDE "data/pokemon/base_stats/growlithe.asm"
INCLUDE "data/pokemon/base_stats/arcanine.asm"
INCLUDE "data/pokemon/base_stats/arcanineh.asm"
INCLUDE "data/pokemon/base_stats/lickitung.asm"
INCLUDE "data/pokemon/base_stats/lickilicky.asm"
INCLUDE "data/pokemon/base_stats/farfetchd.asm"
INCLUDE "data/pokemon/base_stats/luxwan.asm"
INCLUDE "data/pokemon/base_stats/sirfetchd.asm"
INCLUDE "data/pokemon/base_stats/drowzee.asm"
INCLUDE "data/pokemon/base_stats/hypno.asm"
INCLUDE "data/pokemon/base_stats/magnemite.asm"
INCLUDE "data/pokemon/base_stats/magnetite.asm"
INCLUDE "data/pokemon/base_stats/magneton.asm"
INCLUDE "data/pokemon/base_stats/magnezone.asm"
INCLUDE "data/pokemon/base_stats/diglett.asm"
INCLUDE "data/pokemon/base_stats/dugtrio.asm"
INCLUDE "data/pokemon/base_stats/dugtrioa.asm"
@ -130,11 +137,6 @@ INCLUDE "data/pokemon/base_stats/toedscool.asm"
INCLUDE "data/pokemon/base_stats/toedscruel.asm"
INCLUDE "data/pokemon/base_stats/blottle.asm"
INCLUDE "data/pokemon/base_stats/pendraken.asm"
INCLUDE "data/pokemon/base_stats/magnemite.asm"
INCLUDE "data/pokemon/base_stats/magneton.asm"
INCLUDE "data/pokemon/base_stats/magnezone.asm"
INCLUDE "data/pokemon/base_stats/cheep.asm"
INCLUDE "data/pokemon/base_stats/jabetta.asm"
INCLUDE "data/pokemon/base_stats/ribbito.asm"
INCLUDE "data/pokemon/base_stats/croakozuna.asm"
INCLUDE "data/pokemon/base_stats/machop.asm"
@ -152,7 +154,6 @@ INCLUDE "data/pokemon/base_stats/kolta.asm"
INCLUDE "data/pokemon/base_stats/ponyta.asm"
INCLUDE "data/pokemon/base_stats/rapidash.asm"
INCLUDE "data/pokemon/base_stats/rapidashg.asm"
INCLUDE "data/pokemon/base_stats/balumba.asm"
INCLUDE "data/pokemon/base_stats/gastly.asm"
INCLUDE "data/pokemon/base_stats/haunter.asm"
INCLUDE "data/pokemon/base_stats/gengar.asm"
@ -160,6 +161,7 @@ INCLUDE "data/pokemon/base_stats/cubone.asm"
INCLUDE "data/pokemon/base_stats/marowak.asm"
INCLUDE "data/pokemon/base_stats/marowaka.asm"
INCLUDE "data/pokemon/base_stats/guardia.asm"
INCLUDE "data/pokemon/base_stats/balumba.asm"
INCLUDE "data/pokemon/base_stats/doduo.asm"
INCLUDE "data/pokemon/base_stats/dodrio.asm"
INCLUDE "data/pokemon/base_stats/grimer.asm"
@ -174,16 +176,16 @@ INCLUDE "data/pokemon/base_stats/ramoose.asm"
INCLUDE "data/pokemon/base_stats/hitmonlee.asm"
INCLUDE "data/pokemon/base_stats/hitmonchan.asm"
INCLUDE "data/pokemon/base_stats/hitmontop.asm"
INCLUDE "data/pokemon/base_stats/horsea.asm"
INCLUDE "data/pokemon/base_stats/seadra.asm"
INCLUDE "data/pokemon/base_stats/kingdra.asm"
INCLUDE "data/pokemon/base_stats/seel.asm"
INCLUDE "data/pokemon/base_stats/dewgong.asm"
INCLUDE "data/pokemon/base_stats/shellder.asm"
INCLUDE "data/pokemon/base_stats/cloyster.asm"
INCLUDE "data/pokemon/base_stats/disturban.asm"
INCLUDE "data/pokemon/base_stats/staryu.asm"
INCLUDE "data/pokemon/base_stats/starmie.asm"
INCLUDE "data/pokemon/base_stats/seel.asm"
INCLUDE "data/pokemon/base_stats/dewgong.asm"
INCLUDE "data/pokemon/base_stats/horsea.asm"
INCLUDE "data/pokemon/base_stats/seadra.asm"
INCLUDE "data/pokemon/base_stats/kingdra.asm"
INCLUDE "data/pokemon/base_stats/blastyke.asm"
INCLUDE "data/pokemon/base_stats/blastoise.asm"
INCLUDE "data/pokemon/base_stats/sharpoon.asm"

View file

@ -14,8 +14,8 @@
db GROWTH_SLOW ; growth rate
; tm/hm learnset
tmhm MEGA_PUNCH, RAZOR_WIND, SWORDS_DANCE, MEGA_KICK, TOXIC, \
TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \
tmhm MEGA_PUNCH, RAZOR_WIND, SWORDS_DANCE, MEGA_KICK, TOXIC, \
TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \
BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, SEISMIC_TOSS, \
RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \
PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \

View file

@ -39,7 +39,7 @@ CryData::
mon_cry SFX_CRY_13, $00, $80 ; Blastoise
mon_cry SFX_CRY_14, $00, $80 ; Pinsir
mon_cry SFX_CRY_12, $00, $80 ; Tangela
mon_cry SFX_CRY_0F, $00, $80 ; Gyaoon
mon_cry SFX_CRY_0F, $00, $80 ; Gawarhed
mon_cry SFX_CRY_0A, $2C, $80 ; Nidoreign
mon_cry SFX_CRY_1F, $20, $40 ; Growlithe
mon_cry SFX_CRY_17, $FF, $C0 ; Onix
@ -58,25 +58,25 @@ CryData::
mon_cry SFX_CRY_21, $20, $60 ; Psyduck
mon_cry SFX_CRY_0D, $88, $20 ; Drowzee
mon_cry SFX_CRY_12, $E0, $40 ; Golem
mon_cry SFX_CRY_0E, $00, $80 ; Barunda
mon_cry SFX_CRY_0E, $00, $80 ; Balumba
mon_cry SFX_CRY_04, $FF, $30 ; Magmar
mon_cry SFX_CRY_0D, $2E, $E0 ; Buu
mon_cry SFX_CRY_06, $8F, $FF ; Electabuzz
mon_cry SFX_CRY_1C, $20, $C0 ; Magneton
mon_cry SFX_CRY_12, $E6, $DD ; Koffing
mon_cry SFX_CRY_15, $40, $A5 ; Deer
mon_cry SFX_CRY_15, $40, $A5 ; Ramoose
mon_cry SFX_CRY_0A, $DD, $60 ; Mankey
mon_cry SFX_CRY_0C, $88, $C0 ; Seel
mon_cry SFX_CRY_0B, $AA, $01 ; Diglett
mon_cry SFX_CRY_1D, $11, $40 ; Tauros
mon_cry SFX_CRY_03, $90, $B0 ; Trampel
mon_cry SFX_CRY_1C, $C6, $F0 ; Crocky
mon_cry SFX_CRY_1C, $C6, $F0 ; Gavillain
mon_cry SFX_CRY_13, $93, $00 ; Blottle
mon_cry SFX_CRY_10, $DD, $01 ; Farfetch'd
mon_cry SFX_CRY_1A, $44, $40 ; Venonat
mon_cry SFX_CRY_0F, $3C, $C0 ; Dragonite
mon_cry SFX_CRY_00, $80, $10 ; Cactus
mon_cry SFX_CRY_17, $C8, $C0 ; Jagg
mon_cry SFX_CRY_00, $80, $10 ; Cactormus
mon_cry SFX_CRY_17, $C8, $C0 ; Sharpoon
mon_cry SFX_CRY_1D, $B4, $4E ; Bittybat
mon_cry SFX_CRY_0B, $BB, $01 ; Doduo
mon_cry SFX_CRY_0E, $FF, $FF ; Poliwag
@ -89,7 +89,7 @@ CryData::
mon_cry SFX_CRY_20, $20, $E0 ; Krabby
mon_cry SFX_CRY_22, $FF, $40 ; Cheep
mon_cry SFX_CRY_22, $32, $FF ; Jabetta
mon_cry SFX_CRY_0E, $E0, $60 ; Mikon
mon_cry SFX_CRY_0E, $E0, $60 ; Vulpiii
mon_cry SFX_CRY_24, $4F, $10 ; Vulpix
mon_cry SFX_CRY_24, $88, $60 ; Ninetales
mon_cry SFX_CRY_0F, $EE, $01 ; Pikachu
@ -102,8 +102,8 @@ CryData::
mon_cry SFX_CRY_18, $EE, $01 ; Kabutops
mon_cry SFX_CRY_19, $99, $10 ; Horsea
mon_cry SFX_CRY_19, $3C, $01 ; Seadra
mon_cry SFX_CRY_0F, $40, $C0 ; Bawligua
mon_cry SFX_CRY_0F, $20, $C0 ; Cryithan
mon_cry SFX_CRY_0F, $40, $C0 ; Ministare
mon_cry SFX_CRY_0F, $20, $C0 ; Iguanarch
mon_cry SFX_CRY_00, $20, $40 ; Sandshrew
mon_cry SFX_CRY_00, $FF, $FF ; Sandslash
mon_cry SFX_CRY_1F, $F0, $01 ; Omanyte
@ -129,7 +129,7 @@ CryData::
mon_cry SFX_CRY_0B, $2A, $10 ; Dugtrio
mon_cry SFX_CRY_1A, $29, $80 ; Venomoth
mon_cry SFX_CRY_0C, $23, $FF ; Dewgong
mon_cry SFX_CRY_09, $FF, $20 ; Purakkusu
mon_cry SFX_CRY_09, $FF, $20 ; Tricules
mon_cry SFX_CRY_13, $3C, $00 ; Pendraken
mon_cry SFX_CRY_16, $80, $20 ; Caterpie
mon_cry SFX_CRY_1C, $CC, $01 ; Metapod
@ -142,8 +142,8 @@ CryData::
mon_cry SFX_CRY_1E, $99, $FF ; Mewtwo
mon_cry SFX_CRY_05, $55, $01 ; Snorlax
mon_cry SFX_CRY_17, $80, $00 ; Magikarp
mon_cry SFX_CRY_19, $C1, $1C ; Konya
mon_cry SFX_CRY_13, $00, $00 ; Omega
mon_cry SFX_CRY_19, $C1, $1C ; Coinpur
mon_cry SFX_CRY_13, $00, $00 ; Omegadge
mon_cry SFX_CRY_07, $EF, $FF ; Muk
mon_cry SFX_CRY_0F, $40, $80 ; Decilla
mon_cry SFX_CRY_20, $EE, $E0 ; Kingler
@ -164,13 +164,13 @@ CryData::
mon_cry SFX_CRY_0F, $80, $01 ; Bulbasaur
mon_cry SFX_CRY_0F, $00, $C0 ; Venusaur
mon_cry SFX_CRY_1A, $EE, $FF ; Tentacruel
mon_cry SFX_CRY_16, $89, $0E ; Gyopin
mon_cry SFX_CRY_16, $89, $0E ; Orfry
mon_cry SFX_CRY_16, $80, $40 ; Goldeen
mon_cry SFX_CRY_16, $10, $FF ; Seaking
mon_cry SFX_CRY_03, $A3, $01 ; Kotora
mon_cry SFX_CRY_03, $2D, $01 ; Gaotora
mon_cry SFX_CRY_03, $05, $01 ; Gorotora
mon_cry SFX_CRY_25, $37, $10 ; Puchikoon
mon_cry SFX_CRY_25, $37, $10 ; Kolta
mon_cry SFX_CRY_25, $00, $80 ; Ponyta
mon_cry SFX_CRY_25, $20, $C0 ; Rapidash
mon_cry SFX_CRY_22, $00, $80 ; Rattata
@ -182,7 +182,7 @@ CryData::
mon_cry SFX_CRY_23, $20, $F0 ; Aerodactyl
mon_cry SFX_CRY_13, $F7, $00 ; Blastyke
mon_cry SFX_CRY_1C, $80, $60 ; Magnemite
mon_cry SFX_CRY_0F, $63, $40 ; Skimper
mon_cry SFX_CRY_0F, $63, $40 ; Squeamata
mon_cry SFX_CRY_17, $C1, $E4 ; Gorochu
mon_cry SFX_CRY_04, $60, $40 ; Charmander
mon_cry SFX_CRY_1D, $60, $40 ; Squirtle
@ -199,8 +199,8 @@ CryData::
mon_cry SFX_CRY_21, $55, $01 ; Bellsprout
mon_cry SFX_CRY_25, $44, $20 ; Weepinbell
mon_cry SFX_CRY_25, $66, $CC ; Victreebel
; mon_cry SFX_CRY_12, $93, $00 ; Monja
mon_cry SFX_CRY_1F, $40, $01 ; Pudi
mon_cry SFX_CRY_00, $00, $00 ; Wiglett
mon_cry SFX_CRY_00, $00, $00 ; Wugtrio
mon_cry SFX_CRY_00, $00, $00 ; Scizor
mon_cry SFX_CRY_00, $00, $00 ; Rhyperior
mon_cry SFX_CRY_00, $00, $00 ; Espeon
@ -211,12 +211,12 @@ CryData::
mon_cry SFX_CRY_00, $00, $00 ; Lickilicky
mon_cry SFX_CRY_00, $00, $00 ; Tangrowth
mon_cry SFX_CRY_00, $00, $00 ; Kleavor
mon_cry SFX_CRY_21, $DD, $80 ; Tsubomitto
mon_cry SFX_CRY_21, $DD, $80 ; Bellignan
mon_cry SFX_CRY_00, $00, $00 ; Steelix
mon_cry SFX_CRY_00, $00, $00 ; Blissey
mon_cry SFX_CRY_1D, $E3, $1A ; Hitmontop
mon_cry SFX_CRY_1D, $01, $B1 ; Crobat
mon_cry SFX_CRY_0E, $50, $FF ; Animon
mon_cry SFX_CRY_0E, $50, $FF ; Mimmeo
mon_cry SFX_CRY_00, $00, $00 ; Bellossom
mon_cry SFX_CRY_00, $00, $00 ; Porygon2
mon_cry SFX_CRY_00, $00, $00 ; Kingdra
@ -224,10 +224,10 @@ CryData::
mon_cry SFX_CRY_00, $00, $00 ; Slowking
mon_cry SFX_CRY_00, $00, $00 ; Electivire
mon_cry SFX_CRY_00, $00, $00 ; Magmortar
mon_cry SFX_CRY_07, $20, $FF ; Taaban
; mon_cry SFX_CRY_1E, $79, $40 ; Para
mon_cry SFX_CRY_00, $00, $00 ; Hinaazu
mon_cry SFX_CRY_05, $FF, $40 ; Betobebii
mon_cry SFX_CRY_07, $20, $FF ; Disturban
mon_cry SFX_CRY_00, $00, $00 ; Gentlarva
mon_cry SFX_CRY_00, $00, $00 ; Pupal
mon_cry SFX_CRY_00, $00, $00 ; Carapthor
mon_cry SFX_CRY_00, $00, $00 ; Magnezone
mon_cry SFX_CRY_00, $00, $00 ; Porygon-Z
mon_cry SFX_CRY_20, $00, $1C ; Annihilape

View file

@ -68,7 +68,7 @@ PokedexEntryPointers:
dw DragoniteDexEntry
dw CactormusDexEntry
dw SharpoonDexEntry
dw WiglettDexEntry
dw BittybatDexEntry
dw DoduoDexEntry
dw PoliwagDexEntry
dw JynxDexEntry
@ -139,7 +139,7 @@ PokedexEntryPointers:
dw DecillaDexEntry
dw KinglerDexEntry
dw CloysterDexEntry
dw WugtrioDexEntry
dw MagnetiteDexEntry
dw ElectrodeDexEntry
dw ClefableDexEntry
dw WeezingDexEntry
@ -190,6 +190,8 @@ PokedexEntryPointers:
dw BellsproutDexEntry
dw WeepinbellDexEntry
dw VictreebelDexEntry
dw WiglettDexEntry
dw WugtrioDexEntry
dw ScizorDexEntry
dw RhyperiorDexEntry
dw EspeonDexEntry
@ -1406,12 +1408,12 @@ CoinpurDexEntry:
text_far _CoinpurDexEntry
text_end
;BittybatDexEntry:
; db "TINY BAT@"
; db 1,0
; dw 80
; text_far _BittybatDexEntry
; text_end
BittybatDexEntry:
db "TINY BAT@"
db 1,0
dw 80
text_far _BittybatDexEntry
text_end
RibbitoDexEntry:
db "SUMO@"
@ -1553,12 +1555,12 @@ PendrakenDexEntry:
text_far _PendrakenDexEntry
text_end
;MagnetiteDexEntry:
; db "MAGNET@"
; db 2,4
; dw 400
; text_far _MagnetiteDexEntry
; text_end
MagnetiteDexEntry:
db "MAGNET@"
db 2,4
dw 400
text_far _MagnetiteDexEntry
text_end
TriculesDexEntry:
db "BIG HORN@"
@ -1665,13 +1667,6 @@ KleavorDexEntry:
text_far _KleavorDexEntry
text_end
;MonjaDexEntry:
; db "VINE@"
; db 1,4
; dw 330
; text_far _MonjaDexEntry
; text_end
SteelixDexEntry:
db "IRON SNAKE@"
db 30,2

View file

@ -68,7 +68,7 @@ PokedexOrder:
db DEX_DRAGONITE
db DEX_CACTORMUS
db DEX_SHARPOON
db DEX_WIGLETT
db DEX_BITTYBAT
db DEX_DODUO
db DEX_POLIWAG
db DEX_JYNX
@ -139,7 +139,7 @@ PokedexOrder:
db DEX_DECILLA
db DEX_KINGLER
db DEX_CLOYSTER
db DEX_WUGTRIO
db DEX_MAGNETITE
db DEX_ELECTRODE
db DEX_CLEFABLE
db DEX_WEEZING
@ -190,6 +190,8 @@ PokedexOrder:
db DEX_BELLSPROUT
db DEX_WEEPINBELL
db DEX_VICTREEBEL
db DEX_WIGLETT
db DEX_WUGTRIO
db DEX_SCIZOR
db DEX_RHYPERIOR
db DEX_ESPEON

View file

@ -80,7 +80,7 @@ EvosMovesPointerTable:
dw DragoniteEvosMoves
dw CactormusEvosMoves
dw SharpoonEvosMoves
dw WiglettEvosMoves
dw BittybatEvosMoves
dw DoduoEvosMoves
dw PoliwagEvosMoves
dw JynxEvosMoves
@ -151,7 +151,7 @@ EvosMovesPointerTable:
dw DecillaEvosMoves
dw KinglerEvosMoves
dw CloysterEvosMoves
dw WugtrioEvosMoves
dw MagnetiteEvosMoves
dw ElectrodeEvosMoves
dw ClefableEvosMoves
dw WeezingEvosMoves
@ -202,6 +202,8 @@ EvosMovesPointerTable:
dw BellsproutEvosMoves
dw WeepinbellEvosMoves
dw VictreebelEvosMoves
dw WiglettEvosMoves
dw WugtrioEvosMoves
dw ScizorEvosMoves
dw RhyperiorEvosMoves
dw EspeonEvosMoves
@ -1094,19 +1096,19 @@ SharpoonEvosMoves:
db 55, HORN_DRILL
db 0
;BittybatEvosMoves:
BittybatEvosMoves:
; Evolutions
; db EV_LEVEL, 15, ZUBAT
; db 0
db EV_LEVEL, 14, ZUBAT
db 0
; Learnset
; db 7, WING_ATTACK
; db 14, GUST
; db 18, CONFUSE_RAY
; db 22, BITE
; db 26, TACKLE
; db 30, DISABLE
; db 34, HAZE
; db 0
db 7, WING_ATTACK
db 14, GUST
db 18, CONFUSE_RAY
db 22, BITE
db 26, TACKLE
db 30, DISABLE
db 34, HAZE
db 0
DoduoEvosMoves:
; Evolutions
@ -1550,7 +1552,7 @@ MachopEvosMoves:
ZubatEvosMoves:
; Evolutions
db EV_LEVEL, 24, GOLBAT
db EV_LEVEL, 23, GOLBAT
db 0
; Learnset
db 10, SUPERSONIC
@ -1914,18 +1916,18 @@ CloysterEvosMoves:
db 50, SPIKE_CANNON
db 0
;MagnetiteEvosMoves:
MagnetiteEvosMoves:
; Evolutions
; db EV_LEVEL, 30, MAGNETON
; db 0
db EV_LEVEL, 30, MAGNETON
db 0
; Learnset
; db 21, SONICBOOM
; db 25, THUNDERSHOCK
; db 29, SUPERSONIC
; db 35, THUNDER_WAVE
; db 41, SWIFT
; db 47, SCREECH
; db 0
db 21, SONICBOOM
db 25, THUNDERSHOCK
db 29, SUPERSONIC
db 35, THUNDER_WAVE
db 41, SWIFT
db 47, SCREECH
db 0
ElectrodeEvosMoves:
; Evolutions
@ -2306,7 +2308,7 @@ BlastykeEvosMoves:
MagnemiteEvosMoves:
; Evolutions
db EV_LEVEL, 30, MAGNETON
db EV_LEVEL, 20, MAGNETITE
db 0
; Learnset
db 21, SONICBOOM
@ -2532,34 +2534,6 @@ VictreebelEvosMoves:
db 18, SLEEP_POWDER
db 0
;MonjaEvosMoves:
; Evolutions
; db EV_LEVEL, 22, TANGELA
; db 0
; Learnset
; db 5, BIND
; db 9, ABSORB
; db 13, VINE_WHIP
; db 19, POISONPOWDER
; db 22, STUN_SPORE
; db 25, SLEEP_POWDER
; db 29, SLAM
; db 35, GROWTH
; db 40, NIGHT_SHADE
; db 0
;PudiEvosMoves:
; Evolutions
; db EV_LEVEL, 16, GROWLITHE
; db 0
; Learnset
; db 9, EMBER
; db 12, LEER
; db 15, TAKE_DOWN
; db 21, AGILITY
; db 30, FLAMETHROWER
; db 0
ScizorEvosMoves:
; Evolutions
db 0
@ -2868,33 +2842,6 @@ CarapthorEvosMoves:
db 35, SUBSTITUTE
db 0
;HinaazuEvosMoves:
; Evolutions
; db EV_LEVEL, 18, DODUO
; db 0
; Learnset
; db 5, QUICK_ATTACK
; db 11, FURY_ATTACK
; db 20, DRILL_PECK
; db 23, RAGE
; db 27, TRI_ATTACK
; db 32, AGILITY
; db 0
;BetobebiiEvosMoves:
; Evolutions
; db EV_LEVEL, 20, GRIMER
; db 0
; Learnset
; db 13, POISON_GAS
; db 16, ACID
; db 19, MINIMIZE
; db 22, SLUDGE
; db 28, HARDEN
; db 33, SCREECH
; db 37, ACID_ARMOR
; db 0
MagnezoneEvosMoves:
; Evolutions
db 0

View file

@ -54,6 +54,7 @@ MonPartyData:
nybble ICON_MON ; Nidorino
nybble ICON_MON ; Nidoking
nybble ICON_MON ; Nidoreign
nybble ICON_MON ; Bittybat
nybble ICON_MON ; Zubat
nybble ICON_MON ; Golbat
nybble ICON_MON ; Crobat
@ -104,16 +105,22 @@ MonPartyData:
nybble ICON_MON ; Abra
nybble ICON_MON ; Kadabra
nybble ICON_MON ; Alakazam
nybble ICON_WATER ; Cheep
nybble ICON_WATER ; Jabetta
nybble ICON_MON ; Lickitung
nybble ICON_MON ; Lickilicky
nybble ICON_QUADRUPED ; Growlithe
nybble ICON_QUADRUPED ; Arcanine
nybble ICON_QUADRUPED ; Arcanine-H
nybble ICON_MON ; Lickitung
nybble ICON_MON ; Lickilicky
nybble ICON_SMALL_BIRD ; Farfetch'd
nybble ICON_SMALL_BIRD ; Luxwan
nybble ICON_SMALL_BIRD ; Luxwan
nybble ICON_SMALL_BIRD ; Sirfetch'd
nybble ICON_MON ; Drowzee
nybble ICON_MON ; Hypno
nybble ICON_BALL ; Magnemite
nybble ICON_BALL ; Magnetite
nybble ICON_BALL ; Magneton
nybble ICON_BALL ; Magnezone
nybble ICON_MON ; Diglett
nybble ICON_MON ; Dugtrio
nybble ICON_MON ; Dugtrio-A
@ -130,11 +137,6 @@ MonPartyData:
nybble ICON_GRASS ; Toedscruel
nybble ICON_WATER ; Blottle
nybble ICON_WATER ; Pendraken
nybble ICON_BALL ; Magnemite
nybble ICON_BALL ; Magneton
nybble ICON_BALL ; Magnezone
nybble ICON_WATER ; Cheep
nybble ICON_WATER ; Jabetta
nybble ICON_MON ; Ribbito
nybble ICON_MON ; Croakozuna
nybble ICON_MON ; Machop
@ -152,7 +154,6 @@ MonPartyData:
nybble ICON_QUADRUPED ; Ponyta
nybble ICON_QUADRUPED ; Rapidash
nybble ICON_QUADRUPED ; Rapidash-G
nybble ICON_BALL ; Balumba
nybble ICON_MON ; Gastly
nybble ICON_MON ; Haunter
nybble ICON_MON ; Gengar
@ -160,8 +161,9 @@ MonPartyData:
nybble ICON_MON ; Marowak
nybble ICON_MON ; Marowak-A
nybble ICON_MON ; Guardia
nybble ICON_BALL ; Balumba
nybble ICON_SMALL_BIRD ; Doduo
nybble ICON_BIRD ; Dodrio
nybble ICON_SMALL_BIRD ; Dodrio
nybble ICON_MON ; Grimer
nybble ICON_MON ; Muk
nybble ICON_MON ; Muk-A
@ -174,16 +176,16 @@ MonPartyData:
nybble ICON_MON ; Hitmonlee
nybble ICON_MON ; Hitmonchan
nybble ICON_MON ; Hitmontop
nybble ICON_WATER ; Horsea
nybble ICON_WATER ; Seadra
nybble ICON_WATER ; Kingdra
nybble ICON_WATER ; Seel
nybble ICON_WATER ; Dewgong
nybble ICON_HELIX ; Shellder
nybble ICON_HELIX ; Cloyster
nybble ICON_HELIX ; Disturban
nybble ICON_HELIX ; Staryu
nybble ICON_HELIX ; Starmie
nybble ICON_WATER ; Seel
nybble ICON_WATER ; Dewgong
nybble ICON_WATER ; Horsea
nybble ICON_WATER ; Seadra
nybble ICON_WATER ; Kingdra
nybble ICON_WATER ; Blastyke
nybble ICON_WATER ; Blastoise
nybble ICON_WATER ; Sharpoon

View file

@ -68,7 +68,7 @@ MonsterNames::
db "DRAGONITE@"
db "CACTORMUS@" ; Cactus
db "SHARPOON@@" ; Jagg
db "WIGLETT@@@"
db "BITTYBAT@@"
db "DODUO@@@@@"
db "POLIWAG@@@"
db "JYNX@@@@@@"
@ -139,7 +139,7 @@ MonsterNames::
db "DECILLA@@@"
db "KINGLER@@@"
db "CLOYSTER@@"
db "WUGTRIO@@@"
db "MAGNETITE@"
db "ELECTRODE@"
db "CLEFABLE@@"
db "WEEZING@@@"
@ -190,6 +190,8 @@ MonsterNames::
db "BELLSPROUT"
db "WEEPINBELL"
db "VICTREEBEL"
db "WIGLETT@@@"
db "WUGTRIO@@@"
db "SCIZOR@@@@"
db "RHYPERIOR@"
db "ESPEON@@@@"

View file

@ -118,7 +118,7 @@ _CoinpurDexEntry::
next "hoard small coins"
dex
_BittybatDexEntry:: ; unused
_BittybatDexEntry::
text "Flits about in"
next "dark caves. A"
next "swarm of BITTYBAT"
@ -328,7 +328,7 @@ _PendrakenDexEntry::
next "before attacking"
dex
_MagnetiteDexEntry:: ; unused
_MagnetiteDexEntry::
text "Occasionally, it"
next "attracts so much"
next "metal to itself"
@ -378,16 +378,6 @@ _MimmeoDexEntry::
next "in an instant"
dex
_MonjaDexEntry:: ; unused
text "As it runs about,"
next "the vines on its"
next "head may obscure"
page "its singular eye,"
next "causing it to"
next "trip and fall"
dex
_DisturbanDexEntry::
text "It evolved after"
next "biting a SLOWPOKE."
@ -998,7 +988,7 @@ _TaurosPADexEntry::
next "tips of its horns"
dex
_MissingNoDexEntry::
_MissingNoDexEntry:: ; unused
text "This is a newly"
next "discovered"
next "#MON. It is"

View file

@ -55,6 +55,7 @@ MonsterPalettes:
db PAL_PURPLEMON ; NIDORINO
db PAL_PURPLEMON ; NIDOKING
db PAL_GREYMON ; NIDOREIGN
db PAL_BLUEMON ; BITTYBAT
db PAL_BLUEMON ; ZUBAT
db PAL_BLUEMON ; GOLBAT
db PAL_PURPLEMON ; CROBAT
@ -105,16 +106,22 @@ MonsterPalettes:
db PAL_YELLOWMON ; ABRA
db PAL_YELLOWMON ; KADABRA
db PAL_YELLOWMON ; ALAKAZAM
db PAL_PURPLEMON ; CHEEP
db PAL_PURPLEMON ; JABETTA
db PAL_PINKMON ; LICKITUNG
db PAL_PINKMON ; LICKILICKY
db PAL_REDMON ; GROWLITHE
db PAL_REDMON ; ARCANINE
db PAL_REDMON ; ARCANINE_H
db PAL_PINKMON ; LICKITUNG
db PAL_PINKMON ; LICKILICKY
db PAL_BROWNMON ; FARFETCHD
db PAL_BROWNMON ; LUXWAN
db PAL_BROWNMON ; SIRFETCHD
db PAL_YELLOWMON ; DROWZEE
db PAL_YELLOWMON ; HYPNO
db PAL_GREYMON ; MAGNEMITE
db PAL_GREYMON ; MAGNETITE
db PAL_GREYMON ; MAGNETON
db PAL_GREYMON ; MAGNEZONE
db PAL_BROWNMON ; DIGLETT
db PAL_BROWNMON ; DUGTRIO
db PAL_BROWNMON ; DUGTRIO_A
@ -131,11 +138,6 @@ MonsterPalettes:
db PAL_YELLOWMON ; TOEDSCRUEL
db PAL_MEWMON ; BLOTTLE
db PAL_MEWMON ; PENDRAKEN
db PAL_GREYMON ; MAGNEMITE
db PAL_GREYMON ; MAGNETON
db PAL_GREYMON ; MAGNEZONE
db PAL_PURPLEMON ; CHEEP
db PAL_PURPLEMON ; JABETTA
db PAL_GREENMON ; RIBBITO
db PAL_GREENMON ; CROAKOZUNA
db PAL_GREYMON ; MACHOP
@ -153,7 +155,6 @@ MonsterPalettes:
db PAL_REDMON ; PONYTA
db PAL_REDMON ; RAPIDASH
db PAL_PURPLEMON ; RAPIDASH_G
db PAL_PINKMON ; BALUMBA
db PAL_PURPLEMON ; GASTLY
db PAL_PURPLEMON ; HAUNTER
db PAL_PURPLEMON ; GENGAR
@ -161,6 +162,7 @@ MonsterPalettes:
db PAL_BROWNMON ; MAROWAK
db PAL_PURPLEMON ; MAROWAK_A
db PAL_BROWNMON ; GUARDIA
db PAL_PINKMON ; BALUMBA
db PAL_BROWNMON ; DODUO
db PAL_BROWNMON ; DODRIO
db PAL_PURPLEMON ; GRIMER
@ -175,16 +177,16 @@ MonsterPalettes:
db PAL_BROWNMON ; HITMONLEE
db PAL_BROWNMON ; HITMONCHAN
db PAL_BROWNMON ; HITMONTOP
db PAL_CYANMON ; HORSEA
db PAL_CYANMON ; SEADRA
db PAL_CYANMON ; KINGDRA
db PAL_BLUEMON ; SEEL
db PAL_BLUEMON ; DEWGONG
db PAL_PURPLEMON ; SHELLDER
db PAL_PURPLEMON ; CLOYSTER
db PAL_GREYMON ; DISTURBAN
db PAL_REDMON ; STARYU
db PAL_PURPLEMON ; STARMIE
db PAL_BLUEMON ; SEEL
db PAL_BLUEMON ; DEWGONG
db PAL_CYANMON ; HORSEA
db PAL_CYANMON ; SEADRA
db PAL_CYANMON ; KINGDRA
db PAL_CYANMON ; BLASTYKE
db PAL_CYANMON ; BLASTOISE
db PAL_BLUEMON ; SHARPOON

View file

@ -73,7 +73,7 @@ TradebackMovesPointerTable:
dw DragoniteTradebackMoves
dw CactormusTradebackMoves
dw SharpoonTradebackMoves
dw WiglettTradebackMoves
dw BittybatTradebackMoves
dw DoduoTradebackMoves
dw PoliwagTradebackMoves
dw JynxTradebackMoves
@ -144,7 +144,7 @@ TradebackMovesPointerTable:
dw DecillaTradebackMoves
dw KinglerTradebackMoves
dw CloysterTradebackMoves
dw WugtrioTradebackMoves
dw MagnetiteTradebackMoves
dw ElectrodeTradebackMoves
dw ClefableTradebackMoves
dw WeezingTradebackMoves
@ -195,6 +195,8 @@ TradebackMovesPointerTable:
dw BellsproutTradebackMoves
dw WeepinbellTradebackMoves
dw VictreebelTradebackMoves
dw WiglettTradebackMoves
dw WugtrioTradebackMoves
dw ScizorTradebackMoves
dw RhyperiorTradebackMoves
dw EspeonTradebackMoves
@ -831,9 +833,9 @@ SharpoonTradebackMoves:
db 1, AGILITY ; Egg Move
db 0
;BittybatTradebackMoves:
; db 1, QUICK_ATTACK
; db 0
BittybatTradebackMoves:
db 1, QUICK_ATTACK
db 0
DoduoTradebackMoves:
db 1, SWIFT
@ -1395,9 +1397,9 @@ CloysterTradebackMoves:
db 1, SCREECH
db 0
;MagnetiteTradebackMoves:
; db 1, AGILITY
; db 0
MagnetiteTradebackMoves:
db 1, AGILITY
db 0
ElectrodeTradebackMoves:
db 1, HEADBUTT
@ -1799,14 +1801,6 @@ VictreebelTradebackMoves:
db 1, LEECH_LIFE
db 0
;MonjaTradebackMoves:
; db 1, FLASH
; db 1, HEADBUTT
; db 1, AMNESIA
; db 1, CONFUSION
; db 1, REFLECT
; db 0
ScizorTradebackMoves:
db 1, HEADBUTT
db 1, COUNTER

View file

@ -70,7 +70,7 @@ YoungsterData:
db 11, RATTATA, EKANS, 0
db 14, SPEAROW, 0
; Mt. Moon 1F
db 10, RATTATA, SPEAROW, ZUBAT, 0
db 10, RATTATA, SPEAROW, BITTYBAT, 0
; Route 24
db 14, RATTATA, EKANS, ZUBAT, 0
; Route 25
@ -245,7 +245,7 @@ SuperNerdData:
db 12, GRIMER, VOLTORB, KOFFING, 0
; Route 8
db 20, GRIMER, KOFFING, KOFFING, MAGNEMITE, 0
db 22, VOLTORB, KOFFING, MAGNEMITE, 0
db 22, VOLTORB, KOFFING, MAGNETITE, 0
db 26, ELECTRODE, 0
; Unused - both now used in Celadon University
db 30, PORYGON, 0 ;
@ -550,15 +550,15 @@ ScientistData:
db 65, MAGNEZONE, ELECTRODE, PORYGONZ, MIMMEO, GAVILLAIN, WEEZING, 0
; Silph Co. 2F
db 26, GRIMER, WEEZING, KOFFING, WEEZING, 0
db 28, MAGNEMITE, VOLTORB, MAGNETON, 0
db 28, MAGNETITE, VOLTORB, MAGNETON, 0
; Silph Co. 3F/Mansion 1F
db 29, ELECTRODE, MUK, 0
; Silph Co. 4F
db 33, VOLTORB, ELECTRODE, KOFFING, 0
; Silph Co. 5F
db 26, MAGNETON, KOFFING, WEEZING, MAGNEMITE, 0
db 26, MAGNEMITE, KOFFING, WEEZING, MAGNETITE, 0
; Silph Co. 6F
db 25, VOLTORB, KOFFING, MAGNETON, MAGNEMITE, KOFFING, 0
db 25, VOLTORB, KOFFING, MAGNETITE, MAGNEMITE, KOFFING, 0
; Silph Co. 7F
db 29, PORYGON, 0 ; stolen technology!!!
; Silph Co. 8F
@ -566,16 +566,16 @@ ScientistData:
; Silph Co. 9F
db 28, VOLTORB, KOFFING, MAGNETON, 0
; Silph Co. 10F
db 29, MAGNETON, KOFFING, 0
db 29, MAGNETITE, KOFFING, 0
; Mansion 3F
db 33, MAGNEMITE, MAGNETON, DITTO, 0
db 33, MAGNETITE, MAGNETON, DITTO, 0
; Mansion B1F
db 34, MAGNEMITE, ELECTRODE, 0
db 34, MAGNETITE, ELECTRODE, 0
RocketData:
; Mt. Moon B2F
db 13, RATTATA, ZUBAT, 0
db 11, SANDSHREW, RATTATA, ZUBAT, 0
db 11, SANDSHREW, RATTATA, BITTYBAT, 0
db 12, ZUBAT, EKANS, 0
db 16, RATICATE, 0
; Cerulean City

View file

@ -26,8 +26,8 @@ MistyData:
LtSurgeData:
db $FF, 11, VOLTORB, 12, PIKACHU, 14, GAOTORA, 0 ; 0 badges
db $FF, 19, VOLTORB, 18, PIKACHU, 19, GAOTORA, 21, ELECTABUZZ, 0 ; 1
db $FF, 22, VOLTORB, 21, GAOTORA, 21, MAGNEMITE, 23, ELECTABUZZ, 25, RAICHU, 0 ; 2
db $FF, 29, ELECTRODE, 28, GAOTORA, 28, MAGNEMITE, 29, ELECTABUZZ, 31, RAICHU, 0 ; 3
db $FF, 22, VOLTORB, 21, GAOTORA, 21, MAGNETITE, 23, ELECTABUZZ, 25, RAICHU, 0 ; 2
db $FF, 29, ELECTRODE, 28, GAOTORA, 28, MAGNETITE, 29, ELECTABUZZ, 31, RAICHU, 0 ; 3
db $FF, 38, ELECTRODE, 37, GOROTORA, 37, MAGNETON, 38, ELECTABUZZ, 40, GOROCHU, 0 ; 4
db $FF, 41, ELECTRODE, 40, GOROTORA, 40, MAGNETON, 41, ELECTABUZZ, 43, GOROCHU, 0 ; 5
db $FF, 45, ELECTRODE, 44, GOROTORA, 44, MAGNEZONE, 45, ELECTIVIRE, 47, GOROCHU, 0 ; 6

View file

@ -1,14 +1,14 @@
MtMoon1FWildMons:
def_grass_wildmons 10 ; encounter rate
db 8, ZUBAT
db 7, ZUBAT
db 9, ZUBAT
db 8, BITTYBAT
db 7, BITTYBAT
db 9, BITTYBAT
db 8, GEODUDE
db 6, ZUBAT
db 6, BITTYBAT
db 9, SANDSHREW
db 9, GEODUDE
db 8, PARAS
db 10, ZUBAT
db 10, BITTYBAT
db 8, CLEFAIRY
end_grass_wildmons

View file

@ -1,12 +1,12 @@
MtMoonB1FWildMons:
def_grass_wildmons 10 ; encounter rate
db 8, ZUBAT
db 9, ZUBAT
db 8, BITTYBAT
db 9, BITTYBAT
db 7, GEODUDE
db 8, GEODUDE
db 9, GEODUDE
db 9, PARAS
db 10, ZUBAT
db 10, BITTYBAT
db 9, SANDSHREW
db 9, CLEFAIRY
db 10, SANDSHREW

View file

@ -1,8 +1,8 @@
MtMoonB2FWildMons:
def_grass_wildmons 10 ; encounter rate
db 9, ZUBAT
db 9, BITTYBAT
db 9, GEODUDE
db 10, ZUBAT
db 10, BITTYBAT
db 10, GEODUDE
db 11, ZUBAT
db 10, PARAS

View file

@ -1,6 +1,6 @@
PowerPlantWildMons:
def_grass_wildmons 10 ; encounter rate
db 32, MAGNEMITE
db 32, MAGNETITE
db 32, VOLTORB
db 32, GAOTORA
db 33, VOLTORB

View file

@ -23,7 +23,7 @@ SuperRodData:
dbw ROUTE_22, .Group1
dbw ROUTE_23, .Group8
dbw ROUTE_24, .Group2
dbw ROUTE_25, .Group3
dbw ROUTE_25, .Group2
dbw BRUNSWICK_TRAIL, .Group9
dbw CERULEAN_GYM, .Group2
dbw VERMILION_DOCK, .Group3
@ -62,18 +62,19 @@ SuperRodData:
db 5, ORFRY
db 7, ORFRY
.Group2: ; Route 4, Cerulean, Route 24, Route 6
db 4
.Group2: ; Route 4, Cerulean, Route 24, Route 25, Route 6
db 5
db 12, MAGIKARP
db 12, POLIWAG
db 12, ORFRY
db 12, PSYDUCK
db 12, CHEEP
.Group3: ; Route 11, Route 25, Vermilion
.Group3: ; Route 11, Vermilion
db 5
db 15, BLOTTLE
db 15, MAGIKARP
db 15, SLOWPOKE
db 15, GOLDEEN
db 15, TENTACOOL
db 15, CHEEP
@ -86,13 +87,12 @@ SuperRodData:
db 20, KRABBY
.Group5: ; Route 13, Route 17, Route 18, Fuchsia
db 6
db 5
db 25, HORSEA
db 25, POLIWHIRL
db 25, KRABBY
db 25, CHEEP
db 25, BLOTTLE
db 25, GOLDEEN
.Group6: ; Safari Zone
db 6

View file

@ -56,83 +56,83 @@ DexCompletionText:
text_end
DexRatingsTable:
dbw 15, DexRatingText_Own0To9
dbw 30, DexRatingText_Own10To19
dbw 40, DexRatingText_Own20To29
dbw 55, DexRatingText_Own30To39
dbw 70, DexRatingText_Own40To49
dbw 80, DexRatingText_Own50To59
dbw 95, DexRatingText_Own60To69
dbw 110, DexRatingText_Own70To79
dbw 120, DexRatingText_Own80To89
dbw 135, DexRatingText_Own90To99
dbw 150, DexRatingText_Own100To109
dbw 160, DexRatingText_Own110To119
dbw 175, DexRatingText_Own120To129
dbw 190, DexRatingText_Own130To139
dbw 199, DexRatingText_Own140To149
dbw NUM_POKEMON + 1, DexRatingText_Own150To151
dbw 15, DexRatingText_Own0To14
dbw 30, DexRatingText_Own15To29
dbw 50, DexRatingText_Own30To49
dbw 65, DexRatingText_Own50To64
dbw 80, DexRatingText_Own65To79
dbw 100, DexRatingText_Own80To99
dbw 115, DexRatingText_Own100To114
dbw 130, DexRatingText_Own115To129
dbw 150, DexRatingText_Own130To149
dbw 165, DexRatingText_Own150To164
dbw 180, DexRatingText_Own165To179
dbw 200, DexRatingText_Own180To199
dbw 215, DexRatingText_Own200To214
dbw 230, DexRatingText_Own215To229
dbw 250, DexRatingText_Own230To249
dbw NUM_POKEMON + 1, DexRatingText_OwnComplete
DexRatingText_Own0To9:
text_far _DexRatingText_Own0To9
DexRatingText_Own0To14:
text_far _DexRatingText_Own0To14
text_end
DexRatingText_Own10To19:
text_far _DexRatingText_Own10To19
DexRatingText_Own15To29:
text_far _DexRatingText_Own15To29
text_end
DexRatingText_Own20To29:
text_far _DexRatingText_Own20To29
DexRatingText_Own30To49:
text_far _DexRatingText_Own30To49
text_end
DexRatingText_Own30To39:
text_far _DexRatingText_Own30To39
DexRatingText_Own50To64:
text_far _DexRatingText_Own50To64
text_end
DexRatingText_Own40To49:
text_far _DexRatingText_Own40To49
DexRatingText_Own65To79:
text_far _DexRatingText_Own65To79
text_end
DexRatingText_Own50To59:
text_far _DexRatingText_Own50To59
DexRatingText_Own80To99:
text_far _DexRatingText_Own80To99
text_end
DexRatingText_Own60To69:
text_far _DexRatingText_Own60To69
DexRatingText_Own100To114:
text_far _DexRatingText_Own100To114
text_end
DexRatingText_Own70To79:
text_far _DexRatingText_Own70To79
DexRatingText_Own115To129:
text_far _DexRatingText_Own115To129
text_end
DexRatingText_Own80To89:
text_far _DexRatingText_Own80To89
DexRatingText_Own130To149:
text_far _DexRatingText_Own130To149
text_end
DexRatingText_Own90To99:
text_far _DexRatingText_Own90To99
DexRatingText_Own150To164:
text_far _DexRatingText_Own150To164
text_end
DexRatingText_Own100To109:
text_far _DexRatingText_Own100To109
DexRatingText_Own165To179:
text_far _DexRatingText_Own165To179
text_end
DexRatingText_Own110To119:
text_far _DexRatingText_Own110To119
DexRatingText_Own180To199:
text_far _DexRatingText_Own180To199
text_end
DexRatingText_Own120To129:
text_far _DexRatingText_Own120To129
DexRatingText_Own200To214:
text_far _DexRatingText_Own200To214
text_end
DexRatingText_Own130To139:
text_far _DexRatingText_Own130To139
DexRatingText_Own215To229:
text_far _DexRatingText_Own215To229
text_end
DexRatingText_Own140To149:
text_far _DexRatingText_Own140To149
DexRatingText_Own230To249:
text_far _DexRatingText_Own230To249
text_end
DexRatingText_Own150To151:
text_far _DexRatingText_Own150To151
DexRatingText_OwnComplete:
text_far _DexRatingText_OwnComplete
text_end

View file

@ -203,7 +203,7 @@ HandlePokedexListMenu:
call PlaceString
; find the highest pokedex number among the pokemon the player has seen
ld hl, wPokedexSeenEnd - 1
ld b, 249 ; This makes the last number in the dex match up with the last Pokemon in dex order. This makes it look a little odd when incomplete but also allows for Pokemon beyond 248 to display correctly. Setting it as 249 for now (so everything up to Melmetal gets displayed) but may update if we can bring Magnetite and Bittybat back.
ld b, 251 ; This makes the last number in the dex match up with the last Pokemon in dex order. This makes it look a little odd when incomplete but also allows for Pokemon beyond 248 to display correctly.
.maxSeenPokemonLoop
ld a, [hld]
ld c, 8

View file

@ -580,6 +580,10 @@ TaurosPAPicFront:: INCBIN "gfx/pokemon/front/taurospaqua.pic"
TaurosPAPicBack:: INCBIN "gfx/pokemon/back/taurospaquab.pic"
TaurosPBPicFront:: INCBIN "gfx/pokemon/front/taurospblaze.pic"
TaurosPBPicBack:: INCBIN "gfx/pokemon/back/taurospblazeb.pic"
MagnetitePicFront:: INCBIN "gfx/pokemon/front/magnetite.pic"
MagnetitePicBack:: INCBIN "gfx/pokemon/back/magnetiteb.pic"
BittybatPicFront:: INCBIN "gfx/pokemon/front/bittybat.pic"
BittybatPicBack:: INCBIN "gfx/pokemon/back/bittybatb.pic"
LancePic:: INCBIN "gfx/trainers/lance.pic"
YujirouPic:: INCBIN "gfx/trainers/yujirou.pic"

View file

Before

Width:  |  Height:  |  Size: 228 B

After

Width:  |  Height:  |  Size: 228 B

View file

Before

Width:  |  Height:  |  Size: 552 B

After

Width:  |  Height:  |  Size: 552 B

View file

Before

Width:  |  Height:  |  Size: 642 B

After

Width:  |  Height:  |  Size: 642 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 963 B

After

Width:  |  Height:  |  Size: 981 B

View file

Before

Width:  |  Height:  |  Size: 771 B

After

Width:  |  Height:  |  Size: 771 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 769 B

After

Width:  |  Height:  |  Size: 944 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 770 B

After

Width:  |  Height:  |  Size: 919 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 945 B

After

Width:  |  Height:  |  Size: 625 B

View file

@ -114,6 +114,6 @@ _MtMoon1AfterBattleText8::
done
_MtMoon1Text14::
text "Beware! ZUBAT is"
line "a blood sucker!"
text "Beware! BITTYBAT"
line "can suck blood!"
done

View file

@ -13,104 +13,103 @@ _DexCompletionText::
line "Rating:"
prompt
_DexRatingText_Own0To9::
_DexRatingText_Own0To14::
text "You still have"
line "lots to do."
cont "Look for #MON"
cont "in grassy areas!"
done
_DexRatingText_Own10To19::
_DexRatingText_Own15To29::
text "You're on the"
line "right track! "
cont "Get a FLASH HM"
cont "from my AIDE!"
done
_DexRatingText_Own20To29::
text "You still need"
line "more #MON!"
cont "Try to catch"
cont "other species!"
done
_DexRatingText_Own30To39::
_DexRatingText_Own30To49::
text "Good, you're"
line "trying hard!"
cont "Get an ITEMFINDER"
cont "from my AIDE!"
done
_DexRatingText_Own40To49::
_DexRatingText_Own50To64::
text "Looking good!"
line "Go find my AIDE"
cont "when you get 50!"
done
_DexRatingText_Own50To59::
text "You finally got at"
line "least 50 species!"
cont "Be sure to get"
line "Be sure to get"
cont "EXP.ALL from my"
cont "AIDE!"
done
_DexRatingText_Own60To69::
_DexRatingText_Own65To79::
text "Ho! This is geting"
line "even better!"
done
_DexRatingText_Own70To79::
_DexRatingText_Own80To99::
text "Very good!"
line "Go fish for some"
cont "marine #MON!"
done
_DexRatingText_Own80To89::
_DexRatingText_Own100To114::
text "You finally got at"
line "least 100 species!"
cont "Great job!"
done
_DexRatingText_Own115To129::
text "Wonderful!"
line "Do you like to"
cont "collect things?"
done
_DexRatingText_Own90To99::
_DexRatingText_Own130To149::
text "You're over half-"
line "way to completing"
cont "the #DEX!"
cont "Well done!"
done
_DexRatingText_Own150To164::
text "I'm impressed!"
line "It must have been"
cont "difficult to do!"
done
_DexRatingText_Own100To109::
text "You finally got at"
line "least 100 species!"
cont "I can't believe"
cont "how good you are!"
done
_DexRatingText_Own110To119::
_DexRatingText_Own165To179::
text "You even have the"
line "evolved forms of"
cont "#MON! Super!"
done
_DexRatingText_Own120To129::
_DexRatingText_Own180To199::
text "Excellent! Trade"
line "with friends to"
cont "get some more!"
done
_DexRatingText_Own130To139::
_DexRatingText_Own200To214::
text "You finally got at"
line "least 200 species!"
cont "I can't believe"
cont "how good you are!"
done
_DexRatingText_Own215To229::
text "Outstanding!"
line "You've become a"
cont "real pro at this!"
done
_DexRatingText_Own140To149::
_DexRatingText_Own230To249::
text "I have nothing"
line "left to say!"
cont "You're the"
cont "authority now!"
done
_DexRatingText_Own150To151::
_DexRatingText_OwnComplete::
text "Your #DEX is"
line "entirely complete!"
cont "Congratulations!"