Skip to content

Commit 2647e98

Browse files
DakoriasDakorias
committed
Switched around new pokemon
1 parent 1ac43ce commit 2647e98

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+511
-505
lines changed

‎constants/event_flags.asm

+2-3
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@
6767
const EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP
6868
const EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP
6969
const EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY
70-
const_skip ; unused
71-
const_skip ; unused
7270
const EVENT_HEALED_MOOMOO
7371
const EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM
7472
const EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO
@@ -135,7 +133,8 @@
135133
const EVENT_GOT_MASTER_BALL_FROM_ELM
136134
; Monego hidden items
137135
const EVENT_EDWARD_COIN_GOT
138-
const EVENT_SCENIC_BLUFF_SUPER_POTION
136+
const EVENT_SCENIC_BLUFF_HIDDEN_SUPER_POTION
137+
const_skip
139138
const_skip ; unused in Crystal
140139
const_skip ; unused in Crystal
141140
const_skip ; unused in Crystal

‎constants/icon_constants.asm

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
const ICON_NULL
44
const ICON_EKANS
55
const ICON_ARBOK
6-
const ICON_HOUNDOUR
7-
const ICON_HOUNDOOM
6+
const ICON_YANMA
7+
const ICON_YANMEGA
88
const ICON_BALTOY
99
const ICON_CLAYDOL
1010
const ICON_BIDOOF
@@ -67,14 +67,14 @@
6767
const ICON_KADABRA
6868
const ICON_ALAKAZAM
6969
const ICON_DITTO
70-
const ICON_NIDORAN_M
71-
const ICON_NIDORINO
72-
const ICON_NIDOKING
73-
const ICON_NIDORAN_F
74-
const ICON_NIDORINA
75-
const ICON_NIDOQUEEN
76-
const ICON_YANMA
77-
const ICON_YANMEGA
70+
const ICON_DHELMISE
71+
const ICON_SUNKERN
72+
const ICON_SUNFLORA
73+
const ICON_LITWICK
74+
const ICON_LAMPENT
75+
const ICON_CHANDELURE
76+
const ICON_HOUNDOUR
77+
const ICON_HOUNDOOM
7878
const ICON_NUMEL
7979
const ICON_CAMERUPT
8080
const ICON_DRIFLOON

‎constants/map_constants.asm

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ ENDM
8181

8282
newgroup CRAGGY_COAST ; 6
8383
map_const CRAGGY_COAST, 20, 16 ; 1
84-
map_const SCENIC_BLUFF, 15, 26 ; 2
84+
map_const SCENIC_BLUFF, 14, 26 ; 2
8585
map_const MOUNTAIN_CAVE, 10, 14 ; 3
8686
map_const CRAGGY_COAST_HOUSE1, 5, 4 ; 4
8787
map_const CRAGGY_COAST_HOUSE2, 5, 4 ; 5
@@ -96,4 +96,4 @@ ENDM
9696
map_const BERRY_FOREST_HOUSE, 5, 4 ; 2
9797
endgroup
9898

99-
DEF NUM_MAP_GROUPS EQU const_value ; 6
99+
DEF NUM_MAP_GROUPS EQU const_value ; 7

‎constants/pokemon_constants.asm

+10-10
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
const_def 1
2222
const EKANS ; 01
2323
const ARBOK ; 02
24-
const HOUNDOUR ; 03
25-
const HOUNDOOM ; 04
24+
const YANMA ; 03
25+
const YANMEGA ; 04
2626
const BALTOY ; 05
2727
const CLAYDOL ; 06
2828
const BIDOOF ; 07
@@ -85,14 +85,14 @@
8585
const KADABRA ; 41
8686
const ALAKAZAM ; 42
8787
const DITTO ; 43
88-
const NIDORAN_M ; 44
89-
const NIDORINO ; 45
90-
const NIDOKING ; 46
91-
const NIDORAN_F ; 47
92-
const NIDORINA ; 48
93-
const NIDOQUEEN ; 49
94-
const YANMA ; 4a
95-
const YANMEGA ; 4b
88+
const DHELMISE ; 44
89+
const SUNKERN ; 45
90+
const SUNFLORA ; 46
91+
const LITWICK ; 47
92+
const LAMPENT ; 48
93+
const CHANDELURE ; 49
94+
const HOUNDOUR ; 4a
95+
const HOUNDOOM ; 4b
9696
const NUMEL ; 4c
9797
const CAMERUPT ; 4d
9898
const DRIFLOON ; 4e

‎data/battle_tower/parties.asm

