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
Remy Oukaour
7a09fc9f75
GFX tile sizes in decimal
2018-01-14 19:43:35 -05:00
Remy Oukaour
0197e6f23c
Don't split stats gfx in three
2018-01-13 15:22:16 -05:00
Remy Oukaour
5a8700c56a
Add missing file
2018-01-12 16:47:42 -05:00
Remy Oukaour
be4510659a
Mystery Gift graphics match
2018-01-12 15:30:46 -05:00
Remy Oukaour
9b19817854
Comments explain colors
2018-01-12 15:26:06 -05:00
Remy Oukaour
bc22bf2627
Egg palette works like other Pokémon
2018-01-12 15:06:25 -05:00
Remy Oukaour
f1e1b26138
More gfx/**/*.pal files
2018-01-12 14:54:00 -05:00
Remy Oukaour
31caeeba3c
Separate more palettes into gfx/**/*.pal files
2018-01-12 14:41:42 -05:00
Remy Oukaour
bdc95598d7
Easier to find palette data
2018-01-12 03:07:48 -05:00
Remy Oukaour
c6a4d35d57
npc_sprites.pal matches PAL_NPC constants
2018-01-12 02:56:14 -05:00
Remy Oukaour
b23085f526
Missed graphics
2018-01-11 23:51:43 -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
68e5a703cb
Resize SGB graphics
2018-01-11 02:10:06 -05:00
Remy Oukaour
b45f89f80c
More constants and data tables
2018-01-11 01:45:27 -05:00
Remy Oukaour
d91e42ca5e
Group some mutually edited files in data/sprites/
2018-01-10 18:10:01 -05:00
Remy Oukaour
7de7441e72
gfx/*.asm files have INCBINs
2018-01-10 02:38:45 -05:00
Remy Oukaour
ee4ec65fc1
map_objects.pal is easier to find in gfx/overworld/ than gfx/sprites/
2018-01-10 02:30:17 -05:00
Remy Oukaour
8334c3c998
Newline
2018-01-10 00:18:06 -05:00
Remy Oukaour
9af6d8d0f1
Split tilesets/ into gfx/tilesets and data/tilesets/
2018-01-09 23:53:58 -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
fbc353f206
Replace some hex constants
2018-01-09 18:08:40 -05:00
Remy Oukaour
d0a8e8e744
includes.asm → constants.asm
2018-01-09 00:36:15 -05:00
Adelaide Walter
9d0ba6bfd3
Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary).
2018-01-03 19:12:45 -05:00
Remy Oukaour
0b6857b1a9
lava in gym_1 > fountain in unused safari zone
2018-01-03 02:16:25 -05:00
Remy Oukaour
bc83768d81
Tileset images are 128px wide
2018-01-03 02:02:15 -05:00
Remy Oukaour
41feb29680
Make some graphics easier to edit
2018-01-02 19:33:27 -05:00
Remy Oukaour
e3e885aad8
pngcrush -noreduce
2018-01-02 19:19:23 -05:00
Remy Oukaour
eb110edae3
Arrange pichu.png like the rest
2018-01-02 19:00:22 -05:00
Remy Oukaour
e6778f931d
town_map.png matches pokegear.png
2018-01-02 16:45:39 -05:00
xCrystal
b4e087167f
More unreferenced labels and unused text
2018-01-02 19:38:56 +01:00
xCrystal
d7970f749a
Consistent predef function names
2018-01-02 18:49:25 +01:00
xCrystal
3c6c80f1b2
LY_BLANK and rLCDC constants
2017-12-29 18:53:21 +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
Remy Oukaour
b373984ab9
Rename pokemon animation files ( fix #439 )
2017-12-28 11:05:42 -05:00
xCrystal
333524f0be
Lowercase v for VRAM addresses
2017-12-28 13:32:33 +01: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
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
yenatch
25ddc72851
Merge pull request #422 from mid-kid/footprints
...
Split all of the footprints
2017-12-24 20:30:10 -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
4e5fd7a521
Merge branch 'master' of https://github.com/pret/pokecrystal
2017-12-24 14:33:37 -05:00
yenatch
8a8b96138b
remove redundant 2bpp/1bpp files
2017-12-24 13:58:17 -05:00
Remy Oukaour
c66d195089
callba/callab → farcall/callfar
2017-12-24 12:47:30 -05:00
mid-kid
6158eb0829
Split all of the footprints
...
Split all the footprints into separate files in `gfx/footprints/`. Makes them
easier to edit and find for most people.
2017-12-24 14:40:48 +01:00
Remy Oukaour
25a3960646
Move some more main.asm routines into individual files
2017-12-16 19:00:50 -05:00
Remy Oukaour
aa44ecfc4f
Consolidate duplicate graphics
2017-12-16 12:09:16 -05:00
Remy Oukaour
fa98c29fa4
Add more palettes to data/palettes/
2017-12-15 22:36:33 -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
2cf5cc1dc7
Move more unknown graphics into real subfolders
2017-12-15 17:50:45 -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
e48a401290
Reorganize macros
2017-12-14 00:36:24 -05:00
Remy Oukaour
48e40a7f09
Identify some SPRITE_ANIM_FRAME_IDX_* constants
2017-12-12 02:31:14 -05:00
Remy Oukaour
c3f423e30f
Sprite headers and trainer palettes don't have pointer tables, so they don't need individual labels
2017-12-11 23:05:26 -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
dc4357b7fa
"Pic Pointers" and "Unown Pic Pointers" must start at the same address
...
Use `|` not `+` to combine bitmasks
2017-12-11 18:39:39 -05:00
Remy Oukaour
2d644f5077
Name some gfx/unknown/ files
2017-12-11 18:04:23 -05:00
Remy Oukaour
e6f6a75330
Move the rest of gfx/misc/ into specific directories
2017-12-11 17:51:04 -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
c2ad79c4f2
Add constants for time-of-day boundaries
...
Split off more misc constants into proper files
2017-12-11 12:20:01 -05:00
Remy Oukaour
c6fefd0fe8
Rename overworld sprite files, consistent with their constants
2017-12-11 00:17:39 -05:00
Remy Oukaour
08b14e593e
Rename tilesets, consistent with constant names
2017-12-10 23:56:10 -05:00
Remy Oukaour
32ea595c47
Move some gfx/unknown/ files into meaningful directories
2017-12-09 23:37:08 -05:00
Remy Oukaour
31901f73b0
Move some gfx/misc/ files into meaningful directories
2017-12-09 22:57:41 -05:00
Remy Oukaour
5a5df2ab87
More WRAM organization
2017-12-09 14:47:32 -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
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
pfero
999c804f6f
Label some functions in gfx/load_pics.asm
...
A few projects I looked around in used these same labels for these
functions, and it looks like they describe these functions properly.
Also fixed usage of BANK() in a few places.
2017-11-03 01:12:16 +01:00
yenatch
afe67ba1b4
Remove contents.asm
2017-09-24 03:15:01 -04: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
surskitty
817525a811
Labelling kanji for the days of the week (calendar?)
2017-09-09 23:58:23 -04:00
surskitty
5476e2914b
Renaming the image of the GB and the N64.
2017-09-09 23:53:05 -04:00
surskitty
bc61a0ca05
Moving headbutt tree graphic.
2017-09-09 23:43:28 -04:00
yenatch
080704e49f
Merge pull request #370 from yenatch/graphics
...
png everywhere
2017-06-24 17:36:21 -04:00
yenatch
a749057b27
Fix gfx/frames
2017-06-24 16:28:50 -04:00
yenatch
803c5154f4
pngs in gfx/unknown
2017-06-24 16:27:52 -04:00
yenatch
131bda73bc
pngs in gfx/misc
2017-06-24 02:50:42 -04:00
yenatch
89cb46a64d
pngs in gfx/mobile
2017-06-24 00:53:38 -04:00
yenatch
afc6f8033b
forgot to remove 2bpp from gfx/tilesets
2017-06-24 00:50:33 -04:00
yenatch
65809032bf
forgot to remove 2bpp from gfx/intro
2017-06-24 00:49:37 -04:00
yenatch
41ae3610f6
pngs in gfx/fx
...
- gave up on wind.png
- add --remove-yflip
2017-06-24 00:47:55 -04:00
yenatch
f42e731d76
pngs in gfx/battle
2017-06-23 20:00:11 -04:00
yenatch
1f81d1851f
pngs in gfx/
2017-06-23 19:56:24 -04:00
yenatch
a540926345
pngs in gfx/unown_puzzle
2017-06-22 23:53:57 -04:00
yenatch
89093e4670
pngs in gfx/trainers
2017-06-22 23:46:58 -04:00
yenatch
31d9c1fffa
pngs in gfx/trade
...
game_boy.png can be rearranged in a nicer way, but it's a job for another time
2017-06-22 23:45:45 -04:00
yenatch
647f9b4452
pngs in gfx/title
2017-06-21 23:45:01 -04:00
yenatch
967b0898a9
pngs in gfx/tilesets
2017-06-21 00:28:48 -04:00
yenatch
1fee4eb003
pngs in gfx/stats
2017-06-21 00:14:21 -04:00
yenatch
5738567985
pngs in gfx/splash
2017-06-21 00:13:09 -04:00
yenatch
2e0344e63d
pngs in gfx/special/celebi
2017-06-21 00:12:01 -04:00
yenatch
99f6249de8
pngs in gfx/pokegear
...
- flymap_label_border.2bpp was actually 1bpp
2017-06-21 00:11:29 -04:00
yenatch
f10ed64d1a
pngs in gfx/pokedex
2017-06-20 23:42:29 -04:00
yenatch
384788f370
pngs in gfx/mail
2017-06-18 00:13:03 -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
yenatch
f4071b2ce7
pngs in gfx/icon
2017-06-08 22:28:19 -04:00
yenatch
a45b56a8c1
pngs in gfx/frames
2017-06-08 22:26:33 -04:00
yenatch
71b51b7f19
pngs in gfx/{debug,emotes,evo,font,intro}
2017-06-08 22:21:12 -04:00
yenatch
cd159dcf39
pngs in gfx/overworld
2017-06-04 21:06:36 -04:00
yenatch
2dc6dd7584
Remove the now-generated animation data.
2017-05-28 23:35:08 -04:00
yenatch
1c7d4954cd
Change the compression hash for Girafarig's sprite.
2017-05-28 23:26:04 -04:00
yenatch
f748d34aa3
Merge remote-tracking branch 'origin/master' into c-tools
2017-05-28 14:15:22 -04:00
yenatch
e9c1d24c31
Add Pokemon pic pngs.
...
Copies of the matching compressed files are kept, so files with a matching hash will use the matching compressed file instead.
This is the best that can be done until the compressor is fixed, which may never happen.
2017-05-28 14:03:13 -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
Scott Norton
a32b6ccbb5
These are actually .1bpp files
2016-06-25 20:19:52 -04:00
Scott Norton
d5a39e4b67
Add missing gfx/unknown/16c903.pal
2016-06-25 18:10:08 -04:00
pikalaxalt
e515543500
Name all functions in gfx/pics/animation.asm
2016-05-15 23:56:09 -04:00
pikalaxalt
5ea3a953c3
Name all link trade animation related functions
2016-05-13 22:46:32 -04:00
pikalaxalt
295604cbb5
Placeholder non-generic names for engine/color functions
2016-05-11 09:49: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
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
5d94fb22ed
Add missing wind.2bpp.lz
2016-04-18 07:56:15 -04:00
pikalaxalt
0bcd725e6a
Finish renaming battle anim gfx pointers and files
2016-04-10 17:16:08 -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
5322b56a83
Add more missing files
2016-01-29 00:57:06 -05:00
PikalaxALT
2ed6c357af
More WRAM tidying
2016-01-12 12:46:18 -05:00
PikalaxALT
3dcbe0ff55
Pokegear
2016-01-10 17:44:09 -05:00
PikalaxALT
987ed1fafb
More work on slots; WRAM cleanup, Move Deleter
2015-12-19 14:48:30 -05:00
PikalaxALT
3d36f1a837
Events and some WRAM cleanup
2015-12-18 20:07:09 -05:00
PikalaxALT
efee40447e
Mobile trade animations, pokepic animations
2015-12-17 13:49:26 -05:00
PikalaxALT
6e257bc7cd
mystery gift, credits
2015-12-14 20:06:41 -05:00
PikalaxALT
15a03a2577
Unown Puzzles
2015-12-11 11:33:14 -05:00
PikalaxALT
7f68db68ad
underground switches, town map
2015-12-09 11:39:35 -05:00
PikalaxALT
2cdca75441
Crystal Intro
2015-12-02 17:59:05 -05:00
PikalaxALT
d314bdb4fa
Pokedex labels
2015-11-29 21:34:59 -05:00
PikalaxALT
8612a4a531
Renaming sections, further dissolving main.asm
2015-11-28 15:13:40 -05:00
PikalaxALT
58020fb5f6
trade animation
2015-11-23 00:21:21 -05:00
PikalaxALT
8740fc6e87
Annotate gfx/mail.asm
2015-11-22 13:50:19 -05:00
PikalaxALT
24b7b2c1cf
Foreign language font handling in mail
2015-11-22 12:01:58 -05:00
PikalaxALT
7b3090e22a
Annotate battle tower text bug
2015-11-20 15:15:32 -05:00
PikalaxALT
93a129eb6d
main.asm is now under 30k lines
2015-11-19 18:09:11 -05:00
PikalaxALT
3f4044cd46
engine/compose_mail.asm; ldpixel
2015-11-18 13:01:55 -05:00
PikalaxALT
ed44de4bb4
More map object work
2015-11-14 14:41:47 -05:00
PikalaxALT
2ffcb4b490
More splits; map setup labels
2015-11-11 23:38:57 -05:00
PikalaxALT
b522b0f165
engine/mart.asm
2015-11-11 14:12:46 -05:00
PikalaxALT
ba05bfeafe
Move some gfx files around, also clock reset fn
2015-11-10 11:05:26 -05:00
