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
9f31b0fe90
Generate local IDs from map.json files
2024-10-12 03:04:24 -04:00
Eduardo Quezada
25567070d6
Moved callfuncs to general macros folder + added comments + removed unused "emote" macro
2024-05-22 13:52:26 -04:00
Eduardo Quezada
2fe18c22f9
Style fixes
2024-05-21 18:57:09 -04:00
Ariel A
9e00e23b96
Added OW daycare pokemon.
2023-04-23 17:34:38 -04:00
GriffinR
e66ea0cb99
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
GriffinR
06351bf63c
Remove address comments
2021-07-20 15:18:31 -04:00
GriffinR
fac6288156
Add local object event ids for referenced objects
2020-06-22 17:18:58 -04:00
GriffinR
525ec2025d
Document Routes 111-118
2019-11-14 17:41:01 -06:00
GriffinR
dd01942c4f
Document aqua/magma hideout scripts
2019-11-01 17:22:45 -05:00
Fontbane
901a83d249
Fix some labels and include decorations.h
...
Include decorations.h in shop.c
Include decorations.h in event_scripts.s
2019-04-22 17:23:59 -05:00
Fontbane
2c076f1f3e
Doc most OnTransitions
2019-04-22 17:23:59 -05:00
Phlosioneer
8816aa527d
Update map script files
2019-02-25 08:01:22 -06:00
Melody
ac2e4adf2d
improve goto_if macros
2018-12-21 20:28:24 -05:00
Melody
2615ece23b
Use normal apostrophes like adults
2018-12-07 10:41:08 -05:00
Melody
10725def8e
trainerbattle_normal → trainerbattle_single
...
* trainerbattle_normal → trainerbattle_single
* TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE
* improves the macro documentation a little
2018-12-02 15:08:19 -05:00
Melody
bad5323642
cleans up trainer battle scripts
...
* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
2018-12-02 15:08:19 -05:00
Melody
862265b73a
defines register_matchcall macro
2018-12-02 06:04:59 -05:00
Melody
c557ac61ae
adds constants, cleans up callstd and msgbox code
...
* adds some constants for standard script names and messagebox types
* replaces some callstd calls with msgbox calls where equivalent
* replaces msgbox and callstd calls using raw digits with versions that use the constants
2018-12-02 03:37:46 -05:00
Diegoisawesome
156fb472e1
Clean up files and add entries to charmap
2018-07-24 21:18:23 -07:00
Marcus Huderle
135a11e50e
Move events and scripts into map dirs
2018-06-20 19:54:21 -05:00
