From efad45497dfb69cf2879d0bf2e318eaf8fc2252f Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Mon, 24 Jun 2019 14:37:45 +0800 Subject: through AddTextPrinterParameterized2() --- src/quest_log.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/quest_log.c') diff --git a/src/quest_log.c b/src/quest_log.c index 0021ee927..c1ce93ce3 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -1418,7 +1418,7 @@ void sub_8111D10(void) PutWindowTilemap(gUnknown_203ADFE[2]); sub_8111D90(gUnknown_203ADFE[2]); AddTextPrinterParameterized4(gUnknown_203ADFE[2], 2, 2, gUnknown_8456698[count], 1, 0, &gUnknown_8456634, 0, gStringVar4); - schedule_bg_copy_tilemap_to_vram(0); + ScheduleBgCopyTilemapToVram(0); } void sub_8111D90(u8 a0) @@ -2297,7 +2297,7 @@ const struct WindowTemplate gUnknown_8456928 = { 0x00, 0, 15, 30, 5, 15, 0x008F }; -void sub_8112EA8(void) +void MapNamePopupWindowIdSetDummy(void) { gUnknown_203B020 = 0xFF; } -- cgit v1.2.3 From 2a870d54fca85b6f4501cff857837c3f2940fd7d Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 25 Jun 2019 06:50:48 +0800 Subject: All Done --- src/quest_log.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/quest_log.c') diff --git a/src/quest_log.c b/src/quest_log.c index c1ce93ce3..dede9d6cd 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -2471,12 +2471,12 @@ void sub_8112FE4(const u8 * a0) AddTextPrinterParameterized4(gUnknown_203B020, 0x02, 2, 5, 1, 1, &gUnknown_8456930, -1, a0); } -void sub_8113018(const u8 * a0, u8 a1) +void sub_8113018(const u8 * text, u8 mode) { sub_8112FD0(); - sub_8112FE4(a0); - if (a1) - CopyWindowToVram(gUnknown_203B020, a1); + sub_8112FE4(text); + if (mode) + CopyWindowToVram(gUnknown_203B020, mode); } void sub_8113044(void) -- cgit v1.2.3 From f7aaf6234311435ca7bb2e5b094df6dfa8ab1827 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Wed, 26 Jun 2019 07:31:39 +0800 Subject: finished hof_pc --- src/quest_log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/quest_log.c') diff --git a/src/quest_log.c b/src/quest_log.c index 0021ee927..0f449e282 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -1567,7 +1567,7 @@ void sub_81120AC(u8 taskId) { case 0: gUnknown_2031DD8 = 0; - sub_8055DC4(); + Overworld_PlaySpecialMapMusic(); sub_811229C(); FillWindowPixelRect(gUnknown_203ADFE[0], 0xF, 0, 0, gUnknown_845661C[0].width * 8, gUnknown_845661C[0].height * 8); data[0]++; -- cgit v1.2.3 From be2010e0db8ca527693d40a6f1410000033f7e7f Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 28 Jun 2019 04:30:45 +0800 Subject: finished reset_save_heap --- src/quest_log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/quest_log.c') diff --git a/src/quest_log.c b/src/quest_log.c index 07d44388d..3fd9d53de 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -859,7 +859,7 @@ void sub_8110F14(u8 taskId) } else { - SetMainCallback2(sub_8056938); + SetMainCallback2(CB2_ContinueSavedGame); DestroyTask(taskId); } } -- cgit v1.2.3 From b566ae26decaa937c72f608044d8ea604c643260 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 29 Jun 2019 08:36:18 +0800 Subject: finished fldeff_dig + fldeff_rocksmash --- src/quest_log.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/quest_log.c') diff --git a/src/quest_log.c b/src/quest_log.c index 3fd9d53de..fe83f67e9 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -1705,7 +1705,7 @@ void sub_811246C(struct Sprite *sprite) { if (gUnknown_203AF9A[0][0] != 0xFF) { - sub_8063CA4(mapObject, gUnknown_203AF9A[0][0]); + FieldObjectSetHeldMovement(mapObject, gUnknown_203AF9A[0][0]); gUnknown_203AF9A[0][0] = 0xFF; } if (gUnknown_203AF9A[0][1] != 0xFF) @@ -1719,7 +1719,7 @@ void sub_811246C(struct Sprite *sprite) { if (gUnknown_203AF9A[mapObject->localId][0] != 0xFF) { - sub_8063CA4(mapObject, gUnknown_203AF9A[mapObject->localId][0]); + FieldObjectSetHeldMovement(mapObject, gUnknown_203AF9A[mapObject->localId][0]); gUnknown_203AF9A[mapObject->localId][0] = 0xFF; } sub_8063E28(mapObject, sprite); @@ -1911,7 +1911,7 @@ void sub_8112940(u8 a0, struct UnkStruct_203AE98 *a1, u16 a2) gUnknown_3005E94[gUnknown_203AF98].unk_4 = 0; gUnknown_3005E94[gUnknown_203AF98].unk_6 = 0; gUnknown_3005E94[gUnknown_203AF98].unk_0 = 0; - switch (player_get_direction_lower_nybble()) + switch (GetPlayerFacingDirection()) { case 0: case 1: -- cgit v1.2.3