dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity
7,204 Commits 4 Branches 0 Tags
5c55e441734458119a8bf7b748d6dadc77c9302a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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 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
GriffinR cd5a03d4aa Merge pull request #1733 from WhenGryphonsFly/clean__pokeruspartysize 
Use PARTY_SIZE for Pokerus Nurse Conversation
 2022-08-10 20:45:57 -04:00
GriffinR e06ba39751 Use button constants in Task_HandleChooseMonInput 2022-08-10 15:14:35 -04:00
GriffinR f534e8e44a Move party menu data constants 2022-08-10 14:30:01 -04:00
GriffinR bfdbbad468 Split naming screen palettes/graphics, use correct image palettes, clean up 2022-08-09 09:27:28 -04:00
GriffinR 079b1762ac Update special save sector size checks 2022-08-05 12:11:33 -04:00
GriffinR 2487ddb128 Sector security -> signature 2022-08-05 10:42:31 -04:00
GriffinR aa9ccbf194 Merge pull request #1724 from DizzyEggg/lang_improvements 
Accomodate some parts of code based on the french decomp
 2022-08-04 21:37:19 -04:00
GriffinR e5c36cd745 MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes 2022-08-03 14:21:13 -04:00
GriffinR 79384ec9f3 Merge pull request #1702 from GriffinRichards/clean-psn 
Clean up field_poison.c
 2022-08-02 13:20:49 -04:00
GriffinR 99a37b5aa5 Merge pull request #1717 from mrgriffin/trainer-party-macro 
Macros for keeping .partyFlags, .partySize, and .party in sync
 2022-08-02 13:11:43 -04:00
GriffinR 79c5a5983e Merge pull request #1721 from AsparagusEduardo/pret_clean2 
Companion PR to pokefirered #525
 2022-08-01 16:57:40 -04:00
GriffinR 5101811407 Merge pull request #1719 from AsparagusEduardo/pret_cleanBattleScriptCommands 
Further cleaning after comparing with pokefirered
 2022-07-30 09:09:23 -04:00
GriffinR 591eef550e Merge pull request #1720 from Jaizu/patch-25 
Remove duplicated CB2_InitCopyrightScreenAfterBootup
 2022-07-29 06:56:35 -04:00
GriffinR 456d45985f Merge pull request #1718 from AsparagusEduardo/pret_cleanEvoScene 
Cleaned by comparing evolution_scene.c with pokefirered
 2022-07-27 21:54:34 -04:00
GriffinR 4ffe75c611 Merge pull request #1707 from GriffinRichards/use-pocket-consts 
Add some missing pocket constant usage
 2022-07-27 12:22:01 -04:00
GriffinR 1da46a4bbc Merge pull request #1715 from AsparagusEduardo/pret_docBooleans 
Documented boolean uses
 2022-07-27 12:09:02 -04:00
GriffinR 5366e89258 Merge pull request #1713 from DizzyEggg/patch-1 
Change GAME_LANGUAGE to LANGUAGE_ENGLISH
 2022-07-26 11:08:05 -05:00
GriffinR a8c93dcf35 Add missing font constants after EXT_CTRL_CODE_FONT 2022-07-18 02:36:25 -04:00
GriffinR 165f51a295 Merge pull request #1701 from GriffinRichards/faint-cmd-name 
Rename faintifabilitynotdamp and jumpifattackandspecialattackcannotfall
 2022-07-16 08:15:54 -04:00
GriffinR 8898d84ced Merge pull request #1708 from LOuroboros/sStartMenuItems 
Linked MENU_ACTION constants to the items in sStartMenuItems
 2022-07-15 09:22:35 -04:00
GriffinR 16ab534ddb Add some missing pocket constant usage 2022-07-14 10:27:51 -04:00
GriffinR f85b4699dc Fix conditional in SpriteCB_DeoxysRockFragment 2022-07-12 21:29:36 -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
GriffinR a359db6a8c Merge pull request #1704 from LOuroboros/typeAbNameLength 
Relocated TYPE_NAME_LENGTH and ABILITY_NAME_LENGTH
 2022-07-11 22:49:29 -04:00
GriffinR 15f386ede6 Move make compare to its own build section 2022-07-08 01:34:38 -04:00
GriffinR 06dc93fc2f Clean up field_poison.c 2022-07-06 21:04:54 -04:00
GriffinR 2c4c9497d2 Fix comment 2022-07-06 15:02:17 -04:00
GriffinR e6a374f2b6 Rename faintifabilitynotdamp and jumpifattackandspecialattackcannotfall 2022-07-06 14:49:08 -04:00
GriffinR 76659a4091 Merge pull request #1700 from mrgriffin/battle-setup-water-transition 
Simplify GetBattleTransitionTypeByMap
 2022-07-05 11:10:16 -04:00
GriffinR 8231ea2b68 Merge pull request #1699 from mrgriffin/field-camera-mod-16 
Identify a % 16
 2022-07-04 16:31:37 -04:00
GriffinR 650f033c2b Merge pull request #1695 from GriffinRichards/update-gfromh 
Update some GF rom header names
 2022-06-29 11:59:43 -04:00
GriffinR 06c9e0eb99 Merge pull request #1697 from Kurausukun/bpm 
Use Floats and Round Correctly in Tempo Calculation
 2022-06-28 00:27:44 -04:00
GriffinR 8950a41bfd Update some GF rom header names 2022-06-21 18:31:09 -04:00
GriffinR c2a08cc84d Merge pull request #1689 from GriffinRichards/task-ub 
Remove UBFIX related to task destruction
 2022-06-21 16:33:17 -04:00
GriffinR a5291cbc10 Merge pull request #1694 from sphericalice/patch-1 
Fix missing COPYWIN_FULL constant use
 2022-06-19 11:54:29 -04:00
GriffinR fa1ae45b39 Merge pull request #1692 from coltongit/script-fixes 
Supplant PR #1579 (Fix the last of the *.inc inconsistencies)
 2022-06-18 21:02:28 -04:00
GriffinR 21ed288f50 Merge pull request #1687 from SimplyBLGDev/patch-1 
Format newlines in surf.inc
 2022-06-18 11:04:39 -04:00
GriffinR a931874164 Merge pull request #1691 from coltongit/patch-5 
Format newline in BattleFrontier_BattlePikeLobby/scripts.inc
 2022-06-18 11:04:20 -04: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 d11b04f251 Merge pull request #1690 from Kurausukun/ai_doc 
Document Design Oddity, Use Constants, Correct Comment
 2022-06-17 22:09:43 -04:00