ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,288 Commits 1 Branch 0 Tags 235 MiB
35d7201935
Commit Graph

13288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eduardo Quezada
837e2fb684 Merge branch 'RHH/master' into RHH/pr/version/1.5.0 
# Conflicts:
#	data/battle_scripts_1.s
#	data/scripts/debug.inc
#	src/battle_util.c
#	test/ability_contrary.c
 2023-05-30 14:43:20 -04:00
Alex
5a384f9090 Fixes Triple Kick effect and Z move damage calc 
minor correction to the z-move fix

Add comment to EFFECT_TRIPLE_KICK
 2023-05-29 15:28:40 +02:00
GriffinR
5100eef017
Merge pull request #1890 from GriffinRichards/pal-macro 
Add some missing palette macro use
 2023-05-28 18:28:50 -04:00
ghoulslash
4cef99101b
restore items in wild battles (#3031) 2023-05-28 08:52:58 -04:00
ghoulslash
c38b51c570
Fixed Throat Spray's description (#3027) 2023-05-28 08:52:32 -04:00
ghoulslash
3ce5694742
Fixes Speed Boost animation (#3033) 2023-05-28 08:52:04 -04:00
Alex
112636b8f3 Fix Speed Boost animation 2023-05-28 11:54:43 +02:00
Alex
7edd1a45a4 restore items in wild battles 2023-05-28 11:31:22 +02:00
GriffinR
890d00471a
Merge pull request #1886 from GriffinRichards/1bpp 
Index footprint images, convert Spinda spots to .png files
 2023-05-27 21:58:45 -04:00
ghoulslash
a929ae8b48
Replace launchtemplate and launchtask in battle anims (#2640) 
* replace launchtemplate with createsprite using fix_launchtemplate.py

* tidy up script

* fix comment handing in fix_launchtemplate.py

* fix double comma after sprite template

* remove py script

* convert launchtask -> createvisualtask

* fix launchtask->createvisualtask issue

* fix ANIM_PAL ORs

* remove launchtemplate, launchtask macros

* fix pal macros in z moves

* fix bloom doom

* add F_PAL_ALL_BUT_DEF

* remove all ANIM_PAL_ usages

* devestating drake fix

* convert launchsoundtask and setblends

* Reworked CFRU macro PR

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2023-05-27 17:32:53 -04:00
Eduardo Quezada D'Ottone
d0e6ea7612
Optimized battle gender checks (#3020) 
* Optimized battle gender checks

* Apply suggestions from code review

Co-authored-by: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com>

---------

Co-authored-by: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com>
 2023-05-27 17:23:02 -04:00
Eduardo Quezada D'Ottone
c3527dc01e
Fixed Throat Spray's description 2023-05-26 09:24:23 -04:00
Eduardo Quezada
05895c5308 Fixed Frostbite icon appearing in AI Pary menu for mon without ailment 2023-05-25 19:02:13 -07:00
GriffinR
14f7e49099 Add some missing palette macro use 2023-05-25 15:09:16 -04:00
Eduardo Quezada
de2d86408f Fixed Mimikyu's Disguise not breaking 2023-05-24 13:20:22 -07:00
Eduardo Quezada D'Ottone
84d9cd0396
Fixed compile issue when disabling overworld debug menu (#3024) 2023-05-24 08:24:44 -04:00
Eduardo Quezada D'Ottone
b972199141
Battle Item Refactor Fixes (#3022) 2023-05-23 21:32:57 -04:00
Eduardo Quezada D'Ottone
5061927cfa
Fixed Forecast and Flower Gift (#2978) 2023-05-23 19:36:35 -04:00
AgustinGDLV
5a8715e608 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into castform_fix 2023-05-23 16:10:44 -07:00
AgustinGDLV
6a92caa9fb removed old B_WEATHER_FORMS use, tests now have assumptions for config 2023-05-23 16:10:26 -07:00
AgustinGDLV
bb10b0d1b0 fixed GetBattlerSide, removed debug script 2023-05-23 15:50:51 -07:00
AgustinGDLV
a9a32651ac fixed player not being able to cancel partner action after item 2023-05-23 15:41:25 -07:00
AgustinGDLV
34382fcece fixed revive in 1v2 battles 2023-05-23 14:19:24 -07:00
AgustinGDLV
d4c7e5e559 changed B_WEATHER_FORM preproc to affect tables instead of function 2023-05-23 14:03:38 -07:00
ghoulslash
0ac203f2e5
Use AI_PARTY->mons in SetBattlerData (#2986) 2023-05-22 12:05:39 -04:00
Alex
2abf1c56f9 Use AI_PARTY->mons in SetBattlerData 
Use gBattlerPartyIndexes
 2023-05-22 13:49:15 +02:00
Eduardo Quezada D'Ottone
f979013b7e
Disable Gen8+ Obedience Mechanics by default (#2980) 2023-05-21 16:57:43 -04:00
SonikkuA-DatH
12022fa0f6
Gen 4-6 Pokemon Back anims (#2954) 2023-05-20 18:56:23 -04:00
Alex
109b4c4f6c
Small clean up: EndTurnTerrain, BattleScript_GrassyTerrainHeals (#3018) 
remove leftover
 2023-05-20 15:58:55 -04:00
ghoulslash
17b445ab07
Updated DebugAction_Util_CheckSaveBlock (#3017) 2023-05-20 15:29:06 -04:00
LOuroboros
580a09e367 Updated DebugAction_Util_CheckSaveBlock 2023-05-20 15:40:36 -03:00
Alex
a0881b8e8d
Terrains freeze the game after player mon faints (#3016) 2023-05-20 11:10:45 -04:00
psf
9506b205e6
Changed 999999 in MaxMoney to MAX_MONEY constant (#3015) 2023-05-20 08:25:59 -04:00
LOuroboros
29d2d4202e
Evolution updates (#3009) 
* Add Hisuian Sneasel's evolution to gEvolutionTable

* Updates
-Added EVO_ITEM_NIGHT, (it's like EVO_ITEM_DAY but nighttime specific)
-Added EVO_ITEM_HOLD (it's like the day based variations, but day agnostic)
-Turned the trade evo items into regular evolution items
-Ditched the config for the Razor Claw by request
-Updated every entry in gEvolutionTable for species that could only evolve via EVO_TRADE_ITEM to LA's standard

* Review corrections (extrapolations)

* Post Cherrypick corrections

* Corrected the description of EVO_ITEM_NIGHT

* Added a config for the new items' field-evolving functionality
 2023-05-18 06:39:14 -04:00
ghoulslash
487415e56b
Move direct statStage boosts to use statbuffchange (#3000) 
* fix double counting stat boosts for download, moxie beast boost etc

* speed boost use statbuffchange

* BattleScript_MoveStatDrain use statbuffchange

* statbuffchange for rage

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-05-17 11:22:23 -04:00
Martin Griffin
7a9756953f
Fixed testrunner UB with RandomElement. (#3013) 2023-05-17 07:55:54 +01:00
AgustinGDLV
d22efc9a68 fixed UB with unassigned variable 2023-05-16 23:14:54 -07:00
AgustinGDLV
7b08713707 changed B_WEATHER_FORM_SUPPRESS config to preproc 2023-05-16 20:34:16 -07:00
AgustinGDLV
b269cc6906 changed gastro acid check to properly use GetBattlerAbility 2023-05-16 16:37:18 -07:00
AgustinGDLV
785b100693 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into castform_fix 2023-05-16 16:29:38 -07:00
AgustinGDLV
0c182345bf reworked weather form reversion + added more tests 2023-05-16 16:24:25 -07:00
AgustinGDLV
37874fe5c1
fixed revival blessing failure still showing anim (#3010) 2023-05-16 19:21:05 -04:00
LOuroboros
7c8332e7a1
Fixed typo in include/config/battle.h (#3006) 2023-05-15 16:46:55 -03:00
LOuroboros
49a9210e9d
Fixed typo in include/config/battle.h 2023-05-15 16:45:30 -03:00
Eduardo Quezada D'Ottone
15b122bc17
convert a few various to callnatives (#2465) 2023-05-15 15:34:31 -04:00
ghoulslash
eaa44cc8b5 fix syntax 2023-05-15 15:20:44 -04:00
ghoulslash
6458cab70a use NATIVE_ARGS in various to callnative conversions 2023-05-15 15:07:09 -04:00
ghoulslash
60710f823e merge w upcoming 2023-05-15 13:13:28 -04:00
Eduardo Quezada D'Ottone
c42552a107
Fix Mega Evolution issues related to battlers and turn order (#2810) 2023-05-14 22:43:21 -04:00
Eduardo Quezada D'Ottone
2aca82300c
Merge branch 'upcoming' into mega_evo_issues 2023-05-14 22:33:01 -04:00