Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-10-27 19:46:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
Files
9c5ec33aa717f6fc80f2937bcfa4fa0ddea6f483
pokeemerald/src
History
ultima-soul 9c5ec33aa7 Sync Crown Tundra and renamed moves Battle Engine defines.
2021-01-12 14:22:33 -08:00
..
data
Sync Crown Tundra and renamed moves Battle Engine defines.
2021-01-12 14:22:33 -08:00
agb_flash_1m.c
…
agb_flash_le.c
…
agb_flash_mx.c
…
agb_flash.c
Undo PokeCodec's PRs
2020-09-13 06:30:55 -03:00
AgbRfu_LinkManager.c
re-remove extra semicolons (from #1104)
2020-10-19 05:58:51 -04:00
apprentice.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
bard_music.c
…
battle_ai_script_commands.c
Merge pull request #1265 from Kurausukun/berry_crush
2020-12-14 23:22:41 -05:00
battle_ai_switch_items.c
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
battle_anim_bug.c
address comments
2020-11-02 18:43:11 -05:00
battle_anim_dark.c
address comments
2020-11-02 18:43:11 -05:00
battle_anim_dragon.c
…
battle_anim_effects_1.c
Undo PokeCodec's PRs
2020-09-13 06:30:55 -03:00
battle_anim_effects_2.c
…
battle_anim_effects_3.c
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
battle_anim_electric.c
…
battle_anim_fight.c
…
battle_anim_fire.c
…
battle_anim_flying.c
address comments
2020-11-02 18:43:11 -05:00
battle_anim_ghost.c
…
battle_anim_ground.c
…
battle_anim_ice.c
…
battle_anim_mon_movement.c
…
battle_anim_mons.c
Merge branch 'pokemon_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-pokemon-expansion
2020-10-04 02:35:23 -05:00
battle_anim_normal.c
…
battle_anim_poison.c
…
battle_anim_psychic.c
address comments
2020-11-02 18:43:11 -05:00
battle_anim_rock.c
…
battle_anim_smokescreen.c
…
battle_anim_sound_tasks.c
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
battle_anim_status_effects.c
…
battle_anim_throw.c
Minor battle_anim_throw cleanup
2020-08-30 15:11:44 -04:00
battle_anim_utility_funcs.c
address comments
2020-11-02 18:43:11 -05:00
battle_anim_water.c
re-match battle_anim_water functions (from #1136)
2020-10-21 04:41:57 -04:00
battle_anim.c
…
battle_arena.c
Sync Crown Tundra and renamed moves Battle Engine defines.
2021-01-12 14:22:33 -08:00
battle_bg.c
Undo PokeCodec's PRs
2020-09-13 06:30:55 -03:00
battle_controller_link_opponent.c
Merge with master
2020-09-08 12:01:20 +02:00
battle_controller_link_partner.c
Merge with master
2020-09-08 12:01:20 +02:00
battle_controller_opponent.c
Merge with master
2020-09-08 12:01:20 +02:00
battle_controller_player_partner.c
Merge with master
2020-09-08 12:01:20 +02:00
battle_controller_player.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
battle_controller_recorded_opponent.c
Merge with master
2020-09-08 12:01:20 +02:00
battle_controller_recorded_player.c
Merge with master
2020-09-08 12:01:20 +02:00
battle_controller_safari.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
battle_controller_wally.c
Merge with master
2020-09-08 12:01:20 +02:00
battle_controllers.c
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
battle_dome.c
Sync Crown Tundra and renamed moves Battle Engine defines.
2021-01-12 14:22:33 -08:00
battle_factory_screen.c
Use BUGFIX for some inline fixes
2020-12-12 23:30:51 -05:00
battle_factory.c
Document gUnknown_03006298
2020-10-11 09:54:49 +02:00
battle_gfx_sfx_util.c
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
battle_interface.c
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
battle_intro.c
battle_gfx_sfx_util.c: Very annoying fakematch fix.
2020-09-19 17:12:25 -04:00
battle_main.c
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-01 14:14:51 -08:00
battle_message.c
Sync Crown Tundra and renamed moves Battle Engine defines.
2021-01-12 14:22:33 -08:00
battle_palace.c
…
battle_pike.c
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
battle_pyramid_bag.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
battle_pyramid.c
Use BUGFIX for some inline fixes
2020-12-12 23:30:51 -05:00
battle_records.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
battle_script_commands.c
Merge pull request #1265 from Kurausukun/berry_crush
2020-12-14 23:22:41 -05:00
battle_setup.c
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
battle_tent.c
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
battle_tower.c
Label remaining subs in battle_tower.c
2020-12-24 16:18:47 -05:00
battle_transition_frontier.c
…
battle_transition.c
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
battle_tv.c
Merge branch 'master' into reverts
2020-10-26 12:16:36 -03:00
battle_util2.c
…
battle_util.c
Use BUGFIX for some inline fixes
2020-12-12 23:30:51 -05:00
berry_blender.c
Use BUGFIX for some inline fixes
2020-12-12 23:30:51 -05:00
berry_crush.c
change "filler" to "unk", remove newline
2020-12-22 00:08:15 -05:00
berry_fix_graphics.c
…
berry_fix_program.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
berry_powder.c
…
berry_tag_screen.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
berry.c
Undo PokeCodec's PRs
2020-09-13 06:30:55 -03:00
bike.c
…
birch_pc.c
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
braille_puzzles.c
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
cable_car.c
Fix segment typo
2020-09-03 16:17:29 -04:00
cable_club.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
clear_save_data_screen.c
…
clock.c
…
coins.c
…
confetti_util.c
Undo PokeCodec's PRs
2020-09-13 06:30:55 -03:00
contest_ai.c
Use BUGFIX for some inline fixes
2020-12-12 23:30:51 -05:00
contest_effect.c
…
contest_link_util.c
…
contest_link.c
…
contest_painting.c
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
contest_util.c
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
contest.c
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
coord_event_weather.c
…
credits.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
crt0.s
swi --> svc
2020-11-06 12:34:57 -05:00
data.c
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-01 14:14:51 -08:00
daycare.c
Merge pull request #1265 from Kurausukun/berry_crush
2020-12-14 23:22:41 -05:00
decompress.c
Female Eevee backsprite.
2020-11-06 16:45:25 -03:00
decoration_inventory.c
…
decoration.c
Merge pull request #1189 from aaaaaa123456789/reverts
2020-11-03 09:28:45 -05:00
dewford_trend.c
port TrendyPhraseIdOld fakematch fix
2020-10-26 00:29:55 -04:00
digit_obj_util.c
Update src/digit_obj_util.c
2020-10-26 19:14:08 -03:00
diploma.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
dodrio_berry_picking.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
dynamic_placeholder_text_util.c
…
easy_chat.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
egg_hatch.c
battle_gfx_sfx_util.c: Very annoying fakematch fix.
2020-09-19 17:12:25 -04:00
ereader_helpers.c
Sync Crown Tundra and renamed moves Battle Engine defines.
2021-01-12 14:22:33 -08:00
ereader_screen.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
event_data.c
…
event_object_lock.c
…
event_object_movement.c
Add UBFIX for null deref in CameraObjectReset2
2020-12-26 17:25:51 -08:00
evolution_graphics.c
…
evolution_scene.c
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
faraway_island.c
Undo PokeCodec's PRs
2020-09-13 06:30:55 -03:00
field_camera.c
…
field_control_avatar.c
…
field_door.c
…
field_effect_helpers.c
Name object event pals/tags
2020-11-23 14:24:48 -05:00
field_effect.c
Use BUGFIX for some inline fixes
2020-12-12 23:30:51 -05:00
field_message_box.c
…
field_player_avatar.c
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
field_poison.c
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
field_region_map.c
…
field_screen_effect.c
…
field_special_scene.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
field_specials.c
Move object event pal declarations to graphics
2020-11-23 14:45:16 -05:00
field_tasks.c
Fixed Pacifidlog typo.
2020-09-05 01:11:07 -04:00
field_weather_effect.c
…
field_weather.c
…
fieldmap.c
Add UBFIX for null derefs in sub_8088950
2020-12-26 17:39:52 -08:00
fldeff_cut.c
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
fldeff_dig.c
…
fldeff_escalator.c
…
fldeff_flash.c
…
fldeff_misc.c
…
fldeff_rocksmash.c
…
fldeff_softboiled.c
…
fldeff_strength.c
…
fldeff_sweetscent.c
…
fldeff_teleport.c
…
frontier_pass.c
Use BUGFIX for some inline fixes
2020-12-12 23:30:51 -05:00
frontier_util.c
Sync Crown Tundra and renamed moves Battle Engine defines.
2021-01-12 14:22:33 -08:00
graphics.c
Merge with master
2020-09-08 12:01:20 +02:00
gym_leader_rematch.c
…
hall_of_fame.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
heal_location.c
…
hof_pc.c
…
image_processing_effects.c
…
international_string_util.c
…
intro_credits_graphics.c
address comments
2020-11-02 18:43:11 -05:00
intro.c
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
item_icon.c
…
item_menu_icons.c
…
item_menu.c
Merge pull request #1189 from aaaaaa123456789/reverts
2020-11-03 09:28:45 -05:00
item_use.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
item.c
re-match CheckBagHasSpace (from #1179)
2020-10-25 23:19:56 -04:00
landmark.c
…
libgcnmultiboot.s
…
libisagbprn.c
…
librfu_intr.c
…
librfu_rfu.c
…
librfu_sio32id.c
…
librfu_stwi.c
…
lilycove_lady.c
…
link_rfu_2.c
Merge branch 'master' into reverts
2020-10-26 12:16:36 -03:00
link_rfu_3.c
remove naked asm (oops)
2020-10-22 05:04:35 -04:00
link.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
list_menu.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
load_save.c
…
lottery_corner.c
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
m4a_1.s
use better m4a variable/constant names
2020-12-11 16:33:55 +01:00
m4a_tables.c
Undo PokeCodec's PRs
2020-09-13 06:30:55 -03:00
m4a.c
remove trailing spaces
2020-12-12 13:19:08 +01:00
mail_data.c
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
mail.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
main_menu.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
main.c
Simplify RAM reset adaptation for modern
2020-11-06 12:29:40 -05:00
map_name_popup.c
Give proper names to underwater maps
2020-09-01 03:03:14 -04:00
match_call.c
Use BUGFIX for some inline fixes
2020-12-12 23:30:51 -05:00
math_util.c
…
mauville_old_man.c
…
menu_helpers.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
menu_specialized.c
fix indentation
2020-12-14 21:44:25 -05:00
menu.c
whitespace
2020-11-26 01:35:08 -05:00
metatile_behavior.c
Use BUGFIX for some inline fixes
2020-12-12 23:30:51 -05:00
mevent2.c
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
mevent_801BAAC.c
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
mevent_client.c
…
mevent_news.c
…
mevent_scripts.c
…
mevent_server_helpers.c
…
mevent_server.c
…
minigame_countdown.c
…
mirage_tower.c
re-match sub_81BF2B8 (from $1177)
2020-10-23 21:51:46 -04:00
mon_markings.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
money.c
…
move_relearner.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
multiboot.c
rewrite MultiBootWaitCycles as naked function
2020-10-02 12:27:16 +02:00
mystery_event_menu.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
mystery_event_msg.c
…
mystery_event_script.c
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
mystery_gift.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
naming_screen.c
…
new_game.c
…
option_menu.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
overworld.c
use direction constant
2020-12-14 21:54:19 -05:00
palette_util.c
…
palette.c
…
party_menu.c
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-01 14:14:51 -08:00
play_time.c
…
player_pc.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
pokeball.c
Change how mon affine transform fix is handled
2020-12-30 17:36:53 -08:00
pokeblock_feed.c
battle_gfx_sfx_util.c: Very annoying fakematch fix.
2020-09-19 17:12:25 -04:00
pokeblock.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
pokedex_area_region_map.c
…
pokedex_area_screen.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
pokedex_cry_screen.c
…
pokedex.c
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-01 14:14:51 -08:00
pokemon_animation.c
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-01 14:14:51 -08:00
pokemon_icon.c
Add Gen 8 Pokemon data.
2020-12-16 12:57:36 -08:00
pokemon_jump.c
Merge remote-tracking branch 'pret/master' into PE-pretSync
2020-11-07 15:00:10 -03:00
pokemon_size_record.c
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
pokemon_storage_system.c
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-01 14:14:51 -08:00
pokemon_summary_screen.c
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-01 14:14:51 -08:00
pokemon.c
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-01 14:14:51 -08:00
pokenav_conditions_1.c
Solve merge conflicts from previous commit
2020-11-02 22:18:26 -03:00
pokenav_conditions_2.c
align pokenav task funcs and update some pokenav menu bg gfx files
2020-10-11 08:50:58 -06:00
pokenav_conditions_3.c
Solve merge conflicts from previous commit
2020-11-02 22:18:26 -03:00
pokenav_main_menu.c
Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts
2020-11-02 18:43:40 -05:00
pokenav_match_call_1.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
pokenav_match_call_2.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
pokenav_match_call_data.c
Convert to -g; will be required for eliminating fakematches.
2020-09-16 19:36:30 -04:00
pokenav_match_call_ui.c
start pokenav documentation
2020-10-10 16:17:34 -06:00
pokenav_menu_handler_1.c
Solve merge conflicts from previous commit
2020-11-02 22:18:26 -03:00
pokenav_menu_handler_2.c
renamed pokenav graphics file fixes
2020-10-11 09:11:12 -06:00
pokenav_region_map.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
pokenav_ribbons_1.c
Port back improvements from later commits
2020-10-26 12:31:07 -03:00
pokenav_ribbons_2.c
Port back improvements from later commits
2020-10-26 12:31:07 -03:00
pokenav.c
Merge branch 'master' into reverts
2020-10-26 12:16:36 -03:00
post_battle_event_funcs.c
…
random.c
…
rayquaza_scene.c
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
record_mixing.c
Merge branch 'master' into reverts
2020-10-26 12:16:36 -03:00
recorded_battle.c
Label remaining subs in battle_tower.c
2020-12-24 16:18:47 -05:00
region_map.c
Use BUGFIX for some inline fixes
2020-12-12 23:30:51 -05:00
reset_rtc_screen.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
reset_save_heap.c
…
reshow_battle_screen.c
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
roamer.c
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
rotating_gate.c
…
rotating_tile_puzzle.c
…
roulette.c
Use BUGFIX for some inline fixes
2020-12-12 23:30:51 -05:00
rtc.c
…
safari_zone.c
…
save_failed_screen.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
save_location.c
…
save.c
port fix for UpdateSaveAddresses (from #1177)
2020-10-23 22:12:09 -04:00
scanline_effect.c
Changed casts to volatile
2020-09-18 13:26:36 -04:00
scrcmd.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
script_menu.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
script_movement.c
…
script_pokemon_util.c
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
script.c
Undo PokeCodec's PRs
2020-09-13 06:30:55 -03:00
secret_base.c
Merge branch 'master' into reverts
2020-10-26 12:16:36 -03:00
shop.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
siirtc.c
…
slot_machine.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
sound.c
Merge with master
2020-09-08 12:01:20 +02:00
start_menu.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
starter_choose.c
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
strings.c
…
task.c
…
text_input_strings.c
…
text_window.c
…
tileset_anims.c
…
time_events.c
…
title_screen.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
trade.c
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-01 14:14:51 -08:00
trader.c
…
trainer_card.c
Support for gender difference mon icons.
2020-11-06 17:48:03 -03:00
trainer_hill.c
Port back improvements from later commits
2020-10-26 12:31:07 -03:00
trainer_pokemon_sprites.c
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
trainer_see.c
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
trig.c
…
tv.c
add spaces around - and remove comment from include in battle.h
2020-11-06 23:29:52 +03:30
union_room_battle.c
…
union_room_chat.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
union_room_player_avatar.c
…
union_room.c
Use BUGFIX for some inline fixes
2020-12-12 23:30:51 -05:00
unk_text_util_2.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
use_pokeblock.c
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
util.c
…
walda_phrase.c
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
wallclock.c
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
wild_encounter.c
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
wireless_communication_status_screen.c
Undo PokeCodec's PRs
2020-09-13 06:30:55 -03:00