From 4b4f716ae0c582068928a4ae7b31d9d10ac89eb5 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Mon, 8 May 2017 23:13:04 -0700 Subject: finish decompiling mail_data.s --- include/pokemon.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/pokemon.h b/include/pokemon.h index 8e216e04a..ae02de8ca 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -117,6 +117,7 @@ #define PARTY_SIZE 6 #define MAX_TOTAL_EVS 510 #define NUM_STATS 6 +#define UNOWN_FORM_COUNT 28 enum { NATURE_HARDY, -- 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') 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 ++++++++-------- include/dewford_trend.h | 2 +- include/new_game.h | 2 +- include/pokedex.h | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'include') 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); diff --git a/include/dewford_trend.h b/include/dewford_trend.h index 713d491b6..af1b61363 100644 --- a/include/dewford_trend.h +++ b/include/dewford_trend.h @@ -4,7 +4,7 @@ #define ARRAY_2007800 ((struct EasyChatPair *)(unk_2000000 + 0x7800)) #define ARRAY_2007900 ((struct EasyChatPair *)(unk_2000000 + 0x7900)) -void sub_80FA17C(void); +void InitDewfordTrends(void); void sub_80FA4E4(void *, u32, u8); #endif diff --git a/include/new_game.h b/include/new_game.h index 62e83f8f0..f59154af4 100644 --- a/include/new_game.h +++ b/include/new_game.h @@ -3,7 +3,7 @@ void write_word_to_mem(u32 var, u8 *dataPtr); void copy_word_to_mem(u8 *copyTo, u8 *copyFrom); -void set_player_trainer_id(void); +void InitPlayerTrainerId(void); void SetDefaultOptions(void); void ClearPokedexFlags(void); void sub_8052DA8(void); diff --git a/include/pokedex.h b/include/pokedex.h index fded1ec65..5dd44cd2f 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -55,7 +55,7 @@ struct PokedexView u8 unk65E[8]; }; -void sub_808C02C(void); +void ResetPokedex(void); void sub_808C0A0(void); void sub_808C0B8(void); void ClearPokedexView(struct PokedexView *pokedexView); -- 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 +++++----- include/vars.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'include') 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); diff --git a/include/vars.h b/include/vars.h index 5477ba98a..55df0a5e3 100644 --- a/include/vars.h +++ b/include/vars.h @@ -3,7 +3,7 @@ #define VAR_RECYCLE_GOODS 0x4020 #define VAR_REPEL_STEP_COUNT 0x4021 - +#define VAR_ICE_STEP_COUNT 0x4022 #define VAR_FIRST_POKE 0x4023 #define VAR_MIRAGE_RND_H 0x4024 #define VAR_MIRAGE_RND_L 0x4025 @@ -18,9 +18,9 @@ #define VAR_POKELOT_PRIZE 0x4045 #define VAR_NATIONAL_DEX 0x4046 #define VAR_SHROOMISH_SIZE_RECORD 0x4047 - +#define VAR_ASH_GATHER_COUNT 0x4048 #define VAR_BIRCH_STATE 0x4049 - +#define VAR_CRUISE_STEP_COUNT 0x404A #define VAR_POKELOT_RND1 0x404B #define VAR_POKELOT_RND2 0x404C -- 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 +- include/field_screeneffect.h | 43 ------------------------------------------- include/field_weather.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 include/field_screeneffect.h create mode 100644 include/field_weather.h (limited to 'include') 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 diff --git a/include/field_screeneffect.h b/include/field_screeneffect.h deleted file mode 100644 index af07c970d..000000000 --- a/include/field_screeneffect.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef GUARD_WEATHER_H -#define GUARD_WEATHER_H - -void sub_807C828(void); -void DoWeatherEffect(u8 effect); -void sub_807C988(u8 effect); -void sub_807C9B4(u8 effect); -void sub_807C9E4(u8); -void sub_807CA34(u8); -void sub_807CAE8(void); -void nullsub_38(void); -u32 sub_807CB0C(void); -void sub_807CB10(void); -void sub_807CC24(void); -void sub_807CCAC(void); -u8 sub_807CDC4(void); -u8 sub_807CE24(void); -u8 sub_807CE7C(void); -void nullsub_39(void); - -// ASM -void sub_807CEBC(u8, u8, s8); -void sub_807D1BC(u8, u8, u8, u8, u16); -void sub_807D304(int, u8, u16); -void sub_807D424(u8, u16); -// ... -void fade_screen(u8, u8); -// ... -void sub_807D78C(u8 tag); -void sub_807D874(u8); -// ... -void sub_807DB64(u8, u8); -// ... -void PlayRainSoundEffect(void); -// ... -void SetSav1Weather(u32); -u8 GetSav1Weather(void); -void sub_80806E4(void); -// ... -void DoCurrentWeather(void); -void sub_8080750(); - -#endif // GUARD_WEATHER_H diff --git a/include/field_weather.h b/include/field_weather.h new file mode 100644 index 000000000..af07c970d --- /dev/null +++ b/include/field_weather.h @@ -0,0 +1,43 @@ +#ifndef GUARD_WEATHER_H +#define GUARD_WEATHER_H + +void sub_807C828(void); +void DoWeatherEffect(u8 effect); +void sub_807C988(u8 effect); +void sub_807C9B4(u8 effect); +void sub_807C9E4(u8); +void sub_807CA34(u8); +void sub_807CAE8(void); +void nullsub_38(void); +u32 sub_807CB0C(void); +void sub_807CB10(void); +void sub_807CC24(void); +void sub_807CCAC(void); +u8 sub_807CDC4(void); +u8 sub_807CE24(void); +u8 sub_807CE7C(void); +void nullsub_39(void); + +// ASM +void sub_807CEBC(u8, u8, s8); +void sub_807D1BC(u8, u8, u8, u8, u16); +void sub_807D304(int, u8, u16); +void sub_807D424(u8, u16); +// ... +void fade_screen(u8, u8); +// ... +void sub_807D78C(u8 tag); +void sub_807D874(u8); +// ... +void sub_807DB64(u8, u8); +// ... +void PlayRainSoundEffect(void); +// ... +void SetSav1Weather(u32); +u8 GetSav1Weather(void); +void sub_80806E4(void); +// ... +void DoCurrentWeather(void); +void sub_8080750(); + +#endif // GUARD_WEATHER_H -- cgit v1.2.3 From c0c3d2c52ad839450041d1ca6a29691efc5c5d35 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Wed, 10 May 2017 00:13:21 +0200 Subject: Decompile some cable_club functions --- include/link.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/link.h b/include/link.h index f88cf8f5a..eb6f642bc 100644 --- a/include/link.h +++ b/include/link.h @@ -124,8 +124,10 @@ struct Link extern struct Link gLink; extern u16 gRecvCmds[CMD_LENGTH][MAX_LINK_PLAYERS]; +extern u8 gBlockSendBuffer[BLOCK_BUFFER_SIZE]; extern u16 gLinkType; extern u32 gLinkStatus; +extern u16 gBlockRecvBuffer[MAX_LINK_PLAYERS][BLOCK_BUFFER_SIZE / 2]; extern u16 gSendCmd[CMD_LENGTH]; extern u8 gShouldAdvanceLinkState; extern struct LinkPlayer gLinkPlayers[]; -- cgit v1.2.3 From b7efd72ac411800d709082dab220470544541c90 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Tue, 9 May 2017 19:33:43 -0700 Subject: name daily event functions --- include/dewford_trend.h | 2 +- include/flags.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/dewford_trend.h b/include/dewford_trend.h index af1b61363..a37de3389 100644 --- a/include/dewford_trend.h +++ b/include/dewford_trend.h @@ -4,7 +4,7 @@ #define ARRAY_2007800 ((struct EasyChatPair *)(unk_2000000 + 0x7800)) #define ARRAY_2007900 ((struct EasyChatPair *)(unk_2000000 + 0x7900)) -void InitDewfordTrends(void); +void InitDewfordTrend(void); void sub_80FA4E4(void *, u32, u8); #endif diff --git a/include/flags.h b/include/flags.h index 0c0cebc5f..56325dea6 100644 --- a/include/flags.h +++ b/include/flags.h @@ -51,6 +51,7 @@ #define SYS_BRAILLE_WAIT 0x851 #define SYS_BRAILLE_FLY 0x852 +#define SYS_SHOAL_ITEM 0x85F #define SYS_B_DASH 0x860 // got Running Shoes #define SYS_CTRL_OBJ_DELETE 0x861 #define SYS_RESET_RTC_ENABLE 0x862 -- cgit v1.2.3 From 242af849cb56ce0c4469c4e2be82a3ad5dbd3434 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Tue, 9 May 2017 20:39:43 -0700 Subject: minutes, not seconds --- include/berry.h | 2 +- include/global.berry.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/berry.h b/include/berry.h index 0013b4dba..f0acbe0ad 100644 --- a/include/berry.h +++ b/include/berry.h @@ -22,7 +22,7 @@ bool8 IsPlayerFacingPlantedBerryTree(void); bool8 TryToWaterBerryTree(void); void ClearBerryTrees(void); bool32 BerryTreeGrow(struct BerryTree *tree); -void BerryTreeTimeUpdate(int time); +void BerryTreeTimeUpdate(s32 minutes); void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 sparkle); void RemoveBerryTree(u8 id); u8 GetBerryTypeByBerryTreeId(u8 id); diff --git a/include/global.berry.h b/include/global.berry.h index b7938868d..18e022b12 100644 --- a/include/global.berry.h +++ b/include/global.berry.h @@ -45,7 +45,7 @@ struct BerryTree u8 berry; u8 stage:7; u8 growthSparkle:1; - u16 secondsUntilNextStage; + u16 minutesUntilNextStage; u8 berryYield; u8 regrowthCount:4; u8 watered1:1; -- cgit v1.2.3