Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-07-19 17:32:00 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

address review comments/add match from @DizzyEggg

Browse Source
This commit is contained in:
Seth Barberee 2025-04-27 10:19:06 -07:00
parent 058aa76a13
commit 08ca0fe91a
2 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/code_803C1B4.c
View File

@ -8,11 +8,11 @@ extern u8 *gMissionRankText[];
extern s32 gUnknown_80E80A0[];
void sub_803C37C(DungeonLocation *, u8, u8 *);
s32 sub_803C1B4(DungeonLocation *dungeon, u8 r1)
s32 sub_803C1B4(DungeonLocation *dungeon, u8 missionType)
{
s32 temp;
temp = sub_80908D8(dungeon);
if(r1 == 2)
if(missionType == 2)
{
temp += 2;
}
@ -21,26 +21,15 @@ s32 sub_803C1B4(DungeonLocation *dungeon, u8 r1)
return temp;
}
NAKED
u8 sub_803C1D0(DungeonLocation *dungeon, u8 missionType)
u8 sub_803C1D0(struct DungeonLocation *dungeon, u8 missionType)
{
asm_unified(
"\tpush {lr}\n"
"\tlsls r1, 24\n"
"\tlsrs r1, 24\n"
"\tbl sub_803C1B4\n"
"\tadds r1, r0, 0\n"
"\tlsrs r0, r1, 31\n"
"\tadds r0, r1, r0\n"
"\tasrs r1, r0, 1\n"
"\tlsls r0, r1, 24\n"
"\tlsrs r0, 24\n"
"\tcmp r0, 0x6\n"
"\tbls _0803C1EC\n"
"\tmovs r0, 0x6\n"
"_0803C1EC:\n"
"\tpop {r1}\n"
"\tbx r1");
s32 a = sub_803C1B4(dungeon, missionType);
a /= 2;
if ((u8)a >= 7) {
a = 6;
return a;
}
return a;
}
u8 *GetMissionRankText(u8 index)

2
src/ground_event.c
View File

@ -31,7 +31,7 @@ void AllocGroundEvents(void) {
DeleteGroundEvents();
}
void DeleteGroundEvents() {
void DeleteGroundEvents(void) {
s32 v1;
struct GroundEvent_sub* current;