main.c common syms
This commit is contained in:
+1
-1
@@ -366,7 +366,7 @@ sub_8034EFC: @ 8034EFC
|
||||
movs r0, 0
|
||||
strh r0, [r1]
|
||||
lsls r1, r5, 3
|
||||
ldr r2, =gUnknown_030022F8
|
||||
ldr r2, =gMain+0x38
|
||||
mov r9, r2
|
||||
add r1, r9
|
||||
mov r0, r8
|
||||
|
||||
@@ -252,7 +252,7 @@ _0815226C:
|
||||
ldrb r2, [r2]
|
||||
cmp r3, r2
|
||||
bcs _08152292
|
||||
ldr r0, =gUnknown_030024F8
|
||||
ldr r0, =gMain+0x238
|
||||
mov r12, r0
|
||||
ldr r4, =gDummyOamData
|
||||
adds r2, r5, 0
|
||||
@@ -350,7 +350,7 @@ _08152322:
|
||||
cmp r0, 0
|
||||
beq _08152348
|
||||
lsls r0, r6, 3
|
||||
ldr r1, =gUnknown_030024F8
|
||||
ldr r1, =gMain+0x238
|
||||
adds r0, r1
|
||||
ldr r1, =gDummyOamData
|
||||
ldm r1!, {r2,r3}
|
||||
@@ -412,7 +412,7 @@ _08152348:
|
||||
orrs r0, r1
|
||||
strh r0, [r2, 0x4]
|
||||
lsls r1, r6, 3
|
||||
ldr r2, =gUnknown_030024F8
|
||||
ldr r2, =gMain+0x238
|
||||
ldr r0, [r4, 0x4]
|
||||
adds r1, r2
|
||||
adds r0, r5, r0
|
||||
@@ -746,7 +746,7 @@ _081525FC:
|
||||
orrs r0, r2
|
||||
strb r0, [r1, 0x19]
|
||||
lsls r1, r5, 3
|
||||
ldr r0, =gUnknown_030024F8
|
||||
ldr r0, =gMain+0x238
|
||||
adds r1, r0
|
||||
ldr r0, =gDummyOamData
|
||||
ldm r0!, {r2,r3}
|
||||
|
||||
+1
-1
@@ -3426,7 +3426,7 @@ HandleLinkConnection: @ 800B40C
|
||||
bl sub_800B638
|
||||
ldr r4, =gUnknown_030030E0
|
||||
str r0, [r4]
|
||||
ldr r0, =gUnknown_030022EC
|
||||
ldr r0, =gMain+0x2c
|
||||
bl sub_80099E0
|
||||
ldr r0, [r4]
|
||||
movs r1, 0x80
|
||||
|
||||
+5
-5
@@ -3180,7 +3180,7 @@ CB2_NewGame: @ 8085EF8
|
||||
ldr r1, =gUnknown_03005DB0
|
||||
movs r0, 0
|
||||
str r0, [r1]
|
||||
ldr r0, =gUnknown_030026F8
|
||||
ldr r0, =gMain+0x438
|
||||
bl do_load_map_stuff_loop
|
||||
bl SetFieldVBlankCallback
|
||||
ldr r0, =c1_overworld
|
||||
@@ -3255,7 +3255,7 @@ c2_load_new_map: @ 8085FCC
|
||||
thumb_func_start c2_load_new_map_2
|
||||
c2_load_new_map_2: @ 8085FFC
|
||||
push {lr}
|
||||
ldr r0, =gUnknown_030026F8
|
||||
ldr r0, =gMain+0x438
|
||||
bl do_load_map_stuff_loop
|
||||
bl SetFieldVBlankCallback
|
||||
ldr r0, =c1_overworld
|
||||
@@ -3317,7 +3317,7 @@ sub_8086074: @ 8086074
|
||||
thumb_func_start c2_80567AC
|
||||
c2_80567AC: @ 8086098
|
||||
push {lr}
|
||||
ldr r0, =gUnknown_030026F8
|
||||
ldr r0, =gMain+0x438
|
||||
bl map_loading_iteration_3
|
||||
cmp r0, 0
|
||||
beq _080860B8
|
||||
@@ -3356,7 +3356,7 @@ _080860EA:
|
||||
thumb_func_start c2_exit_to_overworld_2_local
|
||||
c2_exit_to_overworld_2_local: @ 80860F4
|
||||
push {lr}
|
||||
ldr r0, =gUnknown_030026F8
|
||||
ldr r0, =gMain+0x438
|
||||
bl sub_8086638
|
||||
cmp r0, 0
|
||||
beq _0808610A
|
||||
@@ -3375,7 +3375,7 @@ c2_exit_to_overworld_2_link: @ 8086118
|
||||
bl sub_8087598
|
||||
cmp r0, 0
|
||||
bne _08086132
|
||||
ldr r0, =gUnknown_030026F8
|
||||
ldr r0, =gMain+0x438
|
||||
bl map_loading_iteration_2_link
|
||||
cmp r0, 0
|
||||
beq _08086132
|
||||
|
||||
+1
-1
@@ -1615,7 +1615,7 @@ _080A0506:
|
||||
thumb_func_start sub_80A0514
|
||||
sub_80A0514: @ 80A0514
|
||||
push {lr}
|
||||
ldr r0, =gUnknown_030026F8
|
||||
ldr r0, =gMain+0x438
|
||||
bl sub_80A03E4
|
||||
cmp r0, 0
|
||||
beq _080A052E
|
||||
|
||||
Reference in New Issue
Block a user