Commit Graph

208 Commits

Author SHA1 Message Date
Xyifer
6eec908ad1
AbandonedShip name parity update with PokeEmerald. (#874)
Some checks failed
CI / build (push) Has been cancelled
2025-02-25 09:18:15 -05:00
Xyifer
c3530bdf81
Route110_TrickHouse name parity with PokeEmerald. (#873)
Some checks are pending
CI / build (push) Waiting to run
2025-02-24 18:07:07 -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
10ae28cd36 Finish porting contest data to C 2021-06-24 10:44:43 -04:00
PikalaxALT
5dd61a98b8 Contest data and strings to C, 2 2021-06-23 15:08:21 -04:00
PikalaxALT
18a567fb29 Document remaining contest.c functions 2021-06-23 12:51:58 -04:00
GriffinR
038abf80ba Give songs meaningful english names 2020-08-29 01:47:36 -04:00
Marcus Huderle
5d55531291 Re-export german tileset images as 16-color indexed mode 2020-08-15 15:20:11 -05: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
d53c3741ab Sync common ferry scripts 2020-05-06 15:09:46 -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
21b8fb4fbd Use map script constants 2020-04-23 18:28:07 -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
PikalaxALT
1bd678656c
Merge pull request #743 from garakmon/metatile_labels
Name Metatiles
2019-09-08 12:43:57 -04:00
garak
dcac22cef9 finish pokenav data decomp 2019-07-18 21:57:19 -04:00
garak
ad365a35c1 name metatiles 2019-07-18 15:10:32 -04:00
Melody
4161c6e6d7 Use real apostrophes instead of fake ones 2018-12-07 10:54:47 -05:00
garak
9220c202b0 fix german build 2018-08-10 01:17:23 -04:00
vblm12
74d273002c Change OPPONENT to TRAINER in data-de. 2018-07-21 17:18:59 -05:00
Marcus Huderle
8bf4b1a917 Fix german 2018-06-20 19:45:19 -05:00
Marcus Huderle
2c7a4e1406 Use MUS_ prefix instead of BGM_ prefix for songs 2018-06-20 17:47:51 -05:00
Marcus Huderle
ab8373bbd5 Move map text into data/maps/<name> 2018-06-20 17:47:43 -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
Marcus Huderle
9680b95bdd Flesh out applymovement command names 2018-05-29 17:53:49 -05:00
Marcus Huderle
5df6fa5c08 Unify 'map object' and 'field object' terms into 'event object' 2018-05-29 17:53:42 -05:00
PikalaxALT
ca09158b73 Decompile remaining easy chat data 2018-04-25 15:11:44 -04:00
Marcus Huderle
84c89b8795 Fix German 2018-04-10 16:06:11 -07:00
Marcus Huderle
38e8741b5a Use FLDEFF_* constants in scripts 2018-04-10 14:51:55 -07:00
Marcus Huderle
d96e37aa67 Document/cleanup fldeff_cut.c 2018-04-10 13:59:55 -07:00
Marcus Huderle
9179520b38 Document/cleanup fldeff_secretpower.c 2018-04-10 13:11:19 -07:00
Marcus Huderle
66367c82ef Merge remote-tracking branch 'upstream/master' into btl_attrs 2018-04-05 18:41:42 -07:00
Blampharos
c9f885eaa6 Decompile move names 2018-01-26 14:54:23 +01:00
Blampharos
dcdaa65d95 Delete leftover assembly files for species names 2018-01-26 10:29:14 +01:00
Blampharos
0bf16dd66a Decompile trainer data
This necessitated changes in other files which access this data.

Three macro constants were migrated from trainer_constants.inc to
trainer.h

data/trainers.inc and data-de/trainers.inc have been deleted
2018-01-25 17:31:41 +01:00
Cameron Hall
ac53fde3fc move debug scripts to a separate file 2018-01-24 01:18:38 -06:00
Cameron Hall
c9629085f5 remove raw pointers from event_scripts.s 2018-01-22 19:40:50 -06:00
Cameron Hall
bcf3fb8745 add more debug data 2018-01-17 12:07:40 -06:00
Cameron Hall
6b5a7d8611 add debug event scripts 2018-01-16 18:50:41 -06:00
camthesaxman
b5667bd097 refactor build system 2018-01-10 23:20:32 -06:00
Marcus Huderle
c0e0004ffa Decompile through HandleEndTurn_BattleWon, and update trainer class constant names 2018-01-07 20:07:36 -08:00
Marcus Huderle
aed64560bc Add friendly macros for goto_if and call_if variants 2018-01-05 11:36:47 -08:00
Marcus Huderle
f0097860b0 Use MSGBOX_YESNO and YES/NO constants for yes/no message boxes 2018-01-04 18:54:20 -08:00
Marcus Huderle
88c42ade4b Use weather constants in scripts (and giveegg) 2018-01-04 14:52:51 -08:00
Marcus Huderle
5c427e8afe Use song constants in scripts 2018-01-04 14:37:52 -08:00
Marcus Huderle
7158286302 Label a bunch more specials 2018-01-01 17:06:17 -06:00
Marcus Huderle
56e2fe07d4 Label trendy phrase specials 2018-01-01 17:06:16 -06:00
Marcus Huderle
2da819cabb Label TV specials, and port over some TV changes from pokeemerald 2018-01-01 17:06:16 -06:00
Marcus Huderle
e3078400bb
Merge pull request #492 from PikalaxALT/decompile_data
Decompile data and abstract away some explicit memcpy calls
2017-12-24 14:23:52 -06:00
Marcus Huderle
2c4d972f7c 'VAR_SPECIAL_X' instead of 'SPECIALVAR_X' 2017-12-24 14:00:44 -06:00
Marcus Huderle
7581e5de93 Fix German build 2017-12-24 10:27:21 -06:00
Marcus Huderle
1c8b05e7b0 Name and use constants for special vars 2017-12-24 10:14:54 -06:00
Marcus Huderle
51247c3eb9 Name and use general purpose vars 2017-12-24 10:14:53 -06:00
Marcus Huderle
e696b89ff2 Name and use dynamic object gfx id vars 2017-12-24 10:14:52 -06:00
Marcus Huderle
4b5ad9de04 Name and use temp var constants 2017-12-24 10:13:52 -06:00
PikalaxALT
65e35eb219 Merge branch 'master' into decompile_data 2017-12-23 13:32:58 -05:00
camthesaxman
255f0d4ee4 clean up and label more of contest.c 2017-12-22 17:42:05 -06:00
camthesaxman
9c9bcee1e2 fix merge conflicts 2017-12-22 14:51:12 -06:00
camthesaxman
ce74d72c31 label and clean up some things in contest.c 2017-12-22 14:19:09 -06:00
Marcus Huderle
19895d2832 Fix German build 2017-12-21 11:52:07 -06:00
Marcus Huderle
754e911b4e Rename gScript* vars to gSpecialVar_* 2017-12-21 11:40:37 -06:00
Marcus Huderle
a753c44277 Use event script macro names from pokeemerald 2017-12-21 10:41:46 -06:00
scnorton
89c0d40ee6 Merge branch 'master' into decompile_data 2017-12-18 15:00:57 -05:00
scnorton
da6cbc139a Decompile data: mystery_event_msg 2017-12-18 11:45:42 -05:00
PikalaxALT
0df0c486d4 Decompile German menu cursor data 2017-12-18 08:23:06 -05:00
Marcus Huderle
88716f4c0e Use FLAG_ prefix for all flags 2017-12-17 20:07:53 -08:00
PikalaxALT
60cf72d595 Decompile German bard music data 2017-12-17 21:25:11 -05:00
Marcus Huderle
b14cdde8bd Label landmark and daily flags. 2017-12-15 14:59:25 -08:00
Marcus Huderle
0a634a60c9 Label item flags 2017-12-15 13:25:19 -08:00
Marcus Huderle
03c75cfd9c Finish all regular hide-show flags 2017-12-15 10:49:58 -08:00
Marcus Huderle
8d346b1bab A few more flags 2017-12-14 20:10:36 -08:00
Marcus Huderle
58bf5392b3 Label flags up to 973 2017-12-10 15:41:21 -08:00
Marcus Huderle
65207e0366 Label all flags up to 901 2017-12-09 14:43:21 -08:00
Marcus Huderle
8dd25bcad0 Start using constants for hide-show flags 2017-12-04 20:48:25 -08:00