Skip to content

Commit 88945c3

Browse files
DakoriasDakorias
committed
Added sprites, new map, various bug fixes
1 parent 0c45ea6 commit 88945c3

File tree

101 files changed

+1333
-937
lines changed

Some content is hidden

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

101 files changed

+1333
-937
lines changed

‎constants/event_flags.asm

+12-13
Original file line numberDiff line numberDiff line change
@@ -37,6 +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 EVENT_GOT_ITEMS_FROM_HERALD_HOUSE
4041
const EVENT_GOT_MAP_FROM_EDWARD
4142
const EVENT_GYM_TRAINERS_IN_HERALD_COVE
4243
const EVENT_LASS_AT_HERALD_ROUTE
@@ -47,8 +48,8 @@
4748
const EVENT_ROCKETS_STEAL_SEALED_MAP
4849
const EVENT_BEAT_ROCKET_THEIVES
4950
const EVENT_BEAT_KENJI_TOURNAMENT
50-
const EVENT_MADE_WHITNEY_CRY
51-
const EVENT_HERDED_FARFETCHD
51+
const EVENT_SCENIC_BLUFF_SEEN_BLUE
52+
const EVENT_OAK_MISSING_FROM_LAB
5253
const EVENT_FOUGHT_SUDOWOODO
5354
const EVENT_CLEARED_SLOWPOKE_WELL
5455
const EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE
@@ -132,11 +133,9 @@
132133
const EVENT_GOT_TM12_SWEET_SCENT
133134
const EVENT_RELEASED_THE_BEASTS
134135
const EVENT_GOT_MASTER_BALL_FROM_ELM
135-
; Johto hidden items
136+
; Monego hidden items
136137
const EVENT_EDWARD_COIN_GOT
137-
const EVENT_HERALD_GROTTO_SUN_STONE
138-
const EVENT_BEACH_GROTTO_MYSTIC_WATER
139-
const EVENT_BURNED_TOWER_1F_HIDDEN_ETHER
138+
const EVENT_SCENIC_BLUFF_SUPER_POTION
140139
const_skip ; unused in Crystal
141140
const_skip ; unused in Crystal
142141
const_skip ; unused in Crystal
@@ -644,16 +643,16 @@
644643
; When these events are cleared, the sprite becomes visible; when set, the sprite is hidden.
645644
; The map script command macros `disappear` and `appear` set/clear these flags and immediately apply the effect on visibility.
646645
; The map script command macros `setevent` and `clearevent` set/clear these flags, and their effects will be seen when the map is reloaded.
647-
; Johto itemballs
646+
; Monego itemballs
648647
const EVENT_EKANS_POKEBALL_IN_OAKS_LAB
649648
const EVENT_HOUNDOUR_POKEBALL_IN_OAKS_LAB
650649
const EVENT_BALTOY_POKEBALL_IN_OAKS_LAB
651-
const EVENT_VIOLET_CITY_PP_UP
652-
const EVENT_VIOLET_CITY_RARE_CANDY
653-
const EVENT_LAKE_OF_RAGE_ELIXER
654-
const EVENT_LAKE_OF_RAGE_TM_DETECT
655-
const EVENT_SPROUT_TOWER_1F_PARLYZ_HEAL
656-
const EVENT_SPROUT_TOWER_2F_X_ACCURACY
650+
const EVENT_HERALD_GROTTO_SUN_STONE
651+
const EVENT_BEACH_GROTTO_MYSTIC_WATER
652+
const EVENT_HERALD_ROUTE_POTION
653+
const EVENT_CRAGGY_BEACH_GREAT_BALL
654+
const EVENT_CRAGGY_BEACH_POTION
655+
const EVENT_SCENIC_BLUFF_PEARL
657656
const EVENT_SPROUT_TOWER_3F_POTION
658657
const EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE
659658
const EVENT_TIN_TOWER_3F_FULL_HEAL

‎constants/landmark_constants.asm

