mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-16 21:05:12 +00:00
Code Issues Projects Releases Wiki Activity

gc-us OK (#2018)

Browse source 
Match BSS order and delete disassembly data
This commit is contained in:
cadmic 2024-08-08 00:26:48 -07:00 • committed by GitHub
parent feac688313
commit 1021c482af
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
23 changed files with 27 additions and 13695 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"
#pragma increment_block_number "gc-eu:64 gc-eu-mq:64 gc-us: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"
#pragma increment_block_number "gc-eu:252 gc-eu-mq:252 gc-us:252"
/**
* Get mass type. Immovable colliders cannot be pushed, while heavy colliders can only be pushed by heavy and immovable