ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,214 Commits 1 Branch 0 Tags 235 MiB
a7615f9649
Commit Graph

13214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DizzyEggg
a7615f9649 remove almost all usage of active battler 2023-08-30 11:21:10 +02:00
DizzyEggg
4683783a92 remove active battler from other files 2023-08-30 10:18:31 +02:00
DizzyEggg
77dd5150f5 remove gActiveBattler from battle_script_commands.c 2023-08-30 09:40:15 +02:00
DizzyEggg
0381ccdf32 remove more of gActiveBattler 2023-08-29 16:20:16 +02:00
DizzyEggg
156aa59f18 start removing gActiveBattler in controller emitters 2023-08-29 15:21:31 +02:00
ghoulslash
326fb2605a
Some gActiveBattler Fixes (#3259) 
* some gActiveBattler related fixes

* fix IsBattleSEPlaying gActiveBattler->battlerId

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-08-29 09:31:11 +02:00
ghoulslash
4490e9879a
Prevent certain status moves when item is known + Fake Out changes (#3219) 2023-08-28 17:12:29 -04:00
ghoulslash
ee8d930634
Simplify/Clean battle controllers code (#3202) 2023-08-28 17:08:39 -04:00
DizzyEggg
6ae1ba10da fix conflicts 2023-08-28 13:55:45 +02:00
Pawkkie
906ea4a5b0
Add missing absorbing abilities to FindMonThatAbsorbsOpponentsMove (#3218) 
* Add missing absorbing abilities to FindMonThatAbsorbsOpponentsMove

* Use array to match ability to absorbing type

Previous implementation involving piggybacking on a conditional in a bit of a messy fashion to check for each ability type, this should be more readable and more easily modified by a novice. This is almost exactly BuffelSaft's inclement emerald implementation.

* Minor syntax fixes
 2023-08-28 13:39:27 +02:00
voloved
2784f701d8
Poké Ball shortcut tweaks (#3254) 2023-08-26 12:58:51 -04:00
Eduardo Quezada D'Ottone
76075ffe57
Revert unneeded sprite changes from 3051 (#3205) 2023-08-25 16:33:15 -04:00
Eduardo Quezada
1f72e6ac07 Merge branch 'RHH/master' into RHH/upcoming 2023-08-24 21:31:58 -04:00
Eduardo Quezada
d360deb3b6 1.5.3 in templates 2023-08-24 20:44:50 -04:00
voloved
2a2cd77cf4
Allow Cycling Through Balls in the Last Ball Used Menu (#3039) 2023-08-24 19:23:26 -04:00
Eduardo Quezada D'Ottone
9c937a945c
Pokemon sprite review pt.1 (#3235) 2023-08-23 22:43:42 -04:00
CyanSMP64
ef69021f0f some more tweaks by mrds 2023-08-24 13:00:31 +12:00
Philipp AUER
905fc6fd4d
Fixed Metronome Item damage multiplier (#3246) 
Co-authored-by: sbird <sbird@no.tld>
 2023-08-23 19:23:00 -04:00
CyanSMP64
fd37946c1d resize golduck 2023-08-22 20:31:13 +12:00
LOuroboros
9d6953cc63
Removed the sTMHMMoves array and made TMs/HMs read moves from their secondaryId item field (#3243) 
* Deleted sTMHMMoves array, TMs/HMs read moves from their secondaryId item field now
The unused "registrability" variable has been removed in order to preserve the size of the gItems array after turning the secondaryId variable into a u16.
* Made ItemIdToBattleMoveId return ITEM_NONE if an item that is not a TM/HM is passed through it
* Renamed IsMoveHm to IsMoveHM
 2023-08-21 12:49:17 +01:00
DizzyEggg
9cf5376c96 use GetBattlerParty in LoadMonSprite 2023-08-21 09:43:01 +02:00
CyanSMP64
4e5809a0d0 tweak graveler, pikachu 2023-08-20 22:08:54 +12:00
Bassoonian
f2391cd823
Add female Basculegion to cry table (#3242) 2023-08-19 11:20:40 -04:00
CyanSMP64
60a2878f8f tweak growlithe, slowbro, poliwag 2023-08-19 16:15:20 +12:00
CyanSMP64
c33660e00f fix arcanine and zard 2023-08-19 15:37:41 +12:00
CyanSMP64
ec24754489 fix arcanine, change bg colour of green pokemon 2023-08-18 17:24:30 +12:00
Eduardo Quezada D'Ottone
5b885a4ddb
Convert vanilla trainer data to only use the full custom trainer mon struct (#3114) 2023-08-17 18:19:38 -04:00
Eduardo Quezada
d3333812dd Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer 2023-08-17 17:52:28 -04:00
Eduardo Quezada
a6dbb68bac Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	data/battle_scripts_1.s
#	src/battle_util.c
#	src/battle_z_move.c
 2023-08-17 13:42:09 -04:00
Philipp AUER
cd90fdec5d
[Critical] fix memory corruption when handling trigger sprites (#3238) 
Co-authored-by: sbird <sbird@no.tld>
 2023-08-16 20:21:16 -04:00
CyanSMP64
74de0ef3ca set background colour 2023-08-16 13:58:31 +12:00
CyanSMP64
0c27db10d6 Review mon sprites 0001-0080 2023-08-15 20:24:07 +12:00
kittenchilly
dba28cf93f
Allow Z-Moves to be selected after Mega Evolution (#3233) 
* Allow Z-Moves to be selected after Mega Evolution

* You cannot do Wish Mega Evolution at all if you hold a z crystal

* Rebase to master
 2023-08-14 19:10:15 -04:00
LOuroboros
2d45b9b8fe
Corrected conditionals used for B_SPEED_BUFFING_RAPID_SPIN and I_GEM_BOOST_POWER (#3232) 2023-08-14 16:14:12 -04:00
LOuroboros
c414a0103c
Made Cmd_jumpifnopursuitswitchdmg and Cmd_pursuitdoubles use Pursuit's effect ID instead of its move ID (#3231) 
* Made jumpifnopursuitswitchdmg use Pursuit's effect ID instead of its move ID

* Made Cmd_pursuitdoubles use Pursuit's effect ID too, even though it's unused
 2023-08-14 08:45:37 -04:00
Eduardo Quezada
32c3c33376 Missing master merge organization 
My bad ^^;
 2023-08-13 19:01:03 -04:00
PCG
b8a22eb119
Remove soundMove from Steam Eruption and replace it with sheerForceBoost (#3229) 
Co-authored-by: PCG06 <prajithgomes06@gmail.com>
 2023-08-13 00:53:22 -04:00
gruxor
f493ae8c69
Fixed item sprites with palette errors (#3222) 2023-08-12 18:13:33 -04:00
Eduardo Quezada
09fc48461f Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	test/battle/move_flags/three_strikes.c
#	test/move_flag_strike_count.c
#	test/move_flag_three_strikes.c
#	test/powder_moves.c
#	test/status1.c
 2023-08-12 16:31:44 -04:00
Eduardo Quezada D'Ottone
d62c0d6d51
Organized tests into subfolders (#2822) 2023-08-12 20:00:15 +01:00
Eduardo Quezada
952bacd858 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
#	.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
#	.github/ISSUE_TEMPLATE/04_other_errors.yaml
 2023-08-11 17:50:28 -04:00
Eduardo Quezada D'Ottone
ada29313de
Fix for wild double battles with an in-game partner (#3210) 
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
 2023-08-11 17:29:10 -04:00
Eduardo Quezada D'Ottone
1ba70a46f2
Fixed Jump Kick's recoil not happening after Spiky Shield's damage (#3208) 
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
 2023-08-11 17:26:43 -04:00
Philipp AUER
59da940283
Refactor damage formula to match Gen5+ (#3196) 
* [battle, damage] refactor damage formula to match gen5+

* [test] use exact values for dry skin, swarm tests

* fixup: assume stats for dry-skin, swarm tests

---------

Co-authored-by: sbird <sbird@no.tld>
 2023-08-11 16:28:38 -04:00
Eduardo Quezada D'Ottone
bd7960ef21
Updated versions for issue templates (#3220) 2023-08-11 12:04:03 -04:00
Eduardo Quezada
f026b51b48 Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer 
# Conflicts:
#	src/battle_main.c
#	src/battle_tower.c
#	src/match_call.c
 2023-08-11 11:41:44 -04:00
Alex
bcb6f723d9 Use AI_DATA->holdEffects instead AI_GetHoldEffect 2023-08-10 16:24:29 +02:00
Alex
275e5ef5e6 Make more use of AI_GetHoldEffect + Fake Out changes 
fix ShouldTryToFlinch

fix some mess up

fix of fix of mess up
 2023-08-10 15:33:12 +02:00
Martin Griffin
f6e6a1f383
Initialize save to empty in test runner (#3215) 2023-08-09 10:06:03 -04:00
Alex
42992ca5ce
Fix Teleport ending trainer battles (#3166) 2023-08-07 11:23:12 -04:00