+7-53
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,13 @@
22
const_def
33
const LANDMARK_SPECIAL ; 00
44
; Johto landmarks
5-
const LANDMARK_NEW_BARK_TOWN ; 01
6-
const LANDMARK_ROUTE_29 ; 02
7-
const LANDMARK_CHERRYGROVE_CITY ; 03
8-
const LANDMARK_ROUTE_30 ; 04
9-
const LANDMARK_ROUTE_31 ; 05
10-
const LANDMARK_VIOLET_CITY ; 06
11-
const LANDMARK_SPROUT_TOWER ; 07
12-
const LANDMARK_ROUTE_32 ; 08
13-
const LANDMARK_RUINS_OF_ALPH ; 09
14-
const LANDMARK_UNION_CAVE ; 0a
15-
const LANDMARK_ROUTE_33 ; 0b
16-
const LANDMARK_AZALEA_TOWN ; 0c
17-
const LANDMARK_SLOWPOKE_WELL ; 0d
18-
const LANDMARK_ILEX_FOREST ; 0e
19-
const LANDMARK_ROUTE_34 ; 0f
20-
const LANDMARK_GOLDENROD_CITY ; 10
21-
const LANDMARK_RADIO_TOWER ; 11
22-
const LANDMARK_ROUTE_35 ; 12
23-
const LANDMARK_NATIONAL_PARK ; 13
24-
const LANDMARK_ROUTE_36 ; 14
25-
const LANDMARK_ROUTE_37 ; 15
26-
const LANDMARK_ECRUTEAK_CITY ; 16
27-
const LANDMARK_TIN_TOWER ; 17
28-
const LANDMARK_BURNED_TOWER ; 18
29-
const LANDMARK_ROUTE_38 ; 19
30-
const LANDMARK_ROUTE_39 ; 1a
31-
const LANDMARK_OLIVINE_CITY ; 1b
32-
const LANDMARK_LIGHTHOUSE ; 1c
33-
const LANDMARK_BATTLE_TOWER ; 1d
34-
const LANDMARK_ROUTE_40 ; 1e
35-
const LANDMARK_WHIRL_ISLANDS ; 1f
36-
const LANDMARK_ROUTE_41 ; 20
37-
const LANDMARK_CIANWOOD_CITY ; 21
38-
const LANDMARK_ROUTE_42 ; 22
39-
const LANDMARK_MT_MORTAR ; 23
40-
const LANDMARK_MAHOGANY_TOWN ; 24
41-
const LANDMARK_ROUTE_43 ; 25
42-
const LANDMARK_LAKE_OF_RAGE ; 26
43-
const LANDMARK_ROUTE_44 ; 27
44-
const LANDMARK_ICE_PATH ; 28
45-
const LANDMARK_BLACKTHORN_CITY ; 29
46-
const LANDMARK_DRAGONS_DEN ; 2a
47-
const LANDMARK_ROUTE_45 ; 2b
48-
const LANDMARK_DARK_CAVE ; 2c
49-
const LANDMARK_ROUTE_46 ; 2d
50-
const LANDMARK_SILVER_CAVE ; 2e
5+
const LANDMARK_HERALD_COVE ; 60
6+
const LANDMARK_HERALD_ROUTE ; 61
7+
const LANDMARK_CRAGGY_BEACH ; 62
8+
const LANDMARK_CRAGGY_COAST ; 63
9+
const LANDMARK_SCENIC_BLUFF ; 64
10+
const LANDMARK_MOUNTAIN_CAVE ; 65
11+
const LANDMARK_BERRY_FOREST ; 66
5112

5213
DEF KANTO_LANDMARK EQU const_value
5314
const LANDMARK_PALLET_TOWN ; 2f
@@ -99,13 +60,6 @@ DEF KANTO_LANDMARK EQU const_value
9960
const LANDMARK_TOHJO_FALLS ; 5d
10061
const LANDMARK_ROUTE_28 ; 5e
10162
const LANDMARK_FAST_SHIP ; 5f
102-
103-
const LANDMARK_HERALD_COVE ; 60
104-
const LANDMARK_HERALD_ROUTE ; 61
105-
const LANDMARK_BEACH_ROUTE ; 62
106-
const LANDMARK_SECOND_TOWN ; 63
107-
const LANDMARK_MOUNTAIN_ROUTE ; 64
108-
const LANDMARK_MOUNTAIN_CAVE ; 65
10963
DEF NUM_LANDMARKS EQU const_value
11064

11165
; used in CaughtData

‎constants/map_constants.asm

+13-8
Original file line numberDiff line numberDiff line change
@@ -76,19 +76,24 @@ ENDM
7676
map_const PLAYERS_HOUSE_2F, 4, 3 ; 9
7777
map_const REGISTRATION_CENTER, 5, 5 ; 10
7878
map_const HERALD_GROTTO, 4, 8 ; 11
79-
map_const BEACH_ROUTE, 12, 40 ; 12
79+
map_const CRAGGY_BEACH, 12, 40 ; 12
8080
endgroup
8181

82-
newgroup SECOND_TOWN ; 6
83-
map_const SECOND_TOWN, 20, 16 ; 1
84-
map_const MOUNTAIN_ROUTE, 14, 26 ; 2
82+
newgroup CRAGGY_COAST ; 6
83+
map_const CRAGGY_COAST, 20, 16 ; 1
84+
map_const SCENIC_BLUFF, 15, 26 ; 2
8585
map_const MOUNTAIN_CAVE, 10, 14 ; 3
86-
map_const SECOND_TOWN_HOUSE1, 5, 4 ; 4
87-
map_const SECOND_TOWN_HOUSE2, 5, 4 ; 5
88-
map_const SECOND_TOWN_POKECENTER, 7, 4 ; 6
89-
map_const SECOND_TOWN_FISHING, 5, 4 ; 7
86+
map_const CRAGGY_COAST_HOUSE1, 5, 4 ; 4
87+
map_const CRAGGY_COAST_HOUSE2, 5, 4 ; 5
88+
map_const CRAGGY_COAST_POKECENTER, 7, 4 ; 6
89+
map_const CRAGGY_COAST_FISHING, 5, 4 ; 7
9090
map_const BEACH_GROTTO, 5, 5 ; 8
9191
map_const MOUNTAIN_GYM, 5, 5 ; 9
9292
endgroup
9393

