Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-08-09 14:28:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,174 Commits 3 Branches 0 Tags 988 MiB
7b3bbd2246
Commit Graph

1991 Commits

Author SHA1 Message Date
Eduardo Quezada
7b3bbd2246 Fixed end of file newlines 2024-06-22 09:54:58 -04:00
dennisw100
23ad0c125d
Seperated Text from script Battle Frontier 2/2 2024-06-22 11:21:47 +02:00
dennisw100
c529d4f09f
Seperated Text from script Battle Frontier 1/2 
Hoffentlich jetzt in den richtigen ordner
 2024-06-22 11:18:09 +02:00
Eduardo Quezada
da17309441 385/665 2023-05-30 08:12:59 -04:00
Eduardo Quezada
c264fdf45e 382/665 2023-01-09 00:49:12 -03:00
Eduardo Quezada
56496b15e5 333/665 2022-12-30 11:46:16 -03:00
Eduardo Quezada
1ddbd318be 328/665 2022-12-30 10:32:17 -03:00
Eduardo Quezada
c7295fa8e2 315/665 2022-12-30 09:50:31 -03:00
Eduardo Quezada
9022504af5 306/665 2022-12-30 08:39:45 -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
Eduardo Quezada
f87d86945f (256/665) 2022-08-17 08:48:38 -04:00
Eduardo Quezada
d45fda5666 (241/665) 2022-08-16 14:30:29 -04:00
Eduardo Quezada
e43f65cc69 using BATTLE_RUN constants in BattleScript_EffectTeleport 2022-08-15 21:06:26 -04:00
Eduardo Quezada
e8a05e92e4 Corrected additional inconsistent uses of whitespace 2022-08-15 17:04:34 -04:00
Eduardo Quezada
63e4a8adcd Fixed instances of .string being used with spaces instead of tabs 2022-08-15 14:32:01 -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
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
Eduardo Quezada
9f23159c43 (185/654) 2022-08-08 15:52:16 -04:00
Eduardo Quezada
1b30bccb47 (56/654) 2022-08-02 12:18:17 -04:00
Eduardo Quezada
18cdd708b5 (56/654) Berry fix gba file + finalizing format for inc files 2022-08-02 11:05:56 -04:00
Eduardo Quezada
6b8d17497f Finished the rest of the Abandoned Ship text 2022-08-01 18:30:55 -04:00
Eduardo Quezada
a59b1fb9d2 First pair 2022-08-01 17:53:15 -04:00
Eduardo Quezada
bec4127e20 Added missing makefile changes 2022-08-01 17:41:25 -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
GriffinR
e6a374f2b6 Rename faintifabilitynotdamp and jumpifattackandspecialattackcannotfall 2022-07-06 14:49:08 -04:00
Colton G. Rushton
3de23b332a Supplant https://github.com/pret/pokeemerald/pull/1579 2022-06-18 21:51:05 -03:00
GriffinR
21ed288f50
Merge pull request #1687 from SimplyBLGDev/patch-1 
Format newlines in surf.inc
 2022-06-18 11:04:39 -04:00
Colton G. Rushton
c8e6d69fdc
Format newline in BattleBattleFrontier_BattlePikeLobby/scripts.inc 
One of the strings declared in BattleFrontier_BattlePikeLobby/scripts.inc was poorly formatted.
 2022-06-18 11:49:13 -03: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
Simply BLG
324a157b34
Format newlines in surf.inc 
One of the strings declared in surf.inc was poorly formatted.

## Description
Some of the strings declared in surf.inc contained newline characters in the middle of the .string line, opposing the format used by every string in the `data/text` directory, I just updated them to match the format, making it more readable.
 2022-06-17 15:21:12 -03:00
Simply BLG
380cc8615b
Format newlines in pc_transfer.inc 2022-06-17 14:22:31 -03:00
Simply BLG
1860b61fe3
Corrected two missing newlines 2022-06-17 12:05:32 -03:00
Simply BLG
e48341f7fc
Format newlines in contest_string.inc 
Some of the strings declared in contest_string.inc were poorly formatted, containing newline characters in the middle of the string, opposing the format used by every string in data/text, I just updated them to match the format, making it more readable.
 2022-06-17 11:52:54 -03:00
GriffinR
4660f8c88b Document battle tower TV show 2022-06-14 09:37:39 -04:00
GriffinR
dec54e6e92 Additional constant usage 2022-06-13 03:21:20 -04:00
GriffinR
1ca1bff81c Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into doc-arg 2022-06-03 15:43:21 -04:00
GriffinR
34438e6bc4 Continue documenting generic arguments 2022-06-03 15:38:03 -04:00
GriffinR
a8437493c1 Document generic argument names in battle anim palettes 2022-06-01 12:25:01 -04:00
GriffinR
593e2c9be0 Fix inconsistent static s/g names 2022-05-17 14:00:02 -04:00
GriffinR
fc5747f0f7
Merge pull request #1649 from GriffinRichards/clean-trainer 
Trainer hill clean up
 2022-04-20 00:20:44 -04:00
GriffinR
62f3f144ab Clean up some trainer hill 2022-03-31 12:54:07 -04:00
cbt6
f826a5a82d Use constants for PC locations 2022-02-23 15:07:22 +08:00
GriffinR
0710a5467b Add some missing RGB constant usage 2022-02-15 21:55:51 -05:00