Eduardo Quezada D'Ottone
e791cf90ad
Merge tag 'pretmaster' into BE_pretmerge2
...
# Conflicts:
# data/battle_anim_scripts.s
# include/battle_anim.h
# include/battle_controllers.h
# include/battle_interface.h
# include/battle_main.h
# include/battle_setup.h
# include/constants/battle_anim.h
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_anim_fire.c
# src/battle_anim_normal.c
# src/battle_controllers.c
# src/battle_dome.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/pokemon.c
2022-07-15 12:58:46 -04:00
sphericalice
186f2c0232
Introduce a MOVE_UNAVAILABLE constant
2022-07-11 15:18:13 +01:00
GriffinR
1ca1bff81c
Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into doc-arg
2022-06-03 15:43:21 -04:00
GriffinR
34438e6bc4
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
GriffinR
593e2c9be0
Fix inconsistent static s/g names
2022-05-17 14:00:02 -04:00
BuffelSaft
9d1800f53e
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2022-01-27 17:18:51 +13:00
BuffelSaft
cca7ec8c58
Fix and rename GetMoveTargetType
...
Change name to GetBattlerMoveTargetType and make it actually use the battlerId argument.
2021-11-24 12:09:54 +13:00
BuffelSaft
fa0b5188bb
Dynamic move targeting
...
Properly implement Expanding Force by replacing all instances that read move target from gBattleMoves with a function.
2021-11-23 16:56:11 +13:00
GriffinR
1b35f9adad
Use specific name limits for string limit functions
2021-11-17 22:11:03 -05: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
13cd2a41f0
Better braille support
2021-10-30 16:19:10 -04:00
GriffinR
41ecae91f8
Label remaining symbols in graphics.c
2021-10-27 13:47:18 -04:00
GriffinR
934a7e7a5d
Merge pull request #1516 from GriffinRichards/doc-miscbattle
...
Miscellaneous battle documentation
2021-10-19 08:09:17 -04:00
GriffinR
28de627913
Add TRACKS_ALL, remove BGCntrlBitfield
2021-10-09 11:34:51 -04:00
GriffinR
31b501e7eb
Start misc battle documentation
2021-10-08 16:39:46 -04:00
GriffinR
739e7d3c31
Document summary screen sprite manager
2021-10-02 23:47:59 -04:00
GriffinR
a66d7e1b43
Document some single-remaining symbols
2021-09-24 17:14:20 -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
PikalaxALT
810ca5f8ff
Flatten pos fields in struct Sprite
2021-07-07 09:11:52 -04:00
PikalaxALT
e0b58592b2
Merge pull request #1469 from GriffinRichards/fix-contesthearts
...
Clarify contest heart tiles
2021-06-21 13:59:50 -04:00
GriffinR
810b51f96c
Clarify contest heart tiles
2021-06-21 13:48:03 -04:00
ExpoSeed
3ed06c2cc2
Remove remaining grey and replace with gray
2021-06-10 11:36:10 -05:00
GriffinR
f7a699c686
Merge pull request #1421 from GriffinRichards/doc-tvrecordmix
...
Document TV
2021-04-29 00:25:01 -04:00
GriffinR
6c38837b26
Merge pull request #1420 from GriffinRichards/doc-dataanims
...
Document battler affine anims, default pokeball throw
2021-04-28 13:56:42 -04:00
GriffinR
aad090e154
Document TV
2021-04-26 12:35:35 -04:00
GriffinR
bee60f4c64
Document battler sprite affine anims, default pokeball throw
2021-04-25 02:18:34 -04:00
GriffinR
bc9fc38254
Misc contest cleanup
2021-04-22 15:51:04 -04:00
GriffinR
dbe24f0baa
Clean up contest_painting
2021-04-21 20:04:12 -04:00
GriffinR
62abcecc54
More usage of DISPLAY constants
2021-04-15 02:22:24 -04:00
GriffinR
b71b10623b
Add palette selection constants
2021-02-24 11:03:51 -05:00
GriffinR
2e57a00d17
Use GAME_LANGUAGE instead of LANGUAGE_ENGLISH
2021-02-05 12:08:49 -05:00
GriffinR
a392cca928
Misc battle documentation
2021-01-23 00:40:31 -05:00
GriffinR
b65980cd4e
Remove unused local variables and functions
2021-01-19 18:19:33 -05:00
Kurausukun
58976ebaa8
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
aaaaaa123456789
bacc831aa9
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
Kurausukun
6545745e59
Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts
2020-11-02 18:43:40 -05:00
Kurausukun
8bf401c227
address comments
2020-11-02 18:43:11 -05:00
aaaaaa123456789
bcbd05e151
Fix whitespace issues
2020-10-26 15:52:44 -03:00
aaaaaa123456789
4bbc14ecdd
Remove unused variable
...
Co-authored-by: Seija <71219152+PokeCodec@users.noreply.github.com>
2020-10-26 15:51:10 -03:00
aaaaaa123456789
1c3d75f673
Merge branch 'master' into reverts
2020-10-26 12:16:36 -03:00
GriffinR
5259898325
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
Kaz
847878eae9
battle_gfx_sfx_util.c: Very annoying fakematch fix.
...
daycare.c: -g eliminates the need for the brace hack.
battle_transition.c: Fix Phase2_Ripple_Func2...?
2020-09-19 17:12:25 -04: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
28ef2fb774
Switch to button macros
2020-09-04 21:11:55 -04:00
PokeCodec
d4158e490a
Match more functions
2020-09-04 19:49:53 -04:00
GriffinR
7c8bc0fbe3
Merge pull request #1149 from PokeCodec/datatypes
...
gflib documenting
2020-09-01 14:25:21 -04:00
GriffinR
09cfed64b5
Merge pull request #1146 from GriffinRichards/rename-songs
...
Give songs meaningful english names
2020-08-28 16:14:21 -04:00
PokeCodec
86a1e89879
Documentation of unk field
2020-08-23 21:34:31 -04:00
