Game-Decompilation/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2024-11-23 13:20:02 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rename remaining yesnoprompt fields

Browse Source
This commit is contained in:
PikalaxALT 2023-12-28 11:49:06 -05:00
parent 5034296bd0
commit 165fa78434
No known key found for this signature in database
GPG Key ID: C7E3D40F3BAC7AEB
29 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/include/overlay_102.inc
View File

@ -71,7 +71,7 @@
.public YesNoPrompt_Destroy
.public YesNoPrompt_InitFromTemplate
.public YesNoPrompt_HandleInput
.public YesNoPrompt_GetUnk74_0
.public YesNoPrompt_IsInTouchMode
.public YesNoPrompt_Reset
.public Main_SetVBlankIntrCB
.public HBlankInterruptDisable

2
asm/include/overlay_108.inc
View File

@ -96,7 +96,7 @@
.public YesNoPrompt_InitFromTemplate
.public YesNoPrompt_InitFromTemplateWithPalette
.public YesNoPrompt_HandleInput
.public YesNoPrompt_GetUnk74_0
.public YesNoPrompt_IsInTouchMode
.public YesNoPrompt_Reset
.public sub_020183F0
.public sub_02018410

2
asm/include/overlay_109.inc
View File

@ -53,7 +53,7 @@
.public YesNoPrompt_Destroy
.public YesNoPrompt_InitFromTemplate
.public YesNoPrompt_HandleInput
.public YesNoPrompt_GetUnk74_0
.public YesNoPrompt_IsInTouchMode
.public YesNoPrompt_Reset
.public sub_020183F0
.public sub_02018410

2
asm/include/overlay_110.inc
View File

@ -56,7 +56,7 @@
.public YesNoPrompt_Destroy
.public YesNoPrompt_InitFromTemplateWithPalette
.public YesNoPrompt_HandleInput
.public YesNoPrompt_GetUnk74_0
.public YesNoPrompt_IsInTouchMode
.public YesNoPrompt_Reset
.public sub_020183F0
.public sub_02018410

2
asm/include/overlay_41.inc
View File

@ -99,7 +99,7 @@
.public YesNoPrompt_Destroy
.public YesNoPrompt_InitFromTemplate
.public YesNoPrompt_HandleInput
.public YesNoPrompt_GetUnk74_0
.public YesNoPrompt_IsInTouchMode
.public YesNoPrompt_Reset
.public sub_020183F0
.public sub_02018410

2
asm/include/overlay_43.inc
View File

@ -71,7 +71,7 @@
.public YesNoPrompt_Destroy
.public YesNoPrompt_InitFromTemplate
.public YesNoPrompt_HandleInput
.public YesNoPrompt_GetUnk74_0
.public YesNoPrompt_IsInTouchMode
.public YesNoPrompt_Reset
.public sub_020183F0
.public sub_02018410

2
asm/include/overlay_44.inc
View File

@ -107,7 +107,7 @@
.public YesNoPrompt_Destroy
.public YesNoPrompt_InitFromTemplate
.public YesNoPrompt_HandleInput
.public YesNoPrompt_SetUnk76_4
.public YesNoPrompt_SetIgnoreTouch
.public Main_SetVBlankIntrCB
.public HBlankInterruptDisable
.public SetKeyRepeatTimers

2
asm/include/overlay_56.inc
View File

@ -57,7 +57,7 @@
.public YesNoPrompt_Destroy
.public YesNoPrompt_InitFromTemplateWithPalette
.public YesNoPrompt_HandleInput
.public YesNoPrompt_GetUnk74_0
.public YesNoPrompt_IsInTouchMode
.public YesNoPrompt_Reset
.public sub_020183F0
.public sub_02018410

2
asm/include/overlay_57.inc
View File

@ -105,7 +105,7 @@
.public YesNoPrompt_Destroy
.public YesNoPrompt_InitFromTemplate
.public YesNoPrompt_HandleInput
.public YesNoPrompt_GetUnk74_0
.public YesNoPrompt_IsInTouchMode
.public YesNoPrompt_Reset
.public sub_02016EDC
.public sub_02016F2C

2
asm/include/overlay_59.inc
View File

@ -82,7 +82,7 @@
.public YesNoPrompt_Destroy
.public YesNoPrompt_InitFromTemplate
.public YesNoPrompt_HandleInput
.public YesNoPrompt_GetUnk74_0
.public YesNoPrompt_IsInTouchMode
.public YesNoPrompt_Reset
.public sub_020183F0
.public sub_02018410

