Skip to content

Commit c9c89d7

Browse files
DakoriasDakorias
committed
Updated 2nd gym
1 parent f78e659 commit c9c89d7

File tree

115 files changed

+3170
-1837
lines changed

Some content is hidden

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

115 files changed

+3170
-1837
lines changed

‎constants/event_flags.asm

+15-9
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
const EVENT_BEAT_KENJI_TOURNAMENT
5252
const EVENT_SCENIC_BLUFF_SEEN_BLUE
5353
const EVENT_OAK_MISSING_FROM_LAB
54-
const EVENT_CLEARED_SLOWPOKE_WELL
55-
const EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE
56-
const EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
54+
const EVENT_TOURNAMENT_ROUND_1_BEAT
55+
const EVENT_TOURNAMENT_ROUND_2_BEAT
56+
const EVENT_TOURNAMENT_ROUND_3_BEAT
5757
const EVENT_MADE_UNOWN_APPEAR_IN_RUINS
5858
const EVENT_FAST_SHIP_DESTINATION_OLIVINE
5959
const EVENT_FAST_SHIP_FIRST_TIME
@@ -550,6 +550,7 @@
550550

551551
; Blackbelt
552552
const EVENT_BEAT_BLACKBELT_LAU
553+
553554
; Beauty
554555

555556
; Johto Gym Leaders
@@ -629,8 +630,10 @@
629630
; Teacher
630631

631632
; Breeder
633+
const EVENT_BEAT_BREEDER_DAWN
632634

633635
; BugManiac
636+
const EVENT_BEAT_BUG_MANIAC_EDWIN
634637

635638
; Clown
636639

@@ -647,6 +650,7 @@
647650
; Painter
648651

649652
; Ranger
653+
const EVENT_BEAT_RANGER_GERALD
650654

651655
; RuinManiac
652656

@@ -664,10 +668,12 @@
664668

665669
; Survivalist
666670
const EVENT_BEAT_SURVIVALIST_PERRY
671+
const EVENT_BEAT_SURVIVALIST_JOHN
667672

668673
; Farmer
669674

670675
; Gardener
676+
const EVENT_BEAT_GARDENER_LILY
671677

672678
; Dancer
673679

@@ -696,12 +702,12 @@
696702
const EVENT_CRAGGY_BEACH_GREAT_BALL
697703
const EVENT_CRAGGY_BEACH_POTION
698704
const EVENT_SCENIC_BLUFF_PEARL
699-
const EVENT_SPROUT_TOWER_3F_POTION
700-
const EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE
701-
const EVENT_TIN_TOWER_3F_FULL_HEAL
702-
const EVENT_TIN_TOWER_4F_ULTRA_BALL
703-
const EVENT_TIN_TOWER_4F_PP_UP
704-
const EVENT_TIN_TOWER_4F_ESCAPE_ROPE
705+
const EVENT_HERALD_BAY_GROTTO_TM46
706+
const EVENT_HERALD_BAY_TM54
707+
const EVENT_HERALD_BAY_GREAT_BALL
708+
const EVENT_RUGGED_CLIFF_RESCUE_BALL
709+
const EVENT_RUGGED_CLIFF_MUSCLE_BAND
710+
const EVENT_RUGGED_CLIFF_GROTTO_TM21
705711
const EVENT_TIN_TOWER_5F_RARE_CANDY
706712
const EVENT_TIN_TOWER_7F_MAX_REVIVE
707713
const EVENT_TIN_TOWER_8F_NUGGET

‎constants/item_constants.asm