+2-2
Original file line numberDiff line numberDiff line change
@@ -1047,7 +1047,7 @@ BattleTowerMons:
10471047
bigdw 36 ; SDef
10481048
db "PUKURIN@@@@"
10491049

1050-
db NIDOKING
1050+
db WOOPER
10511051
db BERRY
10521052
db BLIZZARD, EARTHQUAKE, SURF, THUNDERPUNCH
10531053
dw 0 ; OT ID
@@ -1071,7 +1071,7 @@ BattleTowerMons:
10711071
bigdw 49 ; Spd
10721072
bigdw 50 ; SAtk
10731073
bigdw 46 ; SDef
1074-
db "NIDOKINGU@@"
1074+
db "WOOPER@@@@@"
10751075

10761076
db PIDGEY
10771077
db QUICK_CLAW

‎data/maps/landmarks.asm

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@ ENDM
77
Landmarks:
88
; entries correspond to constants/landmark_constants.asm
99
table_width 4, Landmarks
10-
landmark 0, 0, SpecialMapName
11-
10+
landmark -8, -16, SpecialMapName
1211
landmark 28, 76, HeraldCoveName
1312
landmark 18, 76, HeraldRouteName
1413
landmark 20, 64, CraggyBeachName
15-
landmark 20, 52, CraggyBeachName
14+
landmark 20, 52, CraggyCoastName
1615
landmark 20, 40, ScenicBluffName
1716
landmark 20, 28, MountainCaveName
1817
landmark 12, 60, BerryForestName

‎data/maps/scripts.asm

+3-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ INCLUDE "maps/HeraldPokecenter.asm"
2424
INCLUDE "maps/HeraldGym.asm"
2525
INCLUDE "maps/HeraldHouse.asm"
2626
INCLUDE "maps/HeraldPort.asm"
27-
27+
INCLUDE "maps/CraggyBeach.asm"
2828

2929
SECTION "Map Scripts 4", ROMX
3030

@@ -42,7 +42,6 @@ INCLUDE "maps/LancesRoom.asm"
4242
INCLUDE "maps/HallOfFame.asm"
4343

4444
SECTION "Map Scripts 5", ROMX
45-
INCLUDE "maps/CraggyBeach.asm"
4645
INCLUDE "maps/CraggyCoast.asm"
4746
INCLUDE "maps/ScenicBluff.asm"
4847
INCLUDE "maps/MountainCave.asm"
@@ -52,10 +51,10 @@ INCLUDE "maps/CraggyCoastPokecenter.asm"
5251
INCLUDE "maps/CraggyCoastFishing.asm"
5352
INCLUDE "maps/BeachGrotto.asm"
5453
INCLUDE "maps/MountainGym.asm"
55-
INCLUDE "maps/BerryForest.asm"
56-
INCLUDE "maps/BerryForestHouse.asm"
5754

5855
SECTION "Map Scripts 6", ROMX
56+
INCLUDE "maps/BerryForest.asm"
57+
INCLUDE "maps/BerryForestHouse.asm"
5958

6059

6160
SECTION "Map Scripts 7", ROMX

‎data/moves/moves.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ Moves:
242242
move BATON_PASS, EFFECT_BATON_PASS, 0, NORMAL, 100, 10, 0
243243
move ENCORE, EFFECT_ENCORE, 0, NORMAL, 100, 5, 0
244244
move PURSUIT, EFFECT_PURSUIT, 40, DARK, 100, 20, 0
245-
move RAPID_SPIN, EFFECT_RAPID_SPIN, 35, NORMAL, 100, 40, 0
245+
move RAPID_SPIN, EFFECT_RAPID_SPIN, 35, NORMAL, 30, 40, 0
246246
move POISON_JAB, EFFECT_POISON_HIT, 80, NORMAL, 100, 15, 30
247247
move IRON_TAIL, EFFECT_DEFENSE_DOWN_HIT, 100, STEEL, 90, 15, 30
248248
move METAL_CLAW, EFFECT_ATTACK_UP_HIT, 65, STEEL, 100, 35, 10

‎data/pokemon/base_stats.asm

