Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Continue battle_transition documenting

This commit is contained in:
GriffinR 2021-10-27 16:17:27 -04:00
parent bf87faa922
commit 07bf225f94
6 changed files with 1286 additions and 937 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/field_effect_scripts.s
View File

@ -50,7 +50,7 @@ gFieldEffectScriptPointers::
.4byte gFieldEffectScript_HotSpringsWater @ FLDEFF_HOT_SPRINGS_WATER .4byte gFieldEffectScript_HotSpringsWater @ FLDEFF_HOT_SPRINGS_WATER
.4byte gFieldEffectScript_UseWaterfall @ FLDEFF_USE_WATERFALL .4byte gFieldEffectScript_UseWaterfall @ FLDEFF_USE_WATERFALL
.4byte gFieldEffectScript_UseDive @ FLDEFF_USE_DIVE .4byte gFieldEffectScript_UseDive @ FLDEFF_USE_DIVE
.4byte gFieldEffectScript_Pokeball @ FLDEFF_POKEBALL .4byte gFieldEffectScript_PokeballTrail @ FLDEFF_POKEBALL_TRAIL
.4byte gFieldEffectScript_HeartIcon @ FLDEFF_HEART_ICON .4byte gFieldEffectScript_HeartIcon @ FLDEFF_HEART_ICON
.4byte gFieldEffectScript_Nop47 @ FLDEFF_NOP_47 .4byte gFieldEffectScript_Nop47 @ FLDEFF_NOP_47
.4byte gFieldEffectScript_Nop48 @ FLDEFF_NOP_48 .4byte gFieldEffectScript_Nop48 @ FLDEFF_NOP_48
@ -254,9 +254,9 @@ gFieldEffectScript_UseDive::
field_eff_callnative FldEff_UseDive field_eff_callnative FldEff_UseDive
field_eff_end field_eff_end
gFieldEffectScript_Pokeball:: gFieldEffectScript_PokeballTrail::
field_eff_loadpal gSpritePalette_Pokeball field_eff_loadpal gSpritePalette_Pokeball
field_eff_callnative FldEff_Pokeball field_eff_callnative FldEff_PokeballTrail
field_eff_end field_eff_end
gFieldEffectScript_HeartIcon:: gFieldEffectScript_HeartIcon::

0
graphics/battle_transitions/85BDB14.pal → graphics/battle_transitions/unused.pal
View File

12
include/battle_transition.h
View File

