kittenchilly
bd71946372
Remove all trailing whitespace (master) ( #3472 )
2023-10-27 13:52:44 -03:00
DizzyEggg
c29f8259f6
remove gActiveBattler entirely
2023-08-30 12:46:22 +02:00
AgustinGDLV
34382fcece
fixed revive in 1v2 battles
2023-05-23 14:19:24 -07:00
CallmeEchoo
503035010e
Merge branch 'upcoming' into battleItemFixes
2023-04-24 21:11:34 +02:00
CallmeEchoo
38476bd22c
fix Full Restore not healing confusion
2023-04-21 21:37:02 +02:00
AgustinGDLV
d3a090020b
added code review
2023-04-15 15:30:07 -07:00
AgustinGDLV
82dc1e3e93
fixed dupe strings in battle item use
2023-04-15 09:27:28 -07:00
AgustinGDLV
2eabcea86e
Battle Item Refactor ( #2902 )
...
* items that can be used in battle now use battlescripts
* removed ExecuteTableBasedItemEffect_
* taught AI how to use items, removed AI_itemtype/flag
* X-Items store stages raised in holdEffectParam
* USE_ITEM in tests
2023-04-14 19:25:50 +01:00
Eduardo Quezada
51b716c9d9
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319
...
# Conflicts:
# data/battle_scripts_2.s
# include/constants/battle_string_ids.h
# include/constants/songs.h
# src/battle_message.c
# src/data/pokemon/species_info.h
2023-03-19 20:28:56 -03:00
DizzyEggg
44d2cc7232
Fix bugs related to Trainer Slide messages ( #2699 )
...
* start working on trainer slides
* use cmd->nextInstr
2023-02-27 09:11:25 +01:00
Eduardo Quezada
f5aa3b8272
Document the 2 different sText_GotchaPkmnCaught
2023-02-23 11:43:40 -03:00
Eduardo Quezada
011ec16f1e
Organized conffig files into their own folder and cleaned up
2022-11-14 11:03:49 -03:00
ultima-soul
b0b8b9bf46
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-17 23:51:29 -08:00
ultima-soul
5cb73a012c
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp
2021-08-30 11:57:27 -07:00
ultima-soul
988320b89a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-08-17 11:25:13 -07:00
ultima-soul
64a48800c9
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-08-11 17:10:57 -07:00
ultima-soul
02c9e040df
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-08-11 16:33:10 -07:00
GriffinR
06351bf63c
Remove address comments
2021-07-20 15:18:31 -04:00
ultima-soul
bca67ac683
Refactor Poke Ball code to not rely on Master Ball being the first item internally.
2021-06-11 18:22:50 -07:00
ultima-soul
0a87adad1a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-06-07 18:05:52 -07:00
ultima-soul
75a9fdbafa
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-04-28 20:50:59 -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
b6711441f5
Fix AI Guard Spec use, and Specs->Spec
2021-04-03 15:18:17 -04:00
GriffinR
f4d8a91ba4
Misc battle script cleanup
2021-04-03 14:07:31 -04:00
GriffinR
9ea9ffde09
Add remaining multistring chooser constants
2021-04-03 11:49:06 -04:00
ultima-soul
46e853c13b
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-02-03 16:23:23 -08:00
LOuroboros
fc04c6974b
Edit->Blank Operations->Trim Trailing Space for the win
2021-02-01 17:05:49 -03:00
LOuroboros
78654db215
Added comments for each entry of gBattlescriptsForBallThrow
...
## Description
In an attempt to match the structure of upstream, I reintroduced the comments that point out the Poké Balls affected by each BallThrow battlescript in `gBattlescriptsForBallThrow`.
## **Discord contact info**
Lunos#4026
As usual, if there's anything wrong please let me know.
2020-10-15 02:55:15 -03:00
DizzyEggg
97d0643110
Merge with master
2020-09-08 12:48:28 +02:00
DizzyEggg
271219f962
Merge with master
2020-09-08 12:00:51 +02:00
DizzyEggg
f70a9ce153
Merge with master
2020-08-27 12:01:28 +02:00
DizzyEggg
35559d6b71
Merge with master
2020-08-27 10:58:31 +02:00
GriffinR
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
GriffinR
a4e47f1201
Clean some battle_message.c data
2020-07-23 05:01:42 -04:00
DizzyEggg
42e7930987
Almost done with the balls
2019-04-14 21:49:31 +02:00
DizzyEggg
68d94ad316
Implement trainer sliding
2018-11-03 01:17:16 +01:00
DizzyEggg
7925000a54
merge with master
2018-10-06 16:05:58 +02:00
DizzyEggg
10b479a3ca
Document battle animation scripts.
2018-09-10 21:19:19 +02:00
DizzyEggg
674d35861c
Couple bug fixes
2018-08-11 12:16:00 +02:00
DizzyEggg
f126585e71
Merge with master
2018-08-11 11:05:57 +02:00
DizzyEggg
3d5f512aec
Use constant in a battle script.
2018-08-03 18:07:45 +02:00
DizzyEggg
39f9b1ddf0
Experience on caught mon
2018-08-03 18:01:14 +02:00
DizzyEggg
272b98da6c
document party status summary
2018-06-28 21:06:32 +02:00
DizzyEggg
96290f4ee3
pokemon and battle constants
2018-02-08 11:17:41 +01:00
DizzyEggg
a10fd5a7c4
create more battle constants
2018-02-08 00:35:13 +01:00
camthesaxman
9525fdd54d
convert more constants
2017-12-11 12:41:13 -06:00
camthesaxman
c681b482c2
convert more constants
2017-12-11 12:27:51 -06:00
DizzyEggg
790df7159e
more battlescript labels
2017-12-03 00:47:21 +01:00
DizzyEggg
e10aea9a51
give some more labels to battle struct fields
2017-12-02 23:31:58 +01:00
DizzyEggg
1bb5b1fd07
more battle labels
2017-11-26 17:15:28 +01:00