+12-3
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,6 @@
119119
const BIG_PEARL ; 6f
120120
const EVERSTONE ; 70
121121
const SPELL_TAG ; 71
122-
const RAGECANDYBAR ; 72
123-
const GS_BALL ; 73
124122
const BLUE_CARD ; 74
125123
const MIRACLE_SEED ; 75
126124
const THICK_CLUB ; 76
@@ -257,7 +255,7 @@ DEF TM01 EQU const_value
257255
add_tm SANDSTORM ; e3
258256
add_tm FIRE_BLAST ; e4
259257
add_tm COUNTER ; e5
260-
add_tm DEFENSE_CURL ; e6
258+
add_tm BATON_PASS ; e6
261259
add_tm THUNDERPUNCH ; e7
262260
add_tm DREAM_EATER ; e8
263261
add_tm AIR_SLASH ; e9
@@ -268,6 +266,17 @@ DEF TM01 EQU const_value
268266
add_tm FIRE_PUNCH ; ee
269267
add_tm SPIKES ; ef
270268
add_tm SUBSTITUTE ; f0
269+
add_tm TAUNT ; f
270+
add_tm CALM_MIND ; f
271+
add_tm FLASH_CANNON ; f
272+
add_tm DEFENSE_CURL ; f
273+
add_tm THUNDER_FANG ; f
274+
add_tm BRINE ; f
275+
add_tm FIRE_FANG ; f
276+
add_tm OMINOUS_WIND ; f
277+
add_tm ICE_FANG ; f
278+
add_tm LEAF_BLADE ; f
279+
add_tm DEFOG ; f
271280
DEF NUM_TMS EQU __tmhm_value__ - 1
272281

273282
MACRO add_hm

‎constants/map_constants.asm

+6-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ 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 HERALD_BAY, 14, 20 ; 12
79+
map_const HERALD_BAY, 17, 20 ; 12
8080
map_const HERALD_BAY_HOUSE, 5, 4 ; 13
8181
map_const CRAGGY_BEACH, 12, 40 ; 14
8282
endgroup
@@ -91,15 +91,19 @@ ENDM
9191
map_const CRAGGY_COAST_POKECENTER, 7, 4 ; 7
9292
map_const CRAGGY_COAST_FISHING, 5, 4 ; 8
9393
map_const BEACH_GROTTO, 5, 5 ; 9
94-
map_const MOUNTAIN_GYM, 5, 5 ; 10
94+
map_const MOUNTAIN_GYM, 4, 4 ; 10
9595
map_const RUGGED_CLIFF, 18, 22 ; 11
9696
map_const RUGGED_CLIFF_HOUSE, 5, 4 ; 12
9797
map_const RUGGED_CLIFF_POKECENTER, 7, 4 ; 13
98+
map_const MOUNTAIN_GYM_BREAK, 6, 5 ; 14
99+
map_const MOUNTAIN_GYM_ARENA, 6, 7 ; 15
98100
endgroup
99101

100102
newgroup BERRY_FOREST ; 7
101103
map_const BERRY_FOREST, 16, 16 ; 1
102104
map_const BERRY_FOREST_HOUSE, 5, 4 ; 2
105+
map_const HERALD_BAY_GROTTO, 5, 5 ; 3
106+
map_const RUGGED_CLIFF_GROTTO, 5, 5 ; 4
103107
endgroup
104108

105109
DEF NUM_MAP_GROUPS EQU const_value ; 7

‎constants/move_constants.asm

