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

Use "battle_anims" and "sprite_anims" for clarity, not just "anims"

Browse Source
This commit is contained in:
Remy Oukaour 2017-12-26 18:45:04 -05:00
parent b5417fafec
commit 35a3a19fda
132 changed files with 1967 additions and 1969 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Makefile
View File

@ -169,23 +169,23 @@ gfx/slots/slots_3.2bpp: tools/gfx += --interleave --png=$< --remove-duplicates -
gfx/card_flip/card_flip_2.2bpp: tools/gfx += --remove-whitespace
gfx/anims/angels.2bpp: tools/gfx += --trim-whitespace
gfx/anims/beam.2bpp: tools/gfx += --remove-xflip --remove-yflip --remove-whitespace
gfx/anims/bubble.2bpp: tools/gfx += --trim-whitespace
gfx/anims/charge.2bpp: tools/gfx += --trim-whitespace
gfx/anims/egg.2bpp: tools/gfx += --remove-whitespace
gfx/anims/explosion.2bpp: tools/gfx += --remove-whitespace
gfx/anims/hit.2bpp: tools/gfx += --remove-whitespace
gfx/anims/horn.2bpp: tools/gfx += --remove-whitespace
gfx/anims/lightning.2bpp: tools/gfx += --remove-whitespace
gfx/anims/misc.2bpp: tools/gfx += --remove-duplicates --remove-xflip
gfx/anims/noise.2bpp: tools/gfx += --remove-whitespace
gfx/anims/objects.2bpp: tools/gfx += --remove-whitespace --remove-xflip
gfx/anims/pokeball.2bpp: tools/gfx += --remove-xflip --keep-whitespace
gfx/anims/reflect.2bpp: tools/gfx += --remove-whitespace
gfx/anims/rocks.2bpp: tools/gfx += --remove-whitespace
gfx/anims/skyattack.2bpp: tools/gfx += --remove-whitespace
gfx/anims/status.2bpp: tools/gfx += --remove-whitespace
gfx/battle_anims/angels.2bpp: tools/gfx += --trim-whitespace
gfx/battle_anims/beam.2bpp: tools/gfx += --remove-xflip --remove-yflip --remove-whitespace
gfx/battle_anims/bubble.2bpp: tools/gfx += --trim-whitespace
gfx/battle_anims/charge.2bpp: tools/gfx += --trim-whitespace
gfx/battle_anims/egg.2bpp: tools/gfx += --remove-whitespace
gfx/battle_anims/explosion.2bpp: tools/gfx += --remove-whitespace
gfx/battle_anims/hit.2bpp: tools/gfx += --remove-whitespace
gfx/battle_anims/horn.2bpp: tools/gfx += --remove-whitespace
gfx/battle_anims/lightning.2bpp: tools/gfx += --remove-whitespace
gfx/battle_anims/misc.2bpp: tools/gfx += --remove-duplicates --remove-xflip
gfx/battle_anims/noise.2bpp: tools/gfx += --remove-whitespace
gfx/battle_anims/objects.2bpp: tools/gfx += --remove-whitespace --remove-xflip
gfx/battle_anims/pokeball.2bpp: tools/gfx += --remove-xflip --keep-whitespace
gfx/battle_anims/reflect.2bpp: tools/gfx += --remove-whitespace
gfx/battle_anims/rocks.2bpp: tools/gfx += --remove-whitespace
gfx/battle_anims/skyattack.2bpp: tools/gfx += --remove-whitespace
gfx/battle_anims/status.2bpp: tools/gfx += --remove-whitespace
gfx/player/chris.2bpp: rgbgfx += -h
gfx/player/chris_back.2bpp: rgbgfx += -h

3
constants.asm
View File

@ -8,6 +8,7 @@ INCLUDE "constants/pokemon_constants.asm"
INCLUDE "constants/type_constants.asm"
INCLUDE "constants/move_constants.asm"
INCLUDE "constants/battle_constants.asm"
INCLUDE "constants/battle_anim_constants.asm"
INCLUDE "constants/map_constants.asm"
INCLUDE "constants/map_data_constants.asm"
INCLUDE "constants/map_setup_constants.asm"
@ -20,12 +21,12 @@ INCLUDE "constants/event_flags.asm"
INCLUDE "constants/engine_flags.asm"
INCLUDE "constants/music_constants.asm"
INCLUDE "constants/sfx_constants.asm"
INCLUDE "constants/animation_constants.asm"
INCLUDE "constants/phone_constants.asm"
INCLUDE "constants/credits_constants.asm"
INCLUDE "constants/gfx_constants.asm"
INCLUDE "constants/input_constants.asm"
INCLUDE "constants/pokemon_data_constants.asm"
INCLUDE "constants/icon_constants.asm"
INCLUDE "constants/serial_constants.asm"
INCLUDE "constants/mobile_constants.asm"
INCLUDE "constants/misc_constants.asm"

