Commit Graph

144 Commits

Author SHA1 Message Date
GriffinR 398417593b Merge pull request #549 from AsparagusEduardo/pret_unused
Removed UNUSED attribute
2022-09-12 14:47:25 -04:00
Eduardo Quezada 81ef26732d Removed UNUSED attribute 2022-09-04 18:06:58 -03: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
cbt6 dbaf8f5900 Document field moves 2022-09-04 17:55:15 +08:00
Eduardo Quezada 616ab63d94 More sync with battle controllers 2022-08-20 16:13:03 -04:00
GriffinR b3590324b8 Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim 2022-08-19 11:30:00 -04:00
Eduardo Quezada e37c78c73f Usage of ST_OAM_AFFINE constants 2022-08-18 12:10:09 -04:00
GriffinR 5813cb43c2 Sync battle anim.c 2022-08-17 15:57:46 -04:00
GriffinR 56f8b1a47c Merge pull request #536 from GriffinRichards/sync-data
Sync data.c
2022-08-17 11:36:07 -04:00
cbt6 73f8a54aa9 Document remaining movement types and actions 2022-08-16 12:24:18 +08:00
cbt6 2644dd9c21 Merge branch 'master' into movement-action 2022-08-15 12:54:47 +08:00
GriffinR 874f1c9832 Sync data.c 2022-08-12 12:07:43 -04:00
cbt6 7233b2ed0a Rename WalkFastest functions to WalkFaster 2022-08-11 12:21:28 +08:00
cbt6 84848deb14 Rename movement action funcs 2022-08-11 12:20:07 +08:00
cbt6 79ae1e4f14 Use constants for movement speeds 2022-08-11 12:18:04 +08:00
cbt6 1d4503ab46 Sync jump movement functions 2022-08-11 12:17:00 +08:00
GriffinR 0e8b639fae Sync dbp - rename files 2022-08-07 13:55:50 -04:00
GriffinR 12fdf455ce Merge dodrio_berry_picking 1 and 2, sync function names 2022-08-06 20:40:11 -04:00
Eduardo Quezada dcb9d9de1e Synced src/pokeball.c 2022-07-29 21:39:25 -04:00
Eduardo Quezada c40791fd4e SPRITE_INVALID_TAG -> TAG_NONE 2022-07-29 18:37:43 -04:00
Eduardo Quezada 7f53f533bb Synced src/battle_script_commands.c 2022-07-29 09:42:03 -04:00
Eduardo Quezada 0709da5867 Multiple changes 2 2022-07-28 01:20:05 -04:00
cbt6 56ca6d4bcc Document src/field_effect.c 2022-07-13 04:07:52 +08:00
GriffinR cd9d40b3cd Add usage of ANIM_GET_ON_OFF_POKEMON_WEST, unused comments 2022-02-28 15:10:53 -05:00
GriffinR a5e6e91605 Document/sync object event anims 2022-02-28 13:17:57 -05:00
cbt6 0aaae88d6e Rename movement action 0x9F 2022-02-28 23:12:57 +08:00
cbt6 ac3de6d02c Rename some movement actions and functions 2022-02-10 00:20:22 +08:00
GriffinR 08a18d6e32 Sync/update trainer classes 2022-01-10 13:48:08 -05:00
PikalaxALT d30ba3b1fe Port pal tag names from Emerald 2021-05-08 14:28:08 -04:00
PikalaxALT c94617db96 Match pal tag names with their values 2021-05-08 11:41:38 -04:00
PikalaxALT a64b074e7d Rename palette tags and files 2021-05-08 11:34:38 -04:00
PikalaxALT e07dd9507b Name used object event palette tags 2021-05-08 10:27:52 -04:00
PikalaxALT fecbee43d3 Name gObjectEventPal_xxx objects 2021-05-04 09:51:48 -04:00
PikalaxALT e4c733d95d Move field effect graphics resources, 2 2021-05-03 16:54:07 -04:00
PikalaxALT 9ce96141c8 Move event gfx resources, 1 2021-05-03 16:23:01 -04:00
PikalaxALT 014dd7f0be Sync field_effect_objects.h from Emerald 2021-05-03 15:22:13 -04:00
PikalaxALT 7f50753360 Sync field_effect_object_template_pointers.h with Emerald 2021-05-03 14:09:21 -04:00
PikalaxALT cb90fda18d Refactor some field effect graphics 2021-05-03 13:27:37 -04:00
GriffinR d21090cf04 Merge pull request #406 from hjk321/index-graphics
Document, Index, and Prettify Graphics, Part 1 (A-H)
2021-04-23 14:01:11 -04:00
GriffinR 851807f7ac Fix empty trainer party initializer 2021-04-14 16:10:37 -04:00
Kurausukun 4b182affb6 standardize "grey" to "gray" 2021-04-09 22:34:08 -04:00
hjk321 ea68ec3fd7 Merge battle graphics into battle_terrain and remove un-included files
The previous battle folder contained the used (and until recently undocumented) battle terrain graphics, while everything in the previous battle_terrain folder contained unused data (which is now at battle_terrain/unused, minus the files that never get included in the rom).
2021-03-30 23:34:31 -05:00
PikalaxALT f00b44699c Fix movement types; fix some math ops 2021-03-30 20:33:31 -04:00
PikalaxALT 45f75213c0 Some more quest log and field player avater documentation 2021-03-19 09:26:01 -04:00
PikalaxALT 2f4f63afdb Document old man batttle controller 2021-03-15 14:27:50 -04:00
Deokishisu fc623d2abf Rename "Hidden" Movement Type to "Buried"
This commit mirrors the change to pokeemerald that renames `MOVEMENT_TYPE_HIDDEN` to `MOVEMENT_TYPE_BURIED` to avoid confusion between it and `MOVEMENT_TYPE_INVISIBLE`.

As the files and function labels are not synced between the two repos, only the necessary changes were made based on what pokefirered calls its functions. More syncing of labels with pokeemerald will need to be done in the future.
2021-02-14 14:59:10 -05:00
GriffinR 1b84bd395d Fix warning about gMonPaletteTable section 2021-02-12 17:18:14 -05:00
GriffinR 1f6dc0e86b Use trainer constants in flags, automatically update flags/vars count 2021-01-29 15:50:01 -05:00
GriffinR f8a1bf14fb Merge pull request #371 from GriffinRichards/data-pokedex
Move pokedex_screen data from asm to C
2020-11-27 11:12:05 -05:00
Ashley Coleman 06b6853fb8 Rename farfetchd graphics to match define 2020-11-26 11:26:05 -08:00