ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-10 13:45:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,403 Commits 1 Branch 0 Tags 235 MiB
017f44f5ac
Commit Graph

77 Commits

Author SHA1 Message Date
ultima-soul
23bf41713c Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-12-01 20:17:08 -08:00
LOuroboros
b042eb6436 gBattleTerrainTable -> sBattleTerrainTable 2021-11-28 01:22:27 -03: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
41ecae91f8 Label remaining symbols in graphics.c 2021-10-27 13:47:18 -04:00
GriffinR
d8e65fc4b6 More battle doc, add battle window ids 2021-10-09 03:01:10 -04:00
GriffinR
31b501e7eb Start misc battle documentation 2021-10-08 16:39:46 -04:00
ghoulslash
9d8672e3df merge with be 2021-09-16 13:12:59 -04:00
ultima-soul
02c9e040df Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-11 16:33:10 -07:00
ghoulslash
a37d4c3da9 merge with be, give life dew jungle healing effect 2021-07-25 08:22:05 -06: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
8368b753df More usage of WININ/OUT constants 2021-04-15 02:43:09 -04:00
ultima-soul
939608f5b8 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-02 13:16:40 -07:00
GriffinR
d5d1caf965 Add some uses of OBJ_VRAM/VRAM_SIZE 2021-03-30 15:07:04 -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
ultima-soul
2a20d50904 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-02-01 15:54:08 -08:00
Evan
c009b51ae8 add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot 2021-01-28 13:27:00 -07:00
GriffinR
a392cca928 Misc battle documentation 2021-01-23 00:40:31 -05:00
GriffinR
b9e1b050e1 Label remaining battle types 2021-01-13 15:20:29 -05:00
Evan
9ec67db8fa keep permanent terrain bg from party menu, bag 2020-11-24 17:03:40 -05:00
Evan
c026f705b3 permanent terrain move bgs 2020-11-17 19:45:27 -07:00
ultima-soul
99fdc13e61 Merge branch 'master' into battle_engine_sync 2020-11-07 15:59:20 -08: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
97d0643110 Merge with master 2020-09-08 12:48:28 +02:00
PokeCodec
d4158e490a Match more functions 2020-09-04 19:49:53 -04:00
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
DizzyEggg
060b795d8e Merge with master 2020-04-11 19:48:24 +02:00
GriffinR
8853588af0 Sync digit_obj_util 2020-04-08 16:27:11 -04:00
DizzyEggg
ac499bc896 Merge with master 2019-12-09 08:16:18 +01:00
GriffinR
c40879aa36 Use ST_OAM constants for OamData definitions 2019-12-06 19:05:44 -06:00
DizzyEggg
b4ac979600 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-11-10 12:09:43 +01:00
Marcus Huderle
01e6fb6dd0 Document some battle_bg-related things 2019-11-07 18:24:04 -06:00
DizzyEggg
f8713f9c15 Merge with master 2019-04-06 20:43:13 +02:00
DizzyEggg
b85a74afc5 Give names to battle anim backgrounds 2019-04-06 12:44:27 -05:00
DizzyEggg
8751fafad1 Make it compile 2019-04-05 07:53:23 -05:00
DizzyEggg
cd3de7821e Merge branch 'master' into battle_engine_v2 2019-04-02 08:37:54 +02:00
PikalaxALT
ade0183378 Document mystery_gift 2019-03-31 18:59:52 -04:00
DizzyEggg
54ab6b43dc Merge with master 2019-03-22 10:40:31 +01:00
Phlosioneer
9848f84b9e Use constants for Oam .shape and .size fields 
Also some general formatting fixes for constants.
 2019-03-16 12:37:04 -05:00
DizzyEggg
842e379a7b Merge branch 'master' into battle_engine_v2 2019-02-23 22:50:46 +01:00
garak
22657c7087 use BG_SCREEN_ADDR macro for tilemap addresses 2019-02-17 00:35:26 -05:00
garak
35575b57a0 use BG_CHAR_ADDR define 2019-02-16 23:51:06 -05:00
DizzyEggg
7bc4a3b3f7 Merge with master 2019-01-29 22:12:53 +01:00
Marcus Huderle
e81838dba3 Misc. documentation and move some data into .c files 2019-01-29 14:36:02 -06:00
DizzyEggg
517573eb4b Update with master 2018-12-26 17:46:51 +01:00
DizzyEggg
7f6f6c33ab Fix BgAttributes 2018-12-26 13:05:02 +01:00
DizzyEggg
6fa5f33519 Merge branch 'master' into battle_engine_v2 2018-12-24 09:07:18 +01:00
DizzyEggg
efa820469a move data to c 2018-12-23 14:52:47 +01:00
DizzyEggg
ef55bdac89 Merge branch 'master' into battle_engine_v2 2018-12-22 23:57:42 +01:00
DizzyEggg
9ffd0c7382 3.5 asm left 2018-12-17 23:00:08 +01:00