Commit Graph

597 Commits

Author SHA1 Message Date
Remy Oukaour
f1f84743f7 Keep table labels in the same files as their contents. 2017-12-11 22:44:25 -05:00
Remy Oukaour
dc4357b7fa "Pic Pointers" and "Unown Pic Pointers" must start at the same address
Use `|` not `+` to combine bitmasks
2017-12-11 18:39:39 -05:00
Remy Oukaour
2d644f5077 Name some gfx/unknown/ files 2017-12-11 18:04:23 -05:00
Remy Oukaour
e6f6a75330 Move the rest of gfx/misc/ into specific directories 2017-12-11 17:51:04 -05:00
Remy Oukaour
4afc2f01ef Add member constants for the base data struct, same as most other structs 2017-12-11 17:35:35 -05:00
Remy Oukaour
5be98bae3c Move more data tables into data/ files. 2017-12-11 15:20:32 -05:00
Remy Oukaour
31cce83e9b Move lots of data tables into individual data/ files
(This is not expected to be their final location, but it makes them easier to relocate when necessary, and easier for users to edit until the whole project's file structure is finalized.)
2017-12-11 14:23:18 -05:00
Remy Oukaour
c2ad79c4f2 Add constants for time-of-day boundaries
Split off more misc constants into proper files
2017-12-11 12:20:01 -05:00
Remy Oukaour
41acb0667a Document macros/map.asm
Rename MORN/DAY/NITE to MORN_F/DAY_F/NITE_F; use MORN/DAY/NITE for shifted values (cleaner for person_events)
Prefix FLOOR to the `elevfloor` constants
2017-12-11 01:02:28 -05:00
Remy Oukaour
c6fefd0fe8 Rename overworld sprite files, consistent with their constants 2017-12-11 00:17:39 -05:00
Remy Oukaour
a551e345df PokeCenter → Pokecenter (consistent with the POKECENTER map constants) 2017-12-10 22:34:42 -05:00
Remy Oukaour
b4261d27d8 Use new palette constants 2017-12-10 20:50:08 -05:00
Remy Oukaour
699495bfcb Consistent capitalization for map names, matching their constants 2017-12-10 13:37:15 -05:00
Remy Oukaour
d554b997c5 Use correct WRAM labels for intro/title scenes
Remove outdated WRAM alias comments
2017-12-10 00:18:29 -05:00
Remy Oukaour
ab7025a144 Consistent code formatting: no redundant as and spaces after commas 2017-12-10 00:06:20 -05:00
Remy Oukaour
32ea595c47 Move some gfx/unknown/ files into meaningful directories 2017-12-09 23:37:08 -05:00
Remy Oukaour
31901f73b0 Move some gfx/misc/ files into meaningful directories 2017-12-09 22:57:41 -05:00
Remy Oukaour
59ee673775 Consistent pointer labels in WRAM 2017-12-09 22:24:43 -05:00
Remy Oukaour
cd2a748128 More WRAM cleanup 2017-12-09 22:00:36 -05:00
Remy Oukaour
880fb511e1 More WRAM organization 2017-12-09 15:28:03 -05:00
Remy Oukaour
e3c686f6df Further WRAM organization 2017-12-09 15:14:51 -05:00
Remy Oukaour
5a5df2ab87 More WRAM organization 2017-12-09 14:47:32 -05:00
Remy Oukaour
16c6696dd5 Start organizing WRAM
- Use db and dw when they're more meaningful than ds 1/2
- Use unions to group related labels
2017-12-09 13:58:49 -05:00
Remy Oukaour
6a41d4f63e Define more charmap characters and use them in place of hard-coded numbers 2017-12-09 12:57:23 -05:00
Remy Oukaour
512863989f Document constants with comments, actual names, and more thorough usage 2017-12-09 02:15:46 -05:00
mid-kid
a1fc73603e Label all of PARTYMENUACTION_*
It's pretty clear what it's used for.
PartyMenuActionText is used for two things:
1) Storing what kind of action we're going to do (<$10)
2) Storing the text for some kind of healing stuff I'm not entirely sure (>=$f0)

In the former case, if GetPartyMenuTilemapPointers is ran, it will be
used to pick a sequence of actions that should be done, specified in the
table, and it'll print the corresponding string using the
PartyMenuStrings table. The items in the sequence of actions that should
be done are in WritePartyMenuTilemap.

