Finish naming objs in slot_machine

This commit is contained in:
PikalaxALT
2020-04-08 12:51:31 -04:00
parent d7c165d8fe
commit 2073a56531
6 changed files with 746 additions and 653 deletions
+1 -9
View File
@@ -9,22 +9,14 @@ struct TilesPal
u16* pal; u16* pal;
}; };
const struct TilesPal* sub_8098758(u8 id);
void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 palOffset);
void sub_809882C(u8 windowId, u16 destOffset, u8 palOffset);
void sub_80987D4(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset);
void box_border_load_tiles_and_pal(u8 windowId, u16 destOffset, u8 palOffset);
void sub_8098858(u8 windowId, u16 tileNum, u8 palNum);
void sub_80989E0(u8 windowId, u16 tileNum, u8 palNum);
void rbox_fill_rectangle(u8 windowId); void rbox_fill_rectangle(u8 windowId);
const u16* stdpal_get(u8 id); const u16* stdpal_get(u8 id);
const u16* GetOverworldTextboxPalettePtr(void); const u16* GetOverworldTextboxPalettePtr(void);
void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset);
void TextWindow_LoadResourcesStdFrame0(u8 windowId, u16 tileStart, u8 palette); void TextWindow_LoadResourcesStdFrame0(u8 windowId, u16 tileStart, u8 palette);
void TextWindow_SetStdFrame0_WithPal(u8 windowId, u16 tileStart, u8 palette); void TextWindow_SetStdFrame0_WithPal(u8 windowId, u16 tileStart, u8 palette);
void TextWindow_SetUserSelectedFrame(u8 windowId, u16 tileStart, u8 palette); void TextWindow_SetUserSelectedFrame(u8 windowId, u16 tileStart, u8 palette);
void LoadUserWindowBorderGfx(u8 windowId, u16 tileStart, u8 palette); void LoadUserWindowBorderGfx(u8 windowId, u16 tileStart, u8 palette);
void sub_814FDA0(u8 windowId, u16 tileStart, u8 palette); void DrawWindowBorderWithStdpal3(u8 bgId, u16 tileStart, u8 palette);
void DrawTextBorderOuter(u8 windowId, u16 tileStart, u8 palette); void DrawTextBorderOuter(u8 windowId, u16 tileStart, u8 palette);
void DrawTextBorderInner(u8 windowId, u16 tileNum, u8 palNum); void DrawTextBorderInner(u8 windowId, u16 tileNum, u8 palNum);
void TextWindow_LoadTilesStdFrame1(u8 windowId, u16 destOffset); void TextWindow_LoadTilesStdFrame1(u8 windowId, u16 destOffset);
+1 -1
View File
@@ -398,7 +398,7 @@ bool32 HandleMysteryGiftOrEReaderSetup(s32 mg_or_ereader)
SetBgTilemapBuffer(0, Alloc(0x800)); SetBgTilemapBuffer(0, Alloc(0x800));
LoadUserWindowBorderGfx(0, 10, 0xE0); LoadUserWindowBorderGfx(0, 10, 0xE0);
sub_814FDA0(0, 1, 0xF0); DrawWindowBorderWithStdpal3(0, 1, 0xF0);
DecompressAndLoadBgGfxUsingHeap(3, gUnkTextboxBorderGfx, 0x100, 0, 0); DecompressAndLoadBgGfxUsingHeap(3, gUnkTextboxBorderGfx, 0x100, 0, 0);
InitWindows(sMainWindows); InitWindows(sMainWindows);
DeactivateAllTextPrinters(); DeactivateAllTextPrinters();
+1 -1
View File
@@ -352,7 +352,7 @@ static bool8 LoadOptionMenuPalette(void)
LoadPalette(stdpal_get(2), 0xF0, 0x20); LoadPalette(stdpal_get(2), 0xF0, 0x20);
break; break;
case 3: case 3:
sub_814FDA0(1, 0x1B3, 0x30); DrawWindowBorderWithStdpal3(1, 0x1B3, 0x30);
break; break;
default: default:
return TRUE; return TRUE;
+1 -1
View File
@@ -220,7 +220,7 @@ static void sub_8149DC8(void)
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);
sub_814A84C(); sub_814A84C();
sub_814AA24(0); sub_814AA24(0);
sub_814FDA0(0, 1, 0xE0); DrawWindowBorderWithStdpal3(0, 1, 0xE0);
LoadUserWindowBorderGfx(0, 0x00A, 0xD0); LoadUserWindowBorderGfx(0, 0x00A, 0xD0);
CopyBgTilemapBufferToVram(0); CopyBgTilemapBufferToVram(0);
CopyBgTilemapBufferToVram(2); CopyBgTilemapBufferToVram(2);
+741 -640
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -28,7 +28,7 @@ void sub_814FD6C(u8 bgId, u16 destOffset, u8 palIdx)
LoadPalette(stdpal_get(1), palIdx, 32); LoadPalette(stdpal_get(1), palIdx, 32);
} }
void sub_814FDA0(u8 bgId, u16 destOffset, u8 palIdx) void DrawWindowBorderWithStdpal3(u8 bgId, u16 destOffset, u8 palIdx)
{ {
LoadBgTiles(bgId, gStdFrame0, 0x120, destOffset); LoadBgTiles(bgId, gStdFrame0, 0x120, destOffset);
LoadPalette(stdpal_get(3), palIdx, 32); LoadPalette(stdpal_get(3), palIdx, 32);