Commit Graph

4793 Commits

Author SHA1 Message Date
Eduardo Quezada 9022504af5 306/665 2022-12-30 08:39:45 -03:00
Eduardo Quezada 93c810231e 294/665 2022-12-29 22:36:10 -03:00
Eduardo Quezada c13a758c4b 279/665 2022-12-29 22:18:02 -03:00
Eduardo Quezada a57efb3ebb 270/665 2022-12-29 21:54:12 -03:00
Eduardo Quezada a7b9a4e862 264/665 2022-12-29 20:43:39 -03:00
Eduardo Quezada fe0367be3e Merge remote-tracking branch 'pret/master' into pret_multilanguage
# Conflicts:
#	graphics_file_rules.mk
#	src/naming_screen.c
2022-08-23 08:11:38 -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 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
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
Eduardo Quezada fbcb80c575 (260/665) 2022-08-18 11:13:02 -04:00
GriffinR 936ebbd973 Fix phaseShit typo 2022-08-17 11:47:00 -04:00
Eduardo Quezada f87d86945f (256/665) 2022-08-17 08:48:38 -04:00
Eduardo Quezada 5933c42439 Synced Route 4 and 10's MapSec labels 2022-08-16 18:23:37 -04:00
Eduardo Quezada db2d524603 Corrected CopyFrontierBrainTrainerName 2022-08-16 17:22:39 -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
Eduardo Quezada 4649d1eddd (234/665) 2022-08-15 14:27:41 -04:00
GriffinR 5515e328b2 Clean up lock/unlock anim movement 2022-08-12 21:18:10 -04:00
Eduardo Quezada 11cc2179a4 (205/665) Italian up to date with French 2022-08-12 15:31:25 -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
Eduardo Quezada 27f2b85efe Incorporated Italian changes, enough to compile (still needs to sync a couple of them) 2022-08-12 00:28:16 -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
Eduardo Quezada ac032cdf9b (202/654) Title screen 2022-08-10 10:59:03 -04:00
Eduardo Quezada c0128e396b Moved french types to their own folder 2022-08-10 09:31:18 -04:00
Eduardo Quezada 06efaeb6df (200!/654) 2022-08-10 09:16:02 -04:00
Eduardo Quezada bb671d90a8 (197/654) 2022-08-10 09:07:13 -04:00
Eduardo Quezada 44ec57c1d5 Berry Blender graphics + Moved Easy Chat 2022-08-09 18:20:17 -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 92eada1251 Bard sounds 2022-08-08 13:01:43 -04:00
Eduardo Quezada fdf99fefb8 Abilities and Ribbon descriptions + fix in strings.c 2022-08-08 12:07:40 -04:00
Eduardo Quezada 860df0bd97 Merge remote-tracking branch 'pret/master' into pret_french
# Conflicts:
#	ld_script.txt
#	src/battle_controller_player.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/evolution_scene.c
#	src/field_specials.c
#	src/pokedex.c
#	src/union_room.c
2022-08-08 11:22:44 -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
Eduardo Quezada fa3abf90c4 (148/654) 2022-08-03 11:25:11 -04:00
Eduardo Quezada 58d0fba024 (125/654) 2022-08-02 18:21:19 -04:00