thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-20 06:08:57 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

The Big One.

Browse source 
Whoa, this one's been in the making for a while now. This one has been my attempt to fix as much as I could within a little over a month. Here's what I've got for you.

- Fixed a bug in Silph Gauntlet where the trainers would not see you unless you spoke to them

- Removed the unnecessary Gawarhed and Wugtrio static encounters. In what was once Gawarhed's place is a Rare Candy.

- Implemented a working ferry system (huge thanks to Red++) that allows travelling to Faraway Island and Citrine City with the right tickets. Currently both maps use a copy of the SS Anne, which may be revised later.

- Bittybat, Magnetite and Burgela have been removed to fix a Pokedex bug where entries wouldn't display correctly if the total number wasn't a multiple of 8.

- Fixed a bug where fishing up a Wiglett and Wugtrio would play the trainer battle and Champion battle themes respectively

- Restructured the Pokedex a little. Don't worry, Lickitung's still number 108!

- All references to betamon in the disassembly have had their names updated to match the new Ogasawara ones

- Removed Blastyke as a Game Corner prize, replacing it with Squeamata.

- Garnet Cavern is now properly listed as a dungeon map

- Fixed an issue where trying to leave Bill's House after entering the garden would put you back in the garden

- Moved Silph Gauntlet's Beauty down 1 floor to make the number of trainers on each floor more consistent

- Finished Gauntlet 6F except for the trainer text (PvK please help)

- Gavillain's stats updated to match KEP 1.4 on the Showdown server. It's now a Dragon/Electric type with less Ice coverage.

- Fixed Clefable's and Wigglytuff's starting movesets from an earlier commit

- Fixed an ABSOLUTELY HORRIBLE, EGREGIOUSLY FRUSTRATING BUG that caused the Pokedex's seen counter to rarely update. This is what caused this commit to be delayed for so long. No joke.

- New sprites, courtesy of Albatross, for Sylveon's back sprite, Alolan Marowak, Alolan Muk, Galarian Weezing and Magnezone!

- Fixed a bug preventing the trade for Haunter from being accessed.
This commit is contained in:
Martha Schilling 2023-09-19 23:34:25 +01:00
parent 57186bb2a0
commit 508a4e790e
246 changed files with 2446 additions and 2384 deletions
Download patch file Download diff file Expand all files Collapse all files

113
constants/event_constants.asm
View file

