Commit Graph

22 Commits

Author SHA1 Message Date
Eduardo Quezada 9241dc6fe7 Merge remote-tracking branch 'pret/master' into pokefirered_pokeemeraldSync4
# Conflicts:
#	include/battle.h
#	include/cable_club.h
#	src/battle_anim_fire.c
#	src/battle_anim_ghost.c
#	src/battle_anim_ground.c
#	src/battle_message.c
#	src/cable_club.c
2022-09-04 17:44:13 -03:00
GriffinR a5853a71bd Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim 2022-08-23 10:47:07 -04:00
GriffinR 17b2faa182 Sync battle anim - scripts 2022-08-19 01:07:53 -04:00
Eduardo Quezada 9205e7ad67 Uses of DISPLAY_WIDTH 2022-08-18 14:02:08 -04:00
GriffinR a064849864 Sync/document battle_message.c 2022-08-12 13:58:24 -04:00
Eduardo Quezada c97e88b437 Review changes 2022-07-29 16:57:13 -04:00
Eduardo Quezada f5e9cc595b Multiple changes
- BATTLESTRINGS_ID_ADDER ->BATTLESTRINGS_TABLE_START
- Defines for battle windows
- MAIL_NONE
- MON_DATA_FILLER -> MON_DATA_UNUSED_RIBBONS
- Usage of BattlePutTextOnWindow with masks
- PlayCry1 -> PlayCry_Normal
- BlendPalettes(0xFFFFFFFF -> BlendPalettes(PALETTES_ALL
- FillPalette(0 -> FillPalette(RGB_BLACK
2022-07-27 18:14:48 -04:00
Eduardo Quezada 3b98289de2 BeginNormalPaletteFade PALETTES_ALL documentation 2022-07-27 13:16:28 -04:00
PikalaxALT aec808ac0d Flatten pos fields in struct Sprite 2021-07-07 09:05:48 -04:00
PikalaxALT 783488aae5 Name nullsubs in battle ctlrs 2021-03-16 16:41:28 -04:00
PikalaxALT 2f4f63afdb Document old man batttle controller 2021-03-15 14:27:50 -04:00
PikalaxALT 31f4edbe50 Document more symbols in battle 2021-03-14 20:10:19 -04:00
Evan fcb999beea document battle_message.c 2020-05-01 19:54:35 -06:00
PikalaxALT a622448029 More quest log documentation amid other stuff 2020-04-05 20:30:45 -04:00
PikalaxALT 898bd24438 gflib propagation, 1 2020-04-02 20:40:15 -04:00
PikalaxALT b7c28c4be7 Remove redundant include lines 2020-02-21 15:00:56 -05:00
jiangzhengwenjz 2bd15329e0 minor fixes
and remove unnecessary NONMATCHING
2019-08-28 14:57:16 +08:00
jiangzhengwenjz 23b2a0cc9f battle_controller_link_partner 2019-08-23 05:12:27 +08:00
jiangzhengwenjz 6a063cf74a ported battle_controller_opponent from pokeem and corrected lots of stuff 2019-08-03 06:55:42 +08:00
jiangzhengwenjz 742a7ee1be ported reshow_battle_screen from pokeem 2019-08-02 07:28:09 +08:00
jiangzhengwenjz 045331d139 ported battle_controllers from pokeem 2019-07-31 07:58:09 +08:00
jiangzhengwenjz a4263a6bd8 ported battle_controller_safari from pokeem 2019-07-31 07:58:08 +08:00