Remy Oukaour
81ba6c848a
cgb layouts
2018-01-21 14:05:32 -05:00
Remy Oukaour
a8eb44b6e3
Separate new_game graphics
2018-01-21 13:58:16 -05:00
Remy Oukaour
01ba6bed88
Move code out of data/
2018-01-16 18:07:06 -05:00
Remy Oukaour
9180362211
Move code out of gfx/ ( close #474 )
2018-01-15 11:06:32 -05:00
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