Strangely enough, one possible value is left completely unused:
PARTYMENUACTION_GIVE_MON_FEMALE. It works in the exact same way as it's
male counterpart, and as such I don't believe it was used in the
japanese version either, since it doesn't matter which gender your 'mon
is when you put 'em in the daycare.
2017-11-30 20:35:58 +01:00
mid-kid
2cc2f057e8 Fix some SPRITE_ANIM_FRAMESET_ constants
Thanks to @roukaour for the fixes.
2017-11-29 20:24:19 +01: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
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
e21551db62 CeruleanCaveNane -> CeruleanCaveName 2017-11-16 18:19:33 +01:00
pfero
999c804f6f Label some functions in gfx/load_pics.asm
A few projects I looked around in used these same labels for these
functions, and it looks like they describe these functions properly.
Also fixed usage of BANK() in a few places.
2017-11-03 01:12:16 +01:00
pfero
88f1b8165b Define GetWarpSFX
This function checks the current tile at the player's feet, and returns
an appropriate SFX that should be played when warping from it.
2017-10-29 11:14:59 +01:00
pfero
7c9a156133 Fix WATERTILE/WALLTILE constants
WATRTILE was wrongly defined as 15, and WALLTILE as 1. Those had to be
flipped around.
This has allowed for us to replace inmediate values with these constants
in several places to improve readability.

WATRTILE was renamed to WATERTILE in the name of readability.
2017-10-28 18:08:24 -04:00
surskitty
6cdc14b920 Labelling a few mom scripts. 2017-10-25 00:34:32 -04:00
yenatch
17448c51a5 Merge pull request #389 from yenatch/rgbds-3
rgbds 0.3.3
2017-09-24 01:23:34 -04:00
PikalaxALT
0e470bc785 Fix section linking
Create linker script and float all sections
2017-09-23 23:04:10 -04:00
i0brendan0
0e33fd74f1 Fix unused Constant for Happiness
The HAPPINESS_TO_EVOLVE constant is what's supposed to be used to give the number for when a Pokemon should evolve by happiness. The constant was not put in place so it is never used, instead the original 220 was put.
2017-08-24 17:29:56 -05:00
yenatch
080704e49f Merge pull request #370 from yenatch/graphics
png everywhere
2017-06-24 17:36:21 -04:00
yenatch
a20664d415 Fix gfx/misc 2017-06-24 16:30:12 -04:00
yenatch
803c5154f4 pngs in gfx/unknown 2017-06-24 16:27:52 -04:00
yenatch
647f9b4452 pngs in gfx/title 2017-06-21 23:45:01 -04:00
yenatch
5738567985 pngs in gfx/splash 2017-06-21 00:13:09 -04:00
yenatch
99f6249de8 pngs in gfx/pokegear
- flymap_label_border.2bpp was actually 1bpp
2017-06-21 00:11:29 -04:00
Ben10do
e6ea1889fb
Replace ‘jp [hl]’ with ‘jp hl’
The former is arguably misleading (as you don’t access the memory location in hl to retrieve the jump location), and is consequently deprecated in newer versions of rgbds.

This fix silences these deprecation warnings.
2017-06-09 22:01:10 +01:00
yenatch
74005945b7 Fix no newline at eof in engine/time.asm 2017-05-28 15:54:03 -04:00
Ben10do
288902139f Revert "Fix floating sections"
This reverts commit e28b88f56d.
2017-03-24 11:51:03 +00:00
AntonioND
e28b88f56d Fix floating sections
This is needed so that rgblink doesn't move them around after modifying
it's placement algorithm.

