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,133 Commits 1 Branch 0 Tags 235 MiB
fc66a8c476
Commit Graph

13133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eduardo Quezada D'Ottone
fc66a8c476
Adds Mortal Spin and Population Bomb (#3178) 2023-08-07 08:54:18 -04:00
Alex
8ee3a3c5bb solve conflics 2023-08-07 14:25:30 +02:00
Eduardo Quezada
34d38bdbae Merge branch 'RHH/master' into RHH/upcoming 2023-08-06 20:31:45 -04:00
Eduardo Quezada
833f7dd9d3 LF shenanigans 2023-08-06 20:25:23 -04:00
Eclipse
5226935857
Fixed Trainer class ball not assigned to second Pokémon (#3203) 2023-08-04 22:56:05 -04:00
ghoulslash
a0dd77dd41
Improve AI switching, so it doesn't get killed on switch-in (#3146) 2023-08-04 07:34:58 -04:00
ghoulslash
dc1d44eefd
Updated Cmd_jumpifsideaffecting (#3200) 2023-08-04 07:32:54 -04:00
ghoulslash
4ae6ae4de3
Reset all battler IDs at battle start (#3111) 
* reset battler IDs before BattleScript_OverworldTerrain and BattleScript_OverworldWeatherStarts to prevent playanimation from executing on invalid battler ids

* replace BS_SCRIPTING with BS_BATTLER_0 in BattleScript_OverworldTerrain and BattleScript_OverworldWeatherStarts

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-08-04 08:57:06 +02:00
DizzyEggg
e7bc42fcaf use IsValidForBattle 2023-08-03 21:17:39 +02:00
LOuroboros
0bace94dc7
Updated Cmd_jumpifsideaffecting 2023-08-03 14:46:45 -03:00
Philipp AUER
7d8bcce9a5
Optimize sprite.c (#3175) 2023-08-03 15:57:04 +03:00
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