get rid of @ local labels

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

View File

@ -54,51 +54,51 @@ InterruptMain: ; 8000248
and r1, r2, r2, lsr 16
mov r12, 0
ands r0, r1, INTR_FLAG_VCOUNT
bne @foundInterrupt
bne .foundInterrupt
add r12, r12, 0x4
mov r0, 0x1
strh r0, [r3, OFFSET_REG_IME - 0x200]
ands r0, r1, INTR_FLAG_SERIAL
bne @foundInterrupt
bne .foundInterrupt
add r12, r12, 0x4
ands r0, r1, INTR_FLAG_TIMER3
bne @foundInterrupt
bne .foundInterrupt
add r12, r12, 0x4
ands r0, r1, INTR_FLAG_HBLANK
bne @foundInterrupt
bne .foundInterrupt
add r12, r12, 0x4
ands r0, r1, INTR_FLAG_VBLANK
bne @foundInterrupt
bne .foundInterrupt
add r12, r12, 0x4
ands r0, r1, INTR_FLAG_TIMER0
bne @foundInterrupt
bne .foundInterrupt
add r12, r12, 0x4
ands r0, r1, INTR_FLAG_TIMER1
bne @foundInterrupt
bne .foundInterrupt
add r12, r12, 0x4
ands r0, r1, INTR_FLAG_TIMER2
bne @foundInterrupt
bne .foundInterrupt
add r12, r12, 0x4
ands r0, r1, INTR_FLAG_DMA0
bne @foundInterrupt
bne .foundInterrupt
add r12, r12, 0x4
ands r0, r1, INTR_FLAG_DMA1
bne @foundInterrupt
bne .foundInterrupt
add r12, r12, 0x4
ands r0, r1, INTR_FLAG_DMA2
bne @foundInterrupt
bne .foundInterrupt
add r12, r12, 0x4
ands r0, r1, INTR_FLAG_DMA3
bne @foundInterrupt
bne .foundInterrupt
add r12, r12, 0x4
ands r0, r1, INTR_FLAG_KEYPAD
bne @foundInterrupt
bne .foundInterrupt
add r12, r12, 0x4
ands r0, r1, INTR_FLAG_GAMEPAK
strbne r0, [r3, OFFSET_REG_SOUNDCNT_X - 0x200]
@loop:
bne @loop
@foundInterrupt:
.foundInterrupt:
strh r0, [r3, OFFSET_REG_IF - 0x200]
bic r2, r2, r0
ldr r0, =0x03007868

View File

@ -11,14 +11,14 @@ ClearDma3Requests: ; 8000BB8
movs r3, 0
ldr r0, =gDma3Requests
movs r1, 0x7F
@loop:
_8000BCC:
strh r3, [r0, 0x8]
str r3, [r0]
str r3, [r0, 0x4]
adds r0, 0x10
subs r1, 0x1
cmp r1, 0
bge @loop
bge _8000BCC
movs r0, 0
strb r0, [r2]
pop {r0}
@ -38,9 +38,9 @@ ProcessDma3Requests: ; 8000BF0
ldr r0, =gDma3ManagerLocked
ldrb r0, [r0]
cmp r0, 0
beq @08000C06
b @08000E46
@08000C06:
beq _08000C06
b _08000E46
_08000C06:
movs r0, 0
str r0, [sp, 0x8]
ldr r1, =gDma3Requests
@ -51,9 +51,9 @@ ProcessDma3Requests: ; 8000BF0
ldrh r0, [r0, 0x8]
mov r12, r2
cmp r0, 0
bne @08000C1E
b @08000E46
@08000C1E:
bne _08000C1E
b _08000E46
_08000C1E:
mov r8, r1
adds r1, 0x4
mov r10, r1
@ -62,7 +62,7 @@ ProcessDma3Requests: ; 8000BF0
ldr r7, =REG_DMA3
movs r2, 0
mov r9, r2
@08000C2E:
_08000C2E:
mov r3, r12
ldrb r0, [r3]
lsls r5, r0, 4
@ -78,47 +78,47 @@ ProcessDma3Requests: ; 8000BF0
lsls r0, 8
ldr r3, [sp, 0x8]
cmp r3, r0
bls @08000C50
b @08000E46
@08000C50:
bls _08000C50
b _08000E46
_08000C50:
ldr r0, =REG_VCOUNT
ldrb r0, [r0]
cmp r0, 0xE0
bls @08000C5A
b @08000E46
@08000C5A:
bls _08000C5A
b _08000E46
_08000C5A:
ldrh r0, [r1, 0xA]
cmp r0, 0x2
beq @08000CD0
beq _08000CD0
cmp r0, 0x2
bgt @08000C80
bgt _08000C80
cmp r0, 0x1
beq @08000C8C
b @08000DF0
beq _08000C8C
b _08000DF0
.pool
@08000C80:
_08000C80:
cmp r0, 0x3
beq @08000D3C
beq _08000D3C
cmp r0, 0x4
bne @08000C8A
b @08000D88
@08000C8A:
b @08000DF0
@08000C8C:
bne _08000C8A
b _08000D88
_08000C8A:
b _08000DF0
_08000C8C:
ldr r3, [r1]
mov r2, r10
adds r0, r5, r2
ldr r2, [r0]
ldrh r1, [r1, 0x8]
cmp r1, r6
bhi @08000CA6
bhi _08000CA6
str r3, [r7]
str r2, [r7, 0x4]
lsrs r0, r1, 2
movs r1, 0x84
lsls r1, 24
b @08000DAA
@08000CA6:
b _08000DAA
_08000CA6:
ldr r4, =REG_DMA3
str r3, [r4]
str r2, [r4, 0x4]
@ -129,21 +129,21 @@ ProcessDma3Requests: ; 8000BF0
adds r2, r6
subs r1, r6
cmp r1, r6
bhi @08000CA6
bhi _08000CA6
str r3, [r4]
str r2, [r4, 0x4]
lsrs r0, r1, 2
movs r1, 0x84
lsls r1, 24
b @08000D76
b _08000D76
.pool
@08000CD0:
_08000CD0:
mov r3, r10
adds r0, r5, r3
ldr r4, [r0]
ldrh r1, [r1, 0x8]
cmp r1, r6
bhi @08000CF4
bhi _08000CF4
mov r0, r8
adds r0, 0xC
adds r0, r5, r0
@ -155,8 +155,8 @@ ProcessDma3Requests: ; 8000BF0
lsrs r0, r1, 2
movs r1, 0x85
lsls r1, 24
b @08000DAA
@08000CF4:
b _08000DAA
_08000CF4:
mov r2, r12
ldrb r0, [r2]
lsls r0, 4
@ -175,7 +175,7 @@ ProcessDma3Requests: ; 8000BF0
adds r4, r6
subs r1, r6
cmp r1, r6
bhi @08000CF4
bhi _08000CF4
ldrb r0, [r2]
lsls r0, 4
adds r0, r5
@ -187,23 +187,23 @@ ProcessDma3Requests: ; 8000BF0
lsrs r0, r1, 2
movs r1, 0x85
lsls r1, 24
b @08000DEA
b _08000DEA
.pool
@08000D3C:
_08000D3C:
ldr r3, [r1]
mov r2, r10
adds r0, r5, r2
ldr r2, [r0]
ldrh r1, [r1, 0x8]
cmp r1, r6
bhi @08000D56
bhi _08000D56
str r3, [r7]
str r2, [r7, 0x4]
lsrs r0, r1, 1
movs r1, 0x80
lsls r1, 24
b @08000DAA
@08000D56:
b _08000DAA
_08000D56:
ldr r4, =REG_DMA3
str r3, [r4]
str r2, [r4, 0x4]
@ -214,26 +214,26 @@ ProcessDma3Requests: ; 8000BF0
adds r2, r6
subs r1, r6
cmp r1, r6
bhi @08000D56
bhi _08000D56
str r3, [r4]
str r2, [r4, 0x4]
lsrs r0, r1, 1
movs r1, 0x80
lsls r1, 24
@08000D76:
_08000D76:
orrs r0, r1
str r0, [r4, 0x8]
ldr r0, [r4, 0x8]
b @08000DF0
b _08000DF0
.pool
@08000D88:
_08000D88:
mov r3, r10
adds r0, r5, r3
ldr r2, [r0]
ldrh r4, [r1, 0x8]
add r1, sp, 0x4
cmp r4, r6
bhi @08000DB2
bhi _08000DB2
mov r0, r8
adds r0, 0xC
adds r0, r5, r0
@ -244,12 +244,12 @@ ProcessDma3Requests: ; 8000BF0
lsrs r0, r4, 1
movs r1, 0x81
lsls r1, 24
@08000DAA:
_08000DAA:
orrs r0, r1
str r0, [r7, 0x8]
ldr r0, [r7, 0x8]
b @08000DF0
@08000DB2:
b _08000DF0
_08000DB2:
mov r5, r12
ldrb r0, [r5]
lsls r0, 4
@ -266,7 +266,7 @@ ProcessDma3Requests: ; 8000BF0
adds r2, r6
subs r4, r6
cmp r4, r6
bhi @08000DB2
bhi _08000DB2
ldrb r0, [r5]
lsls r0, 4
ldr r5, =0x0300001c
@ -278,11 +278,11 @@ ProcessDma3Requests: ; 8000BF0
lsrs r0, r4, 1
movs r1, 0x81
lsls r1, 24
@08000DEA:
_08000DEA:
orrs r0, r1
str r0, [r3, 0x8]
ldr r0, [r3, 0x8]
@08000DF0:
_08000DF0:
ldr r1, =gDma3Requests
mov r3, r12
ldrb r0, [r3]
@ -315,9 +315,9 @@ ProcessDma3Requests: ; 8000BF0
strb r0, [r3]
lsls r0, 24
cmp r0, 0
bge @08000E34
bge _08000E34
strb r4, [r3]
@08000E34:
_08000E34:
mov r2, r12
ldrb r0, [r2]
lsls r0, 4
@ -325,9 +325,9 @@ ProcessDma3Requests: ; 8000BF0
adds r0, r3
ldrh r0, [r0, 0x8]
cmp r0, 0
beq @08000E46
b @08000C2E
@08000E46:
beq _08000E46
b _08000C2E
_08000E46:
add sp, 0xC
pop {r3-r5}
mov r8, r3
@ -364,11 +364,11 @@ RequestDma3Copy: ; 8000E68
mov r9, r6
lsls r0, r2, 4
adds r1, r0, r6
@08000E94:
_08000E94:
lsls r3, r2, 4
ldrh r0, [r1, 0x8]
cmp r0, 0
bne @08000ED4
bne _08000ED4
mov r0, r12
str r0, [r1]
mov r0, r9
@ -378,38 +378,38 @@ RequestDma3Copy: ; 8000E68
str r3, [r0]
strh r7, [r1, 0x8]
cmp r4, 0x1
bne @08000EC0
bne _08000EC0
strh r4, [r1, 0xA]
b @08000EC4
b _08000EC4
.pool
@08000EC0:
_08000EC0:
movs r0, 0x3
strh r0, [r1, 0xA]
@08000EC4:
_08000EC4:
movs r0, 0
ldr r1, =gDma3ManagerLocked
strb r0, [r1]
lsls r0, r2, 16
asrs r0, 16
b @08000EF0
b _08000EF0
.pool
@08000ED4:
_08000ED4:
adds r1, 0x10
adds r2, 0x1
cmp r2, 0x7F
ble @08000EE0
ble _08000EE0
adds r1, r6, 0
movs r2, 0
@08000EE0:
_08000EE0:
adds r5, 0x1
cmp r5, 0x7F
ble @08000E94
ble _08000E94
movs r0, 0
mov r3, r10
strb r0, [r3]
movs r0, 0x1
negs r0, r0
@08000EF0:
_08000EF0:
pop {r3-r5}
mov r8, r3
mov r9, r4
@ -446,11 +446,11 @@ RequestDma3Fill: ; 8000F00
lsls r0, r2, 4
adds r0, 0x8
adds r1, r0, r4
@loop:
_8000F30:
lsls r3, r2, 4
ldrh r0, [r1]
cmp r0, 0
bne @08000F78
bne _08000F78
adds r0, r4, 0x4
adds r0, r3, r0
mov r6, r8
@ -463,39 +463,39 @@ RequestDma3Fill: ; 8000F00
mov r3, r9
str r3, [r0]
cmp r5, 0x1
bne @08000F64
bne _08000F64
movs r0, 0x2
b @08000F66
b _08000F66
.pool
@08000F64:
_08000F64:
movs r0, 0x4
@08000F66:
_08000F66:
strh r0, [r1, 0x2]
movs r0, 0
ldr r6, =gDma3ManagerLocked
strb r0, [r6]
lsls r0, r2, 16
asrs r0, 16
b @08000F96
b _08000F96
.pool
@08000F78:
_08000F78:
adds r1, 0x10
adds r2, 0x1
cmp r2, 0x7F
ble @08000F86
ble _08000F86
mov r1, r12
adds r1, 0x8
movs r2, 0
@08000F86:
_08000F86:
adds r6, 0x1
cmp r6, 0x7F
ble @loop
ble _8000F30
movs r0, 0
mov r1, r10
strb r0, [r1]
movs r0, 0x1
negs r0, r0
@08000F96:
_08000F96:
pop {r3-r5}
mov r8, r3
mov r9, r4
@ -515,31 +515,31 @@ CheckForSpaceForDma3Request: ; 8000FA4
movs r3, 0x1
negs r3, r3
cmp r1, r3
bne @08000FCC
bne _08000FCC
ldr r1, =gDma3Requests
@08000FB6:
_08000FB6:
ldrh r0, [r1, 0x8]
cmp r0, 0
bne @08000FD8
bne _08000FD8
adds r1, 0x10
adds r2, 0x1
cmp r2, 0x7F
ble @08000FB6
@08000FC4:
ble _08000FB6
_08000FC4:
movs r0, 0
b @08000FDC
b _08000FDC
.pool
@08000FCC:
_08000FCC:
ldr r0, =gDma3Requests
lsls r1, 4
adds r1, r0
ldrh r0, [r1, 0x8]
cmp r0, 0
beq @08000FC4
@08000FD8:
beq _08000FC4
_08000FD8:
movs r0, 0x1
negs r0, r0
@08000FDC:
_08000FDC:
pop {r1}
bx r1
.pool

