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

11837 commits

This branch
This branch
All branches
Author SHA1 Message Date
ghoulslash
53061c7d62
Merge pull request #2391 from AsparagusEduardo/RHH/pr/sugardoodoodoodoodoodooaahhoneyhoney 
Implemented Honey's Sweet Scent functionality
 2022-11-01 20:09:30 -04:00
ghoulslash
c6cb54b54e
Merge pull request #2319 from AsparagusEduardo/RHH/pr/Lures 
Implemented Lures and Repel/Lure "use another" menu
 2022-11-01 20:05:15 -04:00
Eduardo Quezada D'Ottone
ebc9fc31d2
Merge pull request #2416 from DizzyEggg/fix_palace 
Fix battle palace bug
 2022-11-01 12:16:55 -03:00
DizzyEggg
51d8b57dcc restore deleted line 2022-10-31 13:19:10 +01:00
DizzyEggg
ea43b7732c Fix battle tent again 2022-10-31 13:16:48 +01:00
Eduardo Quezada D'Ottone
9d64c838cf
Merge pull request #2424 from LOuroboros/getItemId 
Actually removed ItemId_GetId
 2022-10-31 07:15:25 -03:00
Eduardo Quezada D'Ottone
dc4c5757f6
Merge pull request #2423 from LOuroboros/debugPCFlag 
Removed worthless DEBUG_FLAG_PC_FROM_DEBUG_MENU config
 2022-10-31 07:14:48 -03:00
LOuroboros
52dda5fc0f Actually removed ItemId_GetId 2022-10-30 22:52:22 -03:00
LOuroboros
5ebc996c51 Removed worthless DEBUG_FLAG_PC_FROM_DEBUG_MENU config 2022-10-30 22:03:14 -03:00
Eduardo Quezada
d02fc43703 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 2022-10-30 13:38:25 -03:00
GriffinR
d90132842a Update gitignore/spacing for new region map data 2022-10-30 12:22:41 -04:00
Eduardo Quezada
e4a439aa46 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 
# Conflicts:
#	src/data/bard_music/moves.h
#	src/data/bard_music/pokemon.h
 2022-10-30 12:30:38 -03:00
Eduardo Quezada
3172273c73 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/Lures 
# Conflicts:
#	src/pokemon.c
 2022-10-30 12:16:09 -03:00
GriffinR
c76beed989
Merge pull request #1807 from pret/porymap-5 
Update for Porymap 5.0.0
 2022-10-30 11:01:37 -04:00
GriffinR
01c71b4ce1 Fix more text and movements labeled as scripts 2022-10-30 03:27:28 -04:00
GriffinR
f439a2dee7 Fix EventScript_WroteSecretCodeLockOpened typo 2022-10-30 03:14:47 -04:00
LOuroboros
a74a8fa134 Updated CanTeleport 2022-10-29 16:13:40 -03:00
DizzyEggg
215604f5f7 fix battle palace bug 2022-10-27 20:44:43 +02:00
GriffinR
b035fc1f42
Merge pull request #1811 from AsparagusEduardo/pret/pr/BardSounds 
Cleaned up Bard Sounds
 2022-10-27 14:01:48 -04:00
Eduardo Quezada
85c0d2dac8 Review changes 2022-10-27 11:26:09 -03:00
Eduardo Quezada
aedaf3f45f Reordered struct to reduce padding 2022-10-27 10:29:41 -03:00
Eduardo Quezada
a3d84b0cc8 Merge remote-tracking branch 'RHH_origin/wip-2.0.0' into RHH/pr/breaking/speciesReorder 
# Conflicts:
#	src/data/pokemon/level_up_learnsets.h
 2022-10-27 09:21:30 -03:00
BuffelSaft
224ca256ce Requested clean up 
Rename constants, remove white space, improve B_BEAT_UP description.

* Rename B_BEAT_UP_DMG to B_BEAT_UP
* Shorten B_PARENTAL_BOND_DAMAGE to B_PARENTAL_BOND_DMG
* Remove trailing whitespace
* Replace boolean 1 with TRUE in MOVEEND_MULTIHIT_MOVE
 2022-10-27 22:25:33 +13:00
