ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-02 15:50:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,082 Commits 1 Branch 0 Tags 235 MiB
221e38ff86
Commit Graph

37 Commits

Author SHA1 Message Date
ultima-soul
0312c5be8b Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-27 21:38:26 -08:00
ultima-soul
3ed51d6d91 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-21 10:40:26 -08:00
GriffinR
ecb13cdbf7
Merge pull request #1550 from GriffinRichards/doc-pokenav 
Document Pokénav
 2021-11-17 14:47:34 -05:00
GriffinR
4590887359 Clean up some register constant use 2021-11-10 17:01:21 -05:00
GriffinR
ae2602b5a5 Add missing BATTLER_COORD usage 2021-11-08 11:54:29 -05:00
GriffinR
41ecae91f8 Label remaining symbols in graphics.c 2021-10-27 13:47:18 -04:00
GriffinR
31b501e7eb Start misc battle documentation 2021-10-08 16:39:46 -04:00
LOuroboros
554210c5e3 Removed trailing spaces in the most relevant files 
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
 2021-08-24 19:59:32 -03:00
ultima-soul
02c9e040df Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-11 16:33:10 -07:00
PikalaxALT
810ca5f8ff Flatten pos fields in struct Sprite 2021-07-07 09:11:52 -04:00
ultima-soul
14a0303e2f Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-27 18:36:37 -07:00
GriffinR
62abcecc54 More usage of DISPLAY constants 2021-04-15 02:22:24 -04:00
ultima-soul
5bab9474dc Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-03-22 23:08:19 -07:00
Marcus Huderle
a85fada314 Document more battle anim effects 2021-02-28 09:54:55 -06:00
GriffinR
ea748ff7f5
Merge pull request #1344 from GriffinRichards/doc-ec 
Document easy chat and mail, script.c cleanup, add/use some general constants
 2021-02-28 10:26:49 -05:00
Marcus Huderle
c323e7f061 Document some battle anim funcs and data 2021-02-27 11:04:45 -06:00
GriffinR
a5852d57d1 Use TASK_NONE constant 2021-02-24 11:03:25 -05:00
ultima-soul
2a20d50904 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-02-01 15:54:08 -08:00
GriffinR
b65980cd4e Remove unused local variables and functions 2021-01-19 18:19:33 -05:00
ExpoSeed
429df3c319
Merge pull request #571 from LOuroboros/new_surf_pal 
Added functionality to the B_NEW_SURF_PARTICLE_PALETTE anim. config label
 2020-11-10 11:37:07 -06:00
ultima-soul
99fdc13e61 Merge branch 'master' into battle_engine_sync 2020-11-07 15:59:20 -08:00
LOuroboros
ea99195194 Added functionality to the B_NEW_SURF_PARTICLE_PALETTE anim. config label 2020-11-06 22:29:20 -03:00
Kurausukun
03f46ff23a re-match battle_anim_water functions (from #1136) 2020-10-21 04:41:57 -04:00
Kurausukun
c8e832980b re-match CreateWaterPulseRingBubbles 2020-10-19 06:37:00 -04:00
Kurausukun
56c3eefd9f re-match RotateAuroraRingColors_Step 2020-10-19 06:15:35 -04:00
aaaaaa123456789
7dc95a0103 Undo PokeCodec's PRs 
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.

Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
 2020-09-13 06:30:55 -03:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
PokeCodec
35dca16a3d matching 2020-08-13 21:20:55 -04:00
pi1024e
f39de3f503 terminal newline 2020-07-29 22:47:03 -04:00
PokeCodec
b39047226b Match CreateWaterPulseRingBubbles 2020-07-29 22:44:19 -04:00
DizzyEggg
0066640a1e Merge with master 2020-07-27 14:51:39 +02:00
PokeCodec
97ceca6527 Match AnimTask_RotateAuroraRingColors_Step 2020-07-21 16:11:11 -04:00
Evan
fdc6e80e1e fix anim defines 2020-05-28 12:19:07 -06:00
Evan
6c20a49dc6 animations for all moves 2020-05-25 00:37:32 -06:00
Philipp AUER
f1f4000914
anim: add some animation moves (#383) 
- fell stinger
 - draining kiss
 - kings shield (==protect)
 - scald
 - fire pledge
 - water pledge
 - grass pledge

Co-authored-by: SBird <sbird@no.tld>
 2020-05-24 18:14:59 +02:00
DizzyEggg
6968124529 Merge battle anim documentation 2020-02-29 13:59:41 +01:00
GriffinR
51cd0ac081 Rename battle anim type files, remove unneeded ARG_RET_IDs 2020-02-25 12:54:08 -06:00