Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
pokeemmo/src
History
Bassoonian 24fdac662e Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge196
2025-06-19 14:32:23 +02:00
..
data
Fix typos and some cleanup (mainly in battle files) (#7107)
2025-06-13 14:12:13 +02:00
agb_flash_1m.c
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
agb_flash_le.c
…
agb_flash_mx.c
…
agb_flash.c
Get rid of common syms (#2040)
2024-10-14 23:52:11 -04:00
AgbRfu_LinkManager.c
Fixed brace style inconsistencies
2024-12-05 12:46:50 -03:00
apprentice.c
Merge commit 'b31a73f990fb680629e2a503d72d137bcff0872a' into pret-merge
2025-05-24 21:24:56 +02:00
bard_music.c
Document bard music (#2053)
2025-01-17 17:54:38 +00:00
battle_ai_main.c
Chloroblast fix (#7008)
2025-06-06 21:33:56 +02:00
battle_ai_script_commands.c
Rename ItemId_GetX to GetItemX (#2116)
2025-05-22 13:27:52 +01:00
battle_ai_switch_items.c
Fix typos and some cleanup (mainly in battle files) (#7107)
2025-06-13 14:12:13 +02:00
battle_ai_util.c
Fix incorrect function parameters used in AI damage calc (#7130)
2025-06-16 07:59:30 +02:00
battle_anim_bug.c
Added IsOnPlayerSide
2025-05-12 13:53:15 -04:00
battle_anim_dark.c
Added IsOnPlayerSide
2025-05-12 13:53:15 -04:00
battle_anim_dragon.c
Added IsOnPlayerSide
2025-05-12 13:53:15 -04:00
battle_anim_effects_1.c
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge196
2025-06-19 14:32:23 +02:00
battle_anim_effects_2.c
Fix ScaryFace anim for Bitter Malice (#6476)
2025-06-03 22:25:29 +02:00
battle_anim_effects_3.c
New animations for Mega Evolution, Primal Reversion, Ultra Burst, and Power Construct (#6834)
2025-05-15 09:40:02 +02:00
battle_anim_electric.c
Added IsOnPlayerSide
2025-05-12 13:53:15 -04:00
battle_anim_fight.c
Added IsOnPlayerSide
2025-05-12 13:53:15 -04:00
battle_anim_fire.c
Added IsOnPlayerSide
2025-05-12 13:53:15 -04:00
battle_anim_flying.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
battle_anim_ghost.c
Added IsOnPlayerSide
2025-05-12 13:53:15 -04:00
battle_anim_ground.c
Documented usage of createsprite gDirtPlumeSpriteTemplate (#6954)
2025-05-22 09:27:30 +02:00
battle_anim_ice.c
conflicts
2025-05-16 10:46:32 +02:00
battle_anim_mon_movement.c
conflicts
2025-05-16 10:46:32 +02:00
battle_anim_mons.c
conflicts
2025-05-16 10:46:32 +02:00
battle_anim_new.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
battle_anim_normal.c
Added IsOnPlayerSide
2025-05-12 13:53:15 -04:00
battle_anim_poison.c
Added IsOnPlayerSide
2025-05-12 13:53:15 -04:00
battle_anim_psychic.c
Added IsOnPlayerSide
2025-05-12 13:53:15 -04:00
battle_anim_rock.c
conflicts
2025-05-16 10:46:32 +02:00
battle_anim_smokescreen.c
Remove compressed palettes (#6455)
2025-04-26 22:58:40 +02:00
battle_anim_sound_tasks.c
Merge commit '2044bea883d08ec9266d21ac0cd6a56c3e0d5962' into pret-merge
2025-05-15 21:15:37 +02:00
battle_anim_status_effects.c
conflicts
2025-05-16 10:46:32 +02:00
battle_anim_throw.c
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge196
2025-06-19 14:32:23 +02:00
battle_anim_utility_funcs.c
Added IsOnPlayerSide
2025-05-12 13:53:15 -04:00
battle_anim_water.c
conflicts
2025-05-16 10:46:32 +02:00
battle_anim.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
battle_arena.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
battle_bg.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
battle_controller_link_opponent.c
Battle controller pret documentation (#7029)
2025-06-02 14:22:11 +02:00
battle_controller_link_partner.c
Battle controller pret documentation (#7029)
2025-06-02 14:22:11 +02:00
battle_controller_opponent.c
Battle controller pret documentation (#7029)
2025-06-02 14:22:11 +02:00
battle_controller_player_partner.c
Battle controller pret documentation (#7029)
2025-06-02 14:22:11 +02:00
battle_controller_player.c
Battle controller pret documentation (#7029)
2025-06-02 14:22:11 +02:00
battle_controller_recorded_opponent.c
Battle controller pret documentation (#7029)
2025-06-02 14:22:11 +02:00
battle_controller_recorded_player.c
Battle controller pret documentation (#7029)
2025-06-02 14:22:11 +02:00
battle_controller_safari.c
Battle controller pret documentation (#7029)
2025-06-02 14:22:11 +02:00
battle_controller_wally.c
Battle controller pret documentation (#7029)
2025-06-02 14:22:11 +02:00
battle_controllers.c
Battle controller pret documentation (#7029)
2025-06-02 14:22:11 +02:00
battle_debug.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
battle_dome.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
battle_dynamax.c
Added IsOnPlayerSide
2025-05-12 13:53:15 -04:00
battle_end_turn.c
Bug fix for Grassy Terrain incorrectly healing non-grounded Pokemon (#7058)
2025-06-05 14:35:30 +02:00
battle_factory_screen.c
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
battle_factory.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
battle_gfx_sfx_util.c
Streamline pointer notation (#2139)
2025-05-16 12:04:44 +01:00
battle_gimmick.c
Added IsOnPlayerSide
2025-05-12 13:53:15 -04:00
battle_interface.c
conflicts
2025-05-16 10:46:32 +02:00
battle_intro.c
Merge remote-tracking branch 'pret/master' into new-pret-merge
2025-04-29 20:27:33 +02:00
battle_main.c
Fix typos and some cleanup (mainly in battle files) (#7107)
2025-06-13 14:12:13 +02:00
battle_message.c
Fixes Aura Wheel + Normalize and Hunger Switch while Transformed/Terastallized (#7061)
2025-06-04 21:58:10 +02:00
battle_palace.c
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
battle_pike.c
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
battle_pyramid_bag.c
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge196
2025-06-19 14:32:23 +02:00
battle_pyramid.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
battle_records.c
Merge commit '2044bea883d08ec9266d21ac0cd6a56c3e0d5962' into pret-merge
2025-05-15 21:15:37 +02:00
battle_script_commands.c
Fixes Ally Switch in multi battles (#7109)
2025-06-13 15:18:27 +02:00
battle_setup.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
battle_tent.c
Trainer Battle Parameter Consolidation (#5982)
2025-01-25 22:02:39 +01:00
battle_terastal.c
Remove trailing whitespace (#6968)
2025-05-23 22:33:12 +02:00
battle_tower.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
battle_transition_frontier.c
remove some unused data (#4239)
2024-03-04 17:36:23 +01:00
battle_transition.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
battle_tv.c
Remove non-volatile status EFFECTs (#6772)
2025-05-16 22:52:51 +02:00
battle_util2.c
conflicts
2025-05-16 10:46:32 +02:00
battle_util.c
Fix typos and some cleanup (mainly in battle files) (#7107)
2025-06-13 14:12:13 +02:00
battle_z_move.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
berry_blender.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
berry_crush.c
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
berry_fix_graphics.c
Solved a bunch of -Wall errors on modern
2023-09-20 19:01:08 -03:00
berry_fix_program.c
Streamline pointer notation (#2139)
2025-05-16 12:04:44 +01:00
berry_powder.c
Solved a bunch of -Wall errors on modern
2023-09-20 19:01:08 -03:00
berry_tag_screen.c
Remove compressed palettes (#6455)
2025-04-26 22:58:40 +02:00
berry.c
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge196
2025-06-19 14:32:23 +02:00
bg.c
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
bike.c
Revert "Converts a bunch of defines to enums" (#6082)
2025-01-22 21:50:39 +01:00
birch_pc.c
Merge branch '_RHH/master' into _RHH/upcoming
2024-01-11 19:51:11 -03:00
blit.c
remove gflib
2024-09-18 10:37:34 -04:00
braille_puzzles.c
Merge commit 'e4e90ea' into pret-merge
2025-05-27 18:53:30 +02:00
braille.c
Sync text ctrl codes with pokefirered
2022-11-23 21:13:00 -05:00
cable_car.c
Merge branch 'followers' into followers-expanded-id
2025-02-10 00:24:50 -05:00
cable_club.c
Trainer Battle Parameter Consolidation (#5982)
2025-01-25 22:02:39 +01:00
caps.c
Add clarification for underlying math in EV caps (#6580)
2025-04-12 12:55:31 -04:00
clear_save_data_screen.c
Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize
2023-01-18 11:07:12 -05:00
clock.c
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-17 19:33:48 -03:00
coins.c
…
confetti_util.c
…
contest_ai.c
Merge commit 'baf5be20354c9dfde182c0a2dd23ab40643fe57b' into pret-merge
2025-05-15 21:31:54 +02:00
contest_effect.c
Encapsulate move data (#5852)
2025-01-01 20:34:33 +01:00
contest_link_util.c
…
contest_link.c
Remove gDecompressionBuffer (#6029)
2025-01-23 09:47:14 +01:00
contest_painting.c
Fix Contest Painting load palette error (#7077)
2025-06-07 10:05:24 +02:00
contest_util.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
contest.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
coord_event_weather.c
…
credits.c
Remove gDecompressionBuffer (#6029)
2025-01-23 09:47:14 +01:00
crt0.s
Initialize m4a and IRQ handler in a loaded section (#5912)
2025-01-02 15:11:32 +01:00
data.c
Add the header required for TPP tags to work (#6162)
2025-02-01 22:58:26 +01:00
datetime.c
Remove trailing whitespace (#6968)
2025-05-23 22:33:12 +02:00
daycare.c
Merge commit 'b31a73f990fb680629e2a503d72d137bcff0872a' into pret-merge
2025-05-24 21:24:56 +02:00
debug.c
Fix UB when using time menu (#7023)
2025-05-30 20:00:25 +02:00
decompress.c
Remove compressed palettes (#6455)
2025-04-26 22:58:40 +02:00
decoration_inventory.c
…
decoration.c
Remove compressed palettes (#6455)
2025-04-26 22:58:40 +02:00
dewford_trend.c
Misc missing constant use
2023-08-10 01:42:18 -04:00
dexnav.c
Remove trailing whitespace (#6968)
2025-05-23 22:33:12 +02:00
difficulty.c
Arbitrary trainer scripts + map script/trigger softlock prevention (#5033)
2025-01-08 10:27:00 +00:00
digit_obj_util.c
Free some IWRAM (#6000)
2025-01-11 13:30:11 +01:00
diploma.c
Add some missing palette macro use
2023-05-25 15:09:16 -04:00
dma3_manager.c
Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015
2024-10-15 20:56:56 -03:00
dodrio_berry_picking.c
Streamline pointer notation (#2139)
2025-05-16 12:04:44 +01:00
dynamic_placeholder_text_util.c
…
easy_chat.c
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-19 10:32:57 -03:00
egg_hatch.c
Remove compressed palettes (#6455)
2025-04-26 22:58:40 +02:00
ereader_helpers.c
Cleanup identical if blocks (#6988)
2025-05-27 10:12:12 +02:00
ereader_screen.c
Remove gDecompressionBuffer (#6029)
2025-01-23 09:47:14 +01:00
event_data.c
Refactor testing flags and vars to not conflict with user ones (#6301)
2025-02-22 15:32:39 +01:00
event_object_lock.c
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
event_object_movement.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
evolution_graphics.c
Fixed brace style inconsistencies
2024-12-05 12:46:50 -03:00
evolution_scene.c
Remove trailing whitespace (#6968)
2025-05-23 22:33:12 +02:00
expansion_intro.c
Remove compressed palettes (#6455)
2025-04-26 22:58:40 +02:00
fake_rtc.c
Time menu for RTC in debug menu. (#6634)
2025-04-23 19:34:37 +02:00
faraway_island.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
field_camera.c
Ewram and unused function cleanup sweep (#6019)
2025-01-15 14:07:12 +01:00
field_control_avatar.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
field_door.c
Merge commit 'e4e90ea' into pret-merge
2025-05-27 18:53:30 +02:00
field_effect_helpers.c
Remove trailing whitespace (#6968)
2025-05-23 22:33:12 +02:00
field_effect.c
Follower NPCs (follow-me) (#6500)
2025-04-27 14:56:18 +02:00
field_message_box.c
Fix Extra task->tState++ and break in Task_DrawFieldMessageBox (#6261)
2025-02-14 10:11:37 +01:00
field_player_avatar.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
field_poison.c
Merge remote-tracking branch 'upstream/master' into followers
2025-02-10 00:11:38 -05:00
field_region_map.c
Fly from Pokenav (#5679)
2025-01-05 00:24:58 +01:00
field_screen_effect.c
Clear saved follower NPC door warp when doing dive warp (#7065)
2025-06-07 09:54:07 +02:00
field_special_scene.c
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
field_specials.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
field_tasks.c
Solved a bunch of -Wall errors on modern
2023-09-20 19:01:08 -03:00
field_weather_effect.c
Merge remote-tracking branch 'upstream/master' into followers
2025-02-10 00:11:38 -05:00
field_weather.c
Review comments
2025-04-12 08:58:23 +02:00
fieldmap.c
Remove compressed palettes (#6455)
2025-04-26 22:58:40 +02:00
fldeff_cut.c
Field effect for cutting grass is missing setfieldeffectargument. Issue #5766 (#5952)
2025-01-05 16:45:21 +01:00
fldeff_defog.c
Add OW_DEFOG_FIELD_MOVE to allow players to clear overworld Fog (#6477)
2025-04-08 16:21:32 +02:00
fldeff_dig.c
fix: Dig in Sealed Chamber no longer freezes follower. Fixed #5482 rhh
2024-10-12 12:23:18 -04:00
fldeff_escalator.c
Solved a bunch of -Wall errors on modern
2023-09-20 19:01:08 -03:00
fldeff_flash.c
Revert "Converts a bunch of defines to enums" (#6082)
2025-01-22 21:50:39 +01:00
fldeff_misc.c
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
2024-01-17 18:11:35 -03:00
fldeff_rocksmash.c
Revert "Converts a bunch of defines to enums" (#6082)
2025-01-22 21:50:39 +01:00
fldeff_softboiled.c
…
fldeff_strength.c
…
fldeff_sweetscent.c
Remove gDecompressionBuffer (#6029)
2025-01-23 09:47:14 +01:00
fldeff_teleport.c
Follower NPCs (follow-me) (#6500)
2025-04-27 14:56:18 +02:00
follower_helper.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
follower_npc.c
Bug fix: clear follower npc surf blob on white out (#7153)
2025-06-18 22:50:55 +02:00
fonts.c
Type Effectiveness Indicators when selecting moves (#6559)
2025-04-12 01:03:45 +02:00
frontier_pass.c
Merge pull request #2023 from Bassoonian/updatemapmacros
2024-09-19 12:17:16 -04:00
frontier_util.c
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
generational_changes.c
Setting Battle configs during tests (#5803)
2024-12-29 23:28:39 +01:00
gpu_regs.c
remove gflib
2024-09-18 10:37:34 -04:00
graphics.c
Merge branch 'master' into master-upcoming-2025-04-30
2025-04-30 15:22:37 +02:00
gym_leader_rematch.c
Fix FREE_MATCH_CALL
2024-02-02 14:13:16 +01:00
hall_of_fame.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
heal_location.c
Merge commit '07c897a' into pret-merge
2025-05-27 19:46:13 +02:00
hof_pc.c
…
image_processing_effects.c
Get rid of common syms (#2040)
2024-10-14 23:52:11 -04:00
international_string_util.c
Merge remote-tracking branch '_pret/master' into _RHH/pr/master/pret_sync20240324
2024-03-24 13:52:18 -03:00
intro_credits_graphics.c
Solved a bunch of -Wall errors on modern
2023-09-20 19:01:08 -03:00
intro.c
Remove compressed palettes (#6455)
2025-04-26 22:58:40 +02:00
io_reg.c
Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015
2024-10-15 20:56:56 -03:00
item_ball.c
Item Ball refactor / Pluralize item names for giveitem and finditem (#3942)
2024-01-14 21:35:45 +01:00
item_icon.c
Fix the Move Item option in the PC still expecting compressed palettes (#6739)
2025-05-02 21:43:24 +02:00
item_menu_icons.c
Remove compressed palettes (#6455)
2025-04-26 22:58:40 +02:00
item_menu.c
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge196
2025-06-19 14:32:23 +02:00
item_use.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
item.c
Fix sell price display (#7123)
2025-06-15 11:52:51 +02:00
landmark.c
Fixed bottom half of Mt. Pyre not being labeled in PokeNav
2024-08-01 13:34:17 -04:00
libgcnmultiboot.s
…
libisagbprn.c
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
librfu_intr.c
Correct C23 Checks (#2144)
2025-05-19 15:43:06 +01:00
librfu_rfu.c
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-17 00:16:01 -03:00
librfu_sio32id.c
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220
2024-12-20 16:04:33 -03:00
librfu_stwi.c
Get rid of common syms (#2040)
2024-10-14 23:52:11 -04:00
lilycove_lady.c
Merge commit 'b31a73f990fb680629e2a503d72d137bcff0872a' into pret-merge
2025-05-24 21:24:56 +02:00
line_break.c
Evolution Refactor (#6556)
2025-04-23 16:01:33 +02:00
link_rfu_2.c
Fixed brace style inconsistencies
2024-12-05 12:46:50 -03:00
link_rfu_3.c
Merge branch 'pret_master' into RHH/pr/upcoming/pret_Merge20231002
2023-10-02 17:17:41 -03:00
link.c
Remove gDecompressionBuffer (#6029)
2025-01-23 09:47:14 +01:00
list_menu.c
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge196
2025-06-19 14:32:23 +02:00
load_save.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
lottery_corner.c
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220
2024-12-20 16:04:33 -03:00
m4a_1.s
Initialize m4a and IRQ handler in a loaded section (#5912)
2025-01-02 15:11:32 +01:00
m4a_tables.c
Streamline pointer notation (#2139)
2025-05-16 12:04:44 +01:00
m4a.c
Merge commit 'bd0a02c45630d6b3666b079593e787de263d0a17' into pret-merge
2025-05-24 20:42:01 +02:00
mail_data.c
Solved a bunch of -Wall errors on modern
2023-09-20 19:01:08 -03:00
mail.c
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230602
2023-06-02 11:45:28 -04:00
main_menu.c
Merge commit 'e1e7d1cf3530799774fa13d4e409bed7067ffa25' into pret-merge
2025-05-24 19:35:01 +02:00
main.c
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
malloc.c
Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015
2024-10-15 20:56:56 -03:00
map_name_popup.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
match_call.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
math_util.c
…
mauville_old_man.c
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
menu_helpers.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
menu_specialized.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
menu.c
Remove gDecompressionBuffer (#6029)
2025-01-23 09:47:14 +01:00
metatile_behavior.c
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
mini_printf.c
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
minigame_countdown.c
Solved a bunch of -Wall errors on modern
2023-09-20 19:01:08 -03:00
mirage_tower.c
Merge commit 'e4e90ea' into pret-merge
2025-05-27 18:53:30 +02:00
mon_markings.c
…
money.c
Remove compressed palettes (#6455)
2025-04-26 22:58:40 +02:00
move_relearner.c
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge196
2025-06-19 14:32:23 +02:00
move.c
Encapsulate move data (#5852)
2025-01-01 20:34:33 +01:00
multiboot.c
…
mystery_event_menu.c
Remove gDecompressionBuffer (#6029)
2025-01-23 09:47:14 +01:00
mystery_event_msg.c
…
mystery_event_script.c
Clean up code
2024-02-02 13:13:27 +01:00
mystery_gift_client.c
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
mystery_gift_link.c
Streamline pointer notation (#2139)
2025-05-16 12:04:44 +01:00
mystery_gift_menu.c
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
mystery_gift_scripts.c
Document wonder news
2022-11-22 02:17:03 -05:00
mystery_gift_server.c
Streamline pointer notation (#2139)
2025-05-16 12:04:44 +01:00
mystery_gift_view.c
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
mystery_gift.c
Fix small error with making new FREE_MYSTERY_GIFT
2024-02-02 16:34:03 +01:00
naming_screen.c
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.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
option_menu.c
Revert "Guillotine: Decapitalize everything (#3949)" (#4525)
2024-05-13 19:19:37 +02:00
overworld.c
Bug fix: clear follower npc surf blob on white out (#7153)
2025-06-18 22:50:55 +02:00
palette_util.c
Review comments
2025-04-11 11:37:36 +02:00
palette.c
Use RGB values for DEFAULT_LIGHT_COLOR (#7133)
2025-06-16 13:38:07 +02:00
party_menu.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
play_time.c
Implemented Alcremie Evolution Method (#6530)
2025-04-08 19:50:21 +02:00
player_pc.c
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge196
2025-06-19 14:32:23 +02:00
pokeball.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
pokeblock_feed.c
Merge branch 'master' into master-upcoming-2025-04-30
2025-04-30 15:22:37 +02:00
pokeblock.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
pokedex_area_region_map.c
Streamline pointer notation (#2139)
2025-05-16 12:04:44 +01:00
pokedex_area_screen.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
pokedex_cry_screen.c
Get rid of common syms (#2040)
2024-10-14 23:52:11 -04:00
pokedex_plus_hgss.c
Fixed text width for a lot of forms in HGSS Dex (#7035)
2025-05-31 20:28:24 +02:00
pokedex.c
Streamline pointer notation (#2139)
2025-05-16 12:04:44 +01:00
pokemon_animation.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
pokemon_icon.c
Added config to disable gender differences (#5595)
2024-10-29 15:38:26 +01:00
pokemon_jump.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
pokemon_size_record.c
Merge branch '_RHH/master' into _RHH/upcoming
2024-02-16 11:30:01 -03:00
pokemon_sprite_visualizer.c
Merge branch 'master' into master-upcoming-2025-04-30
2025-04-30 15:22:37 +02:00
pokemon_storage_system.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
pokemon_summary_screen.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
pokemon.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
pokenav_conditions_gfx.c
Created PokeNav COMPOUND_STRINGS (#4983)
2024-08-16 22:41:26 +02:00
pokenav_conditions_search_results.c
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
pokenav_conditions.c
Remove compressed palettes (#6455)
2025-04-26 22:58:40 +02:00
pokenav_list.c
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
pokenav_main_menu.c
Remove gDecompressionBuffer (#6029)
2025-01-23 09:47:14 +01:00
pokenav_match_call_data.c
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-17 00:16:01 -03:00
pokenav_match_call_gfx.c
Remove compressed palettes (#6455)
2025-04-26 22:58:40 +02:00
pokenav_match_call_list.c
Revert "Converts a bunch of defines to enums" (#6082)
2025-01-22 21:50:39 +01:00
pokenav_menu_handler_gfx.c
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
pokenav_menu_handler.c
Add PokéNav too
2023-12-12 23:20:22 +01:00
pokenav_region_map.c
Fly from Pokenav (#5679)
2025-01-05 00:24:58 +01:00
pokenav_ribbons_list.c
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
pokenav_ribbons_summary.c
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-17 00:16:01 -03:00
pokenav.c
…
post_battle_event_funcs.c
…
random.c
Merge remote-tracking branch 'upstream/master' into followers
2025-02-10 00:11:38 -05:00
rayquaza_scene.c
Remove compressed palettes (#6455)
2025-04-26 22:58:40 +02:00
record_mixing.c
Don't use SeedRng some places where it isn't necessary (#6156)
2025-02-03 20:03:13 +01:00
recorded_battle.c
conflicts
2025-05-16 10:46:32 +02:00
region_map.c
Merge commit 'e4e90ea' into pret-merge
2025-05-27 18:53:30 +02:00
reload_save.c
Allocate initialized sections for EWRAM and IWRAM (#3892)
2024-01-02 14:24:52 +00:00
reset_rtc_screen.c
FakeRtc datetime and ResetRtcScreen day increments (#5695)
2025-04-12 13:17:58 -07:00
reshow_battle_screen.c
Added IsOnPlayerSide
2025-05-12 13:53:15 -04:00
roamer.c
Merge commit 'e4e90ea' into pret-merge
2025-05-27 18:53:30 +02:00
rom_header_gf.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
rom_header_rhh.c
Rename gItems and gAbilities to gItemsInfo and gAbilitiesInfo (#4068)
2024-01-26 15:25:52 -03:00
rom_header.s
…
rotating_gate.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
rotating_tile_puzzle.c
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
roulette.c
Remove gDecompressionBuffer (#6029)
2025-01-23 09:47:14 +01:00
rtc.c
Remove trailing whitespace (#6968)
2025-05-23 22:33:12 +02:00
safari_zone.c
…
save_failed_screen.c
Remove gDecompressionBuffer (#6029)
2025-01-23 09:47:14 +01:00
save_location.c
Clean up pokemon/ball/dex mentions in comments
2023-12-12 19:02:36 +01:00
save.c
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
2025-05-24 20:38:21 +02:00
scanline_effect.c
Ewram and unused function cleanup sweep (#6019)
2025-01-15 14:07:12 +01:00
scrcmd.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
script_menu.c
Remove trailing whitespace (master) (#5174)
2024-08-14 19:48:20 -07:00
script_movement.c
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
script_pokemon_util.c
helper function to get the species type based on personality
2025-03-31 14:49:40 +02:00
script.c
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
secret_base.c
Merge commit 'e4e90ea' into pret-merge
2025-05-27 18:53:30 +02:00
shop.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
siirtc.c
Mark RTC/Flash save hint string as used
2025-03-30 14:14:40 -05:00
slot_machine.c
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220
2024-12-20 16:04:33 -03:00
sound.c
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
sprays.c
Merge commit 'b31a73f990fb680629e2a503d72d137bcff0872a' into pret-merge
2025-05-24 21:24:56 +02:00
sprite.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
start_menu.c
Replaced hardcoded numbers in DexNav with variables (#6241)
2025-02-12 09:44:45 -03:00
starter_choose.c
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
string_util.c
Update battle messages to Gen 5+ standards (#3240)
2024-10-21 14:52:45 -03:00
strings.c
Add "Move Item" option in party menu (#6758)
2025-05-04 11:40:31 +02:00
task.c
Get rid of common syms (#2040)
2024-10-14 23:52:11 -04:00
test_runner_stub.c
Separate build directory for tests and TESTING define (#3002)
2023-05-31 09:38:37 -04:00
text_input_strings.c
…
text_window.c
some more Dexnav -> DexNav
2025-01-02 10:13:06 -05:00
text.c
Added FONT_SHORT_NARROWER (#5101)
2024-12-04 06:30:19 -08:00
tileset_anims.c
Add some missing palette macro use
2023-05-25 15:09:16 -04:00
tilesets.c
…
time_events.c
Optional high-quality RNG (#3780)
2023-12-22 17:39:15 +00:00
title_screen.c
Clean up pokemon/ball/dex mentions in comments
2023-12-12 19:02:36 +01:00
trade.c
Remove compressed palettes (#6455)
2025-04-26 22:58:40 +02:00
trader.c
Streamline pointer notation (#2139)
2025-05-16 12:04:44 +01:00
trainer_card.c
Allow users to increase MAX_MONEY (#4943)
2024-07-13 11:16:34 +02:00
trainer_hill.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
trainer_pokemon_sprites.c
Remove compressed palettes (#6455)
2025-04-26 22:58:40 +02:00
trainer_pools.c
Changed two LocalRandom calls to new LocalRandom32 (#6173)
2025-02-03 23:32:29 +01:00
trainer_see.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
trainer_slide.c
Added IsOnPlayerSide
2025-05-12 13:53:15 -04:00
trig.c
…
tv.c
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
type_icons.c
Rename GetPartyBattlerData to GetBattlerMon (#6800)
2025-05-09 15:14:09 +02:00
union_room_battle.c
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
union_room_chat.c
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
union_room_player_avatar.c
Merge commit '16357c7' into pret-merge
2025-05-24 19:22:31 +02:00
union_room.c
Merge commit 'e4e90ea' into pret-merge
2025-05-27 18:53:30 +02:00
use_pokeblock.c
Consolidate natures (#4562)
2024-05-19 10:14:31 +02:00
util.c
More review addressing
2025-01-17 18:47:38 -03:00
vs_seeker.c
Trainer Battle Parameter Consolidation (#5982)
2025-01-25 22:02:39 +01:00
walda_phrase.c
…
wallclock.c
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows
2023-02-01 14:59:45 -05:00
wild_encounter.c
Merge branch 'master' into master-to-upcoming
2025-05-28 14:26:15 +02:00
window.c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
wireless_communication_status_screen.c
Streamline pointer notation (#2139)
2025-05-16 12:04:44 +01:00
wonder_news.c
Restored improvements from upstream
2023-01-20 12:34:15 -03:00