more ruby/sapphire code differences

This commit is contained in:
YamaArashi
2016-07-02 15:33:49 -07:00
parent 272c484250
commit a8af58d3bb
3 changed files with 33 additions and 5 deletions

View File

@@ -2429,7 +2429,11 @@ sub_8053F0C: @ 8053F0C
.endif
cmp r5, r0
beq _08053F4E
.ifdef SAPPHIRE
subs r0, 0x20
.else
subs r0, 0x21
.endif
cmp r4, r0
beq _08053F7C
ldr r6, _08053F70

View File

@@ -2369,7 +2369,11 @@ _0807C050:
orrs r1, r0
ldr r0, _0807C06C
strh r1, [r0]
.ifdef SAPPHIRE
strh r1, [r0, 0x34]
.else
strh r1, [r0, 0x2A]
.endif
_0807C064:
adds r0, r4, 0x4
strh r0, [r3, 0x20]
@@ -2380,7 +2384,11 @@ _0807C070:
ldr r1, _0807C084
movs r0, 0
strh r0, [r1]
.ifdef SAPPHIRE
strh r0, [r1, 0x34]
.else
strh r0, [r1, 0x2A]
.endif
adds r0, r3, 0
bl DestroySprite
_0807C07E:
@@ -351423,8 +351431,8 @@ sub_81260EC: @ 81260EC
pop {r0}
bx r0
.align 2, 0
_08126114: .4byte gUnknown_081DCAF4
_08126118: .4byte 0x081DCB38
_08126114: .4byte gScriptFuncs
_08126118: .4byte gScriptFuncs_End
thumb_func_end sub_81260EC
thumb_func_start sub_812611C

View File

@@ -752,6 +752,22 @@ gUnknown_081DA01C: @ 81DA01C
gUnknown_081DC118: @ 81DC118
.incbin "baserom.gba", 0x001dc118, 0x9dc
.global gUnknown_081DCAF4
gUnknown_081DCAF4: @ 81DCAF4
.incbin "baserom.gba", 0x001dcaf4, 0x44
gScriptFuncs:: @ 81DCAF4
.4byte sub_81263D0
.4byte sub_8126380
.4byte script_status_stop_and_ret_1
.4byte sub_81263E4
.4byte sub_81263D4
.4byte sub_812641C
.4byte sub_8126524
.4byte sub_8126438
.4byte sub_81264F0
.4byte sub_812658C
.4byte sub_81265B0
.4byte sub_81265DC
.4byte sub_8126608
.4byte sub_8126714
.4byte sub_8126754
.4byte sub_8126778
.4byte sub_81267C0
gScriptFuncs_End::