Eduardo Quezada
b62e5aa72e
Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214
...
# Conflicts:
# src/battle_main.c
# src/field_specials.c
# src/trade.c
2023-02-15 14:11:03 -03:00
GriffinR
7681340966
Merge branch 'master' of https://github.com/pret/pokeemerald into sync-trade
2023-01-23 14:45:51 -05:00
Eduardo Quezada
e0802f13a2
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20230103
...
# Conflicts:
# include/link_rfu.h
2023-01-03 15:40:33 -03:00
Eduardo Quezada
66d1c9bc65
Documenting padding in structs used by Saveblocks
2022-12-17 22:55:43 -03:00
GriffinR
347a02ace1
Sync trade
2022-12-15 15:40:59 -05:00
Eduardo Quezada
1d7e8bd730
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909
...
# Conflicts:
# asm/macros/battle_ai_script.inc
# asm/macros/battle_script.inc
# data/battle_ai_scripts.s
# include/link_rfu.h
# src/pokemon.c
# src/pokemon_summary_screen.c
# src/sound.c
2022-09-13 16:22:42 -03:00
Eduardo Quezada
65108c3192
Cleaned trailing whitespace
2022-09-11 14:14:49 -04:00
Eduardo Quezada
afcc1178b2
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
...
# Conflicts:
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# include/battle_controllers.h
# include/battle_script_commands.h
# include/battle_util.h
# include/constants/battle_script_commands.h
# include/constants/global.h
# include/decompress.h
# src/battle_anim_effects_1.c
# src/battle_anim_normal.c
# src/battle_anim_poison.c
# src/battle_anim_water.c
# src/battle_arena.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/berry.c
# src/data/trainers.h
# src/decompress.c
# src/field_effect.c
# src/hall_of_fame.c
# src/overworld.c
# src/pokeball.c
# src/pokemon.c
# src/pokemon_icon.c
# src/pokemon_storage_system.c
# src/scrcmd.c
2022-08-22 20:30:45 -04:00
Eduardo Quezada
40805fffc0
Space cleanup
2022-07-29 21:28:39 -04:00
ultima-soul
4f2e3bf214
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-17 21:23:54 -08:00
GriffinR
3a7995bc7c
Fix misleading RecordMixTrainerNames name
2021-10-11 10:39:37 -04:00
GriffinR
7c5c41f23c
Combine link slot length constants
2021-10-07 16:19:02 -04:00
GriffinR
e86d3410a1
Update argument names in link headers, link_rfu doc cleanup
2021-10-07 16:05:12 -04:00
GriffinR
846942ce48
Finish remaining symbols in link_rfu_2
2021-10-07 15:23:47 -04:00
GriffinR
6aaf50ee27
Rename GF Gname, Rfu, finish bulk of Union Room, more link doc
2021-10-07 10:43:03 -04:00
GriffinR
4efa6c882a
Continue misc link documentation, rename reset_save_heap
2021-10-05 23:37:54 -04:00
GriffinR
e01ae55c13
Start more link_rfu_2 documentation
2021-08-15 15:13:42 -04:00
ultima-soul
be7acc919a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-04-03 21:53:29 -07:00
GriffinR
b9c733495b
Document dodrio berry picking
2021-03-03 14:26:05 -05:00
Eduardo Quezada
92728a1875
Added Ultimasoul's Forms from his FromID system.
2020-10-23 11:44:47 -03:00
GriffinR
22c1bf965a
Finish documenting berry blender
2020-08-24 17:06:55 -04:00
GriffinR
4911849723
Document link contest connection
2020-08-13 16:27:40 -04:00
GriffinR
2859900ea9
Second pass on documenting union room
2020-06-10 17:30:59 -04:00
GriffinR
35867f531b
Some link rfu cleanup / link.c documentation
2020-06-08 15:24:25 -04:00
GriffinR
c98342c973
Document link_rfu_3.c
2020-06-08 00:28:21 -04:00
GriffinR
e6f5c4f264
Sync link_rfu_2.c
2020-06-07 12:54:50 -04:00
GriffinR
4fe507e453
Document union_room.c
2020-05-31 13:11:18 -04:00
PikalaxALT
867734a791
Fix alignment in AgbRfu_LinkManager.h
2020-02-16 15:32:10 -05:00
PikalaxALT
91dd7f5cc3
Port librfu from firered
2020-02-16 13:49:36 -05:00
jiangzhengwenjz
8a5f292618
document symbols
2020-01-16 08:14:27 -06:00
GriffinR
2c062dc764
More trade documentation
2019-10-09 05:56:44 -04:00
GriffinR
66a68159b1
Continue trade doc
2019-10-05 10:41:37 -04:00
DizzyEggg
02cadbee60
MORE DODRIO BERRY PICKINGgit status!
2019-08-01 19:01:50 +02:00
PikalaxALT
e92e9a184c
Support for non-dkA toolchains
2019-06-28 22:26:11 -04:00
PikalaxALT
a58d9a16dd
Merge branch 'master' into dodrio_berry_picking
2019-04-05 08:41:31 -04:00
PikalaxALT
4fadbaf161
Minor fixes
...
gotoram --> returnram
cmdCF/execram --> gotoram
fix indentation in sym_ewram.txt
fix mevent_client.h guard name
2019-04-03 17:04:42 -05:00
PikalaxALT
ade0183378
Document mystery_gift
2019-03-31 18:59:52 -04:00
PikalaxALT
ccac4694cd
Merge branch 'master' into continue_union_room
2019-03-30 12:41:10 -04:00
Marcus Huderle
aebc676913
Decompile union_room_chat.c up to sub_801F5B8
2019-03-27 19:09:12 -05:00
PikalaxALT
9a8b001ebf
through sub_801704C
2019-03-27 10:44:49 -04:00
Marcus Huderle
af1baa89f1
Start decompiling union_room_chat.c
2019-03-26 21:58:20 -05:00
scnorton
e3a11bc3ca
through sub_80259FC
2019-03-25 15:26:23 -04:00
Phlosioneer
eca329f9c5
Merge branch 'master' into multiplayer-stuff
2019-02-21 21:22:10 -05:00
Phlosioneer
986d3d8b2f
Finish and polish new_game.c
...
Only one function is left undocumented. I tried to go into the assembly
to at least name it, but it clears fields in the save block that aren't
even documented yet.
2019-02-15 03:40:57 -05:00
Phlosioneer
f2f1b1978b
Done documenting link code in overworld.c
2019-02-10 03:54:50 -05:00
Marcus Huderle
abebd2b864
Cleanup externs in overworld.c
2019-02-08 11:48:51 -06:00
Marcus Huderle
95db853a78
Decompile more of contest_link_80F57C4.c
2019-01-04 20:03:29 -06:00
Diegoisawesome
d8948a5cda
Merge remote-tracking branch 'pret/master' into trade
2018-12-25 15:03:13 -06:00
Diegoisawesome
cd994f4935
Begin trade.c
2018-12-18 19:29:41 -06:00
golem galvanize
2265d49ac2
decompiled up to sub_81B5A8C
2018-12-12 22:55:39 -05:00