238468
asm/emerald.s

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -14,7 +14,7 @@ InitGpuRegManager: ; 8000FE4
movs r5, 0
ldr r4, =0x03000878
movs r3, 0xFF
@08000FFE:
_08000FFE:
adds r0, r2, r6
strb r5, [r0]
adds r1, r2, r4
@ -23,7 +23,7 @@ InitGpuRegManager: ; 8000FE4
strb r0, [r1]
adds r2, 0x1
cmp r2, 0x5F
ble @08000FFE
ble _08000FFE
movs r0, 0
strb r0, [r7]
mov r1, r12
@ -46,7 +46,7 @@ CopyBufferedValueToGpuReg: ; 800103C
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x4
bne @08001068
bne _08001068
ldr r2, =0x04000004
ldrh r1, [r2]
ldr r0, =0x0000ffe7
@ -57,9 +57,9 @@ CopyBufferedValueToGpuReg: ; 800103C
ldrh r1, [r1]
orrs r0, r1
strh r0, [r2]
b @08001076
b _08001076
.pool
@08001068:
_08001068:
movs r0, 0x80
lsls r0, 19
adds r0, r2, r0
@ -67,7 +67,7 @@ CopyBufferedValueToGpuReg: ; 800103C
adds r1, r2, r1
ldrh r1, [r1]
strh r1, [r0]
@08001076:
_08001076:
pop {r0}
bx r0
.pool
@ -80,21 +80,21 @@ CopyBufferedValuesToGpuRegs: ; 8001080
ldr r0, =0x030008d8
ldrb r0, [r0]
cmp r0, 0
bne @080010A4
bne _080010A4
movs r5, 0
@0800108C:
_0800108C:
ldr r0, =0x03000878
adds r4, r5, r0
ldrb r0, [r4]
cmp r0, 0xFF
beq @080010A4
beq _080010A4
bl CopyBufferedValueToGpuReg
movs r0, 0xFF
strb r0, [r4]
adds r5, 0x1
cmp r5, 0x5F
ble @0800108C
@080010A4:
ble _0800108C
_080010A4:
pop {r4,r5}
pop {r0}
bx r0
@ -110,7 +110,7 @@ SetGpuReg: ; 80010B4
lsls r1, 16
lsrs r1, 16
cmp r4, 0x5F
bhi @08001130
bhi _08001130
ldr r0, =0x03000818
adds r0, r4, r0
strh r1, [r0]
@ -122,24 +122,24 @@ SetGpuReg: ; 80010B4
lsls r0, 16
lsrs r0, 16
cmp r0, 0x40
bls @080010E8
bls _080010E8
movs r0, 0x80
lsls r0, 19
ldrh r1, [r0]
movs r0, 0x80
ands r0, r1
cmp r0, 0
beq @080010FE
@080010E8:
beq _080010FE
_080010E8:
adds r0, r4, 0
bl CopyBufferedValueToGpuReg
b @08001130
b _08001130
.pool
@080010F8:
_080010F8:
movs r0, 0
strb r0, [r5]
b @08001130
@080010FE:
b _08001130
_080010FE:
ldr r2, =0x030008d8
movs r0, 0x1
strb r0, [r2]
@ -149,25 +149,25 @@ SetGpuReg: ; 80010B4
adds r5, r2, 0
adds r2, r0, 0
cmp r1, 0xFF
beq @08001128
beq _08001128
adds r1, r2, 0
@08001114:
_08001114:
ldrb r0, [r1]
cmp r0, r4
beq @080010F8
beq _080010F8
adds r1, 0x1
adds r3, 0x1
cmp r3, 0x5F
bgt @08001128
bgt _08001128
ldrb r0, [r1]
cmp r0, 0xFF
bne @08001114
@08001128:
bne _08001114
_08001128:
adds r0, r3, r2
movs r1, 0
strb r4, [r0]
strb r1, [r5]
@08001130:
_08001130:
pop {r4,r5}
pop {r0}
bx r0
@ -183,7 +183,7 @@ SetGpuReg_ScreenOff: ; 8001140
lsls r1, 16
lsrs r1, 16
cmp r4, 0x5F
bhi @080011A8
bhi _080011A8
ldr r0, =0x03000818
adds r0, r4, r0
strh r1, [r0]
@ -193,16 +193,16 @@ SetGpuReg_ScreenOff: ; 8001140
movs r0, 0x80
ands r0, r1
cmp r0, 0
beq @08001176
beq _08001176
adds r0, r4, 0
bl CopyBufferedValueToGpuReg
b @080011A8
b _080011A8
.pool
@08001170:
_08001170:
movs r0, 0
strb r0, [r5]
b @080011A8
@08001176:
b _080011A8
_08001176:
ldr r2, =0x030008d8
movs r0, 0x1
strb r0, [r2]
@ -212,25 +212,25 @@ SetGpuReg_ScreenOff: ; 8001140
adds r5, r2, 0
adds r2, r0, 0
cmp r1, 0xFF
beq @080011A0
beq _080011A0
adds r1, r2, 0
@0800118C:
_0800118C:
ldrb r0, [r1]
cmp r0, r4
beq @08001170
beq _08001170
adds r1, 0x1
adds r3, 0x1
cmp r3, 0x5F
bgt @080011A0
bgt _080011A0
ldrb r0, [r1]
cmp r0, 0xFF
bne @0800118C
@080011A0:
bne _0800118C
_080011A0:
adds r0, r3, r2
movs r1, 0
strb r4, [r0]
strb r1, [r5]
@080011A8:
_080011A8:
pop {r4,r5}
pop {r0}
bx r0
@ -245,23 +245,23 @@ GetGpuReg: ; 80011B8
lsrs r0, 24
adds r1, r0, 0
cmp r1, 0x4
bne @080011CC
bne _080011CC
ldr r0, =0x04000004
b @080011DE
b _080011DE
.pool
@080011CC:
_080011CC:
cmp r1, 0x6
beq @080011DC
beq _080011DC
ldr r0, =0x03000818
adds r0, r1, r0
ldrh r0, [r0]
b @080011E0
b _080011E0
.pool
@080011DC:
_080011DC:
ldr r0, =0x04000006
@080011DE:
_080011DE:
ldrh r0, [r0]
@080011E0:
_080011E0:
pop {r1}
bx r1
.pool
@ -312,7 +312,7 @@ SyncIEReg: ; 8001228
ldr r5, =0x030008d9
ldrb r0, [r5]
cmp r0, 0
beq @08001246
beq _08001246
ldr r2, =0x04000208
ldrh r1, [r2]
movs r4, 0
@ -323,7 +323,7 @@ SyncIEReg: ; 8001228
strh r0, [r3]
strh r1, [r2]
strb r4, [r5]
@08001246:
_08001246:
pop {r4,r5}
pop {r0}
bx r0
@ -395,15 +395,15 @@ SetDispstatVBlankHBlankInterrupts: ; 80012B4
movs r0, 0x2
ands r0, r4
cmp r0, 0
beq @080012E0
beq _080012E0
movs r0, 0x10
orrs r1, r0
@080012E0:
_080012E0:
cmp r2, r1
beq @080012EA
beq _080012EA
movs r0, 0x4
bl SetGpuReg
@080012EA:
_080012EA:
pop {r4}
pop {r0}
bx r0

View File

@ -37,16 +37,16 @@ ReadFlashID: ; 82E1880
add r1, sp, 0x40
ldr r2, =0x00004e20
adds r0, r2, 0
b @082E18B8
b _082E18B8
.pool
@082E18B4:
_082E18B4:
ldrh r0, [r1]
subs r0, 0x1
@082E18B8:
_082E18B8:
strh r0, [r1]
ldrh r0, [r1]
cmp r0, 0
bne @082E18B4
bne _082E18B4
ldr r0, =0x0e000001
bl _call_via_r5
lsls r0, 24
@ -69,16 +69,16 @@ ReadFlashID: ; 82E1880
add r1, sp, 0x40
ldr r2, =0x00004e20
adds r0, r2, 0
b @082E1908
b _082E1908
.pool
@082E1904:
_082E1904:
ldrh r0, [r1]
subs r0, 0x1
@082E1908:
_082E1908:
strh r0, [r1]
ldrh r0, [r1]
cmp r0, 0
bne @082E1904
bne _082E1904
adds r0, r4, 0
add sp, 0x44
pop {r4,r5}
@ -93,17 +93,17 @@ FlashTimerIntr: ; 82E191C
ldr r1, =0x03001a72
ldrh r0, [r1]
cmp r0, 0
beq @082E1938
beq _082E1938
ldrh r0, [r1]
subs r0, 0x1
strh r0, [r1]
lsls r0, 16
cmp r0, 0
bne @082E1938
bne _082E1938
ldr r1, =0x03007840
movs r0, 0x1
strb r0, [r1]
@082E1938:
_082E1938:
pop {r0}
bx r0
.pool
@ -117,7 +117,7 @@ SetFlashTimerIntr: ; 82E1944
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x3
bhi @082E1978
bhi _082E1978
ldr r0, =0x03001a70
strb r1, [r0]
ldr r1, =0x03001a74
@ -129,11 +129,11 @@ SetFlashTimerIntr: ; 82E1944
ldr r0, =FlashTimerIntr
str r0, [r2]
movs r0, 0
b @082E197A
b _082E197A
.pool
@082E1978:
_082E1978:
movs r0, 0x1
@082E197A:
_082E197A:
pop {r1}
bx r1
thumb_func_end SetFlashTimerIntr
@ -258,19 +258,19 @@ SetReadFlash1: ; 82E1A70
ldr r1, =ReadFlash1
subs r0, r1
lsls r0, 15
b @082E1AA4
b _082E1AA4
.pool
@082E1A98:
_082E1A98:
ldrh r0, [r3]
strh r0, [r2]
adds r3, 0x2
adds r2, 0x2
subs r0, r1, 0x1
lsls r0, 16
@082E1AA4:
_082E1AA4:
lsrs r1, r0, 16
cmp r1, 0
bne @082E1A98
bne _082E1A98
pop {r0}
bx r0
thumb_func_end SetReadFlash1
@ -281,18 +281,18 @@ ReadFlash_Core: ; 82E1AB0
adds r4, r0, 0
subs r3, r2, 0x1
cmp r2, 0
beq @082E1ACC
beq _082E1ACC
movs r2, 0x1
negs r2, r2
@082E1ABE:
_082E1ABE:
ldrb r0, [r4]
strb r0, [r1]
adds r4, 0x1
adds r1, 0x1
subs r3, 0x1
cmp r3, r2
bne @082E1ABE
@082E1ACC:
bne _082E1ABE
_082E1ACC:
pop {r4}
pop {r0}
bx r0
@ -320,14 +320,14 @@ ReadFlash: ; 82E1AD4
movs r0, 0x80
lsls r0, 10
cmp r1, r0
bne @082E1B0C
bne _082E1B0C
lsrs r0, r3, 20
lsls r0, 24
lsrs r0, 24
bl SwitchFlashBank
movs r0, 0xF
ands r4, r0
@082E1B0C:
_082E1B0C:
ldr r3, =ReadFlash_Core
movs r0, 0x1
eors r3, r0
@ -336,19 +336,19 @@ ReadFlash: ; 82E1AD4
ldr r1, =ReadFlash_Core
subs r0, r1
lsls r0, 15
b @082E1B40
b _082E1B40
.pool
@082E1B34:
_082E1B34:
ldrh r0, [r3]
strh r0, [r2]
adds r3, 0x2
adds r2, 0x2
subs r0, r1, 0x1
lsls r0, 16
@082E1B40:
_082E1B40:
lsrs r1, r0, 16
cmp r1, 0
bne @082E1B34
bne _082E1B34
mov r3, sp
adds r3, 0x1
ldr r0, =0x03007850
@ -377,25 +377,25 @@ VerifyFlashSector_Core: ; 82E1B70
adds r3, r1, 0
subs r4, r2, 0x1
cmp r2, 0
beq @082E1B96
beq _082E1B96
movs r2, 0x1
negs r2, r2
@082E1B80:
_082E1B80:
ldrb r1, [r3]
ldrb r0, [r5]
adds r5, 0x1
adds r3, 0x1
cmp r1, r0
beq @082E1B90
beq _082E1B90
subs r0, r3, 0x1
b @082E1B98
@082E1B90:
b _082E1B98
_082E1B90:
subs r4, 0x1
cmp r4, r2
bne @082E1B80
@082E1B96:
bne _082E1B80
_082E1B96:
movs r0, 0
@082E1B98:
_082E1B98:
pop {r4,r5}
pop {r1}
bx r1
@ -421,14 +421,14 @@ VerifyFlashSector: ; 82E1BA0
movs r0, 0x80
lsls r0, 10
cmp r1, r0
bne @082E1BD4
bne _082E1BD4
lsrs r0, r3, 20
lsls r0, 24
lsrs r0, 24
bl SwitchFlashBank
movs r0, 0xF
ands r4, r0
@082E1BD4:
_082E1BD4:
ldr r3, =VerifyFlashSector_Core
movs r0, 0x1
eors r3, r0
@ -437,19 +437,19 @@ VerifyFlashSector: ; 82E1BA0
ldr r1, =VerifyFlashSector_Core
subs r0, r1
lsls r0, 15
b @082E1C08
b _082E1C08
.pool
@082E1BFC:
_082E1BFC:
ldrh r0, [r3]
strh r0, [r2]
adds r3, 0x2
adds r2, 0x2
subs r0, r1, 0x1
lsls r0, 16
@082E1C08:
_082E1C08:
lsrs r1, r0, 16
cmp r1, 0
bne @082E1BFC
bne _082E1BFC
mov r3, sp
adds r3, 0x1
ldr r0, =0x03007850
@ -484,14 +484,14 @@ VerifyFlashSectorFirstNBytes: ; 82E1C38
movs r0, 0x80
lsls r0, 10
cmp r1, r0
bne @082E1C60
bne _082E1C60
lsrs r0, r2, 20
lsls r0, 24
lsrs r0, 24
bl SwitchFlashBank
movs r0, 0xF
ands r4, r0
@082E1C60:
_082E1C60:
ldr r2, =0x04000204
ldrh r0, [r2]
ldr r1, =0x0000fffc
@ -507,19 +507,19 @@ VerifyFlashSectorFirstNBytes: ; 82E1C38
ldr r1, =VerifyFlashSector_Core
subs r0, r1
lsls r0, 15
b @082E1CA0
b _082E1CA0
.pool
@082E1C94:
_082E1C94:
ldrh r0, [r3]
strh r0, [r2]
adds r3, 0x2
adds r2, 0x2
subs r0, r1, 0x1
lsls r0, 16
@082E1CA0:
_082E1CA0:
lsrs r1, r0, 16
cmp r1, 0
bne @082E1C94
bne _082E1C94
mov r3, sp
adds r3, 0x1
ldr r0, =0x03007850
@ -547,14 +547,14 @@ ProgramFlashSectorsAndVerify: ; 82E1CD0
lsls r0, 16
lsrs r4, r0, 16
movs r6, 0
b @082E1CE2
@082E1CDC:
b _082E1CE2
_082E1CDC:
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@082E1CE2:
_082E1CE2:
cmp r6, 0x2
bhi @082E1D08
bhi _082E1D08
ldr r0, =0x0300784c
ldr r2, [r0]
adds r0, r4, 0
@ -563,14 +563,14 @@ ProgramFlashSectorsAndVerify: ; 82E1CD0
lsls r0, 16
lsrs r2, r0, 16
cmp r2, 0
bne @082E1CDC
bne _082E1CDC
adds r0, r4, 0
adds r1, r5, 0
bl VerifyFlashSector
adds r2, r0, 0
cmp r2, 0
bne @082E1CDC
@082E1D08:
bne _082E1CDC
_082E1D08:
adds r0, r2, 0
pop {r4-r6}
pop {r1}
@ -586,14 +586,14 @@ ProgramFlashSectorsVerifyFirstNBytes: ; 82E1D14
lsls r0, 16
lsrs r4, r0, 16
movs r6, 0
b @082E1D28
@082E1D22:
b _082E1D28
_082E1D22:
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@082E1D28:
_082E1D28:
cmp r6, 0x2
bhi @082E1D50
bhi _082E1D50
ldr r0, =0x0300784c
ldr r2, [r0]
adds r0, r4, 0
@ -602,15 +602,15 @@ ProgramFlashSectorsVerifyFirstNBytes: ; 82E1D14
lsls r0, 16
lsrs r3, r0, 16
cmp r3, 0
bne @082E1D22
bne _082E1D22
adds r0, r4, 0
adds r1, r5, 0
adds r2, r7, 0
bl VerifyFlashSectorFirstNBytes
adds r3, r0, 0
cmp r3, 0
bne @082E1D22
@082E1D50:
bne _082E1D22
_082E1D50:
adds r0, r3, 0
pop {r4-r7}
pop {r1}
@ -634,22 +634,22 @@ IdentifyFlash: ; 82E1D5C
lsrs r3, r0, 16
ldr r2, =gUnknown_089A30D0
movs r4, 0x1
b @082E1D8A
b _082E1D8A
.pool
@082E1D88:
_082E1D88:
adds r2, 0x4
@082E1D8A:
_082E1D8A:
ldr r1, [r2]
adds r0, r1, 0
adds r0, 0x2C
ldrb r0, [r0]
cmp r0, 0
beq @082E1D9E
beq _082E1D9E
ldrh r0, [r1, 0x2C]
cmp r3, r0
bne @082E1D88
bne _082E1D88
movs r4, 0
@082E1D9E:
_082E1D9E:
ldr r1, =0x03007854
ldr r0, [r2]
ldr r0, [r0]
@ -703,57 +703,57 @@ PollingSR_COMMON: ; 82E1DFC
ldr r6, =0x03007844
ldr r1, =0x0e005555
mov r9, r1
b @082E1E60
b _082E1E60
.pool
@082E1E28:
_082E1E28:
movs r0, 0xF0
mov r1, r9
strb r0, [r1]
movs r0, 0xA0
lsls r0, 8
b @082E1E56
@082E1E34:
b _082E1E56
_082E1E34:
ldr r0, =0x03007840
ldrb r0, [r0]
cmp r0, 0
beq @082E1E60
beq _082E1E60
ldr r1, [r6]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
lsrs r0, 24
cmp r0, r5
beq @082E1E88
beq _082E1E88
movs r0, 0xF0
mov r1, r9
strb r0, [r1]
movs r0, 0xC0
lsls r0, 8
@082E1E56:
_082E1E56:
orrs r7, r0
mov r8, r7
b @082E1E88
b _082E1E88
.pool
@082E1E60:
_082E1E60:
ldr r1, [r6]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
lsrs r1, r0, 24
cmp r1, r5
beq @082E1E88
beq _082E1E88
movs r0, 0x20
ands r0, r1
cmp r0, 0
beq @082E1E34
beq _082E1E34
ldr r1, [r6]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
lsrs r0, 24
cmp r0, r5
bne @082E1E28
@082E1E88:
bne _082E1E28
_082E1E88:
bl StopFlashTimer
mov r0, r8
pop {r3,r4}
@ -822,11 +822,11 @@ EraseFlashSector: ; 82E1F10
ldr r0, [r0]
ldrh r0, [r0, 0xA]
cmp r6, r0
bcc @082E1F30
bcc _082E1F30
ldr r0, =0x000080ff
b @082E1FD0
b _082E1FD0
.pool
@082E1F30:
_082E1F30:
lsrs r0, r6, 4
lsls r0, 24
lsrs r0, 24
@ -834,7 +834,7 @@ EraseFlashSector: ; 82E1F10
movs r0, 0xF
ands r6, r0
movs r7, 0
@082E1F40:
_082E1F40:
ldr r3, =0x04000204
ldrh r1, [r3]
ldr r0, =0x0000fffc
@ -877,15 +877,15 @@ EraseFlashSector: ; 82E1F10
lsls r0, 8
ands r0, r3
cmp r0, 0
beq @082E1FC0
beq _082E1FC0
cmp r7, 0x3
bhi @082E1FC0
bhi _082E1FC0
adds r0, r7, 0x1
lsls r0, 16
lsrs r7, r0, 16
b @082E1F40
b _082E1F40
.pool
@082E1FC0:
_082E1FC0:
ldr r2, =0x04000204
ldrh r0, [r2]
ldr r1, =0x0000fffc
@ -894,7 +894,7 @@ EraseFlashSector: ; 82E1F10
orrs r0, r1
strh r0, [r2]
adds r0, r3, 0
@082E1FD0:
_082E1FD0:
add sp, 0x40
pop {r4-r7}
pop {r1}
@ -915,7 +915,7 @@ ProgramFlashByte: ; 82E1FE0
ldr r0, [r5]
ldr r0, [r0, 0x4]
cmp r6, r0
bcs @082E2068
bcs _082E2068
lsrs r0, r1, 20
lsls r0, 24
lsrs r0, 24
@ -956,12 +956,12 @@ ProgramFlashByte: ; 82E1FE0
bl _call_via_r3
lsls r0, 16
lsrs r0, 16
b @082E206C
b _082E206C
.pool
@082E2068:
_082E2068:
movs r0, 0x80
lsls r0, 8
@082E206C:
_082E206C:
add sp, 0x40
pop {r4-r7}
pop {r1}
@ -1005,17 +1005,17 @@ ProgramFlashSector: ; 82E20AC
ldr r0, [r0]
ldrh r0, [r0, 0xA]
cmp r4, r0
bcc @082E20CC
bcc _082E20CC
ldr r0, =0x000080ff
b @082E2146
b _082E2146
.pool
@082E20CC:
_082E20CC:
adds r0, r4, 0
bl EraseFlashSector
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0
bne @082E2144
bne _082E2144
lsrs r0, r4, 4
lsls r0, 24
lsrs r0, 24
@ -1042,28 +1042,28 @@ ProgramFlashSector: ; 82E20AC
lsls r0, 20
adds r4, r0
adds r6, r1, 0
b @082E212E
b _082E212E
.pool
@082E2124:
_082E2124:
ldrh r0, [r6]
subs r0, 0x1
strh r0, [r6]
adds r7, 0x1
adds r4, 0x1
@082E212E:
_082E212E:
ldrh r0, [r6]
cmp r0, 0
beq @082E2144
beq _082E2144
adds r0, r7, 0
adds r1, r4, 0
bl ProgramFlashByteInternal
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0
beq @082E2124
@082E2144:
beq _082E2124
_082E2144:
adds r0, r5, 0
@082E2146:
_082E2146:
add sp, 0x40
pop {r4-r7}
pop {r1}

