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

decompile metatile behav

Browse Source
This commit is contained in:
DizzyEggg
2017-09-29 19:03:50 +02:00
parent 3c8091393c
commit f5387cf6b1
22 changed files with 1889 additions and 2745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
asm/battle_setup.s
View File

@@ -704,7 +704,7 @@ _080B0C64:
lsls r0, r5, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8089588
bl MetatileBehavior_IsMB_0B
lsls r0, 24
cmp r0, 0
beq _080B0C78
@@ -734,7 +734,7 @@ _080B0C9C:
lsls r0, r5, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_808962C
bl MetatileBehavior_IsDeepOrOceanWater
lsls r0, 24
cmp r0, 0
bne _080B0CF2
@@ -744,7 +744,7 @@ _080B0C9C:
cmp r0, 0
bne _080B0CE0
adds r0, r4, 0
bl sub_808959C
bl MetatileBehavior_IsMountain
lsls r0, 24
cmp r0, 0
beq _080B0CC8
@@ -757,7 +757,7 @@ _080B0CC8:
cmp r0, 0
beq _080B0CF6
adds r0, r4, 0
bl sub_80894D4
bl MetatileBehavior_GetBridgeSth
lsls r0, 24
cmp r0, 0
beq _080B0CE4
@@ -766,7 +766,7 @@ _080B0CE0:
b _080B0D1A
_080B0CE4:
adds r0, r4, 0
bl sub_80894AC
bl MetatileBehavior_IsBridge
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1

28
asm/decoration.s
View File

@@ -2222,7 +2222,7 @@ _08127C0A:
lsls r4, r0, 16
lsls r0, r4, 8
lsrs r0, 24
bl sub_80892D8
bl MetatileBehavior_IsMB_B9
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2257,7 +2257,7 @@ _08127C64:
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8089328
bl MetatileBehavior_IsMB_B7
lsls r0, 24
lsrs r0, 24
movs r6, 0x1
@@ -3189,7 +3189,7 @@ sub_8128484: @ 8128484
lsrs r0, 24
lsls r1, 16
lsrs r4, r1, 16
bl sub_80892C4
bl MetatileBehavior_IsMB_B3
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3257,7 +3257,7 @@ sub_81284F4: @ 81284F4
lsls r0, r6, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_80892C4
bl MetatileBehavior_IsMB_B3
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3266,7 +3266,7 @@ sub_81284F4: @ 81284F4
cmp r0, 0x21
bne _08128522
adds r0, r4, 0
bl sub_8089378
bl MetatileBehavior_IsMB_C2
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3274,7 +3274,7 @@ sub_81284F4: @ 81284F4
_08128522:
lsls r0, r6, 24
lsrs r0, 24
bl sub_8089314
bl MetatileBehavior_IsNormal
lsls r0, 24
cmp r0, 0
beq _08128534
@@ -3520,7 +3520,7 @@ _081286B8:
adds r5, r1, 0
ands r5, r0
adds r0, r4, 0
bl sub_8089314
bl MetatileBehavior_IsNormal
lsls r0, 24
cmp r0, 0
bne _08128724
@@ -3625,12 +3625,12 @@ _08128790:
adds r5, r1, 0
ands r5, r0
adds r0, r4, 0
bl sub_8089314
bl MetatileBehavior_IsNormal
lsls r0, 24
cmp r0, 0
bne _081287F2
adds r0, r4, 0
bl sub_8089328
bl MetatileBehavior_IsMB_B7
lsls r0, 24
cmp r0, 0
bne _081287F2
@@ -3707,7 +3707,7 @@ _08128868:
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8089328
bl MetatileBehavior_IsMB_B7
lsls r0, 24
cmp r0, 0
beq _0812890C
@@ -3772,7 +3772,7 @@ _081288D8:
bne _08128910
_08128900:
adds r0, r4, 0
bl sub_8089364
bl MetatileBehavior_IsMB_C3
lsls r0, 24
cmp r0, 0
bne _0812891C
@@ -3781,7 +3781,7 @@ _0812890C:
b _0812893E
_08128910:
adds r0, r4, 0
bl sub_8089350
bl MetatileBehavior_IsMB_B5
lsls r0, 24
cmp r0, 0
beq _08128900
@@ -6182,13 +6182,13 @@ _08129CA8:
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8089288
bl MetatileBehavior_IsSecretBasePC
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08129CDE
adds r0, r4, 0
bl sub_8089404
bl MetatileBehavior_IsMB_C5
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1

