ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55 from DizzyEggg/decompile_metatile_behavior

Browse Source 
decompile metatile behavior
This commit is contained in:
Diegoisawesome 2017-09-30 03:11:36 -05:00 committed by GitHub
commit 13017a3b19
22 changed files with 1889 additions and 2745 deletions
Show Stats 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 lsls r0, r5, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
adds r0, r4, 0 adds r0, r4, 0
bl sub_8089588 bl MetatileBehavior_IsMB_0B
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B0C78 beq _080B0C78
@ -734,7 +734,7 @@ _080B0C9C:
lsls r0, r5, 24 lsls r0, r5, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
adds r0, r4, 0 adds r0, r4, 0
bl sub_808962C bl MetatileBehavior_IsDeepOrOceanWater
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080B0CF2 bne _080B0CF2
@ -744,7 +744,7 @@ _080B0C9C:
cmp r0, 0 cmp r0, 0
bne _080B0CE0 bne _080B0CE0
adds r0, r4, 0 adds r0, r4, 0
bl sub_808959C bl MetatileBehavior_IsMountain
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B0CC8 beq _080B0CC8
@ -757,7 +757,7 @@ _080B0CC8:
cmp r0, 0 cmp r0, 0
beq _080B0CF6 beq _080B0CF6
adds r0, r4, 0 adds r0, r4, 0
bl sub_80894D4 bl MetatileBehavior_GetBridgeSth
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B0CE4 beq _080B0CE4
@ -766,7 +766,7 @@ _080B0CE0:
b _080B0D1A b _080B0D1A
_080B0CE4: _080B0CE4:
adds r0, r4, 0 adds r0, r4, 0
bl sub_80894AC bl MetatileBehavior_IsBridge
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1

28
asm/decoration.s
View File

