Commit graph

2865 commits

Author SHA1 Message Date
Eduardo Quezada
ee9c6d4912 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-17 00:16:01 -03:00
Eduardo Quezada
80447bee8e Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015 2024-10-15 20:56:56 -03:00
psf
0ef3f7dedd
Merge branch 'upcoming' into scriptCommands 2024-10-11 16:27:02 -07:00
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
psf
58aa1e0034
Merge branch 'upcoming' into scriptCommands 2024-09-30 06:57:54 -07:00
Alex
42c43a3f8f
Adds Commander and Order Up (#5246)
* Adds Commander

* review points

* new line

* correction

* regression / double targeting still broken

* fix wrong target order

* transform fixes

* haze test

* fixes, tests

* bring back wrongly removed else if case

* Eject Pack / Button test + fix

* red card fix

* test fixes

* Fixes Tatsu being hit by multi hit move

* change transform check

* fix test + revert change

* Fix Tatsugiri attacking after freed up from Dozo in the same turn

* Dragon Darts tests

* fix test

* review comments

* assumtion in wrong file

* Order Up test fixes

---------

Co-authored-by: hedara90 <90hedara@gmail.com>
2024-09-29 22:45:50 +02:00
Eduardo Quezada
5130ea9da3 Merge branch '_RHH/master' into _RHH/upcoming 2024-09-28 11:45:49 -03:00
ghoulslash
d695a6240d
Convert settotemboost command to callnative (#5418)
* settotemboost use callnative

* Update src/battle_main.c

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-22 11:25:42 +02:00
pkmnsnfrn
d76ccddad3 spaces to tabs in inc files 2024-09-14 09:03:49 -07:00
pkmnsnfrn
60fb0b34fd Modified getobjectxy to allow for custom destinations 2024-09-14 07:48:24 -07:00
pkmnsnfrn
1665423e52 Renamed scripts to match vanilla
Cleaned up descriptions
2024-09-14 07:11:04 -07:00
pkmnsnfrn
a509f28038 Changed Scripot_GetObjectFacingDirection to callnative 2024-09-14 06:32:47 -07:00
pkmnsnfrn
510af1bee6 Restored original functions and made script versions 2024-09-12 20:55:37 -07:00
pkmnsnfrn
ecd435cd84 Changed CheckChosenMOnMatchDesiredSpecies and CheckPartyHasSpecies to callnative 2024-09-12 20:45:14 -07:00
pkmnsnfrn
c2db77c4f6 Changed Script_GetSetPokedexFlag to callnative 2024-09-12 20:15:55 -07:00
pkmnsnfrn
be7938f322 Changed CheckObjectAtXY to callnative 2024-09-12 18:55:11 -07:00
pkmnsnfrn
10bb349b8c Changed GetObjectPosition to callnative 2024-09-12 18:41:42 -07:00
pkmnsnfrn
22b0fdf5c3 Removed checkspecies_auto and made that the default behavior 2024-09-12 18:18:41 -07:00
pkmnsnfrn
979c9994f7 Set VAR_RESULT to the number of removed items from removeallitem per https://github.com/rh-hideout/pokeemerald-expansion/pull/5177\#issuecomment-2294980531 2024-09-12 05:47:12 -07:00
pkmnsnfrn
f87440a25a Removed setmonball per https://github.com/rh-hideout/pokeemerald-expansion/pull/5177\#issuecomment-2294980531 2024-09-12 05:43:55 -07:00
pkmnsnfrn
a0e914b749 Merge branch 'upcoming' into scriptCommands 2024-09-12 05:39:24 -07:00
Eduardo Quezada
551c558186 Merge branch '_RHH/master' into _RHH/upcoming 2024-09-11 07:28:02 -03:00
Alex
5089b1d0b4
Adds callnative for soundproofcheck to addtionally check the flag (#5301)
* Adds callnative for soundproofcheck to addtionally check the flag

* rename callnative, include parish song and missing ability recording
2024-09-09 06:52:26 -03:00
hedara90
d62b7270c8
Fixed trainerslide arguments (#5344)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-09 10:49:05 +02:00
NT_x86
71fcb2e7b5
Fix incorrect point macros in contest_ai_script.inc 2024-09-08 12:50:35 +03:00
Eduardo Quezada
8533b0c045 Merge branch '_RHH/master' into _RHH/upcoming 2024-09-03 14:39:50 -04:00
ghoulslash
28a9ad3399
(Default Off) Item Description Headers (#4767)
* add item descption headers and (default-off) config

* revert test script

* OW_SHOW_ITEM_DESCRIPTIONS can be 0(off), 1(first time) or 2(always), move code to overworld.c to prevent issues with users whove merged original branch. fix styling

* add ow item header config value labels

* Update include/config/overworld.h

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Update src/overworld.c

* Update include/overworld.h

* ScriptShowItemDescription remove unused var

* fix ScriptShowItemDescription warning

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-03 20:22:01 +02:00
Eduardo Quezada
484acdc138
Convert 8 various to callnatives (#5172)
* Convert 8 various to callnatives

* Address review comments
2024-09-01 15:12:43 +02:00
Alex
e09a59a7e4
Fixes Tar Shot on Tera mons (#5302)
* Fixes Tar Shot on Tera mon

* new line
2024-08-31 12:24:28 -04:00
psf
e7023088ed
Merge branch 'upcoming' into scriptCommands 2024-08-27 21:31:14 -07:00
pkmnsnfrn
67f8a61eef Moved current and template positions to headers 2024-08-14 19:44:18 -07:00
pkmnsnfrn
dc06321054 Moved pokedex flags to constants files andadded constants to header of event_scripts 2024-08-14 19:24:55 -07:00
pkmnsnfrn
458340e043 Moved pokedex special constants to header 2024-08-14 19:09:56 -07:00
pkmnsnfrn
bdeedaa949 Renamed evObjId to localId 2024-08-14 19:05:30 -07:00
Eduardo Quezada
661ec0a9fd Merge branch '_RHH/master' into _RHH/upcoming 2024-08-14 17:10:20 -04:00
Sadfish the Sad
fde85e9357
some gen 9 move anims + fickle beam rework (#5159)
* new move anims + fickle beam rework

* more fickle beam changes

* removed the true for consistency

* ficklebeamboosted gets cleared now

* mortal spin and thunderclap changes

* minor mortal spin pal change

* removed hex numbers and made hard press quicker
2024-08-14 17:20:18 +02:00
pkmnsnfrn
881e54a52b Incremental improvement of getobjectfacing 2024-08-12 06:51:09 -07:00
pkmnsnfrn
f0d5b68f70 Improved checkspecies functions 2024-08-11 22:10:04 -07:00
pkmnsnfrn
abb17ea88b Improved dex flags functions 2024-08-11 21:01:31 -07:00
pkmnsnfrn
ebae09f0a6 Improved checkobjectat 2024-08-11 20:16:27 -07:00
pkmnsnfrn
7f5ecd8d0f getobjectfacingdirection 2024-08-11 19:27:18 -07:00
pkmnsnfrn
262505589a checkforspecies 2024-08-11 19:19:15 -07:00
pkmnsnfrn
e746334e1e Added setmonball 2024-08-11 18:53:39 -07:00
pkmnsnfrn
fba1452c3b Added Seen/CaughtMon macros 2024-08-11 18:49:42 -07:00
pkmnsnfrn
0784f9fa74 Added checkobjectat 2024-08-10 21:40:57 -07:00
pkmnsnfrn
811b5d286e Added getobjectposition 2024-08-10 21:17:50 -07:00
pkmnsnfrn
73953b3e39 Added removeallitem 2024-08-10 14:43:50 -07:00
Bassoonian
89cba94567
Update event.inc to accomodate new gDecompressionBuffer name (#5100) 2024-08-05 22:21:12 -04:00
Eduardo Quezada
18aff2db3b Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	asm/macros/battle_anim_script.inc
#	data/battle_anim_scripts.s
#	include/constants/battle_anim.h
#	src/battle_anim.c
#	src/data/battle_anim.h
2024-07-27 16:26:37 -04:00
hedara90
b0b63f66b9
Added Ivy Cudgel Animation (#5034)
* Added Ivy Cudgel Anim, changed Ogerpon palettes, added jumpifmovetypeequals command

* Make the 20 year old compiler not complain

* Maybe better cudgel

* Moved animation

---------

Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-26 18:06:44 +02:00