diff options
| author | Tetrable <atifhuss386@gmail.com> | 2019-01-03 02:28:18 +0000 |
|---|---|---|
| committer | Tetrable <atifhuss386@gmail.com> | 2019-01-03 02:28:18 +0000 |
| commit | 30e7ac0dcadc1ca15d56dc24e79489be63527357 (patch) | |
| tree | bb804c19ca84b582f7517af645bfc8665b26a1e1 /src/decoration.c | |
| parent | 50aa222aff56499aeef1c64c9191f53b9b20a1de (diff) | |
| parent | b471bba55e7e3743fa8cdb796cba57c41f5bfdbc (diff) | |
Fix merge conflicts
Diffstat (limited to 'src/decoration.c')
| -rw-r--r-- | src/decoration.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/decoration.c b/src/decoration.c index 438f2cbd1..c4c3d6171 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1629,7 +1629,7 @@ void sub_8128950(u8 taskId) void sub_81289D0(u8 taskId) { DisplayYesNoMenu(); - sub_8121F68(taskId, &gUnknown_085A72C4); + DoYesNoFuncWithChoice(taskId, &gUnknown_085A72C4); } void sub_81289F0(u8 taskId) @@ -1694,7 +1694,7 @@ void sub_8128AAC(u8 taskId) void sub_8128B80(u8 taskId) { DisplayYesNoMenu(); - sub_8121F68(taskId, &gUnknown_085A72CC); + DoYesNoFuncWithChoice(taskId, &gUnknown_085A72CC); } void sub_8128BA0(u8 taskId) @@ -2589,7 +2589,7 @@ void sub_812A0E8(u8 taskId) void sub_812A1A0(u8 taskId) { DisplayYesNoMenu(); - sub_8121F68(taskId, &gUnknown_085A7348); + DoYesNoFuncWithChoice(taskId, &gUnknown_085A7348); } void sub_812A1C0(u8 taskId) @@ -2602,7 +2602,7 @@ void sub_812A1C0(u8 taskId) void sub_812A1F0(u8 taskId) { DisplayYesNoMenu(); - sub_8121F68(taskId, &gUnknown_085A7350); + DoYesNoFuncWithChoice(taskId, &gUnknown_085A7350); } void sub_812A210(u8 taskId) @@ -2726,7 +2726,7 @@ void sub_812A3D4(u8 taskId) void sub_812A458(u8 taskId) { DisplayYesNoMenu(); - sub_8121F68(taskId, &gUnknown_085A741C); + DoYesNoFuncWithChoice(taskId, &gUnknown_085A741C); } void sub_812A478(u8 taskId) |