@ -2222,7 +2222,7 @@ _08127C0A:
lsls r4, r0, 16 lsls r4, r0, 16
lsls r0, r4, 8 lsls r0, r4, 8
lsrs r0, 24 lsrs r0, 24
bl sub_80892D8 bl MetatileBehavior_IsMB_B9
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -2257,7 +2257,7 @@ _08127C64:
bl MapGridGetMetatileBehaviorAt bl MapGridGetMetatileBehaviorAt
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8089328 bl MetatileBehavior_IsMB_B7
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r6, 0x1 movs r6, 0x1
@ -3189,7 +3189,7 @@ sub_8128484: @ 8128484
lsrs r0, 24 lsrs r0, 24
lsls r1, 16 lsls r1, 16
lsrs r4, r1, 16 lsrs r4, r1, 16
bl sub_80892C4 bl MetatileBehavior_IsMB_B3
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -3257,7 +3257,7 @@ sub_81284F4: @ 81284F4
lsls r0, r6, 24 lsls r0, r6, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
adds r0, r4, 0 adds r0, r4, 0
bl sub_80892C4 bl MetatileBehavior_IsMB_B3
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -3266,7 +3266,7 @@ sub_81284F4: @ 81284F4
cmp r0, 0x21 cmp r0, 0x21
bne _08128522 bne _08128522
adds r0, r4, 0 adds r0, r4, 0
bl sub_8089378 bl MetatileBehavior_IsMB_C2
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -3274,7 +3274,7 @@ sub_81284F4: @ 81284F4
_08128522: _08128522:
lsls r0, r6, 24 lsls r0, r6, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8089314 bl MetatileBehavior_IsNormal
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08128534 beq _08128534
@ -3520,7 +3520,7 @@ _081286B8:
adds r5, r1, 0 adds r5, r1, 0
ands r5, r0 ands r5, r0
adds r0, r4, 0 adds r0, r4, 0
bl sub_8089314 bl MetatileBehavior_IsNormal
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08128724 bne _08128724
@ -3625,12 +3625,12 @@ _08128790:
adds r5, r1, 0 adds r5, r1, 0
ands r5, r0 ands r5, r0
adds r0, r4, 0 adds r0, r4, 0
bl sub_8089314 bl MetatileBehavior_IsNormal
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _081287F2 bne _081287F2
adds r0, r4, 0 adds r0, r4, 0
bl sub_8089328 bl MetatileBehavior_IsMB_B7
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _081287F2 bne _081287F2
@ -3707,7 +3707,7 @@ _08128868:
bl MapGridGetMetatileBehaviorAt bl MapGridGetMetatileBehaviorAt
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8089328 bl MetatileBehavior_IsMB_B7
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0812890C beq _0812890C
@ -3772,7 +3772,7 @@ _081288D8:
bne _08128910 bne _08128910
_08128900: _08128900:
adds r0, r4, 0 adds r0, r4, 0
bl sub_8089364 bl MetatileBehavior_IsMB_C3
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0812891C bne _0812891C
@ -3781,7 +3781,7 @@ _0812890C:
b _0812893E b _0812893E
_08128910: _08128910:
adds r0, r4, 0 adds r0, r4, 0
bl sub_8089350 bl MetatileBehavior_IsMB_B5
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08128900 beq _08128900
@ -6182,13 +6182,13 @@ _08129CA8:
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
adds r0, r4, 0 adds r0, r4, 0
bl sub_8089288 bl MetatileBehavior_IsSecretBasePC
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
beq _08129CDE beq _08129CDE
adds r0, r4, 0 adds r0, r4, 0
bl sub_8089404 bl MetatileBehavior_IsMB_C5
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 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 bl cur_mapdata_block_role_at_player_pos
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_808904C bl MetatileBehavior_IsMoveTile
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
cmp r6, 0x2 cmp r6, 0x2
@ -831,7 +831,7 @@ _0809C55C:
.pool .pool
_0809C574: _0809C574:
adds r0, r5, 0 adds r0, r5, 0
bl is_tile_x8B bl MetatileBehavior_IsClosedSootopolisGymDoor
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -841,7 +841,7 @@ _0809C574:
.pool .pool
_0809C58C: _0809C58C:
adds r0, r5, 0 adds r0, r5, 0
bl is_tile_xEA bl MetatileBehavior_IsUnknownClosedDoor
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -851,7 +851,7 @@ _0809C58C:
.pool .pool
_0809C5A4: _0809C5A4:
adds r0, r5, 0 adds r0, r5, 0
bl is_tile_x84 bl MetatileBehavior_IsCableBoxResults1
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -859,7 +859,7 @@ _0809C5A4:
b _0809C6E4 b _0809C6E4
_0809C5B4: _0809C5B4:
adds r0, r5, 0 adds r0, r5, 0
bl is_tile_x87 bl MetatileBehavior_IsPokeblockFeeder
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -869,7 +869,7 @@ _0809C5B4:
.pool .pool
_0809C5CC: _0809C5CC:
adds r0, r5, 0 adds r0, r5, 0
bl is_tile_x8C bl MetatileBehavior_IsTrickHousePuzzleDoor
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -879,7 +879,7 @@ _0809C5CC:
.pool .pool
_0809C5E4: _0809C5E4:
adds r0, r5, 0 adds r0, r5, 0
bl is_tile_x85 bl MetatileBehavior_IsRegionMap
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -889,7 +889,7 @@ _0809C5E4:
.pool .pool
_0809C5FC: _0809C5FC:
adds r0, r5, 0 adds r0, r5, 0
bl sub_8089A1C bl MetatileBehavior_IsRunningShoesInstruction
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -899,7 +899,7 @@ _0809C5FC:
.pool .pool
_0809C614: _0809C614:
adds r0, r5, 0 adds r0, r5, 0
bl sub_8089A30 bl MetatileBehavior_IsPictureBookShelf
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -909,7 +909,7 @@ _0809C614:
.pool .pool
_0809C62C: _0809C62C:
adds r0, r5, 0 adds r0, r5, 0
bl sub_8089A44 bl MetatileBehavior_IsBookShelf
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -919,7 +919,7 @@ _0809C62C:
.pool .pool
_0809C644: _0809C644:
adds r0, r5, 0 adds r0, r5, 0
bl sub_8089A58 bl MetatileBehavior_IsPokeCenterBookShelf
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -929,7 +929,7 @@ _0809C644:
.pool .pool
_0809C65C: _0809C65C:
adds r0, r5, 0 adds r0, r5, 0
bl sub_8089A6C bl MetatileBehavior_IsVase
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -939,7 +939,7 @@ _0809C65C:
.pool .pool
_0809C674: _0809C674:
adds r0, r5, 0 adds r0, r5, 0
bl sub_8089A80 bl MetatileBehavior_IsTrashCan
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -949,7 +949,7 @@ _0809C674:
.pool .pool
_0809C68C: _0809C68C:
adds r0, r5, 0 adds r0, r5, 0
bl sub_8089A94 bl MetatileBehavior_IsShopShelf
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -959,7 +959,7 @@ _0809C68C:
.pool .pool
_0809C6A4: _0809C6A4:
adds r0, r5, 0 adds r0, r5, 0
bl sub_8089AA8 bl MetatileBehavior_IsBlueprint
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -970,7 +970,7 @@ _0809C6A4:
_0809C6BC: _0809C6BC:
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl sub_8089AD0 bl MetatileBehavior_IsPlayerFacingWirelessBoxResults
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -981,7 +981,7 @@ _0809C6BC:
_0809C6D4: _0809C6D4:
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl sub_8089AEC bl MetatileBehavior_IsCableBoxResults2
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -1023,7 +1023,7 @@ _0809C71C:
cmp r4, r0 cmp r4, r0
bne _0809C7D0 bne _0809C7D0
adds r0, r5, 0 adds r0, r5, 0
bl sub_8089288 bl MetatileBehavior_IsSecretBasePC
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -1033,7 +1033,7 @@ _0809C71C:
.pool .pool
_0809C74C: _0809C74C:
adds r0, r5, 0 adds r0, r5, 0
bl sub_808929C bl MetatileBehavior_IsSecretBaseRegisterPC
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -1043,7 +1043,7 @@ _0809C74C:
.pool .pool
_0809C764: _0809C764:
adds r0, r5, 0 adds r0, r5, 0
bl sub_80893DC bl MetatileBehavior_IsMB_BF
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -1053,7 +1053,7 @@ _0809C764:
.pool .pool
_0809C77C: _0809C77C:
adds r0, r5, 0 adds r0, r5, 0
bl sub_80893F0 bl MetatileBehavior_IsSecretBaseTvOrShield
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -1063,7 +1063,7 @@ _0809C77C:
.pool .pool
_0809C794: _0809C794:
adds r0, r5, 0 adds r0, r5, 0
bl sub_80892EC bl MetatileBehavior_IsMB_C6
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -1072,7 +1072,7 @@ _0809C794:
b _0809C7E2 b _0809C7E2
_0809C7A8: _0809C7A8:
adds r0, r5, 0 adds r0, r5, 0
bl sub_8089364 bl MetatileBehavior_IsMB_C3
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -1081,7 +1081,7 @@ _0809C7A8:
b _0809C7E2 b _0809C7E2
_0809C7BC: _0809C7BC:
adds r0, r5, 0 adds r0, r5, 0
bl sub_8089350 bl MetatileBehavior_IsMB_B5
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -1090,7 +1090,7 @@ _0809C7BC:
b _0809C7E2 b _0809C7E2
_0809C7D0: _0809C7D0:
adds r0, r5, 0 adds r0, r5, 0
bl sub_8089300 bl MetatileBehavior_IsSecretBasePoster
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -1297,7 +1297,7 @@ sub_809C96C: @ 809C96C
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
adds r0, r4, 0 adds r0, r4, 0
bl sub_8089918 bl MetatileBehavior_IsCrackedFloorHole
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0809C988 beq _0809C988
@ -1306,7 +1306,7 @@ sub_809C96C: @ 809C96C
.pool .pool
_0809C988: _0809C988:
adds r0, r4, 0 adds r0, r4, 0
bl sub_8089ABC bl MetatileBehavior_IsBattlePyramidWarp
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0809C9A4 beq _0809C9A4
@ -1318,7 +1318,7 @@ _0809C996:
.pool .pool
_0809C9A4: _0809C9A4:
adds r0, r4, 0 adds r0, r4, 0
bl sub_80893C8 bl MetatileBehavior_IsSecretBaseGlitterMat
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -1327,7 +1327,7 @@ _0809C9A4:
b _0809C9E8 b _0809C9E8
_0809C9B8: _0809C9B8:
adds r0, r4, 0 adds r0, r4, 0
bl sub_80893B4 bl MetatileBehavior_IsSecretBaseSoundMat
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -1376,7 +1376,7 @@ _0809CA04:
bne _0809CAF8 bne _0809CAF8
lsls r0, r4, 24 lsls r0, r4, 24
lsrs r0, 24 lsrs r0, 24
bl sub_808904C bl MetatileBehavior_IsMoveTile
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0809CAF8 bne _0809CAF8
@ -1719,7 +1719,7 @@ sub_809CC9C: @ 809CC9C
.pool .pool
_0809CCF8: _0809CCF8:
adds r0, r4, 0 adds r0, r4, 0
bl sub_8089870 bl MetatileBehavior_IsLavaridgeB1FWarp
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -1729,7 +1729,7 @@ _0809CCF8:
b _0809CD8C b _0809CD8C
_0809CD0E: _0809CD0E:
adds r0, r4, 0 adds r0, r4, 0
bl is_role_x68 bl MetatileBehavior_IsLavaridge1FWarp
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -1749,7 +1749,7 @@ _0809CD24:
b _0809CD8C b _0809CD8C
_0809CD3A: _0809CD3A:
adds r0, r4, 0 adds r0, r4, 0
bl sub_80898AC bl MetatileBehavior_IsWarpOrBridge
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -1759,7 +1759,7 @@ _0809CD3A:
b _0809CD8C b _0809CD8C
_0809CD50: _0809CD50:
adds r0, r4, 0 adds r0, r4, 0
bl sub_8089904 bl MetatileBehavior_IsMtPyreHole
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -1771,7 +1771,7 @@ _0809CD50:
.pool .pool
_0809CD6C: _0809CD6C:
adds r0, r4, 0 adds r0, r4, 0
bl sub_80898C0 bl MetatileBehavior_IsMossdeepGymWarp
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -1797,7 +1797,7 @@ is_warp_tile: @ 809CD94
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
adds r0, r4, 0 adds r0, r4, 0
bl is_tile_x69_2_warp_door bl MetatileBehavior_IsWarpDoor
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -1815,19 +1815,19 @@ is_warp_tile: @ 809CD94
cmp r0, 0x1 cmp r0, 0x1
beq _0809CE2A beq _0809CE2A
adds r0, r4, 0 adds r0, r4, 0
bl sub_8088F58 bl MetatileBehavior_IsNonAnimDoor
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
beq _0809CE2A beq _0809CE2A
adds r0, r4, 0 adds r0, r4, 0
bl sub_8089870 bl MetatileBehavior_IsLavaridgeB1FWarp
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
beq _0809CE2A beq _0809CE2A
adds r0, r4, 0 adds r0, r4, 0
bl is_role_x68 bl MetatileBehavior_IsLavaridge1FWarp
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -1839,19 +1839,19 @@ is_warp_tile: @ 809CD94
cmp r0, 0x1 cmp r0, 0x1
beq _0809CE2A beq _0809CE2A
adds r0, r4, 0 adds r0, r4, 0
bl sub_8089904 bl MetatileBehavior_IsMtPyreHole
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
beq _0809CE2A beq _0809CE2A
adds r0, r4, 0 adds r0, r4, 0
bl sub_80898C0 bl MetatileBehavior_IsMossdeepGymWarp
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
beq _0809CE2A beq _0809CE2A
adds r0, r4, 0 adds r0, r4, 0
bl sub_80898AC bl MetatileBehavior_IsWarpOrBridge
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -2048,7 +2048,7 @@ map_warp_consider_2_to_inside: @ 809CF78
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
adds r0, r4, 0 adds r0, r4, 0
bl sub_8089210 bl MetatileBehavior_IsSecretBaseOpen
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -2062,7 +2062,7 @@ map_warp_consider_2_to_inside: @ 809CF78
.pool .pool
_0809CFB0: _0809CFB0:
adds r0, r4, 0 adds r0, r4, 0
bl is_tile_x69_2_warp_door bl MetatileBehavior_IsWarpDoor
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -2322,7 +2322,7 @@ dive_warp: @ 809D16C
bne _0809D1A4 bne _0809D1A4
lsls r0, r5, 24 lsls r0, r5, 24
lsrs r0, 24 lsrs r0, 24
bl sub_80895D0 bl MetatileBehavior_IsUnableToEmerge
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0809D1A4 bne _0809D1A4
@ -2340,7 +2340,7 @@ dive_warp: @ 809D16C
_0809D1A4: _0809D1A4:
lsls r0, r5, 24 lsls r0, r5, 24
lsrs r0, 24 lsrs r0, 24
bl sub_80895B0 bl MetatileBehavior_IsDiveable
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@ -2394,7 +2394,7 @@ sub_809D1E8: @ 809D1E8
cmp r0, 0x5 cmp r0, 0x5
bne _0809D244 bne _0809D244
adds r0, r5, 0 adds r0, r5, 0
bl sub_80895D0 bl MetatileBehavior_IsUnableToEmerge
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0809D244 bne _0809D244
@ -2417,7 +2417,7 @@ sub_809D1E8: @ 809D1E8
.pool .pool
_0809D244: _0809D244:
adds r0, r5, 0 adds r0, r5, 0
bl sub_80895B0 bl MetatileBehavior_IsDiveable
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1