96
asm/field_control_avatar.s
View File

@@ -51,7 +51,7 @@ process_overworld_input: @ 809BF08
bl cur_mapdata_block_role_at_player_pos
lsls r0, 24
lsrs r0, 24
bl sub_808904C
bl MetatileBehavior_IsMoveTile
lsls r0, 24
lsrs r7, r0, 24
cmp r6, 0x2
@@ -831,7 +831,7 @@ _0809C55C:
.pool
_0809C574:
adds r0, r5, 0
bl is_tile_x8B
bl MetatileBehavior_IsClosedSootopolisGymDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -841,7 +841,7 @@ _0809C574:
.pool
_0809C58C:
adds r0, r5, 0
bl is_tile_xEA
bl MetatileBehavior_IsUnknownClosedDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -851,7 +851,7 @@ _0809C58C:
.pool
_0809C5A4:
adds r0, r5, 0
bl is_tile_x84
bl MetatileBehavior_IsCableBoxResults1
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -859,7 +859,7 @@ _0809C5A4:
b _0809C6E4
_0809C5B4:
adds r0, r5, 0
bl is_tile_x87
bl MetatileBehavior_IsPokeblockFeeder
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -869,7 +869,7 @@ _0809C5B4:
.pool
_0809C5CC:
adds r0, r5, 0
bl is_tile_x8C
bl MetatileBehavior_IsTrickHousePuzzleDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -879,7 +879,7 @@ _0809C5CC:
.pool
_0809C5E4:
adds r0, r5, 0
bl is_tile_x85
bl MetatileBehavior_IsRegionMap
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -889,7 +889,7 @@ _0809C5E4:
.pool
_0809C5FC:
adds r0, r5, 0
bl sub_8089A1C
bl MetatileBehavior_IsRunningShoesInstruction
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -899,7 +899,7 @@ _0809C5FC:
.pool
_0809C614:
adds r0, r5, 0
bl sub_8089A30
bl MetatileBehavior_IsPictureBookShelf
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -909,7 +909,7 @@ _0809C614:
.pool
_0809C62C:
adds r0, r5, 0
bl sub_8089A44
bl MetatileBehavior_IsBookShelf
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -919,7 +919,7 @@ _0809C62C:
.pool
_0809C644:
adds r0, r5, 0
bl sub_8089A58
bl MetatileBehavior_IsPokeCenterBookShelf
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -929,7 +929,7 @@ _0809C644:
.pool
_0809C65C:
adds r0, r5, 0
bl sub_8089A6C
bl MetatileBehavior_IsVase
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -939,7 +939,7 @@ _0809C65C:
.pool
_0809C674:
adds r0, r5, 0
bl sub_8089A80
bl MetatileBehavior_IsTrashCan
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -949,7 +949,7 @@ _0809C674:
.pool
_0809C68C:
adds r0, r5, 0
bl sub_8089A94
bl MetatileBehavior_IsShopShelf
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -959,7 +959,7 @@ _0809C68C:
.pool
_0809C6A4:
adds r0, r5, 0
bl sub_8089AA8
bl MetatileBehavior_IsBlueprint
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -970,7 +970,7 @@ _0809C6A4:
_0809C6BC:
adds r0, r5, 0
adds r1, r4, 0
bl sub_8089AD0
bl MetatileBehavior_IsPlayerFacingWirelessBoxResults
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -981,7 +981,7 @@ _0809C6BC:
_0809C6D4:
adds r0, r5, 0
adds r1, r4, 0
bl sub_8089AEC
bl MetatileBehavior_IsCableBoxResults2
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1023,7 +1023,7 @@ _0809C71C:
cmp r4, r0
bne _0809C7D0
adds r0, r5, 0
bl sub_8089288
bl MetatileBehavior_IsSecretBasePC
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1033,7 +1033,7 @@ _0809C71C:
.pool
_0809C74C:
adds r0, r5, 0
bl sub_808929C
bl MetatileBehavior_IsSecretBaseRegisterPC
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1043,7 +1043,7 @@ _0809C74C:
.pool
_0809C764:
adds r0, r5, 0
bl sub_80893DC
bl MetatileBehavior_IsMB_BF
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1053,7 +1053,7 @@ _0809C764:
.pool
_0809C77C:
adds r0, r5, 0
bl sub_80893F0
bl MetatileBehavior_IsSecretBaseTvOrShield
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1063,7 +1063,7 @@ _0809C77C:
.pool
_0809C794:
adds r0, r5, 0
bl sub_80892EC
bl MetatileBehavior_IsMB_C6
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1072,7 +1072,7 @@ _0809C794:
b _0809C7E2
_0809C7A8:
adds r0, r5, 0
bl sub_8089364
bl MetatileBehavior_IsMB_C3
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1081,7 +1081,7 @@ _0809C7A8:
b _0809C7E2
_0809C7BC:
adds r0, r5, 0
bl sub_8089350
bl MetatileBehavior_IsMB_B5
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1090,7 +1090,7 @@ _0809C7BC:
b _0809C7E2
_0809C7D0:
adds r0, r5, 0
bl sub_8089300
bl MetatileBehavior_IsSecretBasePoster
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1297,7 +1297,7 @@ sub_809C96C: @ 809C96C
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8089918
bl MetatileBehavior_IsCrackedFloorHole
lsls r0, 24
cmp r0, 0
beq _0809C988
@@ -1306,7 +1306,7 @@ sub_809C96C: @ 809C96C
.pool
_0809C988:
adds r0, r4, 0
bl sub_8089ABC
bl MetatileBehavior_IsBattlePyramidWarp
lsls r0, 24
cmp r0, 0
beq _0809C9A4
@@ -1318,7 +1318,7 @@ _0809C996:
.pool
_0809C9A4:
adds r0, r4, 0
bl sub_80893C8
bl MetatileBehavior_IsSecretBaseGlitterMat
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1327,7 +1327,7 @@ _0809C9A4:
b _0809C9E8
_0809C9B8:
adds r0, r4, 0
bl sub_80893B4
bl MetatileBehavior_IsSecretBaseSoundMat
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1376,7 +1376,7 @@ _0809CA04:
bne _0809CAF8
lsls r0, r4, 24
lsrs r0, 24
bl sub_808904C
bl MetatileBehavior_IsMoveTile
lsls r0, 24
cmp r0, 0
bne _0809CAF8
@@ -1719,7 +1719,7 @@ sub_809CC9C: @ 809CC9C
.pool
_0809CCF8:
adds r0, r4, 0
bl sub_8089870
bl MetatileBehavior_IsLavaridgeB1FWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1729,7 +1729,7 @@ _0809CCF8:
b _0809CD8C
_0809CD0E:
adds r0, r4, 0
bl is_role_x68
bl MetatileBehavior_IsLavaridge1FWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1749,7 +1749,7 @@ _0809CD24:
b _0809CD8C
_0809CD3A:
adds r0, r4, 0
bl sub_80898AC
bl MetatileBehavior_IsWarpOrBridge
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1759,7 +1759,7 @@ _0809CD3A:
b _0809CD8C
_0809CD50:
adds r0, r4, 0
bl sub_8089904
bl MetatileBehavior_IsMtPyreHole
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1771,7 +1771,7 @@ _0809CD50:
.pool
_0809CD6C:
adds r0, r4, 0
bl sub_80898C0
bl MetatileBehavior_IsMossdeepGymWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1797,7 +1797,7 @@ is_warp_tile: @ 809CD94
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl is_tile_x69_2_warp_door
bl MetatileBehavior_IsWarpDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1815,19 +1815,19 @@ is_warp_tile: @ 809CD94
cmp r0, 0x1
beq _0809CE2A
adds r0, r4, 0
bl sub_8088F58
bl MetatileBehavior_IsNonAnimDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0809CE2A
adds r0, r4, 0
bl sub_8089870
bl MetatileBehavior_IsLavaridgeB1FWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0809CE2A
adds r0, r4, 0
bl is_role_x68
bl MetatileBehavior_IsLavaridge1FWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1839,19 +1839,19 @@ is_warp_tile: @ 809CD94
cmp r0, 0x1
beq _0809CE2A
adds r0, r4, 0
bl sub_8089904
bl MetatileBehavior_IsMtPyreHole
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0809CE2A
adds r0, r4, 0
bl sub_80898C0
bl MetatileBehavior_IsMossdeepGymWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0809CE2A
adds r0, r4, 0
bl sub_80898AC
bl MetatileBehavior_IsWarpOrBridge
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2048,7 +2048,7 @@ map_warp_consider_2_to_inside: @ 809CF78
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8089210
bl MetatileBehavior_IsSecretBaseOpen
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2062,7 +2062,7 @@ map_warp_consider_2_to_inside: @ 809CF78
.pool
_0809CFB0:
adds r0, r4, 0
bl is_tile_x69_2_warp_door
bl MetatileBehavior_IsWarpDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2322,7 +2322,7 @@ dive_warp: @ 809D16C
bne _0809D1A4
lsls r0, r5, 24
lsrs r0, 24
bl sub_80895D0
bl MetatileBehavior_IsUnableToEmerge
lsls r0, 24
cmp r0, 0
bne _0809D1A4
@@ -2340,7 +2340,7 @@ dive_warp: @ 809D16C
_0809D1A4:
lsls r0, r5, 24
lsrs r0, 24
bl sub_80895B0
bl MetatileBehavior_IsDiveable
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2394,7 +2394,7 @@ sub_809D1E8: @ 809D1E8
cmp r0, 0x5
bne _0809D244
adds r0, r5, 0
bl sub_80895D0
bl MetatileBehavior_IsUnableToEmerge
lsls r0, 24
cmp r0, 0
bne _0809D244
@@ -2417,7 +2417,7 @@ sub_809D1E8: @ 809D1E8
.pool
_0809D244:
adds r0, r5, 0
bl sub_80895B0
bl MetatileBehavior_IsDiveable
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1

