Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
pokeemmo/include/constants
History
Eduardo Quezada 92301398bc Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax 
# Conflicts:
#	asm/macros/battle_script.inc
#	data/battle_anim_scripts.s
#	data/battle_scripts_1.s
#	include/battle.h
#	include/battle_controllers.h
#	include/battle_interface.h
#	include/config/battle.h
#	include/constants/battle.h
#	include/constants/battle_anim.h
#	include/constants/battle_move_effects.h
#	include/constants/battle_string_ids.h
#	include/data.h
#	include/random.h
#	sound/cry_tables.inc
#	src/battle_anim_new.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/pokemon/form_change_table_pointers.h
#	src/data/pokemon/species_info.h
#	src/data/text/move_names.h
#	test/test_runner_battle.c
2023-10-09 16:51:41 -03:00
..
abilities.h
Add Teal Mask item, move, and ability data (#3349)
2023-10-08 15:56:09 -03:00
apprentice.h
…
battle_ai.h
AI battle tests + AI logic fixes (#3361)
2023-10-04 18:53:29 +01:00
battle_anim_scripts.h
Add many gen 8 move animations (#2861)
2023-06-21 13:19:54 -04:00
battle_anim.h
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
2023-10-09 16:51:41 -03:00
battle_arena.h
Fix typo
2022-08-11 12:09:38 -04:00
battle_dome.h
Removed trailing spaces in the most relevant files
2021-08-24 19:59:32 -03:00
battle_factory.h
…
battle_frontier_mons.h
…
battle_frontier_trainers.h
Removed trailing spaces in the most relevant files
2021-08-24 19:59:32 -03:00
battle_frontier.h
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
2022-07-22 22:57:02 -04:00
battle_move_effects.h
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
2023-10-09 16:51:41 -03:00
battle_palace.h
…
battle_pike.h
Add some battle frontier constant usage
2022-06-09 12:57:28 -04:00
battle_pyramid.h
Misc field_specials cleanup
2023-02-01 11:48:55 -05:00
battle_script_commands.h
Merge branch 'RHH/master' into RHH/upcoming
2023-09-24 20:32:45 -03:00
battle_setup.h
…
battle_string_ids.h
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
2023-10-09 16:51:41 -03:00
battle_tent_mons.h
…
battle_tent_trainers.h
…
battle_tent.h
Add some battle frontier constant usage
2022-06-09 12:57:28 -04:00
battle_tower.h
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-03-22 23:08:19 -07:00
battle.h
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
2023-10-09 16:51:41 -03:00
berry.h
Fix swapped route 102 berries
2021-02-10 16:26:09 -05:00
cable_club.h
Document remaining overworld
2021-04-06 16:55:43 -04:00
coins.h
…
contest.h
Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
2023-08-31 14:28:01 -04:00
daycare.h
Remove unused INHERITED_IV_COUNT define
2023-01-31 09:44:47 +01:00
decorations.h
…
easy_chat.h
Document the trendy saying word group
2023-03-13 15:58:40 -04:00
event_bg.h
…
event_object_movement.h
Clean up lock/unlock anim movement
2022-08-12 21:18:10 -04:00
event_objects.h
Sync clone object macro
2023-02-08 13:11:10 -05:00
field_effects.h
Continue battle_transition documenting
2021-10-29 11:24:36 -04:00
field_poison.h
…
field_specials.h
Misc field_specials cleanup
2023-02-01 11:48:55 -05:00
field_tasks.h
…
field_weather.h
…
flags.h
Merge pull request #1904 from GriffinRichards/temp-alias
2023-08-11 15:45:00 -04:00
form_change_types.h
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
2023-10-09 16:51:41 -03:00
frontier_util.h
…
game_stat.h
Rename GAME_STAT_FISHING_CAPTURES to GAME_STAT_FISHING_ENCOUNTERS
2023-06-05 14:15:07 +02:00
global.h
Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
2023-08-31 14:28:01 -04:00
heal_locations.h
Add the HEAL_LOCATION_NONE constant
2022-06-03 14:59:01 +01:00
hold_effects.h
Add Berserk Gene Item (#2893)
2023-04-25 15:03:57 -04:00
item_effects.h
Add Teal Mask item, move, and ability data (#3349)
2023-10-08 15:56:09 -03:00
item.h
Added shiny rerolls to Lures + reverted repel var name
2022-09-12 10:21:57 -03:00
items.h
Add Teal Mask item, move, and ability data (#3349)
2023-10-08 15:56:09 -03:00
layouts.h
Label unused layouts
2021-02-08 14:45:56 -05:00
lilycove_lady.h
Merge branch 'master' into trailingSpaces
2021-09-23 21:39:21 -04:00
map_groups.h
Erase ghost data in include/constants/map_groups.h
2022-09-09 00:40:30 +07:00
map_scripts.h
Small correction to map script comments
2021-10-13 23:24:10 -04:00
map_types.h
…
maps.h
Correct comment in maps.h
2023-01-18 11:54:06 -05:00
mauville_old_man.h
…
metatile_behaviors.h
Clarify MB_SEMI_DEEP_WATER name
2023-01-17 21:32:55 -05:00
metatile_labels.h
Sort metatile labels alphabetically
2023-02-14 14:36:27 -05:00
moves.h
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
2023-10-09 16:51:41 -03:00
mystery_gift.h
Document wonder news
2022-11-22 02:17:03 -05:00
opponents.h
…
party_menu.h
Add Frostbite status
2023-04-22 18:23:08 +02:00
pokedex.h
Organized conffig files into their own folder and cleaned up
2022-11-14 11:03:49 -03: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
pokemon.h
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
2023-10-09 16:51:41 -03:00
region_map_sections.h
Synced Route 4 and 10's MapSec labels
2022-08-16 18:23:37 -04:00
rgb.h
add silk trap anim
2023-01-28 09:03:18 -05:00
roulette.h
…
script_menu.h
Removed trailing spaces in the most relevant files
2021-08-24 19:59:32 -03:00
secret_bases.h
Document secret_base.c
2021-02-05 12:08:25 -05:00
slot_machine.h
Label slot machine ids, fix GetPriceReduction
2021-11-16 15:43:52 -05:00
songs.h
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319
2023-03-19 20:28:56 -03:00
sound.h
Fix CRY_MODE_ECHO
2021-11-10 11:59:15 -05:00
species.h
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-03-21 09:56:58 -07:00
tms_hms.h
Reference TMs and HMs by move instead of number (#1732)
2023-08-09 10:51:01 -04:00
trade.h
Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214
2023-02-15 14:11:03 -03:00
trainer_hill.h
Fix some frontier gfx, adjacent cleanup
2023-08-03 11:15:15 -04:00
trainer_types.h
…
trainers.h
Removed uses of F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED
2023-07-05 18:22:48 -04:00
tv.h
Redefine TV_SHOWS_COUNT
2023-04-27 13:59:09 -04:00
union_room.h
Fix names and constant usage for union room classes
2022-08-23 12:44:07 -04:00
vars.h
Add temp var aliases
2023-08-04 14:17:28 -04:00
weather.h
Removed trailing spaces in the most relevant files
2021-08-24 19:59:32 -03:00
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