View File

@ -12,15 +12,15 @@ GameCubeMultiBoot_Hash: ; 82DED70
eors r3, r1
movs r2, 0x20
@loop:
.loop:
lsrs r3, 1
bcc @skipExclusiveOr
bcc .skipExclusiveOr
eors r3, r4
@skipExclusiveOr:
.skipExclusiveOr:
subs r2, 0x1
bne @loop
bne .loop
pop {r4,pc}
thumb_func_end GameCubeMultiBoot_Hash
@ -175,14 +175,14 @@ pool_NintendoLogo: .4byte RomHeaderNintendoLogo
GameCubeMultiBoot_ExecuteProgram: ; 82DEE84
ldrb r1, [r0, 0x2]
cmp r1, 0x2
bne @unableToExecute
bne .unableToExecute
ldr r3, pool_InterruptRegs
movs r1, 0
strh r1, [r3, OFFSET_REG_IME - 0x200]
ldr r1, pool_MultiBootLoadAddr
adds r1, 0xC0
bx r1
@unableToExecute:
.unableToExecute:
bx lr
thumb_func_end GameCubeMultiBoot_ExecuteProgram
@ -213,10 +213,10 @@ GameCubeMultiBoot_Init: ; 82DEE98
adds r3, GCMB_STRUCT_BASE_DEST_PTR
; clear all but the last 3 fields of the struct
@clearStructLoop:
.clearStructLoop:
stm r0!, {r1}
cmp r0, r3
blo @clearStructLoop
blo .clearStructLoop
pop {r0,r3}
lsrs r3, 1

View File

@ -40,10 +40,10 @@ RTC_Init: ; 82E2180
lsls r1, r0, 24
lsrs r0, r1, 24
cmp r0, 0
bne @082E219A
bne _082E219A
movs r0, 0
b @082E224E
@082E219A:
b _082E224E
_082E219A:
adds r0, r7, 0
movs r1, 0
strb r1, [r0]
@ -56,7 +56,7 @@ RTC_Init: ; 82E2180
lsls r1, r2, 24
lsrs r0, r1, 24
cmp r0, 0x80
beq @082E21CA
beq _082E21CA
adds r0, r7, 0x4
ldrb r1, [r0, 0x7]
movs r2, 0xC0
@ -66,17 +66,17 @@ RTC_Init: ; 82E2180
lsls r1, r2, 24
lsrs r0, r1, 24
cmp r0, 0
bne @082E21E8
b @082E21CA
@082E21CA:
bne _082E21E8
b _082E21CA
_082E21CA:
bl RTC_Reset
lsls r1, r0, 24
lsrs r0, r1, 24
cmp r0, 0
bne @082E21DA
bne _082E21DA
movs r0, 0
b @082E224E
@082E21DA:
b _082E224E
_082E21DA:
adds r1, r7, 0
adds r0, r7, 0
adds r1, r7, 0
@ -84,7 +84,7 @@ RTC_Init: ; 82E2180
adds r1, r2, 0x1
adds r2, r1, 0
strb r2, [r0]
@082E21E8:
_082E21E8:
adds r1, r7, 0x4
adds r0, r1, 0
bl RTC_GetTime
@ -97,12 +97,12 @@ RTC_Init: ; 82E2180
lsls r1, r2, 24
lsrs r0, r1, 24
cmp r0, 0
beq @082E2236
beq _082E2236
bl RTC_Reset
lsls r1, r0, 24
lsrs r0, r1, 24
cmp r0, 0
bne @082E2228
bne _082E2228
adds r0, r7, 0
ldrb r1, [r0]
lsls r0, r1, 4
@ -114,8 +114,8 @@ RTC_Init: ; 82E2180
lsls r0, r1, 24
lsrs r1, r0, 24
adds r0, r1, 0
b @082E224E
@082E2228:
b _082E224E
_082E2228:
adds r1, r7, 0
adds r0, r7, 0
adds r1, r7, 0
@ -123,7 +123,7 @@ RTC_Init: ; 82E2180
adds r1, r2, 0x1
adds r2, r1, 0
strb r2, [r0]
@082E2236:
_082E2236:
adds r0, r7, 0
ldrb r1, [r0]
lsls r0, r1, 4
@ -135,8 +135,8 @@ RTC_Init: ; 82E2180
lsls r0, r1, 24
lsrs r1, r0, 24
adds r0, r1, 0
b @082E224E
@082E224E:
b _082E224E
_082E224E:
add sp, 0x10
pop {r7}
pop {r1}
@ -152,11 +152,11 @@ RTC_Reset: ; 82E2258
ldr r0, =0x03001a7e
ldrb r1, [r0]
cmp r1, 0x1
bne @082E2270
bne _082E2270
movs r0, 0
b @082E22D4
b _082E22D4
.pool
@082E2270:
_082E2270:
ldr r0, =0x03001a7e
movs r1, 0x1
strb r1, [r0]
@ -198,9 +198,9 @@ RTC_Reset: ; 82E2258
adds r0, r7, 0
ldrb r1, [r0]
adds r0, r1, 0
b @082E22D4
b _082E22D4
.pool
@082E22D4:
_082E22D4:
add sp, 0x10
pop {r7}
pop {r1}
@ -217,11 +217,11 @@ RTC_GetControlReg: ; 82E22DC
ldr r0, =0x03001a7e
ldrb r1, [r0]
cmp r1, 0x1
bne @082E22F4
bne _082E22F4
movs r0, 0
b @082E23A0
b _082E23A0
.pool
@082E22F4:
_082E22F4:
ldr r0, =0x03001a7e
movs r1, 0x1
strb r1, [r0]
@ -299,9 +299,9 @@ RTC_GetControlReg: ; 82E22DC
movs r1, 0
strb r1, [r0]
movs r0, 0x1
b @082E23A0
b _082E23A0
.pool
@082E23A0:
_082E23A0:
add sp, 0x8
pop {r4,r7}
pop {r1}
@ -318,11 +318,11 @@ RTC_SetControlReg: ; 82E23A8
ldr r0, =0x03001a7e
ldrb r1, [r0]
cmp r1, 0x1
bne @082E23C0
bne _082E23C0
movs r0, 0
b @082E2448
b _082E2448
.pool
@082E23C0:
_082E23C0:
ldr r0, =0x03001a7e
movs r1, 0x1
strb r1, [r0]
@ -381,9 +381,9 @@ RTC_SetControlReg: ; 82E23A8
movs r1, 0
strb r1, [r0]
movs r0, 0x1
b @082E2448
b _082E2448
.pool
@082E2448:
_082E2448:
add sp, 0x8
pop {r4,r7}
pop {r1}
@ -400,11 +400,11 @@ RTC_GetDateTime: ; 82E2450
ldr r0, =0x03001a7e
ldrb r1, [r0]
cmp r1, 0x1
bne @082E2468
bne _082E2468
movs r0, 0
b @082E24F8
b _082E24F8
.pool
@082E2468:
_082E2468:
ldr r0, =0x03001a7e
movs r1, 0x1
strb r1, [r0]
@ -425,14 +425,14 @@ RTC_GetDateTime: ; 82E2450
adds r0, r7, 0x4
movs r1, 0
strb r1, [r0]
@082E2492:
_082E2492:
adds r0, r7, 0x4
ldrb r1, [r0]
cmp r1, 0x6
bls @082E24A8
b @082E24C6
bls _082E24A8
b _082E24C6
.pool
@082E24A8:
_082E24A8:
bl RTC_ReadByte
adds r1, r7, 0x4
ldrb r2, [r1]
@ -446,8 +446,8 @@ RTC_GetDateTime: ; 82E2450
adds r1, r2, 0x1
adds r2, r1, 0
strb r2, [r0]
b @082E2492
@082E24C6:
b _082E2492
_082E24C6:
ldr r1, [r7]
adds r0, r1, 0x4
ldr r2, [r7]
@ -468,9 +468,9 @@ RTC_GetDateTime: ; 82E2450
movs r1, 0
strb r1, [r0]
movs r0, 0x1
b @082E24F8
b _082E24F8
.pool
@082E24F8:
_082E24F8:
add sp, 0x8
pop {r7}
pop {r1}
@ -487,11 +487,11 @@ RTC_SetDateTime: ; 82E2500
ldr r0, =0x03001a7e
ldrb r1, [r0]
cmp r1, 0x1
bne @082E2518
bne _082E2518
movs r0, 0
b @082E2594
b _082E2594
.pool
@082E2518:
_082E2518:
ldr r0, =0x03001a7e
movs r1, 0x1
strb r1, [r0]
@ -509,14 +509,14 @@ RTC_SetDateTime: ; 82E2500
adds r0, r7, 0x4
movs r1, 0
strb r1, [r0]
@082E253C:
_082E253C:
adds r0, r7, 0x4
ldrb r1, [r0]
cmp r1, 0x6
bls @082E2554
b @082E2574
bls _082E2554
b _082E2574
.pool
@082E2554:
_082E2554:
adds r0, r7, 0x4
ldrb r1, [r0]
ldr r2, [r7]
@ -531,8 +531,8 @@ RTC_SetDateTime: ; 82E2500
adds r1, r2, 0x1
adds r2, r1, 0
strb r2, [r0]
b @082E253C
@082E2574:
b _082E253C
_082E2574:
ldr r0, =GPIOPortData
movs r1, 0x1
strh r1, [r0]
@ -543,9 +543,9 @@ RTC_SetDateTime: ; 82E2500
movs r1, 0
strb r1, [r0]
movs r0, 0x1
b @082E2594
b _082E2594
.pool
@082E2594:
_082E2594:
add sp, 0x8
pop {r7}
pop {r1}
@ -562,11 +562,11 @@ RTC_GetTime: ; 82E259C
ldr r0, =0x03001a7e
ldrb r1, [r0]
cmp r1, 0x1
bne @082E25B4
bne _082E25B4
movs r0, 0
b @082E2648
b _082E2648
.pool
@082E25B4:
_082E25B4:
ldr r0, =0x03001a7e
movs r1, 0x1
strb r1, [r0]
@ -587,14 +587,14 @@ RTC_GetTime: ; 82E259C
adds r0, r7, 0x4
movs r1, 0
strb r1, [r0]
@082E25DE:
_082E25DE:
adds r0, r7, 0x4
ldrb r1, [r0]
cmp r1, 0x2
bls @082E25F4
b @082E2614
bls _082E25F4
b _082E2614
.pool
@082E25F4:
_082E25F4:
bl RTC_ReadByte
adds r1, r7, 0x4
ldrb r2, [r1]
@ -609,8 +609,8 @@ RTC_GetTime: ; 82E259C
adds r1, r2, 0x1
adds r2, r1, 0
strb r2, [r0]
b @082E25DE
@082E2614:
b _082E25DE
_082E2614:
ldr r1, [r7]
adds r0, r1, 0x4
ldr r2, [r7]
@ -631,9 +631,9 @@ RTC_GetTime: ; 82E259C
movs r1, 0
strb r1, [r0]
movs r0, 0x1
b @082E2648
b _082E2648
.pool
@082E2648:
_082E2648:
add sp, 0x8
pop {r7}
pop {r1}
@ -650,11 +650,11 @@ RTC_SetTime: ; 82E2650
ldr r0, =0x03001a7e
ldrb r1, [r0]
cmp r1, 0x1
bne @082E2668
bne _082E2668
movs r0, 0
b @082E26E4
b _082E26E4
.pool
@082E2668:
_082E2668:
ldr r0, =0x03001a7e
movs r1, 0x1
strb r1, [r0]
@ -672,14 +672,14 @@ RTC_SetTime: ; 82E2650
adds r0, r7, 0x4
movs r1, 0
strb r1, [r0]
@082E268C:
_082E268C:
adds r0, r7, 0x4
ldrb r1, [r0]
cmp r1, 0x2
bls @082E26A4
b @082E26C6
bls _082E26A4
b _082E26C6
.pool
@082E26A4:
_082E26A4:
adds r0, r7, 0x4
ldrb r1, [r0]
ldr r2, [r7]
@ -695,8 +695,8 @@ RTC_SetTime: ; 82E2650
adds r1, r2, 0x1
adds r2, r1, 0
strb r2, [r0]
b @082E268C
@082E26C6:
b _082E268C
_082E26C6:
ldr r0, =GPIOPortData
movs r1, 0x1
strh r1, [r0]
@ -707,9 +707,9 @@ RTC_SetTime: ; 82E2650
movs r1, 0
strb r1, [r0]
movs r0, 0x1
b @082E26E4
b _082E26E4
.pool
@082E26E4:
_082E26E4:
add sp, 0x8
pop {r7}
pop {r1}
@ -726,11 +726,11 @@ RTC_SetUnknownData: ; 82E26EC
ldr r0, =0x03001a7e
ldrb r1, [r0]
cmp r1, 0x1
bne @082E2704
bne _082E2704
movs r0, 0
b @082E2818
b _082E2818
.pool
@082E2704:
_082E2704:
ldr r0, =0x03001a7e
movs r1, 0x1
strb r1, [r0]
@ -768,7 +768,7 @@ RTC_SetUnknownData: ; 82E26EC
adds r0, 0x8
ldrb r1, [r0]
cmp r1, 0xB
bhi @082E2770
bhi _082E2770
adds r0, r7, 0
adds r0, 0x8
ldr r1, [r7]
@ -781,9 +781,9 @@ RTC_SetUnknownData: ; 82E26EC
orrs r2, r1
adds r1, r2, 0
strb r1, [r0]
b @082E278E
b _082E278E
.pool
@082E2770:
_082E2770:
adds r0, r7, 0
adds r0, 0x8
ldr r1, [r7]
@ -799,7 +799,7 @@ RTC_SetUnknownData: ; 82E26EC
orrs r2, r1
adds r1, r2, 0
strb r1, [r0]
@082E278E:
_082E278E:
adds r0, r7, 0
adds r0, 0x8
ldr r1, [r7]
@ -826,14 +826,14 @@ RTC_SetUnknownData: ; 82E26EC
adds r0, r7, 0x4
movs r1, 0
strb r1, [r0]
@082E27C4:
_082E27C4:
adds r0, r7, 0x4
ldrb r1, [r0]
cmp r1, 0x1
bls @082E27D8
b @082E27FA
bls _082E27D8
b _082E27FA
.pool
@082E27D8:
_082E27D8:
adds r0, r7, 0
adds r0, 0x8
adds r1, r7, 0x4
@ -849,8 +849,8 @@ RTC_SetUnknownData: ; 82E26EC
adds r1, r2, 0x1
adds r2, r1, 0
strb r2, [r0]
b @082E27C4
@082E27FA:
b _082E27C4
_082E27FA:
ldr r0, =GPIOPortData
movs r1, 0x1
strh r1, [r0]
@ -861,9 +861,9 @@ RTC_SetUnknownData: ; 82E26EC
movs r1, 0
strb r1, [r0]
movs r0, 0x1
b @082E2818
b _082E2818
.pool
@082E2818:
_082E2818:
add sp, 0xC
pop {r4,r7}
pop {r1}
@ -882,13 +882,13 @@ RTC_WriteByte: ; 82E2820
adds r1, r7, 0x1
movs r2, 0
strb r2, [r1]
@082E2832:
_082E2832:
adds r1, r7, 0x1
ldrb r2, [r1]
cmp r2, 0x7
bls @082E283C
b @082E28BC
@082E283C:
bls _082E283C
b _082E28BC
_082E283C:
adds r1, r7, 0x2
adds r3, r7, 0
ldrb r2, [r3]
@ -950,9 +950,9 @@ RTC_WriteByte: ; 82E2820
adds r2, r3, 0x1
adds r3, r2, 0
strb r3, [r1]
b @082E2832
b _082E2832
.pool
@082E28BC:
_082E28BC:
add sp, 0x4
pop {r4,r5,r7}
pop {r1}
@ -971,13 +971,13 @@ RTC_WriteByteReversed: ; 82E28C4
adds r1, r7, 0x1
movs r2, 0
strb r2, [r1]
@082E28D6:
_082E28D6:
adds r1, r7, 0x1
ldrb r2, [r1]
cmp r2, 0x7
bls @082E28E0
b @082E295C
@082E28E0:
bls _082E28E0
b _082E295C
_082E28E0:
adds r1, r7, 0x2
adds r3, r7, 0
ldrb r2, [r3]
@ -1037,9 +1037,9 @@ RTC_WriteByteReversed: ; 82E28C4
adds r2, r3, 0x1
adds r3, r2, 0
strb r3, [r1]
b @082E28D6
b _082E28D6
.pool
@082E295C:
_082E295C:
add sp, 0x4
pop {r4,r7}
pop {r1}
@ -1055,13 +1055,13 @@ RTC_ReadByte: ; 82E2964
adds r0, r7, 0
movs r1, 0
strb r1, [r0]
@082E2970:
_082E2970:
adds r0, r7, 0
ldrb r1, [r0]
cmp r1, 0x7
bls @082E297A
b @082E29E0
@082E297A:
bls _082E297A
b _082E29E0
_082E297A:
ldr r0, =GPIOPortData
movs r1, 0x4
strh r1, [r0]
@ -1109,14 +1109,14 @@ RTC_ReadByte: ; 82E2964
adds r1, r2, 0x1
adds r2, r1, 0
strb r2, [r0]
b @082E2970
b _082E2970
.pool
@082E29E0:
_082E29E0:
adds r0, r7, 0x2
ldrb r1, [r0]
adds r0, r1, 0
b @082E29E8
@082E29E8:
b _082E29E8
_082E29E8:
add sp, 0x4
pop {r7}
pop {r1}

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