8
asm/field_door.s
View File

@@ -589,7 +589,7 @@ sub_808A854: @ 808A854
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8088EFC
bl MetatileBehavior_IsDoor
lsls r0, 24
cmp r0, 0
beq _0808A876
@@ -612,7 +612,7 @@ sub_808A880: @ 808A880
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8088EFC
bl MetatileBehavior_IsDoor
lsls r0, 24
cmp r0, 0
beq _0808A8A2
@@ -635,7 +635,7 @@ sub_808A8AC: @ 808A8AC
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8088EFC
bl MetatileBehavior_IsDoor
lsls r0, 24
cmp r0, 0
beq _0808A8D8
@@ -664,7 +664,7 @@ task_overworld_door_add_if_role_69_for_opening_door_at: @ 808A8E4
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8088EFC
bl MetatileBehavior_IsDoor
lsls r0, 24
cmp r0, 0
beq _0808A910

6
asm/field_effect_helpers.s
View File

@@ -130,13 +130,13 @@ npc_pal_op: @ 8153FAC
cmp r0, 0
bne _08154008
ldrb r0, [r5, 0x1F]
bl sub_80894D4
bl MetatileBehavior_GetBridgeSth
lsls r0, 24
lsrs r0, 24
cmp r0, 0
bne _08153FEE
ldrb r0, [r5, 0x1E]
bl sub_80894D4
bl MetatileBehavior_GetBridgeSth
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -702,7 +702,7 @@ _08154412:
cmp r0, r1
bne _08154490
ldrb r0, [r4, 0x1E]
bl sub_8088E64
bl MetatileBehavior_IsPokeGrass
lsls r0, 24
cmp r0, 0
bne _08154490

