hedara90
7d1bbf62e1
Apply suggestions from code review
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-02-13 10:23:06 +01:00
Hedara
7426a98dc5
Merge remote-tracking branch 'merrp/followers-expanded-id' into merrp-merge
2025-02-12 13:34:28 +01:00
Ariel A
c8fb56d73b
Merge branch 'followers' into followers-expanded-id
2025-02-10 00:24:50 -05:00
Ariel A
ef05bbf394
Merge remote-tracking branch 'upstream/master' into followers
2025-02-10 00:11:38 -05:00
Alex
de9e9af1b7
Fixes Spectral Thief stealing boost at the wrong time ( #6197 )
...
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2025-02-07 16:24:05 -05:00
Alex
97d8bd2646
Fixes Dragon Tail missing timing against Rocky Helmet / Iron Barbs ( #6154 )
2025-01-31 22:02:26 +01:00
Alex
9ed3b176f0
Pret merge (17 of January) ( #6045 )
2025-01-18 19:53:29 +01:00
ghoulslash
37cbae5e54
Fix Symbiosis Needing battler Argument + Tests ( #6039 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-01-18 14:44:07 +01:00
Bassoonian
bcf9a1eff8
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan
2025-01-17 21:57:25 +01:00
Raymond Dodge
b5b0ffd511
Define field script opcode constants ( #2005 )
...
Replace the magic number opcodes in field script command macros with
these new constants
2025-01-17 17:04:00 +00:00
Eduardo Quezada
15a034a1d9
Fixed multiple transform/form change graphical issues ( #6005 )
2025-01-12 09:49:19 +01:00
Alex
f61a0f6a30
Sheer Force fix and move effect cleanup ( #5812 )
2024-12-21 19:45:50 +01:00
Eduardo Quezada
82252251e7
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220
2024-12-20 16:04:33 -03:00
Eduardo Quezada
3f98c78297
Added POKEMART_LIST_END to avoid users accidentally removing it ( #1947 )
2024-12-04 17:38:23 -05:00
Eduardo Quezada
1a581c407c
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-01 08:11:32 -03:00
Alex
b3b0973fbb
Fixes Population Bomb / Triple Kick missing message ( #5747 )
2024-11-30 18:06:17 -05:00
Alex
b55c87f73f
Fixes Take heart ( #5658 )
...
Co-authored-by: KyleLaporte <moog272@gmail.com>
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-11-11 14:58:09 -05:00
Eduardo Quezada
b48e5770be
Merge branch '_RHH/master' into _RHH/upcoming
2024-11-11 15:58:42 -03:00
Eduardo Quezada
e005ffb576
Merge branch '_RHH/master' into _RHH/upcoming
2024-11-06 10:01:48 -03:00
Alex
8581646c22
Convert 3 variouses to callnatives ( #5646 )
2024-11-06 10:09:49 +01:00
Alex
dc740b4e9a
Fixes Magic Coat message ( #5645 )
2024-11-06 10:09:00 +01:00
Eduardo Quezada
ee2535be96
Merge branch '_RHH/master' into _RHH/upcoming
2024-11-03 12:21:22 -03:00
Alex
45d063dcf8
Fixes Dragon Tail using the effect twice during a Parental Bond attack ( #5630 )
...
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-11-02 09:38:29 -03:00
Ariel A
0f706ac9e0
Merge branch 'followers' into followers-expanded-id
2024-10-21 00:05:26 -04:00
Ariel A
4056804575
feat: improved follower handling during scripted movements
2024-10-20 23:55:05 -04:00
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
