Merge pull request #102 from PikalaxALT/field_fadetransition

Field fadetransition
This commit is contained in:
PikalaxALT
2019-09-26 14:45:58 -04:00
committed by GitHub
16 changed files with 999 additions and 2393 deletions
+1
View File
@@ -9,5 +9,6 @@
// Exported ROM declarations
void sub_8081A90(u8 taskId);
u8 sub_8081150(void);
#endif //GUARD_CABLE_CLUB_H
+4
View File
@@ -85,5 +85,9 @@ 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);
void sub_8084454(void);
void sub_8084784(u8 a0, u8 a1);
void sub_8084F2C(u8 a0);
void sub_80853CC(u8 a0);
#endif //GUARD_FIELD_EFFECTS_H
+2
View File
@@ -16,4 +16,6 @@ void sub_807DC18(void);
void FieldCallback_ReturnToEventScript2(void);
void sub_807DC00(void);
bool32 sub_807E418(void);
#endif // GUARD_FIELD_FADETRANSITION_H
+4
View File
@@ -52,9 +52,12 @@ u8 SpawnSpecialFieldObjectParameterized(u8, u8, u8, s16, s16, u8);
u8 SpawnSpecialFieldObject(struct MapObjectTemplate *);
void sub_8093038(s16, s16, s16 *, s16 *);
void CameraObjectReset1(void);
void CameraObjectReset2(void);
void FieldObjectSetGraphicsId(struct MapObject *, u8);
void FieldObjectTurn(struct MapObject *, u8);
void FieldObjectTurnByLocalIdAndMap(u8, u8, u8, u8);
void FieldObjectForceSetSpecialAnim(struct MapObject *, u8);
u8 sub_8064270(u8 a0);
const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8);
void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8);
void gpu_pal_allocator_reset__manage_upper_four(void);
@@ -90,6 +93,7 @@ u8 sub_805EB44(u8, u8, s16, s16);
void npc_paltag_set_load(u8 mode);
bool8 FieldObjectIsMovementOverridden(struct MapObject *mapObject);
u8 FieldObjectCheckHeldMovementStatus(struct MapObject *mapObject);
u8 sub_8063F84(u8 direction);
// Exported data declarations
+5
View File
@@ -28,5 +28,10 @@ u8 GetPlayerAvatarObjectId(void);
u8 PlayerGetZCoord(void);
u8 GetPlayerAvatarGraphicsIdByCurrentState(void);
void sub_805CB70(void);
void sub_805CB04(bool8);
void sub_805DC04(void);
void sub_805DAB0(void);
bool32 sub_805DAD0(void);
bool32 sub_805DC24(void);
#endif //GUARD_FIELD_PLAYER_AVATAR_H
+2
View File
@@ -7,5 +7,7 @@ void sub_80AF79C(void);
void sub_807F028(u8);
void sub_80B0244(void);
void sub_807E3EC(void);
void sub_807F114(void);
void sub_807F204(u8 taskId);
#endif // GUARD_FIELD_SCREEN_EFFECT_H
+2
View File
@@ -13,6 +13,8 @@ bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId);
u8 oei_task_add(void);
// flash
u8 sub_80C9DCC(u8 lightLevel, u8 mapType);
u8 sub_80C9D7C(u8 mapType1, u8 mapType2);
// cut
+2
View File
@@ -213,5 +213,7 @@ void sub_8054A28(void);
void sub_800B1F4(void);
void LoadWirelessStatusIndicatorSpriteGfx(void);
void CreateWirelessStatusIndicatorSprite(u8, u8);
void sub_8009FE8(void);
void sub_800A068(void);
#endif // GUARD_LINK_H
+2
View File
@@ -47,5 +47,7 @@ struct MapPreviewScreen
u16 sub_80F8318(u8 id);
void sub_80F85BC(u16 a0);
u16 sub_80F856C(u8 id);
bool8 sub_80F8110(u8 mapsec, bool8 forceFirstTime);
bool32 sub_80F83B0(void);
#endif //GUARD_MAP_PREVIEW_SCREEN_H
+5
View File
@@ -133,6 +133,11 @@ void Overworld_ResetStateAfterDigEscRope(void);
bool32 sub_8058244(void);
u8 GetCurrentMapType(void);
u8 get_map_light_from_warp0(void);
const struct MapHeader *warp1_get_mapheader(void);
void sub_8055F88(void);
void sub_8056788(void);
void Overworld_CreditsMainCB(void);
bool32 Overworld_DoScrollSceneForCredits(u8 *, const struct CreditsOverworldCmd *, u8);
+1
View File
@@ -32,6 +32,7 @@ void sub_8112EDC(u8 a0);
u8 sub_8112EB4(void);
void sub_8113018(const u8 * text, u8 mode);
void MapNamePopupWindowIdSetDummy(void);
void sub_8111CF0(void);
extern u8 gUnknown_203ADFA;
+2
View File
@@ -4,5 +4,7 @@
#include "global.h"
void AppendToList(u8* list, u8* pos, u8 newEntry);
void sub_806F1F0(u8 taskId);
void sub_806F1D4(void);
#endif // GUARD_START_MENU_H