Skip to content

Commit 8c68cdd

Browse files
DakoriasDakorias
committed
Last update before newbox
1 parent 7a5ce21 commit 8c68cdd

34 files changed

+178
-140
lines changed

‎constants/event_flags.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@
697697
const EVENT_EKANS_POKEBALL_IN_OAKS_LAB
698698
const EVENT_YANMA_POKEBALL_IN_OAKS_LAB
699699
const EVENT_BALTOY_POKEBALL_IN_OAKS_LAB
700-
const EVENT_HERALD_GROTTO_SUN_STONE
700+
const EVENT_HERALD_GROTTO_REVIVE
701701
const EVENT_BEACH_GROTTO_MYSTIC_WATER
702702
const EVENT_HERALD_ROUTE_POTION
703703
const EVENT_HERALD_ROUTE_GREAT_BALL

‎data/battle_anims/objects.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ BattleAnimObjects:
220220
; ANIM_OBJ_PETAL_DANCE
221221
battleanimobj RELATIVE_X, $48, BATTLEANIMFRAMESET_73, BATTLEANIMFUNC_PETAL_DANCE, PAL_BATTLE_OB_RED, ANIM_GFX_FLOWER
222222
; ANIM_OBJ_SLUDGE_BOMB
223-
battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_19, BATTLEANIMFUNC_THROW_TO_TARGET_DISAPPEAR, PAL_BATTLE_OB_GRAY, ANIM_GFX_EGG
223+
battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_74, BATTLEANIMFUNC_THROW_TO_TARGET_DISAPPEAR, PAL_BATTLE_OB_GRAY, ANIM_GFX_EGG
224224
; ANIM_OBJ_ROCK_BLAST
225225
battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_19, BATTLEANIMFUNC_THROW_TO_TARGET_DISAPPEAR, PAL_BATTLE_OB_BROWN, ANIM_GFX_ROCKS
226226
; ANIM_OBJ_PAY_DAY

‎data/maps/outdoor_sprites.asm

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ HeraldCoveGroupSprites:
6565
db SPRITE_SAILOR
6666
db SPRITE_GRAMPS
6767
db SPRITE_GRANNY
68+
db SPRITE_FRUIT_TREE
6869
db 0 ; end
6970

7071
CraggyCoastGroupSprites:

‎data/moves/animations.asm

+16-20
Original file line numberDiff line numberDiff line change
@@ -4133,27 +4133,23 @@ BattleAnim_PainSplit:
41334133
anim_ret
41344134

41354135
BattleAnim_GunkShot:
4136-
anim_1gfx ANIM_GFX_FIRE
4137-
anim_bgeffect ANIM_BG_CYCLE_OBPALS_GRAY_AND_YELLOW, $0, $2, $0
4138-
anim_bgeffect ANIM_BG_ALTERNATE_HUES, $0, $2, $0
4136+
anim_3gfx ANIM_GFX_EGG, ANIM_GFX_POISON, ANIM_GFX_HIT
4137+
anim_bgeffect ANIM_BG_BLACK_HUES, $0, $8, $0
4138+
anim_bgeffect ANIM_BG_SHAKE_SCREEN_X, $40, $2, $0
4139+
anim_wait 50
41394140
.loop
4140-
anim_sound 0, 0, SFX_EMBER
4141-
anim_obj ANIM_OBJ_SLUDGE_BOMB, 48, 104, $0
4142-
anim_wait 8
4143-
anim_loop 8, .loop
4144-
anim_wait 96
4145-
anim_call BattleAnim_TargetObj_1Row
4146-
anim_bgeffect ANIM_BG_TACKLE, $0, BG_EFFECT_USER, $0
4147-
anim_wait 4
4148-
anim_sound 0, 1, SFX_EMBER
4149-
anim_obj ANIM_OBJ_FIRE_BLAST, 136, 48, $1
4150-
anim_obj ANIM_OBJ_FIRE_BLAST, 136, 48, $4
4151-
anim_obj ANIM_OBJ_FIRE_BLAST, 136, 48, $5
4152-
anim_wait 8
4153-
anim_bgeffect ANIM_BG_SHOW_MON, $0, BG_EFFECT_TARGET, $0
4154-
anim_wait 4
4155-
anim_incobj 9
4156-
anim_wait 8
4141+
anim_sound 6, 2, SFX_SLUDGE_BOMB
4142+
anim_obj ANIM_OBJ_SLUDGE_BOMB, 64, 92, $10
4143+
anim_wait 6
4144+
anim_sound 6, 2, SFX_SLUDGE_BOMB
4145+
anim_obj ANIM_OBJ_SLUDGE_BOMB, 56, 84, $10
4146+
anim_wait 7
4147+
anim_sound 6, 2, SFX_SLUDGE_BOMB
4148+
anim_obj ANIM_OBJ_SLUDGE_BOMB, 52, 88, $10
4149+
anim_wait 5
4150+
anim_loop 3, .loop
4151+
anim_call BattleAnimSub_Sludge
4152+
anim_wait 56
41574153
anim_ret
41584154

