ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1067 from DizzyEggg/transitions

Browse Source 
Transitions
This commit is contained in:
huderlem 2020-06-03 19:45:04 -05:00 committed by GitHub
commit 83336585e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 303 additions and 296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
graphics/battle_transitions/85BC314.bin → graphics/battle_transitions/regice.bin
View File

0
graphics/battle_transitions/85BC2B4.pal → graphics/battle_transitions/regice.pal
View File

0
graphics/battle_transitions/85BD314.bin → graphics/battle_transitions/regirock.bin
View File

0
graphics/battle_transitions/85BC2F4.pal → graphics/battle_transitions/regirock.pal
View File

0
graphics/battle_transitions/85BBC14.png → graphics/battle_transitions/regis.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 231 B

After

Width:  |  Height:  |  Size: 231 B

0
graphics/battle_transitions/85BCB14.bin → graphics/battle_transitions/registeel.bin
View File

0
graphics/battle_transitions/85BC2D4.pal → graphics/battle_transitions/registeel.pal
View File

2
graphics_file_rules.mk
View File

@ -489,7 +489,7 @@ $(ROULETTEGFXDIR)/poke_icons2.4bpp: $(ROULETTEGFXDIR)/wynaut.4bpp \
$(ROULETTEGFXDIR)/makuhita.4bpp $(ROULETTEGFXDIR)/makuhita.4bpp
@cat $^ >$@ @cat $^ >$@
$(BATTRANSGFXDIR)/85BBC14.4bpp: %.4bpp: %.png $(BATTRANSGFXDIR)/regis.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 53 $(GFX) $< $@ -num_tiles 53
$(BATTRANSGFXDIR)/rayquaza.4bpp: %.4bpp: %.png $(BATTRANSGFXDIR)/rayquaza.4bpp: %.4bpp: %.png

2
include/battle_transition.h
View File

@ -7,7 +7,7 @@ void BattleTransition_Start(u8 transitionId);
bool8 IsBattleTransitionDone(void); bool8 IsBattleTransitionDone(void);
bool8 FldEff_Pokeball(void); bool8 FldEff_Pokeball(void);
void TransitionPhase1_Task_RunFuncs(u8 taskId); void TransitionPhase1_Task_RunFuncs(u8 taskId);
void sub_8149F58(u16 **a0, u16 **a1); void GetBg0TilesDst(u16 **tilemap, u16 **tileset);
extern const struct SpritePalette gFieldEffectObjectPaletteInfo10; extern const struct SpritePalette gFieldEffectObjectPaletteInfo10;

593
src/battle_transition.c
View File

File diff suppressed because it is too large Load Diff

2
src/unk_transition.c
View File

@ -187,7 +187,7 @@ static void sub_81DA700(void)
{ {
u16 *dst1, *dst2; u16 *dst1, *dst2;
sub_8149F58(&dst1, &dst2); GetBg0TilesDst(&dst1, &dst2);
LZ77UnCompVram(gUnknown_0862AD54, dst2); LZ77UnCompVram(gUnknown_0862AD54, dst2);
LZ77UnCompVram(gUnknown_0862AF30, dst1); LZ77UnCompVram(gUnknown_0862AF30, dst1);
LoadPalette(gUnknown_0862B53C, 0xF0, 0x20); LoadPalette(gUnknown_0862B53C, 0xF0, 0x20);