dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

get rid of @ local labels

Browse Source
This commit is contained in:
YamaArashi
2016-01-06 20:23:20 -08:00
parent d35478a398
commit 8c312b28ab
20 changed files with 123154 additions and 123154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
asm/main.s
View File

@@ -37,10 +37,10 @@ Main:
ldr r0, =0x03005d88
ldr r0, [r0]
cmp r0, 0x1
beq @08000414
beq _08000414
movs r0, 0
bl SetMainCallback2
@08000414:
_08000414:
ldr r2, =0x030022b4
strb r4, [r2]
ldr r1, =0x03000000
@@ -52,35 +52,35 @@ Main:
movs r0, 0
mov r8, r0
adds r6, r2, 0
@0800042A:
_0800042A:
bl ReadKeypad
ldr r0, =0x03002700
ldrb r0, [r0]
cmp r0, 0
bne @08000454
bne _08000454
ldrh r1, [r7, 0x28]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq @08000454
beq _08000454
movs r0, 0xE
ands r0, r1
cmp r0, 0xE
bne @08000454
bne _08000454
bl rfu_REQ_stopMode
bl rfu_waitREQComplete
bl Reset
@08000454:
_08000454:
bl sub_8087634
cmp r0, 0x1
bne @0800048C
bne _0800048C
strb r0, [r6]
bl HandleLinkConnectionAndCallMainCallbacks
movs r0, 0
strb r0, [r6]
b @080004B2
b _080004B2
.pool
@0800048C:
_0800048C:
ldr r5, =0x030022b4
movs r0, 0
strb r0, [r5]
@@ -88,7 +88,7 @@ Main:
bl sub_80875C8
adds r4, r0, 0
cmp r4, 0x1
bne @080004B2
bne _080004B2
movs r0, 0
strh r0, [r7, 0x2E]
bl ClearObjectCopyRequests
@@ -96,11 +96,11 @@ Main:
bl HandleLinkConnectionAndCallMainCallbacks
mov r2, r8
strb r2, [r5]
@080004B2:
_080004B2:
bl gametime_increment
bl sound_something
bl WaitForVBlankIntr
b @0800042A
b _0800042A
.pool
thumb_func_end Main
@@ -111,9 +111,9 @@ HandleLinkConnectionAndCallMainCallbacks: ; 80004C4
bl HandleLinkConnection
lsls r0, 24
cmp r0, 0
bne @080004D4
bne _080004D4
bl CallMainCallbacks
@080004D4:
_080004D4:
pop {r0}
bx r0
thumb_func_end HandleLinkConnectionAndCallMainCallbacks
@@ -149,14 +149,14 @@ CallMainCallbacks: ; 800051C
ldr r4, =0x030022c0
ldr r0, [r4]
cmp r0, 0
beq @0800052A
beq _0800052A
bl _call_via_r0
@0800052A:
_0800052A:
ldr r0, [r4, 0x4]
cmp r0, 0
beq @08000534
beq _08000534
bl _call_via_r0
@08000534:
_08000534:
pop {r4}
pop {r0}
bx r0
@@ -276,61 +276,61 @@ ReadKeypad: ; 80005E4
strh r0, [r1, 0x30]
adds r2, r1, 0
cmp r3, 0
beq @08000630
beq _08000630
ldrh r0, [r2, 0x2C]
cmp r0, r3
bne @08000630
bne _08000630
ldrh r0, [r2, 0x32]
subs r0, 0x1
strh r0, [r2, 0x32]
lsls r0, 16
cmp r0, 0
bne @08000636
bne _08000636
strh r3, [r2, 0x30]
ldr r0, =0x030026fc
b @08000632
b _08000632
.pool
@08000630:
_08000630:
ldr r0, =0x030022b0
@08000632:
_08000632:
ldrh r0, [r0]
strh r0, [r2, 0x32]
@08000636:
_08000636:
strh r3, [r2, 0x28]
strh r3, [r2, 0x2C]
ldr r0, =0x03005d90
ldr r0, [r0]
ldrb r0, [r0, 0x13]
cmp r0, 0x2
bne @08000668
bne _08000668
ldrh r1, [r2, 0x2E]
movs r3, 0x80
lsls r3, 2
adds r0, r3, 0
ands r0, r1
cmp r0, 0
beq @08000658
beq _08000658
movs r0, 0x1
orrs r0, r1
strh r0, [r2, 0x2E]
@08000658:
_08000658:
ldrh r1, [r2, 0x2C]
adds r0, r3, 0
ands r0, r1
cmp r0, 0
beq @08000668
beq _08000668
movs r0, 0x1
orrs r0, r1
strh r0, [r2, 0x2C]
@08000668:
_08000668:
ldrh r1, [r2, 0x2E]
ldrh r0, [r2, 0x36]
ands r0, r1
cmp r0, 0
beq @08000676
beq _08000676
movs r0, 0x1
strh r0, [r2, 0x34]
@08000676:
_08000676:
pop {r0}
bx r0
.pool
@@ -345,12 +345,12 @@ InitIntrHandlers: ; 8000684
ldr r3, =gRomInterruptTable
ldr r2, =0x03002710
movs r1, 0xD
@08000690:
_08000690:
ldm r3!, {r0}
stm r2!, {r0}
subs r1, 0x1
cmp r1, 0
bge @08000690
bge _08000690
ldr r0, =0x040000d4
str r5, [r0]
str r4, [r0, 0x4]
@@ -431,17 +431,17 @@ VBlankIntr: ; 8000738
ldr r0, =0x030030fc
ldrb r0, [r0]
cmp r0, 0
beq @0800074C
beq _0800074C
bl rfu_syncVBlank__
b @08000758
b _08000758
.pool
@0800074C:
_0800074C:
ldr r0, =0x03002748
ldrb r0, [r0]
cmp r0, 0
bne @08000758
bne _08000758
bl sub_800B9B8
@08000758:
_08000758:
ldr r0, =0x030022c0
ldr r1, [r0, 0x20]
adds r1, 0x1
@@ -450,20 +450,20 @@ VBlankIntr: ; 8000738
ldr r1, [r1]
adds r4, r0, 0
cmp r1, 0
beq @08000778
beq _08000778
ldr r2, [r1]
movs r0, 0x2
negs r0, r0
cmp r2, r0
bhi @08000778
bhi _08000778
adds r0, r2, 0x1
str r0, [r1]
@08000778:
_08000778:
ldr r0, [r4, 0xC]
cmp r0, 0
beq @08000782
beq _08000782
bl _call_via_r0
@08000782:
_08000782:
ldr r0, [r4, 0x24]
adds r0, 0x1
str r0, [r4, 0x24]
@@ -481,16 +481,16 @@ VBlankIntr: ; 8000738
movs r0, 0x2
ands r0, r1
cmp r0, 0
beq @080007BA
beq _080007BA
ldr r0, =0x02022fec
ldr r0, [r0]
ldr r1, =0x013f0102
ands r0, r1
cmp r0, 0
bne @080007BE
@080007BA:
bne _080007BE
_080007BA:
bl GenerateRandomNumber
@080007BE:
_080007BE:
bl sub_800E174
ldr r2, =0x03007ff8
ldrh r0, [r2]
@@ -527,9 +527,9 @@ HBlankIntr: ; 8000814
ldr r4, =0x030022c0
ldr r0, [r4, 0x10]
cmp r0, 0
beq @08000822
beq _08000822
bl _call_via_r0
@08000822:
_08000822:
ldr r2, =0x03007ff8
ldrh r0, [r2]
movs r1, 0x2
@@ -552,9 +552,9 @@ VCountIntr: ; 8000844
ldr r4, =0x030022c0
ldr r0, [r4, 0x14]
cmp r0, 0
beq @08000852
beq _08000852
bl _call_via_r0
@08000852:
_08000852:
bl SoundVSync_rev01
ldr r2, =0x03007ff8
ldrh r0, [r2]
@@ -578,9 +578,9 @@ SerialIntr: ; 8000878
ldr r4, =0x030022c0
ldr r0, [r4, 0x18]
cmp r0, 0
beq @08000886
beq _08000886
bl _call_via_r0
@08000886:
_08000886:
ldr r2, =0x03007ff8
ldrh r0, [r2]
movs r1, 0x80
@@ -616,15 +616,15 @@ WaitForVBlankIntr: ; 80008AC
movs r0, 0x1
ands r0, r1
cmp r0, 0
bne @080008D0
bne _080008D0
movs r3, 0x1
@080008C6:
_080008C6:
ldrh r1, [r2, 0x1C]
adds r0, r3, 0
ands r0, r1
cmp r0, 0
beq @080008C6
@080008D0:
beq _080008C6
_080008D0:
pop {r0}
bx r0
.pool