diff options
| author | Henny022p <info@henny022.de> | 2025-03-05 14:00:09 +0000 |
|---|---|---|
| committer | Henny022p <info@henny022.de> | 2025-03-09 18:57:59 +0000 |
| commit | 96a3e64280301f8adae30d58fae5502eee4b3b96 (patch) | |
| tree | 42a7e934192e21c8e98f7dc981df26e8a3e457a5 /include | |
| parent | 22c5e387295ee76c16d165f8154cd9aaa19c087c (diff) | |
cleanup graphics code
a bit
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm.h | 2 | ||||
| -rw-r--r-- | include/entity.h | 2 | ||||
| -rw-r--r-- | include/manager/hyruleTownTileSetManager.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/asm.h b/include/asm.h index dbf374d2..b5c12e26 100644 --- a/include/asm.h +++ b/include/asm.h @@ -11,7 +11,7 @@ extern void SetTile(u32 tileIndex, u32 tilePos, u32 layer); extern void UpdateScrollVram(void); extern u32 sub_080B1BA4(u32, u32, u32); -extern void LoadResourceAsync(const void* src, u32 dest, u32 size); +extern void LoadResourceAsync(const void* src, void* dest, u32 size); extern void GenericConfused(struct Entity_*); extern void sub_08001290(struct Entity_*, u32); extern void GenericKnockback(struct Entity_*); diff --git a/include/entity.h b/include/entity.h index d1d08517..ffde0674 100644 --- a/include/entity.h +++ b/include/entity.h @@ -560,7 +560,7 @@ extern u8 gManagerCount; #define TILE(x, y) (((((x)-gRoomControls.origin_x) >> 4) & 0x3F) | ((((y)-gRoomControls.origin_y) >> 4) & 0x3F) << 6) // Calculate tilePos from x and y coordinates where x and y are already relative to the current room. #define TILE_LOCAL(x, y) ((((x) >> 4) & 0x3F) | (((y) >> 4) & 0x3F) << 6) -#define TILE_POS(x, y) (x + (y << 6)) +#define TILE_POS(x, y) ((x) + ((y) << 6)) #define TILE_POS_X_COMPONENT 0x3f #define TILE_POS_Y_COMPONENT 0xfc0 #define COORD_TO_TILE(entity) TILE((entity)->x.HALF.HI, (entity)->y.HALF.HI) diff --git a/include/manager/hyruleTownTileSetManager.h b/include/manager/hyruleTownTileSetManager.h index ee908238..34a0e809 100644 --- a/include/manager/hyruleTownTileSetManager.h +++ b/include/manager/hyruleTownTileSetManager.h @@ -5,9 +5,9 @@ typedef struct { Manager base; - u8 field_0x20; - u8 field_0x21; - u8 field_0x22; + u8 gfxGroup0; + u8 gfxGroup1; + u8 gfxGroup2; } HyruleTownTileSetManager; #endif // HYRULETOWNTILESETMANAGER_H |