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,181 Commits 1 Branch 0 Tags 235 MiB
2784f701d8
Commit Graph

13181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Griffin
17555feb20
Animation script cleanup and fixes - Part 2 (#3193) 2023-08-02 12:28:29 +01:00
Martin Griffin
b08b6a37cb Optimize BuildOamBuffer 2023-08-02 12:22:30 +01:00
Martin Griffin
b3295d1cfb
Reverted BattleMove power to u8 (#3187) 2023-08-02 12:20:11 +01:00
Martin Griffin
cd51471c96
Revamped GetTotalAccuracy (#3182) 2023-08-02 12:19:36 +01:00
Martin Griffin
5543c9da8b
[battle, movesets] revert bulbasaur's level up change (#3194) 2023-08-02 09:06:48 +01:00
sbird
1d8ad1b756 [battle, movesets] revert bulbasaur's level up change 2023-08-02 09:51:45 +02: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
e21346dd67 Fixed Rage Powder's animation not turning the user red 2023-08-01 19:05:39 -04:00
Eduardo Quezada
d0277fc04f Cleaned: createvisualtask AnimTask_BlendColorCycle 2023-08-01 19:05:18 -04:00
Eduardo Quezada
2cf7f54a6b Cleaned: 3 more createvisualtask 
- AnimTask_CanBattlerSwitch
- AnimTask_BlendMonInAndOut
- AnimTask_CentredFrozenIceCube
 2023-08-01 19:05:11 -04:00
Eduardo Quezada
ac519bd5d3 Cleaned: createvisualtask AnimTask_FlailMovement & AnimTask_ElectricChargingParticles 2023-08-01 19:05:04 -04:00
Eduardo Quezada
eef07a9f9f Cleaned: createvisualtask AnimTask_HorizontalShake 2023-08-01 19:04:56 -04:00
Eduardo Quezada
5fc5e5703c Cleaned: createvisualtask AnimTask_RockMonBackAndForth & AnimTask_PositionFissureBgOnBattler 2023-08-01 19:04:47 -04:00
Eduardo Quezada
323b771630 Cleaned: createvisualtask AnimTask_ScaleMonAndRestore & AnimTask_RotateMonSpriteToSide 2023-08-01 19:03:52 -04:00
Eduardo Quezada
b4ad3be0cb Cleaned: createvisualtask AnimTask_ShakeMon 2023-08-01 19:02:59 -04:00
Eduardo Quezada
1d25dd0c93 Cleaned: createvisualtask AnimTask_ShakeMon2 2023-08-01 19:02:57 -04:00
Eduardo Quezada
d3f170ef0f Cleaned: createvisualtask AnimTask_ShakeMonInPlace 2023-08-01 19:02:14 -04:00
Eduardo Quezada D'Ottone
15c0ea253a
Animation script cleanup and fixes - Part 1 (#3185) 
* Cleaned: visible, monbg & invisible

* Cleaned: createvisualtaskontargets AnimTask_ShakeMon

* Cleaned: createvisualtask SoundTask_PlayDoubleCry

* Fixed: createvisualtask SoundTask_PlayCryWithEcho

Checksum changed from
7a05d0b5b2cd65346597a9a598c7f7cde1570475
to
35eae7f4357391b1ce38f0d79715f47f92c82087

* Cleaned: createvisualtask SoundTask_PlayCryHighPitch

* Cleaned: createvisualtask AnimTask_WindUpLunge

* Cleaned: createvisualtask AnimTask_TranslateMonEllipticalRespectSide

* Cleaned: createvisualtask AnimTask_SwayMon

* Cleaned: createvisualtask AnimTask_Splash

* Removed bad use of: createvisualtask AnimTask_Splash in Move_ROCK_CLIMB

It wasn't breaking the animation because ANIM_ATTACKER (0) was being passed for the hop count, essentially skipping the animation.

* Cleaned: createvisualtask AnimTask_ShockWaveProgressingBolt & AnimTask_ShakeMonInPlace

* Fixed Move_PLASMA_FISTS's use of AnimTask_ShockWaveProgressingBolt
 2023-07-31 23:17:50 +02: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
Eduardo Quezada D'Ottone
8196bea2d7
Pret merge 23-07-25 (#3176) 2023-07-30 10:46:23 -04:00
Eclipse
c76e5deb9f
Fixed Wailord icon (#3183) 2023-07-30 10:08:56 -04:00
Alex
5167b01b14 var for ability + hold effect, loaded dice comparison 
fix for small bug introduced in the latest commit
 2023-07-29 23:36:01 +02:00
LOuroboros
4a657c7eaf Revamped GetTotalAccuracy 2023-07-29 17:22:10 -03:00
Alex
5fa7a6d4c6 Skill Link Tests, Loaded Dice stuff 2023-07-28 13:20:06 +02:00
DizzyEggg
1baa57418e
Fixed copyright screen not showing up on certain emulators (#2664) 
* Fix old intro not showing up on VBA

* Update intro.c

* Update intro.c

* Update intro.c
 2023-07-26 21:33:01 -04:00
Alex
bca29d8586 Adds Mortal Spin and Population Bomb 2023-07-26 17:37:56 +02:00
DizzyEggg
6f31314c4a Fix uturn typo in test 2023-07-26 09:42:29 +02:00
DizzyEggg
a3d6e31227 Merge branch 'rattled' into stamina_fix 2023-07-26 09:36:46 +02:00
DizzyEggg
c11839c648 Use isValidForBattle 2023-07-26 09:34:23 +02:00
DizzyEggg
7b7cbf506d Merge branch 'upcoming' into ai_switching 2023-07-26 09:23:53 +02:00
DizzyEggg
6658899841 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into upcoming 2023-07-26 09:23:13 +02: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
GriffinR
39192725f2
Merge pull request #1901 from mrgriffin/pret-potential-misalignment 
Detect potential misalignment in modern
 2023-07-25 14:21:42 -04:00
DizzyEggg
0c0373a6b9 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into upcoming 2023-07-25 12:37:00 +02:00
Alex
da9b421ae1
Fix Ruin ability calcs (#3171) 2023-07-25 09:59:26 +02:00
Martin Griffin
b499f41a5c Print ticks 2023-07-25 07:40:51 +01:00
Martin Griffin
31a3ada7de Detect potential misalignment in modern 2023-07-24 19:42:56 +01:00
Martin Griffin
3f5daa8cf1 Add BENCHMARK to test runner 
Counts the time spent in the block in arbitrary time units (64-cycles
currently). If the block takes more than ~4 million cycles (~0.25s) the
benchmark will wrap around.

Note that the time can be affected by the timeout IRQs, and should only
be taken as a loose indication of relative performance.
 2023-07-24 15:18:28 +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
6f40d44a23 Cleanup RandomUniform and RandomElementArray 2023-07-23 10:24:58 +01: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