Commit Graph

222 Commits

Author SHA1 Message Date
Remy Oukaour
c8575823a0 Battle data goes in data/battle/
TreeMons, like fish groups, have constants
2018-01-10 17:30:27 -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
7de7441e72 gfx/*.asm files have INCBINs 2018-01-10 02:38:45 -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
e943ac3308 Clarify doc comment 2018-01-09 23:26:04 -05:00
Remy Oukaour
5c5f8b325f Move data/palettes/ .pal files into gfx/ 2018-01-09 23:21:32 -05:00
Remy Oukaour
f22485b08d Binary tilemaps 2018-01-09 22:44:06 -05:00
Remy Oukaour
feb34b49ba data/phone_text → data/phone/text 2018-01-09 19:51:30 -05:00
Remy Oukaour
cc0fd6e12c CRYSTAL11 → _CRYSTAL11 2018-01-09 17:26:40 -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
a3242b4ad4 Simpler comments 2018-01-09 15:23:03 -05:00
Remy Oukaour
cb92b7bbf0 Indent with tabs 2018-01-09 15:20:21 -05:00
Remy Oukaour
5a73a62d9b Move battle engine data into data/
IsJohtoGymLeader → IsGymLeader
2018-01-09 15:12:49 -05:00
Remy Oukaour
459d5d3164 default_names.asm → player_names.asm 2018-01-09 00:45:03 -05:00
Remy Oukaour
d0a8e8e744 includes.asm → constants.asm 2018-01-09 00:36:15 -05:00
Remy Oukaour
31edd7f803 Move text/ into data/ 2018-01-09 00:23:48 -05:00
Remy Oukaour
187196ff80 Macro clarifies how TimeFishGroups works 2018-01-08 15:54:58 -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
Adelaide Walter
51106cccd0 Scrub WRAM addresses from comments & use WRAM1_Begin where appropriate. 2018-01-03 00:19:54 -05:00
Remy Oukaour
b0d2409c83 Move EZChat Pokémon order to data/ 2018-01-02 23:21:07 -05:00
Remy Oukaour
e3e885aad8 pngcrush -noreduce 2018-01-02 19:19:23 -05:00
Remy Oukaour
41de67edbd Identify more G/S intro OAM data 2018-01-02 17:05:40 -05:00
Remy Oukaour
e6778f931d town_map.png matches pokegear.png 2018-01-02 16:45:39 -05:00
Remy Oukaour
ae78ee6cc8 One more G/S intro OAM identified 2018-01-02 16:19:04 -05:00
Remy Oukaour
d5c8cb7496 Align comments 2018-01-02 16:09: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
xCrystal
d7970f749a Consistent predef function names 2018-01-02 18:49:25 +01:00
xCrystal
7c0e903c48 Clean up leftover code from main.asm 2018-01-02 16:25:40 +01:00
xCrystal
9a3088e50c Clean up XXX comments for unused content 2018-01-02 13:26:18 +01:00
Remy Oukaour
3c953efcba Consistent *_palette_map.asm 2018-01-01 18:33:42 -05:00
Remy Oukaour
0722de77ae Remove trailing whitespace
find . -name '*.asm' -exec sed -i 's/[ \t]\+$//' {} \;
2018-01-01 18:32:01 -05:00
Remy Oukaour
eb8e55a01a Route 17-18 Gate and Route 29-46 Gate 2018-01-01 18:19:32 -05:00
yenatch
8c3905c4cd
Merge pull request #451 from yenatch/document-battle-anim-macros
Fix and document some battle animation macros
2018-01-01 12:47:28 -05:00
yenatch
cc5aeb8b87 Fix anim_obj x/y values
- negative values have no meaning
- left in optional tile x/y for backwards compatibility
2017-12-29 13:43:17 -05:00
Remy Oukaour
ab823e2b54 FAST_TEXT_DELAY_F 2017-12-29 13:29:24 -05:00
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