Skip to content

Commit 7a5ce21

Browse files
DakoriasDakorias
committed
Adding Berry Master Script and New fixes
1 parent 09d5693 commit 7a5ce21

Some content is hidden

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

80 files changed

+725
-587
lines changed

‎constants/engine_flags.asm

+3-1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@
6868
const ENGINE_FLYPOINT_NEW_BARK
6969
const ENGINE_FLYPOINT_BATTLE_TOWER
7070
const ENGINE_FLYPOINT_HERALD_COVE
71+
const ENGINE_FLYPOINT_CRAGGY_COAST
72+
const ENGINE_FLYPOINT_RUGGED_CLIFF
7173
; wLuckyNumberShowFlag
7274
const ENGINE_LUCKY_NUMBER_SHOW
7375
; wStatusFlags2
@@ -83,7 +85,7 @@
8385
const ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY
8486
; wDailyFlags2
8587
const ENGINE_MT_MOON_SQUARE_CLEFAIRY
86-
const ENGINE_UNION_CAVE_LAPRAS
88+
const ENGINE_BERRY_FOREST_MASTER_BERRIES
8789
const ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
8890
const ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN
8991
const ENGINE_DAISYS_GROOMING

‎constants/event_flags.asm

+12-7
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
const EVENT_GOT_BALTOY_FROM_OAK
3838
const EVENT_GOT_A_POKEMON_FROM_OAK
3939
const EVENT_BATTLE_PERCY_2ND_GYM
40-
const_skip
40+
const EVENT_LASS_BATTLE_HERALD_ROUTE
4141
const EVENT_EDWARD_MISSING_FROM_GYM
4242
const EVENT_GOT_MAP_FROM_EDWARD
4343
const EVENT_GYM_TRAINERS_IN_HERALD_COVE
@@ -54,8 +54,9 @@
5454
const EVENT_TOURNAMENT_ROUND_1_BEAT
5555
const EVENT_TOURNAMENT_ROUND_2_BEAT
5656
const EVENT_TOURNAMENT_ROUND_3_BEAT
57-
const EVENT_MADE_UNOWN_APPEAR_IN_RUINS
58-
const EVENT_FAST_SHIP_DESTINATION_OLIVINE
57+
const EVENT_BERRY_MASTER_POKEFAN_M
58+
const EVENT_BERRY_FOREST_MASTER_FINISHED
59+
const EVENT_BERRY_MASTER_GIVES_BERRIES
5960
const EVENT_FAST_SHIP_FIRST_TIME
6061
const EVENT_FAST_SHIP_HAS_ARRIVED
6162
const EVENT_FAST_SHIP_FOUND_GIRL
@@ -594,6 +595,7 @@
594595
const EVENT_BEAT_HIKER_CONNOR
595596

596597
; Bug Catcher
598+
const EVENT_BEAT_BUG_CATCHER_JAMES
597599

598600
; Officer
599601

@@ -620,7 +622,6 @@
620622

621623
; Youngster
622624
const EVENT_BEAT_YOUNGSTER_KEVIN
623-
const EVENT_BEAT_YOUNGSTER_JAMES
624625
const EVENT_BEAT_YOUNGSTER_ALEX
625626
const EVENT_BEAT_YOUNGSTER_DANNY1
626627
const EVENT_BEAT_YOUNGSTER_ALLEN
@@ -699,17 +700,20 @@
699700
const EVENT_HERALD_GROTTO_SUN_STONE
700701
const EVENT_BEACH_GROTTO_MYSTIC_WATER
701702
const EVENT_HERALD_ROUTE_POTION
703+
const EVENT_HERALD_ROUTE_GREAT_BALL
702704
const EVENT_CRAGGY_BEACH_GREAT_BALL
703705
const EVENT_CRAGGY_BEACH_POTION
706+
const EVENT_CRAGGY_BEACH_KRABBY
704707
const EVENT_SCENIC_BLUFF_PEARL
705708
const EVENT_HERALD_BAY_GROTTO_TM46
706709
const EVENT_HERALD_BAY_TM54
707710
const EVENT_HERALD_BAY_GREAT_BALL
711+
const EVENT_HERALD_BAY_POTION
708712
const EVENT_RUGGED_CLIFF_RESCUE_BALL
709713
const EVENT_RUGGED_CLIFF_MUSCLE_BAND
710714
const EVENT_RUGGED_CLIFF_GROTTO_TM21
711-
const EVENT_TIN_TOWER_5F_RARE_CANDY
712-
const EVENT_TIN_TOWER_7F_MAX_REVIVE
715+
const EVENT_BERRY_FOREST_MIRACLE_SEED
716+
const EVENT_BERRY_FOREST_SUPER_POTION
713717
const EVENT_TIN_TOWER_8F_NUGGET
714718
const EVENT_TIN_TOWER_8F_MAX_ELIXER
715719
const EVENT_TIN_TOWER_8F_FULL_RESTORE
@@ -996,7 +1000,8 @@
9961000
; (In pokegold the previous 4 event flags were not defined,
9971001
; but in pokecrystal the 'const_next 1900' is redundant.)
9981002

