Commit Graph

242 Commits

Author SHA1 Message Date
Remy Oukaour
66527d861f "Trainer*AfterBattleText" labels 2017-12-10 15:44:41 -05:00
Remy Oukaour
fba44a5929 Single files for tilesets/data.asm and maps/blockdata.asm 2017-12-10 13:53:02 -05:00
Remy Oukaour
699495bfcb Consistent capitalization for map names, matching their constants 2017-12-10 13:37:15 -05:00
Remy Oukaour
512863989f Document constants with comments, actual names, and more thorough usage 2017-12-09 02:15:46 -05:00
yenatch
cf7eec3bde
Merge pull request #404 from surskitty/master
De-Magic-Numbers the Rocket Grunts
2017-12-06 00:06:11 -05:00
surskitty
15015e4877 Making all Rocket Grunts call the constant. 2017-11-27 00:38:15 -05:00
surskitty
9c28b822cb Fighting Dojo npc labels. 2017-11-27 00:07:24 -05:00
mid-kid
09d9f2c1ef Add MobileError-related labels
This function is called from a few different places in the mobile code,
including from one special that is only executed when the
BattleTowerRoomMenu special returns with a non-zero code.

Since that special causes a blue "error" screen to appear, that looks
the exact same as the one you'd get when trying to connect from the
mobile trade corner/battle colosseum in a Pokémon Center's top floor,
and this function contains a bunch of japanese strings in a jumptable, I
think it's reasonable to assume it should be called
"DisplayMobileError".
2017-11-26 11:35:13 +01:00
mid-kid
89d6a24644 Script_ChoseChallenge -> Script_ChooseChallenge
This script is called for the player to *choose* (or pick) the challenge
they want to undertake.
2017-11-26 11:29:38 +01:00
mid-kid
afc92eadc1 Label BattleTowerRoomMenu
All of the functions called by it are prefixed with BattleTowerRoomMenu,
but a bunch of them seem more generic than that, since they're part of
different mobile menus. Also called another menu jumptable
BattleTowerRoomMenu2 for the lack of a better name (only the Yes/No menu
functions are used in western crystal).
The names of the more generic functions should be fixed when we start
labelling other menus.
2017-11-25 17:03:20 +01:00
Marcus Huderle
c28be02a19
Merge pull request #395 from surskitty/master
Some Script Labels
2017-11-21 17:18:29 -08:00
mid-kid
e5f9fddb86 PewterPokeCEnter2FBeta -> PewterPokeCenter2FBeta
Probably a typo.
2017-11-22 00:34:37 +01:00
mid-kid
671341a0fb Labelled some battle tower-related functions
The UbersCheck and LevelCheck are used only for the battle tower,
despite them living in the mobile files.
Also labelled some of the known BattleTowerActions.
2017-11-19 11:52:42 +01:00
surskitty
88a80619d2 Cianwood City labels 2017-10-26 20:25:36 -04:00
surskitty
3caa8d1cbc Another label. 2017-10-26 19:53:20 -04:00
surskitty
0852c9ad38 Pokefan Derek fully labelled. 2017-10-26 19:48:13 -04:00
surskitty
9f46f07e72 Full script labels for Fuchsia Gym. 2017-10-26 19:38:58 -04:00
surskitty
98c7050563 Cerulean Mart labels 2017-10-26 19:21:42 -04:00
surskitty
394c9f2c24 Partially labelling Pokefan Derek. 2017-10-26 02:26:47 -04:00
surskitty
63287e5648 Some Fuchsia Gym labels. 2017-10-26 02:14:05 -04:00
surskitty
2d185c697d Fuchsia City labels 2017-10-26 02:03:55 -04:00
surskitty
ba0424d79c Celadon Cafe labels. 2017-10-26 01:59:28 -04:00
surskitty
151174300f Labelling triggers pointlessly. 2017-10-26 01:51:13 -04:00
surskitty
14a121f85e Mahogany Gym labels. 2017-10-26 01:23:54 -04:00
surskitty
ed10d336cb Labels for TM people. 2017-10-26 00:52:21 -04:00
surskitty
c76e2c48e0 Labelling Jasmine. 2017-10-26 00:12:32 -04:00
surskitty
71821405ff Labelling some of Morty's scripts. 2017-10-26 00:03:06 -04:00
surskitty
f204a11274 Typo fix. 2017-10-21 00:25:49 -04:00
surskitty
20e88485a5 Renaming labels for E4. 2017-10-21 00:10:00 -04:00
hatschky
f0209d6ed6 Labels for Trainer Rankings stat tracking functions 2017-01-16 21:11:34 +00:00
IIMarckus
5a9701ddc8 Give a better label. 2017-01-11 00:25:12 -07:00
IIMarckus
143c3b367e Fix misleading label; the Growlithe check doesn't change in 1.1. 2017-01-11 00:24:05 -07:00
PikalaxALT
d84ebd2124 pitchoffset macro to replace forceoctave 2016-07-29 10:40:54 -04:00
pikalaxalt
1fa6aecbfc Unify directional movement macros 2016-05-14 13:46:14 -04:00
pikalaxalt
3108c9fa6a Unify step_sleep macro 2016-05-14 12:28:00 -04:00
pikalaxalt
82f1534925 Copycat labels; macro for the Crystal-only Unown chamber unlock words 2016-04-30 21:20:12 -04:00
pikalaxalt
73c7ea2b43 Local labels starting with underscores have colons depending on whether the first alphanumeric character is capitalized or not 2016-04-10 15:11:37 -04:00
pikalaxalt
6be4cd4da9 Local labels starting with lowercase letters are no longer decorated with a trailing colon 2016-04-10 15:01:49 -04:00
pikalaxalt
bf73772a56 Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style 2016-04-10 14:42:14 -04:00
pikalaxalt
46ead9b849 Alan's script pointers are now local references; movement_tree_shake for sudowoodo on route 36 2016-04-10 13:47:24 -04:00
pikalaxalt
552febffe8 Merge branch 'master' of https://github.com/pret/pokecrystal 2016-04-10 13:39:55 -04:00
IIMarckus
0a2b14309a More labels cleanup in map scripts. 2016-04-07 04:13:59 -06:00
IIMarckus
88328f18b6 Improve some map script labels. 2016-04-06 23:00:08 -06:00
IIMarckus
7fefefcf12 Remove duplicate blockdata. 2016-04-06 23:00:05 -06:00
pikalaxalt
93e12d2003 Split up banks 1-3 of main.asm 2016-03-27 12:47:28 -04:00
pikalaxalt
2650bcffad Merge branch 'master' of https://github.com/pret/pokecrystal 2016-03-25 11:32:21 -04:00
yenatch
63eb59c6ed Fix a typo in AzaleaGym. 2016-03-25 11:12:15 -04:00
dannye
e4aff99f4e Fix filename case inconsistency
when the filename uses different case than the include,
rgbds mistakenly thinks that file is intermediate
2016-03-24 11:38:49 -05:00
pikalaxalt
707020f9be Merge branch 'master' of https://github.com/pret/pokecrystal 2016-03-19 19:46:39 -04:00
yenatch
a2b891964f Use fish group constants in map headers. 2016-03-16 18:08:18 -04:00