Skip to content

Commit ba797bb

Browse files
committed
s11d: Fix function names in landing.c (PR FoxdieTeam#2135)
Replace sub_ placeholders with proper function names from functions.txt: - sub_8001FF2C → GCL_ExecProc (2 occurrences) - sub_80032968 → GM_SeSet2 (2 occurrences) - sub_80037E40 → GM_VoxStream (1 occurrence) - sub_8005D58C → NewPadVibration (2 occurrences) - sub_8008BBA0 → printf (1 occurrence) Total: 8 replacements across landing.c Build verification: s11d.bin matches target hash APPVEYOR=1 enforcement: No blocking warnings
1 parent c4db2bb commit ba797bb

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

source/overlays/s11d/chara/landing/landing.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -524,9 +524,9 @@ void s11d_landing_800CD154(GV_ACT *actor)
524524
extern void GM_ActControl(CONTROL *control);
525525
extern void GM_ConfigObjectRoot(OBJECT *object, CONTROL *control, SVECTOR *vec);
526526
extern void DG_SetPos2(SVECTOR *src, SVECTOR *dst);
527-
extern void sub_8001FF2C(int, int, int); // Unknown function
528-
extern void sub_80032968(int, int, int); // Sound playback
529-
extern void sub_8005D58C(void *, int); // Unknown function
527+
extern void GCL_ExecProc(int, int, int); // Unknown function
528+
extern void GM_SeSet2(int, int, int); // Sound playback
529+
extern void NewPadVibration(void *, int); // Unknown function
530530

531531
// Cast to LandingWork
532532
work = (LandingWork *)actor;
@@ -574,7 +574,7 @@ void s11d_landing_800CD154(GV_ACT *actor)
574574
*(unsigned int *)0x800BB3CC |= 0x104A2000;
575575

576576
// Call initialization function
577-
sub_8001FF2C(work->field_90C, 0, 0x104A2000);
577+
GCL_ExecProc(work->field_90C, 0, 0x104A2000);
578578
}
579579

580580
// Update primitive positions from control position
@@ -622,17 +622,17 @@ void s11d_landing_800CD154(GV_ACT *actor)
622622
if (counter == 8)
623623
{
624624
// Play helicopter sound at frame 8
625-
sub_80032968(0, 0x3F, 0x80);
625+
GM_SeSet2(0, 0x3F, 0x80);
626626
}
627627

628628
if (counter == 24)
629629
{
630630
// Play landing sound at frame 24
631-
sub_80032968(0, 0x3F, 0x81);
631+
GM_SeSet2(0, 0x3F, 0x81);
632632

633633
// Trigger game events
634-
sub_8005D58C((void *)0x800C3348, 1);
635-
sub_8005D58C((void *)0x800C334C, 2);
634+
NewPadVibration((void *)0x800C3348, 1);
635+
NewPadVibration((void *)0x800C334C, 2);
636636
}
637637

638638
// Check for completion/cleanup trigger
@@ -641,7 +641,7 @@ void s11d_landing_800CD154(GV_ACT *actor)
641641
// Trigger final event
642642
work->field_198 = 0;
643643
work->field_1C0 = 15;
644-
sub_8001FF2C(work->field_910, 0, 15);
644+
GCL_ExecProc(work->field_910, 0, 15);
645645

646646
// Disable further updates
647647
work->field_908 = -1;
@@ -657,8 +657,8 @@ void s11d_landing_800CCEBC(void)
657657
int timeout_flag = 0;
658658
extern int GM_StreamStatus(void);
659659
extern void GM_StreamPlayStop(void);
660-
extern void sub_8008BBA0(const char *, int);
661-
extern void sub_80037E40(void);
660+
extern void printf(const char *, int);
661+
extern void GM_VoxStream(void);
662662

663663
// Countdown timer for deferred initialization
664664
if (landing_int_800C3344 != 0)
@@ -719,7 +719,7 @@ void s11d_landing_800CCEBC(void)
719719
landing_int_800C3338 = 0;
720720
landing_byte_800C3335 = 1;
721721
landing_int_800C332C = landing_array_800D1F8C[0];
722-
sub_80037E40();
722+
GM_VoxStream();
723723
}
724724
}
725725
else
@@ -738,7 +738,7 @@ void s11d_landing_800CCEBC(void)
738738
{
739739
// Timeout reached
740740
timeout_flag = 1;
741-
sub_8008BBA0("landing", landing_int_800C332C);
741+
printf("landing", landing_int_800C332C);
742742
GM_StreamPlayStop();
743743
return;
744744
}

0 commit comments

Comments
 (0)