mirror of
https://github.com/pret/pokeemerald.git
synced 2026-07-23 04:20:57 -05:00
a64e1c63c1
* Made gBattleMoves handle the InGame name and description of battle moves No more multiple arrays in separate, individual files. Note: -Keep an eye on Task_LearnedMove. * Reintroduced move names Misc: -Fixed Trick-or-Treat and Light of Ruin's expanded names. -Introduced a new field for Z-Move names, and a constant for their name length. -Added a few TODOs to GetBattleMoveName. -Updated GetMaxMoveName and GetZMoveName. There's no reason not to let GetBattleMoveName handle everything on its own. * Updated GetBattleMoveName to handle Z-Move Names Misc: -Removed pointless TODO about MOVE_NAME_LENGTH. -The compiler doesn't allow to have a move name with a value higher than MOVE_NAME_LENGTH, therefore it's pointless to worry about it. * Fixed a couple of expanded move names * Removed zMoveName variable of struct BattleMove and extended the name variable's size * Ditched no longer used MOVE_NAME_LENGTH constant * Corrected the names of the max moves I should have done this after updating the size of the name variable of the struct BattleMove, but I didn't think about it at all until Cancer Fairy indirectly gave me the idea. * Fixed U-turn's name * Brought back MOVE_NAME_LENGTH I think it doesn't make sense to have a Z_MOVE_NAME_LENGTH because the length in question is used for all battle moves, not just the Z-Moves. * Introduced a union for Move/Z-Move names in the struct BattleMove * Fixed the union for gBattleMoves move names Also updated GetBattleMoveName to properly handle Max Move names. Also also renamed the "zMoveName" variable to "bigMoveName" which better reflects its purpose. Z-Move names weren't the only thing it covered, since it also handles Max Move names. * Removed deprecated GetZMoveName and GetMaxMoveName * Reintroduced mention to gMoveNames in sGFRomHeader * Fixed move names and ported move descriptions * Fused the struct ContestMove into the struct BattleMove * Removed no longer used Z_MOVE_NAME_LENGTH constant * Renamed the struct BattleMove's bigMoveName variable and introduced macros to prettify move names * Reintroduced the contest parameters for Pokémon moves * Renamed gBattleMoves to gMovesInfo This is consistent with gSpeciesInfo, the array that contains most of the species data. * Renamed the BattleMove struct to MovesInfo This is consistent with the struct SpeciesInfo, which contains the variables used by the gSpeciesInfo array. * Removed empty lines separating battle params from contest params in gMovesInfo * Renamed MovesInfo to MoveInfo * Added Cancer Fairy's HANDLE_EXPANDED_MOVE_NAME macro Used to handle moves with expanded names in a more comfortable manner. Also fixed Trick-or-Treat's expanded name. * Renamed GetBattleMoveName to GetMoveName * Added a comment pointing out that the shared move descriptions are shared move descriptions * Re-aligned one of the escape characters of CHECK_MOVE_FLAG * Renamed the battle_moves.h file to moves_info.h instead for consistency's sake * Applied Eduardo's adjustments * Using compound string for regular move names as well, saving 1180 bytes and making their use consistent * Move description formatting * Updated Pursuit test after merge * Renamed the BATTLE_CATEGORY constants to DAMAGE_CATEGORY --------- Co-authored-by: Nephrite <thechurchofcage@gmail.com> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> |
||
|---|---|---|
| .. | ||
| abilities.h | ||
| apprentice.h | ||
| battle_ai.h | ||
| battle_anim_scripts.h | ||
| battle_anim.h | ||
| battle_arena.h | ||
| battle_dome.h | ||
| battle_factory.h | ||
| battle_frontier_mons.h | ||
| battle_frontier_trainers.h | ||
| battle_frontier.h | ||
| battle_move_effects.h | ||
| battle_palace.h | ||
| battle_partner.h | ||
| battle_pike.h | ||
| battle_pyramid.h | ||
| battle_script_commands.h | ||
| battle_setup.h | ||
| battle_string_ids.h | ||
| battle_tent_mons.h | ||
| battle_tent_trainers.h | ||
| battle_tent.h | ||
| battle_tower.h | ||
| battle_z_move_effects.h | ||
| battle.h | ||
| berry.h | ||
| cable_club.h | ||
| coins.h | ||
| contest.h | ||
| cries.h | ||
| daycare.h | ||
| decorations.h | ||
| easy_chat.h | ||
| event_bg.h | ||
| event_object_movement.h | ||
| event_objects.h | ||
| expansion.h | ||
| field_effects.h | ||
| field_poison.h | ||
| field_specials.h | ||
| field_tasks.h | ||
| field_weather.h | ||
| flags.h | ||
| form_change_types.h | ||
| frontier_util.h | ||
| game_stat.h | ||
| global.h | ||
| heal_locations.h | ||
| hold_effects.h | ||
| item_effects.h | ||
| item.h | ||
| items.h | ||
| layouts.h | ||
| lilycove_lady.h | ||
| map_groups.h | ||
| map_scripts.h | ||
| map_types.h | ||
| maps.h | ||
| mauville_old_man.h | ||
| metatile_behaviors.h | ||
| metatile_labels.h | ||
| moves.h | ||
| mystery_gift.h | ||
| opponents.h | ||
| party_menu.h | ||
| pokedex.h | ||
| pokemon_debug.h | ||
| pokemon.h | ||
| region_map_sections.h | ||
| rgb.h | ||
| roulette.h | ||
| script_menu.h | ||
| secret_bases.h | ||
| slot_machine.h | ||
| songs.h | ||
| sound.h | ||
| species.h | ||
| tms_hms.h | ||
| trade.h | ||
| trainer_hill.h | ||
| trainer_types.h | ||
| trainers.h | ||
| tv.h | ||
| union_room.h | ||
| vars.h | ||
| weather.h | ||
| wild_encounter.h | ||