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

532 Commits

Author SHA1 Message Date
Rangi c5cc23a35f wGameTimerPause bit flag constants 2018-01-23 12:40:29 -05:00
Rangi fdda670f40 Cry headers and map headers were eliminated 2018-01-23 11:17:21 -05:00
Rangi 94ae404732 Separate data/mon_menu.asm 2018-01-23 10:46:26 -05:00
Rangi fc61d58dc4 Rename some more maps 
The Pokécom Center's .blk contains 1F and the Administration room, but the .asm script is just for the Admin room; 1F-related text and scripts are in GoldenrodPokecenter1F.asm. Presumably both map scripts shared the same .blk.
 2018-01-23 01:03:47 -05:00
Rangi 14cb5a3cb0 EcruteakHouse → EcruteakTinTowerEntrance 2018-01-23 00:30:07 -05:00
Rangi 0261bd2ff5 Daisy offers "grooming", not "massage" 2018-01-23 00:11:23 -05:00
Rangi 14ef9d3066 PALETTE_SIZE 2018-01-22 19:57:35 -05:00
Rangi a73c532738 tile+color macros in gfx.asm 2018-01-22 19:40:17 -05:00
Rangi 363d8b9242 KrissHouse → PlayersHouse 2018-01-22 19:10:09 -05:00
Rangi 7f187be36c Don't say "House" twice 2018-01-22 18:29:21 -05:00
Rangi f44b7ad5c3 Add data/text/ 2018-01-22 17:33:52 -05:00
Rangi cb5e3378de Move type data to data/types/ 2018-01-22 16:23:34 -05:00
Rangi efe6981a0d Add daily+weekly bit flags (close issue #429) 2018-01-22 15:59:24 -05:00
Rangi 3a7f518de4 wStatusFlags/2 bit constants 2018-01-22 15:40:43 -05:00
Rangi 4d8528f903 More engine flag constants 2018-01-22 14:34:55 -05:00
Rangi 125d51b3b2 More engine bit flag constants 2018-01-22 13:57:44 -05:00
Rangi e135091f09 Day-Care bit flags 2018-01-22 13:18:23 -05:00
Rangi 7cef012335 wUnlockedUnowns engine flag constants 
Use local labels for "End"ings
 2018-01-22 13:00:35 -05:00
Rangi 6ecf18aa52 Engine flag bit constants for wPokegearFlags 2018-01-22 12:03:18 -05:00
Rangi 9e8f33d605 Cleaner roammon and treemon data 2018-01-22 11:30:17 -05:00
Remy Oukaour 05382d3e3c PARTY_LENGTH; MON_NAME; sgb_border.bin 2018-01-20 12:25:55 -05:00
Remy Oukaour 8127d1fbcf Rename BATTLETOWER_NROF constants 2018-01-20 12:05:16 -05:00
Remy Oukaour 0c6338836d Resolve #471 (although link code still needs more cleanup, like its WRAM labels) 2018-01-19 14:49:43 -05:00
Remy Oukaour c861ff5af3 This table entry has the address of MoveDescriptions in GSC ($4000 in G/S, $4b52 in Crystal) 2018-01-19 00:42:31 -05:00
Remy Oukaour 9576740b70 clean up GetName/NamesPointers 2018-01-19 00:29:05 -05:00
Remy Oukaour 25048bd12d wiggle → wobble 2018-01-19 00:16:08 -05:00
Remy Oukaour 2acaa96cf1 More charmap and home/text.asm documentation for JP chars 2018-01-18 18:34:20 -05:00
Remy Oukaour d82127b23c SGB MON_NITE colors 2018-01-18 16:19:09 -05:00
Remy Oukaour 72c4f9e04a More constants, related to map objects 2018-01-18 15:58:55 -05:00
Remy Oukaour 3bf8325edd More accurate constant/label names 2018-01-18 15:06:43 -05:00
Remy Oukaour 69ace7f48d Identify leftover SGB palettes from R/B 2018-01-18 12:31:19 -05:00
Remy Oukaour 22fd1221f5 More .pal files 2018-01-18 11:37:05 -05:00
Remy Oukaour 226d1812b3 Only graphics data goes in gfx/ 
Introduce PALRGB_WHITE constant for $7fff
 2018-01-18 11:16:24 -05:00
Remy Oukaour 0306e94cc3 More SGB documentation 2018-01-18 00:16:03 -05:00
Remy Oukaour c5d9ecae9c More SGB documentation 2018-01-17 22:48:57 -05:00
Remy Oukaour 4161ec98b4 Partially document SGB data from pokered 2018-01-17 22:37:04 -05:00
Remy Oukaour b1c808f9f8 Rename some tilesets (close #467) 2018-01-17 14:50:34 -05:00
Remy Oukaour 8f092adf41 mapgroup → mapconst 2018-01-17 00:07:05 -05:00
Remy Oukaour e2ac753da1 No redundant filename prefixes 2018-01-17 00:00:43 -05:00
Remy Oukaour bf074f3598 map_header → map_def; map_header_2 → map_data 2018-01-16 23:25:00 -05:00
Remy Oukaour 94bbfe2f0c Move map-related "metadata" files into data/maps/ 2018-01-16 19:56:21 -05:00
Remy Oukaour 7b3de85a06 Avoid "+- 1" at every maskbits 2018-01-16 17:27:50 -05:00
Remy Oukaour 2b82338920 Phone data 0/7 are time masks 2018-01-15 22:00:56 -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 8e1e583640 Close #470 (JOHTO_POKEMON) 2018-01-14 20:58:49 -05:00
Remy Oukaour eb3102200f More Battle Tower map script constants, fewer raw hex values 2018-01-14 19:26:55 -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 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 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 bdc95598d7 Easier to find palette data 2018-01-12 03:07:48 -05:00
Remy Oukaour 1f5cc28db7 Comment on VAR_* constants 2018-01-12 02:36:14 -05:00
Remy Oukaour 2b4a4ccaab SaffronMagnetTrainStation 2018-01-12 02:33:06 -05:00
Remy Oukaour d83aefb30a Use more constants in scripts 2018-01-12 02:27:42 -05:00
Remy Oukaour af4001132e Break up engine/events_3.asm 2018-01-11 23:50:44 -05:00
Remy Oukaour 2085ebcc61 maskbits for NUM_FRAMES 2018-01-11 23:04:50 -05:00
Remy Oukaour 163f3e0c3f Local UI tiles don't belong in charmap 
Separate 1bpp font tiles from gfx/mobile/phone_tiles.png
 2018-01-11 22:49:45 -05:00
Remy Oukaour 17f34cb29c Disambiguate some uses of wcf64/5/6 2018-01-11 15:36:11 -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 1a2bc57841 Event script–related constants go in constants/script_constants.asm 2018-01-11 02:35:46 -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 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 c8575823a0 Battle data goes in data/battle/ 
TreeMons, like fish groups, have constants
 2018-01-10 17:30:27 -05:00
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