diff options
| author | cadmic <cadmic24@gmail.com> | 2024-04-14 14:51:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-14 23:51:32 +0200 |
| commit | f643499462f8cf908ddf1ee77b5625ebaff2cf25 (patch) | |
| tree | 852eb24ec8f3c8c507d779c4878be92cf5ff36c7 /src/code/z_common_data.c | |
| parent | a94661054ed8e7ac895c3f4df07b8ac339fc3ce0 (diff) | |
Match retail BSS ordering (#1927)
* Match retail BSS ordering
* Revert moving some global variables to headers
* Adjust block numbers after header changes
* Fix debug build
* Overlay bss ordering
* Fix BSS ordering after header changes
* gc-eu-mq OK
* Implement preprocessor for #pragma increment_block_number
* Transfer usage comment from reencode.sh
* Use temporary directory instead of temporary file
* Move ColChkMassType back
Diffstat (limited to 'src/code/z_common_data.c')
| -rw-r--r-- | src/code/z_common_data.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c index 2d7c36fc8..47aecd9e6 100644 --- a/src/code/z_common_data.c +++ b/src/code/z_common_data.c @@ -1,5 +1,10 @@ #include "global.h" +// For retail BSS ordering, the block number of D_8015FA88 must be 0 or +// just above (the exact upper bound depends on the block numbers assigned to +// extern variables declared in headers). +#pragma increment_block_number 60 + ALIGNED(16) SaveContext gSaveContext; u32 D_8015FA88; u32 D_8015FA8C; |