dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync some function names with pokeemerald.

Browse Source
This commit is contained in:
ultima-soul
2019-10-06 13:06:13 -07:00
parent d4ba74fb34
commit 0873084a5d
18 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/easy_chat.s
+3 -3
View File
@@ -868,8 +868,8 @@ _080BDD2C: .4byte gUnknown_83ECED4
_080BDD30: .4byte 0x0000ffff
thumb_func_end sub_80BDCB8
thumb_func_start sub_80BDD34
sub_80BDD34: @ 80BDD34
thumb_func_start InitEasyChatPhrases
InitEasyChatPhrases: @ 80BDD34
push {r4-r7,lr}
movs r4, 0
ldr r5, _080BDE00 @ =gSaveBlock1Ptr
@@ -988,7 +988,7 @@ _080BDE18: .4byte 0x0000ffff
_080BDE1C: .4byte 0x00002cc4
_080BDE20: .4byte 0x00002cd0
_080BDE24: .4byte 0x00002f10
thumb_func_end sub_80BDD34
thumb_func_end InitEasyChatPhrases
thumb_func_start sub_80BDE28
sub_80BDE28: @ 80BDE28
asm/event_data.s
+3 -3
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_806E0D0
sub_806E0D0: @ 806E0D0
thumb_func_start InitEventData
InitEventData: @ 806E0D0
push {r4,lr}
ldr r4, _0806E108 @ =gSaveBlock1Ptr
ldr r0, [r4]
@@ -35,7 +35,7 @@ sub_806E0D0: @ 806E0D0
.align 2, 0
_0806E108: .4byte gSaveBlock1Ptr
_0806E10C: .4byte gUnknown_20370E0
thumb_func_end sub_806E0D0
thumb_func_end InitEventData
thumb_func_start sub_806E110
sub_806E110: @ 806E110
asm/overworld.s
+3 -3
View File
@@ -289,8 +289,8 @@ sub_8054E40: @ 8054E40
_08054E64: .4byte 0x0000406e
thumb_func_end sub_8054E40
thumb_func_start sub_8054E68
sub_8054E68: @ 8054E68
thumb_func_start ResetGameStats
ResetGameStats: @ 8054E68
push {r4,r5,lr}
movs r2, 0
ldr r5, _08054E8C @ =gSaveBlock1Ptr
@@ -311,7 +311,7 @@ _08054E74:
bx r0
.align 2, 0
_08054E8C: .4byte gSaveBlock1Ptr
thumb_func_end sub_8054E68
thumb_func_end ResetGameStats
thumb_func_start IncrementGameStat
IncrementGameStat: @ 8054E90
asm/player_pc.s
+3 -3
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_80EB658
sub_80EB658: @ 80EB658
thumb_func_start NewGameInitPCItems
NewGameInitPCItems: @ 80EB658
push {r4-r6,lr}
movs r4, 0
bl ClearPCItemSlots
@@ -48,7 +48,7 @@ _080EB6A0:
bx r0
.align 2, 0
_080EB6A8: .4byte gUnknown_8402220
thumb_func_end sub_80EB658
thumb_func_end NewGameInitPCItems
thumb_func_start sub_80EB6AC
sub_80EB6AC: @ 80EB6AC
asm/pokemon_storage_system.s
+3 -3
View File
@@ -1897,8 +1897,8 @@ _0808C7D8: .4byte mapldr_0808C6D8
_0808C7DC: .4byte CB2_ReturnToField
thumb_func_end sub_808C7B4
thumb_func_start sub_808C7E0
sub_808C7E0: @ 808C7E0
thumb_func_start ResetPokemonStorageSystem
ResetPokemonStorageSystem: @ 808C7E0
push {r4-r6,lr}
movs r0, 0
bl sub_808BA00
@@ -1954,7 +1954,7 @@ _0808C832:
bx r0
.align 2, 0
_0808C850: .4byte gUnknown_84186CD
thumb_func_end sub_808C7E0
thumb_func_end ResetPokemonStorageSystem
thumb_func_start sub_808C854
sub_808C854: @ 808C854
include/battle_records.h
-1
View File
@@ -4,7 +4,6 @@
extern u8 gRecordsWindowId;
void ClearPlayerLinkBattleRecords(void);
void InitLinkBattleRecords(void);
void UpdatePlayerLinkBattleRecords(s32 battlerId);
void ShowLinkBattleRecords(void);
void RemoveRecordsWindow(void);
include/easy_chat.h
+1 -1
View File
@@ -38,7 +38,7 @@ void InitializeEasyChatWordArray(u16 *words, u16 length);
void ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2);
bool8 ECWord_CheckIfOutsideOfValidRange(u16 word);
void sub_80BDE28(void);
void sub_80BDD34(void);
void InitEasyChatPhrases(void);
void EnableRareWord(u8);
#endif // GUARD_EASYCHAT_H
include/event_data.h
-1
View File
@@ -37,7 +37,6 @@ void sub_806E6FC(void);
void sub_806E2D0(void);
void sub_806E370(void);
bool32 sub_806E25C(void);
void sub_806E0D0(void);
void sub_806E190(void);
extern u16 gSpecialVar_0x8000;
include/item.h
+1 -1
View File
@@ -62,7 +62,7 @@ u8 ItemId_GetBattleUsage(u16 itemId);
ItemUseFunc ItemId_GetBattleFunc(u16 itemId);
u8 ItemId_GetSecondaryId(u16 itemId);
u16 itemid_get_market_price(u16 itemId);
void ClearItemSlotsInAllBagPockets(void);
void ClearBag(void);
void ClearPCItemSlots(void);
void sub_809A824(u16 itemId);
bool8 AddBagItem(u16 itemId, u16 amount);
include/overworld.h
+1 -1
View File
@@ -137,7 +137,7 @@ u8 get_map_light_from_warp0(void);
const struct MapHeader *warp1_get_mapheader(void);
void sub_8055F88(void);
void sub_8056788(void);
void sub_8054E68(void);
void ResetGameStats(void);
void Overworld_CreditsMainCB(void);
bool32 Overworld_DoScrollSceneForCredits(u8 *, const struct CreditsOverworldCmd *, u8);
include/player_pc.h
+1 -1
View File
@@ -21,6 +21,6 @@ struct PlayerPC_Unk_203AAC4
// Exported ROM declarations
void sub_816B060(u8 taskId);
void sub_80EB658(void);
void NewGameInitPCItems(void);
#endif //GUARD_PLAYER_PC_H
include/pokemon_storage_system.h
+1 -1
View File
@@ -14,7 +14,7 @@ u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request);
void sub_808BCB4(u8 boxId, u8 monPosition);
u8 * GetBoxNamePtr(u8 boxId);
void sub_808CE60(void);
void sub_808C7E0(void);
void ResetPokemonStorageSystem(void);
u8 StorageGetCurrentBox(void);
#endif // GUARD_POKEMON_STORAGE_SYSTEM_H
include/trainer_tower.h
+1 -1
View File
@@ -6,6 +6,6 @@ void InitTrainerTowerBattleStruct(void);
void FreeTrainerTowerBattleStruct(void);
u8 GetTrainerTowerTrainerFrontSpriteId(void);
void sub_815D838(void);
void sub_815EE0C(void);
void ResetTrainerTowerResults(void);
#endif //GUARD_TRAINER_TOWER_H
src/battle_records.c
+6 -6
View File
@@ -279,7 +279,7 @@ static void ResetBGPos(void)
ChangeBgY(3, 0, 0);
}
static void InitLinkBattleRecord(struct LinkBattleRecord * record)
static void ClearLinkBattleRecord(struct LinkBattleRecord *record)
{
CpuFill16(0, record, sizeof(*record));
record->name[0] = EOS;
@@ -289,12 +289,12 @@ static void InitLinkBattleRecord(struct LinkBattleRecord * record)
record->draws = 0;
}
static void InitLinkBattleRecords_(struct LinkBattleRecords * records)
static void ClearLinkBattleRecords(struct LinkBattleRecords *records)
{
s32 i;
for (i = 0; i < LINK_B_RECORDS_COUNT; i++)
InitLinkBattleRecord(&records->entries[i]);
ClearLinkBattleRecord(&records->entries[i]);
SetGameStat(GAME_STAT_LINK_BATTLE_WINS, 0);
SetGameStat(GAME_STAT_LINK_BATTLE_LOSSES, 0);
SetGameStat(GAME_STAT_LINK_BATTLE_DRAWS, 0);
@@ -404,7 +404,7 @@ static void AddOpponentLinkBattleRecord(struct LinkBattleRecords * records, cons
{
i = LINK_B_RECORDS_COUNT - 1;
record = &records->entries[LINK_B_RECORDS_COUNT - 1];
InitLinkBattleRecord(record);
ClearLinkBattleRecord(record);
StringCopyN(record->name, namebuf, OT_NAME_LENGTH);
record->trainerId = trainerId;
}
@@ -412,9 +412,9 @@ static void AddOpponentLinkBattleRecord(struct LinkBattleRecords * records, cons
SortLinkBattleRecords(records);
}
void InitLinkBattleRecords(void)
void ClearPlayerLinkBattleRecords(void)
{
InitLinkBattleRecords_(&gSaveBlock2Ptr->linkBattleRecords);
ClearLinkBattleRecords(&gSaveBlock2Ptr->linkBattleRecords);
}
static void IncTrainerCardWinCount(s32 battlerId)
src/item.c
+1 -1
View File
@@ -326,7 +326,7 @@ void ClearPCItemSlots(void)
}
}
void ClearItemSlotsInAllBagPockets(void)
void ClearBag(void)
{
u16 i;
src/new_game.c
+8 -8
View File
@@ -125,23 +125,23 @@ void NewGameInitData(void)
InitPlayerTrainerId();
PlayTimeCounter_Reset();
ClearPokedexFlags();
sub_806E0D0();
InitEventData();
ResetFameChecker();
SetMoney(&gSaveBlock1Ptr->money, 3000);
sub_8054E68();
InitLinkBattleRecords();
ResetGameStats();
ClearPlayerLinkBattleRecords();
sub_80A0904();
sub_80A0958();
sub_806E190();
gPlayerPartyCount = 0;
ZeroPlayerPartyMons();
sub_808C7E0();
ResetPokemonStorageSystem();
ClearRoamerData();
gSaveBlock1Ptr->registeredItem = 0;
ClearItemSlotsInAllBagPockets();
sub_80EB658();
ClearBag();
NewGameInitPCItems();
sub_809C794();
sub_80BDD34();
InitEasyChatPhrases();
sub_8113044();
copy_strings_to_sav1();
ResetMiniGamesResults();
@@ -150,7 +150,7 @@ void NewGameInitData(void)
WarpToPlayersRoom();
ScriptContext2_RunNewScript(EventScript_ResetAllMapFlags);
StringCopy(gSaveBlock1Ptr->rivalName, rivalName);
sub_815EE0C();
ResetTrainerTowerResults();
}
static void ResetMiniGamesResults(void)
src/quest_log.c
+1 -1
View File
@@ -986,7 +986,7 @@ void sub_8111368(void)
{
gUnknown_203ADFA = 2;
sub_806E6FC();
ClearItemSlotsInAllBagPockets();
ClearBag();
ClearPCItemSlots();
if (sub_8110AC8() == 1)
{
src/trainer_tower.c
+1 -1
View File
@@ -1458,7 +1458,7 @@ void sub_815EDF4(u32 * counter, u32 value)
*counter = value ^ gSaveBlock2Ptr->encryptionKey;
}
void sub_815EE0C(void)
void ResetTrainerTowerResults(void)
{
s32 i;