Commit Graph

157 Commits

Author SHA1 Message Date
GriffinR
8fca2dcf26 Update gitignore/spacing for new region map data 2022-10-30 21:59:04 -04:00
GriffinR
f096196c91
Merge branch 'master' into porymap-5 2022-10-27 14:16:25 -04:00
GriffinR
a533ff70e7
Merge pull request #568 from GriffinRichards/tilesets-c
Convert tilesets.s to C
2022-10-10 12:48:37 -04:00
GriffinR
5dfc494c00 Convert tilesets.s to C 2022-10-08 03:54:27 -04:00
GriffinR
57e82c9264 Label movement action arrays, z coord -> elevation 2022-10-05 18:20:54 -04:00
cbt6
32573b2ba9 Document item use 2022-10-04 00:51:38 +08:00
GriffinR
a247433e20 Sync/document item_menu_icons.c 2022-10-01 23:42:11 -04:00
GriffinR
87def58265
Merge pull request #518 from GriffinRichards/format-obj
Reformat object event graphics info
2022-09-25 21:58:52 -04:00
GriffinR
7b5f4a00cb
Merge pull request #500 from garakmon/rme_updates
use json for region map sections
2022-09-25 21:58:27 -04:00
cbt6
61ad87a314 Document party menu 2022-09-17 14:29:32 +08:00
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
GriffinR
e46d7d4bca
Merge branch 'master' into format-obj 2022-08-06 18:36:52 -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
1ff0849127 Reformat object event graphics info 2022-07-02 16:42:36 -04:00
garakmon
c518cba3ec use json for region map sections
- also update wild encounters inja template to consider whitespace trimming
2022-04-21 20:21:58 -04: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