Commit Graph

7093 Commits

Author SHA1 Message Date
Eduardo Quezada
e8a05e92e4 Corrected additional inconsistent uses of whitespace 2022-08-15 17:04:34 -04:00
Eduardo Quezada
63e4a8adcd Fixed instances of .string being used with spaces instead of tabs 2022-08-15 14:32: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
Martin Griffin
c5b30b7f21 Wildcards in ld_script.txt
Allows hacks to introduce new files and variables without needing to
change ld_script.txt similar to ld_script_modern.txt.
2022-08-15 12:25:16 +01: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
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
WhenGryphonsFly
475658116e Fix BUGFIX return statement in battle_dome.c 2022-08-10 20:00:16 -05: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
WhenGryphonsFly
86881b12ef Use PARTY_SIZE for Pokerus Nurse Conversation 2022-08-10 19:09:59 -05: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
DizzyEggg
c991131b75 Change language stuff based on the french decomp 2022-08-04 11:53:16 +02: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
Eduardo Quezada
b49f8c10ad Review changes from https://github.com/pret/pokefirered/pull/525 2022-08-01 15:37:05 -04:00
Eduardo Quezada
cc288e3786 Review changes 2022-08-01 15:14:21 -04:00
Eduardo Quezada
7ea49adf3c CpuCopy16 in UnkUtil_CpuRun 2022-08-01 08:04:48 -04:00
Eduardo Quezada
a72d4c4168 Cleanup from syncing pss and mon markings 2022-07-30 12:43:14 -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
Eduardo Quezada
897b3d07f6 Sync src/pokeball.c with pokefirered 2022-07-29 21:29:12 -04:00
Eduardo Quezada
40805fffc0 Space cleanup 2022-07-29 21:28:39 -04:00
Eduardo Quezada
2e1bf0d965 OamData mosaic FALSE 2022-07-29 21:27:39 -04:00
Eduardo Quezada
2214b01954 Forgot to include this fix 2022-07-29 17:07:56 -04:00
Eduardo Quezada
5d4b76c0ba Review changes from pokefirered #524 2022-07-29 17:00:07 -04:00
Eduardo Quezada
9dc64b67cd Review changes 2022-07-29 15:38:23 -04:00
Eduardo Quezada
01558ff8f3 Struct pointers star standarizing 2022-07-29 11:15:33 -04:00
Eduardo Quezada
13672680b0 void pointer standarized 2022-07-29 10:52:35 -04:00
Eduardo Quezada
aa93af4083 Fixed check 2022-07-29 10:34:21 -04:00
Eduardo Quezada
fa32f337be Review changes 2022-07-29 10:21:20 -04:00
Eduardo Quezada
7b3401ee27 Standarized use of star in pointer types 2022-07-29 10:17:58 -04:00
Eduardo Quezada
9caca17064 Cleanup by syncing src/battle_script_commands.c with pokefirered 2022-07-29 09:43:16 -04:00
GriffinR
591eef550e
Merge pull request #1720 from Jaizu/patch-25
Remove duplicated CB2_InitCopyrightScreenAfterBootup
2022-07-29 06:56:35 -04:00
Jaizu
7a8c28ccca
Remove duplicated CB2_InitCopyrightScreenAfterBootup 2022-07-29 10:52:36 +02:00
Eduardo Quezada
09af7422d5 Further cleaning after comparing with pokefirered
STAT_BUFF changed to STAT_CHANGE, as it also uses debuffs
2022-07-28 01:27:05 -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
Eduardo Quezada
dc47a959da Reverted comments from pokefirered 2022-07-27 20:33:34 -04:00
Eduardo Quezada
b00bd8b181 Cleaned by comparing evolution_scene.c with pokefirered 2022-07-27 18:51:32 -04:00
Martin Griffin
2380d13a43 Macros for keeping .partyFlags, .partySize, and .party in sync 2022-07-27 23:25:37 +01: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
DizzyEggg
b7c78571a6
Update src/international_string_util.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2022-07-26 15:39:29 +02:00
DizzyEggg
c557c4eb27
Add a comment 2022-07-26 14:44:53 +02:00
LOuroboros
b59f7aed7f
Added a constant for NPC trainer name length (#1712) 2022-07-25 22:59:13 -04:00