pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Trainer data structure and field move functions

Browse Source 
Trainer data in map scripts is now a macro-defined structure.

Field move functions in main.asm are now nearly completely annotated, with local references.

Trailing white space deleted.
This commit is contained in:
PikalaxALT
2015-07-18 23:45:39 -04:00
parent e674869018
commit 60cd04b023
116 changed files with 2148 additions and 8705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

380
constants/battle_constants.asm
View File

@@ -96,54 +96,54 @@ const_value SET 3
; substatus
enum_start 7, -1
enum SUBSTATUS_IN_LOVE
enum SUBSTATUS_ROLLOUT
enum SUBSTATUS_ENDURE
enum SUBSTATUS_PERISH
enum SUBSTATUS_IDENTIFIED
enum SUBSTATUS_PROTECT
enum SUBSTATUS_CURSE
enum SUBSTATUS_NIGHTMARE
enum SUBSTATUS_IN_LOVE
enum SUBSTATUS_ROLLOUT
enum SUBSTATUS_ENDURE
enum SUBSTATUS_PERISH
enum SUBSTATUS_IDENTIFIED
enum SUBSTATUS_PROTECT
enum SUBSTATUS_CURSE
enum SUBSTATUS_NIGHTMARE
SUBSTATUS_CURLED EQU 0
enum_start 7, -1
enum SUBSTATUS_CONFUSED
enum SUBSTATUS_FLYING
enum SUBSTATUS_UNDERGROUND
enum SUBSTATUS_CHARGED
enum SUBSTATUS_FLINCHED
enum SUBSTATUS_IN_LOOP
enum SUBSTATUS_RAMPAGE
enum SUBSTATUS_BIDE
enum SUBSTATUS_CONFUSED
enum SUBSTATUS_FLYING
enum SUBSTATUS_UNDERGROUND
enum SUBSTATUS_CHARGED
enum SUBSTATUS_FLINCHED
enum SUBSTATUS_IN_LOOP
enum SUBSTATUS_RAMPAGE
enum SUBSTATUS_BIDE
enum_start 7, -1
enum SUBSTATUS_LEECH_SEED
enum SUBSTATUS_RAGE
enum SUBSTATUS_RECHARGE
enum SUBSTATUS_SUBSTITUTE
enum SUBSTATUS_UNKNOWN_1
enum SUBSTATUS_LEECH_SEED
enum SUBSTATUS_RAGE
enum SUBSTATUS_RECHARGE
enum SUBSTATUS_SUBSTITUTE
enum SUBSTATUS_UNKNOWN_1
enum SUBSTATUS_FOCUS_ENERGY
enum SUBSTATUS_MIST
enum SUBSTATUS_X_ACCURACY
enum SUBSTATUS_MIST
enum SUBSTATUS_X_ACCURACY
enum_start 7, -1
enum SUBSTATUS_CANT_RUN
enum SUBSTATUS_CANT_RUN
enum SUBSTATUS_DESTINY_BOND
enum SUBSTATUS_LOCK_ON
enum SUBSTATUS_ENCORED
enum SUBSTATUS_TRANSFORMED
enum SUBSTATUS_UNKNOWN_2
enum SUBSTATUS_UNKNOWN_3
enum SUBSTATUS_TOXIC
enum SUBSTATUS_LOCK_ON
enum SUBSTATUS_ENCORED
enum SUBSTATUS_TRANSFORMED
enum SUBSTATUS_UNKNOWN_2
enum SUBSTATUS_UNKNOWN_3
enum SUBSTATUS_TOXIC
; environmental
enum_start 4, -1
enum SCREENS_REFLECT
enum SCREENS_REFLECT
enum SCREENS_LIGHT_SCREEN
enum SCREENS_SAFEGUARD
enum SCREENS_SAFEGUARD
enum SCREENS_UNUSED
enum SCREENS_SPIKES
enum SCREENS_SPIKES
; weather
const_def
@@ -158,160 +158,160 @@ SUBSTATUS_CURLED EQU 0
; move effects
const_def
const EFFECT_NORMAL_HIT
const EFFECT_SLEEP
const EFFECT_POISON_HIT
const EFFECT_LEECH_HIT
const EFFECT_BURN_HIT
const EFFECT_FREEZE_HIT
const EFFECT_PARALYZE_HIT
const EFFECT_EXPLOSION
const EFFECT_DREAM_EATER
const EFFECT_MIRROR_MOVE
const EFFECT_ATTACK_UP
const EFFECT_DEFENSE_UP
const EFFECT_SPEED_UP
const EFFECT_SP_ATK_UP
const EFFECT_SP_DEF_UP
const EFFECT_ACCURACY_UP
const EFFECT_EVASION_UP
const EFFECT_ALWAYS_HIT
const EFFECT_ATTACK_DOWN
const EFFECT_DEFENSE_DOWN
const EFFECT_SPEED_DOWN
const EFFECT_SP_ATK_DOWN
const EFFECT_SP_DEF_DOWN
const EFFECT_ACCURACY_DOWN
const EFFECT_EVASION_DOWN
const EFFECT_HAZE
const EFFECT_BIDE
const EFFECT_RAMPAGE
const EFFECT_WHIRLWIND
const EFFECT_MULTI_HIT
const EFFECT_CONVERSION
const EFFECT_FLINCH_HIT
const EFFECT_HEAL
const EFFECT_TOXIC
const EFFECT_PAY_DAY
const EFFECT_LIGHT_SCREEN
const EFFECT_TRI_ATTACK
const EFFECT_UNUSED_25
const EFFECT_OHKO
const EFFECT_RAZOR_WIND
const EFFECT_SUPER_FANG
const EFFECT_STATIC_DAMAGE
const EFFECT_BIND
const EFFECT_UNUSED_2B
const EFFECT_DOUBLE_HIT
const EFFECT_JUMP_KICK
const EFFECT_MIST
const EFFECT_FOCUS_ENERGY
const EFFECT_RECOIL_HIT
const EFFECT_CONFUSE
const EFFECT_ATTACK_UP_2
const EFFECT_DEFENSE_UP_2
const EFFECT_SPEED_UP_2
const EFFECT_SP_ATK_UP_2
const EFFECT_SP_DEF_UP_2
const EFFECT_ACCURACY_UP_2
const EFFECT_EVASION_UP_2
const EFFECT_TRANSFORM
const EFFECT_ATTACK_DOWN_2
const EFFECT_DEFENSE_DOWN_2
const EFFECT_SPEED_DOWN_2
const EFFECT_SP_ATK_DOWN_2
const EFFECT_SP_DEF_DOWN_2
const EFFECT_ACCURACY_DOWN_2
const EFFECT_EVASION_DOWN_2
const EFFECT_REFLECT
const EFFECT_POISON
const EFFECT_PARALYZE
const EFFECT_ATTACK_DOWN_HIT
const EFFECT_DEFENSE_DOWN_HIT
const EFFECT_SPEED_DOWN_HIT
const EFFECT_SP_ATK_DOWN_HIT
const EFFECT_SP_DEF_DOWN_HIT
const EFFECT_ACCURACY_DOWN_HIT
const EFFECT_EVASION_DOWN_HIT
const EFFECT_SKY_ATTACK
const EFFECT_CONFUSE_HIT
const EFFECT_TWINEEDLE
const EFFECT_UNUSED_4E
const EFFECT_SUBSTITUTE
const EFFECT_HYPER_BEAM
const EFFECT_RAGE
const EFFECT_MIMIC
const EFFECT_METRONOME
const EFFECT_LEECH_SEED
const EFFECT_SPLASH
const EFFECT_DISABLE
const EFFECT_LEVEL_DAMAGE
const EFFECT_PSYWAVE
const EFFECT_COUNTER
const EFFECT_ENCORE
const EFFECT_PAIN_SPLIT
const EFFECT_SNORE
const EFFECT_CONVERSION2
const EFFECT_LOCK_ON
const EFFECT_SKETCH
const EFFECT_DEFROST_OPPONENT
const EFFECT_SLEEP_TALK
const EFFECT_DESTINY_BOND
const EFFECT_REVERSAL
const EFFECT_SPITE
const EFFECT_FALSE_SWIPE
const EFFECT_HEAL_BELL
const EFFECT_PRIORITY_HIT
const EFFECT_TRIPLE_KICK
const EFFECT_THIEF
const EFFECT_MEAN_LOOK
const EFFECT_NIGHTMARE
const EFFECT_FLAME_WHEEL
const EFFECT_CURSE
const EFFECT_UNUSED_6E
const EFFECT_PROTECT
const EFFECT_SPIKES
const EFFECT_FORESIGHT
const EFFECT_PERISH_SONG
const EFFECT_SANDSTORM
const EFFECT_ENDURE
const EFFECT_ROLLOUT
const EFFECT_SWAGGER
const EFFECT_FURY_CUTTER
const EFFECT_ATTRACT
const EFFECT_RETURN
const EFFECT_PRESENT
const EFFECT_FRUSTRATION
const EFFECT_SAFEGUARD
const EFFECT_SACRED_FIRE
const EFFECT_MAGNITUDE
const EFFECT_BATON_PASS
const EFFECT_PURSUIT
const EFFECT_RAPID_SPIN
const EFFECT_UNUSED_82
const EFFECT_UNUSED_83
const EFFECT_MORNING_SUN
const EFFECT_SYNTHESIS
const EFFECT_MOONLIGHT
const EFFECT_HIDDEN_POWER
const EFFECT_RAIN_DANCE
const EFFECT_SUNNY_DAY
const EFFECT_STEEL_WING
const EFFECT_METAL_CLAW
const EFFECT_ANCIENTPOWER
const EFFECT_FAKE_OUT
const EFFECT_BELLY_DRUM
const EFFECT_PSYCH_UP
const EFFECT_MIRROR_COAT
const EFFECT_SKULL_BASH
const EFFECT_TWISTER
const EFFECT_EARTHQUAKE
const EFFECT_FUTURE_SIGHT
const EFFECT_GUST
const EFFECT_STOMP
const EFFECT_SOLARBEAM
const EFFECT_THUNDER
const EFFECT_TELEPORT
const EFFECT_BEAT_UP
const EFFECT_FLY
const EFFECT_DEFENSE_CURL
const EFFECT_NORMAL_HIT
const EFFECT_SLEEP
const EFFECT_POISON_HIT
const EFFECT_LEECH_HIT
const EFFECT_BURN_HIT
const EFFECT_FREEZE_HIT
const EFFECT_PARALYZE_HIT
const EFFECT_EXPLOSION
const EFFECT_DREAM_EATER
const EFFECT_MIRROR_MOVE
const EFFECT_ATTACK_UP
const EFFECT_DEFENSE_UP
const EFFECT_SPEED_UP
const EFFECT_SP_ATK_UP
const EFFECT_SP_DEF_UP
const EFFECT_ACCURACY_UP
const EFFECT_EVASION_UP
const EFFECT_ALWAYS_HIT
const EFFECT_ATTACK_DOWN
const EFFECT_DEFENSE_DOWN
const EFFECT_SPEED_DOWN
const EFFECT_SP_ATK_DOWN
const EFFECT_SP_DEF_DOWN
const EFFECT_ACCURACY_DOWN
const EFFECT_EVASION_DOWN
const EFFECT_HAZE
const EFFECT_BIDE
const EFFECT_RAMPAGE
const EFFECT_WHIRLWIND
const EFFECT_MULTI_HIT
const EFFECT_CONVERSION
const EFFECT_FLINCH_HIT
const EFFECT_HEAL
const EFFECT_TOXIC
const EFFECT_PAY_DAY
const EFFECT_LIGHT_SCREEN
const EFFECT_TRI_ATTACK
const EFFECT_UNUSED_25
const EFFECT_OHKO
const EFFECT_RAZOR_WIND
const EFFECT_SUPER_FANG
const EFFECT_STATIC_DAMAGE
const EFFECT_BIND
const EFFECT_UNUSED_2B
const EFFECT_DOUBLE_HIT
const EFFECT_JUMP_KICK
const EFFECT_MIST
const EFFECT_FOCUS_ENERGY
const EFFECT_RECOIL_HIT
const EFFECT_CONFUSE
const EFFECT_ATTACK_UP_2
const EFFECT_DEFENSE_UP_2
const EFFECT_SPEED_UP_2
const EFFECT_SP_ATK_UP_2
const EFFECT_SP_DEF_UP_2
const EFFECT_ACCURACY_UP_2
const EFFECT_EVASION_UP_2
const EFFECT_TRANSFORM
const EFFECT_ATTACK_DOWN_2
const EFFECT_DEFENSE_DOWN_2
const EFFECT_SPEED_DOWN_2
const EFFECT_SP_ATK_DOWN_2
const EFFECT_SP_DEF_DOWN_2
const EFFECT_ACCURACY_DOWN_2
const EFFECT_EVASION_DOWN_2
const EFFECT_REFLECT
const EFFECT_POISON
const EFFECT_PARALYZE
const EFFECT_ATTACK_DOWN_HIT
const EFFECT_DEFENSE_DOWN_HIT
const EFFECT_SPEED_DOWN_HIT
const EFFECT_SP_ATK_DOWN_HIT
const EFFECT_SP_DEF_DOWN_HIT
const EFFECT_ACCURACY_DOWN_HIT
const EFFECT_EVASION_DOWN_HIT
const EFFECT_SKY_ATTACK
const EFFECT_CONFUSE_HIT
const EFFECT_TWINEEDLE
const EFFECT_UNUSED_4E
const EFFECT_SUBSTITUTE
const EFFECT_HYPER_BEAM
const EFFECT_RAGE
const EFFECT_MIMIC
const EFFECT_METRONOME
const EFFECT_LEECH_SEED
const EFFECT_SPLASH
const EFFECT_DISABLE
const EFFECT_LEVEL_DAMAGE
const EFFECT_PSYWAVE
const EFFECT_COUNTER
const EFFECT_ENCORE
const EFFECT_PAIN_SPLIT
const EFFECT_SNORE
const EFFECT_CONVERSION2
const EFFECT_LOCK_ON
const EFFECT_SKETCH
const EFFECT_DEFROST_OPPONENT
const EFFECT_SLEEP_TALK
const EFFECT_DESTINY_BOND
const EFFECT_REVERSAL
const EFFECT_SPITE
const EFFECT_FALSE_SWIPE
const EFFECT_HEAL_BELL
const EFFECT_PRIORITY_HIT
const EFFECT_TRIPLE_KICK
const EFFECT_THIEF
const EFFECT_MEAN_LOOK
const EFFECT_NIGHTMARE
const EFFECT_FLAME_WHEEL
const EFFECT_CURSE
const EFFECT_UNUSED_6E
const EFFECT_PROTECT
const EFFECT_SPIKES
const EFFECT_FORESIGHT
const EFFECT_PERISH_SONG
const EFFECT_SANDSTORM
const EFFECT_ENDURE
const EFFECT_ROLLOUT
const EFFECT_SWAGGER
const EFFECT_FURY_CUTTER
const EFFECT_ATTRACT
const EFFECT_RETURN
const EFFECT_PRESENT
const EFFECT_FRUSTRATION
const EFFECT_SAFEGUARD
const EFFECT_SACRED_FIRE
const EFFECT_MAGNITUDE
const EFFECT_BATON_PASS
const EFFECT_PURSUIT
const EFFECT_RAPID_SPIN
const EFFECT_UNUSED_82
const EFFECT_UNUSED_83
const EFFECT_MORNING_SUN
const EFFECT_SYNTHESIS
const EFFECT_MOONLIGHT
const EFFECT_HIDDEN_POWER
const EFFECT_RAIN_DANCE
const EFFECT_SUNNY_DAY
const EFFECT_STEEL_WING
const EFFECT_METAL_CLAW
const EFFECT_ANCIENTPOWER
const EFFECT_FAKE_OUT
const EFFECT_BELLY_DRUM
const EFFECT_PSYCH_UP
const EFFECT_MIRROR_COAT
const EFFECT_SKULL_BASH
const EFFECT_TWISTER
const EFFECT_EARTHQUAKE
const EFFECT_FUTURE_SIGHT
const EFFECT_GUST
const EFFECT_STOMP
const EFFECT_SOLARBEAM
const EFFECT_THUNDER
const EFFECT_TELEPORT
const EFFECT_BEAT_UP
const EFFECT_FLY
const EFFECT_DEFENSE_CURL

