diff options
| author | zelda2774 <69368340+zelda2774@users.noreply.github.com> | 2021-04-25 20:37:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-25 14:37:32 -0400 |
| commit | 4e81e4a38897fbe27924c1287e51065cbaa2b3ab (patch) | |
| tree | 7bada440754b9fff04c7261c216896b0083b7b21 /src/code | |
| parent | e11e8b709da9108c40c7f964a07725527f677130 (diff) | |
Set __FILE__ in asm_processor (#793)
* Set __FILE__ in asm_processor
* bss fix
* Update to upstream version
Co-authored-by: zelda2774 <zelda2774@invalid>
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_collision_check.c | 1 | ||||
| -rw-r--r-- | src/code/z_parameter.c | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index b66aeda0d..4bc7b5919 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -2254,7 +2254,6 @@ void CollisionCheck_AC_CylVsQuad(GlobalContext* globalCtx, CollisionCheckContext static s8 sBssDummy0; static s8 sBssDummy1; -static s8 sBssDummy2; /** * AC overlap check. Calculates the center of each collider element and the point of contact. diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 859270875..d3fc173de 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -3012,11 +3012,10 @@ s16 D_80125B5C[] = { 91, 91 }; // unused // Due to an unknown reason, bss ordering changes within the 5 static variables in the function below. // In order to restore the correct order, we need a specific number of bss variables in the file before that point. -// For this, we introduce 3 dummy variables which end up in padding at the end of the file's bss, so they don't actually +// For this, we introduce 2 dummy variables which end up in padding at the end of the file's bss, so they don't actually // take space. s8 sBssDummy1; s8 sBssDummy2; -s8 sBssDummy3; #ifdef NON_MATCHING // mostly regalloc, minor ordering and stack usage differences |