falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move sub_080ADA04 to screen.h

This commit is contained in:
Tal Hayon 2021-12-28 05:41:26 +02:00
parent 5ddb348ceb
commit f4b261415c
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.h
View File

@ -224,6 +224,4 @@ extern void sub_080806BC(u32, u32, u32, u32);
extern void LoadObjPalette(Entity*, u32);
extern void sub_080ADA04(OAMCommand*, void*);
#endif

2
include/screen.h
View File

@ -82,4 +82,6 @@ extern BgControls gBgControls;
extern Screen gScreen;
extern OAMCommand gOamCmd;
extern void sub_080ADA04(OAMCommand*, void*);
#endif

14
src/demoScreen.c
View File

@ -110,16 +110,14 @@ NONMATCH("asm/non_matching/demoScreen/sub_080A2FD0.inc", void sub_080A2FD0(void)
val = 0;
keys = gInput.heldKeys;
switch (keys) {
case DPAD_RIGHT:
{
case DPAD_RIGHT: {
if (gChooseFileState.unk_0x0 == 0) {
val = 1;
gChooseFileState.unk_0x20 = 4;
SoundReq(SFX_TEXTBOX_CHOICE);
}
}
case DPAD_LEFT:
{
case DPAD_LEFT: {
if (gChooseFileState.unk_0x0 == 0) {
val = -1;
gChooseFileState.unk_0x20 = 0xfc;
@ -127,8 +125,7 @@ NONMATCH("asm/non_matching/demoScreen/sub_080A2FD0.inc", void sub_080A2FD0(void)
}
}
case START_BUTTON:
case A_BUTTON:
{
case A_BUTTON: {
if (gChooseFileState.unk_0x0 == 0) {
gMain.screen = 2;
gMain.funcIndex = gChooseFileState.unk_0x0;
@ -146,13 +143,12 @@ NONMATCH("asm/non_matching/demoScreen/sub_080A2FD0.inc", void sub_080A2FD0(void)
tmp = gSaveHeader->saveFileId;
tmp *= 0x68;
if (tmp != tmp3) {
if (tmp != tmp3) {
tmp5 = gChooseFileState.unk_0x20;
tmp5 += tmp3;
gChooseFileState.unk_0x10 = (tmp5 + (0x9c << 1)) % (0x9c << 1);
unk_0x0 = 1;
}
else {
} else {
unk_0x0 = 0;
}