From 56dabd4626f2acb6bc8ce1a4d615a2fe54a64737 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 25 Jun 2019 07:50:29 +0800 Subject: [PATCH] multiple fixes --- .gitignore | 4 ++-- ld_script.txt | 1 - src/new_menu_helpers.c | 46 ++++++++++++++++++++-------------------- tools/br_ips/.gitignore | 2 -- tools/br_ips/br_ips | Bin 17624 -> 0 bytes tools/br_ips/ips_patch | Bin 13088 -> 0 bytes 6 files changed, 25 insertions(+), 28 deletions(-) delete mode 100644 tools/br_ips/.gitignore delete mode 100644 tools/br_ips/br_ips delete mode 100644 tools/br_ips/ips_patch diff --git a/.gitignore b/.gitignore index c9266139c..e3cb43d69 100644 --- a/.gitignore +++ b/.gitignore @@ -42,5 +42,5 @@ build/ *.DS_Store *.pl *.bak -src/data/items.h # Autogenerated by jsonproc - +src/data/items.h +tools/br_ips/{br_ips,ips_patch}{,.exe} diff --git a/ld_script.txt b/ld_script.txt index 224f518f3..4bb96d231 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -219,7 +219,6 @@ SECTIONS { asm/evolution_graphics.o(.text); src/fldeff_teleport.o(.text); src/new_menu_helpers.o(.text); - asm/new_menu_helpers.o(.text); asm/box_party_pokemon_dropdown.o(.text); asm/save_menu_util.o(.text); asm/map_preview_screen.o(.text); diff --git a/src/new_menu_helpers.c b/src/new_menu_helpers.c index 9ee172f0f..c8b9e22b8 100644 --- a/src/new_menu_helpers.c +++ b/src/new_menu_helpers.c @@ -26,7 +26,7 @@ static EWRAM_DATA u16 gUnknown_203AB5C = {0}; static EWRAM_DATA void *gUnknown_203AB60[0x20] = {NULL}; static EWRAM_DATA u8 sStartMenuWindowId = {0}; -static const u8 gUnknown_841F428[] = { 8, 4, 1, 0, }; +static const u8 gUnknown_841F428[] = { 8, 4, 1 }; static const struct WindowTemplate sStandardTextBox_WindowTemplates[] = { @@ -39,7 +39,7 @@ static const struct WindowTemplate sStandardTextBox_WindowTemplates[] = .paletteNum = DLG_WINDOW_PALETTE_NUM, .baseBlock = 0x198, }, - DUMMY_WIN_TEMPLATE, + DUMMY_WIN_TEMPLATE }; static const struct WindowTemplate sYesNo_WindowTemplate = @@ -142,20 +142,20 @@ static const struct FontInfo gFontInfos[] = .fgColor = 0x1, .bgColor = 0x2, .shadowColor = 0xF, - }, + } }; static const u8 gMenuCursorDimensions[][2] = { - { 0x8, 0xD, }, - { 0x8, 0xE, }, - { 0x8, 0xE, }, - { 0x8, 0xE, }, - { 0x8, 0xE, }, - { 0x8, 0xE, }, - { 0x8, 0x10, }, - { 0x0, 0x0, }, + { 0x8, 0xD }, + { 0x8, 0xE }, + { 0x8, 0xE }, + { 0x8, 0xE }, + { 0x8, 0xE }, + { 0x8, 0xE }, + { 0x8, 0x10 }, + { 0x0, 0x0 } }; static u16 CopyDecompressedTileDataToVram(u8 bgId, const void *src, u16 size, u16 offset, u8 mode); @@ -202,7 +202,7 @@ void DoScheduledBgTilemapCopiesToVram(void) void ResetTempTileDataBuffers(void) { int i; - for (i = 0; i < (s32)ARRAY_COUNT(gUnknown_203AB60); i++) + for (i = 0; i < (s32)NELEMS(gUnknown_203AB60); i++) { gUnknown_203AB60[i] = NULL; } @@ -234,7 +234,7 @@ bool8 FreeTempTileDataBuffersIfPossible(void) void *DecompressAndCopyTileDataToVram(u8 bgId, const void *src, u32 size, u16 offset, u8 mode) { u32 sizeOut; - if (gUnknown_203AB5C < ARRAY_COUNT(gUnknown_203AB60)) + if (gUnknown_203AB5C < NELEMS(gUnknown_203AB60)) { void *ptr = MallocAndDecompress(src, &sizeOut); if (!size) @@ -252,7 +252,7 @@ void *DecompressAndCopyTileDataToVram(u8 bgId, const void *src, u32 size, u16 of void *DecompressAndCopyTileDataToVram2(u8 bgId, const void *src, u32 size, u16 offset, u8 mode) { u32 sizeOut; - if (gUnknown_203AB5C < ARRAY_COUNT(gUnknown_203AB60)) + if (gUnknown_203AB5C < NELEMS(gUnknown_203AB60)) { void *ptr = MallocAndDecompress(src, &sizeOut); if (sizeOut > size) @@ -285,8 +285,8 @@ void DecompressAndLoadBgGfxUsingHeap2(u8 bgId, const void *src, u32 size, u16 of { u32 sizeOut; void *ptr = MallocAndDecompress(src, &sizeOut); - if (sizeOut > size) - sizeOut = size; + if (sizeOut > size) + sizeOut = size; if (ptr) { u8 taskId = CreateTask(TaskFreeBufAfterCopyingTileDataToVram, 0); @@ -308,7 +308,7 @@ void *MallocAndDecompress(const void *src, u32 *size) { void *ptr; u8 *sizeAsBytes = (u8 *)size; - u8 *srcAsBytes = (u8 *)src; + const u8 *srcAsBytes = src; sizeAsBytes[0] = srcAsBytes[1]; sizeAsBytes[1] = srcAsBytes[2]; @@ -324,7 +324,7 @@ void *MallocAndDecompress(const void *src, u32 *size) static u16 CopyDecompressedTileDataToVram(u8 bgId, const void *src, u16 size, u16 offset, u8 mode) { switch (mode) - { // different to EM + { case 1: break; case 0: @@ -413,8 +413,8 @@ u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed printer.y = 1; printer.currentX = 0; printer.currentY = 1; - printer.letterSpacing = 1; // different to EM - printer.lineSpacing = 1; // different to EM + printer.letterSpacing = 1; + printer.lineSpacing = 1; printer.unk = 0; printer.fgColor = fgColor; printer.bgColor = bgColor; @@ -426,11 +426,11 @@ u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed void AddTextPrinterDiffStyle(bool8 allowSkippingDelayWithButtonPress) { u8 result; - void *nptr = NULL; // This is required for matching + void *nptr = NULL; gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress; result = ContextNpcGetTextColor(); - if (!result) + if (result == 0) AddTextPrinterParameterized2(0, 4, gStringVar4, GetTextSpeedSetting(), nptr, 8, 1, 3); else if (result == 1) AddTextPrinterParameterized2(0, 5, gStringVar4, GetTextSpeedSetting(), nptr, 4, 1, 3); @@ -671,7 +671,7 @@ u8 sub_80F78E0(u8 height) { struct WindowTemplate wTemp1, wTemp2; SetWindowTemplateFields(&wTemp1, 0, 0x16, 1, 7, height * 2 - 1, DLG_WINDOW_PALETTE_NUM, 0x13D); - wTemp2 = wTemp1; // This is required for matching + wTemp2 = wTemp1; sStartMenuWindowId = AddWindow(&wTemp2); PutWindowTilemap(sStartMenuWindowId); } diff --git a/tools/br_ips/.gitignore b/tools/br_ips/.gitignore deleted file mode 100644 index f3fb1444f..000000000 --- a/tools/br_ips/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -br_ips -ips_patch diff --git a/tools/br_ips/br_ips b/tools/br_ips/br_ips deleted file mode 100644 index 0b291d4e278c8d447c11ed16d3c1ad5ee954432f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17624 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 iJF$tp(#ES@ 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 OoLV^PeCkYI`~L=aGb!Bw