Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions 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

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