From e37e10854230c3b0f2b96dfe4e8626a1352ac1c9 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 23 Jul 2019 09:16:59 +0800 Subject: document battle transition symbols --- include/battle_transition.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/battle_transition.h b/include/battle_transition.h index 91e564790..8f29d40b3 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -4,7 +4,7 @@ #include "global.h" void sub_8149DFC(u8 a0); -bool8 sub_80D08F8(void); -void sub_80D08B8(u8 a0); +bool8 BT_IsDone(void); +void BT_StartOnField(u8 a0); #endif // GUARD_BATTLE_TRANSITION_H -- cgit v1.2.3 From a674ba2749871cb1c26c4c17719cc784e329f815 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 23 Jul 2019 09:31:54 +0800 Subject: updated battle transition header --- include/battle_transition.h | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/battle_transition.h b/include/battle_transition.h index 8f29d40b3..4e9d0029c 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -3,8 +3,37 @@ #include "global.h" -void sub_8149DFC(u8 a0); bool8 BT_IsDone(void); -void BT_StartOnField(u8 a0); +void BT_StartOnField(u8 transitionId); +bool8 FldEff_Pokeball(void); + +enum +{ + MUGSHOT_LORELEI, + MUGSHOT_BRUNO, + MUGSHOT_AGATHA, + MUGSHOT_LANCE, + MUGSHOT_BLUE, + MUGSHOTS_COUNT +}; + +#define B_TRANSITION_BLUR 0 +#define B_TRANSITION_DISTORTED_WAVE 1 +#define B_TRANSITION_HORIZONTAL_CORRUGATE 2 +#define B_TRANSITION_BIG_POKEBALL 3 +#define B_TRANSITION_SLIDING_POKEBALLS 4 +#define B_TRANSITION_CLOCKWISE_BLACKFADE 5 +#define B_TRANSITION_FULLSCREEN_WAVE 6 +#define B_TRANSITION_BLACK_WAVE_TO_RIGHT 7 +#define B_TRANSITION_SLICED_SCREEN 8 +#define B_TRANSITION_WHITEFADE_IN_STRIPES 9 +#define B_TRANSITION_GRID_SQUARES 10 +#define B_TRANSITION_BLACK_DOODLES 11 +#define B_TRANSITION_LORELEI 12 +#define B_TRANSITION_BRUNO 13 +#define B_TRANSITION_AGATHA 14 +#define B_TRANSITION_LANCE 15 +#define B_TRANSITION_BLUE 16 +#define B_TRANSITION_ANTI_CLOCKWISE_SPIRAL 17 #endif // GUARD_BATTLE_TRANSITION_H -- cgit v1.2.3 From e150a620450a17bb2ab3905c04c33777dc6bf0cc Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 23 Jul 2019 14:07:10 +0800 Subject: battle transition data decomp --- include/battle_transition.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/battle_transition.h b/include/battle_transition.h index 4e9d0029c..4ef5f19d9 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -3,10 +3,6 @@ #include "global.h" -bool8 BT_IsDone(void); -void BT_StartOnField(u8 transitionId); -bool8 FldEff_Pokeball(void); - enum { MUGSHOT_LORELEI, @@ -36,4 +32,10 @@ enum #define B_TRANSITION_BLUE 16 #define B_TRANSITION_ANTI_CLOCKWISE_SPIRAL 17 +extern const struct SpritePalette sSpritePalette_SlidingPokeball; + +bool8 BT_IsDone(void); +void BT_StartOnField(u8 transitionId); +bool8 FldEff_Pokeball(void); + #endif // GUARD_BATTLE_TRANSITION_H -- cgit v1.2.3 From 4677efabdbe6769c8e35a9c003c42855678de81f Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Wed, 24 Jul 2019 05:50:36 +0800 Subject: thru BT_Phase2BigPokeball_UpdateWave3 --- include/overworld.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/overworld.h b/include/overworld.h index 9a9657006..7c1f34e41 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -106,6 +106,7 @@ extern bool8 (* gFieldCallback2)(void); void SetLastHealLocationWarp(u8 healLocaionId); void sub_8055864(u8 mapGroup, u8 mapNum); void CB2_Overworld(void); +void CB2_OverworldBasic(void); void CB2_NewGame(void); bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType); void Overworld_ResetStateAfterTeleport(void); -- cgit v1.2.3 From 25661400cc57bc3511945d9d05c324ceec5839e2 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Wed, 24 Jul 2019 14:52:07 +0800 Subject: thru BT_Phase2AntiClockwiseSpiral --- include/field_effect.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/field_effect.h b/include/field_effect.h index 426f77510..47f35fe86 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -83,5 +83,6 @@ void sub_80B69DC(void); void CreateTeleportFieldEffectTask(void); void FieldEffectActiveListRemove(u8 id); void sub_8085620(void); +void FieldEffectStop(struct Sprite *sprite, u8 id); #endif //GUARD_FIELD_EFFECTS_H -- cgit v1.2.3 From a348095998751f50042cfa3892ed91b37b8e11a8 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Thu, 25 Jul 2019 14:15:41 +0800 Subject: matched all easy functions --- include/field_camera.h | 1 + include/field_effect.h | 1 + include/trainer_pokemon_sprites.h | 7 ++++--- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/field_camera.h b/include/field_camera.h index 53d734081..d67523c8f 100644 --- a/include/field_camera.h +++ b/include/field_camera.h @@ -26,5 +26,6 @@ extern u16 gUnknown_03005DE8; void DrawWholeMapView(void); void CurrentMapDrawMetatileAt(int x, int y); +void sub_805A658(s16 *x, s16 *y); #endif //GUARD_FIELD_CAMERA_H diff --git a/include/field_effect.h b/include/field_effect.h index 47f35fe86..0ab2d0475 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -84,5 +84,6 @@ void CreateTeleportFieldEffectTask(void); void FieldEffectActiveListRemove(u8 id); void sub_8085620(void); void FieldEffectStop(struct Sprite *sprite, u8 id); +u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer); #endif //GUARD_FIELD_EFFECTS_H diff --git a/include/trainer_pokemon_sprites.h b/include/trainer_pokemon_sprites.h index 3ae75ed0f..2a520715f 100644 --- a/include/trainer_pokemon_sprites.h +++ b/include/trainer_pokemon_sprites.h @@ -1,5 +1,5 @@ -#ifndef GUARD_BATTLE_DOME_CARDS_H -#define GUARD_BATTLE_DOME_CARDS_H +#ifndef GUARD_TRAINER_POKEMON_SPRITES_H +#define GUARD_TRAINER_POKEMON_SPRITES_H #include "global.h" @@ -13,5 +13,6 @@ u16 sub_818D938(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteS u8 sub_818D97C(u8 a0, u8 a1); u16 CreateTrainerPicSprite(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag); u16 FreeAndDestroyTrainerPicSprite(u16); +u16 PlayerGenderToFrontTrainerPicId_Debug(u8 gender, bool8 getClass); -#endif //GUARD_BATTLE_DOME_CARDS_H +#endif // GUARD_TRAINER_POKEMON_SPRITES_H -- cgit v1.2.3