ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,028 Commits 1 Branch 0 Tags 235 MiB
13dedfb511
Commit Graph

9187 Commits

Author SHA1 Message Date
Martin Griffin
c4057cb0e0
Fix Metronome's/Mirror Move's called move to take powder moves / multi hit moves into account (#3135) 2023-07-16 06:41:18 +01:00
DizzyEggg
2a249654e7 fix mirror move/metronome powder/multi hit moves & tests 2023-07-15 14:00:55 +02:00
Martin Griffin
96159d189f
Clear fixedPopup when gTestRunnerHeadless (#3133) 
Previously fixedPopup = FALSE was unconditional, but it was erroneously
changed in f1b9872bf0.
 2023-07-14 11:26:19 -04:00
DizzyEggg
98ae1beaec
Fix ability pop-up properly updating text (#3107) 2023-07-06 15:10:28 -04:00
DizzyEggg
cf9b933a5f
Fix Z-Moves softlocking when the z move effect was not used (#3108) 2023-07-06 15:08:28 -04:00
Eduardo Quezada
f21953f254 Merge remote-tracking branch 'pret/master' into RHH/master 2023-07-06 13:06:31 -04:00
DizzyEggg
9a09f1e3b9 Fix Roullout Fury Cutter AI power calc 2023-07-06 13:41:16 +02:00
DizzyEggg
34aff01d3a
Fix graphical/exp bugs with 2 vs 1 trainer battles (#3105) 2023-07-05 14:52:24 -04:00
gruxor
68ce97cd90
Fixed shadows in viewer (#3094) 
* Fixed shadows in viewer + minor arg signature fix

* Unfixed castform functions, upcoming removal
 2023-07-02 19:41:47 -04:00
ghoulslash
a0ad8c817c
Change Mega evo sprites from 3per battler to 1 per battler (#3087) 2023-06-30 09:05:07 -04:00
DizzyEggg
1e2a613bd2
fix debug menu not removing task (#3088) 2023-06-29 14:11:02 -04:00
ghoulslash
e21fcda54c
Fix Light Of Ruin freeze and potentially other move anims (#3084) 2023-06-29 11:58:53 -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
a4a519b69f Change Mega evo sprites from 3per battler to 1 per battler 2023-06-28 10:38:38 +02:00
DizzyEggg
09013ee2db Fix createsprite battle anim cmd not checking MAX_SPRITES 2023-06-27 22:39:43 +02:00
ghoulslash
c7e8edf19b
Easy Chat always shows words in uppercase (#3050) 2023-06-24 13:28:13 -04: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
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
49ffd4a2e9 Easy Chat always shows words in uppercase 2023-06-06 10:55:42 -04:00
Eduardo Quezada
601a96f34a Fixes Hisuian mon not evolving + fixed regional mon not breeding correctly 2023-06-06 08:01:29 -04: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
Bassoonian
7bf34448e4 Rename GAME_STAT_FISHING_CAPTURES to GAME_STAT_FISHING_ENCOUNTERS 2023-06-05 14:15:07 +02:00
AgustinGDLV
1ea23daefe fixed bug with zeroing out abilities on switch-in 2023-06-03 11:58:57 -07:00
AgustinGDLV
53fa7e524c allow for illegal abilities within tests 2023-06-03 11:32:54 -07: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
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
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
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
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
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
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
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
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
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
2aca82300c
Merge branch 'upcoming' into mega_evo_issues 2023-05-14 22:33:01 -04:00
Eduardo Quezada D'Ottone
447739d005
Fix shiny animation not respecting Illusion mon target and Imposter revealing opponent ability (#2985) 2023-05-14 22:16:58 -04:00
Eclipse
76379661d0
Fixed mons mot disobeying with Gen8 mechanics disabled (#2990) 2023-05-14 22:09:45 -04:00
Frank DeBlasio
2420134e45
Updated Ability Patch for Gen 9 functionality (#2989) 2023-05-14 19:30:30 -04:00
Alex
f6f0e5fa33
Fix for wrong mon position for scripted wild doubles (#2996) 2023-05-14 19:03:14 -04:00
Eduardo Quezada D'Ottone
15adbc8368
Pret merge Friday (#2998) 2023-05-14 18:38:33 -04:00
Frank DeBlasio
d09072fd0d
Updated Esper Wing's accuracy if B_UPDATED_MOVE_DATA is Gen9 (#3004) 2023-05-14 12:55:08 -04:00
Bassoonian
292d460810 Fix ability select in debug givemon 2023-05-12 14:02:14 +02:00
Bassoonian
c05404e772 Merge branch 'master' of https://github.com/pret/pokeemerald into rhhpretmerge 2023-05-12 13:48:52 +02:00
GriffinR
6fdf75bd8c Support plain pixel conversion, convert spinda spots to .png 2023-05-11 13:41:38 -04:00
Salem
8fc4aa9dcd
Remove duplicate CanBePoisoned condition (#2988) 2023-05-10 18:16:57 -04:00
GriffinR
8c537ccd72 Colorize bag select button 2023-05-10 00:33:43 -04:00
GriffinR
8b37b4292a Document DrawFootprint 2023-05-09 22:43:25 -04:00
Ultimate Bob
64c2eb39c0 Ignore Illusion if the pokemon is the last slot in the party. 2023-05-09 02:33:12 +10:00
Ultimate Bob
ebc8edd5a6 Fix shiny animation not respecting illusion mon. 2023-05-09 00:58:38 +10:00
Salem
fe5e59c910
Merge branch 'upcoming' into RHH/content/gen9SnowWeather 2023-05-07 17:27:58 +02:00
Martin Griffin
9cd13cc520 Fix USE_ITEM explicit targets 2023-05-07 07:50:41 +01:00
Eduardo Quezada D'Ottone
3cee3b18c8
Fix healthbox reappearing from B_ANIM_SWITCH_OUT_OPPONENT_MON (#2849) 2023-05-06 21:25:04 -04:00
Eduardo Quezada D'Ottone
c530eb2445
Add mirror herb (#2873) 2023-05-06 21:20:37 -04:00
Eduardo Quezada D'Ottone
84aed50c5b
Manually port daycare expansion to modern standards (#2963) 2023-05-06 21:03:05 -04:00
Eduardo Quezada D'Ottone
42445512ad
Battle Item Tests + critical fixes + new test macro (#2940) 2023-05-06 20:43:32 -04:00
CallmeEchoo
488cc410a0 update ability descriptions 2023-05-05 10:24:12 +02:00
GriffinR
dd65eddbdd
Merge pull request #1883 from GriffinRichards/doc-mod 
Add some missing ARRAY_COUNT, make TV_SHOWS_COUNT depend on NUM_NORMAL_TVSHOW_SLOTS
 2023-05-05 02:38:30 -04:00
GriffinR
f91abdf765
Merge pull request #1882 from GriffinRichards/ambient 
Add time ranges to UpdateAmbientCry
 2023-05-05 02:16:57 -04:00
AgustinGDLV
a5f28afe42 fixed Forecast and Flower Gift 2023-05-04 17:04:54 -07:00
CallmeEchoo
eb5b81684c refactored snow into damaging weather 
this is necessary for ice body to properly work.
doesnt actually do any damage
 2023-05-05 01:38:12 +02:00
CallmeEchoo
74f074f5f3 ai scoring for snow and hail relation 
we generally dont want to ecourage to use snow when hail is up and vice versa to avoid looping between the two weathers if score adds up. so we return false in the ShouldSetX functions if either weather is up
We also reduce score by a little as further disincentive to loop and since both effect are so similar that switching between them is usually not a good idea
 2023-05-03 16:26:41 +02:00
Bassoonian
1068ec5d9f Fix Plus/Minus to only work with special moves 2023-05-03 13:03:40 +02:00
Salem
a877266400
Merge branch 'upcoming' into RHH/content/gen9SnowWeather 2023-05-02 21:19:01 +02:00
CallmeEchoo
c5a73f59a4 ad suggested changes 2023-05-02 21:17:14 +02:00