999-
const_next 1900
1003+
const_next 1902
1004+
10001005
; Kanto people
10011006
const EVENT_ROUTE_24_ROCKET
10021007
const EVENT_CERULEAN_GYM_ROCKET

‎constants/item_constants.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
const PROTEIN ; 1b
3636
const IRON ; 1c
3737
const CARBOS ; 1d
38-
const LUCKY_PUNCH ; 1e
38+
const BERRY_BOX ; 1e
3939
const CALCIUM ; 1f
4040
const RARE_CANDY ; 20
4141
const X_ACCURACY ; 21

‎constants/item_data_constants.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ DEF MAIL_STRUCT_LENGTH_JP EQU $2a ; mailmsg_jp struct
7979
const_def
8080
const HELD_NONE
8181
const HELD_BERRY
82-
const HELD_2
82+
const HELD_DREAM_BERRY
8383
const HELD_LEFTOVERS
8484
const_skip
8585
const HELD_5

‎constants/map_data_constants.asm

+6-25
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,10 @@ DEF NUM_FISHGROUPS EQU const_value - 1
8282
const SPAWN_NEW_BARK
8383
const SPAWN_BATTLE_TOWER
8484
const SPAWN_HERALD_COVE
85-
const SPAWN_HERALD_ROUTE
85+
const SPAWN_CRAGGY_COAST
86+
const SPAWN_RUGGED_CLIFF
8687
const SPAWN_NONE
87-
88+
8889
DEF NUM_SPAWNS EQU const_value
8990

9091
DEF SPAWN_N_A EQU -1
@@ -93,30 +94,10 @@ DEF SPAWN_N_A EQU -1
9394
const_def
9495
; johto
9596
DEF JOHTO_FLYPOINT EQU const_value
96-
const FLY_NEW_BARK
97-
const FLY_CHERRYGROVE
98-
const FLY_VIOLET
99-
const FLY_AZALEA
100-
const FLY_GOLDENROD
101-
const FLY_ECRUTEAK
102-
const FLY_OLIVINE
103-
const FLY_CIANWOOD
104-
const FLY_MAHOGANY
105-
const FLY_LAKE_OF_RAGE
106-
const FLY_BLACKTHORN
107-
const FLY_MT_SILVER
97+
const FLY_HERALD_COVE
98+
const FLY_CRAGGY_COAST
99+
const FLY_RUGGED_CLIFF
108100
; kanto
109101
DEF KANTO_FLYPOINT EQU const_value
110-
const FLY_PALLET
111-
const FLY_VIRIDIAN
112-
const FLY_PEWTER
113-
const FLY_CERULEAN
114-
const FLY_VERMILION
115-
const FLY_ROCK_TUNNEL
116-
const FLY_LAVENDER
117-
const FLY_CELADON
118-
const FLY_SAFFRON
119-
const FLY_FUCHSIA
120-
const FLY_CINNABAR
121102
const FLY_INDIGO
122103
DEF NUM_FLYPOINTS EQU const_value

‎constants/script_constants.asm

+1
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ DEF EMOTE_LENGTH EQU 6
207207
; fruittree arguments
208208
; FruitTreeItems indexes (see data/items/fruit_trees.asm)
209209
const_def 1
210+
const FRUITTREE_HERALD_ROUTE ; 01
210211
const FRUITTREE_SCENIC_BLUFF ; 01
211212
const FRUITTREE_BERRY_FOREST_1 ; 02
212213
const FRUITTREE_BERRY_FOREST_2 ; 03

‎constants/wram_constants.asm

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ DEF TEXT_DELAY_MASK EQU %111
3737
const BATTLE_SHIFT ; 6
3838
const BATTLE_SCENE ; 7
3939