4
asm/field_player_avatar.s
View File

@@ -1223,7 +1223,7 @@ sub_808B238: @ 808B238
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8088F58
bl MetatileBehavior_IsNonAnimDoor
lsls r0, 24
cmp r0, 0
bne _0808B2D8
@@ -2255,7 +2255,7 @@ PlayCollisionSoundIfNotFacingWarp: @ 808B9EC
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl is_tile_x69_2_warp_door
bl MetatileBehavior_IsWarpDoor
lsls r0, 24
cmp r0, 0
bne _0808BA54

4
asm/field_screen.s
View File

@@ -8248,7 +8248,7 @@ sub_80AF334: @ 80AF334
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8088EFC
bl MetatileBehavior_IsDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -8258,7 +8258,7 @@ sub_80AF334: @ 80AF334
.pool
_080AF36C:
adds r0, r4, 0
bl sub_8088F58
bl MetatileBehavior_IsNonAnimDoor
lsls r0, 24
lsrs r0, 24
ldr r1, =task_map_chg_seq_0807E2CC

32
asm/field_tasks.s
View File

@@ -221,7 +221,7 @@ sub_809DA30: @ 809DA30
lsls r1, 24
lsrs r4, r1, 24
adds r0, r4, 0
bl sub_8089764
bl MetatileBehavior_IsPacifilogVerticalLog1
lsls r0, 24
cmp r0, 0
beq _0809DA48
@@ -229,7 +229,7 @@ sub_809DA30: @ 809DA30
b _0809DA80
_0809DA48:
adds r0, r4, 0
bl sub_8089778
bl MetatileBehavior_IsPacifilogVerticalLog2
lsls r0, 24
cmp r0, 0
beq _0809DA5A
@@ -238,7 +238,7 @@ _0809DA48:
b _0809DA80
_0809DA5A:
adds r0, r4, 0
bl sub_808978C
bl MetatileBehavior_IsPacifilogHorizontalLog1
lsls r0, 24
cmp r0, 0
beq _0809DA6C
@@ -247,7 +247,7 @@ _0809DA5A:
b _0809DA80
_0809DA6C:
adds r0, r4, 0
bl sub_80897A0
bl MetatileBehavior_IsPacifilogHorizontalLog2
lsls r0, 24
cmp r0, 0
bne _0809DA7C
@@ -414,7 +414,7 @@ sub_809DB7C: @ 809DB7C
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8089764
bl MetatileBehavior_IsPacifilogVerticalLog1
lsls r0, 24
cmp r0, 0
beq _0809DBC0
@@ -427,7 +427,7 @@ _0809DBBC:
b _0809DC08
_0809DBC0:
adds r0, r4, 0
bl sub_8089778
bl MetatileBehavior_IsPacifilogVerticalLog2
lsls r0, 24
cmp r0, 0
beq _0809DBD8
@@ -439,7 +439,7 @@ _0809DBC0:
b _0809DBBC
_0809DBD8:
adds r0, r4, 0
bl sub_808978C
bl MetatileBehavior_IsPacifilogHorizontalLog1
lsls r0, 24
cmp r0, 0
beq _0809DBF0
@@ -451,7 +451,7 @@ _0809DBD8:
b _0809DBBC
_0809DBF0:
adds r0, r4, 0
bl sub_80897A0
bl MetatileBehavior_IsPacifilogHorizontalLog2
lsls r0, 24
cmp r0, 0
beq _0809DC06
@@ -496,7 +496,7 @@ sub_809DC18: @ 809DC18
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8089764
bl MetatileBehavior_IsPacifilogVerticalLog1
lsls r0, 24
cmp r0, 0
beq _0809DC5C
@@ -509,7 +509,7 @@ _0809DC58:
b _0809DCA4
_0809DC5C:
adds r0, r4, 0
bl sub_8089778
bl MetatileBehavior_IsPacifilogVerticalLog2
lsls r0, 24
cmp r0, 0
beq _0809DC74
@@ -521,7 +521,7 @@ _0809DC5C:
b _0809DC58
_0809DC74:
adds r0, r4, 0
bl sub_808978C
bl MetatileBehavior_IsPacifilogHorizontalLog1
lsls r0, 24
cmp r0, 0
beq _0809DC8C
@@ -533,7 +533,7 @@ _0809DC74:
b _0809DC58
_0809DC8C:
adds r0, r4, 0
bl sub_80897A0
bl MetatileBehavior_IsPacifilogHorizontalLog2
lsls r0, 24
cmp r0, 0
beq _0809DCA2
@@ -1326,7 +1326,7 @@ _0809E29A:
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
bl sub_8089604
bl MetatileBehavior_IsThinIce
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1341,7 +1341,7 @@ _0809E29A:
.pool
_0809E2E0:
adds r0, r4, 0
bl sub_8089618
bl MetatileBehavior_IsCrackedIce
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1630,7 +1630,7 @@ _0809E53E:
lsls r0, r6, 24
lsrs r6, r0, 24
adds r0, r6, 0
bl sub_8089918
bl MetatileBehavior_IsCrackedFloorHole
lsls r0, 24
cmp r0, 0
beq _0809E556
@@ -1658,7 +1658,7 @@ _0809E572:
ldrh r0, [r4]
strh r0, [r5, 0x6]
adds r0, r6, 0
bl sub_808992C
bl MetatileBehavior_IsCrackedFloor
lsls r0, 24
cmp r0, 0
beq _0809E5D2

