Eduardo Quezada D'Ottone
|
f78bb4fb84
|
Merge remote-tracking branch 'pret/master' into item_expansion
# Conflicts:
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
|
2022-07-12 17:42:32 -04:00 |
|
GriffinR
|
30a5821997
|
Merge pull request #1705 from sphericalice/move-unavailable
Introduces a MOVE_UNAVAILABLE constant
|
2022-07-12 11:32:57 -04:00 |
|
sphericalice
|
186f2c0232
|
Introduce a MOVE_UNAVAILABLE constant
|
2022-07-11 15:18:13 +01:00 |
|
LOuroboros
|
a1004485c5
|
Relocated TYPE_NAME_LENGTH and ABILITY_NAME_LENGTH
|
2022-07-10 20:08:28 -03:00 |
|
GriffinR
|
57222323c1
|
Merge pull request #1678 from GriffinRichards/const-frontier
Add some battle frontier constant usage
|
2022-06-18 10:22:58 -04:00 |
|
GriffinR
|
4660f8c88b
|
Document battle tower TV show
|
2022-06-14 09:37:39 -04:00 |
|
GriffinR
|
7143865f6f
|
Add some battle frontier constant usage
|
2022-06-09 12:57:28 -04:00 |
|
GriffinR
|
1f540845cb
|
Merge pull request #1675 from GriffinRichards/doc-arg
Document generic arguments
|
2022-06-09 11:11:02 -04:00 |
|
GriffinR
|
bc2dbd772e
|
Add warning to NUM_OBJ_EVENT_GFX
|
2022-06-03 16:18:34 -04:00 |
|
GriffinR
|
1ca1bff81c
|
Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into doc-arg
|
2022-06-03 15:43:21 -04:00 |
|
GriffinR
|
34438e6bc4
|
Continue documenting generic arguments
|
2022-06-03 15:38:03 -04:00 |
|
sphericalice
|
380cb46919
|
Correct CreateRegionMapPlayerIcon's argument names
Correct CreateRegionMapPlayerIcon's argument names in include/region_map.h
|
2022-06-03 15:04:52 +01:00 |
|
GriffinR
|
a8437493c1
|
Document generic argument names in battle anim palettes
|
2022-06-01 12:25:01 -04:00 |
|
GriffinR
|
5e6d8a77e4
|
Document some generic argument names
|
2022-05-31 14:34:25 -04:00 |
|
Martin Griffin
|
1cc59acca9
|
Static assertion for size of save structs
|
2022-05-25 19:48:42 +01:00 |
|
sneed
|
c8e08edbae
|
rename item1 and item2 in BaseStats
|
2022-05-23 19:10:24 +03:00 |
|
GriffinR
|
6d772a5e30
|
Merge pull request #1662 from GriffinRichards/door-gfx
Clean up door animations
|
2022-05-21 16:07:02 -04:00 |
|
GriffinR
|
5c8e1e81ea
|
Color single-palette door anim graphics
|
2022-05-18 12:41:20 -04:00 |
|
GriffinR
|
593e2c9be0
|
Fix inconsistent static s/g names
|
2022-05-17 14:00:02 -04:00 |
|
LOuroboros
|
1d75f3ffde
|
Moved order of defined header files in include/global.h
|
2022-05-13 10:51:49 -03:00 |
|
LOuroboros
|
12d956872b
|
Merge branch 'master' of https://github.com/pret/pokeemerald into iePretMerge
|
2022-05-13 03:18:37 -03:00 |
|
Eduardo Quezada D'Ottone
|
49905cee04
|
Ability Patch
|
2022-05-03 14:14:04 -04:00 |
|
GriffinR
|
fc5747f0f7
|
Merge pull request #1649 from GriffinRichards/clean-trainer
Trainer hill clean up
|
2022-04-20 00:20:44 -04:00 |
|
LOuroboros
|
eb1834ce84
|
Merge branch 'master' of https://github.com/pret/pokeemerald into iePret
|
2022-04-11 01:22:48 -03:00 |
|
GriffinR
|
328b925a08
|
Move trainer hill map data to bin files
|
2022-03-31 14:08:31 -04:00 |
|
GriffinR
|
62f3f144ab
|
Clean up some trainer hill
|
2022-03-31 12:54:07 -04:00 |
|
GriffinR
|
66cbe29c14
|
Add bugfix for Battle Factory trainer IVs
|
2022-03-30 09:37:03 -04:00 |
|
GriffinR
|
5160520639
|
Merge pull request #1642 from GriffinRichards/bstrings
Add usage of battle strings table offset constant
|
2022-03-14 16:40:54 -04:00 |
|
GriffinR
|
d664135572
|
Add usage of battle strings table offset constant
|
2022-03-10 10:44:04 -05:00 |
|
ultima-soul
|
2d3ba500c9
|
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
|
2022-03-01 15:10:19 -08:00 |
|
GriffinR
|
a2ee0c8393
|
Merge pull request #1639 from GriffinRichards/typo-hoppy
Fix bunny hoppy typo
|
2022-02-28 22:34:24 -05:00 |
|
GriffinR
|
5d58cdd297
|
Fix bunny hoppy typo
|
2022-02-28 13:34:39 -05:00 |
|
sphericalice
|
40efac0ddf
|
Rename GetBattlePyramindTrainerEncounterMusicId to fix typo
|
2022-02-22 19:13:17 +00:00 |
|
GriffinR
|
7d2344c07b
|
Merge pull request #1616 from GriffinRichards/missing-req
Add missing :req, remove old macros
|
2022-02-02 22:09:36 -05:00 |
|
GriffinR
|
2efbd5f549
|
Merge pull request #1608 from GriffinRichards/fix-fieldmap
Fix some incorrect fieldmap names
|
2022-01-26 17:51:56 -05:00 |
|
GriffinR
|
2495d18132
|
Add missing :req, remove old macros
|
2022-01-23 18:52:04 -05:00 |
|
LOuroboros
|
367ba2d5bf
|
Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into flingIE
|
2022-01-22 05:39:48 -03:00 |
|
GriffinR
|
3d0326106e
|
Z coord / height -> elevation
|
2022-01-21 12:48:19 -05:00 |
|
GriffinR
|
79dfac92c9
|
Merge pull request #1604 from GriffinRichards/clean-spinda
Document Spinda spot algorithm
|
2022-01-21 09:55:43 -05:00 |
|
GriffinR
|
fb81d9ad4a
|
Correct map data comment
|
2022-01-20 23:26:39 -05:00 |
|
Eduardo Quezada D'Ottone
|
7d75e16312
|
Small documentation and cleanup
|
2022-01-20 12:25:48 -03:00 |
|
GriffinR
|
062cdbe01c
|
Merge pull request #1599 from GriffinRichards/fix-tilemaps
Break up graphics/interface and graphics/misc
|
2022-01-20 08:53:44 -05:00 |
|
GriffinR
|
a7e6045d71
|
Merge pull request #1597 from GriffinRichards/misc-cleanup
Miscellaneous fixes
|
2022-01-19 22:17:37 -05:00 |
|
GriffinR
|
c4f33f2b2b
|
TRAVERSABLE->UNUSED, rename MB_SECRET_BASE_OBSTACLE
|
2022-01-19 12:54:55 -05:00 |
|
GriffinR
|
e682c12519
|
sTileBitAttributes to sparse array, rename MB_UNNUSED_CAVE
|
2022-01-19 12:39:11 -05:00 |
|
GriffinR
|
8200fda14e
|
Fix decorations metatile attribute names
|
2022-01-19 10:56:54 -05:00 |
|
GriffinR
|
a8b466dc80
|
Disambiguate fieldmap names
|
2022-01-19 10:15:32 -05:00 |
|
GriffinR
|
f127e64a3c
|
Name overworld tilemaps for their bg, add layer type constants
|
2022-01-19 09:37:12 -05:00 |
|
GriffinR
|
225147a94f
|
Document Spinda spot algorithm
|
2022-01-17 15:34:18 -05:00 |
|
GriffinR
|
69759b2d12
|
Merge pull request #1601 from GriffinRichards/fix-decor-flag
Fix FLAG_DECORATION_0 name
|
2022-01-16 17:44:58 -05:00 |
|