From b252bd029279b6f28518c59df1ba03caf44d756f Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 27 Oct 2018 00:53:07 +0200 Subject: Window priority to window bg --- src/item_menu.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/item_menu.c') diff --git a/src/item_menu.c b/src/item_menu.c index bb619cac8..7dbdf716f 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -268,7 +268,7 @@ const u8 gUnknown_08614164[][3] = { const struct WindowTemplate gUnknown_08614174[] = { { - .priority = 0, + .bg = 0, .tilemapLeft = 14, .tilemapTop = 2, .width = 15, @@ -277,7 +277,7 @@ const struct WindowTemplate gUnknown_08614174[] = .baseBlock = 0x27, }, { - .priority = 0, + .bg = 0, .tilemapLeft = 0, .tilemapTop = 13, .width = 14, @@ -286,7 +286,7 @@ const struct WindowTemplate gUnknown_08614174[] = .baseBlock = 0x117, }, { - .priority = 0, + .bg = 0, .tilemapLeft = 4, .tilemapTop = 1, .width = 8, @@ -295,7 +295,7 @@ const struct WindowTemplate gUnknown_08614174[] = .baseBlock = 0x1A1, }, { - .priority = 0, + .bg = 0, .tilemapLeft = 1, .tilemapTop = 13, .width = 5, @@ -304,7 +304,7 @@ const struct WindowTemplate gUnknown_08614174[] = .baseBlock = 0x16B, }, { - .priority = 0, + .bg = 0, .tilemapLeft = 7, .tilemapTop = 13, .width = 4, @@ -313,7 +313,7 @@ const struct WindowTemplate gUnknown_08614174[] = .baseBlock = 0x189, }, { - .priority = 1, + .bg = 1, .tilemapLeft = 2, .tilemapTop = 15, .width = 27, @@ -327,7 +327,7 @@ const struct WindowTemplate gUnknown_08614174[] = const struct WindowTemplate gUnknown_086141AC[] = { { - .priority = 1, + .bg = 1, .tilemapLeft = 22, .tilemapTop = 17, .width = 7, @@ -336,7 +336,7 @@ const struct WindowTemplate gUnknown_086141AC[] = .baseBlock = 0x21D, }, { - .priority = 1, + .bg = 1, .tilemapLeft = 22, .tilemapTop = 15, .width = 7, @@ -345,7 +345,7 @@ const struct WindowTemplate gUnknown_086141AC[] = .baseBlock = 0x21D, }, { - .priority = 1, + .bg = 1, .tilemapLeft = 15, .tilemapTop = 15, .width = 14, @@ -354,7 +354,7 @@ const struct WindowTemplate gUnknown_086141AC[] = .baseBlock = 0x21D, }, { - .priority = 1, + .bg = 1, .tilemapLeft = 15, .tilemapTop = 13, .width = 14, @@ -363,7 +363,7 @@ const struct WindowTemplate gUnknown_086141AC[] = .baseBlock = 0x21D, }, { - .priority = 1, + .bg = 1, .tilemapLeft = 2, .tilemapTop = 15, .width = 27, @@ -372,7 +372,7 @@ const struct WindowTemplate gUnknown_086141AC[] = .baseBlock = 0x1B1, }, { - .priority = 1, + .bg = 1, .tilemapLeft = 24, .tilemapTop = 15, .width = 5, @@ -381,7 +381,7 @@ const struct WindowTemplate gUnknown_086141AC[] = .baseBlock = 0x21D, }, { - .priority = 1, + .bg = 1, .tilemapLeft = 21, .tilemapTop = 9, .width = 5, @@ -390,7 +390,7 @@ const struct WindowTemplate gUnknown_086141AC[] = .baseBlock = 0x21D, }, { - .priority = 1, + .bg = 1, .tilemapLeft = 24, .tilemapTop = 17, .width = 5, @@ -399,7 +399,7 @@ const struct WindowTemplate gUnknown_086141AC[] = .baseBlock = 0x21D, }, { - .priority = 1, + .bg = 1, .tilemapLeft = 18, .tilemapTop = 11, .width = 10, @@ -408,7 +408,7 @@ const struct WindowTemplate gUnknown_086141AC[] = .baseBlock = 0x245, }, { - .priority = 1, + .bg = 1, .tilemapLeft = 1, .tilemapTop = 1, .width = 10, -- cgit v1.2.3 From 7de1c4bd141bc793873b12acd7f1eaae7474bfbc Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 30 Oct 2018 22:17:03 +0100 Subject: Make frontier util compile --- src/item_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/item_menu.c') diff --git a/src/item_menu.c b/src/item_menu.c index 7dbdf716f..37b1a961e 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -2,7 +2,7 @@ #include "item_menu.h" #include "battle.h" #include "battle_controllers.h" -#include "battle_frontier_2.h" +#include "frontier_util.h" #include "berry_tag_screen.h" #include "bg.h" #include "constants/items.h" -- cgit v1.2.3 From 0bb51037d7d3e257a84b1488016441aafd34b020 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 1 Nov 2018 21:31:10 +0100 Subject: Finish frontier util --- src/item_menu.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/item_menu.c') diff --git a/src/item_menu.c b/src/item_menu.c index 37b1a961e..124fbccd2 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -48,6 +48,8 @@ #include "window.h" #include "apprentice.h" +extern bool8 InBattlePike(void); + void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)()); void CB2_Bag(void); bool8 setup_bag_menu(void); -- cgit v1.2.3 From 7dd4ed70601039d0c811752211b4aefa1d09b69b Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Mon, 5 Nov 2018 14:45:54 -0600 Subject: r5/r6 swap on sub_80E2578 --- src/item_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/item_menu.c') diff --git a/src/item_menu.c b/src/item_menu.c index bb619cac8..106babdae 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -1543,7 +1543,7 @@ void Task_HandleInBattleItemMenuInput(u8 taskId) { if (sub_81221EC() != TRUE) { - s8 r4 = Menu_ProcessInputNoWrapAround(); + s8 r4 = Menu_ProcessInputNoWrap(); switch (r4) { case -2: -- cgit v1.2.3 From f8d337e491f531285f6067e2e7f39a8d606036d6 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 6 Nov 2018 11:30:21 -0600 Subject: Finish cleaning up text.c --- src/item_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/item_menu.c') diff --git a/src/item_menu.c b/src/item_menu.c index 7dbdf716f..64c8036dd 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -1029,7 +1029,7 @@ void DisplayItemMessage(u8 taskId, u8 fontId, const u8 *str, void ( *callback)(u data[10] = AddItemMessageWindow(4); FillWindowPixelBuffer(data[10], 17); - DisplayMessageAndContinueTask(taskId, data[10], 10, 13, fontId, GetPlayerTextSpeed(), str, callback); + DisplayMessageAndContinueTask(taskId, data[10], 10, 13, fontId, GetPlayerTextSpeedDelay(), str, callback); schedule_bg_copy_tilemap_to_vram(1); } -- cgit v1.2.3 From 9f50ba1ce38dfad92477acf16e2f159c9f410072 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 7 Nov 2018 12:35:31 -0600 Subject: Fix incorrect compressed types, part 2 --- src/item_menu.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/item_menu.c') diff --git a/src/item_menu.c b/src/item_menu.c index 0cbcc13d0..2c0ac09ef 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -447,7 +447,6 @@ EWRAM_DATA u16 gSpecialVar_ItemId = 0; EWRAM_DATA struct TempWallyStruct *gUnknown_0203CE80 = 0; extern u8 *gPocketNamesStringsTable[]; -extern u8 gUnknown_08D9A88C[]; extern struct ListMenuTemplate gUnknown_08613F9C; extern const u8 gMoveNames[][0xD]; extern u8* gReturnToXStringsTable[]; -- cgit v1.2.3