Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-02 16:20:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
Files
7774c9727de3ceaef7cec602e18cc549dae13e03
pokeemerald/include
History
Eduardo Quezada 7774c9727d Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230125 
# Conflicts:
#	tools/mapjson/mapjson.cpp
2023-01-25 20:28:55 -03:00
..
config
Merge pull request #2566 from AsparagusEduardo/RHH/pr/feature/breedBalls
2023-01-13 09:35:15 -05:00
constants
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230125
2023-01-25 20:28:55 -03:00
gba
Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize
2023-01-18 11:07:12 -05:00
agb_flash.h
…
AgbRfu_LinkManager.h
…
apprentice.h
Renaming Script Contexts
2022-08-15 15:18:12 -04:00
bard_music.h
Review changes
2022-10-27 11:26:09 -03:00
battle_ai_main.h
AI knows Party mons
2022-08-23 11:58:17 +02:00
battle_ai_switch_items.h
…
battle_ai_util.h
Applied remaining instances of BATTLE_OPPOSITE and BATTLE_PARTNER
2022-09-02 23:57:43 -04:00
battle_anim.h
Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826
2022-08-26 22:23:37 -04:00
battle_arena.h
Add some missing battle arena constants
2022-08-11 12:02:56 -04:00
battle_bg.h
Organized conffig files into their own folder and cleaned up
2022-11-14 11:03:49 -03:00
battle_controllers.h
Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902
2022-09-02 23:24:08 -04:00
battle_debug.h
…
battle_dome.h
…
battle_factory_screen.h
…
battle_factory.h
Add bugfix for Battle Factory trainer IVs
2022-03-30 09:37:03 -04:00
battle_gfx_sfx_util.h
Merge tag 'pretmaster' into BE_pretmerge2
2022-07-15 12:58:46 -04:00
battle_interface.h
Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826
2022-08-26 22:23:37 -04:00
battle_main.h
Moved ABILITY_NAME_LENGTH back to include/constants/global.h to keep in line with upstream pret
2022-08-23 08:25:27 -04:00
battle_message.h
Organized conffig files into their own folder and cleaned up
2022-11-14 11:03:49 -03:00
battle_pike.h
…
battle_pyramid_bag.h
…
battle_pyramid.h
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
battle_records.h
…
battle_script_commands.h
Implemented Protosynthesis' effect
2022-12-06 05:23:29 -03:00
battle_scripts.h
Updated the implementation
2023-01-09 15:18:22 -03:00
battle_setup.h
Merge tag 'pretmaster' into BE_pretmerge2
2022-07-15 12:58:46 -04:00
battle_tent.h
…
battle_tower.h
…
battle_transition_frontier.h
…
battle_transition.h
…
battle_tv.h
…
battle_util2.h
…
battle_util.h
Extra review changes
2023-01-09 14:22:14 -03:00
battle_z_move.h
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
2022-08-22 20:30:45 -04:00
battle.h
Silk Trap Effect (#2512)
2023-01-23 16:42:47 -03:00
berry_blender.h
…
berry_crush.h
…
berry_fix_program.h
…
berry_powder.h
…
berry_tag_screen.h
…
berry.h
…
bike.h
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
braille_puzzles.h
…
cable_club.h
…
clear_save_data_menu.h
…
clock.h
…
coins.h
…
confetti_util.h
…
config.h
Restore GEN_LATEST to GEN_8
2022-12-04 18:16:37 +01:00
contest_ai.h
…
contest_effect.h
…
contest_link.h
…
contest_painting.h
…
contest_util.h
…
contest.h
Revert "Removed Unown hack"
2023-01-07 11:39:56 -03:00
coord_event_weather.h
…
credits.h
…
crt0.h
…
data.h
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
2022-08-22 20:30:45 -04:00
daycare.h
…
debug.h
Organized conffig files into their own folder and cleaned up
2022-11-14 11:03:49 -03:00
decompress.h
Multiple changes
2022-08-25 03:42:41 -04:00
decoration_inventory.h
…
decoration.h
…
dewford_trend.h
…
digit_obj_util.h
Document some generic argument names
2022-05-31 14:34:25 -04:00
diploma.h
…
dodrio_berry_picking.h
…
dynamic_placeholder_text_util.h
…
easy_chat.h
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
2022-08-22 20:30:45 -04:00
egg_hatch.h
…
ereader_helpers.h
Clean up some trainer hill
2022-03-31 12:54:07 -04:00
ereader_screen.h
…
event_data.h
…
event_object_lock.h
…
event_object_movement.h
Use constants for overworld object palette slots
2022-09-27 20:16:48 -04:00
event_scripts.h
Document battle tower TV show
2022-06-14 09:37:39 -04:00
evolution_graphics.h
Document some generic argument names
2022-05-31 14:34:25 -04:00
evolution_scene.h
Struct pointers star standarizing
2022-07-29 11:15:33 -04:00
faraway_island.h
Struct pointers star standarizing
2022-07-29 11:15:33 -04:00
field_camera.h
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
field_control_avatar.h
…
field_door.h
…
field_effect_helpers.h
Struct pointers star standarizing
2022-07-29 11:15:33 -04:00
field_effect.h
Added missing labels in headers
2022-09-12 21:14:15 -03:00
field_message_box.h
…
field_player_avatar.h
Added missing labels in headers
2022-09-12 21:14:15 -03:00
field_poison.h
…
field_screen_effect.h
…
field_special_scene.h
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
field_specials.h
…
field_tasks.h
…
field_weather.h
Merge branch 'master' into thunder
2022-10-18 04:37:56 +00:00
fieldmap.h
Add NUM_TILES_PER_METATILE
2022-12-03 17:29:02 -05:00
fldeff_misc.h
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
fldeff.h
Implemented Honey's Sweet Scent functionality
2022-10-16 20:20:13 -03:00
fonts.h
…
frontier_pass.h
…
frontier_util.h
…
global.berry.h
Documenting padding in structs used by Saveblocks
2022-12-17 22:55:43 -03:00
global.fieldmap.h
Documenting padding in structs used by Saveblocks
2022-12-17 22:55:43 -03:00
global.h
Matching merge from upstream pret
2023-01-20 12:31:54 -03:00
global.tv.h
Documenting padding in structs used by Saveblocks
2022-12-17 22:55:43 -03:00
graphics.h
Matching merge from upstream pret
2023-01-20 12:31:54 -03:00
gym_leader_rematch.h
…
hall_of_fame.h
…
heal_location.h
…
image_processing_effects.h
…
international_string_util.h
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
intro_credits_graphics.h
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
intro.h
Remove duplicated CB2_InitCopyrightScreenAfterBootup
2022-07-29 10:52:36 +02:00
item_icon.h
…
item_menu_icons.h
…
item_menu.h
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
item_use.h
Merge pull request #2391 from AsparagusEduardo/RHH/pr/sugardoodoodoodoodoodooaahhoneyhoney
2022-11-01 20:09:30 -04:00
item.h
Organized conffig files into their own folder and cleaned up
2022-11-14 11:03:49 -03:00
landmark.h
…
libgcnmultiboot.h
…
librfu.h
…
lilycove_lady.h
…
link_rfu.h
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20230103
2023-01-03 15:40:33 -03:00
link.h
Document wonder news
2022-11-22 02:17:03 -05:00
list_menu.h
Add list menu cursor constants
2022-11-09 15:16:46 -05:00
load_save.h
[doc] fix misnamed dma <--> aslr
2022-09-07 14:37:03 +02:00
lottery_corner.h
…
m4a.h
…
mail.h
Revert "Removed Unown hack"
2023-01-07 11:39:56 -03:00
main_menu.h
removed unnecessary script, cheat start now with national dex, reverted accidental type hin removal, changed indentation
2022-09-02 12:10:11 +02:00
main.h
…
map_name_popup.h
…
match_call.h
…
math_util.h
…
mauville_old_man.h
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
menu_helpers.h
Document some generic argument names
2022-05-31 14:34:25 -04:00
menu_specialized.h
Document some generic argument names
2022-05-31 14:34:25 -04:00
menu.h
Added missing labels in headers
2022-09-12 21:14:15 -03:00
metatile_behavior.h
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
mini_printf.h
[debug] add support for mgba printf
2022-09-06 13:40:31 +02:00
minigame_countdown.h
…
mirage_tower.h
…
mon_markings.h
…
money.h
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
move_relearner.h
…
multiboot_pokemon_colosseum.h
…
multiboot.h
…
mystery_event_menu.h
…
mystery_event_msg.h
…
mystery_event_script.h
…
mystery_gift_client.h
…
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
…
overworld.h
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
palette_util.h
…
palette.h
Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize
2023-01-18 11:07:12 -05:00
party_menu.h
Merge branch 'dev' into AI
2022-09-24 11:07:09 -03:00
pc_screen_effect.h
…
play_time.h
…
player_pc.h
…
pokeball.h
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
2022-07-22 22:57:02 -04:00
pokeblock.h
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
pokedex_area_region_map.h
…
pokedex_area_screen.h
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
pokedex_cry_screen.h
Struct pointers star standarizing
2022-07-29 11:15:33 -04:00
pokedex.h
Organized conffig files into their own folder and cleaned up
2022-11-14 11:03:49 -03:00
pokemon_animation.h
…
pokemon_debug.h
…
pokemon_icon.h
Added LoadMonIconPalettePersonality to load gender specific pokemon icon palettes
2022-09-26 12:40:30 +02:00
pokemon_jump.h
…
pokemon_size_record.h
…
pokemon_storage_system.h
Merge branch 'tx_debug_system' of https://github.com/TheXaman/pokeemerald into tx_debug_system_rhh
2022-08-29 19:13:11 +02:00
pokemon_summary_screen.h
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925
2022-10-01 17:32:32 -03:00
pokemon.h
Matching merge from upstream pret
2023-01-20 12:31:54 -03:00
pokenav.h
Cleaned trailing whitespace
2022-09-11 14:14:49 -04:00
random.h
…
rayquaza_scene.h
…
record_mixing.h
…
recorded_battle.h
…
region_map.h
Correct CreateRegionMapPlayerIcon's argument names
2022-06-03 15:04:52 +01:00
reload_save.h
…
reset_rtc_screen.h
…
reshow_battle_screen.h
…
roamer.h
…
rotating_gate.h
…
rotating_tile_puzzle.h
…
roulette.h
…
rtc.h
…
safari_zone.h
…
save_location.h
…
save.h
Sector security -> signature
2022-08-05 10:42:31 -04:00
scanline_effect.h
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
script_menu.h
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
script_movement.h
…
script_pokemon_util.h
…
script.h
Moving documentation comments per request
2022-08-15 16:37:38 -04:00
secret_base.h
Renaming Script Contexts
2022-08-15 15:18:12 -04:00
shop.h
Clean up shop.c
2022-09-22 15:08:17 -04:00
siirtc.h
…
slot_machine.h
…
sound.h
Review changes
2022-07-29 15:38:23 -04:00
start_menu.h
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
starter_choose.h
Colorize and combine birch_bag/birch_grass
2023-01-12 15:22:23 -05:00
strings.h
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/Lures
2022-10-30 12:16:09 -03:00
task.h
…
text_window.h
…
tileset_anims.h
Convert tilesets.s to C
2022-09-27 17:23:26 -04:00
tilesets.h
Convert tilesets.s to C
2022-09-27 17:23:26 -04:00
time_events.h
…
title_screen.h
…
trade.h
Review changes from pokefirered #524
2022-07-29 17:00:07 -04:00
trader.h
…
trainer_card.h
Fix names and constant usage for union room classes
2022-08-23 12:44:07 -04:00
trainer_hill.h
Added a constant for NPC trainer name length (#1712)
2022-07-25 22:59:13 -04:00
trainer_pokemon_sprites.h
…
trainer_see.h
…
trig.h
…
tv.h
…
union_room_battle.h
…
union_room_chat.h
…
union_room_player_avatar.h
…
union_room.h
Cleaned trailing whitespace
2022-09-11 14:14:49 -04:00
util.h
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
walda_phrase.h
…
wallclock.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
wonder_news.h
Document wonder news
2022-11-22 02:17:03 -05:00