mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-10 23:22:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

moved gCurrentAreaDroptable into gRoomVars properly

Browse Source 
also rename globals
This commit is contained in:
Henny022p
2022-02-10 01:29:15 +01:00
parent 5145c4776d
commit d64fea8164
7 changed files with 33 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/droptables.h
+9 -8
View File
@@ -24,14 +24,15 @@ typedef union {
} Droptable;
static_assert(sizeof(Droptable) == 0x20);
extern const Droptable gDroptablesEnemies[];
extern const Droptable gDroptablesAreas[];
extern const Droptable gDroptablesObjects[];
extern const Droptable gEnemyDroptables[];
extern const Droptable gAreaDroptables[];
extern const Droptable gObjectDroptables[];
extern const Droptable gUnk_0800191C[];
extern const Droptable gDroptablesModifiers[];
#define gDroptableModifierNone gDroptablesModifiers[0]
#define gDroptableModifierNoShells gDroptablesModifiers[1]
#define gDroptableModifierNoKinstones gDroptablesModifiers[2]
enum {
DROPTABLE_NONE,
DROPTABLE_NO_SHELLS,
DROPTABLE_NO_KINSTONES,
};
extern const Droptable gDroptableModifiers[];
#endif // TMC_DROPTABLES_H
include/room.h
+3 -2
View File
@@ -3,6 +3,7 @@
#include "global.h"
#include "entity.h"
#include "droptables.h"
enum RoomTransition {
TRANSITION_DEFAULT,
@@ -72,8 +73,8 @@ typedef struct {
/* 0x10 */ u8 unk_10[4];
/* 0x14 */ u32 flags;
/* 0x18 */ u32 unk3;
/* 0x1c */ u8 filler4[48];
/* 0x4c */ u8 filler5[28];
/* 0x1c */ u8 filler4[44];
/* 0x48 */ Droptable currentAreaDroptable;
/* 0x68 */ u32 animFlags;
/* 0x6c */ void* field_0x6c[8];
/* 0x8c */ void* field_0x8c[8];