CreateRandomDrop and droptables

This commit is contained in:
Henny022p
2022-02-03 05:44:50 +01:00
parent 67d369c53b
commit bbc3a88415
18 changed files with 2563 additions and 1434 deletions
+34
View File
@@ -0,0 +1,34 @@
#ifndef TMC_DROPTABLES_H
#define TMC_DROPTABLES_H
typedef union {
struct {
s16 none;
s16 rupee1;
s16 rupee5;
s16 rupee20;
s16 hearts;
s16 fairy;
s16 bombs;
s16 arrows;
s16 mysteriousShells;
s16 kinstoneGreen;
s16 kinstoneBlue;
s16 kinstoneRed;
s16 none2;
s16 none3;
s16 none4;
s16 none5;
} s;
s16 a[16];
} Droptable;
static_assert(sizeof(Droptable) == 0x20);
extern const Droptable gUnk_0800137C[];
extern const Droptable gUnk_0800143C[];
extern const Droptable gUnk_080015BC[];
extern const Droptable gUnk_0800161C[];
extern const Droptable gUnk_0800191C[];
extern const Droptable gUnk_08001A1C[];
#endif // TMC_DROPTABLES_H
+1 -1
View File
@@ -168,7 +168,7 @@ extern void sub_080044AE(Entity*, u32, u32);
extern void sub_0801AF18(u8*, u32, u32);
extern void sub_0807B9B8(s32, s32, s32);
extern void sub_08000148(u32, u32, u32);
extern void sub_0805457C(Entity*, s32);
extern void CreateRandomItemDrop(Entity*, s32);
extern Entity* sub_080A2A3C(Entity*, u32, u32, u32);
extern void sub_0806FCF4(Entity*, s32, s32, s32);
extern u32 sub_080041DC(Entity*, u32, u32);
+6
View File
@@ -143,6 +143,12 @@ typedef enum {
ITEM_SKILL_FAST_SPIN,
ITEM_SKILL_FAST_SPLIT,
ITEM_SKILL_LONG_SPIN,
// these are not actually item ids but special values used by item drops for example
ITEM_KINSTONE_GREEN = 0xfc,
ITEM_KINSTONE_BLUE,
ITEM_KINSTONE_RED,
ITEM_ENEMY_BEETLE
} Item;
#endif
+2 -1
View File
@@ -255,7 +255,8 @@ typedef struct {
/*0x0c*/ u8 itemButtons[2];
/*0x0e*/ u8 bottles[4];
/*0x12*/ u8 effect;
/*0x13*/ u8 filler3[5];
/*0x13*/ u8 hasAllFigurines;
/*0x14*/ u8 filler3[4];
/*0x18*/ u16 rupees;
/*0x1a*/ u16 field_0x1a;
/*0x1c*/ u16 charmTimer;