summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/enemy/mazaalMacro.c4
-rw-r--r--src/manager/managerF.c16
-rw-r--r--src/npc/npc4E.c8
-rw-r--r--src/npc/rem.c4
-rw-r--r--src/npc/stockwell.c4
-rw-r--r--src/npc/talon.c4
-rw-r--r--src/npc/windTribespeople.c4
-rw-r--r--src/object/object6A.c12
-rw-r--r--src/roomInit.c24
9 files changed, 40 insertions, 40 deletions
diff --git a/src/enemy/mazaalMacro.c b/src/enemy/mazaalMacro.c
index ed28d6c8..ba955777 100644
--- a/src/enemy/mazaalMacro.c
+++ b/src/enemy/mazaalMacro.c
@@ -5,7 +5,7 @@
extern void sub_0807B600(u32);
-extern const u16 script_08012E20[];
+extern const u16 script_MazaalMacroDefeated[];
void sub_08034E18(Entity*);
void sub_08034FA0(Entity*);
@@ -139,7 +139,7 @@ void sub_08034E68(Entity* this) {
if (gScreenTransition.field_0x39 == 0) {
if (sub_08079F8C() != 0) {
this->action = 3;
- scriptExecutionContext = StartCutscene(this, (u16*)script_08012E20);
+ scriptExecutionContext = StartCutscene(this, (u16*)script_MazaalMacroDefeated);
*(ScriptExecutionContext**)&this->cutsceneBeh = scriptExecutionContext;
}
} else {
diff --git a/src/manager/managerF.c b/src/manager/managerF.c
index cc7b7692..bd871e70 100644
--- a/src/manager/managerF.c
+++ b/src/manager/managerF.c
@@ -75,16 +75,16 @@ const ManagerF_HelperStruct gUnk_08108354[] = {
const u32 gUnk_08108354_terminator = 0xFFFF; // terminator for the previous array
-extern u16 script_0800E600[];
-extern u16 script_0800E62C[];
-extern u16 script_0800E658[];
-extern u16 script_0800E684[];
+extern u16 script_PlayerAtDarkNut1[];
+extern u16 script_PlayerAtDarkNut2[];
+extern u16 script_PlayerAtDarkNut3[];
+extern u16 script_PlayerAtMadderpillar[];
u16* const gUnk_08108380[] = {
- script_0800E600,
- script_0800E62C,
- script_0800E658,
- script_0800E684,
+ script_PlayerAtDarkNut1,
+ script_PlayerAtDarkNut2,
+ script_PlayerAtDarkNut3,
+ script_PlayerAtMadderpillar,
};
void sub_08058F44(u32, u32, u32);
diff --git a/src/npc/npc4E.c b/src/npc/npc4E.c
index 84d18da1..41c83e06 100644
--- a/src/npc/npc4E.c
+++ b/src/npc/npc4E.c
@@ -17,8 +17,8 @@ typedef struct {
extern void sub_08078850(Entity*, u32, u8 /* TODO this is a s8 in beedle.c*/, gUnk_0810C89C_struct*);
-extern void script_08016030; // Cutscene data type?
-extern void script_0801606C; // Cutscene data type?
+extern void script_Object3ELeftStoneOpening; // Cutscene data type?
+extern void script_Object3ERightStoneOpening; // Cutscene data type?
const Hitbox gUnk_08114154;
const u8 gUnk_0811415C[];
@@ -142,12 +142,12 @@ void sub_0806DB84(Entity* this, ScriptExecutionContext* context) {
ent = CreateObject(OBJECT_3E, 4, 0);
if (ent != NULL) {
PositionRelative(this, ent, -0x80000, 0);
- *(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &script_08016030);
+ *(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &script_Object3ELeftStoneOpening);
}
ent = CreateObject(OBJECT_3E, 5, 0);
if (ent != NULL) {
PositionRelative(this, ent, 0x80000, 0);
- *(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &script_0801606C);
+ *(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &script_Object3ERightStoneOpening);
}
}
diff --git a/src/npc/rem.c b/src/npc/rem.c
index d3ab32d0..493ce944 100644
--- a/src/npc/rem.c
+++ b/src/npc/rem.c
@@ -6,7 +6,7 @@ extern void sub_0806A8C8(Entity*);
extern void (*gUnk_08112260[])(Entity*);
extern void (*gUnk_08112278[])(Entity*);
-extern void script_08012F0C;
+extern void script_Rem;
extern void sub_08078850(Entity*, u32, u32, u32*);
extern u32 gUnk_0811229C;
@@ -51,7 +51,7 @@ void sub_0806A3D8(Entity* this) {
this->actionDelay = 0xb4;
SetDefaultPriority(this, PRIO_MESSAGE);
sub_0806A8C8(this);
- uVar1 = StartCutscene(this, &script_08012F0C);
+ uVar1 = StartCutscene(this, &script_Rem);
*(ScriptExecutionContext**)&this->cutsceneBeh = uVar1;
sub_0807DD94(this, NULL);
}
diff --git a/src/npc/stockwell.c b/src/npc/stockwell.c
index 454b8b2a..e6beed01 100644
--- a/src/npc/stockwell.c
+++ b/src/npc/stockwell.c
@@ -13,7 +13,7 @@ extern bool32 sub_08056338(void);
extern void sub_08078850(Entity*, u32, u8, u32*);
extern u32 gUnk_0810FDA0;
-extern u16 script_080142B0;
+extern u16 script_Stockwell;
void Stockwell(Entity* this) {
gUnk_0810FDA4[this->action](this);
@@ -32,7 +32,7 @@ void sub_08065080(Entity* this) {
#ifndef EU
sub_08078850(this, 0, 0, &gUnk_0810FDA0);
#endif
- context = StartCutscene(this, &script_080142B0);
+ context = StartCutscene(this, &script_Stockwell);
*(ScriptExecutionContext**)&this->cutsceneBeh = context;
}
diff --git a/src/npc/talon.c b/src/npc/talon.c
index 1ed653fd..a7bc1e81 100644
--- a/src/npc/talon.c
+++ b/src/npc/talon.c
@@ -4,7 +4,7 @@
extern void (*gUnk_0810FEC4[])(Entity* this);
extern void (*gUnk_0810FEBC[])(Entity* this);
extern SpriteLoadData gUnk_0810FEB0;
-extern u8 script_0800B41C;
+extern u8 script_TalonGotKey;
extern u8 gUnk_0810FED8[];
void sub_0806574C(Entity* this);
@@ -103,7 +103,7 @@ void sub_080656D4(Entity* this) {
} else {
if (this->interactType != 0) {
if (GetInventoryValue(0x37) != 0) { // keyLonLon
- StartCutscene(this, (u16*)&script_0800B41C);
+ StartCutscene(this, (u16*)&script_TalonGotKey);
goto label2;
} else {
this->field_0x68.HALF.HI = this->action;
diff --git a/src/npc/windTribespeople.c b/src/npc/windTribespeople.c
index f5e3d57d..a0d979eb 100644
--- a/src/npc/windTribespeople.c
+++ b/src/npc/windTribespeople.c
@@ -15,7 +15,7 @@ extern void (*const gUnk_08113A7C[])(Entity*);
extern void (*const gUnk_08113A8C[])(Entity*, ScriptExecutionContext*);
extern SpriteLoadData gUnk_08113A1C[];
-extern u16 script_08014A80;
+extern u16 script_WindTribespeople6;
extern Dialog gUnk_08113ABC[];
extern u16 gUnk_08113B0C[];
@@ -64,7 +64,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, &script_08014A80);
+ sub_0807DD80(this, &script_WindTribespeople6);
}
}
}
diff --git a/src/object/object6A.c b/src/object/object6A.c
index baeccd92..b1005e1e 100644
--- a/src/object/object6A.c
+++ b/src/object/object6A.c
@@ -16,10 +16,10 @@ extern s16 gUnk_08122B0E[];
extern u16 gUnk_08122B1E[];
extern s8 gUnk_08122B2E[];
-extern u16 script_0800AEDC;
-extern u16 script_0801183C;
+extern u16 script_Object6ATheLittleHat;
+extern u16 script_Object6ASwordInChest;
extern u16 script_08015B14;
-extern u16 script_08011940;
+extern u16 script_ZeldaMagic;
extern u16 script_08012C48;
typedef struct {
@@ -186,7 +186,7 @@ void sub_08094B94(Object6AEntity* this) {
if (e != NULL) {
CopyPosition(&gPlayerEntity, e);
e->z.HALF.HI = -48;
- ((Object6AEntity*)e)->ctx = StartCutscene(e, &script_0800AEDC);
+ ((Object6AEntity*)e)->ctx = StartCutscene(e, &script_Object6ATheLittleHat);
CreateDust(e);
e->z.HALF.HI += 16;
e->y.HALF.HI++;
@@ -535,7 +535,7 @@ void sub_08095244(Object6AEntity* this) {
if (e != NULL) {
e->parent = super;
PositionRelative(super, e, 0x100000, -0x100000);
- ((Object6AEntity*)e)->ctx = StartCutscene(e, &script_0801183C);
+ ((Object6AEntity*)e)->ctx = StartCutscene(e, &script_Object6ASwordInChest);
}
}
}
@@ -804,7 +804,7 @@ void sub_08095810(Object6AEntity* this) {
e->parent = super;
CopyPosition(super, e);
ResolveEntityOnTop(super, e);
- ((Object6AEntity*)e)->ctx = StartCutscene(e, &script_08011940);
+ ((Object6AEntity*)e)->ctx = StartCutscene(e, &script_ZeldaMagic);
}
}
diff --git a/src/roomInit.c b/src/roomInit.c
index e553a20f..15aa6c1b 100644
--- a/src/roomInit.c
+++ b/src/roomInit.c
@@ -390,7 +390,7 @@ u32 sub_unk3_HouseInteriors1_InnWestRoom(void) {
return 1;
}
-extern void* script_08010A5C[];
+extern void* script_PlayerSleepingInn[];
void sub_StateChange_HouseInteriors1_InnWestRoom(void) {
if (CheckLocalFlag(YADO_CHECKIN)) {
@@ -398,7 +398,7 @@ void sub_StateChange_HouseInteriors1_InnWestRoom(void) {
DoFade(5, 256);
gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x50;
gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38;
- sub_080751E8(1, 2, &script_08010A5C);
+ sub_080751E8(1, 2, &script_PlayerSleepingInn);
}
}
@@ -424,7 +424,7 @@ void sub_StateChange_HouseInteriors1_InnMiddleRoom(void) {
DoFade(5, 256);
gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x50;
gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38;
- sub_080751E8(1, 2, &script_08010A5C);
+ sub_080751E8(1, 2, &script_PlayerSleepingInn);
}
}
@@ -450,7 +450,7 @@ void sub_StateChange_HouseInteriors1_InnEastRoom(void) {
DoFade(5, 256);
gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x60;
gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38;
- sub_080751E8(1, 2, &script_08010A5C);
+ sub_080751E8(1, 2, &script_PlayerSleepingInn);
}
}
@@ -665,14 +665,14 @@ u32 sub_unk3_HyruleCastle_4(void) {
return 1;
}
-extern u32 script_08009E88;
+extern u32 script_PlayerWakingUpInHyruleCastle;
void sub_StateChange_HyruleCastle_4(void) {
if (!CheckLocalFlag(CASTLE_04_MEZAME)) {
DoFade(5, 256);
gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0xb0;
gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x40;
- sub_080751E8(0, 6, &script_08009E88);
+ sub_080751E8(0, 6, &script_PlayerWakingUpInHyruleCastle);
#ifdef EU
SoundReq(0x80010000);
gArea.musicIndex = gArea.pMusicIndex;
@@ -4806,14 +4806,14 @@ u32 sub_unk3_HouseInteriors2_LinksHouseBedroom() {
}
extern EntityData gUnk_080F31D8;
-extern u32 script_08009B30;
+extern u32 script_PlayerIntro;
void sub_StateChange_HouseInteriors2_LinksHouseBedroom(void) {
if (!CheckGlobalFlag(START) && !CheckLocalFlag(0x46)) {
sub_080A71C4(5, 1, 4, 4);
gUpdateVisibleTiles = 0;
DoFade(5, 256);
- sub_080751E8(0, 6, &script_08009B30);
+ sub_080751E8(0, 6, &script_PlayerIntro);
}
if (!CheckGlobalFlag(OUTDOOR)) {
gArea.musicIndex = gArea.pMusicIndex;
@@ -4824,12 +4824,12 @@ void sub_StateChange_HouseInteriors2_LinksHouseBedroom(void) {
}
}
-extern u32 script_08009E58;
+extern u32 script_PlayerWakeAfterRest;
void sub_0804E864(void) {
gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x90;
gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38;
- sub_080751E8(1, 6, &script_08009E58);
+ sub_080751E8(1, 6, &script_PlayerWakeAfterRest);
ModHealth(0xa0);
}
@@ -5316,14 +5316,14 @@ u32 sub_unk3_HouseInteriors3_Simon(void) {
}
extern EntityData gUnk_080F5DD0;
-extern u32 script_08011C50;
+extern u32 script_PlayerWakingUpAtSimons;
void sub_StateChange_HouseInteriors3_Simon(void) {
if (gSave.global_progress > 7) {
LoadRoomEntityList(&gUnk_080F5DD0);
}
if (CheckGlobalFlag(MAROYA_WAKEUP)) {
- sub_080751E8(1, 2, &script_08011C50);
+ sub_080751E8(1, 2, &script_PlayerWakingUpAtSimons);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-18 06:49:39 +0000