PR #2782 follow-up: match 10 additional functions

.gitignore

@@ -5,6 +5,7 @@ ctx_includes.h
 *.s.c
 objdiff.json
 compile_commands.json
+.pi-sessions/
 
 # decompctx output
 ctx.*

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
   hooks:
     - id: style-check
       name: style-check
-      entry: python tools/check/main.py --fix --quiet
+      entry: python3 tools/check/main.py --fix --quiet
       language: system
       pass_filenames: true
       types_or: [c]

config/GALE01/splits.txt

@@ -1269,6 +1269,7 @@ melee/ft/chara/ftKirby/ftkirby.c:
 	.text       start:0x800EE528 end:0x800F1F68
 	.rodata     start:0x803B7548 end:0x803B7570
 	.data       start:0x803C8368 end:0x803CB6D8
+	.sdata      start:0x804D3D98 end:0x804D3DAC
 	.sdata2     start:0x804D9350 end:0x804D9364
 
 melee/ft/chara/ftKirby/ftkirbyattackdash.c:
@@ -1352,6 +1353,7 @@ melee/ft/chara/ftKirby/ftkirbyyoshiegg.c:
 
 melee/ft/chara/ftKirby/ftkirbyspecialmars.c:
 	.text       start:0x8010B1F4 end:0x8010C288
+	.sdata      start:0x804D3E00 end:0x804D3E0D
 	.sdata2     start:0x804D9570 end:0x804D9580
 
 melee/ft/chara/ftKirby/ftkirbyspecialpeach.c:
@@ -2317,11 +2319,17 @@ melee/gm/gm_1A7A.c:
 	.sdata2     start:0x804DAA18 end:0x804DAA28
 
 melee/gm/gmregenddisp.c:
-	.text       start:0x801A7FB4 end:0x801A9DD0
-	.data       start:0x803DB458 end:0x803DBF78
+	.text       start:0x801A7FB4 end:0x801A9B30
+	.data       start:0x803DB458 end:0x803DB640
 	.bss        start:0x80480A00 end:0x80480B38
 	.sdata      start:0x804D42A0 end:0x804D42B8
-	.sdata2     start:0x804DAA28 end:0x804DAAA8
+	.sdata2     start:0x804DAA28 end:0x804DAAA0
+
+melee/gm/gm_1A9B.c:
+	.text       start:0x801A9B30 end:0x801A9DD0
+	.data       start:0x803DB640 end:0x803DBF78
+	.sbss       start:0x804D67C8 end:0x804D67CA
+	.sdata2     start:0x804DAAA0 end:0x804DAAA8
 
 melee/gm/gmopening.c:
 	.text       start:0x801A9DD0 end:0x801AA644
@@ -2480,7 +2488,7 @@ melee/gm/gm_1BA8.c:
 	.bss        start:0x80497758 end:0x8049E558
 	.sdata      start:0x804D4330 end:0x804D44C8
 	.sbss       start:0x804D6900 end:0x804D6940
-	.sdata2     start:0x804DAC78 end:0x804DAC88
+	.sdata2     start:0x804DAC78 end:0x804DAC8C
 
 melee/gm/gm_1BF9.c:
 	.text       start:0x801BF948 end:0x801BFA6C
@@ -2660,7 +2668,7 @@ melee/gr/gricemt.c:
 
 melee/gr/grinishie1.c:
 	.text       start:0x801FA908 end:0x801FCBC0
-	.rodata     start:0x803B8268 end:0x803B8278
+	.rodata     start:0x803B8268 end:0x803B8274
 	.data       start:0x803E48C8 end:0x803E4A60
 	.sdata      start:0x804D4748 end:0x804D4760
 	.sbss       start:0x804D69F8 end:0x804D6A00
@@ -4359,6 +4367,7 @@ melee/if/soundtest.c:
 	.text       start:0x802FF7DC end:0x80301E44
 	.data       start:0x803F9F28 end:0x803FDC20
 	.sdata      start:0x804D5850 end:0x804D5A40
+	.sdata2     start:0x804DDC40 end:0x804DDC48
 
 melee/if/textdraw.c:
 	.text       start:0x80301E44 end:0x803029B4

configure.py

@@ -1031,6 +1031,7 @@ def MatchingFor(*versions):
             Object(NonMatching, "melee/gm/gmregtyfall.c"),
             Object(NonMatching, "melee/gm/gm_1A7A.c"),
             Object(NonMatching, "melee/gm/gmregenddisp.c"),
+            Object(Matching, "melee/gm/gm_1A9B.c"),
             Object(Matching, "melee/gm/gmopening.c"),
             Object(NonMatching, "melee/gm/gmstaffroll.c"),
             Object(Matching, "melee/gm/gmhowto.c"),

src/MSL/stddef.h

@@ -13,7 +13,11 @@ typedef unsigned int usize_t;
 typedef signed int intptr_t;
 typedef unsigned int uintptr_t;
 
+#if defined(__clang__) || defined(__GNUC__)
+#define offsetof(type, member) __builtin_offsetof(type, member)
+#else
 #define offsetof(type, member) ((size_t) &(((type*) 0)->member))
+#endif
 
 #ifndef NULL
 #define NULL 0L