@ -78,54 +78,6 @@
const EVENT_BEAT_MISTY
const EVENT_GOT_BICYCLE
; Silph Gauntlet events ; Why is there so much free space here, my god
; 1F Trainers
const_next $d1
const EVENT_BEAT_GAUNTLET_YOUNGSTER
const EVENT_BEAT_GAUNTLET_BUG_CATCHER
const EVENT_BEAT_GAUNTLET_STUDENT
const EVENT_BEAT_GAUNTLET_JR_TRAINER_M
const EVENT_BEAT_GAUNTLET_JR_TRAINER_F
const EVENT_BEAT_GAUNTLET_BIRD_KEEPER
; 2F Trainers
const EVENT_BEAT_GAUNTLET_LASS
const EVENT_BEAT_GAUNTLET_JUNIOR
const EVENT_BEAT_GAUNTLET_HIKER
const EVENT_BEAT_GAUNTLET_SUPER_NERD
const EVENT_BEAT_GAUNTLET_POKEMANIAC
const EVENT_BEAT_GAUNTLET_BLACK_BELT
; 3F Trainers
const EVENT_BEAT_GAUNTLET_SAILOR
const EVENT_BEAT_GAUNTLET_FIREFIGHTER
const EVENT_BEAT_GAUNTLET_GENTLEMAN
const EVENT_BEAT_GAUNTLET_ENGINEER
const EVENT_BEAT_GAUNTLET_ROCKER
const EVENT_BEAT_GAUNTLET_FISHER
const EVENT_BEAT_GAUNTLET_BEAUTY
; 4F Trainers
const EVENT_BEAT_GAUNTLET_SCIENTIST
const EVENT_BEAT_GAUNTLET_GAMBLER
const EVENT_BEAT_GAUNTLET_ROCKET
const EVENT_BEAT_GAUNTLET_BIKER
const EVENT_BEAT_GAUNTLET_BURGLAR
const EVENT_BEAT_GAUNTLET_CHANNELER
; 5F Trainers
const EVENT_BEAT_GAUNTLET_JUGGLER
const EVENT_BEAT_GAUNTLET_PSYCHIC
const EVENT_BEAT_GAUNTLET_CUE_BALL
const EVENT_BEAT_GAUNTLET_SWIMMER
const EVENT_BEAT_GAUNTLET_TAMER
const EVENT_BEAT_GAUNTLET_COOLTRAINER_F
const EVENT_BEAT_GAUNTLET_COOLTRAINER_M
; 6F Trainers
const EVENT_BEAT_GAUNTLET_BROCK
const EVENT_BEAT_GAUNTLET_MISTY
const EVENT_BEAT_GAUNTLET_SURGE
const EVENT_BEAT_GAUNTLET_ERIKA
const EVENT_BEAT_GAUNTLET_KOGA
const EVENT_BEAT_GAUNTLET_SABRINA
const EVENT_BEAT_GAUNTLET_BLAINE
; Lavender Town events
const_next $100 - 2
const EVENT_POKEMON_TOWER_RIVAL_ON_LEFT
@ -554,7 +506,7 @@
const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2
const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3
const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4
const EVENT_BEAT_GYAOON
const_skip
const EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2
; Route 24 events
@ -649,8 +601,6 @@
; New static encounter events
const_next $620
const_skip
const EVENT_BEAT_WUGTRIO
const_skip 7
const EVENT_BEAT_MEW
const_skip 7
const EVENT_BEAT_MOLTRES
@ -793,7 +743,7 @@
const EVENT_BEAT_OMEGA ; must be here
const EVENT_SILPH_CO_11_UNLOCKED_DOOR
const EVENT_GOT_CANDY_JAR
const EVENT_BEAT_CHIEF
const_skip
const EVENT_GOT_MASTER_BALL
const_skip
const EVENT_BEAT_SILPH_CO_GIOVANNI
@ -862,6 +812,65 @@ DEF INDIGO_PLATEAU_EVENTS_END EQU const_value - 1
const_skip 4
const EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH
; Silph Gauntlet events
const_next $930
DEF SILPH_GAUNTLET_EVENTS_START EQU const_value
; 1F Trainers
const_skip
const EVENT_BEAT_GAUNTLET_YOUNGSTER
const EVENT_BEAT_GAUNTLET_BUG_CATCHER
const EVENT_BEAT_GAUNTLET_STUDENT
const EVENT_BEAT_GAUNTLET_JR_TRAINER_M
const EVENT_BEAT_GAUNTLET_JR_TRAINER_F
const EVENT_BEAT_GAUNTLET_BIRD_KEEPER
; 2F Trainers
const_skip 2
const EVENT_BEAT_GAUNTLET_LASS
const EVENT_BEAT_GAUNTLET_HIKER
const EVENT_BEAT_GAUNTLET_SUPER_NERD
const EVENT_BEAT_GAUNTLET_POKEMANIAC
const EVENT_BEAT_GAUNTLET_BEAUTY
const EVENT_BEAT_GAUNTLET_BLACK_BELT
; 3F Trainers
const_skip 2
const EVENT_BEAT_GAUNTLET_SAILOR
const EVENT_BEAT_GAUNTLET_FIREFIGHTER
const EVENT_BEAT_GAUNTLET_GENTLEMAN
const EVENT_BEAT_GAUNTLET_ENGINEER
const EVENT_BEAT_GAUNTLET_ROCKER
const EVENT_BEAT_GAUNTLET_FISHER
; 4F Trainers
const_skip 2
const EVENT_BEAT_GAUNTLET_SCIENTIST
const EVENT_BEAT_GAUNTLET_GAMBLER
const EVENT_BEAT_GAUNTLET_ROCKET
const EVENT_BEAT_GAUNTLET_BIKER
const EVENT_BEAT_GAUNTLET_BURGLAR
const EVENT_BEAT_GAUNTLET_CHANNELER
; 5F Trainers
const_skip 2
const EVENT_BEAT_GAUNTLET_JUGGLER
const EVENT_BEAT_GAUNTLET_PSYCHIC
const EVENT_BEAT_GAUNTLET_CUE_BALL
const EVENT_BEAT_GAUNTLET_SWIMMER
const EVENT_BEAT_GAUNTLET_TAMER
const EVENT_BEAT_GAUNTLET_COOLTRAINER_F
const EVENT_BEAT_GAUNTLET_COOLTRAINER_M
; 6F Trainers
const_skip
const EVENT_BEAT_GAUNTLET_BROCK
const EVENT_BEAT_GAUNTLET_MISTY
const EVENT_BEAT_GAUNTLET_SURGE
const EVENT_BEAT_GAUNTLET_ERIKA
const EVENT_BEAT_GAUNTLET_KOGA
const EVENT_BEAT_GAUNTLET_SABRINA
const EVENT_BEAT_GAUNTLET_BLAINE
const_skip
const EVENT_BEAT_CHIEF
const_skip 5
const_skip
DEF SILPH_GAUNTLET_EVENTS_END EQU const_value - 1
; Rock Tunnel events
const_next $9B0
const_skip

