Commit Graph

340 Commits

Author SHA1 Message Date
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
pikalaxalt
f2fa5349d5 More annotations of HP bar animations, including an oversight by GameFreak resulting in super-slow HP bars for Pokemon with over 48 HP 2016-03-08 19:54:06 -05:00
PikalaxALT
599e6e8d16 Battle animation annotations 2016-03-01 22:31:21 -05:00
PikalaxALT
b272c0c375 Fix marts using hard-coded bank number 2016-01-27 12:25:12 -05:00
PikalaxALT
6d1b7f28c8 Split base stats 2016-01-09 16:52:34 -05:00
PikalaxALT
69af99da5e Mr Pokemons House 2016-01-06 16:59:56 -05:00
PikalaxALT
ce019e6347 Map callback constants 2016-01-06 07:44:50 -05:00
PikalaxALT
80aba7fc13 maptrigger macro 2016-01-05 08:46:37 -05:00
PikalaxALT
2bd45ca574 Move effects; no more reloadmapmusic, returnafterbattle 2015-12-26 19:22:27 -05:00
PikalaxALT
f485a45cda More mobile-related labels; remove unneeded map object constants 2015-12-26 12:01:21 -05:00
PikalaxALT
7683b78fb4 Labels relating to odd egg 2015-12-25 23:34:33 -05:00
PikalaxALT
a5e928eb98 writebackup --> closewindow; game corner prize vendors; others 2015-12-24 22:58:42 -05:00
PikalaxALT
1df28a6beb Merge branch 'master' of github.com:pret/pokecrystal into scriptmacrorenaming 2015-12-24 14:30:32 -05:00
PikalaxALT
d08199c79d Color fns, some more address decoding in link/mobile 2015-12-22 18:03:00 -05:00
PikalaxALT
d644406f61 More menu stuff 2015-12-17 22:31:16 -05:00
PikalaxALT
fe4ef4e595 Elevator 2015-12-17 17:51:32 -05:00
PikalaxALT
7203e9d2cc Map script and color shenanigans 2015-12-16 21:57:42 -05:00
PikalaxALT
77ef8404a1 Menu 2015-12-15 18:59:49 -05:00
PikalaxALT
efe3462f9a Replaced SignpostItem with Hidden(ItemName) 2015-12-15 11:21:58 -05:00
PikalaxALT
bb2aba7da1 No more ItemFragment 2015-12-15 10:55:56 -05:00
PikalaxALT
3980d2d736 .TriggerX labels are now consistently 0-based 2015-12-10 22:28:46 -05:00
PikalaxALT
b9870541d4 slot machines 2015-12-10 22:26:31 -05:00
PikalaxALT
a5a8364c35 opentext and breeding 2015-12-09 18:25:44 -05:00
PikalaxALT
0c4bf512d0 itemfragment 2015-12-09 11:57:08 -05:00
PikalaxALT
7f68db68ad underground switches, town map 2015-12-09 11:39:35 -05:00
PikalaxALT
5b7fc7b0fa More battle tower shenanigans 2015-12-08 16:06:13 -05:00
PikalaxALT
02d05255fe A stab at audio engine. 2015-12-06 22:36:09 -05:00
PikalaxALT
92a8c491c3 Break up engine/sprites.asm; address yenatch's comments 2015-12-01 21:54:11 -05:00
PikalaxALT
0eb0c40ba7 buttonsound 2015-11-29 22:29:45 -05:00
PikalaxALT
8612a4a531 Renaming sections, further dissolving main.asm 2015-11-28 15:13:40 -05:00
PikalaxALT
43903f543b Farfetchd event 2015-11-27 13:06:43 -05:00
PikalaxALT
0d944f5915 Person event constants for each map 2015-11-27 00:22:14 -05:00
PikalaxALT
4bcd71e322 Fix some labels in engine/timeofdaypals.asm 2015-11-26 21:06:32 -05:00
PikalaxALT
c7985e1f3c Battle Tower scripts and text labels 2015-11-26 21:05:32 -05:00
PikalaxALT
01792e00d2 Rename several script commands 2015-11-25 10:16:29 -05:00
PikalaxALT
f599e477fc Partial interpretation of battle tower trainer data 2015-11-24 15:18:44 -05:00
PikalaxALT
f3c8f75209 bug contest judgint labels 2015-11-23 21:19:53 -05:00
PikalaxALT
d972564175 link and seer labels 2015-11-23 16:04:53 -05:00
PikalaxALT
23c70110d0 Replace 6 2015-11-20 15:18:35 -05:00
PikalaxALT
7b3090e22a Annotate battle tower text bug 2015-11-20 15:15:32 -05:00
PikalaxALT
812976cee6 bgcoord 2015-11-20 11:47:52 -05:00
PikalaxALT
8a6a1a7d77 CmdQueues 2015-11-18 23:16:25 -05:00
PikalaxALT
6d47be8d8c Fruit tree constants, more mail engine 2015-11-18 10:42:42 -05:00
PikalaxALT
4bfe086ef6 Phone scripts and specials 2015-11-17 12:29:37 -05:00
PikalaxALT
0b8fe4bac3 More specials; bank 12 mobile 2015-11-16 22:29:54 -05:00
PikalaxALT
435b0cf686 Options menu, some mobile fns 2015-11-16 16:46:32 -05:00
PikalaxALT
36470537e0 Globally introduce PERSONTYPE constants 2015-11-15 15:07:20 -05:00
PikalaxALT
ead04b3b75 Backup prior to global introduction of PERSONTYPE constants 2015-11-15 14:59:38 -05:00
PikalaxALT
e0b4fc781a sprite engine; tileset constants 2015-11-13 00:49:27 -05:00
PikalaxALT
40802da3cf Map header labels, tileset constants 2015-11-12 11:10:19 -05:00
PikalaxALT
2ffcb4b490 More splits; map setup labels 2015-11-11 23:38:57 -05:00
PikalaxALT
91068077f0 Further split bank 4 2015-11-11 16:15:06 -05:00
PikalaxALT
f1b2466cc3 Cleaning up static HRAM labels; movement stuff, route 38 trainers 2015-11-09 23:01:45 -05:00
PikalaxALT
ae2970d73b Sprite movement function labels 2015-11-06 16:42:38 -05:00
PikalaxALT
1205fe5100 PLAYEREVENT_ 2015-11-05 15:08:00 -05:00
PikalaxALT
adf2fe712d Various labels 2015-11-05 14:06:03 -05:00
PikalaxALT
3cadc7b012 give/takeitem *, 1: the 1 is optional 2015-11-04 20:20:14 -05:00
PikalaxALT
7fd20e6322 home/copy.asm completely labeled 2015-11-04 16:14:27 -05:00
PikalaxALT
739bb3c136 Replace party struct relative values with EQUS constants 2015-11-04 11:31:00 -05:00
PikalaxALT
91ea4a2f9b Battle Tower trainer text 2015-11-03 22:35:36 -05:00
PikalaxALT
c5527a02ae dbw BANK, addr replaced with dba 2015-11-03 19:43:47 -05:00
PikalaxALT
10beeb3c06 Battle Tower 2015-11-03 15:22:04 -05:00
PikalaxALT
2faa4a0f70 Fix errors in global substitution 2015-11-03 07:11:32 -05:00
PikalaxALT
0f37a42ad4 Mart constants 2015-11-02 17:38:08 -05:00
PikalaxALT
72af3337fd No more NONE 2015-11-02 14:37:02 -05:00
PikalaxALT
fda1f7c01a SPRITEMOVEDATA 2015-10-31 21:05:02 -04:00
PikalaxALT
8153737bae Enumerate text constants 2015-10-30 10:34:35 -04:00
PikalaxALT
ed29db5841 No more -bash000; engine/movement.asm, SPRITEMOVEFN 2015-10-29 23:32:11 -04:00
PikalaxALT
119d6b4119 About time I got to these functions 2015-10-24 10:39:52 -04:00
PikalaxALT
97cc513f54 Plus 4 on person events; feeble attempt to annotate color functions 2015-10-21 10:43:42 -04:00
PikalaxALT
4fa6c6daa4 Split up bank 2; other relabelings 2015-10-16 13:35:43 -04:00
PikalaxALT
0c39f6e273 Happiness and Mystery Gift constants 2015-10-12 12:33:24 -04:00
PikalaxALT
d42330ed8b Annotation of PrintNum arguments in bc, and radio functions 2015-10-10 18:00:12 -04:00
PikalaxALT
2770cfc354 soft reset 2015-10-04 14:14:51 -04:00
PikalaxALT
726c4bc1d6 Moved time-related functions in bank 4 to engine/time.asm 2015-10-02 22:49:26 -04:00
PikalaxALT
c50b49bd62 Renamed some unused specials 2015-10-01 16:55:24 -04:00
JimB16
d6a4dada40 added/renamed constants and labels 2015-09-01 06:26:31 +02:00
JimB16
bcc11712a5 added 'wBT_OTTempCopy'-label and the data structure that comes after 2015-08-31 14:31:13 +02:00
JimB16
706f289c70 change more labelss 2015-08-25 01:56:30 +02:00
JimB16
4cd118b149 changed BattleTower-Labels 2015-08-24 19:35:05 +02:00
JimB16
157e5fd4b8 changed labels 2015-08-24 17:04:13 +02:00
JimB16
3922ad2c3c changed labels and added comments 2015-08-23 15:09:56 +02:00
yenatch
3cd79c55a3 Merge pull request #309 from PikalaxALT/master
Wild data, save functions, fix missing include
2015-08-17 11:58:57 -04:00
yenatch
9974a2c701 Merge pull request #303 from yenatch/map-objects
Add constants for common map object ids.
2015-08-17 00:14:40 -04:00
PikalaxALT
aa27080e29 Split fourth-to-last byte of person_event into nybble arguments 2015-07-31 15:16:53 -04:00
PikalaxALT
895e14cd05 Reworked person_event arguments 2015-07-29 18:22:23 -04:00
IIMarckus
c3c7c7e658 Fix typo: Recptionist → Receptionist 2015-07-28 23:29:44 -06:00
PikalaxALT
594253eb30 Merge yenatch:map-objects 2015-07-25 20:18:59 -04:00
PikalaxALT
6c3000efd2 Macro update, roam mon annotations
Updated map and mapgroup macros to get around an rgbds bug.

