Merge pull request #400 from mid-kid/master

mid-kid's amazing patches act 2
This commit is contained in:
Marcus Huderle 2017-11-29 17:13:47 -08:00 committed by GitHub
commit 7a2a205281
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
268 changed files with 584 additions and 579 deletions

View File

@ -367,71 +367,71 @@ MAX_OUTDOOR_SPRITES EQU 23
const_def
const SPRITE_ANIM_FRAMESET_00
const SPRITE_ANIM_FRAMESET_01
const SPRITE_ANIM_FRAMESET_02
const SPRITE_ANIM_FRAMESET_03
const SPRITE_ANIM_FRAMESET_04
const SPRITE_ANIM_FRAMESET_05
const SPRITE_ANIM_FRAMESET_06
const SPRITE_ANIM_FRAMESET_PARTY_MON
const SPRITE_ANIM_FRAMESET_02 ; unused?
const SPRITE_ANIM_FRAMESET_03 ; unused?
const SPRITE_ANIM_FRAMESET_04 ; unused?
const SPRITE_ANIM_FRAMESET_05 ; unused?
const SPRITE_ANIM_FRAMESET_06 ; unused?
const SPRITE_ANIM_FRAMESET_07
const SPRITE_ANIM_FRAMESET_08
const SPRITE_ANIM_FRAMESET_09
const SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR
const SPRITE_ANIM_FRAMESET_09 ; unused?
const SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO
const SPRITE_ANIM_FRAMESET_0B
const SPRITE_ANIM_FRAMESET_0C
const SPRITE_ANIM_FRAMESET_SLOT_GOLEM
const SPRITE_ANIM_FRAMESET_SLOTS_GOLEM
const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY
const SPRITE_ANIM_FRAMESET_0F
const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY_2
const SPRITE_ANIM_FRAMESET_SLOTS_EGG
const SPRITE_ANIM_FRAMESET_WALK_CYCLE
const SPRITE_ANIM_FRAMESET_12
const SPRITE_ANIM_FRAMESET_13
const SPRITE_ANIM_FRAMESET_14
const SPRITE_ANIM_FRAMESET_15
const SPRITE_ANIM_FRAMESET_16
const SPRITE_ANIM_FRAMESET_STILL_CURSOR
const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL
const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_0
const SPRITE_ANIM_FRAMESET_TRADE_POOF
const SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE
const SPRITE_ANIM_FRAMESET_TRADEMON_ICON
const SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE
const SPRITE_ANIM_FRAMESET_19
const SPRITE_ANIM_FRAMESET_1A
const SPRITE_ANIM_FRAMESET_1B
const SPRITE_ANIM_FRAMESET_1C
const SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT
const SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB
const SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED
const SPRITE_ANIM_FRAMESET_1C ; unused?
const SPRITE_ANIM_FRAMESET_LEAF
const SPRITE_ANIM_FRAMESET_1E
const SPRITE_ANIM_FRAMESET_1F
const SPRITE_ANIM_FRAMESET_20
const SPRITE_ANIM_FRAMESET_21
const SPRITE_ANIM_FRAMESET_22
const SPRITE_ANIM_FRAMESET_23
const SPRITE_ANIM_FRAMESET_CUT_TREE
const SPRITE_ANIM_FRAMESET_EGG_CRACK
const SPRITE_ANIM_FRAMESET_EGG_HATCH
const SPRITE_ANIM_FRAMESET_21 ; unused?
const SPRITE_ANIM_FRAMESET_22 ; unused?
const SPRITE_ANIM_FRAMESET_23 ; unused?
const SPRITE_ANIM_FRAMESET_24
const SPRITE_ANIM_FRAMESET_25
const SPRITE_ANIM_FRAMESET_HEADBUTT
const SPRITE_ANIM_FRAMESET_26
const SPRITE_ANIM_FRAMESET_27
const SPRITE_ANIM_FRAMESET_28
const SPRITE_ANIM_FRAMESET_29
const SPRITE_ANIM_FRAMESET_2A
const SPRITE_ANIM_FRAMESET_2B
const SPRITE_ANIM_FRAMESET_2C
const SPRITE_ANIM_FRAMESET_2D
const SPRITE_ANIM_FRAMESET_2E
const SPRITE_ANIM_FRAMESET_27 ; unused?
const SPRITE_ANIM_FRAMESET_28 ; unused?
const SPRITE_ANIM_FRAMESET_29 ; unused?
const SPRITE_ANIM_FRAMESET_2A ; unused?
const SPRITE_ANIM_FRAMESET_2B ; unused?
const SPRITE_ANIM_FRAMESET_2C ; unused?
const SPRITE_ANIM_FRAMESET_BLUE_WALK
const SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE
const SPRITE_ANIM_FRAMESET_2F
const SPRITE_ANIM_FRAMESET_30
const SPRITE_ANIM_FRAMESET_31
const SPRITE_ANIM_FRAMESET_32
const SPRITE_ANIM_FRAMESET_33
const SPRITE_ANIM_FRAMESET_34
const SPRITE_ANIM_FRAMESET_35
const SPRITE_ANIM_FRAMESET_36
const SPRITE_ANIM_FRAMESET_37
const SPRITE_ANIM_FRAMESET_38
const SPRITE_ANIM_FRAMESET_39
const SPRITE_ANIM_FRAMESET_3A
const SPRITE_ANIM_FRAMESET_3B
const SPRITE_ANIM_FRAMESET_3C
const SPRITE_ANIM_FRAMESET_3D
const SPRITE_ANIM_FRAMESET_3E
const SPRITE_ANIM_FRAMESET_3F
const SPRITE_ANIM_FRAMESET_40
const SPRITE_ANIM_FRAMESET_41
const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE
const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_2
const SPRITE_ANIM_FRAMESET_INTRO_PICHU
const SPRITE_ANIM_FRAMESET_INTRO_WOOPER
const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_1
const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_2
const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_3
const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_4
const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F_2
const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY
const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F
const SPRITE_ANIM_FRAMESET_CELEBI_LEFT
const SPRITE_ANIM_FRAMESET_CELEBI_RIGHT
const_def
const SPRITE_ANIM_SEQ_NULL

Some files were not shown because too many files have changed in this diff Show More