12
constants/animation_constants.asm → constants/battle_anim_constants.asm
View File

@ -26,7 +26,7 @@
const BATTLEANIMSTRUCT_17
BATTLEANIMSTRUCT_LENGTH EQU const_value
; BattleAnimObjects indexes (see data/anims/objects.asm)
; BattleAnimObjects indexes (see data/battle_anims/objects.asm)
const_def
const ANIM_OBJ_00
const ANIM_OBJ_01
@ -217,7 +217,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
const ANIM_OBJ_BA
const ANIM_OBJ_BB
; DoBattleAnimFrame arguments (see engine/anims/functions.asm)
; DoBattleAnimFrame arguments (see engine/battle_anims/functions.asm)
const_def
const BATTLEANIMFUNC_00
const BATTLEANIMFUNC_01
@ -300,7 +300,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
const BATTLEANIMFUNC_4E
const BATTLEANIMFUNC_4F
; BattleAnimFrameData indexes (see data/anims/framesets.asm)
; BattleAnimFrameData indexes (see data/battle_anims/framesets.asm)
const_def
const BATTLEANIMFRAMESET_00
const BATTLEANIMFRAMESET_01
@ -488,7 +488,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
const BATTLEANIMFRAMESET_B7
const BATTLEANIMFRAMESET_B8
; BattleAnimOAMData indexes (see data/anims/oam.asm)
; BattleAnimOAMData indexes (see data/battle_anims/oam.asm)
const_def
const BATTLEANIMOAMSET_00
const BATTLEANIMOAMSET_01
@ -707,7 +707,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
const BATTLEANIMOAMSET_D6
const BATTLEANIMOAMSET_D7
; BattleBGEffects indexes (see engine/anims/bg_effects.asm)
; BattleBGEffects indexes (see engine/battle_anims/bg_effects.asm)
const_value SET 1
const ANIM_BG_FLASH_INVERTED
const ANIM_BG_FLASH_WHITE
@ -763,7 +763,7 @@ const_value SET 1
const ANIM_BG_WOBBLE_MON
const ANIM_BG_35
; AnimObjGFX indexes (see data/anims/object_gfx.asm)
; AnimObjGFX indexes (see data/battle_anims/object_gfx.asm)
const_value SET 1
const ANIM_GFX_HIT
const ANIM_GFX_CUT

41
constants/icon_constants.asm Normal file
View File

@ -0,0 +1,41 @@
; IconPointers indexes (see data/icon_pointers.asm)
const_def
const ICON_NULL
const ICON_POLIWAG
const ICON_JIGGLYPUFF
const ICON_DIGLETT
const ICON_PIKACHU
const ICON_STARYU
const ICON_FISH
const ICON_BIRD
const ICON_MONSTER
const ICON_CLEFAIRY
const ICON_ODDISH
const ICON_BUG
const ICON_GHOST
const ICON_LAPRAS
const ICON_HUMANSHAPE
const ICON_FOX
const ICON_EQUINE
const ICON_SHELL
const ICON_BLOB
const ICON_SERPENT
const ICON_VOLTORB
const ICON_SQUIRTLE
const ICON_BULBASAUR
const ICON_CHARMANDER
const ICON_CATERPILLAR
const ICON_UNOWN
const ICON_GEODUDE
const ICON_FIGHTER
const ICON_EGG
const ICON_JELLYFISH
const ICON_MOTH
const ICON_BAT
const ICON_SNORLAX
const ICON_HO_OH
const ICON_LUGIA
const ICON_GYARADOS
const ICON_SLOWPOKE
const ICON_SUDOWOODO
const ICON_BIGMON

2
constants/pokemon_constants.asm
View File

@ -10,8 +10,8 @@
; - BitmasksPointers (see gfx/pokemon/bitmask_pointers.asm)
; - AnimationExtraPointers (see gfx/pokemon/extra_pointers.asm)
; - FramesPointers (see gfx/pokemon/frame_pointers.asm)
; - PokemonPalettes (see gfx/pokemon/palette_pointers.asm)
; - PicPointers (see gfx/pokemon/pic_pointers.asm)
; - PokemonPalettes (see data/palettes/pokemon_palettes.asm)
; - AlphabeticalPokedexOrder (see data/pokemon/dex_order_alpha.asm)
; - NewPokedexOrder (see data/pokemon/dex_order_new.asm)
; - MonMenuIcons (see data/pokemon/menu_icons.asm)

