summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common.asm2
-rw-r--r--constants.asm2
-rw-r--r--extras/gbz80disasm.py1
3 files changed, 4 insertions, 1 deletions
diff --git a/common.asm b/common.asm
index ab408c18..f44ac9a2 100644
--- a/common.asm
+++ b/common.asm
@@ -421,7 +421,7 @@ OverworldLoopLessDelay:
call LoadGBPal
ld a,[$d736]
bit 6,a ; jumping down a ledge?
- call nz,$039e
+ call nz, HandleMidJump
ld a,[$cfc5] ; walking animation counter
and a
jp nz,.moveAhead\@ ; if the player sprite has not yet completed the walking animation
diff --git a/constants.asm b/constants.asm
index 125b8bba..573e97e5 100644
--- a/constants.asm
+++ b/constants.asm
@@ -95,6 +95,8 @@ W_WHICHTRADE EQU $CD3D ; which entry from TradeMons to select
W_WHICHPOKEMON EQU $CF92 ; which pokemon you selected
+W_WALKCOUNTER EQU $CFC5 ; walk animation counter
+
W_OPPONENTHP EQU $CFE6 ; active opponent's hp (16 bits)
W_OPPONENTNUMBER EQU $CFE8 ; active opponent's position in team (0 to 5)
W_OPPONENTSTATUS EQU $CFE9 ; active opponent's status condition
diff --git a/extras/gbz80disasm.py b/extras/gbz80disasm.py
index 699d91aa..6f9011dc 100644
--- a/extras/gbz80disasm.py
+++ b/extras/gbz80disasm.py
@@ -568,6 +568,7 @@ asm_commands = {
"6581": "ItemUseNotTime",
"3a87": "AddNTimes",
"3dab": "IsInArray", #bank 3
+ "039e": "HandleMidJump",
}
def random_asm_label():