Pascal naming

This commit is contained in:
Kermalis 2023-08-05 13:20:00 -04:00
parent c5e53c0e6b
commit 9917619da8
6 changed files with 18 additions and 17 deletions

View File

@ -5573,7 +5573,7 @@ _0809BC26:
lsrs r4, 31
bl sub_809B294
adds r0, r4, 0
bl KangaskhanStorage_New
bl CreateKangaskhanStorage
lsls r0, 24
cmp r0, 0
beq _0809BC5C
@ -5658,7 +5658,7 @@ _0809BCE8:
beq _0809BCF0
movs r0, 0x3
_0809BCF0:
bl KecleonBros_New
bl CreateKecleonBros
lsls r0, 24
cmp r0, 0
beq _0809BD10

View File

@ -133,8 +133,8 @@ gUnknown_81161B8: @ 81161B8
gUnknown_81161C8: @ 81161C8
.byte 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.4byte KangaskhanStorage_Delete
.4byte KangaskhanStorage_Callback
.4byte DeleteKangaskhanStorage
.4byte KangaskhanStorageCallback
.global gUnknown_81161D8
gUnknown_81161D8: @ 81161D8
@ -154,8 +154,8 @@ gUnknown_81161E8: @ 81161E8
gUnknown_81161F8: @ 81161F8
.byte 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.4byte KecleonBros_Delete
.4byte KecleonBros_Callback
.4byte DeleteKecleonBros
.4byte KecleonBrosCallback
.global gUnknown_8116208
gUnknown_8116208: @ 8116208

View File

@ -81,7 +81,8 @@ enum KangaskhanStorageStates
KANGASKHAN_STORAGE_IS_MONEY_USED_TM = 9,
};
u32 KangaskhanStorage_Callback(void);
u32 KangaskhanStorage_New(bool32 isAsleep);
u32 CreateKangaskhanStorage(bool32 isAsleep);
void DeleteKangaskhanStorage(void);
u32 KangaskhanStorageCallback(void);
#endif

View File

@ -82,10 +82,10 @@ enum KecleonStoreStates
KECLEON_STORE_CANT_SELL_ITEM = 13,
};
u32 KecleonBros_Callback(void);
void KecleonBros_Delete(void);
// mode corresponds to the enum: KecleonBrosMode
u32 KecleonBros_New(u32 mode);
u32 CreateKecleonBros(u32 mode);
void DeleteKecleonBros(void);
u32 KecleonBrosCallback(void);
bool32 sub_801A5D8(u32, s32, struct UnkTextStruct2_sub *, u32);
u32 sub_801A6E8(bool8);

View File

@ -105,7 +105,7 @@ void sub_8018AE4(void);
void AdvanceToKangaskhanStorageFallbackState(void);
void UpdateKangaskhanStorageState(u32);
u32 KangaskhanStorage_New(bool32 isAsleep)
u32 CreateKangaskhanStorage(bool32 isAsleep)
{
char *monName;
struct OpenedFile *faceFile;
@ -139,7 +139,7 @@ u32 KangaskhanStorage_New(bool32 isAsleep)
return 1;
}
u32 KangaskhanStorage_Callback(void)
u32 KangaskhanStorageCallback(void)
{
switch (gKangaskhanStorageWork->currState) {
case KANGASKHAN_STORAGE_INIT:
@ -190,7 +190,7 @@ u32 KangaskhanStorage_Callback(void)
return 0;
}
void KangaskhanStorage_Delete(void)
void DeleteKangaskhanStorage(void)
{
if (gKangaskhanStorageWork != NULL) {
CloseFile(gKangaskhanStorageWork->faceFile);

View File

@ -113,7 +113,7 @@ void Kecleon_SortItems(void);
void KecleonBros_SetState(u32);
void UpdateKecleonStoreDialogue(void);
u32 KecleonBros_New(u32 mode)
u32 CreateKecleonBros(u32 mode)
{
char *monName;
struct OpenedFile *faceFile;
@ -173,7 +173,7 @@ u32 KecleonBros_New(u32 mode)
return 1;
}
u32 KecleonBros_Callback(void)
u32 KecleonBrosCallback(void)
{
switch (gKecleonBrosWork->currState) {
case KECLEON_STORE_INIT:
@ -218,7 +218,7 @@ u32 KecleonBros_Callback(void)
return 0;
}
void KecleonBros_Delete(void)
void DeleteKecleonBros(void)
{
if (gKecleonBrosWork != NULL) {
CloseFile(gKecleonBrosWork->faceFile);