diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-17 14:45:36 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-06-17 14:45:36 -0700 |
| commit | 723b0f247b0a61671dfec34a873e7c26632f4c03 (patch) | |
| tree | 50c220e209c8eedeec135af2ffe871d86478eb4a /asm/rom5.s | |
| parent | 852e2fd5385467a2d7f3c02d77d322a9b88201e9 (diff) | |
account for differences in Sapphire's code
Diffstat (limited to 'asm/rom5.s')
| -rw-r--r-- | asm/rom5.s | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index e1d7c1da0..e33cc2fca 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -3268,14 +3268,21 @@ sub_807C7E4: @ 807C7E4 ands r0, r1 cmp r0, 0 bne _0807C80C + .ifdef SAPPHIRE + mov r0, sp + strh r2, [r0] + .else lsls r1, r2, 10 mov r0, sp strh r1, [r0] + .endif b _0807C816 _0807C80C: movs r0, 0x1F subs r0, r2 + .ifndef SAPPHIRE lsls r0, 10 + .endif mov r1, sp strh r0, [r1] _0807C816: @@ -308261,8 +308268,13 @@ sub_8110908: @ 8110908 push {r6,r7} lsls r0, 16 lsrs r7, r0, 16 + .ifdef SAPPHIRE + ldr r0, _sub_8110908_Latias + .else + @ Latios movs r0, 0xCC lsls r0, 1 + .endif cmp r7, r0 bne _0811091E b _08110A44 @@ -308323,6 +308335,9 @@ _08110960: beq _0811099A b _081109BA .align 2, 0 + .ifdef SAPPHIRE +_sub_8110908_Latias: .4byte 407 + .endif _08110988: .4byte 0x02000000 _0811098C: .4byte gUnknown_083F856C _08110990: .4byte gUnknown_083F856E @@ -351357,6 +351372,9 @@ sub_8126098: @ 8126098 cmp r2, 0 beq _081260C6 movs r0, 0x80 + .ifdef SAPPHIRE + lsls r0, 1 @ unknown difference + .endif ands r0, r4 cmp r0, 0 beq _081260C6 @@ -380940,8 +380958,12 @@ sub_8134240: @ 8134240 push {r6} sub sp, 0x10 ldr r5, _081342FC + .ifdef SAPPHIRE + ldr r6, _sub_8134240_Latias + .else movs r6, 0xCC lsls r6, 1 + .endif movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -381019,6 +381041,9 @@ sub_8134240: @ 8134240 bx r0 .align 2, 0 _081342FC: .4byte 0x030045c0 + .ifdef SAPPHIRE +_sub_8134240_Latias: .4byte 407 + .endif _08134300: .4byte 0x02028878 _08134304: .4byte 0x02039302 _08134308: .4byte gUnknown_08402E80 @@ -396619,9 +396644,14 @@ _0813BFDA: bl SetVBlankCallback movs r1, 0x80 lsls r1, 7 + .ifdef SAPPHIRE + movs r0, 0 + movs r2, 0x40 + .else movs r2, 0x80 lsls r2, 3 movs r0, 0x1 + .endif movs r3, 0x10 bl sub_8148EC0 lsls r0, 24 |