From b70f60b16dee66bc72d4c12e25a7a3a3688ab410 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Tue, 10 Jan 2023 07:45:54 -0800 Subject: [PATCH] Address most review comments --- asm/code_80958E8_1.s | 20 ++++++++++---------- asm/pelipper_board.s | 2 +- include/code_80958E8.h | 2 +- src/code_80958E8.c | 4 ++-- src/code_80958E8_1.c | 26 +++++++++++++------------- src/code_80972F4.c | 4 ++-- src/dungeon_movement_1.c | 9 +++++++-- src/pelipper_board.c | 4 ++-- src/pelipper_board_1.c | 12 ++++++------ src/wonder_mail_2_1.c | 6 +++--- src/wonder_mail_2_mid.c | 6 +++--- 11 files changed, 50 insertions(+), 45 deletions(-) diff --git a/asm/code_80958E8_1.s b/asm/code_80958E8_1.s index efaa254b0..63b909e98 100644 --- a/asm/code_80958E8_1.s +++ b/asm/code_80958E8_1.s @@ -621,7 +621,7 @@ CountFilledPelipperBoardSlots: _0809651A: lsls r0, r4, 24 lsrs r0, 24 - bl IsPelliperBoardSlotEmpty + bl IsPelipperBoardSlotEmpty lsls r0, 24 cmp r0, 0 bne _0809652A @@ -672,8 +672,8 @@ _0809656E: bx r1 thumb_func_end sub_8096538 - thumb_func_start GetPelliperBoardSlotInfo -GetPelliperBoardSlotInfo: + thumb_func_start GetPelipperBoardSlotInfo +GetPelipperBoardSlotInfo: lsls r0, 24 lsrs r0, 24 ldr r2, _08096588 @@ -686,10 +686,10 @@ GetPelliperBoardSlotInfo: bx lr .align 2, 0 _08096588: .4byte gUnknown_203B490 - thumb_func_end GetPelliperBoardSlotInfo + thumb_func_end GetPelipperBoardSlotInfo - thumb_func_start IsPelliperBoardSlotEmpty -IsPelliperBoardSlotEmpty: + thumb_func_start IsPelipperBoardSlotEmpty +IsPelipperBoardSlotEmpty: push {lr} lsls r0, 24 lsrs r0, 24 @@ -712,10 +712,10 @@ _080965B0: _080965B2: pop {r1} bx r1 - thumb_func_end IsPelliperBoardSlotEmpty + thumb_func_end IsPelipperBoardSlotEmpty - thumb_func_start ResetPelliperBoardSlot -ResetPelliperBoardSlot: + thumb_func_start ResetPelipperBoardSlot +ResetPelipperBoardSlot: push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -746,7 +746,7 @@ ResetPelliperBoardSlot: bx r0 .align 2, 0 _080965F0: .4byte gUnknown_203B490 - thumb_func_end ResetPelliperBoardSlot + thumb_func_end ResetPelipperBoardSlot thumb_func_start sub_80965F4 sub_80965F4: diff --git a/asm/pelipper_board.s b/asm/pelipper_board.s index c13a5027e..30bfd2085 100644 --- a/asm/pelipper_board.s +++ b/asm/pelipper_board.s @@ -135,7 +135,7 @@ sub_802EC10: movs r0, 0x4 str r0, [r1] ldrb r0, [r2, 0x8] - bl GetPelliperBoardSlotInfo + bl GetPelipperBoardSlotInfo bl IsMailinJobSlot lsls r0, 24 cmp r0, 0 diff --git a/include/code_80958E8.h b/include/code_80958E8.h index 43e808e85..b78845ca3 100644 --- a/include/code_80958E8.h +++ b/include/code_80958E8.h @@ -13,7 +13,7 @@ struct unkStruct_203B490 { // size: 0x330? /* 0x0 */ struct WonderMail mailboxSlots[4]; - /* 0x50 */ struct WonderMail pelliperBoardJobs[8]; + /* 0x50 */ struct WonderMail pelipperBoardJobs[8]; /* 0xF0 */ struct WonderMail jobSlots[8]; u8 unk190[0x28]; u8 unk1B8[0x78]; diff --git a/src/code_80958E8.c b/src/code_80958E8.c index d70c8bf74..0dbaa6f0c 100644 --- a/src/code_80958E8.c +++ b/src/code_80958E8.c @@ -20,7 +20,7 @@ extern u8 xxx_bit_lut_lookup_8091E50(u8 ,u8 ); extern u32 GetMaxItemCount(u8); extern bool8 sub_803C0DC(s16); extern void ResetMailboxSlot(u8); -extern void ResetPelliperBoardSlot(u8); +extern void ResetPelipperBoardSlot(u8); extern void ResetJobSlot(u8); extern bool8 ValidateWonderMail(struct WonderMail *); @@ -46,7 +46,7 @@ void InitializeMailJobsNews(void) } for(index = 0; index < 8; index++) { - ResetPelliperBoardSlot(index); + ResetPelipperBoardSlot(index); } for(index = 0; index < 8; index++) { diff --git a/src/code_80958E8_1.c b/src/code_80958E8_1.c index f49f4833c..a09ed9148 100644 --- a/src/code_80958E8_1.c +++ b/src/code_80958E8_1.c @@ -24,7 +24,7 @@ extern void sub_8096C80(void); extern void sub_8096D24(void); extern void sub_80965F4(); extern void SortPelipperJobs(); -extern struct WonderMail *GetPelliperBoardSlotInfo(u8); +extern struct WonderMail *GetPelipperBoardSlotInfo(u8); u8 sub_8097318(s16 param_1); extern u8 sub_8095B28(struct WonderMail *); @@ -39,14 +39,14 @@ void SortPelipperJobs(void) { for(index2 = index1 + 1; index2 < 8; index2++) { - if(gUnknown_203B490->pelliperBoardJobs[index2].mailType != WONDER_MAIL_TYPE_NONE) + if(gUnknown_203B490->pelipperBoardJobs[index2].mailType != WONDER_MAIL_TYPE_NONE) { - if((gUnknown_203B490->pelliperBoardJobs[index1].dungeon.dungeonIndex > gUnknown_203B490->pelliperBoardJobs[index2].dungeon.dungeonIndex) || - ((gUnknown_203B490->pelliperBoardJobs[index1].dungeon.dungeonIndex == gUnknown_203B490->pelliperBoardJobs[index2].dungeon.dungeonIndex) && (gUnknown_203B490->pelliperBoardJobs[index1].dungeon.dungeonFloor > gUnknown_203B490->pelliperBoardJobs[index2].dungeon.dungeonFloor))) + if((gUnknown_203B490->pelipperBoardJobs[index1].dungeon.dungeonIndex > gUnknown_203B490->pelipperBoardJobs[index2].dungeon.dungeonIndex) || + ((gUnknown_203B490->pelipperBoardJobs[index1].dungeon.dungeonIndex == gUnknown_203B490->pelipperBoardJobs[index2].dungeon.dungeonIndex) && (gUnknown_203B490->pelipperBoardJobs[index1].dungeon.dungeonFloor > gUnknown_203B490->pelipperBoardJobs[index2].dungeon.dungeonFloor))) { - mail = gUnknown_203B490->pelliperBoardJobs[index1]; - gUnknown_203B490->pelliperBoardJobs[index1] = gUnknown_203B490->pelliperBoardJobs[index2]; - gUnknown_203B490->pelliperBoardJobs[index2] = mail; + mail = gUnknown_203B490->pelipperBoardJobs[index1]; + gUnknown_203B490->pelipperBoardJobs[index1] = gUnknown_203B490->pelipperBoardJobs[index2]; + gUnknown_203B490->pelipperBoardJobs[index2] = mail; } } } @@ -62,12 +62,12 @@ void GeneratePelipperJobs(void) range = RandomRange(4,8); for(index = 0; index < 8; index++) { - gUnknown_203B490->pelliperBoardJobs[index].mailType = WONDER_MAIL_TYPE_NONE; + gUnknown_203B490->pelipperBoardJobs[index].mailType = WONDER_MAIL_TYPE_NONE; } index = 0; if (sub_8097318(0xe) != 0) { - mail = GetPelliperBoardSlotInfo(0); + mail = GetPelipperBoardSlotInfo(0); mail->mailType = 2; mail->missionType = WONDER_MAIL_MISSION_TYPE_UNK6; mail->unk2 = 1; @@ -85,7 +85,7 @@ void GeneratePelipperJobs(void) if (sub_8097318(0xf) != 0) { - mail = GetPelliperBoardSlotInfo(index); + mail = GetPelipperBoardSlotInfo(index); mail->mailType = 3; mail->missionType = WONDER_MAIL_MISSION_TYPE_UNK6; mail->unk2 = 2; @@ -102,7 +102,7 @@ void GeneratePelipperJobs(void) } if (sub_8097318(0x1c) != 0) { - mail = GetPelliperBoardSlotInfo(index); + mail = GetPelipperBoardSlotInfo(index); mail->mailType = 4; mail->missionType = WONDER_MAIL_MISSION_TYPE_UNK6; mail->unk2 = 3; @@ -118,8 +118,8 @@ void GeneratePelipperJobs(void) index++; } for (; index <= range; index++) { - if (sub_8095B28(&gUnknown_203B490->pelliperBoardJobs[index]) == 0) break; - gUnknown_203B490->pelliperBoardJobs[index].rewardType = RandomRange(MONEY, BLANK_4); + if (sub_8095B28(&gUnknown_203B490->pelipperBoardJobs[index]) == 0) break; + gUnknown_203B490->pelipperBoardJobs[index].rewardType = RandomRange(MONEY, BLANK_4); } sub_80965F4(); SortPelipperJobs(); diff --git a/src/code_80972F4.c b/src/code_80972F4.c index 3fbd8c195..c9e0da7d1 100644 --- a/src/code_80972F4.c +++ b/src/code_80972F4.c @@ -47,7 +47,7 @@ u32 RestoreMailInfo(u8 *r0, u32 size) } for(index = 0; index < 8; index++) { - RestoreWonderMail(&backup, &gUnknown_203B490->pelliperBoardJobs[index]); + RestoreWonderMail(&backup, &gUnknown_203B490->pelipperBoardJobs[index]); } for(index = 0; index < 8; index++) { @@ -92,7 +92,7 @@ u32 SaveMailInfo(u8 *r0, u32 size) } for(index = 0; index < 8; index++) { - SaveWonderMail(&backup, &gUnknown_203B490->pelliperBoardJobs[index]); + SaveWonderMail(&backup, &gUnknown_203B490->pelipperBoardJobs[index]); } for(index = 0; index < 8; index++) { diff --git a/src/dungeon_movement_1.c b/src/dungeon_movement_1.c index 96bb56e2e..ffcfb32ce 100644 --- a/src/dungeon_movement_1.c +++ b/src/dungeon_movement_1.c @@ -79,11 +79,16 @@ bool8 sub_807049C(struct DungeonEntity *pokemon, struct Position *pos) bool8 sub_8070564(struct DungeonEntity *pokemon, struct Position *pos) { u8 crossableTerrain; - register s32 crossableTerrain2 asm("r3"); struct MapTile *tile; u16 tileFlags; - register s32 tileFlags_0 asm("r0"); struct DungeonEntityData *entityData; +#ifndef NONMATCHING + register s32 tileFlags_0 asm("r0"); + register s32 crossableTerrain2 asm("r3"); +#else + s32 tileFlags_0; + s32 crossableTerrain2; +#endif entityData = pokemon->entityData; tile = GetMapTile_1(pos->x, pos->y); diff --git a/src/pelipper_board.c b/src/pelipper_board.c index 8862db079..1df26c3c0 100644 --- a/src/pelipper_board.c +++ b/src/pelipper_board.c @@ -90,7 +90,7 @@ extern void sub_802C10C(u32, u32, u32); extern void sub_802C28C(u32); extern void sub_802C39C(void); extern void CreatePelipperAcceptedStatusBox(u32); -extern struct WonderMail *GetPelliperBoardSlotInfo(u32); +extern struct WonderMail *GetPelipperBoardSlotInfo(u32); extern void sub_803B35C(struct WonderMail *, u32 *); extern void sub_802DE84(u32 *); extern void sub_802C860(u32); @@ -211,7 +211,7 @@ void sub_802EA58(void) sub_8012D60(&gUnknown_203B308->unk6C, gUnknown_203B308->unkBC, 0, 0, gUnknown_203B308->unk68, 2); break; case 7: - sub_803B35C(GetPelliperBoardSlotInfo(gUnknown_203B308->jobIndex), &gUnknown_203B308->unkC); + sub_803B35C(GetPelipperBoardSlotInfo(gUnknown_203B308->jobIndex), &gUnknown_203B308->unkC); gUnknown_203B308->unkC = 3; gUnknown_203B308->unk50 = 0; sub_802DE84(&gUnknown_203B308->unkC); diff --git a/src/pelipper_board_1.c b/src/pelipper_board_1.c index d711a4945..011b8c8b7 100644 --- a/src/pelipper_board_1.c +++ b/src/pelipper_board_1.c @@ -40,12 +40,12 @@ extern u32 sub_802C898(void); extern void sub_802C8F4(void); extern u32 sub_802DEE0(void); extern void sub_802DF24(void); -extern struct WonderMail *GetPelliperBoardSlotInfo(u8); +extern struct WonderMail *GetPelipperBoardSlotInfo(u8); extern u8 sub_802C4A4(void); extern void sub_8096C80(void); extern void sub_8096D24(void); extern void sub_8096A78(struct WonderMail*); -extern void ResetPelliperBoardSlot(u8); +extern void ResetPelipperBoardSlot(u8); extern void sub_80965F4(void); extern void sub_802C2D4(void); extern u8 sub_8012FD8(u32 *); @@ -127,26 +127,26 @@ void sub_802EDBC(void) { case 4: PlaySound(0x133); - mail = GetPelliperBoardSlotInfo(gUnknown_203B308->jobIndex); + mail = GetPelipperBoardSlotInfo(gUnknown_203B308->jobIndex); switch(mail->mailType) { case 2: gUnknown_203B308->unk4 = 1; - ResetPelliperBoardSlot(gUnknown_203B308->jobIndex); + ResetPelipperBoardSlot(gUnknown_203B308->jobIndex); sub_80965F4(); sub_802C2D4(); SetPelipperBoardState(3); break; case 3: gUnknown_203B308->unk4 = 2; - ResetPelliperBoardSlot(gUnknown_203B308->jobIndex); + ResetPelipperBoardSlot(gUnknown_203B308->jobIndex); sub_80965F4(); sub_802C2D4(); SetPelipperBoardState(3); break; case 4: gUnknown_203B308->unk4 = 3; - ResetPelliperBoardSlot(gUnknown_203B308->jobIndex); + ResetPelipperBoardSlot(gUnknown_203B308->jobIndex); sub_80965F4(); sub_802C2D4(); SetPelipperBoardState(3); diff --git a/src/wonder_mail_2_1.c b/src/wonder_mail_2_1.c index 7593e40c9..242c478da 100644 --- a/src/wonder_mail_2_1.c +++ b/src/wonder_mail_2_1.c @@ -170,7 +170,7 @@ extern void PlayMenuSoundEffect(u32); extern void sub_8013660(void *); extern void sub_8013848(u32 *, s32, u32, u32); extern void sub_8012D34(struct UnkTextStruct2 *, u32); -extern bool8 IsPelliperBoardSlotEmpty(u8); +extern bool8 IsPelipperBoardSlotEmpty(u8); extern void sub_802C910(u32); extern void sub_802CC00(void); extern void sub_802CC70(void); @@ -192,7 +192,7 @@ s32 sub_802C474(void) s32 counter = 0; for(index = 0; index < MAX_ACCEPTED_JOBS; index++) { - if(!IsPelliperBoardSlotEmpty(index)) + if(!IsPelipperBoardSlotEmpty(index)) { gUnknown_203B2E0->unk0[counter] = index; counter++; @@ -206,7 +206,7 @@ bool8 sub_802C4A4(void) s32 index; for(index = 0; index < MAX_ACCEPTED_JOBS; index++) { - if(!IsPelliperBoardSlotEmpty(index)) + if(!IsPelipperBoardSlotEmpty(index)) return FALSE; } return TRUE; diff --git a/src/wonder_mail_2_mid.c b/src/wonder_mail_2_mid.c index 38ce275c0..ca19cbdd9 100644 --- a/src/wonder_mail_2_mid.c +++ b/src/wonder_mail_2_mid.c @@ -25,7 +25,7 @@ extern void sub_80073B8(u32); extern void sub_80073E0(u32); extern s32 sub_8013800(u32 *, s32); -extern struct WonderMail *GetPelliperBoardSlotInfo(u32); +extern struct WonderMail *GetPelipperBoardSlotInfo(u32); extern void sub_803B35C(struct WonderMail *, u32 *); extern u8 gBulletinBoardText[]; extern bool8 IsMailinJobSlot(struct WonderMail *); @@ -348,11 +348,11 @@ void sub_802C39C(void) do { uVar1 = (gUnknown_203B2E0->unk0[gUnknown_203B2E0->unk26 * gUnknown_203B2E0->unk24 + iVar6]); - mail = GetPelliperBoardSlotInfo(uVar1); + mail = GetPelipperBoardSlotInfo(uVar1); local.unk0[0] = gUnknown_203B2E0->unk3C; local.unk4C = sub_8013800(&gUnknown_203B2E0->unk8,iVar6); sub_803B35C(mail,local.unk0); - if (IsMailinJobSlot(GetPelliperBoardSlotInfo(uVar1))) { + if (IsMailinJobSlot(GetPelipperBoardSlotInfo(uVar1))) { local.unk3C[11] = 2; } CreateRescueTitle(&local);