Eduardo Quezada
7ddebb6671
Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214
...
# Conflicts:
# data/battle_ai_scripts.s
# src/menu_specialized.c
# src/mystery_gift_menu.c
2023-02-15 14:18:00 -03:00
GriffinR
77c3163cf0
Use window constants in reset_rtc_screen
2022-09-29 18:29:20 -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
2e1bf0d965
OamData mosaic FALSE
2022-07-29 21:27:39 -04:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
GriffinR
50d3003a0d
Text clean-up, TEXT_SPEED_FF to TEXT_SKIP_DRAW
2021-11-03 19:54:20 -04:00
GriffinR
9a0618afc3
Add COPYWIN constants
2021-11-03 15:29:18 -04:00
GriffinR
fdaf436960
Add font id constants
2021-10-30 19:54:15 -04:00
GriffinR
42d2fefe02
Merge branch 'master' into tag-none
2021-09-24 10:17:34 -04:00
GriffinR
f8f7617946
Add TAG_NONE
2021-09-14 13:14:14 -04: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
ultima-soul
02c9e040df
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-08-11 16:33:10 -07:00
PikalaxALT
810ca5f8ff
Flatten pos fields in struct Sprite
2021-07-07 09:11:52 -04:00
ultima-soul
5bab9474dc
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-03-22 23:08:19 -07:00
GriffinR
1912b0cf0a
Merge branch 'master' into doc-rtcscreen
2021-02-28 10:28:43 -05:00
GriffinR
f09278393e
Document reset_rtc_screen
2021-02-24 14:29:33 -05:00
GriffinR
b71b10623b
Add palette selection constants
2021-02-24 11:03:51 -05:00
DizzyEggg
97d0643110
Merge with master
2020-09-08 12:48:28 +02:00
PokeCodec
28ef2fb774
Switch to button macros
2020-09-04 21:11:55 -04:00
DizzyEggg
f70a9ce153
Merge with master
2020-08-27 12:01:28 +02:00
GriffinR
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
DizzyEggg
4c3f40a361
Merge with master
2020-07-11 12:59:23 +02:00
GriffinR
18d57a3802
Document some overworld and field effects
2020-06-23 15:48:53 -04:00
Sierraffinity
74edaed426
Begin item_menu.c cleanup
2020-06-10 13:07:42 -07:00
DizzyEggg
108f6b711f
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2
2020-02-23 10:58:26 +01:00
GriffinR
084bd66924
Document Trainer Card
2020-02-08 14:31:17 -06:00
DizzyEggg
d8aab3d112
Merge with master
2020-01-18 18:17:25 +01:00
GriffinR
58e64b9524
Clean up some of save.c
2020-01-12 18:42:41 -06:00
DizzyEggg
ac499bc896
Merge with master
2019-12-09 08:16:18 +01:00
GriffinR
c40879aa36
Use ST_OAM constants for OamData definitions
2019-12-06 19:05:44 -06:00
DizzyEggg
dcb5d16cb3
Merge with master
2019-11-29 21:47:31 +01:00
GriffinR
63ee15fc28
Document Frontier Util
2019-11-25 18:37:48 -06:00
DizzyEggg
bae5d2038f
Update with master
2019-10-10 16:18:48 +02:00
GriffinR
5325835ee7
Use STR_CONV constants
2019-09-30 15:43:44 -04:00
DizzyEggg
c219776034
Merge with master
2019-08-04 23:09:28 +02:00
PikalaxALT
fb06e4a3c9
Modernize code
...
Can compile with arm-none-eabi-gcc 8.3.0
gbafix correctly handles ELF input
2019-06-26 12:12:10 -04:00
DizzyEggg
2646f3b26a
Merge with master
2019-04-13 13:42:44 +02:00
Phlosioneer
1360b3a477
RGB Constants
2019-04-04 17:05:46 -04:00
DizzyEggg
54ab6b43dc
Merge with master
2019-03-22 10:40:31 +01: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
DizzyEggg
fddb5159b4
Merge with master
2019-03-05 21:46:45 +01:00
Phlosioneer
44e92ce259
Give window drawing functions better names
2019-02-22 01:40:11 -05:00
DizzyEggg
0800a44f7a
Merge branch 'master' into battle_engine_v2
2018-09-16 09:22:05 +02:00
DizzyEggg
2f59df03ab
Standartize AddTextPrinterParametrized functions,
2018-09-08 23:38:30 +02:00
DizzyEggg
81b29ae7c1
Merge with pokeemerald
2018-07-16 22:45:06 +02:00
Diegoisawesome
731d6d59bc
Document list_menu.c and main_menu.c
2018-07-15 04:30:37 -07:00
DizzyEggg
626b80106e
Basic Battle Debug Menu is done
2018-07-13 23:00:56 +02:00
Diegoisawesome
772fd47564
Merge branch 'master' of https://github.com/pret/pokeemerald into menu
2018-02-07 18:06:59 -06:00
DizzyEggg
9b4b19fd5a
rtc screen review changes
2018-02-07 19:59:02 +01:00
DizzyEggg
27452ca822
decompile rtc reset screen
2018-02-02 19:00:01 +01:00