Legendary beast locale handling annotated and relabeled.

Added a new constant NUM_ENGINE_FLAGS for use in the EngineFlagAction function.  This will make it easier for modders to add or remove engine flags.
2015-07-25 19:02:36 -04:00
PikalaxALT
432df825d4 Replaced GROUP_, MAP_ references with the map macro
Updated macros that rely on the GROUP_, MAP_ constants to use the map macro

Added GROUP_NONE and MAP_NONE for the sake of compatibility with this new scheme

Added new macro elevfloor to simplify the definition of elevators under this new scheme
2015-07-23 12:59:19 -04:00
PikalaxALT
c8960dd2c8 Various annotations
Annotated the SGB functions in predef/sgb.asm, and some of the map scripts.  Renamed several functions in home.  Renamed six WRAM addresses corresponding to party icon animations, and renamed several others relative to these.
2015-07-22 15:57:02 -04:00
yenatch
ec10d9dd6f Add constants for common map object ids. 2015-07-21 23:49:18 -07:00
PikalaxALT
5631bdc0d7 Added labels to different parts of the map script and event headers 2015-07-21 00:02:21 -04:00
PikalaxALT
471492b775 Reverted ld_hl_pointer macro 2015-07-20 22:18:18 -04:00
PikalaxALT
06673cbee7 Named more specials, fixed a missing EOL 2015-07-20 18:59:26 -04:00
PikalaxALT
bef792f2d2 More label updates, moved predefs to new file
Also named most of the engine and event flag constants.
2015-07-20 03:51:52 -04:00
PikalaxALT
94129b6b45 Finished the decoration attributes table
Interpretation of the Decoration Attributes table is complete.

Other changes include some more event flag and function naming, as well as a minor tweak to the person_events of every map.
2015-07-19 04:58:31 -04:00
PikalaxALT
60cd04b023 Trainer data structure and field move functions
Trainer data in map scripts is now a macro-defined structure.

Field move functions in main.asm are now nearly completely annotated, with local references.

Trailing white space deleted.
2015-07-18 23:45:39 -04:00
PikalaxALT
e674869018 Updated signpost items and person_event flags 2015-07-18 16:00:53 -04:00
PikalaxALT
0fcef5fc08 More annotations and interpretations of functions and scripts 2015-07-17 17:17:10 -04:00
PikalaxALT
894955f9d9 Special script annotation, trainer constant enumeration, person-event structure update 2015-07-16 18:10:10 -04:00
PikalaxALT
39524cdb76 More enumeration of constants, more annotations of scripts. 2015-07-15 15:48:44 -04:00
PikalaxALT
8fa8e29170 - Update variable sprites to use constants rather than fixed values 2015-07-13 02:29:10 -04:00