Signed-off-by: AntonioND <antonio_nd@outlook.com>
2017-03-15 00:52:26 +00:00
IIMarckus
a722f936a9 Strip address comments. 2017-02-22 21:49:44 -07:00
hatschky
f0209d6ed6 Labels for Trainer Rankings stat tracking functions 2017-01-16 21:11:34 +00:00
YamaArashi
65c38930a3 Merge branch 'master' of https://github.com/PikalaxALT/pokecrystal into PikalaxALT-master 2016-12-30 17:21:02 -08:00
Fredrik Ljungdahl
b439a7259f Fix an incorrect comment regarding breeding
If Defense DV match and lower 3 DVs match father+mother, breeding
chance isn't maximized, but prevented. Possibly done to combat
in-breeding
2016-10-29 01:52:13 +02:00
PikalaxALT
8f2d68a9e6 Person action and facing labels, part 2 2016-09-27 10:10:13 -04:00
PikalaxALT
ef98c44edd Person action and facing labels, part 1 2016-09-27 09:37:10 -04:00
PikalaxALT
d84ebd2124 pitchoffset macro to replace forceoctave 2016-07-29 10:40:54 -04:00
Scott Norton
a32b6ccbb5 These are actually .1bpp files 2016-06-25 20:19:52 -04:00
pikalaxalt
4e2487c056 hLCDCPointer and InitList 2016-06-13 22:53:33 -04:00
pikalaxalt
ca01a92880 Fix indentation in many places 2016-06-07 08:13:08 -04:00
pikalaxalt
b0e7d04ccf Some mystery gift functions 2016-06-07 08:08:51 -04:00
pikalaxalt
d7a01e92e9 Remaining layout constants 2016-06-06 18:23:00 -04:00
pikalaxalt
98f443f70c engine/events.asm labels finished
fixed palred/green/blue macros
2016-05-17 08:40:56 -04:00
pikalaxalt
2eeb78d1bc Evolution addresses 2016-05-16 15:46:13 -04:00
pikalaxalt
12396874cf HP bar animation addresses and AI switch 2016-05-16 09:36:24 -04:00
pikalaxalt
87b733994b SPRITE_ANIM_FRAME_IDX constants 2016-05-15 22:00:17 -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
1a84ca4e55 EZChat cursor object 2016-05-14 01:11:01 -04:00
pikalaxalt
c72912337e Refine labels in engine/trade/animation.asm 2016-05-13 23:23:26 -04:00
pikalaxalt
5ea3a953c3 Name all link trade animation related functions 2016-05-13 22:46:32 -04:00
pikalaxalt
1be6923c06 Inexplicably empty function with malformed predef pointer, but what are you gonna do about it? 2016-05-11 21:24:14 -04:00
pikalaxalt
6a3b3e3773 Save functions; feeble attempt at serial and link functions 2016-05-11 21:19:52 -04:00
pikalaxalt
af0119ca7e Name all printer functions 2016-05-11 17:16:03 -04:00
pikalaxalt
295604cbb5 Placeholder non-generic names for engine/color functions 2016-05-11 09:49:03 -04:00
pikalaxalt
46ecd5b869 Name all functions in event/ 2016-05-10 12:59:34 -04:00
pikalaxalt
ae36ef2c7f Labeled every function in ROM0 that's referenced in the source 2016-05-10 12:31:49 -04:00
pikalaxalt
e95d42e0af All functions in main.asm have non-generic names 2016-05-08 14:11:24 -04:00
pikalaxalt
8c26547645 Mobile and more battle anims 2016-05-05 15:07:37 -04:00
pikalaxalt
a613ed915c HDMA transfer functions 2016-05-04 22:34:09 -04:00
pikalaxalt
3713b71d9e More splitting of main.asm; remove unneeded rept 2 2016-05-04 11:46:23 -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
a8fe0c13d4 Make town map pals more intuitive in source 2016-04-02 09:28:46 -04:00
pikalaxalt
93e12d2003 Split up banks 1-3 of main.asm 2016-03-27 12:47:28 -04:00
pikalaxalt
707020f9be Merge branch 'master' of https://github.com/pret/pokecrystal 2016-03-19 19:46:39 -04:00
yenatch
d2a3e4a6a4 Split fish code out of data/. 2016-03-16 18:11:26 -04:00
yenatch
5b27af071c Add fish group constants. 2016-03-16 18:05:28 -04:00
pikalaxalt
5b9ba5d921 Fix comment on HP bar bug 2016-03-08 20:02:30 -05: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
f31da089bb Merge branch 'master' of https://github.com/pret/pokecrystal 2016-03-01 22:31:28 -05:00
PikalaxALT
599e6e8d16 Battle animation annotations 2016-03-01 22:31:21 -05:00
yenatch
08ac6dfd80 *_crystal.asm files are no longer needed to build crystal *.o. 2016-01-29 16:24:38 -05:00
PikalaxALT
5322b56a83 Add more missing files 2016-01-29 00:57:06 -05:00
PikalaxALT
b272c0c375 Fix marts using hard-coded bank number 2016-01-27 12:25:12 -05:00
PikalaxALT
be8d1c80f4 Merge branch 'master' of https://github.com/pret/pokecrystal 2016-01-19 23:28:37 -05:00
YamaArashi
49a7eeb76d Update pokedex.asm 2016-01-19 16:51:05 -08:00
PikalaxALT
8a45169a9d Merge branch 'master' of https://github.com/pret/pokecrystal 2016-01-18 00:56:33 -05:00
PikalaxALT
8bf255b9f8 Prepare to merge 2016-01-18 00:39:01 -05:00
PikalaxALT
2ed6c357af More WRAM tidying 2016-01-12 12:46:18 -05:00
PikalaxALT
35f687b536 Fully label home/map_objects.asm 2016-01-11 02:36:39 -05:00
PikalaxALT
1637d915d4 Restored StandingTile and introduced LastTile 2016-01-11 02:28:09 -05:00
PikalaxALT
3dcbe0ff55 Pokegear 2016-01-10 17:44:09 -05:00
YamaArashi
20e7bc3b09 pokedex jumptable constants 2016-01-09 23:05:34 -08:00
PikalaxALT
8360a1a2e8 Pokegear functions and RAM labels 2016-01-09 23:41:03 -05:00
YamaArashi
0dd5f7ab7a pokedex palette numbers 2016-01-09 19:56:37 -08:00
YamaArashi
b609a1690d pokedex unown mode 2016-01-09 19:46:41 -08:00
YamaArashi
418c84dc0c pokedex 2 2016-01-09 19:03:38 -08:00
YamaArashi
e033ea3a37 commented pokedex more 2016-01-09 17:51:14 -08:00
PikalaxALT
f7ee74c3b8 Finish labels in engine/namingscreen.asm 2016-01-09 19:34:14 -05:00
PikalaxALT
6d1b7f28c8 Split base stats 2016-01-09 16:52:34 -05:00
PikalaxALT
f14562da4b Merge branch 'master' of https://github.com/pret/pokecrystal 2016-01-07 18:45:34 -05:00
IIMarckus
f81fb0ba13 Improve text labels, trim address comments. 2016-01-07 15:41:51 -07:00
PikalaxALT
69af99da5e Mr Pokemons House 2016-01-06 16:59:56 -05:00
IIMarckus
e699992e6b Text labels for Places and People. 2016-01-06 11:01:20 -07: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
c087d44c42 more gfx-related labels 2016-01-04 08:43:55 -05:00
PikalaxALT
2a263629a4 Item effects, post-battle, and decoration flags 2015-12-29 16:44:37 -05:00
PikalaxALT
9bbb65166e More movement stuff 2015-12-29 13:15:58 -05:00
PikalaxALT
a2a2668233 Dummy Game 2015-12-28 17:09:53 -05:00
PikalaxALT
57d4cb0edf trainer card 2015-12-28 10:57:04 -05:00
PikalaxALT
f030315b1f jumptable macro repurposed 2015-12-26 21:59:03 -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
2a2222476a Split up anim objects into several files 2015-12-24 14:07:33 -05:00
PikalaxALT
41618f9e98 More battle anim object constants 2015-12-24 13:33:54 -05:00
PikalaxALT
8152ab612c Battle anims 2015-12-23 17:10:50 -05:00
PikalaxALT
3893feb835 Battle Anim Object struct constants 2015-12-23 14:00:29 -05:00
PikalaxALT
ddc05ec8dd Finish stats screen function labels 2015-12-23 09:12:29 -05:00
PikalaxALT
30b37da387 More stats screen shenanigans 2015-12-22 22:19:33 -05:00
PikalaxALT
d08199c79d Color fns, some more address decoding in link/mobile 2015-12-22 18:03:00 -05:00
PikalaxALT
630d789c70 More link trade shenanigans 2015-12-21 14:10:16 -05:00
PikalaxALT
047effba94 Menu joy flags; started with link address space 2015-12-20 12:54:08 -05:00
PikalaxALT
987ed1fafb More work on slots; WRAM cleanup, Move Deleter 2015-12-19 14:48:30 -05:00
PikalaxALT
3d36f1a837 Events and some WRAM cleanup 2015-12-18 20:07:09 -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
42dd25b3e5 Merge branch 'master' of https://github.com/pret/pokecrystal into scriptmacrorenaming 2015-12-17 15:17:41 -05:00
PikalaxALT
caa83c08a7 Movement etc. 2015-12-17 15:14:51 -05:00
IIMarckus
67d38da5b0 text/common.asm is only for std scripts. 2015-12-17 13:03:36 -07:00
PikalaxALT
efee40447e Mobile trade animations, pokepic animations 2015-12-17 13:49:26 -05:00
PikalaxALT
7203e9d2cc Map script and color shenanigans 2015-12-16 21:57:42 -05:00
PikalaxALT
879b430fce Bill's PC 2015-12-16 12:36:58 -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