+7-7
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
const POUND ; 01
1010
const KARATE_CHOP ; 02
1111
const SWIFT ; 03
12-
const COMET_PUNCH ; 04
12+
const TAILWIND ; 04
1313
const FLATTER ; 05
1414
const BUG_BUZZ ; 06
1515
const FIRE_PUNCH ; 07
@@ -28,7 +28,7 @@
2828
const U_TURN ; 14
2929
const DARK_PULSE ; 15
3030
const VINE_WHIP ; 16
31-
const STOMP ; 17
31+
const BANEFULBUNKR ; 17
3232
const DOUBLE_KICK ; 18
3333
const DARK_VOID ; 19
3434
const HOWL ; 1a
@@ -101,7 +101,7 @@
101101
const CONFUSION ; 5d
102102
const PSYCHIC_M ; 5e
103103
const HYPNOSIS ; 5f
104-
const MEDITATE ; 60
104+
const BULK_UP ; 60
105105
const AGILITY ; 61
106106
const QUICK_ATTACK ; 62
107107
const RAGE ; 63
@@ -112,19 +112,19 @@
112112
const DOUBLE_TEAM ; 68
113113
const RECOVER ; 69
114114
const HARDEN ; 6a
115-
const MINIMIZE ; 6b
115+
const TAUNT ; 6b
116116
const SMOKESCREEN ; 6c
117117
const CONFUSE_RAY ; 6d
118118
const ERUPTION ; 6e
119119
const DEFENSE_CURL ; 6f
120-
const BARRIER ; 70
120+
const COIL ; 70
121121
const LIGHT_SCREEN ; 71
122122
const HAZE ; 72
123123
const REFLECT ; 73
124124
const FOCUS_ENERGY ; 74
125125
const FRENZY_PLANT ; 75
126126
const METRONOME ; 76
127-
const MIRROR_MOVE ; 77
127+
const PSYSHOCK ; 77
128128
const SELFDESTRUCT ; 78
129129
const FLASH_CANNON ; 79
130130
const LICK ; 7a
@@ -164,7 +164,7 @@
164164
const REST ; 9c
165165
const ROCK_SLIDE ; 9d
166166
const KNOCK_OFF ; 9e
167-
const SHARPEN ; 9f
167+
const ACID_RAIN ; 9f
168168
const CONVERSION ; a0
169169
const TRI_ATTACK ; a1
170170
const TRICK_ROOM ; a2

‎constants/sprite_data_constants.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ DEF NUM_SPRITEDATA_FIELDS EQU _RS
3131
const PAL_NPC_BLUE ; 9
3232
const PAL_NPC_GREEN ; a
3333
const PAL_NPC_BROWN ; b
34-
const PAL_NPC_PINK ; c
34+
const PAL_NPC_PURPLE ; c
3535
const PAL_NPC_EMOTE ; d
3636
const PAL_NPC_TREE ; e
3737
const PAL_NPC_ROCK ; f

‎constants/trainer_constants.asm

+5-3
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,6 @@ DEF NUM_NONTRAINER_PHONECONTACTS EQU const_value - 1
9595
const DANNY2
9696
const WESLEY
9797
const DAVID
98-
const ANDREW1
99-
const ANDREW2
100-
const ANDREW3
10198

10299
trainerclass DETECTIVE ; 17
103100

@@ -171,6 +168,9 @@ DEF NUM_NONTRAINER_PHONECONTACTS EQU const_value - 1
171168

172169
trainerclass BLACKBELT_T ; 32
173170
const LAU
171+
const HONDA1
172+
const HONDA2
173+
const HONDA3
174174

175175
trainerclass EXECUTIVEM ; 33
176176

@@ -246,6 +246,7 @@ DEF NUM_NONTRAINER_PHONECONTACTS EQU const_value - 1
246246
trainerclass PAINTER ; 4e
247247

248248
trainerclass RANGER ; 4f
249+
const GERALD
249250

250251
trainerclass RUIN_MANIAC ; 50
251252

@@ -263,6 +264,7 @@ DEF NUM_NONTRAINER_PHONECONTACTS EQU const_value - 1
263264

264265
trainerclass SURVIVALIST ; 57
265266
const PERRY
267+
const JOHN
266268

267269
trainerclass FARMER ; 58
268270

‎data/battle/ai/constant_damage_effects.asm

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
; BattleCommand_DamageCalc and BattleCommand_Stab.
44

55
ConstantDamageEffects:
6-
db EFFECT_SUPER_FANG
76
db EFFECT_STATIC_DAMAGE
87
db EFFECT_LEVEL_DAMAGE
98
db EFFECT_PSYWAVE

‎data/battle/ai/encore_moves.asm

