Skip to content

Commit 6923540

Browse files
DakoriasDakorias
committed
Nayrus Pokedex (Still need Bug fixing)
1 parent 874759f commit 6923540

Some content is hidden

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

46 files changed

+8561
-271
lines changed

‎constants/charmap.asm

+10-3
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
; Actual characters (from gfx/font/font_battle_extra.png)
4040

4141
charmap "<LV>", $6e
42-
42+
charmap "<DEX_LV>", $5d
4343
charmap "<DO>", $70 ; hiragana small do, unused
44-
charmap "◀", $71
45-
charmap "『", $72 ; Japanese opening quote, unused
44+
charmap "◀", $71
45+
charmap "『", $72 ; Japanese opening quote, unused
4646
charmap "<ID>", $73
4747
charmap "№", $74
4848

@@ -52,6 +52,7 @@
5252

5353
; needed for StatsScreen_PlaceShinyIcon and PrintPartyMonPage1
5454
charmap "⁂", $3f ; gfx/stats/stats_tiles.png, tile 14
55+
charmap "<DEX_⁂>", $64 ; gfx/stats/stats_tiles.png, tile 14
5556

5657
; Actual characters (from gfx/font/font.png)
5758

@@ -116,6 +117,12 @@
116117
charmap "y", $b8
117118
charmap "z", $b9
118119

120+
charmap ">", $c0
121+
charmap "<", $c1
122+
charmap "=", $c2
123+
charmap "+", $c3
124+
charmap "<%>", $c4
125+
119126
charmap "┌", $ba
120127
charmap "─", $bb
121128
charmap "┐", $bc

‎constants/pokemon_data_constants.asm

+9-1
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,8 @@ DEF WATER_WILDDATA_LENGTH EQU 2 + 1 + NUM_WATERMON * 4
212212
DEF FISHGROUP_DATA_LENGTH EQU 1 + 2 * 3
213213

214214
DEF NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm)
215+
NUM_ROAMMONS EQU 2 ; G/S is three, and wram still has 3 roamers
216+
; but Crystal only has 2. please change this if you want to use the 3rd
215217

216218
; treemon sets
217219
; TreeMons indexes (see data/wild/treemons.asm)
@@ -223,7 +225,7 @@ DEF NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.as
223225
const TREEMON_SET_KANTO
224226
const TREEMON_SET_LAKE
225227
const TREEMON_SET_FOREST
226-
const TREEMON_SET_ROCK
228+
; const TREEMON_SET_ROCK
227229
DEF NUM_TREEMON_SETS EQU const_value
228230

229231
; treemon scores
@@ -232,6 +234,12 @@ DEF NUM_TREEMON_SETS EQU const_value
232234
const TREEMON_SCORE_GOOD ; 1
233235
const TREEMON_SCORE_RARE ; 2
234236

237+
; rock smash groups, for Nayru's pokedex
238+
; const TREEMON_SET_ROCK is originally within NUM_TREEMON_SETS
239+
const_def
240+
const TREEMON_SET_ROCK
241+
NUM_ROCKSMASH_SETS EQU const_value
242+
235243
; ChangeHappiness arguments (see data/events/happiness_changes.asm)
236244
const_def 1
237245
const HAPPINESS_GAINLEVEL ; 01

‎constants/scgb_constants.asm

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
const SCGB_POKEGEAR_PALS
77
const SCGB_STATS_SCREEN_HP_PALS
88
const SCGB_POKEDEX
9+
const SCGB_POKEDEX_EVO
10+
const SCGB_POKEDEX_PICS
911
const SCGB_SLOT_MACHINE
1012
const SCGB_BETA_TITLE_SCREEN
1113
const SCGB_GS_INTRO

‎constants/wram_constants.asm

+13
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,19 @@ DEF AUTO_INPUT EQU $ff
1313
const DEXMODE_ABC
1414
const DEXMODE_UNOWN
1515

16+
; wPokedexColor
17+
const_def
18+
const DEXCOLOR_RED
19+
const DEXCOLOR_BLUE
20+
const DEXCOLOR_PURPLE
21+
const DEXCOLOR_BROWN
22+
const DEXCOLOR_GREEN
23+
const DEXCOLOR_PINK
24+
const DEXCOLOR_YELLOW
25+
const DEXCOLOR_CYAN
26+
const DEXCOLOR_GRAY
27+
const DEXCOLOR_MEWTWO
28+
1629
; wMonType::
1730
const_def
1831
const PARTYMON ; 0

