 GriffinR
|
398417593b
|
Merge pull request #549 from AsparagusEduardo/pret_unused
Removed UNUSED attribute
|
2022-09-12 14:47:25 -04:00 |
|
|
GriffinR
|
0a01d8f31b
|
Merge pull request #545 from GriffinRichards/sync-fieldmap
Sync fieldmap
|
2022-09-12 14:31:51 -04:00 |
|
|
GriffinR
|
faac89f686
|
Merge pull request #548 from AsparagusEduardo/pokefirered_pokeemeraldSync4
pokeemerald sync No. 4
|
2022-09-05 21:00:13 -04:00 |
|
|
Eduardo Quezada
|
7dcac240d4
|
Review changes
|
2022-09-04 21:23:24 -03:00 |
|
|
Eduardo Quezada
|
b6bc114ef1
|
Review suggestions
|
2022-09-04 20:56:14 -03: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
|
b3c7b9e09f
|
Merge pull request #547 from cbt6/field-moves
Document field moves
|
2022-09-04 10:52:05 -04:00 |
|
|
cbt6
|
dbaf8f5900
|
Document field moves
|
2022-09-04 17:55:15 +08: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
|
097fc309f6
|
Merge pull request #546 from cbt6/pokemon-storage
Document Pokemon storage system
|
2022-09-03 14:11:29 -04:00 |
|
|
cbt6
|
3a1994f7f7
|
Rearrange Pokemon storage source files
|
2022-09-03 23:35:07 +08:00 |
|
|
cbt6
|
c0bf576445
|
Organize Pokemon storage graphics
|
2022-09-03 23:30:02 +08:00 |
|
|
cbt6
|
859ca7994e
|
Document Pokemon storage system
|
2022-09-03 23:27:56 +08:00 |
|
|
GriffinR
|
d5dfd66812
|
CpuFastFill -> CpuFastFill16 in fieldmap
|
2022-09-02 19:42:26 -04:00 |
|
|
GriffinR
|
dcdf31f020
|
Sync fieldmap
|
2022-09-02 19:24:59 -04:00 |
|
|
GriffinR
|
a30ea109c1
|
Merge pull request #544 from GriffinRichards/fix-b-msg
Fix battle message charmap copied from emerald
|
2022-09-01 23:08:21 -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
|
7c0b46f6da
|
Merge pull request #541 from GriffinRichards/sync-script
Sync script.c
|
2022-08-26 23:55:31 -04: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
|
72f76b19b3
|
Sync script.c
|
2022-08-22 20:27:23 -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
|
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
|
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 |
|