dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity
7,276 Commits 4 Branches 0 Tags
ae6ec3b1b8a998e2852b48276c0ce119bc154dc8
Commit Graph
100 Commits
This Branch
This Branch
All Branches
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
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
GriffinR 97021baec6 Drop usage of global directive 2022-09-02 21:53:44 -04:00
GriffinR 8b7230c3c4 CpuFastFill -> CpuFastFill16 in fieldmap 2022-09-02 19:41:28 -04:00
GriffinR 7f1c4720a2 Update arguments for ApplyGlobalTintToPaletteSlot 2022-09-02 19:36:46 -04:00
GriffinR 03a98c72bc Sync fieldmap 2022-09-02 19:29:35 -04:00
GriffinR ff53a553bc Merge pull request #1761 from AsparagusEduardo/pret/tmFlagNames 
Renamed TM flags to keep consistency with the rest of the repo
 2022-09-02 17:09:49 -04:00
GriffinR a28fbbc1b8 Merge pull request #1748 from GriffinRichards/fix-judgement 
Standardize judgement vs judgment spelling
 2022-09-01 11:51:04 -04:00
GriffinR d211adbc77 Merge pull request #1760 from LOuroboros/bermuda 
Updated a couple of sizeofs in src/battle_pyramid_bag.c
 2022-09-01 11:42:09 -04:00
GriffinR b66de1f056 Merge pull request #1759 from LOuroboros/pyramidSchemes 
Automatized the contents of some sideof in src/item.c
 2022-08-31 22:14:06 -04:00
GriffinR 0a2ac61b0f Merge pull request #1757 from AsparagusEduardo/pret_clean2 
Cleanup based on previous PRs
 2022-08-27 11:40:33 -04:00
GriffinR 8aead3b4c8 Merge pull request #1747 from GriffinRichards/contest-ai-bug 
Incorporate commented bug fixes in contest AI scripts
 2022-08-26 23:53:44 -04:00
GriffinR 578064d799 Add missing use of METATILE_ROW_WIDTH 2022-08-26 15:23:54 -04:00
GriffinR 0516f94837 Merge pull request #1753 from LOuroboros/GetLeadMonFriendshipScore 
Added constants for GetLeadMonFriendshipScore
 2022-08-26 14:52:10 -04:00
GriffinR c5e873aa2b Merge pull request #1742 from GriffinRichards/sound-pan 
Add missing usage of SOUND_PAN_*
 2022-08-26 14:47:24 -04:00
GriffinR 005c46f0da Merge pull request #1754 from AsparagusEduardo/pret_citySigns 
Corrected Oldale Town Sign labels
 2022-08-25 22:09:56 -04:00
GriffinR ce4a6e9067 MAP_NONE -> MAP_DYNAMIC 2022-08-25 21:34:05 -04:00
GriffinR 8a1130d046 Missing constant in friendshiptodamagecalculation 2022-08-25 10:21:41 -04:00
GriffinR 32ea55dcba Merge pull request #1752 from LOuroboros/patch-4 
Re-aligned READ_PTR_FROM_TASK's 2nd line EoL
 2022-08-24 17:08:15 -04:00
GriffinR 8cc520ccd7 Merge pull request #1751 from LOuroboros/patch-3 
Fixed KeyInterCB_DeferToEventScript comment
 2022-08-24 17:07:59 -04:00
GriffinR eecf968390 Merge pull request #1750 from LOuroboros/patch-2 
Fixed switch syntax in Task_TryFieldPoisonWhiteOut
 2022-08-24 17:07:17 -04:00
GriffinR 3771abbe08 Fix names and constant usage for union room classes 2022-08-23 12:44:07 -04:00
GriffinR 8a8ba92f21 Revert COMMON wildcards 2022-08-22 19:04:47 -04:00
GriffinR 898ec580ae Merge pull request #1737 from GriffinRichards/lock-unlock 
Clean up lock/unlock anim movement
 2022-08-22 01:30:33 -04:00
GriffinR 30906762ed Merge pull request #1740 from AsparagusEduardo/pret_stringTabs 
Fixed inconsistent use of white space for scripts, .c files and .h files.
 2022-08-20 23:03:59 -04:00
GriffinR 261b0ff118 Standardize judgement vs judgment spelling 2022-08-20 22:58:46 -04:00
GriffinR 9e175a1037 Merge pull request #1735 from GriffinRichards/arena-const 
Add some missing battle arena constants
 2022-08-20 22:54:32 -04:00
GriffinR 81ef818f61 Merge pull request #1731 from GriffinRichards/missing-tag 
Move party menu data constants
 2022-08-20 22:43:52 -04:00
GriffinR 1685365cd4 Merge pull request #1727 from AsparagusEduardo/pret_clean 
Cleanup from https://github.com/pret/pokefirered/pull/532
 2022-08-19 21:27:55 -04:00
GriffinR 11b4958f23 Incorporate commented bug fixes in contest AI scripts 2022-08-19 19:45:15 -04:00
GriffinR c2d5dd2a1f Additional battle anim sync 2022-08-19 11:51:13 -04:00
GriffinR cce9918908 Add Wnum_tiles to additional num_tiles rules 2022-08-18 23:13:27 -04:00
GriffinR 936ebbd973 Fix phaseShit typo 2022-08-17 11:47:00 -04:00
GriffinR e707cdffa8 Merge pull request #1744 from AsparagusEduardo/pret_syncMapSec 
Synced Route 4 and 10's MapSec labels
 2022-08-16 19:12:45 -04:00
GriffinR 2ec8f27811 Add missing usage of SOUND_PAN_* 2022-08-16 13:04:00 -04:00
GriffinR 26734d80f3 Merge pull request #1728 from AsparagusEduardo/pret_monDataEnum 
Convert MON_DATA constants into enum to ease editing and addition of fields.
 2022-08-15 18:51:32 -04:00
GriffinR 96fa350b45 Merge pull request #1741 from tustin2121/tustin2121-patch-scriptcontext 
Renaming the Script Contexts
 2022-08-15 16:46:01 -04:00
GriffinR 3dc3dc847f Merge pull request #1738 from mrgriffin/wildcard-ld-script 
Wildcards in ld_script.txt
 2022-08-15 08:35:48 -04:00
GriffinR 5515e328b2 Clean up lock/unlock anim movement 2022-08-12 21:18:10 -04:00
GriffinR 2df6cc1820 Merge pull request #1730 from GriffinRichards/sync-naming-screen 
Clean up naming screen graphics
 2022-08-12 11:05:55 -04:00
GriffinR 574cf1ddb9 Merge pull request #1725 from GriffinRichards/security-signature 
Sector security -> signature
 2022-08-12 10:47:10 -04:00
GriffinR cf4d05e9e7 Fix typo 2022-08-11 12:09:38 -04:00
GriffinR 63468f9fcb Add some missing battle arena constants 2022-08-11 12:02:56 -04:00
GriffinR 286a99eb1d Merge pull request #1723 from GriffinRichards/fix-impassable 
MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes
 2022-08-10 21:28:14 -04:00
GriffinR e814fe0224 Merge pull request #1734 from WhenGryphonsFly/clean__battledomebugfix 
Fix BUGFIX return statement in battle_dome.c
 2022-08-10 21:21:54 -04:00