Commit Graph

414 Commits

Author SHA1 Message Date
Remy Oukaour
bc79f17b9d More maskbits 2018-01-10 13:59:07 -05:00
Remy Oukaour
417937cffc Resolve #461 2018-01-10 13:47:57 -05:00
Remy Oukaour
cc95d1208d Use maskbits more, and clarify its usage 2018-01-10 11:57:28 -05:00
Remy Oukaour
22b607b664 Move radio channel data into data/ 2018-01-10 11:30:12 -05:00
Remy Oukaour
16eb97ae9c Constant swap explains this Battle Tower bug 2018-01-10 02:55:44 -05:00
Remy Oukaour
8aa58dca9e Specialized macros go with their data/code 2018-01-10 00:08:05 -05:00
Remy Oukaour
9af6d8d0f1 Split tilesets/ into gfx/tilesets and data/tilesets/ 2018-01-09 23:53:58 -05:00
Remy Oukaour
feb34b49ba data/phone_text → data/phone/text 2018-01-09 19:51:30 -05:00
Remy Oukaour
2f0973f3e0 Clean up some hex values in map scripts 2018-01-09 18:45:25 -05:00
Remy Oukaour
fbc353f206 Replace some hex constants 2018-01-09 18:08:40 -05:00
Remy Oukaour
a8cf8979d9 Do a little cleanup towards issue #465 2018-01-09 17:20:47 -05:00
Remy Oukaour
ce50d1b2cb Clearer Battle Tower code 2018-01-09 16:55:11 -05:00
Remy Oukaour
a849c3557b More comments
Fix some constants
2018-01-09 15:39:48 -05:00
Remy Oukaour
05e5eaf12f Eliminate version.asm (resolves #464) 2018-01-09 00:51:53 -05:00
Remy Oukaour
bdd3a55333 Organize mobile/battle_tower_*.asm data and code 2018-01-06 18:53:30 -05:00
Remy Oukaour
10bd011d06 More relevant data file locations 2018-01-03 02:23:54 -05:00
Remy Oukaour
8d095cd5b8 Better names 2018-01-03 01:27:12 -05:00
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