40+
DEF TEXT_DELAY_NONE EQU %000 ; 0
4041
DEF TEXT_DELAY_FAST EQU %001 ; 1
4142
DEF TEXT_DELAY_MED EQU %011 ; 3
4243
DEF TEXT_DELAY_SLOW EQU %101 ; 5

‎data/battle/held_consumables.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
ConsumableEffects:
44
db HELD_BERRY
5-
db HELD_2
5+
db HELD_DREAM_BERRY
66
db HELD_5
77
db HELD_HEAL_POISON
88
db HELD_HEAL_FREEZE

‎data/events/engine_flags.asm

+2
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ EngineFlags:
7878
engine_flag wVisitedSpawns, SPAWN_NEW_BARK
7979
engine_flag wVisitedSpawns, SPAWN_BATTLE_TOWER
8080
engine_flag wVisitedSpawns, SPAWN_HERALD_COVE
81+
engine_flag wVisitedSpawns, SPAWN_CRAGGY_COAST
82+
engine_flag wVisitedSpawns, SPAWN_RUGGED_CLIFF
8183

8284
engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F
8385

‎data/items/attributes.asm

+17-17
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ ItemAttributes:
4747
; ESCAPE_ROPE
4848
item_attribute 550, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
4949
; REPEL
50-
item_attribute 350, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
50+
item_attribute 100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
5151
; MAX_ELIXER
5252
item_attribute 4500, HELD_NONE, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
5353
; FIRE_STONE
@@ -66,8 +66,8 @@ ItemAttributes:
6666
item_attribute 9800, HELD_NONE, 0, CANT_SELECT, MEDICINE, ITEMMENU_PARTY, ITEMMENU_NOUSE
6767
; CARBOS
6868
item_attribute 9800, HELD_NONE, 0, CANT_SELECT, MEDICINE, ITEMMENU_PARTY, ITEMMENU_NOUSE
69-
; LUCKY_PUNCH
70-
item_attribute 10, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
69+
; BERRY_BOX
70+
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
7171
; CALCIUM
7272
item_attribute 9800, HELD_NONE, 0, CANT_SELECT, MEDICINE, ITEMMENU_PARTY, ITEMMENU_NOUSE
7373
; RARE_CANDY
@@ -91,9 +91,9 @@ ItemAttributes:
9191
; GUARD_SPEC
9292
item_attribute 700, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
9393
; SUPER_REPEL
94-
item_attribute 500, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
94+
item_attribute 150, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
9595
; MAX_REPEL
96-
item_attribute 700, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
96+
item_attribute 300, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
9797
; DIRE_HIT
9898
item_attribute 650, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
9999
; ID_CARD
@@ -155,27 +155,27 @@ ItemAttributes:
155155
; QUICK_CLAW
156156
item_attribute 100, HELD_QUICK_CLAW, 60, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
157157
; PSNCUREBERRY
158-
item_attribute 10, HELD_HEAL_POISON, 0, CANT_SELECT, BERRIES, ITEMMENU_PARTY, ITEMMENU_PARTY
158+
item_attribute 200, HELD_HEAL_POISON, 0, CANT_SELECT, BERRIES, ITEMMENU_PARTY, ITEMMENU_PARTY
159159
; GOLD_LEAF
160160
item_attribute 1000, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
161161
; SOFT_SAND
162162
item_attribute 100, HELD_GROUND_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
163163
; SHARP_BEAK
164164
item_attribute 100, HELD_FLYING_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
165165
; PRZCUREBERRY
166-
item_attribute 10, HELD_HEAL_PARALYZE, 0, CANT_SELECT, BERRIES, ITEMMENU_PARTY, ITEMMENU_PARTY
166+
item_attribute 250, HELD_HEAL_PARALYZE, 0, CANT_SELECT, BERRIES, ITEMMENU_PARTY, ITEMMENU_PARTY
167167
; BURNT_BERRY
168-
item_attribute 10, HELD_HEAL_FREEZE, 0, CANT_SELECT, BERRIES, ITEMMENU_PARTY, ITEMMENU_PARTY
168+
item_attribute 200, HELD_HEAL_FREEZE, 0, CANT_SELECT, BERRIES, ITEMMENU_PARTY, ITEMMENU_PARTY
169169
; ICE_BERRY
170-
item_attribute 10, HELD_HEAL_BURN, 0, CANT_SELECT, BERRIES, ITEMMENU_PARTY, ITEMMENU_PARTY
170+
item_attribute 150, HELD_HEAL_BURN, 0, CANT_SELECT, BERRIES, ITEMMENU_PARTY, ITEMMENU_PARTY
171171
; POISON_BARB
172172
item_attribute 100, HELD_POISON_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
173173
; KINGS_ROCK
174174
item_attribute 100, HELD_FLINCH, 30, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
175175
; BITTER_BERRY
176-
item_attribute 10, HELD_HEAL_CONFUSION, 0, CANT_SELECT, BERRIES, ITEMMENU_NOUSE, ITEMMENU_PARTY
176+
item_attribute 200, HELD_HEAL_CONFUSION, 0, CANT_SELECT, BERRIES, ITEMMENU_NOUSE, ITEMMENU_PARTY
177177
; MINT_BERRY
178-
item_attribute 10, HELD_HEAL_SLEEP, 0, CANT_SELECT, BERRIES, ITEMMENU_PARTY, ITEMMENU_PARTY
178+
item_attribute 300, HELD_HEAL_SLEEP, 0, CANT_SELECT, BERRIES, ITEMMENU_PARTY, ITEMMENU_PARTY
179179
; RED_APRICORN
180180
item_attribute 200, HELD_NONE, 0, CANT_SELECT, BERRIES, ITEMMENU_NOUSE, ITEMMENU_NOUSE
181181
; TINYMUSHROOM
@@ -225,7 +225,7 @@ ItemAttributes:
225225
; MAGNET
226226
item_attribute 100, HELD_ELECTRIC_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
227227
; MIRACLEBERRY
228-
item_attribute 10, HELD_HEAL_STATUS, 0, CANT_SELECT, BERRIES, ITEMMENU_PARTY, ITEMMENU_PARTY
228+
item_attribute 400, HELD_HEAL_STATUS, 0, CANT_SELECT, BERRIES, ITEMMENU_PARTY, ITEMMENU_PARTY
229229
; PEARL
230230
item_attribute 1400, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
231231
; BIG_PEARL
@@ -281,7 +281,7 @@ ItemAttributes:
281281
; CHARCOAL
282282
item_attribute 9800, HELD_FIRE_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
283283
; BERRY_JUICE
284-
item_attribute 100, HELD_BERRY, 20, CANT_SELECT, MEDICINE, ITEMMENU_PARTY, ITEMMENU_PARTY
284+
item_attribute 400, HELD_BERRY, 20, CANT_SELECT, MEDICINE, ITEMMENU_PARTY, ITEMMENU_PARTY
285285
; SCOPE_LENS
286286
item_attribute 200, HELD_CRITICAL_UP, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
287287
; SHINY_BALL
@@ -298,13 +298,13 @@ ItemAttributes:
298298
; LEFTOVERS
299299
item_attribute 200, HELD_LEFTOVERS, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
300300
; DREAM_BERRY
301-
item_attribute 30, HELD_BERRY, 30, CANT_SELECT, BERRIES, ITEMMENU_PARTY, ITEMMENU_PARTY
301+
item_attribute 500, HELD_BERRY, 30, CANT_SELECT, BERRIES, ITEMMENU_PARTY, ITEMMENU_PARTY
302302
; TEACHY_TV
303303
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
304304
; LIGHT_CLAY
305305
item_attribute 100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
306306
; MYSTERYBERRY
307-
item_attribute 10, HELD_RESTORE_PP, -1, CANT_SELECT, BERRIES, ITEMMENU_PARTY, ITEMMENU_PARTY
307+
item_attribute 250, HELD_RESTORE_PP, -1, CANT_SELECT, BERRIES, ITEMMENU_PARTY, ITEMMENU_PARTY
308308
; DRAGON_SCALE
309309
item_attribute 2100, HELD_NONE, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
310310
; BERSERK_GENE
@@ -350,9 +350,9 @@ ItemAttributes:
350350
; UP_GRADE
351351
item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
352352
; BERRY
353-
item_attribute 10, HELD_BERRY, 10, CANT_SELECT, BERRIES, ITEMMENU_PARTY, ITEMMENU_PARTY
353+
item_attribute 150, HELD_BERRY, 10, CANT_SELECT, BERRIES, ITEMMENU_PARTY, ITEMMENU_PARTY
354354
; GOLD_BERRY
355-
item_attribute 10, HELD_BERRY, 30, CANT_SELECT, BERRIES, ITEMMENU_PARTY, ITEMMENU_PARTY
355+
item_attribute 500, HELD_BERRY, 30, CANT_SELECT, BERRIES, ITEMMENU_PARTY, ITEMMENU_PARTY
356356
; SQUIRTBOTTLE
357357
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
358358
; BLACK_SLUDGE