‎data/maps/map_names.asm

+225
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,225 @@
1+
MapGroupNum_Names::
2+
table_width 2, MapGroupNum_Names
3+
dw CableClub_Map_Names
4+
dw Battle_Tower_Map_Names
5+
dw New_Bark_Map_Names
6+
dw Indigo_Map_Names
7+
dw Herald_Cove_Map_Names
8+
dw Craggy_Coast_Map_Names
9+
dw Berry_Forest_Map_Names
10+
assert_table_length NUM_MAP_GROUPS
11+
12+
GetMapGroupNum_Name::
13+
dec d ; map num
14+
dec e ; map group
15+
push de
16+
ld d, 0
17+
; ld hl, Dungeons_Map_Names
18+
ld hl, MapGroupNum_Names
19+
add hl, de
20+
add hl, de
21+
ld a, [hli]
22+
ld e, a
23+
ld a, [hl]
24+
ld d, a
25+
ld h, d
26+
ld l, e
27+
pop de
28+
ld e, d
29+
ld d, 0
30+
add hl, de
31+
add hl, de
32+
ld a, [hli]
33+
ld e, a
34+
ld a, [hl]
35+
ld d, a
36+
; return string ptr in de
37+
ret
38+
39+
40+
CableClub_Map_Names: ;newgroup CABLE_CLUB ; 1
41+
table_width 2, CableClub_Map_Names
42+
dw CableClub_Map_Name1 ; map_const POKECENTER_2F ; 1
43+
dw CableClub_Map_Name2 ; map_const TRADE_CENTER ; 2
44+
dw CableClub_Map_Name3 ; map_const COLOSSEUM ; 3
45+
dw CableClub_Map_Name4 ; map_const TIME_CAPSULE ; 4
46+
assert_table_length NUM_CABLE_CLUB_MAPS
47+
48+
Battle_Tower_Map_Names: ;newgroup BATTLE_TOWER
49+
table_width 2, Battle_Tower_Map_Names ; 2
50+
dw Battle_Tower_Map_Name1 ; map_const BATTLE_TOWER_OUTSIDE ; 1
51+
dw Battle_Tower_Map_Name2 ; map_const BATTLE_TOWER_1F ; 2
52+
dw Battle_Tower_Map_Name3 ; map_const BATTLE_TOWER_ELEVATOR ; 3
53+
dw Battle_Tower_Map_Name4 ; map_const BATTLE_TOWER_HALLWAY ; 4
54+
dw Battle_Tower_Map_Name5 ; map_const BATTLE_TOWER_BATTLE_ROOM, ; 5
55+
assert_table_length NUM_BATTLE_TOWER_MAPS
56+
57+
New_Bark_Map_Names: ;newgroup NEW_BARK
58+
table_width 2, New_Bark_Map_Names ; 3
59+
dw New_Bark_Map_Name1 ; map_const NEW_BARK_TOWN, ; 1
60+
assert_table_length NUM_NEW_BARK_MAPS
61+
62+
Indigo_Map_Names: ;newgroup INDIGO
63+
table_width 2, Indigo_Map_Names ; 4
64+
dw Indigo_Map_Name1 ; map_const INDIGO_PLATEAU_POKECENTER_1F, 10, 9 ; 1
65+
dw Indigo_Map_Name2 ; map_const WILLS_ROOM ; 2
66+
dw Indigo_Map_Name3 ; map_const KOGAS_ROOM ; 3
67+
dw Indigo_Map_Name4 ; map_const BRUNOS_ROOM ; 4
68+
dw Indigo_Map_Name5 ; map_const KARENS_ROOM ; 5
69+
dw Indigo_Map_Name6 ; map_const LANCES_ROOM ; 6
70+
dw Indigo_Map_Name7 ; map_const HALL_OF_FAME ; 7
71+
assert_table_length NUM_INDIGO_MAPS
72+
73+
Herald_Cove_Map_Names: ;newgroup HERALD_COVE
74+
table_width 2, Herald_Cove_Map_Names ; 5
75+
dw Herald_Cove_Map_Name1 ; map_const HERALD_COVE ; 1
76+
dw Herald_Cove_Map_Name2 ; map_const HERALD_ROUTE ; 2
77+
dw Herald_Cove_Map_Name3 ; map_const HERALD_LAB ; 3
78+
dw Herald_Cove_Map_Name4 ; map_const HERALD_POKECENTER ; 4
79+
dw Herald_Cove_Map_Name5 ; map_const HERALD_GYM ; 5
80+
dw Herald_Cove_Map_Name6 ; map_const HERALD_HOUSE ; 6
81+
dw Herald_Cove_Map_Name7 ; map_const HERALD_PORT ; 7
82+
dw Herald_Cove_Map_Name8 ; map_const PLAYERS_HOUSE_1F, 10, 45 ; 8
83+
dw Herald_Cove_Map_Name9 ; map_const PLAYERS_HOUSE_2F, 10, 18 ; 9
84+
dw Herald_Cove_Map_Name10 ; map_const REGISTRATION_CENTER, 20, 18 ; 10
85+
dw Herald_Cove_Map_Name11 ; map_const HERALD_GROTTO, 20, 18 ; 11
86+
dw Herald_Cove_Map_Name12 ; map_const HERALD_BAY, 20, 18 ; 12
87+
dw Herald_Cove_Map_Name13 ; map_const HERALD_BAY_HOUSE, 20, 18 ; 13
88+
dw Herald_Cove_Map_Name14 ; map_const CRAGGY_BEACH, 20, 18 ; 14
89+
assert_table_length NUM_HERALD_COVE_MAPS
90+
91+
Craggy_Coast_Map_Names: ;newgroup CRAGGY_COAST
92+
table_width 2, Craggy_Coast_Map_Names ; 6
93+
dw Craggy_Coast_Map_Name1 ; map_const CRAGGY_COAST ; 1
94+
dw Craggy_Coast_Map_Name2 ; map_const SCENIC_BLUFF ; 2
95+
dw Craggy_Coast_Map_Name3 ; map_const MT_MONEGO ; 3
96+
dw Craggy_Coast_Map_Name4 ; map_const MT_MONEGO_B1F ; 4
97+
dw Craggy_Coast_Map_Name5 ; map_const CRAGGY_COAST_HOUSE1, 10, 18 ; 5
98+
dw Craggy_Coast_Map_Name6 ; map_const CRAGGY_COAST_HOUSE2, 30, 9 ; 6
99+
dw Craggy_Coast_Map_Name7 ; map_const CRAGGY_COAST_POKECENTER, 10, 18 ; 7
100+
dw Craggy_Coast_Map_Name8 ; map_const CRAGGY_COAST_FISHING, 10, 9 ; 8
101+
dw Craggy_Coast_Map_Name9 ; map_const BEACH_GROTTO, 10, 9 ; 8
102+
dw Craggy_Coast_Map_Name10 ; map_const MOUNTAIN_GYM, 10, 9 ; 8
103+
dw Craggy_Coast_Map_Name11 ; map_const RUGGED_CLIFF, 10, 9 ; 8
104+
dw Craggy_Coast_Map_Name12 ; map_const RUGGED_CLIFF_HOUSE, 10, 9 ; 8
105+
dw Craggy_Coast_Map_Name13 ; map_const RUGGED_CLIFF_POKECENTER, 10, 9 ; 8
106+
dw Craggy_Coast_Map_Name14 ; map_const MOUNTAIN_GYM_BREAK, 10, 9 ; 8
107+
dw Craggy_Coast_Map_Name15 ; map_const MOUNTAIN_GYM_ARENA, 10, 9 ; 8
108+
assert_table_length NUM_CRAGGY_COAST_MAPS
109+
110+
Berry_Forest_Map_Names: ;newgroup BERRY_FOREST
111+
table_width 2, Berry_Forest_Map_Names ; 7
112+
dw Berry_Forest_Map_Name1 ; map_const BERRY_FOREST ; 1
113+
dw Berry_Forest_Map_Name2 ; map_const BERRY_FOREST_HOUSE ; 2
114+
dw Berry_Forest_Map_Name3 ; map_const HERALD_BAY_GROTTO ; 3
115+
dw Berry_Forest_Map_Name4 ; map_const RUGGED_CLIFF_GROTTO ; 4
116+
assert_table_length NUM_BERRY_FOREST_MAPS
117+
118+
; MAX LENGTH: 17
119+
CableClub_Map_Name1: ; map_const OLIVINE_POKECENTER_1F ; 1
120+
db "OLIVINE¯", $E1, $E2, " CENTER@"
121+
CableClub_Map_Name2: ; map_const OLIVINE_GYM ; 2
122+
db "OLIVINE¯GYM@"
123+
CableClub_Map_Name3: ; map_const OLIVINE_TIMS_HOUSE ; 3
124+
db "TIM'S HOUSE@"
125+
CableClub_Map_Name4: ; map_const OLIVINE_HOUSE_BETA ; 4
126+
db "OLIVINE¯HOUSE@"
127+
128+
Battle_Tower_Map_Name1: ; map_const OLIVINE_PUNISHMENT_SPEECH_HOUSE ; 1
129+
db "OLIVINE¯HOUSE 1@"
130+
Battle_Tower_Map_Name2: ; map_const OLIVINE_GOOD_ROD_HOUSE ; 2
131+
db "OLIVINE¯HOUSE 2@"
132+
Battle_Tower_Map_Name3: ; map_const OLIVINE_CAFE ; 3
133+
db "OLIVINE¯CAFE@"
134+
Battle_Tower_Map_Name4: ; map_const OLIVINE_MART ; 4
135+
db "OLIVINE ", $70, $71, "MART@"
136+
Battle_Tower_Map_Name5: ; map_const ROUTE_38_ECRUTEAK_GATE ; 5
137+
db "ROUTE 38 GATE@"
138+
139+
New_Bark_Map_Name1: ; map_const MAHOGANY_RED_GYARADOS_SPEECH_HOUSE ; 1
140+
db "MAHOGANY¯HOUSE@"
141+
142+
Indigo_Map_Name1: ; map_const SPROUT_TOWER_1F, ; 1
143+
db "SPROUT¯TOWER 1F@"
144+
Indigo_Map_Name2: ; map_const SPROUT_TOWER_2F, ; 2
145+
db "SPROUT¯TOWER 2F@"
146+
Indigo_Map_Name3: ; map_const SPROUT_TOWER_3F, ; 3
147+
db "SPROUT¯TOWER 3F@"
148+
Indigo_Map_Name4: ; map_const TIN_TOWER_1F, ; 4
149+
db "TIN TOWER 1F@"
150+
Indigo_Map_Name5: ; map_const TIN_TOWER_2F,; 5
151+
db "TIN TOWER 2F@"
152+
Indigo_Map_Name6: ; map_const TIN_TOWER_3F,; 6
153+
db "TIN TOWER 3F@"
154+
Indigo_Map_Name7: ; map_const TIN_TOWER_4F,; 7
155+
db "TIN TOWER 4F@"
156+
157+
158+
Herald_Cove_Map_Name1: ; map_const HERALD_COVE,; 1
159+
db "HERALD COVE@"
160+
Herald_Cove_Map_Name2: ; map_const HERALD_ROUTE ; 2
161+
db "HERALD PASS@"
162+
Herald_Cove_Map_Name3: ; map_const HERALD_LAB ; 3
163+
db "HERALD LAB@"
164+
Herald_Cove_Map_Name4: ; map_const HERALD_POKECENTER ; 4
165+
db "HERALD", $E1, $E2, "CENTER@"
166+
Herald_Cove_Map_Name5: ; map_const HERALD_GYM ; 5
167+
db "HERALD COVE¯GYM@"
168+
Herald_Cove_Map_Name6: ; map_const HERALD_HOUSE ; 6
169+
db "HERALD HOUSE@"
170+
Herald_Cove_Map_Name7: ; map_const HERALD_PORT ; 7
171+
db "HERALD PORT@"
172+
Herald_Cove_Map_Name8: ; map_const PLAYERS_HOUSE_1F ; 8
173+
db "ITEMFINDER¯HOUSE@"
174+
Herald_Cove_Map_Name9: ; map_const PLAYERS_HOUSE_2F,; 9
175+
db "ECRUTEAK¯CITY@"
176+
Herald_Cove_Map_Name10: ; map_const REGISTRATION_CENTER,; 10
177+
db "REGISTRATION¯CENTER@"
178+
Herald_Cove_Map_Name11: ; map_const HERALD_GROTTO,; 11
179+
db "HERALD GROTTO@"
180+
Herald_Cove_Map_Name12: ; map_const HERALD_BAY,; 12
181+
db "HERALD BAY@"
182+
Herald_Cove_Map_Name13: ; map_const HERALD_BAY_HOUSE,; 13
183+
db "HERALD BAY¯HOUSE@"
184+
Herald_Cove_Map_Name14: ; map_const CRAGGY_BEACH,; 14
185+
db "CRAGGY BEACH@"
186+
187+
Craggy_Coast_Map_Name1: ; map_const CRAGGY_COAST ; 1
188+
db "CRAGGY COAST@"
189+
Craggy_Coast_Map_Name2: ; map_const SCENIC_BLUFF ; 2
190+
db "SCENIC BLUFF@"
191+
Craggy_Coast_Map_Name3: ; map_const MT_MONEGO ; 3
192+
db "MT. MONEGO@"
193+
Craggy_Coast_Map_Name4: ; map_const MT_MONEGO_B1F ; 4
194+
db "MT. MONEGO BF1@"
195+
Craggy_Coast_Map_Name5: ; map_const CRAGGY_COAST_HOUSE1 ; 5
196+
db "CRAGGY COAST¯HOUSE 1@"
197+
Craggy_Coast_Map_Name6: ; map_const CRAGGY_COAST_HOUSE2 ; 6
198+
db "CRAGGY COAST¯HOUSE 2@"
199+
Craggy_Coast_Map_Name7: ; map_const CRAGGY_COAST_POKECENTER ; 7
200+
db "CRAGGY", $E1, $E2, "CENTER@"
201+
Craggy_Coast_Map_Name8: ; map_const CRAGGY_COAST_FISHING,; 8
202+
db "CRAGGY COAST¯FISHING@"
203+
Craggy_Coast_Map_Name9: ; map_const BEACH_GROTTO,; 9
204+
db "BEACH GROTTO@"
205+
Craggy_Coast_Map_Name10: ; map_const MOUNTAIN_GYM,; 10
206+
db "MT. MONEGO¯GYM@"
207+
Craggy_Coast_Map_Name11: ; map_const RUGGED_CLIFF ; 11
208+
db "RUGGED CLIFF@"
209+
Craggy_Coast_Map_Name12: ; map_const RUGGED_CLIFF_HOUSE ; 12
210+
db "RUGGED CLIFF¯HOUSE@"
211+
Craggy_Coast_Map_Name13: ; map_const RUGGED_CLIFF_POKECENTER ; 13
212+
db "RUGGED", $E1, $E2, "CENTER@"
213+
Craggy_Coast_Map_Name14: ; map_const MOUNTAIN_GYM_BREAK ; 14
214+
db "MT. MONEGO¯BREAK@"
215+
Craggy_Coast_Map_Name15: ; map_const MOUNTAIN_GYM_ARENA, ; 15
216+
db "MT. MONEGO¯ARENA@"
217+
218+
Berry_Forest_Map_Name1: ; map_const BERRY_FOREST ; 1
219+
db "BERRY FOREST@"
220+
Berry_Forest_Map_Name2: ; map_const BERRY_FOREST_HOUSE ; 2
221+
db "BERRY FOREST¯HOUSE@"
222+
Berry_Forest_Map_Name3: ; map_const HERALD_BAY_GROTTO ; 3
223+
db "HERALD BAY¯GROTTO@"
224+
Berry_Forest_Map_Name4: ; map_const RUGGED_CLIFF_GROTTO ; 4
225+
db "RUGGED CLIFF¯GROTTO@"

‎data/pokemon/base_stats/talonflame.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
db 100 ; unknown 1
1212
db 15 ; step cycles to hatch
1313
db 5 ; unknown 2
14-
INCBIN "gfx/pokemon/charmander/front.dimensions"
14+
INCBIN "gfx/pokemon/talonflame/front.dimensions"
1515
dw NULL, NULL ; unused (beta front/back pics)
1616
db GROWTH_MEDIUM_SLOW ; growth rate
1717
dn EGG_GROUND, EGG_GROUND ; egg groups

‎data/predef_pointers.asm

+1
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,5 @@ PredefPointers::
8080
add_predef AnimateFrontpic
8181
add_predef Unused_HOF_AnimateAlignedFrontpic
8282
add_predef HOF_AnimateFrontpic
83+
add_predef GetMonTypeIndex
8384
dbw -1, DummyEndPredef ; pointless

‎data/wild/bug_contest_mons.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ContestMons:
1+
ContestMons::
22
; %, species, min, max
33
db 20, CATERPIE, 7, 18
44
db 20, CATERPIE, 7, 18

0 commit comments

Comments
 (0)