8
asm/field_door.s
View File

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

6
asm/field_effect_helpers.s
View File

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

4
asm/field_player_avatar.s
View File

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

4
asm/field_screen.s
View File

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

32
asm/field_tasks.s
View File

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

6
asm/fldeff_80F9BCC.s
View File

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

10
asm/fldeff_cut.s
View File

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

2
asm/item_use.s
View File

@ -464,7 +464,7 @@ _080FD3EC:
_080FD40C: _080FD40C:
lsls r0, r6, 24 lsls r0, r6, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8089510 bl MetatileBehavior_8089510
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 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 bl MapGridGetMetatileBehaviorAt
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8088E64 bl MetatileBehavior_IsPokeGrass
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
_081D4888: _081D4888:

6
asm/rom4.s
View File

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

16
asm/secret_base.s
View File

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

12
asm/wild_encounter.s
View File

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

4
data/metatile_behavior.s → data/rom_8486FEC.s
View File

@ -4,5 +4,5 @@
.section .rodata .section .rodata
.align 2, 0 .align 2, 0
gUnknown_08486EFC:: @ 8486EFC gUnknown_8486FEC:: @ 8486FEC
.incbin "baserom.gba", 0x486efc, 0x10090 .incbin "baserom.gba", 0x486fec, 0xFFA0

