diff --git a/config/overlays.mk b/config/overlays.mk index a47876ab6..efd916a08 100644 --- a/config/overlays.mk +++ b/config/overlays.mk @@ -30,6 +30,7 @@ build/src/ov_SC01_077/ov_SC01_077_jr_801588CC.o: JTBL_PADS := 0,4 # §8e pads ( build/src/ov_SC01_077/ov_SC01_077_jr_80159C84.o: JTBL_PADS := 0,4 # §8e pads (jtbl_carve.py) tables=+0x0,+0x20 build/src/ov_SC01_077/ov_SC01_077_jr_8015AE2C.o: JTBL_PADS := 0,4 # §8e pads (jtbl_carve.py) tables=+0x0,+0x20 build/src/ov_SC01_077/ov_SC01_077_jr_8016AB6C.o: JTBL_PADS := 0,0 # §8e pads (jtbl_carve.py) tables=+0x0,+0x20 +build/src/ov_SC01_077/ov_SC01_077_jr_80178D40.o: JTBL_PADS := 0,0 # §8e pads (jtbl_carve.py) tables=+0x0,+0x178 ov_SC01_077_CHECK_SHA := config/check.ov_SC01_077.sha ov_SC01_077_SYMBOLS := config/symbols.ov_SC01_077.txt ov_SC01_077_SIG := .run/sig.ov_SC01_077.jsonl diff --git a/config/splat.ov_SC01_077.yaml b/config/splat.ov_SC01_077.yaml index dcb785516..7033ed12a 100644 --- a/config/splat.ov_SC01_077.yaml +++ b/config/splat.ov_SC01_077.yaml @@ -128,7 +128,7 @@ segments: - [0xb0b10, .rodata, ov_SC01_077_jr_801734BC] # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py) - [0xb0b24, data, tail16] - [0xb0ccc, .rodata, ov_SC01_077_jr_80178D40] # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py) - - [0xb0e44, data, tail17] + - [0xb0ed0, data, tail17] - [0xb0ed4, .rodata, ov_SC01_077_jr_8017A4AC] # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py) - [0xb0f60, data, tail18] - [0xb0f64, .rodata, ov_SC01_077_jr_8017AE2C] # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py) diff --git a/src/ov_SC01_000/ov_SC01_000_jr_80178D40.c b/src/ov_SC01_000/ov_SC01_000_jr_80178D40.c index e93c7ad6e..01bb521f0 100644 --- a/src/ov_SC01_000/ov_SC01_000_jr_80178D40.c +++ b/src/ov_SC01_000/ov_SC01_000_jr_80178D40.c @@ -3324,7 +3324,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A568C; void func_8017A094(s32 arg0) { @@ -3337,7 +3337,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A568C; void func_8017A0C4(s32 arg0) { @@ -3355,7 +3355,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801A56B4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC01_000/ov_SC01_000_jr_8017A4AC.c b/src/ov_SC01_000/ov_SC01_000_jr_8017A4AC.c index c00d8d60a..7407d56ee 100644 --- a/src/ov_SC01_000/ov_SC01_000_jr_8017A4AC.c +++ b/src/ov_SC01_000/ov_SC01_000_jr_8017A4AC.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_000/ov_SC01_000_jr_8017AE2C.c b/src/ov_SC01_000/ov_SC01_000_jr_8017AE2C.c index 9a4ef3ab7..7109f7d4f 100644 --- a/src/ov_SC01_000/ov_SC01_000_jr_8017AE2C.c +++ b/src/ov_SC01_000/ov_SC01_000_jr_8017AE2C.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_000/ov_SC01_000_jr_8017BEBC.c b/src/ov_SC01_000/ov_SC01_000_jr_8017BEBC.c index 60422babf..ed7effbb8 100644 --- a/src/ov_SC01_000/ov_SC01_000_jr_8017BEBC.c +++ b/src/ov_SC01_000/ov_SC01_000_jr_8017BEBC.c @@ -2549,17 +2549,17 @@ extern short D_801A58E4; extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_001/ov_SC01_001_jr_80178D40.c b/src/ov_SC01_001/ov_SC01_001_jr_80178D40.c index 304ac3f1b..cafad3482 100644 --- a/src/ov_SC01_001/ov_SC01_001_jr_80178D40.c +++ b/src/ov_SC01_001/ov_SC01_001_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801ED91C; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801ED91C; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801ED944; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC01_001/ov_SC01_001_jr_8017A4AC.c b/src/ov_SC01_001/ov_SC01_001_jr_8017A4AC.c index ffb65f9f5..d1d63319d 100644 --- a/src/ov_SC01_001/ov_SC01_001_jr_8017A4AC.c +++ b/src/ov_SC01_001/ov_SC01_001_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_001/ov_SC01_001_jr_8017AE2C.c b/src/ov_SC01_001/ov_SC01_001_jr_8017AE2C.c index 844bb248e..0cea6b403 100644 --- a/src/ov_SC01_001/ov_SC01_001_jr_8017AE2C.c +++ b/src/ov_SC01_001/ov_SC01_001_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_001/ov_SC01_001_jr_8017BEBC.c b/src/ov_SC01_001/ov_SC01_001_jr_8017BEBC.c index d898bf974..107a8f86d 100644 --- a/src/ov_SC01_001/ov_SC01_001_jr_8017BEBC.c +++ b/src/ov_SC01_001/ov_SC01_001_jr_8017BEBC.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_001/ov_SC01_001_jr_8017D2DC.c b/src/ov_SC01_001/ov_SC01_001_jr_8017D2DC.c index 69dd0591d..3e40864b5 100644 --- a/src/ov_SC01_001/ov_SC01_001_jr_8017D2DC.c +++ b/src/ov_SC01_001/ov_SC01_001_jr_8017D2DC.c @@ -2541,17 +2541,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_004/ov_SC01_004_jr_80178D40.c b/src/ov_SC01_004/ov_SC01_004_jr_80178D40.c index bac2e1580..cb9adf262 100644 --- a/src/ov_SC01_004/ov_SC01_004_jr_80178D40.c +++ b/src/ov_SC01_004/ov_SC01_004_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_80190084; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_80190084; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801900AC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC01_004/ov_SC01_004_jr_8017A4AC.c b/src/ov_SC01_004/ov_SC01_004_jr_8017A4AC.c index 3f236f557..f7095f268 100644 --- a/src/ov_SC01_004/ov_SC01_004_jr_8017A4AC.c +++ b/src/ov_SC01_004/ov_SC01_004_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_004/ov_SC01_004_jr_8017AE2C.c b/src/ov_SC01_004/ov_SC01_004_jr_8017AE2C.c index 2d9102f61..d304ff852 100644 --- a/src/ov_SC01_004/ov_SC01_004_jr_8017AE2C.c +++ b/src/ov_SC01_004/ov_SC01_004_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_004/ov_SC01_004_jr_8017BE9C.c b/src/ov_SC01_004/ov_SC01_004_jr_8017BE9C.c index 3b9e6c97b..1ed060f7b 100644 --- a/src/ov_SC01_004/ov_SC01_004_jr_8017BE9C.c +++ b/src/ov_SC01_004/ov_SC01_004_jr_8017BE9C.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_005/ov_SC01_005_jr_80178D40.c b/src/ov_SC01_005/ov_SC01_005_jr_80178D40.c index e8571aead..4a3a34fe4 100644 --- a/src/ov_SC01_005/ov_SC01_005_jr_80178D40.c +++ b/src/ov_SC01_005/ov_SC01_005_jr_80178D40.c @@ -3323,7 +3323,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801CD7E4; void func_8017A094(s32 arg0) { @@ -3336,7 +3336,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801CD7E4; void func_8017A0C4(s32 arg0) { @@ -3354,7 +3354,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801CD80C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC01_005/ov_SC01_005_jr_8017A4AC.c b/src/ov_SC01_005/ov_SC01_005_jr_8017A4AC.c index 0c18af2b7..5dcd49ba1 100644 --- a/src/ov_SC01_005/ov_SC01_005_jr_8017A4AC.c +++ b/src/ov_SC01_005/ov_SC01_005_jr_8017A4AC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_005/ov_SC01_005_jr_8017AE2C.c b/src/ov_SC01_005/ov_SC01_005_jr_8017AE2C.c index 099bd6c0c..b845726b1 100644 --- a/src/ov_SC01_005/ov_SC01_005_jr_8017AE2C.c +++ b/src/ov_SC01_005/ov_SC01_005_jr_8017AE2C.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_005/ov_SC01_005_jr_8017C340.c b/src/ov_SC01_005/ov_SC01_005_jr_8017C340.c index a62d2160e..d76d4f13b 100644 --- a/src/ov_SC01_005/ov_SC01_005_jr_8017C340.c +++ b/src/ov_SC01_005/ov_SC01_005_jr_8017C340.c @@ -2549,17 +2549,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_006/ov_SC01_006_jr_80178D40.c b/src/ov_SC01_006/ov_SC01_006_jr_80178D40.c index 147e5935b..73363b5d1 100644 --- a/src/ov_SC01_006/ov_SC01_006_jr_80178D40.c +++ b/src/ov_SC01_006/ov_SC01_006_jr_80178D40.c @@ -3323,7 +3323,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801CD7E4; void func_8017A094(s32 arg0) { @@ -3336,7 +3336,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801CD7E4; void func_8017A0C4(s32 arg0) { @@ -3354,7 +3354,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801CD80C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC01_006/ov_SC01_006_jr_8017A4AC.c b/src/ov_SC01_006/ov_SC01_006_jr_8017A4AC.c index 0c18af2b7..5dcd49ba1 100644 --- a/src/ov_SC01_006/ov_SC01_006_jr_8017A4AC.c +++ b/src/ov_SC01_006/ov_SC01_006_jr_8017A4AC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_006/ov_SC01_006_jr_8017AE2C.c b/src/ov_SC01_006/ov_SC01_006_jr_8017AE2C.c index be255f838..d5164d85e 100644 --- a/src/ov_SC01_006/ov_SC01_006_jr_8017AE2C.c +++ b/src/ov_SC01_006/ov_SC01_006_jr_8017AE2C.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_006/ov_SC01_006_jr_8017C340.c b/src/ov_SC01_006/ov_SC01_006_jr_8017C340.c index e723be531..5059d5864 100644 --- a/src/ov_SC01_006/ov_SC01_006_jr_8017C340.c +++ b/src/ov_SC01_006/ov_SC01_006_jr_8017C340.c @@ -2549,17 +2549,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_008/ov_SC01_008_jr_80178D40.c b/src/ov_SC01_008/ov_SC01_008_jr_80178D40.c index 4f6e88bdc..9e3cdea05 100644 --- a/src/ov_SC01_008/ov_SC01_008_jr_80178D40.c +++ b/src/ov_SC01_008/ov_SC01_008_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A3294; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A3294; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801A32BC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC01_008/ov_SC01_008_jr_8017A4AC.c b/src/ov_SC01_008/ov_SC01_008_jr_8017A4AC.c index bbc73bfc0..0c53b1d84 100644 --- a/src/ov_SC01_008/ov_SC01_008_jr_8017A4AC.c +++ b/src/ov_SC01_008/ov_SC01_008_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_008/ov_SC01_008_jr_8017AE2C.c b/src/ov_SC01_008/ov_SC01_008_jr_8017AE2C.c index c73dff65c..493d5865a 100644 --- a/src/ov_SC01_008/ov_SC01_008_jr_8017AE2C.c +++ b/src/ov_SC01_008/ov_SC01_008_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_008/ov_SC01_008_jr_8017BE9C.c b/src/ov_SC01_008/ov_SC01_008_jr_8017BE9C.c index cd5bcd792..975988c42 100644 --- a/src/ov_SC01_008/ov_SC01_008_jr_8017BE9C.c +++ b/src/ov_SC01_008/ov_SC01_008_jr_8017BE9C.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_009/ov_SC01_009_jr_80178D40.c b/src/ov_SC01_009/ov_SC01_009_jr_80178D40.c index 3eeed2408..b93f17bc3 100644 --- a/src/ov_SC01_009/ov_SC01_009_jr_80178D40.c +++ b/src/ov_SC01_009/ov_SC01_009_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801F30F4; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801F30F4; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801F311C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC01_009/ov_SC01_009_jr_8017A4AC.c b/src/ov_SC01_009/ov_SC01_009_jr_8017A4AC.c index 7ec6e5645..9dcf450df 100644 --- a/src/ov_SC01_009/ov_SC01_009_jr_8017A4AC.c +++ b/src/ov_SC01_009/ov_SC01_009_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_009/ov_SC01_009_jr_8017AE2C.c b/src/ov_SC01_009/ov_SC01_009_jr_8017AE2C.c index af54df25f..decadc932 100644 --- a/src/ov_SC01_009/ov_SC01_009_jr_8017AE2C.c +++ b/src/ov_SC01_009/ov_SC01_009_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_009/ov_SC01_009_jr_8017BE9C.c b/src/ov_SC01_009/ov_SC01_009_jr_8017BE9C.c index 176869bb9..4a0ef6d23 100644 --- a/src/ov_SC01_009/ov_SC01_009_jr_8017BE9C.c +++ b/src/ov_SC01_009/ov_SC01_009_jr_8017BE9C.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_074/ov_SC01_074_jr_80178D40.c b/src/ov_SC01_074/ov_SC01_074_jr_80178D40.c index 232850e79..8f7a25dbd 100644 --- a/src/ov_SC01_074/ov_SC01_074_jr_80178D40.c +++ b/src/ov_SC01_074/ov_SC01_074_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019BB74; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019BB74; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8019BB9C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC01_074/ov_SC01_074_jr_8017A4AC.c b/src/ov_SC01_074/ov_SC01_074_jr_8017A4AC.c index e8c35cbcd..dc0bdd738 100644 --- a/src/ov_SC01_074/ov_SC01_074_jr_8017A4AC.c +++ b/src/ov_SC01_074/ov_SC01_074_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_074/ov_SC01_074_jr_8017AE2C.c b/src/ov_SC01_074/ov_SC01_074_jr_8017AE2C.c index 4e7cd00cc..bedfd5dde 100644 --- a/src/ov_SC01_074/ov_SC01_074_jr_8017AE2C.c +++ b/src/ov_SC01_074/ov_SC01_074_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_074/ov_SC01_074_jr_8017BE9C.c b/src/ov_SC01_074/ov_SC01_074_jr_8017BE9C.c index 6915f80ac..6b86a5087 100644 --- a/src/ov_SC01_074/ov_SC01_074_jr_8017BE9C.c +++ b/src/ov_SC01_074/ov_SC01_074_jr_8017BE9C.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_077/ov_SC01_077_jr_80178D40.c b/src/ov_SC01_077/ov_SC01_077_jr_80178D40.c index f83a25fa2..b9ea3fecb 100644 --- a/src/ov_SC01_077/ov_SC01_077_jr_80178D40.c +++ b/src/ov_SC01_077/ov_SC01_077_jr_80178D40.c @@ -3433,7 +3433,84 @@ Lend: DEFINE_func_80179B28() /* dedup: shared engine-core @0x80179B28 (src/shared) */ -INCLUDE_ASM("asm/ov_SC01_077/nonmatchings/ov_SC01_077_jr_80178D40", func_80179B74); +// @class: schedule +// @stuck: none — MATCH (111 ins). symcheck: data syms CLEAN (D_801DA310/D_801DA714, 0 INVENTED); its lone MISSING is jtbl_801D8F9C, the COMPILER-emitted table ($L17 -> .rdata) — banking needs the §8a/§8e rodata-island flip (35 entries, .align 3), not a source-side ref. +/* func_80179B74 (ov_SC01_077) — command-queue WRITER: copies the opcode + its + * operand halfwords from *p into the 0x200-entry ring D_801DA310 at write index + * D_801DA714. Mirror of the reader func_8017A4AC (same ring, read index D_801DA710). + * + * Three levers were needed on top of the obvious shape (each byte-proven here): + * 1. jtbl SPAN — the target's table is 35 entries (0..0x22) with NO `addiu a0,a0,-1` + * bias and `sltiu v0,a0,0x23`, so the source must contain an empty `case 0:` and + * an empty `case 0x22:`; without them gcc biases by -1 and emits sltiu 0x20. + * 2. SCHEDULE — the operand push must route through a NAMED block-scoped temp + * (`{ s16 t = *p++; ring[idx] = t; ... }`). Written as the anonymous + * `ring[idx] = *p++;` the sched1 pass puts the `lh D_801DA714` ahead of the + * `lhu 0(a1)` in exactly the two blocks that also carry a live `addiu a1,a1,2` + * (cases {1,5} and {0x17,0x1c,0x1d,0x20}) — 6 of the 8 residual mismatches. + * The temp gives the loaded value its own pseudo and flips those two blocks. + * 3. FRAME — the target reserves 0x80 with NO saves and NO spills; gcc's own + * (unused) area for this body is 0x58, so +0x28 of address-taken local is + * required: `s32 pad[10]; (void)&pad;` (cookbook §17 phantom-frame INDUCE + * lever). 10 words exactly; 8 -> 0x78 and 12 -> 0x88 both miss. + * + * Case-block ORDER in the source is the emitted block order: {1,5} then {0x13} + * then {2,3,4,6,0x12,0x14,0x1f} then {0x17,0x1c,0x1d,0x20}. The 3-/2-/1-push + * tails are then cross-jump merged (no calls, so §88 does not block it) into the + * shared .L80179CE4 / .L80179D08 tail that sits after the last case block. + * + * Symbols are the splat spellings and match the sibling TU ov_SC01_077_jr_8017A4AC.c + * (`extern u16 D_801DA310[0x200];` / `extern s16 D_801DA714;`) so the whole-binary + * link and any one-big-TU build see one consistent type. + */ + +extern u16 D_801DA310[0x200]; +extern s16 D_801DA714; + +void func_80179B74(u16 *p) { + s32 pad[10]; + s16 c; + + (void)&pad; + c = *p++; + D_801DA310[D_801DA714] = c; + D_801DA714 = (D_801DA714 + 1) & 0x1FF; + switch (c) { + case 0: + break; + case 1: + case 5: + { s16 t = *p++; D_801DA310[D_801DA714] = t; D_801DA714 = (D_801DA714 + 1) & 0x1FF; } + { s16 t = *p++; D_801DA310[D_801DA714] = t; D_801DA714 = (D_801DA714 + 1) & 0x1FF; } + { s16 t = *p++; D_801DA310[D_801DA714] = t; D_801DA714 = (D_801DA714 + 1) & 0x1FF; } + break; + case 0x13: + { s16 t = *p++; D_801DA310[D_801DA714] = t; D_801DA714 = (D_801DA714 + 1) & 0x1FF; } + { s16 t = *p++; D_801DA310[D_801DA714] = t; D_801DA714 = (D_801DA714 + 1) & 0x1FF; } + break; + case 2: + case 3: + case 4: + case 6: + case 0x12: + case 0x14: + case 0x1F: + { s16 t = *p++; D_801DA310[D_801DA714] = t; D_801DA714 = (D_801DA714 + 1) & 0x1FF; } + break; + case 0x17: + case 0x1C: + case 0x1D: + case 0x20: + { s16 t = *p++; D_801DA310[D_801DA714] = t; D_801DA714 = (D_801DA714 + 1) & 0x1FF; } + { s16 t = *p++; D_801DA310[D_801DA714] = t; D_801DA714 = (D_801DA714 + 1) & 0x1FF; } + { s16 t = *p++; D_801DA310[D_801DA714] = t; D_801DA714 = (D_801DA714 + 1) & 0x1FF; } + { s16 t = *p++; D_801DA310[D_801DA714] = t; D_801DA714 = (D_801DA714 + 1) & 0x1FF; } + break; + case 0x22: + break; + } +} + DEFINE_func_80179D30() /* dedup: shared engine-core @0x80179D30 (src/shared) */ @@ -3445,7 +3522,7 @@ DEFINE_func_80179DF8() /* dedup: shared engine-core @0x80179DF8 (src/shared) */ DEFINE_func_80179E1C() /* dedup: shared engine-core @0x80179E1C (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_80179E48(s16 a0) { s16 sp[2]; @@ -3454,7 +3531,7 @@ void func_80179E48(s16 a0) { func_80179B74(sp); } -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_80179E74(s16 a0) { s16 sp[2]; @@ -3467,7 +3544,7 @@ DEFINE_func_80179EA0() /* dedup: shared engine-core @0x80179EA0 (src/shared) */ DEFINE_func_80179EE8() /* dedup: shared engine-core @0x80179EE8 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_80179F14(s16 a0, s16 a1) { s16 sp[3]; @@ -3487,7 +3564,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801DA734; void func_8017A094(s32 arg0) { @@ -3498,7 +3575,7 @@ void func_8017A094(s32 arg0) { func_80179B74(&sp10); } -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801DA734; void func_8017A0C4(s32 arg0) { @@ -3514,7 +3591,7 @@ DEFINE_func_8017A0F4() /* dedup: shared engine-core @0x8017A0F4 (src/shared) */ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801DA75C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC01_077/ov_SC01_077_jr_8017A4AC.c b/src/ov_SC01_077/ov_SC01_077_jr_8017A4AC.c index 86185a58c..b8f112dc6 100644 --- a/src/ov_SC01_077/ov_SC01_077_jr_8017A4AC.c +++ b/src/ov_SC01_077/ov_SC01_077_jr_8017A4AC.c @@ -2691,17 +2691,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern M2C_UNK func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_077/ov_SC01_077_jr_8017AE2C.c b/src/ov_SC01_077/ov_SC01_077_jr_8017AE2C.c index 5334076f2..c537bb16d 100644 --- a/src/ov_SC01_077/ov_SC01_077_jr_8017AE2C.c +++ b/src/ov_SC01_077/ov_SC01_077_jr_8017AE2C.c @@ -2691,17 +2691,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern M2C_UNK func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_077/ov_SC01_077_jr_80182268.c b/src/ov_SC01_077/ov_SC01_077_jr_80182268.c index d72d4a3b2..6f4f71c57 100644 --- a/src/ov_SC01_077/ov_SC01_077_jr_80182268.c +++ b/src/ov_SC01_077/ov_SC01_077_jr_80182268.c @@ -2704,17 +2704,17 @@ extern short D_801DAB2C; extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_080/ov_SC01_080_jr_80178D40.c b/src/ov_SC01_080/ov_SC01_080_jr_80178D40.c index b2e4ef933..35488e299 100644 --- a/src/ov_SC01_080/ov_SC01_080_jr_80178D40.c +++ b/src/ov_SC01_080/ov_SC01_080_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C59A4; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C59A4; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801C59CC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC01_080/ov_SC01_080_jr_8017A4AC.c b/src/ov_SC01_080/ov_SC01_080_jr_8017A4AC.c index 615dc8afb..286f239a0 100644 --- a/src/ov_SC01_080/ov_SC01_080_jr_8017A4AC.c +++ b/src/ov_SC01_080/ov_SC01_080_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_080/ov_SC01_080_jr_8017AE2C.c b/src/ov_SC01_080/ov_SC01_080_jr_8017AE2C.c index d4e1fdc2a..3909ec1cb 100644 --- a/src/ov_SC01_080/ov_SC01_080_jr_8017AE2C.c +++ b/src/ov_SC01_080/ov_SC01_080_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_084/ov_SC01_084_jr_80178D40.c b/src/ov_SC01_084/ov_SC01_084_jr_80178D40.c index a043a830e..982e6e609 100644 --- a/src/ov_SC01_084/ov_SC01_084_jr_80178D40.c +++ b/src/ov_SC01_084/ov_SC01_084_jr_80178D40.c @@ -3323,7 +3323,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C744C; void func_8017A094(s32 arg0) { @@ -3336,7 +3336,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C744C; void func_8017A0C4(s32 arg0) { @@ -3354,7 +3354,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801C7474; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC01_084/ov_SC01_084_jr_8017A4AC.c b/src/ov_SC01_084/ov_SC01_084_jr_8017A4AC.c index 015864965..0cd6f12b5 100644 --- a/src/ov_SC01_084/ov_SC01_084_jr_8017A4AC.c +++ b/src/ov_SC01_084/ov_SC01_084_jr_8017A4AC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_084/ov_SC01_084_jr_8017AE2C.c b/src/ov_SC01_084/ov_SC01_084_jr_8017AE2C.c index 89836d357..a19f336ae 100644 --- a/src/ov_SC01_084/ov_SC01_084_jr_8017AE2C.c +++ b/src/ov_SC01_084/ov_SC01_084_jr_8017AE2C.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC01_084/ov_SC01_084_jr_8017CA80.c b/src/ov_SC01_084/ov_SC01_084_jr_8017CA80.c index 8360d4c4e..9441ef5b6 100644 --- a/src/ov_SC01_084/ov_SC01_084_jr_8017CA80.c +++ b/src/ov_SC01_084/ov_SC01_084_jr_8017CA80.c @@ -2549,17 +2549,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_000/ov_SC02_000_jr_80178D40.c b/src/ov_SC02_000/ov_SC02_000_jr_80178D40.c index 7253d55c6..6fcedc32f 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_80178D40.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_80178D40.c @@ -3320,7 +3320,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801E7F7C; void func_8017A094(s32 arg0) { @@ -3333,7 +3333,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801E7F7C; void func_8017A0C4(s32 arg0) { @@ -3351,7 +3351,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801E7FA4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC02_000/ov_SC02_000_jr_8017A4AC.c b/src/ov_SC02_000/ov_SC02_000_jr_8017A4AC.c index 478928db8..8fb182bd0 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_8017A4AC.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_8017A4AC.c @@ -2544,17 +2544,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_000/ov_SC02_000_jr_8017AE2C.c b/src/ov_SC02_000/ov_SC02_000_jr_8017AE2C.c index 26a6f5d51..5403ae397 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_8017AE2C.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_8017AE2C.c @@ -2544,17 +2544,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_000/ov_SC02_000_jr_8017FCB0.c b/src/ov_SC02_000/ov_SC02_000_jr_8017FCB0.c index 732dcb1f0..c06117041 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_8017FCB0.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_8017FCB0.c @@ -2556,17 +2556,17 @@ extern short D_801E8864; extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_003/ov_SC02_003_jr_80178D40.c b/src/ov_SC02_003/ov_SC02_003_jr_80178D40.c index 6168978c2..4ec359f31 100644 --- a/src/ov_SC02_003/ov_SC02_003_jr_80178D40.c +++ b/src/ov_SC02_003/ov_SC02_003_jr_80178D40.c @@ -3320,7 +3320,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801E7F7C; void func_8017A094(s32 arg0) { @@ -3333,7 +3333,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801E7F7C; void func_8017A0C4(s32 arg0) { @@ -3351,7 +3351,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801E7FA4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC02_003/ov_SC02_003_jr_8017A4AC.c b/src/ov_SC02_003/ov_SC02_003_jr_8017A4AC.c index 478928db8..8fb182bd0 100644 --- a/src/ov_SC02_003/ov_SC02_003_jr_8017A4AC.c +++ b/src/ov_SC02_003/ov_SC02_003_jr_8017A4AC.c @@ -2544,17 +2544,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_003/ov_SC02_003_jr_8017AE2C.c b/src/ov_SC02_003/ov_SC02_003_jr_8017AE2C.c index 100a07a7a..d53982661 100644 --- a/src/ov_SC02_003/ov_SC02_003_jr_8017AE2C.c +++ b/src/ov_SC02_003/ov_SC02_003_jr_8017AE2C.c @@ -2544,17 +2544,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_003/ov_SC02_003_jr_8017FCB0.c b/src/ov_SC02_003/ov_SC02_003_jr_8017FCB0.c index c65c865ae..bf2933d0b 100644 --- a/src/ov_SC02_003/ov_SC02_003_jr_8017FCB0.c +++ b/src/ov_SC02_003/ov_SC02_003_jr_8017FCB0.c @@ -2556,17 +2556,17 @@ extern short D_801E8864; extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_004/ov_SC02_004_jr_80178D40.c b/src/ov_SC02_004/ov_SC02_004_jr_80178D40.c index 7834653ed..79f946596 100644 --- a/src/ov_SC02_004/ov_SC02_004_jr_80178D40.c +++ b/src/ov_SC02_004/ov_SC02_004_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801961CC; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801961CC; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801961F4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC02_004/ov_SC02_004_jr_8017A4AC.c b/src/ov_SC02_004/ov_SC02_004_jr_8017A4AC.c index c113feba9..79aec1a90 100644 --- a/src/ov_SC02_004/ov_SC02_004_jr_8017A4AC.c +++ b/src/ov_SC02_004/ov_SC02_004_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_004/ov_SC02_004_jr_8017AE2C.c b/src/ov_SC02_004/ov_SC02_004_jr_8017AE2C.c index 0441e5a3e..6c528b115 100644 --- a/src/ov_SC02_004/ov_SC02_004_jr_8017AE2C.c +++ b/src/ov_SC02_004/ov_SC02_004_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_005/ov_SC02_005_jr_80178D40.c b/src/ov_SC02_005/ov_SC02_005_jr_80178D40.c index 734de6586..79a55ddb8 100644 --- a/src/ov_SC02_005/ov_SC02_005_jr_80178D40.c +++ b/src/ov_SC02_005/ov_SC02_005_jr_80178D40.c @@ -3324,7 +3324,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801E4244; void func_8017A094(s32 arg0) { @@ -3337,7 +3337,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801E4244; void func_8017A0C4(s32 arg0) { @@ -3355,7 +3355,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801E426C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC02_005/ov_SC02_005_jr_8017A4AC.c b/src/ov_SC02_005/ov_SC02_005_jr_8017A4AC.c index 720e6e2ad..b26812719 100644 --- a/src/ov_SC02_005/ov_SC02_005_jr_8017A4AC.c +++ b/src/ov_SC02_005/ov_SC02_005_jr_8017A4AC.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_005/ov_SC02_005_jr_8017AE2C.c b/src/ov_SC02_005/ov_SC02_005_jr_8017AE2C.c index 674211e46..730b6e6ba 100644 --- a/src/ov_SC02_005/ov_SC02_005_jr_8017AE2C.c +++ b/src/ov_SC02_005/ov_SC02_005_jr_8017AE2C.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_011/ov_SC02_011_jr_80178D40.c b/src/ov_SC02_011/ov_SC02_011_jr_80178D40.c index d3edea086..5db65c109 100644 --- a/src/ov_SC02_011/ov_SC02_011_jr_80178D40.c +++ b/src/ov_SC02_011/ov_SC02_011_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801EB124; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801EB124; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801EB14C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC02_011/ov_SC02_011_jr_8017A4AC.c b/src/ov_SC02_011/ov_SC02_011_jr_8017A4AC.c index d28e07d8c..ddfdcf49d 100644 --- a/src/ov_SC02_011/ov_SC02_011_jr_8017A4AC.c +++ b/src/ov_SC02_011/ov_SC02_011_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_011/ov_SC02_011_jr_8017AE2C.c b/src/ov_SC02_011/ov_SC02_011_jr_8017AE2C.c index 1f9430da9..e35fa5f48 100644 --- a/src/ov_SC02_011/ov_SC02_011_jr_8017AE2C.c +++ b/src/ov_SC02_011/ov_SC02_011_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_015/ov_SC02_015_jr_80178D40.c b/src/ov_SC02_015/ov_SC02_015_jr_80178D40.c index 9319d1577..88ca0aec0 100644 --- a/src/ov_SC02_015/ov_SC02_015_jr_80178D40.c +++ b/src/ov_SC02_015/ov_SC02_015_jr_80178D40.c @@ -3320,7 +3320,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801902A4; void func_8017A094(s32 arg0) { @@ -3333,7 +3333,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801902A4; void func_8017A0C4(s32 arg0) { @@ -3351,7 +3351,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801902CC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC02_015/ov_SC02_015_jr_8017A4AC.c b/src/ov_SC02_015/ov_SC02_015_jr_8017A4AC.c index 28ceaa873..5c4f1b61b 100644 --- a/src/ov_SC02_015/ov_SC02_015_jr_8017A4AC.c +++ b/src/ov_SC02_015/ov_SC02_015_jr_8017A4AC.c @@ -2544,17 +2544,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_015/ov_SC02_015_jr_8017AE2C.c b/src/ov_SC02_015/ov_SC02_015_jr_8017AE2C.c index 26eeea99a..b4b3e2d9d 100644 --- a/src/ov_SC02_015/ov_SC02_015_jr_8017AE2C.c +++ b/src/ov_SC02_015/ov_SC02_015_jr_8017AE2C.c @@ -2544,17 +2544,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_016/ov_SC02_016_jr_80178D40.c b/src/ov_SC02_016/ov_SC02_016_jr_80178D40.c index f2a9452c5..28e2ae3d2 100644 --- a/src/ov_SC02_016/ov_SC02_016_jr_80178D40.c +++ b/src/ov_SC02_016/ov_SC02_016_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B3EBC; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B3EBC; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801B3EE4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC02_016/ov_SC02_016_jr_8017A4AC.c b/src/ov_SC02_016/ov_SC02_016_jr_8017A4AC.c index 808c9d140..33b621f4e 100644 --- a/src/ov_SC02_016/ov_SC02_016_jr_8017A4AC.c +++ b/src/ov_SC02_016/ov_SC02_016_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_016/ov_SC02_016_jr_8017AE2C.c b/src/ov_SC02_016/ov_SC02_016_jr_8017AE2C.c index 53e70cb3f..daa5a8da8 100644 --- a/src/ov_SC02_016/ov_SC02_016_jr_8017AE2C.c +++ b/src/ov_SC02_016/ov_SC02_016_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_016/ov_SC02_016_jr_8017DC70.c b/src/ov_SC02_016/ov_SC02_016_jr_8017DC70.c index 1a3c76ade..f58a9feef 100644 --- a/src/ov_SC02_016/ov_SC02_016_jr_8017DC70.c +++ b/src/ov_SC02_016/ov_SC02_016_jr_8017DC70.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_017/ov_SC02_017_jr_80178D40.c b/src/ov_SC02_017/ov_SC02_017_jr_80178D40.c index a5b22b1c8..a195bc86c 100644 --- a/src/ov_SC02_017/ov_SC02_017_jr_80178D40.c +++ b/src/ov_SC02_017/ov_SC02_017_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801EF6E4; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801EF6E4; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801EF70C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC02_017/ov_SC02_017_jr_8017A4AC.c b/src/ov_SC02_017/ov_SC02_017_jr_8017A4AC.c index 8ae5cb237..ff74e9f5f 100644 --- a/src/ov_SC02_017/ov_SC02_017_jr_8017A4AC.c +++ b/src/ov_SC02_017/ov_SC02_017_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_017/ov_SC02_017_jr_8017AE2C.c b/src/ov_SC02_017/ov_SC02_017_jr_8017AE2C.c index 8359e7484..800a9b1ac 100644 --- a/src/ov_SC02_017/ov_SC02_017_jr_8017AE2C.c +++ b/src/ov_SC02_017/ov_SC02_017_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_017/ov_SC02_017_jr_8017DF34.c b/src/ov_SC02_017/ov_SC02_017_jr_8017DF34.c index 79f850afb..25ba92ece 100644 --- a/src/ov_SC02_017/ov_SC02_017_jr_8017DF34.c +++ b/src/ov_SC02_017/ov_SC02_017_jr_8017DF34.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_021/ov_SC02_021_jr_80178D40.c b/src/ov_SC02_021/ov_SC02_021_jr_80178D40.c index bdb72d32d..9ee370864 100644 --- a/src/ov_SC02_021/ov_SC02_021_jr_80178D40.c +++ b/src/ov_SC02_021/ov_SC02_021_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_80192C54; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_80192C54; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_80192C7C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC02_021/ov_SC02_021_jr_8017A4AC.c b/src/ov_SC02_021/ov_SC02_021_jr_8017A4AC.c index dd53d6edd..0677c3222 100644 --- a/src/ov_SC02_021/ov_SC02_021_jr_8017A4AC.c +++ b/src/ov_SC02_021/ov_SC02_021_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_021/ov_SC02_021_jr_8017AE2C.c b/src/ov_SC02_021/ov_SC02_021_jr_8017AE2C.c index a028f76ad..189ebc1af 100644 --- a/src/ov_SC02_021/ov_SC02_021_jr_8017AE2C.c +++ b/src/ov_SC02_021/ov_SC02_021_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_021/ov_SC02_021_jr_8017C294.c b/src/ov_SC02_021/ov_SC02_021_jr_8017C294.c index d5b5a9d9f..166bbad4a 100644 --- a/src/ov_SC02_021/ov_SC02_021_jr_8017C294.c +++ b/src/ov_SC02_021/ov_SC02_021_jr_8017C294.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_026/ov_SC02_026_jr_80178D40.c b/src/ov_SC02_026/ov_SC02_026_jr_80178D40.c index 492c9ad46..4bee6a58a 100644 --- a/src/ov_SC02_026/ov_SC02_026_jr_80178D40.c +++ b/src/ov_SC02_026/ov_SC02_026_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801D0094; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801D0094; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801D00BC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC02_026/ov_SC02_026_jr_8017A4AC.c b/src/ov_SC02_026/ov_SC02_026_jr_8017A4AC.c index d38901b15..b7f8137fd 100644 --- a/src/ov_SC02_026/ov_SC02_026_jr_8017A4AC.c +++ b/src/ov_SC02_026/ov_SC02_026_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_026/ov_SC02_026_jr_8017AE2C.c b/src/ov_SC02_026/ov_SC02_026_jr_8017AE2C.c index b6b8b7b5c..03af3d485 100644 --- a/src/ov_SC02_026/ov_SC02_026_jr_8017AE2C.c +++ b/src/ov_SC02_026/ov_SC02_026_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_026/ov_SC02_026_jr_8017C180.c b/src/ov_SC02_026/ov_SC02_026_jr_8017C180.c index 89779a89d..a281a05f9 100644 --- a/src/ov_SC02_026/ov_SC02_026_jr_8017C180.c +++ b/src/ov_SC02_026/ov_SC02_026_jr_8017C180.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_027/ov_SC02_027_jr_80178D40.c b/src/ov_SC02_027/ov_SC02_027_jr_80178D40.c index 5bebbce90..b86d12ca8 100644 --- a/src/ov_SC02_027/ov_SC02_027_jr_80178D40.c +++ b/src/ov_SC02_027/ov_SC02_027_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801D9E04; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801D9E04; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801D9E2C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC02_027/ov_SC02_027_jr_8017A4AC.c b/src/ov_SC02_027/ov_SC02_027_jr_8017A4AC.c index c0caa07d4..cfcb8b8fd 100644 --- a/src/ov_SC02_027/ov_SC02_027_jr_8017A4AC.c +++ b/src/ov_SC02_027/ov_SC02_027_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_027/ov_SC02_027_jr_8017AE2C.c b/src/ov_SC02_027/ov_SC02_027_jr_8017AE2C.c index c9702e019..cbb67a0a9 100644 --- a/src/ov_SC02_027/ov_SC02_027_jr_8017AE2C.c +++ b/src/ov_SC02_027/ov_SC02_027_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_027/ov_SC02_027_jr_8017D898.c b/src/ov_SC02_027/ov_SC02_027_jr_8017D898.c index 63e945fa2..795d6a666 100644 --- a/src/ov_SC02_027/ov_SC02_027_jr_8017D898.c +++ b/src/ov_SC02_027/ov_SC02_027_jr_8017D898.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_028/ov_SC02_028_jr_80178D40.c b/src/ov_SC02_028/ov_SC02_028_jr_80178D40.c index dc3dd5688..4872fa3da 100644 --- a/src/ov_SC02_028/ov_SC02_028_jr_80178D40.c +++ b/src/ov_SC02_028/ov_SC02_028_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801D2DA4; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801D2DA4; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801D2DCC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC02_028/ov_SC02_028_jr_8017A4AC.c b/src/ov_SC02_028/ov_SC02_028_jr_8017A4AC.c index 93f31c845..7288b0b93 100644 --- a/src/ov_SC02_028/ov_SC02_028_jr_8017A4AC.c +++ b/src/ov_SC02_028/ov_SC02_028_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_028/ov_SC02_028_jr_8017AE2C.c b/src/ov_SC02_028/ov_SC02_028_jr_8017AE2C.c index 5323c533b..525fc9158 100644 --- a/src/ov_SC02_028/ov_SC02_028_jr_8017AE2C.c +++ b/src/ov_SC02_028/ov_SC02_028_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_028/ov_SC02_028_jr_8017D898.c b/src/ov_SC02_028/ov_SC02_028_jr_8017D898.c index d88a2be53..8b112920f 100644 --- a/src/ov_SC02_028/ov_SC02_028_jr_8017D898.c +++ b/src/ov_SC02_028/ov_SC02_028_jr_8017D898.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_031/ov_SC02_031_jr_80178D40.c b/src/ov_SC02_031/ov_SC02_031_jr_80178D40.c index e67a017d1..2d6d6cdfe 100644 --- a/src/ov_SC02_031/ov_SC02_031_jr_80178D40.c +++ b/src/ov_SC02_031/ov_SC02_031_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B751C; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B751C; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801B7544; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC02_031/ov_SC02_031_jr_8017A4AC.c b/src/ov_SC02_031/ov_SC02_031_jr_8017A4AC.c index 9bd785e28..d46174f81 100644 --- a/src/ov_SC02_031/ov_SC02_031_jr_8017A4AC.c +++ b/src/ov_SC02_031/ov_SC02_031_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_031/ov_SC02_031_jr_8017AE2C.c b/src/ov_SC02_031/ov_SC02_031_jr_8017AE2C.c index 2ce5b5428..a3559c8cb 100644 --- a/src/ov_SC02_031/ov_SC02_031_jr_8017AE2C.c +++ b/src/ov_SC02_031/ov_SC02_031_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_035/ov_SC02_035_jr_80178D40.c b/src/ov_SC02_035/ov_SC02_035_jr_80178D40.c index 6ccb38cd5..75213d8d6 100644 --- a/src/ov_SC02_035/ov_SC02_035_jr_80178D40.c +++ b/src/ov_SC02_035/ov_SC02_035_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801BE84C; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801BE84C; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801BE874; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC02_035/ov_SC02_035_jr_8017A4AC.c b/src/ov_SC02_035/ov_SC02_035_jr_8017A4AC.c index 04bcfd5fc..a30f3f49d 100644 --- a/src/ov_SC02_035/ov_SC02_035_jr_8017A4AC.c +++ b/src/ov_SC02_035/ov_SC02_035_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_035/ov_SC02_035_jr_8017AE2C.c b/src/ov_SC02_035/ov_SC02_035_jr_8017AE2C.c index c346b0967..123bf7b8f 100644 --- a/src/ov_SC02_035/ov_SC02_035_jr_8017AE2C.c +++ b/src/ov_SC02_035/ov_SC02_035_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_035/ov_SC02_035_jr_8017BEBC.c b/src/ov_SC02_035/ov_SC02_035_jr_8017BEBC.c index c26bf24c9..939b5d5be 100644 --- a/src/ov_SC02_035/ov_SC02_035_jr_8017BEBC.c +++ b/src/ov_SC02_035/ov_SC02_035_jr_8017BEBC.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_039/ov_SC02_039_jr_80178D40.c b/src/ov_SC02_039/ov_SC02_039_jr_80178D40.c index 0b8d6fba3..227b165ba 100644 --- a/src/ov_SC02_039/ov_SC02_039_jr_80178D40.c +++ b/src/ov_SC02_039/ov_SC02_039_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A0BFC; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A0BFC; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801A0C24; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC02_039/ov_SC02_039_jr_8017A4AC.c b/src/ov_SC02_039/ov_SC02_039_jr_8017A4AC.c index 43a62ec78..9c0e33ccf 100644 --- a/src/ov_SC02_039/ov_SC02_039_jr_8017A4AC.c +++ b/src/ov_SC02_039/ov_SC02_039_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_039/ov_SC02_039_jr_8017AE2C.c b/src/ov_SC02_039/ov_SC02_039_jr_8017AE2C.c index eb02ead48..aa75777b7 100644 --- a/src/ov_SC02_039/ov_SC02_039_jr_8017AE2C.c +++ b/src/ov_SC02_039/ov_SC02_039_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_039/ov_SC02_039_jr_8017BEBC.c b/src/ov_SC02_039/ov_SC02_039_jr_8017BEBC.c index 49b9a1db2..db87c171c 100644 --- a/src/ov_SC02_039/ov_SC02_039_jr_8017BEBC.c +++ b/src/ov_SC02_039/ov_SC02_039_jr_8017BEBC.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_041/ov_SC02_041_jr_80178D40.c b/src/ov_SC02_041/ov_SC02_041_jr_80178D40.c index d7043ce29..c0a49b7cd 100644 --- a/src/ov_SC02_041/ov_SC02_041_jr_80178D40.c +++ b/src/ov_SC02_041/ov_SC02_041_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B8F74; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B8F74; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801B8F9C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC02_041/ov_SC02_041_jr_8017A4AC.c b/src/ov_SC02_041/ov_SC02_041_jr_8017A4AC.c index b293e6102..27a224f6c 100644 --- a/src/ov_SC02_041/ov_SC02_041_jr_8017A4AC.c +++ b/src/ov_SC02_041/ov_SC02_041_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_041/ov_SC02_041_jr_8017AE2C.c b/src/ov_SC02_041/ov_SC02_041_jr_8017AE2C.c index 4a75462ad..39ab2dbea 100644 --- a/src/ov_SC02_041/ov_SC02_041_jr_8017AE2C.c +++ b/src/ov_SC02_041/ov_SC02_041_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC02_041/ov_SC02_041_jr_8017BEBC.c b/src/ov_SC02_041/ov_SC02_041_jr_8017BEBC.c index 4250c7b7c..84e4b6a94 100644 --- a/src/ov_SC02_041/ov_SC02_041_jr_8017BEBC.c +++ b/src/ov_SC02_041/ov_SC02_041_jr_8017BEBC.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_001/ov_SC03_001_jr_80178D40.c b/src/ov_SC03_001/ov_SC03_001_jr_80178D40.c index a6ab30788..86b151f41 100644 --- a/src/ov_SC03_001/ov_SC03_001_jr_80178D40.c +++ b/src/ov_SC03_001/ov_SC03_001_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801EE5F4; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801EE5F4; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801EE61C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_001/ov_SC03_001_jr_8017A4AC.c b/src/ov_SC03_001/ov_SC03_001_jr_8017A4AC.c index bd370bd0a..c82ecea2d 100644 --- a/src/ov_SC03_001/ov_SC03_001_jr_8017A4AC.c +++ b/src/ov_SC03_001/ov_SC03_001_jr_8017A4AC.c @@ -2544,17 +2544,17 @@ extern short D_801EF464; extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_001/ov_SC03_001_jr_8017AE2C.c b/src/ov_SC03_001/ov_SC03_001_jr_8017AE2C.c index 00a817a6b..ffc18fd97 100644 --- a/src/ov_SC03_001/ov_SC03_001_jr_8017AE2C.c +++ b/src/ov_SC03_001/ov_SC03_001_jr_8017AE2C.c @@ -2544,17 +2544,17 @@ extern short D_801EF464; extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_002/ov_SC03_002_jr_80178D40.c b/src/ov_SC03_002/ov_SC03_002_jr_80178D40.c index d3f0147db..a9af5ee39 100644 --- a/src/ov_SC03_002/ov_SC03_002_jr_80178D40.c +++ b/src/ov_SC03_002/ov_SC03_002_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801CB674; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801CB674; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801CB69C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_002/ov_SC03_002_jr_8017A4AC.c b/src/ov_SC03_002/ov_SC03_002_jr_8017A4AC.c index 854c37db3..091420b22 100644 --- a/src/ov_SC03_002/ov_SC03_002_jr_8017A4AC.c +++ b/src/ov_SC03_002/ov_SC03_002_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_002/ov_SC03_002_jr_8017AE2C.c b/src/ov_SC03_002/ov_SC03_002_jr_8017AE2C.c index 646ef9172..a0c56bf57 100644 --- a/src/ov_SC03_002/ov_SC03_002_jr_8017AE2C.c +++ b/src/ov_SC03_002/ov_SC03_002_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_002/ov_SC03_002_jr_8017D604.c b/src/ov_SC03_002/ov_SC03_002_jr_8017D604.c index bc247570d..bed702348 100644 --- a/src/ov_SC03_002/ov_SC03_002_jr_8017D604.c +++ b/src/ov_SC03_002/ov_SC03_002_jr_8017D604.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_003/ov_SC03_003_jr_80178D40.c b/src/ov_SC03_003/ov_SC03_003_jr_80178D40.c index 664d21130..62596e573 100644 --- a/src/ov_SC03_003/ov_SC03_003_jr_80178D40.c +++ b/src/ov_SC03_003/ov_SC03_003_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8018F97C; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8018F97C; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8018F9A4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_003/ov_SC03_003_jr_8017A4AC.c b/src/ov_SC03_003/ov_SC03_003_jr_8017A4AC.c index 79439ed3d..f0e9ada0c 100644 --- a/src/ov_SC03_003/ov_SC03_003_jr_8017A4AC.c +++ b/src/ov_SC03_003/ov_SC03_003_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_003/ov_SC03_003_jr_8017AE2C.c b/src/ov_SC03_003/ov_SC03_003_jr_8017AE2C.c index b4e70691b..de909188e 100644 --- a/src/ov_SC03_003/ov_SC03_003_jr_8017AE2C.c +++ b/src/ov_SC03_003/ov_SC03_003_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_006/ov_SC03_006_jr_80178D40.c b/src/ov_SC03_006/ov_SC03_006_jr_80178D40.c index 5622f13e1..e59be212c 100644 --- a/src/ov_SC03_006/ov_SC03_006_jr_80178D40.c +++ b/src/ov_SC03_006/ov_SC03_006_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801F72F4; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801F72F4; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801F731C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_006/ov_SC03_006_jr_8017A4AC.c b/src/ov_SC03_006/ov_SC03_006_jr_8017A4AC.c index 7c0a54720..76c234b0f 100644 --- a/src/ov_SC03_006/ov_SC03_006_jr_8017A4AC.c +++ b/src/ov_SC03_006/ov_SC03_006_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_006/ov_SC03_006_jr_8017AE2C.c b/src/ov_SC03_006/ov_SC03_006_jr_8017AE2C.c index 1fc119e2f..a06ada7e2 100644 --- a/src/ov_SC03_006/ov_SC03_006_jr_8017AE2C.c +++ b/src/ov_SC03_006/ov_SC03_006_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_007/ov_SC03_007_jr_80178D40.c b/src/ov_SC03_007/ov_SC03_007_jr_80178D40.c index 458271629..7026f8a34 100644 --- a/src/ov_SC03_007/ov_SC03_007_jr_80178D40.c +++ b/src/ov_SC03_007/ov_SC03_007_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801E9C4C; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801E9C4C; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801E9C74; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_007/ov_SC03_007_jr_8017A4AC.c b/src/ov_SC03_007/ov_SC03_007_jr_8017A4AC.c index a2f0ec26e..ef192f8d0 100644 --- a/src/ov_SC03_007/ov_SC03_007_jr_8017A4AC.c +++ b/src/ov_SC03_007/ov_SC03_007_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_007/ov_SC03_007_jr_8017AE2C.c b/src/ov_SC03_007/ov_SC03_007_jr_8017AE2C.c index 6eaff6611..02a7bf0ff 100644 --- a/src/ov_SC03_007/ov_SC03_007_jr_8017AE2C.c +++ b/src/ov_SC03_007/ov_SC03_007_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_010/ov_SC03_010_jr_80178D40.c b/src/ov_SC03_010/ov_SC03_010_jr_80178D40.c index e6aeda58f..8e8fe663a 100644 --- a/src/ov_SC03_010/ov_SC03_010_jr_80178D40.c +++ b/src/ov_SC03_010/ov_SC03_010_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019FEAC; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019FEAC; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8019FED4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_010/ov_SC03_010_jr_8017A4AC.c b/src/ov_SC03_010/ov_SC03_010_jr_8017A4AC.c index 1e2359789..629d1e270 100644 --- a/src/ov_SC03_010/ov_SC03_010_jr_8017A4AC.c +++ b/src/ov_SC03_010/ov_SC03_010_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_010/ov_SC03_010_jr_8017AE2C.c b/src/ov_SC03_010/ov_SC03_010_jr_8017AE2C.c index b8e3d7741..f8bf886c1 100644 --- a/src/ov_SC03_010/ov_SC03_010_jr_8017AE2C.c +++ b/src/ov_SC03_010/ov_SC03_010_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_010/ov_SC03_010_jr_8017C730.c b/src/ov_SC03_010/ov_SC03_010_jr_8017C730.c index 6cb6790d4..cbe0ba9b6 100644 --- a/src/ov_SC03_010/ov_SC03_010_jr_8017C730.c +++ b/src/ov_SC03_010/ov_SC03_010_jr_8017C730.c @@ -2541,17 +2541,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_011/ov_SC03_011_jr_80178D40.c b/src/ov_SC03_011/ov_SC03_011_jr_80178D40.c index acd497020..f6dac39e1 100644 --- a/src/ov_SC03_011/ov_SC03_011_jr_80178D40.c +++ b/src/ov_SC03_011/ov_SC03_011_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A2144; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A2144; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801A216C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_011/ov_SC03_011_jr_8017A4AC.c b/src/ov_SC03_011/ov_SC03_011_jr_8017A4AC.c index 7c5bb59ab..0c08a9f55 100644 --- a/src/ov_SC03_011/ov_SC03_011_jr_8017A4AC.c +++ b/src/ov_SC03_011/ov_SC03_011_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_011/ov_SC03_011_jr_8017AE2C.c b/src/ov_SC03_011/ov_SC03_011_jr_8017AE2C.c index fef8d8a98..373852e71 100644 --- a/src/ov_SC03_011/ov_SC03_011_jr_8017AE2C.c +++ b/src/ov_SC03_011/ov_SC03_011_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_011/ov_SC03_011_jr_8017C730.c b/src/ov_SC03_011/ov_SC03_011_jr_8017C730.c index 044ecb843..40af0de0b 100644 --- a/src/ov_SC03_011/ov_SC03_011_jr_8017C730.c +++ b/src/ov_SC03_011/ov_SC03_011_jr_8017C730.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_012/ov_SC03_012_jr_80178D40.c b/src/ov_SC03_012/ov_SC03_012_jr_80178D40.c index b2b905db4..a3d7f7c2c 100644 --- a/src/ov_SC03_012/ov_SC03_012_jr_80178D40.c +++ b/src/ov_SC03_012/ov_SC03_012_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_80194F64; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_80194F64; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_80194F8C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_012/ov_SC03_012_jr_8017A4AC.c b/src/ov_SC03_012/ov_SC03_012_jr_8017A4AC.c index 45c3d7a70..f131cab91 100644 --- a/src/ov_SC03_012/ov_SC03_012_jr_8017A4AC.c +++ b/src/ov_SC03_012/ov_SC03_012_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_012/ov_SC03_012_jr_8017AE2C.c b/src/ov_SC03_012/ov_SC03_012_jr_8017AE2C.c index aa1a75df6..7464cbb8c 100644 --- a/src/ov_SC03_012/ov_SC03_012_jr_8017AE2C.c +++ b/src/ov_SC03_012/ov_SC03_012_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_013/ov_SC03_013_jr_80178D40.c b/src/ov_SC03_013/ov_SC03_013_jr_80178D40.c index eee9bc974..0cfd5c22b 100644 --- a/src/ov_SC03_013/ov_SC03_013_jr_80178D40.c +++ b/src/ov_SC03_013/ov_SC03_013_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801AD234; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801AD234; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801AD25C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_013/ov_SC03_013_jr_8017A4AC.c b/src/ov_SC03_013/ov_SC03_013_jr_8017A4AC.c index 5d1f673ac..5da8cbcf4 100644 --- a/src/ov_SC03_013/ov_SC03_013_jr_8017A4AC.c +++ b/src/ov_SC03_013/ov_SC03_013_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_013/ov_SC03_013_jr_8017AE2C.c b/src/ov_SC03_013/ov_SC03_013_jr_8017AE2C.c index fa84ff007..dbd1ca8e8 100644 --- a/src/ov_SC03_013/ov_SC03_013_jr_8017AE2C.c +++ b/src/ov_SC03_013/ov_SC03_013_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_013/ov_SC03_013_jr_8017C730.c b/src/ov_SC03_013/ov_SC03_013_jr_8017C730.c index 8ee116069..f6b8b7e22 100644 --- a/src/ov_SC03_013/ov_SC03_013_jr_8017C730.c +++ b/src/ov_SC03_013/ov_SC03_013_jr_8017C730.c @@ -2541,17 +2541,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_014/ov_SC03_014_jr_80178D40.c b/src/ov_SC03_014/ov_SC03_014_jr_80178D40.c index 8dfca38a5..f93d7b80e 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_80178D40.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801EA7B4; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801EA7B4; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801EA7DC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_014/ov_SC03_014_jr_8017A4AC.c b/src/ov_SC03_014/ov_SC03_014_jr_8017A4AC.c index cfc4f85e0..bb83cc868 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_8017A4AC.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_014/ov_SC03_014_jr_8017AE2C.c b/src/ov_SC03_014/ov_SC03_014_jr_8017AE2C.c index 47e105882..ea0a1525a 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_8017AE2C.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_014/ov_SC03_014_jr_8017EB7C.c b/src/ov_SC03_014/ov_SC03_014_jr_8017EB7C.c index 02f0fc4d2..7b8ede5e6 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_8017EB7C.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_8017EB7C.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_015/ov_SC03_015_jr_80178D40.c b/src/ov_SC03_015/ov_SC03_015_jr_80178D40.c index d48f7a1be..532f89fe7 100644 --- a/src/ov_SC03_015/ov_SC03_015_jr_80178D40.c +++ b/src/ov_SC03_015/ov_SC03_015_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801EA7B4; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801EA7B4; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801EA7DC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_015/ov_SC03_015_jr_8017A4AC.c b/src/ov_SC03_015/ov_SC03_015_jr_8017A4AC.c index cfc4f85e0..bb83cc868 100644 --- a/src/ov_SC03_015/ov_SC03_015_jr_8017A4AC.c +++ b/src/ov_SC03_015/ov_SC03_015_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_015/ov_SC03_015_jr_8017AE2C.c b/src/ov_SC03_015/ov_SC03_015_jr_8017AE2C.c index 5339ef77e..e3127d364 100644 --- a/src/ov_SC03_015/ov_SC03_015_jr_8017AE2C.c +++ b/src/ov_SC03_015/ov_SC03_015_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_015/ov_SC03_015_jr_8017EB7C.c b/src/ov_SC03_015/ov_SC03_015_jr_8017EB7C.c index ab1db3e0c..380d163fe 100644 --- a/src/ov_SC03_015/ov_SC03_015_jr_8017EB7C.c +++ b/src/ov_SC03_015/ov_SC03_015_jr_8017EB7C.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_023/ov_SC03_023_jr_80178D40.c b/src/ov_SC03_023/ov_SC03_023_jr_80178D40.c index 2ac079269..3153e3f29 100644 --- a/src/ov_SC03_023/ov_SC03_023_jr_80178D40.c +++ b/src/ov_SC03_023/ov_SC03_023_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_80198B8C; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_80198B8C; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_80198BB4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_023/ov_SC03_023_jr_8017A4AC.c b/src/ov_SC03_023/ov_SC03_023_jr_8017A4AC.c index 19676b710..52bda8748 100644 --- a/src/ov_SC03_023/ov_SC03_023_jr_8017A4AC.c +++ b/src/ov_SC03_023/ov_SC03_023_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_023/ov_SC03_023_jr_8017AE2C.c b/src/ov_SC03_023/ov_SC03_023_jr_8017AE2C.c index 886679a29..dc29db1e0 100644 --- a/src/ov_SC03_023/ov_SC03_023_jr_8017AE2C.c +++ b/src/ov_SC03_023/ov_SC03_023_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_024/ov_SC03_024_jr_80178D40.c b/src/ov_SC03_024/ov_SC03_024_jr_80178D40.c index 2a935694d..a71e0662c 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_80178D40.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C1124; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C1124; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801C114C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_024/ov_SC03_024_jr_8017A4AC.c b/src/ov_SC03_024/ov_SC03_024_jr_8017A4AC.c index 2aa3f154f..f459ea2a1 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_8017A4AC.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_024/ov_SC03_024_jr_8017AE2C.c b/src/ov_SC03_024/ov_SC03_024_jr_8017AE2C.c index a5b6f7b41..3e5118995 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_8017AE2C.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_024/ov_SC03_024_jr_8017DF84.c b/src/ov_SC03_024/ov_SC03_024_jr_8017DF84.c index b124c595c..59449269c 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_8017DF84.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_8017DF84.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_028/ov_SC03_028_jr_80178D40.c b/src/ov_SC03_028/ov_SC03_028_jr_80178D40.c index fae16a7e2..8faca65ec 100644 --- a/src/ov_SC03_028/ov_SC03_028_jr_80178D40.c +++ b/src/ov_SC03_028/ov_SC03_028_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801EB45C; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801EB45C; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801EB484; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_028/ov_SC03_028_jr_8017A4AC.c b/src/ov_SC03_028/ov_SC03_028_jr_8017A4AC.c index 3b3babdf3..0dcac1ce6 100644 --- a/src/ov_SC03_028/ov_SC03_028_jr_8017A4AC.c +++ b/src/ov_SC03_028/ov_SC03_028_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_028/ov_SC03_028_jr_8017AE2C.c b/src/ov_SC03_028/ov_SC03_028_jr_8017AE2C.c index 5ce05a90a..f97b77cb4 100644 --- a/src/ov_SC03_028/ov_SC03_028_jr_8017AE2C.c +++ b/src/ov_SC03_028/ov_SC03_028_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_029/ov_SC03_029_jr_80178D40.c b/src/ov_SC03_029/ov_SC03_029_jr_80178D40.c index 2d8b0e0f5..e7b2c1b6b 100644 --- a/src/ov_SC03_029/ov_SC03_029_jr_80178D40.c +++ b/src/ov_SC03_029/ov_SC03_029_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801D9434; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801D9434; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801D945C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_029/ov_SC03_029_jr_8017A4AC.c b/src/ov_SC03_029/ov_SC03_029_jr_8017A4AC.c index a50256925..530f63fdb 100644 --- a/src/ov_SC03_029/ov_SC03_029_jr_8017A4AC.c +++ b/src/ov_SC03_029/ov_SC03_029_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_029/ov_SC03_029_jr_8017AE2C.c b/src/ov_SC03_029/ov_SC03_029_jr_8017AE2C.c index dcbf243bd..9a4d3ba0a 100644 --- a/src/ov_SC03_029/ov_SC03_029_jr_8017AE2C.c +++ b/src/ov_SC03_029/ov_SC03_029_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_029/ov_SC03_029_jr_8017DC70.c b/src/ov_SC03_029/ov_SC03_029_jr_8017DC70.c index a15def8f4..e9613fa6b 100644 --- a/src/ov_SC03_029/ov_SC03_029_jr_8017DC70.c +++ b/src/ov_SC03_029/ov_SC03_029_jr_8017DC70.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_030/ov_SC03_030_jr_80178D40.c b/src/ov_SC03_030/ov_SC03_030_jr_80178D40.c index ccef74ca4..a444629ba 100644 --- a/src/ov_SC03_030/ov_SC03_030_jr_80178D40.c +++ b/src/ov_SC03_030/ov_SC03_030_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801E1A2C; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801E1A2C; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801E1A54; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_030/ov_SC03_030_jr_8017A4AC.c b/src/ov_SC03_030/ov_SC03_030_jr_8017A4AC.c index 0273097f3..96af7b07b 100644 --- a/src/ov_SC03_030/ov_SC03_030_jr_8017A4AC.c +++ b/src/ov_SC03_030/ov_SC03_030_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_030/ov_SC03_030_jr_8017AE2C.c b/src/ov_SC03_030/ov_SC03_030_jr_8017AE2C.c index 1556a0682..663836855 100644 --- a/src/ov_SC03_030/ov_SC03_030_jr_8017AE2C.c +++ b/src/ov_SC03_030/ov_SC03_030_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_031/ov_SC03_031_jr_80178D40.c b/src/ov_SC03_031/ov_SC03_031_jr_80178D40.c index d6ddd61ef..c163472c8 100644 --- a/src/ov_SC03_031/ov_SC03_031_jr_80178D40.c +++ b/src/ov_SC03_031/ov_SC03_031_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C5E2C; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C5E2C; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801C5E54; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_031/ov_SC03_031_jr_8017A4AC.c b/src/ov_SC03_031/ov_SC03_031_jr_8017A4AC.c index ae06a9088..2db7ebbe2 100644 --- a/src/ov_SC03_031/ov_SC03_031_jr_8017A4AC.c +++ b/src/ov_SC03_031/ov_SC03_031_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_031/ov_SC03_031_jr_8017AE2C.c b/src/ov_SC03_031/ov_SC03_031_jr_8017AE2C.c index 0be6ce0e9..42398fdd3 100644 --- a/src/ov_SC03_031/ov_SC03_031_jr_8017AE2C.c +++ b/src/ov_SC03_031/ov_SC03_031_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_031/ov_SC03_031_jr_8017DB5C.c b/src/ov_SC03_031/ov_SC03_031_jr_8017DB5C.c index 7ff9a03df..005a0b334 100644 --- a/src/ov_SC03_031/ov_SC03_031_jr_8017DB5C.c +++ b/src/ov_SC03_031/ov_SC03_031_jr_8017DB5C.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_089/ov_SC03_089_jr_80178D40.c b/src/ov_SC03_089/ov_SC03_089_jr_80178D40.c index c64b0ea42..4316409b5 100644 --- a/src/ov_SC03_089/ov_SC03_089_jr_80178D40.c +++ b/src/ov_SC03_089/ov_SC03_089_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C66E4; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C66E4; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801C670C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_089/ov_SC03_089_jr_8017A4AC.c b/src/ov_SC03_089/ov_SC03_089_jr_8017A4AC.c index 22a24aa70..3ee5a2b05 100644 --- a/src/ov_SC03_089/ov_SC03_089_jr_8017A4AC.c +++ b/src/ov_SC03_089/ov_SC03_089_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_089/ov_SC03_089_jr_8017AE2C.c b/src/ov_SC03_089/ov_SC03_089_jr_8017AE2C.c index a35befba6..849b964e6 100644 --- a/src/ov_SC03_089/ov_SC03_089_jr_8017AE2C.c +++ b/src/ov_SC03_089/ov_SC03_089_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_089/ov_SC03_089_jr_8017CA80.c b/src/ov_SC03_089/ov_SC03_089_jr_8017CA80.c index 6e2718945..f7f39ecbc 100644 --- a/src/ov_SC03_089/ov_SC03_089_jr_8017CA80.c +++ b/src/ov_SC03_089/ov_SC03_089_jr_8017CA80.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_090/ov_SC03_090_jr_80178D40.c b/src/ov_SC03_090/ov_SC03_090_jr_80178D40.c index fb639b6bf..f069fcb3b 100644 --- a/src/ov_SC03_090/ov_SC03_090_jr_80178D40.c +++ b/src/ov_SC03_090/ov_SC03_090_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801CBB4C; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801CBB4C; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801CBB74; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_090/ov_SC03_090_jr_8017A4AC.c b/src/ov_SC03_090/ov_SC03_090_jr_8017A4AC.c index 76e5eaaf3..57125e77e 100644 --- a/src/ov_SC03_090/ov_SC03_090_jr_8017A4AC.c +++ b/src/ov_SC03_090/ov_SC03_090_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_090/ov_SC03_090_jr_8017AE2C.c b/src/ov_SC03_090/ov_SC03_090_jr_8017AE2C.c index 6ace5995d..12b510b7a 100644 --- a/src/ov_SC03_090/ov_SC03_090_jr_8017AE2C.c +++ b/src/ov_SC03_090/ov_SC03_090_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_090/ov_SC03_090_jr_8017CA80.c b/src/ov_SC03_090/ov_SC03_090_jr_8017CA80.c index eaf3983c8..c92df3471 100644 --- a/src/ov_SC03_090/ov_SC03_090_jr_8017CA80.c +++ b/src/ov_SC03_090/ov_SC03_090_jr_8017CA80.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_091/ov_SC03_091_jr_80178D40.c b/src/ov_SC03_091/ov_SC03_091_jr_80178D40.c index 82aad725d..5212bf35c 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_80178D40.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801D221C; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801D221C; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801D2244; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_091/ov_SC03_091_jr_8017A4AC.c b/src/ov_SC03_091/ov_SC03_091_jr_8017A4AC.c index 9084654c9..a3c03f4ee 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_8017A4AC.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_091/ov_SC03_091_jr_8017AE2C.c b/src/ov_SC03_091/ov_SC03_091_jr_8017AE2C.c index 67c7465d0..e3e45ff00 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_8017AE2C.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_091/ov_SC03_091_jr_8017D898.c b/src/ov_SC03_091/ov_SC03_091_jr_8017D898.c index d387856b3..fdc6b6442 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_8017D898.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_8017D898.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_091/ov_SC03_091_jr_80182268.c b/src/ov_SC03_091/ov_SC03_091_jr_80182268.c index c91f2ef24..8a5dd7cbd 100644 --- a/src/ov_SC03_091/ov_SC03_091_jr_80182268.c +++ b/src/ov_SC03_091/ov_SC03_091_jr_80182268.c @@ -2558,17 +2558,17 @@ extern short D_801D26DC; extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_092/ov_SC03_092_jr_80178D40.c b/src/ov_SC03_092/ov_SC03_092_jr_80178D40.c index 931d64e73..2bc5c2304 100644 --- a/src/ov_SC03_092/ov_SC03_092_jr_80178D40.c +++ b/src/ov_SC03_092/ov_SC03_092_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B2DE4; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B2DE4; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801B2E0C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_092/ov_SC03_092_jr_8017A4AC.c b/src/ov_SC03_092/ov_SC03_092_jr_8017A4AC.c index b6f7376c4..4933f6b0a 100644 --- a/src/ov_SC03_092/ov_SC03_092_jr_8017A4AC.c +++ b/src/ov_SC03_092/ov_SC03_092_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_092/ov_SC03_092_jr_8017AE2C.c b/src/ov_SC03_092/ov_SC03_092_jr_8017AE2C.c index 2dbabec8e..a93fd46d0 100644 --- a/src/ov_SC03_092/ov_SC03_092_jr_8017AE2C.c +++ b/src/ov_SC03_092/ov_SC03_092_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_093/ov_SC03_093_jr_80178D40.c b/src/ov_SC03_093/ov_SC03_093_jr_80178D40.c index b1c1ac110..2dabd0224 100644 --- a/src/ov_SC03_093/ov_SC03_093_jr_80178D40.c +++ b/src/ov_SC03_093/ov_SC03_093_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801CC254; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801CC254; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801CC27C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_093/ov_SC03_093_jr_8017A4AC.c b/src/ov_SC03_093/ov_SC03_093_jr_8017A4AC.c index 975babb82..f8bbe8955 100644 --- a/src/ov_SC03_093/ov_SC03_093_jr_8017A4AC.c +++ b/src/ov_SC03_093/ov_SC03_093_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_093/ov_SC03_093_jr_8017AE2C.c b/src/ov_SC03_093/ov_SC03_093_jr_8017AE2C.c index 828b398b5..4151f8246 100644 --- a/src/ov_SC03_093/ov_SC03_093_jr_8017AE2C.c +++ b/src/ov_SC03_093/ov_SC03_093_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_093/ov_SC03_093_jr_8017D898.c b/src/ov_SC03_093/ov_SC03_093_jr_8017D898.c index fc8578d12..d6cf25578 100644 --- a/src/ov_SC03_093/ov_SC03_093_jr_8017D898.c +++ b/src/ov_SC03_093/ov_SC03_093_jr_8017D898.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_094/ov_SC03_094_jr_80178D40.c b/src/ov_SC03_094/ov_SC03_094_jr_80178D40.c index aa9ce69cb..b335f9658 100644 --- a/src/ov_SC03_094/ov_SC03_094_jr_80178D40.c +++ b/src/ov_SC03_094/ov_SC03_094_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801D3094; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801D3094; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801D30BC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_094/ov_SC03_094_jr_8017A4AC.c b/src/ov_SC03_094/ov_SC03_094_jr_8017A4AC.c index 4da390cc2..d32ee3991 100644 --- a/src/ov_SC03_094/ov_SC03_094_jr_8017A4AC.c +++ b/src/ov_SC03_094/ov_SC03_094_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_094/ov_SC03_094_jr_8017AE2C.c b/src/ov_SC03_094/ov_SC03_094_jr_8017AE2C.c index e001b98f5..7bb95ba71 100644 --- a/src/ov_SC03_094/ov_SC03_094_jr_8017AE2C.c +++ b/src/ov_SC03_094/ov_SC03_094_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_094/ov_SC03_094_jr_8017BEBC.c b/src/ov_SC03_094/ov_SC03_094_jr_8017BEBC.c index 6812448b5..6ee70cc54 100644 --- a/src/ov_SC03_094/ov_SC03_094_jr_8017BEBC.c +++ b/src/ov_SC03_094/ov_SC03_094_jr_8017BEBC.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_095/ov_SC03_095_jr_80178D40.c b/src/ov_SC03_095/ov_SC03_095_jr_80178D40.c index d80de5125..1a37226d1 100644 --- a/src/ov_SC03_095/ov_SC03_095_jr_80178D40.c +++ b/src/ov_SC03_095/ov_SC03_095_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019BC8C; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019BC8C; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8019BCB4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_095/ov_SC03_095_jr_8017A4AC.c b/src/ov_SC03_095/ov_SC03_095_jr_8017A4AC.c index 04d534638..46286dae6 100644 --- a/src/ov_SC03_095/ov_SC03_095_jr_8017A4AC.c +++ b/src/ov_SC03_095/ov_SC03_095_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_095/ov_SC03_095_jr_8017AE2C.c b/src/ov_SC03_095/ov_SC03_095_jr_8017AE2C.c index 4d3b4bc40..116a118b7 100644 --- a/src/ov_SC03_095/ov_SC03_095_jr_8017AE2C.c +++ b/src/ov_SC03_095/ov_SC03_095_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_095/ov_SC03_095_jr_8017BEBC.c b/src/ov_SC03_095/ov_SC03_095_jr_8017BEBC.c index 0cec38192..7218841e6 100644 --- a/src/ov_SC03_095/ov_SC03_095_jr_8017BEBC.c +++ b/src/ov_SC03_095/ov_SC03_095_jr_8017BEBC.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_096/ov_SC03_096_jr_80178D40.c b/src/ov_SC03_096/ov_SC03_096_jr_80178D40.c index 93cbbdd75..a1b3e1cb2 100644 --- a/src/ov_SC03_096/ov_SC03_096_jr_80178D40.c +++ b/src/ov_SC03_096/ov_SC03_096_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019A744; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019A744; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8019A76C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_096/ov_SC03_096_jr_8017A4AC.c b/src/ov_SC03_096/ov_SC03_096_jr_8017A4AC.c index acbd86aa7..1300ce25f 100644 --- a/src/ov_SC03_096/ov_SC03_096_jr_8017A4AC.c +++ b/src/ov_SC03_096/ov_SC03_096_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_096/ov_SC03_096_jr_8017AE2C.c b/src/ov_SC03_096/ov_SC03_096_jr_8017AE2C.c index cf5b759f8..ffe1c290d 100644 --- a/src/ov_SC03_096/ov_SC03_096_jr_8017AE2C.c +++ b/src/ov_SC03_096/ov_SC03_096_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_096/ov_SC03_096_jr_8017BEBC.c b/src/ov_SC03_096/ov_SC03_096_jr_8017BEBC.c index a876a0f1b..37a27a5f2 100644 --- a/src/ov_SC03_096/ov_SC03_096_jr_8017BEBC.c +++ b/src/ov_SC03_096/ov_SC03_096_jr_8017BEBC.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_097/ov_SC03_097_jr_80178D40.c b/src/ov_SC03_097/ov_SC03_097_jr_80178D40.c index 07ada7f2c..436f987c4 100644 --- a/src/ov_SC03_097/ov_SC03_097_jr_80178D40.c +++ b/src/ov_SC03_097/ov_SC03_097_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801AA7CC; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801AA7CC; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801AA7F4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_097/ov_SC03_097_jr_8017A4AC.c b/src/ov_SC03_097/ov_SC03_097_jr_8017A4AC.c index dab2e72ed..bbfb205b7 100644 --- a/src/ov_SC03_097/ov_SC03_097_jr_8017A4AC.c +++ b/src/ov_SC03_097/ov_SC03_097_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_097/ov_SC03_097_jr_8017AE2C.c b/src/ov_SC03_097/ov_SC03_097_jr_8017AE2C.c index b0465d231..7426ad9fa 100644 --- a/src/ov_SC03_097/ov_SC03_097_jr_8017AE2C.c +++ b/src/ov_SC03_097/ov_SC03_097_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_097/ov_SC03_097_jr_8017D898.c b/src/ov_SC03_097/ov_SC03_097_jr_8017D898.c index ff7cd5920..1307c17ea 100644 --- a/src/ov_SC03_097/ov_SC03_097_jr_8017D898.c +++ b/src/ov_SC03_097/ov_SC03_097_jr_8017D898.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_098/ov_SC03_098_jr_80178D40.c b/src/ov_SC03_098/ov_SC03_098_jr_80178D40.c index 19725afde..e7311a819 100644 --- a/src/ov_SC03_098/ov_SC03_098_jr_80178D40.c +++ b/src/ov_SC03_098/ov_SC03_098_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C543C; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C543C; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801C5464; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_098/ov_SC03_098_jr_8017A4AC.c b/src/ov_SC03_098/ov_SC03_098_jr_8017A4AC.c index 2c8264209..a49368bfe 100644 --- a/src/ov_SC03_098/ov_SC03_098_jr_8017A4AC.c +++ b/src/ov_SC03_098/ov_SC03_098_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_098/ov_SC03_098_jr_8017AE2C.c b/src/ov_SC03_098/ov_SC03_098_jr_8017AE2C.c index 1283258fc..83a2b3b1e 100644 --- a/src/ov_SC03_098/ov_SC03_098_jr_8017AE2C.c +++ b/src/ov_SC03_098/ov_SC03_098_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_098/ov_SC03_098_jr_8017D898.c b/src/ov_SC03_098/ov_SC03_098_jr_8017D898.c index f4e14e9d4..5cbb80a83 100644 --- a/src/ov_SC03_098/ov_SC03_098_jr_8017D898.c +++ b/src/ov_SC03_098/ov_SC03_098_jr_8017D898.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_099/ov_SC03_099_jr_80178D40.c b/src/ov_SC03_099/ov_SC03_099_jr_80178D40.c index 625be1053..50d540c58 100644 --- a/src/ov_SC03_099/ov_SC03_099_jr_80178D40.c +++ b/src/ov_SC03_099/ov_SC03_099_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801BF10C; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801BF10C; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801BF134; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_099/ov_SC03_099_jr_8017A4AC.c b/src/ov_SC03_099/ov_SC03_099_jr_8017A4AC.c index 305531ffa..5cd4a6a97 100644 --- a/src/ov_SC03_099/ov_SC03_099_jr_8017A4AC.c +++ b/src/ov_SC03_099/ov_SC03_099_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_099/ov_SC03_099_jr_8017AE2C.c b/src/ov_SC03_099/ov_SC03_099_jr_8017AE2C.c index 96362a7bf..3a5d4e7bf 100644 --- a/src/ov_SC03_099/ov_SC03_099_jr_8017AE2C.c +++ b/src/ov_SC03_099/ov_SC03_099_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_099/ov_SC03_099_jr_8017BEBC.c b/src/ov_SC03_099/ov_SC03_099_jr_8017BEBC.c index 15d94d51f..945a19873 100644 --- a/src/ov_SC03_099/ov_SC03_099_jr_8017BEBC.c +++ b/src/ov_SC03_099/ov_SC03_099_jr_8017BEBC.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_100/ov_SC03_100_jr_80178D40.c b/src/ov_SC03_100/ov_SC03_100_jr_80178D40.c index 711435d83..33ace9d38 100644 --- a/src/ov_SC03_100/ov_SC03_100_jr_80178D40.c +++ b/src/ov_SC03_100/ov_SC03_100_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C8394; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C8394; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801C83BC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_100/ov_SC03_100_jr_8017A4AC.c b/src/ov_SC03_100/ov_SC03_100_jr_8017A4AC.c index 777450a01..9e2071792 100644 --- a/src/ov_SC03_100/ov_SC03_100_jr_8017A4AC.c +++ b/src/ov_SC03_100/ov_SC03_100_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_100/ov_SC03_100_jr_8017AE2C.c b/src/ov_SC03_100/ov_SC03_100_jr_8017AE2C.c index ea96096aa..11c4f352d 100644 --- a/src/ov_SC03_100/ov_SC03_100_jr_8017AE2C.c +++ b/src/ov_SC03_100/ov_SC03_100_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_100/ov_SC03_100_jr_8017D898.c b/src/ov_SC03_100/ov_SC03_100_jr_8017D898.c index 452ef16e0..9cf393085 100644 --- a/src/ov_SC03_100/ov_SC03_100_jr_8017D898.c +++ b/src/ov_SC03_100/ov_SC03_100_jr_8017D898.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_101/ov_SC03_101_jr_80178D40.c b/src/ov_SC03_101/ov_SC03_101_jr_80178D40.c index a8ff4ab1d..dfc6bcfa0 100644 --- a/src/ov_SC03_101/ov_SC03_101_jr_80178D40.c +++ b/src/ov_SC03_101/ov_SC03_101_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019DC5C; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019DC5C; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8019DC84; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_101/ov_SC03_101_jr_8017A4AC.c b/src/ov_SC03_101/ov_SC03_101_jr_8017A4AC.c index c22642cf0..bc0c9da16 100644 --- a/src/ov_SC03_101/ov_SC03_101_jr_8017A4AC.c +++ b/src/ov_SC03_101/ov_SC03_101_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_101/ov_SC03_101_jr_8017AE2C.c b/src/ov_SC03_101/ov_SC03_101_jr_8017AE2C.c index fa2a26753..71b38422f 100644 --- a/src/ov_SC03_101/ov_SC03_101_jr_8017AE2C.c +++ b/src/ov_SC03_101/ov_SC03_101_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_101/ov_SC03_101_jr_8017CA80.c b/src/ov_SC03_101/ov_SC03_101_jr_8017CA80.c index 3bf9cb7e5..d9d6e8c60 100644 --- a/src/ov_SC03_101/ov_SC03_101_jr_8017CA80.c +++ b/src/ov_SC03_101/ov_SC03_101_jr_8017CA80.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_102/ov_SC03_102_jr_80178D40.c b/src/ov_SC03_102/ov_SC03_102_jr_80178D40.c index 0faa70e20..81d6d129f 100644 --- a/src/ov_SC03_102/ov_SC03_102_jr_80178D40.c +++ b/src/ov_SC03_102/ov_SC03_102_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B98D4; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B98D4; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801B98FC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_102/ov_SC03_102_jr_8017A4AC.c b/src/ov_SC03_102/ov_SC03_102_jr_8017A4AC.c index b86aeacad..c2c39d9db 100644 --- a/src/ov_SC03_102/ov_SC03_102_jr_8017A4AC.c +++ b/src/ov_SC03_102/ov_SC03_102_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_102/ov_SC03_102_jr_8017AE2C.c b/src/ov_SC03_102/ov_SC03_102_jr_8017AE2C.c index 82333c5fa..aabe6eec5 100644 --- a/src/ov_SC03_102/ov_SC03_102_jr_8017AE2C.c +++ b/src/ov_SC03_102/ov_SC03_102_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_102/ov_SC03_102_jr_8017BEBC.c b/src/ov_SC03_102/ov_SC03_102_jr_8017BEBC.c index 696250b7a..7117aad00 100644 --- a/src/ov_SC03_102/ov_SC03_102_jr_8017BEBC.c +++ b/src/ov_SC03_102/ov_SC03_102_jr_8017BEBC.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_103/ov_SC03_103_jr_80178D40.c b/src/ov_SC03_103/ov_SC03_103_jr_80178D40.c index 674b102df..04adcbad7 100644 --- a/src/ov_SC03_103/ov_SC03_103_jr_80178D40.c +++ b/src/ov_SC03_103/ov_SC03_103_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C4A8C; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C4A8C; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801C4AB4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_103/ov_SC03_103_jr_8017A4AC.c b/src/ov_SC03_103/ov_SC03_103_jr_8017A4AC.c index 35adc4fdd..06bd70b3a 100644 --- a/src/ov_SC03_103/ov_SC03_103_jr_8017A4AC.c +++ b/src/ov_SC03_103/ov_SC03_103_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_103/ov_SC03_103_jr_8017AE2C.c b/src/ov_SC03_103/ov_SC03_103_jr_8017AE2C.c index b3acce5d7..4d17bc207 100644 --- a/src/ov_SC03_103/ov_SC03_103_jr_8017AE2C.c +++ b/src/ov_SC03_103/ov_SC03_103_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_103/ov_SC03_103_jr_8017C294.c b/src/ov_SC03_103/ov_SC03_103_jr_8017C294.c index 53377d638..a42fa10c1 100644 --- a/src/ov_SC03_103/ov_SC03_103_jr_8017C294.c +++ b/src/ov_SC03_103/ov_SC03_103_jr_8017C294.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_104/ov_SC03_104_jr_80178D40.c b/src/ov_SC03_104/ov_SC03_104_jr_80178D40.c index 22ec773d9..a8a5ed51d 100644 --- a/src/ov_SC03_104/ov_SC03_104_jr_80178D40.c +++ b/src/ov_SC03_104/ov_SC03_104_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C0024; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C0024; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801C004C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_104/ov_SC03_104_jr_8017A4AC.c b/src/ov_SC03_104/ov_SC03_104_jr_8017A4AC.c index cadb6c7c4..246c59722 100644 --- a/src/ov_SC03_104/ov_SC03_104_jr_8017A4AC.c +++ b/src/ov_SC03_104/ov_SC03_104_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_104/ov_SC03_104_jr_8017AE2C.c b/src/ov_SC03_104/ov_SC03_104_jr_8017AE2C.c index 2d56a25fd..62dbcf619 100644 --- a/src/ov_SC03_104/ov_SC03_104_jr_8017AE2C.c +++ b/src/ov_SC03_104/ov_SC03_104_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_104/ov_SC03_104_jr_8017CA80.c b/src/ov_SC03_104/ov_SC03_104_jr_8017CA80.c index 223b18d1a..e7f75d85a 100644 --- a/src/ov_SC03_104/ov_SC03_104_jr_8017CA80.c +++ b/src/ov_SC03_104/ov_SC03_104_jr_8017CA80.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_105/ov_SC03_105_jr_80178D40.c b/src/ov_SC03_105/ov_SC03_105_jr_80178D40.c index c52a5d3c7..da054ec1f 100644 --- a/src/ov_SC03_105/ov_SC03_105_jr_80178D40.c +++ b/src/ov_SC03_105/ov_SC03_105_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B95B4; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B95B4; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801B95DC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_105/ov_SC03_105_jr_8017A4AC.c b/src/ov_SC03_105/ov_SC03_105_jr_8017A4AC.c index 53ce8991c..757d357e1 100644 --- a/src/ov_SC03_105/ov_SC03_105_jr_8017A4AC.c +++ b/src/ov_SC03_105/ov_SC03_105_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_105/ov_SC03_105_jr_8017AE2C.c b/src/ov_SC03_105/ov_SC03_105_jr_8017AE2C.c index 033d1ca45..242ca8d37 100644 --- a/src/ov_SC03_105/ov_SC03_105_jr_8017AE2C.c +++ b/src/ov_SC03_105/ov_SC03_105_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_105/ov_SC03_105_jr_8017C8D0.c b/src/ov_SC03_105/ov_SC03_105_jr_8017C8D0.c index c2b42d360..e3a182a18 100644 --- a/src/ov_SC03_105/ov_SC03_105_jr_8017C8D0.c +++ b/src/ov_SC03_105/ov_SC03_105_jr_8017C8D0.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_108/ov_SC03_108_jr_80178D40.c b/src/ov_SC03_108/ov_SC03_108_jr_80178D40.c index c8f95bb62..269e2ba3f 100644 --- a/src/ov_SC03_108/ov_SC03_108_jr_80178D40.c +++ b/src/ov_SC03_108/ov_SC03_108_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A18A4; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A18A4; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801A18CC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_108/ov_SC03_108_jr_8017A4AC.c b/src/ov_SC03_108/ov_SC03_108_jr_8017A4AC.c index 816c4ce29..24bed229e 100644 --- a/src/ov_SC03_108/ov_SC03_108_jr_8017A4AC.c +++ b/src/ov_SC03_108/ov_SC03_108_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_108/ov_SC03_108_jr_8017AE2C.c b/src/ov_SC03_108/ov_SC03_108_jr_8017AE2C.c index 956a056f2..f4714b4cf 100644 --- a/src/ov_SC03_108/ov_SC03_108_jr_8017AE2C.c +++ b/src/ov_SC03_108/ov_SC03_108_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_108/ov_SC03_108_jr_8017BEBC.c b/src/ov_SC03_108/ov_SC03_108_jr_8017BEBC.c index 71ebdd780..d0814429c 100644 --- a/src/ov_SC03_108/ov_SC03_108_jr_8017BEBC.c +++ b/src/ov_SC03_108/ov_SC03_108_jr_8017BEBC.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_109/ov_SC03_109_jr_80178D40.c b/src/ov_SC03_109/ov_SC03_109_jr_80178D40.c index 7b7046efd..20d1b865b 100644 --- a/src/ov_SC03_109/ov_SC03_109_jr_80178D40.c +++ b/src/ov_SC03_109/ov_SC03_109_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019A2B4; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019A2B4; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8019A2DC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_109/ov_SC03_109_jr_8017A4AC.c b/src/ov_SC03_109/ov_SC03_109_jr_8017A4AC.c index dff0d69b2..b6cf26708 100644 --- a/src/ov_SC03_109/ov_SC03_109_jr_8017A4AC.c +++ b/src/ov_SC03_109/ov_SC03_109_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_109/ov_SC03_109_jr_8017AE2C.c b/src/ov_SC03_109/ov_SC03_109_jr_8017AE2C.c index 616f15153..5bcb466b4 100644 --- a/src/ov_SC03_109/ov_SC03_109_jr_8017AE2C.c +++ b/src/ov_SC03_109/ov_SC03_109_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_109/ov_SC03_109_jr_8017C180.c b/src/ov_SC03_109/ov_SC03_109_jr_8017C180.c index 086231e72..f08b6987c 100644 --- a/src/ov_SC03_109/ov_SC03_109_jr_8017C180.c +++ b/src/ov_SC03_109/ov_SC03_109_jr_8017C180.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_110/ov_SC03_110_jr_80178D40.c b/src/ov_SC03_110/ov_SC03_110_jr_80178D40.c index 8abdbecf1..c265bd129 100644 --- a/src/ov_SC03_110/ov_SC03_110_jr_80178D40.c +++ b/src/ov_SC03_110/ov_SC03_110_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A205C; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A205C; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801A2084; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_110/ov_SC03_110_jr_8017A4AC.c b/src/ov_SC03_110/ov_SC03_110_jr_8017A4AC.c index 58467715f..270b8f965 100644 --- a/src/ov_SC03_110/ov_SC03_110_jr_8017A4AC.c +++ b/src/ov_SC03_110/ov_SC03_110_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_110/ov_SC03_110_jr_8017AE2C.c b/src/ov_SC03_110/ov_SC03_110_jr_8017AE2C.c index 9965c314a..a87c857ee 100644 --- a/src/ov_SC03_110/ov_SC03_110_jr_8017AE2C.c +++ b/src/ov_SC03_110/ov_SC03_110_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_110/ov_SC03_110_jr_8017D898.c b/src/ov_SC03_110/ov_SC03_110_jr_8017D898.c index 026cb4d8d..1b046667d 100644 --- a/src/ov_SC03_110/ov_SC03_110_jr_8017D898.c +++ b/src/ov_SC03_110/ov_SC03_110_jr_8017D898.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_111/ov_SC03_111_jr_80178D40.c b/src/ov_SC03_111/ov_SC03_111_jr_80178D40.c index f115d5ba8..2c9f16d46 100644 --- a/src/ov_SC03_111/ov_SC03_111_jr_80178D40.c +++ b/src/ov_SC03_111/ov_SC03_111_jr_80178D40.c @@ -3322,7 +3322,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B9564; void func_8017A094(s32 arg0) { @@ -3335,7 +3335,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B9564; void func_8017A0C4(s32 arg0) { @@ -3353,7 +3353,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801B958C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_111/ov_SC03_111_jr_8017A4AC.c b/src/ov_SC03_111/ov_SC03_111_jr_8017A4AC.c index 846fdc08a..d667e0035 100644 --- a/src/ov_SC03_111/ov_SC03_111_jr_8017A4AC.c +++ b/src/ov_SC03_111/ov_SC03_111_jr_8017A4AC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_111/ov_SC03_111_jr_8017AE2C.c b/src/ov_SC03_111/ov_SC03_111_jr_8017AE2C.c index 2ca520050..34e3461c7 100644 --- a/src/ov_SC03_111/ov_SC03_111_jr_8017AE2C.c +++ b/src/ov_SC03_111/ov_SC03_111_jr_8017AE2C.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_111/ov_SC03_111_jr_8017EC58.c b/src/ov_SC03_111/ov_SC03_111_jr_8017EC58.c index af83e1ad2..9a140dab9 100644 --- a/src/ov_SC03_111/ov_SC03_111_jr_8017EC58.c +++ b/src/ov_SC03_111/ov_SC03_111_jr_8017EC58.c @@ -2548,17 +2548,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_112/ov_SC03_112_jr_80178D40.c b/src/ov_SC03_112/ov_SC03_112_jr_80178D40.c index 489865ea3..ce778f299 100644 --- a/src/ov_SC03_112/ov_SC03_112_jr_80178D40.c +++ b/src/ov_SC03_112/ov_SC03_112_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801ACDC4; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801ACDC4; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801ACDEC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_112/ov_SC03_112_jr_8017A4AC.c b/src/ov_SC03_112/ov_SC03_112_jr_8017A4AC.c index 305f4f0f3..2f299048c 100644 --- a/src/ov_SC03_112/ov_SC03_112_jr_8017A4AC.c +++ b/src/ov_SC03_112/ov_SC03_112_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_112/ov_SC03_112_jr_8017AE2C.c b/src/ov_SC03_112/ov_SC03_112_jr_8017AE2C.c index 6aef345bb..5df185f13 100644 --- a/src/ov_SC03_112/ov_SC03_112_jr_8017AE2C.c +++ b/src/ov_SC03_112/ov_SC03_112_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_112/ov_SC03_112_jr_8017C294.c b/src/ov_SC03_112/ov_SC03_112_jr_8017C294.c index e1d570594..040f83bde 100644 --- a/src/ov_SC03_112/ov_SC03_112_jr_8017C294.c +++ b/src/ov_SC03_112/ov_SC03_112_jr_8017C294.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_113/ov_SC03_113_jr_80178D40.c b/src/ov_SC03_113/ov_SC03_113_jr_80178D40.c index c3598af19..b1daa5ab1 100644 --- a/src/ov_SC03_113/ov_SC03_113_jr_80178D40.c +++ b/src/ov_SC03_113/ov_SC03_113_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A5954; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A5954; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801A597C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_113/ov_SC03_113_jr_8017A4AC.c b/src/ov_SC03_113/ov_SC03_113_jr_8017A4AC.c index dffa1f2b2..695458e7d 100644 --- a/src/ov_SC03_113/ov_SC03_113_jr_8017A4AC.c +++ b/src/ov_SC03_113/ov_SC03_113_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_113/ov_SC03_113_jr_8017AE2C.c b/src/ov_SC03_113/ov_SC03_113_jr_8017AE2C.c index 6eda0f898..f5b584154 100644 --- a/src/ov_SC03_113/ov_SC03_113_jr_8017AE2C.c +++ b/src/ov_SC03_113/ov_SC03_113_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_113/ov_SC03_113_jr_8017C294.c b/src/ov_SC03_113/ov_SC03_113_jr_8017C294.c index 2be95d936..4d49a4b3e 100644 --- a/src/ov_SC03_113/ov_SC03_113_jr_8017C294.c +++ b/src/ov_SC03_113/ov_SC03_113_jr_8017C294.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_114/ov_SC03_114_jr_80178D40.c b/src/ov_SC03_114/ov_SC03_114_jr_80178D40.c index 8fa4d80ed..cdb5d571c 100644 --- a/src/ov_SC03_114/ov_SC03_114_jr_80178D40.c +++ b/src/ov_SC03_114/ov_SC03_114_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A95EC; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A95EC; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801A9614; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_114/ov_SC03_114_jr_8017A4AC.c b/src/ov_SC03_114/ov_SC03_114_jr_8017A4AC.c index 7d415cce2..bfa591d56 100644 --- a/src/ov_SC03_114/ov_SC03_114_jr_8017A4AC.c +++ b/src/ov_SC03_114/ov_SC03_114_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_114/ov_SC03_114_jr_8017AE2C.c b/src/ov_SC03_114/ov_SC03_114_jr_8017AE2C.c index 1731e7f75..acdce58a9 100644 --- a/src/ov_SC03_114/ov_SC03_114_jr_8017AE2C.c +++ b/src/ov_SC03_114/ov_SC03_114_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_114/ov_SC03_114_jr_8017BEBC.c b/src/ov_SC03_114/ov_SC03_114_jr_8017BEBC.c index 7b560a17b..99368b980 100644 --- a/src/ov_SC03_114/ov_SC03_114_jr_8017BEBC.c +++ b/src/ov_SC03_114/ov_SC03_114_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_115/ov_SC03_115_jr_80178D40.c b/src/ov_SC03_115/ov_SC03_115_jr_80178D40.c index 07319af08..f502019bb 100644 --- a/src/ov_SC03_115/ov_SC03_115_jr_80178D40.c +++ b/src/ov_SC03_115/ov_SC03_115_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_80194F44; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_80194F44; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_80194F6C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_115/ov_SC03_115_jr_8017A4AC.c b/src/ov_SC03_115/ov_SC03_115_jr_8017A4AC.c index f93027e17..4bddbe8c5 100644 --- a/src/ov_SC03_115/ov_SC03_115_jr_8017A4AC.c +++ b/src/ov_SC03_115/ov_SC03_115_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_115/ov_SC03_115_jr_8017AE2C.c b/src/ov_SC03_115/ov_SC03_115_jr_8017AE2C.c index a6af5df26..110aed372 100644 --- a/src/ov_SC03_115/ov_SC03_115_jr_8017AE2C.c +++ b/src/ov_SC03_115/ov_SC03_115_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_115/ov_SC03_115_jr_8017BEBC.c b/src/ov_SC03_115/ov_SC03_115_jr_8017BEBC.c index 973b18144..bf7245f6e 100644 --- a/src/ov_SC03_115/ov_SC03_115_jr_8017BEBC.c +++ b/src/ov_SC03_115/ov_SC03_115_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_116/ov_SC03_116_jr_80178D40.c b/src/ov_SC03_116/ov_SC03_116_jr_80178D40.c index b402f12c6..372d60a10 100644 --- a/src/ov_SC03_116/ov_SC03_116_jr_80178D40.c +++ b/src/ov_SC03_116/ov_SC03_116_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_80197AD4; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_80197AD4; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_80197AFC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_116/ov_SC03_116_jr_8017A4AC.c b/src/ov_SC03_116/ov_SC03_116_jr_8017A4AC.c index 027b40ea1..e445a1009 100644 --- a/src/ov_SC03_116/ov_SC03_116_jr_8017A4AC.c +++ b/src/ov_SC03_116/ov_SC03_116_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_116/ov_SC03_116_jr_8017AE2C.c b/src/ov_SC03_116/ov_SC03_116_jr_8017AE2C.c index dc059d11b..ee1d1f2c3 100644 --- a/src/ov_SC03_116/ov_SC03_116_jr_8017AE2C.c +++ b/src/ov_SC03_116/ov_SC03_116_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_117/ov_SC03_117_jr_80178D40.c b/src/ov_SC03_117/ov_SC03_117_jr_80178D40.c index a2a3d2246..aa9edc052 100644 --- a/src/ov_SC03_117/ov_SC03_117_jr_80178D40.c +++ b/src/ov_SC03_117/ov_SC03_117_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801CE24C; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801CE24C; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801CE274; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_117/ov_SC03_117_jr_8017A4AC.c b/src/ov_SC03_117/ov_SC03_117_jr_8017A4AC.c index 5b5237f44..827a74f77 100644 --- a/src/ov_SC03_117/ov_SC03_117_jr_8017A4AC.c +++ b/src/ov_SC03_117/ov_SC03_117_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_117/ov_SC03_117_jr_8017AE2C.c b/src/ov_SC03_117/ov_SC03_117_jr_8017AE2C.c index 688c132f7..74ed01d35 100644 --- a/src/ov_SC03_117/ov_SC03_117_jr_8017AE2C.c +++ b/src/ov_SC03_117/ov_SC03_117_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_117/ov_SC03_117_jr_8017BEBC.c b/src/ov_SC03_117/ov_SC03_117_jr_8017BEBC.c index 6e0276fd6..77955b118 100644 --- a/src/ov_SC03_117/ov_SC03_117_jr_8017BEBC.c +++ b/src/ov_SC03_117/ov_SC03_117_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_118/ov_SC03_118_jr_80178D40.c b/src/ov_SC03_118/ov_SC03_118_jr_80178D40.c index f0660a7ae..31d1a5391 100644 --- a/src/ov_SC03_118/ov_SC03_118_jr_80178D40.c +++ b/src/ov_SC03_118/ov_SC03_118_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801D419C; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801D419C; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801D41C4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_118/ov_SC03_118_jr_8017A4AC.c b/src/ov_SC03_118/ov_SC03_118_jr_8017A4AC.c index 82cd3a0ee..435473b55 100644 --- a/src/ov_SC03_118/ov_SC03_118_jr_8017A4AC.c +++ b/src/ov_SC03_118/ov_SC03_118_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_118/ov_SC03_118_jr_8017AE2C.c b/src/ov_SC03_118/ov_SC03_118_jr_8017AE2C.c index ccf8478ac..1480fb29f 100644 --- a/src/ov_SC03_118/ov_SC03_118_jr_8017AE2C.c +++ b/src/ov_SC03_118/ov_SC03_118_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_118/ov_SC03_118_jr_8017FB84.c b/src/ov_SC03_118/ov_SC03_118_jr_8017FB84.c index 49e03bd2e..ab5d7560f 100644 --- a/src/ov_SC03_118/ov_SC03_118_jr_8017FB84.c +++ b/src/ov_SC03_118/ov_SC03_118_jr_8017FB84.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_119/ov_SC03_119_jr_80178D40.c b/src/ov_SC03_119/ov_SC03_119_jr_80178D40.c index 7410832d4..1aabe54b6 100644 --- a/src/ov_SC03_119/ov_SC03_119_jr_80178D40.c +++ b/src/ov_SC03_119/ov_SC03_119_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801D419C; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801D419C; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801D41C4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_119/ov_SC03_119_jr_8017A4AC.c b/src/ov_SC03_119/ov_SC03_119_jr_8017A4AC.c index f0f5c3ca8..e66f233ab 100644 --- a/src/ov_SC03_119/ov_SC03_119_jr_8017A4AC.c +++ b/src/ov_SC03_119/ov_SC03_119_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_119/ov_SC03_119_jr_8017AE2C.c b/src/ov_SC03_119/ov_SC03_119_jr_8017AE2C.c index 7baa757fe..242f41e19 100644 --- a/src/ov_SC03_119/ov_SC03_119_jr_8017AE2C.c +++ b/src/ov_SC03_119/ov_SC03_119_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_119/ov_SC03_119_jr_8017FB84.c b/src/ov_SC03_119/ov_SC03_119_jr_8017FB84.c index 7c76cba33..71b4dcbdc 100644 --- a/src/ov_SC03_119/ov_SC03_119_jr_8017FB84.c +++ b/src/ov_SC03_119/ov_SC03_119_jr_8017FB84.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_121/ov_SC03_121_jr_80178D40.c b/src/ov_SC03_121/ov_SC03_121_jr_80178D40.c index 241b5d462..441df86d2 100644 --- a/src/ov_SC03_121/ov_SC03_121_jr_80178D40.c +++ b/src/ov_SC03_121/ov_SC03_121_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801AEC44; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801AEC44; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801AEC6C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_121/ov_SC03_121_jr_8017A4AC.c b/src/ov_SC03_121/ov_SC03_121_jr_8017A4AC.c index 9e9d299a6..cad79106c 100644 --- a/src/ov_SC03_121/ov_SC03_121_jr_8017A4AC.c +++ b/src/ov_SC03_121/ov_SC03_121_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_121/ov_SC03_121_jr_8017AE2C.c b/src/ov_SC03_121/ov_SC03_121_jr_8017AE2C.c index db5366e62..c3e0a3bd5 100644 --- a/src/ov_SC03_121/ov_SC03_121_jr_8017AE2C.c +++ b/src/ov_SC03_121/ov_SC03_121_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_121/ov_SC03_121_jr_8017BEBC.c b/src/ov_SC03_121/ov_SC03_121_jr_8017BEBC.c index 464d2c0da..ab6caafad 100644 --- a/src/ov_SC03_121/ov_SC03_121_jr_8017BEBC.c +++ b/src/ov_SC03_121/ov_SC03_121_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_124/ov_SC03_124_jr_80178D40.c b/src/ov_SC03_124/ov_SC03_124_jr_80178D40.c index 88b17a56e..b1e8ea6d8 100644 --- a/src/ov_SC03_124/ov_SC03_124_jr_80178D40.c +++ b/src/ov_SC03_124/ov_SC03_124_jr_80178D40.c @@ -3320,7 +3320,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801E176C; void func_8017A094(s32 arg0) { @@ -3333,7 +3333,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801E176C; void func_8017A0C4(s32 arg0) { @@ -3351,7 +3351,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801E1794; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_124/ov_SC03_124_jr_8017A4AC.c b/src/ov_SC03_124/ov_SC03_124_jr_8017A4AC.c index 6b882db8d..b7ce9114a 100644 --- a/src/ov_SC03_124/ov_SC03_124_jr_8017A4AC.c +++ b/src/ov_SC03_124/ov_SC03_124_jr_8017A4AC.c @@ -2543,17 +2543,17 @@ extern short D_801E25E4; extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_124/ov_SC03_124_jr_8017AE2C.c b/src/ov_SC03_124/ov_SC03_124_jr_8017AE2C.c index d3d58c451..acd1a638b 100644 --- a/src/ov_SC03_124/ov_SC03_124_jr_8017AE2C.c +++ b/src/ov_SC03_124/ov_SC03_124_jr_8017AE2C.c @@ -2543,17 +2543,17 @@ extern short D_801E25E4; extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_125/ov_SC03_125_jr_80178D40.c b/src/ov_SC03_125/ov_SC03_125_jr_80178D40.c index 1c7e64cce..1e46c9818 100644 --- a/src/ov_SC03_125/ov_SC03_125_jr_80178D40.c +++ b/src/ov_SC03_125/ov_SC03_125_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C4064; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C4064; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801C408C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_125/ov_SC03_125_jr_8017A4AC.c b/src/ov_SC03_125/ov_SC03_125_jr_8017A4AC.c index 30a49dd4e..27f3795dc 100644 --- a/src/ov_SC03_125/ov_SC03_125_jr_8017A4AC.c +++ b/src/ov_SC03_125/ov_SC03_125_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_125/ov_SC03_125_jr_8017AE2C.c b/src/ov_SC03_125/ov_SC03_125_jr_8017AE2C.c index 88321111b..3de89f84b 100644 --- a/src/ov_SC03_125/ov_SC03_125_jr_8017AE2C.c +++ b/src/ov_SC03_125/ov_SC03_125_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_125/ov_SC03_125_jr_8017D604.c b/src/ov_SC03_125/ov_SC03_125_jr_8017D604.c index d85fc850b..a7421814a 100644 --- a/src/ov_SC03_125/ov_SC03_125_jr_8017D604.c +++ b/src/ov_SC03_125/ov_SC03_125_jr_8017D604.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_126/ov_SC03_126_jr_80178D40.c b/src/ov_SC03_126/ov_SC03_126_jr_80178D40.c index b31a362e0..7903c28eb 100644 --- a/src/ov_SC03_126/ov_SC03_126_jr_80178D40.c +++ b/src/ov_SC03_126/ov_SC03_126_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8018F92C; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8018F92C; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8018F954; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC03_126/ov_SC03_126_jr_8017A4AC.c b/src/ov_SC03_126/ov_SC03_126_jr_8017A4AC.c index 10533b6f1..c80d345d9 100644 --- a/src/ov_SC03_126/ov_SC03_126_jr_8017A4AC.c +++ b/src/ov_SC03_126/ov_SC03_126_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_126/ov_SC03_126_jr_8017AE2C.c b/src/ov_SC03_126/ov_SC03_126_jr_8017AE2C.c index 76e7eec86..fb38c96c7 100644 --- a/src/ov_SC03_126/ov_SC03_126_jr_8017AE2C.c +++ b/src/ov_SC03_126/ov_SC03_126_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC03_126/ov_SC03_126_jr_8017D5C0.c b/src/ov_SC03_126/ov_SC03_126_jr_8017D5C0.c index 0272f5713..f6d7594b7 100644 --- a/src/ov_SC03_126/ov_SC03_126_jr_8017D5C0.c +++ b/src/ov_SC03_126/ov_SC03_126_jr_8017D5C0.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_000/ov_SC04_000_jr_80178D40.c b/src/ov_SC04_000/ov_SC04_000_jr_80178D40.c index 0595591cb..1de6fb186 100644 --- a/src/ov_SC04_000/ov_SC04_000_jr_80178D40.c +++ b/src/ov_SC04_000/ov_SC04_000_jr_80178D40.c @@ -3320,7 +3320,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A99DC; void func_8017A094(s32 arg0) { @@ -3333,7 +3333,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A99DC; void func_8017A0C4(s32 arg0) { @@ -3351,7 +3351,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801A9A04; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC04_000/ov_SC04_000_jr_8017A4AC.c b/src/ov_SC04_000/ov_SC04_000_jr_8017A4AC.c index 4ac1e950a..7f2d4b2e1 100644 --- a/src/ov_SC04_000/ov_SC04_000_jr_8017A4AC.c +++ b/src/ov_SC04_000/ov_SC04_000_jr_8017A4AC.c @@ -2543,17 +2543,17 @@ extern short D_801AB054; extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_000/ov_SC04_000_jr_8017AE2C.c b/src/ov_SC04_000/ov_SC04_000_jr_8017AE2C.c index b57875b9f..c570c2d74 100644 --- a/src/ov_SC04_000/ov_SC04_000_jr_8017AE2C.c +++ b/src/ov_SC04_000/ov_SC04_000_jr_8017AE2C.c @@ -2543,17 +2543,17 @@ extern short D_801AB054; extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_000/ov_SC04_000_jr_8017BEBC.c b/src/ov_SC04_000/ov_SC04_000_jr_8017BEBC.c index 54aaa7c1e..ef992b0ed 100644 --- a/src/ov_SC04_000/ov_SC04_000_jr_8017BEBC.c +++ b/src/ov_SC04_000/ov_SC04_000_jr_8017BEBC.c @@ -2545,17 +2545,17 @@ extern short D_801AB054; extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_002/ov_SC04_002_jr_80178D40.c b/src/ov_SC04_002/ov_SC04_002_jr_80178D40.c index 22038add9..c52ca01cd 100644 --- a/src/ov_SC04_002/ov_SC04_002_jr_80178D40.c +++ b/src/ov_SC04_002/ov_SC04_002_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C0CEC; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C0CEC; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801C0D14; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC04_002/ov_SC04_002_jr_8017A4AC.c b/src/ov_SC04_002/ov_SC04_002_jr_8017A4AC.c index 2e5fe383f..dd277ec39 100644 --- a/src/ov_SC04_002/ov_SC04_002_jr_8017A4AC.c +++ b/src/ov_SC04_002/ov_SC04_002_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_002/ov_SC04_002_jr_8017AE2C.c b/src/ov_SC04_002/ov_SC04_002_jr_8017AE2C.c index fe302161d..a25ffb9f8 100644 --- a/src/ov_SC04_002/ov_SC04_002_jr_8017AE2C.c +++ b/src/ov_SC04_002/ov_SC04_002_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_002/ov_SC04_002_jr_8017BEBC.c b/src/ov_SC04_002/ov_SC04_002_jr_8017BEBC.c index 0d4c58f71..aaed57c0b 100644 --- a/src/ov_SC04_002/ov_SC04_002_jr_8017BEBC.c +++ b/src/ov_SC04_002/ov_SC04_002_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_003/ov_SC04_003_jr_80178D40.c b/src/ov_SC04_003/ov_SC04_003_jr_80178D40.c index ec728594a..873f20ade 100644 --- a/src/ov_SC04_003/ov_SC04_003_jr_80178D40.c +++ b/src/ov_SC04_003/ov_SC04_003_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019B954; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019B954; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8019B97C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC04_003/ov_SC04_003_jr_8017A4AC.c b/src/ov_SC04_003/ov_SC04_003_jr_8017A4AC.c index a87eb2001..4e20aacec 100644 --- a/src/ov_SC04_003/ov_SC04_003_jr_8017A4AC.c +++ b/src/ov_SC04_003/ov_SC04_003_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_003/ov_SC04_003_jr_8017AE2C.c b/src/ov_SC04_003/ov_SC04_003_jr_8017AE2C.c index 820fcf0c5..563b16e01 100644 --- a/src/ov_SC04_003/ov_SC04_003_jr_8017AE2C.c +++ b/src/ov_SC04_003/ov_SC04_003_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_003/ov_SC04_003_jr_8017BEBC.c b/src/ov_SC04_003/ov_SC04_003_jr_8017BEBC.c index 87974c1b0..e9ec18577 100644 --- a/src/ov_SC04_003/ov_SC04_003_jr_8017BEBC.c +++ b/src/ov_SC04_003/ov_SC04_003_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_004/ov_SC04_004_jr_80178D40.c b/src/ov_SC04_004/ov_SC04_004_jr_80178D40.c index a8aa5cc69..9584847da 100644 --- a/src/ov_SC04_004/ov_SC04_004_jr_80178D40.c +++ b/src/ov_SC04_004/ov_SC04_004_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B3754; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B3754; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801B377C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC04_004/ov_SC04_004_jr_8017A4AC.c b/src/ov_SC04_004/ov_SC04_004_jr_8017A4AC.c index 3b0d4e169..caf0d36e9 100644 --- a/src/ov_SC04_004/ov_SC04_004_jr_8017A4AC.c +++ b/src/ov_SC04_004/ov_SC04_004_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_004/ov_SC04_004_jr_8017AE2C.c b/src/ov_SC04_004/ov_SC04_004_jr_8017AE2C.c index 54eeb25c1..7fdd6d35a 100644 --- a/src/ov_SC04_004/ov_SC04_004_jr_8017AE2C.c +++ b/src/ov_SC04_004/ov_SC04_004_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_005/ov_SC04_005_jr_80178D40.c b/src/ov_SC04_005/ov_SC04_005_jr_80178D40.c index 4864d93f6..291c1eccc 100644 --- a/src/ov_SC04_005/ov_SC04_005_jr_80178D40.c +++ b/src/ov_SC04_005/ov_SC04_005_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C192C; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C192C; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801C1954; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC04_005/ov_SC04_005_jr_8017A4AC.c b/src/ov_SC04_005/ov_SC04_005_jr_8017A4AC.c index 9357a00c1..99711241c 100644 --- a/src/ov_SC04_005/ov_SC04_005_jr_8017A4AC.c +++ b/src/ov_SC04_005/ov_SC04_005_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_005/ov_SC04_005_jr_8017AE2C.c b/src/ov_SC04_005/ov_SC04_005_jr_8017AE2C.c index 48c5c055b..b2c980bab 100644 --- a/src/ov_SC04_005/ov_SC04_005_jr_8017AE2C.c +++ b/src/ov_SC04_005/ov_SC04_005_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_005/ov_SC04_005_jr_8017BEBC.c b/src/ov_SC04_005/ov_SC04_005_jr_8017BEBC.c index 2c974f5be..b8921ae85 100644 --- a/src/ov_SC04_005/ov_SC04_005_jr_8017BEBC.c +++ b/src/ov_SC04_005/ov_SC04_005_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_006/ov_SC04_006_jr_80178D40.c b/src/ov_SC04_006/ov_SC04_006_jr_80178D40.c index 55865a2e6..d225f7513 100644 --- a/src/ov_SC04_006/ov_SC04_006_jr_80178D40.c +++ b/src/ov_SC04_006/ov_SC04_006_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019DBD4; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019DBD4; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8019DBFC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC04_006/ov_SC04_006_jr_8017A4AC.c b/src/ov_SC04_006/ov_SC04_006_jr_8017A4AC.c index 1ff786cc1..ba5e94c8d 100644 --- a/src/ov_SC04_006/ov_SC04_006_jr_8017A4AC.c +++ b/src/ov_SC04_006/ov_SC04_006_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_006/ov_SC04_006_jr_8017AE2C.c b/src/ov_SC04_006/ov_SC04_006_jr_8017AE2C.c index 8ab52d5fa..8c6a50101 100644 --- a/src/ov_SC04_006/ov_SC04_006_jr_8017AE2C.c +++ b/src/ov_SC04_006/ov_SC04_006_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_006/ov_SC04_006_jr_8017BEBC.c b/src/ov_SC04_006/ov_SC04_006_jr_8017BEBC.c index ce5fda13e..9e8529d7b 100644 --- a/src/ov_SC04_006/ov_SC04_006_jr_8017BEBC.c +++ b/src/ov_SC04_006/ov_SC04_006_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_007/ov_SC04_007_jr_80178D40.c b/src/ov_SC04_007/ov_SC04_007_jr_80178D40.c index 2fdd15064..392510e02 100644 --- a/src/ov_SC04_007/ov_SC04_007_jr_80178D40.c +++ b/src/ov_SC04_007/ov_SC04_007_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B518C; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B518C; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801B51B4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC04_007/ov_SC04_007_jr_8017A4AC.c b/src/ov_SC04_007/ov_SC04_007_jr_8017A4AC.c index f42b6123e..fd6dd7f33 100644 --- a/src/ov_SC04_007/ov_SC04_007_jr_8017A4AC.c +++ b/src/ov_SC04_007/ov_SC04_007_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_007/ov_SC04_007_jr_8017AE2C.c b/src/ov_SC04_007/ov_SC04_007_jr_8017AE2C.c index c735a1552..99cb31e4f 100644 --- a/src/ov_SC04_007/ov_SC04_007_jr_8017AE2C.c +++ b/src/ov_SC04_007/ov_SC04_007_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c b/src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c index cb9628089..bd11d4514 100644 --- a/src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c +++ b/src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_008/ov_SC04_008_jr_80178D40.c b/src/ov_SC04_008/ov_SC04_008_jr_80178D40.c index 88babb53a..fe22bba47 100644 --- a/src/ov_SC04_008/ov_SC04_008_jr_80178D40.c +++ b/src/ov_SC04_008/ov_SC04_008_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_80191E64; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_80191E64; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_80191E8C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC04_008/ov_SC04_008_jr_8017A4AC.c b/src/ov_SC04_008/ov_SC04_008_jr_8017A4AC.c index 2118e4a9d..3beb7cb17 100644 --- a/src/ov_SC04_008/ov_SC04_008_jr_8017A4AC.c +++ b/src/ov_SC04_008/ov_SC04_008_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_008/ov_SC04_008_jr_8017AE2C.c b/src/ov_SC04_008/ov_SC04_008_jr_8017AE2C.c index f52ca51c5..0aad61b47 100644 --- a/src/ov_SC04_008/ov_SC04_008_jr_8017AE2C.c +++ b/src/ov_SC04_008/ov_SC04_008_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_009/ov_SC04_009_jr_80178D40.c b/src/ov_SC04_009/ov_SC04_009_jr_80178D40.c index d2c3f67ed..f389a8d84 100644 --- a/src/ov_SC04_009/ov_SC04_009_jr_80178D40.c +++ b/src/ov_SC04_009/ov_SC04_009_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_80198074; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_80198074; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8019809C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC04_009/ov_SC04_009_jr_8017A4AC.c b/src/ov_SC04_009/ov_SC04_009_jr_8017A4AC.c index ccb7e022d..90f2c8f9b 100644 --- a/src/ov_SC04_009/ov_SC04_009_jr_8017A4AC.c +++ b/src/ov_SC04_009/ov_SC04_009_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_009/ov_SC04_009_jr_8017AE2C.c b/src/ov_SC04_009/ov_SC04_009_jr_8017AE2C.c index 5ab39f501..2f45fdfbd 100644 --- a/src/ov_SC04_009/ov_SC04_009_jr_8017AE2C.c +++ b/src/ov_SC04_009/ov_SC04_009_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_009/ov_SC04_009_jr_8017BEBC.c b/src/ov_SC04_009/ov_SC04_009_jr_8017BEBC.c index 091714334..9ce45dd0a 100644 --- a/src/ov_SC04_009/ov_SC04_009_jr_8017BEBC.c +++ b/src/ov_SC04_009/ov_SC04_009_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_010/ov_SC04_010_jr_80178D40.c b/src/ov_SC04_010/ov_SC04_010_jr_80178D40.c index 3e5faedaa..4c96dac33 100644 --- a/src/ov_SC04_010/ov_SC04_010_jr_80178D40.c +++ b/src/ov_SC04_010/ov_SC04_010_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8018F50C; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8018F50C; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8018F534; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC04_010/ov_SC04_010_jr_8017A4AC.c b/src/ov_SC04_010/ov_SC04_010_jr_8017A4AC.c index 7f28123b4..05b4c12a9 100644 --- a/src/ov_SC04_010/ov_SC04_010_jr_8017A4AC.c +++ b/src/ov_SC04_010/ov_SC04_010_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_010/ov_SC04_010_jr_8017AE2C.c b/src/ov_SC04_010/ov_SC04_010_jr_8017AE2C.c index 927c2fafa..d15cbcb3d 100644 --- a/src/ov_SC04_010/ov_SC04_010_jr_8017AE2C.c +++ b/src/ov_SC04_010/ov_SC04_010_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_010/ov_SC04_010_jr_8017BEBC.c b/src/ov_SC04_010/ov_SC04_010_jr_8017BEBC.c index 3597ad4bf..54879b7ea 100644 --- a/src/ov_SC04_010/ov_SC04_010_jr_8017BEBC.c +++ b/src/ov_SC04_010/ov_SC04_010_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_011/ov_SC04_011_jr_80178D40.c b/src/ov_SC04_011/ov_SC04_011_jr_80178D40.c index 1c905b264..53595b4ba 100644 --- a/src/ov_SC04_011/ov_SC04_011_jr_80178D40.c +++ b/src/ov_SC04_011/ov_SC04_011_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801EEC74; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801EEC74; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801EEC9C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC04_011/ov_SC04_011_jr_8017A4AC.c b/src/ov_SC04_011/ov_SC04_011_jr_8017A4AC.c index 9537ff937..a357b4059 100644 --- a/src/ov_SC04_011/ov_SC04_011_jr_8017A4AC.c +++ b/src/ov_SC04_011/ov_SC04_011_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_011/ov_SC04_011_jr_8017AE2C.c b/src/ov_SC04_011/ov_SC04_011_jr_8017AE2C.c index 00fecb079..dd28b4529 100644 --- a/src/ov_SC04_011/ov_SC04_011_jr_8017AE2C.c +++ b/src/ov_SC04_011/ov_SC04_011_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_011/ov_SC04_011_jr_8017D494.c b/src/ov_SC04_011/ov_SC04_011_jr_8017D494.c index 92fe46749..a7c7fcd72 100644 --- a/src/ov_SC04_011/ov_SC04_011_jr_8017D494.c +++ b/src/ov_SC04_011/ov_SC04_011_jr_8017D494.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_012/ov_SC04_012_jr_80178D40.c b/src/ov_SC04_012/ov_SC04_012_jr_80178D40.c index 64fc535e4..f9a3ddc28 100644 --- a/src/ov_SC04_012/ov_SC04_012_jr_80178D40.c +++ b/src/ov_SC04_012/ov_SC04_012_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_80191BE4; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_80191BE4; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_80191C0C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC04_012/ov_SC04_012_jr_8017A4AC.c b/src/ov_SC04_012/ov_SC04_012_jr_8017A4AC.c index bf0bef121..a17d6ce45 100644 --- a/src/ov_SC04_012/ov_SC04_012_jr_8017A4AC.c +++ b/src/ov_SC04_012/ov_SC04_012_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_012/ov_SC04_012_jr_8017AE2C.c b/src/ov_SC04_012/ov_SC04_012_jr_8017AE2C.c index c14160967..cc139cd1f 100644 --- a/src/ov_SC04_012/ov_SC04_012_jr_8017AE2C.c +++ b/src/ov_SC04_012/ov_SC04_012_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_015/ov_SC04_015_jr_80178D40.c b/src/ov_SC04_015/ov_SC04_015_jr_80178D40.c index 881da7325..37f67329d 100644 --- a/src/ov_SC04_015/ov_SC04_015_jr_80178D40.c +++ b/src/ov_SC04_015/ov_SC04_015_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C88CC; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C88CC; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801C88F4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC04_015/ov_SC04_015_jr_8017A4AC.c b/src/ov_SC04_015/ov_SC04_015_jr_8017A4AC.c index d373e7920..6f7c323c1 100644 --- a/src/ov_SC04_015/ov_SC04_015_jr_8017A4AC.c +++ b/src/ov_SC04_015/ov_SC04_015_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_015/ov_SC04_015_jr_8017AE2C.c b/src/ov_SC04_015/ov_SC04_015_jr_8017AE2C.c index a4b567118..268e36133 100644 --- a/src/ov_SC04_015/ov_SC04_015_jr_8017AE2C.c +++ b/src/ov_SC04_015/ov_SC04_015_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_016/ov_SC04_016_jr_80178D40.c b/src/ov_SC04_016/ov_SC04_016_jr_80178D40.c index c32b460f2..0c3792be1 100644 --- a/src/ov_SC04_016/ov_SC04_016_jr_80178D40.c +++ b/src/ov_SC04_016/ov_SC04_016_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A6A74; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A6A74; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801A6A9C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC04_016/ov_SC04_016_jr_8017A4AC.c b/src/ov_SC04_016/ov_SC04_016_jr_8017A4AC.c index 847b13d53..21bcf89b8 100644 --- a/src/ov_SC04_016/ov_SC04_016_jr_8017A4AC.c +++ b/src/ov_SC04_016/ov_SC04_016_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_016/ov_SC04_016_jr_8017AE2C.c b/src/ov_SC04_016/ov_SC04_016_jr_8017AE2C.c index f01b77581..2bf767521 100644 --- a/src/ov_SC04_016/ov_SC04_016_jr_8017AE2C.c +++ b/src/ov_SC04_016/ov_SC04_016_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_016/ov_SC04_016_jr_8017BEBC.c b/src/ov_SC04_016/ov_SC04_016_jr_8017BEBC.c index 3536cb7e6..0bc183c38 100644 --- a/src/ov_SC04_016/ov_SC04_016_jr_8017BEBC.c +++ b/src/ov_SC04_016/ov_SC04_016_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_018/ov_SC04_018_jr_80178D40.c b/src/ov_SC04_018/ov_SC04_018_jr_80178D40.c index d70ff77fa..bf29df7cc 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_80178D40.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_80178D40.c @@ -3320,7 +3320,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801E6CC4; void func_8017A094(s32 arg0) { @@ -3333,7 +3333,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801E6CC4; void func_8017A0C4(s32 arg0) { @@ -3351,7 +3351,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801E6CEC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC04_018/ov_SC04_018_jr_8017A4AC.c b/src/ov_SC04_018/ov_SC04_018_jr_8017A4AC.c index 70aabfeb9..3fe3e680f 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_8017A4AC.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_8017A4AC.c @@ -2543,17 +2543,17 @@ extern short D_801E7B24; extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c b/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c index c986fb1cc..ee15cfdbc 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c @@ -2543,17 +2543,17 @@ extern short D_801E7B24; extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_019/ov_SC04_019_jr_80178D40.c b/src/ov_SC04_019/ov_SC04_019_jr_80178D40.c index 8d6ab4e2a..fc75b372c 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_80178D40.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801E6CC4; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801E6CC4; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801E6CEC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC04_019/ov_SC04_019_jr_8017A4AC.c b/src/ov_SC04_019/ov_SC04_019_jr_8017A4AC.c index 9f90f09d2..abcb38b29 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_8017A4AC.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c b/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c index a2d11ca52..d0fa7e9e1 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_020/ov_SC04_020_jr_80178D40.c b/src/ov_SC04_020/ov_SC04_020_jr_80178D40.c index afc1c66a4..afbbd33f1 100644 --- a/src/ov_SC04_020/ov_SC04_020_jr_80178D40.c +++ b/src/ov_SC04_020/ov_SC04_020_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801BC2D4; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801BC2D4; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801BC2FC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC04_020/ov_SC04_020_jr_8017A4AC.c b/src/ov_SC04_020/ov_SC04_020_jr_8017A4AC.c index f8ab52b30..2c9bc1c14 100644 --- a/src/ov_SC04_020/ov_SC04_020_jr_8017A4AC.c +++ b/src/ov_SC04_020/ov_SC04_020_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_020/ov_SC04_020_jr_8017AE2C.c b/src/ov_SC04_020/ov_SC04_020_jr_8017AE2C.c index 27c9248f6..cc45440e1 100644 --- a/src/ov_SC04_020/ov_SC04_020_jr_8017AE2C.c +++ b/src/ov_SC04_020/ov_SC04_020_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_020/ov_SC04_020_jr_8017D604.c b/src/ov_SC04_020/ov_SC04_020_jr_8017D604.c index 1d297ba34..763e35df7 100644 --- a/src/ov_SC04_020/ov_SC04_020_jr_8017D604.c +++ b/src/ov_SC04_020/ov_SC04_020_jr_8017D604.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_021/ov_SC04_021_jr_80178D40.c b/src/ov_SC04_021/ov_SC04_021_jr_80178D40.c index 0d375843c..75f6d7687 100644 --- a/src/ov_SC04_021/ov_SC04_021_jr_80178D40.c +++ b/src/ov_SC04_021/ov_SC04_021_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8018F92C; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8018F92C; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8018F954; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC04_021/ov_SC04_021_jr_8017A4AC.c b/src/ov_SC04_021/ov_SC04_021_jr_8017A4AC.c index 10533b6f1..c80d345d9 100644 --- a/src/ov_SC04_021/ov_SC04_021_jr_8017A4AC.c +++ b/src/ov_SC04_021/ov_SC04_021_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_021/ov_SC04_021_jr_8017AE2C.c b/src/ov_SC04_021/ov_SC04_021_jr_8017AE2C.c index 5a6125705..fa3fd2bba 100644 --- a/src/ov_SC04_021/ov_SC04_021_jr_8017AE2C.c +++ b/src/ov_SC04_021/ov_SC04_021_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC04_021/ov_SC04_021_jr_8017D5C0.c b/src/ov_SC04_021/ov_SC04_021_jr_8017D5C0.c index d0c9689f9..582e83e17 100644 --- a/src/ov_SC04_021/ov_SC04_021_jr_8017D5C0.c +++ b/src/ov_SC04_021/ov_SC04_021_jr_8017D5C0.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_000/ov_SC05_000_jr_80178D40.c b/src/ov_SC05_000/ov_SC05_000_jr_80178D40.c index f011578af..167ef9441 100644 --- a/src/ov_SC05_000/ov_SC05_000_jr_80178D40.c +++ b/src/ov_SC05_000/ov_SC05_000_jr_80178D40.c @@ -3319,7 +3319,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019AA5C; void func_8017A094(s32 arg0) { @@ -3332,7 +3332,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019AA5C; void func_8017A0C4(s32 arg0) { @@ -3350,7 +3350,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8019AA84; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC05_000/ov_SC05_000_jr_8017A4AC.c b/src/ov_SC05_000/ov_SC05_000_jr_8017A4AC.c index 50a62f3a8..21c93327f 100644 --- a/src/ov_SC05_000/ov_SC05_000_jr_8017A4AC.c +++ b/src/ov_SC05_000/ov_SC05_000_jr_8017A4AC.c @@ -2543,17 +2543,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_000/ov_SC05_000_jr_8017AE2C.c b/src/ov_SC05_000/ov_SC05_000_jr_8017AE2C.c index c9ba3e16e..f8bdc705e 100644 --- a/src/ov_SC05_000/ov_SC05_000_jr_8017AE2C.c +++ b/src/ov_SC05_000/ov_SC05_000_jr_8017AE2C.c @@ -2543,17 +2543,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_000/ov_SC05_000_jr_8017BEBC.c b/src/ov_SC05_000/ov_SC05_000_jr_8017BEBC.c index 576267398..d4c506399 100644 --- a/src/ov_SC05_000/ov_SC05_000_jr_8017BEBC.c +++ b/src/ov_SC05_000/ov_SC05_000_jr_8017BEBC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_001/ov_SC05_001_jr_80178D40.c b/src/ov_SC05_001/ov_SC05_001_jr_80178D40.c index d607f8640..e463c7277 100644 --- a/src/ov_SC05_001/ov_SC05_001_jr_80178D40.c +++ b/src/ov_SC05_001/ov_SC05_001_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B5B1C; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B5B1C; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801B5B44; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC05_001/ov_SC05_001_jr_8017A4AC.c b/src/ov_SC05_001/ov_SC05_001_jr_8017A4AC.c index 5f623f923..c92914dc5 100644 --- a/src/ov_SC05_001/ov_SC05_001_jr_8017A4AC.c +++ b/src/ov_SC05_001/ov_SC05_001_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_001/ov_SC05_001_jr_8017AE2C.c b/src/ov_SC05_001/ov_SC05_001_jr_8017AE2C.c index 02ce74945..87767b698 100644 --- a/src/ov_SC05_001/ov_SC05_001_jr_8017AE2C.c +++ b/src/ov_SC05_001/ov_SC05_001_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_001/ov_SC05_001_jr_8017BEBC.c b/src/ov_SC05_001/ov_SC05_001_jr_8017BEBC.c index eb3ff6a32..3403904f9 100644 --- a/src/ov_SC05_001/ov_SC05_001_jr_8017BEBC.c +++ b/src/ov_SC05_001/ov_SC05_001_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_002/ov_SC05_002_jr_80178D40.c b/src/ov_SC05_002/ov_SC05_002_jr_80178D40.c index a3493ee2d..778e00b91 100644 --- a/src/ov_SC05_002/ov_SC05_002_jr_80178D40.c +++ b/src/ov_SC05_002/ov_SC05_002_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019FDBC; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019FDBC; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8019FDE4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC05_002/ov_SC05_002_jr_8017A4AC.c b/src/ov_SC05_002/ov_SC05_002_jr_8017A4AC.c index 83ebc795a..5be96ff9b 100644 --- a/src/ov_SC05_002/ov_SC05_002_jr_8017A4AC.c +++ b/src/ov_SC05_002/ov_SC05_002_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_002/ov_SC05_002_jr_8017AE2C.c b/src/ov_SC05_002/ov_SC05_002_jr_8017AE2C.c index e3cf399fb..c10921fe3 100644 --- a/src/ov_SC05_002/ov_SC05_002_jr_8017AE2C.c +++ b/src/ov_SC05_002/ov_SC05_002_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_002/ov_SC05_002_jr_8017BEBC.c b/src/ov_SC05_002/ov_SC05_002_jr_8017BEBC.c index b9d8d653c..0a4879f5f 100644 --- a/src/ov_SC05_002/ov_SC05_002_jr_8017BEBC.c +++ b/src/ov_SC05_002/ov_SC05_002_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_003/ov_SC05_003_jr_80178D40.c b/src/ov_SC05_003/ov_SC05_003_jr_80178D40.c index 281d833ed..c2ac563da 100644 --- a/src/ov_SC05_003/ov_SC05_003_jr_80178D40.c +++ b/src/ov_SC05_003/ov_SC05_003_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801AC8CC; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801AC8CC; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801AC8F4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC05_003/ov_SC05_003_jr_8017A4AC.c b/src/ov_SC05_003/ov_SC05_003_jr_8017A4AC.c index 038499988..62b6f3dc8 100644 --- a/src/ov_SC05_003/ov_SC05_003_jr_8017A4AC.c +++ b/src/ov_SC05_003/ov_SC05_003_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_003/ov_SC05_003_jr_8017AE2C.c b/src/ov_SC05_003/ov_SC05_003_jr_8017AE2C.c index 0655dd59e..f6cfec2b1 100644 --- a/src/ov_SC05_003/ov_SC05_003_jr_8017AE2C.c +++ b/src/ov_SC05_003/ov_SC05_003_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_003/ov_SC05_003_jr_8017BEBC.c b/src/ov_SC05_003/ov_SC05_003_jr_8017BEBC.c index 485cc305f..9d1db7be7 100644 --- a/src/ov_SC05_003/ov_SC05_003_jr_8017BEBC.c +++ b/src/ov_SC05_003/ov_SC05_003_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_004/ov_SC05_004_jr_80178D40.c b/src/ov_SC05_004/ov_SC05_004_jr_80178D40.c index 2e3135d80..453b55611 100644 --- a/src/ov_SC05_004/ov_SC05_004_jr_80178D40.c +++ b/src/ov_SC05_004/ov_SC05_004_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019EF44; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019EF44; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8019EF6C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC05_004/ov_SC05_004_jr_8017A4AC.c b/src/ov_SC05_004/ov_SC05_004_jr_8017A4AC.c index ca448bc5f..b6621de50 100644 --- a/src/ov_SC05_004/ov_SC05_004_jr_8017A4AC.c +++ b/src/ov_SC05_004/ov_SC05_004_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_004/ov_SC05_004_jr_8017AE2C.c b/src/ov_SC05_004/ov_SC05_004_jr_8017AE2C.c index 462019c08..2d864fd53 100644 --- a/src/ov_SC05_004/ov_SC05_004_jr_8017AE2C.c +++ b/src/ov_SC05_004/ov_SC05_004_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_004/ov_SC05_004_jr_8017BEBC.c b/src/ov_SC05_004/ov_SC05_004_jr_8017BEBC.c index 3cb11c36f..f9008275d 100644 --- a/src/ov_SC05_004/ov_SC05_004_jr_8017BEBC.c +++ b/src/ov_SC05_004/ov_SC05_004_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_005/ov_SC05_005_jr_80178D40.c b/src/ov_SC05_005/ov_SC05_005_jr_80178D40.c index d5b6cd172..20ed7eda1 100644 --- a/src/ov_SC05_005/ov_SC05_005_jr_80178D40.c +++ b/src/ov_SC05_005/ov_SC05_005_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B1BAC; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B1BAC; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801B1BD4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC05_005/ov_SC05_005_jr_8017A4AC.c b/src/ov_SC05_005/ov_SC05_005_jr_8017A4AC.c index 080d5ce5a..b2b53400b 100644 --- a/src/ov_SC05_005/ov_SC05_005_jr_8017A4AC.c +++ b/src/ov_SC05_005/ov_SC05_005_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_005/ov_SC05_005_jr_8017AE2C.c b/src/ov_SC05_005/ov_SC05_005_jr_8017AE2C.c index 96733b6bc..0f5e046d8 100644 --- a/src/ov_SC05_005/ov_SC05_005_jr_8017AE2C.c +++ b/src/ov_SC05_005/ov_SC05_005_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_005/ov_SC05_005_jr_8017D898.c b/src/ov_SC05_005/ov_SC05_005_jr_8017D898.c index 2ea9fb34a..a2a092357 100644 --- a/src/ov_SC05_005/ov_SC05_005_jr_8017D898.c +++ b/src/ov_SC05_005/ov_SC05_005_jr_8017D898.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_006/ov_SC05_006_jr_80178D40.c b/src/ov_SC05_006/ov_SC05_006_jr_80178D40.c index 8326d8b0c..5667d396e 100644 --- a/src/ov_SC05_006/ov_SC05_006_jr_80178D40.c +++ b/src/ov_SC05_006/ov_SC05_006_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8018FCE4; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8018FCE4; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8018FD0C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC05_006/ov_SC05_006_jr_8017A4AC.c b/src/ov_SC05_006/ov_SC05_006_jr_8017A4AC.c index d7c2f9a23..790d8bba8 100644 --- a/src/ov_SC05_006/ov_SC05_006_jr_8017A4AC.c +++ b/src/ov_SC05_006/ov_SC05_006_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_006/ov_SC05_006_jr_8017AE2C.c b/src/ov_SC05_006/ov_SC05_006_jr_8017AE2C.c index 349884496..3baae4a32 100644 --- a/src/ov_SC05_006/ov_SC05_006_jr_8017AE2C.c +++ b/src/ov_SC05_006/ov_SC05_006_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_006/ov_SC05_006_jr_8017BEBC.c b/src/ov_SC05_006/ov_SC05_006_jr_8017BEBC.c index effe3d522..279be6ae6 100644 --- a/src/ov_SC05_006/ov_SC05_006_jr_8017BEBC.c +++ b/src/ov_SC05_006/ov_SC05_006_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_007/ov_SC05_007_jr_80178D40.c b/src/ov_SC05_007/ov_SC05_007_jr_80178D40.c index 21279292b..e9d56967f 100644 --- a/src/ov_SC05_007/ov_SC05_007_jr_80178D40.c +++ b/src/ov_SC05_007/ov_SC05_007_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019CCC4; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019CCC4; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8019CCEC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC05_007/ov_SC05_007_jr_8017A4AC.c b/src/ov_SC05_007/ov_SC05_007_jr_8017A4AC.c index a72d36a2e..0723a5269 100644 --- a/src/ov_SC05_007/ov_SC05_007_jr_8017A4AC.c +++ b/src/ov_SC05_007/ov_SC05_007_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_007/ov_SC05_007_jr_8017AE2C.c b/src/ov_SC05_007/ov_SC05_007_jr_8017AE2C.c index 4c73ddc88..dd4390714 100644 --- a/src/ov_SC05_007/ov_SC05_007_jr_8017AE2C.c +++ b/src/ov_SC05_007/ov_SC05_007_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_007/ov_SC05_007_jr_8017BEBC.c b/src/ov_SC05_007/ov_SC05_007_jr_8017BEBC.c index 4434c9a45..954a246a8 100644 --- a/src/ov_SC05_007/ov_SC05_007_jr_8017BEBC.c +++ b/src/ov_SC05_007/ov_SC05_007_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_008/ov_SC05_008_jr_80178D40.c b/src/ov_SC05_008/ov_SC05_008_jr_80178D40.c index 10cf1eee8..75a0e6680 100644 --- a/src/ov_SC05_008/ov_SC05_008_jr_80178D40.c +++ b/src/ov_SC05_008/ov_SC05_008_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A0FF4; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A0FF4; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801A101C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC05_008/ov_SC05_008_jr_8017A4AC.c b/src/ov_SC05_008/ov_SC05_008_jr_8017A4AC.c index 3ed994008..13621be2b 100644 --- a/src/ov_SC05_008/ov_SC05_008_jr_8017A4AC.c +++ b/src/ov_SC05_008/ov_SC05_008_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_008/ov_SC05_008_jr_8017AE2C.c b/src/ov_SC05_008/ov_SC05_008_jr_8017AE2C.c index 7b0a1e14c..6d159abf5 100644 --- a/src/ov_SC05_008/ov_SC05_008_jr_8017AE2C.c +++ b/src/ov_SC05_008/ov_SC05_008_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_009/ov_SC05_009_jr_80178D40.c b/src/ov_SC05_009/ov_SC05_009_jr_80178D40.c index 2c85a3511..5e7704f2f 100644 --- a/src/ov_SC05_009/ov_SC05_009_jr_80178D40.c +++ b/src/ov_SC05_009/ov_SC05_009_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_80196A04; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_80196A04; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_80196A2C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC05_009/ov_SC05_009_jr_8017A4AC.c b/src/ov_SC05_009/ov_SC05_009_jr_8017A4AC.c index 5a7b8bb25..911bc3fc5 100644 --- a/src/ov_SC05_009/ov_SC05_009_jr_8017A4AC.c +++ b/src/ov_SC05_009/ov_SC05_009_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_009/ov_SC05_009_jr_8017AE2C.c b/src/ov_SC05_009/ov_SC05_009_jr_8017AE2C.c index 3408151e1..9131e95df 100644 --- a/src/ov_SC05_009/ov_SC05_009_jr_8017AE2C.c +++ b/src/ov_SC05_009/ov_SC05_009_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_009/ov_SC05_009_jr_8017BEBC.c b/src/ov_SC05_009/ov_SC05_009_jr_8017BEBC.c index 9fe555b67..d5234c305 100644 --- a/src/ov_SC05_009/ov_SC05_009_jr_8017BEBC.c +++ b/src/ov_SC05_009/ov_SC05_009_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_010/ov_SC05_010_jr_80178D40.c b/src/ov_SC05_010/ov_SC05_010_jr_80178D40.c index 43503b471..036b40435 100644 --- a/src/ov_SC05_010/ov_SC05_010_jr_80178D40.c +++ b/src/ov_SC05_010/ov_SC05_010_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C6E54; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801C6E54; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801C6E7C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC05_010/ov_SC05_010_jr_8017A4AC.c b/src/ov_SC05_010/ov_SC05_010_jr_8017A4AC.c index bcbbf1776..6c42c3b39 100644 --- a/src/ov_SC05_010/ov_SC05_010_jr_8017A4AC.c +++ b/src/ov_SC05_010/ov_SC05_010_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_010/ov_SC05_010_jr_8017AE2C.c b/src/ov_SC05_010/ov_SC05_010_jr_8017AE2C.c index f16c5d577..6df434b64 100644 --- a/src/ov_SC05_010/ov_SC05_010_jr_8017AE2C.c +++ b/src/ov_SC05_010/ov_SC05_010_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_010/ov_SC05_010_jr_8017C8D0.c b/src/ov_SC05_010/ov_SC05_010_jr_8017C8D0.c index 0bcf47593..90c21a8f2 100644 --- a/src/ov_SC05_010/ov_SC05_010_jr_8017C8D0.c +++ b/src/ov_SC05_010/ov_SC05_010_jr_8017C8D0.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_011/ov_SC05_011_jr_80178D40.c b/src/ov_SC05_011/ov_SC05_011_jr_80178D40.c index 5afd66833..b1aa57b06 100644 --- a/src/ov_SC05_011/ov_SC05_011_jr_80178D40.c +++ b/src/ov_SC05_011/ov_SC05_011_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019CFDC; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019CFDC; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8019D004; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC05_011/ov_SC05_011_jr_8017A4AC.c b/src/ov_SC05_011/ov_SC05_011_jr_8017A4AC.c index 093a1d760..1268e6ffa 100644 --- a/src/ov_SC05_011/ov_SC05_011_jr_8017A4AC.c +++ b/src/ov_SC05_011/ov_SC05_011_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_011/ov_SC05_011_jr_8017AE2C.c b/src/ov_SC05_011/ov_SC05_011_jr_8017AE2C.c index 7ac445cc7..76cba51a1 100644 --- a/src/ov_SC05_011/ov_SC05_011_jr_8017AE2C.c +++ b/src/ov_SC05_011/ov_SC05_011_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_011/ov_SC05_011_jr_8017BEBC.c b/src/ov_SC05_011/ov_SC05_011_jr_8017BEBC.c index 89bc9e0d0..85e730e86 100644 --- a/src/ov_SC05_011/ov_SC05_011_jr_8017BEBC.c +++ b/src/ov_SC05_011/ov_SC05_011_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_017/ov_SC05_017_jr_80178D40.c b/src/ov_SC05_017/ov_SC05_017_jr_80178D40.c index d8d66b553..cf475a92e 100644 --- a/src/ov_SC05_017/ov_SC05_017_jr_80178D40.c +++ b/src/ov_SC05_017/ov_SC05_017_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801ECB1C; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801ECB1C; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801ECB44; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC05_017/ov_SC05_017_jr_8017A4AC.c b/src/ov_SC05_017/ov_SC05_017_jr_8017A4AC.c index e630aae18..7823d99ca 100644 --- a/src/ov_SC05_017/ov_SC05_017_jr_8017A4AC.c +++ b/src/ov_SC05_017/ov_SC05_017_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_017/ov_SC05_017_jr_8017AE2C.c b/src/ov_SC05_017/ov_SC05_017_jr_8017AE2C.c index a9ef8943e..d4da1d875 100644 --- a/src/ov_SC05_017/ov_SC05_017_jr_8017AE2C.c +++ b/src/ov_SC05_017/ov_SC05_017_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_018/ov_SC05_018_jr_80178D40.c b/src/ov_SC05_018/ov_SC05_018_jr_80178D40.c index 5d4213273..6f359403e 100644 --- a/src/ov_SC05_018/ov_SC05_018_jr_80178D40.c +++ b/src/ov_SC05_018/ov_SC05_018_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801E625C; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801E625C; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801E6284; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC05_018/ov_SC05_018_jr_8017A4AC.c b/src/ov_SC05_018/ov_SC05_018_jr_8017A4AC.c index 307f1967e..d289d6c7a 100644 --- a/src/ov_SC05_018/ov_SC05_018_jr_8017A4AC.c +++ b/src/ov_SC05_018/ov_SC05_018_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_018/ov_SC05_018_jr_8017AE2C.c b/src/ov_SC05_018/ov_SC05_018_jr_8017AE2C.c index 129ba0d63..eda93afab 100644 --- a/src/ov_SC05_018/ov_SC05_018_jr_8017AE2C.c +++ b/src/ov_SC05_018/ov_SC05_018_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_018/ov_SC05_018_jr_8017D604.c b/src/ov_SC05_018/ov_SC05_018_jr_8017D604.c index 6b4213042..3524c5128 100644 --- a/src/ov_SC05_018/ov_SC05_018_jr_8017D604.c +++ b/src/ov_SC05_018/ov_SC05_018_jr_8017D604.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_019/ov_SC05_019_jr_80178D40.c b/src/ov_SC05_019/ov_SC05_019_jr_80178D40.c index e11b5c284..5c5b19ab7 100644 --- a/src/ov_SC05_019/ov_SC05_019_jr_80178D40.c +++ b/src/ov_SC05_019/ov_SC05_019_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8018F92C; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8018F92C; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8018F954; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC05_019/ov_SC05_019_jr_8017A4AC.c b/src/ov_SC05_019/ov_SC05_019_jr_8017A4AC.c index 10533b6f1..c80d345d9 100644 --- a/src/ov_SC05_019/ov_SC05_019_jr_8017A4AC.c +++ b/src/ov_SC05_019/ov_SC05_019_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_019/ov_SC05_019_jr_8017AE2C.c b/src/ov_SC05_019/ov_SC05_019_jr_8017AE2C.c index b0d3381f5..e528685a2 100644 --- a/src/ov_SC05_019/ov_SC05_019_jr_8017AE2C.c +++ b/src/ov_SC05_019/ov_SC05_019_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC05_019/ov_SC05_019_jr_8017D5C0.c b/src/ov_SC05_019/ov_SC05_019_jr_8017D5C0.c index c5471c0f5..9ed7f3d60 100644 --- a/src/ov_SC05_019/ov_SC05_019_jr_8017D5C0.c +++ b/src/ov_SC05_019/ov_SC05_019_jr_8017D5C0.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_000/ov_SC06_000_jr_80178D40.c b/src/ov_SC06_000/ov_SC06_000_jr_80178D40.c index 050086cd9..39b448a5c 100644 --- a/src/ov_SC06_000/ov_SC06_000_jr_80178D40.c +++ b/src/ov_SC06_000/ov_SC06_000_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801AE59C; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801AE59C; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801AE5C4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC06_000/ov_SC06_000_jr_8017A4AC.c b/src/ov_SC06_000/ov_SC06_000_jr_8017A4AC.c index 226f2100f..d9a8c9c78 100644 --- a/src/ov_SC06_000/ov_SC06_000_jr_8017A4AC.c +++ b/src/ov_SC06_000/ov_SC06_000_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_000/ov_SC06_000_jr_8017AE2C.c b/src/ov_SC06_000/ov_SC06_000_jr_8017AE2C.c index ffa501c3b..2229bbbb3 100644 --- a/src/ov_SC06_000/ov_SC06_000_jr_8017AE2C.c +++ b/src/ov_SC06_000/ov_SC06_000_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_006/ov_SC06_006_jr_80178D40.c b/src/ov_SC06_006/ov_SC06_006_jr_80178D40.c index 9f5e2090a..492c74ce9 100644 --- a/src/ov_SC06_006/ov_SC06_006_jr_80178D40.c +++ b/src/ov_SC06_006/ov_SC06_006_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801F7FE4; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801F7FE4; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801F800C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC06_006/ov_SC06_006_jr_8017A4AC.c b/src/ov_SC06_006/ov_SC06_006_jr_8017A4AC.c index ee0ad8727..d8701d4b8 100644 --- a/src/ov_SC06_006/ov_SC06_006_jr_8017A4AC.c +++ b/src/ov_SC06_006/ov_SC06_006_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_006/ov_SC06_006_jr_8017AE2C.c b/src/ov_SC06_006/ov_SC06_006_jr_8017AE2C.c index d49216fb2..eefd3b2d5 100644 --- a/src/ov_SC06_006/ov_SC06_006_jr_8017AE2C.c +++ b/src/ov_SC06_006/ov_SC06_006_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_006/ov_SC06_006_jr_8017BEBC.c b/src/ov_SC06_006/ov_SC06_006_jr_8017BEBC.c index fee178182..a89fd78fd 100644 --- a/src/ov_SC06_006/ov_SC06_006_jr_8017BEBC.c +++ b/src/ov_SC06_006/ov_SC06_006_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_008/ov_SC06_008_jr_80178D40.c b/src/ov_SC06_008/ov_SC06_008_jr_80178D40.c index 8ae538292..d80895d61 100644 --- a/src/ov_SC06_008/ov_SC06_008_jr_80178D40.c +++ b/src/ov_SC06_008/ov_SC06_008_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A9F64; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A9F64; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801A9F8C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC06_008/ov_SC06_008_jr_8017A4AC.c b/src/ov_SC06_008/ov_SC06_008_jr_8017A4AC.c index d5d5e3ebd..40924360f 100644 --- a/src/ov_SC06_008/ov_SC06_008_jr_8017A4AC.c +++ b/src/ov_SC06_008/ov_SC06_008_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_008/ov_SC06_008_jr_8017AE2C.c b/src/ov_SC06_008/ov_SC06_008_jr_8017AE2C.c index 7cbab9b5e..fc0a85593 100644 --- a/src/ov_SC06_008/ov_SC06_008_jr_8017AE2C.c +++ b/src/ov_SC06_008/ov_SC06_008_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_008/ov_SC06_008_jr_8017C294.c b/src/ov_SC06_008/ov_SC06_008_jr_8017C294.c index ed4d96b0e..c8330ce7a 100644 --- a/src/ov_SC06_008/ov_SC06_008_jr_8017C294.c +++ b/src/ov_SC06_008/ov_SC06_008_jr_8017C294.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_010/ov_SC06_010_jr_80178D40.c b/src/ov_SC06_010/ov_SC06_010_jr_80178D40.c index 6a1114d7b..5c0a8bfba 100644 --- a/src/ov_SC06_010/ov_SC06_010_jr_80178D40.c +++ b/src/ov_SC06_010/ov_SC06_010_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B1F9C; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B1F9C; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801B1FC4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC06_010/ov_SC06_010_jr_8017A4AC.c b/src/ov_SC06_010/ov_SC06_010_jr_8017A4AC.c index 97421462a..c3ed20861 100644 --- a/src/ov_SC06_010/ov_SC06_010_jr_8017A4AC.c +++ b/src/ov_SC06_010/ov_SC06_010_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_011/ov_SC06_011_jr_80178D40.c b/src/ov_SC06_011/ov_SC06_011_jr_80178D40.c index 007da28d8..ebfb806b3 100644 --- a/src/ov_SC06_011/ov_SC06_011_jr_80178D40.c +++ b/src/ov_SC06_011/ov_SC06_011_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801ABB4C; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801ABB4C; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801ABB74; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC06_011/ov_SC06_011_jr_8017A4AC.c b/src/ov_SC06_011/ov_SC06_011_jr_8017A4AC.c index 1b4ea584a..f656ae3fe 100644 --- a/src/ov_SC06_011/ov_SC06_011_jr_8017A4AC.c +++ b/src/ov_SC06_011/ov_SC06_011_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_011/ov_SC06_011_jr_8017AE2C.c b/src/ov_SC06_011/ov_SC06_011_jr_8017AE2C.c index e6177c97c..d115756a4 100644 --- a/src/ov_SC06_011/ov_SC06_011_jr_8017AE2C.c +++ b/src/ov_SC06_011/ov_SC06_011_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_011/ov_SC06_011_jr_8017BEBC.c b/src/ov_SC06_011/ov_SC06_011_jr_8017BEBC.c index 521127563..77fc0aa96 100644 --- a/src/ov_SC06_011/ov_SC06_011_jr_8017BEBC.c +++ b/src/ov_SC06_011/ov_SC06_011_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_013/ov_SC06_013_jr_80178D40.c b/src/ov_SC06_013/ov_SC06_013_jr_80178D40.c index bf38a105c..7a4da9ef4 100644 --- a/src/ov_SC06_013/ov_SC06_013_jr_80178D40.c +++ b/src/ov_SC06_013/ov_SC06_013_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019AA04; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019AA04; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8019AA2C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC06_013/ov_SC06_013_jr_8017A4AC.c b/src/ov_SC06_013/ov_SC06_013_jr_8017A4AC.c index ae6003384..372ad8880 100644 --- a/src/ov_SC06_013/ov_SC06_013_jr_8017A4AC.c +++ b/src/ov_SC06_013/ov_SC06_013_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_013/ov_SC06_013_jr_8017AE2C.c b/src/ov_SC06_013/ov_SC06_013_jr_8017AE2C.c index 3aee9328b..27fbe6d16 100644 --- a/src/ov_SC06_013/ov_SC06_013_jr_8017AE2C.c +++ b/src/ov_SC06_013/ov_SC06_013_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_013/ov_SC06_013_jr_8017BEBC.c b/src/ov_SC06_013/ov_SC06_013_jr_8017BEBC.c index 3fd337ba5..91d27c7f3 100644 --- a/src/ov_SC06_013/ov_SC06_013_jr_8017BEBC.c +++ b/src/ov_SC06_013/ov_SC06_013_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_014/ov_SC06_014_jr_80178D40.c b/src/ov_SC06_014/ov_SC06_014_jr_80178D40.c index b0dde7773..b742d9db7 100644 --- a/src/ov_SC06_014/ov_SC06_014_jr_80178D40.c +++ b/src/ov_SC06_014/ov_SC06_014_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A13F4; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A13F4; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801A141C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC06_014/ov_SC06_014_jr_8017A4AC.c b/src/ov_SC06_014/ov_SC06_014_jr_8017A4AC.c index 7667abe92..3bebf7925 100644 --- a/src/ov_SC06_014/ov_SC06_014_jr_8017A4AC.c +++ b/src/ov_SC06_014/ov_SC06_014_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_014/ov_SC06_014_jr_8017AE2C.c b/src/ov_SC06_014/ov_SC06_014_jr_8017AE2C.c index 0acd5b6b3..dc8c46ed9 100644 --- a/src/ov_SC06_014/ov_SC06_014_jr_8017AE2C.c +++ b/src/ov_SC06_014/ov_SC06_014_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_014/ov_SC06_014_jr_8017BEBC.c b/src/ov_SC06_014/ov_SC06_014_jr_8017BEBC.c index 709eb40b9..673eb63f2 100644 --- a/src/ov_SC06_014/ov_SC06_014_jr_8017BEBC.c +++ b/src/ov_SC06_014/ov_SC06_014_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_015/ov_SC06_015_jr_80178D40.c b/src/ov_SC06_015/ov_SC06_015_jr_80178D40.c index 6fd2b6d2f..b091a4f7b 100644 --- a/src/ov_SC06_015/ov_SC06_015_jr_80178D40.c +++ b/src/ov_SC06_015/ov_SC06_015_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801947D4; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801947D4; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801947FC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC06_015/ov_SC06_015_jr_8017A4AC.c b/src/ov_SC06_015/ov_SC06_015_jr_8017A4AC.c index 27fe56d8d..0eaec22ad 100644 --- a/src/ov_SC06_015/ov_SC06_015_jr_8017A4AC.c +++ b/src/ov_SC06_015/ov_SC06_015_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_015/ov_SC06_015_jr_8017AE2C.c b/src/ov_SC06_015/ov_SC06_015_jr_8017AE2C.c index 7d43e6b24..84986e395 100644 --- a/src/ov_SC06_015/ov_SC06_015_jr_8017AE2C.c +++ b/src/ov_SC06_015/ov_SC06_015_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_015/ov_SC06_015_jr_8017BEBC.c b/src/ov_SC06_015/ov_SC06_015_jr_8017BEBC.c index b2d735ad2..3217f9d22 100644 --- a/src/ov_SC06_015/ov_SC06_015_jr_8017BEBC.c +++ b/src/ov_SC06_015/ov_SC06_015_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_016/ov_SC06_016_jr_80178D40.c b/src/ov_SC06_016/ov_SC06_016_jr_80178D40.c index 10c063a38..46fafe67c 100644 --- a/src/ov_SC06_016/ov_SC06_016_jr_80178D40.c +++ b/src/ov_SC06_016/ov_SC06_016_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019F5A4; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019F5A4; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8019F5CC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC06_016/ov_SC06_016_jr_8017A4AC.c b/src/ov_SC06_016/ov_SC06_016_jr_8017A4AC.c index ef4f3d0ac..e1f123208 100644 --- a/src/ov_SC06_016/ov_SC06_016_jr_8017A4AC.c +++ b/src/ov_SC06_016/ov_SC06_016_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_016/ov_SC06_016_jr_8017AE2C.c b/src/ov_SC06_016/ov_SC06_016_jr_8017AE2C.c index f6628a499..718e6f48e 100644 --- a/src/ov_SC06_016/ov_SC06_016_jr_8017AE2C.c +++ b/src/ov_SC06_016/ov_SC06_016_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_016/ov_SC06_016_jr_8017C8D0.c b/src/ov_SC06_016/ov_SC06_016_jr_8017C8D0.c index 8d8264420..fd4942313 100644 --- a/src/ov_SC06_016/ov_SC06_016_jr_8017C8D0.c +++ b/src/ov_SC06_016/ov_SC06_016_jr_8017C8D0.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_018/ov_SC06_018_jr_80178D40.c b/src/ov_SC06_018/ov_SC06_018_jr_80178D40.c index 73fffe0ef..413922ba3 100644 --- a/src/ov_SC06_018/ov_SC06_018_jr_80178D40.c +++ b/src/ov_SC06_018/ov_SC06_018_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801D4E8C; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801D4E8C; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801D4EB4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC06_018/ov_SC06_018_jr_8017A4AC.c b/src/ov_SC06_018/ov_SC06_018_jr_8017A4AC.c index ab4adcfed..9616bc8f0 100644 --- a/src/ov_SC06_018/ov_SC06_018_jr_8017A4AC.c +++ b/src/ov_SC06_018/ov_SC06_018_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_018/ov_SC06_018_jr_8017AE2C.c b/src/ov_SC06_018/ov_SC06_018_jr_8017AE2C.c index d508612a8..f110c71e3 100644 --- a/src/ov_SC06_018/ov_SC06_018_jr_8017AE2C.c +++ b/src/ov_SC06_018/ov_SC06_018_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_018/ov_SC06_018_jr_8017C24C.c b/src/ov_SC06_018/ov_SC06_018_jr_8017C24C.c index f2291875b..5aefa069e 100644 --- a/src/ov_SC06_018/ov_SC06_018_jr_8017C24C.c +++ b/src/ov_SC06_018/ov_SC06_018_jr_8017C24C.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_018/ov_SC06_018_jr_8019059C.c b/src/ov_SC06_018/ov_SC06_018_jr_8019059C.c index 4921e99d4..21913eae9 100644 --- a/src/ov_SC06_018/ov_SC06_018_jr_8019059C.c +++ b/src/ov_SC06_018/ov_SC06_018_jr_8019059C.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_020/ov_SC06_020_jr_80178D40.c b/src/ov_SC06_020/ov_SC06_020_jr_80178D40.c index fce852156..e91e83e69 100644 --- a/src/ov_SC06_020/ov_SC06_020_jr_80178D40.c +++ b/src/ov_SC06_020/ov_SC06_020_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801BA6A4; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801BA6A4; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801BA6CC; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC06_020/ov_SC06_020_jr_8017A4AC.c b/src/ov_SC06_020/ov_SC06_020_jr_8017A4AC.c index 961fb1f25..0f91b57fe 100644 --- a/src/ov_SC06_020/ov_SC06_020_jr_8017A4AC.c +++ b/src/ov_SC06_020/ov_SC06_020_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_020/ov_SC06_020_jr_8017AE2C.c b/src/ov_SC06_020/ov_SC06_020_jr_8017AE2C.c index 755d9c02d..9c8f60ef7 100644 --- a/src/ov_SC06_020/ov_SC06_020_jr_8017AE2C.c +++ b/src/ov_SC06_020/ov_SC06_020_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_020/ov_SC06_020_jr_8017C24C.c b/src/ov_SC06_020/ov_SC06_020_jr_8017C24C.c index 90e052781..7c41bafb1 100644 --- a/src/ov_SC06_020/ov_SC06_020_jr_8017C24C.c +++ b/src/ov_SC06_020/ov_SC06_020_jr_8017C24C.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_022/ov_SC06_022_jr_80178D40.c b/src/ov_SC06_022/ov_SC06_022_jr_80178D40.c index 32ecf761c..e76f5cb5d 100644 --- a/src/ov_SC06_022/ov_SC06_022_jr_80178D40.c +++ b/src/ov_SC06_022/ov_SC06_022_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801E1F0C; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801E1F0C; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801E1F34; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC06_022/ov_SC06_022_jr_8017A4AC.c b/src/ov_SC06_022/ov_SC06_022_jr_8017A4AC.c index 6528e3534..313bf5240 100644 --- a/src/ov_SC06_022/ov_SC06_022_jr_8017A4AC.c +++ b/src/ov_SC06_022/ov_SC06_022_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_022/ov_SC06_022_jr_8017AE2C.c b/src/ov_SC06_022/ov_SC06_022_jr_8017AE2C.c index 84b833f29..550b6cc95 100644 --- a/src/ov_SC06_022/ov_SC06_022_jr_8017AE2C.c +++ b/src/ov_SC06_022/ov_SC06_022_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_022/ov_SC06_022_jr_8017BEBC.c b/src/ov_SC06_022/ov_SC06_022_jr_8017BEBC.c index d5ce670f5..7ae42fda5 100644 --- a/src/ov_SC06_022/ov_SC06_022_jr_8017BEBC.c +++ b/src/ov_SC06_022/ov_SC06_022_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_024/ov_SC06_024_jr_80178D40.c b/src/ov_SC06_024/ov_SC06_024_jr_80178D40.c index 9c51b3416..09c7da3d1 100644 --- a/src/ov_SC06_024/ov_SC06_024_jr_80178D40.c +++ b/src/ov_SC06_024/ov_SC06_024_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801E108C; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801E108C; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801E10B4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC06_024/ov_SC06_024_jr_8017A4AC.c b/src/ov_SC06_024/ov_SC06_024_jr_8017A4AC.c index 756fc0c1d..a59ab2027 100644 --- a/src/ov_SC06_024/ov_SC06_024_jr_8017A4AC.c +++ b/src/ov_SC06_024/ov_SC06_024_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_024/ov_SC06_024_jr_8017AE2C.c b/src/ov_SC06_024/ov_SC06_024_jr_8017AE2C.c index 985a86221..ef5fb831c 100644 --- a/src/ov_SC06_024/ov_SC06_024_jr_8017AE2C.c +++ b/src/ov_SC06_024/ov_SC06_024_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_024/ov_SC06_024_jr_8017BEBC.c b/src/ov_SC06_024/ov_SC06_024_jr_8017BEBC.c index 591a8d2d5..017600cfb 100644 --- a/src/ov_SC06_024/ov_SC06_024_jr_8017BEBC.c +++ b/src/ov_SC06_024/ov_SC06_024_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_025/ov_SC06_025_jr_80178D40.c b/src/ov_SC06_025/ov_SC06_025_jr_80178D40.c index 4fffbcc6e..1e9660fca 100644 --- a/src/ov_SC06_025/ov_SC06_025_jr_80178D40.c +++ b/src/ov_SC06_025/ov_SC06_025_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B1254; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B1254; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801B127C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC06_025/ov_SC06_025_jr_8017A4AC.c b/src/ov_SC06_025/ov_SC06_025_jr_8017A4AC.c index 1b9938159..305b38a58 100644 --- a/src/ov_SC06_025/ov_SC06_025_jr_8017A4AC.c +++ b/src/ov_SC06_025/ov_SC06_025_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_025/ov_SC06_025_jr_8017AE2C.c b/src/ov_SC06_025/ov_SC06_025_jr_8017AE2C.c index fd8d80a38..4a7f7e7fb 100644 --- a/src/ov_SC06_025/ov_SC06_025_jr_8017AE2C.c +++ b/src/ov_SC06_025/ov_SC06_025_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_025/ov_SC06_025_jr_8017BEBC.c b/src/ov_SC06_025/ov_SC06_025_jr_8017BEBC.c index eacebdfa1..f1404bc1d 100644 --- a/src/ov_SC06_025/ov_SC06_025_jr_8017BEBC.c +++ b/src/ov_SC06_025/ov_SC06_025_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_027/ov_SC06_027_jr_80178D40.c b/src/ov_SC06_027/ov_SC06_027_jr_80178D40.c index 208d40608..941bf9f52 100644 --- a/src/ov_SC06_027/ov_SC06_027_jr_80178D40.c +++ b/src/ov_SC06_027/ov_SC06_027_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019D22C; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019D22C; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8019D254; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC06_027/ov_SC06_027_jr_8017A4AC.c b/src/ov_SC06_027/ov_SC06_027_jr_8017A4AC.c index 3d72b5946..0b54cdd2d 100644 --- a/src/ov_SC06_027/ov_SC06_027_jr_8017A4AC.c +++ b/src/ov_SC06_027/ov_SC06_027_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_027/ov_SC06_027_jr_8017AE2C.c b/src/ov_SC06_027/ov_SC06_027_jr_8017AE2C.c index 961a8a311..50af154a9 100644 --- a/src/ov_SC06_027/ov_SC06_027_jr_8017AE2C.c +++ b/src/ov_SC06_027/ov_SC06_027_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_027/ov_SC06_027_jr_8017BEBC.c b/src/ov_SC06_027/ov_SC06_027_jr_8017BEBC.c index 91ff6cb89..99505c23f 100644 --- a/src/ov_SC06_027/ov_SC06_027_jr_8017BEBC.c +++ b/src/ov_SC06_027/ov_SC06_027_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_029/ov_SC06_029_jr_80178D40.c b/src/ov_SC06_029/ov_SC06_029_jr_80178D40.c index 771df6f96..28c047aee 100644 --- a/src/ov_SC06_029/ov_SC06_029_jr_80178D40.c +++ b/src/ov_SC06_029/ov_SC06_029_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801DCB4C; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801DCB4C; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801DCB74; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC06_029/ov_SC06_029_jr_8017A4AC.c b/src/ov_SC06_029/ov_SC06_029_jr_8017A4AC.c index c20614fc8..db4786f83 100644 --- a/src/ov_SC06_029/ov_SC06_029_jr_8017A4AC.c +++ b/src/ov_SC06_029/ov_SC06_029_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_029/ov_SC06_029_jr_8017AE2C.c b/src/ov_SC06_029/ov_SC06_029_jr_8017AE2C.c index 8a5c96303..1db39c212 100644 --- a/src/ov_SC06_029/ov_SC06_029_jr_8017AE2C.c +++ b/src/ov_SC06_029/ov_SC06_029_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_029/ov_SC06_029_jr_8017C954.c b/src/ov_SC06_029/ov_SC06_029_jr_8017C954.c index 75f18b27a..fa4b4c71f 100644 --- a/src/ov_SC06_029/ov_SC06_029_jr_8017C954.c +++ b/src/ov_SC06_029/ov_SC06_029_jr_8017C954.c @@ -2540,17 +2540,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_030/ov_SC06_030_jr_80178D40.c b/src/ov_SC06_030/ov_SC06_030_jr_80178D40.c index 34e3d3cec..faa0a7211 100644 --- a/src/ov_SC06_030/ov_SC06_030_jr_80178D40.c +++ b/src/ov_SC06_030/ov_SC06_030_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B9DAC; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801B9DAC; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801B9DD4; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC06_030/ov_SC06_030_jr_8017A4AC.c b/src/ov_SC06_030/ov_SC06_030_jr_8017A4AC.c index 002478fd5..49bbecd85 100644 --- a/src/ov_SC06_030/ov_SC06_030_jr_8017A4AC.c +++ b/src/ov_SC06_030/ov_SC06_030_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_030/ov_SC06_030_jr_8017AE2C.c b/src/ov_SC06_030/ov_SC06_030_jr_8017AE2C.c index 8961d58fe..4c8feea35 100644 --- a/src/ov_SC06_030/ov_SC06_030_jr_8017AE2C.c +++ b/src/ov_SC06_030/ov_SC06_030_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_030/ov_SC06_030_jr_8017C8D0.c b/src/ov_SC06_030/ov_SC06_030_jr_8017C8D0.c index 765384a46..bdd06849a 100644 --- a/src/ov_SC06_030/ov_SC06_030_jr_8017C8D0.c +++ b/src/ov_SC06_030/ov_SC06_030_jr_8017C8D0.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_032/ov_SC06_032_jr_80178D40.c b/src/ov_SC06_032/ov_SC06_032_jr_80178D40.c index 06f1bb73f..c87b210e6 100644 --- a/src/ov_SC06_032/ov_SC06_032_jr_80178D40.c +++ b/src/ov_SC06_032/ov_SC06_032_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801D045C; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801D045C; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801D0484; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC06_032/ov_SC06_032_jr_8017A4AC.c b/src/ov_SC06_032/ov_SC06_032_jr_8017A4AC.c index 75e67a30c..4a93e3108 100644 --- a/src/ov_SC06_032/ov_SC06_032_jr_8017A4AC.c +++ b/src/ov_SC06_032/ov_SC06_032_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_032/ov_SC06_032_jr_8017AE2C.c b/src/ov_SC06_032/ov_SC06_032_jr_8017AE2C.c index f55dc0ddf..99ca4ff50 100644 --- a/src/ov_SC06_032/ov_SC06_032_jr_8017AE2C.c +++ b/src/ov_SC06_032/ov_SC06_032_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_032/ov_SC06_032_jr_8017C24C.c b/src/ov_SC06_032/ov_SC06_032_jr_8017C24C.c index 5ce225a1d..843fd7dae 100644 --- a/src/ov_SC06_032/ov_SC06_032_jr_8017C24C.c +++ b/src/ov_SC06_032/ov_SC06_032_jr_8017C24C.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_033/ov_SC06_033_jr_80178D40.c b/src/ov_SC06_033/ov_SC06_033_jr_80178D40.c index 931a3e614..73244646e 100644 --- a/src/ov_SC06_033/ov_SC06_033_jr_80178D40.c +++ b/src/ov_SC06_033/ov_SC06_033_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801D051C; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801D051C; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801D0544; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC06_033/ov_SC06_033_jr_8017A4AC.c b/src/ov_SC06_033/ov_SC06_033_jr_8017A4AC.c index 8c5e9cd68..205dd3783 100644 --- a/src/ov_SC06_033/ov_SC06_033_jr_8017A4AC.c +++ b/src/ov_SC06_033/ov_SC06_033_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_033/ov_SC06_033_jr_8017AE2C.c b/src/ov_SC06_033/ov_SC06_033_jr_8017AE2C.c index afa45b47f..939da3f9f 100644 --- a/src/ov_SC06_033/ov_SC06_033_jr_8017AE2C.c +++ b/src/ov_SC06_033/ov_SC06_033_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC06_033/ov_SC06_033_jr_8017C24C.c b/src/ov_SC06_033/ov_SC06_033_jr_8017C24C.c index a8964f643..d2568b347 100644 --- a/src/ov_SC06_033/ov_SC06_033_jr_8017C24C.c +++ b/src/ov_SC06_033/ov_SC06_033_jr_8017C24C.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC07_000/ov_SC07_000_jr_80178D40.c b/src/ov_SC07_000/ov_SC07_000_jr_80178D40.c index 275c620e4..6078e92f1 100644 --- a/src/ov_SC07_000/ov_SC07_000_jr_80178D40.c +++ b/src/ov_SC07_000/ov_SC07_000_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801CFA64; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801CFA64; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801CFA8C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC07_000/ov_SC07_000_jr_8017A4AC.c b/src/ov_SC07_000/ov_SC07_000_jr_8017A4AC.c index feaddb23a..d535908a1 100644 --- a/src/ov_SC07_000/ov_SC07_000_jr_8017A4AC.c +++ b/src/ov_SC07_000/ov_SC07_000_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC07_000/ov_SC07_000_jr_8017AE2C.c b/src/ov_SC07_000/ov_SC07_000_jr_8017AE2C.c index b5468bf33..43b2d5e96 100644 --- a/src/ov_SC07_000/ov_SC07_000_jr_8017AE2C.c +++ b/src/ov_SC07_000/ov_SC07_000_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC07_000/ov_SC07_000_jr_8017BEBC.c b/src/ov_SC07_000/ov_SC07_000_jr_8017BEBC.c index 777e7f687..fe286794b 100644 --- a/src/ov_SC07_000/ov_SC07_000_jr_8017BEBC.c +++ b/src/ov_SC07_000/ov_SC07_000_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC07_001/ov_SC07_001_jr_80178D40.c b/src/ov_SC07_001/ov_SC07_001_jr_80178D40.c index a811cda85..5161eaa9b 100644 --- a/src/ov_SC07_001/ov_SC07_001_jr_80178D40.c +++ b/src/ov_SC07_001/ov_SC07_001_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801AAB14; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801AAB14; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801AAB3C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC07_001/ov_SC07_001_jr_8017A4AC.c b/src/ov_SC07_001/ov_SC07_001_jr_8017A4AC.c index f893ef138..ceb55de5a 100644 --- a/src/ov_SC07_001/ov_SC07_001_jr_8017A4AC.c +++ b/src/ov_SC07_001/ov_SC07_001_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC07_001/ov_SC07_001_jr_8017AE2C.c b/src/ov_SC07_001/ov_SC07_001_jr_8017AE2C.c index e81f07bb6..f8b1d401d 100644 --- a/src/ov_SC07_001/ov_SC07_001_jr_8017AE2C.c +++ b/src/ov_SC07_001/ov_SC07_001_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC07_001/ov_SC07_001_jr_8017BEBC.c b/src/ov_SC07_001/ov_SC07_001_jr_8017BEBC.c index 6df7a21d6..0392ba1c4 100644 --- a/src/ov_SC07_001/ov_SC07_001_jr_8017BEBC.c +++ b/src/ov_SC07_001/ov_SC07_001_jr_8017BEBC.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC07_002/ov_SC07_002_jr_80178D40.c b/src/ov_SC07_002/ov_SC07_002_jr_80178D40.c index c03c0afc4..51fa2afd5 100644 --- a/src/ov_SC07_002/ov_SC07_002_jr_80178D40.c +++ b/src/ov_SC07_002/ov_SC07_002_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019B664; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019B664; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_8019B68C; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC07_002/ov_SC07_002_jr_8017A4AC.c b/src/ov_SC07_002/ov_SC07_002_jr_8017A4AC.c index 9ef23d001..0b29791fc 100644 --- a/src/ov_SC07_002/ov_SC07_002_jr_8017A4AC.c +++ b/src/ov_SC07_002/ov_SC07_002_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC07_002/ov_SC07_002_jr_8017AE2C.c b/src/ov_SC07_002/ov_SC07_002_jr_8017AE2C.c index ee20cb8b7..926083ae1 100644 --- a/src/ov_SC07_002/ov_SC07_002_jr_8017AE2C.c +++ b/src/ov_SC07_002/ov_SC07_002_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC07_002/ov_SC07_002_jr_8017C8D0.c b/src/ov_SC07_002/ov_SC07_002_jr_8017C8D0.c index ae4b30d1a..d10dc4d57 100644 --- a/src/ov_SC07_002/ov_SC07_002_jr_8017C8D0.c +++ b/src/ov_SC07_002/ov_SC07_002_jr_8017C8D0.c @@ -2547,17 +2547,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC07_006/ov_SC07_006_jr_8016AE5C.c b/src/ov_SC07_006/ov_SC07_006_jr_8016AE5C.c index 62831daff..da0e5be27 100644 --- a/src/ov_SC07_006/ov_SC07_006_jr_8016AE5C.c +++ b/src/ov_SC07_006/ov_SC07_006_jr_8016AE5C.c @@ -5996,7 +5996,7 @@ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017a040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A094(s32 arg0) { @@ -6010,7 +6010,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A0C4(s32 arg0) { @@ -6030,7 +6030,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017a11c (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { diff --git a/src/ov_SC07_006/ov_SC07_006_jr_8017AE2C.c b/src/ov_SC07_006/ov_SC07_006_jr_8017AE2C.c index f68d1337a..965a7973c 100644 --- a/src/ov_SC07_006/ov_SC07_006_jr_8017AE2C.c +++ b/src/ov_SC07_006/ov_SC07_006_jr_8017AE2C.c @@ -3188,17 +3188,17 @@ extern M2C_UNK func_80178D40(s32 arg0, s32 arg1); extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC07_006/ov_SC07_006_jr_8017BEBC.c b/src/ov_SC07_006/ov_SC07_006_jr_8017BEBC.c index 32f0ad64f..2e8ddf7cb 100644 --- a/src/ov_SC07_006/ov_SC07_006_jr_8017BEBC.c +++ b/src/ov_SC07_006/ov_SC07_006_jr_8017BEBC.c @@ -3111,17 +3111,17 @@ extern M2C_UNK func_80178D40(s32 arg0, s32 arg1); extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC07_006/ov_SC07_006_jr_80183814.c b/src/ov_SC07_006/ov_SC07_006_jr_80183814.c index 07974af43..767d0ecb9 100644 --- a/src/ov_SC07_006/ov_SC07_006_jr_80183814.c +++ b/src/ov_SC07_006/ov_SC07_006_jr_80183814.c @@ -3107,17 +3107,17 @@ extern M2C_UNK func_80178D40(s32 arg0, s32 arg1); extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC07_007/ov_SC07_007_jr_8016AE5C.c b/src/ov_SC07_007/ov_SC07_007_jr_8016AE5C.c index 59310c53f..8026ce689 100644 --- a/src/ov_SC07_007/ov_SC07_007_jr_8016AE5C.c +++ b/src/ov_SC07_007/ov_SC07_007_jr_8016AE5C.c @@ -5789,7 +5789,7 @@ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017a040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A094(s32 arg0) { @@ -5803,7 +5803,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A0C4(s32 arg0) { @@ -5823,7 +5823,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017a11c (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { diff --git a/src/ov_SC07_007/ov_SC07_007_jr_8017AE2C.c b/src/ov_SC07_007/ov_SC07_007_jr_8017AE2C.c index 966d66327..d6229a8c6 100644 --- a/src/ov_SC07_007/ov_SC07_007_jr_8017AE2C.c +++ b/src/ov_SC07_007/ov_SC07_007_jr_8017AE2C.c @@ -3188,17 +3188,17 @@ extern M2C_UNK func_80178D40(s32 arg0, s32 arg1); extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC07_007/ov_SC07_007_jr_8017BEBC.c b/src/ov_SC07_007/ov_SC07_007_jr_8017BEBC.c index d0fd0a3ef..71d287902 100644 --- a/src/ov_SC07_007/ov_SC07_007_jr_8017BEBC.c +++ b/src/ov_SC07_007/ov_SC07_007_jr_8017BEBC.c @@ -3111,17 +3111,17 @@ extern M2C_UNK func_80178D40(s32 arg0, s32 arg1); extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC07_008/ov_SC07_008_jr_80178D40.c b/src/ov_SC07_008/ov_SC07_008_jr_80178D40.c index 8b7a39d06..b2372bc0c 100644 --- a/src/ov_SC07_008/ov_SC07_008_jr_80178D40.c +++ b/src/ov_SC07_008/ov_SC07_008_jr_80178D40.c @@ -3320,7 +3320,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019654C; void func_8017A094(s32 arg0) { @@ -3333,7 +3333,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_8019654C; void func_8017A0C4(s32 arg0) { @@ -3351,7 +3351,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_80196574; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC07_008/ov_SC07_008_jr_8017A4AC.c b/src/ov_SC07_008/ov_SC07_008_jr_8017A4AC.c index e9bc3bb69..b134a3a7f 100644 --- a/src/ov_SC07_008/ov_SC07_008_jr_8017A4AC.c +++ b/src/ov_SC07_008/ov_SC07_008_jr_8017A4AC.c @@ -2544,17 +2544,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC07_008/ov_SC07_008_jr_8017AE2C.c b/src/ov_SC07_008/ov_SC07_008_jr_8017AE2C.c index bed1e42c6..36782932e 100644 --- a/src/ov_SC07_008/ov_SC07_008_jr_8017AE2C.c +++ b/src/ov_SC07_008/ov_SC07_008_jr_8017AE2C.c @@ -2544,17 +2544,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC07_008/ov_SC07_008_jr_8017BEBC.c b/src/ov_SC07_008/ov_SC07_008_jr_8017BEBC.c index ec4eee67e..7bb1eba18 100644 --- a/src/ov_SC07_008/ov_SC07_008_jr_8017BEBC.c +++ b/src/ov_SC07_008/ov_SC07_008_jr_8017BEBC.c @@ -2546,17 +2546,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC07_009/ov_SC07_009_jr_80178D40.c b/src/ov_SC07_009/ov_SC07_009_jr_80178D40.c index 28d61ba1c..04c9ae19c 100644 --- a/src/ov_SC07_009/ov_SC07_009_jr_80178D40.c +++ b/src/ov_SC07_009/ov_SC07_009_jr_80178D40.c @@ -3321,7 +3321,7 @@ DEFINE_func_80179FEC() /* dedup: shared engine-core @0x80179FEC (src/shared) */ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017A040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A3BDC; void func_8017A094(s32 arg0) { @@ -3334,7 +3334,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern s32 D_801A3BDC; void func_8017A0C4(s32 arg0) { @@ -3352,7 +3352,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017A11C (src/shared) */ extern s32 D_801A3C04; -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { s16 sp10; diff --git a/src/ov_SC07_009/ov_SC07_009_jr_8017A4AC.c b/src/ov_SC07_009/ov_SC07_009_jr_8017A4AC.c index 613d66d9f..007990402 100644 --- a/src/ov_SC07_009/ov_SC07_009_jr_8017A4AC.c +++ b/src/ov_SC07_009/ov_SC07_009_jr_8017A4AC.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC07_009/ov_SC07_009_jr_8017AE2C.c b/src/ov_SC07_009/ov_SC07_009_jr_8017AE2C.c index a4094ec3c..74a08a1e0 100644 --- a/src/ov_SC07_009/ov_SC07_009_jr_8017AE2C.c +++ b/src/ov_SC07_009/ov_SC07_009_jr_8017AE2C.c @@ -2545,17 +2545,17 @@ extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern s32 func_80178D40(s32 arg0, s32 arg1); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC07_010/ov_SC07_010_jr_8016AE5C.c b/src/ov_SC07_010/ov_SC07_010_jr_8016AE5C.c index 26547a437..4f79334e0 100644 --- a/src/ov_SC07_010/ov_SC07_010_jr_8016AE5C.c +++ b/src/ov_SC07_010/ov_SC07_010_jr_8016AE5C.c @@ -5181,7 +5181,7 @@ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017a040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A094(s32 arg0) { @@ -5195,7 +5195,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A0C4(s32 arg0) { @@ -5215,7 +5215,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017a11c (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { diff --git a/src/ov_SC07_010/ov_SC07_010_jr_8017AE2C.c b/src/ov_SC07_010/ov_SC07_010_jr_8017AE2C.c index 3fb8cf8ce..f18ad4a66 100644 --- a/src/ov_SC07_010/ov_SC07_010_jr_8017AE2C.c +++ b/src/ov_SC07_010/ov_SC07_010_jr_8017AE2C.c @@ -2636,17 +2636,17 @@ extern M2C_UNK func_80178D40(s32 arg0, s32 arg1); extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC07_011/ov_SC07_011_jr_8016AE5C.c b/src/ov_SC07_011/ov_SC07_011_jr_8016AE5C.c index ca33ee9f4..e0b0e41df 100644 --- a/src/ov_SC07_011/ov_SC07_011_jr_8016AE5C.c +++ b/src/ov_SC07_011/ov_SC07_011_jr_8016AE5C.c @@ -5819,7 +5819,7 @@ DEFINE_func_8017A040() /* dedup: shared engine-core @0x8017a040 (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A094(s32 arg0) { @@ -5833,7 +5833,7 @@ void func_8017A094(s32 arg0) { -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A0C4(s32 arg0) { @@ -5853,7 +5853,7 @@ DEFINE_func_8017A11C() /* dedup: shared engine-core @0x8017a11c (src/shared) */ -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); void func_8017A144(s32 a0) { diff --git a/src/ov_SC07_011/ov_SC07_011_jr_8017AE2C.c b/src/ov_SC07_011/ov_SC07_011_jr_8017AE2C.c index ca6f70dd6..52192f0fd 100644 --- a/src/ov_SC07_011/ov_SC07_011_jr_8017AE2C.c +++ b/src/ov_SC07_011/ov_SC07_011_jr_8017AE2C.c @@ -3191,17 +3191,17 @@ extern M2C_UNK func_80178D40(s32 arg0, s32 arg1); extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/ov_SC07_011/ov_SC07_011_jr_8017BEBC.c b/src/ov_SC07_011/ov_SC07_011_jr_8017BEBC.c index 5cdbb0540..bf4dfcbd2 100644 --- a/src/ov_SC07_011/ov_SC07_011_jr_8017BEBC.c +++ b/src/ov_SC07_011/ov_SC07_011_jr_8017BEBC.c @@ -3114,17 +3114,17 @@ extern M2C_UNK func_80178D40(s32 arg0, s32 arg1); extern void func_80178CBC(s32 arg0, s32 arg1); extern void func_80178D18(void); extern void func_80179B28(s32 a0); -extern void func_80179B74(s16 *a0); +extern void func_80179B74(u16 *p); extern void func_80179D30(u16 *a0); extern void func_80179D78(u16 *a0); -extern void func_80179B74(short *); +extern void func_80179B74(u16 *p); extern void func_80179DCC(short a0); extern void func_80179DF8(void); extern void func_80179E1C(short a0); extern void func_80179E48(s16 a0); extern void func_80179E74(s16 a0); extern void func_80179EA0(u16 *a0); -extern void func_80179B74(short *p); +extern void func_80179B74(u16 *p); extern void func_80179EE8(short a0); extern void func_80179F14(s16 a0, s16 a1); extern void func_80179F44(void); diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index c7e99b1a4..57e09cbd8 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -2380,7 +2380,7 @@ } #define DEFINE_func_80179DF8() \ - extern void func_80179B74(s16 *a0); \ + extern void func_80179B74(u16 *p); \ void func_80179DF8(void) { \ s16 local; \ local = 0; \ @@ -2647,7 +2647,7 @@ } #define DEFINE_func_80179F44() \ - extern void func_80179B74(short *); \ + extern void func_80179B74(u16 *p); \ void func_80179F44(void) { \ short sp10; \ sp10 = 0x18; \ @@ -2655,7 +2655,7 @@ } #define DEFINE_func_8017A0F4() \ - extern void func_80179B74(short *); \ + extern void func_80179B74(u16 *p); \ void func_8017A0F4(void) { \ short sp10; \ sp10 = 0x7; \ @@ -2663,7 +2663,7 @@ } #define DEFINE_func_8017A11C() \ - extern void func_80179B74(short *); \ + extern void func_80179B74(u16 *p); \ void func_8017A11C(void) { \ short sp10; \ sp10 = 0x8; \ @@ -2671,7 +2671,7 @@ } #define DEFINE_func_8017A180() \ - extern void func_80179B74(short *); \ + extern void func_80179B74(u16 *p); \ void func_8017A180(void) { \ short sp10; \ sp10 = 0x9; \ @@ -2679,7 +2679,7 @@ } #define DEFINE_func_8017A1A8() \ - extern void func_80179B74(short *); \ + extern void func_80179B74(u16 *p); \ void func_8017A1A8(void) { \ short sp10; \ sp10 = 0xA; \ @@ -2687,7 +2687,7 @@ } #define DEFINE_func_8017A1D0() \ - extern void func_80179B74(short *); \ + extern void func_80179B74(u16 *p); \ void func_8017A1D0(void) { \ short sp10; \ sp10 = 0xB; \ @@ -2695,7 +2695,7 @@ } #define DEFINE_func_8017A1F8() \ - extern void func_80179B74(short *); \ + extern void func_80179B74(u16 *p); \ void func_8017A1F8(void) { \ short sp10; \ sp10 = 0xC; \ @@ -2703,7 +2703,7 @@ } #define DEFINE_func_8017A298() \ - extern void func_80179B74(short *); \ + extern void func_80179B74(u16 *p); \ void func_8017A298(void) { \ short sp10; \ sp10 = 0xE; \ @@ -2711,7 +2711,7 @@ } #define DEFINE_func_8017A2C0() \ - extern void func_80179B74(short *); \ + extern void func_80179B74(u16 *p); \ void func_8017A2C0(void) { \ short sp10; \ sp10 = 0xF; \ @@ -2719,7 +2719,7 @@ } #define DEFINE_func_8017A2E8() \ - extern void func_80179B74(short *); \ + extern void func_80179B74(u16 *p); \ void func_8017A2E8(void) { \ short sp10; \ sp10 = 0x10; \ @@ -2727,7 +2727,7 @@ } #define DEFINE_func_8017A310() \ - extern void func_80179B74(short *); \ + extern void func_80179B74(u16 *p); \ void func_8017A310(void) { \ short sp10; \ sp10 = 0x11; \ @@ -2735,7 +2735,7 @@ } #define DEFINE_func_8017A338() \ - extern void func_80179B74(short *); \ + extern void func_80179B74(u16 *p); \ void func_8017A338(void) { \ short sp10; \ sp10 = 0x19; \ @@ -2743,7 +2743,7 @@ } #define DEFINE_func_8017A360() \ - extern void func_80179B74(short *); \ + extern void func_80179B74(u16 *p); \ void func_8017A360(void) { \ short sp10; \ sp10 = 0x1E; \ @@ -2751,7 +2751,7 @@ } #define DEFINE_func_8017A388() \ - extern void func_80179B74(short *); \ + extern void func_80179B74(u16 *p); \ void func_8017A388(void) { \ short sp10; \ sp10 = 0x1A; \ @@ -2926,7 +2926,7 @@ } #define DEFINE_func_80179DCC() \ - extern void func_80179B74(short *); \ + extern void func_80179B74(u16 *p); \ void func_80179DCC(short a0) { \ short sp10[2]; \ sp10[1] = a0; \ @@ -2935,7 +2935,7 @@ } #define DEFINE_func_80179E1C() \ - extern void func_80179B74(short *); \ + extern void func_80179B74(u16 *p); \ void func_80179E1C(short a0) { \ short sp10[2]; \ sp10[1] = a0; \ @@ -2944,7 +2944,7 @@ } #define DEFINE_func_80179EE8() \ - extern void func_80179B74(short *p); \ + extern void func_80179B74(u16 *p); \ void func_80179EE8(short a0) { \ short sp[2]; \ sp[1] = a0; \ @@ -2953,7 +2953,7 @@ } #define DEFINE_func_80179F6C() \ - extern void func_80179B74(short *p); \ + extern void func_80179B74(u16 *p); \ void func_80179F6C(short a0) { \ short sp[2]; \ sp[1] = a0; \ @@ -4833,7 +4833,7 @@ } #define DEFINE_func_80179E48() \ - extern void func_80179B74(s16 *a0); \ + extern void func_80179B74(u16 *p); \ void func_80179E48(s16 a0) { \ s16 sp[2]; \ sp[0] = 0x1F; \ @@ -4842,7 +4842,7 @@ } #define DEFINE_func_80179E74() \ - extern void func_80179B74(s16 *a0); \ + extern void func_80179B74(u16 *p); \ void func_80179E74(s16 a0) { \ s16 sp[2]; \ sp[0] = 0x4; \ @@ -4967,7 +4967,7 @@ } #define DEFINE_func_80179F14() \ - extern void func_80179B74(s16 *a0); \ + extern void func_80179B74(u16 *p); \ void func_80179F14(s16 a0, s16 a1) { \ s16 sp[3]; \ sp[0] = 0x13; \ @@ -5606,7 +5606,7 @@ } #define DEFINE_func_80179D78() \ - extern void func_80179B74(s16 *a0); \ + extern void func_80179B74(u16 *p); \ void func_80179D78(u16 *a0) { \ s16 sp[5]; \ sp[0] = 0x1C; \ @@ -5809,21 +5809,21 @@ } #define DEFINE_func_8017A220() \ - extern void func_80179B74(s16 *a0); \ + extern void func_80179B74(u16 *p); \ void func_8017A220(void) { \ s16 v = 0x21; \ func_80179B74(&v); \ } #define DEFINE_func_8017A248() \ - extern void func_80179B74(s16 *a0); \ + extern void func_80179B74(u16 *p); \ void func_8017A248(void) { \ s16 v = 0x22; \ func_80179B74(&v); \ } #define DEFINE_func_8017A270() \ - extern void func_80179B74(s16 *a0); \ + extern void func_80179B74(u16 *p); \ void func_8017A270(void) { \ s16 v = 0xD; \ func_80179B74(&v); \ @@ -8053,7 +8053,7 @@ } #define DEFINE_func_80179D30() \ - extern void func_80179B74(s16 *a0); \ + extern void func_80179B74(u16 *p); \ void func_80179D30(u16 *a0) { \ s16 buf[4]; \ buf[0] = 1; \ @@ -8064,7 +8064,7 @@ } #define DEFINE_func_80179EA0() \ - extern void func_80179B74(s16 *a0); \ + extern void func_80179B74(u16 *p); \ void func_80179EA0(u16 *a0) { \ s16 buf[4]; \ buf[0] = 5; \ @@ -8388,7 +8388,7 @@ } #define DEFINE_func_80179F98() \ - extern void func_80179B74(s16 *a0); \ + extern void func_80179B74(u16 *p); \ void func_80179F98(u16 *a0) { \ s16 sp[5]; \ sp[0] = 0x17; \ @@ -8400,7 +8400,7 @@ } #define DEFINE_func_80179FEC() \ - extern void func_80179B74(s16 *a0); \ + extern void func_80179B74(u16 *p); \ void func_80179FEC(u16 *a0) { \ s16 sp[5]; \ sp[0] = 0x20; \ @@ -8412,7 +8412,7 @@ } #define DEFINE_func_8017A040() \ - extern void func_80179B74(s16 *a0); \ + extern void func_80179B74(u16 *p); \ void func_8017A040(u16 *a0) { \ s16 sp[5]; \ sp[0] = 0x1D; \