Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-15 14:38:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
Files
3ce34c41b6223a38cec3bbfbdc0fd7d4197c0d2d
pokeemerald/include
History
Hedara 3ce34c41b6 Merge commit '1f2fe7396b68d82da356b93fca10cc5736d3159c' into merrp-merge 
Conflicts:
	include/follower_helper.h
	src/follower_helper.c
2025-06-25 17:20:38 +02:00
..
config
Update the description of OW_OBJECT_VANILLA_SHADOWS (#7184)
2025-06-23 15:40:13 +02:00
constants
Merge commit '1f2fe7396b68d82da356b93fca10cc5736d3159c' into merrp-merge
2025-06-25 17:20:38 +02:00
gba
Master to upcoming merge
2025-05-26 10:41:11 +02:00
test
Test runner fixes (#7100)
2025-06-15 12:02:29 +02:00
agb_flash.h
…
AgbRfu_LinkManager.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
apprentice.h
…
bard_music.h
Document bard music (#2053)
2025-01-17 17:54:38 +00:00
battle_ai_main.h
don't need prints any more
2025-05-08 14:52:13 -04:00
battle_ai_script_commands.h
Merge commit '2044bea883d08ec9266d21ac0cd6a56c3e0d5962' into pret-merge
2025-05-15 21:15:37 +02:00
battle_ai_switch_items.h
Adjust switch AI based on move scoring (#6615)
2025-05-06 00:39:44 +02:00
battle_ai_util.h
Master to upcoming merge
2025-05-26 10:41:11 +02:00
battle_anim_scripts.h
New animations for Mega Evolution, Primal Reversion, Ultra Burst, and Power Construct (#6834)
2025-05-15 09:40:02 +02:00
battle_anim.h
Master to upcoming merge
2025-05-26 10:41:11 +02:00
battle_arena.h
Turn battle string ids into enums (#6594)
2025-04-13 16:12:30 +02:00
battle_bg.h
…
battle_controllers.h
Battle controller pret documentation (#7029)
2025-06-02 14:22:11 +02:00
battle_debug.h
…
battle_dome.h
…
battle_dynamax.h
Remove non-existent functions from header files (#6825)
2025-05-13 10:52:45 +02:00
battle_end_turn.h
clean up
2025-02-23 23:22:31 +01:00
battle_factory_screen.h
…
battle_factory.h
Refactor AI flags to u64 (#6753)
2025-05-04 17:16:34 +02:00
battle_gfx_sfx_util.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
battle_gimmick.h
Remove non-existent functions from header files (#6825)
2025-05-13 10:52:45 +02:00
battle_interface.h
Master to upcoming merge
2025-05-26 10:41:11 +02:00
battle_main.h
Master to upcoming merge
2025-05-26 10:41:11 +02:00
battle_message.h
Turn battle string ids into enums (#6594)
2025-04-13 16:12:30 +02:00
battle_pike.h
…
battle_pyramid_bag.h
…
battle_pyramid.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
battle_records.h
Rename battlerId to battler for consistency (#2126)
2025-05-09 12:43:23 +01:00
battle_script_commands.h
Master to upcoming merge
2025-05-26 10:41:11 +02:00
battle_scripts.h
Fix typos and some cleanup (mainly in battle files) (#7107)
2025-06-13 14:12:13 +02:00
battle_setup.h
Merge remote-tracking branch 'pret/master' into new-pret-merge
2025-04-29 20:27:33 +02:00
battle_tent.h
…
battle_terastal.h
…
battle_tower.h
Follower NPCs (follow-me) (#6500)
2025-04-27 14:56:18 +02:00
battle_transition_frontier.h
…
battle_transition.h
Clean up redundancy for mugshots (#5906)
2024-12-30 18:32:21 +01:00
battle_tv.h
conflicts
2025-05-16 10:46:32 +02:00
battle_util2.h
…
battle_util.h
Remove incorrectly re-added ABILITYEFFECT_ cases
2025-05-28 14:38:57 +02:00
battle_z_move.h
…
battle.h
Fixes repeated learning of level up moves (#6981)
2025-05-26 14:15:16 -07: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
Remove gDecompressionBuffer (#6029)
2025-01-23 09:47:14 +01:00
bike.h
…
birch_pc.h
…
blit.h
…
braille_puzzles.h
…
cable_club.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
caps.h
…
clear_save_data_menu.h
…
clock.h
…
coins.h
…
confetti_util.h
…
contest_ai.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
contest_effect.h
…
contest_link.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
contest_painting.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
contest_util.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
contest.h
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
coord_event_weather.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
credits.h
…
crt0.h
…
data.h
Expand trainerproc to support additional battle types (#6770)
2025-05-17 15:08:44 +02:00
datetime.h
FakeRtc datetime and ResetRtcScreen day increments (#5695)
2025-04-12 13:17:58 -07:00
daycare.h
Merge branch 'master' into master-to-upcoming
2025-02-06 13:05:02 +01:00
debug.h
Refactor AI flags to u64 (#6753)
2025-05-04 17:16:34 +02:00
decompress.h
Remove compressed palettes (#6455)
2025-04-26 22:58:40 +02:00
decoration_inventory.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
decoration.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
dewford_trend.h
…
dexnav.h
Converts some defines to enums (#6592)
2025-04-13 13:39:20 +02:00
difficulty.h
Adds B_VAR_DIFFICULTY and related functions READ DESC (#5337)
2025-01-04 14:25:03 +01:00
digit_obj_util.h
…
diploma.h
…
dma3.h
…
dodrio_berry_picking.h
…
dynamic_placeholder_text_util.h
…
easy_chat.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
egg_hatch.h
…
ereader_helpers.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
ereader_screen.h
…
event_data.h
Cleaned up Debug Menu (#6070)
2025-01-22 15:27:08 +01:00
event_object_lock.h
…
event_object_movement.h
Master to upcoming merge
2025-05-26 10:41:11 +02:00
event_scripts.h
Follower NPCs (follow-me) (#6500)
2025-04-27 14:56:18 +02:00
evolution_graphics.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
evolution_scene.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
expansion_intro.h
…
fake_rtc.h
Time menu for RTC in debug menu. (#6634)
2025-04-23 19:34:37 +02:00
faraway_island.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
field_camera.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
field_control_avatar.h
Master to upcoming merge
2025-05-26 10:41:11 +02:00
field_door.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
field_effect_helpers.h
Master to upcoming merge
2025-05-26 10:41:11 +02:00
field_effect.h
Master to upcoming merge
2025-05-26 10:41:11 +02:00
field_message_box.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
field_player_avatar.h
Master to upcoming merge
2025-05-26 10:41:11 +02:00
field_poison.h
…
field_screen_effect.h
Follower NPCs (follow-me) (#6500)
2025-04-27 14:56:18 +02:00
field_special_scene.h
…
field_specials.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
field_tasks.h
…
field_weather.h
Review comments
2025-04-12 08:58:23 +02:00
fieldmap.h
Master to upcoming merge
2025-05-26 10:41:11 +02:00
fldeff_misc.h
…
fldeff.h
Master to upcoming merge
2025-05-26 10:41:11 +02:00
follower_helper.h
Merge commit '1f2fe7396b68d82da356b93fca10cc5736d3159c' into merrp-merge
2025-06-25 17:20:38 +02:00
follower_npc_alternate_sprites.h
Follower NPCs (follow-me) (#6500)
2025-04-27 14:56:18 +02:00
follower_npc.h
Make setobjextxy work with npc followers during ON_WARP map script (#6913)
2025-05-26 18:59:14 +02:00
fonts.h
…
fpmath.h
…
frontier_pass.h
…
frontier_util.h
Revert "Converts a bunch of defines to enums" (#6082)
2025-01-22 21:50:39 +01:00
generational_changes.h
Merge branch 'master' into master-upcoming
2025-05-12 18:21:35 +02:00
global.berry.h
…
global.fieldmap.h
Merge branch 'upcoming' into merrps-dns
2025-04-12 16:33:02 +02:00
global.h
Fixes Roamers not saving shininess (#7185)
2025-06-23 15:05:01 +02:00
global.tv.h
…
gpu_regs.h
…
graphics.h
Merge remote-tracking branch 'pret/master' into pret-merge
2025-06-24 10:42:24 +02:00
gym_leader_rematch.h
…
hall_of_fame.h
Remove gDecompressionBuffer (#6029)
2025-01-23 09:47:14 +01:00
heal_location.h
Merge commit '091b726' into pret-merge
2025-05-27 19:02:53 +02:00
image_processing_effects.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
international_string_util.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
intro_credits_graphics.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
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
Fix the Move Item option in the PC still expecting compressed palettes (#6739)
2025-05-02 21:43:24 +02:00
item_menu_icons.h
Remove compressed palettes (#6455)
2025-04-26 22:58:40 +02:00
item_menu.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
item_use.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
item.h
Fix sell price display (#7123)
2025-06-15 11:52:51 +02:00
landmark.h
…
libgcnmultiboot.h
…
librfu.h
Correct C23 Checks (#2144)
2025-05-19 15:43:06 +01:00
lilycove_lady.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
line_break.h
Evolution Refactor (#6556)
2025-04-23 16:01:33 +02: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
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge196
2025-06-19 14:32:23 +02:00
load_save.h
…
lottery_corner.h
…
m4a.h
…
mail.h
…
main_menu.h
…
main.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
malloc.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
map_name_popup.h
…
match_call.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
math_util.h
…
mauville_old_man.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
menu_helpers.h
…
menu_specialized.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
menu.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
metaprogram.h
metaprogram.h without global.h (#6469)
2025-03-28 21:21:58 +01:00
metatile_behavior.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
mini_printf.h
Streamline pointer notation (#2139)
2025-05-16 12:04:44 +01:00
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
Remove non-volatile status EFFECTs (#6772)
2025-05-16 22:52:51 +02:00
multiboot_pokemon_colosseum.h
…
multiboot.h
…
mystery_event_menu.h
…
mystery_event_msg.h
…
mystery_event_script.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
mystery_gift_client.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
mystery_gift_link.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
mystery_gift_menu.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
mystery_gift_server.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
mystery_gift_view.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
mystery_gift.h
…
naming_screen.h
Add caught mon to full party by sending a different mon to the Box (#6058)
2025-02-09 00:54:58 +01:00
new_game.h
…
option_menu.h
…
overworld.h
Master to upcoming merge
2025-05-26 10:41:11 +02:00
palette_util.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
palette.h
Remove non-existent functions from header files (#6825)
2025-05-13 10:52:45 +02:00
party_menu.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +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
Remove compressed palettes (#6455)
2025-04-26 22:58:40 +02:00
pokeblock.h
Remove compressed palettes (#6455)
2025-04-26 22:58:40 +02:00
pokedex_area_region_map.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
pokedex_area_screen.h
Master to upcoming merge
2025-05-26 10:41:11 +02:00
pokedex_cry_screen.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
pokedex_plus_hgss.h
…
pokedex.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
pokemon_animation.h
Revert "Converts a bunch of defines to enums" (#6082)
2025-01-22 21:50:39 +01: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
…
pokemon_storage_system.h
Merge commit 'baf5be20354c9dfde182c0a2dd23ab40643fe57b' into pret-merge
2025-05-15 21:31:54 +02:00
pokemon_summary_screen.h
IV/EV Info on Summary Screen (#6027)
2025-01-20 09:41:31 +01:00
pokemon.h
Master to upcoming merge
2025-05-26 10:41:11 +02:00
pokenav.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
random.h
Store predictingMove, config for chance
2025-05-08 14:19:43 -04:00
rayquaza_scene.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
record_mixing.h
…
recorded_battle.h
Master to upcoming merge
2025-05-26 10:41:11 +02:00
region_map.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
regions.h
Fixed non-regional forms breeding incorrectly (#4985)
2025-02-03 17:03:29 +01:00
reload_save.h
…
reset_rtc_screen.h
…
reshow_battle_screen.h
fix for battle ui for add to party menu (#6229) (#6240)
2025-02-12 22:02:25 +01:00
roamer.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
rotating_gate.h
Fix conflicting types for rotating gate functions (#2087)
2025-01-17 18:19:21 -05:00
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
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
save_location.h
…
save.h
…
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
Fixed typo in requests_effects (#6215)
2025-02-09 16:59:31 -05:00
secret_base.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
shop.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
siirtc.h
Moved time constants to dedicated files (#7019)
2025-05-30 16:39:01 +02:00
slot_machine.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
sound.h
…
sprite.h
Master to upcoming merge
2025-05-26 10:41:11 +02:00
start_menu.h
…
starter_choose.h
…
string_util.h
…
strings.h
Add "Move Item" option in party menu (#6758)
2025-05-04 11:40:31 +02:00
task.h
…
test_runner.h
Made memory integrity checks run betweeen PARAMETRIZE runs (#6462)
2025-03-28 21:43:04 +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
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
title_screen.h
…
trade.h
Move gTradePlatform_Tilemap to header (#2088)
2025-06-22 19:48:37 -04:00
trader.h
…
trainer_card.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
trainer_hill.h
Revert "Converts a bunch of defines to enums" (#6082)
2025-01-22 21:50:39 +01:00
trainer_pokemon_sprites.h
…
trainer_pools.h
Trainer Party Pools (#5731)
2025-01-25 13:28:46 +01:00
trainer_see.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
trainer_slide.h
Fix Powder (status) config and some terrain timers not using gBattleTurnCounter (#6109)
2025-01-26 13:06:11 +01:00
trig.h
…
tv.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
type_icons.h
Adds SHOW_TYPES_SEEN to the B_SHOW_TYPES option (#6561)
2025-04-10 21:43:21 +02:00
union_room_battle.h
…
union_room_chat.h
…
union_room_player_avatar.h
…
union_room.h
…
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
Master to upcoming merge
2025-05-26 10:41:11 +02:00
window.h
Add Time-Based Encounters (#6454)
2025-04-09 09:49:09 +02:00
wonder_news.h
…