156
include/metatile_behavior.h
View File

@ -1,11 +1,149 @@
#ifndef GUARD_METATILE_BEHAVIOR_H #ifndef GUARD_METATILE_BEHAVIOR
#define GUARD_METATILE_BEHAVIOR_H #define GUARD_METATILE_BEHAVIOR
// Exported type declarations bool8 ShouldDoJumpLandingDustEffect(u8);
bool8 MetatileBehavior_IsEncounterTile(u8);
bool8 MetatileBehavior_IsJumpEast(u8);
bool8 MetatileBehavior_IsJumpWest(u8);
bool8 MetatileBehavior_IsJumpNorth(u8);
bool8 MetatileBehavior_IsJumpSouth(u8);
bool8 MetatileBehavior_IsPokeGrass(u8);
bool8 MetatileBehavior_IsSandOrDeepSand(u8);
bool8 MetatileBehavior_IsDeepSand(u8);
bool8 MetatileBehavior_IsReflective(u8);
bool8 MetatileBehavior_IsIce(u8);
bool8 MetatileBehavior_IsWarpDoor(u8);
bool8 MetatileBehavior_IsDoor(u8);
bool8 MetatileBehavior_IsEscalator(u8);
bool8 MetatileBehavior_IsMB_04(u8);
bool8 MetatileBehavior_IsLadder(u8);
bool8 MetatileBehavior_IsNonAnimDoor(u8);
bool8 MetatileBehavior_IsDeepSouthWarp(u8);
bool8 MetatileBehavior_IsSurfableWaterOrUnderwater(u8);
bool8 MetatileBehavior_IsEastArrowWarp(u8);
bool8 MetatileBehavior_IsWestArrowWarp(u8);
bool8 MetatileBehavior_IsNorthArrowWarp(u8);
bool8 MetatileBehavior_IsSouthArrowWarp(u8);
bool8 MetatileBehavior_IsArrowWarp(u8);
bool8 MetatileBehavior_IsMoveTile(u8);
bool8 MetatileBehavior_IsIce_2(u8);
bool8 MetatileBehavior_IsTrickHouseSlipperyFloor(u8);
bool8 MetatileBehavior_IsMB_05(u8);
bool8 MetatileBehavior_IsWalkNorth(u8);
bool8 MetatileBehavior_IsWalkSouth(u8);
bool8 MetatileBehavior_IsWalkWest(u8);
bool8 MetatileBehavior_IsWalkEast(u8);
bool8 MetatileBehavior_IsNorthwardCurrent(u8);
bool8 MetatileBehavior_IsSouthwardCurrent(u8);
bool8 MetatileBehavior_IsWestwardCurrent(u8);
bool8 MetatileBehavior_IsEastwardCurrent(u8);
bool8 MetatileBehavior_IsSlideNorth(u8);
bool8 MetatileBehavior_IsSlideSouth(u8);
bool8 MetatileBehavior_IsSlideWest(u8);
bool8 MetatileBehavior_IsSlideEast(u8);
bool8 MetatileBehavior_IsCounter(u8);
bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8 tile, u8 playerDir);
bool8 MetatileBehavior_IsPC(u8);
bool8 MetatileBehavior_IsCableBoxResults1(u8);
bool8 MetatileBehavior_IsSecretBaseOpen(u8);
bool8 MetatileBehavior_IsSecretBaseCave(u8);
bool8 MetatileBehavior_IsSecretBaseTree(u8);
bool8 MetatileBehavior_IsSecretBaseShrub(u8);
bool8 MetatileBehavior_IsSecretBasePC(u8);
bool8 MetatileBehavior_IsSecretBaseRegisterPC(u8);
bool8 MetatileBehavior_IsMB_B2(u8);
bool8 MetatileBehavior_IsMB_B3(u8);
bool8 MetatileBehavior_IsMB_B9(u8);
bool8 MetatileBehavior_IsMB_C6(u8);
bool8 MetatileBehavior_IsSecretBasePoster(u8);
bool8 MetatileBehavior_IsNormal(u8);
bool8 MetatileBehavior_IsMB_B7(u8);
bool8 MetatileBehavior_IsMB_B2_Duplicate(u8);
bool8 MetatileBehavior_IsMB_B5(u8);
bool8 MetatileBehavior_IsMB_C3(u8);
bool8 MetatileBehavior_IsMB_C2(u8);
bool8 MetatileBehavior_IsSecretBaseBalloon(u8);
bool8 MetatileBehavior_IsMB_BE(u8);
bool8 MetatileBehavior_IsSecretBaseSoundMat(u8);
bool8 MetatileBehavior_IsSecretBaseGlitterMat(u8);
bool8 MetatileBehavior_IsMB_BF(u8);
bool8 MetatileBehavior_IsSecretBaseTvOrShield(u8);
bool8 MetatileBehavior_IsMB_C5(u8);
bool8 MetatileBehavior_HasRipples(u8);
bool8 MetatileBehavior_IsPuddle(u8);
bool8 MetatileBehavior_IsTallGrass(u8);
bool8 MetatileBehavior_IsLongGrass(u8);
bool8 MetatileBehavior_IsBerryTreeSoil(u8);
bool8 MetatileBehavior_IsAsh(u8);
bool8 MetatileBehavior_IsUnusedFootprintMetatile(u8);
bool8 MetatileBehavior_IsBridge(u8);
u8 MetatileBehavior_GetBridgeSth(u8);
u8 MetatileBehavior_8089510(u8);
bool8 MetatileBehavior_IsLandWildEncounter(u8);
bool8 MetatileBehavior_IsWaterWildEncounter(u8);
bool8 MetatileBehavior_IsMB_0B(u8);
bool8 MetatileBehavior_IsMountain(u8);
bool8 MetatileBehavior_IsDiveable(u8);
bool8 MetatileBehavior_IsUnableToEmerge(u8);
bool8 MetatileBehavior_IsShallowFlowingWater(u8);
bool8 MetatileBehavior_IsThinIce(u8);
bool8 MetatileBehavior_IsCrackedIce(u8);
bool8 MetatileBehavior_IsDeepOrOceanWater(u8);
bool8 MetatileBehavior_IsMB_18_OrMB_1A(u8);
bool8 MetatileBehavior_IsSurfableAndNotWaterfall(u8);
bool8 MetatileBehavior_IsEastBlocked(u8);
bool8 MetatileBehavior_IsWestBlocked(u8);
bool8 MetatileBehavior_IsNorthBlocked(u8);
bool8 MetatileBehavior_IsSouthBlocked(u8);
bool8 MetatileBehavior_IsShortGrass(u8);
bool8 MetatileBehavior_IsHotSprings(u8);
bool8 MetatileBehavior_IsWaterfall(u8);
bool8 MetatileBehavior_IsFortreeBridge(u8);
bool8 MetatileBehavior_IsPacifilogVerticalLog1(u8);
bool8 MetatileBehavior_IsPacifilogVerticalLog2(u8);
bool8 MetatileBehavior_IsPacifilogHorizontalLog1(u8);
bool8 MetatileBehavior_IsPacifilogHorizontalLog2(u8);
bool8 MetatileBehavior_IsPacifidlogLog(u8);
bool8 MetatileBehavior_IsTrickHousePuzzleDoor(u8);
bool8 MetatileBehavior_IsRegionMap(u8);
bool8 MetatileBehavior_IsClosedSootopolisGymDoor(u8);
bool8 MetatileBehavior_IsUnknownClosedDoor(u8);
bool8 MetatileBehavior_IsRoulette(u8);
bool8 MetatileBehavior_IsPokeblockFeeder(u8);
bool8 MetatileBehavior_IsSecretBaseJumpMat(u8);
bool8 MetatileBehavior_IsSecretBaseSpinMat(u8);
bool8 MetatileBehavior_IsLavaridgeB1FWarp(u8);
bool8 MetatileBehavior_IsLavaridgeB1FWarp(u8);
bool8 MetatileBehavior_IsAquaHideoutWarp(u8);
bool8 MetatileBehavior_IsWarpOrBridge(u8);
bool8 MetatileBehavior_IsMossdeepGymWarp(u8);
bool8 MetatileBehavior_IsSurfableFishableWater(u8);
bool8 MetatileBehavior_IsMtPyreHole(u8);
bool8 MetatileBehavior_IsCrackedFloorHole(u8);
bool8 MetatileBehavior_IsCrackedFloor(u8);
bool8 MetatileBehavior_IsMuddySlope(u8);
bool8 MetatileBehavior_IsBumpySlope(u8);
bool8 MetatileBehavior_IsIsolatedVerticalRail(u8);
bool8 MetatileBehavior_IsIsolatedHorizontalRail(u8);
bool8 MetatileBehavior_IsVerticalRail(u8);
bool8 MetatileBehavior_IsHorizontalRail(u8);
bool8 MetatileBehavior_IsSeaweed(u8);
bool8 MetatileBehavior_IsRunningDisallowed(u8);
bool8 MetatileBehavior_IsCuttableGrass(u8);
bool8 MetatileBehavior_IsRunningShoesInstruction(u8);
bool8 MetatileBehavior_IsPictureBookShelf(u8);
bool8 MetatileBehavior_IsBookShelf(u8);
bool8 MetatileBehavior_IsPokeCenterBookShelf(u8);
bool8 MetatileBehavior_IsVase(u8);
bool8 MetatileBehavior_IsTrashCan(u8);
bool8 MetatileBehavior_IsShopShelf(u8);
bool8 MetatileBehavior_IsBlueprint(u8);
bool8 MetatileBehavior_IsBattlePyramidWarp(u8);
bool8 MetatileBehavior_IsPlayerFacingWirelessBoxResults(u8 tile, u8 playerDir);
bool8 MetatileBehavior_IsCableBoxResults2(u8 tile, u8 playerDir);
bool8 MetatileBehavior_IsQuestionnaire(u8);
bool8 MetatileBehavior_IsLongGrass_Duplicate(u8);
bool8 MetatileBehavior_IsLongGrassSouthEdge(u8);
bool8 MetatileBehavior_IsTrainerHillTimer(u8);
// Exported RAM declarations #endif // GUARD_METATILE_BEHAVIOR
// Exported ROM declarations
bool8 sub_8088E64(u8);
#endif //GUARD_METATILE_BEHAVIOR_H

