diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
| commit | 5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch) | |
| tree | a1ce27018f39d98f49d89468df426d0291e18560 /constants/item_constants.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'constants/item_constants.asm')
| -rwxr-xr-x | constants/item_constants.asm | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/constants/item_constants.asm b/constants/item_constants.asm index dd321b45..fe6fcb15 100755 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -56,7 +56,7 @@ SAFARI_ROCK EQU $16 ; overload const FULL_HEAL ; $34 const REVIVE ; $35 const MAX_REVIVE ; $36 - const GUARD_SPEC_ ; $37 + const GUARD_SPEC ; $37 const SUPER_REPEL ; $38 const MAX_REPEL ; $39 const DIRE_HIT ; $3A @@ -64,7 +64,7 @@ SAFARI_ROCK EQU $16 ; overload const FRESH_WATER ; $3C const SODA_POP ; $3D const LEMONADE ; $3E - const S_S__TICKET ; $3F + const S_S_TICKET ; $3F const GOLD_TEETH ; $40 const X_ATTACK ; $41 const X_DEFEND ; $42 @@ -76,7 +76,7 @@ SAFARI_ROCK EQU $16 ; overload const SILPH_SCOPE ; $48 const POKE_FLUTE ; $49 const LIFT_KEY ; $4A - const EXP__ALL ; $4B + const EXP_ALL ; $4B const OLD_ROD ; $4C const GOOD_ROD ; $4D const SUPER_ROD ; $4E @@ -85,6 +85,20 @@ SAFARI_ROCK EQU $16 ; overload const MAX_ETHER ; $51 const ELIXER ; $52 const MAX_ELIXER ; $53 + const FLOOR_B2F ; $54 + const FLOOR_B1F ; $55 + const FLOOR_1F ; $56 + const FLOOR_2F ; $57 + const FLOOR_3F ; $58 + const FLOOR_4F ; $59 + const FLOOR_5F ; $5A + const FLOOR_6F ; $5B + const FLOOR_7F ; $5C + const FLOOR_8F ; $5D + const FLOOR_9F ; $5E + const FLOOR_10F ; $5F + const FLOOR_11F ; $60 + const FLOOR_B4F ; $61 const_value = $C4 |