dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'pret/master' into pokefirered_pokeemeraldSync4

Browse Source 
# Conflicts:
#	include/battle.h
#	include/cable_club.h
#	src/battle_anim_fire.c
#	src/battle_anim_ghost.c
#	src/battle_anim_ground.c
#	src/battle_message.c
#	src/cable_club.c
This commit is contained in:
Eduardo Quezada
2022-09-04 17:44:13 -03:00
parent 616ab63d94 b3c7b9e09f
commit 9241dc6fe7
355 changed files with 20064 additions and 19067 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/battle_anim.h
+1625
View File
File diff suppressed because it is too large Load Diff
src/data/object_events/object_event_graphics.h
+3 -3
View File
@@ -191,9 +191,9 @@ const u16 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U16("graphics/field_effe
const u16 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U16("graphics/field_effects/pics/shadow_large.4bpp");
const u16 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U16("graphics/field_effects/pics/shadow_extra_large.4bpp");
const u16 filler_8398188[0x90] = {};
const u16 gUnknown_8398648[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp");
const u16 gUnknown_8398668[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp");
const u16 gUnknown_8398688[] = INCBIN_U16("graphics/field_effects/fldeff_cut.gbapal");
const u16 gFieldEffectObjectPic_CutGrass[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp");
UNUSED const u16 gFieldEffectObjectPic_CutGrass2[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp");
const u16 gFieldEffectPal_CutGrass[] = INCBIN_U16("graphics/field_effects/fldeff_cut.gbapal");
const u16 gFieldEffectObjectPic_Ripple[] = INCBIN_U16("graphics/field_effects/pics/ripple.4bpp");
const u16 gFieldEffectObjectPic_Ash[] = INCBIN_U16("graphics/field_effects/pics/ash.4bpp");
const u16 gFieldEffectObjectPic_Arrow[] = INCBIN_U16("graphics/field_effects/pics/arrow.4bpp");