179
include/metatile_behaviors.h Normal file
View File

@ -0,0 +1,179 @@
#ifndef GUARD_METATILE_BEHAVIORS
#define GUARD_METATILE_BEHAVIORS
#define MB_NORMAL 0x00
#define MB_TALL_GRASS 0x02
#define MB_LONG_GRASS 0x03
#define MB_04 0x04
#define MB_05 0x05
#define MB_DEEP_SAND 0x06
#define MB_SHORT_GRASS 0x07
#define MB_CAVE 0x08
#define MB_LONG_GRASS_SOUTH_EDGE 0x09
#define MB_NO_RUNNING 0x0A
#define MB_0B 0x0B
#define MB_MOUNTAIN_TOP 0x0C
#define MB_BATTLE_PYRAMID_WARP 0x0D
#define MB_MOSSDEEP_GYM_WARP 0x0E
#define MB_MT_PYRE_HOLE 0x0F
#define MB_POND_WATER 0x10
#define MB_SEMI_DEEP_WATER 0x11
#define MB_DEEP_WATER 0x12
#define MB_WATERFALL 0x13
#define MB_SOOTOPOLIS_DEEP_WATER 0x14
#define MB_OCEAN_WATER 0x15
#define MB_PUDDLE 0x16
#define MB_SHALLOW_WATER 0x17
#define MB_18 0x18
#define MB_NO_SURFACING 0x19
#define MB_1A 0x1A
#define MB_STAIRS_OUTSIDE_ABANDONED_SHIP 0x1B
#define MB_SHOAL_CAVE_ENTRANCE 0x1C
#define MB_ICE 0x20
#define MB_SAND 0x21
#define MB_SEAWEED 0x22
#define MB_ASHGRASS 0x24
#define MB_25 0x25
#define MB_THIN_ICE 0x26
#define MB_CRACKED_ICE 0x27
#define MB_HOT_SPRINGS 0x28
#define MB_LAVARIDGE_GYM_B1F_WARP 0x29
#define MB_SEAWEED_NO_SURFACING 0x2A
#define MB_REFLECTION_UNDER_BRIDGE 0x2B
#define MB_IMPASSABLE_EAST 0x30
#define MB_IMPASSABLE_WEST 0x31
#define MB_IMPASSABLE_NORTH 0x32
#define MB_IMPASSABLE_SOUTH 0x33
#define MB_IMPASSABLE_NORTHEAST 0x34
#define MB_IMPASSABLE_NORTHWEST 0x35
#define MB_IMPASSABLE_SOUTHEAST 0x36
#define MB_IMPASSABLE_SOUTHWEST 0x37
#define MB_JUMP_EAST 0x38
#define MB_JUMP_WEST 0x39
#define MB_JUMP_NORTH 0x3A
#define MB_JUMP_SOUTH 0x3B
#define MB_JUMP_SOUTHEAST 0x3E
#define MB_JUMP_SOUTHWEST 0x3F
#define MB_WALK_EAST 0x40
#define MB_WALK_WEST 0x41
#define MB_WALK_NORTH 0x42
#define MB_WALK_SOUTH 0x43
#define MB_SLIDE_EAST 0x44
#define MB_SLIDE_WEST 0x45
#define MB_SLIDE_NORTH 0x46
#define MB_SLIDE_SOUTH 0x47
#define MB_TRICK_HOUSE_PUZZLE_8_FLOOR 0x48
#define MB_EASTWARD_CURRENT 0x50
#define MB_WESTWARD_CURRENT 0x51
#define MB_NORTHWARD_CURRENT 0x52
#define MB_SOUTHWARD_CURRENT 0x53
#define MB_NON_ANIMATED_DOOR 0x60
#define MB_LADDER 0x61
#define MB_EAST_ARROW_WARP 0x62
#define MB_WEST_ARROW_WARP 0x63
#define MB_NORTH_ARROW_WARP 0x64
#define MB_SOUTH_ARROW_WARP 0x65
#define MB_CRACKED_FLOOR_HOLE 0x66
#define MB_AQUA_HIDEOUT_WARP 0x67
#define MB_LAVARIDGE_GYM_1F_WARP 0x68
#define MB_ANIMATED_DOOR 0x69
#define MB_UP_ESCALATOR 0x6A
#define MB_DOWN_ESCALATOR 0x6B
#define MB_WATER_DOOR 0x6C
#define MB_WATER_SOUTH_ARROW_WARP 0x6D
#define MB_DEEP_SOUTH_WARP 0x6E
#define MB_WARP_OR_BRIDGE 0x70
#define MB_71 0x71
#define MB_ROUTE120_NORTH_BRIDGE_1 0x72
#define MB_ROUTE120_NORTH_BRIDGE_2 0x73
#define MB_PACIFIDLOG_VERTICAL_LOG_1 0x74
#define MB_PACIFIDLOG_VERTICAL_LOG_2 0x75
#define MB_PACIFIDLOG_HORIZONTAL_LOG_1 0x76
#define MB_PACIFIDLOG_HORIZONTAL_LOG_2 0x77
#define MB_FORTREE_BRIDGE 0x78
#define MB_ROUTE120_SOUTH_BRIDGE_1 0x7A
#define MB_ROUTE120_SOUTH_BRIDGE_2 0x7B
#define MB_ROUTE120_NORTH_BRIDGE_3 0x7C
#define MB_ROUTE120_NORTH_BRIDGE_4 0x7D
#define MB_7E 0x7E
#define MB_ROUTE110_BRIDGE 0x7F
#define MB_COUNTER 0x80
#define MB_PC 0x83
#define MB_CABLE_BOX_RESULTS_1 0x84
#define MB_REGION_MAP 0x85
#define MB_TELEVISION 0x86
#define MB_POKEBLOCK_FEEDER 0x87
#define MB_SLOT_MACHINE 0x89
#define MB_ROULETTE 0x8A
#define MB_CLOSED_SOOTOPOLIS_GYM_DOOR 0x8B
#define MB_TRICK_HOUSE_PUZZLE_DOOR 0x8C
#define MB_8D 0x8D
#define MB_RUNNING_SHOES_INSTRUCTION 0x8E
#define MB_QUESTIONNAIRE 0x8F
#define MB_SECRET_BASE_SPOT_RED_CAVE 0x90
#define MB_SECRET_BASE_SPOT_RED_CAVE_OPEN 0x91
#define MB_SECRET_BASE_SPOT_BROWN_CAVE 0x92
#define MB_SECRET_BASE_SPOT_BROWN_CAVE_OPEN 0x93
#define MB_SECRET_BASE_SPOT_YELLOW_CAVE 0x94
#define MB_SECRET_BASE_SPOT_YELLOW_CAVE_OPEN 0x95
#define MB_SECRET_BASE_SPOT_TREE_LEFT 0x96
#define MB_SECRET_BASE_SPOT_TREE_LEFT_OPEN 0x97
#define MB_SECRET_BASE_SPOT_SHRUB 0x98
#define MB_SECRET_BASE_SPOT_SHRUB_OPEN 0x99
#define MB_SECRET_BASE_SPOT_BLUE_CAVE 0x9A
#define MB_SECRET_BASE_SPOT_BLUE_CAVE_OPEN 0x9B
#define MB_SECRET_BASE_SPOT_TREE_RIGHT 0x9C
#define MB_SECRET_BASE_SPOT_TREE_RIGHT_OPEN 0x9D
#define MB_BERRY_TREE_SOIL 0xA0
#define MB_SECRET_BASE_PC 0xB0
#define MB_SECRET_BASE_REGISTER_PC 0xB1
#define MB_B2 0xB2
#define MB_B3 0xB3
#define MB_B4 0xB4
#define MB_B5 0xB5
#define MB_B6 0xB6
#define MB_B7 0xB7
#define MB_SECRET_BASE_BALLOON 0xB8
#define MB_B9 0xB9
#define MB_SECRET_BASE_GLITTER_MAT 0xBA
#define MB_SECRET_BASE_JUMP_MAT 0xBB
#define MB_SECRET_BASE_SPIN_MAT 0xBC
#define MB_SECRET_BASE_SOUND_MAT 0xBD
#define MB_BE 0xBE
#define MB_BF 0xBF
#define MB_BED 0xC0
#define MB_C1 0xC1
#define MB_C2 0xC2
#define MB_C3 0xC3
#define MB_SECRET_BASE_TV_SHIELD 0xC4
#define MB_C5 0xC5
#define MB_C6 0xC6
#define MB_SECRET_BASE_POSTER 0xC7
#define MB_C8 0xC8
#define MB_C9 0xC9
#define MB_CA 0xCA
#define MB_CB 0xCB
#define MB_CC 0xCC
#define MB_CD 0xCD
#define MB_CE 0xCE
#define MB_CF 0xCF
#define MB_MUDDY_SLOPE 0xD0
#define MB_BUMPY_SLOPE 0xD1
#define MB_CRACKED_FLOOR 0xD2
#define MB_ISOLATED_VERTICAL_RAIL 0xD3
#define MB_ISOLATED_HORIZONTAL_RAIL 0xD4
#define MB_VERTICAL_RAIL 0xD5
#define MB_HORIZONTAL_RAIL 0xD6
#define MB_PICTURE_BOOK_SHELF 0xE0
#define MB_BOOKSHELF 0xE1
#define MB_POKEMON_CENTER_BOOKSHELF 0xE2
#define MB_VASE 0xE3
#define MB_TRASH_CAN 0xE4
#define MB_SHOP_SHELF 0xE5
#define MB_BLUEPRINT 0xE6
#define MB_CABLE_BOX_RESULTS_2 0xE7
#define MB_WIRELESS_BOX_RESULTS 0xE8
#define MB_TRAINER_HILL_TIMER 0xE9
#define MB_UNKNOWN_CLOSED_DOOR 0xEA
#endif // GUARD_METATILE_BEHAVIORS

