Martin Griffin
6fed961ed6
Write palette IDs in hex
2022-08-19 15:29:35 +01:00
GriffinR
cce9918908
Add Wnum_tiles to additional num_tiles rules
2022-08-18 23:13:27 -04:00
Martin Griffin
5e593a62fb
Ignore num_tiles if it would truncate non-transparent tiles ( #1729 )
2022-08-18 23:07:25 -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
Eduardo Quezada
5933c42439
Synced Route 4 and 10's MapSec labels
2022-08-16 18:23:37 -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
Eduardo Quezada
0149f420f9
Corrected comment
2022-08-15 17:36:55 -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
tustin2121
ec73158f16
Moving documentation comments per request
...
from the discord chat.
2022-08-15 16:37:38 -04:00
tustin2121
1cb659df8c
Renaming Script Contexts
...
- Determined how the various script contexts were used and renamed accordingly.
- ScriptContext2_Enable/Disable => Lock/UnlockPlayerFieldControls - The sole purpose of the flag is to make sure the player can't move around in the overworld. It has nothing to do with script contexts.
- ScriptContext1 => ScriptContext - It is the global script context used to set up scripts which run over many frames.
- ScriptContext2_RunNewScript => RunScriptImmediately - ScriptContext2's sole purpose was to run scripts immediately and in a separate context, usually while the global context is waiting for things like map loads or screen changes.
2022-08-15 15:18:12 -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
Eduardo Quezada
1fd1870a13
Moved enum to include/pokemon.h
2022-08-08 18:40:47 -04:00
Eduardo Quezada
75d52dc762
Convert MON_DATA constants into enum to ease editing and addition of fields.
2022-08-08 18:18:17 -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
