Commit Graph
100 Commits
Author SHA1 Message Date
GriffinR 14e8526a55 Merge pull request #1845 from AsparagusEduardo/pret/pr2/EasyChat
Improve Easy Chat documentation
2023-01-15 00:22:57 -05:00
GriffinR aeec8d65ee Merge pull request #1844 from Kurausukun/patch-2
Update INSTALL.md
2023-01-14 21:10:43 -05:00
GriffinR 89286c91e3 Merge pull request #1842 from GriffinRichards/gbagfx-pals
Automatically constrain png pixels to bit depth
2023-01-12 16:36:05 -05:00
GriffinR cf14c1fd13 Colorize mirage_tower.png 2023-01-12 11:40:15 -05:00
GriffinR 5b3596108d Add some missing PARTY_SIZE usage 2023-01-12 10:51:20 -05:00
GriffinR 3009cc7220 Colorize door animations that use multiple palettes 2023-01-11 13:31:17 -05:00
GriffinR 3ee3d6e346 Support reducing png bit depth 2023-01-11 10:11:11 -05:00
GriffinR 6d6a876dbd Merge pull request #1820 from GriffinRichards/doc-wnews
Document wonder news
2023-01-03 22:34:58 -05:00
GriffinR 36c89d345c Merge branch 'master' into doc-wnews 2023-01-03 22:28:21 -05:00
GriffinR 8c61869638 Merge pull request #1835 from Jaizu/patch-29
Fix ANIM_SPRITE on regular builds with BUGFIX.
2022-12-29 10:17:57 -05:00
GriffinR d02d518917 Merge pull request #1829 from AsparagusEduardo/pret/doc/SaveBlockPadding
Documenting padding in structs used by Saveblocks
2022-12-27 20:50:37 -05:00
GriffinR a3d09af095 Merge pull request #1832 from AsparagusEduardo/pret/pr2/doc/summaryTypes
Added TYPE_ICON_SPRITE_COUNT to Summary documentation
2022-12-27 20:49:59 -05:00
GriffinR 0947e792bf Merge pull request #1833 from SBird1337/doc/writesequencetobgtilemapbuffer
[doc] remove mislabled metatile attributes in bg.c
2022-12-27 20:49:38 -05:00
GriffinR 7355c9c1d7 Merge pull request #1831 from sphericalice/caught-icon-rename
Rename ball_display_unused_extra
2022-12-26 12:01:56 -05:00
GriffinR 7a480c0a87 Merge pull request #1830 from sphericalice/registered-item-none
Use the ITEM_NONE constant for the registeredItem save block field
2022-12-18 16:11:29 -05:00
GriffinR 2aa6a9c164 Remove two unreferenced metatile labels 2022-12-16 11:05:56 -05:00
GriffinR 5c90df73ba Merge pull request #1825 from AsparagusEduardo/pret/pr2/AnimationMacros
Species animation tables into macros
2022-12-10 10:00:34 -05:00
GriffinR f87c5be45a Merge pull request #1827 from SBird1337/fix/debugprint
[fix] DebugPrintf with no format arguments
2022-12-09 12:54:19 -05:00
GriffinR f55443656f Add NUM_TILES_PER_METATILE 2022-12-03 17:29:02 -05:00
GriffinR dc24fde7f6 Sync calcrom fixes 2022-11-27 17:33:09 -05:00
GriffinR e5260c9aa1 Merge pull request #1823 from tustin2121/patch-6
Use multi-include incbins for stormy_water animation
2022-11-27 12:26:52 -05:00
GriffinR 004ce32da0 Sync text ctrl codes with pokefirered 2022-11-23 21:13:00 -05:00
GriffinR 483c3d5c13 Document wonder news 2022-11-22 02:17:03 -05:00
GriffinR 4736b4b14d Merge pull request #1810 from AsparagusEduardo/pret/pr/baseStatsRename
Renamed gBaseStats to gSpeciesInfo
2022-11-18 17:45:23 -05:00
GriffinR 5fa364256d Merge pull request #1808 from AsparagusEduardo/pret/PR/numSides
Introduce NUM_BATTLE_SIDES
2022-11-18 17:39:00 -05:00
GriffinR df470b75dd Merge pull request #1817 from GriffinRichards/sync-wireless
Add cursor kind constants, sync wireless improvements
2022-11-17 15:18:20 -05:00
GriffinR 601bb0b578 Index gBattleFrontierHeldItems 2022-11-10 16:14:06 -05:00
GriffinR 3b1c8dfb17 Update list menu graphics 2022-11-09 19:44:58 -05:00
GriffinR e434b0047f More missing constant usage 2022-11-09 15:53:47 -05:00
GriffinR 431a7ef8dd Add missing cursorKind field usage 2022-11-09 15:37:47 -05:00
GriffinR 1d1c2d41bb Add list menu cursor constants 2022-11-09 15:16:46 -05:00
GriffinR b3e75138da Sync wireless improvements 2022-11-09 15:14:18 -05:00
GriffinR 9e24fe6ec8 Merge pull request #1816 from LOuroboros/patch-1
Fixed indentation in ScrCmd_faceplayer
2022-11-08 19:07:34 -05:00
GriffinR 0a6de12b5e Merge pull request #1814 from AsparagusEduardo/pret/pr/storageDoc
Doc missing uses of ST_OAM_OBJ_X in Pokémon Storage System
2022-11-06 23:35:53 -05:00
GriffinR b1af66ebe5 Merge pull request #1812 from tustin2121/patch-linker
GF Header and Modern Builds
2022-11-04 09:31:31 -04:00
GriffinR d90132842a Update gitignore/spacing for new region map data 2022-10-30 12:22:41 -04:00
GriffinR c76beed989 Merge pull request #1807 from pret/porymap-5
Update for Porymap 5.0.0
2022-10-30 11:01:37 -04:00
GriffinR 01c71b4ce1 Fix more text and movements labeled as scripts 2022-10-30 03:27:28 -04:00
GriffinR f439a2dee7 Fix EventScript_WroteSecretCodeLockOpened typo 2022-10-30 03:14:47 -04:00
GriffinR b035fc1f42 Merge pull request #1811 from AsparagusEduardo/pret/pr/BardSounds
Cleaned up Bard Sounds
2022-10-27 14:01:48 -04:00
GriffinR cc182bf05e Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
GriffinR e752c8a2f9 Merge pull request #1805 from tustin2121/tustin2121-patch-runimmedeately
Document seldom-used trigger functionality
2022-10-20 11:45:35 -04:00
GriffinR fad92ec906 Merge pull request #1803 from abaresk/thunder
Add more documentation to thunder weather effect
2022-10-20 11:36:10 -04:00
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
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
GriffinR bbb4ee32ca Merge pull request #1801 from Kurausukun/storage_struct
Combine "Unused" Field into Tile Buffer
2022-10-10 21:10:25 -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
GriffinR bb2e64b3fc Merge pull request #1786 from tustin2121/patch-spritestuff
Subsprite Tables Documentation
2022-10-06 22:17:32 -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
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
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
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
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
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
GriffinR 1107ff954d Clean up shop.c 2022-09-22 15:08:17 -04:00
GriffinR d79252aa7f Merge pull request #1784 from AsparagusEduardo/pret/pr/FrontierPartySize
Altered MAX_FRONTIER_PARTY_SIZE to be automatically calculated by the other frontier party sizes
2022-09-22 12:19:05 -04:00
GriffinR b8341558c3 Merge pull request #1779 from GriffinRichards/sync-fld-weather
Add misc constant usage to field_weather_effect
2022-09-22 12:13:07 -04:00
GriffinR 9bcc36fe08 Merge pull request #1767 from GriffinRichards/trainer-pals
Generate trainer pic palettes from image
2022-09-22 11:34:03 -04:00
GriffinR e74fa7b8c0 Merge pull request #1785 from AsparagusEduardo/pret/pr/malloc
Removed unnecessary malloc.h macros
2022-09-22 11:25:06 -04:00
GriffinR 36494c1c1d Merge pull request #1783 from AsparagusEduardo/pret/pr/battlerReservedPalettes
gReservedSpritePaletteCount using MAX_BATTLERS_COUNT for battles
2022-09-14 12:14:33 -04:00
GriffinR c1dfd3c9ec Merge pull request #1763 from GriffinRichards/rm-global
Drop usage of global directive
2022-09-13 15:08:37 -04:00
GriffinR 509f1d59cd Merge pull request #1782 from LOuroboros/patch-2
Removed unused extern declaration of old gUnknown func
2022-09-13 14:51:20 -04:00
GriffinR 91c040b081 Merge pull request #1777 from AsparagusEduardo/pret/pr/trailingWhitespace
Cleaned trailing whitespace
2022-09-13 14:00:11 -04:00
GriffinR 4c34babb4d Merge pull request #1780 from LOuroboros/raquaza
Fixed a typo and scripting vars alignment
2022-09-12 22:02:46 -04:00
GriffinR e7a459c778 Merge pull request #1781 from AsparagusEduardo/pret/pr/argumentsHeaders
Added missing labels in headers
2022-09-12 21:27:57 -04:00
GriffinR 041870672a Add misc constant usage to field_weather_effect 2022-09-12 15:11:58 -04:00
GriffinR d3d8b4a181 Merge pull request #1762 from GriffinRichards/sync-fieldmap
Sync fieldmap
2022-09-12 14:32:27 -04:00
GriffinR 91cba0e648 Merge pull request #1776 from AsparagusEduardo/pret/pr/ShinyValue
Added parenthesis to GET_SHINY_VALUE
2022-09-11 13:49:50 -04:00
GriffinR c3623bc928 Merge pull request #1775 from AsparagusEduardo/pret/pr/repeatedStrings
Removed repeated extern consts in strings.h
2022-09-09 12:53:55 -04:00
GriffinR ecb75ee514 Merge pull request #1774 from AsparagusEduardo/pret/pr/monCoords
Adjusted style of coords tables
2022-09-08 21:48:05 -04:00
GriffinR 75ded96ecf Merge pull request #1773 from Jaizu/patch-27
Fix 'y' actually being 'x' in CreatePCMultichoice
2022-09-08 16:31:26 -04:00
GriffinR c5e1feae38 Merge pull request #1772 from LOuroboros/patch-1
Undefined temporary preproc macro HIBYTE
2022-09-07 16:50:57 -04:00
GriffinR af1725793a Merge pull request #1771 from SBird1337/doc/aslr
[doc] fix misnamed dma <--> aslr
2022-09-07 10:43:08 -04:00
GriffinR 281bddcd3d Merge pull request #1765 from AsparagusEduardo/pret/pokefirered_sync4
Implemented review changes from https://github.com/pret/pokefirered/pull/548
2022-09-06 21:40:37 -04:00
GriffinR 74b563f696 Merge pull request #1749 from GriffinRichards/ur-classes
Fix names and constant usage for union room classes
2022-09-06 21:35:10 -04:00
GriffinR f334b61b44 Merge pull request #1769 from AsparagusEduardo/pret/pr/frontierTrainerMonAlign
Aligned FRONTIER_MONS trainer macros with the rest for consistency
2022-09-06 21:20:49 -04:00
GriffinR 7dac3c4b65 Merge pull request #1766 from tustin2121/tustin2121-patch-extern
Adding missing externs
2022-09-05 20:28:33 -04:00
GriffinR c8afeea182 Generate trainer pic palettes from image 2022-09-05 16:09:45 -04:00
GriffinR 36551dff2f Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
GriffinR 797aa08141 Merge pull request #1764 from AsparagusEduardo/pret/battlerMacros
Further uses of GET_BATTLER_SIDE macros'
2022-09-03 01:04:55 -04:00