Eduardo Quezada
749225ace1
Matching merge from upstream pret
...
# Conflicts:
# graphics/interface/menu_info.png
# include/pokemon.h
# src/battle_ai_switch_items.c
# src/battle_anim_mons.c
# src/battle_anim_water.c
# src/battle_controller_opponent.c
# src/battle_gfx_sfx_util.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/data/pokemon/species_info.h
# src/pokemon.c
# src/pokemon_summary_screen.c
2023-01-20 12:31:54 -03:00
GriffinR
0cc10a1ada
Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize
2023-01-18 11:07:12 -05:00
Eduardo Quezada
68b474c0f0
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007
...
# Conflicts:
# include/constants/items.h
# src/battle_interface.c
2022-10-07 14:52:32 -03:00
GriffinR
e515e52abb
Add DISPLAY_TILE_* constants
2022-09-26 19:52:17 -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
Martin Griffin
d57442a511
Decimal paletteNums
2022-08-19 17:05:22 +01:00
Martin Griffin
6fed961ed6
Write palette IDs in hex
2022-08-19 15:29:35 +01:00
GriffinR
9a0618afc3
Add COPYWIN constants
2021-11-03 15:29:18 -04:00
GriffinR
e14210ce1f
Merge pull request #1536 from GriffinRichards/clean-braille
...
Add font id constants, better braille support
2021-11-03 13:17:29 -04:00
GriffinR
fdaf436960
Add font id constants
2021-10-30 19:54:15 -04:00
GriffinR
41ecae91f8
Label remaining symbols in graphics.c
2021-10-27 13:47:18 -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
Kurausukun
3e725272fc
standardize "grey" to "gray"
2021-04-09 22:39:34 -04:00
GriffinR
b71b10623b
Add palette selection constants
2021-02-24 11:03:51 -05:00
GriffinR
4911849723
Document link contest connection
2020-08-13 16:27:40 -04:00
GriffinR
c2a07276ae
Merge branch 'master' into doc-link
2020-06-13 16:15:11 -04:00
Sierraffinity
74edaed426
Begin item_menu.c cleanup
2020-06-10 13:07:42 -07:00
GriffinR
9190af73b7
Label union room battle trainer
2020-06-03 15:28:29 -04:00
GriffinR
bc6bd36813
Document union_room_battle.c
2020-06-02 19:05:59 -04:00
GriffinR
18a00da820
Split wireless_communication_status_screen.c out
2020-06-02 18:51:26 -04:00
GriffinR
4fe507e453
Document union_room.c
2020-05-31 13:11:18 -04:00
GriffinR
7a5deff0bc
Add misc party constant usage
2020-04-09 15:18:53 -04:00
PikalaxALT
91dd7f5cc3
Port librfu from firered
2020-02-16 13:49:36 -05:00
PikalaxALT
306ce048ad
Move gflib srcs and headers to gflib subdir
2019-09-08 21:07:54 -04: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
PikalaxALT
a58d9a16dd
Merge branch 'master' into dodrio_berry_picking
2019-04-05 08:41:31 -04:00
PikalaxALT
7571969a45
Finish union room battle
2019-04-01 22:08:50 -05:00
PikalaxALT
4be97b2dc6
through sub_801A960
2019-04-01 22:08:50 -05:00
