dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Further synchronisation

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
asm/fldeff_80F9BCC.s
+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