mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-18 13:54:46 +00:00
Code Issues Projects Releases Wiki Activity

Match remaining GC retail versions (#2019)

Browse source 
* Match the remaining GC retail versions

* Fix BSS ordering for existing versions

* Disable clang-format for #pragma increment_block_number

* sramResetCode -> sSramResetCode

* Replace 0xFF3F with or-ing all buttons together

* Revert "Disable clang-format for #pragma increment_block_number"

This reverts commit 406b6d26c9.

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
cadmic 2024-08-09 17:58:46 -07:00 • committed by GitHub
parent cd2264f018
commit d495436190
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
59 changed files with 11405 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/code/z_collision_check.c
View file

@ -12,7 +12,7 @@ typedef s32 (*ColChkLineFunc)(PlayState*, CollisionCheckContext*, Collider*, Vec
#define SAC_ENABLE (1 << 0)
#pragma increment_block_number "gc-eu:64 gc-eu-mq:64 gc-us:64"
#pragma increment_block_number "gc-eu:64 gc-eu-mq:64 gc-jp:64 gc-jp-ce:64 gc-jp-mq:64 gc-us:64 gc-us-mq:64"
#if OOT_DEBUG
/**
@ -2693,7 +2693,7 @@ typedef enum {
/* 2 */ MASSTYPE_NORMAL
} ColChkMassType;
#pragma increment_block_number "gc-eu:252 gc-eu-mq:252 gc-us:252"
#pragma increment_block_number "gc-eu:252 gc-eu-mq:252 gc-jp:252 gc-jp-ce:252 gc-jp-mq:252 gc-us:252 gc-us-mq:252"
/**
* Get mass type. Immovable colliders cannot be pushed, while heavy colliders can only be pushed by heavy and immovable