16
constants/hide_show_constants.asm
View file

@ -105,7 +105,7 @@ DEF SHOW EQU $15
const HS_POWER_PLANT_ITEM_3 ; 5B X
const HS_POWER_PLANT_ITEM_4 ; 5C X
const HS_POWER_PLANT_ITEM_5 ; 5D X
const HS_GYAOON ; 5E X
const HS_VICTORY_ROAD_2F_ITEM_0 ; 5E X
const HS_VICTORY_ROAD_2F_ITEM_1 ; 5F X
const HS_VICTORY_ROAD_2F_ITEM_2 ; 60 X
const HS_VICTORY_ROAD_2F_ITEM_3 ; 61 X
@ -137,7 +137,6 @@ DEF SHOW EQU $15
const HS_SS_ANNE_B1F_ROOMS_ITEM_1 ; 7B X
const HS_SS_ANNE_B1F_ROOMS_ITEM_2 ; 7C X
const HS_SS_ANNE_B1F_ROOMS_ITEM_3 ; 7D X
const HS_WUGTRIO ; 7E X
const HS_VICTORY_ROAD_3F_ITEM_1 ; 7F X
const HS_VICTORY_ROAD_3F_ITEM_2 ; 80 X
const HS_VICTORY_ROAD_3F_BOULDER ; 81
@ -165,12 +164,7 @@ DEF SHOW EQU $15
const HS_SILPH_CO_3F_1 ; 97
const HS_SILPH_CO_3F_2 ; 98
const HS_SILPH_CO_3F_ITEM ; 99 X
const HS_SILPH_CO_4F_1 ; 9A
const HS_SILPH_CO_4F_2 ; 9B
const HS_SILPH_CO_4F_3 ; 9C
const HS_SILPH_CO_4F_ITEM_1 ; 9D X
const HS_SILPH_CO_4F_ITEM_2 ; 9E X
const HS_SILPH_CO_4F_ITEM_3 ; 9F X
const HS_SILPH_CO_5F_1 ; A0
const HS_SILPH_CO_5F_2 ; A1
const HS_SILPH_CO_5F_3 ; A2
@ -178,11 +172,7 @@ DEF SHOW EQU $15
const HS_SILPH_CO_5F_ITEM_1 ; A4 X
const HS_SILPH_CO_5F_ITEM_2 ; A5 X
const HS_SILPH_CO_5F_ITEM_3 ; A6 X
const HS_SILPH_CO_6F_1 ; A7
const HS_SILPH_CO_6F_2 ; A8
const HS_SILPH_CO_6F_3 ; A9
const HS_SILPH_CO_6F_ITEM_1 ; AA X
const HS_SILPH_CO_6F_ITEM_2 ; AB X
const HS_SILPH_CO_7F_1 ; AC
const HS_SILPH_CO_7F_2 ; AE
const HS_SILPH_CO_7F_3 ; AF

10
constants/map_constants.asm
View file

