GriffinR
69fdf0faa4
Merge pull request #1853 from GriffinRichards/doc-contest-bar
...
Clarify AI_CV_AttackDown_UnknownTypeList
2023-02-15 11:29:57 -05:00
GriffinR
28ada9c93b
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest-bar
2023-02-01 15:52:19 -05:00
GriffinR
9003966fcc
Misc field_specials cleanup
2023-02-01 11:48:55 -05:00
GriffinR
29c1af50ca
Fix Best Streak stat name
2023-01-20 11:25:04 -05:00
GriffinR
b7d92e8537
Revert incorrect constant usage, add new correct ones
2023-01-18 12:11:09 -05:00
GriffinR
5a906c33ac
Merge branch 'master' into sync_battle_anim_args
2023-01-18 11:47:33 -05:00
GriffinR
c663154760
Merge pull request #1836 from GriffinRichards/fix-clone
...
Add fix for Battle Tower cloning bug
2023-01-15 00:32:24 -05:00
GriffinR
e88139d1b5
Add fix for Battle Tower cloning bug
2022-12-29 11:22:53 -05:00
GriffinR
483c3d5c13
Document wonder news
2022-11-22 02:17:03 -05:00
GriffinR
c76beed989
Merge pull request #1807 from pret/porymap-5
...
Update for Porymap 5.0.0
2022-10-30 11:01:37 -04:00
GriffinR
01c71b4ce1
Fix more text and movements labeled as scripts
2022-10-30 03:27:28 -04:00
GriffinR
f439a2dee7
Fix EventScript_WroteSecretCodeLockOpened typo
2022-10-30 03:14:47 -04:00
GriffinR
cc182bf05e
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
GriffinR
a418f8d976
Merge pull request #1755 from GriffinRichards/map-dynamic
...
Rename special map constants, treat warp ids as strings
2022-10-18 22:45:56 -04:00
tustin2121
4730870646
VAR_RUN_TRIGGER_IMMEDIATELY -> TRIGGER_RUN_IMMEDIATELY
...
Getting rid of the VAR_ prefix, to avoid the porymap problem.
2022-10-18 21:12:31 -04:00
tustin2121
327c648e87
Document seldom-used trigger functionality
...
Added a define for use in overworld triggers where the goal is to run the provided script in the immediate script context instead of the global one like normal. This is used in triggers in the desert, on faraway island, and a couple other places to do weather effects quickly and on the same frame. Suggestions for a better define name are welcome.
2022-10-16 20:46:50 -04:00
GriffinR
4f407a1066
Convert tilesets.s to C
2022-09-27 17:23:26 -04:00
GriffinR
91c040b081
Merge pull request #1777 from AsparagusEduardo/pret/pr/trailingWhitespace
...
Cleaned trailing whitespace
2022-09-13 14:00:11 -04:00
LOuroboros
222362e804
Fixed Raquaza typo
2022-09-12 21:26:22 -03:00
Eduardo Quezada
65108c3192
Cleaned trailing whitespace
2022-09-11 14:14:49 -04:00
GriffinR
36551dff2f
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Eduardo Quezada
c7fc2e13f7
Renamed TM flags to keep consistency with the rest of the repo
2022-09-02 16:54:58 -04:00
GriffinR
8aead3b4c8
Merge pull request #1747 from GriffinRichards/contest-ai-bug
...
Incorporate commented bug fixes in contest AI scripts
2022-08-26 23:53:44 -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
Eduardo Quezada
6fb4da68f3
Corrected Oldale Town Sign labels
2022-08-25 22:00:24 -04:00
GriffinR
ce4a6e9067
MAP_NONE -> MAP_DYNAMIC
2022-08-25 21:34:05 -04:00
LOuroboros
11d6ae4820
Renamed the GetLeadMonFriendshipScore constants
2022-08-25 11:34:37 -03:00
LOuroboros
1f4ef2a0fb
Added constants for GetLeadMonFriendshipScore
2022-08-25 10:40:56 -03: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
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
