diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/field_effect.h | 138 | ||||
| -rw-r--r-- | include/field_effect_helpers.h | 1 | ||||
| -rw-r--r-- | include/field_map_obj.h | 2 | ||||
| -rw-r--r-- | include/field_player_avatar.h | 5 | ||||
| -rw-r--r-- | include/field_screen.h | 2 | ||||
| -rw-r--r-- | include/fieldmap.h | 4 | ||||
| -rw-r--r-- | include/overworld.h | 4 |
7 files changed, 151 insertions, 5 deletions
diff --git a/include/field_effect.h b/include/field_effect.h index d7eea08f4..9cd26f6b8 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -1,6 +1,8 @@ #ifndef GUARD_FIELD_EFFECTS_H #define GUARD_FIELD_EFFECTS_H +#include "task.h" + extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[2]; extern const struct SpritePalette gNewGameBirchObjectPaletteInfo; extern const struct CompressedSpriteSheet gTrainerFrontPicTable[2]; @@ -75,7 +77,7 @@ enum FieldEffectScriptIdx FLDEFF_USE_TELEPORT }; -extern u32 gFieldEffectArguments[8]; +extern s32 gFieldEffectArguments[8]; extern void (*gUnknown_0203CEEC)(void); extern bool8 (*gUnknown_03005DB0)(void); @@ -85,7 +87,7 @@ void sub_80B69DC(void); u8 AddNewGameBirchObject(s16, s16, u8); void FieldEffectStop(struct Sprite *sprite, u8 id); u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer); -void sub_80B7FC8(void); +void CreateTeleportFieldEffectTask(void); void FieldEffectActiveListRemove(u8 id); void MultiplyInvertedPaletteRGBComponents(u16, u8, u8, u8); void FieldEffectActiveListAdd(u8 id); @@ -95,5 +97,137 @@ void FieldEffectScript_LoadPalette(u8 **script); void FieldEffectScript_CallNative(u8 **script, u32 *val); void FieldEffectFreeTilesIfUnused(u16 tileStart); void FieldEffectFreePaletteIfUnused(u8 paletteNum); +bool8 FieldEffectCmd_loadtiles(u8 **script, u32 *val); +bool8 FieldEffectCmd_loadfadedpal(u8 **script, u32 *val); +bool8 FieldEffectCmd_loadpal(u8 **script, u32 *val); +bool8 FieldEffectCmd_callnative(u8 **script, u32 *val); +bool8 FieldEffectCmd_end(u8 **script, u32 *val); +bool8 FieldEffectCmd_loadgfx_callnative(u8 **script, u32 *val); +bool8 FieldEffectCmd_loadtiles_callnative(u8 **script, u32 *val); +bool8 FieldEffectCmd_loadfadedpal_callnative(u8 **script, u32 *val); + +void PokecenterHealEffect_0(struct Task *); +void PokecenterHealEffect_1(struct Task *); +void PokecenterHealEffect_2(struct Task *); +void PokecenterHealEffect_3(struct Task *); + +void HallOfFameRecordEffect_0(struct Task *); +void HallOfFameRecordEffect_1(struct Task *); +void HallOfFameRecordEffect_2(struct Task *); +void HallOfFameRecordEffect_3(struct Task *); + +void PokeballGlowEffect_0(struct Sprite *); +void PokeballGlowEffect_1(struct Sprite *); +void PokeballGlowEffect_2(struct Sprite *); +void PokeballGlowEffect_3(struct Sprite *); +void PokeballGlowEffect_4(struct Sprite *); +void PokeballGlowEffect_5(struct Sprite *); +void PokeballGlowEffect_6(struct Sprite *); +void PokeballGlowEffect_7(struct Sprite *); + +bool8 sub_80B6BCC(struct Task *); +bool8 sub_80B6C74(struct Task *); +bool8 sub_80B6C90(struct Task *); +bool8 sub_80B6D04(struct Task *); +bool8 sub_80B6DBC(struct Task *); +bool8 sub_80B6DD8(struct Task *); +bool8 sub_80B6E18(struct Task *); + +bool8 sub_80B6EC0(struct Task *); +bool8 sub_80B6EE0(struct Task *); +bool8 sub_80B6F50(struct Task *); +bool8 sub_80B6F74(struct Task *); +bool8 sub_80B6F84(struct Task *); +bool8 sub_80B6FA8(struct Task *); + +bool8 sub_80B7114(struct Task *); +bool8 sub_80B7190(struct Task *); +bool8 sub_80B71D0(struct Task *); +bool8 sub_80B7230(struct Task *); +bool8 sub_80B7270(struct Task *); +bool8 sub_80B72D0(struct Task *); +bool8 sub_80B72F4(struct Task *); + +bool8 sub_80B73D0(struct Task *, struct MapObject *); +bool8 waterfall_1_do_anim_probably(struct Task *, struct MapObject *); +bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct MapObject *); +bool8 sub_80B7450(struct Task *, struct MapObject *); +bool8 sub_80B7478(struct Task *, struct MapObject *); + +bool8 dive_1_lock(struct Task *); +bool8 dive_2_unknown(struct Task *); +bool8 dive_3_unknown(struct Task *); + +bool8 sub_80B764C(struct Task *, struct MapObject *, struct Sprite *); +bool8 sub_80B7684(struct Task *, struct MapObject *, struct Sprite *); +bool8 sub_80B76B8(struct Task *, struct MapObject *, struct Sprite *); +bool8 sub_80B7704(struct Task *, struct MapObject *, struct Sprite *); +bool8 sub_80B77F8(struct Task *, struct MapObject *, struct Sprite *); +bool8 sub_80B7814(struct Task *, struct MapObject *, struct Sprite *); + +bool8 sub_80B78EC(struct Task *, struct MapObject *, struct Sprite *); +bool8 sub_80B791C(struct Task *, struct MapObject *, struct Sprite *); +bool8 sub_80B7968(struct Task *, struct MapObject *, struct Sprite *); +bool8 sub_80B79BC(struct Task *, struct MapObject *, struct Sprite *); + +bool8 sub_80B7AE8(struct Task *, struct MapObject *, struct Sprite *); +bool8 sub_80B7B18(struct Task *, struct MapObject *, struct Sprite *); +bool8 sub_80B7B94(struct Task *, struct MapObject *, struct Sprite *); +bool8 sub_80B7BCC(struct Task *, struct MapObject *, struct Sprite *); +bool8 sub_80B7BF4(struct Task *, struct MapObject *, struct Sprite *); + +void sub_80B7D14(struct Task *); +void sub_80B7D34(struct Task *); + +void sub_80B7EC4(struct Task *); +void sub_80B7EE8(struct Task *); + +void sub_80B8280(struct Task *); +void sub_80B830C(struct Task *); +void sub_80B8410(struct Task *); + +void sub_80B8584(struct Task *); +void sub_80B85F8(struct Task *); +void sub_80B8660(struct Task *); +void sub_80B86EC(struct Task *); +void sub_80B871C(struct Task *); +void sub_80B8770(struct Task *); +void overworld_bg_setup_2(struct Task *); + +void sub_80B88E4(struct Task *); +void sub_80B8920(struct Task *); +void sub_80B898C(struct Task *); +void sub_80B89DC(struct Task *); +void sub_80B8A0C(struct Task *); +void sub_80B8A44(struct Task *); +void sub_80B8A64(struct Task *); + +void sub_80B8DB4(struct Task *); +void sub_80B8E14(struct Task *); +void sub_80B8E60(struct Task *); +void sub_80B8EA8(struct Task *); +void sub_80B8F24(struct Task *); + +void sub_80B9204(struct Task *); +void sub_80B925C(struct Task *); +void sub_80B92A0(struct Task *); +void sub_80B92F8(struct Task *); +void sub_80B933C(struct Task *); +void sub_80B9390(struct Task *); +void sub_80B9418(struct Task *); +void sub_80B9474(struct Task *); +void sub_80B9494(struct Task *); + +void sub_80B9804(struct Task *); +void sub_80B98B8(struct Task *); +void sub_80B9924(struct Task *); +void sub_80B9978(struct Task *); +void sub_80B99F0(struct Task *); +void sub_80B9A28(struct Task *); +void sub_80B9A60(struct Task *); + +void sub_80B9C28(s16*, u8); +void sub_80B9C54(s16*, u8); +void sub_80B9CDC(s16*, u8); #endif //GUARD_FIELD_EFFECTS_H diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 15928eba3..9e4cca64d 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -13,5 +13,6 @@ u8 sub_8154228(void); bool8 sub_8155DA0(struct MapObject *); void sub_8155D78(struct MapObject *); +void sub_81555AC(u8, u8); #endif //GUARD_FIELD_EFFECT_HELPERS_H diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 8f34d4b93..1bf3915e1 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -93,6 +93,8 @@ void npc_coords_shift_still(struct MapObject *pObject); void FieldObjectMoveDestCoords(struct MapObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1); u8 AddCameraObject(u8 linkedSpriteId); void UpdateFieldObjectsForCameraUpdate(s16 x, s16 y); +u8 GetSimpleGoAnimId(u32); +u8 sub_8093514(u32); // Exported data declarations diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index f616717f2..0b9ea385c 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -40,6 +40,9 @@ void sub_808D074(u8); void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr); u8 GetRivalAvatarGraphicsIdByStateIdAndGender(u8, u8); void sub_808C114(void); -u8 GetPlayerAvatarGraphicsIdByCurrentState(); +u8 GetPlayerAvatarGraphicsIdByCurrentState(void); +void SetPlayerAvatarStateMask(u8 a); +u8 GetPlayerAvatarGraphicsIdByStateId(u8 a); +u8 sub_8093540(u32); #endif // GUARD_FIELD_PLAYER_AVATAR_H diff --git a/include/field_screen.h b/include/field_screen.h index 36afac53d..2eea5b505 100644 --- a/include/field_screen.h +++ b/include/field_screen.h @@ -7,7 +7,7 @@ // Exported ROM declarations void pal_fill_black(void); -bool8 sub_80ABDFC(void); +bool8 IsWeatherNotFadingIn(void); void sub_80AF168(void); void UpdateWeatherPerDay(u16 days); void sub_80AC3D0(void); diff --git a/include/fieldmap.h b/include/fieldmap.h index 6e127ce5d..699595580 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -28,4 +28,8 @@ struct MapConnection *sub_8088950(u8 direction, int x, int y); bool8 sub_80889A8(u8 direction, int x, int y, struct MapConnection *connection); bool8 sub_8088A0C(int x, int src_width, int dest_width, int offset); +void SpriteCB_PokeballGlow(struct Sprite *); +void SpriteCB_PokecenterMonitor(struct Sprite *); +void SpriteCB_HallOfFameMonitor(struct Sprite *); + #endif //GUARD_FIELDMAP_H diff --git a/include/overworld.h b/include/overworld.h index 59d4d6a30..15d7bb362 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -23,6 +23,8 @@ extern u16 *gBGTilemapBuffers1; extern u16 *gBGTilemapBuffers2; extern u16 *gBGTilemapBuffers3; +extern void (*gFieldCallback)(void); + // Exported ROM declarations extern const struct UCoords32 gUnknown_08339D64[]; @@ -101,7 +103,7 @@ u8 GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum); u8 GetMapTypeByWarpData(struct WarpData *warp); u8 Overworld_GetMapTypeOfSaveblockLocation(void); u8 get_map_light_from_warp0(void); -bool8 is_light_level_1_2_3_5_or_6(u8 mapType); +bool8 is_map_type_1_2_3_5_or_6(u8 mapType); bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType); bool8 Overworld_MapTypeIsIndoors(u8 mapType); u8 sav1_saved_warp2_map_get_name(void); |