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
8cc520ccd7
Merge pull request #1751 from LOuroboros/patch-3
...
Fixed KeyInterCB_DeferToEventScript comment
2022-08-24 17:07:59 -04:00
015961c00a
Re-aligned READ_PTR_FROM_TASK's 2nd line EoL
2022-08-24 17:19:24 -03:00
3a65529293
Fixed KeyInterCB_DeferToEventScript comment
2022-08-24 17:12:59 -03:00
90f72a745a
Fixed switch syntax in Task_TryFieldPoisonWhiteOut
2022-08-24 17:01:36 -03:00
3771abbe08
Fix names and constant usage for union room classes
2022-08-23 12:44:07 -04:00
898ec580ae
Merge pull request #1737 from GriffinRichards/lock-unlock
...
Clean up lock/unlock anim movement
2022-08-22 01:30:33 -04:00
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
261b0ff118
Standardize judgement vs judgment spelling
2022-08-20 22:58:46 -04:00
9e175a1037
Merge pull request #1735 from GriffinRichards/arena-const
...
Add some missing battle arena constants
2022-08-20 22:54:32 -04:00
81ef818f61
Merge pull request #1731 from GriffinRichards/missing-tag
...
Move party menu data constants
2022-08-20 22:43:52 -04:00
76d2d92abb
Merge branch 'pretmaster' into pret_clean2
2022-08-20 12:43:09 -04:00
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
c2d5dd2a1f
Additional battle anim sync
2022-08-19 11:51:13 -04:00
3bc2cf921c
Sync src/battle_controllers.c with pokefirered
2022-08-18 14:30:22 -04:00
59f89bde9e
Misc cleanup
2022-08-18 14:23:45 -04:00
936ebbd973
Fix phaseShit typo
2022-08-17 11:47:00 -04:00
5933c42439
Synced Route 4 and 10's MapSec labels
2022-08-16 18:23:37 -04:00
2ec8f27811
Add missing usage of SOUND_PAN_*
2022-08-16 13:04:00 -04:00
7b0c8ec972
Revert style changes
2022-08-15 20:41:12 -04:00
44b26cc8aa
From pokefirered
2022-08-15 18:27:37 -04:00
e8a05e92e4
Corrected additional inconsistent uses of whitespace
2022-08-15 17:04:34 -04:00
ec73158f16
Moving documentation comments per request
...
from the discord chat.
2022-08-15 16:37:38 -04:00
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
5515e328b2
Clean up lock/unlock anim movement
2022-08-12 21:18:10 -04:00
2df6cc1820
Merge pull request #1730 from GriffinRichards/sync-naming-screen
...
Clean up naming screen graphics
2022-08-12 11:05:55 -04:00
574cf1ddb9
Merge pull request #1725 from GriffinRichards/security-signature
...
Sector security -> signature
2022-08-12 10:47:10 -04:00
cf4d05e9e7
Fix typo
2022-08-11 12:09:38 -04:00
63468f9fcb
Add some missing battle arena constants
2022-08-11 12:02:56 -04:00
286a99eb1d
Merge pull request #1723 from GriffinRichards/fix-impassable
...
MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes
2022-08-10 21:28:14 -04:00
475658116e
Fix BUGFIX return statement in battle_dome.c
2022-08-10 20:00:16 -05:00
86881b12ef
Use PARTY_SIZE for Pokerus Nurse Conversation
2022-08-10 19:09:59 -05:00
e06ba39751
Use button constants in Task_HandleChooseMonInput
2022-08-10 15:14:35 -04:00
f534e8e44a
Move party menu data constants
2022-08-10 14:30:01 -04:00
bfdbbad468
Split naming screen palettes/graphics, use correct image palettes, clean up
2022-08-09 09:27:28 -04:00
4b08a511c3
Cleanup from https://github.com/pret/pokefirered/pull/532
2022-08-07 22:40:15 -04:00
079b1762ac
Update special save sector size checks
2022-08-05 12:11:33 -04:00
2487ddb128
Sector security -> signature
2022-08-05 10:42:31 -04:00
c991131b75
Change language stuff based on the french decomp
2022-08-04 11:53:16 +02:00
e5c36cd745
MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes
2022-08-03 14:21:13 -04:00
79384ec9f3
Merge pull request #1702 from GriffinRichards/clean-psn
...
Clean up field_poison.c
2022-08-02 13:20:49 -04:00
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
b49f8c10ad
Review changes from https://github.com/pret/pokefirered/pull/525
2022-08-01 15:37:05 -04:00
cc288e3786
Review changes
2022-08-01 15:14:21 -04:00
7ea49adf3c
CpuCopy16 in UnkUtil_CpuRun
2022-08-01 08:04:48 -04:00
a72d4c4168
Cleanup from syncing pss and mon markings
2022-07-30 12:43:14 -04:00
897b3d07f6
Sync src/pokeball.c with pokefirered
2022-07-29 21:29:12 -04:00
2e1bf0d965
OamData mosaic FALSE
2022-07-29 21:27:39 -04:00
2214b01954
Forgot to include this fix
2022-07-29 17:07:56 -04:00
5d4b76c0ba
Review changes from pokefirered #524
2022-07-29 17:00:07 -04:00
GriffinR