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
f969effd36
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925
2022-09-25 12:51:39 -03:00
Eduardo Quezada
e412ec30a0
Removed calloc macro
2022-09-16 20:34:22 -03: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
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
be7d0bd3b0
Merge branch 'master' into doc-menu
2021-11-04 12:11:31 -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
afb9ff3a40
Document files with a few remaining symbols
2021-11-02 18:06:06 -04:00
GriffinR
fdaf436960
Add font id constants
2021-10-30 19:54:15 -04:00
GriffinR
7f3c529935
Document record mixing mail swap
2021-10-24 15:49:19 -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
be7acc919a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-04-03 21:53:29 -07:00
Kurausukun
5b910a11b4
port miscellaneous fr documentation
2021-03-18 20:35:39 -04:00
GriffinR
b71b10623b
Add palette selection constants
2021-02-24 11:03:51 -05:00
GriffinR
1cac608dbe
Document mail
2021-02-24 11:03:39 -05:00
GriffinR
2e57a00d17
Use GAME_LANGUAGE instead of LANGUAGE_ENGLISH
2021-02-05 12:08:49 -05:00
ultima-soul
96232ea166
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-01-28 23:59:08 -08:00
GriffinR
cf9f8d01c5
Add misc item data constants
2021-01-19 05:49:20 -05:00
GriffinR
3f9037d63a
Use ARRAY_COUNT in InitBgsFromTemplates
2021-01-19 04:14:07 -05:00
ultima-soul
6a0939cd4e
Remove special handling for Deoxys.
2020-12-21 22:39:19 -08:00
GriffinR
5259898325
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05: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
fb5bea98ce
More battle_dome.c doc
2020-01-07 22:30:37 -05:00
GriffinR
ed1ff0ad77
Document misc strings and text colors
2019-12-10 19:29:23 -06:00
PikalaxALT
306ce048ad
Move gflib srcs and headers to gflib subdir
2019-09-08 21:07:54 -04:00
Phlosioneer
1360b3a477
RGB Constants
2019-04-04 17:05:46 -04:00
Phlosioneer
3716da5430
Rename macro with correct name for pixel values
2019-03-02 17:25:39 -05:00
Phlosioneer
72bb0daccb
Merge branch 'master' into main-menu-state-machine
2019-02-26 22:34:42 -05:00
Marcus Huderle
7ea05431a5
Decompile more easy_chat.c
2019-02-25 14:11:31 -06:00
Phlosioneer
c96f8751cd
Improve window palette macros
2019-02-21 23:27:12 -05:00
Phlosioneer
d979ac3bf3
Document main_menu state machine, name window constants
...
The new names for the constants (and newly named functions) give a much
better understanding of what the window system is trying to do.
2019-02-11 00:34:50 -05:00
DizzyEggg
b9ad5de8a0
fortmatting
2018-12-26 14:50:47 +01:00
DizzyEggg
6761a049da
Fix Bldalpha args
2018-12-26 14:03:48 +01:00
nullableVoidPtr
3909b6408c
Fix alloc.c as per #386 , define INVALID_ constants and rename malloc to alloc as per #325
...
Some of the INVALID_ are likely erroneously placed, due to lack of documentation
2018-12-06 09:44:08 +08:00
DizzyEggg
b252bd0292
Window priority to window bg
2018-10-27 00:53:07 +02:00
DizzyEggg
24b9cd721f
More Battle Factory
2018-09-03 22:55:55 +02:00
Diegoisawesome
731d6d59bc
Document list_menu.c and main_menu.c
2018-07-15 04:30:37 -07:00
PikalaxALT
cae0fb8ec2
through sub_81203FC
2018-05-02 16:57:34 -04:00
KDSKardabox
447afe4505
Decompile pokemon icon
2018-04-13 17:51:49 +05:30
DizzyEggg
db3ecf5012
decompile scanline effect
2018-01-29 17:47:12 +01:00
DizzyEggg
ad2ef517bd
option menu fix conflicts
2018-01-21 12:46:19 +01:00
golem galvanize
59e1aacd26
DIEGO SEND HELP
2018-01-20 17:26:30 -05:00
DizzyEggg
a6072ae293
decompile option menu
2018-01-16 18:59:06 +01:00
ProjectRevoTPP
03a2a3b81b
fourteenth wave of graphics.s dumps
2017-12-28 17:15:37 -05:00
DizzyEggg
46fa2557d7
merge mail with master, fix conflicts
2017-12-17 20:22:56 +01:00
camthesaxman
c681b482c2
convert more constants
2017-12-11 12:27:51 -06:00
camthesaxman
caa13f8777
convert some constants to C headers
2017-12-05 11:55:48 -06:00
