diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2024-04-20 19:10:53 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-20 19:10:53 -0600 |
| commit | 7a10ba89f6bf26fd4b659510fefb2ce1cd315f02 (patch) | |
| tree | a06fc0b8288801398c24c96e80b0320cf513c9de /yamls | |
| parent | 4df64731472064ac5452b62fb867e59a18487852 (diff) | |
Header cleanup and some renames (#616)
* Place macros for addr conversions
* dl renames
* fixes
* changes ok
* Delete types.h
* move enums
Diffstat (limited to 'yamls')
| -rw-r--r-- | yamls/us/ceremony_data.yml | 3 | ||||
| -rw-r--r-- | yamls/us/ceremony_rsp_init_80284EE0.yml | 3 | ||||
| -rw-r--r-- | yamls/us/common_data.yml | 3 | ||||
| -rw-r--r-- | yamls/us/data_segment2.yml | 3 | ||||
| -rw-r--r-- | yamls/us/startup_logo.yml | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/yamls/us/ceremony_data.yml b/yamls/us/ceremony_data.yml index 1f5f1cf5b..bc68825e6 100644 --- a/yamls/us/ceremony_data.yml +++ b/yamls/us/ceremony_data.yml @@ -5,7 +5,8 @@ code: - '#include <assets/ceremony_data.h>' header: - - '#include <types.h>' + - '#include <ultra64.h>' + - '#include <common_structs.h>' - '#include <waypoints.h>' silver_trophy_dl: diff --git a/yamls/us/ceremony_rsp_init_80284EE0.yml b/yamls/us/ceremony_rsp_init_80284EE0.yml index 6b6c53e06..c316b45ca 100644 --- a/yamls/us/ceremony_rsp_init_80284EE0.yml +++ b/yamls/us/ceremony_rsp_init_80284EE0.yml @@ -4,7 +4,8 @@ offset: 0x128520 header: code: - - '#include <types.h>' + - '#include <ultra64.h>' + - '#include <common_structs.h>' - '#include <PR/gbi.h>' - '#include "courses/royal_raceway/course_displaylists.inc.h"' D_80284EE0: diff --git a/yamls/us/common_data.yml b/yamls/us/common_data.yml index 782a4dce5..0b0c8a56a 100644 --- a/yamls/us/common_data.yml +++ b/yamls/us/common_data.yml @@ -8,7 +8,8 @@ - '#include <assets/common_data.h>' header: - '#include <PR/gbi.h>' - - '#include <types.h>' + - '#include <ultra64.h>' + - '#include <common_structs.h>' tables: common_grand_prix_human_item_curve: range: [0x8150, 0x840C] diff --git a/yamls/us/data_segment2.yml b/yamls/us/data_segment2.yml index 1aedcd5af..b4f76de73 100644 --- a/yamls/us/data_segment2.yml +++ b/yamls/us/data_segment2.yml @@ -5,7 +5,8 @@ header: code: - '#include <macros.h>' - - '#include <types.h>' + - '#include <ultra64.h>' + - '#include <common_structs.h>' - '#include <PR/ultratypes.h>' - '#include <PR/gbi.h>' - '#include "data_segment2.h"' diff --git a/yamls/us/startup_logo.yml b/yamls/us/startup_logo.yml index 6c5459ed5..52483c382 100644 --- a/yamls/us/startup_logo.yml +++ b/yamls/us/startup_logo.yml @@ -5,7 +5,8 @@ code: - '#include <assets/startup_logo.h>' header: - - '#include "types.h"' + - '#include <ultra64.h>' + - '#include <common_structs.h>' dl1: symbol: startup_logo_dl |