diff options
Diffstat (limited to 'src/quest_log.c')
-rw-r--r-- | src/quest_log.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/quest_log.c b/src/quest_log.c index 0d1cb7984..065b42cef 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -1,7 +1,7 @@ #include "global.h" #include "constants/species.h" #include "constants/items.h" -#include "data2.h" +#include "data.h" #include "malloc.h" #include "main.h" #include "task.h" @@ -410,7 +410,7 @@ const struct WindowTemplate gUnknown_845661C[3] = { { 0, 0, 14, 30, 6, 15, 0x14c } }; -const struct TextColor gUnknown_8456634 = {15, 1, 12}; +const u8 gUnknown_8456634[3] = {15, 1, 12}; const u16 gUnknown_8456638[] = INCBIN_U16("data/graphics/unknown_8456638.bin"); @@ -871,7 +871,7 @@ void sub_8110F90(u8 unused) gSaveBlock1Ptr->location.mapNum = 19; gSaveBlock1Ptr->location.warpId = -1; gUnknown_203ADF8 = 0; - gUnknown_2031DD8 = 1; + gDisableMapMusicChangeOnMapLoad = 1; sub_8082740(1); sub_8111368(); } @@ -923,7 +923,7 @@ void sub_8111070(u8 a0) StringAppend(gStringVar4, gStringVar1); } - AddTextPrinterParameterized4(gUnknown_203ADFE[0], 2, 2, 2, 1, 2, &gUnknown_8456634, 0, gStringVar4); + AddTextPrinterParameterized4(gUnknown_203ADFE[0], 2, 2, 2, 1, 2, gUnknown_8456634, 0, gStringVar4); PutWindowTilemap(gUnknown_203ADFE[0]); PutWindowTilemap(gUnknown_203ADFE[1]); CopyWindowToVram(gUnknown_203ADFE[0], 2); @@ -986,7 +986,7 @@ void sub_8111368(void) { gUnknown_203ADFA = 2; sub_806E6FC(); - ClearItemSlotsInAllBagPockets(); + ClearBag(); ClearPCItemSlots(); if (sub_8110AC8() == 1) { @@ -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); + AddTextPrinterParameterized4(gUnknown_203ADFE[2], 2, 2, gUnknown_8456698[count], 1, 0, gUnknown_8456634, 0, gStringVar4); ScheduleBgCopyTilemapToVram(0); } @@ -1567,7 +1567,7 @@ void sub_81120AC(u8 taskId) switch (data[0]) { case 0: - gUnknown_2031DD8 = 0; + gDisableMapMusicChangeOnMapLoad = 0; Overworld_PlaySpecialMapMusic(); sub_811229C(); FillWindowPixelRect(gUnknown_203ADFE[0], 0xF, 0, 0, gUnknown_845661C[0].width * 8, gUnknown_845661C[0].height * 8); @@ -2463,13 +2463,13 @@ void sub_8112FD0(void) sub_8112F18(gUnknown_203B020); } -const struct TextColor gUnknown_8456930 = { +const u8 gUnknown_8456930[3] = { 0, 10, 2 }; void sub_8112FE4(const u8 * a0) { - AddTextPrinterParameterized4(gUnknown_203B020, 0x02, 2, 5, 1, 1, &gUnknown_8456930, -1, a0); + AddTextPrinterParameterized4(gUnknown_203B020, 0x02, 2, 5, 1, 1, gUnknown_8456930, -1, a0); } void sub_8113018(const u8 * text, u8 mode) |