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
a72d4c4168
Cleanup from syncing pss and mon markings
2022-07-30 12:43:14 -04:00
Eduardo Quezada
2e1bf0d965
OamData mosaic FALSE
2022-07-29 21:27:39 -04:00
Eduardo Quezada
13672680b0
void pointer standarized
2022-07-29 10:52:35 -04:00
Eduardo Quezada
f3bebcd12c
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
...
# Conflicts:
# include/battle_anim.h
# include/global.h
# include/pokemon.h
# src/battle_message.c
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
2022-07-22 22:57:02 -04:00
GriffinR
5e6d8a77e4
Document some generic argument names
2022-05-31 14:34:25 -04:00
LOuroboros
fa39dc76dc
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
GriffinR
694aa3c65d
Move balls, shop, link, map popups, and bag out of interface
2022-01-11 13:53:23 -05:00
ultima-soul
26f29a04fd
Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync"
...
This reverts commit ac2bcece75349262ebc3
2021-12-10 09:41:54 -08:00
ultima-soul
ac2bcece75
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync
2021-12-09 14:16:05 -08:00
ultima-soul
d408b56549
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-12-01 20:18:57 -08:00
LOuroboros
2e67153982
Renamed the Enigma Berries' constants
2021-12-01 22:16:38 -03:00
ultima-soul
a8f9a54787
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-11-21 10:41:32 -08:00
GriffinR
04cc923d6c
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
GriffinR
be7d0bd3b0
Merge branch 'master' into doc-menu
2021-11-04 12:11:31 -04:00
GriffinR
c291fa8e7f
Propagate BG_COORD constants
2021-11-03 23:02:06 -04:00
GriffinR
afb9ff3a40
Document files with a few remaining symbols
2021-11-02 18:06:06 -04:00
ultima-soul
5cb73a012c
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp
2021-08-30 11:57:27 -07:00
LOuroboros
554210c5e3
Removed trailing spaces in the most relevant files
...
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g'
Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
GriffinR
8f5e2bbeba
Label swap line margin flag
2021-08-21 11:04:28 -04:00
GriffinR
80348e7188
Merge branch 'master' into doc-itemmenu2
2021-08-11 19:01:47 -04:00
GriffinR
28a8fe191a
Document item menu
2021-08-10 22:13:02 -04:00
GriffinR
bd5cf07059
Merge branch 'master' into doc-playerpc
2021-08-02 14:08:10 -04:00
GriffinR
06b909bcd8
Document player pc
2021-08-02 13:58:40 -04:00
PikalaxALT
810ca5f8ff
Flatten pos fields in struct Sprite
2021-07-07 09:11:52 -04:00
ultima-soul
53e900a643
Rearranged rest of item ids except for Key Items.
2021-07-02 22:43:50 -07:00
GriffinR
8c820878bf
Document Battle Pyramid Bag
2021-04-23 15:07:36 -04:00
GriffinR
c786a9b20c
Document pokeblock menu
2021-04-11 18:10:05 -04:00
Kurausukun
102582a3df
Merge branch 'master' of https://github.com/pret/pokeemerald into fr_doc
2021-03-29 18:36:18 -04:00
GriffinR
557152b06e
Minor link cleanup
2021-03-21 13:40:40 -05:00
Kurausukun
5b910a11b4
port miscellaneous fr documentation
2021-03-18 20:35:39 -04:00
aaaaaa123456789
bacc831aa9
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
aaaaaa123456789
7dc95a0103
Undo PokeCodec's PRs
...
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.
Reverts #1104 , #1108 , #1115 , #1118 , #1119 , #1124 , #1126 , #1127 , #1132 , #1136 ,
#1137 , #1139 , #1140 , #1144 , #1148 , #1149 , #1150 , #1153 , #1155 , #1177 , #1179 ,
#1180 , #1181 , #1182 and #1183 .
2020-09-13 06:30:55 -03:00
PokeCodec
7efdcaf120
Removed excess parenthesis
2020-09-04 21:16:55 -04:00
PokeCodec
28ef2fb774
Switch to button macros
2020-09-04 21:11:55 -04:00
Sierraffinity
74edaed426
Begin item_menu.c cleanup
2020-06-10 13:07:42 -07:00
GriffinR
c40879aa36
Use ST_OAM constants for OamData definitions
2019-12-06 19:05:44 -06:00
GriffinR
6db014cc32
Document party_menu first pass
2019-10-25 15:41:06 -04:00
PikalaxALT
b839c21307
Fix/suppress warnings when building with gcc-8
2019-06-26 16:42:57 -04:00
Marcus Huderle
fe12f2f4b3
Document and cleanup some decoration code
2019-04-06 12:49:09 -05:00
Phlosioneer
9848f84b9e
Use constants for Oam .shape and .size fields
...
Also some general formatting fixes for constants.
2019-03-16 12:37:04 -05:00
Phlosioneer
5886f82ef5
Merge branch 'master' into extern-cleanup
2019-03-08 02:45:26 -05:00
Phlosioneer
9372731c3e
Merge branch 'master' into main-menu-state-machine
2019-03-02 17:35:44 -05:00
Phlosioneer
ee69426838
Eliminate more externs
2019-03-02 02:44:02 -05:00
Phlosioneer
44e92ce259
Give window drawing functions better names
2019-02-22 01:40:11 -05:00
Phlosioneer
f2f1b1978b
Done documenting link code in overworld.c
2019-02-10 03:54:50 -05:00
Diegoisawesome
439fa13e94
Start porting/decompiling roulette
2018-12-31 16:09:45 -06:00
DizzyEggg
9ffd0c7382
3.5 asm left
2018-12-17 23:00:08 +01:00
Diegoisawesome
18839a4872
Merge remote-tracking branch 'pret/master' into script_menu
2018-11-06 20:20:56 -06:00
Diegoisawesome
6d38431c33
Begin cleaning text.c
2018-11-06 10:44:48 -06:00