@ -166,8 +166,7 @@ DEF FIRST_INDOOR_MAP EQU const_value
map_const LAVENDER_POKECENTER, 7, 4 ; $8F
map_const POKEMON_TOWER_1F, 10, 9 ; $90
map_const POKEMON_TOWER_2F, 10, 9 ; $91
map_const BRUNSWICK_GROTTO, 15, 12 ; $92
; map_const POKEMON_TOWER_3F, 10, 9 ; $92 - Currently unused
map_const BRUNSWICK_GROTTO, 15, 12 ; $92 - Was Pokemon Tower 3F
map_const POKEMON_TOWER_4F, 10, 9 ; $93 - Currently unused
map_const POKEMON_TOWER_5F, 10, 9 ; $94 - Currently unused
map_const POKEMON_TOWER_6F, 10, 9 ; $95
@ -229,13 +228,12 @@ DEF FIRST_INDOOR_MAP EQU const_value
map_const CITRINE_MART, 4, 4 ; $CD - was UNUSED_MAP_CC
map_const GARNET_CAVERN_1F, 15, 9 ; $CE - was UNUSED_MAP_CD
map_const GARNET_CAVERN_B1F, 15, 9 ; $CF - was UNUSED_MAP_CE
map_const SILPH_CO_2F, 15, 9 ; $D0
map_const VERMILION_FERRY_DOCK, 14, 6 ; $D0 - was SILPH_CO_2F
map_const SILPH_CO_3F, 15, 9 ; $D1
map_const SILPH_CO_4F, 15, 9 ; $D2
map_const CITRINE_FERRY_DOCK, 14, 6 ; $D2 - was SILPH_CO_4F
map_const SILPH_CO_5F, 15, 9 ; $D3
map_const SILPH_CO_6F, 13, 9 ; $D4
map_const SEAGALLOP_FERRY, 5, 4 ; $D4 - was SILPH_CO_6F
map_const SILPH_CO_7F, 13, 9 ; $D5
;map_const SILPH_CO_8F, 13, 9 ; $D6
map_const POKEMON_MANSION_2F, 15, 14 ; $D7
map_const POKEMON_MANSION_3F, 15, 9 ; $D8
map_const POKEMON_MANSION_B1F, 15, 14 ; $D9

385
constants/pokedex_constants.asm
View file