35
constants/event_flags.asm
View File

@@ -718,11 +718,11 @@
const EVENT_2C9
const EVENT_2CA
const EVENT_2CB
const EVENT_2CC
const EVENT_KRISS_ROOM_POSTER
const EVENT_2CD
const EVENT_2CE
const EVENT_2CF
const EVENT_2D0
const EVENT_2D0 ; 2d0
const EVENT_2D1
const EVENT_2D2
const EVENT_SWITCH_1
@@ -738,7 +738,7 @@
const EVENT_SWITCH_10
const EVENT_SWITCH_11
const EVENT_SWITCH_12
const EVENT_SWITCH_13
const EVENT_SWITCH_13 ; 2e0
const EVENT_SWITCH_14
const EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART
const EVENT_TURNED_OFF_SECURITY_CAMERAS
@@ -754,7 +754,7 @@
const EVENT_EXPLODING_TRAP_5
const EVENT_EXPLODING_TRAP_6
const EVENT_EXPLODING_TRAP_7
const EVENT_EXPLODING_TRAP_8
const EVENT_EXPLODING_TRAP_8 ; 2f0
const EVENT_EXPLODING_TRAP_9
const EVENT_EXPLODING_TRAP_10
const EVENT_EXPLODING_TRAP_11
@@ -770,7 +770,7 @@
const EVENT_EXPLODING_TRAP_21
const EVENT_EXPLODING_TRAP_22
const EVENT_LEARNED_HAIL_GIOVANNI
const EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER
const EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER ; 300
const EVENT_LEARNED_SLOWPOKETAIL
const EVENT_LEARNED_RATICATE_TAIL
const EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE
@@ -786,7 +786,7 @@
const EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
const EVENT_BRUNOS_ROOM_EXIT_OPEN
const EVENT_KARENS_ROOM_ENTRANCE_CLOSED
const EVENT_KARENS_ROOM_EXIT_OPEN
const EVENT_KARENS_ROOM_EXIT_OPEN ; 310
const EVENT_LANCES_ROOM_ENTRANCE_CLOSED
const EVENT_LANCES_ROOM_EXIT_OPEN
const EVENT_CONTEST_OFFICER_HAS_SUN_STONE
@@ -802,7 +802,7 @@
const EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
const EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
const EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
const EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
const EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA ; 320
const EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
const EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
const EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
@@ -1910,7 +1910,7 @@
const EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA
const EVENT_KURTS_HOUSE_KURT_1
const EVENT_KURTS_HOUSE_KURT_2
const EVENT_SLOWPOKE_WELL_KURT
const EVENT_SLOWPOKE_WELL_KURT ; 740
const EVENT_KRISS_HOUSE_2F_CONSOLE
const EVENT_KRISS_HOUSE_2F_DOLL_1
const EVENT_KRISS_HOUSE_2F_DOLL_2
@@ -1926,7 +1926,7 @@
const EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
const EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST
const EVENT_OPENED_MT_SILVER
const EVENT_FOUGHT_SNORLAX
const EVENT_FOUGHT_SNORLAX ; 750
const EVENT_LAKE_OF_RAGE_RED_GYARADOS
const EVENT_WAREHOUSE_ENTRANCE_GRANNY
const EVENT_WAREHOUSE_ENTRANCE_GRAMPS
@@ -1942,7 +1942,7 @@
const EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
const EVENT_ROUTE_40_MONICA_OF_MONDAY
const EVENT_LANCES_ROOM_OAK_AND_MARY
const EVENT_UNION_CAVE_B2F_LAPRAS
const EVENT_UNION_CAVE_B2F_LAPRAS ; 760
const EVENT_761
const EVENT_RED_IN_MT_SILVER
const EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY
@@ -1959,7 +1959,7 @@
const EVENT_CERULEAN_GYM_ROCKET
const EVENT_ROUTE_25_MISTY_BOYFRIEND
const EVENT_TRAINERS_IN_CERULEAN_GYM
const EVENT_VERMILION_CITY_SNORLAX
const EVENT_VERMILION_CITY_SNORLAX ; 770
const EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
const EVENT_SAFFRON_TRAIN_STATION_POPULATION
const EVENT_COPYCATS_HOUSE_2F_DOLL
@@ -1975,7 +1975,7 @@
const EVENT_PICKED_UP_FOCUS_BAND
const EVENT_ROCK_TUNNEL_1F_ELIXER
const EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING
const EVENT_ROCK_TUNNEL_B1F_IRON
const EVENT_ROCK_TUNNEL_B1F_IRON ; 780
const EVENT_ROCK_TUNNEL_B1F_PP_UP
const EVENT_ROCK_TUNNEL_B1F_REVIVE
const EVENT_ROUTE_2_DIRE_HIT
@@ -1992,7 +1992,7 @@
const EVENT_KURTS_HOUSE_GRANDDAUGHTER_2
const EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER
const EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
const EVENT_DRAGON_SHRINE_CLAIR
const EVENT_DRAGON_SHRINE_CLAIR ; 790
const EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
const EVENT_KRISS_HOUSE_1F_NEIGHBOR
const EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
@@ -2008,7 +2008,7 @@
const EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM
const EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM
const EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM
const EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM
const EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM ; 7a0
const EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM
const EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM
const EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM
@@ -2024,7 +2024,7 @@
const EVENT_CIANWOOD_CITY_EUSINE
const EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
const EVENT_SAW_SUICUNE_ON_ROUTE_42
const EVENT_SAW_SUICUNE_ON_ROUTE_36
const EVENT_SAW_SUICUNE_ON_ROUTE_36 ; 7b0
const EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
const EVENT_TIN_TOWER_1F_SUICUNE
const EVENT_TIN_TOWER_1F_ENTEI
@@ -2040,7 +2040,7 @@
const EVENT_ROUTE_44_MAX_REPEL
const EVENT_ICE_PATH_1F_PROTEIN
const EVENT_DRAGONS_DEN_B1F_CALCIUM
const EVENT_DRAGONS_DEN_B1F_MAX_ELIXER
const EVENT_DRAGONS_DEN_B1F_MAX_ELIXER ; 7c0
const EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL
const EVENT_SILVER_CAVE_ROOM_2_CALCIUM
const EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL
@@ -2056,5 +2056,4 @@
const EVENT_RADIO_TOWER_5F_ULTRA_BALL
const EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT
const EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
NUM_EVENTS EQU const_value
NUM_EVENTS EQU const_value ; 7d0

