ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 20:24:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,551 Commits 1 Branch 0 Tags 235 MiB
b248791f47
Commit Graph

2025 Commits

Author SHA1 Message Date
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
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
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
GriffinR
5515e328b2 Clean up lock/unlock anim movement 2022-08-12 21:18: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
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
5fa8ca55b0 Clean up some additional unknowns 2022-05-17 17:12:45 -04:00
GriffinR
593e2c9be0 Fix inconsistent static s/g names 2022-05-17 14:00:02 -04:00
PikalaxALT
ff936c15e1 Sync arg descriptions from FireRed 
https://github.com/pret/pokefirered/pull/501
 2022-04-28 13:46:23 -04:00
PikalaxALT
3f7b6ca357 Remove spurious space in battle_anim_scripts.s 2022-04-28 09:04:16 -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
GriffinR
2495d18132 Add missing :req, remove old macros 2022-01-23 18:52:04 -05:00
GriffinR
a7e6045d71
Merge pull request #1597 from GriffinRichards/misc-cleanup 
Miscellaneous fixes
 2022-01-19 22:17:37 -05:00
GriffinR
69759b2d12
Merge pull request #1601 from GriffinRichards/fix-decor-flag 
Fix FLAG_DECORATION_0 name
 2022-01-16 17:44:58 -05:00
GriffinR
fd7457b05a Remove berry fix 2022-01-13 15:26:20 -05:00
GriffinR
f899a02ac6 Use MON_GIVEN_TO_ constants for givemon 2022-01-12 18:34:26 -05:00
GriffinR
49418f8c01 Add missing commas 2022-01-11 09:55:11 -05:00
GriffinR
3a6c633905 Add seteventmon 2022-01-11 02:16:25 -05:00
GriffinR
110fbc559c Make item optional for givemon and setwildbattle 2022-01-11 02:08:14 -05:00
GriffinR
8b920691e6 Fix FLAG_DECORATION_0 name 2022-01-09 01:31:42 -05:00
GriffinR
ce55e58ad8 Misc cleanup 2022-01-04 10:09:42 -05:00
GriffinR
23f5c9fd5c Clean up pokedex_area_screen 2021-12-31 00:16:56 -05:00
LOuroboros
e28fa7f91c
Update event_scripts.s 2021-12-21 22:10:54 -03:00
GriffinR
cc05b08227 Fix incorrect ever grande flower animation palettes 2021-12-06 11:17:42 -05:00
GriffinR
d501636730 Fix incorrect flag animation palettes 2021-12-03 16:36:18 -05:00
GriffinR
e0fae879da
Merge pull request #1558 from GriffinRichards/update-macros 
Update event macro comments
 2021-11-22 19:10:49 -05:00
GriffinR
23dd1dad7f Fix incorrect palettes in Mauville flower tileset anims 2021-11-21 11:23:03 -05:00
GriffinR
42a83ee50e Use STR_VAR names for apprentice_buff and frontier_gettrainername 2021-11-18 23:20:05 -05:00
GriffinR
e66ea0cb99 Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
GriffinR
6c6487dd7a Missing spaces to tabs in scripts files 2021-11-18 21:02:22 -05:00
GriffinR
c89dfd9f56 Finish updating macro comments 2021-11-18 01:47:58 -05:00
GriffinR
b5b5d95de6 Distinguish 'virtual object' names from object events 2021-11-17 23:40:53 -05:00
GriffinR
c4f8f4d11a Add STR_VAR_# ids to string buffer macros 2021-11-17 22:00:44 -05:00
GriffinR
c940b67716 Continue macro comment updating 2021-11-17 17:45:59 -05:00
GriffinR
61aa9c3ba9 More updating event macro comments 2021-11-16 17:46:34 -05:00
GriffinR
d414787932 Some TV clean-up 2021-11-16 16:22:17 -05:00
GriffinR
5d9c31a610 Label slot machine ids, fix GetPriceReduction 2021-11-16 15:43:52 -05:00
GriffinR
63c5905914 Continue updating event macro comments 2021-11-16 13:10:23 -05:00
GriffinR
04cc923d6c Handle optional arguments for warp commands, add WARP_ID_NONE 2021-11-16 10:53:00 -05:00
GriffinR
65d3b58374 Add PARTY_NOTHING_CHOSEN 2021-11-15 10:57:06 -05:00
GriffinR
f85de6eca5 Start event macro comment updates 2021-11-15 10:54:57 -05:00
GriffinR
b14fe9dce3
Merge pull request #1547 from GriffinRichards/doc-sounddata 
Clean up sound, add CRY_MODE constants
 2021-11-13 15:54:40 -05:00
