Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-03-21 17:25:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

decomp TrySpawnDoughSeedPoke

Browse Source
This commit is contained in:
Seth Barberee 2026-01-03 12:02:10 -08:00
parent 44374b7673
commit af52c034e1
4 changed files with 39 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
asm/overlay_29_02338560.s
View File

@ -1,44 +0,0 @@
.include "asm/macros.inc"
.include "overlay_29_02338560.inc"
.text
; https://decomp.me/scratch/5EgdA
arm_func_start TrySpawnDoughSeedPoke
TrySpawnDoughSeedPoke: ; 0x02338560
stmdb sp!, {r3, lr}
ldr r0, _023385BC ; =DUNGEON_PTR
ldr r0, [r0]
add r0, r0, #0x4000
#ifdef JAPAN
ldrb r0, [r0, #0x24]
#else
ldrb r0, [r0, #0xc8]
#endif
cmp r0, #0
ldmeqia sp!, {r3, pc}
bl IsFullFloorFixedRoom
cmp r0, #0
bne _023385A4
ldr r1, _023385C0 ; =ov29_02352B5C
add r0, sp, #0
ldrh r2, [r1]
strh r2, [sp]
ldrh r1, [r1, #2]
strh r1, [sp, #2]
bl ov29_02344E88
_023385A4:
ldr r0, _023385BC ; =DUNGEON_PTR
mov r1, #0
ldr r0, [r0]
add r0, r0, #0x4000
#ifdef JAPAN
strb r1, [r0, #0x24]
#else
strb r1, [r0, #0xc8]
#endif
ldmia sp!, {r3, pc}
.align 2, 0
_023385BC: .word DUNGEON_PTR
_023385C0: .word ov29_02352B5C
arm_func_end TrySpawnDoughSeedPoke

6
include/overlay_29_02338560.h Normal file
View File

@ -0,0 +1,6 @@
#ifndef PMDSKY_OVERLAY_29_02338560_H
#define PMDSKY_OVERLAY_29_02338560_H
void TrySpawnDoughSeedPoke(void);
#endif /* ifndef PMDSKY_OVERLAY_29_02338560_H */

2
main.lsf
View File

@ -650,7 +650,7 @@ Overlay OVY_29
Object src/overlay_29_0233836C.o
Object asm/overlay_29_023383A8.o
Object src/overlay_29_02338548.o
Object asm/overlay_29_02338560.o
Object src/overlay_29_02338560.o
Object src/overlay_29_02338604.o
Object asm/overlay_29_0233861C.o
Object src/overlay_29_02340CAC.o

32
src/overlay_29_02338560.c Normal file
View File

@ -0,0 +1,32 @@
#include "overlay_29_02338560.h"
#include "dungeon.h"
#include "fixed_room_data_1.h"
extern u16 ov29_02352B5C[2];
void ov29_02344E88(s16 *param_1);
void TrySpawnDoughSeedPoke(void)
{
s16 arr[2];
#ifdef JAPAN
if (DUNGEON_PTR[0]->traps[24].id == TRAP_NULL_TRAP) {
#else
if (DUNGEON_PTR[0]->traps[65].id == TRAP_NULL_TRAP) {
#endif
return;
}
if (!IsFullFloorFixedRoom()) {
arr[0] = ov29_02352B5C[0];
arr[1] = ov29_02352B5C[1];
ov29_02344E88(arr);
}
#ifdef JAPAN
DUNGEON_PTR[0]->traps[24].id = TRAP_NULL_TRAP;
#else
DUNGEON_PTR[0]->traps[65].id = TRAP_NULL_TRAP;
#endif
}