pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity
5,318 Commits 1 Branch 0 Tags 52 MiB
5f0cdcaa85
Commit Graph

1584 Commits

Author SHA1 Message Date
Remy Oukaour
fa98c29fa4 Add more palettes to data/palettes/ 2017-12-15 22:36:33 -05:00
Remy Oukaour
e44640b008 Move more main.asm code into individual files 2017-12-15 21:22:26 -05:00
Remy Oukaour
1038ebca5e Move more contiguous related code blocks from main.asm to engine/ and events/ 2017-12-15 20:10:54 -05:00
surskitty
cb5aa29228 Labelling the remaining stuff one sed at a time. 2017-12-15 18:16:27 -05:00
Remy Oukaour
2cf5cc1dc7 Move more unknown graphics into real subfolders 2017-12-15 17:50:45 -05:00
Remy Oukaour
59fe407812 Copy pokered's organization some more, with further constant and data files 2017-12-15 17:22:52 -05:00
Remy Oukaour
ebf3bfb6b2 Move some misc/ files into meaningful directories 2017-12-15 12:53:33 -05:00
Remy Oukaour
94722aa8f0 Move predef/ files into engine/ 
Get rid of single-file engine/ subdirectories
Move tilesets/ palettes unrelated to individual tilesets into data/palettes/ (more from engine/colors.asm can be moved here too)
 2017-12-15 12:31:18 -05:00
Remy Oukaour
6ab1d028bb Split items/ and trainers/ into their data/ and engine/ components 
Move some data into a pokemon/ subdirectory
 2017-12-14 23:00:54 -05:00
