diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/event_constants.asm | 24 | ||||
| -rwxr-xr-x | constants/item_constants.asm | 6 | ||||
| -rw-r--r-- | constants/misc_constants.asm | 18 |
3 files changed, 25 insertions, 23 deletions
diff --git a/constants/event_constants.asm b/constants/event_constants.asm index 2d1fab45..5b379fae 100644 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -1121,15 +1121,15 @@ const_value = 0 const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 ; 45E, (D7D2, bit 6) const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_7 ; 45F, (D7D2, bit 7) const EVENT_460 ; 460, (D7D3, bit 0) - const EVENT_BEAT_POWER_PLANT_TRAINER_0 ; 461, (D7D3, bit 1) - const EVENT_BEAT_POWER_PLANT_TRAINER_1 ; 462, (D7D3, bit 2) - const EVENT_BEAT_POWER_PLANT_TRAINER_2 ; 463, (D7D3, bit 3) - const EVENT_BEAT_POWER_PLANT_TRAINER_3 ; 464, (D7D3, bit 4) - const EVENT_BEAT_POWER_PLANT_TRAINER_4 ; 465, (D7D3, bit 5) - const EVENT_BEAT_POWER_PLANT_TRAINER_5 ; 466, (D7D3, bit 6) - const EVENT_BEAT_POWER_PLANT_TRAINER_6 ; 467, (D7D3, bit 7) - const EVENT_BEAT_POWER_PLANT_TRAINER_7 ; 468, (D7D4, bit 0) - const EVENT_BEAT_POWER_PLANT_TRAINER_8 ; 469, (D7D4, bit 1) + const EVENT_BEAT_POWER_PLANT_VOLTORB_0 ; 461, (D7D3, bit 1) + const EVENT_BEAT_POWER_PLANT_VOLTORB_1 ; 462, (D7D3, bit 2) + const EVENT_BEAT_POWER_PLANT_VOLTORB_2 ; 463, (D7D3, bit 3) + const EVENT_BEAT_POWER_PLANT_VOLTORB_3 ; 464, (D7D3, bit 4) + const EVENT_BEAT_POWER_PLANT_VOLTORB_4 ; 465, (D7D3, bit 5) + const EVENT_BEAT_POWER_PLANT_VOLTORB_5 ; 466, (D7D3, bit 6) + const EVENT_BEAT_POWER_PLANT_VOLTORB_6 ; 467, (D7D3, bit 7) + const EVENT_BEAT_POWER_PLANT_VOLTORB_7 ; 468, (D7D4, bit 0) + const EVENT_BEAT_ZAPDOS ; 469, (D7D4, bit 1) const EVENT_46A ; 46A, (D7D4, bit 2) const EVENT_46B ; 46B, (D7D4, bit 3) const EVENT_46C ; 46C, (D7D4, bit 4) @@ -1342,7 +1342,7 @@ const_value = 0 const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 ; 53B, (D7EE, bit 3) const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 ; 53C, (D7EE, bit 4) const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5 ; 53D, (D7EE, bit 5) - const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_6 ; 53E, (D7EE, bit 6) + const EVENT_BEAT_MOLTRES ; 53E, (D7EE, bit 6) const EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2 ; 53F, (D7EE, bit 7) const EVENT_GOT_NUGGET ; 540, (D7EF, bit 0) const EVENT_BEAT_ROUTE24_ROCKET ; 541, (D7EF, bit 1) @@ -2241,7 +2241,7 @@ const_value = 0 const EVENT_8BE ; 8BE, (D85E, bit 6) const EVENT_8BF ; 8BF, (D85E, bit 7) const EVENT_8C0 ; 8C0, (D85F, bit 0) - const EVENT_BEAT_UNKNOWN_DUNGEON_3_TRAINER_0 ; 8C1, (D85F, bit 1) + const EVENT_BEAT_MEWTWO ; 8C1, (D85F, bit 1) const EVENT_8C2 ; 8C2, (D85F, bit 2) const EVENT_8C3 ; 8C3, (D85F, bit 3) const EVENT_8C4 ; 8C4, (D85F, bit 4) @@ -2522,7 +2522,7 @@ const_value = 0 const EVENT_9D7 ; 9D7, (D881, bit 7) const EVENT_9D8 ; 9D8, (D882, bit 0) const EVENT_9D9 ; 9D9, (D882, bit 1) - const EVENT_BEAT_SEAFOAM_ISLANDS_5_TRAINER_0 ; 9DA, (D882, bit 2) + const EVENT_BEAT_ARTICUNO ; 9DA, (D882, bit 2) const EVENT_9DB ; 9DB, (D882, bit 3) const EVENT_9DC ; 9DC, (D882, bit 4) const EVENT_9DD ; 9DD, (D882, bit 5) diff --git a/constants/item_constants.asm b/constants/item_constants.asm index 1a7f2cc8..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 diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index c6945a42..8e5b9866 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -10,6 +10,9 @@ PARTY_LENGTH EQU 6 MONS_PER_BOX EQU 20 NUM_BOXES EQU 12 +BAG_ITEM_CAPACITY EQU 20 +PC_ITEM_CAPACITY EQU 50 + HOF_MON EQU $10 HOF_TEAM EQU PARTY_LENGTH * HOF_MON HOF_TEAM_CAPACITY EQU 50 @@ -52,14 +55,6 @@ NPC_MOVEMENT_UP EQU $40 NPC_MOVEMENT_LEFT EQU $80 NPC_MOVEMENT_RIGHT EQU $C0 -; battle types -const_value set $0 - const NORMAL_BATTLE ; $0 - const OLD_MAN_BATTLE ; $1 - const SAFARI_BATTLE ; $2 - const HURRY_RUN_AWAY_BATTLE ; $3 - const STARTER_PIKACHU_BATTLE ; $4 - ; text box IDs MESSAGE_BOX EQU $01 FIELD_MOVE_MON_MENU EQU $04 @@ -180,6 +175,13 @@ HP_BAR_RED EQU 2 ; D733 flags BIT_TEST_BATTLE EQU 0 +; battle type constants +BATTLE_TYPE_NORMAL EQU 0 +BATTLE_TYPE_OLD_MAN EQU 1 +BATTLE_TYPE_SAFARI EQU 2 +BATTLE_TYPE_RUN EQU 3 +BATTLE_TYPE_PIKACHU EQU 4 + ; serial ESTABLISH_CONNECTION_WITH_INTERNAL_CLOCK EQU $01 |