2
asm/include/overlay_68.inc
View File

@ -74,7 +74,7 @@
.public YesNoPrompt_Destroy
.public YesNoPrompt_InitFromTemplate
.public YesNoPrompt_HandleInput
.public YesNoPrompt_GetUnk74_0
.public YesNoPrompt_IsInTouchMode
.public YesNoPrompt_Reset
.public sub_020183F0
.public sub_02018410

2
asm/include/overlay_73.inc
View File

@ -67,7 +67,7 @@
.public YesNoPrompt_Destroy
.public YesNoPrompt_InitFromTemplate
.public YesNoPrompt_HandleInput
.public YesNoPrompt_GetUnk74_0
.public YesNoPrompt_IsInTouchMode
.public YesNoPrompt_Reset
.public sub_020183F0
.public sub_02018410

2
asm/include/overlay_trainer_card_main.inc
View File

@ -59,7 +59,7 @@
.public YesNoPrompt_Destroy
.public YesNoPrompt_InitFromTemplate
.public YesNoPrompt_HandleInput
.public YesNoPrompt_GetUnk74_0
.public YesNoPrompt_IsInTouchMode
.public YesNoPrompt_Reset
.public sub_020183F0
.public sub_02018410

2
asm/overlay_102.s
View File

@ -7717,7 +7717,7 @@ _021EB156:
mov r0, #0x7a
lsl r0, r0, #2
ldr r0, [r5, r0]
bl YesNoPrompt_GetUnk74_0
bl YesNoPrompt_IsInTouchMode
mov r0, #0x7a
lsl r0, r0, #2
ldr r0, [r5, r0]

4
asm/overlay_108.s
View File

