Eduardo Quezada
0d5b00aaf2
Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
...
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# data/maps/BattleFrontier_Lounge7/scripts.inc
# include/battle_anim.h
# include/battle_message.h
# include/constants/items.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_anim_throw.c
# src/battle_anim_utility_funcs.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/party_menu.h
# src/data/pokemon/tmhm_learnsets.h
# src/daycare.c
# src/field_specials.c
# src/hall_of_fame.c
# src/party_menu.c
# src/pokemon.c
# src/tv.c
2023-08-31 14:28:01 -04:00
GriffinR
866c32a735
Add temp var aliases
2023-08-04 14:17:28 -04:00
Eduardo Quezada
55ba9d8364
Fixed right Frontier move tutor not loading their move list correctly.
2022-12-18 13:17:33 -03:00
Eduardo Quezada
e4a439aa46
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
...
# Conflicts:
# src/data/bard_music/moves.h
# src/data/bard_music/pokemon.h
2022-10-30 12:30:38 -03:00
GriffinR
36551dff2f
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
crater-git
9f16d1dd12
Fixed battle frontier tutors (for real this time)
2022-08-27 22:45:10 -04:00
crater-git
54ee960970
Fixed Battle Frontier tutor move IDs
2022-08-26 10:12:11 -04:00
GriffinR
e66ea0cb99
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
GriffinR
c4f8f4d11a
Add STR_VAR_# ids to string buffer macros
2021-11-17 22:00:44 -05:00
GriffinR
06351bf63c
Remove address comments
2021-07-20 15:18:31 -04:00
GriffinR
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -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
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
57a66bb22d
Document Battle Frontier lounges
2019-11-16 11:37:34 -06:00
GriffinR
033c6cea3b
Use YES/NO constants for MSGBOX_YESNO
2019-11-02 16:36:43 -05:00
GriffinR
6db014cc32
Document party_menu first pass
2019-10-25 15:41:06 -04:00
GriffinR
f179ab95c0
Document move tutors
2019-10-06 17:30:17 -04:00
GriffinR
275695c189
Document more script_menu, lilycove harbor
2019-09-19 17:27:34 -04:00
GriffinR
6ab49da811
Clean up field_specials documentation
2019-09-17 16:50:17 -05:00
GriffinR
3dbd375779
Some frontier field_specials documentation
2019-09-17 16:50:17 -05:00
GriffinR
aac9658a8e
Document some field_specials data
2019-09-17 16:50:17 -05: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
Tetrable
a3ebca4d81
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Tetrable
1e3da62d24
Finish off labelling flags
2019-01-02 21:12:43 +00:00
Marcus Huderle
a1ea3b5e39
Use map_header_flags macro ( #483 )
2018-12-26 12:20:15 -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
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
Deokishisu
bf2063cc1a
Update All EVENT_OBJ_GFX References
...
Didn't realize that this needed to be done as well for renaming OW sprites. The event_objects.h file has had its corresponding defines renamed and all references in all files to those defines have been relabeled.
2018-10-14 19:09:18 -04:00
Marcus Huderle
94650495c6
Use map battle scene constants in map headers
2018-07-12 22:45:41 -05:00
Marcus Huderle
546819bc72
Use map type constants in map headers
2018-07-12 22:39:38 -05:00
Marcus Huderle
d53e8137cd
Use weather constants in map headers
2018-07-12 22:15:35 -05:00
Marcus Huderle
d5eb94330a
Use region map section constants in map headers
2018-07-12 21:47:04 -05:00
Marcus Huderle
8ffd7a70fc
Use movement type constants in object_event macros
2018-07-10 18:04:51 -05:00
Marcus Huderle
135a11e50e
Move events and scripts into map dirs
2018-06-20 19:54:21 -05:00
Marcus Huderle
89d35e82a2
Move 'map attributes' into 'layouts'
2018-06-20 19:54:21 -05:00
sceptillion
96511dc214
use internal song names
2017-12-22 00:10:20 -08:00
Diegoisawesome
f61810a8f9
Dump maps
2017-11-09 19:21:31 -06:00
