DizzyEggg
|
156aa59f18
|
start removing gActiveBattler in controller emitters
|
2023-08-29 15:21:31 +02:00 |
|
DizzyEggg
|
9cf5376c96
|
use GetBattlerParty in LoadMonSprite
|
2023-08-21 09:43:01 +02:00 |
|
DizzyEggg
|
ce18df46e6
|
replace global usage of gActiveBattler in controller files
|
2023-08-07 12:51:58 +02:00 |
|
DizzyEggg
|
b8ba6139cb
|
health bar update
|
2023-08-07 10:29:02 +02:00 |
|
DizzyEggg
|
546b0c7e97
|
handle move anim
|
2023-08-07 09:26:03 +02:00 |
|
DizzyEggg
|
e8d6c99e6d
|
more controllers work
|
2023-08-07 01:05:09 +02:00 |
|
DizzyEggg
|
ef8024d8c5
|
draw trainer pic
|
2023-08-06 21:50:59 +02:00 |
|
DizzyEggg
|
a9483c361b
|
trainer intro ball throw
|
2023-08-06 12:41:36 +02:00 |
|
DizzyEggg
|
ffb0e20049
|
hide show party status summary
|
2023-08-05 23:27:56 +02:00 |
|
DizzyEggg
|
18db0cb3b7
|
controller string
|
2023-08-05 22:41:13 +02:00 |
|
DizzyEggg
|
0b4c1aa275
|
more work on controllers
|
2023-08-05 20:42:19 +02:00 |
|
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
|
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 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 |
|
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 |
|
DizzyEggg
|
380af442c3
|
Fix buggy pokemon anims with Illusion (#2639)
* try illusion fix
* fix
|
2023-02-19 12:05:56 +01:00 |
|
Bassoonian
|
333917941b
|
Add PLA+ obedience mechanics (with config)
|
2023-01-11 08:15:57 +01:00 |
|
Eduardo Quezada
|
4b1aca19cb
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909
# Conflicts:
# src/battle_controller_link_opponent.c
# src/battle_controller_opponent.c
# src/battle_controller_recorded_opponent.c
# src/battle_controllers.c
# src/data/pokemon_graphics/back_pic_coordinates.h
# src/data/pokemon_graphics/front_pic_coordinates.h
# src/pokemon.c
|
2022-09-10 00:17:03 -04:00 |
|
Eduardo Quezada
|
7500435a80
|
Implemented review changes from https://github.com/pret/pokefirered/pull/548
|
2022-09-04 21:24:12 -03: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 |
|
DizzyEggg
|
1b9c2816c2
|
fix updatehptextinhealthbox arguments
|
2022-08-25 17:37:47 +02: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 |
|
Eduardo Quezada
|
59f89bde9e
|
Misc cleanup
|
2022-08-18 14:23:45 -04:00 |
|
Eduardo Quezada
|
7b3401ee27
|
Standarized use of star in pointer types
|
2022-07-29 10:17:58 -04:00 |
|
Sneed69
|
c60de5055d
|
remove IsMoveWithoutAnimation
|
2022-06-03 17:42:42 +03:00 |
|
ultima-soul
|
23bf41713c
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-12-01 20:17:08 -08:00 |
|
ultima-soul
|
0312c5be8b
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-11-27 21:38:26 -08:00 |
|
ultima-soul
|
3ed51d6d91
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-11-21 10:40:26 -08:00 |
|
GriffinR
|
1b35f9adad
|
Use specific name limits for string limit functions
|
2021-11-17 22:11:03 -05:00 |
|
GriffinR
|
f42eafc85b
|
Merge branch 'master' into doc-banim
|
2021-11-13 23:26:46 -05:00 |
|
GriffinR
|
e3b6337c3a
|
Finish battle_anim_mons doc
|
2021-11-08 14:29:37 -05:00 |
|
GriffinR
|
c4169cfd29
|
Disambiguate cry functions
|
2021-11-07 14:26:09 -05:00 |
|
GriffinR
|
54b254a829
|
Add CRY_MODE constants
|
2021-11-07 13:33:05 -05:00 |
|
GriffinR
|
934a7e7a5d
|
Merge pull request #1516 from GriffinRichards/doc-miscbattle
Miscellaneous battle documentation
|
2021-10-19 08:09:17 -04:00 |
|
GriffinR
|
fc15b0d5f0
|
Add controller buffer constants, finish misc battle doc
|
2021-10-13 16:21:39 -04:00 |
|
GriffinR
|
28de627913
|
Add TRACKS_ALL, remove BGCntrlBitfield
|
2021-10-09 11:34:51 -04:00 |
|
GriffinR
|
d8e65fc4b6
|
More battle doc, add battle window ids
|
2021-10-09 03:01:10 -04:00 |
|
ultima-soul
|
02c9e040df
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-08-11 16:33:10 -07:00 |
|
PikalaxALT
|
810ca5f8ff
|
Flatten pos fields in struct Sprite
|
2021-07-07 09:11:52 -04:00 |
|
ghoulslash
|
c3e28e9b1a
|
merge with be
|
2021-05-23 12:22:52 -06:00 |
|
ultima-soul
|
14a0303e2f
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-04-27 18:36:37 -07:00 |
|
GriffinR
|
62abcecc54
|
More usage of DISPLAY constants
|
2021-04-15 02:22:24 -04:00 |
|
GriffinR
|
f4d8a91ba4
|
Misc battle script cleanup
|
2021-04-03 14:07:31 -04:00 |
|
ultima-soul
|
5bab9474dc
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-03-22 23:08:19 -07:00 |
|