izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conflicts

Browse Source
This commit is contained in:
David Benepe
2021-06-10 01:31:04 -05:00
parent 4da2c7dfa2
commit 413601c776
6 changed files with 15 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/unknown_043920.h
+3 -1
View File
@@ -19,7 +19,9 @@ extern f32 D_800DCBE8[19];
// Unused? Not sure if this is actually an array or just some random data.
extern s32 D_800DCC34[19];
extern s32 D_800DCC80[19];
extern s32 D_800DCC80[13];
extern s16 D_800DCCB4[12];
extern u16 D_800DCCCC[20];
include/unknown_06B2B0.h
+10 -1
View File
@@ -3,6 +3,15 @@
#include "types.h"
typedef struct unknown800DD408 {
u8 unk0;
u8 unk1;
u8 unk2;
u8 unk3;
u16 unk4;
u16 unk6;
} unknown800DD408;
extern s8 D_800DD310;
extern s8 D_800DD314;
extern s8 D_800DD318;
@@ -55,7 +64,7 @@ extern s32 D_800DD3EC;
extern s8 D_800DD3F0;
extern s16 D_800DD3F4[8];
extern s32 D_800DD404;
extern s32 D_800DD408;
extern unknown800DD408 D_800DD408;
extern s32 D_800DD40C;
// Unused?
include/unknown_080500.h
+2 -2
View File
@@ -339,8 +339,8 @@ extern u16 D_800E0700[8];
extern s16 D_800E0710[16];
extern s16 D_800E0730[18];
extern s16 D_800E0758[56];
extern s16 D_800E0730[19];
extern s16 D_800E0758[54];
extern s16 D_800E07C4[14];