Eduardo Quezada D'Ottone
93dd8786ee
Merge pull request #2413 from kaisermg5/fix_tmhm_lock 
Fix lock when teaching a TM/HM after learning a move by level up.
 2022-10-26 22:27:19 -03:00
Eduardo Quezada
8fc6cf7a14 Macros 2022-10-26 22:17:00 -03:00
Eduardo Quezada
ffdb18cfdd Ordered mon graphics in include/graphics.h 2022-10-26 12:52:55 -03:00
Eduardo Quezada
5b2a728f77 Ordered Gen 8 mon graphics in src/data/graphics/pokemon.h 2022-10-26 12:30:04 -03:00
Eduardo Quezada
d3d24717b0 Ordered Gen 7 mon graphics in src/data/graphics/pokemon.h 2022-10-26 08:13:33 -03:00
BuffelSaft
3327758cdb Move B_BEAT_UP_DMG to other move settings 
This is more of a mechanical change like gen 8's change to Teleport, so it should go in the same block of settings.
 2022-10-26 23:29:09 +13:00
Eduardo Quezada
072c50c5b4 Fixed cry order 2022-10-25 21:52:37 -03:00
Eduardo Quezada
a424f3f9d9 Ordered Gen 6 mon graphics in src/data/graphics/pokemon.h 2022-10-25 20:53:18 -03:00
Eduardo Quezada
4ee7c374ff Ordered Gen 5 mon graphics in src/data/graphics/pokemon.h 2022-10-25 18:57:45 -03:00
kaisermg5
2cd0a0f862 Fix lock when teaching a TM/HM after learning a move by level up. 2022-10-25 18:48:06 -03:00
Eduardo Quezada
14ef537b73 Ordered Gen 4 mon graphics in src/data/graphics/pokemon.h 2022-10-25 18:26:23 -03:00
Eduardo Quezada
1e96fef90c Ordered Gen 3 mon graphics in src/data/graphics/pokemon.h 2022-10-25 17:47:03 -03:00
Eduardo Quezada
eed8e19529 Removed extra Toxtricity and Alcremie Gigantamax forms 2022-10-25 16:51:12 -03:00
Eduardo Quezada
1d2e15e005 Fixed compile 2022-10-25 16:50:48 -03:00
Eduardo Quezada
54291c3564 Cleanup 2022-10-25 16:29:00 -03:00
Eduardo Quezada
db999624ba Added animation delay + enemy elevation fields 2022-10-25 16:28:51 -03:00
Eduardo Quezada
ecd34a351b Ordered Gen 1-3 mon to vanilla order 2022-10-25 16:28:18 -03:00
Eduardo Quezada
03a967c4b7 Ordered Gen 2 mon graphics in src/data/graphics/pokemon.h 2022-10-25 16:00:59 -03:00
Eduardo Quezada
8462176667 Tentative version for base stat changes 2022-10-25 14:45:42 -03:00
Eduardo Quezada
85ce30b1d6 Created macros for Bard Sounds 2022-10-25 14:33:02 -03:00
Eduardo Quezada
77ce81888b Removed the double question mark 2022-10-24 15:55:13 -03:00
Eduardo Quezada
1e4a2c1eb4 Fixed compile when disabling P_GEN_X_POKEMON 2022-10-24 14:12:54 -03:00
Eduardo Quezada
1f6f6781ff Fix compile 2022-10-24 12:33:13 -03:00
GriffinR
cc182bf05e Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
Eduardo Quezada
dc8dbc3910 Ordered Gen 1 mon graphics in src/data/graphics/pokemon.h 2022-10-24 09:33:36 -03:00
BuffelSaft
d9cc98a4fe Suggested changes 
- Various style fixes
- Add BATTLE_ALIVE_EXCEPT_ATTACKER case to CountAliveMonsInBattle
 2022-10-24 22:19:35 +13:00
BuffelSaft
7bca475d77 Add Misty Explosion to Parental Bond ban list 
Probably not needed, but just in case!
 2022-10-23 21:48:20 +13:00