36c89d345c
Merge branch 'master' into doc-wnews
2023-01-03 22:28:21 -05:00
2aa6a9c164
Remove two unreferenced metatile labels
2022-12-16 11:05:56 -05:00
347a02ace1
Sync trade
2022-12-15 15:40:59 -05:00
483c3d5c13
Document wonder news
2022-11-22 02:17:03 -05:00
5fa364256d
Merge pull request #1808 from AsparagusEduardo/pret/PR/numSides
...
Introduce NUM_BATTLE_SIDES
2022-11-18 17:39:00 -05:00
c76beed989
Merge pull request #1807 from pret/porymap-5
...
Update for Porymap 5.0.0
2022-10-30 11:01:37 -04:00
18e7fc5efc
Introduce NUM_BATTLE_SIDES
2022-10-20 08:41:18 -03:00
3e8baa5b04
Merge branch 'master' into porymap-5
2022-10-18 22:54:25 -04:00
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
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
e33581ff9c
Merge pull request #1671 from sphericalice/heal-location-none
...
Add the HEAL_LOCATION_NONE constant
2022-10-18 18:41:04 -04:00
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
60e1ad20e4
Add NUM_MON_PIC_FRAMES, and trainer pic size constants
2022-10-10 23:16:08 -04:00
453da8aa8c
Moved ILLEGAL_BATTLE_TYPES to include\constants\battle.h and renamed it to BATTLE_TYPE_RECORDED_INVALID
2022-10-07 15:49:00 -03:00
e293986fbb
Merge pull request #1793 from GriffinRichards/clean-shop
...
Clean up shop.c
2022-10-06 17:24:53 -04:00
1107ff954d
Clean up shop.c
2022-09-22 15:08:17 -04:00
bca1267ca8
Altered MAX_FRONTIER_PARTY_SIZE to be automatically calculated by the other frontier party sizes
2022-09-15 14:52:18 -03:00
14c6d8b91a
Fixed alignment for the value of vars 0x4020 to 0x40FF
2022-09-12 21:33:03 -03:00
cb83a09203
Fixed vars alignment
2022-09-12 21:27:53 -03:00
222362e804
Fixed Raquaza typo
2022-09-12 21:26:22 -03:00
74b563f696
Merge pull request #1749 from GriffinRichards/ur-classes
...
Fix names and constant usage for union room classes
2022-09-06 21:35:10 -04:00
c7fc2e13f7
Renamed TM flags to keep consistency with the rest of the repo
2022-09-02 16:54:58 -04:00
a28fbbc1b8
Merge pull request #1748 from GriffinRichards/fix-judgement
...
Standardize judgement vs judgment spelling
2022-09-01 11:51:04 -04:00
15d611ba65
Usage of BATTLE_PARTNER
2022-08-27 01:26:13 -04:00
ce4a6e9067
MAP_NONE -> MAP_DYNAMIC
2022-08-25 21:34:05 -04:00
11d6ae4820
Renamed the GetLeadMonFriendshipScore constants
2022-08-25 11:34:37 -03:00
1f4ef2a0fb
Added constants for GetLeadMonFriendshipScore
2022-08-25 10:40:56 -03:00
3771abbe08
Fix names and constant usage for union room classes
2022-08-23 12:44:07 -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
261b0ff118
Standardize judgement vs judgment spelling
2022-08-20 22:58:46 -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
5515e328b2
Clean up lock/unlock anim movement
2022-08-12 21:18:10 -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
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
4b08a511c3
Cleanup from https://github.com/pret/pokefirered/pull/532
2022-08-07 22:40:15 -04:00
9caca17064
Cleanup by syncing src/battle_script_commands.c with pokefirered
2022-07-29 09:43:16 -04: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
b59f7aed7f
Added a constant for NPC trainer name length ( #1712 )
2022-07-25 22:59:13 -04:00
30a5821997
Merge pull request #1705 from sphericalice/move-unavailable
...
Introduces a MOVE_UNAVAILABLE constant
2022-07-12 11:32:57 -04:00
186f2c0232
Introduce a MOVE_UNAVAILABLE constant
2022-07-11 15:18:13 +01:00
a1004485c5
Relocated TYPE_NAME_LENGTH and ABILITY_NAME_LENGTH
2022-07-10 20:08:28 -03:00
57222323c1
Merge pull request #1678 from GriffinRichards/const-frontier
...
Add some battle frontier constant usage
2022-06-18 10:22:58 -04:00
4660f8c88b
Document battle tower TV show
2022-06-14 09:37:39 -04:00
7143865f6f
Add some battle frontier constant usage
2022-06-09 12:57:28 -04:00
1f540845cb
Merge pull request #1675 from GriffinRichards/doc-arg
...
Document generic arguments
2022-06-09 11:11:02 -04:00
bc2dbd772e
Add warning to NUM_OBJ_EVENT_GFX
2022-06-03 16:18:34 -04:00
GriffinR