Eduardo Quezada
62912f8caf
Battle indicator now depends on species instead of held item
...
- This is to avoid a situation where a user would plop a Primal Groudon and its indicator would become Alpha if it doesn't have a Red Orb.
2022-11-06 16:01:07 -03:00
Eduardo Quezada
797c5514d3
Mega Evolution in form change tables
2022-11-01 18:37:23 -03:00
Eduardo Quezada
f5b900e2ef
Defaults Primal Reversion indicator to Alpha when item not Red Orb.
2022-11-01 15:02:22 -03:00
Eduardo Quezada
0a79390ec0
Primal Reversion in Form Change tables
2022-10-21 02:08:37 -03:00
Eduardo Quezada
68b474c0f0
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007
...
# Conflicts:
# include/constants/items.h
# src/battle_interface.c
2022-10-07 14:52:32 -03:00
Eduardo Quezada
adb4e54e95
Fixed multi battle battler coordinates and party menu when only one Pokémon is chosen
2022-09-18 22:34:06 -03:00
tustin2121
5c55e44173
More diagrams
...
- Diagramed all subsprite tables in the code base. There's a LOT in the slot machine code.
2022-09-17 14:34:20 -04:00
tustin2121
c371a44a83
Formatting
2022-09-17 13:34:54 -04:00
tustin2121
13877f71dc
Minor documentation
...
Some things I figured out while working on my hack.
- The Subsprite tables do not use `DISPLAY_WIDTH`, but rather use -16, since they are signed bytes. The negative numbers better illustrate what the tables are doing.
- Figured out the as-of-yet undocumented data in SpriteCB_FlygonSilhouette
2022-09-17 13:33:10 -04:00
LOuroboros
fc65a483aa
Fixed ability pop ups
2022-09-11 22:34:24 -03: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
DizzyEggg
622a7f8141
merge with master
2022-08-25 22:10:59 +02:00
DizzyEggg
a0ec8a5a80
4 digit hp in battle
2022-08-25 16:40:56 +02:00
ghoulslash
f736766c94
Merge pull request #2238 from DizzyEggg/multi
...
Wild multi battles and doubles 2 vs 1 interface
2022-08-25 08:47:02 -04:00
Eduardo Quezada D'Ottone
5659f6178f
Optimized x adjustment
2022-08-25 00:03:43 -04:00
DizzyEggg
7aa55f2753
better interface 1 player mon in double
2022-08-24 23:00:21 +02:00
DizzyEggg
17b47de90d
Ability pop-up displays properly long abilities
2022-08-24 20:20:44 +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
Eduardo Quezada
2e1bf0d965
OamData mosaic FALSE
2022-07-29 21:27:39 -04:00
Eduardo Quezada
13672680b0
void pointer standarized
2022-07-29 10:52:35 -04:00
Eduardo Quezada
7b3401ee27
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
Eduardo Quezada D'Ottone
fe63dafcc1
Merge branch 'battle_engine' into BE_pretmerge
...
# Conflicts:
# src/battle_anim_fire.c
# src/battle_controller_player.c
2022-07-20 08:50:30 -04:00
ghoulslash
6b84a9f0b3
merge w be
2022-07-17 12:40:43 -04:00
Eduardo Quezada D'Ottone
e791cf90ad
Merge tag 'pretmaster' into BE_pretmerge2
...
# Conflicts:
# data/battle_anim_scripts.s
# include/battle_anim.h
# include/battle_controllers.h
# include/battle_interface.h
# include/battle_main.h
# include/battle_setup.h
# include/constants/battle_anim.h
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_anim_fire.c
# src/battle_anim_normal.c
# src/battle_controllers.c
# src/battle_dome.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/pokemon.c
2022-07-15 12:58:46 -04:00
GriffinR
34438e6bc4
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
GriffinR
5e6d8a77e4
Document some generic argument names
2022-05-31 14:34:25 -04:00
sneed
d8d31b7972
disable last used ball in bpike
2022-05-20 04:57:32 +03:00
ExpoSeed
f50a406b18
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2022-03-22 12:56:23 -05:00
Eduardo Quezada D'Ottone
221e38ff86
Merge pull request #1957 from ghoulslash/be/ability_popup
...
Ability Popup Fixes + Longer Ability Names config
2022-01-01 19:39:55 -03:00
ghoulslash
0a95a31ee9
fix formatting
2021-12-23 08:44:54 -05:00
Eduardo Quezada D'Ottone
a57043b589
Merge pull request #1983 from sphericalice/last_ball_refactor
...
Refactor CanThrowLastUsedBall and related functions
2021-12-19 20:21:50 -03:00
ExpoSeed
d6747527da
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-12-16 21:44:01 -06:00
Eduardo Quezada D'Ottone
abe9910251
Fixed speed to be more like vanilla's
2021-12-12 12:42:14 -03:00
Eduardo Quezada D'Ottone
7ca07527fa
Config for HP bars moving faster for higher HP amounts. Credit to Dat.H
2021-12-12 12:33:49 -03:00
sphericalice
3db871c49a
Refactor CanThrowLastUsedBall and related functions
2021-12-05 23:10:05 +00:00
ultima-soul
23bf41713c
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-12-01 20:17:08 -08:00
ghoulslash
7a7c6afc39
larger ability popup, fix ability name printing/clearing, and config for longer ability names
2021-11-29 12:42:01 -05: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
8e424b6985
Merge branch 'master' into doc-binterface
2021-11-09 16:09:48 -05:00
GriffinR
684f599a44
Label remaining battle_interface symbols
2021-11-08 16:03:44 -05:00
GriffinR
50d3003a0d
Text clean-up, TEXT_SPEED_FF to TEXT_SKIP_DRAW
2021-11-03 19:54:20 -04:00
GriffinR
e14210ce1f
Merge pull request #1536 from GriffinRichards/clean-braille
...
Add font id constants, better braille support
2021-11-03 13:17:29 -04:00
GriffinR
36039e1b86
Convert fonts.s to C
2021-10-31 01:44:18 -04:00
GriffinR
fdaf436960
Add font id constants
2021-10-30 19:54:15 -04:00
ghoulslash
f342e7c590
merge with be
2021-10-28 17:03:10 -04:00
GriffinR
41ecae91f8
Label remaining symbols in graphics.c
2021-10-27 13:47:18 -04:00
Eduardo Quezada D'Ottone
71ff664700
Ordered config into new categories
2021-10-23 20:11:02 -03:00
