diff options
Diffstat (limited to 'constants.asm')
| -rw-r--r-- | constants.asm | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/constants.asm b/constants.asm index f5e5a67a..dafee50e 100644 --- a/constants.asm +++ b/constants.asm @@ -82,6 +82,8 @@ TX_FAR: MACRO ; wram locations W_AICOUNT EQU $CCDF ; number of times remaining that AI action can occur +W_WHICHTRADE EQU $CD3D ; which entry from TradeMons to select + 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 @@ -240,7 +242,7 @@ KADABRA EQU $26 GRAVELER EQU $27 CHANSEY EQU $28 MACHOKE EQU $29 -MR__MIME EQU $2A +MR_MIME EQU $2A HITMONLEE EQU $2B HITMONCHAN EQU $2C ARBOK EQU $2D @@ -526,7 +528,7 @@ DEX_GOLDEEN EQU 118 DEX_SEAKING EQU 119 DEX_STARYU EQU 120 DEX_STARMIE EQU 121 -DEX_MR__MIME EQU 122 +DEX_MR_MIME EQU 122 DEX_SCYTHER EQU 123 DEX_JYNX EQU 124 DEX_ELECTABUZZ EQU 125 @@ -608,7 +610,7 @@ X_ACCURACY EQU $2E LEAF_STONE EQU $2F CARD_KEY EQU $30 NUGGET EQU $31 -PP_UP EQU $32 +;PP_UP EQU $32 POKE_DOLL EQU $33 FULL_HEAL EQU $34 REVIVE EQU $35 @@ -628,7 +630,7 @@ X_DEFEND EQU $42 X_SPEED EQU $43 X_SPECIAL EQU $44 COIN_CASE EQU $45 -OAK_S_PARCEL EQU $46 +OAKS_PARCEL EQU $46 ITEMFINDER EQU $47 SILPH_SCOPE EQU $48 POKE_FLUTE EQU $49 @@ -638,7 +640,7 @@ OLD_ROD EQU $4C GOOD_ROD EQU $4D SUPER_ROD EQU $4E ; XXX todo: compare this to $32 -;PP_UP EQU $4F +PP_UP EQU $4F ETHER EQU $50 MAX_ETHER EQU $51 ELIXER EQU $52 @@ -1043,8 +1045,8 @@ CELADON_MART_1 EQU $7A CELADON_MART_2 EQU $7B CELADON_MART_3 EQU $7C CELADON_MART_4 EQU $7D -CELADON_MART_5 EQU $7E -CELADON_MART_6 EQU $7F +CELADON_MART_ROOF EQU $7E +CELADON_MART_ELEVATOR EQU $7F CELADON_MANSION_1 EQU $80 CELADON_MANSION_2 EQU $81 CELADON_MANSION_3 EQU $82 @@ -1053,11 +1055,11 @@ CELADON_MANSION_5 EQU $84 CELADON_POKECENTER EQU $85 CELADON_GYM EQU $86 GAME_CORNER EQU $87 -CELADON_HOUSE EQU $88 +CELADON_MART_5 EQU $88 CELADONPRIZE_ROOM EQU $89 CELADON_DINER EQU $8A -CELADON_HOUSE_2 EQU $8B -CELADONHOTEL EQU $8C +CELADON_HOUSE EQU $8B +CELADON_HOTEL EQU $8C LAVENDER_POKECENTER EQU $8D POKEMONTOWER_1 EQU $8E POKEMONTOWER_2 EQU $8F |