+10-10
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ BaseData::
2525
table_width BASE_DATA_SIZE, BaseData
2626
INCLUDE "data/pokemon/base_stats/ekans.asm"
2727
INCLUDE "data/pokemon/base_stats/arbok.asm"
28-
INCLUDE "data/pokemon/base_stats/houndour.asm"
29-
INCLUDE "data/pokemon/base_stats/houndoom.asm"
28+
INCLUDE "data/pokemon/base_stats/yanma.asm"
29+
INCLUDE "data/pokemon/base_stats/yanmega.asm"
3030
INCLUDE "data/pokemon/base_stats/baltoy.asm"
3131
INCLUDE "data/pokemon/base_stats/claydol.asm"
3232
INCLUDE "data/pokemon/base_stats/bidoof.asm"
@@ -89,14 +89,14 @@ INCLUDE "data/pokemon/base_stats/abra.asm"
8989
INCLUDE "data/pokemon/base_stats/kadabra.asm"
9090
INCLUDE "data/pokemon/base_stats/alakazam.asm"
9191
INCLUDE "data/pokemon/base_stats/ditto.asm"
92-
INCLUDE "data/pokemon/base_stats/nidoran_m.asm"
93-
INCLUDE "data/pokemon/base_stats/nidorino.asm"
94-
INCLUDE "data/pokemon/base_stats/nidoking.asm"
95-
INCLUDE "data/pokemon/base_stats/nidoran_f.asm"
96-
INCLUDE "data/pokemon/base_stats/nidorina.asm"
97-
INCLUDE "data/pokemon/base_stats/nidoqueen.asm"
98-
INCLUDE "data/pokemon/base_stats/yanma.asm"
99-
INCLUDE "data/pokemon/base_stats/yanmega.asm"
92+
INCLUDE "data/pokemon/base_stats/dhelmise.asm"
93+
INCLUDE "data/pokemon/base_stats/sunkern.asm"
94+
INCLUDE "data/pokemon/base_stats/sunflora.asm"
95+
INCLUDE "data/pokemon/base_stats/litwick.asm"
96+
INCLUDE "data/pokemon/base_stats/lampent.asm"
97+
INCLUDE "data/pokemon/base_stats/chandelure.asm"
98+
INCLUDE "data/pokemon/base_stats/houndour.asm"
99+
INCLUDE "data/pokemon/base_stats/houndoom.asm"
100100
INCLUDE "data/pokemon/base_stats/numel.asm"
101101
INCLUDE "data/pokemon/base_stats/camerupt.asm"
102102
INCLUDE "data/pokemon/base_stats/drifloon.asm"

‎data/pokemon/base_stats/butterfree.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
db 60, 45, 50, 70, 80, 80
44
; hp atk def spd sat sdf
55

6-
db BUG, FLYING ; type
6+
db BUG, PSYCHIC_TYPE ; type
77
db 45 ; catch rate
88
db 160 ; base exp
99
db NO_ITEM, SILVERPOWDER ; items

‎data/pokemon/base_stats/nidoqueen.asm ‎data/pokemon/base_stats/chandelure.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
db NIDOQUEEN ; 072
1+
db CHANDELURE ; 072
22

33
db 90, 82, 87, 76, 75, 85
44
; hp atk def spd sat sdf

‎data/pokemon/base_stats/nidoran_m.asm ‎data/pokemon/base_stats/dhelmise.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
db NIDORAN_M ; 067
1+
db DHELMISE ; 067
22

33
db 46, 57, 40, 50, 40, 40
44
; hp atk def spd sat sdf

‎data/pokemon/base_stats/houndoom.asm

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
db HOUNDOOM ; 004
1+
db HOUNDOOM ; 074
22

33
db 75, 90, 50, 95, 110, 80
44
; hp atk def spd sat sdf
@@ -13,7 +13,7 @@
1313
db 5 ; unknown 2
1414
INCBIN "gfx/pokemon/houndoom/front.dimensions"
1515
dw NULL, NULL ; unused (beta front/back pics)
16-
db GROWTH_MEDIUM_SLOW ; growth rate
16+
db GROWTH_SLOW ; growth rate
1717
dn EGG_GROUND, EGG_GROUND ; egg groups
1818

1919
; tm/hm learnset

‎data/pokemon/base_stats/houndour.asm

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
db HOUNDOUR ; 003
1+
db HOUNDOUR ; 073
22

33
db 45, 60, 30, 65, 80, 50
44
; hp atk def spd sat sdf
55

66
db DARK, FIRE ; type
77
db 120 ; catch rate
8-
db 69 ; base exp
8+
db 114 ; base exp
99
db NO_ITEM, NO_ITEM ; items
1010
db GENDER_F50 ; gender ratio
1111
db 100 ; unknown 1
1212
db 20 ; step cycles to hatch
1313
db 5 ; unknown 2
1414
INCBIN "gfx/pokemon/houndour/front.dimensions"
1515
dw NULL, NULL ; unused (beta front/back pics)
16-
db GROWTH_MEDIUM_SLOW ; growth rate
16+
db GROWTH_SLOW ; growth rate
1717
dn EGG_GROUND, EGG_GROUND ; egg groups
1818

1919
; tm/hm learnset

‎data/pokemon/base_stats/kingler.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
db 55, 130, 115, 75, 50, 50
44
; hp atk def spd sat sdf
55

