ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,111 Commits 1 Branch 0 Tags 235 MiB
cbebdf044a
Commit Graph

5289 Commits

Author SHA1 Message Date
DizzyEggg
cbebdf044a handle se, bgm and fainting cry 2023-08-05 12:13:50 +02:00
DizzyEggg
5a8b6c18ef ball throw and start removing empty controller functions 2023-08-05 11:05:37 +02:00
DizzyEggg
c72bb27325 faint animation 2023-08-04 22:15:39 +02:00
DizzyEggg
7360a4a18a up to return mon to ball 2023-08-04 17:29:29 +02:00
DizzyEggg
7ba8a0216f more work on controllers 2023-08-04 13:42:40 +02:00
DizzyEggg
cc30d2fb53 start removing duplicate controller functions 2023-08-04 12:10:38 +02:00
Martin Griffin
b3295d1cfb
Reverted BattleMove power to u8 (#3187) 2023-08-02 12:20:11 +01:00
Eduardo Quezada
f94efa94e1 Merge branch 'RHH/master' into RHH/upcoming 2023-08-02 01:18:07 -04:00
ghoulslash
7a814999e5 MOVE_CORROSIVE_GAS Effect (#3152) 
# Conflicts:
#	data/battle_anim_scripts.s
#	data/battle_scripts_1.s
#	include/constants/battle_move_effects.h
 2023-08-02 01:05:54 -04:00
Eduardo Quezada
87050d8c08 Fix Stamina/Wind Power/Electromorphosis/Rattled issues with targets (#3143) 2023-08-01 23:54:04 -04:00
Philipp AUER
44eb6260cc
[battle, anim] woodhammer animation overhaul (#3192) 
* [battle, anim] woodhammer animation overhaul

* squashme: timings

---------

Co-authored-by: sbird <sbird@no.tld>
 2023-08-01 19:10:18 -04:00
Eduardo Quezada D'Ottone
54816816a0
Fixed null dereferencing errors with -fanalyzer on modern (#3165) 2023-07-31 14:49:08 -04:00
Eduardo Quezada D'Ottone
f0d03dd99b
Set GEN_LATEST to GEN_9 (#3186) 2023-07-31 15:41:53 +02:00
DizzyEggg
efb98e97c7 remove unused config B_CHECK_IF_CHARGED_UP 2023-07-31 14:22:48 +02:00
DizzyEggg
5eec3b2fc3
fix various issues with primal weather blocking water/fire type moves (#3138) 
* fix various issues with primal weather blocking water/fire type moves

* forgot to change return to effect=1

* fix bugs
 2023-07-30 10:50:51 -04:00
Martin Griffin
0e5c78aeb6 Merge remote-tracking branch 'pret/master' into 'rhh/master' 2023-07-25 19:49:18 +01:00
Eduardo Quezada
ad78dfcf68 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	src/battle_script_commands.c
#	src/battle_util.c
 2023-07-25 14:38:53 -04:00
Martin Griffin
31a3ada7de Detect potential misalignment in modern 2023-07-24 19:42:56 +01:00
Martin Griffin
b53cca1a06
Declarations for 2- and 3-argument GetMonData (#1756) 
* Type-safe GetMonData/GetBoxMonData

* Comments
 2023-07-24 09:57:37 -04:00
ghoulslash
b5431898c2
RNG for Metronome, multi-hit moves, and Loaded Dice (#3159) 2023-07-23 08:15:14 -04:00
Martin Griffin
fc321965a9 RNG_HITS and RNG_LOADED_DICE 2023-07-23 10:24:58 +01:00
ghoulslash
a527d6c7de
Fix wrong color in stat move animation (#3161) 2023-07-23 04:38:25 -04:00
gruxor
fc8ee625b6 Fixed outstanding UB with -fanalyzer on modern 2023-07-21 15:51:03 -04:00
Alex
ad25dfe1e9
Set otGender + Moves in FillPartnerParty (#3163) 2023-07-21 14:43:39 -04:00
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
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
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
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
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
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
2a249654e7 fix mirror move/metronome powder/multi hit moves & tests 2023-07-15 14:00:55 +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
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
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