72b8c2f60b
Decorations + general language string macro
2024-06-24 09:48:12 -04:00
28ab70e0e3
Fixed include/constants/global.h being remade on each build
2023-05-30 11:58:14 -04:00
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
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
9e175a1037
Merge pull request #1735 from GriffinRichards/arena-const
...
Add some missing battle arena constants
2022-08-20 22:54:32 -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
5933c42439
Synced Route 4 and 10's MapSec labels
2022-08-16 18:23:37 -04:00
db2d524603
Corrected CopyFrontierBrainTrainerName
2022-08-16 17:22:39 -04:00
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
0149f420f9
Corrected comment
2022-08-15 17:36:55 -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
11cc2179a4
(205/665) Italian up to date with French
2022-08-12 15:31:25 -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
27f2b85efe
Incorporated Italian changes, enough to compile (still needs to sync a couple of them)
2022-08-12 00:28:16 -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
bb671d90a8
(197/654)
2022-08-10 09:07:13 -04:00
bfdbbad468
Split naming screen palettes/graphics, use correct image palettes, clean up
2022-08-09 09:27:28 -04:00
1fd1870a13
Moved enum to include/pokemon.h
2022-08-08 18:40:47 -04:00
75d52dc762
Convert MON_DATA constants into enum to ease editing and addition of fields.
2022-08-08 18:18:17 -04:00
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
4b08a511c3
Cleanup from https://github.com/pret/pokefirered/pull/532
2022-08-07 22:40:15 -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
c05c6bfe24
(90/654)
2022-08-02 15:44:28 -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
1b30bccb47
(56/654)
2022-08-02 12:18:17 -04:00
18cdd708b5
(56/654) Berry fix gba file + finalizing format for inc files
2022-08-02 11:05:56 -04:00
4e137fb43c
(55/654) src/battle_message.c and adjustments to Makefile
2022-08-02 10:01:19 -04:00
b2160d50bb
37/654
2022-08-01 23:35:34 -04:00
bec4127e20
Added missing makefile changes
2022-08-01 17:41:25 -04:00
79c5a5983e
Merge pull request #1721 from AsparagusEduardo/pret_clean2
...
Companion PR to pokefirered #525
2022-08-01 16:57:40 -04:00
5101811407
Merge pull request #1719 from AsparagusEduardo/pret_cleanBattleScriptCommands
...
Further cleaning after comparing with pokefirered
2022-07-30 09:09:23 -04:00
40805fffc0
Space cleanup
2022-07-29 21:28:39 -04:00
5d4b76c0ba
Review changes from pokefirered #524
2022-07-29 17:00:07 -04:00
9dc64b67cd
Review changes
2022-07-29 15:38:23 -04:00
01558ff8f3
Struct pointers star standarizing
2022-07-29 11:15:33 -04:00
13672680b0
void pointer standarized
2022-07-29 10:52:35 -04:00
7b3401ee27
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
9caca17064
Cleanup by syncing src/battle_script_commands.c with pokefirered
2022-07-29 09:43:16 -04:00
7a8c28ccca
Remove duplicated CB2_InitCopyrightScreenAfterBootup
2022-07-29 10:52:36 +02:00
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