Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-16 07:01:44 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
Files
c27930eabfcfdeba4a276916cd496d2d7377366c
pokeemerald/include
History
Hedara c27930eabf Merge commit '678fdf9' into pret-merge 
Conflicts:
	data/maps/BirthIsland_Exterior/scripts.inc
	data/maps/DesertUnderpass/scripts.inc
	data/maps/Route117/scripts.inc
	data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
	data/maps/SootopolisCity/scripts.inc
	include/constants/event_objects.h
	src/battle_setup.c
	src/event_object_movement.c
	src/field_control_avatar.c
	src/item_use.c
	src/scrcmd.c
	tools/mapjson/mapjson.cpp
2025-05-27 19:22:40 +02:00
..
config
Fix Iron Ball type effectiveness check (#6794)
2025-05-09 22:23:44 +02:00
constants
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
gba
Merge commit 'bd0a02c45630d6b3666b079593e787de263d0a17' into pret-merge
2025-05-24 20:42:01 +02:00
test
Changed Tackle for Scratch in tests (#6730)
2025-04-30 17:18:52 -04: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
Add function to adjust AI scoring for generalized item effects (#6247)
2025-02-13 12:51:25 -05: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
Switch chance config support (#6187)
2025-02-10 00:30:54 +01:00
battle_ai_util.h
Fixes AI repeated use of weather set up moves (#6963)
2025-05-22 16:50:13 -04:00
battle_anim_scripts.h
Move battle anim arrays to C (#5306)
2024-09-04 11:21:40 +02:00
battle_anim.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
battle_arena.h
…
battle_bg.h
…
battle_controllers.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
battle_debug.h
…
battle_dome.h
…
battle_dynamax.h
Convert max effects to normal move effects (#6143)
2025-02-06 21:02:39 -03:00
battle_factory_screen.h
…
battle_factory.h
…
battle_gfx_sfx_util.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
battle_gimmick.h
Gimmick Indicator refactor (#6553)
2025-04-10 23:56:26 +02:00
battle_interface.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
battle_main.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
battle_message.h
Fixes Toxic Spikes Absorbed message (#6448)
2025-03-19 13:46:23 +01: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
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
battle_scripts.h
Reverts wrongly done gem fix and renames struggle effect (#6806)
2025-05-15 10:45:48 +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
Revert "Converts a bunch of defines to enums" (#6082)
2025-01-22 21:50:39 +01: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
Replace: moveId -> move, moveIdx -> moveIndex (#2134)
2025-05-09 16:33:23 +01:00
battle_util2.h
…
battle_util.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
battle_z_move.h
…
battle.h
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02: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
remove gflib
2024-09-18 10:37:34 -04:00
braille_puzzles.h
…
cable_club.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
caps.h
Merge level_caps and ev_caps into one caps file (#5429)
2024-09-27 23:40:49 +02:00
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
Merge branch 'followers' into followers-expanded-id
2025-02-10 00:24:50 -05:00
daycare.h
Merge branch 'master' into master-to-upcoming
2025-02-06 13:05:02 +01:00
debug.h
…
decompress.h
Remove gDecompressionBuffer (#6029)
2025-01-23 09:47:14 +01: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
fix search level
2025-03-15 00:20:01 +01: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
Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015
2024-10-15 20:56:56 -03:00
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
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
event_scripts.h
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-11 08:07:15 -03: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
…
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
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +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
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
field_effect.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
field_message_box.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
field_player_avatar.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
field_poison.h
…
field_screen_effect.h
Cleaned up and reordered functions
2024-08-27 20:56:09 -07: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
Ewram and unused function cleanup sweep (#6019)
2025-01-15 14:07:12 +01:00
fieldmap.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
fldeff_misc.h
…
fldeff.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
follower_helper.h
…
fonts.h
Added FONT_SHORT_NARROWER (#5101)
2024-12-04 06:30:19 -08:00
fpmath.h
Fix fixed point damage calculation off-by-1s (#5775)
2024-12-05 11:35:56 +00:00
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
A lot of tests (#6734)
2025-05-07 16:50:12 +02:00
global.berry.h
…
global.fieldmap.h
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge10apr
2025-04-10 23:57:57 +02:00
global.h
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
global.tv.h
…
gpu_regs.h
remove gflib
2024-09-18 10:37:34 -04:00
graphics.h
Merge remote-tracking branch 'pret/master' into new-pret-merge
2025-04-29 20:27:33 +02:00
gym_leader_rematch.h
Fix trainer match call flags
2024-08-15 23:00:20 +02:00
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
remove gflib
2024-09-18 10:37:34 -04:00
item_ball.h
…
item_icon.h
…
item_menu_icons.h
Remove gDecompressionBuffer (#6029)
2025-01-23 09:47:14 +01: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
Merge commit 'b31a73f990fb680629e2a503d72d137bcff0872a' into pret-merge
2025-05-24 21:24:56 +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
Automatic Line Breaks, somewhat even lines (#5689)
2024-11-29 18:46:45 +01: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 commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
load_save.h
…
lottery_corner.h
…
m4a.h
…
mail.h
Clean up defines lacking spaces
2024-08-15 19:34:56 +02:00
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
Added missing gMovesInfo encapsulation (#6656)
2025-04-20 22:36:27 +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
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
palette_util.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
palette.h
…
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
Decouple Poke Ball ids from item ids (#5560)
2024-10-28 18:03:15 +01:00
pokeblock.h
…
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
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01: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
Add in-battle shadows underneath all enemy battlers (#5178)
2024-09-10 21:27:49 +02:00
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
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
pokenav.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
random.h
Adds RNG tags and tests for Moody and Starf Berry (#6718)
2025-05-01 10:16:15 +02: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
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +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
…
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
…
slot_machine.h
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01:00
sound.h
Tests: detect task leaks (#5528)
2024-10-22 10:19:00 +02:00
sprite.h
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
start_menu.h
…
starter_choose.h
…
string_util.h
Update battle messages to Gen 5+ standards (#3240)
2024-10-21 14:52:45 -03:00
strings.h
Add caught mon to full party by sending a different mon to the Box (#6058)
2025-02-09 00:54:58 +01: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
some cleanup
2024-10-18 22:13:49 -04:00
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
Update header files to match source files (#2143)
2025-05-19 09:18:04 +01: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
Add B_SHOW_TYPES and cleaned up IsDoubleBattle (#5131)
2024-08-11 17:55:51 +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
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
window.h
Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015
2024-10-15 20:56:56 -03:00
wonder_news.h
…