File diff suppressed because it is too large Load Diff

View File

@ -37,25 +37,25 @@ AllocInternal: ; 80009B8
movs r0, 0x3
ands r0, r1
cmp r0, 0
beq @080009CC
beq _080009CC
lsrs r0, r1, 2
adds r0, 0x1
lsls r1, r0, 2
@080009CC:
_080009CC:
movs r2, 0x1
@080009CE:
_080009CE:
ldrh r0, [r4]
cmp r0, 0
bne @08000A0C
bne _08000A0C
ldr r3, [r4, 0x4]
cmp r3, r1
bcc @08000A0C
bcc _08000A0C
subs r0, r3, r1
cmp r0, 0x1F
bhi @080009E4
bhi _080009E4
strh r2, [r4]
b @08000A06
@080009E4:
b _08000A06
_080009E4:
subs r3, 0x10
subs r3, r1
adds r0, r1, 0
@ -70,21 +70,21 @@ AllocInternal: ; 80009B8
str r5, [r4, 0xC]
ldr r0, [r5, 0xC]
cmp r0, r6
beq @08000A06
beq _08000A06
str r5, [r0, 0x8]
@08000A06:
_08000A06:
adds r0, r4, 0
adds r0, 0x10
b @08000A18
@08000A0C:
b _08000A18
_08000A0C:
ldr r0, [r4, 0xC]
cmp r0, r6
beq @08000A16
beq _08000A16
adds r4, r0, 0
b @080009CE
@08000A16:
b _080009CE
_08000A16:
movs r0, 0
@08000A18:
_08000A18:
pop {r4-r6}
pop {r1}
bx r1
@ -95,7 +95,7 @@ AllocInternal: ; 80009B8
FreeInternal: ; 8000A20
push {r4,r5,lr}
cmp r1, 0
beq @08000A7C
beq _08000A7C
adds r5, r0, 0
adds r2, r1, 0
subs r2, 0x10
@ -103,10 +103,10 @@ FreeInternal: ; 8000A20
strh r0, [r2]
ldr r3, [r2, 0xC]
cmp r3, r5
beq @08000A54
beq _08000A54
ldrh r4, [r3]
cmp r4, 0
bne @08000A54
bne _08000A54
ldr r0, [r2, 0x4]
adds r0, 0x10
ldr r1, [r3, 0x4]
@ -117,23 +117,23 @@ FreeInternal: ; 8000A20
ldr r0, [r0, 0xC]
str r0, [r2, 0xC]
cmp r0, r5
beq @08000A54
beq _08000A54
str r2, [r0, 0x8]
@08000A54:
_08000A54:
cmp r2, r5
beq @08000A7C
beq _08000A7C
ldr r1, [r2, 0x8]
ldrh r3, [r1]
cmp r3, 0
bne @08000A7C
bne _08000A7C
ldr r0, [r2, 0xC]
str r0, [r1, 0xC]
ldr r1, [r2, 0xC]
cmp r1, r5
beq @08000A6E
beq _08000A6E
ldr r0, [r2, 0x8]
str r0, [r1, 0x8]
@08000A6E:
_08000A6E:
strh r3, [r2, 0x2]
ldr r0, [r2, 0x8]
ldr r1, [r0, 0x4]
@ -141,7 +141,7 @@ FreeInternal: ; 8000A20
ldr r2, [r2, 0x4]
adds r1, r2
str r1, [r0, 0x4]
@08000A7C:
_08000A7C:
pop {r4,r5}
pop {r0}
bx r0
@ -156,15 +156,15 @@ AllocZeroedInternal: ; 8000A84
bl AllocInternal
adds r5, r0, 0
cmp r5, 0
beq @08000AB8
beq _08000AB8
movs r0, 0x3
ands r0, r4
cmp r0, 0
beq @08000AA2
beq _08000AA2
lsrs r0, r4, 2
adds r0, 0x1
lsls r4, r0, 2
@08000AA2:
_08000AA2:
movs r0, 0
str r0, [sp]
lsls r2, r4, 9
@ -175,7 +175,7 @@ AllocZeroedInternal: ; 8000A84
mov r0, sp
adds r1, r5, 0
bl CpuSet
@08000AB8:
_08000AB8:
adds r0, r5, 0
add sp, 0x4
pop {r4,r5}
@ -193,43 +193,43 @@ CheckMemBlockInternal: ; 8000AC4
ldrh r2, [r3, 0x2]
ldr r0, =0x0000a3a3
cmp r2, r0
bne @08000B0A
bne _08000B0A
ldr r0, [r3, 0xC]
ldrh r1, [r0, 0x2]
adds r4, r0, 0
cmp r1, r2
bne @08000B0A
bne _08000B0A
cmp r4, r5
beq @08000AE8
beq _08000AE8
ldr r0, [r4, 0x8]
cmp r0, r3
bne @08000B0A
@08000AE8:
bne _08000B0A
_08000AE8:
ldr r2, [r3, 0x8]
ldrh r1, [r2, 0x2]
ldr r0, =0x0000a3a3
cmp r1, r0
bne @08000B0A
bne _08000B0A
cmp r2, r5
beq @08000AFC
beq _08000AFC
ldr r0, [r2, 0xC]
cmp r0, r3
bne @08000B0A
@08000AFC:
bne _08000B0A
_08000AFC:
cmp r4, r5
beq @08000B14
beq _08000B14
ldr r0, [r3, 0x4]
adds r0, 0x10
adds r0, r3, r0
cmp r4, r0
beq @08000B14
@08000B0A:
beq _08000B14
_08000B0A:
movs r0, 0
b @08000B16
b _08000B16
.pool
@08000B14:
_08000B14:
movs r0, 0x1
@08000B16:
_08000B16:
pop {r4,r5}
pop {r1}
bx r1
@ -308,23 +308,23 @@ CheckHeap: ; 8000B88
ldr r0, =0x03000004
ldr r4, [r0]
adds r5, r0, 0
@08000B90:
_08000B90:
ldr r0, [r5]
adds r1, r4, 0
adds r1, 0x10
bl CheckMemBlockInternal
cmp r0, 0
beq @08000BB0
beq _08000BB0
ldr r4, [r4, 0xC]
ldr r0, [r5]
cmp r4, r0
bne @08000B90
bne _08000B90
movs r0, 0x1
b @08000BB2
b _08000BB2
.pool
@08000BB0:
_08000BB0:
movs r0, 0
@08000BB2:
_08000BB2:
pop {r4,r5}
pop {r1}
bx r1

View File

