mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-09 06:53:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Prefix script files with script_ instead of gUnk_

Browse Source
This commit is contained in:
octorock
2021-03-06 14:08:28 +01:00
parent 09087886c6
commit 33b1445deb
418 changed files with 1004 additions and 986 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/npc/ezloCap.c
+4 -4
View File
@@ -6,8 +6,8 @@
#include "script.h"
extern Hitbox gUnk_080FD170;
extern void gUnk_08016030; // Cutscene data type?
extern void gUnk_0801606C; // Cutscene data type?
extern void script_08016030; // Cutscene data type?
extern void script_0801606C; // Cutscene data type?
extern void sub_0809623C(Entity*);
extern void sub_08096260(Entity*);
@@ -219,12 +219,12 @@ void sub_0806DB84(Entity* this, u8 unused) {
ent = CreateObject(0x3e, 4, 0);
if (ent != NULL) {
PositionRelative(this, ent, -0x80000, 0);
*(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &gUnk_08016030);
*(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &script_08016030);
}
ent = CreateObject(0x3e, 5, 0);
if (ent != NULL) {
PositionRelative(this, ent, 0x80000, 0);
*(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &gUnk_0801606C);
*(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &script_0801606C);
}
}
src/npc/rem.c
+2 -2
View File
@@ -10,7 +10,7 @@ extern void sub_0806A8C8(Entity*);
extern void (*gUnk_08112260[])(Entity*);
extern void (*gUnk_08112278[])(Entity*);
extern void gUnk_08012F0C;
extern void script_08012F0C;
void Rem(Entity* this) {
gUnk_08112260[this->type](this);
@@ -44,7 +44,7 @@ void sub_0806A3D8(Entity* this) {
this->actionDelay = 0xb4;
sub_0805E3A0(this, 2);
sub_0806A8C8(this);
uVar1 = StartCutscene(this, &gUnk_08012F0C);
uVar1 = StartCutscene(this, &script_08012F0C);
*(ScriptExecutionContext**)&this->cutsceneBeh = uVar1;
sub_0807DD94(this, NULL);
}
src/npc/talon.c
+2 -2
View File
@@ -8,7 +8,7 @@
extern void (*gUnk_0810FEC4[])(Entity* this);
extern void (*gUnk_0810FEBC[])(Entity* this);
extern SpriteLoadData gUnk_0810FEB0;
extern u8 gUnk_0800B41C;
extern u8 script_0800B41C;
extern u8 gUnk_0810FED8[];
void sub_0806574C(Entity* this);
@@ -107,7 +107,7 @@ void sub_080656D4(Entity* this) {
} else {
if (this->interactType != 0) {
if (GetInventoryValue(0x37) != 0) { // keyLonLon
StartCutscene(this, (u16*)&gUnk_0800B41C);
StartCutscene(this, (u16*)&script_0800B41C);
goto label2;
} else {
this->field_0x68.HALF.HI = this->action;
src/npc/windTribespeople.c
+2 -2
View File
@@ -24,7 +24,7 @@ extern void (*const gUnk_08113A7C[])(Entity*);
extern void (*const gUnk_08113A8C[])(Entity*, Entity*);
extern SpriteLoadData gUnk_08113A1C[];
extern u32 gUnk_08014A80;
extern u32 script_08014A80;
extern Dialog gUnk_08113ABC[];
extern u16 gUnk_08113B0C[];
@@ -57,7 +57,7 @@ void sub_0806C7D4(Entity* this) {
sub_0807DD94(this, NULL);
if ((this->type2 == 3) && (!CheckGlobalFlag(WARP_EVENT_END)) && (CheckLocalFlag(0x63)) && (CheckRoomFlag(0))) {
this->type2 = 7;
sub_0807DD80(this, &gUnk_08014A80);
sub_0807DD80(this, &script_08014A80);
}
}
}
src/room.c
+13 -13
View File
@@ -386,7 +386,7 @@ u32 sub_0804B7A8(void) {
return 1;
}
extern void* gUnk_08010A5C[];
extern void* script_08010A5C[];
void sub_0804B7E8(void) {
if (CheckLocalFlag(0x91)) {
@@ -394,7 +394,7 @@ void sub_0804B7E8(void) {
DoFade(5, 0x100);
gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x50;
gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38;
sub_080751E8(1, 2, &gUnk_08010A5C);
sub_080751E8(1, 2, &script_08010A5C);
}
}
@@ -420,7 +420,7 @@ void sub_0804B86C(void) {
DoFade(5, 0x100);
gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x50;
gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38;
sub_080751E8(1, 2, &gUnk_08010A5C);
sub_080751E8(1, 2, &script_08010A5C);
}
}
@@ -440,7 +440,7 @@ u32 sub_0804B8B0(void) {
return 1;
}
extern void* gUnk_08010A5C[];
extern void* script_08010A5C[];
void sub_0804B8F0(void) {
if (CheckLocalFlag(0x91)) {
@@ -448,7 +448,7 @@ void sub_0804B8F0(void) {
DoFade(5, 0x100);
gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x60;
gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38;
sub_080751E8(1, 2, &gUnk_08010A5C);
sub_080751E8(1, 2, &script_08010A5C);
}
}
@@ -648,14 +648,14 @@ u32 sub_0804BC50(void) {
return 1;
}
extern u32 gUnk_08009E88;
extern u32 script_08009E88;
void sub_0804BC70(void) {
if (!CheckLocalFlag(0x9f)) {
DoFade(5, 0x100);
gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0xb0;
gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x40;
sub_080751E8(0, 6, &gUnk_08009E88);
sub_080751E8(0, 6, &script_08009E88);
}
if (!CheckGlobalFlag(TABIDACHI)) {
sub_08052878();
@@ -4774,7 +4774,7 @@ u32 sub_0804E7D8() {
extern EntityData gUnk_080F31D8;
extern u8 gUnk_02000070;
extern u32 gUnk_08009B30;
extern u32 script_08009B30;
void sub_0804E7DC(void) {
@@ -4782,7 +4782,7 @@ void sub_0804E7DC(void) {
sub_080A71C4(5, 1, 4, 4);
gUnk_02000070 = 0;
DoFade(5, 0x100);
sub_080751E8(0, 6, &gUnk_08009B30);
sub_080751E8(0, 6, &script_08009B30);
}
if (!CheckGlobalFlag(OUTDOOR)) {
gArea.musicIndex = gArea.pMusicIndex;
@@ -4793,12 +4793,12 @@ void sub_0804E7DC(void) {
}
}
extern u32 gUnk_08009E58;
extern u32 script_08009E58;
void sub_0804E864(void) {
gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x90;
gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38;
sub_080751E8(1, 6, &gUnk_08009E58);
sub_080751E8(1, 6, &script_08009E58);
ModHealth(0xa0);
}
@@ -5274,14 +5274,14 @@ u32 sub_0804EFDC(void) {
}
extern EntityData gUnk_080F5DD0;
extern u32 gUnk_08011C50;
extern u32 script_08011C50;
void sub_0804EFF8(void) {
if (gSave.unk8 > 7) {
LoadRoomEntityList(&gUnk_080F5DD0);
}
if (CheckGlobalFlag(MAROYA_WAKEUP)) {
sub_080751E8(1, 2, &gUnk_08011C50);
sub_080751E8(1, 2, &script_08011C50);
}
}