41594155
BattleAnim_Magnitude:

‎data/pokemon/base_stats/breloom.asm

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
db BRELOOM ; 084
22

3-
db 110, 80, 80, 30, 90, 80
3+
db 60, 130, 80, 70, 60, 60
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 GRASS, FIGHTING ; type
7+
db 90 ; catch rate
8+
db 165 ; base exp
99
db NO_ITEM, NO_ITEM ; items
1010
db GENDER_F50 ; gender ratio
1111
db 100 ; unknown 1
12-
db 20 ; step cycles to hatch
12+
db 15 ; step cycles to hatch
1313
db 5 ; unknown 2
14-
INCBIN "gfx/pokemon/charmander/front.dimensions"
14+
INCBIN "gfx/pokemon/breloom/front.dimensions"
1515
dw NULL, NULL ; unused (beta front/back pics)
1616
db GROWTH_SLIGHTLY_FAST ; growth rate
17-
dn EGG_GROUND, EGG_GROUND ; egg groups
17+
dn EGG_FAIRY, EGG_PLANT ; egg groups
1818

1919
; tm/hm learnset
2020
tmhm CURSE

‎data/pokemon/base_stats/claydol.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/claydol/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/pokemon/base_stats/exeggcute.asm

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
db EXEGGCUTE ; 113
22

3-
db 110, 80, 80, 30, 90, 80
3+
db 60, 40, 80, 40, 60, 45
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 GRASS, PSYCHIC_TYPE ; type
7+
db 90 ; catch rate
8+
db 98 ; 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/exeggcute/front.dimensions"
1515
dw NULL, NULL ; unused (beta front/back pics)
1616
db GROWTH_SLIGHTLY_FAST ; growth rate
1717
dn EGG_GROUND, EGG_GROUND ; egg groups

‎data/pokemon/base_stats/mankey.asm

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

6-
db FIGHTING, DARK ; type
6+
db FIGHTING, FIGHTING ; type
77
db 190 ; catch rate
88
db 74 ; base exp
99
db NO_ITEM, NO_ITEM ; items

‎data/pokemon/evos_attacks.asm

+16-14
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ INCLUDE "data/pokemon/evos_attacks_pointers.asm"
1717
EkansEvosAttacks:
1818
db EVOLVE_LEVEL, 26, ARBOK
1919
db 0 ; no more evolutions
20-
db 1, POISON_STING
20+
db 1, GUNK_SHOT
2121
db 1, LEER
2222
db 6, WRAP
2323
db 9, BITE
@@ -70,30 +70,32 @@ db 20, WING_ATTACK
7070
db 22, DOUBLE_TEAM
7171
db 26, SIGNAL_BEAM
7272
db 30, ANCIENTPOWER
73-
db 36, U_TURN
73+
db 34, AIR_SLASH
74+
db 38, U_TURN
7475
db 41, HYPNOSIS
7576
db 47, DRAGON_PULSE
7677
db 50, BUG_BUZZ
77-
db 55, AIR_SLASH
78+
db 55, HURRICANE
7879
db 0 ; no more level-up moves
7980

