Martin Griffin
e42a0a6dbe
Narrower fonts
2024-04-25 18:40:37 +01:00
AgustinGDLV
84a9d4ffcf
Terastallization ( #4110 )
...
* wrote foundational terastal tests
* implemented baseline test-only Tera functionality; modified GetBattlerType + STAB calculations, misc. changes to some moves
* added tests and func. for Stellar type, more tests for Tera Blast
* more tests for Stellar type, Conversion fixes, Color Change + Conversion2 future proof
* implemented tera blast, expanded stellar type func., fixed tests
* last set of Tera/Tera Blast tests for checklist, protean fix
* implemented in-battle Terastallization, WIP stellar indicator and tera animation
* fixed bad merge
* expanded NUMBER_OF_MON_TYPES, cut down on TYPE_STELLAR hackiness, added Stellar type to summary
* fixed type indicators
* added tera logic to AI
* implemented code review changes, added B_TERA_ORB_NO_COST
* updated AI to calc damage with Tera when applicable; minor rework to AI gimmick handling
* fixed Tera Blast split choice occuring when not Terastallized
* fixed Tera Blast using Last Respects BP calcs
* added tera type to TrainerMon, code review tweaks
2024-04-24 11:17:46 +02:00
Alex
5b5b9e7e50
Revert "Organized pokemon graphics by generation ( #3868 )" ( #3959 )
...
This reverts commit b077d92731
2024-01-10 15:49:58 -03:00
MartyKen
b077d92731
Organized pokemon graphics by generation ( #3868 )
...
* VSync BENCHMARKs and avoid AdvanceRandom in tests (#3867 )
* Organized pokemon graphics per generation
title says it all
---------
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2024-01-08 20:48:12 +01:00
Eduardo Quezada
1fc712f153
Merge remote-tracking branch '_pret/master' into RHH/pr/upcoming/pret_20231210
...
# Conflicts:
# Makefile
# data/battle_scripts_1.s
# gflib/malloc.c
# gflib/malloc.h
# include/battle.h
# ld_script.ld
# ld_script_modern.ld
# src/battle_ai_script_commands.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/pokemon/species_info.h
# src/pokemon.c
2023-12-10 13:27:09 -03:00
Icedude907
81f397360e
Moved files - spinda spots, jp fonts, redyellowgreen_frame.bin
2023-11-12 14:28:11 +13:00
GriffinR
f4111d8082
Sync castform folder organization
2023-07-09 14:57:51 -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
Eduardo Quezada
4c57b84cd9
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230602
...
# Conflicts:
# graphics/pokemon/mawile/footprint.png
# src/battle_gfx_sfx_util.c
# src/fldeff_sweetscent.c
# src/pokedex.c
2023-06-02 11:45:28 -04:00
GriffinR
6fdf75bd8c
Support plain pixel conversion, convert spinda spots to .png
2023-05-11 13:41:38 -04: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
52e00ac603
Correct colors in summary_screen/tiles.png
2023-01-12 21:41:06 -05:00
GriffinR
12cbb0b30f
Colorize and combine birch_bag/birch_grass
2023-01-12 15:22:23 -05:00
Eduardo Quezada
6a57dcdc4c
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20221216
...
# Conflicts:
# src/data.c
# src/data/pokemon_graphics/front_pic_anims.h
2022-12-16 19:19:23 -03:00
tustin2121
cf6f343726
Use multi-include incbins for stormy_water
...
- Removes a special case rule from the make files.
2022-11-26 23:38:39 -05: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
GriffinR
3b1c8dfb17
Update list menu graphics
2022-11-09 19:44:58 -05:00
Eduardo Quezada
e4a439aa46
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
...
# Conflicts:
# src/data/bard_music/moves.h
# src/data/bard_music/pokemon.h
2022-10-30 12:30:38 -03:00
GriffinR
7223dbd62f
Merge branch 'master' into rme-update
2022-09-25 11:56:57 -04:00
Eduardo Quezada
1d7e8bd730
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909
...
# Conflicts:
# asm/macros/battle_ai_script.inc
# asm/macros/battle_script.inc
# data/battle_ai_scripts.s
# include/link_rfu.h
# src/pokemon.c
# src/pokemon_summary_screen.c
# src/sound.c
2022-09-13 16:22:42 -03:00
Eduardo Quezada
65108c3192
Cleaned trailing whitespace
2022-09-11 14:14:49 -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
GriffinR
cce9918908
Add Wnum_tiles to additional num_tiles rules
2022-08-18 23:13:27 -04:00
Martin Griffin
5e593a62fb
Ignore num_tiles if it would truncate non-transparent tiles ( #1729 )
2022-08-18 23:07:25 -04:00
GriffinR
bfdbbad468
Split naming screen palettes/graphics, use correct image palettes, clean up
2022-08-09 09:27:28 -04:00
sneed
ef496ddb9d
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into cherrim
2022-05-19 00:54:16 +03:00
sneed
09bace2b26
fix cherrim sprite
2022-05-19 00:40:54 +03:00
sneed
5a4c165bea
fix 4bpp instead of gbapal
2022-05-18 21:27:47 +03:00
sneed
49abca345d
back_normal.4bpp to normal/back.4bpp
2022-05-18 21:11:39 +03:00
sneed
8c15c5b6d7
fix castform sprite
2022-05-18 20:47:14 +03:00
ultima-soul
84a7f960c8
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2022-02-28 23:37:41 -08:00
GriffinR
8b43cffe09
Move remaining region map graphics to region map folder
2022-02-22 18:43:23 -05:00
GriffinR
4dec9b83a3
Move more graphics out of misc
2022-01-14 12:29:30 -05:00
GriffinR
01af8e877f
Move starter choose out of interface/misc
2022-01-11 17:49:08 -05:00
GriffinR
694aa3c65d
Move balls, shop, link, map popups, and bag out of interface
2022-01-11 13:53:23 -05:00
GriffinR
565dd24309
Move party menu graphics out of interface
2022-01-11 11:37:13 -05:00
GriffinR
23f5c9fd5c
Clean up pokedex_area_screen
2021-12-31 00:16:56 -05:00
ultima-soul
01a90ca6c2
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-11-27 22:17:05 -08:00
ultima-soul
57bf1c7824
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-11-21 10:41:12 -08:00
GriffinR
baeacbe2f1
Clean up pokenav general menus, organize pokenav graphics
2021-11-12 17:08:12 -05: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
GriffinR
a470e2c761
Tabs to spaces for graphics_file_rules alignment
2021-10-27 14:07:56 -04:00
GriffinR
41ecae91f8
Label remaining symbols in graphics.c
2021-10-27 13:47:18 -04:00
ultima-soul
cf0fd961b9
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-04-28 23:56:58 -07:00
ultima-soul
0da3f74a7e
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-04-28 18:58:38 -07:00
GriffinR
18f85b5cf0
Merge pull request #1415 from GriffinRichards/doc-contestutil
...
Some Contest clean up
2021-04-27 02:29:41 -04:00
GriffinR
dbe24f0baa
Clean up contest_painting
2021-04-21 20:04:12 -04:00
GriffinR
838a452363
Doc storage - choose box menu, move wallpaper gfx
2021-04-15 18:46:20 -04:00