@ -37,25 +37,25 @@ MultiBootMain: ; 81BA70C
adds r7, r0, 0
bl MultiBootCheckComplete
cmp r0, 0
beq @081BA722
b @081BAAEA
@081BA722:
beq _081BA722
b _081BAAEA
_081BA722:
adds r0, r7, 0
adds r0, 0x4A
ldrb r1, [r0]
mov r10, r0
cmp r1, 0xF
bls @081BA736
bls _081BA736
subs r0, r1, 0x1
mov r1, r10
strb r0, [r1]
b @081BAAEA
@081BA736:
b _081BAAEA
_081BA736:
adds r1, r7, 0
adds r1, 0x48
ldrb r0, [r1]
cmp r0, 0
beq @081BA760
beq _081BA760
movs r0, 0
strb r0, [r1]
ldr r0, =0x04000128
@ -63,79 +63,79 @@ MultiBootMain: ; 81BA70C
movs r5, 0xFC
ands r5, r0
cmp r5, 0x8
beq @081BA760
beq _081BA760
adds r0, r7, 0
bl MultiBootInit
movs r0, 0x8
eors r0, r5
b @081BAAEC
b _081BAAEC
.pool
@081BA760:
_081BA760:
ldrb r0, [r7, 0x18]
cmp r0, 0xDF
bls @081BA7B2
bls _081BA7B2
adds r0, r7, 0
bl MultiBootHandShake
adds r5, r0, 0
cmp r5, 0
beq @081BA774
b @081BAAEC
@081BA774:
beq _081BA774
b _081BAAEC
_081BA774:
adds r0, r7, 0
adds r0, 0x4B
ldrb r0, [r0]
cmp r0, 0x1
bne @081BA790
bne _081BA790
ldrb r0, [r7, 0x18]
cmp r0, 0xE1
bls @081BA790
bls _081BA790
adds r0, r7, 0
bl MultiBootCheckComplete
cmp r0, 0
bne @081BA790
b @081BAADA
@081BA790:
bne _081BA790
b _081BAADA
_081BA790:
adds r0, r7, 0
bl MultiBootCheckComplete
cmp r0, 0
beq @081BA79C
b @081BAAEA
@081BA79C:
beq _081BA79C
b _081BAAEA
_081BA79C:
ldrh r0, [r7, 0x16]
cmp r0, 0
bne @081BA7AC
bne _081BA7AC
adds r0, r7, 0
bl MultiBootInit
movs r0, 0x71
b @081BAAEC
@081BA7AC:
b _081BAAEC
_081BA7AC:
subs r0, 0x1
strh r0, [r7, 0x16]
b @081BAAEA
@081BA7B2:
b _081BAAEA
_081BA7B2:
ldrb r0, [r7, 0x18]
cmp r0, 0x2
bne @081BA7BA
b @081BA8F0
@081BA7BA:
bne _081BA7BA
b _081BA8F0
_081BA7BA:
cmp r0, 0x2
bgt @081BA7C8
bgt _081BA7C8
cmp r0, 0
beq @081BA7D6
beq _081BA7D6
cmp r0, 0x1
beq @081BA892
b @081BAA28
@081BA7C8:
beq _081BA892
b _081BAA28
_081BA7C8:
cmp r0, 0xD0
bne @081BA7CE
b @081BA93C
@081BA7CE:
bne _081BA7CE
b _081BA93C
_081BA7CE:
cmp r0, 0xD1
bne @081BA7D4
b @081BA9D6
@081BA7D4:
b @081BAA28
@081BA7D6:
bne _081BA7D4
b _081BA9D6
_081BA7D4:
b _081BAA28
_081BA7D6:
movs r3, 0xE
movs r5, 0x3
ldr r0, =0x04000120
@ -145,19 +145,19 @@ MultiBootMain: ; 81BA70C
ldrb r2, [r7, 0x1E]
adds r6, r2, 0
cmp r1, r0
bne @081BA7FE
bne _081BA7FE
adds r4, r1, 0
ldr r1, =0x04000126
@081BA7EE:
_081BA7EE:
asrs r3, 1
subs r1, 0x2
subs r5, 0x1
cmp r5, 0
beq @081BA7FE
beq _081BA7FE
ldrh r0, [r1]
cmp r0, r4
beq @081BA7EE
@081BA7FE:
beq _081BA7EE
_081BA7FE:
movs r0, 0xE
ands r3, r0
strb r3, [r7, 0x1D]
@ -169,14 +169,14 @@ MultiBootMain: ; 81BA70C
movs r1, 0x1
ands r0, r1
cmp r0, 0
beq @081BA82C
beq _081BA82C
ldr r0, =0x00007208
b @081BA852
b _081BA852
.pool
@081BA82C:
_081BA82C:
subs r5, 0x1
cmp r5, 0
beq @081BA858
beq _081BA858
lsls r0, r5, 1
ldr r1, =0x04000120
adds r0, r1
@ -187,48 +187,48 @@ MultiBootMain: ; 81BA70C
movs r1, 0x1
ands r0, r1
cmp r0, 0
beq @081BA82C
beq _081BA82C
adds r0, r1, 0
lsls r0, r5
movs r1, 0xE4
lsls r1, 7
orrs r0, r1
@081BA852:
_081BA852:
cmp r4, r0
beq @081BA82C
beq _081BA82C
movs r3, 0
@081BA858:
_081BA858:
adds r0, r3, 0
ands r0, r6
strb r0, [r7, 0x1E]
cmp r3, 0
bne @081BA868
bne _081BA868
movs r0, 0xF
mov r2, r10
strb r0, [r2]
@081BA868:
_081BA868:
mov r1, r10
ldrb r0, [r1]
cmp r0, 0
bne @081BA884
bne _081BA884
ldrb r0, [r7, 0x1D]
ldrb r2, [r7, 0x1E]
cmp r0, r2
beq @081BA88A
beq _081BA88A
adds r0, r7, 0
bl MultiBootStartProbe
b @081BA892
b _081BA892
.pool
@081BA884:
_081BA884:
subs r0, 0x1
mov r1, r10
strb r0, [r1]
@081BA88A:
_081BA88A:
ldrb r1, [r7, 0x1E]
movs r2, 0xC4
lsls r2, 7
b @081BA992
@081BA892:
b _081BA992
_081BA892:
adds r1, r7, 0
adds r1, 0x49
movs r0, 0
@ -236,7 +236,7 @@ MultiBootMain: ; 81BA70C
movs r5, 0x3
mov r12, r1
ldr r3, =0x0300129c
@081BA8A0:
_081BA8A0:
lsls r0, r5, 1
ldr r2, =0x04000120
adds r0, r2
@ -245,7 +245,7 @@ MultiBootMain: ; 81BA70C
asrs r0, r4, 8
subs r2, r5, 0x1
cmp r0, 0x72
bne @081BA8CA
bne _081BA8CA
lsls r0, r2, 1
adds r0, r3
strh r4, [r0]
@ -254,28 +254,28 @@ MultiBootMain: ; 81BA70C
movs r0, 0x1
lsls r0, r5
cmp r4, r0
bne @081BA8CA
bne _081BA8CA
ldrb r0, [r1]
orrs r4, r0
strb r4, [r1]
@081BA8CA:
_081BA8CA:
adds r5, r2, 0
cmp r5, 0
bne @081BA8A0
bne _081BA8A0
ldrb r0, [r7, 0x1D]
mov r1, r12
ldrb r1, [r1]
cmp r0, r1
bne @081BA88A
bne _081BA88A
movs r0, 0x2
strb r0, [r7, 0x18]
mov r2, r12
ldrb r1, [r2]
movs r2, 0xC2
lsls r2, 7
b @081BA992
b _081BA992
.pool
@081BA8F0:
_081BA8F0:
movs r5, 0x3
movs r0, 0x49
adds r0, r7
@ -286,14 +286,14 @@ MultiBootMain: ; 81BA70C
mov r9, r1
ldr r2, =0x04000120
mov r8, r2
@081BA904:
_081BA904:
ldrb r3, [r4]
adds r0, r3, 0
asrs r0, r5
ands r0, r6
subs r2, r5, 0x1
cmp r0, 0
beq @081BA92A
beq _081BA92A
lsls r0, r5, 1
add r0, r8
ldrh r1, [r0]
@ -301,18 +301,18 @@ MultiBootMain: ; 81BA70C
add r0, r9
ldrh r0, [r0]
cmp r1, r0
beq @081BA92A
beq _081BA92A
adds r0, r6, 0
lsls r0, r5
eors r3, r0
strb r3, [r4]
@081BA92A:
_081BA92A:
adds r5, r2, 0
cmp r5, 0
bne @081BA904
b @081BAA90
bne _081BA904
b _081BAA90
.pool
@081BA93C:
_081BA93C:
movs r3, 0x1
movs r5, 0x3
movs r0, 0x49
@ -322,7 +322,7 @@ MultiBootMain: ; 81BA70C
adds r6, 0x19
ldr r1, =0x0300129c
mov r8, r1
@081BA94E:
_081BA94E:
lsls r0, r5, 1
ldr r2, =0x04000120
adds r0, r2
@ -337,48 +337,48 @@ MultiBootMain: ; 81BA70C
movs r0, 0x1
ands r1, r0
cmp r1, 0
beq @081BA982
beq _081BA982
asrs r0, r4, 8
subs r0, 0x72
cmp r0, 0x1
bls @081BA976
b @081BAAE0
@081BA976:
bls _081BA976
b _081BAAE0
_081BA976:
lsls r0, r2, 1
add r0, r8
ldrh r0, [r0]
cmp r4, r0
bne @081BA982
bne _081BA982
movs r3, 0
@081BA982:
_081BA982:
adds r5, r2, 0
cmp r5, 0
bne @081BA94E
bne _081BA94E
cmp r3, 0
bne @081BA9A8
bne _081BA9A8
ldrb r1, [r7, 0x1C]
movs r2, 0xC6
lsls r2, 7
@081BA992:
_081BA992:
adds r0, r2, 0
orrs r1, r0
adds r0, r7, 0
bl MultiBootSend
b @081BAAEC
b _081BAAEC
.pool
@081BA9A8:
_081BA9A8:
movs r0, 0xD1
strb r0, [r7, 0x18]
movs r3, 0x11
movs r5, 0x3
adds r1, r6, 0x2
@081BA9B2:
_081BA9B2:
ldrb r0, [r1]
adds r3, r0
subs r1, 0x1
subs r5, 0x1
cmp r5, 0
bne @081BA9B2
bne _081BA9B2
strb r3, [r7, 0x14]
movs r0, 0xFF
ands r3, r0
@ -389,49 +389,49 @@ MultiBootMain: ; 81BA70C
adds r0, r7, 0
adds r1, r3, 0
bl MultiBootSend
b @081BAAEC
@081BA9D6:
b _081BAAEC
_081BA9D6:
movs r5, 0x3
movs r2, 0x49
ldrb r1, [r2, r7]
ldr r2, =0x04000126
movs r3, 0x1
@081BA9E0:
_081BA9E0:
ldrh r0, [r2]
adds r4, r0, 0
adds r0, r1, 0
asrs r0, r5
ands r0, r3
cmp r0, 0
beq @081BA9F4
beq _081BA9F4
asrs r0, r4, 8
cmp r0, 0x73
bne @081BAAE0
@081BA9F4:
bne _081BAAE0
_081BA9F4:
subs r2, 0x2
subs r5, 0x1
cmp r5, 0
bne @081BA9E0
bne _081BA9E0
adds r0, r7, 0
bl MultiBoot
adds r5, r0, 0
cmp r5, 0
bne @081BAA18
bne _081BAA18
movs r0, 0xE0
strb r0, [r7, 0x18]
adds r0, 0xB0
strh r0, [r7, 0x16]
b @081BAAEA
b _081BAAEA
.pool
@081BAA18:
_081BAA18:
adds r0, r7, 0
bl MultiBootInit
movs r0, 0x1E
mov r1, r10
strb r0, [r1]
movs r0, 0x70
b @081BAAEC
@081BAA28:
b _081BAAEC
_081BAA28:
movs r5, 0x3
movs r2, 0x49
adds r2, r7
@ -439,7 +439,7 @@ MultiBootMain: ; 81BA70C
mov r8, r12
movs r0, 0x1
mov r9, r0
@081BAA36:
_081BAA36:
mov r1, r8
ldrb r6, [r1]
adds r0, r6, 0
@ -447,7 +447,7 @@ MultiBootMain: ; 81BA70C
mov r2, r9
ands r0, r2
cmp r0, 0
beq @081BAA70
beq _081BAA70
lsls r0, r5, 1
ldr r1, =0x04000120
adds r0, r1
@ -461,49 +461,49 @@ MultiBootMain: ; 81BA70C
mov r3, r9
lsls r3, r5
cmp r2, r1
bne @081BAA6A
bne _081BAA6A
movs r0, 0xFF
ands r4, r0
cmp r4, r3
beq @081BAA70
@081BAA6A:
beq _081BAA70
_081BAA6A:
eors r6, r3
mov r2, r8
strb r6, [r2]
@081BAA70:
_081BAA70:
subs r5, 0x1
cmp r5, 0
bne @081BAA36
bne _081BAA36
ldrb r0, [r7, 0x18]
cmp r0, 0xC4
bne @081BAA90
bne _081BAA90
mov r0, r12
ldrb r1, [r0]
movs r0, 0xE
ands r0, r1
strb r0, [r7, 0x1E]
strb r5, [r7, 0x18]
b @081BA88A
b _081BA88A
.pool
@081BAA90:
_081BAA90:
mov r1, r12
ldrb r0, [r1]
cmp r0, 0
bne @081BAAA2
bne _081BAAA2
adds r0, r7, 0
bl MultiBootInit
movs r0, 0x50
b @081BAAEC
@081BAAA2:
b _081BAAEC
_081BAAA2:
ldrb r0, [r7, 0x18]
adds r0, 0x2
strb r0, [r7, 0x18]
lsls r0, 24
lsrs r0, 24
cmp r0, 0xC4
bne @081BAAB2
b @081BA88A
@081BAAB2:
bne _081BAAB2
b _081BA88A
_081BAAB2:
ldrb r0, [r7, 0x18]
ldr r1, [r7, 0x28]
adds r0, r1
@ -517,23 +517,23 @@ MultiBootMain: ; 81BA70C
bl MultiBootSend
adds r5, r0, 0
cmp r5, 0
bne @081BAAEC
bne _081BAAEC
adds r0, r7, 0
adds r0, 0x4B
ldrb r0, [r0]
cmp r0, 0x1
bne @081BAAEA
@081BAADA:
bne _081BAAEA
_081BAADA:
bl MultiBootWaitSendDone
b @081BA736
@081BAAE0:
b _081BA736
_081BAAE0:
adds r0, r7, 0
bl MultiBootInit
movs r0, 0x60
b @081BAAEC
@081BAAEA:
b _081BAAEC
_081BAAEA:
movs r0, 0
@081BAAEC:
_081BAAEC:
pop {r3-r5}
mov r8, r3
mov r9, r4
@ -555,7 +555,7 @@ MultiBootSend: ; 81BAAFC
movs r4, 0x8C
ands r4, r0
cmp r4, 0x8
bne @081BAB34
bne _081BAB34
ldr r0, =0x0400012a
strh r1, [r0]
ldr r1, =0x00002083
@ -566,15 +566,15 @@ MultiBootSend: ; 81BAAFC
movs r0, 0x1
strb r0, [r1]
movs r0, 0
b @081BAB40
b _081BAB40
.pool
@081BAB34:
_081BAB34:
adds r0, r2, 0
bl MultiBootInit
movs r0, 0x8
eors r4, r0
adds r0, r4, 0
@081BAB40:
_081BAB40:
pop {r4}
pop {r1}
bx r1
@ -587,18 +587,18 @@ MultiBootStartProbe: ; 81BAB48
adds r1, r0, 0
ldrb r0, [r1, 0x18]
cmp r0, 0
beq @081BAB5A
beq _081BAB5A
adds r0, r1, 0
bl MultiBootInit
b @081BAB66
@081BAB5A:
b _081BAB66
_081BAB5A:
adds r2, r1, 0
adds r2, 0x4A
strb r0, [r2]
strb r0, [r1, 0x1E]
movs r0, 0x1
strb r0, [r1, 0x18]
@081BAB66:
_081BAB66:
pop {r0}
bx r0
thumb_func_end MultiBootStartProbe
@ -617,15 +617,15 @@ MultiBootStartMaster: ; 81BAB6C
movs r3, 0
ldrb r0, [r4, 0x18]
cmp r0, 0
bne @081BABA8
bne _081BABA8
ldrb r0, [r4, 0x1E]
cmp r0, 0
beq @081BABA8
beq _081BABA8
adds r0, r4, 0
adds r0, 0x4A
ldrb r0, [r0]
cmp r0, 0
bne @081BABA8
bne _081BABA8
str r6, [r4, 0x20]
adds r2, 0xF
movs r0, 0x10
@ -635,13 +635,13 @@ MultiBootStartMaster: ; 81BAB6C
adds r1, r2, r0
ldr r0, =0x0003ff00
cmp r1, r0
bls @081BABB4
@081BABA8:
bls _081BABB4
_081BABA8:
adds r0, r4, 0
bl MultiBootInit
b @081BAC28
b _081BAC28
.pool
@081BABB4:
_081BABB4:
adds r0, r6, r2
str r0, [r4, 0x24]
lsls r1, r7, 24
@ -651,41 +651,41 @@ MultiBootStartMaster: ; 81BAB6C
asrs r0, 24
adds r2, r1, 0
cmp r0, 0x8
bhi @081BAC14
bhi _081BAC14
lsls r0, 2
ldr r1, =@081BABD8
ldr r1, =_081BABD8
adds r0, r1
ldr r0, [r0]
mov pc, r0
.pool
.align 2, 0
@081BABD8:
.4byte @081BABFC
.4byte @081BABFC
.4byte @081BABFC
.4byte @081BABFC
.4byte @081BAC06
.4byte @081BAC0C
.4byte @081BAC0C
.4byte @081BAC0C
.4byte @081BAC0C
@081BABFC:
_081BABD8:
.4byte _081BABFC
.4byte _081BABFC
.4byte _081BABFC
.4byte _081BABFC
.4byte _081BAC06
.4byte _081BAC0C
.4byte _081BAC0C
.4byte _081BAC0C
.4byte _081BAC0C
_081BABFC:
lsls r3, r5, 3
asrs r1, r2, 24
movs r0, 0x3
subs r0, r1
b @081BAC12
@081BAC06:
b _081BAC12
_081BAC06:
movs r0, 0x38
adds r3, r5, 0
b @081BAC12
@081BAC0C:
b _081BAC12
_081BAC0C:
lsls r3, r5, 3
asrs r0, r2, 24
subs r0, 0x1
@081BAC12:
_081BAC12:
orrs r3, r0
@081BAC14:
_081BAC14:
movs r0, 0x3F
ands r3, r0
lsls r0, r3, 1
@ -696,7 +696,7 @@ MultiBootStartMaster: ; 81BAB6C
strb r0, [r4, 0x1C]
movs r0, 0xD0
strb r0, [r4, 0x18]
@081BAC28:
_081BAC28:
pop {r4-r7}
pop {r0}
bx r0
@ -708,12 +708,12 @@ MultiBootCheckComplete: ; 81BAC30
push {lr}
ldrb r0, [r0, 0x18]
cmp r0, 0xE9
beq @081BAC3C
beq _081BAC3C
movs r0, 0
b @081BAC3E
@081BAC3C:
b _081BAC3E
_081BAC3C:
movs r0, 0x1
@081BAC3E:
_081BAC3E:
pop {r1}
bx r1
thumb_func_end MultiBootCheckComplete
@ -725,17 +725,17 @@ MultiBootHandShake: ; 81BAC44
adds r3, r0, 0
ldrb r0, [r3, 0x18]
cmp r0, 0xE0
beq @081BAC60
beq _081BAC60
cmp r0, 0xE0
blt @081BAC70
blt _081BAC70
cmp r0, 0xE8
bgt @081BAC70
bgt _081BAC70
cmp r0, 0xE7
blt @081BAC70
blt _081BAC70
movs r4, 0x3
ldrb r5, [r3, 0x1E]
b @081BACD0
@081BAC60:
b _081BACD0
_081BAC60:
movs r1, 0
movs r0, 0xE1
strb r0, [r3, 0x18]
@ -743,28 +743,28 @@ MultiBootHandShake: ; 81BAC44
movs r0, 0x80
lsls r0, 13
str r0, [r3]
b @081BACC2
@081BAC70:
b _081BACC2
_081BAC70:
movs r4, 0x3
ldrb r5, [r3, 0x1E]
movs r6, 0x1
ldr r1, =0x04000126
@081BAC78:
_081BAC78:
ldrh r0, [r1]
adds r2, r0, 0
adds r0, r5, 0
asrs r0, r4
ands r0, r6
cmp r0, 0
beq @081BAC8C
beq _081BAC8C
ldr r0, [r3, 0x4]
cmp r2, r0
bne @081BAC60
@081BAC8C:
bne _081BAC60
_081BAC8C:
subs r1, 0x2
subs r4, 0x1
cmp r4, 0
bne @081BAC78
bne _081BAC78
ldrb r0, [r3, 0x18]
adds r0, 0x1
strb r0, [r3, 0x18]
@ -772,7 +772,7 @@ MultiBootHandShake: ; 81BAC44
ldrh r0, [r3]
str r0, [r3, 0x4]
cmp r1, 0
bne @081BACBA
bne _081BACBA
ldr r0, [r3, 0x28]
adds r1, r0, 0
adds r1, 0xAC
@ -784,18 +784,18 @@ MultiBootHandShake: ; 81BAC44
str r1, [r3, 0x4]
lsls r1, 5
str r1, [r3]
@081BACBA:
_081BACBA:
ldr r0, [r3]
lsrs r0, 5
str r0, [r3]
@081BACC0:
_081BACC0:
ldrh r1, [r3]
@081BACC2:
_081BACC2:
adds r0, r3, 0
bl MultiBootSend
b @081BAD28
b _081BAD28
.pool
@081BACD0:
_081BACD0:
lsls r0, r4, 1
ldr r1, =0x04000120
adds r0, r1
@ -806,21 +806,21 @@ MultiBootHandShake: ; 81BAC44
movs r1, 0x1
ands r0, r1
cmp r0, 0
beq @081BACEC
beq _081BACEC
ldr r0, [r3, 0x4]
cmp r2, r0
bne @081BAD1C
@081BACEC:
bne _081BAD1C
_081BACEC:
subs r4, 0x1
cmp r4, 0
bne @081BACD0
bne _081BACD0
ldrb r0, [r3, 0x18]
adds r0, 0x1
strb r0, [r3, 0x18]
lsls r0, 24
lsrs r0, 24
cmp r0, 0xE9
beq @081BAD26
beq _081BAD26
ldr r0, [r3, 0x28]
adds r1, r0, 0
adds r1, 0xAE
@ -831,16 +831,16 @@ MultiBootHandShake: ; 81BAC44
orrs r1, r0
str r1, [r3]
str r1, [r3, 0x4]
b @081BACC0
b _081BACC0
.pool
@081BAD1C:
_081BAD1C:
adds r0, r3, 0
bl MultiBootInit
movs r0, 0x71
b @081BAD28
@081BAD26:
b _081BAD28
_081BAD26:
movs r0, 0
@081BAD28:
_081BAD28:
pop {r4-r6}
pop {r1}
bx r1
@ -853,14 +853,14 @@ MultiBootWaitCycles: ; 81BAD30
lsrs r2, 24
movs r1, 0xC
cmp r2, 0x2
beq @081BAD42
beq _081BAD42
movs r1, 0xD
cmp r2, 0x8
beq @081BAD42
beq _081BAD42
movs r1, 0x4
@081BAD42:
_081BAD42:
subs r0, r1
bgt @081BAD42
bgt _081BAD42
bx lr
thumb_func_end MultiBootWaitCycles
@ -874,19 +874,19 @@ MultiBootWaitSendDone: ; 81BAD48
movs r0, 0x80
ands r0, r1
cmp r0, 0
beq @081BAD6C
beq _081BAD6C
ldr r5, =0x0000795c
movs r4, 0x80
@081BAD5C:
_081BAD5C:
adds r2, 0x1
cmp r2, r5
bgt @081BAD6C
bgt _081BAD6C
ldrh r1, [r3]
adds r0, r4, 0
ands r0, r1
cmp r0, 0
bne @081BAD5C
@081BAD6C:
bne _081BAD5C
_081BAD6C:
movs r0, 0x96
lsls r0, 2
bl MultiBootWaitCycles

View File