‎data/items/descriptions.asm

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ItemDescriptions:
3030
dw ProteinDesc
3131
dw IronDesc
3232
dw CarbosDesc
33-
dw LuckyPunchDesc
33+
dw BerryBoxDesc
3434
dw CalciumDesc
3535
dw RareCandyDesc
3636
dw XAccuracyDesc
@@ -375,9 +375,9 @@ CarbosDesc:
375375
db "Raises SPEED of"
376376
next "one #MON.@"
377377

378-
LuckyPunchDesc:
379-
db "Ups critical hit"
380-
next "ratio of CHANSEY.@"
378+
BerryBoxDesc:
379+
db "A box of BERRIES"
380+
next "for someone...@"
381381

382382
CalciumDesc:
383383
db "Ups SPECIAL stats"

‎data/items/fruit_trees.asm

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
FruitTreeItems:
22
; entries correspond to FRUITTREE_* constants
33
table_width 1, FruitTreeItems
4+
db BERRY ; HERALD_ROUTE
45
db BERRY ; SCENIC_BLUFF
56
db BERRY ; BERRY_FOREST_1
67
db PRZCUREBERRY ; BERRY_FOREST_2

‎data/items/names.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ItemNames::
2929
li "PROTEIN"
3030
li "IRON"
3131
li "CARBOS"
32-
li "LUCKY PUNCH"
32+
li "BERRY BOX"
3333
li "CALCIUM"
3434
li "RARE CANDY"
3535
li "X ACCURACY"

