diff options
| -rw-r--r-- | asm/rom4.s | 8 | ||||
| -rw-r--r-- | data/data2.s | 20 |
2 files changed, 15 insertions, 13 deletions
diff --git a/asm/rom4.s b/asm/rom4.s index 7c9bca10a..7bbff31fa 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -37697,7 +37697,7 @@ GetGroundEffectFlags_JumpLanding: @ 80639E8 ldr r1, _08063A24 ands r0, r1 cmp r0, 0x20 - bne _08063A3A + bne _08063A3A @ Is player landing after jumping? movs r5, 0 ldr r0, _08063A28 mov r8, r0 @@ -37705,7 +37705,7 @@ _08063A02: lsls r4, r5, 2 mov r0, r8 adds r1, r4, r0 - ldrb r0, [r7, 0x1E] + ldrb r0, [r7, 0x1E] @ Load metatile behavior ldr r1, [r1] bl _call_via_r1 lsls r0, 24 @@ -37720,8 +37720,8 @@ _08063A02: b _08063A3A .align 2, 0 _08063A24: .4byte 0x02000020 -_08063A28: .4byte gUnknown_08376010 -_08063A2C: .4byte gUnknown_08376028 +_08063A28: .4byte gJumpLanding_MetatileFunctionPointers +_08063A2C: .4byte gJumpLanding_Bitmasks _08063A30: adds r0, r5, 0x1 lsls r0, 24 diff --git a/data/data2.s b/data/data2.s index ca7e207c3..a3ede4b6b 100644 --- a/data/data2.s +++ b/data/data2.s @@ -6985,7 +6985,9 @@ gUnknown_08376008:: @ 8376008 .incbin "baserom.gba", 0x00376008, 0x8 .align 2 -gUnknown_08376010:: @ 8376010 +@ Functions used to determine which category of tile the player is landing +@ on after jumping over a ledge. +gJumpLanding_MetatileFunctionPointers:: @ 8376010 .4byte MetatileBehavior_IsTallGrass .4byte MetatileBehavior_IsLongGrass .4byte MetatileBehavior_IsPuddle @@ -6994,14 +6996,14 @@ gUnknown_08376010:: @ 8376010 .4byte sub_8056D9C @ This table contains bitmasks used for determining the animation that happens when the player lands on -@ the ground after jumping over a ledge. -gUnknown_08376028:: @ 8376028 - .4byte 0x00001000 @ Landing in regular grass - .4byte 0x00002000 @ Landing in tall grass (?) - .4byte 0x00004000 @ Landing on firm surface - .4byte 0x00008000 @ Landing on water - .4byte 0x00004000 @ Landing on firm surface - .4byte 0x00010000 @ Landing on normal ground (dirt) +@ the ground after jumping over a ledge. Each entry corresponds to the gJumpLanding_MetatileFunctionPointers table. +gJumpLanding_Bitmasks:: @ 8376028 + .4byte 0x00001000 @ Landing in tall grass + .4byte 0x00002000 @ Landing in long grass + .4byte 0x00004000 @ Landing on puddle + .4byte 0x00008000 @ Landing on surfable water or underwater + .4byte 0x00004000 @ Landing on shallow flowing water + .4byte 0x00010000 @ Landing on any other type of ground .align 2 gUnknown_08376040:: @ 8376040 |