Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,172 Commits 1 Branch 0 Tags
Commit Graph

18172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ghoulslash
1cdc91ce53
Add Costar Tests, Download Test for Doubles (#5526) 
* add download double battle test

* fix costar and add test

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2024-10-16 10:44:01 +02:00
GriffinR
0ee9b3cf08 Fix event_constants recipe running twice 2024-10-15 22:17:38 -04:00
GriffinR
0eb6d1d74c Merge branch 'porymap-6' of https://github.com/pret/pokeemerald into generate-map-constants 2024-10-15 22:04:45 -04:00
GriffinR
da9c0239d9 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2024-10-15 22:02:40 -04:00
ghoulslash
bb78d45400 some fixes 2024-10-15 21:24:53 -04:00
ghoulslash
cf78462fab merge w upcoming 2024-10-15 21:24:47 -04:00
Eduardo Quezada
9ed153ff93 Merge branch '_RHH/master' into _RHH/pr/master/pretSync20241015 2024-10-15 22:22:52 -03:00
Eduardo Quezada
80447bee8e Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015 2024-10-15 20:56:56 -03:00
Alex
ed65c4a2f7
Fixes Partner targeting and Acupressure/Ally Switch interaction (#5446) 
* Fixes Partner targeting and Acupressure/Ally Switch interaction

* More tests

* Update test/battle/move.c
 2024-10-15 17:04:35 -04:00
Bassoonian
b9ac5d1d8a
Add newline to move relearner string (#5523) 2024-10-15 21:58:58 +02:00
luckytyphlosion
a55c75d350
Get rid of common syms (#2040) 2024-10-14 23:52:11 -04:00
mid-kid
253d3dd7ef
Remove unnecessary looping for rule generation and unroll macros (#2046) 2024-10-14 23:47:07 -04:00
hedara90
a5d3a7c9d5
2024-10-13 master to upcoming (#5519) 2024-10-13 21:30:02 +02:00
Hedara
1b3de8a7d6 Merge branch 'master' into 2024-10-13-masterToUpcoming 2024-10-13 20:28:47 +02:00
aronson
b91656d1c3
Update test LD script to respect 4 byte data section alignment (#5517) 2024-10-13 07:31:31 +01:00
GriffinR
a0be2cbf7b Fix Fallorbor typo 2024-10-12 23:50:12 -04:00
GriffinR
f61c0099b9 OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA 2024-10-12 23:34:02 -04:00
GriffinR
bf17d54b52 Finish adding local IDs to map.json files 2024-10-12 23:32:28 -04:00
Eduardo Quezada
0a4b3a8dd7 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-12 16:23:27 -03:00
aronson
a01f9b4708
Align EWRAM and IWRAM data-filled sections to 4 bytes (#5512) 2024-10-12 19:41:26 +01:00
psf
c82ff7b5b1
Merrp merge (12th of October) (#5514) 
Co-authored-by: Ariel A <24759293+aarant@users.noreply.github.com>
Fixes #5482
 2024-10-12 10:50:31 -07:00
kittenchilly
743dc4d765
Add text fitting tests for move, ability, item, and pokedex descriptions (#5505) 2024-10-12 19:37:11 +02:00
Bassoonian
eedeaf1ead
Clean up scrcmd PR (#5511) 
Renamed CheckPartyHasSpecie to CheckPartyHasSpecies and cleaned up function calls
 2024-10-12 10:34:05 -07:00
Bassoonian
8dba27249c Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into merrpmerge1210 2024-10-12 18:41:33 +02:00
Ariel A
e10005010e Merge branch 'followers' into followers-expanded-id 2024-10-12 12:27:05 -04:00
GriffinR
cb66ea6653 Continue adding local IDs to map.json files 2024-10-12 12:24:57 -04:00
Ariel A
d80190fe10 fix: Dig in Sealed Chamber no longer freezes follower. Fixed #5482 rhh 2024-10-12 12:23:18 -04:00
Ariel A
ef462d9d9b meta: remote_build no longer untracks new files after build 2024-10-12 12:19:42 -04:00
GriffinR
a2a3255bdd Fix typo, remove old size check 2024-10-12 03:30:35 -04:00
GriffinR
9f31b0fe90 Generate local IDs from map.json files 2024-10-12 03:04:24 -04:00
ghoulslash
f810d7d0c0
Adds new scripting macros to increase developer quality of life (#5177) 2024-10-11 21:08:41 -04:00
psf
0ef3f7dedd
Merge branch 'upcoming' into scriptCommands 2024-10-11 16:27:02 -07:00
ghoulslash
353915ef64
Add various tests, add RNG_RANDOM_TARGET (#5438) 
* burn dmg test depends on config

* burn and frostbite tests use B_BURN_DAMAGE config for denom val

* update kings shield test with config

* add RNG_RANDOM_TARGET, use SetRandomTarget in HandleAction_UseMove target acquisition, update uproar test to PASSES_RANDOMLY since test will fail if you target the soundproof voltorb. Slightly faster UproarWakeUpCheck

* add sticky web+contrary test

* add EXPECT_EQ to contrary+sticky web test

* Update src/battle_script_commands.c

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

* Update src/battle_util.c

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

* Update test/battle/move_effect/uproar.c

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

* fix test

* syntax fix

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-10-11 23:47:46 +02:00
SarnPoke
2db1f071fa
Add battle flag that prevents running from wild Pokémon (#5502) 
* Add No Running Battle Flag

Adds a flag that if set prevents the player from being able to run from wild battles.

* Formatting battle_util.c

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

* Adjust for pre-Gen 8 Teleport

Addresses the edge case with Teleport when used with under Gen 8 mechanics.

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-10-11 21:59:50 +02:00
GriffinR
6518f1e3ff Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2024-10-11 15:26:58 -04:00
GriffinR
091b7269df
Move heal locations data to their associated map.json (#2034) 2024-10-11 15:15:55 -04:00
GriffinR
b6892f5b67 Let scaninc ignore empty C files 2024-10-11 15:03:38 -04:00
mid-kid
2c7964dbc2
Fix deleting files with dependency files (#2045) 2024-10-11 14:33:32 -04:00
Pawkkie
464c90a862
ShouldSwitchIfGameStatePrompt Tests (#5462) 
* Weird tests plz help <3

* better RNG tag names?

* DATA.trial for data to reset between trials

* Fix Wonder Guard test

* Unused errors

* Finish new tests

* Split fix into its own PR

* Spacing

* Rename RNG_AI_SWITCH_TOXICD

* Forgot to save file lol

---------

Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
 2024-10-11 19:57:19 +02:00
Bassoonian
d7c5bfee68
Clean up Shedinja code (#5501) 2024-10-11 19:50:41 +02:00
Martin Griffin
fcc067e515
[preproc] support C23 enum underlying type syntax (#2043) 2024-10-11 13:50:26 -04:00
Bassoonian
b5c884504c
Fix negative mutation value (#5504) 2024-10-11 19:49:24 +02:00
GriffinR
af8f4bf45d Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2024-10-11 13:38:04 -04:00
GriffinR
6d24d8a78f Fix libpng installation for workflow on Ubuntu 24.04 2024-10-11 13:29:16 -04:00
hedara90
cac815164a
Cleanup extraneous function in header (#5506) 2024-10-11 12:14:14 +02:00
kittenchilly
130d6042e0
Add Ion Deluge animation (#5467) 2024-10-10 22:37:57 +02:00
kittenchilly
5b4acea651
Add config to change Vivillon's breeding form (#4813) 
* Add config to change Vivillon's default form

* Update daycare.c

* Remove the default form stuff

* Update daycare.c

* Clean up

* Assert and fancy
 2024-10-10 21:27:50 +02:00
kittenchilly
8890500b77
Fix P_FRIENDSHIP_EVO_THRESHOLD not checking for Gen 8 (#5503) 2024-10-10 21:26:46 +02:00
Martin Griffin
6395d55b43
Merge pull request #2044 from AreaZR/Excessive 
Fix typo: | should be || in Task_TryFieldPoisonWhiteOut
 2024-10-10 20:26:12 +01:00
PhallenTree
8d2d62273b
Updated ability popups for Skill Swap, Mummy/Lingering Aroma, Worry Seed, Simple Beam, fix Doodle/Role Play bugs (#5493) 
* Updated ability popups of Skill Swap, Mummy/Lingering Aroma, Worry Seed, Simple Beam, Fix Doodle and Role Play issues

* More Doodle fixes

* Add tests

* Fix Doodle not activating if partner is fainted and its ability cannot be suppressed

* Fix tests compile

* Commander cantBeOverwritten

* Add battle script for Overwrite then Regular ability
 2024-10-10 18:36:01 +02:00