Port many field_effect.c names from Emerald
This commit is contained in:
@@ -669,7 +669,7 @@ sub_805E2E8: @ 805E2E8
|
||||
bl GetCurrentMapType
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl is_light_level_1_2_3_5_or_6
|
||||
bl IsMapTypeOutdoors
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0805E37C
|
||||
|
||||
+448
-447
File diff suppressed because it is too large
Load Diff
+3
-3
@@ -2723,8 +2723,8 @@ _0807B0AC: .4byte gUnknown_2038684
|
||||
_0807B0B0: .4byte gUnknown_20386A4
|
||||
thumb_func_end sub_807B084
|
||||
|
||||
thumb_func_start sub_807B0B4
|
||||
sub_807B0B4: @ 807B0B4
|
||||
thumb_func_start ResetPreservedPalettesInWeather
|
||||
ResetPreservedPalettesInWeather: @ 807B0B4
|
||||
ldr r1, _0807B0BC @ =gUnknown_20386A4
|
||||
ldr r0, _0807B0C0 @ =gUnknown_83C2CC0
|
||||
str r0, [r1]
|
||||
@@ -2732,7 +2732,7 @@ sub_807B0B4: @ 807B0B4
|
||||
.align 2, 0
|
||||
_0807B0BC: .4byte gUnknown_20386A4
|
||||
_0807B0C0: .4byte gUnknown_83C2CC0
|
||||
thumb_func_end sub_807B0B4
|
||||
thumb_func_end ResetPreservedPalettesInWeather
|
||||
|
||||
thumb_func_start sub_807B0C4
|
||||
sub_807B0C4: @ 807B0C4
|
||||
|
||||
+10
-10
@@ -115,8 +115,8 @@ _08054C8A:
|
||||
_08054C9C: .4byte sWhiteOutMoneyLossBadgeFlagIDs
|
||||
thumb_func_end CountBadgesForOverworldWhiteOutLossCalculation
|
||||
|
||||
thumb_func_start sub_8054CA0
|
||||
sub_8054CA0: @ 8054CA0
|
||||
thumb_func_start Overworld_ResetStateAfterFly
|
||||
Overworld_ResetStateAfterFly: @ 8054CA0
|
||||
push {lr}
|
||||
bl ResetInitialPlayerAvatarState
|
||||
movs r0, 0x83
|
||||
@@ -152,7 +152,7 @@ _08054CF8: .4byte 0x00000805
|
||||
_08054CFC: .4byte 0x00000806
|
||||
_08054D00: .4byte 0x00000808
|
||||
_08054D04: .4byte 0x0000404d
|
||||
thumb_func_end sub_8054CA0
|
||||
thumb_func_end Overworld_ResetStateAfterFly
|
||||
|
||||
thumb_func_start Overworld_ResetStateAfterTeleport
|
||||
Overworld_ResetStateAfterTeleport: @ 8054D08
|
||||
@@ -1242,12 +1242,12 @@ sub_805550C: @ 805550C
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
adds r0, r4, 0
|
||||
bl is_light_level_1_2_3_5_or_6
|
||||
bl IsMapTypeOutdoors
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08055590
|
||||
adds r0, r5, 0
|
||||
bl is_light_level_1_2_3_5_or_6
|
||||
bl IsMapTypeOutdoors
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -1764,7 +1764,7 @@ sub_8055920: @ 8055920
|
||||
bl sub_8054F68
|
||||
ldr r0, _0805599C @ =gMapHeader
|
||||
ldrb r0, [r0, 0x17]
|
||||
bl is_light_level_1_2_3_5_or_6
|
||||
bl IsMapTypeOutdoors
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
@@ -1815,7 +1815,7 @@ sub_80559A8: @ 80559A8
|
||||
bl sub_8054F68
|
||||
ldr r0, _080559E0 @ =gMapHeader
|
||||
ldrb r0, [r0, 0x17]
|
||||
bl is_light_level_1_2_3_5_or_6
|
||||
bl IsMapTypeOutdoors
|
||||
bl TrySetMapSaveWarpStatus
|
||||
bl SetSav1WeatherFromCurrMapHeader
|
||||
bl sub_805610C
|
||||
@@ -2933,8 +2933,8 @@ sub_80561B4: @ 80561B4
|
||||
_080561D4: .4byte gUnknown_2031DB4
|
||||
thumb_func_end sub_80561B4
|
||||
|
||||
thumb_func_start is_light_level_1_2_3_5_or_6
|
||||
is_light_level_1_2_3_5_or_6: @ 80561D8
|
||||
thumb_func_start IsMapTypeOutdoors
|
||||
IsMapTypeOutdoors: @ 80561D8
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -2956,7 +2956,7 @@ _080561F6:
|
||||
_080561F8:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end is_light_level_1_2_3_5_or_6
|
||||
thumb_func_end IsMapTypeOutdoors
|
||||
|
||||
thumb_func_start Overworld_MapTypeAllowsTeleportAndFly
|
||||
Overworld_MapTypeAllowsTeleportAndFly: @ 80561FC
|
||||
|
||||
@@ -1801,7 +1801,7 @@ mapldr_0808C6D8: @ 808C6D8
|
||||
bl _call_via_r4
|
||||
adds r0, r5, 0
|
||||
bl SetVBlankCallback
|
||||
bl sub_807DC00
|
||||
bl FadeInFromBlack
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
|
||||
Reference in New Issue
Block a user