Commit Graph

9701 Commits

Author SHA1 Message Date
sneed
f43d54af89 AI chooses most resistant mon 2022-06-18 19:00:33 +03:00
GriffinR
21ed288f50
Merge pull request #1687 from SimplyBLGDev/patch-1
Format newlines in surf.inc
2022-06-18 11:04:39 -04:00
GriffinR
a931874164
Merge pull request #1691 from coltongit/patch-5
Format newline in BattleFrontier_BattlePikeLobby/scripts.inc
2022-06-18 11:04:20 -04:00
Colton G. Rushton
c8e6d69fdc
Format newline in BattleBattleFrontier_BattlePikeLobby/scripts.inc
One of the strings declared in BattleFrontier_BattlePikeLobby/scripts.inc was poorly formatted.
2022-06-18 11:49:13 -03:00
GriffinR
57222323c1
Merge pull request #1678 from GriffinRichards/const-frontier
Add some battle frontier constant usage
2022-06-18 10:22:58 -04:00
GriffinR
d11b04f251
Merge pull request #1690 from Kurausukun/ai_doc
Document Design Oddity, Use Constants, Correct Comment
2022-06-17 22:09:43 -04:00
Kurausukun
d3c8346a67 fix type, add bugfix 2022-06-17 21:58:56 -04:00
Kurausukun
23e9455e0a document design oddity, use constants, correct comment 2022-06-17 21:52:58 -04:00
GriffinR
7a6b417b8e Remove UBFIX related to task destruction 2022-06-17 21:01:23 -04:00
GriffinR
de1145e790
Merge pull request #1688 from coltongit/patch-4
Add bugfix from bugs_and_glitches.md to BUGFIX
2022-06-17 17:48:53 -04:00
Colton G. Rushton
f02ea58a68
Add comment description of this bugfix 2022-06-17 18:32:46 -03:00
Colton G. Rushton
d7ab1ba588
Fix formatting 2022-06-17 18:22:47 -03:00
Colton G. Rushton
b885e01b39
Update src/item_menu_icons.c
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
2022-06-17 18:16:14 -03:00
Colton G. Rushton
b17fb2ff56
Delete bugs_and_glitches.md 2022-06-17 18:07:46 -03:00
Colton G. Rushton
e42498ab40
Add bugfix from bugs_and_glitches.md to BUGFIX
Item flicker fix now in `BUGFIX`
Supersedes and resolves #1680
Fixes #1215
Fixes #1514
2022-06-17 18:06:37 -03:00
Simply BLG
324a157b34
Format newlines in surf.inc
One of the strings declared in surf.inc was poorly formatted.

## Description
Some of the strings declared in surf.inc contained newline characters in the middle of the .string line, opposing the format used by every string in the `data/text` directory, I just updated them to match the format, making it more readable.
2022-06-17 15:21:12 -03:00
GriffinR
03e74c4aff
Merge pull request #1686 from SimplyBLGDev/patch-2
Format newlines in pc_transfer.inc
2022-06-17 13:37:57 -04:00
Simply BLG
380cc8615b
Format newlines in pc_transfer.inc 2022-06-17 14:22:31 -03:00
GriffinR
0e5fac564e
Merge pull request #1684 from SimplyBLGDev/patch-1
Format newlines in contest_string.inc
2022-06-17 11:20:20 -04:00
Simply BLG
1860b61fe3
Corrected two missing newlines 2022-06-17 12:05:32 -03:00
Simply BLG
e48341f7fc
Format newlines in contest_string.inc
Some of the strings declared in contest_string.inc were poorly formatted, containing newline characters in the middle of the string, opposing the format used by every string in data/text, I just updated them to match the format, making it more readable.
2022-06-17 11:52:54 -03:00
GriffinR
4660f8c88b Document battle tower TV show 2022-06-14 09:37:39 -04:00
GriffinR
95f075ec90 Remove erroneous bugfix 2022-06-13 15:01:04 -04:00
GriffinR
dec54e6e92 Additional constant usage 2022-06-13 03:21:20 -04:00
sneed
407047ace7 ground x2 vs flying if inverse battle 2022-06-10 23:23:21 +03:00
GriffinR
6418f08944
Merge pull request #1679 from LOuroboros/ribbons
Untangled CheckPartnersMonForRibbons
2022-06-09 14:47:38 -04:00
LOuroboros
7470a56d44 Untangled CheckPartnersMonForRibbons 2022-06-09 15:08:58 -03:00
GriffinR
7143865f6f Add some battle frontier constant usage 2022-06-09 12:57:28 -04:00
GriffinR
1f540845cb
Merge pull request #1675 from GriffinRichards/doc-arg
Document generic arguments
2022-06-09 11:11:02 -04:00
GriffinR
ceaff148f7 Shift to multiply 2022-06-09 10:52:19 -04:00
GriffinR
89e6e11f4c
Merge pull request #1676 from GriffinRichards/obj-warning
Add warning to NUM_OBJ_EVENT_GFX
2022-06-05 21:19:39 -04:00
ghoulslash
b33a8b0cb4 move ai score calc to STATE_TURN_START_RECORD so AI can consider move selection for item use 2022-06-05 11:09:04 -04:00
sneed
1d19c0dc9f Update battle_util.c 2022-06-05 16:38:37 +03:00
ghoulslash
c694e0cb90 merge w be 2022-06-05 08:22:24 -04:00
ghoulslash
15fe85902f
Merge pull request #2164 from Sneed69/battle_engine
Heal Block stops Synthesis
2022-06-05 08:18:03 -04:00
sneed
bf1025ac16 Update battle_util.c 2022-06-05 05:09:06 +03:00
sneed
f419fc3ae7 fix terrain move softlock 2022-06-04 18:36:18 +03:00
ghoulslash
24af1d5c1b
Merge pull request #2162 from Sneed69/IsMoveWithoutAnimation
Remove IsMoveWithoutAnimation
2022-06-04 08:38:45 -04:00
GriffinR
bc2dbd772e Add warning to NUM_OBJ_EVENT_GFX 2022-06-03 16:18:34 -04: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
78b0c20738
Merge pull request #1674 from Sneed69/master
Include config.h in siirtc.c
2022-06-03 14:45:10 -04:00
sneed
af6bf17930 Include config.h in siirtc.c 2022-06-03 21:04:14 +03:00
GriffinR
817fcb1c34
Merge pull request #1673 from sphericalice/try-free-and-set-null
Use the TRY_FREE_AND_SET_NULL macro where appropriate
2022-06-03 11:07:38 -04:00
sphericalice
284e46927a Use the FREE_AND_SET_NULL macro where appropriate 2022-06-03 15:56:11 +01:00
sphericalice
d03756dfd2 Use the TRY_FREE_AND_SET_NULL macro where appropriate 2022-06-03 15:42:53 +01:00
Sneed69
c60de5055d remove IsMoveWithoutAnimation 2022-06-03 17:42:42 +03:00
GriffinR
7bea8c58e7
Merge pull request #1672 from sphericalice/create-region-map-player-icon-arg-names
Correct CreateRegionMapPlayerIcon's argument names
2022-06-03 10:22:03 -04:00
sphericalice
380cb46919
Correct CreateRegionMapPlayerIcon's argument names
Correct CreateRegionMapPlayerIcon's argument names in include/region_map.h
2022-06-03 15:04:52 +01:00
sneed
e1c57e4071 move_none does not benefit from stab 2022-06-01 22:45:50 +03:00