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

1730 commits

Author SHA1 Message Date
Bassoonian
e601719c91 Add new PLA form change items 2023-03-24 00:04:08 +01:00
Bassoonian
f15fb1540f Allow Kubfu evolution with Scroll items 2023-03-23 23:16:08 +01:00
Bassoonian
80d0efae0c Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhhupcomingdev 2023-03-23 23:04:23 +01:00
Eduardo Quezada D'Ottone
2658fe32c2
Removed ITEM_HAS_EFFECT (#2840) 2023-03-23 10:02:32 +01:00
Eduardo Quezada
47b4e6095d Undo Timburr and Stunfisk friendships, as they don't change 2023-03-19 22:00:18 -03: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
Bassoonian
d480fc90f2 Fix Scrolls type 2023-03-19 21:21:43 +01:00
Bassoonian
372c6a1afa Add new item variables and defines 2023-03-19 20:55:39 +01:00
LOuroboros
f4e8389779 Added Psyblade and Hydro Steam 2023-03-17 09:25:39 -03:00
Eduardo Quezada
0a9ab96390 Added STANDARD_FRIENDSHIP constant to allow easier custom adjustments 2023-03-14 08:54:49 -03:00
Alex
aa29eced1f
Merge branch 'rh-hideout:upcoming' into PLA_missing_sprites 2023-03-13 17:46:53 +01:00
Eduardo Quezada D'Ottone
a8c9309458
Fixed Wring Out's power (#2824) 
Fixes #2823
 2023-03-13 09:07:29 +01:00
Eduardo Quezada D'Ottone
13ca2271e2
Add meltan and melmetal teachable moves (#2732) 2023-03-07 10:25:05 -03:00
Eduardo Quezada
9917f5cc8b Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303 
# Conflicts:
#	Makefile
#	include/constants/pokemon.h
#	include/pokemon.h
#	make_tools.mk
#	src/battle_ai_script_commands.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/party_menu.c
#	src/pokemon.c
#	src/trade.c
#	src/trainer_pokemon_sprites.c
 2023-03-03 11:00:50 -03:00
Alex
58b408cbbf some new sprites 2023-03-02 17:04:24 +01:00
ghoulslash
ad6495980f
Partially fix dex size inconsistencies (#2799) 2023-03-02 09:35:32 -05:00
Alex
487e26e700 fix enamorus_t + samuroutt sprite + conflicts 2023-03-02 11:05:59 +01:00
DizzyEggg
12db276a71 fix endif 2023-02-28 10:36:11 +01:00
DizzyEggg
1fb2560f7b newline 2023-02-28 10:14:16 +01:00
DizzyEggg
9d1e31ab39 accidentally removed ifs 2023-02-28 10:12:50 +01:00
DizzyEggg
cc2778b8bb some touches 2023-02-28 10:08:31 +01:00
Eduardo Quezada
90021f3be6 Removed zMovePower field in gBattleMoves in favor of a function. 2023-02-27 23:49:43 -03:00
DizzyEggg
3159508603 fix dex size inaccuraccies 2023-02-27 23:08:54 +01:00
GriffinR
8d88a38561
Merge pull request #1854 from GriffinRichards/constants-num-frames 
Add MAX_MON_PIC_FRAMES, and trainer pic size constants
 2023-02-27 13:16:49 -05:00
Eduardo Quezada
41bf9ea63c Removed trailing whitespaces 2023-02-26 18:43:15 -03:00
BuffelSaft
deb3109c81
Use proper symbol name styles for Jangmo-o family (#2739) 2023-02-26 13:15:53 +13:00
Alex
7ea82820ec Consider nature power in AI_CalcDamage 2023-02-25 15:07:45 +01:00
Eduardo Quezada
31ab56bceb Fixed footprint symbol names. 2023-02-25 09:23:34 -03:00
Eduardo Quezada
ca81d7a0f9 Forgot about Jangmo-o 2023-02-24 21:58:09 -03:00
Eduardo Quezada
bbefee6bd4 Use proper symbol styles for Hakamo-O and Kommo-O 2023-02-24 15:22:58 -03:00
Alex
48391d8eff Basculegion female form 2023-02-24 08:46:34 +01:00
Alex
a870ec3c22 enamorus_t cry, basculegionf sprite, new typhlosion back sprite 2023-02-23 15:20:12 +01:00
DizzyEggg
3ff8c95c4e add meltan melmetal teachable moves 2023-02-23 10:53:55 +01:00
Alex
1c832768bb fix trainer party 2023-02-22 20:44:03 +01:00
Alex
1f694ae7ed missing pla sprites 2023-02-22 20:41:01 +01:00
DizzyEggg
e0b76e98ff
Add MOVE_SHELL_TRAP Effect (#2716) 
* implemented Shell Trap

Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com>
 2023-02-22 13:55:34 +00:00
LOuroboros
c33cc834bc
Updated Psyshield Bash's accuracy 2023-02-19 19:04:36 -03:00
ghoulslash
4b64433816
Add Battle Anim cmds for dynamic Task, Sprite creation + Misc. Anim Fixes (#2649) 
* add createvisualtaskontargets, createspriteontargets to fix electroweb, fiery wrath anims

* add missing semicolon

* add Cmd_createspriteontargets_onpos for heal block, fix heal block targeting

* remove duplicate func

* improve origin pulse anim

* fix IsDoubleBattle call

* venom drench acid uses average battler positions

* add GetSubpriorityForMoveAnim

* add GetBattleAnimMoveTargets for CreateSpriteOnTargets and Cmd_createvisualtaskontargets

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-02-19 11:48:12 +01:00
DizzyEggg
56c9564e7a
8th gen Howl's effect (#2700) 
* Howl gen8 effect
 2023-02-17 10:28:46 +00:00
Eduardo Quezada D'Ottone
625a7622e2
Merge pull request #2697 from AsparagusEduardo/RHH/sync/pret_20230214 
It's ya boi, pret merge! (pret merge 2023/02/16)
 2023-02-16 21:57:41 -03:00
DizzyEggg
94651e77a5 Fix Clang Scales target and effect 2023-02-15 22:18:18 +01:00
Eduardo Quezada
7ddebb6671 Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 
# Conflicts:
#	data/battle_ai_scripts.s
#	src/menu_specialized.c
#	src/mystery_gift_menu.c
 2023-02-15 14:18:00 -03:00
Eduardo Quezada
b62e5aa72e Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 
# Conflicts:
#	src/battle_main.c
#	src/field_specials.c
#	src/trade.c
 2023-02-15 14:11:03 -03:00
GriffinR
a322379feb
Merge branch 'master' into doc-windows 2023-02-15 10:04:48 -05:00
ghoulslash
908b509401
Fix Round's Base Power calc, Add Turn order effects (#2602) 
* fix round base power calc, add turn order change

* remove unused callnative cmd

* fix round turn order update

* fix moveTarget getting set incorrectly in HandleAction_UseMove. also redirection doesn't affect MOVE_TARGET_ALL_BATTLERS

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-02-14 16:49:50 +01:00
Jaizu
9f7267e48d Fix Giga Impact on contests. 2023-02-09 11:29:29 +01:00
GriffinR
c32fbf594a
Merge pull request #1851 from GriffinRichards/doc-fldspc 
Document remaining field_specials task data
 2023-02-08 22:34:57 -05:00
GriffinR
5496f0e6b0
Merge pull request #1850 from GriffinRichards/sync-trade 
Sync trade
 2023-02-03 19:05:00 -05:00
Jaizu
717ba22ea1
Make contest opponents an enum 
I'm sure that at least 2 people eventually might consider editing them, this makes it easier.
 2023-02-03 15:49:22 +01:00
GriffinR
3b15fd34cc Merge branch 'master' of https://github.com/pret/pokeemerald into constants-num-frames 2023-02-01 16:09:01 -05:00