Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-10 05:43:22 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,563 Commits 2 Branches 0 Tags 366 MiB
e78094de85
Commit Graph

426 Commits

Author SHA1 Message Date
GriffinR
519443e214 Sync battle transitions 2022-11-18 21:16:08 -05:00
GriffinR
a7609df31b Sync union_room_player_avatar 2022-11-08 13:37:11 -05:00
GriffinR
9983b41c1d Sync union room 2022-11-08 01:19:15 -05:00
cbt6
8998b19435 Document src/event_object_movement.c 2022-11-07 14:53:37 +08:00
cbt6
dea9552563 Document src/event_data.c 2022-11-07 14:52:23 +08:00
GriffinR
2abdb6aa41
Merge pull request #572 from GriffinRichards/sync-mgfitview 
Sync wonder card / news screens
 2022-11-01 16:20:36 -04:00
GriffinR
52591dcee4
Merge pull request #570 from pret/porymap-5 
Update for Porymap 5.0.0
 2022-10-30 11:01:30 -04:00
GriffinR
8aae7ac7f3 Sync pokedex constants 2022-10-29 23:46:39 -04:00
GriffinR
8c887bca44 Sync mystery_gift_show_card 2022-10-27 15:49:53 -04:00
GriffinR
f096196c91
Merge branch 'master' into porymap-5 2022-10-27 14:16:25 -04:00
GriffinR
2b2bf84502 Use actual flag values for hidden items 2022-10-25 14:51:01 -04:00
GriffinR
c77adaf6bf Sync map data macros 2022-10-25 14:31:01 -04:00
GriffinR
32ab6087d8
Merge pull request #484 from GriffinRichards/clone-union 
Separate connection clone objects from normal objects
 2022-10-17 21:29:52 -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
lioniac
fe757ff8ae
Updated vars.h 2022-09-26 10:31:44 -03: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
GriffinR
bfd1fb2419 MAP_NONE -> MAP_DYNAMIC, treat warp ids as strings to allow constants 2022-09-03 14:59:18 -04:00
GriffinR
0400ee2124
Merge branch 'master' into clone-union 2022-09-03 14:31:04 -04:00
GriffinR
76ec1837aa Merge branch 'master' of https://github.com/pret/pokefirered into sync-cableclub 2022-09-03 14:19:50 -04:00
GriffinR
17a8498701 Fix battle message charmap copied from emerald 2022-08-30 14:07:57 -04:00
GriffinR
321f5371d8 Sync cable club 2022-08-25 18:48:54 -04:00
GriffinR
da955aaf64 Document safari reactions, move b string ids to constants 2022-08-23 11:11:50 -04: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
feb3d9cbab
Merge pull request #537 from GriffinRichards/doc-bmsg 
Sync/document battle_message.c
 2022-08-23 10:45:48 -04: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
GriffinR
17b2faa182 Sync battle anim - scripts 2022-08-19 01:07:53 -04:00
GriffinR
5813cb43c2 Sync battle anim.c 2022-08-17 15:57:46 -04:00
GriffinR
ab56ac41a1
Merge branch 'master' into clone-union 2022-08-17 15:41:50 -04:00
GriffinR
5dc80c492a
Merge pull request #532 from AsparagusEduardo/pokefirered_pokeemeraldSync3 
Sync src/battle_util.c with pokeemerald
 2022-08-17 11:29:51 -04:00
GriffinR
0c74385de7 Sync battle anim - effects 3 2022-08-16 14:23:32 -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
a064849864 Sync/document battle_message.c 2022-08-12 13:58:24 -04:00
cbt6
7233b2ed0a Rename WalkFastest functions to WalkFaster 2022-08-11 12:21:28 +08:00
GriffinR
2b93687ade Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union 2022-08-10 13:48:30 -04:00
GriffinR
fbdbc5851c Add npc text color constants 2022-08-09 16:06:51 -04:00
GriffinR
acb480f1c1 Sync event.inc and scrcmd.c 2022-08-09 15:10:38 -04:00
Eduardo Quezada
ac973aa38d Sync src/battle_util.c with pokeemerald 2022-08-07 22:37:10 -04:00
GriffinR
3fd7e08ae1
Merge pull request #529 from GriffinRichards/rename-viridian 
Rename Viridian City houses
 2022-08-06 12:53:54 -04:00
GriffinR
507b284353 Celadon water -> cycling road water 2022-08-06 02:31:19 -04:00
GriffinR
daf293b9ab Rename Viridian City houses 2022-08-05 15:51:27 -04:00
GriffinR
1640f8b835 Document metatile behaviors 2022-08-05 15:27:08 -04:00
Eduardo Quezada
b1bc05ec05 Review changes 2022-08-01 15:37:00 -04:00
Eduardo Quezada
19a521fe33 Almost complete battle_scripts_1.s sync 2022-08-01 01:05:18 -04:00