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

Merge pull request #230 from slaw-22/Options2
Some checks are pending
build / build (push) Waiting to run
Details

Browse Source 
Decomp more options funcs
This commit is contained in:
AnonymousRandomPerson 2025-12-21 17:34:40 -05:00 committed by GitHub
commit 36e2373448
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 20 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/include/main_02034974.inc
View File

@ -227,8 +227,8 @@
.public sub_0204964C
.public sub_0204AB78
.public sub_0204AB98
.public sub_0204AF98
.public sub_0204AFAC
.public CopyFrameTypeOption
.public SetFrameTypeOption
.public sub_0204DA1C
.public sub_0204E210
.public sub_0204E3C8

2
asm/include/main_0203C774.inc
View File

@ -465,7 +465,7 @@
.public sub_0203931C
.public DebugPrintEventFlagSize
.public SetSpecialEpisodeOpenOld
.public sub_0204AF98
.public CopyFrameTypeOption
.public sub_0204CDB8
.public sub_0204E154
.public sub_0204E19C

2
asm/include/main_0204AF98.inc
View File

@ -1,2 +0,0 @@
#pragma once
.public _022AB0A0

2
asm/include/main_02058F24.inc
View File

@ -481,7 +481,7 @@
.public sub_0204A198
.public sub_0204A1A4
.public sub_0204AB18
.public sub_0204AF98
.public CopyFrameTypeOption
.public SetGameMode
.public sub_0204D018
.public sub_0204E210

4
asm/main_02034974.s
View File

@ -1476,7 +1476,7 @@ sub_02035CE4: ; 0x02035CE4
ldr r0, _02035DAC ; =_020AFDD8
ldr r0, [r0, #4]
add r0, r0, #0xa4
bl sub_0204AF98
bl CopyFrameTypeOption
ldr r0, _02035DAC ; =_020AFDD8
mvn r3, #1
ldr ip, [r0, #4]
@ -1849,7 +1849,7 @@ _02036250:
strb r0, [r1, #0xa4]
ldr r0, [r2, #4]
add r0, r0, #0xa4
bl sub_0204AFAC
bl SetFrameTypeOption
ldr r0, _0203630C ; =_020AFDD8
ldr r0, [r0, #4]
ldr r0, [r0, #0xa8]

2
asm/main_0203C774.s
View File

@ -16520,7 +16520,7 @@ _02049CD4:
mov r1, #9
add r0, sp, #0
str r1, [r2, #4]
bl sub_0204AF98
bl CopyFrameTypeOption
ldrb r0, [sp]
bl sub_02027180
ldr r0, _02049D34 ; =_020AFF54

24
asm/main_0204AF98.s
View File

@ -1,24 +0,0 @@
.include "asm/macros.inc"
.include "main_0204AF98.inc"
.text
arm_func_start sub_0204AF98
sub_0204AF98: ; 0x0204AF98
ldr r1, _0204AFA8 ; =_022AB0A0
ldrb r1, [r1, #9]
strb r1, [r0]
bx lr
.align 2, 0
_0204AFA8: .word _022AB0A0
arm_func_end sub_0204AF98
arm_func_start sub_0204AFAC
sub_0204AFAC: ; 0x0204AFAC
ldrb r1, [r0]
ldr r0, _0204AFBC ; =_022AB0A0
strb r1, [r0, #9]
bx lr
.align 2, 0
_0204AFBC: .word _022AB0A0
arm_func_end sub_0204AFAC

2
asm/main_02058F24.s
View File

@ -16001,7 +16001,7 @@ _02065F70:
bl UnloadOverlay
_02065FCC:
add r0, sp, #0
bl sub_0204AF98
bl CopyFrameTypeOption
ldrb r0, [sp]
bl sub_02027180
bl sub_020205F8

6
include/options.h
View File

@ -8,13 +8,13 @@ struct options {
u8 touch_screen;
u8 bottom_screen;
u8 top_screen;
u8 unk0;
u8 grids;
u8 speed;
u8 far_off_pals;
u8 damage_turn;
u8 d_pad_attack;
u8 check_direction;
u8 unk1;
u8 frame_type;
};
u8 GetDamageTurnOption();
@ -23,5 +23,7 @@ u8 GetCheckDirectionOption();
bool8 IsMapShownOnEitherScreen();
bool8 IsTeamStatsOnTopScreen();
bool8 IsTextLogOnTopScreen();
void CopyFrameTypeOption(u8* dst);
void SetFrameTypeOption(u8* new_ft);
#endif //PMDSKY_OPTIONS

1
main.lsf
View File

@ -79,7 +79,6 @@ Static main
Object src/main_0203C760.o
Object asm/main_0203C774.o
Object src/options.o
Object asm/main_0204AF98.o
Object src/game_mode.o
Object src/script_variable.o
Object asm/main_rodata_0209CECC.o

8
src/options.c
View File

@ -38,3 +38,11 @@ bool8 IsTextLogOnTopScreen() {
return FALSE;
}
}
void CopyFrameTypeOption(u8* dst) {
*dst = _022AB0A0.frame_type;
}
void SetFrameTypeOption(u8* new_ft) {
_022AB0A0.frame_type = *new_ft;
}