10
constants/item_constants.asm
View File

@@ -354,3 +354,13 @@ const_value SET 70
const HELD_BRIGHTPOWDER
const HELD_4E
const HELD_FOCUS_BAND
const_def
const ITEMATTR_PRICE
const ITEMATTR_PRICE_HI
const ITEMATTR_EFFECT
const ITEMATTR_PARAM
const ITEMATTR_PERMISSIONS
const ITEMATTR_POCKET
const ITEMATTR_HELP
NUM_ITEMATTRS EQU const_value

69
constants/phone_constants.asm
View File

@@ -1,34 +1,43 @@
PHONE_SCHOOLBOY_JACK EQU $05
PHONE_POKEFAN_BEVERLY EQU $06
PHONE_SAILOR_HUEY EQU $07
PHONE_COOLTRAINERM_GAVEN EQU $0b
PHONE_COOLTRAINERF_BETH EQU $0c
PHONE_BIRDKEEPER_JOSE EQU $0d
PHONE_COOLTRAINERF_REENA EQU $0e
PHONE_YOUNGSTER_JOEY EQU $0f
PHONE_BUG_CATCHER_WADE EQU $10
PHONE_FISHER_RALPH EQU $11
PHONE_PICNICKER_LIZ EQU $12
PHONE_HIKER_ANTHONY EQU $13
PHONE_CAMPER_TODD EQU $14
PHONE_PICNICKER_GINA EQU $15
PHONE_JUGGLER_IRWIN EQU $16
PHONE_BUG_CATCHER_ARNIE EQU $17
PHONE_SCHOOLBOY_ALAN EQU $18
PHONE_LASS_DANA EQU $1a
PHONE_SCHOOLBOY_CHAD EQU $1b
PHONE_POKEFANM_DEREK EQU $1c
PHONE_FISHER_TULLY EQU $1d
PHONE_POKEMANIAC_BRENT EQU $1e
PHONE_PICNICKER_TIFFANY EQU $1f
PHONE_BIRDKEEPER_VANCE EQU $20
PHONE_FISHER_WILTON EQU $21
PHONE_BLACKBELT_KENJI EQU $22
PHONE_HIKER_PARRY EQU $23
PHONE_PICNICKER_ERIN EQU $24
const_def
const PHONE_00
const PHONE_MOM
const PHONE_OAK
const PHONE_BILL
const PHONE_ELM
const PHONE_SCHOOLBOY_JACK
const PHONE_POKEFAN_BEVERLY
const PHONE_SAILOR_HUEY
const PHONE_08
const PHONE_09
const PHONE_0A
const PHONE_COOLTRAINERM_GAVEN
const PHONE_COOLTRAINERF_BETH
const PHONE_BIRDKEEPER_JOSE
const PHONE_COOLTRAINERF_REENA
const PHONE_YOUNGSTER_JOEY
const PHONE_BUG_CATCHER_WADE
const PHONE_FISHER_RALPH
const PHONE_PICNICKER_LIZ
const PHONE_HIKER_ANTHONY
const PHONE_CAMPER_TODD
const PHONE_PICNICKER_GINA
const PHONE_JUGGLER_IRWIN
const PHONE_BUG_CATCHER_ARNIE
const PHONE_SCHOOLBOY_ALAN
const PHONE_19
const PHONE_LASS_DANA
const PHONE_SCHOOLBOY_CHAD
const PHONE_POKEFANM_DEREK
const PHONE_FISHER_TULLY
const PHONE_POKEMANIAC_BRENT
const PHONE_PICNICKER_TIFFANY
const PHONE_BIRDKEEPER_VANCE
const PHONE_FISHER_WILTON
const PHONE_BLACKBELT_KENJI
const PHONE_HIKER_PARRY
const PHONE_PICNICKER_ERIN
const PHONE_BUENA
const_def
const ELMCALL_NONE