@ -4,7 +4,7 @@
void BattleTransition_StartOnField(u8 transitionId); void BattleTransition_StartOnField(u8 transitionId);
void BattleTransition_Start(u8 transitionId); void BattleTransition_Start(u8 transitionId);
bool8 IsBattleTransitionDone(void); bool8 IsBattleTransitionDone(void);
bool8 FldEff_Pokeball(void); bool8 FldEff_PokeballTrail(void);
void Task_BattleTransition_Intro(u8 taskId); void Task_BattleTransition_Intro(u8 taskId);
void GetBg0TilesDst(u16 **tilemap, u16 **tileset); void GetBg0TilesDst(u16 **tilemap, u16 **tileset);
@ -25,13 +25,13 @@ enum {
B_TRANSITION_SHUFFLE, B_TRANSITION_SHUFFLE,
B_TRANSITION_BIG_POKEBALL, B_TRANSITION_BIG_POKEBALL,
B_TRANSITION_POKEBALLS_TRAIL, B_TRANSITION_POKEBALLS_TRAIL,
B_TRANSITION_CLOCKWISE_BLACKFADE, B_TRANSITION_CLOCKWISE_WIPE,
B_TRANSITION_RIPPLE, B_TRANSITION_RIPPLE,
B_TRANSITION_WAVE, B_TRANSITION_WAVE,
B_TRANSITION_SLICE, B_TRANSITION_SLICE,
B_TRANSITION_WHITEFADE, B_TRANSITION_WHITE_BARS_FADE,
B_TRANSITION_GRID_SQUARES, B_TRANSITION_GRID_SQUARES,
B_TRANSITION_SHARDS, B_TRANSITION_ANGLED_WIPES,
B_TRANSITION_SIDNEY, B_TRANSITION_SIDNEY,
B_TRANSITION_PHOEBE, B_TRANSITION_PHOEBE,
B_TRANSITION_GLACIA, B_TRANSITION_GLACIA,
@ -46,8 +46,8 @@ enum {
B_TRANSITION_GROUDON, B_TRANSITION_GROUDON,
B_TRANSITION_RAYQUAZA, B_TRANSITION_RAYQUAZA,
B_TRANSITION_SHRED_SPLIT, B_TRANSITION_SHRED_SPLIT,
B_TRANSITION_BLACKHOLE1, B_TRANSITION_BLACKHOLE,
B_TRANSITION_BLACKHOLE2, B_TRANSITION_BLACKHOLE_PULSATE,
B_TRANSITION_RECTANGULAR_SPIRAL, B_TRANSITION_RECTANGULAR_SPIRAL,
B_TRANSITION_FRONTIER_LOGO_WIGGLE, B_TRANSITION_FRONTIER_LOGO_WIGGLE,
B_TRANSITION_FRONTIER_LOGO_WAVE, B_TRANSITION_FRONTIER_LOGO_WAVE,

4
include/constants/field_effects.h
View File

@ -46,7 +46,7 @@
#define FLDEFF_HOT_SPRINGS_WATER 42 #define FLDEFF_HOT_SPRINGS_WATER 42
#define FLDEFF_USE_WATERFALL 43 #define FLDEFF_USE_WATERFALL 43
#define FLDEFF_USE_DIVE 44 #define FLDEFF_USE_DIVE 44
#define FLDEFF_POKEBALL 45 #define FLDEFF_POKEBALL_TRAIL 45
#define FLDEFF_HEART_ICON 46 #define FLDEFF_HEART_ICON 46
#define FLDEFF_NOP_47 47 #define FLDEFF_NOP_47 47
#define FLDEFF_NOP_48 48 #define FLDEFF_NOP_48 48
@ -113,7 +113,7 @@
#define FLDEFF_PAL_TAG_GENERAL_1 0x1005 #define FLDEFF_PAL_TAG_GENERAL_1 0x1005
#define FLDEFF_PAL_TAG_POKEBALL_GLOW 0x1007 #define FLDEFF_PAL_TAG_POKEBALL_GLOW 0x1007
#define FLDEFF_PAL_TAG_SECRET_POWER_PLANT 0x1008 #define FLDEFF_PAL_TAG_SECRET_POWER_PLANT 0x1008
#define FLDEFF_PAL_TAG_POKEBALL 0x1009 #define FLDEFF_PAL_TAG_POKEBALL_TRAIL 0x1009
#define FLDEFF_PAL_TAG_ASH 0x100D #define FLDEFF_PAL_TAG_ASH 0x100D
#define FLDEFF_PAL_TAG_SAND_PILLAR 0x100E #define FLDEFF_PAL_TAG_SAND_PILLAR 0x100E
#define FLDEFF_PAL_TAG_SMALL_SPARKLE 0x100F #define FLDEFF_PAL_TAG_SMALL_SPARKLE 0x100F

12
src/battle_setup.c
View File

@ -112,15 +112,15 @@ EWRAM_DATA static u8 sNoOfPossibleTrainerRetScripts = 0;
// Otherwise, the second transition is used. // Otherwise, the second transition is used.
static const u8 sBattleTransitionTable_Wild[][2] = static const u8 sBattleTransitionTable_Wild[][2] =
{ {
[TRANSITION_TYPE_NORMAL] = {B_TRANSITION_SLICE, B_TRANSITION_WHITEFADE}, [TRANSITION_TYPE_NORMAL] = {B_TRANSITION_SLICE, B_TRANSITION_WHITE_BARS_FADE},
[TRANSITION_TYPE_CAVE] = {B_TRANSITION_CLOCKWISE_BLACKFADE, B_TRANSITION_GRID_SQUARES}, [TRANSITION_TYPE_CAVE] = {B_TRANSITION_CLOCKWISE_WIPE, B_TRANSITION_GRID_SQUARES},
[TRANSITION_TYPE_FLASH] = {B_TRANSITION_BLUR, B_TRANSITION_GRID_SQUARES}, [TRANSITION_TYPE_FLASH] = {B_TRANSITION_BLUR, B_TRANSITION_GRID_SQUARES},
[TRANSITION_TYPE_WATER] = {B_TRANSITION_WAVE, B_TRANSITION_RIPPLE}, [TRANSITION_TYPE_WATER] = {B_TRANSITION_WAVE, B_TRANSITION_RIPPLE},
}; };
static const u8 sBattleTransitionTable_Trainer[][2] = static const u8 sBattleTransitionTable_Trainer[][2] =
{ {
[TRANSITION_TYPE_NORMAL] = {B_TRANSITION_POKEBALLS_TRAIL, B_TRANSITION_SHARDS}, [TRANSITION_TYPE_NORMAL] = {B_TRANSITION_POKEBALLS_TRAIL, B_TRANSITION_ANGLED_WIPES},
[TRANSITION_TYPE_CAVE] = {B_TRANSITION_SHUFFLE, B_TRANSITION_BIG_POKEBALL}, [TRANSITION_TYPE_CAVE] = {B_TRANSITION_SHUFFLE, B_TRANSITION_BIG_POKEBALL},
[TRANSITION_TYPE_FLASH] = {B_TRANSITION_BLUR, B_TRANSITION_GRID_SQUARES}, [TRANSITION_TYPE_FLASH] = {B_TRANSITION_BLUR, B_TRANSITION_GRID_SQUARES},
[TRANSITION_TYPE_WATER] = {B_TRANSITION_SWIRL, B_TRANSITION_RIPPLE}, [TRANSITION_TYPE_WATER] = {B_TRANSITION_SWIRL, B_TRANSITION_RIPPLE},
@ -555,7 +555,7 @@ void StartGroudonKyogreBattle(void)
gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON; gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON;
if (gGameVersion == VERSION_RUBY) if (gGameVersion == VERSION_RUBY)
CreateBattleStartTask(B_TRANSITION_SHARDS, MUS_VS_KYOGRE_GROUDON); // GROUDON CreateBattleStartTask(B_TRANSITION_ANGLED_WIPES, MUS_VS_KYOGRE_GROUDON); // GROUDON
else else
CreateBattleStartTask(B_TRANSITION_RIPPLE, MUS_VS_KYOGRE_GROUDON); // KYOGRE CreateBattleStartTask(B_TRANSITION_RIPPLE, MUS_VS_KYOGRE_GROUDON); // KYOGRE

2189
src/battle_transition.c
View File

File diff suppressed because it is too large Load Diff