Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2025-03-01 17:46:48 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Symbols DRA DrawTimeAttackMenu (#582)

Browse Source 
Made this PR because the previous one was merged before I could push the
changes for the symbols to it 😅
This commit is contained in:
Julien Augugliaro 2023-09-11 22:10:20 +02:00 committed by GitHub
parent d9c9086126
commit caa4c4dd69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/symbols.hd.dra.txt
View File

@ -892,7 +892,8 @@ D_8013783C = 0x80137414;
D_80137840 = 0x80137418;
D_80137844 = 0x8013741C;
D_80137848 = 0x80137420;
g_TimeAttackEntryTimes = 0x80137428;c_strTimeAttackEntry = 0x80137494;
g_TimeAttackEntryTimes = 0x80137428;
c_strTimeAttackEntry = 0x80137494;
g_NewAttackRightHand = 0x80137500;
g_NewAttackLeftHand = 0x80137504;
g_NewDefenseEquip = 0x80137508;

1
config/symbols.hd.txt
View File

@ -749,7 +749,6 @@ g_MenuNavigation_cursorSettings = 0x8003C9E0;
g_MenuNavigation_cursorCloak = 0x8003C9E4;
g_MenuNavigation_cursorButtons = 0x8003C9E8;
D_8003C9EC = 0x8003C9EC;
g_TimeAttackVerticalPageCursor = 0x8003C9F0;
g_Settings = 0x8003C9F8;
g_Settings_buttonConfig_1 = 0x8003C9FC;
g_Settings_buttonMask_0 = 0x8003CA18;

3
config/symbols.us.dra.txt
View File

@ -1075,7 +1075,8 @@ g_IsCloakColorUnlocked = 0x80137604;
g_IsSelectingEquipment = 0x8013760C;
g_EquipmentCursor = 0x80137610;
g_MenuData = 0x8013761C;
g_TimeAttackEntryTimes = 0x80137854;c_strTimeAttackEntry = 0x801378C0;
g_TimeAttackEntryTimes = 0x80137854;
c_strTimeAttackEntry = 0x801378C0;
g_NewAttackRightHand = 0x8013792C;
g_NewAttackLeftHand = 0x80137930;
g_NewDefenseEquip = 0x80137934;

1
config/symbols.us.txt
View File

@ -749,7 +749,6 @@ g_MenuNavigation_cursorSettings = 0x8003C9E0;
g_MenuNavigation_cursorCloak = 0x8003C9E4;
g_MenuNavigation_cursorButtons = 0x8003C9E8;
D_8003C9EC = 0x8003C9EC;
g_TimeAttackVerticalPageCursor = 0x8003C9F0;
g_Settings = 0x8003C9F8;
g_Settings_buttonConfig_1 = 0x8003C9FC;
g_Settings_buttonMask_0 = 0x8003CA18;

2
src/dra/5298C.c
View File

@ -796,7 +796,7 @@ void DrawTimeAttackMenu(MenuContext* ctx) {
for (i = 0, offsetY = 8; i < 12; i++, offsetY += 12) {
cursorX = ctx->cursorX;
entryIdx = i + g_TimeAttackVerticalPageCursor;
entryIdx = i + g_MenuNavigation.cursorTimeAttack;
cursorY = ctx->cursorY + offsetY;
DrawMenuInt(entryIdx + 1, cursorX + 16, cursorY, ctx);
seconds = g_TimeAttackEntryTimes[entryIdx];

1
src/dra/dra.h
View File

@ -259,7 +259,6 @@ typedef struct {
u16 exteriorLight;
} JosephsCloak;
extern s32 g_TimeAttackVerticalPageCursor;
extern void (*D_800A0004)(); // TODO pointer to 0x50 array of functions
extern s32 D_800A0144[];
extern u32 D_800A0158;