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

1426 Commits

Author SHA1 Message Date
Remy Oukaour fe3ef73a8c Group unused data 2018-01-15 00:44:40 -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
Remy Oukaour 0e1148fb2c Move code out of data/ 2018-01-12 03:15:58 -05:00
Remy Oukaour af4001132e Break up engine/events_3.asm 2018-01-11 23:50:44 -05:00
Remy Oukaour cc8dac5a22 Use constants and data for Unown chamber events 2018-01-11 00:25:14 -05:00
Remy Oukaour e0088adb3f Other files belong in data/battle/ 2018-01-10 17:49:19 -05:00
Remy Oukaour 417937cffc Resolve #461 2018-01-10 13:47:57 -05:00
Remy Oukaour 7de7441e72 gfx/*.asm files have INCBINs 2018-01-10 02:38:45 -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 cc0fd6e12c CRYSTAL11 → _CRYSTAL11 2018-01-09 17:26:40 -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 bdd3a55333 Organize mobile/battle_tower_*.asm data and code 2018-01-06 18:53:30 -05:00
xCrystal 7c0e903c48 Clean up leftover code from main.asm 2018-01-02 16:25:40 +01:00
xCrystal 6f0b81504d More unreferenced labels cleanup 2018-01-02 16:04:21 +01:00
Remy Oukaour b9a68fec25 Consistent if/else/endc (matches rept/endr) and DEF (matches BANK/HIGH/LOW) 2017-12-28 22:13:39 -05:00
Remy Oukaour b373984ab9 Rename pokemon animation files (fix #439) 2017-12-28 11:05:42 -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 172dba3c0b Rename some sections 
engine/battle_tower.asm fits better in events/
 2017-12-26 22:57:19 -05:00
Remy Oukaour dae16acd6f event/ → events/, and move some appropriate engine/ files there 2017-12-26 21:55:57 -05:00
Remy Oukaour 8259136911 Name mail graphics 2017-12-26 20:02:00 -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 da2b01a36c Clean up color/palette code 2017-12-25 12:41:31 -05:00
Remy Oukaour c6b12b07b3 Group Pokérus files in engine/pokerus/ 2017-12-24 20:11:03 -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 040aa7cb17 LoadEDTile → CopyTilemapAtOnce (fix #345) 2017-12-24 18:11:17 -05:00
Remy Oukaour 9973e43d5a Fix issue #345: 
- GetMonFrontpic → GetEnemyMonFrontpic
- GetMonBackpic → GetBattleMonBackpic
- FrontpicPredef → GetAnimatedFrontpicPredef
- GetFrontpic → GetMonFrontpic
- GetBackpic → GetMonBackpic
- CutAndPasteMap → PadMapForHDMATransfer
 2017-12-24 15:03:20 -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 c66d195089 callba/callab → farcall/callfar 2017-12-24 12:47:30 -05:00
yenatch c51968f0de Merge remote-tracking branch 'origin/master' into master 2017-12-23 17:14:09 -05:00
Remy Oukaour 25a3960646 Move some more main.asm routines into individual files 2017-12-16 19:00:50 -05:00
Remy Oukaour 05d49f7d75 Move more code out of main.asm 2017-12-16 12:49:43 -05:00
Remy Oukaour cbde91d7ed Only engine/decorations.asm uses PadCoords_de 2017-12-15 23:59:24 -05:00
surskitty c883ab4d34 Reorganising phone stuff. 2017-12-15 23:06:53 -05:00
Remy Oukaour e44640b008 Move more main.asm code into individual files 2017-12-15 21:22:26 -05:00
Remy Oukaour 1038ebca5e Move more contiguous related code blocks from main.asm to engine/ and events/ 2017-12-15 20:10:54 -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 fecc5c339a More comments for macros 2017-12-15 00:38:52 -05:00
Remy Oukaour 6ba30e593e Macro-ify the unused palette map 2017-12-14 23:35:08 -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
surskitty 771c4a7e05 Splitting phone scripts up. 2017-12-13 22:30:37 -05:00
Remy Oukaour 0e7a101e41 Use constants for gender ratios 2017-12-13 17:59:14 -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 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 e6f6a75330 Move the rest of gfx/misc/ into specific directories 2017-12-11 17:51:04 -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 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 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 a551e345df PokeCenter → Pokecenter (consistent with the POKECENTER map constants) 2017-12-10 22:34:42 -05:00
Remy Oukaour fba44a5929 Single files for tilesets/data.asm and maps/blockdata.asm 2017-12-10 13:53:02 -05:00
Remy Oukaour d554b997c5 Use correct WRAM labels for intro/title scenes 
Remove outdated WRAM alias comments
 2017-12-10 00:18:29 -05:00
Remy Oukaour ab7025a144 Consistent code formatting: no redundant `a`s and spaces after commas 2017-12-10 00:06:20 -05:00
Remy Oukaour 31901f73b0 Move some gfx/misc/ files into meaningful directories 2017-12-09 22:57:41 -05:00
Remy Oukaour cd2a748128 More WRAM cleanup 2017-12-09 22:00:36 -05:00
Remy Oukaour e3c686f6df Further WRAM organization 2017-12-09 15:14:51 -05:00
Remy Oukaour 6a41d4f63e Define more charmap characters and use them in place of hard-coded numbers 2017-12-09 12:57:23 -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 359d73ceef Move LoadOverworldFont to main.asm 
It doesn't fit correctly in misc/mobile_41.asm.
Also moved the font images out of gfx/unknown and into gfx/font.
 2017-11-21 23:53:51 +01:00
mid-kid 23445ba4be Define bank43 in main.asm instead of unused_title 
All other banks are defined in main.asm as well, and it's confusing how
the build breaks when you try to remove this unused file.
 2017-11-16 23:24:30 +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 080704e49f Merge pull request #370 from yenatch/graphics 
png everywhere
 2017-06-24 17:36:21 -04:00
yenatch a20664d415 Fix gfx/misc 2017-06-24 16:30:12 -04:00
Ben10do e6ea1889fb
Replace ‘jp [hl]’ with ‘jp hl’ 
The former is arguably misleading (as you don’t access the memory location in hl to retrieve the jump location), and is consequently deprecated in newer versions of rgbds.

This fix silences these deprecation warnings.
 2017-06-09 22:01:10 +01: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
hatschky f0209d6ed6 Labels for Trainer Rankings stat tracking functions 2017-01-16 21:11:34 +00:00
pikalaxalt 4e2487c056 hLCDCPointer and InitList 2016-06-13 22:53:33 -04:00
pikalaxalt d7a01e92e9 Remaining layout constants 2016-06-06 18:23:00 -04:00
pikalaxalt 98f443f70c engine/events.asm labels finished 
fixed palred/green/blue macros
 2016-05-17 08:40:56 -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 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 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 a613ed915c HDMA transfer functions 2016-05-04 22:34:09 -04:00
pikalaxalt 3713b71d9e More splitting of main.asm; remove unneeded rept 2 2016-05-04 11:46:23 -04:00
pikalaxalt 82f1534925 Copycat labels; macro for the Crystal-only Unown chamber unlock words 2016-04-30 21:20:12 -04:00
pikalaxalt 6be4cd4da9 Local labels starting with lowercase letters are no longer decorated with a trailing colon 2016-04-10 15:01:49 -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 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