@ -77,11 +77,11 @@ BlitBitmapRect4Bit: ; 8002C20
adds r2, r4
mov r8, r2
cmp r0, r4
bge @08002C74
bge _08002C74
ldr r2, [sp, 0x8]
adds r0, r2
mov r8, r0
@08002C74:
_08002C74:
ldr r4, [sp, 0x4]
ldrh r0, [r4, 0x6]
mov r1, r9
@ -89,10 +89,10 @@ BlitBitmapRect4Bit: ; 8002C20
adds r2, r5, r7
str r2, [sp, 0x14]
cmp r0, r5
bge @08002C88
bge _08002C88
adds r0, r7
str r0, [sp, 0x14]
@08002C88:
_08002C88:
ldr r4, [sp]
ldrh r1, [r4, 0x4]
movs r2, 0x7
@ -108,14 +108,14 @@ BlitBitmapRect4Bit: ; 8002C20
str r0, [sp, 0x1C]
ldr r0, [sp, 0x10]
cmp r0, 0xFF
bne @08002D46
bne _08002D46
adds r3, r7, 0
mov r1, r9
ldr r2, [sp, 0x14]
cmp r3, r2
blt @08002CB4
b @08002DEE
@08002CB4:
blt _08002CB4
b _08002DEE
_08002CB4:
ldr r5, [sp, 0x8]
ldr r6, [sp, 0xC]
adds r4, r3, 0x1
@ -123,7 +123,7 @@ BlitBitmapRect4Bit: ; 8002C20
adds r0, r1, 0x1
str r0, [sp, 0x28]
cmp r5, r8
bge @08002D3A
bge _08002D3A
movs r7, 0x3
asrs r0, r3, 3
ldr r2, [sp, 0x18]
@ -140,7 +140,7 @@ BlitBitmapRect4Bit: ; 8002C20
mov r12, r0
lsls r0, r1, 29
lsrs r3, r0, 27
@08002CE4:
_08002CE4:
asrs r0, r5, 1
ands r0, r7
ldr r2, [sp]
@ -183,21 +183,21 @@ BlitBitmapRect4Bit: ; 8002C20
adds r5, 0x1
adds r6, 0x1
cmp r5, r8
blt @08002CE4
@08002D3A:
blt _08002CE4
_08002D3A:
ldr r3, [sp, 0x24]
ldr r1, [sp, 0x28]
ldr r2, [sp, 0x14]
cmp r3, r2
blt @08002CB4
b @08002DEE
@08002D46:
blt _08002CB4
b _08002DEE
_08002D46:
adds r3, r7, 0
mov r1, r9
ldr r4, [sp, 0x14]
cmp r3, r4
bge @08002DEE
@08002D50:
bge _08002DEE
_08002D50:
ldr r5, [sp, 0x8]
ldr r6, [sp, 0xC]
adds r0, r3, 0x1
@ -205,7 +205,7 @@ BlitBitmapRect4Bit: ; 8002C20
adds r2, r1, 0x1
str r2, [sp, 0x28]
cmp r5, r8
bge @08002DE4
bge _08002DE4
movs r4, 0x3
mov r9, r4
asrs r0, r3, 3
@ -224,7 +224,7 @@ BlitBitmapRect4Bit: ; 8002C20
mov r12, r0
lsls r0, r1, 29
lsrs r7, r0, 27
@08002D84:
_08002D84:
asrs r0, r5, 1
mov r1, r9
ands r0, r1
@ -258,7 +258,7 @@ BlitBitmapRect4Bit: ; 8002C20
ands r2, r0
ldr r0, [sp, 0x10]
cmp r2, r0
beq @08002DDC
beq _08002DDC
adds r0, r6, 0
ands r0, r3
lsls r1, r0, 2
@ -269,18 +269,18 @@ BlitBitmapRect4Bit: ; 8002C20
ands r0, r1
orrs r2, r0
strb r2, [r4]
@08002DDC:
_08002DDC:
adds r5, 0x1
adds r6, 0x1
cmp r5, r8
blt @08002D84
@08002DE4:
blt _08002D84
_08002DE4:
ldr r3, [sp, 0x24]
ldr r1, [sp, 0x28]
ldr r2, [sp, 0x14]
cmp r3, r2
blt @08002D50
@08002DEE:
blt _08002D50
_08002DEE:
add sp, 0x2C
pop {r3-r5}
mov r8, r3
@ -319,17 +319,17 @@ FillBitmapRect4Bit: ; 8002E00
mov r3, r9
ldrh r1, [r3, 0x4]
cmp r4, r1
ble @08002E36
ble _08002E36
adds r4, r1, 0
@08002E36:
_08002E36:
adds r2, r0
mov r12, r2
mov r2, r9
ldrh r0, [r2, 0x6]
cmp r12, r0
ble @08002E44
ble _08002E44
mov r12, r0
@08002E44:
_08002E44:
movs r0, 0x7
ands r0, r1
adds r0, r1, r0
@ -345,19 +345,19 @@ FillBitmapRect4Bit: ; 8002E00
mov r10, r0
adds r1, r6, 0
cmp r1, r12
bge @08002EB6
@08002E64:
bge _08002EB6
_08002E64:
ldr r3, [sp]
adds r7, r1, 0x1
cmp r3, r4
bge @08002EB0
bge _08002EB0
asrs r0, r1, 3
ldr r2, [sp, 0x4]
muls r0, r2
lsls r6, r0, 5
lsls r0, r1, 29
lsrs r5, r0, 27
@08002E78:
_08002E78:
asrs r2, r3, 1
movs r0, 0x3
ands r2, r0
@ -371,28 +371,28 @@ FillBitmapRect4Bit: ; 8002E00
adds r2, r1, r5
lsls r0, r3, 31
cmp r0, 0
beq @08002E9E
beq _08002E9E
ldrb r1, [r2]
movs r0, 0xF
ands r0, r1
mov r1, r8
b @08002EA6
@08002E9E:
b _08002EA6
_08002E9E:
ldrb r1, [r2]
movs r0, 0xF0
ands r0, r1
mov r1, r10
@08002EA6:
_08002EA6:
orrs r0, r1
strb r0, [r2]
adds r3, 0x1
cmp r3, r4
blt @08002E78
@08002EB0:
blt _08002E78
_08002EB0:
adds r1, r7, 0
cmp r1, r12
blt @08002E64
@08002EB6:
blt _08002E64
_08002EB6:
add sp, 0x8
pop {r3-r5}
mov r8, r3
@ -453,24 +453,24 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
adds r1, r5, r1
str r1, [sp, 0x18]
cmp r0, r5
bge @08002F2E
bge _08002F2E
ldr r2, [sp, 0x8]
adds r0, r2
str r0, [sp, 0x18]
@08002F2E:
_08002F2E:
ldr r5, [sp, 0x4]
ldrh r1, [r5, 0x6]
subs r0, r1, r7
cmp r0, r4
bge @08002F40
bge _08002F40
adds r0, r3, r1
subs r0, r7
str r0, [sp, 0x1C]
b @08002F44
@08002F40:
b _08002F44
_08002F40:
adds r4, r3, r4
str r4, [sp, 0x1C]
@08002F44:
_08002F44:
ldr r0, [sp]
ldrh r1, [r0, 0x4]
movs r2, 0x7
@ -488,14 +488,14 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
str r1, [sp, 0x24]
ldr r0, [sp, 0x10]
cmp r0, 0xFF
bne @08003024
bne _08003024
adds r2, r3, 0
adds r5, r7, 0
ldr r1, [sp, 0x1C]
cmp r2, r1
blt @08002F74
b @08003106
@08002F74:
blt _08002F74
b _08003106
_08002F74:
ldr r3, [sp, 0x8]
lsrs r3, 1
str r3, [sp, 0x2C]
@ -506,7 +506,7 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
lsrs r0, r7, 3
lsls r0, 5
str r0, [sp, 0x30]
@08002F88:
_08002F88:
ldr r0, [sp]
ldr r1, [r0]
ldr r3, [sp, 0x2C]
@ -530,7 +530,7 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
str r0, [sp, 0x38]
ldr r1, [sp, 0x18]
cmp r3, r1
bge @08003018
bge _08003018
asrs r0, r5, 3
ldr r2, [sp, 0x24]
muls r0, r2
@ -539,7 +539,7 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
lsls r0, r5, 29
lsrs r0, 26
mov r9, r0
@08002FC8:
_08002FC8:
movs r0, 0x7
ands r0, r4
ldr r5, [sp, 0x4]
@ -554,11 +554,11 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
movs r0, 0x1
ands r0, r3
cmp r0, 0
beq @08002FEC
beq _08002FEC
ldrb r0, [r6]
lsrs r0, 4
b @08003008
@08002FEC:
b _08003008
_08002FEC:
asrs r2, r3, 1
movs r0, 0x3
ands r2, r0
@ -573,7 +573,7 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
ldrb r1, [r6]
movs r0, 0xF
ands r0, r1
@08003008:
_08003008:
ldr r1, [sp, 0x14]
adds r0, r1, r0
strb r0, [r5]
@ -581,20 +581,20 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
adds r4, 0x1
ldr r2, [sp, 0x18]
cmp r3, r2
blt @08002FC8
@08003018:
blt _08002FC8
_08003018:
mov r2, r10
ldr r5, [sp, 0x38]
ldr r3, [sp, 0x1C]
cmp r2, r3
blt @08002F88
b @08003106
@08003024:
blt _08002F88
b _08003106
_08003024:
adds r2, r3, 0
adds r5, r7, 0
ldr r7, [sp, 0x1C]
cmp r2, r7
bge @08003106
bge _08003106
ldr r0, [sp, 0x8]
lsrs r0, 1
str r0, [sp, 0x34]
@ -602,7 +602,7 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
ldr r1, [sp, 0x34]
ands r1, r0
str r1, [sp, 0x34]
@0800303C:
_0800303C:
ldr r3, [sp]
ldr r1, [r3]
ldr r7, [sp, 0x34]
@ -627,7 +627,7 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
str r0, [sp, 0x38]
ldr r1, [sp, 0x18]
cmp r3, r1
bge @080030FC
bge _080030FC
asrs r0, r5, 3
ldr r2, [sp, 0x24]
muls r0, r2
@ -636,17 +636,17 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
lsls r0, r5, 29
lsrs r0, 26
mov r12, r0
@0800307E:
_0800307E:
movs r0, 0x1
ands r0, r3
cmp r0, 0
beq @080030B2
beq _080030B2
ldrb r2, [r6]
movs r0, 0xF0
ands r0, r2
ldr r5, [sp, 0x28]
cmp r0, r5
beq @080030F2
beq _080030F2
adds r0, r4, 0
movs r1, 0x7
ands r0, r1
@ -662,8 +662,8 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
lsrs r0, r2, 4
ldr r1, [sp, 0x14]
adds r0, r1, r0
b @080030F0
@080030B2:
b _080030F0
_080030B2:
asrs r2, r3, 1
movs r0, 0x3
ands r2, r0
@ -680,7 +680,7 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
ands r2, r0
ldr r0, [sp, 0x10]
cmp r2, r0
beq @080030F2
beq _080030F2
adds r0, r4, 0
movs r1, 0x7
ands r0, r1
@ -695,21 +695,21 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
adds r5, r1, r0
ldr r1, [sp, 0x14]
adds r0, r1, r2
@080030F0:
_080030F0:
strb r0, [r5]
@080030F2:
_080030F2:
adds r3, 0x1
adds r4, 0x1
ldr r2, [sp, 0x18]
cmp r3, r2
blt @0800307E
@080030FC:
blt _0800307E
_080030FC:
mov r2, r10
ldr r5, [sp, 0x38]
ldr r3, [sp, 0x1C]
cmp r2, r3
blt @0800303C
@08003106:
blt _0800303C
_08003106:
add sp, 0x3C
pop {r3-r5}
mov r8, r3
@ -749,16 +749,16 @@ FillBitmapRect8Bit: ; 8003118
mov r3, r8
ldrh r1, [r3, 0x4]
cmp r5, r1
ble @08003150
ble _08003150
adds r5, r1, 0
@08003150:
_08003150:
adds r7, r2, r0
mov r2, r8
ldrh r0, [r2, 0x6]
cmp r7, r0
ble @0800315C
ble _0800315C
adds r7, r0, 0
@0800315C:
_0800315C:
movs r0, 0x7
ands r0, r1
adds r0, r1, r0
@ -766,13 +766,13 @@ FillBitmapRect8Bit: ; 8003118
str r0, [sp]
adds r1, r6, 0
cmp r1, r7
bge @080031AC
@0800316C:
bge _080031AC
_0800316C:
mov r3, r10
adds r6, r1, 0x1
str r6, [sp, 0x4]
cmp r3, r5
bge @080031A6
bge _080031A6
movs r0, 0x7
mov r12, r0
asrs r0, r1, 3
@ -781,7 +781,7 @@ FillBitmapRect8Bit: ; 8003118
lsls r4, r0, 6
lsls r0, r1, 29
lsrs r2, r0, 26
@08003186:
_08003186:
adds r0, r3, 0
mov r6, r12
ands r0, r6
@ -797,12 +797,12 @@ FillBitmapRect8Bit: ; 8003118
strb r0, [r1]
adds r3, 0x1
cmp r3, r5
blt @08003186
@080031A6:
blt _08003186
_080031A6:
ldr r1, [sp, 0x4]
cmp r1, r7
blt @0800316C
@080031AC:
blt _0800316C
_080031AC:
add sp, 0x8
pop {r3-r5}
mov r8, r3

144
asm/rtc.s
View File