GriffinR
c4169cfd29 Disambiguate cry functions 2021-11-07 14:26:09 -05:00
GriffinR
54b254a829 Add CRY_MODE constants 2021-11-07 13:33:05 -05:00
cbt6
32aaf6912f Rename movement scripts to use Faster over Fastest 2021-11-05 02:22:28 +08:00
GriffinR
e14210ce1f
Merge pull request #1536 from GriffinRichards/clean-braille 
Add font id constants, better braille support
 2021-11-03 13:17:29 -04:00
GriffinR
0ba22ca112
Merge pull request #1534 from GriffinRichards/doc-btrans 
Document battle transition
 2021-11-03 11:26:20 -04:00
Eduardo Quezada D'Ottone
f3013d8ee9 Standarized Solarbeam into Solar Beam 2021-11-01 18:36:35 -03:00
GriffinR
36039e1b86 Convert fonts.s to C 2021-10-31 01:44:18 -04:00
GriffinR
fdaf436960 Add font id constants 2021-10-30 19:54:15 -04:00
GriffinR
13cd2a41f0 Better braille support 2021-10-30 16:19:10 -04:00
GriffinR
71605556ab Clean up braille_puzzles 2021-10-30 11:59:14 -04:00
GriffinR
875be8a8a8
Merge pull request #1528 from GriffinRichards/doc-ereaderscr 
Document ereader screen
 2021-10-30 09:34:14 -04:00
GriffinR
07bf225f94 Continue battle_transition documenting 2021-10-29 11:24:36 -04:00
GriffinR
fbf3bf2ce8 Replace 'mystery_event_club' 2021-10-26 22:43:56 -04:00
GriffinR
b0c27a8521 Document ereader screen 2021-10-26 15:44:42 -04:00
GriffinR
d6571f2355
Merge pull request #1525 from GriffinRichards/doc-recmix 
Document remainder of Record Mixing
 2021-10-26 14:18:38 -04:00
GriffinR
6dc3c9864c
Merge pull request #1520 from GriffinRichards/doc-random 
Document random remaining symbols
 2021-10-24 23:43:17 -04:00
GriffinR
ab80264921
Merge pull request #1519 from GriffinRichards/doc-mgift 
Document Mystery Gift
 2021-10-24 15:50:39 -04:00
GriffinR
7f3c529935 Document record mixing mail swap 2021-10-24 15:49:19 -04:00
GriffinR
24b4e898ad More mauville_old_man clean up 2021-10-18 14:40:04 -04:00
GriffinR
7590bacec1 Label remaining symbols in field_specials 2021-10-18 02:14:29 -04:00
GriffinR
db8ce5d7f9 Clean up mauville_old_man, drop ScrSpecial prefix 2021-10-18 01:09:41 -04:00
GriffinR
ece7ef3410 Correct usage of MysteryEvent to MysteryGift 2021-10-17 03:00:48 -04:00
GriffinR
3cd27acbea Document wonder news 2021-10-17 02:09:31 -04:00
GriffinR
845a5e99cc General mystery gift documentation, finish mystery gift client/server/scripts 2021-10-16 23:35:17 -04:00
GriffinR
e1900efe1e
Merge branch 'master' into doc-miscbattle 2021-10-15 22:46:43 -04:00
GriffinR
c02001c46d Document mystery gift link scripts, general mystery gift 2021-10-15 12:05:06 -04:00
GriffinR
def6cc8158 Label battle script macro arguments 2021-10-13 17:44:04 -04:00
GriffinR
fc15b0d5f0 Add controller buffer constants, finish misc battle doc 2021-10-13 16:21:39 -04:00
GriffinR
f23e0beeba Rename battle anim cmds, move its data, name remaining symbols 2021-10-11 13:18:21 -04:00
GriffinR
31b501e7eb Start misc battle documentation 2021-10-08 16:39:46 -04:00
GriffinR
a2655ba9ab
Merge branch 'master' into doc-union 2021-10-07 16:10:35 -04:00
Pokestia
38a4dea402 Rename Battle Weather flags 2021-09-30 12:08:20 +02:00
Pokestia
e699965332 Use compact weather macros 2021-09-29 17:45:39 +02:00
GriffinR
a66d7e1b43 Document some single-remaining symbols 2021-09-24 17:14:20 -04:00
LOuroboros
554210c5e3 Removed trailing spaces in the most relevant files 
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
 2021-08-24 19:59:32 -03:00