5
ld_script.txt
View File

@ -90,7 +90,7 @@ SECTIONS {
src/new_game.o(.text); src/new_game.o(.text);
asm/rom4.o(.text); asm/rom4.o(.text);
asm/fieldmap.o(.text); asm/fieldmap.o(.text);
asm/metatile_behavior.o(.text); src/metatile_behavior.o(.text);
asm/field_camera.o(.text); asm/field_camera.o(.text);
asm/field_door.o(.text); asm/field_door.o(.text);
asm/field_player_avatar.o(.text); asm/field_player_avatar.o(.text);
@ -343,7 +343,8 @@ SECTIONS {
src/new_game.o(.rodata); src/new_game.o(.rodata);
data/rom4.o(.rodata); data/rom4.o(.rodata);
data/fieldmap.o(.rodata); data/fieldmap.o(.rodata);
data/metatile_behavior.o(.rodata); src/metatile_behavior.o(.rodata);
data/rom_8486FEC.o(.rodata);
data/field_door.o(.rodata); data/field_door.o(.rodata);
data/field_player_avatar.o(.rodata); data/field_player_avatar.o(.rodata);
data/field_map_obj.o(.rodata); data/field_map_obj.o(.rodata);

2
src/field_map_obj.c
View File

@ -3413,7 +3413,7 @@ bool8 mss_08062EA4(struct MapObject *mapObject, struct Sprite *sprite)
{ {
return FALSE; return FALSE;
} }
return gUnknown_0850DA64[player_get_x22()](mapObject, sprite, player_get_direction_upper_nybble(), sub_8088E64); return gUnknown_0850DA64[player_get_x22()](mapObject, sprite, player_get_direction_upper_nybble(), MetatileBehavior_IsPokeGrass);
} }
bool8 sub_80925AC(struct MapObject *, struct Sprite *); bool8 sub_80925AC(struct MapObject *, struct Sprite *);

1436
src/metatile_behavior.c Normal file
View File

File diff suppressed because it is too large Load Diff