6
asm/fldeff_80F9BCC.s
View File

@@ -584,7 +584,7 @@ sub_80FA004: @ 80FA004
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_808923C
bl MetatileBehavior_IsSecretBaseCave
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -599,7 +599,7 @@ sub_80FA004: @ 80FA004
.pool
_080FA070:
adds r0, r4, 0
bl sub_808925C
bl MetatileBehavior_IsSecretBaseTree
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -614,7 +614,7 @@ _080FA070:
.pool
_080FA0A0:
adds r0, r4, 0
bl is_tile_x98
bl MetatileBehavior_IsSecretBaseShrub
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1

10
asm/fldeff_cut.s
View File

@@ -130,7 +130,7 @@ _080D37F6:
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8088E64
bl MetatileBehavior_IsPokeGrass
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -175,7 +175,7 @@ _080D3890:
movs r0, 0x1
strb r0, [r1]
adds r0, r4, 0
bl sub_80899F8
bl MetatileBehavior_IsCuttableGrass
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x1
@@ -309,7 +309,7 @@ _080D395A:
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8088E64
bl MetatileBehavior_IsPokeGrass
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -339,7 +339,7 @@ _080D39F4:
b _080D395A
_080D39F8:
adds r0, r4, 0
bl sub_80899F8
bl MetatileBehavior_IsCuttableGrass
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x1
@@ -1344,7 +1344,7 @@ sub_80D423C: @ 80D423C
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl MetatileBehavior_IsLongGrass2
bl MetatileBehavior_IsLongGrass_Duplicate
lsls r0, 24
cmp r0, 0
beq _080D42AE

