LOuroboros
11d6ae4820
Renamed the GetLeadMonFriendshipScore constants
2022-08-25 11:34:37 -03:00
GriffinR
8a1130d046
Missing constant in friendshiptodamagecalculation
2022-08-25 10:21:41 -04:00
LOuroboros
1f4ef2a0fb
Added constants for GetLeadMonFriendshipScore
2022-08-25 10:40:56 -03: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
LOuroboros
015961c00a
Re-aligned READ_PTR_FROM_TASK's 2nd line EoL
2022-08-24 17:19:24 -03:00
LOuroboros
3a65529293
Fixed KeyInterCB_DeferToEventScript comment
2022-08-24 17:12:59 -03:00
LOuroboros
90f72a745a
Fixed switch syntax in Task_TryFieldPoisonWhiteOut
2022-08-24 17:01:36 -03: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
Eduardo Quezada
76d2d92abb
Merge branch 'pretmaster' into pret_clean2
2022-08-20 12:43:09 -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
Martin Griffin
5e593a62fb
Ignore num_tiles if it would truncate non-transparent tiles ( #1729 )
2022-08-18 23:07:25 -04:00
Eduardo Quezada
3bc2cf921c
Sync src/battle_controllers.c with pokefirered
2022-08-18 14:30:22 -04:00
Eduardo Quezada
59f89bde9e
Misc cleanup
2022-08-18 14:23:45 -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
2ec8f27811
Add missing usage of SOUND_PAN_*
2022-08-16 13:04:00 -04:00
Eduardo Quezada
e43f65cc69
using BATTLE_RUN constants in BattleScript_EffectTeleport
2022-08-15 21:06:26 -04:00
Eduardo Quezada
7b0c8ec972
Revert style changes
2022-08-15 20:41:12 -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
44b26cc8aa
From pokefirered
2022-08-15 18:27:37 -04:00
Eduardo Quezada
0149f420f9
Corrected comment
2022-08-15 17:36:55 -04:00
Eduardo Quezada
e8a05e92e4
Corrected additional inconsistent uses of whitespace
2022-08-15 17:04:34 -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
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
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
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
