Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
pokeemmo/include/constants
History
Eduardo Quezada ddc752eb14 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	asm/macros/event.inc
#	data/field_effect_scripts.s
#	data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
#	data/script_cmd_table.inc
#	graphics/pokemon/castform/sunny/anim_front.png
#	graphics/pokemon/castform/sunny/normal.pal
#	include/battle_util.h
#	include/constants/event_object_movement.h
#	include/constants/field_effects.h
#	src/battle_controller_player.c
#	src/battle_util.c
#	src/data/object_events/movement_action_func_tables.h
#	src/data/object_events/object_event_pic_tables.h
#	src/data/trainer_graphics/back_pic_anims.h
#	src/daycare.c
#	src/event_object_movement.c
#	src/field_effect_helpers.c
#	src/load_save.c
#	src/scrcmd.c
#	src/trainer_see.c
2024-01-17 18:11:35 -03:00
..
abilities.h
Define new abilities (#3838)
2023-12-28 12:33:29 +01:00
apprentice.h
…
battle_ai.h
Smarter SwitchAI Mon Choices | HasBadOdds Switch Check (#3253)
2023-11-11 14:37:35 +01:00
battle_anim_scripts.h
Add many gen 8 move animations (#2861)
2023-06-21 13:19:54 -04:00
battle_anim.h
Fix rain dance/sunny day not blending opponent sprite (#3785)
2023-12-21 13:17:05 +01:00
battle_arena.h
Fix typo
2022-08-11 12:09:38 -04:00
battle_dome.h
Battle Dome Automation (#3596)
2023-11-24 16:19:32 +01:00
battle_factory.h
…
battle_frontier_mons.h
…
battle_frontier_trainers.h
…
battle_frontier.h
Partner Battle refactor (#3592)
2023-12-20 12:38:28 +01:00
battle_move_effects.h
Removed some hardcoded move IDs (#3982)
2024-01-12 22:41:46 +01:00
battle_palace.h
Clean up pokemon/ball/dex mentions in comments
2023-12-12 19:02:36 +01:00
battle_partner.h
Partner Battle refactor (#3592)
2023-12-20 12:38:28 +01:00
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 'upcoming' into secondary_effects_overhaul
2023-12-30 23:54:01 +09:00
battle_setup.h
…
battle_string_ids.h
Applied more review fixes
2024-01-12 03:02:48 +09: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
…
battle_z_move_effects.h
Removed some hardcoded move IDs (#3982)
2024-01-12 22:41:46 +01:00
battle.h
Adds Move Psychic Noise (#4005)
2024-01-16 22:52:56 +01:00
berry.h
Refactor growth time and add six stage toggle
2023-12-07 13:22:01 +01:00
cable_club.h
…
coins.h
…
contest.h
Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
2023-08-31 14:28:01 -04:00
cries.h
Add Indigo Disk Pokemon data (#3878)
2024-01-01 01:38:50 +01: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
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
2024-01-17 18:11:35 -03:00
event_objects.h
Cleanup pt1
2023-06-17 23:34:01 -04:00
expansion.h
Non-tagged
2024-01-17 11:52:04 -03:00
field_effects.h
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
2024-01-17 18:11:35 -03:00
field_poison.h
…
field_specials.h
Clean up pokemon/ball/dex mentions in comments
2023-12-12 19:02:36 +01:00
field_tasks.h
…
field_weather.h
…
flags.h
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
2024-01-17 18:11:35 -03:00
form_change_types.h
Add status form change
2023-12-15 11:17:35 +01: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
Add pluralName to gItems to allow the proper spelling when multiple items are received at once (#4001)
2024-01-16 19:05:41 +01:00
heal_locations.h
Add the HEAL_LOCATION_NONE constant
2022-06-03 14:59:01 +01:00
hold_effects.h
Change Ivy Cudgel to be based on Ogerpon form rather than held item (#3865)
2023-12-30 11:40:58 +01: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
Raised the limit of max items per stack to 999 (#3923)
2024-01-14 16:32:38 -03:00
layouts.h
…
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
Metronome move fix (#3852)
2023-12-28 16:57:29 +01:00
mystery_gift.h
Document wonder news
2022-11-22 02:17:03 -05:00
opponents.h
Partner Battle refactor (#3592)
2023-12-20 12:38:28 +01:00
party_menu.h
Add support for legendary fusion (#3274)
2023-11-23 22:59:51 +01:00
pokedex.h
Add Indigo Disk Pokemon data (#3878)
2024-01-01 01:38:50 +01: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 'master' of https://github.com/pret/pokeemerald into pretmergenewyears
2023-12-30 20:49:05 +01: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
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion
2024-01-05 00:32:21 +01:00
secret_bases.h
…
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
Add Indigo Disk Pokemon data (#3878)
2024-01-01 01:38:50 +01: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
Refactor mugshots (#4000)
2024-01-16 00:45:13 +01:00
tv.h
Clean up pokemon/ball/dex mentions in comments
2023-12-12 19:02:36 +01: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
…
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