Commit Graph

157 Commits

Author SHA1 Message Date
GriffinR
1f33c6fd8f
Merge branch 'master' into master 2026-02-14 12:08:49 -05:00
Robin Xyifer
91b4d8ff9f Partial naming of Contest data, mostly focused on Lilycove. EN tested, DE not tested. 2025-05-16 13:10:06 -05:00
GriffinR
1439b0e84f Merge branch 'master' of https://github.com/pret/pokeruby into porymap-6 2025-05-14 12:04:46 -04:00
Robin Xyifer
253e0d3ce0 Final cleanup before final build tests. 2025-03-27 17:34:06 -05:00
Robin Xyifer
78ffcc3100 SlateportCity internal maps names parity update. 2025-03-27 01:00:26 -05:00
Robin Xyifer
cfdeb74236 LittlerootTown internal maps name parity update. 2025-03-13 18:42:40 -05:00
Robin Xyifer
ecd31b9fa2 LilycoveCity internal maps name parity update. 2025-03-13 15:45:50 -05:00
Robin Xyifer
9a26d88699 FallarborTown internal maps name parity update. 2025-03-11 18:55:05 -05:00
GriffinR
bbb43dd04a Add some LOCALID usage 2025-02-10 14:29:21 -05:00
GriffinR
cb26a6faeb Add support for local IDs in map.json 2025-02-10 13:30:29 -05:00
GriffinR
4cfc9ee51c Sync labels in AbandonedShip corridor scripts 2024-01-18 15:56:42 -05:00
PikalaxALT
75b2298d37 Start syncing contest code documentation from Emerald 2021-06-21 10:19:41 -04:00
GriffinR
038abf80ba Give songs meaningful english names 2020-08-29 01:47:36 -04:00
GriffinR
f0bf1e641c Sync cave_hole.inc 2020-07-20 17:53:45 -04:00
GriffinR
4722b1e2a2 Sync some secret_base.inc 2020-05-21 15:49:29 -04:00
GriffinR
c272741e76 Split misc script text files 2020-05-07 14:05:15 -04:00
GriffinR
4a7f3117e7 Sync elite_four.inc, check_furniture.inc 2020-05-07 12:49:36 -04:00
GriffinR
9f0a897602 Sync static_pokemon.inc 2020-05-06 16:02:03 -04:00
GriffinR
49d6f31c28 Sync cave_of_origin.inc 2020-05-06 15:20:28 -04:00
GriffinR
b230178cdb Sync prof_birch.inc 2020-05-06 15:02:51 -04:00
GriffinR
d3127e3594 Sync common scripts up to prof_birch.inc 2020-05-06 14:48:14 -04:00
GriffinR
554a26b6be Sync set_gym_trainers.inc 2020-05-06 13:59:30 -04:00
GriffinR
15b66d82c6 Sync surf.inc, dynamic_npc_graphics.inc 2020-05-06 13:51:41 -04:00
GriffinR
6f0a4b2215 Use fadescreen constants, sync common scripts after pc.inc 2020-04-29 15:35:25 -04:00
GriffinR
788dc307d4 Sync pc.inc 2020-04-29 14:56:39 -04:00
GriffinR
9604fa3936 Sync record_mix.inc 2020-04-28 14:24:46 -04:00
GriffinR
d1d59596f1 Sync obtain_item.inc 2020-04-28 13:04:50 -04:00
GriffinR
b1c7689dcc Use OBJ_EVENT_ID_PLAYER 2020-04-27 17:05:15 -04:00
GriffinR
625f621397 Sync movement.inc 2020-04-27 16:53:59 -04:00
GriffinR
b9560c155e Sync pkmn_center_nurse.inc 2020-04-27 16:17:06 -04:00
GriffinR
6f0551ae38 Sync hall_of_fame.inc 2020-04-27 15:42:05 -04:00
GriffinR
15f5cb7e73 Sync new_game.inc 2020-04-27 14:19:54 -04:00
GriffinR
7d4c9d1f9f Sync movement actions 2020-04-27 13:57:50 -04:00
GriffinR
541c069857 Sync trainer_battle.inc 2020-04-27 13:48:11 -04:00
GriffinR
2e74b9c2eb Sync std_msgbox.inc 2020-04-27 13:17:45 -04:00
GriffinR
faf8130585 Sync shared_secret_base.inc 2020-04-24 15:23:48 -04:00
GriffinR
214d997497 Use msgbox constants 2020-04-23 18:08:40 -04:00
GriffinR
7109435631 Sync event macros 2020-04-23 17:59:25 -04:00
GriffinR
98ca62cf91 Standardize Event Object to Object Event 2020-02-12 18:35:27 -06:00
GriffinR
11170ce90c Sync specialvars with pokeemerald 2019-10-16 20:22:11 -05:00
garak
ad365a35c1 name metatiles 2019-07-18 15:10:32 -04:00
PikalaxALT
1eb17b1921 Some documentation of contest_link_80C2020 2019-04-08 17:33:35 -05:00
Doesnty
a6f39d191d Fix a flag name typo 2019-04-05 17:29:59 -05:00
Marcus Huderle
016e0e6da3 Fix nonmatching DaycareMonReceivedMail_() 2018-07-26 09:52:22 -05:00
vblm12
5674674840 Rename OPPONENT_ to TRAINER_ to match pokeemerald. 2018-07-20 21:32:31 -05:00
Marcus Huderle
f14c3be5e8 Document field_effect_helpers and other misc. things 2018-06-23 16:00:17 -05:00
Marcus Huderle
2c7a4e1406 Use MUS_ prefix instead of BGM_ prefix for songs 2018-06-20 17:47:51 -05:00
Marcus Huderle
6dc3c86939 Move map scripts into 'data/maps/<mapname>/scripts.inc' 2018-06-20 17:47:16 -05:00
Marcus Huderle
2e80477ea1 Label move_tutor_menu.c 2018-06-10 11:09:57 -05:00
Marcus Huderle
0a2c709535 Label all metatile behaviors and functions 2018-06-07 20:54:44 -05:00