atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
sovereignx/include/constants
History
Eduardo Quezada afcc1178b2 Merge remote-tracking branch 'pret/master' into MergedBranchUltimate 
# Conflicts:
#	data/battle_ai_scripts.s
#	data/battle_scripts_1.s
#	include/battle_controllers.h
#	include/battle_script_commands.h
#	include/battle_util.h
#	include/constants/battle_script_commands.h
#	include/constants/global.h
#	include/decompress.h
#	src/battle_anim_effects_1.c
#	src/battle_anim_normal.c
#	src/battle_anim_poison.c
#	src/battle_anim_water.c
#	src/battle_arena.c
#	src/battle_controller_link_opponent.c
#	src/battle_controller_link_partner.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_recorded_player.c
#	src/battle_controller_safari.c
#	src/battle_controller_wally.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/berry.c
#	src/data/trainers.h
#	src/decompress.c
#	src/field_effect.c
#	src/hall_of_fame.c
#	src/overworld.c
#	src/pokeball.c
#	src/pokemon.c
#	src/pokemon_icon.c
#	src/pokemon_storage_system.c
#	src/scrcmd.c
2022-08-22 20:30:45 -04:00
..
abilities.h
apprentice.h
battle.h Merge remote-tracking branch 'pret/master' into MergedBranchUltimate 2022-08-22 20:30:45 -04:00
battle_ai.h AI_EFFECTIVENESS_xY are enums 2022-07-03 16:28:34 -04:00
battle_anim.h Merge branch 'battle_engine' into BE_pretmerge 2022-07-20 08:50:30 -04:00
battle_arena.h Fix typo 2022-08-11 12:09:38 -04:00
battle_config.h Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms 2022-08-22 17:27:21 -04:00
battle_dome.h
battle_factory.h
battle_frontier.h Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 2022-07-22 22:57:02 -04:00
battle_frontier_mons.h
battle_frontier_trainers.h
battle_move_effects.h merge w be 2022-07-17 12:40:43 -04:00
battle_palace.h
battle_pike.h Add some battle frontier constant usage 2022-06-09 12:57:28 -04:00
battle_pyramid.h Add some battle frontier constant usage 2022-06-09 12:57:28 -04:00
battle_script_commands.h Merge remote-tracking branch 'pret/master' into MergedBranchUltimate 2022-08-22 20:30:45 -04:00
battle_setup.h
battle_string_ids.h Merge branch 'battle_engine' into BE_pretmerge 2022-07-20 08:50:30 -04:00
battle_tent.h Add some battle frontier constant usage 2022-06-09 12:57:28 -04:00
battle_tent_mons.h
battle_tent_trainers.h
battle_tower.h
berry.h
cable_club.h
coins.h
contest.h
daycare.h changed EGG_MOVES_ARRAY_COUN to 19 to include all the added egg moves (19 is max value (Buneary)) 2022-01-04 00:23:24 +01:00
decorations.h
easy_chat.h
event_bg.h
event_object_movement.h Clean up lock/unlock anim movement 2022-08-12 21:18:10 -04:00
event_objects.h Add warning to NUM_OBJ_EVENT_GFX 2022-06-03 16:18:34 -04:00
expansion_branches.h
field_effects.h
field_poison.h
field_specials.h
field_tasks.h
field_weather.h
flags.h Fix inconsistent static s/g names 2022-05-17 14:00:02 -04:00
frontier_util.h
game_stat.h
global.h Merge remote-tracking branch 'pret/master' into MergedBranchUltimate 2022-08-22 20:30:45 -04:00
heal_locations.h
hold_effects.h Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
item.h
item_config.h
item_effects.h Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION 2022-08-02 00:15:55 -05:00
items.h Merge remote-tracking branch 'RHH/item_expansion' into IE_noJadeOrb 2022-01-16 18:44:03 -03:00
layouts.h
lilycove_lady.h
map_groups.h
map_scripts.h
map_types.h
maps.h Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
mauville_old_man.h
metatile_behaviors.h Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
metatile_labels.h Color single-palette door anim graphics 2022-05-18 12:41:20 -04:00
moves.h Merge pull request #2194 from AsparagusEduardo/BE_pretmerge 2022-07-22 14:00:40 -04:00
mystery_gift.h
opponents.h
party_menu.h
pokedex.h Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms 2022-08-22 17:27:21 -04:00
pokemon.h Merge remote-tracking branch 'pret/master' into MergedBranchUltimate 2022-08-22 20:30:45 -04:00
pokemon_config.h Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms 2022-08-22 17:27:21 -04:00
pokemon_debug.h added option to view changes for front/back sprite picCoords and elevation live 2021-12-13 22:31:37 +01:00
region_map_sections.h Synced Route 4 and 10's MapSec labels 2022-08-16 18:23:37 -04:00
rgb.h
roulette.h
script_menu.h
secret_bases.h
slot_machine.h
songs.h
sound.h
species.h Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms 2022-08-22 17:27:21 -04:00
trade.h
trainer_hill.h Added a constant for NPC trainer name length (#1712) 2022-07-25 22:59:13 -04:00
trainer_types.h
trainers.h
tv.h Document battle tower TV show 2022-06-14 09:37:39 -04:00
union_room.h Add some battle frontier constant usage 2022-06-09 12:57:28 -04:00
vars.h
weather.h
wild_encounter.h Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
z_move_effects.h move gSwapDamagecategory to battle struct, use GetSplitBasedOnStats for photon geyser check 2022-07-19 18:24:53 -04:00