8081
YanmegaEvosAttacks:
8182
db 0 ; no more evolutions
8283
db 1, GUST
8384
db 1, LEER
84-
db 1, QUICK_ATTACK
85-
db 1, LEECH_LIFE
85+
db 6, QUICK_ATTACK
86+
db 9, LEECH_LIFE
8687
db 13, SUPERSONIC
8788
db 16, TWISTER
8889
db 20, WING_ATTACK
8990
db 22, DOUBLE_TEAM
9091
db 26, SIGNAL_BEAM
9192
db 30, ANCIENTPOWER
92-
db 36, U_TURN
93+
db 34, AIR_SLASH
94+
db 38, U_TURN
9395
db 41, HYPNOSIS
9496
db 47, DRAGON_PULSE
9597
db 50, BUG_BUZZ
96-
db 55, AIR_SLASH
98+
db 55, HURRICANE
9799
db 0 ; no more level-up moves
98100

99101
BaltoyEvosAttacks:
@@ -370,7 +372,7 @@ CaterpieEvosAttacks:
370372
MetapodEvosAttacks:
371373
db EVOLVE_LEVEL, 10, BUTTERFREE
372374
db 0 ; no more evolutions
373-
db 1, HARDEN
375+
db 1, TACKLE
374376
db 1, STRING_SHOT
375377
db 7, HARDEN
376378
db 0 ; no more level-up moves
@@ -1312,11 +1314,9 @@ ChandelureEvosAttacks:
13121314
db 13, LEECH_SEED
13131315
db 17, BULLET_SEED
13141316
db 21, POISONPOWDER
1315-
db 22, MACH_PUNCH
1316-
db 30, ROCK_SMASH
1317+
db 30, GROWTH
13171318
db 35, GIGA_DRAIN
13181319
db 42, SPORE
1319-
db 51, DYNAMICPUNCH
13201320
db 0 ; no more level-up moves
13211321

13221322
BreloomEvosAttacks:
@@ -1327,9 +1327,11 @@ ChandelureEvosAttacks:
13271327
db 13, LEECH_SEED
13281328
db 17, BULLET_SEED
13291329
db 21, POISONPOWDER
1330-
db 30, GROWTH
1330+
db 22, MACH_PUNCH
1331+
db 30, ROCK_SMASH
13311332
db 35, GIGA_DRAIN
13321333
db 42, SPORE
1334+
db 51, DYNAMICPUNCH
13331335
db 0 ; no more level-up moves
13341336

13351337
BunearyEvosAttacks:
@@ -1542,12 +1544,12 @@ ChandelureEvosAttacks:
15421544

15431545
VulpixEvosAttacks:
15441546
db 0 ; no more evolutions
1545-
db 1, PSYSHOCK
1547+
db 1, ICY_WIND
15461548
db 0 ; no more level-up moves
15471549

15481550
NinetalesEvosAttacks:
15491551
db 0 ; no more evolutions
1550-
db 1, PSYSHOCK
1552+
db 1, ICY_WIND
15511553
db 0 ; no more level-up moves
15521554

15531555
GrowlitheEvosAttacks:

‎data/pokemon/pic_pointers.asm

+4-4
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,10 @@ PokemonPicPointers::
308308
dba FroslassBackpic
309309
dba SkarmoryFrontpic
310310
dba SkarmoryBackpic
311+
dba StunkyFrontpic
312+
dba StunkyBackpic
313+
dba SkuntankFrontpic
314+
dba SkuntankBackpic
311315
dba CubchooFrontpic
312316
dba CubchooBackpic
313317
dba BearticFrontpic
@@ -318,10 +322,6 @@ PokemonPicPointers::
318322
dba LombreBackpic
319323
dba LudicoloFrontpic
320324
dba LudicoloBackpic
321-
dba StunkyFrontpic
322-
dba StunkyBackpic
323-
dba SkuntankFrontpic
324-
dba SkuntankBackpic
325325
dba DuskullFrontpic
326326
dba DuskullBackpic
327327
dba DusclopsFrontpic

‎data/trainers/parties.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ RangerGroup:
563563
; GERALD (1)
564564
db "GERALD@", TRAINERTYPE_NORMAL
565565
db 14, GROWLITHE
566-
db 16, LOMBRE
566+
db 15, LOMBRE
567567
db -1 ; end
568568

569569
RuinManiacGroup:

‎data/wild/johto_grass.asm

+7-7
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ JohtoGrassWildMons:
144144
end_grass_wildmons
145145