@ -867,7 +867,7 @@ _021E5FA2:
mov r0, #0x13
lsl r0, r0, #6
ldr r0, [r5, r0]
bl YesNoPrompt_GetUnk74_0
bl YesNoPrompt_IsInTouchMode
add r6, r0, #0
ldr r0, [r5, #0x10]
cmp r6, r0
@ -7569,7 +7569,7 @@ _021E9506:
_021E950C:
ldr r0, _021E9524 ; =0x00000514
ldr r0, [r5, r0]
bl YesNoPrompt_GetUnk74_0
bl YesNoPrompt_IsInTouchMode
str r0, [r5, #0x10]
ldr r0, _021E9524 ; =0x00000514
ldr r0, [r5, r0]

2
asm/overlay_109.s
View File

@ -3951,7 +3951,7 @@ _021E776E:
add r0, r5, #0
add r0, #0x8c
ldr r0, [r0]
bl YesNoPrompt_GetUnk74_0
bl YesNoPrompt_IsInTouchMode
ldr r1, [r5, #0xc]
cmp r0, r1
beq _021E7780

4
asm/overlay_41.s
View File

@ -3824,7 +3824,7 @@ _02247B9E:
_02247BA0:
ldr r0, _02247BB0 ; =0x000006B8
ldr r0, [r5, r0]
bl YesNoPrompt_GetUnk74_0
bl YesNoPrompt_IsInTouchMode
ldr r1, _02247BB4 ; =0x000006EC
str r0, [r5, r1]
add r0, r4, #0
@ -4137,7 +4137,7 @@ _02247E1A:
_02247E1C:
ldr r0, _02247E2C ; =0x000006B8
ldr r0, [r5, r0]
bl YesNoPrompt_GetUnk74_0
bl YesNoPrompt_IsInTouchMode
ldr r1, _02247E30 ; =0x000006EC
str r0, [r5, r1]
add r0, r4, #0

2
asm/overlay_43.s
View File

@ -1945,7 +1945,7 @@ ov43_0222AE2C: ; 0x0222AE2C
cmp r0, #1
bhi _0222AE58
ldr r0, [r4, #0x60]
bl YesNoPrompt_GetUnk74_0
bl YesNoPrompt_IsInTouchMode
str r0, [r5]
ldr r0, [r4, #0x60]
bl YesNoPrompt_Reset

2
asm/overlay_44.s
View File

@ -15431,7 +15431,7 @@ ov44_02231A14: ; 0x02231A14
bl ov44_02231A28
mov r1, #1
add r4, r0, #0
bl YesNoPrompt_SetUnk76_4
bl YesNoPrompt_SetIgnoreTouch
add r0, r4, #0
pop {r4, pc}
.balign 4, 0

2
asm/overlay_56.s
View File

@ -679,7 +679,7 @@ _021E6118:
add r0, r5, #0
add r0, #0xac
ldr r0, [r0]
bl YesNoPrompt_GetUnk74_0
bl YesNoPrompt_IsInTouchMode
add r6, r0, #0
ldrb r0, [r5, #0xa]
cmp r6, r0

2
asm/overlay_57.s
View File

@ -6237,7 +6237,7 @@ _0223AA46:
mov r0, #0x91
lsl r0, r0, #2
ldr r0, [r4, r0]
bl YesNoPrompt_GetUnk74_0
bl YesNoPrompt_IsInTouchMode
ldr r1, _0223AB50 ; =0x0000040C
str r0, [r4, r1]
sub r0, r1, #4

2
asm/overlay_59.s
View File

@ -2410,7 +2410,7 @@ _02238FDA:
mov r0, #0x92
lsl r0, r0, #2
ldr r0, [r5, r0]
bl YesNoPrompt_GetUnk74_0
bl YesNoPrompt_IsInTouchMode
str r0, [r5, #0x40]
mov r0, #0x92
lsl r0, r0, #2

2
asm/overlay_68.s
View File

@ -1008,7 +1008,7 @@ _021E6124:
mov r0, #0x46
lsl r0, r0, #2
ldr r0, [r5, r0]
bl YesNoPrompt_GetUnk74_0
bl YesNoPrompt_IsInTouchMode
mov r1, #0x6d
lsl r1, r1, #2
str r0, [r5, r1]

2
asm/overlay_73.s
View File

@ -1846,7 +1846,7 @@ ov73_021E6830: ; 0x021E6830
mov r0, #0xba
lsl r0, r0, #2
ldr r0, [r4, r0]
bl YesNoPrompt_GetUnk74_0
bl YesNoPrompt_IsInTouchMode
mov r1, #0xc5
lsl r1, r1, #2
str r0, [r4, r1]

2
asm/overlay_trainer_card_main.s
View File

@ -3614,7 +3614,7 @@ _021E7894:
mov r0, #0xcf
lsl r0, r0, #6
ldr r0, [r5, r0]
bl YesNoPrompt_GetUnk74_0
bl YesNoPrompt_IsInTouchMode
ldr r1, _021E78CC ; =0x0000310C
str r0, [r5, r1]
mov r0, #0xcf

8
include/yes_no_prompt.h
View File

@ -9,7 +9,7 @@
typedef enum YesNoResponse {
YESNORESPONSE_WAIT = 0,
YESNORESPONSE_YES,
YESNOREPSONSE_NO,
YESNORESPONSE_NO,
YESNORESPONSE_YES_TOUCH,
YESNORESPONSE_NO_TOUCH,
} YesNoResponse;
@ -21,7 +21,7 @@ typedef struct YesNoPromptTemplate {
u32 plttSlot;
u8 x;
u8 y;
u8 dummy : 4;
u8 ignoreTouchFlag : 4;
u8 initialCursorPos : 4;
u8 shapeParam;
} YesNoPromptTemplate;
@ -72,7 +72,7 @@ void YesNoPrompt_InitFromTemplate(YesNoPromptState *, const YesNoPromptTemplate
void YesNoPrompt_InitFromTemplateWithPalette(YesNoPromptState *, const YesNoPromptTemplate *, PaletteData *);
YesNoResponse YesNoPrompt_HandleInputForSave(YesNoPromptState *);
YesNoResponse YesNoPrompt_HandleInput(YesNoPromptState *);
int YesNoPrompt_GetUnk74_0(YesNoPromptState *);
void YesNoPrompt_SetUnk76_4(YesNoPromptState *yesno, int a1);
int YesNoPrompt_IsInTouchMode(YesNoPromptState *);
void YesNoPrompt_SetIgnoreTouch(YesNoPromptState *yesno, int a1);
#endif //POKEHEARTGOLD_YES_NO_PROMPT_H

18
src/alph_puzzle.c
View File

@ -88,7 +88,7 @@ typedef struct AlphPuzzleTile {
typedef struct AlphPuzzleData {
HeapID heapId;
int fieldSystemUnk10Cflag;
int menuIgnoreTouchFlag;
int unkState;
u16 subState;
u16 sceneTImer;
@ -564,7 +564,7 @@ static void AlphPuzzle_ScreenOff(void) {
}
static void AlphPuzzle_InitTextOptionsAndPuzzleIndex(AlphPuzzleData *data) {
data->fieldSystemUnk10Cflag = sub_020183F0(data->args->fieldSystemUnk10Cpointer);
data->menuIgnoreTouchFlag = sub_020183F0(data->args->fieldSystemUnk10Cpointer);
Options *options = Save_PlayerData_GetOptionsAddr(data->args->savedata);
data->textFrameDelay = Options_GetTextFrameDelay(options);
data->frame = Options_GetFrame(options);
@ -572,7 +572,7 @@ static void AlphPuzzle_InitTextOptionsAndPuzzleIndex(AlphPuzzleData *data) {
}
static void AlphPuzzle_Finish(AlphPuzzleData *data) {
sub_02018410(data->args->fieldSystemUnk10Cpointer, data->fieldSystemUnk10Cflag);
sub_02018410(data->args->fieldSystemUnk10Cpointer, data->menuIgnoreTouchFlag);
if (data->puzzleSolved) {
Save_VarsFlags_SetAlphPuzzleFlag(Save_VarsFlags_Get(data->args->savedata), data->puzzleIndex);
}
@ -686,7 +686,7 @@ static int AlphPuzzle_CheckInput(AlphPuzzleData *data) {
return ALPH_PUZZLE_STATE_WAIT_FOR_INPUT;
}
if (TouchscreenHitbox_FindRectAtTouchNew(sButtonHitboxes) == TS_HITBOX_ALPH_QUIT) {
data->fieldSystemUnk10Cflag = 1;
data->menuIgnoreTouchFlag = 1;
AlphPuzzle_CreateQuitTask(data);
PlaySE(SEQ_SE_DP_SELECT);
return ALPH_PUZZLE_STATE_QUIT;
@ -697,7 +697,7 @@ static int AlphPuzzle_CheckInput(AlphPuzzleData *data) {
}
AlphPuzzle_UpdateSelectedTile(data, tileIndex, TRUE);
PlaySE(SEQ_SE_GS_SEKIBAN_SENTAKU);
data->fieldSystemUnk10Cflag = 1;
data->menuIgnoreTouchFlag = 1;
return ALPH_PUZZLE_STATE_PICKUP_TILE;
}
@ -1243,7 +1243,7 @@ static void AlphPuzzle_Quit_CreateYesNoPrompt(AlphPuzzleData *data) {
unkStruct.bgId = 0;
unkStruct.x = 25;
unkStruct.y = 10;
unkStruct.dummy = data->fieldSystemUnk10Cflag;
unkStruct.ignoreTouchFlag = data->menuIgnoreTouchFlag;
unkStruct.initialCursorPos = 1;
unkStruct.shapeParam = 0;
YesNoPrompt_InitFromTemplateWithPalette(data->yesNoPrompt, &unkStruct, data->palette);
@ -1252,16 +1252,16 @@ static void AlphPuzzle_Quit_CreateYesNoPrompt(AlphPuzzleData *data) {
static AlphPuzzleStates AlphPuzzle_Quit_HandleYesNoPrompt(AlphPuzzleData *data) {
AlphPuzzleStates ret;
switch (YesNoPrompt_HandleInput(data->yesNoPrompt)) {
case 1:
case YESNORESPONSE_YES:
ret = ALPH_PUZZLE_STATE_FADE_OUT;
break;
case 2:
case YESNORESPONSE_NO:
ret = ALPH_PUZZLE_STATE_WAIT_FOR_INPUT;
break;
default:
return ALPH_PUZZLE_STATE_QUIT;
}
data->fieldSystemUnk10Cflag = YesNoPrompt_GetUnk74_0(data->yesNoPrompt);
data->menuIgnoreTouchFlag = YesNoPrompt_IsInTouchMode(data->yesNoPrompt);
YesNoPrompt_Reset(data->yesNoPrompt);
ClearFrameAndWindow2(&data->window[ALPH_WINDOW_CONFIRM_QUIT], 1);
FillWindowPixelBuffer(&data->window[ALPH_WINDOW_CONFIRM_QUIT], 0);

18
src/touch_save_app.c
View File

@ -306,7 +306,7 @@ static void ov30_0225D880(TouchSaveAppData *data) {
template.bgId = 6;
template.x = 26;
template.y = 10;
template.dummy = 0;
template.ignoreTouchFlag = 0;
template.initialCursorPos = 0;
BgClearTilemapBufferAndCommit(data->bgConfig, GF_BG_LYR_SUB_2);
@ -362,8 +362,8 @@ static BOOL TouchSaveApp_GetSaveConfirmation(TouchSaveAppData *data) {
static BOOL TouchSaveApp_HandleSaveConfirmation(TouchSaveAppData *data) {
switch (YesNoPrompt_HandleInputForSave(data->unk48)) {
case 1: // Yes
ov30_0225DC00(&data->fieldSystem->unk_10C, YesNoPrompt_GetUnk74_0(data->unk48));
case YESNORESPONSE_YES: // Yes
ov30_0225DC00(&data->fieldSystem->unk_10C, YesNoPrompt_IsInTouchMode(data->unk48));
YesNoPrompt_Destroy(data->unk48);
if (Save_FileExists(data->fieldSystem->saveData) == TRUE) {
data->state = TOUCHSAVEAPP_STATE_PRINT_OVERWRITE_MESSAGE;
@ -371,8 +371,8 @@ static BOOL TouchSaveApp_HandleSaveConfirmation(TouchSaveAppData *data) {
data->state = TOUCHSAVEAPP_STATE_PRINT_SAVING_MESSAGE;
}
break;
case 2: // No
ov30_0225DC00(&data->fieldSystem->unk_10C, YesNoPrompt_GetUnk74_0(data->unk48));
case YESNORESPONSE_NO: // No
ov30_0225DC00(&data->fieldSystem->unk_10C, YesNoPrompt_IsInTouchMode(data->unk48));
YesNoPrompt_Destroy(data->unk48);
return TRUE;
}
@ -398,13 +398,13 @@ static BOOL TouchSaveApp_GetOverwriteConfirmation(TouchSaveAppData *data) {
static BOOL TouchSaveApp_HandleOverwriteConfirmation(TouchSaveAppData *data) {
switch (YesNoPrompt_HandleInputForSave(data->unk48)) {
case 1: // Yes
ov30_0225DC00(&data->fieldSystem->unk_10C, YesNoPrompt_GetUnk74_0(data->unk48));
case YESNORESPONSE_YES: // Yes
ov30_0225DC00(&data->fieldSystem->unk_10C, YesNoPrompt_IsInTouchMode(data->unk48));
YesNoPrompt_Destroy(data->unk48);
data->state = TOUCHSAVEAPP_STATE_PRINT_SAVING_MESSAGE;
break;
case 2: // No
ov30_0225DC00(&data->fieldSystem->unk_10C, YesNoPrompt_GetUnk74_0(data->unk48));
case YESNORESPONSE_NO: // No
ov30_0225DC00(&data->fieldSystem->unk_10C, YesNoPrompt_IsInTouchMode(data->unk48));
YesNoPrompt_Destroy(data->unk48);
return TRUE;
}

6
src/yes_no_prompt.c
View File

@ -184,7 +184,7 @@ YesNoResponse YesNoPrompt_HandleInput(YesNoPromptState *yesno) {
if (yesno->result == 0) {
return YESNORESPONSE_YES;
}
return YESNOREPSONSE_NO;
return YESNORESPONSE_NO;
}
if (!(yesno->confirmSelectionTimer % 2)) {
if (!((yesno->confirmSelectionTimer / 2) % 2)) {
@ -197,7 +197,7 @@ YesNoResponse YesNoPrompt_HandleInput(YesNoPromptState *yesno) {
return YESNORESPONSE_WAIT;
}
BOOL YesNoPrompt_GetUnk74_0(YesNoPromptState *yesno) {
BOOL YesNoPrompt_IsInTouchMode(YesNoPromptState *yesno) {
return yesno->inTouchMode;
}
@ -209,7 +209,7 @@ void YesNoPrompt_Reset(YesNoPromptState *yesno) {
YesNoPrompt_Init(yesno, yesno->heapId);
}
void YesNoPrompt_SetUnk76_4(YesNoPromptState *yesno, int a1) {
void YesNoPrompt_SetIgnoreTouch(YesNoPromptState *yesno, int a1) {
GF_ASSERT(yesno != NULL);
yesno->ignoreTouch = a1;
}