@ -29,15 +29,15 @@ GameFreakRTC_ConvertFromBCD: ; 802F0F8
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x9F
bhi @0802F10A
bhi _0802F10A
movs r3, 0xF
ands r3, r2
cmp r3, 0x9
bls @0802F10E
@0802F10A:
bls _0802F10E
_0802F10A:
movs r0, 0xFF
b @0802F11C
@0802F10E:
b _0802F11C
_0802F10E:
lsrs r1, r0, 28
movs r0, 0xF
ands r1, r0
@ -45,7 +45,7 @@ GameFreakRTC_ConvertFromBCD: ; 802F0F8
adds r0, r1
lsls r0, 1
adds r0, r3
@0802F11C:
_0802F11C:
pop {r1}
bx r1
thumb_func_end GameFreakRTC_ConvertFromBCD
@ -58,25 +58,25 @@ GameFreakRTC_IsLeapYear: ; 802F120
movs r0, 0x3
ands r0, r4
cmp r0, 0
bne @0802F138
bne _0802F138
adds r0, r4, 0
movs r1, 0x64
bl __umodsi3
cmp r0, 0
bne @0802F146
@0802F138:
bne _0802F146
_0802F138:
movs r1, 0xC8
lsls r1, 1
adds r0, r4, 0
bl __umodsi3
cmp r0, 0
bne @0802F14A
@0802F146:
bne _0802F14A
_0802F146:
movs r0, 0x1
b @0802F14C
@0802F14A:
b _0802F14C
_0802F14A:
movs r0, 0
@0802F14C:
_0802F14C:
pop {r4}
pop {r1}
bx r1
@ -98,8 +98,8 @@ GameFreakRTC_ConvertYearMonthDayToNumDays: ; 802F154
movs r5, 0
subs r4, r7, 0x1
cmp r4, 0
blt @0802F192
@0802F170:
blt _0802F192
_0802F170:
ldr r1, =0x0000016d
adds r0, r5, r1
lsls r0, 16
@ -109,41 +109,41 @@ GameFreakRTC_ConvertYearMonthDayToNumDays: ; 802F154
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne @0802F18C
bne _0802F18C
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
@0802F18C:
_0802F18C:
subs r4, 0x1
cmp r4, 0
bge @0802F170
@0802F192:
bge _0802F170
_0802F192:
subs r0, r6, 0x1
cmp r0, 0
ble @0802F1AA
ble _0802F1AA
ldr r1, =gDaysInEachMonth
adds r4, r0, 0
@0802F19C:
_0802F19C:
ldm r1!, {r0}
adds r0, r5, r0
lsls r0, 16
lsrs r5, r0, 16
subs r4, 0x1
cmp r4, 0
bne @0802F19C
@0802F1AA:
bne _0802F19C
_0802F1AA:
cmp r6, 0x2
bls @0802F1C2
bls _0802F1C2
adds r0, r7, 0
bl GameFreakRTC_IsLeapYear
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne @0802F1C2
bne _0802F1C2
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
@0802F1C2:
_0802F1C2:
mov r1, r8
adds r0, r5, r1
lsls r0, 16
@ -204,18 +204,18 @@ GameFreakRTC_Init: ; 802F21C
movs r0, 0xF
ands r0, r4
cmp r0, 0x1
beq @0802F250
beq _0802F250
movs r0, 0x1
strh r0, [r5]
b @0802F26E
b _0802F26E
.pool
@0802F250:
_0802F250:
movs r0, 0xF0
ands r0, r4
cmp r0, 0
beq @0802F25A
beq _0802F25A
movs r0, 0x2
@0802F25A:
_0802F25A:
strh r0, [r5]
ldr r4, =0x03000dc0
adds r0, r4, 0
@ -224,7 +224,7 @@ GameFreakRTC_Init: ; 802F21C
bl GameFreakRTC_TestForErrors
ldr r1, =0x03000db8
strh r0, [r1]
@0802F26E:
_0802F26E:
pop {r4,r5}
pop {r0}
bx r0
@ -251,17 +251,17 @@ GameFreakRTC_GetRTCDateTime: ; 802F288
lsls r0, 4
ands r0, r1
cmp r0, 0
beq @0802F2AC
beq _0802F2AC
adds r1, r2, 0
ldr r0, =gDefaultRTCInfo
ldm r0!, {r2-r4}
stm r1!, {r2-r4}
b @0802F2B2
b _0802F2B2
.pool
@0802F2AC:
_0802F2AC:
adds r0, r2, 0
bl GameFreakRTC_GetControlRegAndRTCDateTime
@0802F2B2:
_0802F2B2:
pop {r4}
pop {r0}
bx r0
@ -327,49 +327,49 @@ GameFreakRTC_TestForErrors: ; 802F2FC
movs r0, 0x40
ands r0, r1
cmp r0, 0
bne @0802F322
bne _0802F322
movs r0, 0x10
orrs r4, r0
@0802F322:
_0802F322:
ldrb r0, [r7]
bl GameFreakRTC_ConvertFromBCD
mov r8, r0
cmp r0, 0xFF
bne @0802F336
bne _0802F336
movs r0, 0x40
orrs r4, r0
lsls r0, r4, 16
lsrs r4, r0, 16
@0802F336:
_0802F336:
ldrb r0, [r7, 0x1]
bl GameFreakRTC_ConvertFromBCD
adds r6, r0, 0
cmp r6, 0xFF
beq @0802F34A
beq _0802F34A
cmp r6, 0
beq @0802F34A
beq _0802F34A
cmp r6, 0xC
ble @0802F352
@0802F34A:
ble _0802F352
_0802F34A:
movs r0, 0x80
orrs r4, r0
lsls r0, r4, 16
lsrs r4, r0, 16
@0802F352:
_0802F352:
ldrb r0, [r7, 0x2]
bl GameFreakRTC_ConvertFromBCD
adds r5, r0, 0
cmp r5, 0xFF
bne @0802F36A
bne _0802F36A
movs r1, 0x80
lsls r1, 1
adds r0, r1, 0
orrs r4, r0
lsls r0, r4, 16
lsrs r4, r0, 16
@0802F36A:
_0802F36A:
cmp r6, 0x2
bne @0802F384
bne _0802F384
mov r0, r8
bl GameFreakRTC_IsLeapYear
lsls r0, 24
@ -377,60 +377,60 @@ GameFreakRTC_TestForErrors: ; 802F2FC
ldr r1, =gDaysInEachMonth
ldr r1, [r1, 0x4]
adds r0, r1
b @0802F38E
b _0802F38E
.pool
@0802F384:
_0802F384:
ldr r0, =gDaysInEachMonth
subs r1, r6, 0x1
lsls r1, 2
adds r1, r0
ldr r0, [r1]
@0802F38E:
_0802F38E:
cmp r5, r0
ble @0802F39E
ble _0802F39E
movs r1, 0x80
lsls r1, 1
adds r0, r1, 0
orrs r4, r0
lsls r0, r4, 16
lsrs r4, r0, 16
@0802F39E:
_0802F39E:
ldrb r0, [r7, 0x4]
bl GameFreakRTC_ConvertFromBCD
adds r5, r0, 0
cmp r5, 0x18
ble @0802F3B6
ble _0802F3B6
movs r1, 0x80
lsls r1, 2
adds r0, r1, 0
orrs r4, r0
lsls r0, r4, 16
lsrs r4, r0, 16
@0802F3B6:
_0802F3B6:
ldrb r0, [r7, 0x5]
bl GameFreakRTC_ConvertFromBCD
adds r5, r0, 0
cmp r5, 0x3C
ble @0802F3CE
ble _0802F3CE
movs r1, 0x80
lsls r1, 3
adds r0, r1, 0
orrs r4, r0
lsls r0, r4, 16
lsrs r4, r0, 16
@0802F3CE:
_0802F3CE:
ldrb r0, [r7, 0x6]
bl GameFreakRTC_ConvertFromBCD
adds r5, r0, 0
cmp r5, 0x3C
ble @0802F3E6
ble _0802F3E6
movs r1, 0x80
lsls r1, 4
adds r0, r1, 0
orrs r4, r0
lsls r0, r4, 16
lsrs r4, r0, 16
@0802F3E6:
_0802F3E6:
adds r0, r4, 0
pop {r3}
mov r8, r3
@ -614,38 +614,38 @@ GameFreakRTC_GetRTCDelta: ; 802F504
movs r0, 0x4
ldrsb r0, [r7, r0]
cmp r0, 0
bge @0802F556
bge _0802F556
adds r0, r1, 0
adds r0, 0x3C
strb r0, [r7, 0x4]
ldrb r0, [r7, 0x3]
subs r0, 0x1
strb r0, [r7, 0x3]
@0802F556:
_0802F556:
ldrb r1, [r7, 0x3]
movs r0, 0x3
ldrsb r0, [r7, r0]
cmp r0, 0
bge @0802F56C
bge _0802F56C
adds r0, r1, 0
adds r0, 0x3C
strb r0, [r7, 0x3]
ldrb r0, [r7, 0x2]
subs r0, 0x1
strb r0, [r7, 0x2]
@0802F56C:
_0802F56C:
ldrb r1, [r7, 0x2]
movs r0, 0x2
ldrsb r0, [r7, r0]
cmp r0, 0
bge @0802F582
bge _0802F582
adds r0, r1, 0
adds r0, 0x18
strb r0, [r7, 0x2]
ldrh r0, [r7]
subs r0, 0x1
strh r0, [r7]
@0802F582:
_0802F582:
pop {r4-r7}
pop {r0}
bx r0
@ -731,37 +731,37 @@ GameFreakRTC_GetDelta: ; 802F5FC
strh r0, [r4]
lsls r0, r5, 24
cmp r0, 0
bge @0802F630
bge _0802F630
adds r0, r5, 0
adds r0, 0x3C
strb r0, [r4, 0x4]
subs r0, r6, 0x1
strb r0, [r4, 0x3]
@0802F630:
_0802F630:
ldrb r1, [r4, 0x3]
movs r0, 0x3
ldrsb r0, [r4, r0]
cmp r0, 0
bge @0802F646
bge _0802F646
adds r0, r1, 0
adds r0, 0x3C
strb r0, [r4, 0x3]
ldrb r0, [r4, 0x2]
subs r0, 0x1
strb r0, [r4, 0x2]
@0802F646:
_0802F646:
ldrb r1, [r4, 0x2]
movs r0, 0x2
ldrsb r0, [r4, r0]
cmp r0, 0
bge @0802F65C
bge _0802F65C
adds r0, r1, 0
adds r0, 0x18
strb r0, [r4, 0x2]
ldrh r0, [r4]
subs r0, 0x1
strh r0, [r4]
@0802F65C:
_0802F65C:
pop {r4-r6}
pop {r0}
bx r0

File diff suppressed because it is too large Load Diff

View File

@ -6,7 +6,7 @@ clear_tasks: ; 80A8F50
ldr r6, =0x03005e00
adds r7, r6, 0
adds r7, 0x8
@080A8F5A:
_080A8F5A:
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@ -30,7 +30,7 @@ clear_tasks: ; 80A8F50
lsls r4, 24
lsrs r4, 24
cmp r4, 0xF
bls @080A8F5A
bls _080A8F5A
ldr r0, =0x03005e00
movs r1, 0xFE
strb r1, [r0, 0x5]
@ -54,14 +54,14 @@ AddTask: ; 80A8FB0
lsrs r1, 24
movs r6, 0
ldr r7, =0x03005e00
@080A8FBC:
_080A8FBC:
lsls r0, r6, 2
adds r0, r6
lsls r5, r0, 3
adds r4, r5, r7
ldrb r0, [r4, 0x4]
cmp r0, 0
bne @080A8FF0
bne _080A8FF0
str r2, [r4]
strb r1, [r4, 0x7]
adds r0, r6, 0
@ -75,16 +75,16 @@ AddTask: ; 80A8FB0
movs r0, 0x1
strb r0, [r4, 0x4]
adds r0, r6, 0
b @080A8FFC
b _080A8FFC
.pool
@080A8FF0:
_080A8FF0:
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0xF
bls @080A8FBC
bls _080A8FBC
movs r0, 0
@080A8FFC:
_080A8FFC:
pop {r4-r7}
pop {r1}
bx r1
@ -102,7 +102,7 @@ insert_task_in_order_by_priority: ; 80A9004
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x10
bne @080A9034
bne _080A9034
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@ -112,9 +112,9 @@ insert_task_in_order_by_priority: ; 80A9004
strb r1, [r0, 0x5]
movs r1, 0xFF
strb r1, [r0, 0x6]
b @080A9090
b _080A9090
.pool
@080A9034:
_080A9034:
ldr r6, =0x03005e00
lsls r0, r4, 2
mov r12, r0
@ -122,7 +122,7 @@ insert_task_in_order_by_priority: ; 80A9004
adds r0, r4
lsls r0, 3
adds r2, r0, r6
@080A9042:
_080A9042:
lsls r0, r1, 2
adds r0, r1
lsls r5, r0, 3
@ -131,30 +131,30 @@ insert_task_in_order_by_priority: ; 80A9004
ldrb r0, [r2, 0x7]
ldrb r7, [r3, 0x7]
cmp r0, r7
bcs @080A9074
bcs _080A9074
ldrb r0, [r3, 0x5]
strb r0, [r2, 0x5]
strb r1, [r2, 0x6]
ldrb r0, [r3, 0x5]
cmp r0, 0xFE
beq @080A906C
beq _080A906C
adds r1, r0, 0
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
add r0, r8
strb r4, [r0, 0x6]
@080A906C:
_080A906C:
strb r4, [r3, 0x5]
b @080A9090
b _080A9090
.pool
@080A9074:
_080A9074:
ldrb r0, [r3, 0x6]
cmp r0, 0xFF
beq @080A907E
beq _080A907E
adds r1, r0, 0
b @080A9042
@080A907E:
b _080A9042
_080A907E:
mov r2, r12
adds r0, r2, r4
lsls r0, 3
@ -164,7 +164,7 @@ insert_task_in_order_by_priority: ; 80A9004
ldrb r1, [r2, 0x6]
strb r1, [r0, 0x6]
strb r4, [r2, 0x6]
@080A9090:
_080A9090:
pop {r3}
mov r8, r3
pop {r4-r7}
@ -185,28 +185,28 @@ remove_task: ; 80A909C
adds r2, r1, r4
ldrb r0, [r2, 0x4]
cmp r0, 0
beq @080A9106
beq _080A9106
movs r0, 0
strb r0, [r2, 0x4]
ldrb r3, [r2, 0x5]
cmp r3, 0xFE
bne @080A90D4
bne _080A90D4
ldrb r0, [r2, 0x6]
cmp r0, 0xFF
beq @080A9106
beq _080A9106
adds r1, r0, 0
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r4
strb r3, [r0, 0x5]
b @080A9106
b _080A9106
.pool
@080A90D4:
_080A90D4:
ldrb r3, [r2, 0x6]
adds r0, r3, 0
cmp r0, 0xFF
bne @080A90EC
bne _080A90EC
ldrb r0, [r2, 0x5]
lsls r1, r0, 2
adds r1, r0
@ -214,8 +214,8 @@ remove_task: ; 80A909C
adds r1, r4
movs r0, 0xFF
strb r0, [r1, 0x6]
b @080A9106
@080A90EC:
b _080A9106
_080A90EC:
ldrb r1, [r2, 0x5]
lsls r0, r1, 2
adds r0, r1
@ -229,7 +229,7 @@ remove_task: ; 80A909C
adds r0, r4
ldrb r1, [r2, 0x5]
strb r1, [r0, 0x5]
@080A9106:
_080A9106:
pop {r4}
pop {r0}
bx r0
@ -243,9 +243,9 @@ run_active_tasks: ; 80A910C
lsls r0, 24
lsrs r0, 24
cmp r0, 0x10
beq @080A9130
beq _080A9130
ldr r5, =0x03005e00
@080A911C:
_080A911C:
lsls r4, r0, 2
adds r4, r0
lsls r4, 3
@ -254,8 +254,8 @@ run_active_tasks: ; 80A910C
bl _call_via_r1
ldrb r0, [r4, 0x6]
cmp r0, 0xFF
bne @080A911C
@080A9130:
bne _080A911C
_080A9130:
pop {r4,r5}
pop {r0}
bx r0
@ -271,27 +271,27 @@ get_first_active_task: ; 80A913C
ldrb r1, [r0, 0x4]
adds r3, r0, 0
cmp r1, 0x1
bne @080A9150
bne _080A9150
ldrb r0, [r3, 0x5]
cmp r0, 0xFE
beq @080A916E
@080A9150:
beq _080A916E
_080A9150:
adds r0, r2, 0x1
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xF
bhi @080A916E
bhi _080A916E
lsls r0, r2, 2
adds r0, r2
lsls r0, 3
adds r1, r0, r3
ldrb r0, [r1, 0x4]
cmp r0, 0x1
bne @080A9150
bne _080A9150
ldrb r0, [r1, 0x5]
cmp r0, 0xFE
bne @080A9150
@080A916E:
bne _080A9150
_080A916E:
adds r0, r2, 0
pop {r1}
bx r1
@ -366,28 +366,28 @@ is_function_an_active_task: ; 80A91E4
adds r3, r0, 0
movs r2, 0
ldr r4, =0x03005e00
@080A91EC:
_080A91EC:
lsls r0, r2, 2
adds r0, r2
lsls r0, 3
adds r1, r0, r4
ldrb r0, [r1, 0x4]
cmp r0, 0x1
bne @080A9208
bne _080A9208
ldr r0, [r1]
cmp r0, r3
bne @080A9208
bne _080A9208
movs r0, 0x1
b @080A9214
b _080A9214
.pool
@080A9208:
_080A9208:
adds r0, r2, 0x1
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xF
bls @080A91EC
bls _080A91EC
movs r0, 0
@080A9214:
_080A9214:
pop {r4}
pop {r1}
bx r1
@ -400,24 +400,24 @@ get_task_id_by_function: ; 80A921C
adds r3, r0, 0
movs r2, 0
ldr r1, =0x03005e00
@080A9224:
_080A9224:
ldrb r0, [r1, 0x4]
cmp r0, 0x1
bne @080A923C
bne _080A923C
ldr r0, [r1]
cmp r0, r3
bne @080A923C
bne _080A923C
lsls r0, r2, 24
lsrs r0, 24
b @080A9246
b _080A9246
.pool
@080A923C:
_080A923C:
adds r1, 0x28
adds r2, 0x1
cmp r2, 0xF
ble @080A9224
ble _080A9224
movs r0, 0xFF
@080A9246:
_080A9246:
pop {r1}
bx r1
thumb_func_end get_task_id_by_function
@ -428,23 +428,23 @@ sub_80A924C: ; 80A924C
movs r2, 0
movs r1, 0
ldr r3, =0x03005e00
@080A9254:
_080A9254:
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r3
ldrb r0, [r0, 0x4]
cmp r0, 0x1
bne @080A9268
bne _080A9268
adds r0, r2, 0x1
lsls r0, 24
lsrs r2, r0, 24
@080A9268:
_080A9268:
adds r0, r1, 0x1
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0xF
bls @080A9254
bls _080A9254
adds r0, r2, 0
pop {r1}
bx r1
@ -460,7 +460,7 @@ set_word_task_arg: ; 80A927C
lsls r1, 24
lsrs r3, r1, 24
cmp r3, 0xE
bhi @080A92AA
bhi _080A92AA
ldr r2, =0x03005e00
lsls r0, r3, 1
lsls r1, r4, 2
@ -476,7 +476,7 @@ set_word_task_arg: ; 80A927C
adds r0, r2
lsrs r1, r5, 16
strh r1, [r0]
@080A92AA:
_080A92AA:
pop {r4,r5}
pop {r0}
bx r0
@ -491,10 +491,10 @@ get_word_task_arg: ; 80A92B4
lsls r1, 24
lsrs r1, 24
cmp r1, 0xE
bls @080A92C6
bls _080A92C6
movs r0, 0
b @080A92E8
@080A92C6:
b _080A92E8
_080A92C6:
ldr r3, =0x03005e00
lsls r0, r1, 1
lsls r2, r4, 2
@ -512,7 +512,7 @@ get_word_task_arg: ; 80A92B4
ldrsh r1, [r1, r2]
lsls r1, 16
orrs r0, r1
@080A92E8:
_080A92E8:
pop {r4}
pop {r1}
bx r1

File diff suppressed because it is too large Load Diff

View File

