Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,854 Commits 1 Branch 0 Tags
Commit Graph

427 Commits

Author SHA1 Message Date
DizzyEggg
1793b9e1da more controller functions 2023-08-05 14:11:25 +02:00
DizzyEggg
a505cd7fb9 simplify the get mon set mon data functions more 2023-08-05 12:53:14 +02:00
DizzyEggg
cbebdf044a handle se, bgm and fainting cry 2023-08-05 12:13:50 +02:00
DizzyEggg
c4bfe40da6 remove empty controller functions 2023-08-05 11:39:42 +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
Eduardo Quezada
4bbb3a1e51 Merge branch 'RHH/master' into RHH/upcoming 2023-07-05 19:28:37 -04:00
DizzyEggg
34aff01d3a
Fix graphical/exp bugs with 2 vs 1 trainer battles (#3105) 2023-07-05 14:52:24 -04:00
Eduardo Quezada D'Ottone
81e59ace25
Cleaned up remaining Castform hack stuff (#3063) 
* Removed gCastformFrontSpriteCoords

* Removed sCastformElevations and IsCastformForm

* Removed sCastformBackSpriteYCoords and castformPalette in BattleStruct

* Scrubbed unused BS commands

* Removed B_ANIM_CASTFORM_CHANGE and BattleForm constants

* Removed redundant function in Pokémon Debug menu

* Removed handling in animation scripts

* Removed gBattleMonForms

* Reduced MAX_MON_PIC_FRAMES to 2

* Removed Castform/Cherrim makefile stuff

* Fixed weather form change tests not checking species.

* Fixed Castform palettes after Lunos' PR
 2023-06-30 09:58:07 +02:00
AgustinGDLV
3d4789c492 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-05-28 11:10:50 -07:00
AgustinGDLV
a9a32651ac fixed player not being able to cancel partner action after item 2023-05-23 15:41:25 -07:00
AgustinGDLV
aec51b5b04 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-05-11 20:02:06 -07:00
Ultimate_Bob
32e63d8cc7
Don't copy opponent personality when swapping mon sprite during Mega Evolution (#2852) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-04-30 21:15:03 -04:00
AgustinGDLV
86242c1c70
MOVE_REVIVAL_BLESSING Effect (#2883) 
* implemented Revival Blessing
 2023-04-12 01:14:25 +01:00
AgustinGDLV
fff0f78c89 fixed Gigantamax and level bugs + lots of clean-up and debug removal 2023-03-25 15:33:50 -07:00
AgustinGDLV
7d4a666b4c current HP increases on level up 2023-03-25 09:53:50 -07:00
AgustinGDLV
886bee2b90 fixed double HP multiplier application + slapped KNOWN_FAILING on RNG-based tests 2023-03-24 23:11:53 -07:00
AgustinGDLV
2bcfaf8b57 CanDynamax rewrite, level-up + misc. bug fixes 2023-03-24 22:06:09 -07:00
AgustinGDLV
40102fe418 added check for AI to use Dynamax on last pokemon 2023-03-23 21:20:35 -07:00
AgustinGDLV
7d70222770 added most Dynamax immunities/interactions + tests + fixed some move selection bugs 2023-03-20 16:40:05 -07:00
AgustinGDLV
317b52f3f6 added Dynamax trigger sprite 2023-03-10 22:05:23 -08:00
AgustinGDLV
76073fab52 added basic Dynamax-in-battle 2023-03-10 10:20:27 -08:00
AgustinGDLV
ac649a476f added Gigantamax check + move display and tint when dynamaxed 2023-03-07 19:21:59 -08:00
ghoulslash
c399391891
Merge pull request #2677 from AlexOn1ine/z_moves_switch_order 
Fix switching Z-Moves when pressing SELECT in battle
 2023-02-13 08:41:58 -05:00
Alex
ce416be297 z_move switch move bug 2023-02-11 18:32:07 +01:00
Eduardo Quezada D'Ottone
8381b14c51
Implemented Xhyzi's RHH copyright intro (with config) (#2415) 
* Rhh & Pret Copyright Screen

* Porygon recovered his voice

* Expansion text

---------

Co-authored-by: Xhyzi <xhyzdot@gmail.com>
Co-authored-by: Jaizu <jaizu85@gmail.com>
 2023-02-08 15:54:12 +01:00
Eduardo Quezada
749225ace1 Matching merge from upstream pret 
# Conflicts:
#	graphics/interface/menu_info.png
#	include/pokemon.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_mons.c
#	src/battle_anim_water.c
#	src/battle_controller_opponent.c
#	src/battle_gfx_sfx_util.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
#	src/pokemon_summary_screen.c
 2023-01-20 12:31:54 -03:00
GriffinR
0cc10a1ada Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize 2023-01-18 11:07:12 -05:00
Bassoonian
333917941b Add PLA+ obedience mechanics (with config) 2023-01-11 08:15:57 +01:00
Eduardo Quezada
9d1149c423 Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221124 
# Conflicts:
#	src/pokemon.c
 2022-11-29 17:40:09 -03:00
Eduardo Quezada
e858b4e709 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124 
# Conflicts:
#	include/battle.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_dome.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/battle_tower.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
 2022-11-24 15:36:00 -03:00
Eduardo Quezada
011ec16f1e Organized conffig files into their own folder and cleaned up 2022-11-14 11:03:49 -03:00
Eduardo Quezada
3ed485632f Renamed gBaseStats to gSpeciesInfo 2022-10-24 17:01:48 -03:00
Eduardo Quezada
057f76bfe6 Cleaned up missing JOY macros 2022-09-25 13:05:18 -03:00
Eduardo Quezada
3a6318f1d9 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/configRefactor 
# Conflicts:
#	include/constants/battle_config.h
 2022-09-06 15:20:54 -04:00
Eduardo Quezada
dbd56efaef Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 
# Conflicts:
#	src/battle_util.c
 2022-09-05 12:20:57 -04:00
Eduardo Quezada
790bdd69f8 Using GET_BATTLER_SIDE and GET_BATTLER_SIDE2 2022-09-03 00:28:32 -04:00
Eduardo Quezada
5403cd036e Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 
# Conflicts:
#	include/battle.h
#	include/battle_controllers.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
 2022-09-02 23:24:08 -04:00
Eduardo Quezada
69f4c226f0 Merge remote-tracking branch 'RHH/master' into RHH_cleanConfigs 
# Conflicts:
#	src/battle_ai_main.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_script_commands.c
#	src/pokemon.c
#	src/pokemon_summary_screen.c
 2022-08-27 02:42:22 -04:00
Eduardo Quezada
1f0a952546 Usage of BATTLE_OPPOSITE 2022-08-27 01:44:39 -04:00
Eduardo Quezada
15d611ba65 Usage of BATTLE_PARTNER 2022-08-27 01:26:13 -04:00
DizzyEggg
a0ec8a5a80 4 digit hp in battle 2022-08-25 16:40:56 +02:00
Eduardo Quezada
1f5adf93c7 Cleaned up use of configs be almost exclusively preproc functions 2022-08-23 21:00:08 -04:00
Eduardo Quezada
afcc1178b2 Merge remote-tracking branch 'pret/master' into MergedBranchUltimate 
# Conflicts:
#	data/battle_ai_scripts.s
#	data/battle_scripts_1.s
#	include/battle_controllers.h
#	include/battle_script_commands.h
#	include/battle_util.h
#	include/constants/battle_script_commands.h
#	include/constants/global.h
#	include/decompress.h
#	src/battle_anim_effects_1.c
#	src/battle_anim_normal.c
#	src/battle_anim_poison.c
#	src/battle_anim_water.c
#	src/battle_arena.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_safari.c
#	src/battle_controller_wally.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/berry.c
#	src/data/trainers.h
#	src/decompress.c
#	src/field_effect.c
#	src/hall_of_fame.c
#	src/overworld.c
#	src/pokeball.c
#	src/pokemon.c
#	src/pokemon_icon.c
#	src/pokemon_storage_system.c
#	src/scrcmd.c
 2022-08-22 20:30:45 -04:00
Martin Griffin
6fed961ed6 Write palette IDs in hex 2022-08-19 15:29:35 +01:00
Eduardo Quezada
4b08a511c3 Cleanup from https://github.com/pret/pokefirered/pull/532 2022-08-07 22:40:15 -04:00
DizzyEggg
c991131b75 Change language stuff based on the french decomp 2022-08-04 11:53:16 +02:00