Commit Graph

7275 Commits

Author SHA1 Message Date
GriffinR
3e8baa5b04
Merge branch 'master' into porymap-5 2022-10-18 22:54:25 -04:00
GriffinR
a418f8d976
Merge pull request #1755 from GriffinRichards/map-dynamic
Rename special map constants, treat warp ids as strings
2022-10-18 22:45:56 -04:00
GriffinR
e33581ff9c
Merge pull request #1671 from sphericalice/heal-location-none
Add the HEAL_LOCATION_NONE constant
2022-10-18 18:41:04 -04:00
Marcus Huderle
0d0a9bd31d Update src/overworld.c
Co-authored-by: GriffinR <griffin.g.richards@gmail.com>
2022-10-17 17:41:27 -07:00
Marcus Huderle
48ab684b48 Fix weather color map documentation 2022-10-17 17:41:27 -07:00
GriffinR
716025395c
Merge pull request #1802 from abaresk/wild-encounters
Document new metatile wild encounter odds
2022-10-17 18:56:58 -04:00
GriffinR
2e128e3282
Merge pull request #1799 from AsparagusEduardo/pret/pr/recordedInvalid
Moved ILLEGAL_BATTLE_TYPES to include\constants\battle.h and renamed it to BATTLE_TYPE_RECORDED_INVALID
2022-10-13 14:30:18 -04:00
GriffinR
722e501b7c
Merge pull request #1800 from AsparagusEduardo/pret/pr/gSoftResetDisabled
Documented missing gSoftResetDisabled uses
2022-10-13 14:29:43 -04:00
GriffinR
a10ec0487e Color rotating gate pngs 2022-10-12 19:19:42 -04:00
Abaresk
af081b08ee Make related func names more concise 2022-10-12 04:35:23 +00:00
Abaresk
11e3f03bd8 Document new metatile wild encounter odds 2022-10-12 04:03:02 +00:00
GriffinR
bbb4ee32ca
Merge pull request #1801 from Kurausukun/storage_struct
Combine "Unused" Field into Tile Buffer
2022-10-10 21:10:25 -04:00
Kurausukun
dc97eca92d combine "unused" field into tile buffer 2022-10-10 21:00:31 -04:00
GriffinR
bd023b1c6c
Merge pull request #1796 from GriffinRichards/tilesets-c
Convert tilesets.s to C
2022-10-10 12:47:47 -04:00
GriffinR
65d3944a93 Give tileset palettes proper type, name compressed secret base tiles 2022-10-08 02:02:12 -04:00
Eduardo Quezada
044898fe95 Documented missing gSoftResetDisabled uses 2022-10-07 15:56:00 -03:00
Eduardo Quezada
453da8aa8c Moved ILLEGAL_BATTLE_TYPES to include\constants\battle.h and renamed it to BATTLE_TYPE_RECORDED_INVALID 2022-10-07 15:49:00 -03:00
GriffinR
bb2e64b3fc
Merge pull request #1786 from tustin2121/patch-spritestuff
Subsprite Tables Documentation
2022-10-06 22:17:32 -04:00
tustin2121
ea168d1a6b Fix typo 2: revelations 2022-10-06 20:34:46 -04:00
tustin2121
f3bddd1ea6 Fix typo 2022-10-06 19:36:01 -04:00
GriffinR
e293986fbb
Merge pull request #1793 from GriffinRichards/clean-shop
Clean up shop.c
2022-10-06 17:24:53 -04:00
GriffinR
c6e4c29ea3
Merge pull request #1792 from GriffinRichards/display-tiles
Add DISPLAY_TILE_* constants
2022-10-05 20:44:28 -04:00
GriffinR
cefbf5986c
Merge pull request #1797 from AsparagusEduardo/pret/pr/item
Removed unused functions in item header
2022-10-04 22:42:42 -04:00
Eduardo Quezada
a20334f79a Removed unused functions in item header 2022-10-04 22:06:07 -03:00
GriffinR
79a34411ce Add additional DISPLAY_TILE_WIDTH usage 2022-09-29 15:22:21 -04:00
GriffinR
1ae5010233
Merge pull request #1794 from SBird1337/doc/decompress-casts
[doc] clean up casts in decompress.c
2022-09-29 11:40:02 -04:00
sbird
8dad7cc649 [doc] clean up casts in decompress.c 2022-09-29 17:33:39 +02:00
GriffinR
6db489e2d5 Use constants for overworld object palette slots 2022-09-27 20:16:48 -04:00
GriffinR
4f407a1066 Convert tilesets.s to C 2022-09-27 17:23:26 -04:00
GriffinR
e515e52abb Add DISPLAY_TILE_* constants 2022-09-26 19:52:17 -04:00
GriffinR
f0744641d1
Merge pull request #1651 from garakmon/entry_json
use json for region map sections
2022-09-25 21:56:09 -04:00
GriffinR
171367d66c
Merge pull request #1643 from cbt6/object-event-graphics-info
Format object event graphics info
2022-09-25 21:55:22 -04:00
GriffinR
45e6b48170
Merge pull request #1636 from GriffinRichards/rme-update
Updates to region map for Porymap
2022-09-25 21:54:26 -04:00
GriffinR
b8bf9dea56
Merge pull request #1791 from AsparagusEduardo/pret/pr/unk40EF
Documented unk40EF in Summary Screen
2022-09-25 21:50:37 -04:00
Eduardo Quezada
5054cf3586 Documented unk40EF in Summary Screen 2022-09-25 21:33:20 -03:00
GriffinR
f695ddd1ba Ignore new Porymap config 2022-09-25 18:34:07 -04:00
GriffinR
56c28fb2dd Move region map gitignore to existing data gitignore 2022-09-25 18:15:16 -04:00
GriffinR
e473aaf783 Merge branch 'master' of https://github.com/pret/pokeemerald into entry_json 2022-09-25 18:10:04 -04:00
GriffinR
7223dbd62f
Merge branch 'master' into rme-update 2022-09-25 11:56:57 -04:00
GriffinR
4579efe4c7
Merge pull request #1790 from AsparagusEduardo/pret/pr/namingScreenGender
Gender icon in naming screen based on Pokémon name length
2022-09-24 23:27:40 -04:00
Eduardo Quezada
0f35f080ec Gender icon in naming screen based on Pokémon name length 2022-09-24 23:48:24 -03:00
GriffinR
d8b3919063 Ignore Porymap's prefabs file 2022-09-24 18:27:53 -04:00
GriffinR
9b6b164aad
Merge pull request #1768 from SBird1337/feature/mgba-print
[debug] add support for mgba printf
2022-09-23 13:49:48 -04:00
sbird
343d7f7d26 [debug] do not use heap allocation for MgbaPrintf 2022-09-23 04:12:57 +02:00
sbird
12670e8e3e [debug] simplify macros, add EX versions 2022-09-23 03:48:58 +02:00
sbird
22329d3318 [debug] use boolean constants for nStopProgram 2022-09-23 03:23:44 +02:00
sbird
44a5a8d31e [debug] fix AGBAssert for AGBPrintf debug block 2022-09-23 03:22:57 +02:00
GriffinR
ad9247439c
Merge pull request #1788 from AsparagusEduardo/pret/pr/newKeys
Added missing uses of JOY_xx macros
2022-09-22 20:50:19 -04:00
Eduardo Quezada
7e112b0f0d Added missing uses of JOY_xx macros 2022-09-22 21:43:33 -03:00
GriffinR
1107ff954d Clean up shop.c 2022-09-22 15:08:17 -04:00