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

4471 Commits

Author SHA1 Message Date
Eduardo Quezada
2c4a9b754d Merge branch 'RHH/master' into RHH/upcoming 2023-06-30 16:14:57 -04:00
ghoulslash
304fc4c5b5
Fix disobedience wrong move effect issue (#3089) 2023-06-30 09:03:18 -04:00
Eduardo Quezada D'Ottone
81e59ace25
Cleaned up remaining Castform hack stuff (#3063) 
* Removed gCastformFrontSpriteCoords

* Removed sCastformElevations and IsCastformForm

* Removed sCastformBackSpriteYCoords and castformPalette in BattleStruct

* Scrubbed unused BS commands

* Removed B_ANIM_CASTFORM_CHANGE and BattleForm constants

* Removed redundant function in Pokémon Debug menu

* Removed handling in animation scripts

* Removed gBattleMonForms

* Reduced MAX_MON_PIC_FRAMES to 2

* Removed Castform/Cherrim makefile stuff

* Fixed weather form change tests not checking species.

* Fixed Castform palettes after Lunos' PR
 2023-06-30 09:58:07 +02:00
Alex
ea7e6265dd
Small Grassy Glide anim bug (#3092) 2023-06-29 14:07:46 -04:00
Alex
20099274d8
Fix Clear Amulet visual bug + Tests (#3074) 
* Fix Clear Amulet visual bug + Tests

TODO Tests, additional tests + Triple Kick pp bug

* Wonder Guard message, switch instead of if, misalignments
 2023-06-28 12:26:03 -04:00
DizzyEggg
f9058a8544 Fix disobedience wrong move effect issue 2023-06-28 12:47:20 +02:00
Ariel A
4a3f6ba2fe Merge branch 'lighting' into lighting-expanded-id 2023-06-28 00:11:59 -04:00
Ariel A
c1953e5d4b Improved OutOfCenterPartyHeal interaction with followers. 2023-06-27 23:40:50 -04:00
PSF
b2901c51b0 Added bugfix for SaveBeforeLinkMultisChallenge to remove extra incrementgamestat 2023-06-27 15:34:31 -07:00
ghoulslash
7371a9e401
Add many gen 8 move animations (#2861) 
* port many gen8 and 9 move anims from cfru

* fix thunder cage, shell smash, shelter anims. update anim credits

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-06-21 13:19:54 -04:00
LOuroboros
2bf88502a7 More corrections 2023-06-19 04:18:53 -03:00
Eduardo Quezada
bf814e11cd Cleanup 
- Proper whitespace
- Bracket pret style
- Simplified RemoveObjectEventInternal
- SImplified GetMonInfo
- Made IsFollowerVisible easier to read
 2023-06-18 01:19:46 -04:00
Eduardo Quezada
4bbe3278d6 Cleanup pt1 
- Moved Tracks to the end of field effect scripts
- Restored whitespace in scripts to minimize conflicts
- Restored data/maps/map_groups.json
- Proper tab uses in scripts
- Allow SHADOW_SIZE_XL to be used
 2023-06-17 23:34:01 -04:00
Eduardo Quezada
33012d841a Cleaning up follower Object Event IDs + Reverted OW Regis 
TODO: allow OW mon to have their frames play more than once
 2023-06-17 23:05:29 -04:00
Eduardo Quezada
116f61f055 Removed unneeded calls to bufferspeciesname 2023-06-17 19:27:33 -04:00
Eduardo Quezada
341ce6fd95 Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3 
# Conflicts:
#	.github/workflows/build.yml
#	README.md
#	gflib/sprite.c
#	graphics/pokemon/banette/anim_front.png
#	graphics/pokemon/banette/normal.pal
#	graphics/pokemon/sentret/normal.pal
#	graphics/pokemon/togetic/anim_front.png
#	graphics/pokemon/togetic/normal.pal
#	include/battle_script_commands.h
#	include/data.h
#	ld_script.txt
#	src/battle_controller_player.c
#	src/bike.c
#	src/event_object_movement.c
 2023-06-16 21:25:16 -04:00
LOuroboros
9896f20eb8 Applied fixes and corrections (Jun 2023) 2023-06-15 09:22:26 -03:00
LOuroboros
81bb299e7f Updated Axe Kick's battle script 
I have no idea why is this working now when I'm pretty sure it didn't work before, but I consider this a win all the same.
 2023-06-13 06:50:48 -03:00
LOuroboros
313f522622 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch2 2023-06-13 05:44:37 -03:00
Ariel A
91794286b5 Improved light color blending logic. 
Added auxiliary .pla files to gbafx, to support setting color high bits.
Updated light palettes to new system.
 2023-06-08 21:07:07 -04:00
AgustinGDLV
f91cbe9a36 updated anim macros 2023-05-29 10:23:58 -07:00
AgustinGDLV
3d4789c492 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-05-28 11:10:50 -07:00
Alex
112636b8f3 Fix Speed Boost animation 2023-05-28 11:54:43 +02: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
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
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
bb10b0d1b0 fixed GetBattlerSide, removed debug script 2023-05-23 15:50:51 -07:00
AgustinGDLV
34382fcece fixed revive in 1v2 battles 2023-05-23 14:19:24 -07:00
Alex
109b4c4f6c
Small clean up: EndTurnTerrain, BattleScript_GrassyTerrainHeals (#3018) 
remove leftover
 2023-05-20 15:58:55 -04:00
LOuroboros
580a09e367 Updated DebugAction_Util_CheckSaveBlock 2023-05-20 15:40:36 -03: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
AgustinGDLV
d133564e21 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-05-16 21:57:06 -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
Ariel A
540c536342 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-05-15 19:15:38 -04:00
Ariel A
5d392244be Merge branch 'followers' into followers-expanded-id 2023-05-15 19:08:45 -04:00
Ariel A
996f43120d Merge branch 'followers' into lighting 2023-05-15 18:50:55 -04:00
Ariel A
d12efe8cd7 Merge branch 'master' into followers 2023-05-15 18:37:38 -04:00
Eduardo Quezada D'Ottone
2aca82300c
Merge branch 'upcoming' into mega_evo_issues 2023-05-14 22:33:01 -04:00
AgustinGDLV
dceefacb95 moved tryfaintmon back, no bugs? 2023-05-11 22:35:08 -07:00
AgustinGDLV
3b6389ec21 updated tests 2023-05-11 22:13:43 -07:00
AgustinGDLV
aec51b5b04 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-05-11 20:02:06 -07:00
ghoulslash
5657f8369e merge w pret 2023-05-11 10:44:18 -04:00
Ultimate Bob
f985eefaa1 Show Imposter abilty in popup instead of opponent's ability. 2023-05-09 01:40:28 +10:00
Salem
fe5e59c910
Merge branch 'upcoming' into RHH/content/gen9SnowWeather 2023-05-07 17:27:58 +02:00
Eduardo Quezada D'Ottone
c530eb2445
Add mirror herb (#2873) 2023-05-06 21:20:37 -04:00
Eduardo Quezada D'Ottone
42445512ad
Battle Item Tests + critical fixes + new test macro (#2940) 2023-05-06 20:43:32 -04:00
AgustinGDLV
a5f28afe42 fixed Forecast and Flower Gift 2023-05-04 17:04:54 -07:00