Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-09-12 21:37:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

more dungeon_init funcs

Browse Source
This commit is contained in:
Seth Barberee
2026-04-06 16:25:40 -07:00
parent 8a24ee8fa6
commit 3e2d83b552
4 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
asm/main_0204EFE0.s
View File

@@ -1,24 +0,0 @@
.include "asm/macros.inc"
.include "main_0204EFE0.inc"
.text
arm_func_start sub_0204F024
sub_0204F024: ; 0x0204F024
ldr r1, _0204F030 ; =PENDING_DUNGEON_ID
strb r0, [r1, #0xe]
bx lr
.align 2, 0
_0204F030: .word PENDING_DUNGEON_ID
arm_func_end sub_0204F024
arm_func_start sub_0204F034
sub_0204F034: ; 0x0204F034
stmdb sp!, {r3, lr}
mov r0, #0
mov r1, #0x28
bl LoadScriptVariableValue
mov r0, r0, lsl #0x18
mov r0, r0, asr #0x18
ldmia sp!, {r3, pc}
arm_func_end sub_0204F034

2
include/dungeon_init.h
View File

@@ -95,5 +95,7 @@ struct dungeon_init {
void sub_0204E974(s8 arg0);
void InitDungeonInit(struct dungeon_init* dg_init, s16 dungeon_idx);
s32 IsNoLossPenaltyDungeon(s16 dungeon_id);
void sub_0204F024(s32 value);
s8 sub_0204F034(void);
#endif //PMDSKY_DUNGEON_INIT

1
main.lsf
View File

@@ -88,7 +88,6 @@ Static main
Object src/main_0204DD80.o
Object asm/main_0204DE7C.o
Object src/dungeon_init.o
Object asm/main_0204EFE0.o
Object src/main_0204F050.o
Object asm/main_0204F0A0.o
Object src/main_0204FDFC.o

11
src/dungeon_init.c
View File

@@ -3,6 +3,7 @@
#include "enums.h"
#include "game_mode.h"
#include "main_0205BD14.h"
#include "nitro/types.h"
#include "progression.h"
#include "script_variable.h"
@@ -268,7 +269,7 @@ s32 IsNoLossPenaltyDungeon(s16 dungeon_id) {
return_val = TRUE;
break;
case DUNGEON_DEEP_STAR_CAVE_TEAM_ROGUE:
if(LoadScriptVariableValue(NULL, DUNGEON_STEAM_CAVE_PEAK) == 0) {
if(LoadScriptVariableValue(NULL, VAR_SIDE01_BOSS2ND) == 0) {
return_val = TRUE;
}
break;
@@ -278,3 +279,11 @@ s32 IsNoLossPenaltyDungeon(s16 dungeon_id) {
return return_val;
}
void sub_0204F024(s32 value) {
PENDING_DUNGEON_ID.field_0xE = value;
}
s8 sub_0204F034(void) {
return LoadScriptVariableValue(NULL, VAR_DUNGEON_ENTER_MODE);
}