diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm.h | 36 | ||||
-rw-r--r-- | include/asm.inc.h | 473 | ||||
-rw-r--r-- | include/battle_setup.h | 77 | ||||
-rw-r--r-- | include/berry.h | 38 | ||||
-rw-r--r-- | include/blend_palette.h | 6 | ||||
-rw-r--r-- | include/field_player_avatar.h | 95 | ||||
-rw-r--r-- | include/global.h | 17 | ||||
-rw-r--r-- | include/m4a.h | 11 | ||||
-rw-r--r-- | include/main_menu.h | 61 | ||||
-rw-r--r-- | include/pokedex.h | 2 | ||||
-rw-r--r-- | include/rom4.h | 208 | ||||
-rw-r--r-- | include/trainer_see.h | 1 | ||||
-rw-r--r-- | include/weather.h | 3 |
13 files changed, 1024 insertions, 4 deletions
diff --git a/include/asm.h b/include/asm.h new file mode 100644 index 000000000..ec0516497 --- /dev/null +++ b/include/asm.h @@ -0,0 +1,36 @@ +#ifndef PROJECT_ASM_H +#define PROJECT_ASM_H + +#include "task.h" +#include "main.h" +#include "sprite.h" +#include "asm_fieldmap.h" + +struct UnkInputStruct +{ + u8 input_field_0; + u8 input_field_1; + u8 input_field_2; + u8 input_field_3; +}; + +struct UnknownStruct_FPA +{ + u8 unk0; + u8 unk1; + u8 unk2; + s16 unk4; + s16 unk6; + u8 unk8; + u8 unk9; + u8 unkA_0:4; + u8 unkA_4:4; + u16 unkC; + u16 unkE; + u32 unk10; + u16 unk14; +}; + +#include "asm.inc.h" + +#endif //PROJECT_ASM_H diff --git a/include/asm.inc.h b/include/asm.inc.h new file mode 100644 index 000000000..fc7093437 --- /dev/null +++ b/include/asm.inc.h @@ -0,0 +1,473 @@ +// asm/rom3.o +void sub_800C35C(void); + +// asm/rom_800D42C.o +void sub_800E7C4(void); +u8 b_first_side(u8, u8, u8); +void sub_80157C4(u8 index); +u8 sub_8015A98(u8, u8, u8); +u8 sub_8018324(u8, u8, u8, u8, u16); +void sub_8032AA8(u8 index, int i); + +// asm/rom_803D1FC.o +u16 SpeciesToNationalPokedexNum(u16); +u32 SpeciesToCryId(u32); +void DrawSpindaSpots(u16, u32, void *, u8); +u8 sub_803FC58(u16); +void AdjustFriendship(struct Pokemon *, u8); +void sub_80408BC(); +void current_map_music_set__default_for_battle(u16); + +// asm/rom_8040EB4.o +void StoreWordInTwoHalfwords(u32, u8 *); +void LoadWordFromTwoHalfwords(u32, u8 *); + +// asm/daycare.o +u8 daycare_count_pokemon(u32); +void sub_8041324(struct BoxPokemon *, void *); +void sub_8041790(int i); +u16 sub_8041870(u16); +void sub_8041940(void); +void sub_8041950(void); +u8 daycare_relationship_score_from_savegame(void); + +// asm/rom_804373C.o +void CreatePokeballSprite(u8 r0, u8 r1, u8 r2, u8 r3, u8 s1, u8 s2, u8 s3, u16 s4); + +// asm/load_save.o +void CheckForFlashMemory(void); +int sub_80479F8(); +void sub_8047A04(); +void sub_8047A1C(void); +void sub_8047A34(void); +void save_serialize_game(void); +void save_deserialize_game(); + +// asm/berry_blender.o +void sub_80516C4(u8, u16); + +// asm/metatile_behavior.o +bool8 MetatileBehavior_IsSandOrDeepSand(char); +bool8 is_tile_x69_2_warp_door(u8); +u8 MetatileBehavior_IsDoor(u8); +bool8 MetatileBehavior_IsLadder(u8); +u8 sub_8056F08(u8); +bool8 sub_8056F24(u8); +u8 MetatileBehavior_IsSurfableWaterOrUnderwater(u8); +bool8 MetatileBehavior_IsEastArrowWarp(u8); +bool8 MetatileBehavior_IsWestArrowWarp(u8); +bool8 MetatileBehavior_IsNorthArrowWarp(u8); +bool8 MetatileBehavior_IsSouthArrowWarp(u8); +bool8 MetatileBehavior_IsTallGrass(char); +bool8 MetatileBehavior_IsLongGrass(char); +u8 MetatileBehavior_IsBridge(u8); +u8 sub_8057450(u8); +u8 MetatileBehavior_IsLandWildEncounter(u8); +u8 MetatileBehavior_IsWaterWildEncounter(u8); +bool8 sub_80574C4(char); +bool8 sub_80574D8(char); +bool8 sub_8057568(char); +bool8 sub_805759C(u8); +bool8 MetatileBehavior_IsSurfableFishableWater(u8); + +// src/field_door.o +void FieldSetDoorOpened(u32, u32); +void FieldSetDoorClosed(u32, u32); +s8 FieldAnimateDoorClose(u32, u32); +s8 FieldAnimateDoorOpen(u32, u32); +bool8 FieldIsDoorAnimationRunning(void); +u32 sub_8058790(u32 x, u32 y); + +// asm/field_map_obj.o +void sub_805AA98(); +u8 sub_805AB54(void); +u8 GetFieldObjectIdByLocalIdAndMap(u8, u8, u8); +bool8 TryGetFieldObjectIdByLocalIdAndMap(u8, u8, u8, u8 *); +u8 GetFieldObjectIdByXY(s16, s16); +void RemoveFieldObjectByLocalIdAndMap(u8, u8, u8); +u8 SpawnSpecialFieldObject(struct UnknownStruct_FPA *); +u8 show_sprite(u8, u8, u8); +u8 AddPseudoFieldObject(u8 val, void (*player)(struct Sprite *), int i, int i1, int i2); +u8 sub_805B410(u8, u8, s16, s16, u8, u8); +void sub_805B55C(int i, int i1); +void sub_805B710(int i, int i1); +void sub_805B980(struct MapObject *, u8); +void FieldObjectTurn(struct MapObject *, u8); +void FieldObjectTurnByLocalIdAndMap(u8, u8, u8, u8); +struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8); +void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8); +void FieldObjectGetLocalIdAndMap(struct MapObject *, u8 *, u8 *, u8 *); +void sub_805BCF0(u8, u8, u8, u8); +void sub_805BD48(u8, u8, u8); +void sub_805BD90(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y); +void npc_coords_shift(struct MapObject *pObject, s16 x, s16 y); +void sub_805C0F8(u8, u8, u8, s16, s16); +void npc_coords_shift_still(struct MapObject *pObject); +u8 GetFieldObjectIdByXYZ(u16, u16, int); +void UpdateFieldObjectsForCameraUpdate(s16, s16); +u8 AddCameraObject(u8); +u8 * GetFieldObjectScriptPointerByFieldObjectId(u8); +u8 FieldObjectGetBerryTreeId(u8); +void sub_805C754(struct MapObject *pObject); +void sub_805C774(struct MapObject *, u8 ); +void sub_805C78C(u8, u8, u8); +void sub_805C7C4(int i); +u8 FieldObjectDirectionToImageAnimId(u8); +u8 get_go_image_anim_num(u8 unk_19); +u8 sub_805FD98(u8); +u8 sub_805FDE8(u8); +u8 sub_805FDF8(u8); +u8 sub_805FE08(u8); +void npc_set_running_behaviour_etc(struct MapObject *, u8); +u8 npc_running_behaviour_by_direction(u8); +u8 npc_block_way(struct MapObject *, s16, s16, u8); +u8 sub_8060024(struct MapObject *, s16, s16, u8); +u8 sub_8060234(u8, u8, u8); +void sub_8060288(u8, u8, u8); +void sub_80603CC(s16 x, s16 y, s16 *pInt, s16 *pInt1); +void FieldObjectMoveDestCoords(struct MapObject *pObject, u8 unk_19, s16 *pInt, s16 *pInt1); +bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *); +void FieldObjectSetSpecialAnim(struct MapObject *, u8); +void FieldObjectForceSetSpecialAnim(struct MapObject *pObject, u8 a); +void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *); +void FieldObjectClearAnim(struct MapObject *); +bool8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *); +u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *); +u8 FieldObjectGetSpecialAnim(struct MapObject *); +u8 GetFaceDirectionAnimId(u8); +u8 GetSimpleGoAnimId(u8); +u8 GetGoSpeed0AnimId(u8 a); +u8 sub_8060744(u8 a); +u8 d2s_08064034(u8 a); +u8 sub_806079C(u8 a); +u8 sub_80607F4(u8 a); +u8 GetJumpLedgeAnimId(u8 a); +u8 sub_806084C(u8); +u8 sub_8060878(u8); +u8 sub_80608D0(u8); +u8 GetStepInPlaceDelay32AnimId(u8 a); +u8 GetStepInPlaceDelay16AnimId(u8); +u8 GetStepInPlaceDelay8AnimId(u8 a); +u8 FieldObjectFaceOppositeDirection(void *, u8); +u8 sub_80609D8(u8); +u8 sub_8060A04(u8); +u8 sub_8060A30(u8); +u8 sub_8060A5C(u8); +u8 sub_8060A88(u8); +u8 sub_8060AB4(u8); +u8 sub_8060AE0(u8); +u8 sub_8060B0C(u8); +u8 sub_8060B38(u8); +u8 sub_8060B64(u8); +u8 GetOppositeDirection(u8); + +// asm/field_ground_effect.o +u8 GetLedgeJumpDirection(s16, s16, u8); +u8 ZCoordToPriority(u8); +void FieldObjectUpdateZCoord(struct MapObject *pObject); +void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8); + +// src/map_obj_80643A4.o +bool8 sub_80643A4(struct MapObject *); +void player_bitmagic(void); +void sub_8064470(u8); +void sub_806451C(void); +void sub_806487C(struct Sprite *sprite, bool8 invisible); +void sub_8064990(u8, u8); + +// asm/rom_8065394.o +void sub_8067EEC(struct UnkInputStruct *pStruct); +void process_overworld_input(struct UnkInputStruct *pStruct, u16 keys, u16 heldKeys); +int sub_8068024(struct UnkInputStruct *pStruct); +u8 *sub_80682A8(void *, u8, u8); +void overworld_poison_timer_set(void); +void prev_quest_postbuffer_cursor_backup_reset(void); +u8 *sub_8068E24(struct UnkStruct_8054FF8_Substruct *); +u8 *GetFieldObjectScriptPointerForComparison(); +void sub_8069030(void); +void sub_806906C(void); +bool32 IsNationalPokedex(void); +bool32 IsMysteryGiftAvailable(void); +int sub_80691DC(void); + +// asm/rom_806936C.o +void overworld_ensure_per_step_coros_running(); +void activate_per_step_callback(u8); +void wild_encounter_reset_coro_args(void); +void DoTimeBasedEvents(void); + +// asm/reset_rtc_screen.o +void CB2_InitResetRtcScreen(void); + +// asm/rom_806D7F8.o +bool8 pokemon_has_move(struct Pokemon *, u16); + +// asm/rom_8074BAC.o +u8 battle_side_get_owner(u8); +u8 battle_get_per_side_status(u8); +u8 battle_get_side_with_given_state(u8); + +// asm/rom_8080874.o +void pal_fill_black(); +void sub_8080990(void); +void sub_80809B0(void); +void sub_8080A3C(void); +void sub_8080AC4(void); +void mapldr_default(); +void sub_8080B60(void); +void atk17_seteffectuser(void); +void sub_8080E44(void); +void sub_8080E88(void); +void sp13E_warp_to_last_warp(void); +void sub_8080EF0(void); +void sp13F_fall_to_last_warp(void); +void sub_8080F68(void); +void sub_8081594(u8); +void sub_80815E0(u8 val); + +// asm/cable_club.o +u8 sub_8083664(void); +void sub_8083A84(TaskFunc); +s32 sub_8083BF4(u8 id); + +// src/fldeff_emotion.o +void sub_8084894(struct Sprite *sprite, u16 a2, u8 a3); +void objc_exclamation_mark_probably(struct Sprite *sprite); + +// asm/rom_80859BC.o +u8 CreateTrainerSprite_BirchSpeech(u8, u16, u16, u8, void *); +u8 CreateBirchSprite(u8, u8, u8); +void remove_some_task(void); +void dp12_8087EA4(void); +void sub_80895F8(u32 i, u32 i1, u32 i2); +void sub_8089668(void); +void sub_8089944(int i, int i1, int i2, int i3, int i4, int i5, int i6); +void sub_8089A70(void); + +// asm/trainer_card.o +void sub_8093110(void (*)(void)); +void sub_8093130(u8, void (*)(void)); + +// asm/rom_8094928.o +void sub_80961D8(void); +u8 pokemon_ailments_get_primary(u32); +u8 exec_movement(u8, u8, u8, void *); +bool8 sub_80A212C(u8, u8, u8); +void sub_80A2178(void); +void sub_80A2B18(void); +void AddMapNamePopUpWindowTask(void); +void HideMapNamePopUpWindow(); + +// asm/item_menu.o +void sub_80A3684(void); +void sub_80A3714(void); +void sub_80A53F8(void); +void sub_80A68CC(); + +// asm/contest.o +void sub_80AB1B0(void); +void sub_80B2D1C(void); + +// asm/shop.o +void CreatePokemartMenu(void *); +void CreateDecorationShop1Menu(void *); +void CreateDecorationShop2Menu(void *); + +// asm/script_menu.o +bool8 sub_80B5054(u8, u8, u8, u8); +bool8 sub_80B50B0(u8, u8, u8, u8, u8); +bool8 Multichoice(u8, u8, u8, u8); +bool8 yes_no_box(u8, u8); +bool8 sub_80B5578(u8, u8, u8, u8, u8); +bool8 sub_80B58C4(u16, u8, u8); +void *picbox_close(void); + +// asm/naming_screen.o +void DoNamingScreen(u8 r0, struct SaveBlock2 *r1, u16 r2, u16 r3, u8 s0, MainCallback s4); + +// asm/money.o +bool8 IsEnoughMoney(u32, u32); +void sub_80B79B8(u32 *, u32); +void sub_80B79E0(u32 *, u32); +void sub_80B7BEC(u32, u8, u8); +void sub_80B7C14(u32, u8, u8); +void RemoveMoneyLabelObject(u8, u8); + +// asm/secret_base.o +void sub_80BB5B4(void); +u8 sub_80BBB24(void); +void sub_80BBCCC(u8); +u8 *sub_80BCCE8(void); +void sub_80BD674(void *, u32, u8); + +// asm/tv.o +void sub_80BD7A8(void); +void UpdateTVScreensOnMap(u32, u32); +void sub_80BDAB4(void); +void sub_80BE97C(u8); +void sub_80BEA50(u16); +bool8 GetPriceReduction(u8); +u8 sub_80BF0B8(u32); +void sub_80BFD44(void *, u32, u8); +void sub_80C0514(void *, u32, u8); + +// asm/contest_link_80C2020.o +void sub_80C48C8(void); +void sub_80C4940(void); +void sub_80C4980(u8); + +// asm/script_pokemon_util_80C4BF0.o +void ShowContestWinner(void); +void HealPlayerParty(); +u8 ScriptGiveMon(u16, u8, u16, u32, u32, u8); +u8 ScriptGiveEgg(u16); +void ScriptWildBattle(u16, u8, u16); +void ScriptSetMonMoveSlot(u8, u16, u8); + +// asm/fldeff_80C5CD4.o +void DoFieldPoisonEffect(void); +bool32 FieldPoisonEffectIsRunning(void); +void CreateRecordMixingSprite(void); +void DestroyRecordMixingSprite(void); + +// asm/rotating_gate.o +void RotatingGatePuzzleCameraUpdate(s16, s16); +void sub_80C8080(); +u32 CheckForRotatingGatePuzzleCollision(u8, s16, s16); + +// asm/bike.o +void MovePlayerOnBike(u8, u16, u16); +void sub_80E5B38(u16 i, u16 c); +u8 sub_80E5DEC(u8); +bool8 player_should_look_direction_be_enforced_upon_movement(void); +void sub_80E5FCC(int i, int i1); +void sub_80E6010(int i); +s16 sub_80E6034(void); +void sub_80E6084(); + +// asm/easy_chat.o +void sub_80E6764(void); +u8 ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16, u16); +u16 sub_80EB72C(u16); + +// asm/pokenav.o +void sub_80EBA5C(void); + +// asm/mauville_old_man.o +void sub_80F7AA4(void); +void sub_80F7F30(void); + +// asm/script_pokemon_util_80F99CC.o +void sub_80F99CC(void); + +// src/dewford_trend.o +void sub_80FA17C(void); +void sub_80FA46C(struct EasyChatPair *, u16, u8); +void sub_80FA4E4(struct EasyChatPair *, u32, u8); +bool8 sub_80FA670(struct EasyChatPair *, struct EasyChatPair *, u8); +void sub_80FA740(struct EasyChatPair *); +bool8 SB1ContainsWords(u16 *); +bool8 IsEasyChatPairEqual(u16 *, u16 *); + +// asm/region_map.o +void CopyMapName(); + +// asm/slot_machine.o +void PlaySlotMachine(u8, void *); + +// asm/contest_painting.o +void sub_8106630(u32); + +// asm/rom6.o +void sub_810C994(void); +void sub_810CA6C(s32); +s16 sub_810CAE4(u8, struct Pokeblock *); +void sub_810CC80(void); +u8 sub_810D32C(void); +void ResetCyclingRoadChallengeData(void); +void ScriptAddElevatorMenuItem(u8, u8, u8, u8); +void ScriptShowElevatorMenu(void); +u8 GetLeadMonIndex(void); +void sub_810FA54(void); + +// asm/battle_records.o +void InitLinkBattleRecords(void); + +// asm/battle_transition.o +void sub_811AABC(u8); +void sub_811AAD8(u8); +u8 sub_811AAE8(void); + +// asm/mystery_event_script.o +void sub_8126160(u8); +u16 sub_8126338(void); + +// asm/field_effect_helpers.o +u8 sub_8126B54(void); +void objid_set_invisible(u8); +void sub_8126BC4(u8 unk_1B, u8 r6, s16 x, s16 y); +void sub_8127ED0(u8, u8); +void sub_8127F28(u8, u8, s16); +u8 sub_8128124(u8 id); + +// asm/rom_81258BC.o +void sub_8132670(void); +void sub_8133F80(void); +u8 sub_8133FE4(u8); +u8 IsThereStorageSpaceForDecoration(u8); +u8 sub_8134074(u8); +s8 sub_81340A8(u8); +void sub_81341F8(void); +void sub_813420C(void); +void mapnumbers_history_shift_sav1_0_2_4_out(void); +void sub_8134348(void); +void sub_8134394(); +u8 sub_81344CC(void); +void sub_8134AC0(void *); + +// asm/player_pc.o +void NewGameInitPCItems(void); + +// asm/rom_813BA94.o +void sub_813CAF4(u8); +void intro_reset_and_hide_bgs(void); +void sub_813CCE8(u8); +void sub_813CE30(u16, u16, u16, u16); +u8 sub_813CE88(/*TODO: arg types*/); +u8 sub_813CFA8(/*TODO: arg types*/); +void sub_813D084(/*TODO: arg types*/); +u8 sub_813D584(/*TODO: arg types*/); +void sub_813D788(struct Sprite *); +void sub_813D880(struct Sprite *); +void sub_813D954(/*TODO: arg types*/); +void sub_813DB9C(struct Sprite *); +void sub_813DE70(struct Sprite *); +void sub_813E10C(struct Sprite *); +void sub_813E210(struct Sprite *); +void sub_813E7C0(u8); +void sub_813E930(/*TODO: arg types*/); +void sub_813EB4C(u8); +void sub_813EDBC(/*TODO: arg types*/); + +// asm/mystery_event_menu.o +void CB2_InitMysteryEventMenu(void); + +// asm/save_failed_screen.o +void fullscreen_save_activate(); + +// asm/rom_8148B8C.o +void load_intro_part2_graphics(/*TODO: arg types*/); +void sub_8148C78(/*TODO: arg types*/); +u8 sub_8148EC0(/*TODO: arg types*/); +void sub_8149020(/*TODO: arg types*/); +u8 intro_create_brendan_sprite(/*TODO: arg types*/); +u8 intro_create_may_sprite(/*TODO: arg types*/); +u8 intro_create_latios_sprite(/*TODO: arg types*/); +u8 intro_create_latias_sprite(/*TODO: arg types*/); + +// src/agb_flash.o +u16 ReadFlashId(void); +u16 SetFlashTimerIntr(u8 timerNum, void (**intrFunc)(void)); +void ReadFlash(u16 sectorNum, u32 offset, u8 *dest, u32 size); +u32 ProgramFlashSectorAndVerify(); +u32 ProgramFlashSectorAndVerifyNBytes(u16 sectorNum, u8 *src, u32 n); diff --git a/include/battle_setup.h b/include/battle_setup.h index 2c9d1d8c5..b82180f28 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -1,7 +1,84 @@ #ifndef GUARD_BATTLE_SETUP_H #define GUARD_BATTLE_SETUP_H +// task01_battle_start +// task_add_01_battle_start void CheckForSafariZoneAndProceed(void); +void sub_8081A18(void); void sub_8081A5C(void); +void sub_8081AA4(void); +// task_add_01_battle_start_with_music_and_stats +// sub_8081AFC +void sub_8081B3C(void); +// sub_8081B78 +// sub_8081BB8 +// sub_8081BF8 +// sub_8081C50 +void sub_8081C8C(void); +void sub_8081CEC(void); +// sub_8081D3C +// sub_8081E90 +// GetSumOfPartyMonLevel +// GetSumOfEnemyPartyLevel +u8 GetWildBattleTransition(void); +u8 GetTrainerBattleTransition(void); +// GetBattleTowerBattleTransition +// sub_8082168 +void sub_8082188(void); +void sub_80821D8(void); +void sub_8082228(void); +// TrainerBattleLoadArg32 +// TrainerBattleLoadArg16 +// TrainerBattleLoadArg8 +// trainerflag_opponent +bool32 battle_exit_is_player_defeat(u32 a1); +// sub_80822BC +// TrainerBattleLoadArgs +// battle_80801F0 +u8 *TrainerBattleConfigure(u8 *data); +void TrainerWantsBattle(u8, u8 *); +u8* GetTrainerFlagFromScriptPointer(u8 *data); +// sub_8082524 +// sub_8082558 +// sub_8082564 +// sub_808257C +// unref_sub_8082590 +u8 trainer_flag_check(u16); +void trainer_flag_set(u16); +void trainer_flag_clear(u16); +void sub_80825E4(void); +void sub_808260C(void); +// do_choose_name_or_words_screen +// sub_80826B0 +// sub_80826D8 +u8 *sub_80826E8(void); +u8 *sub_8082700(void); +// sub_8082718 +// PlayTrainerEncounterMusic +// SanitizeString +u8 *sub_808281C(void); +// sub_8082830 +// unref_sub_808286C +u8 *sub_8082880(void); +// sub_8082894 +// sub_80828B8 +// sub_80828FC +// sub_80829A8 +// sub_80829E8 +// sub_8082A18 +// sub_8082A54 +// sub_8082A90 +// sub_8082AE4 +// sub_8082B10 +// sub_8082B44 +// sub_8082B78 +// sub_8082BA4 +void sub_8082BD0(u16, u16); +// sub_8082C0C +// unref_sub_8082C2C +u16 sub_8082C4C(u16 a1); +// sub_8082C68 +// sub_8082C9C +void sub_8082CB8(void); #endif // GUARD_BATTLE_SETUP_H diff --git a/include/berry.h b/include/berry.h new file mode 100644 index 000000000..2b2933412 --- /dev/null +++ b/include/berry.h @@ -0,0 +1,38 @@ +#ifndef GUARD_BERRY_H +#define GUARD_BERRY_H + +void unref_sub_80B4884(void); +void sub_80B48A8(u8 *src); +u32 sub_80B48F8(struct EnigmaBerry *enigmaBerry); +bool32 sub_80B4940(void); +struct Berry *GetBerryInfo(u8 berry); +struct BerryTree *GetBerryTreeInfo(u8 id); +bool32 FieldObjectInteractionWaterBerryTree(void); +bool32 IsPlayerFacingPlantedBerryTree(void); +u8 WaterBerryTree(void); +void sub_80B4A90(void); +bool32 BerryTreeGrow(struct BerryTree *tree); +void BerryTreeTimeUpdate(int time); +void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 sparkle); +void RemoveBerryTree(u8 id); +u8 GetBerryTypeByBerryTreeId(u8 id); +u8 GetStageByBerryTreeId(u8); +u8 ItemIdToBerryType(u16 item); +u16 BerryTypeToItemId(u16 berry); +void GetBerryNameByBerryType(u8 berry, u8 *string); +void ResetBerryTreeSparkleFlag(u8 id); +u8 BerryTreeGetNumStagesWatered(struct BerryTree *tree); +u8 GetNumStagesWateredByBerryTreeId(u8 id); +u8 CalcBerryYieldInternal(u16 max, u16 min, u8 water); +u8 CalcBerryYield(struct BerryTree *tree); +u8 GetBerryCountByBerryTreeId(u8 id); +u16 GetStageDurationByBerryType(u8); +void FieldObjectInteractionGetBerryTreeData(void); +void sub_80B4EE4(void); +void FieldObjectInteractionPlantBerryTree(void); +void FieldObjectInteractionPickBerryTree(void); +void FieldObjectInteractionRemoveBerryTree(void); +u8 PlayerHasBerries(void); +void ResetBerryTreeSparkleFlags(void); + +#endif // GUARD_BERRY_H diff --git a/include/blend_palette.h b/include/blend_palette.h new file mode 100644 index 000000000..a00847bc3 --- /dev/null +++ b/include/blend_palette.h @@ -0,0 +1,6 @@ +#ifndef GUARD_BLEND_PALETTE_H +#define GUARD_BLEND_PALETTE_H + +void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor); + +#endif // GUARD_BLEND_PALETTE_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 0c9e78a2a..9e2e7a489 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -1,17 +1,112 @@ #ifndef GUARD_FIELD_PLAYER_AVATAR_H #define GUARD_FIELD_PLAYER_AVATAR_H +// sub_80587B4 void player_step(u8 a, u16 b, u16 c); +// ForcedMovement_None +// ForcedMovement_Slip +// sub_8058AAC +// sub_8058AC4 +// sub_8058ADC +// sub_8058AF4 +// sub_8058B0C +// sub_8058B24 +// sub_8058B3C +// sub_8058B54 +// ForcedMovement_SlideSouth +// ForcedMovement_SlideNorth +// ForcedMovement_SlideWest +// ForcedMovement_SlideEast +// sub_8058C04 +// sub_8058C10 +// ForcedMovement_MuddySlope +// PlayerNotOnBikeNotMoving +// PlayerNotOnBikeTurningInPlace +// sub_8058D0C +u8 CheckForFieldObjectCollision(struct MapObject *a, s16 b, s16 c, u8 d, u8 e); void SetPlayerAvatarTransitionFlags(u16 a); +// nullsub_49 +// PlayerAvatarTransition_Normal +// PlayerAvatarTransition_MachBike +// PlayerAvatarTransition_AcroBike +// PlayerAvatarTransition_Surfing +// PlayerAvatarTransition_Underwater +// sub_80591F4 void sub_8059204(void); +// player_get_x22 +// player_npc_set_state_and_x22_etc +void PlayerGoSpeed0(u8 a); +void sub_80593C4(u8 a); +void npc_use_some_d2s(u8 a); +// sub_80593F4 +void sub_805940C(u8 a); +// PlayerOnBikeCollide +void PlayerFaceDirection(u8 a); +void PlayerTurnInPlace(u8 a); +void PlayerJumpLedge(u8 a); void sub_80594C0(void); +// sub_8059504 +// sub_805951C +// sub_8059534 +// sub_805954C +// sub_8059570 +// sub_8059594 +// sub_80595B8 +// sub_80595DC +// sub_8059600 +// sub_8059618 +// sub_8059630 void GetXYCoordsOneStepInFrontOfPlayer(s16 *x, s16 *y); void PlayerGetDestCoords(s16 *, s16 *); u8 player_get_direction_lower_nybble(void); u8 player_get_direction_upper_nybble(void); +// PlayerGetZCoord u8 TestPlayerAvatarFlags(u8); +// sub_80597D0 +// GetPlayerAvatarObjectId void sub_80597E8(void); void sub_80597F4(void); +u8 sub_805983C(u8 a, u8 b); +u8 GetPlayerAvatarGraphicsIdByStateId(u8 a); +// GetPlayerAvatarGenderByGraphicsId +// PartyHasMonWithSurf +// IsPlayerSurfingNorth +// IsPlayerFacingSurfableFishableWater +// ClearPlayerAvatarInfo +void SetPlayerAvatarStateMask(u8 a); +// GetPlayerAvatarGraphicsIdByCurrentState +// SetPlayerAvatarExtraStateTransition void InitPlayerAvatar(s16 a, s16 b, u8 c, u8 d); +// sub_8059B88 +// sub_8059BF4 +// sub_8059C3C +// sub_8059C94 +// sub_8059D08 +// sub_8059E84 +// sub_8059EA4 +// sub_8059F40 +// sub_805A000 +// sub_805A0D8 +// sub_805A100 +// sub_805A178 +// sub_805A1B8 +void sub_805A20C(u8 a); +// StartFishing +// Fishing1 +// Fishing2 +// Fishing3 +// Fishing4 +// Fishing5 +// Fishing6 +// Fishing7 +// Fishing8 +// Fishing9 +// Fishing10 +// Fishing11 +// Fishing12 +// Fishing13 +// Fishing14 +// Fishing15 +// Fishing16 #endif diff --git a/include/global.h b/include/global.h index 7fbf5755b..79204e082 100644 --- a/include/global.h +++ b/include/global.h @@ -294,6 +294,23 @@ struct SaveBlock2 /*0xA8*/ u8 filler_A8[0x7E8]; }; +struct UnkStruct_8054FF8_Substruct +{ + s16 x; + s16 y; + u8 field_8; +}; + +struct UnkStruct_8054FF8 +{ + u8 a; + u8 b; + u8 c; + u8 d; + struct UnkStruct_8054FF8_Substruct sub; + u16 field_C; +}; + extern struct SaveBlock2 gSaveBlock2; #endif // GUARD_GLOBAL_H diff --git a/include/m4a.h b/include/m4a.h index 85cba5d77..949403885 100644 --- a/include/m4a.h +++ b/include/m4a.h @@ -3,11 +3,16 @@ #include "gba/m4a_internal.h" -void m4aSoundInit(void); -void m4aSoundMain(void); -void m4aSongNumStart(u16 n); void m4aSoundVSync(void); +void m4aSoundInit(void); +void m4aSoundMain(void); +void m4aSongNumStart(u16); +void m4aSongNumStop(u16 n); void m4aMPlayContinue(struct MusicPlayerInfo *mplayInfo); +void m4aMPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed); +void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed); +void m4aMPlayFadeIn(struct MusicPlayerInfo *mplayInfo, u16 speed); +void m4aMPlayImmInit(struct MusicPlayerInfo *mplayInfo); #endif //GUARD_M4A_H diff --git a/include/main_menu.h b/include/main_menu.h new file mode 100644 index 000000000..87569dc8e --- /dev/null +++ b/include/main_menu.h @@ -0,0 +1,61 @@ +#ifndef GUARD_MAIN_MENU_H +#define GUARD_MAIN_MENU_H + +#include "gba/types.h" + +void CB2_MainMenu(void); +void VBlankCB_MainMenu(void); +void CB2_InitMainMenu(void); +void Task_NewGameSpeech1(u8 taskId); +// Task_NewGameSpeech2 +// Task_NewGameSpeech3 +// Task_NewGameSpeech4 +// Task_NewGameSpeech5 +// Task_NewGameSpeech6 +// Task_NewGameSpeech7 +// Task_NewGameSpeech8 +// Task_NewGameSpeech9 +// Task_NewGameSpeech10 +// Task_NewGameSpeech11 +// Task_NewGameSpeech12 +// Task_NewGameSpeech13 +// Task_NewGameSpeech14 +// Task_NewGameSpeech15 +// Task_NewGameSpeech16 +// Task_NewGameSpeech17 +// Task_NewGameSpeech18 +// Task_NewGameSpeech19 +// Task_NewGameSpeech20 +// Task_NewGameSpeech21 +// Task_NewGameSpeech22 +// Task_NewGameSpeech23 +// Task_NewGameSpeech24 +// Task_NewGameSpeech25 +// Task_NewGameSpeech26 +// Task_NewGameSpeech27 +// Task_NewGameSpeech28 +// Task_NewGameSpeech29 +// Task_NewGameSpeech30 +// Task_NewGameSpeech31 +// Task_NewGameSpeech32 +// Task_NewGameSpeech33 +// CB_ContinueNewGameSpeechPart2 +// nullsub_34 +// sub_800B240 +// CreateAzurillSprite +// AddBirchSpeechObjects +// Task_SpriteFadeOut +// StartSpriteFadeOut +// Task_SpriteFadeIn +// StartSpriteFadeIn +// sub_800B5A8 +// StartBackgroundFadeOut +// sub_800B654 +// StartBackgroundFadeIn +// CreateGenderMenu +// GenderMenuProcessInput +// CreateNameMenu +// NameMenuProcessInput +// SetPresetPlayerName + +#endif //GUARD_M4A_H diff --git a/include/pokedex.h b/include/pokedex.h index 22ba76fc6..af0ed7102 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -133,11 +133,13 @@ void sub_8090750(u8); void sub_8090A3C(u8); void sub_8090C68(void); +u8 *GetPokemonCategory(u16); bool8 sub_8090D90(u16, u8); u16 GetNationalPokedexCount(u8); u16 GetHoennPokedexCount(u8); +u16 sub_8090FF4(void); void sub_8091060(u16); void sub_8091154(u16 order, int i, int i1); void sub_80911C8(u16 num, int i, int i1); diff --git a/include/rom4.h b/include/rom4.h index 21a866d02..98ec02b5f 100644 --- a/include/rom4.h +++ b/include/rom4.h @@ -1,13 +1,221 @@ #ifndef GUARD_ROM4_H #define GUARD_ROM4_H +#include "sprite.h" + +struct UnkPlayerStruct +{ + u8 player_field_0; + u8 player_field_1; +}; + +// sub_8052F5C +// flag_var_implications_of_teleport_ +// new_game +// sub_8053014 +void sub_8053050(void); +// sub_805308C +void sub_80530AC(void); void sav12_xor_increment(u8 index); +u32 sub_8053108(u8); +// sav12_xor_set +// sub_8053154 +// sub_8053198 +void update_saveblock1_field_object_coords(u8, s16, s16); +void update_saveblock1_field_object_movement_behavior(u8, u8); +// mapdata_load_assets_to_gpu_and_full_redraw +// get_mapdata_header +// warp_shift +// warp_set +// warp_data_is_not_neg_1 +// get_mapheader_by_bank_and_number +// warp1_get_mapheader +// set_current_map_header_from_sav1_save_old_name +// sub_805338C +// sub_80533CC void warp_in(void); void warp1_set(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); +// warp1_set_2 +// saved_warp2_set +void saved_warp2_set_2(int unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); +// copy_saved_warp2_bank_and_enter_x_to_warp1 +// sub_8053538 +void sub_8053570(void); +void sub_8053588(u8); +// sub_80535C4 void sub_805363C(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); +// sub_8053678 +void sub_8053690(s8, s8, s8, s8, s8); +// warp1_set_to_warp2 +void sub_80536E4(s8, s8, s8, s8, s8); +void sub_8053720(s16, s16); +// sub_8053778 +// unref_sub_8053790 +// sub_80537CC +// gpu_sync_bg_hide +// sub_8053818 +// sub_8053850 +// sub_80538B0 +// sub_80538D0 +// sub_80538F0 +// sub_8053994 +void player_avatar_init_params_reset(void); +// walkrun_find_lowest_active_bit_in_bitfield +// sub_8053AA8 +u8 sub_8053B00(struct UnkPlayerStruct *playerStruct, u16 a2, u8 a3); +u8 sub_8053B60(struct UnkPlayerStruct *playerStruct, u8, u16, u8); +u16 cur_mapdata_block_role_at_screen_center_acc_to_sav1(void); +bool32 sub_8053C44(void); +void sub_8053C98(void); +void sub_8053CE4(s32 a1); +u8 sav1_get_flash_used_on_map(void); +void sub_8053D14(u16); +// sub_8053D30 +// sub_8053D6C +// sub_8053D9C +// sav1_map_get_music +// warp1_target_get_music +// call_map_music_set_to_zero +// sub_8053E90 +void sav1_set_battle_music_maybe(u16); void sav1_reset_battle_music_maybe(void); +void sub_8053F0C(void); +void sub_8053F84(void); +void sub_8053FB0(u16); +// is_warp1_light_level_8_or_9 +// sub_8053FF8 +// sub_8054034 +// sub_8054044 +// sub_8054050 +// sub_80540D0 +void sub_8054164(void); +u8 get_map_light_level_by_bank_and_number(s8 mapGroup, s8 mapNum); +// get_map_light_level_from_warp u8 sav1_map_get_light_level(void); +// get_map_light_from_warp0 bool8 is_light_level_1_2_3_5_or_6(u8 a1); +// is_light_level_1_2_3_or_6 +u8 is_light_level_8_or_9(u8); +// unref_sub_8054260 +u8 sav1_map_get_name(); +// sav1_map_get_battletype +// ResetSafariZoneFlag_ +bool32 is_c1_link_related_active(void); +// c1_overworld_normal +// c1_overworld +// c2_overworld_basic +// sub_8054398 +void c2_overworld(void); +// set_callback1 +// sub_80543DC +// sub_80543E8 +void CB2_NewGame(void); +void c2_whiteout(void); void CB2_LoadMap(void); +void CB2_LoadMap2(void); +// sub_8054534 +// sub_8054588 +void c2_80567AC(void); +void c2_exit_to_overworld_2_switch(void); +void c2_exit_to_overworld_2_local(void); +void c2_exit_to_overworld_2_link(void); +// sub_805465C +void sub_805469C(void); +// sub_80546B8 +void c2_exit_to_overworld_1_continue_scripts_restart_music(void); +void sub_80546F0(void); +// sub_805470C +void CB2_ContinueSavedGame(void); +void FieldClearVBlankHBlankCallbacks(void); +void SetFieldVBlankCallback(void); +void VBlankCB_Field(void); +// sub_8054814 +bool32 sub_805483C(u8 *); +bool32 sub_805493C(u8 *, u32); +bool32 sub_8054A4C(u8 *); +bool32 sub_8054A9C(u8 *a1); +void do_load_map_stuff_loop(u8 *a1); +void sub_8054BA8(void); +void sub_8054C2C(void); +void sub_8054C54(void); +void sub_8054D4C(u32 a1); +void sub_8054D90(void); +void mli4_mapscripts_and_other(void); +void sub_8054E20(void); +void sub_8054E34(void); +void sub_8054E60(void); +void sub_8054E7C(void); +void sub_8054E98(void); +void sub_8054EC8(void); +void sub_8054F48(void); +void sub_8054F70(void); +// sub_8054F88 +// sub_8054FC0 +// sub_8054FF8 +// sub_8055218 +// sub_8055280 +// sub_80552B0 +u16 sub_805530C(u16); +void sub_8055340(u16 *); +void sub_8055354(void); +u16 sub_8055390(u32); +// sub_80553E0 +u16 sub_80553E4(u32); +u16 sub_8055408(u32); +u16 sub_8055438(u32); +// sub_8055468 +// sub_805546C +// sub_80554A4 +// sub_80554B8 +// sub_80554BC +// sub_80554E4 +// sub_80554F8 +// unref_sub_8055568 +// sub_8055574 +u16 sub_8055588(void); +// sub_805559C +void sub_80555B0(int linkPlayerId, int a2, struct UnkStruct_8054FF8 *a3); +bool32 sub_8055618(struct UnkStruct_8054FF8 *); +bool32 sub_8055630(struct UnkStruct_8054FF8 *); +u8 *sub_8055648(struct UnkStruct_8054FF8 *); +bool32 sub_8055660(struct UnkStruct_8054FF8 *); +u8 *sub_805568C(struct UnkStruct_8054FF8 *); +u16 sub_8055758(u8 *); +void sub_80557E8(void); +void sub_80557F4(void); +void sub_8055808(u8 *); +void sub_8055824(void); +void sub_8055840(u8 *); +void sub_805585C(void); +bool32 sub_8055870(void); +u32 sub_80558AC(void); +u32 sub_8055910(void); +u32 sub_8055940(void); +// ZeroLinkPlayerMapObject +// strange_npc_table_clear +// ZeroMapObject +void SpawnLinkPlayerMapObject(u8, s16, s16, u8); +void InitLinkPlayerMapObjectPos(struct MapObject *, s16, s16); +// unref_sub_8055A6C +// unref_sub_8055A9C +u8 sub_8055AE8(u8); +void sub_8055B08(u8, u16 *, u16 *); +u8 sub_8055B30(u8); +u8 sub_8055B50(u8); +// unref_sub_8055B74 +u8 GetLinkPlayerIdAt(s16, s16); +void sub_8055BFC(u8, u8); +// sub_8055C68 +// sub_8055C88 +// sub_8055C8C +// sub_8055CAC +// sub_8055CB0 +// sub_8055D18 +// sub_8055D30 +// sub_8055D38 +u8 npc_something3(u8, u8); +u8 LinkPlayerDetectCollision(u8, u8, s16, s16); +void CreateLinkPlayerSprite(u8); +void SpriteCB_LinkPlayer(struct Sprite *); #endif // GUARD_ROM4_H diff --git a/include/trainer_see.h b/include/trainer_see.h index 281c7b158..e4d1fe270 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -30,6 +30,5 @@ void sub_80846E4(u8 taskId); void sub_8084794(u32 var); void sub_80847C8(void); void sub_80847D8(u8); -void sub_80847D8(u8); #endif // GUARD_TRAINER_SEE_H diff --git a/include/weather.h b/include/weather.h index a6ca2262c..a24a6d51f 100644 --- a/include/weather.h +++ b/include/weather.h @@ -31,10 +31,13 @@ void sub_807D874(u8); // ... void sub_807DB64(u8, u8); // ... +void PlayRainSoundEffect(void); +// ... void SetSav1Weather(u32); u8 GetSav1Weather(void); void sub_80806E4(void); // ... void sub_808073C(void); +void sub_8080750(); #endif // GUARD_WEATHER_H |