Merge branch 'master' into ply

This commit is contained in:
notyourav
2021-03-17 20:23:01 -07:00
committed by GitHub
250 changed files with 580 additions and 1024 deletions
+1 -2
View File
@@ -39,8 +39,7 @@ typedef struct {
u8 field_0x4[0x4];
bool8 transitioningOut;
u8 transitionType; // transition when changing areas
u8 field_0xa; // seems to be a tile type
u8 field_0xb;
u16 field_0xa; // seems to be a tile type
u8 areaID;
u8 roomID;
u8 playerState;