Commit Graph

48 Commits

Author SHA1 Message Date
GriffinR 673c86c56f Merge branch 'master' into sync-text 2022-11-26 18:08:49 -05:00
GriffinR e78094de85 Document fonts 2022-11-22 14:20:27 -05:00
GriffinR 3c3101b72c Sync mevent file names 2022-11-19 18:39:26 -05:00
GriffinR c8562b05ab Merge pull request #580 from GriffinRichards/sync-rfu2
Sync wireless link
2022-11-14 11:39:05 -05:00
cbt6 c257ba1e6b Document src/battle_interface.c 2022-11-14 23:50:20 +08:00
GriffinR 9983b41c1d Sync union room 2022-11-08 01:19:15 -05:00
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 76ec1837aa Merge branch 'master' of https://github.com/pret/pokefirered into sync-cableclub 2022-09-03 14:19:50 -04:00
GriffinR 321f5371d8 Sync cable club 2022-08-25 18:48:54 -04:00
GriffinR 72f76b19b3 Sync script.c 2022-08-22 20:27:23 -04:00
Eduardo Quezada e37c78c73f Usage of ST_OAM_AFFINE constants 2022-08-18 12:10:09 -04:00
Eduardo Quezada 57374b796b Sync src/battle_controllers.c 2022-08-18 11:32:26 -04:00
cbt6 686c8383e5 Document src/save.c 2022-08-05 14:18:53 +08:00
Eduardo Quezada 95dd979f09 Font constants and slight PSS sync 2022-07-31 21:00:27 -04:00
Eduardo Quezada 60ce72fa5a Synced src/mon_markings.c and partly synced PSS 2022-07-30 12:29:20 -04:00
Eduardo Quezada c97e88b437 Review changes 2022-07-29 16:57:13 -04:00
Eduardo Quezada 7f53f533bb Synced src/battle_script_commands.c 2022-07-29 09:42:03 -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 611112269e StringCopy10 to StringCopy_Nickname 2022-07-27 14:35:19 -04:00
Eduardo Quezada 3b98289de2 BeginNormalPaletteFade PALETTES_ALL documentation 2022-07-27 13:16:28 -04:00
GriffinR b2c74cae84 Sync global 2021-11-19 20:36:59 -05:00
PikalaxALT aec808ac0d Flatten pos fields in struct Sprite 2021-07-07 09:05:48 -04:00
PikalaxALT 8ccf95e502 Label unnamed symbols in trade_scene, 1 2021-03-19 08:51:05 -04:00
PikalaxALT 89faf387db Document remaining symbols in daycare.c 2021-03-19 08:29:25 -04:00
PikalaxALT c779411957 Sync EVO_MODE consts from emerald 2021-03-18 13:14:08 -04:00
PikalaxALT 4d86834d12 Document item use functions in pokemon.c 2021-03-16 21:16:31 -04:00
PikalaxALT 2f4f63afdb Document old man batttle controller 2021-03-15 14:27:50 -04:00
GriffinR 1f6dc0e86b Use trainer constants in flags, automatically update flags/vars count 2021-01-29 15:50:01 -05:00
GriffinR bb56d4a3f4 Give songs meaningful english names 2020-08-29 03:11:03 -04:00
PikalaxALT aea30489fc Create COPYWIN defines for CopyWindowToVram calls 2020-04-10 16:17:46 -04:00
PikalaxALT ea207f6334 Clean up includes 2020-04-08 17:03:26 -04:00
PikalaxALT f0fe4904d0 through sub_8056918 2020-03-28 14:03:51 -04:00
GriffinR cbe6e27f37 region_map.h to region_map_sections.h 2020-03-11 01:04:27 -04:00
GriffinR f66d0dfce3 Move graphics.s through pokemon to src 2020-02-22 11:49:09 -05:00
PikalaxALT b7c28c4be7 Remove redundant include lines 2020-02-21 15:00:56 -05:00
PikalaxALT aa4a979334 More function documentation in union_room, link, link_rfu_2 2020-02-12 15:32:14 -05:00
PikalaxALT 78caeff45b Name remaining funcs in union_room.c 2020-02-06 10:44:22 -05:00
PikalaxALT 4770fac9eb More mevent documentation 2020-02-04 14:16:45 -05:00
GriffinR 2908c9fa95 Document some misc small scripts 2020-01-20 15:17:34 -05:00
GriffinR 04d176334a Document some Quest Log 2020-01-15 16:00:45 -05:00
PikalaxALT e7cb5476c4 Port evolution_scene 2019-11-20 11:08:30 -05:00
PikalaxALT 36bea47ea6 Static symbols in easy_chat 2019-11-01 15:59:24 -04:00
PikalaxALT eff29ff7ae Fix typos 2019-10-31 09:04:51 -04:00
PikalaxALT f86bb07027 Review comments and documentation 2019-10-30 21:06:15 -04:00
PikalaxALT 1ba6cb2245 Some renaming; resolve trade bss 2019-10-30 16:51:43 -04:00
PikalaxALT 4fae033d1a Finish trade_scene data 2019-10-30 16:01:31 -04:00
PikalaxALT 84e1b97eac Ape trade graphics from Emerald 2019-10-30 15:09:13 -04:00
PikalaxALT f6d768d5ed Trade data; split off trade_scene 2019-10-30 14:20:32 -04:00