Commit Graph

3563 Commits

Author SHA1 Message Date
Eduardo Quezada
616ab63d94 More sync with battle controllers 2022-08-20 16:13:03 -04:00
GriffinR
8a793e73a5 Sync link_rfu_2 2022-08-19 15:27:54 -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
219a38578a Sync battle anim - script funcs 2022-08-19 10:29:25 -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
a3c2108af7 Sync battle anim - flying, header cleanup 2022-08-18 14:20:25 -04:00
Eduardo Quezada
2f03c4a62c src/battle_controller_link_opponent.c 2022-08-18 14:17:56 -04:00
Eduardo Quezada
9020751fc4 triedShinyMonAnim 2022-08-18 14:17:35 -04:00
Eduardo Quezada
9205e7ad67 Uses of DISPLAY_WIDTH 2022-08-18 14:02:08 -04:00
Eduardo Quezada
27e81b2fc7 UnusedControllerStruct 2022-08-18 12:59:38 -04:00
Eduardo Quezada
26e8d57ba1 Special Trainer IDs 2022-08-18 12:58:27 -04:00
Eduardo Quezada
e37c78c73f Usage of ST_OAM_AFFINE constants 2022-08-18 12:10:09 -04:00
Eduardo Quezada
5f81a9834f GetBattlerSpriteCoord and GetBattlerSpriteCoord2 using BATTLER_COORD_* constants 2022-08-18 12:00:13 -04:00
Eduardo Quezada
57374b796b Sync src/battle_controllers.c 2022-08-18 11:32:26 -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
f476806547 Sync battle anim - rock 2022-08-17 14:18:30 -04:00
GriffinR
96ecc82c98 Sync battle anim - poison, psychic 2022-08-17 13:52:24 -04:00
GriffinR
a1fcfa2f26 Sync battle anim - normal 2022-08-17 13:30:22 -04:00
GriffinR
efa422d6fa Sync battle anim - mons 2022-08-17 13:14:34 -04:00
GriffinR
1711490e16 Sync battle anim - mon movement 2022-08-17 12:31:28 -04:00
GriffinR
9552ea6330 Sync battle anim - ice 2022-08-17 12:18:06 -04:00
GriffinR
56f8b1a47c
Merge pull request #536 from GriffinRichards/sync-data
Sync data.c
2022-08-17 11:36:07 -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
a67c9aeda6
Merge pull request #539 from GriffinRichards/town-map
Format town map sprite
2022-08-17 11:24:32 -04:00
GriffinR
b0acce4fbc Format town map sprite 2022-08-17 09:25:32 -04:00
GriffinR
3a0cd4180d Sync battle anim - ground 2022-08-16 15:38:51 -04:00
GriffinR
ba890e57a4 Sync battle anim - ghost 2022-08-16 15:27:42 -04:00
GriffinR
796d307ffb Sync battle anim - fire 2022-08-16 15:15:07 -04:00
GriffinR
b598507a2e Sync battle anim - fight 2022-08-16 14:51:48 -04:00
GriffinR
ba6bb34226 Sync battle anim - electric 2022-08-16 14:35:37 -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
GriffinR
89774bfdac
Merge pull request #538 from cbt6/movement
Document remaining movement types and actions
2022-08-16 00:51:01 -04:00
cbt6
73f8a54aa9 Document remaining movement types and actions 2022-08-16 12:24:18 +08:00
Eduardo Quezada
5135d64501 Review changes 2022-08-15 20:42:34 -04:00
GriffinR
f1fddd83f9
Merge pull request #535 from cbt6/movement-action
Sync movement action functions
2022-08-15 15:19:20 -04:00
GriffinR
b15305378a Sync battle anim - effects 1 2022-08-15 15:17:18 -04:00
cbt6
2644dd9c21
Merge branch 'master' into movement-action 2022-08-15 12:54:47 +08:00
GriffinR
102dc65fd1 Sync battle anim - dragon 2022-08-14 18:36:29 -04:00
GriffinR
92a193aa71 Sync battle anim - dark 2022-08-14 18:30:55 -04:00
GriffinR
e4aec1b6d1 Sync battle anim - bug 2022-08-14 18:21:03 -04:00
GriffinR
702d43e742 Rename battle anim files 2022-08-14 18:02:16 -04:00
GriffinR
b3c2c7291f
Merge pull request #534 from GriffinRichards/sync-scriptcmds
Sync script commands
2022-08-14 17:28:52 -04:00
GriffinR
442935bba0 Delete random text file 2022-08-12 20:02:49 -04:00
GriffinR
1040b2a66a Restore NUM_LOAF_STRINGS 2022-08-12 15:42:26 -04:00