From d6c8fad0ba67d581178a91cb2af2db09fc5e0bd1 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Mon, 19 Dec 2016 19:13:16 -0800 Subject: decompile ground effect flags functions --- include/asm.inc.h | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index c9d43c5b9..58c1592bd 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -37,30 +37,6 @@ void CreatePokeballSprite(u8 r0, u8 r1, u8 r2, u8 r3, u8 s1, u8 s2, u8 s3, u16 s // 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); -- cgit v1.2.3 From c48b7b23a7c0fb7ead26d10cd3c6c209c4c256ff Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Wed, 28 Dec 2016 20:54:19 -0800 Subject: name save_failed_screen.c functions --- include/asm.inc.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 58c1592bd..ae3928dd9 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -450,9 +450,6 @@ void sub_813EDBC(/*TODO: arg types*/); // asm/mystery_event_menu.o void CB2_InitMysteryEventMenu(void); -// asm/save_failed_screen.o -void fullscreen_save_activate(u8); - // asm/rom_81473B8.o bool8 sub_81474C8(void); void sub_8147514(void); -- cgit v1.2.3 From 9eceeb2a37763413b015f8fc01da9ec7d35c8d16 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Thu, 29 Dec 2016 21:11:40 -0800 Subject: decompile mystery_event_menu.c --- include/asm.inc.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index ae3928dd9..9c2ca5e94 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -397,6 +397,7 @@ void sub_811AAD8(u8); u8 sub_811AAE8(void); // asm/mystery_event_script.o +u32 sub_812613C(u8 *); void sub_8126160(u8); u16 sub_8126338(void); -- cgit v1.2.3 From 1eeb0b58b51d9a12e6d7059816a5f6598c4facc7 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Thu, 29 Dec 2016 21:32:16 -0800 Subject: add nonmatching cleaner code for mystery_event_menu.c --- include/asm.inc.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 9c2ca5e94..c375389dc 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -448,9 +448,6 @@ 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/rom_81473B8.o bool8 sub_81474C8(void); void sub_8147514(void); -- cgit v1.2.3 From fc7bec7f53db0ee0c385a76a70cd3f9305651980 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 30 Dec 2016 20:29:28 -0800 Subject: decompile more of pokemon_3 --- include/asm.inc.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index c375389dc..bfa37e058 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -11,7 +11,6 @@ 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); -- cgit v1.2.3 From 530adda9554ba77e65a05f795e85432b008f9655 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 1 Jan 2017 18:30:55 -0800 Subject: name some functions --- include/asm.inc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index bfa37e058..a4069baa6 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -444,8 +444,8 @@ 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*/); +void InitIntroTorchicAttackAnim(u8); +void InitIntroMudkipAttackAnim(/*TODO: arg types*/); // asm/rom_81473B8.o bool8 sub_81474C8(void); -- cgit v1.2.3 From 80e95a204723eea4bb5fe914dd44f78a66552c03 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 1 Jan 2017 22:39:54 -0800 Subject: braille puzzle stuff --- include/asm.inc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index a4069baa6..cea5325c6 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -448,8 +448,8 @@ void InitIntroTorchicAttackAnim(u8); void InitIntroMudkipAttackAnim(/*TODO: arg types*/); // asm/rom_81473B8.o -bool8 sub_81474C8(void); -void sub_8147514(void); +bool8 ShouldDoBrailleStrengthEffect(void); +void DoBrailleStrengthEffect(void); // asm/rom_8148B8C.o void load_intro_part2_graphics(/*TODO: arg types*/); -- cgit v1.2.3 From c4af9225bc4e2f30a240e9cabca98fca4d708501 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 1 Jan 2017 23:25:19 -0800 Subject: split rom_806936C --- include/asm.inc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index cea5325c6..76cf9e837 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -158,9 +158,9 @@ 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 SetUpFieldTasks(); +void ActivatePerStepCallback(u8); +void ResetFieldTasksArgs(void); void DoTimeBasedEvents(void); // asm/reset_rtc_screen.o -- cgit v1.2.3 From 145e90483b2a30698f917f62e585aa7fa4794588 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Mon, 2 Jan 2017 00:41:28 -0800 Subject: event_data.c --- include/asm.inc.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 76cf9e837..290e753f3 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -151,11 +151,6 @@ 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 SetUpFieldTasks(); -- cgit v1.2.3 From e7054aed143a0853048df3ffb61d322014c1e52d Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Mon, 2 Jan 2017 04:48:04 -0800 Subject: name_string_util.s --- include/asm.inc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 290e753f3..a7c40a08d 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -455,7 +455,7 @@ 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*/); -void sub_814A568(u8*); +void SanitizeNameString(u8*); // src/agb_flash.o u16 ReadFlashId(void); -- cgit v1.2.3 From 2f362cf67ab65f62ec3a2a2a6497615cb8bc502c Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 3 Jan 2017 02:35:26 +0100 Subject: Partly decompile tv show --- include/asm.inc.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index a7c40a08d..4d49ef7b6 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -278,12 +278,24 @@ void sub_80BD674(void *, u32, u8); void sub_80BD7A8(void); void UpdateTVScreensOnMap(u32, u32); void sub_80BDAB4(void); +u8 sub_80BDEAC(u8 *); +void sub_80BE160(TVShow *); +void sub_80BE8EC(u16); +void UpdateMassOutbreakTimeLeft(u16); void sub_80BE97C(u8); void sub_80BEA50(u16); +void sub_80BEA5C(u16); bool8 GetPriceReduction(u8); +void sub_80BEE84(u16); u8 sub_80BF0B8(u32); +void sub_80BF478(void); +u16 sub_80BF674(u16 species); +s8 sub_80BF720(TVShow *); +u8 sub_80BF77C(u32); void sub_80BFD44(void *, u32, u8); void sub_80C0514(void *, u32, u8); +void StartMassOutbreak(void); +void TVShowDone(void); // asm/contest_link_80C2020.o void sub_80C2358(void); @@ -360,6 +372,7 @@ bool8 SB1ContainsWords(u16 *); bool8 IsEasyChatPairEqual(u16 *, u16 *); // asm/region_map.o +void sub_80FBFB4(u8 *str, u8 region, u8); void CopyMapName(); // asm/slot_machine.o -- cgit v1.2.3 From bb2c7f3e07fe9fe9ae72b361b93f106af1259124 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Mon, 2 Jan 2017 22:58:06 -0800 Subject: name functions and split data more --- include/asm.inc.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 4d49ef7b6..86d16066b 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -135,10 +135,10 @@ 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); +bool8 FreezeMapObject(struct MapObject *); +void FreezeMapObjects(void); +void FreezeMapObjectsExceptOne(u8); +void UnfreezeMapObjects(void); void sub_806487C(struct Sprite *sprite, bool8 invisible); void sub_8064990(u8, u8); -- cgit v1.2.3 From 6f64e68814206dc6082fd8dc3fceed79e5e63928 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Mon, 2 Jan 2017 23:23:23 -0800 Subject: decompile coord_event_weather.c --- include/asm.inc.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 86d16066b..9cf316079 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -170,6 +170,9 @@ u8 battle_side_get_owner(u8); u8 battle_get_per_side_status(u8); u8 battle_get_side_with_given_state(u8); +// asm/weather.o +void SetWeather(u32); + // asm/rom_8080874.o void pal_fill_black(); void sub_8080990(void); -- cgit v1.2.3 From c03e7be9af2a908833a868436f0f9f12519a81ee Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 3 Jan 2017 19:54:37 +0100 Subject: Attempt to decompile trainer memo printing --- include/asm.inc.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 9cf316079..5e2b49a84 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -376,6 +376,7 @@ bool8 IsEasyChatPairEqual(u16 *, u16 *); // asm/region_map.o void sub_80FBFB4(u8 *str, u8 region, u8); +u8 *CopyLocationName(u8 *dest, u8 location); void CopyMapName(); // asm/slot_machine.o -- cgit v1.2.3 From 1505e4e24c3706d7178d0c0716d2274f51d77343 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 4 Jan 2017 23:20:09 -0600 Subject: begin decompiling more intro code --- include/asm.inc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 5e2b49a84..5ec19b81e 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -443,9 +443,9 @@ 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_813CE88(u16, s16, u16, u16, u8); +u8 sub_813CFA8(u16, u16, u16, u16); +void sub_813D084(u8); u8 sub_813D584(/*TODO: arg types*/); void sub_813D788(struct Sprite *); void sub_813D880(struct Sprite *); -- cgit v1.2.3 From e7ea49dc389fde77b9f515c4fc3bebc3fa37b1d1 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 5 Jan 2017 17:08:36 -0600 Subject: decompile up to sub_813D584 --- include/asm.inc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 5ec19b81e..0e45c3174 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -446,7 +446,7 @@ void sub_813CE30(u16, u16, u16, u16); u8 sub_813CE88(u16, s16, u16, u16, u8); u8 sub_813CFA8(u16, u16, u16, u16); void sub_813D084(u8); -u8 sub_813D584(/*TODO: arg types*/); +u8 sub_813D584(u16, s16, u16, u16, u16, u8); void sub_813D788(struct Sprite *); void sub_813D880(struct Sprite *); void sub_813D954(/*TODO: arg types*/); -- cgit v1.2.3 From 505ad946b9b9e102ceb01f86a03769c5b6d22749 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 6 Jan 2017 00:42:09 +0100 Subject: Decompile party_menu functions --- include/asm.inc.h | 61 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 45 insertions(+), 16 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 5e2b49a84..61790e8ce 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -9,15 +9,17 @@ 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 +// src/pokemon_3.o u16 SpeciesToNationalPokedexNum(u16); + +// asm/pokemon_3.o 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 +// asm/util.o void StoreWordInTwoHalfwords(u16 *, u32); void LoadWordFromTwoHalfwords(u16 *, u32 *); @@ -30,7 +32,7 @@ void sub_8041940(void); void sub_8041950(void); u8 daycare_relationship_score_from_savegame(void); -// asm/rom_804373C.o +// asm/pokeball.o void CreatePokeballSprite(u8 r0, u8 r1, u8 r2, u8 r3, u8 s1, u8 s2, u8 s3, u16 s4); // asm/berry_blender.o @@ -134,7 +136,7 @@ u8 ZCoordToPriority(u8); void FieldObjectUpdateZCoord(struct MapObject *pObject); void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8); -// src/map_obj_80643A4.o +// src/field_map_obj_helpers.o bool8 FreezeMapObject(struct MapObject *); void FreezeMapObjects(void); void FreezeMapObjectsExceptOne(u8); @@ -142,7 +144,7 @@ void UnfreezeMapObjects(void); void sub_806487C(struct Sprite *sprite, bool8 invisible); void sub_8064990(u8, u8); -// asm/rom_8065394.o +// asm/field_control_avatar.o void sub_8067EEC(struct UnkInputStruct *pStruct); void process_overworld_input(struct UnkInputStruct *pStruct, u16 keys, u16 heldKeys); int sub_8068024(struct UnkInputStruct *pStruct); @@ -152,23 +154,26 @@ void prev_quest_postbuffer_cursor_backup_reset(void); u8 *sub_8068E24(struct UnkStruct_8054FF8_Substruct *); u8 *GetFieldObjectScriptPointerForComparison(); -// asm/rom_806936C.o +// asm/field_tasks.o void SetUpFieldTasks(); void ActivatePerStepCallback(u8); void ResetFieldTasksArgs(void); + +// asm/clock.o void DoTimeBasedEvents(void); // asm/reset_rtc_screen.o void CB2_InitResetRtcScreen(void); -// asm/rom_806D7F8.o +// asm/party_menu.o void GetMonNickname(struct Pokemon *mon, u8 *nickname); bool8 pokemon_has_move(struct Pokemon *, u16); -// asm/rom_8074BAC.o +// asm/rom_8077ABC.o u8 battle_side_get_owner(u8); u8 battle_get_per_side_status(u8); u8 battle_get_side_with_given_state(u8); +bool8 IsDoubleBattle(); // asm/weather.o void SetWeather(u32); @@ -204,27 +209,41 @@ void objc_exclamation_mark_probably(struct Sprite *sprite); u8 CreateTrainerSprite_BirchSpeech(u8, u16, u16, u8, void *); void LoadTrainerGfx_TrainerCard(u8 gender, int, void *); u8 CreateBirchSprite(u8, u8, u8); + +// asm/unknown_task.o 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); + +// asm/pokemon_menu.o void sub_8089A70(void); void sub_808AB90(void); -// asm/rom_8094928.o +// asm/pokemon_storage_system.o void sub_80961D8(void); + +// asm/pokemon_icon.o u8 sub_809D3A4(u16 arg0, void (*)(struct Sprite *), int, u8 arg3, u32 arg4); u16 sub_809D4A8(u16); void sub_809D510(struct Sprite *); void sub_809D580(u16); void sub_809D608(u16); + +// asm/pokemon_summary_screen.o u8 pokemon_ailments_get_primary(u32); + +// asm/script_movement.o u8 exec_movement(u8, u8, u8, void *); bool8 sub_80A212C(u8, u8, u8); void sub_80A2178(void); + +// asm/mail_data.o void sub_80A2B18(void); u16 sub_80A2D64(u16, u8 *); + +// asm/map_name_popup.o void AddMapNamePopUpWindowTask(void); void HideMapNamePopUpWindow(); @@ -258,7 +277,7 @@ void CreatePokemartMenu(void *); void CreateDecorationShop1Menu(void *); void CreateDecorationShop2Menu(void *); -// asm/script_menu.o +// src/script_menu.o bool8 sub_80B5054(u8, u8, u8, u8); bool8 sub_80B50B0(u8, u8, u8, u8, u8); bool8 Multichoice(u8, u8, u8, u8); @@ -297,6 +316,8 @@ s8 sub_80BF720(TVShow *); u8 sub_80BF77C(u32); void sub_80BFD44(void *, u32, u8); void sub_80C0514(void *, u32, u8); + +// src/tv.o void StartMassOutbreak(void); void TVShowDone(void); @@ -376,8 +397,8 @@ bool8 IsEasyChatPairEqual(u16 *, u16 *); // asm/region_map.o void sub_80FBFB4(u8 *str, u8 region, u8); -u8 *CopyLocationName(u8 *dest, u8 location); void CopyMapName(); +u8 *CopyLocationName(u8 *dest, u8 location); // asm/slot_machine.o void PlaySlotMachine(u8, void *); @@ -388,9 +409,13 @@ void sub_8106630(u32); // asm/rom6.o bool8 npc_before_player_of_type(u8); u8 oei_task_add(void); + +// asm/pokeblock.o void sub_810C994(void); void sub_810CA6C(s32); s16 sub_810CAE4(u8, struct Pokeblock *); + +// asm/rom_810CBB4.o void sub_810CC80(void); u8 sub_810D32C(void); void ResetCyclingRoadChallengeData(void); @@ -407,9 +432,11 @@ void sub_811AABC(u8); void sub_811AAD8(u8); u8 sub_811AAE8(void); -// asm/mystery_event_script.o +// src/mystery_event_script.o u32 sub_812613C(u8 *); void sub_8126160(u8); + +// asm/mystery_event_script.o u16 sub_8126338(void); // asm/field_effect_helpers.o @@ -435,10 +462,10 @@ void sub_8134394(); u8 sub_81344CC(void); void sub_8134AC0(void *); -// asm/player_pc.o +// src/player_pc.o void NewGameInitPCItems(void); -// asm/rom_813BA94.o +// asm/intro.o void sub_813CAF4(u8); void intro_reset_and_hide_bgs(void); void sub_813CCE8(u8); @@ -459,11 +486,11 @@ void sub_813E930(/*TODO: arg types*/); void InitIntroTorchicAttackAnim(u8); void InitIntroMudkipAttackAnim(/*TODO: arg types*/); -// asm/rom_81473B8.o +// asm/braille_puzzles.o bool8 ShouldDoBrailleStrengthEffect(void); void DoBrailleStrengthEffect(void); -// asm/rom_8148B8C.o +// asm/intro_credits_graphics.o void load_intro_part2_graphics(/*TODO: arg types*/); void sub_8148C78(/*TODO: arg types*/); u8 sub_8148EC0(/*TODO: arg types*/); @@ -472,6 +499,8 @@ 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*/); + +// asm/name_string_util.o void SanitizeNameString(u8*); // src/agb_flash.o -- cgit v1.2.3 From b6b9ebd3ee7b4cfce12f0b062bdd65a70b0ee45a Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 6 Jan 2017 20:32:46 -0600 Subject: decompile more intro functions --- include/asm.inc.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 18127f136..1736751ac 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -470,17 +470,18 @@ 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(u16, s16, u16, u16, u8); +u16 sub_813CE88(u16, s16, s16, u16, u8); u8 sub_813CFA8(u16, u16, u16, u16); void sub_813D084(u8); -u8 sub_813D584(u16, s16, u16, u16, u16, u8); +u8 CreateWaterDrop(s16, s16, u16, u16, u16, u8); void sub_813D788(struct Sprite *); void sub_813D880(struct Sprite *); -void sub_813D954(/*TODO: arg types*/); +u8 CreateGameFreakLogo(s16, s16, u8); void sub_813DB9C(struct Sprite *); void sub_813DE70(struct Sprite *); void sub_813E10C(struct Sprite *); void sub_813E210(struct Sprite *); +void sub_813E580(u16, u16); void sub_813E7C0(u8); void sub_813E930(/*TODO: arg types*/); void InitIntroTorchicAttackAnim(u8); -- cgit v1.2.3 From c4c79da09ad63c9c5fc02023ebdff6489a7a4a74 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Sat, 7 Jan 2017 02:54:16 -0500 Subject: finish decompiling intro.c (#169) * finish decompiling * remove intro.s --- include/asm.inc.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 1736751ac..3e7c5fa99 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -465,27 +465,8 @@ void sub_8134AC0(void *); // src/player_pc.o void NewGameInitPCItems(void); -// asm/intro.o -void sub_813CAF4(u8); -void intro_reset_and_hide_bgs(void); -void sub_813CCE8(u8); +// src/intro.o void sub_813CE30(u16, u16, u16, u16); -u16 sub_813CE88(u16, s16, s16, u16, u8); -u8 sub_813CFA8(u16, u16, u16, u16); -void sub_813D084(u8); -u8 CreateWaterDrop(s16, s16, u16, u16, u16, u8); -void sub_813D788(struct Sprite *); -void sub_813D880(struct Sprite *); -u8 CreateGameFreakLogo(s16, s16, u8); -void sub_813DB9C(struct Sprite *); -void sub_813DE70(struct Sprite *); -void sub_813E10C(struct Sprite *); -void sub_813E210(struct Sprite *); -void sub_813E580(u16, u16); -void sub_813E7C0(u8); -void sub_813E930(/*TODO: arg types*/); -void InitIntroTorchicAttackAnim(u8); -void InitIntroMudkipAttackAnim(/*TODO: arg types*/); // asm/braille_puzzles.o bool8 ShouldDoBrailleStrengthEffect(void); -- cgit v1.2.3 From 11f95794b99b5560f53c400ee5f7f3f231e8e3ad Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 8 Jan 2017 00:05:04 -0800 Subject: decompile porthole code --- include/asm.inc.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 3e7c5fa99..c415cd825 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -193,6 +193,7 @@ void sp13E_warp_to_last_warp(void); void sub_8080EF0(void); void sp13F_fall_to_last_warp(void); void sub_8080F68(void); +void sub_8080F9C(void); void sub_8081594(u8); void sub_80815E0(u8 val); @@ -419,6 +420,8 @@ s16 sub_810CAE4(u8, struct Pokeblock *); void sub_810CC80(void); u8 sub_810D32C(void); void ResetCyclingRoadChallengeData(void); +bool32 sub_810D9B0(u16); +u8 sub_810D9EC(s8 *, s8 *, s16 *, s16 *); void ScriptAddElevatorMenuItem(u8, u8, u8, u8); void ScriptShowElevatorMenu(void); u8 GetLeadMonIndex(void); -- cgit v1.2.3 From 0e96421b07bf5e51a7197535262950c45391cf1f Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 10 Jan 2017 21:08:59 +0100 Subject: Continue decompiling credits --- include/asm.inc.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index c415cd825..43a25a231 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -478,6 +478,8 @@ void DoBrailleStrengthEffect(void); // asm/intro_credits_graphics.o void load_intro_part2_graphics(/*TODO: arg types*/); void sub_8148C78(/*TODO: arg types*/); +void sub_8148CB0(u8); +void sub_8148E90(u8); u8 sub_8148EC0(/*TODO: arg types*/); void sub_8149020(/*TODO: arg types*/); u8 intro_create_brendan_sprite(/*TODO: arg types*/); -- cgit v1.2.3 From 13dc0d36b0b2a7899881c323ff37754c779ba117 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 10 Jan 2017 22:07:09 -0600 Subject: fix up dewford_trend.c a bit --- include/asm.inc.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 43a25a231..44a28b2b5 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -389,12 +389,7 @@ 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 *); +void sub_80FA4E4(void *, u32, u8); // asm/region_map.o void sub_80FBFB4(u8 *str, u8 region, u8); -- cgit v1.2.3 From 6b0268e0c0fb98014cb72f8a918a33c0645162d2 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Tue, 10 Jan 2017 23:15:38 -0500 Subject: finish decompiling field_control_avatar.c (#182) * start decompiling field_control_avatar.c * remove field_control_player_avatar.c * finish decompiling * cleanup * var and flag constants --- include/asm.inc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 44a28b2b5..6f78b2a08 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -148,10 +148,10 @@ void sub_8064990(u8, u8); 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); +u8 *sub_80682A8(struct MapPosition *, u8, u8); void overworld_poison_timer_set(void); void prev_quest_postbuffer_cursor_backup_reset(void); -u8 *sub_8068E24(struct UnkStruct_8054FF8_Substruct *); +u8 *sub_8068E24(struct MapPosition *); u8 *GetFieldObjectScriptPointerForComparison(); // asm/field_tasks.o -- cgit v1.2.3 From 370b2b3c3e355040982404dc4bf17e1b765ff5a0 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 14 Jan 2017 18:30:15 -0800 Subject: decompile map_name_popup.c --- include/asm.inc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 6f78b2a08..036cf0266 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -245,8 +245,8 @@ void sub_80A2B18(void); u16 sub_80A2D64(u16, u8 *); // asm/map_name_popup.o -void AddMapNamePopUpWindowTask(void); -void HideMapNamePopUpWindow(); +void ShowMapNamePopup(void); +void HideMapNamePopup(); // asm/item_menu.o void sub_80A3684(void); -- cgit v1.2.3 From 50d60b4403c8f8395bb0d11f9767304a8d25b3ac Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 21 Jan 2017 04:36:36 -0500 Subject: finish decompiling bike.c (#207) * decompile first few functions of field_map_obj.c * formatting * almost finish decompiling bike.c * finish decompiling bike.c --- include/asm.inc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 036cf0266..64f554ebd 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -362,7 +362,7 @@ 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); +void sub_80E6010(u8 i); s16 sub_80E6034(void); void sub_80E6084(); -- cgit v1.2.3 From ef82a98a1525f58d3a6c56194a42f7660cfc923b Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Sat, 21 Jan 2017 22:04:49 -0600 Subject: label a few things and put data in field_player_avatar.c (#212) --- include/asm.inc.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 64f554ebd..bfc902ffb 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -145,9 +145,9 @@ void sub_806487C(struct Sprite *sprite, bool8 invisible); void sub_8064990(u8, u8); // asm/field_control_avatar.o -void sub_8067EEC(struct UnkInputStruct *pStruct); -void process_overworld_input(struct UnkInputStruct *pStruct, u16 keys, u16 heldKeys); -int sub_8068024(struct UnkInputStruct *pStruct); +void FieldClearPlayerInput(struct FieldInput *pStruct); +void FieldGetPlayerInput(struct FieldInput *pStruct, u16 keys, u16 heldKeys); +int sub_8068024(struct FieldInput *pStruct); u8 *sub_80682A8(struct MapPosition *, u8, u8); void overworld_poison_timer_set(void); void prev_quest_postbuffer_cursor_backup_reset(void); @@ -361,7 +361,7 @@ 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 BikeClearState(int i, int i1); void sub_80E6010(u8 i); s16 sub_80E6034(void); void sub_80E6084(); -- cgit v1.2.3 From 22e4e3f3781cf69813ff258f1cd575a9ca46ae18 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Sun, 22 Jan 2017 21:35:31 -0600 Subject: decompile script_movement (#213) * start decompiling script_movement * finish decompiling * delete script_movement.s --- include/asm.inc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index bfc902ffb..482f4d91f 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -96,7 +96,7 @@ 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); +bool8 FieldObjectSetSpecialAnim(struct MapObject *, u8); void FieldObjectForceSetSpecialAnim(struct MapObject *pObject, u8 a); void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *); void FieldObjectClearAnim(struct MapObject *); @@ -236,7 +236,7 @@ void sub_809D608(u16); u8 pokemon_ailments_get_primary(u32); // asm/script_movement.o -u8 exec_movement(u8, u8, u8, void *); +bool8 exec_movement(u8, u8, u8, u8 *); bool8 sub_80A212C(u8, u8, u8); void sub_80A2178(void); -- cgit v1.2.3 From b1925402a0c7ffa4ca9470ef2ad9afc9a1baaf06 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 22 Jan 2017 23:22:12 -0600 Subject: start decompiling naming_screen --- include/asm.inc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index bfc902ffb..79bb4ae4f 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -288,7 +288,7 @@ 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); +void DoNamingScreen(u8 r0, u8 *r1, u16 r2, u16 r3, u32 s0, MainCallback s4); // asm/secret_base.o void sub_80BB5B4(void); -- cgit v1.2.3 From ed8f49d5e1418309cbc4f705a242d073258c8639 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 28 Jan 2017 13:51:14 -0800 Subject: tabs to spaces --- include/asm.inc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 50d983852..bee42f1b5 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -78,7 +78,7 @@ u8 AddCameraObject(u8); u8 * GetFieldObjectScriptPointerByFieldObjectId(u8); u8 FieldObjectGetBerryTreeId(u8); void sub_805C754(struct MapObject *pObject); -void sub_805C774(struct MapObject *, u8 ); +void sub_805C774(struct MapObject *, u8); void sub_805C78C(u8, u8, u8); void sub_805C7C4(int i); u8 FieldObjectDirectionToImageAnimId(u8); -- cgit v1.2.3 From b6b5453431af46791fd9d211efac64464c1dff85 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 29 Jan 2017 20:59:54 -0500 Subject: start decompiling mauville_old_man.c (#225) * some labels and enumerate player speeds * clear up speed enums * GetPlayerSpeed * oops * start decompiling mauville_old_man.c * formatting * decompile more of mauville_old_man.c * someone fix this please * formatting * make ROM build again * formatting again --- include/asm.inc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index bee42f1b5..379b79f2d 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -359,11 +359,11 @@ void sub_80C8F34(u8); // asm/bike.o void MovePlayerOnBike(u8, u16, u16); void sub_80E5B38(u16 i, u16 c); -u8 sub_80E5DEC(u8); +u8 IsRunningDisallowed(u8); bool8 player_should_look_direction_be_enforced_upon_movement(void); void BikeClearState(int i, int i1); void sub_80E6010(u8 i); -s16 sub_80E6034(void); +s16 GetPlayerSpeed(void); void sub_80E6084(); // asm/easy_chat.o -- cgit v1.2.3 From 9813caaf5345ea28f8230d41461618673779c2fb Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 31 Jan 2017 03:08:44 -0500 Subject: make ROM match again (#227) * some labels and enumerate player speeds * clear up speed enums * GetPlayerSpeed * oops * start decompiling mauville_old_man.c * formatting * decompile more of mauville_old_man.c * someone fix this please * formatting * make ROM build again * formatting again * make ROM match again --- include/asm.inc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 379b79f2d..f556fe4e5 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -376,7 +376,7 @@ u16 sub_80EB72C(u16); void sub_80EBA5C(void); // asm/mauville_old_man.o -void sub_80F7AA4(void); +void SetMauvilleOldMan(void); void sub_80F7F30(void); // asm/menu_helpers.o -- cgit v1.2.3 From 2c66ef8ef361de78f1b6529f177e299207d2006e Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 3 Feb 2017 01:04:43 -0600 Subject: decompile more code --- include/asm.inc.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 50d983852..f879f40c1 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -53,12 +53,13 @@ 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 SpawnSpecialFieldObject(struct MapObjectTemplate *); u8 show_sprite(u8, u8, u8); -u8 AddPseudoFieldObject(u8 val, void (*player)(struct Sprite *), int i, int i1, int i2); +u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 c, s16 d, u8 subpriority); 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_805B55C(int i, int i1); +void sub_805B55C(s16 a, s16 b); +void sub_805B710(u16 i, u16 i1); void sub_805B980(struct MapObject *, u8); void FieldObjectTurn(struct MapObject *, u8); void FieldObjectTurnByLocalIdAndMap(u8, u8, u8, u8); -- cgit v1.2.3 From 2afc20150b1cf5e9bcc8008c0323ac57af353718 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Sat, 4 Feb 2017 21:47:11 -0600 Subject: decompile more of field_map_obj (#231) * decompile more code * decompile more of field_map_obj * decompile more of field_map_obj --- include/asm.inc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 53b2f1cb8..8189914fa 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -63,7 +63,7 @@ void sub_805B710(u16 i, u16 i1); void sub_805B980(struct MapObject *, u8); void FieldObjectTurn(struct MapObject *, u8); void FieldObjectTurnByLocalIdAndMap(u8, u8, u8, u8); -struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8); +const 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); @@ -73,7 +73,7 @@ void gpu_pal_allocator_reset__manage_upper_four(void); 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); +u8 GetFieldObjectIdByXYZ(u16, u16, u8); void UpdateFieldObjectsForCameraUpdate(s16, s16); u8 AddCameraObject(u8); u8 * GetFieldObjectScriptPointerByFieldObjectId(u8); @@ -81,7 +81,7 @@ 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); +void sub_805C7C4(u8 i); u8 FieldObjectDirectionToImageAnimId(u8); u8 get_go_image_anim_num(u8 unk_19); u8 sub_805FD98(u8); -- cgit v1.2.3 From 6035511c139549a0291b6b3d43b9b080f792b2b6 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 18 Mar 2017 04:00:15 +0100 Subject: reorganize and add new headers for many files --- include/asm.inc.h | 101 ------------------------------------------------------ 1 file changed, 101 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 8189914fa..9ee10aa58 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -38,14 +38,6 @@ void CreatePokeballSprite(u8 r0, u8 r1, u8 r2, u8 r3, u8 s1, u8 s2, u8 s3, u16 s // asm/berry_blender.o void sub_80516C4(u8, u16); -// 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); @@ -137,32 +129,11 @@ u8 ZCoordToPriority(u8); void FieldObjectUpdateZCoord(struct MapObject *pObject); void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8); -// src/field_map_obj_helpers.o -bool8 FreezeMapObject(struct MapObject *); -void FreezeMapObjects(void); -void FreezeMapObjectsExceptOne(u8); -void UnfreezeMapObjects(void); -void sub_806487C(struct Sprite *sprite, bool8 invisible); -void sub_8064990(u8, u8); - -// asm/field_control_avatar.o -void FieldClearPlayerInput(struct FieldInput *pStruct); -void FieldGetPlayerInput(struct FieldInput *pStruct, u16 keys, u16 heldKeys); -int sub_8068024(struct FieldInput *pStruct); -u8 *sub_80682A8(struct MapPosition *, u8, u8); -void overworld_poison_timer_set(void); -void prev_quest_postbuffer_cursor_backup_reset(void); -u8 *sub_8068E24(struct MapPosition *); -u8 *GetFieldObjectScriptPointerForComparison(); - // asm/field_tasks.o void SetUpFieldTasks(); void ActivatePerStepCallback(u8); void ResetFieldTasksArgs(void); -// asm/clock.o -void DoTimeBasedEvents(void); - // asm/reset_rtc_screen.o void CB2_InitResetRtcScreen(void); @@ -203,10 +174,6 @@ 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 *); void LoadTrainerGfx_TrainerCard(u8 gender, int, void *); @@ -259,11 +226,6 @@ u8 sub_80A7D8C(u8 berry, int i, int i1); void sub_80A7DD4(void); u8 sub_80A7E5C(u8); -// src/matsuda_debug_menu.o -void sub_80AA280(u8); -void sub_80AA5E8(u8); -void sub_80AA658(u8); - // asm/contest.o void sub_80AB1B0(void); void sub_80AE098(u8); @@ -279,18 +241,6 @@ void CreatePokemartMenu(void *); void CreateDecorationShop1Menu(void *); void CreateDecorationShop2Menu(void *); -// src/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, u8 *r1, u16 r2, u16 r3, u32 s0, MainCallback s4); - // asm/secret_base.o void sub_80BB5B4(void); u8 sub_80BBB24(void); @@ -330,15 +280,6 @@ void sub_80C4940(void); void sub_80C4980(u8); u8 sub_80C4B34(u8 *); -// asm/script_pokemon_util_80C4BF0.o -u8 sub_80C4D50(void); -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); @@ -357,16 +298,6 @@ void sub_80C8E1C(u8); void sub_80C8EBC(u8); void sub_80C8F34(u8); -// asm/bike.o -void MovePlayerOnBike(u8, u16, u16); -void sub_80E5B38(u16 i, u16 c); -u8 IsRunningDisallowed(u8); -bool8 player_should_look_direction_be_enforced_upon_movement(void); -void BikeClearState(int i, int i1); -void sub_80E6010(u8 i); -s16 GetPlayerSpeed(void); -void sub_80E6084(); - // asm/easy_chat.o void sub_80E6764(void); void sub_80EB3FC(u8 *, u16); @@ -385,13 +316,6 @@ bool8 sub_80F9344(void); void sub_80F9368(void); void sub_80F9438(void); -// asm/script_pokemon_util_80F99CC.o -void sub_80F99CC(void); - -// src/dewford_trend.o -void sub_80FA17C(void); -void sub_80FA4E4(void *, u32, u8); - // asm/region_map.o void sub_80FBFB4(u8 *str, u8 region, u8); void CopyMapName(); @@ -400,13 +324,6 @@ u8 *CopyLocationName(u8 *dest, u8 location); // asm/slot_machine.o void PlaySlotMachine(u8, void *); -// asm/contest_painting.o -void sub_8106630(u32); - -// asm/rom6.o -bool8 npc_before_player_of_type(u8); -u8 oei_task_add(void); - // asm/pokeblock.o void sub_810C994(void); void sub_810CA6C(s32); @@ -464,13 +381,6 @@ void sub_8134AC0(void *); // src/player_pc.o void NewGameInitPCItems(void); -// src/intro.o -void sub_813CE30(u16, u16, u16, u16); - -// asm/braille_puzzles.o -bool8 ShouldDoBrailleStrengthEffect(void); -void DoBrailleStrengthEffect(void); - // asm/intro_credits_graphics.o void load_intro_part2_graphics(/*TODO: arg types*/); void sub_8148C78(/*TODO: arg types*/); @@ -482,14 +392,3 @@ 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*/); - -// asm/name_string_util.o -void SanitizeNameString(u8*); - -// 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); -u16 IdentifyFlash(void); -- cgit v1.2.3 From 4a6035a14c916be794890054556529ae5300a0b4 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Mon, 17 Apr 2017 22:18:32 +0200 Subject: Decompile fldeff_softboiled --- include/asm.inc.h | 59 +++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 13 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 9ee10aa58..d0fe6e354 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -1,12 +1,16 @@ -// asm/rom3.o +// src/rom3.o void sub_800C35C(void); -// asm/rom_800D42C.o +// asm/battle_2.o void sub_800E7C4(void); u8 b_first_side(u8, u8, u8); void sub_80157C4(u8 index); + +// asm/battle_3.o u8 sub_8015A98(u8, u8, u8); u8 sub_8018324(u8, u8, u8, u8, u16); + +// asm/battle_7.o void sub_8032AA8(u8 index, int i); // src/pokemon_3.o @@ -23,8 +27,10 @@ void current_map_music_set__default_for_battle(u16); void StoreWordInTwoHalfwords(u16 *, u32); void LoadWordFromTwoHalfwords(u16 *, u32 *); -// asm/daycare.o +// src/daycare.o u8 daycare_count_pokemon(u8 *); + +// asm/daycare.o void sub_8041324(struct BoxPokemon *, void *); void sub_8041790(int i); u16 sub_8041870(u16); @@ -38,7 +44,7 @@ void CreatePokeballSprite(u8 r0, u8 r1, u8 r2, u8 r3, u8 s1, u8 s2, u8 s3, u16 s // asm/berry_blender.o void sub_80516C4(u8, u16); -// asm/field_map_obj.o +// src/field_map_obj.o void sub_805AA98(); u8 sub_805AB54(void); u8 GetFieldObjectIdByLocalIdAndMap(u8, u8, u8); @@ -49,7 +55,6 @@ u8 SpawnSpecialFieldObject(struct MapObjectTemplate *); u8 show_sprite(u8, u8, u8); u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 c, s16 d, u8 subpriority); u8 sub_805B410(u8, u8, s16, s16, u8, u8); -//void sub_805B55C(int i, int i1); void sub_805B55C(s16 a, s16 b); void sub_805B710(u16 i, u16 i1); void sub_805B980(struct MapObject *, u8); @@ -74,6 +79,8 @@ void sub_805C754(struct MapObject *pObject); void sub_805C774(struct MapObject *, u8); void sub_805C78C(u8, u8, u8); void sub_805C7C4(u8 i); + +// asm/field_map_obj.o u8 FieldObjectDirectionToImageAnimId(u8); u8 get_go_image_anim_num(u8 unk_19); u8 sub_805FD98(u8); @@ -138,8 +145,17 @@ void ResetFieldTasksArgs(void); void CB2_InitResetRtcScreen(void); // asm/party_menu.o +void sub_806CB74(u8 taskId); +void sub_806CCE4(void); +void sub_806CD44(u8 taskId); +void sub_806D538(); +void sub_806D5A4(void); void GetMonNickname(struct Pokemon *mon, u8 *nickname); bool8 pokemon_has_move(struct Pokemon *, u16); +void sub_806FA18(u8 taskId); + +// src/party_menu.o +void sub_806E834(); // asm/rom_8077ABC.o u8 battle_side_get_owner(u8); @@ -147,13 +163,15 @@ u8 battle_get_per_side_status(u8); u8 battle_get_side_with_given_state(u8); bool8 IsDoubleBattle(); -// asm/weather.o +// asm/field_screeneffect.o void SetWeather(u32); -// asm/rom_8080874.o +// src/field_fadetransition.o void pal_fill_black(); void sub_8080990(void); void sub_80809B0(void); + +// asm/field_fadetransition.o void sub_8080A3C(void); void sub_8080AC4(void); void mapldr_default(); @@ -166,6 +184,8 @@ void sub_8080EF0(void); void sp13F_fall_to_last_warp(void); void sub_8080F68(void); void sub_8080F9C(void); + +// asm/rom_8080874.o void sub_8081594(u8); void sub_80815E0(u8 val); @@ -174,7 +194,7 @@ u8 sub_8083664(void); void sub_8083A84(TaskFunc); s32 sub_8083BF4(u8 id); -// asm/rom_80859BC.o +// asm/field_effect.o u8 CreateTrainerSprite_BirchSpeech(u8, u16, u16, u8, void *); void LoadTrainerGfx_TrainerCard(u8 gender, int, void *); u8 CreateBirchSprite(u8, u8, u8); @@ -188,6 +208,7 @@ void sub_8089944(int i, int i1, int i2, int i3, int i4, int i5, int i6); // asm/pokemon_menu.o void sub_8089A70(void); +void sub_808A004(); void sub_808AB90(void); // asm/pokemon_storage_system.o @@ -203,7 +224,7 @@ void sub_809D608(u16); // asm/pokemon_summary_screen.o u8 pokemon_ailments_get_primary(u32); -// asm/script_movement.o +// src/script_movement.o bool8 exec_movement(u8, u8, u8, u8 *); bool8 sub_80A212C(u8, u8, u8); void sub_80A2178(void); @@ -212,7 +233,7 @@ void sub_80A2178(void); void sub_80A2B18(void); u16 sub_80A2D64(u16, u8 *); -// asm/map_name_popup.o +// src/map_name_popup.o void ShowMapNamePopup(void); void HideMapNamePopup(); @@ -307,8 +328,10 @@ u16 sub_80EB72C(u16); // asm/pokenav.o void sub_80EBA5C(void); -// asm/mauville_old_man.o +// src/mauville_old_man.o void SetMauvilleOldMan(void); + +// asm/mauville_old_man.o void sub_80F7F30(void); // asm/menu_helpers.o @@ -329,9 +352,13 @@ void sub_810C994(void); void sub_810CA6C(s32); s16 sub_810CAE4(u8, struct Pokeblock *); -// asm/rom_810CBB4.o +// asm/fldeff_flash.o void sub_810CC80(void); + +// asm/time_events.o u8 sub_810D32C(void); + +// asm/field_specials.o void ResetCyclingRoadChallengeData(void); bool32 sub_810D9B0(u16); u8 sub_810D9EC(s8 *, s8 *, s16 *, s16 *); @@ -363,19 +390,25 @@ void sub_8127ED0(u8, u8); void sub_8127F28(u8, u8, s16); u8 sub_8128124(u8 id); -// asm/rom_81258BC.o +// asm/learn_move.o void sub_8132670(void); + +// asm/decoration_inventory.o void sub_8133F80(void); u8 sub_8133FE4(u8); u8 IsThereStorageSpaceForDecoration(u8); u8 sub_8134074(u8); s8 sub_81340A8(u8); + +// asm/roamer.o 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); + +// asm/battle_tower.o void sub_8134AC0(void *); // src/player_pc.o -- cgit v1.2.3 From d7284694ec3543b84074f52938ea5e6666e17599 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Thu, 4 May 2017 00:10:25 -0700 Subject: decompile time_events --- include/asm.inc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index d0fe6e354..416917fa6 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -356,7 +356,7 @@ s16 sub_810CAE4(u8, struct Pokeblock *); void sub_810CC80(void); // asm/time_events.o -u8 sub_810D32C(void); +u8 IsMirageIslandPresent(void); // asm/field_specials.o void ResetCyclingRoadChallengeData(void); -- cgit v1.2.3 From e22b9c54f123d4443829b96948b4110d9379a816 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 5 May 2017 22:09:13 -0700 Subject: decompile some pokemon functions --- include/asm.inc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 416917fa6..3cc54f6c1 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -17,7 +17,7 @@ void sub_8032AA8(u8 index, int i); u16 SpeciesToNationalPokedexNum(u16); // asm/pokemon_3.o -void DrawSpindaSpots(u16, u32, void *, u8); +void DrawSpindaSpots(u16, u32, u8 *, u8); u8 sub_803FC58(u16); void AdjustFriendship(struct Pokemon *, u8); void sub_80408BC(); -- cgit v1.2.3 From 8795103ac91814ab14ab8b0f68de987336c93d73 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sun, 7 May 2017 00:41:52 +0200 Subject: Decompile cycling field specials --- include/asm.inc.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 3cc54f6c1..430664517 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -414,6 +414,9 @@ void sub_8134AC0(void *); // src/player_pc.o void NewGameInitPCItems(void); +// src/diploma.o +void sub_8145D88(void); + // asm/intro_credits_graphics.o void load_intro_part2_graphics(/*TODO: arg types*/); void sub_8148C78(/*TODO: arg types*/); -- cgit v1.2.3 From 91208b74b8e7cf6c18526417d7a3c093c955c1fe Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sun, 7 May 2017 14:42:45 +0200 Subject: Start decompiling easy_chat --- include/asm.inc.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 430664517..da5c02113 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -321,9 +321,8 @@ void sub_80C8F34(u8); // asm/easy_chat.o void sub_80E6764(void); -void sub_80EB3FC(u8 *, u16); +u8* sub_80EB3FC(u8 *, u16); u8 ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16, u16); -u16 sub_80EB72C(u16); // asm/pokenav.o void sub_80EBA5C(void); -- cgit v1.2.3 From 00c64ddd66d1cf733f71d4e2104ae9f12108486d Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Mon, 8 May 2017 22:06:49 +0200 Subject: Decompile sub_803037C --- include/asm.inc.h | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index da5c02113..582c3ebb7 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -10,20 +10,23 @@ void sub_80157C4(u8 index); u8 sub_8015A98(u8, u8, u8); u8 sub_8018324(u8, u8, u8, u8, u16); +// asm/battle_5.o +void sub_802C098(); +void sub_802E3E4(u8, int); +void nullsub_8(u8); + // asm/battle_7.o void sub_8032AA8(u8 index, int i); // src/pokemon_3.o u16 SpeciesToNationalPokedexNum(u16); - -// asm/pokemon_3.o void DrawSpindaSpots(u16, u32, u8 *, u8); u8 sub_803FC58(u16); void AdjustFriendship(struct Pokemon *, u8); void sub_80408BC(); void current_map_music_set__default_for_battle(u16); -// asm/util.o +// src/util.o void StoreWordInTwoHalfwords(u16 *, u32); void LoadWordFromTwoHalfwords(u16 *, u32 *); @@ -157,7 +160,7 @@ void sub_806FA18(u8 taskId); // src/party_menu.o void sub_806E834(); -// asm/rom_8077ABC.o +// src/rom_8077ABC.o u8 battle_side_get_owner(u8); u8 battle_get_per_side_status(u8); u8 battle_get_side_with_given_state(u8); @@ -211,6 +214,9 @@ void sub_8089A70(void); void sub_808A004(); void sub_808AB90(void); +// asm/rom_8094928.o +u8 pokemon_order_func(u8); + // asm/pokemon_storage_system.o void sub_80961D8(void); @@ -354,7 +360,7 @@ s16 sub_810CAE4(u8, struct Pokeblock *); // asm/fldeff_flash.o void sub_810CC80(void); -// asm/time_events.o +// src/time_events.o u8 IsMirageIslandPresent(void); // asm/field_specials.o @@ -374,6 +380,10 @@ void sub_811AABC(u8); void sub_811AAD8(u8); u8 sub_811AAE8(void); +// asm/battle_message.o +void get_battle_strings_(u8 *); +void sub_8120FFC(const u8 *, u8 *); + // src/mystery_event_script.o u32 sub_812613C(u8 *); void sub_8126160(u8); -- cgit v1.2.3 From f6e3598f5efbda472c6605c94b5597d1196ea619 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Mon, 8 May 2017 22:37:45 +0200 Subject: Decompile ShowPokedexCryScreen --- include/asm.inc.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 582c3ebb7..23156e756 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -375,6 +375,13 @@ void sub_810FA54(void); // asm/battle_records.o void InitLinkBattleRecords(void); +// asm/pokedex_cry_screen.o +u8 sub_8119E3C(struct CryRelatedStruct *, u8); +void sub_8119F88(u8 a); +void sub_811A050(u16 species); +u8 ShowPokedexCryScreen(struct CryRelatedStruct *, u8); +void DestroyCryMeterNeedleSprite(); + // asm/battle_transition.o void sub_811AABC(u8); void sub_811AAD8(u8); -- cgit v1.2.3 From e6868bbdb2b9a0f00085029817d3a451781973cd Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Mon, 8 May 2017 13:55:31 -0700 Subject: decompile roamer.s --- include/asm.inc.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 23156e756..eb3cec985 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -416,14 +416,6 @@ u8 IsThereStorageSpaceForDecoration(u8); u8 sub_8134074(u8); s8 sub_81340A8(u8); -// asm/roamer.o -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); - // asm/battle_tower.o void sub_8134AC0(void *); -- cgit v1.2.3 From 964b665d2a17295ae3a06be0439ef6ae5ccc3444 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Tue, 9 May 2017 00:24:51 -0700 Subject: name mail_data.c functions --- include/asm.inc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index eb3cec985..11d4e150e 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -236,8 +236,8 @@ bool8 sub_80A212C(u8, u8, u8); void sub_80A2178(void); // asm/mail_data.o -void sub_80A2B18(void); -u16 sub_80A2D64(u16, u8 *); +void ClearMailData(void); +u16 MailSpeciesToSpecies(u16, u8 *); // src/map_name_popup.o void ShowMapNamePopup(void); -- cgit v1.2.3 From 60cf06cccacb692bbd2270b08ad0d583a8a76090 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Tue, 9 May 2017 01:12:59 -0700 Subject: name new-game functions --- include/asm.inc.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 11d4e150e..88c2f6d2f 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -218,7 +218,7 @@ void sub_808AB90(void); u8 pokemon_order_func(u8); // asm/pokemon_storage_system.o -void sub_80961D8(void); +void ResetPokemonStorageSystem(void); // asm/pokemon_icon.o u8 sub_809D3A4(u16 arg0, void (*)(struct Sprite *), int, u8 arg3, u32 arg4); @@ -245,7 +245,7 @@ void HideMapNamePopup(); // asm/item_menu.o void sub_80A3684(void); -void sub_80A3714(void); +void ClearItems(void); void sub_80A53F8(void); void sub_80A5B40(void); void sub_80A68CC(); @@ -254,7 +254,7 @@ void sub_80A7DD4(void); u8 sub_80A7E5C(u8); // asm/contest.o -void sub_80AB1B0(void); +void ResetLinkContestBoolean(void); void sub_80AE098(u8); void sub_80AE398(u8, u8); u32 sub_80AE770(u8, u8); @@ -269,16 +269,16 @@ void CreateDecorationShop1Menu(void *); void CreateDecorationShop2Menu(void *); // asm/secret_base.o -void sub_80BB5B4(void); +void ResetSecretBases(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 ClearTVShowData(void); void UpdateTVScreensOnMap(u32, u32); -void sub_80BDAB4(void); +void ResetGabbyAndTy(void); u8 sub_80BDEAC(u8 *); void sub_80BE160(TVShow *); void sub_80BE8EC(u16); @@ -326,7 +326,7 @@ void sub_80C8EBC(u8); void sub_80C8F34(u8); // asm/easy_chat.o -void sub_80E6764(void); +void InitEasyChatPhrases(void); u8* sub_80EB3FC(u8 *, u16); u8 ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16, u16); @@ -370,7 +370,7 @@ u8 sub_810D9EC(s8 *, s8 *, s16 *, s16 *); void ScriptAddElevatorMenuItem(u8, u8, u8, u8); void ScriptShowElevatorMenu(void); u8 GetLeadMonIndex(void); -void sub_810FA54(void); +void ResetFanClub(void); // asm/battle_records.o void InitLinkBattleRecords(void); -- cgit v1.2.3 From 3ee2e8ce97c33eb9bc837779c8a46b546d805367 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Tue, 9 May 2017 01:56:49 -0700 Subject: name more functions --- include/asm.inc.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 88c2f6d2f..1f32d50ec 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -245,7 +245,7 @@ void HideMapNamePopup(); // asm/item_menu.o void sub_80A3684(void); -void ClearItems(void); +void ClearBag(void); void sub_80A53F8(void); void sub_80A5B40(void); void sub_80A68CC(); @@ -353,7 +353,7 @@ u8 *CopyLocationName(u8 *dest, u8 location); void PlaySlotMachine(u8, void *); // asm/pokeblock.o -void sub_810C994(void); +void ClearPokeblocks(void); void sub_810CA6C(s32); s16 sub_810CAE4(u8, struct Pokeblock *); @@ -365,8 +365,8 @@ u8 IsMirageIslandPresent(void); // asm/field_specials.o void ResetCyclingRoadChallengeData(void); -bool32 sub_810D9B0(u16); -u8 sub_810D9EC(s8 *, s8 *, s16 *, s16 *); +bool32 CountSSTidalStep(u16); +u8 GetSSTidalLocation(s8 *, s8 *, s16 *, s16 *); void ScriptAddElevatorMenuItem(u8, u8, u8, u8); void ScriptShowElevatorMenu(void); u8 GetLeadMonIndex(void); @@ -410,7 +410,7 @@ u8 sub_8128124(u8 id); void sub_8132670(void); // asm/decoration_inventory.o -void sub_8133F80(void); +void ClearDecorationInventories(void); u8 sub_8133FE4(u8); u8 IsThereStorageSpaceForDecoration(u8); u8 sub_8134074(u8); -- cgit v1.2.3 From ca3da9a99901a20aa1b32a2bd9063fb49bb8612a Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Tue, 9 May 2017 03:46:55 -0700 Subject: file renaming --- include/asm.inc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 1f32d50ec..0c111a991 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -166,7 +166,7 @@ u8 battle_get_per_side_status(u8); u8 battle_get_side_with_given_state(u8); bool8 IsDoubleBattle(); -// asm/field_screeneffect.o +// asm/field_weather.o void SetWeather(u32); // src/field_fadetransition.o -- cgit v1.2.3 From e093a13a4b0e72f9f150d98bf0df8dab981316c2 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Sun, 14 May 2017 18:34:49 +0200 Subject: Remove last NONMATCHINGs in credits.c --- include/asm.inc.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 0c111a991..b3b2a58d3 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -422,6 +422,9 @@ void sub_8134AC0(void *); // src/player_pc.o void NewGameInitPCItems(void); +// asm/hall_of_fame.o +void sub_8143648(u16 paletteTag, u8 arg1); + // src/diploma.o void sub_8145D88(void); -- cgit v1.2.3 From 5ee5e6b87e5cd8d67f505aa94f76dd38f10e8486 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 17 May 2017 11:21:52 -0400 Subject: couple more functions in tv.text_80BF544; fix type declaration of sub_80BF77C --- include/asm.inc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 0c111a991..e13b4668a 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -292,7 +292,7 @@ u8 sub_80BF0B8(u32); void sub_80BF478(void); u16 sub_80BF674(u16 species); s8 sub_80BF720(TVShow *); -u8 sub_80BF77C(u32); +bool8 sub_80BF77C(u16); void sub_80BFD44(void *, u32, u8); void sub_80C0514(void *, u32, u8); -- cgit v1.2.3 From 14c5c79f3e3f903e3e7b34b5c0c9bb3b90e7ab75 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 17 May 2017 17:40:04 -0500 Subject: fill holes in party_menu.c and add battle_interface.h header --- include/asm.inc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 0c111a991..62a8ac1cc 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -158,7 +158,7 @@ bool8 pokemon_has_move(struct Pokemon *, u16); void sub_806FA18(u8 taskId); // src/party_menu.o -void sub_806E834(); +u8 sub_806E834(const u8 *message, u8 arg1); // src/rom_8077ABC.o u8 battle_side_get_owner(u8); -- cgit v1.2.3 From b97e078c6e84cf6cf5fe7539e4dcc2d24de494c8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 18 May 2017 13:38:20 -0400 Subject: sub_80BFD44 --- include/asm.inc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index e13b4668a..3931f7f1c 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -293,7 +293,7 @@ void sub_80BF478(void); u16 sub_80BF674(u16 species); s8 sub_80BF720(TVShow *); bool8 sub_80BF77C(u16); -void sub_80BFD44(void *, u32, u8); +void sub_80BFD44(u8 *, u32, u8); void sub_80C0514(void *, u32, u8); // src/tv.o -- cgit v1.2.3 From 7cc51195fc910852977a3213b39a45ed60aef8e8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 18 May 2017 21:01:25 -0400 Subject: sub_80BF0B8 --- include/asm.inc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 3931f7f1c..b5191b068 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -288,7 +288,7 @@ void sub_80BEA50(u16); void sub_80BEA5C(u16); bool8 GetPriceReduction(u8); void sub_80BEE84(u16); -u8 sub_80BF0B8(u32); +u8 sub_80BF0B8(int); void sub_80BF478(void); u16 sub_80BF674(u16 species); s8 sub_80BF720(TVShow *); -- cgit v1.2.3 From d4988da0cab8e88d390042d568641177ebb8ce41 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 18 May 2017 21:05:57 -0400 Subject: sub_80BF088 --- include/asm.inc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index b5191b068..c28050929 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -288,7 +288,7 @@ void sub_80BEA50(u16); void sub_80BEA5C(u16); bool8 GetPriceReduction(u8); void sub_80BEE84(u16); -u8 sub_80BF0B8(int); +size_t sub_80BF0B8(int); void sub_80BF478(void); u16 sub_80BF674(u16 species); s8 sub_80BF720(TVShow *); -- cgit v1.2.3 From b60ad4ccba10b7c570b633edcdb74c64055a0aa4 Mon Sep 17 00:00:00 2001 From: NieDzejkob Date: Sun, 14 May 2017 17:50:01 +0200 Subject: Make it build with all the label changes --- include/asm.inc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index c28050929..9a404db59 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -31,7 +31,7 @@ void StoreWordInTwoHalfwords(u16 *, u32); void LoadWordFromTwoHalfwords(u16 *, u32 *); // src/daycare.o -u8 daycare_count_pokemon(u8 *); +u8 daycare_count_pokemon(struct BoxPokemon *); // asm/daycare.o void sub_8041324(struct BoxPokemon *, void *); -- cgit v1.2.3 From 2774cb1bae07fe079c7faf53f697ea78ac8e76d4 Mon Sep 17 00:00:00 2001 From: NieDzejkob Date: Mon, 15 May 2017 14:53:28 +0200 Subject: Name some functions --- include/asm.inc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 9a404db59..2c28398b8 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -31,7 +31,7 @@ void StoreWordInTwoHalfwords(u16 *, u32); void LoadWordFromTwoHalfwords(u16 *, u32 *); // src/daycare.o -u8 daycare_count_pokemon(struct BoxPokemon *); +u8 Daycare_CountPokemon(struct BoxPokemon *); // asm/daycare.o void sub_8041324(struct BoxPokemon *, void *); -- cgit v1.2.3 From 67dd78ddc1989009efc68994fcdb11f688fc7092 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sat, 13 May 2017 03:00:49 +0200 Subject: Decompile more of easy_chat --- include/asm.inc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index c28050929..f92017b46 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -328,7 +328,7 @@ void sub_80C8F34(u8); // asm/easy_chat.o void InitEasyChatPhrases(void); u8* sub_80EB3FC(u8 *, u16); -u8 ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16, u16); +u8 *ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16, u16); // asm/pokenav.o void sub_80EBA5C(void); -- cgit v1.2.3 From 70b04997a09a45552a257623867acc1a8be6141e Mon Sep 17 00:00:00 2001 From: scnorton Date: Mon, 22 May 2017 19:31:47 -0400 Subject: IsCoordOutsideFieldObjectMovementRect and others --- include/asm.inc.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 3db79b128..8921d14cd 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -1,6 +1,14 @@ // src/rom3.o void sub_800C35C(void); +struct UnkStruct8060024 { + u8 outsideMovementRect:1; + u8 tileIsImpassable:1; + u8 elevationMismatch:1; + u8 pathBlockedByObject:1; + u8 pad_04:4; +}; + // asm/battle_2.o void sub_800E7C4(void); u8 b_first_side(u8, u8, u8); -- cgit v1.2.3 From c4ec5255085223ca39ed43387b2b74d62e1ee93f Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 23 May 2017 13:50:14 -0400 Subject: Another chunk of largely-identical FMO functions --- include/asm.inc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h index 8921d14cd..9bd8324ad 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -128,7 +128,7 @@ u8 sub_80608D0(u8); u8 GetStepInPlaceDelay32AnimId(u8 a); u8 GetStepInPlaceDelay16AnimId(u8); u8 GetStepInPlaceDelay8AnimId(u8 a); -u8 FieldObjectFaceOppositeDirection(void *, u8); +u8 FieldObjectFaceOppositeDirection(struct MapObject *, u8); u8 sub_80609D8(u8); u8 sub_8060A04(u8); u8 sub_8060A30(u8); -- cgit v1.2.3 From 4d2b22a899c11dfcacfec6889968ab01655a3fe3 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 26 May 2017 14:53:51 +0200 Subject: Add headers --- include/asm.inc.h | 449 ------------------------------------------------------ 1 file changed, 449 deletions(-) delete mode 100644 include/asm.inc.h (limited to 'include/asm.inc.h') diff --git a/include/asm.inc.h b/include/asm.inc.h deleted file mode 100644 index 9bd8324ad..000000000 --- a/include/asm.inc.h +++ /dev/null @@ -1,449 +0,0 @@ -// src/rom3.o -void sub_800C35C(void); - -struct UnkStruct8060024 { - u8 outsideMovementRect:1; - u8 tileIsImpassable:1; - u8 elevationMismatch:1; - u8 pathBlockedByObject:1; - u8 pad_04:4; -}; - -// asm/battle_2.o -void sub_800E7C4(void); -u8 b_first_side(u8, u8, u8); -void sub_80157C4(u8 index); - -// asm/battle_3.o -u8 sub_8015A98(u8, u8, u8); -u8 sub_8018324(u8, u8, u8, u8, u16); - -// asm/battle_5.o -void sub_802C098(); -void sub_802E3E4(u8, int); -void nullsub_8(u8); - -// asm/battle_7.o -void sub_8032AA8(u8 index, int i); - -// src/pokemon_3.o -u16 SpeciesToNationalPokedexNum(u16); -void DrawSpindaSpots(u16, u32, u8 *, u8); -u8 sub_803FC58(u16); -void AdjustFriendship(struct Pokemon *, u8); -void sub_80408BC(); -void current_map_music_set__default_for_battle(u16); - -// src/util.o -void StoreWordInTwoHalfwords(u16 *, u32); -void LoadWordFromTwoHalfwords(u16 *, u32 *); - -// src/daycare.o -u8 Daycare_CountPokemon(struct BoxPokemon *); - -// asm/daycare.o -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/pokeball.o -void CreatePokeballSprite(u8 r0, u8 r1, u8 r2, u8 r3, u8 s1, u8 s2, u8 s3, u16 s4); - -// asm/berry_blender.o -void sub_80516C4(u8, u16); - -// src/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 MapObjectTemplate *); -u8 show_sprite(u8, u8, u8); -u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 c, s16 d, u8 subpriority); -u8 sub_805B410(u8, u8, s16, s16, u8, u8); -void sub_805B55C(s16 a, s16 b); -void sub_805B710(u16 i, u16 i1); -void sub_805B980(struct MapObject *, u8); -void FieldObjectTurn(struct MapObject *, u8); -void FieldObjectTurnByLocalIdAndMap(u8, u8, u8, u8); -const 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 gpu_pal_allocator_reset__manage_upper_four(void); -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, u8); -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(u8 i); - -// asm/field_map_obj.o -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 *); -bool8 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(struct MapObject *, 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); - -// asm/field_tasks.o -void SetUpFieldTasks(); -void ActivatePerStepCallback(u8); -void ResetFieldTasksArgs(void); - -// asm/reset_rtc_screen.o -void CB2_InitResetRtcScreen(void); - -// asm/party_menu.o -void sub_806CB74(u8 taskId); -void sub_806CCE4(void); -void sub_806CD44(u8 taskId); -void sub_806D538(); -void sub_806D5A4(void); -void GetMonNickname(struct Pokemon *mon, u8 *nickname); -bool8 pokemon_has_move(struct Pokemon *, u16); -void sub_806FA18(u8 taskId); - -// src/party_menu.o -u8 sub_806E834(const u8 *message, u8 arg1); - -// src/rom_8077ABC.o -u8 battle_side_get_owner(u8); -u8 battle_get_per_side_status(u8); -u8 battle_get_side_with_given_state(u8); -bool8 IsDoubleBattle(); - -// asm/field_weather.o -void SetWeather(u32); - -// src/field_fadetransition.o -void pal_fill_black(); -void sub_8080990(void); -void sub_80809B0(void); - -// asm/field_fadetransition.o -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_8080F9C(void); - -// asm/rom_8080874.o -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); - -// asm/field_effect.o -u8 CreateTrainerSprite_BirchSpeech(u8, u16, u16, u8, void *); -void LoadTrainerGfx_TrainerCard(u8 gender, int, void *); -u8 CreateBirchSprite(u8, u8, u8); - -// asm/unknown_task.o -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); - -// asm/pokemon_menu.o -void sub_8089A70(void); -void sub_808A004(); -void sub_808AB90(void); - -// asm/rom_8094928.o -u8 pokemon_order_func(u8); - -// asm/pokemon_storage_system.o -void ResetPokemonStorageSystem(void); - -// asm/pokemon_icon.o -u8 sub_809D3A4(u16 arg0, void (*)(struct Sprite *), int, u8 arg3, u32 arg4); -u16 sub_809D4A8(u16); -void sub_809D510(struct Sprite *); -void sub_809D580(u16); -void sub_809D608(u16); - -// asm/pokemon_summary_screen.o -u8 pokemon_ailments_get_primary(u32); - -// src/script_movement.o -bool8 exec_movement(u8, u8, u8, u8 *); -bool8 sub_80A212C(u8, u8, u8); -void sub_80A2178(void); - -// asm/mail_data.o -void ClearMailData(void); -u16 MailSpeciesToSpecies(u16, u8 *); - -// src/map_name_popup.o -void ShowMapNamePopup(void); -void HideMapNamePopup(); - -// asm/item_menu.o -void sub_80A3684(void); -void ClearBag(void); -void sub_80A53F8(void); -void sub_80A5B40(void); -void sub_80A68CC(); -u8 sub_80A7D8C(u8 berry, int i, int i1); -void sub_80A7DD4(void); -u8 sub_80A7E5C(u8); - -// asm/contest.o -void ResetLinkContestBoolean(void); -void sub_80AE098(u8); -void sub_80AE398(u8, u8); -u32 sub_80AE770(u8, u8); -void sub_80AE82C(u8); -void sub_80AF668(void); -void sub_80B0F28(u8); -void sub_80B2D1C(void); - -// asm/shop.o -void CreatePokemartMenu(void *); -void CreateDecorationShop1Menu(void *); -void CreateDecorationShop2Menu(void *); - -// asm/secret_base.o -void ResetSecretBases(void); -u8 sub_80BBB24(void); -void sub_80BBCCC(u8); -u8 *sub_80BCCE8(void); -void sub_80BD674(void *, u32, u8); - -// asm/tv.o -void ClearTVShowData(void); -void UpdateTVScreensOnMap(u32, u32); -void ResetGabbyAndTy(void); -u8 sub_80BDEAC(u8 *); -void sub_80BE160(TVShow *); -void sub_80BE8EC(u16); -void UpdateMassOutbreakTimeLeft(u16); -void sub_80BE97C(u8); -void sub_80BEA50(u16); -void sub_80BEA5C(u16); -bool8 GetPriceReduction(u8); -void sub_80BEE84(u16); -size_t sub_80BF0B8(int); -void sub_80BF478(void); -u16 sub_80BF674(u16 species); -s8 sub_80BF720(TVShow *); -bool8 sub_80BF77C(u16); -void sub_80BFD44(u8 *, u32, u8); -void sub_80C0514(void *, u32, u8); - -// src/tv.o -void StartMassOutbreak(void); -void TVShowDone(void); - -// asm/contest_link_80C2020.o -void sub_80C2358(void); -void sub_80C48C8(void); -void sub_80C4940(void); -void sub_80C4980(u8); -u8 sub_80C4B34(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/contest_link_80C857C.o -void sub_80C8734(u8); -void sub_80C88AC(u8); -void sub_80C8E1C(u8); -void sub_80C8EBC(u8); -void sub_80C8F34(u8); - -// asm/easy_chat.o -void InitEasyChatPhrases(void); -u8* sub_80EB3FC(u8 *, u16); -u8 *ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16, u16); - -// asm/pokenav.o -void sub_80EBA5C(void); - -// src/mauville_old_man.o -void SetMauvilleOldMan(void); - -// asm/mauville_old_man.o -void sub_80F7F30(void); - -// asm/menu_helpers.o -bool8 sub_80F9344(void); -void sub_80F9368(void); -void sub_80F9438(void); - -// asm/region_map.o -void sub_80FBFB4(u8 *str, u8 region, u8); -void CopyMapName(); -u8 *CopyLocationName(u8 *dest, u8 location); - -// asm/slot_machine.o -void PlaySlotMachine(u8, void *); - -// asm/pokeblock.o -void ClearPokeblocks(void); -void sub_810CA6C(s32); -s16 sub_810CAE4(u8, struct Pokeblock *); - -// asm/fldeff_flash.o -void sub_810CC80(void); - -// src/time_events.o -u8 IsMirageIslandPresent(void); - -// asm/field_specials.o -void ResetCyclingRoadChallengeData(void); -bool32 CountSSTidalStep(u16); -u8 GetSSTidalLocation(s8 *, s8 *, s16 *, s16 *); -void ScriptAddElevatorMenuItem(u8, u8, u8, u8); -void ScriptShowElevatorMenu(void); -u8 GetLeadMonIndex(void); -void ResetFanClub(void); - -// asm/battle_records.o -void InitLinkBattleRecords(void); - -// asm/pokedex_cry_screen.o -u8 sub_8119E3C(struct CryRelatedStruct *, u8); -void sub_8119F88(u8 a); -void sub_811A050(u16 species); -u8 ShowPokedexCryScreen(struct CryRelatedStruct *, u8); -void DestroyCryMeterNeedleSprite(); - -// asm/battle_transition.o -void sub_811AABC(u8); -void sub_811AAD8(u8); -u8 sub_811AAE8(void); - -// asm/battle_message.o -void get_battle_strings_(u8 *); -void sub_8120FFC(const u8 *, u8 *); - -// src/mystery_event_script.o -u32 sub_812613C(u8 *); -void sub_8126160(u8); - -// asm/mystery_event_script.o -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/learn_move.o -void sub_8132670(void); - -// asm/decoration_inventory.o -void ClearDecorationInventories(void); -u8 sub_8133FE4(u8); -u8 IsThereStorageSpaceForDecoration(u8); -u8 sub_8134074(u8); -s8 sub_81340A8(u8); - -// asm/battle_tower.o -void sub_8134AC0(void *); - -// src/player_pc.o -void NewGameInitPCItems(void); - -// asm/hall_of_fame.o -void sub_8143648(u16 paletteTag, u8 arg1); - -// src/diploma.o -void sub_8145D88(void); - -// asm/intro_credits_graphics.o -void load_intro_part2_graphics(/*TODO: arg types*/); -void sub_8148C78(/*TODO: arg types*/); -void sub_8148CB0(u8); -void sub_8148E90(u8); -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*/); -- cgit v1.2.3