+4-11
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,17 @@ EncoreMoves:
1111
db GROWTH
1212
db POISONPOWDER
1313
db STRING_SHOT
14-
db MEDITATE
1514
db AGILITY
16-
db TELEPORT
1715
db SCREECH
1816
db HAZE
1917
db FOCUS_ENERGY
2018
db DREAM_EATER
2119
db POISON_GAS
22-
db SPLASH
23-
db SHARPEN
2420
db CONVERSION
25-
db SUPER_FANG
2621
db SUBSTITUTE
2722
db TRIPLE_KICK
28-
db SPIDER_WEB
29-
db MIND_READER
30-
db FLAME_WHEEL
31-
db AEROBLAST
32-
db COTTON_SPORE
33-
db POWDER_SNOW
23+
db HAIL
24+
db TRICK_ROOM
25+
db HOWL
26+
db TAIL_WHIP
3427
db -1 ; end

‎data/battle/ai/rain_dance_moves.asm

+6-5
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ RainDanceMoves:
44
db WATER_GUN
55
db HYDRO_PUMP
66
db SURF
7-
db BUBBLEBEAM
87
db THUNDER
98
db WATERFALL
10-
db CLAMP
11-
db BUBBLE
129
db CRABHAMMER
13-
db OCTAZOOKA
14-
db WHIRLPOOL
10+
db HYDRO_CANNON
11+
db DIVE
12+
db MUDDY_WATER
13+
db WATER_PULSE
14+
db BRINE
15+
db AQUA_JET
1516
db -1 ; end

‎data/battle/ai/reckless_moves.asm

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
RecklessMoves:
55
db EFFECT_SELFDESTRUCT
6-
db EFFECT_RAMPAGE
76
db EFFECT_MULTI_HIT
87
db EFFECT_DOUBLE_HIT
98
db -1 ; end

‎data/battle/ai/residual_moves.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ ResidualMoves:
77
db STUN_SPORE
88
db THUNDER_WAVE
99
db FOCUS_ENERGY
10-
db BIDE
1110
db POISON_GAS
1211
db TRANSFORM
1312
db CONVERSION
1413
db SUBSTITUTE
1514
db SPIKES
15+
db WILL_O_WISP
1616
db -1 ; end

‎data/battle/ai/risky_effects.asm

-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@
33

44
RiskyEffects:
55
db EFFECT_SELFDESTRUCT
6-
db EFFECT_OHKO
76
db -1 ; end

‎data/battle/ai/stall_moves.asm

-8
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,18 @@ StallMoves:
1212
db LEECH_SEED
1313
db GROWTH
1414
db STRING_SHOT
15-
db MEDITATE
1615
db AGILITY
1716
db RAGE
18-
db MIMIC
1917
db SCREECH
2018
db HARDEN
21-
db WITHDRAW
2219
db DEFENSE_CURL
23-
db BARRIER
2420
db LIGHT_SCREEN
2521
db HAZE
2622
db REFLECT
2723
db FOCUS_ENERGY
28-
db BIDE
2924
db AMNESIA
3025
db TRANSFORM
31-
db SPLASH
3226
db ACID_ARMOR
33-
db SHARPEN
3427
db CONVERSION
3528
db SUBSTITUTE
36-
db FLAME_WHEEL
3729
db -1 ; end

‎data/battle/ai/status_only_effects.asm

+1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ StatusOnlyEffects:
66
db EFFECT_TOXIC
77
db EFFECT_POISON
88
db EFFECT_PARALYZE
9+
db EFFECT_WILL_O_WISP
910
db -1 ; end

‎data/battle/ai/sunny_day_moves.asm

+7-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,14 @@ SunnyDayMoves:
55
db FIRE_PUNCH
66
db EMBER
77
db FLAMETHROWER
8-
db FIRE_SPIN
98
db FIRE_BLAST
10-
db SACRED_FIRE
119
db MORNING_SUN
1210
db SYNTHESIS
11+
db SOLARBEAM
12+
db FLAME_WHEEL
13+
db BLAST_BURN
14+
db BLAZE_KICK
15+
db LAVA_PLUME
16+
db FIRE_FANG
17+
db ERUPTION
1318
db -1 ; end

0 commit comments

Comments
 (0)