FosterProgramming
|
5348de4abb
|
Banned species list (#8003)
|
2025-10-23 21:29:33 +02:00 |
|
Hedara
|
c27930eabf
|
Merge commit '678fdf9' into pret-merge
Conflicts:
data/maps/BirthIsland_Exterior/scripts.inc
data/maps/DesertUnderpass/scripts.inc
data/maps/Route117/scripts.inc
data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
data/maps/SootopolisCity/scripts.inc
include/constants/event_objects.h
src/battle_setup.c
src/event_object_movement.c
src/field_control_avatar.c
src/item_use.c
src/scrcmd.c
tools/mapjson/mapjson.cpp
|
2025-05-27 19:22:40 +02:00 |
|
GriffinR
|
f61c0099b9
|
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
|
2024-10-12 23:34:02 -04:00 |
|
GriffinR
|
bf17d54b52
|
Finish adding local IDs to map.json files
|
2024-10-12 23:32:28 -04:00 |
|
GriffinR
|
cb66ea6653
|
Continue adding local IDs to map.json files
|
2024-10-12 12:24:57 -04:00 |
|
Eduardo Quezada
|
ebbcb7d025
|
Whitespace, documentation and style
|
2024-01-22 19:12:52 -03:00 |
|
Ariel A
|
8df538479a
|
Merge branch 'master' into followers
|
2023-09-03 17:39:35 -04:00 |
|
GriffinR
|
866c32a735
|
Add temp var aliases
|
2023-08-04 14:17:28 -04:00 |
|
Ariel A
|
e6d1cfae24
|
Merge branch 'master' into followers
|
2022-11-21 21:21:50 -05:00 |
|
GriffinR
|
36551dff2f
|
Treat warp ids as strings to allow constants
|
2022-09-03 15:43:43 -04:00 |
|
Ariel A
|
9beee311c4
|
Merge branch 'master' into romhack
|
2022-07-17 15:13:15 -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 |
|
Ariel A
|
4236f18f2d
|
Fixed follower bugs when returning from a battle facility challenge.
|
2022-05-20 00:18:41 -04:00 |
|
GriffinR
|
49418f8c01
|
Add missing commas
|
2022-01-11 09:55:11 -05:00 |
|
GriffinR
|
e66ea0cb99
|
Reformat compare + goto_if/call_if to single statements
|
2021-11-18 23:06:51 -05:00 |
|
GriffinR
|
04cc923d6c
|
Handle optional arguments for warp commands, add WARP_ID_NONE
|
2021-11-16 10:53:00 -05:00 |
|
GriffinR
|
06351bf63c
|
Remove address comments
|
2021-07-20 15:18:31 -04:00 |
|
GriffinR
|
f602a9dcbf
|
Use bool for multichoice ignoreBPress
|
2021-03-31 00:35:56 -04:00 |
|
GriffinR
|
d356e35b64
|
Fix incorrect pike curtain SE names
|
2020-08-20 20:23:08 -04:00 |
|
GriffinR
|
3014241179
|
Give songs meaningful english names
|
2020-08-20 19:06:14 -04:00 |
|
GriffinR
|
fac6288156
|
Add local object event ids for referenced objects
|
2020-06-22 17:18:58 -04:00 |
|
GriffinR
|
e5757a3def
|
Use trainer type constants
|
2020-04-28 19:59:08 -05:00 |
|
GriffinR
|
b1d26e10a8
|
Sync map header property names with pokefirered
|
2020-04-28 19:59:08 -05:00 |
|
GriffinR
|
949509aade
|
Merge branch 'master' into fix-eventobj
|
2019-12-18 13:16:38 -05:00 |
|
GriffinR
|
96ec5e1b84
|
Use fadescreen constants
|
2019-12-15 11:42:50 -05:00 |
|
GriffinR
|
6556b556dd
|
Merge branch 'master' into fix-eventobj
|
2019-12-11 01:09:06 -05:00 |
|
GriffinR
|
49f1a90534
|
Document Battle Pike scripts
|
2019-12-10 19:31:27 -06:00 |
|
GriffinR
|
c51e0f3bae
|
Merge branch 'master' into fix-eventobj
|
2019-12-06 02:34:54 -05:00 |
|
GriffinR
|
41c1c9ca8a
|
Set up Battle Pike macros
|
2019-12-05 21:11:17 -06:00 |
|
GriffinR
|
be17c1602d
|
Set up remaining facility script doc, use Palace macros
|
2019-12-05 21:11:17 -06:00 |
|
GriffinR
|
cb90f22c5e
|
Merge master into ObjEvent rename
|
2019-11-27 12:51:10 -05:00 |
|
GriffinR
|
8d870d94c9
|
Document Battle Arena scripts
|
2019-11-26 18:47:48 -06:00 |
|
GriffinR
|
f559fa3fe2
|
Merge master into ObjEvent rename
|
2019-11-25 20:00:04 -05:00 |
|
GriffinR
|
63ee15fc28
|
Document Frontier Util
|
2019-11-25 18:37:48 -06:00 |
|
GriffinR
|
4dfa959fa2
|
Begin documenting Battle Pike and Frontier Util
|
2019-11-25 18:37:48 -06:00 |
|
GriffinR
|
82cb741d8b
|
Standardize EVENT_OBJECT to OBJECT_EVENT
|
2019-11-20 23:12:51 -05:00 |
|
GriffinR
|
ec3e86f1d2
|
Standardize Event Object to Object Event
|
2019-11-20 22:55:44 -05:00 |
|
GriffinR
|
6ac7efb54f
|
Document Scotts House and begin frontier macros
|
2019-11-17 08:16:28 -06:00 |
|
GriffinR
|
a3ee92a4e7
|
Document some frontier util funcs
|
2019-11-10 16:37:14 -06:00 |
|
GriffinR
|
033c6cea3b
|
Use YES/NO constants for MSGBOX_YESNO
|
2019-11-02 16:36:43 -05:00 |
|
GriffinR
|
c4deb4db96
|
Document field_poison
|
2019-10-06 20:04:30 -04:00 |
|
GriffinR
|
9aed405851
|
Document a few field specials
|
2019-09-30 01:42:52 -04:00 |
|
GriffinR
|
de0084ef7a
|
Document multichoice ids
|
2019-09-19 00:56:51 -04:00 |
|
GriffinR
|
06af24bce5
|
Use misc ScrCmd constants
|
2019-09-16 19:44:47 -05:00 |
|
Phlosioneer
|
8816aa527d
|
Update map script files
|
2019-02-25 08:01:22 -06:00 |
|
Phlosioneer
|
4582fd1545
|
Name a ton of commonly used event scripts
|
2019-02-24 10:10:18 -06:00 |
|
Marcus Huderle
|
19b76bffda
|
Use strings for map json trainer_type and trainer_sight_or_berry_tree_id fields
|
2019-02-16 16:56:41 -06:00 |
|
Marcus Huderle
|
29d6221935
|
Convert map data to JSON
|
2019-01-31 15:51:20 -06:00 |
|
Marcus Huderle
|
5c1667b41a
|
Define layout constants
|
2019-01-29 16:55:25 -06:00 |
|
Marcus Huderle
|
a1ea3b5e39
|
Use map_header_flags macro (#483)
|
2018-12-26 12:20:15 -06:00 |
|