Skip to content

Commit e659d3c

Browse files
committed
Split code.s
1 parent 0d79645 commit e659d3c

15 files changed

Lines changed: 34426 additions & 34397 deletions

File tree

asm/code.s renamed to asm/bosses.s

Lines changed: 135 additions & 34343 deletions
Large diffs are not rendered by default.

asm/code_1.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11761,7 +11761,7 @@ _080553A0:
1176111761
strb r0, [r1]
1176211762
movs r0, #0
1176311763
movs r1, #2
11764-
bl sub_808723C
11764+
bl CreateMainMenu
1176511765
b _080555F0
1176611766
.align 2, 0
1176711767
_080553D8: .4byte 0x0000FFFF
@@ -11792,7 +11792,7 @@ _080553F0:
1179211792
strb r0, [r1]
1179311793
movs r0, #0
1179411794
movs r1, #3
11795-
bl sub_808723C
11795+
bl CreateMainMenu
1179611796
b _080555F0
1179711797
.align 2, 0
1179811798
_08055428: .4byte 0x0000FFFF

asm/code_2.s

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6457,7 +6457,7 @@ sub_809E978: @ 0x0809E978
64576457
adds r0, #0x98
64586458
str r6, [r0]
64596459
adds r6, #0x80
6460-
ldr r5, _0809EB6C @ =gUnknown_080D8ADC
6460+
ldr r5, _0809EB6C @ =sAnimsTimeAttackDigits
64616461
ldrh r1, [r5]
64626462
strh r1, [r0, #0xc]
64636463
ldrb r1, [r5, #2]
@@ -6546,7 +6546,7 @@ _0809EB5C: .4byte 0x06010000
65466546
_0809EB60: .4byte gUnknown_080D98D8
65476547
_0809EB64: .4byte gUnknown_080D8AAC
65486548
_0809EB68: .4byte gUnknown_080D8ACC
6549-
_0809EB6C: .4byte gUnknown_080D8ADC
6549+
_0809EB6C: .4byte sAnimsTimeAttackDigits
65506550
_0809EB70: .4byte gUnknown_080D8AEC
65516551

65526552
thumb_func_start sub_809EB74
@@ -7802,7 +7802,7 @@ sub_809F550: @ 0x0809F550
78027802
bl DisplaySprite
78037803
adds r4, r6, #0
78047804
adds r4, #0x98
7805-
ldr r5, _0809F5E0 @ =gUnknown_080D8ADC
7805+
ldr r5, _0809F5E0 @ =sAnimsTimeAttackDigits
78067806
ldrh r0, [r5]
78077807
strh r0, [r4, #0xc]
78087808
ldrb r0, [r6, #3]
@@ -7857,7 +7857,7 @@ sub_809F550: @ 0x0809F550
78577857
pop {r0}
78587858
bx r0
78597859
.align 2, 0
7860-
_0809F5E0: .4byte gUnknown_080D8ADC
7860+
_0809F5E0: .4byte sAnimsTimeAttackDigits
78617861

78627862
thumb_func_start sub_809F5E4
78637863
sub_809F5E4: @ 0x0809F5E4
@@ -12933,19 +12933,19 @@ _080A1D8E:
1293312933
bne _080A1D9E
1293412934
movs r0, #1
1293512935
movs r1, #0
12936-
bl sub_808723C
12936+
bl CreateMainMenu
1293712937
b _080A1DB4
1293812938
_080A1D9E:
1293912939
cmp r1, #3
1294012940
bne _080A1DAC
1294112941
movs r0, #0
1294212942
movs r1, #4
12943-
bl sub_808723C
12943+
bl CreateMainMenu
1294412944
b _080A1DB4
1294512945
_080A1DAC:
1294612946
movs r0, #0
1294712947
movs r1, #0
12948-
bl sub_808723C
12948+
bl CreateMainMenu
1294912949
_080A1DB4:
1295012950
ldr r0, _080A1DC4 @ =gCurTask
1295112951
ldr r0, [r0]
@@ -32414,7 +32414,7 @@ _080AB74C: .4byte gStageData
3241432414
_080AB750:
3241532415
movs r0, #3
3241632416
movs r1, #1
32417-
bl sub_808723C
32417+
bl CreateMainMenu
3241832418
_080AB758:
3241932419
ldr r0, _080AB76C @ =gCurTask
3242032420
ldr r0, [r0]

asm/enemy_unknown_code.s

Whitespace-only changes.

asm/game_over.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2654,7 +2654,7 @@ _08003950:
26542654
bne _080039A4
26552655
movs r0, #0
26562656
movs r1, #2
2657-
bl sub_808723C
2657+
bl CreateMainMenu
26582658
b _08003A08
26592659
.align 2, 0
26602660
_08003984: .4byte gPlayers
@@ -2670,7 +2670,7 @@ _080039A4:
26702670
bne _080039B2
26712671
movs r0, #0
26722672
movs r1, #3
2673-
bl sub_808723C
2673+
bl CreateMainMenu
26742674
b _08003A08
26752675
_080039B2:
26762676
ldrb r0, [r2, #9]

0 commit comments

Comments
 (0)