From b205d8a02ede876f6494e5f0861e5b78348fafdb Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Mon, 23 Jan 2012 01:16:20 -0600 Subject: remove silly script hg-commit-id: 8738e623fe29 --- extras/print_pc_items.py | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 extras/print_pc_items.py (limited to 'extras') diff --git a/extras/print_pc_items.py b/extras/print_pc_items.py deleted file mode 100644 index 7b9dc6c3..00000000 --- a/extras/print_pc_items.py +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/python -#author: Bryan Bishop -#date: 2012-01-19 -#spit out some constants - -for x in range(1, 51): - print "W_BOXITEM%.2d EQU $%s" % (x, ("%.2x" % (0xd539+(x*2))).upper()) - print "W_BOXITEM%.2dQTY EQU $%s" % (x, ("%.2x" % (0xd539+(x*2)+1)).upper()) - -- cgit v1.3.1-sl0p From b40cb88593938af583699ecd603949f59f7043ba Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Mon, 23 Jan 2012 10:12:07 -0600 Subject: $039e -> HandleMidJump hg-commit-id: f18a7d446304 --- common.asm | 2 +- constants.asm | 2 ++ extras/gbz80disasm.py | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'extras') 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(): -- cgit v1.3.1-sl0p