mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 14:34:32 +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

6
src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
View file

@ -100,19 +100,19 @@ static ColliderCylinderInit sLightBallCylinderInit = {
static u8 D_808E4C58[] = { 0, 12, 10, 12, 14, 16, 12, 14, 16, 12, 14, 16, 12, 14, 16, 10, 16, 14 };
static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f };
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128"
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-us:128"
static EnGanonMant* sCape;
// TODO: There's probably a way to match BSS ordering with less padding by spreading the variables out and moving
// data around. It would be easier if we had more options for controlling BSS ordering in debug.
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128"
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-us:128"
static s32 sSeed1;
static s32 sSeed2;
static s32 sSeed3;
#pragma increment_block_number "gc-eu:192 gc-eu-mq:192"
#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-us:192"
static BossGanon* sGanondorf;

2
src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c
View file

@ -53,7 +53,7 @@ ActorProfile En_Wonder_Item_Profile = {
/**/ NULL,
};
#pragma increment_block_number "gc-eu:0 gc-eu-mq:0"
#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-us:0"
static Vec3f sTagPointsFree[9];
static Vec3f sTagPointsOrdered[9];

4
src/overlays/actors/ovl_En_Xc/z_en_xc.c
View file

@ -14,7 +14,7 @@
#include "assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h"
#include "terminal.h"
#pragma increment_block_number "gc-eu:0 gc-eu-mq:0"
#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-us:0"
#define FLAGS ACTOR_FLAG_4
@ -1395,7 +1395,7 @@ void func_80B3F3D8(void) {
Sfx_PlaySfxCentered2(NA_SE_PL_SKIP);
}
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128"
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-us:128"
void EnXc_PlayDiveSFX(Vec3f* src, PlayState* play) {
static Vec3f D_80B42DA0;

2
src/overlays/actors/ovl_Fishing/z_fishing.c
View file

@ -11,7 +11,7 @@
#include "ichain.h"
#include "terminal.h"
#pragma increment_block_number "gc-eu:206 gc-eu-mq:206"
#pragma increment_block_number "gc-eu:206 gc-eu-mq:206 gc-us:208"
#define FLAGS ACTOR_FLAG_4

6
src/overlays/actors/ovl_player_actor/z_player.c
View file

@ -354,19 +354,19 @@ void Player_Action_CsAction(Player* this, PlayState* play);
// .bss part 1
#pragma increment_block_number "gc-eu:0 gc-eu-mq:0"
#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-us:0"
static s32 D_80858AA0;
// TODO: There's probably a way to match BSS ordering with less padding by spreading the variables out and moving
// data around. It would be easier if we had more options for controlling BSS ordering in debug.
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128"
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-us:128"
static s32 D_80858AA4;
static Vec3f sInteractWallCheckResult;
static Input* sControlInput;
#pragma increment_block_number "gc-eu:192 gc-eu-mq:192"
#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-us:192"
// .data