Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-05 09:41:06 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
Files
7c86bd5d08faff04f018906814dcb85e6f4030ca
pokeemerald/include
History
Eduardo Quezada 7c86bd5d08 Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826 
# Conflicts:
#	include/battle_interface.h
#	src/battle_anim_effects_1.c
#	src/battle_script_commands.c
#	src/field_specials.c
2022-08-26 22:23:37 -04:00
..
constants
Merge pull request #2173 from LOuroboros/yourAffection
2022-08-26 14:54:32 -04:00
gba
void pointer standarized
2022-07-29 10:52:35 -04:00
agb_flash.h
…
AgbRfu_LinkManager.h
…
apprentice.h
Renaming Script Contexts
2022-08-15 15:18:12 -04:00
bard_music.h
…
battle_ai_main.h
move ai score calc to STATE_TURN_START_RECORD so AI can consider move selection for item use
2022-06-05 11:09:04 -04:00
battle_ai_switch_items.h
revert ai item usage code
2021-11-28 13:12:56 -05:00
battle_ai_util.h
merge w be
2022-07-17 12:40: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
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge
2022-04-03 13:26:27 -03:00
battle_controllers.h
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
2022-08-22 20:30:45 -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
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
2022-08-22 20:30:45 -04:00
battle_pike.h
…
battle_pyramid_bag.h
Start misc battle documentation
2021-10-08 16:39:46 -04:00
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
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
2022-08-22 20:30:45 -04:00
battle_scripts.h
Merge pull request #2173 from LOuroboros/yourAffection
2022-08-26 14:54:32 -04: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
Drop battle transition 'phase' terminology
2021-10-25 10:20:48 -04:00
battle_transition.h
Continue battle_transition documenting
2021-10-29 11:24:36 -04:00
battle_tv.h
…
battle_util2.h
Document some single-remaining symbols
2021-09-24 17:14:20 -04:00
battle_util.h
Merge pull request #2173 from LOuroboros/yourAffection
2022-08-26 14:54:32 -04:00
battle_z_move.h
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
2022-08-22 20:30:45 -04:00
battle.h
Merge pull request #2173 from LOuroboros/yourAffection
2022-08-26 14:54:32 -04: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
Enable BUGFIX by default
2022-08-25 22:35:33 -04:00
contest_ai.h
…
contest_effect.h
…
contest_link.h
…
contest_painting.h
…
contest_util.h
…
contest.h
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
2022-08-22 20:30:45 -04:00
coord_event_weather.h
…
credits.h
…
crt0.h
Update modern linker script
2021-11-04 17:28:41 -04:00
data.h
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
2022-08-22 20:30:45 -04:00
daycare.h
Document record mixing mail swap
2021-10-24 15:49:19 -04: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
Document some mystery gift
2021-10-14 15:10:41 -04:00
event_data.h
General mystery gift documentation, finish mystery gift client/server/scripts
2021-10-16 23:35:17 -04:00
event_object_lock.h
…
event_object_movement.h
Clean up lock/unlock anim movement
2022-08-12 21:18:10 -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
Remove dead sub references
2021-11-17 15:47:47 -05:00
field_door.h
…
field_effect_helpers.h
Struct pointers star standarizing
2022-07-29 11:15:33 -04:00
field_effect.h
Struct pointers star standarizing
2022-07-29 11:15:33 -04:00
field_message_box.h
…
field_player_avatar.h
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
field_poison.h
…
field_screen_effect.h
Finish updating macro comments
2021-11-18 01:47:58 -05:00
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
More updating event macro comments
2021-11-16 17:46:34 -05:00
fieldmap.h
MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes
2022-08-03 14:21:13 -04:00
fldeff_misc.h
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
fldeff.h
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
fonts.h
Convert fonts.s to C
2021-10-31 01:44:18 -04:00
frontier_pass.h
…
frontier_util.h
…
global.berry.h
…
global.fieldmap.h
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
global.h
Moved branch defs to config.h, now only for compat
2022-08-24 16:10:32 -04:00
global.tv.h
Added a constant for NPC trainer name length (#1712)
2022-07-25 22:59:13 -04:00
graphics.h
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
2022-08-22 20:30:45 -04:00
gym_leader_rematch.h
Start misc battle documentation
2021-10-08 16:39:46 -04:00
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 remote-tracking branch 'RHH/item_expansion' into RHH_masterMerge
2022-07-22 23:38:52 -04:00
item.h
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
landmark.h
…
libgcnmultiboot.h
…
librfu.h
…
lilycove_lady.h
…
link_rfu.h
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
2022-08-22 20:30:45 -04:00
link.h
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
list_menu.h
Document some generic argument names
2022-05-31 14:34:25 -04:00
load_save.h
Merge branch 'master' into fix_saveblock_reorder
2021-11-13 23:19:57 -05:00
lottery_corner.h
…
m4a.h
…
mail.h
Documented boolean uses
2022-07-25 14:59:14 -04:00
main_menu.h
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
main.h
Label remaining symbols in graphics.c
2021-10-27 13:47:18 -04:00
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
Struct pointers star standarizing
2022-07-29 11:15:33 -04: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
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
Correct usage of MysteryEvent to MysteryGift
2021-10-17 03:00:48 -04:00
mystery_event_script.h
Finish updating macro comments
2021-11-18 01:47:58 -05:00
mystery_gift_client.h
Correct usage of MysteryEvent to MysteryGift
2021-10-17 03:00:48 -04:00
mystery_gift_link.h
Correct usage of MysteryEvent to MysteryGift
2021-10-17 03:00:48 -04:00
mystery_gift_menu.h
Correct usage of MysteryEvent to MysteryGift
2021-10-17 03:00:48 -04:00
mystery_gift_server.h
Correct usage of MysteryEvent to MysteryGift
2021-10-17 03:00:48 -04:00
mystery_gift_view.h
Correct usage of MysteryEvent to MysteryGift
2021-10-17 03:00:48 -04:00
mystery_gift.h
Correct usage of MysteryEvent to MysteryGift
2021-10-17 03:00:48 -04:00
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
Document files with a few remaining symbols
2021-11-02 18:06:06 -04:00
palette.h
Label unknown palette functions
2021-11-08 16:08:36 -05:00
party_menu.h
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
2022-08-22 20:30:45 -04: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
Document some single-remaining symbols
2021-09-24 17:14:20 -04:00
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
added footprints
2021-12-13 19:24:19 +01:00
pokemon_animation.h
…
pokemon_debug.h
added option to view changes for front/back sprite picCoords and elevation live
2021-12-13 22:31:37 +01:00
pokemon_icon.h
Multiple changes
2022-08-25 03:42:41 -04:00
pokemon_jump.h
…
pokemon_size_record.h
…
pokemon_storage_system.h
Document some generic argument names
2022-05-31 14:34:25 -04:00
pokemon_summary_screen.h
Placeholder moves can't be used in battle.
2022-08-24 00:30:49 -04:00
pokemon.h
Multiple changes
2022-08-25 03:42:41 -04:00
pokenav.h
Corrected additional inconsistent uses of whitespace
2022-08-15 17:04:34 -04:00
random.h
…
rayquaza_scene.h
…
record_mixing.h
Document record mixing mail swap
2021-10-24 15:49:19 -04:00
recorded_battle.h
Clean up recorded_battle, add MOVE_IS_PERMANENT
2021-10-12 01:14:17 -04:00
region_map.h
Correct CreateRegionMapPlayerIcon's argument names
2022-06-03 15:04:52 +01:00
reload_save.h
Continue misc link documentation, rename reset_save_heap
2021-10-05 23:37:54 -04:00
reset_rtc_screen.h
Fixed struct names
2021-12-28 14:48:57 -03:00
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
…
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
…
strings.h
Merge pull request #2142 from AgustinGDLV/exp_candy
2022-08-25 23:03:24 -04:00
task.h
…
text_window.h
Document files with a few remaining symbols
2021-11-02 18:06:06 -04:00
tileset_anims.h
…
tilesets.h
…
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
Document some generic argument names
2022-05-31 14:34:25 -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
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-17 21:23:54 -08:00
trainer_see.h
…
trig.h
…
tv.h
Label slot machine ids, fix GetPriceReduction
2021-11-16 15:43:52 -05:00
union_room_battle.h
…
union_room_chat.h
…
union_room_player_avatar.h
Update argument names in link headers, link_rfu doc cleanup
2021-10-07 16:05:12 -04:00
union_room.h
Document some mystery gift
2021-10-14 15:10:41 -04:00
util.h
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
walda_phrase.h
Document walda_phrase
2021-09-26 17:01:39 -04:00
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
Correct usage of MysteryEvent to MysteryGift
2021-10-17 03:00:48 -04:00