Remy Oukaour
e1a672e427
Constants for TextBoxFlags
2017-12-29 13:18:17 -05:00
Remy Oukaour
4c35f3ac85
Merge branch 'master' of https://github.com/pret/pokecrystal
...
# Conflicts:
# macros/scripts/maps.asm
2017-12-28 20:56:21 -05:00
xCrystal
50fc9c3389
endm -> ENDM
2017-12-28 22:31:16 +01:00
Remy Oukaour
84e22eb578
Consistent (x, y) coordinate formatting in map scripts
2017-12-28 14:31:25 -05:00
xCrystal
333524f0be
Lowercase v for VRAM addresses
2017-12-28 13:32:33 +01:00
xCrystal
7beb497d3a
Uppercase MACRO and EQU(S) according to the style guide
2017-12-28 13:23:44 +01:00
xCrystal
9457679af8
Prefix engine_flags wram addresses with w
2017-12-28 13:15:46 +01:00
Remy Oukaour
e3e64fdf59
Move more decoration data to data/
2017-12-27 11:56:03 -05:00
Remy Oukaour
7a4d641251
Remove redundant data/ filename prefixes
2017-12-27 01:29:15 -05:00
Remy Oukaour
86fd37af16
Move events/ to engine/events/
2017-12-27 00:09:12 -05:00
Remy Oukaour
c4a18b1329
Correct documentation
...
Split out text_constants.asm
2017-12-26 22:36:01 -05:00
Remy Oukaour
dae16acd6f
event/ → events/, and move some appropriate engine/ files there
2017-12-26 21:55:57 -05:00
Remy Oukaour
b3f0e11567
Various cleanup
2017-12-26 20:33:41 -05:00
Remy Oukaour
8259136911
Name mail graphics
2017-12-26 20:02:00 -05:00
Remy Oukaour
9bc680bd6d
Battle animation data is like sprite animation data
2017-12-26 19:27:56 -05:00
Remy Oukaour
35a3a19fda
Use "battle_anims" and "sprite_anims" for clarity, not just "anims"
2017-12-26 18:45:04 -05:00
Remy Oukaour
b5417fafec
Split battle/ into data/ and engine/ components
2017-12-26 17:47:05 -05:00
Remy Oukaour
2f98c2032f
Constant comments
2017-12-26 15:09:39 -05:00
Remy Oukaour
4d18bb2eda
Rename: gfx/pics → gfx/pokemon
2017-12-26 12:55:02 -05:00
Remy Oukaour
24f0e7d045
Rename: emote_headers, sprite_headers, cry_headers, gfx_headers, tileset_headers
2017-12-26 12:50:32 -05:00
Remy Oukaour
b5a8e3b3b3
Follow the X_constants/X_data_constants convention
2017-12-25 23:45:54 -05:00
Remy Oukaour
e34e68095d
Resolve #428 : Use HIGH(X)
and LOW(X)
instead of X / $100
and X % $100
or X >> 8
and X & $ff
2017-12-25 14:23:16 -05:00
Remy Oukaour
da2b01a36c
Clean up color/palette code
2017-12-25 12:41:31 -05:00
Remy Oukaour
1522140e41
Clarify why G/S egg moves were removed ( resolves #294 )
2017-12-24 18:23:24 -05:00
Remy Oukaour
0a1fef45fd
Rename maps:
...
- Underground -> UndergroundPath
- Route5UndergroundEntrance -> Route5UndergroundPathEntrance
- Route6UndergroundEntrance -> Route6UndergroundPathEntrance
- WarehouseEntrance -> GoldenrodUnderground
- UndergroundWarehouse -> GoldenrodUndergroundWarehouse
- UndergroundPathSwitchRoomEntrances -> GoldenrodUndergroundSwitchRoomEntrances
2017-12-24 18:06:12 -05:00
yenatch
0b8b6f9259
Use PSYCHIC_M for the Psychic TM.
...
Fixes #385
2017-12-24 17:54:24 -05:00
Remy Oukaour
b805d343f3
Merge branch 'master' of https://github.com/pret/pokecrystal
2017-12-24 17:30:29 -05:00
Remy Oukaour
c05b7f41dd
Renaming: ( fix #412 )
...
- MapTriggers / maptrigger → SceneScripts / scene_script
- XYTriggers / xy_trigger → CoordEvents / coord_event
- Signposts / signpost → BGEvents / bg_event
- PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 14:33:17 -05:00
Remy Oukaour
20d6c1d876
Rename "map permissions" to "map environment" ( fix #396 )
2017-12-24 13:08:38 -05:00
Remy Oukaour
c66d195089
callba/callab → farcall/callfar
2017-12-24 12:47:30 -05:00
mid-kid
21607bdd1f
HELD_TRADE_EVOLVE -> HELD_FLINCH
...
This item effect effectively causes the target to flinch (sometimes).
It's not exclusive to trade evolve items in later generations either.
2017-12-24 14:42:05 +01:00
Remy Oukaour
aa97752efe
Move NUM_BUENA_PRIZES to event/buena.asm (still hard-coded)
...
Buena_PrizeMenu has "rept NUM_BUENA_PRIZES", which needs NUM_BUENA_PRIZES to be already defined. BuenaPrizeItems and BuenaPrizeItemsEnd are needed to define NUM_BUENA_PRIZES; but BuenaPrizeItems is defined after Buena_PrizeMenu. I don't see a way to avoid hard-coding its value of 9.
Contrast that with the NUM_MOM_ITEMS constants, which are not used as "rept" arguments and so can be defined within their code file.
2017-12-23 00:31:04 -05:00
Remy Oukaour
25a3960646
Move some more main.asm routines into individual files
2017-12-16 19:00:50 -05:00
Remy Oukaour
fa98c29fa4
Add more palettes to data/palettes/
2017-12-15 22:36:33 -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
dc76bf804f
Move all misc/ and unknown/ files to meaningful directories
2017-12-15 13:21:47 -05:00
Remy Oukaour
253c09949b
Move data/audio/ back into audio/
...
Keep trainer data together
2017-12-15 12:38:59 -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
28aec67f6e
Document one more bug/oversight
...
Move FleeMons table into data/
2017-12-15 00:05:53 -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
Remy Oukaour
e48a401290
Reorganize macros
2017-12-14 00:36:24 -05:00
Remy Oukaour
0e7a101e41
Use constants for gender ratios
2017-12-13 17:59:14 -05:00
yenatch
a1d9c7459b
SpriteAnimSeqData comments on same line
2017-12-12 23:44:57 -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
39367a1b68
Outdoor sprite groups have the same names as map header groups
2017-12-12 01:01:56 -05:00
Remy Oukaour
79873a1bfc
Move pic animation documentation to docs/
...
Move growth rates to a data/ table
Name more SECTIONs
2017-12-11 23:44:29 -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
4afc2f01ef
Add member constants for the base data struct, same as most other structs
2017-12-11 17:35:35 -05:00
Remy Oukaour
8c2c9e91b5
Better file name
2017-12-11 17:13:38 -05:00
Remy Oukaour
2e41368ac4
Factor out one more data table
2017-12-11 17:11:30 -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
08b14e593e
Rename tilesets, consistent with constant names
2017-12-10 23:56:10 -05:00
Remy Oukaour
25bff5c1ac
Remove unused .asm file
2017-12-10 13:58:55 -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
e39c8afbf2
Rename all files in data/pokedex/entries/
...
Some people suggested this would be a good idea, and make management of
the files easier. I'm inclined to agree.
2017-11-26 23:10:49 +01:00
mid-kid
617ba8be3d
width -> weight
...
This used to be confusing, since the first thing I think when I see
"width, height" is graphics, in this case probably the sprites.
Well, it has nothing to do with that. Weight is mass times gravity or
something, width is a form of distance.
2017-11-20 18:11:53 +01: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
yenatch
dbaec20534
Include front.dimensions file instead of manual pic dimensions
2017-06-24 20:21:30 -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
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
bfe2f6d52e
Merge branch 'master' of https://github.com/pret/pokecrystal
2016-05-27 10:39:17 -04:00
yenatch
604778749d
Undo Slowpoke family changes in #343 .
2016-05-23 21:26:08 -04:00
Brandon Mulcahy
313e48d6d9
Switch labels for fast and slow exp groups
2016-05-23 16:55:20 -04:00
pikalaxalt
1544185bec
Revise frame macro to account for flags in sprite anim framesets
2016-05-15 23:05:41 -04:00
pikalaxalt
ee906a67c7
These macros are perfect for the object anim engine
2016-05-15 22:33:51 -04:00
pikalaxalt
87b733994b
SPRITE_ANIM_FRAME_IDX constants
2016-05-15 22:00:17 -04:00
pikalaxalt
e95d42e0af
All functions in main.asm have non-generic names
2016-05-08 14:11:24 -04:00
pikalaxalt
3713b71d9e
More splitting of main.asm; remove unneeded rept 2
2016-05-04 11:46:23 -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
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
yenatch
8e1167a1e5
Merge branch 'fix-makefile'
2016-02-10 00:32:58 -05:00
IIMarckus
52f9ec8dce
Remove misleading (unreferenced) labels.
2016-01-30 20:53:27 -07:00
yenatch
08ac6dfd80
*_crystal.asm files are no longer needed to build crystal *.o.
2016-01-29 16:24:38 -05:00
PikalaxALT
3dcbe0ff55
Pokegear
2016-01-10 17:44:09 -05:00
PikalaxALT
6d1b7f28c8
Split base stats
2016-01-09 16:52:34 -05:00
PikalaxALT
9bbb65166e
More movement stuff
2015-12-29 13:15:58 -05:00
PikalaxALT
7683b78fb4
Labels relating to odd egg
2015-12-25 23:34: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
d644406f61
More menu stuff
2015-12-17 22:31:16 -05:00
PikalaxALT
c635e30777
map setup and warps
2015-12-14 11:12:18 -05:00
PikalaxALT
b9870541d4
slot machines
2015-12-10 22:26:31 -05:00
PikalaxALT
6eac26732a
Celebi Event
2015-12-05 15:38:25 -05:00
PikalaxALT
e83a5bae87
Address some comments from padz
2015-12-05 08:08:01 -05:00
PikalaxALT
5b94d54a6c
More work on animations
2015-12-04 08:46:11 -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
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
7b3090e22a
Annotate battle tower text bug
2015-11-20 15:15:32 -05:00
PikalaxALT
09603bf031
More Battle Tower shenanigans
2015-11-07 14:38:52 -05:00
PikalaxALT
739bb3c136
Replace party struct relative values with EQUS constants
2015-11-04 11:31:00 -05:00
PikalaxALT
10beeb3c06
Battle Tower
2015-11-03 15:22:04 -05:00
PikalaxALT
72af3337fd
No more NONE
2015-11-02 14:37:02 -05:00
PikalaxALT
010b450834
Prepare to merge
2015-11-01 18:13:31 -05:00
PikalaxALT
4fa6c6daa4
Split up bank 2; other relabelings
2015-10-16 13:35:43 -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
4cd354ec32
fixed the BT_OTrainer Labels
2015-08-26 03:11:19 +02:00
JimB16
2f4a0179fe
changed constants to SRAMLabels
2015-08-26 01:40:34 +02:00
JimB16
b9c1d1b61e
named labels and commented WRAMVars in battle_tower.asm
2015-08-25 17:02:13 +02:00
JimB16
3922ad2c3c
changed labels and added comments
2015-08-23 15:09:56 +02:00
JimB16
9772c722ac
added comments and labels to BattleTower-Code
2015-08-23 07:09:36 +02:00
yenatch
70f9c27aac
Found a reference to an unknown blob.
2015-08-19 22:42:59 -07: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
471492b775
Reverted ld_hl_pointer macro
2015-07-20 22:18:18 -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
Scott Norton
f74fd6903f
- Renamed "Functiond283" to "GetPocketCapacity" and updated the pointers and constants to better reflect their hypothesized purposes.
...
- Using yenatch's version of the macro and constant handling, rewrote the tmhm bit array as a macro-defined environment.
2015-07-03 13:46:38 -04:00
IIMarckus
4d532beee6
Remove trailing newlines.
2015-06-23 12:24:51 -06:00
IIMarckus
828d6b92f0
Add the ability to build Crystal 1.1.
2015-02-14 01:51:34 -07:00
yenatch
8e03321069
Blindly use wram labels for everything except mobile, part 1.
...
Wram banks and mobile make this tough, since any address can secretly be a ghost.
As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-10 00:53:03 -08:00
yenatch
e246b53ba8
Odds and ends in bank 45 (and more ascii incbins).
2015-02-06 00:19:36 -08:00
yenatch
091d33e801
More mobile incbins and start incbinning .txt for ascii.
2015-02-04 16:07:38 -08:00
yenatch
b6793b65df
Use a macro for Odd Egg probabilities.
2014-07-18 10:31:39 -07:00
yenatch
32a5f21cc7
More PartyMon labels for relative addressing.
2014-06-23 12:45:30 -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
2d1a1b9c17
Experience growth rate constants.
2014-06-04 01:41:43 -07:00
yenatch
99fbe3147b
Rename directory stats -> data.
2014-05-31 22:57:00 -07:00