Commit graph

4833 commits

Author SHA1 Message Date
Eduardo Quezada
481210b7f3 Missing uses of MAX_SPRITES 2022-08-27 00:54:30 -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
LOuroboros
23bf67c63f Removed unnecessary inclusion of header in src/field_specials.c 2022-08-25 11:43:01 -03:00
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
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
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
c2d5dd2a1f Additional battle anim sync 2022-08-19 11:51:13 -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
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
7b0c8ec972 Revert style changes 2022-08-15 20:41:12 -04:00
Eduardo Quezada
44b26cc8aa From pokefirered 2022-08-15 18:27:37 -04:00
Eduardo Quezada
e8a05e92e4 Corrected additional inconsistent uses of whitespace 2022-08-15 17:04:34 -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
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
WhenGryphonsFly
475658116e Fix BUGFIX return statement in battle_dome.c 2022-08-10 20:00:16 -05:00
WhenGryphonsFly
86881b12ef Use PARTY_SIZE for Pokerus Nurse Conversation 2022-08-10 19:09:59 -05: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
Eduardo Quezada
4b08a511c3 Cleanup from https://github.com/pret/pokefirered/pull/532 2022-08-07 22:40:15 -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
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
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
Eduardo Quezada
897b3d07f6 Sync src/pokeball.c with pokefirered 2022-07-29 21:29:12 -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
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
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
Eduardo Quezada
a37d8b1346 Documented boolean uses 2022-07-25 14:59:14 -04:00
DizzyEggg
151b5a5f8a
Change GAME_LANGUAGE to LANGUAGE_ENGLISH 2022-07-23 12:23:04 +02: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
LOuroboros
26e03dcda8 Linked MENU_ACTION constants to the items in sStartMenuItems 2022-07-15 04:45:05 -03: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
sphericalice
167353223c Use MAX_MON_MOVES in Cmd_trysetencore 2022-07-11 15:23:23 +01:00
sphericalice
186f2c0232 Introduce a MOVE_UNAVAILABLE constant 2022-07-11 15:18:13 +01: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
Martin Griffin
c9958e3087 Simplify GetBattleTransitionTypeByMap 2022-07-05 14:17:46 +01:00
Martin Griffin
4e76ffb4ca Identify a % 16 2022-07-04 21:25:19 +01: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
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
sphericalice
5d7140fa83
Fix missing COPYWIN_FULL constant use 2022-06-19 13:33:47 +01: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
Kurausukun
d3c8346a67 fix type, add bugfix 2022-06-17 21:58:56 -04:00
Kurausukun
23e9455e0a document design oddity, use constants, correct comment 2022-06-17 21:52:58 -04:00
GriffinR
7a6b417b8e Remove UBFIX related to task destruction 2022-06-17 21:01:23 -04:00
Colton G. Rushton
f02ea58a68
Add comment description of this bugfix 2022-06-17 18:32:46 -03:00
Colton G. Rushton
d7ab1ba588
Fix formatting 2022-06-17 18:22:47 -03:00
Colton G. Rushton
b885e01b39
Update src/item_menu_icons.c
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
2022-06-17 18:16:14 -03:00