6-
db WATER, WATER ; type
6+
db POISON, WATER ; type
77
db 60 ; catch rate
88
db 206 ; base exp
99
db NO_ITEM, NO_ITEM ; items

‎data/pokemon/base_stats/krabby.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
db 30, 105, 90, 50, 25, 25
44
; hp atk def spd sat sdf
55

6-
db WATER, WATER ; type
6+
db POISON, WATER ; type
77
db 225 ; catch rate
88
db 115 ; base exp
99
db NO_ITEM, NO_ITEM ; items

‎data/pokemon/base_stats/nidorina.asm ‎data/pokemon/base_stats/lampent.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
db NIDORINA ; 071
1+
db SUNKERN ; 071
22

33
db 70, 62, 67, 56, 55, 55
44
; hp atk def spd sat sdf

‎data/pokemon/base_stats/nidoran_f.asm ‎data/pokemon/base_stats/litwick.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
db NIDORAN_F ; 070
1+
db LITWICK ; 070
22

33
db 55, 47, 52, 41, 40, 40
44
; hp atk def spd sat sdf

‎data/pokemon/base_stats/masquerain.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
db 70, 60, 60, 80, 100, 70
44
; hp atk def spd sat sdf
55

6-
db BUG, FLYING ; type
6+
db BUG, WATER ; type
77
db 75 ; catch rate
88
db 135 ; base exp
99
db NO_ITEM, NO_ITEM ; items

‎data/pokemon/base_stats/nidoking.asm ‎data/pokemon/base_stats/sunflora.asm

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
db NIDOKING ; 069
1+
db SUNFLORA ; 069
22

33
db 81, 92, 77, 85, 85, 75
44
; hp atk def spd sat sdf
55

6-
db POISON, GROUND ; type
6+
db GRASS, FIRE ; type
77
db 45 ; catch rate
88
db 195 ; base exp
99
db NO_ITEM, NO_ITEM ; items

‎data/pokemon/base_stats/nidorino.asm ‎data/pokemon/base_stats/sunkern.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
db NIDORINO ; 068
1+
db LAMPENT ; 068
22

33
db 61, 72, 57, 65, 55, 55
44
; hp atk def spd sat sdf

‎data/pokemon/base_stats/wobbuffet.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
db 190, 33, 58, 33, 33, 58
44
; hp atk def spd sat sdf
55

6-
db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
6+
db PSYCHIC_TYPE, GHOST ; type
77
db 45 ; catch rate
88
db 177 ; base exp
99
db NO_ITEM, NO_ITEM ; items

‎data/pokemon/base_stats/yanma.asm

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
db YANMA ; 073
1+
db YANMA ; 003
22

33
db 65, 65, 45, 95, 75, 45
44
; hp atk def spd sat sdf
@@ -13,7 +13,7 @@
1313
db 5 ; unknown 2
1414
INCBIN "gfx/pokemon/yanma/front.dimensions"
1515
dw NULL, NULL ; unused (beta front/back pics)
16-
db GROWTH_MEDIUM_FAST ; growth rate
16+
db GROWTH_MEDIUM_SLOW ; growth rate
1717
dn EGG_BUG, EGG_BUG ; egg groups
1818

1919
; tm/hm learnset

‎data/pokemon/base_stats/yanmega.asm

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
db YANMEGA ; 074
1+
db YANMEGA ; 004
22

3-
db 110, 80, 80, 30, 90, 80
3+
db 80, 90, 75, 100, 100, 55
44
; hp atk def spd sat sdf
55

6-
db GRASS, DRAGON ; type
7-
db 45 ; catch rate
8-
db 182 ; base exp
6+
db BUG, DRAGON ; type
7+
db 30 ; catch rate
8+
db 198 ; base exp
99
db NO_ITEM, NO_ITEM ; items
1010
db GENDER_F50 ; gender ratio
1111
db 100 ; unknown 1
1212
db 20 ; step cycles to hatch
1313
db 5 ; unknown 2
14-
INCBIN "gfx/pokemon/charmander/front.dimensions"
14+
INCBIN "gfx/pokemon/yanmega/front.dimensions"
1515
dw NULL, NULL ; unused (beta front/back pics)
16-
db GROWTH_SLIGHTLY_FAST ; growth rate
17-
dn EGG_GROUND, EGG_GROUND ; egg groups
16+
db GROWTH_MEDIUM_SLOW ; growth rate
17+
dn EGG_BUG, EGG_BUG ; egg groups
1818

1919
; tm/hm learnset
2020
tmhm CURSE

0 commit comments

Comments
 (0)