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
|
62aed217fe
|
Remove unused common symbols in window.c
|
2023-02-01 16:14:32 -05:00 |
|
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
|
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 |
|
sbird
|
214718110a
|
[doc] remove mislabled metatile attributes from WriteSequenceToBgTilemapBuffer
|
2022-12-27 15:38:13 +01:00 |
|
Eduardo Quezada
|
e858b4e709
|
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124
# Conflicts:
# include/battle.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_dome.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/battle_tower.c
# src/data/pokemon/species_info.h
# src/pokemon.c
|
2022-11-24 15:36:00 -03:00 |
|
GriffinR
|
004ce32da0
|
Sync text ctrl codes with pokefirered
|
2022-11-23 21:13:00 -05:00 |
|
Eduardo Quezada
|
f969effd36
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925
|
2022-09-25 12:51:39 -03:00 |
|
Eduardo Quezada
|
8a68596b64
|
Removed free macro
|
2022-09-16 20:36:44 -03:00 |
|
Eduardo Quezada
|
e412ec30a0
|
Removed calloc macro
|
2022-09-16 20:34:22 -03:00 |
|
Eduardo Quezada
|
63156b4398
|
Removed malloc macro
|
2022-09-16 20:24:26 -03: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 |
|
GriffinR
|
91c040b081
|
Merge pull request #1777 from AsparagusEduardo/pret/pr/trailingWhitespace
Cleaned trailing whitespace
|
2022-09-13 14:00:11 -04:00 |
|
Eduardo Quezada
|
5eb9312250
|
Added missing labels in headers
|
2022-09-12 21:14:15 -03:00 |
|
Eduardo Quezada
|
65108c3192
|
Cleaned trailing whitespace
|
2022-09-11 14:14:49 -04:00 |
|
Eduardo Quezada
|
5403cd036e
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902
# Conflicts:
# include/battle.h
# include/battle_controllers.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controllers.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
|
2022-09-02 23:24:08 -04:00 |
|
Eduardo Quezada
|
0a34d47041
|
Merge remote-tracking branch 'pret/master' into pret_clean2
|
2022-08-27 00:56:00 -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
|
6fed961ed6
|
Write palette IDs in hex
|
2022-08-19 15:29:35 +01:00 |
|
Eduardo Quezada
|
59f89bde9e
|
Misc cleanup
|
2022-08-18 14:23:45 -04:00 |
|
Eduardo Quezada
|
e8a05e92e4
|
Corrected additional inconsistent uses of whitespace
|
2022-08-15 17:04:34 -04:00 |
|
Eduardo Quezada
|
2e1bf0d965
|
OamData mosaic FALSE
|
2022-07-29 21:27:39 -04:00 |
|
Eduardo Quezada
|
01558ff8f3
|
Struct pointers star standarizing
|
2022-07-29 11:15:33 -04:00 |
|
Eduardo Quezada
|
13672680b0
|
void pointer standarized
|
2022-07-29 10:52:35 -04:00 |
|
Eduardo Quezada
|
7b3401ee27
|
Standarized use of star in pointer types
|
2022-07-29 10:17:58 -04:00 |
|
GriffinR
|
a8c93dcf35
|
Add missing font constants after EXT_CTRL_CODE_FONT
|
2022-07-18 02:36:25 -04:00 |
|
GriffinR
|
34438e6bc4
|
Continue documenting generic arguments
|
2022-06-03 15:38:03 -04:00 |
|
GriffinR
|
a8b466dc80
|
Disambiguate fieldmap names
|
2022-01-19 10:15:32 -05:00 |
|
MCboy
|
1a33187bad
|
Move enum to bg.h
|
2022-01-14 13:48:46 +03:30 |
|
MCboy
|
998900bd1b
|
Give sensical names to Unused_AdjustBgMosaic
|
2022-01-14 13:37:27 +03:30 |
|
GriffinR
|
83be1bfc8f
|
Remove sFiller from malloc.c
|
2021-11-29 11:19:30 -05:00 |
|
GriffinR
|
1b35f9adad
|
Use specific name limits for string limit functions
|
2021-11-17 22:11:03 -05:00 |
|
GriffinR
|
b9fa18bdd4
|
Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into update-macros
|
2021-11-17 22:03:37 -05:00 |
|
GriffinR
|
c1970a4bc8
|
Remove dead sub references
|
2021-11-17 15:47:47 -05:00 |
|
GriffinR
|
7e27a0746d
|
Misc text clean-up
|
2021-11-14 22:21:17 -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
|
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
|
3e49ac804b
|
Merge branch 'master' into doc-finalmisc
|
2021-11-03 13:56:22 -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
|
0ba22ca112
|
Merge pull request #1534 from GriffinRichards/doc-btrans
Document battle transition
|
2021-11-03 11:26:20 -04:00 |
|
GriffinR
|
929aade0fd
|
Fix braille slash
|
2021-11-02 18:34:05 -04:00 |
|
GriffinR
|
afb9ff3a40
|
Document files with a few remaining symbols
|
2021-11-02 18:06:06 -04:00 |
|
GriffinR
|
36039e1b86
|
Convert fonts.s to C
|
2021-10-31 01:44:18 -04:00 |
|
GriffinR
|
fdaf436960
|
Add font id constants
|
2021-10-30 19:54:15 -04:00 |
|
GriffinR
|
13cd2a41f0
|
Better braille support
|
2021-10-30 16:19:10 -04:00 |
|
LOuroboros
|
cde0ce878c
|
EXT_CTRL_CODE_SIZE -> EXT_CTRL_CODE_FONT
|
2021-10-29 19:00:07 -03:00 |
|
GriffinR
|
901cd476b6
|
Fix incorrect arguments on CopyRectToBgTilemapBufferRect
|
2021-10-29 11:51:47 -04:00 |
|