Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-05-15 07:50:05 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
13,398 Commits 3 Branches 0 Tags 947 MiB
dbeaa2b2e9
Commit Graph

9467 Commits

Author SHA1 Message Date
Aaghat
7832a43544 Minor fixes 2023-09-08 21:47:43 +05:30
Aaghat
e8f56d5c68 use rare candy instead of exp share 2023-09-08 19:26:29 +05:30
Aaghat
cc273ed2c4 Clean Up 2023-09-08 19:25:01 +05:30
Aaghat
c4231ba860 Merge branch 'tx_pokedexPlus_hgss' of https://github.com/TheXaman/pokeemerald into PokedexPlus_Hgss 2023-09-08 18:47:26 +05:30
psf
75d06bb599
Generation 6 Experience Share (#3276) 2023-09-07 23:18:18 -03:00
Eduardo Quezada
820113d883 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	data/battle_anim_scripts.s
#	data/battle_scripts_1.s
#	include/battle_scripts.h
#	include/battle_util.h
#	src/battle_script_commands.c
#	src/battle_util.c
 2023-09-07 15:13:06 -03:00
DizzyEggg
cfd802423b
Fling fixes and tests (#3191) 
* begin fling tests

* fling fixes and tests

* Update test/move_effect_fling.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/move_effect_fling.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/move_effect_fling.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/move_effect_fling.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/move_effect_fling.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/move_effect_fling.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/move_effect_fling.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/move_effect_fling.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* scripts names change

* fix fling's test file

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-09-05 06:56:36 -03:00
ghoulslash
675aa5db41
fix GetBattleAnimMoveTargets logic (#3278) 
* fix GetBattleAnimMoveTargets logic

* more efficient GetBattleAnimMoveTargets

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-09-05 09:21:14 +02:00
kittenchilly
2fa4206bf1
Add new Substitute doll sprites (#3263) 2023-09-04 19:48:43 -03:00
DizzyEggg
d9677763e5 remove gActiveBattler replacement 2023-09-04 10:26:37 +02:00
DizzyEggg
7c2ad314d4 merge with upcoming 2023-09-04 09:40:48 +02:00
Eduardo Quezada
35d7201935 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	data/battle_scripts_1.s
#	include/battle_scripts.h
 2023-08-31 20:46:53 -04:00
Eduardo Quezada D'Ottone
c4e88760f5
Pret merge (2023/08/31) (#3268) 2023-08-31 14:52:18 -04:00
Eduardo Quezada
842b9dc6c0 Incorporated bugfixes from upstream 2023-08-31 14:30:13 -04:00
Eduardo Quezada
0d5b00aaf2 Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829 
# Conflicts:
#	README.md
#	data/battle_ai_scripts.s
#	data/battle_scripts_1.s
#	data/maps/BattleFrontier_Lounge7/scripts.inc
#	include/battle_anim.h
#	include/battle_message.h
#	include/constants/items.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_anim_throw.c
#	src/battle_anim_utility_funcs.c
#	src/battle_controller_link_opponent.c
#	src/battle_controller_link_partner.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_recorded_player.c
#	src/battle_controller_wally.c
#	src/battle_gfx_sfx_util.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/party_menu.h
#	src/data/pokemon/tmhm_learnsets.h
#	src/daycare.c
#	src/field_specials.c
#	src/hall_of_fame.c
#	src/party_menu.c
#	src/pokemon.c
#	src/tv.c
 2023-08-31 14:28:01 -04:00
Eduardo Quezada D'Ottone
82c65d37e7
Fixed 2v1 handling when debug menu is enabled (#3223) 2023-08-31 09:00:59 +02:00
Alex
64ffc5a85d
Fixes Beat Up + Chloroblast (#3264) 2023-08-30 15:58:53 -04:00
DizzyEggg
aae4a0970c merge with upcoming 2023-08-30 15:46:27 +02:00
DizzyEggg
493c330cbd merge with upcoming 2023-08-30 13:23:55 +02:00
DizzyEggg
c29f8259f6 remove gActiveBattler entirely 2023-08-30 12:46:22 +02:00
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
kittenchilly
c427d96f3f Better Ultra Burst animation 2023-08-29 19:13:21 -05:00
kittenchilly
028536e2d3 Spaces 2023-08-29 17:12:09 -05:00
kittenchilly
d540eccbb1 Merge branch 'upcoming' into ultraburst 2023-08-29 16:17:35 -05:00
Eduardo Quezada
be152fbee8 Merge branch 'RHH/master' into RHH/pr/master/opponentName 2023-08-29 13:11:32 -04: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
DizzyEggg
00e1542cb8 Merge branch 'ai_switch_mon_fix' of https://github.com/DizzyEggg/pokeemerald into ai_switch_mon_fix 2023-08-29 10:42:07 +02:00
DizzyEggg
44acd287f1 solve conflicts 2023-08-29 10:41:05 +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
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
GriffinR
d67914e114
Merge pull request #1912 from GriffinRichards/moves-mask 
Handful of fixes related to MAX_MON_MOVES
 2023-08-27 19:40:59 -04:00
kittenchilly
48d6fe2e64 Merge branch 'upcoming' into ultraburst 2023-08-26 14:43:31 -05:00
voloved
2784f701d8
Poké Ball shortcut tweaks (#3254) 2023-08-26 12:58:51 -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
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
GriffinR
e70577d59b Add missing sizeof in trainer_see 2023-08-20 17:22:29 -04:00
GriffinR
4941e2602a
Merge pull request #1909 from GriffinRichards/stat-anim 
Document stat change animation
 2023-08-20 14:29:11 -04:00
CyanSMP64
4e5809a0d0 tweak graveler, pikachu 2023-08-20 22:08:54 +12:00
CyanSMP64
ec24754489 fix arcanine, change bg colour of green pokemon 2023-08-18 17:24:30 +12:00
Eduardo Quezada
d3333812dd Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer 2023-08-17 17:52:28 -04:00
kittenchilly
4ca4b2dd76 Update battle_interface.c 2023-08-17 13:29:27 -05:00