Remove redundant data/ filename prefixes

This commit is contained in:
Remy Oukaour
2017-12-27 01:29:15 -05:00
parent 86fd37af16
commit 7a4d641251
41 changed files with 88 additions and 87 deletions

View File

@@ -1,9 +1,9 @@
; item ids ; item ids
; indexes for: ; indexes for:
; - ItemAttributes (see data/items/item_attributes.asm) ; - ItemNames (see data/items/names.asm)
; - ItemDescriptions (see data/items/item_descriptions.asm) ; - ItemDescriptions (see data/items/descriptions.asm)
; - ItemAttributes (see data/items/attributes.asm)
; - ItemEffects (see engine/item_effects.asm) ; - ItemEffects (see engine/item_effects.asm)
; - ItemNames (see data/items/item_names.asm)
const_def const_def
const NO_ITEM ; $00 const NO_ITEM ; $00
const MASTER_BALL ; $01 const MASTER_BALL ; $01

View File

@@ -1,4 +1,4 @@
; item_attributes struct members (see data/items/item_attributes.asm) ; item_attributes struct members (see data/items/attributes.asm)
const_def const_def
const ITEMATTR_PRICE const ITEMATTR_PRICE
const ITEMATTR_PRICE_HI const ITEMATTR_PRICE_HI

View File

@@ -16,8 +16,8 @@ endm
; map group ids ; map group ids
; `newgroup` indexes are for: ; `newgroup` indexes are for:
; - MapGroupPointers (see maps/map_headers.asm) ; - MapGroupPointers (see maps/map_headers.asm)
; - MapGroupRoofs (see data/maps/roofs.asm)
; - OutdoorSprites (see data/maps/outdoor_sprites.asm) ; - OutdoorSprites (see data/maps/outdoor_sprites.asm)
; - MapGroupRoofs (see data/maps/mapgroup_roofs.asm)
; `mapgroup` indexes are for the sub-tables of MapGroupPointers (see maps/map_headers.asm) ; `mapgroup` indexes are for the sub-tables of MapGroupPointers (see maps/map_headers.asm)
const_def const_def

View File

@@ -1,5 +1,5 @@
; hMapEntryMethod values ; hMapEntryMethod values
; MapSetupScripts indexes (see data/maps/map_setup_scripts.asm) ; MapSetupScripts indexes (see data/maps/setup_scripts.asm)
const_value SET $f1 const_value SET $f1
const MAPSETUP_WARP ; f1 const MAPSETUP_WARP ; f1
const MAPSETUP_CONTINUE ; f2 const MAPSETUP_CONTINUE ; f2

View File

@@ -1,9 +1,9 @@
; move ids ; move ids
; indexes for: ; indexes for:
; - Moves (see data/moves/moves.asm) ; - Moves (see data/moves/moves.asm)
; - MoveNames (see data/moves/move_names.asm) ; - MoveNames (see data/moves/names.asm)
; - MoveDescriptions (see data/moves/move_descriptions.asm) ; - MoveDescriptions (see data/moves/descriptions.asm)
; - BattleAnimations (see data/moves/move_anims.asm) ; - BattleAnimations (see data/moves/animations.asm)
const_def const_def
const NO_MOVE ; 00 const NO_MOVE ; 00
const POUND ; 01 const POUND ; 01

View File

@@ -1,4 +1,4 @@
; MoveEffectsPointers indexes (see data/moves/move_effects_pointers.asm) ; MoveEffectsPointers indexes (see data/moves/effects_pointers.asm)
const_def const_def
const EFFECT_NORMAL_HIT const EFFECT_NORMAL_HIT
const EFFECT_SLEEP const EFFECT_SLEEP

View File

