Eduardo Quezada D'Ottone
fe63dafcc1
Merge branch 'battle_engine' into BE_pretmerge
...
# Conflicts:
# src/battle_anim_fire.c
# src/battle_controller_player.c
2022-07-20 08:50:30 -04:00
ghoulslash
6b84a9f0b3
merge w be
2022-07-17 12:40:43 -04:00
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
57222323c1
Merge pull request #1678 from GriffinRichards/const-frontier
...
Add some battle frontier constant usage
2022-06-18 10:22:58 -04:00
GriffinR
7143865f6f
Add some battle frontier constant usage
2022-06-09 12:57:28 -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
5e6d8a77e4
Document some generic argument names
2022-05-31 14:34:25 -04:00
sneed
c316b11739
chanceCommon to chanceNotRare
2022-05-24 00:53:09 +03:00
sneed
c8e08edbae
rename item1 and item2 in BaseStats
2022-05-23 19:10:24 +03:00
ghoulslash
7dd6988b2b
fix args to GetMonData
2022-05-13 20:32:03 -04:00
ghoulslash
b5d98ec93e
prevent overwriting wild mon held items
2022-05-13 20:05:52 -04:00
ExpoSeed
f50a406b18
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2022-03-22 12:56:23 -05:00
ultima-soul
86089ce935
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2022-02-28 22:13:14 -08:00
sphericalice
40efac0ddf
Rename GetBattlePyramindTrainerEncounterMusicId to fix typo
2022-02-22 19:13:17 +00:00
GriffinR
30d9704418
Specify unsigned in spot comment
2022-01-17 17:27:17 -05:00
GriffinR
313f14ed63
Add Spinda spot color constants
2022-01-17 17:00:18 -05:00
GriffinR
177863da47
Fix typo
2022-01-17 16:04:02 -05:00
GriffinR
225147a94f
Document Spinda spot algorithm
2022-01-17 15:34:18 -05:00
GriffinR
d4111d5520
Add comment about pokedex reordering
2022-01-05 14:50:19 -05:00
ExpoSeed
d6747527da
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-12-16 21:44:01 -06:00
ultima-soul
a5afdac0ae
Resolved review suggestions for upstream Battle Engine sync.
2021-12-08 12:08:16 -08:00
ultima-soul
23bf41713c
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-12-01 20:17:08 -08:00
ultima-soul
0312c5be8b
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-27 21:38:26 -08:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
GriffinR
1b35f9adad
Use specific name limits for string limit functions
2021-11-17 22:11:03 -05:00
GriffinR
c4169cfd29
Disambiguate cry functions
2021-11-07 14:26:09 -05:00
GriffinR
7f49f26331
Restore ModifyStatByNature bug notes
2021-10-27 22:38:48 -04:00
GriffinR
fc15b0d5f0
Add controller buffer constants, finish misc battle doc
2021-10-13 16:21:39 -04:00
GriffinR
b0598b1aef
Clean up recorded_battle, add MOVE_IS_PERMANENT
2021-10-12 01:14:17 -04:00
GriffinR
b8a44bf10a
Calculate pokemon substruct size, missing MON_PIC_SIZE
2021-10-11 10:35:53 -04:00
GriffinR
31b501e7eb
Start misc battle documentation
2021-10-08 16:39:46 -04:00
GriffinR
6e62c057f5
Document remaining symbols in pokemon.c
2021-10-02 23:48:12 -04:00
GriffinR
739e7d3c31
Document summary screen sprite manager
2021-10-02 23:47:59 -04:00
Pokestia
38a4dea402
Rename Battle Weather flags
2021-09-30 12:08:20 +02:00
GriffinR
42d2fefe02
Merge branch 'master' into tag-none
2021-09-24 10:17:34 -04:00
GriffinR
f8f7617946
Add TAG_NONE
2021-09-14 13:14:14 -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
ExpoSeed
c8fc141287
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-06-10 11:54:20 -05:00
ultima-soul
092f02f119
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-06-07 12:00:23 -07:00
ghoulslash
c356ffaed4
merge with be. fix null ptr check in GetBattleMoveSplit
2021-05-24 10:46:53 -06:00
Eduardo Quezada D'Ottone
d1d95df409
Fixed B_X_ITEMS_BUFF boosting 2 stages only in Gen 7
2021-05-21 11:29:13 -04:00
Eduardo Quezada D'Ottone
76b99e66dc
Added missing Treecko from animation list.
2021-05-16 20:46:58 -04:00
ultima-soul
56fc420187
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 21:34:30 -07:00
ultima-soul
14a0303e2f
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-27 18:36:37 -07:00
GriffinR
bee60f4c64
Document battler sprite affine anims, default pokeball throw
2021-04-25 02:18:34 -04:00
GriffinR
e5f0d2f736
Doc storage - releasing, some cursor
2021-04-16 04:30:09 -04:00
GriffinR
82f870091e
Merge pull request #1400 from GriffinRichards/doc-pokemonanim
...
Document Pokémon animation
2021-04-13 01:36:15 -04:00
GriffinR
72ba8cf58d
Document pokemon animation types
2021-04-10 00:50:28 -04:00
