Further synchronisation

This commit is contained in:
Slawter666
2018-10-17 01:11:44 +01:00
parent 3aff112127
commit 1435c96b41
23 changed files with 158 additions and 155 deletions
+5 -5
View File
@@ -178,9 +178,9 @@ _0809C006:
bx r0
thumb_func_end FieldGetPlayerInput
thumb_func_start sub_809C014
@ int sub_809C014(overworld_input_data *input_data)
sub_809C014: @ 809C014
thumb_func_start ProcessPlayerFieldInput
@ int ProcessPlayerFieldInput(overworld_input_data *input_data)
ProcessPlayerFieldInput: @ 809C014
push {r4-r6,lr}
sub sp, 0x8
adds r5, r0, 0
@@ -348,7 +348,7 @@ _0809C172:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_809C014
thumb_func_end ProcessPlayerFieldInput
thumb_func_start player_get_pos_to_and_height
player_get_pos_to_and_height: @ 809C17C
@@ -1560,7 +1560,7 @@ overworld_poison_step: @ 809CB94
strh r1, [r0]
cmp r1, 0
bne _0809CBD4
bl overworld_poison
bl DoPoisonFieldEffect
cmp r0, 0x1
beq _0809CBD4
cmp r0, 0x1
+1 -1
View File
@@ -7851,7 +7851,7 @@ palette_bg_faded_fill_black: @ 80AF020
thumb_func_start pal_fill_for_maplights
pal_fill_for_maplights: @ 80AF040
push {r4,lr}
bl get_map_light_from_warp0
bl GetLastUsedWarpMapType
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
+8 -8
View File
@@ -2200,8 +2200,8 @@ _080FAE2A:
.pool
thumb_func_end sub_80FADE4
thumb_func_start task50_overworld_poison_effect
task50_overworld_poison_effect: @ 80FAE38
thumb_func_start task50_FldeffPoison_Start
task50_FldeffPoison_Start: @ 80FAE38
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -2260,25 +2260,25 @@ _080FAE92:
_080FAEA2:
pop {r0}
bx r0
thumb_func_end task50_overworld_poison_effect
thumb_func_end task50_FldeffPoison_Start
thumb_func_start overworld_poison_effect
overworld_poison_effect: @ 80FAEA8
thumb_func_start FldeffPoison_Start
FldeffPoison_Start: @ 80FAEA8
push {lr}
movs r0, 0x4F
bl PlaySE
ldr r0, =task50_overworld_poison_effect
ldr r0, =task50_FldeffPoison_Start
movs r1, 0x50
bl CreateTask
pop {r0}
bx r0
.pool
thumb_func_end overworld_poison_effect
thumb_func_end FldeffPoison_Start
thumb_func_start FieldPoisonEffectIsRunning
FieldPoisonEffectIsRunning: @ 80FAEC0
push {lr}
ldr r0, =task50_overworld_poison_effect
ldr r0, =task50_FldeffPoison_Start
bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24