Commit Graph

1345 Commits

Author SHA1 Message Date
GriffinR
c212795217 Fix index comment for ScrCmd_playslotmachine 2023-05-31 21:47:33 -04:00
GriffinR
a2f30a3382
Merge pull request #611 from GriffinRichards/sync-pokemon
Sync pokemon.c
2023-03-18 13:24:51 -04:00
cbt6
242bb41682 Document src/graphics.c 2023-03-11 23:57:01 +08:00
GriffinR
ab417d1255 Sync pokemon.c 2023-03-06 15:23:11 -05:00
SphericalIce
8e2d4b179e Add missing newline in gOakSpeech_Text_LetsGo 2022-12-31 14:48:57 +00:00
SphericalIce
2070ea7896 Format strings in new_game_intro.inc 2022-12-31 14:42:41 +00:00
SphericalIce
0348b58899 Rename gOakText_AskPlayerGender to fit naming convention 2022-12-31 14:39:34 +00:00
SphericalIce
d080ebd0f0 Document oak_speech.c 2022-12-30 23:59:45 +00:00
GriffinR
fd81669091 Remove old move descriptions 2022-12-16 09:46:31 -05:00
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
a19cb44458 Clean up mystery gift sync, document wonder news 2022-11-22 01:58:30 -05:00
GriffinR
6d6f207eb4 Initial mystery gift sync 2022-11-19 21:01:35 -05:00
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
GriffinR
403cbeded2 Fix Marcos/Macros typo 2022-10-30 22:01:45 -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
5dfc494c00 Convert tilesets.s to C 2022-10-08 03:54:27 -04:00
GriffinR
aeb1c74bbf Label remaining scripts 2022-10-05 15:32:51 -04:00
GriffinR
7b2da8e402 Sync/document the rest of strings.c 2022-09-13 14:48:54 -04: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
ccd527b782
Merge pull request #542 from GriffinRichards/sync-cableclub
Sync cable club
2022-09-03 14:27:13 -04:00
GriffinR
56fead7d16
Merge pull request #543 from Jaizu/common_movement_naming
Add Common_ to movements.inc
2022-09-03 14:20:33 -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
Jaizu
ce612de462 Add Common_ to movements.inc 2022-08-28 16:51:45 +02:00
GriffinR
321f5371d8 Sync cable club 2022-08-25 18:48:54 -04:00
GriffinR
feccd302d7
Merge pull request #540 from GriffinRichards/sync-b-anim
Sync battle anim
2022-08-25 10:09:32 -04:00
GriffinR
b06d2045fc Script_HeartIcon -> Script_XIcon 2022-08-24 18:17:18 -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
GriffinR
b3590324b8 Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim 2022-08-19 11:30:00 -04:00
GriffinR
c976547c02 Clean up FRLG-specific anim scripts 2022-08-19 10:11:39 -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
c0b0e87f68 Sync battle anim - status effects 2022-08-17 15:14:30 -04:00
GriffinR
4e106d86e3 Sync battle anim - sound tasks 2022-08-17 14:44:26 -04:00
GriffinR
8601b4fff3 Sync battle anim - smokescreen 2022-08-17 14:29:23 -04:00
GriffinR
a1fcfa2f26 Sync battle anim - normal 2022-08-17 13:30:22 -04:00
GriffinR
9552ea6330 Sync battle anim - ice 2022-08-17 12:18:06 -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
GriffinR
bcab96fb86 Sync battle anim - effects 2 2022-08-16 13:54:37 -04:00