atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "More transitions documentation"

Browse source
This commit is contained in:
PikalaxALT 2020-06-01 18:05:31 -04:00 committed by GitHub
parent d54053f9d7
commit 72b332d551
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 295 additions and 302 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 231 B

After

Width:  |  Height:  |  Size: 231 B

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

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

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

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

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

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

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 GetBg0TilesDst(u16 **tilemap, u16 **tileset); void sub_8149F58(u16 **a0, u16 **a1);
extern const struct SpritePalette gFieldEffectObjectPaletteInfo10; extern const struct SpritePalette gFieldEffectObjectPaletteInfo10;

587
src/battle_transition.c
View file

File diff suppressed because it is too large Load diff

8
src/unk_transition.c
View file

@ -185,11 +185,11 @@ static const TransitionStateFunc sPhase2_41_Funcs[] =
// code // code
static void sub_81DA700(void) static void sub_81DA700(void)
{ {
u16 *tilemap, *tileset; u16 *dst1, *dst2;
GetBg0TilesDst(&tilemap, &tileset); sub_8149F58(&dst1, &dst2);
LZ77UnCompVram(gUnknown_0862AD54, tileset); LZ77UnCompVram(gUnknown_0862AD54, dst2);
LZ77UnCompVram(gUnknown_0862AF30, tilemap); LZ77UnCompVram(gUnknown_0862AF30, dst1);
LoadPalette(gUnknown_0862B53C, 0xF0, 0x20); LoadPalette(gUnknown_0862B53C, 0xF0, 0x20);
LoadCompressedSpriteSheet(&sUnknown_0862B724); LoadCompressedSpriteSheet(&sUnknown_0862B724);
LoadSpritePalette(&sUnknown_0862B72C); LoadSpritePalette(&sUnknown_0862B72C);