diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-12 19:22:23 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-12 19:22:23 +0100 |
| commit | b5ea69cf74e24ab2b09572b3324ac4b3bbd8818a (patch) | |
| tree | cca355371fd2cdd9d9b6fd86c266a500837123a8 /asm | |
| parent | 734403fdfafd1dc4b738f98158dcec45bb01f58b (diff) | |
| parent | 54ad6794bce3ee534aa78a8c6e7f32715cd8f6a9 (diff) | |
Fix conflicts
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/field_screen.s | 2 | ||||
| -rw-r--r-- | asm/fldeff_80F9BCC.s | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/asm/field_screen.s b/asm/field_screen.s index c11aef1b4..8a97644ac 100644 --- a/asm/field_screen.s +++ b/asm/field_screen.s @@ -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 diff --git a/asm/fldeff_80F9BCC.s b/asm/fldeff_80F9BCC.s index 3cfbe215a..a361faa32 100644 --- a/asm/fldeff_80F9BCC.s +++ b/asm/fldeff_80F9BCC.s @@ -2262,8 +2262,8 @@ _080FAEA2: bx r0 thumb_func_end task50_overworld_poison_effect - 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 @@ -2273,7 +2273,7 @@ overworld_poison_effect: @ 80FAEA8 pop {r0} bx r0 .pool - thumb_func_end overworld_poison_effect + thumb_func_end FldeffPoison_Start thumb_func_start FieldPoisonEffectIsRunning FieldPoisonEffectIsRunning: @ 80FAEC0 |