‎data/maps/flypoints.asm

+3-14
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,9 @@ Flypoints:
22
; entries correspond to FLY_* constants
33
; Monego
44
; landmark, spawn point
5-
db LANDMARK_HERALD_COVE, SPAWN_N_A
6-
db LANDMARK_CRAGGY_COAST, SPAWN_N_A
7-
db LANDMARK_RUGGED_CLIFF, SPAWN_N_A
5+
db LANDMARK_HERALD_COVE, SPAWN_HERALD_COVE
6+
db LANDMARK_CRAGGY_COAST, SPAWN_CRAGGY_COAST
7+
db LANDMARK_RUGGED_CLIFF, SPAWN_RUGGED_CLIFF
88
; Kanto
9-
db LANDMARK_PALLET_TOWN, SPAWN_N_A
10-
db LANDMARK_VIRIDIAN_CITY, SPAWN_N_A
11-
db LANDMARK_PEWTER_CITY, SPAWN_N_A
12-
db LANDMARK_CERULEAN_CITY, SPAWN_N_A
13-
db LANDMARK_VERMILION_CITY, SPAWN_N_A
14-
db LANDMARK_ROCK_TUNNEL, SPAWN_N_A
15-
db LANDMARK_LAVENDER_TOWN, SPAWN_N_A
16-
db LANDMARK_CELADON_CITY, SPAWN_N_A
17-
db LANDMARK_SAFFRON_CITY, SPAWN_N_A
18-
db LANDMARK_FUCHSIA_CITY, SPAWN_N_A
19-
db LANDMARK_CINNABAR_ISLAND, SPAWN_N_A
209
db LANDMARK_INDIGO_PLATEAU, SPAWN_INDIGO
2110
db -1 ; end

‎data/maps/spawn_points.asm

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ SpawnPoints:
1515
spawn NEW_BARK_TOWN, 15, 8
1616
spawn BATTLE_TOWER_OUTSIDE, 8, 10
1717
spawn HERALD_COVE, 19, 18
18-
spawn HERALD_ROUTE, 26, 6
18+
spawn CRAGGY_COAST, 7, 16
19+
spawn RUGGED_CLIFF, 11, 4
1920
spawn NONE, 6, 2
2021

2122
spawn N_A, -1, -1

‎data/pokemon/base_stats/applin.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
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/applin/front.dimensions"
1515
dw NULL, NULL ; unused (beta front/back pics)
1616
db GROWTH_SLIGHTLY_FAST ; growth rate
1717
dn EGG_PLANT, EGG_DRAGON ; egg groups

0 commit comments

Comments
 (0)