Merge pull request #52 from WhenGryphonsFly/objdiff-2

Add support for objdiff and updated decomp-permuter-agbcc
pret · Oct 4, 2024 · 71fb744 · 71fb744
2 parents ca783dd + d5f56bb
commit 71fb744
Show file tree

Hide file tree

Showing 417 changed files with 30 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 *.exe
 *.o
+!expected_objs/*.o
 *.i
 *.elf
 *.gba

diff --git a/asm/rom_11B9C.s b/asm/rom_11B9C.s
@@ -49498,7 +49498,7 @@ sub_2AADC: @ 0x0802AADC
 	ldrb r5, [r3, #0x1e]
 	cmp r5, #0
 	beq _0802AAF6
-	bl sub_2C518
+	bl _0802C518
 _0802AAF6:
 	ldr r0, _0802AB60 @ =0x000005A6
 	adds r4, r3, r0
@@ -52646,9 +52646,7 @@ _0802C4EC:
 	lsrs r5, r1, #0x10
 	cmp r1, #0
 	bge _0802C4EC
-
-	thumb_func_start sub_2C518
-sub_2C518: @ 0x0802C518
+_0802C518: @ 0x0802C518, bl-ed to but not subroutine?
 	add sp, #4
 	pop {r3, r4, r5}
 	mov r8, r3

diff --git a/asm/rom_3219C.s b/asm/rom_3219C.s
@@ -14672,9 +14672,7 @@ _0803A0E2:
 	ble _0803A0E2
 _0803A14E:
 	movs r2, #0
-
-	thumb_func_start sub_3A150
-sub_3A150: @ 0x0803A150
+_0803A150: @ 0x0803A150, bl-ed to but not subroutine?
 	lsls r2, r2, #0x10
 	asrs r3, r2, #0x10
 	movs r0, #0xb8
@@ -15773,7 +15771,7 @@ _0803AA9E:
 	asrs r0, r0, #0x10
 	cmp r0, #1
 	bgt _0803AAB2
-	bl sub_3A150
+	bl _0803A150
 _0803AAB2:
 	ldr r6, _0803AB44 @ =gUnknown_0200C4F8
 	str r6, [sp]

diff --git a/expected_objs/IdlePinballGameMain.o b/expected_objs/IdlePinballGameMain.o
diff --git a/expected_objs/PinballGameMain.o b/expected_objs/PinballGameMain.o
diff --git a/expected_objs/nullsub_18.o b/expected_objs/nullsub_18.o
diff --git a/expected_objs/nullsub_19.o b/expected_objs/nullsub_19.o
diff --git a/expected_objs/nullsub_20.o b/expected_objs/nullsub_20.o
diff --git a/expected_objs/sub_1001C.o b/expected_objs/sub_1001C.o
diff --git a/expected_objs/sub_10170.o b/expected_objs/sub_10170.o
diff --git a/expected_objs/sub_102A8.o b/expected_objs/sub_102A8.o
diff --git a/expected_objs/sub_10424.o b/expected_objs/sub_10424.o
diff --git a/expected_objs/sub_10480.o b/expected_objs/sub_10480.o
diff --git a/expected_objs/sub_1050C.o b/expected_objs/sub_1050C.o
diff --git a/expected_objs/sub_10528.o b/expected_objs/sub_10528.o
diff --git a/expected_objs/sub_10544.o b/expected_objs/sub_10544.o
diff --git a/expected_objs/sub_105A0.o b/expected_objs/sub_105A0.o
diff --git a/expected_objs/sub_11B9C.o b/expected_objs/sub_11B9C.o
diff --git a/expected_objs/sub_11C14.o b/expected_objs/sub_11C14.o
diff --git a/expected_objs/sub_11C98.o b/expected_objs/sub_11C98.o
diff --git a/expected_objs/sub_11F88.o b/expected_objs/sub_11F88.o
diff --git a/expected_objs/sub_12524.o b/expected_objs/sub_12524.o
diff --git a/expected_objs/sub_12BF8.o b/expected_objs/sub_12BF8.o
diff --git a/expected_objs/sub_1332C.o b/expected_objs/sub_1332C.o
diff --git a/expected_objs/sub_1333C.o b/expected_objs/sub_1333C.o
diff --git a/expected_objs/sub_13824.o b/expected_objs/sub_13824.o
diff --git a/expected_objs/sub_13934.o b/expected_objs/sub_13934.o
diff --git a/expected_objs/sub_13B28.o b/expected_objs/sub_13B28.o
diff --git a/expected_objs/sub_13D24.o b/expected_objs/sub_13D24.o
diff --git a/expected_objs/sub_13FC.o b/expected_objs/sub_13FC.o
diff --git a/expected_objs/sub_14074.o b/expected_objs/sub_14074.o
diff --git a/expected_objs/sub_14488.o b/expected_objs/sub_14488.o
diff --git a/expected_objs/sub_1467C.o b/expected_objs/sub_1467C.o
diff --git a/expected_objs/sub_14740.o b/expected_objs/sub_14740.o
diff --git a/expected_objs/sub_1493C.o b/expected_objs/sub_1493C.o
diff --git a/expected_objs/sub_14AF4.o b/expected_objs/sub_14AF4.o
diff --git a/expected_objs/sub_14B84.o b/expected_objs/sub_14B84.o
diff --git a/expected_objs/sub_14E08.o b/expected_objs/sub_14E08.o
diff --git a/expected_objs/sub_15054.o b/expected_objs/sub_15054.o
diff --git a/expected_objs/sub_153CC.o b/expected_objs/sub_153CC.o
diff --git a/expected_objs/sub_16090.o b/expected_objs/sub_16090.o
diff --git a/expected_objs/sub_162B8.o b/expected_objs/sub_162B8.o
diff --git a/expected_objs/sub_1642C.o b/expected_objs/sub_1642C.o
diff --git a/expected_objs/sub_1668.o b/expected_objs/sub_1668.o
diff --git a/expected_objs/sub_16A0.o b/expected_objs/sub_16A0.o
diff --git a/expected_objs/sub_170C.o b/expected_objs/sub_170C.o
diff --git a/expected_objs/sub_171C8.o b/expected_objs/sub_171C8.o
diff --git a/expected_objs/sub_173FC.o b/expected_objs/sub_173FC.o
diff --git a/expected_objs/sub_1748.o b/expected_objs/sub_1748.o
diff --git a/expected_objs/sub_17634.o b/expected_objs/sub_17634.o
diff --git a/expected_objs/sub_176B0.o b/expected_objs/sub_176B0.o
diff --git a/expected_objs/sub_17898.o b/expected_objs/sub_17898.o
diff --git a/expected_objs/sub_179D0.o b/expected_objs/sub_179D0.o
diff --git a/expected_objs/sub_17C1C.o b/expected_objs/sub_17C1C.o
diff --git a/expected_objs/sub_17D8.o b/expected_objs/sub_17D8.o
diff --git a/expected_objs/sub_17F28.o b/expected_objs/sub_17F28.o
diff --git a/expected_objs/sub_18180.o b/expected_objs/sub_18180.o
diff --git a/expected_objs/sub_1828.o b/expected_objs/sub_1828.o
diff --git a/expected_objs/sub_182B4.o b/expected_objs/sub_182B4.o
diff --git a/expected_objs/sub_18324.o b/expected_objs/sub_18324.o
diff --git a/expected_objs/sub_1857C.o b/expected_objs/sub_1857C.o
diff --git a/expected_objs/sub_18784.o b/expected_objs/sub_18784.o
diff --git a/expected_objs/sub_187F4.o b/expected_objs/sub_187F4.o
diff --git a/expected_objs/sub_18A4C.o b/expected_objs/sub_18A4C.o
diff --git a/expected_objs/sub_18AE0.o b/expected_objs/sub_18AE0.o
diff --git a/expected_objs/sub_18B50.o b/expected_objs/sub_18B50.o
diff --git a/expected_objs/sub_18DAC.o b/expected_objs/sub_18DAC.o
diff --git a/expected_objs/sub_18F38.o b/expected_objs/sub_18F38.o
diff --git a/expected_objs/sub_19048.o b/expected_objs/sub_19048.o
diff --git a/expected_objs/sub_19190.o b/expected_objs/sub_19190.o
diff --git a/expected_objs/sub_19288.o b/expected_objs/sub_19288.o
diff --git a/expected_objs/sub_19304.o b/expected_objs/sub_19304.o
diff --git a/expected_objs/sub_1931C.o b/expected_objs/sub_1931C.o
diff --git a/expected_objs/sub_19490.o b/expected_objs/sub_19490.o
diff --git a/expected_objs/sub_195C4.o b/expected_objs/sub_195C4.o
diff --git a/expected_objs/sub_19734.o b/expected_objs/sub_19734.o
diff --git a/expected_objs/sub_19894.o b/expected_objs/sub_19894.o
diff --git a/expected_objs/sub_19A20.o b/expected_objs/sub_19A20.o
diff --git a/expected_objs/sub_19B10.o b/expected_objs/sub_19B10.o
diff --git a/expected_objs/sub_19B64.o b/expected_objs/sub_19B64.o
diff --git a/expected_objs/sub_19B90.o b/expected_objs/sub_19B90.o
diff --git a/expected_objs/sub_19C04.o b/expected_objs/sub_19C04.o
diff --git a/expected_objs/sub_19CC8.o b/expected_objs/sub_19CC8.o
diff --git a/expected_objs/sub_19D04.o b/expected_objs/sub_19D04.o
diff --git a/expected_objs/sub_19E10.o b/expected_objs/sub_19E10.o
diff --git a/expected_objs/sub_19F70.o b/expected_objs/sub_19F70.o
diff --git a/expected_objs/sub_19FA0.o b/expected_objs/sub_19FA0.o
diff --git a/expected_objs/sub_1A0F4.o b/expected_objs/sub_1A0F4.o
diff --git a/expected_objs/sub_1A2C0.o b/expected_objs/sub_1A2C0.o
diff --git a/expected_objs/sub_1A98C.o b/expected_objs/sub_1A98C.o
diff --git a/expected_objs/sub_1A9E8.o b/expected_objs/sub_1A9E8.o
diff --git a/expected_objs/sub_1AA38.o b/expected_objs/sub_1AA38.o
diff --git a/expected_objs/sub_1AAA0.o b/expected_objs/sub_1AAA0.o
diff --git a/expected_objs/sub_1AD84.o b/expected_objs/sub_1AD84.o
diff --git a/expected_objs/sub_1ADF4.o b/expected_objs/sub_1ADF4.o
diff --git a/expected_objs/sub_1AF84.o b/expected_objs/sub_1AF84.o
diff --git a/expected_objs/sub_1AFD4.o b/expected_objs/sub_1AFD4.o
diff --git a/expected_objs/sub_1B140.o b/expected_objs/sub_1B140.o
diff --git a/expected_objs/sub_1BB68.o b/expected_objs/sub_1BB68.o
diff --git a/expected_objs/sub_1C544.o b/expected_objs/sub_1C544.o
diff --git a/expected_objs/sub_1C560.o b/expected_objs/sub_1C560.o
diff --git a/expected_objs/sub_1C5AC.o b/expected_objs/sub_1C5AC.o
diff --git a/expected_objs/sub_1C73C.o b/expected_objs/sub_1C73C.o
diff --git a/expected_objs/sub_1C7F4.o b/expected_objs/sub_1C7F4.o
diff --git a/expected_objs/sub_1D128.o b/expected_objs/sub_1D128.o
diff --git a/expected_objs/sub_1D4D0.o b/expected_objs/sub_1D4D0.o
diff --git a/expected_objs/sub_1D5D8.o b/expected_objs/sub_1D5D8.o
diff --git a/expected_objs/sub_1DA74.o b/expected_objs/sub_1DA74.o
diff --git a/expected_objs/sub_1DAD8.o b/expected_objs/sub_1DAD8.o
diff --git a/expected_objs/sub_1DC7C.o b/expected_objs/sub_1DC7C.o
diff --git a/expected_objs/sub_1DDDC.o b/expected_objs/sub_1DDDC.o
diff --git a/expected_objs/sub_1EC48.o b/expected_objs/sub_1EC48.o
diff --git a/expected_objs/sub_1F158.o b/expected_objs/sub_1F158.o
diff --git a/expected_objs/sub_1F2A4.o b/expected_objs/sub_1F2A4.o
diff --git a/expected_objs/sub_1F59C.o b/expected_objs/sub_1F59C.o
diff --git a/expected_objs/sub_1F698.o b/expected_objs/sub_1F698.o
diff --git a/expected_objs/sub_1FA48.o b/expected_objs/sub_1FA48.o
diff --git a/expected_objs/sub_1FBC4.o b/expected_objs/sub_1FBC4.o
diff --git a/expected_objs/sub_1FF0C.o b/expected_objs/sub_1FF0C.o
diff --git a/expected_objs/sub_201B8.o b/expected_objs/sub_201B8.o
diff --git a/expected_objs/sub_203CC.o b/expected_objs/sub_203CC.o
diff --git a/expected_objs/sub_20EC0.o b/expected_objs/sub_20EC0.o
diff --git a/expected_objs/sub_21238.o b/expected_objs/sub_21238.o
diff --git a/expected_objs/sub_21300.o b/expected_objs/sub_21300.o
diff --git a/expected_objs/sub_21320.o b/expected_objs/sub_21320.o
diff --git a/expected_objs/sub_21514.o b/expected_objs/sub_21514.o
diff --git a/expected_objs/sub_21578.o b/expected_objs/sub_21578.o
diff --git a/expected_objs/sub_216FC.o b/expected_objs/sub_216FC.o
diff --git a/expected_objs/sub_219A8.o b/expected_objs/sub_219A8.o
diff --git a/expected_objs/sub_219EC.o b/expected_objs/sub_219EC.o
diff --git a/expected_objs/sub_21B0C.o b/expected_objs/sub_21B0C.o
diff --git a/expected_objs/sub_21D78.o b/expected_objs/sub_21D78.o
diff --git a/expected_objs/sub_21FBC.o b/expected_objs/sub_21FBC.o
diff --git a/expected_objs/sub_225F0.o b/expected_objs/sub_225F0.o
diff --git a/expected_objs/sub_22978.o b/expected_objs/sub_22978.o
diff --git a/expected_objs/sub_22A30.o b/expected_objs/sub_22A30.o
diff --git a/expected_objs/sub_22C6C.o b/expected_objs/sub_22C6C.o
diff --git a/expected_objs/sub_22D54.o b/expected_objs/sub_22D54.o
diff --git a/expected_objs/sub_22FA4.o b/expected_objs/sub_22FA4.o
diff --git a/expected_objs/sub_23070.o b/expected_objs/sub_23070.o
diff --git a/expected_objs/sub_2310C.o b/expected_objs/sub_2310C.o
diff --git a/expected_objs/sub_2312C.o b/expected_objs/sub_2312C.o
diff --git a/expected_objs/sub_23300.o b/expected_objs/sub_23300.o
diff --git a/expected_objs/sub_23954.o b/expected_objs/sub_23954.o
diff --git a/expected_objs/sub_239A4.o b/expected_objs/sub_239A4.o
diff --git a/expected_objs/sub_23E18.o b/expected_objs/sub_23E18.o
diff --git a/expected_objs/sub_2414.o b/expected_objs/sub_2414.o
diff --git a/expected_objs/sub_242B4.o b/expected_objs/sub_242B4.o
diff --git a/expected_objs/sub_24350.o b/expected_objs/sub_24350.o
diff --git a/expected_objs/sub_24408.o b/expected_objs/sub_24408.o
diff --git a/expected_objs/sub_2530C.o b/expected_objs/sub_2530C.o
diff --git a/expected_objs/sub_253E0.o b/expected_objs/sub_253E0.o
diff --git a/expected_objs/sub_25808.o b/expected_objs/sub_25808.o
diff --git a/expected_objs/sub_25F64.o b/expected_objs/sub_25F64.o
diff --git a/expected_objs/sub_260B8.o b/expected_objs/sub_260B8.o
diff --git a/expected_objs/sub_26778.o b/expected_objs/sub_26778.o
diff --git a/expected_objs/sub_26820.o b/expected_objs/sub_26820.o
diff --git a/expected_objs/sub_268CC.o b/expected_objs/sub_268CC.o
diff --git a/expected_objs/sub_269A4.o b/expected_objs/sub_269A4.o
diff --git a/expected_objs/sub_26A10.o b/expected_objs/sub_26A10.o
diff --git a/expected_objs/sub_26EA4.o b/expected_objs/sub_26EA4.o
diff --git a/expected_objs/sub_26F38.o b/expected_objs/sub_26F38.o
diff --git a/expected_objs/sub_27080.o b/expected_objs/sub_27080.o
diff --git a/expected_objs/sub_278F4.o b/expected_objs/sub_278F4.o
diff --git a/expected_objs/sub_27D44.o b/expected_objs/sub_27D44.o
diff --git a/expected_objs/sub_27E08.o b/expected_objs/sub_27E08.o
diff --git a/expected_objs/sub_27F94.o b/expected_objs/sub_27F94.o
diff --git a/expected_objs/sub_28404.o b/expected_objs/sub_28404.o
diff --git a/expected_objs/sub_28544.o b/expected_objs/sub_28544.o
diff --git a/expected_objs/sub_28AE0.o b/expected_objs/sub_28AE0.o
diff --git a/expected_objs/sub_28BFC.o b/expected_objs/sub_28BFC.o
diff --git a/expected_objs/sub_28C90.o b/expected_objs/sub_28C90.o
diff --git a/expected_objs/sub_28E2C.o b/expected_objs/sub_28E2C.o
diff --git a/expected_objs/sub_28EA0.o b/expected_objs/sub_28EA0.o
diff --git a/expected_objs/sub_292A0.o b/expected_objs/sub_292A0.o
diff --git a/expected_objs/sub_29334.o b/expected_objs/sub_29334.o
diff --git a/expected_objs/sub_293D8.o b/expected_objs/sub_293D8.o
diff --git a/expected_objs/sub_29624.o b/expected_objs/sub_29624.o
diff --git a/expected_objs/sub_29664.o b/expected_objs/sub_29664.o
diff --git a/expected_objs/sub_2971C.o b/expected_objs/sub_2971C.o
diff --git a/expected_objs/sub_29924.o b/expected_objs/sub_29924.o
diff --git a/expected_objs/sub_29A6C.o b/expected_objs/sub_29A6C.o
diff --git a/expected_objs/sub_29D9C.o b/expected_objs/sub_29D9C.o
diff --git a/expected_objs/sub_2A054.o b/expected_objs/sub_2A054.o
diff --git a/expected_objs/sub_2A354.o b/expected_objs/sub_2A354.o
diff --git a/expected_objs/sub_2AADC.o b/expected_objs/sub_2AADC.o
diff --git a/expected_objs/sub_2C538.o b/expected_objs/sub_2C538.o
diff --git a/expected_objs/sub_2C9A4.o b/expected_objs/sub_2C9A4.o
diff --git a/expected_objs/sub_2CA9C.o b/expected_objs/sub_2CA9C.o
diff --git a/expected_objs/sub_2CD98.o b/expected_objs/sub_2CD98.o
diff --git a/expected_objs/sub_2CE80.o b/expected_objs/sub_2CE80.o
diff --git a/expected_objs/sub_2D104.o b/expected_objs/sub_2D104.o
diff --git a/expected_objs/sub_2D204.o b/expected_objs/sub_2D204.o
diff --git a/expected_objs/sub_2DE54.o b/expected_objs/sub_2DE54.o
diff --git a/expected_objs/sub_2E094.o b/expected_objs/sub_2E094.o
diff --git a/expected_objs/sub_2E67C.o b/expected_objs/sub_2E67C.o
diff --git a/expected_objs/sub_2E6AC.o b/expected_objs/sub_2E6AC.o
diff --git a/expected_objs/sub_2F140.o b/expected_objs/sub_2F140.o
diff --git a/expected_objs/sub_2F26C.o b/expected_objs/sub_2F26C.o
diff --git a/expected_objs/sub_2F504.o b/expected_objs/sub_2F504.o
diff --git a/expected_objs/sub_2F79C.o b/expected_objs/sub_2F79C.o
diff --git a/expected_objs/sub_2FCD0.o b/expected_objs/sub_2FCD0.o
diff --git a/expected_objs/sub_300D8.o b/expected_objs/sub_300D8.o
diff --git a/expected_objs/sub_30178.o b/expected_objs/sub_30178.o
diff --git a/expected_objs/sub_30480.o b/expected_objs/sub_30480.o
diff --git a/expected_objs/sub_304C8.o b/expected_objs/sub_304C8.o
diff --git a/expected_objs/sub_308DC.o b/expected_objs/sub_308DC.o
diff --git a/expected_objs/sub_30EB4.o b/expected_objs/sub_30EB4.o
diff --git a/expected_objs/sub_31144.o b/expected_objs/sub_31144.o
diff --git a/expected_objs/sub_313A0.o b/expected_objs/sub_313A0.o
diff --git a/expected_objs/sub_31498.o b/expected_objs/sub_31498.o
diff --git a/expected_objs/sub_31B30.o b/expected_objs/sub_31B30.o
diff --git a/expected_objs/sub_31BE8.o b/expected_objs/sub_31BE8.o
diff --git a/expected_objs/sub_31CF8.o b/expected_objs/sub_31CF8.o
diff --git a/expected_objs/sub_329F4.o b/expected_objs/sub_329F4.o
diff --git a/expected_objs/sub_32B74.o b/expected_objs/sub_32B74.o
diff --git a/expected_objs/sub_32BE4.o b/expected_objs/sub_32BE4.o
diff --git a/expected_objs/sub_32DF8.o b/expected_objs/sub_32DF8.o
diff --git a/expected_objs/sub_32F3C.o b/expected_objs/sub_32F3C.o
diff --git a/expected_objs/sub_33130.o b/expected_objs/sub_33130.o
diff --git a/expected_objs/sub_3342C.o b/expected_objs/sub_3342C.o
diff --git a/expected_objs/sub_336E0.o b/expected_objs/sub_336E0.o
diff --git a/expected_objs/sub_340EC.o b/expected_objs/sub_340EC.o
diff --git a/expected_objs/sub_34450.o b/expected_objs/sub_34450.o
diff --git a/expected_objs/sub_350F0.o b/expected_objs/sub_350F0.o
diff --git a/expected_objs/sub_351A8.o b/expected_objs/sub_351A8.o
diff --git a/expected_objs/sub_356A0.o b/expected_objs/sub_356A0.o
diff --git a/expected_objs/sub_357B8.o b/expected_objs/sub_357B8.o
diff --git a/expected_objs/sub_35860.o b/expected_objs/sub_35860.o
diff --git a/expected_objs/sub_35AA4.o b/expected_objs/sub_35AA4.o
diff --git a/expected_objs/sub_35D54.o b/expected_objs/sub_35D54.o
diff --git a/expected_objs/sub_36CB4.o b/expected_objs/sub_36CB4.o
diff --git a/expected_objs/sub_372B4.o b/expected_objs/sub_372B4.o
diff --git a/expected_objs/sub_3751C.o b/expected_objs/sub_3751C.o
diff --git a/expected_objs/sub_37850.o b/expected_objs/sub_37850.o
diff --git a/expected_objs/sub_38218.o b/expected_objs/sub_38218.o
diff --git a/expected_objs/sub_383E4.o b/expected_objs/sub_383E4.o
diff --git a/expected_objs/sub_3869C.o b/expected_objs/sub_3869C.o
diff --git a/expected_objs/sub_38A20.o b/expected_objs/sub_38A20.o
diff --git a/expected_objs/sub_395D8.o b/expected_objs/sub_395D8.o
diff --git a/expected_objs/sub_39A40.o b/expected_objs/sub_39A40.o
diff --git a/expected_objs/sub_3ADA0.o b/expected_objs/sub_3ADA0.o
diff --git a/expected_objs/sub_3AE14.o b/expected_objs/sub_3AE14.o
diff --git a/expected_objs/sub_3B120.o b/expected_objs/sub_3B120.o
diff --git a/expected_objs/sub_3B49C.o b/expected_objs/sub_3B49C.o
diff --git a/expected_objs/sub_3B7C4.o b/expected_objs/sub_3B7C4.o
diff --git a/expected_objs/sub_3C6E0.o b/expected_objs/sub_3C6E0.o
diff --git a/expected_objs/sub_3CBC4.o b/expected_objs/sub_3CBC4.o
diff --git a/expected_objs/sub_3E5D0.o b/expected_objs/sub_3E5D0.o
diff --git a/expected_objs/sub_3E644.o b/expected_objs/sub_3E644.o
diff --git a/expected_objs/sub_3E79C.o b/expected_objs/sub_3E79C.o
diff --git a/expected_objs/sub_3EB2C.o b/expected_objs/sub_3EB2C.o
diff --git a/expected_objs/sub_3EDF0.o b/expected_objs/sub_3EDF0.o
diff --git a/expected_objs/sub_3FAE0.o b/expected_objs/sub_3FAE0.o
diff --git a/expected_objs/sub_40288.o b/expected_objs/sub_40288.o
diff --git a/expected_objs/sub_41580.o b/expected_objs/sub_41580.o
diff --git a/expected_objs/sub_417F8.o b/expected_objs/sub_417F8.o
diff --git a/expected_objs/sub_423D8.o b/expected_objs/sub_423D8.o
diff --git a/expected_objs/sub_42E48.o b/expected_objs/sub_42E48.o
diff --git a/expected_objs/sub_43228.o b/expected_objs/sub_43228.o
diff --git a/expected_objs/sub_43500.o b/expected_objs/sub_43500.o
diff --git a/expected_objs/sub_4387C.o b/expected_objs/sub_4387C.o
diff --git a/expected_objs/sub_44D58.o b/expected_objs/sub_44D58.o
diff --git a/expected_objs/sub_44F3C.o b/expected_objs/sub_44F3C.o
diff --git a/expected_objs/sub_45164.o b/expected_objs/sub_45164.o
diff --git a/expected_objs/sub_455D0.o b/expected_objs/sub_455D0.o
diff --git a/expected_objs/sub_45E08.o b/expected_objs/sub_45E08.o
diff --git a/expected_objs/sub_45E90.o b/expected_objs/sub_45E90.o
diff --git a/expected_objs/sub_467F4.o b/expected_objs/sub_467F4.o
diff --git a/expected_objs/sub_46FD4.o b/expected_objs/sub_46FD4.o
diff --git a/expected_objs/sub_47030.o b/expected_objs/sub_47030.o
diff --git a/expected_objs/sub_47100.o b/expected_objs/sub_47100.o
diff --git a/expected_objs/sub_47110.o b/expected_objs/sub_47110.o
diff --git a/expected_objs/sub_47160.o b/expected_objs/sub_47160.o
diff --git a/expected_objs/sub_472E4.o b/expected_objs/sub_472E4.o
diff --git a/expected_objs/sub_47344.o b/expected_objs/sub_47344.o
diff --git a/expected_objs/sub_474F4.o b/expected_objs/sub_474F4.o
diff --git a/expected_objs/sub_47670.o b/expected_objs/sub_47670.o
diff --git a/expected_objs/sub_478D8.o b/expected_objs/sub_478D8.o
diff --git a/expected_objs/sub_47FBC.o b/expected_objs/sub_47FBC.o
diff --git a/expected_objs/sub_47FF8.o b/expected_objs/sub_47FF8.o
diff --git a/expected_objs/sub_48124.o b/expected_objs/sub_48124.o
diff --git a/expected_objs/sub_48190.o b/expected_objs/sub_48190.o
diff --git a/expected_objs/sub_495A0.o b/expected_objs/sub_495A0.o
diff --git a/expected_objs/sub_497BC.o b/expected_objs/sub_497BC.o
diff --git a/expected_objs/sub_49850.o b/expected_objs/sub_49850.o
diff --git a/expected_objs/sub_49A34.o b/expected_objs/sub_49A34.o
diff --git a/expected_objs/sub_49ED4.o b/expected_objs/sub_49ED4.o
diff --git a/expected_objs/sub_4A270.o b/expected_objs/sub_4A270.o
diff --git a/expected_objs/sub_4A518.o b/expected_objs/sub_4A518.o
diff --git a/expected_objs/sub_4A6A0.o b/expected_objs/sub_4A6A0.o
diff --git a/expected_objs/sub_4A90C.o b/expected_objs/sub_4A90C.o
diff --git a/expected_objs/sub_4AAD8.o b/expected_objs/sub_4AAD8.o
diff --git a/expected_objs/sub_4ABC8.o b/expected_objs/sub_4ABC8.o
diff --git a/expected_objs/sub_4ABEC.o b/expected_objs/sub_4ABEC.o
diff --git a/expected_objs/sub_4ACF0.o b/expected_objs/sub_4ACF0.o
diff --git a/expected_objs/sub_4AE8C.o b/expected_objs/sub_4AE8C.o
diff --git a/expected_objs/sub_4B000.o b/expected_objs/sub_4B000.o
diff --git a/expected_objs/sub_4B20C.o b/expected_objs/sub_4B20C.o
diff --git a/expected_objs/sub_4B280.o b/expected_objs/sub_4B280.o