Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,757 Commits 2 Branches 0 Tags 197 MiB
Commit Graph

447 Commits

Author SHA1 Message Date
Remy Oukaour b0d2409c83 Move EZChat Pokémon order to data/ 2018-01-02 23:21:07 -05:00
Remy Oukaour 3fc06b0f9d Use constants 2018-01-02 20:35:57 -05:00
Remy Oukaour 41de67edbd Identify more G/S intro OAM data 2018-01-02 17:05:40 -05:00
Remy Oukaour ae78ee6cc8 One more G/S intro OAM identified 2018-01-02 16:19:04 -05:00
Remy Oukaour 6cc4b534b5 Align comments 2018-01-02 16:01:47 -05:00
Remy Oukaour 64b27d86c0 More G/S intro OAM documentation 2018-01-02 15:54:23 -05:00
Remy Oukaour 6a3045d759 1-based EZ Chat cursor data indexes 2018-01-02 15:02:08 -05:00
Remy Oukaour 2dd9ac08a4 More sprite anim documentation 2018-01-02 14:39:24 -05:00
Remy Oukaour 7ad8ea13c9 Document more sprite anim data 2018-01-02 14:25:58 -05:00
Remy Oukaour eb8e55a01a Route 17-18 Gate and Route 29-46 Gate 2018-01-01 18:19:32 -05:00
Remy Oukaour 985946740e Consistent map naming ("Town" and "City" are left out in houses and gates) 2018-01-01 18:08:18 -05:00
xCrystal e5fa3f9a11 Fix missing palred/palgreen/palblue constants 2018-01-01 21:05:00 +01:00
xCrystal a98ed77c83 Merge 2d0ed11 and 355acfc from Roukaour/master 2018-01-01 20:25:07 +01:00
xCrystal 6e12a51503 Use more palette(s) constants 2018-01-01 20:09:53 +01:00
Remy Oukaour 2d0ed1159e Use constants for rBGPI+rOBPI auto-increment 
Fix some documentation
 2018-01-01 13:43:02 -05:00
yenatch 92fba8821c
Merge pull request #450 from roukaour/master 
Constants for TextBoxFlags
 2017-12-30 21:32:45 -05:00