412
constants/sfx_constants.asm
View File

@@ -1,210 +1,210 @@
const_def
const SFX_DEX_FANFARE_50_79
const SFX_ITEM
const SFX_CAUGHT_MON
const SFX_POKEBALLS_PLACED_ON_TABLE
const SFX_POTION
const SFX_FULL_HEAL
const SFX_MENU
const SFX_READ_TEXT
const SFX_READ_TEXT_2
const SFX_DEX_FANFARE_20_49
const SFX_DEX_FANFARE_80_109
const SFX_POISON
const SFX_GOT_SAFARI_BALLS
const SFX_BOOT_PC
const SFX_SHUT_DOWN_PC
const SFX_CHOOSE_PC_OPTION
const SFX_ESCAPE_ROPE
const SFX_PUSH_BUTTON
const SFX_SECOND_PART_OF_ITEMFINDER
const SFX_WARP_TO
const SFX_WARP_FROM
const SFX_CHANGE_DEX_MODE
const SFX_JUMP_OVER_LEDGE
const SFX_GRASS_RUSTLE
const SFX_FLY
const SFX_WRONG
const SFX_SQUEAK
const SFX_STRENGTH
const SFX_BOAT
const SFX_WALL_OPEN
const SFX_PLACE_PUZZLE_PIECE_DOWN
const SFX_ENTER_DOOR
const SFX_SWITCH_POKEMON
const SFX_TALLY
const SFX_TRANSACTION
const SFX_EXIT_BUILDING
const SFX_BUMP
const SFX_SAVE
const SFX_POKEFLUTE
const SFX_ELEVATOR_END
const SFX_THROW_BALL
const SFX_BALL_POOF
const SFX_UNKNOWN_2A
const SFX_RUN
const SFX_SLOT_MACHINE_START
const SFX_FANFARE
const SFX_PECK
const SFX_KINESIS
const SFX_LICK
const SFX_POUND
const SFX_MOVE_PUZZLE_PIECE
const SFX_COMET_PUNCH
const SFX_MEGA_PUNCH
const SFX_SCRATCH
const SFX_VICEGRIP
const SFX_RAZOR_WIND
const SFX_CUT
const SFX_WING_ATTACK
const SFX_WHIRLWIND
const SFX_BIND
const SFX_VINE_WHIP
const SFX_DOUBLE_KICK
const SFX_MEGA_KICK
const SFX_HEADBUTT
const SFX_HORN_ATTACK
const SFX_TACKLE
const SFX_POISON_STING
const SFX_POWDER
const SFX_DOUBLESLAP
const SFX_BITE
const SFX_JUMP_KICK
const SFX_STOMP
const SFX_TAIL_WHIP
const SFX_KARATE_CHOP
const SFX_SUBMISSION
const SFX_WATER_GUN
const SFX_SWORDS_DANCE
const SFX_THUNDER
const SFX_SUPERSONIC
const SFX_LEER
const SFX_EMBER
const SFX_BUBBLEBEAM
const SFX_HYDRO_PUMP
const SFX_SURF
const SFX_PSYBEAM
const SFX_CHARGE
const SFX_THUNDERSHOCK
const SFX_PSYCHIC
const SFX_SCREECH
const SFX_BONE_CLUB
const SFX_SHARPEN
const SFX_EGG_BOMB
const SFX_SING
const SFX_HYPER_BEAM
const SFX_SHINE
const SFX_UNKNOWN_5F
const SFX_UNKNOWN_60
const SFX_UNKNOWN_61
const SFX_UNKNOWN_62
const SFX_UNKNOWN_63
const SFX_BURN
const SFX_TITLE_SCREEN_ENTRANCE
const SFX_UNKNOWN_66
const SFX_GET_COIN_FROM_SLOTS
const SFX_PAY_DAY
const SFX_METRONOME
const SFX_CALL
const SFX_HANG_UP
const SFX_NO_SIGNAL
const SFX_SANDSTORM
const SFX_ELEVATOR
const SFX_PROTECT
const SFX_SKETCH
const SFX_RAIN_DANCE
const SFX_AEROBLAST
const SFX_SPARK
const SFX_CURSE
const SFX_RAGE
const SFX_THIEF
const SFX_THIEF_2
const SFX_SPIDER_WEB
const SFX_MIND_READER
const SFX_NIGHTMARE
const SFX_SNORE
const SFX_SWEET_KISS
const SFX_SWEET_KISS_2
const SFX_BELLY_DRUM
const SFX_UNKNOWN_7F
const SFX_SLUDGE_BOMB
const SFX_FORESIGHT
const SFX_SPITE
const SFX_OUTRAGE
const SFX_PERISH_SONG
const SFX_GIGA_DRAIN
const SFX_ATTRACT
const SFX_KINESIS_2
const SFX_ZAP_CANNON
const SFX_MEAN_LOOK
const SFX_HEAL_BELL
const SFX_RETURN
const SFX_EXP_BAR
const SFX_MILK_DRINK
const SFX_PRESENT
const SFX_MORNING_SUN
const SFX_LEVEL_UP
const SFX_KEY_ITEM
const SFX_FANFARE_2
const SFX_REGISTER_PHONE_NUMBER
const SFX_3RD_PLACE
const SFX_GET_EGG_FROM_DAYCARE_MAN
const SFX_GET_EGG_FROM_DAYCARE_LADY
const SFX_MOVE_DELETED
const SFX_2ND_PLACE
const SFX_1ST_PLACE
const SFX_CHOOSE_A_CARD
const SFX_GET_TM
const SFX_GET_BADGE
const SFX_QUIT_SLOTS
const SFX_EGG_CRACK
const SFX_DEX_FANFARE_LESS_THAN_20
const SFX_DEX_FANFARE_140_169
const SFX_DEX_FANFARE_170_199
const SFX_DEX_FANFARE_200_229
const SFX_DEX_FANFARE_230_PLUS
const SFX_EVOLVED
const SFX_MASTER_BALL
const SFX_EGG_HATCH
const SFX_DEX_FANFARE_50_79
const SFX_ITEM
const SFX_CAUGHT_MON
const SFX_POKEBALLS_PLACED_ON_TABLE
const SFX_POTION
const SFX_FULL_HEAL
const SFX_MENU
const SFX_READ_TEXT
const SFX_READ_TEXT_2
const SFX_DEX_FANFARE_20_49
const SFX_DEX_FANFARE_80_109
const SFX_POISON
const SFX_GOT_SAFARI_BALLS
const SFX_BOOT_PC
const SFX_SHUT_DOWN_PC
const SFX_CHOOSE_PC_OPTION
const SFX_ESCAPE_ROPE
const SFX_PUSH_BUTTON
const SFX_SECOND_PART_OF_ITEMFINDER
const SFX_WARP_TO
const SFX_WARP_FROM
const SFX_CHANGE_DEX_MODE
const SFX_JUMP_OVER_LEDGE
const SFX_GRASS_RUSTLE
const SFX_FLY
const SFX_WRONG
const SFX_SQUEAK
const SFX_STRENGTH
const SFX_BOAT
const SFX_WALL_OPEN
const SFX_PLACE_PUZZLE_PIECE_DOWN
const SFX_ENTER_DOOR
const SFX_SWITCH_POKEMON
const SFX_TALLY
const SFX_TRANSACTION
const SFX_EXIT_BUILDING
const SFX_BUMP
const SFX_SAVE
const SFX_POKEFLUTE
const SFX_ELEVATOR_END
const SFX_THROW_BALL
const SFX_BALL_POOF
const SFX_UNKNOWN_2A
const SFX_RUN
const SFX_SLOT_MACHINE_START
const SFX_FANFARE
const SFX_PECK
const SFX_KINESIS
const SFX_LICK
const SFX_POUND
const SFX_MOVE_PUZZLE_PIECE
const SFX_COMET_PUNCH
const SFX_MEGA_PUNCH
const SFX_SCRATCH
const SFX_VICEGRIP
const SFX_RAZOR_WIND
const SFX_CUT
const SFX_WING_ATTACK
const SFX_WHIRLWIND
const SFX_BIND
const SFX_VINE_WHIP
const SFX_DOUBLE_KICK
const SFX_MEGA_KICK
const SFX_HEADBUTT
const SFX_HORN_ATTACK
const SFX_TACKLE
const SFX_POISON_STING
const SFX_POWDER
const SFX_DOUBLESLAP
const SFX_BITE
const SFX_JUMP_KICK
const SFX_STOMP
const SFX_TAIL_WHIP
const SFX_KARATE_CHOP
const SFX_SUBMISSION
const SFX_WATER_GUN
const SFX_SWORDS_DANCE
const SFX_THUNDER
const SFX_SUPERSONIC
const SFX_LEER
const SFX_EMBER
const SFX_BUBBLEBEAM
const SFX_HYDRO_PUMP
const SFX_SURF
const SFX_PSYBEAM
const SFX_CHARGE
const SFX_THUNDERSHOCK
const SFX_PSYCHIC
const SFX_SCREECH
const SFX_BONE_CLUB
const SFX_SHARPEN
const SFX_EGG_BOMB
const SFX_SING
const SFX_HYPER_BEAM
const SFX_SHINE
const SFX_UNKNOWN_5F
const SFX_UNKNOWN_60
const SFX_UNKNOWN_61
const SFX_UNKNOWN_62
const SFX_UNKNOWN_63
const SFX_BURN
const SFX_TITLE_SCREEN_ENTRANCE
const SFX_UNKNOWN_66
const SFX_GET_COIN_FROM_SLOTS
const SFX_PAY_DAY
const SFX_METRONOME
const SFX_CALL
const SFX_HANG_UP
const SFX_NO_SIGNAL
const SFX_SANDSTORM
const SFX_ELEVATOR
const SFX_PROTECT
const SFX_SKETCH
const SFX_RAIN_DANCE
const SFX_AEROBLAST
const SFX_SPARK
const SFX_CURSE
const SFX_RAGE
const SFX_THIEF
const SFX_THIEF_2
const SFX_SPIDER_WEB
const SFX_MIND_READER
const SFX_NIGHTMARE
const SFX_SNORE
const SFX_SWEET_KISS
const SFX_SWEET_KISS_2
const SFX_BELLY_DRUM
const SFX_UNKNOWN_7F
const SFX_SLUDGE_BOMB
const SFX_FORESIGHT
const SFX_SPITE
const SFX_OUTRAGE
const SFX_PERISH_SONG
const SFX_GIGA_DRAIN
const SFX_ATTRACT
const SFX_KINESIS_2
const SFX_ZAP_CANNON
const SFX_MEAN_LOOK
const SFX_HEAL_BELL
const SFX_RETURN
const SFX_EXP_BAR
const SFX_MILK_DRINK
const SFX_PRESENT
const SFX_MORNING_SUN
const SFX_LEVEL_UP
const SFX_KEY_ITEM
const SFX_FANFARE_2
const SFX_REGISTER_PHONE_NUMBER
const SFX_3RD_PLACE
const SFX_GET_EGG_FROM_DAYCARE_MAN
const SFX_GET_EGG_FROM_DAYCARE_LADY
const SFX_MOVE_DELETED
const SFX_2ND_PLACE
const SFX_1ST_PLACE
const SFX_CHOOSE_A_CARD
const SFX_GET_TM
const SFX_GET_BADGE
const SFX_QUIT_SLOTS
const SFX_EGG_CRACK
const SFX_DEX_FANFARE_LESS_THAN_20
const SFX_DEX_FANFARE_140_169
const SFX_DEX_FANFARE_170_199
const SFX_DEX_FANFARE_200_229
const SFX_DEX_FANFARE_230_PLUS
const SFX_EVOLVED
const SFX_MASTER_BALL
const SFX_EGG_HATCH
const SFX_GS_INTRO_CHARIZARD_FIREBALL
const SFX_GS_INTRO_POKEMON_APPEARS
const SFX_FLASH
const SFX_GAME_FREAK_LOGO_GS
const SFX_NOT_VERY_EFFECTIVE
const SFX_DAMAGE
const SFX_SUPER_EFFECTIVE
const SFX_BALL_BOUNCE
const SFX_MOONLIGHT
const SFX_ENCORE
const SFX_BEAT_UP
const SFX_BATON_PASS
const SFX_BALL_WIGGLE
const SFX_SWEET_SCENT
const SFX_SWEET_SCENT_2
const SFX_HIT_END_OF_EXP_BAR
const SFX_GIVE_TRADEMON
const SFX_GET_TRADEMON
const SFX_TRAIN_ARRIVED
const SFX_STOP_SLOT
const SFX_2_BOOPS
const SFX_GLASS_TING
const SFX_GLASS_TING_2
const SFX_GS_INTRO_POKEMON_APPEARS
const SFX_FLASH
const SFX_GAME_FREAK_LOGO_GS
const SFX_NOT_VERY_EFFECTIVE
const SFX_DAMAGE
const SFX_SUPER_EFFECTIVE
const SFX_BALL_BOUNCE
const SFX_MOONLIGHT
const SFX_ENCORE
const SFX_BEAT_UP
const SFX_BATON_PASS
const SFX_BALL_WIGGLE
const SFX_SWEET_SCENT
const SFX_SWEET_SCENT_2
const SFX_HIT_END_OF_EXP_BAR
const SFX_GIVE_TRADEMON
const SFX_GET_TRADEMON
const SFX_TRAIN_ARRIVED
const SFX_STOP_SLOT
const SFX_2_BOOPS
const SFX_GLASS_TING
const SFX_GLASS_TING_2
const SFX_INTRO_UNOWN_1
const SFX_INTRO_UNOWN_2
const SFX_INTRO_UNOWN_3
const SFX_DITTO_POP_UP
const SFX_DITTO_TRANSFORM
const SFX_INTRO_SUICUNE_1
const SFX_INTRO_PICHU
const SFX_INTRO_SUICUNE_2
const SFX_INTRO_SUICUNE_3
const SFX_DITTO_BOUNCE
const SFX_INTRO_SUICUNE_4
const SFX_GAME_FREAK_PRESENTS
const SFX_TINGLE
const SFX_UNKNOWN_CB
const SFX_TWO_PC_BEEPS
const SFX_4_NOTE_DITTY
const SFX_TWINKLE
const SFX_INTRO_UNOWN_1
const SFX_INTRO_UNOWN_2
const SFX_INTRO_UNOWN_3
const SFX_DITTO_POP_UP
const SFX_DITTO_TRANSFORM
const SFX_INTRO_SUICUNE_1
const SFX_INTRO_PICHU
const SFX_INTRO_SUICUNE_2
const SFX_INTRO_SUICUNE_3
const SFX_DITTO_BOUNCE
const SFX_INTRO_SUICUNE_4
const SFX_GAME_FREAK_PRESENTS
const SFX_TINGLE
const SFX_UNKNOWN_CB
const SFX_TWO_PC_BEEPS
const SFX_4_NOTE_DITTY
const SFX_TWINKLE