Remy Oukaour
3dcc0066a5
Comments help find map_data.asm
2018-01-16 23:55:33 -05:00
Remy Oukaour
bf074f3598
map_header → map_def; map_header_2 → map_data
2018-01-16 23:25:00 -05:00
Remy Oukaour
3d0e1819e9
0/1 → FALSE/TRUE, with correct comment
2018-01-16 20:56:08 -05:00
Remy Oukaour
94bbfe2f0c
Move map-related "metadata" files into data/maps/
2018-01-16 19:56:21 -05:00
Remy Oukaour
01ba6bed88
Move code out of data/
2018-01-16 18:07:06 -05:00
Remy Oukaour
7b3de85a06
Avoid "+- 1" at every maskbits
2018-01-16 17:27:50 -05:00
Remy Oukaour
8048082114
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 14:39:28 -05:00
Remy Oukaour
2b82338920
Phone data 0/7 are time masks
2018-01-15 22:00:56 -05:00
Remy Oukaour
9fb74161e5
Comments
2018-01-15 14:39:53 -05:00
Remy Oukaour
6c7e88513a
Long lists of db/dw series with struct-defining macros belong in data/
2018-01-15 14:11:11 -05:00
Remy Oukaour
fe3ef73a8c
Group unused data
2018-01-15 00:44:40 -05:00
Remy Oukaour
07b8fe2983
G/S does use this OAM data: https://i.imgur.com/KdIhKKk.png
2018-01-15 00:21:41 -05:00
Remy Oukaour
14c8cf5b48
Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452 )
...
# Conflicts:
# data/player_names.asm
# engine/battle/menu.asm
# engine/billspc.asm
# engine/billspctop.asm
# engine/buy_sell_toss.asm
# engine/decorations.asm
# engine/delete_save_change_clock.asm
# engine/events/buena.asm
# engine/events/elevator.asm
# engine/events/kurt.asm
# engine/events/mom.asm
# engine/events/move_tutor.asm
# engine/events/pokecenter_pc.asm
# engine/events/pokepic.asm
# engine/events/std_scripts.asm
# engine/events/unown_walls.asm
# engine/init_gender.asm
# engine/intro_menu.asm
# engine/mail.asm
# engine/main_menu.asm
# engine/mart.asm
# engine/menu_2.asm
# engine/mon_menu.asm
# engine/pack.asm
# engine/slot_machine.asm
# engine/start_menu.asm
# home/menu.asm
# maps/CeladonDeptStore6F.asm
# maps/CeladonGameCornerPrizeRoom.asm
# maps/DragonShrine.asm
# maps/EarlsPokemonAcademy.asm
# maps/GoldenrodCity.asm
# maps/GoldenrodDeptStore6F.asm
# maps/GoldenrodGameCorner.asm
# maps/GoldenrodPokeComCenter2FMobile.asm
# mobile/mobile_12.asm
# mobile/mobile_12_2.asm
# mobile/mobile_22.asm
# mobile/mobile_22_2.asm
# mobile/mobile_40.asm
# mobile/mobile_45.asm
# mobile/mobile_45_sprite_engine.asm
# mobile/mobile_46.asm
# mobile/mobile_5c.asm
# mobile/mobile_5f.asm
# mobile/mobile_menu.asm
2018-01-14 23:43:51 -05:00
Remy Oukaour
dfcca93b45
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460 )
...
# Conflicts:
# engine/battle/core.asm
# engine/save.asm
2018-01-14 23:00:22 -05:00
Remy Oukaour
5c28d05bb4
Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459 )
...
# Conflicts:
# data/items/descriptions.asm
# data/sprite_anims/framesets.asm
# engine/crystal_colors.asm
# engine/events/kurt.asm
# engine/events/special.asm
# engine/events/std_scripts.asm
# engine/events_3.asm
# engine/item_effects.asm
# engine/namingscreen.asm
# engine/scripting.asm
# engine/stats_screen.asm
# engine/trade_animation.asm
# home/audio.asm
# main.asm
# maps/BattleTower1F.asm
# maps/BattleTowerBattleRoom.asm
# maps/BurnedTowerB1F.asm
# maps/ElmsLab.asm
# maps/GoldenrodDeptStore5F.asm
# maps/GoldenrodUnderground.asm
# maps/HallOfFame.asm
# maps/MahoganyTown.asm
# maps/ManiasHouse.asm
# maps/MobileBattleRoom.asm
# maps/MobileTradeRoomMobile.asm
# maps/RadioTower2F.asm
# maps/Route35NationalParkGate.asm
# maps/Route36NationalParkGate.asm
# maps/Route39Farmhouse.asm
# tilesets/palette_maps.asm
2018-01-14 22:56:36 -05:00
mid-kid
11d67567d2
Use constants for menu flags
...
Added a bunch of constants for the bitflags of each kind of menu. Some
are slightly vague or too long, but I'm not sure how to else name them.
2018-01-14 11:59:56 +01:00
Remy Oukaour
2ab60fa8a4
menu_coords macro for (x1, y1, x2, y2) order (see issue #440 )
2018-01-13 16:38:14 -05:00
Remy Oukaour
d054116458
Merge branch 'patch' of https://github.com/mid-kid/pokecrystal
...
# Conflicts:
# constants/sprite_anim_constants.asm
# data/sprite_anims/framesets.asm
# data/sprite_anims/oam.asm
2018-01-12 17:23:50 -05:00
Remy Oukaour
bc22bf2627
Egg palette works like other Pokémon
2018-01-12 15:06:25 -05:00
Remy Oukaour
960783cdf4
Label more ANIM_OBJ_* constants
2018-01-12 13:47:04 -05:00
mid-kid
5b7773b7d3
Label frameset 09
...
It seems to be used as the "big" text entry cursor (i.e. for the bottom
3 buttons in the text entry screen).
It is never referenced explicitly, instead used when adding 1 to
SPRITEANIMSTRUCT_0E, in NamingScreen_AnimateCursor.
2018-01-12 12:17:55 +01:00
Remy Oukaour
0e1148fb2c
Move code out of data/
2018-01-12 03:15:58 -05:00
Remy Oukaour
bdc95598d7
Easier to find palette data
2018-01-12 03:07:48 -05:00
Remy Oukaour
2b4a4ccaab
SaffronMagnetTrainStation
2018-01-12 02:33:06 -05:00
Remy Oukaour
af4001132e
Break up engine/events_3.asm
2018-01-11 23:50:44 -05:00
Remy Oukaour
94d6a32721
Use maskbits some more
2018-01-11 14:27:19 -05:00
Remy Oukaour
a436bbc23b
Move party menu qualities to data/
2018-01-11 02:54:07 -05:00
Remy Oukaour
16a39f655a
Full sentences
2018-01-11 02:44:47 -05:00
Remy Oukaour
2d0506ecf9
Group item and deco data more
2018-01-11 01:54:49 -05:00
Remy Oukaour
b45f89f80c
More constants and data tables
2018-01-11 01:45:27 -05:00
Remy Oukaour
cc8dac5a22
Use constants and data for Unown chamber events
2018-01-11 00:25:14 -05:00
Remy Oukaour
3b7c495e38
No romaji
2018-01-10 23:36:49 -05:00
Remy Oukaour
532724e90f
Comment on the original function of move grammar
2018-01-10 23:29:47 -05:00
Remy Oukaour
0a3b251dcb
Arrays end with -1, not $ff
2018-01-10 22:53:42 -05:00
Remy Oukaour
d91e42ca5e
Group some mutually edited files in data/sprites/
2018-01-10 18:10:01 -05:00
Remy Oukaour
e0088adb3f
Other files belong in data/battle/
2018-01-10 17:49:19 -05:00
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
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
