diff --git a/asm/include/main_02034974.inc b/asm/include/main_02034974.inc index 089909e1..21cf761b 100644 --- a/asm/include/main_02034974.inc +++ b/asm/include/main_02034974.inc @@ -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 diff --git a/asm/include/main_0203C774.inc b/asm/include/main_0203C774.inc index 3db75319..62955dde 100644 --- a/asm/include/main_0203C774.inc +++ b/asm/include/main_0203C774.inc @@ -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 diff --git a/asm/include/main_0204AF98.inc b/asm/include/main_0204AF98.inc deleted file mode 100644 index 7cb7222e..00000000 --- a/asm/include/main_0204AF98.inc +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -.public _022AB0A0 diff --git a/asm/include/main_02058F24.inc b/asm/include/main_02058F24.inc index bc09f491..d17af061 100644 --- a/asm/include/main_02058F24.inc +++ b/asm/include/main_02058F24.inc @@ -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 diff --git a/asm/main_02034974.s b/asm/main_02034974.s index 2e9def1b..4d5b37f0 100644 --- a/asm/main_02034974.s +++ b/asm/main_02034974.s @@ -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] diff --git a/asm/main_0203C774.s b/asm/main_0203C774.s index 4b2d09f7..0ccbb746 100644 --- a/asm/main_0203C774.s +++ b/asm/main_0203C774.s @@ -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 diff --git a/asm/main_0204AF98.s b/asm/main_0204AF98.s deleted file mode 100644 index 0ef3e657..00000000 --- a/asm/main_0204AF98.s +++ /dev/null @@ -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 diff --git a/asm/main_02058F24.s b/asm/main_02058F24.s index 5a13173f..ae4edaba 100644 --- a/asm/main_02058F24.s +++ b/asm/main_02058F24.s @@ -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 diff --git a/include/options.h b/include/options.h index f3108f5b..5653305b 100644 --- a/include/options.h +++ b/include/options.h @@ -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 diff --git a/main.lsf b/main.lsf index 7cc12747..ba4fa80b 100644 --- a/main.lsf +++ b/main.lsf @@ -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 diff --git a/src/options.c b/src/options.c index 6febafe4..fe247e51 100644 --- a/src/options.c +++ b/src/options.c @@ -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; +}