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

13107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DizzyEggg
fc37345c29 Fix wrong color in stat move animation 2023-07-21 10:42:39 +02:00
Martin Griffin
b406a9c1bd RandomUniformExcept and RNG_METRONOME 2023-07-20 10:25:03 +01:00
Eduardo Quezada
47cea526ec Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	src/battle_util.c
 2023-07-19 23:22:07 -04:00
Eduardo Quezada
89f368db12 Fixed missing versions 2023-07-19 23:05:07 -04:00
Bassoonian
6d7d7f109e
Fix debug menu memory overflow (#3154) 2023-07-19 17:38:09 -04:00
GriffinR
56ec3b6461
Merge pull request #1900 from Bassoonian/priortiy 
Fix priortiy typos
 2023-07-19 11:44:10 -04:00
Bassoonian
7fa6ed8b05 Fix priortiy typos 2023-07-19 17:33:28 +02:00
Alex
6b5d1e7577
Adds some gen9 moves (#3147) 
* Adds some gen9 moves

* Fix Test + Tabs

* Collision Course boost changed to 1.3333
 2023-07-19 13:25:20 +02:00
DizzyEggg
34beb3d662 add tests for rattled 2023-07-19 10:59:36 +02:00
Eduardo Quezada D'Ottone
cf29c9eb69
Fixed enemy parties not reverting to their original form post-battle (#3150) 2023-07-19 08:46:57 +02:00
Eclipse
ca792d43cc
Gender differences sprites, final part (#3122) 
* The last survivors

* Tweaked Numel, Milotic and Relicanth
Updated their sprites according to their current depictions.

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-07-18 21:31:22 -04:00
luckytyphlosion
8ec0bff034
Update msys2 instructions 
Add pacman -Sy msys2-keyring
 2023-07-18 19:28:41 -04:00
CyanSMP64
219ac7830c
Update female Alakazam's front sprite design (#3149) 2023-07-18 12:56:15 -04:00
Eduardo Quezada D'Ottone
b08c8f85fc
Fixed Utility Umbrella damage calculations (#2835) 
* Fixed Utility Umbrella holders not receiving regular damage when being hurt by what would've been weakened rain/sun attacks

* Fixed reading move incorrectly

* Tests: Sun, Rain, Utility Umbrella and Hydro Steam

* [STASH] Skeli changes, needs to remake tests

* Fixed tests

* Removed redundant tests

* Removed unused variable

* Removed Primal Todo tests
 2023-07-18 09:22:05 +02:00
Eduardo Quezada D'Ottone
6fec0e4dd1
Ported TheXaman's latest changes to the Debug Menu (#2815) 
* Added option for generating incrementing pokemon in pc boxes

# Conflicts:
#	src/debug.c

* added submenu arrows, increased menu high to full screen

# Conflicts:
#	src/debug.c

* combined flags and vars into one submenu

# Conflicts:
#	src/debug.c

* added new window to flags/vars showing the current state and added submenu indicator

# Conflicts:
#	src/debug.c

* added alligned arrows for debug submenus

# Conflicts:
#	src/debug.c

* used {CLEAR_TO X} instead of manual spaces

# Conflicts:
#	src/debug.c

* renamed gDebugText to proper sDebugText

# Conflicts:
#	src/debug.c

* added Fill submenu, added fill function for PC items and all bag pockets  @LOuroboros

# Conflicts:
#	src/debug.c

* put cheat start into utility

# Conflicts:
#	src/debug.c

* put fill submenu into main menu

# Conflicts:
#	src/debug.c

* tiny fix

* renaming and reordering

# Conflicts:
#	src/debug.c

* Added reset pokedex flags for @AsparagusEduardo

* made flag toggle list dynamic

# Conflicts:
#	src/debug.c

* initial battle debug menu WIP

# Conflicts:
#	src/debug.c
#	src/wild_encounter.c

* fix visual bug

* added battle start

# Conflicts:
#	include/debug.h
#	src/battle_ai_script_commands.c

* Added faster way to add initial movesets to mon

* Added waiting music for the slow box filling

* Simplified the call to scripts

* Simplified debug scripts

* Disabled Battle Test for now

* Fixed personality on fast PC fill being always 0

* Removed BATTLE_ENGINE instances + added AI_FLAG_COUNT

* Added missing return TRUE

* Sets nickname

* Changed how GetSpeciesName to how it's used upstream

---------

Co-authored-by: TheXaman <48356183+TheXaman@users.noreply.github.com>
 2023-07-18 09:17:03 +02:00
Eduardo Quezada D'Ottone
43ad1a4d3b
Unified multi-strike move flags (#3126) 
* Unified twoStrikes and threeStrikes flags into strikeCount

* Decreased strikeCount max from 255 to 15.
 2023-07-18 09:07:14 +02:00
Alex
38655b9d1f
Fix gem boost on multi hit moves and config for gem param (#3144) 2023-07-18 06:11:54 +01:00
DizzyEggg
04feba8314 test for electromorphosis, small fix for wind power 2023-07-17 16:30:59 +02:00
DizzyEggg
c0f10623d6 Merge branch 'be/staminafix' of https://github.com/ghoulslash/pokeemerald into stamina_fix 2023-07-17 15:35:40 +02:00
DizzyEggg
1b6f582600 tests for stamina/wind power 2023-07-17 15:33:44 +02:00
Alex
330e20b9e9
Fix Protosynthesis and Quark Drive boosts (#3139) 
* Fix Protosynthesis and Quark Drive boosts

* Added Tests + fix newly introduced bug in the PR

Add unintentionally deletet break

new line
 2023-07-17 11:10:13 +02:00
Eduardo Quezada D'Ottone
ab33b7d863
Merge master 23-07-16 (#3140) 2023-07-16 16:24:56 -04:00
DizzyEggg
1f1d24b3e4
Fix Primal Reversion not activating when switching in after fainting (#3141) 
* Fixed Primal Reversion not activating when switching in after a fainting
* add tests for primal reversion

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2023-07-16 12:26:54 +01:00
Martin Griffin
17f8f50a59 Merge remote-tracking branch 'rhh/master' into upcoming 2023-07-16 07:46:34 +01:00
Eclipse
fb8989414f
Fixed Mega Venasaur icon (#3137) 2023-07-16 02:40:21 -04:00
DizzyEggg
3c5c68ac58
Fix how AI categorizes Weak moves and give priority to always hits moves when needed (#3109) 
* ai weak move fix and always hits move prioritarizing
 2023-07-16 07:24:59 +01:00
Martin Griffin
58ede15263
Fix Roullout Fury Cutter AI power calc (#3110) 2023-07-16 06:45:35 +01:00
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
381aa58587
Fix Bad Dreams ability pop-up + tests (#3131) 
* Fix all bad dreams issues and add tests

Co-authored-by: ShaeTsuPog <shaetsu@protonmail.com>
 2023-07-16 06:38:00 +01:00
Eduardo Quezada
786bf7752f Merge branch 'RHH/master' into RHH/upcoming 2023-07-16 01:33:30 -04:00
GriffinR
d79e62690b
Merge pull request #1899 from gruxor/master 
Remove unused macro to fix syntax highlights
 2023-07-15 13:28:29 -04:00
Eduardo Quezada D'Ottone
b48175edd2
Updated branches that use CI 2023-07-15 11:25:23 -04:00
DizzyEggg
2a249654e7 fix mirror move/metronome powder/multi hit moves & tests 2023-07-15 14:00:55 +02:00
Philipp AUER
0e9b649f5a
Detect test runner crashes (#3129) 2023-07-15 13:09:30 +02:00
Martin Griffin
25986be089 Prevent corrupted heaps causing infinite loops 2023-07-15 11:48:53 +01:00
Martin Griffin
4637d7e7ee Recover from test crashes 2023-07-15 11:48:52 +01:00
Martin Griffin
b31f10d124
Make Hydra respect -jN (#3132) 2023-07-14 19:10:42 +02:00
Martin Griffin
e9bd8979b0 More efficient Random calls in Shuffle 2023-07-14 18:57:19 +02:00
Eduardo Quezada
168b005406 Merge branch 'RHH/master' into RHH/upcoming 2023-07-14 12:40:01 -04:00
SonikkuA-DatH
6382640f8a
Castform, Cherrim Sun, Spinda, and Spheal Graphical Tweaks (#3127) 
* Casrform graphics. Palette changes, edited backs, and 2 Frame anims

* Castform Graphics

* Cherrim graphics, and Castform redefinitions

* Spheal and Spinda Graphic edits. Spheal mouth adjustment, Spinda 2 frame and palette

* Revised Spinda Spot drawing function, removed tabs

* Animations for Castform forms, Spinda, Cherrim Sun, and Spheal set

* Spacing

* Forgot shiny pal. Fixed

* Delete .vs directory

* remove vs ref
 2023-07-14 11:45:40 -04: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
Eduardo Quezada
240f41fc58 Reverted BattleMove power to u8 
Nothing was using it, despite what the comment suggested
 2023-07-14 10:53:40 -04:00
Eduardo Quezada D'Ottone
d4bb1dffd7
Delete unneeded workflow 2023-07-14 07:28:41 -04:00
Eduardo Quezada D'Ottone
e1f2320f2e
Delete unneeded workflow 2023-07-14 07:27:52 -04:00
Eduardo Quezada D'Ottone
5f29ae6f99
Failed tests are now listed in the total (#3073) 
* Failed tests are now listed in the total
 2023-07-14 10:17:54 +01:00
Martin Griffin
d3d582dd70
[battle, fpmath] revert changes to Q_24_8 format (#3125) 2023-07-14 10:15:55 +01:00
DizzyEggg
0c0b841a80
Remove debug item effect override (#3106) 2023-07-13 18:47:01 -04:00
sbird
cb66e8b770 [battle, fpmath] revert changes to Q_24_8 format 2023-07-13 23:43:02 +02:00
Eduardo Quezada D'Ottone
0efc9a29ad
Disabled species now default their graphics to SPECIES_NONE (#3116) 2023-07-12 20:11:07 -04:00
gruxor
5fd881a1b6 Remove unused macro to fix syntax highlights 2023-07-12 14:44:23 -04:00