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

13007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Griffin
3e6f499517 TearDownBattle function 2023-06-22 15:08:15 +01:00
voloved
c911d4bf57
Made window's starting location track with ball; made window show if it's showing on startup (#3042) 2023-06-21 13:19:08 -04:00
Pawkkie
62ae3b1df1
Fix bug due to variable overflow when AI chooses new Pokemon to send out (#3068) 2023-06-21 12:59:30 -04:00
Alex
43821d606f
Fix Baton Pass for when Ace mon is the last alive (#3067) 
* Updated preproc config for Diamond Storm

* Fix baton pass bug with IsAceMon

remove not needed check

---------

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2023-06-21 11:11:06 -04:00
Martin Griffin
97bc8e4689
At most one PASSES_RANDOMLY (#3065) 2023-06-20 14:46:02 -04:00
Eduardo Quezada D'Ottone
186d8763ea
Fixed selling TMs set as reusable (#3049) 2023-06-19 16:19:29 -04:00
Eduardo Quezada D'Ottone
b01f7927cf
Fixed Sylveon's evolution method (#3048) 2023-06-19 16:17:51 -04:00
Eduardo Quezada D'Ottone
5128520291
Fixes Hisuian mon not evolving + Fixed regional mon not breeding correctly (#3047) 2023-06-19 16:16:55 -04:00
Eduardo Quezada D'Ottone
7505b323ab
Test Runner support for illegal abilities (#3045) 2023-06-17 17:23:32 -04:00
GriffinR
fce97dc397
Merge pull request #1891 from ipatix/makefilefix 
Fix compilation for modern under certain circumstances
 2023-06-08 12:20:42 -04:00
Michael Panzlaff
2651401e6b Fix PATH for modern target for non dkp systems 
When prepending something to PATH, we should use PATH=/foo/bar:$PATH
and not PATH=/foo/bar:PATH. Because your shell won't certainly find
something under the literal name PATH.

If one is not using devkitarm, TOOLCHAIN will resolve to an empty
string. If TOOLCHAIN is an empty string the only search path for the
modern gcc will be /bin which may work on some installations but is
probably not what was originally intended with this line. So let's just
search the standard search path if nothing can be found under $(TOOLCHAIN).

Either way, PATH is already set up previously, so we can make sure
MODERNCC is invoked properly by calling MODERNCC with PATH=$(PATH).
 2023-06-08 12:42:17 +02:00
Eduardo Quezada
49ffd4a2e9 Easy Chat always shows words in uppercase 2023-06-06 10:55:42 -04:00
GriffinR
7ecdb3046a
Merge pull request #1894 from mrgriffin/patch-2 
Fix EWRAM_DATA wildcards
 2023-06-06 09:32:11 -04:00
Eduardo Quezada
601a96f34a Fixes Hisuian mon not evolving + fixed regional mon not breeding correctly 2023-06-06 08:01:29 -04:00
Martin Griffin
62f592f4df
Fix EWRAM_DATA wildcards 
`ewram_data` not `.ewram_data`, doh!
 2023-06-06 09:02:52 +01:00
GriffinR
9c4a59f865 Fix swapped Dodrio Berry Picking palettes 2023-06-05 19:53:59 -04:00
GriffinR
86459acb69 Fix sTVPokemonAnslerTextGroup typo 2023-06-05 13:13:35 -04:00
GriffinR
859eb4dab6
Merge pull request #1893 from Bassoonian/fixfishinggamestat 
Rename GAME_STAT_FISHING_CAPTURES to GAME_STAT_FISHING_ENCOUNTERS
 2023-06-05 08:45:05 -04:00
Bassoonian
7bf34448e4 Rename GAME_STAT_FISHING_CAPTURES to GAME_STAT_FISHING_ENCOUNTERS 2023-06-05 14:15:07 +02:00
Eduardo Quezada
e43567f0a1 Fixed releases order 2023-06-03 16:49:49 -04:00
Eduardo Quezada
ee2f9da72a Fixed issue template titles 2023-06-03 16:40:51 -04:00
Eduardo Quezada D'Ottone
c17d6f4bc7
Update 01_battle_engine_bugs.yaml 2023-06-03 16:39:56 -04:00
Eduardo Quezada
b389c34c88 Further templates 2023-06-03 16:36:20 -04:00
Eduardo Quezada D'Ottone
91c6c3ea95
Create battle_ai_issues.yaml 2023-06-03 15:11:47 -04:00
Eduardo Quezada D'Ottone
f8408a42b3
Update battle_engine_bugs.yaml 2023-06-03 15:07:43 -04:00
AgustinGDLV
1ea23daefe fixed bug with zeroing out abilities on switch-in 2023-06-03 11:58:57 -07:00
AgustinGDLV
d795256142 remove debug 2023-06-03 11:56:01 -07:00
Eduardo Quezada D'Ottone
d7130fbb0f
Create battle_engine_bugs.yaml 2023-06-03 14:50:14 -04:00
AgustinGDLV
53fa7e524c allow for illegal abilities within tests 2023-06-03 11:32:54 -07:00
Eduardo Quezada D'Ottone
1dbf9560a5
Version 1.5.0 (#3040) 2023-06-02 14:19:01 -04:00
Eduardo Quezada D'Ottone
a1a49cef8f
One point five baby (pret merge 2023/06/02) (#3044) 2023-06-02 12:34:21 -04:00
Eduardo Quezada
43da48f992 CpuFastFill for initializing, thanks SBird 2023-06-02 12:22:05 -04:00
Eduardo Quezada
271bca6a3d Fixed Staraptor using Staravia's footprint 2023-06-02 11:56:36 -04:00
Eduardo Quezada
5bf040f38d Missing pret improvement that was causing unmatching 2023-06-02 11:56:12 -04:00
Eduardo Quezada
4c57b84cd9 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230602 
# Conflicts:
#	graphics/pokemon/mawile/footprint.png
#	src/battle_gfx_sfx_util.c
#	src/fldeff_sweetscent.c
#	src/pokedex.c
 2023-06-02 11:45:28 -04:00
GriffinR
23b57050c2 Fix some compressed tilemaps 2023-06-01 15:31:12 -04:00
Martin Griffin
412f6f5352
Separate build directory for tests and TESTING define (#3002) 
* Separate build directory for tests and TESTING define

* fixup! Separate build directory for tests and TESTING define

* fixup! Separate build directory for tests and TESTING define

* fixup! Separate build directory for tests and TESTING define
 2023-05-31 09:38:37 -04:00
BuffelSaft
2e08277a4e
Fixes Triple Kick effect and Z move damage calc (#2983) 2023-05-31 22:25:16 +12:00
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