@@ -1,21 +1,21 @@
; pokemon ids ; pokemon ids
; indexes for: ; indexes for:
; - PokemonCries (see data/pokemon/cries.asm) ; - PokemonNames (see data/pokemon/names.asm)
; - BaseData (see data/pokemon/base_stats.asm) ; - BaseData (see data/pokemon/base_stats.asm)
; - EggMovePointers (see data/pokemon/egg_move_pointers.asm)
; - EvosAttacksPointers (see data/pokemon/evos_attacks_pointers.asm) ; - EvosAttacksPointers (see data/pokemon/evos_attacks_pointers.asm)
; - PokemonNames (see data/pokemon/pokemon_names.asm) ; - EggMovePointers (see data/pokemon/egg_move_pointers.asm)
; - PokemonCries (see data/pokemon/cries.asm)
; - MonMenuIcons (see data/pokemon/menu_icons.asm)
; - PokemonPalettes (see data/pokemon/palettes.asm)
; - PokedexDataPointerTable (see data/pokemon/dex_entry_pointers.asm) ; - PokedexDataPointerTable (see data/pokemon/dex_entry_pointers.asm)
; - AnimationPointers (see gfx/pokemon/anim_pointers.asm)
; - BitmasksPointers (see gfx/pokemon/bitmask_pointers.asm)
; - AnimationExtraPointers (see gfx/pokemon/extra_pointers.asm)
; - FramesPointers (see gfx/pokemon/frame_pointers.asm)
; - PicPointers (see gfx/pokemon/pic_pointers.asm)
; - PokemonPalettes (see data/palettes/pokemon_palettes.asm)
; - AlphabeticalPokedexOrder (see data/pokemon/dex_order_alpha.asm) ; - AlphabeticalPokedexOrder (see data/pokemon/dex_order_alpha.asm)
; - NewPokedexOrder (see data/pokemon/dex_order_new.asm) ; - NewPokedexOrder (see data/pokemon/dex_order_new.asm)
; - MonMenuIcons (see data/pokemon/menu_icons.asm)
; - Pokered_MonIndices (see data/time_capsule/mon_order.asm) ; - Pokered_MonIndices (see data/time_capsule/mon_order.asm)
; - PokemonPicPointers (see gfx/pokemon/pic_pointers.asm)
; - AnimationPointers (see gfx/pokemon/anim_pointers.asm)
; - AnimationExtraPointers (see gfx/pokemon/extra_pointers.asm)
; - BitmasksPointers (see gfx/pokemon/bitmask_pointers.asm)
; - FramesPointers (see gfx/pokemon/frame_pointers.asm)
; - SortedPokemon (see mobile/fixed_words.asm) ; - SortedPokemon (see mobile/fixed_words.asm)
const_value set 1 const_value set 1
const BULBASAUR ; 01 const BULBASAUR ; 01

View File

@@ -5,12 +5,14 @@ ENDM
; trainer class ids ; trainer class ids
; `trainerclass` indexes are for: ; `trainerclass` indexes are for:
; - TrainerClassAttributes (see data/trainers/trainer_attributes.asm) ; - TrainerClassNames (see data/trainers/class_names.asm)
; - TrainerClassDVs (see data/trainers/trainer_dvs.asm) ; - TrainerClassAttributes (see data/trainers/attributes.asm)
; - TrainerClassNames (see data/trainers/trainer_class_names.asm) ; - TrainerClassDVs (see data/trainers/dvs.asm)
; - TrainerEncounterMusic (see data/trainers/encounter_music.asm)
; - TrainerGroups (see data/trainers/party_pointers.asm) ; - TrainerGroups (see data/trainers/party_pointers.asm)
; - BTTrainerClassGenders (see data/trainers/gendered_trainers.asm) ; - TrainerEncounterMusic (see data/trainers/encounter_music.asm)
; - TrainerPicPointers (see data/trainers/pic_pointers.asm)
; - TrainerPalettes (see data/trainers/palettes.asm)
; - BTTrainerClassGenders (see data/trainers/genders.asm)
; trainer constants are Trainers indexes, for the sub-tables of TrainerGroups (see data/trainers/parties.asm) ; trainer constants are Trainers indexes, for the sub-tables of TrainerGroups (see data/trainers/parties.asm)
enum_start enum_start
CHRIS EQU __enum__ CHRIS EQU __enum__

View File

@@ -1,4 +1,4 @@
; TrainerClassAttributes struct members (see data/trainers/trainer_attributes.asm) ; TrainerClassAttributes struct members (see data/trainers/attributes.asm)
const_def const_def
const TRNATTR_ITEM1 ; 0 const TRNATTR_ITEM1 ; 0
const TRNATTR_ITEM2 ; 1 const TRNATTR_ITEM2 ; 1
@@ -45,7 +45,7 @@ SWITCH_SOMETIMES EQU 1 << SWITCH_SOMETIMES_F
SWITCH_RARELY EQU 1 << SWITCH_RARELY_F SWITCH_RARELY EQU 1 << SWITCH_RARELY_F
SWITCH_OFTEN EQU 1 << SWITCH_OFTEN_F SWITCH_OFTEN EQU 1 << SWITCH_OFTEN_F
; TrainerTypes indexes (see trainers/read_party.asm) ; TrainerTypes indexes (see engine/battle/read_trainer_party.asm)
const_def const_def
const TRAINERTYPE_NORMAL const TRAINERTYPE_NORMAL
const TRAINERTYPE_MOVES const TRAINERTYPE_MOVES

View File

@@ -1,7 +1,7 @@
dw 0 ; padding dw 0 ; padding
BattleCommandPointers: ; 3fd28 BattleCommandPointers: ; 3fd28
; entries correspond to macros/scripts/effect_commands.asm ; entries correspond to macros/scripts/battle_commands.asm
dw BattleCommand_CheckTurn ; 34084 dw BattleCommand_CheckTurn ; 34084
dw BattleCommand_CheckObedience ; 343db dw BattleCommand_CheckObedience ; 343db
dw BattleCommand_UsedMoveText ; 34541 dw BattleCommand_UsedMoveText ; 34541

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