Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for objdiff and updated decomp-permuter-agbcc #52

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

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