atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16547 commits 2 branches 40 tags 617 MiB
Commit graph

75 commits

Author SHA1 Message Date
kittenchilly
44bf14e6fd
Add functionality to Poké Flute and Town Map (#5405) 
* Add functionality to Poké Flute and Town Map

* Poke flute in-battle

* Address reviews

* Update item_use.c

* Update battle_message.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c
 2024-10-03 10:52:59 +02:00
hedara90
d62b7270c8
Fixed trainerslide arguments (#5344) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-09-09 10:49:05 +02:00
Eduardo Quezada
18980b20a3
Remove trailing whitespace (master) (#5174) 2024-08-14 19:48:20 -07:00
Bassoonian
cfcac0b0f9
Clean up battle scripts (#4839) 
* Clean up battle and anim scripts

* Revert anim cleanup
 2024-07-15 16:25:25 +02:00
cawtds
474f929c02
Fix dire hit being used on incorrect target (#4626) 
* fix getboxmondata for evolutiontracker if compiled with agbcc

* fix dire hit being used on incorrect battler
 2024-05-26 00:06:55 +02:00
cawtds
b73e33618d
Fix status curing of full restore when used on party member (#4603) 
* fix getboxmondata for evolutiontracker if compiled with agbcc

* fixed full restore curing status condition when used in battle on party member with missing hp
added more full restore tests

* formatting, removed unused
 2024-05-20 00:25:03 +02:00
Eduardo Quezada
1720e1b129 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	data/battle_scripts_2.s
#	src/data/pokemon/species_info/gen_9.h
 2024-02-10 17:53:32 -03:00
Bassoonian
b4fa0b1bf0
Clean up space/tabs difference (#4163) 2024-02-10 14:43:14 -03:00
Eduardo Quezada
67f1772f1e Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_util.c
#	test/battle/item_effect/heal_and_cure_status.c
 2024-02-09 17:02:56 -03:00
DizzyEggg
31ac151e29
Fix Full Restore / Antidote not reseting Toxic Counter (#4135) 
* Fix Full Restore / Antidote not reseting Toxic Counter

* Update battle_scripts_2.s

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-02-09 13:58:16 +01:00
Alex
ab2774f8c7
Adds Dragon Cheer (#4122) 
* Adds Dragon Cheer

* fix assumptions

---------

Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
 2024-02-03 08:00:41 -07:00
Alex
f6c08c08b6
Fix item usage in double battles (#3977) 
* Fix item usage in double battles

* fix failing tests

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2024-01-15 21:55:35 +01:00
kittenchilly
9d2be9f3a6
Remove all trailing whitespace (upcoming) (#3473) 2023-10-27 13:54:55 -03:00
DizzyEggg
2fcb9bbc9b
Wild battle tests + tests for exp points (#3342) 
* Add WIld Battles to test runner + exp tests
 2023-09-27 08:35:05 +01: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