Sync with pokecrystal up to b0ddb07

This commit is contained in:
xCrystal
2023-08-22 01:09:23 +01:00
parent d6001be90c
commit 5e78fd1ecc
11 changed files with 898 additions and 858 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -47,7 +47,7 @@ DecorationAttributes:
decoration DECO_DOLL, SQUIRTLE, SET_UP_DOLL, EVENT_DECO_SQUIRTLE_DOLL, SPRITE_SQUIRTLE
decoration DECO_DOLL, POLIWAG, SET_UP_DOLL, EVENT_DECO_POLIWAG_DOLL, SPRITE_POLIWAG
decoration DECO_DOLL, DIGLETT, SET_UP_DOLL, EVENT_DECO_DIGLETT_DOLL, SPRITE_DIGLETT
decoration DECO_DOLL, STARYU, SET_UP_DOLL, EVENT_DECO_STARMIE_DOLL, SPRITE_STARMIE
decoration DECO_DOLL, STARYU, SET_UP_DOLL, EVENT_DECO_STARYU_DOLL, SPRITE_STARMIE
decoration DECO_DOLL, MAGIKARP, SET_UP_DOLL, EVENT_DECO_MAGIKARP_DOLL, SPRITE_MAGIKARP
decoration DECO_DOLL, ODDISH, SET_UP_DOLL, EVENT_DECO_ODDISH_DOLL, SPRITE_ODDISH
decoration DECO_DOLL, GENGAR, SET_UP_DOLL, EVENT_DECO_GENGAR_DOLL, SPRITE_GENGAR

View File

@@ -35,7 +35,7 @@ DecorationIDs:
db DECO_SQUIRTLE_DOLL ; 24
db DECO_POLIWAG_DOLL ; 25
db DECO_DIGLETT_DOLL ; 26
db DECO_STARMIE_DOLL ; 27
db DECO_STARYU_DOLL ; 27
db DECO_MAGIKARP_DOLL ; 28
db DECO_ODDISH_DOLL ; 29
db DECO_GENGAR_DOLL ; 2a

View File

@@ -1240,7 +1240,7 @@ BattleAnim_Thunderpunch:
anim_obj ANIM_OBJ_PUNCH_SHAKE, 136, 56, $43
anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $2
anim_sound 0, 1, SFX_THUNDER
anim_obj ANIM_OBJ_THUNDER3, 152, 68, $0
anim_obj ANIM_OBJ_THUNDER_RIGHT, 152, 68, $0
anim_wait 64
anim_ret
@@ -1280,13 +1280,13 @@ BattleAnim_Thunder:
anim_1gfx ANIM_GFX_LIGHTNING
anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $6, $20
anim_sound 0, 1, SFX_THUNDER
anim_obj ANIM_OBJ_THUNDER2, 120, 68, $0
anim_obj ANIM_OBJ_THUNDER_LEFT, 120, 68, $0
anim_wait 16
anim_sound 0, 1, SFX_THUNDER
anim_obj ANIM_OBJ_THUNDER3, 152, 68, $0
anim_obj ANIM_OBJ_THUNDER_RIGHT, 152, 68, $0
anim_wait 16
anim_sound 0, 1, SFX_THUNDER
anim_obj ANIM_OBJ_THUNDER1, 136, 68, $0
anim_obj ANIM_OBJ_THUNDER_CENTER, 136, 68, $0
anim_wait 48
anim_ret
@@ -2645,7 +2645,7 @@ BattleAnim_TriAttack:
anim_wait 16
anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $4, $4
anim_sound 0, 1, SFX_THUNDER
anim_obj ANIM_OBJ_THUNDER3, 152, 68, $0
anim_obj ANIM_OBJ_THUNDER_RIGHT, 152, 68, $0
anim_wait 16
anim_ret