Skip to content

Commit 9564d7a

Browse files
emooseemoose
committed
maps: fix some incomplete shares
1 parent ab777db commit 9564d7a

12 files changed

Lines changed: 30 additions & 14 deletions

File tree

‎include/maps/shared/sharedFunc_800D63D0_0_s00.h‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,23 @@ void sharedFunc_800D63D0_0_s00(s_SubCharacter* chara)
5656

5757
if (newAnimStatus != ANIM_STATUS(0, false))
5858
{
59+
#if !defined(MAP5_S02) && !defined(MAP7_S02)
5960
func_800622B8(3, chara, newAnimStatus, 3);
60-
61+
#endif
6162
flags = &chara->properties_E4.player.afkTimer_E8;
6263
*flags |= 1 << 9;
6364
}
6465
}
66+
67+
#if defined(MAP5_S02) || defined(MAP7_S02)
68+
if (chara->properties_E4.larvalStalker.properties_E8[0].val16[0] & (1 << 9))
69+
{
70+
chara->timer_C6 += FP_MULTIPLY_FLOAT_PRECISE(g_DeltaTime0, 0.25f, Q12_SHIFT);
71+
72+
if (chara->timer_C6 > FP_TIME(1.0f))
73+
{
74+
chara->model_0.charaId_0 = 0;
75+
}
76+
}
77+
#endif
6578
}

‎include/maps/shared/sharedFunc_800D654C_0_s00.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
void sharedFunc_800D654C_0_s00(s_SubCharacter* chara)
2+
{
3+
}

‎include/maps/shared/sharedFunc_800D6554_0_s00.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ void sharedFunc_800D6554_0_s00(s_SubCharacter* chara)
1919
}
2020
else if ((g_SysWork.field_2388.field_154.field_0.field_0.field_0 & 0x3) == 2)
2121
{
22-
#ifdef MAP1_S01
22+
#if defined(MAP1_S00) || defined(MAP1_S01)
2323
var = func_8006FD90(chara, 0, 0xC000, 0);
2424
#else
2525
var = func_8006FD90(chara, 0, 0x10000, 0);

‎src/maps/map0_s00/map0_s00.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ INCLUDE_ASM("asm/maps/map0_s00/nonmatchings/map0_s00", sharedFunc_800D5C64_0_s00
260260

261261
#include "maps/shared/sharedFunc_800D63D0_0_s00.h" // 0x800D63D0
262262

263-
void sharedFunc_800D654C_0_s00(s_SubCharacter* chara) {}
263+
#include "maps/shared/sharedFunc_800D654C_0_s00.h" // 0x800D654C
264264

265265
#include "maps/shared/sharedFunc_800D6554_0_s00.h" // 0x800D6554
266266

‎src/maps/map1_s00/map1_s00.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@ INCLUDE_ASM("asm/maps/map1_s00/nonmatchings/map1_s00", sharedFunc_800D5C64_0_s00
138138

139139
#include "maps/shared/sharedFunc_800D63D0_0_s00.h" // 0x800D5B60
140140

141-
void sharedFunc_800D654C_0_s00(s_SubCharacter* chara) {} // 0x800D5CDC
141+
#include "maps/shared/sharedFunc_800D654C_0_s00.h" // 0x800D5CDC
142142

143-
INCLUDE_ASM("asm/maps/map1_s00/nonmatchings/map1_s00", sharedFunc_800D6554_0_s00); // 0x800D5CE4
143+
#include "maps/shared/sharedFunc_800D6554_0_s00.h" // 0x800D5CE4
144144

145145
#include "maps/shared/sharedFunc_800D670C_0_s00.h" // 0x800D5E9C
146146

‎src/maps/map1_s01/map1_s01.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ INCLUDE_ASM("asm/maps/map1_s01/nonmatchings/map1_s01", sharedFunc_800D5C64_0_s00
126126

127127
#include "maps/shared/sharedFunc_800D63D0_0_s00.h" // 0x800D5158
128128

129-
void sharedFunc_800D654C_0_s00(s_SubCharacter* chara) {} // 0x800D52D4
129+
#include "maps/shared/sharedFunc_800D654C_0_s00.h" // 0x800D52D4
130130

131131
#include "maps/shared/sharedFunc_800D6554_0_s00.h" // 0x800D52DC
132132

‎src/maps/map1_s02/map1_s02.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ INCLUDE_ASM("asm/maps/map1_s02/nonmatchings/map1_s02", sharedFunc_800D5C64_0_s00
132132

133133
#include "maps/shared/sharedFunc_800D63D0_0_s00.h" // 0x800D5FB0
134134

135-
void sharedFunc_800D654C_0_s00(s_SubCharacter* chara) {} // 0x800D612C
135+
#include "maps/shared/sharedFunc_800D654C_0_s00.h" // 0x800D612C
136136

137137
#include "maps/shared/sharedFunc_800D6554_0_s00.h" // 0x800D6134
138138

‎src/maps/map1_s03/map1_s03.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ INCLUDE_ASM("asm/maps/map1_s03/nonmatchings/map1_s03", sharedFunc_800D5C64_0_s00
148148

149149
#include "maps/shared/sharedFunc_800D63D0_0_s00.h" // 0x800D6428
150150

151-
void sharedFunc_800D654C_0_s00(s_SubCharacter* chara) {} // 0x800D65A4
151+
#include "maps/shared/sharedFunc_800D654C_0_s00.h" // 0x800D65A4
152152

153153
#include "maps/shared/sharedFunc_800D6554_0_s00.h" // 0x800D65AC
154154

‎src/maps/map5_s02/map5_s02.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ INCLUDE_ASM("asm/maps/map5_s02/nonmatchings/map5_s02", sharedFunc_800D5C64_0_s00
103103

104104
#include "maps/shared/sharedFunc_800D5FCC_0_s00.h" // 0x800D0E6C
105105

106-
INCLUDE_ASM("asm/maps/map5_s02/nonmatchings/map5_s02", sharedFunc_800D63D0_0_s00); // 0x800D1270
106+
#include "maps/shared/sharedFunc_800D63D0_0_s00.h" // 0x800D1270
107107

108-
void sharedFunc_800D654C_0_s00(s_SubCharacter* chara) {} // 0x800D143C
108+
#include "maps/shared/sharedFunc_800D654C_0_s00.h" // 0x800D143C
109109

110110
#include "maps/shared/sharedFunc_800D6554_0_s00.h" // 0x800D1444
111111

‎src/maps/map6_s03/map6_s03.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ INCLUDE_ASM("asm/maps/map6_s03/nonmatchings/map6_s03", sharedFunc_800D5C64_0_s00
128128

129129
#include "maps/shared/sharedFunc_800D63D0_0_s00.h" // 0x800D267C
130130

131-
void sharedFunc_800D654C_0_s00(s_SubCharacter* chara) {} // 0x800D27F8
131+
#include "maps/shared/sharedFunc_800D654C_0_s00.h" // 0x800D27F8
132132

133133
#include "maps/shared/sharedFunc_800D6554_0_s00.h" // 0x800D2800
134134

0 commit comments

Comments
 (0)