Remy Oukaour ab823e2b54 FAST_TEXT_DELAY_F 2017-12-29 13:29:24 -05:00
xCrystal 2a7ba6685a Clean up changes in 3c6c80f 2017-12-29 19:22:33 +01:00
Remy Oukaour e1a672e427 Constants for TextBoxFlags 2017-12-29 13:18:17 -05:00
xCrystal 3c6c80f1b2 LY_BLANK and rLCDC constants 2017-12-29 18:53:21 +01:00
xCrystal 69762a2bfd SET -> set 2017-12-29 17:15:01 +01:00
xCrystal ee5bf71640 Consistently name unknown fields in macros/wram as Fieldxx 2017-12-29 16:19:51 +01: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 b373984ab9 Rename pokemon animation files (fix #439) 2017-12-28 11:05:42 -05: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 fbb492f9d7 Note about footprints in comments 2017-12-27 11:33:08 -05:00
Remy Oukaour e614dd1278 gfx/pokemon/animation.asm → engine/pic_animation.asm 
Correct comment in constants/pokemon_constants.asm
 2017-12-27 01:58:36 -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 47e4f21e62 Keep memory map values in hardware_constants.asm 2017-12-26 23:18:05 -05:00
Remy Oukaour c4a18b1329 Correct documentation 
Split out text_constants.asm
 2017-12-26 22:36:01 -05:00
Remy Oukaour d15429e3b7 Separate constants in a consistent way 2017-12-26 22:25:11 -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 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 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 85aa236c34 Use percentages for AI scoring logic 
Define MAX_DAY_CARE_EXP
 2017-12-25 16:18:05 -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 148fd299f9 Add more constants for some maximum values 2017-12-24 19:49:57 -05:00
Remy Oukaour 7d4486e6a3 Remove all code from main.asm (some labeled INCBINs, like out-of-context graphics, are still present) 
engine/routines/ stores isolated out-of-context routines as individual files. It might be preferable later to append them to their related engine/ files in unique little SECTIONs, relying on the linkerscript to place them appropriately; or some other organization method. In the meantime, they're now easily findable apart from main.asm's other content.
 2017-12-24 19:35:35 -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
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
yenatch c51968f0de Merge remote-tracking branch 'origin/master' into master 2017-12-23 17:14:09 -05: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 daa071451d More comments for constant<->table correspondences 2017-12-22 23:08:55 -05:00
Remy Oukaour fbf931f5d3 Ad some more constants for meaningful audio WRAM bits 2017-12-16 00:50:03 -05:00
Remy Oukaour 5aac8afae7 PLAYER_SLIP → PLAYER_SKATE (probably used for the beta skateboard; DoPlayerMovement.BikeCheck returns true for it) 2017-12-15 23:29:42 -05:00
Remy Oukaour f96aab4014 Correct some documentation comments 2017-12-15 21:32:43 -05:00
Remy Oukaour e44640b008 Move more main.asm code into individual files 2017-12-15 21:22:26 -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 ebf3bfb6b2 Move some misc/ files into meaningful directories 2017-12-15 12:53:33 -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 d6dc9351e9 Start documenting effect commands 2017-12-15 00:48:59 -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
surskitty d69d81f3a0 Fix the spelling of Thursday 2017-12-13 22:41:15 -05:00
Remy Oukaour 8745915dbd Rename the Onix trade house to match the rest 2017-12-13 18:07:00 -05:00
Remy Oukaour 0e7a101e41 Use constants for gender ratios 2017-12-13 17:59:14 -05:00
Remy Oukaour 10eb426e40 Document more bugs 2017-12-12 22:58:20 -05:00
Remy Oukaour c85587d973 Remove unused constant 
Fix typo
 2017-12-12 21:29:53 -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 065de03646 Separate sprite constants and sprite-related data constants, like Pokémon and maps 2017-12-12 01:06:23 -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 720cdc72b2 Comments distinguish "move effects" and "effect commands" 
Effect command enums are used like constants, not macros
 2017-12-11 17:41:18 -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 690442e31d Map dimensions are separate from other constants, same as pokemon_constants vs pokemon_data_constants 2017-12-11 16:51:12 -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 ec380e6df2 tilemap → tileset 2017-12-11 01:11:05 -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 08b14e593e Rename tilesets, consistent with constant names 2017-12-10 23:56:10 -05:00
Remy Oukaour b4261d27d8 Use new palette constants 2017-12-10 20:50:08 -05:00
Remy Oukaour a0bef01a1d Define more palette constants 2017-12-10 20:10:39 -05:00
Remy Oukaour 699495bfcb Consistent capitalization for map names, matching their constants 2017-12-10 13:37:15 -05:00
Remy Oukaour 7ccb11c903 Add constants for battle object colors 2017-12-09 22:07:52 -05:00
Remy Oukaour cd2a748128 More WRAM cleanup 2017-12-09 22:00:36 -05:00
Remy Oukaour 0b7d8d44ad More constants 2017-12-09 13:28:23 -05:00
Remy Oukaour 55d19b6dca Separate file for mobile constants 2017-12-09 12:57:42 -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
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
surskitty b6c1ceed80 Constants for Rocket Grunt rosters. 
Having constants rather than magic numbers should make it easier
to remove unused grunts from the roster.
 2017-11-27 00:35:10 -05:00
mid-kid df118afbca Move all of constants/sram_constants.asm into sram 
This way we can easily use `BANK()` where appropriate, and it is more
tidy.
 2017-11-20 23:07:24 +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
mid-kid 1bf12455e4 SelfDestruct -> Selfdestruct 
Just keeping things consistent. Nobody's going to write SELF_DESTRUCT.
Kind of subjective, and we could do it the other way around, if anybody
really cares.
 2017-11-18 17:28:12 +01:00
mid-kid fd14253796 Clean up labels in battle/moves/move_effects.asm 
There were a lot of unused labels in there, and a few confusing
misnomers around move_effects_pointers.asm. They now match up exactly
with the names in battle_constants.asm.
Also renamed a few effects, to make their purpose clearer, and to match
up with their respective event script commands:
EFFECT_EXPLOSION    -> EFFECT_SELFDESCTRUCT
EFFECT_HAZE         -> EFFECT_RESET_STATS
EFFECT_WHIRLWIND    -> EFFECT_FORCE_SWITCH
EFFECT_BIND         -> EFFECT_TRAP_TARGET
EFFECT_TWINEEDLE    -> EFFECT_POISON_MULTI_HIT
EFFECT_STEEL_WING   -> EFFECT_DEFENSE_UP_HIT
EFFECT_METAL_CLAW   -> EFFECT_ATTACK_UP_HIT
EFFECT_ANCIENTPOWER -> EFFECT_ALL_UP_HIT
 2017-11-15 16:36:13 +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
yenatch 866ca63c51 Fix a misleading define for SLP 2017-06-24 17:49:31 -04:00
hatschky f0209d6ed6 Labels for Trainer Rankings stat tracking functions 2017-01-16 21:11:34 +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 d84ebd2124 pitchoffset macro to replace forceoctave 2016-07-29 10:40:54 -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 d7a01e92e9 Remaining layout constants 2016-06-06 18:23:00 -04:00
pikalaxalt bfe2f6d52e Merge branch 'master' of https://github.com/pret/pokecrystal 2016-05-27 10:39:17 -04:00
Brandon Mulcahy 313e48d6d9 Switch labels for fast and slow exp groups 2016-05-23 16:55:20 -04:00
pikalaxalt 87b733994b SPRITE_ANIM_FRAME_IDX constants 2016-05-15 22:00:17 -04:00
pikalaxalt a5f5418fae Rename FixedWords to EZChat 2016-05-14 16:37:12 -04:00
pikalaxalt 1a84ca4e55 EZChat cursor object 2016-05-14 01:11:01 -04:00
pikalaxalt 5ea3a953c3 Name all link trade animation related functions 2016-05-13 22:46:32 -04:00
pikalaxalt af0119ca7e Name all printer functions 2016-05-11 17:16:03 -04:00
pikalaxalt f8c14d97e5 Pitch wheel 2016-05-10 14:33:24 -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 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
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
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 5b27af071c Add fish group constants. 2016-03-16 18:05:28 -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 d02c9e39dd BG pal constants, convert tileset pal maps to asm 2016-01-20 19:16:25 -05: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 3dcbe0ff55 Pokegear 2016-01-10 17:44:09 -05: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 e033ea3a37 commented pokedex more 2016-01-09 17:51:14 -08: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 2a263629a4 Item effects, post-battle, and decoration flags 2015-12-29 16:44:37 -05:00
PikalaxALT a2a2668233 Dummy Game 2015-12-28 17:09:53 -05:00