43
constants/pokemon_data_constants.asm
View File

@ -102,49 +102,6 @@ REDMON_STRUCT_LENGTH EQU 44
PARTY_LENGTH EQU 6
; IconPointers indexes (see gfx/icon_pointers.asm)
const_def
const ICON_NULL
const ICON_POLIWAG
const ICON_JIGGLYPUFF
const ICON_DIGLETT
const ICON_PIKACHU
const ICON_STARYU
const ICON_FISH
const ICON_BIRD
const ICON_MONSTER
const ICON_CLEFAIRY
const ICON_ODDISH
const ICON_BUG
const ICON_GHOST
const ICON_LAPRAS
const ICON_HUMANSHAPE
const ICON_FOX
const ICON_EQUINE
const ICON_SHELL
const ICON_BLOB
const ICON_SERPENT
const ICON_VOLTORB
const ICON_SQUIRTLE
const ICON_BULBASAUR
const ICON_CHARMANDER
const ICON_CATERPILLAR
const ICON_UNOWN
const ICON_GEODUDE
const ICON_FIGHTER
const ICON_EGG
const ICON_JELLYFISH
const ICON_MOTH
const ICON_BAT
const ICON_SNORLAX
const ICON_HO_OH
const ICON_LUGIA
const ICON_GYARADOS
const ICON_SLOWPOKE
const ICON_SUDOWOODO
const ICON_BIGMON
; evolution types (used in data/pokemon/evos_attacks.asm)
const_value SET 1
const EVOLVE_LEVEL

6
constants/sprite_anim_constants.asm
View File

@ -17,7 +17,7 @@
const SPRITEANIMSTRUCT_0E ; e
const SPRITEANIMSTRUCT_0F ; f
; SpriteAnimSeqData indexes (see data/sprites/sequences.asm)
; SpriteAnimSeqData indexes (see data/sprite_anims/sequences.asm)
const_def
const SPRITE_ANIM_INDEX_PARTY_MON ; 00
const SPRITE_ANIM_INDEX_GS_TITLE_TRAIL ; 01
@ -103,7 +103,7 @@
const SPRITE_ANIM_SEQ_INTRO_UNOWN_F ; 21
const SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY ; 22
; SpriteAnimFrameData indexes (see data/sprites/framesets.asm)
; SpriteAnimFrameData indexes (see data/sprite_anims/framesets.asm)
const_def
const SPRITE_ANIM_FRAMESET_00
const SPRITE_ANIM_FRAMESET_PARTY_MON ; 01
@ -172,7 +172,7 @@
const SPRITE_ANIM_FRAMESET_CELEBI_LEFT ; 40
const SPRITE_ANIM_FRAMESET_CELEBI_RIGHT ; 41
; SpriteAnimOAMData indexes (see data/sprites/oam.asm)
; SpriteAnimOAMData indexes (see data/sprite_anims/oam.asm)
const_def
const SPRITE_ANIM_OAMSET_RED_WALK_1 ; 00
const SPRITE_ANIM_OAMSET_RED_WALK_2 ; 01

1271
data/anims/framesets.asm
View File

File diff suppressed because it is too large Load Diff

0
data/anims/ball_colors.asm → data/battle_anims/ball_colors.asm
View File

1270
data/battle_anims/framesets.asm Executable file
View File

File diff suppressed because it is too large Load Diff

0
data/anims/oam.asm → data/battle_anims/oam.asm
View File

0
data/anims/object_gfx.asm → data/battle_anims/object_gfx.asm
View File

0
data/anims/objects.asm → data/battle_anims/objects.asm
View File

0
gfx/icon_pointers.asm → data/icon_pointers.asm
View File

541
data/palettes/pokemon_palettes.asm Normal file
View File

File diff suppressed because it is too large Load Diff

0
gfx/trainer_palettes.asm → data/palettes/trainer_palettes.asm
View File

0
gfx/pokemon/pic_pointers.asm → data/pokemon/pic_pointers.asm
View File

0
gfx/pokemon/unown_pic_pointers.asm → data/pokemon/unown_pic_pointers.asm
View File

0
data/sprites/framesets.asm → data/sprite_anims/framesets.asm
View File

0
data/sprites/oam.asm → data/sprite_anims/oam.asm
View File

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