@ -32,7 +32,7 @@
const DEX_PIDGEY ; 16 (026)
const DEX_PIDGEOTTO ; 17 (027)
const DEX_PIDGEOT ; 18 (028)
const DEX_KONYA ; (029) - Route 2 + Viridian Forest
const DEX_COINPUR ; (029) - Route 2 + Viridian Forest
const DEX_MEOWTH ; 52 (030)
const DEX_PERSIAN ; 53 (031)
const DEX_PERSIAN_A ; (032)
@ -44,88 +44,88 @@
const DEX_KAKUNA ; 14 (038)
const DEX_BEEDRILL ; 15 (039)
const DEX_KOKANA ; (040)
const DEX_KASANAGI ; (041)
const DEX_PUPAL ; (041)
const DEX_CARAPTHOR ; (042)
const DEX_SPEAROW ; 21 (043) - Route 3
const DEX_FEAROW ; 22 (044)
const DEX_EKANS ; 23 (045)
const DEX_ARBOK ; 24 (046)
const DEX_SANDSHREW ; 27 (047)
const DEX_SANDSLASH ; 28 (048)
const DEX_SANDSLASH_A ; (049)
const DEX_NIDORAN_F ; 29 (050)
const DEX_NIDORINA ; 30 (051)
const DEX_NIDOQUEEN ; 31 (052)
const DEX_NIDORAN_M ; 32 (053)
const DEX_NIDORINO ; 33 (054)
const DEX_NIDOKING ; 34 (055)
const DEX_NIDOREIGN ; (056)
const DEX_BITTYBAT ; (057) - Mt. Moon
const DEX_ZUBAT ; 41 (058)
const DEX_GOLBAT ; 42 (059)
const DEX_CROBAT ; (060)
const DEX_GEODUDE ; 74 (061)
const DEX_GRAVELER ; 75 (062)
const DEX_GOLEM ; 76 (063)
const DEX_GOLEM_A ; (064)
const DEX_PARAS ; 46 (065)
const DEX_PARASECT ; 47 (066)
const DEX_CLEFAIRY ; 35 (067)
const DEX_CLEFABLE ; 36 (068)
const DEX_JIGGLYPUFF ; 39 (069) - Route 4
const DEX_WIGGLYTUFF ; 40 (070)
const DEX_MIKON ; (071)
const DEX_VULPIX ; 37 (072)
const DEX_NINETALES ; 38 (073)
const DEX_NINETALES_A ; (074)
const DEX_GROWLITHE ; 58 (075)
const DEX_ARCANINE ; 59 (076)
const DEX_ARCANINE_H ; (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_TSUBOMITTO ; (088)
const DEX_MAGIKARP ; 129 (089)
const DEX_GYARADOS ; 130 (090)
const DEX_GYOPIN ; (091)
const DEX_GOLDEEN ; 118 (092)
const DEX_SEAKING ; 119 (093)
const DEX_VENONAT ; 48 (094)
const DEX_VENOMOTH ; 49 (095)
const DEX_CHEEP ; (096)
const DEX_JABETTA ; (097)
const DEX_PSYDUCK ; 54 (098)
const DEX_WEIRDUCK ; (099)
const DEX_GOLDUCK ; 55 (100)
const DEX_POLIWAG ; 60 (101)
const DEX_POLIWHIRL ; 61 (102)
const DEX_POLIWRATH ; 62 (103)
const DEX_POLITOED ; (104)
const DEX_ABRA ; 63 (105)
const DEX_KADABRA ; 64 (106)
const DEX_ALAKAZAM ; 65 (107)
const DEX_KOTORA ; (043)
const DEX_GAOTORA ; (044)
const DEX_GOROTORA ; (045)
const DEX_SPEAROW ; 21 (046) - Route 3 + Mt. Moon
const DEX_FEAROW ; 22 (047)
const DEX_NIDORAN_F ; 29 (048)
const DEX_NIDORINA ; 30 (049)
const DEX_NIDOQUEEN ; 31 (050)
const DEX_NIDORAN_M ; 32 (051)
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_LICKITUNG ; 108 (108) (There's a reason we're keeping Lickitung's number.)
const DEX_LICKILICKY ; (109)
const DEX_DROWZEE ; 96 (110) - Route 11 + Diglett's Cave
const DEX_HYPNO ; 97 (111)
const DEX_DIGLETT ; 50 (112)
const DEX_DUGTRIO ; 51 (113)
const DEX_DUGTRIO_A ; (114)
const DEX_WIGLETT ; (115)
const DEX_WUGTRIO ; (116)
const DEX_ONIX ; 95 (117)
const DEX_STEELIX ; (118)
const DEX_KOTORA ; (119) - Route 10 + Rock Tunnel + Fishing Rod 2
const DEX_GAOTORA ; (120)
const DEX_GOROTORA ; (121)
const DEX_VOLTORB ; 100 (122)
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)
@ -134,16 +134,16 @@
const DEX_TOEDSCRUEL ; (128)
const DEX_BLOTTLE ; (129)
const DEX_PENDRAKEN ; (130)
const DEX_RIBBITO ; (131)
const DEX_CROAKOZUNA ; (132)
const DEX_MAGNEMITE ; 81 (133)
const DEX_MAGNETITE ; (134)
const DEX_MAGNETON ; 82 (135)
const DEX_MAGNEZONE ; (136)
const DEX_MACHOP ; 66 (137)
const DEX_MACHOKE ; 67 (138)
const DEX_MACHAMP ; 68 (139)
const DEX_CROCKY ; (140)
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)
@ -151,109 +151,106 @@
const DEX_SLOWBRO_G ; (145)
const DEX_SLOWKING ; (146)
const DEX_SLOWKING_G ; (147)
const DEX_PUCHIKOON ; (148) - Route 7 + Route 8
const DEX_PONYTA ; 77 (149)
const DEX_RAPIDASH ; 78 (150)
const DEX_RAPIDASH_G ; (151)
const DEX_DEER ; (152)
const DEX_MONJA ; (153)
const DEX_TANGELA ; 114 (154)
const DEX_TANGROWTH ; (155)
const DEX_BARUNDA ; (156)
const DEX_GASTLY ; 92 (157) - Lavender Tower
const DEX_HAUNTER ; 93 (158)
const DEX_GENGAR ; 94 (159)
const DEX_CUBONE ; 104 (160)
const DEX_MAROWAK ; 105 (161)
const DEX_MAROWAK_A ; (162)
const DEX_GUARDIA ; (163)
const DEX_FARFETCHD ; 83 (164) - Routes 13-18
const DEX_MADAAMU ; (165)
const DEX_SIRFETCHD ; (166)
const DEX_DODUO ; 84 (167)
const DEX_DODRIO ; 85 (168)
const DEX_GRIMER ; 88 (169)
const DEX_MUK ; 89 (170)
const DEX_MUK_A ; (171)
const DEX_KOFFING ; 109 (172)
const DEX_WEEZING ; 110 (173)
const DEX_WEEZING_G ; (174)
const DEX_DITTO ; 132 (175)
const DEX_ANIMON ; (176)
const DEX_MR_MIME ; 122 (177)
const DEX_MR_RIME ; (178)
const DEX_CACTUS ; (179)
const DEX_HITMONLEE ; 106 (180) - Saffron City
const DEX_HITMONCHAN ; 107 (181)
const DEX_HITMONTOP ; (182)
const DEX_SHELLDER ; 90 (183) - Surfing, Fishing Rod 3, Seafoam Islands
const DEX_CLOYSTER ; 91 (184)
const DEX_TAABAN ; (185)
const DEX_STARYU ; 120 (186)
const DEX_STARMIE ; 121 (187)
const DEX_SEEL ; 86 (188)
const DEX_DEWGONG ; 87 (189)
const DEX_BLASTYKE ; (190)
const DEX_BLASTOISE ; 9 (191)
const DEX_HORSEA ; 116 (192)
const DEX_SEADRA ; 117 (193)
const DEX_KINGDRA ; (194)
const DEX_JAGG ; (195)
const DEX_EXEGGCUTE ; 102 (196) - Safari Zone
const DEX_EXEGGUTOR ; 103 (197)
const DEX_EXEGGUTOR_A ; (198)
const DEX_RHYHORN ; 111 (199)
const DEX_RHYDON ; 112 (200)
const DEX_RHYPERIOR ; (201)
const DEX_SCYTHER ; 123 (202)
const DEX_SCIZOR ; (203)
const DEX_KLEAVOR ; (204)
const DEX_PINSIR ; 127 (205)
const DEX_PURAKKUSU ; (206)
const DEX_KANGASKHAN ; 115 (207)
const DEX_TRAMPEL ; (208)
const DEX_TAUROS ; 128 (209)
const DEX_TAUROS_P ; (210)
const DEX_TAUROS_PA ; (211)
const DEX_TAUROS_PB ; (212)
const DEX_CHANSEY ; 113 (213)
const DEX_BLISSEY ; (214)
const DEX_SKIMPER ; (215) - Rare/Special Pokemon
const DEX_BAWLIGUA ; (216)
const DEX_CRYITHAN ; (217)
const DEX_JYNX ; 124 (218)
const DEX_BUU ; (219)
const DEX_ELECTABUZZ ; 125 (220)
const DEX_ELECTIVIRE ; (221)
const DEX_MAGMAR ; 126 (222)
const DEX_MAGMORTAR ; (223)
const DEX_LAPRAS ; 131 (224)
const DEX_PORYGON ; 137 (225)
const DEX_PORYGON2 ; (226)
const DEX_PORYGONZ ; (227)
const DEX_OMANYTE ; 138 (228)
const DEX_OMASTAR ; 139 (229)
const DEX_KABUTO ; 140 (230)
const DEX_KABUTOPS ; 141 (231)
const DEX_AERODACTYL ; 142 (232)
const DEX_DECILLA ; (233)
const DEX_GYAOON ; (234)
const DEX_OMEGA ; (235)
const DEX_SNORLAX ; 143 (236)
const DEX_SCREAM_TAIL ; (237) - Paradoxes, Legendary and Mythical Pokemon
const DEX_SANDY_SHOCKS ; (238)
const DEX_DRATINI ; 147 (239)
const DEX_DRAGONAIR ; 148 (240)
const DEX_DRAGONITE ; 149 (241)
const DEX_ARTICUNO ; 144 (242)
const DEX_ARTICUNO_G ; (243)
const DEX_ZAPDOS ; 145 (244)
const DEX_ZAPDOS_G ; (245)
const DEX_MOLTRES ; 146 (246)
const DEX_MOLTRES_G ; (247)
const DEX_MEWTWO ; 150 (248)
const DEX_MEW ; 151 (249)
const DEX_MELTAN ; (250)
const DEX_MELMETAL ; (251)
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_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)
DEF NUM_POKEMON EQU const_value - 1