146146
def_grass_wildmons MT_MONEGO
147-
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
147+
db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
148148
; morn
149149
; %, Species, min, max
150150
db 25, GEODUDE, 10, 12
@@ -258,8 +258,8 @@ JohtoGrassWildMons:
258258
db 10, SUNKERN, 13, 14
259259
db 10, APPLIN, 13, 14
260260
db 2, SKIPLOOM, 17, 18
261-
db 2, TREEKO, 14, 18
262-
db 1, TREEKO, 14, 17
261+
db 2, CHIKORITA, 11, 13
262+
db 1, CHIKORITA, 12, 14
263263

264264
; day
265265
db 30, HOPPIP, 15, 17
@@ -268,8 +268,8 @@ JohtoGrassWildMons:
268268
db 10, SUNKERN, 13, 14
269269
db 10, APPLIN, 13, 14
270270
db 2, SKIPLOOM, 17, 18
271-
db 2, TREEKO, 14, 18
272-
db 1, TREEKO, 14, 17
271+
db 2, BULBASAUR, 11, 13
272+
db 1, BULBASAUR, 12, 14
273273

274274
; nite
275275
db 30, HOPPIP, 15, 17
@@ -278,8 +278,8 @@ JohtoGrassWildMons:
278278
db 10, SUNKERN, 13, 14
279279
db 10, APPLIN, 13, 14
280280
db 2, SKIPLOOM, 17, 18
281-
db 2, TREEKO, 14, 18
282-
db 1, TREEKO, 14, 17
281+
db 2, TREEKO, 11, 13
282+
db 1, TREEKO, 12, 14
283283

284284
end_grass_wildmons
285285
db -1 ; end

‎engine/battle_anims/core.asm

+7
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,13 @@ InitBattleAnimBuffer:
261261
ld a, [wFXAnimID + 1]
262262
or a
263263
jr nz, .no_sub
264+
ld a, [wFXAnimID]
265+
cp NO_MOVE
266+
jr z, .do_sub
267+
cp NO_MOVE
268+
jr z, .do_sub
269+
cp NO_MOVE
270+
jr nz, .no_sub
264271

265272
.do_sub
266273
pop af

‎gfx/pics.asm

