Commit Graph

7313 Commits

Author SHA1 Message Date
GriffinR 004ce32da0 Sync text ctrl codes with pokefirered 2022-11-23 21:13:00 -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
LOuroboros a35986fd9c Fixed indentation in ScrCmd_faceplayer 2022-11-08 21:01:50 -03: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
Eduardo Quezada 237877e21b Doc missing uses of ST_OAM_OBJ_X in Pokémon Storage System 2022-11-07 00:00:23 -03:00
GriffinR b1af66ebe5 Merge pull request #1812 from tustin2121/patch-linker
GF Header and Modern Builds
2022-11-04 09:31:31 -04:00
tustin2121 116364334d Fix build of jsonproc
- Changing uint to unsigned int, as uint is not standard.
2022-11-02 19:51:43 -05:00
tustin2121 fd87c97ef8 Adding documentation about GFHeader 2022-11-02 12:42:58 -04:00
tustin2121 8ff5ae7eb4 Pinning the GF header to the front of modern
- Pinning the GF Header, crt0, and main to the front of the ROM when building modern.
- Moving the gflib before other source files, to make it closer to the non-modern linker script (and therefore smaller patches).
2022-11-02 12:42:26 -04:00
tustin2121 f4f9329653 Fix build of jsonproc
- Changing uint to unsigned int, as uint is not standard.
2022-11-02 12:39:32 -04:00
Eduardo Quezada 14e85249d1 Review changes 2022-10-30 17:12:13 -03: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
Eduardo Quezada 85c0d2dac8 Review changes 2022-10-27 11:26:09 -03:00
Eduardo Quezada 85ce30b1d6 Created macros for Bard Sounds 2022-10-25 14:33:02 -03:00
Eduardo Quezada 3ed485632f Renamed gBaseStats to gSpeciesInfo 2022-10-24 17:01:48 -03:00
GriffinR cc182bf05e Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
Marcus Huderle ae6ec3b1b8 Change cleanString() to convert invalid chars to underscores 2022-10-22 15:09:37 -05: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
Eduardo Quezada D'Ottone 18e7fc5efc Introduce NUM_BATTLE_SIDES 2022-10-20 08:41:18 -03: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
tustin2121 4730870646 VAR_RUN_TRIGGER_IMMEDIATELY -> TRIGGER_RUN_IMMEDIATELY
Getting rid of the VAR_ prefix, to avoid the porymap problem.
2022-10-18 21:12:31 -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
Abaresk 7f09894045 Merge branch 'master' into thunder 2022-10-18 04:37:56 +00: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
tustin2121 327c648e87 Document seldom-used trigger functionality
Added a define for use in overworld triggers where the goal is to run the provided script in the immediate script context instead of the global one like normal. This is used in triggers in the desert, on faraway island, and a couple other places to do weather effects quickly and on the same frame. Suggestions for a better define name are welcome.
2022-10-16 20:46:50 -04:00
Abaresk e67d55bfc4 Fix names 2022-10-15 13:37:24 +00:00
Abaresk b538239f18 Add more documentation to thunder weather 2022-10-15 04:25:35 +00: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