189
constants/pokemon_constants.asm
View file

@ -16,7 +16,7 @@
const NIDOKING ; $07
const SLOWBRO ; $08
const IVYSAUR ; $09
const EXEGGUTOR ; $0A - Moon Stone (Evo Stone Glitch)
const EXEGGUTOR ; $0A
const LICKITUNG ; $0B
const EXEGGCUTE ; $0C
const GRIMER ; $0D
@ -37,10 +37,10 @@
const BLASTOISE ; $1C
const PINSIR ; $1D
const TANGELA ; $1E
const GYAOON ; $1F (new)
const NIDOREIGN ; $20 (new) Fire Stone (Evo Stone Glitch)
const GROWLITHE ; $21 - Thunderstone (Evo Stone Glitch)
const ONIX ; $22 - Water Stone (Evo Stone Glitch)
const GAWARHED ; $1F (new)
const NIDOREIGN ; $20 (new)
const GROWLITHE ; $21
const ONIX ; $22
const FEAROW ; $23
const PIDGEY ; $24
const SLOWPOKE ; $25
@ -50,58 +50,58 @@
const MACHOKE ; $29
const MR_MIME ; $2A
const HITMONLEE ; $2B
const HITMONCHAN ; $2C - Heart Stone (Evo Stone Glitch)
const HITMONCHAN ; $2C
const ARBOK ; $2D
const PARASECT ; $2E
const PSYDUCK ; $2F - Leaf Stone (Evo Stone Glitch)
const PSYDUCK ; $2F
const DROWZEE ; $30
const GOLEM ; $31
const BARUNDA ; $32 (new)
const BALUMBA ; $32 (new)
const MAGMAR ; $33
const BUU ; $34 (new)
const ELECTABUZZ ; $35
const MAGNETON ; $36
const KOFFING ; $37
const DEER ; $38 (new)
const RAMOOSE ; $38 (new)
const MANKEY ; $39
const SEEL ; $3A
const DIGLETT ; $3B
const TAUROS ; $3C
const TRAMPEL ; $3D (new)
const CROCKY ; $3E (new)
const GAVILLAIN ; $3E (new)
const BLOTTLE ; $3F (new)
const FARFETCHD ; $40
const VENONAT ; $41
const DRAGONITE ; $42
const CACTUS ; $43 (new)
const JAGG ; $44 (new)
const BITTYBAT ; $45 (new)
const CACTORMUS ; $43 (new)
const SHARPOON ; $44 (new)
const WIGLETT ; $45 (new)
const DODUO ; $46
const POLIWAG ; $47
const JYNX ; $48
const MOLTRES ; $49
const ARTICUNO ; $4A
const ZAPDOS ; $4B
const DITTO ; $4C - Candy Jar (Evo Stone Glitch)
const DITTO ; $4C
const MEOWTH ; $4D
const KRABBY ; $4E
const CHEEP ; $4F (new)
const JABETTA ; $50 (new)
const MIKON ; $51 (new)
const VULPIII ; $51 (new)
const VULPIX ; $52
const NINETALES ; $53
const PIKACHU ; $54 - Ice Stone (Evo Stone Glitch)
const RAICHU ; $55 - Protector (Evo Stone Glitch)
const RIBBITO ; $56 (new) Poison Stone (Evo Stone Glitch)
const CROAKOZUNA ; $57 (new) Black Augurite (Evo Stone Glitch)
const DRATINI ; $58 - Dubious Disc (Evo Stone Glitch)
const PIKACHU ; $54
const RAICHU ; $55
const RIBBITO ; $56 (new)
const CROAKOZUNA ; $57 (new)
const DRATINI ; $58
const DRAGONAIR ; $59
const KABUTO ; $5A
const KABUTOPS ; $5B - Up-Grade (Evo Stone Glitch)
const HORSEA ; $5C - Metal Coat (Evo Stone Glitch)
const KABUTOPS ; $5B
const HORSEA ; $5C
const SEADRA ; $5D
const BAWLIGUA ; $5E (new)
const CRYITHAN ; $5F (new)
const MINISTARE ; $5E (new)
const IGUANARCH ; $5F (new)
const SANDSHREW ; $60
const SANDSLASH ; $61
const OMANYTE ; $62
@ -121,13 +121,13 @@
const WEEDLE ; $70
const KAKUNA ; $71
const BEEDRILL ; $72
const MADAAMU ; $73 (new)
const LUXWAN ; $73 (new)
const DODRIO ; $74
const PRIMEAPE ; $75
const DUGTRIO ; $76
const VENOMOTH ; $77
const DEWGONG ; $78
const PURAKKUSU ; $79 (new)
const TRICULES ; $79 (new)
const PENDRAKEN ; $7A (new)
const CATERPIE ; $7B
const METAPOD ; $7C
@ -140,13 +140,13 @@
const MEWTWO ; $83
const SNORLAX ; $84
const MAGIKARP ; $85
const KONYA ; $86 (new)
const OMEGA ; $87 (new)
const COINPUR ; $86 (new)
const OMEGADGE ; $87 (new)
const MUK ; $88
const DECILLA ; $89 (new)
const KINGLER ; $8A
const CLOYSTER ; $8B
const MAGNETITE ; $8C (new)
const WUGTRIO ; $8C (new)
const ELECTRODE ; $8D
const CLEFABLE ; $8E
const WEEZING ; $8F
@ -162,13 +162,13 @@
const BULBASAUR ; $99
const VENUSAUR ; $9A
const TENTACRUEL ; $9B
const GYOPIN ; $9C (new)
const ORFRY ; $9C (new)
const GOLDEEN ; $9D
const SEAKING ; $9E
const KOTORA ; $9F (new)
const GAOTORA ; $A0 (new)
const GOROTORA ; $A1 (new)
const PUCHIKOON ; $A2 (new)
const KOLTA ; $A2 (new)
const PONYTA ; $A3
const RAPIDASH ; $A4
const RATTATA ; $A5
@ -180,7 +180,7 @@
const AERODACTYL ; $AB
const BLASTYKE ; $AC (new)
const MAGNEMITE ; $AD
const SKIMPER ; $AE (new)
const SQUEAMATA ; $AE (new)
const GOROCHU ; $AF (new)
const CHARMANDER ; $B0
const SQUIRTLE ; $B1
@ -197,70 +197,67 @@
const BELLSPROUT ; $BC
const WEEPINBELL ; $BD
const VICTREEBEL ; $BE
const MONJA ; $BF (new pokemon start here)
const SCIZOR ; $C0
const RHYPERIOR ; $C1
const ESPEON ; $C2
const UMBREON ; $C3
const LEAFEON ; $C4
const GLACEON ; $C5
const SYLVEON ; $C6
const LICKILICKY ; $C7
const TANGROWTH ; $C8
const KLEAVOR ; $C9
const TSUBOMITTO ; $CA
const STEELIX ; $CB
const BLISSEY ; $CC
const HITMONTOP ; $CD
const CROBAT ; $CE
const ANIMON ; $CF
const BELLOSSOM ; $D0
const PORYGON2 ; $D1
const KINGDRA ; $D2
const POLITOED ; $D3
const SLOWKING ; $D4
const ELECTIVIRE ; $D5
const MAGMORTAR ; $D6
const TAABAN ; $D7
const KOKANA ; $D8
const KASANAGI ; $D9
const CARAPTHOR ; $DA
const MAGNEZONE ; $DB
const PORYGONZ ; $DC
const ANNIHILAPE ; $DD
const SCREAM_TAIL ; $DE
const SANDY_SHOCKS ; $DF
const WIGLETT ; $E0
const WUGTRIO ; $E1
const TOEDSCOOL ; $E2
const TOEDSCRUEL ; $E3
const PERRSERKER ; $E4
const SIRFETCHD ; $E5
const MR_RIME ; $E6
const MELTAN ; $E7
const MELMETAL ; $E8
const ARCANINE_H ; $E9
const ELECTRODE_H ; $EA
const RATICATE_A ; $EB
const RAICHU_A ; $EC
const SANDSLASH_A ; $ED
const NINETALES_A ; $EE
const DUGTRIO_A ; $EF
const PERSIAN_A ; $F0
const GOLEM_A ; $F1
const RAPIDASH_G ; $F2
const SLOWBRO_G ; $F3
const SLOWKING_G ; $F4
const MUK_A ; $F5
const EXEGGUTOR_A ; $F6
const MAROWAK_A ; $F7
const WEEZING_G ; $F8
const TAUROS_P ; $F9
const TAUROS_PA ; $FA
const TAUROS_PB ; $FB
const FOSSIL_KABUTOPS ; $FC (was B6)
const FOSSIL_AERODACTYL ; $FD (was B7)
const MON_GHOST ; $FE (was B8)
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 KOKANA ; $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)
DEF NUM_POKEMON_INDEXES EQU const_value - 1