+9-9
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ GliscorFrontpic: INCBIN "gfx/pokemon/gliscor/front.animated.2bpp.lz"
164164
YanmaFrontpic: INCBIN "gfx/pokemon/yanma/front.animated.2bpp.lz"
165165
SmeargleFrontpic: INCBIN "gfx/pokemon/smeargle/front.animated.2bpp.lz"
166166
MamoswineFrontpic: INCBIN "gfx/pokemon/mamoswine/front.animated.2bpp.lz"
167-
LotadFrontpic: INCBIN "gfx/pokemon/lotad/front.animated.2bpp.lz"
167+
LotadFrontpic: INCBIN "gfx/pokemon/lotad/front.animated.2bpp.lz"
168168
MurkrowFrontpic: INCBIN "gfx/pokemon/murkrow/front.animated.2bpp.lz"
169169
GravelerFrontpic: INCBIN "gfx/pokemon/graveler/front.animated.2bpp.lz"
170170
StarmieFrontpic: INCBIN "gfx/pokemon/starmie/front.animated.2bpp.lz"
@@ -383,7 +383,7 @@ CarvanhaBackpic: INCBIN "gfx/pokemon/carvanha/back.2bpp.lz"
383383
GligarBackpic: INCBIN "gfx/pokemon/gligar/back.2bpp.lz"
384384
TyphlosionBackpic: INCBIN "gfx/pokemon/typhlosion/back.2bpp.lz"
385385
CharmeleonBackpic: INCBIN "gfx/pokemon/charmeleon/back.2bpp.lz"
386-
ChandelureBackpic: INCBIN "gfx/pokemon/chandelure/back.2bpp.lz"
386+
ChandelureBackpic: INCBIN "gfx/pokemon/chandelure/back.2bpp.lz"
387387
PichuFrontpic: INCBIN "gfx/pokemon/pichu/front.animated.2bpp.lz"
388388
DrifblimBackpic: INCBIN "gfx/pokemon/drifblim/back.2bpp.lz"
389389
PorygonZBackpic: INCBIN "gfx/pokemon/porygonz/back.2bpp.lz"
@@ -398,27 +398,27 @@ TeacherPic: INCBIN "gfx/trainers/teacher.2bpp.lz"
398398
EggPic: INCBIN "gfx/pokemon/egg/front.animated.2bpp.lz"
399399
EeveeBackpic: INCBIN "gfx/pokemon/eevee/back.2bpp.lz"
400400
ShuckleFrontpic: INCBIN "gfx/pokemon/shuckle/front.animated.2bpp.lz"
401-
LotadBackpic: INCBIN "gfx/pokemon/lotad/back.2bpp.lz"
402-
DarkraiFrontpic: INCBIN "gfx/pokemon/darkrai/front.animated.2bpp.lz"
403-
CresseliaFrontpic: INCBIN "gfx/pokemon/cresselia/front.animated.2bpp.lz"
401+
LotadBackpic: INCBIN "gfx/pokemon/lotad/back.2bpp.lz"
402+
DarkraiFrontpic: INCBIN "gfx/pokemon/darkrai/front.animated.2bpp.lz"
403+
CresseliaFrontpic: INCBIN "gfx/pokemon/cresselia/front.animated.2bpp.lz"
404404
OnixBackpic: INCBIN "gfx/pokemon/onix/back.2bpp.lz"
405405
KoffingBackpic: INCBIN "gfx/pokemon/koffing/back.2bpp.lz"
406406
BirdKeeperPic: INCBIN "gfx/trainers/bird_keeper.2bpp.lz"
407407
FalknerPic: INCBIN "gfx/trainers/falkner.2bpp.lz"
408408
KarenPic: INCBIN "gfx/trainers/karen.2bpp.lz"
409-
LampentBackpic: INCBIN "gfx/pokemon/lampent/back.2bpp.lz"
410-
DragalgeBackpic: INCBIN "gfx/pokemon/dragalge/back.2bpp.lz"
409+
LampentBackpic: INCBIN "gfx/pokemon/lampent/back.2bpp.lz"
410+
DragalgeBackpic: INCBIN "gfx/pokemon/dragalge/back.2bpp.lz"
411411
GrowlitheBackpic: INCBIN "gfx/pokemon/growlithe/back.2bpp.lz"
412412
KogaPic: INCBIN "gfx/trainers/koga.2bpp.lz"
413413
MachokeBackpic: INCBIN "gfx/pokemon/machoke/back.2bpp.lz"
414414
RaichuBackpic: INCBIN "gfx/pokemon/raichu/back.2bpp.lz"
415415
CrawdauntBackpic: INCBIN "gfx/pokemon/crawdaunt/back.2bpp.lz"
416416
SwimmermPic: INCBIN "gfx/trainers/swimmer_m.2bpp.lz"
417417
HeatranFrontpic: INCBIN "gfx/pokemon/heatran/front.animated.2bpp.lz"
418-
SunkernBackpic: INCBIN "gfx/pokemon/sunkern/back.2bpp.lz"
418+
SunkernBackpic: INCBIN "gfx/pokemon/sunkern/back.2bpp.lz"
419419
MysticalmanPic: INCBIN "gfx/trainers/mysticalman.2bpp.lz"
420420
CooltrainerfPic: INCBIN "gfx/trainers/cooltrainer_f.2bpp.lz"
421-
DeoxysFrontpic: INCBIN "gfx/pokemon/deoxys/front.animated.2bpp.lz"
421+
DeoxysFrontpic: INCBIN "gfx/pokemon/deoxys/front.animated.2bpp.lz"
422422

423423

424424
SECTION "Pics 14", ROMX

‎gfx/pokemon/buneary/front.png

-290 Bytes
Loading

‎gfx/pokemon/exeggcute/front.png

-16 Bytes
Loading

‎gfx/pokemon/lombre/front.png

-1.01 KB
Loading

‎gfx/pokemon/lotad/front.png

-621 Bytes
Loading

‎gfx/pokemon/vulpix/anim.asm

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
setrepeat 2
2-
frame 0, 10
3-
frame 1, 05
1+
frame 0, 08
2+
frame 1, 10
3+
frame 2, 04
4+
frame 3, 04
5+
frame 2, 04
6+
frame 3, 04
7+
frame 2, 04
8+
frame 3, 04
49
frame 2, 05
5-
dorepeat 1
6-
setrepeat 2
7-
frame 0, 04
8-
frame 3, 05
9-
dorepeat 6
10-
endanim
10+
frame 0, 16
11+
endanim

0 commit comments

Comments
 (0)