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

Merge branch 'main' of https://github.com/pret/pmd-sky

Browse Source
This commit is contained in:
AnonymousRandomPerson
2026-04-15 00:43:06 -04:00
parent 59d7b1f6e4 108cde045d
commit 78cb739ef4
6 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
asm/include/overlay_29_022DEBA4.inc
View File

@@ -159,7 +159,7 @@
.public ov29_023369F8
.public ov29_0233781C
.public ov29_0233785C
.public ov29_0233845C
.public ResetVictoryCounter
.public ov29_0233873C
.public ov29_023389C4
.public ov29_02338A4C

2
asm/overlay_29_022DEBA4.s
View File

@@ -763,7 +763,7 @@ _022DF660:
bl ov29_022E12F8
cmp r5, #0
bne _022DF68C
bl ov29_0233845C
bl ResetVictoryCounter
bl GenerateFloor
ldrb r0, [sb, #0x748]
bl GetTurnLimit

32
asm/overlay_29_023383A8.s
View File

@@ -3,38 +3,6 @@
.text
arm_func_start RevealAttackedTile
RevealAttackedTile: ; 0x02338430
stmdb sp!, {r4, lr}
mov r4, r0
mov r1, #1
bl TryRevealAttackedTrap
mov r0, r4
bl PositionIsOnHiddenStairs
cmp r0, #0
ldmeqia sp!, {r4, pc}
mov r0, #1
bl HiddenStairsTrigger
ldmia sp!, {r4, pc}
arm_func_end RevealAttackedTile
arm_func_start ov29_0233845C
ov29_0233845C: ; 0x0233845C
ldr r1, _02338474 ; =DUNGEON_PTR
ldr r0, _02338478 ; =0x00012AFE
ldr r1, [r1]
mov r2, #0
strh r2, [r1, r0]
bx lr
.align 2, 0
_02338474: .word DUNGEON_PTR
#ifdef JAPAN
_02338478: .word 0x00012A5A
#else
_02338478: .word 0x00012AFE
#endif
arm_func_end ov29_0233845C
arm_func_start ov29_0233847C
ov29_0233847C: ; 0x0233847C
stmdb sp!, {r4, lr}

9
include/overlay_29_023383A8.h Normal file
View File

@@ -0,0 +1,9 @@
#ifndef PMDSKY_OVERLAY_29_023383A8_H
#define PMDSKY_OVERLAY_29_023383A8_H
#include "dungeon_mode.h"
void RevealAttackedTile(struct position *pos);
void ResetVictoryCounter();
#endif //PMDSKY_OVERLAY_29_023383A8_H

1
main.lsf
View File

@@ -696,6 +696,7 @@ Overlay OVY_29
Object asm/overlay_29_02337EC0.o
Object src/overlay_29_02338350.o
Object src/overlay_29_0233836C.o
Object src/overlay_29_023383a8_0.o
Object asm/overlay_29_023383A8.o
Object src/overlay_29_02338548.o
Object src/overlay_29_02338560.o

21
src/overlay_29_023383a8_0.c Normal file
View File

@@ -0,0 +1,21 @@
#include "overlay_29_023383A8.h"
#include "dungeon.h"
#include "dungeon_mode.h"
extern void TryRevealAttackedTrap(struct position* pos, int param1);
extern bool32 PositionIsOnHiddenStairs(struct position* pos);
extern void HiddenStairsTrigger(bool32 param0);
void RevealAttackedTile(struct position *pos) {
TryRevealAttackedTrap(pos, 1);
if (PositionIsOnHiddenStairs(pos) == FALSE) {
return;
}
HiddenStairsTrigger(TRUE);
}
void ResetVictoryCounter() {
DUNGEON_PTR[0]->victory_counter = 0;
}