mirror of
https://github.com/pret/pmd-sky.git
synced 2026-03-21 17:25:15 -05:00
Decomped IsMissionSuspendedAndValid
Decomped by @slaw-22
This commit is contained in:
parent
a78c571138
commit
638865a207
|
|
@ -78,6 +78,7 @@
|
|||
.public IsItemInTimeDarkness
|
||||
.public IsItemInTreasureBoxes
|
||||
.public IsItemValidVeneer
|
||||
.public IsMissionSuspendedAndValid
|
||||
.public IsMonsterValid
|
||||
.public IsSpecialEpisodeBeaten
|
||||
.public IsSpecialEpisodeOpen
|
||||
|
|
@ -1,19 +1,8 @@
|
|||
.include "asm/macros.inc"
|
||||
.include "main_0205C854.inc"
|
||||
.include "main_0205C870.inc"
|
||||
|
||||
.text
|
||||
|
||||
arm_func_start IsMissionSuspendedAndValid
|
||||
IsMissionSuspendedAndValid: ; 0x0205C854
|
||||
stmdb sp!, {r3, lr}
|
||||
ldrb r1, [r0]
|
||||
cmp r1, #4
|
||||
movne r0, #0
|
||||
ldmneia sp!, {r3, pc}
|
||||
bl IsMissionValid
|
||||
ldmia sp!, {r3, pc}
|
||||
arm_func_end IsMissionSuspendedAndValid
|
||||
|
||||
arm_func_start sub_0205C870
|
||||
sub_0205C870: ; 0x0205C870
|
||||
cmp r0, #6
|
||||
|
|
@ -1,7 +1,10 @@
|
|||
#ifndef PMDSKY_MAIN_0205C73C_H
|
||||
#define PMDSKY_MAIN_0205C73C_H
|
||||
|
||||
#include "mission.h"
|
||||
|
||||
void sub_0205C73C(void);
|
||||
void sub_0205C75C(void);
|
||||
bool8 IsMissionSuspendedAndValid(struct mission *mission);
|
||||
|
||||
#endif //PMDSKY_MAIN_0205C73C_H
|
||||
|
|
|
|||
2
main.lsf
2
main.lsf
|
|
@ -162,7 +162,7 @@ Static main
|
|||
Object src/main_0205C440.o
|
||||
Object asm/main_0205C548.o
|
||||
Object src/main_0205C73C.o
|
||||
Object asm/main_0205C854.o
|
||||
Object asm/main_0205C870.o
|
||||
Object src/dungeon_init_2.o
|
||||
Object asm/main_0206A750.o
|
||||
Object src/main_0206C98C.o
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ extern u8 _022B6F10[];
|
|||
|
||||
extern void sub_020600CC(void);
|
||||
extern void ClearMissionData(struct mission* mission);
|
||||
extern bool8 IsMissionValid(struct mission *mission);
|
||||
|
||||
void sub_0205C73C(void)
|
||||
{
|
||||
|
|
@ -41,3 +42,13 @@ void sub_0205C75C(void)
|
|||
*(u32 *)&MISSION_DELIVER_LIST_PTR.unk18[i * 12 + 0x348] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
bool8 IsMissionSuspendedAndValid(struct mission *mission)
|
||||
{
|
||||
if (mission->status != MISSION_STATUS_SUSPENDED)
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
return IsMissionValid(mission);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user