94+
newgroup BERRY_FOREST ; 7
95+
map_const BERRY_FOREST, 16, 16
96+
map_const BERRY_FOREST_HOUSE, 5, 4
97+
endgroup
98+
9499
DEF NUM_MAP_GROUPS EQU const_value ; 6

‎constants/mart_constants.asm

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
const MART_UNDERGROUND
4646
const MART_HERALD_COVE
4747
const MART_HERALD_BERRIES
48-
const MART_SECOND_TOWN1
49-
const MART_SECOND_TOWN2
50-
const MART_SECOND_TOWN3
51-
const MART_SECOND_TOWN4
48+
const MART_CRAGGY_COAST1
49+
const MART_CRAGGY_COAST2
50+
const MART_CRAGGY_COAST3
51+
const MART_CRAGGY_COAST4
5252
DEF NUM_MARTS EQU const_value

‎constants/scgb_constants.asm

+2-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ DEF SCGB_DEFAULT EQU $ff
7272
const PREDEFPAL_SILVER_CAVE
7373
const PREDEFPAL_DUNGEONS
7474
const PREDEFPAL_HERALD_COVE
75-
const PREDEFPAL_SECOND_TOWN
75+
const PREDEFPAL_CRAGGY_COAST
76+
const PREDEFPAL_BERRY_FOREST
7677

7778
const PREDEFPAL_NITE
7879
const PREDEFPAL_BLACKOUT

‎constants/script_constants.asm

+2-2
Original file line numberDiff line numberDiff line change
@@ -207,7 +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_ROUTE_29 ; 01
210+
const FRUITTREE_SCENIC_BLUFF ; 01
211211
const FRUITTREE_ROUTE_30_1 ; 02
212212
const FRUITTREE_ROUTE_38 ; 03
213213
const FRUITTREE_ROUTE_46_1 ; 04
@@ -300,7 +300,7 @@ DEF BUG_CONTESTANT_SIZE EQU 4
300300
; HealMachineAnim.Pointers indexes (see engine/events/heal_machine_anim.asm)
301301
const_def
302302
const HEALMACHINE_POKECENTER ; 0
303-
const HEALMACHINE_ELMS_LAB ; 1
303+
const HEALMACHINE_HERALD_LAB ; 1
304304
const HEALMACHINE_HALL_OF_FAME ; 2
305305

306306
; UnownPuzzle setval arguments

‎constants/sprite_constants.asm

+8-4
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,13 @@
112112
const SPRITE_GIOVANNI_HAT ; 6d
113113
const SPRITE_EDWARD ; 6e
114114
const SPRITE_HARRISON ; 6f
115+
const SPRITE_COTTONEE
116+
const SPRITE_SHINX
117+
const SPRITE_MURKROW
118+
const SPRITE_EKANS
119+
const SPRITE_HOUNDOUR
120+
const SPRITE_BALTOY
121+
const SPRITE_KENJI
115122

116123
DEF NUM_OVERWORLD_SPRITES EQU const_value - 1
117124

@@ -140,7 +147,7 @@ DEF SPRITE_POKEMON EQU const_value
140147
const SPRITE_BULBASAUR ; 93
141148
const SPRITE_JIGGLYPUFF ; 94
142149
const SPRITE_GRIMER ; 95
143-
const SPRITE_EKANS ; 96
150+
const SPRITE_EKANS_2 ; 96
144151
const SPRITE_PARAS ; 97
145152
const SPRITE_TENTACOOL ; 98
146153
const SPRITE_TAUROS ; 99
@@ -153,9 +160,6 @@ DEF SPRITE_POKEMON EQU const_value
153160
const SPRITE_GYARADOS ; a0
154161
const SPRITE_LUGIA ; a1
155162
const SPRITE_HO_OH ; a2
156-
const SPRITE_COTTONEE ; a3
157-
const SPRITE_SHINX ; a4
158-
const SPRITE_MURKROW ; a5
159163

160164
DEF NUM_POKEMON_SPRITES EQU const_value - SPRITE_POKEMON
161165

‎constants/trainer_constants.asm

+3-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,9 @@ DEF NUM_NONTRAINER_PHONECONTACTS EQU const_value - 1
9696
const DANNY2
9797
const WESLEY
9898
const DAVID
99-
const ANDREW
99+
const ANDREW1
100+
const ANDREW2
101+
const ANDREW3
100102

101103
trainerclass DETECTIVE ; 17
102104

0 commit comments

Comments
 (0)