surskitty
75c56e86c4 The labelling never ends, but phone_scripts.asm does. 2017-12-14 21:19:46 -05:00
surskitty
955a0c9dd3 Another batch. 2017-12-14 15:39:46 -05:00
surskitty
f905a2353e One day we'll be through with this. Labels. 2017-12-14 15:25:46 -05:00
surskitty
62dd7a8bae phone_scripts is most of the way there, too. 2017-12-14 14:48:39 -05:00
surskitty
e1413e022d phone_callers.asm is now fully readable, if not fully labelled. 2017-12-14 14:13:10 -05:00
Remy Oukaour
e48a401290 Reorganize macros 2017-12-14 00:36:24 -05:00
surskitty
1116180e3c Renaming RandomPhoneRareWildMon to RandomRareWildMon. 2017-12-13 23:39:47 -05:00
surskitty
8e54adc22f Labels, including a comment explaining RandomPhoneRareWildMon. 2017-12-13 23:35:07 -05:00
surskitty
1f0fbfb602 Label label label. 2017-12-13 22:54:29 -05:00
surskitty
d69d81f3a0 Fix the spelling of Thursday 2017-12-13 22:41:15 -05:00
surskitty
a5c0461192 Labels labels labels 2017-12-13 22:40:11 -05:00
surskitty
771c4a7e05 Splitting phone scripts up. 2017-12-13 22:30:37 -05:00
surskitty
8fa7183d29 More phone script labelling. 2017-12-13 21:50:32 -05:00
surskitty
2b72d949b2 Another batch of labels. Jack's move trivia, mostly. 2017-12-13 21:12:42 -05:00
surskitty
cb1c6967ed Some more phone labels. 2017-12-13 20:49:10 -05:00
surskitty
4b36a9d2e1 Merge branch 'master' of github.com:pret/pokecrystal 2017-12-13 19:55:03 -05:00
surskitty
e3ee39f334 Labelling the bragging phone calls. 2017-12-13 19:54:28 -05:00
Remy Oukaour
76ea57688e Add table of contents (might remove if it's too cumbersome to maintain) 2017-12-13 00:28:48 -05:00
yenatch
725750d69d use an xor instead of the result 2017-12-12 23:45:32 -05:00
Remy Oukaour
10eb426e40 Document more bugs 2017-12-12 22:58:20 -05:00
Remy Oukaour
ad620243d9 Fix make compare 2017-12-12 20:21:08 -05:00
Remy Oukaour
78d489733c Merge branch 'master' of https://github.com/pret/pokecrystal 2017-12-12 20:15:15 -05:00
Remy Oukaour
93c32e3580 Document bugs and glitches 2017-12-12 20:15:07 -05:00
Remy Oukaour
b006415371 Define constants for collision types 2017-12-12 16:15:58 -05:00
Remy Oukaour
5b13a7a13b Identify more sprite-related constants 
Start more documentation
 2017-12-12 13:22:19 -05:00
Remy Oukaour
c5675927fe Identify more sprite-related constants 2017-12-12 12:18:11 -05:00
Remy Oukaour
48e40a7f09 Identify some SPRITE_ANIM_FRAME_IDX_* constants 2017-12-12 02:31:14 -05:00
Remy Oukaour
213dcc70d7 More consistent data tables 2017-12-11 22:59:30 -05:00
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
PikalaxALT
6e257bc7cd mystery gift, credits 2015-12-14 20:06:41 -05:00
PikalaxALT
c635e30777 map setup and warps 2015-12-14 11:12:18 -05:00
PikalaxALT
8a439dbd05 Miscellaneous labels 2015-12-13 20:33:56 -05:00
PikalaxALT
259c155187 Pack; buy, sell, toss 2015-12-13 17:11:58 -05:00
PikalaxALT
acd92eee94 Pack 2015-12-13 14:15:16 -05:00
PikalaxALT
ecd277204a Card Flip 2015-12-11 16:59:40 -05:00
PikalaxALT
b65fe57db6 Simplify EnlargedTiles 2015-12-11 11:53:01 -05:00
PikalaxALT
15a03a2577 Unown Puzzles 2015-12-11 11:33:14 -05:00
PikalaxALT
f198dfd862 card flip (checkpoint commit) 2015-12-11 08:17:38 -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
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
6eac26732a Celebi Event 2015-12-05 15:38:25 -05:00
PikalaxALT
81ea723b04 Getting started with battle anims; sine and cosine 2015-12-04 14:33:29 -05:00
PikalaxALT
5b94d54a6c More work on animations 2015-12-04 08:46:11 -05:00
PikalaxALT
2f14f3a669 No more autogen functions in engine/crystal_intro.asm 2015-12-02 20:37:00 -05:00
PikalaxALT
2cdca75441 Crystal Intro 2015-12-02 17:59:05 -05:00
PikalaxALT
be082943ed More work interpreting the sprite engine 2015-12-02 13:24:18 -05:00
PikalaxALT
92a8c491c3 Break up engine/sprites.asm; address yenatch's comments 2015-12-01 21:54:11 -05:00
PikalaxALT
ffbf2c0f5d More animations including cutting grass 2015-12-01 15:35:28 -05:00
PikalaxALT
6b33a8d155 More breakup of main.asm 2015-11-30 11:04:14 -05:00
PikalaxALT
0eb0c40ba7 buttonsound 2015-11-29 22:29:45 -05:00
PikalaxALT
d314bdb4fa Pokedex labels 2015-11-29 21:34:59 -05:00
PikalaxALT
8612a4a531 Renaming sections, further dissolving main.asm 2015-11-28 15:13:40 -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
0c6f94effd Final relabeling before merge 2015-11-25 10:26:30 -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
6c248953b7 Mobile functions for fixed-phrase selection 2015-11-24 10:35:13 -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
0dc5ae04b8 more trade animation labels 2015-11-23 02:08:08 -05:00
PikalaxALT
58020fb5f6 trade animation 2015-11-23 00:21:21 -05:00
PikalaxALT
24b7b2c1cf Foreign language font handling in mail 2015-11-22 12:01:58 -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
b023056259 engine/stats_screen.asm 2015-11-19 23:38:16 -05:00
PikalaxALT
93a129eb6d main.asm is now under 30k lines 2015-11-19 18:09:11 -05:00
PikalaxALT
8a6a1a7d77 CmdQueues 2015-11-18 23:16:25 -05:00
PikalaxALT
91f7491017 items/item_effects.asm; engine/evolution.asm 2015-11-18 18:35:44 -05:00
PikalaxALT
1ff37608b6 Update mail struct labels 2015-11-18 13:29:30 -05:00
PikalaxALT
3f4044cd46 engine/compose_mail.asm; ldpixel 2015-11-18 13:01:55 -05:00
PikalaxALT
6d47be8d8c Fruit tree constants, more mail engine 2015-11-18 10:42:42 -05:00
PikalaxALT
bc1870e3f4 Save, Bill's PC 2015-11-17 23:29:14 -05:00
PikalaxALT
27ef600ace Here's the mail it never fails 2015-11-17 17:56:49 -05:00
PikalaxALT
e88c88ff20 engine/decorations.asm 2015-11-17 16:12:27 -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
042fc4bfe5 Split up some more banks in main.asm 2015-11-16 21:46:36 -05:00
PikalaxALT
ba871547ed engine/pokegear.asm 2015-11-16 21:07:26 -05:00
PikalaxALT
435b0cf686 Options menu, some mobile fns 2015-11-16 16:46:32 -05:00
PikalaxALT
4b5424368f Little cleanup on engine/scripting.asm 2015-11-16 12:49:42 -05:00
PikalaxALT
fb88b2ccf8 Movement constants, script stack 2015-11-16 11:53:26 -05:00
PikalaxALT
8290f851fd Further decoding of SpriteMovementData 2015-11-16 00:52:53 -05:00
PikalaxALT
aba038a4a4 Fix some movement macro/function names 2015-11-15 21:28:15 -05:00
PikalaxALT
ead04b3b75 Backup prior to global introduction of PERSONTYPE constants 2015-11-15 14:59:38 -05:00
PikalaxALT
b921226aea More map object, swap StandingTile and NextTile 2015-11-14 23:02:38 -05:00
PikalaxALT
ed44de4bb4 More map object work 2015-11-14 14:41:47 -05:00
PikalaxALT
cc8c36ee14 Creation of constants for OBJECT_09 indices 2015-11-13 18:59:49 -05:00
PikalaxALT
21276b79f1 SpriteAnim 2015-11-13 10:48:49 -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
b522b0f165 engine/mart.asm 2015-11-11 14:12:46 -05:00
PikalaxALT
4b35fa0582 Added w3 and w5 labels for misc/mobile_40.asm 2015-11-10 23:23:28 -05:00
PikalaxALT
8fb01de917 No more DefaultFlypoint 2015-11-10 19:51:13 -05:00
PikalaxALT
d13fb46d40 enum macros/move_anim.asm, resolve battle/anims.asm function labels 2015-11-10 16:53:37 -05:00
PikalaxALT
ba05bfeafe Move some gfx files around, also clock reset fn 2015-11-10 11:05:26 -05:00
PikalaxALT
d8cd991b35 engine/link.asm 2015-11-09 23:55:39 -05:00
PikalaxALT
f1b2466cc3 Cleaning up static HRAM labels; movement stuff, route 38 trainers 2015-11-09 23:01:45 -05:00
PikalaxALT
77d0a8a396 Add missing files in engine/ and battle/ 2015-11-09 17:02:47 -05:00
PikalaxALT
93ab6985d2 Some work on battle animations 2015-11-09 16:41:09 -05:00
PikalaxALT
ac824f62fc More battle core labels 2015-11-08 13:27:26 -05:00
PikalaxALT
c34264ddd8 AI and player items, withdraw/deposit 2015-11-08 10:59:28 -05:00
PikalaxALT
6a570ebb8e more battle core labels 2015-11-07 21:04:54 -05:00
PikalaxALT
09603bf031 More Battle Tower shenanigans 2015-11-07 14:38:52 -05:00
PikalaxALT
2cbb1acc6e Pokemon animations 2015-11-07 09:48:32 -05:00
PikalaxALT
e044580669 battle/ai/switch.asm and more battle/effect_commands.asm 2015-11-07 08:05:57 -05:00
PikalaxALT
d8aa438644 More battle command labels 2015-11-06 20:55:16 -05:00
PikalaxALT
ae2970d73b Sprite movement function labels 2015-11-06 16:42:38 -05:00
PikalaxALT
46e66077a5 BattleCommand labels copied from macros 2015-11-06 14:45:10 -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
cf5d726b7f Mon submenu, engine/menu.asm 2015-11-04 14:02:11 -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
b1dc88b728 Experience and level calculations 2015-11-03 12:36:33 -05:00
PikalaxALT
40eae001a1 Status strings 2015-11-03 09:45:25 -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
e0d6e9ca7a Fix NorthMapObjectIndexBuffer etc 2015-11-02 12:54:27 -05:00
PikalaxALT
d35cfad0de object_struct 2015-11-02 11:15:32 -05:00
PikalaxALT
76e2ea534f Object masks 2015-11-01 21:17:46 -05:00
PikalaxALT
6b2d0ae841 Fix merge conflicts 2015-11-01 18:19:52 -05:00
PikalaxALT
010b450834 Prepare to merge 2015-11-01 18:13:31 -05:00
PikalaxALT
31c407bb3d Buena local labels 2015-11-01 12:44:30 -05:00
PikalaxALT
3b4805ee98 Sweepthrough of ClearBox arg conversion to lb 2015-11-01 09:38:48 -05:00
PikalaxALT
fda1f7c01a SPRITEMOVEDATA 2015-10-31 21:05:02 -04:00
PikalaxALT
ed29db5841 No more -bash000; engine/movement.asm, SPRITEMOVEFN 2015-10-29 23:32:11 -04:00
JimB16
9a9cb38e39 merge with newest update 2015-10-26 03:26:53 +01:00
PikalaxALT
4d17f6e1f6 Address comments on PR 322 2015-10-24 19:49:19 -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
6c25592b8c So very jumb 2015-10-19 16:49:29 -04:00
JimB16
3b9a3cc3be merge conflicts resolved 2015-10-19 16:25:15 +02:00
PikalaxALT
0a244e043c Move battle start animation functions to its own file 2015-10-19 10:23:58 -04:00
PikalaxALT
52605b764a Add commented numbers to map/group constants 2015-10-17 21:26:38 -04:00
PikalaxALT
f53d65c536 Battle intro animation function 2015-10-17 17:18:52 -04:00
PikalaxALT
da7849d800 Restructured functions in main.asm to resemble the home functions they clone 2015-10-17 13:00:34 -04:00
PikalaxALT
4fa6c6daa4 Split up bank 2; other relabelings 2015-10-16 13:35:43 -04:00
PikalaxALT
1e2ff967aa Replaced "ldtile" and "dwtile" with the "tile" equs macro 2015-10-14 09:29:15 -04:00
PikalaxALT
d338a092c5 Revert sPlayerID 2015-10-13 17:40:18 -04:00
PikalaxALT
12f9dca7a5 Final descriptive label in tilesets/animations.asm 2015-10-13 14:29:34 -04:00
PikalaxALT
88bc86b0bb Replace Functionfb8 with FillBoxWithByte 2015-10-13 12:46:40 -04:00
PikalaxALT
0c39f6e273 Happiness and Mystery Gift constants 2015-10-12 12:33:24 -04:00
PikalaxALT
327faac497 Magikarp functions moved to event/magikarp.asm 2015-10-11 12:26:39 -04:00
PikalaxALT
d42330ed8b Annotation of PrintNum arguments in bc, and radio functions 2015-10-10 18:00:12 -04:00
JimB16
4b722eb530 changed name of some labels 2015-10-10 13:45:39 +02:00
PikalaxALT
b68913a782 More radio labels 2015-10-09 23:09:03 -04:00
JimB16
6730600d9b found CalcPkmnStats-function 2015-10-08 20:53:39 +02:00
PikalaxALT
96b0e448c4 Labeling of AI item and wild encounter functions 2015-10-07 21:27:32 -04:00
JimB16
975efb28ae Merge remote-tracking branch 'upstream/master' 2015-10-07 20:38:24 +02:00
PikalaxALT
edf42a54d5 More labels, including fns responsible for partymon generation 2015-10-07 13:19:41 -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
0001c688d3 found functions that determine next OTPkmn 2015-09-12 04:21:00 +02:00
JimB16
a7cb2a5e9b changed more labels 2015-09-10 01:27:07 +02:00
JimB16
bcc11712a5 added 'wBT_OTTempCopy'-label and the data structure that comes after 2015-08-31 14:31:13 +02:00
JimB16
172a1488de renamed labels and added comments 2015-08-30 13:17:14 +02:00
JimB16
706f289c70 change more labelss 2015-08-25 01:56:30 +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
a0aadb33e7 More sScratch. 2015-08-20 23:00:59 -07:00
yenatch
9e3bd6cb9b Label scratch space and a bunch of box lists. 2015-08-19 21:51:04 -07:00
yenatch
038166f97c Fix some dubious comments about abandoned sram addresses. 2015-08-19 21:29:58 -07:00
yenatch
860296f468 Comment and label the save file. 2015-08-19 21:14:15 -07:00
yenatch
9c84a3dd22 Split out the save file code. 2015-08-19 10:17:58 -07: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
PikalaxALT
895e14cd05 Reworked person_event arguments 2015-07-29 18:22:23 -04:00
yenatch
abf3fc2137 Name some map event reading functions. 2015-07-26 00:11:33 -07: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
185b0a1c86 Wild Pokemon functions and data 
Replaced encounter rates with percent values
Added new constants denoting the number of wild Pokemon in the grass and water wild constructs
Annotated and relabeled the encounter generating functions
Renamed a WRAM address associaed with the temporary storage of the wild Pokemon's species
Moved spawn constants to constants/map_constants.asm for use anywhere in the disassembly
 2015-07-23 03:51:15 -04:00
PikalaxALT
4c480a23dc Fixed a few labeling bugs 2015-07-22 16:58:47 -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
yenatch
973721491c Merge remote-tracking branch 'kanzure/master' into gfx-script 2015-07-20 23:05:28 -07:00
PikalaxALT
d5ddd9e54e Move radio code to its own file 2015-07-21 01:52:46 -04: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
d9300a9bec Fix unnecessary white space and retire add_n_times 2015-07-20 11:28:05 -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
yenatch
a3c6931fa8 Use pngs for some misc graphics. 2015-07-18 22:01:59 -07: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
yenatch
8186190ef1 Fix filenames and use pngs for credits graphics. 2015-07-18 00:05:14 -07: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
PikalaxALT
249bad9551 Replace EVENT_ALWAYS_THERE with -1 2015-07-13 00:18:01 -04:00
PikalaxALT
d282fe4799 Event and engine constant enumeration; replace static flag numbers with their constant names 2015-07-12 02:00:17 -04:00
IIMarckus
388336353d Fix mislabeled engine flags. 2015-07-10 06:12:28 -06:00
IIMarckus
07a12b37b6 Add more event flags. 2015-07-10 06:08:03 -06:00
IIMarckus
a711b45404 checkcode $1a is Kenji's break schedule. 2015-07-10 03:03:08 -06:00
IIMarckus
6f3b2d6de8 Add constants for checkcodes. 
From PikalaxALT.
 2015-07-09 20:23:23 -06:00
yenatch
e2c2e20f93 Use charmaps for special string codepoints. 
Also fix all the text.
Also fix some unreferenced scripts that were interpreted as text.
 2015-06-27 22:53:38 -07:00
yenatch
c00949dddf Labels for the heal machine; spriteface constants. 2015-06-26 23:24:55 -07:00
yenatch
d6f7dc3206 Fix the Nurse std comments. 2015-06-26 23:17:10 -07:00
yenatch
0f57aefdf2 Merge branch 'tilesets' into master 
Conflicts:
	tilesets/tileset_headers.asm
 2015-06-26 11:00:39 -07:00
IIMarckus
e57e1ba63b Improve some signpost labels. 2015-06-25 22:01:08 -06:00
IIMarckus
f16d60e3f9 Update some event flags. 2015-06-24 21:20:04 -06:00
IIMarckus
fdfbeb7e5f More std enums. 2015-06-24 19:26:24 -06:00
IIMarckus
5d48bc96fd More std_scripts enums. 2015-06-23 15:02:58 -06:00
IIMarckus
1027a3a157 Clean up labels. 2015-06-23 14:29:06 -06:00
IIMarckus
7ac6aa2d22 Begin enumerating std_scripts constants. 2015-06-23 14:21:54 -06:00
IIMarckus
0ba261a3fd Introduce checkmorn/checkday/checknite to replace checktime. 2015-06-23 12:28:48 -06:00
IIMarckus
4d532beee6 Remove trailing newlines. 2015-06-23 12:24:51 -06:00
yenatch
5ae298f533 Organized the primary tileset palettes. 
Crystal's tileset-specific palettes are disconnected from these.
 2015-06-23 10:46:51 -07:00
IIMarckus
47938939fe Give Buena's phone scripts more appropriate filenames. 2015-06-23 11:43:32 -06:00
yenatch
93a589795f Merge remote-tracking branch 'kanzure/master' 2015-05-18 02:21:14 -07:00
yenatch
b47c4bc6fd Use more constants in the event scripting engine. 2015-05-18 02:16:11 -07:00
IIMarckus
7563a990aa w-prefix the new PokegearFlags variable. 2015-05-18 03:15:45 -06:00
IIMarckus
bd894f6fb0 Fix a static address. 2015-05-18 02:07:28 -06:00
IIMarckus
32864d2db6 Give wd957 a more descriptive name. 2015-05-14 22:42:29 -06:00
yenatch
adc41566aa Fix a static reference to a string in Pokedex code. 2015-03-03 18:31:46 -08:00
IIMarckus
828d6b92f0 Add the ability to build Crystal 1.1. 2015-02-14 01:51:34 -07:00
IIMarckus
b028e13834 Give an internal Pokédex status variable its own label. 
This new label is used in revision 1.1 of Pokémon Crystal.
 2015-02-14 01:40:38 -07:00
yenatch
92e2ed3e61 Split out event scripting specials. 2015-02-11 15:09:35 -08:00
yenatch
b048ea0faf Use labels for script specials instead of constants/static values. 2015-02-11 15:03:42 -08:00
yenatch
9aef93701a Split out map object code. 2015-02-11 14:13:22 -08:00
yenatch
a31b4586df Split out the diploma code. 2015-02-11 14:08:07 -08:00
yenatch
f4e0e61114 Split out the map setup scripts. 2015-02-11 14:01:04 -08:00
yenatch
c6c220f1ad Split out spawn points. 2015-02-11 13:59:59 -08:00
yenatch
3977bd6208 Split out map triggers. 2015-02-11 13:45:33 -08:00
yenatch
25f5306a4d Split out the Pokedex code. 2015-02-11 13:36:02 -08:00
yenatch
e13565f933 Split out the pack code. 2015-02-11 13:27:15 -08:00
yenatch
956b990cd2 Fix a bunch of palette copying errors and wram bank conflicts. 
There are probably a bunch more labels with wrong banks. This takes care of the most noticeable ones.
 2015-02-10 18:21:38 -08:00
yenatch
62b473d6c6 Blind wram labels part 3. 2015-02-10 15:14:21 -08:00
yenatch
849595e537 Blindly use wram labels for everything except mobile, part 2. 2015-02-10 14:18:23 -08:00
yenatch
d3054dc4cb More graphics and straggling static refs. 2015-02-06 21:17:32 -08:00
yenatch
ed88e4947c Get rid of more static refs in banks 47, 5c, 5f. 2015-02-05 23:59:50 -08:00
yenatch
8583cc4724 Stop using the preprocessor. 2015-01-20 00:01:23 -08:00
yenatch
3fe3cd1a46 hVBlank 2015-01-19 21:31:29 -08:00
yenatch
7b87e67a89 More labels in code and some mobile datatracking. 2015-01-01 20:59:08 -08:00
yenatch
133e2fb7a7 Use "- $ff00" instead of "& $ff" when dealing with hram. 2014-12-29 08:49:08 -08:00
yenatch
1a2784d414 Recombine the event engine objects. 
They must be in the same bank to work, and defining sections with static banks should only be used to produce an identical rom.

They were only split in the first place to minimize the amount of code tahat needed to be rebuilt based on a single constant, which in retrospect was meaningless.
 2014-12-29 08:08:03 -08:00
yenatch
6604afce62 Use the "next" directive in the credits. 2014-12-03 21:26:14 -08:00
yenatch
7996f5b1ab Miscellaneous formatting cleanup. 2014-09-30 11:19:33 -07:00
yenatch
ed15916f05 Use landmark constants in displaylocation commands (phone scripts). 2014-08-22 20:36:10 -07:00
yenatch
49b00673b0 Recomment Headbutt tree and Rock Smash encounters. 2014-08-18 08:20:37 -07:00
yenatch
b922fe72a1 Label CheckPhoneCall. 2014-07-24 20:19:56 -07:00
yenatch
f7e53b0f50 Dump the phone scripts. 
This is one of the last major incbins. The rest is mostly mobile code.
 2014-07-23 20:20:21 -07:00
yenatch
cda504fbce Fix "name" event command parameter comments. 2014-07-22 22:39:41 -07:00
yenatch
b211cac35a Separate phone scripts from std scripts. 2014-07-22 22:09:55 -07:00
yenatch
29d92fe79c Fix some static addresses in std scripts. 2014-07-22 22:05:41 -07:00
yenatch
e75e735f7f Reflect the extra loadwilddata argument in its function comment. 2014-07-22 22:05:06 -07:00
yenatch
849044ce8a Remove generated "jump sources" comments. 2014-07-19 14:11:48 -07:00
yenatch
be08d93b61 Name the script special function and clean up a couple specials. 2014-07-19 14:02:58 -07:00
yenatch
928cdcfc23 Name cry functions in home.asm. 2014-07-18 10:31:52 -07:00
yenatch
c2dba43188 Contest battle type and comment the battle menu. 2014-06-17 11:58:11 -07:00
yenatch
8639fcd29b Use a predef macro that takes labels instead of juggling constants. 
Besides making predefs convenient, naming a predef no longer requires
adding or renaming a predef constant. This also lets predefs be rearranged at will.
 2014-06-16 11:20:01 -07:00
yenatch
023cfdbb05 Consolidate monster structs in wram and sram. 
The PartyMon struct is really the box struct with volatile variables like status added.

Some other labels have been reworked.
Move structs no longer have explicit labels since their location is arbitrary and usually shared.
 2014-06-12 18:32:42 -07:00
yenatch
fd8804472d Use {hl,de,bc}coord macros wherever possible. 2014-06-04 01:10:56 -07:00
yenatch
2cb3f8e1b9 Comment music functions in home.asm. 2014-05-21 16:21:46 -04:00
yenatch
95af7dd873 Move RegionCheck into engine/landmarks.asm. 2014-04-30 23:44:44 -04:00
yenatch
113dd395d2 Include palette 0 in PokemonPalettes. 
Now PokemonPalettes is referenced.
 2014-04-13 00:03:21 -04:00
yenatch
f66f4d51c7 Replace static bank 0 calls in the event scripting engine. 2014-04-12 15:45:40 -04:00
yenatch
0eb49d5941 Fix a title screen label that accidentally made its way into bank 1. 
Somehow, a title screen (bank 0x43) function had its label put in bank 1.
This caused changes to either bank to break the compiled rom.

fixes 61a3d145
 2014-04-09 18:27:29 -04:00
yenatch
73ffc4677a Image extensions in gfx/{intro,title}. 2014-04-02 00:41:56 -04:00
yenatch
6a66f28bf5 Fix image extensions in gfx/{credits,misc}. 2014-04-02 00:16:03 -04:00
yenatch
2564836df1 Compressed title screen graphics are padded too. 2014-03-04 01:29:43 -05:00
yenatch
7ab8f76117 Label map trigger functions in home.asm. 2014-03-03 22:53:43 -05:00
yenatch
2b144fcfd4 Finish off SGB and CGB code and data. 
That should be it for bank 2.
 2014-03-02 16:02:55 -05:00
yenatch
78c70bffe4 More SGB and CGB palettes. 2014-03-02 01:22:33 -05:00
yenatch
38850df63d Lots of SGB incbins in bank 2. 
Palette/block packets, border tilemap, more palettes etc.
 2014-03-01 21:43:16 -05:00
yenatch
83537048fb Smoke out bank 4. 
Highlights: contest trainers and mons
 2014-03-01 10:31:13 -05:00
yenatch
ddc665a31a Move includes into object bases instead of their version wrappers. 2014-02-05 19:07:24 -05:00
yenatch
cf2acc1001 Use :: to export labels between objects. 
This fixes the build.
 2014-02-01 20:26:39 -05:00
yenatch
1ba5b0f4bc Map setup scripts and commands 2014-01-26 22:07:19 -05:00
yenatch
4612670768 more npc trade cleanup 2013-12-27 22:20:24 -05:00
yenatch
58af27eaeb label overworld loop functions 2013-12-27 05:56:23 -05:00
yenatch
0cd1d2071f item effect incbins 2013-12-24 17:11:52 -05:00
yenatch
7b20626c7b more object struct constants 2013-12-23 04:39:26 -05:00
yenatch
496502b3dc no more Public in joypad interface labels 2013-12-22 17:30:35 -05:00
yenatch
0d3308f68c use RGB macros for palettes instead of binary chunks 2013-12-20 00:29:31 -05:00
yenatch
c7b19392a9 use the sgb border label in asm 2013-12-13 20:49:01 -05:00
yenatch
1b7e44c729 split out sprite facing defs into engine/facings.asm 2013-12-11 22:00:56 -05:00
yenatch
be0c7962b0 YesNoBox 2013-12-04 03:07:58 -05:00
yenatch
3de254f7a2 more 3pt macro labels; shorten 3pt macros to take just a label 
static addresses should be avoided anyway
 2013-12-02 14:18:03 -05:00
yenatch
ce37f0f970 labels for every 3callasm 2013-12-01 18:26:05 -05:00
yenatch
9aaa5f24bb shorten redundant text_jump macros 2013-12-01 17:54:09 -05:00
yenatch
0b905cb8ac rename a credit constant to avoid conflicts 2013-11-29 01:49:48 -05:00
yenatch
b18beef4d5 more landmark constants and rename FlypointPerms -> VisitedSpawns 2013-11-29 00:38:22 -05:00
yenatch
fd73d41e6b redone landmarks, now with constants 2013-11-28 03:54:21 -05:00
yenatch
ac65a8b821 engine/credits_crystal.o 2013-11-28 01:38:49 -05:00
yenatch
72b1dda303 more credits cleanup 2013-11-28 00:55:32 -05:00
yenatch
04eb541f83 proper section names and bank constants 2013-11-26 04:29:47 -05:00
yenatch
f16193dc91 move more credits asm into engine/credits.asm 2013-11-24 04:26:10 -05:00
yenatch
25325139e6 more credits labels and theend graphic 2013-11-24 04:09:17 -05:00
yenatch
cf6295cb9f objects for event handling and scripting 2013-11-23 02:51:48 -05:00
yenatch
29afa24f0b split more event handling out of main 2013-11-23 02:33:53 -05:00
yenatch
bd392da29e split event handling into engine/events.asm 2013-11-22 05:04:32 -05:00
yenatch
bcd833e758 version checks for event script commands and move in related asm 2013-11-22 04:51:47 -05:00
yenatch
94188ee0f7 version-sensitive objects for egg moves and evos/attacks 
this way main.o and wram.o are version-neutral
 2013-11-22 00:14:55 -05:00
yenatch
bd49428c4a Merge commit '789469c' into merge-mrwint 
Conflicts:
	main.asm
 2013-10-25 16:48:29 -04:00
yenatch
da22ada91c Merge commit '546c17ad' into merge-mrwint 
Conflicts:
	engine/scripting.asm
	main.asm
 2013-10-25 16:23:16 -04:00
yenatch
789469c465 rename 'StartMusic' to 'PlayMusic' 2013-10-08 13:21:15 -04:00
yenatch
546c17ad37 rename 'StartSFX' to 'PlaySFX' 2013-10-08 13:10:36 -04:00
Mr Wint
dfa9adcaeb * added index comments to pointer lists 
* added map header wram addresses
* analyzed some assembly
 2013-10-05 04:03:34 +02:00
Mr Wint
c666d1014a * make jumps and calls use labels 2013-10-02 06:53:35 +02:00
Mr Wint
c5ff1606f0 * last callab/callba macros 2013-10-02 03:55:40 +02:00
Mr Wint
181840cf43 * even more callab/callba macros 2013-10-02 03:20:48 +02:00
Mr Wint
eb5a7afe2b * more callab/callba macros 2013-10-02 02:47:54 +02:00
Mr Wint
255135d187 * extracted and added a bunch of assembly 2013-10-01 23:23:21 +02:00
yenatch
cf359b09fc fix parsing errors for displaylocation 2013-10-01 01:13:21 -04:00
yenatch
4cdc51d159 fix parameter comments for updated script commands 2013-10-01 01:13:04 -04:00
yenatch
e5b5e1238d script command unknown0xa8 is wait 2013-10-01 01:03:08 -04:00
yenatch
ad3293595d script commands if_greater_than and if_less_than were swapped 2013-09-26 18:40:20 -04:00
yenatch
73bd376cfd rename bit2 script commands to flag 2013-09-24 03:51:42 -04:00
yenatch
3134b26f7b rename bit1 script commands to event 2013-09-24 03:48:58 -04:00
yenatch
8da8dff7cf use a label in wildon/wildoff script command asm 2013-09-24 03:31:00 -04:00
yenatch
2afb247caa script commands wildon and wildoff got mixed up 
this was a mistake in the original pksv spec and tauwasser's notes
 2013-09-24 03:29:37 -04:00
yenatch
237861b553 rename hall of fame labels 2013-09-16 17:42:11 -04:00
yenatch
9ae1cd6a1c split title screen functions into engine/title.asm 2013-09-15 18:59:53 -04:00
yenatch
3370a04d9e split color asm and data into engine/color.asm 2013-09-15 18:02:02 -04:00
yenatch
f0cf86777b fix item asm labels 
CheckItem was called PickUpItem by mistake

Also label TossItem and ReceiveItem
 2013-09-08 01:43:51 -04:00
yenatch
9f53825ce2 move common asm from engine/ to common/ 
engine/ was getting really bloated and common asm wasnt what it was made for
 2013-09-07 23:38:19 -04:00
yenatch
7a3a4f913b split fruit tree asm out into engine/fruit_trees.asm 2013-09-07 23:26:28 -04:00
yenatch
6e5876377f split out std scripts from main.asm 2013-09-07 15:30:07 -04:00
yenatch
45e791bb42 StdScripts label in engine/scripting.asm 2013-09-07 05:08:34 -04:00
yenatch
4a429aded4 add a label in the text engine 2013-09-06 03:47:07 -04:00
yenatch
60dde1d03e forgot to commit engine/farcall.asm 
fixes 715a19fd59
 2013-09-05 14:25:20 -04:00
yenatch
d93d17b43b split out game time functions into engine/game_time.asm 2013-09-03 18:58:16 -04:00
yenatch
340e31d839 split menu functions into engine/menu.asm 2013-09-03 18:43:15 -04:00
yenatch
23bb05851b split Sine/Cosine into engine/sine.asm 2013-09-03 18:40:12 -04:00
yenatch
12e6ff3fc6 split map object functions into engine/map_objects.asm 2013-09-03 18:39:19 -04:00
yenatch
71bbd77261 split some RTC interfaces into engine/rtc.asm 2013-09-03 18:35:37 -04:00
yenatch
004956798c split vram functions out into engine/video.asm 2013-09-03 18:32:55 -04:00
yenatch
b74e63a20d split out delay functions 2013-09-03 17:36:55 -04:00
yenatch
5b38b377f2 wram labels for graphics requests 2013-09-01 15:24:07 -04:00
yenatch
8190c3e5e7 rename DoTileAnimation to AnimateTileset 2013-09-01 00:07:10 -04:00
yenatch
fc6bc8e311 rename graphics request handlers to Serve1bppRequest and Serve2bppRequest 
these had some really dumb names
 2013-09-01 00:02:35 -04:00
yenatch
abce472354 fix PushOAM references in VBlank 2013-08-31 21:47:28 -04:00
yenatch
b333b18dbd Function2f79 is PickUpItem 2013-08-30 23:07:08 -04:00
yenatch
c9d3881a2f rename RNG to Random 
also fix 'Far' naming scheme for BattleRandom

this was a long time coming
 2013-08-30 22:59:40 -04:00
yenatch
7cc320e835 Coins in main.asm 2013-08-30 17:50:46 -04:00
yenatch
c4a764ce10 use more bank 0 labels in engine/scripting.asm 2013-08-29 23:20:09 -04:00
yenatch
cc98fab33e move VBlank interrupt label from main.asm to engine/vblank.asm 2013-08-29 19:40:33 -04:00
yenatch
2c16bc7ab9 move copy asm from main.asm to engine/copy.asm 2013-08-29 19:39:21 -04:00
yenatch
04da88a285 move palette asm from main.asm to engine/palettes.asm 2013-08-29 19:37:35 -04:00
yenatch
6d29673a5f move time-related asm from main.asm into engine/time.asm 2013-08-29 19:32:03 -04:00
yenatch
6467755568 move serial asm from main.asm into engine/serial.asm 2013-08-29 19:11:39 -04:00
yenatch
2341bb148a move more joypad code from main.asm into engine/joypad.asm 2013-08-29 19:10:06 -04:00
yenatch
906496e107 split lcd functions out of main.asm 2013-08-29 18:52:26 -04:00
yenatch
2b5b6f3e3a split fading functions out of main.asm 2013-08-29 18:50:59 -04:00
yenatch
eff81fb080 fix Stack's address ($c100 -> $c0ff) 
using negative ds
 2013-08-29 02:10:32 -04:00
yenatch
12ab33b37e rename FarCall family labels 
FarJump labels renamed to FarCall
register aliases JpHl and JpDe renamed to _hl_ and _de_
 2013-08-27 18:16:42 -04:00
yenatch
17725d7af1 battle init and some overworld actions 2013-08-24 04:10:38 -04:00
yenatch
af205a7217 BitTable2 -> EngineFlags 2013-08-23 16:08:31 -04:00
yenatch
3a24cff5eb BitTableFunc -> FlagAction 2013-08-23 15:49:24 -04:00
yenatch
636a960909 split out text engine 2013-08-21 14:01:49 -04:00
yenatch
35de889dd7 split out decompression 2013-08-21 14:01:46 -04:00
yenatch
99d2ee2bdc split out program init 2013-08-20 03:26:37 -04:00
yenatch
3460b82d22 update hram addresses in engine/vblank.asm 2013-08-19 20:49:41 -04:00
yenatch
df21dbccb7 $ffcf $ffd0 -> hSCX hSCY 2013-08-19 18:46:56 -04:00
yenatch
449bda272a $ffd1 $ffd2 -> hWX hWY 2013-08-19 18:44:12 -04:00
yenatch
6343e2ddaf Reset 2013-07-26 23:49:33 -04:00
yenatch
8e27cfbc1a movement command asm 2013-07-20 22:34:40 -04:00
yenatch
173f38346c get rid of bank 25 hard addresses in scripting.asm 2013-07-20 02:27:48 -04:00
yenatch
f2888a2d75 more overworld wram labels 2013-07-20 01:25:20 -04:00
yenatch
0988d69d9d more scripting cleanup 2013-07-10 19:17:04 -04:00
yenatch
a3870db643 Clean up and remove incbins from script commands 2013-07-10 19:17:04 -04:00
yenatch
fb931fe616 move miscellaneous asm into engine/ 2013-06-17 21:30:36 -04:00