@ -28,7 +28,7 @@ sub_80A0980: ; 80A0980
ldr r3, =0x03000f34
ldrb r0, [r3]
cmp r0, 0x13
bhi @080A09C0
bhi _080A09C0
ldr r2, =0x02037624
adds r1, r0, 0
lsls r0, r1, 1
@ -52,7 +52,7 @@ sub_80A0980: ; 80A0980
ldrb r0, [r3]
adds r0, 0x1
strb r0, [r3]
@080A09C0:
_080A09C0:
pop {r4-r6}
pop {r0}
bx r0
@ -67,12 +67,12 @@ sub_80A09D0: ; 80A09D0
adds r6, r4, 0
ldrb r0, [r4]
cmp r3, r0
bge @080A0A02
bge _080A0A02
ldr r2, =0x040000d4
ldr r1, =0x02037624
movs r5, 0x80
lsls r5, 24
@080A09E6:
_080A09E6:
ldr r0, [r1]
str r0, [r2]
ldr r0, [r1, 0x4]
@ -86,8 +86,8 @@ sub_80A09D0: ; 80A09D0
adds r3, 0x1
ldrb r0, [r4]
cmp r3, r0
blt @080A09E6
@080A0A02:
blt _080A09E6
_080A0A02:
movs r0, 0
strb r0, [r6]
pop {r4-r6}
@ -127,10 +127,10 @@ sub_80A0A38: ; 80A0A38
lsrs r0, 16
ldrh r1, [r1]
cmp r0, r1
bcc @080A0A56
bcc _080A0A56
movs r0, 0
strh r0, [r2]
@080A0A56:
_080A0A56:
ldr r4, =0x03000f3a
ldrh r0, [r4]
adds r0, 0x1
@ -140,24 +140,24 @@ sub_80A0A38: ; 80A0A38
lsrs r0, 16
ldrh r1, [r1]
cmp r0, r1
bcc @080A0A6E
bcc _080A0A6E
movs r0, 0
strh r0, [r4]
@080A0A6E:
_080A0A6E:
ldr r0, =0x03000f40
ldr r1, [r0]
cmp r1, 0
beq @080A0A7C
beq _080A0A7C
ldrh r0, [r2]
bl _call_via_r1
@080A0A7C:
_080A0A7C:
ldr r0, =0x03000f44
ldr r1, [r0]
cmp r1, 0
beq @080A0A8A
beq _080A0A8A
ldrh r0, [r4]
bl _call_via_r1
@080A0A8A:
_080A0A8A:
pop {r4}
pop {r0}
bx r0
@ -179,12 +179,12 @@ cur_mapheader_run_tileset1_func: ; 80A0AA8
ldr r0, [r0]
ldr r0, [r0, 0x10]
cmp r0, 0
beq @080A0ACE
beq _080A0ACE
ldr r0, [r0, 0x14]
cmp r0, 0
beq @080A0ACE
beq _080A0ACE
bl _call_via_r0
@080A0ACE:
_080A0ACE:
pop {r0}
bx r0
.pool
@ -205,12 +205,12 @@ cur_mapheader_run_tileset2_func: ; 80A0AE4
ldr r0, [r0]
ldr r0, [r0, 0x14]
cmp r0, 0
beq @080A0B0A
beq _080A0B0A
ldr r0, [r0, 0x14]
cmp r0, 0
beq @080A0B0A
beq _080A0B0A
bl _call_via_r0
@080A0B0A:
_080A0B0A:
pop {r0}
bx r0
.pool
@ -259,30 +259,30 @@ sub_80A0B70: ; 80A0B70
ands r0, r5
lsrs r4, r0, 16
cmp r4, 0
bne @080A0B86
bne _080A0B86
lsrs r0, r5, 20
bl sub_80A0BCC
@080A0B86:
_080A0B86:
cmp r4, 0x1
bne @080A0B90
bne _080A0B90
lsrs r0, r5, 20
bl sub_80A0BF4
@080A0B90:
_080A0B90:
cmp r4, 0x2
bne @080A0B9A
bne _080A0B9A
lsrs r0, r5, 20
bl sub_80A0C1C
@080A0B9A:
_080A0B9A:
cmp r4, 0x3
bne @080A0BA4
bne _080A0BA4
lsrs r0, r5, 20
bl sub_80A0C44
@080A0BA4:
_080A0BA4:
cmp r4, 0x4
bne @080A0BAE
bne _080A0BAE
lsrs r0, r5, 20
bl sub_80A12AC
@080A0BAE:
_080A0BAE:
pop {r4,r5}
pop {r0}
bx r0
@ -296,10 +296,10 @@ sub_80A0BB4: ; 80A0BB4
lsls r0, 11
ands r0, r1
cmp r0, 0
bne @080A0BC8
bne _080A0BC8
lsrs r0, r1, 19
bl sub_80A1688
@080A0BC8:
_080A0BC8:
pop {r0}
bx r0
thumb_func_end sub_80A0BB4
@ -758,56 +758,56 @@ sub_80A103C: ; 80A103C
ands r0, r5
lsrs r6, r0, 16
cmp r6, 0
bne @080A105C
bne _080A105C
lsrs r4, r5, 19
adds r0, r4, 0
movs r1, 0
bl sub_80A1434
adds r0, r4, 0
bl sub_80A1470
@080A105C:
_080A105C:
cmp r6, 0x1
bne @080A1068
bne _080A1068
lsrs r0, r5, 19
movs r1, 0x1
bl sub_80A1434
@080A1068:
_080A1068:
cmp r6, 0x2
bne @080A1074
bne _080A1074
lsrs r0, r5, 19
movs r1, 0x2
bl sub_80A1434
@080A1074:
_080A1074:
cmp r6, 0x3
bne @080A1080
bne _080A1080
lsrs r0, r5, 19
movs r1, 0x3
bl sub_80A1434
@080A1080:
_080A1080:
cmp r6, 0x4
bne @080A108C
bne _080A108C
lsrs r0, r5, 19
movs r1, 0x4
bl sub_80A1434
@080A108C:
_080A108C:
cmp r6, 0x5
bne @080A1098
bne _080A1098
lsrs r0, r5, 19
movs r1, 0x5
bl sub_80A1434
@080A1098:
_080A1098:
cmp r6, 0x6
bne @080A10A4
bne _080A10A4
lsrs r0, r5, 19
movs r1, 0x6
bl sub_80A1434
@080A10A4:
_080A10A4:
cmp r6, 0x7
bne @080A10B0
bne _080A10B0
lsrs r0, r5, 19
movs r1, 0x7
bl sub_80A1434
@080A10B0:
_080A10B0:
pop {r4-r6}
pop {r0}
bx r0
@ -821,10 +821,10 @@ sub_80A10B8: ; 80A10B8
lsls r0, 11
ands r0, r1
cmp r0, 0
bne @080A10CC
bne _080A10CC
lsrs r0, r1, 19
bl sub_80A1520
@080A10CC:
_080A10CC:
pop {r0}
bx r0
thumb_func_end sub_80A10B8
@ -837,10 +837,10 @@ sub_80A10D0: ; 80A10D0
lsls r0, 12
ands r0, r1
cmp r0, 0
bne @080A10E4
bne _080A10E4
lsrs r0, r1, 20
bl sub_80A1598
@080A10E4:
_080A10E4:
pop {r0}
bx r0
thumb_func_end sub_80A10D0
@ -854,53 +854,53 @@ sub_80A10E8: ; 80A10E8
ands r0, r4
lsrs r5, r0, 16
cmp r5, 0
bne @080A1100
bne _080A1100
lsrs r0, r4, 19
movs r1, 0
bl sub_80A1394
@080A1100:
_080A1100:
cmp r5, 0x1
bne @080A110C
bne _080A110C
lsrs r0, r4, 19
movs r1, 0x1
bl sub_80A1394
@080A110C:
_080A110C:
cmp r5, 0x2
bne @080A1118
bne _080A1118
lsrs r0, r4, 19
movs r1, 0x2
bl sub_80A1394
@080A1118:
_080A1118:
cmp r5, 0x3
bne @080A1124
bne _080A1124
lsrs r0, r4, 19
movs r1, 0x3
bl sub_80A1394
@080A1124:
_080A1124:
cmp r5, 0x4
bne @080A1130
bne _080A1130
lsrs r0, r4, 19
movs r1, 0x4
bl sub_80A1394
@080A1130:
_080A1130:
cmp r5, 0x5
bne @080A113C
bne _080A113C
lsrs r0, r4, 19
movs r1, 0x5
bl sub_80A1394
@080A113C:
_080A113C:
cmp r5, 0x6
bne @080A1148
bne _080A1148
lsrs r0, r4, 19
movs r1, 0x6
bl sub_80A1394
@080A1148:
_080A1148:
cmp r5, 0x7
bne @080A1154
bne _080A1154
lsrs r0, r4, 19
movs r1, 0x7
bl sub_80A1394
@080A1154:
_080A1154:
pop {r4,r5}
pop {r0}
bx r0
@ -915,17 +915,17 @@ sub_80A115C: ; 80A115C
ands r0, r4
lsrs r5, r0, 16
cmp r5, 0
bne @080A1176
bne _080A1176
lsrs r0, r4, 20
lsls r0, 24
lsrs r0, 24
bl sub_80A12D4
@080A1176:
_080A1176:
cmp r5, 0x1
bne @080A1180
bne _080A1180
lsrs r0, r4, 20
bl sub_80A1498
@080A1180:
_080A1180:
pop {r4,r5}
pop {r0}
bx r0
@ -940,53 +940,53 @@ sub_80A1188: ; 80A1188
ands r0, r4
lsrs r5, r0, 16
cmp r5, 0
bne @080A11A0
bne _080A11A0
lsrs r0, r4, 19
movs r1, 0
bl sub_80A14C0
@080A11A0:
_080A11A0:
cmp r5, 0x1
bne @080A11AC
bne _080A11AC
lsrs r0, r4, 19
movs r1, 0x1
bl sub_80A14C0
@080A11AC:
_080A11AC:
cmp r5, 0x2
bne @080A11B8
bne _080A11B8
lsrs r0, r4, 19
movs r1, 0x2
bl sub_80A14C0
@080A11B8:
_080A11B8:
cmp r5, 0x3
bne @080A11C4
bne _080A11C4
lsrs r0, r4, 19
movs r1, 0x3
bl sub_80A14C0
@080A11C4:
_080A11C4:
cmp r5, 0x4
bne @080A11D0
bne _080A11D0
lsrs r0, r4, 19
movs r1, 0x4
bl sub_80A14C0
@080A11D0:
_080A11D0:
cmp r5, 0x5
bne @080A11DC
bne _080A11DC
lsrs r0, r4, 19
movs r1, 0x5
bl sub_80A14C0
@080A11DC:
_080A11DC:
cmp r5, 0x6
bne @080A11E8
bne _080A11E8
lsrs r0, r4, 19
movs r1, 0x6
bl sub_80A14C0
@080A11E8:
_080A11E8:
cmp r5, 0x7
bne @080A11F4
bne _080A11F4
lsrs r0, r4, 19
movs r1, 0x7
bl sub_80A14C0
@080A11F4:
_080A11F4:
pop {r4,r5}
pop {r0}
bx r0
@ -1001,19 +1001,19 @@ sub_80A11FC: ; 80A11FC
ands r0, r4
lsrs r5, r0, 16
cmp r5, 0
bne @080A1216
bne _080A1216
lsrs r0, r4, 20
lsls r0, 24
lsrs r0, 24
bl sub_80A131C
@080A1216:
_080A1216:
cmp r5, 0x1
bne @080A1224
bne _080A1224
lsrs r0, r4, 20
lsls r0, 24
lsrs r0, 24
bl sub_80A136C
@080A1224:
_080A1224:
pop {r4,r5}
pop {r0}
bx r0
@ -1027,10 +1027,10 @@ sub_80A122C: ; 80A122C
lsls r0, 12
ands r0, r1
cmp r0, 0
bne @080A1240
bne _080A1240
lsrs r0, r1, 20
bl sub_80A1798
@080A1240:
_080A1240:
pop {r0}
bx r0
thumb_func_end sub_80A122C
@ -1043,12 +1043,12 @@ sub_80A1244: ; 80A1244
lsls r0, 12
ands r0, r1
cmp r0, 0
bne @080A125C
bne _080A125C
lsrs r0, r1, 20
lsls r0, 24
lsrs r0, 24
bl sub_80A1344
@080A125C:
_080A125C:
pop {r0}
bx r0
thumb_func_end sub_80A1244
@ -1062,10 +1062,10 @@ sub_80A1260: ; 80A1260
ands r0, r1
lsrs r0, 16
cmp r0, 0x1
bne @080A1276
bne _080A1276
lsrs r0, r1, 20
bl sub_80A14F8
@080A1276:
_080A1276:
pop {r0}
bx r0
thumb_func_end sub_80A1260
@ -1078,10 +1078,10 @@ sub_80A127C: ; 80A127C
lsls r0, 11
ands r0, r1
cmp r0, 0
bne @080A1290
bne _080A1290
lsrs r0, r1, 19
bl sub_80A1548
@080A1290:
_080A1290:
pop {r0}
bx r0
thumb_func_end sub_80A127C
@ -1094,10 +1094,10 @@ sub_80A1294: ; 80A1294
lsls r0, 11
ands r0, r1
cmp r0, 0
bne @080A12A8
bne _080A12A8
lsrs r0, r1, 19
bl sub_80A1570
@080A12A8:
_080A12A8:
pop {r0}
bx r0
thumb_func_end sub_80A1294
@ -1224,7 +1224,7 @@ sub_80A1394: ; 80A1394
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0xB
bhi @080A13F0
bhi _080A13F0
adds r0, r5, 0
movs r1, 0xC
bl __umodsi3
@ -1248,9 +1248,9 @@ sub_80A1394: ; 80A1394
ldr r1, [r5]
movs r2, 0x80
bl sub_80A0980
b @080A141C
b _080A141C
.pool
@080A13F0:
_080A13F0:
movs r0, 0x3
ands r5, r0
ldr r0, =gUnknown_085153E4
@ -1271,7 +1271,7 @@ sub_80A1394: ; 80A1394
ldr r1, [r4]
movs r2, 0x80
bl sub_80A0980
@080A141C:
_080A141C:
pop {r4-r6}
pop {r0}
bx r0
@ -1295,7 +1295,7 @@ sub_80A1434: ; 80A1434
adds r1, r0
ldr r2, [r1]
cmp r2, 0
beq @080A1464
beq _080A1464
ldr r0, =gUnknown_08515804
lsls r1, r3, 2
adds r1, r0
@ -1303,7 +1303,7 @@ sub_80A1434: ; 80A1434
adds r0, r2, 0
movs r2, 0x80
bl sub_80A0980
@080A1464:
_080A1464:
pop {r0}
bx r0
.pool
@ -1477,10 +1477,10 @@ sub_80A15C0: ; 80A15C0
movs r1, 0x1
ands r0, r1
cmp r0, 0
bne @080A15D4
bne _080A15D4
lsrs r0, r2, 17
bl sub_80A1748
@080A15D4:
_080A15D4:
pop {r0}
bx r0
thumb_func_end sub_80A15C0
@ -1493,10 +1493,10 @@ sub_80A15D8: ; 80A15D8
lsls r0, 11
ands r0, r1
cmp r0, 0
bne @080A15EC
bne _080A15EC
lsrs r0, r1, 19
bl sub_80A16B0
@080A15EC:
_080A15EC:
pop {r0}
bx r0
thumb_func_end sub_80A15D8
@ -1510,17 +1510,17 @@ sub_80A15F0: ; 80A15F0
movs r0, 0x3F
ands r0, r5
cmp r0, 0x1
bne @080A1606
bne _080A1606
lsrs r0, r4, 22
bl sub_80A1720
@080A1606:
_080A1606:
movs r0, 0x7
ands r0, r5
cmp r0, 0x1
bne @080A1614
bne _080A1614
lsrs r0, r4, 19
bl sub_80A16F8
@080A1614:
_080A1614:
pop {r4,r5}
pop {r0}
bx r0
@ -1534,10 +1534,10 @@ sub_80A161C: ; 80A161C
lsls r0, 10
ands r0, r1
cmp r0, 0
bne @080A1630
bne _080A1630
lsrs r0, r1, 18
bl sub_80A1770
@080A1630:
_080A1630:
pop {r0}
bx r0
thumb_func_end sub_80A161C
@ -1550,13 +1550,13 @@ sub_80A1634: ; 80A1634
lsls r0, 11
ands r0, r4
cmp r0, 0
bne @080A1650
bne _080A1650
lsrs r4, 19
adds r0, r4, 0
bl sub_80A17C0
adds r0, r4, 0
bl sub_80A17EC
@080A1650:
_080A1650:
pop {r4}
pop {r0}
bx r0
@ -1570,10 +1570,10 @@ sub_80A1658: ; 80A1658
lsls r0, 10
ands r0, r1
cmp r0, 0
bne @080A166C
bne _080A166C
lsrs r0, r1, 18
bl sub_80A1818
@080A166C:
_080A166C:
pop {r0}
bx r0
thumb_func_end sub_80A1658
@ -1586,10 +1586,10 @@ sub_80A1670: ; 80A1670
lsls r0, 10
ands r0, r1
cmp r0, 0
bne @080A1684
bne _080A1684
lsrs r0, r1, 18
bl sub_80A1884
@080A1684:
_080A1684:
pop {r0}
bx r0
thumb_func_end sub_80A1670
@ -1812,14 +1812,14 @@ sub_80A1818: ; 80A1818
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
beq @080A1862
beq _080A1862
ldr r1, =0x03000f44
ldr r0, =sub_80A1670
str r0, [r1]
ldr r1, =0x03000f3c
movs r0, 0x20
strh r0, [r1]
@080A1862:
_080A1862:
pop {r0}
bx r0
.pool
@ -1844,7 +1844,7 @@ sub_80A1884: ; 80A1884
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
bne @080A18D6
bne _080A18D6
ldr r0, =0x02037fd4
ldrh r2, [r0, 0x4]
lsls r2, 21
@ -1862,10 +1862,10 @@ sub_80A1884: ; 80A1884
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0
bne @080A18D6
bne _080A18D6
ldr r0, =0x03000f44
str r1, [r0]
@080A18D6:
_080A18D6:
pop {r0}
bx r0
.pool

File diff suppressed because it is too large Load Diff