diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/arm_func.s | 10 | ||||
| -rw-r--r-- | asm/code.s | 9 | ||||
| -rw-r--r-- | asm/code_809017C.s | 2 |
3 files changed, 7 insertions, 14 deletions
diff --git a/asm/arm_func.s b/asm/arm_func.s index 4fd4543..a84435f 100644 --- a/asm/arm_func.s +++ b/asm/arm_func.s @@ -8,18 +8,18 @@ arm_func_start sub_80001E8 sub_80001E8: stmdb sp!, {r4-r11} - mov r12, 0x4000000 + mov r12, 0x4000000 @ REG_BASE ldr r11, _08000224 add r10, r11, 0x40 mov r9, 0x1 mov r8, 0 - strb r8, [r12, 0x208] + strb r8, [r12, 0x208] @ REG_IME ldmia r10, {r0-r7} stmia r10!, {r4-r7} stmia r10!, {r0-r3} ldr r0, [r11, 0x4] str r8, [r11, 0x4] - strb r9, [r12, 0x208] + strb r9, [r12, 0x208] @ REG_IME ldmia sp!, {r4-r11} bx lr .align 2, 0 @@ -29,7 +29,7 @@ _08000224: .4byte gUnknown_202DCF8 arm_func_start sub_8000228 sub_8000228: mov r12, 0x4000000 - add r12, r12, 0x120 + add r12, r12, 0x120 @ REG_SIODATA32 ldmia r12, {r0,r1} stmdb sp!, {r7-r11} ldr r11, _08000340 @@ -92,7 +92,7 @@ _080002F4: ldrb r0, [r11] cmp r0, 0 beq _08000334 - ldr r7, _08000344 + ldr r7, _08000344 @ REG_TM3CNT_H mov r0, 0 strh r0, [r7] ldrh r0, [r12, 0x8] @@ -5,18 +5,11 @@ .text + @ Unused thumb_func_start sub_80001DC sub_80001DC: mov r0, sp bx lr thumb_func_end sub_80001DC - thumb_func_start sub_80001E0 -sub_80001E0: - ldr r0, _080001E4 - bx lr - .align 2, 0 -_080001E4: .4byte gUnknown_3004000 - thumb_func_end sub_80001E0 - .align 2, 0 @ Don't pad with nop. diff --git a/asm/code_809017C.s b/asm/code_809017C.s index 26cdabc..6c2d1ef 100644 --- a/asm/code_809017C.s +++ b/asm/code_809017C.s @@ -4476,7 +4476,7 @@ sub_80921A8: ldr r0, [r0] bx lr .align 2, 0 -_080921B4: .4byte gUnknown_810B44C +_080921B4: .4byte gRescueTeamRanks thumb_func_end sub_80921A8 thumb_func_start sub_80921B8 |