2
asm/item_use.s
View File

@@ -464,7 +464,7 @@ _080FD3EC:
_080FD40C:
lsls r0, r6, 24
lsrs r0, 24
bl sub_8089510
bl MetatileBehavior_8089510
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1

2610
asm/metatile_behavior.s
View File

File diff suppressed because it is too large Load Diff

2
asm/pokenav.s
View File

@@ -27356,7 +27356,7 @@ _081D4870:
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8088E64
bl MetatileBehavior_IsPokeGrass
lsls r0, 24
lsrs r0, 24
_081D4888:

6
asm/rom4.s
View File

@@ -1699,19 +1699,19 @@ _080853AC:
lsls r4, 24
lsrs r5, r4, 24
adds r0, r5, 0
bl sub_8088F74
bl MetatileBehavior_IsDeepSouthWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _080853E8
adds r0, r5, 0
bl sub_8088F58
bl MetatileBehavior_IsNonAnimDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08085442
adds r0, r5, 0
bl sub_8088EFC
bl MetatileBehavior_IsDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1

16
asm/secret_base.s
View File

@@ -1163,13 +1163,13 @@ _080E941E:
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8089350
bl MetatileBehavior_IsMB_B5
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _080E9462
adds r0, r4, 0
bl sub_8089364
bl MetatileBehavior_IsMB_C3
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3288,7 +3288,7 @@ _080EA62C:
.pool
_080EA668:
adds r0, r5, 0
bl sub_80893C8
bl MetatileBehavior_IsSecretBaseGlitterMat
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3308,7 +3308,7 @@ _080EA680:
.pool
_080EA698:
adds r0, r5, 0
bl sub_808938C
bl MetatileBehavior_IsSecretBaseBalloon
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3377,7 +3377,7 @@ _080EA714:
.pool
_080EA72C:
adds r0, r5, 0
bl sub_80893A0
bl MetatileBehavior_IsMB_BE
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3409,7 +3409,7 @@ _080EA75E:
.pool
_080EA778:
adds r0, r5, 0
bl sub_80893B4
bl MetatileBehavior_IsSecretBaseSoundMat
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3429,7 +3429,7 @@ _080EA778:
.pool
_080EA7A8:
adds r0, r5, 0
bl MetatileBehavior_0xBB
bl MetatileBehavior_IsSecretBaseJumpMat
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3449,7 +3449,7 @@ _080EA7A8:
.pool
_080EA7D8:
adds r0, r5, 0
bl MetatileBehavior_0xBC
bl MetatileBehavior_IsSecretBaseSpinMat
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1

12
asm/wild_encounter.s
View File

@@ -68,7 +68,7 @@ _080B4920:
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8089660
bl MetatileBehavior_IsSurfableAndNotWaterfall
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1424,7 +1424,7 @@ _080B539C:
lsls r0, r6, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_808952C
bl MetatileBehavior_IsLandWildEncounter
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1498,7 +1498,7 @@ _080B5418:
.pool
_080B543C:
adds r0, r4, 0
bl sub_8089558
bl MetatileBehavior_IsWaterWildEncounter
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1509,7 +1509,7 @@ _080B543C:
cmp r0, 0
beq _080B54FE
adds r0, r4, 0
bl sub_80894AC
bl MetatileBehavior_IsBridge
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1726,7 +1726,7 @@ _080B562C:
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_808952C
bl MetatileBehavior_IsLandWildEncounter
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1769,7 +1769,7 @@ _080B568C:
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8089558
bl MetatileBehavior_IsWaterWildEncounter
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1