Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-08-15 14:31:19 -05:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
Files
b0ccddac694e04f438cc06eb3f427ebab980979b
pokeemerald-expansion/include
History
Hedara b0ccddac69 Merge branch 'master' into master-to-upcoming 
Conflicts:
	include/constants/expansion.h
2025-11-03 11:11:07 +01:00
..
config
Merge branch 'master' into master-to-upcoming
2025-10-29 18:42:59 +01:00
constants
Merge branch 'master' into master-to-upcoming
2025-11-03 11:11:07 +01:00
gba
25/08/25 Master merge
2025-08-25 17:30:38 +02:00
test
Fix nature power string and add support for evnvironment in tests (#8068)
2025-10-28 19:23:16 +01:00
agb_flash.h
…
AgbRfu_LinkManager.h
…
apprentice.h
…
bard_music.h
…
battle_ai_field_statuses.h
AI refactor for weather-setting, terrain-setting, Trick Room behaviors; doubles-focused (#7319)
2025-07-19 19:20:07 -04:00
battle_ai_main.h
IncreaseStatUpScore adjustments for Simple, +3 moves, Acupressure, max move effects (#7662)
2025-09-01 19:02:56 +02:00
battle_ai_switch_items.h
Add type enum (#8054)
2025-10-27 16:41:22 +00:00
battle_ai_util.h
Combine Simple Beam and Worry Seed into one effect (#8039)
2025-10-29 15:20:12 +01:00
battle_anim_scripts.h
Separates FRB and FRZ animations (#7611)
2025-08-28 19:07:08 +02:00
battle_anim.h
Converts some defines to enums and name unnamed enums (#8019)
2025-10-23 18:06:29 +02:00
battle_arena.h
…
battle_bg.h
…
battle_controllers.h
Add type enum (#8054)
2025-10-27 16:41:22 +00:00
battle_debug.h
…
battle_dome.h
…
battle_dynamax.h
Add type enum (#8054)
2025-10-27 16:41:22 +00:00
battle_end_turn.h
…
battle_environment.h
Add type enum (#8054)
2025-10-27 16:41:22 +00:00
battle_factory_screen.h
…
battle_factory.h
…
battle_gfx_sfx_util.h
Replaces STATUS2 usage with volatiles in code (#7262)
2025-07-11 22:53:49 +02:00
battle_gimmick.h
Fix wrong gimmick spite showing when inputting too fast (#8066)
2025-10-28 17:02:35 +01:00
battle_hold_effects.h
Clean up for item hold effect refactor (#8014)
2025-10-30 21:07:37 +01:00
battle_interface.h
feat: change defines in constants/abilities.h to an enum (#7006)
2025-09-29 21:35:09 +02:00
battle_main.h
Add type enum (#8054)
2025-10-27 16:41:22 +00:00
battle_message.h
Add type enum (#8054)
2025-10-27 16:41:22 +00:00
battle_pike.h
…
battle_pyramid_bag.h
Use TaskFunc wherever posible (#2188)
2025-10-18 17:53:50 +01:00
battle_pyramid.h
Merge branch 'master' into _pret/pr/pyramidLocation
2025-06-30 11:51:45 -04:00
battle_records.h
…
battle_script_commands.h
Emergency Exit on hazards activation + fix end of turn activation (#8075)
2025-10-30 17:01:13 +01:00
battle_scripts.h
Grudge, Destiny Bond and FaintBattler refactor (#8072)
2025-10-30 23:14:02 +01:00
battle_setup.h
Converts some defines to enums and name unnamed enums (#8019)
2025-10-23 18:06:29 +02:00
battle_tent.h
…
battle_terastal.h
Add type enum (#8054)
2025-10-27 16:41:22 +00:00
battle_tower.h
Converts a bunch of defines to enums (#7041)
2025-06-02 15:54:37 +02:00
battle_transition_frontier.h
…
battle_transition.h
Converts some defines to enums and name unnamed enums (#8019)
2025-10-23 18:06:29 +02:00
battle_tv.h
…
battle_util2.h
…
battle_util.h
10/11/25 Master to upcoming merge
2025-11-01 11:54:17 +01:00
battle_z_move.h
…
battle.h
Merge branch 'master' into master-to-upcoming
2025-11-03 11:11:07 +01:00
berry_blender.h
…
berry_crush.h
…
berry_fix_program.h
…
berry_powder.h
…
berry_tag_screen.h
…
berry.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
bg.h
…
bike.h
…
birch_pc.h
…
blit.h
…
braille_puzzles.h
…
cable_club.h
…
caps.h
…
clear_save_data_menu.h
…
clock.h
…
coins.h
…
confetti_util.h
…
contest_ai.h
…
contest_effect.h
…
contest_link.h
…
contest_painting.h
…
contest_util.h
…
contest.h
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
coord_event_weather.h
…
credits.h
…
crt0.h
…
data.h
Add type enum (#8054)
2025-10-27 16:41:22 +00:00
datetime.h
…
daycare.h
…
debug.h
Add new actions to Debug Menu (#7837)
2025-10-03 20:26:49 +02:00
decompress_error_handler.h
New sprite compressor (#5627)
2025-05-30 23:10:54 +02:00
decompress.h
Fix follower compression (#7038)
2025-06-01 10:06:12 +02:00
decoration_inventory.h
…
decoration.h
…
dewford_trend.h
…
dexnav.h
…
difficulty.h
…
digit_obj_util.h
…
diploma.h
…
dma3.h
…
dodrio_berry_picking.h
Use MainCallback wherever posible (#2184)
2025-10-14 09:41:27 +01:00
dynamic_placeholder_text_util.h
…
easy_chat.h
…
egg_hatch.h
…
ereader_helpers.h
…
ereader_screen.h
…
event_data.h
…
event_object_lock.h
…
event_object_movement.h
Merge commit '685a8a911878f54463845c9f2ebbf11bd04ff4ee' into merrp-merge
2025-06-25 17:49:19 +02:00
event_scripts.h
Rock climb by ghoulslash (#7432)
2025-08-03 14:52:07 +02:00
evolution_graphics.h
…
evolution_scene.h
…
expansion_intro.h
…
fake_rtc.h
…
faraway_island.h
…
field_camera.h
…
field_control_avatar.h
Master to upcoming merge
2025-05-26 10:41:11 +02:00
field_door.h
…
field_effect_helpers.h
Merge commit '685a8a911878f54463845c9f2ebbf11bd04ff4ee' into merrp-merge
2025-06-25 17:49:19 +02:00
field_effect.h
11/08/25 Master to upcoming merge
2025-08-11 08:31:12 +02:00
field_message_box.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
field_move.h
Refactor field moves (#6660)
2025-05-31 09:03:12 +02:00
field_name_box.h
Fix namebox bug when reloading the map mid-script (#8073)
2025-10-30 09:13:22 +01:00
field_player_avatar.h
Update fishing odds to match official games (#7574)
2025-10-04 09:05:28 -07:00
field_poison.h
…
field_screen_effect.h
…
field_special_scene.h
…
field_specials.h
Converts some defines to enums and name unnamed enums (#8019)
2025-10-23 18:06:29 +02:00
field_tasks.h
…
field_weather.h
…
fieldmap.h
Merge branch 'followers' into lighting
2025-06-24 20:44:44 -04:00
fishing.h
Update fishing odds to match official games (#7574)
2025-10-04 09:05:28 -07:00
fldeff_misc.h
Refactor field moves (#6660)
2025-05-31 09:03:12 +02:00
fldeff.h
Refactor field moves (#6660)
2025-05-31 09:03:12 +02:00
follower_helper.h
Merge commit '1f2fe7396b68d82da356b93fca10cc5736d3159c' into merrp-merge
2025-06-25 17:20:38 +02:00
follower_npc_alternate_sprites.h
Better system for Follower NPC running frames (#7222)
2025-06-27 10:12:35 +02:00
follower_npc.h
11/08/25 Master to upcoming merge
2025-08-11 08:31:12 +02:00
fonts.h
…
fpmath.h
…
frontier_pass.h
…
frontier_util.h
Banned species list (#8003)
2025-10-23 21:29:33 +02:00
gametypes.h
Add typedefs for MAPSEC and METLOC values (#2183)
2025-10-19 17:37:13 +01:00
generational_changes.h
Fix badge boost not applying in gen1 and 2 (#8013)
2025-10-22 22:57:04 +02:00
global.berry.h
…
global.fieldmap.h
Merge commit '7fd0029ed7b9a245f866b6a7467f6d0bd7c0f717' into pret-merge
2025-11-01 15:09:20 +01:00
global.h
Merge commit '7fd0029ed7b9a245f866b6a7467f6d0bd7c0f717' into pret-merge
2025-11-01 15:09:20 +01:00
global.tv.h
Merge commit '7fd0029ed7b9a245f866b6a7467f6d0bd7c0f717' into pret-merge
2025-11-01 15:09:20 +01:00
gpu_regs.h
…
graphics.h
New and polished battle animations (#7074)
2025-07-11 19:14:19 +02:00
gym_leader_rematch.h
…
hall_of_fame.h
…
heal_location.h
Merge commit '091b726' into pret-merge
2025-05-27 19:02:53 +02:00
image_processing_effects.h
…
international_string_util.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
intro_credits_graphics.h
…
intro.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
io_reg.h
…
item_ball.h
…
item_icon.h
…
item_menu_icons.h
…
item_menu.h
Merge commit '0965dffe70bb7d4bc229e24e4bc0266a6be6b8c8' into pret-merge
2025-11-01 14:56:09 +01:00
item_use.h
New Feature: ORAS Dowsing (#7211)
2025-10-27 17:41:07 +01:00
item.h
Even more enums and documentation (#8029)
2025-10-25 14:37:47 +02:00
landmark.h
Add typedefs for MAPSEC and METLOC values (#2183)
2025-10-19 17:37:13 +01:00
libgcnmultiboot.h
…
librfu.h
…
lilycove_lady.h
…
line_break.h
Added naive line break (#7076)
2025-06-06 20:13:07 -07:00
link_rfu.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
link.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
list_menu.h
Banned species list (#8003)
2025-10-23 21:29:33 +02:00
load_save.h
…
lottery_corner.h
…
m4a.h
…
mail.h
Use MainCallback wherever posible (#2184)
2025-10-14 09:41:27 +01:00
main_menu.h
…
main.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
malloc.h
Increased heap by 768 bytes (#7097)
2025-06-11 17:55:32 +02:00
map_name_popup.h
…
match_call.h
Implement field_name_box (#7697)
2025-09-14 20:45:18 +02:00
math_util.h
Fix move comparison scoring (#7301)
2025-07-10 09:51:46 +02:00
mauville_old_man.h
…
menu_helpers.h
…
menu_specialized.h
…
menu.h
Minor clean up in menu.c (#8060)
2025-10-30 17:15:15 +01:00
metaprogram.h
Changed item name/pluralName to a compound string (#7359)
2025-08-08 20:51:16 +02:00
metatile_behavior.h
Rock climb by ghoulslash (#7432)
2025-08-03 14:52:07 +02:00
mini_printf.h
…
minigame_countdown.h
…
mirage_tower.h
…
mon_markings.h
…
money.h
…
move_relearner.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
move.h
Combine Simple Beam and Worry Seed into one effect (#8039)
2025-10-29 15:20:12 +01:00
multiboot_pokemon_colosseum.h
…
multiboot.h
…
mystery_event_menu.h
…
mystery_event_msg.h
…
mystery_event_script.h
…
mystery_gift_client.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
mystery_gift_link.h
…
mystery_gift_menu.h
…
mystery_gift_server.h
…
mystery_gift_view.h
…
mystery_gift.h
…
naming_screen.h
…
new_game.h
…
option_menu.h
…
oras_dowse.h
New Feature: ORAS Dowsing (#7211)
2025-10-27 17:41:07 +01:00
overworld.h
Merge branch 'master' into master-to-upcoming
2025-11-03 11:11:07 +01:00
palette_util.h
…
palette.h
…
party_menu.h
11/08/25 Master to upcoming merge
2025-08-11 08:31:12 +02:00
pc_screen_effect.h
…
play_time.h
…
player_pc.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
pokeball.h
Add gBallItemIds Array (#7905)
2025-10-10 11:09:19 +02:00
pokeblock.h
…
pokedex_area_region_map.h
…
pokedex_area_screen.h
Master to upcoming merge
2025-05-26 10:41:11 +02:00
pokedex_cry_screen.h
…
pokedex_plus_hgss.h
Revert HGSS dex and movelist changes (#8016)
2025-10-23 13:52:25 +02:00
pokedex.h
Fix hgss pokedex when catching mon with terrain (#7884)
2025-10-08 17:54:23 +02:00
pokemon_animation.h
Converts a bunch of defines to enums (#7041)
2025-06-02 15:54:37 +02:00
pokemon_icon.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
pokemon_jump.h
…
pokemon_size_record.h
…
pokemon_sprite_visualizer.h
Refactor battle environment (#4891)
2025-07-12 12:38:06 -04:00
pokemon_storage_system.h
…
pokemon_summary_screen.h
…
pokemon.h
Add type enum (#8054)
2025-10-27 16:41:22 +00:00
pokenav.h
Merge commit '7fd0029ed7b9a245f866b6a7467f6d0bd7c0f717' into pret-merge
2025-11-01 15:09:20 +01:00
random.h
Master to upcoming merge
2025-10-25 16:19:32 +02:00
rayquaza_scene.h
Use MainCallback wherever posible (#2184)
2025-10-14 09:41:27 +01:00
record_mixing.h
…
recorded_battle.h
Multibattle testing system (#7257)
2025-10-24 15:00:23 +02:00
region_map.h
Merge commit '7fd0029ed7b9a245f866b6a7467f6d0bd7c0f717' into pret-merge
2025-11-01 15:09:20 +01:00
regions.h
…
reload_save.h
…
reset_rtc_screen.h
…
reshow_battle_screen.h
…
roamer.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
rotating_gate.h
…
rotating_tile_puzzle.h
…
roulette.h
…
rtc.h
Moved time constants to dedicated files (#7019)
2025-05-30 16:39:01 +02:00
safari_zone.h
…
save_location.h
…
save.h
Merge commit 'f2cf20ce9bdf4a9f6cd0300a005ca3ec6ae89e3c' into pret-merge
2025-11-01 14:51:14 +01:00
scanline_effect.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
script_menu.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
script_movement.h
…
script_pokemon_util.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
script.h
…
secret_base.h
…
shop.h
…
siirtc.h
Moved time constants to dedicated files (#7019)
2025-05-30 16:39:01 +02:00
slot_machine.h
…
sound.h
…
sprite.h
battle_interface: overhaul ability pop up (#7227)
2025-07-10 19:09:52 +02:00
start_menu.h
…
starter_choose.h
…
string_util.h
…
strings.h
Master to upcoming merge
2025-10-25 16:19:32 +02:00
task.h
…
test_runner.h
Fix nature power string and add support for evnvironment in tests (#8068)
2025-10-28 19:23:16 +01:00
text_window.h
…
text.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
tileset_anims.h
…
tilesets.h
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
time_events.h
…
title_screen.h
…
trade.h
Add type enum (#8054)
2025-10-27 16:41:22 +00:00
trader.h
…
trainer_card.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
trainer_hill.h
Converts a bunch of defines to enums (#7041)
2025-06-02 15:54:37 +02:00
trainer_pokemon_sprites.h
Improve trainer back pic-related data and code (+ smol documentation) (#6821)
2025-06-30 23:50:48 +02:00
trainer_pools.h
Add pool rules for Mega Stones and Z-Crystals (#7720)
2025-09-12 21:04:36 +02:00
trainer_see.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
trainer_slide.h
Add type enum (#8054)
2025-10-27 16:41:22 +00:00
trig.h
…
tv.h
…
type_icons.h
…
union_room_battle.h
…
union_room_chat.h
…
union_room_player_avatar.h
…
union_room.h
Add type enum (#8054)
2025-10-27 16:41:22 +00:00
util.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
vs_seeker.h
…
walda_phrase.h
…
wallclock.h
…
wild_encounter.h
feat: separate water and rock smash encounter rate checks (#7293)
2025-07-08 20:52:42 +02:00
window.h
Text rendering optimizations (#7497)
2025-08-28 21:24:27 +02:00
wonder_news.h
…