dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
paul
2018-11-20 19:03:24 +01:00
parent 4fc60e3f70 2ed26ab8fc
commit 284bbf91af
26 changed files with 3705 additions and 4921 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_setup.s
+12 -12
View File
@@ -763,7 +763,7 @@ sub_807FC5C: @ 807FC5C
lsls r0, r5, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8059F34
bl MetatileBehavior_IsTallGrass_2
lsls r0, 24
cmp r0, 0
beq _0807FC92
@@ -771,7 +771,7 @@ sub_807FC5C: @ 807FC5C
b _0807FD88
_0807FC92:
adds r0, r4, 0
bl sub_8059F4C
bl MetatileBehavior_ReturnFalse_3
lsls r0, 24
cmp r0, 0
beq _0807FCA2
@@ -779,7 +779,7 @@ _0807FC92:
b _0807FD88
_0807FCA2:
adds r0, r4, 0
bl sub_8059B74
bl MetatileBehavior_IsMB21OrWaterfallBottom
lsls r0, 24
cmp r0, 0
beq _0807FCB2
@@ -814,7 +814,7 @@ _0807FCF4:
lsls r0, r5, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl MetatileBehavior_IsMB_0B
bl MetatileBehavior_IsMB0B
lsls r0, 24
cmp r0, 0
beq _0807FD08
@@ -823,7 +823,7 @@ _0807FD04:
b _0807FD88
_0807FD08:
adds r0, r4, 0
bl sub_8059CA4
bl MetatileBehavior_IsSurfable
lsls r0, 24
cmp r0, 0
bne _0807FD70
@@ -835,7 +835,7 @@ _0807FD18:
_0807FD1C:
lsls r0, r5, 24
lsrs r0, 24
bl sub_8059CA4
bl MetatileBehavior_IsSurfable
lsls r0, 24
cmp r0, 0
bne _0807FD82
@@ -844,17 +844,17 @@ _0807FD2C:
lsls r0, r5, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_805A01C
bl MetatileBehavior_IsDeepSemiDeepOrSplashingWater
lsls r0, 24
cmp r0, 0
bne _0807FD82
adds r0, r4, 0
bl sub_8059CA4
bl MetatileBehavior_IsSurfable
lsls r0, 24
cmp r0, 0
bne _0807FD70
adds r0, r4, 0
bl MetatileBehavior_IsMountain
bl MetatileBehavior_IsMB0C
lsls r0, 24
cmp r0, 0
beq _0807FD58
@@ -867,7 +867,7 @@ _0807FD58:
cmp r0, 0
beq _0807FD86
adds r0, r4, 0
bl sub_8059F5C
bl MetatileBehavior_ReturnFalse_7
lsls r0, 24
cmp r0, 0
beq _0807FD74
@@ -876,7 +876,7 @@ _0807FD70:
b _0807FD88
_0807FD74:
adds r0, r4, 0
bl sub_8059F58
bl MetatileBehavior_ReturnFalse_6
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -919,7 +919,7 @@ GetBattleTransitionTypeByMap: @ 807FD90
_0807FDC0:
lsls r0, r4, 24
lsrs r0, 24
bl sub_8059CA4
bl MetatileBehavior_IsSurfable
lsls r0, 24
cmp r0, 0
bne _0807FDE8
asm/bike.s
+10 -10
View File
@@ -87,7 +87,7 @@ sub_80BD100: @ 80BD100
mov r0, r8
strb r0, [r5, 0xA]
ldrb r0, [r4, 0x1E]
bl sub_805A1DC
bl MetatileBehavior_IsCyclingRoadPullDownTile
cmp r0, 0x1
bne _080BD176
ldr r0, _080BD164 @ =gMain
@@ -207,7 +207,7 @@ sub_80BD1E8: @ 80BD1E8
ldr r1, _080BD244 @ =gMapObjects
adds r0, r1
ldrb r0, [r0, 0x1E]
bl sub_805A1DC
bl MetatileBehavior_IsCyclingRoadPullDownTile
adds r2, r0, 0
cmp r2, 0x1
bne _080BD25A
@@ -572,12 +572,12 @@ sub_80BD4B8: @ 80BD4B8
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_805A234
bl MetatileBehavior_IsMB0A
lsls r0, 24
cmp r0, 0
bne _080BD4E2
adds r0, r4, 0
bl sub_805A118
bl MetatileBehavior_ReturnFalse_9
lsls r0, 24
cmp r0, 0
beq _080BD4E6
@@ -611,21 +611,21 @@ sub_80BD4F0: @ 80BD4F0
cmp r0, 0x1
bhi _080BD51A
adds r0, r4, 0
bl sub_805A210
bl MetatileBehavior_ReturnFalse_15
lsls r0, 24
cmp r0, 0
bne _080BD532
adds r0, r4, 0
bl sub_805A218
bl MetatileBehavior_ReturnFalse_17
b _080BD52C
_080BD51A:
adds r0, r5, 0
bl sub_805A214
bl MetatileBehavior_ReturnFalse_16
lsls r0, 24
cmp r0, 0
bne _080BD532
adds r0, r5, 0
bl sub_805A21C
bl MetatileBehavior_ReturnFalse_18
_080BD52C:
lsls r0, 24
cmp r0, 0
@@ -697,7 +697,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C
lsls r0, 2
adds r0, r2
ldrb r0, [r0, 0x1E]
bl sub_805A20C
bl MetatileBehavior_ReturnFalse_14
lsls r0, 24
cmp r0, 0
beq _080BD5C0
@@ -875,7 +875,7 @@ Bike_HandleBumpySlopeJump: @ 80BD6C4
bl sub_8058F78
lsls r0, 24
lsrs r0, 24
bl sub_805A20C
bl MetatileBehavior_ReturnFalse_14
lsls r0, 24
cmp r0, 0
beq _080BD70C
asm/field_control_avatar.s
+65 -65
View File
@@ -53,7 +53,7 @@ sub_806C8BC: @ 806C8BC
bl cur_mapdata_block_role_at_player_pos
lsls r0, 24
lsrs r0, 24
bl sub_8059D70
bl MetatileBehavior_IsForcedMovementTile
lsls r0, 24
lsrs r7, r0, 24
bl ScriptContext1_IsScriptSetUp
@@ -1226,7 +1226,7 @@ _0806D210: .4byte gUnknown_20370D4
_0806D214: .4byte gUnknown_81A6955
_0806D218:
adds r0, r4, 0
bl sub_805A134
bl MetatileBehavior_IsRegionMap
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1237,7 +1237,7 @@ _0806D218:
_0806D22C: .4byte gUnknown_81A6C32
_0806D230:
adds r0, r4, 0
bl sub_805A24C
bl MetatileBehavior_IsBookshelf
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1248,7 +1248,7 @@ _0806D230:
_0806D244: .4byte gUnknown_81A7606
_0806D248:
adds r0, r4, 0
bl sub_805A260
bl MetatileBehavior_IsPokeMartShelf
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1259,7 +1259,7 @@ _0806D248:
_0806D25C: .4byte gUnknown_81A760F
_0806D260:
adds r0, r4, 0
bl sub_805A44C
bl MetatileBehavior_IsFood
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1270,7 +1270,7 @@ _0806D260:
_0806D274: .4byte gUnknown_81A7618
_0806D278:
adds r0, r4, 0
bl sub_805A558
bl MetatileBehavior_IsImpressiveMachine
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1281,7 +1281,7 @@ _0806D278:
_0806D28C: .4byte gUnknown_81A7633
_0806D290:
adds r0, r4, 0
bl sub_805A474
bl MetatileBehavior_IsBlueprints
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1292,7 +1292,7 @@ _0806D290:
_0806D2A4: .4byte gUnknown_81A763C
_0806D2A8:
adds r0, r4, 0
bl sub_805A56C
bl MetatileBehavior_IsVideoGame
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1303,7 +1303,7 @@ _0806D2A8:
_0806D2BC: .4byte gUnknown_81A7621
_0806D2C0:
adds r0, r4, 0
bl sub_805A580
bl MetatileBehavior_IsBurglary
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1314,7 +1314,7 @@ _0806D2C0:
_0806D2D4: .4byte gUnknown_81A7645
_0806D2D8:
adds r0, r4, 0
bl sub_805A4C4
bl MetatileBehavior_IsComputer
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1325,7 +1325,7 @@ _0806D2D8:
_0806D2EC: .4byte gUnknown_81A762A
_0806D2F0:
adds r0, r4, 0
bl sub_805A594
bl MetatileBehavior_IsMBA3
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1348,7 +1348,7 @@ _0806D308:
_0806D31C: .4byte gUnknown_81A764E
_0806D320:
adds r0, r4, 0
bl sub_805A374
bl MetatileBehavior_IsCabinet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1359,7 +1359,7 @@ _0806D320:
_0806D334: .4byte gUnknown_81A7657
_0806D338:
adds r0, r4, 0
bl sub_805A388
bl MetatileBehavior_IsKitchen
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1370,7 +1370,7 @@ _0806D338:
_0806D34C: .4byte gUnknown_81A7660
_0806D350:
adds r0, r4, 0
bl sub_805A39C
bl MetatileBehavior_IsDresser
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1381,7 +1381,7 @@ _0806D350:
_0806D364: .4byte gUnknown_81A7669
_0806D368:
adds r0, r4, 0
bl sub_805A3B0
bl MetatileBehavior_IsSnacks
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1392,7 +1392,7 @@ _0806D368:
_0806D37C: .4byte gUnknown_81A7672
_0806D380:
adds r0, r4, 0
bl sub_805A488
bl MetatileBehavior_IsPainting
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1403,7 +1403,7 @@ _0806D380:
_0806D394: .4byte gUnknown_81A767B
_0806D398:
adds r0, r4, 0
bl sub_805A49C
bl MetatileBehavior_IsPowerPlantMachine
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1414,7 +1414,7 @@ _0806D398:
_0806D3AC: .4byte gUnknown_81A7684
_0806D3B0:
adds r0, r4, 0
bl sub_805A4B0
bl MetatileBehavior_IsTelephone
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1425,7 +1425,7 @@ _0806D3B0:
_0806D3C4: .4byte gUnknown_81A768D
_0806D3C8:
adds r0, r4, 0
bl sub_805A4D8
bl MetatileBehavior_IsAdvertisingPoster
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1436,7 +1436,7 @@ _0806D3C8:
_0806D3DC: .4byte gUnknown_81A7696
_0806D3E0:
adds r0, r4, 0
bl sub_805A4EC
bl MetatileBehavior_IsTastyFood
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1447,7 +1447,7 @@ _0806D3E0:
_0806D3F4: .4byte gUnknown_81A769F
_0806D3F8:
adds r0, r4, 0
bl sub_805A500
bl MetatileBehavior_IsTrashBin
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1458,7 +1458,7 @@ _0806D3F8:
_0806D40C: .4byte gUnknown_81A76A8
_0806D410:
adds r0, r4, 0
bl sub_805A514
bl MetatileBehavior_IsCup
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1469,7 +1469,7 @@ _0806D410:
_0806D424: .4byte gUnknown_81A76B1
_0806D428:
adds r0, r4, 0
bl sub_805A528
bl MetatileBehavior_ReturnFalse_19
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1480,7 +1480,7 @@ _0806D428:
_0806D43C: .4byte gUnknown_81A76BA
_0806D440:
adds r0, r4, 0
bl sub_805A52C
bl MetatileBehavior_ReturnFalse_20
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1491,7 +1491,7 @@ _0806D440:
_0806D454: .4byte gUnknown_81A76C3
_0806D458:
adds r0, r4, 0
bl sub_805A530
bl MetatileBehavior_IsBlinkingLights
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1502,7 +1502,7 @@ _0806D458:
_0806D46C: .4byte gUnknown_81A76CC
_0806D470:
adds r0, r4, 0
bl sub_805A544
bl MetatileBehavior_IsMB9F
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1514,7 +1514,7 @@ _0806D484: .4byte gUnknown_81A76D5
_0806D488:
adds r0, r4, 0
adds r1, r5, 0
bl sub_805A3D8
bl MetatileBehavior_IsPlayerFacingMB_8D
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1525,7 +1525,7 @@ _0806D488:
_0806D49C: .4byte gUnknown_81BBFD8
_0806D4A0:
adds r0, r4, 0
bl sub_805A410
bl MetatileBehavior_IsQuestionnaire
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1537,7 +1537,7 @@ _0806D4B4: .4byte gUnknown_81A7702
_0806D4B8:
adds r0, r4, 0
adds r1, r5, 0
bl sub_805A3F4
bl MetatileBehavior_IsPlayerFacingBattleRecords
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1548,7 +1548,7 @@ _0806D4B8:
_0806D4CC: .4byte gUnknown_81BB8A7
_0806D4D0:
adds r0, r4, 0
bl sub_805A424
bl MetatileBehavior_IsIndigoPlateauMark
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1560,7 +1560,7 @@ _0806D4D0:
_0806D4E8: .4byte gUnknown_81A76F0
_0806D4EC:
adds r0, r4, 0
bl sub_805A438
bl MetatileBehavior_IsIndigoPlateauMark2
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1573,7 +1573,7 @@ _0806D504: .4byte gUnknown_81A76F9
_0806D508:
adds r0, r4, 0
adds r1, r5, 0
bl sub_805A290
bl MetatileBehavior_IsPlayerFacingPokeMartSign
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1586,7 +1586,7 @@ _0806D520: .4byte gUnknown_81A76DE
_0806D524:
adds r0, r4, 0
adds r1, r5, 0
bl sub_805A274
bl MetatileBehavior_IsPlayerFacingPokemonCenterSign
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1610,7 +1610,7 @@ sub_806D548: @ 806D548
lsls r1, 24
lsrs r4, r1, 24
adds r0, r4, 0
bl sub_8059CC8
bl MetatileBehavior_IsSemiDeepWater
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1721,7 +1721,7 @@ sub_806D5E8: @ 806D5E8
bne _0806D658
lsls r0, r6, 24
lsrs r0, 24
bl sub_8059D70
bl MetatileBehavior_IsForcedMovementTile
lsls r0, 24
cmp r0, 0
bne _0806D658
@@ -1800,7 +1800,7 @@ sub_806D698: @ 806D698
bne _0806D720
lsls r0, r4, 24
lsrs r0, 24
bl sub_8059D70
bl MetatileBehavior_IsForcedMovementTile
lsls r0, 24
cmp r0, 0
bne _0806D720
@@ -2057,7 +2057,7 @@ sub_806D898: @ 806D898
lsrs r4, r0, 24
adds r0, r4, 0
adds r1, r5, 0
bl sub_805A274
bl MetatileBehavior_IsPlayerFacingPokemonCenterSign
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2067,7 +2067,7 @@ sub_806D898: @ 806D898
_0806D8B6:
adds r0, r4, 0
adds r1, r5, 0
bl sub_805A290
bl MetatileBehavior_IsPlayerFacingPokeMartSign
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2076,7 +2076,7 @@ _0806D8B6:
b _0806D902
_0806D8CA:
adds r0, r4, 0
bl sub_805A424
bl MetatileBehavior_IsIndigoPlateauMark
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2085,7 +2085,7 @@ _0806D8CA:
b _0806D902
_0806D8DC:
adds r0, r4, 0
bl sub_805A438
bl MetatileBehavior_IsIndigoPlateauMark2
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2094,7 +2094,7 @@ _0806D8DC:
b _0806D902
_0806D8EE:
adds r0, r4, 0
bl sub_805A360
bl MetatileBehavior_IsSignpost
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2273,7 +2273,7 @@ sub_806DA10: @ 806DA10
lsls r0, r5, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8059BF0
bl MetatileBehavior_IsEscalator
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2286,7 +2286,7 @@ sub_806DA10: @ 806DA10
_0806DA68: .4byte gMapHeader
_0806DA6C:
adds r0, r4, 0
bl sub_805A158
bl MetatileBehavior_ReturnFalse_12
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2296,7 +2296,7 @@ _0806DA6C:
b _0806DAEE
_0806DA82:
adds r0, r4, 0
bl MetatileBehavior_IsLavaridge1FWarp
bl MetatileBheavior_IsMB_68
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2306,7 +2306,7 @@ _0806DA82:
b _0806DAEE
_0806DA98:
adds r0, r4, 0
bl MetatileBehavior_IsAquaHideoutWarp
bl MetatileBehavior_IsRegularWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2316,7 +2316,7 @@ _0806DA98:
b _0806DAEE
_0806DAAE:
adds r0, r4, 0
bl sub_805A184
bl MetatileBehavior_IsUnionRoomWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2326,7 +2326,7 @@ _0806DAAE:
b _0806DAEE
_0806DAC4:
adds r0, r4, 0
bl sub_805A1C4
bl MetatileBehavior_IsFallWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2362,49 +2362,49 @@ sub_806DAF4: @ 806DAF4
cmp r0, 0x1
beq _0806DB7C
adds r0, r4, 0
bl sub_8059C78
bl MetatileBehavior_IsLadder
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0806DB7C
adds r0, r4, 0
bl sub_8059BF0
bl MetatileBehavior_IsEscalator
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0806DB7C
adds r0, r4, 0
bl sub_8059C8C
bl MetatileBehavior_IsCaveDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0806DB7C
adds r0, r4, 0
bl sub_805A158
bl MetatileBehavior_ReturnFalse_12
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0806DB7C
adds r0, r4, 0
bl MetatileBehavior_IsLavaridge1FWarp
bl MetatileBheavior_IsMB_68
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0806DB7C
adds r0, r4, 0
bl MetatileBehavior_IsAquaHideoutWarp
bl MetatileBehavior_IsRegularWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0806DB7C
adds r0, r4, 0
bl sub_805A1C4
bl MetatileBehavior_IsFallWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0806DB7C
adds r0, r4, 0
bl sub_805A184
bl MetatileBehavior_IsUnionRoomWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2435,23 +2435,23 @@ _0806DB98:
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8059C20
bl MetatileBehavior_IsUnknownWarp6D
lsls r0, 24
cmp r0, 0
bne _0806DBCC
adds r0, r4, 0
bl sub_8059C48
bl MetatileBehavior_IsUnknownWarp6F
b _0806DBC6
_0806DBB0:
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8059C0C
bl MetatileBehavior_IsUnknownWarp6C
lsls r0, 24
cmp r0, 0
bne _0806DBCC
adds r0, r4, 0
bl sub_8059C34
bl MetatileBehavior_IsUnknownWarp6E
_0806DBC6:
lsls r0, 24
cmp r0, 0
@@ -2491,12 +2491,12 @@ _0806DBF2:
_0806DBFC:
lsls r0, 24
lsrs r0, 24
bl sub_8059D04
bl MetatileBehavior_IsNorthArrowWarp
b _0806DC22
_0806DC06:
lsls r0, 24
lsrs r0, 24
bl sub_8059D18
bl MetatileBehavior_IsSouthArrowWarp
b _0806DC22
_0806DC10:
lsls r0, 24
@@ -2952,7 +2952,7 @@ dive_warp: @ 806DF3C
bne _0806DF74
lsls r0, r5, 24
lsrs r0, 24
bl sub_8059FCC
bl MetatileBehavior_IsMB19
lsls r0, 24
cmp r0, 0
bne _0806DF74
@@ -2971,7 +2971,7 @@ _0806DF70: .4byte gMapHeader
_0806DF74:
lsls r0, r5, 24
lsrs r0, 24
bl sub_8059FB0
bl MetatileBehavior_IsDeepOrSemiDeepWater
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3025,7 +3025,7 @@ sub_806DFB8: @ 806DFB8
cmp r0, 0x5
bne _0806E014
adds r0, r5, 0
bl sub_8059FCC
bl MetatileBehavior_IsMB19
lsls r0, 24
cmp r0, 0
bne _0806E014
@@ -3049,7 +3049,7 @@ sub_806DFB8: @ 806DFB8
_0806E010: .4byte gMapHeader
_0806E014:
adds r0, r5, 0
bl sub_8059FB0
bl MetatileBehavior_IsDeepOrSemiDeepWater
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
asm/field_door.s
+4 -4
View File
@@ -490,7 +490,7 @@ sub_805B268: @ 805B268
bl sub_8058F78
lsls r0, 24
lsrs r0, 24
bl sub_8059BDC
bl MetatileBehavior_IsWarpDoor_2
lsls r0, 24
cmp r0, 0
beq _0805B292
@@ -518,7 +518,7 @@ sub_805B29C: @ 805B29C
bl sub_8058F78
lsls r0, 24
lsrs r0, 24
bl sub_8059BDC
bl MetatileBehavior_IsWarpDoor_2
lsls r0, 24
cmp r0, 0
beq _0805B2C6
@@ -546,7 +546,7 @@ sub_805B2D0: @ 805B2D0
bl sub_8058F78
lsls r0, 24
lsrs r0, 24
bl sub_8059BDC
bl MetatileBehavior_IsWarpDoor_2
lsls r0, 24
cmp r0, 0
beq _0805B304
@@ -580,7 +580,7 @@ sub_805B310: @ 805B310
bl sub_8058F78
lsls r0, 24
lsrs r0, 24
bl sub_8059BDC
bl MetatileBehavior_IsWarpDoor_2
lsls r0, 24
cmp r0, 0
beq _0805B344
asm/field_effect_helpers.s
+9 -9
View File
@@ -134,13 +134,13 @@ npc_pal_op: @ 80DAE54
cmp r0, 0
bne _080DAEB0
ldrb r0, [r5, 0x1F]
bl sub_8059F5C
bl MetatileBehavior_ReturnFalse_7
lsls r0, 24
lsrs r0, 24
cmp r0, 0
bne _080DAE96
ldrb r0, [r5, 0x1E]
bl sub_8059F5C
bl MetatileBehavior_ReturnFalse_7
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -714,27 +714,27 @@ _080DB2AE:
cmp r0, r1
bne _080DB32C
ldrb r0, [r4, 0x1E]
bl sub_8059B44
bl MetatileBehavior_IsTallGrass
lsls r0, 24
cmp r0, 0
bne _080DB32C
ldrb r0, [r4, 0x1E]
bl sub_8059CA4
bl MetatileBehavior_IsSurfable
lsls r0, 24
cmp r0, 0
bne _080DB32C
ldrb r0, [r4, 0x1F]
bl sub_8059CA4
bl MetatileBehavior_IsSurfable
lsls r0, 24
cmp r0, 0
bne _080DB32C
ldrb r0, [r4, 0x1E]
bl sub_8059B90
bl MetatileBehavior_IsReflective
lsls r0, 24
cmp r0, 0
bne _080DB32C
ldrb r0, [r4, 0x1F]
bl sub_8059B90
bl MetatileBehavior_IsReflective
lsls r0, 24
cmp r0, 0
beq _080DB334
@@ -900,7 +900,7 @@ _080DB438:
cmp r0, 0
bne _080DB48C
adds r0, r6, 0
bl sub_8059F34
bl MetatileBehavior_IsTallGrass_2
lsls r0, 24
cmp r0, 0
beq _080DB48C
@@ -1251,7 +1251,7 @@ _080DB6E8:
cmp r0, 0
bne _080DB73C
adds r0, r4, 0
bl sub_8059F4C
bl MetatileBehavior_ReturnFalse_3
lsls r0, 24
cmp r0, 0
beq _080DB73C
asm/field_fadetransition.s
+9 -9
View File
@@ -465,7 +465,7 @@ sub_807DE78: @ 807DE78
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl sub_8059BDC
bl MetatileBehavior_IsWarpDoor_2
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -500,7 +500,7 @@ _0807DEE8:
adds r0, r5, 0
bl sub_807DF4C
adds r0, r4, 0
bl sub_8059C8C
bl MetatileBehavior_IsCaveDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -511,7 +511,7 @@ _0807DEE8:
_0807DF00: .4byte task_map_chg_seq_0807E20C
_0807DF04:
adds r0, r4, 0
bl sub_8059C5C
bl MetatileBehavior_IsUnknownWarp6C_to_6F
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2105,7 +2105,7 @@ sub_807EBBC: @ 807EBBC
lsrs r4, r0, 24
adds r7, r4, 0
adds r0, r4, 0
bl sub_8059C0C
bl MetatileBehavior_IsUnknownWarp6C
lsls r0, 24
cmp r0, 0
beq _0807EBE0
@@ -2117,7 +2117,7 @@ sub_807EBBC: @ 807EBBC
b _0807EC2A
_0807EBE0:
adds r0, r4, 0
bl sub_8059C20
bl MetatileBehavior_IsUnknownWarp6D
lsls r0, 24
cmp r0, 0
beq _0807EBFA
@@ -2130,7 +2130,7 @@ _0807EBE0:
b _0807EC2A
_0807EBFA:
adds r0, r4, 0
bl sub_8059C34
bl MetatileBehavior_IsUnknownWarp6E
lsls r0, 24
cmp r0, 0
beq _0807EC0E
@@ -2140,7 +2140,7 @@ _0807EBFA:
b _0807EC2A
_0807EC0E:
adds r0, r7, 0
bl sub_8059C48
bl MetatileBehavior_IsUnknownWarp6F
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -2251,12 +2251,12 @@ sub_807ECBC: @ 807ECBC
lsls r0, 24
lsrs r6, r0, 24
adds r0, r6, 0
bl sub_8059C34
bl MetatileBehavior_IsUnknownWarp6E
lsls r0, 24
cmp r0, 0
bne _0807ED06
adds r0, r6, 0
bl sub_8059C0C
bl MetatileBehavior_IsUnknownWarp6C
lsls r0, 24
cmp r0, 0
beq _0807ED0A
asm/field_ground_effect.s
+22 -22
View File
@@ -186,7 +186,7 @@ GetGroundEffectFlags_TallGrassOnSpawn: @ 8067CA8
push {r4,lr}
adds r4, r1, 0
ldrb r0, [r0, 0x1E]
bl sub_8059F34
bl MetatileBehavior_IsTallGrass_2
lsls r0, 24
cmp r0, 0
beq _08067CC0
@@ -205,7 +205,7 @@ GetGroundEffectFlags_TallGrassOnBeginStep: @ 8067CC8
push {r4,lr}
adds r4, r1, 0
ldrb r0, [r0, 0x1E]
bl sub_8059F34
bl MetatileBehavior_IsTallGrass_2
lsls r0, 24
cmp r0, 0
beq _08067CE0
@@ -224,7 +224,7 @@ GetGroundEffectFlags_LongGrassOnSpawn: @ 8067CE8
push {r4,lr}
adds r4, r1, 0
ldrb r0, [r0, 0x1E]
bl sub_8059F4C
bl MetatileBehavior_ReturnFalse_3
lsls r0, 24
cmp r0, 0
beq _08067D00
@@ -243,7 +243,7 @@ GetGroundEffectFlags_LongGrassOnBeginStep: @ 8067D08
push {r4,lr}
adds r4, r1, 0
ldrb r0, [r0, 0x1E]
bl sub_8059F4C
bl MetatileBehavior_ReturnFalse_3
lsls r0, 24
cmp r0, 0
beq _08067D20
@@ -263,7 +263,7 @@ GetGroundEffectFlags_Tracks: @ 8067D28
adds r4, r0, 0
adds r5, r1, 0
ldrb r0, [r4, 0x1F]
bl sub_8059B8C
bl MetatileBehavior_ReturnFalse
lsls r0, 24
cmp r0, 0
beq _08067D42
@@ -273,12 +273,12 @@ GetGroundEffectFlags_Tracks: @ 8067D28
b _08067D5E
_08067D42:
ldrb r0, [r4, 0x1F]
bl sub_8059B5C
bl MetatileBehavior_IsMB21OrSand
lsls r0, 24
cmp r0, 0
bne _08067D5A
ldrb r0, [r4, 0x1F]
bl sub_8059F54
bl MetatileBehavior_ReturnFalse_5
lsls r0, 24
cmp r0, 0
beq _08067D62
@@ -300,12 +300,12 @@ GetGroundEffectFlags_SandHeap: @ 8067D68
adds r4, r0, 0
adds r5, r1, 0
ldrb r0, [r4, 0x1E]
bl sub_8059B8C
bl MetatileBehavior_ReturnFalse
lsls r0, 24
cmp r0, 0
beq _08067DA6
ldrb r0, [r4, 0x1F]
bl sub_8059B8C
bl MetatileBehavior_ReturnFalse
lsls r0, 24
cmp r0, 0
beq _08067DA6
@@ -343,23 +343,23 @@ GetGroundEffectFlags_ShallowFlowingWater: @ 8067DB8
adds r4, r0, 0
adds r5, r1, 0
ldrb r0, [r4, 0x1E]
bl sub_8059FE0
bl MetatileBehavior_IsWaterfallBottom
lsls r0, 24
cmp r0, 0
beq _08067DD6
ldrb r0, [r4, 0x1F]
bl sub_8059FE0
bl MetatileBehavior_IsWaterfallBottom
lsls r0, 24
cmp r0, 0
bne _08067DEE
_08067DD6:
ldrb r0, [r4, 0x1E]
bl sub_805A12C
bl MetatileBehavior_ReturnFalse_10
lsls r0, 24
cmp r0, 0
beq _08067E0C
ldrb r0, [r4, 0x1F]
bl sub_805A12C
bl MetatileBehavior_ReturnFalse_10
lsls r0, 24
cmp r0, 0
beq _08067E0C
@@ -397,12 +397,12 @@ GetGroundEffectFlags_Puddle: @ 8067E1C
adds r4, r0, 0
adds r5, r1, 0
ldrb r0, [r4, 0x1E]
bl sub_8059F20
bl MetatileBehavior_IsPuddle
lsls r0, 24
cmp r0, 0
beq _08067E44
ldrb r0, [r4, 0x1F]
bl sub_8059F20
bl MetatileBehavior_IsPuddle
lsls r0, 24
cmp r0, 0
beq _08067E44
@@ -422,7 +422,7 @@ GetGroundEffectFlags_Ripple: @ 8067E4C
push {r4,lr}
adds r4, r1, 0
ldrb r0, [r0, 0x1E]
bl sub_8059F08
bl MetatileBehavior_IsPondWaterOrPuddle
lsls r0, 24
cmp r0, 0
beq _08067E66
@@ -443,12 +443,12 @@ GetGroundEffectFlags_ShortGrass: @ 8067E6C
adds r4, r0, 0
adds r5, r1, 0
ldrb r0, [r4, 0x1E]
bl sub_805A0EC
bl MetatileBehavior_ReturnFalse_8
lsls r0, 24
cmp r0, 0
beq _08067EAA
ldrb r0, [r4, 0x1F]
bl sub_805A0EC
bl MetatileBehavior_ReturnFalse_8
lsls r0, 24
cmp r0, 0
beq _08067EAA
@@ -528,7 +528,7 @@ GetGroundEffectFlags_Seaweed: @ 8067F0C
push {r4,lr}
adds r4, r1, 0
ldrb r0, [r0, 0x1E]
bl sub_805A220
bl MetatileBehavior_IsMB22
lsls r0, 24
cmp r0, 0
beq _08067F26
@@ -763,7 +763,7 @@ GetReflectionTypeByMetatileBehavior: @ 80680C8
b _080680F0
_080680DE:
adds r0, r4, 0
bl sub_8059B90
bl MetatileBehavior_IsReflective
lsls r0, 24
cmp r0, 0
bne _080680EE
@@ -838,12 +838,12 @@ FieldObjectSetSpriteOamTableForLongGrass: @ 8068154
cmp r0, 0
blt _080681A8
ldrb r0, [r5, 0x1E]
bl sub_8059F4C
bl MetatileBehavior_ReturnFalse_3
lsls r0, 24
cmp r0, 0
beq _080681A8
ldrb r0, [r5, 0x1F]
bl sub_8059F4C
bl MetatileBehavior_ReturnFalse_3
lsls r0, 24
cmp r0, 0
beq _080681A8
asm/field_map_obj.s
+4 -4
View File
@@ -11129,7 +11129,7 @@ _08062ED0:
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
ldr r3, _08062F04 @ =sub_8059B44
ldr r3, _08062F04 @ =MetatileBehavior_IsTallGrass
ldr r4, [r4]
adds r0, r6, 0
adds r1, r7, 0
@@ -11142,7 +11142,7 @@ _08062EF8:
bx r1
.align 2, 0
_08062F00: .4byte gUnknown_83A6390
_08062F04: .4byte sub_8059B44
_08062F04: .4byte MetatileBehavior_IsTallGrass
thumb_func_end mss_08062EA4
thumb_func_start FieldObjectCB_TreeDisguise
@@ -13373,13 +13373,13 @@ sub_8063E28: @ 8063E28
bl sub_8064544
_08063E5C:
ldrb r0, [r4, 0x1E]
bl sub_8059DAC
bl MetatileBehavior_IsIce_2
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08063E78
ldrb r0, [r4, 0x1E]
bl sub_8059DC0
bl MetatileBehavior_IsUnknownMovement48
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
asm/field_player_avatar.s
+9 -9
View File
@@ -213,7 +213,7 @@ sub_805B528: @ 805B528
cmp r0, 0
beq _0805B598
ldrb r0, [r5, 0x1C]
bl sub_805A344
bl MetatileBehavior_IsSpinTile
lsls r0, 24
cmp r0, 0
beq _0805B598
@@ -230,13 +230,13 @@ sub_805B528: @ 805B528
cmp r0, 0
beq _0805B586
ldrb r0, [r1, 0x1E]
bl sub_805A330
bl MetatileBehavior_IsStopSpinning
lsls r0, 24
cmp r0, 0
bne _0805B598
ldr r0, [r4]
ldrb r0, [r0, 0x1E]
bl sub_805A344
bl MetatileBehavior_IsSpinTile
lsls r0, 24
cmp r0, 0
beq _0805B57A
@@ -1015,7 +1015,7 @@ _0805BB00:
bl sub_8058F78
lsls r0, 24
lsrs r0, 24
bl sub_805A460
bl MetatileBehavior_IsRockStairs
lsls r0, 24
lsrs r0, 24
b _0805BB14
@@ -1335,7 +1335,7 @@ sub_805BCEC: @ 805BCEC
bl sub_8058F78
lsls r0, 24
lsrs r0, 24
bl sub_8059C8C
bl MetatileBehavior_IsCaveDoor
lsls r0, 24
cmp r0, 0
bne _0805BDA0
@@ -2322,12 +2322,12 @@ sub_805C438: @ 805C438
cmp r5, 0x3
bne _0805C484
adds r0, r4, 0
bl sub_8059C20
bl MetatileBehavior_IsUnknownWarp6D
lsls r0, 24
cmp r0, 0
bne _0805C4DE
adds r0, r4, 0
bl sub_8059C48
bl MetatileBehavior_IsUnknownWarp6F
lsls r0, 24
cmp r0, 0
bne _0805C4DE
@@ -2335,12 +2335,12 @@ _0805C484:
cmp r5, 0x4
bne _0805C4A0
adds r0, r4, 0
bl sub_8059C0C
bl MetatileBehavior_IsUnknownWarp6C
lsls r0, 24
cmp r0, 0
bne _0805C4DE
adds r0, r4, 0
bl sub_8059C34
bl MetatileBehavior_IsUnknownWarp6E
lsls r0, 24
cmp r0, 0
bne _0805C4DE
asm/field_tasks.s
+2 -2
View File
@@ -481,7 +481,7 @@ _0806EB8E:
bl sub_8058F78
lsls r0, 24
lsrs r0, 24
bl sub_8059F50
bl MetatileBehavior_ReturnFalse_4
lsls r0, 24
cmp r0, 0
beq _0806EBF6
@@ -633,7 +633,7 @@ _0806ECCE:
strh r0, [r5, 0x6]
lsls r0, r7, 24
lsrs r0, 24
bl sub_805A1D8
bl MetatileBehavior_ReturnFalse_13
lsls r0, 24
cmp r0, 0
beq _0806ED2E
asm/item_use.s
+6 -6
View File
@@ -359,25 +359,25 @@ sub_80A122C: @ 80A122C
cmp r0, 0x1
beq _080A129A
adds r0, r4, 0
bl sub_805A218
bl MetatileBehavior_ReturnFalse_17
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _080A129A
adds r0, r4, 0
bl sub_805A21C
bl MetatileBehavior_ReturnFalse_18
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _080A129A
adds r0, r4, 0
bl sub_805A210
bl MetatileBehavior_ReturnFalse_15
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _080A129A
adds r0, r4, 0
bl sub_805A214
bl MetatileBehavior_ReturnFalse_16
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -535,7 +535,7 @@ _080A13D0:
b _080A1406
_080A13D4:
adds r0, r5, 0
bl sub_8059CA4
bl MetatileBehavior_IsSurfable
lsls r0, 24
cmp r0, 0
beq _080A13F4
@@ -551,7 +551,7 @@ _080A13D4:
_080A13F4:
lsls r0, r6, 24
lsrs r0, 24
bl sub_8059F58
bl MetatileBehavior_ReturnFalse_6
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
asm/metatile_behavior.s
-2194
View File
File diff suppressed because it is too large Load Diff
asm/overworld.s
+14 -14
View File
@@ -1984,7 +1984,7 @@ _08055AF4:
beq _08055B30
lsls r0, r5, 24
lsrs r0, 24
bl sub_8059CA4
bl MetatileBehavior_IsSurfable
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2018,7 +2018,7 @@ sub_8055B38: @ 8055B38
push {lr}
lsls r0, 24
lsrs r0, 24
bl sub_8059CA4
bl MetatileBehavior_IsSurfable
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2067,25 +2067,25 @@ _08055B94:
lsls r4, 24
lsrs r5, r4, 24
adds r0, r5, 0
bl sub_8059CA0
bl MetatileBehavior_ReturnFalse_2
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08055BD0
adds r0, r5, 0
bl sub_8059C8C
bl MetatileBehavior_IsCaveDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08055C68
adds r0, r5, 0
bl sub_8059BDC
bl MetatileBehavior_IsWarpDoor_2
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08055C68
adds r0, r5, 0
bl sub_8059D18
bl MetatileBehavior_IsSouthArrowWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2097,7 +2097,7 @@ _08055BD0:
_08055BD4: .4byte 0x00000802
_08055BD8:
adds r0, r5, 0
bl sub_8059D04
bl MetatileBehavior_IsNorthArrowWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2115,13 +2115,13 @@ _08055BD8:
cmp r0, 0x1
beq _08055C1E
adds r0, r5, 0
bl sub_8059C0C
bl MetatileBehavior_IsUnknownWarp6C
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08055C1E
adds r0, r5, 0
bl sub_8059C34
bl MetatileBehavior_IsUnknownWarp6E
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2131,13 +2131,13 @@ _08055C1E:
b _08055C6E
_08055C22:
adds r0, r5, 0
bl sub_8059C20
bl MetatileBehavior_IsUnknownWarp6D
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08055C3E
adds r0, r5, 0
bl sub_8059C48
bl MetatileBehavior_IsUnknownWarp6F
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2158,7 +2158,7 @@ _08055C4C:
beq _08055C6C
_08055C54:
lsrs r0, r4, 24
bl sub_8059C78
bl MetatileBehavior_IsLadder
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2680,7 +2680,7 @@ sub_8055FE0: @ 8055FE0
bl sub_8058F78
lsls r0, 24
lsrs r0, 24
bl sub_8059CA4
bl MetatileBehavior_IsSurfable
lsls r0, 24
cmp r0, 0
beq _0805606A
@@ -6714,7 +6714,7 @@ sub_8058034: @ 8058034
bne _08058058
_08058042:
ldrb r0, [r4, 0xC]
bl sub_8059D18
bl MetatileBehavior_IsSouthArrowWarp
lsls r0, 24
cmp r0, 0
beq _08058058
asm/party_menu.s
+2 -2
View File
@@ -12103,7 +12103,7 @@ sub_8124998: @ 8124998
bl sub_8058F78
lsls r0, 24
lsrs r0, 24
bl sub_8059CC8
bl MetatileBehavior_IsSemiDeepWater
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -12166,7 +12166,7 @@ _08124A24:
bl sub_8058F78
lsls r0, 24
lsrs r0, 24
bl sub_8059CC8
bl MetatileBehavior_IsSemiDeepWater
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
asm/unk_8159F40.s
+1 -1
View File
@@ -801,7 +801,7 @@ sub_815A540: @ 815A540
bl sub_8058F78
lsls r0, 24
lsrs r0, 24
bl sub_8059CA4
bl MetatileBehavior_IsSurfable
lsls r0, 24
cmp r0, 0
bne _0815A5A4
asm/wild_encounter.s
+1 -1
View File
@@ -878,7 +878,7 @@ _08082D78:
bl sub_8058F1C
lsls r0, 24
lsrs r0, 24
bl sub_8059F58
bl MetatileBehavior_ReturnFalse_6
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1